From 9f22c3c31a410bee989018679ad1132d24db7ea0 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 01:35:04 +0100
Subject: [PATCH 0001/2864] Added tag 2.0 for changeset 6e46a40aaa85

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 97ad02a0..9530e4ce 100644
--- a/.hgtags
+++ b/.hgtags
@@ -8,3 +8,4 @@ bb986ed591734ca469f726753cbc48ebbfce0dcc 1.2.1
 4a20105a242ab154f6202aa6651979bfbb4cf95e 1.2.3
 803aa0976cca3dd737777c640722988b1f3769fe 1.2.4
 703c4511105fd9c8b85afda951a294c194e7cf3e 1.2.5
+6e46a40aaa850a979f5d09dd95d02791ec7ab0ef 2.0

From c7f959d0b4fa75944cba1ec0372068c7dd8f7baa Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 16:16:03 +0100
Subject: [PATCH 0002/2864] Remove a debug statement, thanks Dan Jacka for
 reporting this.

---
 pelican/readers.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index b9ad82e3..11c22947 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -30,8 +30,6 @@ class RstReader(object):
         metadatas = self._parse_metadata(text)
         extra_params = {'input_encoding': 'unicode',
                         'initial_header_level': '2'}
-        from ipdb import set_trace
-        set_trace()
         rendered_content = core.publish_parts(text, writer_name='html',
                                               settings_overrides=extra_params)
         title = rendered_content.get('title')

From f913381f59ffc40dbbca8c2f9d1bbd0711a66566 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 16:43:24 +0100
Subject: [PATCH 0003/2864] Add a thanks file.

---
 THANKS | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 THANKS

diff --git a/THANKS b/THANKS
new file mode 100644
index 00000000..0f193e7d
--- /dev/null
+++ b/THANKS
@@ -0,0 +1,4 @@
+Some people have helped to improve pelican by contributing features, reporting
+bugs or giving ideas. Thanks to them !
+
+- Dan Jacka

From 4438a73135fe9fc489ece6312aa8e58e7ce9ceb0 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 16:47:35 +0100
Subject: [PATCH 0004/2864] Update the README

---
 README.rst | 56 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/README.rst b/README.rst
index 9d7faf92..ecf0b33b 100644
--- a/README.rst
+++ b/README.rst
@@ -9,24 +9,12 @@ Pelican is a simple weblog generator, writen in python.
 * Easy to interface with DVCSes and web hooks
 * Completely static output, so easy to host anywhere !
 
-Getting started
+Files metadatas
 ---------------
 
-Yeah? You're ready? Let's go !::
-
-    $ pip install pelican
-    $ pelican -p /path/to/your/content/
-    ...
-
-And… that's all! You can see your weblog generated on the content/ folder.
-
-
-Metadata
----------
-
 Pelican tries to be smart enough to get the informations he needs from the
-filesystem (for instance, about date of creation of the files), but it seems to
-be less reliable than static metadata.
+filesystem (for instance, about the category of your articles), but you need to
+provide by hand some of those informations in your files.
 
 You could provide the metadata in the restructured text files, using the
 following syntax::
@@ -39,19 +27,47 @@ following syntax::
     :category: yeah
     :author: Alexis Metaireau
 
+Note that only the `date` metadata is mandatory, so you just have to add that in i
+your files. The category can also be determined by the directory where the rst file
+is. For instance, the category of `python/foobar/myfoobar.rst` is `foobar`.
+
+Getting started — Generate your blog
+-------------------------------------
+
+Yeah? You're ready? Let's go ! You can install pelican in a lot of different
+ways, the simpler one is via pip::
+
+    $ pip install pelican
+
+Then, you have just to launch pelican, like this::
+
+    $ pelican /path/to/your/content/
+
+And… that's all! You can see your weblog generated on the content/ folder.
+
+This one will just generate a simple output, with the default theme. It's not
+really sexy, as it's a simple HTML output (without any style). 
+
+You can create your own style if you want, have a look to the help to see all
+the options you can use::
+
+    $ pelican --help
+
 Why the name "Pelican" ?
 ------------------------
 
 Heh, you didnt noticed? "Pelican" is an anagram for "Calepin" ;)
 
+Source code
+-----------
+
+You can access the source code via mercurial at http://hg.notmyidea.org/pelican/
+or via git on http://github.com/ametaireau/pelican/
+
 Feedback !
 ----------
 
 If you want to see new features in Pelican, dont hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
 
-Source code
------------
-
-Get the source code from http://hg.notmyidea.org/pelican/
-
+Contact me at "alexis at notmyidea dot org" for any request/feedback !

From 41a5f390fb08db1011dc701e2896bcccc29caef8 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 16:47:59 +0100
Subject: [PATCH 0005/2864] Put the notmyidea theme by default.

--HG--
rename : samples/themes/notmyidea/css/main.css => pelican/themes/notmyidea/css/main.css
rename : samples/themes/notmyidea/css/pygment.css => pelican/themes/notmyidea/css/pygment.css
rename : samples/themes/notmyidea/css/reset.css => pelican/themes/notmyidea/css/reset.css
rename : samples/themes/notmyidea/images/icons/delicious.png => pelican/themes/notmyidea/images/icons/delicious.png
rename : samples/themes/notmyidea/images/icons/lastfm.png => pelican/themes/notmyidea/images/icons/lastfm.png
rename : samples/themes/notmyidea/images/icons/rss.png => pelican/themes/notmyidea/images/icons/rss.png
rename : samples/themes/notmyidea/images/icons/twitter.png => pelican/themes/notmyidea/images/icons/twitter.png
rename : samples/themes/notmyidea/templates/archives.html => pelican/themes/notmyidea/templates/archives.html
rename : samples/themes/notmyidea/templates/article.html => pelican/themes/notmyidea/templates/article.html
rename : samples/themes/notmyidea/templates/base.html => pelican/themes/notmyidea/templates/base.html
rename : samples/themes/notmyidea/templates/categories.html => pelican/themes/notmyidea/templates/categories.html
rename : samples/themes/notmyidea/templates/category.html => pelican/themes/notmyidea/templates/category.html
rename : samples/themes/notmyidea/templates/index.html => pelican/themes/notmyidea/templates/index.html
rename : samples/themes/notmyidea/templates/tag.html => pelican/themes/notmyidea/templates/tag.html
rename : samples/themes/notmyidea/templates/tags.html => pelican/themes/notmyidea/templates/tags.html
rename : pelican/themes/templates/archives.html => pelican/themes/simple/templates/archives.html
rename : pelican/themes/templates/article.html => pelican/themes/simple/templates/article.html
rename : pelican/themes/templates/base.html => pelican/themes/simple/templates/base.html
rename : pelican/themes/templates/categories.html => pelican/themes/simple/templates/categories.html
rename : pelican/themes/templates/category.html => pelican/themes/simple/templates/category.html
rename : pelican/themes/templates/index.html => pelican/themes/simple/templates/index.html
rename : pelican/themes/templates/tag.html => pelican/themes/simple/templates/tag.html
rename : pelican/themes/templates/tags.html => pelican/themes/simple/templates/tags.html
---
 MANIFEST.in                                         |   2 +-
 bin/pelican                                         |   2 +-
 pelican/contents.py                                 |   4 ++--
 pelican/settings.py                                 |   2 +-
 {samples => pelican}/themes/notmyidea/css/main.css  |   0
 .../themes/notmyidea/css/pygment.css                |   0
 {samples => pelican}/themes/notmyidea/css/reset.css |   0
 .../themes/notmyidea/images/icons/delicious.png     | Bin
 .../themes/notmyidea/images/icons/lastfm.png        | Bin
 .../themes/notmyidea/images/icons/rss.png           | Bin
 .../themes/notmyidea/images/icons/twitter.png       | Bin
 .../themes/notmyidea/templates/archives.html        |   0
 .../themes/notmyidea/templates/article.html         |   5 ++++-
 .../themes/notmyidea/templates/base.html            |   4 +++-
 .../{ => notmyidea}/templates/categories.html       |   0
 .../themes/notmyidea/templates/category.html        |   0
 .../themes/notmyidea/templates/index.html           |   4 +++-
 pelican/themes/{ => notmyidea}/templates/tag.html   |   0
 pelican/themes/{ => notmyidea}/templates/tags.html  |   0
 pelican/themes/{ => simple}/templates/archives.html |   0
 pelican/themes/{ => simple}/templates/article.html  |   0
 pelican/themes/{ => simple}/templates/base.html     |   0
 .../themes/simple}/templates/categories.html        |   0
 pelican/themes/{ => simple}/templates/category.html |   0
 pelican/themes/{ => simple}/templates/index.html    |   0
 .../themes/simple}/templates/tag.html               |   0
 .../themes/simple}/templates/tags.html              |   0
 samples/test_settings.py                            |   8 ++++----
 setup.py                                            |   4 ++--
 29 files changed, 21 insertions(+), 14 deletions(-)
 rename {samples => pelican}/themes/notmyidea/css/main.css (100%)
 rename {samples => pelican}/themes/notmyidea/css/pygment.css (100%)
 rename {samples => pelican}/themes/notmyidea/css/reset.css (100%)
 rename {samples => pelican}/themes/notmyidea/images/icons/delicious.png (100%)
 rename {samples => pelican}/themes/notmyidea/images/icons/lastfm.png (100%)
 rename {samples => pelican}/themes/notmyidea/images/icons/rss.png (100%)
 rename {samples => pelican}/themes/notmyidea/images/icons/twitter.png (100%)
 rename {samples => pelican}/themes/notmyidea/templates/archives.html (100%)
 rename {samples => pelican}/themes/notmyidea/templates/article.html (79%)
 rename {samples => pelican}/themes/notmyidea/templates/base.html (92%)
 rename pelican/themes/{ => notmyidea}/templates/categories.html (100%)
 rename {samples => pelican}/themes/notmyidea/templates/category.html (100%)
 rename {samples => pelican}/themes/notmyidea/templates/index.html (91%)
 rename pelican/themes/{ => notmyidea}/templates/tag.html (100%)
 rename pelican/themes/{ => notmyidea}/templates/tags.html (100%)
 rename pelican/themes/{ => simple}/templates/archives.html (100%)
 rename pelican/themes/{ => simple}/templates/article.html (100%)
 rename pelican/themes/{ => simple}/templates/base.html (100%)
 rename {samples/themes/notmyidea => pelican/themes/simple}/templates/categories.html (100%)
 rename pelican/themes/{ => simple}/templates/category.html (100%)
 rename pelican/themes/{ => simple}/templates/index.html (100%)
 rename {samples/themes/notmyidea => pelican/themes/simple}/templates/tag.html (100%)
 rename {samples/themes/notmyidea => pelican/themes/simple}/templates/tags.html (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
index 4dc39a85..996b1814 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include *.rst
-recursive-include pelican *.html
+recursive-include pelican *.html *.css *png
 include LICENSE
diff --git a/bin/pelican b/bin/pelican
index d85eaf3c..e39d8c3a 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -10,7 +10,7 @@ parser.add_argument(dest='path',
     help='Path where to find the content files (default is "content").')
 parser.add_argument('-t', '--theme-path', dest='theme',
     help='Path where to find the theme templates. If not specified, it will'
-         'use the ones included with pelican.')
+         'use the default one included with pelican.')
 parser.add_argument('-o', '--output', dest='output',
     help='Where to output the generated files. If not specified, a directory'
          ' will be created, named "output" in the current path.')
diff --git a/pelican/contents.py b/pelican/contents.py
index a805efc2..0038b2fa 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -8,7 +8,7 @@ class Page(object):
     :param string: the string to parse, containing the original content.
     :param markup: the markup language to use while parsing.
     """
-    mandatory_properties = ('author', 'title')
+    mandatory_properties = ('title')
 
     def __init__(self, content, metadatas={}, settings={}):
         self.content = content
@@ -35,7 +35,7 @@ class Page(object):
 
 
 class Article(Page):
-    mandatory_properties = ('author', 'title', 'date', 'category')
+    mandatory_properties = ('title', 'date', 'category')
 
 
 class Quote(Page):
diff --git a/pelican/settings.py b/pelican/settings.py
index c7e60dc3..670584be 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,7 +1,7 @@
 import os
 
 _DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
-                              "themes"])
+                              "themes/notmyidea"])
 _DEFAULT_CONFIG = {'PATH': None,
                    'THEME': _DEFAULT_THEME,
                    'OUTPUT_PATH': 'output/',
diff --git a/samples/themes/notmyidea/css/main.css b/pelican/themes/notmyidea/css/main.css
similarity index 100%
rename from samples/themes/notmyidea/css/main.css
rename to pelican/themes/notmyidea/css/main.css
diff --git a/samples/themes/notmyidea/css/pygment.css b/pelican/themes/notmyidea/css/pygment.css
similarity index 100%
rename from samples/themes/notmyidea/css/pygment.css
rename to pelican/themes/notmyidea/css/pygment.css
diff --git a/samples/themes/notmyidea/css/reset.css b/pelican/themes/notmyidea/css/reset.css
similarity index 100%
rename from samples/themes/notmyidea/css/reset.css
rename to pelican/themes/notmyidea/css/reset.css
diff --git a/samples/themes/notmyidea/images/icons/delicious.png b/pelican/themes/notmyidea/images/icons/delicious.png
similarity index 100%
rename from samples/themes/notmyidea/images/icons/delicious.png
rename to pelican/themes/notmyidea/images/icons/delicious.png
diff --git a/samples/themes/notmyidea/images/icons/lastfm.png b/pelican/themes/notmyidea/images/icons/lastfm.png
similarity index 100%
rename from samples/themes/notmyidea/images/icons/lastfm.png
rename to pelican/themes/notmyidea/images/icons/lastfm.png
diff --git a/samples/themes/notmyidea/images/icons/rss.png b/pelican/themes/notmyidea/images/icons/rss.png
similarity index 100%
rename from samples/themes/notmyidea/images/icons/rss.png
rename to pelican/themes/notmyidea/images/icons/rss.png
diff --git a/samples/themes/notmyidea/images/icons/twitter.png b/pelican/themes/notmyidea/images/icons/twitter.png
similarity index 100%
rename from samples/themes/notmyidea/images/icons/twitter.png
rename to pelican/themes/notmyidea/images/icons/twitter.png
diff --git a/samples/themes/notmyidea/templates/archives.html b/pelican/themes/notmyidea/templates/archives.html
similarity index 100%
rename from samples/themes/notmyidea/templates/archives.html
rename to pelican/themes/notmyidea/templates/archives.html
diff --git a/samples/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
similarity index 79%
rename from samples/themes/notmyidea/templates/article.html
rename to pelican/themes/notmyidea/templates/article.html
index 4aed28f4..63384b9c 100644
--- a/samples/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -9,9 +9,12 @@
                 <abbr class="published" title="{{ article.date.isoformat() }}">
                     {{ article.date.strftime('%a %d %B %Y') }}
                 </abbr>
+                {% if article.author %}
                 <address class="vcard author">
                         By <a class="url fn" href="#">{{ article.author }}</a>
-                </address>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
+                </address>
+                {% endif %}
+                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
         </footer><!-- /.post-info -->
         {{ article.content }}
         </div><!-- /.entry-content -->
diff --git a/samples/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
similarity index 92%
rename from samples/themes/notmyidea/templates/base.html
rename to pelican/themes/notmyidea/templates/base.html
index a9572db8..4552016d 100644
--- a/samples/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -20,7 +20,9 @@
 </head>
 
 <body id="index" class="home">
-<a href="http://github.com/ametaireau"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>        
+{% if GITHUB_URL %}
+<a href="{{ GITHUB_URL }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>        
+{% endif %}
 
         <header id="banner" class="body">
                 <h1><a href="{{ SITEURL }}">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
diff --git a/pelican/themes/templates/categories.html b/pelican/themes/notmyidea/templates/categories.html
similarity index 100%
rename from pelican/themes/templates/categories.html
rename to pelican/themes/notmyidea/templates/categories.html
diff --git a/samples/themes/notmyidea/templates/category.html b/pelican/themes/notmyidea/templates/category.html
similarity index 100%
rename from samples/themes/notmyidea/templates/category.html
rename to pelican/themes/notmyidea/templates/category.html
diff --git a/samples/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
similarity index 91%
rename from samples/themes/notmyidea/templates/index.html
rename to pelican/themes/notmyidea/templates/index.html
index 3ee1edb1..69ae66f8 100644
--- a/samples/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -10,9 +10,11 @@
                                 {{ article.date.strftime('%a %d %B %Y') }}
                         </abbr>
 
+                        {% if article.author %}
                         <address class="vcard author">
                                 By <a class="url fn" href="#">{{ article.author }}</a>
-                        </address>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
+                        </address>
+                        {% endif %}<p> In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
                 </footer><!-- /.post-info -->
                 {{ article.content }}
         </article></aside><!-- /#featured -->
diff --git a/pelican/themes/templates/tag.html b/pelican/themes/notmyidea/templates/tag.html
similarity index 100%
rename from pelican/themes/templates/tag.html
rename to pelican/themes/notmyidea/templates/tag.html
diff --git a/pelican/themes/templates/tags.html b/pelican/themes/notmyidea/templates/tags.html
similarity index 100%
rename from pelican/themes/templates/tags.html
rename to pelican/themes/notmyidea/templates/tags.html
diff --git a/pelican/themes/templates/archives.html b/pelican/themes/simple/templates/archives.html
similarity index 100%
rename from pelican/themes/templates/archives.html
rename to pelican/themes/simple/templates/archives.html
diff --git a/pelican/themes/templates/article.html b/pelican/themes/simple/templates/article.html
similarity index 100%
rename from pelican/themes/templates/article.html
rename to pelican/themes/simple/templates/article.html
diff --git a/pelican/themes/templates/base.html b/pelican/themes/simple/templates/base.html
similarity index 100%
rename from pelican/themes/templates/base.html
rename to pelican/themes/simple/templates/base.html
diff --git a/samples/themes/notmyidea/templates/categories.html b/pelican/themes/simple/templates/categories.html
similarity index 100%
rename from samples/themes/notmyidea/templates/categories.html
rename to pelican/themes/simple/templates/categories.html
diff --git a/pelican/themes/templates/category.html b/pelican/themes/simple/templates/category.html
similarity index 100%
rename from pelican/themes/templates/category.html
rename to pelican/themes/simple/templates/category.html
diff --git a/pelican/themes/templates/index.html b/pelican/themes/simple/templates/index.html
similarity index 100%
rename from pelican/themes/templates/index.html
rename to pelican/themes/simple/templates/index.html
diff --git a/samples/themes/notmyidea/templates/tag.html b/pelican/themes/simple/templates/tag.html
similarity index 100%
rename from samples/themes/notmyidea/templates/tag.html
rename to pelican/themes/simple/templates/tag.html
diff --git a/samples/themes/notmyidea/templates/tags.html b/pelican/themes/simple/templates/tags.html
similarity index 100%
rename from samples/themes/notmyidea/templates/tags.html
rename to pelican/themes/simple/templates/tags.html
diff --git a/samples/test_settings.py b/samples/test_settings.py
index 7c0ffd4f..85729eb7 100644
--- a/samples/test_settings.py
+++ b/samples/test_settings.py
@@ -3,11 +3,11 @@ PATH = 'samples/content'
 THEME = 'samples/themes/notmyidea'
 AUTHOR = u'Alexis Métaireau'
 
-BLOGNAME = 'NotMyIdea.org'
-BLOGSUBTITLE = u"%s's weblog" % AUTHOR
-BLOGURL = 'http://blog.notmyidea.org'
+SITENAME = 'Pelican'
+SITESUBTITLE = u"%s's weblog" % AUTHOR
+SITEURL = 'http://blog.notmyidea.org'
 
-BLOGROLL = (('Biologeek', 'http://biologeek.org'),
+SITEROLL = (('Biologeek', 'http://biologeek.org'),
             ('Filyb', "http://filyb.info/"),
             ('Libert-fr', "http://www.libert-fr.com"),
             ('N1k0', "http://prendreuncafe.com/blog/"),
diff --git a/setup.py b/setup.py
index b6be0012..4d7e6c89 100644
--- a/setup.py
+++ b/setup.py
@@ -7,14 +7,14 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.0',
+    version = '2.1',
     url = 'http://hg.lolnet.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',
     description = "A tool to generate a static blog, with restructured text input files.",
     long_description=open('README.rst').read(),
     packages = ['pelican'],
-    package_data = {'pelican': ['themes/templates/*']},
+    include_package_data = True,
     install_requires = requires, 
     scripts = ['bin/pelican'],
     classifiers = ['Development Status :: 5 - Production/Stable',

From a486d4ed3ebed472fd7bd356104ec0496179d017 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 16:48:15 +0100
Subject: [PATCH 0006/2864] Added tag 2.1 for changeset bf14d1a5c1fa

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 9530e4ce..d7fb161f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -9,3 +9,4 @@ bb986ed591734ca469f726753cbc48ebbfce0dcc 1.2.1
 803aa0976cca3dd737777c640722988b1f3769fe 1.2.4
 703c4511105fd9c8b85afda951a294c194e7cf3e 1.2.5
 6e46a40aaa850a979f5d09dd95d02791ec7ab0ef 2.0
+bf14d1a5c1fae9475447698f0f9b8d35c551f732 2.1

From cb337aad9d09a6d4bb821bf864b64b3314c176cf Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 16:54:40 +0100
Subject: [PATCH 0007/2864] Change the pelican link.

---
 pelican/themes/notmyidea/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 4552016d..d1e6250b 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -63,7 +63,7 @@
         
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://hg.lolnet.org/pelican/">pelican</a>, which takes great advantages of <a href="http://python.org">python</a>.
+                Proudly powered by <a href="http://alexis.notmyidea.org/pelican/">pelican</a>, which takes great advantages of <a href="http://python.org">python</a>.
                 </address><!-- /#about -->
                 
                 <p>The theme is by <a href="http://smashingmagazine.com">Smashing Magazine</a>, thanks!</p>

From 97b9a1c6edf7f29ba07d0bdfbfb3a1cb7096ad8f Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 17:04:15 +0100
Subject: [PATCH 0008/2864] Remove unicode chars for output, as it breaks on
 some systems.

---
 pelican/generators.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 91f8ad2e..2e2bd007 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -79,7 +79,7 @@ class Generator(object):
                 pass
             fp = open(complete_path, 'w')
             feed.write(fp, 'utf-8')
-            print u' ✔ writing %s' % complete_path
+            print u' [OK] writing %s' % complete_path
             
             fp.close()
         return feed
@@ -101,7 +101,7 @@ class Generator(object):
             pass
         with open(filename, 'w', encoding='utf-8') as f:
             f.write(output)
-        print u' ✔ writing %s' % filename
+        print u' [ok] writing %s' % filename
 
     def get_templates(self, path=None):
         """Return the templates to use.
@@ -164,7 +164,7 @@ class ArticlesGenerator(Generator):
             try:
                 article.check_properties()
             except NameError as e:
-                print u" ☓ Skipping %s: impossible to find informations about '%s'" % (f, e)
+                print u"[INFO] Skipping %s: impossible to find informations about '%s'" % (f, e)
                 continue
 
             update_dict(self.dates, article.date.strftime('%Y-%m-%d'), article)
@@ -226,7 +226,7 @@ class ArticlesGenerator(Generator):
                 fromp = os.path.expanduser(os.path.join(self.theme, path))
                 to = os.path.expanduser(os.path.join(self.output_path, path))
                 shutil.copytree(fromp, to)
-                print u' ✔ copying %s' % fromp
+                print u' [OK] copying %s' % fromp
 
             except OSError:
                 pass

From fb9ab3fc583833a7ace6e8b485fe112d88565b91 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 17:04:48 +0100
Subject: [PATCH 0009/2864] Tag 2.1.1

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 4d7e6c89..6e365a21 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.1',
+    version = '2.1.1',
     url = 'http://hg.lolnet.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From 5706d788f2dc84b7212daa2db664dbdac66533c2 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 17:04:57 +0100
Subject: [PATCH 0010/2864] Added tag 2.1.1 for changeset da86343ebd54

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d7fb161f..14cecbed 100644
--- a/.hgtags
+++ b/.hgtags
@@ -10,3 +10,4 @@ bb986ed591734ca469f726753cbc48ebbfce0dcc 1.2.1
 703c4511105fd9c8b85afda951a294c194e7cf3e 1.2.5
 6e46a40aaa850a979f5d09dd95d02791ec7ab0ef 2.0
 bf14d1a5c1fae9475447698f0f9b8d35c551f732 2.1
+da86343ebd543e5865050e47ecb0937755528d13 2.1.1

From 259eb1571dc7be4a8625b0fbd64cb1b4317d5b06 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 17:06:56 +0100
Subject: [PATCH 0011/2864] prettify output

---
 pelican/generators.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 2e2bd007..77044750 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -79,7 +79,7 @@ class Generator(object):
                 pass
             fp = open(complete_path, 'w')
             feed.write(fp, 'utf-8')
-            print u' [OK] writing %s' % complete_path
+            print u' [ok] writing %s' % complete_path
             
             fp.close()
         return feed
@@ -164,7 +164,7 @@ class ArticlesGenerator(Generator):
             try:
                 article.check_properties()
             except NameError as e:
-                print u"[INFO] Skipping %s: impossible to find informations about '%s'" % (f, e)
+                print u"[info] Skipping %s: impossible to find informations about '%s'" % (f, e)
                 continue
 
             update_dict(self.dates, article.date.strftime('%Y-%m-%d'), article)
@@ -226,7 +226,7 @@ class ArticlesGenerator(Generator):
                 fromp = os.path.expanduser(os.path.join(self.theme, path))
                 to = os.path.expanduser(os.path.join(self.output_path, path))
                 shutil.copytree(fromp, to)
-                print u' [OK] copying %s' % fromp
+                print u' [ok] copying %s' % fromp
 
             except OSError:
                 pass

From 340ddf4aa864970e871c6bfcd14d3b366e492544 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 20:17:23 +0100
Subject: [PATCH 0012/2864] Add a way to output pages as well.

---
 bin/pelican                                  |  15 ++-
 pelican/contents.py                          |   2 +-
 pelican/generators.py                        | 122 +++++++++++++------
 pelican/themes/notmyidea/templates/base.html |   7 +-
 pelican/themes/notmyidea/templates/page.html |   8 ++
 5 files changed, 109 insertions(+), 45 deletions(-)
 create mode 100644 pelican/themes/notmyidea/templates/page.html

diff --git a/bin/pelican b/bin/pelican
index e39d8c3a..2a8035ce 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import argparse
 
-from pelican.generators import ArticlesGenerator
+from pelican.generators import ArticlesGenerator, PagesGenerator
 
 parser = argparse.ArgumentParser(description="""A tool to generate a
 static blog, with restructured text input files.""")
@@ -23,6 +23,15 @@ parser.add_argument('-s', '--settings', dest='settings',
 
 if __name__ == '__main__':
     args = parser.parse_args()
-    gen = ArticlesGenerator(args.settings)
-    gen.generate(args.path, args.theme, args.output, args.markup)
+
+    articles = ArticlesGenerator(args.settings)
+    pages = PagesGenerator(args.settings)
+    context = {}
+
+    for gen in articles, pages:
+        context.update(gen.create_context(args.path, args.theme, args.output,
+                       args.markup))
+
+    for gen in articles, pages:
+        gen.generate(context)
     print "Enjoy !"
diff --git a/pelican/contents.py b/pelican/contents.py
index 0038b2fa..bd52d57b 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -8,7 +8,7 @@ class Page(object):
     :param string: the string to parse, containing the original content.
     :param markup: the markup language to use while parsing.
     """
-    mandatory_properties = ('title')
+    mandatory_properties = ('title',)
 
     def __init__(self, content, metadatas={}, settings={}):
         self.content = content
diff --git a/pelican/generators.py b/pelican/generators.py
index 77044750..c25e3978 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -10,13 +10,13 @@ from feedgenerator import Atom1Feed
 
 from pelican.utils import update_dict
 from pelican.settings import read_settings
-from pelican.contents import Article
+from pelican.contents import Article, Page
 from pelican.readers import read_file
 
 ## Constants ##########################################################
 
 _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
-              'archives')
+              'archives', 'page')
 
 _DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
 
@@ -92,6 +92,7 @@ class Generator(object):
         :param context: dict to pass to the templates.
         :param **kwargs: additional variables to pass to the templates
         """
+        context = context.copy()
         context.update(kwargs)
         output = template.render(context)
         filename = os.sep.join((self.output_path, name))
@@ -128,7 +129,47 @@ class Generator(object):
         except:
             pass
 
+    def _get_context(self, items):
+        """Return the context to be used in templates"""
+
+        # create a new context only if none currently exists.
+        if not hasattr(self, "context"):
+            context = self.settings.copy()
+        else:
+            context = self.context
+
+        # put all we need in the context, to generate the output
+        for item in items:
+            value = getattr(self, item)
+            if hasattr(value, 'items'):
+                value = value.items()
+            context[item] = value
+        return context
+
+    def get_files(self, path, exclude=[]):
+        """Return the files to use to use in this generator
+
+        :param path: the path to search the file on
+        :param exclude: the list of path to exclude
+        """
+        files = []
+        for root, dirs, temp_files in os.walk(path, followlinks=True):
+            for e in exclude:
+                if e in dirs:
+                    dirs.remove(e)
+            files.extend([os.sep.join((root, f)) for f in temp_files
+                if f.endswith(self.format)])
+        return files
+
+    def is_valid_content(self, content, f):
+        try:
+            content.check_properties()
+            return True
+        except NameError as e:
+            print u" [info] Skipping %s: impossible to find informations about '%s'" % (f, e)
+            return False
     
+
 class ArticlesGenerator(Generator):
 
     def __init__(self, settings=None):
@@ -139,14 +180,6 @@ class ArticlesGenerator(Generator):
         self.tags = {}
         self.categories = {} 
         
-    def get_files(self, path):
-        """Return the files to use to use in this generator"""
-        files = []
-        for root, dirs, temp_files in os.walk(path, followlinks=True):
-            files.extend([os.sep.join((root, f)) for f in temp_files
-                if f.endswith(self.format)])
-        return files
-
     def process_files(self, files):
         """Process all the files and build the lists and dicts of
         articles/categories/etc.
@@ -161,10 +194,7 @@ class ArticlesGenerator(Generator):
                     metadatas['category'] = unicode(category)
 
             article = Article(content, metadatas, settings=self.settings)
-            try:
-                article.check_properties()
-            except NameError as e:
-                print u"[info] Skipping %s: impossible to find informations about '%s'" % (f, e)
+            if not self.is_valid_content(article, f):
                 continue
 
             update_dict(self.dates, article.date.strftime('%Y-%m-%d'), article)
@@ -175,18 +205,6 @@ class ArticlesGenerator(Generator):
                     update_dict(self.tags, tag, article)
             self.articles.append(article)
 
-    def _get_context(self):
-        """Return the context to be used in templates"""
-
-        context = self.settings.copy()
-        # put all we need in the context, to generate the output
-        for item in ('articles', 'dates', 'years', 'tags', 'categories'):
-            value = getattr(self, item)
-            if hasattr(value, 'items'):
-                value = value.items()
-            context[item] = value
-        return context
-
     def generate_feeds(self, context):
         """Generate the feeds from the current context, and output files.""" 
 
@@ -231,26 +249,52 @@ class ArticlesGenerator(Generator):
             except OSError:
                 pass
 
-    def generate(self, path=None, theme=None, output_path=None, fmt=None):
-        """Search the given path for files, and generate a static blog in output,
-        using the given theme.
-
-        :param path: the path where to find the files to parse
-        :param theme: where to search for templates
-        :param output_path: where to output the generated files
-        :param settings: the settings file to use
-        :param fmt: the format of the files to read. It's a list.
-        """
-
+    def create_context(self, path=None, theme=None, output_path=None, fmt=None):
         self._init_params(path, theme, output_path, fmt)
 
         # build the list of articles / categories / etc.
-        self.process_files(self.get_files(path))
+        self.process_files(self.get_files(path, ['pages',]))
 
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
         # and generate the output :)
-        context = self._get_context()
+        return self._get_context(('articles', 'dates', 'years', 'tags', 
+                                  'categories'))
+
+    def generate(self, context):
         self.generate_feeds(context)
         self.generate_pages(context)
         self.generate_static_content()
+
+
+class PagesGenerator(Generator):
+    """Generate pages"""
+
+    def __init__(self, settings=None):
+        super(PagesGenerator, self).__init__(settings)
+        self.pages = []
+
+    def process_files(self, files):
+        """Process all the files and build the lists and dicts of
+        articles/categories/etc.
+        """
+        for f in files:
+            content, metadatas = read_file(f)
+            page = Page(content, metadatas, settings=self.settings)
+            if not self.is_valid_content(page, f):
+                continue
+            self.pages.append(page)
+        
+    def generate_pages(self, context):
+        templates = self.get_templates(self.theme)
+        for page in self.pages:
+            self.generate_file('pages/%s' % page.url, 
+                               templates['page'], context, page=page)
+        
+    def create_context(self, path=None, theme=None, output_path=None, fmt=None):
+        self._init_params(path, theme, output_path, fmt)
+        self.process_files(self.get_files(os.sep.join((path, 'pages'))))
+        return self._get_context(('pages',))
+
+    def generate(self, context):
+        self.generate_pages(context)
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index d1e6250b..f6387ac7 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -30,6 +30,9 @@
                 {% for title, link in MENUITEMS %}
                     <li><a href="{{ link }}">{{ title }}</a></li>
                 {% endfor %}
+                {% for title, link in PAGES %}
+                    <li><a href="{{ SITEURL }}/{{ link }}">{{ title }}</a></li>
+                {% endfor %}
                 {% for cat, null in categories %}
                     <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
                 {% endfor %}
@@ -38,11 +41,11 @@
         {% block content %}
         {% endblock %}
         <section id="extras" class="body">
-        {% if SITEROLL %}
+        {% if LINKS %}
                 <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        {% for name, link in SITEROLL %}
+                        {% for name, link in LINKS %}
                             <li><a href="{{ link }}">{{ name }}</a></li>
                         {% endfor %}
                         </ul>
diff --git a/pelican/themes/notmyidea/templates/page.html b/pelican/themes/notmyidea/templates/page.html
new file mode 100644
index 00000000..1f028cc2
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/page.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{% endblock %}
+{% block content %}        
+<section id="content" class="body">    
+    <h2>{{ page.title }}</h2>
+    {{ page.content }}
+</section>
+{% endblock %}

From 5322f408fd57feef0502ce34305c6feb04d64907 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 30 Oct 2010 20:17:52 +0100
Subject: [PATCH 0013/2864] Added tag 2.2 for changeset 760187f048bb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 14cecbed..aa0a597b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -11,3 +11,4 @@ bb986ed591734ca469f726753cbc48ebbfce0dcc 1.2.1
 6e46a40aaa850a979f5d09dd95d02791ec7ab0ef 2.0
 bf14d1a5c1fae9475447698f0f9b8d35c551f732 2.1
 da86343ebd543e5865050e47ecb0937755528d13 2.1.1
+760187f048bb23979402f950ecb5d3c5493995b1 2.2

From c83d234773efc6e1d82ff411757076927542d22d Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 31 Oct 2010 00:08:16 +0100
Subject: [PATCH 0014/2864] Add the ability to read from markdown too.

---
 bin/pelican           |  7 ++++---
 pelican/generators.py | 19 +++++++++++--------
 pelican/readers.py    | 20 +++++++++++++++++---
 pelican/settings.py   |  2 +-
 pelican/utils.py      |  6 ++++--
 setup.py              |  6 +++---
 6 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/bin/pelican b/bin/pelican
index 2a8035ce..540a1acc 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -14,7 +14,7 @@ parser.add_argument('-t', '--theme-path', dest='theme',
 parser.add_argument('-o', '--output', dest='output',
     help='Where to output the generated files. If not specified, a directory'
          ' will be created, named "output" in the current path.')
-parser.add_argument('-m', '--markup', default='rst', dest='markup',
+parser.add_argument('-m', '--markup', default='rst, md', dest='markup',
     help='the markup language to use. Currently only ReSTreucturedtext is'
           ' available.')
 parser.add_argument('-s', '--settings', dest='settings',
@@ -27,10 +27,11 @@ if __name__ == '__main__':
     articles = ArticlesGenerator(args.settings)
     pages = PagesGenerator(args.settings)
     context = {}
-
+    
     for gen in articles, pages:
+        markup = [a.split()[0] for a in args.markup.split(',')]
         context.update(gen.create_context(args.path, args.theme, args.output,
-                       args.markup))
+                       markup))
 
     for gen in articles, pages:
         gen.generate(context)
diff --git a/pelican/generators.py b/pelican/generators.py
index c25e3978..503e4506 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -27,21 +27,22 @@ class Generator(object):
     def __init__(self, settings):
         self.settings = read_settings(settings)
     
-    def _init_params(self, path=None, theme=None, output_path=None, fmt=None):
+    def _init_params(self, path=None, theme=None, output_path=None, 
+        markup=None):
         """Initialize parameters for this object.
 
         :param path: the path where to find the files to parse
         :param theme: where to search for templates
         :param output_path: where to output the generated files
         :param settings: the settings file to use
-        :param fmt: the format of the files to read. It's a list.
+        :param markup: the markup of the files to read. It's a list.
         """
         # get the settings
         self.path = path or self.settings['PATH']
         self.theme = theme or self.settings['THEME']
         output_path = output_path or self.settings['OUTPUT_PATH']
         self.output_path = os.path.realpath(output_path)
-        self.format = fmt or self.settings['FORMAT']
+        self.markup = markup or self.settings['MARKUP']
 
         # get the list of files to parse
         if not path:
@@ -158,7 +159,7 @@ class Generator(object):
                 if e in dirs:
                     dirs.remove(e)
             files.extend([os.sep.join((root, f)) for f in temp_files
-                if f.endswith(self.format)])
+                if True in [f.endswith(markup) for markup in self.markup]])
         return files
 
     def is_valid_content(self, content, f):
@@ -249,8 +250,9 @@ class ArticlesGenerator(Generator):
             except OSError:
                 pass
 
-    def create_context(self, path=None, theme=None, output_path=None, fmt=None):
-        self._init_params(path, theme, output_path, fmt)
+    def create_context(self, path=None, theme=None, output_path=None, 
+        markup=None):
+        self._init_params(path, theme, output_path, markup)
 
         # build the list of articles / categories / etc.
         self.process_files(self.get_files(path, ['pages',]))
@@ -291,8 +293,9 @@ class PagesGenerator(Generator):
             self.generate_file('pages/%s' % page.url, 
                                templates['page'], context, page=page)
         
-    def create_context(self, path=None, theme=None, output_path=None, fmt=None):
-        self._init_params(path, theme, output_path, fmt)
+    def create_context(self, path=None, theme=None, output_path=None, 
+        markup=None):
+        self._init_params(path, theme, output_path, markup)
         self.process_files(self.get_files(os.sep.join((path, 'pages'))))
         return self._get_context(('pages',))
 
diff --git a/pelican/readers.py b/pelican/readers.py
index 11c22947..38632222 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,4 +1,5 @@
 from docutils import core
+from markdown import Markdown
 import re
 
 # import the directives to have pygments support
@@ -38,14 +39,27 @@ class RstReader(object):
             metadatas['title'] = title
         return content, metadatas
 
-_EXTENSIONS = {'rst': RstReader}  # supported formats
+class MarkdownReader(object):
+
+    def read(self, filename):
+        """Parse content and metadata of markdown files"""
+        text = open(filename)
+        md = Markdown(extensions = ['meta'])
+        content = md.convert(text)
+        
+        metadatas = {}
+        for name, value in md.Meta.items():
+            metadatas[name.lower()] = value[0] 
+        return content, metadatas
+
+_EXTENSIONS = {'rst': RstReader, 'md': MarkdownReader}  # supported formats
 
 
 def read_file(filename, fmt=None):
     """Return a reader object using the given format."""
     if not fmt:
-        fmt = 'rst'
+        fmt = filename.split('.')[-1]
     if fmt not in _EXTENSIONS.keys():
-        raise TypeError('Pelican does not know how to parse %s files' % fmt)
+        raise TypeError('Pelican does not know how to parse %s' % filename)
     reader = _EXTENSIONS[fmt]()
     return reader.read(filename)
diff --git a/pelican/settings.py b/pelican/settings.py
index 670584be..814850f8 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -5,7 +5,7 @@ _DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
 _DEFAULT_CONFIG = {'PATH': None,
                    'THEME': _DEFAULT_THEME,
                    'OUTPUT_PATH': 'output/',
-                   'MARKUP': 'rst',
+                   'MARKUP': ('rst', 'md'),
                    'STATIC_PATHS': ['css', 'images'],
                    'FEED': 'feeds/all.atom.xml',
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
diff --git a/pelican/utils.py b/pelican/utils.py
index 5824b7b9..1f7b0c4b 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import re
 from datetime import datetime
 from codecs import open as _open
@@ -41,8 +42,9 @@ def slugify(value):
 
     Took from django sources.
     """
-    import unicodedata
-    value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
+    if type(value) == unicode:
+        import unicodedata
+        value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
     value = unicode(re.sub('[^\w\s-]', '', value).strip().lower())
     return re.sub('[-\s]+', '-', value)
 
diff --git a/setup.py b/setup.py
index 6e365a21..90dada4d 100644
--- a/setup.py
+++ b/setup.py
@@ -7,11 +7,11 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.1.1',
-    url = 'http://hg.lolnet.org/pelican/',
+    version = '2.2',
+    url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',
-    description = "A tool to generate a static blog, with restructured text input files.",
+    description = "A tool to generate a static blog, with restructured text (or markdown) input files.",
     long_description=open('README.rst').read(),
     packages = ['pelican'],
     include_package_data = True,

From 3df73021afda07aa893918f77a179608f2062a67 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 31 Oct 2010 00:09:51 +0100
Subject: [PATCH 0015/2864] Tag 2.3

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 90dada4d..909f6d37 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.2',
+    version = '2.3',
     url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From 33fb510a093c78be7d67a0d30f6d1b9a3d589e32 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 31 Oct 2010 00:09:58 +0100
Subject: [PATCH 0016/2864] Added tag 2.3 for changeset 20aa16fe4daa

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index aa0a597b..7e9d67a8 100644
--- a/.hgtags
+++ b/.hgtags
@@ -12,3 +12,4 @@ bb986ed591734ca469f726753cbc48ebbfce0dcc 1.2.1
 bf14d1a5c1fae9475447698f0f9b8d35c551f732 2.1
 da86343ebd543e5865050e47ecb0937755528d13 2.1.1
 760187f048bb23979402f950ecb5d3c5493995b1 2.2
+20aa16fe4daa3b70f6c063f170edc916b49837ed 2.3

From 4743678bc91f2e5ad363f1e9eff94751718f0f5c Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 31 Oct 2010 01:15:35 +0000
Subject: [PATCH 0017/2864] Update the readme with markdown.

---
 README.rst | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index ecf0b33b..b767145f 100644
--- a/README.rst
+++ b/README.rst
@@ -4,7 +4,7 @@ Pelican
 Pelican is a simple weblog generator, writen in python.
 
 * Write your weblog entries directly with your editor of choice (vim!) and
-  directly in restructured text.
+  directly in restructured text, or markdown.
 * A simple cli-tool to (re)generate the weblog.
 * Easy to interface with DVCSes and web hooks
 * Completely static output, so easy to host anywhere !
@@ -27,6 +27,14 @@ following syntax::
     :category: yeah
     :author: Alexis Metaireau
 
+
+You can also use a mardown syntax::
+
+    Date: 2010-12-03
+    Title: My super title
+
+    Put you content here.
+
 Note that only the `date` metadata is mandatory, so you just have to add that in i
 your files. The category can also be determined by the directory where the rst file
 is. For instance, the category of `python/foobar/myfoobar.rst` is `foobar`.

From 091d8a2705a019b9e0a1e240af92cc0c39016a02 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 31 Oct 2010 15:00:45 +0000
Subject: [PATCH 0018/2864] Minor theme changes.

---
 pelican/themes/notmyidea/css/main.css         | 37 +++++++++++--------
 .../themes/notmyidea/templates/article.html   |  4 +-
 pelican/themes/notmyidea/templates/index.html |  7 ++--
 pelican/themes/notmyidea/templates/page.html  |  2 +-
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/pelican/themes/notmyidea/css/main.css b/pelican/themes/notmyidea/css/main.css
index 6e2ce59b..591df44e 100644
--- a/pelican/themes/notmyidea/css/main.css
+++ b/pelican/themes/notmyidea/css/main.css
@@ -10,35 +10,38 @@
 /* Imports */
 @import url("reset.css");
 @import url("pygment.css");
+@import url(http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
 
 /***** Global *****/
 /* Body */
-	body {
-		background: #F5F4EF url('../images/bg.png');
-		color: #000305;
-		font-size: 87.5%; /* Base font size: 14px */
-		font-family: 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
-		line-height: 1.429;
-		margin: 0;
-		padding: 0;
-		text-align: left;
-	}
+body {
+    background: #F5F4EF url('../images/bg.png');
+    color: #000305;
+    font-size: 87.5%; /* Base font size: 14px */
+    font-family: 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+    line-height: 1.429;
+    margin: 0;
+    padding: 0;
+    text-align: left;
+}
 
 article img{
    float: right;
 }
 
 /* Headings */
+h1 {font-size: 2em }
 h2 {font-size: 1.571em}	/* 22px */
 h3 {font-size: 1.429em}	/* 20px */
 h4 {font-size: 1.286em}	/* 18px */
 h5 {font-size: 1.143em}	/* 16px */
 h6 {font-size: 1em}		/* 14px */
 
-h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6 {
 	font-weight: 400;
 	line-height: 1.1;
 	margin-bottom: .8em;
+    font-family: 'Yanone Kaffeesatz', arial, serif;
 }
 
 h3, h4, h5, h6 { margin-top: .8em; }
@@ -92,10 +95,13 @@ dl {margin: 0 0 1.5em 0;}
 dt {font-weight: bold;}
 dd {margin-left: 1.5em;}
 
-pre{background-color: #000; padding: 10px; color: #fff; margin: 10px;}
+pre{background-color: #000; padding: 10px; color: #fff; margin: 10px; overflow: auto;}
 
 /* Quotes */
-blockquote {font-style: italic;}
+blockquote {
+    margin: 20px;
+    font-style: italic;
+}
 cite {}
 
 q {}
@@ -341,8 +347,9 @@ img.left, figure.left {float: right; margin: 0 0 2em 2em;}
 li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 #content > .hentry {padding: 1em 0;}
 
-.entry-title {font-size: 2em; margin-bottom: 5px; margin-top: 0; }
-.entry-title a:link, .entry-title a:visited {text-decoration: none;}
+.entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;}
+.entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
+.entry-title a:visited {background-color: #fff;}
 
 .hentry .post-info * {font-style: normal;}
 
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 63384b9c..5c865348 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -3,7 +3,9 @@
 {% block content %}        
 <section id="content" class="body">    
 <article>
-        <header> <h2 class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title }}</a></h2> </header>
+        <header> <h1 class="entry-title"><a href="{{ article.url }}"
+        rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title
+        }}</a></h1> </header>
         <div class="entry-content">
         <footer class="post-info">
                 <abbr class="published" title="{{ article.date.isoformat() }}">
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 69ae66f8..e4260302 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -4,7 +4,8 @@
 {% for article in articles %}        
     {% if loop.index == 1 %}
         <aside id="featured" class="body"><article>
-                <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2> 
+                <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url
+                }}">{{ article.title }}</a></h1> 
                 <footer class="post-info">
                         <abbr class="published" title="{{ article.date.isoformat() }}">
                                 {{ article.date.strftime('%a %d %B %Y') }}
@@ -20,14 +21,14 @@
         </article></aside><!-- /#featured -->
         {% if loop.length  > 1 %}
             <section id="content" class="body">
-                <h2>Others articles</h2>
+                <h1>Others articles</h1>
                 <hr />
                     <ol id="posts-list" class="hfeed">
         {% endif %}
     {% else %} 
         <li><article class="hentry">    
                 <header>
-                        <h2><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2>
+                        <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h1>
                 </header>
                 
                 <div class="entry-content">
diff --git a/pelican/themes/notmyidea/templates/page.html b/pelican/themes/notmyidea/templates/page.html
index 1f028cc2..44aaf25d 100644
--- a/pelican/themes/notmyidea/templates/page.html
+++ b/pelican/themes/notmyidea/templates/page.html
@@ -2,7 +2,7 @@
 {% block title %}{{ page.title }}{% endblock %}
 {% block content %}        
 <section id="content" class="body">    
-    <h2>{{ page.title }}</h2>
+    <h1 class="entry-title">{{ page.title }}</h1>
     {{ page.content }}
 </section>
 {% endblock %}

From 60bcd21c00443d947d76b268ed052b8787741f5b Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 31 Oct 2010 15:48:42 +0000
Subject: [PATCH 0019/2864] Add the dependency to Mardown.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 909f6d37..a1adc622 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 import sys
 
-requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils']
+requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown']
 if sys.version_info < (2,7):
     requires.append('argparse')
 

From d2a3b5380cc8ee838556190e3c78a58479affc22 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Wed, 3 Nov 2010 00:51:55 +0000
Subject: [PATCH 0020/2864] Add support of DISQUS.

---
 pelican/themes/notmyidea/templates/article.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 5c865348..93491aca 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -20,6 +20,21 @@
         </footer><!-- /.post-info -->
         {{ article.content }}
         </div><!-- /.entry-content -->
+        {% if DISQUS_SITENAME %}
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "{{ article.url }}";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        {% endif %}
+
 </article>
 </section>
 {% endblock %}

From c989db50c966fcd2de82dae9942b35feefb35354 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Fri, 5 Nov 2010 00:22:03 +0000
Subject: [PATCH 0021/2864] Refactoring, again.

Separate Generator and Processors. Place clear for upcoming changes about pages
only websites powered by pelican !
---
 bin/pelican           |  21 ++--
 pelican/contents.py   |  10 ++
 pelican/generators.py | 216 +++++-------------------------------------
 pelican/processors.py | 125 ++++++++++++++++++++++++
 pelican/utils.py      |  22 +++++
 5 files changed, 189 insertions(+), 205 deletions(-)
 create mode 100644 pelican/processors.py

diff --git a/bin/pelican b/bin/pelican
index 540a1acc..b802946e 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -1,7 +1,10 @@
 #!/usr/bin/env python
 import argparse
 
-from pelican.generators import ArticlesGenerator, PagesGenerator
+from pelican.utils import clean_output_dir
+from pelican.generators import Generator
+from pelican.processors import (ArticlesProcessor, PagesProcessor, 
+                                StaticProcessor)
 
 parser = argparse.ArgumentParser(description="""A tool to generate a
 static blog, with restructured text input files.""")
@@ -23,16 +26,10 @@ parser.add_argument('-s', '--settings', dest='settings',
 
 if __name__ == '__main__':
     args = parser.parse_args()
+    markup = [a.split()[0] for a in args.markup.split(',')]
 
-    articles = ArticlesGenerator(args.settings)
-    pages = PagesGenerator(args.settings)
-    context = {}
-    
-    for gen in articles, pages:
-        markup = [a.split()[0] for a in args.markup.split(',')]
-        context.update(gen.create_context(args.path, args.theme, args.output,
-                       markup))
-
-    for gen in articles, pages:
-        gen.generate(context)
+    generator = Generator(args.settings, args.path, args.theme, 
+                          args.output, markup)
+    clean_output_dir(args.output)
+    generator.run([ArticlesProcessor, PagesProcessor, StaticProcessor])
     print "Enjoy !"
diff --git a/pelican/contents.py b/pelican/contents.py
index bd52d57b..13d8d320 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -40,3 +40,13 @@ class Article(Page):
 
 class Quote(Page):
     base_properties = ('author', 'date')
+
+
+def is_valid_content(content, f):
+    try:
+        content.check_properties()
+        return True
+    except NameError as e:
+        print u" [info] Skipping %s: impossible to find informations about '%s'" % (f, e)
+        return False
+    
diff --git a/pelican/generators.py b/pelican/generators.py
index 503e4506..89da9cc5 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,54 +1,50 @@
 # -*- coding: utf-8 -*-
 import os
-import shutil
 from codecs import open
-from operator import attrgetter
 
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
 from feedgenerator import Atom1Feed
 
-from pelican.utils import update_dict
 from pelican.settings import read_settings
-from pelican.contents import Article, Page
-from pelican.readers import read_file
-
-## Constants ##########################################################
 
 _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
               'archives', 'page')
 
-_DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
-
 
 class Generator(object):
     """Base class generator"""
     
-    def __init__(self, settings):
-        self.settings = read_settings(settings)
-    
-    def _init_params(self, path=None, theme=None, output_path=None, 
+    def __init__(self, settings=None, path=None, theme=None, output_path=None, 
         markup=None):
-        """Initialize parameters for this object.
-
-        :param path: the path where to find the files to parse
-        :param theme: where to search for templates
-        :param output_path: where to output the generated files
-        :param settings: the settings file to use
-        :param markup: the markup of the files to read. It's a list.
-        """
-        # get the settings
+        if settings is None:
+            settings = {}
+        self.settings = read_settings(settings)
         self.path = path or self.settings['PATH']
         self.theme = theme or self.settings['THEME']
         output_path = output_path or self.settings['OUTPUT_PATH']
         self.output_path = os.path.realpath(output_path)
         self.markup = markup or self.settings['MARKUP']
 
+        if 'SITEURL' not in self.settings:
+            self.settings['SITEURL'] = self.output_path
+
         # get the list of files to parse
         if not path:
             raise Exception('you need to specify a path to search the docs on !')
 
-    def generate_feed(self, elements, context, output_path=None, filename=None):
+    def run(self, processors):
+        context = self.settings.copy()
+        processors = [p() for p in processors]
+
+        for p in processors:
+            if hasattr(p, 'preprocess'):
+                p.preprocess(context, self)
+
+        for p in processors:
+            p.process(context, self)
+
+    def generate_feed(self, elements, context, filename=None):
         """Generate a feed with the list of articles provided
 
         Return the feed. If no output_path or filename is specified, just return
@@ -72,8 +68,8 @@ class Generator(object):
                 author_name=getattr(element, 'author', 'John Doe'),
                 pubdate=element.date)
 
-        if output_path and filename:
-            complete_path = os.path.join(output_path, filename)
+        if filename:
+            complete_path = os.path.join(self.output_path, filename)
             try:
                 os.makedirs(os.path.dirname(complete_path))
             except Exception:
@@ -105,12 +101,12 @@ class Generator(object):
             f.write(output)
         print u' [ok] writing %s' % filename
 
-    def get_templates(self, path=None):
+    def get_templates(self):
         """Return the templates to use.
 
         :param path: the path to load the templates from
         """
-        path = os.path.expanduser(os.path.join(path, 'templates'))
+        path = os.path.expanduser(os.path.join(self.theme, 'templates'))
         env = Environment(loader=FileSystemLoader(path))
         templates = {}
         for template in _TEMPLATES:
@@ -121,32 +117,6 @@ class Generator(object):
                     template, path))
         return templates
 
-    def clean_output_dir(self):
-        """Remove all the files from the output directory"""
-
-        # remove all the existing content from the output folder
-        try:
-            shutil.rmtree(os.path.join(self.output_path))
-        except:
-            pass
-
-    def _get_context(self, items):
-        """Return the context to be used in templates"""
-
-        # create a new context only if none currently exists.
-        if not hasattr(self, "context"):
-            context = self.settings.copy()
-        else:
-            context = self.context
-
-        # put all we need in the context, to generate the output
-        for item in items:
-            value = getattr(self, item)
-            if hasattr(value, 'items'):
-                value = value.items()
-            context[item] = value
-        return context
-
     def get_files(self, path, exclude=[]):
         """Return the files to use to use in this generator
 
@@ -161,143 +131,3 @@ class Generator(object):
             files.extend([os.sep.join((root, f)) for f in temp_files
                 if True in [f.endswith(markup) for markup in self.markup]])
         return files
-
-    def is_valid_content(self, content, f):
-        try:
-            content.check_properties()
-            return True
-        except NameError as e:
-            print u" [info] Skipping %s: impossible to find informations about '%s'" % (f, e)
-            return False
-    
-
-class ArticlesGenerator(Generator):
-
-    def __init__(self, settings=None):
-        super(ArticlesGenerator, self).__init__(settings)
-        self.articles = [] 
-        self.dates = {}
-        self.years = {}
-        self.tags = {}
-        self.categories = {} 
-        
-    def process_files(self, files):
-        """Process all the files and build the lists and dicts of
-        articles/categories/etc.
-        """
-        for f in files:
-            content, metadatas = read_file(f)
-            if 'category' not in metadatas.keys():
-                category = os.path.dirname(f).replace(
-                    os.path.expanduser(self.path)+'/', '')
-
-                if category != '':
-                    metadatas['category'] = unicode(category)
-
-            article = Article(content, metadatas, settings=self.settings)
-            if not self.is_valid_content(article, f):
-                continue
-
-            update_dict(self.dates, article.date.strftime('%Y-%m-%d'), article)
-            update_dict(self.years, article.date.year, article)
-            update_dict(self.categories, article.category, article)
-            if hasattr(article, 'tags'):
-                for tag in article.tags:
-                    update_dict(self.tags, tag, article)
-            self.articles.append(article)
-
-    def generate_feeds(self, context):
-        """Generate the feeds from the current context, and output files.""" 
-
-        if 'SITEURL' not in context:
-            context['SITEURL'] = self.output_path
-
-        self.generate_feed(self.articles, context, self.output_path, 
-            context['FEED'])
-
-        for cat, arts in self.categories.items():
-            arts.sort(key=attrgetter('date'), reverse=True)
-            self.generate_feed(arts, context, self.output_path,
-                context['CATEGORY_FEED'] % cat)
-
-    def generate_pages(self, context):
-        """Generate the pages on the disk"""
-
-        templates = self.get_templates(self.theme)
-        generate = self.generate_file
-        for template in _DIRECT_TEMPLATES:
-            generate('%s.html' % template, templates[template], context, blog=True)
-        for tag in self.tags:
-            generate('tag/%s.html' % tag, templates['tag'], context, tag=tag)
-        for cat in self.categories:
-            generate('category/%s.html' % cat, templates['category'], context,
-                          category=cat, articles=self.categories[cat])
-        for article in self.articles:
-            generate('%s' % article.url,
-                          templates['article'], context, article=article,
-                          category=article.category)
-
-    def generate_static_content(self):
-        """copy static paths to output"""
-        
-        for path in self.settings['STATIC_PATHS']:
-            try:
-                fromp = os.path.expanduser(os.path.join(self.theme, path))
-                to = os.path.expanduser(os.path.join(self.output_path, path))
-                shutil.copytree(fromp, to)
-                print u' [ok] copying %s' % fromp
-
-            except OSError:
-                pass
-
-    def create_context(self, path=None, theme=None, output_path=None, 
-        markup=None):
-        self._init_params(path, theme, output_path, markup)
-
-        # build the list of articles / categories / etc.
-        self.process_files(self.get_files(path, ['pages',]))
-
-        # sort the articles by date
-        self.articles.sort(key=attrgetter('date'), reverse=True)
-        # and generate the output :)
-        return self._get_context(('articles', 'dates', 'years', 'tags', 
-                                  'categories'))
-
-    def generate(self, context):
-        self.generate_feeds(context)
-        self.generate_pages(context)
-        self.generate_static_content()
-
-
-class PagesGenerator(Generator):
-    """Generate pages"""
-
-    def __init__(self, settings=None):
-        super(PagesGenerator, self).__init__(settings)
-        self.pages = []
-
-    def process_files(self, files):
-        """Process all the files and build the lists and dicts of
-        articles/categories/etc.
-        """
-        for f in files:
-            content, metadatas = read_file(f)
-            page = Page(content, metadatas, settings=self.settings)
-            if not self.is_valid_content(page, f):
-                continue
-            self.pages.append(page)
-        
-    def generate_pages(self, context):
-        templates = self.get_templates(self.theme)
-        for page in self.pages:
-            self.generate_file('pages/%s' % page.url, 
-                               templates['page'], context, page=page)
-        
-    def create_context(self, path=None, theme=None, output_path=None, 
-        markup=None):
-        self._init_params(path, theme, output_path, markup)
-        self.process_files(self.get_files(os.sep.join((path, 'pages'))))
-        return self._get_context(('pages',))
-
-    def generate(self, context):
-        self.generate_pages(context)
diff --git a/pelican/processors.py b/pelican/processors.py
new file mode 100644
index 00000000..564978cc
--- /dev/null
+++ b/pelican/processors.py
@@ -0,0 +1,125 @@
+from operator import attrgetter
+import os
+
+from pelican.utils import update_dict, copytree
+from pelican.contents import Article, Page, is_valid_content
+from pelican.readers import read_file
+
+_DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
+
+
+class Processor(object):
+
+    def _update_context(self, context, items):
+        """Update the context with the given items from the currrent 
+        processor.
+        """
+        for item in items:
+            value = getattr(self, item)
+            if hasattr(value, 'items'):
+                value = value.items()
+            context[item] = value
+
+
+class ArticlesProcessor(Processor):
+
+    def __init__(self, settings=None):
+        self.articles = [] 
+        self.dates = {}
+        self.years = {}
+        self.tags = {}
+        self.categories = {} 
+        
+    def generate_feeds(self, context, generator):
+        """Generate the feeds from the current context, and output files.""" 
+
+        generator.generate_feed(self.articles, context, context['FEED'])
+
+        for cat, arts in self.categories.items():
+            arts.sort(key=attrgetter('date'), reverse=True)
+            generator.generate_feed(arts, context, 
+                                    context['CATEGORY_FEED'] % cat)
+
+    def generate_pages(self, context, generator):
+        """Generate the pages on the disk"""
+
+        templates = generator.get_templates()
+        generate = generator.generate_file
+        for template in _DIRECT_TEMPLATES:
+            generate('%s.html' % template, templates[template], context, blog=True)
+        for tag in self.tags:
+            generate('tag/%s.html' % tag, templates['tag'], context, tag=tag)
+        for cat in self.categories:
+            generate('category/%s.html' % cat, templates['category'], context,
+                          category=cat, articles=self.categories[cat])
+        for article in self.articles:
+            generate('%s' % article.url,
+                          templates['article'], context, article=article,
+                          category=article.category)
+
+    def preprocess(self, context, generator):
+
+        # build the list of articles / categories / etc.
+        files = generator.get_files(generator.path, exclude=['pages',])
+        for f in files:
+            content, metadatas = read_file(f)
+            if 'category' not in metadatas.keys():
+                category = os.path.dirname(f).replace(
+                    os.path.expanduser(generator.path)+'/', '')
+
+                if category != '':
+                    metadatas['category'] = unicode(category)
+
+            article = Article(content, metadatas, settings=generator.settings)
+            if not is_valid_content(article, f):
+                continue
+
+            update_dict(self.dates, article.date.strftime('%Y-%m-%d'), article)
+            update_dict(self.years, article.date.year, article)
+            update_dict(self.categories, article.category, article)
+            if hasattr(article, 'tags'):
+                for tag in article.tags:
+                    update_dict(self.tags, tag, article)
+            self.articles.append(article)
+
+        # sort the articles by date
+        self.articles.sort(key=attrgetter('date'), reverse=True)
+        # and generate the output :)
+        self._update_context(context, ('articles', 'dates', 'years', 
+                                       'tags', 'categories'))
+
+    def process(self, context, generator):
+        self.generate_feeds(context, generator)
+        self.generate_pages(context, generator)
+
+
+class PagesProcessor(Processor):
+    """Generate pages"""
+
+    def __init__(self):
+        self.pages = []
+
+    def preprocess(self, context, generator):
+        for f in generator.get_files(os.sep.join((generator.path, 'pages'))):
+            content, metadatas = read_file(f)
+            page = Page(content, metadatas, settings=generator.settings)
+            if not is_valid_content(page, f):
+                continue
+            self.pages.append(page)
+        
+    def process(self, context, generator):
+        templates = generator.get_templates()
+        for page in self.pages:
+            generator.generate_file('pages/%s' % page.url, 
+                               templates['page'], context, page=page)
+        self._update_context(context, ('pages',))
+
+
+class StaticProcessor(Processor):
+    """copy static paths to output"""
+
+    def process(self, context, generator):
+        for path in generator.settings['STATIC_PATHS']:
+            copytree(path, generator.theme, generator.output_path)
+        copytree('pics', generator.path, generator.output_path)
+
diff --git a/pelican/utils.py b/pelican/utils.py
index 1f7b0c4b..1bcc8604 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import re
+import os
+import shutil
 from datetime import datetime
 from codecs import open as _open
 
@@ -48,6 +50,26 @@ def slugify(value):
     value = unicode(re.sub('[^\w\s-]', '', value).strip().lower())
     return re.sub('[-\s]+', '-', value)
 
+def copytree(path, origin, destination):
+    """Copy path from origin to destination, silent any errors"""
+
+    try:
+        fromp = os.path.expanduser(os.path.join(origin, path))
+        to = os.path.expanduser(os.path.join(destination, path))
+        shutil.copytree(fromp, to)
+        print u' [ok] copying %s' % fromp
+
+    except OSError:
+        pass
+
+def clean_output_dir(path):
+    """Remove all the files from the output directory"""
+
+    # remove all the existing content from the output folder
+    try:
+        shutil.rmtree(path)
+    except Exception as e:
+        pass
 
 def truncate_html_words(s, num, end_text='...'):
     """Truncates HTML to a certain number of words (not counting tags and

From f7cbef6393095ed85c327484616d209a6e2e01fb Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Fri, 5 Nov 2010 02:05:00 +0000
Subject: [PATCH 0022/2864] Add static pages listing and options.

---
 pelican/processors.py                         | 2 ++
 pelican/settings.py                           | 1 +
 pelican/themes/notmyidea/templates/base.html  | 6 ++++--
 pelican/themes/notmyidea/templates/index.html | 9 +++++++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pelican/processors.py b/pelican/processors.py
index 564978cc..c23af3f5 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -106,6 +106,8 @@ class PagesProcessor(Processor):
             if not is_valid_content(page, f):
                 continue
             self.pages.append(page)
+
+        context['PAGES'] = self.pages
         
     def process(self, context, generator):
         templates = generator.get_templates()
diff --git a/pelican/settings.py b/pelican/settings.py
index 814850f8..6c5449d1 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -10,6 +10,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'FEED': 'feeds/all.atom.xml',
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
                    'SITENAME': 'A Pelican Blog',
+                   'DISPLAY_PAGES_ON_MENU': True,
                   }
 
 def read_settings(filename):
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index f6387ac7..b5a845b3 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -30,9 +30,11 @@
                 {% for title, link in MENUITEMS %}
                     <li><a href="{{ link }}">{{ title }}</a></li>
                 {% endfor %}
-                {% for title, link in PAGES %}
-                    <li><a href="{{ SITEURL }}/{{ link }}">{{ title }}</a></li>
+                {% if DISPLAY_PAGES_ON_MENU %}
+                {% for page in PAGES %}
+                    <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
                 {% endfor %}
+                {% endif %}
                 {% for cat, null in categories %}
                     <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
                 {% endfor %}
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index e4260302..8ed9fe37 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block content %}        
 {% block content_title %}{% endblock %}
+{% if articles %}
 {% for article in articles %}        
     {% if loop.index == 1 %}
         <aside id="featured" class="body"><article>
@@ -49,4 +50,12 @@
 {% endfor %}
 </ol><!-- /#posts-list -->
 </section><!-- /#content -->
+{% else %}
+<section id="content" class="body">    
+<h2>Pages</h2>
+{% for page in PAGES %}
+    <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
+{% endfor %}
+</section>
+{% endif %}
 {% endblock content %}

From 93c46b7519ebecf9e577890585de69c06880ef3a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 6 Nov 2010 02:03:32 +0000
Subject: [PATCH 0023/2864] Adding pdf support.

---
 bin/pelican           |  5 +++--
 pelican/contents.py   | 12 +++++++++---
 pelican/processors.py | 32 ++++++++++++++++++++++++++++++--
 setup.py              |  5 +++--
 4 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/bin/pelican b/bin/pelican
index b802946e..533de87e 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -4,7 +4,7 @@ import argparse
 from pelican.utils import clean_output_dir
 from pelican.generators import Generator
 from pelican.processors import (ArticlesProcessor, PagesProcessor, 
-                                StaticProcessor)
+                                StaticProcessor, PdfProcessor)
 
 parser = argparse.ArgumentParser(description="""A tool to generate a
 static blog, with restructured text input files.""")
@@ -31,5 +31,6 @@ if __name__ == '__main__':
     generator = Generator(args.settings, args.path, args.theme, 
                           args.output, markup)
     clean_output_dir(args.output)
-    generator.run([ArticlesProcessor, PagesProcessor, StaticProcessor])
+    generator.run([ArticlesProcessor, PagesProcessor, StaticProcessor,
+                   PdfProcessor])
     print "Enjoy !"
diff --git a/pelican/contents.py b/pelican/contents.py
index 13d8d320..91cac20d 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -10,7 +10,7 @@ class Page(object):
     """
     mandatory_properties = ('title',)
 
-    def __init__(self, content, metadatas={}, settings={}):
+    def __init__(self, content, metadatas={}, settings={}, filename=None):
         self.content = content
         for key, value in metadatas.items():
             setattr(self, key, value)
@@ -19,6 +19,9 @@ class Page(object):
             if 'AUTHOR' in settings:
                 self.author = settings['AUTHOR']
 
+        if filename:
+            self.filename = filename
+
     def check_properties(self):
         """test that each mandatory property is set."""
         for prop in self.mandatory_properties:
@@ -27,7 +30,11 @@ class Page(object):
 
     @property
     def url(self):
-        return '%s.html' % slugify(self.title)
+        return '%s.html' % self.slug
+
+    @property
+    def slug(self):
+        return slugify(self.title)
 
     @property
     def summary(self):
@@ -49,4 +56,3 @@ def is_valid_content(content, f):
     except NameError as e:
         print u" [info] Skipping %s: impossible to find informations about '%s'" % (f, e)
         return False
-    
diff --git a/pelican/processors.py b/pelican/processors.py
index c23af3f5..b532ead1 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -1,6 +1,8 @@
 from operator import attrgetter
 import os
 
+from rst2pdf.createpdf import RstToPdf
+
 from pelican.utils import update_dict, copytree
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
@@ -70,7 +72,8 @@ class ArticlesProcessor(Processor):
                 if category != '':
                     metadatas['category'] = unicode(category)
 
-            article = Article(content, metadatas, settings=generator.settings)
+            article = Article(content, metadatas, settings=generator.settings,
+                              filename=f)
             if not is_valid_content(article, f):
                 continue
 
@@ -102,7 +105,8 @@ class PagesProcessor(Processor):
     def preprocess(self, context, generator):
         for f in generator.get_files(os.sep.join((generator.path, 'pages'))):
             content, metadatas = read_file(f)
-            page = Page(content, metadatas, settings=generator.settings)
+            page = Page(content, metadatas, settings=generator.settings,
+                        filename=f)
             if not is_valid_content(page, f):
                 continue
             self.pages.append(page)
@@ -125,3 +129,27 @@ class StaticProcessor(Processor):
             copytree(path, generator.theme, generator.output_path)
         copytree('pics', generator.path, generator.output_path)
 
+
+class PdfProcessor(Processor):
+    """Generate PDFs on the output dir, for all articles and pages coming from
+    rst"""
+
+    def _create_pdf(self, creator, obj, output_path):
+        if obj.filename.endswith(".rst"):
+            creator.createPdf(text=open(obj.filename).read(),
+                output=os.path.join(output_path, "%s.pdf" % obj.slug))
+
+    def process(self, context, generator):
+        pdf_path = os.path.join(generator.output_path, 'pdf')
+        try:
+            os.mkdir(pdf_path)
+        except OSError:
+            pass
+
+        pdfcreator = RstToPdf(breakside=0, stylesheets=['twelvepoint'])
+
+        for article in context['articles']:
+            self._create_pdf(pdfcreator, article, pdf_path)
+
+        for page in context['pages']:
+            self._create_pdf(pdfcreator, page, pdf_path)
diff --git a/setup.py b/setup.py
index a1adc622..80d50568 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,14 @@
 from setuptools import setup
 import sys
 
-requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown']
+requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown',
+            'rst2pdf']
 if sys.version_info < (2,7):
     requires.append('argparse')
 
 setup(
     name = "pelican",
-    version = '2.3',
+    version = '2.4',
     url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From abbe52f9ef2d526b957968cca320a822f7ac6b1e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 6 Nov 2010 02:03:55 +0000
Subject: [PATCH 0024/2864] Added tag 2.4 for changeset f9c1d9408150

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 7e9d67a8..29a19c51 100644
--- a/.hgtags
+++ b/.hgtags
@@ -13,3 +13,4 @@ bf14d1a5c1fae9475447698f0f9b8d35c551f732 2.1
 da86343ebd543e5865050e47ecb0937755528d13 2.1.1
 760187f048bb23979402f950ecb5d3c5493995b1 2.2
 20aa16fe4daa3b70f6c063f170edc916b49837ed 2.3
+f9c1d94081504f21f5b2ba147a38099e45db1769 2.4

From 56ee6eb4a0f4220c9828d11aa787670cef074cb2 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 6 Nov 2010 02:07:57 +0000
Subject: [PATCH 0025/2864] Don't activate Pdf output by default.

---
 bin/pelican | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/pelican b/bin/pelican
index 533de87e..5de1da29 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -31,6 +31,5 @@ if __name__ == '__main__':
     generator = Generator(args.settings, args.path, args.theme, 
                           args.output, markup)
     clean_output_dir(args.output)
-    generator.run([ArticlesProcessor, PagesProcessor, StaticProcessor,
-                   PdfProcessor])
+    generator.run([ArticlesProcessor, PagesProcessor, StaticProcessor])
     print "Enjoy !"

From 2307fa15bdaec46d22724f435a334b65996eb889 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 6 Nov 2010 02:08:05 +0000
Subject: [PATCH 0026/2864] Added tag 2.4.1 for changeset e65199a0b270

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 29a19c51..dee81346 100644
--- a/.hgtags
+++ b/.hgtags
@@ -14,3 +14,4 @@ da86343ebd543e5865050e47ecb0937755528d13 2.1.1
 760187f048bb23979402f950ecb5d3c5493995b1 2.2
 20aa16fe4daa3b70f6c063f170edc916b49837ed 2.3
 f9c1d94081504f21f5b2ba147a38099e45db1769 2.4
+e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1

From 66b4b26274ab9a39fb2104bdb9ce6d804082194e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 6 Nov 2010 02:08:26 +0000
Subject: [PATCH 0027/2864] Update setup.py

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 80d50568..bf64c6c6 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.4',
+    version = '2.4.1',
     url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From b7179548c3e3c0fd4ee2bd18cee3450f716c0a02 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 6 Nov 2010 02:24:04 +0000
Subject: [PATCH 0028/2864] Added tag 2.4.2 for changeset 89dbd7b6f114

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index dee81346..1f8fe1c4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -15,3 +15,4 @@ da86343ebd543e5865050e47ecb0937755528d13 2.1.1
 20aa16fe4daa3b70f6c063f170edc916b49837ed 2.3
 f9c1d94081504f21f5b2ba147a38099e45db1769 2.4
 e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1
+89dbd7b6f114508eae62fc821326f4797dfc8b23 2.4.2

From efc6bb7aa48ce8363824444cfbf80984bdc43e81 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 6 Nov 2010 02:25:47 +0000
Subject: [PATCH 0029/2864] Add a settings for PDF generation.

---
 bin/pelican         | 7 ++++++-
 pelican/settings.py | 1 +
 setup.py            | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/pelican b/bin/pelican
index 5de1da29..8c364bc9 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -31,5 +31,10 @@ if __name__ == '__main__':
     generator = Generator(args.settings, args.path, args.theme, 
                           args.output, markup)
     clean_output_dir(args.output)
-    generator.run([ArticlesProcessor, PagesProcessor, StaticProcessor])
+
+    processors = [ArticlesProcessor, PagesProcessor, StaticProcessor]
+    if generator.settings['PDF_PROCESSOR']:
+        processors.append(PdfProcessor)
+
+    generator.run(processors)
     print "Enjoy !"
diff --git a/pelican/settings.py b/pelican/settings.py
index 6c5449d1..3c97bd42 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -11,6 +11,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
                    'SITENAME': 'A Pelican Blog',
                    'DISPLAY_PAGES_ON_MENU': True,
+                   'PDF_PROCESSOR': False,
                   }
 
 def read_settings(filename):
diff --git a/setup.py b/setup.py
index bf64c6c6..dba98f2b 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.4.1',
+    version = '2.4.2',
     url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From d0b034db0ad8399862abc1d3b5af1f45c1ca4dcb Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 6 Nov 2010 02:40:10 +0000
Subject: [PATCH 0030/2864] Add PDF to the templates.

---
 pelican/themes/notmyidea/css/main.css           | 4 ++++
 pelican/themes/notmyidea/templates/article.html | 2 +-
 pelican/themes/notmyidea/templates/index.html   | 7 +++++--
 pelican/themes/notmyidea/templates/page.html    | 2 ++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pelican/themes/notmyidea/css/main.css b/pelican/themes/notmyidea/css/main.css
index 591df44e..7116ab5c 100644
--- a/pelican/themes/notmyidea/css/main.css
+++ b/pelican/themes/notmyidea/css/main.css
@@ -89,6 +89,10 @@ ol {
     padding:5px;
 }
 
+.post-info p{
+    margin-bottom: 1px;
+}
+
 .readmore { float: right }
 
 dl {margin: 0 0 1.5em 0;}
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 93491aca..5e3d37ca 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -16,7 +16,7 @@
                         By <a class="url fn" href="#">{{ article.author }}</a>
                 </address>
                 {% endif %}
-                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
+                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
         </footer><!-- /.post-info -->
         {{ article.content }}
         </div><!-- /.entry-content -->
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 8ed9fe37..57f0b22f 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -16,7 +16,8 @@
                         <address class="vcard author">
                                 By <a class="url fn" href="#">{{ article.author }}</a>
                         </address>
-                        {% endif %}<p> In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
+                        {% endif %}
+                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
                 </footer><!-- /.post-info -->
                 {{ article.content }}
         </article></aside><!-- /#featured -->
@@ -40,7 +41,9 @@
 
                         <address class="vcard author">
                                 By <a class="url fn" href="#">{{ article.author }}</a>
-                        </address>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
+                        </address>
+                        <p> In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
+                    <p>{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">pdf</a>{% endif %}</p>
                 </footer><!-- /.post-info -->
                 {{ article.summary }}
                 <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
diff --git a/pelican/themes/notmyidea/templates/page.html b/pelican/themes/notmyidea/templates/page.html
index 44aaf25d..9635fb8d 100644
--- a/pelican/themes/notmyidea/templates/page.html
+++ b/pelican/themes/notmyidea/templates/page.html
@@ -3,6 +3,8 @@
 {% block content %}        
 <section id="content" class="body">    
     <h1 class="entry-title">{{ page.title }}</h1>
+    {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
+    the pdf</a>{% endif %}
     {{ page.content }}
 </section>
 {% endblock %}

From e8ae29dfbf33f92bd9821326eeb8a53b4dd52505 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 6 Nov 2010 02:40:37 +0000
Subject: [PATCH 0031/2864] setup.py

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index dba98f2b..13a67957 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.4.2',
+    version = '2.4.3',
     url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From 94d0505d0ce1c299bbd4204853b6055794a22242 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 6 Nov 2010 02:41:07 +0000
Subject: [PATCH 0032/2864] Added tag 2.4.3 for changeset 979b4473af56

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1f8fe1c4..383a3f9d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -16,3 +16,4 @@ da86343ebd543e5865050e47ecb0937755528d13 2.1.1
 f9c1d94081504f21f5b2ba147a38099e45db1769 2.4
 e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1
 89dbd7b6f114508eae62fc821326f4797dfc8b23 2.4.2
+979b4473af56a191a278c83058bc9c8fa1fde30e 2.4.3

From 27ee2cf4e666b3bda72c2e555c096c84a593ddd6 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 7 Nov 2010 14:04:11 +0000
Subject: [PATCH 0033/2864] Add a import script I've used to convert from a
 wordpress xml file.

---
 tools/wp2pelican.py | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100755 tools/wp2pelican.py

diff --git a/tools/wp2pelican.py b/tools/wp2pelican.py
new file mode 100755
index 00000000..55af44ab
--- /dev/null
+++ b/tools/wp2pelican.py
@@ -0,0 +1,34 @@
+#! /usr/bin/env python
+
+from BeautifulSoup import BeautifulStoneSoup
+from codecs import open
+import os
+import argparse
+
+def wp2html(xml):
+    xmlfile = open(xml, encoding='utf-8').read()
+    soup = BeautifulStoneSoup(xmlfile)
+    items = soup.rss.channel.findAll('item')
+
+    for item in items:
+        if item.fetch('wp:status')[0].contents[0] == "publish":
+            title = item.title.contents[0]
+            content = item.fetch('content:encoded')[0].contents[0]
+            filename = item.fetch('wp:post_name')[0].contents[0]
+            yield (title, content, filename)
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description="""Transform a wordpress xml export into rst files """)
+
+    parser.add_argument(dest='xml', help='The xml filepath')
+    parser.add_argument('-o', '--output', dest='output', default='output', help='Output path')
+    args = parser.parse_args() 
+
+    for title, content, filename in wp2html(args.xml): 
+        html_filename = os.path.join(args.output, filename+'.html')
+        rst_filename = os.path.join(args.output, filename+'.rst')
+
+        with open(html_filename, 'w', encoding='utf-8') as fp:
+            fp.write(content)
+        os.system('pandoc --from=html --to=rst -o %s %s' % (rst_filename,
+            html_filename))

From aa30ca92560362b5bcb1ac85994a37e3e84d8e53 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 7 Nov 2010 14:13:20 +0000
Subject: [PATCH 0034/2864] Add a features list on the README. Remove the
 dependency to rst2pdf by default.

---
 README.rst | 12 ++++++++++++
 setup.py   |  3 +--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index b767145f..3b57b17b 100644
--- a/README.rst
+++ b/README.rst
@@ -39,6 +39,18 @@ Note that only the `date` metadata is mandatory, so you just have to add that in
 your files. The category can also be determined by the directory where the rst file
 is. For instance, the category of `python/foobar/myfoobar.rst` is `foobar`.
 
+Features
+--------
+
+Pelican currently supports:
+
+* blog articles
+* comments, via an external service (disqus). Please notice that while 
+  it's useful, it's an external service, and you'll not manage the 
+  comments by yourself. It could potentially eat your data.
+* theming support (themes are done using `jinja2 <http://jinjna.pocoo.org>`_)
+* PDF generation of the articles/pages (optional).
+
 Getting started — Generate your blog
 -------------------------------------
 
diff --git a/setup.py b/setup.py
index 13a67957..e5deb946 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,7 @@
 from setuptools import setup
 import sys
 
-requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown',
-            'rst2pdf']
+requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown']
 if sys.version_info < (2,7):
     requires.append('argparse')
 

From 101d171bf794f0e4c06a0cc456ef1770f6b97c10 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 7 Nov 2010 14:17:47 +0000
Subject: [PATCH 0035/2864] Add a list of dependencies to the README.

---
 README.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.rst b/README.rst
index 3b57b17b..7f738388 100644
--- a/README.rst
+++ b/README.rst
@@ -78,6 +78,21 @@ Why the name "Pelican" ?
 
 Heh, you didnt noticed? "Pelican" is an anagram for "Calepin" ;)
 
+Dependencies
+------------
+
+At this time, pelican is dependent of the following python packages:
+
+* feedgenerator, to generate the ATOM feeds.
+* jinja2, for templating support.
+* pygments, to have syntactic colorization
+* docutils and Markdown
+
+If you're not using python 2.7, you will also need `argparse`.
+
+All those dependencies will be processed automaticaly if you install pelican
+using setuptools/distribute or pip.
+
 Source code
 -----------
 

From 29395965b60861111258f5fdc6db9226f6dcb156 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 7 Nov 2010 14:35:10 +0000
Subject: [PATCH 0036/2864] Fallback to default category if no category is
 detected (for articles)

---
 pelican/processors.py | 3 +++
 pelican/settings.py   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pelican/processors.py b/pelican/processors.py
index b532ead1..323be16d 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -69,6 +69,9 @@ class ArticlesProcessor(Processor):
                 category = os.path.dirname(f).replace(
                     os.path.expanduser(generator.path)+'/', '')
 
+                if category == generator.path:
+                    category = context['DEFAULT_CATEGORY']
+
                 if category != '':
                     metadatas['category'] = unicode(category)
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 3c97bd42..0838e856 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -12,6 +12,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'SITENAME': 'A Pelican Blog',
                    'DISPLAY_PAGES_ON_MENU': True,
                    'PDF_PROCESSOR': False,
+                   'DEFAULT_CATEGORY': 'misc',
                   }
 
 def read_settings(filename):

From 01f2912c8f545a968f83c6a2d0fd2bf1d4c1642a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 7 Nov 2010 14:36:04 +0000
Subject: [PATCH 0037/2864] bump.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e5deb946..b3acdb30 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.4.3',
+    version = '2.4.4',
     url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From 1560f177f80fefdecc266a0942eceac184a962b4 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 7 Nov 2010 14:36:12 +0000
Subject: [PATCH 0038/2864] Added tag 2.4.4 for changeset 26a444fbb78b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 383a3f9d..ddcf911f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -17,3 +17,4 @@ f9c1d94081504f21f5b2ba147a38099e45db1769 2.4
 e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1
 89dbd7b6f114508eae62fc821326f4797dfc8b23 2.4.2
 979b4473af56a191a278c83058bc9c8fa1fde30e 2.4.3
+26a444fbb78becae358afa0a5b47587db8739b21 2.4.4

From 97567393865f2b00f012aa295f9d90544e06f075 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 7 Nov 2010 14:40:32 +0000
Subject: [PATCH 0039/2864] update THANKS

---
 THANKS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/THANKS b/THANKS
index 0f193e7d..15cd9876 100644
--- a/THANKS
+++ b/THANKS
@@ -2,3 +2,4 @@ Some people have helped to improve pelican by contributing features, reporting
 bugs or giving ideas. Thanks to them !
 
 - Dan Jacka
+- solsTiCe on linuxfr

From b391defeb6d0a6d5fa455397391bc3eed60129af Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Mon, 8 Nov 2010 00:15:34 +0000
Subject: [PATCH 0040/2864] Fix a bug with the optional dependency to rst2pdf.

---
 pelican/processors.py | 18 ++++++++++--------
 setup.py              |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pelican/processors.py b/pelican/processors.py
index 323be16d..110aaa01 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -1,8 +1,6 @@
 from operator import attrgetter
 import os
 
-from rst2pdf.createpdf import RstToPdf
-
 from pelican.utils import update_dict, copytree
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
@@ -136,10 +134,16 @@ class StaticProcessor(Processor):
 class PdfProcessor(Processor):
     """Generate PDFs on the output dir, for all articles and pages coming from
     rst"""
+    def __init__(self):
+        try:
+            from rst2pdf.createpdf import RstToPdf
+            self.pdfcreator = RstToPdf(breakside=0, stylesheets=['twelvepoint'])
+        except ImportError:
+            raise Exception("unable to find rst2pdf")
 
-    def _create_pdf(self, creator, obj, output_path):
+    def _create_pdf(self, obj, output_path):
         if obj.filename.endswith(".rst"):
-            creator.createPdf(text=open(obj.filename).read(),
+            self.pdfcreator.createPdf(text=open(obj.filename).read(),
                 output=os.path.join(output_path, "%s.pdf" % obj.slug))
 
     def process(self, context, generator):
@@ -149,10 +153,8 @@ class PdfProcessor(Processor):
         except OSError:
             pass
 
-        pdfcreator = RstToPdf(breakside=0, stylesheets=['twelvepoint'])
-
         for article in context['articles']:
-            self._create_pdf(pdfcreator, article, pdf_path)
+            self._create_pdf(article, pdf_path)
 
         for page in context['pages']:
-            self._create_pdf(pdfcreator, page, pdf_path)
+            self._create_pdf(page, pdf_path)
diff --git a/setup.py b/setup.py
index b3acdb30..0faaa84a 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.4.4',
+    version = '2.4.5',
     url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From 5a9dbcab1c31f6cef59e78e2b22e10d43bd0dfd5 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Mon, 8 Nov 2010 00:15:49 +0000
Subject: [PATCH 0041/2864] Added tag 2.4.5 for changeset 3542b65fd196

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ddcf911f..174c6504 100644
--- a/.hgtags
+++ b/.hgtags
@@ -18,3 +18,4 @@ e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1
 89dbd7b6f114508eae62fc821326f4797dfc8b23 2.4.2
 979b4473af56a191a278c83058bc9c8fa1fde30e 2.4.3
 26a444fbb78becae358afa0a5b47587db8739b21 2.4.4
+3542b65fd1963ae7065b6a3bc912fbb6c150e98c 2.4.5

From 35dc0bf34c266a40d931d722b3f9cca3cd4c93f9 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Mon, 8 Nov 2010 01:26:45 +0000
Subject: [PATCH 0042/2864] Add a new theme "martyalchin", based on
 http://martyalchin.com

---
 bin/pelican                                   |   2 +-
 pelican/generators.py                         |  13 +-
 pelican/themes/martyalchin/css/style.css      | 404 ++++++++++++++++++
 .../martyalchin/templates/archives.html       |   0
 .../themes/martyalchin/templates/article.html |  13 +
 .../themes/martyalchin/templates/base.html    |  15 +
 .../martyalchin/templates/categories.html     |   0
 .../martyalchin/templates/category.html       |   9 +
 .../themes/martyalchin/templates/index.html   |  10 +
 .../themes/martyalchin/templates/page.html    |   7 +
 pelican/themes/martyalchin/templates/tag.html |   0
 .../themes/martyalchin/templates/tags.html    |   0
 12 files changed, 468 insertions(+), 5 deletions(-)
 create mode 100644 pelican/themes/martyalchin/css/style.css
 create mode 100644 pelican/themes/martyalchin/templates/archives.html
 create mode 100644 pelican/themes/martyalchin/templates/article.html
 create mode 100644 pelican/themes/martyalchin/templates/base.html
 create mode 100644 pelican/themes/martyalchin/templates/categories.html
 create mode 100644 pelican/themes/martyalchin/templates/category.html
 create mode 100644 pelican/themes/martyalchin/templates/index.html
 create mode 100644 pelican/themes/martyalchin/templates/page.html
 create mode 100644 pelican/themes/martyalchin/templates/tag.html
 create mode 100644 pelican/themes/martyalchin/templates/tags.html

diff --git a/bin/pelican b/bin/pelican
index 8c364bc9..4577139b 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -30,7 +30,7 @@ if __name__ == '__main__':
 
     generator = Generator(args.settings, args.path, args.theme, 
                           args.output, markup)
-    clean_output_dir(args.output)
+    clean_output_dir(generator.output_path)
 
     processors = [ArticlesProcessor, PagesProcessor, StaticProcessor]
     if generator.settings['PDF_PROCESSOR']:
diff --git a/pelican/generators.py b/pelican/generators.py
index 89da9cc5..b2643a6e 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -26,6 +26,14 @@ class Generator(object):
         self.output_path = os.path.realpath(output_path)
         self.markup = markup or self.settings['MARKUP']
 
+        if not os.path.exists(self.theme):
+            theme_path = os.sep.join([os.path.dirname(
+                os.path.abspath(__file__)), "themes/%s" % self.theme])
+            if os.path.exists(theme_path):
+                self.theme = theme_path
+            else:
+                raise Exception("Impossible to find the theme %s" % self.theme)
+
         if 'SITEURL' not in self.settings:
             self.settings['SITEURL'] = self.output_path
 
@@ -102,10 +110,7 @@ class Generator(object):
         print u' [ok] writing %s' % filename
 
     def get_templates(self):
-        """Return the templates to use.
-
-        :param path: the path to load the templates from
-        """
+        """Return the templates to use."""
         path = os.path.expanduser(os.path.join(self.theme, 'templates'))
         env = Environment(loader=FileSystemLoader(path))
         templates = {}
diff --git a/pelican/themes/martyalchin/css/style.css b/pelican/themes/martyalchin/css/style.css
new file mode 100644
index 00000000..7ea07917
--- /dev/null
+++ b/pelican/themes/martyalchin/css/style.css
@@ -0,0 +1,404 @@
+/* Resets to avoid browser differences */
+
+body, button, div, fieldset, form, h1, h2, h3, input, label, li, p, pre, td, textarea, .typygmentdown {
+    margin: 0;
+    padding: 0;
+    text-align: justify;
+    font-family: Georgia, serif;
+    font-size: 100%;
+    line-height: 1.25;
+    letter-spacing: 0;
+    border: none;
+    background: none;
+}
+
+/* Overall page layout */
+
+body {
+    background: white;
+    color: black;
+    color: #303030;
+}
+
+@media screen {
+    body {
+        width: 700px;
+        margin: 20px auto;
+    }
+}
+
+@media print {
+    body {
+        margin: 0 2em;
+    }
+}
+
+/* Headings */
+
+h1, h2, h3, h4, h5, h6, .info, .info p {
+    font-family: Times, serif;
+    font-weight: normal;
+    page-break-inside: avoid;
+}
+
+h1 .caps, h2 .caps, h3 .caps {
+    letter-spacing: -.05em;
+}
+
+h1 {
+    font-family: Times, serif;
+    text-align: center;
+    font-size: 2.25em;
+    line-height: 1.111;
+    padding-right: 0.08em;
+    letter-spacing: -.07em;
+}
+
+h2 {
+    margin-top: 0.714em;
+    font-size: 1.75em;
+    line-height: 0.714;
+    letter-spacing: -.05em;
+}
+
+h3 {
+    margin-top: 0.926em;
+    font-size: 1.35em;
+    line-height: 0.926;
+    letter-spacing: -.03em;
+}
+
+h1 .dquo, h2 .dquo, h3 .dquo, h4 .dquo, h5 .dquo, h6 .dquo {
+    margin-left: -.4em;
+}
+
+.info, .info p {
+    text-align: center;
+    letter-spacing: -.03em;
+}
+
+.info p {
+    margin: 0;
+}
+
+.info img.g {
+    width: 24px;
+    height: 24px;
+    margin: -7px 0;
+}
+
+#home h2 a[href*="http://"] {
+    padding-right: 28px;
+    background: url("/static/link.png") right center no-repeat;
+}
+
+#home h2 a[href*="http://"]:visited {
+    padding-right: 28px;
+    background: url("/static/visited.png") right center no-repeat;
+}
+
+h2 + p.published {
+    float: right;
+    margin-top: -1.25em;
+}
+
+.copyright {
+    margin: 1.25em 0;
+}
+
+/* Page text */
+
+p, p[class] + p {
+    margin-top: 1.25em;
+    widows: 2;
+    orphans: 2;
+    text-indent: 0;
+    clear: left;
+}
+
+p + p {
+    text-indent: 1.5em;
+    margin-top: 0;
+}
+
+p ~ img {
+    display: block;
+    margin: 1.25em auto;
+}
+
+.caps {
+    letter-spacing: 0.1em;
+    font-size: 75%;
+}
+
+abbr {
+    border-bottom: 1px dotted black;
+}
+
+blockquote {
+    margin: 0 1em;
+    font-style: italic;
+    letter-spacing: -0.0625em;
+}
+
+blockquote em {
+    font-style: normal;
+    letter-spacing: 0;
+}
+
+div.image {
+    text-align: center;
+    margin: 1.25em 0;
+}
+
+img {
+    border: none;
+}
+
+
+
+.side {
+    position: absolute;
+    width: 150px;
+    height: auto;
+    margin-left: 710px;
+}
+
+.left.side {
+    margin-left: -160px;
+}
+
+.right.side {
+    margin-left: 710px;
+}
+
+@media screen {
+    h1 a, h2 a, h3 a, .info a {
+        text-decoration: none;
+    }
+
+    a:link {
+        color: #85ac40;
+    }
+
+    a:visited {
+        color: #61883b;
+    }
+
+    ::selection {
+        background: #dcff9d;
+    }
+
+    ::-moz-selection {
+        background: #e2ffaf;
+    }
+}
+
+@media print {
+    a {
+        color: inherit;
+        text-decoration: none;
+    }
+
+    abbr {
+        border-bottom: none;
+    }
+}
+
+/* Lists */
+
+ul, ol {
+    margin: 1.25em 0 1.25em -1.5em;
+    padding-left: 1.5em;
+}
+
+ul ul, ul ol, ol ol, ol ul {
+    margin: 0;
+}
+
+ul li {
+    list-style: disc;
+}
+
+li p {
+    margin: 0;
+}
+
+/* Code */
+
+pre {
+    margin-top: 1.47em;
+    font-family: Courier;
+    font-size: .85em;
+    line-height: 1.47;
+    overflow: visible;
+}
+
+code {
+    font-family: Courier;
+    font-size: .85em;
+    line-height: 1;
+}
+
+.typygmentdown .c {
+    font-style: italic;
+}
+
+.typygmentdown .k, .typygmentdown .ow {
+    color: #404040;
+}
+
+.typygmentdown .c, .typygmentdown .sd {
+    color: #808080;
+}
+
+/* Comments */
+
+#comment-list {
+    margin: 0;
+    padding: 0;
+}
+
+#comment-list li {
+    padding-bottom: 1.25em;
+}
+
+#comment-list cite {
+    font-style: normal;
+}
+
+#comment-list cite + blockquote {
+    margin-top: 0;
+}
+
+#comment-list blockquote {
+    margin: 0;
+}
+
+#comment-list p {
+    margin-top: 1.25em;
+    text-indent: 0;
+}
+
+#comment-form th {
+    width: 25%;
+}
+
+#comment-form input, #comment-form select, #comment-form textarea {
+    width: 100%;
+}
+
+@media print {
+    #comment-list, #comment-form {
+        display: none;
+    }
+}
+
+/* Friends */
+
+#friends li {
+    list-style: none;
+    margin-left: 0;
+    padding-left: 0;
+}
+
+#friends a[rel] {
+    margin-left: 20px;
+}
+
+#friends a[rel~="colleague"] {
+    background: url("/static/dj.png") left center no-repeat;
+    margin-left: 0;
+    padding-left: 20px;
+}
+
+/* Forms */
+
+form, form p {
+    text-indent: 0;
+    text-align: left;
+}
+
+from th, form td {
+    margin: 0;
+    padding: 0;
+}
+
+input, select, textarea {
+    background: white;
+    line-height: 1.5;
+}
+
+input[type="submit"], button {
+    border: 1px outset;
+    text-align: center;
+    background: #85ac40;
+    padding: .2em;
+}
+
+input[type="text"], textarea {
+    vertical-align: top;
+    border: 1px solid #e0e0e0;
+}
+
+input[type="text"], select {
+    width: 15em;
+}
+
+textarea {
+    width: 45em;
+    height: 7.5em;
+    overflow: auto;
+}
+
+#honeypot {
+    display: none;
+}
+
+/* Tables */
+
+table {
+    border-collapse: collapse;
+    border: none;
+    margin: 1.25em auto;
+}
+
+caption {
+    border-bottom: 1px solid #303030;
+}
+
+thead th {
+    border-bottom: 1px solid #303030;
+}
+
+tfoot th,
+tfoot td {
+    border-top: 1px solid #303030;
+}
+
+th[scope="row"],
+th[scope="col"] {
+    text-align: left;
+}
+
+tbody + tbody th, tbody + tbody td {
+    border-top: 1px solid #d0d0d0;
+}
+
+tbody + tbody tr + tr th,
+tbody + tbody tr + tr td,
+tfoot tr + tr th,
+tfoot tr + tr td {
+    border-top: none;
+}
+
+th, td {
+    padding: 0 0.5em;
+    font-weight: normal;
+    vertical-align: top;
+}
+
+table.numeric td, table.numeric th[scope="col"] {
+    text-align: right;
+}
+
diff --git a/pelican/themes/martyalchin/templates/archives.html b/pelican/themes/martyalchin/templates/archives.html
new file mode 100644
index 00000000..e69de29b
diff --git a/pelican/themes/martyalchin/templates/article.html b/pelican/themes/martyalchin/templates/article.html
new file mode 100644
index 00000000..c7711a75
--- /dev/null
+++ b/pelican/themes/martyalchin/templates/article.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block title %}{{ article.title }}{%endblock%}
+{% block content %}
+    <h1>{{ article.title }}</h1>
+    <div class="info">
+    {% if article.author %}
+     By <a class="url fn" href="#">{{ article.author }}</a>
+    {% endif %}
+     on <a>{{ article.date.strftime('%a %d %B %Y') }}</a>
+     about <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
+    </div>
+    {{ article.content }}
+{% endblock %}
diff --git a/pelican/themes/martyalchin/templates/base.html b/pelican/themes/martyalchin/templates/base.html
new file mode 100644
index 00000000..0e7ac866
--- /dev/null
+++ b/pelican/themes/martyalchin/templates/base.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="{{ SITEURL }}/css/style.css" type="text/css" />
+        <link href="{{ SITEURL }}/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+    </head>
+    <body>
+    {% block content %} {% endblock %}
+
+    <div class="copyright info vcard">Design by <a class="fn url"
+    href="http://martyalchin.com">Marty Alchin</a>, <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">some rights reserved</a>. Powered by <a href="http://alexis.notomyidea.org/pelican/">pelican</a></div>
+    </body>
+</html>
diff --git a/pelican/themes/martyalchin/templates/categories.html b/pelican/themes/martyalchin/templates/categories.html
new file mode 100644
index 00000000..e69de29b
diff --git a/pelican/themes/martyalchin/templates/category.html b/pelican/themes/martyalchin/templates/category.html
new file mode 100644
index 00000000..8f9b6626
--- /dev/null
+++ b/pelican/themes/martyalchin/templates/category.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+{% block title %}{{ category }}{%endblock%}
+<h1>{{ category }}</h1>
+<div class="info"></div>
+{% for article in articles %}        
+<h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2> 
+<p class="published">{{ article.date.strftime('%a %d %B %Y') }}</p>
+{{ article.summary }}
+{% endfor %}
diff --git a/pelican/themes/martyalchin/templates/index.html b/pelican/themes/martyalchin/templates/index.html
new file mode 100644
index 00000000..eeaa8a7a
--- /dev/null
+++ b/pelican/themes/martyalchin/templates/index.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% block content %}
+        <h1><a href="{{ SITEURL }}">{{ SITENAME }}</a></h1>
+        {% if SITESUBTITLE %} <div class="info">{{ SITESUBTITLE }}</div> {% endif %}
+        {% for article in articles %}        
+        <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2> 
+        <p class="published">{{ article.date.strftime('%a %d %B %Y') }}</p>
+        {{ article.summary }}
+        {% endfor %}
+{% endblock %}
diff --git a/pelican/themes/martyalchin/templates/page.html b/pelican/themes/martyalchin/templates/page.html
new file mode 100644
index 00000000..727c762c
--- /dev/null
+++ b/pelican/themes/martyalchin/templates/page.html
@@ -0,0 +1,7 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{%endblock%}
+{% block content %}
+    <h1>{{ page.title }}</h1>
+    {{ page.content }}
+{% endblock %}
+
diff --git a/pelican/themes/martyalchin/templates/tag.html b/pelican/themes/martyalchin/templates/tag.html
new file mode 100644
index 00000000..e69de29b
diff --git a/pelican/themes/martyalchin/templates/tags.html b/pelican/themes/martyalchin/templates/tags.html
new file mode 100644
index 00000000..e69de29b

From 8b5fbb95f36831055372e0504678e6970c6a3834 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Mon, 8 Nov 2010 22:59:16 +0000
Subject: [PATCH 0043/2864] Fix #1. Thanks solstice for reporting it.

---
 pelican/generators.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index b2643a6e..8d776b32 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -21,6 +21,9 @@ class Generator(object):
             settings = {}
         self.settings = read_settings(settings)
         self.path = path or self.settings['PATH']
+        if self.path.endswith('/'):
+            self.path = self.path[:-1]
+
         self.theme = theme or self.settings['THEME']
         output_path = output_path or self.settings['OUTPUT_PATH']
         self.output_path = os.path.realpath(output_path)

From 59a8bf024efe4077798fc4b2419f3e5c75df5e73 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Mon, 8 Nov 2010 23:04:00 +0000
Subject: [PATCH 0044/2864] Add the page.html template to the "simple" theme.
 Fix #2.

---
 pelican/themes/simple/templates/page.html | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 pelican/themes/simple/templates/page.html

diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
new file mode 100644
index 00000000..6308d588
--- /dev/null
+++ b/pelican/themes/simple/templates/page.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{%endblock%}
+{% block content %}
+    <h1>{{ page.title }}</h1>
+    {{ page.content }}
+{% endblock %}

From 178ab7e5d2675fda9009cecbfc89a8195ef4f940 Mon Sep 17 00:00:00 2001
From: Guillaume B <guitreize@gmail.com>
Date: Wed, 10 Nov 2010 02:12:29 +0800
Subject: [PATCH 0045/2864] Instructions for the naming convention of files.

Signed-off-by: Guillaume B <guitreize@gmail.com>
---
 README.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 7f738388..28c06109 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,5 @@
+:date: 2010-10-03 10:20
+
 Pelican
 #######
 
@@ -17,7 +19,7 @@ filesystem (for instance, about the category of your articles), but you need to
 provide by hand some of those informations in your files.
 
 You could provide the metadata in the restructured text files, using the
-following syntax::
+following syntax (give your file the `.rst` extension)::
 
     My super title
     ##############
@@ -28,7 +30,7 @@ following syntax::
     :author: Alexis Metaireau
 
 
-You can also use a mardown syntax::
+You can also use a mardown syntax (with a file ending in `.md`)::
 
     Date: 2010-12-03
     Title: My super title

From c8184ffcbcb691ed0d1a191df669d6a6c7a8673d Mon Sep 17 00:00:00 2001
From: Guillaume B <guitreize@gmail.com>
Date: Thu, 11 Nov 2010 05:27:14 +0800
Subject: [PATCH 0046/2864] Pass the metadata conversion in Markdown as well,
 so that dates and tags are correctly processed.

Signed-off-by: Guillaume B <guitreize@gmail.com>
---
 pelican/readers.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 38632222..f18826a9 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -49,7 +49,11 @@ class MarkdownReader(object):
         
         metadatas = {}
         for name, value in md.Meta.items():
-            metadatas[name.lower()] = value[0] 
+            if name in _METADATAS_FIELDS:
+                meta = _METADATAS_FIELDS[name](value[0])
+            else:
+                meta = value[0]
+            metadatas[name.lower()] = meta
         return content, metadatas
 
 _EXTENSIONS = {'rst': RstReader, 'md': MarkdownReader}  # supported formats

From 676d9fc6f2d09a96f629a33025a62f67811f636a Mon Sep 17 00:00:00 2001
From: Guillaume B <guitreize@gmail.com>
Date: Thu, 11 Nov 2010 05:29:28 +0800
Subject: [PATCH 0047/2864] Typo in Readme

Signed-off-by: Guillaume B <guitreize@gmail.com>
---
 README.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.rst b/README.rst
index 28c06109..81159eb3 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,3 @@
-:date: 2010-10-03 10:20
-
 Pelican
 #######
 

From 372d5a77ecd11c50cd8e38deb15625f33bcfed93 Mon Sep 17 00:00:00 2001
From: Guillaume B <guitreize@gmail.com>
Date: Thu, 11 Nov 2010 05:36:54 +0800
Subject: [PATCH 0048/2864] Todo

Signed-off-by: Guillaume B <guitreize@gmail.com>
---
 TODO | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TODO b/TODO
index ddf354e2..3b8ebdd4 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
 * Add a way to support pictures (see how sphinx makes that)
 * Find a way to extend the existing templates instead of rewriting all from scratch.
 * find a better way to specify the templates. an idea is simply to install the templates in a default path, and to add a way to specify them by default under a "_themes" dir.
+* Make the program support UTF8-encoded files as input (and later: any encoding?)

From 086b93c06a68286924edc8baca0ab9a17fb5ec2c Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Fri, 12 Nov 2010 02:05:28 +0000
Subject: [PATCH 0049/2864] Add few items to the TODO

---
 TODO | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/TODO b/TODO
index 3b8ebdd4..ca3d97b0 100644
--- a/TODO
+++ b/TODO
@@ -2,3 +2,6 @@
 * Find a way to extend the existing templates instead of rewriting all from scratch.
 * find a better way to specify the templates. an idea is simply to install the templates in a default path, and to add a way to specify them by default under a "_themes" dir.
 * Make the program support UTF8-encoded files as input (and later: any encoding?)
+* Fallback on mtime to get date informations
+* Change the directory structure ?
+* update the doc

From 7dc847f5b20dd60f91baea9f80f5d7c36855ec1f Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Fri, 12 Nov 2010 02:14:20 +0000
Subject: [PATCH 0050/2864] Get informations about dates from the filesystem if
 no other way of getting it is working.

---
 TODO                  | 1 -
 pelican/processors.py | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index ca3d97b0..c6a48bbf 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,5 @@
 * Find a way to extend the existing templates instead of rewriting all from scratch.
 * find a better way to specify the templates. an idea is simply to install the templates in a default path, and to add a way to specify them by default under a "_themes" dir.
 * Make the program support UTF8-encoded files as input (and later: any encoding?)
-* Fallback on mtime to get date informations
 * Change the directory structure ?
 * update the doc
diff --git a/pelican/processors.py b/pelican/processors.py
index 110aaa01..4b43dd55 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -73,6 +73,10 @@ class ArticlesProcessor(Processor):
                 if category != '':
                     metadatas['category'] = unicode(category)
 
+            # fallback on filesystem date
+            if 'date' not in metadatas.keys():
+                    metadatas['date'] = datetime.fromtimestamp(os.stat(f).st_ctime)
+
             article = Article(content, metadatas, settings=generator.settings,
                               filename=f)
             if not is_valid_content(article, f):

From 4c85555d3334145af1918b8c01f1de702e5d5ec5 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Fri, 12 Nov 2010 02:18:19 +0000
Subject: [PATCH 0051/2864] ... and add a way to deactivate it.

---
 pelican/processors.py | 3 +--
 pelican/settings.py   | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/processors.py b/pelican/processors.py
index 4b43dd55..e4248645 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -73,8 +73,7 @@ class ArticlesProcessor(Processor):
                 if category != '':
                     metadatas['category'] = unicode(category)
 
-            # fallback on filesystem date
-            if 'date' not in metadatas.keys():
+            if 'date' not in metadatas.keys() and context['FALLBACK_ON_FS_DATE']:
                     metadatas['date'] = datetime.fromtimestamp(os.stat(f).st_ctime)
 
             article = Article(content, metadatas, settings=generator.settings,
diff --git a/pelican/settings.py b/pelican/settings.py
index 0838e856..c53e79d0 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -13,6 +13,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DISPLAY_PAGES_ON_MENU': True,
                    'PDF_PROCESSOR': False,
                    'DEFAULT_CATEGORY': 'misc',
+                   'FALLBACK_ON_FS_DATE': True,
                   }
 
 def read_settings(filename):

From 3cbd60360dc3948a0e294cadfbbdeb1f54844431 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Fri, 12 Nov 2010 02:38:43 +0000
Subject: [PATCH 0052/2864] Update the README / CLI

---
 README.rst  | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 TODO        |  1 -
 bin/pelican |  2 +-
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 81159eb3..81f4bca1 100644
--- a/README.rst
+++ b/README.rst
@@ -73,6 +73,55 @@ the options you can use::
 
     $ pelican --help
 
+Settings
+--------
+
+Pelican try to be configurable via a configuration file, that you can pass to
+the command line. Here are the settings you can use, with some basic
+description.
+
+Please note that all the settings you put in this file will be passed to the
+templates as well.
+
+* `PATH` is the path to look at for input files.
+* `THEME`: the theme to use to product the output. can be the complete static
+  path to a theme folder, or choosed between the default pelican themes (see
+  below)
+* `OUTPUT_PATH`: Where to output the generated files. Default to "output"
+* `SITENAME`: You site name,
+* `DISPLAY_PAGES_ON_MENU`: Display or not the pages on the menu of the
+  template. Templates can follow or not this settings.
+* `PDF_PROCESSOR`: Put True if you want to have PDF outputs as well as HTML
+  pages,
+* `DEFAULT_CATEGORY`: The default category. `misc` by default.
+* `FALLBACK_ON_FS_DATE`: Choose to fallback on filesystem dates informations if
+  any other way to retreive the date currrently exists.,
+* `MARKUP`: A list of available markup languages you want to use. At the
+  moment, only available values are `rst` and `md`.
+* `STATIC_PATHS`: The static paths you want to copy under "static"
+* `FEED`: url to output the feed.,
+* `CATEGORY_FEED`: Where to put the categories feeds. default is `feeds/%s.atom.xml`
+
+Themes
+------
+
+3 themes are available. You can specify them using the `-t` option:
+
+* notmyidea
+* default
+* martylachin 
+
+You can define your own theme too, and specify it's emplacement in the same
+way.
+
+The `notmyidea` theme can make good use of the following settings:
+
+* `GITHUB_URL` = your github URL (if you have one)
+* `DISQUS_SITENAME` can handle disqus comments
+* `LINKS` is a list of tuples Title, Url, for links
+* `SOCIAL` (('twitter', 'yourtwitter complete url'),) and any other name/link
+  you want to put under "social"
+
 Why the name "Pelican" ?
 ------------------------
 
diff --git a/TODO b/TODO
index c6a48bbf..b91164a3 100644
--- a/TODO
+++ b/TODO
@@ -3,4 +3,3 @@
 * find a better way to specify the templates. an idea is simply to install the templates in a default path, and to add a way to specify them by default under a "_themes" dir.
 * Make the program support UTF8-encoded files as input (and later: any encoding?)
 * Change the directory structure ?
-* update the doc
diff --git a/bin/pelican b/bin/pelican
index 4577139b..82ab7804 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -10,7 +10,7 @@ parser = argparse.ArgumentParser(description="""A tool to generate a
 static blog, with restructured text input files.""")
 
 parser.add_argument(dest='path',
-    help='Path where to find the content files (default is "content").')
+    help='Path where to find the content files')
 parser.add_argument('-t', '--theme-path', dest='theme',
     help='Path where to find the theme templates. If not specified, it will'
          'use the default one included with pelican.')

From 7bb0771d2b1ff7f1652b1975f00f8da42582a0f4 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Fri, 12 Nov 2010 02:41:33 +0000
Subject: [PATCH 0053/2864] Updating thanks.

---
 THANKS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/THANKS b/THANKS
index 15cd9876..5dc1196e 100644
--- a/THANKS
+++ b/THANKS
@@ -2,4 +2,5 @@ Some people have helped to improve pelican by contributing features, reporting
 bugs or giving ideas. Thanks to them !
 
 - Dan Jacka
-- solsTiCe on linuxfr
+- solsTiCe on linuxfr for reporting bugs
+- Guillaume B (Gui13)

From 6184450b60b6b7b7653390d886ea0eef9d2ebd47 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Fri, 12 Nov 2010 20:13:33 +0000
Subject: [PATCH 0054/2864] Adding ronny's ideas to the TODO list.

---
 THANKS | 1 +
 TODO   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/THANKS b/THANKS
index 5dc1196e..5598f088 100644
--- a/THANKS
+++ b/THANKS
@@ -4,3 +4,4 @@ bugs or giving ideas. Thanks to them !
 - Dan Jacka
 - solsTiCe on linuxfr for reporting bugs
 - Guillaume B (Gui13)
+- Ronny Pfannschmidt
diff --git a/TODO b/TODO
index b91164a3..1d06e5cc 100644
--- a/TODO
+++ b/TODO
@@ -3,3 +3,5 @@
 * find a better way to specify the templates. an idea is simply to install the templates in a default path, and to add a way to specify them by default under a "_themes" dir.
 * Make the program support UTF8-encoded files as input (and later: any encoding?)
 * Change the directory structure ?
+* Add status support (draft, published, hidden)
+* Add a serve + automatic generation behaviour.

From da3efaa8d23bb640ee00554834bd03edd2b8e8cc Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 14 Nov 2010 22:54:03 +0000
Subject: [PATCH 0055/2864] =?UTF-8?q?Add=20J=C3=A9rome's=20ideas.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 THANKS | 1 +
 TODO   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/THANKS b/THANKS
index 5598f088..88799080 100644
--- a/THANKS
+++ b/THANKS
@@ -5,3 +5,4 @@ bugs or giving ideas. Thanks to them !
 - solsTiCe on linuxfr for reporting bugs
 - Guillaume B (Gui13)
 - Ronny Pfannschmidt
+- Jérome Renard
diff --git a/TODO b/TODO
index 1d06e5cc..0ff78934 100644
--- a/TODO
+++ b/TODO
@@ -5,3 +5,4 @@
 * Change the directory structure ?
 * Add status support (draft, published, hidden)
 * Add a serve + automatic generation behaviour.
+* Recompile only the changed files, not all.

From 5407be19cf7f08b0d2113e65d94ab5a5a5614404 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Mon, 15 Nov 2010 15:09:17 +0000
Subject: [PATCH 0056/2864] Add a FAQ.

---
 README.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README.rst b/README.rst
index 81f4bca1..b9851e56 100644
--- a/README.rst
+++ b/README.rst
@@ -155,3 +155,16 @@ If you want to see new features in Pelican, dont hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
 
 Contact me at "alexis at notmyidea dot org" for any request/feedback !
+
+FAQ
+---
+
+Here are some frequently asqued questions.
+
+How do I specify my site URL? I dont want to use the default "/home/…" folder.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Configure the `SITENAME` to your site base url, let's say
+`http://myswebsite.tld`, in your settings file::
+
+    SITENAME = "http://mywebsite.tld"

From 8de5e7b3a85d3ae9c98c79321f7826555546e3fc Mon Sep 17 00:00:00 2001
From: Jerome <jerome.renard@gmail.com>
Date: Mon, 15 Nov 2010 16:33:47 +0100
Subject: [PATCH 0057/2864] - Added linkedin support

---
 pelican/themes/notmyidea/css/main.css         | 855 +++++++++---------
 .../notmyidea/images/icons/linkedin.png       | Bin 0 -> 376 bytes
 2 files changed, 428 insertions(+), 427 deletions(-)
 create mode 100644 pelican/themes/notmyidea/images/icons/linkedin.png

diff --git a/pelican/themes/notmyidea/css/main.css b/pelican/themes/notmyidea/css/main.css
index 7116ab5c..907f9c92 100644
--- a/pelican/themes/notmyidea/css/main.css
+++ b/pelican/themes/notmyidea/css/main.css
@@ -1,427 +1,428 @@
-/*
-	Name: Smashing HTML5
-	Date: July 2009
-	Description: Sample layout for HTML5 and CSS3 goodness.
-	Version: 1.0
-	Author: Enrique Ramírez
-	Autor URI: http://enrique-ramirez.com
-*/
-
-/* Imports */
-@import url("reset.css");
-@import url("pygment.css");
-@import url(http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
-
-/***** Global *****/
-/* Body */
-body {
-    background: #F5F4EF url('../images/bg.png');
-    color: #000305;
-    font-size: 87.5%; /* Base font size: 14px */
-    font-family: 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
-    line-height: 1.429;
-    margin: 0;
-    padding: 0;
-    text-align: left;
-}
-
-article img{
-   float: right;
-}
-
-/* Headings */
-h1 {font-size: 2em }
-h2 {font-size: 1.571em}	/* 22px */
-h3 {font-size: 1.429em}	/* 20px */
-h4 {font-size: 1.286em}	/* 18px */
-h5 {font-size: 1.143em}	/* 16px */
-h6 {font-size: 1em}		/* 14px */
-
-h1, h2, h3, h4, h5, h6 {
-	font-weight: 400;
-	line-height: 1.1;
-	margin-bottom: .8em;
-    font-family: 'Yanone Kaffeesatz', arial, serif;
-}
-
-h3, h4, h5, h6 { margin-top: .8em; }
-	
-hr { border: 2px solid #EEEEEE; }
-
-/* Anchors */
-a {outline: 0;}
-a img {border: 0px; text-decoration: none;}
-a:link, a:visited {
-	color: #C74350;
-	padding: 0 1px;
-	text-decoration: underline;
-}
-a:hover, a:active {
-	background-color: #C74350;
-	color: #fff;
-	text-decoration: none;
-	text-shadow: 1px 1px 1px #333;
-}
-	
-/* Paragraphs */
-p {margin-bottom: 1.143em;}
-
-strong, b {font-weight: bold;}
-em, i {font-style: italic;}
-
-::-moz-selection {background: #F6CF74; color: #fff;}
-::selection {background: #F6CF74; color: #fff;}
-
-/* Lists */
-ul {
-	list-style: outside disc;
-	margin: 1em 0 1.5em 1.5em;
-}
-
-ol {
-	list-style: outside decimal;
-	margin: 1em 0 1.5em 1.5em;
-}
-
-.post-info {
-    float:right;
-    margin:10px;
-    padding:5px;
-}
-
-.post-info p{
-    margin-bottom: 1px;
-}
-
-.readmore { float: right }
-
-dl {margin: 0 0 1.5em 0;}
-dt {font-weight: bold;}
-dd {margin-left: 1.5em;}
-
-pre{background-color: #000; padding: 10px; color: #fff; margin: 10px; overflow: auto;}
-
-/* Quotes */
-blockquote {
-    margin: 20px;
-    font-style: italic;
-}
-cite {}
-
-q {}
-
-/* Tables */
-table {margin: .5em auto 1.5em auto; width: 98%;}
-	
-	/* Thead */
-	thead th {padding: .5em .4em; text-align: left;}
-	thead td {}
-
-	/* Tbody */
-	tbody td {padding: .5em .4em;}
-	tbody th {}
-	
-	tbody .alt td {}
-	tbody .alt th {}
-	
-	/* Tfoot */
-	tfoot th {}
-	tfoot td {}
-	
-/* HTML5 tags */
-header, section, footer,
-aside, nav, article, figure {
-	display: block;
-}
-
-/***** Layout *****/
-.body {clear: both; margin: 0 auto; width: 800px;}
-img.right figure.right {float: right; margin: 0 0 2em 2em;}
-img.left, figure.left {float: right; margin: 0 0 2em 2em;}
-
-/*
-	Header
-*****************/
-#banner {
-	margin: 0 auto;
-	padding: 2.5em 0 0 0;
-}
-
-	/* Banner */
-	#banner h1 {font-size: 3.571em; line-height: 0;}
-	#banner h1 a:link, #banner h1 a:visited {
-		color: #000305;
-		display: block;
-		font-weight: bold;
-		margin: 0 0 .6em .2em;
-		text-decoration: none;
-		width: 427px;
-	}
-	#banner h1 a:hover, #banner h1 a:active {
-		background: none;
-		color: #C74350;
-		text-shadow: none;
-	}
-	
-	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
-	
-	/* Main Nav */
-	#banner nav {
-		background: #000305;
-		font-size: 1.143em;
-		height: 40px;
-		line-height: 30px;
-		margin: 0 auto 2em auto;
-		padding: 0;
-		text-align: center;
-		width: 800px;
-		
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
-	
-	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
-	#banner nav li {float: left; display: inline; margin: 0;}
-	
-	#banner nav a:link, #banner nav a:visited {
-		color: #fff;
-		display: inline-block;
-		height: 30px;
-		padding: 5px 1.5em;
-		text-decoration: none;
-	}
-	#banner nav a:hover, #banner nav a:active,
-	#banner nav .active a:link, #banner nav .active a:visited {
-		background: #C74451;
-		color: #fff;
-		text-shadow: none !important;
-	}
-	
-	#banner nav li:first-child a {
-		border-top-left-radius: 5px;
-		-moz-border-radius-topleft: 5px;
-		-webkit-border-top-left-radius: 5px;
-		
-		border-bottom-left-radius: 5px;
-		-moz-border-radius-bottomleft: 5px;
-		-webkit-border-bottom-left-radius: 5px;
-	}
-
-/*
-	Featured
-*****************/
-#featured {
-	background: #fff;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px;
-	width: 760px;
-	
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
-}
-
-#featured figure {
-	border: 2px solid #eee;
-	float: right;
-	margin: 0.786em 2em 0 5em;
-	width: 248px;
-}
-#featured figure img {display: block; float: right;}
-
-#featured h2 {color: #C74451; font-size: 1.714em; margin-bottom: 0.333em;}
-#featured h3 {font-size: 1.429em; margin-bottom: .5em;}
-
-#featured h3 a:link, #featured h3 a:visited {color: #000305; text-decoration: none;}
-#featured h3 a:hover, #featured h3 a:active {color: #fff;}
-
-/*
-	Body
-*****************/
-#content {
-	background: #fff;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px 20px;
-	width: 760px;
-	
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
-}
-
-/*
-	Extras
-*****************/
-#extras {margin: 0 auto 3em auto; overflow: hidden;}
-
-#extras ul {list-style: none; margin: 0;}
-#extras li {border-bottom: 1px solid #fff;}
-#extras h2 {
-	color: #C74350;
-	font-size: 1.429em;
-	margin-bottom: .25em;
-	padding: 0 3px;
-}
-
-#extras a:link, #extras a:visited {
-	color: #444;
-	display: block;
-	border-bottom: 1px solid #F4E3E3;
-	text-decoration: none;
-	padding: .3em .25em;
-}
-
-#extras li:last-child,
-#extras li:last-child a {border: 0}
-
-#extras .blogroll li:nth-last-child(2),
-#extras .blogroll li:nth-last-child(3),
-#extras .blogroll li:nth-last-child(2) a,
-#extras .blogroll li:nth-last-child(3) a {border: 0;}
-
-#extras a:hover, #extras a:active {color: #fff;}
-
-	/* Blogroll */
-	#extras .blogroll {
-		float: left;
-		width: 615px;
-	}
-	
-	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
-	
-	/* Social */
-	#extras .social {
-		float: right;
-		width: 175px;
-	}
-	
-	#extras div[class='social'] a {
-		background-repeat: no-repeat;
-		background-position: 3px 6px;
-		padding-left: 25px;
-	}
-	
-		/* Icons */
-		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
-		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
-		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[href*='atom.xml'] {background-image: url('../images/icons/rss.png');}
-		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
-
-/*
-	About
-*****************/
-#about {
-	background: #fff;
-	font-style: normal;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px;
-	text-align: left;
-	width: 760px;
-	
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
-}
-
-#about .primary {float: left; width: 165px;}
-#about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
-#about .photo {float: left; margin: 5px 20px;}
-
-#about .url:link, #about .url:visited {text-decoration: none;}
-
-#about .bio {float: right; width: 500px;}
-
-/*
-	Footer
-*****************/
-#contentinfo {padding-bottom: 2em; text-align: right;}
-
-/***** Sections *****/
-/* Blog */
-.hentry {
-	border-bottom: 1px solid #eee;
-	padding: 1.5em 0;
-}
-li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
-#content > .hentry {padding: 1em 0;}
-
-.entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;}
-.entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
-.entry-title a:visited {background-color: #fff;}
-
-.hentry .post-info * {font-style: normal;}
-
-	/* Content */
-	.hentry footer {margin-bottom: 2em;}
-	.hentry footer address {display: inline;}
-	#posts-list footer address {display: block;}
-
-	/* Blog Index */
-	#posts-list {list-style: none; margin: 0;}
-	#posts-list .hentry {padding-left: 10px; position: relative;}
-	
-	#posts-list footer {
-		left: 10px;
-		position: relative;
-        float: left;
-		top: 0.5em;
-		width: 190px;
-	}
-	
-	/* About the Author */
-	#about-author {
-		background: #f9f9f9;
-		clear: both;
-		font-style: normal;
-		margin: 2em 0;
-		padding: 10px 20px 15px 20px;
-		
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
-	
-	#about-author strong {
-		color: #C64350;
-		clear: both;
-		display: block;
-		font-size: 1.429em;
-	}
-	
-	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
-	
-	/* Comments */
-	#comments-list {list-style: none; margin: 0 1em;}
-	#comments-list blockquote {
-		background: #f8f8f8;
-		clear: both;
-		font-style: normal;
-		margin: 0;
-		padding: 15px 20px;
-		
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
-	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
-	
-	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
-	
-	/* Add a Comment */
-	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
-	#add-comment input[type='text'],
-	#add-comment input[type='email'],
-	#add-comment input[type='url'] {float: left; width: 200px;}
-	
-	#add-comment textarea {float: left; height: 150px; width: 495px;}
-	
-	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
-	
-	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
-	#add-comment * {margin-bottom: .5em;}
+/*
+	Name: Smashing HTML5
+	Date: July 2009
+	Description: Sample layout for HTML5 and CSS3 goodness.
+	Version: 1.0
+	Author: Enrique Ramírez
+	Autor URI: http://enrique-ramirez.com
+*/
+
+/* Imports */
+@import url("reset.css");
+@import url("pygment.css");
+@import url(http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+
+/***** Global *****/
+/* Body */
+body {
+    background: #F5F4EF url('../images/bg.png');
+    color: #000305;
+    font-size: 87.5%; /* Base font size: 14px */
+    font-family: 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+    line-height: 1.429;
+    margin: 0;
+    padding: 0;
+    text-align: left;
+}
+
+article img{
+   float: right;
+}
+
+/* Headings */
+h1 {font-size: 2em }
+h2 {font-size: 1.571em}	/* 22px */
+h3 {font-size: 1.429em}	/* 20px */
+h4 {font-size: 1.286em}	/* 18px */
+h5 {font-size: 1.143em}	/* 16px */
+h6 {font-size: 1em}		/* 14px */
+
+h1, h2, h3, h4, h5, h6 {
+	font-weight: 400;
+	line-height: 1.1;
+	margin-bottom: .8em;
+    font-family: 'Yanone Kaffeesatz', arial, serif;
+}
+
+h3, h4, h5, h6 { margin-top: .8em; }
+	
+hr { border: 2px solid #EEEEEE; }
+
+/* Anchors */
+a {outline: 0;}
+a img {border: 0px; text-decoration: none;}
+a:link, a:visited {
+	color: #C74350;
+	padding: 0 1px;
+	text-decoration: underline;
+}
+a:hover, a:active {
+	background-color: #C74350;
+	color: #fff;
+	text-decoration: none;
+	text-shadow: 1px 1px 1px #333;
+}
+	
+/* Paragraphs */
+p {margin-bottom: 1.143em;}
+
+strong, b {font-weight: bold;}
+em, i {font-style: italic;}
+
+::-moz-selection {background: #F6CF74; color: #fff;}
+::selection {background: #F6CF74; color: #fff;}
+
+/* Lists */
+ul {
+	list-style: outside disc;
+	margin: 1em 0 1.5em 1.5em;
+}
+
+ol {
+	list-style: outside decimal;
+	margin: 1em 0 1.5em 1.5em;
+}
+
+.post-info {
+    float:right;
+    margin:10px;
+    padding:5px;
+}
+
+.post-info p{
+    margin-bottom: 1px;
+}
+
+.readmore { float: right }
+
+dl {margin: 0 0 1.5em 0;}
+dt {font-weight: bold;}
+dd {margin-left: 1.5em;}
+
+pre{background-color: #000; padding: 10px; color: #fff; margin: 10px; overflow: auto;}
+
+/* Quotes */
+blockquote {
+    margin: 20px;
+    font-style: italic;
+}
+cite {}
+
+q {}
+
+/* Tables */
+table {margin: .5em auto 1.5em auto; width: 98%;}
+	
+	/* Thead */
+	thead th {padding: .5em .4em; text-align: left;}
+	thead td {}
+
+	/* Tbody */
+	tbody td {padding: .5em .4em;}
+	tbody th {}
+	
+	tbody .alt td {}
+	tbody .alt th {}
+	
+	/* Tfoot */
+	tfoot th {}
+	tfoot td {}
+	
+/* HTML5 tags */
+header, section, footer,
+aside, nav, article, figure {
+	display: block;
+}
+
+/***** Layout *****/
+.body {clear: both; margin: 0 auto; width: 800px;}
+img.right figure.right {float: right; margin: 0 0 2em 2em;}
+img.left, figure.left {float: right; margin: 0 0 2em 2em;}
+
+/*
+	Header
+*****************/
+#banner {
+	margin: 0 auto;
+	padding: 2.5em 0 0 0;
+}
+
+	/* Banner */
+	#banner h1 {font-size: 3.571em; line-height: 0;}
+	#banner h1 a:link, #banner h1 a:visited {
+		color: #000305;
+		display: block;
+		font-weight: bold;
+		margin: 0 0 .6em .2em;
+		text-decoration: none;
+		width: 427px;
+	}
+	#banner h1 a:hover, #banner h1 a:active {
+		background: none;
+		color: #C74350;
+		text-shadow: none;
+	}
+	
+	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
+	
+	/* Main Nav */
+	#banner nav {
+		background: #000305;
+		font-size: 1.143em;
+		height: 40px;
+		line-height: 30px;
+		margin: 0 auto 2em auto;
+		padding: 0;
+		text-align: center;
+		width: 800px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	
+	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
+	#banner nav li {float: left; display: inline; margin: 0;}
+	
+	#banner nav a:link, #banner nav a:visited {
+		color: #fff;
+		display: inline-block;
+		height: 30px;
+		padding: 5px 1.5em;
+		text-decoration: none;
+	}
+	#banner nav a:hover, #banner nav a:active,
+	#banner nav .active a:link, #banner nav .active a:visited {
+		background: #C74451;
+		color: #fff;
+		text-shadow: none !important;
+	}
+	
+	#banner nav li:first-child a {
+		border-top-left-radius: 5px;
+		-moz-border-radius-topleft: 5px;
+		-webkit-border-top-left-radius: 5px;
+		
+		border-bottom-left-radius: 5px;
+		-moz-border-radius-bottomleft: 5px;
+		-webkit-border-bottom-left-radius: 5px;
+	}
+
+/*
+	Featured
+*****************/
+#featured {
+	background: #fff;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+#featured figure {
+	border: 2px solid #eee;
+	float: right;
+	margin: 0.786em 2em 0 5em;
+	width: 248px;
+}
+#featured figure img {display: block; float: right;}
+
+#featured h2 {color: #C74451; font-size: 1.714em; margin-bottom: 0.333em;}
+#featured h3 {font-size: 1.429em; margin-bottom: .5em;}
+
+#featured h3 a:link, #featured h3 a:visited {color: #000305; text-decoration: none;}
+#featured h3 a:hover, #featured h3 a:active {color: #fff;}
+
+/*
+	Body
+*****************/
+#content {
+	background: #fff;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px 20px;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+/*
+	Extras
+*****************/
+#extras {margin: 0 auto 3em auto; overflow: hidden;}
+
+#extras ul {list-style: none; margin: 0;}
+#extras li {border-bottom: 1px solid #fff;}
+#extras h2 {
+	color: #C74350;
+	font-size: 1.429em;
+	margin-bottom: .25em;
+	padding: 0 3px;
+}
+
+#extras a:link, #extras a:visited {
+	color: #444;
+	display: block;
+	border-bottom: 1px solid #F4E3E3;
+	text-decoration: none;
+	padding: .3em .25em;
+}
+
+#extras li:last-child,
+#extras li:last-child a {border: 0}
+
+#extras .blogroll li:nth-last-child(2),
+#extras .blogroll li:nth-last-child(3),
+#extras .blogroll li:nth-last-child(2) a,
+#extras .blogroll li:nth-last-child(3) a {border: 0;}
+
+#extras a:hover, #extras a:active {color: #fff;}
+
+	/* Blogroll */
+	#extras .blogroll {
+		float: left;
+		width: 615px;
+	}
+	
+	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
+	
+	/* Social */
+	#extras .social {
+		float: right;
+		width: 175px;
+	}
+	
+	#extras div[class='social'] a {
+		background-repeat: no-repeat;
+		background-position: 3px 6px;
+		padding-left: 25px;
+	}
+	
+		/* Icons */
+		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
+		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
+		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
+		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
+		.social a[href*='atom.xml'] {background-image: url('../images/icons/rss.png');}
+		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
+		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+
+/*
+	About
+*****************/
+#about {
+	background: #fff;
+	font-style: normal;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px;
+	text-align: left;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+#about .primary {float: left; width: 165px;}
+#about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
+#about .photo {float: left; margin: 5px 20px;}
+
+#about .url:link, #about .url:visited {text-decoration: none;}
+
+#about .bio {float: right; width: 500px;}
+
+/*
+	Footer
+*****************/
+#contentinfo {padding-bottom: 2em; text-align: right;}
+
+/***** Sections *****/
+/* Blog */
+.hentry {
+	border-bottom: 1px solid #eee;
+	padding: 1.5em 0;
+}
+li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
+#content > .hentry {padding: 1em 0;}
+
+.entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;}
+.entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
+.entry-title a:visited {background-color: #fff;}
+
+.hentry .post-info * {font-style: normal;}
+
+	/* Content */
+	.hentry footer {margin-bottom: 2em;}
+	.hentry footer address {display: inline;}
+	#posts-list footer address {display: block;}
+
+	/* Blog Index */
+	#posts-list {list-style: none; margin: 0;}
+	#posts-list .hentry {padding-left: 10px; position: relative;}
+	
+	#posts-list footer {
+		left: 10px;
+		position: relative;
+        float: left;
+		top: 0.5em;
+		width: 190px;
+	}
+	
+	/* About the Author */
+	#about-author {
+		background: #f9f9f9;
+		clear: both;
+		font-style: normal;
+		margin: 2em 0;
+		padding: 10px 20px 15px 20px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	
+	#about-author strong {
+		color: #C64350;
+		clear: both;
+		display: block;
+		font-size: 1.429em;
+	}
+	
+	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
+	
+	/* Comments */
+	#comments-list {list-style: none; margin: 0 1em;}
+	#comments-list blockquote {
+		background: #f8f8f8;
+		clear: both;
+		font-style: normal;
+		margin: 0;
+		padding: 15px 20px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
+	
+	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
+	
+	/* Add a Comment */
+	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
+	#add-comment input[type='text'],
+	#add-comment input[type='email'],
+	#add-comment input[type='url'] {float: left; width: 200px;}
+	
+	#add-comment textarea {float: left; height: 150px; width: 495px;}
+	
+	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
+	
+	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
+	#add-comment * {margin-bottom: .5em;}
\ No newline at end of file
diff --git a/pelican/themes/notmyidea/images/icons/linkedin.png b/pelican/themes/notmyidea/images/icons/linkedin.png
new file mode 100644
index 0000000000000000000000000000000000000000..feb04962bfe2fd712cb5003c8c20b43af4c18201
GIT binary patch
literal 376
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1Ig<N%)#SD+I6
z_O)}4-}0QX^Tp@yRa?$nd;UIt$zg}dTMylR@%{H7$0>Wd_Fj7M_G{R}1CBkLw_JJn
z>DQmab*CL>?Ok)>!PFzy{Acg}|Np;3*ZSPGC!W6l5w&pt&tHEg9=P)1$FJ6%7tcO?
zWxgW&B*^ZPAirP+hi5m^K%69RcNc~ZR#^`qhqJ&VvY3H^TNs2H8D`Cq01C2~c>21s
z-{R(FQ&rw_X(1C(sL|8KF+}2W>G_L%hZJ~NFD#lIs%=oPMZxdy|Meo%9>~ox&zv>K
zB$L~r<aZkfgWz=Lyqm20XVxusKG$*l)?2QYAJ>*j<o0AdvsI9iTUyciG3K=Cj_Pdv
zsFgaO=a_kD{%Kv_vzW(gZpy5n+eNW69-p?9c8*Zj*!tyi{epY%eko6V$gGmgC;W7e
S-+7>87(8A5T-G@yGywqOA)@^N

literal 0
HcmV?d00001


From 5a3c58f55ec3ec3710a01d05cea6e92ab75cec12 Mon Sep 17 00:00:00 2001
From: Jerome <jerome.renard@gmail.com>
Date: Mon, 15 Nov 2010 16:47:44 +0100
Subject: [PATCH 0058/2864] - Added configurable Google analytics template  
 (GOOGLE_ANALYTICS='UA-XXXX-YYYY' in your settings file)

---
 pelican/themes/notmyidea/templates/analytics.html | 11 +++++++++++
 pelican/themes/notmyidea/templates/base.html      | 15 ++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 pelican/themes/notmyidea/templates/analytics.html

diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
new file mode 100644
index 00000000..ba174fcc
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -0,0 +1,11 @@
+{% if GOOGLE_ANALYTICS %}
+    <script type="text/javascript">
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+    </script>
+    <script type="text/javascript">
+    try {
+        var pageTracker = _gat._getTracker("{{GOOGLE_ANALYTICS}}");
+    pageTracker._trackPageview();
+    } catch(err) {}</script>
+{% endif %}
\ No newline at end of file
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index b5a845b3..0df8a138 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -9,11 +9,11 @@
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-        
+
         <!--[if lte IE 7]>
                 <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
                 <script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
-                
+
         <!--[if lt IE 7]>
                 <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
 
@@ -21,7 +21,7 @@
 
 <body id="index" class="home">
 {% if GITHUB_URL %}
-<a href="{{ GITHUB_URL }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>        
+<a href="{{ GITHUB_URL }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>
 {% endif %}
 
         <header id="banner" class="body">
@@ -53,7 +53,7 @@
                         </ul>
                 </div><!-- /.blogroll -->
         {% endif %}
-        {% if SOCIAL %}        
+        {% if SOCIAL %}
                 <div class="social">
                         <h2>social</h2>
                         <ul>
@@ -65,14 +65,15 @@
                 </div><!-- /.social -->
         {% endif %}
         </section><!-- /#extras -->
-        
+
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
                 Proudly powered by <a href="http://alexis.notmyidea.org/pelican/">pelican</a>, which takes great advantages of <a href="http://python.org">python</a>.
                 </address><!-- /#about -->
-                
+
                 <p>The theme is by <a href="http://smashingmagazine.com">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
+{% include 'analytics.html' %}
 </body>
-</html>
+</html>
\ No newline at end of file

From 32102dae122d31a4599d5376461496b92f9fc14a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Mon, 15 Nov 2010 18:58:54 +0000
Subject: [PATCH 0059/2864] Fix a FAQ mistake.

---
 README.rst          | 8 ++++----
 THANKS              | 1 +
 pelican/contents.py | 1 +
 pelican/readers.py  | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index b9851e56..cac2029b 100644
--- a/README.rst
+++ b/README.rst
@@ -161,10 +161,10 @@ FAQ
 
 Here are some frequently asqued questions.
 
-How do I specify my site URL? I dont want to use the default "/home/…" folder.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+How can I specify the url of my website ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Configure the `SITENAME` to your site base url, let's say
+Configure the `SITEURL` to your site base url, let's say
 `http://myswebsite.tld`, in your settings file::
 
-    SITENAME = "http://mywebsite.tld"
+    SITEURL = "http://mywebsite.tld"
diff --git a/THANKS b/THANKS
index 88799080..0054ae14 100644
--- a/THANKS
+++ b/THANKS
@@ -6,3 +6,4 @@ bugs or giving ideas. Thanks to them !
 - Guillaume B (Gui13)
 - Ronny Pfannschmidt
 - Jérome Renard
+- Nicolas Martin
diff --git a/pelican/contents.py b/pelican/contents.py
index 91cac20d..815a0cde 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -12,6 +12,7 @@ class Page(object):
 
     def __init__(self, content, metadatas={}, settings={}, filename=None):
         self.content = content
+        self.status = "published"  # default value
         for key, value in metadatas.items():
             setattr(self, key, value)
 
diff --git a/pelican/readers.py b/pelican/readers.py
index f18826a9..c8d43c08 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -11,7 +11,8 @@ from pelican.utils import get_date, open
 _METADATAS_FIELDS = {'tags': lambda x: x.split(', '),
                      'date': lambda x: get_date(x),
                      'category': lambda x: x,
-                     'author': lambda x: x}
+                     'author': lambda x: x,
+                     'status': lambda x:x.strip(),}
 
 
 class RstReader(object):

From caacf4884836ef1384fcf0179d1decd5124d64ef Mon Sep 17 00:00:00 2001
From: Jerome <jerome.renard@gmail.com>
Date: Mon, 15 Nov 2010 23:47:44 +0800
Subject: [PATCH 0060/2864] - Added configurable Google analytics template  
 (GOOGLE_ANALYTICS='UA-XXXX-YYYY' in your settings file)

---
 pelican/themes/notmyidea/templates/analytics.html | 11 +++++++++++
 pelican/themes/notmyidea/templates/base.html      | 15 ++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 pelican/themes/notmyidea/templates/analytics.html

diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
new file mode 100644
index 00000000..ba174fcc
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -0,0 +1,11 @@
+{% if GOOGLE_ANALYTICS %}
+    <script type="text/javascript">
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+    </script>
+    <script type="text/javascript">
+    try {
+        var pageTracker = _gat._getTracker("{{GOOGLE_ANALYTICS}}");
+    pageTracker._trackPageview();
+    } catch(err) {}</script>
+{% endif %}
\ No newline at end of file
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index b5a845b3..0df8a138 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -9,11 +9,11 @@
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-        
+
         <!--[if lte IE 7]>
                 <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
                 <script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
-                
+
         <!--[if lt IE 7]>
                 <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
 
@@ -21,7 +21,7 @@
 
 <body id="index" class="home">
 {% if GITHUB_URL %}
-<a href="{{ GITHUB_URL }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>        
+<a href="{{ GITHUB_URL }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>
 {% endif %}
 
         <header id="banner" class="body">
@@ -53,7 +53,7 @@
                         </ul>
                 </div><!-- /.blogroll -->
         {% endif %}
-        {% if SOCIAL %}        
+        {% if SOCIAL %}
                 <div class="social">
                         <h2>social</h2>
                         <ul>
@@ -65,14 +65,15 @@
                 </div><!-- /.social -->
         {% endif %}
         </section><!-- /#extras -->
-        
+
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
                 Proudly powered by <a href="http://alexis.notmyidea.org/pelican/">pelican</a>, which takes great advantages of <a href="http://python.org">python</a>.
                 </address><!-- /#about -->
-                
+
                 <p>The theme is by <a href="http://smashingmagazine.com">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
+{% include 'analytics.html' %}
 </body>
-</html>
+</html>
\ No newline at end of file

From 6431a91a6f8342529f12aa48668d3f9b6b6eb199 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Tue, 16 Nov 2010 01:13:26 +0000
Subject: [PATCH 0061/2864] Doc fix.

---
 README.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.rst b/README.rst
index cac2029b..9aef86c4 100644
--- a/README.rst
+++ b/README.rst
@@ -159,8 +159,6 @@ Contact me at "alexis at notmyidea dot org" for any request/feedback !
 FAQ
 ---
 
-Here are some frequently asqued questions.
-
 How can I specify the url of my website ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

From a3321fec6a9e61cb5d7e287c24a972b105760428 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Tue, 16 Nov 2010 01:18:00 +0000
Subject: [PATCH 0062/2864] Add SITEURL and GOOGLE_ANALYTICS informations to
 the README.

---
 README.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 9aef86c4..c632e3b1 100644
--- a/README.rst
+++ b/README.rst
@@ -83,12 +83,13 @@ description.
 Please note that all the settings you put in this file will be passed to the
 templates as well.
 
+* `SITEURL` is the base URL of your website.
 * `PATH` is the path to look at for input files.
 * `THEME`: the theme to use to product the output. can be the complete static
   path to a theme folder, or choosed between the default pelican themes (see
   below)
 * `OUTPUT_PATH`: Where to output the generated files. Default to "output"
-* `SITENAME`: You site name,
+* `SITENAME`: Your site name,
 * `DISPLAY_PAGES_ON_MENU`: Display or not the pages on the menu of the
   template. Templates can follow or not this settings.
 * `PDF_PROCESSOR`: Put True if you want to have PDF outputs as well as HTML
@@ -121,6 +122,7 @@ The `notmyidea` theme can make good use of the following settings:
 * `LINKS` is a list of tuples Title, Url, for links
 * `SOCIAL` (('twitter', 'yourtwitter complete url'),) and any other name/link
   you want to put under "social"
+* `GOOGLE_ANALYTICS` = 'UA-XXXX-YYYY' to activate google analytics.
 
 Why the name "Pelican" ?
 ------------------------

From 18d5ecc364e889d09fe486a7e6e8acc04f1befdf Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Tue, 16 Nov 2010 15:13:10 +0000
Subject: [PATCH 0063/2864] Update TODO.

---
 THANKS | 1 +
 TODO   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/THANKS b/THANKS
index 0054ae14..7c316d5f 100644
--- a/THANKS
+++ b/THANKS
@@ -7,3 +7,4 @@ bugs or giving ideas. Thanks to them !
 - Ronny Pfannschmidt
 - Jérome Renard
 - Nicolas Martin
+- David Kulak
diff --git a/TODO b/TODO
index 0ff78934..6a044f29 100644
--- a/TODO
+++ b/TODO
@@ -6,3 +6,4 @@
 * Add status support (draft, published, hidden)
 * Add a serve + automatic generation behaviour.
 * Recompile only the changed files, not all.
+* Add a way to make the cofee (it's really something useful)

From cdd17193343c347c060a3607806dea7108016c27 Mon Sep 17 00:00:00 2001
From: Jerome <jerome.renard@gmail.com>
Date: Wed, 17 Nov 2010 08:24:20 +0100
Subject: [PATCH 0064/2864] - Added configurable twitter button   Just add a
 TWITTER_USERNAME='foo' in your settings file

---
 pelican/themes/notmyidea/templates/article.html | 4 ++--
 pelican/themes/notmyidea/templates/twitter.html | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 pelican/themes/notmyidea/templates/twitter.html

diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 5e3d37ca..86b63231 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -5,7 +5,7 @@
 <article>
         <header> <h1 class="entry-title"><a href="{{ article.url }}"
         rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title
-        }}</a></h1> </header>
+        }}</a></h1> {% include 'twitter.html' %} </header>
         <div class="entry-content">
         <footer class="post-info">
                 <abbr class="published" title="{{ article.date.isoformat() }}">
@@ -37,4 +37,4 @@
 
 </article>
 </section>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/pelican/themes/notmyidea/templates/twitter.html b/pelican/themes/notmyidea/templates/twitter.html
new file mode 100644
index 00000000..c6b159f4
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/twitter.html
@@ -0,0 +1,3 @@
+{% if TWITTER_USERNAME %}
+<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+{% endif %}
\ No newline at end of file

From bab39c98005783d4e403a51d0cc026aacac8abc2 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Thu, 18 Nov 2010 03:33:57 +0000
Subject: [PATCH 0065/2864] Add a "wide" css for notmyidea.org theme

---
 README.rst                                   |  1 +
 pelican/settings.py                          |  1 +
 pelican/themes/notmyidea/css/wide.css        | 23 ++++++++++++++++++++
 pelican/themes/notmyidea/templates/base.html |  4 ++--
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 pelican/themes/notmyidea/css/wide.css

diff --git a/README.rst b/README.rst
index c632e3b1..f0b6492d 100644
--- a/README.rst
+++ b/README.rst
@@ -102,6 +102,7 @@ templates as well.
 * `STATIC_PATHS`: The static paths you want to copy under "static"
 * `FEED`: url to output the feed.,
 * `CATEGORY_FEED`: Where to put the categories feeds. default is `feeds/%s.atom.xml`
+* `CSS_FILE`: To specify the CSS file you want to load.
 
 Themes
 ------
diff --git a/pelican/settings.py b/pelican/settings.py
index c53e79d0..dfd5c48d 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -14,6 +14,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'PDF_PROCESSOR': False,
                    'DEFAULT_CATEGORY': 'misc',
                    'FALLBACK_ON_FS_DATE': True,
+                   'CSS_FILE': 'main.css',
                   }
 
 def read_settings(filename):
diff --git a/pelican/themes/notmyidea/css/wide.css b/pelican/themes/notmyidea/css/wide.css
new file mode 100644
index 00000000..aa99f03c
--- /dev/null
+++ b/pelican/themes/notmyidea/css/wide.css
@@ -0,0 +1,23 @@
+@import url("main.css");
+
+body {
+    font:1.3em/1.3 "Hoefler Text","Georgia",Georgia,serif,sans-serif;
+}
+
+.body, #banner nav, #banner nav ul, #about, #featured, #content{
+    width: inherit;
+}
+
+#banner nav {
+    -moz-border-radius: 0px;
+    margin-bottom: 0px;
+}
+
+#featured, #extras {
+    padding: 50px;
+}
+
+#extras {
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 0df8a138..fdce847d 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -3,7 +3,7 @@
 <head>
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="{{ SITEURL }}/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="{{ SITEURL }}/css/{{ CSS_FILE }}" type="text/css" />
         <link href="{{ SITEURL }}/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
 
 
@@ -76,4 +76,4 @@
 
 {% include 'analytics.html' %}
 </body>
-</html>
\ No newline at end of file
+</html>

From 5b1dd2f3f1436f5843b1733f8e59a13f60cf9fbf Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Thu, 18 Nov 2010 03:37:38 +0000
Subject: [PATCH 0066/2864] CSS Fix. Don't hilight titles links.

---
 pelican/themes/notmyidea/css/main.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/css/main.css b/pelican/themes/notmyidea/css/main.css
index 907f9c92..fd443ebe 100644
--- a/pelican/themes/notmyidea/css/main.css
+++ b/pelican/themes/notmyidea/css/main.css
@@ -62,6 +62,10 @@ a:hover, a:active {
 	text-decoration: none;
 	text-shadow: 1px 1px 1px #333;
 }
+
+h1 a:hover {
+    background-color: inherit
+}
 	
 /* Paragraphs */
 p {margin-bottom: 1.143em;}
@@ -425,4 +429,4 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
 	
 	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
-	#add-comment * {margin-bottom: .5em;}
\ No newline at end of file
+	#add-comment * {margin-bottom: .5em;}

From 01b6d8eb44fbb0af7dd5e09af1486b1d63632e13 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Fri, 19 Nov 2010 02:13:38 +0000
Subject: [PATCH 0067/2864] Update the wide theme.

---
 pelican/themes/notmyidea/css/wide.css         | 20 +++++++++++++++++++
 pelican/themes/notmyidea/templates/base.html  |  5 +----
 .../themes/notmyidea/templates/github.html    |  9 +++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 pelican/themes/notmyidea/templates/github.html

diff --git a/pelican/themes/notmyidea/css/wide.css b/pelican/themes/notmyidea/css/wide.css
index aa99f03c..3376f4c7 100644
--- a/pelican/themes/notmyidea/css/wide.css
+++ b/pelican/themes/notmyidea/css/wide.css
@@ -13,10 +13,30 @@ body {
     margin-bottom: 0px;
 }
 
+#banner nav ul{
+    padding-right: 50px;
+}
+
+#banner nav li{
+    float: right;
+}
+
+#banner nav li:first-child a {
+    -moz-border-radius: 0px;
+}
+
+#banner h1 {
+    margin-bottom: -18px;
+}
+
 #featured, #extras {
     padding: 50px;
 }
 
+#featured {
+    padding-top: 20px;
+}
+
 #extras {
     padding-top: 0px;
     padding-bottom: 0px;
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index fdce847d..bdeb7b9f 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -20,10 +20,7 @@
 </head>
 
 <body id="index" class="home">
-{% if GITHUB_URL %}
-<a href="{{ GITHUB_URL }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>
-{% endif %}
-
+{% include 'github.html' %}
         <header id="banner" class="body">
                 <h1><a href="{{ SITEURL }}">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
                 <nav><ul>
diff --git a/pelican/themes/notmyidea/templates/github.html b/pelican/themes/notmyidea/templates/github.html
new file mode 100644
index 00000000..75592ac6
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/github.html
@@ -0,0 +1,9 @@
+{% if GITHUB_URL %}
+<a href="{{ GITHUB_URL }}">
+{% if GITHUB_POSITION != "left" %}
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+{% else %}
+<img style="position: absolute; top: 0; left: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_left_white_ffffff.png" alt="Fork me on GitHub" />
+{% endif %}
+</a>
+{% endif %}

From 9a51102f2935406ff5d2a575f9836cb28fbb5fd5 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 20 Nov 2010 00:54:33 +0000
Subject: [PATCH 0068/2864] Dont remove the output folder if it's the source
 one ;)

---
 bin/pelican           | 2 --
 pelican/generators.py | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/pelican b/bin/pelican
index 82ab7804..098bd9e0 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 import argparse
 
-from pelican.utils import clean_output_dir
 from pelican.generators import Generator
 from pelican.processors import (ArticlesProcessor, PagesProcessor, 
                                 StaticProcessor, PdfProcessor)
@@ -30,7 +29,6 @@ if __name__ == '__main__':
 
     generator = Generator(args.settings, args.path, args.theme, 
                           args.output, markup)
-    clean_output_dir(generator.output_path)
 
     processors = [ArticlesProcessor, PagesProcessor, StaticProcessor]
     if generator.settings['PDF_PROCESSOR']:
diff --git a/pelican/generators.py b/pelican/generators.py
index 8d776b32..8902dfb8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -7,6 +7,7 @@ from jinja2.exceptions import TemplateNotFound
 from feedgenerator import Atom1Feed
 
 from pelican.settings import read_settings
+from pelican.utils import clean_output_dir
 
 _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
               'archives', 'page')
@@ -52,6 +53,9 @@ class Generator(object):
             if hasattr(p, 'preprocess'):
                 p.preprocess(context, self)
 
+        if self.output_path not in os.path.realpath(self.path):
+            clean_output_dir(self.output_path)
+
         for p in processors:
             p.process(context, self)
 

From 56fb4828d803e5c7f1ea36f3fba8364f5c48f867 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 20 Nov 2010 02:25:42 +0000
Subject: [PATCH 0069/2864] Add some more comments.

---
 pelican/generators.py | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 8902dfb8..1c0ff4eb 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -14,10 +14,14 @@ _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
 
 
 class Generator(object):
-    """Base class generator"""
-    
-    def __init__(self, settings=None, path=None, theme=None, output_path=None, 
+    """Handle all generation process: files writes, feed creation, and this
+    kind of basic stuff"""
+
+    def __init__(self, settings=None, path=None, theme=None, output_path=None,
         markup=None):
+        """Read the settings, and performs some checks on the environement
+        before doing anything else.
+        """
         if settings is None:
             settings = {}
         self.settings = read_settings(settings)
@@ -46,6 +50,7 @@ class Generator(object):
             raise Exception('you need to specify a path to search the docs on !')
 
     def run(self, processors):
+        """Get the context from each processor, and then process them"""
         context = self.settings.copy()
         processors = [p() for p in processors]
 
@@ -92,7 +97,7 @@ class Generator(object):
             fp = open(complete_path, 'w')
             feed.write(fp, 'utf-8')
             print u' [ok] writing %s' % complete_path
-            
+
             fp.close()
         return feed
 
@@ -117,7 +122,10 @@ class Generator(object):
         print u' [ok] writing %s' % filename
 
     def get_templates(self):
-        """Return the templates to use."""
+        """Return the templates to use.
+        Use self.theme to get the templates to use, and return a list of
+        templates ready to use with Jinja2.
+        """
         path = os.path.expanduser(os.path.join(self.theme, 'templates'))
         env = Environment(loader=FileSystemLoader(path))
         templates = {}
@@ -125,21 +133,24 @@ class Generator(object):
             try:
                 templates[template] = env.get_template('%s.html' % template)
             except TemplateNotFound:
-                raise Exception('Unable to load %s.html from %s' % (
+                raise Exception('[templates] unable to load %s.html from %s' % (
                     template, path))
         return templates
 
-    def get_files(self, path, exclude=[]):
-        """Return the files to use to use in this generator
+    def get_files(self, path, exclude=[], extensions=None):
+        """Return a list of files to use, based on rules
 
         :param path: the path to search the file on
         :param exclude: the list of path to exclude
         """
+        if not extensions:
+            extensions = self.markup
+
         files = []
         for root, dirs, temp_files in os.walk(path, followlinks=True):
             for e in exclude:
                 if e in dirs:
                     dirs.remove(e)
             files.extend([os.sep.join((root, f)) for f in temp_files
-                if True in [f.endswith(markup) for markup in self.markup]])
+                if True in [f.endswith(ext) for ext in extensions]])
         return files

From 0e95084649fcad370e2c2e733b8465385abb0c14 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 20 Nov 2010 02:26:49 +0000
Subject: [PATCH 0070/2864] Use relative URLS instead of static ones.

---
 pelican/generators.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 1c0ff4eb..fb6e48ce 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -64,7 +64,8 @@ class Generator(object):
         for p in processors:
             p.process(context, self)
 
-    def generate_feed(self, elements, context, filename=None):
+    def generate_feed(self, elements, context, filename=None,
+        relative_urls=True):
         """Generate a feed with the list of articles provided
 
         Return the feed. If no output_path or filename is specified, just return
@@ -74,16 +75,22 @@ class Generator(object):
         :param context: the context to get the feed metadatas.
         :param output_path: where to output the file.
         :param filename: the filename to output.
+        :param relative_urls: use relative urls or absolutes ones
         """
+        if relative_urls:
+            site_url = self._get_relative_siteurl(filename)
+        else:
+            site_url = context['SITEURL']
+
         feed = Atom1Feed(
             title=context['SITENAME'],
-            link=context['SITEURL'],
-            feed_url='%s/%s' % (context['SITEURL'], filename),
+            link=site_url,
+            feed_url= filename,
             description=context.get('SITESUBTITLE', ''))
         for element in elements:
             feed.add_item(
                 title=element.title,
-                link='%s/%s' % (context['SITEURL'], element.url),
+                link= element.url,
                 description=element.content,
                 author_name=getattr(element, 'author', 'John Doe'),
                 pubdate=element.date)
@@ -101,15 +108,20 @@ class Generator(object):
             fp.close()
         return feed
 
-    def generate_file(self, name, template, context, **kwargs):
+    def generate_file(self, name, template, context, relative_urls=True,
+        **kwargs):
         """Write the file with the given informations
 
         :param name: name of the file to output
         :param template: template to use to generate the content
         :param context: dict to pass to the templates.
+        :param relative_urls: use relative urls or absolutes ones
         :param **kwargs: additional variables to pass to the templates
         """
         context = context.copy()
+        if relative_urls:
+            context['SITEURL'] = self._get_relative_siteurl(name)
+
         context.update(kwargs)
         output = template.render(context)
         filename = os.sep.join((self.output_path, name))
@@ -154,3 +166,7 @@ class Generator(object):
             files.extend([os.sep.join((root, f)) for f in temp_files
                 if True in [f.endswith(ext) for ext in extensions]])
         return files
+
+    def _get_relative_siteurl(self, filename):
+        """Return the siteurl relative to the given filename"""
+        return '../' * filename.count('/') + '.'

From ed5e35faeb9408e3eeb3ebbfa87129278dc0f446 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 20 Nov 2010 16:01:17 +0000
Subject: [PATCH 0071/2864] Little fixes, add ideas too.

---
 README.rst | 7 ++++++-
 TODO       | 3 ++-
 setup.py   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index f0b6492d..82a126da 100644
--- a/README.rst
+++ b/README.rst
@@ -111,7 +111,7 @@ Themes
 
 * notmyidea
 * default
-* martylachin 
+* martyalchin 
 
 You can define your own theme too, and specify it's emplacement in the same
 way.
@@ -125,6 +125,11 @@ The `notmyidea` theme can make good use of the following settings:
   you want to put under "social"
 * `GOOGLE_ANALYTICS` = 'UA-XXXX-YYYY' to activate google analytics.
 
+In addition, you can use the "wide" version of the `notmyidea` theme, by
+adding that in your configuration::
+
+    CSS_FILE = "wide.css"
+
 Why the name "Pelican" ?
 ------------------------
 
diff --git a/TODO b/TODO
index 6a044f29..858b441c 100644
--- a/TODO
+++ b/TODO
@@ -6,4 +6,5 @@
 * Add status support (draft, published, hidden)
 * Add a serve + automatic generation behaviour.
 * Recompile only the changed files, not all.
-* Add a way to make the cofee (it's really something useful)
+* Add a way to make the coffee (or not)
+* Add a sitemap generator.
diff --git a/setup.py b/setup.py
index 0faaa84a..be9c0569 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.4.5',
+    version = '2.5.0',
     url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From a54fbafd7cb3cb288261da716d46b0b8e3ffac21 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 20 Nov 2010 16:01:40 +0000
Subject: [PATCH 0072/2864] Added tag 2.5.0 for changeset 87745dfdd51b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 174c6504..59157608 100644
--- a/.hgtags
+++ b/.hgtags
@@ -19,3 +19,4 @@ e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1
 979b4473af56a191a278c83058bc9c8fa1fde30e 2.4.3
 26a444fbb78becae358afa0a5b47587db8739b21 2.4.4
 3542b65fd1963ae7065b6a3bc912fbb6c150e98c 2.4.5
+87745dfdd51b96bf18eaaf6c402effa902c1b856 2.5.0

From 4702dd896b33e605b8970aeadab41b486e24a5fc Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 20 Nov 2010 18:47:40 +0000
Subject: [PATCH 0073/2864] Add section open and close in the notmyidea theme.

---
 pelican/themes/notmyidea/templates/archives.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/themes/notmyidea/templates/archives.html b/pelican/themes/notmyidea/templates/archives.html
index 31b02a0d..b3e534b7 100644
--- a/pelican/themes/notmyidea/templates/archives.html
+++ b/pelican/themes/notmyidea/templates/archives.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
+<section id="content" class="body">
 <h1>Archives for {{ SITENAME }}</h1>
 
 <dl>
@@ -10,4 +11,5 @@
     {% endfor %}
 {% endfor %}
 </dl>
+</section>
 {% endblock %}

From 8fb52e1c63e0a8c85e2c585e8337eb0c617b8908 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 20 Nov 2010 19:37:27 +0000
Subject: [PATCH 0074/2864] Update the README with accurate informations.

---
 README.rst | 110 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 59 insertions(+), 51 deletions(-)

diff --git a/README.rst b/README.rst
index 82a126da..40fd03ff 100644
--- a/README.rst
+++ b/README.rst
@@ -35,9 +35,10 @@ You can also use a mardown syntax (with a file ending in `.md`)::
 
     Put you content here.
 
-Note that only the `date` metadata is mandatory, so you just have to add that in i
-your files. The category can also be determined by the directory where the rst file
-is. For instance, the category of `python/foobar/myfoobar.rst` is `foobar`.
+Note that none of those are mendatory: if the date is not specified, pelican will
+rely on the mtime of your file, and the category can also be determined by the 
+directory where the rst file is. For instance, the category of 
+`python/foobar/myfoobar.rst` is `foobar`.
 
 Features
 --------
@@ -54,8 +55,8 @@ Pelican currently supports:
 Getting started — Generate your blog
 -------------------------------------
 
-Yeah? You're ready? Let's go ! You can install pelican in a lot of different
-ways, the simpler one is via pip::
+You're ready? Let's go ! You can install pelican in a lot of different ways, 
+the simpler one is via `pip <http://pip.openplans.org/>`_.
 
     $ pip install pelican
 
@@ -63,7 +64,7 @@ Then, you have just to launch pelican, like this::
 
     $ pelican /path/to/your/content/
 
-And… that's all! You can see your weblog generated on the content/ folder.
+And… that's all! You can see your weblog generated on the `content/` folder.
 
 This one will just generate a simple output, with the default theme. It's not
 really sexy, as it's a simple HTML output (without any style). 
@@ -76,33 +77,43 @@ the options you can use::
 Settings
 --------
 
-Pelican try to be configurable via a configuration file, that you can pass to
-the command line. Here are the settings you can use, with some basic
-description.
+Pelican is configurable thanks a configuration file, that you can pass to
+the command line::
 
-Please note that all the settings you put in this file will be passed to the
-templates as well.
+    $ pelican -s path/to/your/settingsfile.py path
 
-* `SITEURL` is the base URL of your website.
-* `PATH` is the path to look at for input files.
-* `THEME`: the theme to use to product the output. can be the complete static
-  path to a theme folder, or choosed between the default pelican themes (see
-  below)
-* `OUTPUT_PATH`: Where to output the generated files. Default to "output"
-* `SITENAME`: Your site name,
-* `DISPLAY_PAGES_ON_MENU`: Display or not the pages on the menu of the
-  template. Templates can follow or not this settings.
-* `PDF_PROCESSOR`: Put True if you want to have PDF outputs as well as HTML
-  pages,
-* `DEFAULT_CATEGORY`: The default category. `misc` by default.
-* `FALLBACK_ON_FS_DATE`: Choose to fallback on filesystem dates informations if
-  any other way to retreive the date currrently exists.,
-* `MARKUP`: A list of available markup languages you want to use. At the
-  moment, only available values are `rst` and `md`.
-* `STATIC_PATHS`: The static paths you want to copy under "static"
-* `FEED`: url to output the feed.,
-* `CATEGORY_FEED`: Where to put the categories feeds. default is `feeds/%s.atom.xml`
-* `CSS_FILE`: To specify the CSS file you want to load.
+Here are the available settings. Please note that all the settings you put in 
+this file will be passed to the templates as well.
+
+=======================   =======================================================
+Setting name              what it does ?
+=======================   =======================================================
+`SITEURL`                 base URL of your website.
+`PATH`                    path to look at for input files.
+`THEME`                   theme to use to product the output. can be the
+                          complete static path to a theme folder, or choosed
+                          between the list of default themes (see below)
+`OUTPUT_PATH`             Where to output the generated files. Default to
+                          "output"
+`SITENAME`                Your site name,
+`DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template. 
+                          Templates can follow or not this settings.
+`PDF_PROCESSOR`           Put True if you want to have PDF versions of your
+                          documents. You will need to install `rst2pdf`.
+`DEFAULT_CATEGORY`        The default category to fallback on. `misc` by default.
+`FALLBACK_ON_FS_DATE`     If True, pelican will use the filesystem dates infos
+                          (mtime) if it can't get informations from the
+                          metadatas?
+`MARKUP`                  A list of available markup languages you want to use.
+                          moment, only available values are `rst` and `md`.
+`STATIC_PATHS`            The static paths you want to copy under "static"
+`FEED`                    relative url to output the feed. Default is
+                          `feeds/all.atom.xml`
+`CATEGORY_FEED`           Where to put the categories feeds. default is 
+                          `feeds/%s.atom.xml`
+`CSS_FILE`                To specify the CSS file you want to load, if it's not 
+                          the default one ('main.css')
+=======================   =======================================================
 
 Themes
 ------
@@ -110,20 +121,28 @@ Themes
 3 themes are available. You can specify them using the `-t` option:
 
 * notmyidea
-* default
+* simple (a synonym for "full text" :)
 * martyalchin 
 
 You can define your own theme too, and specify it's emplacement in the same
-way.
+way (be sure to specify the full absolute path to it).
 
-The `notmyidea` theme can make good use of the following settings:
+The `notmyidea` theme can make good use of the following settings. I recommand
+to use them too in your themes.
 
-* `GITHUB_URL` = your github URL (if you have one)
-* `DISQUS_SITENAME` can handle disqus comments
-* `LINKS` is a list of tuples Title, Url, for links
-* `SOCIAL` (('twitter', 'yourtwitter complete url'),) and any other name/link
-  you want to put under "social"
-* `GOOGLE_ANALYTICS` = 'UA-XXXX-YYYY' to activate google analytics.
+=======================   =======================================================
+Setting name              what it does ?
+=======================   =======================================================
+`GITHUB_URL`              Your github URL (if you have one), it will then
+                          use it to create a github ribbon.
+`DISQUS_SITENAME`         Pelican can handle disqus comments, specify the
+                          sitename you've filled in on disqus
+`LINKS`                   A list of tuples (Title, Url) for links to appear on
+                          the header.
+`SOCIAL`                  A list of tuples (Title, Url) to appear in the "social"
+                          section. 
+`GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
+=======================   =======================================================
 
 In addition, you can use the "wide" version of the `notmyidea` theme, by
 adding that in your configuration::
@@ -163,14 +182,3 @@ If you want to see new features in Pelican, dont hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
 
 Contact me at "alexis at notmyidea dot org" for any request/feedback !
-
-FAQ
----
-
-How can I specify the url of my website ?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Configure the `SITEURL` to your site base url, let's say
-`http://myswebsite.tld`, in your settings file::
-
-    SITEURL = "http://mywebsite.tld"

From 6bec424f4eb1dab4e5206be120121065d0c3e7be Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sat, 20 Nov 2010 19:57:22 +0000
Subject: [PATCH 0075/2864] Fix doc misspellings

---
 README.rst | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.rst b/README.rst
index 40fd03ff..60ac7cae 100644
--- a/README.rst
+++ b/README.rst
@@ -9,11 +9,11 @@ Pelican is a simple weblog generator, writen in python.
 * Easy to interface with DVCSes and web hooks
 * Completely static output, so easy to host anywhere !
 
-Files metadatas
----------------
+Files metadata
+--------------
 
 Pelican tries to be smart enough to get the informations he needs from the
-filesystem (for instance, about the category of your articles), but you need to
+file system (for instance, about the category of your articles), but you need to
 provide by hand some of those informations in your files.
 
 You could provide the metadata in the restructured text files, using the
@@ -28,14 +28,14 @@ following syntax (give your file the `.rst` extension)::
     :author: Alexis Metaireau
 
 
-You can also use a mardown syntax (with a file ending in `.md`)::
+You can also use a markdown syntax (with a file ending in `.md`)::
 
     Date: 2010-12-03
     Title: My super title
 
     Put you content here.
 
-Note that none of those are mendatory: if the date is not specified, pelican will
+Note that none of those are mandatory: if the date is not specified, pelican will
 rely on the mtime of your file, and the category can also be determined by the 
 directory where the rst file is. For instance, the category of 
 `python/foobar/myfoobar.rst` is `foobar`.
@@ -56,7 +56,7 @@ Getting started — Generate your blog
 -------------------------------------
 
 You're ready? Let's go ! You can install pelican in a lot of different ways, 
-the simpler one is via `pip <http://pip.openplans.org/>`_.
+the simpler one is via `pip <http://pip.openplans.org/>`_::
 
     $ pip install pelican
 
@@ -91,7 +91,7 @@ Setting name              what it does ?
 `SITEURL`                 base URL of your website.
 `PATH`                    path to look at for input files.
 `THEME`                   theme to use to product the output. can be the
-                          complete static path to a theme folder, or choosed
+                          complete static path to a theme folder, or chosen
                           between the list of default themes (see below)
 `OUTPUT_PATH`             Where to output the generated files. Default to
                           "output"
@@ -101,9 +101,9 @@ Setting name              what it does ?
 `PDF_PROCESSOR`           Put True if you want to have PDF versions of your
                           documents. You will need to install `rst2pdf`.
 `DEFAULT_CATEGORY`        The default category to fallback on. `misc` by default.
-`FALLBACK_ON_FS_DATE`     If True, pelican will use the filesystem dates infos
+`FALLBACK_ON_FS_DATE`     If True, pelican will use the file system dates infos
                           (mtime) if it can't get informations from the
-                          metadatas?
+                          metadata?
 `MARKUP`                  A list of available markup languages you want to use.
                           moment, only available values are `rst` and `md`.
 `STATIC_PATHS`            The static paths you want to copy under "static"
@@ -127,7 +127,7 @@ Themes
 You can define your own theme too, and specify it's emplacement in the same
 way (be sure to specify the full absolute path to it).
 
-The `notmyidea` theme can make good use of the following settings. I recommand
+The `notmyidea` theme can make good use of the following settings. I recommend
 to use them too in your themes.
 
 =======================   =======================================================
@@ -152,7 +152,7 @@ adding that in your configuration::
 Why the name "Pelican" ?
 ------------------------
 
-Heh, you didnt noticed? "Pelican" is an anagram for "Calepin" ;)
+Heh, you didn't noticed? "Pelican" is an anagram for "Calepin" ;)
 
 Dependencies
 ------------
@@ -166,7 +166,7 @@ At this time, pelican is dependent of the following python packages:
 
 If you're not using python 2.7, you will also need `argparse`.
 
-All those dependencies will be processed automaticaly if you install pelican
+All those dependencies will be processed automatically if you install pelican
 using setuptools/distribute or pip.
 
 Source code

From 090a02a9e35b0a49117779611ecdb4483b2764bf Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Sun, 21 Nov 2010 01:49:37 +0000
Subject: [PATCH 0076/2864] Change the output directory structure and a bit the
 templates structure as well.

--HG--
rename : pelican/themes/martyalchin/css/style.css => pelican/themes/martyalchin/static/css/style.css
rename : pelican/themes/notmyidea/css/main.css => pelican/themes/notmyidea/static/css/main.css
rename : pelican/themes/notmyidea/css/pygment.css => pelican/themes/notmyidea/static/css/pygment.css
rename : pelican/themes/notmyidea/css/reset.css => pelican/themes/notmyidea/static/css/reset.css
rename : pelican/themes/notmyidea/css/wide.css => pelican/themes/notmyidea/static/css/wide.css
rename : pelican/themes/notmyidea/images/icons/delicious.png => pelican/themes/notmyidea/static/images/icons/delicious.png
rename : pelican/themes/notmyidea/images/icons/lastfm.png => pelican/themes/notmyidea/static/images/icons/lastfm.png
rename : pelican/themes/notmyidea/images/icons/linkedin.png => pelican/themes/notmyidea/static/images/icons/linkedin.png
rename : pelican/themes/notmyidea/images/icons/rss.png => pelican/themes/notmyidea/static/images/icons/rss.png
rename : pelican/themes/notmyidea/images/icons/twitter.png => pelican/themes/notmyidea/static/images/icons/twitter.png
---
 TODO                                          |   2 --
 pelican/generators.py                         |  16 ++++-----
 pelican/processors.py                         |  31 +++++++++++-------
 pelican/settings.py                           |   3 +-
 .../martyalchin/{ => static}/css/style.css    |   0
 .../themes/martyalchin/templates/base.html    |   2 +-
 .../notmyidea/{ => static}/css/main.css       |   0
 .../notmyidea/{ => static}/css/pygment.css    |   0
 .../notmyidea/{ => static}/css/reset.css      |   0
 .../notmyidea/{ => static}/css/wide.css       |   0
 .../{ => static}/images/icons/delicious.png   | Bin
 .../{ => static}/images/icons/lastfm.png      | Bin
 .../{ => static}/images/icons/linkedin.png    | Bin
 .../{ => static}/images/icons/rss.png         | Bin
 .../{ => static}/images/icons/twitter.png     | Bin
 pelican/themes/notmyidea/templates/base.html  |   2 +-
 pelican/utils.py                              |  10 +++---
 17 files changed, 37 insertions(+), 29 deletions(-)
 rename pelican/themes/martyalchin/{ => static}/css/style.css (100%)
 rename pelican/themes/notmyidea/{ => static}/css/main.css (100%)
 rename pelican/themes/notmyidea/{ => static}/css/pygment.css (100%)
 rename pelican/themes/notmyidea/{ => static}/css/reset.css (100%)
 rename pelican/themes/notmyidea/{ => static}/css/wide.css (100%)
 rename pelican/themes/notmyidea/{ => static}/images/icons/delicious.png (100%)
 rename pelican/themes/notmyidea/{ => static}/images/icons/lastfm.png (100%)
 rename pelican/themes/notmyidea/{ => static}/images/icons/linkedin.png (100%)
 rename pelican/themes/notmyidea/{ => static}/images/icons/rss.png (100%)
 rename pelican/themes/notmyidea/{ => static}/images/icons/twitter.png (100%)

diff --git a/TODO b/TODO
index 858b441c..9928ced2 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,6 @@
 * Add a way to support pictures (see how sphinx makes that)
 * Find a way to extend the existing templates instead of rewriting all from scratch.
-* find a better way to specify the templates. an idea is simply to install the templates in a default path, and to add a way to specify them by default under a "_themes" dir.
 * Make the program support UTF8-encoded files as input (and later: any encoding?)
-* Change the directory structure ?
 * Add status support (draft, published, hidden)
 * Add a serve + automatic generation behaviour.
 * Recompile only the changed files, not all.
diff --git a/pelican/generators.py b/pelican/generators.py
index fb6e48ce..f5374722 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -16,10 +16,10 @@ _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
 class Generator(object):
     """Handle all generation process: files writes, feed creation, and this
     kind of basic stuff"""
-
-    def __init__(self, settings=None, path=None, theme=None, output_path=None,
+    
+    def __init__(self, settings=None, path=None, theme=None, output_path=None, 
         markup=None):
-        """Read the settings, and performs some checks on the environement
+        """Read the settings, and performs some checks on the environment 
         before doing anything else.
         """
         if settings is None:
@@ -64,7 +64,7 @@ class Generator(object):
         for p in processors:
             p.process(context, self)
 
-    def generate_feed(self, elements, context, filename=None,
+    def generate_feed(self, elements, context, filename=None, 
         relative_urls=True):
         """Generate a feed with the list of articles provided
 
@@ -72,7 +72,7 @@ class Generator(object):
         the feed object.
 
         :param articles: the articles to put on the feed.
-        :param context: the context to get the feed metadatas.
+        :param context: the context to get the feed metadata.
         :param output_path: where to output the file.
         :param filename: the filename to output.
         :param relative_urls: use relative urls or absolutes ones
@@ -104,11 +104,11 @@ class Generator(object):
             fp = open(complete_path, 'w')
             feed.write(fp, 'utf-8')
             print u' [ok] writing %s' % complete_path
-
+            
             fp.close()
         return feed
 
-    def generate_file(self, name, template, context, relative_urls=True,
+    def generate_file(self, name, template, context, relative_urls=True, 
         **kwargs):
         """Write the file with the given informations
 
@@ -166,7 +166,7 @@ class Generator(object):
             files.extend([os.sep.join((root, f)) for f in temp_files
                 if True in [f.endswith(ext) for ext in extensions]])
         return files
-
+    
     def _get_relative_siteurl(self, filename):
         """Return the siteurl relative to the given filename"""
         return '../' * filename.count('/') + '.'
diff --git a/pelican/processors.py b/pelican/processors.py
index e4248645..e9720c55 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -11,7 +11,7 @@ _DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
 class Processor(object):
 
     def _update_context(self, context, items):
-        """Update the context with the given items from the currrent 
+        """Update the context with the given items from the currrent
         processor.
         """
         for item in items:
@@ -24,20 +24,20 @@ class Processor(object):
 class ArticlesProcessor(Processor):
 
     def __init__(self, settings=None):
-        self.articles = [] 
+        self.articles = []
         self.dates = {}
         self.years = {}
         self.tags = {}
-        self.categories = {} 
-        
+        self.categories = {}
+
     def generate_feeds(self, context, generator):
-        """Generate the feeds from the current context, and output files.""" 
+        """Generate the feeds from the current context, and output files."""
 
         generator.generate_feed(self.articles, context, context['FEED'])
 
         for cat, arts in self.categories.items():
             arts.sort(key=attrgetter('date'), reverse=True)
-            generator.generate_feed(arts, context, 
+            generator.generate_feed(arts, context,
                                     context['CATEGORY_FEED'] % cat)
 
     def generate_pages(self, context, generator):
@@ -92,7 +92,7 @@ class ArticlesProcessor(Processor):
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
         # and generate the output :)
-        self._update_context(context, ('articles', 'dates', 'years', 
+        self._update_context(context, ('articles', 'dates', 'years',
                                        'tags', 'categories'))
 
     def process(self, context, generator):
@@ -116,11 +116,11 @@ class PagesProcessor(Processor):
             self.pages.append(page)
 
         context['PAGES'] = self.pages
-        
+
     def process(self, context, generator):
         templates = generator.get_templates()
         for page in self.pages:
-            generator.generate_file('pages/%s' % page.url, 
+            generator.generate_file('pages/%s' % page.url,
                                templates['page'], context, page=page)
         self._update_context(context, ('pages',))
 
@@ -128,10 +128,17 @@ class PagesProcessor(Processor):
 class StaticProcessor(Processor):
     """copy static paths to output"""
 
+    def _copy_paths(self, paths, source, destination, output_path,
+            final_path=None):
+        for path in paths:
+            copytree(path, source, os.path.join(output_path, destination),
+                    final_path)
+
     def process(self, context, generator):
-        for path in generator.settings['STATIC_PATHS']:
-            copytree(path, generator.theme, generator.output_path)
-        copytree('pics', generator.path, generator.output_path)
+        self._copy_paths(generator.settings['STATIC_PATHS'], generator.path,
+                         'static', generator.output_path)
+        self._copy_paths(generator.settings['THEME_PATHS'], generator.theme,
+                         'theme', generator.output_path, '.')
 
 
 class PdfProcessor(Processor):
diff --git a/pelican/settings.py b/pelican/settings.py
index dfd5c48d..79de75cd 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -6,7 +6,8 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'THEME': _DEFAULT_THEME,
                    'OUTPUT_PATH': 'output/',
                    'MARKUP': ('rst', 'md'),
-                   'STATIC_PATHS': ['css', 'images'],
+                   'STATIC_PATHS': ['images',],
+                   'THEME_PATHS': ['static',],
                    'FEED': 'feeds/all.atom.xml',
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
                    'SITENAME': 'A Pelican Blog',
diff --git a/pelican/themes/martyalchin/css/style.css b/pelican/themes/martyalchin/static/css/style.css
similarity index 100%
rename from pelican/themes/martyalchin/css/style.css
rename to pelican/themes/martyalchin/static/css/style.css
diff --git a/pelican/themes/martyalchin/templates/base.html b/pelican/themes/martyalchin/templates/base.html
index 0e7ac866..eea18f9b 100644
--- a/pelican/themes/martyalchin/templates/base.html
+++ b/pelican/themes/martyalchin/templates/base.html
@@ -3,7 +3,7 @@
     <head>
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="{{ SITEURL }}/css/style.css" type="text/css" />
+        <link rel="stylesheet" href="{{ SITEURL }}/theme/css/style.css" type="text/css" />
         <link href="{{ SITEURL }}/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
     </head>
     <body>
diff --git a/pelican/themes/notmyidea/css/main.css b/pelican/themes/notmyidea/static/css/main.css
similarity index 100%
rename from pelican/themes/notmyidea/css/main.css
rename to pelican/themes/notmyidea/static/css/main.css
diff --git a/pelican/themes/notmyidea/css/pygment.css b/pelican/themes/notmyidea/static/css/pygment.css
similarity index 100%
rename from pelican/themes/notmyidea/css/pygment.css
rename to pelican/themes/notmyidea/static/css/pygment.css
diff --git a/pelican/themes/notmyidea/css/reset.css b/pelican/themes/notmyidea/static/css/reset.css
similarity index 100%
rename from pelican/themes/notmyidea/css/reset.css
rename to pelican/themes/notmyidea/static/css/reset.css
diff --git a/pelican/themes/notmyidea/css/wide.css b/pelican/themes/notmyidea/static/css/wide.css
similarity index 100%
rename from pelican/themes/notmyidea/css/wide.css
rename to pelican/themes/notmyidea/static/css/wide.css
diff --git a/pelican/themes/notmyidea/images/icons/delicious.png b/pelican/themes/notmyidea/static/images/icons/delicious.png
similarity index 100%
rename from pelican/themes/notmyidea/images/icons/delicious.png
rename to pelican/themes/notmyidea/static/images/icons/delicious.png
diff --git a/pelican/themes/notmyidea/images/icons/lastfm.png b/pelican/themes/notmyidea/static/images/icons/lastfm.png
similarity index 100%
rename from pelican/themes/notmyidea/images/icons/lastfm.png
rename to pelican/themes/notmyidea/static/images/icons/lastfm.png
diff --git a/pelican/themes/notmyidea/images/icons/linkedin.png b/pelican/themes/notmyidea/static/images/icons/linkedin.png
similarity index 100%
rename from pelican/themes/notmyidea/images/icons/linkedin.png
rename to pelican/themes/notmyidea/static/images/icons/linkedin.png
diff --git a/pelican/themes/notmyidea/images/icons/rss.png b/pelican/themes/notmyidea/static/images/icons/rss.png
similarity index 100%
rename from pelican/themes/notmyidea/images/icons/rss.png
rename to pelican/themes/notmyidea/static/images/icons/rss.png
diff --git a/pelican/themes/notmyidea/images/icons/twitter.png b/pelican/themes/notmyidea/static/images/icons/twitter.png
similarity index 100%
rename from pelican/themes/notmyidea/images/icons/twitter.png
rename to pelican/themes/notmyidea/static/images/icons/twitter.png
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index bdeb7b9f..99d6d380 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -3,7 +3,7 @@
 <head>
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="{{ SITEURL }}/css/{{ CSS_FILE }}" type="text/css" />
+        <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
         <link href="{{ SITEURL }}/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
 
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 1bcc8604..79bd4e38 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -50,14 +50,16 @@ def slugify(value):
     value = unicode(re.sub('[^\w\s-]', '', value).strip().lower())
     return re.sub('[-\s]+', '-', value)
 
-def copytree(path, origin, destination):
+def copytree(path, origin, destination, topath=None):
     """Copy path from origin to destination, silent any errors"""
-
+    
+    if not topath:
+        topath = path
     try:
         fromp = os.path.expanduser(os.path.join(origin, path))
-        to = os.path.expanduser(os.path.join(destination, path))
+        to = os.path.expanduser(os.path.join(destination, topath))
         shutil.copytree(fromp, to)
-        print u' [ok] copying %s' % fromp
+        print u' [ok] copying %s to %s' % (fromp, to)
 
     except OSError:
         pass

From d489000c65150aa9a25f65a3bc435cac81c79510 Mon Sep 17 00:00:00 2001
From: Philippe Pepiot <phil@philpep.org>
Date: Wed, 24 Nov 2010 15:49:10 +0100
Subject: [PATCH 0077/2864] Add syntax highlight  support for markdown posts

---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index c8d43c08..e9520fe6 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -45,7 +45,7 @@ class MarkdownReader(object):
     def read(self, filename):
         """Parse content and metadata of markdown files"""
         text = open(filename)
-        md = Markdown(extensions = ['meta'])
+        md = Markdown(extensions = ['meta', 'codehilite'])
         content = md.convert(text)
         
         metadatas = {}

From a3f0ded1464ea9fc2bef9fe3bed31ab774cc944b Mon Sep 17 00:00:00 2001
From: Philippe Pepiot <phil@philpep.org>
Date: Wed, 24 Nov 2010 15:58:58 +0100
Subject: [PATCH 0078/2864] Missing import in processors

---
 pelican/processors.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/processors.py b/pelican/processors.py
index e9720c55..63843030 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -1,4 +1,5 @@
 from operator import attrgetter
+from datetime import datetime
 import os
 
 from pelican.utils import update_dict, copytree

From 5fda51de423012d38977b6bee48b03f11f708815 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 26 Nov 2010 23:37:03 +0000
Subject: [PATCH 0079/2864] Fix #12

---
 pelican/processors.py                            | 8 +++-----
 pelican/themes/notmyidea/templates/archives.html | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pelican/processors.py b/pelican/processors.py
index 63843030..d35abdbf 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -27,7 +27,6 @@ class ArticlesProcessor(Processor):
     def __init__(self, settings=None):
         self.articles = []
         self.dates = {}
-        self.years = {}
         self.tags = {}
         self.categories = {}
 
@@ -82,8 +81,6 @@ class ArticlesProcessor(Processor):
             if not is_valid_content(article, f):
                 continue
 
-            update_dict(self.dates, article.date.strftime('%Y-%m-%d'), article)
-            update_dict(self.years, article.date.year, article)
             update_dict(self.categories, article.category, article)
             if hasattr(article, 'tags'):
                 for tag in article.tags:
@@ -92,9 +89,10 @@ class ArticlesProcessor(Processor):
 
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
+        self.dates = self.articles
+        self.dates.sort(key=attrgetter('date'))
         # and generate the output :)
-        self._update_context(context, ('articles', 'dates', 'years',
-                                       'tags', 'categories'))
+        self._update_context(context, ('articles', 'dates', 'tags', 'categories'))
 
     def process(self, context, generator):
         self.generate_feeds(context, generator)
diff --git a/pelican/themes/notmyidea/templates/archives.html b/pelican/themes/notmyidea/templates/archives.html
index b3e534b7..1644affb 100644
--- a/pelican/themes/notmyidea/templates/archives.html
+++ b/pelican/themes/notmyidea/templates/archives.html
@@ -4,11 +4,9 @@
 <h1>Archives for {{ SITENAME }}</h1>
 
 <dl>
-{% for date, articles in dates %}
-    {% for article in articles %}
-        <dt>{{ date }}</dt>
-        <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
-    {% endfor %}
+{% for article in dates %}
+    <dt>{{ article.date.strftime('%a %d %B %Y') }}</dt>
+    <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
 {% endfor %}
 </dl>
 </section>

From dd202744d03bdee89bd014218a9b0fd5aa6a81a9 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 27 Nov 2010 15:20:38 +0000
Subject: [PATCH 0080/2864] Oops. Make a copy of the list before modifying it !

---
 pelican/processors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/processors.py b/pelican/processors.py
index d35abdbf..c209cafd 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -89,7 +89,7 @@ class ArticlesProcessor(Processor):
 
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
-        self.dates = self.articles
+        self.dates = list(self.articles)
         self.dates.sort(key=attrgetter('date'))
         # and generate the output :)
         self._update_context(context, ('articles', 'dates', 'tags', 'categories'))

From 7d11af5630c9cc0ea0367a30f3c30d9bb3c16215 Mon Sep 17 00:00:00 2001
From: Philippe Pepiot <phil@philpep.org>
Date: Wed, 1 Dec 2010 02:30:38 +0100
Subject: [PATCH 0081/2864] Dont use relative urls if SITEURL is set. Feeds
 needs absolutes urls

---
 pelican/generators.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index f5374722..7e4fe327 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -64,8 +64,7 @@ class Generator(object):
         for p in processors:
             p.process(context, self)
 
-    def generate_feed(self, elements, context, filename=None, 
-        relative_urls=True):
+    def generate_feed(self, elements, context, filename=None):
         """Generate a feed with the list of articles provided
 
         Return the feed. If no output_path or filename is specified, just return
@@ -75,22 +74,18 @@ class Generator(object):
         :param context: the context to get the feed metadata.
         :param output_path: where to output the file.
         :param filename: the filename to output.
-        :param relative_urls: use relative urls or absolutes ones
         """
-        if relative_urls:
-            site_url = self._get_relative_siteurl(filename)
-        else:
-            site_url = context['SITEURL']
+        site_url = context.get('SITEURL', self._get_relative_siteurl(filename))
 
         feed = Atom1Feed(
             title=context['SITENAME'],
             link=site_url,
-            feed_url= filename,
+            feed_url= "%s/%s" % (site_url, filename),
             description=context.get('SITESUBTITLE', ''))
         for element in elements:
             feed.add_item(
                 title=element.title,
-                link= element.url,
+                link= "%s/%s" % (site_url, element.url),
                 description=element.content,
                 author_name=getattr(element, 'author', 'John Doe'),
                 pubdate=element.date)

From a8ac5c626868850565ad66bbfed1c894f52a7ef6 Mon Sep 17 00:00:00 2001
From: Philippe Pepiot <phil@philpep.org>
Date: Wed, 1 Dec 2010 02:48:11 +0100
Subject: [PATCH 0082/2864] Support RSS2 feeds

---
 README.rst            |  2 ++
 pelican/generators.py | 10 +++++++---
 pelican/processors.py | 10 ++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 60ac7cae..8846f34f 100644
--- a/README.rst
+++ b/README.rst
@@ -109,8 +109,10 @@ Setting name              what it does ?
 `STATIC_PATHS`            The static paths you want to copy under "static"
 `FEED`                    relative url to output the feed. Default is
                           `feeds/all.atom.xml`
+`FEED_RSS`                relative url to output the rss feed. Default is None (no rss)
 `CATEGORY_FEED`           Where to put the categories feeds. default is 
                           `feeds/%s.atom.xml`
+`CATEGORY_FEED_RSS`       Where to put the categories rss feeds. default is None (no rss)
 `CSS_FILE`                To specify the CSS file you want to load, if it's not 
                           the default one ('main.css')
 =======================   =======================================================
diff --git a/pelican/generators.py b/pelican/generators.py
index 7e4fe327..2c97d76a 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -4,7 +4,7 @@ from codecs import open
 
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
-from feedgenerator import Atom1Feed
+from feedgenerator import Atom1Feed, Rss201rev2Feed
 
 from pelican.settings import read_settings
 from pelican.utils import clean_output_dir
@@ -64,7 +64,8 @@ class Generator(object):
         for p in processors:
             p.process(context, self)
 
-    def generate_feed(self, elements, context, filename=None):
+    def generate_feed(self, elements, context, filename=None,
+            feed_type='atom'):
         """Generate a feed with the list of articles provided
 
         Return the feed. If no output_path or filename is specified, just return
@@ -74,10 +75,13 @@ class Generator(object):
         :param context: the context to get the feed metadata.
         :param output_path: where to output the file.
         :param filename: the filename to output.
+        :param feed_type: the feed type to use (atom or rss)
         """
         site_url = context.get('SITEURL', self._get_relative_siteurl(filename))
 
-        feed = Atom1Feed(
+        feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
+
+        feed = feed_class(
             title=context['SITENAME'],
             link=site_url,
             feed_url= "%s/%s" % (site_url, filename),
diff --git a/pelican/processors.py b/pelican/processors.py
index c209cafd..fe21e9f3 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -35,11 +35,21 @@ class ArticlesProcessor(Processor):
 
         generator.generate_feed(self.articles, context, context['FEED'])
 
+        if 'FEED_RSS' in context:
+            generator.generate_feed(self.articles, context,
+                    context['FEED_RSS'], feed_type='rss')
+
         for cat, arts in self.categories.items():
             arts.sort(key=attrgetter('date'), reverse=True)
             generator.generate_feed(arts, context,
                                     context['CATEGORY_FEED'] % cat)
 
+            if 'CATEGORY_FEED_RSS' in context:
+                generator.generate_feed(arts, context,
+                        context['CATEGORY_FEED_RSS'] % cat,
+                        feed_type='rss')
+
+
     def generate_pages(self, context, generator):
         """Generate the pages on the disk"""
 

From 8fd1c50086b1d520bcf59fa561e8f1ed4676c42f Mon Sep 17 00:00:00 2001
From: Philippe Pepiot <phil@philpep.org>
Date: Wed, 1 Dec 2010 02:52:35 +0100
Subject: [PATCH 0083/2864] Support tags on feeds

---
 pelican/generators.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index 2c97d76a..678c4bd9 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -91,6 +91,7 @@ class Generator(object):
                 title=element.title,
                 link= "%s/%s" % (site_url, element.url),
                 description=element.content,
+                categories=element.tags,
                 author_name=getattr(element, 'author', 'John Doe'),
                 pubdate=element.date)
 

From 3b7c546136d6987414e8d93804de18b5e86810e5 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 1 Dec 2010 18:45:44 +0000
Subject: [PATCH 0084/2864] Fix #15: check for tags before using them in the
 feeds.

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 678c4bd9..cbe905a8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -91,7 +91,7 @@ class Generator(object):
                 title=element.title,
                 link= "%s/%s" % (site_url, element.url),
                 description=element.content,
-                categories=element.tags,
+                categories=element.tags if hasattr(element, "tags") else None,
                 author_name=getattr(element, 'author', 'John Doe'),
                 pubdate=element.date)
 

From 836d4ea117483ae8f030d1857d8291606c71750f Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 2 Dec 2010 03:22:24 +0000
Subject: [PATCH 0085/2864] Refactoring, Again :)

Added some more notes about how this is working on the documentation. I do think
that the overall structure is clearer now, and easiest to understand. After all,
that's how it should always be !

--HG--
rename : pelican/processors.py => pelican/generators.py
rename : pelican/generators.py => pelican/writers.py
---
 README.rst                                    |   4 +
 THANKS                                        |   1 +
 bin/pelican                                   |  39 +--
 docs/internals.rst                            |  81 +++++
 pelican/__init__.py                           | 104 ++++++
 pelican/contents.py                           |   2 +-
 pelican/generators.py                         | 316 +++++++++++-------
 pelican/processors.py                         | 179 ----------
 pelican/settings.py                           |   2 +-
 pelican/themes/notmyidea/templates/index.html |   2 +-
 pelican/utils.py                              |   7 +
 pelican/writers.py                            |  80 +++++
 12 files changed, 473 insertions(+), 344 deletions(-)
 create mode 100644 docs/internals.rst
 delete mode 100644 pelican/processors.py
 create mode 100644 pelican/writers.py

diff --git a/README.rst b/README.rst
index 8846f34f..84cd594d 100644
--- a/README.rst
+++ b/README.rst
@@ -177,6 +177,10 @@ Source code
 You can access the source code via mercurial at http://hg.notmyidea.org/pelican/
 or via git on http://github.com/ametaireau/pelican/
 
+If you feel hackish, have a look to the `pelican's internals explanations
+<http://alexis.notmyidea.org/pelican/internals.html>`_.
+
+
 Feedback !
 ----------
 
diff --git a/THANKS b/THANKS
index 7c316d5f..168c0398 100644
--- a/THANKS
+++ b/THANKS
@@ -8,3 +8,4 @@ bugs or giving ideas. Thanks to them !
 - Jérome Renard
 - Nicolas Martin
 - David Kulak
+- Arnaud Bos
diff --git a/bin/pelican b/bin/pelican
index 098bd9e0..3fe2ee57 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -1,38 +1,3 @@
 #!/usr/bin/env python
-import argparse
-
-from pelican.generators import Generator
-from pelican.processors import (ArticlesProcessor, PagesProcessor, 
-                                StaticProcessor, PdfProcessor)
-
-parser = argparse.ArgumentParser(description="""A tool to generate a
-static blog, with restructured text input files.""")
-
-parser.add_argument(dest='path',
-    help='Path where to find the content files')
-parser.add_argument('-t', '--theme-path', dest='theme',
-    help='Path where to find the theme templates. If not specified, it will'
-         'use the default one included with pelican.')
-parser.add_argument('-o', '--output', dest='output',
-    help='Where to output the generated files. If not specified, a directory'
-         ' will be created, named "output" in the current path.')
-parser.add_argument('-m', '--markup', default='rst, md', dest='markup',
-    help='the markup language to use. Currently only ReSTreucturedtext is'
-          ' available.')
-parser.add_argument('-s', '--settings', dest='settings',
-    help='the settings of the application. Default to None.')
-
-
-if __name__ == '__main__':
-    args = parser.parse_args()
-    markup = [a.split()[0] for a in args.markup.split(',')]
-
-    generator = Generator(args.settings, args.path, args.theme, 
-                          args.output, markup)
-
-    processors = [ArticlesProcessor, PagesProcessor, StaticProcessor]
-    if generator.settings['PDF_PROCESSOR']:
-        processors.append(PdfProcessor)
-
-    generator.run(processors)
-    print "Enjoy !"
+from pelican import main
+main()
diff --git a/docs/internals.rst b/docs/internals.rst
new file mode 100644
index 00000000..80fc8661
--- /dev/null
+++ b/docs/internals.rst
@@ -0,0 +1,81 @@
+Pelican internals
+#################
+
+This section describe how pelican is working internally. As you'll see, it's
+quite simple, but a bit of documentation doesn't hurt :)
+
+Overall structure
+=================
+
+What `pelican` does, is taking a list of files, and processing them, to some
+sort of output. Usually, the files are restructured text and markdown files,
+and the output is a blog, but it can be anything you want.
+
+I've separated the logic in different classes and concepts:
+
+* `writers` are responsible of all the writing process of the
+  files. It's writing .html files, RSS feeds and so on. Since those operations 
+  are commonly used, the object is created once, and then passed to the 
+  generators.
+
+* `readers` are used to read from various formats (Markdown, and Restructured
+  Text for now, but the system is extensible). Given a file, they return
+  metadata (author, tags, category etc) and content (HTML formated)
+
+* `generators` generate the different outputs. For instance, pelican comes with
+  `ArticlesGenerator` and `PageGenerator`, into others. Given
+  a configurations, they can do whatever they want. Most of the time it's
+  generating files from inputs.
+
+* `pelican` also uses `templates`, so it's easy to write you own theme. The
+  syntax is `jinja2`, and, trust me, really easy to learn, so don't hesitate
+  a second.
+
+How to implement a new reader ?
+===============================
+
+There is an awesome markup language you want to add to pelican ?
+Well, the only thing you have to do is to create a class that have a `read`
+method, that is returning an HTML content and some metadata.
+
+Take a look to the Markdown reader::
+
+    class MarkdownReader(object):
+
+        def read(self, filename):
+            """Parse content and metadata of markdown files"""
+            text = open(filename)
+            md = Markdown(extensions = ['meta', 'codehilite'])
+            content = md.convert(text)
+            
+            metadatas = {}
+            for name, value in md.Meta.items():
+                if name in _METADATAS_FIELDS:
+                    meta = _METADATAS_FIELDS[name](value[0])
+                else:
+                    meta = value[0]
+                metadatas[name.lower()] = meta
+            return content, metadatas
+
+Simple isn't it ?
+
+How to implement a new generator ?
+==================================
+
+Generators have basically two important methods. You're not forced to create
+both, only the existing ones will be called.
+
+* `generate_context`, that is called in a first place, for all the generators.
+  Do whatever you have to do, and update the global context if needed. This
+  context is shared between all generators, and will be passed to the
+  templates. For instance, the `PageGenerator` `generate_context` method find
+  all the pages, transform them into objects, and populate the context with
+  them. Be careful to *not* output anything using this context at this stage,
+  as it is likely to change by the effect of others generators.
+
+* `generate_output` is then called. And guess what is it made for ? Oh,
+  generating the output :) That's here that you may want to look at the context
+  and call the methods of the `writer` object, that is passed at the first
+  argument of this function. In the `PageGenerator` example, this method will
+  look at all the pages recorded in the global context, and output a file on
+  the disk (using the writer method `write_file`) for each page encountered.
diff --git a/pelican/__init__.py b/pelican/__init__.py
index e69de29b..3e7c90ec 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -0,0 +1,104 @@
+import argparse
+import os
+
+from pelican.settings import read_settings
+from pelican.utils import clean_output_dir
+from pelican.writers import Writer
+from pelican.generators import (ArticlesGenerator, PagesGenerator, 
+                                StaticGenerator, PdfGenerator)
+
+
+def init_params(settings=None, path=None, theme=None, output_path=None, 
+        markup=None):
+    """Read the settings, and performs some checks on the environment
+    before doing anything else.
+    """
+    if settings is None:
+        settings = {}
+    settings = read_settings(settings)
+    path = path or settings['PATH']
+    if path.endswith('/'):
+        path = path[:-1]
+
+    # define the default settings
+    theme = theme or settings['THEME']
+    output_path = output_path or settings['OUTPUT_PATH']
+    output_path = os.path.realpath(output_path)
+    markup = markup or settings['MARKUP']
+
+    # find the theme in pelican.theme if the given one does not exists
+    if not os.path.exists(theme):
+        theme_path = os.sep.join([os.path.dirname(
+            os.path.abspath(__file__)), "themes/%s" % theme])
+        if os.path.exists(theme_path):
+            theme = theme_path
+        else:
+            raise Exception("Impossible to find the theme %s" % theme)
+
+    if 'SITEURL' not in settings:
+        settings['SITEURL'] = output_path
+
+    # get the list of files to parse
+    if not path:
+        raise Exception('you need to specify a path to search the docs on !')
+
+    return settings, path, theme, output_path, markup
+
+
+def run_generators(generators, settings, path, theme, output_path, markup):
+    """Run the generators and return"""
+
+    context = settings.copy()
+    generators = [p(context, settings, path, theme, output_path, markup) 
+            for p in generators]
+
+    writer = Writer(output_path)
+
+    for p in generators:
+        if hasattr(p, 'generate_context'):
+            p.generate_context()
+
+    # erase the directory if it is not the source
+    if output_path not in os.path.realpath(path):
+        clean_output_dir(output_path)
+
+    for p in generators:
+        if hasattr(p, 'generate_output'):
+            p.generate_output(writer)
+
+
+def run_pelican(settings, path, theme, output_path, markup):
+    """Run pelican with the given parameters"""
+
+    params = init_params(settings, path, theme, output_path, markup)
+    generators = [ArticlesGenerator, PagesGenerator, StaticGenerator]
+    if params[0]['PDF_GENERATOR']:  # param[0] is settings
+        processors.append(PdfGenerator)
+    run_generators(generators, *params)
+
+
+def main():
+    parser = argparse.ArgumentParser(description="""A tool to generate a
+    static blog, with restructured text input files.""")
+
+    parser.add_argument(dest='path',
+        help='Path where to find the content files')
+    parser.add_argument('-t', '--theme-path', dest='theme',
+        help='Path where to find the theme templates. If not specified, it will'
+             'use the default one included with pelican.')
+    parser.add_argument('-o', '--output', dest='output',
+        help='Where to output the generated files. If not specified, a directory'
+             ' will be created, named "output" in the current path.')
+    parser.add_argument('-m', '--markup', default='rst, md', dest='markup',
+        help='the markup language to use. Currently only ReSTreucturedtext is'
+              ' available.')
+    parser.add_argument('-s', '--settings', dest='settings',
+        help='the settings of the application. Default to None.')
+    args = parser.parse_args()
+    markup = [a.split()[0] for a in args.markup.split(',')]
+
+    run_pelican(args.settings, args.path, args.theme, args.output, markup)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/pelican/contents.py b/pelican/contents.py
index 815a0cde..0caceed0 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -2,7 +2,7 @@ from pelican.utils import slugify, truncate_html_words
 
 
 class Page(object):
-    """Represents a page..
+    """Represents a page
     Given a content, and metadatas, create an adequate object.
 
     :param string: the string to parse, containing the original content.
diff --git a/pelican/generators.py b/pelican/generators.py
index cbe905a8..34a1b181 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,137 +1,29 @@
-# -*- coding: utf-8 -*-
+from operator import attrgetter
+from datetime import datetime
 import os
-from codecs import open
 
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
-from feedgenerator import Atom1Feed, Rss201rev2Feed
 
-from pelican.settings import read_settings
-from pelican.utils import clean_output_dir
+from pelican.utils import update_dict, copytree
+from pelican.contents import Article, Page, is_valid_content
+from pelican.readers import read_file
 
 _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
               'archives', 'page')
+_DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
 
 
 class Generator(object):
-    """Handle all generation process: files writes, feed creation, and this
-    kind of basic stuff"""
-    
-    def __init__(self, settings=None, path=None, theme=None, output_path=None, 
-        markup=None):
-        """Read the settings, and performs some checks on the environment 
-        before doing anything else.
-        """
-        if settings is None:
-            settings = {}
-        self.settings = read_settings(settings)
-        self.path = path or self.settings['PATH']
-        if self.path.endswith('/'):
-            self.path = self.path[:-1]
+    """Baseclass generator"""
 
-        self.theme = theme or self.settings['THEME']
-        output_path = output_path or self.settings['OUTPUT_PATH']
-        self.output_path = os.path.realpath(output_path)
-        self.markup = markup or self.settings['MARKUP']
+    def __init__(self, *args, **kwargs):
+        for idx, item in enumerate(('context', 'settings', 'path', 'theme',
+                'output_path', 'markup')):
+            setattr(self, item, args[idx])
 
-        if not os.path.exists(self.theme):
-            theme_path = os.sep.join([os.path.dirname(
-                os.path.abspath(__file__)), "themes/%s" % self.theme])
-            if os.path.exists(theme_path):
-                self.theme = theme_path
-            else:
-                raise Exception("Impossible to find the theme %s" % self.theme)
-
-        if 'SITEURL' not in self.settings:
-            self.settings['SITEURL'] = self.output_path
-
-        # get the list of files to parse
-        if not path:
-            raise Exception('you need to specify a path to search the docs on !')
-
-    def run(self, processors):
-        """Get the context from each processor, and then process them"""
-        context = self.settings.copy()
-        processors = [p() for p in processors]
-
-        for p in processors:
-            if hasattr(p, 'preprocess'):
-                p.preprocess(context, self)
-
-        if self.output_path not in os.path.realpath(self.path):
-            clean_output_dir(self.output_path)
-
-        for p in processors:
-            p.process(context, self)
-
-    def generate_feed(self, elements, context, filename=None,
-            feed_type='atom'):
-        """Generate a feed with the list of articles provided
-
-        Return the feed. If no output_path or filename is specified, just return
-        the feed object.
-
-        :param articles: the articles to put on the feed.
-        :param context: the context to get the feed metadata.
-        :param output_path: where to output the file.
-        :param filename: the filename to output.
-        :param feed_type: the feed type to use (atom or rss)
-        """
-        site_url = context.get('SITEURL', self._get_relative_siteurl(filename))
-
-        feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
-
-        feed = feed_class(
-            title=context['SITENAME'],
-            link=site_url,
-            feed_url= "%s/%s" % (site_url, filename),
-            description=context.get('SITESUBTITLE', ''))
-        for element in elements:
-            feed.add_item(
-                title=element.title,
-                link= "%s/%s" % (site_url, element.url),
-                description=element.content,
-                categories=element.tags if hasattr(element, "tags") else None,
-                author_name=getattr(element, 'author', 'John Doe'),
-                pubdate=element.date)
-
-        if filename:
-            complete_path = os.path.join(self.output_path, filename)
-            try:
-                os.makedirs(os.path.dirname(complete_path))
-            except Exception:
-                pass
-            fp = open(complete_path, 'w')
-            feed.write(fp, 'utf-8')
-            print u' [ok] writing %s' % complete_path
-            
-            fp.close()
-        return feed
-
-    def generate_file(self, name, template, context, relative_urls=True, 
-        **kwargs):
-        """Write the file with the given informations
-
-        :param name: name of the file to output
-        :param template: template to use to generate the content
-        :param context: dict to pass to the templates.
-        :param relative_urls: use relative urls or absolutes ones
-        :param **kwargs: additional variables to pass to the templates
-        """
-        context = context.copy()
-        if relative_urls:
-            context['SITEURL'] = self._get_relative_siteurl(name)
-
-        context.update(kwargs)
-        output = template.render(context)
-        filename = os.sep.join((self.output_path, name))
-        try:
-            os.makedirs(os.path.dirname(filename))
-        except Exception:
-            pass
-        with open(filename, 'w', encoding='utf-8') as f:
-            f.write(output)
-        print u' [ok] writing %s' % filename
+        for arg, value in kwargs.items():
+            setattr(self, arg, value)
 
     def get_templates(self):
         """Return the templates to use.
@@ -166,7 +58,181 @@ class Generator(object):
             files.extend([os.sep.join((root, f)) for f in temp_files
                 if True in [f.endswith(ext) for ext in extensions]])
         return files
-    
-    def _get_relative_siteurl(self, filename):
-        """Return the siteurl relative to the given filename"""
-        return '../' * filename.count('/') + '.'
+
+    def _update_context(self, items):
+        """Update the context with the given items from the currrent
+        processor.
+        """
+        for item in items:
+            value = getattr(self, item)
+            if hasattr(value, 'items'):
+                value = value.items()
+            self.context[item] = value
+
+
+class ArticlesGenerator(Generator):
+    """Generate blog articles"""
+
+    def __init__(self, *args, **kwargs):
+        """initialize properties"""
+        self.articles = []
+        self.dates = {}
+        self.tags = {}
+        self.categories = {}
+        super(ArticlesGenerator, self).__init__(*args, **kwargs)
+
+    def generate_feeds(self, writer):
+        """Generate the feeds from the current context, and output files."""
+
+        writer.write_feed(self.articles, self.context, self.settings['FEED'])
+
+        if 'FEED_RSS' in self.settings:
+            writer.write_feed(self.articles, self.context,
+                    self.settings['FEED_RSS'], feed_type='rss')
+
+        for cat, arts in self.categories.items():
+            arts.sort(key=attrgetter('date'), reverse=True)
+            writer.write_feed(arts, self.context,
+                              self.settings['CATEGORY_FEED'] % cat)
+
+            if 'CATEGORY_FEED_RSS' in self.settings:
+                writer.write_feed(arts, self.context,
+                        self.settings['CATEGORY_FEED_RSS'] % cat,
+                        feed_type='rss')
+
+
+    def generate_pages(self, writer):
+        """Generate the pages on the disk
+        TODO: change the name"""
+
+        templates = self.get_templates()
+        write = writer.write_file
+        for template in _DIRECT_TEMPLATES:
+            write('%s.html' % template, templates[template], self.context,
+                    blog=True)
+        for tag in self.tags:
+            write('tag/%s.html' % tag, templates['tag'], self.context, tag=tag)
+        for cat in self.categories:
+            write('category/%s.html' % cat, templates['category'], self.context,
+                          category=cat, articles=self.categories[cat])
+        for article in self.articles:
+            write('%s' % article.url,
+                          templates['article'], self.context, article=article,
+                          category=article.category)
+
+    def generate_context(self):
+        """change the context"""
+
+        # return the list of files to use
+        files = self.get_files(self.path, exclude=['pages',])
+        for f in files:
+            content, metadatas = read_file(f)
+
+            # if no category is set, use the name of the path as a category
+            if 'category' not in metadatas.keys():
+                category = os.path.dirname(f).replace(
+                    os.path.expanduser(self.path)+'/', '')
+
+                if category == self.path:
+                    category = self.settings['DEFAULT_CATEGORY']
+
+                if category != '':
+                    metadatas['category'] = unicode(category)
+
+            if 'date' not in metadatas.keys()\
+                and self.settings['FALLBACK_ON_FS_DATE']:
+                    metadatas['date'] = datetime.fromtimestamp(os.stat(f).st_ctime)
+
+            article = Article(content, metadatas, settings=self.settings,
+                              filename=f)
+            if not is_valid_content(article, f):
+                continue
+
+            update_dict(self.categories, article.category, article)
+            if hasattr(article, 'tags'):
+                for tag in article.tags:
+                    update_dict(self.tags, tag, article)
+            self.articles.append(article)
+
+        # sort the articles by date
+        self.articles.sort(key=attrgetter('date'), reverse=True)
+        self.dates = list(self.articles)
+        self.dates.sort(key=attrgetter('date'))
+        # and generate the output :)
+        self._update_context(('articles', 'dates', 'tags', 'categories'))
+
+    def generate_output(self, writer):
+        self.generate_feeds(writer)
+        self.generate_pages(writer)
+
+
+class PagesGenerator(Generator):
+    """Generate pages"""
+
+    def __init__(self, *args, **kwargs):
+        self.pages = []
+        super(PagesGenerator, self).__init__(*args, **kwargs)
+
+    def generate_context(self):
+        for f in self.get_files(os.sep.join((self.path, 'pages'))):
+            content, metadatas = read_file(f)
+            page = Page(content, metadatas, settings=self.settings,
+                        filename=f)
+            if not is_valid_content(page, f):
+                continue
+            self.pages.append(page)
+
+        self._update_context(('pages', ))
+
+    def generate_output(self, writer):
+        templates = self.get_templates()
+        for page in self.pages:
+            writer.write_file('pages/%s' % page.url, templates['page'],
+                    self.context, page=page)
+        self._update_context(('pages',))
+
+
+class StaticGenerator(Generator):
+    """copy static paths to output"""
+
+    def _copy_paths(self, paths, source, destination, output_path,
+            final_path=None):
+        for path in paths:
+            copytree(path, source, os.path.join(output_path, destination),
+                    final_path)
+
+    def generate_output(self, writer):
+        self._copy_paths(self.settings['STATIC_PATHS'], self.path,
+                         'static', self.output_path)
+        self._copy_paths(self.settings['THEME_PATHS'], self.theme,
+                         'theme', self.output_path, '.')
+
+
+class PdfGenerator(Generator):
+    """Generate PDFs on the output dir, for all articles and pages coming from
+    rst"""
+    def __init__(self, *args, **kwargs):
+        try:
+            from rst2pdf.createpdf import RstToPdf
+            self.pdfcreator = RstToPdf(breakside=0, stylesheets=['twelvepoint'])
+        except ImportError:
+            raise Exception("unable to find rst2pdf")
+        super(PdfGenerator, self).__init(*args, **kwargs)
+
+    def _create_pdf(self, obj, output_path):
+        if obj.filename.endswith(".rst"):
+            self.pdfcreator.createPdf(text=open(obj.filename).read(),
+                output=os.path.join(output_path, "%s.pdf" % obj.slug))
+
+    def generate_context(self):
+        pdf_path = os.path.join(self.output_path, 'pdf')
+        try:
+            os.mkdir(pdf_path)
+        except OSError:
+            pass
+
+        for article in self.context['articles']:
+            self._create_pdf(article, pdf_path)
+
+        for page in self.context['pages']:
+            self._create_pdf(page, pdf_path)
diff --git a/pelican/processors.py b/pelican/processors.py
deleted file mode 100644
index fe21e9f3..00000000
--- a/pelican/processors.py
+++ /dev/null
@@ -1,179 +0,0 @@
-from operator import attrgetter
-from datetime import datetime
-import os
-
-from pelican.utils import update_dict, copytree
-from pelican.contents import Article, Page, is_valid_content
-from pelican.readers import read_file
-
-_DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
-
-
-class Processor(object):
-
-    def _update_context(self, context, items):
-        """Update the context with the given items from the currrent
-        processor.
-        """
-        for item in items:
-            value = getattr(self, item)
-            if hasattr(value, 'items'):
-                value = value.items()
-            context[item] = value
-
-
-class ArticlesProcessor(Processor):
-
-    def __init__(self, settings=None):
-        self.articles = []
-        self.dates = {}
-        self.tags = {}
-        self.categories = {}
-
-    def generate_feeds(self, context, generator):
-        """Generate the feeds from the current context, and output files."""
-
-        generator.generate_feed(self.articles, context, context['FEED'])
-
-        if 'FEED_RSS' in context:
-            generator.generate_feed(self.articles, context,
-                    context['FEED_RSS'], feed_type='rss')
-
-        for cat, arts in self.categories.items():
-            arts.sort(key=attrgetter('date'), reverse=True)
-            generator.generate_feed(arts, context,
-                                    context['CATEGORY_FEED'] % cat)
-
-            if 'CATEGORY_FEED_RSS' in context:
-                generator.generate_feed(arts, context,
-                        context['CATEGORY_FEED_RSS'] % cat,
-                        feed_type='rss')
-
-
-    def generate_pages(self, context, generator):
-        """Generate the pages on the disk"""
-
-        templates = generator.get_templates()
-        generate = generator.generate_file
-        for template in _DIRECT_TEMPLATES:
-            generate('%s.html' % template, templates[template], context, blog=True)
-        for tag in self.tags:
-            generate('tag/%s.html' % tag, templates['tag'], context, tag=tag)
-        for cat in self.categories:
-            generate('category/%s.html' % cat, templates['category'], context,
-                          category=cat, articles=self.categories[cat])
-        for article in self.articles:
-            generate('%s' % article.url,
-                          templates['article'], context, article=article,
-                          category=article.category)
-
-    def preprocess(self, context, generator):
-
-        # build the list of articles / categories / etc.
-        files = generator.get_files(generator.path, exclude=['pages',])
-        for f in files:
-            content, metadatas = read_file(f)
-            if 'category' not in metadatas.keys():
-                category = os.path.dirname(f).replace(
-                    os.path.expanduser(generator.path)+'/', '')
-
-                if category == generator.path:
-                    category = context['DEFAULT_CATEGORY']
-
-                if category != '':
-                    metadatas['category'] = unicode(category)
-
-            if 'date' not in metadatas.keys() and context['FALLBACK_ON_FS_DATE']:
-                    metadatas['date'] = datetime.fromtimestamp(os.stat(f).st_ctime)
-
-            article = Article(content, metadatas, settings=generator.settings,
-                              filename=f)
-            if not is_valid_content(article, f):
-                continue
-
-            update_dict(self.categories, article.category, article)
-            if hasattr(article, 'tags'):
-                for tag in article.tags:
-                    update_dict(self.tags, tag, article)
-            self.articles.append(article)
-
-        # sort the articles by date
-        self.articles.sort(key=attrgetter('date'), reverse=True)
-        self.dates = list(self.articles)
-        self.dates.sort(key=attrgetter('date'))
-        # and generate the output :)
-        self._update_context(context, ('articles', 'dates', 'tags', 'categories'))
-
-    def process(self, context, generator):
-        self.generate_feeds(context, generator)
-        self.generate_pages(context, generator)
-
-
-class PagesProcessor(Processor):
-    """Generate pages"""
-
-    def __init__(self):
-        self.pages = []
-
-    def preprocess(self, context, generator):
-        for f in generator.get_files(os.sep.join((generator.path, 'pages'))):
-            content, metadatas = read_file(f)
-            page = Page(content, metadatas, settings=generator.settings,
-                        filename=f)
-            if not is_valid_content(page, f):
-                continue
-            self.pages.append(page)
-
-        context['PAGES'] = self.pages
-
-    def process(self, context, generator):
-        templates = generator.get_templates()
-        for page in self.pages:
-            generator.generate_file('pages/%s' % page.url,
-                               templates['page'], context, page=page)
-        self._update_context(context, ('pages',))
-
-
-class StaticProcessor(Processor):
-    """copy static paths to output"""
-
-    def _copy_paths(self, paths, source, destination, output_path,
-            final_path=None):
-        for path in paths:
-            copytree(path, source, os.path.join(output_path, destination),
-                    final_path)
-
-    def process(self, context, generator):
-        self._copy_paths(generator.settings['STATIC_PATHS'], generator.path,
-                         'static', generator.output_path)
-        self._copy_paths(generator.settings['THEME_PATHS'], generator.theme,
-                         'theme', generator.output_path, '.')
-
-
-class PdfProcessor(Processor):
-    """Generate PDFs on the output dir, for all articles and pages coming from
-    rst"""
-    def __init__(self):
-        try:
-            from rst2pdf.createpdf import RstToPdf
-            self.pdfcreator = RstToPdf(breakside=0, stylesheets=['twelvepoint'])
-        except ImportError:
-            raise Exception("unable to find rst2pdf")
-
-    def _create_pdf(self, obj, output_path):
-        if obj.filename.endswith(".rst"):
-            self.pdfcreator.createPdf(text=open(obj.filename).read(),
-                output=os.path.join(output_path, "%s.pdf" % obj.slug))
-
-    def process(self, context, generator):
-        pdf_path = os.path.join(generator.output_path, 'pdf')
-        try:
-            os.mkdir(pdf_path)
-        except OSError:
-            pass
-
-        for article in context['articles']:
-            self._create_pdf(article, pdf_path)
-
-        for page in context['pages']:
-            self._create_pdf(page, pdf_path)
diff --git a/pelican/settings.py b/pelican/settings.py
index 79de75cd..431340cc 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -12,7 +12,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
                    'SITENAME': 'A Pelican Blog',
                    'DISPLAY_PAGES_ON_MENU': True,
-                   'PDF_PROCESSOR': False,
+                   'PDF_GENERATOR': False,
                    'DEFAULT_CATEGORY': 'misc',
                    'FALLBACK_ON_FS_DATE': True,
                    'CSS_FILE': 'main.css',
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 57f0b22f..aa6f30ec 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
-{% block content %}        
 {% block content_title %}{% endblock %}
+{% block content %}        
 {% if articles %}
 {% for article in articles %}        
     {% if loop.index == 1 %}
diff --git a/pelican/utils.py b/pelican/utils.py
index 79bd4e38..c1410039 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -64,6 +64,7 @@ def copytree(path, origin, destination, topath=None):
     except OSError:
         pass
 
+
 def clean_output_dir(path):
     """Remove all the files from the output directory"""
 
@@ -73,6 +74,12 @@ def clean_output_dir(path):
     except Exception as e:
         pass
 
+
+def get_relative_path(filename):
+    """Return the relative path to the given filename"""
+    return '../' * filename.count('/') + '.'
+
+
 def truncate_html_words(s, num, end_text='...'):
     """Truncates HTML to a certain number of words (not counting tags and
     comments). Closes opened tags if they were correctly closed in the given
diff --git a/pelican/writers.py b/pelican/writers.py
new file mode 100644
index 00000000..e71156c0
--- /dev/null
+++ b/pelican/writers.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+import os
+from codecs import open
+
+from feedgenerator import Atom1Feed, Rss201rev2Feed
+
+from pelican.utils import get_relative_path
+
+class Writer(object):
+
+    def __init__(self, output_path):
+        self.output_path = output_path
+
+    def write_feed(self, elements, context, filename=None, feed_type='atom'):
+        """Generate a feed with the list of articles provided
+
+        Return the feed. If no output_path or filename is specified, just return
+        the feed object.
+
+        :param articles: the articles to put on the feed.
+        :param context: the context to get the feed metadata.
+        :param output_path: where to output the file.
+        :param filename: the filename to output.
+        :param feed_type: the feed type to use (atom or rss)
+        """
+        site_url = context.get('SITEURL', get_relative_path(filename))
+
+        feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
+
+        feed = feed_class(
+            title=context['SITENAME'],
+            link=site_url,
+            feed_url= "%s/%s" % (site_url, filename),
+            description=context.get('SITESUBTITLE', ''))
+        for element in elements:
+            feed.add_item(
+                title=element.title,
+                link= "%s/%s" % (site_url, element.url),
+                description=element.content,
+                categories=element.tags if hasattr(element, "tags") else None,
+                author_name=getattr(element, 'author', 'John Doe'),
+                pubdate=element.date)
+
+        if filename:
+            complete_path = os.path.join(self.output_path, filename)
+            try:
+                os.makedirs(os.path.dirname(complete_path))
+            except Exception:
+                pass
+            fp = open(complete_path, 'w')
+            feed.write(fp, 'utf-8')
+            print u' [ok] writing %s' % complete_path
+
+            fp.close()
+        return feed
+
+    def write_file(self, name, template, context, relative_urls=True,
+        **kwargs):
+        """Render the template and write the file.
+
+        :param name: name of the file to output
+        :param template: template to use to generate the content
+        :param context: dict to pass to the templates.
+        :param relative_urls: use relative urls or absolutes ones
+        :param **kwargs: additional variables to pass to the templates
+        """
+        localcontext = context.copy()
+        if relative_urls:
+            localcontext['SITEURL'] = get_relative_path(name)
+
+        localcontext.update(kwargs)
+        output = template.render(localcontext)
+        filename = os.sep.join((self.output_path, name))
+        try:
+            os.makedirs(os.path.dirname(filename))
+        except Exception:
+            pass
+        with open(filename, 'w', encoding='utf-8') as f:
+            f.write(output)
+        print u' [ok] writing %s' % filename

From 9bdb5b8a885e1e79c3579eb60245e3b9966e32c9 Mon Sep 17 00:00:00 2001
From: Freeculture <guillaume@lame.homelinux.com>
Date: Fri, 3 Dec 2010 09:28:40 -0800
Subject: [PATCH 0086/2864] A large image causes problem in article excerpt. It
 comes on following excerpt area. I think the best thing to do is to disable
 display of images in excerpt.

---
 pelican/themes/notmyidea/static/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index fd443ebe..f0fd028b 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -355,7 +355,7 @@ img.left, figure.left {float: right; margin: 0 0 2em 2em;}
 }
 li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 #content > .hentry {padding: 1em 0;}
-
+.hentry img{display : none ;}
 .entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;}
 .entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
 .entry-title a:visited {background-color: #fff;}

From f49c91070a601705292673e0912dd85da2ed45a2 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 5 Dec 2010 19:15:02 +0000
Subject: [PATCH 0087/2864] Add a documentation about themes.

---
 README.rst            | 45 ++++++++++++++--------
 docs/themes.rst       | 90 +++++++++++++++++++++++++++++++++++++++++++
 pelican/generators.py | 10 +++--
 pelican/settings.py   |  2 +-
 4 files changed, 125 insertions(+), 22 deletions(-)
 create mode 100644 docs/themes.rst

diff --git a/README.rst b/README.rst
index 84cd594d..17905c32 100644
--- a/README.rst
+++ b/README.rst
@@ -36,8 +36,8 @@ You can also use a markdown syntax (with a file ending in `.md`)::
     Put you content here.
 
 Note that none of those are mandatory: if the date is not specified, pelican will
-rely on the mtime of your file, and the category can also be determined by the 
-directory where the rst file is. For instance, the category of 
+rely on the mtime of your file, and the category can also be determined by the
+directory where the rst file is. For instance, the category of
 `python/foobar/myfoobar.rst` is `foobar`.
 
 Features
@@ -46,8 +46,8 @@ Features
 Pelican currently supports:
 
 * blog articles
-* comments, via an external service (disqus). Please notice that while 
-  it's useful, it's an external service, and you'll not manage the 
+* comments, via an external service (disqus). Please notice that while
+  it's useful, it's an external service, and you'll not manage the
   comments by yourself. It could potentially eat your data.
 * theming support (themes are done using `jinja2 <http://jinjna.pocoo.org>`_)
 * PDF generation of the articles/pages (optional).
@@ -55,7 +55,7 @@ Pelican currently supports:
 Getting started — Generate your blog
 -------------------------------------
 
-You're ready? Let's go ! You can install pelican in a lot of different ways, 
+You're ready? Let's go ! You can install pelican in a lot of different ways,
 the simpler one is via `pip <http://pip.openplans.org/>`_::
 
     $ pip install pelican
@@ -67,7 +67,7 @@ Then, you have just to launch pelican, like this::
 And… that's all! You can see your weblog generated on the `content/` folder.
 
 This one will just generate a simple output, with the default theme. It's not
-really sexy, as it's a simple HTML output (without any style). 
+really sexy, as it's a simple HTML output (without any style).
 
 You can create your own style if you want, have a look to the help to see all
 the options you can use::
@@ -82,7 +82,7 @@ the command line::
 
     $ pelican -s path/to/your/settingsfile.py path
 
-Here are the available settings. Please note that all the settings you put in 
+Here are the available settings. Please note that all the settings you put in
 this file will be passed to the templates as well.
 
 =======================   =======================================================
@@ -96,7 +96,7 @@ Setting name              what it does ?
 `OUTPUT_PATH`             Where to output the generated files. Default to
                           "output"
 `SITENAME`                Your site name,
-`DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template. 
+`DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template.
                           Templates can follow or not this settings.
 `PDF_PROCESSOR`           Put True if you want to have PDF versions of your
                           documents. You will need to install `rst2pdf`.
@@ -106,14 +106,22 @@ Setting name              what it does ?
                           metadata?
 `MARKUP`                  A list of available markup languages you want to use.
                           moment, only available values are `rst` and `md`.
-`STATIC_PATHS`            The static paths you want to copy under "static"
-`FEED`                    relative url to output the feed. Default is
+`STATIC_PATHS`            The static paths you want to have accessible on the
+                          output path "static". By default, pelican will copy
+                          the 'images' folder to the output folder.
+`STATIC_THEME_PATHS`      Static theme paths you want to copy. Default values
+                          is `static`, but if your theme have others static paths,
+                          you can put them here.
+`FEED`                    relative url to output the atom feed. Default is
                           `feeds/all.atom.xml`
-`FEED_RSS`                relative url to output the rss feed. Default is None (no rss)
-`CATEGORY_FEED`           Where to put the categories feeds. default is 
-                          `feeds/%s.atom.xml`
-`CATEGORY_FEED_RSS`       Where to put the categories rss feeds. default is None (no rss)
-`CSS_FILE`                To specify the CSS file you want to load, if it's not 
+`FEED_RSS`                relative url to output the rss feed. Default is
+                          None (no rss)
+`CATEGORY_FEED`           Where to put the atom categories feeds. default is
+                          `feeds/%s.atom.xml`, where %s is the name of the
+                          category.
+`CATEGORY_FEED_RSS`       Where to put the categories rss feeds. default is None
+                          (no rss)
+`CSS_FILE`                To specify the CSS file you want to load, if it's not
                           the default one ('main.css')
 =======================   =======================================================
 
@@ -124,11 +132,14 @@ Themes
 
 * notmyidea
 * simple (a synonym for "full text" :)
-* martyalchin 
+* martyalchin
 
 You can define your own theme too, and specify it's emplacement in the same
 way (be sure to specify the full absolute path to it).
 
+Here is `a guide on how to create your theme
+<http://alexis.notmyidea.org/pelican/themes.html>`_
+
 The `notmyidea` theme can make good use of the following settings. I recommend
 to use them too in your themes.
 
@@ -142,7 +153,7 @@ Setting name              what it does ?
 `LINKS`                   A list of tuples (Title, Url) for links to appear on
                           the header.
 `SOCIAL`                  A list of tuples (Title, Url) to appear in the "social"
-                          section. 
+                          section.
 `GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
 =======================   =======================================================
 
diff --git a/docs/themes.rst b/docs/themes.rst
new file mode 100644
index 00000000..7b7c0de5
--- /dev/null
+++ b/docs/themes.rst
@@ -0,0 +1,90 @@
+How to create themes for pelican
+################################
+
+Pelican uses the great `jinja2 <http://jinjna.pocoo.org>`_ templating engine to
+generate it's HTML output.
+
+Structure
+=========
+
+To make your own theme, you must follow the following structure::
+
+    ├── static
+    │   ├── css
+    │   └── images
+    └── templates
+        ├── archives.html
+        ├── article.html
+        ├── categories.html
+        ├── category.html
+        ├── index.html
+        ├── page.html
+        ├── tag.html
+        └── tags.html
+
+* `static` contains all the static content. It will be copied on the output
+  `theme/static` folder then. I've put the css and image folders, but they are
+  just examples. Put what you need here.
+
+* `templates` contains all the templates that will be used to generate the content.
+  I've just put the mandatory templates here, you can define your own if it helps 
+  you to organize yourself while doing the theme.
+ 
+Templates and variables
+=======================
+
+It's using a simple syntax, that you can embbed into your html pages.
+This document describes which templates should exists on a theme, and which
+variables will be passed to each template, while generating it.
+
+All templates will receive the variables defined in your settings file, if they 
+are in caps. You can access them directly. 
+
+Common variables
+----------------
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+articles        That's the list of articles, ordsered desc. by date
+                all the elements are `Article` objects, so you can 
+                access their properties (e.g. title, summary, author
+                etc. 
+dates           The same list of article, but ordered by date,
+                ascending
+tags            A dict containing each tags (keys), and the list of
+                relative articles.
+categories      A dict containing each category (keys), and the 
+                list of relative articles.
+pages           The list of pages
+=============   ===================================================
+
+category.html
+-------------
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+articles        The articles of this category
+category        The name of the category being processed
+=============   ===================================================
+
+article.html
+-------------
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+article         The article object to be displayed
+category        The name of the category of the current article
+=============   ===================================================
+
+tag.html
+--------
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+tag             The name of the tag being processed
+articles        Articles related to this tag
+=============   ===================================================
diff --git a/pelican/generators.py b/pelican/generators.py
index 34a1b181..8ba776ab 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -110,8 +110,9 @@ class ArticlesGenerator(Generator):
         for template in _DIRECT_TEMPLATES:
             write('%s.html' % template, templates[template], self.context,
                     blog=True)
-        for tag in self.tags:
-            write('tag/%s.html' % tag, templates['tag'], self.context, tag=tag)
+        for tag, articles in self.tags.items():
+            write('tag/%s.html' % tag, templates['tag'], self.context, tag=tag, 
+                    articles=articles)
         for cat in self.categories:
             write('category/%s.html' % cat, templates['category'], self.context,
                           category=cat, articles=self.categories[cat])
@@ -193,7 +194,8 @@ class PagesGenerator(Generator):
 
 
 class StaticGenerator(Generator):
-    """copy static paths to output"""
+    """copy static paths (what you want to cpy, like images, medias etc.
+    to output"""
 
     def _copy_paths(self, paths, source, destination, output_path,
             final_path=None):
@@ -204,7 +206,7 @@ class StaticGenerator(Generator):
     def generate_output(self, writer):
         self._copy_paths(self.settings['STATIC_PATHS'], self.path,
                          'static', self.output_path)
-        self._copy_paths(self.settings['THEME_PATHS'], self.theme,
+        self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
                          'theme', self.output_path, '.')
 
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 431340cc..88d2bde6 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -7,7 +7,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'OUTPUT_PATH': 'output/',
                    'MARKUP': ('rst', 'md'),
                    'STATIC_PATHS': ['images',],
-                   'THEME_PATHS': ['static',],
+                   'THEME_STATIC_PATHS': ['static',],
                    'FEED': 'feeds/all.atom.xml',
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
                    'SITENAME': 'A Pelican Blog',

From 44d2968976249f02302ef5f926019eb22f510ae3 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 5 Dec 2010 22:54:42 +0000
Subject: [PATCH 0088/2864] Update the sample config with the one I use.

---
 samples/pelican.conf.py  |  1 +
 samples/test_settings.py | 21 ---------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 create mode 120000 samples/pelican.conf.py
 delete mode 100644 samples/test_settings.py

diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
new file mode 120000
index 00000000..f74e77a9
--- /dev/null
+++ b/samples/pelican.conf.py
@@ -0,0 +1 @@
+/home/alexis/projets/notmyidea.org/blog/pelican.conf.py
\ No newline at end of file
diff --git a/samples/test_settings.py b/samples/test_settings.py
deleted file mode 100644
index 85729eb7..00000000
--- a/samples/test_settings.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-PATH = 'samples/content' 
-THEME = 'samples/themes/notmyidea'
-AUTHOR = u'Alexis Métaireau'
-
-SITENAME = 'Pelican'
-SITESUBTITLE = u"%s's weblog" % AUTHOR
-SITEURL = 'http://blog.notmyidea.org'
-
-SITEROLL = (('Biologeek', 'http://biologeek.org'),
-            ('Filyb', "http://filyb.info/"),
-            ('Libert-fr', "http://www.libert-fr.com"),
-            ('N1k0', "http://prendreuncafe.com/blog/"),
-            (u'Tarek Ziadé', "http://ziade.org/blog"),
-            ('Zubin Mithra', "http://zubin71.wordpress.com/"),)
-
-MENUITEMS = (('home', 'http://notmyidea.org'),
-             ('contact', 'mailto: alexis notmyidea org'),)
-
-SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
-          ('lastfm', 'http://lastfm.com/user/akounet'),)

From f352d16971a6bceddc2318d2dca122dd5a41f9e3 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 5 Dec 2010 23:11:45 +0000
Subject: [PATCH 0089/2864] Put the real version of the conf file, not the
 symbolic link ;)

---
 samples/pelican.conf.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 samples/pelican.conf.py

diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
deleted file mode 120000
index f74e77a9..00000000
--- a/samples/pelican.conf.py
+++ /dev/null
@@ -1 +0,0 @@
-/home/alexis/projets/notmyidea.org/blog/pelican.conf.py
\ No newline at end of file
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
new file mode 100644
index 00000000..f921ee91
--- /dev/null
+++ b/samples/pelican.conf.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+AUTHOR = u'Alexis Métaireau'
+SITENAME = u"Alexis' log" 
+SITEURL = 'http://blog.notmyidea.org'
+
+GITHUB_URL = 'http://github.com/ametaireau/'
+DISQUS_SITENAME = "blog-notmyidea"
+PDF_PROCESSOR = False
+
+LINKS = (('Biologeek', 'http://biologeek.org'),
+            ('Filyb', "http://filyb.info/"),
+            ('Libert-fr', "http://www.libert-fr.com"),
+            ('N1k0', "http://prendreuncafe.com/blog/"),
+            (u'Tarek Ziadé', "http://ziade.org/blog"),
+            ('Zubin Mithra', "http://zubin71.wordpress.com/"),)
+
+SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
+          ('lastfm', 'http://lastfm.com/user/akounet'),
+          ('github', 'http://github.com/ametaireau'),)

From 8cca3d8f01392dfd4156b8329b1c04c09e2d5c3c Mon Sep 17 00:00:00 2001
From: Freeculture <guillaume@lame.homelinux.com>
Date: Mon, 6 Dec 2010 06:09:19 -0800
Subject: [PATCH 0090/2864] Original theme force image alignment on the right.
 Removed it to choose it with a markup langage.

---
 pelican/themes/notmyidea/static/css/main.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index f0fd028b..0972ca0b 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -25,9 +25,7 @@ body {
     text-align: left;
 }
 
-article img{
-   float: right;
-}
+
 
 /* Headings */
 h1 {font-size: 2em }

From 497b725dab61fcd5af54e624b11ed355e2b612e6 Mon Sep 17 00:00:00 2001
From: Florian Preinstorfer <nblock@archlinux.us>
Date: Fri, 10 Dec 2010 19:37:32 +0100
Subject: [PATCH 0091/2864] fixed a spelling error

---
 pelican/themes/notmyidea/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index aa6f30ec..d01e9928 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -23,7 +23,7 @@
         </article></aside><!-- /#featured -->
         {% if loop.length  > 1 %}
             <section id="content" class="body">
-                <h1>Others articles</h1>
+                <h1>Other articles</h1>
                 <hr />
                     <ol id="posts-list" class="hfeed">
         {% endif %}

From bdbba6bc6859d038c3d0d149f191684cc30845d6 Mon Sep 17 00:00:00 2001
From: Florian Preinstorfer <nblock@archlinux.us>
Date: Fri, 10 Dec 2010 20:28:45 +0100
Subject: [PATCH 0092/2864] fixed generation of archive.html (template simple)

-just one loop needed
-same date format as in index.html (template simple)
---
 pelican/themes/simple/templates/archives.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pelican/themes/simple/templates/archives.html b/pelican/themes/simple/templates/archives.html
index 9414f5be..17877390 100644
--- a/pelican/themes/simple/templates/archives.html
+++ b/pelican/themes/simple/templates/archives.html
@@ -3,11 +3,9 @@
 <h1>Archives for {{ SITENAME }}</h2>
 
 <dl>
-{% for date, articles in dates %}
-    {% for article in articles %}
-        <dt>{{ date }}</dt>
-        <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
-    {% endfor %}
+{% for article in dates %}
+    <dt>{{ article.date.strftime('%Y-%m-%d %H:%M') }}</dt>
+    <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
 {% endfor %}
 </dl>
 {% endblock %}

From 69762295c8b060fee16e94d4ee27dac8f24e297a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 12 Dec 2010 19:47:36 +0000
Subject: [PATCH 0093/2864] Add a quick note about pages.

---
 README.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.rst b/README.rst
index 17905c32..027f8198 100644
--- a/README.rst
+++ b/README.rst
@@ -74,6 +74,12 @@ the options you can use::
 
     $ pelican --help
 
+Pages
+-----
+
+If you create a folder named `pages`, all the files in it will be used to
+generate static pages.
+
 Settings
 --------
 

From 7c82f5e037399916eef1488ab187b54050326557 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 13 Dec 2010 22:46:53 +0000
Subject: [PATCH 0094/2864] 2.5.1

---
 pelican/__init__.py | 4 ++--
 setup.py            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 3e7c90ec..7f37f46c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -52,8 +52,6 @@ def run_generators(generators, settings, path, theme, output_path, markup):
     generators = [p(context, settings, path, theme, output_path, markup) 
             for p in generators]
 
-    writer = Writer(output_path)
-
     for p in generators:
         if hasattr(p, 'generate_context'):
             p.generate_context()
@@ -62,6 +60,8 @@ def run_generators(generators, settings, path, theme, output_path, markup):
     if output_path not in os.path.realpath(path):
         clean_output_dir(output_path)
 
+    writer = Writer(output_path)
+
     for p in generators:
         if hasattr(p, 'generate_output'):
             p.generate_output(writer)
diff --git a/setup.py b/setup.py
index be9c0569..d461cb46 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.5.0',
+    version = '2.5.1',
     url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From a0817db16e89248d5d4c449455541d4a77f4c9ca Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 13 Dec 2010 22:46:58 +0000
Subject: [PATCH 0095/2864] Added tag 2.5.1 for changeset 294a2830a393

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 59157608..2ee4d129 100644
--- a/.hgtags
+++ b/.hgtags
@@ -20,3 +20,4 @@ e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1
 26a444fbb78becae358afa0a5b47587db8739b21 2.4.4
 3542b65fd1963ae7065b6a3bc912fbb6c150e98c 2.4.5
 87745dfdd51b96bf18eaaf6c402effa902c1b856 2.5.0
+294a2830a393d5a97671dc211dbdb5254a15e604 2.5.1

From d93557fe3568639bf507b2382a0a12d7c06ce9c5 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 13 Dec 2010 22:47:32 +0000
Subject: [PATCH 0096/2864] Added tag 2.5.1 for changeset 92b31e41134c

---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 2ee4d129..0d83ed03 100644
--- a/.hgtags
+++ b/.hgtags
@@ -21,3 +21,5 @@ e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1
 3542b65fd1963ae7065b6a3bc912fbb6c150e98c 2.4.5
 87745dfdd51b96bf18eaaf6c402effa902c1b856 2.5.0
 294a2830a393d5a97671dc211dbdb5254a15e604 2.5.1
+294a2830a393d5a97671dc211dbdb5254a15e604 2.5.1
+92b31e41134cb2c1a156ce623338cf634d2ebc3e 2.5.1

From dd97b35029245a46735cabdcbe78642b7b612a64 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 14 Dec 2010 15:05:43 +0000
Subject: [PATCH 0097/2864] Add the tag list to the articles, if any.

---
 pelican/themes/notmyidea/templates/article.html | 5 +++--
 pelican/themes/notmyidea/templates/index.html   | 2 ++
 pelican/themes/notmyidea/templates/taglist.html | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 pelican/themes/notmyidea/templates/taglist.html

diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 86b63231..8b5e5bae 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -16,7 +16,8 @@
                         By <a class="url fn" href="#">{{ article.author }}</a>
                 </address>
                 {% endif %}
-                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
+                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. 
+        {% include 'taglist.html' %}
         </footer><!-- /.post-info -->
         {{ article.content }}
         </div><!-- /.entry-content -->
@@ -37,4 +38,4 @@
 
 </article>
 </section>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index d01e9928..2f61d6d5 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -18,6 +18,7 @@
                         </address>
                         {% endif %}
                 <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
+                {% include 'taglist.html' %}
                 </footer><!-- /.post-info -->
                 {{ article.content }}
         </article></aside><!-- /#featured -->
@@ -43,6 +44,7 @@
                                 By <a class="url fn" href="#">{{ article.author }}</a>
                         </address>
                         <p> In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
+                        {% include 'taglist.html' %}
                     <p>{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">pdf</a>{% endif %}</p>
                 </footer><!-- /.post-info -->
                 {{ article.summary }}
diff --git a/pelican/themes/notmyidea/templates/taglist.html b/pelican/themes/notmyidea/templates/taglist.html
new file mode 100644
index 00000000..4259077a
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/taglist.html
@@ -0,0 +1,2 @@
+{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}</p>{% endif %}
+{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>

From e0e62d8b8e93cf096c8c18dc66db221772e0d8a0 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 14 Dec 2010 15:31:11 +0000
Subject: [PATCH 0098/2864] Update the documentation.

---
 README.rst               | 164 +--------------------------------------
 docs/conf.py             |   6 +-
 docs/getting_started.rst |  87 +++++++++++++++++++++
 docs/index.rst           |  54 ++++++++++++-
 docs/settings.rst        |  90 +++++++++++++++++++++
 5 files changed, 235 insertions(+), 166 deletions(-)
 create mode 100644 docs/getting_started.rst
 mode change 120000 => 100644 docs/index.rst
 create mode 100644 docs/settings.rst

diff --git a/README.rst b/README.rst
index 027f8198..71d94290 100644
--- a/README.rst
+++ b/README.rst
@@ -9,37 +9,6 @@ Pelican is a simple weblog generator, writen in python.
 * Easy to interface with DVCSes and web hooks
 * Completely static output, so easy to host anywhere !
 
-Files metadata
---------------
-
-Pelican tries to be smart enough to get the informations he needs from the
-file system (for instance, about the category of your articles), but you need to
-provide by hand some of those informations in your files.
-
-You could provide the metadata in the restructured text files, using the
-following syntax (give your file the `.rst` extension)::
-
-    My super title
-    ##############
-
-    :date: 2010-10-03 10:20
-    :tags: thats, awesome
-    :category: yeah
-    :author: Alexis Metaireau
-
-
-You can also use a markdown syntax (with a file ending in `.md`)::
-
-    Date: 2010-12-03
-    Title: My super title
-
-    Put you content here.
-
-Note that none of those are mandatory: if the date is not specified, pelican will
-rely on the mtime of your file, and the category can also be determined by the
-directory where the rst file is. For instance, the category of
-`python/foobar/myfoobar.rst` is `foobar`.
-
 Features
 --------
 
@@ -52,142 +21,14 @@ Pelican currently supports:
 * theming support (themes are done using `jinja2 <http://jinjna.pocoo.org>`_)
 * PDF generation of the articles/pages (optional).
 
-Getting started — Generate your blog
--------------------------------------
-
-You're ready? Let's go ! You can install pelican in a lot of different ways,
-the simpler one is via `pip <http://pip.openplans.org/>`_::
-
-    $ pip install pelican
-
-Then, you have just to launch pelican, like this::
-
-    $ pelican /path/to/your/content/
-
-And… that's all! You can see your weblog generated on the `content/` folder.
-
-This one will just generate a simple output, with the default theme. It's not
-really sexy, as it's a simple HTML output (without any style).
-
-You can create your own style if you want, have a look to the help to see all
-the options you can use::
-
-    $ pelican --help
-
-Pages
------
-
-If you create a folder named `pages`, all the files in it will be used to
-generate static pages.
-
-Settings
---------
-
-Pelican is configurable thanks a configuration file, that you can pass to
-the command line::
-
-    $ pelican -s path/to/your/settingsfile.py path
-
-Here are the available settings. Please note that all the settings you put in
-this file will be passed to the templates as well.
-
-=======================   =======================================================
-Setting name              what it does ?
-=======================   =======================================================
-`SITEURL`                 base URL of your website.
-`PATH`                    path to look at for input files.
-`THEME`                   theme to use to product the output. can be the
-                          complete static path to a theme folder, or chosen
-                          between the list of default themes (see below)
-`OUTPUT_PATH`             Where to output the generated files. Default to
-                          "output"
-`SITENAME`                Your site name,
-`DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template.
-                          Templates can follow or not this settings.
-`PDF_PROCESSOR`           Put True if you want to have PDF versions of your
-                          documents. You will need to install `rst2pdf`.
-`DEFAULT_CATEGORY`        The default category to fallback on. `misc` by default.
-`FALLBACK_ON_FS_DATE`     If True, pelican will use the file system dates infos
-                          (mtime) if it can't get informations from the
-                          metadata?
-`MARKUP`                  A list of available markup languages you want to use.
-                          moment, only available values are `rst` and `md`.
-`STATIC_PATHS`            The static paths you want to have accessible on the
-                          output path "static". By default, pelican will copy
-                          the 'images' folder to the output folder.
-`STATIC_THEME_PATHS`      Static theme paths you want to copy. Default values
-                          is `static`, but if your theme have others static paths,
-                          you can put them here.
-`FEED`                    relative url to output the atom feed. Default is
-                          `feeds/all.atom.xml`
-`FEED_RSS`                relative url to output the rss feed. Default is
-                          None (no rss)
-`CATEGORY_FEED`           Where to put the atom categories feeds. default is
-                          `feeds/%s.atom.xml`, where %s is the name of the
-                          category.
-`CATEGORY_FEED_RSS`       Where to put the categories rss feeds. default is None
-                          (no rss)
-`CSS_FILE`                To specify the CSS file you want to load, if it's not
-                          the default one ('main.css')
-=======================   =======================================================
-
-Themes
-------
-
-3 themes are available. You can specify them using the `-t` option:
-
-* notmyidea
-* simple (a synonym for "full text" :)
-* martyalchin
-
-You can define your own theme too, and specify it's emplacement in the same
-way (be sure to specify the full absolute path to it).
-
-Here is `a guide on how to create your theme
-<http://alexis.notmyidea.org/pelican/themes.html>`_
-
-The `notmyidea` theme can make good use of the following settings. I recommend
-to use them too in your themes.
-
-=======================   =======================================================
-Setting name              what it does ?
-=======================   =======================================================
-`GITHUB_URL`              Your github URL (if you have one), it will then
-                          use it to create a github ribbon.
-`DISQUS_SITENAME`         Pelican can handle disqus comments, specify the
-                          sitename you've filled in on disqus
-`LINKS`                   A list of tuples (Title, Url) for links to appear on
-                          the header.
-`SOCIAL`                  A list of tuples (Title, Url) to appear in the "social"
-                          section.
-`GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
-=======================   =======================================================
-
-In addition, you can use the "wide" version of the `notmyidea` theme, by
-adding that in your configuration::
-
-    CSS_FILE = "wide.css"
+Have a look to `the documentation <http://alexis.notmyidea.org/pelican/>`_ for
+more informations.
 
 Why the name "Pelican" ?
 ------------------------
 
 Heh, you didn't noticed? "Pelican" is an anagram for "Calepin" ;)
 
-Dependencies
-------------
-
-At this time, pelican is dependent of the following python packages:
-
-* feedgenerator, to generate the ATOM feeds.
-* jinja2, for templating support.
-* pygments, to have syntactic colorization
-* docutils and Markdown
-
-If you're not using python 2.7, you will also need `argparse`.
-
-All those dependencies will be processed automatically if you install pelican
-using setuptools/distribute or pip.
-
 Source code
 -----------
 
@@ -197,7 +38,6 @@ or via git on http://github.com/ametaireau/pelican/
 If you feel hackish, have a look to the `pelican's internals explanations
 <http://alexis.notmyidea.org/pelican/internals.html>`_.
 
-
 Feedback !
 ----------
 
diff --git a/docs/conf.py b/docs/conf.py
index 0efe92b2..159ddbcc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,14 +21,14 @@ pygments_style = 'sphinx'
 # a list of builtin themes.
 sys.path.append(os.path.abspath('_themes'))
 html_theme_path = ['_themes']
-html_theme = 'flask_small'
+html_theme = 'flask'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
-    'index_logo': 'pelican.png',
-    'github_fork': 'ametaireau/pelican',
+#    'index_logo': 'pelican.png',
+#    'github_fork': 'ametaireau/pelican',
 }
 
 # Add any paths that contain custom themes here, relative to this directory.
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
new file mode 100644
index 00000000..df3b71d9
--- /dev/null
+++ b/docs/getting_started.rst
@@ -0,0 +1,87 @@
+Getting started
+###############
+
+Installing
+==========
+
+You're ready? Let's go ! You can install pelican in a lot of different ways,
+the simpler one is via `pip <http://pip.openplans.org/>`_::
+
+    $ pip install pelican
+
+If you have the sources, you can install pelican using the distutils command
+install. I recommend to do so in a virtualenv::
+
+    $ virtualenv .
+    $ source bin/activate
+    $ python setup.py install
+
+Dependencies
+============
+
+At this time, pelican is dependent of the following python packages:
+
+* feedgenerator, to generate the ATOM feeds.
+* jinja2, for templating support.
+* pygments, to have syntactic colorization
+* docutils and Markdown
+
+If you're not using python 2.7, you will also need `argparse`.
+
+All those dependencies will be processed automatically if you install pelican
+using setuptools/distribute or pip.
+
+Files metadata
+==============
+
+Pelican tries to be smart enough to get the informations he needs from the
+file system (for instance, about the category of your articles), but you need to
+provide by hand some of those informations in your files.
+
+You could provide the metadata in the restructured text files, using the
+following syntax (give your file the `.rst` extension)::
+
+    My super title
+    ##############
+
+    :date: 2010-10-03 10:20
+    :tags: thats, awesome
+    :category: yeah
+    :author: Alexis Metaireau
+
+
+You can also use a markdown syntax (with a file ending in `.md`)::
+
+    Date: 2010-12-03
+    Title: My super title
+
+    Put you content here.
+
+Note that none of those are mandatory: if the date is not specified, pelican will
+rely on the mtime of your file, and the category can also be determined by the
+directory where the rst file is. For instance, the category of
+`python/foobar/myfoobar.rst` is `foobar`.
+
+Generate your blog
+==================
+
+To launch pelican, just use the `pelican` command::
+
+    $ pelican /path/to/your/content/
+
+And… that's all! You can see your weblog generated on the `content/` folder.
+
+This one will just generate a simple output, with the default theme. It's not
+really sexy, as it's a simple HTML output (without any style).
+
+You can create your own style if you want, have a look to the help to see all
+the options you can use::
+
+    $ pelican --help
+
+Pages
+=====
+
+If you create a folder named `pages`, all the files in it will be used to
+generate static pages.
+
diff --git a/docs/index.rst b/docs/index.rst
deleted file mode 120000
index 89a01069..00000000
--- a/docs/index.rst
+++ /dev/null
@@ -1 +0,0 @@
-../README.rst
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
new file mode 100644
index 00000000..9af7ff6b
--- /dev/null
+++ b/docs/index.rst
@@ -0,0 +1,53 @@
+Pelican
+#######
+
+Pelican is a simple weblog generator, writen in python.
+
+* Write your weblog entries directly with your editor of choice (vim!) and
+  directly in restructured text, or markdown.
+* A simple cli-tool to (re)generate the weblog.
+* Easy to interface with DVCSes and web hooks
+* Completely static output, so easy to host anywhere !
+
+Documentation
+=============
+
+.. toctree::
+   :maxdepth: 2
+   
+   getting_started
+   settings
+   themes
+   internals
+
+Features
+========
+
+Pelican currently supports:
+
+* blog articles
+* comments, via an external service (disqus). Please notice that while
+  it's useful, it's an external service, and you'll not manage the
+  comments by yourself. It could potentially eat your data.
+* theming support (themes are done using `jinja2 <http://jinjna.pocoo.org>`_)
+* PDF generation of the articles/pages (optional).
+
+Why the name "Pelican" ?
+========================
+
+Heh, you didn't noticed? "Pelican" is an anagram for "Calepin" ;)
+
+Source code
+===========
+
+You can access the source code via mercurial at http://hg.notmyidea.org/pelican/
+or via git on http://github.com/ametaireau/pelican/
+
+Feedback !
+==========
+
+If you want to see new features in Pelican, dont hesitate to tell me, to clone
+the repository, etc. That's open source, dude!
+
+Contact me at "alexis at notmyidea dot org" for any request/feedback !
+
diff --git a/docs/settings.rst b/docs/settings.rst
new file mode 100644
index 00000000..85679eb5
--- /dev/null
+++ b/docs/settings.rst
@@ -0,0 +1,90 @@
+Settings
+########
+
+Specifying the settings
+=======================
+
+Pelican is configurable thanks to a configuration file, that you can pass to
+the command line::
+
+    $ pelican -s path/to/your/settingsfile.py path
+
+Here are the available settings. Please note that all the settings you put in
+this file will be passed to the templates as well.
+
+=======================   =======================================================
+Setting name              what it does ?
+=======================   =======================================================
+`SITEURL`                 base URL of your website.
+`PATH`                    path to look at for input files.
+`THEME`                   theme to use to product the output. can be the
+                          complete static path to a theme folder, or chosen
+                          between the list of default themes (see below)
+`OUTPUT_PATH`             Where to output the generated files. Default to
+                          "output"
+`SITENAME`                Your site name,
+`DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template.
+                          Templates can follow or not this settings.
+`PDF_PROCESSOR`           Put True if you want to have PDF versions of your
+                          documents. You will need to install `rst2pdf`.
+`DEFAULT_CATEGORY`        The default category to fallback on. `misc` by default.
+`FALLBACK_ON_FS_DATE`     If True, pelican will use the file system dates infos
+                          (mtime) if it can't get informations from the
+                          metadata?
+`MARKUP`                  A list of available markup languages you want to use.
+                          moment, only available values are `rst` and `md`.
+`STATIC_PATHS`            The static paths you want to have accessible on the
+                          output path "static". By default, pelican will copy
+                          the 'images' folder to the output folder.
+`STATIC_THEME_PATHS`      Static theme paths you want to copy. Default values
+                          is `static`, but if your theme have others static paths,
+                          you can put them here.
+`FEED`                    relative url to output the atom feed. Default is
+                          `feeds/all.atom.xml`
+`FEED_RSS`                relative url to output the rss feed. Default is
+                          None (no rss)
+`CATEGORY_FEED`           Where to put the atom categories feeds. default is
+                          `feeds/%s.atom.xml`, where %s is the name of the
+                          category.
+`CATEGORY_FEED_RSS`       Where to put the categories rss feeds. default is None
+                          (no rss)
+`CSS_FILE`                To specify the CSS file you want to load, if it's not
+                          the default one ('main.css')
+=======================   =======================================================
+
+Themes
+======
+
+3 themes are available. You can specify them using the `-t` option:
+
+* notmyidea
+* simple (a synonym for "full text" :)
+* martyalchin
+
+You can define your own theme too, and specify it's emplacement in the same
+way (be sure to specify the full absolute path to it).
+
+Here is `a guide on how to create your theme
+<http://alexis.notmyidea.org/pelican/themes.html>`_
+
+The `notmyidea` theme can make good use of the following settings. I recommend
+to use them too in your themes.
+
+=======================   =======================================================
+Setting name              what it does ?
+=======================   =======================================================
+`GITHUB_URL`              Your github URL (if you have one), it will then
+                          use it to create a github ribbon.
+`DISQUS_SITENAME`         Pelican can handle disqus comments, specify the
+                          sitename you've filled in on disqus
+`LINKS`                   A list of tuples (Title, Url) for links to appear on
+                          the header.
+`SOCIAL`                  A list of tuples (Title, Url) to appear in the "social"
+                          section.
+`GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
+=======================   =======================================================
+
+In addition, you can use the "wide" version of the `notmyidea` theme, by
+adding that in your configuration::
+
+    CSS_FILE = "wide.css"

From 5748a91ad706d25805c10a0a27ea4106008d00ee Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 14 Dec 2010 15:48:35 +0000
Subject: [PATCH 0099/2864] Add PAGES to the context

---
 docs/getting_started.rst | 2 ++
 pelican/generators.py    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index df3b71d9..a6eaf79b 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -85,3 +85,5 @@ Pages
 If you create a folder named `pages`, all the files in it will be used to
 generate static pages.
 
+Then, use the `DISPLAY_PAGES_ON_MENU` setting, which will add all the pages to 
+the menu.
diff --git a/pelican/generators.py b/pelican/generators.py
index 8ba776ab..11f964fb 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -184,13 +184,13 @@ class PagesGenerator(Generator):
             self.pages.append(page)
 
         self._update_context(('pages', ))
+        self.context['PAGES'] = self.pages
 
     def generate_output(self, writer):
         templates = self.get_templates()
         for page in self.pages:
             writer.write_file('pages/%s' % page.url, templates['page'],
                     self.context, page=page)
-        self._update_context(('pages',))
 
 
 class StaticGenerator(Generator):

From 3e9b80e993091163f9088940cb812b4af42d7fee Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 14 Dec 2010 15:55:26 +0000
Subject: [PATCH 0100/2864] Fix #21: Add a setting for the archive order
 (REVERSE_ARCHIVE_ORDER)

---
 docs/settings.rst     | 2 ++
 pelican/generators.py | 2 +-
 pelican/settings.py   | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 85679eb5..365eb24f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -50,6 +50,8 @@ Setting name              what it does ?
                           (no rss)
 `CSS_FILE`                To specify the CSS file you want to load, if it's not
                           the default one ('main.css')
+`REVERSE_ARCHIVE_ORDER`   Reverse the archives order. (True makes it in
+                          descending order: the newer first)
 =======================   =======================================================
 
 Themes
diff --git a/pelican/generators.py b/pelican/generators.py
index 11f964fb..d6077408 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -158,7 +158,7 @@ class ArticlesGenerator(Generator):
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
         self.dates = list(self.articles)
-        self.dates.sort(key=attrgetter('date'))
+        self.dates.sort(key=attrgetter('date'), reverse=self.context['REVERSE_ARCHIVE_ORDER'])
         # and generate the output :)
         self._update_context(('articles', 'dates', 'tags', 'categories'))
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 88d2bde6..bf5afacd 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -16,6 +16,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DEFAULT_CATEGORY': 'misc',
                    'FALLBACK_ON_FS_DATE': True,
                    'CSS_FILE': 'main.css',
+                   'REVERSE_ARCHIVE_ORDER': False,
                   }
 
 def read_settings(filename):

From 1d2af7aa0117e1ab07b5056fa634f47eeb703dfa Mon Sep 17 00:00:00 2001
From: Florian Preinstorfer <nblock@archlinux.us>
Date: Tue, 14 Dec 2010 23:45:45 +0100
Subject: [PATCH 0101/2864] added a keep commandline switch (-k, --keep)

-keep output directory if keep commandline switch is provided
-added KEEP_OUTPUT_DIRECTORY to settings (default is to delete output
directory before processing)
-updated documentation
---
 docs/settings.rst   |  2 ++
 pelican/__init__.py | 19 +++++++++++--------
 pelican/settings.py |  1 +
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 365eb24f..e2876f96 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -52,6 +52,8 @@ Setting name              what it does ?
                           the default one ('main.css')
 `REVERSE_ARCHIVE_ORDER`   Reverse the archives order. (True makes it in
                           descending order: the newer first)
+`KEEP_OUTPUT_DIRECTORY`   Keep the output directory and just update all the generated files. 
+                          Default is to delete the output directory.   
 =======================   =======================================================
 
 Themes
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 7f37f46c..a26ba8ff 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,7 +9,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
 
 
 def init_params(settings=None, path=None, theme=None, output_path=None, 
-        markup=None):
+        markup=None, keep=False):
     """Read the settings, and performs some checks on the environment
     before doing anything else.
     """
@@ -25,6 +25,7 @@ def init_params(settings=None, path=None, theme=None, output_path=None,
     output_path = output_path or settings['OUTPUT_PATH']
     output_path = os.path.realpath(output_path)
     markup = markup or settings['MARKUP']
+    keep = keep or settings['KEEP_OUTPUT_DIRECTORY']
 
     # find the theme in pelican.theme if the given one does not exists
     if not os.path.exists(theme):
@@ -42,14 +43,14 @@ def init_params(settings=None, path=None, theme=None, output_path=None,
     if not path:
         raise Exception('you need to specify a path to search the docs on !')
 
-    return settings, path, theme, output_path, markup
+    return settings, path, theme, output_path, markup, keep
 
 
-def run_generators(generators, settings, path, theme, output_path, markup):
+def run_generators(generators, settings, path, theme, output_path, markup, keep):
     """Run the generators and return"""
 
     context = settings.copy()
-    generators = [p(context, settings, path, theme, output_path, markup) 
+    generators = [p(context, settings, path, theme, output_path, markup, keep) 
             for p in generators]
 
     for p in generators:
@@ -57,7 +58,7 @@ def run_generators(generators, settings, path, theme, output_path, markup):
             p.generate_context()
 
     # erase the directory if it is not the source
-    if output_path not in os.path.realpath(path):
+    if output_path not in os.path.realpath(path) and not keep:
         clean_output_dir(output_path)
 
     writer = Writer(output_path)
@@ -67,10 +68,10 @@ def run_generators(generators, settings, path, theme, output_path, markup):
             p.generate_output(writer)
 
 
-def run_pelican(settings, path, theme, output_path, markup):
+def run_pelican(settings, path, theme, output_path, markup, delete):
     """Run pelican with the given parameters"""
 
-    params = init_params(settings, path, theme, output_path, markup)
+    params = init_params(settings, path, theme, output_path, markup, delete)
     generators = [ArticlesGenerator, PagesGenerator, StaticGenerator]
     if params[0]['PDF_GENERATOR']:  # param[0] is settings
         processors.append(PdfGenerator)
@@ -94,10 +95,12 @@ def main():
               ' available.')
     parser.add_argument('-s', '--settings', dest='settings',
         help='the settings of the application. Default to None.')
+    parser.add_argument('-k', '--keep', action='store_true',
+        help='Keep the output directory and just update all the generated files. Default is to delete the output directory.')
     args = parser.parse_args()
     markup = [a.split()[0] for a in args.markup.split(',')]
 
-    run_pelican(args.settings, args.path, args.theme, args.output, markup)
+    run_pelican(args.settings, args.path, args.theme, args.output, markup, args.keep)
 
 
 if __name__ == '__main__':
diff --git a/pelican/settings.py b/pelican/settings.py
index bf5afacd..e3c511d3 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -17,6 +17,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'FALLBACK_ON_FS_DATE': True,
                    'CSS_FILE': 'main.css',
                    'REVERSE_ARCHIVE_ORDER': False,
+                   'KEEP_OUTPUT_DIRECTORY': False,
                   }
 
 def read_settings(filename):

From 3c8cafdc0d3a3dc48ec7dc7edb7336920343c661 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 15 Dec 2010 12:45:21 +0000
Subject: [PATCH 0102/2864] Make the long option a bit more verbose for
 --keep-output-directory

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index a26ba8ff..a4d76398 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -95,7 +95,7 @@ def main():
               ' available.')
     parser.add_argument('-s', '--settings', dest='settings',
         help='the settings of the application. Default to None.')
-    parser.add_argument('-k', '--keep', action='store_true',
+    parser.add_argument('-k', '--keep-output-directory', action='store_true',
         help='Keep the output directory and just update all the generated files. Default is to delete the output directory.')
     args = parser.parse_args()
     markup = [a.split()[0] for a in args.markup.split(',')]

From 62bd20a844b794c3dcaaf573d3eb1c983e561766 Mon Sep 17 00:00:00 2001
From: Florian Preinstorfer <nblock@archlinux.us>
Date: Wed, 15 Dec 2010 15:56:38 +0100
Subject: [PATCH 0103/2864] fixed a ValueError with -k option

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index a4d76398..069b0c87 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -95,7 +95,7 @@ def main():
               ' available.')
     parser.add_argument('-s', '--settings', dest='settings',
         help='the settings of the application. Default to None.')
-    parser.add_argument('-k', '--keep-output-directory', action='store_true',
+    parser.add_argument('-k', '--keep-output-directory', dest='keep', action='store_true',
         help='Keep the output directory and just update all the generated files. Default is to delete the output directory.')
     args = parser.parse_args()
     markup = [a.split()[0] for a in args.markup.split(',')]

From c347e3be42029239cf33e51bb71b34b76f60368b Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 15 Dec 2010 18:01:29 +0000
Subject: [PATCH 0104/2864] Switch back the theme. Order the settings.

---
 docs/conf.py      |  6 ++---
 docs/index.rst    | 21 ++++++++-------
 docs/settings.rst | 65 +++++++++++++++++++++++++----------------------
 3 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 159ddbcc..0efe92b2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,14 +21,14 @@ pygments_style = 'sphinx'
 # a list of builtin themes.
 sys.path.append(os.path.abspath('_themes'))
 html_theme_path = ['_themes']
-html_theme = 'flask'
+html_theme = 'flask_small'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
-#    'index_logo': 'pelican.png',
-#    'github_fork': 'ametaireau/pelican',
+    'index_logo': 'pelican.png',
+    'github_fork': 'ametaireau/pelican',
 }
 
 # Add any paths that contain custom themes here, relative to this directory.
diff --git a/docs/index.rst b/docs/index.rst
index 9af7ff6b..5fd8f8b7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -9,17 +9,6 @@ Pelican is a simple weblog generator, writen in python.
 * Easy to interface with DVCSes and web hooks
 * Completely static output, so easy to host anywhere !
 
-Documentation
-=============
-
-.. toctree::
-   :maxdepth: 2
-   
-   getting_started
-   settings
-   themes
-   internals
-
 Features
 ========
 
@@ -51,3 +40,13 @@ the repository, etc. That's open source, dude!
 
 Contact me at "alexis at notmyidea dot org" for any request/feedback !
 
+Documentation
+=============
+
+.. toctree::
+   :maxdepth: 2
+   
+   getting_started
+   settings
+   themes
+   internals
diff --git a/docs/settings.rst b/docs/settings.rst
index e2876f96..d1b84e0a 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -9,40 +9,17 @@ the command line::
 
     $ pelican -s path/to/your/settingsfile.py path
 
+Settings are given as the form of a python module (a file). You can have an
+example by looking at `/samples/pelican.conf.py
+<https://github.com/ametaireau/pelican/raw/master/samples/pelican.conf.py>`_
+
 Here are the available settings. Please note that all the settings you put in
 this file will be passed to the templates as well.
 
 =======================   =======================================================
 Setting name              what it does ?
 =======================   =======================================================
-`SITEURL`                 base URL of your website.
-`PATH`                    path to look at for input files.
-`THEME`                   theme to use to product the output. can be the
-                          complete static path to a theme folder, or chosen
-                          between the list of default themes (see below)
-`OUTPUT_PATH`             Where to output the generated files. Default to
-                          "output"
-`SITENAME`                Your site name,
-`DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template.
-                          Templates can follow or not this settings.
-`PDF_PROCESSOR`           Put True if you want to have PDF versions of your
-                          documents. You will need to install `rst2pdf`.
-`DEFAULT_CATEGORY`        The default category to fallback on. `misc` by default.
-`FALLBACK_ON_FS_DATE`     If True, pelican will use the file system dates infos
-                          (mtime) if it can't get informations from the
-                          metadata?
-`MARKUP`                  A list of available markup languages you want to use.
-                          moment, only available values are `rst` and `md`.
-`STATIC_PATHS`            The static paths you want to have accessible on the
-                          output path "static". By default, pelican will copy
-                          the 'images' folder to the output folder.
-`STATIC_THEME_PATHS`      Static theme paths you want to copy. Default values
-                          is `static`, but if your theme have others static paths,
-                          you can put them here.
-`FEED`                    relative url to output the atom feed. Default is
-                          `feeds/all.atom.xml`
-`FEED_RSS`                relative url to output the rss feed. Default is
-                          None (no rss)
+`AUTHOR`                  Default author (put your name)
 `CATEGORY_FEED`           Where to put the atom categories feeds. default is
                           `feeds/%s.atom.xml`, where %s is the name of the
                           category.
@@ -50,10 +27,38 @@ Setting name              what it does ?
                           (no rss)
 `CSS_FILE`                To specify the CSS file you want to load, if it's not
                           the default one ('main.css')
-`REVERSE_ARCHIVE_ORDER`   Reverse the archives order. (True makes it in
-                          descending order: the newer first)
+`DEFAULT_CATEGORY`        The default category to fallback on. `misc` by default.
+`DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template.
+                          Templates can follow or not this settings.
+`FALLBACK_ON_FS_DATE`     If True, pelican will use the file system dates infos
+                          (mtime) if it can't get informations from the
+                          metadata?
+`FEED`                    relative url to output the atom feed. Default is
+                          `feeds/all.atom.xml`
+`FEED_RSS`                relative url to output the rss feed. Default is
+                          None (no rss)
 `KEEP_OUTPUT_DIRECTORY`   Keep the output directory and just update all the generated files. 
                           Default is to delete the output directory.   
+`MARKUP`                  A list of available markup languages you want to use.
+                          moment, only available values are `rst` and `md`.
+`OUTPUT_PATH`             Where to output the generated files. Default to
+                          "output"
+`PATH`                    path to look at for input files.
+`PDF_PROCESSOR`           Put True if you want to have PDF versions of your
+                          documents. You will need to install `rst2pdf`.
+`REVERSE_ARCHIVE_ORDER`   Reverse the archives order. (True makes it in
+                          descending order: the newer first)
+`SITEURL`                 base URL of your website.
+`SITENAME`                Your site name,
+`STATIC_PATHS`            The static paths you want to have accessible on the
+                          output path "static". By default, pelican will copy
+                          the 'images' folder to the output folder.
+`STATIC_THEME_PATHS`      Static theme paths you want to copy. Default values
+                          is `static`, but if your theme have others static paths,
+                          you can put them here.
+`THEME`                   theme to use to product the output. can be the
+                          complete static path to a theme folder, or chosen
+                          between the list of default themes (see below)
 =======================   =======================================================
 
 Themes

From 2f38fab3e02eb5c2c088db98449c16ffaa4b74ae Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 15 Dec 2010 18:08:25 +0000
Subject: [PATCH 0105/2864] Add some explanations about the theme templates.

---
 docs/themes.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/themes.rst b/docs/themes.rst
index 7b7c0de5..340c3d44 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -43,6 +43,8 @@ are in caps. You can access them directly.
 Common variables
 ----------------
 
+All of those settings will be given to all templates.
+
 =============   ===================================================
 Variable        Description
 =============   ===================================================
@@ -62,6 +64,9 @@ pages           The list of pages
 category.html
 -------------
 
+This template will be processed for each of the existing categories, and will
+finally remain at output/category/`category_name`.html.
+
 =============   ===================================================
 Variable        Description
 =============   ===================================================
@@ -72,6 +77,9 @@ category        The name of the category being processed
 article.html
 -------------
 
+This template will be processed for each article. .html files will be outputed
+in output/`article_name`.html. Here are the specific variables it gets.
+
 =============   ===================================================
 Variable        Description
 =============   ===================================================
@@ -82,6 +90,9 @@ category        The name of the category of the current article
 tag.html
 --------
 
+For each tag, this template will be processed. It will create .html files in
+/output/tag/`tag_name`.html
+
 =============   ===================================================
 Variable        Description
 =============   ===================================================

From 6b25943a3ab611ea1fd1e815d57cd26fdca01a33 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 15 Dec 2010 18:09:43 +0000
Subject: [PATCH 0106/2864] Update THANKS

---
 THANKS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/THANKS b/THANKS
index 168c0398..0604e5db 100644
--- a/THANKS
+++ b/THANKS
@@ -9,3 +9,4 @@ bugs or giving ideas. Thanks to them !
 - Nicolas Martin
 - David Kulak
 - Arnaud Bos
+- nblock (Florian)

From 3a16dcec8c58fb58504f7d76b521b50334fd861b Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 15 Dec 2010 18:13:59 +0000
Subject: [PATCH 0107/2864] Add explanations about each template.

---
 docs/themes.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 340c3d44..633acaaf 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -13,14 +13,14 @@ To make your own theme, you must follow the following structure::
     │   ├── css
     │   └── images
     └── templates
-        ├── archives.html
-        ├── article.html
-        ├── categories.html
-        ├── category.html
-        ├── index.html
-        ├── page.html
-        ├── tag.html
-        └── tags.html
+        ├── archives.html    // to display archives
+        ├── article.html     // processed for each article
+        ├── categories.html  // must list all the categories
+        ├── category.html    // processed for each category
+        ├── index.html       // the index. List all the articles
+        ├── page.html        // processed for each page
+        ├── tag.html         // processed for each tag
+        └── tags.html        // must list all the tags. Can be a tag cloud.
 
 * `static` contains all the static content. It will be copied on the output
   `theme/static` folder then. I've put the css and image folders, but they are

From 2bccc298fbfbe20c69c1b395cabf0766d30d61a9 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 15 Dec 2010 18:14:54 +0000
Subject: [PATCH 0108/2864] Settings have to be in caps.

---
 docs/settings.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index d1b84e0a..27e399b9 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -13,6 +13,9 @@ Settings are given as the form of a python module (a file). You can have an
 example by looking at `/samples/pelican.conf.py
 <https://github.com/ametaireau/pelican/raw/master/samples/pelican.conf.py>`_
 
+All the settings identifiers must be set in caps, otherwise they will not be
+processed.
+
 Here are the available settings. Please note that all the settings you put in
 this file will be passed to the templates as well.
 

From 07393cf3b8bda41710137a8a83de3993961c73dc Mon Sep 17 00:00:00 2001
From: Florian Preinstorfer <nblock@archlinux.us>
Date: Wed, 15 Dec 2010 21:50:55 +0100
Subject: [PATCH 0109/2864] sort notmyidea template settings

---
 docs/settings.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 27e399b9..33a57155 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -85,15 +85,15 @@ to use them too in your themes.
 =======================   =======================================================
 Setting name              what it does ?
 =======================   =======================================================
-`GITHUB_URL`              Your github URL (if you have one), it will then
-                          use it to create a github ribbon.
 `DISQUS_SITENAME`         Pelican can handle disqus comments, specify the
                           sitename you've filled in on disqus
+`GITHUB_URL`              Your github URL (if you have one), it will then
+                          use it to create a github ribbon.
+`GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
 `LINKS`                   A list of tuples (Title, Url) for links to appear on
                           the header.
 `SOCIAL`                  A list of tuples (Title, Url) to appear in the "social"
                           section.
-`GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
 =======================   =======================================================
 
 In addition, you can use the "wide" version of the `notmyidea` theme, by

From 05f90fec8e36dc00e32d38088e8b23107399fb70 Mon Sep 17 00:00:00 2001
From: solsTiCe d'Hiver <solstice.dhiver@gmail.com>
Date: Thu, 16 Dec 2010 11:06:30 +0100
Subject: [PATCH 0110/2864] Add missing word in settings.rst docs

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 33a57155..b8eee542 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -43,7 +43,7 @@ Setting name              what it does ?
 `KEEP_OUTPUT_DIRECTORY`   Keep the output directory and just update all the generated files. 
                           Default is to delete the output directory.   
 `MARKUP`                  A list of available markup languages you want to use.
-                          moment, only available values are `rst` and `md`.
+                          For the moment, only available values are `rst` and `md`.
 `OUTPUT_PATH`             Where to output the generated files. Default to
                           "output"
 `PATH`                    path to look at for input files.

From 99de8224bb335a13845d52abef41588e6efcc0c4 Mon Sep 17 00:00:00 2001
From: solsTiCe d'Hiver <solstice.dhiver@gmail.com>
Date: Thu, 16 Dec 2010 20:44:42 +0100
Subject: [PATCH 0111/2864] Change default for markup

* markup default are already defined in SETTINGS['MARKUP'] so there is no need to define it here
* also change a weird construct
---
 pelican/__init__.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 069b0c87..3ff7b460 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -90,15 +90,14 @@ def main():
     parser.add_argument('-o', '--output', dest='output',
         help='Where to output the generated files. If not specified, a directory'
              ' will be created, named "output" in the current path.')
-    parser.add_argument('-m', '--markup', default='rst, md', dest='markup',
-        help='the markup language to use. Currently only ReSTreucturedtext is'
-              ' available.')
+    parser.add_argument('-m', '--markup', default='', dest='markup',
+        help='the markup language to use (rst or md).')
     parser.add_argument('-s', '--settings', dest='settings',
         help='the settings of the application. Default to None.')
     parser.add_argument('-k', '--keep-output-directory', dest='keep', action='store_true',
         help='Keep the output directory and just update all the generated files. Default is to delete the output directory.')
     args = parser.parse_args()
-    markup = [a.split()[0] for a in args.markup.split(',')]
+    markup = [a.strip().lower() for a in args.markup.split(',')]
 
     run_pelican(args.settings, args.path, args.theme, args.output, markup, args.keep)
 

From a322d6c4e8281b699292c4421c2143c59d091cb1 Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Fri, 17 Dec 2010 00:04:45 +0300
Subject: [PATCH 0112/2864] Lowercase meta field's name before looking the
 processor.

---
 pelican/readers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index e9520fe6..0616eecd 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -50,11 +50,12 @@ class MarkdownReader(object):
         
         metadatas = {}
         for name, value in md.Meta.items():
+            name = name.lower()
             if name in _METADATAS_FIELDS:
                 meta = _METADATAS_FIELDS[name](value[0])
             else:
                 meta = value[0]
-            metadatas[name.lower()] = meta
+            metadatas[name] = meta
         return content, metadatas
 
 _EXTENSIONS = {'rst': RstReader, 'md': MarkdownReader}  # supported formats

From 3decf7f5195dcab046b7c303ca60bbfac463a381 Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Fri, 17 Dec 2010 00:05:39 +0300
Subject: [PATCH 0113/2864] Added .gitignore file.

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..c53cdba0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.egg-info
+.*.swp
+.*.swo

From 658e1203b21c87086210b370aecd49c3268ef612 Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Fri, 17 Dec 2010 00:07:55 +0300
Subject: [PATCH 0114/2864] Simplier metadata processing, using dict's 'get'
 method with default value.

---
 pelican/readers.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 0616eecd..7ff393c5 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -51,11 +51,9 @@ class MarkdownReader(object):
         metadatas = {}
         for name, value in md.Meta.items():
             name = name.lower()
-            if name in _METADATAS_FIELDS:
-                meta = _METADATAS_FIELDS[name](value[0])
-            else:
-                meta = value[0]
-            metadatas[name] = meta
+            metadatas[name] = _METADATAS_FIELDS.get(
+                name, lambda x:x
+            )(value[0])
         return content, metadatas
 
 _EXTENSIONS = {'rst': RstReader, 'md': MarkdownReader}  # supported formats

From bc5a19a37baccddd5719a3b6586ce001b1e3187c Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Fri, 17 Dec 2010 00:32:12 +0300
Subject: [PATCH 0115/2864] Slugify is broken for non-ascii titles. Now slug
 could be redefined, using the metadata.

---
 pelican/contents.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 0caceed0..cfc5e442 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -20,6 +20,12 @@ class Page(object):
             if 'AUTHOR' in settings:
                 self.author = settings['AUTHOR']
 
+        if not hasattr(self, 'slug'):
+            self.slug = slugify(self.title)
+
+        if not hasattr(self, 'url'):
+            self.url = '%s.html' % self.slug
+
         if filename:
             self.filename = filename
 
@@ -29,14 +35,6 @@ class Page(object):
             if not hasattr(self, prop):
                 raise NameError(prop)
 
-    @property
-    def url(self):
-        return '%s.html' % self.slug
-
-    @property
-    def slug(self):
-        return slugify(self.title)
-
     @property
     def summary(self):
         return truncate_html_words(self.content, 50)

From 1a31c74d5c7b34c4cdb483e527d116f63c25b5f2 Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Fri, 17 Dec 2010 00:32:27 +0300
Subject: [PATCH 0116/2864] .gitignore updated.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c53cdba0..29ac491f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.egg-info
 .*.swp
 .*.swo
+*.pyc

From d61b108a0e26955a145f73a28a505b753f5ec938 Mon Sep 17 00:00:00 2001
From: Freeculture <guillaume@lame.homelinux.com>
Date: Fri, 17 Dec 2010 09:25:19 +0100
Subject: [PATCH 0117/2864] Creation of tag feeds (atom & rss)

---
 pelican/generators.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index d6077408..a841a850 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -100,6 +100,14 @@ class ArticlesGenerator(Generator):
                         self.settings['CATEGORY_FEED_RSS'] % cat,
                         feed_type='rss')
 
+        if 'TAG_FEEDS' in self.settings:
+            for tag, arts in self.tags.items():
+                arts.sort(key=attrgetter('date'), reverse=True)
+                writer.write_feed(arts, self.context, self.settings['TAG_FEED'] % tag)
+
+                if 'TAG_FEED_RSS' in self.settings:
+                    writer.write_feed(arts, self.context, self.settings['TAG_FEED_RSS'] % tag, feed_type='rss')
+
 
     def generate_pages(self, writer):
         """Generate the pages on the disk
@@ -111,7 +119,7 @@ class ArticlesGenerator(Generator):
             write('%s.html' % template, templates[template], self.context,
                     blog=True)
         for tag, articles in self.tags.items():
-            write('tag/%s.html' % tag, templates['tag'], self.context, tag=tag, 
+            write('tag/%s.html' % tag, templates['tag'], self.context, tag=tag,
                     articles=articles)
         for cat in self.categories:
             write('category/%s.html' % cat, templates['category'], self.context,

From 8352b6136747f670c2af47e45da76140a09dba1d Mon Sep 17 00:00:00 2001
From: Freeculture <guillaume@lame.homelinux.com>
Date: Fri, 17 Dec 2010 09:29:01 +0100
Subject: [PATCH 0118/2864] Creation of tag template page

---
 pelican/themes/notmyidea/templates/tag.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/themes/notmyidea/templates/tag.html b/pelican/themes/notmyidea/templates/tag.html
index e69de29b..68cdcba6 100644
--- a/pelican/themes/notmyidea/templates/tag.html
+++ b/pelican/themes/notmyidea/templates/tag.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}

From 7a9bbc44910001535c83e672b0067373cc446da8 Mon Sep 17 00:00:00 2001
From: Freeculture <guillaume@lame.homelinux.com>
Date: Fri, 17 Dec 2010 09:31:20 +0100
Subject: [PATCH 0119/2864] Add the category name in the title page

---
 pelican/themes/notmyidea/templates/category.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/themes/notmyidea/templates/category.html b/pelican/themes/notmyidea/templates/category.html
index 09763b9a..56f8e93e 100644
--- a/pelican/themes/notmyidea/templates/category.html
+++ b/pelican/themes/notmyidea/templates/category.html
@@ -1 +1,2 @@
 {% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}

From 01af09fd23b0ae20093e22547be70075e0bddfe9 Mon Sep 17 00:00:00 2001
From: Freeculture <guillaume@lame.homelinux.com>
Date: Fri, 17 Dec 2010 09:34:20 +0100
Subject: [PATCH 0120/2864] Add RSS feed if exists in the template

---
 pelican/themes/notmyidea/templates/base.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 99d6d380..03ff1bb1 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -4,7 +4,10 @@
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
-        <link href="{{ SITEURL }}/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+        <link href="{{ SITEURL }}/{{ FEED }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+        {% if FEED_RSS %}
+        <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+        {% endif %}
 
 
         <!--[if IE]>
@@ -54,7 +57,11 @@
                 <div class="social">
                         <h2>social</h2>
                         <ul>
-                            <li><a href="{{ SITEURL }}/feeds/all.atom.xml" rel="alternate">atom feed</a></li>
+                            <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">atom feed</a></li>
+                            {% if FEED_RSS %}
+                            <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">rss feed</a></li>
+                            {% endif %}
+
                         {% for name, link in SOCIAL %}
                             <li><a href="{{ link }}">{{ name }}</a></li>
                         {% endfor %}

From c9626d7916da189b05c80723c7931956eb5f8974 Mon Sep 17 00:00:00 2001
From: Freeculture <guillaume@lame.homelinux.com>
Date: Fri, 17 Dec 2010 09:42:04 +0100
Subject: [PATCH 0121/2864] Add of brownstone template

---
 .../themes/brownstone/static/css/pygment.css  | 205 +++++++++
 .../themes/brownstone/static/css/style.css    | 414 ++++++++++++++++++
 .../themes/brownstone/static/images/img01.jpg | Bin 0 -> 2407 bytes
 .../themes/brownstone/static/images/img02.jpg | Bin 0 -> 61715 bytes
 .../themes/brownstone/static/images/img03.jpg | Bin 0 -> 28837 bytes
 .../themes/brownstone/static/images/img04.jpg | Bin 0 -> 13400 bytes
 .../themes/brownstone/static/images/img05.jpg | Bin 0 -> 3315 bytes
 .../themes/brownstone/static/images/img06.jpg | Bin 0 -> 2130 bytes
 .../brownstone/templates/analytics.html       |  11 +
 .../themes/brownstone/templates/archives.html |  19 +
 .../themes/brownstone/templates/article.html  |  35 ++
 pelican/themes/brownstone/templates/base.html | 106 +++++
 .../brownstone/templates/categories.html      |  18 +
 .../themes/brownstone/templates/category.html |   2 +
 .../themes/brownstone/templates/index.html    |  43 ++
 pelican/themes/brownstone/templates/page.html |  17 +
 pelican/themes/brownstone/templates/tag.html  |   2 +
 pelican/themes/brownstone/templates/tags.html |  12 +
 .../themes/brownstone/templates/twitter.html  |   3 +
 19 files changed, 887 insertions(+)
 create mode 100644 pelican/themes/brownstone/static/css/pygment.css
 create mode 100644 pelican/themes/brownstone/static/css/style.css
 create mode 100644 pelican/themes/brownstone/static/images/img01.jpg
 create mode 100644 pelican/themes/brownstone/static/images/img02.jpg
 create mode 100644 pelican/themes/brownstone/static/images/img03.jpg
 create mode 100644 pelican/themes/brownstone/static/images/img04.jpg
 create mode 100644 pelican/themes/brownstone/static/images/img05.jpg
 create mode 100644 pelican/themes/brownstone/static/images/img06.jpg
 create mode 100644 pelican/themes/brownstone/templates/analytics.html
 create mode 100644 pelican/themes/brownstone/templates/archives.html
 create mode 100644 pelican/themes/brownstone/templates/article.html
 create mode 100644 pelican/themes/brownstone/templates/base.html
 create mode 100644 pelican/themes/brownstone/templates/categories.html
 create mode 100644 pelican/themes/brownstone/templates/category.html
 create mode 100644 pelican/themes/brownstone/templates/index.html
 create mode 100644 pelican/themes/brownstone/templates/page.html
 create mode 100644 pelican/themes/brownstone/templates/tag.html
 create mode 100644 pelican/themes/brownstone/templates/tags.html
 create mode 100644 pelican/themes/brownstone/templates/twitter.html

diff --git a/pelican/themes/brownstone/static/css/pygment.css b/pelican/themes/brownstone/static/css/pygment.css
new file mode 100644
index 00000000..594b0fa3
--- /dev/null
+++ b/pelican/themes/brownstone/static/css/pygment.css
@@ -0,0 +1,205 @@
+.hll {
+background-color:#FFFFCC;
+}
+.c {
+color:#408090;
+font-style:italic;
+}
+.err {
+border:1px solid #FF0000;
+}
+.k {
+color:#007020;
+font-weight:bold;
+}
+.o {
+color:#666666;
+}
+.cm {
+color:#408090;
+font-style:italic;
+}
+.cp {
+color:#007020;
+}
+.c1 {
+color:#408090;
+font-style:italic;
+}
+.cs {
+background-color:#FFF0F0;
+color:#408090;
+}
+.gd {
+color:#A00000;
+}
+.ge {
+font-style:italic;
+}
+.gr {
+color:#FF0000;
+}
+.gh {
+color:#000080;
+font-weight:bold;
+}
+.gi {
+color:#00A000;
+}
+.go {
+color:#303030;
+}
+.gp {
+color:#C65D09;
+font-weight:bold;
+}
+.gs {
+font-weight:bold;
+}
+.gu {
+color:#800080;
+font-weight:bold;
+}
+.gt {
+color:#0040D0;
+}
+.kc {
+color:#007020;
+font-weight:bold;
+}
+.kd {
+color:#007020;
+font-weight:bold;
+}
+.kn {
+color:#007020;
+font-weight:bold;
+}
+.kp {
+color:#007020;
+}
+.kr {
+color:#007020;
+font-weight:bold;
+}
+.kt {
+color:#902000;
+}
+.m {
+color:#208050;
+}
+.s {
+color:#4070A0;
+}
+.na {
+color:#4070A0;
+}
+.nb {
+color:#007020;
+}
+.nc {
+color:#0E84B5;
+font-weight:bold;
+}
+.no {
+color:#60ADD5;
+}
+.nd {
+color:#555555;
+font-weight:bold;
+}
+.ni {
+color:#D55537;
+font-weight:bold;
+}
+.ne {
+color:#007020;
+}
+.nf {
+color:#06287E;
+}
+.nl {
+color:#002070;
+font-weight:bold;
+}
+.nn {
+color:#0E84B5;
+font-weight:bold;
+}
+.nt {
+color:#062873;
+font-weight:bold;
+}
+.nv {
+color:#BB60D5;
+}
+.ow {
+color:#007020;
+font-weight:bold;
+}
+.w {
+color:#BBBBBB;
+}
+.mf {
+color:#208050;
+}
+.mh {
+color:#208050;
+}
+.mi {
+color:#208050;
+}
+.mo {
+color:#208050;
+}
+.sb {
+color:#4070A0;
+}
+.sc {
+color:#4070A0;
+}
+.sd {
+color:#4070A0;
+font-style:italic;
+}
+.s2 {
+color:#4070A0;
+}
+.se {
+color:#4070A0;
+font-weight:bold;
+}
+.sh {
+color:#4070A0;
+}
+.si {
+color:#70A0D0;
+font-style:italic;
+}
+.sx {
+color:#C65D09;
+}
+.sr {
+color:#235388;
+}
+.s1 {
+color:#4070A0;
+}
+.ss {
+color:#517918;
+}
+.bp {
+color:#007020;
+}
+.vc {
+color:#BB60D5;
+}
+.vg {
+color:#BB60D5;
+}
+.vi {
+color:#BB60D5;
+}
+.il {
+color:#208050;
+}
diff --git a/pelican/themes/brownstone/static/css/style.css b/pelican/themes/brownstone/static/css/style.css
new file mode 100644
index 00000000..fa8fe165
--- /dev/null
+++ b/pelican/themes/brownstone/static/css/style.css
@@ -0,0 +1,414 @@
+
+/*
+Design by Free CSS Templates
+http://www.freecsstemplates.org
+Released for free under a Creative Commons Attribution 2.5 License
+*/
+@import url("pygment.css");
+body {
+	margin: 30px 0px 0px 0px;
+	padding: 0;
+	background: #7E776F url('../images/img01.jpg') repeat left top;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 13px;
+	color: #3E3B36;
+}
+.summary h2{font-size:1.6em; color:black;}
+h1, h2, h3 {
+	margin: 0;
+	padding: 0;
+	font-weight: normal;
+	color: #F0E9E9;
+}
+
+h1 {
+	font-size: 2em;
+}
+
+h2 {
+	font-size: 2.8em;
+}
+
+h3 {
+	font-size: 1.6em;
+}
+
+p, ul, ol {
+	margin-top: 0;
+	line-height: 180%;
+}
+
+ul, ol {
+}
+
+a {
+	text-decoration: none;
+	color: #4D8D99;
+}
+
+a:hover {
+}
+
+#wrapper {
+	margin: 0 auto;
+	padding: 0;
+}
+
+/* Header */
+
+#header-wrapper {
+	height: 100px;
+	background: #3C3230;
+	border-bottom: 10px solid #4F4440;
+}
+
+#header {
+	width: 950px;
+	margin: 0 auto;
+	padding: 0px 0px 0px 30px;
+}
+
+/* Logo */
+
+#logo {
+	width: 280px;
+	height: 140px;
+	margin: 0;
+	padding: 0;
+	background: url('../images/img07.jpg') no-repeat left top;
+	color: #34312C;
+}
+
+#logo h1, #logo p {
+	margin: 0;
+	padding: 0;
+	letter-spacing: -2px;
+	text-align: center;
+	font-family: Georgia, "Times New Roman", Times, serif;
+}
+
+#logo h1 {
+	margin: 0px 0px -20px 0px;
+	padding: 20px 0px 0px 0px;
+	font-size: 50px;
+	color: #4D8D99;
+}
+
+#logo h1 a {
+	color: #F0E9E9;
+}
+
+#logo p {
+	margin: 0px;
+	padding: 0px;
+	font-size: 26px;
+} 
+
+#logo a {
+	border: none;
+	background: none;
+	text-decoration: none;
+	color: #34312C;
+}
+
+/* Search */
+
+#search {
+	width: 280px;
+	height: 50px;
+	padding: 20px 0px 0px 0px;
+	background: url('../images/img05.jpg') no-repeat left 15px;
+}
+
+#search form {
+	margin: 0px 0px 0px 0px;
+	padding: 0px 0px 0px 0px;
+}
+
+#search fieldset {
+	margin: 0;
+	padding: 0;
+	border: none;
+}
+
+#search-text {
+	width: 190px;
+	padding: 0px 5px 2px 10px;
+	border: none;
+	background: none;
+	text-transform: lowercase;
+	font: normal 11px Arial, Helvetica, sans-serif;
+	color: #34312C;
+}
+
+#search-submit {
+	width: 70px;
+	height: 22px;
+	border: none;
+	border: none;
+	background: none;
+	text-indent: -99999px;
+	color: #34312C;
+}
+
+/* Menu */
+
+#menu {
+	width: 280px;
+	margin: 20px auto 20px auto;
+	padding: 0;
+}
+
+#menu ul {
+	margin: 0;
+	padding: 50px 0px 0px 0px;
+	list-style: none;
+	line-height: normal;
+}
+
+#menu li {
+	border-bottom: 1px dashed #191918;
+}
+
+#menu a {
+	display: block;
+	width: 260px;
+	height: 27px;
+	margin: 4px 0px;
+	padding: 8px 0px 0px 20px;
+	text-decoration: none;
+	text-transform: capitalize;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight: normal;
+	color: #FFF;
+}
+
+#menu a:hover, #menu .current_page_item a {
+	background: url('../images/img06.jpg') no-repeat left top; 
+	text-decoration: none;
+}
+
+#menu .current_page_item a {
+}
+
+/* Page */
+
+#page {
+	width: 1000px;
+	margin: 0 auto;
+	background: url('../images/img04.jpg') repeat-y left top;
+}
+
+#page-bgtop {
+	background: url('../images/img02.jpg') no-repeat left top;
+}
+
+#page-bgbtm {
+	overflow: hidden;
+	width: 920px;
+	padding: 20px 40px 20px 40px;
+	background: url(images/img03.jpg) no-repeat left bottom;
+}
+/* Content */
+
+#content {
+	float: right;
+	width: 520px;
+	padding: 70px 30px 0px 60px;
+}
+
+.post {
+	margin-bottom: 40px;
+}
+
+.post .title {
+	padding: 0px 0px 0px 0px;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	letter-spacing: -.5px;
+}
+
+.post .title a {
+	color: #52483E;
+	border: none;
+}
+
+.post .meta {
+	margin-bottom: 0px;
+	padding: 10px 0px 0px 0px;
+	text-align: left;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 13px;
+	font-weight: bold;
+}
+
+.post .meta .date {
+	float: left;
+}
+
+.post .meta .posted {
+	float: right;
+}
+
+.post .meta a {
+}
+
+.post .entry {
+	padding: 0px 0px 20px 0px;
+	border-bottom: 1px dotted #99938B;
+	text-align: justify;
+}
+.post .entry dt {
+        font-weight:bold ;
+}
+
+.post img {
+        margin:10px;
+        border:black;
+}
+.summary img{
+        display:none
+}
+
+.entry h2{
+        font-size: 1.6em;
+        color: #36302a;
+}
+
+.entry h3{
+        font-size: 1.2em;
+        color: #36302a;
+}
+h2.title {
+        font-size:2.8em;
+}
+
+.highlight{
+        background:black;
+        padding:2px;
+}
+
+.highlight pre{
+        color:white;
+}
+
+.highlight{
+        overflow:auto;
+}
+
+.links {
+	padding-top: 20px;
+	font-size: 12px;
+	font-weight: bold;
+}
+
+/* Sidebar */
+
+#sidebar {
+	float: left;
+	width: 280px;
+	margin: 0px;
+	padding: 0px 0px 80px 10px;
+	color: #787878;
+}
+
+#sidebar ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+#sidebar li {
+	margin: 0;
+	padding: 0;
+}
+
+#sidebar li ul {
+	margin: 0px 0px 0px 20px;
+	padding-bottom: 30px;
+}
+
+#sidebar li li {
+	line-height: 35px;
+	border-bottom: 1px dashed #191918;
+	border-left: none;
+}
+
+#sidebar li li span {
+	display: block;
+	margin-top: -20px;
+	padding: 0;
+	font-size: 11px;
+	font-style: italic;
+}
+
+#sidebar li li a {
+	color: #787878;
+}
+
+#sidebar li li a:hover {
+	color: #F0E9E9;
+}
+
+#sidebar h2 {
+	height: 38px;
+	letter-spacing: -.5px;
+	font-size: 1.8em;
+}
+
+#sidebar p {
+	margin: 0 0px;
+	padding: 0px 20px 20px 20px;
+}
+
+#sidebar a {
+	border: none;
+}
+
+#sidebar a:hover {
+}
+
+/* Calendar */
+
+#calendar {
+}
+
+#calendar_wrap {
+	padding: 20px;
+}
+
+#calendar table {
+	width: 100%;
+}
+
+#calendar tbody td {
+	text-align: center;
+}
+
+#calendar #next {
+	text-align: right;
+}
+
+/* Footer */
+
+#footer {
+	width: 920px;
+	height: 80px;
+	margin: 0 auto;
+	padding: 0px 0 15px 310px;
+	font-family: Arial, Helvetica, sans-serif;
+}
+
+#footer p {
+	margin: 0;
+	padding-top: 20px;
+	line-height: normal;
+	font-size: 9px;
+	text-transform: uppercase;
+	text-align: center;
+	color: #69635E;
+}
+
+#footer a {
+	color: #474440;
+}
diff --git a/pelican/themes/brownstone/static/images/img01.jpg b/pelican/themes/brownstone/static/images/img01.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d417a5c0362da9ddf54a8e91a5bfef7764ee4bbb
GIT binary patch
literal 2407
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

literal 0
HcmV?d00001

diff --git a/pelican/themes/brownstone/static/images/img02.jpg b/pelican/themes/brownstone/static/images/img02.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c4071c10c79175308713e8cba712dcb5a74caa44
GIT binary patch
literal 61715
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

literal 0
HcmV?d00001

diff --git a/pelican/themes/brownstone/static/images/img03.jpg b/pelican/themes/brownstone/static/images/img03.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..bcb88b65df6264379dddbbccd0d12fc6e82cb92a
GIT binary patch
literal 28837
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

literal 0
HcmV?d00001

diff --git a/pelican/themes/brownstone/static/images/img04.jpg b/pelican/themes/brownstone/static/images/img04.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ffb54f7c0c3acd5d8826f4e79a852e06fdc12ca3
GIT binary patch
literal 13400
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

literal 0
HcmV?d00001

diff --git a/pelican/themes/brownstone/static/images/img05.jpg b/pelican/themes/brownstone/static/images/img05.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5723f783cc5e92689573cd7873985c5a7fb4765b
GIT binary patch
literal 3315
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
Vw4!Qp#!zkRb1$?WQ8YQ6`UhZvtAYRk

literal 0
HcmV?d00001

diff --git a/pelican/themes/brownstone/static/images/img06.jpg b/pelican/themes/brownstone/static/images/img06.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6a93cf2f8942664c70419e1684f8bc363600a6e4
GIT binary patch
literal 2130
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfguVg^p1hgF(p4Kl_BK-
zP=xXSZH5*GMmS&svY42FB#?jrW+rAJ01_-9z|0B;>>$7a2O#Z0)vV0Stn92TtVl9&
zCHNWt4=@OFFeo#MF*6D>FbOg;3o`yc!jKPiHWM==BhZ~Nz|6)7G@lDa3@j(Wz`(-F
z%)-RT%)|~BU=%cD`k)w?v?x)CnZdE~p)d=pl95y4#DyE1jFUx71d&YzYxsYQfrlAr
zp&+v$gFVBK&wutmJ^q^iZ~Yp@)88x|SpPKtX><zytFZU{FP=jSfkOWdx8AvP?l=FF
zcMk>c1z(vVu$d$5V_j;fT8qws?cJZXR+=cLvF?eV8S1%^+d%ixpHr)RIU*bL#h--+
zWjLMTuGnw1YO<49LiEv}Q$uD6Y-YNre`eK^3#~K6hJ_)#=huJ#cmJC3!{_46*Lz%C
z_q19z%zwcV*}8N7?BxCOXTQ&SyXQ`dOs}%Ig$o0_pMkOQ=YXYu`_gOs>hjY0PyA=t
z@UY;%@s$~ZE1X6H6L;DWF8tgtE^qBTJ)?G7gXNRzZ+q9<O0g_|wotgC_3YnwWvPEp
z0#o0i;gz;<2M0O%ErtENg{9dHiBE#v4c0F%to*s6>_3C)7ukd7{xfVoCa=$aOR((G
z-*bVcYBC3^|1-=exHc>@D0Kr7R%jjGd-%t@IQyf2_iy=}uYV)EPX1C}vDCL6F^V@A
zxTUY0a7Ir)|L^+kzd4%A&;GWae)2zq<fN=3yXNzD&yRm9e)A*5yry2We)W@oCc4$~
zjw_x%{ZKvK_uB6_wT!1vKlrXUd+qldznG^_Klm=zJo^2{FYNmI&3AU?ZNH!Vf-f$f
zeP_wt{C&qS$n4q2U-WX<{o4KomX$SfPcN75`z`NK^y!D~>1D5Lzu7g6SYsV;{>eZ7
tx&L48?}mT*)5~V>@4Ku7i~@Pb`piFjT6ae8=&tnj|8Zei`g+IzHvwwrtUCYz

literal 0
HcmV?d00001

diff --git a/pelican/themes/brownstone/templates/analytics.html b/pelican/themes/brownstone/templates/analytics.html
new file mode 100644
index 00000000..f19c7a6f
--- /dev/null
+++ b/pelican/themes/brownstone/templates/analytics.html
@@ -0,0 +1,11 @@
+{% if GOOGLE_ANALYTICS %}
+    <script type="text/javascript">
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+    </script>
+    <script type="text/javascript">
+    try {
+        var pageTracker = _gat._getTracker("{{GOOGLE_ANALYTICS}}");
+    pageTracker._trackPageview();
+    } catch(err) {}</script>
+{% endif %}
diff --git a/pelican/themes/brownstone/templates/archives.html b/pelican/themes/brownstone/templates/archives.html
new file mode 100644
index 00000000..a023ecee
--- /dev/null
+++ b/pelican/themes/brownstone/templates/archives.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+{% block title %}Archives de {{ SITENAME }}{% endblock %}
+{% block content %}  
+                        	<div id="content">
+					<div class="post">
+					<dl>
+						<h2 class="title">Archives de {{ SITENAME }}</h2>
+						{% for article in dates %}
+                                                    <dt>{{ article.date.strftime('%a %d %B %Y') }}</dt>
+                                                    <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
+                                                    <dd>Catégorie : <a href="{{ article.category }}">{{ article.category }}</a></dd>
+                                                {% endfor %}
+                                                </dl>
+					</div>
+			        
+					<div style="clear: both;">&nbsp;</div>
+				</div>
+				<!-- end #content -->
+{% endblock %}
diff --git a/pelican/themes/brownstone/templates/article.html b/pelican/themes/brownstone/templates/article.html
new file mode 100644
index 00000000..0467b64c
--- /dev/null
+++ b/pelican/themes/brownstone/templates/article.html
@@ -0,0 +1,35 @@
+{% extends "base.html" %}
+{% block title %}{{ article.title }}{% endblock %}
+{% block content %}    
+                        	<div id="content">
+					<div class="post">
+						<h2 class="title"><a href="{{ article.url }}">{{ article.title }}</a></h2>
+						<p class="meta"><span class="date">Le {{ article.date.strftime('%a %d %B %Y') }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p>
+					<p class="meta">Tags : {% for tag in article.tags %}
+<span><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> / </span>
+{% endfor %}</p>	
+						<div style="clear: both;">&nbsp;</div>
+						<div class="entry">
+						 {{ article.content }}	
+						{% include 'twitter.html' %}
+						</div>
+					</div>
+			      
+					<div style="clear: both;">&nbsp;</div>
+					 {% if DISQUS_SITENAME %}
+                                        <div class="post">
+                                        <h2 class="title">Commentaires !</h2>
+                                            <div id="disqus_thread"></div>
+                                            <script type="text/javascript">
+                                               var disqus_identifier = "{{ article.url }}";
+                                               (function() {
+                                               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                               dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+                                               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                              })();
+                                            </script>
+                                        </div>
+                                        {% endif %}
+				</div>
+				<!-- end #content -->
+{% endblock %}
diff --git a/pelican/themes/brownstone/templates/base.html b/pelican/themes/brownstone/templates/base.html
new file mode 100644
index 00000000..2dd9992c
--- /dev/null
+++ b/pelican/themes/brownstone/templates/base.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+Design by Free CSS Templates
+http://www.freecsstemplates.org
+Released for free under a Creative Commons Attribution 2.5 License
+
+Name       : Brown Stone  
+Description: A two-column, fixed-width design with dark color scheme.
+Version    : 1.0
+Released   : 20100928
+
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta name="keywords" content="" />
+<meta name="description" content="" />
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>{% block title %}{{ SITENAME }}{%endblock%}</title>
+<link href="{{ SITEURL }}/theme/css/style.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="{{ SITEURL }}/{{ FEED }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+<link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+</head>
+<body>
+<div id="wrapper">
+	<div id="page">
+		<div id="page-bgtop">
+			<div id="page-bgbtm">
+				{% block content %}
+                                {% endblock %}
+				<div id="sidebar">
+					<div id="logo">
+						<h1><a href="{{ SITEURL }}">{{ SITENAME }}</h1>
+						{% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}
+					</div>
+					<div id="menu">
+						<ul>
+							<li class="current_page_item"><a href="{{ SITEURL }}">Home</a></li>
+							<li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
+							{% if DISPLAY_PAGES_ON_MENU %}
+                                                        {% for page in PAGES %}
+                                                            <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
+                                                        {% endfor %}
+                                                        {% endif %}
+						</ul>
+					</div>
+					<ul>
+						<li>
+							<h2>Catégories</h2>
+							<ul>
+							{% for cat, null in categories %}
+								 <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+							{% endfor %}
+							</ul>
+						</li>
+						{% if LINKS %}
+						<li>
+							<h2>Blogroll</h2>
+							<ul>
+							{% for name, link in LINKS %}
+                                                            <li><a href="{{ link }}">{{ name }}</a></li>
+                                                        {% endfor %}
+							</ul>
+						</li>
+						{% endif %}
+						{% if SOCIAL %}
+                                                <li>
+                                                        <h2>Social</h2>
+                                                        <ul>
+                                                            <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">Flux Atom</a></li>
+                                                            {% if FEED_RSS %}
+                                                            <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">Flux Rss</a></li>
+                                                            {% endif %}
+                                                        {% for name, link in SOCIAL %}
+                                                            <li><a href="{{ link }}">{{ name }}</a></li>
+                                                        {% endfor %}
+                                                        </ul>
+                                                </li><!-- /.social -->
+                                                {% endif %}
+						<li>
+						        <h2>Tags</h2>
+						        <ul>
+						        {% for tag, articles in tags %}
+                                                                <li><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a></li>
+                                                        {% endfor %}
+						        </ul>
+						</li>
+						
+						
+					</ul>
+				</div>
+				<!-- end #sidebar -->
+				<div style="clear: both;">&nbsp;</div>
+			</div>
+		</div>
+	</div>
+	<!-- end #page -->
+
+<div id="footer">
+	<p>Copyright (c) 2008 Sitename.com. All rights reserved. Design by <a href="http://www.freecsstemplates.org/">CSS Templates</a>.</p>
+	<p>Proudly powered by <a href="http://alexis.notmyidea.org/pelican/">pelican</a>, which takes great advantages of <a href="http://python.org">python</a>.
+</p>
+</div>
+{% include 'analytics.html' %}
+<!-- end #footer -->
+</body>
+</html>
diff --git a/pelican/themes/brownstone/templates/categories.html b/pelican/themes/brownstone/templates/categories.html
new file mode 100644
index 00000000..9e9bea89
--- /dev/null
+++ b/pelican/themes/brownstone/templates/categories.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{% block content %}
+<div id="content">
+<div class="post">  
+                        {% if articles %}
+                        {% for article in articles %}        
+                            {% if loop.index == 1 %}
+				<ul>
+                                {% for category, articles in categories %}
+                                    <li>{{ category }}</li>
+                                {% endfor %}
+                                </ul>
+		            {% endif %}
+                        {% endfor %}
+                        {% endif %}
+				</div>
+				</div>
+{% endblock %}
diff --git a/pelican/themes/brownstone/templates/category.html b/pelican/themes/brownstone/templates/category.html
new file mode 100644
index 00000000..56f8e93e
--- /dev/null
+++ b/pelican/themes/brownstone/templates/category.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
diff --git a/pelican/themes/brownstone/templates/index.html b/pelican/themes/brownstone/templates/index.html
new file mode 100644
index 00000000..147ea006
--- /dev/null
+++ b/pelican/themes/brownstone/templates/index.html
@@ -0,0 +1,43 @@
+{% extends "base.html" %}
+{% block content_title %}{% endblock %}
+{% block content %} 
+                        {% if articles %}
+                        {% for article in articles %}        
+                            {% if loop.index == 1 %}
+				<div id="content">
+					<div class="post">
+						<h2 class="title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
+						<p class="meta"><span class="date">Le {{ article.date.strftime('%a %d %B %Y') }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p>
+					<p class="meta">Tags : {% for tag in article.tags %}
+<span><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> / </span>
+{% endfor %}</p>
+						<div style="clear: both;">&nbsp;</div>
+						<div class="entry">
+						 {{ article.content }}	
+						{% include 'twitter.html' %}
+						</div>
+					</div>
+			        {% if loop.length  > 1 %}	
+			                <div class="post">
+			                        <h2 class="title">Autres articles</h2>
+			                </div>
+			        {% endif %}
+			    {% else %} 
+			                <div class="post summary">
+						<h2 class="title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
+						<p class="meta"><span class="date">Le {{ article.date.strftime('%a %d %B %Y') }}</span><span class="posted">Par <a href="#">{{ article.author }}</a></span></p>
+						<div style="clear: both;">&nbsp;</div>
+						<div class="entry">
+						 {{ article.summary }}	
+						 <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">Lire la suite …</a>
+						</div>
+					</div>
+		            {% endif %}
+                        {% endfor %}
+                        {% else %}
+                                <div id="content">
+                                </div>
+                        {% endif %}
+					<div style="clear: both;">&nbsp;</div>
+				</div>
+				{% endblock content %}
diff --git a/pelican/themes/brownstone/templates/page.html b/pelican/themes/brownstone/templates/page.html
new file mode 100644
index 00000000..6181ea98
--- /dev/null
+++ b/pelican/themes/brownstone/templates/page.html
@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{% endblock %}
+{% block content %}        
+<div id="content">
+<div class="post">    
+    <h2 class="title"><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></h1>
+    {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
+    the pdf</a>{% endif %}
+    <div style="clear: both;">&nbsp;</div>
+    <div class="entry">
+    {{ page.content }}
+    {% include 'twitter.html' %}
+    </div>
+    </div>
+</div>
+
+{% endblock %}
diff --git a/pelican/themes/brownstone/templates/tag.html b/pelican/themes/brownstone/templates/tag.html
new file mode 100644
index 00000000..68cdcba6
--- /dev/null
+++ b/pelican/themes/brownstone/templates/tag.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
diff --git a/pelican/themes/brownstone/templates/tags.html b/pelican/themes/brownstone/templates/tags.html
new file mode 100644
index 00000000..a950663c
--- /dev/null
+++ b/pelican/themes/brownstone/templates/tags.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% block content %}
+<div id="content">
+<div class="post">  
+<ul>
+{% for tag, articles in tags %}
+    <li>{{ tag }}</li>
+{% endfor %}
+</ul>
+</div>
+</div>
+{% endblock %}
diff --git a/pelican/themes/brownstone/templates/twitter.html b/pelican/themes/brownstone/templates/twitter.html
new file mode 100644
index 00000000..94a9ba9c
--- /dev/null
+++ b/pelican/themes/brownstone/templates/twitter.html
@@ -0,0 +1,3 @@
+{% if TWITTER_USERNAME %}
+<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+{% endif %}

From 44bdcb9c92bb3fbd17ead7c1a1b4091b0ee85ca4 Mon Sep 17 00:00:00 2001
From: Freeculture <guillaume@lame.homelinux.com>
Date: Sat, 18 Dec 2010 10:11:31 +0100
Subject: [PATCH 0122/2864] Put RSS Feed as optional in brownstone template

---
 pelican/themes/brownstone/templates/base.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/themes/brownstone/templates/base.html b/pelican/themes/brownstone/templates/base.html
index 2dd9992c..cd7cc7b3 100644
--- a/pelican/themes/brownstone/templates/base.html
+++ b/pelican/themes/brownstone/templates/base.html
@@ -18,7 +18,9 @@ Released   : 20100928
 <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
 <link href="{{ SITEURL }}/theme/css/style.css" rel="stylesheet" type="text/css" media="screen" />
 <link href="{{ SITEURL }}/{{ FEED }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+{% if FEED_RSS %}
 <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+{% endif %}
 </head>
 <body>
 <div id="wrapper">

From 9e2e73d39cff4b7a1f6370cd001f8bb8712cc1e9 Mon Sep 17 00:00:00 2001
From: Freeculture <guillaume@lame.homelinux.com>
Date: Sat, 18 Dec 2010 20:42:15 +0100
Subject: [PATCH 0123/2864] Fixed a mistake for tag feed generator

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index a841a850..ed007d3a 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -100,7 +100,7 @@ class ArticlesGenerator(Generator):
                         self.settings['CATEGORY_FEED_RSS'] % cat,
                         feed_type='rss')
 
-        if 'TAG_FEEDS' in self.settings:
+        if 'TAG_FEED' in self.settings:
             for tag, arts in self.tags.items():
                 arts.sort(key=attrgetter('date'), reverse=True)
                 writer.write_feed(arts, self.context, self.settings['TAG_FEED'] % tag)

From f0651b2b68ecb4ac093a07d72722b65ea134baa9 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 18 Dec 2010 20:16:48 +0000
Subject: [PATCH 0124/2864] Remove trailing slashes.

---
 pelican/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 3ff7b460..f05ea245 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -4,11 +4,11 @@ import os
 from pelican.settings import read_settings
 from pelican.utils import clean_output_dir
 from pelican.writers import Writer
-from pelican.generators import (ArticlesGenerator, PagesGenerator, 
+from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 StaticGenerator, PdfGenerator)
 
 
-def init_params(settings=None, path=None, theme=None, output_path=None, 
+def init_params(settings=None, path=None, theme=None, output_path=None,
         markup=None, keep=False):
     """Read the settings, and performs some checks on the environment
     before doing anything else.
@@ -50,7 +50,7 @@ def run_generators(generators, settings, path, theme, output_path, markup, keep)
     """Run the generators and return"""
 
     context = settings.copy()
-    generators = [p(context, settings, path, theme, output_path, markup, keep) 
+    generators = [p(context, settings, path, theme, output_path, markup, keep)
             for p in generators]
 
     for p in generators:

From 60873654db26e9deaf6cdfae240df544b2673afa Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 18 Dec 2010 20:17:32 +0000
Subject: [PATCH 0125/2864] Better format for the -k -keep-output-directory
 option.

---
 pelican/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index f05ea245..11131af3 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -94,8 +94,10 @@ def main():
         help='the markup language to use (rst or md).')
     parser.add_argument('-s', '--settings', dest='settings',
         help='the settings of the application. Default to None.')
-    parser.add_argument('-k', '--keep-output-directory', dest='keep', action='store_true',
-        help='Keep the output directory and just update all the generated files. Default is to delete the output directory.')
+    parser.add_argument('-k', '--keep-output-directory', dest='keep',
+            action='store_true',
+        help='Keep the output directory and just update all the generated files.'
+             'Default is to delete the output directory.')
     args = parser.parse_args()
     markup = [a.strip().lower() for a in args.markup.split(',')]
 

From 75707282893a1d6e577302f3a8b8e3706c1c8aa4 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 18 Dec 2010 20:18:48 +0000
Subject: [PATCH 0126/2864] Fix The wrong population of the list in case any
 markup language is given. Only split the option if there is something to
 parse, otherwise default to None.

---
 pelican/__init__.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 11131af3..8d281745 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -90,8 +90,9 @@ def main():
     parser.add_argument('-o', '--output', dest='output',
         help='Where to output the generated files. If not specified, a directory'
              ' will be created, named "output" in the current path.')
-    parser.add_argument('-m', '--markup', default='', dest='markup',
-        help='the markup language to use (rst or md).')
+    parser.add_argument('-m', '--markup', default=None, dest='markup',
+        help='the list of markup language to use (rst or md). Please indicate them'
+             'separated by commas')
     parser.add_argument('-s', '--settings', dest='settings',
         help='the settings of the application. Default to None.')
     parser.add_argument('-k', '--keep-output-directory', dest='keep',
@@ -99,7 +100,10 @@ def main():
         help='Keep the output directory and just update all the generated files.'
              'Default is to delete the output directory.')
     args = parser.parse_args()
-    markup = [a.strip().lower() for a in args.markup.split(',')]
+
+    # Split the markup languages only if some have been given. Otherwise, populate
+    # the variable with None.
+    markup = [a.strip().lower() for a in args.markup.split(',')] if args.markup else None
 
     run_pelican(args.settings, args.path, args.theme, args.output, markup, args.keep)
 

From ccf53ceb044ddd45d8a25c805ae40aff8a1371c9 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 18 Dec 2010 20:36:16 +0000
Subject: [PATCH 0127/2864] Add a version option.

---
 pelican/__init__.py | 4 ++++
 setup.py            | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 8d281745..79842f74 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -7,6 +7,8 @@ from pelican.writers import Writer
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 StaticGenerator, PdfGenerator)
 
+VERSION = "2.5.1"
+
 
 def init_params(settings=None, path=None, theme=None, output_path=None,
         markup=None, keep=False):
@@ -99,6 +101,8 @@ def main():
             action='store_true',
         help='Keep the output directory and just update all the generated files.'
              'Default is to delete the output directory.')
+    parser.add_argument('--version', action='version', version=VERSION,
+            help="Print the pelican version and exit")
     args = parser.parse_args()
 
     # Split the markup languages only if some have been given. Otherwise, populate
diff --git a/setup.py b/setup.py
index d461cb46..86f43f0f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
 from setuptools import setup
+from pelican import VERSION
 import sys
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown']
@@ -7,7 +8,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.5.1',
+    version = VERSION,
     url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From c61a207699b6fb5c7a98b5b31e49bd3431d81866 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 18 Dec 2010 21:06:51 +0000
Subject: [PATCH 0128/2864] Do not make the output with absolute urls by
 default.

---
 pelican/__init__.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 79842f74..9f15e37b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -38,9 +38,6 @@ def init_params(settings=None, path=None, theme=None, output_path=None,
         else:
             raise Exception("Impossible to find the theme %s" % theme)
 
-    if 'SITEURL' not in settings:
-        settings['SITEURL'] = output_path
-
     # get the list of files to parse
     if not path:
         raise Exception('you need to specify a path to search the docs on !')

From 6470e542853a48fadc452b48c2c7842068507f38 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 18 Dec 2010 21:08:53 +0000
Subject: [PATCH 0129/2864] Added tag 2.5.2 for changeset 7d728f8e771c

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0d83ed03..9c884e5a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -23,3 +23,4 @@ e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1
 294a2830a393d5a97671dc211dbdb5254a15e604 2.5.1
 294a2830a393d5a97671dc211dbdb5254a15e604 2.5.1
 92b31e41134cb2c1a156ce623338cf634d2ebc3e 2.5.1
+7d728f8e771cbbc802ce81e424e08a8eecbd48dc 2.5.2

From a948b6a1c0223144551606b8693db9da675d81b6 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 18 Dec 2010 21:13:20 +0000
Subject: [PATCH 0130/2864] Version bump.

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 9f15e37b..c60fafae 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -7,7 +7,7 @@ from pelican.writers import Writer
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 StaticGenerator, PdfGenerator)
 
-VERSION = "2.5.1"
+VERSION = "2.5.2"
 
 
 def init_params(settings=None, path=None, theme=None, output_path=None,

From 472c6871daa97b574cccf752a6e38b26c5e60ad3 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 18 Dec 2010 21:14:14 +0000
Subject: [PATCH 0131/2864] Added tag 2.5.2 for changeset 6d368a1739a4

---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 9c884e5a..149c7033 100644
--- a/.hgtags
+++ b/.hgtags
@@ -24,3 +24,5 @@ e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1
 294a2830a393d5a97671dc211dbdb5254a15e604 2.5.1
 92b31e41134cb2c1a156ce623338cf634d2ebc3e 2.5.1
 7d728f8e771cbbc802ce81e424e08a8eecbd48dc 2.5.2
+7d728f8e771cbbc802ce81e424e08a8eecbd48dc 2.5.2
+6d368a1739a4ce48d2d04b00db04fa538e2bf90a 2.5.2

From 1c29609f0888138507045f91bae21fbf8f9fb5a9 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 19 Dec 2010 01:29:02 +0000
Subject: [PATCH 0132/2864] Temporary circular dependency fix about getting the
 right version.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 86f43f0f..c10b4fb2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup
-from pelican import VERSION
 import sys
+VERSION = "2.5.2"
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown']
 if sys.version_info < (2,7):

From 4aacf4f7c7f4cb11e7e17528ee38329d01ed8415 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 19 Dec 2010 01:30:08 +0000
Subject: [PATCH 0133/2864] Version bump

---
 pelican/__init__.py | 2 +-
 setup.py            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index c60fafae..eec863aa 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -7,7 +7,7 @@ from pelican.writers import Writer
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 StaticGenerator, PdfGenerator)
 
-VERSION = "2.5.2"
+VERSION = "2.5.3"
 
 
 def init_params(settings=None, path=None, theme=None, output_path=None,
diff --git a/setup.py b/setup.py
index c10b4fb2..11378737 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
 from setuptools import setup
 import sys
-VERSION = "2.5.2"
+
+VERSION = "2.5.3" # find a better way to do so.
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown']
 if sys.version_info < (2,7):

From 67b43c6079c033373b4e84a76fbb8bbed1b16a36 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 19 Dec 2010 01:30:18 +0000
Subject: [PATCH 0134/2864] Added tag 2.5.3 for changeset 1f9dd44b5464

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 149c7033..6d4c8d99 100644
--- a/.hgtags
+++ b/.hgtags
@@ -26,3 +26,4 @@ e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1
 7d728f8e771cbbc802ce81e424e08a8eecbd48dc 2.5.2
 7d728f8e771cbbc802ce81e424e08a8eecbd48dc 2.5.2
 6d368a1739a4ce48d2d04b00db04fa538e2bf90a 2.5.2
+1f9dd44b546425216b1fa35fd88d3d532da8916b 2.5.3

From a71d93c63cc5f68ccf8a1fa5b1541e2031f9a191 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 19 Dec 2010 03:34:19 +0000
Subject: [PATCH 0135/2864] Add comment number support.

---
 pelican/themes/notmyidea/templates/base.html          |  1 +
 pelican/themes/notmyidea/templates/comments.html      |  1 +
 pelican/themes/notmyidea/templates/disqus_script.html | 11 +++++++++++
 pelican/themes/notmyidea/templates/index.html         |  5 ++++-
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pelican/themes/notmyidea/templates/comments.html
 create mode 100644 pelican/themes/notmyidea/templates/disqus_script.html

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 03ff1bb1..1ec6fe5e 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -79,5 +79,6 @@
         </footer><!-- /#contentinfo -->
 
 {% include 'analytics.html' %}
+{% include 'disqus_script.html' %}
 </body>
 </html>
diff --git a/pelican/themes/notmyidea/templates/comments.html b/pelican/themes/notmyidea/templates/comments.html
new file mode 100644
index 00000000..ea693afb
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/comments.html
@@ -0,0 +1 @@
+{% if DISQUS_SITENAME %}<p>There are <a href="{{ SITEURL }}/{{ article.slug }}.html#disqus_thread">comments</a>.</p>{% endif %}
diff --git a/pelican/themes/notmyidea/templates/disqus_script.html b/pelican/themes/notmyidea/templates/disqus_script.html
new file mode 100644
index 00000000..c4f442c8
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/disqus_script.html
@@ -0,0 +1,11 @@
+{% if DISQUS_SITENAME %}
+<script type="text/javascript">
+    var disqus_shortname = '{{ DISQUS_SITENAME }}';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+{% endif %}
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 2f61d6d5..e6e7d816 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -21,7 +21,9 @@
                 {% include 'taglist.html' %}
                 </footer><!-- /.post-info -->
                 {{ article.content }}
-        </article></aside><!-- /#featured -->
+                {% include 'comments.html' %}
+                </article>
+                </aside><!-- /#featured -->
         {% if loop.length  > 1 %}
             <section id="content" class="body">
                 <h1>Other articles</h1>
@@ -49,6 +51,7 @@
                 </footer><!-- /.post-info -->
                 {{ article.summary }}
                 <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
+                {% include 'comments.html' %}
                 </div><!-- /.entry-content -->
         </article></li>
     {% endif %}

From 3afdb8fcffec3061011ccf33d4b47ba9e4afe1b8 Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Sun, 19 Dec 2010 00:32:43 +0300
Subject: [PATCH 0136/2864] Articles translations are enabled. To use this
 feature, you need to add a Lang meta into the each article and set
 DEFAULT_LANG setting which is 'en' by default.

Than, only articles in the default language (or without variant in
default language) will be shown in the index of the blog. And each
Article will have translations list.

The same is applicable to the static Pages.

Also, separate feeds are generated for each language except default.
---
 pelican/contents.py   | 13 ++++++++++++-
 pelican/generators.py | 36 +++++++++++++++++++++++++++++-------
 pelican/settings.py   |  1 +
 pelican/utils.py      | 37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index cfc5e442..cc869625 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -12,6 +12,8 @@ class Page(object):
 
     def __init__(self, content, metadatas={}, settings={}, filename=None):
         self.content = content
+        self.translations = []
+
         self.status = "published"  # default value
         for key, value in metadatas.items():
             setattr(self, key, value)
@@ -20,11 +22,20 @@ class Page(object):
             if 'AUTHOR' in settings:
                 self.author = settings['AUTHOR']
 
+        default_lang = settings.get('DEFAULT_LANG', 'en').lower()
+        if not hasattr(self, 'lang'):
+            self.lang = default_lang
+
+        self.in_default_lang = (self.lang == default_lang)
+
         if not hasattr(self, 'slug'):
             self.slug = slugify(self.title)
 
         if not hasattr(self, 'url'):
-            self.url = '%s.html' % self.slug
+            if self.in_default_lang:
+                self.url = '%s.html' % self.slug
+            else:
+                self.url = '%s-%s.html' % (self.slug, self.lang)
 
         if filename:
             self.filename = filename
diff --git a/pelican/generators.py b/pelican/generators.py
index d6077408..59b3866e 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,11 +1,13 @@
 from operator import attrgetter
+from itertools import chain
 from datetime import datetime
+from collections import defaultdict
 import os
 
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
 
-from pelican.utils import update_dict, copytree
+from pelican.utils import update_dict, copytree, process_translations
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
 
@@ -75,7 +77,8 @@ class ArticlesGenerator(Generator):
 
     def __init__(self, *args, **kwargs):
         """initialize properties"""
-        self.articles = []
+        self.articles = [] # only articles in default language
+        self.translations = []
         self.dates = {}
         self.tags = {}
         self.categories = {}
@@ -100,6 +103,15 @@ class ArticlesGenerator(Generator):
                         self.settings['CATEGORY_FEED_RSS'] % cat,
                         feed_type='rss')
 
+        translations_feeds = defaultdict(list)
+        for article in self.translations:
+            translations_feeds[article.lang].append(article)
+
+        for lang, items in translations_feeds.items():
+            items.sort(key=attrgetter('date'), reverse=True)
+            writer.write_feed(items, self.context,
+                              self.settings['TRANSLATION_FEED'] % lang)
+
 
     def generate_pages(self, writer):
         """Generate the pages on the disk
@@ -116,7 +128,7 @@ class ArticlesGenerator(Generator):
         for cat in self.categories:
             write('category/%s.html' % cat, templates['category'], self.context,
                           category=cat, articles=self.categories[cat])
-        for article in self.articles:
+        for article in chain(self.translations, self.articles):
             write('%s' % article.url,
                           templates['article'], self.context, article=article,
                           category=article.category)
@@ -126,6 +138,7 @@ class ArticlesGenerator(Generator):
 
         # return the list of files to use
         files = self.get_files(self.path, exclude=['pages',])
+        all_articles = []
         for f in files:
             content, metadatas = read_file(f)
 
@@ -149,11 +162,17 @@ class ArticlesGenerator(Generator):
             if not is_valid_content(article, f):
                 continue
 
-            update_dict(self.categories, article.category, article)
             if hasattr(article, 'tags'):
                 for tag in article.tags:
                     update_dict(self.tags, tag, article)
-            self.articles.append(article)
+            all_articles.append(article)
+
+        self.articles, self.translations = process_translations(all_articles)
+
+        for article in self.articles:
+            # only main articles are listed in categories, not translations
+            update_dict(self.categories, article.category, article)
+
 
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
@@ -175,20 +194,23 @@ class PagesGenerator(Generator):
         super(PagesGenerator, self).__init__(*args, **kwargs)
 
     def generate_context(self):
+        all_pages = []
         for f in self.get_files(os.sep.join((self.path, 'pages'))):
             content, metadatas = read_file(f)
             page = Page(content, metadatas, settings=self.settings,
                         filename=f)
             if not is_valid_content(page, f):
                 continue
-            self.pages.append(page)
+            all_pages.append(page)
+
+        self.pages, self.translations = process_translations(all_pages)
 
         self._update_context(('pages', ))
         self.context['PAGES'] = self.pages
 
     def generate_output(self, writer):
         templates = self.get_templates()
-        for page in self.pages:
+        for page in chain(self.translations, self.pages):
             writer.write_file('pages/%s' % page.url, templates['page'],
                     self.context, page=page)
 
diff --git a/pelican/settings.py b/pelican/settings.py
index e3c511d3..9e294b05 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -10,6 +10,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'THEME_STATIC_PATHS': ['static',],
                    'FEED': 'feeds/all.atom.xml',
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
+                   'TRANSLATION_FEED': 'feeds/all-%s.atom.xml',
                    'SITENAME': 'A Pelican Blog',
                    'DISPLAY_PAGES_ON_MENU': True,
                    'PDF_GENERATOR': False,
diff --git a/pelican/utils.py b/pelican/utils.py
index c1410039..97a6c64c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -4,6 +4,8 @@ import os
 import shutil
 from datetime import datetime
 from codecs import open as _open
+from itertools import groupby
+from operator import attrgetter
 
 def update_dict(mapping, key, value):
     """Update a dict intenal list
@@ -147,3 +149,38 @@ def truncate_html_words(s, num, end_text='...'):
     # Return string
     return out
 
+
+def process_translations(content_list):
+    """ Finds all translation and returns
+        tuple with two lists (index, translations).
+        Index list includes items in default language
+        or items which have no variant in default language.
+
+        Also, for each content_list item, it
+        sets attribute 'translations'
+    """
+    grouped_by_slugs = groupby(content_list, attrgetter('slug'))
+    index = []
+    translations = []
+
+    for slug, items in grouped_by_slugs:
+        items = list(items)
+        # find items with default language
+        default_lang_items = filter(
+            attrgetter('in_default_lang'),
+            items
+        )
+        len_ = len(default_lang_items)
+        if len_ > 1:
+            print u' [warning] there are %s varianits of "%s"' % (len_, slug)
+        elif len_ == 0:
+            default_lang_items = items[:1]
+
+        index.extend(default_lang_items)
+        translations.extend(filter(
+            lambda x: x not in default_lang_items,
+            items
+        ))
+        for a in items:
+            a.translations = filter(lambda x: x != a, items)
+    return index, translations

From 1d74de2559a96b48b05c4ebeab7fc13acc9f5302 Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Tue, 21 Dec 2010 00:21:29 +0300
Subject: [PATCH 0137/2864] Added another option CLEAN_URLS, to use generated
 files with mod_rewrite and to show nice urls to the end user.

---
 pelican/contents.py   | 13 ++++++++++---
 pelican/generators.py |  4 ++--
 pelican/settings.py   |  1 +
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index cc869625..1ecced30 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -31,11 +31,18 @@ class Page(object):
         if not hasattr(self, 'slug'):
             self.slug = slugify(self.title)
 
-        if not hasattr(self, 'url'):
+        if not hasattr(self, 'save_as'):
             if self.in_default_lang:
-                self.url = '%s.html' % self.slug
+                self.save_as = '%s.html' % self.slug
+                clean_url = '%s/' % self.slug
             else:
-                self.url = '%s-%s.html' % (self.slug, self.lang)
+                self.save_as = '%s-%s.html' % (self.slug, self.lang)
+                clean_url = '%s-%s/' % (self.slug, self.lang)
+
+        if settings.get('CLEAN_URLS', False):
+            self.url = clean_url
+        else:
+            self.url = self.save_as
 
         if filename:
             self.filename = filename
diff --git a/pelican/generators.py b/pelican/generators.py
index 59b3866e..88579c26 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -129,7 +129,7 @@ class ArticlesGenerator(Generator):
             write('category/%s.html' % cat, templates['category'], self.context,
                           category=cat, articles=self.categories[cat])
         for article in chain(self.translations, self.articles):
-            write('%s' % article.url,
+            write(article.save_as,
                           templates['article'], self.context, article=article,
                           category=article.category)
 
@@ -211,7 +211,7 @@ class PagesGenerator(Generator):
     def generate_output(self, writer):
         templates = self.get_templates()
         for page in chain(self.translations, self.pages):
-            writer.write_file('pages/%s' % page.url, templates['page'],
+            writer.write_file('pages/%s' % page.save_as, templates['page'],
                     self.context, page=page)
 
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 9e294b05..dba11906 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -19,6 +19,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'CSS_FILE': 'main.css',
                    'REVERSE_ARCHIVE_ORDER': False,
                    'KEEP_OUTPUT_DIRECTORY': False,
+                   'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
                   }
 
 def read_settings(filename):

From a45f705bda9b503c27e80d0a2b6503b9ab868ec2 Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Tue, 21 Dec 2010 00:22:15 +0300
Subject: [PATCH 0138/2864] Typo was fixed.

---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 97a6c64c..fe7ab009 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -172,7 +172,7 @@ def process_translations(content_list):
         )
         len_ = len(default_lang_items)
         if len_ > 1:
-            print u' [warning] there are %s varianits of "%s"' % (len_, slug)
+            print u' [warning] there are %s variants of "%s"' % (len_, slug)
         elif len_ == 0:
             default_lang_items = items[:1]
 

From 750e2116490750cccd2be2daf5e17d40ec0c1acb Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 20 Dec 2010 22:50:54 +0000
Subject: [PATCH 0139/2864] Update the documentations and fix some little
 things about the translation feature.

---
 docs/getting_started.rst | 8 ++++++++
 docs/settings.rst        | 4 ++++
 pelican/contents.py      | 2 +-
 pelican/settings.py      | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index a6eaf79b..f66a6f06 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -87,3 +87,11 @@ generate static pages.
 
 Then, use the `DISPLAY_PAGES_ON_MENU` setting, which will add all the pages to 
 the menu.
+
+Translations
+============
+
+It is possible to translate articles. To do so, you need to add a `Lang` meta
+in your articles/pages, and to set a `DEFAULT_LANG` setting (which is en by
+default). Then, only articles with this default language will be listed, and
+each article will have a translation list.
diff --git a/docs/settings.rst b/docs/settings.rst
index b8eee542..e58243bc 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -31,6 +31,7 @@ Setting name              what it does ?
 `CSS_FILE`                To specify the CSS file you want to load, if it's not
                           the default one ('main.css')
 `DEFAULT_CATEGORY`        The default category to fallback on. `misc` by default.
+`DEFAULT_LANG`            The default language to use. Default is 'en'.
 `DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template.
                           Templates can follow or not this settings.
 `FALLBACK_ON_FS_DATE`     If True, pelican will use the file system dates infos
@@ -62,6 +63,9 @@ Setting name              what it does ?
 `THEME`                   theme to use to product the output. can be the
                           complete static path to a theme folder, or chosen
                           between the list of default themes (see below)
+`TRANSLATION_FEED`        Where to put the RSS feed for translations. Default
+                          is feeds/all-%s.atom.xml where %s is the name of the
+                          lang.
 =======================   =======================================================
 
 Themes
diff --git a/pelican/contents.py b/pelican/contents.py
index 1ecced30..bb6949fb 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -22,7 +22,7 @@ class Page(object):
             if 'AUTHOR' in settings:
                 self.author = settings['AUTHOR']
 
-        default_lang = settings.get('DEFAULT_LANG', 'en').lower()
+        default_lang = settings.get('DEFAULT_LANG').lower()
         if not hasattr(self, 'lang'):
             self.lang = default_lang
 
diff --git a/pelican/settings.py b/pelican/settings.py
index dba11906..599f56ee 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -20,6 +20,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'REVERSE_ARCHIVE_ORDER': False,
                    'KEEP_OUTPUT_DIRECTORY': False,
                    'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
+                   'DEFAULT_LANG': 'en',
                   }
 
 def read_settings(filename):

From 558038be32f4cbfdf2c04897a5f10c9cde039e15 Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Wed, 22 Dec 2010 01:08:23 +0300
Subject: [PATCH 0140/2864] Fixed tags parsing, now it can parse tags like this
 "blah,minor,    foo  , bar". Also, code for metadata parsing was slightly
 refactored.

---
 pelican/readers.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 7ff393c5..1fc51f68 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,6 +1,7 @@
 from docutils import core
 from markdown import Markdown
 import re
+import string
 
 # import the directives to have pygments support
 import rstdirectives
@@ -8,11 +9,11 @@ import rstdirectives
 from pelican.utils import get_date, open
 
 
-_METADATAS_FIELDS = {'tags': lambda x: x.split(', '),
-                     'date': lambda x: get_date(x),
-                     'category': lambda x: x,
-                     'author': lambda x: x,
-                     'status': lambda x:x.strip(),}
+_METADATAS_PROCESSORS = {
+    'tags': lambda x: map(string.strip, x.split(',')),
+    'date': lambda x: get_date(x),
+    'status': string.strip,
+}
 
 
 class RstReader(object):
@@ -20,10 +21,11 @@ class RstReader(object):
     def _parse_metadata(self, content):
         """Return the dict containing metadatas"""
         output = {}
-        for m in re.compile(':([a-z]+): (.*)\s', re.M).finditer(content):
+        for m in re.compile('^:([a-z]+): (.*)\s', re.M).finditer(content):
             name, value = m.group(1).lower(), m.group(2)
-            if name in _METADATAS_FIELDS:
-                output[name] = _METADATAS_FIELDS[name](value)
+            output[name] = _METADATAS_PROCESSORS.get(
+                name, lambda x:x
+            )(value)
         return output
 
     def read(self, filename):
@@ -51,7 +53,7 @@ class MarkdownReader(object):
         metadatas = {}
         for name, value in md.Meta.items():
             name = name.lower()
-            metadatas[name] = _METADATAS_FIELDS.get(
+            metadatas[name] = _METADATAS_PROCESSORS.get(
                 name, lambda x:x
             )(value[0])
         return content, metadatas

From 52459768f24bddbd1d7316814930b2479b9b30dc Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Wed, 22 Dec 2010 02:35:29 +0300
Subject: [PATCH 0141/2864] Fixed feed generator for translations.

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index a61c2d1e..6cdd4a9f 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -114,7 +114,7 @@ class ArticlesGenerator(Generator):
                             self.settings['TAG_FEED_RSS'] % tag, feed_type='rss')
 
         translations_feeds = defaultdict(list)
-        for article in self.translations:
+        for article in chain(self.articles, self.translations):
             translations_feeds[article.lang].append(article)
 
         for lang, items in translations_feeds.items():

From c64ccc4fcd27d36da225b299640cff2f757d6c49 Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Wed, 22 Dec 2010 03:19:35 +0300
Subject: [PATCH 0142/2864] Added setting option RELATIVE_URLS to change
 default behaviour of file writer.

---
 pelican/generators.py | 9 +++++++--
 pelican/settings.py   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 6cdd4a9f..a183dccd 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,5 +1,6 @@
 from operator import attrgetter
 from itertools import chain
+from functools import partial
 from datetime import datetime
 from collections import defaultdict
 import os
@@ -128,7 +129,10 @@ class ArticlesGenerator(Generator):
         TODO: change the name"""
 
         templates = self.get_templates()
-        write = writer.write_file
+        write = partial(
+            writer.write_file,
+            relative_urls = self.settings.get('RELATIVE_URLS')
+        )
         for template in _DIRECT_TEMPLATES:
             write('%s.html' % template, templates[template], self.context,
                     blog=True)
@@ -223,7 +227,8 @@ class PagesGenerator(Generator):
         templates = self.get_templates()
         for page in chain(self.translations, self.pages):
             writer.write_file('pages/%s' % page.save_as, templates['page'],
-                    self.context, page=page)
+                    self.context, page=page,
+                    relative_urls = self.settings.get('RELATIVE_URLS'))
 
 
 class StaticGenerator(Generator):
diff --git a/pelican/settings.py b/pelican/settings.py
index 599f56ee..8f0dcdbd 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -20,6 +20,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'REVERSE_ARCHIVE_ORDER': False,
                    'KEEP_OUTPUT_DIRECTORY': False,
                    'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
+                   'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
                   }
 

From 31cee95b6fe534c130be9f2796591efe42e37c52 Mon Sep 17 00:00:00 2001
From: Guillaume B <guitreize@gmail.com>
Date: Wed, 22 Dec 2010 04:46:11 +0800
Subject: [PATCH 0143/2864] Fixed the PDF generation

Signed-off-by: Guillaume B <guitreize@gmail.com>
---
 pelican/__init__.py     |  2 +-
 pelican/generators.py   | 19 ++++++++++++++-----
 samples/pelican.conf.py |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 pelican/__init__.py
 mode change 100644 => 100755 pelican/generators.py
 mode change 100644 => 100755 samples/pelican.conf.py

diff --git a/pelican/__init__.py b/pelican/__init__.py
old mode 100644
new mode 100755
index eec863aa..915d92c7
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -73,7 +73,7 @@ def run_pelican(settings, path, theme, output_path, markup, delete):
     params = init_params(settings, path, theme, output_path, markup, delete)
     generators = [ArticlesGenerator, PagesGenerator, StaticGenerator]
     if params[0]['PDF_GENERATOR']:  # param[0] is settings
-        processors.append(PdfGenerator)
+        generators.append(PdfGenerator)
     run_generators(generators, *params)
 
 
diff --git a/pelican/generators.py b/pelican/generators.py
old mode 100644
new mode 100755
index a61c2d1e..a034fb85
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -7,7 +7,7 @@ import os
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
 
-from pelican.utils import update_dict, copytree, process_translations
+from pelican.utils import update_dict, copytree, process_translations, open
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
 
@@ -252,18 +252,27 @@ class PdfGenerator(Generator):
             self.pdfcreator = RstToPdf(breakside=0, stylesheets=['twelvepoint'])
         except ImportError:
             raise Exception("unable to find rst2pdf")
-        super(PdfGenerator, self).__init(*args, **kwargs)
+        super(PdfGenerator, self).__init__(*args, **kwargs)
 
     def _create_pdf(self, obj, output_path):
         if obj.filename.endswith(".rst"):
-            self.pdfcreator.createPdf(text=open(obj.filename).read(),
-                output=os.path.join(output_path, "%s.pdf" % obj.slug))
-
+            filename = obj.slug + ".pdf"
+            output_pdf=os.path.join(output_path, filename)
+            # print "Generating pdf for", obj.filename, " in ", output_pdf
+            self.pdfcreator.createPdf(text=open(obj.filename), output=output_pdf)
+            print u' [ok] writing %s' % output_pdf
+    
     def generate_context(self):
+        pass
+
+    def generate_output(self, writer=None):
+        # we don't use the writer passed as argument here, since we write our own files
+        print u' Generating PDF files...'
         pdf_path = os.path.join(self.output_path, 'pdf')
         try:
             os.mkdir(pdf_path)
         except OSError:
+            print "Couldn't create the pdf output folder in ", pdf_path
             pass
 
         for article in self.context['articles']:
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
old mode 100644
new mode 100755
index f921ee91..36aca0ac
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -5,7 +5,7 @@ SITEURL = 'http://blog.notmyidea.org'
 
 GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
-PDF_PROCESSOR = False
+PDF_GENERATOR = False
 
 LINKS = (('Biologeek', 'http://biologeek.org'),
             ('Filyb', "http://filyb.info/"),

From a937424faa1fd2a7ecf47321c2c5de9ec3194c64 Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Sat, 25 Dec 2010 17:26:24 +0300
Subject: [PATCH 0144/2864] Base routines were transformed into the class
 Pelican. This class could be overridden using PELICAN_CLASS option.

---
 pelican/__init__.py | 125 +++++++++++++++++++++++++-------------------
 pelican/settings.py |   1 +
 2 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 915d92c7..f0684d65 100755
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -10,71 +10,79 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
 VERSION = "2.5.3"
 
 
-def init_params(settings=None, path=None, theme=None, output_path=None,
-        markup=None, keep=False):
-    """Read the settings, and performs some checks on the environment
-    before doing anything else.
-    """
-    if settings is None:
-        settings = {}
-    settings = read_settings(settings)
-    path = path or settings['PATH']
-    if path.endswith('/'):
-        path = path[:-1]
+class Pelican(object):
+    def __init__(self, settings=None, path=None, theme=None, output_path=None,
+            markup=None, keep=False):
+        """Read the settings, and performs some checks on the environment
+        before doing anything else.
+        """
+        self.path = path or settings['PATH']
+        if self.path.endswith('/'):
+            self.path = path[:-1]
 
-    # define the default settings
-    theme = theme or settings['THEME']
-    output_path = output_path or settings['OUTPUT_PATH']
-    output_path = os.path.realpath(output_path)
-    markup = markup or settings['MARKUP']
-    keep = keep or settings['KEEP_OUTPUT_DIRECTORY']
+        # define the default settings
+        self.settings = settings
+        self.theme = theme or settings['THEME']
+        self.path = path
+        output_path = output_path or settings['OUTPUT_PATH']
+        self.output_path = os.path.realpath(output_path)
+        self.markup = markup or settings['MARKUP']
+        self.keep = keep or settings['KEEP_OUTPUT_DIRECTORY']
 
-    # find the theme in pelican.theme if the given one does not exists
-    if not os.path.exists(theme):
-        theme_path = os.sep.join([os.path.dirname(
-            os.path.abspath(__file__)), "themes/%s" % theme])
-        if os.path.exists(theme_path):
-            theme = theme_path
-        else:
-            raise Exception("Impossible to find the theme %s" % theme)
+        # find the theme in pelican.theme if the given one does not exists
+        if not os.path.exists(self.theme):
+            theme_path = os.sep.join([os.path.dirname(
+                os.path.abspath(__file__)), "themes/%s" % self.theme])
+            if os.path.exists(theme_path):
+                self.theme = theme_path
+            else:
+                raise Exception("Impossible to find the theme %s" % theme)
 
-    # get the list of files to parse
-    if not path:
-        raise Exception('you need to specify a path to search the docs on !')
-
-    return settings, path, theme, output_path, markup, keep
+        # get the list of files to parse
+        if not self.path:
+            raise Exception('you need to specify a path to search the docs on !')
 
 
-def run_generators(generators, settings, path, theme, output_path, markup, keep):
-    """Run the generators and return"""
+    def run(self):
+        """Run the generators and return"""
 
-    context = settings.copy()
-    generators = [p(context, settings, path, theme, output_path, markup, keep)
-            for p in generators]
+        context = self.settings.copy()
+        generators = [
+            cls(
+                context,
+                self.settings,
+                self.path,
+                self.theme,
+                self.output_path,
+                self.markup,
+                self.keep
+            ) for cls in self.get_generator_classes()
+        ]
 
-    for p in generators:
-        if hasattr(p, 'generate_context'):
-            p.generate_context()
+        for p in generators:
+            if hasattr(p, 'generate_context'):
+                p.generate_context()
 
-    # erase the directory if it is not the source
-    if output_path not in os.path.realpath(path) and not keep:
-        clean_output_dir(output_path)
+        # erase the directory if it is not the source
+        if os.path.realpath(self.path).startswith(self.output_path) and not keep:
+            clean_output_dir(self.output_path)
 
-    writer = Writer(output_path)
+        writer = self.get_writer()
 
-    for p in generators:
-        if hasattr(p, 'generate_output'):
-            p.generate_output(writer)
+        for p in generators:
+            if hasattr(p, 'generate_output'):
+                p.generate_output(writer)
 
 
-def run_pelican(settings, path, theme, output_path, markup, delete):
-    """Run pelican with the given parameters"""
+    def get_generator_classes(self):
+        generators = [ArticlesGenerator, PagesGenerator, StaticGenerator]
+        if self.settings['PDF_GENERATOR']:
+            generators.append(PdfGenerator)
+        return generators
+
+    def get_writer(self):
+        return Writer(self.output_path)
 
-    params = init_params(settings, path, theme, output_path, markup, delete)
-    generators = [ArticlesGenerator, PagesGenerator, StaticGenerator]
-    if params[0]['PDF_GENERATOR']:  # param[0] is settings
-        generators.append(PdfGenerator)
-    run_generators(generators, *params)
 
 
 def main():
@@ -106,7 +114,18 @@ def main():
     # the variable with None.
     markup = [a.strip().lower() for a in args.markup.split(',')] if args.markup else None
 
-    run_pelican(args.settings, args.path, args.theme, args.output, markup, args.keep)
+    if args.settings is None:
+        settings = {}
+    settings = read_settings(args.settings)
+
+    cls = settings.get('PELICAN_CLASS')
+    if isinstance(cls, basestring):
+        module, cls_name = cls.rsplit('.', 1)
+        module = __import__(module)
+        cls = getattr(module, cls_name)
+
+    pelican = cls(settings, args.path, args.theme, args.output, markup, args.keep)
+    pelican.run()
 
 
 if __name__ == '__main__':
diff --git a/pelican/settings.py b/pelican/settings.py
index 8f0dcdbd..0fef4fec 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -22,6 +22,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
                    'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
+                   'PELICAN_CLASS': 'pelican.Pelican',
                   }
 
 def read_settings(filename):

From 03104bfbc3b9221b9b559888b1c44ac803c1429d Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Sat, 25 Dec 2010 17:58:47 +0300
Subject: [PATCH 0145/2864] Feed writer was refactored to allow more granular
 overriding of functionality.

---
 pelican/writers.py | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index e71156c0..b6095d3b 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -11,6 +11,25 @@ class Writer(object):
     def __init__(self, output_path):
         self.output_path = output_path
 
+    def _create_new_feed(self, feed_type, context):
+        feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
+        feed = feed_class(
+            title=context['SITENAME'],
+            link=self.site_url,
+            feed_url=self.feed_url,
+            description=context.get('SITESUBTITLE', ''))
+        return feed
+
+
+    def _add_item_to_the_feed(self, feed, item):
+        feed.add_item(
+            title=item.title,
+            link='%s/%s' % (self.site_url, item.url),
+            description=item.content,
+            categories=item.tags if hasattr(item, 'tags') else None,
+            author_name=getattr(item, 'author', 'John Doe'),
+            pubdate=item.date)
+
     def write_feed(self, elements, context, filename=None, feed_type='atom'):
         """Generate a feed with the list of articles provided
 
@@ -23,23 +42,13 @@ class Writer(object):
         :param filename: the filename to output.
         :param feed_type: the feed type to use (atom or rss)
         """
-        site_url = context.get('SITEURL', get_relative_path(filename))
+        self.site_url = context.get('SITEURL', get_relative_path(filename))
+        self.feed_url= '%s/%s' % (self.site_url, filename)
 
-        feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
+        feed = self._create_new_feed(feed_type, context)
 
-        feed = feed_class(
-            title=context['SITENAME'],
-            link=site_url,
-            feed_url= "%s/%s" % (site_url, filename),
-            description=context.get('SITESUBTITLE', ''))
-        for element in elements:
-            feed.add_item(
-                title=element.title,
-                link= "%s/%s" % (site_url, element.url),
-                description=element.content,
-                categories=element.tags if hasattr(element, "tags") else None,
-                author_name=getattr(element, 'author', 'John Doe'),
-                pubdate=element.date)
+        for item in elements:
+            self._add_item_to_the_feed(feed, item)
 
         if filename:
             complete_path = os.path.join(self.output_path, filename)

From 01b4c069162bb332d2c3cef6e9d324abebe4317c Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Sun, 26 Dec 2010 23:59:30 +0300
Subject: [PATCH 0146/2864] Custom bicycle 'update_dict' was replaced with
 'collections.defaultdict'.

---
 pelican/generators.py | 10 +++++-----
 pelican/utils.py      | 11 -----------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 88ee6919..18dba81a 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -8,7 +8,7 @@ import os
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
 
-from pelican.utils import update_dict, copytree, process_translations, open
+from pelican.utils import copytree, process_translations, open
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
 
@@ -81,8 +81,8 @@ class ArticlesGenerator(Generator):
         self.articles = [] # only articles in default language
         self.translations = []
         self.dates = {}
-        self.tags = {}
-        self.categories = {}
+        self.tags = defaultdict(list)
+        self.categories = defaultdict(list)
         super(ArticlesGenerator, self).__init__(*args, **kwargs)
 
     def generate_feeds(self, writer):
@@ -178,14 +178,14 @@ class ArticlesGenerator(Generator):
 
             if hasattr(article, 'tags'):
                 for tag in article.tags:
-                    update_dict(self.tags, tag, article)
+                    self.tags[tag].append(article)
             all_articles.append(article)
 
         self.articles, self.translations = process_translations(all_articles)
 
         for article in self.articles:
             # only main articles are listed in categories, not translations
-            update_dict(self.categories, article.category, article)
+            self.categories[article.category].append(article)
 
 
         # sort the articles by date
diff --git a/pelican/utils.py b/pelican/utils.py
index fe7ab009..9641b078 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -7,17 +7,6 @@ from codecs import open as _open
 from itertools import groupby
 from operator import attrgetter
 
-def update_dict(mapping, key, value):
-    """Update a dict intenal list
-
-    :param mapping: the mapping to update
-    :param key: the key of the mapping to update.
-    :param value: the value to append to the list.
-    """
-    if key not in mapping:
-        mapping[key] = []
-    mapping[key].append(value)
-
 
 def get_date(string):
     """Return a datetime object from a string.

From 3c0649d89f2f17ad04d5ea7bd287a05937ef5820 Mon Sep 17 00:00:00 2001
From: Allan Whatmough <al.whatmough@gmail.com>
Date: Mon, 27 Dec 2010 23:27:40 +0000
Subject: [PATCH 0147/2864] Use JINJA_EXTENSIONS setting if available when
 creating the Environment object.

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 88ee6919..6e7f524c 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -34,7 +34,7 @@ class Generator(object):
         templates ready to use with Jinja2.
         """
         path = os.path.expanduser(os.path.join(self.theme, 'templates'))
-        env = Environment(loader=FileSystemLoader(path))
+        env = Environment(loader=FileSystemLoader(path),extensions=self.settings.get('JINJA_EXTENSIONS', []))
         templates = {}
         for template in _TEMPLATES:
             try:

From 426ee1f76e749003afd8a8dc64b5790f01f86b16 Mon Sep 17 00:00:00 2001
From: Allan Whatmough <al.whatmough@gmail.com>
Date: Wed, 29 Dec 2010 13:20:53 +0000
Subject: [PATCH 0148/2864] Add JINJA_EXTENSIONS to the settings docs

---
 docs/settings.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index e58243bc..a201b92b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -41,6 +41,8 @@ Setting name              what it does ?
                           `feeds/all.atom.xml`
 `FEED_RSS`                relative url to output the rss feed. Default is
                           None (no rss)
+`JINJA_EXTENSIONS`        A list of any Jinja2 extensions you want to use.
+                          Default is no extensions (the empty list)
 `KEEP_OUTPUT_DIRECTORY`   Keep the output directory and just update all the generated files. 
                           Default is to delete the output directory.   
 `MARKUP`                  A list of available markup languages you want to use.

From 164c70386191f0761923c1344447b8fac0e0795c Mon Sep 17 00:00:00 2001
From: Allan Whatmough <al.whatmough@gmail.com>
Date: Wed, 29 Dec 2010 13:21:21 +0000
Subject: [PATCH 0149/2864] Add a default for JINJA_EXTENSIONS (default is no
 extensions)

---
 pelican/settings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/settings.py b/pelican/settings.py
index 8f0dcdbd..c9795a08 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -22,6 +22,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
                    'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
+                   'JINJA_EXTENSIONS': [],
                   }
 
 def read_settings(filename):

From 35ca78f64267fe9e034a0b5c67803b02b99b5638 Mon Sep 17 00:00:00 2001
From: Allan Whatmough <al.whatmough@gmail.com>
Date: Wed, 29 Dec 2010 13:23:09 +0000
Subject: [PATCH 0150/2864] Typo

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index a201b92b..d371317f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -42,7 +42,7 @@ Setting name              what it does ?
 `FEED_RSS`                relative url to output the rss feed. Default is
                           None (no rss)
 `JINJA_EXTENSIONS`        A list of any Jinja2 extensions you want to use.
-                          Default is no extensions (the empty list)
+                          Default is no extensions (the empty list).
 `KEEP_OUTPUT_DIRECTORY`   Keep the output directory and just update all the generated files. 
                           Default is to delete the output directory.   
 `MARKUP`                  A list of available markup languages you want to use.

From 5af56793eb7566918459deb0466bd810fd916a07 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 29 Dec 2010 15:37:25 +0100
Subject: [PATCH 0151/2864] Add generated docs to gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 29ac491f..927c084a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .*.swp
 .*.swo
 *.pyc
+docs/_build

From b3256f0ecd6d54882a5ffec6213e69cfd4a0e28d Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Sat, 1 Jan 2011 23:08:29 +0300
Subject: [PATCH 0152/2864] Added tag cloud generation. Result stored in the
 context.tag_cloud as list of tuples (tag, weight). Weight is from 1 to
 TAG_CLOUD_STEPS, lesser weight corresponds to bigger font size.

---
 docs/settings.rst     |  2 ++
 pelican/generators.py | 32 ++++++++++++++++++++++++++++++--
 pelican/settings.py   |  2 ++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e58243bc..0b70e461 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -60,6 +60,8 @@ Setting name              what it does ?
 `STATIC_THEME_PATHS`      Static theme paths you want to copy. Default values
                           is `static`, but if your theme have others static paths,
                           you can put them here.
+`TAG_CLOUD_STEPS`         Count of different font sizes in the tag cloud.
+`TAG_CLOUD_MAX_ITEMS`     Maximum tags count in the cloud.
 `THEME`                   theme to use to product the output. can be the
                           complete static path to a theme folder, or chosen
                           between the list of default themes (see below)
diff --git a/pelican/generators.py b/pelican/generators.py
index 88ee6919..1f72b87e 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,9 +1,11 @@
-from operator import attrgetter
+from operator import attrgetter, itemgetter
 from itertools import chain
 from functools import partial
 from datetime import datetime
 from collections import defaultdict
 import os
+import math
+import random
 
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
@@ -193,8 +195,34 @@ class ArticlesGenerator(Generator):
         self.dates = list(self.articles)
         self.dates.sort(key=attrgetter('date'), 
                 reverse=self.context['REVERSE_ARCHIVE_ORDER'])
+
+        # create tag cloud
+        tag_cloud = defaultdict(int)
+        for article in self.articles:
+            for tag in article.tags:
+                tag_cloud[tag] += 1
+
+        tag_cloud = sorted(tag_cloud.items(), key = itemgetter(1), reverse = True)
+        tag_cloud = tag_cloud[:self.settings.get('TAG_CLOUD_MAX_ITEMS')]
+
+        max_count = max(map(itemgetter(1), tag_cloud))
+        steps = self.settings.get('TAG_CLOUD_STEPS')
+
+        # calculate word sizes
+        self.tag_cloud = [
+            (
+                tag,
+                int(
+                    math.floor(steps - (steps - 1) * math.log(count) / math.log(max_count))
+                )
+            )
+            for tag, count in tag_cloud
+        ]
+        # put words in chaos
+        random.shuffle(self.tag_cloud)
+
         # and generate the output :)
-        self._update_context(('articles', 'dates', 'tags', 'categories'))
+        self._update_context(('articles', 'dates', 'tags', 'categories', 'tag_cloud'))
 
     def generate_output(self, writer):
         self.generate_feeds(writer)
diff --git a/pelican/settings.py b/pelican/settings.py
index 8f0dcdbd..d931cf02 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -22,6 +22,8 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
                    'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
+                   'TAG_CLOUD_STEPS': 4,
+                   'TAG_CLOUD_MAX_ITEMS': 100,
                   }
 
 def read_settings(filename):

From fd47a74b9e852e411ab4bad8fd7f4ccf61eb746e Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Sun, 2 Jan 2011 02:50:08 +0300
Subject: [PATCH 0153/2864] Template loading on demand get_templates was
 transformed into get_template.

---
 docs/settings.rst     |  2 ++
 pelican/generators.py | 41 +++++++++++++++++++++++------------------
 pelican/settings.py   |  1 +
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 0b70e461..853b5745 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -34,6 +34,8 @@ Setting name              what it does ?
 `DEFAULT_LANG`            The default language to use. Default is 'en'.
 `DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template.
                           Templates can follow or not this settings.
+`DIRECT_TEMPLATES`        Tuple, containing templates to render. There should be
+                          a html file for each of these templates in the theme.
 `FALLBACK_ON_FS_DATE`     If True, pelican will use the file system dates infos
                           (mtime) if it can't get informations from the
                           metadata?
diff --git a/pelican/generators.py b/pelican/generators.py
index 1f72b87e..6c67f07f 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -16,7 +16,6 @@ from pelican.readers import read_file
 
 _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
               'archives', 'page')
-_DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
 
 
 class Generator(object):
@@ -30,21 +29,23 @@ class Generator(object):
         for arg, value in kwargs.items():
             setattr(self, arg, value)
 
-    def get_templates(self):
-        """Return the templates to use.
+        # templates cache
+        self._templates = {}
+        self._templates_path = os.path.expanduser(os.path.join(self.theme, 'templates'))
+        self._env = Environment(loader = FileSystemLoader(self._templates_path))
+
+    def get_template(self, name):
+        """Return the template by name.
         Use self.theme to get the templates to use, and return a list of
         templates ready to use with Jinja2.
         """
-        path = os.path.expanduser(os.path.join(self.theme, 'templates'))
-        env = Environment(loader=FileSystemLoader(path))
-        templates = {}
-        for template in _TEMPLATES:
+        if name not in self._templates:
             try:
-                templates[template] = env.get_template('%s.html' % template)
+                self._templates[name] = self._env.get_template(name + '.html')
             except TemplateNotFound:
                 raise Exception('[templates] unable to load %s.html from %s' % (
-                    template, path))
-        return templates
+                    name, self._templates_path))
+        return self._templates[name]
 
     def get_files(self, path, exclude=[], extensions=None):
         """Return a list of files to use, based on rules
@@ -130,23 +131,28 @@ class ArticlesGenerator(Generator):
         """Generate the pages on the disk
         TODO: change the name"""
 
-        templates = self.get_templates()
         write = partial(
             writer.write_file,
             relative_urls = self.settings.get('RELATIVE_URLS')
         )
-        for template in _DIRECT_TEMPLATES:
-            write('%s.html' % template, templates[template], self.context,
+        for template in self.settings.get('DIRECT_TEMPLATES'):
+            write('%s.html' % template, self.get_template(template), self.context,
                     blog=True)
+
+        tag_template = self.get_template('tag')
         for tag, articles in self.tags.items():
-            write('tag/%s.html' % tag, templates['tag'], self.context, tag=tag,
+            write('tag/%s.html' % tag, tag_template, self.context, tag=tag,
                     articles=articles)
+
+        category_template = self.get_template('category')
         for cat in self.categories:
-            write('category/%s.html' % cat, templates['category'], self.context,
+            write('category/%s.html' % cat, category_template, self.context,
                           category=cat, articles=self.categories[cat])
+
+        article_template = self.get_template('article')
         for article in chain(self.translations, self.articles):
             write(article.save_as,
-                          templates['article'], self.context, article=article,
+                          article_template, self.context, article=article,
                           category=article.category)
 
     def generate_context(self):
@@ -252,9 +258,8 @@ class PagesGenerator(Generator):
         self.context['PAGES'] = self.pages
 
     def generate_output(self, writer):
-        templates = self.get_templates()
         for page in chain(self.translations, self.pages):
-            writer.write_file('pages/%s' % page.save_as, templates['page'],
+            writer.write_file('pages/%s' % page.save_as, self.get_template('page'),
                     self.context, page=page,
                     relative_urls = self.settings.get('RELATIVE_URLS'))
 
diff --git a/pelican/settings.py b/pelican/settings.py
index d931cf02..85f7a6a5 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -24,6 +24,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DEFAULT_LANG': 'en',
                    'TAG_CLOUD_STEPS': 4,
                    'TAG_CLOUD_MAX_ITEMS': 100,
+                   'DIRECT_TEMPLATES': ('index', 'tags', 'categories', 'archives'),
                   }
 
 def read_settings(filename):

From 3ee595f9277245f0e1d62e03ab2fdb9911c89289 Mon Sep 17 00:00:00 2001
From: Arnaud BOS <arnaud.tlse@gmail.com>
Date: Thu, 30 Dec 2010 14:11:37 +0000
Subject: [PATCH 0154/2864] Images support and add built files to gitignore

---
 .gitignore                                |   2 +
 pelican/contents.py                       |  10 ++++-
 pelican/generators.py                     |  51 +++++++++++++++++----
 pelican/writers.py                        |  52 ++++++++++++++++++++++
 samples/content/another_super_article.rst |   5 +++
 samples/content/pages/test_page.rst       |  12 +++++
 samples/content/pictures/Fat_Cat.jpg      | Bin 0 -> 62675 bytes
 samples/content/pictures/Sushi.jpg        | Bin 0 -> 28992 bytes
 samples/content/pictures/Sushi_Macro.jpg  | Bin 0 -> 38594 bytes
 samples/content/super_article.rst         |  13 +++++-
 samples/pelican.conf.py                   |   2 +
 11 files changed, 136 insertions(+), 11 deletions(-)
 create mode 100644 samples/content/pages/test_page.rst
 create mode 100644 samples/content/pictures/Fat_Cat.jpg
 create mode 100644 samples/content/pictures/Sushi.jpg
 create mode 100644 samples/content/pictures/Sushi_Macro.jpg

diff --git a/.gitignore b/.gitignore
index 927c084a..86021fe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 .*.swo
 *.pyc
 docs/_build
+build
+dist
diff --git a/pelican/contents.py b/pelican/contents.py
index bb6949fb..dd39fe28 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -11,7 +11,7 @@ class Page(object):
     mandatory_properties = ('title',)
 
     def __init__(self, content, metadatas={}, settings={}, filename=None):
-        self.content = content
+        self._content = content
         self.translations = []
 
         self.status = "published"  # default value
@@ -53,6 +53,14 @@ class Page(object):
             if not hasattr(self, prop):
                 raise NameError(prop)
 
+    @property
+    def content(self):
+        if hasattr(self, "_get_content"):
+            content = self._get_content()
+        else:
+            content = self._content
+        return content
+
     @property
     def summary(self):
         return truncate_html_words(self.content, 50)
diff --git a/pelican/generators.py b/pelican/generators.py
index 6e7f524c..f43c7c2a 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -4,11 +4,12 @@ from functools import partial
 from datetime import datetime
 from collections import defaultdict
 import os
+import re
 
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
 
-from pelican.utils import update_dict, copytree, process_translations, open
+from pelican.utils import update_dict, copytree, get_relative_path, process_translations, open
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
 
@@ -16,6 +17,32 @@ _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
               'archives', 'page')
 _DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
 
+def update_object_content(name, input):
+    """Change all the relatives paths of the input content to relatives paths
+       suitable fot the ouput content
+
+    :param name: path of the output.
+    :param input: input resource that will be passed to the templates.
+    """
+    content = input._content
+
+    hrefs = re.compile(r'<\s*[^\>]*href\s*=\s*(["\'])(.*?)\1')
+    srcs = re.compile(r'<\s*[^\>]*src\s*=\s*(["\'])(.*?)\1')
+
+    matches = hrefs.findall(content)
+    matches.extend(srcs.findall(content))
+    relative_paths = []
+    for found in matches:
+        found = found[1]
+        if found not in relative_paths:
+            relative_paths.append(found)
+
+    for relative_path in relative_paths:
+        if not relative_path.startswith("http://"):
+            dest_path = os.sep.join((get_relative_path(name), "static", relative_path))
+            content = content.replace(relative_path, dest_path)
+
+    return content
 
 class Generator(object):
     """Baseclass generator"""
@@ -133,19 +160,25 @@ class ArticlesGenerator(Generator):
             writer.write_file,
             relative_urls = self.settings.get('RELATIVE_URLS')
         )
+        # to minimize the number of relative path stuff modification in writer, articles pass first
+        for article in chain(self.translations, self.articles):
+            write('%s' % article.save_as,
+                templates['article'], self.context, article=article,
+                category=article.category)
+
         for template in _DIRECT_TEMPLATES:
             write('%s.html' % template, templates[template], self.context,
-                    blog=True)
+                blog=True)
+
+        # and subfolders after that
         for tag, articles in self.tags.items():
-            write('tag/%s.html' % tag, templates['tag'], self.context, tag=tag,
-                    articles=articles)
+            for article in articles:
+                write('tag/%s.html' % tag, templates['tag'], self.context,
+                    tag=tag, articles=articles)
+
         for cat in self.categories:
             write('category/%s.html' % cat, templates['category'], self.context,
-                          category=cat, articles=self.categories[cat])
-        for article in chain(self.translations, self.articles):
-            write(article.save_as,
-                          templates['article'], self.context, article=article,
-                          category=article.category)
+                category=cat, articles=self.categories[cat])
 
     def generate_context(self):
         """change the context"""
diff --git a/pelican/writers.py b/pelican/writers.py
index e71156c0..138ccd8d 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -4,12 +4,16 @@ from codecs import open
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 
+from functools import partial
+
 from pelican.utils import get_relative_path
+from pelican.generators import update_object_content
 
 class Writer(object):
 
     def __init__(self, output_path):
         self.output_path = output_path
+        self.reminder = dict()
 
     def write_feed(self, elements, context, filename=None, feed_type='atom'):
         """Generate a feed with the list of articles provided
@@ -69,6 +73,8 @@ class Writer(object):
             localcontext['SITEURL'] = get_relative_path(name)
 
         localcontext.update(kwargs)
+        self.update_context_contents(name, localcontext)
+
         output = template.render(localcontext)
         filename = os.sep.join((self.output_path, name))
         try:
@@ -78,3 +84,49 @@ class Writer(object):
         with open(filename, 'w', encoding='utf-8') as f:
             f.write(output)
         print u' [ok] writing %s' % filename
+
+    def update_context_contents(self, name, context):
+        """Recursively run the context to find elements (articles, pages, etc) whose content getter needs to
+           be modified in order to deal with relative paths.
+
+           :param name: name of the file to output.
+           :param context: dict that will be passed to the templates.
+        """
+        if context is None:
+            return None
+
+        if type(context) == tuple:
+            context = list(context)
+
+        if type(context) == dict:
+            context = list(context.values())
+
+        for i in xrange(len(context)):
+            if type(context[i]) == tuple or type(context[i]) == list:
+                context[i] = self.update_context_contents(name, context[i])
+
+            elif type(context[i]) == dict:
+                context[i] = self.update_context_content(name, context[i].values())
+
+            elif hasattr(context[i], '_content'):
+                relative_path = get_relative_path(name)
+                item = context[i]
+
+                if item in self.reminder:
+                    if relative_path not in self.reminder[item]:
+                        l = self.reminder[item]
+                        l.append(relative_path)
+                        self.inject_update_method(name, item)
+                else:
+                    l = list(relative_path)
+                    self.reminder[item] = l
+                    self.inject_update_method(name, item)
+        return context
+
+    def inject_update_method(self, name, item):
+        """Replace the content attribute getter of an element by a function that will deals with its
+           relatives paths.
+        """
+        if item:
+            setattr(item, "_get_content",
+                partial(update_object_content, name, item))
diff --git a/samples/content/another_super_article.rst b/samples/content/another_super_article.rst
index fb9b4c28..1c1c6d9c 100644
--- a/samples/content/another_super_article.rst
+++ b/samples/content/another_super_article.rst
@@ -11,3 +11,8 @@ Why not ?
 
 After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !
+
+.. image:: pictures/Sushi.jpg
+   :height: 450 px
+   :width: 600 px
+   :alt: alternate text
diff --git a/samples/content/pages/test_page.rst b/samples/content/pages/test_page.rst
new file mode 100644
index 00000000..06f91c10
--- /dev/null
+++ b/samples/content/pages/test_page.rst
@@ -0,0 +1,12 @@
+This is a test page
+###################
+
+:category: test
+
+Just an image.
+
+.. image:: pictures/Fat_Cat.jpg
+   :height: 450 px
+   :width: 600 px
+   :alt: alternate text
+
diff --git a/samples/content/pictures/Fat_Cat.jpg b/samples/content/pictures/Fat_Cat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d8a96d356be94e782aaf36ba4e47168435b56338
GIT binary patch
literal 62675
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

literal 0
HcmV?d00001

diff --git a/samples/content/pictures/Sushi.jpg b/samples/content/pictures/Sushi.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e49e5f0ab53461187c2cf61ebc1f3befdc937aed
GIT binary patch
literal 28992
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
GKmXZ^k)SRB

literal 0
HcmV?d00001

diff --git a/samples/content/pictures/Sushi_Macro.jpg b/samples/content/pictures/Sushi_Macro.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..21f935a1bf82808aa2ded423caba3cc9f2911973
GIT binary patch
literal 38594
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
V9RVclK)_SR8Zrq#de{_0|JgZd7T*8>

literal 0
HcmV?d00001

diff --git a/samples/content/super_article.rst b/samples/content/super_article.rst
index 8f53a0b6..8096de95 100644
--- a/samples/content/super_article.rst
+++ b/samples/content/super_article.rst
@@ -11,7 +11,17 @@ Some content here !
 This is a simple title
 ======================
 
-And here comes the cool stuff.
+And here comes the cool stuff_.
+
+.. image:: pictures/Sushi.jpg
+   :height: 450 px
+   :width: 600 px
+   :alt: alternate text
+
+.. image:: pictures/Sushi_Macro.jpg
+   :height: 450 px
+   :width: 600 px
+   :alt: alternate text
 
 .. code-block:: python
 
@@ -20,3 +30,4 @@ And here comes the cool stuff.
 
 → And now try with some utf8 hell: ééé
 
+.. _stuff: http://books.couchdb.org/relax/design-documents/views
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 36aca0ac..daf1d20d 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -17,3 +17,5 @@ LINKS = (('Biologeek', 'http://biologeek.org'),
 SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
           ('lastfm', 'http://lastfm.com/user/akounet'),
           ('github', 'http://github.com/ametaireau'),)
+
+STATIC_PATHS = ["pictures",]

From f495cb41d959f26f29c897dd7ef03976d0d40380 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 5 Jan 2011 13:51:04 +0100
Subject: [PATCH 0155/2864] Add TWITTER_USERNAME settings in the docs.

---
 docs/settings.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index d371317f..e59d1b5b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -100,6 +100,9 @@ Setting name              what it does ?
                           the header.
 `SOCIAL`                  A list of tuples (Title, Url) to appear in the "social"
                           section.
+`TWITTER_USERNAME`        Allows to add a button on the articles to tweet about
+                          them. Add you twitter username if you want this
+                          button to appear.
 =======================   =======================================================
 
 In addition, you can use the "wide" version of the `notmyidea` theme, by

From b3ca36a8b0e5823fbe562b3d2332f0358850103a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 5 Jan 2011 14:04:11 +0100
Subject: [PATCH 0156/2864] Add references to the simple theme in the
 documentation.

---
 docs/themes.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 633acaaf..0ddd2498 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -2,7 +2,10 @@ How to create themes for pelican
 ################################
 
 Pelican uses the great `jinja2 <http://jinjna.pocoo.org>`_ templating engine to
-generate it's HTML output.
+generate it's HTML output. The jinja2 syntax is really simple. If you want to
+create your own theme, feel free to take inspiration from the "simple" theme,
+which is available `here
+<https://github.com/ametaireau/pelican/tree/master/pelican/themes/simple/templates>`_
 
 Structure
 =========

From 2f6300af46229f58c5477d929aa04950381a0f59 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 5 Jan 2011 14:27:46 +0100
Subject: [PATCH 0157/2864] Do not create a general function for
 "update_object_content".

---
 pelican/generators.py | 27 ---------------------------
 pelican/writers.py    | 36 ++++++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index f43c7c2a..49d5a887 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -4,7 +4,6 @@ from functools import partial
 from datetime import datetime
 from collections import defaultdict
 import os
-import re
 
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
@@ -17,32 +16,6 @@ _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
               'archives', 'page')
 _DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
 
-def update_object_content(name, input):
-    """Change all the relatives paths of the input content to relatives paths
-       suitable fot the ouput content
-
-    :param name: path of the output.
-    :param input: input resource that will be passed to the templates.
-    """
-    content = input._content
-
-    hrefs = re.compile(r'<\s*[^\>]*href\s*=\s*(["\'])(.*?)\1')
-    srcs = re.compile(r'<\s*[^\>]*src\s*=\s*(["\'])(.*?)\1')
-
-    matches = hrefs.findall(content)
-    matches.extend(srcs.findall(content))
-    relative_paths = []
-    for found in matches:
-        found = found[1]
-        if found not in relative_paths:
-            relative_paths.append(found)
-
-    for relative_path in relative_paths:
-        if not relative_path.startswith("http://"):
-            dest_path = os.sep.join((get_relative_path(name), "static", relative_path))
-            content = content.replace(relative_path, dest_path)
-
-    return content
 
 class Generator(object):
     """Baseclass generator"""
diff --git a/pelican/writers.py b/pelican/writers.py
index 138ccd8d..5d443f09 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 import os
+import re
 from codecs import open
+from functools import partial
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 
-from functools import partial
-
 from pelican.utils import get_relative_path
-from pelican.generators import update_object_content
+
 
 class Writer(object):
 
@@ -127,6 +127,34 @@ class Writer(object):
         """Replace the content attribute getter of an element by a function that will deals with its
            relatives paths.
         """
+
+        def _update_object_content(name, input):
+            """Change all the relatives paths of the input content to relatives paths
+               suitable fot the ouput content
+
+            :param name: path of the output.
+            :param input: input resource that will be passed to the templates.
+            """
+            content = input._content
+
+            hrefs = re.compile(r'<\s*[^\>]*href\s*=\s*(["\'])(.*?)\1')
+            srcs = re.compile(r'<\s*[^\>]*src\s*=\s*(["\'])(.*?)\1')
+
+            matches = hrefs.findall(content)
+            matches.extend(srcs.findall(content))
+            relative_paths = []
+            for found in matches:
+                found = found[1]
+                if found not in relative_paths:
+                    relative_paths.append(found)
+
+            for relative_path in relative_paths:
+                if not relative_path.startswith("http://"):
+                    dest_path = os.sep.join((get_relative_path(name), "static", relative_path))
+                    content = content.replace(relative_path, dest_path)
+
+            return content
+
         if item:
             setattr(item, "_get_content",
-                partial(update_object_content, name, item))
+                partial(_update_object_content, name, item))

From 79576f25b62c8a520e603d8677c31927220f53b3 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 5 Jan 2011 16:22:52 +0100
Subject: [PATCH 0158/2864] Fix translation feature. Add translation support to
 the notmyidea theme.

---
 pelican/contents.py                           |  2 +-
 .../themes/notmyidea/templates/article.html   | 13 +--------
 .../notmyidea/templates/article_infos.html    | 14 ++++++++++
 pelican/themes/notmyidea/templates/index.html | 27 ++-----------------
 .../notmyidea/templates/translations.html     |  6 +++++
 pelican/utils.py                              |  1 +
 samples/content/another_super_article-fr.rst  |  6 +++++
 samples/content/another_super_article.rst     |  2 +-
 samples/content/super_article.rst             |  2 +-
 9 files changed, 33 insertions(+), 40 deletions(-)
 create mode 100644 pelican/themes/notmyidea/templates/article_infos.html
 create mode 100644 pelican/themes/notmyidea/templates/translations.html
 create mode 100644 samples/content/another_super_article-fr.rst

diff --git a/pelican/contents.py b/pelican/contents.py
index dd39fe28..b6e71b75 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -16,7 +16,7 @@ class Page(object):
 
         self.status = "published"  # default value
         for key, value in metadatas.items():
-            setattr(self, key, value)
+            setattr(self, key.lower(), value)
 
         if not hasattr(self, 'author'):
             if 'AUTHOR' in settings:
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 8b5e5bae..14fffe4d 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -7,18 +7,7 @@
         rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title
         }}</a></h1> {% include 'twitter.html' %} </header>
         <div class="entry-content">
-        <footer class="post-info">
-                <abbr class="published" title="{{ article.date.isoformat() }}">
-                    {{ article.date.strftime('%a %d %B %Y') }}
-                </abbr>
-                {% if article.author %}
-                <address class="vcard author">
-                        By <a class="url fn" href="#">{{ article.author }}</a>
-                </address>
-                {% endif %}
-                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. 
-        {% include 'taglist.html' %}
-        </footer><!-- /.post-info -->
+        {% include 'article_infos.html' %}
         {{ article.content }}
         </div><!-- /.entry-content -->
         {% if DISQUS_SITENAME %}
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
new file mode 100644
index 00000000..818b5277
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -0,0 +1,14 @@
+<footer class="post-info">
+        <abbr class="published" title="{{ article.date.isoformat() }}">
+                {{ article.date.strftime('%a %d %B %Y') }}
+        </abbr>
+
+        {% if article.author %}
+        <address class="vcard author">
+                By <a class="url fn" href="#">{{ article.author }}</a>
+        </address>
+        {% endif %}
+<p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
+{% include 'taglist.html' %}
+{% include 'translations.html' %}
+</footer><!-- /.post-info -->
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index e6e7d816..5969e6c8 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -7,19 +7,7 @@
         <aside id="featured" class="body"><article>
                 <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url
                 }}">{{ article.title }}</a></h1> 
-                <footer class="post-info">
-                        <abbr class="published" title="{{ article.date.isoformat() }}">
-                                {{ article.date.strftime('%a %d %B %Y') }}
-                        </abbr>
-
-                        {% if article.author %}
-                        <address class="vcard author">
-                                By <a class="url fn" href="#">{{ article.author }}</a>
-                        </address>
-                        {% endif %}
-                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
-                {% include 'taglist.html' %}
-                </footer><!-- /.post-info -->
+                {% include 'article_infos.html' %}
                 {{ article.content }}
                 {% include 'comments.html' %}
                 </article>
@@ -37,18 +25,7 @@
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
-                        <abbr class="published" title="{{ article.date.isoformat() }}">
-                                {{ article.date.strftime('%a %d %B %Y') }}
-                        </abbr>
-
-                        <address class="vcard author">
-                                By <a class="url fn" href="#">{{ article.author }}</a>
-                        </address>
-                        <p> In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
-                        {% include 'taglist.html' %}
-                    <p>{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">pdf</a>{% endif %}</p>
-                </footer><!-- /.post-info -->
+                {% include 'article_infos.html' %}
                 {{ article.summary }}
                 <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
                 {% include 'comments.html' %}
diff --git a/pelican/themes/notmyidea/templates/translations.html b/pelican/themes/notmyidea/templates/translations.html
new file mode 100644
index 00000000..0079883e
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/translations.html
@@ -0,0 +1,6 @@
+{% if article.translations %}
+Translations: 
+    {% for translation in article.translations %}
+        <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
+    {% endfor %}
+{% endif %}
diff --git a/pelican/utils.py b/pelican/utils.py
index fe7ab009..b15d8642 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -159,6 +159,7 @@ def process_translations(content_list):
         Also, for each content_list item, it
         sets attribute 'translations'
     """
+    content_list.sort(key=attrgetter('slug'))
     grouped_by_slugs = groupby(content_list, attrgetter('slug'))
     index = []
     translations = []
diff --git a/samples/content/another_super_article-fr.rst b/samples/content/another_super_article-fr.rst
new file mode 100644
index 00000000..f0e63196
--- /dev/null
+++ b/samples/content/another_super_article-fr.rst
@@ -0,0 +1,6 @@
+Oh yeah !
+#########
+
+:lang: fr
+
+Et voila du contenu en français
diff --git a/samples/content/another_super_article.rst b/samples/content/another_super_article.rst
index 1c1c6d9c..84cdc401 100644
--- a/samples/content/another_super_article.rst
+++ b/samples/content/another_super_article.rst
@@ -1,5 +1,5 @@
 Oh yeah !
-#########################
+#########
 
 :tags: oh, bar, yeah
 :date: 2010-10-20 10:14
diff --git a/samples/content/super_article.rst b/samples/content/super_article.rst
index 8096de95..3b9f9adc 100644
--- a/samples/content/super_article.rst
+++ b/samples/content/super_article.rst
@@ -25,7 +25,7 @@ And here comes the cool stuff_.
 
 .. code-block:: python
 
-   >>> from ipdb import set trace
+   >>> from ipdb import set_trace
    >>> set_trace()
 
 → And now try with some utf8 hell: ééé

From 6b4b5fce139c15ccf9b32ff24d4dd07ec4006d78 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 5 Jan 2011 16:23:44 +0100
Subject: [PATCH 0159/2864] update sphinx configuration

---
 docs/conf.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 0efe92b2..5b24d67c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -8,10 +8,11 @@ import sys, os
 
 # -- General configuration -----------------------------------------------------
 templates_path = ['_templates']
+extensions = ['sphinx.ext.autodoc',]
 source_suffix = '.rst'
 master_doc = 'index'
 project = u'Pelican'
-copyright = u'2010, Alexis Metaireau'
+copyright = u'2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'
 

From bb96e253c97ad540d99456a7353d5a542bda2fe7 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 5 Jan 2011 16:24:44 +0100
Subject: [PATCH 0160/2864] Start working on the testsuite.

---
 pelican/tests/test_contents.py | 54 ++++++++++++++++++++++++++++++++++
 pelican/tests/test_settings.py | 16 ++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 pelican/tests/test_contents.py
 create mode 100644 pelican/tests/test_settings.py

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
new file mode 100644
index 00000000..10d3741a
--- /dev/null
+++ b/pelican/tests/test_contents.py
@@ -0,0 +1,54 @@
+from unittest2 import TestCase
+
+from pelican.contents import Page
+from pelican.settings import DEFAULT_CONFIG
+
+class TestPage(TestCase):
+
+    def test_use_args(self):
+        # creating a page with arguments passed to the connstructor should use
+        # them to initialise object's attributes
+        metadata = {'foo': 'bar', 'foobar': 'baz'}
+        page = Page('content', metadatas=metadata)
+        for key, value in metadata.items():
+            self.assertTrue(hasattr(page, key))
+            self.assertEqual(value, getattr(page, key))
+        self.assertEqual(page.content, "content")
+
+    def test_mandatory_properties(self):
+        # if the title is not set, must throw an exception
+        page = Page('content')
+        with self.assertRaises(NameError) as cm:
+            page.check_properties()
+
+        page = Page('content', metadatas={'title': 'foobar'})
+        page.check_properties()
+        
+
+    def test_slug(self):
+        # if a title is given, it should be used to generate the slug
+        page = Page('content', {'title': 'foobar is foo'})
+        self.assertEqual(page.slug, 'foobar-is-foo')
+
+
+    def test_defaultlang(self):
+        # if no lang is given, default to the default one
+        page = Page('content')
+        self.assertEqual(page.lang, DEFAULT_CONFIG['DEFAULT_LANG'])
+
+        # it is possible to specify the lang in the metadata infos
+        page = Page('content', {'lang': 'fr'})
+        self.assertEqual(page.lang, 'fr')
+
+    def test_save_as(self):
+        # if a lang is not the default lang, save_as should be set accordingly
+        page = Page('content', {'title': 'foobar', 'lang': 'fr'}) #default lang is en
+        self.assertEqual(page.save_as, "foobar-fr.html")
+
+        # otherwise, if a title is defined, save_as should be set
+        page = Page('content', {'title': 'foobar'})
+        page.save_as = 'foobar.html'
+
+        # if no title is given, there is no save_as
+        page = Page('content')
+        self.assertFalse(hasattr(page, 'save_as'))
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
new file mode 100644
index 00000000..58e38378
--- /dev/null
+++ b/pelican/tests/test_settings.py
@@ -0,0 +1,16 @@
+from unittest2 import TestCase
+
+from pelican.settings import read_settings, DEFAULT_CONFIG
+
+class SettingsTest(TestCase):
+
+    def test_read_settings(self):
+        # providing no file should return the default values
+        settings = read_settings(None)
+        self.assertDictEqual(settings, DEFAULT_CONFIG)
+
+        # providing a file should read it, replace the default values and append 
+        # new values to the settings, if any
+        settings = read_settings(mock)
+        self.assertIn('key', settings)
+        self.assertEqual(settings['KEY'

From 6e4a826dc1b64bde468f987a387d3baa28c6dd66 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 6 Jan 2011 02:33:14 +0100
Subject: [PATCH 0161/2864] Update the translation documentation.

---
 docs/getting_started.rst | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index f66a6f06..0b928afe 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -91,7 +91,39 @@ the menu.
 Translations
 ============
 
-It is possible to translate articles. To do so, you need to add a `Lang` meta
+It is possible to translate articles. To do so, you need to add a `lang` meta
 in your articles/pages, and to set a `DEFAULT_LANG` setting (which is en by
-default). Then, only articles with this default language will be listed, and
+default). 
+Then, only articles with this default language will be listed, and
 each article will have a translation list.
+
+Pelican uses the "slug" of two articles to compare if they are translations of
+each others. So it's possible to define (in restructured text) the slug
+directly.
+
+Here is an exemple of two articles (one in english and the other one in
+french).
+
+The english one::
+
+    Foobar is not dead
+    ##################
+
+    :slug: foobar-is-not-dead
+    :lang: en
+
+    That's true, foobar is still alive !
+
+And the french one::
+
+    Foobar n'est pas mort !
+    #######################
+
+    :slug: foobar-is-not-dead
+    :lang: fr
+
+    Oui oui, foobar est toujours vivant !
+
+Despite the text quality, you can see that only the slug is the same here.
+You're not forced to define the slug that way, and it's completely possible to
+have two translations with the same title (which defines the slug)

From 30c2a0b681187180ca8228e0160962c6f25e794c Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 6 Jan 2011 02:37:37 +0100
Subject: [PATCH 0162/2864] Update doc version.

---
 docs/conf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/conf.py b/docs/conf.py
index 5b24d67c..507e30a3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -15,6 +15,8 @@ project = u'Pelican'
 copyright = u'2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'
+version = "2"
+release = version
 
 # -- Options for HTML output ---------------------------------------------------
 

From 55da03ad2fb1cdcb94c5748204ebee75616fec91 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 12 Jan 2011 19:08:29 +0100
Subject: [PATCH 0163/2864] Fix notmyidea layout. This fixes #54

---
 pelican/themes/notmyidea/static/css/main.css | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 0972ca0b..a3fd60f1 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -276,14 +276,6 @@ img.left, figure.left {float: right; margin: 0 0 2em 2em;}
 	padding: .3em .25em;
 }
 
-#extras li:last-child,
-#extras li:last-child a {border: 0}
-
-#extras .blogroll li:nth-last-child(2),
-#extras .blogroll li:nth-last-child(3),
-#extras .blogroll li:nth-last-child(2) a,
-#extras .blogroll li:nth-last-child(3) a {border: 0;}
-
 #extras a:hover, #extras a:active {color: #fff;}
 
 	/* Blogroll */

From b8fb45de9e512c8c9fc729647a8a843fda6714fc Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 12 Jan 2011 23:45:06 +0100
Subject: [PATCH 0164/2864] Add the autoreload feature. This fixes #45. I've
 choosen to not serve the content via HTTP, because it's really simple to do
 "firefox output/index.html".

---
 docs/getting_started.rst |  7 +++++++
 pelican/__init__.py      | 25 +++++++++++++++++++------
 pelican/utils.py         | 24 ++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 0b928afe..db3c0431 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -127,3 +127,10 @@ And the french one::
 Despite the text quality, you can see that only the slug is the same here.
 You're not forced to define the slug that way, and it's completely possible to
 have two translations with the same title (which defines the slug)
+
+Autoreload
+==========
+
+It's possible to tell pelican to watch for your modifications, instead of
+manually launching it each time you need. Use the `-r` option, or
+`--autoreload`.
diff --git a/pelican/__init__.py b/pelican/__init__.py
index f0684d65..e9a98375 100755
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,11 +1,12 @@
 import argparse
 import os
+from functools import partial
 
-from pelican.settings import read_settings
-from pelican.utils import clean_output_dir
-from pelican.writers import Writer
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
-                                StaticGenerator, PdfGenerator)
+        StaticGenerator, PdfGenerator)
+from pelican.settings import read_settings
+from pelican.utils import clean_output_dir, files_changed
+from pelican.writers import Writer
 
 VERSION = "2.5.3"
 
@@ -107,7 +108,10 @@ def main():
         help='Keep the output directory and just update all the generated files.'
              'Default is to delete the output directory.')
     parser.add_argument('--version', action='version', version=VERSION,
-            help="Print the pelican version and exit")
+            help='Print the pelican version and exit')
+    parser.add_argument('-r', '--autoreload', dest='autoreload', action='store_true',
+            help="Relaunch pelican each time a modification occurs on the content"
+                 "files")
     args = parser.parse_args()
 
     # Split the markup languages only if some have been given. Otherwise, populate
@@ -125,7 +129,16 @@ def main():
         cls = getattr(module, cls_name)
 
     pelican = cls(settings, args.path, args.theme, args.output, markup, args.keep)
-    pelican.run()
+
+    if args.autoreload:
+        while True:
+            try:
+                if files_changed(pelican.path, pelican.markup):
+                    pelican.run()
+            except KeyboardInterrupt:
+                break
+    else:
+        pelican.run()
 
 
 if __name__ == '__main__':
diff --git a/pelican/utils.py b/pelican/utils.py
index 7def7881..5a7fbaaf 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -174,3 +174,27 @@ def process_translations(content_list):
         for a in items:
             a.translations = filter(lambda x: x != a, items)
     return index, translations
+
+
+LAST_MTIME = 0
+
+
+def files_changed(path, extensions):
+    """Return True if the files have changed since the last check"""
+
+    def with_extension(f):
+        return True if True in [f.endswith(ext) for ext in extensions] else False
+
+    def file_times(path):
+        """Return the last time files have been modified"""
+        for top_level in os.listdir(path):
+            for root, dirs, files in os.walk(top_level):
+                for file in filter(with_extension, files):
+                    yield os.stat(os.path.join(root, file)).st_mtime
+
+    global LAST_MTIME
+    mtime = max(file_times(path))
+    if mtime > LAST_MTIME:
+        LAST_MTIME = mtime
+        return True
+    return False

From a64ecf24be357348025b1f45b1687e24b6ff2b85 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 12 Jan 2011 23:47:19 +0100
Subject: [PATCH 0165/2864] Merge branches 'autoreload' and 'master'


From c13c707a625b11e1c5b0e0a180ce5b6bec177985 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 13 Jan 2011 00:32:37 +0100
Subject: [PATCH 0166/2864] Tests for contents.py

---
 pelican/contents.py                       | 10 ++++++----
 {pelican/tests => tests}/test_contents.py |  2 --
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename {pelican/tests => tests}/test_contents.py (99%)

diff --git a/pelican/contents.py b/pelican/contents.py
index b6e71b75..9a70da2c 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,4 +1,5 @@
 from pelican.utils import slugify, truncate_html_words
+from pelican.settings import DEFAULT_CONFIG
 
 
 class Page(object):
@@ -22,16 +23,17 @@ class Page(object):
             if 'AUTHOR' in settings:
                 self.author = settings['AUTHOR']
 
-        default_lang = settings.get('DEFAULT_LANG').lower()
+        default_lang = settings.get('DEFAULT_LANG', 
+                DEFAULT_CONFIG['DEFAULT_LANG']).lower()
         if not hasattr(self, 'lang'):
             self.lang = default_lang
 
         self.in_default_lang = (self.lang == default_lang)
 
-        if not hasattr(self, 'slug'):
+        if not hasattr(self, 'slug') and hasattr(self, 'title'):
             self.slug = slugify(self.title)
 
-        if not hasattr(self, 'save_as'):
+        if not hasattr(self, 'save_as') and hasattr(self, 'slug'):
             if self.in_default_lang:
                 self.save_as = '%s.html' % self.slug
                 clean_url = '%s/' % self.slug
@@ -41,7 +43,7 @@ class Page(object):
 
         if settings.get('CLEAN_URLS', False):
             self.url = clean_url
-        else:
+        elif hasattr(self, 'save_as'):
             self.url = self.save_as
 
         if filename:
diff --git a/pelican/tests/test_contents.py b/tests/test_contents.py
similarity index 99%
rename from pelican/tests/test_contents.py
rename to tests/test_contents.py
index 10d3741a..c1ef27e2 100644
--- a/pelican/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -23,14 +23,12 @@ class TestPage(TestCase):
 
         page = Page('content', metadatas={'title': 'foobar'})
         page.check_properties()
-        
 
     def test_slug(self):
         # if a title is given, it should be used to generate the slug
         page = Page('content', {'title': 'foobar is foo'})
         self.assertEqual(page.slug, 'foobar-is-foo')
 
-
     def test_defaultlang(self):
         # if no lang is given, default to the default one
         page = Page('content')

From 8454b0d1b8f160227ebc15f5c94724edd682d628 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 13 Jan 2011 00:46:10 +0100
Subject: [PATCH 0167/2864] Tests for settings.

---
 pelican/settings.py            | 48 +++++++++++++++++-----------------
 pelican/tests/test_settings.py | 16 ------------
 samples/pelican.conf.py        | 14 ++++++----
 tests/__init__.py              |  0
 tests/test_settings.py         | 34 ++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 45 deletions(-)
 delete mode 100644 pelican/tests/test_settings.py
 create mode 100644 tests/__init__.py
 create mode 100644 tests/test_settings.py

diff --git a/pelican/settings.py b/pelican/settings.py
index 2178c5ca..13270a4d 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,35 +1,35 @@
 import os
 
-_DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
+DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
                               "themes/notmyidea"])
-_DEFAULT_CONFIG = {'PATH': None,
-                   'THEME': _DEFAULT_THEME,
-                   'OUTPUT_PATH': 'output/',
-                   'MARKUP': ('rst', 'md'),
-                   'STATIC_PATHS': ['images',],
-                   'THEME_STATIC_PATHS': ['static',],
-                   'FEED': 'feeds/all.atom.xml',
-                   'CATEGORY_FEED': 'feeds/%s.atom.xml',
-                   'TRANSLATION_FEED': 'feeds/all-%s.atom.xml',
-                   'SITENAME': 'A Pelican Blog',
-                   'DISPLAY_PAGES_ON_MENU': True,
-                   'PDF_GENERATOR': False,
-                   'DEFAULT_CATEGORY': 'misc',
-                   'FALLBACK_ON_FS_DATE': True,
-                   'CSS_FILE': 'main.css',
-                   'REVERSE_ARCHIVE_ORDER': False,
-                   'KEEP_OUTPUT_DIRECTORY': False,
-                   'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
-                   'RELATIVE_URLS': True,
-                   'DEFAULT_LANG': 'en',
-                   'PELICAN_CLASS': 'pelican.Pelican',
-                   'JINJA_EXTENSIONS': [],
+DEFAULT_CONFIG = {'PATH': None,
+                  'THEME': DEFAULT_THEME,
+                  'OUTPUT_PATH': 'output/',
+                  'MARKUP': ('rst', 'md'),
+                  'STATIC_PATHS': ['images',],
+                  'THEME_STATIC_PATHS': ['static',],
+                  'FEED': 'feeds/all.atom.xml',
+                  'CATEGORY_FEED': 'feeds/%s.atom.xml',
+                  'TRANSLATION_FEED': 'feeds/all-%s.atom.xml',
+                  'SITENAME': 'A Pelican Blog',
+                  'DISPLAY_PAGES_ON_MENU': True,
+                  'PDF_GENERATOR': False,
+                  'DEFAULT_CATEGORY': 'misc',
+                  'FALLBACK_ON_FS_DATE': True,
+                  'CSS_FILE': 'main.css',
+                  'REVERSE_ARCHIVE_ORDER': False,
+                  'KEEP_OUTPUT_DIRECTORY': False,
+                  'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
+                  'RELATIVE_URLS': True,
+                  'DEFAULT_LANG': 'en',
+                  'PELICAN_CLASS': 'pelican.Pelican',
+                  'JINJA_EXTENSIONS': [],
                   }
 
 def read_settings(filename):
     """Load a Python file into a dictionary.
     """
-    context = _DEFAULT_CONFIG.copy()
+    context = DEFAULT_CONFIG.copy()
     if filename:
         tempdict = {}
         execfile(filename, tempdict)
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
deleted file mode 100644
index 58e38378..00000000
--- a/pelican/tests/test_settings.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from unittest2 import TestCase
-
-from pelican.settings import read_settings, DEFAULT_CONFIG
-
-class SettingsTest(TestCase):
-
-    def test_read_settings(self):
-        # providing no file should return the default values
-        settings = read_settings(None)
-        self.assertDictEqual(settings, DEFAULT_CONFIG)
-
-        # providing a file should read it, replace the default values and append 
-        # new values to the settings, if any
-        settings = read_settings(mock)
-        self.assertIn('key', settings)
-        self.assertEqual(settings['KEY'
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index daf1d20d..d796e2d5 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -8,14 +8,18 @@ DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
 
 LINKS = (('Biologeek', 'http://biologeek.org'),
-            ('Filyb', "http://filyb.info/"),
-            ('Libert-fr', "http://www.libert-fr.com"),
-            ('N1k0', "http://prendreuncafe.com/blog/"),
-            (u'Tarek Ziadé', "http://ziade.org/blog"),
-            ('Zubin Mithra', "http://zubin71.wordpress.com/"),)
+         ('Filyb', "http://filyb.info/"),
+         ('Libert-fr', "http://www.libert-fr.com"),
+         ('N1k0', "http://prendreuncafe.com/blog/"),
+         (u'Tarek Ziadé', "http://ziade.org/blog"),
+         ('Zubin Mithra', "http://zubin71.wordpress.com/"),)
 
 SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
           ('lastfm', 'http://lastfm.com/user/akounet'),
           ('github', 'http://github.com/ametaireau'),)
 
 STATIC_PATHS = ["pictures",]
+
+# foobar will not be used, because it's not in caps. All configuration keys 
+# have to be in caps
+foobar = "barbaz"
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/test_settings.py b/tests/test_settings.py
new file mode 100644
index 00000000..a22fcde0
--- /dev/null
+++ b/tests/test_settings.py
@@ -0,0 +1,34 @@
+from unittest2 import TestCase
+import os
+
+from pelican.settings import read_settings, DEFAULT_CONFIG
+
+SETTINGS = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
+        "../samples/pelican.conf.py"])
+
+class SettingsTest(TestCase):
+
+
+    def test_read_settings(self):
+        # providing a file, it should read it, replace the default values and append 
+        # new values to the settings, if any
+        settings = read_settings(SETTINGS)
+
+        # overwrite existing settings
+        self.assertEqual(settings.get('SITENAME'), u"Alexis' log")
+        
+        # add new settings
+        self.assertEqual(settings.get('SITEURL'), 'http://blog.notmyidea.org')
+
+        # keep default settings if not defined
+        self.assertEqual(settings.get('DEFAULT_CATEGORY'), 
+            DEFAULT_CONFIG['DEFAULT_CATEGORY'])
+
+        # do not copy keys not in caps
+        self.assertNotIn('foobar', settings)
+
+
+    def test_empty_read_settings(self):
+        # providing no file should return the default values
+        settings = read_settings(None)
+        self.assertDictEqual(settings, DEFAULT_CONFIG)

From 6b1434f7a7ff5d253add83246515f1451e8eca70 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 19 Jan 2011 16:22:15 +0100
Subject: [PATCH 0168/2864] Add a FAQ.

---
 docs/faq.rst    | 38 ++++++++++++++++++++++++++++++++++++++
 docs/index.rst  |  1 +
 docs/themes.rst |  1 +
 3 files changed, 40 insertions(+)
 create mode 100644 docs/faq.rst

diff --git a/docs/faq.rst b/docs/faq.rst
new file mode 100644
index 00000000..bee1dd54
--- /dev/null
+++ b/docs/faq.rst
@@ -0,0 +1,38 @@
+Frequently Asked Questions (FAQ)
+################################
+
+Here is a summary of the frequently asked questions for pelican.
+
+Is it mandatory to have a configuration file ?
+==============================================
+
+No, it's not. Configurations files are just an easy way to configure pelican.
+For the basic operations, it's possible to specify options while invoking
+pelican with the command line (see `pelican --help` for more informations about
+that)
+
+I'm creating my own theme, how to use pygments ?
+================================================
+
+Pygment add some classes to the generated content, so the theming of your theme
+will be done thanks to a css file. You can have a look to the one proposed by
+default `on the project website <http://pygments.org/demo/15101/>`_
+
+How do I create my own theme ?
+==============================
+
+Please refer yourself to :ref:`theming-pelican`.
+
+How can I help ?
+================
+
+You have different options to help. First, you can use pelican, and report any
+idea or problem you have on `the bugtracker
+<http://github.com/ametaireau/pelican/issues>`_.
+
+If you want to contribute, please have a look to `the git repository
+<https://github.com/ametaireau/pelican/>`_, fork it, add your changes and do
+a pull request, I'll review them as soon as possible.
+
+You can also contribute by creating themes, and making the documentation
+better.
diff --git a/docs/index.rst b/docs/index.rst
index 5fd8f8b7..a493f57e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -50,3 +50,4 @@ Documentation
    settings
    themes
    internals
+   faq
diff --git a/docs/themes.rst b/docs/themes.rst
index 0ddd2498..2783df1e 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -1,5 +1,6 @@
 How to create themes for pelican
 ################################
+.. _theming-pelican:
 
 Pelican uses the great `jinja2 <http://jinjna.pocoo.org>`_ templating engine to
 generate it's HTML output. The jinja2 syntax is really simple. If you want to

From 2954098004e9d3eb74d652d2f8bbc440e8ec8287 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 20 Jan 2011 01:04:54 +0100
Subject: [PATCH 0169/2864] Update an anchor.

---
 docs/themes.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 2783df1e..7d492544 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -1,6 +1,7 @@
+.. _theming-pelican:
+
 How to create themes for pelican
 ################################
-.. _theming-pelican:
 
 Pelican uses the great `jinja2 <http://jinjna.pocoo.org>`_ templating engine to
 generate it's HTML output. The jinja2 syntax is really simple. If you want to

From 3566bb6f5f7a2fb48c485fbad7b9961aa061acba Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Sun, 23 Jan 2011 22:53:45 +0100
Subject: [PATCH 0170/2864] Update wp2pelican script to extract date and author
 taken from wordpress xml file.

---
 tools/wp2pelican.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/wp2pelican.py b/tools/wp2pelican.py
index 55af44ab..9a52a8f8 100755
--- a/tools/wp2pelican.py
+++ b/tools/wp2pelican.py
@@ -15,7 +15,9 @@ def wp2html(xml):
             title = item.title.contents[0]
             content = item.fetch('content:encoded')[0].contents[0]
             filename = item.fetch('wp:post_name')[0].contents[0]
-            yield (title, content, filename)
+            date = item.fetch('wp:post_date')[0].contents[0]
+            author = item.fetch('dc:creator')[0].contents[0].title()
+            yield (title, content, filename, date, author)
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="""Transform a wordpress xml export into rst files """)
@@ -24,7 +26,7 @@ if __name__ == '__main__':
     parser.add_argument('-o', '--output', dest='output', default='output', help='Output path')
     args = parser.parse_args() 
 
-    for title, content, filename in wp2html(args.xml): 
+    for title, content, filename, date, author in wp2html(args.xml): 
         html_filename = os.path.join(args.output, filename+'.html')
         rst_filename = os.path.join(args.output, filename+'.rst')
 
@@ -32,3 +34,8 @@ if __name__ == '__main__':
             fp.write(content)
         os.system('pandoc --from=html --to=rst -o %s %s' % (rst_filename,
             html_filename))
+        with open(rst_filename, 'r', encoding='utf-8') as fs:
+            content = fs.read()
+        with open(rst_filename, 'w', encoding='utf-8') as fs:
+            header = '%s\n%s\n\n:date: %s\n:author: %s\n\n' % (title, '#' * len(title) ,date, author)
+            fs.write(header+content)

From 4d0e18db23a0024684165a0a239fda65dc0f13bb Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 24 Jan 2011 01:59:09 +0000
Subject: [PATCH 0171/2864] Avoid rewriting protocol related links.

---
 pelican/writers.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 4e61e40c..c14f4f71 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -158,8 +158,9 @@ class Writer(object):
                     relative_paths.append(found)
 
             for relative_path in relative_paths:
-                if not relative_path.startswith("http://"):
-                    dest_path = os.sep.join((get_relative_path(name), "static", relative_path))
+                if not "://" in relative_path: # we don't want to rewrite protocols
+                    dest_path = os.sep.join((get_relative_path(name), "static",
+                        relative_path))
                     content = content.replace(relative_path, dest_path)
 
             return content

From 1cc5017fb49deecfc0edcd321a3ff776a9a90ea0 Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Mon, 24 Jan 2011 23:50:29 +0100
Subject: [PATCH 0172/2864] Correct bug in date format importation.

---
 tools/wp2pelican.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/wp2pelican.py b/tools/wp2pelican.py
index 9a52a8f8..27678126 100755
--- a/tools/wp2pelican.py
+++ b/tools/wp2pelican.py
@@ -15,7 +15,11 @@ def wp2html(xml):
             title = item.title.contents[0]
             content = item.fetch('content:encoded')[0].contents[0]
             filename = item.fetch('wp:post_name')[0].contents[0]
-            date = item.fetch('wp:post_date')[0].contents[0]
+            
+            raw_date = item.fetch('wp:post_date')[0].contents[0]
+            date_object = time.strptime(raw_date, "%Y-%m-%d %H:%M:%S")
+            date = time.strftime("%Y-%m-%d %H:%M", date_object)
+            
             author = item.fetch('dc:creator')[0].contents[0].title()
             yield (title, content, filename, date, author)
 

From f4450b0091fc24cb68be3aa13adcc456fca08c98 Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Mon, 24 Jan 2011 23:57:53 +0100
Subject: [PATCH 0173/2864] Add extraction of categories and tags, put rst
 files in category subdir.

---
 tools/wp2pelican.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tools/wp2pelican.py b/tools/wp2pelican.py
index 27678126..b00662d3 100755
--- a/tools/wp2pelican.py
+++ b/tools/wp2pelican.py
@@ -21,7 +21,11 @@ def wp2html(xml):
             date = time.strftime("%Y-%m-%d %H:%M", date_object)
             
             author = item.fetch('dc:creator')[0].contents[0].title()
-            yield (title, content, filename, date, author)
+            categories = [(cat['nicename'],cat.contents[0]) for cat in item.fetch(domain='category')]
+            
+            tags = [tag.contents[0].title() for tag in item.fetch(domain='tag', nicename=None)]
+            
+            yield (title, content, filename, date, author, categories, tags)
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="""Transform a wordpress xml export into rst files """)
@@ -30,14 +34,22 @@ if __name__ == '__main__':
     parser.add_argument('-o', '--output', dest='output', default='output', help='Output path')
     args = parser.parse_args() 
 
-    for title, content, filename, date, author in wp2html(args.xml): 
+    for title, content, filename, date, author, categories in wp2html(args.xml): 
         html_filename = os.path.join(args.output, filename+'.html')
-        rst_filename = os.path.join(args.output, filename+'.rst')
+        
+        if(len(categories) == 1):
+            rst_filename = os.path.join(args.output, categories[0][0], filename+'.rst.dr')
+            if not os.path.isdir(os.path.join(args.output, categories[0][0])):
+                os.mkdir(os.path.join(args.output, categories[0][0]))
+        else:
+            rst_filename = os.path.join(args.output, filename+'.rst.dr')
 
         with open(html_filename, 'w', encoding='utf-8') as fp:
             fp.write(content)
+            
         os.system('pandoc --from=html --to=rst -o %s %s' % (rst_filename,
             html_filename))
+            
         with open(rst_filename, 'r', encoding='utf-8') as fs:
             content = fs.read()
         with open(rst_filename, 'w', encoding='utf-8') as fs:

From 246753c6d4607dd146bf70e3535fc61201ac5ddb Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Mon, 24 Jan 2011 23:59:15 +0100
Subject: [PATCH 0174/2864] Remove temporary html files after their
 utilisation.

---
 tools/wp2pelican.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/wp2pelican.py b/tools/wp2pelican.py
index b00662d3..f4b3988a 100755
--- a/tools/wp2pelican.py
+++ b/tools/wp2pelican.py
@@ -49,6 +49,8 @@ if __name__ == '__main__':
             
         os.system('pandoc --from=html --to=rst -o %s %s' % (rst_filename,
             html_filename))
+        
+        os.remove(html_filename)
             
         with open(rst_filename, 'r', encoding='utf-8') as fs:
             content = fs.read()

From a5203ae3634b1a6b486673635ad4793368690183 Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Tue, 25 Jan 2011 00:02:00 +0100
Subject: [PATCH 0175/2864] Refactor building of header part.

---
 tools/wp2pelican.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/tools/wp2pelican.py b/tools/wp2pelican.py
index f4b3988a..0407175c 100755
--- a/tools/wp2pelican.py
+++ b/tools/wp2pelican.py
@@ -4,6 +4,7 @@ from BeautifulSoup import BeautifulStoneSoup
 from codecs import open
 import os
 import argparse
+import time
 
 def wp2html(xml):
     xmlfile = open(xml, encoding='utf-8').read()
@@ -27,6 +28,17 @@ def wp2html(xml):
             
             yield (title, content, filename, date, author, categories, tags)
 
+def buildHeader(title, date, author, categories, tags):
+    header = '%s\n%s\n' % (title, '#' * len(title))
+    if (date != None):
+        header += ':date: %s\n' % (date)
+    if (categories != []):
+        header += ':category: %s\n' % (', '.join(categories))
+    if (tags != []):
+        header += ':tags: %s\n' % (', '.join(tags))
+    header += '\n'
+    return header
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="""Transform a wordpress xml export into rst files """)
 
@@ -55,5 +67,6 @@ if __name__ == '__main__':
         with open(rst_filename, 'r', encoding='utf-8') as fs:
             content = fs.read()
         with open(rst_filename, 'w', encoding='utf-8') as fs:
-            header = '%s\n%s\n\n:date: %s\n:author: %s\n\n' % (title, '#' * len(title) ,date, author)
-            fs.write(header+content)
+            categories = [x[1] for x in categories]
+            header = buildHeader(title, date, author, categories, tags)
+            fs.write(header+content)
\ No newline at end of file

From 8a0aec18eb879b92efde719d62199eb1cf48bbdd Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 25 Jan 2011 00:19:09 +0000
Subject: [PATCH 0176/2864] Removed the hg repository.

---
 README.rst     | 3 +--
 docs/index.rst | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 71d94290..5cf557fa 100644
--- a/README.rst
+++ b/README.rst
@@ -32,8 +32,7 @@ Heh, you didn't noticed? "Pelican" is an anagram for "Calepin" ;)
 Source code
 -----------
 
-You can access the source code via mercurial at http://hg.notmyidea.org/pelican/
-or via git on http://github.com/ametaireau/pelican/
+You can access the source code via git on http://github.com/ametaireau/pelican/
 
 If you feel hackish, have a look to the `pelican's internals explanations
 <http://alexis.notmyidea.org/pelican/internals.html>`_.
diff --git a/docs/index.rst b/docs/index.rst
index a493f57e..b43c0ac9 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -29,8 +29,7 @@ Heh, you didn't noticed? "Pelican" is an anagram for "Calepin" ;)
 Source code
 ===========
 
-You can access the source code via mercurial at http://hg.notmyidea.org/pelican/
-or via git on http://github.com/ametaireau/pelican/
+You can access the source code via git on http://github.com/ametaireau/pelican/
 
 Feedback !
 ==========

From 156d757bd840cfb706662c18775315b602d27775 Mon Sep 17 00:00:00 2001
From: Guillaume <guillaume@lame.homelinux.com>
Date: Tue, 25 Jan 2011 14:32:06 +0100
Subject: [PATCH 0177/2864] =?UTF-8?q?D=C3=A9but=20Documentation=20Fran?=
 =?UTF-8?q?=C3=A7ais?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/fr/Makefile                              | 130 +++
 docs/fr/_build/doctrees/basis.doctree         | Bin 0 -> 10446 bytes
 docs/fr/_build/doctrees/environment.pickle    | Bin 0 -> 22018 bytes
 docs/fr/_build/doctrees/faq.doctree           | Bin 0 -> 11188 bytes
 .../_build/doctrees/getting_started.doctree   | Bin 0 -> 10950 bytes
 docs/fr/_build/doctrees/index.doctree         | Bin 0 -> 13144 bytes
 docs/fr/_build/doctrees/install.doctree       | Bin 0 -> 10934 bytes
 docs/fr/_build/doctrees/internals.doctree     | Bin 0 -> 19934 bytes
 docs/fr/_build/doctrees/settings.doctree      | Bin 0 -> 41041 bytes
 docs/fr/_build/doctrees/themes.doctree        | Bin 0 -> 29358 bytes
 docs/fr/_build/html/.buildinfo                |   4 +
 docs/fr/_build/latex/Makefile                 |  58 ++
 docs/fr/_build/latex/Raclette.tex             | 829 ++++++++++++++++++
 docs/fr/_build/latex/fncychap.sty             | 683 +++++++++++++++
 docs/fr/_build/latex/howto.cls                |  70 ++
 docs/fr/_build/latex/manual.cls               | 108 +++
 docs/fr/_build/latex/python.ist               |  11 +
 docs/fr/_build/latex/sphinx.sty               | 744 ++++++++++++++++
 docs/fr/_build/latex/tabulary.sty             | 452 ++++++++++
 docs/fr/basis.rst                             |  58 ++
 docs/fr/conf.py                               | 152 ++++
 docs/fr/faq.rst                               |  38 +
 docs/fr/index.rst                             |  54 ++
 docs/fr/index.rst.save                        |  53 ++
 docs/fr/install.rst                           |  67 ++
 docs/fr/internals.rst                         |  81 ++
 docs/fr/settings.rst                          | 111 +++
 docs/fr/themes.rst                            | 106 +++
 28 files changed, 3809 insertions(+)
 create mode 100644 docs/fr/Makefile
 create mode 100644 docs/fr/_build/doctrees/basis.doctree
 create mode 100644 docs/fr/_build/doctrees/environment.pickle
 create mode 100644 docs/fr/_build/doctrees/faq.doctree
 create mode 100644 docs/fr/_build/doctrees/getting_started.doctree
 create mode 100644 docs/fr/_build/doctrees/index.doctree
 create mode 100644 docs/fr/_build/doctrees/install.doctree
 create mode 100644 docs/fr/_build/doctrees/internals.doctree
 create mode 100644 docs/fr/_build/doctrees/settings.doctree
 create mode 100644 docs/fr/_build/doctrees/themes.doctree
 create mode 100644 docs/fr/_build/html/.buildinfo
 create mode 100644 docs/fr/_build/latex/Makefile
 create mode 100644 docs/fr/_build/latex/Raclette.tex
 create mode 100644 docs/fr/_build/latex/fncychap.sty
 create mode 100644 docs/fr/_build/latex/howto.cls
 create mode 100644 docs/fr/_build/latex/manual.cls
 create mode 100644 docs/fr/_build/latex/python.ist
 create mode 100644 docs/fr/_build/latex/sphinx.sty
 create mode 100644 docs/fr/_build/latex/tabulary.sty
 create mode 100644 docs/fr/basis.rst
 create mode 100644 docs/fr/conf.py
 create mode 100644 docs/fr/faq.rst
 create mode 100644 docs/fr/index.rst
 create mode 100644 docs/fr/index.rst.save
 create mode 100644 docs/fr/install.rst
 create mode 100644 docs/fr/internals.rst
 create mode 100644 docs/fr/settings.rst
 create mode 100644 docs/fr/themes.rst

diff --git a/docs/fr/Makefile b/docs/fr/Makefile
new file mode 100644
index 00000000..bf49b542
--- /dev/null
+++ b/docs/fr/Makefile
@@ -0,0 +1,130 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Raclette.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Raclette.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Raclette"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Raclette"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	make -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/docs/fr/_build/doctrees/basis.doctree b/docs/fr/_build/doctrees/basis.doctree
new file mode 100644
index 0000000000000000000000000000000000000000..80bef55de4542800fb766e386cb5931eb481b0af
GIT binary patch
literal 10446
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

literal 0
HcmV?d00001

diff --git a/docs/fr/_build/doctrees/environment.pickle b/docs/fr/_build/doctrees/environment.pickle
new file mode 100644
index 0000000000000000000000000000000000000000..8561eea0ed027543a6dc026c94933291471f93d8
GIT binary patch
literal 22018
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
NXxDp*w%j`M{{ZbXYV!a9

literal 0
HcmV?d00001

diff --git a/docs/fr/_build/doctrees/faq.doctree b/docs/fr/_build/doctrees/faq.doctree
new file mode 100644
index 0000000000000000000000000000000000000000..32bfd0a18fdd8be38a3ea5a99efd30305745032a
GIT binary patch
literal 11188
zcmdT~2Xq|O)pk=`TXF##caM#YC9GZ9V8GbM*c2lp5H@&-2vOFvyCcoWyF2^t%ve^E
z2{;J}P7moJy$}-88%YT12?^<q^bpbuq<2E{f8U##Rj~{PesT`y?AiO~)qB5t-+lL$
ztEUx9UNH>ZvY)GZCEL&Nvtn0+jGEeUNKK2>^menQYE|rDq-OhSMx+|r`-~}5rVNO!
zLR2h|7?!`^E*bdp1J|qiM*D!JI#gqC-vZS0sz%`0MoqjSyBHY5cENW8TQ&7e?VE>U
zmJParA$H9}fhQxX8AZ!c<aonI$unG|D7F>YMrFkChIMZh+c;ab^!BwS9TdXBK&;|^
zTT}*(=Om4bRu!!syIe!{nZ12E<h#Cs(JEH8WN|Pf@C?T~U>lZE^r{2yU?>)aFb3Q*
z2btB|x1O!mR$?yP>fks&It_A(PC_3tjtmkyAMILuLvyYl7Jx_qc)e=AWDoeNEmE`1
zwwfirov+xwZw&&|IsIy`*;Wii&^YgVp%iU3uh-0!?4lR5qmJt}=UHLk4R~Hq^#VKZ
z2bKit_@1d|6Sd=(d^JB(3)-DVbNQ%hvRXCSx@xk}j5@(-G8cH&ETGROYRRT*S?DyI
z^H>0#WXI@ak<(%>g{aw*mvytTLb8>SEEK|iDz;keWXv|U9HWdS&P=n7t)K}sqbAf+
zXO`LN`dRc}*FrY%veZJ>%8t`QmReBDoK_R9EAg<<z_@|4>>ur+fNZJ&wLCPNi;i0^
z0aCT1Ul|k4+=nefD;c#CR=z4yC&J3b8cx7pZB8*8p(W@;t#PKAjY<AV6T1OI5?0+J
zrcOq!?b`xV>2kb^-8C4x<+6pD)U{i@L9r?oZB|`nuV|IKYIfNLBwd(ne%F9>K`S}&
z1J!=bA=MG7lM7~3U=32QYMt4X@Txk^j1>gp7Qz5llZ{la-E1y}HP-W0SHD_sHWka3
z@8fGjzdFTiE?`aw?e5fmwb7hTBRQ>Ko$j1qnGJEPGy2sgr_l<{8D+O>t22A1q07Vt
zsLjqa2jFdKpC~qrx(tE00=u&!wXNM*tzE*-QJ1hoyM#TXE@9`6Jss+7XN|MUImzj8
z)|m~u6SdueAUoO}uz!vNuFrMA>v;~?Jl_FxJ3|LNISD5hOk`xQeGs0i``AX`1#~Zr
zR1es7$jMn@!3ql#yM)>;D6HmW)J2f*;z;#UzU@$Lw=K2-2Vxn12!+CXcmvwGjZU~D
zeBpp6MxySVx@3&}E%kxaZep-UV{j=kxQrO=B?cxjxSSZwNHKVf)BXR$OdsI5B2tef
z9AxZb4Tr-Cab=_)hir4oD8Ei8ne5k0KAueG$>csVX*tU*@>y_ZS!A^-WwqGu&_qg+
zvI!yG@2&^ueh0w7m9fD%+ENBJ0}dH*$-od9*w4|+<A$yPrH3$H6_|LDsu2^8U5YWG
zA*e_RrML%D^m?6GMb`QTTyf4gckII9>y-mG0#g|Z{lLH)WLy4-F>L9@CiQPvEn+8-
z%j|@Sz;PM{%Xf>0SF>ZE?<ZqmUG&`oRwJx3e$6hr1F*YVywVQC$H6442fY38i<zWL
zW7rKG-DS~(omNW*C%4h=+qSVUt&`R6c%MN7t#~x-Dw46A0{aCo3^IXZ1s%#CqXccL
zfmT9DB^;m<hN*;uRKf_A(30x^3GL9rEst)z)DvM6Pl{AT-9Or8c``Jqj&yn26X&r|
zz`s?CaO_vX-mi|-A<E2PYNFAor_dQZRhz-nXa?8N44zIicm~bj+K>Zr?KlhzV3aoA
z>eMp<>a!yCYz&~C%+;7@SQBPX;6yzqETDr`=-?Ra^ttHtd69ZPxjx1wFNguL!vcQV
z^<5XK7p7b#OI7UpUZkacF{OP8rF|)-eVMadyS|q@t=jd?PEG$6vFp1&Qm-UCj3IYD
z*ckFvVD7rH&hOQlh1ZaU*OG<Tk%iY2@HcSY)dzngFndTNz6l845UDqVWrw3*KkEK&
zjMQ5w$z70ScO2&$R;gt8h<1!5>Y#_BBOA1<^kLW&z}p1~qB>DcmoQXh2#s}f1aU6&
zDt2ZVv64}+5$wZD!RJ)>`|JuKxgWdJoN<L08Vu)?SiS6d`_s|b2w^PTBnB*uAZi}4
z!g65jn|$YCY;}U5wz;b-4Hk2r40e_5ir2N_v<>SwbZy(0S8p8yy>@vwY3ScZ=-*E0
z-$Cf#N$B52=;x+-e>Yv;4UZa()O(=u_eSb{RPCdP?e{}JHy-K8#<;K#z=ho$sSi>x
zhUE{(8a_mC_u+PPhK|T@xxa1gN6bbr5sIsB?OTCiAHdesM`=eNqeXq3A@C<?V4tK}
zeTpvhM!L{X!=mnIBmEg@@UxM+4T5S{dUNbbTk2S-&m9RAHjjfgBInNorQ0L*1)`)~
z<^xU+^+kg5rS`g<Uv{(%UvU;%6yvKD<7*V->lEV~P7@qsBFQ)5;v3_k)wi_EO}*|N
zk@|Kjz&Nk_9X;>9%l^K{?!QmGe&8(DUiXJii}tz;(%JW;*z4XIsUK4!9wKzdhX}il
za)@vjc)Me)kNt@r@TVN`XB_b79Pk$u<(Hi3^`U+RtsF!DzlL^x6RF>V9fxDxIqFgG
zj?_KmlAd~Z88M=bLl7*%+B5og8Cwg_*o>^r`x3XAO;*u;IrY0Sd}{~wd(HPB$oC(~
z_n*l3pUL-M$oIk&qQBBXExNxU)!)GL-y`)8GI#$q{|PSchIRQh$E_aBVLgZsk!p6e
z1UH{Q2<|iLUof(JBlU0gM?;=mCUqY>gN4i*+gkmH=Jwxqvk6`C2uh|*oie3wI=VrI
zOvQ)URPjojnKBJuI5t5+(b563Oh?XPZK~MR$_&<?j?K0-AO(P=k@VDlX<|u>UdD7!
z&G_zxB})q{Z0MH^=^6bpQ&%J}dIrfXeD}=;HxpDOttg0rU(qjZ_?WoQv@10S0l%M-
z*(mKeBy&I_nTvlK%YBer=IIZxaU2q4<9JYW24R)?NOH!>0+vCR6G*}0LQqb*d*M7}
z5i`3d<!~{It~n%2Kq6U+e+)|xGDJpVC(@iUDa+zK9gZP6C5M*Fk%(jk{;64=8{5NZ
zI3<Rzvofx8#C}p%=>iCNA`%pEH7SHzLkgizB3;VaE^C>bsVDrB#G0iYd3w%E2U3xo
ztiR)+l{23q!>;56P}Z@7HA7@+%#4>#-3B~lSpXh#q~M{86g;da1p^yEsnYuBr?8+~
zN61GEb}Gt%(MFI+PQyPi8cH}IuXR5lr|T+b#8vuk0=Nuzbf8mm2Xssx)Hi%^2|Pv1
z89QAZ7<JNDXd(6SW4xj4#Fn$9&r^lF&ykE<vMqzh5aMAQS<!8D_Xv>aT8z;XyG-i;
zas20mg&g*eU6@&c<>Cl7te;!CzK@d~1WGyC1ir_EN_Qk@YH<MSW|jlgEu;W-D=9!d
zixi-410|@-Qk9;K4Em`3|63qrJH~~=c7Q~3j%H%@|D1_)F)q-gNnolWhLQ6$Kj$a>
zoDEPOrpja|$AF41V4rbJBi%?(a+)r?SohYxbr?2@WRAr!<U%%sl6y#@^ovMg3>TBa
z7<x&e{7XRLs<gcHR=b%WZy3khrR+fov~wv)B$weobymbjJ1Ylaj)Qnc_UbxjTt^=Q
zJvghD%h8koJ%(MRagNZz4W)uz!759%`+Y2vknKuR$o4o=$ktDqVenHI@A1r9=OFZf
zkVtDUnnxm%efS^aMH35Pc!aYjv2>k6Qs*|b+@&{AI8>?z3=_D|iVuc6janQ_OxP)D
zs~LaM62szSD|G)##XRri_Ip3hyx?50>C=0+A~tHczR=#L<Yg?Q7GfKxkAUf!cCFQ4
z2V5KXBiQEQWE8tVxE#>*NGm5r$TW%jC}~lFs?BnsIzS3b8YG2fIix_@1*Q8~nYxc5
zWYB$Vcqkyrezb;}l|dq@=&n{j#ICAn4aumwWGZ{Q*ILr+HZb_`lp=~lz)*!<CNtSb
z`Y0D`60rWQeJ5dL&gKW!yo784xDSv5{$Wz6<sd24GC~S9JOPxJPH8!jpGew$G(Mh$
zQlK1xMDk?(r<0ioji1a{={i@(b^1EM`7v9q96~F?^AxtO&*P`!YbcfLX{@qH&*N*D
zglJDEg=o(pg=p83HtTtuN_Uu9={)WOPmkF2cqT>yQqKa3<k|SAk9b5!d=6zx%{KKv
z&(-5UFByL~Bu>v`tTIk^M!gTtUq<gqIqPklVly16SUjMnBfu$7e8a3S#4-gt2yDs8
z^W$;H1ZO&qc!3@hYPpW(P|FKRVTmsyg=M~&6l!`2C>_C?)DgUt1>Jp*2(vFk-%!iT
zK_Ynt{-KtkL;_-^gS$8iwir~KGjTm#^?AN-i(HQyy=H6uDi_hbFR#>ny$b(kGcxq;
zoV;3RzJ{4|{E<q*E9cWzzPuLM{qi~%&K-9(towVtE`0+_kDt(#C%wMBQCD~qE3_2d
zKx@O78+7iQ@lPDhS?R4bFA(HLWaA#XE=&CiTi&9Zy%qmQ+!gvGeqdM9su{Tnm9V6}
z4J4AcvxVMvV4l81e?ZsoM8a$++Xw8jybI}`snqnlk)r0`!_wqNR^H3Z4jRV$n1Ug^
zpT+t%Q$B!X&s=kc-Z$Q?^LO>`yhJ{TWJovlAtdwy`(Y#^xds1qZa$(vz|F0!gaJNE
zit#^23VuFLiUB_XO5aC`*y$%pyZg3cmUMH&3g~cFske*9s>#nJSMgR6cS-R90MFn{
zIr$X&fsuV0B$ChIKW1&s5Sfj=<ZeyOw(%ItXLW_41nJv!2cN5V0Hi;!KOo!fNTf)A
z0qGd&FCs-rzr@lM=`S-=BmEVoAoy2V93%ZTBzu-6NPit4Lv@V5!P*RBzKKL6-@<<#
z<2&>R`1m#}0pstGV&w0V0^{$IVyN$f5@X6jjDJAd-M4X4jK_zLlVbZrv<J370*T~K
z{HNHG$+6fDjmPrGy1`xb2Eg(s`U5ij6p0kepCKJ%`E#Tw(Jxq<V);vEYAk=n6a@S=
zi(@Q*gJjRj1k2yzV-(A~S({kigG401!+#yi-|G+X@ds7{mVYG0$bTXQmVYM2P=5g>
zmXw89{*|=5Z_`n+93M4Kis#?Z2k`tmNF@Kje~Kp=odi#tPOjz&T)+GiReH^4w-mo=
zk$>SE&suPyGWy)bmwS=hFaO5B*_yhm*pc0byh#4Tk~uEUodi!i^6`B0<-fYwlxZkz
z_OaAp5%Og!KF9c}0nxV<rOf448Qa>7OhdUR)A1k44AwR0rEWLRCl#F0zBHf&d>)7K
zJSpLQ56`VIcU{|;MwIoMvt*!%26*ceN?DqaXD&&$QGw^-$(3sd1N!>G2`c3-X=aTU
zzGSlX%Z-+JgtnSp8@-+LC8IlU^AYja^1R{Yn<JU2b6W$CL#8~=Vvh|dml0`Yy0wg;
zJ;bvkG%VTD#=L2ERc15Mf;Ulk!(~-!G6&xjKr1O9yW+XX!~2j~5Eajws(QtcdAef8
zvC2VG?KoDOVYVjx#Sc>Cc-C{a_nJ$ga!>LA%F}0r@hA2Yr81K9QO%q~0em!cFn$?m
z$O2|Jlx&<-$O-JpoMTrCHce)vZ2OLF2eJ_Phs|ZUx2}c3(fVJ+jvC2YF_6XlXyx;o
zYFNo1<nk;_kO!^KE`^m^zP{4=vK0APv=O}Uo;<0%EUw%(Y)O^po#@xLDzaSHolmv#
z0TZ>K#~KJxVDBqXXf~rPyJr2yk{JA)Yaev+@(YV_=qD(yWY-O5WBgt~R_QLa&SBjL
zT>Vr|PSm;ci)GK+pSLTPTh3#9CU{r|8(fXTYt3a4wNj57M$IVi*9hzyR61-<x2p%_
zB;8poc+I!N5~Qq@Wv$MhV;|%NTi(Teo>UR_NxROUNA&Q{Exx#oA?(n7&Wzto<vCg8
zWL>$9^8vv}e9i33I-NUvg2tp1*=9o+3}iP+mg!8=6=zW{?#Zo=RkC!kT8nOy_1!^P
z&+pm!lIvSI@`A1NX`gJ+ZCl`JYT&{>D5tO*r<_&D54)wnkyDY=(`>elH&WTiiVf!8
zonYxSrkj#?dU86ywmghSUvdU}Xi4r&J&{fL?ls%A0gl3brq0FLcx}|9Y-Y<9iANb8
z9?sQ90>`T+7n%ofTvzkEWD9F89S>N3{H)uGDnoiUw9)J4M-e)Uji<RK*~Ua0%zvz=
z&qn59b4fhYZJaIA69LJ<$tPFBvK>`0ZxR*g`QXbAWcJHB>~evgA#T;TML(0YtJGLY
z&P5^S;Y>Wr!(5K@&WrO}H8gc^em-)0!-6?~VwkI+NXkw&!m&RdzsUtiN79Y|cIO1V
zL|crzpM}ot&T`zdFB#g4wZd5%pARp?v!g{rS0N`f=Z$;E8As;3bWa!J9~;5V+-3IY
zUa|gO#7wNW7n5TB?FFr`{Fg9Oul&22!g9O^G&Eb%1;&?4k<l-g;a~4r$@gA-L}IdL
GA@_fiFd%dQ

literal 0
HcmV?d00001

diff --git a/docs/fr/_build/doctrees/getting_started.doctree b/docs/fr/_build/doctrees/getting_started.doctree
new file mode 100644
index 0000000000000000000000000000000000000000..cc1c82050cdfe9703bb694a7d4cc9c397938798a
GIT binary patch
literal 10950
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

literal 0
HcmV?d00001

diff --git a/docs/fr/_build/doctrees/index.doctree b/docs/fr/_build/doctrees/index.doctree
new file mode 100644
index 0000000000000000000000000000000000000000..7d258321cb20d2c6e54a6d4f2f95b600000570f4
GIT binary patch
literal 13144
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
H>}mTq^BPQP

literal 0
HcmV?d00001

diff --git a/docs/fr/_build/doctrees/install.doctree b/docs/fr/_build/doctrees/install.doctree
new file mode 100644
index 0000000000000000000000000000000000000000..433be37db97d885eb5cd381b79de179d224e7129
GIT binary patch
literal 10934
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

literal 0
HcmV?d00001

diff --git a/docs/fr/_build/doctrees/internals.doctree b/docs/fr/_build/doctrees/internals.doctree
new file mode 100644
index 0000000000000000000000000000000000000000..6c8143cbf1717d7063f88039541159cfbaa3fe7b
GIT binary patch
literal 19934
zcmeHP349!N^)Ee>ZIj;RN?>S#ZXit%L9tMqV!4EdN;|L!aWmPSWH#B|*?BYDG~g(x
zoZdHH;C(CJiZ>o8;Dv$*DBgGr-s1iJzTeDdleGUoAInE-C7*oe?flO7zVH3syx%c%
z$?QVWFVv$_Iqa$WMK{dww&GT!Ot4?qrNQhtn3J_zt4_s@CTeaN%#DM2+1%1uvu4%Y
za;e}{tx`2|rRtQ!V19pYH8MPZ+=_gwRH>C+wq!Y0)g8A++^Q>1<cqa2SkRw4boV92
zb&4*Fwe)LG{ti?um#r|8dLgQd8?^S<?WJLTD2z%GnD?vsqB|T0nK)Qzx7QpA-F(Fj
zLuUjWFB%Bi?Dj%k1ia)!zb*wgXz#Z(MYrICA=C~Q_uI>ydgKrLepK}%Hy=ihM8T3X
z_p=vJ_EIqnmd3%dtT*3Ynh3sbQt;*80^5Sv>mq+$L+o|VI*7flA$G9BYq2|bQ_6@O
ztn^y#rHQ!fCdFM<w_6Hcsa%8z!Ttlm0n?Qhx&_LS2@ZtL4vK?=p)+yD6Ja~-S@wLO
z0{MeZZ?-)@Nk3$IGvd~yUM&@12$|r}+$N}~*YhiG??}B=E<3P`-mT(~h*PO3ZoOr{
z;FNn4Kzd<1Vehc?Hh}4oFbb^8E)5QggVjU!g2)*mn!y@-LBerxxSesLNJ>NX2)a5V
z4vx&)Eya3`<-%a?K#;W;6v|E*;;w5TILdAratdQYZ67@lblY>Nnsoy~kGI^h=b2i)
z1Hm!ge5Y>DEtjfp@Q5>KqshdqgJZqf9w2;VcDnE|r82}m4hS9}2an2n9cp}AXPEh;
zy-x2S?-1`WZ;d@qYXv8G;QTRJ5B#q8z~+e_m^;Y>UmHAd^VqrvCcLEUjnjMH?(W2J
z>)TCtn}FZRaqu`W<gx4H>qAa`XnGq^uLH%@yiBke5}XnTr&5B;pu+85DYO#2Ee!Dj
z&~|CAR$~Z<*0?WYrRqpyG?yoOtWBXc;n&x4<hgFQRf^VznV?>ZTq{&7@3x>djP9XQ
zWckBZ3bC37?%c4tHnP0BMArJQ;It;xS{vL3rxUp|6uHL}xig8}SwwCNk?SXNb5rEb
z_WJfBiMB#9Pl$tas2ECjiYmtA5Zo3A+mUR~niSeQoRZoq>A95jJW86Qr0099918nH
zuhpTvEvdX0WIdYWg>f)IWzy@OJ;N7134Lrc=IE&%=CzMO_TjLPA@)&V2gNC^yFhc-
zO%6k{kvQ-u8JoY*NJhgd#la|fxgETm=Q)uzm>AKZY8+M)T9Kos<XGiWsFpEYD!XB~
z<y4DSP5c5pGfge>+)6i}6d_zpCiGz^up+-6)#_1?Wrub6{0S8BTuU3U;K3|$8*Z^^
zMHo2RYQ>SUqCZ|W1-mosiS<ll<Ox<<_D77x!d&^_!XR*}6Ol(=VCUAjQ;m9pu_idx
zILiuWg>Y60r%yO*gfk$VnN(Sl1)lR#Sb`83MsZLlSd*zc(0Xa+=v6P0hgWmqqzmvu
z<A8c+989owE81+J99%>*x>$L7GI@&0(^JUPQ_0gMb@o6HcPZFefU1dpf~SF@r^mrF
z(4^YsPAC-~Z1J?dgUjkesCg4=?jst#9D-jF2UilyeMqdUj48QL7YF9maqvt^cp?;c
z#@Ze5(JsAg<eHHH<1ZE9-K}D2Sgj0Wz&uuU02O?gT`daN2hW;r|Ib!idk$^wxwN(C
z(bk?%TYCZRzdg187s6`xwDT81RWFW%mp~AYj9k6TXWdY}Ty~>8y-Ox|DP+GU4qld;
zb>a%`g-xY`mvhj(B5Th#iNPy#`vIn-D9NiR)3tnZUq=yNO~GD6!Iq?gy>>>Zz@GDX
z4puV3>(Kq{<KPX1{w}mRI4;PLa4_{&HNP5`hRX0o!xn>Bx+RvO*GZfqvyhxoFV|z8
zf#+<aNRJm)%86UE&e^uj8g|_x+!-8P=v#iZ$J$nc>QLVg(MOFTHX^|=LuXm=D;2+5
zp0MhnTQr{39~wohNRL=R%t`B@=8bO#4^^wiSPM4eD@%>&HSEa*Z-hp!NdlkN1_r^K
z2=1HJO5Q>U-%3Q^Mr_|sFy8?%`%^66skVB39K4Hw-MLQ#7Q7pHy*_y|>!aj73etNC
z()$R~`w7wq2+{|Q#ldZVDC^Pr-w+2MCPeD|Q=1AtLa0Bgt$d8Fe4MR(f~|a#t=vfG
ze?6W5rxNF%)C@k2f%Ta<_-r~#Zcyj%8DD=J)UeN)Yj6`p{#+b<o+$2{65dR0*N5-~
zz=Xh~C%PpLZl%0;aA27^W#WnG0XV3cXbp>Bv3598^6Q~B><eadp_Sc|1X0EroYNF&
zWjI4&L96PIn;432ESw181L;eU?HV`N)nlDj+5tb}sMAuXGl5<)ZLemqh~N~R$g#4R
zY<s>S*BL=zSb!rM@nyntqe55uJVJ|+l|6m?ma`HT-C|cJ_`;+Q^3?HsQAfj<I2yjp
z(eM?HhTAwAzS`_~zNU`n_BgnM_%M3i7x4+c4tQ>9b~)crc)m$^zD0QMBs_N!o^R9T
ztfaH}j&V76$H8|Aj=G%Gc!KZI<$PaT`2kz`AzS$oTlq0txrZ+2cDC}9#N{M4gP&sj
z{VWcCjwUtUyt~=u+?u+aeZww;UqIMj#=)<M-@Yc>uc_fFZsy)NxQ~+F$6+)XA`GT$
zd<;k2rbyFF!@?fxRJf2*6^m;cbEL};2vb}{Jf+CX3~rLBRKRTUv~;x)ffQn$!L3-!
zn@qzrvkGVCqZ>i9>Txm-;+^VnX{4TnK#A|+RIlh;<Cv_vm^_oU2{YHTw)kd#N^YZ4
z#WhPDi9ig{%)C?GWvPm3DWjm@O!q*))xq&Q4vyb*aQuOT<BuF1e`@wXe^w84e;oXU
z(B1pL2VL-2Aa`%GbNZVi_je-q4<h$ZASbgBngcx950ozIKsXnfjT`k+G6%n6nXC65
zxkb}plzGU2$CCM4VC{e`U_#e`w2&S>Ag!e6CPRvD7J|};-Op|oF|jX~L93HyEp14>
z>{4k5iDfaaiAx(LFU?-<WYpX9F(6A!e@nH$Wv0K}gVgqNG)HL>Fd)p7723zjq>tr9
zbLI$?RjdS1_t$a&^#CRS)B{NY>OrIc^<Ywf+5y@CwUdcvscA;ratJbk?V%vCSh%Lx
zlCx%PxrU;yKn^oiR%?|triw1HnC!!m(j?&#TI|TA*kVdJ)tAUxR)BO_Ed%Mgm;mXH
zB87BElR~;~Qb@NBv>{y&6Z>*)Xn0Dy(u)j8b__@?kH9sRj2tyfb`h#RbPi39HGDo&
z`8>|>nR|$NIv#8o9Zm+f@+jr-(FupwQIn0eM{Ga&oaKhrAVShw8NNOo?B*1itJaq5
zgcFQ@bvmSreOxSr+poAi)^<$2!-;C->|`iAI9jTXI>(|io;!GiNFC3J3TDWNYp@>K
zXsYZwQq>-czOHk-VJSklcno2!-LDpVGID|uBbhU6yef}T{$XY7nF%X9krY;T5-F@~
z11YTRv7k-Q5823ctn^49e#Ei~S3XFt-Rp6XlgWAKDD~Im{pE2g0g%|t3?Oj|DUdjo
z6iA##3M5Vk<&)qLy67`-W1a+$$FEq<)ca|xq;eKgIi|O0F8b(a0{S?c6n$(ZMITQf
zMIYyYVoZ+`Tz0dKbjkv%Y)29Xv<(u=xwxhSnv66L=!H-T)_PKll=DnQt~teWzNwg-
zUg(KPPx?=M^95S|!lv>~wk-oJ4+)>7`H(Qr1V}hY3JD!jNH|0a2@9aj5*C@>r_p|6
z$cT$X$T$oV%LuNijAW)+#^cp#{Tt&;Jkv!<yBIZH<o^BU#?Zo4+{)T=C26^Z<0Bc<
zQe|O)=4&QEt1$tf1*8B?NC8?%3eY0ZX3*+P@5{|cqoz&SffOJ%4id{wTvNozMl)i3
zfbY3ekqOh^McUuRraui19)z}^jOH3x8qbR>{<*0ov3B_s)8&k<EqSVD0Mkp@3NXEt
z6qr7Z6qr7pbR~DX<Qe?gqMKc7lBGep3~9RGC70t@ELZ4#haMC-eb+|{%v96bC|9z*
z&QWrhco^=4$yM3}Sh|`SVCk8pVCh+;VCmVU;O9A@^e_!(p398B2h{iTP!tC6e2`dP
zfGZ4OG+~I6zy<&y9rp{h$cs#o+|95DJbJK9%k3#Fn2fvJ2(!4CRj*lPr#e!{q^Gep
z#pjn()J2?h;<Pbyo?9;KJO|6TcsNaNW_b>_08j%nA2g32X1N#3GP>-KlGwY`LXM>?
zA%k3<@qAq-MiwfWMH^0oz@4tc;IXEwGG_Ieye11eJ@R5mHB|##@syXSu+YFunGX$I
zLkbPNj1(GpIVm*o3Q%g`h}0Zji3IMbUB1`AB(DNX(Dbz+v0SJ8b?i<2y&5b*2Q;(f
z5%L;k^|cAB^jb#O@;VlUeqOIx(9au~0R6m?6#97+DfIJZQt0O`pmc<6oX^L%lJ@21
zqDhWIc^mG5&D%j@c?Yhk8zc+OZg2x??3t;(({y#ccJ(gPRc_CleK%Taphus_A^RTf
z<h@BJhtn3FG3*;#W#1p;u;S7|x^RjS!-Grf*US4%TTT8*N5lKI9iaUI<^$~yk^=1y
zkpk@-NP+f;K{*<_($Vk{X7uIOJTM02qbLq-d<-O(kK+n$JmAWoU|*f16kUDS^rI$a
zZg4r}JT}w|V;T7*$^oexL1Ot7uI%f;*|TODN0Wkcj$)HF`%hi#GZ_niIJKpqWka_-
z+^x$kJi>!)=JId#>eX9$o{MWc4d0Wx9d4Y_T~2QOqj;mLo(|Z+J+W$*3pv_yBeznt
zHZ(MsO%|}RafZ|j*0O`O-PT&3gu=Ni2)uTnt5G#&WrI~I_TUDqN>P@*bs4G1cgiB$
zyEtxC)ircT*p21)aviR}$~Ly3yB_W*hS?_3*-UBJBHJvN-*U?KO`A7u-?S}%>KUh;
zwRzhlNG!=ec8dOHl)Qj#3}m&-3yx`$gq7TK=<c?uv`RyOv>PtthuUsW*&lZ$+ckim
z$v~s1d48md>z;%}J`F2@g-s3*yKRb5$!Ayq?&-5MC%biLrMy0@IR#g4LW12=!zmC~
z0Q=`y4&&zYq!>pxlVW_`LW=QqD=Eg)7eG0lj!wtZ7n#xbu$ew=rtm-9o7$C`ehEeb
zFZyMWSiXX5`b@hKzbC`G+cf{HCSOlfZPVj%h@rSJfYU}B<!i{DV)33n5N_8>FxWeo
z4}<+WDGd1=q%iDnlEQ$$1xf=xDK+3bnPC>yX7+X$GQs$_L1Ot1u3&sLVS(H#?`c?n
zx0d>@DK#^!|DI-m#qZ+>S^NPhSo|R=So{&`3JvRj%%2N1tlyY2dJob}SpO6Jish$z
z-=QakcN5k(mR<qe&)8(=D4A@I?0>GUfU93H16=)*6kPp^6kPq96u{jJO5hs&+{cW*
z2ipB_P#Q@779^J6;YuVEo+!_x75rX{{J|8-P2fS@*scgopgrV-I55pMq-b1^N8`jB
zj-1giBJRdE#`!pGiRl0iAalpFU^Z+`+@2Z2UPpHt<h$5##Ss*S=6+STPH?aU$JyAr
zTkMfPf{Ur3skQw{nFDBlW<Ef>pA?||g%qIul@y@;4V0j5N|pF`X7oM8QvCx=Ko|c6
ziDec74C*2gmFOE?;5?A*hs;=Jn<6ynX8Yk;Aep0ilgEH$E)odEJW@b3pA--+AO$2X
zpoC;|3P~#xvfOl+41UG3Q13f(#4z0xbMqQ1?2NFQs1q*Cs*H~KK<5rQ4oF*At>g(D
zh6d>Yp~eWnhSTPzy(=D5oSfO2jrw{G&tkLVHd6M7oU(Cc*sy2tfYU;-2&{3I!c4*p
z=XRlo^Fc+}Of>FtvmW*{*{5lD97n!sR8tQGHI|B|Z{{%&p0=`X&BP%wc1T_=W>RTu
zJg3j4R;L;Qg$jde94pWrK0U6Ko*ngTb*}7c(47jS+lH*rW1Y+qfJ2n^G9&Y&FpiE&
zPk=TKde)Ppr_=-^N**AM&>%6vVFVXvM?<=7+?PvZE(a^-&K@S?t~JC7HpU(f(BTLb
z&#K~9!Y1Uf=DP@X0E43mCJu|o6r@ef1BTVk3>em8QW)G4QjEQ&q%gE)pfI%b#FQ*&
zI;SEl@FSL$xWevp9I`Xveb~%YrGxvrnaL_zMdv78PxF%c{%RetvICd_E8{$jR(236
ztn6S?SXl?Cac7vzcjCq@sUL!0u^g)R9l2$Ah|RPyv5-xZK1_?Dv(-#MXKP5&+2N$<
z><ChHb|fg*4rsw#J6KEFms^776Q|Q~l#)droO~BZEJxuAV^<GO*5Kj2HOZm1dr<p-
z!`$U)gGskyvd&<V`yZ0O2O=ltldNm?Dip^gQ0!_`_YtfEBRy8jz(^m-1Q_XYq%hLs
zNnxaqB88DY8noF+Phk44_H`eF3|Q!TkXTN{HMLMO)oh{g(6cO*JV{G#FeP)EI#rs-
zYJrVOf!&O{K4ep%O<D{Boy-IX^f*!ow3!qFok9wMP6cfi=rpG9X4IXIJaBpjNGy-X
zHI<31HOn+cnM}a?pLmALnTD~ml(8*_vD|-}iGK9k(Af0VFzhya2<*d*oQ-05PH$CS
zpOEm%V+$II$T@5U3f!hSP~dhZK!G+X6nHKv6nGvf6qo~TR^a(e@5{|WiwJGxiMWN%
zE&z$;LR?dwkpb12-I6jV1Db}~H7YQ9E#^NJ6v>m&J6O$w#4?C0Sbb<XanN}~m6!o1
z2WMqSSt}&0am94<!DrAKWJrj34=V*`mSt_ixwMfwUS`s>Wz0t0SiuUghVmP&v%T(2
z@_ge=jiF-#{Q52g<PHxe=>CsR4H(*29CI>_F{dstYiOFRec~NK?z^yeZ7Z2JCNB?I
z$%_YrmRVt)d^9HUd(xCnIq-78h`!`&DueUkdR5;b#oGsZE@DO~@9uQ?J};X^@x%jg
zijYYeP5IJj9;+&NxfW9oPIM^w)TxP?VWeiL>%N%DW>~OT3dgK$8m60fC2(pl>Cs4;
z=W^~~m*VU?1rKu+gy(p3%C95-!^EaXibm1X!*EwMjKMd|d<?!3QVc$i6oaosiorJu
z+8l<DF`Z#}89!pF;7TKY*i!!MEu~7$c8<~mG>6i@Y8aMMV+JfGAcds}DJ&%<g{4HG
z45iOvXj{jP38i=7S1jXtZ(iM;;ZbBKa`{M@&{F8@A|{}(i%HSflS$E6Op3mq0?J1M
zjgZ|vm9#I%0H_g3n^7f~APYYCQjl1lhHLtGAY;vsbRMMI%YB<X-3apx73MM{Ozyvd
z@yo$$qOT-$y+UQUGLb<~r<j*?2IVRihB;iVnJ|ZEG6ClBEK-=mvq@nN&mo05JQuXt
z9G=H?b2`PeDbGg=tl$M8vAhu1)C$N(vlX1Cae=P3?CGOJUSv9bv3B|r(`oL(?BJzn
zb1JIWXkRZ&`r6fm;N`3Xa9^Qi0PZW90B~PL3UIF_1-RFd0^C=FHiP>brtfM(@LFU5
z<JW;;Lmk%?V=~o@@s-4QFL{v48w}TPRIcA-xX$fW9KIP$P1W*Sl-ai?%<9>1wQ~~>
z$lF)}Dt@~bfQsM21gQ9(q)_qoq)_p@NTK3)gEp)9Jxn*pzbD(3_aYVgeIH0H@5eRO
zFWG6<ZwK`Ie+DHVFfDyhTl$b`Dfj=@x&Z|nIGC6fSM%?1b;MrSSUPn@K8)i1c3b09
zCj3^0d_=qaD6V!361X26%EvVE<4jx<PE>~caz3pU$|sOKAfIIB(kY)t(e`fC+)pug
z#k8t?jXji4Yk|+OKx=^qWBF35d{$F$!j;SD_M-HwEc{M~d=AO@4ogFp#wT3l^IGj@
zT*-Y6`zDa{7A@XVDw>bA$gQ}?_gdPTnGNL&TJ?*p+LrQRIQ$aQV)-(2mS8oygoriD
z<FhX#ZWPK_wAyXVYzf_nTP>k{6}L_A0^_w19!V%>&gE7<CV*c<zAv}q8p|ClYcEUj
z%=4=yka8@PuOkP1E;kV}K3s$I2}Q)NC1~Uu$m_Qk$#4M`@DZE3l;xX9vk&&7sJ6bh
zH}ZXasi)*d!#%!?^z!B4UilVFv;wz+s~<<X)AZ0@b8C~|6bR)mZM+@dPbk%}F;U^S
zc|!TNrnW^syG(if4qKdue3_8D`MWJWj)saj;__Xl&33EuJ^pCr1_V~mD>eB(?kRvO
zDPP75H)Z(&((nnEMG%#HR%#0JLoJx`oHAbI)?z<mvAK3z!k>9LU4G1R-U<D72UPA$
zo<V*Q+Q^$*EX)_n_<0YC*-I!uh>9Ni=cbDMgvs-Y?ofS1e#(~YC2nQNrO8a-B_q#u
zBl#K9ud+K$*tEO$f6j*HleI!5zu-+9zo=5JSMoc#Wg)*r8nn8&Sg+Lb4HFLKS4hWb
z#J5pO)nPv={A*LVeH=%~DGS<lor>J6Wmi&doZwLV`E<WU?n5R{KDf1YM;vopQGUbQ
zrPv0<Cyg+=>S2Q7Z`t%bdp<Td@G6x2PMcJn!@75ra7Nu1`MsvDER=m`EbmsFQaO*4
zg*a4!1N8C-WL{}^Lexsb9ZZ^0-kihuBMMz*&vC0e<WJg|5xf?<^&+IKl;zKwyu{sE
z!;9(p#wUT~eobFS^zZ>E^YIA-;a{}Ph34Z#c)PzkCV$n!?HmvAD(2%Dq5Mr#7f;ie
z{2j^mym~ae?gaS<f8(1X{MeI@qJNr}^ewK2l4TYaQ|wl)vMvN%`|*Bp9&=C!uk3U8
zjv&rPYQNnIPlJOe!=;@vhs8MLoT2=9sTg@O7b$19*zHq|ROYeZJbU}8U}-*oFGxN>
zB@1}BX^+3IBrR;GwXt_6t+?;E+tmywLC<LFB3f3%uPkKELleI;K0e-4!?#fIK>_-e
zqPqiMb*hEEvWTTRrouLD?6slDsE&zt`riB`PVKBbyHu3L{Lzj<(5&wzNW98E*o=4A
zd@C#jo{^VNK20G@Q3RtWQG||)P?jNaK$f$~RXR@aMj=jM;Q<51Qg20BflQ3Xh4=<m
zBW<NgYg1?%K7AEZ`|CsY%IQxrj4Fv_e^#2MUzw5v@H>_Ram{)w&Ecix_z=_zv$?#=
z+g7)iP5CC7dCDH7)egoLdl$ztKIzaV5TA515%I_&q=-)r1x>%sB^DD8WB76ye<561
h4O+Kb(`QO3Ymk8L7F_N5w9H~CN8l!wBUy5&=U<X!_7(sD

literal 0
HcmV?d00001

diff --git a/docs/fr/_build/doctrees/settings.doctree b/docs/fr/_build/doctrees/settings.doctree
new file mode 100644
index 0000000000000000000000000000000000000000..2fb10dd7983965d9e1d5e6ed9dce77ebacd6dbdf
GIT binary patch
literal 41041
zcmd6w2YA%R_Vx*(IzUM8?1qG360p+?sTfQk5JSM5kV5RWy=Hf@z24b1C5h5|@4ffl
zd+)vX-rG%Xdhg%wJz5E2xR9Ig=KilAKl9FvX3lxfIWv-08cBP1ZEVUlb`&!$g^IRZ
zQ>sv=Vr#0cSe9R8$Ugb5UVhQ?MDMm_YpOWAJypne^YY!xr!3#4OP9(*vbDV>Rj6!F
zwPYHTZ555Vw&sfV+4&yh7Maq62E}x$l^#87rmRLO8K2gXX-dU&ZSiz&X1th-H@Z}^
zn2OKNb-1{-&G(|`a<nb9ry4WOvomeev>{$d6^rBx`Q9~CdTDb|F01KCEK%raC=@eA
zY{<3MHKm#h`Nh0^pG3d*q${NAU{FX-gGS$}`F@FhjUCQmTwMXBjj8<NHHosORAbI1
z)jQw6Cb49)qnK;X<%(^&VydoCOuAxziE)c0dddZvrb2#6FTYfIx<_KUlKI0*<`0wk
z!!Up8bk9VOlI_c+dnHy&4l~P#<=Tc}`LJScm~Z(oSw76SeA#qwB!*_Ic35cUa_O=}
zuduXyN1|6_I@8jGA^8=i=2z?-!9uE0)|BN}B7iG<`Bey@OU^8rJRs2}(F5P$g?udC
zHPNF~AMY&2rP^IbTc(jwQI=nI%2qhOGM#HpRbov`OOioSInm{&xnygrd9Si1*O+Vx
zMnfgzs8HGLDg)jXu29SmJYb*vYF>WzhD6U|a++M4AC%}>BAj0%QI;$gU8bR<NWcbr
z`SS8aucnT6wJYR@OwF&E=-JqkEEFiMH8npp(W@cZINd4a!=~md5{oK6l~eO;r<YGA
zy8FG>nVMfWU6$-fbZg19rSj{I>x#(I5YMll?wZDf8<cmpo$=Iy)f?i#jlBHE<>>)7
z@FoWXZ<BN^y>dF9UM)Q+(cK#7ho>RDX?Yr&o26m5c^Xbzq@lBA8WLM|q|u!&X&lj6
zVQp#_Gp=fGEhF*PC@)`)`m{7|)X|XaXh<upqrLprR42O3A(CE048|CPv0|`|7>pBx
z@#*D~BC&0{cTzmM2Rv%Z)3R}bm!BvbHTNcmgK+M-w;h^B`zEK&)=8#mvNY97Q$m`y
zmzo{s(lI4nwLrl;V&zU=erH)JB@@ib&JJS4CK+q(>9YJTFrMn=cNOD07*F)~Kk-Z<
zt~r>Q*5Q&3Eh*?H+ol(^r%BG)pqUYG&a|Y4YI{+8pEx_Ocss+2re)gSH0Bu6ZB22F
znBl|ob#p9F^bUFC>*emGIiW#LXp|G0<b;%*&@3nP3>-ZTC+zySbIqsmWyZ^A<(mJ3
zy6Jdk>U_i1k}0NKvZbzpox=38d<!9K_3~}vRe>8;kC*nE@nHpAUrbjPbCud1hPw-e
zh=Yl3%;zEz=sTC_e7mBMXAd{4wPkprJ;_epC3>~HR3YVNr1AyDqo~MqXlBk(pk^vO
zvlO1PAUv}P&tKrR8}8oS%kP0%HWOR@3913=dHFqM?ZcW<rQJrHy>5J3W=5(lo@B5w
z(wcLwHJ)o`fVR&rrWu*7xuy<=Zh6wi=#Yx|j-~OLPR>ZhlWk?GS$5QoH_VQ=<Z{z>
zh-4Jk|Eq&>*=FftvAr<7vT|CcnC@ucAl+K2gLyK;(YGVqTXTG<Y)uvj+P{*tMSWd<
zuQ_o@+wkAphW|eD>b`RFescHz^6vriZ=b-w2bSaDhX0By@&^%=gT4GA^8SBG<)Qe+
z>uBh_&*I3G;yByLk>oIj#Nl542$5>W5C5fr9jV!IRC%JC9cqtW@Oj%Yi5@WSaGCtE
zQ^vsYKQ(gl$7xg?ukmq$CgF)1E+=V_oZKPD=@5Jh<70s*m8TNb)4crY!Bjh(sm8&#
zcj)8%8S@5!v$ts}j;m+l{j<FM+4BB4Ec*}6iu^fp@ww%p@6Jn`x#y>sPRim7WbuWv
z_##<+ak>Xb;F8goU_cL_WB$^Ph7`wk?K&>=@|TP04lo_j(lXa!IL;|_TQSp|Nx4G2
zwWCmsH`w`cJk!Quti3Qao@2k_W@ZXH{-tKeXL7C<=UkR{W$iB4$mwvZsUm+x=b3z^
z&E%^@^lI_GMlriql&{lF?jOwL>j~7~N$dvVe504Y2?wM_^0GO*)SJEhE%M9W_+<<e
z%XX*Qiza6zGc9(=4^KAZ6I)VAe4w*<|3IJY>`5K@+dGPQuB@2m+(Abi-(9#=rvs@b
zojXWDF~u((eybF;-=3LjX{pHH+S!4(nFDW^1MiRn@00`Yk^}FS1D6UMcn=QzpRnLw
zJbj;+zh9n~H8;=qKwgwz%kmE}E+6#r57F3;bfq&vPJXpL|F9;(Bj$le<$=fKfyd>6
zC**-A@jy-BfTud|CX3TtuA{vy|1>(D@$%35IuQ6=xg<O<SubcBy(rNyN#M(gZjHH?
zLjIL;T{W8?)Gp-JdCub1gtOVQ{A);l-OIlbN`BKMza`0UOY%FC{H`Rw$B(OA%gjtu
zF`a*Z+;WosjHG|ST<uvBnE#NODw!X7`Hw@H|1g=KNam-K`A^CGOfo-@$oyhlRVeez
z^q@4N=J7{5m24`@e}#gtz5F+!f^W^g-%0HE((;46^P?2}6pH-0voM#NS(g6=QNMcm
z-$GHpo2Wk!<+?1wo_^R=w}`NEs_QCTXR2Eil-RGa-gToek9*k>x!Gl|JKKir<9Yy|
z>#2q|Mh1JXmlcLgb-l?*SD6r9iwV)yM~JSzpmhBzUHw$ae$XvW#&i8ikvOFfv%Yj9
z71z<sEunU?tn`+CmgtnkEotphx|BAcbZH?<ml2|LSs_Z712r?3lhWl?Sv9Yc6{tU8
zAGadlxs^zvk}YW#Kbtc;5Op_ixRtFgTk^>&)@^{_jd=sTm=&NGCnI{R3ZXYp2))&W
z&|4i0eKJUu^2r)xJU5tBKIw-~X6jc=rWkL^v3uImm8)eeE6q`_46z=lT~ixSyOt2O
zLxrdvCPZxo7<#2rl~waovo>4s%Q}GP)+Lo+O1i}{@JrTrND2=v%20Ic`P<|$cC5)J
zx4u<$9<{}WToXfU12$sxhJfcbB1Mbu#*M9jJ)4k`J;R0Av#Ah!HWOmc=3p>8+!hqd
z)6539B{|P+W#y8{5mrEC6&Z;fDMaKbAtI}Vh#U<fGAmjdJ6nV0LCD8Y@Z4Bc1zfkW
z0)oepk>K${1aB)uaE%bb6F><TISHO9RMfX4<GD$sin=a=)sINjj+rp2-c44USXOGI
z@vgPD=uBt>I=2_1a|a<hrwGxxBdB<<AcZ?om?spv6jB$SW|g^}X#}TT0MAV&Rp^Zd
z!+TdNqqmNX^wtZ}n-rqAL5SW)P`1i6scsTh*>ywTG?$`=A=V6dZW^iY&{$TQ8DET{
z#qH9|9C9x0Z?dhWp%(-uV{)>g9LP?$0%Tjrh-|A6vTZ`h=7f-K2cv<>t6qU|WIR_O
zRbU1Xm{F<bWJgOe&Sk`O&c(}hhM^y}w$B>kis~85icB<I9VP)LGqeFFGlejjC4|Xr
zAxw4y!*K1c%Bnx3b`M(OOAqkeo}`LdiHmHQce-Z%nQD_|FYC6q-_4(Y`&a?O`;rmi
z{e%$SUkKp?gb+Ruj82w=D2J2fU<#f)L{-6LIn)XWK8%b6A1*}j5kdqXDMav5pahGY
z2GG$$#pD<=o;#LQF<D%bW#ow3>a8bC+OckQb@ixvcbuBWveF(6!tvGx)hB2Js!tT6
z`XnK$PZpy36i`7}QF>3MkS)!L)5v@7bW-`()G*A>urhMbBqO<J36XoY5V_|Fk$WyE
zlVpKJpC_!E(iaovvcR3s2Eus(;JFJ)efPz(BH$1H1<ZtttlPz5Hz;0W1t?xhMieg-
zLh*7T6t56M@k%i2^{Z4buU}2ZbJvi{>#b1Uf!`sVI_K;p+fLJqxmJFp6jRf3F2lj9
zIhATERK&StZ!;!SD66-s%0Y#SByB6Wq*FgMKGWn3D(L#2#OUC!YbNB&O44RmxNAiu
zmX&SMm|kauFzkA5z_1&H7<Qu&!)_8{*v()V(_1L$ip6?=%?x)d{fW<Qfah*EVFUiM
zusi6FWpZ#wLom|rG|_jJL@%X5KCkcG-Reqs@3D4x;a*kXh5Lkf;eH`rctD639t0I$
zDbomiNLV#x3FOZs-aX7ltb7FU+@qwyC=|KqC`7_wB>dS>KIY4P+~hvt%l)?mJV~F>
zWBjV-P%-B`B)VgJ%2Yh<tMGSh&sYIhJu4x&>Nz2<dR~aDUJ&A{7eTpdLzQvWOJKNT
zdzpggUQt!BV|&#K2!4%>1ivms@Ebw|zbQoUTc8AsoCLou)D(M%jOX4Z)fBUs&$U~q
zn>2ZHy?am1V_7kXPK5WZ8|pvM2GoBjMEyrX)PF2Q{XalWgjJ;b6AHnQ`;@%r{z;1Z
ztf^sWeP(6keojVmzYrq#OCfT<5+e6&P-e*riT+0D53PBuaNn|#q4gc$x$jAXp(PU0
zp~d}>InfOc^*>m*AH#0Y{K*Q?{F#hs{vw3tuR>`4CWPkiVAT76s9xUh(p6j*A(i*H
zoZp@yvTt+TO_*o@7O%;*rOL|Na&a~fab1yxL&P>3sYOi%RJ&<ARJ#kI+CvD{o<gYh
z0>eo4R%O+HgjX4&aQ<R|=lYN;-X*f~0xpkwopbx>oa$@c`uW}bIkmVIu&6&7S+s-@
zi<T5((NaPzS{jVbsbwgKb81-%o?A{;!JJy&3J6|-j0CSJMDR*N1g|Va@G77Li<}1E
z0HLB9BjdR^siIn@{piTalj}y09baAVR#mH5R*Itm8fdN2x|%kib#)<H2MN)-h7hfT
zK?Nu#mE{zIsWgPV=hh^ZYfTMfbS*0*cPJUj9VSF>g%G)wLgcOu${LZE=yinty~BXK
zTbDY5xE|oS^+|oF#j?`9&>6IWb=xrP2D^={0K1LJh}|Ya*bNuLZc`!bHUp!+-dy$a
z^%i72w<W23Jqcge=HjJ$-gab%ynhu=m*!?B+lo4SXvrm;hQ>3^{Kg$z(Dgj7)}_Le
z1}0Rzd~j<r!}5bdVek;Qm9)jOG9VhW5vCRPRoVdikwVyy62iV(2>a1s7_+TaS@m~O
z9fNd2G#2pOHl!L1CI0f&g6G*d>o(r+=FhWjt$>j=WMt$7Ax2IVV&ry0jGP2U=h<Y+
z;XJFQ;JJjVf_b*R6%f1w83~>uMDUJ61n(q7@XnwFi=0O0E<(kADj9wqk}CE~YMza%
z9z7y4zP2vd``5cVwT@*)AR4=R>xK5DHlV#hi1tPy+M9%EPl1Zvs#4udA((H|$a^kL
zDi@m?Ms&u?$jy?G-04E(wg{2iDnxD@D63?IMCXK6Q~F~?XCquY+X!kN@SG#{ofylC
z!$Rj>!MYX0Zm{gI0xV~c5zCoESk4l{a<&kbyMa;P@2-0Jeh)I9^GN0UjWq8fGblKP
z)?91mBDt1Sut=vOUf-H2G}h}zW9baN!tE)Mv8-4|1GJZkhT`7Z0L6WTP~2At#r=d(
z+#d`BbN~gNWDokYgxrDjz_$kho;%pO5BN8_A3_h<%N=u0qz^S=hn0kB*^+O!J6x^t
z{}Hwc<Bn7X#vLWZxTA#_cZ?9@js@j^$=4`3PFOXi8zSXNcRXd-p8$C7MABenh(dH^
z&`B3N=kokXe&>^|^C^Dkd0U;zhS0(Vo%o(+a!&W<_&bj?tbm<oN(gqICB)9Nh1hwH
z5IfHWWoK~WdmiO*=W#v-&t0IZVCQk66%c$88412vh~P_v2)<N^;LAV>7CAZaa-jzB
z6=XbjC8-9mE_#MLkMSdFwyt+qsbwrH<<W6@we>*rHQIpYYlUdOPKf5~g=oG3)VLfd
zwKq}-b{sd6_uS2-XwI4%hQuvaM((X-B=<HUa&H$R_YNU)?*wI$43Ox%gno2`9fu5X
zcT>;MxCijuy`;g=kpAe<nCrwVINiO^y4@dkgW&^KfZ>B=#PA^@3?CN4@DU*l9|fa6
ze@ylA`Qv0f_XMeYJ`A5ncN#6pwrL$KtJ6-SqmZhI2baD0jXpTlHn_q)DM7KUxJ5(q
zlnI2`)7k*BXM_-YRtT}@gb;fk3`6pQDy#kiix=sLV_yP1_cE!%SfVBi7kr3)#k#%f
zck^e-YgT~&>tw|L4I%vB6vF>4A^hJ4qqF24%Hb?|mxAZsQ&lia-nRmRKOiH)9|{rt
zkr2Tj3laPeP=ZBHW9k#3BK9d6exH#lVp_^oKWgmciQ`A?ST}LR*42~iCe+kzTV0c=
zcb}<CEGrh#*nDnXq40$^K;cUv6uuHd;cFojz5x}R)ujJh3c+;wjy%8DNabf!!(jZu
z%E<kZjO6|#MDEW*<o+T=?ysOslO+=Uo3LuiGMF-7OWf}?AiRG7p6jw`;Lcc9L>4-4
z7NLXZx`y4Lx~LVP+Kr5;b{9gmhY+egg;4DUMx)SM^@>6n8P6?7swmWpdZxh5<Jobp
z2J1e&&R*NKB2_D4Rba7gN9lT2c%!+ZtTw#mtkr4Fxt10d&4wbFX5p=F*GIZzS(y_J
zXJ6xhE&a3sTNW2$OMfA@EFr{}CBZP9OR2Kzze9X!bP>K~0M9K;s!>z2Mt)rI>|D;e
zE$?^pXXgr5z~mLl$mErTn7pzOlUEU9@&GV8J7bi?*%_zcxm8sa%+7&UK=5j0BzScp
zf(Ho^yoM0LgFy)vISt`*p~l4!GW_Ht)ws}*t{**O{P?O7BgbiCj-FgMii_0sZY_0)
zWyK*H%%Rp10>iWc0u@3CR0<)mwh#jAfC}ayX<wH@FgMpD&o4nzdD+x3;5V=`ayKL+
zxf=<QyRi_tn+TCR9F$?QL!vhoR@qgk`Pkt$V>6-M9Pr#0q`oU-S<zVN%-qttZ54Kd
z=m;x7w2F*~jub+4ln|oTLWqtAqY>Cz^@_k4GTfOXRRnZ}dTevN)^)HFG+2yii)A>T
z*}Sy%AcfhiiEE8F+2W5(TXU{ZR^D37w5EpmKS{NAbZ{}wDkIjBXf>ZLh349i<61Yf
zyG%>%=$+isZ6hMw+!NT!VOv7y#u*_D8?Ox*wyhAuYJ?azL5N`!!7#Ghsj}+-z=}yI
zCa{wM&()G@G?h$~hZj6&6V`2ezned2cd!EXPaz}wcNAj(PD1S8S&03+fYCWSm2x;|
zcctLDI#mU8w%!T|PLh$}1|fnQg$QmEA~*#~u*hj>Hw!glrjg-iBdJD={WkD#AZ64d
zmX*?ID6`fQjnlOOjV(enwhGbMCPZTnR4B`(uAM?KN%Q3S*+?q4ni|G_!OF-jl9AjF
zA#!I3kvmg}+*zP35pjv0E%bkah`8I0GQry&@Z27xzO!Ok>0Rio^sL*SVK<oVWd)e+
zO-9W25yEU=A<Xs@!fbyq>f-}cFCQOB#&ZXe%E#5rN|$1(6^mr!9gekcxp=OlsGF!d
zRO+sfT~>{ra0Yjc`0YC9wvjtn3SwDtj)v$EQv~5dwE@D12_byA5W+_YA$%klhUh2?
z`l-6kU!muYrZ-+c2H?J=i5l=1MIA?Ptdi5_{DeK;1fNh6ytEE2{>_@XJ#wP@60?)6
zAuc#s6}aFOAuc#ohzm{=;)2sb#Z1~Xn$8eb*~OcA<-0T4ij`*po;#Z~7+azj9a{_f
zU3!l7J~!+Q-Seyf-Sf$a?gc{VUMPg_MMCIa42o{>yYv#u;r`)L3ZA=6Rl)w@aw{PC
z3NjLWr4Yea2@!m?5W&}g5-f7^!?i+<-RsDB?s`&<UAuU!Y3ARDxk0UBSt*VVz#FYK
zT5r+@wB9U4>n%dG-YP`vZJ-9=no@Z?g<v0X2YJukNs892sliQmSsA%^labtegvh;D
zh}`>x$h{wwH6kz34+#B>#{qfwAa%s@A;5DFlLoPr?r1FM`+M{e>-K2a4R()N0d|j*
z5xXaZuzOMnyQhS(dm4=T`We;B*Uysi+;gPz_2vtnh{4^Lxpot}`4SIrzC16%v8=d8
z!}EeEfar_b0MVC(5Pew)(N}~JeH9GD^O`EF{sXLDM-YyG1Mu9NqzZ9~sywjZqw8DN
z?QOrCe{_Av3fS{58QJrm5PRMiV$TOc?D-Ik&Yq7bhqLEn3ZDCis)E_`i4_q1DH#d=
zrx3xP2@(9c5W!!75-f5WZ(j-((XYsO?rTy-)Gi5cGqz@%5p~s5YO8A|kDXA%-OO*)
zI+hiIXqdjWUTFVL8_@o}5bZw*(f*?l?LUDE(@?4YnL;p&ej)F<UrFU+Q^Pp@&C1CA
zos8uEAw+H$F5^k=B0}VL1!a|tkmyBK?_Uz`Y=rB^HiFt6@LUg4--)rTI4pEF^|Wri
z!fvqaZ3S4CkrB(qgs|)*gk@hLEc<~`-!HCu`My6H&n-bJ-|x(98o|>}tR~m9C~dRj
z+hp3Z$#vsAl$L5M@WfQXo|6i0$>@qtS>%cjH#8$H%XOsY*K3g{R1i6&!YwJav8*hK
z25~7<j~PpA17<8E#EfNyn6aD?GnNO#Ag-Xws=uA{il`xID*>KcnN-81WQe@C;F-9J
zbsOM!^Jikr3RoK_BWqU`V(ma7)~+VR+SS46OdLcxoQZ2tVEw16f|*!u1q2TvBf)D5
z5xkZV!9#@z9tKLV$Z5=02sIii$#`yUQjG??ax|{GdScy#MD4^xZQZD`ld4D7vV5xE
zt)nintXM=Nxvq7E!g|^Oh4qC{*gyz{4TVtH2vj61q<>=y!F1e&yyu3K%Fm{TfxfAg
zk-Hfg$=zIt+%1I2-BO6$tw5P3OC)-P(7$ptUrSsS4G8Z@z;mNWeRsyPBC^mqS#8}$
zhuxsMwH2T`hK#6=6+(3zAymf+p*kLnMqyjkD+)DaJU4+<QPA(xaj8_ho%fbbftz?{
ztFf4Kvzen!@vNTy=xEnZ(|GW3!?aWzkKGk{azVdd3v<m<PNkbtEh&2*f(2CmS#>C~
z!c7#BSXQ=0W4oOZ!mvr&fMJt`7*;F9u!Io9wg<!5?x0Hl_vwGv3f*rZusZ^t+lf@;
zsbrcwyx@7evvu3W@8-|jsaC-LUCGG)IwAJg3$Z^b#Qp{_I&T{(hx4|Hg6C4I3g&II
z6%ag)j0C5J2+jx*oE0K?Iw-*+r@`GK)QD*%<GD6cjTl=NyzPid;}R3=T~2LcS*eW%
zv)$UFGp`NkbV76%gy<{^(b)kim}^Vn3<|+Sok`wvvq<GwQ^V+=ZDr){Mn-aX7b15L
zA#yz-a`yyfi>OQVUP6D_uTS0WO$`Cu2k_j!q`t#qS!rJA%-qkq?H_i7+W}U9+ks@n
z?I0oC4i>`g5Fy+S1*3jGO!e~f;bgcGNGd<)<~~}6&mOfV-Sm$3cyMcEK8MWFT)(v|
zzC1<WR^(Bwwic#xC}2jirGv}DdPuaMhvn;Sme;p7)mOM9MJ1M%b<uDhWt1@OXl=l>
zV}zJ?tPs<V6Jpx&U>MF5DCpO0{eQs_cOuFN=ShI)PBzW{W%0-fN9ck7qzm0CD8pw8
z-kjgcry7sbN<6yb0duuGU5yzmXV?}zdZsGy=vhKMdbSXco+HGg=Ykq660d=Lp0H{P
zXLMbNojac*W?ulXLYFic#Uc<L#q<#ii?zGR?{%^Dy2S4l*?cKA^H_A5HNL#m7~lqW
zQ@y)FZ87Ld+kin=sRDzp7GlsfLJYcAh(XtZQG>2mebp3hq;zR*ayL-Io*Mzr-9#GL
zBlVr^VLe-y3L4*Rjc@TAPqEsN{emt6+-m)9^ZWTb;oGf%6?c%46?Y1;;w~Xp+%3e4
zdq7zcTm-n6a<~(|kAmm!S5>eRe!vO{evpg=KO{u(!$Jf<B1G_`pahGY;{BLVJBP=~
zaHEt|JBPmVf9bqw;)vQY_3lYE<VL6<a@qGO>ww~?wE@M?2vPj35XH|4QT#lpsk^SU
zzCa<^6Te8_b1#viIBRN%_sdpB?ki*@_f;WsUlSttbs=)!0A-N)OZ1z<sws<MK!m@0
zi)v!|HsHB;NQ1yjeKhd%y%g}Sb$c)D2Eq5O0KpH)h~S4p2!14l;KxD;{sWA9{1es7
z<DZh@MklE}zA=QurRI@qg`H1@!duk5<YA!SZlL>2GPx5fhy>?zlMTl&v;mG^3gP&b
z5RP99;rI<02IpH<R{j4G`VJYm`+I;Jr=*H)iKXnu<G#~ZW<K%A@Z4)Jf3$8t`Q7}P
z^RpE&<rgwC<yRr5{3gVd--Vd+2N<0>UDz#!GiMPB+$vR7Fmo2Q0)o4dk>Kt^1osdk
zxTg@oy+8>TISsVls#hG#$Z)HaRB^P+>;9DKqZZuI6hxxZ*IJ^npEjUzaUmM}3(>fQ
z5RFTMipu&@w-kk7$}COZbIXv*t)_+%xvZ6uyBrzGU0#UX6@<uLQHb1?Kv^Q<61}p}
zzq~HuZWYP|Zveo9ex$y$Vp-{3=v;|gw^hS#FdJwEn5{-e%vKk|Y>*IUYY1UB7>xS3
zT=nwt5Hj3$B$bcj%oV+DLzmU{_6WT?f}2*{y3!SP|0jc6OMSTmDTsJ~sL6oKFl~TK
zg%B>4Lb$9ggv&Z$=>2t7S@q`>uSZ+lw?4p)Nm2!=#71^3c<gUz-8S;O`D1@$D?oV@
zGNL?O2<1(MP~J=k<;}t9*x!P3IQF-sz@vhy3da5jD<HUvj0BGqB6yS#!PP<pj|NS!
z%8Zz;g^J4<GTe+LRb1>LrHP|P*G-%>VPy5>$$GGF8#U#2p&$~5an=RZ<Fx_R+X_)#
zBSiHCA*v^W3d07{yB&pK5=<iRxyhvRuc=|E)mj<32{Mwqy%4!O2$8Gv5Xs#Ulu5Ec
zqIVMd4=K%Mf!mo4gmV{w=LAW8_r<azu+Z7Ct97djyFszu3Q$av5yb`}6dQ$5Y!X5-
z1xCHzta^EU8X0crk;?1!%!Y}Kd)))p-Q4J^V|(2S_QYrKq6NDE#+5NW#}~dIjVG6O
z)G}pzzXDG(X-;L@cwrdt8PGZ9y6sKPoVjPDn_Go~NEoxm0b8bP1GcmXv87drEp0+<
z$$?=Q+bQVGefz(Sxyz%1s5yWekEU<H->I*N3jCwU%sET%Fzqu++IwSd=utOQ9T*L>
zY%3m|tqMH2n-CA~F2sX-2=Sl?YBWfN2JD`~swq8@S_+ffiz<xX8}Qsdq`^=Xk?2sR
zUvPH2uQlG!ZycW8`gSbn>~??acYxo|-%lNA1xz`Jj7&LLh$)8%G38JprW^*^z=niO
zIh=C1pE`nq=Z;iWu%9~03J5-$j07JeMDVdf1Rp0v@bRDoi<|_XAk>UGkqoyCNi}2a
z(%_`(?W-qEuC5y~Y2=u(+gI03m^7-I{ng3p63dE3bfBMNU7>KQHbCJtArwv*Lg5S{
z6wU-S&^MC)vnT}ntFy^_?i^AmWK9j>KiA60J&%m!o-ai11w!OrC`9f>piGk`5`D4I
zzce^sOWY+iU@%+?aL14|7z`p39Sn1wi3N)>FSl-2gx#Qer4^uh6&X>zS_su^giyU!
z2-WMrXcVqjy`pdf8PDBFswhlk<W5Ry$K)?mNjhE!I717{TvN(b#LI1m)|#A76)y(h
z{U*HEu`$)wq?bimo8fjDqAfKu<v8jy3x>Fxq$`#c{b=}ZHl1+4MH}FLs}SzD3E_Ub
z5bk$?VfgM;W!2w9^e$u*p1T1aY$VmFD6yBH7JQa)uXVf6@8-|G`>lY950H_G4+=5y
zAt5F{EX2e|!07CIlyW%x9;4v7$5j=~z9+1J;3vsQ@KZtrKP^P?GeQJE3reuaX^1{2
zRNS8@<GB||6?fYYP99rZotQMf-o2<sv8?n)1NM?NM(NAifYMilD1B9k($|D2eH~Q5
zHj&0RC<OEEP4b?5i&UO9H4Ngnt&H4v$Vl$HLgc<DMDF`S<bD9k7;%^A4~72jw#40i
zL=_?Y7~rlVsqeB_R;m{|!#=TYpN8Ea_fIQ8?lUqX_qh;qUkD-hr4Vvofl*I?t$KO-
z8#12zmQ<czff?4I*9YNg-4fG*pZESW6nLv$h5JsOVp;Ksdj5Os42d7K0TMq7A@P$C
z5<d$e@e3Gw{#R92EkxsQG{RxO1D^YXRFNss5c36(`7Zpl;>kr)-_JO#s}<n7C>e3>
zCWLEuAzXV1;o1|7j`?1c!!h5Rg6GOq6^!}CtbpJ?WF)w+5W)R~2wq%>;QpWli=2kZ
z5<*2{Niv>Wid2!XMHL!1H6ylVb>z}&70XI-)b-0)YqTz_4QO3Xh}PwWXk9^w))hgy
zez;VwL?IaTE0g!!Dx`9)sliPHtc=_k8Oe<ck-Mr8xdVmBT@92qA}`Ua3rlbFERlDE
zs3VAL0NlYN^_>>WO7}uXeYtfT5_W^#npS|_T4cm-s1SC;gs`g+!mbjG`g(2E%h&6W
z;q@(~^0j`2a7ydq8s_$x{ZO}_n#Quy9(DNo)&<oYXalM@6ry?~A*wePqIwfBbog*p
zR?Sz>rfkAFn*pBNoK#^bDHqEHkMJ$5+m?Pef3Lok6<|1mj2Ko4VK`C<!%;#QR)f(I
zKALhk!nda2xiP8=M)+7OAb1-x5<E_b;PFBPZ!1J_4Jg4Pr!g@>D6dZ><GJlf<#l_U
zWpeF^+OZ>9r(ZjUMGuqIGM1I{sM9A~4>Z?m1DX>;G;c3N^A18Z>spGOzNysiNFf;I
zJCXO?&ZKg$sbL)LVrAq`B_p}J3XxkUL~gwhxk*qK$pDFN5SCt=6fwXxQcp0O0PcB_
z`p%1GrGKF#z1g}=3%kKEZ3P%+$cSN92*c?@7`6yu*a}8{-llr_JV(ZJ?WFSgF^u%u
zG%wC8veK}T<@m+)+_!7|w{14+ZFw2JO4eVhUsk%jXqQk1`ke<>#H+$5<T|Y+Zp^jM
zwx?AGXIi!5f3Vi^bBd;)in<R}66aS|xV*^5va&xKc4wq9zMu^lUld||hY;gu2r+&p
z7>0e8Dy#lSEu9TH2FPxJ=XNL6a4eaxNG*7_?_u3MzneeX_p|~&+KY^Qw6_o+?IXlT
z`wH>VeqeOA?@u|L?FUfs+<~eJX8S=_K=8q2B=`^^f)5oU_%I=Y4+kY!<TN*q5NhNd
zNyc+Wk!s}G>dew?uN_mpZFMl`k5>CwRurPaKgRl@|5$B6|8YX}A1_4z2}1Or2rBqn
zNcl+=f;oROdC#3fDkqy7X4I)xM($~3B=>Y7a?cPV_e>#j&jMwa%#i4_h5jPYdChR=
zu$91`3$SvN)OTboD;5i#`R7}=3&L*jywD2pyoii=UMz&?B|>;!Dum}{VATJYt6u)U
zf(*aGNag?inE8|aS<eh?)uT9_=e}m`oP~q_P1!OYxT*IiJa44o{p6+VMWq+l$8CRM
zZ{Fm=oXAdPXc?!D{`;l<CCsgHz0Ib=T_t)vu_%aK7P{JKV(vBCfVtNSG50zl=3Xzv
z+#A3!+&5CtWg$J<`xlLKHz9+_-3;)6qY3n%75=LNZ$$<c%KdXL?A&JJZ!d|r6$>S=
zx;xaKh~H@&alu`xzy)^;alt)8TyU=t7u*Lb;?kgzdB4zKO5n?M4^V?m4+5Thh%^|D
zq7fa9bQ^{5{v(ln*jM_9DSgye`k#~j7y?7DF6c7T<EH-!U%$VTe9{Vd_9+R$vrh~0
z>@z|<`>YVpJ_pLP!A;cXDTh1B7btk{MO6hm$(O8v;Frlr@GC+DzbZuVYeEFS4oa}d
zDP(U5HA&wj!*5PfO;TN&tGB&ly?a|tVp(a8PLy}7DJtL922{Q$MCJQJRDK{t<%ggq
z$_VNEh(fSm{FpqyK1orTH8qUBPppjGPsvE`KZVHsOo-gig~<H^lqq5^(O(Mvd-=xP
zeMJR>?`yzw-;f4_Pl}_1Z@!n2zO`=Oh25a`y%nJL0~t~KQ3$o4gi!lg2(@3psF#0L
zy}bMz8PEMrDlZ>}m;HSprz7^z6R+xWynnpWf7rr5JE^d}SA$(?D&ytheDQ-H2mS=J
zou^J_k~*DXXX>BHu&~9&8`HT$s;#UcRh*gPedjve2^N?JFZ{ATg?M=(mE!HhJl{CP
z{UNHctgMely9*;iZ!C3-kdf(Kg_ypm5YxK}F}*t&M!Sb9tNthL><KjnM=yZoyrdd~
zCF2#P1)l(wS+~XfZvNcvV+B0amyA5rPl$&W7viD*LOiqt7@gZoQV!?#QWQM5w5o!+
zy^IwQyet_BUQUSM<%I}dL5ScLK?xQ)O^B6*8g(m^;iomJMxCwmuAMZZX7YG`^61G&
zdnMlhwT@*)AR73X^+J1G8_>S05bXnnXkSf;_SHcJew0)Xq7Y2;HOTXGn^Z0~HO!@Q
zD<gLZ8OdE!h}^Y=$Q>#~?l4eR$q0$A5c=!9I~(CD*+x*;20XV8sqaLV%aUK{j9=Hf
ztrvEK<@#2D<pyNLazi03Hxj~fV<9Xz0i(Vju6p@?Q!<|0j8wjFW5$O|C4y(FcxjkD
zQe`)Si!Rw#(BoGu`3}#4bn+8E@G~s(a=rz=nosNCD%|E`63fcCXk522Mp(9`HelIS
zLM$60#Ih<OmW>3%xQ<d~)&GSV)o3QPqXCxsl4>xOY?F`w<$TqPZ@b&uY~2`Zr-~l_
z8?W8ipeF}%ebvQnLxtzYk(P!|@R1q&wu>8Y8}Qn;WaPCPAzqsx#A_3U%ji=tZaZar
z+SgvTDZP2yO`^^|_~Is$<DRdT{iPSR_OT|HP`6lCL`w0}w_e=#))LJ-XakycjF#pd
zg=pSMh}xY&#Vgdgi#GUYWhE6;slk`K0z9!vDqoiLikJD)MsK|}N%~EujAZn#=O1YN
zMUvsl$vI!ih`ddzm1A1)0jc_7tftJhYgi9=4al3@#Cn<7XlgLAN!u|oCB(#LAtp`}
zVqzMUiQ@yeW~c~GzyBgZmqi9nnGSfa#RU4N-+xtLD>ATBE}V1v-Dcu*CGo7s=_1d#
zcD2O?dE0;soGNfZL5K^ALR`=x#04`z?QbMqd&QYTf34uKqMJntTV?~E+l{m|n6pwJ
z-4D`5KLNtX?Cy8m!#a9?$GKbVNo8miv!?UQiW@pwI6tY=nMRr0i^fc<y-nOczBrDS
z(b1h)EYid6E9v-QKebKt@He^rDcSwqHRXZ>)CQLvD8y9<331iILR@nQsL>I;?%o|r
z#XPT07r{ENvbL7F!`KeX!vWS9t1)|O-Rj|G5v{ZN+(XhGNiDQxh(9S4y+Z-+DAhvx
zXzL22V^jg7V}&q1P6+ekg)lq;gkebVMAhqHaS|EU=#pwimXwNDbkBW?ZAQ(h+JKtV
zgs3@Ph?+Bms5uk#9l-!OOO;if%sQJ&#>qJV_j5@jYQ@FhsWN&?E;`Q|p6@rDvN|p*
zWOP2NujLeGx8>Sq^KdYyo&%d11-wdQR&ii__z-si9p>_0HgMU6CJI|FQWI>sScol`
z2(jf-A+}rwMqPHf>gBR4$Z&CiRNPCN#53x$t86oBuGR+BTq8uywL;WfCq&Klpj<XV
zbLs|FR{eQ1Z=^lmyb0iqMWhi%qS@J-w^+kl{f71`DOO(>XD3^@ncP<9Zezpzy>`2G
z!JIqP1as~bV$NMc%(+{LIro53uidM9dF?(jtivURqpdiNsCEyiSu87lQ7=Ad%~AW1
zHlX%lA!;8HqV`cCY99mT#fkFb<Er#mwMKP3K{d{L67bwpq;ghCvDgL9(t%lwpSFh2
z_zkD*%h1!>AHA7{A2WO<%)djJn`u9E_#srx<%Zgl?%;rAFE6xLx-{}bi8mYay%zl@
z;v<5ovYEUcrktNxg$}2#bG;MM#&WWukZa+ic;OGOj2^3d7CJa;8$sk6(sRZVM?J3%
zIO+u<j(Smuqh1o?sFy)GYEp0@dqo?n{#VR<6*k1^HNbPPlPX3fn-vd>kwxbXYx1Vw
z#Flm0=V5fs?oWJm(*GC`U&u<fq-JIG8O+jtw<71Jg&)ZBf2>xdi>)nu3Cq2OvibP_
zZR3FN-_dq_|E>_<zbC}^?+fw$2cUeP2z>t`6*`H~0Wo0jKB5vAd<<}@!dm#x`GhS#
zp%NbQ07I3pOu0|3@jpwAry%ZcbHZm*&Y|aXDf7QE<-Q<4Wi_<^3D3JPCE(a8l{DAK
zrv8l>xUbX|hkh-@!QTjR{I^0J|D6y=e-G+ZMIO=);Rj*WpJw<Y&56KIfaiWDWf0mq
zgxt&s<O?om;CMbT<$kd?zxr*atcy+m{>XB_(OoY6U1EZ7O1VEMWdn=5FhtVJ>f=&w
z5oIyDs}Q3X6=HNZVK04XDzv-1ss^R!d}hk^pvH4ONwpW&Z$nPd<MrY2uP<HH(OyoA
ziQ?08xhA_%l(Uzw>uL`dZFG(uzKbe8HqIl8d_IxYMrFZeC4O0Ghp1hiEu<(-CD%)o
z=G}kwHbz)grtMg@m=J6G2nl&#Ay)PSHHW4Ib7*lYG>3FzD_dNDDu~_^03U|2tpnz4
zU5X0y%MWu-k(ai%%aq#cX^4nN+_LIIc$Ty6a9my$a9lwM#}$QeTuBJWl|h9;N;Ldd
z5q3Ti8bBp9V*u|WCJhFe$k-su`mgh+r#^W3cL!!wpU*(!vzpK6zoK|`bcGSov6s(I
zxj{x_4WCA*^Y^qqJmm)4Hlk6k{zPMlkZ7zaBpPc8iN;Wn5fh&J4pTj!opKdqJXcBT
zyB?uyTY=8&s1d@}6{2K4AxhR4B6I`L{~VRukgR=?Dl5{8_eNm3z7^#*Cg-_LtX%ry
z%y289VpB3wv6&DRn+s8~g%A~6f^)th<+h?|pQg%+x73Uf+Q+0!R~1FijU)}t8D#}@
zRjVnwMhnrkwGdrngy<RzMs#gMaok24!hx=FYUu0Y6IE_JMbB+Z8tSUC0<tHlDY7RD
z(Yc)v4wHoFnhZuo*Q#Eh=Sh&^ssm{#bO$RSREJ0j-BF0porDP8S%}bGKnWEw`DQ8@
zUg6x80#_YW6<p!0w*rEbWF)vjh~P#cf}4a0PJt3EauVDu)Y;)QGAvRcMd-ZWkjkhX
zOTYz@^R%qBNAGlPKyQl>y{$s@wh7Uj1GS&qMM~RMIiC+z<*8>M;sDldlR_n1(ky=d
z8EyC>gkZU9(b{+T?fpy1GpqownPkLkmJnXEh49)<2(R72s6X~lz5L;k;WIO&@`o0<
zboxluUTPW3N_o^Hds`1Q@1qT9-dBj`{e)=VUx?-dz|bQHs&c*`sXB-)_~c-~bBB=1
zCneqD*vThz9;VVK1=hC*tg;&bm~^PgILw#f`{{5i!1f3-Vtb?zwnqtJd$bU?$AHmM
zek^7GD^$mk^W5=PF6|ReumVy~BqOOO36XlT5UHmKk$Ng9sbZ#qaT*v7^V2EtFsrJ9
zVSc6+5PTLH2|inh;B$lsK39m~^FRp}ISD>rsIXo@hCA}43ah>eq8E&AmzZ2PXMx^D
zY8=Z-e>AceTPKuXq75j&REYA+gebpUi1I5yMRr$dzLG+49serwp1Yb<K{Pe&q_43u
za<3&Lxz`Did%Y03Hwck?BPgR}gGApX^p~P_vccWVCPvLIfah){^<5atibC{gJl`94
zw^_H_!)}ng!wQhRlZ;5-C4}VNLP*{tgyg+o)bsbLUY@_73@`O1mFFkp`QV$^IyvJr
z*G*gnY04Dx9r^^e&c2F#2{ica$@x~9mh{<&b2tMVJcB!RJhqZ*(kU5BoBW>cL8*&n
zWkED{51Cr%KdcSVe?$oVM}^RTObGqQ!7z4DsIuyB<N74x3DQ%5=bk3js3;jAZ~e=u
zZHJd<tlP7GH-9!iX9cW$o{X$~L5P(v3bFDfAy&Q&M(5otl*4)VDh1EIrmA4xy>0~r
zzd=TV-xMPFEg^#679#i^P=ZBHL-bvtqW>Nlo|`3A^z~}+`mM*-j!9J2*+TFS)Gn5l
z>S)+LwD#!zNE^`mu@Jrg5Tf@JA$mUr6}EaQ{U?QB%6&$jA9tj3uBl-(e_>_heo01h
zzY-$%Yaw#K5hC|nQ1*zvM1Lo&vK75^=)3Q!C6GS=p8Jv1cU&wh?F*f4KUue*!*1~V
z#R~BIm5liPCWPPbLiqh5gkKjfvPS*A2xaqkS2CVklvMuS4u5m8$MNBAeL&lmgqLUh
zr^WnbKW(WYe4wJ}KMKZVYb(>;bSn4()W}!1xo*RcVZXP_G&JyXeb-IOVp;Kz2Ccg(
zg?tZfhkQ>V<a-Gr-&+XzGB6C<VydkAo0#@NI05Plc&;C*21ALyJhkANwzzfc?|1WO
z+7ed4#wE$f#-)VVxU>)(ml0y)vS4(kEk`+=Y0Fda+zP4+X4;BYK=4XrBzR>Zf>#kD
zcz_VWF;Id<P9rle)J$8I3{TyXD)M%#dg}=jwjR&JPBkOO@5mBeR_Cs!*0HPzL_@c_
z^+Nj~Z9w}PLbMMSqP<**_937`*C5qvQV8bTTI4-9lvFM@HH_zBRz_|G8Of~_B6n>e
za@P?ecU@3c$q0#FPw3yO?relxpKSzn1Hf||lKM`JWyN8kvu-2nwsF`EmYY}smcz-2
z<)%VdZYG4~=0aF*0Y-hlrRwGTt;l$81gU&Klvy`8F=E&h{)X+y-(bzAWFs#I)qLVo
z#54|h$+l$6Y*z3VDqNN1#Im9mjmk)q2d`1u0IzBxyhaP*wY3mlW56&fV^vx8?~~Yu
zez<iU;JNXn3S^0y>|5|$+19$%_}%=uGQkSapGZdZw-Z8tk`Vfnh0w1BqjM!eIh-ro
zQ}EmlstV?cZpGM&njOhV@J>Pm?<_>{E<yxP1tnPIG^%zLDqeMDcqW%r@!|qim-_Kz
zYsN7_l4=smN^3L}4b~J}8npqHO+r+rgs5y5qH-FjP&7(knnEx^GUPp%C6!-I4MT6b
zm66**Msiz)$ZZoMHz!1HJ1A4cT%z+rf610Hca93eR{%U$B=z0J=Q_zRbXIg&w;5qK
zsLiwj)Mk+pwb??b?IwiU?n0>T0Y<&-sa{^*lMJufC6$-A!pn2sn^WxI<`?UyYW0QI
zq49)k8DjUpS~6|Z3pQQa+qrwl8D1GjB^I70^?0D$Te4$W(T#>@AJYNXeYF9u`w8K?
zzYwkm2;q7l7>4H{RaX6Hh#ib9+<yq*xkE`6<q})@VZpQKFza@>-_4&rM_2)qjwB<K
zjuK+h(Lzi*Mu<trg3;M?9OZEK98bY>C#WizJttZL!6%WC;FE<2K1GP&Q-ugV4U}M!
z(~vt|sJNa%#&c(qDz2Obbg7>_VdU5mJlJ=Z+QhO_8;#G|))t-TXahRW6{7PzAv(_&
zqVob!@kvSHg%pD6a}jyZT}&#+ni|IFC00i6rDP=cG9hv=7b5oxA#$$-Ws9gw^i@KC
zWrt7QT}=%Eyaw>xwWPko_$nv)h0dSrtlRZrH@Mwk1-RWvM%-=^!tG`u+-?!V?N%`A
z=i5{-Ki^J<Utpy2^TOwk4l@3%DcztOSjaVIk}U(v3cPxc^&=JTPRZu|xq`^$oV!d1
zT<_KfxZWd#>%Bs_-Y10X{a_fM2UPiI=FguX_8_uw|3iT19wt?oOKjzb1<#*HtlOi0
zH-G*-W(7=ooQzC*LWoIE3Nh&^AtpTyM(58nl*9S+ECt@&tEyoBJZ}XAzd%NUUlbzv
zB_V=e79#i+P=ZBHWA0U<;`$mH?h2ABuKuFJ9mdwyR!^!+Os<~fKP~u%TF0^?5RKHE
z)(h=#X#?8d7NY$fA==*+qWwKkk(wse?^6h7(g)-{_aUiVY-$*-A6Xf>ACr;Xe+ZHL
zi4eJ;3X%IyP*%wZiT+GjT2$D{2=_VL2<jJr=e{KMofylC!$RlOSJv(8up2DDu>vf=
zB_o#K31RuY5SBj(VfiB%_5Dw(m+yZj!|yCo`F^I3NxBi_A99+S__4zS5=E{nls<66
zvVu&bj#P|ctp?`f*bOW$)<LPYB0hp1T$Er-rdZ_JD1JLRyHZj5jpe^|HqF<8OH#v`
zP~m<RC0@cSh)l)bj2b5Xt__&@hY%CH@HnYVTttY8UBNKGi>k8f|J0stP$1ad0p1i$
zs^L{KQeOX;Ggy}{$8ZkjzY%Jz<+wa$;p%D9dim0(v=FYbZSiDNQ%1Y9q2_yCMY0v(
zoF)vM$(o~q!Fx}F57R_$g86r!cvfO|nWS+0ubAdNLc!g=##~!-W?BbtA=PTT;jTA|
ziBacO3T4KJ7%isl#Hf#u81)qrqkckSv^c03wFGzh`ct91eEK-^U$De2L4TaQB*1gV
zCd~gh^Is9RH2twoKAv+AaTyc6Y)N$Idx*=a3lnj9+l~iTPz4@XQHTdt65@fCg?L~U
zP!mx~w7VD}?0gR~MkQ9o0lr;B8tf-TCc2-Xr@rR(Z$;4!^rf$6(pUGT{{=CF=oxxT
z_xD=ZovdL(2bYBE%Q(SDOyisTqfwvs9O%mZ&XIxCE;kObjxJr0%hpsIT)37H*A5lp
z+F?RmSpjM=<$}RfsSW<yK<2M?Z5rU$bpW1}CJp>5+BP4tga4$CZHdKf0kysZlX7l7
zTGS-^Hs^9hZmOs1T&lU?);B>LkS2Ojp*>x}ZD^Gnsj`1zc56efr7q}Ia2r$25^rr>
zBH2;Q1zUW1!)@!P+PZY7u6~2ftik4L(7Q3CXVX~Q?Y6MmElK5xM4!eE=eTOj%1K@z
zycN|oi6ui@>fl(=1FUX@b*mzsXGx>~rJSH?nHxzXqB{!kT(x=xNB_}QAUa!<Npx@F
zRVFQN4Eb@3D28LnDTdo<YmWk#-WpSGoGMpSD90;DD7V$-ZpOEU?6^LOZpGQ{DL29D
z$JUIV;3kso(2UuRjO`02k>TA}q#>JHE5Ih9Mkv@`i2faf@X-}ZDclj%G?YaWx|6VK
z$`%aRF;c9bUGZYl>03YpD_Pj3UuVJkp$hF5E81rd)K}~o4J?yr=0U)=##B><+ZjoW
zv0VV(ltmhhG10ZTo31xV^qbquZdYrNE&0061k{HDm>o$gU|j>5z}JoBeP1_`ldUOj
z4Se0KO7rzJ<uE<1&AzWQWXB~+zRps}hF+eo);d9GA>+AL($LFoR)9xNjqq~25Y2fZ
zUUouM6+n4ew#dsxVbzqe^Y!wdSYtF_hj$<phtB}`kxm*oT+E{m&-xBdX|A^C9Oox)
z7ENjry)sR8JOt&6ZZ_p{izNC+r)I(JMlC<@NfUj8S?ABkJ*eYrtlH8)!#jEOO7A*<
z*c9BJ)@?6s>=i7kaeGsYOgBC))yB=7rn2qreZggJAGYV*zN9Q&R@=mq;XXoNbG7RM
zZhyAGb1ALQaZPnisdi*A05eSM1K3uR=;N9j>-5@_I=;N)4x}!zQfXNh%XeA|6`54A
z*%rlV6<nn|NG*D^muO5$jXT)a(62q!E>r#CU2un(@P51$H`87h+?{fVT5aEAPAUVA
zhf$f;n=KQ4gV!k2gR2&Yvmwzn)#i>+rnh~LtH=y<N1B*Eest>mUCB|@jbopNjfG;S
z&GvZiXlq!OPPVX<vpvo+YSt~$w?wQZSt#I&W7RG_ye6?SvCg?VJe1Q(PMu%$@3lF1
z9L*B_#hk}w3TgDW;0AZRs=GI(8ak%A6C^3oKh@fh(pZ_z-XP7%uRD?YLlUd_kJtSx
z`6o$G4^e9@x|3Dts~@0k9j$e<ba-*6P)9fyZ|Z1muM79o1$Qd-9CVua)yntCN{vtR
z8~2-;bZxQ)xv6BUJKfqYqj>4vj|zJoYtk`=fqn)X6TR3rY|z^4H@P!aT!ICXMUDGn
zN1^1!vn0BEqKALl=gu~f7Ho#~j12c3bIzS(waYZ}E$``dDZbX-Qpc&I<EVni&t>Dm
ziB&MQH9YFg89#M}b~*Mu8Xb~YG}Si4oo~W?!`lm~jwY;ZZE+V^b^p|?b{;&e%P>Xw
z8PQU37h3(2@?N2%p{Q$RC9hm$G8glYFgo&0cNbgZewql85qyc&F5W3(?oz4~-8+iS
z!!~x8DPL9+rRj6IFUj7l83x&1p=Q0U%dkRbn!8fv#p}2Mo8&bUjCGwmyQ{2kZ+0>5
zu*l4ESF4%kTC$;z)AM55T|>>dUWtBl4^nrn8g@_Aj)u~8%J-}*9YC*FX{*XKuO6?Q
z*1_H1WCyv4E;r33Tm7%rRkq|BlP$p!tCAs9sBCtX!G5Sh@3p=`VtSX}txIHYq+FBe
zXQObA&u_BYJ{nlz{^Vx$jFt8$GiT1^U|39ZJw=Obn^H4S+g_-2x2V<1b9=4R)Vq}?
zS(_65w9l=Z<EGoxxof7$-L6bO42XvN4k`~xtmIF3K7?R*$#G{fUDsHe{CCoX$y17h
zO^SlMi%PEQNaV6MO?b;=il4N(HsY$VHMx7($Yfm1C1-|p_xg2x%{74!-F?*7bTlNE
z>3pu{A5897r!I*_Gff5e0C~?nNLrp=#{d1aTzYhR>GWCYWwTmrnqEG=az|oGMm4*+
zVuvyE&nF+Ut`C#4P-}giB|l<fIQ~AWN{+XW2|4~g4u(hmCsb)i{wI~=aQqb5k?0*9
aPYUj7DtKa?)K;g8=(7~Kz@wH875@*3bRuT}

literal 0
HcmV?d00001

diff --git a/docs/fr/_build/doctrees/themes.doctree b/docs/fr/_build/doctrees/themes.doctree
new file mode 100644
index 0000000000000000000000000000000000000000..8410575b665b1931c7f96c6322502d20acf6d6c3
GIT binary patch
literal 29358
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
SW<J8q{9FzYE|tcrrvC%3@6XKu

literal 0
HcmV?d00001

diff --git a/docs/fr/_build/html/.buildinfo b/docs/fr/_build/html/.buildinfo
new file mode 100644
index 00000000..b8d60d4c
--- /dev/null
+++ b/docs/fr/_build/html/.buildinfo
@@ -0,0 +1,4 @@
+# Sphinx build info version 1
+# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
+config: 169ffeb4c85c990fa0841cda8c347b3b
+tags: fbb0d17656682115ca4d033fb2f83ba1
diff --git a/docs/fr/_build/latex/Makefile b/docs/fr/_build/latex/Makefile
new file mode 100644
index 00000000..5c0d5018
--- /dev/null
+++ b/docs/fr/_build/latex/Makefile
@@ -0,0 +1,58 @@
+# Makefile for Sphinx LaTeX output
+
+ALLDOCS = $(basename $(wildcard *.tex))
+ALLPDF = $(addsuffix .pdf,$(ALLDOCS))
+ALLDVI = $(addsuffix .dvi,$(ALLDOCS))
+
+# Prefix for archive names
+ARCHIVEPRREFIX =
+# Additional LaTeX options
+LATEXOPTS =
+
+all: $(ALLPDF)
+all-pdf: $(ALLPDF)
+all-dvi: $(ALLDVI)
+all-ps: all-dvi
+	for f in *.dvi; do dvips $$f; done
+
+zip: all-$(FMT)
+	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
+	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
+	zip -q -r -9 $(ARCHIVEPREFIX)docs-$(FMT).zip $(ARCHIVEPREFIX)docs-$(FMT)
+	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
+
+tar: all-$(FMT)
+	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
+	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
+	tar cf $(ARCHIVEPREFIX)docs-$(FMT).tar $(ARCHIVEPREFIX)docs-$(FMT)
+	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
+
+bz2: tar
+	bzip2 -9 -k $(ARCHIVEPREFIX)docs-$(FMT).tar
+
+# The number of LaTeX runs is quite conservative, but I don't expect it
+# to get run often, so the little extra time won't hurt.
+%.dvi: %.tex
+	latex $(LATEXOPTS) '$<'
+	latex $(LATEXOPTS) '$<'
+	latex $(LATEXOPTS) '$<'
+	-makeindex -s python.ist '$(basename $<).idx'
+	-makeindex -s python.ist '$(basename mod$<).idx'
+	latex $(LATEXOPTS) '$<'
+	latex $(LATEXOPTS) '$<'
+
+%.pdf: %.tex
+	pdflatex $(LATEXOPTS) '$<'
+	pdflatex $(LATEXOPTS) '$<'
+	pdflatex $(LATEXOPTS) '$<'
+	-makeindex -s python.ist '$(basename $<).idx'
+	-makeindex -s python.ist '$(basename mod$<).idx'
+	pdflatex $(LATEXOPTS) '$<'
+	pdflatex $(LATEXOPTS) '$<'
+
+clean:
+	rm -f *.pdf *.dvi *.ps
+	rm -f *.log *.ind *.aux *.toc *.syn *.idx *.out *.ilg *.pla
+
+.PHONY: all all-pdf all-dvi all-ps clean
+
diff --git a/docs/fr/_build/latex/Raclette.tex b/docs/fr/_build/latex/Raclette.tex
new file mode 100644
index 00000000..78d907f2
--- /dev/null
+++ b/docs/fr/_build/latex/Raclette.tex
@@ -0,0 +1,829 @@
+% Generated by Sphinx.
+\documentclass[letterpaper,10pt,english]{manual}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{babel}
+\usepackage{times}
+\usepackage[Bjarne]{fncychap}
+\usepackage{longtable}
+\usepackage{sphinx}
+
+
+\title{Raclette Documentation}
+\date{January 24, 2011}
+\release{2}
+\author{Alexis Métaireau}
+\newcommand{\sphinxlogo}{}
+\renewcommand{\releasename}{Release}
+\makeindex
+\makemodindex
+
+\makeatletter
+\def\PYG@reset{\let\PYG@it=\relax \let\PYG@bf=\relax%
+    \let\PYG@ul=\relax \let\PYG@tc=\relax%
+    \let\PYG@bc=\relax \let\PYG@ff=\relax}
+\def\PYG@tok#1{\csname PYG@tok@#1\endcsname}
+\def\PYG@toks#1+{\ifx\relax#1\empty\else%
+    \PYG@tok{#1}\expandafter\PYG@toks\fi}
+\def\PYG@do#1{\PYG@bc{\PYG@tc{\PYG@ul{%
+    \PYG@it{\PYG@bf{\PYG@ff{#1}}}}}}}
+\def\PYG#1#2{\PYG@reset\PYG@toks#1+\relax+\PYG@do{#2}}
+
+\def\PYG@tok@gd{\def\PYG@tc##1{\textcolor[rgb]{0.63,0.00,0.00}{##1}}}
+\def\PYG@tok@gu{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.50,0.00,0.50}{##1}}}
+\def\PYG@tok@gt{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.25,0.82}{##1}}}
+\def\PYG@tok@gs{\let\PYG@bf=\textbf}
+\def\PYG@tok@gr{\def\PYG@tc##1{\textcolor[rgb]{1.00,0.00,0.00}{##1}}}
+\def\PYG@tok@cm{\let\PYG@it=\textit\def\PYG@tc##1{\textcolor[rgb]{0.25,0.50,0.56}{##1}}}
+\def\PYG@tok@vg{\def\PYG@tc##1{\textcolor[rgb]{0.73,0.38,0.84}{##1}}}
+\def\PYG@tok@m{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
+\def\PYG@tok@mh{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
+\def\PYG@tok@cs{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.50,0.56}{##1}}\def\PYG@bc##1{\colorbox[rgb]{1.00,0.94,0.94}{##1}}}
+\def\PYG@tok@ge{\let\PYG@it=\textit}
+\def\PYG@tok@vc{\def\PYG@tc##1{\textcolor[rgb]{0.73,0.38,0.84}{##1}}}
+\def\PYG@tok@il{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
+\def\PYG@tok@go{\def\PYG@tc##1{\textcolor[rgb]{0.19,0.19,0.19}{##1}}}
+\def\PYG@tok@cp{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
+\def\PYG@tok@gi{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.63,0.00}{##1}}}
+\def\PYG@tok@gh{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.00,0.50}{##1}}}
+\def\PYG@tok@ni{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.84,0.33,0.22}{##1}}}
+\def\PYG@tok@nl{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.13,0.44}{##1}}}
+\def\PYG@tok@nn{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.05,0.52,0.71}{##1}}}
+\def\PYG@tok@no{\def\PYG@tc##1{\textcolor[rgb]{0.38,0.68,0.84}{##1}}}
+\def\PYG@tok@na{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
+\def\PYG@tok@nb{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
+\def\PYG@tok@nc{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.05,0.52,0.71}{##1}}}
+\def\PYG@tok@nd{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.33,0.33,0.33}{##1}}}
+\def\PYG@tok@ne{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
+\def\PYG@tok@nf{\def\PYG@tc##1{\textcolor[rgb]{0.02,0.16,0.49}{##1}}}
+\def\PYG@tok@si{\let\PYG@it=\textit\def\PYG@tc##1{\textcolor[rgb]{0.44,0.63,0.82}{##1}}}
+\def\PYG@tok@s2{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
+\def\PYG@tok@vi{\def\PYG@tc##1{\textcolor[rgb]{0.73,0.38,0.84}{##1}}}
+\def\PYG@tok@nt{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.02,0.16,0.45}{##1}}}
+\def\PYG@tok@nv{\def\PYG@tc##1{\textcolor[rgb]{0.73,0.38,0.84}{##1}}}
+\def\PYG@tok@s1{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
+\def\PYG@tok@gp{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.78,0.36,0.04}{##1}}}
+\def\PYG@tok@sh{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
+\def\PYG@tok@ow{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
+\def\PYG@tok@sx{\def\PYG@tc##1{\textcolor[rgb]{0.78,0.36,0.04}{##1}}}
+\def\PYG@tok@bp{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
+\def\PYG@tok@c1{\let\PYG@it=\textit\def\PYG@tc##1{\textcolor[rgb]{0.25,0.50,0.56}{##1}}}
+\def\PYG@tok@kc{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
+\def\PYG@tok@c{\let\PYG@it=\textit\def\PYG@tc##1{\textcolor[rgb]{0.25,0.50,0.56}{##1}}}
+\def\PYG@tok@mf{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
+\def\PYG@tok@err{\def\PYG@bc##1{\fcolorbox[rgb]{1.00,0.00,0.00}{1,1,1}{##1}}}
+\def\PYG@tok@kd{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
+\def\PYG@tok@ss{\def\PYG@tc##1{\textcolor[rgb]{0.32,0.47,0.09}{##1}}}
+\def\PYG@tok@sr{\def\PYG@tc##1{\textcolor[rgb]{0.14,0.33,0.53}{##1}}}
+\def\PYG@tok@mo{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
+\def\PYG@tok@mi{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
+\def\PYG@tok@kn{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
+\def\PYG@tok@o{\def\PYG@tc##1{\textcolor[rgb]{0.40,0.40,0.40}{##1}}}
+\def\PYG@tok@kr{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
+\def\PYG@tok@s{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
+\def\PYG@tok@kp{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
+\def\PYG@tok@w{\def\PYG@tc##1{\textcolor[rgb]{0.73,0.73,0.73}{##1}}}
+\def\PYG@tok@kt{\def\PYG@tc##1{\textcolor[rgb]{0.56,0.13,0.00}{##1}}}
+\def\PYG@tok@sc{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
+\def\PYG@tok@sb{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
+\def\PYG@tok@k{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
+\def\PYG@tok@se{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
+\def\PYG@tok@sd{\let\PYG@it=\textit\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
+
+\def\PYGZbs{\char`\\}
+\def\PYGZus{\char`\_}
+\def\PYGZob{\char`\{}
+\def\PYGZcb{\char`\}}
+\def\PYGZca{\char`\^}
+\def\PYGZsh{\char`\#}
+\def\PYGZpc{\char`\%}
+\def\PYGZdl{\char`\$}
+\def\PYGZti{\char`\~}
+% for compatibility with earlier versions
+\def\PYGZat{@}
+\def\PYGZlb{[}
+\def\PYGZrb{]}
+\makeatother
+
+\begin{document}
+
+\maketitle
+\tableofcontents
+\hypertarget{--doc-index}{}
+
+
+Pelican est un generateur de blog simple codé en python
+\begin{itemize}
+\item {} 
+Écrivez vos articles directement dans votre éditeur favori (vim !) et
+directement en syntaxe reStructuredText ou Markdown ;
+
+\item {} 
+Un outil simple en ligne de conmmande pour (re)générer le blog ;
+
+\item {} 
+Sortie complètement statique, facile pour l'héberger n'importe où ;
+
+\end{itemize}
+
+
+\chapter{Fonctionnalités}
+
+Pelican supporte actuellement :
+\begin{itemize}
+\item {} 
+des articles de blog ;
+
+\item {} 
+des pages statiques ;
+
+\item {} 
+les commentaires via un service externe (\href{http://disqus.com}{disqus})
+Notez qu'étant bien un service externe assez pratique, vous ne gérez pas
+vous même les commentaires. Ce qui pourrait occasionner une perte de vos données;
+
+\item {} 
+support de template (les templates sont crées avec Jinja 2 \href{http://jinjna.pocoo.org}{jinja2}) ;
+
+\item {} 
+génération optionnelle de vos pages et articles en pdf.
+
+\end{itemize}
+
+
+\chapter{Pourquoi le nom ``Pelican'' ?}
+
+Vous n'avez pas remarqué ? ''Pelican'' est un anagramme pour ``Calepin'' ;)
+
+
+\chapter{Code source}
+
+Vous pouvez accéder au code source via mercurial sur  \href{http://hg.notmyidea.org/pelican/}{http://hg.notmyidea.org/pelican/}
+ou via git à l'adresse \href{http://github.com/ametaireau/pelican/}{http://github.com/ametaireau/pelican/}
+
+
+\chapter{Feedback !}
+
+Si vous voulez de nouvelles fonctionnalitées pour Pelican, n'hésitez pas à me le dire,
+à cloner le dépôt, etc … C'est open source !!!
+
+Contactez moi à ``alexis at notmyidea dot org'' pour quelques requêtes ou retour d'expérience que ce soi !
+
+
+\chapter{Documentation}
+
+\resetcurrentobjects
+\hypertarget{--doc-getting\_started}{}
+
+\section{Installation et mise à jour de Pelican}
+
+
+\subsection{Installation}
+
+Il y a deux façons d’installer Pelican sur son système. La première est via l’utilitaire
+pip, l’autre façon est de télécharger Pelican via Github. Ici nous allons voir les deux
+façons de procéder.
+
+
+\subsubsection{Via pip}
+
+Pour installer Pelican via pip, vous aurez besoin du paquet python-pip. puis installez Pelican
+
+\begin{Verbatim}[commandchars=\\\{\}]
+\PYG{c}{\PYGZsh{} apt-get install python-pip}
+\PYG{c}{\PYGZsh{} pip install pelican}
+\end{Verbatim}
+
+
+\subsubsection{Via Github}
+
+Pour installer Pelican en reprenant le code via Github, nous aurons besoin du paquet
+git-core pour récupérez les sources de Pelican. Puis nous procédons à l’installation
+
+\begin{Verbatim}[commandchars=@\[\]]
+@# apt-get install git-core
+@$ git clone https://github.com/ametaireau/pelican.git
+@$ cd pelican
+@# python setup.py install
+\end{Verbatim}
+
+
+\subsection{Mises à jour}
+
+
+\subsubsection{Via pip}
+
+Rien de bien compliqué pour mettre à jour via pip
+
+\begin{Verbatim}[commandchars=@\[\]]
+@$ cd votreRepertoireSource
+@$ pip install --upgrade pelican
+\end{Verbatim}
+
+
+\subsubsection{Via Github}
+
+C'est un peu plus long avec Github par contre
+
+\begin{Verbatim}[commandchars=@\[\]]
+@$ cd votreRepertoireSource
+@$ git pull origin master
+@$ cd pelican
+@# python setup.py install
+\end{Verbatim}
+
+Vous aurez un message d’erreur si le module setuptools de python n’est pas installé.
+La manipulation est la suivante
+
+\begin{Verbatim}[commandchars=\\\{\}]
+\PYG{c}{\PYGZsh{} apt-get install python-setuptools}
+\end{Verbatim}
+
+
+\subsection{Alors, quelle méthode choisir ?}
+
+Vous avez le choix entre deux méthodes, mais aussi entre deux concepts. La méthode
+de Github est la version de développement, où les modifications arrivent assez
+fréquemment sans être testées à fond. La version de pip est une version arrêtée avec un
+numéro de version dans laquelle vous aurez moins de bug. N’oubliez cependant pas
+que le projet est très jeune et manque donc de maturité. Si vous aimez avoir les toutes
+dernières versions utilisez Github, sinon penchez vous sur pip.
+
+\resetcurrentobjects
+\hypertarget{--doc-settings}{}
+
+\section{Settings}
+
+
+\subsection{Specifying the settings}
+
+Pelican is configurable thanks to a configuration file, that you can pass to
+the command line:
+
+\begin{Verbatim}[commandchars=@\[\]]
+@$ pelican -s path/to/your/settingsfile.py path
+\end{Verbatim}
+
+Settings are given as the form of a python module (a file). You can have an
+example by looking at \href{https://github.com/ametaireau/pelican/raw/master/samples/pelican.conf.py}{/samples/pelican.conf.py}
+
+All the settings identifiers must be set in caps, otherwise they will not be
+processed.
+
+Here are the available settings. Please note that all the settings you put in
+this file will be passed to the templates as well.
+
+\begin{tabulary}{\textwidth}{|L|L|}
+\hline
+\textbf{
+Setting name
+} & \textbf{
+what it does ?
+}\\
+\hline
+
+\emph{AUTHOR}
+ & 
+Default author (put your name)
+\\
+
+\emph{CATEGORY\_FEED}
+ & 
+Where to put the atom categories feeds. default is
+\emph{feeds/\%s.atom.xml}, where \%s is the name of the
+category.
+\\
+
+\emph{CATEGORY\_FEED\_RSS}
+ & 
+Where to put the categories rss feeds. default is None
+(no rss)
+\\
+
+\emph{CSS\_FILE}
+ & 
+To specify the CSS file you want to load, if it's not
+the default one (`main.css')
+\\
+
+\emph{DEFAULT\_CATEGORY}
+ & 
+The default category to fallback on. \emph{misc} by default.
+\\
+
+\emph{DEFAULT\_LANG}
+ & 
+The default language to use. Default is `en'.
+\\
+
+\emph{DISPLAY\_PAGES\_ON\_MENU}
+ & 
+Display or not the pages on the menu of the template.
+Templates can follow or not this settings.
+\\
+
+\emph{FALLBACK\_ON\_FS\_DATE}
+ & 
+If True, pelican will use the file system dates infos
+(mtime) if it can't get informations from the
+metadata?
+\\
+
+\emph{FEED}
+ & 
+relative url to output the atom feed. Default is
+\emph{feeds/all.atom.xml}
+\\
+
+\emph{FEED\_RSS}
+ & 
+relative url to output the rss feed. Default is
+None (no rss)
+\\
+
+\emph{JINJA\_EXTENSIONS}
+ & 
+A list of any Jinja2 extensions you want to use.
+Default is no extensions (the empty list).
+\\
+
+\emph{KEEP\_OUTPUT\_DIRECTORY}
+ & 
+Keep the output directory and just update all the generated files.
+Default is to delete the output directory.
+\\
+
+\emph{MARKUP}
+ & 
+A list of available markup languages you want to use.
+For the moment, only available values are \emph{rst} and \emph{md}.
+\\
+
+\emph{OUTPUT\_PATH}
+ & 
+Where to output the generated files. Default to
+``output''
+\\
+
+\emph{PATH}
+ & 
+path to look at for input files.
+\\
+
+\emph{PDF\_PROCESSOR}
+ & 
+Put True if you want to have PDF versions of your
+documents. You will need to install \emph{rst2pdf}.
+\\
+
+\emph{REVERSE\_ARCHIVE\_ORDER}
+ & 
+Reverse the archives order. (True makes it in
+descending order: the newer first)
+\\
+
+\emph{SITEURL}
+ & 
+base URL of your website.
+\\
+
+\emph{SITENAME}
+ & 
+Your site name,
+\\
+
+\emph{STATIC\_PATHS}
+ & 
+The static paths you want to have accessible on the
+output path ``static''. By default, pelican will copy
+the `images' folder to the output folder.
+\\
+
+\emph{STATIC\_THEME\_PATHS}
+ & 
+Static theme paths you want to copy. Default values
+is \emph{static}, but if your theme have others static paths,
+you can put them here.
+\\
+
+\emph{THEME}
+ & 
+theme to use to product the output. can be the
+complete static path to a theme folder, or chosen
+between the list of default themes (see below)
+\\
+
+\emph{TRANSLATION\_FEED}
+ & 
+Where to put the RSS feed for translations. Default
+is feeds/all-\%s.atom.xml where \%s is the name of the
+lang.
+\\
+\hline
+\end{tabulary}
+
+
+
+\subsection{Themes}
+
+3 themes are available. You can specify them using the \emph{-t} option:
+\begin{itemize}
+\item {} 
+notmyidea
+
+\item {} 
+simple (a synonym for ``full text'' :)
+
+\item {} 
+martyalchin
+
+\end{itemize}
+
+You can define your own theme too, and specify it's emplacement in the same
+way (be sure to specify the full absolute path to it).
+
+Here is \href{http://alexis.notmyidea.org/pelican/themes.html}{a guide on how to create your theme}
+
+The \emph{notmyidea} theme can make good use of the following settings. I recommend
+to use them too in your themes.
+
+\begin{tabulary}{\textwidth}{|L|L|}
+\hline
+\textbf{
+Setting name
+} & \textbf{
+what it does ?
+}\\
+\hline
+
+\emph{DISQUS\_SITENAME}
+ & 
+Pelican can handle disqus comments, specify the
+sitename you've filled in on disqus
+\\
+
+\emph{GITHUB\_URL}
+ & 
+Your github URL (if you have one), it will then
+use it to create a github ribbon.
+\\
+
+\emph{GOOGLE\_ANALYTICS}
+ & 
+`UA-XXXX-YYYY' to activate google analytics.
+\\
+
+\emph{LINKS}
+ & 
+A list of tuples (Title, Url) for links to appear on
+the header.
+\\
+
+\emph{SOCIAL}
+ & 
+A list of tuples (Title, Url) to appear in the ``social''
+section.
+\\
+
+\emph{TWITTER\_USERNAME}
+ & 
+Allows to add a button on the articles to tweet about
+them. Add you twitter username if you want this
+button to appear.
+\\
+\hline
+\end{tabulary}
+
+
+In addition, you can use the ``wide'' version of the \emph{notmyidea} theme, by
+adding that in your configuration:
+
+\begin{Verbatim}[commandchars=\\\{\}]
+\PYG{n}{CSS\PYGZus{}FILE} \PYG{o}{=} \PYG{l+s}{"}\PYG{l+s}{wide.css}\PYG{l+s}{"}
+\end{Verbatim}
+
+\resetcurrentobjects
+\hypertarget{--doc-themes}{}
+
+\hypertarget{theming-pelican}{}\section{How to create themes for pelican}
+
+Pelican uses the great \href{http://jinjna.pocoo.org}{jinja2} templating engine to
+generate it's HTML output. The jinja2 syntax is really simple. If you want to
+create your own theme, feel free to take inspiration from the ``simple'' theme,
+which is available \href{https://github.com/ametaireau/pelican/tree/master/pelican/themes/simple/templates}{here}
+
+
+\subsection{Structure}
+
+To make your own theme, you must follow the following structure:
+
+\begin{Verbatim}[commandchars=@\[\]]
+├-- static
+@textbar[]   ├-- css
+@textbar[]   └-- images
+└-- templates
+    ├-- archives.html    // to display archives
+    ├-- article.html     // processed for each article
+    ├-- categories.html  // must list all the categories
+    ├-- category.html    // processed for each category
+    ├-- index.html       // the index. List all the articles
+    ├-- page.html        // processed for each page
+    ├-- tag.html         // processed for each tag
+    └-- tags.html        // must list all the tags. Can be a tag cloud.
+\end{Verbatim}
+\begin{itemize}
+\item {} 
+\emph{static} contains all the static content. It will be copied on the output
+\emph{theme/static} folder then. I've put the css and image folders, but they are
+just examples. Put what you need here.
+
+\item {} 
+\emph{templates} contains all the templates that will be used to generate the content.
+I've just put the mandatory templates here, you can define your own if it helps
+you to organize yourself while doing the theme.
+
+\end{itemize}
+
+
+\subsection{Templates and variables}
+
+It's using a simple syntax, that you can embbed into your html pages.
+This document describes which templates should exists on a theme, and which
+variables will be passed to each template, while generating it.
+
+All templates will receive the variables defined in your settings file, if they
+are in caps. You can access them directly.
+
+
+\subsubsection{Common variables}
+
+All of those settings will be given to all templates.
+
+\begin{tabulary}{\textwidth}{|L|L|}
+\hline
+\textbf{
+Variable
+} & \textbf{
+Description
+}\\
+\hline
+
+articles
+ & 
+That's the list of articles, ordsered desc. by date
+all the elements are \emph{Article} objects, so you can
+access their properties (e.g. title, summary, author
+etc.
+\\
+
+dates
+ & 
+The same list of article, but ordered by date,
+ascending
+\\
+
+tags
+ & 
+A dict containing each tags (keys), and the list of
+relative articles.
+\\
+
+categories
+ & 
+A dict containing each category (keys), and the
+list of relative articles.
+\\
+
+pages
+ & 
+The list of pages
+\\
+\hline
+\end{tabulary}
+
+
+
+\subsubsection{category.html}
+
+This template will be processed for each of the existing categories, and will
+finally remain at output/category/\emph{category\_name}.html.
+
+\begin{tabulary}{\textwidth}{|L|L|}
+\hline
+\textbf{
+Variable
+} & \textbf{
+Description
+}\\
+\hline
+
+articles
+ & 
+The articles of this category
+\\
+
+category
+ & 
+The name of the category being processed
+\\
+\hline
+\end{tabulary}
+
+
+
+\subsubsection{article.html}
+
+This template will be processed for each article. .html files will be outputed
+in output/\emph{article\_name}.html. Here are the specific variables it gets.
+
+\begin{tabulary}{\textwidth}{|L|L|}
+\hline
+\textbf{
+Variable
+} & \textbf{
+Description
+}\\
+\hline
+
+article
+ & 
+The article object to be displayed
+\\
+
+category
+ & 
+The name of the category of the current article
+\\
+\hline
+\end{tabulary}
+
+
+
+\subsubsection{tag.html}
+
+For each tag, this template will be processed. It will create .html files in
+/output/tag/\emph{tag\_name}.html
+
+\begin{tabulary}{\textwidth}{|L|L|}
+\hline
+\textbf{
+Variable
+} & \textbf{
+Description
+}\\
+\hline
+
+tag
+ & 
+The name of the tag being processed
+\\
+
+articles
+ & 
+Articles related to this tag
+\\
+\hline
+\end{tabulary}
+
+
+\resetcurrentobjects
+\hypertarget{--doc-internals}{}
+
+\section{Pelican internals}
+
+This section describe how pelican is working internally. As you'll see, it's
+quite simple, but a bit of documentation doesn't hurt :)
+
+
+\subsection{Overall structure}
+
+What \emph{pelican} does, is taking a list of files, and processing them, to some
+sort of output. Usually, the files are restructured text and markdown files,
+and the output is a blog, but it can be anything you want.
+
+I've separated the logic in different classes and concepts:
+\begin{itemize}
+\item {} 
+\emph{writers} are responsible of all the writing process of the
+files. It's writing .html files, RSS feeds and so on. Since those operations
+are commonly used, the object is created once, and then passed to the
+generators.
+
+\item {} 
+\emph{readers} are used to read from various formats (Markdown, and Restructured
+Text for now, but the system is extensible). Given a file, they return
+metadata (author, tags, category etc) and content (HTML formated)
+
+\item {} 
+\emph{generators} generate the different outputs. For instance, pelican comes with
+\emph{ArticlesGenerator} and \emph{PageGenerator}, into others. Given
+a configurations, they can do whatever they want. Most of the time it's
+generating files from inputs.
+
+\item {} 
+\emph{pelican} also uses \emph{templates}, so it's easy to write you own theme. The
+syntax is \emph{jinja2}, and, trust me, really easy to learn, so don't hesitate
+a second.
+
+\end{itemize}
+
+
+\subsection{How to implement a new reader ?}
+
+There is an awesome markup language you want to add to pelican ?
+Well, the only thing you have to do is to create a class that have a \emph{read}
+method, that is returning an HTML content and some metadata.
+
+Take a look to the Markdown reader:
+
+\begin{Verbatim}[commandchars=\\\{\}]
+\PYG{k}{class} \PYG{n+nc}{MarkdownReader}\PYG{p}{(}\PYG{n+nb}{object}\PYG{p}{)}\PYG{p}{:}
+
+    \PYG{k}{def} \PYG{n+nf}{read}\PYG{p}{(}\PYG{n+nb+bp}{self}\PYG{p}{,} \PYG{n}{filename}\PYG{p}{)}\PYG{p}{:}
+        \PYG{l+s+sd}{"""Parse content and metadata of markdown files"""}
+        \PYG{n}{text} \PYG{o}{=} \PYG{n+nb}{open}\PYG{p}{(}\PYG{n}{filename}\PYG{p}{)}
+        \PYG{n}{md} \PYG{o}{=} \PYG{n}{Markdown}\PYG{p}{(}\PYG{n}{extensions} \PYG{o}{=} \PYG{p}{[}\PYG{l+s}{'}\PYG{l+s}{meta}\PYG{l+s}{'}\PYG{p}{,} \PYG{l+s}{'}\PYG{l+s}{codehilite}\PYG{l+s}{'}\PYG{p}{]}\PYG{p}{)}
+        \PYG{n}{content} \PYG{o}{=} \PYG{n}{md}\PYG{o}{.}\PYG{n}{convert}\PYG{p}{(}\PYG{n}{text}\PYG{p}{)}
+
+        \PYG{n}{metadatas} \PYG{o}{=} \PYG{p}{\PYGZob{}}\PYG{p}{\PYGZcb{}}
+        \PYG{k}{for} \PYG{n}{name}\PYG{p}{,} \PYG{n}{value} \PYG{o+ow}{in} \PYG{n}{md}\PYG{o}{.}\PYG{n}{Meta}\PYG{o}{.}\PYG{n}{items}\PYG{p}{(}\PYG{p}{)}\PYG{p}{:}
+            \PYG{k}{if} \PYG{n}{name} \PYG{o+ow}{in} \PYG{n}{\PYGZus{}METADATAS\PYGZus{}FIELDS}\PYG{p}{:}
+                \PYG{n}{meta} \PYG{o}{=} \PYG{n}{\PYGZus{}METADATAS\PYGZus{}FIELDS}\PYG{p}{[}\PYG{n}{name}\PYG{p}{]}\PYG{p}{(}\PYG{n}{value}\PYG{p}{[}\PYG{l+m+mi}{0}\PYG{p}{]}\PYG{p}{)}
+            \PYG{k}{else}\PYG{p}{:}
+                \PYG{n}{meta} \PYG{o}{=} \PYG{n}{value}\PYG{p}{[}\PYG{l+m+mi}{0}\PYG{p}{]}
+            \PYG{n}{metadatas}\PYG{p}{[}\PYG{n}{name}\PYG{o}{.}\PYG{n}{lower}\PYG{p}{(}\PYG{p}{)}\PYG{p}{]} \PYG{o}{=} \PYG{n}{meta}
+        \PYG{k}{return} \PYG{n}{content}\PYG{p}{,} \PYG{n}{metadatas}
+\end{Verbatim}
+
+Simple isn't it ?
+
+
+\subsection{How to implement a new generator ?}
+
+Generators have basically two important methods. You're not forced to create
+both, only the existing ones will be called.
+\begin{itemize}
+\item {} 
+\emph{generate\_context}, that is called in a first place, for all the generators.
+Do whatever you have to do, and update the global context if needed. This
+context is shared between all generators, and will be passed to the
+templates. For instance, the \emph{PageGenerator} \emph{generate\_context} method find
+all the pages, transform them into objects, and populate the context with
+them. Be careful to \emph{not} output anything using this context at this stage,
+as it is likely to change by the effect of others generators.
+
+\item {} 
+\emph{generate\_output} is then called. And guess what is it made for ? Oh,
+generating the output :) That's here that you may want to look at the context
+and call the methods of the \emph{writer} object, that is passed at the first
+argument of this function. In the \emph{PageGenerator} example, this method will
+look at all the pages recorded in the global context, and output a file on
+the disk (using the writer method \emph{write\_file}) for each page encountered.
+
+\end{itemize}
+
+\resetcurrentobjects
+\hypertarget{--doc-faq}{}
+
+\section{Frequently Asked Questions (FAQ)}
+
+Here is a summary of the frequently asked questions for pelican.
+
+
+\subsection{Is it mandatory to have a configuration file ?}
+
+No, it's not. Configurations files are just an easy way to configure pelican.
+For the basic operations, it's possible to specify options while invoking
+pelican with the command line (see \emph{pelican --help} for more informations about
+that)
+
+
+\subsection{I'm creating my own theme, how to use pygments ?}
+
+Pygment add some classes to the generated content, so the theming of your theme
+will be done thanks to a css file. You can have a look to the one proposed by
+default \href{http://pygments.org/demo/15101/}{on the project website}
+
+
+\subsection{How do I create my own theme ?}
+
+Please refer yourself to \hyperlink{theming-pelican}{\emph{How to create themes for pelican}}.
+
+
+\subsection{How can I help ?}
+
+You have different options to help. First, you can use pelican, and report any
+idea or problem you have on \href{http://github.com/ametaireau/pelican/issues}{the bugtracker}.
+
+If you want to contribute, please have a look to \href{https://github.com/ametaireau/pelican/}{the git repository}, fork it, add your changes and do
+a pull request, I'll review them as soon as possible.
+
+You can also contribute by creating themes, and making the documentation
+better.
+
+
+\renewcommand{\indexname}{Module Index}
+\printmodindex
+\renewcommand{\indexname}{Index}
+\printindex
+\end{document}
diff --git a/docs/fr/_build/latex/fncychap.sty b/docs/fr/_build/latex/fncychap.sty
new file mode 100644
index 00000000..9a56c04e
--- /dev/null
+++ b/docs/fr/_build/latex/fncychap.sty
@@ -0,0 +1,683 @@
+%%% Copyright   Ulf A. Lindgren
+%%%
+%%% Note        Premission is granted to modify this file under
+%%%             the condition that it is saved using another
+%%%             file and package name.
+%%%
+%%% Revision    1.1 (1997)
+%%%
+%%%             Jan. 8th Modified package name base date option
+%%%             Jan. 22th Modified FmN and FmTi for error in book.cls
+%%%                  \MakeUppercase{#}->{\MakeUppercase#}
+%%%             Apr. 6th Modified Lenny option to prevent undesired 
+%%%                  skip of line.
+%%%             Nov. 8th Fixed \@chapapp for AMS
+%%%
+%%% Revision    1.2 (1998)
+%%%
+%%%             Feb. 11th Fixed appendix problem related to Bjarne
+%%%             Aug. 11th Fixed problem related to 11pt and 12pt 
+%%%                  suggested by Tomas Lundberg. THANKS!
+%%%
+%%% Revision    1.3 (2004)
+%%%             Sep. 20th problem with frontmatter, mainmatter and
+%%%                  backmatter, pointed out by Lapo Mori
+%%%
+%%% Revision    1.31 (2004)
+%%%             Sep. 21th problem with the Rejne definition streched text
+%%%                  caused ugly gaps in the vrule aligned with the title
+%%%                  text. Kindly pointed out to me by Hendri Adriaens
+%%%
+%%% Revision    1.32 (2005)
+%%%             Jun. 23th compatibility problem with the KOMA class 'scrbook.cls'
+%%%                  a remedy is a redefinition of '\@schapter' in
+%%%                  line with that used in KOMA. The problem was pointed
+%%%                  out to me by Mikkel Holm Olsen
+%%%
+%%% Revision    1.33 (2005)
+%%%             Aug. 9th misspelled ``TWELV'' corrected, the error was pointed
+%%%                  out to me by George Pearson
+%%%
+%%% Revision    1.34 (2007)
+%%%             Added an alternative to Lenny provided by Peter
+%%%             Osborne (2005-11-28)
+%%%             Corrected front, main and back matter, based on input
+%%%             from Bas van Gils (2006-04-24)
+%%%             Jul. 30th Added Bjornstrup option provided by Jean-Marc
+%%%             Francois (2007-01-05).
+%%%             Reverted to \MakeUppercase{#} see rev 1.1, solved
+%%%             problem with MakeUppercase and MakeLowercase pointed
+%%%             out by Marco Feuerstein  (2007-06-06) 
+
+
+%%% Last modified   Jul. 2007
+
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesPackage{fncychap}
+             [2007/07/30 v1.34
+                 LaTeX package (Revised chapters)]
+
+%%%% For conditional inclusion of color
+\newif\ifusecolor
+\usecolorfalse
+
+
+
+%%%% DEFINITION OF Chapapp variables
+\newcommand{\CNV}{\huge\bfseries}
+\newcommand{\ChNameVar}[1]{\renewcommand{\CNV}{#1}}
+
+
+%%%% DEFINITION OF TheChapter variables
+\newcommand{\CNoV}{\huge\bfseries}
+\newcommand{\ChNumVar}[1]{\renewcommand{\CNoV}{#1}}
+
+\newif\ifUCN
+\UCNfalse
+\newif\ifLCN
+\LCNfalse
+\def\ChNameLowerCase{\LCNtrue\UCNfalse}
+\def\ChNameUpperCase{\UCNtrue\LCNfalse}
+\def\ChNameAsIs{\UCNfalse\LCNfalse}
+
+%%%%% Fix for AMSBook 971008
+
+\@ifundefined{@chapapp}{\let\@chapapp\chaptername}{}
+
+
+%%%%% Fix for Bjarne and appendix 980211
+
+\newif\ifinapp
+\inappfalse
+\renewcommand\appendix{\par
+  \setcounter{chapter}{0}%
+  \setcounter{section}{0}%
+  \inapptrue%
+  \renewcommand\@chapapp{\appendixname}%
+  \renewcommand\thechapter{\@Alph\c@chapter}}
+
+%%%%% Fix for frontmatter, mainmatter, and backmatter 040920
+
+\@ifundefined{@mainmatter}{\newif\if@mainmatter \@mainmattertrue}{}
+
+%%%%%
+
+
+
+\newcommand{\FmN}[1]{%
+\ifUCN
+   {\MakeUppercase{#1}}\LCNfalse
+\else
+   \ifLCN
+      {\MakeLowercase{#1}}\UCNfalse
+   \else #1
+   \fi
+\fi}
+
+
+%%%% DEFINITION OF Title variables
+\newcommand{\CTV}{\Huge\bfseries}
+\newcommand{\ChTitleVar}[1]{\renewcommand{\CTV}{#1}}
+
+%%%% DEFINITION OF the basic rule width
+\newlength{\RW}
+\setlength{\RW}{1pt}
+\newcommand{\ChRuleWidth}[1]{\setlength{\RW}{#1}}
+
+\newif\ifUCT
+\UCTfalse
+\newif\ifLCT
+\LCTfalse
+\def\ChTitleLowerCase{\LCTtrue\UCTfalse}
+\def\ChTitleUpperCase{\UCTtrue\LCTfalse}
+\def\ChTitleAsIs{\UCTfalse\LCTfalse}
+\newcommand{\FmTi}[1]{%
+\ifUCT
+   {\MakeUppercase{#1}}\LCTfalse
+\else
+   \ifLCT
+      {\MakeLowercase{#1}}\UCTfalse
+   \else {#1}
+   \fi
+\fi}
+
+
+
+\newlength{\mylen}
+\newlength{\myhi}
+\newlength{\px}
+\newlength{\py}
+\newlength{\pyy}
+\newlength{\pxx}
+
+
+\def\mghrulefill#1{\leavevmode\leaders\hrule\@height #1\hfill\kern\z@}
+
+\newcommand{\DOCH}{%
+  \CNV\FmN{\@chapapp}\space \CNoV\thechapter
+  \par\nobreak
+  \vskip 20\p@
+  }
+\newcommand{\DOTI}[1]{%
+    \CTV\FmTi{#1}\par\nobreak
+    \vskip 40\p@
+    }
+\newcommand{\DOTIS}[1]{%
+    \CTV\FmTi{#1}\par\nobreak
+    \vskip 40\p@
+    }
+
+%%%%%% SONNY DEF
+
+\DeclareOption{Sonny}{%
+  \ChNameVar{\Large\sf}
+  \ChNumVar{\Huge}
+  \ChTitleVar{\Large\sf}
+  \ChRuleWidth{0.5pt}
+  \ChNameUpperCase
+  \renewcommand{\DOCH}{%
+    \raggedleft
+    \CNV\FmN{\@chapapp}\space \CNoV\thechapter
+    \par\nobreak
+    \vskip 40\p@}
+  \renewcommand{\DOTI}[1]{%
+    \CTV\raggedleft\mghrulefill{\RW}\par\nobreak
+    \vskip 5\p@
+    \CTV\FmTi{#1}\par\nobreak
+    \mghrulefill{\RW}\par\nobreak
+    \vskip 40\p@}
+  \renewcommand{\DOTIS}[1]{%
+    \CTV\raggedleft\mghrulefill{\RW}\par\nobreak
+    \vskip 5\p@
+    \CTV\FmTi{#1}\par\nobreak
+    \mghrulefill{\RW}\par\nobreak
+    \vskip 40\p@}
+}
+
+%%%%%% LENNY DEF
+
+\DeclareOption{Lenny}{%
+
+  \ChNameVar{\fontsize{14}{16}\usefont{OT1}{phv}{m}{n}\selectfont}
+  \ChNumVar{\fontsize{60}{62}\usefont{OT1}{ptm}{m}{n}\selectfont}
+  \ChTitleVar{\Huge\bfseries\rm}
+  \ChRuleWidth{1pt}
+  \renewcommand{\DOCH}{%
+    \settowidth{\px}{\CNV\FmN{\@chapapp}}
+    \addtolength{\px}{2pt}
+    \settoheight{\py}{\CNV\FmN{\@chapapp}}
+    \addtolength{\py}{1pt}
+
+    \settowidth{\mylen}{\CNV\FmN{\@chapapp}\space\CNoV\thechapter}
+    \addtolength{\mylen}{1pt}
+    \settowidth{\pxx}{\CNoV\thechapter}
+    \addtolength{\pxx}{-1pt}
+
+    \settoheight{\pyy}{\CNoV\thechapter}
+    \addtolength{\pyy}{-2pt}
+    \setlength{\myhi}{\pyy}
+    \addtolength{\myhi}{-1\py}
+    \par
+    \parbox[b]{\textwidth}{%
+    \rule[\py]{\RW}{\myhi}%
+    \hskip -\RW%
+    \rule[\pyy]{\px}{\RW}%
+    \hskip -\px%
+    \raggedright%
+    \CNV\FmN{\@chapapp}\space\CNoV\thechapter%
+    \hskip1pt%
+    \mghrulefill{\RW}%
+    \rule{\RW}{\pyy}\par\nobreak%
+    \vskip -\baselineskip%
+    \vskip -\pyy%
+    \hskip \mylen%
+    \mghrulefill{\RW}\par\nobreak%
+    \vskip \pyy}%
+    \vskip 20\p@}
+ 
+
+  \renewcommand{\DOTI}[1]{%
+    \raggedright
+    \CTV\FmTi{#1}\par\nobreak
+    \vskip 40\p@}
+
+  \renewcommand{\DOTIS}[1]{%
+    \raggedright
+    \CTV\FmTi{#1}\par\nobreak
+    \vskip 40\p@}
+ }
+
+%%%%%% Peter Osbornes' version of LENNY DEF
+
+\DeclareOption{PetersLenny}{%
+
+% five new lengths 
+\newlength{\bl}                           %  bottom left   : orig \space
+\setlength{\bl}{6pt}
+\newcommand{\BL}[1]{\setlength{\bl}{#1}}
+\newlength{\br}                           %  bottom right  : orig 1pt
+\setlength{\br}{1pt}
+\newcommand{\BR}[1]{\setlength{\br}{#1}}
+\newlength{\tl}                           %  top left      : orig 2pt
+\setlength{\tl}{2pt}
+\newcommand{\TL}[1]{\setlength{\tl}{#1}}
+\newlength{\trr}                           %  top right      :orig 1pt 
+\setlength{\trr}{1pt}
+\newcommand{\TR}[1]{\setlength{\trr}{#1}}
+\newlength{\blrule}                           %  top right      :orig 1pt 
+\setlength{\trr}{0pt}
+\newcommand{\BLrule}[1]{\setlength{\blrule}{#1}}
+
+
+  \ChNameVar{\fontsize{14}{16}\usefont{OT1}{phv}{m}{n}\selectfont}
+  \ChNumVar{\fontsize{60}{62}\usefont{OT1}{ptm}{m}{n}\selectfont}
+  \ChTitleVar{\Huge\bfseries\rm}
+  \ChRuleWidth{1pt}
+\renewcommand{\DOCH}{%
+
+
+%%%%%%%                                   tweaks for 1--9 and A--Z
+\ifcase\c@chapter\relax%
+\or\BL{-3pt}\TL{-4pt}\BR{0pt}\TR{-6pt}%1
+\or\BL{0pt}\TL{-4pt}\BR{2pt}\TR{-4pt}%2
+\or\BL{0pt}\TL{-4pt}\BR{2pt}\TR{-4pt}%3
+\or\BL{0pt}\TL{5pt}\BR{2pt}\TR{-4pt}%4
+\or\BL{0pt}\TL{3pt}\BR{2pt}\TR{-4pt}%5
+\or\BL{-1pt}\TL{0pt}\BR{2pt}\TR{-2pt}%6
+\or\BL{0pt}\TL{-3pt}\BR{2pt}\TR{-2pt}%7
+\or\BL{0pt}\TL{-3pt}\BR{2pt}\TR{-2pt}%8
+\or\BL{0pt}\TL{-3pt}\BR{-4pt}\TR{-2pt}%9
+\or\BL{-3pt}\TL{-3pt}\BR{2pt}\TR{-7pt}%10
+\or\BL{-6pt}\TL{-6pt}\BR{0pt}\TR{-9pt}%11
+\or\BL{-6pt}\TL{-6pt}\BR{2pt}\TR{-7pt}%12
+\or\BL{-5pt}\TL{-5pt}\BR{0pt}\TR{-9pt}%13
+\or\BL{-6pt}\TL{-6pt}\BR{0pt}\TR{-9pt}%14
+\or\BL{-3pt}\TL{-3pt}\BR{3pt}\TR{-6pt}%15
+\or\BL{-3pt}\TL{-3pt}\BR{3pt}\TR{-6pt}%16
+\or\BL{-5pt}\TL{-3pt}\BR{-8pt}\TR{-6pt}%17
+\or\BL{-5pt}\TL{-5pt}\BR{0pt}\TR{-9pt}%18
+\or\BL{-3pt}\TL{-3pt}\BR{-6pt}\TR{-9pt}%19
+\or\BL{0pt}\TL{0pt}\BR{0pt}\TR{-5pt}%20
+\fi
+
+\ifinapp\ifcase\c@chapter\relax%
+\or\BL{0pt}\TL{14pt}\BR{5pt}\TR{-19pt}%A
+\or\BL{0pt}\TL{-5pt}\BR{-3pt}\TR{-8pt}%B
+\or\BL{-3pt}\TL{-2pt}\BR{1pt}\TR{-6pt}\BLrule{0pt}%C
+\or\BL{0pt}\TL{-5pt}\BR{-3pt}\TR{-8pt}\BLrule{0pt}%D
+\or\BL{0pt}\TL{-5pt}\BR{2pt}\TR{-3pt}%E
+\or\BL{0pt}\TL{-5pt}\BR{-10pt}\TR{-1pt}%F
+\or\BL{-3pt}\TL{0pt}\BR{0pt}\TR{-7pt}%G
+\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}%H
+\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}%I
+\or\BL{2pt}\TL{0pt}\BR{-3pt}\TR{1pt}%J
+\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}%K
+\or\BL{0pt}\TL{-5pt}\BR{2pt}\TR{-19pt}%L
+\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}%M
+\or\BL{0pt}\TL{-5pt}\BR{-2pt}\TR{-1pt}%N
+\or\BL{-3pt}\TL{-2pt}\BR{-3pt}\TR{-11pt}%O
+\or\BL{0pt}\TL{-5pt}\BR{-9pt}\TR{-3pt}%P
+\or\BL{-3pt}\TL{-2pt}\BR{-3pt}\TR{-11pt}%Q
+\or\BL{0pt}\TL{-5pt}\BR{4pt}\TR{-8pt}%R
+\or\BL{-2pt}\TL{-2pt}\BR{-2pt}\TR{-7pt}%S
+\or\BL{-3pt}\TL{0pt}\BR{-5pt}\TR{4pt}\BLrule{8pt}%T
+\or\BL{-7pt}\TL{-11pt}\BR{-5pt}\TR{-7pt}\BLrule{0pt}%U
+\or\BL{-14pt}\TL{-5pt}\BR{-14pt}\TR{-1pt}\BLrule{14pt}%V
+\or\BL{-10pt}\TL{-9pt}\BR{-13pt}\TR{-3pt}\BLrule{7pt}%W
+\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}\BLrule{0pt}%X
+\or\BL{-6pt}\TL{-4pt}\BR{-7pt}\TR{1pt}\BLrule{7pt}%Y
+\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}\BLrule{0pt}%Z
+\fi\fi
+%%%%%%%
+    \settowidth{\px}{\CNV\FmN{\@chapapp}}
+    \addtolength{\px}{\tl}        %MOD change 2pt to \tl
+    \settoheight{\py}{\CNV\FmN{\@chapapp}}
+    \addtolength{\py}{1pt}
+
+    \settowidth{\mylen}{\CNV\FmN{\@chapapp}\space\CNoV\thechapter}
+    \addtolength{\mylen}{\trr}% MOD change 1pt to \tr
+    \settowidth{\pxx}{\CNoV\thechapter}
+    \addtolength{\pxx}{-1pt}
+
+    \settoheight{\pyy}{\CNoV\thechapter}
+    \addtolength{\pyy}{-2pt}
+    \setlength{\myhi}{\pyy}
+    \addtolength{\myhi}{-1\py}
+    \par
+    \parbox[b]{\textwidth}{%
+    \rule[\py]{\RW}{\myhi}%
+    \hskip -\RW%
+    \rule[\pyy]{\px}{\RW}% 
+    \hskip -\px%
+    \raggedright%
+    \CNV\FmN{\@chapapp}\rule{\blrule}{\RW}\hskip\bl\CNoV\thechapter%MOD 
+%    \CNV\FmN{\@chapapp}\space\CNoV\thechapter                     %ORIGINAL
+    \hskip\br%                           %MOD 1pt to \br
+    \mghrulefill{\RW}% 
+    \rule{\RW}{\pyy}\par\nobreak% 
+    \vskip -\baselineskip%
+    \vskip -\pyy%
+    \hskip \mylen%
+    \mghrulefill{\RW}\par\nobreak%
+    \vskip \pyy}%
+    \vskip 20\p@}
+ 
+
+  \renewcommand{\DOTI}[1]{%
+    \raggedright
+    \CTV\FmTi{#1}\par\nobreak
+    \vskip 40\p@}
+
+  \renewcommand{\DOTIS}[1]{%
+    \raggedright
+    \CTV\FmTi{#1}\par\nobreak
+    \vskip 40\p@}
+ }
+
+
+%
+
+
+%%%%%% BJORNSTRUP DEF
+
+\DeclareOption{Bjornstrup}{%
+  \usecolortrue
+  % pzc (Zapf Chancelery) is nice.  ppl (Palatino) is cool too.
+  \ChNumVar{\fontsize{76}{80}\usefont{OT1}{pzc}{m}{n}\selectfont}
+  \ChTitleVar{\raggedleft\Large\sffamily\bfseries}
+
+  \setlength{\myhi}{10pt}         % Space between grey box border and text
+  \setlength{\mylen}{\textwidth}
+  \addtolength{\mylen}{-2\myhi}
+  \renewcommand{\DOCH}{%
+    \settowidth{\py}{\CNoV\thechapter}
+    \addtolength{\py}{-10pt}      % Amount of space by which the
+%                                  % number is shifted right
+    \fboxsep=0pt%
+    \colorbox[gray]{.85}{\rule{0pt}{40pt}\parbox[b]{\textwidth}{\hfill}}%
+    \kern-\py\raise20pt%
+    \hbox{\color[gray]{.5}\CNoV\thechapter}\\%
+  }
+  
+  \renewcommand{\DOTI}[1]{%
+    \nointerlineskip\raggedright%
+    \fboxsep=\myhi%
+    \vskip-1ex%
+    \colorbox[gray]{.85}{\parbox[t]{\mylen}{\CTV\FmTi{#1}}}\par\nobreak%
+    \vskip 40\p@%
+  }
+
+  \renewcommand{\DOTIS}[1]{%
+    \fboxsep=0pt
+    \colorbox[gray]{.85}{\rule{0pt}{40pt}\parbox[b]{\textwidth}{\hfill}}\\%
+    \nointerlineskip\raggedright%
+    \fboxsep=\myhi%
+    \colorbox[gray]{.85}{\parbox[t]{\mylen}{\CTV\FmTi{#1}}}\par\nobreak%
+    \vskip 40\p@%
+  }
+}
+
+
+%%%%%%% GLENN DEF
+
+
+\DeclareOption{Glenn}{%
+  \ChNameVar{\bfseries\Large\sf}
+  \ChNumVar{\Huge}
+  \ChTitleVar{\bfseries\Large\rm}
+  \ChRuleWidth{1pt}
+  \ChNameUpperCase
+  \ChTitleUpperCase
+  \renewcommand{\DOCH}{%
+    \settoheight{\myhi}{\CTV\FmTi{Test}}
+    \setlength{\py}{\baselineskip}
+    \addtolength{\py}{\RW}
+    \addtolength{\py}{\myhi}
+    \setlength{\pyy}{\py}
+    \addtolength{\pyy}{-1\RW}
+     
+    \raggedright
+    \CNV\FmN{\@chapapp}\space\CNoV\thechapter
+    \hskip 3pt\mghrulefill{\RW}\rule[-1\pyy]{2\RW}{\py}\par\nobreak}
+
+  \renewcommand{\DOTI}[1]{%
+    \addtolength{\pyy}{-4pt}
+    \settoheight{\myhi}{\CTV\FmTi{#1}}
+    \addtolength{\myhi}{\py}
+    \addtolength{\myhi}{-1\RW}
+    \vskip -1\pyy
+    \rule{2\RW}{\myhi}\mghrulefill{\RW}\hskip 2pt
+    \raggedleft\CTV\FmTi{#1}\par\nobreak
+    \vskip 80\p@}
+
+\newlength{\backskip}
+  \renewcommand{\DOTIS}[1]{%
+%    \setlength{\py}{10pt}
+%    \setlength{\pyy}{\py}
+%    \addtolength{\pyy}{\RW}
+%    \setlength{\myhi}{\baselineskip}
+%    \addtolength{\myhi}{\pyy}
+%    \mghrulefill{\RW}\rule[-1\py]{2\RW}{\pyy}\par\nobreak
+%    \addtolength{}{}
+%\vskip -1\baselineskip
+%    \rule{2\RW}{\myhi}\mghrulefill{\RW}\hskip 2pt
+%    \raggedleft\CTV\FmTi{#1}\par\nobreak
+%    \vskip 60\p@}
+%% Fix suggested by Tomas Lundberg
+    \setlength{\py}{25pt}  % eller vad man vill
+    \setlength{\pyy}{\py}
+    \setlength{\backskip}{\py}
+    \addtolength{\backskip}{2pt}
+    \addtolength{\pyy}{\RW}
+    \setlength{\myhi}{\baselineskip}
+    \addtolength{\myhi}{\pyy}
+    \mghrulefill{\RW}\rule[-1\py]{2\RW}{\pyy}\par\nobreak
+    \vskip -1\backskip
+    \rule{2\RW}{\myhi}\mghrulefill{\RW}\hskip 3pt %
+    \raggedleft\CTV\FmTi{#1}\par\nobreak
+    \vskip 40\p@}
+ }
+
+%%%%%%% CONNY DEF
+
+\DeclareOption{Conny}{%
+  \ChNameUpperCase
+  \ChTitleUpperCase  
+  \ChNameVar{\centering\Huge\rm\bfseries}
+  \ChNumVar{\Huge}
+  \ChTitleVar{\centering\Huge\rm}
+  \ChRuleWidth{2pt}
+
+  \renewcommand{\DOCH}{%
+    \mghrulefill{3\RW}\par\nobreak
+    \vskip -0.5\baselineskip
+    \mghrulefill{\RW}\par\nobreak
+    \CNV\FmN{\@chapapp}\space \CNoV\thechapter
+    \par\nobreak
+    \vskip -0.5\baselineskip
+   }
+  \renewcommand{\DOTI}[1]{%
+    \mghrulefill{\RW}\par\nobreak
+    \CTV\FmTi{#1}\par\nobreak
+    \vskip 60\p@
+    }
+  \renewcommand{\DOTIS}[1]{%
+    \mghrulefill{\RW}\par\nobreak
+    \CTV\FmTi{#1}\par\nobreak
+    \vskip 60\p@
+    }
+  }
+
+%%%%%%% REJNE DEF
+
+\DeclareOption{Rejne}{%
+
+  \ChNameUpperCase
+  \ChTitleUpperCase  
+  \ChNameVar{\centering\Large\rm}
+  \ChNumVar{\Huge}
+  \ChTitleVar{\centering\Huge\rm}
+  \ChRuleWidth{1pt}
+  \renewcommand{\DOCH}{%
+    \settoheight{\py}{\CNoV\thechapter}
+    \parskip=0pt plus 1pt % Set parskip to default, just in case v1.31
+    \addtolength{\py}{-1pt}
+    \CNV\FmN{\@chapapp}\par\nobreak
+    \vskip 20\p@
+    \setlength{\myhi}{2\baselineskip}
+    \setlength{\px}{\myhi}
+    \addtolength{\px}{-1\RW}
+    \rule[-1\px]{\RW}{\myhi}\mghrulefill{\RW}\hskip
+    10pt\raisebox{-0.5\py}{\CNoV\thechapter}\hskip 10pt\mghrulefill{\RW}\rule[-1\px]{\RW}{\myhi}\par\nobreak
+     \vskip -3\p@% Added -2pt vskip to correct for streched text v1.31
+    }
+  \renewcommand{\DOTI}[1]{%
+    \setlength{\mylen}{\textwidth}
+    \parskip=0pt plus 1pt % Set parskip to default, just in case v1.31
+    \addtolength{\mylen}{-2\RW}
+    {\vrule width\RW}\parbox{\mylen}{\CTV\FmTi{#1}}{\vrule width\RW}\par\nobreak%
+    \vskip -3pt\rule{\RW}{2\baselineskip}\mghrulefill{\RW}\rule{\RW}{2\baselineskip}%
+    \vskip 60\p@% Added -2pt in vskip to correct for streched text v1.31
+    }
+  \renewcommand{\DOTIS}[1]{%
+    \setlength{\py}{\fboxrule}
+    \setlength{\fboxrule}{\RW}
+    \setlength{\mylen}{\textwidth}
+    \addtolength{\mylen}{-2\RW}
+    \fbox{\parbox{\mylen}{\vskip 2\baselineskip\CTV\FmTi{#1}\par\nobreak\vskip \baselineskip}} 
+    \setlength{\fboxrule}{\py}
+    \vskip 60\p@
+    }
+  }
+
+
+%%%%%%% BJARNE DEF
+
+\DeclareOption{Bjarne}{%
+  \ChNameUpperCase
+  \ChTitleUpperCase  
+  \ChNameVar{\raggedleft\normalsize\rm}
+  \ChNumVar{\raggedleft \bfseries\Large}
+  \ChTitleVar{\raggedleft \Large\rm}
+  \ChRuleWidth{1pt}
+
+
+%% Note thechapter -> c@chapter fix appendix bug
+%% Fixed misspelled 12
+
+  \newcounter{AlphaCnt}
+  \newcounter{AlphaDecCnt}
+  \newcommand{\AlphaNo}{%
+    \ifcase\number\theAlphaCnt
+      \ifnum\c@chapter=0
+        ZERO\else{}\fi
+    \or ONE\or TWO\or THREE\or FOUR\or FIVE
+    \or SIX\or SEVEN\or EIGHT\or NINE\or TEN
+    \or ELEVEN\or TWELVE\or THIRTEEN\or FOURTEEN\or FIFTEEN
+    \or SIXTEEN\or SEVENTEEN\or EIGHTEEN\or NINETEEN\fi
+}
+
+  \newcommand{\AlphaDecNo}{%
+    \setcounter{AlphaDecCnt}{0}
+    \@whilenum\number\theAlphaCnt>0\do
+      {\addtocounter{AlphaCnt}{-10}
+       \addtocounter{AlphaDecCnt}{1}}
+     \ifnum\number\theAlphaCnt=0
+     \else
+       \addtocounter{AlphaDecCnt}{-1}
+       \addtocounter{AlphaCnt}{10}
+     \fi
+     
+     
+    \ifcase\number\theAlphaDecCnt\or TEN\or TWENTY\or THIRTY\or
+    FORTY\or FIFTY\or SIXTY\or SEVENTY\or EIGHTY\or NINETY\fi
+    }
+  \newcommand{\TheAlphaChapter}{%
+    
+    \ifinapp 
+      \thechapter
+    \else
+      \setcounter{AlphaCnt}{\c@chapter}
+      \ifnum\c@chapter<20
+        \AlphaNo
+      \else
+        \AlphaDecNo\AlphaNo
+      \fi
+    \fi
+    }  
+  \renewcommand{\DOCH}{%
+    \mghrulefill{\RW}\par\nobreak
+    \CNV\FmN{\@chapapp}\par\nobreak 
+    \CNoV\TheAlphaChapter\par\nobreak
+    \vskip -1\baselineskip\vskip 5pt\mghrulefill{\RW}\par\nobreak
+    \vskip 20\p@
+    }
+  \renewcommand{\DOTI}[1]{%
+    \CTV\FmTi{#1}\par\nobreak
+    \vskip 40\p@
+    }
+  \renewcommand{\DOTIS}[1]{%
+    \CTV\FmTi{#1}\par\nobreak
+    \vskip 40\p@
+    }
+}
+
+\DeclareOption*{%
+  \PackageWarning{fancychapter}{unknown style option}
+  }
+
+\ProcessOptions* \relax
+
+\ifusecolor
+  \RequirePackage{color} 
+\fi
+\def\@makechapterhead#1{%
+  \vspace*{50\p@}%
+  {\parindent \z@ \raggedright \normalfont
+    \ifnum \c@secnumdepth >\m@ne
+      \if@mainmatter%%%%% Fix for frontmatter, mainmatter, and backmatter 040920
+        \DOCH
+      \fi
+    \fi
+    \interlinepenalty\@M
+    \if@mainmatter%%%%% Fix for frontmatter, mainmatter, and backmatter 060424
+      \DOTI{#1}%
+    \else%
+      \DOTIS{#1}%
+    \fi
+  }}
+
+
+%%% Begin: To avoid problem with scrbook.cls (fncychap version 1.32)
+
+%%OUT:
+%\def\@schapter#1{\if@twocolumn
+%                   \@topnewpage[\@makeschapterhead{#1}]%
+%                 \else
+%                   \@makeschapterhead{#1}%
+%                   \@afterheading
+%                 \fi}
+
+%%IN:
+\def\@schapter#1{%
+\if@twocolumn%
+  \@makeschapterhead{#1}%
+\else%
+  \@makeschapterhead{#1}%
+  \@afterheading%
+\fi}
+
+%%% End: To avoid problem with scrbook.cls (fncychap version 1.32)
+
+\def\@makeschapterhead#1{%
+  \vspace*{50\p@}%
+  {\parindent \z@ \raggedright
+    \normalfont
+    \interlinepenalty\@M
+    \DOTIS{#1}
+    \vskip 40\p@
+  }}
+
+\endinput
+
+
diff --git a/docs/fr/_build/latex/howto.cls b/docs/fr/_build/latex/howto.cls
new file mode 100644
index 00000000..6844533a
--- /dev/null
+++ b/docs/fr/_build/latex/howto.cls
@@ -0,0 +1,70 @@
+%
+% howto.cls for Sphinx
+%
+
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesClass{howto}[2008/10/18 Document class (Sphinx HOWTO)]
+
+% Pass all given class options to the parent class.
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+\ProcessOptions\relax
+\LoadClass[twoside]{article}
+
+% Set some sane defaults for section numbering depth and TOC depth.  You can
+% reset these counters in your preamble.
+%
+\setcounter{secnumdepth}{2}
+
+% Change the title page to look a bit better, and fit in with the fncychap
+% ``Bjarne'' style a bit better.
+%
+\renewcommand{\maketitle}{
+  \rule{\textwidth}{1pt}
+  \ifsphinxpdfoutput
+    \begingroup
+    % These \defs are required to deal with multi-line authors; it
+    % changes \\ to ', ' (comma-space), making it pass muster for
+    % generating document info in the PDF file.
+    \def\\{, }
+    \def\and{and }
+    \pdfinfo{
+      /Author (\@author)
+      /Title (\@title)
+    }
+    \endgroup
+  \fi
+  \begin{flushright}
+    \sphinxlogo%
+    {\rm\Huge\py@HeaderFamily \@title} \par
+    {\em\large\py@HeaderFamily \py@release\releaseinfo} \par
+    \vspace{25pt}
+    {\Large\py@HeaderFamily
+      \begin{tabular}[t]{c}
+        \@author
+      \end{tabular}} \par
+    \vspace{25pt}
+    \@date \par
+    \py@authoraddress \par
+  \end{flushright}
+  \@thanks
+  \setcounter{footnote}{0}
+  \let\thanks\relax\let\maketitle\relax
+  %\gdef\@thanks{}\gdef\@author{}\gdef\@title{}
+}
+
+\let\py@OldTableofcontents=\tableofcontents
+\renewcommand{\tableofcontents}{
+  \begingroup
+    \parskip = 0mm
+    \py@OldTableofcontents
+  \endgroup
+  \rule{\textwidth}{1pt}
+  \vspace{12pt}
+}  
+
+\@ifundefined{fancyhf}{
+  \pagestyle{plain}}{
+  \pagestyle{normal}}		% start this way; change for
+\pagenumbering{arabic}		% ToC & chapters
+
+\thispagestyle{empty}
diff --git a/docs/fr/_build/latex/manual.cls b/docs/fr/_build/latex/manual.cls
new file mode 100644
index 00000000..2fb77c62
--- /dev/null
+++ b/docs/fr/_build/latex/manual.cls
@@ -0,0 +1,108 @@
+%
+% manual.cls for Sphinx
+%
+
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesClass{manual}[2008/10/18 Document class (Sphinx manual)]
+
+% Pass all given class options to the parent class.
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
+\ProcessOptions\relax
+\LoadClass[twoside,openright]{report}
+
+% Set some sane defaults for section numbering depth and TOC depth.  You can
+% reset these counters in your preamble.
+%
+\setcounter{secnumdepth}{2}
+\setcounter{tocdepth}{1}
+
+% Change the title page to look a bit better, and fit in with the fncychap
+% ``Bjarne'' style a bit better.
+%
+\renewcommand{\maketitle}{%
+  \begin{titlepage}%
+    \let\footnotesize\small
+    \let\footnoterule\relax
+    \rule{\textwidth}{1pt}%
+    \ifsphinxpdfoutput
+      \begingroup
+      % These \defs are required to deal with multi-line authors; it
+      % changes \\ to ', ' (comma-space), making it pass muster for
+      % generating document info in the PDF file.
+      \def\\{, }
+      \def\and{and }
+      \pdfinfo{
+        /Author (\@author)
+        /Title (\@title)
+      }
+      \endgroup
+    \fi
+    \begin{flushright}%
+      \sphinxlogo%
+      {\rm\Huge\py@HeaderFamily \@title \par}%
+      {\em\LARGE\py@HeaderFamily \py@release\releaseinfo \par}
+      \vfill
+      {\LARGE\py@HeaderFamily
+        \begin{tabular}[t]{c}
+          \@author
+        \end{tabular}
+        \par}
+      \vfill\vfill
+      {\large
+       \@date \par
+       \vfill
+       \py@authoraddress \par
+      }%
+    \end{flushright}%\par
+    \@thanks
+  \end{titlepage}%
+  \cleardoublepage%
+  \setcounter{footnote}{0}%
+  \let\thanks\relax\let\maketitle\relax
+  %\gdef\@thanks{}\gdef\@author{}\gdef\@title{}
+}
+
+
+% Catch the end of the {abstract} environment, but here make sure the abstract
+% is followed by a blank page if the 'openright' option is used.
+%
+\let\py@OldEndAbstract=\endabstract
+\renewcommand{\endabstract}{
+  \if@openright
+    \ifodd\value{page}
+      \typeout{Adding blank page after the abstract.}
+      \vfil\pagebreak
+    \fi
+  \fi
+  \py@OldEndAbstract
+}
+
+% This wraps the \tableofcontents macro with all the magic to get the spacing
+% right and have the right number of pages if the 'openright' option has been
+% used.  This eliminates a fair amount of crud in the individual document files.
+%
+\let\py@OldTableofcontents=\tableofcontents
+\renewcommand{\tableofcontents}{%
+  \setcounter{page}{1}%
+  \pagebreak%
+  \pagestyle{plain}%
+  {%
+    \parskip = 0mm%
+    \py@OldTableofcontents%
+    \if@openright%
+      \ifodd\value{page}%
+        \typeout{Adding blank page after the table of contents.}%
+        \pagebreak\hspace{0pt}%
+      \fi%
+    \fi%
+    \cleardoublepage%
+  }%
+  \pagenumbering{arabic}%
+  \@ifundefined{fancyhf}{}{\pagestyle{normal}}%
+}
+
+% This is needed to get the width of the section # area wide enough in the
+% library reference.  Doing it here keeps it the same for all the manuals.
+%
+\renewcommand*\l@section{\@dottedtocline{1}{1.5em}{2.6em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{4.1em}{3.5em}}
diff --git a/docs/fr/_build/latex/python.ist b/docs/fr/_build/latex/python.ist
new file mode 100644
index 00000000..9ffa0f95
--- /dev/null
+++ b/docs/fr/_build/latex/python.ist
@@ -0,0 +1,11 @@
+line_max 100
+headings_flag 1
+heading_prefix "  \\bigletter "
+
+preamble "\\begin{theindex}
+\\def\\bigletter#1{{\\Large\\sffamily#1}\\nopagebreak\\vspace{1mm}}
+
+"
+
+symhead_positive "{Symbols}"
+numhead_positive "{Numbers}"
diff --git a/docs/fr/_build/latex/sphinx.sty b/docs/fr/_build/latex/sphinx.sty
new file mode 100644
index 00000000..6b98d289
--- /dev/null
+++ b/docs/fr/_build/latex/sphinx.sty
@@ -0,0 +1,744 @@
+%
+% sphinx.sty
+%
+% Adapted from the old python.sty, mostly written by Fred Drake,
+% by Georg Brandl.
+%
+
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesPackage{sphinx}[2008/05/01 LaTeX package (Sphinx markup)]
+
+\RequirePackage{textcomp}
+\RequirePackage{fancyhdr}
+\RequirePackage{fancybox}
+\RequirePackage{titlesec}
+\RequirePackage{tabulary}
+\RequirePackage{amsmath} % for \text
+\RequirePackage{makeidx}
+\RequirePackage{framed}
+\RequirePackage{color}
+% For highlighted code.
+\RequirePackage{fancyvrb}
+% For table captions.
+\RequirePackage{threeparttable}
+% Handle footnotes in tables.
+\RequirePackage{footnote}
+\makesavenoteenv{tabulary}
+% For floating figures in the text.
+\RequirePackage{wrapfig}
+% Separate paragraphs by space by default.
+\RequirePackage{parskip}
+
+% Redefine these colors to your liking in the preamble.
+\definecolor{TitleColor}{rgb}{0.126,0.263,0.361}
+\definecolor{InnerLinkColor}{rgb}{0.208,0.374,0.486}
+\definecolor{OuterLinkColor}{rgb}{0.216,0.439,0.388}
+% Redefine these colors to something not white if you want to have colored
+% background and border for code examples.
+\definecolor{VerbatimColor}{rgb}{1,1,1}
+\definecolor{VerbatimBorderColor}{rgb}{1,1,1}
+
+% Uncomment these two lines to ignore the paper size and make the page 
+% size more like a typical published manual.
+%\renewcommand{\paperheight}{9in}
+%\renewcommand{\paperwidth}{8.5in}   % typical squarish manual
+%\renewcommand{\paperwidth}{7in}     % O'Reilly ``Programmming Python''
+
+% For graphicx, check if we are compiling under latex or pdflatex.
+\ifx\pdftexversion\undefined
+  \usepackage{graphicx}
+\else
+  \usepackage[pdftex]{graphicx}
+\fi
+
+% for PDF output, use colors and maximal compression
+\newif\ifsphinxpdfoutput\sphinxpdfoutputfalse
+\ifx\pdfoutput\undefined\else\ifcase\pdfoutput
+  \let\py@NormalColor\relax
+  \let\py@TitleColor\relax
+\else
+  \sphinxpdfoutputtrue
+  \input{pdfcolor}
+  \def\py@NormalColor{\color[rgb]{0.0,0.0,0.0}}
+  \def\py@TitleColor{\color{TitleColor}}
+  \pdfcompresslevel=9
+\fi\fi
+
+% XeLaTeX can do colors, too
+\ifx\XeTeXrevision\undefined\else
+  \def\py@NormalColor{\color[rgb]{0.0,0.0,0.0}}
+  \def\py@TitleColor{\color{TitleColor}}
+\fi
+
+% Increase printable page size (copied from fullpage.sty)
+\topmargin 0pt
+\advance \topmargin by -\headheight
+\advance \topmargin by -\headsep
+
+% attempt to work a little better for A4 users
+\textheight \paperheight
+\advance\textheight by -2in
+
+\oddsidemargin 0pt
+\evensidemargin 0pt
+%\evensidemargin -.25in  % for ``manual size'' documents
+\marginparwidth 0.5in
+
+\textwidth \paperwidth
+\advance\textwidth by -2in
+
+
+% Style parameters and macros used by most documents here
+\raggedbottom
+\sloppy
+\hbadness = 5000                % don't print trivial gripes
+
+\pagestyle{empty}               % start this way; change for
+\pagenumbering{roman}           % ToC & chapters
+
+% Use this to set the font family for headers and other decor:
+\newcommand{\py@HeaderFamily}{\sffamily\bfseries}
+
+% Redefine the 'normal' header/footer style when using "fancyhdr" package:
+\@ifundefined{fancyhf}{}{
+  % Use \pagestyle{normal} as the primary pagestyle for text.
+  \fancypagestyle{normal}{
+    \fancyhf{}
+    \fancyfoot[LE,RO]{{\py@HeaderFamily\thepage}}
+    \fancyfoot[LO]{{\py@HeaderFamily\nouppercase{\rightmark}}}
+    \fancyfoot[RE]{{\py@HeaderFamily\nouppercase{\leftmark}}}
+    \fancyhead[LE,RO]{{\py@HeaderFamily \@title, \py@release}}
+    \renewcommand{\headrulewidth}{0.4pt}
+    \renewcommand{\footrulewidth}{0.4pt}
+  }
+  % Update the plain style so we get the page number & footer line,
+  % but not a chapter or section title.  This is to keep the first
+  % page of a chapter and the blank page between chapters `clean.'
+  \fancypagestyle{plain}{
+    \fancyhf{}
+    \fancyfoot[LE,RO]{{\py@HeaderFamily\thepage}}
+    \renewcommand{\headrulewidth}{0pt}
+    \renewcommand{\footrulewidth}{0.4pt}
+  }
+}
+
+% Some custom font markup commands.
+%
+\newcommand{\strong}[1]{{\bf #1}}
+\newcommand{\code}[1]{\texttt{#1}}
+\newcommand{\bfcode}[1]{\code{\bfseries#1}}
+\newcommand{\samp}[1]{`\code{#1}'}
+\newcommand{\email}[1]{\textsf{#1}}
+
+\newcommand{\py@modulebadkey}{{--just-some-junk--}}
+
+% Redefine the Verbatim environment to allow border and background colors.
+% The original environment is still used for verbatims within tables.
+\let\OriginalVerbatim=\Verbatim
+\let\endOriginalVerbatim=\endVerbatim
+
+% Play with vspace to be able to keep the indentation.
+\newlength\distancetoright
+\newlength\leftsidespace
+\def\mycolorbox#1{%
+  \setlength\leftsidespace{\@totalleftmargin}%
+  \setlength\distancetoright{\textwidth}%
+  \advance\distancetoright -\@totalleftmargin %
+  \noindent\hspace*{\@totalleftmargin}%
+  \fcolorbox{VerbatimBorderColor}{VerbatimColor}{%
+  \begin{minipage}{\distancetoright}%
+    \smallskip%
+    \noindent\hspace*{-\leftsidespace}%
+    #1
+  \end{minipage}%
+  }%
+}
+\def\FrameCommand{\mycolorbox}
+
+\renewcommand{\Verbatim}[1][1]{%
+  % The list environement is needed to control perfectly the vertical
+  % space.
+  \list{}{%
+  \setlength\parskip{0pt}%
+  \setlength\itemsep{0ex}%
+  \setlength\topsep{0ex}%
+  \setlength\partopsep{0pt}%
+  \setlength\leftmargin{0pt}%
+  }%
+  \item\MakeFramed {\FrameRestore}%
+     \small%
+    \OriginalVerbatim[#1]%
+}
+\renewcommand{\endVerbatim}{%
+    \endOriginalVerbatim%
+  \endMakeFramed%
+  \endlist%
+}
+
+
+% Index-entry generation support.
+%
+
+% Command to generate two index entries (using subentries)
+\newcommand{\indexii}[2]{\index{#1!#2}\index{#2!#1}}
+
+% And three entries (using only one level of subentries)
+\newcommand{\indexiii}[3]{\index{#1!#2 #3}\index{#2!#3, #1}\index{#3!#1 #2}}
+
+% And four (again, using only one level of subentries)
+\newcommand{\indexiv}[4]{
+\index{#1!#2 #3 #4}
+\index{#2!#3 #4, #1}
+\index{#3!#4, #1 #2}
+\index{#4!#1 #2 #3}
+}
+
+% support for the module index
+\newif\ifpy@UseModuleIndex
+\py@UseModuleIndexfalse
+
+\newcommand{\makemodindex}{
+  \newwrite\modindexfile
+  \openout\modindexfile=mod\jobname.idx
+  \py@UseModuleIndextrue
+}
+
+\newcommand{\printmodindex}{
+  \@input@{mod\jobname.ind}
+}
+
+% Add the defining entry for a module
+\newcommand{\py@modindex}[2]{%
+  \renewcommand{\py@thismodule}{#1}
+  \ifpy@UseModuleIndex%
+    \@ifundefined{py@modplat@\py@thismodulekey}{
+      \write\modindexfile{\protect\indexentry{#1@{\texttt{#1}}|hyperpage}{\thepage}}%
+    }{\write\modindexfile{\protect\indexentry{#1@{\texttt{#1 }%
+        \emph{(\platformof{\py@thismodulekey})}}|hyperpage}{\thepage}}%
+    }
+  \fi%
+}
+
+% "Current" keys
+\newcommand{\py@thisclass}{}
+\newcommand{\py@thismodule}{}
+\newcommand{\py@thismodulekey}{}
+\newcommand{\py@thismoduletype}{}
+\newcommand{\py@emptymodule}{}
+
+% \declaremodule[key]{type}{name}
+\newcommand{\declaremodule}[3][\py@modulebadkey]{
+  \renewcommand{\py@thismoduletype}{#2}
+  \ifx\py@modulebadkey#1
+    \renewcommand{\py@thismodulekey}{#3}
+  \else
+    \renewcommand{\py@thismodulekey}{#1}
+  \fi
+  \py@modindex{#3}{}
+  %\label{module-\py@thismodulekey}
+}
+
+% Record module platforms for the Module Index
+\newif\ifpy@ModPlatformFileIsOpen \py@ModPlatformFileIsOpenfalse
+\long\def\py@writeModPlatformFile#1{%
+  \protected@write\py@ModPlatformFile%
+    {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble}%
+    {\string#1}%
+}
+\newcommand{\py@ModPlatformFilename}{\jobname.pla}
+\newcommand{\platform}[1]{
+  \ifpy@ModPlatformFileIsOpen\else
+    \newwrite\py@ModPlatformFile
+    \openout\py@ModPlatformFile=\py@ModPlatformFilename
+    \py@ModPlatformFileIsOpentrue
+  \fi
+  \py@writeModPlatformFile{\py@defplatform{\py@thismodulekey}{#1}}
+}
+\newcommand{\py@defplatform}[2]{\expandafter\def\csname py@modplat@#1\endcsname{#2}}
+\newcommand{\platformof}[1]{\csname py@modplat@#1\endcsname}
+
+\InputIfFileExists{\jobname.pla}{}{}
+
+% \moduleauthor{name}{email}
+\newcommand{\moduleauthor}[2]{}
+
+% \sectionauthor{name}{email}
+\newcommand{\sectionauthor}[2]{}
+
+% Ignore module synopsis.
+\newcommand{\modulesynopsis}[1]{}
+
+% Reset "current" objects.
+\newcommand{\resetcurrentobjects}{
+  \renewcommand{\py@thisclass}{}
+  \renewcommand{\py@thismodule}{}
+  \renewcommand{\py@thismodulekey}{}
+  \renewcommand{\py@thismoduletype}{}
+}
+
+% Augment the sectioning commands used to get our own font family in place,
+% and reset some internal data items:
+\titleformat{\section}{\Large\py@HeaderFamily}%
+            {\py@TitleColor\thesection}{0.5em}{\py@TitleColor}{\py@NormalColor}
+\titleformat{\subsection}{\large\py@HeaderFamily}%
+            {\py@TitleColor\thesubsection}{0.5em}{\py@TitleColor}{\py@NormalColor}
+\titleformat{\subsubsection}{\py@HeaderFamily}%
+            {\py@TitleColor\thesubsubsection}{0.5em}{\py@TitleColor}{\py@NormalColor}
+\titleformat{\paragraph}{\large\py@HeaderFamily}%
+            {\py@TitleColor}{0em}{\py@TitleColor}{\py@NormalColor}
+
+
+% Now for a lot of semantically-loaded environments that do a ton of magical
+% things to get the right formatting and index entries for the stuff in
+% Python modules and C API.
+
+
+% {fulllineitems} is used in one place in libregex.tex, but is really for
+% internal use in this file.
+%
+\newcommand{\py@itemnewline}[1]{%
+  \@tempdima\linewidth%
+  \advance\@tempdima \leftmargin\makebox[\@tempdima][l]{#1}%
+}
+
+\newenvironment{fulllineitems}{
+  \begin{list}{}{\labelwidth \leftmargin \labelsep 0pt
+                 \rightmargin 0pt \topsep -\parskip \partopsep \parskip
+                 \itemsep -\parsep
+                 \let\makelabel=\py@itemnewline}
+}{\end{list}}
+
+% \optional is mostly for use in the arguments parameters to the various
+% {*desc} environments defined below, but may be used elsewhere.  Known to
+% be used in the debugger chapter.
+%
+% Typical usage:
+%
+%     \begin{funcdesc}{myfunc}{reqparm\optional{, optparm}}
+%                                    ^^^       ^^^
+%                          No space here       No space here
+%
+% When a function has multiple optional parameters, \optional should be
+% nested, not chained.  This is right:
+%
+%     \begin{funcdesc}{myfunc}{\optional{parm1\optional{, parm2}}}
+%
+\let\py@badkey=\@undefined
+
+\newcommand{\optional}[1]{%
+  {\textnormal{\Large[}}{#1}\hspace{0.5mm}{\textnormal{\Large]}}}
+
+% This can be used when a function or method accepts an varying number 
+% of arguments, such as by using the *args syntax in the parameter list.
+\newcommand{\py@moreargs}{...}
+
+% This can be used when you don't want to document the parameters to a 
+% function or method, but simply state that it's an alias for
+% something else.
+\newcommand{\py@unspecified}{...}
+
+\newcommand{\py@varvars}[1]{{%
+    {\let\unspecified=\py@unspecified%
+      \let\moreargs=\py@moreargs%
+      \emph{#1}}}}
+
+\newlength{\py@argswidth}
+\newcommand{\py@sigparams}[1]{%
+  \parbox[t]{\py@argswidth}{\py@varvars{#1}\code{)}}}
+\newcommand{\py@sigline}[2]{%
+  \settowidth{\py@argswidth}{#1\code{(}}%
+  \addtolength{\py@argswidth}{-2\py@argswidth}%
+  \addtolength{\py@argswidth}{\textwidth}%
+  \item[#1\code{(}\py@sigparams{#2}]}
+
+% C functions ------------------------------------------------------------
+% \begin{cfuncdesc}[refcount]{type}{name}{arglist}
+% Note that the [refcount] slot should only be filled in by
+% tools/anno-api.py; it pulls the value from the refcounts database.
+\newcommand{\cfuncline}[3]{
+  \py@sigline{\code{#1 \bfcode{#2}}}{#3}%
+}
+\newenvironment{cfuncdesc}[3]{
+  \begin{fulllineitems}
+    \cfuncline{#1}{#2}{#3}
+}{\end{fulllineitems}}
+
+% C variables ------------------------------------------------------------
+% \begin{cvardesc}{type}{name}
+\newenvironment{cvardesc}[2]{
+  \begin{fulllineitems}
+    \item[\code{#1 \bfcode{#2}}]
+}{\end{fulllineitems}}
+
+% C data types -----------------------------------------------------------
+% \begin{ctypedesc}[index name]{typedef name}
+\newenvironment{ctypedesc}[2][\py@badkey]{
+  \begin{fulllineitems}
+    \item[\bfcode{#2}]
+}{\end{fulllineitems}}
+
+% C type fields ----------------------------------------------------------
+% \begin{cmemberdesc}{container type}{ctype}{membername}
+\newcommand{\cmemberline}[3]{
+  \item[\code{#2 \bfcode{#3}}]
+}
+\newenvironment{cmemberdesc}[3]{
+  \begin{fulllineitems}
+    \cmemberline{#1}{#2}{#3}
+}{\end{fulllineitems}}
+
+% Funky macros -----------------------------------------------------------
+% \begin{csimplemacrodesc}{name}
+% -- "simple" because it has no args; NOT for constant definitions!
+\newenvironment{csimplemacrodesc}[1]{
+  \begin{fulllineitems}
+    \item[\bfcode{#1}]
+}{\end{fulllineitems}}
+
+% simple functions (not methods) -----------------------------------------
+% \begin{funcdesc}{name}{args}
+\newcommand{\funcline}[2]{%
+  \py@sigline{\bfcode{#1}}{#2}}
+\newenvironment{funcdesc}[2]{
+  \begin{fulllineitems}
+    \funcline{#1}{#2}
+}{\end{fulllineitems}}
+
+% classes ----------------------------------------------------------------
+% \begin{classdesc}{name}{constructor args}
+\newcommand{\classline}[2]{
+  \py@sigline{\strong{class }\bfcode{#1}}{#2}}
+\newenvironment{classdesc}[2]{
+  % Using \renewcommand doesn't work for this, for unknown reasons:
+  \global\def\py@thisclass{#1}
+  \begin{fulllineitems}
+    \classline{#1}{#2}
+}{\end{fulllineitems}}
+
+% \begin{excclassdesc}{name}{constructor args}
+% but indexes as an exception
+\newenvironment{excclassdesc}[2]{
+  % Using \renewcommand doesn't work for this, for unknown reasons:
+  \global\def\py@thisclass{#1}
+  \begin{fulllineitems}
+    \py@sigline{\strong{exception }\bfcode{#1}}{#2}%
+}{\end{fulllineitems}}
+
+% There is no corresponding {excclassdesc*} environment.  To describe
+% a class exception without parameters, use the {excdesc} environment.
+
+
+\let\py@classbadkey=\@undefined
+
+% object method ----------------------------------------------------------
+% \begin{methoddesc}[classname]{methodname}{args}
+\newcommand{\methodline}[3][\@undefined]{
+  \py@sigline{\bfcode{#2}}{#3}}
+\newenvironment{methoddesc}[3][\@undefined]{
+  \begin{fulllineitems}
+    \ifx\@undefined#1\relax
+      \methodline{#2}{#3}
+    \else
+      \def\py@thisclass{#1}
+      \methodline{#2}{#3}
+    \fi
+}{\end{fulllineitems}}
+
+% static method ----------------------------------------------------------
+% \begin{staticmethoddesc}[classname]{methodname}{args}
+\newcommand{\staticmethodline}[3][\@undefined]{
+  \py@sigline{static \bfcode{#2}}{#3}}
+\newenvironment{staticmethoddesc}[3][\@undefined]{
+  \begin{fulllineitems}
+    \ifx\@undefined#1\relax
+      \staticmethodline{#2}{#3}
+    \else
+      \def\py@thisclass{#1}
+      \staticmethodline{#2}{#3}
+    \fi
+}{\end{fulllineitems}}
+
+% class method ----------------------------------------------------------
+% \begin{classmethoddesc}[classname]{methodname}{args}
+\newcommand{\classmethodline}[3][\@undefined]{
+  \py@sigline{class \bfcode{#2}}{#3}}
+\newenvironment{classmethoddesc}[3][\@undefined]{
+  \begin{fulllineitems}
+    \ifx\@undefined#1\relax
+      \classmethodline{#2}{#3}
+    \else
+      \def\py@thisclass{#1}
+      \classmethodline{#2}{#3}
+    \fi
+}{\end{fulllineitems}}
+
+% object data attribute --------------------------------------------------
+% \begin{memberdesc}[classname]{membername}
+\newcommand{\memberline}[2][\py@classbadkey]{%
+  \ifx\@undefined#1\relax
+    \item[\bfcode{#2}]
+  \else
+    \item[\bfcode{#2}]
+  \fi
+}
+\newenvironment{memberdesc}[2][\py@classbadkey]{
+  \begin{fulllineitems}
+    \ifx\@undefined#1\relax
+      \memberline{#2}
+    \else
+      \def\py@thisclass{#1}
+      \memberline{#2}
+    \fi
+}{\end{fulllineitems}}
+
+% For exceptions: --------------------------------------------------------
+% \begin{excdesc}{name}
+%  -- for constructor information, use excclassdesc instead
+\newenvironment{excdesc}[1]{
+  \begin{fulllineitems}
+    \item[\strong{exception }\bfcode{#1}]
+}{\end{fulllineitems}}
+
+% Module data or constants: ----------------------------------------------
+% \begin{datadesc}{name}
+\newcommand{\dataline}[1]{%
+  \item[\bfcode{#1}]\nopagebreak}
+\newenvironment{datadesc}[1]{
+  \begin{fulllineitems}
+    \dataline{#1}
+}{\end{fulllineitems}}
+
+% bytecode instruction ---------------------------------------------------
+% \begin{opcodedesc}{name}{var}
+% -- {var} may be {}
+\newenvironment{opcodedesc}[2]{
+  \begin{fulllineitems}
+    \item[\bfcode{#1}\quad\emph{#2}]
+}{\end{fulllineitems}}
+
+% generic description ----------------------------------------------------
+\newcommand{\descline}[1]{%
+  \item[\bfcode{#1}]\nopagebreak%
+}
+\newenvironment{describe}[1]{
+  \begin{fulllineitems}
+    \descline{#1}
+}{\end{fulllineitems}}
+
+% This version is being checked in for the historical record; it shows
+% how I've managed to get some aspects of this to work.  It will not
+% be used in practice, so a subsequent revision will change things
+% again.  This version has problems, but shows how to do something
+% that proved more tedious than I'd expected, so I don't want to lose
+% the example completely.
+%
+\newcommand{\grammartoken}[1]{\texttt{#1}}
+\newenvironment{productionlist}[1][\py@badkey]{
+  \def\optional##1{{\Large[}##1{\Large]}}
+  \def\production##1##2{\code{##1}&::=&\code{##2}\\}
+  \def\productioncont##1{& &\code{##1}\\}
+  \def\token##1{##1}
+  \let\grammartoken=\token
+  \parindent=2em
+  \indent
+  \begin{tabular}{lcl}
+}{%
+  \end{tabular}
+}
+
+% Notices / Admonitions
+%
+\newlength{\py@noticelength}
+
+\newcommand{\py@heavybox}{
+  \setlength{\fboxrule}{1pt}
+  \setlength{\fboxsep}{7pt}
+  \setlength{\py@noticelength}{\linewidth}
+  \addtolength{\py@noticelength}{-2\fboxsep}
+  \addtolength{\py@noticelength}{-2\fboxrule}
+  \setlength{\shadowsize}{3pt}
+  \Sbox
+  \minipage{\py@noticelength}
+}
+\newcommand{\py@endheavybox}{
+  \endminipage
+  \endSbox
+  \fbox{\TheSbox}
+}
+
+% Some are quite plain:
+\newcommand{\py@noticestart@note}{}
+\newcommand{\py@noticeend@note}{}
+\newcommand{\py@noticestart@hint}{}
+\newcommand{\py@noticeend@hint}{}
+\newcommand{\py@noticestart@important}{}
+\newcommand{\py@noticeend@important}{}
+\newcommand{\py@noticestart@tip}{}
+\newcommand{\py@noticeend@tip}{}
+
+% Others gets more visible distinction:
+\newcommand{\py@noticestart@warning}{\py@heavybox}
+\newcommand{\py@noticeend@warning}{\py@endheavybox}
+\newcommand{\py@noticestart@caution}{\py@heavybox}
+\newcommand{\py@noticeend@caution}{\py@endheavybox}
+\newcommand{\py@noticestart@attention}{\py@heavybox}
+\newcommand{\py@noticeend@attention}{\py@endheavybox}
+\newcommand{\py@noticestart@danger}{\py@heavybox}
+\newcommand{\py@noticeend@danger}{\py@endheavybox}
+\newcommand{\py@noticestart@error}{\py@heavybox}
+\newcommand{\py@noticeend@error}{\py@endheavybox}
+
+\newenvironment{notice}[2]{
+  \def\py@noticetype{#1}
+  \csname py@noticestart@#1\endcsname
+  \par\strong{#2}
+}{\csname py@noticeend@\py@noticetype\endcsname}
+
+% Allow the release number to be specified independently of the
+% \date{}.  This allows the date to reflect the document's date and
+% release to specify the release that is documented.
+%
+\newcommand{\py@release}{}
+\newcommand{\version}{}
+\newcommand{\shortversion}{}
+\newcommand{\releaseinfo}{}
+\newcommand{\releasename}{Release}
+\newcommand{\release}[1]{%
+  \renewcommand{\py@release}{\releasename\space\version}%
+  \renewcommand{\version}{#1}}
+\newcommand{\setshortversion}[1]{%
+  \renewcommand{\shortversion}{#1}}
+\newcommand{\setreleaseinfo}[1]{%
+  \renewcommand{\releaseinfo}{#1}}
+
+% Allow specification of the author's address separately from the
+% author's name.  This can be used to format them differently, which
+% is a good thing.
+%
+\newcommand{\py@authoraddress}{}
+\newcommand{\authoraddress}[1]{\renewcommand{\py@authoraddress}{#1}}
+
+% This sets up the fancy chapter headings that make the documents look
+% at least a little better than the usual LaTeX output.
+%
+\@ifundefined{ChTitleVar}{}{
+  \ChNameVar{\raggedleft\normalsize\py@HeaderFamily}
+  \ChNumVar{\raggedleft \bfseries\Large\py@HeaderFamily}
+  \ChTitleVar{\raggedleft \rm\Huge\py@HeaderFamily}
+  % This creates chapter heads without the leading \vspace*{}:
+  \def\@makechapterhead#1{%
+    {\parindent \z@ \raggedright \normalfont
+      \ifnum \c@secnumdepth >\m@ne
+        \DOCH
+      \fi
+      \interlinepenalty\@M
+      \DOTI{#1}
+    }
+  }
+}
+
+% Redefine description environment so that it is usable inside fulllineitems.
+%
+\renewcommand{\description}{%
+  \list{}{\labelwidth\z@%
+          \itemindent-\leftmargin%
+	  \labelsep5pt%
+          \let\makelabel=\descriptionlabel}}
+
+% Definition lists; requested by AMK for HOWTO documents.  Probably useful
+% elsewhere as well, so keep in in the general style support.
+%
+\newenvironment{definitions}{%
+  \begin{description}%
+  \def\term##1{\item[##1]\mbox{}\\*[0mm]}
+}{%
+  \end{description}%
+}
+
+% Tell TeX about pathological hyphenation cases:
+\hyphenation{Base-HTTP-Re-quest-Hand-ler}
+
+
+% The following is stuff copied from docutils' latex writer.
+%
+\newcommand{\optionlistlabel}[1]{\bf #1 \hfill}
+\newenvironment{optionlist}[1]
+{\begin{list}{}
+  {\setlength{\labelwidth}{#1}
+   \setlength{\rightmargin}{1cm}
+   \setlength{\leftmargin}{\rightmargin}
+   \addtolength{\leftmargin}{\labelwidth}
+   \addtolength{\leftmargin}{\labelsep}
+   \renewcommand{\makelabel}{\optionlistlabel}}
+}{\end{list}}
+
+\newlength{\lineblockindentation}
+\setlength{\lineblockindentation}{2.5em}
+\newenvironment{lineblock}[1]
+{\begin{list}{}
+  {\setlength{\partopsep}{\parskip}
+   \addtolength{\partopsep}{\baselineskip}
+   \topsep0pt\itemsep0.15\baselineskip\parsep0pt
+   \leftmargin#1}
+ \raggedright}
+{\end{list}}
+
+% Redefine includgraphics for avoiding images larger than the screen size
+% If the size is not specified.
+\let\py@Oldincludegraphics\includegraphics
+
+\newbox\image@box%
+\newdimen\image@width%
+\renewcommand\includegraphics[2][\@empty]{%
+  \ifx#1\@empty%
+    \setbox\image@box=\hbox{\py@Oldincludegraphics{#2}}%
+    \image@width\wd\image@box%
+    \ifdim \image@width>\linewidth%
+      \setbox\image@box=\hbox{\py@Oldincludegraphics[width=\linewidth]{#2}}%
+      \box\image@box%
+    \else%
+      \py@Oldincludegraphics{#2}%
+    \fi%
+  \else%
+    \py@Oldincludegraphics[#1]{#2}%
+  \fi%
+}
+
+
+% Fix the index and bibliography environments to add an entry to the Table of
+% Contents; this is much nicer than just having to jump to the end of the book
+% and flip around, especially with multiple indexes.
+%
+\let\py@OldTheindex=\theindex
+\renewcommand{\theindex}{
+  \cleardoublepage
+  \phantomsection
+  \py@OldTheindex
+  \addcontentsline{toc}{chapter}{\indexname}
+}
+
+\let\py@OldThebibliography=\thebibliography
+\renewcommand{\thebibliography}[1]{
+  \cleardoublepage
+  \phantomsection
+  \py@OldThebibliography{1}
+  \addcontentsline{toc}{chapter}{\bibname}
+}
+
+% Include hyperref last.
+\RequirePackage[colorlinks,breaklinks,
+                linkcolor=InnerLinkColor,filecolor=OuterLinkColor,
+                menucolor=OuterLinkColor,pagecolor=OuterLinkColor,
+                urlcolor=OuterLinkColor,citecolor=InnerLinkColor]{hyperref}
+
+% From docutils.writers.latex2e
+\providecommand{\DUspan}[2]{%
+  {% group ("span") to limit the scope of styling commands
+    \@for\node@class@name:=#1\do{%
+    \ifcsname docutilsrole\node@class@name\endcsname%
+      \csname docutilsrole\node@class@name\endcsname%
+    \fi%
+    }%
+    {#2}% node content
+  }% close "span"
+}
diff --git a/docs/fr/_build/latex/tabulary.sty b/docs/fr/_build/latex/tabulary.sty
new file mode 100644
index 00000000..ba83c0af
--- /dev/null
+++ b/docs/fr/_build/latex/tabulary.sty
@@ -0,0 +1,452 @@
+%%
+%% This is file `tabulary.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% tabulary.dtx  (with options: `package')
+%% DRAFT VERSION
+%%
+%% File `tabulary.dtx'.
+%% Copyright (C) 1995 1996 2003 David Carlisle
+%% This file may be distributed under the terms of the LPPL.
+%% See 00readme.txt for details.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{tabulary}
+          [2007/10/02 v0.9 tabulary package (DPC)]
+\RequirePackage{array}
+\catcode`\Z=14
+\DeclareOption{debugshow}{\catcode`\Z=9\relax}
+\ProcessOptions
+\def\arraybackslash{\let\\=\@arraycr}
+\def\@finalstrut#1{%
+  \unskip\ifhmode\nobreak\fi\vrule\@width\z@\@height\z@\@depth\dp#1}
+\newcount\TY@count
+\def\tabulary{%
+  \let\TY@final\tabular
+  \let\endTY@final\endtabular
+  \TY@tabular}
+\def\TY@tabular#1{%
+  \edef\TY@{\@currenvir}%
+  {\ifnum0=`}\fi
+  \@ovxx\TY@linewidth
+  \@ovyy\TY@tablewidth
+  \count@\z@
+  \@tempswatrue
+  \@whilesw\if@tempswa\fi{%
+  \advance\count@\@ne
+  \expandafter\ifx\csname TY@F\the\count@\endcsname\relax
+    \@tempswafalse
+  \else
+    \expandafter\let\csname TY@SF\the\count@\expandafter\endcsname
+                     \csname TY@F\the\count@\endcsname
+    \global\expandafter\let\csname TY@F\the\count@\endcsname\relax
+    \expandafter\let\csname TY@S\the\count@\expandafter\endcsname
+                     \csname TY@\the\count@\endcsname
+  \fi}%
+    \global\TY@count\@ne
+    \TY@width\xdef{0pt}%
+    \global\TY@tablewidth\z@
+    \global\TY@linewidth#1\relax
+Z\message{^^J^^JTable^^J%
+Z        Target Width: \the\TY@linewidth^^J%
+Z        \string\tabcolsep: \the\tabcolsep\space
+Z        \string\arrayrulewidth: \the\arrayrulewidth\space
+Z        \string\doublerulesep: \the\doublerulesep^^J%
+Z        \string\tymin: \the\tymin\space
+Z        \string\tymax: \the\tymax^^J}%
+    \let\@classz\TY@classz
+    \let\verb\TX@verb
+    \toks@{}\TY@get@body}
+\let\TY@@mkpream\@mkpream
+\def\TY@mkpream{%
+    \def\@addamp{%
+      \if@firstamp \@firstampfalse \else
+      \global\advance\TY@count\@ne
+      \edef\@preamble{\@preamble &}\fi
+      \TY@width\xdef{0pt}}%
+    \def\@acol{%
+      \TY@subwidth\col@sep
+      \@addtopreamble{\hskip\col@sep}}%
+    \let\@arrayrule\TY@arrayrule
+    \let\@classvi\TY@classvi
+    \def\@classv{\save@decl
+      \expandafter\NC@ecs\@nextchar\extracolsep{}\extracolsep\@@@
+      \sbox\z@{\d@llarbegin\@nextchar\d@llarend}%
+      \TY@subwidth{\wd\z@}%
+      \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
+      \prepnext@tok}%
+  \global\let\@mkpream\TY@@mkpream
+  \TY@@mkpream}
+\def\TY@arrayrule{%
+  \TY@subwidth\arrayrulewidth
+  \@addtopreamble \vline}
+\def\TY@classvi{\ifcase \@lastchclass
+  \@acol \or
+  \TY@subwidth\doublerulesep
+  \@addtopreamble{\hskip \doublerulesep}\or
+  \@acol \or
+  \@classvii
+  \fi}
+\def\TY@tab{%
+  \setbox\z@\hbox\bgroup
+  \let\[$\let\]$%
+  \let\equation$\let\endequation$%
+    \col@sep\tabcolsep
+    \let\d@llarbegin\begingroup\let\d@llarend\endgroup
+    \let\@mkpream\TY@mkpream
+      \def\multicolumn##1##2##3{\multispan##1\relax}%
+    \CT@start\TY@tabarray}
+\def\TY@tabarray{\@ifnextchar[{\TY@array}{\@array[t]}}
+\def\TY@array[#1]{\@array[t]}
+\def\TY@width#1{%
+  \expandafter#1\csname TY@\the\TY@count\endcsname}
+\def\TY@subwidth#1{%
+  \TY@width\dimen@
+  \advance\dimen@-#1\relax
+  \TY@width\xdef{\the\dimen@}%
+  \global\advance\TY@linewidth-#1\relax}
+\def\endtabulary{%
+  \gdef\@halignto{}%
+  \let\TY@footnote\footnote%
+  \def\footnote{}% prevent footnotes from doing anything
+  \expandafter\TY@tab\the\toks@
+  \crcr\omit
+  {\xdef\TY@save@row{}%
+     \loop
+    \advance\TY@count\m@ne
+    \ifnum\TY@count>\z@
+    \xdef\TY@save@row{\TY@save@row&\omit}%
+    \repeat}\TY@save@row
+  \endarray\global\setbox1=\lastbox\setbox0=\vbox{\unvbox1
+    \unskip\global\setbox1=\lastbox}\egroup
+  \dimen@\TY@linewidth
+  \divide\dimen@\TY@count
+  \ifdim\dimen@<\tymin
+    \TY@warn{tymin too large (\the\tymin), resetting to \the\dimen@}%
+    \tymin\dimen@
+  \fi
+  \setbox\tw@=\hbox{\unhbox\@ne
+    \loop
+\@tempdima=\lastskip
+\ifdim\@tempdima>\z@
+Z   \message{ecs=\the\@tempdima^^J}%
+   \global\advance\TY@linewidth-\@tempdima
+\fi
+    \unskip
+    \setbox\tw@=\lastbox
+    \ifhbox\tw@
+Z     \message{Col \the\TY@count: Initial=\the\wd\tw@\space}%
+      \ifdim\wd\tw@>\tymax
+        \wd\tw@\tymax
+Z       \message{> max\space}%
+Z     \else
+Z       \message{ \@spaces\space}%
+      \fi
+  \TY@width\dimen@
+Z \message{\the\dimen@\space}%
+  \advance\dimen@\wd\tw@
+Z \message{Final=\the\dimen@\space}%
+   \TY@width\xdef{\the\dimen@}%
+      \ifdim\dimen@<\tymin
+Z        \message{< tymin}%
+         \global\advance\TY@linewidth-\dimen@
+         \expandafter\xdef\csname TY@F\the\TY@count\endcsname
+                                                        {\the\dimen@}%
+       \else
+      \expandafter\ifx\csname TY@F\the\TY@count\endcsname\z@
+Z        \message{***}%
+         \global\advance\TY@linewidth-\dimen@
+         \expandafter\xdef\csname TY@F\the\TY@count\endcsname
+                                                        {\the\dimen@}%
+        \else
+Z        \message{> tymin}%
+         \global\advance\TY@tablewidth\dimen@
+         \global\expandafter\let\csname TY@F\the\TY@count\endcsname
+                                                               \maxdimen
+       \fi\fi
+       \advance\TY@count\m@ne
+    \repeat}%
+    \TY@checkmin
+    \TY@checkmin
+    \TY@checkmin
+    \TY@checkmin
+    \TY@count\z@
+    \let\TY@box\TY@box@v
+    \let\footnote\TY@footnote % restore footnotes
+  {\expandafter\TY@final\the\toks@\endTY@final}%
+  \count@\z@
+  \@tempswatrue
+  \@whilesw\if@tempswa\fi{%
+  \advance\count@\@ne
+  \expandafter\ifx\csname TY@SF\the\count@\endcsname\relax
+    \@tempswafalse
+  \else
+    \global\expandafter\let\csname TY@F\the\count@\expandafter\endcsname
+                   \csname TY@SF\the\count@\endcsname
+    \global\expandafter\let\csname TY@\the\count@\expandafter\endcsname
+                   \csname TY@S\the\count@\endcsname
+  \fi}%
+  \TY@linewidth\@ovxx
+  \TY@tablewidth\@ovyy
+    \ifnum0=`{\fi}}
+\def\TY@checkmin{%
+  \let\TY@checkmin\relax
+\ifdim\TY@tablewidth>\z@
+  \Gscale@div\TY@ratio\TY@linewidth\TY@tablewidth
+ \ifdim\TY@tablewidth <\linewidth
+   \def\TY@ratio{1}%
+ \fi
+\else
+  \TY@warn{No suitable columns!}%
+  \def\TY@ratio{1}%
+\fi
+\count@\z@
+Z \message{^^JLine Width: \the\TY@linewidth,
+Z             Natural Width: \the\TY@tablewidth,
+Z             Ratio: \TY@ratio^^J}%
+\@tempdima\z@
+\loop
+\ifnum\count@<\TY@count
+\advance\count@\@ne
+  \ifdim\csname TY@F\the\count@\endcsname>\tymin
+    \dimen@\csname TY@\the\count@\endcsname
+    \dimen@\TY@ratio\dimen@
+    \ifdim\dimen@<\tymin
+Z     \message{Column \the\count@\space ->}%
+      \global\expandafter\let\csname TY@F\the\count@\endcsname\tymin
+      \global\advance\TY@linewidth-\tymin
+      \global\advance\TY@tablewidth-\csname TY@\the\count@\endcsname
+      \let\TY@checkmin\TY@@checkmin
+    \else
+      \expandafter\xdef\csname TY@F\the\count@\endcsname{\the\dimen@}%
+      \advance\@tempdima\csname TY@F\the\count@\endcsname
+    \fi
+  \fi
+Z \dimen@\csname TY@F\the\count@\endcsname\message{\the\dimen@, }%
+\repeat
+Z \message{^^JTotal:\the\@tempdima^^J}%
+}
+\let\TY@@checkmin\TY@checkmin
+\newdimen\TY@linewidth
+\def\tyformat{\everypar{{\nobreak\hskip\z@skip}}}
+\newdimen\tymin
+\tymin=10pt
+\newdimen\tymax
+\tymax=2\textwidth
+\def\@testpach{\@chclass
+ \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
+  \ifnum \@lastchclass=7 5 \else
+   \ifnum \@lastchclass=8 \tw@ \else
+    \ifnum \@lastchclass=9 \thr@@
+   \else \z@
+   \ifnum \@lastchclass = 10 \else
+   \edef\@nextchar{\expandafter\string\@nextchar}%
+   \@chnum
+   \if \@nextchar c\z@ \else
+    \if \@nextchar l\@ne \else
+     \if \@nextchar r\tw@ \else
+   \if \@nextchar C7 \else
+    \if \@nextchar L8 \else
+     \if \@nextchar R9 \else
+     \if \@nextchar J10 \else
+   \z@ \@chclass
+   \if\@nextchar |\@ne \else
+    \if \@nextchar !6 \else
+     \if \@nextchar @7 \else
+      \if \@nextchar <8 \else
+       \if \@nextchar >9 \else
+  10
+  \@chnum
+  \if \@nextchar m\thr@@\else
+   \if \@nextchar p4 \else
+    \if \@nextchar b5 \else
+   \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi\fi \fi \fi\fi \fi
+     \fi  \fi  \fi  \fi  \fi  \fi \fi \fi \fi \fi \fi}
+\def\TY@classz{%
+  \@classx
+  \@tempcnta\count@
+  \ifx\TY@box\TY@box@v
+    \global\advance\TY@count\@ne
+  \fi
+  \let\centering c%
+  \let\raggedright\noindent
+  \let\raggedleft\indent
+  \let\arraybackslash\relax
+  \prepnext@tok
+  \ifnum\@chnum<4
+    \global\expandafter\let\csname TY@F\the\TY@count\endcsname\z@
+  \fi
+  \ifnum\@chnum=6
+    \global\expandafter\let\csname TY@F\the\TY@count\endcsname\z@
+  \fi
+  \@addtopreamble{%
+    \ifcase\@chnum
+      \hfil \d@llarbegin\insert@column\d@llarend \hfil \or
+      \kern\z@
+       \d@llarbegin \insert@column \d@llarend \hfil \or
+      \hfil\kern\z@ \d@llarbegin \insert@column \d@llarend \or
+      $\vcenter\@startpbox{\@nextchar}\insert@column \@endpbox $\or
+      \vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or
+      \vbox \@startpbox{\@nextchar}\insert@column \@endpbox \or
+      \d@llarbegin \insert@column \d@llarend \or% dubious "s" case
+      \TY@box\centering\or
+      \TY@box\raggedright\or
+      \TY@box\raggedleft\or
+      \TY@box\relax
+    \fi}\prepnext@tok}
+\def\TY@box#1{%
+  \ifx\centering#1%
+      \hfil \d@llarbegin\insert@column\d@llarend \hfil \else
+  \ifx\raggedright#1%
+        \kern\z@%<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+      \d@llarbegin \insert@column \d@llarend \hfil \else
+  \ifx\raggedleft#1%
+      \hfil\kern\z@ \d@llarbegin \insert@column \d@llarend \else
+  \ifx\relax#1%
+       \d@llarbegin \insert@column \d@llarend
+  \fi  \fi  \fi  \fi}
+\def\TY@box@v#1{%
+      \vtop \@startpbox{\csname TY@F\the\TY@count\endcsname}%
+              #1\arraybackslash\tyformat
+                              \insert@column\@endpbox}
+\newdimen\TY@tablewidth
+\def\Gscale@div#1#2#3{%
+  \setlength\dimen@{#3}%
+  \ifdim\dimen@=\z@
+    \PackageError{graphics}{Division by 0}\@eha
+    \dimen@#2%
+  \fi
+  \edef\@tempd{\the\dimen@}%
+  \setlength\dimen@{#2}%
+  \count@65536\relax
+  \ifdim\dimen@<\z@
+    \dimen@-\dimen@
+    \count@-\count@
+  \fi
+  \loop
+    \ifdim\dimen@<8192\p@
+      \dimen@\tw@\dimen@
+      \divide\count@\tw@
+  \repeat
+  \dimen@ii=\@tempd\relax
+  \divide\dimen@ii\count@
+  \divide\dimen@\dimen@ii
+  \edef#1{\strip@pt\dimen@}}
+\long\def\TY@get@body#1\end
+  {\toks@\expandafter{\the\toks@#1}\TY@find@end}
+\def\TY@find@end#1{%
+  \def\@tempa{#1}%
+  \ifx\@tempa\TY@\def\@tempa{\end{#1}}\expandafter\@tempa
+  \else\toks@\expandafter
+    {\the\toks@\end{#1}}\expandafter\TY@get@body\fi}
+\def\TY@warn{%
+  \PackageWarning{tabulary}}
+\catcode`\Z=11
+\AtBeginDocument{
+\@ifpackageloaded{colortbl}{%
+\expandafter\def\expandafter\@mkpream\expandafter#\expandafter1%
+  \expandafter{%
+    \expandafter\let\expandafter\CT@setup\expandafter\relax
+    \expandafter\let\expandafter\CT@color\expandafter\relax
+    \expandafter\let\expandafter\CT@do@color\expandafter\relax
+    \expandafter\let\expandafter\color\expandafter\relax
+    \expandafter\let\expandafter\CT@column@color\expandafter\relax
+    \expandafter\let\expandafter\CT@row@color\expandafter\relax
+    \@mkpream{#1}}
+\let\TY@@mkpream\@mkpream
+\def\TY@classz{%
+  \@classx
+  \@tempcnta\count@
+  \ifx\TY@box\TY@box@v
+    \global\advance\TY@count\@ne
+  \fi
+  \let\centering c%
+  \let\raggedright\noindent
+  \let\raggedleft\indent
+  \let\arraybackslash\relax
+  \prepnext@tok
+\expandafter\CT@extract\the\toks\@tempcnta\columncolor!\@nil
+  \ifnum\@chnum<4
+    \global\expandafter\let\csname TY@F\the\TY@count\endcsname\z@
+  \fi
+  \ifnum\@chnum=6
+    \global\expandafter\let\csname TY@F\the\TY@count\endcsname\z@
+  \fi
+  \@addtopreamble{%
+    \setbox\z@\hbox\bgroup\bgroup
+    \ifcase\@chnum
+      \hskip\stretch{.5}\kern\z@
+      \d@llarbegin\insert@column\d@llarend\hskip\stretch{.5}\or
+      \kern\z@%<<<<<<<<<<<<<<<<<<<<<<<<<<<
+       \d@llarbegin \insert@column \d@llarend \hfill \or
+      \hfill\kern\z@ \d@llarbegin \insert@column \d@llarend \or
+      $\vcenter\@startpbox{\@nextchar}\insert@column \@endpbox $\or
+      \vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or
+      \vbox \@startpbox{\@nextchar}\insert@column \@endpbox \or
+      \d@llarbegin \insert@column \d@llarend \or% dubious s case
+      \TY@box\centering\or
+      \TY@box\raggedright\or
+      \TY@box\raggedleft\or
+      \TY@box\relax
+    \fi
+ \egroup\egroup
+\begingroup
+  \CT@setup
+  \CT@column@color
+  \CT@row@color
+  \CT@do@color
+\endgroup
+        \@tempdima\ht\z@
+        \advance\@tempdima\minrowclearance
+        \vrule\@height\@tempdima\@width\z@
+\unhbox\z@
+}\prepnext@tok}%
+    \def\TY@arrayrule{%
+      \TY@subwidth\arrayrulewidth
+      \@addtopreamble{{\CT@arc@\vline}}}%
+    \def\TY@classvi{\ifcase \@lastchclass
+      \@acol \or
+      \TY@subwidth\doublerulesep
+      \ifx\CT@drsc@\relax
+        \@addtopreamble{\hskip\doublerulesep}%
+      \else
+        \@addtopreamble{{\CT@drsc@\vrule\@width\doublerulesep}}%
+      \fi\or
+      \@acol \or
+      \@classvii
+      \fi}%
+}{%
+\let\CT@start\relax
+}
+}
+{\uccode`\*=`\ %
+\uppercase{\gdef\TX@verb{%
+  \leavevmode\null\TX@vwarn
+  {\ifnum0=`}\fi\ttfamily\let\\\ignorespaces
+  \@ifstar{\let~*\TX@vb}{\TX@vb}}}}
+\def\TX@vb#1{\def\@tempa##1#1{\toks@{##1}\edef\@tempa{\the\toks@}%
+    \expandafter\TX@v\meaning\@tempa\\ \\\ifnum0=`{\fi}}\@tempa!}
+\def\TX@v#1!{\afterassignment\TX@vfirst\let\@tempa= }
+\begingroup
+\catcode`\*=\catcode`\#
+\catcode`\#=12
+\gdef\TX@vfirst{%
+  \if\@tempa#%
+    \def\@tempb{\TX@v@#}%
+  \else
+    \let\@tempb\TX@v@
+    \if\@tempa\space~\else\@tempa\fi
+  \fi
+  \@tempb}
+\gdef\TX@v@*1 *2{%
+  \TX@v@hash*1##\relax\if*2\\\else~\expandafter\TX@v@\fi*2}
+\gdef\TX@v@hash*1##*2{*1\ifx*2\relax\else#\expandafter\TX@v@hash\fi*2}
+\endgroup
+\def\TX@vwarn{%
+  \@warning{\noexpand\verb may be unreliable inside tabularx/y}%
+  \global\let\TX@vwarn\@empty}
+\endinput
+%%
+%% End of file `tabulary.sty'.
diff --git a/docs/fr/basis.rst b/docs/fr/basis.rst
new file mode 100644
index 00000000..7a6fd118
--- /dev/null
+++ b/docs/fr/basis.rst
@@ -0,0 +1,58 @@
+Les bases de Pelican
+####################
+
+Créer son premier article
+=========================
+
+Pour créer notre premier article, nous allons éditer un fichier, par exemple premier_article.rst ::
+
+	Premier article pour Pelican
+	############################
+	:author: Guillaume
+	:date: 2011-01-08 10:20
+	:category: GNU-Linux
+	:tags: tutoriel, git
+	Ceci est un tutoriel pour configurer git.
+	Bla, bla, bla ....
+
+Maintenant que ce fichier est créé, on va lancer la création du blog ::
+
+	pelican .
+
+Vous aller obtenir une sortie comme celle ci — $PATH représente le dossier où vous
+avez créé votre article ::
+
+	[ok] writing $PATH/output/feeds/all.atom.xml
+	[ok] writing $PATH/output/feeds/GNU/Linux.atom.xml
+	[ok] writing $PATH/output/feeds/all-en.atom.xml
+	[ok] writing $PATH/output/premier-article-pour-pelican.html
+	[ok] writing $PATH/output/index.html
+	[ok] writing $PATH/output/tags.html
+	[ok] writing $PATH/output/categories.html
+	[ok] writing $PATH/output/archives.html
+	[ok] writing $PATH/output/tag/tutoriel.html
+	[ok] writing $PATH/output/tag/git.html
+	[ok] writing $PATH/output/category/GNU-Linux.html
+
+
+Première analyse
+================
+
+Nous allons décortiquer un peu tout ça ensemble.
+
+* Un dossier output/ a été créé pour y mettre le fichiers xml et html du blog.
+* Dans le dossier feeds/, nous retrouvons les différents flux de syndication.
+* Le fichier de l’article et la page principale du blog a été généré.
+* Le répertoire tag/ propose une page par tag.
+* La page correspondant à la catégorie est générée dans le répertoire category/
+
+Si vous ouvrez le fichier index.html — ou un autre — avec votre navigateur, vous
+remarquerez que :
+
+* Le thème utilisé par défaut est notmyidea
+* Le nom du blog est A Pelican Blog.
+  
+Bien évidemment, il y a des paramètres de base que l’on peut modifier pour mettre
+un peu tout ça à sa sauce. C’est ce que nous allons voir au travers du fichier de configuration.
+
+
diff --git a/docs/fr/conf.py b/docs/fr/conf.py
new file mode 100644
index 00000000..301ec096
--- /dev/null
+++ b/docs/fr/conf.py
@@ -0,0 +1,152 @@
+# -*- coding: utf-8 -*-
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+# sys.path.insert(0, os.path.abspath('..'))
+
+# -- General configuration -----------------------------------------------------
+templates_path = ['../_templates']
+extensions = ['sphinx.ext.autodoc',]
+source_suffix = '.rst'
+master_doc = 'index'
+project = u'Pelican'
+copyright = u'2010, Alexis Metaireau and contributors'
+exclude_patterns = ['_build']
+pygments_style = 'sphinx'
+version = "2"
+release = version
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+sys.path.append(os.path.abspath('../_themes'))
+html_theme_path = ['../_themes']
+html_theme = 'flask_small'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+html_theme_options = {
+    'index_logo': 'pelican.png',
+    'github_fork': 'ametaireau/pelican',
+}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['../_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Raclettedoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'Raclette.tex', u'Raclette Documentation',
+   u'Alexis Métaireau', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'raclette', u'Raclette Documentation',
+     [u'Alexis Métaireau'], 1)
+]
diff --git a/docs/fr/faq.rst b/docs/fr/faq.rst
new file mode 100644
index 00000000..bee1dd54
--- /dev/null
+++ b/docs/fr/faq.rst
@@ -0,0 +1,38 @@
+Frequently Asked Questions (FAQ)
+################################
+
+Here is a summary of the frequently asked questions for pelican.
+
+Is it mandatory to have a configuration file ?
+==============================================
+
+No, it's not. Configurations files are just an easy way to configure pelican.
+For the basic operations, it's possible to specify options while invoking
+pelican with the command line (see `pelican --help` for more informations about
+that)
+
+I'm creating my own theme, how to use pygments ?
+================================================
+
+Pygment add some classes to the generated content, so the theming of your theme
+will be done thanks to a css file. You can have a look to the one proposed by
+default `on the project website <http://pygments.org/demo/15101/>`_
+
+How do I create my own theme ?
+==============================
+
+Please refer yourself to :ref:`theming-pelican`.
+
+How can I help ?
+================
+
+You have different options to help. First, you can use pelican, and report any
+idea or problem you have on `the bugtracker
+<http://github.com/ametaireau/pelican/issues>`_.
+
+If you want to contribute, please have a look to `the git repository
+<https://github.com/ametaireau/pelican/>`_, fork it, add your changes and do
+a pull request, I'll review them as soon as possible.
+
+You can also contribute by creating themes, and making the documentation
+better.
diff --git a/docs/fr/index.rst b/docs/fr/index.rst
new file mode 100644
index 00000000..3d77a923
--- /dev/null
+++ b/docs/fr/index.rst
@@ -0,0 +1,54 @@
+Pelican
+#######
+
+Pelican est un generateur de blog simple codé en python
+
+* Écrivez vos articles directement dans votre éditeur favori (vim !) et
+  directement en syntaxe reStructuredText ou Markdown ;
+* Un outil simple en ligne de conmmande pour (re)générer le blog ;
+* Sortie complètement statique, facile pour l'héberger n'importe où ;
+
+Fonctionnalités
+===============
+
+Pelican supporte actuellement :
+
+* des articles de blog ;
+* des pages statiques ;
+* les commentaires via un service externe (`disqus <http://disqus.com>`_)
+  Notez qu'étant bien un service externe assez pratique, vous ne gérez pas
+  vous même les commentaires. Ce qui pourrait occasionner une perte de vos données;
+* support de template (les templates sont crées avec `jinja2 <http://jinjna.pocoo.org>`_) ;
+* génération optionnelle de vos pages et articles en pdf.
+
+Pourquoi le nom "Pelican" ?
+============================
+
+Vous n'avez pas remarqué ? "Pelican" est un anagramme pour "Calepin"  ;)
+
+Code source
+===========
+
+Vous pouvez accéder au code source via mercurial sur  http://hg.notmyidea.org/pelican/
+ou via git à l'adresse http://github.com/ametaireau/pelican/
+
+Feedback !
+==========
+
+Si vous voulez de nouvelles fonctionnalitées pour Pelican, n'hésitez pas à nous le dire,
+à cloner le dépôt, etc … C'est open source !!!
+
+Contactez Alexis à "alexis at notmyidea dot org" pour quelques requêtes ou retour d'expérience que ce soi !
+
+Documentation
+=============
+
+.. toctree::
+   :maxdepth: 2
+   
+   install
+   basis
+   settings
+   themes
+   internals
+   faq
diff --git a/docs/fr/index.rst.save b/docs/fr/index.rst.save
new file mode 100644
index 00000000..822f0fcd
--- /dev/null
+++ b/docs/fr/index.rst.save
@@ -0,0 +1,53 @@
+Pelican
+#######
+
+Pelican est un generateur de blog simple codé en python
+
+* Écrivez vos articles directement dans votre éditeur favori (vim !) et
+  directement en syntaxe reStructuredText ou Markdown ;
+* Un outil simple en ligne de conmmande pour (re)générer le blog ;
+* Sortie complètement statique, facile pour l'héberger n'importe où ;
+
+Fonctionnalités
+===============
+
+Pelican supporte actuellement :
+
+* des articles de blog ;
+* des pages statiques ;
+* les commentaires via un service externe (`disqus <http://disqus.com>`_)
+  Notez qu'étant bien un service externe assez pratique, vous ne gérez pas
+  vous même les commentaires. Ce qui pourrait occasionner une perte de vos données;
+* support de template (les templates sont crées avec Jinja 2 `jinja2 <http://jinjna.pocoo.org>`_) ;
+* génération optionnelle de vos pages et articles en pdf.
+
+Pourquoi le nom "Pelican" ?
+============================
+
+Vous n'avez pas remarqué ? "Pelican" est un anagramme pour "Calepin" ;)
+
+Code source
+===========
+
+Vous pouvez accéder au code source via mercurial sur  http://hg.notmyidea.org/pelican/
+ou via git à l'adresse http://github.com/ametaireau/pelican/
+
+Feedback !
+==========
+
+Si vous voulez de nouvelles fonctionnalitées pour Pelican, n'hésitez pas à me le dire,
+à cloner le dépôt, etc … C'est open source !!!
+
+Contactez Ale "alexis at notmyidea dot org" pour quelques requêtes ou retour d'expérience que ce soi !
+
+Documentation
+=============
+
+.. toctree::
+   :maxdepth: 2
+   
+   getting_started
+   settings
+   themes
+   internals
+   faq
diff --git a/docs/fr/install.rst b/docs/fr/install.rst
new file mode 100644
index 00000000..e853979d
--- /dev/null
+++ b/docs/fr/install.rst
@@ -0,0 +1,67 @@
+Installation et mise à jour de Pelican
+######################################
+
+Installation
+============
+
+Il y a deux façons d’installer Pelican sur son système. La première est via l’utilitaire
+pip, l’autre façon est de télécharger Pelican via Github. Ici nous allons voir les deux
+façons de procéder.
+
+Via pip
+-------
+
+Pour installer Pelican via pip, vous aurez besoin du paquet python-pip. puis installez Pelican ::
+
+	# apt-get install python-pip
+	# pip install pelican
+
+
+Via Github
+----------
+
+Pour installer Pelican en reprenant le code via Github, nous aurons besoin du paquet 
+git-core pour récupérez les sources de Pelican. Puis nous procédons à l’installation ::
+
+	# apt-get install git-core
+	$ git clone https://github.com/ametaireau/pelican.git
+	$ cd pelican
+	# python setup.py install
+
+Mises à jour
+============
+
+Via pip
+-------
+
+Rien de bien compliqué pour mettre à jour via pip ::
+
+	$ cd votreRepertoireSource
+	$ pip install --upgrade pelican
+
+
+Via Github
+----------
+
+C'est un peu plus long avec Github par contre ::
+
+	$ cd votreRepertoireSource
+	$ git pull origin master
+	$ cd pelican
+	# python setup.py install
+
+Vous aurez un message d’erreur si le module setuptools de python n’est pas installé. 
+La manipulation est la suivante ::
+
+	# apt-get install python-setuptools
+
+Alors, quelle méthode choisir ?
+===============================
+
+Vous avez le choix entre deux méthodes, mais aussi entre deux concepts. La méthode 
+de Github est la version de développement, où les modifications arrivent assez
+fréquemment sans être testées à fond. La version de pip est une version arrêtée avec un
+numéro de version dans laquelle vous aurez moins de bug. N’oubliez cependant pas
+que le projet est très jeune et manque donc de maturité. Si vous aimez avoir les toutes
+dernières versions utilisez Github, sinon penchez vous sur pip.
+
diff --git a/docs/fr/internals.rst b/docs/fr/internals.rst
new file mode 100644
index 00000000..80fc8661
--- /dev/null
+++ b/docs/fr/internals.rst
@@ -0,0 +1,81 @@
+Pelican internals
+#################
+
+This section describe how pelican is working internally. As you'll see, it's
+quite simple, but a bit of documentation doesn't hurt :)
+
+Overall structure
+=================
+
+What `pelican` does, is taking a list of files, and processing them, to some
+sort of output. Usually, the files are restructured text and markdown files,
+and the output is a blog, but it can be anything you want.
+
+I've separated the logic in different classes and concepts:
+
+* `writers` are responsible of all the writing process of the
+  files. It's writing .html files, RSS feeds and so on. Since those operations 
+  are commonly used, the object is created once, and then passed to the 
+  generators.
+
+* `readers` are used to read from various formats (Markdown, and Restructured
+  Text for now, but the system is extensible). Given a file, they return
+  metadata (author, tags, category etc) and content (HTML formated)
+
+* `generators` generate the different outputs. For instance, pelican comes with
+  `ArticlesGenerator` and `PageGenerator`, into others. Given
+  a configurations, they can do whatever they want. Most of the time it's
+  generating files from inputs.
+
+* `pelican` also uses `templates`, so it's easy to write you own theme. The
+  syntax is `jinja2`, and, trust me, really easy to learn, so don't hesitate
+  a second.
+
+How to implement a new reader ?
+===============================
+
+There is an awesome markup language you want to add to pelican ?
+Well, the only thing you have to do is to create a class that have a `read`
+method, that is returning an HTML content and some metadata.
+
+Take a look to the Markdown reader::
+
+    class MarkdownReader(object):
+
+        def read(self, filename):
+            """Parse content and metadata of markdown files"""
+            text = open(filename)
+            md = Markdown(extensions = ['meta', 'codehilite'])
+            content = md.convert(text)
+            
+            metadatas = {}
+            for name, value in md.Meta.items():
+                if name in _METADATAS_FIELDS:
+                    meta = _METADATAS_FIELDS[name](value[0])
+                else:
+                    meta = value[0]
+                metadatas[name.lower()] = meta
+            return content, metadatas
+
+Simple isn't it ?
+
+How to implement a new generator ?
+==================================
+
+Generators have basically two important methods. You're not forced to create
+both, only the existing ones will be called.
+
+* `generate_context`, that is called in a first place, for all the generators.
+  Do whatever you have to do, and update the global context if needed. This
+  context is shared between all generators, and will be passed to the
+  templates. For instance, the `PageGenerator` `generate_context` method find
+  all the pages, transform them into objects, and populate the context with
+  them. Be careful to *not* output anything using this context at this stage,
+  as it is likely to change by the effect of others generators.
+
+* `generate_output` is then called. And guess what is it made for ? Oh,
+  generating the output :) That's here that you may want to look at the context
+  and call the methods of the `writer` object, that is passed at the first
+  argument of this function. In the `PageGenerator` example, this method will
+  look at all the pages recorded in the global context, and output a file on
+  the disk (using the writer method `write_file`) for each page encountered.
diff --git a/docs/fr/settings.rst b/docs/fr/settings.rst
new file mode 100644
index 00000000..e59d1b5b
--- /dev/null
+++ b/docs/fr/settings.rst
@@ -0,0 +1,111 @@
+Settings
+########
+
+Specifying the settings
+=======================
+
+Pelican is configurable thanks to a configuration file, that you can pass to
+the command line::
+
+    $ pelican -s path/to/your/settingsfile.py path
+
+Settings are given as the form of a python module (a file). You can have an
+example by looking at `/samples/pelican.conf.py
+<https://github.com/ametaireau/pelican/raw/master/samples/pelican.conf.py>`_
+
+All the settings identifiers must be set in caps, otherwise they will not be
+processed.
+
+Here are the available settings. Please note that all the settings you put in
+this file will be passed to the templates as well.
+
+=======================   =======================================================
+Setting name              what it does ?
+=======================   =======================================================
+`AUTHOR`                  Default author (put your name)
+`CATEGORY_FEED`           Where to put the atom categories feeds. default is
+                          `feeds/%s.atom.xml`, where %s is the name of the
+                          category.
+`CATEGORY_FEED_RSS`       Where to put the categories rss feeds. default is None
+                          (no rss)
+`CSS_FILE`                To specify the CSS file you want to load, if it's not
+                          the default one ('main.css')
+`DEFAULT_CATEGORY`        The default category to fallback on. `misc` by default.
+`DEFAULT_LANG`            The default language to use. Default is 'en'.
+`DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template.
+                          Templates can follow or not this settings.
+`FALLBACK_ON_FS_DATE`     If True, pelican will use the file system dates infos
+                          (mtime) if it can't get informations from the
+                          metadata?
+`FEED`                    relative url to output the atom feed. Default is
+                          `feeds/all.atom.xml`
+`FEED_RSS`                relative url to output the rss feed. Default is
+                          None (no rss)
+`JINJA_EXTENSIONS`        A list of any Jinja2 extensions you want to use.
+                          Default is no extensions (the empty list).
+`KEEP_OUTPUT_DIRECTORY`   Keep the output directory and just update all the generated files. 
+                          Default is to delete the output directory.   
+`MARKUP`                  A list of available markup languages you want to use.
+                          For the moment, only available values are `rst` and `md`.
+`OUTPUT_PATH`             Where to output the generated files. Default to
+                          "output"
+`PATH`                    path to look at for input files.
+`PDF_PROCESSOR`           Put True if you want to have PDF versions of your
+                          documents. You will need to install `rst2pdf`.
+`REVERSE_ARCHIVE_ORDER`   Reverse the archives order. (True makes it in
+                          descending order: the newer first)
+`SITEURL`                 base URL of your website.
+`SITENAME`                Your site name,
+`STATIC_PATHS`            The static paths you want to have accessible on the
+                          output path "static". By default, pelican will copy
+                          the 'images' folder to the output folder.
+`STATIC_THEME_PATHS`      Static theme paths you want to copy. Default values
+                          is `static`, but if your theme have others static paths,
+                          you can put them here.
+`THEME`                   theme to use to product the output. can be the
+                          complete static path to a theme folder, or chosen
+                          between the list of default themes (see below)
+`TRANSLATION_FEED`        Where to put the RSS feed for translations. Default
+                          is feeds/all-%s.atom.xml where %s is the name of the
+                          lang.
+=======================   =======================================================
+
+Themes
+======
+
+3 themes are available. You can specify them using the `-t` option:
+
+* notmyidea
+* simple (a synonym for "full text" :)
+* martyalchin
+
+You can define your own theme too, and specify it's emplacement in the same
+way (be sure to specify the full absolute path to it).
+
+Here is `a guide on how to create your theme
+<http://alexis.notmyidea.org/pelican/themes.html>`_
+
+The `notmyidea` theme can make good use of the following settings. I recommend
+to use them too in your themes.
+
+=======================   =======================================================
+Setting name              what it does ?
+=======================   =======================================================
+`DISQUS_SITENAME`         Pelican can handle disqus comments, specify the
+                          sitename you've filled in on disqus
+`GITHUB_URL`              Your github URL (if you have one), it will then
+                          use it to create a github ribbon.
+`GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
+`LINKS`                   A list of tuples (Title, Url) for links to appear on
+                          the header.
+`SOCIAL`                  A list of tuples (Title, Url) to appear in the "social"
+                          section.
+`TWITTER_USERNAME`        Allows to add a button on the articles to tweet about
+                          them. Add you twitter username if you want this
+                          button to appear.
+=======================   =======================================================
+
+In addition, you can use the "wide" version of the `notmyidea` theme, by
+adding that in your configuration::
+
+    CSS_FILE = "wide.css"
diff --git a/docs/fr/themes.rst b/docs/fr/themes.rst
new file mode 100644
index 00000000..7d492544
--- /dev/null
+++ b/docs/fr/themes.rst
@@ -0,0 +1,106 @@
+.. _theming-pelican:
+
+How to create themes for pelican
+################################
+
+Pelican uses the great `jinja2 <http://jinjna.pocoo.org>`_ templating engine to
+generate it's HTML output. The jinja2 syntax is really simple. If you want to
+create your own theme, feel free to take inspiration from the "simple" theme,
+which is available `here
+<https://github.com/ametaireau/pelican/tree/master/pelican/themes/simple/templates>`_
+
+Structure
+=========
+
+To make your own theme, you must follow the following structure::
+
+    ├── static
+    │   ├── css
+    │   └── images
+    └── templates
+        ├── archives.html    // to display archives
+        ├── article.html     // processed for each article
+        ├── categories.html  // must list all the categories
+        ├── category.html    // processed for each category
+        ├── index.html       // the index. List all the articles
+        ├── page.html        // processed for each page
+        ├── tag.html         // processed for each tag
+        └── tags.html        // must list all the tags. Can be a tag cloud.
+
+* `static` contains all the static content. It will be copied on the output
+  `theme/static` folder then. I've put the css and image folders, but they are
+  just examples. Put what you need here.
+
+* `templates` contains all the templates that will be used to generate the content.
+  I've just put the mandatory templates here, you can define your own if it helps 
+  you to organize yourself while doing the theme.
+ 
+Templates and variables
+=======================
+
+It's using a simple syntax, that you can embbed into your html pages.
+This document describes which templates should exists on a theme, and which
+variables will be passed to each template, while generating it.
+
+All templates will receive the variables defined in your settings file, if they 
+are in caps. You can access them directly. 
+
+Common variables
+----------------
+
+All of those settings will be given to all templates.
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+articles        That's the list of articles, ordsered desc. by date
+                all the elements are `Article` objects, so you can 
+                access their properties (e.g. title, summary, author
+                etc. 
+dates           The same list of article, but ordered by date,
+                ascending
+tags            A dict containing each tags (keys), and the list of
+                relative articles.
+categories      A dict containing each category (keys), and the 
+                list of relative articles.
+pages           The list of pages
+=============   ===================================================
+
+category.html
+-------------
+
+This template will be processed for each of the existing categories, and will
+finally remain at output/category/`category_name`.html.
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+articles        The articles of this category
+category        The name of the category being processed
+=============   ===================================================
+
+article.html
+-------------
+
+This template will be processed for each article. .html files will be outputed
+in output/`article_name`.html. Here are the specific variables it gets.
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+article         The article object to be displayed
+category        The name of the category of the current article
+=============   ===================================================
+
+tag.html
+--------
+
+For each tag, this template will be processed. It will create .html files in
+/output/tag/`tag_name`.html
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+tag             The name of the tag being processed
+articles        Articles related to this tag
+=============   ===================================================

From e14ed4749d73772776ffb70f204807d631098d71 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 25 Jan 2011 16:23:43 +0000
Subject: [PATCH 0178/2864] Add the slug for the translation articles.

---
 samples/content/another_super_article-fr.rst | 5 +++--
 samples/content/another_super_article.rst    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/samples/content/another_super_article-fr.rst b/samples/content/another_super_article-fr.rst
index f0e63196..71ac9635 100644
--- a/samples/content/another_super_article-fr.rst
+++ b/samples/content/another_super_article-fr.rst
@@ -1,6 +1,7 @@
-Oh yeah !
-#########
+Trop bien !
+###########
 
 :lang: fr
+:slug: oh-yeah
 
 Et voila du contenu en français
diff --git a/samples/content/another_super_article.rst b/samples/content/another_super_article.rst
index 84cdc401..abe8d26c 100644
--- a/samples/content/another_super_article.rst
+++ b/samples/content/another_super_article.rst
@@ -5,6 +5,7 @@ Oh yeah !
 :date: 2010-10-20 10:14
 :category: bar
 :author: Alexis Métaireau
+:slug: oh-yeah
 
 Why not ?
 =========

From 54c918a10e0d4db58133739a5a5f552ef51a572b Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 25 Jan 2011 16:26:37 +0000
Subject: [PATCH 0179/2864] Add the output folder to the gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 86021fe0..94f02b5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 docs/_build
 build
 dist
+output

From fb219afeba113e26be365b68b095e9548c67a622 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 25 Jan 2011 16:35:59 +0000
Subject: [PATCH 0180/2864] Integrated the french documentation to the already
 existing one.

---
 .gitignore                                    |   1 +
 docs/fr/Makefile                              | 130 ---
 docs/fr/_build/doctrees/basis.doctree         | Bin 10446 -> 0 bytes
 docs/fr/_build/doctrees/environment.pickle    | Bin 22018 -> 0 bytes
 docs/fr/_build/doctrees/faq.doctree           | Bin 11188 -> 0 bytes
 .../_build/doctrees/getting_started.doctree   | Bin 10950 -> 0 bytes
 docs/fr/_build/doctrees/index.doctree         | Bin 13144 -> 0 bytes
 docs/fr/_build/doctrees/install.doctree       | Bin 10934 -> 0 bytes
 docs/fr/_build/doctrees/internals.doctree     | Bin 19934 -> 0 bytes
 docs/fr/_build/doctrees/settings.doctree      | Bin 41041 -> 0 bytes
 docs/fr/_build/doctrees/themes.doctree        | Bin 29358 -> 0 bytes
 docs/fr/_build/html/.buildinfo                |   4 -
 docs/fr/_build/latex/Makefile                 |  58 --
 docs/fr/_build/latex/Raclette.tex             | 829 ------------------
 docs/fr/_build/latex/fncychap.sty             | 683 ---------------
 docs/fr/_build/latex/howto.cls                |  70 --
 docs/fr/_build/latex/manual.cls               | 108 ---
 docs/fr/_build/latex/python.ist               |  11 -
 docs/fr/_build/latex/sphinx.sty               | 744 ----------------
 docs/fr/_build/latex/tabulary.sty             | 452 ----------
 docs/index.rst                                |   2 +
 21 files changed, 3 insertions(+), 3089 deletions(-)
 delete mode 100644 docs/fr/Makefile
 delete mode 100644 docs/fr/_build/doctrees/basis.doctree
 delete mode 100644 docs/fr/_build/doctrees/environment.pickle
 delete mode 100644 docs/fr/_build/doctrees/faq.doctree
 delete mode 100644 docs/fr/_build/doctrees/getting_started.doctree
 delete mode 100644 docs/fr/_build/doctrees/index.doctree
 delete mode 100644 docs/fr/_build/doctrees/install.doctree
 delete mode 100644 docs/fr/_build/doctrees/internals.doctree
 delete mode 100644 docs/fr/_build/doctrees/settings.doctree
 delete mode 100644 docs/fr/_build/doctrees/themes.doctree
 delete mode 100644 docs/fr/_build/html/.buildinfo
 delete mode 100644 docs/fr/_build/latex/Makefile
 delete mode 100644 docs/fr/_build/latex/Raclette.tex
 delete mode 100644 docs/fr/_build/latex/fncychap.sty
 delete mode 100644 docs/fr/_build/latex/howto.cls
 delete mode 100644 docs/fr/_build/latex/manual.cls
 delete mode 100644 docs/fr/_build/latex/python.ist
 delete mode 100644 docs/fr/_build/latex/sphinx.sty
 delete mode 100644 docs/fr/_build/latex/tabulary.sty

diff --git a/.gitignore b/.gitignore
index 94f02b5e..721af351 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .*.swo
 *.pyc
 docs/_build
+docs/fr/_build
 build
 dist
 output
diff --git a/docs/fr/Makefile b/docs/fr/Makefile
deleted file mode 100644
index bf49b542..00000000
--- a/docs/fr/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Raclette.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Raclette.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/Raclette"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Raclette"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	make -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/docs/fr/_build/doctrees/basis.doctree b/docs/fr/_build/doctrees/basis.doctree
deleted file mode 100644
index 80bef55de4542800fb766e386cb5931eb481b0af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10446
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

diff --git a/docs/fr/_build/doctrees/environment.pickle b/docs/fr/_build/doctrees/environment.pickle
deleted file mode 100644
index 8561eea0ed027543a6dc026c94933291471f93d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22018
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
NXxDp*w%j`M{{ZbXYV!a9

diff --git a/docs/fr/_build/doctrees/faq.doctree b/docs/fr/_build/doctrees/faq.doctree
deleted file mode 100644
index 32bfd0a18fdd8be38a3ea5a99efd30305745032a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11188
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
GA@_fiFd%dQ

diff --git a/docs/fr/_build/doctrees/getting_started.doctree b/docs/fr/_build/doctrees/getting_started.doctree
deleted file mode 100644
index cc1c82050cdfe9703bb694a7d4cc9c397938798a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10950
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

diff --git a/docs/fr/_build/doctrees/index.doctree b/docs/fr/_build/doctrees/index.doctree
deleted file mode 100644
index 7d258321cb20d2c6e54a6d4f2f95b600000570f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13144
zcmd^G2bdjI^-tUOlHC+YLK;k#EZLA`mtGP=3x>tO5)6YYvb@Z`H@h=0@6Eh9GqWi&
zk|-^JVxuUQSU?tODxyeJ)-KHgN>xF6wTlS)``wv&`*stgexLro|M%_Ax%J$0e&^nE
z>)SLYmv?hvU>E&1$IY95hS8Gg1Q~Dig3aET$Q#?LH#kPg3^tTa-y0WsHLYEBqehJ?
zn?*ZkI9_dM*Ca%HT_+dVuHzU*I~W}By}Hh>Mx>|w3}$-uon5n7*A2xBU0W-fn&XzV
z=7d?Zc8J%|*;R`o1=}eYdwH3aqr1i<nuBnfk7_y78y}a*+rAh2-UO7$phT}}=6j6X
zT5Yb^*cs}R{jkRm>;SsCPBw4$`d(AyP1KvphWKW-Wct3*2Zbhedz1C1Tqpvivq=k6
zI`vH6%()Uvy+fxy#Rvnp*L4HO4a}?`7!r6pt{kn`5gI%1ds8ECTB}v7*QK~jx9aqX
z!%#tMJ6ZL5<8Vl3SPlC06p+P5b1?u}oHChdW%SwvidoipeLQhkoJcv_nxNMvD9o`M
z_4*V7Z|6|2&slac52d_ax;<^Am3>ngE91?Dk((oLR~T80bqV8n`Y62?H~|r_#Tuj6
zCh5D4WFux-LdT|18E<~qGMJ&=a!Y1=UuYML20BvvDslV7D3uhF?L{|d6x$Q++5v>$
z-Yf04lQ-A5i63~ar*HNaMBeT_dR<`j5nFGeUYAJgEz&ba5QyCq2EcN0<h8Zx_4%;O
za=zEz?d_r0<%)*yBerL^x0hbe4k5Jt-re3l`dAuj-)?U|Yr3J=#I^SC_71RWjZhy~
zv>nqsaOD`VOvZq>#2RA(zNM`r6-UP^Lgj;i-m=I$xYe4c#>A>*OdMjhSk2aM)&gsx
zUZcu-hgy*LuvQCF9&SOn<rYLb!h$sKupq;V&_dHz(%_LJ+dJM|j}h51tdXOD)jK0^
zB^tNb;IgpC2zy4>gc%JOploHlqap1vk=IFS4}hr>X*JUiw9wJ|OvglrH$%}d)_RI=
zpXS@8GKMJZJ2;@3j#l0fSQy2}R;kxeX~0`W6^~OYzKbfZri#Z?MV%_1Ko!TOD!$w5
zcxys*LH+kc-icJ70v)qm^?Sl%(G0Rh+XsH{1pp^SUN@@fqpEZmUscLGnObC9_1ZYm
zThlcfSnW<V3@X$^6XvL2o?4mIsy5ZCcblHVma}$XmNH%+nztg)CjJq44sOYb-EVHx
z`dwdxL$Py3)7SF0U~roB!CKyMeB=gVYJ&rLaDi=ljeb{bt+n4SX>%87W{|0_0VDYv
zoWNLbYGSSqB+Lb&n0fXe%?-6<3|X6Z*E!l!uK)l}O8RI+MM`fi)h{X|mZ+pdon2~Q
zrn(-~?M$^5i(Sf(yx@OBr4TAvu}YTejQvWFb<|@$_1Hi?Hd2rG#b(3cJ_Q}|zi*8Q
zz4`r-cPe``)xhk9!HhqPy=GJ7Z6?Hrqu1yT42cOl9h|Uu(e86h4%(dSz|+E;YMfBC
zRxua!4GuVi17Zs2S~aMbdLI}vy`}8^L50(4#OZY6bOv!clQ^AKZSO70-e*VNITVvz
zHdUj2uHy0`a``a1oJTGnA(xL5?RvV>j{)tsNsEsIvQI?b`Kc^t4}<K2$h(k`9SO)*
zyBJ(V2i|P(vSe&w4i9WEG#6n+<!peXAS=$d1_ydf=>uTSe7HYUH8pqedTnXOyJ#eC
zpHv!uiW*-`jXzC|KSPZ_TaDZ26mDB1@AH&s#oH#4_XP-aLA43Ks08{F1-gU+T}pwz
zOo1+=2^wgE0hr)zl;Lui;VY4M1<gQtwx(t<(RsPNxH9stLT0tcwHDFKT&;w?hQfZ8
z!hVgye%;#1puE>wbp}PAkUE=hv|5~QuZz5I5=E{#SBzY9ehckinc$%&-0M{n-)0jx
zu!$Sl#7*RX^DySO0F&)<{0_AHZsgrc?a2MQcu>;s4MyJgD9J96B%MnAupIXo1Af=U
z)T7+^67Ty}f+^4R10~oGDcFxF*pDgLPbk<=DOgjg^=%OB^)zrh<h&#D?xdV-Y%rFS
zGu~a1_cJ6b{8Mn$B=_@Ht7>xl1;zL!C%3yP)jgEuSCnN^D$B21l{30G^6sPF)1WtY
z3{^8%#lhSU3GPblpd8EtO5F#^_#w9Q8>;(THt{<&QJGL4Rs-dc$ooC@AeVcqd-tP?
z%VXs7IJrDQE>DunQ?a1v-A@Cs{~*~j!0Fk@doJbwNZMPKYR^aB3sh}tqFR|-1TFOx
zK4#57jMVIpN~S+irax1rzfh*XQl`IEYxZ}g*^80)54KD$&sS^qlH&4Da(S6tULlu%
zfs2g7>VwKn#?Y0~h(Nzr6;H;X!0DT1EJ!5d@J(BLv06{5QTerTe%E8rmMahVM|M{O
z3lOY2Y=etJ-;{nkXKGkKn1V^BbxpkC&<?VKpuD8LJ&v}a?!jxa3o@P99&OaTaQ@&x
zU|<E)V`F~W4j(SkH)>^Wu#^w(cSBzTe@s`x48zZ;q|)H!B@<KEaOv8#<t7@jmCqK#
z#@Z&AGkk78;kQHZDVy}$m<YMH$|HSn!1R|&9aJ7+L8(_Tw0BDbGxzM44C&t8GM;qb
zZka#|Q#68B*;JaC4o@Hx5r||GzU(~zkKmk41X>F0PF1~GrYIzU=nl*PqC1iT(W#_B
zbQ&oToes**J%ycnCq!D&yBEBX?kF=*3q5`&NF=iqi+OL5#cb4q7PR8F`zP!kO>Bg7
zW=7_q0Ia<;NF=-9OKZ=8wEuBTh=!7w?qn`&=;OHUlxBq0F-JUnWLL!XTC^34E%TT;
z8GN@HV$y;v0=OF~0G&??pj$}+^a4@<yE`bBkxD0GyO8M})h#YU3UFHt5=k4rP=-@P
zf$G6oVCULU(OueA;>f)vPC@#x|ByY93t;vHiDWN)3CxaAV0&Id_C^8Xu@4JYl-?Jy
zLaN?=EHa1NE!m$zXm|iAG(3<L8ZIH7fF;6^l1rJiP_K=}l7kS%5~QPRD<t`!_e{$m
zE$neHNF;~gOAP-{NPZ}UtqdP5`jSnH9Hvw`JW=ID7$I35(Jf;UUM}LWL2IRNPh*&C
zT}&D|p|{qIelw@7iBG>OJ&94rXe+xp*KKp9kF$=pRF*3thAlee2-P(D&O4ZizO#Z9
zed<V3jG_)w^rfRfs~!70nNG*P5`jpL#uwHo#BCI)SGBi0MrEU!PG+E)V@c7>DpE9a
z94VT47bv~mRF25ih|t^Z^CoeT<G}zOMhA)H1jTLMo9Fg!Fn|%MaM)8wJRMIyB6&~3
zdsj&MI;<flk`>1Hds#2>cPAlSb*wAhh!>Qfn+~ptpBrgfIhmXQV3rhst|0}`1}T8<
zAqB8GP&xuiPi*s~vA2tRkC;dSSiK;T^x>O&JF2L>T_JXHg~XRxs-zv4?3xK7U%dxP
z0mZ2CS{AQ(v?5}KRD}|Y%u*iBVGvrlq|l;F3N1X+jPhuyBEqDFg^DK|3pv=^eWXL3
z03?zSUpk94v!9hxQ&x?~b*l9Gr1TQ7O3nt<(X8f{)$u(yE$O-`UjCZF&=Q|#fcf6G
zjBHSi3?FYB6>DhrK4wC*Q%GUAh!l2wKPfal6|{Q1ZDKmd+hznJ`2fCD=)kukqI{4{
zTME>=dbFOVm_x|ZnE@fsAcc@;l0wL{NFn4FP>$AV>``YkvEwaDbPkxnYUhGP@*#Zb
zR1z_%xpJNGp0HW6ca{&UvggHRx7k6<M^pxs`6vQZ=3}H#=HsML<`bkdxuKTx8EjB{
z>KVz7PA)*2+E&Yj2t{&{iqBJbG^<A5(Ik6Z+|kG<$*ZM6=@M)YW&i(_st$23W(LIh
zG%3XS3@OC<EGcC994N7^2(pzK9k1E$=TQs@egPzsFXBrC6Je-9Jo&IEeMuF$Brejm
z5<TezwZoW?Nkwfha6DQva0xXyaO>7XZr$2k(Jna+Hyj?DV?z|53pFn{ie}k%nl)|d
z0=X1?hwINxy?j|U2mLQ&KJ*_Th5nb5LjSLjLjNm3ssF6h5LYsz<87DoDzF7!SA#@y
z4Zg%H5uOMsywbk*RaNS1aj9+l+SgSEl)DxID)$XiD0dwxl=~*>Y}MDk#o&0=*LF@-
zydG(BU;8#fk=&r-^VIF$@}b*3xsi2S3Y4b0Z{4JdqxqYef#z=^Mf2YwMf2Y!1-7?>
z65C3{gUsmIrk(F08Q6RuB$6NCOKg(HDdA9G`k^ZFqqs=d`DtImc_I6fk;~z19@|bM
z<V8t(OQ|-{Sn1<t(Kc{ci{n@=ndhuN+_eU!4R+o%xP+<Phh=a=&wY0vHnf9Vwc>mO
z7kJnxrxlTIg+1JBw__8bHtI%LsVzT-gu{_jz49kYa3J?n<^#FgNP*n#q(JTtQXqFH
zD3Q}rlih^`u2J@X^D4{FzymP<93+xoD2DUi62o7D2ehP7hE^(fEB5y!>@~>yT3E}k
z$OnV=*Q`{TwC_c%>vh$?kM)7x{iHzi0aBp+ASqCOh!m*)29%2v3e2hGx1=4fuZ`cK
zEWmphB$7w)MITk0H0p~EinT$z3W4DaDE+D(NPdrE;Pfa+B#+?>POnkrag^Ey=qD6|
zCldxOLqNYq-+YS9fcDd@SwZ_5#JXNTlV`~UkUvKX$e$+#<S&o{@;{IQ@;`!BL;feG
zcf5gy{)`Gh>n|XY{1x96cdB2Fd(~9^H&yuWLxs~DV0G9nFRBa(`ws*t>`SCj;-92Y
z>SfZMmHT{!!A9ji=cQxuUr3AH=cqB1YBavIA)h|1s62g;F-V5dC``5Y9IHyB^>NHc
z>oufky_OWM*O3CcdQkd+O1llr=or~d2B`pOJV+!H@P#Oaq;1MK<UAWyk*2sv*Lje3
zwT(kLoc7^Ug#U!cbm&R3?)0@`?<LeGP~FNTlk*~6$>4g%$3<v7hr>ytuFtD2UV<*l
zAR$+Dc?ig)!GZGNwZS6Xk><3AH(jbNpU=tNE%TC8JtfiR&Yde0A=_}sl-r!7L<VG&
znGeXOkOHzDNCDZ7q=0NHC?VS|HPtj`bo@{1Ivt|HZaaZQG6P@QEdhX*8nW9=Rb*CN
zq|1TbmSby<YYjkuSkYW>`<$Yhu_|KF2w;e0O2ct0K$gDdc;$rS-6H;dEV!`Rx*RVz
zco8jTz#Gc^d~<ynN4_{E#vwC`X&^ox2F;b(XnH$lnWH3vS$1YV%(4q9%%YLPEOSX=
zmS#|zWkG6|U76AG-%w>9S_bMZAd&2bFHukQBhCu-bQv~Zm1>PkZMzIxpfaHU?g&u-
zg{07b5h?UvOgcmPkv0bFl^<D@qR@`C*pKXiP$YY*_&oJi>xksti`o#%UaZ|xpgh&C
zWN%dg0_?*K2(T|H1lW%h0_;x;0~`QK15}zmkQp7@X=w>EfX`BpNDji6_$19!N`+6(
zFI%>=zRk$z<CkiIo5RBhoXajl5iI!+R@D!QtE*XZNOU|Wic8C($mc|K7|ZGPPFTWi
zubG#_5#M69=r!swk}OA5AJ<oOd*ld}1I6Bf02N(93IL8I1ppnSQ1~cNy$&}h=+3^p
z6R~btiEnGCdbeXcxJW7%<!B_GA;;j`*;Rva)q{%*UpiIlu`0D5slFKmw$ta!DwT1Z
z%BV#~VBu2Hmv^b;)hf9G$+p7_8l&jT@hV4GIXn~SH9R>%rM(+pQ?Iq`eBN}V3$ZQw
z1l!3KL%ff}6}T_&L0Y$*h;M6wauz67fg%*xV1c{~WM=C1C1ZWwEC-gn7x9&2VCwW9
zPfkKgx{o!uWYNb5g10Qau3$+l-N^3L8!ON0_(DrgMq(sceD!)HsMlGtMkN|doaApP
z^|-}sTFaLnB;)XhnUjY-&r|&JD%WK0jw7mORe@erppOL_ayDNBxQ;KDO11Ijh|wpc
zF9Z2HObSTGTfmAgm1l&qR#hwFyUhzAe}j+n&9rDnN+^Wx>VQPzvW8mJp-+}o1U<_`
zK(8s9m=#43UOAcr%SVX)FJNx+CQm{pE?_t8X9(SJ9kbPIHd&A0$|?FdzTK1!D*dR=
z701d(1Vb)H--m!Yc{v4vNFsbI(!5_qAkC>Pga$T|qW#UJkmm!WXz+ueTy9Y#GChs7
zqiYfRUI!ZnbZfQvP+n_}FFcwxOd6OmFb^cxEBQ7#9rfS_&H#zzOnhTeS_%{nKEPUN
ztx`m98jh))r3w@hWVa{=XIB^i*>h9`x}1wZitL9Fj*<N^Le%U$=BCJggoz5-k1_;B
zKgR4B*^eW*a%zI?ClD!AFg>58c?NL-0+C#ZZw1qfR0MK-l7)cjr%2KA#iYRW)1+wX
zGoZwjx)9UPlD-<I@ge7SG5s9s0n@D@k$fKC6jKUUjcFmq5aSw;I{D~D<O?X$sn^^2
z_`R!q5pg_u#lm#xDXcGFLTa~Mg0J3~4x@O0U5YduiZEvqyebxGxgZ<&179vv)drYZ
zU-5O9BU&|ndId`k)5&K}Fp5|~WaKNzcjXFvBe{}g^(m=4$nvQtdzvp-AqR5qfc9L;
z<LxgNd~kR<dgZH;*QrmC-W)369dIZ`xdv(atYpI&xGvs8+h)+Kw&qq)Dz?j4S)u{M
zK4+>IrC*C%Xeyg!sv2Jq`to(fyvfG|P|hZ|>Aqa6QX4S=Rmu1ba;)K8u|ck5xUpzB
zeIec(pdwBazR9#P@Y3I6pdpW|63iZ@vRsci6;MXX#xCO9NW;6;2~ZVJo}GC5zCjht
zSVj@gAC)J$k;TU8jfs5mLs_|r<*Y+H_1Q4FD_H>L<}veR<EVw_WJLsTMlpR7wf9lc
zLi<IaA-6EOCU5qHeexZ0(kGdiQQ2iSU_!A>Gm!5heTzN^uhz<8@M`>TC8Ju3hFN`(
zkw!lI#r&LI&uK%xhcsAqVm>UDvlS2Q%lDCv$pmk9ZKu~w3jZK3+_cURhq{2TX_VxL
zs_aynjq@F?pH1(c<VVQV>yfv(WsiOG@?%CPV|9yH;g}pkKSA*)WL=}z;;mh;-6ua)
zES1gCyZdcyPF#`ORO(dhMU1ss95mX+EY>aRFvpkMk$ILr2db7Tv)NEL%KBvjdj|?_
z(Z`xjzuc*q#fq1GGt5KFQc><w$&;{vcF~cC=Kr6m^eIFSuL#xa;{=tTE1u)yy${~R
zI&0+@s&Es>LsduqrAnPR!eVkalJ%M}=v{n(+{17tVZ~AOtC*ARR2x}-&0-Cz%3>dI
z-OKpIEM@_t2L?z$yie6_fTt-#3VXfW&te>MMo)H~oyQ{M0i>*~*PDiSQhAUCYxLt+
zK%|Elu1ntV%WoK4_LiQb%Wuh}A$b@Lv;Ge8PQ6KW!6CpOR;d%%t13R_5!T!#@hR)p
zt!s;)PAi|1H~VpDSN7ZG_bfGgIAkNn-J>W{P~)MAem6UW(POMU#?H&*3^ZW?RNMLq
zByQ1X#be!!AENodGO)7A6M1<OMKE#_Bd8JK%Tq|~mZ!;bni?Zmw&E=fe?(zAv{_!B
zK_*7xc>G|XlJ;zz)~KMV`19wG+8OrfQ%5eqFrp-o=UHi#dX_IQARNgb@NKoG<LG2Y
zyz$sMKFZh$&-!K+ES_r2jISML$0x*d3VR|k)Ta#lxktQs{G(#|Cw#GTSi(jBpA~yd
zzkgvOrrW=gV*33XXl3I6I}_E!{~|+}jsF1}>J8~!<I77(z|jr9>MRStE0C8FiR2ZQ
H>}mTq^BPQP

diff --git a/docs/fr/_build/doctrees/install.doctree b/docs/fr/_build/doctrees/install.doctree
deleted file mode 100644
index 433be37db97d885eb5cd381b79de179d224e7129..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10934
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

diff --git a/docs/fr/_build/doctrees/internals.doctree b/docs/fr/_build/doctrees/internals.doctree
deleted file mode 100644
index 6c8143cbf1717d7063f88039541159cfbaa3fe7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19934
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

diff --git a/docs/fr/_build/doctrees/settings.doctree b/docs/fr/_build/doctrees/settings.doctree
deleted file mode 100644
index 2fb10dd7983965d9e1d5e6ed9dce77ebacd6dbdf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41041
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
aPYUj7DtKa?)K;g8=(7~Kz@wH875@*3bRuT}

diff --git a/docs/fr/_build/doctrees/themes.doctree b/docs/fr/_build/doctrees/themes.doctree
deleted file mode 100644
index 8410575b665b1931c7f96c6322502d20acf6d6c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29358
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
SW<J8q{9FzYE|tcrrvC%3@6XKu

diff --git a/docs/fr/_build/html/.buildinfo b/docs/fr/_build/html/.buildinfo
deleted file mode 100644
index b8d60d4c..00000000
--- a/docs/fr/_build/html/.buildinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sphinx build info version 1
-# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 169ffeb4c85c990fa0841cda8c347b3b
-tags: fbb0d17656682115ca4d033fb2f83ba1
diff --git a/docs/fr/_build/latex/Makefile b/docs/fr/_build/latex/Makefile
deleted file mode 100644
index 5c0d5018..00000000
--- a/docs/fr/_build/latex/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# Makefile for Sphinx LaTeX output
-
-ALLDOCS = $(basename $(wildcard *.tex))
-ALLPDF = $(addsuffix .pdf,$(ALLDOCS))
-ALLDVI = $(addsuffix .dvi,$(ALLDOCS))
-
-# Prefix for archive names
-ARCHIVEPRREFIX =
-# Additional LaTeX options
-LATEXOPTS =
-
-all: $(ALLPDF)
-all-pdf: $(ALLPDF)
-all-dvi: $(ALLDVI)
-all-ps: all-dvi
-	for f in *.dvi; do dvips $$f; done
-
-zip: all-$(FMT)
-	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
-	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
-	zip -q -r -9 $(ARCHIVEPREFIX)docs-$(FMT).zip $(ARCHIVEPREFIX)docs-$(FMT)
-	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
-
-tar: all-$(FMT)
-	mkdir $(ARCHIVEPREFIX)docs-$(FMT)
-	cp $(ALLPDF) $(ARCHIVEPREFIX)docs-$(FMT)
-	tar cf $(ARCHIVEPREFIX)docs-$(FMT).tar $(ARCHIVEPREFIX)docs-$(FMT)
-	rm -r $(ARCHIVEPREFIX)docs-$(FMT)
-
-bz2: tar
-	bzip2 -9 -k $(ARCHIVEPREFIX)docs-$(FMT).tar
-
-# The number of LaTeX runs is quite conservative, but I don't expect it
-# to get run often, so the little extra time won't hurt.
-%.dvi: %.tex
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-	-makeindex -s python.ist '$(basename $<).idx'
-	-makeindex -s python.ist '$(basename mod$<).idx'
-	latex $(LATEXOPTS) '$<'
-	latex $(LATEXOPTS) '$<'
-
-%.pdf: %.tex
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-	-makeindex -s python.ist '$(basename $<).idx'
-	-makeindex -s python.ist '$(basename mod$<).idx'
-	pdflatex $(LATEXOPTS) '$<'
-	pdflatex $(LATEXOPTS) '$<'
-
-clean:
-	rm -f *.pdf *.dvi *.ps
-	rm -f *.log *.ind *.aux *.toc *.syn *.idx *.out *.ilg *.pla
-
-.PHONY: all all-pdf all-dvi all-ps clean
-
diff --git a/docs/fr/_build/latex/Raclette.tex b/docs/fr/_build/latex/Raclette.tex
deleted file mode 100644
index 78d907f2..00000000
--- a/docs/fr/_build/latex/Raclette.tex
+++ /dev/null
@@ -1,829 +0,0 @@
-% Generated by Sphinx.
-\documentclass[letterpaper,10pt,english]{manual}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{babel}
-\usepackage{times}
-\usepackage[Bjarne]{fncychap}
-\usepackage{longtable}
-\usepackage{sphinx}
-
-
-\title{Raclette Documentation}
-\date{January 24, 2011}
-\release{2}
-\author{Alexis Métaireau}
-\newcommand{\sphinxlogo}{}
-\renewcommand{\releasename}{Release}
-\makeindex
-\makemodindex
-
-\makeatletter
-\def\PYG@reset{\let\PYG@it=\relax \let\PYG@bf=\relax%
-    \let\PYG@ul=\relax \let\PYG@tc=\relax%
-    \let\PYG@bc=\relax \let\PYG@ff=\relax}
-\def\PYG@tok#1{\csname PYG@tok@#1\endcsname}
-\def\PYG@toks#1+{\ifx\relax#1\empty\else%
-    \PYG@tok{#1}\expandafter\PYG@toks\fi}
-\def\PYG@do#1{\PYG@bc{\PYG@tc{\PYG@ul{%
-    \PYG@it{\PYG@bf{\PYG@ff{#1}}}}}}}
-\def\PYG#1#2{\PYG@reset\PYG@toks#1+\relax+\PYG@do{#2}}
-
-\def\PYG@tok@gd{\def\PYG@tc##1{\textcolor[rgb]{0.63,0.00,0.00}{##1}}}
-\def\PYG@tok@gu{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.50,0.00,0.50}{##1}}}
-\def\PYG@tok@gt{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.25,0.82}{##1}}}
-\def\PYG@tok@gs{\let\PYG@bf=\textbf}
-\def\PYG@tok@gr{\def\PYG@tc##1{\textcolor[rgb]{1.00,0.00,0.00}{##1}}}
-\def\PYG@tok@cm{\let\PYG@it=\textit\def\PYG@tc##1{\textcolor[rgb]{0.25,0.50,0.56}{##1}}}
-\def\PYG@tok@vg{\def\PYG@tc##1{\textcolor[rgb]{0.73,0.38,0.84}{##1}}}
-\def\PYG@tok@m{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
-\def\PYG@tok@mh{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
-\def\PYG@tok@cs{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.50,0.56}{##1}}\def\PYG@bc##1{\colorbox[rgb]{1.00,0.94,0.94}{##1}}}
-\def\PYG@tok@ge{\let\PYG@it=\textit}
-\def\PYG@tok@vc{\def\PYG@tc##1{\textcolor[rgb]{0.73,0.38,0.84}{##1}}}
-\def\PYG@tok@il{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
-\def\PYG@tok@go{\def\PYG@tc##1{\textcolor[rgb]{0.19,0.19,0.19}{##1}}}
-\def\PYG@tok@cp{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
-\def\PYG@tok@gi{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.63,0.00}{##1}}}
-\def\PYG@tok@gh{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.00,0.50}{##1}}}
-\def\PYG@tok@ni{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.84,0.33,0.22}{##1}}}
-\def\PYG@tok@nl{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.13,0.44}{##1}}}
-\def\PYG@tok@nn{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.05,0.52,0.71}{##1}}}
-\def\PYG@tok@no{\def\PYG@tc##1{\textcolor[rgb]{0.38,0.68,0.84}{##1}}}
-\def\PYG@tok@na{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
-\def\PYG@tok@nb{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
-\def\PYG@tok@nc{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.05,0.52,0.71}{##1}}}
-\def\PYG@tok@nd{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.33,0.33,0.33}{##1}}}
-\def\PYG@tok@ne{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
-\def\PYG@tok@nf{\def\PYG@tc##1{\textcolor[rgb]{0.02,0.16,0.49}{##1}}}
-\def\PYG@tok@si{\let\PYG@it=\textit\def\PYG@tc##1{\textcolor[rgb]{0.44,0.63,0.82}{##1}}}
-\def\PYG@tok@s2{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
-\def\PYG@tok@vi{\def\PYG@tc##1{\textcolor[rgb]{0.73,0.38,0.84}{##1}}}
-\def\PYG@tok@nt{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.02,0.16,0.45}{##1}}}
-\def\PYG@tok@nv{\def\PYG@tc##1{\textcolor[rgb]{0.73,0.38,0.84}{##1}}}
-\def\PYG@tok@s1{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
-\def\PYG@tok@gp{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.78,0.36,0.04}{##1}}}
-\def\PYG@tok@sh{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
-\def\PYG@tok@ow{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
-\def\PYG@tok@sx{\def\PYG@tc##1{\textcolor[rgb]{0.78,0.36,0.04}{##1}}}
-\def\PYG@tok@bp{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
-\def\PYG@tok@c1{\let\PYG@it=\textit\def\PYG@tc##1{\textcolor[rgb]{0.25,0.50,0.56}{##1}}}
-\def\PYG@tok@kc{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
-\def\PYG@tok@c{\let\PYG@it=\textit\def\PYG@tc##1{\textcolor[rgb]{0.25,0.50,0.56}{##1}}}
-\def\PYG@tok@mf{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
-\def\PYG@tok@err{\def\PYG@bc##1{\fcolorbox[rgb]{1.00,0.00,0.00}{1,1,1}{##1}}}
-\def\PYG@tok@kd{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
-\def\PYG@tok@ss{\def\PYG@tc##1{\textcolor[rgb]{0.32,0.47,0.09}{##1}}}
-\def\PYG@tok@sr{\def\PYG@tc##1{\textcolor[rgb]{0.14,0.33,0.53}{##1}}}
-\def\PYG@tok@mo{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
-\def\PYG@tok@mi{\def\PYG@tc##1{\textcolor[rgb]{0.13,0.50,0.31}{##1}}}
-\def\PYG@tok@kn{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
-\def\PYG@tok@o{\def\PYG@tc##1{\textcolor[rgb]{0.40,0.40,0.40}{##1}}}
-\def\PYG@tok@kr{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
-\def\PYG@tok@s{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
-\def\PYG@tok@kp{\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
-\def\PYG@tok@w{\def\PYG@tc##1{\textcolor[rgb]{0.73,0.73,0.73}{##1}}}
-\def\PYG@tok@kt{\def\PYG@tc##1{\textcolor[rgb]{0.56,0.13,0.00}{##1}}}
-\def\PYG@tok@sc{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
-\def\PYG@tok@sb{\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
-\def\PYG@tok@k{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.00,0.44,0.13}{##1}}}
-\def\PYG@tok@se{\let\PYG@bf=\textbf\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
-\def\PYG@tok@sd{\let\PYG@it=\textit\def\PYG@tc##1{\textcolor[rgb]{0.25,0.44,0.63}{##1}}}
-
-\def\PYGZbs{\char`\\}
-\def\PYGZus{\char`\_}
-\def\PYGZob{\char`\{}
-\def\PYGZcb{\char`\}}
-\def\PYGZca{\char`\^}
-\def\PYGZsh{\char`\#}
-\def\PYGZpc{\char`\%}
-\def\PYGZdl{\char`\$}
-\def\PYGZti{\char`\~}
-% for compatibility with earlier versions
-\def\PYGZat{@}
-\def\PYGZlb{[}
-\def\PYGZrb{]}
-\makeatother
-
-\begin{document}
-
-\maketitle
-\tableofcontents
-\hypertarget{--doc-index}{}
-
-
-Pelican est un generateur de blog simple codé en python
-\begin{itemize}
-\item {} 
-Écrivez vos articles directement dans votre éditeur favori (vim !) et
-directement en syntaxe reStructuredText ou Markdown ;
-
-\item {} 
-Un outil simple en ligne de conmmande pour (re)générer le blog ;
-
-\item {} 
-Sortie complètement statique, facile pour l'héberger n'importe où ;
-
-\end{itemize}
-
-
-\chapter{Fonctionnalités}
-
-Pelican supporte actuellement :
-\begin{itemize}
-\item {} 
-des articles de blog ;
-
-\item {} 
-des pages statiques ;
-
-\item {} 
-les commentaires via un service externe (\href{http://disqus.com}{disqus})
-Notez qu'étant bien un service externe assez pratique, vous ne gérez pas
-vous même les commentaires. Ce qui pourrait occasionner une perte de vos données;
-
-\item {} 
-support de template (les templates sont crées avec Jinja 2 \href{http://jinjna.pocoo.org}{jinja2}) ;
-
-\item {} 
-génération optionnelle de vos pages et articles en pdf.
-
-\end{itemize}
-
-
-\chapter{Pourquoi le nom ``Pelican'' ?}
-
-Vous n'avez pas remarqué ? ''Pelican'' est un anagramme pour ``Calepin'' ;)
-
-
-\chapter{Code source}
-
-Vous pouvez accéder au code source via mercurial sur  \href{http://hg.notmyidea.org/pelican/}{http://hg.notmyidea.org/pelican/}
-ou via git à l'adresse \href{http://github.com/ametaireau/pelican/}{http://github.com/ametaireau/pelican/}
-
-
-\chapter{Feedback !}
-
-Si vous voulez de nouvelles fonctionnalitées pour Pelican, n'hésitez pas à me le dire,
-à cloner le dépôt, etc … C'est open source !!!
-
-Contactez moi à ``alexis at notmyidea dot org'' pour quelques requêtes ou retour d'expérience que ce soi !
-
-
-\chapter{Documentation}
-
-\resetcurrentobjects
-\hypertarget{--doc-getting\_started}{}
-
-\section{Installation et mise à jour de Pelican}
-
-
-\subsection{Installation}
-
-Il y a deux façons d’installer Pelican sur son système. La première est via l’utilitaire
-pip, l’autre façon est de télécharger Pelican via Github. Ici nous allons voir les deux
-façons de procéder.
-
-
-\subsubsection{Via pip}
-
-Pour installer Pelican via pip, vous aurez besoin du paquet python-pip. puis installez Pelican
-
-\begin{Verbatim}[commandchars=\\\{\}]
-\PYG{c}{\PYGZsh{} apt-get install python-pip}
-\PYG{c}{\PYGZsh{} pip install pelican}
-\end{Verbatim}
-
-
-\subsubsection{Via Github}
-
-Pour installer Pelican en reprenant le code via Github, nous aurons besoin du paquet
-git-core pour récupérez les sources de Pelican. Puis nous procédons à l’installation
-
-\begin{Verbatim}[commandchars=@\[\]]
-@# apt-get install git-core
-@$ git clone https://github.com/ametaireau/pelican.git
-@$ cd pelican
-@# python setup.py install
-\end{Verbatim}
-
-
-\subsection{Mises à jour}
-
-
-\subsubsection{Via pip}
-
-Rien de bien compliqué pour mettre à jour via pip
-
-\begin{Verbatim}[commandchars=@\[\]]
-@$ cd votreRepertoireSource
-@$ pip install --upgrade pelican
-\end{Verbatim}
-
-
-\subsubsection{Via Github}
-
-C'est un peu plus long avec Github par contre
-
-\begin{Verbatim}[commandchars=@\[\]]
-@$ cd votreRepertoireSource
-@$ git pull origin master
-@$ cd pelican
-@# python setup.py install
-\end{Verbatim}
-
-Vous aurez un message d’erreur si le module setuptools de python n’est pas installé.
-La manipulation est la suivante
-
-\begin{Verbatim}[commandchars=\\\{\}]
-\PYG{c}{\PYGZsh{} apt-get install python-setuptools}
-\end{Verbatim}
-
-
-\subsection{Alors, quelle méthode choisir ?}
-
-Vous avez le choix entre deux méthodes, mais aussi entre deux concepts. La méthode
-de Github est la version de développement, où les modifications arrivent assez
-fréquemment sans être testées à fond. La version de pip est une version arrêtée avec un
-numéro de version dans laquelle vous aurez moins de bug. N’oubliez cependant pas
-que le projet est très jeune et manque donc de maturité. Si vous aimez avoir les toutes
-dernières versions utilisez Github, sinon penchez vous sur pip.
-
-\resetcurrentobjects
-\hypertarget{--doc-settings}{}
-
-\section{Settings}
-
-
-\subsection{Specifying the settings}
-
-Pelican is configurable thanks to a configuration file, that you can pass to
-the command line:
-
-\begin{Verbatim}[commandchars=@\[\]]
-@$ pelican -s path/to/your/settingsfile.py path
-\end{Verbatim}
-
-Settings are given as the form of a python module (a file). You can have an
-example by looking at \href{https://github.com/ametaireau/pelican/raw/master/samples/pelican.conf.py}{/samples/pelican.conf.py}
-
-All the settings identifiers must be set in caps, otherwise they will not be
-processed.
-
-Here are the available settings. Please note that all the settings you put in
-this file will be passed to the templates as well.
-
-\begin{tabulary}{\textwidth}{|L|L|}
-\hline
-\textbf{
-Setting name
-} & \textbf{
-what it does ?
-}\\
-\hline
-
-\emph{AUTHOR}
- & 
-Default author (put your name)
-\\
-
-\emph{CATEGORY\_FEED}
- & 
-Where to put the atom categories feeds. default is
-\emph{feeds/\%s.atom.xml}, where \%s is the name of the
-category.
-\\
-
-\emph{CATEGORY\_FEED\_RSS}
- & 
-Where to put the categories rss feeds. default is None
-(no rss)
-\\
-
-\emph{CSS\_FILE}
- & 
-To specify the CSS file you want to load, if it's not
-the default one (`main.css')
-\\
-
-\emph{DEFAULT\_CATEGORY}
- & 
-The default category to fallback on. \emph{misc} by default.
-\\
-
-\emph{DEFAULT\_LANG}
- & 
-The default language to use. Default is `en'.
-\\
-
-\emph{DISPLAY\_PAGES\_ON\_MENU}
- & 
-Display or not the pages on the menu of the template.
-Templates can follow or not this settings.
-\\
-
-\emph{FALLBACK\_ON\_FS\_DATE}
- & 
-If True, pelican will use the file system dates infos
-(mtime) if it can't get informations from the
-metadata?
-\\
-
-\emph{FEED}
- & 
-relative url to output the atom feed. Default is
-\emph{feeds/all.atom.xml}
-\\
-
-\emph{FEED\_RSS}
- & 
-relative url to output the rss feed. Default is
-None (no rss)
-\\
-
-\emph{JINJA\_EXTENSIONS}
- & 
-A list of any Jinja2 extensions you want to use.
-Default is no extensions (the empty list).
-\\
-
-\emph{KEEP\_OUTPUT\_DIRECTORY}
- & 
-Keep the output directory and just update all the generated files.
-Default is to delete the output directory.
-\\
-
-\emph{MARKUP}
- & 
-A list of available markup languages you want to use.
-For the moment, only available values are \emph{rst} and \emph{md}.
-\\
-
-\emph{OUTPUT\_PATH}
- & 
-Where to output the generated files. Default to
-``output''
-\\
-
-\emph{PATH}
- & 
-path to look at for input files.
-\\
-
-\emph{PDF\_PROCESSOR}
- & 
-Put True if you want to have PDF versions of your
-documents. You will need to install \emph{rst2pdf}.
-\\
-
-\emph{REVERSE\_ARCHIVE\_ORDER}
- & 
-Reverse the archives order. (True makes it in
-descending order: the newer first)
-\\
-
-\emph{SITEURL}
- & 
-base URL of your website.
-\\
-
-\emph{SITENAME}
- & 
-Your site name,
-\\
-
-\emph{STATIC\_PATHS}
- & 
-The static paths you want to have accessible on the
-output path ``static''. By default, pelican will copy
-the `images' folder to the output folder.
-\\
-
-\emph{STATIC\_THEME\_PATHS}
- & 
-Static theme paths you want to copy. Default values
-is \emph{static}, but if your theme have others static paths,
-you can put them here.
-\\
-
-\emph{THEME}
- & 
-theme to use to product the output. can be the
-complete static path to a theme folder, or chosen
-between the list of default themes (see below)
-\\
-
-\emph{TRANSLATION\_FEED}
- & 
-Where to put the RSS feed for translations. Default
-is feeds/all-\%s.atom.xml where \%s is the name of the
-lang.
-\\
-\hline
-\end{tabulary}
-
-
-
-\subsection{Themes}
-
-3 themes are available. You can specify them using the \emph{-t} option:
-\begin{itemize}
-\item {} 
-notmyidea
-
-\item {} 
-simple (a synonym for ``full text'' :)
-
-\item {} 
-martyalchin
-
-\end{itemize}
-
-You can define your own theme too, and specify it's emplacement in the same
-way (be sure to specify the full absolute path to it).
-
-Here is \href{http://alexis.notmyidea.org/pelican/themes.html}{a guide on how to create your theme}
-
-The \emph{notmyidea} theme can make good use of the following settings. I recommend
-to use them too in your themes.
-
-\begin{tabulary}{\textwidth}{|L|L|}
-\hline
-\textbf{
-Setting name
-} & \textbf{
-what it does ?
-}\\
-\hline
-
-\emph{DISQUS\_SITENAME}
- & 
-Pelican can handle disqus comments, specify the
-sitename you've filled in on disqus
-\\
-
-\emph{GITHUB\_URL}
- & 
-Your github URL (if you have one), it will then
-use it to create a github ribbon.
-\\
-
-\emph{GOOGLE\_ANALYTICS}
- & 
-`UA-XXXX-YYYY' to activate google analytics.
-\\
-
-\emph{LINKS}
- & 
-A list of tuples (Title, Url) for links to appear on
-the header.
-\\
-
-\emph{SOCIAL}
- & 
-A list of tuples (Title, Url) to appear in the ``social''
-section.
-\\
-
-\emph{TWITTER\_USERNAME}
- & 
-Allows to add a button on the articles to tweet about
-them. Add you twitter username if you want this
-button to appear.
-\\
-\hline
-\end{tabulary}
-
-
-In addition, you can use the ``wide'' version of the \emph{notmyidea} theme, by
-adding that in your configuration:
-
-\begin{Verbatim}[commandchars=\\\{\}]
-\PYG{n}{CSS\PYGZus{}FILE} \PYG{o}{=} \PYG{l+s}{"}\PYG{l+s}{wide.css}\PYG{l+s}{"}
-\end{Verbatim}
-
-\resetcurrentobjects
-\hypertarget{--doc-themes}{}
-
-\hypertarget{theming-pelican}{}\section{How to create themes for pelican}
-
-Pelican uses the great \href{http://jinjna.pocoo.org}{jinja2} templating engine to
-generate it's HTML output. The jinja2 syntax is really simple. If you want to
-create your own theme, feel free to take inspiration from the ``simple'' theme,
-which is available \href{https://github.com/ametaireau/pelican/tree/master/pelican/themes/simple/templates}{here}
-
-
-\subsection{Structure}
-
-To make your own theme, you must follow the following structure:
-
-\begin{Verbatim}[commandchars=@\[\]]
-├-- static
-@textbar[]   ├-- css
-@textbar[]   └-- images
-└-- templates
-    ├-- archives.html    // to display archives
-    ├-- article.html     // processed for each article
-    ├-- categories.html  // must list all the categories
-    ├-- category.html    // processed for each category
-    ├-- index.html       // the index. List all the articles
-    ├-- page.html        // processed for each page
-    ├-- tag.html         // processed for each tag
-    └-- tags.html        // must list all the tags. Can be a tag cloud.
-\end{Verbatim}
-\begin{itemize}
-\item {} 
-\emph{static} contains all the static content. It will be copied on the output
-\emph{theme/static} folder then. I've put the css and image folders, but they are
-just examples. Put what you need here.
-
-\item {} 
-\emph{templates} contains all the templates that will be used to generate the content.
-I've just put the mandatory templates here, you can define your own if it helps
-you to organize yourself while doing the theme.
-
-\end{itemize}
-
-
-\subsection{Templates and variables}
-
-It's using a simple syntax, that you can embbed into your html pages.
-This document describes which templates should exists on a theme, and which
-variables will be passed to each template, while generating it.
-
-All templates will receive the variables defined in your settings file, if they
-are in caps. You can access them directly.
-
-
-\subsubsection{Common variables}
-
-All of those settings will be given to all templates.
-
-\begin{tabulary}{\textwidth}{|L|L|}
-\hline
-\textbf{
-Variable
-} & \textbf{
-Description
-}\\
-\hline
-
-articles
- & 
-That's the list of articles, ordsered desc. by date
-all the elements are \emph{Article} objects, so you can
-access their properties (e.g. title, summary, author
-etc.
-\\
-
-dates
- & 
-The same list of article, but ordered by date,
-ascending
-\\
-
-tags
- & 
-A dict containing each tags (keys), and the list of
-relative articles.
-\\
-
-categories
- & 
-A dict containing each category (keys), and the
-list of relative articles.
-\\
-
-pages
- & 
-The list of pages
-\\
-\hline
-\end{tabulary}
-
-
-
-\subsubsection{category.html}
-
-This template will be processed for each of the existing categories, and will
-finally remain at output/category/\emph{category\_name}.html.
-
-\begin{tabulary}{\textwidth}{|L|L|}
-\hline
-\textbf{
-Variable
-} & \textbf{
-Description
-}\\
-\hline
-
-articles
- & 
-The articles of this category
-\\
-
-category
- & 
-The name of the category being processed
-\\
-\hline
-\end{tabulary}
-
-
-
-\subsubsection{article.html}
-
-This template will be processed for each article. .html files will be outputed
-in output/\emph{article\_name}.html. Here are the specific variables it gets.
-
-\begin{tabulary}{\textwidth}{|L|L|}
-\hline
-\textbf{
-Variable
-} & \textbf{
-Description
-}\\
-\hline
-
-article
- & 
-The article object to be displayed
-\\
-
-category
- & 
-The name of the category of the current article
-\\
-\hline
-\end{tabulary}
-
-
-
-\subsubsection{tag.html}
-
-For each tag, this template will be processed. It will create .html files in
-/output/tag/\emph{tag\_name}.html
-
-\begin{tabulary}{\textwidth}{|L|L|}
-\hline
-\textbf{
-Variable
-} & \textbf{
-Description
-}\\
-\hline
-
-tag
- & 
-The name of the tag being processed
-\\
-
-articles
- & 
-Articles related to this tag
-\\
-\hline
-\end{tabulary}
-
-
-\resetcurrentobjects
-\hypertarget{--doc-internals}{}
-
-\section{Pelican internals}
-
-This section describe how pelican is working internally. As you'll see, it's
-quite simple, but a bit of documentation doesn't hurt :)
-
-
-\subsection{Overall structure}
-
-What \emph{pelican} does, is taking a list of files, and processing them, to some
-sort of output. Usually, the files are restructured text and markdown files,
-and the output is a blog, but it can be anything you want.
-
-I've separated the logic in different classes and concepts:
-\begin{itemize}
-\item {} 
-\emph{writers} are responsible of all the writing process of the
-files. It's writing .html files, RSS feeds and so on. Since those operations
-are commonly used, the object is created once, and then passed to the
-generators.
-
-\item {} 
-\emph{readers} are used to read from various formats (Markdown, and Restructured
-Text for now, but the system is extensible). Given a file, they return
-metadata (author, tags, category etc) and content (HTML formated)
-
-\item {} 
-\emph{generators} generate the different outputs. For instance, pelican comes with
-\emph{ArticlesGenerator} and \emph{PageGenerator}, into others. Given
-a configurations, they can do whatever they want. Most of the time it's
-generating files from inputs.
-
-\item {} 
-\emph{pelican} also uses \emph{templates}, so it's easy to write you own theme. The
-syntax is \emph{jinja2}, and, trust me, really easy to learn, so don't hesitate
-a second.
-
-\end{itemize}
-
-
-\subsection{How to implement a new reader ?}
-
-There is an awesome markup language you want to add to pelican ?
-Well, the only thing you have to do is to create a class that have a \emph{read}
-method, that is returning an HTML content and some metadata.
-
-Take a look to the Markdown reader:
-
-\begin{Verbatim}[commandchars=\\\{\}]
-\PYG{k}{class} \PYG{n+nc}{MarkdownReader}\PYG{p}{(}\PYG{n+nb}{object}\PYG{p}{)}\PYG{p}{:}
-
-    \PYG{k}{def} \PYG{n+nf}{read}\PYG{p}{(}\PYG{n+nb+bp}{self}\PYG{p}{,} \PYG{n}{filename}\PYG{p}{)}\PYG{p}{:}
-        \PYG{l+s+sd}{"""Parse content and metadata of markdown files"""}
-        \PYG{n}{text} \PYG{o}{=} \PYG{n+nb}{open}\PYG{p}{(}\PYG{n}{filename}\PYG{p}{)}
-        \PYG{n}{md} \PYG{o}{=} \PYG{n}{Markdown}\PYG{p}{(}\PYG{n}{extensions} \PYG{o}{=} \PYG{p}{[}\PYG{l+s}{'}\PYG{l+s}{meta}\PYG{l+s}{'}\PYG{p}{,} \PYG{l+s}{'}\PYG{l+s}{codehilite}\PYG{l+s}{'}\PYG{p}{]}\PYG{p}{)}
-        \PYG{n}{content} \PYG{o}{=} \PYG{n}{md}\PYG{o}{.}\PYG{n}{convert}\PYG{p}{(}\PYG{n}{text}\PYG{p}{)}
-
-        \PYG{n}{metadatas} \PYG{o}{=} \PYG{p}{\PYGZob{}}\PYG{p}{\PYGZcb{}}
-        \PYG{k}{for} \PYG{n}{name}\PYG{p}{,} \PYG{n}{value} \PYG{o+ow}{in} \PYG{n}{md}\PYG{o}{.}\PYG{n}{Meta}\PYG{o}{.}\PYG{n}{items}\PYG{p}{(}\PYG{p}{)}\PYG{p}{:}
-            \PYG{k}{if} \PYG{n}{name} \PYG{o+ow}{in} \PYG{n}{\PYGZus{}METADATAS\PYGZus{}FIELDS}\PYG{p}{:}
-                \PYG{n}{meta} \PYG{o}{=} \PYG{n}{\PYGZus{}METADATAS\PYGZus{}FIELDS}\PYG{p}{[}\PYG{n}{name}\PYG{p}{]}\PYG{p}{(}\PYG{n}{value}\PYG{p}{[}\PYG{l+m+mi}{0}\PYG{p}{]}\PYG{p}{)}
-            \PYG{k}{else}\PYG{p}{:}
-                \PYG{n}{meta} \PYG{o}{=} \PYG{n}{value}\PYG{p}{[}\PYG{l+m+mi}{0}\PYG{p}{]}
-            \PYG{n}{metadatas}\PYG{p}{[}\PYG{n}{name}\PYG{o}{.}\PYG{n}{lower}\PYG{p}{(}\PYG{p}{)}\PYG{p}{]} \PYG{o}{=} \PYG{n}{meta}
-        \PYG{k}{return} \PYG{n}{content}\PYG{p}{,} \PYG{n}{metadatas}
-\end{Verbatim}
-
-Simple isn't it ?
-
-
-\subsection{How to implement a new generator ?}
-
-Generators have basically two important methods. You're not forced to create
-both, only the existing ones will be called.
-\begin{itemize}
-\item {} 
-\emph{generate\_context}, that is called in a first place, for all the generators.
-Do whatever you have to do, and update the global context if needed. This
-context is shared between all generators, and will be passed to the
-templates. For instance, the \emph{PageGenerator} \emph{generate\_context} method find
-all the pages, transform them into objects, and populate the context with
-them. Be careful to \emph{not} output anything using this context at this stage,
-as it is likely to change by the effect of others generators.
-
-\item {} 
-\emph{generate\_output} is then called. And guess what is it made for ? Oh,
-generating the output :) That's here that you may want to look at the context
-and call the methods of the \emph{writer} object, that is passed at the first
-argument of this function. In the \emph{PageGenerator} example, this method will
-look at all the pages recorded in the global context, and output a file on
-the disk (using the writer method \emph{write\_file}) for each page encountered.
-
-\end{itemize}
-
-\resetcurrentobjects
-\hypertarget{--doc-faq}{}
-
-\section{Frequently Asked Questions (FAQ)}
-
-Here is a summary of the frequently asked questions for pelican.
-
-
-\subsection{Is it mandatory to have a configuration file ?}
-
-No, it's not. Configurations files are just an easy way to configure pelican.
-For the basic operations, it's possible to specify options while invoking
-pelican with the command line (see \emph{pelican --help} for more informations about
-that)
-
-
-\subsection{I'm creating my own theme, how to use pygments ?}
-
-Pygment add some classes to the generated content, so the theming of your theme
-will be done thanks to a css file. You can have a look to the one proposed by
-default \href{http://pygments.org/demo/15101/}{on the project website}
-
-
-\subsection{How do I create my own theme ?}
-
-Please refer yourself to \hyperlink{theming-pelican}{\emph{How to create themes for pelican}}.
-
-
-\subsection{How can I help ?}
-
-You have different options to help. First, you can use pelican, and report any
-idea or problem you have on \href{http://github.com/ametaireau/pelican/issues}{the bugtracker}.
-
-If you want to contribute, please have a look to \href{https://github.com/ametaireau/pelican/}{the git repository}, fork it, add your changes and do
-a pull request, I'll review them as soon as possible.
-
-You can also contribute by creating themes, and making the documentation
-better.
-
-
-\renewcommand{\indexname}{Module Index}
-\printmodindex
-\renewcommand{\indexname}{Index}
-\printindex
-\end{document}
diff --git a/docs/fr/_build/latex/fncychap.sty b/docs/fr/_build/latex/fncychap.sty
deleted file mode 100644
index 9a56c04e..00000000
--- a/docs/fr/_build/latex/fncychap.sty
+++ /dev/null
@@ -1,683 +0,0 @@
-%%% Copyright   Ulf A. Lindgren
-%%%
-%%% Note        Premission is granted to modify this file under
-%%%             the condition that it is saved using another
-%%%             file and package name.
-%%%
-%%% Revision    1.1 (1997)
-%%%
-%%%             Jan. 8th Modified package name base date option
-%%%             Jan. 22th Modified FmN and FmTi for error in book.cls
-%%%                  \MakeUppercase{#}->{\MakeUppercase#}
-%%%             Apr. 6th Modified Lenny option to prevent undesired 
-%%%                  skip of line.
-%%%             Nov. 8th Fixed \@chapapp for AMS
-%%%
-%%% Revision    1.2 (1998)
-%%%
-%%%             Feb. 11th Fixed appendix problem related to Bjarne
-%%%             Aug. 11th Fixed problem related to 11pt and 12pt 
-%%%                  suggested by Tomas Lundberg. THANKS!
-%%%
-%%% Revision    1.3 (2004)
-%%%             Sep. 20th problem with frontmatter, mainmatter and
-%%%                  backmatter, pointed out by Lapo Mori
-%%%
-%%% Revision    1.31 (2004)
-%%%             Sep. 21th problem with the Rejne definition streched text
-%%%                  caused ugly gaps in the vrule aligned with the title
-%%%                  text. Kindly pointed out to me by Hendri Adriaens
-%%%
-%%% Revision    1.32 (2005)
-%%%             Jun. 23th compatibility problem with the KOMA class 'scrbook.cls'
-%%%                  a remedy is a redefinition of '\@schapter' in
-%%%                  line with that used in KOMA. The problem was pointed
-%%%                  out to me by Mikkel Holm Olsen
-%%%
-%%% Revision    1.33 (2005)
-%%%             Aug. 9th misspelled ``TWELV'' corrected, the error was pointed
-%%%                  out to me by George Pearson
-%%%
-%%% Revision    1.34 (2007)
-%%%             Added an alternative to Lenny provided by Peter
-%%%             Osborne (2005-11-28)
-%%%             Corrected front, main and back matter, based on input
-%%%             from Bas van Gils (2006-04-24)
-%%%             Jul. 30th Added Bjornstrup option provided by Jean-Marc
-%%%             Francois (2007-01-05).
-%%%             Reverted to \MakeUppercase{#} see rev 1.1, solved
-%%%             problem with MakeUppercase and MakeLowercase pointed
-%%%             out by Marco Feuerstein  (2007-06-06) 
-
-
-%%% Last modified   Jul. 2007
-
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{fncychap}
-             [2007/07/30 v1.34
-                 LaTeX package (Revised chapters)]
-
-%%%% For conditional inclusion of color
-\newif\ifusecolor
-\usecolorfalse
-
-
-
-%%%% DEFINITION OF Chapapp variables
-\newcommand{\CNV}{\huge\bfseries}
-\newcommand{\ChNameVar}[1]{\renewcommand{\CNV}{#1}}
-
-
-%%%% DEFINITION OF TheChapter variables
-\newcommand{\CNoV}{\huge\bfseries}
-\newcommand{\ChNumVar}[1]{\renewcommand{\CNoV}{#1}}
-
-\newif\ifUCN
-\UCNfalse
-\newif\ifLCN
-\LCNfalse
-\def\ChNameLowerCase{\LCNtrue\UCNfalse}
-\def\ChNameUpperCase{\UCNtrue\LCNfalse}
-\def\ChNameAsIs{\UCNfalse\LCNfalse}
-
-%%%%% Fix for AMSBook 971008
-
-\@ifundefined{@chapapp}{\let\@chapapp\chaptername}{}
-
-
-%%%%% Fix for Bjarne and appendix 980211
-
-\newif\ifinapp
-\inappfalse
-\renewcommand\appendix{\par
-  \setcounter{chapter}{0}%
-  \setcounter{section}{0}%
-  \inapptrue%
-  \renewcommand\@chapapp{\appendixname}%
-  \renewcommand\thechapter{\@Alph\c@chapter}}
-
-%%%%% Fix for frontmatter, mainmatter, and backmatter 040920
-
-\@ifundefined{@mainmatter}{\newif\if@mainmatter \@mainmattertrue}{}
-
-%%%%%
-
-
-
-\newcommand{\FmN}[1]{%
-\ifUCN
-   {\MakeUppercase{#1}}\LCNfalse
-\else
-   \ifLCN
-      {\MakeLowercase{#1}}\UCNfalse
-   \else #1
-   \fi
-\fi}
-
-
-%%%% DEFINITION OF Title variables
-\newcommand{\CTV}{\Huge\bfseries}
-\newcommand{\ChTitleVar}[1]{\renewcommand{\CTV}{#1}}
-
-%%%% DEFINITION OF the basic rule width
-\newlength{\RW}
-\setlength{\RW}{1pt}
-\newcommand{\ChRuleWidth}[1]{\setlength{\RW}{#1}}
-
-\newif\ifUCT
-\UCTfalse
-\newif\ifLCT
-\LCTfalse
-\def\ChTitleLowerCase{\LCTtrue\UCTfalse}
-\def\ChTitleUpperCase{\UCTtrue\LCTfalse}
-\def\ChTitleAsIs{\UCTfalse\LCTfalse}
-\newcommand{\FmTi}[1]{%
-\ifUCT
-   {\MakeUppercase{#1}}\LCTfalse
-\else
-   \ifLCT
-      {\MakeLowercase{#1}}\UCTfalse
-   \else {#1}
-   \fi
-\fi}
-
-
-
-\newlength{\mylen}
-\newlength{\myhi}
-\newlength{\px}
-\newlength{\py}
-\newlength{\pyy}
-\newlength{\pxx}
-
-
-\def\mghrulefill#1{\leavevmode\leaders\hrule\@height #1\hfill\kern\z@}
-
-\newcommand{\DOCH}{%
-  \CNV\FmN{\@chapapp}\space \CNoV\thechapter
-  \par\nobreak
-  \vskip 20\p@
-  }
-\newcommand{\DOTI}[1]{%
-    \CTV\FmTi{#1}\par\nobreak
-    \vskip 40\p@
-    }
-\newcommand{\DOTIS}[1]{%
-    \CTV\FmTi{#1}\par\nobreak
-    \vskip 40\p@
-    }
-
-%%%%%% SONNY DEF
-
-\DeclareOption{Sonny}{%
-  \ChNameVar{\Large\sf}
-  \ChNumVar{\Huge}
-  \ChTitleVar{\Large\sf}
-  \ChRuleWidth{0.5pt}
-  \ChNameUpperCase
-  \renewcommand{\DOCH}{%
-    \raggedleft
-    \CNV\FmN{\@chapapp}\space \CNoV\thechapter
-    \par\nobreak
-    \vskip 40\p@}
-  \renewcommand{\DOTI}[1]{%
-    \CTV\raggedleft\mghrulefill{\RW}\par\nobreak
-    \vskip 5\p@
-    \CTV\FmTi{#1}\par\nobreak
-    \mghrulefill{\RW}\par\nobreak
-    \vskip 40\p@}
-  \renewcommand{\DOTIS}[1]{%
-    \CTV\raggedleft\mghrulefill{\RW}\par\nobreak
-    \vskip 5\p@
-    \CTV\FmTi{#1}\par\nobreak
-    \mghrulefill{\RW}\par\nobreak
-    \vskip 40\p@}
-}
-
-%%%%%% LENNY DEF
-
-\DeclareOption{Lenny}{%
-
-  \ChNameVar{\fontsize{14}{16}\usefont{OT1}{phv}{m}{n}\selectfont}
-  \ChNumVar{\fontsize{60}{62}\usefont{OT1}{ptm}{m}{n}\selectfont}
-  \ChTitleVar{\Huge\bfseries\rm}
-  \ChRuleWidth{1pt}
-  \renewcommand{\DOCH}{%
-    \settowidth{\px}{\CNV\FmN{\@chapapp}}
-    \addtolength{\px}{2pt}
-    \settoheight{\py}{\CNV\FmN{\@chapapp}}
-    \addtolength{\py}{1pt}
-
-    \settowidth{\mylen}{\CNV\FmN{\@chapapp}\space\CNoV\thechapter}
-    \addtolength{\mylen}{1pt}
-    \settowidth{\pxx}{\CNoV\thechapter}
-    \addtolength{\pxx}{-1pt}
-
-    \settoheight{\pyy}{\CNoV\thechapter}
-    \addtolength{\pyy}{-2pt}
-    \setlength{\myhi}{\pyy}
-    \addtolength{\myhi}{-1\py}
-    \par
-    \parbox[b]{\textwidth}{%
-    \rule[\py]{\RW}{\myhi}%
-    \hskip -\RW%
-    \rule[\pyy]{\px}{\RW}%
-    \hskip -\px%
-    \raggedright%
-    \CNV\FmN{\@chapapp}\space\CNoV\thechapter%
-    \hskip1pt%
-    \mghrulefill{\RW}%
-    \rule{\RW}{\pyy}\par\nobreak%
-    \vskip -\baselineskip%
-    \vskip -\pyy%
-    \hskip \mylen%
-    \mghrulefill{\RW}\par\nobreak%
-    \vskip \pyy}%
-    \vskip 20\p@}
- 
-
-  \renewcommand{\DOTI}[1]{%
-    \raggedright
-    \CTV\FmTi{#1}\par\nobreak
-    \vskip 40\p@}
-
-  \renewcommand{\DOTIS}[1]{%
-    \raggedright
-    \CTV\FmTi{#1}\par\nobreak
-    \vskip 40\p@}
- }
-
-%%%%%% Peter Osbornes' version of LENNY DEF
-
-\DeclareOption{PetersLenny}{%
-
-% five new lengths 
-\newlength{\bl}                           %  bottom left   : orig \space
-\setlength{\bl}{6pt}
-\newcommand{\BL}[1]{\setlength{\bl}{#1}}
-\newlength{\br}                           %  bottom right  : orig 1pt
-\setlength{\br}{1pt}
-\newcommand{\BR}[1]{\setlength{\br}{#1}}
-\newlength{\tl}                           %  top left      : orig 2pt
-\setlength{\tl}{2pt}
-\newcommand{\TL}[1]{\setlength{\tl}{#1}}
-\newlength{\trr}                           %  top right      :orig 1pt 
-\setlength{\trr}{1pt}
-\newcommand{\TR}[1]{\setlength{\trr}{#1}}
-\newlength{\blrule}                           %  top right      :orig 1pt 
-\setlength{\trr}{0pt}
-\newcommand{\BLrule}[1]{\setlength{\blrule}{#1}}
-
-
-  \ChNameVar{\fontsize{14}{16}\usefont{OT1}{phv}{m}{n}\selectfont}
-  \ChNumVar{\fontsize{60}{62}\usefont{OT1}{ptm}{m}{n}\selectfont}
-  \ChTitleVar{\Huge\bfseries\rm}
-  \ChRuleWidth{1pt}
-\renewcommand{\DOCH}{%
-
-
-%%%%%%%                                   tweaks for 1--9 and A--Z
-\ifcase\c@chapter\relax%
-\or\BL{-3pt}\TL{-4pt}\BR{0pt}\TR{-6pt}%1
-\or\BL{0pt}\TL{-4pt}\BR{2pt}\TR{-4pt}%2
-\or\BL{0pt}\TL{-4pt}\BR{2pt}\TR{-4pt}%3
-\or\BL{0pt}\TL{5pt}\BR{2pt}\TR{-4pt}%4
-\or\BL{0pt}\TL{3pt}\BR{2pt}\TR{-4pt}%5
-\or\BL{-1pt}\TL{0pt}\BR{2pt}\TR{-2pt}%6
-\or\BL{0pt}\TL{-3pt}\BR{2pt}\TR{-2pt}%7
-\or\BL{0pt}\TL{-3pt}\BR{2pt}\TR{-2pt}%8
-\or\BL{0pt}\TL{-3pt}\BR{-4pt}\TR{-2pt}%9
-\or\BL{-3pt}\TL{-3pt}\BR{2pt}\TR{-7pt}%10
-\or\BL{-6pt}\TL{-6pt}\BR{0pt}\TR{-9pt}%11
-\or\BL{-6pt}\TL{-6pt}\BR{2pt}\TR{-7pt}%12
-\or\BL{-5pt}\TL{-5pt}\BR{0pt}\TR{-9pt}%13
-\or\BL{-6pt}\TL{-6pt}\BR{0pt}\TR{-9pt}%14
-\or\BL{-3pt}\TL{-3pt}\BR{3pt}\TR{-6pt}%15
-\or\BL{-3pt}\TL{-3pt}\BR{3pt}\TR{-6pt}%16
-\or\BL{-5pt}\TL{-3pt}\BR{-8pt}\TR{-6pt}%17
-\or\BL{-5pt}\TL{-5pt}\BR{0pt}\TR{-9pt}%18
-\or\BL{-3pt}\TL{-3pt}\BR{-6pt}\TR{-9pt}%19
-\or\BL{0pt}\TL{0pt}\BR{0pt}\TR{-5pt}%20
-\fi
-
-\ifinapp\ifcase\c@chapter\relax%
-\or\BL{0pt}\TL{14pt}\BR{5pt}\TR{-19pt}%A
-\or\BL{0pt}\TL{-5pt}\BR{-3pt}\TR{-8pt}%B
-\or\BL{-3pt}\TL{-2pt}\BR{1pt}\TR{-6pt}\BLrule{0pt}%C
-\or\BL{0pt}\TL{-5pt}\BR{-3pt}\TR{-8pt}\BLrule{0pt}%D
-\or\BL{0pt}\TL{-5pt}\BR{2pt}\TR{-3pt}%E
-\or\BL{0pt}\TL{-5pt}\BR{-10pt}\TR{-1pt}%F
-\or\BL{-3pt}\TL{0pt}\BR{0pt}\TR{-7pt}%G
-\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}%H
-\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}%I
-\or\BL{2pt}\TL{0pt}\BR{-3pt}\TR{1pt}%J
-\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}%K
-\or\BL{0pt}\TL{-5pt}\BR{2pt}\TR{-19pt}%L
-\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}%M
-\or\BL{0pt}\TL{-5pt}\BR{-2pt}\TR{-1pt}%N
-\or\BL{-3pt}\TL{-2pt}\BR{-3pt}\TR{-11pt}%O
-\or\BL{0pt}\TL{-5pt}\BR{-9pt}\TR{-3pt}%P
-\or\BL{-3pt}\TL{-2pt}\BR{-3pt}\TR{-11pt}%Q
-\or\BL{0pt}\TL{-5pt}\BR{4pt}\TR{-8pt}%R
-\or\BL{-2pt}\TL{-2pt}\BR{-2pt}\TR{-7pt}%S
-\or\BL{-3pt}\TL{0pt}\BR{-5pt}\TR{4pt}\BLrule{8pt}%T
-\or\BL{-7pt}\TL{-11pt}\BR{-5pt}\TR{-7pt}\BLrule{0pt}%U
-\or\BL{-14pt}\TL{-5pt}\BR{-14pt}\TR{-1pt}\BLrule{14pt}%V
-\or\BL{-10pt}\TL{-9pt}\BR{-13pt}\TR{-3pt}\BLrule{7pt}%W
-\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}\BLrule{0pt}%X
-\or\BL{-6pt}\TL{-4pt}\BR{-7pt}\TR{1pt}\BLrule{7pt}%Y
-\or\BL{0pt}\TL{-5pt}\BR{3pt}\TR{-1pt}\BLrule{0pt}%Z
-\fi\fi
-%%%%%%%
-    \settowidth{\px}{\CNV\FmN{\@chapapp}}
-    \addtolength{\px}{\tl}        %MOD change 2pt to \tl
-    \settoheight{\py}{\CNV\FmN{\@chapapp}}
-    \addtolength{\py}{1pt}
-
-    \settowidth{\mylen}{\CNV\FmN{\@chapapp}\space\CNoV\thechapter}
-    \addtolength{\mylen}{\trr}% MOD change 1pt to \tr
-    \settowidth{\pxx}{\CNoV\thechapter}
-    \addtolength{\pxx}{-1pt}
-
-    \settoheight{\pyy}{\CNoV\thechapter}
-    \addtolength{\pyy}{-2pt}
-    \setlength{\myhi}{\pyy}
-    \addtolength{\myhi}{-1\py}
-    \par
-    \parbox[b]{\textwidth}{%
-    \rule[\py]{\RW}{\myhi}%
-    \hskip -\RW%
-    \rule[\pyy]{\px}{\RW}% 
-    \hskip -\px%
-    \raggedright%
-    \CNV\FmN{\@chapapp}\rule{\blrule}{\RW}\hskip\bl\CNoV\thechapter%MOD 
-%    \CNV\FmN{\@chapapp}\space\CNoV\thechapter                     %ORIGINAL
-    \hskip\br%                           %MOD 1pt to \br
-    \mghrulefill{\RW}% 
-    \rule{\RW}{\pyy}\par\nobreak% 
-    \vskip -\baselineskip%
-    \vskip -\pyy%
-    \hskip \mylen%
-    \mghrulefill{\RW}\par\nobreak%
-    \vskip \pyy}%
-    \vskip 20\p@}
- 
-
-  \renewcommand{\DOTI}[1]{%
-    \raggedright
-    \CTV\FmTi{#1}\par\nobreak
-    \vskip 40\p@}
-
-  \renewcommand{\DOTIS}[1]{%
-    \raggedright
-    \CTV\FmTi{#1}\par\nobreak
-    \vskip 40\p@}
- }
-
-
-%
-
-
-%%%%%% BJORNSTRUP DEF
-
-\DeclareOption{Bjornstrup}{%
-  \usecolortrue
-  % pzc (Zapf Chancelery) is nice.  ppl (Palatino) is cool too.
-  \ChNumVar{\fontsize{76}{80}\usefont{OT1}{pzc}{m}{n}\selectfont}
-  \ChTitleVar{\raggedleft\Large\sffamily\bfseries}
-
-  \setlength{\myhi}{10pt}         % Space between grey box border and text
-  \setlength{\mylen}{\textwidth}
-  \addtolength{\mylen}{-2\myhi}
-  \renewcommand{\DOCH}{%
-    \settowidth{\py}{\CNoV\thechapter}
-    \addtolength{\py}{-10pt}      % Amount of space by which the
-%                                  % number is shifted right
-    \fboxsep=0pt%
-    \colorbox[gray]{.85}{\rule{0pt}{40pt}\parbox[b]{\textwidth}{\hfill}}%
-    \kern-\py\raise20pt%
-    \hbox{\color[gray]{.5}\CNoV\thechapter}\\%
-  }
-  
-  \renewcommand{\DOTI}[1]{%
-    \nointerlineskip\raggedright%
-    \fboxsep=\myhi%
-    \vskip-1ex%
-    \colorbox[gray]{.85}{\parbox[t]{\mylen}{\CTV\FmTi{#1}}}\par\nobreak%
-    \vskip 40\p@%
-  }
-
-  \renewcommand{\DOTIS}[1]{%
-    \fboxsep=0pt
-    \colorbox[gray]{.85}{\rule{0pt}{40pt}\parbox[b]{\textwidth}{\hfill}}\\%
-    \nointerlineskip\raggedright%
-    \fboxsep=\myhi%
-    \colorbox[gray]{.85}{\parbox[t]{\mylen}{\CTV\FmTi{#1}}}\par\nobreak%
-    \vskip 40\p@%
-  }
-}
-
-
-%%%%%%% GLENN DEF
-
-
-\DeclareOption{Glenn}{%
-  \ChNameVar{\bfseries\Large\sf}
-  \ChNumVar{\Huge}
-  \ChTitleVar{\bfseries\Large\rm}
-  \ChRuleWidth{1pt}
-  \ChNameUpperCase
-  \ChTitleUpperCase
-  \renewcommand{\DOCH}{%
-    \settoheight{\myhi}{\CTV\FmTi{Test}}
-    \setlength{\py}{\baselineskip}
-    \addtolength{\py}{\RW}
-    \addtolength{\py}{\myhi}
-    \setlength{\pyy}{\py}
-    \addtolength{\pyy}{-1\RW}
-     
-    \raggedright
-    \CNV\FmN{\@chapapp}\space\CNoV\thechapter
-    \hskip 3pt\mghrulefill{\RW}\rule[-1\pyy]{2\RW}{\py}\par\nobreak}
-
-  \renewcommand{\DOTI}[1]{%
-    \addtolength{\pyy}{-4pt}
-    \settoheight{\myhi}{\CTV\FmTi{#1}}
-    \addtolength{\myhi}{\py}
-    \addtolength{\myhi}{-1\RW}
-    \vskip -1\pyy
-    \rule{2\RW}{\myhi}\mghrulefill{\RW}\hskip 2pt
-    \raggedleft\CTV\FmTi{#1}\par\nobreak
-    \vskip 80\p@}
-
-\newlength{\backskip}
-  \renewcommand{\DOTIS}[1]{%
-%    \setlength{\py}{10pt}
-%    \setlength{\pyy}{\py}
-%    \addtolength{\pyy}{\RW}
-%    \setlength{\myhi}{\baselineskip}
-%    \addtolength{\myhi}{\pyy}
-%    \mghrulefill{\RW}\rule[-1\py]{2\RW}{\pyy}\par\nobreak
-%    \addtolength{}{}
-%\vskip -1\baselineskip
-%    \rule{2\RW}{\myhi}\mghrulefill{\RW}\hskip 2pt
-%    \raggedleft\CTV\FmTi{#1}\par\nobreak
-%    \vskip 60\p@}
-%% Fix suggested by Tomas Lundberg
-    \setlength{\py}{25pt}  % eller vad man vill
-    \setlength{\pyy}{\py}
-    \setlength{\backskip}{\py}
-    \addtolength{\backskip}{2pt}
-    \addtolength{\pyy}{\RW}
-    \setlength{\myhi}{\baselineskip}
-    \addtolength{\myhi}{\pyy}
-    \mghrulefill{\RW}\rule[-1\py]{2\RW}{\pyy}\par\nobreak
-    \vskip -1\backskip
-    \rule{2\RW}{\myhi}\mghrulefill{\RW}\hskip 3pt %
-    \raggedleft\CTV\FmTi{#1}\par\nobreak
-    \vskip 40\p@}
- }
-
-%%%%%%% CONNY DEF
-
-\DeclareOption{Conny}{%
-  \ChNameUpperCase
-  \ChTitleUpperCase  
-  \ChNameVar{\centering\Huge\rm\bfseries}
-  \ChNumVar{\Huge}
-  \ChTitleVar{\centering\Huge\rm}
-  \ChRuleWidth{2pt}
-
-  \renewcommand{\DOCH}{%
-    \mghrulefill{3\RW}\par\nobreak
-    \vskip -0.5\baselineskip
-    \mghrulefill{\RW}\par\nobreak
-    \CNV\FmN{\@chapapp}\space \CNoV\thechapter
-    \par\nobreak
-    \vskip -0.5\baselineskip
-   }
-  \renewcommand{\DOTI}[1]{%
-    \mghrulefill{\RW}\par\nobreak
-    \CTV\FmTi{#1}\par\nobreak
-    \vskip 60\p@
-    }
-  \renewcommand{\DOTIS}[1]{%
-    \mghrulefill{\RW}\par\nobreak
-    \CTV\FmTi{#1}\par\nobreak
-    \vskip 60\p@
-    }
-  }
-
-%%%%%%% REJNE DEF
-
-\DeclareOption{Rejne}{%
-
-  \ChNameUpperCase
-  \ChTitleUpperCase  
-  \ChNameVar{\centering\Large\rm}
-  \ChNumVar{\Huge}
-  \ChTitleVar{\centering\Huge\rm}
-  \ChRuleWidth{1pt}
-  \renewcommand{\DOCH}{%
-    \settoheight{\py}{\CNoV\thechapter}
-    \parskip=0pt plus 1pt % Set parskip to default, just in case v1.31
-    \addtolength{\py}{-1pt}
-    \CNV\FmN{\@chapapp}\par\nobreak
-    \vskip 20\p@
-    \setlength{\myhi}{2\baselineskip}
-    \setlength{\px}{\myhi}
-    \addtolength{\px}{-1\RW}
-    \rule[-1\px]{\RW}{\myhi}\mghrulefill{\RW}\hskip
-    10pt\raisebox{-0.5\py}{\CNoV\thechapter}\hskip 10pt\mghrulefill{\RW}\rule[-1\px]{\RW}{\myhi}\par\nobreak
-     \vskip -3\p@% Added -2pt vskip to correct for streched text v1.31
-    }
-  \renewcommand{\DOTI}[1]{%
-    \setlength{\mylen}{\textwidth}
-    \parskip=0pt plus 1pt % Set parskip to default, just in case v1.31
-    \addtolength{\mylen}{-2\RW}
-    {\vrule width\RW}\parbox{\mylen}{\CTV\FmTi{#1}}{\vrule width\RW}\par\nobreak%
-    \vskip -3pt\rule{\RW}{2\baselineskip}\mghrulefill{\RW}\rule{\RW}{2\baselineskip}%
-    \vskip 60\p@% Added -2pt in vskip to correct for streched text v1.31
-    }
-  \renewcommand{\DOTIS}[1]{%
-    \setlength{\py}{\fboxrule}
-    \setlength{\fboxrule}{\RW}
-    \setlength{\mylen}{\textwidth}
-    \addtolength{\mylen}{-2\RW}
-    \fbox{\parbox{\mylen}{\vskip 2\baselineskip\CTV\FmTi{#1}\par\nobreak\vskip \baselineskip}} 
-    \setlength{\fboxrule}{\py}
-    \vskip 60\p@
-    }
-  }
-
-
-%%%%%%% BJARNE DEF
-
-\DeclareOption{Bjarne}{%
-  \ChNameUpperCase
-  \ChTitleUpperCase  
-  \ChNameVar{\raggedleft\normalsize\rm}
-  \ChNumVar{\raggedleft \bfseries\Large}
-  \ChTitleVar{\raggedleft \Large\rm}
-  \ChRuleWidth{1pt}
-
-
-%% Note thechapter -> c@chapter fix appendix bug
-%% Fixed misspelled 12
-
-  \newcounter{AlphaCnt}
-  \newcounter{AlphaDecCnt}
-  \newcommand{\AlphaNo}{%
-    \ifcase\number\theAlphaCnt
-      \ifnum\c@chapter=0
-        ZERO\else{}\fi
-    \or ONE\or TWO\or THREE\or FOUR\or FIVE
-    \or SIX\or SEVEN\or EIGHT\or NINE\or TEN
-    \or ELEVEN\or TWELVE\or THIRTEEN\or FOURTEEN\or FIFTEEN
-    \or SIXTEEN\or SEVENTEEN\or EIGHTEEN\or NINETEEN\fi
-}
-
-  \newcommand{\AlphaDecNo}{%
-    \setcounter{AlphaDecCnt}{0}
-    \@whilenum\number\theAlphaCnt>0\do
-      {\addtocounter{AlphaCnt}{-10}
-       \addtocounter{AlphaDecCnt}{1}}
-     \ifnum\number\theAlphaCnt=0
-     \else
-       \addtocounter{AlphaDecCnt}{-1}
-       \addtocounter{AlphaCnt}{10}
-     \fi
-     
-     
-    \ifcase\number\theAlphaDecCnt\or TEN\or TWENTY\or THIRTY\or
-    FORTY\or FIFTY\or SIXTY\or SEVENTY\or EIGHTY\or NINETY\fi
-    }
-  \newcommand{\TheAlphaChapter}{%
-    
-    \ifinapp 
-      \thechapter
-    \else
-      \setcounter{AlphaCnt}{\c@chapter}
-      \ifnum\c@chapter<20
-        \AlphaNo
-      \else
-        \AlphaDecNo\AlphaNo
-      \fi
-    \fi
-    }  
-  \renewcommand{\DOCH}{%
-    \mghrulefill{\RW}\par\nobreak
-    \CNV\FmN{\@chapapp}\par\nobreak 
-    \CNoV\TheAlphaChapter\par\nobreak
-    \vskip -1\baselineskip\vskip 5pt\mghrulefill{\RW}\par\nobreak
-    \vskip 20\p@
-    }
-  \renewcommand{\DOTI}[1]{%
-    \CTV\FmTi{#1}\par\nobreak
-    \vskip 40\p@
-    }
-  \renewcommand{\DOTIS}[1]{%
-    \CTV\FmTi{#1}\par\nobreak
-    \vskip 40\p@
-    }
-}
-
-\DeclareOption*{%
-  \PackageWarning{fancychapter}{unknown style option}
-  }
-
-\ProcessOptions* \relax
-
-\ifusecolor
-  \RequirePackage{color} 
-\fi
-\def\@makechapterhead#1{%
-  \vspace*{50\p@}%
-  {\parindent \z@ \raggedright \normalfont
-    \ifnum \c@secnumdepth >\m@ne
-      \if@mainmatter%%%%% Fix for frontmatter, mainmatter, and backmatter 040920
-        \DOCH
-      \fi
-    \fi
-    \interlinepenalty\@M
-    \if@mainmatter%%%%% Fix for frontmatter, mainmatter, and backmatter 060424
-      \DOTI{#1}%
-    \else%
-      \DOTIS{#1}%
-    \fi
-  }}
-
-
-%%% Begin: To avoid problem with scrbook.cls (fncychap version 1.32)
-
-%%OUT:
-%\def\@schapter#1{\if@twocolumn
-%                   \@topnewpage[\@makeschapterhead{#1}]%
-%                 \else
-%                   \@makeschapterhead{#1}%
-%                   \@afterheading
-%                 \fi}
-
-%%IN:
-\def\@schapter#1{%
-\if@twocolumn%
-  \@makeschapterhead{#1}%
-\else%
-  \@makeschapterhead{#1}%
-  \@afterheading%
-\fi}
-
-%%% End: To avoid problem with scrbook.cls (fncychap version 1.32)
-
-\def\@makeschapterhead#1{%
-  \vspace*{50\p@}%
-  {\parindent \z@ \raggedright
-    \normalfont
-    \interlinepenalty\@M
-    \DOTIS{#1}
-    \vskip 40\p@
-  }}
-
-\endinput
-
-
diff --git a/docs/fr/_build/latex/howto.cls b/docs/fr/_build/latex/howto.cls
deleted file mode 100644
index 6844533a..00000000
--- a/docs/fr/_build/latex/howto.cls
+++ /dev/null
@@ -1,70 +0,0 @@
-%
-% howto.cls for Sphinx
-%
-
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{howto}[2008/10/18 Document class (Sphinx HOWTO)]
-
-% Pass all given class options to the parent class.
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
-\ProcessOptions\relax
-\LoadClass[twoside]{article}
-
-% Set some sane defaults for section numbering depth and TOC depth.  You can
-% reset these counters in your preamble.
-%
-\setcounter{secnumdepth}{2}
-
-% Change the title page to look a bit better, and fit in with the fncychap
-% ``Bjarne'' style a bit better.
-%
-\renewcommand{\maketitle}{
-  \rule{\textwidth}{1pt}
-  \ifsphinxpdfoutput
-    \begingroup
-    % These \defs are required to deal with multi-line authors; it
-    % changes \\ to ', ' (comma-space), making it pass muster for
-    % generating document info in the PDF file.
-    \def\\{, }
-    \def\and{and }
-    \pdfinfo{
-      /Author (\@author)
-      /Title (\@title)
-    }
-    \endgroup
-  \fi
-  \begin{flushright}
-    \sphinxlogo%
-    {\rm\Huge\py@HeaderFamily \@title} \par
-    {\em\large\py@HeaderFamily \py@release\releaseinfo} \par
-    \vspace{25pt}
-    {\Large\py@HeaderFamily
-      \begin{tabular}[t]{c}
-        \@author
-      \end{tabular}} \par
-    \vspace{25pt}
-    \@date \par
-    \py@authoraddress \par
-  \end{flushright}
-  \@thanks
-  \setcounter{footnote}{0}
-  \let\thanks\relax\let\maketitle\relax
-  %\gdef\@thanks{}\gdef\@author{}\gdef\@title{}
-}
-
-\let\py@OldTableofcontents=\tableofcontents
-\renewcommand{\tableofcontents}{
-  \begingroup
-    \parskip = 0mm
-    \py@OldTableofcontents
-  \endgroup
-  \rule{\textwidth}{1pt}
-  \vspace{12pt}
-}  
-
-\@ifundefined{fancyhf}{
-  \pagestyle{plain}}{
-  \pagestyle{normal}}		% start this way; change for
-\pagenumbering{arabic}		% ToC & chapters
-
-\thispagestyle{empty}
diff --git a/docs/fr/_build/latex/manual.cls b/docs/fr/_build/latex/manual.cls
deleted file mode 100644
index 2fb77c62..00000000
--- a/docs/fr/_build/latex/manual.cls
+++ /dev/null
@@ -1,108 +0,0 @@
-%
-% manual.cls for Sphinx
-%
-
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{manual}[2008/10/18 Document class (Sphinx manual)]
-
-% Pass all given class options to the parent class.
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
-\ProcessOptions\relax
-\LoadClass[twoside,openright]{report}
-
-% Set some sane defaults for section numbering depth and TOC depth.  You can
-% reset these counters in your preamble.
-%
-\setcounter{secnumdepth}{2}
-\setcounter{tocdepth}{1}
-
-% Change the title page to look a bit better, and fit in with the fncychap
-% ``Bjarne'' style a bit better.
-%
-\renewcommand{\maketitle}{%
-  \begin{titlepage}%
-    \let\footnotesize\small
-    \let\footnoterule\relax
-    \rule{\textwidth}{1pt}%
-    \ifsphinxpdfoutput
-      \begingroup
-      % These \defs are required to deal with multi-line authors; it
-      % changes \\ to ', ' (comma-space), making it pass muster for
-      % generating document info in the PDF file.
-      \def\\{, }
-      \def\and{and }
-      \pdfinfo{
-        /Author (\@author)
-        /Title (\@title)
-      }
-      \endgroup
-    \fi
-    \begin{flushright}%
-      \sphinxlogo%
-      {\rm\Huge\py@HeaderFamily \@title \par}%
-      {\em\LARGE\py@HeaderFamily \py@release\releaseinfo \par}
-      \vfill
-      {\LARGE\py@HeaderFamily
-        \begin{tabular}[t]{c}
-          \@author
-        \end{tabular}
-        \par}
-      \vfill\vfill
-      {\large
-       \@date \par
-       \vfill
-       \py@authoraddress \par
-      }%
-    \end{flushright}%\par
-    \@thanks
-  \end{titlepage}%
-  \cleardoublepage%
-  \setcounter{footnote}{0}%
-  \let\thanks\relax\let\maketitle\relax
-  %\gdef\@thanks{}\gdef\@author{}\gdef\@title{}
-}
-
-
-% Catch the end of the {abstract} environment, but here make sure the abstract
-% is followed by a blank page if the 'openright' option is used.
-%
-\let\py@OldEndAbstract=\endabstract
-\renewcommand{\endabstract}{
-  \if@openright
-    \ifodd\value{page}
-      \typeout{Adding blank page after the abstract.}
-      \vfil\pagebreak
-    \fi
-  \fi
-  \py@OldEndAbstract
-}
-
-% This wraps the \tableofcontents macro with all the magic to get the spacing
-% right and have the right number of pages if the 'openright' option has been
-% used.  This eliminates a fair amount of crud in the individual document files.
-%
-\let\py@OldTableofcontents=\tableofcontents
-\renewcommand{\tableofcontents}{%
-  \setcounter{page}{1}%
-  \pagebreak%
-  \pagestyle{plain}%
-  {%
-    \parskip = 0mm%
-    \py@OldTableofcontents%
-    \if@openright%
-      \ifodd\value{page}%
-        \typeout{Adding blank page after the table of contents.}%
-        \pagebreak\hspace{0pt}%
-      \fi%
-    \fi%
-    \cleardoublepage%
-  }%
-  \pagenumbering{arabic}%
-  \@ifundefined{fancyhf}{}{\pagestyle{normal}}%
-}
-
-% This is needed to get the width of the section # area wide enough in the
-% library reference.  Doing it here keeps it the same for all the manuals.
-%
-\renewcommand*\l@section{\@dottedtocline{1}{1.5em}{2.6em}}
-\renewcommand*\l@subsection{\@dottedtocline{2}{4.1em}{3.5em}}
diff --git a/docs/fr/_build/latex/python.ist b/docs/fr/_build/latex/python.ist
deleted file mode 100644
index 9ffa0f95..00000000
--- a/docs/fr/_build/latex/python.ist
+++ /dev/null
@@ -1,11 +0,0 @@
-line_max 100
-headings_flag 1
-heading_prefix "  \\bigletter "
-
-preamble "\\begin{theindex}
-\\def\\bigletter#1{{\\Large\\sffamily#1}\\nopagebreak\\vspace{1mm}}
-
-"
-
-symhead_positive "{Symbols}"
-numhead_positive "{Numbers}"
diff --git a/docs/fr/_build/latex/sphinx.sty b/docs/fr/_build/latex/sphinx.sty
deleted file mode 100644
index 6b98d289..00000000
--- a/docs/fr/_build/latex/sphinx.sty
+++ /dev/null
@@ -1,744 +0,0 @@
-%
-% sphinx.sty
-%
-% Adapted from the old python.sty, mostly written by Fred Drake,
-% by Georg Brandl.
-%
-
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{sphinx}[2008/05/01 LaTeX package (Sphinx markup)]
-
-\RequirePackage{textcomp}
-\RequirePackage{fancyhdr}
-\RequirePackage{fancybox}
-\RequirePackage{titlesec}
-\RequirePackage{tabulary}
-\RequirePackage{amsmath} % for \text
-\RequirePackage{makeidx}
-\RequirePackage{framed}
-\RequirePackage{color}
-% For highlighted code.
-\RequirePackage{fancyvrb}
-% For table captions.
-\RequirePackage{threeparttable}
-% Handle footnotes in tables.
-\RequirePackage{footnote}
-\makesavenoteenv{tabulary}
-% For floating figures in the text.
-\RequirePackage{wrapfig}
-% Separate paragraphs by space by default.
-\RequirePackage{parskip}
-
-% Redefine these colors to your liking in the preamble.
-\definecolor{TitleColor}{rgb}{0.126,0.263,0.361}
-\definecolor{InnerLinkColor}{rgb}{0.208,0.374,0.486}
-\definecolor{OuterLinkColor}{rgb}{0.216,0.439,0.388}
-% Redefine these colors to something not white if you want to have colored
-% background and border for code examples.
-\definecolor{VerbatimColor}{rgb}{1,1,1}
-\definecolor{VerbatimBorderColor}{rgb}{1,1,1}
-
-% Uncomment these two lines to ignore the paper size and make the page 
-% size more like a typical published manual.
-%\renewcommand{\paperheight}{9in}
-%\renewcommand{\paperwidth}{8.5in}   % typical squarish manual
-%\renewcommand{\paperwidth}{7in}     % O'Reilly ``Programmming Python''
-
-% For graphicx, check if we are compiling under latex or pdflatex.
-\ifx\pdftexversion\undefined
-  \usepackage{graphicx}
-\else
-  \usepackage[pdftex]{graphicx}
-\fi
-
-% for PDF output, use colors and maximal compression
-\newif\ifsphinxpdfoutput\sphinxpdfoutputfalse
-\ifx\pdfoutput\undefined\else\ifcase\pdfoutput
-  \let\py@NormalColor\relax
-  \let\py@TitleColor\relax
-\else
-  \sphinxpdfoutputtrue
-  \input{pdfcolor}
-  \def\py@NormalColor{\color[rgb]{0.0,0.0,0.0}}
-  \def\py@TitleColor{\color{TitleColor}}
-  \pdfcompresslevel=9
-\fi\fi
-
-% XeLaTeX can do colors, too
-\ifx\XeTeXrevision\undefined\else
-  \def\py@NormalColor{\color[rgb]{0.0,0.0,0.0}}
-  \def\py@TitleColor{\color{TitleColor}}
-\fi
-
-% Increase printable page size (copied from fullpage.sty)
-\topmargin 0pt
-\advance \topmargin by -\headheight
-\advance \topmargin by -\headsep
-
-% attempt to work a little better for A4 users
-\textheight \paperheight
-\advance\textheight by -2in
-
-\oddsidemargin 0pt
-\evensidemargin 0pt
-%\evensidemargin -.25in  % for ``manual size'' documents
-\marginparwidth 0.5in
-
-\textwidth \paperwidth
-\advance\textwidth by -2in
-
-
-% Style parameters and macros used by most documents here
-\raggedbottom
-\sloppy
-\hbadness = 5000                % don't print trivial gripes
-
-\pagestyle{empty}               % start this way; change for
-\pagenumbering{roman}           % ToC & chapters
-
-% Use this to set the font family for headers and other decor:
-\newcommand{\py@HeaderFamily}{\sffamily\bfseries}
-
-% Redefine the 'normal' header/footer style when using "fancyhdr" package:
-\@ifundefined{fancyhf}{}{
-  % Use \pagestyle{normal} as the primary pagestyle for text.
-  \fancypagestyle{normal}{
-    \fancyhf{}
-    \fancyfoot[LE,RO]{{\py@HeaderFamily\thepage}}
-    \fancyfoot[LO]{{\py@HeaderFamily\nouppercase{\rightmark}}}
-    \fancyfoot[RE]{{\py@HeaderFamily\nouppercase{\leftmark}}}
-    \fancyhead[LE,RO]{{\py@HeaderFamily \@title, \py@release}}
-    \renewcommand{\headrulewidth}{0.4pt}
-    \renewcommand{\footrulewidth}{0.4pt}
-  }
-  % Update the plain style so we get the page number & footer line,
-  % but not a chapter or section title.  This is to keep the first
-  % page of a chapter and the blank page between chapters `clean.'
-  \fancypagestyle{plain}{
-    \fancyhf{}
-    \fancyfoot[LE,RO]{{\py@HeaderFamily\thepage}}
-    \renewcommand{\headrulewidth}{0pt}
-    \renewcommand{\footrulewidth}{0.4pt}
-  }
-}
-
-% Some custom font markup commands.
-%
-\newcommand{\strong}[1]{{\bf #1}}
-\newcommand{\code}[1]{\texttt{#1}}
-\newcommand{\bfcode}[1]{\code{\bfseries#1}}
-\newcommand{\samp}[1]{`\code{#1}'}
-\newcommand{\email}[1]{\textsf{#1}}
-
-\newcommand{\py@modulebadkey}{{--just-some-junk--}}
-
-% Redefine the Verbatim environment to allow border and background colors.
-% The original environment is still used for verbatims within tables.
-\let\OriginalVerbatim=\Verbatim
-\let\endOriginalVerbatim=\endVerbatim
-
-% Play with vspace to be able to keep the indentation.
-\newlength\distancetoright
-\newlength\leftsidespace
-\def\mycolorbox#1{%
-  \setlength\leftsidespace{\@totalleftmargin}%
-  \setlength\distancetoright{\textwidth}%
-  \advance\distancetoright -\@totalleftmargin %
-  \noindent\hspace*{\@totalleftmargin}%
-  \fcolorbox{VerbatimBorderColor}{VerbatimColor}{%
-  \begin{minipage}{\distancetoright}%
-    \smallskip%
-    \noindent\hspace*{-\leftsidespace}%
-    #1
-  \end{minipage}%
-  }%
-}
-\def\FrameCommand{\mycolorbox}
-
-\renewcommand{\Verbatim}[1][1]{%
-  % The list environement is needed to control perfectly the vertical
-  % space.
-  \list{}{%
-  \setlength\parskip{0pt}%
-  \setlength\itemsep{0ex}%
-  \setlength\topsep{0ex}%
-  \setlength\partopsep{0pt}%
-  \setlength\leftmargin{0pt}%
-  }%
-  \item\MakeFramed {\FrameRestore}%
-     \small%
-    \OriginalVerbatim[#1]%
-}
-\renewcommand{\endVerbatim}{%
-    \endOriginalVerbatim%
-  \endMakeFramed%
-  \endlist%
-}
-
-
-% Index-entry generation support.
-%
-
-% Command to generate two index entries (using subentries)
-\newcommand{\indexii}[2]{\index{#1!#2}\index{#2!#1}}
-
-% And three entries (using only one level of subentries)
-\newcommand{\indexiii}[3]{\index{#1!#2 #3}\index{#2!#3, #1}\index{#3!#1 #2}}
-
-% And four (again, using only one level of subentries)
-\newcommand{\indexiv}[4]{
-\index{#1!#2 #3 #4}
-\index{#2!#3 #4, #1}
-\index{#3!#4, #1 #2}
-\index{#4!#1 #2 #3}
-}
-
-% support for the module index
-\newif\ifpy@UseModuleIndex
-\py@UseModuleIndexfalse
-
-\newcommand{\makemodindex}{
-  \newwrite\modindexfile
-  \openout\modindexfile=mod\jobname.idx
-  \py@UseModuleIndextrue
-}
-
-\newcommand{\printmodindex}{
-  \@input@{mod\jobname.ind}
-}
-
-% Add the defining entry for a module
-\newcommand{\py@modindex}[2]{%
-  \renewcommand{\py@thismodule}{#1}
-  \ifpy@UseModuleIndex%
-    \@ifundefined{py@modplat@\py@thismodulekey}{
-      \write\modindexfile{\protect\indexentry{#1@{\texttt{#1}}|hyperpage}{\thepage}}%
-    }{\write\modindexfile{\protect\indexentry{#1@{\texttt{#1 }%
-        \emph{(\platformof{\py@thismodulekey})}}|hyperpage}{\thepage}}%
-    }
-  \fi%
-}
-
-% "Current" keys
-\newcommand{\py@thisclass}{}
-\newcommand{\py@thismodule}{}
-\newcommand{\py@thismodulekey}{}
-\newcommand{\py@thismoduletype}{}
-\newcommand{\py@emptymodule}{}
-
-% \declaremodule[key]{type}{name}
-\newcommand{\declaremodule}[3][\py@modulebadkey]{
-  \renewcommand{\py@thismoduletype}{#2}
-  \ifx\py@modulebadkey#1
-    \renewcommand{\py@thismodulekey}{#3}
-  \else
-    \renewcommand{\py@thismodulekey}{#1}
-  \fi
-  \py@modindex{#3}{}
-  %\label{module-\py@thismodulekey}
-}
-
-% Record module platforms for the Module Index
-\newif\ifpy@ModPlatformFileIsOpen \py@ModPlatformFileIsOpenfalse
-\long\def\py@writeModPlatformFile#1{%
-  \protected@write\py@ModPlatformFile%
-    {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble}%
-    {\string#1}%
-}
-\newcommand{\py@ModPlatformFilename}{\jobname.pla}
-\newcommand{\platform}[1]{
-  \ifpy@ModPlatformFileIsOpen\else
-    \newwrite\py@ModPlatformFile
-    \openout\py@ModPlatformFile=\py@ModPlatformFilename
-    \py@ModPlatformFileIsOpentrue
-  \fi
-  \py@writeModPlatformFile{\py@defplatform{\py@thismodulekey}{#1}}
-}
-\newcommand{\py@defplatform}[2]{\expandafter\def\csname py@modplat@#1\endcsname{#2}}
-\newcommand{\platformof}[1]{\csname py@modplat@#1\endcsname}
-
-\InputIfFileExists{\jobname.pla}{}{}
-
-% \moduleauthor{name}{email}
-\newcommand{\moduleauthor}[2]{}
-
-% \sectionauthor{name}{email}
-\newcommand{\sectionauthor}[2]{}
-
-% Ignore module synopsis.
-\newcommand{\modulesynopsis}[1]{}
-
-% Reset "current" objects.
-\newcommand{\resetcurrentobjects}{
-  \renewcommand{\py@thisclass}{}
-  \renewcommand{\py@thismodule}{}
-  \renewcommand{\py@thismodulekey}{}
-  \renewcommand{\py@thismoduletype}{}
-}
-
-% Augment the sectioning commands used to get our own font family in place,
-% and reset some internal data items:
-\titleformat{\section}{\Large\py@HeaderFamily}%
-            {\py@TitleColor\thesection}{0.5em}{\py@TitleColor}{\py@NormalColor}
-\titleformat{\subsection}{\large\py@HeaderFamily}%
-            {\py@TitleColor\thesubsection}{0.5em}{\py@TitleColor}{\py@NormalColor}
-\titleformat{\subsubsection}{\py@HeaderFamily}%
-            {\py@TitleColor\thesubsubsection}{0.5em}{\py@TitleColor}{\py@NormalColor}
-\titleformat{\paragraph}{\large\py@HeaderFamily}%
-            {\py@TitleColor}{0em}{\py@TitleColor}{\py@NormalColor}
-
-
-% Now for a lot of semantically-loaded environments that do a ton of magical
-% things to get the right formatting and index entries for the stuff in
-% Python modules and C API.
-
-
-% {fulllineitems} is used in one place in libregex.tex, but is really for
-% internal use in this file.
-%
-\newcommand{\py@itemnewline}[1]{%
-  \@tempdima\linewidth%
-  \advance\@tempdima \leftmargin\makebox[\@tempdima][l]{#1}%
-}
-
-\newenvironment{fulllineitems}{
-  \begin{list}{}{\labelwidth \leftmargin \labelsep 0pt
-                 \rightmargin 0pt \topsep -\parskip \partopsep \parskip
-                 \itemsep -\parsep
-                 \let\makelabel=\py@itemnewline}
-}{\end{list}}
-
-% \optional is mostly for use in the arguments parameters to the various
-% {*desc} environments defined below, but may be used elsewhere.  Known to
-% be used in the debugger chapter.
-%
-% Typical usage:
-%
-%     \begin{funcdesc}{myfunc}{reqparm\optional{, optparm}}
-%                                    ^^^       ^^^
-%                          No space here       No space here
-%
-% When a function has multiple optional parameters, \optional should be
-% nested, not chained.  This is right:
-%
-%     \begin{funcdesc}{myfunc}{\optional{parm1\optional{, parm2}}}
-%
-\let\py@badkey=\@undefined
-
-\newcommand{\optional}[1]{%
-  {\textnormal{\Large[}}{#1}\hspace{0.5mm}{\textnormal{\Large]}}}
-
-% This can be used when a function or method accepts an varying number 
-% of arguments, such as by using the *args syntax in the parameter list.
-\newcommand{\py@moreargs}{...}
-
-% This can be used when you don't want to document the parameters to a 
-% function or method, but simply state that it's an alias for
-% something else.
-\newcommand{\py@unspecified}{...}
-
-\newcommand{\py@varvars}[1]{{%
-    {\let\unspecified=\py@unspecified%
-      \let\moreargs=\py@moreargs%
-      \emph{#1}}}}
-
-\newlength{\py@argswidth}
-\newcommand{\py@sigparams}[1]{%
-  \parbox[t]{\py@argswidth}{\py@varvars{#1}\code{)}}}
-\newcommand{\py@sigline}[2]{%
-  \settowidth{\py@argswidth}{#1\code{(}}%
-  \addtolength{\py@argswidth}{-2\py@argswidth}%
-  \addtolength{\py@argswidth}{\textwidth}%
-  \item[#1\code{(}\py@sigparams{#2}]}
-
-% C functions ------------------------------------------------------------
-% \begin{cfuncdesc}[refcount]{type}{name}{arglist}
-% Note that the [refcount] slot should only be filled in by
-% tools/anno-api.py; it pulls the value from the refcounts database.
-\newcommand{\cfuncline}[3]{
-  \py@sigline{\code{#1 \bfcode{#2}}}{#3}%
-}
-\newenvironment{cfuncdesc}[3]{
-  \begin{fulllineitems}
-    \cfuncline{#1}{#2}{#3}
-}{\end{fulllineitems}}
-
-% C variables ------------------------------------------------------------
-% \begin{cvardesc}{type}{name}
-\newenvironment{cvardesc}[2]{
-  \begin{fulllineitems}
-    \item[\code{#1 \bfcode{#2}}]
-}{\end{fulllineitems}}
-
-% C data types -----------------------------------------------------------
-% \begin{ctypedesc}[index name]{typedef name}
-\newenvironment{ctypedesc}[2][\py@badkey]{
-  \begin{fulllineitems}
-    \item[\bfcode{#2}]
-}{\end{fulllineitems}}
-
-% C type fields ----------------------------------------------------------
-% \begin{cmemberdesc}{container type}{ctype}{membername}
-\newcommand{\cmemberline}[3]{
-  \item[\code{#2 \bfcode{#3}}]
-}
-\newenvironment{cmemberdesc}[3]{
-  \begin{fulllineitems}
-    \cmemberline{#1}{#2}{#3}
-}{\end{fulllineitems}}
-
-% Funky macros -----------------------------------------------------------
-% \begin{csimplemacrodesc}{name}
-% -- "simple" because it has no args; NOT for constant definitions!
-\newenvironment{csimplemacrodesc}[1]{
-  \begin{fulllineitems}
-    \item[\bfcode{#1}]
-}{\end{fulllineitems}}
-
-% simple functions (not methods) -----------------------------------------
-% \begin{funcdesc}{name}{args}
-\newcommand{\funcline}[2]{%
-  \py@sigline{\bfcode{#1}}{#2}}
-\newenvironment{funcdesc}[2]{
-  \begin{fulllineitems}
-    \funcline{#1}{#2}
-}{\end{fulllineitems}}
-
-% classes ----------------------------------------------------------------
-% \begin{classdesc}{name}{constructor args}
-\newcommand{\classline}[2]{
-  \py@sigline{\strong{class }\bfcode{#1}}{#2}}
-\newenvironment{classdesc}[2]{
-  % Using \renewcommand doesn't work for this, for unknown reasons:
-  \global\def\py@thisclass{#1}
-  \begin{fulllineitems}
-    \classline{#1}{#2}
-}{\end{fulllineitems}}
-
-% \begin{excclassdesc}{name}{constructor args}
-% but indexes as an exception
-\newenvironment{excclassdesc}[2]{
-  % Using \renewcommand doesn't work for this, for unknown reasons:
-  \global\def\py@thisclass{#1}
-  \begin{fulllineitems}
-    \py@sigline{\strong{exception }\bfcode{#1}}{#2}%
-}{\end{fulllineitems}}
-
-% There is no corresponding {excclassdesc*} environment.  To describe
-% a class exception without parameters, use the {excdesc} environment.
-
-
-\let\py@classbadkey=\@undefined
-
-% object method ----------------------------------------------------------
-% \begin{methoddesc}[classname]{methodname}{args}
-\newcommand{\methodline}[3][\@undefined]{
-  \py@sigline{\bfcode{#2}}{#3}}
-\newenvironment{methoddesc}[3][\@undefined]{
-  \begin{fulllineitems}
-    \ifx\@undefined#1\relax
-      \methodline{#2}{#3}
-    \else
-      \def\py@thisclass{#1}
-      \methodline{#2}{#3}
-    \fi
-}{\end{fulllineitems}}
-
-% static method ----------------------------------------------------------
-% \begin{staticmethoddesc}[classname]{methodname}{args}
-\newcommand{\staticmethodline}[3][\@undefined]{
-  \py@sigline{static \bfcode{#2}}{#3}}
-\newenvironment{staticmethoddesc}[3][\@undefined]{
-  \begin{fulllineitems}
-    \ifx\@undefined#1\relax
-      \staticmethodline{#2}{#3}
-    \else
-      \def\py@thisclass{#1}
-      \staticmethodline{#2}{#3}
-    \fi
-}{\end{fulllineitems}}
-
-% class method ----------------------------------------------------------
-% \begin{classmethoddesc}[classname]{methodname}{args}
-\newcommand{\classmethodline}[3][\@undefined]{
-  \py@sigline{class \bfcode{#2}}{#3}}
-\newenvironment{classmethoddesc}[3][\@undefined]{
-  \begin{fulllineitems}
-    \ifx\@undefined#1\relax
-      \classmethodline{#2}{#3}
-    \else
-      \def\py@thisclass{#1}
-      \classmethodline{#2}{#3}
-    \fi
-}{\end{fulllineitems}}
-
-% object data attribute --------------------------------------------------
-% \begin{memberdesc}[classname]{membername}
-\newcommand{\memberline}[2][\py@classbadkey]{%
-  \ifx\@undefined#1\relax
-    \item[\bfcode{#2}]
-  \else
-    \item[\bfcode{#2}]
-  \fi
-}
-\newenvironment{memberdesc}[2][\py@classbadkey]{
-  \begin{fulllineitems}
-    \ifx\@undefined#1\relax
-      \memberline{#2}
-    \else
-      \def\py@thisclass{#1}
-      \memberline{#2}
-    \fi
-}{\end{fulllineitems}}
-
-% For exceptions: --------------------------------------------------------
-% \begin{excdesc}{name}
-%  -- for constructor information, use excclassdesc instead
-\newenvironment{excdesc}[1]{
-  \begin{fulllineitems}
-    \item[\strong{exception }\bfcode{#1}]
-}{\end{fulllineitems}}
-
-% Module data or constants: ----------------------------------------------
-% \begin{datadesc}{name}
-\newcommand{\dataline}[1]{%
-  \item[\bfcode{#1}]\nopagebreak}
-\newenvironment{datadesc}[1]{
-  \begin{fulllineitems}
-    \dataline{#1}
-}{\end{fulllineitems}}
-
-% bytecode instruction ---------------------------------------------------
-% \begin{opcodedesc}{name}{var}
-% -- {var} may be {}
-\newenvironment{opcodedesc}[2]{
-  \begin{fulllineitems}
-    \item[\bfcode{#1}\quad\emph{#2}]
-}{\end{fulllineitems}}
-
-% generic description ----------------------------------------------------
-\newcommand{\descline}[1]{%
-  \item[\bfcode{#1}]\nopagebreak%
-}
-\newenvironment{describe}[1]{
-  \begin{fulllineitems}
-    \descline{#1}
-}{\end{fulllineitems}}
-
-% This version is being checked in for the historical record; it shows
-% how I've managed to get some aspects of this to work.  It will not
-% be used in practice, so a subsequent revision will change things
-% again.  This version has problems, but shows how to do something
-% that proved more tedious than I'd expected, so I don't want to lose
-% the example completely.
-%
-\newcommand{\grammartoken}[1]{\texttt{#1}}
-\newenvironment{productionlist}[1][\py@badkey]{
-  \def\optional##1{{\Large[}##1{\Large]}}
-  \def\production##1##2{\code{##1}&::=&\code{##2}\\}
-  \def\productioncont##1{& &\code{##1}\\}
-  \def\token##1{##1}
-  \let\grammartoken=\token
-  \parindent=2em
-  \indent
-  \begin{tabular}{lcl}
-}{%
-  \end{tabular}
-}
-
-% Notices / Admonitions
-%
-\newlength{\py@noticelength}
-
-\newcommand{\py@heavybox}{
-  \setlength{\fboxrule}{1pt}
-  \setlength{\fboxsep}{7pt}
-  \setlength{\py@noticelength}{\linewidth}
-  \addtolength{\py@noticelength}{-2\fboxsep}
-  \addtolength{\py@noticelength}{-2\fboxrule}
-  \setlength{\shadowsize}{3pt}
-  \Sbox
-  \minipage{\py@noticelength}
-}
-\newcommand{\py@endheavybox}{
-  \endminipage
-  \endSbox
-  \fbox{\TheSbox}
-}
-
-% Some are quite plain:
-\newcommand{\py@noticestart@note}{}
-\newcommand{\py@noticeend@note}{}
-\newcommand{\py@noticestart@hint}{}
-\newcommand{\py@noticeend@hint}{}
-\newcommand{\py@noticestart@important}{}
-\newcommand{\py@noticeend@important}{}
-\newcommand{\py@noticestart@tip}{}
-\newcommand{\py@noticeend@tip}{}
-
-% Others gets more visible distinction:
-\newcommand{\py@noticestart@warning}{\py@heavybox}
-\newcommand{\py@noticeend@warning}{\py@endheavybox}
-\newcommand{\py@noticestart@caution}{\py@heavybox}
-\newcommand{\py@noticeend@caution}{\py@endheavybox}
-\newcommand{\py@noticestart@attention}{\py@heavybox}
-\newcommand{\py@noticeend@attention}{\py@endheavybox}
-\newcommand{\py@noticestart@danger}{\py@heavybox}
-\newcommand{\py@noticeend@danger}{\py@endheavybox}
-\newcommand{\py@noticestart@error}{\py@heavybox}
-\newcommand{\py@noticeend@error}{\py@endheavybox}
-
-\newenvironment{notice}[2]{
-  \def\py@noticetype{#1}
-  \csname py@noticestart@#1\endcsname
-  \par\strong{#2}
-}{\csname py@noticeend@\py@noticetype\endcsname}
-
-% Allow the release number to be specified independently of the
-% \date{}.  This allows the date to reflect the document's date and
-% release to specify the release that is documented.
-%
-\newcommand{\py@release}{}
-\newcommand{\version}{}
-\newcommand{\shortversion}{}
-\newcommand{\releaseinfo}{}
-\newcommand{\releasename}{Release}
-\newcommand{\release}[1]{%
-  \renewcommand{\py@release}{\releasename\space\version}%
-  \renewcommand{\version}{#1}}
-\newcommand{\setshortversion}[1]{%
-  \renewcommand{\shortversion}{#1}}
-\newcommand{\setreleaseinfo}[1]{%
-  \renewcommand{\releaseinfo}{#1}}
-
-% Allow specification of the author's address separately from the
-% author's name.  This can be used to format them differently, which
-% is a good thing.
-%
-\newcommand{\py@authoraddress}{}
-\newcommand{\authoraddress}[1]{\renewcommand{\py@authoraddress}{#1}}
-
-% This sets up the fancy chapter headings that make the documents look
-% at least a little better than the usual LaTeX output.
-%
-\@ifundefined{ChTitleVar}{}{
-  \ChNameVar{\raggedleft\normalsize\py@HeaderFamily}
-  \ChNumVar{\raggedleft \bfseries\Large\py@HeaderFamily}
-  \ChTitleVar{\raggedleft \rm\Huge\py@HeaderFamily}
-  % This creates chapter heads without the leading \vspace*{}:
-  \def\@makechapterhead#1{%
-    {\parindent \z@ \raggedright \normalfont
-      \ifnum \c@secnumdepth >\m@ne
-        \DOCH
-      \fi
-      \interlinepenalty\@M
-      \DOTI{#1}
-    }
-  }
-}
-
-% Redefine description environment so that it is usable inside fulllineitems.
-%
-\renewcommand{\description}{%
-  \list{}{\labelwidth\z@%
-          \itemindent-\leftmargin%
-	  \labelsep5pt%
-          \let\makelabel=\descriptionlabel}}
-
-% Definition lists; requested by AMK for HOWTO documents.  Probably useful
-% elsewhere as well, so keep in in the general style support.
-%
-\newenvironment{definitions}{%
-  \begin{description}%
-  \def\term##1{\item[##1]\mbox{}\\*[0mm]}
-}{%
-  \end{description}%
-}
-
-% Tell TeX about pathological hyphenation cases:
-\hyphenation{Base-HTTP-Re-quest-Hand-ler}
-
-
-% The following is stuff copied from docutils' latex writer.
-%
-\newcommand{\optionlistlabel}[1]{\bf #1 \hfill}
-\newenvironment{optionlist}[1]
-{\begin{list}{}
-  {\setlength{\labelwidth}{#1}
-   \setlength{\rightmargin}{1cm}
-   \setlength{\leftmargin}{\rightmargin}
-   \addtolength{\leftmargin}{\labelwidth}
-   \addtolength{\leftmargin}{\labelsep}
-   \renewcommand{\makelabel}{\optionlistlabel}}
-}{\end{list}}
-
-\newlength{\lineblockindentation}
-\setlength{\lineblockindentation}{2.5em}
-\newenvironment{lineblock}[1]
-{\begin{list}{}
-  {\setlength{\partopsep}{\parskip}
-   \addtolength{\partopsep}{\baselineskip}
-   \topsep0pt\itemsep0.15\baselineskip\parsep0pt
-   \leftmargin#1}
- \raggedright}
-{\end{list}}
-
-% Redefine includgraphics for avoiding images larger than the screen size
-% If the size is not specified.
-\let\py@Oldincludegraphics\includegraphics
-
-\newbox\image@box%
-\newdimen\image@width%
-\renewcommand\includegraphics[2][\@empty]{%
-  \ifx#1\@empty%
-    \setbox\image@box=\hbox{\py@Oldincludegraphics{#2}}%
-    \image@width\wd\image@box%
-    \ifdim \image@width>\linewidth%
-      \setbox\image@box=\hbox{\py@Oldincludegraphics[width=\linewidth]{#2}}%
-      \box\image@box%
-    \else%
-      \py@Oldincludegraphics{#2}%
-    \fi%
-  \else%
-    \py@Oldincludegraphics[#1]{#2}%
-  \fi%
-}
-
-
-% Fix the index and bibliography environments to add an entry to the Table of
-% Contents; this is much nicer than just having to jump to the end of the book
-% and flip around, especially with multiple indexes.
-%
-\let\py@OldTheindex=\theindex
-\renewcommand{\theindex}{
-  \cleardoublepage
-  \phantomsection
-  \py@OldTheindex
-  \addcontentsline{toc}{chapter}{\indexname}
-}
-
-\let\py@OldThebibliography=\thebibliography
-\renewcommand{\thebibliography}[1]{
-  \cleardoublepage
-  \phantomsection
-  \py@OldThebibliography{1}
-  \addcontentsline{toc}{chapter}{\bibname}
-}
-
-% Include hyperref last.
-\RequirePackage[colorlinks,breaklinks,
-                linkcolor=InnerLinkColor,filecolor=OuterLinkColor,
-                menucolor=OuterLinkColor,pagecolor=OuterLinkColor,
-                urlcolor=OuterLinkColor,citecolor=InnerLinkColor]{hyperref}
-
-% From docutils.writers.latex2e
-\providecommand{\DUspan}[2]{%
-  {% group ("span") to limit the scope of styling commands
-    \@for\node@class@name:=#1\do{%
-    \ifcsname docutilsrole\node@class@name\endcsname%
-      \csname docutilsrole\node@class@name\endcsname%
-    \fi%
-    }%
-    {#2}% node content
-  }% close "span"
-}
diff --git a/docs/fr/_build/latex/tabulary.sty b/docs/fr/_build/latex/tabulary.sty
deleted file mode 100644
index ba83c0af..00000000
--- a/docs/fr/_build/latex/tabulary.sty
+++ /dev/null
@@ -1,452 +0,0 @@
-%%
-%% This is file `tabulary.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% tabulary.dtx  (with options: `package')
-%% DRAFT VERSION
-%%
-%% File `tabulary.dtx'.
-%% Copyright (C) 1995 1996 2003 David Carlisle
-%% This file may be distributed under the terms of the LPPL.
-%% See 00readme.txt for details.
-%%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tabulary}
-          [2007/10/02 v0.9 tabulary package (DPC)]
-\RequirePackage{array}
-\catcode`\Z=14
-\DeclareOption{debugshow}{\catcode`\Z=9\relax}
-\ProcessOptions
-\def\arraybackslash{\let\\=\@arraycr}
-\def\@finalstrut#1{%
-  \unskip\ifhmode\nobreak\fi\vrule\@width\z@\@height\z@\@depth\dp#1}
-\newcount\TY@count
-\def\tabulary{%
-  \let\TY@final\tabular
-  \let\endTY@final\endtabular
-  \TY@tabular}
-\def\TY@tabular#1{%
-  \edef\TY@{\@currenvir}%
-  {\ifnum0=`}\fi
-  \@ovxx\TY@linewidth
-  \@ovyy\TY@tablewidth
-  \count@\z@
-  \@tempswatrue
-  \@whilesw\if@tempswa\fi{%
-  \advance\count@\@ne
-  \expandafter\ifx\csname TY@F\the\count@\endcsname\relax
-    \@tempswafalse
-  \else
-    \expandafter\let\csname TY@SF\the\count@\expandafter\endcsname
-                     \csname TY@F\the\count@\endcsname
-    \global\expandafter\let\csname TY@F\the\count@\endcsname\relax
-    \expandafter\let\csname TY@S\the\count@\expandafter\endcsname
-                     \csname TY@\the\count@\endcsname
-  \fi}%
-    \global\TY@count\@ne
-    \TY@width\xdef{0pt}%
-    \global\TY@tablewidth\z@
-    \global\TY@linewidth#1\relax
-Z\message{^^J^^JTable^^J%
-Z        Target Width: \the\TY@linewidth^^J%
-Z        \string\tabcolsep: \the\tabcolsep\space
-Z        \string\arrayrulewidth: \the\arrayrulewidth\space
-Z        \string\doublerulesep: \the\doublerulesep^^J%
-Z        \string\tymin: \the\tymin\space
-Z        \string\tymax: \the\tymax^^J}%
-    \let\@classz\TY@classz
-    \let\verb\TX@verb
-    \toks@{}\TY@get@body}
-\let\TY@@mkpream\@mkpream
-\def\TY@mkpream{%
-    \def\@addamp{%
-      \if@firstamp \@firstampfalse \else
-      \global\advance\TY@count\@ne
-      \edef\@preamble{\@preamble &}\fi
-      \TY@width\xdef{0pt}}%
-    \def\@acol{%
-      \TY@subwidth\col@sep
-      \@addtopreamble{\hskip\col@sep}}%
-    \let\@arrayrule\TY@arrayrule
-    \let\@classvi\TY@classvi
-    \def\@classv{\save@decl
-      \expandafter\NC@ecs\@nextchar\extracolsep{}\extracolsep\@@@
-      \sbox\z@{\d@llarbegin\@nextchar\d@llarend}%
-      \TY@subwidth{\wd\z@}%
-      \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
-      \prepnext@tok}%
-  \global\let\@mkpream\TY@@mkpream
-  \TY@@mkpream}
-\def\TY@arrayrule{%
-  \TY@subwidth\arrayrulewidth
-  \@addtopreamble \vline}
-\def\TY@classvi{\ifcase \@lastchclass
-  \@acol \or
-  \TY@subwidth\doublerulesep
-  \@addtopreamble{\hskip \doublerulesep}\or
-  \@acol \or
-  \@classvii
-  \fi}
-\def\TY@tab{%
-  \setbox\z@\hbox\bgroup
-  \let\[$\let\]$%
-  \let\equation$\let\endequation$%
-    \col@sep\tabcolsep
-    \let\d@llarbegin\begingroup\let\d@llarend\endgroup
-    \let\@mkpream\TY@mkpream
-      \def\multicolumn##1##2##3{\multispan##1\relax}%
-    \CT@start\TY@tabarray}
-\def\TY@tabarray{\@ifnextchar[{\TY@array}{\@array[t]}}
-\def\TY@array[#1]{\@array[t]}
-\def\TY@width#1{%
-  \expandafter#1\csname TY@\the\TY@count\endcsname}
-\def\TY@subwidth#1{%
-  \TY@width\dimen@
-  \advance\dimen@-#1\relax
-  \TY@width\xdef{\the\dimen@}%
-  \global\advance\TY@linewidth-#1\relax}
-\def\endtabulary{%
-  \gdef\@halignto{}%
-  \let\TY@footnote\footnote%
-  \def\footnote{}% prevent footnotes from doing anything
-  \expandafter\TY@tab\the\toks@
-  \crcr\omit
-  {\xdef\TY@save@row{}%
-     \loop
-    \advance\TY@count\m@ne
-    \ifnum\TY@count>\z@
-    \xdef\TY@save@row{\TY@save@row&\omit}%
-    \repeat}\TY@save@row
-  \endarray\global\setbox1=\lastbox\setbox0=\vbox{\unvbox1
-    \unskip\global\setbox1=\lastbox}\egroup
-  \dimen@\TY@linewidth
-  \divide\dimen@\TY@count
-  \ifdim\dimen@<\tymin
-    \TY@warn{tymin too large (\the\tymin), resetting to \the\dimen@}%
-    \tymin\dimen@
-  \fi
-  \setbox\tw@=\hbox{\unhbox\@ne
-    \loop
-\@tempdima=\lastskip
-\ifdim\@tempdima>\z@
-Z   \message{ecs=\the\@tempdima^^J}%
-   \global\advance\TY@linewidth-\@tempdima
-\fi
-    \unskip
-    \setbox\tw@=\lastbox
-    \ifhbox\tw@
-Z     \message{Col \the\TY@count: Initial=\the\wd\tw@\space}%
-      \ifdim\wd\tw@>\tymax
-        \wd\tw@\tymax
-Z       \message{> max\space}%
-Z     \else
-Z       \message{ \@spaces\space}%
-      \fi
-  \TY@width\dimen@
-Z \message{\the\dimen@\space}%
-  \advance\dimen@\wd\tw@
-Z \message{Final=\the\dimen@\space}%
-   \TY@width\xdef{\the\dimen@}%
-      \ifdim\dimen@<\tymin
-Z        \message{< tymin}%
-         \global\advance\TY@linewidth-\dimen@
-         \expandafter\xdef\csname TY@F\the\TY@count\endcsname
-                                                        {\the\dimen@}%
-       \else
-      \expandafter\ifx\csname TY@F\the\TY@count\endcsname\z@
-Z        \message{***}%
-         \global\advance\TY@linewidth-\dimen@
-         \expandafter\xdef\csname TY@F\the\TY@count\endcsname
-                                                        {\the\dimen@}%
-        \else
-Z        \message{> tymin}%
-         \global\advance\TY@tablewidth\dimen@
-         \global\expandafter\let\csname TY@F\the\TY@count\endcsname
-                                                               \maxdimen
-       \fi\fi
-       \advance\TY@count\m@ne
-    \repeat}%
-    \TY@checkmin
-    \TY@checkmin
-    \TY@checkmin
-    \TY@checkmin
-    \TY@count\z@
-    \let\TY@box\TY@box@v
-    \let\footnote\TY@footnote % restore footnotes
-  {\expandafter\TY@final\the\toks@\endTY@final}%
-  \count@\z@
-  \@tempswatrue
-  \@whilesw\if@tempswa\fi{%
-  \advance\count@\@ne
-  \expandafter\ifx\csname TY@SF\the\count@\endcsname\relax
-    \@tempswafalse
-  \else
-    \global\expandafter\let\csname TY@F\the\count@\expandafter\endcsname
-                   \csname TY@SF\the\count@\endcsname
-    \global\expandafter\let\csname TY@\the\count@\expandafter\endcsname
-                   \csname TY@S\the\count@\endcsname
-  \fi}%
-  \TY@linewidth\@ovxx
-  \TY@tablewidth\@ovyy
-    \ifnum0=`{\fi}}
-\def\TY@checkmin{%
-  \let\TY@checkmin\relax
-\ifdim\TY@tablewidth>\z@
-  \Gscale@div\TY@ratio\TY@linewidth\TY@tablewidth
- \ifdim\TY@tablewidth <\linewidth
-   \def\TY@ratio{1}%
- \fi
-\else
-  \TY@warn{No suitable columns!}%
-  \def\TY@ratio{1}%
-\fi
-\count@\z@
-Z \message{^^JLine Width: \the\TY@linewidth,
-Z             Natural Width: \the\TY@tablewidth,
-Z             Ratio: \TY@ratio^^J}%
-\@tempdima\z@
-\loop
-\ifnum\count@<\TY@count
-\advance\count@\@ne
-  \ifdim\csname TY@F\the\count@\endcsname>\tymin
-    \dimen@\csname TY@\the\count@\endcsname
-    \dimen@\TY@ratio\dimen@
-    \ifdim\dimen@<\tymin
-Z     \message{Column \the\count@\space ->}%
-      \global\expandafter\let\csname TY@F\the\count@\endcsname\tymin
-      \global\advance\TY@linewidth-\tymin
-      \global\advance\TY@tablewidth-\csname TY@\the\count@\endcsname
-      \let\TY@checkmin\TY@@checkmin
-    \else
-      \expandafter\xdef\csname TY@F\the\count@\endcsname{\the\dimen@}%
-      \advance\@tempdima\csname TY@F\the\count@\endcsname
-    \fi
-  \fi
-Z \dimen@\csname TY@F\the\count@\endcsname\message{\the\dimen@, }%
-\repeat
-Z \message{^^JTotal:\the\@tempdima^^J}%
-}
-\let\TY@@checkmin\TY@checkmin
-\newdimen\TY@linewidth
-\def\tyformat{\everypar{{\nobreak\hskip\z@skip}}}
-\newdimen\tymin
-\tymin=10pt
-\newdimen\tymax
-\tymax=2\textwidth
-\def\@testpach{\@chclass
- \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
-  \ifnum \@lastchclass=7 5 \else
-   \ifnum \@lastchclass=8 \tw@ \else
-    \ifnum \@lastchclass=9 \thr@@
-   \else \z@
-   \ifnum \@lastchclass = 10 \else
-   \edef\@nextchar{\expandafter\string\@nextchar}%
-   \@chnum
-   \if \@nextchar c\z@ \else
-    \if \@nextchar l\@ne \else
-     \if \@nextchar r\tw@ \else
-   \if \@nextchar C7 \else
-    \if \@nextchar L8 \else
-     \if \@nextchar R9 \else
-     \if \@nextchar J10 \else
-   \z@ \@chclass
-   \if\@nextchar |\@ne \else
-    \if \@nextchar !6 \else
-     \if \@nextchar @7 \else
-      \if \@nextchar <8 \else
-       \if \@nextchar >9 \else
-  10
-  \@chnum
-  \if \@nextchar m\thr@@\else
-   \if \@nextchar p4 \else
-    \if \@nextchar b5 \else
-   \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi\fi \fi \fi\fi \fi
-     \fi  \fi  \fi  \fi  \fi  \fi \fi \fi \fi \fi \fi}
-\def\TY@classz{%
-  \@classx
-  \@tempcnta\count@
-  \ifx\TY@box\TY@box@v
-    \global\advance\TY@count\@ne
-  \fi
-  \let\centering c%
-  \let\raggedright\noindent
-  \let\raggedleft\indent
-  \let\arraybackslash\relax
-  \prepnext@tok
-  \ifnum\@chnum<4
-    \global\expandafter\let\csname TY@F\the\TY@count\endcsname\z@
-  \fi
-  \ifnum\@chnum=6
-    \global\expandafter\let\csname TY@F\the\TY@count\endcsname\z@
-  \fi
-  \@addtopreamble{%
-    \ifcase\@chnum
-      \hfil \d@llarbegin\insert@column\d@llarend \hfil \or
-      \kern\z@
-       \d@llarbegin \insert@column \d@llarend \hfil \or
-      \hfil\kern\z@ \d@llarbegin \insert@column \d@llarend \or
-      $\vcenter\@startpbox{\@nextchar}\insert@column \@endpbox $\or
-      \vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or
-      \vbox \@startpbox{\@nextchar}\insert@column \@endpbox \or
-      \d@llarbegin \insert@column \d@llarend \or% dubious "s" case
-      \TY@box\centering\or
-      \TY@box\raggedright\or
-      \TY@box\raggedleft\or
-      \TY@box\relax
-    \fi}\prepnext@tok}
-\def\TY@box#1{%
-  \ifx\centering#1%
-      \hfil \d@llarbegin\insert@column\d@llarend \hfil \else
-  \ifx\raggedright#1%
-        \kern\z@%<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-      \d@llarbegin \insert@column \d@llarend \hfil \else
-  \ifx\raggedleft#1%
-      \hfil\kern\z@ \d@llarbegin \insert@column \d@llarend \else
-  \ifx\relax#1%
-       \d@llarbegin \insert@column \d@llarend
-  \fi  \fi  \fi  \fi}
-\def\TY@box@v#1{%
-      \vtop \@startpbox{\csname TY@F\the\TY@count\endcsname}%
-              #1\arraybackslash\tyformat
-                              \insert@column\@endpbox}
-\newdimen\TY@tablewidth
-\def\Gscale@div#1#2#3{%
-  \setlength\dimen@{#3}%
-  \ifdim\dimen@=\z@
-    \PackageError{graphics}{Division by 0}\@eha
-    \dimen@#2%
-  \fi
-  \edef\@tempd{\the\dimen@}%
-  \setlength\dimen@{#2}%
-  \count@65536\relax
-  \ifdim\dimen@<\z@
-    \dimen@-\dimen@
-    \count@-\count@
-  \fi
-  \loop
-    \ifdim\dimen@<8192\p@
-      \dimen@\tw@\dimen@
-      \divide\count@\tw@
-  \repeat
-  \dimen@ii=\@tempd\relax
-  \divide\dimen@ii\count@
-  \divide\dimen@\dimen@ii
-  \edef#1{\strip@pt\dimen@}}
-\long\def\TY@get@body#1\end
-  {\toks@\expandafter{\the\toks@#1}\TY@find@end}
-\def\TY@find@end#1{%
-  \def\@tempa{#1}%
-  \ifx\@tempa\TY@\def\@tempa{\end{#1}}\expandafter\@tempa
-  \else\toks@\expandafter
-    {\the\toks@\end{#1}}\expandafter\TY@get@body\fi}
-\def\TY@warn{%
-  \PackageWarning{tabulary}}
-\catcode`\Z=11
-\AtBeginDocument{
-\@ifpackageloaded{colortbl}{%
-\expandafter\def\expandafter\@mkpream\expandafter#\expandafter1%
-  \expandafter{%
-    \expandafter\let\expandafter\CT@setup\expandafter\relax
-    \expandafter\let\expandafter\CT@color\expandafter\relax
-    \expandafter\let\expandafter\CT@do@color\expandafter\relax
-    \expandafter\let\expandafter\color\expandafter\relax
-    \expandafter\let\expandafter\CT@column@color\expandafter\relax
-    \expandafter\let\expandafter\CT@row@color\expandafter\relax
-    \@mkpream{#1}}
-\let\TY@@mkpream\@mkpream
-\def\TY@classz{%
-  \@classx
-  \@tempcnta\count@
-  \ifx\TY@box\TY@box@v
-    \global\advance\TY@count\@ne
-  \fi
-  \let\centering c%
-  \let\raggedright\noindent
-  \let\raggedleft\indent
-  \let\arraybackslash\relax
-  \prepnext@tok
-\expandafter\CT@extract\the\toks\@tempcnta\columncolor!\@nil
-  \ifnum\@chnum<4
-    \global\expandafter\let\csname TY@F\the\TY@count\endcsname\z@
-  \fi
-  \ifnum\@chnum=6
-    \global\expandafter\let\csname TY@F\the\TY@count\endcsname\z@
-  \fi
-  \@addtopreamble{%
-    \setbox\z@\hbox\bgroup\bgroup
-    \ifcase\@chnum
-      \hskip\stretch{.5}\kern\z@
-      \d@llarbegin\insert@column\d@llarend\hskip\stretch{.5}\or
-      \kern\z@%<<<<<<<<<<<<<<<<<<<<<<<<<<<
-       \d@llarbegin \insert@column \d@llarend \hfill \or
-      \hfill\kern\z@ \d@llarbegin \insert@column \d@llarend \or
-      $\vcenter\@startpbox{\@nextchar}\insert@column \@endpbox $\or
-      \vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or
-      \vbox \@startpbox{\@nextchar}\insert@column \@endpbox \or
-      \d@llarbegin \insert@column \d@llarend \or% dubious s case
-      \TY@box\centering\or
-      \TY@box\raggedright\or
-      \TY@box\raggedleft\or
-      \TY@box\relax
-    \fi
- \egroup\egroup
-\begingroup
-  \CT@setup
-  \CT@column@color
-  \CT@row@color
-  \CT@do@color
-\endgroup
-        \@tempdima\ht\z@
-        \advance\@tempdima\minrowclearance
-        \vrule\@height\@tempdima\@width\z@
-\unhbox\z@
-}\prepnext@tok}%
-    \def\TY@arrayrule{%
-      \TY@subwidth\arrayrulewidth
-      \@addtopreamble{{\CT@arc@\vline}}}%
-    \def\TY@classvi{\ifcase \@lastchclass
-      \@acol \or
-      \TY@subwidth\doublerulesep
-      \ifx\CT@drsc@\relax
-        \@addtopreamble{\hskip\doublerulesep}%
-      \else
-        \@addtopreamble{{\CT@drsc@\vrule\@width\doublerulesep}}%
-      \fi\or
-      \@acol \or
-      \@classvii
-      \fi}%
-}{%
-\let\CT@start\relax
-}
-}
-{\uccode`\*=`\ %
-\uppercase{\gdef\TX@verb{%
-  \leavevmode\null\TX@vwarn
-  {\ifnum0=`}\fi\ttfamily\let\\\ignorespaces
-  \@ifstar{\let~*\TX@vb}{\TX@vb}}}}
-\def\TX@vb#1{\def\@tempa##1#1{\toks@{##1}\edef\@tempa{\the\toks@}%
-    \expandafter\TX@v\meaning\@tempa\\ \\\ifnum0=`{\fi}}\@tempa!}
-\def\TX@v#1!{\afterassignment\TX@vfirst\let\@tempa= }
-\begingroup
-\catcode`\*=\catcode`\#
-\catcode`\#=12
-\gdef\TX@vfirst{%
-  \if\@tempa#%
-    \def\@tempb{\TX@v@#}%
-  \else
-    \let\@tempb\TX@v@
-    \if\@tempa\space~\else\@tempa\fi
-  \fi
-  \@tempb}
-\gdef\TX@v@*1 *2{%
-  \TX@v@hash*1##\relax\if*2\\\else~\expandafter\TX@v@\fi*2}
-\gdef\TX@v@hash*1##*2{*1\ifx*2\relax\else#\expandafter\TX@v@hash\fi*2}
-\endgroup
-\def\TX@vwarn{%
-  \@warning{\noexpand\verb may be unreliable inside tabularx/y}%
-  \global\let\TX@vwarn\@empty}
-\endinput
-%%
-%% End of file `tabulary.sty'.
diff --git a/docs/index.rst b/docs/index.rst
index b43c0ac9..a370a94f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -42,6 +42,8 @@ Contact me at "alexis at notmyidea dot org" for any request/feedback !
 Documentation
 =============
 
+A french version of the documentation is available at :doc:`fr/index`.
+
 .. toctree::
    :maxdepth: 2
    

From ac70770ba5c362be9f27d1abe7ab818a42d80a93 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 25 Jan 2011 16:50:34 +0000
Subject: [PATCH 0181/2864] Add the translation of the FAQ.

---
 docs/fr/faq.rst    | 51 ++++++++++++++++++++++------------------------
 docs/fr/themes.rst |  2 +-
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/docs/fr/faq.rst b/docs/fr/faq.rst
index bee1dd54..8cbe0881 100644
--- a/docs/fr/faq.rst
+++ b/docs/fr/faq.rst
@@ -1,38 +1,35 @@
-Frequently Asked Questions (FAQ)
-################################
+*Foire aux questions (FAQ)*
 
-Here is a summary of the frequently asked questions for pelican.
+Voici un résumé des questions fréquemment posées pour pelican.
 
-Is it mandatory to have a configuration file ?
-==============================================
+*Est-il obligatoire d'avoir un fichier de configuration ?*
 
-No, it's not. Configurations files are just an easy way to configure pelican.
-For the basic operations, it's possible to specify options while invoking
-pelican with the command line (see `pelican --help` for more informations about
-that)
+Non. Les fichiers de configuration sont juste un moyen facile de configurer
+pelican. Pour les opérations de base, il est possible de spécifier des
+options
+en invoquant pelican avec la ligne de commande (voir pelican --help pour
+plus
+d'informations à ce sujet)
 
-I'm creating my own theme, how to use pygments ?
-================================================
+*Je crée mon propre thème, comment utiliser pygments?*
 
-Pygment add some classes to the generated content, so the theming of your theme
-will be done thanks to a css file. You can have a look to the one proposed by
-default `on the project website <http://pygments.org/demo/15101/>`_
+Pygment ajoute quelques classes au contenu généré, de sorte qua colorisation
+de votre thème se fait grâce à un fichier css. Vous pouvez jeter un oeil à
+celui proposé par`sur le site du projet <http://pygments.org/demo/15101/>`_
 
-How do I create my own theme ?
-==============================
+*Comment puis-je créer mon propre thèm*
 
-Please refer yourself to :ref:`theming-pelican`.
+Vueillez vous référer à :ref:`theming-pelican-fr`.
 
-How can I help ?
-================
+*Comment puis-je aider?*
 
-You have different options to help. First, you can use pelican, and report any
-idea or problem you have on `the bugtracker
-<http://github.com/ametaireau/pelican/issues>`_.
+Vous avez plusieurs options pour aider. Tout d'abord, vous pouvez utiliser
+le
+pélican, et signaler toute idée ou problème que vous avez sur le bugtracker
+.
 
-If you want to contribute, please have a look to `the git repository
-<https://github.com/ametaireau/pelican/>`_, fork it, add your changes and do
-a pull request, I'll review them as soon as possible.
+Si vous voulez contribuer, jeter un oeil au dépôt git , ajoutez vos
+modifications et faites une demande, je les regarderai dès que possible
 
-You can also contribute by creating themes, and making the documentation
-better.
+Vous pouvez aussi contribuer en créant des thèmes, et/ou compléter la
+documentation.
diff --git a/docs/fr/themes.rst b/docs/fr/themes.rst
index 7d492544..a9c2262b 100644
--- a/docs/fr/themes.rst
+++ b/docs/fr/themes.rst
@@ -1,4 +1,4 @@
-.. _theming-pelican:
+.. _theming-pelican-fr:
 
 How to create themes for pelican
 ################################

From 079e9f878e8b0b14da02cc3495cf89e7fde55c23 Mon Sep 17 00:00:00 2001
From: Guillaume <guillaume@mint.(none)>
Date: Wed, 26 Jan 2011 17:36:59 +0100
Subject: [PATCH 0182/2864] Francisation des noms de fichier de la doc fr

---
 docs/fr/{basis.rst => bases.rst}          |   0
 docs/fr/configuration.rst                 | 154 ++++++++++++++++++++++
 docs/fr/conventions.rst                   |  18 +++
 docs/fr/index.rst                         |  14 +-
 docs/fr/index.rst.save                    |  53 --------
 docs/fr/{install.rst => installation.rst} |   0
 docs/fr/internals.rst                     |  81 ------------
 docs/fr/settings.rst                      | 111 ----------------
 docs/fr/themes.rst                        | 106 ---------------
 9 files changed, 178 insertions(+), 359 deletions(-)
 rename docs/fr/{basis.rst => bases.rst} (100%)
 create mode 100644 docs/fr/configuration.rst
 create mode 100644 docs/fr/conventions.rst
 delete mode 100644 docs/fr/index.rst.save
 rename docs/fr/{install.rst => installation.rst} (100%)
 delete mode 100644 docs/fr/internals.rst
 delete mode 100644 docs/fr/settings.rst
 delete mode 100644 docs/fr/themes.rst

diff --git a/docs/fr/basis.rst b/docs/fr/bases.rst
similarity index 100%
rename from docs/fr/basis.rst
rename to docs/fr/bases.rst
diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
new file mode 100644
index 00000000..5f61a3ba
--- /dev/null
+++ b/docs/fr/configuration.rst
@@ -0,0 +1,154 @@
+Fichier de configuration
+************************
+
+On va créer un fichier de configuration que l’on va appeler **settings.py**. On peut
+utiliser Pelican sans faire ce fichier, mais il faudrait à chaque fois passer les paramètres
+en ligne de commande. Et comme il va nous servir à faire d’autres choses bien utile,
+autant l’appréhender de suite. Cependant, nous n’allons voir que la base pour l’instant.
+
+Paramètres de base
+==================
+
+AUTHOR :
+	Désigne l’auteur par défaut ;
+
+DEFAULT_CATEGORY :
+        La catégorie par défaut des articles. Si ce paramètre n’est
+	pas documenté, il prendra la valeur misc — pour miscellaneous (divers en français) ;
+
+SITENAME :
+	Le nom de votre site ;
+
+OUTPUT_PATH : 
+	Le répertoire de sortie du blog.
+
+Quand je dis qu’on va faire simple, on fait simple !
+Passons donc à ce quoi doit ressembler le fichier de configuration ::
+
+	# -*- coding: utf-8 -*-
+	AUTHOR = "Guillaume"
+	DEFAULT_CATEGORY = "GNU-Linux"
+	SITENAME = "Free Culture"
+
+
+Si vous avez un serveur comme Apache de configuré pour votre machine, vous
+pouvez paramétrer le répertoire de sortie vers **/var/www/blog** par exemple ::
+
+	OUTPUT_PATH = "/var/www/blog"
+
+Une remarque importante. Si vous avez besoin de passer un caractère accentué, il
+faut le préciser que la chaine est en unicode en faisant par exemple
+*AUTHOR = u"Guillaume LAMÉ"*
+
+Pour bien vérifier que les paramètres sont bien pris en compte, nous allons enlever les lignes *:author: Guillaume* et *:category: GNU-Linux* de notre fichier
+**premier_article.rst** et regénérer le blog.
+
+Rafraichissez votre page, ce devrait être bon.
+
+Nous allons maintenant passer en revue les différents paramètres de Pelican. Je les
+ai regroupé par thème. Cependant, c’est surtout un listing avant de rentrer dans les
+détails au prochain chapitre.
+
+Flux de syndication
+===================
+
+CATEGORY_FEED : 
+	Chemin d’écriture des flux Atom liés aux catégories ;
+
+CATEGORY_FEED_RSS : 
+	Idem pour les flux rss (Optionnel);
+
+FEED :
+	Chemin du flux Atom global ;
+
+FEED_RSS :
+	Chemin du flux Rss global (Optionnel);
+
+TAG_FEED :
+	Chemin des flux Atom pour les tags (Optionnel);
+
+TAG_FEED_RSS :
+	Chemin des flux Rss pour les tags (Optionnel).
+
+
+Traductions
+===========
+
+DEFAULT_LANG :
+	Le langage par défaut à utiliser. «*en*» par défaut ;
+
+TRANSLATION_FEED :
+	Chemin du flux pour les traductions.
+
+
+Thèmes
+======
+
+CSS_FILE :
+	Fichier css à utiliser si celui-ci est différent du fichier par défaut (*main.css*) ;
+
+DISPLAY_PAGES_ON_MENU :
+	Affiche ou non les pages statiques sur le menu du thème ; 
+
+DISQUS_SITENAME :
+	Indiquer le nom du site spécifié sur Disqus ;
+
+GITHUB_URL :
+	Indiquez votre url Github ;
+
+GOOGLE_ANALYTICS :
+	'UA-XXXX-YYYY' pour activer Google analytics ;
+
+JINJA_EXTENSIONS :
+	Liste d'extension Jinja2 que vous souhaitez utiliser ;
+
+LINKS :
+	Une liste de tuples (Titre, url) pour afficher la liste de lien ;
+
+PDF_PROCESSOR :
+	Génère ou non les articles et pages au format pdf ;
+
+REVERSE_ARCHIVE_ORDER :
+	Met les articles plus récent en tête de l'archive ;
+
+SOCIAL :
+	Une liste de tuples (Titre, url) pour afficher la liste de lien dans la section "Social" ;
+
+STATIC_THEME_PATHS :
+	Répertoire du thème que vous souhaitez importer dans l'arborescence finale ;
+ 
+THEME :
+	Thème à utiliser:
+
+TWITTER_USERNAME :
+	Permet d'afficher un bouton permettant le tweet des articles. 
+
+
+
+
+
+Paramètres divers
+=================
+
+FALLBACK_ON_FS_DATE :
+	Si *True*, Pelican se basera sur le *mtime* du fichier s'il n'y a pas de date spécifiée dans le fichier de l'article ;
+
+KEEP_OUTPUT DIRECTORY :
+	Ne génère que les fichiers modifiés et n'efface pas le repertoire de sortie ;
+
+MARKUP :
+	Langage de balisage à utiliser ;
+
+PATH :
+	Répertoire à suivre pour les fichiers inclus ;
+
+SITEURL :
+	URL de base de votre site ;
+
+STATIC_PATHS :
+	Les chemins statiques que vous voulez avoir accès sur le chemin de sortie "statique" ;
+
+
+
+
+
diff --git a/docs/fr/conventions.rst b/docs/fr/conventions.rst
new file mode 100644
index 00000000..bf88c07e
--- /dev/null
+++ b/docs/fr/conventions.rst
@@ -0,0 +1,18 @@
+Conventions
+###########
+
+Environnement de test
+=====================
+
+Les exemples sont basées sur une distribution Debian. Pour les autres distributions,
+il y aura des ajustements à faire, notamment pour l’installation de Pelican. Les
+noms des paquets peuvent changer.
+
+Conventions typographiques
+==========================
+
+Un petit rappel concernant les codes sources.
+
+ *  $ correspond à une ligne à exécuter en tant qu’utilisateur courant du systême ;
+ * # correspond à une ligne à exécuter en tant que root ;
+ * **settings.py** : Les noms des répertoires et fichiers sont en gras.
diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index 3d77a923..cdb0868f 100644
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -29,8 +29,8 @@ Vous n'avez pas remarqué ? "Pelican" est un anagramme pour "Calepin"  ;)
 Code source
 ===========
 
-Vous pouvez accéder au code source via mercurial sur  http://hg.notmyidea.org/pelican/
-ou via git à l'adresse http://github.com/ametaireau/pelican/
+Vous pouvez accéder au code source via git à l'adresse 
+http://github.com/ametaireau/pelican/
 
 Feedback !
 ==========
@@ -46,9 +46,7 @@ Documentation
 .. toctree::
    :maxdepth: 2
    
-   install
-   basis
-   settings
-   themes
-   internals
-   faq
+   conventions
+   installation
+   bases
+   configuration
diff --git a/docs/fr/index.rst.save b/docs/fr/index.rst.save
deleted file mode 100644
index 822f0fcd..00000000
--- a/docs/fr/index.rst.save
+++ /dev/null
@@ -1,53 +0,0 @@
-Pelican
-#######
-
-Pelican est un generateur de blog simple codé en python
-
-* Écrivez vos articles directement dans votre éditeur favori (vim !) et
-  directement en syntaxe reStructuredText ou Markdown ;
-* Un outil simple en ligne de conmmande pour (re)générer le blog ;
-* Sortie complètement statique, facile pour l'héberger n'importe où ;
-
-Fonctionnalités
-===============
-
-Pelican supporte actuellement :
-
-* des articles de blog ;
-* des pages statiques ;
-* les commentaires via un service externe (`disqus <http://disqus.com>`_)
-  Notez qu'étant bien un service externe assez pratique, vous ne gérez pas
-  vous même les commentaires. Ce qui pourrait occasionner une perte de vos données;
-* support de template (les templates sont crées avec Jinja 2 `jinja2 <http://jinjna.pocoo.org>`_) ;
-* génération optionnelle de vos pages et articles en pdf.
-
-Pourquoi le nom "Pelican" ?
-============================
-
-Vous n'avez pas remarqué ? "Pelican" est un anagramme pour "Calepin" ;)
-
-Code source
-===========
-
-Vous pouvez accéder au code source via mercurial sur  http://hg.notmyidea.org/pelican/
-ou via git à l'adresse http://github.com/ametaireau/pelican/
-
-Feedback !
-==========
-
-Si vous voulez de nouvelles fonctionnalitées pour Pelican, n'hésitez pas à me le dire,
-à cloner le dépôt, etc … C'est open source !!!
-
-Contactez Ale "alexis at notmyidea dot org" pour quelques requêtes ou retour d'expérience que ce soi !
-
-Documentation
-=============
-
-.. toctree::
-   :maxdepth: 2
-   
-   getting_started
-   settings
-   themes
-   internals
-   faq
diff --git a/docs/fr/install.rst b/docs/fr/installation.rst
similarity index 100%
rename from docs/fr/install.rst
rename to docs/fr/installation.rst
diff --git a/docs/fr/internals.rst b/docs/fr/internals.rst
deleted file mode 100644
index 80fc8661..00000000
--- a/docs/fr/internals.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-Pelican internals
-#################
-
-This section describe how pelican is working internally. As you'll see, it's
-quite simple, but a bit of documentation doesn't hurt :)
-
-Overall structure
-=================
-
-What `pelican` does, is taking a list of files, and processing them, to some
-sort of output. Usually, the files are restructured text and markdown files,
-and the output is a blog, but it can be anything you want.
-
-I've separated the logic in different classes and concepts:
-
-* `writers` are responsible of all the writing process of the
-  files. It's writing .html files, RSS feeds and so on. Since those operations 
-  are commonly used, the object is created once, and then passed to the 
-  generators.
-
-* `readers` are used to read from various formats (Markdown, and Restructured
-  Text for now, but the system is extensible). Given a file, they return
-  metadata (author, tags, category etc) and content (HTML formated)
-
-* `generators` generate the different outputs. For instance, pelican comes with
-  `ArticlesGenerator` and `PageGenerator`, into others. Given
-  a configurations, they can do whatever they want. Most of the time it's
-  generating files from inputs.
-
-* `pelican` also uses `templates`, so it's easy to write you own theme. The
-  syntax is `jinja2`, and, trust me, really easy to learn, so don't hesitate
-  a second.
-
-How to implement a new reader ?
-===============================
-
-There is an awesome markup language you want to add to pelican ?
-Well, the only thing you have to do is to create a class that have a `read`
-method, that is returning an HTML content and some metadata.
-
-Take a look to the Markdown reader::
-
-    class MarkdownReader(object):
-
-        def read(self, filename):
-            """Parse content and metadata of markdown files"""
-            text = open(filename)
-            md = Markdown(extensions = ['meta', 'codehilite'])
-            content = md.convert(text)
-            
-            metadatas = {}
-            for name, value in md.Meta.items():
-                if name in _METADATAS_FIELDS:
-                    meta = _METADATAS_FIELDS[name](value[0])
-                else:
-                    meta = value[0]
-                metadatas[name.lower()] = meta
-            return content, metadatas
-
-Simple isn't it ?
-
-How to implement a new generator ?
-==================================
-
-Generators have basically two important methods. You're not forced to create
-both, only the existing ones will be called.
-
-* `generate_context`, that is called in a first place, for all the generators.
-  Do whatever you have to do, and update the global context if needed. This
-  context is shared between all generators, and will be passed to the
-  templates. For instance, the `PageGenerator` `generate_context` method find
-  all the pages, transform them into objects, and populate the context with
-  them. Be careful to *not* output anything using this context at this stage,
-  as it is likely to change by the effect of others generators.
-
-* `generate_output` is then called. And guess what is it made for ? Oh,
-  generating the output :) That's here that you may want to look at the context
-  and call the methods of the `writer` object, that is passed at the first
-  argument of this function. In the `PageGenerator` example, this method will
-  look at all the pages recorded in the global context, and output a file on
-  the disk (using the writer method `write_file`) for each page encountered.
diff --git a/docs/fr/settings.rst b/docs/fr/settings.rst
deleted file mode 100644
index e59d1b5b..00000000
--- a/docs/fr/settings.rst
+++ /dev/null
@@ -1,111 +0,0 @@
-Settings
-########
-
-Specifying the settings
-=======================
-
-Pelican is configurable thanks to a configuration file, that you can pass to
-the command line::
-
-    $ pelican -s path/to/your/settingsfile.py path
-
-Settings are given as the form of a python module (a file). You can have an
-example by looking at `/samples/pelican.conf.py
-<https://github.com/ametaireau/pelican/raw/master/samples/pelican.conf.py>`_
-
-All the settings identifiers must be set in caps, otherwise they will not be
-processed.
-
-Here are the available settings. Please note that all the settings you put in
-this file will be passed to the templates as well.
-
-=======================   =======================================================
-Setting name              what it does ?
-=======================   =======================================================
-`AUTHOR`                  Default author (put your name)
-`CATEGORY_FEED`           Where to put the atom categories feeds. default is
-                          `feeds/%s.atom.xml`, where %s is the name of the
-                          category.
-`CATEGORY_FEED_RSS`       Where to put the categories rss feeds. default is None
-                          (no rss)
-`CSS_FILE`                To specify the CSS file you want to load, if it's not
-                          the default one ('main.css')
-`DEFAULT_CATEGORY`        The default category to fallback on. `misc` by default.
-`DEFAULT_LANG`            The default language to use. Default is 'en'.
-`DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template.
-                          Templates can follow or not this settings.
-`FALLBACK_ON_FS_DATE`     If True, pelican will use the file system dates infos
-                          (mtime) if it can't get informations from the
-                          metadata?
-`FEED`                    relative url to output the atom feed. Default is
-                          `feeds/all.atom.xml`
-`FEED_RSS`                relative url to output the rss feed. Default is
-                          None (no rss)
-`JINJA_EXTENSIONS`        A list of any Jinja2 extensions you want to use.
-                          Default is no extensions (the empty list).
-`KEEP_OUTPUT_DIRECTORY`   Keep the output directory and just update all the generated files. 
-                          Default is to delete the output directory.   
-`MARKUP`                  A list of available markup languages you want to use.
-                          For the moment, only available values are `rst` and `md`.
-`OUTPUT_PATH`             Where to output the generated files. Default to
-                          "output"
-`PATH`                    path to look at for input files.
-`PDF_PROCESSOR`           Put True if you want to have PDF versions of your
-                          documents. You will need to install `rst2pdf`.
-`REVERSE_ARCHIVE_ORDER`   Reverse the archives order. (True makes it in
-                          descending order: the newer first)
-`SITEURL`                 base URL of your website.
-`SITENAME`                Your site name,
-`STATIC_PATHS`            The static paths you want to have accessible on the
-                          output path "static". By default, pelican will copy
-                          the 'images' folder to the output folder.
-`STATIC_THEME_PATHS`      Static theme paths you want to copy. Default values
-                          is `static`, but if your theme have others static paths,
-                          you can put them here.
-`THEME`                   theme to use to product the output. can be the
-                          complete static path to a theme folder, or chosen
-                          between the list of default themes (see below)
-`TRANSLATION_FEED`        Where to put the RSS feed for translations. Default
-                          is feeds/all-%s.atom.xml where %s is the name of the
-                          lang.
-=======================   =======================================================
-
-Themes
-======
-
-3 themes are available. You can specify them using the `-t` option:
-
-* notmyidea
-* simple (a synonym for "full text" :)
-* martyalchin
-
-You can define your own theme too, and specify it's emplacement in the same
-way (be sure to specify the full absolute path to it).
-
-Here is `a guide on how to create your theme
-<http://alexis.notmyidea.org/pelican/themes.html>`_
-
-The `notmyidea` theme can make good use of the following settings. I recommend
-to use them too in your themes.
-
-=======================   =======================================================
-Setting name              what it does ?
-=======================   =======================================================
-`DISQUS_SITENAME`         Pelican can handle disqus comments, specify the
-                          sitename you've filled in on disqus
-`GITHUB_URL`              Your github URL (if you have one), it will then
-                          use it to create a github ribbon.
-`GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
-`LINKS`                   A list of tuples (Title, Url) for links to appear on
-                          the header.
-`SOCIAL`                  A list of tuples (Title, Url) to appear in the "social"
-                          section.
-`TWITTER_USERNAME`        Allows to add a button on the articles to tweet about
-                          them. Add you twitter username if you want this
-                          button to appear.
-=======================   =======================================================
-
-In addition, you can use the "wide" version of the `notmyidea` theme, by
-adding that in your configuration::
-
-    CSS_FILE = "wide.css"
diff --git a/docs/fr/themes.rst b/docs/fr/themes.rst
deleted file mode 100644
index a9c2262b..00000000
--- a/docs/fr/themes.rst
+++ /dev/null
@@ -1,106 +0,0 @@
-.. _theming-pelican-fr:
-
-How to create themes for pelican
-################################
-
-Pelican uses the great `jinja2 <http://jinjna.pocoo.org>`_ templating engine to
-generate it's HTML output. The jinja2 syntax is really simple. If you want to
-create your own theme, feel free to take inspiration from the "simple" theme,
-which is available `here
-<https://github.com/ametaireau/pelican/tree/master/pelican/themes/simple/templates>`_
-
-Structure
-=========
-
-To make your own theme, you must follow the following structure::
-
-    ├── static
-    │   ├── css
-    │   └── images
-    └── templates
-        ├── archives.html    // to display archives
-        ├── article.html     // processed for each article
-        ├── categories.html  // must list all the categories
-        ├── category.html    // processed for each category
-        ├── index.html       // the index. List all the articles
-        ├── page.html        // processed for each page
-        ├── tag.html         // processed for each tag
-        └── tags.html        // must list all the tags. Can be a tag cloud.
-
-* `static` contains all the static content. It will be copied on the output
-  `theme/static` folder then. I've put the css and image folders, but they are
-  just examples. Put what you need here.
-
-* `templates` contains all the templates that will be used to generate the content.
-  I've just put the mandatory templates here, you can define your own if it helps 
-  you to organize yourself while doing the theme.
- 
-Templates and variables
-=======================
-
-It's using a simple syntax, that you can embbed into your html pages.
-This document describes which templates should exists on a theme, and which
-variables will be passed to each template, while generating it.
-
-All templates will receive the variables defined in your settings file, if they 
-are in caps. You can access them directly. 
-
-Common variables
-----------------
-
-All of those settings will be given to all templates.
-
-=============   ===================================================
-Variable        Description
-=============   ===================================================
-articles        That's the list of articles, ordsered desc. by date
-                all the elements are `Article` objects, so you can 
-                access their properties (e.g. title, summary, author
-                etc. 
-dates           The same list of article, but ordered by date,
-                ascending
-tags            A dict containing each tags (keys), and the list of
-                relative articles.
-categories      A dict containing each category (keys), and the 
-                list of relative articles.
-pages           The list of pages
-=============   ===================================================
-
-category.html
--------------
-
-This template will be processed for each of the existing categories, and will
-finally remain at output/category/`category_name`.html.
-
-=============   ===================================================
-Variable        Description
-=============   ===================================================
-articles        The articles of this category
-category        The name of the category being processed
-=============   ===================================================
-
-article.html
--------------
-
-This template will be processed for each article. .html files will be outputed
-in output/`article_name`.html. Here are the specific variables it gets.
-
-=============   ===================================================
-Variable        Description
-=============   ===================================================
-article         The article object to be displayed
-category        The name of the category of the current article
-=============   ===================================================
-
-tag.html
---------
-
-For each tag, this template will be processed. It will create .html files in
-/output/tag/`tag_name`.html
-
-=============   ===================================================
-Variable        Description
-=============   ===================================================
-tag             The name of the tag being processed
-articles        Articles related to this tag
-=============   ===================================================

From d0ec18f4dbd623c55bdf4928ee7c363f699ef696 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 1 Feb 2011 01:57:39 +0000
Subject: [PATCH 0183/2864] Add the ability to sort categories.

generator.categories is now a list of (category, articles) instead of a dict. This
is to avoid using ordered dicts that have been introduces in python 2.7, so we stay
as much as possible compatible with older versions.

This fixes #62. Thanks to Bruno for the report.
---
 THANKS                  |  1 +
 docs/settings.rst       |  2 ++
 pelican/generators.py   | 10 +++++++---
 pelican/settings.py     |  1 +
 samples/pelican.conf.py |  1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/THANKS b/THANKS
index 0604e5db..aaee40bc 100644
--- a/THANKS
+++ b/THANKS
@@ -10,3 +10,4 @@ bugs or giving ideas. Thanks to them !
 - David Kulak
 - Arnaud Bos
 - nblock (Florian)
+- Bruno Bord
diff --git a/docs/settings.rst b/docs/settings.rst
index e59d1b5b..f64b102b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -54,6 +54,8 @@ Setting name              what it does ?
                           documents. You will need to install `rst2pdf`.
 `REVERSE_ARCHIVE_ORDER`   Reverse the archives order. (True makes it in
                           descending order: the newer first)
+`REVERSE_CATEGORY_ORDER`  Reverse the category order. (True makes it in
+                          descending order, default is alphabetically)
 `SITEURL`                 base URL of your website.
 `SITENAME`                Your site name,
 `STATIC_PATHS`            The static paths you want to have accessible on the
diff --git a/pelican/generators.py b/pelican/generators.py
index 05620e69..a2ea3593 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -94,7 +94,7 @@ class ArticlesGenerator(Generator):
             writer.write_feed(self.articles, self.context,
                     self.settings['FEED_RSS'], feed_type='rss')
 
-        for cat, arts in self.categories.items():
+        for cat, arts in self.categories:
             arts.sort(key=attrgetter('date'), reverse=True)
             writer.write_feed(arts, self.context,
                               self.settings['CATEGORY_FEED'] % cat)
@@ -149,9 +149,9 @@ class ArticlesGenerator(Generator):
                 write('tag/%s.html' % tag, templates['tag'], self.context,
                     tag=tag, articles=articles)
 
-        for cat in self.categories:
+        for cat, articles in self.categories:
             write('category/%s.html' % cat, templates['category'], self.context,
-                category=cat, articles=self.categories[cat])
+                category=cat, articles=articles)
 
     def generate_context(self):
         """change the context"""
@@ -200,6 +200,10 @@ class ArticlesGenerator(Generator):
         self.dates.sort(key=attrgetter('date'), 
                 reverse=self.context['REVERSE_ARCHIVE_ORDER'])
         # and generate the output :)
+
+        # order the categories per name
+        self.categories = list(self.categories.items())
+        self.categories.sort(reverse=self.settings.get('REVERSE_CATEGORY_ORDER'))
         self._update_context(('articles', 'dates', 'tags', 'categories'))
 
     def generate_output(self, writer):
diff --git a/pelican/settings.py b/pelican/settings.py
index 2178c5ca..3fd0a6da 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -18,6 +18,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'FALLBACK_ON_FS_DATE': True,
                    'CSS_FILE': 'main.css',
                    'REVERSE_ARCHIVE_ORDER': False,
+                   'REVERSE_CATEGORY_ORDER': False,
                    'KEEP_OUTPUT_DIRECTORY': False,
                    'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
                    'RELATIVE_URLS': True,
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index daf1d20d..6cb869d8 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -6,6 +6,7 @@ SITEURL = 'http://blog.notmyidea.org'
 GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
+REVERSE_CATEGORY_ORDER = True
 
 LINKS = (('Biologeek', 'http://biologeek.org'),
             ('Filyb', "http://filyb.info/"),

From cd9f672662dda1e057e3d8e2c9a0283995c6cd09 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 1 Feb 2011 02:06:54 +0000
Subject: [PATCH 0184/2864] fix documentation

---
 docs/settings.rst | 106 +++++++++++++++++++++++-----------------------
 1 file changed, 54 insertions(+), 52 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index f64b102b..404b7f68 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -19,58 +19,60 @@ processed.
 Here are the available settings. Please note that all the settings you put in
 this file will be passed to the templates as well.
 
-=======================   =======================================================
-Setting name              what it does ?
-=======================   =======================================================
-`AUTHOR`                  Default author (put your name)
-`CATEGORY_FEED`           Where to put the atom categories feeds. default is
-                          `feeds/%s.atom.xml`, where %s is the name of the
-                          category.
-`CATEGORY_FEED_RSS`       Where to put the categories rss feeds. default is None
-                          (no rss)
-`CSS_FILE`                To specify the CSS file you want to load, if it's not
-                          the default one ('main.css')
-`DEFAULT_CATEGORY`        The default category to fallback on. `misc` by default.
-`DEFAULT_LANG`            The default language to use. Default is 'en'.
-`DISPLAY_PAGES_ON_MENU`   Display or not the pages on the menu of the template.
-                          Templates can follow or not this settings.
-`FALLBACK_ON_FS_DATE`     If True, pelican will use the file system dates infos
-                          (mtime) if it can't get informations from the
-                          metadata?
-`FEED`                    relative url to output the atom feed. Default is
-                          `feeds/all.atom.xml`
-`FEED_RSS`                relative url to output the rss feed. Default is
-                          None (no rss)
-`JINJA_EXTENSIONS`        A list of any Jinja2 extensions you want to use.
-                          Default is no extensions (the empty list).
-`KEEP_OUTPUT_DIRECTORY`   Keep the output directory and just update all the generated files. 
-                          Default is to delete the output directory.   
-`MARKUP`                  A list of available markup languages you want to use.
-                          For the moment, only available values are `rst` and `md`.
-`OUTPUT_PATH`             Where to output the generated files. Default to
-                          "output"
-`PATH`                    path to look at for input files.
-`PDF_PROCESSOR`           Put True if you want to have PDF versions of your
-                          documents. You will need to install `rst2pdf`.
-`REVERSE_ARCHIVE_ORDER`   Reverse the archives order. (True makes it in
-                          descending order: the newer first)
-`REVERSE_CATEGORY_ORDER`  Reverse the category order. (True makes it in
-                          descending order, default is alphabetically)
-`SITEURL`                 base URL of your website.
-`SITENAME`                Your site name,
-`STATIC_PATHS`            The static paths you want to have accessible on the
-                          output path "static". By default, pelican will copy
-                          the 'images' folder to the output folder.
-`STATIC_THEME_PATHS`      Static theme paths you want to copy. Default values
-                          is `static`, but if your theme have others static paths,
-                          you can put them here.
-`THEME`                   theme to use to product the output. can be the
-                          complete static path to a theme folder, or chosen
-                          between the list of default themes (see below)
-`TRANSLATION_FEED`        Where to put the RSS feed for translations. Default
-                          is feeds/all-%s.atom.xml where %s is the name of the
-                          lang.
-=======================   =======================================================
+
+========================    =======================================================
+Setting name                what it does ?
+========================    =======================================================
+`AUTHOR`                    Default author (put your name)
+`CATEGORY_FEED`             Where to put the atom categories feeds. default is
+                            `feeds/%s.atom.xml`, where %s is the name of the
+                            category.
+`CATEGORY_FEED_RSS`         Where to put the categories rss feeds. default is None
+                            (no rss)
+`CSS_FILE`                  To specify the CSS file you want to load, if it's not
+                            the default one ('main.css')
+`DEFAULT_CATEGORY`          The default category to fallback on. `misc` by default.
+`DEFAULT_LANG`              The default language to use. Default is 'en'.
+`DISPLAY_PAGES_ON_MENU`     Display or not the pages on the menu of the template.
+                            Templates can follow or not this settings.
+`FALLBACK_ON_FS_DATE`       If True, pelican will use the file system dates infos
+                            (mtime) if it can't get informations from the
+                            metadata?
+`FEED`                      relative url to output the atom feed. Default is
+                            `feeds/all.atom.xml`
+`FEED_RSS`                  relative url to output the rss feed. Default is
+                            None (no rss)
+`JINJA_EXTENSIONS`          A list of any Jinja2 extensions you want to use.
+                            Default is no extensions (the empty list).
+`KEEP_OUTPUT_DIRECTORY`     Keep the output directory and just update all the 
+                            generated files. 
+                            Default is to delete the output directory.   
+`MARKUP`                    A list of available markup languages you want to use.
+                            For the moment, only available values are `rst` and `md`.
+`OUTPUT_PATH`               Where to output the generated files. Default to
+                            "output"
+`PATH`                      path to look at for input files.
+`PDF_PROCESSOR`             Put True if you want to have PDF versions of your
+                            documents. You will need to install `rst2pdf`.
+`REVERSE_ARCHIVE_ORDER`     Reverse the archives order. (True makes it in
+                            descending order: the newer first)
+`REVERSE_CATEGORY_ORDER`    Reverse the category order. (True makes it in
+                            descending order, default is alphabetically)
+`SITEURL`                   base URL of your website.
+`SITENAME`                  Your site name,
+`STATIC_PATHS`              The static paths you want to have accessible on the
+                            output path "static". By default, pelican will copy
+                            the 'images' folder to the output folder.
+`STATIC_THEME_PATHS`        Static theme paths you want to copy. Default values
+                            is `static`, but if your theme have others static paths,
+                            you can put them here.
+`THEME`                     theme to use to product the output. can be the
+                            complete static path to a theme folder, or chosen
+                            between the list of default themes (see below)
+`TRANSLATION_FEED`          Where to put the RSS feed for translations. Default
+                            is feeds/all-%s.atom.xml where %s is the name of the
+                            lang.
+========================    =======================================================
 
 Themes
 ======

From 81c6ae3b2ddf45e3c9ba0583521280c0db2027f8 Mon Sep 17 00:00:00 2001
From: Freeculture <guillaume@mint.(none)>
Date: Tue, 1 Feb 2011 14:41:26 +0100
Subject: [PATCH 0185/2864] Update french documentation

---
 docs/fr/astuces.rst            |  20 +++++++
 docs/fr/conf.py                |   2 +-
 docs/fr/index.rst              |   3 +
 docs/fr/parametres_article.rst | 106 +++++++++++++++++++++++++++++++++
 4 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 docs/fr/astuces.rst
 create mode 100644 docs/fr/parametres_article.rst

diff --git a/docs/fr/astuces.rst b/docs/fr/astuces.rst
new file mode 100644
index 00000000..3f9a3987
--- /dev/null
+++ b/docs/fr/astuces.rst
@@ -0,0 +1,20 @@
+Trucs et astuces pour Pelican
+#############################
+
+Personnaliser l'url d'un article pour Pelican
+=============================================
+
+Par défaut, quand vous créez un article ayant pour titre *Mon article pour Pelican*,
+l'url par défaut devient *mon-article-pour-pelican.html*. Cependant, il est possible 
+de modifier cela en utilisant la technique utilisée pour les traductions d'article,
+c'est à dire le paramètre *:slug:* ::
+
+	Mon article pour Pelican
+	########################
+
+	:date: 2011-01-31 11:05
+	:slug: super-article-pour-pelican
+
+	bla, bla, bla …
+
+En prenant cet exemple ci dessus, votre url deviendra *super-article-pour-pelican.html*
diff --git a/docs/fr/conf.py b/docs/fr/conf.py
index 301ec096..4fc515c6 100644
--- a/docs/fr/conf.py
+++ b/docs/fr/conf.py
@@ -24,7 +24,7 @@ release = version
 # a list of builtin themes.
 sys.path.append(os.path.abspath('../_themes'))
 html_theme_path = ['../_themes']
-html_theme = 'flask_small'
+html_theme = 'flask'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index cdb0868f..9d741af2 100644
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -50,3 +50,6 @@ Documentation
    installation
    bases
    configuration
+   parametres_article
+   astuces
+   faq
diff --git a/docs/fr/parametres_article.rst b/docs/fr/parametres_article.rst
new file mode 100644
index 00000000..a3d25b55
--- /dev/null
+++ b/docs/fr/parametres_article.rst
@@ -0,0 +1,106 @@
+Les paramètres des articles dans Pelican
+########################################
+
+Les catégories
+==============
+
+Nous avons vu que pour affecter un article à une catégorie, nous avions le paramètre *:category:*.
+Il y a cependant plus simple, affecter un répertoire à une catégorie. 
+  
+Dans le répertoire ou vous avez vos articles, créez le repertoire **GNU-Linux** et déplacez y le fichier
+**premier_article.rst**. Bien évidemment nous ne verront pas la différence, car jusqu'ici *GNU-Linux*
+est notre catégorie par défaut.
+  
+Nous allons faire un autre exemple d'article avec la catégorie Pelican. Créez le répertoire **Pelican**
+et collez cette exemple d'article ::
+
+	Préparation de la documentation
+	###############################
+
+	:date: 2011-01-27 15:28
+	:tags: documentation
+	
+	Il y a quand même pas mal de boulot pour faire une documentation !
+
+Et lancez la compilation du blog. Vous voyez que la catégorie est affectée automatiquement. 
+
+Les tags
+========
+
+Pour les tags, il n'y a rien de compliqué. il suffit de mettre le(s) tags séparés si besoin d'une virgule. ::
+
+	Préparation de la documentation
+	###############################
+
+	:date: 2011-01-27 15:28
+	:tags: documentation, pelican
+
+Par contre, par soucis de clarté au niveau des url je vous conseille de mettre les expression de plusieurs 
+mots séparées par des tirets ::
+
+	:tags: mise-a-jour
+
+et non ::
+
+	:tags: mise a jour
+
+
+Les auteurs
+===========
+
+Par défaut, vous pouvez indiqué votre nom en tant qu'auteur dans le fichier de configuration.
+S'il y a plusieurs auteurs pour le site, vous pouvez le définir manuellement dans
+l'article avec la méta-donnée ::
+
+	:author: Guillaume
+
+La date
+=======
+
+La date se met au format anglophone : **YYYY-MM-DD hh:mm** ::
+
+	:date: 2011-01-31 14:12
+
+
+Les traductions
+===============
+
+Pelican permet de générer un blog multilingue assez facilement. Pour cela nous devons :
+
+* Définir la langue de base du blog ;
+* Donner une référence à l'article initial ;
+* Définir la langue du fichier traduit et y reporter la référence.
+
+Pour définir la langue de base nous allons modifier le fichier **settings.py** et y rajouter la ligne suivante ::
+
+	DEFAULT_LANG = "fr"
+
+Puis ajouter la référence dans notre article d'origine qui deviendra ::
+
+	Préparation de la documentation
+        ###############################
+
+        :date: 2011-01-27 15:28
+        :tags: documentation
+	:slug: preparation-de-la-documentation
+
+        Il y a quand même pas mal de boulot pour faire une documentation !
+
+Nous n'avons plus qu'à créer l'article en anglais ::
+
+	Start of documentation
+	######################
+
+	:slug: preparation-de-la-documention
+	:lang: en
+
+	There are still a lot of work to documentation !
+
+**Il est important de comprendre que la valeur de :slug: deviendra votre url. Ne mettez donc pas un diminutif pour 
+identifier l'article**
+
+Rien de plus à savoir pour traduire efficacement des articles.	
+
+
+Maintenant que vous avez toutes les clés en main pour créer un article, nous allons passer à la personnalisation 
+du fichier de configuration.

From 3070c8fc9e6a712cce748c5d0d56c05d036cc958 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 1 Feb 2011 17:09:45 +0000
Subject: [PATCH 0186/2864] remove useless conf.py for the fr doc

---
 docs/fr/conf.py | 152 ------------------------------------------------
 1 file changed, 152 deletions(-)
 delete mode 100644 docs/fr/conf.py

diff --git a/docs/fr/conf.py b/docs/fr/conf.py
deleted file mode 100644
index 4fc515c6..00000000
--- a/docs/fr/conf.py
+++ /dev/null
@@ -1,152 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('..'))
-
-# -- General configuration -----------------------------------------------------
-templates_path = ['../_templates']
-extensions = ['sphinx.ext.autodoc',]
-source_suffix = '.rst'
-master_doc = 'index'
-project = u'Pelican'
-copyright = u'2010, Alexis Metaireau and contributors'
-exclude_patterns = ['_build']
-pygments_style = 'sphinx'
-version = "2"
-release = version
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-sys.path.append(os.path.abspath('../_themes'))
-html_theme_path = ['../_themes']
-html_theme = 'flask'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-html_theme_options = {
-    'index_logo': 'pelican.png',
-    'github_fork': 'ametaireau/pelican',
-}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['../_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'Raclettedoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'Raclette.tex', u'Raclette Documentation',
-   u'Alexis Métaireau', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'raclette', u'Raclette Documentation',
-     [u'Alexis Métaireau'], 1)
-]

From d13e6f14fbeecc5ae439a9b79052f939cc090a6e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 1 Feb 2011 21:44:50 +0000
Subject: [PATCH 0187/2864] Changes about locales and dates.

Add a way to specify the locale in the settings, and the date formating as well.
Fixes #61.
---
 docs/settings.rst                                  |  4 ++++
 pelican/contents.py                                | 14 ++++++++++++++
 pelican/settings.py                                |  7 +++++++
 pelican/themes/brownstone/templates/archives.html  |  2 +-
 pelican/themes/brownstone/templates/article.html   |  2 +-
 pelican/themes/brownstone/templates/index.html     |  4 ++--
 pelican/themes/martyalchin/templates/article.html  |  2 +-
 pelican/themes/martyalchin/templates/category.html |  2 +-
 pelican/themes/martyalchin/templates/index.html    |  2 +-
 pelican/themes/notmyidea/templates/archives.html   |  2 +-
 .../themes/notmyidea/templates/article_infos.html  |  2 +-
 pelican/themes/simple/templates/archives.html      |  2 +-
 pelican/themes/simple/templates/article.html       |  2 +-
 pelican/themes/simple/templates/index.html         |  2 +-
 pelican/writers.py                                 |  2 +-
 samples/pelican.conf.py                            |  1 +
 16 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 404b7f68..c1e24671 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -31,7 +31,10 @@ Setting name                what it does ?
                             (no rss)
 `CSS_FILE`                  To specify the CSS file you want to load, if it's not
                             the default one ('main.css')
+`DATE_FORMATS`              If you do manage multiple languages, you can set
+                            the date formatting here.
 `DEFAULT_CATEGORY`          The default category to fallback on. `misc` by default.
+`DEFAULT_DATE_FORMAT`       The default date format you want to use.
 `DEFAULT_LANG`              The default language to use. Default is 'en'.
 `DISPLAY_PAGES_ON_MENU`     Display or not the pages on the menu of the template.
                             Templates can follow or not this settings.
@@ -46,6 +49,7 @@ Setting name                what it does ?
                             Default is no extensions (the empty list).
 `KEEP_OUTPUT_DIRECTORY`     Keep the output directory and just update all the 
                             generated files. 
+`LOCALE`                    Change the locale. Default is the system locale.
                             Default is to delete the output directory.   
 `MARKUP`                    A list of available markup languages you want to use.
                             For the moment, only available values are `rst` and `md`.
diff --git a/pelican/contents.py b/pelican/contents.py
index b6e71b75..1ace659f 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -47,6 +47,15 @@ class Page(object):
         if filename:
             self.filename = filename
 
+        if not hasattr(self, 'date_format'):
+            if self.lang in settings['DATE_FORMATS']:
+                self.date_format = settings['DATE_FORMATS'][self.lang]
+            else:
+                self.date_format = settings['DEFAULT_DATE_FORMAT']
+
+        # store the settings ref.
+        self._settings = settings
+
     def check_properties(self):
         """test that each mandatory property is set."""
         for prop in self.mandatory_properties:
@@ -65,6 +74,11 @@ class Page(object):
     def summary(self):
         return truncate_html_words(self.content, 50)
 
+    @property
+    def locale_date(self):
+        return self.date.strftime(self.date_format)
+
+
 
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')
diff --git a/pelican/settings.py b/pelican/settings.py
index 3fd0a6da..3070ad15 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,4 +1,5 @@
 import os
+import locale
 
 _DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
                               "themes/notmyidea"])
@@ -24,7 +25,10 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
                    'PELICAN_CLASS': 'pelican.Pelican',
+                   'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
+                   'DATE_FORMATS': {},
                    'JINJA_EXTENSIONS': [],
+                   'LOCALE': '', # default to user locale
                   }
 
 def read_settings(filename):
@@ -37,4 +41,7 @@ def read_settings(filename):
         for key in tempdict:
             if key.isupper():
                 context[key] = tempdict[key]
+
+    # set the locale
+    locale.setlocale(locale.LC_ALL, context['LOCALE'])
     return context
diff --git a/pelican/themes/brownstone/templates/archives.html b/pelican/themes/brownstone/templates/archives.html
index a023ecee..5adaacb6 100644
--- a/pelican/themes/brownstone/templates/archives.html
+++ b/pelican/themes/brownstone/templates/archives.html
@@ -6,7 +6,7 @@
 					<dl>
 						<h2 class="title">Archives de {{ SITENAME }}</h2>
 						{% for article in dates %}
-                                                    <dt>{{ article.date.strftime('%a %d %B %Y') }}</dt>
+                                                    <dt>{{ article.locale_date }}</dt>
                                                     <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
                                                     <dd>Catégorie : <a href="{{ article.category }}">{{ article.category }}</a></dd>
                                                 {% endfor %}
diff --git a/pelican/themes/brownstone/templates/article.html b/pelican/themes/brownstone/templates/article.html
index 0467b64c..2458ecb5 100644
--- a/pelican/themes/brownstone/templates/article.html
+++ b/pelican/themes/brownstone/templates/article.html
@@ -4,7 +4,7 @@
                         	<div id="content">
 					<div class="post">
 						<h2 class="title"><a href="{{ article.url }}">{{ article.title }}</a></h2>
-						<p class="meta"><span class="date">Le {{ article.date.strftime('%a %d %B %Y') }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p>
+						<p class="meta"><span class="date">Le {{ article.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p>
 					<p class="meta">Tags : {% for tag in article.tags %}
 <span><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> / </span>
 {% endfor %}</p>	
diff --git a/pelican/themes/brownstone/templates/index.html b/pelican/themes/brownstone/templates/index.html
index 147ea006..3ec17811 100644
--- a/pelican/themes/brownstone/templates/index.html
+++ b/pelican/themes/brownstone/templates/index.html
@@ -7,7 +7,7 @@
 				<div id="content">
 					<div class="post">
 						<h2 class="title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
-						<p class="meta"><span class="date">Le {{ article.date.strftime('%a %d %B %Y') }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p>
+						<p class="meta"><span class="date">Le {{ article.date.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p>
 					<p class="meta">Tags : {% for tag in article.tags %}
 <span><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> / </span>
 {% endfor %}</p>
@@ -25,7 +25,7 @@
 			    {% else %} 
 			                <div class="post summary">
 						<h2 class="title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
-						<p class="meta"><span class="date">Le {{ article.date.strftime('%a %d %B %Y') }}</span><span class="posted">Par <a href="#">{{ article.author }}</a></span></p>
+						<p class="meta"><span class="date">Le {{ article.locale_date }}</span><span class="posted">Par <a href="#">{{ article.author }}</a></span></p>
 						<div style="clear: both;">&nbsp;</div>
 						<div class="entry">
 						 {{ article.summary }}	
diff --git a/pelican/themes/martyalchin/templates/article.html b/pelican/themes/martyalchin/templates/article.html
index c7711a75..f5c6591c 100644
--- a/pelican/themes/martyalchin/templates/article.html
+++ b/pelican/themes/martyalchin/templates/article.html
@@ -6,7 +6,7 @@
     {% if article.author %}
      By <a class="url fn" href="#">{{ article.author }}</a>
     {% endif %}
-     on <a>{{ article.date.strftime('%a %d %B %Y') }}</a>
+     on <a>{{ article.date.locale_date }}</a>
      about <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
     </div>
     {{ article.content }}
diff --git a/pelican/themes/martyalchin/templates/category.html b/pelican/themes/martyalchin/templates/category.html
index 8f9b6626..7c72d92a 100644
--- a/pelican/themes/martyalchin/templates/category.html
+++ b/pelican/themes/martyalchin/templates/category.html
@@ -4,6 +4,6 @@
 <div class="info"></div>
 {% for article in articles %}        
 <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2> 
-<p class="published">{{ article.date.strftime('%a %d %B %Y') }}</p>
+<p class="published">{{ article.locale_date }}</p>
 {{ article.summary }}
 {% endfor %}
diff --git a/pelican/themes/martyalchin/templates/index.html b/pelican/themes/martyalchin/templates/index.html
index eeaa8a7a..6286ef60 100644
--- a/pelican/themes/martyalchin/templates/index.html
+++ b/pelican/themes/martyalchin/templates/index.html
@@ -4,7 +4,7 @@
         {% if SITESUBTITLE %} <div class="info">{{ SITESUBTITLE }}</div> {% endif %}
         {% for article in articles %}        
         <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2> 
-        <p class="published">{{ article.date.strftime('%a %d %B %Y') }}</p>
+        <p class="published">{{ article.locale_date }}</p>
         {{ article.summary }}
         {% endfor %}
 {% endblock %}
diff --git a/pelican/themes/notmyidea/templates/archives.html b/pelican/themes/notmyidea/templates/archives.html
index 1644affb..5ba2c817 100644
--- a/pelican/themes/notmyidea/templates/archives.html
+++ b/pelican/themes/notmyidea/templates/archives.html
@@ -5,7 +5,7 @@
 
 <dl>
 {% for article in dates %}
-    <dt>{{ article.date.strftime('%a %d %B %Y') }}</dt>
+    <dt>{{ article.locale_date }}</dt>
     <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
 {% endfor %}
 </dl>
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index 818b5277..3a028a1c 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -1,6 +1,6 @@
 <footer class="post-info">
         <abbr class="published" title="{{ article.date.isoformat() }}">
-                {{ article.date.strftime('%a %d %B %Y') }}
+                {{ article.locale_date }}
         </abbr>
 
         {% if article.author %}
diff --git a/pelican/themes/simple/templates/archives.html b/pelican/themes/simple/templates/archives.html
index 17877390..e6364efa 100644
--- a/pelican/themes/simple/templates/archives.html
+++ b/pelican/themes/simple/templates/archives.html
@@ -4,7 +4,7 @@
 
 <dl>
 {% for article in dates %}
-    <dt>{{ article.date.strftime('%Y-%m-%d %H:%M') }}</dt>
+    <dt>{{ article.locale_date }}</dt>
     <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
 {% endfor %}
 </dl>
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index c28634f9..0bfed07a 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -4,7 +4,7 @@
         <header> <h2 class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
         <footer class="post-info">
                 <abbr class="published" title="{{ article.date.isoformat() }}">
-                        {{ article.date.strftime('%Y-%m-%d %H:%M') }}
+                        {{ article.locale_date }}
                 </abbr>
                 {% if article.author %}
                 <address class="vcard author">
diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index 6ca3ce8f..c09dbf5d 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -10,7 +10,7 @@
         <li><article class="hentry">    
                 <header> <h2 class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
                 <footer class="post-info">
-                    <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.date.strftime('%Y-%m-%d %H:%M') }} </abbr>
+                    <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr>
                     {% if article.author %}<address class="vcard author">By <a class="url fn" href="#">{{ article.author }}</a></address>{% endif %}
                 </footer><!-- /.post-info -->
                 <div class="entry-content"> {{ article.summary }} </div><!-- /.entry-content -->
diff --git a/pelican/writers.py b/pelican/writers.py
index c14f4f71..b3d996e9 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -115,7 +115,7 @@ class Writer(object):
                 context[i] = self.update_context_contents(name, context[i])
 
             elif type(context[i]) == dict:
-                context[i] = self.update_context_content(name, context[i].values())
+                context[i] = self.update_context_contents(name, context[i].values())
 
             elif hasattr(context[i], '_content'):
                 relative_path = get_relative_path(name)
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 6cb869d8..89a4332f 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -7,6 +7,7 @@ GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
+LOCALE = 'en_US.utf8'
 
 LINKS = (('Biologeek', 'http://biologeek.org'),
             ('Filyb', "http://filyb.info/"),

From 816d2cd4b4b69f0df11ef35ff0a9d7d8294df0f8 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 1 Feb 2011 21:51:58 +0000
Subject: [PATCH 0188/2864] Move martyalchin and brownstone theme to
 pelican-themes

---
 docs/settings.rst                             |   5 +-
 .../themes/brownstone/static/css/pygment.css  | 205 ---------
 .../themes/brownstone/static/css/style.css    | 414 ------------------
 .../themes/brownstone/static/images/img01.jpg | Bin 2407 -> 0 bytes
 .../themes/brownstone/static/images/img02.jpg | Bin 61715 -> 0 bytes
 .../themes/brownstone/static/images/img03.jpg | Bin 28837 -> 0 bytes
 .../themes/brownstone/static/images/img04.jpg | Bin 13400 -> 0 bytes
 .../themes/brownstone/static/images/img05.jpg | Bin 3315 -> 0 bytes
 .../themes/brownstone/static/images/img06.jpg | Bin 2130 -> 0 bytes
 .../brownstone/templates/analytics.html       |  11 -
 .../themes/brownstone/templates/archives.html |  19 -
 .../themes/brownstone/templates/article.html  |  35 --
 pelican/themes/brownstone/templates/base.html | 108 -----
 .../brownstone/templates/categories.html      |  18 -
 .../themes/brownstone/templates/category.html |   2 -
 .../themes/brownstone/templates/index.html    |  43 --
 pelican/themes/brownstone/templates/page.html |  17 -
 pelican/themes/brownstone/templates/tag.html  |   2 -
 pelican/themes/brownstone/templates/tags.html |  12 -
 .../themes/brownstone/templates/twitter.html  |   3 -
 .../themes/martyalchin/static/css/style.css   | 404 -----------------
 .../martyalchin/templates/archives.html       |   0
 .../themes/martyalchin/templates/article.html |  13 -
 .../themes/martyalchin/templates/base.html    |  15 -
 .../martyalchin/templates/categories.html     |   0
 .../martyalchin/templates/category.html       |   9 -
 .../themes/martyalchin/templates/index.html   |  10 -
 .../themes/martyalchin/templates/page.html    |   7 -
 pelican/themes/martyalchin/templates/tag.html |   0
 .../themes/martyalchin/templates/tags.html    |   0
 30 files changed, 3 insertions(+), 1349 deletions(-)
 delete mode 100644 pelican/themes/brownstone/static/css/pygment.css
 delete mode 100644 pelican/themes/brownstone/static/css/style.css
 delete mode 100644 pelican/themes/brownstone/static/images/img01.jpg
 delete mode 100644 pelican/themes/brownstone/static/images/img02.jpg
 delete mode 100644 pelican/themes/brownstone/static/images/img03.jpg
 delete mode 100644 pelican/themes/brownstone/static/images/img04.jpg
 delete mode 100644 pelican/themes/brownstone/static/images/img05.jpg
 delete mode 100644 pelican/themes/brownstone/static/images/img06.jpg
 delete mode 100644 pelican/themes/brownstone/templates/analytics.html
 delete mode 100644 pelican/themes/brownstone/templates/archives.html
 delete mode 100644 pelican/themes/brownstone/templates/article.html
 delete mode 100644 pelican/themes/brownstone/templates/base.html
 delete mode 100644 pelican/themes/brownstone/templates/categories.html
 delete mode 100644 pelican/themes/brownstone/templates/category.html
 delete mode 100644 pelican/themes/brownstone/templates/index.html
 delete mode 100644 pelican/themes/brownstone/templates/page.html
 delete mode 100644 pelican/themes/brownstone/templates/tag.html
 delete mode 100644 pelican/themes/brownstone/templates/tags.html
 delete mode 100644 pelican/themes/brownstone/templates/twitter.html
 delete mode 100644 pelican/themes/martyalchin/static/css/style.css
 delete mode 100644 pelican/themes/martyalchin/templates/archives.html
 delete mode 100644 pelican/themes/martyalchin/templates/article.html
 delete mode 100644 pelican/themes/martyalchin/templates/base.html
 delete mode 100644 pelican/themes/martyalchin/templates/categories.html
 delete mode 100644 pelican/themes/martyalchin/templates/category.html
 delete mode 100644 pelican/themes/martyalchin/templates/index.html
 delete mode 100644 pelican/themes/martyalchin/templates/page.html
 delete mode 100644 pelican/themes/martyalchin/templates/tag.html
 delete mode 100644 pelican/themes/martyalchin/templates/tags.html

diff --git a/docs/settings.rst b/docs/settings.rst
index c1e24671..9fa3bcd3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -81,11 +81,10 @@ Setting name                what it does ?
 Themes
 ======
 
-3 themes are available. You can specify them using the `-t` option:
+By default, two themes are availablee. You can specify them using the `-t` option:
 
 * notmyidea
 * simple (a synonym for "full text" :)
-* martyalchin
 
 You can define your own theme too, and specify it's emplacement in the same
 way (be sure to specify the full absolute path to it).
@@ -93,6 +92,8 @@ way (be sure to specify the full absolute path to it).
 Here is `a guide on how to create your theme
 <http://alexis.notmyidea.org/pelican/themes.html>`_
 
+You can find a list of themes at http://github.com/ametaireau/pelican-themes.
+
 The `notmyidea` theme can make good use of the following settings. I recommend
 to use them too in your themes.
 
diff --git a/pelican/themes/brownstone/static/css/pygment.css b/pelican/themes/brownstone/static/css/pygment.css
deleted file mode 100644
index 594b0fa3..00000000
--- a/pelican/themes/brownstone/static/css/pygment.css
+++ /dev/null
@@ -1,205 +0,0 @@
-.hll {
-background-color:#FFFFCC;
-}
-.c {
-color:#408090;
-font-style:italic;
-}
-.err {
-border:1px solid #FF0000;
-}
-.k {
-color:#007020;
-font-weight:bold;
-}
-.o {
-color:#666666;
-}
-.cm {
-color:#408090;
-font-style:italic;
-}
-.cp {
-color:#007020;
-}
-.c1 {
-color:#408090;
-font-style:italic;
-}
-.cs {
-background-color:#FFF0F0;
-color:#408090;
-}
-.gd {
-color:#A00000;
-}
-.ge {
-font-style:italic;
-}
-.gr {
-color:#FF0000;
-}
-.gh {
-color:#000080;
-font-weight:bold;
-}
-.gi {
-color:#00A000;
-}
-.go {
-color:#303030;
-}
-.gp {
-color:#C65D09;
-font-weight:bold;
-}
-.gs {
-font-weight:bold;
-}
-.gu {
-color:#800080;
-font-weight:bold;
-}
-.gt {
-color:#0040D0;
-}
-.kc {
-color:#007020;
-font-weight:bold;
-}
-.kd {
-color:#007020;
-font-weight:bold;
-}
-.kn {
-color:#007020;
-font-weight:bold;
-}
-.kp {
-color:#007020;
-}
-.kr {
-color:#007020;
-font-weight:bold;
-}
-.kt {
-color:#902000;
-}
-.m {
-color:#208050;
-}
-.s {
-color:#4070A0;
-}
-.na {
-color:#4070A0;
-}
-.nb {
-color:#007020;
-}
-.nc {
-color:#0E84B5;
-font-weight:bold;
-}
-.no {
-color:#60ADD5;
-}
-.nd {
-color:#555555;
-font-weight:bold;
-}
-.ni {
-color:#D55537;
-font-weight:bold;
-}
-.ne {
-color:#007020;
-}
-.nf {
-color:#06287E;
-}
-.nl {
-color:#002070;
-font-weight:bold;
-}
-.nn {
-color:#0E84B5;
-font-weight:bold;
-}
-.nt {
-color:#062873;
-font-weight:bold;
-}
-.nv {
-color:#BB60D5;
-}
-.ow {
-color:#007020;
-font-weight:bold;
-}
-.w {
-color:#BBBBBB;
-}
-.mf {
-color:#208050;
-}
-.mh {
-color:#208050;
-}
-.mi {
-color:#208050;
-}
-.mo {
-color:#208050;
-}
-.sb {
-color:#4070A0;
-}
-.sc {
-color:#4070A0;
-}
-.sd {
-color:#4070A0;
-font-style:italic;
-}
-.s2 {
-color:#4070A0;
-}
-.se {
-color:#4070A0;
-font-weight:bold;
-}
-.sh {
-color:#4070A0;
-}
-.si {
-color:#70A0D0;
-font-style:italic;
-}
-.sx {
-color:#C65D09;
-}
-.sr {
-color:#235388;
-}
-.s1 {
-color:#4070A0;
-}
-.ss {
-color:#517918;
-}
-.bp {
-color:#007020;
-}
-.vc {
-color:#BB60D5;
-}
-.vg {
-color:#BB60D5;
-}
-.vi {
-color:#BB60D5;
-}
-.il {
-color:#208050;
-}
diff --git a/pelican/themes/brownstone/static/css/style.css b/pelican/themes/brownstone/static/css/style.css
deleted file mode 100644
index fa8fe165..00000000
--- a/pelican/themes/brownstone/static/css/style.css
+++ /dev/null
@@ -1,414 +0,0 @@
-
-/*
-Design by Free CSS Templates
-http://www.freecsstemplates.org
-Released for free under a Creative Commons Attribution 2.5 License
-*/
-@import url("pygment.css");
-body {
-	margin: 30px 0px 0px 0px;
-	padding: 0;
-	background: #7E776F url('../images/img01.jpg') repeat left top;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 13px;
-	color: #3E3B36;
-}
-.summary h2{font-size:1.6em; color:black;}
-h1, h2, h3 {
-	margin: 0;
-	padding: 0;
-	font-weight: normal;
-	color: #F0E9E9;
-}
-
-h1 {
-	font-size: 2em;
-}
-
-h2 {
-	font-size: 2.8em;
-}
-
-h3 {
-	font-size: 1.6em;
-}
-
-p, ul, ol {
-	margin-top: 0;
-	line-height: 180%;
-}
-
-ul, ol {
-}
-
-a {
-	text-decoration: none;
-	color: #4D8D99;
-}
-
-a:hover {
-}
-
-#wrapper {
-	margin: 0 auto;
-	padding: 0;
-}
-
-/* Header */
-
-#header-wrapper {
-	height: 100px;
-	background: #3C3230;
-	border-bottom: 10px solid #4F4440;
-}
-
-#header {
-	width: 950px;
-	margin: 0 auto;
-	padding: 0px 0px 0px 30px;
-}
-
-/* Logo */
-
-#logo {
-	width: 280px;
-	height: 140px;
-	margin: 0;
-	padding: 0;
-	background: url('../images/img07.jpg') no-repeat left top;
-	color: #34312C;
-}
-
-#logo h1, #logo p {
-	margin: 0;
-	padding: 0;
-	letter-spacing: -2px;
-	text-align: center;
-	font-family: Georgia, "Times New Roman", Times, serif;
-}
-
-#logo h1 {
-	margin: 0px 0px -20px 0px;
-	padding: 20px 0px 0px 0px;
-	font-size: 50px;
-	color: #4D8D99;
-}
-
-#logo h1 a {
-	color: #F0E9E9;
-}
-
-#logo p {
-	margin: 0px;
-	padding: 0px;
-	font-size: 26px;
-} 
-
-#logo a {
-	border: none;
-	background: none;
-	text-decoration: none;
-	color: #34312C;
-}
-
-/* Search */
-
-#search {
-	width: 280px;
-	height: 50px;
-	padding: 20px 0px 0px 0px;
-	background: url('../images/img05.jpg') no-repeat left 15px;
-}
-
-#search form {
-	margin: 0px 0px 0px 0px;
-	padding: 0px 0px 0px 0px;
-}
-
-#search fieldset {
-	margin: 0;
-	padding: 0;
-	border: none;
-}
-
-#search-text {
-	width: 190px;
-	padding: 0px 5px 2px 10px;
-	border: none;
-	background: none;
-	text-transform: lowercase;
-	font: normal 11px Arial, Helvetica, sans-serif;
-	color: #34312C;
-}
-
-#search-submit {
-	width: 70px;
-	height: 22px;
-	border: none;
-	border: none;
-	background: none;
-	text-indent: -99999px;
-	color: #34312C;
-}
-
-/* Menu */
-
-#menu {
-	width: 280px;
-	margin: 20px auto 20px auto;
-	padding: 0;
-}
-
-#menu ul {
-	margin: 0;
-	padding: 50px 0px 0px 0px;
-	list-style: none;
-	line-height: normal;
-}
-
-#menu li {
-	border-bottom: 1px dashed #191918;
-}
-
-#menu a {
-	display: block;
-	width: 260px;
-	height: 27px;
-	margin: 4px 0px;
-	padding: 8px 0px 0px 20px;
-	text-decoration: none;
-	text-transform: capitalize;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	font-weight: normal;
-	color: #FFF;
-}
-
-#menu a:hover, #menu .current_page_item a {
-	background: url('../images/img06.jpg') no-repeat left top; 
-	text-decoration: none;
-}
-
-#menu .current_page_item a {
-}
-
-/* Page */
-
-#page {
-	width: 1000px;
-	margin: 0 auto;
-	background: url('../images/img04.jpg') repeat-y left top;
-}
-
-#page-bgtop {
-	background: url('../images/img02.jpg') no-repeat left top;
-}
-
-#page-bgbtm {
-	overflow: hidden;
-	width: 920px;
-	padding: 20px 40px 20px 40px;
-	background: url(images/img03.jpg) no-repeat left bottom;
-}
-/* Content */
-
-#content {
-	float: right;
-	width: 520px;
-	padding: 70px 30px 0px 60px;
-}
-
-.post {
-	margin-bottom: 40px;
-}
-
-.post .title {
-	padding: 0px 0px 0px 0px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	letter-spacing: -.5px;
-}
-
-.post .title a {
-	color: #52483E;
-	border: none;
-}
-
-.post .meta {
-	margin-bottom: 0px;
-	padding: 10px 0px 0px 0px;
-	text-align: left;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 13px;
-	font-weight: bold;
-}
-
-.post .meta .date {
-	float: left;
-}
-
-.post .meta .posted {
-	float: right;
-}
-
-.post .meta a {
-}
-
-.post .entry {
-	padding: 0px 0px 20px 0px;
-	border-bottom: 1px dotted #99938B;
-	text-align: justify;
-}
-.post .entry dt {
-        font-weight:bold ;
-}
-
-.post img {
-        margin:10px;
-        border:black;
-}
-.summary img{
-        display:none
-}
-
-.entry h2{
-        font-size: 1.6em;
-        color: #36302a;
-}
-
-.entry h3{
-        font-size: 1.2em;
-        color: #36302a;
-}
-h2.title {
-        font-size:2.8em;
-}
-
-.highlight{
-        background:black;
-        padding:2px;
-}
-
-.highlight pre{
-        color:white;
-}
-
-.highlight{
-        overflow:auto;
-}
-
-.links {
-	padding-top: 20px;
-	font-size: 12px;
-	font-weight: bold;
-}
-
-/* Sidebar */
-
-#sidebar {
-	float: left;
-	width: 280px;
-	margin: 0px;
-	padding: 0px 0px 80px 10px;
-	color: #787878;
-}
-
-#sidebar ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-#sidebar li {
-	margin: 0;
-	padding: 0;
-}
-
-#sidebar li ul {
-	margin: 0px 0px 0px 20px;
-	padding-bottom: 30px;
-}
-
-#sidebar li li {
-	line-height: 35px;
-	border-bottom: 1px dashed #191918;
-	border-left: none;
-}
-
-#sidebar li li span {
-	display: block;
-	margin-top: -20px;
-	padding: 0;
-	font-size: 11px;
-	font-style: italic;
-}
-
-#sidebar li li a {
-	color: #787878;
-}
-
-#sidebar li li a:hover {
-	color: #F0E9E9;
-}
-
-#sidebar h2 {
-	height: 38px;
-	letter-spacing: -.5px;
-	font-size: 1.8em;
-}
-
-#sidebar p {
-	margin: 0 0px;
-	padding: 0px 20px 20px 20px;
-}
-
-#sidebar a {
-	border: none;
-}
-
-#sidebar a:hover {
-}
-
-/* Calendar */
-
-#calendar {
-}
-
-#calendar_wrap {
-	padding: 20px;
-}
-
-#calendar table {
-	width: 100%;
-}
-
-#calendar tbody td {
-	text-align: center;
-}
-
-#calendar #next {
-	text-align: right;
-}
-
-/* Footer */
-
-#footer {
-	width: 920px;
-	height: 80px;
-	margin: 0 auto;
-	padding: 0px 0 15px 310px;
-	font-family: Arial, Helvetica, sans-serif;
-}
-
-#footer p {
-	margin: 0;
-	padding-top: 20px;
-	line-height: normal;
-	font-size: 9px;
-	text-transform: uppercase;
-	text-align: center;
-	color: #69635E;
-}
-
-#footer a {
-	color: #474440;
-}
diff --git a/pelican/themes/brownstone/static/images/img01.jpg b/pelican/themes/brownstone/static/images/img01.jpg
deleted file mode 100644
index d417a5c0362da9ddf54a8e91a5bfef7764ee4bbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2407
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

diff --git a/pelican/themes/brownstone/static/images/img02.jpg b/pelican/themes/brownstone/static/images/img02.jpg
deleted file mode 100644
index c4071c10c79175308713e8cba712dcb5a74caa44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 61715
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

diff --git a/pelican/themes/brownstone/static/images/img03.jpg b/pelican/themes/brownstone/static/images/img03.jpg
deleted file mode 100644
index bcb88b65df6264379dddbbccd0d12fc6e82cb92a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28837
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

diff --git a/pelican/themes/brownstone/static/images/img04.jpg b/pelican/themes/brownstone/static/images/img04.jpg
deleted file mode 100644
index ffb54f7c0c3acd5d8826f4e79a852e06fdc12ca3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13400
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

diff --git a/pelican/themes/brownstone/static/images/img05.jpg b/pelican/themes/brownstone/static/images/img05.jpg
deleted file mode 100644
index 5723f783cc5e92689573cd7873985c5a7fb4765b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3315
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
Vw4!Qp#!zkRb1$?WQ8YQ6`UhZvtAYRk

diff --git a/pelican/themes/brownstone/static/images/img06.jpg b/pelican/themes/brownstone/static/images/img06.jpg
deleted file mode 100644
index 6a93cf2f8942664c70419e1684f8bc363600a6e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2130
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfguVg^p1hgF(p4Kl_BK-
zP=xXSZH5*GMmS&svY42FB#?jrW+rAJ01_-9z|0B;>>$7a2O#Z0)vV0Stn92TtVl9&
zCHNWt4=@OFFeo#MF*6D>FbOg;3o`yc!jKPiHWM==BhZ~Nz|6)7G@lDa3@j(Wz`(-F
z%)-RT%)|~BU=%cD`k)w?v?x)CnZdE~p)d=pl95y4#DyE1jFUx71d&YzYxsYQfrlAr
zp&+v$gFVBK&wutmJ^q^iZ~Yp@)88x|SpPKtX><zytFZU{FP=jSfkOWdx8AvP?l=FF
zcMk>c1z(vVu$d$5V_j;fT8qws?cJZXR+=cLvF?eV8S1%^+d%ixpHr)RIU*bL#h--+
zWjLMTuGnw1YO<49LiEv}Q$uD6Y-YNre`eK^3#~K6hJ_)#=huJ#cmJC3!{_46*Lz%C
z_q19z%zwcV*}8N7?BxCOXTQ&SyXQ`dOs}%Ig$o0_pMkOQ=YXYu`_gOs>hjY0PyA=t
z@UY;%@s$~ZE1X6H6L;DWF8tgtE^qBTJ)?G7gXNRzZ+q9<O0g_|wotgC_3YnwWvPEp
z0#o0i;gz;<2M0O%ErtENg{9dHiBE#v4c0F%to*s6>_3C)7ukd7{xfVoCa=$aOR((G
z-*bVcYBC3^|1-=exHc>@D0Kr7R%jjGd-%t@IQyf2_iy=}uYV)EPX1C}vDCL6F^V@A
zxTUY0a7Ir)|L^+kzd4%A&;GWae)2zq<fN=3yXNzD&yRm9e)A*5yry2We)W@oCc4$~
zjw_x%{ZKvK_uB6_wT!1vKlrXUd+qldznG^_Klm=zJo^2{FYNmI&3AU?ZNH!Vf-f$f
zeP_wt{C&qS$n4q2U-WX<{o4KomX$SfPcN75`z`NK^y!D~>1D5Lzu7g6SYsV;{>eZ7
tx&L48?}mT*)5~V>@4Ku7i~@Pb`piFjT6ae8=&tnj|8Zei`g+IzHvwwrtUCYz

diff --git a/pelican/themes/brownstone/templates/analytics.html b/pelican/themes/brownstone/templates/analytics.html
deleted file mode 100644
index f19c7a6f..00000000
--- a/pelican/themes/brownstone/templates/analytics.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% if GOOGLE_ANALYTICS %}
-    <script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
-    try {
-        var pageTracker = _gat._getTracker("{{GOOGLE_ANALYTICS}}");
-    pageTracker._trackPageview();
-    } catch(err) {}</script>
-{% endif %}
diff --git a/pelican/themes/brownstone/templates/archives.html b/pelican/themes/brownstone/templates/archives.html
deleted file mode 100644
index 5adaacb6..00000000
--- a/pelican/themes/brownstone/templates/archives.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Archives de {{ SITENAME }}{% endblock %}
-{% block content %}  
-                        	<div id="content">
-					<div class="post">
-					<dl>
-						<h2 class="title">Archives de {{ SITENAME }}</h2>
-						{% for article in dates %}
-                                                    <dt>{{ article.locale_date }}</dt>
-                                                    <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
-                                                    <dd>Catégorie : <a href="{{ article.category }}">{{ article.category }}</a></dd>
-                                                {% endfor %}
-                                                </dl>
-					</div>
-			        
-					<div style="clear: both;">&nbsp;</div>
-				</div>
-				<!-- end #content -->
-{% endblock %}
diff --git a/pelican/themes/brownstone/templates/article.html b/pelican/themes/brownstone/templates/article.html
deleted file mode 100644
index 2458ecb5..00000000
--- a/pelican/themes/brownstone/templates/article.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "base.html" %}
-{% block title %}{{ article.title }}{% endblock %}
-{% block content %}    
-                        	<div id="content">
-					<div class="post">
-						<h2 class="title"><a href="{{ article.url }}">{{ article.title }}</a></h2>
-						<p class="meta"><span class="date">Le {{ article.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p>
-					<p class="meta">Tags : {% for tag in article.tags %}
-<span><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> / </span>
-{% endfor %}</p>	
-						<div style="clear: both;">&nbsp;</div>
-						<div class="entry">
-						 {{ article.content }}	
-						{% include 'twitter.html' %}
-						</div>
-					</div>
-			      
-					<div style="clear: both;">&nbsp;</div>
-					 {% if DISQUS_SITENAME %}
-                                        <div class="post">
-                                        <h2 class="title">Commentaires !</h2>
-                                            <div id="disqus_thread"></div>
-                                            <script type="text/javascript">
-                                               var disqus_identifier = "{{ article.url }}";
-                                               (function() {
-                                               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-                                               dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
-                                               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-                                              })();
-                                            </script>
-                                        </div>
-                                        {% endif %}
-				</div>
-				<!-- end #content -->
-{% endblock %}
diff --git a/pelican/themes/brownstone/templates/base.html b/pelican/themes/brownstone/templates/base.html
deleted file mode 100644
index cd7cc7b3..00000000
--- a/pelican/themes/brownstone/templates/base.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
-Design by Free CSS Templates
-http://www.freecsstemplates.org
-Released for free under a Creative Commons Attribution 2.5 License
-
-Name       : Brown Stone  
-Description: A two-column, fixed-width design with dark color scheme.
-Version    : 1.0
-Released   : 20100928
-
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta name="keywords" content="" />
-<meta name="description" content="" />
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>{% block title %}{{ SITENAME }}{%endblock%}</title>
-<link href="{{ SITEURL }}/theme/css/style.css" rel="stylesheet" type="text/css" media="screen" />
-<link href="{{ SITEURL }}/{{ FEED }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
-{% if FEED_RSS %}
-<link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
-{% endif %}
-</head>
-<body>
-<div id="wrapper">
-	<div id="page">
-		<div id="page-bgtop">
-			<div id="page-bgbtm">
-				{% block content %}
-                                {% endblock %}
-				<div id="sidebar">
-					<div id="logo">
-						<h1><a href="{{ SITEURL }}">{{ SITENAME }}</h1>
-						{% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}
-					</div>
-					<div id="menu">
-						<ul>
-							<li class="current_page_item"><a href="{{ SITEURL }}">Home</a></li>
-							<li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
-							{% if DISPLAY_PAGES_ON_MENU %}
-                                                        {% for page in PAGES %}
-                                                            <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
-                                                        {% endfor %}
-                                                        {% endif %}
-						</ul>
-					</div>
-					<ul>
-						<li>
-							<h2>Catégories</h2>
-							<ul>
-							{% for cat, null in categories %}
-								 <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
-							{% endfor %}
-							</ul>
-						</li>
-						{% if LINKS %}
-						<li>
-							<h2>Blogroll</h2>
-							<ul>
-							{% for name, link in LINKS %}
-                                                            <li><a href="{{ link }}">{{ name }}</a></li>
-                                                        {% endfor %}
-							</ul>
-						</li>
-						{% endif %}
-						{% if SOCIAL %}
-                                                <li>
-                                                        <h2>Social</h2>
-                                                        <ul>
-                                                            <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">Flux Atom</a></li>
-                                                            {% if FEED_RSS %}
-                                                            <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">Flux Rss</a></li>
-                                                            {% endif %}
-                                                        {% for name, link in SOCIAL %}
-                                                            <li><a href="{{ link }}">{{ name }}</a></li>
-                                                        {% endfor %}
-                                                        </ul>
-                                                </li><!-- /.social -->
-                                                {% endif %}
-						<li>
-						        <h2>Tags</h2>
-						        <ul>
-						        {% for tag, articles in tags %}
-                                                                <li><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a></li>
-                                                        {% endfor %}
-						        </ul>
-						</li>
-						
-						
-					</ul>
-				</div>
-				<!-- end #sidebar -->
-				<div style="clear: both;">&nbsp;</div>
-			</div>
-		</div>
-	</div>
-	<!-- end #page -->
-
-<div id="footer">
-	<p>Copyright (c) 2008 Sitename.com. All rights reserved. Design by <a href="http://www.freecsstemplates.org/">CSS Templates</a>.</p>
-	<p>Proudly powered by <a href="http://alexis.notmyidea.org/pelican/">pelican</a>, which takes great advantages of <a href="http://python.org">python</a>.
-</p>
-</div>
-{% include 'analytics.html' %}
-<!-- end #footer -->
-</body>
-</html>
diff --git a/pelican/themes/brownstone/templates/categories.html b/pelican/themes/brownstone/templates/categories.html
deleted file mode 100644
index 9e9bea89..00000000
--- a/pelican/themes/brownstone/templates/categories.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "base.html" %}
-{% block content %}
-<div id="content">
-<div class="post">  
-                        {% if articles %}
-                        {% for article in articles %}        
-                            {% if loop.index == 1 %}
-				<ul>
-                                {% for category, articles in categories %}
-                                    <li>{{ category }}</li>
-                                {% endfor %}
-                                </ul>
-		            {% endif %}
-                        {% endfor %}
-                        {% endif %}
-				</div>
-				</div>
-{% endblock %}
diff --git a/pelican/themes/brownstone/templates/category.html b/pelican/themes/brownstone/templates/category.html
deleted file mode 100644
index 56f8e93e..00000000
--- a/pelican/themes/brownstone/templates/category.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends "index.html" %}
-{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
diff --git a/pelican/themes/brownstone/templates/index.html b/pelican/themes/brownstone/templates/index.html
deleted file mode 100644
index 3ec17811..00000000
--- a/pelican/themes/brownstone/templates/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "base.html" %}
-{% block content_title %}{% endblock %}
-{% block content %} 
-                        {% if articles %}
-                        {% for article in articles %}        
-                            {% if loop.index == 1 %}
-				<div id="content">
-					<div class="post">
-						<h2 class="title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
-						<p class="meta"><span class="date">Le {{ article.date.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p>
-					<p class="meta">Tags : {% for tag in article.tags %}
-<span><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> / </span>
-{% endfor %}</p>
-						<div style="clear: both;">&nbsp;</div>
-						<div class="entry">
-						 {{ article.content }}	
-						{% include 'twitter.html' %}
-						</div>
-					</div>
-			        {% if loop.length  > 1 %}	
-			                <div class="post">
-			                        <h2 class="title">Autres articles</h2>
-			                </div>
-			        {% endif %}
-			    {% else %} 
-			                <div class="post summary">
-						<h2 class="title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
-						<p class="meta"><span class="date">Le {{ article.locale_date }}</span><span class="posted">Par <a href="#">{{ article.author }}</a></span></p>
-						<div style="clear: both;">&nbsp;</div>
-						<div class="entry">
-						 {{ article.summary }}	
-						 <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">Lire la suite …</a>
-						</div>
-					</div>
-		            {% endif %}
-                        {% endfor %}
-                        {% else %}
-                                <div id="content">
-                                </div>
-                        {% endif %}
-					<div style="clear: both;">&nbsp;</div>
-				</div>
-				{% endblock content %}
diff --git a/pelican/themes/brownstone/templates/page.html b/pelican/themes/brownstone/templates/page.html
deleted file mode 100644
index 6181ea98..00000000
--- a/pelican/themes/brownstone/templates/page.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "base.html" %}
-{% block title %}{{ page.title }}{% endblock %}
-{% block content %}        
-<div id="content">
-<div class="post">    
-    <h2 class="title"><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></h1>
-    {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
-    the pdf</a>{% endif %}
-    <div style="clear: both;">&nbsp;</div>
-    <div class="entry">
-    {{ page.content }}
-    {% include 'twitter.html' %}
-    </div>
-    </div>
-</div>
-
-{% endblock %}
diff --git a/pelican/themes/brownstone/templates/tag.html b/pelican/themes/brownstone/templates/tag.html
deleted file mode 100644
index 68cdcba6..00000000
--- a/pelican/themes/brownstone/templates/tag.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends "index.html" %}
-{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
diff --git a/pelican/themes/brownstone/templates/tags.html b/pelican/themes/brownstone/templates/tags.html
deleted file mode 100644
index a950663c..00000000
--- a/pelican/themes/brownstone/templates/tags.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-{% block content %}
-<div id="content">
-<div class="post">  
-<ul>
-{% for tag, articles in tags %}
-    <li>{{ tag }}</li>
-{% endfor %}
-</ul>
-</div>
-</div>
-{% endblock %}
diff --git a/pelican/themes/brownstone/templates/twitter.html b/pelican/themes/brownstone/templates/twitter.html
deleted file mode 100644
index 94a9ba9c..00000000
--- a/pelican/themes/brownstone/templates/twitter.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% if TWITTER_USERNAME %}
-<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-{% endif %}
diff --git a/pelican/themes/martyalchin/static/css/style.css b/pelican/themes/martyalchin/static/css/style.css
deleted file mode 100644
index 7ea07917..00000000
--- a/pelican/themes/martyalchin/static/css/style.css
+++ /dev/null
@@ -1,404 +0,0 @@
-/* Resets to avoid browser differences */
-
-body, button, div, fieldset, form, h1, h2, h3, input, label, li, p, pre, td, textarea, .typygmentdown {
-    margin: 0;
-    padding: 0;
-    text-align: justify;
-    font-family: Georgia, serif;
-    font-size: 100%;
-    line-height: 1.25;
-    letter-spacing: 0;
-    border: none;
-    background: none;
-}
-
-/* Overall page layout */
-
-body {
-    background: white;
-    color: black;
-    color: #303030;
-}
-
-@media screen {
-    body {
-        width: 700px;
-        margin: 20px auto;
-    }
-}
-
-@media print {
-    body {
-        margin: 0 2em;
-    }
-}
-
-/* Headings */
-
-h1, h2, h3, h4, h5, h6, .info, .info p {
-    font-family: Times, serif;
-    font-weight: normal;
-    page-break-inside: avoid;
-}
-
-h1 .caps, h2 .caps, h3 .caps {
-    letter-spacing: -.05em;
-}
-
-h1 {
-    font-family: Times, serif;
-    text-align: center;
-    font-size: 2.25em;
-    line-height: 1.111;
-    padding-right: 0.08em;
-    letter-spacing: -.07em;
-}
-
-h2 {
-    margin-top: 0.714em;
-    font-size: 1.75em;
-    line-height: 0.714;
-    letter-spacing: -.05em;
-}
-
-h3 {
-    margin-top: 0.926em;
-    font-size: 1.35em;
-    line-height: 0.926;
-    letter-spacing: -.03em;
-}
-
-h1 .dquo, h2 .dquo, h3 .dquo, h4 .dquo, h5 .dquo, h6 .dquo {
-    margin-left: -.4em;
-}
-
-.info, .info p {
-    text-align: center;
-    letter-spacing: -.03em;
-}
-
-.info p {
-    margin: 0;
-}
-
-.info img.g {
-    width: 24px;
-    height: 24px;
-    margin: -7px 0;
-}
-
-#home h2 a[href*="http://"] {
-    padding-right: 28px;
-    background: url("/static/link.png") right center no-repeat;
-}
-
-#home h2 a[href*="http://"]:visited {
-    padding-right: 28px;
-    background: url("/static/visited.png") right center no-repeat;
-}
-
-h2 + p.published {
-    float: right;
-    margin-top: -1.25em;
-}
-
-.copyright {
-    margin: 1.25em 0;
-}
-
-/* Page text */
-
-p, p[class] + p {
-    margin-top: 1.25em;
-    widows: 2;
-    orphans: 2;
-    text-indent: 0;
-    clear: left;
-}
-
-p + p {
-    text-indent: 1.5em;
-    margin-top: 0;
-}
-
-p ~ img {
-    display: block;
-    margin: 1.25em auto;
-}
-
-.caps {
-    letter-spacing: 0.1em;
-    font-size: 75%;
-}
-
-abbr {
-    border-bottom: 1px dotted black;
-}
-
-blockquote {
-    margin: 0 1em;
-    font-style: italic;
-    letter-spacing: -0.0625em;
-}
-
-blockquote em {
-    font-style: normal;
-    letter-spacing: 0;
-}
-
-div.image {
-    text-align: center;
-    margin: 1.25em 0;
-}
-
-img {
-    border: none;
-}
-
-
-
-.side {
-    position: absolute;
-    width: 150px;
-    height: auto;
-    margin-left: 710px;
-}
-
-.left.side {
-    margin-left: -160px;
-}
-
-.right.side {
-    margin-left: 710px;
-}
-
-@media screen {
-    h1 a, h2 a, h3 a, .info a {
-        text-decoration: none;
-    }
-
-    a:link {
-        color: #85ac40;
-    }
-
-    a:visited {
-        color: #61883b;
-    }
-
-    ::selection {
-        background: #dcff9d;
-    }
-
-    ::-moz-selection {
-        background: #e2ffaf;
-    }
-}
-
-@media print {
-    a {
-        color: inherit;
-        text-decoration: none;
-    }
-
-    abbr {
-        border-bottom: none;
-    }
-}
-
-/* Lists */
-
-ul, ol {
-    margin: 1.25em 0 1.25em -1.5em;
-    padding-left: 1.5em;
-}
-
-ul ul, ul ol, ol ol, ol ul {
-    margin: 0;
-}
-
-ul li {
-    list-style: disc;
-}
-
-li p {
-    margin: 0;
-}
-
-/* Code */
-
-pre {
-    margin-top: 1.47em;
-    font-family: Courier;
-    font-size: .85em;
-    line-height: 1.47;
-    overflow: visible;
-}
-
-code {
-    font-family: Courier;
-    font-size: .85em;
-    line-height: 1;
-}
-
-.typygmentdown .c {
-    font-style: italic;
-}
-
-.typygmentdown .k, .typygmentdown .ow {
-    color: #404040;
-}
-
-.typygmentdown .c, .typygmentdown .sd {
-    color: #808080;
-}
-
-/* Comments */
-
-#comment-list {
-    margin: 0;
-    padding: 0;
-}
-
-#comment-list li {
-    padding-bottom: 1.25em;
-}
-
-#comment-list cite {
-    font-style: normal;
-}
-
-#comment-list cite + blockquote {
-    margin-top: 0;
-}
-
-#comment-list blockquote {
-    margin: 0;
-}
-
-#comment-list p {
-    margin-top: 1.25em;
-    text-indent: 0;
-}
-
-#comment-form th {
-    width: 25%;
-}
-
-#comment-form input, #comment-form select, #comment-form textarea {
-    width: 100%;
-}
-
-@media print {
-    #comment-list, #comment-form {
-        display: none;
-    }
-}
-
-/* Friends */
-
-#friends li {
-    list-style: none;
-    margin-left: 0;
-    padding-left: 0;
-}
-
-#friends a[rel] {
-    margin-left: 20px;
-}
-
-#friends a[rel~="colleague"] {
-    background: url("/static/dj.png") left center no-repeat;
-    margin-left: 0;
-    padding-left: 20px;
-}
-
-/* Forms */
-
-form, form p {
-    text-indent: 0;
-    text-align: left;
-}
-
-from th, form td {
-    margin: 0;
-    padding: 0;
-}
-
-input, select, textarea {
-    background: white;
-    line-height: 1.5;
-}
-
-input[type="submit"], button {
-    border: 1px outset;
-    text-align: center;
-    background: #85ac40;
-    padding: .2em;
-}
-
-input[type="text"], textarea {
-    vertical-align: top;
-    border: 1px solid #e0e0e0;
-}
-
-input[type="text"], select {
-    width: 15em;
-}
-
-textarea {
-    width: 45em;
-    height: 7.5em;
-    overflow: auto;
-}
-
-#honeypot {
-    display: none;
-}
-
-/* Tables */
-
-table {
-    border-collapse: collapse;
-    border: none;
-    margin: 1.25em auto;
-}
-
-caption {
-    border-bottom: 1px solid #303030;
-}
-
-thead th {
-    border-bottom: 1px solid #303030;
-}
-
-tfoot th,
-tfoot td {
-    border-top: 1px solid #303030;
-}
-
-th[scope="row"],
-th[scope="col"] {
-    text-align: left;
-}
-
-tbody + tbody th, tbody + tbody td {
-    border-top: 1px solid #d0d0d0;
-}
-
-tbody + tbody tr + tr th,
-tbody + tbody tr + tr td,
-tfoot tr + tr th,
-tfoot tr + tr td {
-    border-top: none;
-}
-
-th, td {
-    padding: 0 0.5em;
-    font-weight: normal;
-    vertical-align: top;
-}
-
-table.numeric td, table.numeric th[scope="col"] {
-    text-align: right;
-}
-
diff --git a/pelican/themes/martyalchin/templates/archives.html b/pelican/themes/martyalchin/templates/archives.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/pelican/themes/martyalchin/templates/article.html b/pelican/themes/martyalchin/templates/article.html
deleted file mode 100644
index f5c6591c..00000000
--- a/pelican/themes/martyalchin/templates/article.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "base.html" %}
-{% block title %}{{ article.title }}{%endblock%}
-{% block content %}
-    <h1>{{ article.title }}</h1>
-    <div class="info">
-    {% if article.author %}
-     By <a class="url fn" href="#">{{ article.author }}</a>
-    {% endif %}
-     on <a>{{ article.date.locale_date }}</a>
-     about <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
-    </div>
-    {{ article.content }}
-{% endblock %}
diff --git a/pelican/themes/martyalchin/templates/base.html b/pelican/themes/martyalchin/templates/base.html
deleted file mode 100644
index eea18f9b..00000000
--- a/pelican/themes/martyalchin/templates/base.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-    <head>
-        <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="{{ SITEURL }}/theme/css/style.css" type="text/css" />
-        <link href="{{ SITEURL }}/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
-    </head>
-    <body>
-    {% block content %} {% endblock %}
-
-    <div class="copyright info vcard">Design by <a class="fn url"
-    href="http://martyalchin.com">Marty Alchin</a>, <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">some rights reserved</a>. Powered by <a href="http://alexis.notomyidea.org/pelican/">pelican</a></div>
-    </body>
-</html>
diff --git a/pelican/themes/martyalchin/templates/categories.html b/pelican/themes/martyalchin/templates/categories.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/pelican/themes/martyalchin/templates/category.html b/pelican/themes/martyalchin/templates/category.html
deleted file mode 100644
index 7c72d92a..00000000
--- a/pelican/themes/martyalchin/templates/category.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "base.html" %}
-{% block title %}{{ category }}{%endblock%}
-<h1>{{ category }}</h1>
-<div class="info"></div>
-{% for article in articles %}        
-<h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2> 
-<p class="published">{{ article.locale_date }}</p>
-{{ article.summary }}
-{% endfor %}
diff --git a/pelican/themes/martyalchin/templates/index.html b/pelican/themes/martyalchin/templates/index.html
deleted file mode 100644
index 6286ef60..00000000
--- a/pelican/themes/martyalchin/templates/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "base.html" %}
-{% block content %}
-        <h1><a href="{{ SITEURL }}">{{ SITENAME }}</a></h1>
-        {% if SITESUBTITLE %} <div class="info">{{ SITESUBTITLE }}</div> {% endif %}
-        {% for article in articles %}        
-        <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2> 
-        <p class="published">{{ article.locale_date }}</p>
-        {{ article.summary }}
-        {% endfor %}
-{% endblock %}
diff --git a/pelican/themes/martyalchin/templates/page.html b/pelican/themes/martyalchin/templates/page.html
deleted file mode 100644
index 727c762c..00000000
--- a/pelican/themes/martyalchin/templates/page.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "base.html" %}
-{% block title %}{{ page.title }}{%endblock%}
-{% block content %}
-    <h1>{{ page.title }}</h1>
-    {{ page.content }}
-{% endblock %}
-
diff --git a/pelican/themes/martyalchin/templates/tag.html b/pelican/themes/martyalchin/templates/tag.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/pelican/themes/martyalchin/templates/tags.html b/pelican/themes/martyalchin/templates/tags.html
deleted file mode 100644
index e69de29b..00000000

From 06246d1aa42cc2925aea0695828247711a95ed93 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 1 Feb 2011 22:49:33 +0000
Subject: [PATCH 0189/2864] Fix #65. Unicode, grr. Thanks Bruno Bord.

---
 pelican/contents.py               | 8 ++++----
 pelican/generators.py             | 1 +
 pelican/readers.py                | 1 +
 pelican/settings.py               | 1 +
 samples/content/super_article.rst | 2 +-
 samples/pelican.conf.py           | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 1ace659f..938315f7 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from pelican.utils import slugify, truncate_html_words
 
 
@@ -53,6 +54,9 @@ class Page(object):
             else:
                 self.date_format = settings['DEFAULT_DATE_FORMAT']
 
+        if hasattr(self, 'date'):
+            self.locale_date = self.date.strftime(self.date_format).decode('utf')
+
         # store the settings ref.
         self._settings = settings
 
@@ -74,10 +78,6 @@ class Page(object):
     def summary(self):
         return truncate_html_words(self.content, 50)
 
-    @property
-    def locale_date(self):
-        return self.date.strftime(self.date_format)
-
 
 
 class Article(Page):
diff --git a/pelican/generators.py b/pelican/generators.py
index a2ea3593..c50b55e1 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from operator import attrgetter
 from itertools import chain
 from functools import partial
diff --git a/pelican/readers.py b/pelican/readers.py
index 1fc51f68..47e7d9f0 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from docutils import core
 from markdown import Markdown
 import re
diff --git a/pelican/settings.py b/pelican/settings.py
index 3070ad15..d84178fe 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import os
 import locale
 
diff --git a/samples/content/super_article.rst b/samples/content/super_article.rst
index 3b9f9adc..e2f933d2 100644
--- a/samples/content/super_article.rst
+++ b/samples/content/super_article.rst
@@ -2,7 +2,7 @@ This is a super article !
 #########################
 
 :tags: foo, bar, foobar
-:date: 2010-10-02 10:14
+:date: 2010-12-02 10:14
 :category: yeah
 :author: Alexis Métaireau
 
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 89a4332f..122c8c4a 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -7,7 +7,7 @@ GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
-LOCALE = 'en_US.utf8'
+LOCALE = 'fr_FR.utf8'
 
 LINKS = (('Biologeek', 'http://biologeek.org'),
             ('Filyb', "http://filyb.info/"),

From bbd8305310e200b932c2bf97794720b568754aec Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 9 Feb 2011 21:17:57 +0000
Subject: [PATCH 0190/2864] Set locale to default while writing RSS feeds to
 always output RFC822 compatible dates. Fixes #67

---
 pelican/writers.py      | 40 +++++++++++++++++++++++-----------------
 samples/pelican.conf.py |  3 +++
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index b3d996e9..ea53aead 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -3,9 +3,9 @@ import os
 import re
 from codecs import open
 from functools import partial
+import locale
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
-
 from pelican.utils import get_relative_path
 
 
@@ -26,6 +26,7 @@ class Writer(object):
 
 
     def _add_item_to_the_feed(self, feed, item):
+
         feed.add_item(
             title=item.title,
             link='%s/%s' % (self.site_url, item.url),
@@ -46,26 +47,31 @@ class Writer(object):
         :param filename: the filename to output.
         :param feed_type: the feed type to use (atom or rss)
         """
-        self.site_url = context.get('SITEURL', get_relative_path(filename))
-        self.feed_url= '%s/%s' % (self.site_url, filename)
+        old_locale = locale.getlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, 'C')
+        try:
+            self.site_url = context.get('SITEURL', get_relative_path(filename))
+            self.feed_url= '%s/%s' % (self.site_url, filename)
 
-        feed = self._create_new_feed(feed_type, context)
+            feed = self._create_new_feed(feed_type, context)
 
-        for item in elements:
-            self._add_item_to_the_feed(feed, item)
+            for item in elements:
+                self._add_item_to_the_feed(feed, item)
 
-        if filename:
-            complete_path = os.path.join(self.output_path, filename)
-            try:
-                os.makedirs(os.path.dirname(complete_path))
-            except Exception:
-                pass
-            fp = open(complete_path, 'w')
-            feed.write(fp, 'utf-8')
-            print u' [ok] writing %s' % complete_path
+            if filename:
+                complete_path = os.path.join(self.output_path, filename)
+                try:
+                    os.makedirs(os.path.dirname(complete_path))
+                except Exception:
+                    pass
+                fp = open(complete_path, 'w')
+                feed.write(fp, 'utf-8')
+                print u' [ok] writing %s' % complete_path
 
-            fp.close()
-        return feed
+                fp.close()
+            return feed
+        finally:
+            locale.setlocale(locale.LC_ALL, old_locale)
 
     def write_file(self, name, template, context, relative_urls=True,
         **kwargs):
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 122c8c4a..10d5497a 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -9,6 +9,9 @@ PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
 LOCALE = 'fr_FR.utf8'
 
+FEED_RSS = 'feeds/all.rss.xml'
+CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'
+
 LINKS = (('Biologeek', 'http://biologeek.org'),
             ('Filyb', "http://filyb.info/"),
             ('Libert-fr', "http://www.libert-fr.com"),

From 00f0f89cbdfab83946fea7bde2e9cc7f029a82f1 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 9 Feb 2011 21:29:07 +0000
Subject: [PATCH 0191/2864] Add some documentation about the code-block
 feature. Fixes #66

---
 docs/getting_started.rst | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index db3c0431..91f9e2fa 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -17,7 +17,7 @@ install. I recommend to do so in a virtualenv::
     $ python setup.py install
 
 Dependencies
-============
+------------
 
 At this time, pelican is dependent of the following python packages:
 
@@ -31,8 +31,11 @@ If you're not using python 2.7, you will also need `argparse`.
 All those dependencies will be processed automatically if you install pelican
 using setuptools/distribute or pip.
 
+Writing articles using pelican
+==============================
+
 Files metadata
-==============
+--------------
 
 Pelican tries to be smart enough to get the informations he needs from the
 file system (for instance, about the category of your articles), but you need to
@@ -63,7 +66,7 @@ directory where the rst file is. For instance, the category of
 `python/foobar/myfoobar.rst` is `foobar`.
 
 Generate your blog
-==================
+------------------
 
 To launch pelican, just use the `pelican` command::
 
@@ -80,7 +83,7 @@ the options you can use::
     $ pelican --help
 
 Pages
-=====
+-----
 
 If you create a folder named `pages`, all the files in it will be used to
 generate static pages.
@@ -89,7 +92,7 @@ Then, use the `DISPLAY_PAGES_ON_MENU` setting, which will add all the pages to
 the menu.
 
 Translations
-============
+------------
 
 It is possible to translate articles. To do so, you need to add a `lang` meta
 in your articles/pages, and to set a `DEFAULT_LANG` setting (which is en by
@@ -128,8 +131,20 @@ Despite the text quality, you can see that only the slug is the same here.
 You're not forced to define the slug that way, and it's completely possible to
 have two translations with the same title (which defines the slug)
 
+Syntactic recognition
+---------------------
+
+Pelican is able to regognise the syntax you are using, and to colorize the
+right way your block codes. To do so, you have to use the following syntax::
+
+    ::code-block identifier
+    your code goes here
+
+The identifier is one of the lexers available `here
+<http://pygments.org/docs/lexers/>`_.
+
 Autoreload
-==========
+----------
 
 It's possible to tell pelican to watch for your modifications, instead of
 manually launching it each time you need. Use the `-r` option, or

From a07fe2abeea69637c5b54333e34f9bcbd4d88013 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 10 Feb 2011 01:27:28 +0000
Subject: [PATCH 0192/2864] Add a way to import from RSS/Atom feeds. Fixes #55

---
 tools/wp2pelican.py | 72 ---------------------------------------------
 1 file changed, 72 deletions(-)
 delete mode 100755 tools/wp2pelican.py

diff --git a/tools/wp2pelican.py b/tools/wp2pelican.py
deleted file mode 100755
index 0407175c..00000000
--- a/tools/wp2pelican.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /usr/bin/env python
-
-from BeautifulSoup import BeautifulStoneSoup
-from codecs import open
-import os
-import argparse
-import time
-
-def wp2html(xml):
-    xmlfile = open(xml, encoding='utf-8').read()
-    soup = BeautifulStoneSoup(xmlfile)
-    items = soup.rss.channel.findAll('item')
-
-    for item in items:
-        if item.fetch('wp:status')[0].contents[0] == "publish":
-            title = item.title.contents[0]
-            content = item.fetch('content:encoded')[0].contents[0]
-            filename = item.fetch('wp:post_name')[0].contents[0]
-            
-            raw_date = item.fetch('wp:post_date')[0].contents[0]
-            date_object = time.strptime(raw_date, "%Y-%m-%d %H:%M:%S")
-            date = time.strftime("%Y-%m-%d %H:%M", date_object)
-            
-            author = item.fetch('dc:creator')[0].contents[0].title()
-            categories = [(cat['nicename'],cat.contents[0]) for cat in item.fetch(domain='category')]
-            
-            tags = [tag.contents[0].title() for tag in item.fetch(domain='tag', nicename=None)]
-            
-            yield (title, content, filename, date, author, categories, tags)
-
-def buildHeader(title, date, author, categories, tags):
-    header = '%s\n%s\n' % (title, '#' * len(title))
-    if (date != None):
-        header += ':date: %s\n' % (date)
-    if (categories != []):
-        header += ':category: %s\n' % (', '.join(categories))
-    if (tags != []):
-        header += ':tags: %s\n' % (', '.join(tags))
-    header += '\n'
-    return header
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description="""Transform a wordpress xml export into rst files """)
-
-    parser.add_argument(dest='xml', help='The xml filepath')
-    parser.add_argument('-o', '--output', dest='output', default='output', help='Output path')
-    args = parser.parse_args() 
-
-    for title, content, filename, date, author, categories in wp2html(args.xml): 
-        html_filename = os.path.join(args.output, filename+'.html')
-        
-        if(len(categories) == 1):
-            rst_filename = os.path.join(args.output, categories[0][0], filename+'.rst.dr')
-            if not os.path.isdir(os.path.join(args.output, categories[0][0])):
-                os.mkdir(os.path.join(args.output, categories[0][0]))
-        else:
-            rst_filename = os.path.join(args.output, filename+'.rst.dr')
-
-        with open(html_filename, 'w', encoding='utf-8') as fp:
-            fp.write(content)
-            
-        os.system('pandoc --from=html --to=rst -o %s %s' % (rst_filename,
-            html_filename))
-        
-        os.remove(html_filename)
-            
-        with open(rst_filename, 'r', encoding='utf-8') as fs:
-            content = fs.read()
-        with open(rst_filename, 'w', encoding='utf-8') as fs:
-            categories = [x[1] for x in categories]
-            header = buildHeader(title, date, author, categories, tags)
-            fs.write(header+content)
\ No newline at end of file

From ad4f7cd3c92b9c5951860279379ca141e3bb207c Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 10 Feb 2011 01:31:04 +0000
Subject: [PATCH 0193/2864] Don't loose the file in the rename. Fixes #55

---
 tools/importer.py | 121 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100755 tools/importer.py

diff --git a/tools/importer.py b/tools/importer.py
new file mode 100755
index 00000000..719084b9
--- /dev/null
+++ b/tools/importer.py
@@ -0,0 +1,121 @@
+#! /usr/bin/env python
+
+from pelican.utils import slugify
+
+from codecs import open
+import os
+import argparse
+import time
+
+
+def wp2fields(xml):
+    """Opens a wordpress XML file, and yield pelican fields"""
+    from BeautifulSoup import BeautifulStoneSoup
+
+    xmlfile = open(xml, encoding='utf-8').read()
+    soup = BeautifulStoneSoup(xmlfile)
+    items = soup.rss.channel.findAll('item')
+
+    for item in items:
+        if item.fetch('wp:status')[0].contents[0] == "publish":
+            title = item.title.contents[0]
+            content = item.fetch('content:encoded')[0].contents[0]
+            filename = item.fetch('wp:post_name')[0].contents[0]
+            
+            raw_date = item.fetch('wp:post_date')[0].contents[0]
+            date_object = time.strptime(raw_date, "%Y-%m-%d %H:%M:%S")
+            date = time.strftime("%Y-%m-%d %H:%M", date_object)
+            
+            author = item.fetch('dc:creator')[0].contents[0].title()
+            categories = [(cat['nicename'],cat.contents[0]) for cat in item.fetch(domain='category')]
+            
+            tags = [tag.contents[0].title() for tag in item.fetch(domain='tag', nicename=None)]
+            
+            yield (title, content, filename, date, author, categories, tags)
+
+def feed2fields(file):
+    """Read a feed and yield pelican fields"""
+    import feedparser
+    d = feedparser.parse(file)
+    for entry in d.entries:
+        date = (time.strftime("%Y-%m-%d %H:%M", entry.updated_parsed) 
+                if hasattr(entry, "updated_parsed") else None)
+        author = entry.author if hasattr(entry, "author") else None
+        tags = [e['term'] for e in entry.tags] if hasattr(entry, "tags") else None
+
+        slug = slugify(entry.title)
+        yield (entry.title, entry.description, slug, date, author, [], tags)
+
+
+def build_header(title, date, author, categories, tags):
+    """Build a header from a list of fields"""
+    header = '%s\n%s\n' % (title, '#' * len(title))
+    if date:
+        header += ':date: %s\n' % date
+    if categories:
+        header += ':category: %s\n' % ', '.join(categories)
+    if tags:
+        header += ':tags: %s\n' % ', '.join(tags)
+    header += '\n'
+    return header
+
+
+def fields2pelican(fields, output_path):
+    for title, content, filename, date, author, categories, tags in fields: 
+        html_filename = os.path.join(output_path, filename+'.html')
+        
+        if(len(categories) == 1):
+            rst_filename = os.path.join(output_path, categories[0][0], filename+'.rst')
+            if not os.path.isdir(os.path.join(output_path, categories[0][0])):
+                os.mkdir(os.path.join(output_path, categories[0][0]))
+        else:
+            rst_filename = os.path.join(output_path, filename+'.rst')
+
+        with open(html_filename, 'w', encoding='utf-8') as fp:
+            fp.write(content)
+            
+        os.system('pandoc --from=html --to=rst -o %s %s' % (rst_filename,
+            html_filename))
+        
+        os.remove(html_filename)
+            
+        with open(rst_filename, 'r', encoding='utf-8') as fs:
+            content = fs.read()
+        with open(rst_filename, 'w', encoding='utf-8') as fs:
+            categories = [x[1] for x in categories]
+            header = build_header(title, date, author, categories, tags)
+            fs.write(header + content)
+
+
+def main(input_type, input, output_path):
+    if input_type == 'wordpress':
+        fields = wp2fields(input)
+    elif input_type == 'feed':
+        fields = feed2fields(input)
+
+    fields2pelican(fields, output_path)
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+            description="Transform even feed or XML files to rst files."
+                    "Be sure to have pandoc installed")
+
+    parser.add_argument(dest='input', help='The input file to read')
+    parser.add_argument('--wpfile', action='store_true', dest='wpfile', 
+            help='Wordpress XML export')
+    parser.add_argument('--feed', action='store_true', dest='feed', 
+            help='feed to parse')
+    parser.add_argument('-o', '--output', dest='output', default='output', 
+            help='Output path')
+    args = parser.parse_args() 
+    
+    input_type = None
+    if args.wpfile:
+        input_type = 'wordpress'
+    elif args.feed:
+        input_type = 'feed'
+    else:
+        print "you must provide either --wpfile or --feed options"
+        exit()
+    main(input_type, args.input, args.output)

From d48451755568994b0aefd255bbfaf1b5aa63dbff Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@spillane.docenti.dsi.unimi.it>
Date: Fri, 11 Feb 2011 15:36:04 +0100
Subject: [PATCH 0194/2864] Added a small fix to pygments use

---
 docs/getting_started.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 91f9e2fa..bc7c73d0 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -137,8 +137,8 @@ Syntactic recognition
 Pelican is able to regognise the syntax you are using, and to colorize the
 right way your block codes. To do so, you have to use the following syntax::
 
-    ::code-block identifier
-    your code goes here
+    .. code-block:: identifier
+        your code goes here
 
 The identifier is one of the lexers available `here
 <http://pygments.org/docs/lexers/>`_.

From ca58928b6c947e2d86167b3c4342d651339907a7 Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@spillane.docenti.dsi.unimi.it>
Date: Fri, 11 Feb 2011 15:36:51 +0100
Subject: [PATCH 0195/2864] Path is an optional argument on the command line,
 since it can be a setting in the configuration file

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index e9a98375..f599cc46 100755
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -18,7 +18,7 @@ class Pelican(object):
         before doing anything else.
         """
         self.path = path or settings['PATH']
-        if self.path.endswith('/'):
+        if path or self.path.endswith('/'):
             self.path = path[:-1]
 
         # define the default settings
@@ -90,7 +90,7 @@ def main():
     parser = argparse.ArgumentParser(description="""A tool to generate a
     static blog, with restructured text input files.""")
 
-    parser.add_argument(dest='path',
+    parser.add_argument(dest='path', nargs='?',
         help='Path where to find the content files')
     parser.add_argument('-t', '--theme-path', dest='theme',
         help='Path where to find the theme templates. If not specified, it will'

From 4edb5bf4970c77cb9899759dfb9d6b29ee27e0d9 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 14 Feb 2011 10:42:25 +0000
Subject: [PATCH 0196/2864] add the settings for pelican command line usage
 example

---
 THANKS                   | 1 +
 docs/getting_started.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/THANKS b/THANKS
index aaee40bc..e0275b7a 100644
--- a/THANKS
+++ b/THANKS
@@ -11,3 +11,4 @@ bugs or giving ideas. Thanks to them !
 - Arnaud Bos
 - nblock (Florian)
 - Bruno Bord
+- Laureline Guérin
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index bc7c73d0..442732be 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -70,7 +70,7 @@ Generate your blog
 
 To launch pelican, just use the `pelican` command::
 
-    $ pelican /path/to/your/content/
+    $ pelican /path/to/your/content/ [-s path/to/your/settings.py]
 
 And… that's all! You can see your weblog generated on the `content/` folder.
 

From a9a0bd6cd3c576d67973b0f7b73907ccb18500bc Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 14 Feb 2011 18:42:25 +0800
Subject: [PATCH 0197/2864] add the settings for pelican command line usage
 example

---
 THANKS                   | 1 +
 docs/getting_started.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/THANKS b/THANKS
index aaee40bc..e0275b7a 100644
--- a/THANKS
+++ b/THANKS
@@ -11,3 +11,4 @@ bugs or giving ideas. Thanks to them !
 - Arnaud Bos
 - nblock (Florian)
 - Bruno Bord
+- Laureline Guérin
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index bc7c73d0..442732be 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -70,7 +70,7 @@ Generate your blog
 
 To launch pelican, just use the `pelican` command::
 
-    $ pelican /path/to/your/content/
+    $ pelican /path/to/your/content/ [-s path/to/your/settings.py]
 
 And… that's all! You can see your weblog generated on the `content/` folder.
 

From 1f821ce2f65bff857a24c0cb29d34080fef1e09c Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@spillane.docenti.dsi.unimi.it>
Date: Mon, 14 Feb 2011 15:35:17 +0100
Subject: [PATCH 0198/2864] Fixed path definition from settings/command line
 opt

---
 pelican/__init__.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index f599cc46..05b8c216 100755
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -18,13 +18,14 @@ class Pelican(object):
         before doing anything else.
         """
         self.path = path or settings['PATH']
-        if path or self.path.endswith('/'):
+        if not self.path:
+            raise Exception('you need to specify a path to search the docs on !')
+        if self.path.endswith('/'):
             self.path = path[:-1]
 
         # define the default settings
         self.settings = settings
         self.theme = theme or settings['THEME']
-        self.path = path
         output_path = output_path or settings['OUTPUT_PATH']
         self.output_path = os.path.realpath(output_path)
         self.markup = markup or settings['MARKUP']
@@ -39,11 +40,6 @@ class Pelican(object):
             else:
                 raise Exception("Impossible to find the theme %s" % theme)
 
-        # get the list of files to parse
-        if not self.path:
-            raise Exception('you need to specify a path to search the docs on !')
-
-
     def run(self):
         """Run the generators and return"""
 

From aba1b39211b6b90d49571a6572598129e38901ee Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@dsi.unimi.it>
Date: Mon, 14 Feb 2011 15:40:23 +0100
Subject: [PATCH 0199/2864] Fixed getlocale/setlocale bug accoriding to
 http://bugs.python.org/issue1699853 and
 http://hub.esss.com.br/wordpress/blog/archives/8561

---
 pelican/writers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index ea53aead..c40c0ea3 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -47,7 +47,7 @@ class Writer(object):
         :param filename: the filename to output.
         :param feed_type: the feed type to use (atom or rss)
         """
-        old_locale = locale.getlocale(locale.LC_ALL)
+        old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, 'C')
         try:
             self.site_url = context.get('SITEURL', get_relative_path(filename))

From 4111acd1c136b77ec11e2b8962089502ee4c9bba Mon Sep 17 00:00:00 2001
From: Laureline Guerin <laureline.guerin@makina-corpus.com>
Date: Mon, 14 Feb 2011 16:24:54 +0100
Subject: [PATCH 0200/2864] Pagination added for index and tag/category pages

---
 pelican/generators.py                         | 52 ++++++++++--
 pelican/paginator.py                          | 85 +++++++++++++++++++
 pelican/settings.py                           |  3 +
 pelican/themes/notmyidea/templates/index.html | 18 +++-
 .../themes/notmyidea/templates/paginator.html | 13 +++
 samples/pelican.conf.py                       |  1 +
 6 files changed, 164 insertions(+), 8 deletions(-)
 create mode 100644 pelican/paginator.py
 create mode 100644 pelican/themes/notmyidea/templates/paginator.html

diff --git a/pelican/generators.py b/pelican/generators.py
index c50b55e1..088a7271 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -12,10 +12,12 @@ from jinja2.exceptions import TemplateNotFound
 from pelican.utils import copytree, get_relative_path, process_translations, open
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
+from pelican.paginator import Paginator
 
 _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
               'archives', 'page')
 _DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
+_PAGINATED_DIRECT_TEMPLATES = ('index', 'tag', 'category')
 
 
 class Generator(object):
@@ -141,18 +143,58 @@ class ArticlesGenerator(Generator):
                 category=article.category)
 
         for template in _DIRECT_TEMPLATES:
-            write('%s.html' % template, templates[template], self.context,
-                blog=True)
+            if self.settings.get('WITH_PAGINATION') and template in _PAGINATED_DIRECT_TEMPLATES:
+                articles_paginator = Paginator(self.articles,
+                                               self.settings.get('DEFAULT_PAGINATION'),
+                                               self.settings.get('DEFAULT_ORPHANS'))
+                dates_paginator = Paginator(self.dates,
+                                            self.settings.get('DEFAULT_PAGINATION'),
+                                            self.settings.get('DEFAULT_ORPHANS'))
+                for page_num in range(articles_paginator.num_pages):
+                    # update context with paginator object and current page
+                    self.context.update({'articles_paginator': articles_paginator,
+                                         'articles_page': articles_paginator.page(page_num+1),
+                                         'dates_paginator': dates_paginator,
+                                         'dates_page': dates_paginator.page(page_num+1),
+                                         'page_name': 'index'})
+                    write('%s%s.html' % (template, '%s' % (page_num > 0 and page_num+1 or '')),
+                          templates[template], self.context, blog=True)
+            else:
+                write('%s.html' % template, templates[template], self.context,
+                    blog=True)
 
         # and subfolders after that
         for tag, articles in self.tags.items():
-            for article in articles:
+            if self.settings.get('WITH_PAGINATION') and 'tag' in _PAGINATED_DIRECT_TEMPLATES:
+                articles_paginator = Paginator(articles,
+                                               self.settings.get('DEFAULT_PAGINATION'),
+                                               self.settings.get('DEFAULT_ORPHANS'))
+                for page_num in range(articles_paginator.num_pages):
+                    # update context with paginator object and current page
+                    self.context.update({'articles_paginator': articles_paginator,
+                                         'articles_page': articles_paginator.page(page_num+1),
+                                         'page_name': 'tag/%s' % tag})
+                    write('tag/%s%s.html' % (tag, '%s' % (page_num > 0 and page_num+1 or '')),
+                          templates['tag'], self.context, blog=True)
+            else:
                 write('tag/%s.html' % tag, templates['tag'], self.context,
                     tag=tag, articles=articles)
 
         for cat, articles in self.categories:
-            write('category/%s.html' % cat, templates['category'], self.context,
-                category=cat, articles=articles)
+            if self.settings.get('WITH_PAGINATION') and 'tag' in _PAGINATED_DIRECT_TEMPLATES:
+                articles_paginator = Paginator(articles,
+                                               self.settings.get('DEFAULT_PAGINATION'),
+                                               self.settings.get('DEFAULT_ORPHANS'))
+                for page_num in range(articles_paginator.num_pages):
+                    # update context with paginator object and current page
+                    self.context.update({'articles_paginator': articles_paginator,
+                                         'articles_page': articles_paginator.page(page_num+1),
+                                         'page_name': 'category/%s' % cat})
+                    write('category/%s%s.html' % (cat, '%s' % (page_num > 0 and page_num+1 or '')),
+                          templates['category'], self.context, blog=True)
+            else:
+                write('category/%s.html' % cat, templates['category'], self.context,
+                    category=cat, articles=articles)
 
     def generate_context(self):
         """change the context"""
diff --git a/pelican/paginator.py b/pelican/paginator.py
new file mode 100644
index 00000000..a2a452b9
--- /dev/null
+++ b/pelican/paginator.py
@@ -0,0 +1,85 @@
+# From django.core.paginator
+from math import ceil
+
+class Paginator(object):
+    def __init__(self, object_list, per_page, orphans=0):
+        self.object_list = object_list
+        self.per_page = per_page
+        self.orphans = orphans
+        self._num_pages = self._count = None
+
+    def page(self, number):
+        "Returns a Page object for the given 1-based page number."
+        bottom = (number - 1) * self.per_page
+        top = bottom + self.per_page
+        if top + self.orphans >= self.count:
+            top = self.count
+        return Page(self.object_list[bottom:top], number, self)
+
+    def _get_count(self):
+        "Returns the total number of objects, across all pages."
+        if self._count is None:
+            self._count = len(self.object_list)
+        return self._count
+    count = property(_get_count)
+
+    def _get_num_pages(self):
+        "Returns the total number of pages."
+        if self._num_pages is None:
+            hits = max(1, self.count - self.orphans)
+            self._num_pages = int(ceil(hits / float(self.per_page)))
+        return self._num_pages
+    num_pages = property(_get_num_pages)
+
+    def _get_page_range(self):
+        """
+        Returns a 1-based range of pages for iterating through within
+        a template for loop.
+        """
+        return range(1, self.num_pages + 1)
+    page_range = property(_get_page_range)
+
+class Page(object):
+    def __init__(self, object_list, number, paginator):
+        self.object_list = object_list
+        self.number = number
+        self.paginator = paginator
+
+    def __repr__(self):
+        return '<Page %s of %s>' % (self.number, self.paginator.num_pages)
+
+    def has_next(self):
+        return self.number < self.paginator.num_pages
+
+    def has_previous(self):
+        return self.number > 1
+
+    def has_other_pages(self):
+        return self.has_previous() or self.has_next()
+
+    def next_page_number(self):
+        return self.number + 1
+
+    def previous_page_number(self):
+        return self.number - 1
+
+    def start_index(self):
+        """
+        Returns the 1-based index of the first object on this page,
+        relative to total objects in the paginator.
+        """
+        # Special case, return zero if no items.
+        if self.paginator.count == 0:
+            return 0
+        return (self.paginator.per_page * (self.number - 1)) + 1
+
+    def end_index(self):
+        """
+        Returns the 1-based index of the last object on this page,
+        relative to total objects found (hits).
+        """
+        # Special case for the last page because there can be orphans.
+        if self.number == self.paginator.num_pages:
+            return self.paginator.count
+        return self.number * self.paginator.per_page
+
diff --git a/pelican/settings.py b/pelican/settings.py
index d84178fe..dbd230d4 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -30,6 +30,9 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DATE_FORMATS': {},
                    'JINJA_EXTENSIONS': [],
                    'LOCALE': '', # default to user locale
+                   'WITH_PAGINATION': True,
+                   'DEFAULT_PAGINATION': 5,
+                   'DEFAULT_ORPHANS': 0,
                   }
 
 def read_settings(filename):
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 5969e6c8..57b7c1a7 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -2,8 +2,8 @@
 {% block content_title %}{% endblock %}
 {% block content %}        
 {% if articles %}
-{% for article in articles %}        
-    {% if loop.index == 1 %}
+{% for article in articles_page.object_list %}        
+    {% if loop.first and not articles_page.has_previous() %}
         <aside id="featured" class="body"><article>
                 <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url
                 }}">{{ article.title }}</a></h1> 
@@ -11,14 +11,21 @@
                 {{ article.content }}
                 {% include 'comments.html' %}
                 </article>
+                {% if loop.length == 1 %}
+                    {% include 'paginator.html' %}
+                {% endif %}
                 </aside><!-- /#featured -->
-        {% if loop.length  > 1 %}
+        {% if loop.length > 1 %}
             <section id="content" class="body">
                 <h1>Other articles</h1>
                 <hr />
                     <ol id="posts-list" class="hfeed">
         {% endif %}
     {% else %} 
+    {% if loop.first and articles_page.has_previous %}
+    <section id="content" class="body">
+        <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
+    {% endif %}
         <li><article class="hentry">    
                 <header>
                         <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h1>
@@ -32,9 +39,14 @@
                 </div><!-- /.entry-content -->
         </article></li>
     {% endif %}
+    {% if loop.last and (articles_page.has_previous() or not articles_page.has_previous() and loop.length > 1) %}
+        {% include 'paginator.html' %}
+    {% endif %}
 {% endfor %}
 </ol><!-- /#posts-list -->
+{% if loop.length > 1 %}
 </section><!-- /#content -->
+{% endif %}
 {% else %}
 <section id="content" class="body">    
 <h2>Pages</h2>
diff --git a/pelican/themes/notmyidea/templates/paginator.html b/pelican/themes/notmyidea/templates/paginator.html
new file mode 100644
index 00000000..9cce0237
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/paginator.html
@@ -0,0 +1,13 @@
+<p class="paginator">
+    {% if articles_page.has_previous() %}
+        {% if articles_page.previous_page_number() == 1 %}
+            <a href="{{ SITEURL }}/{{ page_name }}.html">&laquo;</a>
+        {% else %}
+            <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">&laquo;</a>
+        {% endif %}
+    {% endif %}
+    Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}
+    {% if articles_page.has_next() %}
+        <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">&raquo;</a>
+    {% endif %}
+</p>
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 10d5497a..07c49d01 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -8,6 +8,7 @@ DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
 LOCALE = 'fr_FR.utf8'
+DEFAULT_PAGINATION = 2
 
 FEED_RSS = 'feeds/all.rss.xml'
 CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'

From dc6771d60457a996ea8cc01a32695ad5d53b171c Mon Sep 17 00:00:00 2001
From: Laureline Guerin <laureline.guerin@makina-corpus.com>
Date: Mon, 14 Feb 2011 16:46:18 +0100
Subject: [PATCH 0201/2864] Pagination - fix context

---
 pelican/generators.py | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 088a7271..5029e397 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -151,14 +151,11 @@ class ArticlesGenerator(Generator):
                                             self.settings.get('DEFAULT_PAGINATION'),
                                             self.settings.get('DEFAULT_ORPHANS'))
                 for page_num in range(articles_paginator.num_pages):
-                    # update context with paginator object and current page
-                    self.context.update({'articles_paginator': articles_paginator,
-                                         'articles_page': articles_paginator.page(page_num+1),
-                                         'dates_paginator': dates_paginator,
-                                         'dates_page': dates_paginator.page(page_num+1),
-                                         'page_name': 'index'})
                     write('%s%s.html' % (template, '%s' % (page_num > 0 and page_num+1 or '')),
-                          templates[template], self.context, blog=True)
+                          templates[template], self.context, blog=True,
+                          articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
+                          dates_paginator=dates_paginator, dates_page=dates_paginator.page(page_num+1),
+                          page_name='index')
             else:
                 write('%s.html' % template, templates[template], self.context,
                     blog=True)
@@ -170,12 +167,10 @@ class ArticlesGenerator(Generator):
                                                self.settings.get('DEFAULT_PAGINATION'),
                                                self.settings.get('DEFAULT_ORPHANS'))
                 for page_num in range(articles_paginator.num_pages):
-                    # update context with paginator object and current page
-                    self.context.update({'articles_paginator': articles_paginator,
-                                         'articles_page': articles_paginator.page(page_num+1),
-                                         'page_name': 'tag/%s' % tag})
                     write('tag/%s%s.html' % (tag, '%s' % (page_num > 0 and page_num+1 or '')),
-                          templates['tag'], self.context, blog=True)
+                          templates['tag'], self.context, tag=tag, articles=articles,
+                          articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
+                          page_name='tag/%s'%tag)
             else:
                 write('tag/%s.html' % tag, templates['tag'], self.context,
                     tag=tag, articles=articles)
@@ -186,12 +181,10 @@ class ArticlesGenerator(Generator):
                                                self.settings.get('DEFAULT_PAGINATION'),
                                                self.settings.get('DEFAULT_ORPHANS'))
                 for page_num in range(articles_paginator.num_pages):
-                    # update context with paginator object and current page
-                    self.context.update({'articles_paginator': articles_paginator,
-                                         'articles_page': articles_paginator.page(page_num+1),
-                                         'page_name': 'category/%s' % cat})
                     write('category/%s%s.html' % (cat, '%s' % (page_num > 0 and page_num+1 or '')),
-                          templates['category'], self.context, blog=True)
+                          templates['category'], self.context, category=cat, articles=articles,
+                          articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
+                          page_name='category/%s' % cat)
             else:
                 write('category/%s.html' % cat, templates['category'], self.context,
                     category=cat, articles=articles)

From c019443026ee3a423d866176ef8c6a1a71d71e99 Mon Sep 17 00:00:00 2001
From: skami <skami@skami-laptop.dyndns.org>
Date: Mon, 14 Feb 2011 19:10:01 +0100
Subject: [PATCH 0202/2864] Added support for HTML as input format

---
 pelican/readers.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 47e7d9f0..a8e8d63e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -59,7 +59,25 @@ class MarkdownReader(object):
             )(value[0])
         return content, metadatas
 
-_EXTENSIONS = {'rst': RstReader, 'md': MarkdownReader}  # supported formats
+
+class HtmlReader(object):
+    _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
+
+    def read(self, filename):
+        """Parse content and metadata of (x)HTML files"""
+        content = open(filename)
+        metadatas = {'title':'unnamed'}
+        for i in self._re.findall(content):
+            key = i.split(':')[0][5:].strip()
+            value = i.split(':')[-1][:-3].strip()
+            print [key,value]
+            metadatas[key.lower()] = value
+
+        return content, metadatas
+
+
+
+_EXTENSIONS = {'rst': RstReader, 'md': MarkdownReader, 'html': HtmlReader}  # supported formats
 
 
 def read_file(filename, fmt=None):

From 60756678abdbfbcd12fafc2c9a06ac2aa39d8650 Mon Sep 17 00:00:00 2001
From: Laureline Guerin <laureline.guerin@makina-corpus.com>
Date: Tue, 15 Feb 2011 13:41:55 +0100
Subject: [PATCH 0203/2864] Pagination - simplification

---
 pelican/generators.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 5029e397..a2da66a4 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -17,7 +17,7 @@ from pelican.paginator import Paginator
 _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
               'archives', 'page')
 _DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives')
-_PAGINATED_DIRECT_TEMPLATES = ('index', 'tag', 'category')
+_PAGINATED_DIRECT_TEMPLATES = ('index', )
 
 
 class Generator(object):
@@ -162,7 +162,7 @@ class ArticlesGenerator(Generator):
 
         # and subfolders after that
         for tag, articles in self.tags.items():
-            if self.settings.get('WITH_PAGINATION') and 'tag' in _PAGINATED_DIRECT_TEMPLATES:
+            if self.settings.get('WITH_PAGINATION'):
                 articles_paginator = Paginator(articles,
                                                self.settings.get('DEFAULT_PAGINATION'),
                                                self.settings.get('DEFAULT_ORPHANS'))
@@ -176,7 +176,7 @@ class ArticlesGenerator(Generator):
                     tag=tag, articles=articles)
 
         for cat, articles in self.categories:
-            if self.settings.get('WITH_PAGINATION') and 'tag' in _PAGINATED_DIRECT_TEMPLATES:
+            if self.settings.get('WITH_PAGINATION'):
                 articles_paginator = Paginator(articles,
                                                self.settings.get('DEFAULT_PAGINATION'),
                                                self.settings.get('DEFAULT_ORPHANS'))

From be7274064b847bea6e9cde14f1ea73989d000330 Mon Sep 17 00:00:00 2001
From: Laureline Guerin <laureline.guerin@makina-corpus.com>
Date: Tue, 15 Feb 2011 13:44:36 +0100
Subject: [PATCH 0204/2864] Cat and tag page generation - update dates list
 with articles of current tag/category

---
 pelican/generators.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index a2da66a4..d116a28e 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -162,32 +162,34 @@ class ArticlesGenerator(Generator):
 
         # and subfolders after that
         for tag, articles in self.tags.items():
+            dates = [article for article in self.dates if article in articles]
             if self.settings.get('WITH_PAGINATION'):
                 articles_paginator = Paginator(articles,
                                                self.settings.get('DEFAULT_PAGINATION'),
                                                self.settings.get('DEFAULT_ORPHANS'))
                 for page_num in range(articles_paginator.num_pages):
                     write('tag/%s%s.html' % (tag, '%s' % (page_num > 0 and page_num+1 or '')),
-                          templates['tag'], self.context, tag=tag, articles=articles,
+                          templates['tag'], self.context, tag=tag, articles=articles, dates=dates,
                           articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
                           page_name='tag/%s'%tag)
             else:
                 write('tag/%s.html' % tag, templates['tag'], self.context,
-                    tag=tag, articles=articles)
+                    tag=tag, articles=articles, dates=dates)
 
         for cat, articles in self.categories:
+            dates = [article for article in self.dates if article in articles]
             if self.settings.get('WITH_PAGINATION'):
                 articles_paginator = Paginator(articles,
                                                self.settings.get('DEFAULT_PAGINATION'),
                                                self.settings.get('DEFAULT_ORPHANS'))
                 for page_num in range(articles_paginator.num_pages):
                     write('category/%s%s.html' % (cat, '%s' % (page_num > 0 and page_num+1 or '')),
-                          templates['category'], self.context, category=cat, articles=articles,
+                          templates['category'], self.context, category=cat, articles=articles, dates=dates,
                           articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
                           page_name='category/%s' % cat)
             else:
                 write('category/%s.html' % cat, templates['category'], self.context,
-                    category=cat, articles=articles)
+                    category=cat, articles=articles, dates=dates)
 
     def generate_context(self):
         """change the context"""

From b042974673e0bab5e6d8c145c9a325b6c3d09613 Mon Sep 17 00:00:00 2001
From: Laureline Guerin <laureline.guerin@makina-corpus.com>
Date: Tue, 15 Feb 2011 13:46:31 +0100
Subject: [PATCH 0205/2864] Paginiation - add dates pagination to tag/category
 pages

---
 pelican/generators.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index d116a28e..0279bda3 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -167,10 +167,14 @@ class ArticlesGenerator(Generator):
                 articles_paginator = Paginator(articles,
                                                self.settings.get('DEFAULT_PAGINATION'),
                                                self.settings.get('DEFAULT_ORPHANS'))
+                dates_paginator = Paginator(dates,
+                                            self.settings.get('DEFAULT_PAGINATION'),
+                                            self.settings.get('DEFAULT_ORPHANS'))
                 for page_num in range(articles_paginator.num_pages):
                     write('tag/%s%s.html' % (tag, '%s' % (page_num > 0 and page_num+1 or '')),
                           templates['tag'], self.context, tag=tag, articles=articles, dates=dates,
                           articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
+                          dates_paginator=dates_paginator, dates_page=dates_paginator.page(page_num+1),
                           page_name='tag/%s'%tag)
             else:
                 write('tag/%s.html' % tag, templates['tag'], self.context,
@@ -182,10 +186,14 @@ class ArticlesGenerator(Generator):
                 articles_paginator = Paginator(articles,
                                                self.settings.get('DEFAULT_PAGINATION'),
                                                self.settings.get('DEFAULT_ORPHANS'))
+                dates_paginator = Paginator(dates,
+                                            self.settings.get('DEFAULT_PAGINATION'),
+                                            self.settings.get('DEFAULT_ORPHANS'))
                 for page_num in range(articles_paginator.num_pages):
                     write('category/%s%s.html' % (cat, '%s' % (page_num > 0 and page_num+1 or '')),
                           templates['category'], self.context, category=cat, articles=articles, dates=dates,
                           articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
+                          dates_paginator=dates_paginator, dates_page=dates_paginator.page(page_num+1),
                           page_name='category/%s' % cat)
             else:
                 write('category/%s.html' % cat, templates['category'], self.context,

From eb0f33df165ffcfb7750fc418e14d23c871673f6 Mon Sep 17 00:00:00 2001
From: Laureline Guerin <laureline.guerin@makina-corpus.com>
Date: Tue, 15 Feb 2011 13:48:14 +0100
Subject: [PATCH 0206/2864] Pagination - rename template

---
 pelican/themes/notmyidea/templates/index.html                 | 4 ++--
 .../notmyidea/templates/{paginator.html => pagination.html}   | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pelican/themes/notmyidea/templates/{paginator.html => pagination.html} (100%)

diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 57b7c1a7..ded814ff 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -12,7 +12,7 @@
                 {% include 'comments.html' %}
                 </article>
                 {% if loop.length == 1 %}
-                    {% include 'paginator.html' %}
+                    {% include 'pagination.html' %}
                 {% endif %}
                 </aside><!-- /#featured -->
         {% if loop.length > 1 %}
@@ -40,7 +40,7 @@
         </article></li>
     {% endif %}
     {% if loop.last and (articles_page.has_previous() or not articles_page.has_previous() and loop.length > 1) %}
-        {% include 'paginator.html' %}
+        {% include 'pagination.html' %}
     {% endif %}
 {% endfor %}
 </ol><!-- /#posts-list -->
diff --git a/pelican/themes/notmyidea/templates/paginator.html b/pelican/themes/notmyidea/templates/pagination.html
similarity index 100%
rename from pelican/themes/notmyidea/templates/paginator.html
rename to pelican/themes/notmyidea/templates/pagination.html

From 17fe724ca490024ca742cb7fd568fdd191600dcc Mon Sep 17 00:00:00 2001
From: Laureline Guerin <laureline.guerin@makina-corpus.com>
Date: Tue, 15 Feb 2011 13:53:20 +0100
Subject: [PATCH 0207/2864] Fix category url in base template - simple theme

---
 pelican/themes/simple/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 26103864..eaf4484f 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -11,7 +11,7 @@
         </header><!-- /#banner -->
         {% if categories %}<ul>
         {% for category, articles in categories %}
-            <li><a href="category/{{category}}.html">{{ category }}</a></li> 
+            <li><a href="{{ SITEURL }}/category/{{category}}.html">{{ category }}</a></li> 
         {% endfor %}
         </ul> {% endif %}
         {% block content %}

From 636e939d2324a29ecfbbafc9fbc4f2d765dd1de9 Mon Sep 17 00:00:00 2001
From: Laureline Guerin <laureline.guerin@makina-corpus.com>
Date: Tue, 15 Feb 2011 13:57:00 +0100
Subject: [PATCH 0208/2864] Pagination - update simple theme

---
 pelican/themes/simple/templates/index.html | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index c09dbf5d..0e4ef141 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 <ol id="post-list">
-{% for article in articles %}        
+{% for article in articles_page.object_list %}        
         <li><article class="hentry">    
                 <header> <h2 class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
                 <footer class="post-info">
@@ -17,5 +17,18 @@
         </article></li>
 {% endfor %}
 </ol><!-- /#posts-list -->
+<p class="paginator">
+    {% if articles_page.has_previous() %}
+        {% if articles_page.previous_page_number() == 1 %}
+            <a href="{{ SITEURL }}/{{ page_name }}.html">&laquo;</a>
+        {% else %}
+            <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">&laquo;</a>
+        {% endif %}
+    {% endif %}
+    Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}
+    {% if articles_page.has_next() %}
+        <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">&raquo;</a>
+    {% endif %}
+</p>
 </section><!-- /#content -->
 {% endblock content %}

From d272896adfe5bbd996b726fcf5ee926578784479 Mon Sep 17 00:00:00 2001
From: Laureline Guerin <laureline.guerin@makina-corpus.com>
Date: Tue, 15 Feb 2011 14:36:55 +0100
Subject: [PATCH 0209/2864] Pagination - refactoring

---
 pelican/__init__.py   |  2 +-
 pelican/generators.py | 62 +++++++++----------------------------------
 pelican/writers.py    | 56 ++++++++++++++++++++++++++++++--------
 3 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index f599cc46..8114cae8 100755
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -82,7 +82,7 @@ class Pelican(object):
         return generators
 
     def get_writer(self):
-        return Writer(self.output_path)
+        return Writer(self.output_path, settings=self.settings)
 
 
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 0279bda3..94f1a21c 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -12,7 +12,6 @@ from jinja2.exceptions import TemplateNotFound
 from pelican.utils import copytree, get_relative_path, process_translations, open
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
-from pelican.paginator import Paginator
 
 _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories',
               'archives', 'page')
@@ -143,61 +142,26 @@ class ArticlesGenerator(Generator):
                 category=article.category)
 
         for template in _DIRECT_TEMPLATES:
-            if self.settings.get('WITH_PAGINATION') and template in _PAGINATED_DIRECT_TEMPLATES:
-                articles_paginator = Paginator(self.articles,
-                                               self.settings.get('DEFAULT_PAGINATION'),
-                                               self.settings.get('DEFAULT_ORPHANS'))
-                dates_paginator = Paginator(self.dates,
-                                            self.settings.get('DEFAULT_PAGINATION'),
-                                            self.settings.get('DEFAULT_ORPHANS'))
-                for page_num in range(articles_paginator.num_pages):
-                    write('%s%s.html' % (template, '%s' % (page_num > 0 and page_num+1 or '')),
-                          templates[template], self.context, blog=True,
-                          articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
-                          dates_paginator=dates_paginator, dates_page=dates_paginator.page(page_num+1),
-                          page_name='index')
-            else:
-                write('%s.html' % template, templates[template], self.context,
-                    blog=True)
+            paginated = {}
+            if template in _PAGINATED_DIRECT_TEMPLATES:
+                paginated = {'articles': self.articles, 'dates': self.dates}
+            write('%s.html' % template, templates[template], self.context,
+                blog=True, paginated=paginated, page_name=template)
 
         # and subfolders after that
         for tag, articles in self.tags.items():
             dates = [article for article in self.dates if article in articles]
-            if self.settings.get('WITH_PAGINATION'):
-                articles_paginator = Paginator(articles,
-                                               self.settings.get('DEFAULT_PAGINATION'),
-                                               self.settings.get('DEFAULT_ORPHANS'))
-                dates_paginator = Paginator(dates,
-                                            self.settings.get('DEFAULT_PAGINATION'),
-                                            self.settings.get('DEFAULT_ORPHANS'))
-                for page_num in range(articles_paginator.num_pages):
-                    write('tag/%s%s.html' % (tag, '%s' % (page_num > 0 and page_num+1 or '')),
-                          templates['tag'], self.context, tag=tag, articles=articles, dates=dates,
-                          articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
-                          dates_paginator=dates_paginator, dates_page=dates_paginator.page(page_num+1),
-                          page_name='tag/%s'%tag)
-            else:
-                write('tag/%s.html' % tag, templates['tag'], self.context,
-                    tag=tag, articles=articles, dates=dates)
+            write('tag/%s.html' % tag, templates['tag'], self.context,
+                tag=tag, articles=articles, dates=dates,
+                paginated={'articles': articles, 'dates': dates},
+                page_name='tag/%s'%tag)
 
         for cat, articles in self.categories:
             dates = [article for article in self.dates if article in articles]
-            if self.settings.get('WITH_PAGINATION'):
-                articles_paginator = Paginator(articles,
-                                               self.settings.get('DEFAULT_PAGINATION'),
-                                               self.settings.get('DEFAULT_ORPHANS'))
-                dates_paginator = Paginator(dates,
-                                            self.settings.get('DEFAULT_PAGINATION'),
-                                            self.settings.get('DEFAULT_ORPHANS'))
-                for page_num in range(articles_paginator.num_pages):
-                    write('category/%s%s.html' % (cat, '%s' % (page_num > 0 and page_num+1 or '')),
-                          templates['category'], self.context, category=cat, articles=articles, dates=dates,
-                          articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
-                          dates_paginator=dates_paginator, dates_page=dates_paginator.page(page_num+1),
-                          page_name='category/%s' % cat)
-            else:
-                write('category/%s.html' % cat, templates['category'], self.context,
-                    category=cat, articles=articles, dates=dates)
+            write('category/%s.html' % cat, templates['category'], self.context,
+                category=cat, articles=articles, dates=dates,
+                paginated={'articles': articles, 'dates': dates},
+                page_name='category/%s' % cat)
 
     def generate_context(self):
         """change the context"""
diff --git a/pelican/writers.py b/pelican/writers.py
index ea53aead..9f3779d4 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -7,13 +7,15 @@ import locale
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 from pelican.utils import get_relative_path
+from pelican.paginator import Paginator
 
 
 class Writer(object):
 
-    def __init__(self, output_path):
+    def __init__(self, output_path, settings=None):
         self.output_path = output_path
         self.reminder = dict()
+        self.settings = settings or {}
 
     def _create_new_feed(self, feed_type, context):
         feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
@@ -74,15 +76,29 @@ class Writer(object):
             locale.setlocale(locale.LC_ALL, old_locale)
 
     def write_file(self, name, template, context, relative_urls=True,
-        **kwargs):
+        paginated=None, **kwargs):
         """Render the template and write the file.
 
         :param name: name of the file to output
         :param template: template to use to generate the content
         :param context: dict to pass to the templates.
         :param relative_urls: use relative urls or absolutes ones
+        :param paginated: dict of article list to paginate - must have the same length (same list in different orders)
         :param **kwargs: additional variables to pass to the templates
         """
+
+        def _write_file(template, localcontext, output_path, name):
+            """Render the template write the file."""
+            output = template.render(localcontext)
+            filename = os.sep.join((output_path, name))
+            try:
+                os.makedirs(os.path.dirname(filename))
+            except Exception:
+                pass
+            with open(filename, 'w', encoding='utf-8') as f:
+                f.write(output)
+            print u' [ok] writing %s' % filename
+
         localcontext = context.copy()
         if relative_urls:
             localcontext['SITEURL'] = get_relative_path(name)
@@ -90,15 +106,33 @@ class Writer(object):
         localcontext.update(kwargs)
         self.update_context_contents(name, localcontext)
 
-        output = template.render(localcontext)
-        filename = os.sep.join((self.output_path, name))
-        try:
-            os.makedirs(os.path.dirname(filename))
-        except Exception:
-            pass
-        with open(filename, 'w', encoding='utf-8') as f:
-            f.write(output)
-        print u' [ok] writing %s' % filename
+        # check paginated
+        paginated = paginated or {}
+        if self.settings.get('WITH_PAGINATION') and paginated:
+            # pagination needed, init paginators
+            paginators = {}
+            for key in paginated.iterkeys():
+                object_list = paginated[key]
+                paginators[key] = Paginator(object_list,
+                                            self.settings.get('DEFAULT_PAGINATION'),
+                                            self.settings.get('DEFAULT_ORPHANS'))
+            # generated pages, and write
+            for page_num in range(paginators.values()[0].num_pages):
+                paginated_localcontext = localcontext.copy()
+                paginated_name = name
+                for key in paginators.iterkeys():
+                    paginator = paginators[key]
+                    page = paginator.page(page_num+1)
+                    paginated_localcontext.update({'%s_paginator' % key: paginator,
+                                                   '%s_page' % key: page})
+                if page_num > 0:
+                    # FIXME file extension
+                    paginated_name = paginated_name.replace('.html', '%s.html' % (page_num+1))
+
+                _write_file(template, paginated_localcontext, self.output_path, paginated_name)
+        else:
+            # no pagination
+            _write_file(template, localcontext, self.output_path, name)
 
     def update_context_contents(self, name, context):
         """Recursively run the context to find elements (articles, pages, etc) whose content getter needs to

From e0e4155e89e00e928fb1617bb61737f31fd60125 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 15 Feb 2011 13:48:57 +0000
Subject: [PATCH 0210/2864] PEP 8 fixes

---
 pelican/generators.py |  9 ++++++---
 pelican/writers.py    | 30 +++++++++++++++++-------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 94f1a21c..c2312ddb 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -36,7 +36,8 @@ class Generator(object):
         templates ready to use with Jinja2.
         """
         path = os.path.expanduser(os.path.join(self.theme, 'templates'))
-        env = Environment(loader=FileSystemLoader(path),extensions=self.settings.get('JINJA_EXTENSIONS', []))
+        env = Environment(loader=FileSystemLoader(path), 
+                extensions=self.settings.get('JINJA_EXTENSIONS', []))
         templates = {}
         for template in _TEMPLATES:
             try:
@@ -135,7 +136,8 @@ class ArticlesGenerator(Generator):
             writer.write_file,
             relative_urls = self.settings.get('RELATIVE_URLS')
         )
-        # to minimize the number of relative path stuff modification in writer, articles pass first
+        # to minimize the number of relative path stuff modification 
+        # in writer, articles pass first
         for article in chain(self.translations, self.articles):
             write('%s' % article.save_as,
                 templates['article'], self.context, article=article,
@@ -291,7 +293,8 @@ class PdfGenerator(Generator):
         pass
 
     def generate_output(self, writer=None):
-        # we don't use the writer passed as argument here, since we write our own files
+        # we don't use the writer passed as argument here
+        # since we write our own files
         print u' Generating PDF files...'
         pdf_path = os.path.join(self.output_path, 'pdf')
         try:
diff --git a/pelican/writers.py b/pelican/writers.py
index 9f3779d4..18a09f05 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -83,7 +83,8 @@ class Writer(object):
         :param template: template to use to generate the content
         :param context: dict to pass to the templates.
         :param relative_urls: use relative urls or absolutes ones
-        :param paginated: dict of article list to paginate - must have the same length (same list in different orders)
+        :param paginated: dict of article list to paginate - must have the
+                          same length (same list in different orders)
         :param **kwargs: additional variables to pass to the templates
         """
 
@@ -114,8 +115,8 @@ class Writer(object):
             for key in paginated.iterkeys():
                 object_list = paginated[key]
                 paginators[key] = Paginator(object_list,
-                                            self.settings.get('DEFAULT_PAGINATION'),
-                                            self.settings.get('DEFAULT_ORPHANS'))
+                        self.settings.get('DEFAULT_PAGINATION'),
+                        self.settings.get('DEFAULT_ORPHANS'))
             # generated pages, and write
             for page_num in range(paginators.values()[0].num_pages):
                 paginated_localcontext = localcontext.copy()
@@ -127,19 +128,22 @@ class Writer(object):
                                                    '%s_page' % key: page})
                 if page_num > 0:
                     # FIXME file extension
-                    paginated_name = paginated_name.replace('.html', '%s.html' % (page_num+1))
+                    paginated_name = paginated_name.replace('.html',
+                            '%s.html' % (page_num+1))
 
-                _write_file(template, paginated_localcontext, self.output_path, paginated_name)
+                _write_file(template, paginated_localcontext, self.output_path,
+                        paginated_name)
         else:
             # no pagination
             _write_file(template, localcontext, self.output_path, name)
 
     def update_context_contents(self, name, context):
-        """Recursively run the context to find elements (articles, pages, etc) whose content getter needs to
-           be modified in order to deal with relative paths.
+        """Recursively run the context to find elements (articles, pages, etc) 
+        whose content getter needs to
+        be modified in order to deal with relative paths.
 
-           :param name: name of the file to output.
-           :param context: dict that will be passed to the templates.
+        :param name: name of the file to output.
+        :param context: dict that will be passed to the templates.
         """
         if context is None:
             return None
@@ -173,13 +177,13 @@ class Writer(object):
         return context
 
     def inject_update_method(self, name, item):
-        """Replace the content attribute getter of an element by a function that will deals with its
-           relatives paths.
+        """Replace the content attribute getter of an element by a function 
+        that will deals with its relatives paths.
         """
 
         def _update_object_content(name, input):
-            """Change all the relatives paths of the input content to relatives paths
-               suitable fot the ouput content
+            """Change all the relatives paths of the input content to relatives 
+            paths suitable fot the ouput content
 
             :param name: path of the output.
             :param input: input resource that will be passed to the templates.

From 4fddcf6c925f25b8d8a5fe462519e8129573a7ab Mon Sep 17 00:00:00 2001
From: skami <skami@skami-laptop.dyndns.org>
Date: Tue, 15 Feb 2011 18:48:23 +0100
Subject: [PATCH 0211/2864] Removed the issue #75

See:
https://github.com/ametaireau/pelican/issues#issue/75
---
 pelican/generators.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index c50b55e1..c7239154 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -165,8 +165,7 @@ class ArticlesGenerator(Generator):
 
             # if no category is set, use the name of the path as a category
             if 'category' not in metadatas.keys():
-                category = os.path.dirname(f).replace(
-                    os.path.expanduser(self.path)+'/', '')
+                category = os.path.basename(os.path.dirname(f))
 
                 if category == self.path:
                     category = self.settings['DEFAULT_CATEGORY']

From 608fcc17e07602336081bc3c49c1add052de0d57 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 15 Feb 2011 22:07:57 +0000
Subject: [PATCH 0212/2864] fixed a but

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 05b8c216..1ef7fd2f 100755
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -61,7 +61,7 @@ class Pelican(object):
                 p.generate_context()
 
         # erase the directory if it is not the source
-        if os.path.realpath(self.path).startswith(self.output_path) and not keep:
+        if os.path.realpath(self.path).startswith(self.output_path) and not self.keep:
             clean_output_dir(self.output_path)
 
         writer = self.get_writer()

From bf7ba84d93c80cb8eebfd466da47a8664cfc48ce Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Wed, 16 Feb 2011 00:02:09 -0800
Subject: [PATCH 0213/2864] Removed an useless "print" statment...

---
 pelican/readers.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index a8e8d63e..35681ac1 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -70,7 +70,6 @@ class HtmlReader(object):
         for i in self._re.findall(content):
             key = i.split(':')[0][5:].strip()
             value = i.split(':')[-1][:-3].strip()
-            print [key,value]
             metadatas[key.lower()] = value
 
         return content, metadatas

From fd45299b6bfbae332fdf13f232b9c95ea60ab649 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 14 Feb 2011 18:42:25 +0800
Subject: [PATCH 0214/2864] add the settings for pelican command line usage
 example

---
 THANKS                   | 1 +
 docs/getting_started.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/THANKS b/THANKS
index aaee40bc..e0275b7a 100644
--- a/THANKS
+++ b/THANKS
@@ -11,3 +11,4 @@ bugs or giving ideas. Thanks to them !
 - Arnaud Bos
 - nblock (Florian)
 - Bruno Bord
+- Laureline Guérin
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index bc7c73d0..442732be 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -70,7 +70,7 @@ Generate your blog
 
 To launch pelican, just use the `pelican` command::
 
-    $ pelican /path/to/your/content/
+    $ pelican /path/to/your/content/ [-s path/to/your/settings.py]
 
 And… that's all! You can see your weblog generated on the `content/` folder.
 

From d3fd066209f65f62010e518747b771bb37f7e929 Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@spillane.docenti.dsi.unimi.it>
Date: Mon, 14 Feb 2011 22:35:17 +0800
Subject: [PATCH 0215/2864] Fixed path definition from settings/command line
 opt

---
 pelican/__init__.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index f599cc46..05b8c216 100755
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -18,13 +18,14 @@ class Pelican(object):
         before doing anything else.
         """
         self.path = path or settings['PATH']
-        if path or self.path.endswith('/'):
+        if not self.path:
+            raise Exception('you need to specify a path to search the docs on !')
+        if self.path.endswith('/'):
             self.path = path[:-1]
 
         # define the default settings
         self.settings = settings
         self.theme = theme or settings['THEME']
-        self.path = path
         output_path = output_path or settings['OUTPUT_PATH']
         self.output_path = os.path.realpath(output_path)
         self.markup = markup or settings['MARKUP']
@@ -39,11 +40,6 @@ class Pelican(object):
             else:
                 raise Exception("Impossible to find the theme %s" % theme)
 
-        # get the list of files to parse
-        if not self.path:
-            raise Exception('you need to specify a path to search the docs on !')
-
-
     def run(self):
         """Run the generators and return"""
 

From cbb8a78c191d6fcbef1792862c9b0112a018b642 Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@dsi.unimi.it>
Date: Mon, 14 Feb 2011 22:40:23 +0800
Subject: [PATCH 0216/2864] Fixed getlocale/setlocale bug accoriding to
 http://bugs.python.org/issue1699853 and
 http://hub.esss.com.br/wordpress/blog/archives/8561

---
 pelican/writers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index ea53aead..c40c0ea3 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -47,7 +47,7 @@ class Writer(object):
         :param filename: the filename to output.
         :param feed_type: the feed type to use (atom or rss)
         """
-        old_locale = locale.getlocale(locale.LC_ALL)
+        old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, 'C')
         try:
             self.site_url = context.get('SITEURL', get_relative_path(filename))

From 90c084f81841c1953e28df4edef5a781ba49e8b6 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 16 Feb 2011 06:07:57 +0800
Subject: [PATCH 0217/2864] fixed a but

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 05b8c216..1ef7fd2f 100755
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -61,7 +61,7 @@ class Pelican(object):
                 p.generate_context()
 
         # erase the directory if it is not the source
-        if os.path.realpath(self.path).startswith(self.output_path) and not keep:
+        if os.path.realpath(self.path).startswith(self.output_path) and not self.keep:
             clean_output_dir(self.output_path)
 
         writer = self.get_writer()

From 284233a92040060d157c1e5c006c3e9398e97aac Mon Sep 17 00:00:00 2001
From: skami <skami@skami-laptop.dyndns.org>
Date: Wed, 16 Feb 2011 15:39:22 +0100
Subject: [PATCH 0218/2864] Non-ASCII in dates are now rendered as xml entities

---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 938315f7..e4dfd037 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -55,7 +55,7 @@ class Page(object):
                 self.date_format = settings['DEFAULT_DATE_FORMAT']
 
         if hasattr(self, 'date'):
-            self.locale_date = self.date.strftime(self.date_format).decode('utf')
+            self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf')
 
         # store the settings ref.
         self._settings = settings

From b1f6cfb2c9a5fc73c9e36cf48c6490f976db01e6 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 15 Feb 2011 14:27:27 +0000
Subject: [PATCH 0219/2864] pagination - fix extension

---
 pelican/writers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 18a09f05..b8dda376 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -127,9 +127,9 @@ class Writer(object):
                     paginated_localcontext.update({'%s_paginator' % key: paginator,
                                                    '%s_page' % key: page})
                 if page_num > 0:
-                    # FIXME file extension
-                    paginated_name = paginated_name.replace('.html',
-                            '%s.html' % (page_num+1))
+                    ext = '.' + paginated_name.rsplit('.')[-1]
+                    paginated_name = paginated_name.replace(ext, 
+                            '%s%s' % (page_num + 1, ext))
 
                 _write_file(template, paginated_localcontext, self.output_path,
                         paginated_name)

From 8171e1753c0cdda3e13c452717019f47fa056928 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 17 Feb 2011 19:03:23 +0000
Subject: [PATCH 0220/2864] Fix a template bug.

---
 pelican/themes/notmyidea/templates/index.html | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index ded814ff..217bacf2 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -2,31 +2,32 @@
 {% block content_title %}{% endblock %}
 {% block content %}        
 {% if articles %}
-{% for article in articles_page.object_list %}        
-    {% if loop.first and not articles_page.has_previous() %}
-        <aside id="featured" class="body"><article>
-                <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url
-                }}">{{ article.title }}</a></h1> 
-                {% include 'article_infos.html' %}
-                {{ article.content }}
-                {% include 'comments.html' %}
+    {% for article in articles_page.object_list %}        
+
+        {# First item #}
+        {% if loop.first and not articles_page.has_previous() %}
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1> 
+                    {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
                 </article>
                 {% if loop.length == 1 %}
                     {% include 'pagination.html' %}
                 {% endif %}
-                </aside><!-- /#featured -->
-        {% if loop.length > 1 %}
-            <section id="content" class="body">
-                <h1>Other articles</h1>
-                <hr />
-                    <ol id="posts-list" class="hfeed">
-        {% endif %}
-    {% else %} 
-    {% if loop.first and articles_page.has_previous %}
-    <section id="content" class="body">
-        <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
-    {% endif %}
-        <li><article class="hentry">    
+            </aside><!-- /#featured -->
+            {% if loop.length > 1 %}
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            {% endif %}
+        {# other items #}
+        {% else %} 
+            {% if loop.first and articles_page.has_previous %}
+                <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
+            {% endif %}
+            <li><article class="hentry">    
                 <header>
                         <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h1>
                 </header>
@@ -37,15 +38,16 @@
                 <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
                 {% include 'comments.html' %}
                 </div><!-- /.entry-content -->
-        </article></li>
-    {% endif %}
-    {% if loop.last and (articles_page.has_previous() or not articles_page.has_previous() and loop.length > 1) %}
-        {% include 'pagination.html' %}
-    {% endif %}
+            </article></li>
+        {% endif %}
+        {% if loop.last and (articles_page.has_previous() 
+           or not articles_page.has_previous() and loop.length > 1) %}
+            {% include 'pagination.html' %}
+        {% endif %}
 {% endfor %}
-</ol><!-- /#posts-list -->
-{% if loop.length > 1 %}
-</section><!-- /#content -->
+    {% if loop.length > 1 or articles_page.has_previous() %}
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
 {% endif %}
 {% else %}
 <section id="content" class="body">    

From 80d1fdaef3e994fb5e058a96348cc68e2cf76892 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 17 Feb 2011 19:03:55 +0000
Subject: [PATCH 0221/2864] Add some few test content.

---
 samples/content/cat1/article1.rst | 6 ++++++
 samples/content/cat1/article2.rst | 6 ++++++
 samples/content/cat1/article3.rst | 6 ++++++
 3 files changed, 18 insertions(+)
 create mode 100644 samples/content/cat1/article1.rst
 create mode 100644 samples/content/cat1/article2.rst
 create mode 100644 samples/content/cat1/article3.rst

diff --git a/samples/content/cat1/article1.rst b/samples/content/cat1/article1.rst
new file mode 100644
index 00000000..4789543b
--- /dev/null
+++ b/samples/content/cat1/article1.rst
@@ -0,0 +1,6 @@
+Article 1
+#########
+
+:date: 2011-02-17
+
+Article 1
diff --git a/samples/content/cat1/article2.rst b/samples/content/cat1/article2.rst
new file mode 100644
index 00000000..a4f87866
--- /dev/null
+++ b/samples/content/cat1/article2.rst
@@ -0,0 +1,6 @@
+Article 2
+#########
+
+:date: 2011-02-17
+
+Article 2
diff --git a/samples/content/cat1/article3.rst b/samples/content/cat1/article3.rst
new file mode 100644
index 00000000..53471177
--- /dev/null
+++ b/samples/content/cat1/article3.rst
@@ -0,0 +1,6 @@
+Article 3
+#########
+
+:date: 2011-02-17
+
+Article 3

From 3f9319d55fd6c3a85f4c9544c924c629b00b94db Mon Sep 17 00:00:00 2001
From: Laureline Guerin <laureline.guerin@makina-corpus.com>
Date: Fri, 18 Feb 2011 11:21:33 +0100
Subject: [PATCH 0222/2864] some doc about pagination

---
 docs/settings.rst |  6 ++++
 docs/themes.rst   | 70 ++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9fa3bcd3..2b03d92e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -76,6 +76,12 @@ Setting name                what it does ?
 `TRANSLATION_FEED`          Where to put the RSS feed for translations. Default
                             is feeds/all-%s.atom.xml where %s is the name of the
                             lang.
+`WITH_PAGINATION`           Activate pagination. Default is True.
+`DEFAULT_PAGINATION`        The maximum number of articles to include on a page,
+                            not including orphans. Default is 5.
+`DEFAULT_ORPHANS`           The minimum number of articles allowed on the last
+                            page, defaults to zero. Use this when you don't want
+                            to have a last page with very few articles.
 ========================    =======================================================
 
 Themes
diff --git a/docs/themes.rst b/docs/themes.rst
index 7d492544..037218fb 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -66,18 +66,50 @@ categories      A dict containing each category (keys), and the
 pages           The list of pages
 =============   ===================================================
 
+index.html
+----------
+
+Home page of your blog, will finally remain at output/index.html.
+
+If pagination is active, next pages will remain at output/index`n`.html.
+
+===================     ===================================================
+Variable                Description
+===================     ===================================================
+articles_paginator      A paginator object of article list
+articles_page           The current page of articles
+dates_paginator         A paginator object of article list, ordered by date,
+                        ascending
+dates_page              The current page of articles, ordered by date,
+                        ascending
+page_name               'index'. Usefull for pagination links.
+===================     ===================================================
+
 category.html
 -------------
 
 This template will be processed for each of the existing categories, and will
 finally remain at output/category/`category_name`.html.
 
-=============   ===================================================
-Variable        Description
-=============   ===================================================
-articles        The articles of this category
-category        The name of the category being processed
-=============   ===================================================
+If pagination is active, next pages will remain at
+output/category/`category_name``n`.html.
+
+===================     ===================================================
+Variable                Description
+===================     ===================================================
+category                The name of the category being processed
+articles                Articles of this category
+dates                   Articles of this category, but ordered by date,
+                        ascending
+articles_paginator      A paginator object of article list
+articles_page           The current page of articles
+dates_paginator         A paginator object of article list, ordered by date,
+                        ascending
+dates_page              The current page of articles, ordered by date,
+                        ascending
+page_name               'category/`category_name`'. Usefull for pagination
+                        links.
+===================     ===================================================
 
 article.html
 -------------
@@ -96,11 +128,23 @@ tag.html
 --------
 
 For each tag, this template will be processed. It will create .html files in
-/output/tag/`tag_name`.html
+/output/tag/`tag_name`.html.
 
-=============   ===================================================
-Variable        Description
-=============   ===================================================
-tag             The name of the tag being processed
-articles        Articles related to this tag
-=============   ===================================================
+If pagination is active, next pages will remain at
+output/tag/`tag_name``n`.html.
+
+===================     ===================================================
+Variable                Description
+===================     ===================================================
+tag                     The name of the tag being processed
+articles                Articles related to this tag
+dates                   Articles related to this tag, but ordered by date,
+                        ascending
+articles_paginator      A paginator object of article list
+articles_page           The current page of articles
+dates_paginator         A paginator object of article list, ordered by date,
+                        ascending
+dates_page              The current page of articles, ordered by date,
+                        ascending
+page_name               'tag/`tag_name`'. Usefull for pagination links.
+===================     ===================================================

From 9f12721895108ca581ccc5f4b2531c6bdea465bf Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 18 Feb 2011 12:33:11 +0000
Subject: [PATCH 0223/2864] typo

---
 docs/themes.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 037218fb..833b7f82 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -82,7 +82,7 @@ dates_paginator         A paginator object of article list, ordered by date,
                         ascending
 dates_page              The current page of articles, ordered by date,
                         ascending
-page_name               'index'. Usefull for pagination links.
+page_name               'index'. Useful for pagination links.
 ===================     ===================================================
 
 category.html
@@ -107,7 +107,7 @@ dates_paginator         A paginator object of article list, ordered by date,
                         ascending
 dates_page              The current page of articles, ordered by date,
                         ascending
-page_name               'category/`category_name`'. Usefull for pagination
+page_name               'category/`category_name`'. Useful for pagination
                         links.
 ===================     ===================================================
 
@@ -146,5 +146,5 @@ dates_paginator         A paginator object of article list, ordered by date,
                         ascending
 dates_page              The current page of articles, ordered by date,
                         ascending
-page_name               'tag/`tag_name`'. Usefull for pagination links.
+page_name               'tag/`tag_name`'. Useful for pagination links.
 ===================     ===================================================

From fabc1f346e65fd544f347c6f00cb30988d22b31c Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 18 Feb 2011 12:36:53 +0000
Subject: [PATCH 0224/2864] Do not activate the pagination by default

---
 docs/settings.rst   | 12 ++++++------
 pelican/settings.py |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 2b03d92e..35a13ef6 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -36,6 +36,11 @@ Setting name                what it does ?
 `DEFAULT_CATEGORY`          The default category to fallback on. `misc` by default.
 `DEFAULT_DATE_FORMAT`       The default date format you want to use.
 `DEFAULT_LANG`              The default language to use. Default is 'en'.
+`DEFAULT_ORPHANS`           The minimum number of articles allowed on the last
+                            page, defaults to zero. Use this when you don't want
+                            to have a last page with very few articles.
+`DEFAULT_PAGINATION`        The maximum number of articles to include on a page,
+                            not including orphans. Default is 5.
 `DISPLAY_PAGES_ON_MENU`     Display or not the pages on the menu of the template.
                             Templates can follow or not this settings.
 `FALLBACK_ON_FS_DATE`       If True, pelican will use the file system dates infos
@@ -76,12 +81,7 @@ Setting name                what it does ?
 `TRANSLATION_FEED`          Where to put the RSS feed for translations. Default
                             is feeds/all-%s.atom.xml where %s is the name of the
                             lang.
-`WITH_PAGINATION`           Activate pagination. Default is True.
-`DEFAULT_PAGINATION`        The maximum number of articles to include on a page,
-                            not including orphans. Default is 5.
-`DEFAULT_ORPHANS`           The minimum number of articles allowed on the last
-                            page, defaults to zero. Use this when you don't want
-                            to have a last page with very few articles.
+`WITH_PAGINATION`           Activate pagination. Default is False.
 ========================    =======================================================
 
 Themes
diff --git a/pelican/settings.py b/pelican/settings.py
index dbd230d4..66b4dede 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -30,7 +30,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DATE_FORMATS': {},
                    'JINJA_EXTENSIONS': [],
                    'LOCALE': '', # default to user locale
-                   'WITH_PAGINATION': True,
+                   'WITH_PAGINATION': False,
                    'DEFAULT_PAGINATION': 5,
                    'DEFAULT_ORPHANS': 0,
                   }

From 7b4d5e83175663d24c03f3f5df9b66924e95f3d8 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 18 Feb 2011 13:34:26 +0000
Subject: [PATCH 0225/2864] remove 'except as' for python 2.5 compat

---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 5a7fbaaf..4fe9820f 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -62,7 +62,7 @@ def clean_output_dir(path):
     # remove all the existing content from the output folder
     try:
         shutil.rmtree(path)
-    except Exception as e:
+    except Exception:
         pass
 
 

From e43d6607330d175bb41f1aacb0cf123d321f9828 Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Tue, 22 Feb 2011 11:10:58 +0100
Subject: [PATCH 0226/2864] Add support for skribit suggestions tab. WARNING :
 NOT TESTED.

---
 pelican/themes/notmyidea/templates/base.html       |  1 +
 .../notmyidea/templates/skribit_tab_script.html    | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pelican/themes/notmyidea/templates/skribit_tab_script.html

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 1ec6fe5e..8d748783 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -9,6 +9,7 @@
         <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
 
+        {% include 'skribit_tab_script.html' %}
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/pelican/themes/notmyidea/templates/skribit_tab_script.html b/pelican/themes/notmyidea/templates/skribit_tab_script.html
new file mode 100644
index 00000000..cef1ee69
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/skribit_tab_script.html
@@ -0,0 +1,14 @@
+{% if SKRIBIT_TYPE and SKRIBIT_TYPE == 'TAB' and SKRIBIT_TAB_SITENAME %}
+<link rel="stylesheet" type="text/css" media="screen" charset="utf-8" href="http://assets.skribit.com/stylesheets/SkribitSuggest.css"></link>
+<style type="text/css" media="print" charset="utf-8">a#sk_tab{display:none !important;}</style>
+<script src="http://assets.skribit.com/javascripts/SkribitSuggest.js" type="text/javascript"></script>
+<script type="text/javascript" charset="utf-8">
+      var skribit_settings = {};
+      skribit_settings.placement = "{{ SKRIBIT_TAB_PLACEMENT or 'right' }}";
+      skribit_settings.color = "{{ SKRIBIT_TAB_COLOR or '#333333' }}";
+      skribit_settings.text_color = "{{ SKRIBIT_TAB_TEXT_COLOR or 'white' }}";
+      skribit_settings.distance_vert = "{{ SKRIBIT_TAB_DISTANCE_VERT or '20%' }}";
+      skribit_settings.distance_horiz = "{{ SKRIBIT_TAB_DISTANCE_HORIZ or '' }}";
+      SkribitSuggest.suggest('http://skribit.com/lightbox/{{ SKRIBIT_TAB_SITENAME }}', skribit_settings);
+</script>
+{% endif %}
\ No newline at end of file

From 68f8826ecf0289d3c3c4d6cb95a965df6f28562a Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Tue, 22 Feb 2011 11:13:52 +0100
Subject: [PATCH 0227/2864] Add support for skribit widget. WARNING : NOT
 TESTED.

---
 pelican/themes/notmyidea/templates/base.html              | 1 +
 .../themes/notmyidea/templates/skribit_widget_script.html | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 pelican/themes/notmyidea/templates/skribit_widget_script.html

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 8d748783..6a5cfaf5 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -54,6 +54,7 @@
                         </ul>
                 </div><!-- /.blogroll -->
         {% endif %}
+        {% include 'skribit_widget_script.html' %}
         {% if SOCIAL %}
                 <div class="social">
                         <h2>social</h2>
diff --git a/pelican/themes/notmyidea/templates/skribit_widget_script.html b/pelican/themes/notmyidea/templates/skribit_widget_script.html
new file mode 100644
index 00000000..0e03531b
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/skribit_widget_script.html
@@ -0,0 +1,8 @@
+{% if SKRIBIT_TYPE == 'WIDGET' and SKRIBIT_WIDGET_ID %}
+<div id="writeSkribitHere"></div>
+<script src="http://assets.skribit.com/javascripts/SkribitWidget.js?renderTo=writeSkribitHere&amp;blog={{ SKRIBIT_WIDGET_ID }}&amp;cnt=5"></script>
+<noscript>Sorry, but the
+    <a href="http://skribit.com" title="Skribit - Cure Writer's Block">Skribit</a> widget only works on browsers with JavaScript support.
+    <a href="http://skribit.com/blogs/think-different-think-open" title="Skribit Suggestions for Think Different, Think Open">View suggestions for this blog here.</a>
+</noscript>
+{% endif %}
\ No newline at end of file

From b2be5638f8242fb9d424d5c6025b0a7ccadfd07f Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Tue, 22 Feb 2011 11:18:41 +0100
Subject: [PATCH 0228/2864] Rename SKRIBIT_TAB_DISTANCE_VERT
 (SKRIBIT_TAB_DISTANCE_HORIZ) to respectively SKRIBIT_TAB_VERT
 (SKRIBIT_TAB_HORIZ).

---
 pelican/themes/notmyidea/templates/skribit_tab_script.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/skribit_tab_script.html b/pelican/themes/notmyidea/templates/skribit_tab_script.html
index cef1ee69..637bd78f 100644
--- a/pelican/themes/notmyidea/templates/skribit_tab_script.html
+++ b/pelican/themes/notmyidea/templates/skribit_tab_script.html
@@ -7,8 +7,8 @@
       skribit_settings.placement = "{{ SKRIBIT_TAB_PLACEMENT or 'right' }}";
       skribit_settings.color = "{{ SKRIBIT_TAB_COLOR or '#333333' }}";
       skribit_settings.text_color = "{{ SKRIBIT_TAB_TEXT_COLOR or 'white' }}";
-      skribit_settings.distance_vert = "{{ SKRIBIT_TAB_DISTANCE_VERT or '20%' }}";
-      skribit_settings.distance_horiz = "{{ SKRIBIT_TAB_DISTANCE_HORIZ or '' }}";
+      skribit_settings.distance_vert = "{{ SKRIBIT_TAB_VERT or '20%' }}";
+      skribit_settings.distance_horiz = "{{ SKRIBIT_TAB_HORIZ or '' }}";
       SkribitSuggest.suggest('http://skribit.com/lightbox/{{ SKRIBIT_TAB_SITENAME }}', skribit_settings);
 </script>
 {% endif %}
\ No newline at end of file

From 6902485c12d3a50c1ff8dd399d05b5a80b7373c5 Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Tue, 22 Feb 2011 11:35:06 +0100
Subject: [PATCH 0229/2864] Add some docs for skribit integration.

---
 docs/settings.rst | 55 +++++++++++++++++++++++++++++++++++++++++++++++
 docs/themes.rst   | 15 +++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 35a13ef6..15f62d47 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -69,6 +69,15 @@ Setting name                what it does ?
                             descending order, default is alphabetically)
 `SITEURL`                   base URL of your website.
 `SITENAME`                  Your site name,
+`SKRIBIT_TYPE`              The type of skribit widget (TAB or WIDGET, default
+                            TAB).
+`SKRIBIT_TAB_COLOR`         Tab color (#XXXXXX, default #333333).
+`SKRIBIT_TAB_HORIZ`         Tab Distance from Left (% or distance, default Null).
+`SKRIBIT_TAB_VERT`          Tab Distance from Top (% or distance, default 20%).
+`SKRIBIT_TAB_PLACEMENT`     Tab placement (Top, Bottom, Left or Right, default
+                            LEFT).
+`SKRIBIT_TAB_SITENAME`      Tab identifier (See Skribit part below).
+`SKRIBIT_WIDGET_ID`         Widget identifier (See Skribit part below).
 `STATIC_PATHS`              The static paths you want to have accessible on the
                             output path "static". By default, pelican will copy
                             the 'images' folder to the output folder.
@@ -84,6 +93,52 @@ Setting name                what it does ?
 `WITH_PAGINATION`           Activate pagination. Default is False.
 ========================    =======================================================
 
+Skribit
+=======
+
+Skribit has two ways to display suggestions : as a sidebar widget or as a
+suggestions tab. You can choose one of the display by setting the SKRIBIT_TYPE
+in your config.
+
+Sidebar widget
+--------------
+
+The settings for sidebar widget is :
+
+ * SKRIBIT_WIDGET_ID
+
+All the customizations are done in the skribit web interface.
+
+To retrieve your identifier from the code snippet, you can use this python code::
+
+    import re
+    regex = re.compile('.*http://assets.skribit.com/javascripts/SkribitWidget.\
+        js\?renderTo=writeSkribitHere&amp;blog=(.*)&amp;.*')
+    snippet = '''SNIPPET CONTENT'''
+    snippet = snippet.replace('\n', '')
+    identifier = regex.match(snippet).groups()[0]
+
+Suggestion tab
+--------------
+
+The setting for suggestion tab are :
+
+ * SKRIBIT_TAB_COLOR
+ * SKRIBIT_TAB_DISTANCE_HORIZ
+ * SKRIBIT_TAB_DISTANCE_VERT
+ * SKRIBIT_TAB_PLACEMENT
+ * SKRIBIT_TAB_SITENAME
+
+These settings are used for customization.
+
+To retrieve your sitename from the code snippet, you can use this python code::
+
+    import re
+    regex = re.compile('.*http://skribit.com/lightbox/(.*)\',.*')
+    snippet = '''SNIPPET CONTENT'''
+    snippet = snippet.replace('\n', '')
+    identifier = regex.match(snippet).groups()[0]
+
 Themes
 ======
 
diff --git a/docs/themes.rst b/docs/themes.rst
index 833b7f82..9f8b8765 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -148,3 +148,18 @@ dates_page              The current page of articles, ordered by date,
                         ascending
 page_name               'tag/`tag_name`'. Useful for pagination links.
 ===================     ===================================================
+
+Include skribit script
+======================
+
+In order to support skribit scripts in your themes, you must following these
+actions :
+
+ * Copy `skribit_tab_script.html` and `skribit_widget_script.html` in your
+   templates directory.
+ * Add {% include 'skribit_tab_script.html' %} in your <head> part in order to
+   support suggestions tab.
+ * Add {% include 'skribit_widget_script.html' %} where you want in order to
+   support sidebar widget.
+
+You can take a look at notmyidea default theme for working example.

From 906c620327014a818dc124fe481e02b33df0f11f Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Tue, 22 Feb 2011 11:41:57 +0100
Subject: [PATCH 0230/2864] Correct docs.

---
 docs/settings.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 15f62d47..fc581eec 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -69,8 +69,7 @@ Setting name                what it does ?
                             descending order, default is alphabetically)
 `SITEURL`                   base URL of your website.
 `SITENAME`                  Your site name,
-`SKRIBIT_TYPE`              The type of skribit widget (TAB or WIDGET, default
-                            TAB).
+`SKRIBIT_TYPE`              The type of skribit widget (TAB or WIDGET).
 `SKRIBIT_TAB_COLOR`         Tab color (#XXXXXX, default #333333).
 `SKRIBIT_TAB_HORIZ`         Tab Distance from Left (% or distance, default Null).
 `SKRIBIT_TAB_VERT`          Tab Distance from Top (% or distance, default 20%).
@@ -105,7 +104,7 @@ Sidebar widget
 
 The settings for sidebar widget is :
 
- * SKRIBIT_WIDGET_ID
+ * SKRIBIT_WIDGET_ID : the identifier of your blog.
 
 All the customizations are done in the skribit web interface.
 
@@ -121,15 +120,16 @@ To retrieve your identifier from the code snippet, you can use this python code:
 Suggestion tab
 --------------
 
-The setting for suggestion tab are :
+The setting for suggestion tab's customizations are :
 
  * SKRIBIT_TAB_COLOR
  * SKRIBIT_TAB_DISTANCE_HORIZ
  * SKRIBIT_TAB_DISTANCE_VERT
  * SKRIBIT_TAB_PLACEMENT
- * SKRIBIT_TAB_SITENAME
 
-These settings are used for customization.
+The identifier is :
+
+ * SKRIBIT_TAB_SITENAME : the identifier of your blog
 
 To retrieve your sitename from the code snippet, you can use this python code::
 

From 43e931baa4b8140fe700b23af6758572a8835ce7 Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Thu, 24 Feb 2011 05:15:04 +0000
Subject: [PATCH 0231/2864] Make readers with external dependencies optional.

---
 pelican/readers.py | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 35681ac1..4e1d7b2e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,12 +1,18 @@
 # -*- coding: utf-8 -*-
-from docutils import core
-from markdown import Markdown
+try:
+    from docutils import core
+
+    # import the directives to have pygments support
+    import rstdirectives
+except ImportError:
+    core = False
+try:
+    from markdown import Markdown
+except ImportError:
+    Markdown = False
 import re
 import string
 
-# import the directives to have pygments support
-import rstdirectives
-
 from pelican.utils import get_date, open
 
 
@@ -17,7 +23,12 @@ _METADATAS_PROCESSORS = {
 }
 
 
-class RstReader(object):
+class Reader(object):
+    enabled = True
+
+class RstReader(Reader):
+    enabled = bool(core)
+    extension = "rst"
 
     def _parse_metadata(self, content):
         """Return the dict containing metadatas"""
@@ -43,7 +54,9 @@ class RstReader(object):
             metadatas['title'] = title
         return content, metadatas
 
-class MarkdownReader(object):
+class MarkdownReader(Reader):
+    enabled = bool(Markdown)
+    extension = "md"
 
     def read(self, filename):
         """Parse content and metadata of markdown files"""
@@ -60,7 +73,8 @@ class MarkdownReader(object):
         return content, metadatas
 
 
-class HtmlReader(object):
+class HtmlReader(Reader):
+    extension = "html"
     _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
 
     def read(self, filename):
@@ -76,8 +90,7 @@ class HtmlReader(object):
 
 
 
-_EXTENSIONS = {'rst': RstReader, 'md': MarkdownReader, 'html': HtmlReader}  # supported formats
-
+_EXTENSIONS = dict((cls.extension, cls) for cls in Reader.__subclasses__())
 
 def read_file(filename, fmt=None):
     """Return a reader object using the given format."""
@@ -86,4 +99,6 @@ def read_file(filename, fmt=None):
     if fmt not in _EXTENSIONS.keys():
         raise TypeError('Pelican does not know how to parse %s' % filename)
     reader = _EXTENSIONS[fmt]()
+    if not reader.enabled:
+        raise ValueError("Missing dependencies for %s" % fmt)
     return reader.read(filename)

From 6fc6a4dac9f0941c99e29636d3ac83cf11f2575d Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Thu, 24 Feb 2011 05:17:05 +0000
Subject: [PATCH 0232/2864] Document Reader.enabled attribute usage.

---
 docs/internals.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/internals.rst b/docs/internals.rst
index 80fc8661..4ff8c91c 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -40,7 +40,8 @@ method, that is returning an HTML content and some metadata.
 
 Take a look to the Markdown reader::
 
-    class MarkdownReader(object):
+    class MarkdownReader(Reader):
+        enabled = bool(Markdown)
 
         def read(self, filename):
             """Parse content and metadata of markdown files"""
@@ -59,6 +60,12 @@ Take a look to the Markdown reader::
 
 Simple isn't it ?
 
+If your new reader requires additional Python dependencies then you should wrap
+their `imports` statements in `try...except`.  Then inside the reader's class
+set the `enabled` class attribute to mark import success or failure.  This makes
+it possible for users to continue using their favourite markup method without
+needing to install modules for all the additional formats they don't use.
+
 How to implement a new generator ?
 ==================================
 

From 09f964ffcbeda804f52133e5825a39577ae27f9d Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Sat, 26 Feb 2011 16:17:20 +0000
Subject: [PATCH 0233/2864] Split hard and soft dependencies in getting_started
 doc.

---
 docs/getting_started.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 442732be..d90e1fe8 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -23,13 +23,14 @@ At this time, pelican is dependent of the following python packages:
 
 * feedgenerator, to generate the ATOM feeds.
 * jinja2, for templating support.
-* pygments, to have syntactic colorization
-* docutils and Markdown
 
 If you're not using python 2.7, you will also need `argparse`.
 
-All those dependencies will be processed automatically if you install pelican
-using setuptools/distribute or pip.
+Optionally:
+
+* docutils, for reST support
+* pygments, to have syntactic colorization with resT input
+* Markdown, for Markdown as an input format
 
 Writing articles using pelican
 ==============================

From d8e8bc868fa7bcea589ef34b32d30ce6aa373a6c Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 27 Feb 2011 04:01:10 +0000
Subject: [PATCH 0234/2864] fix pagination

---
 pelican/writers.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index ea32de14..2c135270 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -109,14 +109,19 @@ class Writer(object):
 
         # check paginated
         paginated = paginated or {}
-        if self.settings.get('WITH_PAGINATION') and paginated:
+        if paginated:
             # pagination needed, init paginators
             paginators = {}
             for key in paginated.iterkeys():
                 object_list = paginated[key]
-                paginators[key] = Paginator(object_list,
+
+                if self.settings.get('WITH_PAGINATION'):
+                    paginators[key] = Paginator(object_list,
                         self.settings.get('DEFAULT_PAGINATION'),
                         self.settings.get('DEFAULT_ORPHANS'))
+                else:
+                    paginators[key] = Paginator(object_list, len(object_list), 0)
+
             # generated pages, and write
             for page_num in range(paginators.values()[0].num_pages):
                 paginated_localcontext = localcontext.copy()

From ec06e6ed9590f0d7dbaff9a5f4b58cf94136a1fb Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 8 Mar 2011 15:40:12 +0000
Subject: [PATCH 0235/2864] Add a possibility to define the summary of an
 article directly in rst.

---
 THANKS                            | 1 +
 pelican/contents.py               | 8 +++-----
 samples/content/super_article.rst | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/THANKS b/THANKS
index e0275b7a..6a74b068 100644
--- a/THANKS
+++ b/THANKS
@@ -12,3 +12,4 @@ bugs or giving ideas. Thanks to them !
 - nblock (Florian)
 - Bruno Bord
 - Laureline Guérin
+- Samuel Martin
diff --git a/pelican/contents.py b/pelican/contents.py
index e4dfd037..397b7fdb 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -57,6 +57,9 @@ class Page(object):
         if hasattr(self, 'date'):
             self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf')
 
+        if not hasattr(self, 'summary'):
+            self.summary = property(lambda self: truncate_html_words(self.content, 50))
+
         # store the settings ref.
         self._settings = settings
 
@@ -74,11 +77,6 @@ class Page(object):
             content = self._content
         return content
 
-    @property
-    def summary(self):
-        return truncate_html_words(self.content, 50)
-
-
 
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')
diff --git a/samples/content/super_article.rst b/samples/content/super_article.rst
index e2f933d2..b3e22051 100644
--- a/samples/content/super_article.rst
+++ b/samples/content/super_article.rst
@@ -5,6 +5,7 @@ This is a super article !
 :date: 2010-12-02 10:14
 :category: yeah
 :author: Alexis Métaireau
+:summary: This is a simple test
 
 Some content here !
 

From 8d6de4ec5954afaa44e363e33b495d9b75a518c2 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 8 Mar 2011 19:37:35 +0000
Subject: [PATCH 0236/2864] Bump version

---
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 419b40b0..e1636149 100755
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -8,7 +8,7 @@ from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 
-VERSION = "2.5.3"
+VERSION = "2.6.0"
 
 
 class Pelican(object):
diff --git a/setup.py b/setup.py
index 11378737..936a3171 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 import sys
 
-VERSION = "2.5.3" # find a better way to do so.
+VERSION = "2.6.0" # find a better way to do so.
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown']
 if sys.version_info < (2,7):

From f9123a4cc646bda2a14552f57cb09478f7df7cbc Mon Sep 17 00:00:00 2001
From: Marcus Fredriksson <drmegahertz@gmail.com>
Date: Wed, 9 Mar 2011 12:21:15 +0100
Subject: [PATCH 0237/2864] Binds the summary property to the current instance

An unbound property will just return itself instead of calling the intended
method.
---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 397b7fdb..7097e946 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -58,7 +58,7 @@ class Page(object):
             self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf')
 
         if not hasattr(self, 'summary'):
-            self.summary = property(lambda self: truncate_html_words(self.content, 50))
+            self.summary = property(lambda self: truncate_html_words(self.content, 50)).__get__(self, Page)
 
         # store the settings ref.
         self._settings = settings

From 5f3c4ffafe3d7593ff509d2e73c998c8d3c6b46b Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 9 Mar 2011 12:11:53 +0000
Subject: [PATCH 0238/2864] Thanks to DrMegahertz !

---
 THANKS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/THANKS b/THANKS
index 6a74b068..078a67d1 100644
--- a/THANKS
+++ b/THANKS
@@ -13,3 +13,4 @@ bugs or giving ideas. Thanks to them !
 - Bruno Bord
 - Laureline Guérin
 - Samuel Martin
+- Marcus Fredriksson

From 37666770becccd3e6b4e1f79f4890d64dea5876d Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Wed, 23 Mar 2011 07:10:28 +0000
Subject: [PATCH 0239/2864] =?UTF-8?q?imports=E2=86=92import=20typo=20fix.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/internals.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/internals.rst b/docs/internals.rst
index 4ff8c91c..12127646 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -61,7 +61,7 @@ Take a look to the Markdown reader::
 Simple isn't it ?
 
 If your new reader requires additional Python dependencies then you should wrap
-their `imports` statements in `try...except`.  Then inside the reader's class
+their `import` statements in `try...except`.  Then inside the reader's class
 set the `enabled` class attribute to mark import success or failure.  This makes
 it possible for users to continue using their favourite markup method without
 needing to install modules for all the additional formats they don't use.

From ddcccfeaa952d2e1e24ceac94e5d66c73b57c01b Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Wed, 23 Mar 2011 11:14:25 +0300
Subject: [PATCH 0240/2864] Switch to 'C' locale during page rendering.

Don't know why, but without it Jinja fails with UnicodeDecode error.
---
 pelican/writers.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 2c135270..afc37648 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -90,7 +90,12 @@ class Writer(object):
 
         def _write_file(template, localcontext, output_path, name):
             """Render the template write the file."""
-            output = template.render(localcontext)
+            old_locale = locale.setlocale(locale.LC_ALL)
+            locale.setlocale(locale.LC_ALL, 'C')
+            try:
+                output = template.render(localcontext)
+            finally:
+                locale.setlocale(locale.LC_ALL, old_locale)
             filename = os.sep.join((output_path, name))
             try:
                 os.makedirs(os.path.dirname(filename))

From f9f6da0a439aad9b210d4d2542e3e117da036724 Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Wed, 23 Mar 2011 11:15:37 +0300
Subject: [PATCH 0241/2864] Don't add 'static' prefix to urls with schema.

Don't add 'static' prefix to urls like 'mailto:some@example.com' or
'skype:somename'.
---
 pelican/writers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index afc37648..2b168bcb 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -212,7 +212,7 @@ class Writer(object):
                     relative_paths.append(found)
 
             for relative_path in relative_paths:
-                if not "://" in relative_path: # we don't want to rewrite protocols
+                if not ":" in relative_path: # we don't want to rewrite protocols
                     dest_path = os.sep.join((get_relative_path(name), "static",
                         relative_path))
                     content = content.replace(relative_path, dest_path)

From dfb214d47d2d84de7f6ed54443ce07a1e5eb9cef Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 23 Mar 2011 16:41:24 +0000
Subject: [PATCH 0242/2864] default tags to []

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index cb64145a..50773260 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -220,7 +220,7 @@ class ArticlesGenerator(Generator):
         # create tag cloud
         tag_cloud = defaultdict(int)
         for article in self.articles:
-            for tag in article.tags:
+            for tag in getattr(article, 'tags', []):
                 tag_cloud[tag] += 1
 
         tag_cloud = sorted(tag_cloud.items(), key = itemgetter(1), reverse = True)

From b909e4aac3906f2320041ba6755d97160111df8b Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sat, 26 Mar 2011 17:46:31 +0100
Subject: [PATCH 0243/2864] Removed a division by zero

---
 pelican/paginator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/paginator.py b/pelican/paginator.py
index a2a452b9..89e081ca 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -27,7 +27,7 @@ class Paginator(object):
         "Returns the total number of pages."
         if self._num_pages is None:
             hits = max(1, self.count - self.orphans)
-            self._num_pages = int(ceil(hits / float(self.per_page)))
+            self._num_pages = int(ceil(hits / (float(self.per_page) or 1)))
         return self._num_pages
     num_pages = property(_get_num_pages)
 

From 421dc21f723c1657f55d7c0fd94b1d4b1086d572 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sun, 27 Mar 2011 12:46:33 +0200
Subject: [PATCH 0244/2864] Removed a category-related bug

---
 pelican/generators.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 50773260..51080023 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -182,10 +182,11 @@ class ArticlesGenerator(Generator):
 
             # if no category is set, use the name of the path as a category
             if 'category' not in metadatas.keys():
-                category = os.path.basename(os.path.dirname(f))
 
-                if category == self.path:
+                if os.path.dirname(f) == self.path:
                     category = self.settings['DEFAULT_CATEGORY']
+		else:
+		    category = os.path.basename(os.path.dirname(f))
 
                 if category != '':
                     metadatas['category'] = unicode(category)
@@ -226,7 +227,9 @@ class ArticlesGenerator(Generator):
         tag_cloud = sorted(tag_cloud.items(), key = itemgetter(1), reverse = True)
         tag_cloud = tag_cloud[:self.settings.get('TAG_CLOUD_MAX_ITEMS')]
 
-        max_count = max(map(itemgetter(1), tag_cloud))
+        tags = map(itemgetter(1), tag_cloud)
+	if tags:
+        	max_count = max(tags)
         steps = self.settings.get('TAG_CLOUD_STEPS')
 
         # calculate word sizes

From 752e9d1c75be40b3fe5e24c03b55556e21eb3ef7 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sun, 27 Mar 2011 12:49:28 +0200
Subject: [PATCH 0245/2864] Tabs replaced by spaces

---
 pelican/generators.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 51080023..e87f7cea 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -185,8 +185,8 @@ class ArticlesGenerator(Generator):
 
                 if os.path.dirname(f) == self.path:
                     category = self.settings['DEFAULT_CATEGORY']
-		else:
-		    category = os.path.basename(os.path.dirname(f))
+                else:
+                    category = os.path.basename(os.path.dirname(f))
 
                 if category != '':
                     metadatas['category'] = unicode(category)
@@ -228,8 +228,8 @@ class ArticlesGenerator(Generator):
         tag_cloud = tag_cloud[:self.settings.get('TAG_CLOUD_MAX_ITEMS')]
 
         tags = map(itemgetter(1), tag_cloud)
-	if tags:
-        	max_count = max(tags)
+        if tags:
+                max_count = max(tags)
         steps = self.settings.get('TAG_CLOUD_STEPS')
 
         # calculate word sizes

From 9d10e2bff158dc7bde14891e5260ef7e070ff93c Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Mon, 18 Apr 2011 17:58:48 +0200
Subject: [PATCH 0246/2864] Added a logging system (will be useful for plugins)

---
 pelican/log.py | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pelican/log.py

diff --git a/pelican/log.py b/pelican/log.py
new file mode 100644
index 00000000..38747447
--- /dev/null
+++ b/pelican/log.py
@@ -0,0 +1,47 @@
+import logging
+
+gray = lambda(text) : '\033[1;30m' + str(text) + '\033[1;m'
+red = lambda(text) : '\033[1;31m' + str(text) + '\033[1;m'
+green = lambda(text) : '\033[1;32m' + str(text) + '\033[1;m'
+yellow = lambda(text) : '\033[1;33m' + str(text) + '\033[1;m'
+blue = lambda(text) : '\033[1;34m' + str(text) + '\033[1;m'
+magenta = lambda(text) : '\033[1;35m' + str(text) + '\033[1;m'
+cyan = lambda(text) : '\033[1;36m' + str(text) + '\033[1;m'
+white = lambda(text) : '\033[1;37m' + str(text) + '\033[1;m'
+crimson = lambda(text) : '\033[1;38m' + str(text) + '\033[1;m'
+bgred = lambda(text) : '\033[1;41m' + str(text) + '\033[1;m'
+bggreen = lambda(text) : '\033[1;42m' + str(text) + '\033[1;m'
+bgbrown = lambda(text) : '\033[1;43m' + str(text) + '\033[1;m'
+bgblue = lambda(text) : '\033[1;44m' + str(text) + '\033[1;m'
+bgmagenta = lambda(text) : '\033[1;45m' + str(text) + '\033[1;m'
+bgcyan = lambda(text) : '\033[1;46m' + str(text) + '\033[1;m'
+bggray = lambda(text) : '\033[1;47m' + str(text) + '\033[1;m'
+bgcrimson = lambda(text) : '\033[1;48m' + str(text) + '\033[1;m'
+
+
+class Formatter(logging.Formatter):
+
+    def format(self, record):
+        if record.levelname is 'INFO':
+            return record.msg
+        elif record.levelname is 'WARNING':
+            return yellow(record.levelname) + ': ' + record.msg
+        elif record.levelname is 'ERROR':
+            return red(record.levelname) + ': ' + record.msg
+        elif record.levelname is 'CRITICAL':
+            return bgred(record.levelname) + ': ' + record.msg
+
+def init(logger=logging.getLogger(), handler=logging.StreamHandler()):
+    fmt = Formatter()
+    handler.setFormatter(fmt)
+    logger.addHandler(handler)
+    logger.setLevel(logging.INFO)
+
+init()
+
+
+logging.info('info')
+logging.warning('warning')
+logging.error('error')
+logging.critical('critical')
+

From c5578e338d422e163a6b4675c3a17abdc7cdfb9a Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Mon, 18 Apr 2011 20:14:07 +0200
Subject: [PATCH 0247/2864] Added a colored  logging system

---
 pelican/log.py | 96 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 66 insertions(+), 30 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index 38747447..e6769d28 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,47 +1,83 @@
 import logging
+import sys
+import os
 
-gray = lambda(text) : '\033[1;30m' + str(text) + '\033[1;m'
-red = lambda(text) : '\033[1;31m' + str(text) + '\033[1;m'
-green = lambda(text) : '\033[1;32m' + str(text) + '\033[1;m'
-yellow = lambda(text) : '\033[1;33m' + str(text) + '\033[1;m'
-blue = lambda(text) : '\033[1;34m' + str(text) + '\033[1;m'
-magenta = lambda(text) : '\033[1;35m' + str(text) + '\033[1;m'
-cyan = lambda(text) : '\033[1;36m' + str(text) + '\033[1;m'
-white = lambda(text) : '\033[1;37m' + str(text) + '\033[1;m'
-crimson = lambda(text) : '\033[1;38m' + str(text) + '\033[1;m'
-bgred = lambda(text) : '\033[1;41m' + str(text) + '\033[1;m'
-bggreen = lambda(text) : '\033[1;42m' + str(text) + '\033[1;m'
-bgbrown = lambda(text) : '\033[1;43m' + str(text) + '\033[1;m'
-bgblue = lambda(text) : '\033[1;44m' + str(text) + '\033[1;m'
-bgmagenta = lambda(text) : '\033[1;45m' + str(text) + '\033[1;m'
-bgcyan = lambda(text) : '\033[1;46m' + str(text) + '\033[1;m'
-bggray = lambda(text) : '\033[1;47m' + str(text) + '\033[1;m'
-bgcrimson = lambda(text) : '\033[1;48m' + str(text) + '\033[1;m'
+global ANSI
+ANSI = {
+    'gray' : lambda(text) : '\033[1;30m' + str(text) + '\033[1;m',
+    'red' : lambda(text) : '\033[1;31m' + str(text) + '\033[1;m',
+    'green' : lambda(text) : '\033[1;32m' + str(text) + '\033[1;m',
+    'yellow' : lambda(text) : '\033[1;33m' + str(text) + '\033[1;m',
+    'blue' : lambda(text) : '\033[1;34m' + str(text) + '\033[1;m',
+    'magenta' : lambda(text) : '\033[1;35m' + str(text) + '\033[1;m',
+    'cyan' : lambda(text) : '\033[1;36m' + str(text) + '\033[1;m',
+    'white' : lambda(text) : '\033[1;37m' + str(text) + '\033[1;m',
+    'crimson' : lambda(text) : '\033[1;38m' + str(text) + '\033[1;m',
+    'bgred' : lambda(text) : '\033[1;41m' + str(text) + '\033[1;m',
+    'bggreen' : lambda(text) : '\033[1;42m' + str(text) + '\033[1;m',
+    'bgbrown' : lambda(text) : '\033[1;43m' + str(text) + '\033[1;m',
+    'bgblue' : lambda(text) : '\033[1;44m' + str(text) + '\033[1;m',
+    'bgmagenta' : lambda(text) : '\033[1;45m' + str(text) + '\033[1;m',
+    'bgcyan' : lambda(text) : '\033[1;46m' + str(text) + '\033[1;m',
+    'bggray' : lambda(text) : '\033[1;47m' + str(text) + '\033[1;m',
+    'bgcrimson' : lambda(text) : '\033[1;48m' + str(text) + '\033[1;m'
+}
 
-
-class Formatter(logging.Formatter):
+class ANSIFormatter(logging.Formatter):
+    """
+    Convert a `logging.LogReport' object into colored text, using ANSI escape sequences.
+    """
+    ## colors:
 
     def format(self, record):
-        if record.levelname is 'INFO':
-            return record.msg
+        if not record.levelname or record.levelname is 'INFO':
+            return ANSI['cyan'](record.msg)
         elif record.levelname is 'WARNING':
-            return yellow(record.levelname) + ': ' + record.msg
+            return ANSI['yellow'](record.levelname) + ': ' + record.msg
         elif record.levelname is 'ERROR':
-            return red(record.levelname) + ': ' + record.msg
+            return ANSI['red'](record.levelname) + ': ' + record.msg
         elif record.levelname is 'CRITICAL':
-            return bgred(record.levelname) + ': ' + record.msg
+            return ANSI['bgred'](record.levelname) + ': ' + record.msg
+
+
+class TextFormatter(logging.Formatter):
+    """
+    Convert a `logging.LogReport' object into text.
+    """
+
+    def format(self, record):
+        if not record.levelname or record.levelname is 'INFO':
+            return record.msg
+        else:
+            return record.levelname + ': ' + record.msg
+
+
+class Formatter(object):
+    """
+    A dummy class.
+    Return an instance of the appropriate formatter (ANSIFormatter if sys.stdout.isatty() is True, else TextFormatter)
+    """
+
+    def __new__(cls, *args, **kwargs):
+        if os.isatty(sys.stdout.fileno()): # thanks to http://stackoverflow.com/questions/2086961/how-can-i-determine-if-a-python-script-is-executed-from-crontab/2087031#2087031
+            return ANSIFormatter(*args, **kwargs)
+        else:
+            return TextFormatter( *args, **kwargs)
+
+
 
 def init(logger=logging.getLogger(), handler=logging.StreamHandler()):
     fmt = Formatter()
     handler.setFormatter(fmt)
     logger.addHandler(handler)
-    logger.setLevel(logging.INFO)
 
 init()
 
-
-logging.info('info')
-logging.warning('warning')
-logging.error('error')
-logging.critical('critical')
+if __name__ == '__main__':
+    logging.basicConfig(filename='example.log',level=logging.DEBUG)
+    logging.debug('Logging test')
+    logging.info('info')
+    logging.warning('warning')
+    logging.error('error')
+    logging.critical('critical')
 

From 834c952f20ccddc0b416d4f636a2beb4365a6c0b Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Tue, 19 Apr 2011 11:49:24 +0200
Subject: [PATCH 0248/2864] Added shortcuts functions in the `log' module

---
 pelican/log.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pelican/log.py b/pelican/log.py
index e6769d28..798180b5 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -66,6 +66,14 @@ class Formatter(object):
 
 
 
+# shortcuts
+debug, info, warn, error, critical = (logging.debug,
+                                      logging.info,
+                                      logging.warn,
+                                      logging.error,
+                                      logging.critical)
+
+
 def init(logger=logging.getLogger(), handler=logging.StreamHandler()):
     fmt = Formatter()
     handler.setFormatter(fmt)

From 3166e6dfe360af4457b8f5e2554b37f1557a241d Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Tue, 19 Apr 2011 14:49:46 +0200
Subject: [PATCH 0249/2864] =?UTF-8?q?Calls=20to=20=C2=ABprint=C2=BB=20repl?=
 =?UTF-8?q?aced=20by=20the=20=C2=ABpelican.log=C2=BB=20module.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pelican/__init__.py   | 13 ++++++++++++-
 pelican/contents.py   |  4 ++--
 pelican/generators.py |  7 ++++---
 pelican/log.py        | 12 +++++++++---
 pelican/utils.py      |  5 +++--
 pelican/writers.py    |  5 +++--
 6 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index e1636149..1b73fc97 100755
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -7,6 +7,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
 from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
+from pelican import log
 
 VERSION = "2.6.0"
 
@@ -103,6 +104,12 @@ def main():
             action='store_true',
         help='Keep the output directory and just update all the generated files.'
              'Default is to delete the output directory.')
+    parser.add_argument('-v', '--verbose', action='store_const', const=log.INFO, dest='verbosity',
+            help='Show all messages')
+    parser.add_argument('-q', '--quiet', action='store_const', const=log.CRITICAL, dest='verbosity',
+            help='Show only critical errors')
+    parser.add_argument('-D', '--debug', action='store_const', const=log.DEBUG, dest='verbosity',
+            help='Show all message, including debug messages')
     parser.add_argument('--version', action='version', version=VERSION,
             help='Print the pelican version and exit')
     parser.add_argument('-r', '--autoreload', dest='autoreload', action='store_true',
@@ -110,6 +117,7 @@ def main():
                  "files")
     args = parser.parse_args()
 
+    log.init(args.verbosity)
     # Split the markup languages only if some have been given. Otherwise, populate
     # the variable with None.
     markup = [a.strip().lower() for a in args.markup.split(',')] if args.markup else None
@@ -134,7 +142,10 @@ def main():
             except KeyboardInterrupt:
                 break
     else:
-        pelican.run()
+        try:
+            pelican.run()
+        except Exception, e:
+            log.critical(str(e))
 
 
 if __name__ == '__main__':
diff --git a/pelican/contents.py b/pelican/contents.py
index 7097e946..dc6bfceb 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from pelican.utils import slugify, truncate_html_words
-
+from pelican.log import *
 
 class Page(object):
     """Represents a page
@@ -91,5 +91,5 @@ def is_valid_content(content, f):
         content.check_properties()
         return True
     except NameError as e:
-        print u" [info] Skipping %s: impossible to find informations about '%s'" % (f, e)
+        error(u"Skipping %s: impossible to find informations about '%s'" % (f, e))
         return False
diff --git a/pelican/generators.py b/pelican/generators.py
index e87f7cea..5a1f71b7 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -14,6 +14,7 @@ from jinja2.exceptions import TemplateNotFound
 from pelican.utils import copytree, get_relative_path, process_translations, open
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
+from pelican.log import *
 
 
 class Generator(object):
@@ -321,7 +322,7 @@ class PdfGenerator(Generator):
             output_pdf=os.path.join(output_path, filename)
             # print "Generating pdf for", obj.filename, " in ", output_pdf
             self.pdfcreator.createPdf(text=open(obj.filename), output=output_pdf)
-            print u' [ok] writing %s' % output_pdf
+            info(u' [ok] writing %s' % output_pdf)
     
     def generate_context(self):
         pass
@@ -329,12 +330,12 @@ class PdfGenerator(Generator):
     def generate_output(self, writer=None):
         # we don't use the writer passed as argument here
         # since we write our own files
-        print u' Generating PDF files...'
+        info(u' Generating PDF files...')
         pdf_path = os.path.join(self.output_path, 'pdf')
         try:
             os.mkdir(pdf_path)
         except OSError:
-            print "Couldn't create the pdf output folder in ", pdf_path
+            error("Couldn't create the pdf output folder in " + pdf_path)
             pass
 
         for article in self.context['articles']:
diff --git a/pelican/log.py b/pelican/log.py
index 798180b5..8229e0d2 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -31,7 +31,7 @@ class ANSIFormatter(logging.Formatter):
 
     def format(self, record):
         if not record.levelname or record.levelname is 'INFO':
-            return ANSI['cyan'](record.msg)
+            return ANSI['white'](record.msg)
         elif record.levelname is 'WARNING':
             return ANSI['yellow'](record.levelname) + ': ' + record.msg
         elif record.levelname is 'ERROR':
@@ -72,16 +72,22 @@ debug, info, warn, error, critical = (logging.debug,
                                       logging.warn,
                                       logging.error,
                                       logging.critical)
+DEBUG, INFO, WARN, ERROR, CRITICAL = (logging.DEBUG,
+                                      logging.INFO,
+                                      logging.WARN,
+                                      logging.ERROR,
+                                      logging.CRITICAL)
 
 
-def init(logger=logging.getLogger(), handler=logging.StreamHandler()):
+def init(level=None, logger=logging.getLogger(), handler=logging.StreamHandler()):
     fmt = Formatter()
     handler.setFormatter(fmt)
     logger.addHandler(handler)
+    if level:   logger.setLevel(level)
 
-init()
 
 if __name__ == '__main__':
+    init()
     logging.basicConfig(filename='example.log',level=logging.DEBUG)
     logging.debug('Logging test')
     logging.info('info')
diff --git a/pelican/utils.py b/pelican/utils.py
index 4fe9820f..732b1830 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -6,6 +6,7 @@ from datetime import datetime
 from codecs import open as _open
 from itertools import groupby
 from operator import attrgetter
+from pelican.log import *
 
 
 def get_date(string):
@@ -50,7 +51,7 @@ def copytree(path, origin, destination, topath=None):
         fromp = os.path.expanduser(os.path.join(origin, path))
         to = os.path.expanduser(os.path.join(destination, topath))
         shutil.copytree(fromp, to)
-        print u' [ok] copying %s to %s' % (fromp, to)
+        info('copying %s to %s' % (fromp, to))
 
     except OSError:
         pass
@@ -162,7 +163,7 @@ def process_translations(content_list):
         )
         len_ = len(default_lang_items)
         if len_ > 1:
-            print u' [warning] there are %s variants of "%s"' % (len_, slug)
+            warning(u'there are %s variants of "%s"' % (len_, slug))
         elif len_ == 0:
             default_lang_items = items[:1]
 
diff --git a/pelican/writers.py b/pelican/writers.py
index 2b168bcb..ae407743 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -8,6 +8,7 @@ import locale
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 from pelican.utils import get_relative_path
 from pelican.paginator import Paginator
+from pelican.log import *
 
 
 class Writer(object):
@@ -68,7 +69,7 @@ class Writer(object):
                     pass
                 fp = open(complete_path, 'w')
                 feed.write(fp, 'utf-8')
-                print u' [ok] writing %s' % complete_path
+                info('writing %s' % complete_path)
 
                 fp.close()
             return feed
@@ -103,7 +104,7 @@ class Writer(object):
                 pass
             with open(filename, 'w', encoding='utf-8') as f:
                 f.write(output)
-            print u' [ok] writing %s' % filename
+            info(u'writing %s' % filename)
 
         localcontext = context.copy()
         if relative_urls:

From af1bc749e1025fba18fd0a21f7f5f71de6c65f8f Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Tue, 19 Apr 2011 15:08:04 +0200
Subject: [PATCH 0250/2864] Removed a bug related to unicode

---
 pelican/log.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index 8229e0d2..ebe1df5b 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -4,23 +4,23 @@ import os
 
 global ANSI
 ANSI = {
-    'gray' : lambda(text) : '\033[1;30m' + str(text) + '\033[1;m',
-    'red' : lambda(text) : '\033[1;31m' + str(text) + '\033[1;m',
-    'green' : lambda(text) : '\033[1;32m' + str(text) + '\033[1;m',
-    'yellow' : lambda(text) : '\033[1;33m' + str(text) + '\033[1;m',
-    'blue' : lambda(text) : '\033[1;34m' + str(text) + '\033[1;m',
-    'magenta' : lambda(text) : '\033[1;35m' + str(text) + '\033[1;m',
-    'cyan' : lambda(text) : '\033[1;36m' + str(text) + '\033[1;m',
-    'white' : lambda(text) : '\033[1;37m' + str(text) + '\033[1;m',
-    'crimson' : lambda(text) : '\033[1;38m' + str(text) + '\033[1;m',
-    'bgred' : lambda(text) : '\033[1;41m' + str(text) + '\033[1;m',
-    'bggreen' : lambda(text) : '\033[1;42m' + str(text) + '\033[1;m',
-    'bgbrown' : lambda(text) : '\033[1;43m' + str(text) + '\033[1;m',
-    'bgblue' : lambda(text) : '\033[1;44m' + str(text) + '\033[1;m',
-    'bgmagenta' : lambda(text) : '\033[1;45m' + str(text) + '\033[1;m',
-    'bgcyan' : lambda(text) : '\033[1;46m' + str(text) + '\033[1;m',
-    'bggray' : lambda(text) : '\033[1;47m' + str(text) + '\033[1;m',
-    'bgcrimson' : lambda(text) : '\033[1;48m' + str(text) + '\033[1;m'
+    'gray' : lambda(text) : '\033[1;30m' + unicode(text) + '\033[1;m',
+    'red' : lambda(text) : '\033[1;31m' + unicode(text) + '\033[1;m',
+    'green' : lambda(text) : '\033[1;32m' + unicode(text) + '\033[1;m',
+    'yellow' : lambda(text) : '\033[1;33m' + unicode(text) + '\033[1;m',
+    'blue' : lambda(text) : '\033[1;34m' + unicode(text) + '\033[1;m',
+    'magenta' : lambda(text) : '\033[1;35m' + unicode(text) + '\033[1;m',
+    'cyan' : lambda(text) : '\033[1;36m' + unicode(text) + '\033[1;m',
+    'white' : lambda(text) : '\033[1;37m' + unicode(text) + '\033[1;m',
+    'crimson' : lambda(text) : '\033[1;38m' + unicode(text) + '\033[1;m',
+    'bgred' : lambda(text) : '\033[1;41m' + unicode(text) + '\033[1;m',
+    'bggreen' : lambda(text) : '\033[1;42m' + unicode(text) + '\033[1;m',
+    'bgbrown' : lambda(text) : '\033[1;43m' + unicode(text) + '\033[1;m',
+    'bgblue' : lambda(text) : '\033[1;44m' + unicode(text) + '\033[1;m',
+    'bgmagenta' : lambda(text) : '\033[1;45m' + unicode(text) + '\033[1;m',
+    'bgcyan' : lambda(text) : '\033[1;46m' + unicode(text) + '\033[1;m',
+    'bggray' : lambda(text) : '\033[1;47m' + unicode(text) + '\033[1;m',
+    'bgcrimson' : lambda(text) : '\033[1;48m' + unicode(text) + '\033[1;m'
 }
 
 class ANSIFormatter(logging.Formatter):

From 93e62c633661930c8c2e32d68ad6b79941a8d7f2 Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Mon, 18 Apr 2011 23:21:57 +0800
Subject: [PATCH 0251/2864] fix issue #91

---
 pelican/generators.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 5a1f71b7..cc33c9f0 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -232,13 +232,13 @@ class ArticlesGenerator(Generator):
         if tags:
                 max_count = max(tags)
         steps = self.settings.get('TAG_CLOUD_STEPS')
-
+        
         # calculate word sizes
         self.tag_cloud = [
             (
                 tag,
                 int(
-                    math.floor(steps - (steps - 1) * math.log(count) / math.log(max_count))
+                    math.floor(steps - (steps - 1) * math.log(count) / (math.log(max_count)or 1))
                 )
             )
             for tag, count in tag_cloud

From f8f59502b5b79ffe952cc30dd6ee9bd47f008f00 Mon Sep 17 00:00:00 2001
From: Alessandro Martin <metallourlante@gmail.com>
Date: Mon, 11 Apr 2011 20:04:52 +0800
Subject: [PATCH 0252/2864] Fixed some typos and added links in README

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 5cf557fa..ae132095 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,10 @@
 Pelican
 #######
 
-Pelican is a simple weblog generator, writen in python.
+Pelican is a simple weblog generator, written in `Python <http://www.python.org/>`_.
 
 * Write your weblog entries directly with your editor of choice (vim!) and
-  directly in restructured text, or markdown.
+  directly in `reStructuredText <http://docutils.sourceforge.net/rst.html>`_, or `Markdown <http://daringfireball.net/projects/markdown/>`_.
 * A simple cli-tool to (re)generate the weblog.
 * Easy to interface with DVCSes and web hooks
 * Completely static output, so easy to host anywhere !

From c421956cd9de994b9f8c13f20c2a1280ec122fb0 Mon Sep 17 00:00:00 2001
From: Alessandro Martin <metallourlante@gmail.com>
Date: Tue, 12 Apr 2011 02:17:42 +0800
Subject: [PATCH 0253/2864] Modified Generator Base Class in order to pass
 custom Jinja filters in settings.py

---
 pelican/generators.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index cc33c9f0..569d5f50 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -35,6 +35,10 @@ class Generator(object):
             loader=FileSystemLoader(self._templates_path),
             extensions=self.settings.get('JINJA_EXTENSIONS', []),
         )
+        
+        # get custom Jinja filters from user settings
+        custom_filters = self.settings.get('JINJA_FILTERS', {})
+        self._env.filters.update(custom_filters)
 
     def get_template(self, name):
         """Return the template by name.

From 698686e1d432f09e2ed89a3cdbfd2d7c8fe40b09 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 20 Apr 2011 14:44:25 +0200
Subject: [PATCH 0254/2864] Catch all exceptions in __init__

---
 pelican/__init__.py | 29 +++++++++++++++--------------
 pelican/log.py      |  3 ++-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 1b73fc97..497e5d0d 100755
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -20,7 +20,9 @@ class Pelican(object):
         """
         self.path = path or settings['PATH']
         if not self.path:
-            raise Exception('you need to specify a path to search the docs on !')
+            raise Exception('you need to specify a path containing the content'
+                    ' (see pelican --help for more information)')
+
         if self.path.endswith('/'):
             self.path = path[:-1]
 
@@ -132,20 +134,19 @@ def main():
         module = __import__(module)
         cls = getattr(module, cls_name)
 
-    pelican = cls(settings, args.path, args.theme, args.output, markup, args.keep)
-
-    if args.autoreload:
-        while True:
-            try:
-                if files_changed(pelican.path, pelican.markup):
-                    pelican.run()
-            except KeyboardInterrupt:
-                break
-    else:
-        try:
+    try:
+        pelican = cls(settings, args.path, args.theme, args.output, markup, args.keep)
+        if args.autoreload:
+            while True:
+                try:
+                    if files_changed(pelican.path, pelican.markup):
+                        pelican.run()
+                except KeyboardInterrupt:
+                    break
+        else:
             pelican.run()
-        except Exception, e:
-            log.critical(str(e))
+    except Exception, e:
+        log.critical(str(e))
 
 
 if __name__ == '__main__':
diff --git a/pelican/log.py b/pelican/log.py
index ebe1df5b..b895ad66 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -83,7 +83,8 @@ def init(level=None, logger=logging.getLogger(), handler=logging.StreamHandler()
     fmt = Formatter()
     handler.setFormatter(fmt)
     logger.addHandler(handler)
-    if level:   logger.setLevel(level)
+    if level:
+        logger.setLevel(level)
 
 
 if __name__ == '__main__':

From c749f610c5a6fdea02d7306dbf323ed679b9e335 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 20 Apr 2011 16:17:36 +0200
Subject: [PATCH 0255/2864] add a markdown article for tests purposes

---
 samples/content/cat1/markdown-article.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 samples/content/cat1/markdown-article.md

diff --git a/samples/content/cat1/markdown-article.md b/samples/content/cat1/markdown-article.md
new file mode 100644
index 00000000..3bf56dc0
--- /dev/null
+++ b/samples/content/cat1/markdown-article.md
@@ -0,0 +1,4 @@
+Title: A markdown powered article
+Date: 2011-04-20
+
+You're mutually oblivious.

From 105b5c2863bfa4e578bcd92533e51595fcfd3495 Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Thu, 21 Apr 2011 17:10:00 +0200
Subject: [PATCH 0256/2864] Add subtitle

---
 pelican/readers.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index 4e1d7b2e..6d0b6cea 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -49,9 +49,14 @@ class RstReader(Reader):
         rendered_content = core.publish_parts(text, writer_name='html',
                                               settings_overrides=extra_params)
         title = rendered_content.get('title')
+        subtitle = rendered_content.get('subtitle') or ''
         content = rendered_content.get('body')
+        
         if not metadatas.has_key('title'):
             metadatas['title'] = title
+        if not metadatas.has_key('subtitle'):
+            metadatas['subtitle'] = subtitle
+            
         return content, metadatas
 
 class MarkdownReader(Reader):

From a65cfe62378c2392af0300ab40ea0939ea902c96 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 21 Apr 2011 19:26:12 +0200
Subject: [PATCH 0257/2864] add a test metadata for #98

---
 samples/content/another_super_article.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/content/another_super_article.rst b/samples/content/another_super_article.rst
index abe8d26c..5ec1e2b8 100644
--- a/samples/content/another_super_article.rst
+++ b/samples/content/another_super_article.rst
@@ -6,6 +6,7 @@ Oh yeah !
 :category: bar
 :author: Alexis Métaireau
 :slug: oh-yeah
+:license: WTFPL
 
 Why not ?
 =========

From 34d88bb13cb53534d2ce7c76a12fd6ad0b49f494 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 24 Apr 2011 13:05:40 +0200
Subject: [PATCH 0258/2864] =?UTF-8?q?Add=20documentation=20about=20the=20R?=
 =?UTF-8?q?ELATIVE=5FURLS=20setting.=20Thanks=20to=20G=C3=BCnter=20Kolouse?=
 =?UTF-8?q?k.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 THANKS            | 1 +
 docs/settings.rst | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/THANKS b/THANKS
index 078a67d1..4a8a52a5 100644
--- a/THANKS
+++ b/THANKS
@@ -14,3 +14,4 @@ bugs or giving ideas. Thanks to them !
 - Laureline Guérin
 - Samuel Martin
 - Marcus Fredriksson
+- Günter Kolousek
diff --git a/docs/settings.rst b/docs/settings.rst
index 67039832..e3f4a94e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -63,11 +63,16 @@ Setting name                what it does ?
 `PATH`                      path to look at for input files.
 `PDF_PROCESSOR`             Put True if you want to have PDF versions of your
                             documents. You will need to install `rst2pdf`.
+`RELATIVE_URL`              Defines if pelican should use relative urls or not.
+                            It is set to True per default.
 `REVERSE_ARCHIVE_ORDER`     Reverse the archives order. (True makes it in
                             descending order: the newer first)
 `REVERSE_CATEGORY_ORDER`    Reverse the category order. (True makes it in
                             descending order, default is alphabetically)
-`SITEURL`                   base URL of your website.
+`SITEURL`                   base URL of your website. Note that this is not
+                            a way to tell pelican to use relative urls or
+                            static ones. You should rather use the `RELATIVE_URL`
+                            setting for such use.
 `SITENAME`                  Your site name,
 `SKRIBIT_TYPE`              The type of skribit widget (TAB or WIDGET).
 `SKRIBIT_TAB_COLOR`         Tab color (#XXXXXX, default #333333).

From 94ce3bea645b93840513763de2a15a68b10ee71a Mon Sep 17 00:00:00 2001
From: Simon Liedtke <liedtke.simon@googlemail.com>
Date: Sun, 24 Apr 2011 09:05:38 -0700
Subject: [PATCH 0259/2864] Pelican is an "it", not a "he"

---
 docs/getting_started.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index d90e1fe8..fc2e171e 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -38,7 +38,7 @@ Writing articles using pelican
 Files metadata
 --------------
 
-Pelican tries to be smart enough to get the informations he needs from the
+Pelican tries to be smart enough to get the informations it needs from the
 file system (for instance, about the category of your articles), but you need to
 provide by hand some of those informations in your files.
 

From fcab48a5e5ee67cbf467a107864fbee6f89066d1 Mon Sep 17 00:00:00 2001
From: Simon Liedtke <liedtke.simon@googlemail.com>
Date: Sun, 24 Apr 2011 09:24:05 -0700
Subject: [PATCH 0260/2864] removed unused import

---
 pelican/__init__.py | 1 -
 1 file changed, 1 deletion(-)
 mode change 100755 => 100644 pelican/__init__.py

diff --git a/pelican/__init__.py b/pelican/__init__.py
old mode 100755
new mode 100644
index 497e5d0d..195ada34
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,6 +1,5 @@
 import argparse
 import os
-from functools import partial
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator)

From c9f9f4e500575eee44b5376acfcdbf13f518b176 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 25 Apr 2011 00:33:55 +0200
Subject: [PATCH 0261/2864] include the default values of the settings in the
 1st column in parens

this way, it is much easier for the reader to see which variable has which
default value. I also added some default values which could not be found in
the documentation before.
---
 docs/settings.rst | 157 +++++++++++++++++++++++-----------------------
 1 file changed, 79 insertions(+), 78 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e3f4a94e..498f60cd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -20,84 +20,85 @@ Here are the available settings. Please note that all the settings you put in
 this file will be passed to the templates as well.
 
 
-========================    =======================================================
-Setting name                what it does ?
-========================    =======================================================
-`AUTHOR`                    Default author (put your name)
-`CATEGORY_FEED`             Where to put the atom categories feeds. default is
-                            `feeds/%s.atom.xml`, where %s is the name of the
-                            category.
-`CATEGORY_FEED_RSS`         Where to put the categories rss feeds. default is None
-                            (no rss)
-`CSS_FILE`                  To specify the CSS file you want to load, if it's not
-                            the default one ('main.css')
-`DATE_FORMATS`              If you do manage multiple languages, you can set
-                            the date formatting here.
-`DEFAULT_CATEGORY`          The default category to fallback on. `misc` by default.
-`DEFAULT_DATE_FORMAT`       The default date format you want to use.
-`DEFAULT_LANG`              The default language to use. Default is 'en'.
-`DEFAULT_ORPHANS`           The minimum number of articles allowed on the last
-                            page, defaults to zero. Use this when you don't want
-                            to have a last page with very few articles.
-`DEFAULT_PAGINATION`        The maximum number of articles to include on a page,
-                            not including orphans. Default is 5.
-`DISPLAY_PAGES_ON_MENU`     Display or not the pages on the menu of the template.
-                            Templates can follow or not this settings.
-`FALLBACK_ON_FS_DATE`       If True, pelican will use the file system dates infos
-                            (mtime) if it can't get informations from the
-                            metadata?
-`FEED`                      relative url to output the atom feed. Default is
-                            `feeds/all.atom.xml`
-`FEED_RSS`                  relative url to output the rss feed. Default is
-                            None (no rss)
-`JINJA_EXTENSIONS`          A list of any Jinja2 extensions you want to use.
-                            Default is no extensions (the empty list).
-`KEEP_OUTPUT_DIRECTORY`     Keep the output directory and just update all the 
-                            generated files. 
-`LOCALE`                    Change the locale. Default is the system locale.
-                            Default is to delete the output directory.   
-`MARKUP`                    A list of available markup languages you want to use.
-                            For the moment, only available values are `rst` and `md`.
-`OUTPUT_PATH`               Where to output the generated files. Default to
-                            "output"
-`PATH`                      path to look at for input files.
-`PDF_PROCESSOR`             Put True if you want to have PDF versions of your
-                            documents. You will need to install `rst2pdf`.
-`RELATIVE_URL`              Defines if pelican should use relative urls or not.
-                            It is set to True per default.
-`REVERSE_ARCHIVE_ORDER`     Reverse the archives order. (True makes it in
-                            descending order: the newer first)
-`REVERSE_CATEGORY_ORDER`    Reverse the category order. (True makes it in
-                            descending order, default is alphabetically)
-`SITEURL`                   base URL of your website. Note that this is not
-                            a way to tell pelican to use relative urls or
-                            static ones. You should rather use the `RELATIVE_URL`
-                            setting for such use.
-`SITENAME`                  Your site name,
-`SKRIBIT_TYPE`              The type of skribit widget (TAB or WIDGET).
-`SKRIBIT_TAB_COLOR`         Tab color (#XXXXXX, default #333333).
-`SKRIBIT_TAB_HORIZ`         Tab Distance from Left (% or distance, default Null).
-`SKRIBIT_TAB_VERT`          Tab Distance from Top (% or distance, default 20%).
-`SKRIBIT_TAB_PLACEMENT`     Tab placement (Top, Bottom, Left or Right, default
-                            LEFT).
-`SKRIBIT_TAB_SITENAME`      Tab identifier (See Skribit part below).
-`SKRIBIT_WIDGET_ID`         Widget identifier (See Skribit part below).
-`STATIC_PATHS`              The static paths you want to have accessible on the
-                            output path "static". By default, pelican will copy
-                            the 'images' folder to the output folder.
-`STATIC_THEME_PATHS`        Static theme paths you want to copy. Default values
-                            is `static`, but if your theme have others static paths,
-                            you can put them here.
-`TAG_CLOUD_STEPS`           Count of different font sizes in the tag cloud.
-`TAG_CLOUD_MAX_ITEMS`       Maximum tags count in the cloud.
-`THEME`                     theme to use to product the output. can be the
-                            complete static path to a theme folder, or chosen
-                            between the list of default themes (see below)
-`TRANSLATION_FEED`          Where to put the RSS feed for translations. Default
-                            is feeds/all-%s.atom.xml where %s is the name of the
-                            lang.
-`WITH_PAGINATION`           Activate pagination. Default is False.
-========================    =======================================================
+================================================    =====================================================
+Setting name (default value)                        what does it do?                              
+================================================    =====================================================
+`AUTHOR`                                            Default author (put your name)
+`CATEGORY_FEED` ('feeds/%s.atom.xml'[1]_)           Where to put the atom categories feeds.
+`CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the categories rss feeds.
+`CSS_FILE` (``'main.css'``)                         specify the CSS file you want to load
+`DATE_FORMATS` (``{}``)                             If you do manage multiple languages, you can
+                                                    set the date formatting here.
+`DEFAULT_CATEGORY` (``'misc'``)                     The default category to fallback on.
+`DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)           The default date format you want to use.
+`DEFAULT_LANG` (``'en'``)                           The default language to use.
+`DEFAULT_ORPHANS` (0)                               The minimum number of articles allowed on the
+                                                    last page. Use this when you don't want to
+                                                    have a last page with very few articles.
+`DEFAULT_PAGINATION` (5)                            The maximum number of articles to include on a
+                                                    page, not including orphans.
+`DISPLAY_PAGES_ON_MENU` (``True``)                  Display or not the pages on the menu of the
+                                                    template. Templates can follow or not this
+                                                    settings.
+`FALLBACK_ON_FS_DATE` (``True``)                    If True, pelican will use the file system
+                                                    dates infos (mtime) if it can't get
+                                                    informations from the metadata?
+`FEED` (``'feeds/all.atom.xml'``)                   relative url to output the atom feed.
+`FEED_RSS` (``None``, i.e. no RSS)                  relative url to output the rss feed.
+`JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.
+`KEEP_OUTPUT_DIRECTORY` (``False``)                 Keep the output directory and just update all
+                                                    the generated files.
+`LOCALE` (''[2]_)                                   Change the locale.
+`MARKUP` (``('rst', 'md')``)                        A list of available markup languages you want
+                                                    to use. For the moment, only available values
+                                                    are `rst` and `md`.
+`OUTPUT_PATH` (``'output/'``)                       Where to output the generated files.
+`PATH` (``None``)                                   path to look at for input files.
+`PDF_PROCESSOR` (``False``)                         Set to True if you want to have PDF versions
+                                                    of your documents. You will need to install
+                                                    `rst2pdf`.
+`RELATIVE_URL` (``True``)                           Defines if pelican should use relative urls or
+                                                    not.
+`REVERSE_ARCHIVE_ORDER` (``False``)                 Reverse the archives order. (True makes it in
+                                                    descending order: the newer first)
+`REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True makes it in
+                                                    descending order, default is alphabetically)
+`SITEURL`                                           base URL of your website. Note that this is
+                                                    not a way to tell pelican to use relative urls
+                                                    or static ones. You should rather use the
+                                                    `RELATIVE_URL` setting for such use.
+`SITENAME` (``'A Pelican Blog'``)                   Your site name,
+`SKRIBIT_TYPE`                                      The type of skribit widget (TAB or WIDGET).
+`SKRIBIT_TAB_COLOR`                                 Tab color (#XXXXXX, default #333333).
+`SKRIBIT_TAB_HORIZ`                                 Tab Distance from Left (% or distance, default Null).
+`SKRIBIT_TAB_VERT`                                  Tab Distance from Top (% or distance, default 20%).
+`SKRIBIT_TAB_PLACEMENT`                             Tab placement (Top, Bottom, Left or Right,
+                                                    default LEFT).
+`SKRIBIT_TAB_SITENAME`                              Tab identifier (See Skribit part below).
+`SKRIBIT_WIDGET_ID`                                 Widget identifier (See Skribit part below).
+`STATIC_PATHS`                                      The static paths you want to have accessible
+(``['images']``)                                    on the output path "static". By default,
+                                                    pelican will copy the 'images' folder to the
+                                                    output folder.
+`STATIC_THEME_PATHS` (``['static']``)               Static theme paths you want to copy. Default
+                                                    values is `static`, but if your theme have
+                                                    others static paths, you can put them here.
+`TAG_CLOUD_STEPS` (4)                               Count of different font sizes in the tag
+                                                    cloud.
+`TAG_CLOUD_MAX_ITEMS` (100)                         Maximum tags count in the cloud.
+`THEME`                                             theme to use to product the output. can be the
+                                                    complete static path to a theme folder, or
+                                                    chosen between the list of default themes (see
+                                                    below)
+`TRANSLATION_FEED` ('feeds/all-%s.atom.xml'[3]_)    Where to put the RSS feed for translations.
+`WITH_PAGINATION` (``False``)                       Activate pagination.
+================================================    =====================================================
+
+.. [1] %s is the name of the category.
+
+.. [2] Default is the system locale. Default is to delete the output directory.
+
+.. [3] %s is the language
 
 Skribit
 =======

From b602e3799de3fe09065dc2795f3372aebca83009 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 25 Apr 2011 00:36:15 +0200
Subject: [PATCH 0262/2864] fixed the writings of two variable names in the
 settings table

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 498f60cd..66152a3e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -54,7 +54,7 @@ Setting name (default value)                        what does it do?
                                                     are `rst` and `md`.
 `OUTPUT_PATH` (``'output/'``)                       Where to output the generated files.
 `PATH` (``None``)                                   path to look at for input files.
-`PDF_PROCESSOR` (``False``)                         Set to True if you want to have PDF versions
+`PDF_GENERATOR` (``False``)                         Set to True if you want to have PDF versions
                                                     of your documents. You will need to install
                                                     `rst2pdf`.
 `RELATIVE_URL` (``True``)                           Defines if pelican should use relative urls or
@@ -80,7 +80,7 @@ Setting name (default value)                        what does it do?
 (``['images']``)                                    on the output path "static". By default,
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
-`STATIC_THEME_PATHS` (``['static']``)               Static theme paths you want to copy. Default
+`THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
                                                     values is `static`, but if your theme have
                                                     others static paths, you can put them here.
 `TAG_CLOUD_STEPS` (4)                               Count of different font sizes in the tag

From 9e05b1fd51e3d00fcf0853373681df2740204b66 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 25 Apr 2011 00:38:15 +0200
Subject: [PATCH 0263/2864] various grammar fixes

---
 docs/settings.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 66152a3e..064bc64e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -81,12 +81,12 @@ Setting name (default value)                        what does it do?
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
 `THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
-                                                    values is `static`, but if your theme have
-                                                    others static paths, you can put them here.
+                                                    values is `static`, but if your theme has
+                                                    other static paths, you can put them here.
 `TAG_CLOUD_STEPS` (4)                               Count of different font sizes in the tag
                                                     cloud.
 `TAG_CLOUD_MAX_ITEMS` (100)                         Maximum tags count in the cloud.
-`THEME`                                             theme to use to product the output. can be the
+`THEME`                                             theme to use to produce the output. can be the
                                                     complete static path to a theme folder, or
                                                     chosen between the list of default themes (see
                                                     below)

From 6f89ffec837ac8df09d09548aba835db292b58e5 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 25 Apr 2011 00:39:21 +0200
Subject: [PATCH 0264/2864] removed a useless comma

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 064bc64e..a40ebbb9 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -67,7 +67,7 @@ Setting name (default value)                        what does it do?
                                                     not a way to tell pelican to use relative urls
                                                     or static ones. You should rather use the
                                                     `RELATIVE_URL` setting for such use.
-`SITENAME` (``'A Pelican Blog'``)                   Your site name,
+`SITENAME` (``'A Pelican Blog'``)                   Your site name
 `SKRIBIT_TYPE`                                      The type of skribit widget (TAB or WIDGET).
 `SKRIBIT_TAB_COLOR`                                 Tab color (#XXXXXX, default #333333).
 `SKRIBIT_TAB_HORIZ`                                 Tab Distance from Left (% or distance, default Null).

From e9364df4ed9318d9c5b1a4b8c8d880cd16d0d5a0 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 25 Apr 2011 00:40:42 +0200
Subject: [PATCH 0265/2864] removed a confusing question mark

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index a40ebbb9..795f220c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -42,7 +42,7 @@ Setting name (default value)                        what does it do?
                                                     settings.
 `FALLBACK_ON_FS_DATE` (``True``)                    If True, pelican will use the file system
                                                     dates infos (mtime) if it can't get
-                                                    informations from the metadata?
+                                                    informations from the metadata
 `FEED` (``'feeds/all.atom.xml'``)                   relative url to output the atom feed.
 `FEED_RSS` (``None``, i.e. no RSS)                  relative url to output the rss feed.
 `JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.

From 8732569a016bf08c653220f7535e32a47507600b Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Mon, 25 Apr 2011 12:13:44 +0200
Subject: [PATCH 0266/2864] Removed a bug (debug messages was not showed) and
 improved readability

---
 pelican/log.py | 98 ++++++++++++++++++++++++++------------------------
 1 file changed, 52 insertions(+), 46 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index b895ad66..72b7a017 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,46 +1,51 @@
-import logging
+from  logging import *
 import sys
 import os
 
 global ANSI
 ANSI = {
-    'gray' : lambda(text) : '\033[1;30m' + unicode(text) + '\033[1;m',
-    'red' : lambda(text) : '\033[1;31m' + unicode(text) + '\033[1;m',
-    'green' : lambda(text) : '\033[1;32m' + unicode(text) + '\033[1;m',
-    'yellow' : lambda(text) : '\033[1;33m' + unicode(text) + '\033[1;m',
-    'blue' : lambda(text) : '\033[1;34m' + unicode(text) + '\033[1;m',
-    'magenta' : lambda(text) : '\033[1;35m' + unicode(text) + '\033[1;m',
-    'cyan' : lambda(text) : '\033[1;36m' + unicode(text) + '\033[1;m',
-    'white' : lambda(text) : '\033[1;37m' + unicode(text) + '\033[1;m',
-    'crimson' : lambda(text) : '\033[1;38m' + unicode(text) + '\033[1;m',
-    'bgred' : lambda(text) : '\033[1;41m' + unicode(text) + '\033[1;m',
-    'bggreen' : lambda(text) : '\033[1;42m' + unicode(text) + '\033[1;m',
-    'bgbrown' : lambda(text) : '\033[1;43m' + unicode(text) + '\033[1;m',
-    'bgblue' : lambda(text) : '\033[1;44m' + unicode(text) + '\033[1;m',
-    'bgmagenta' : lambda(text) : '\033[1;45m' + unicode(text) + '\033[1;m',
-    'bgcyan' : lambda(text) : '\033[1;46m' + unicode(text) + '\033[1;m',
-    'bggray' : lambda(text) : '\033[1;47m' + unicode(text) + '\033[1;m',
-    'bgcrimson' : lambda(text) : '\033[1;48m' + unicode(text) + '\033[1;m'
+    'gray' : lambda(text) : u'\033[1;30m' + unicode(text) + u'\033[1;m',
+    'red' : lambda(text) : u'\033[1;31m' + unicode(text) + u'\033[1;m',
+    'green' : lambda(text) : u'\033[1;32m' + unicode(text) + u'\033[1;m',
+    'yellow' : lambda(text) : u'\033[1;33m' + unicode(text) + u'\033[1;m',
+    'blue' : lambda(text) : u'\033[1;34m' + unicode(text) + u'\033[1;m',
+    'magenta' : lambda(text) : u'\033[1;35m' + unicode(text) + u'\033[1;m',
+    'cyan' : lambda(text) : u'\033[1;36m' + unicode(text) + u'\033[1;m',
+    'white' : lambda(text) : u'\033[1;37m' + unicode(text) + u'\033[1;m',
+    'bgred' : lambda(text) : u'\033[1;41m' + unicode(text) + u'\033[1;m',
+    'bggreen' : lambda(text) : u'\033[1;42m' + unicode(text) + u'\033[1;m',
+    'bgbrown' : lambda(text) : u'\033[1;43m' + unicode(text) + u'\033[1;m',
+    'bgblue' : lambda(text) : u'\033[1;44m' + unicode(text) + u'\033[1;m',
+    'bgmagenta' : lambda(text) : u'\033[1;45m' + unicode(text) + u'\033[1;m',
+    'bgcyan' : lambda(text) : u'\033[1;46m' + unicode(text) + u'\033[1;m',
+    'bggray' : lambda(text) : u'\033[1;47m' + unicode(text) + u'\033[1;m',
+    'bgyellow' : lambda(text) : u'\033[1;43m' + unicode(text) + u'\033[1;m',
+    'bggrey' : lambda(text) : u'\033[1;100m' + unicode(text) + u'\033[1;m'
 }
 
-class ANSIFormatter(logging.Formatter):
+
+class ANSIFormatter(Formatter):
     """
     Convert a `logging.LogReport' object into colored text, using ANSI escape sequences.
     """
     ## colors:
 
     def format(self, record):
-        if not record.levelname or record.levelname is 'INFO':
-            return ANSI['white'](record.msg)
+        if record.levelname is 'INFO':
+            return ANSI['cyan']('-> ') + unicode(record.msg)
         elif record.levelname is 'WARNING':
-            return ANSI['yellow'](record.levelname) + ': ' + record.msg
+            return ANSI['yellow'](record.levelname) + ': ' + unicode(record.msg)
         elif record.levelname is 'ERROR':
-            return ANSI['red'](record.levelname) + ': ' + record.msg
+            return ANSI['red'](record.levelname) + ': ' + unicode(record.msg)
         elif record.levelname is 'CRITICAL':
-            return ANSI['bgred'](record.levelname) + ': ' + record.msg
+            return ANSI['bgred'](record.levelname) + ': ' + unicode(record.msg)
+        elif record.levelname is 'DEBUG':
+            return ANSI['bggrey'](record.levelname) + ': ' + unicode(record.msg)
+        else:
+            return ANSI['white'](record.levelname) + ': ' + unicode(record.msg)
 
 
-class TextFormatter(logging.Formatter):
+class TextFormatter(Formatter):
     """
     Convert a `logging.LogReport' object into text.
     """
@@ -52,7 +57,7 @@ class TextFormatter(logging.Formatter):
             return record.levelname + ': ' + record.msg
 
 
-class Formatter(object):
+class DummyFormatter(object):
     """
     A dummy class.
     Return an instance of the appropriate formatter (ANSIFormatter if sys.stdout.isatty() is True, else TextFormatter)
@@ -66,21 +71,10 @@ class Formatter(object):
 
 
 
-# shortcuts
-debug, info, warn, error, critical = (logging.debug,
-                                      logging.info,
-                                      logging.warn,
-                                      logging.error,
-                                      logging.critical)
-DEBUG, INFO, WARN, ERROR, CRITICAL = (logging.DEBUG,
-                                      logging.INFO,
-                                      logging.WARN,
-                                      logging.ERROR,
-                                      logging.CRITICAL)
 
 
-def init(level=None, logger=logging.getLogger(), handler=logging.StreamHandler()):
-    fmt = Formatter()
+def init(level=None, logger=getLogger(), handler=StreamHandler()):
+    fmt = DummyFormatter()
     handler.setFormatter(fmt)
     logger.addHandler(handler)
     if level:
@@ -88,11 +82,23 @@ def init(level=None, logger=logging.getLogger(), handler=logging.StreamHandler()
 
 
 if __name__ == '__main__':
-    init()
-    logging.basicConfig(filename='example.log',level=logging.DEBUG)
-    logging.debug('Logging test')
-    logging.info('info')
-    logging.warning('warning')
-    logging.error('error')
-    logging.critical('critical')
+    init(level=DEBUG)
+    debug('debug')
+    info('info')
+    warning('warning')
+    error('error')
+    critical('critical')
 
+
+__all__ = [
+    "debug", 
+    "info", 
+    "warn", 
+    "error", 
+    "critical", 
+    "DEBUG", 
+    "INFO", 
+    "WARN", 
+    "ERROR", 
+    "CRITICAL"
+] 

From 26b756d7d828d38ebc470b1d184daaf2b2941df3 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 25 Apr 2011 23:29:45 +0100
Subject: [PATCH 0267/2864] Thanks Simon Liedtke

---
 THANKS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/THANKS b/THANKS
index 4a8a52a5..39f54e61 100644
--- a/THANKS
+++ b/THANKS
@@ -15,3 +15,4 @@ bugs or giving ideas. Thanks to them !
 - Samuel Martin
 - Marcus Fredriksson
 - Günter Kolousek
+- Simon Liedtke

From 36cc74b224f8f939754299d0fc8dc0d165a7525c Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 25 Apr 2011 23:33:13 +0100
Subject: [PATCH 0268/2864] Little doc fix

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 795f220c..78cd0214 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -167,7 +167,7 @@ The `notmyidea` theme can make good use of the following settings. I recommend
 to use them too in your themes.
 
 =======================   =======================================================
-Setting name              what it does ?
+Setting name              what does it do ?
 =======================   =======================================================
 `DISQUS_SITENAME`         Pelican can handle disqus comments, specify the
                           sitename you've filled in on disqus

From 6b10d864075e131b46d96464f9f4a99b4cc4f357 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Tue, 26 Apr 2011 00:39:31 +0200
Subject: [PATCH 0269/2864] move a default value to the table cell it belongs
 to

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 795f220c..d4340006 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -76,8 +76,8 @@ Setting name (default value)                        what does it do?
                                                     default LEFT).
 `SKRIBIT_TAB_SITENAME`                              Tab identifier (See Skribit part below).
 `SKRIBIT_WIDGET_ID`                                 Widget identifier (See Skribit part below).
-`STATIC_PATHS`                                      The static paths you want to have accessible
-(``['images']``)                                    on the output path "static". By default,
+`STATIC_PATHS` (``['images']``)                     The static paths you want to have accessible
+                                                    on the output path "static". By default,
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
 `THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default

From 1013ae5eb36b2d9ca499c2efe5065def13f66d94 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 26 Apr 2011 00:34:03 +0100
Subject: [PATCH 0270/2864] theme switch

---
 docs/_themes/LICENSE                          |  37 --
 docs/_themes/README                           |  31 --
 docs/_themes/flask/layout.html                |  16 -
 docs/_themes/flask/relations.html             |  19 -
 docs/_themes/flask/static/flasky.css_t        | 387 ------------------
 docs/_themes/flask/static/small_flask.css     |  70 ----
 docs/_themes/flask/theme.conf                 |   7 -
 docs/_themes/flask_small/static/flasky.css_t  | 287 -------------
 docs/_themes/flask_theme_support.py           |  86 ----
 .../{flask_small => pelican}/layout.html      |   0
 docs/_themes/pelican/static/pelican.css_t     | 247 +++++++++++
 .../{flask_small => pelican}/theme.conf       |   4 +-
 docs/conf.py                                  |   4 +-
 13 files changed, 251 insertions(+), 944 deletions(-)
 delete mode 100644 docs/_themes/LICENSE
 delete mode 100644 docs/_themes/README
 delete mode 100644 docs/_themes/flask/layout.html
 delete mode 100644 docs/_themes/flask/relations.html
 delete mode 100644 docs/_themes/flask/static/flasky.css_t
 delete mode 100644 docs/_themes/flask/static/small_flask.css
 delete mode 100644 docs/_themes/flask/theme.conf
 delete mode 100644 docs/_themes/flask_small/static/flasky.css_t
 delete mode 100644 docs/_themes/flask_theme_support.py
 rename docs/_themes/{flask_small => pelican}/layout.html (100%)
 create mode 100644 docs/_themes/pelican/static/pelican.css_t
 rename docs/_themes/{flask_small => pelican}/theme.conf (58%)

diff --git a/docs/_themes/LICENSE b/docs/_themes/LICENSE
deleted file mode 100644
index 8daab7ee..00000000
--- a/docs/_themes/LICENSE
+++ /dev/null
@@ -1,37 +0,0 @@
-Copyright (c) 2010 by Armin Ronacher.
-
-Some rights reserved.
-
-Redistribution and use in source and binary forms of the theme, with or
-without modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the following
-  disclaimer in the documentation and/or other materials provided
-  with the distribution.
-
-* The names of the contributors may not be used to endorse or
-  promote products derived from this software without specific
-  prior written permission.
-
-We kindly ask you to only use these themes in an unmodified manner just
-for Flask and Flask-related products, not for unrelated projects.  If you
-like the visual style and want to use it for your own projects, please
-consider making some larger changes to the themes (such as changing
-font faces, sizes, colors or margins).
-
-THIS THEME IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS THEME, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/_themes/README b/docs/_themes/README
deleted file mode 100644
index b3292bdf..00000000
--- a/docs/_themes/README
+++ /dev/null
@@ -1,31 +0,0 @@
-Flask Sphinx Styles
-===================
-
-This repository contains sphinx styles for Flask and Flask related
-projects.  To use this style in your Sphinx documentation, follow
-this guide:
-
-1. put this folder as _themes into your docs folder.  Alternatively
-   you can also use git submodules to check out the contents there.
-2. add this to your conf.py:
-
-   sys.path.append(os.path.abspath('_themes'))
-   html_theme_path = ['_themes']
-   html_theme = 'flask'
-
-The following themes exist:
-
-- 'flask' - the standard flask documentation theme for large
-  projects
-- 'flask_small' - small one-page theme.  Intended to be used by
-  very small addon libraries for flask.
-
-The following options exist for the flask_small theme:
-
-   [options]
-   index_logo = ''              filename of a picture in _static
-                                to be used as replacement for the
-                                h1 in the index.rst file.
-   index_logo_height = 120px    height of the index logo
-   github_fork = ''             repository name on github for the
-                                "fork me" badge
diff --git a/docs/_themes/flask/layout.html b/docs/_themes/flask/layout.html
deleted file mode 100644
index d7c87927..00000000
--- a/docs/_themes/flask/layout.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{%- extends "basic/layout.html" %}
-{%- block extrahead %}
-  {{ super() }}
-  {% if theme_touch_icon %}
-  <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}" />
-  {% endif %}
-  <link media="only screen and (max-device-width: 480px)" href="{{
-    pathto('_static/small_flask.css', 1) }}" type= "text/css" rel="stylesheet" />
-{% endblock %}
-{%- block relbar2 %}{% endblock %}
-{%- block footer %}
-    <div class="footer">
-      &copy; Copyright {{ copyright }}.
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
-    </div>
-{%- endblock %}
diff --git a/docs/_themes/flask/relations.html b/docs/_themes/flask/relations.html
deleted file mode 100644
index 3bbcde85..00000000
--- a/docs/_themes/flask/relations.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h3>Related Topics</h3>
-<ul>
-  <li><a href="{{ pathto(master_doc) }}">Documentation overview</a><ul>
-  {%- for parent in parents %}
-  <li><a href="{{ parent.link|e }}">{{ parent.title }}</a><ul>
-  {%- endfor %}
-    {%- if prev %}
-      <li>Previous: <a href="{{ prev.link|e }}" title="{{ _('previous chapter')
-        }}">{{ prev.title }}</a></li>
-    {%- endif %}
-    {%- if next %}
-      <li>Next: <a href="{{ next.link|e }}" title="{{ _('next chapter')
-        }}">{{ next.title }}</a></li>
-    {%- endif %}
-  {%- for parent in parents %}
-  </ul></li>
-  {%- endfor %}
-  </ul></li>
-</ul>
diff --git a/docs/_themes/flask/static/flasky.css_t b/docs/_themes/flask/static/flasky.css_t
deleted file mode 100644
index 0de60eee..00000000
--- a/docs/_themes/flask/static/flasky.css_t
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * flasky.css_t
- * ~~~~~~~~~~~~
- *
- * :copyright: Copyright 2010 by Armin Ronacher.
- * :license: Flask Design License, see LICENSE for details.
- */
-
-{% set page_width = '940px' %}
-{% set sidebar_width = '220px' %}
- 
-@import url("basic.css");
- 
-/* -- page layout ----------------------------------------------------------- */
- 
-body {
-    font-family: 'Georgia', serif;
-    font-size: 17px;
-    background-color: white;
-    color: #000;
-    margin: 0;
-    padding: 0;
-}
-
-div.document {
-    width: {{ page_width }};
-    margin: 30px auto 0 auto;
-}
-
-div.documentwrapper {
-    float: left;
-    width: 100%;
-}
-
-div.bodywrapper {
-    margin: 0 0 0 {{ sidebar_width }};
-}
-
-div.sphinxsidebar {
-    width: {{ sidebar_width }};
-}
-
-hr {
-    border: 1px solid #B1B4B6;
-}
- 
-div.body {
-    background-color: #ffffff;
-    color: #3E4349;
-    padding: 0 30px 0 30px;
-}
-
-img.floatingflask {
-    padding: 0 0 10px 10px;
-    float: right;
-}
- 
-div.footer {
-    width: {{ page_width }};
-    margin: 20px auto 30px auto;
-    font-size: 14px;
-    color: #888;
-    text-align: right;
-}
-
-div.footer a {
-    color: #888;
-}
-
-div.related {
-    display: none;
-}
- 
-div.sphinxsidebar a {
-    color: #444;
-    text-decoration: none;
-    border-bottom: 1px dotted #999;
-}
-
-div.sphinxsidebar a:hover {
-    border-bottom: 1px solid #999;
-}
- 
-div.sphinxsidebar {
-    font-size: 14px;
-    line-height: 1.5;
-}
-
-div.sphinxsidebarwrapper {
-    padding: 18px 10px;
-}
-
-div.sphinxsidebarwrapper p.logo {
-    padding: 0 0 20px 0;
-    margin: 0;
-    text-align: center;
-}
- 
-div.sphinxsidebar h3,
-div.sphinxsidebar h4 {
-    font-family: 'Garamond', 'Georgia', serif;
-    color: #444;
-    font-size: 24px;
-    font-weight: normal;
-    margin: 0 0 5px 0;
-    padding: 0;
-}
-
-div.sphinxsidebar h4 {
-    font-size: 20px;
-}
- 
-div.sphinxsidebar h3 a {
-    color: #444;
-}
-
-div.sphinxsidebar p.logo a,
-div.sphinxsidebar h3 a,
-div.sphinxsidebar p.logo a:hover,
-div.sphinxsidebar h3 a:hover {
-    border: none;
-}
- 
-div.sphinxsidebar p {
-    color: #555;
-    margin: 10px 0;
-}
-
-div.sphinxsidebar ul {
-    margin: 10px 0;
-    padding: 0;
-    color: #000;
-}
- 
-div.sphinxsidebar input {
-    border: 1px solid #ccc;
-    font-family: 'Georgia', serif;
-    font-size: 1em;
-}
- 
-/* -- body styles ----------------------------------------------------------- */
- 
-a {
-    color: #004B6B;
-    text-decoration: underline;
-}
- 
-a:hover {
-    color: #6D4100;
-    text-decoration: underline;
-}
- 
-div.body h1,
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6 {
-    font-family: 'Garamond', 'Georgia', serif;
-    font-weight: normal;
-    margin: 30px 0px 10px 0px;
-    padding: 0;
-}
- 
-div.body h1 { margin-top: 0; padding-top: 0; font-size: 240%; }
-div.body h2 { font-size: 180%; }
-div.body h3 { font-size: 150%; }
-div.body h4 { font-size: 130%; }
-div.body h5 { font-size: 100%; }
-div.body h6 { font-size: 100%; }
- 
-a.headerlink {
-    color: #ddd;
-    padding: 0 4px;
-    text-decoration: none;
-}
- 
-a.headerlink:hover {
-    color: #444;
-    background: #eaeaea;
-}
- 
-div.body p, div.body dd, div.body li {
-    line-height: 1.4em;
-}
-
-div.admonition {
-    background: #fafafa;
-    margin: 20px -30px;
-    padding: 10px 30px;
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-}
-
-div.admonition tt.xref, div.admonition a tt {
-    border-bottom: 1px solid #fafafa;
-}
-
-dd div.admonition {
-    margin-left: -60px;
-    padding-left: 60px;
-}
-
-div.admonition p.admonition-title {
-    font-family: 'Garamond', 'Georgia', serif;
-    font-weight: normal;
-    font-size: 24px;
-    margin: 0 0 10px 0;
-    padding: 0;
-    line-height: 1;
-}
-
-div.admonition p.last {
-    margin-bottom: 0;
-}
-
-div.highlight {
-    background-color: white;
-}
-
-dt:target, .highlight {
-    background: #FAF3E8;
-}
-
-div.note {
-    background-color: #eee;
-    border: 1px solid #ccc;
-}
- 
-div.seealso {
-    background-color: #ffc;
-    border: 1px solid #ff6;
-}
- 
-div.topic {
-    background-color: #eee;
-}
- 
-p.admonition-title {
-    display: inline;
-}
- 
-p.admonition-title:after {
-    content: ":";
-}
-
-pre, tt {
-    font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
-    font-size: 0.9em;
-}
-
-img.screenshot {
-}
-
-tt.descname, tt.descclassname {
-    font-size: 0.95em;
-}
-
-tt.descname {
-    padding-right: 0.08em;
-}
-
-img.screenshot {
-    -moz-box-shadow: 2px 2px 4px #eee;
-    -webkit-box-shadow: 2px 2px 4px #eee;
-    box-shadow: 2px 2px 4px #eee;
-}
-
-table.docutils {
-    border: 1px solid #888;
-    -moz-box-shadow: 2px 2px 4px #eee;
-    -webkit-box-shadow: 2px 2px 4px #eee;
-    box-shadow: 2px 2px 4px #eee;
-}
-
-table.docutils td, table.docutils th {
-    border: 1px solid #888;
-    padding: 0.25em 0.7em;
-}
-
-table.field-list, table.footnote {
-    border: none;
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
-}
-
-table.footnote {
-    margin: 15px 0;
-    width: 100%;
-    border: 1px solid #eee;
-    background: #fdfdfd;
-    font-size: 0.9em;
-}
-
-table.footnote + table.footnote {
-    margin-top: -15px;
-    border-top: none;
-}
-
-table.field-list th {
-    padding: 0 0.8em 0 0;
-}
-
-table.field-list td {
-    padding: 0;
-}
-
-table.footnote td.label {
-    width: 0px;
-    padding: 0.3em 0 0.3em 0.5em;
-}
-
-table.footnote td {
-    padding: 0.3em 0.5em;
-}
-
-dl {
-    margin: 0;
-    padding: 0;
-}
-
-dl dd {
-    margin-left: 30px;
-}
-
-blockquote {
-    margin: 0 0 0 30px;
-    padding: 0;
-}
-
-ul, ol {
-    margin: 10px 0 10px 30px;
-    padding: 0;
-}
- 
-pre {
-    background: #eee;
-    padding: 7px 30px;
-    margin: 15px -30px;
-    line-height: 1.3em;
-}
-
-dl pre, blockquote pre, li pre {
-    margin-left: -60px;
-    padding-left: 60px;
-}
-
-dl dl pre {
-    margin-left: -90px;
-    padding-left: 90px;
-}
- 
-tt {
-    background-color: #ecf0f3;
-    color: #222;
-    /* padding: 1px 2px; */
-}
-
-tt.xref, a tt {
-    background-color: #FBFBFB;
-    border-bottom: 1px solid white;
-}
-
-a.reference {
-    text-decoration: none;
-    border-bottom: 1px dotted #004B6B;
-}
-
-a.reference:hover {
-    border-bottom: 1px solid #6D4100;
-}
-
-a.footnote-reference {
-    text-decoration: none;
-    font-size: 0.7em;
-    vertical-align: top;
-    border-bottom: 1px dotted #004B6B;
-}
-
-a.footnote-reference:hover {
-    border-bottom: 1px solid #6D4100;
-}
-
-a:hover tt {
-    background: #EEE;
-}
diff --git a/docs/_themes/flask/static/small_flask.css b/docs/_themes/flask/static/small_flask.css
deleted file mode 100644
index 1c6df309..00000000
--- a/docs/_themes/flask/static/small_flask.css
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * small_flask.css_t
- * ~~~~~~~~~~~~~~~~~
- *
- * :copyright: Copyright 2010 by Armin Ronacher.
- * :license: Flask Design License, see LICENSE for details.
- */
-
-body {
-    margin: 0;
-    padding: 20px 30px;
-}
-
-div.documentwrapper {
-    float: none;
-    background: white;
-}
-
-div.sphinxsidebar {
-    display: block;
-    float: none;
-    width: 102.5%;
-    margin: 50px -30px -20px -30px;
-    padding: 10px 20px;
-    background: #333;
-    color: white;
-}
-
-div.sphinxsidebar h3, div.sphinxsidebar h4, div.sphinxsidebar p,
-div.sphinxsidebar h3 a {
-    color: white;
-}
-
-div.sphinxsidebar a {
-    color: #aaa;
-}
-
-div.sphinxsidebar p.logo {
-    display: none;
-}
-
-div.document {
-    width: 100%;
-    margin: 0;
-}
-
-div.related {
-    display: block;
-    margin: 0;
-    padding: 10px 0 20px 0;
-}
-
-div.related ul,
-div.related ul li {
-    margin: 0;
-    padding: 0;
-}
-
-div.footer {
-    display: none;
-}
-
-div.bodywrapper {
-    margin: 0;
-}
-
-div.body {
-    min-height: 0;
-    padding: 0;
-}
diff --git a/docs/_themes/flask/theme.conf b/docs/_themes/flask/theme.conf
deleted file mode 100644
index 307a1f0d..00000000
--- a/docs/_themes/flask/theme.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = flasky.css
-pygments_style = flask_theme_support.FlaskyStyle
-
-[options]
-touch_icon = 
diff --git a/docs/_themes/flask_small/static/flasky.css_t b/docs/_themes/flask_small/static/flasky.css_t
deleted file mode 100644
index fe2141c5..00000000
--- a/docs/_themes/flask_small/static/flasky.css_t
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * flasky.css_t
- * ~~~~~~~~~~~~
- *
- * Sphinx stylesheet -- flasky theme based on nature theme.
- *
- * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
- 
-@import url("basic.css");
- 
-/* -- page layout ----------------------------------------------------------- */
- 
-body {
-    font-family: 'Georgia', serif;
-    font-size: 17px;
-    color: #000;
-    background: white;
-    margin: 0;
-    padding: 0;
-}
-
-div.documentwrapper {
-    float: left;
-    width: 100%;
-}
-
-div.bodywrapper {
-    margin: 40px auto 0 auto;
-    width: 700px;
-}
-
-hr {
-    border: 1px solid #B1B4B6;
-}
- 
-div.body {
-    background-color: #ffffff;
-    color: #3E4349;
-    padding: 0 30px 30px 30px;
-}
-
-img.floatingflask {
-    padding: 0 0 10px 10px;
-    float: right;
-}
- 
-div.footer {
-    text-align: right;
-    color: #888;
-    padding: 10px;
-    font-size: 14px;
-    width: 650px;
-    margin: 0 auto 40px auto;
-}
- 
-div.footer a {
-    color: #888;
-    text-decoration: underline;
-}
- 
-div.related {
-    line-height: 32px;
-    color: #888;
-}
-
-div.related ul {
-    padding: 0 0 0 10px;
-}
- 
-div.related a {
-    color: #444;
-}
- 
-/* -- body styles ----------------------------------------------------------- */
- 
-a {
-    color: #004B6B;
-    text-decoration: underline;
-}
- 
-a:hover {
-    color: #6D4100;
-    text-decoration: underline;
-}
-
-div.body {
-    padding-bottom: 40px; /* saved for footer */
-}
- 
-div.body h1,
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6 {
-    font-family: 'Garamond', 'Georgia', serif;
-    font-weight: normal;
-    margin: 30px 0px 10px 0px;
-    padding: 0;
-}
-
-{% if theme_index_logo %}
-div.indexwrapper h1 {
-    text-indent: -999999px;
-    background: url({{ theme_index_logo }}) no-repeat center center;
-    height: {{ theme_index_logo_height }};
-}
-{% endif %}
- 
-div.body h2 { font-size: 180%; }
-div.body h3 { font-size: 150%; }
-div.body h4 { font-size: 130%; }
-div.body h5 { font-size: 100%; }
-div.body h6 { font-size: 100%; }
- 
-a.headerlink {
-    color: white;
-    padding: 0 4px;
-    text-decoration: none;
-}
- 
-a.headerlink:hover {
-    color: #444;
-    background: #eaeaea;
-}
- 
-div.body p, div.body dd, div.body li {
-    line-height: 1.4em;
-}
-
-div.admonition {
-    background: #fafafa;
-    margin: 20px -30px;
-    padding: 10px 30px;
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-}
-
-div.admonition p.admonition-title {
-    font-family: 'Garamond', 'Georgia', serif;
-    font-weight: normal;
-    font-size: 24px;
-    margin: 0 0 10px 0;
-    padding: 0;
-    line-height: 1;
-}
-
-div.admonition p.last {
-    margin-bottom: 0;
-}
-
-div.highlight{
-    background-color: white;
-}
-
-dt:target, .highlight {
-    background: #FAF3E8;
-}
-
-div.note {
-    background-color: #eee;
-    border: 1px solid #ccc;
-}
- 
-div.seealso {
-    background-color: #ffc;
-    border: 1px solid #ff6;
-}
- 
-div.topic {
-    background-color: #eee;
-}
- 
-div.warning {
-    background-color: #ffe4e4;
-    border: 1px solid #f66;
-}
- 
-p.admonition-title {
-    display: inline;
-}
- 
-p.admonition-title:after {
-    content: ":";
-}
-
-pre, tt {
-    font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
-    font-size: 0.85em;
-}
-
-img.screenshot {
-}
-
-tt.descname, tt.descclassname {
-    font-size: 0.95em;
-}
-
-tt.descname {
-    padding-right: 0.08em;
-}
-
-img.screenshot {
-    -moz-box-shadow: 2px 2px 4px #eee;
-    -webkit-box-shadow: 2px 2px 4px #eee;
-    box-shadow: 2px 2px 4px #eee;
-}
-
-table.docutils {
-    border: 1px solid #888;
-    -moz-box-shadow: 2px 2px 4px #eee;
-    -webkit-box-shadow: 2px 2px 4px #eee;
-    box-shadow: 2px 2px 4px #eee;
-}
-
-table.docutils td, table.docutils th {
-    border: 1px solid #888;
-    padding: 0.25em 0.7em;
-}
-
-table.field-list, table.footnote {
-    border: none;
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
-}
-
-table.footnote {
-    margin: 15px 0;
-    width: 100%;
-    border: 1px solid #eee;
-}
-
-table.field-list th {
-    padding: 0 0.8em 0 0;
-}
-
-table.field-list td {
-    padding: 0;
-}
-
-table.footnote td {
-    padding: 0.5em;
-}
-
-dl {
-    margin: 0;
-    padding: 0;
-}
-
-dl dd {
-    margin-left: 30px;
-}
- 
-pre {
-    padding: 0;
-    margin: 15px -30px;
-    padding: 8px;
-    line-height: 1.3em;
-    padding: 7px 30px;
-    background: #eee;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-}
-
-dl pre {
-    margin-left: -60px;
-    padding-left: 60px;
-}
-
-tt {
-    background-color: #ecf0f3;
-    color: #222;
-    /* padding: 1px 2px; */
-}
-
-tt.xref, a tt {
-    background-color: #FBFBFB;
-}
-
-a:hover tt {
-    background: #EEE;
-}
diff --git a/docs/_themes/flask_theme_support.py b/docs/_themes/flask_theme_support.py
deleted file mode 100644
index 33f47449..00000000
--- a/docs/_themes/flask_theme_support.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# flasky extensions.  flasky pygments style based on tango style
-from pygments.style import Style
-from pygments.token import Keyword, Name, Comment, String, Error, \
-     Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
-
-
-class FlaskyStyle(Style):
-    background_color = "#f8f8f8"
-    default_style = ""
-
-    styles = {
-        # No corresponding class for the following:
-        #Text:                     "", # class:  ''
-        Whitespace:                "underline #f8f8f8",      # class: 'w'
-        Error:                     "#a40000 border:#ef2929", # class: 'err'
-        Other:                     "#000000",                # class 'x'
-
-        Comment:                   "italic #8f5902", # class: 'c'
-        Comment.Preproc:           "noitalic",       # class: 'cp'
-
-        Keyword:                   "bold #004461",   # class: 'k'
-        Keyword.Constant:          "bold #004461",   # class: 'kc'
-        Keyword.Declaration:       "bold #004461",   # class: 'kd'
-        Keyword.Namespace:         "bold #004461",   # class: 'kn'
-        Keyword.Pseudo:            "bold #004461",   # class: 'kp'
-        Keyword.Reserved:          "bold #004461",   # class: 'kr'
-        Keyword.Type:              "bold #004461",   # class: 'kt'
-
-        Operator:                  "#582800",   # class: 'o'
-        Operator.Word:             "bold #004461",   # class: 'ow' - like keywords
-
-        Punctuation:               "bold #000000",   # class: 'p'
-
-        # because special names such as Name.Class, Name.Function, etc.
-        # are not recognized as such later in the parsing, we choose them
-        # to look the same as ordinary variables.
-        Name:                      "#000000",        # class: 'n'
-        Name.Attribute:            "#c4a000",        # class: 'na' - to be revised
-        Name.Builtin:              "#004461",        # class: 'nb'
-        Name.Builtin.Pseudo:       "#3465a4",        # class: 'bp'
-        Name.Class:                "#000000",        # class: 'nc' - to be revised
-        Name.Constant:             "#000000",        # class: 'no' - to be revised
-        Name.Decorator:            "#888",           # class: 'nd' - to be revised
-        Name.Entity:               "#ce5c00",        # class: 'ni'
-        Name.Exception:            "bold #cc0000",   # class: 'ne'
-        Name.Function:             "#000000",        # class: 'nf'
-        Name.Property:             "#000000",        # class: 'py'
-        Name.Label:                "#f57900",        # class: 'nl'
-        Name.Namespace:            "#000000",        # class: 'nn' - to be revised
-        Name.Other:                "#000000",        # class: 'nx'
-        Name.Tag:                  "bold #004461",   # class: 'nt' - like a keyword
-        Name.Variable:             "#000000",        # class: 'nv' - to be revised
-        Name.Variable.Class:       "#000000",        # class: 'vc' - to be revised
-        Name.Variable.Global:      "#000000",        # class: 'vg' - to be revised
-        Name.Variable.Instance:    "#000000",        # class: 'vi' - to be revised
-
-        Number:                    "#990000",        # class: 'm'
-
-        Literal:                   "#000000",        # class: 'l'
-        Literal.Date:              "#000000",        # class: 'ld'
-
-        String:                    "#4e9a06",        # class: 's'
-        String.Backtick:           "#4e9a06",        # class: 'sb'
-        String.Char:               "#4e9a06",        # class: 'sc'
-        String.Doc:                "italic #8f5902", # class: 'sd' - like a comment
-        String.Double:             "#4e9a06",        # class: 's2'
-        String.Escape:             "#4e9a06",        # class: 'se'
-        String.Heredoc:            "#4e9a06",        # class: 'sh'
-        String.Interpol:           "#4e9a06",        # class: 'si'
-        String.Other:              "#4e9a06",        # class: 'sx'
-        String.Regex:              "#4e9a06",        # class: 'sr'
-        String.Single:             "#4e9a06",        # class: 's1'
-        String.Symbol:             "#4e9a06",        # class: 'ss'
-
-        Generic:                   "#000000",        # class: 'g'
-        Generic.Deleted:           "#a40000",        # class: 'gd'
-        Generic.Emph:              "italic #000000", # class: 'ge'
-        Generic.Error:             "#ef2929",        # class: 'gr'
-        Generic.Heading:           "bold #000080",   # class: 'gh'
-        Generic.Inserted:          "#00A000",        # class: 'gi'
-        Generic.Output:            "#888",           # class: 'go'
-        Generic.Prompt:            "#745334",        # class: 'gp'
-        Generic.Strong:            "bold #000000",   # class: 'gs'
-        Generic.Subheading:        "bold #800080",   # class: 'gu'
-        Generic.Traceback:         "bold #a40000",   # class: 'gt'
-    }
diff --git a/docs/_themes/flask_small/layout.html b/docs/_themes/pelican/layout.html
similarity index 100%
rename from docs/_themes/flask_small/layout.html
rename to docs/_themes/pelican/layout.html
diff --git a/docs/_themes/pelican/static/pelican.css_t b/docs/_themes/pelican/static/pelican.css_t
new file mode 100644
index 00000000..164073e1
--- /dev/null
+++ b/docs/_themes/pelican/static/pelican.css_t
@@ -0,0 +1,247 @@
+/*
+ * pelican.css_t
+ * ~~~~~~~~~~~~
+ *
+ * Sphinx stylesheet -- pelican theme, based on the nature theme
+ *
+ * :copyright: Copyright 2011 by Alexis Metaireau.
+ */
+ 
+@import url("basic.css");
+ 
+/* -- page layout ----------------------------------------------------------- */
+ 
+body {
+    font-family: Arial, sans-serif;
+    font-size: 100%;
+    background-color: white;
+    color: #555;
+    margin: 0;
+    padding: 0;
+}
+
+div.documentwrapper {
+    width: 70%;
+    margin: auto;
+}
+
+div.bodywrapper {
+    margin: 0 0 0 230px;
+}
+
+hr {
+    border: 1px solid #B1B4B6;
+}
+ 
+div.document {
+    background-color: #eee;
+}
+ 
+div.body {
+    background-color: #ffffff;
+    color: #3E4349;
+    padding: 0 30px 30px 30px;
+    font-size: 0.9em;
+}
+ 
+div.footer {
+    color: #555;
+    width: 100%;
+    padding: 13px 0;
+    text-align: center;
+    font-size: 75%;
+}
+ 
+div.footer a {
+    color: #444;
+    text-decoration: underline;
+}
+ 
+div.related {
+    background-color: #6BA81E;
+    line-height: 32px;
+    color: #fff;
+    text-shadow: 0px 1px 0 #444;
+    font-size: 0.9em;
+}
+ 
+div.related a {
+    color: #E2F3CC;
+}
+ 
+div.sphinxsidebar {
+    font-size: 0.75em;
+    line-height: 1.5em;
+}
+
+div.sphinxsidebarwrapper{
+    padding: 20px 0;
+}
+ 
+div.sphinxsidebar h3,
+div.sphinxsidebar h4 {
+    font-family: Arial, sans-serif;
+    color: #222;
+    font-size: 1.2em;
+    font-weight: normal;
+    margin: 0;
+    padding: 5px 10px;
+    background-color: #ddd;
+    text-shadow: 1px 1px 0 white
+}
+
+div.sphinxsidebar h4{
+    font-size: 1.1em;
+}
+ 
+div.sphinxsidebar h3 a {
+    color: #444;
+}
+ 
+ 
+div.sphinxsidebar p {
+    color: #888;
+    padding: 5px 20px;
+}
+ 
+div.sphinxsidebar p.topless {
+}
+ 
+div.sphinxsidebar ul {
+    margin: 10px 20px;
+    padding: 0;
+    color: #000;
+}
+ 
+div.sphinxsidebar a {
+    color: #444;
+}
+ 
+div.sphinxsidebar input {
+    border: 1px solid #ccc;
+    font-family: sans-serif;
+    font-size: 1em;
+}
+
+div.sphinxsidebar input[type=text]{
+    margin-left: 20px;
+}
+ 
+/* -- body styles ----------------------------------------------------------- */
+ 
+a {
+    color: #005B81;
+    text-decoration: none;
+}
+ 
+a:hover {
+    color: #E32E00;
+    text-decoration: underline;
+}
+ 
+div.body h1,
+div.body h2,
+div.body h3,
+div.body h4,
+div.body h5,
+div.body h6 {
+    font-family: Arial, sans-serif;
+    font-weight: normal;
+    color: #212224;
+    margin: 30px 0px 10px 0px;
+    padding: 5px 0 5px 10px;
+    text-shadow: 0px 1px 0 white
+}
+ 
+div.body h1 { 
+    border-top: 20px solid white; 
+    margin-top: 0; 
+    font-size: 250%; 
+    text-align: center;
+}
+div.body h2 { font-size: 150%; background-color: #C8D5E3; }
+div.body h3 { font-size: 120%; background-color: #D8DEE3; }
+div.body h4 { font-size: 110%; background-color: #D8DEE3; }
+div.body h5 { font-size: 100%; background-color: #D8DEE3; }
+div.body h6 { font-size: 100%; background-color: #D8DEE3; }
+ 
+a.headerlink {
+    color: #c60f0f;
+    font-size: 0.8em;
+    padding: 0 4px 0 4px;
+    text-decoration: none;
+}
+ 
+a.headerlink:hover {
+    background-color: #c60f0f;
+    color: white;
+}
+ 
+div.body p, div.body dd, div.body li {
+    line-height: 1.5em;
+}
+ 
+div.admonition p.admonition-title + p {
+    display: inline;
+}
+
+div.highlight{
+    background-color: #111;
+}
+
+div.note {
+    background-color: #eee;
+    border: 1px solid #ccc;
+}
+ 
+div.seealso {
+    background-color: #ffc;
+    border: 1px solid #ff6;
+}
+ 
+div.topic {
+    background-color: #eee;
+}
+ 
+div.warning {
+    background-color: #ffe4e4;
+    border: 1px solid #f66;
+}
+ 
+p.admonition-title {
+    display: inline;
+}
+ 
+p.admonition-title:after {
+    content: ":";
+}
+ 
+pre {
+    padding: 10px;
+    background-color: #111;
+    color: #fff;
+    line-height: 1.2em;
+    border: 1px solid #C6C9CB;
+    font-size: 1.1em;
+    margin: 1.5em 0 1.5em 0;
+    -webkit-box-shadow: 1px 1px 1px #d8d8d8;
+    -moz-box-shadow: 1px 1px 1px #d8d8d8;
+}
+ 
+tt {
+    background-color: #ecf0f3;
+    color: #222;
+    /* padding: 1px 2px; */
+    font-size: 1.1em;
+    font-family: monospace;
+}
+
+.viewcode-back {
+    font-family: Arial, sans-serif;
+}
+
+div.viewcode-block:target {
+    background-color: #f4debf;
+    border-top: 1px solid #ac9;
+    border-bottom: 1px solid #ac9;
+}
diff --git a/docs/_themes/flask_small/theme.conf b/docs/_themes/pelican/theme.conf
similarity index 58%
rename from docs/_themes/flask_small/theme.conf
rename to docs/_themes/pelican/theme.conf
index 07036d14..ffbb7945 100644
--- a/docs/_themes/flask_small/theme.conf
+++ b/docs/_themes/pelican/theme.conf
@@ -1,8 +1,8 @@
 [theme]
 inherit = basic
-stylesheet = flasky.css
+stylesheet = pelican.css
 nosidebar = true
-pygments_style = flask_theme_support.FlaskyStyle
+pygments_style = fruity
 
 [options]
 index_logo_height = 120px
diff --git a/docs/conf.py b/docs/conf.py
index 507e30a3..76167eaf 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,7 +14,6 @@ master_doc = 'index'
 project = u'Pelican'
 copyright = u'2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
-pygments_style = 'sphinx'
 version = "2"
 release = version
 
@@ -24,12 +23,13 @@ release = version
 # a list of builtin themes.
 sys.path.append(os.path.abspath('_themes'))
 html_theme_path = ['_themes']
-html_theme = 'flask_small'
+html_theme = 'pelican'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
+    'nosidebar': True,
     'index_logo': 'pelican.png',
     'github_fork': 'ametaireau/pelican',
 }

From f9f01320ca21a52c5a155a6225d05d1afd5b1a28 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 26 Apr 2011 00:40:16 +0100
Subject: [PATCH 0271/2864] update the theme (logo)

---
 docs/_themes/pelican/static/pelican.css_t | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/_themes/pelican/static/pelican.css_t b/docs/_themes/pelican/static/pelican.css_t
index 164073e1..3cb2a3c1 100644
--- a/docs/_themes/pelican/static/pelican.css_t
+++ b/docs/_themes/pelican/static/pelican.css_t
@@ -34,7 +34,6 @@ hr {
 }
  
 div.document {
-    background-color: #eee;
 }
  
 div.body {
@@ -153,12 +152,20 @@ div.body h6 {
     text-shadow: 0px 1px 0 white
 }
  
+{% if theme_index_logo %}
+div.indexwrapper h1 {
+    text-indent: -999999px;
+    background: url({{ theme_index_logo }}) no-repeat center center;
+    height: {{ theme_index_logo_height }};
+}
+{% endif %}
 div.body h1 { 
     border-top: 20px solid white; 
     margin-top: 0; 
     font-size: 250%; 
     text-align: center;
 }
+
 div.body h2 { font-size: 150%; background-color: #C8D5E3; }
 div.body h3 { font-size: 120%; background-color: #D8DEE3; }
 div.body h4 { font-size: 110%; background-color: #D8DEE3; }

From dd62f293d68c36a1606f274c82c9270caf9d8efd Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Tue, 26 Apr 2011 02:37:56 +0200
Subject: [PATCH 0272/2864] added missing whitespace in the CLI help

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 195ada34..08ddc716 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -91,8 +91,8 @@ def main():
     parser.add_argument(dest='path', nargs='?',
         help='Path where to find the content files')
     parser.add_argument('-t', '--theme-path', dest='theme',
-        help='Path where to find the theme templates. If not specified, it will'
-             'use the default one included with pelican.')
+        help='Path where to find the theme templates. If not specified, it'
+             'will use the default one included with pelican.')
     parser.add_argument('-o', '--output', dest='output',
         help='Where to output the generated files. If not specified, a directory'
              ' will be created, named "output" in the current path.')

From 77457ed8000a17cfc7e5c9853ae4908b72e9a888 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Tue, 26 Apr 2011 02:39:57 +0200
Subject: [PATCH 0273/2864] another whitespace mistake in the CLI help

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 08ddc716..12d12210 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -97,8 +97,8 @@ def main():
         help='Where to output the generated files. If not specified, a directory'
              ' will be created, named "output" in the current path.')
     parser.add_argument('-m', '--markup', default=None, dest='markup',
-        help='the list of markup language to use (rst or md). Please indicate them'
-             'separated by commas')
+        help='the list of markup language to use (rst or md). Please indicate '
+             'them separated by commas')
     parser.add_argument('-s', '--settings', dest='settings',
         help='the settings of the application. Default to None.')
     parser.add_argument('-k', '--keep-output-directory', dest='keep',

From befd7098ce2d41f90b5d27d088dbe921885a5217 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Tue, 26 Apr 2011 02:49:00 +0200
Subject: [PATCH 0274/2864] typos, grammar mistakes, minor whitespace issues

---
 docs/themes.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 9f8b8765..301e090e 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -32,17 +32,17 @@ To make your own theme, you must follow the following structure::
   just examples. Put what you need here.
 
 * `templates` contains all the templates that will be used to generate the content.
-  I've just put the mandatory templates here, you can define your own if it helps 
+  I've just put the mandatory templates here, you can define your own if it helps
   you to organize yourself while doing the theme.
  
 Templates and variables
 =======================
 
 It's using a simple syntax, that you can embbed into your html pages.
-This document describes which templates should exists on a theme, and which
+This document describes which templates should exist on a theme, and which
 variables will be passed to each template, while generating it.
 
-All templates will receive the variables defined in your settings file, if they 
+All templates will receive the variables defined in your settings file, if they
 are in caps. You can access them directly. 
 
 Common variables
@@ -114,7 +114,7 @@ page_name               'category/`category_name`'. Useful for pagination
 article.html
 -------------
 
-This template will be processed for each article. .html files will be outputed
+This template will be processed for each article. .html files will be output
 in output/`article_name`.html. Here are the specific variables it gets.
 
 =============   ===================================================
@@ -152,8 +152,8 @@ page_name               'tag/`tag_name`'. Useful for pagination links.
 Include skribit script
 ======================
 
-In order to support skribit scripts in your themes, you must following these
-actions :
+In order to support skribit scripts in your themes, you must perform these
+actions:
 
  * Copy `skribit_tab_script.html` and `skribit_widget_script.html` in your
    templates directory.

From ac391479f2c6d13d8580d18dfb1c9dfa05524441 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Tue, 26 Apr 2011 13:44:26 +0200
Subject: [PATCH 0275/2864] fixed link to pelican homepage in the simple theme

---
 pelican/themes/simple/templates/base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index eaf4484f..0477053d 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -18,8 +18,8 @@
         {% endblock %}
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a
-                href="http://hg.lolnet.org/pelican/">pelican</a>, and obviously <a href="http://python.org">python</a>!
+                Proudly powered by <a href="http://docs.notmyidea.org/alexis/pelican/">pelican</a>,
+                and obviously <a href="http://python.org">python</a>!
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>

From 8febf106514f9955e9d4f1ed3cc8bb013dca3edd Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 26 Apr 2011 13:45:42 +0100
Subject: [PATCH 0276/2864] Include the complete license rather than the short
 version. See #103

---
 LICENSE | 669 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 658 insertions(+), 11 deletions(-)

diff --git a/LICENSE b/LICENSE
index b37178ac..dba13ed2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,14 +1,661 @@
-This file is part of Pelican.
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Pelican is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Pelican is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero Public License for more details.
+                            Preamble
 
-You should have received a copy of the GNU Affero Public License
-along with Pelican.  If not, see <http://www.gnu.org/licenses/>.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

From 98ed7338e6c360dd82f0220971851c39875d3cb3 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 21 Apr 2011 19:26:12 +0200
Subject: [PATCH 0277/2864] add a test metadata for #98

---
 samples/content/another_super_article.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/content/another_super_article.rst b/samples/content/another_super_article.rst
index abe8d26c..5ec1e2b8 100644
--- a/samples/content/another_super_article.rst
+++ b/samples/content/another_super_article.rst
@@ -6,6 +6,7 @@ Oh yeah !
 :category: bar
 :author: Alexis Métaireau
 :slug: oh-yeah
+:license: WTFPL
 
 Why not ?
 =========

From bb0d4bcc2f755e5ae27f41d402c158bba7496b6d Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 24 Apr 2011 13:05:40 +0200
Subject: [PATCH 0278/2864] =?UTF-8?q?Add=20documentation=20about=20the=20R?=
 =?UTF-8?q?ELATIVE=5FURLS=20setting.=20Thanks=20to=20G=C3=BCnter=20Kolouse?=
 =?UTF-8?q?k.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 THANKS            | 1 +
 docs/settings.rst | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/THANKS b/THANKS
index 078a67d1..4a8a52a5 100644
--- a/THANKS
+++ b/THANKS
@@ -14,3 +14,4 @@ bugs or giving ideas. Thanks to them !
 - Laureline Guérin
 - Samuel Martin
 - Marcus Fredriksson
+- Günter Kolousek
diff --git a/docs/settings.rst b/docs/settings.rst
index 67039832..e3f4a94e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -63,11 +63,16 @@ Setting name                what it does ?
 `PATH`                      path to look at for input files.
 `PDF_PROCESSOR`             Put True if you want to have PDF versions of your
                             documents. You will need to install `rst2pdf`.
+`RELATIVE_URL`              Defines if pelican should use relative urls or not.
+                            It is set to True per default.
 `REVERSE_ARCHIVE_ORDER`     Reverse the archives order. (True makes it in
                             descending order: the newer first)
 `REVERSE_CATEGORY_ORDER`    Reverse the category order. (True makes it in
                             descending order, default is alphabetically)
-`SITEURL`                   base URL of your website.
+`SITEURL`                   base URL of your website. Note that this is not
+                            a way to tell pelican to use relative urls or
+                            static ones. You should rather use the `RELATIVE_URL`
+                            setting for such use.
 `SITENAME`                  Your site name,
 `SKRIBIT_TYPE`              The type of skribit widget (TAB or WIDGET).
 `SKRIBIT_TAB_COLOR`         Tab color (#XXXXXX, default #333333).

From 8de525fa281a8052a57c7f9f2fde41b48e3b5e07 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Mon, 25 Apr 2011 12:13:44 +0200
Subject: [PATCH 0279/2864] Removed a bug (debug messages was not showed) and
 improved readability

---
 pelican/log.py | 98 ++++++++++++++++++++++++++------------------------
 1 file changed, 52 insertions(+), 46 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index b895ad66..72b7a017 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,46 +1,51 @@
-import logging
+from  logging import *
 import sys
 import os
 
 global ANSI
 ANSI = {
-    'gray' : lambda(text) : '\033[1;30m' + unicode(text) + '\033[1;m',
-    'red' : lambda(text) : '\033[1;31m' + unicode(text) + '\033[1;m',
-    'green' : lambda(text) : '\033[1;32m' + unicode(text) + '\033[1;m',
-    'yellow' : lambda(text) : '\033[1;33m' + unicode(text) + '\033[1;m',
-    'blue' : lambda(text) : '\033[1;34m' + unicode(text) + '\033[1;m',
-    'magenta' : lambda(text) : '\033[1;35m' + unicode(text) + '\033[1;m',
-    'cyan' : lambda(text) : '\033[1;36m' + unicode(text) + '\033[1;m',
-    'white' : lambda(text) : '\033[1;37m' + unicode(text) + '\033[1;m',
-    'crimson' : lambda(text) : '\033[1;38m' + unicode(text) + '\033[1;m',
-    'bgred' : lambda(text) : '\033[1;41m' + unicode(text) + '\033[1;m',
-    'bggreen' : lambda(text) : '\033[1;42m' + unicode(text) + '\033[1;m',
-    'bgbrown' : lambda(text) : '\033[1;43m' + unicode(text) + '\033[1;m',
-    'bgblue' : lambda(text) : '\033[1;44m' + unicode(text) + '\033[1;m',
-    'bgmagenta' : lambda(text) : '\033[1;45m' + unicode(text) + '\033[1;m',
-    'bgcyan' : lambda(text) : '\033[1;46m' + unicode(text) + '\033[1;m',
-    'bggray' : lambda(text) : '\033[1;47m' + unicode(text) + '\033[1;m',
-    'bgcrimson' : lambda(text) : '\033[1;48m' + unicode(text) + '\033[1;m'
+    'gray' : lambda(text) : u'\033[1;30m' + unicode(text) + u'\033[1;m',
+    'red' : lambda(text) : u'\033[1;31m' + unicode(text) + u'\033[1;m',
+    'green' : lambda(text) : u'\033[1;32m' + unicode(text) + u'\033[1;m',
+    'yellow' : lambda(text) : u'\033[1;33m' + unicode(text) + u'\033[1;m',
+    'blue' : lambda(text) : u'\033[1;34m' + unicode(text) + u'\033[1;m',
+    'magenta' : lambda(text) : u'\033[1;35m' + unicode(text) + u'\033[1;m',
+    'cyan' : lambda(text) : u'\033[1;36m' + unicode(text) + u'\033[1;m',
+    'white' : lambda(text) : u'\033[1;37m' + unicode(text) + u'\033[1;m',
+    'bgred' : lambda(text) : u'\033[1;41m' + unicode(text) + u'\033[1;m',
+    'bggreen' : lambda(text) : u'\033[1;42m' + unicode(text) + u'\033[1;m',
+    'bgbrown' : lambda(text) : u'\033[1;43m' + unicode(text) + u'\033[1;m',
+    'bgblue' : lambda(text) : u'\033[1;44m' + unicode(text) + u'\033[1;m',
+    'bgmagenta' : lambda(text) : u'\033[1;45m' + unicode(text) + u'\033[1;m',
+    'bgcyan' : lambda(text) : u'\033[1;46m' + unicode(text) + u'\033[1;m',
+    'bggray' : lambda(text) : u'\033[1;47m' + unicode(text) + u'\033[1;m',
+    'bgyellow' : lambda(text) : u'\033[1;43m' + unicode(text) + u'\033[1;m',
+    'bggrey' : lambda(text) : u'\033[1;100m' + unicode(text) + u'\033[1;m'
 }
 
-class ANSIFormatter(logging.Formatter):
+
+class ANSIFormatter(Formatter):
     """
     Convert a `logging.LogReport' object into colored text, using ANSI escape sequences.
     """
     ## colors:
 
     def format(self, record):
-        if not record.levelname or record.levelname is 'INFO':
-            return ANSI['white'](record.msg)
+        if record.levelname is 'INFO':
+            return ANSI['cyan']('-> ') + unicode(record.msg)
         elif record.levelname is 'WARNING':
-            return ANSI['yellow'](record.levelname) + ': ' + record.msg
+            return ANSI['yellow'](record.levelname) + ': ' + unicode(record.msg)
         elif record.levelname is 'ERROR':
-            return ANSI['red'](record.levelname) + ': ' + record.msg
+            return ANSI['red'](record.levelname) + ': ' + unicode(record.msg)
         elif record.levelname is 'CRITICAL':
-            return ANSI['bgred'](record.levelname) + ': ' + record.msg
+            return ANSI['bgred'](record.levelname) + ': ' + unicode(record.msg)
+        elif record.levelname is 'DEBUG':
+            return ANSI['bggrey'](record.levelname) + ': ' + unicode(record.msg)
+        else:
+            return ANSI['white'](record.levelname) + ': ' + unicode(record.msg)
 
 
-class TextFormatter(logging.Formatter):
+class TextFormatter(Formatter):
     """
     Convert a `logging.LogReport' object into text.
     """
@@ -52,7 +57,7 @@ class TextFormatter(logging.Formatter):
             return record.levelname + ': ' + record.msg
 
 
-class Formatter(object):
+class DummyFormatter(object):
     """
     A dummy class.
     Return an instance of the appropriate formatter (ANSIFormatter if sys.stdout.isatty() is True, else TextFormatter)
@@ -66,21 +71,10 @@ class Formatter(object):
 
 
 
-# shortcuts
-debug, info, warn, error, critical = (logging.debug,
-                                      logging.info,
-                                      logging.warn,
-                                      logging.error,
-                                      logging.critical)
-DEBUG, INFO, WARN, ERROR, CRITICAL = (logging.DEBUG,
-                                      logging.INFO,
-                                      logging.WARN,
-                                      logging.ERROR,
-                                      logging.CRITICAL)
 
 
-def init(level=None, logger=logging.getLogger(), handler=logging.StreamHandler()):
-    fmt = Formatter()
+def init(level=None, logger=getLogger(), handler=StreamHandler()):
+    fmt = DummyFormatter()
     handler.setFormatter(fmt)
     logger.addHandler(handler)
     if level:
@@ -88,11 +82,23 @@ def init(level=None, logger=logging.getLogger(), handler=logging.StreamHandler()
 
 
 if __name__ == '__main__':
-    init()
-    logging.basicConfig(filename='example.log',level=logging.DEBUG)
-    logging.debug('Logging test')
-    logging.info('info')
-    logging.warning('warning')
-    logging.error('error')
-    logging.critical('critical')
+    init(level=DEBUG)
+    debug('debug')
+    info('info')
+    warning('warning')
+    error('error')
+    critical('critical')
 
+
+__all__ = [
+    "debug", 
+    "info", 
+    "warn", 
+    "error", 
+    "critical", 
+    "DEBUG", 
+    "INFO", 
+    "WARN", 
+    "ERROR", 
+    "CRITICAL"
+] 

From 764a135bb3a37d6be0fc08c3ddc67aaa7409314b Mon Sep 17 00:00:00 2001
From: Simon Liedtke <liedtke.simon@googlemail.com>
Date: Sun, 24 Apr 2011 09:05:38 -0700
Subject: [PATCH 0280/2864] Pelican is an "it", not a "he"

---
 docs/getting_started.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index d90e1fe8..fc2e171e 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -38,7 +38,7 @@ Writing articles using pelican
 Files metadata
 --------------
 
-Pelican tries to be smart enough to get the informations he needs from the
+Pelican tries to be smart enough to get the informations it needs from the
 file system (for instance, about the category of your articles), but you need to
 provide by hand some of those informations in your files.
 

From b6b7238519f6049c932d5c1e542bdc5483fb7327 Mon Sep 17 00:00:00 2001
From: Simon Liedtke <liedtke.simon@googlemail.com>
Date: Sun, 24 Apr 2011 09:24:05 -0700
Subject: [PATCH 0281/2864] removed unused import

---
 pelican/__init__.py | 1 -
 1 file changed, 1 deletion(-)
 mode change 100755 => 100644 pelican/__init__.py

diff --git a/pelican/__init__.py b/pelican/__init__.py
old mode 100755
new mode 100644
index 497e5d0d..195ada34
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,6 +1,5 @@
 import argparse
 import os
-from functools import partial
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator)

From ec9525a3e82a9c279b476c5bc6aeb0a0883f1804 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 25 Apr 2011 00:33:55 +0200
Subject: [PATCH 0282/2864] include the default values of the settings in the
 1st column in parens

this way, it is much easier for the reader to see which variable has which
default value. I also added some default values which could not be found in
the documentation before.
---
 docs/settings.rst | 157 +++++++++++++++++++++++-----------------------
 1 file changed, 79 insertions(+), 78 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e3f4a94e..498f60cd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -20,84 +20,85 @@ Here are the available settings. Please note that all the settings you put in
 this file will be passed to the templates as well.
 
 
-========================    =======================================================
-Setting name                what it does ?
-========================    =======================================================
-`AUTHOR`                    Default author (put your name)
-`CATEGORY_FEED`             Where to put the atom categories feeds. default is
-                            `feeds/%s.atom.xml`, where %s is the name of the
-                            category.
-`CATEGORY_FEED_RSS`         Where to put the categories rss feeds. default is None
-                            (no rss)
-`CSS_FILE`                  To specify the CSS file you want to load, if it's not
-                            the default one ('main.css')
-`DATE_FORMATS`              If you do manage multiple languages, you can set
-                            the date formatting here.
-`DEFAULT_CATEGORY`          The default category to fallback on. `misc` by default.
-`DEFAULT_DATE_FORMAT`       The default date format you want to use.
-`DEFAULT_LANG`              The default language to use. Default is 'en'.
-`DEFAULT_ORPHANS`           The minimum number of articles allowed on the last
-                            page, defaults to zero. Use this when you don't want
-                            to have a last page with very few articles.
-`DEFAULT_PAGINATION`        The maximum number of articles to include on a page,
-                            not including orphans. Default is 5.
-`DISPLAY_PAGES_ON_MENU`     Display or not the pages on the menu of the template.
-                            Templates can follow or not this settings.
-`FALLBACK_ON_FS_DATE`       If True, pelican will use the file system dates infos
-                            (mtime) if it can't get informations from the
-                            metadata?
-`FEED`                      relative url to output the atom feed. Default is
-                            `feeds/all.atom.xml`
-`FEED_RSS`                  relative url to output the rss feed. Default is
-                            None (no rss)
-`JINJA_EXTENSIONS`          A list of any Jinja2 extensions you want to use.
-                            Default is no extensions (the empty list).
-`KEEP_OUTPUT_DIRECTORY`     Keep the output directory and just update all the 
-                            generated files. 
-`LOCALE`                    Change the locale. Default is the system locale.
-                            Default is to delete the output directory.   
-`MARKUP`                    A list of available markup languages you want to use.
-                            For the moment, only available values are `rst` and `md`.
-`OUTPUT_PATH`               Where to output the generated files. Default to
-                            "output"
-`PATH`                      path to look at for input files.
-`PDF_PROCESSOR`             Put True if you want to have PDF versions of your
-                            documents. You will need to install `rst2pdf`.
-`RELATIVE_URL`              Defines if pelican should use relative urls or not.
-                            It is set to True per default.
-`REVERSE_ARCHIVE_ORDER`     Reverse the archives order. (True makes it in
-                            descending order: the newer first)
-`REVERSE_CATEGORY_ORDER`    Reverse the category order. (True makes it in
-                            descending order, default is alphabetically)
-`SITEURL`                   base URL of your website. Note that this is not
-                            a way to tell pelican to use relative urls or
-                            static ones. You should rather use the `RELATIVE_URL`
-                            setting for such use.
-`SITENAME`                  Your site name,
-`SKRIBIT_TYPE`              The type of skribit widget (TAB or WIDGET).
-`SKRIBIT_TAB_COLOR`         Tab color (#XXXXXX, default #333333).
-`SKRIBIT_TAB_HORIZ`         Tab Distance from Left (% or distance, default Null).
-`SKRIBIT_TAB_VERT`          Tab Distance from Top (% or distance, default 20%).
-`SKRIBIT_TAB_PLACEMENT`     Tab placement (Top, Bottom, Left or Right, default
-                            LEFT).
-`SKRIBIT_TAB_SITENAME`      Tab identifier (See Skribit part below).
-`SKRIBIT_WIDGET_ID`         Widget identifier (See Skribit part below).
-`STATIC_PATHS`              The static paths you want to have accessible on the
-                            output path "static". By default, pelican will copy
-                            the 'images' folder to the output folder.
-`STATIC_THEME_PATHS`        Static theme paths you want to copy. Default values
-                            is `static`, but if your theme have others static paths,
-                            you can put them here.
-`TAG_CLOUD_STEPS`           Count of different font sizes in the tag cloud.
-`TAG_CLOUD_MAX_ITEMS`       Maximum tags count in the cloud.
-`THEME`                     theme to use to product the output. can be the
-                            complete static path to a theme folder, or chosen
-                            between the list of default themes (see below)
-`TRANSLATION_FEED`          Where to put the RSS feed for translations. Default
-                            is feeds/all-%s.atom.xml where %s is the name of the
-                            lang.
-`WITH_PAGINATION`           Activate pagination. Default is False.
-========================    =======================================================
+================================================    =====================================================
+Setting name (default value)                        what does it do?                              
+================================================    =====================================================
+`AUTHOR`                                            Default author (put your name)
+`CATEGORY_FEED` ('feeds/%s.atom.xml'[1]_)           Where to put the atom categories feeds.
+`CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the categories rss feeds.
+`CSS_FILE` (``'main.css'``)                         specify the CSS file you want to load
+`DATE_FORMATS` (``{}``)                             If you do manage multiple languages, you can
+                                                    set the date formatting here.
+`DEFAULT_CATEGORY` (``'misc'``)                     The default category to fallback on.
+`DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)           The default date format you want to use.
+`DEFAULT_LANG` (``'en'``)                           The default language to use.
+`DEFAULT_ORPHANS` (0)                               The minimum number of articles allowed on the
+                                                    last page. Use this when you don't want to
+                                                    have a last page with very few articles.
+`DEFAULT_PAGINATION` (5)                            The maximum number of articles to include on a
+                                                    page, not including orphans.
+`DISPLAY_PAGES_ON_MENU` (``True``)                  Display or not the pages on the menu of the
+                                                    template. Templates can follow or not this
+                                                    settings.
+`FALLBACK_ON_FS_DATE` (``True``)                    If True, pelican will use the file system
+                                                    dates infos (mtime) if it can't get
+                                                    informations from the metadata?
+`FEED` (``'feeds/all.atom.xml'``)                   relative url to output the atom feed.
+`FEED_RSS` (``None``, i.e. no RSS)                  relative url to output the rss feed.
+`JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.
+`KEEP_OUTPUT_DIRECTORY` (``False``)                 Keep the output directory and just update all
+                                                    the generated files.
+`LOCALE` (''[2]_)                                   Change the locale.
+`MARKUP` (``('rst', 'md')``)                        A list of available markup languages you want
+                                                    to use. For the moment, only available values
+                                                    are `rst` and `md`.
+`OUTPUT_PATH` (``'output/'``)                       Where to output the generated files.
+`PATH` (``None``)                                   path to look at for input files.
+`PDF_PROCESSOR` (``False``)                         Set to True if you want to have PDF versions
+                                                    of your documents. You will need to install
+                                                    `rst2pdf`.
+`RELATIVE_URL` (``True``)                           Defines if pelican should use relative urls or
+                                                    not.
+`REVERSE_ARCHIVE_ORDER` (``False``)                 Reverse the archives order. (True makes it in
+                                                    descending order: the newer first)
+`REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True makes it in
+                                                    descending order, default is alphabetically)
+`SITEURL`                                           base URL of your website. Note that this is
+                                                    not a way to tell pelican to use relative urls
+                                                    or static ones. You should rather use the
+                                                    `RELATIVE_URL` setting for such use.
+`SITENAME` (``'A Pelican Blog'``)                   Your site name,
+`SKRIBIT_TYPE`                                      The type of skribit widget (TAB or WIDGET).
+`SKRIBIT_TAB_COLOR`                                 Tab color (#XXXXXX, default #333333).
+`SKRIBIT_TAB_HORIZ`                                 Tab Distance from Left (% or distance, default Null).
+`SKRIBIT_TAB_VERT`                                  Tab Distance from Top (% or distance, default 20%).
+`SKRIBIT_TAB_PLACEMENT`                             Tab placement (Top, Bottom, Left or Right,
+                                                    default LEFT).
+`SKRIBIT_TAB_SITENAME`                              Tab identifier (See Skribit part below).
+`SKRIBIT_WIDGET_ID`                                 Widget identifier (See Skribit part below).
+`STATIC_PATHS`                                      The static paths you want to have accessible
+(``['images']``)                                    on the output path "static". By default,
+                                                    pelican will copy the 'images' folder to the
+                                                    output folder.
+`STATIC_THEME_PATHS` (``['static']``)               Static theme paths you want to copy. Default
+                                                    values is `static`, but if your theme have
+                                                    others static paths, you can put them here.
+`TAG_CLOUD_STEPS` (4)                               Count of different font sizes in the tag
+                                                    cloud.
+`TAG_CLOUD_MAX_ITEMS` (100)                         Maximum tags count in the cloud.
+`THEME`                                             theme to use to product the output. can be the
+                                                    complete static path to a theme folder, or
+                                                    chosen between the list of default themes (see
+                                                    below)
+`TRANSLATION_FEED` ('feeds/all-%s.atom.xml'[3]_)    Where to put the RSS feed for translations.
+`WITH_PAGINATION` (``False``)                       Activate pagination.
+================================================    =====================================================
+
+.. [1] %s is the name of the category.
+
+.. [2] Default is the system locale. Default is to delete the output directory.
+
+.. [3] %s is the language
 
 Skribit
 =======

From c8d20a70648debb1148a0e9bdd616652929a5a57 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 25 Apr 2011 00:36:15 +0200
Subject: [PATCH 0283/2864] fixed the writings of two variable names in the
 settings table

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 498f60cd..66152a3e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -54,7 +54,7 @@ Setting name (default value)                        what does it do?
                                                     are `rst` and `md`.
 `OUTPUT_PATH` (``'output/'``)                       Where to output the generated files.
 `PATH` (``None``)                                   path to look at for input files.
-`PDF_PROCESSOR` (``False``)                         Set to True if you want to have PDF versions
+`PDF_GENERATOR` (``False``)                         Set to True if you want to have PDF versions
                                                     of your documents. You will need to install
                                                     `rst2pdf`.
 `RELATIVE_URL` (``True``)                           Defines if pelican should use relative urls or
@@ -80,7 +80,7 @@ Setting name (default value)                        what does it do?
 (``['images']``)                                    on the output path "static". By default,
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
-`STATIC_THEME_PATHS` (``['static']``)               Static theme paths you want to copy. Default
+`THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
                                                     values is `static`, but if your theme have
                                                     others static paths, you can put them here.
 `TAG_CLOUD_STEPS` (4)                               Count of different font sizes in the tag

From 1ef913cb6434240640b2308cc1a2e220b056ce70 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 25 Apr 2011 00:38:15 +0200
Subject: [PATCH 0284/2864] various grammar fixes

---
 docs/settings.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 66152a3e..064bc64e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -81,12 +81,12 @@ Setting name (default value)                        what does it do?
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
 `THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
-                                                    values is `static`, but if your theme have
-                                                    others static paths, you can put them here.
+                                                    values is `static`, but if your theme has
+                                                    other static paths, you can put them here.
 `TAG_CLOUD_STEPS` (4)                               Count of different font sizes in the tag
                                                     cloud.
 `TAG_CLOUD_MAX_ITEMS` (100)                         Maximum tags count in the cloud.
-`THEME`                                             theme to use to product the output. can be the
+`THEME`                                             theme to use to produce the output. can be the
                                                     complete static path to a theme folder, or
                                                     chosen between the list of default themes (see
                                                     below)

From 6b62ed867379b6b6c4a513aaacaccc27113547a8 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 25 Apr 2011 00:39:21 +0200
Subject: [PATCH 0285/2864] removed a useless comma

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 064bc64e..a40ebbb9 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -67,7 +67,7 @@ Setting name (default value)                        what does it do?
                                                     not a way to tell pelican to use relative urls
                                                     or static ones. You should rather use the
                                                     `RELATIVE_URL` setting for such use.
-`SITENAME` (``'A Pelican Blog'``)                   Your site name,
+`SITENAME` (``'A Pelican Blog'``)                   Your site name
 `SKRIBIT_TYPE`                                      The type of skribit widget (TAB or WIDGET).
 `SKRIBIT_TAB_COLOR`                                 Tab color (#XXXXXX, default #333333).
 `SKRIBIT_TAB_HORIZ`                                 Tab Distance from Left (% or distance, default Null).

From 60807d1958eca0d46d77870e0353d0b3215436e1 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 25 Apr 2011 00:40:42 +0200
Subject: [PATCH 0286/2864] removed a confusing question mark

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index a40ebbb9..795f220c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -42,7 +42,7 @@ Setting name (default value)                        what does it do?
                                                     settings.
 `FALLBACK_ON_FS_DATE` (``True``)                    If True, pelican will use the file system
                                                     dates infos (mtime) if it can't get
-                                                    informations from the metadata?
+                                                    informations from the metadata
 `FEED` (``'feeds/all.atom.xml'``)                   relative url to output the atom feed.
 `FEED_RSS` (``None``, i.e. no RSS)                  relative url to output the rss feed.
 `JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.

From 51f760edc2ab4a2ab18c1e5916eb30a7270849f1 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Tue, 26 Apr 2011 00:39:31 +0200
Subject: [PATCH 0287/2864] move a default value to the table cell it belongs
 to

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 795f220c..d4340006 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -76,8 +76,8 @@ Setting name (default value)                        what does it do?
                                                     default LEFT).
 `SKRIBIT_TAB_SITENAME`                              Tab identifier (See Skribit part below).
 `SKRIBIT_WIDGET_ID`                                 Widget identifier (See Skribit part below).
-`STATIC_PATHS`                                      The static paths you want to have accessible
-(``['images']``)                                    on the output path "static". By default,
+`STATIC_PATHS` (``['images']``)                     The static paths you want to have accessible
+                                                    on the output path "static". By default,
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
 `THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default

From bb24c05b903d338b4f5ca9b79dcd0295bcb5c39f Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Tue, 26 Apr 2011 02:37:56 +0200
Subject: [PATCH 0288/2864] added missing whitespace in the CLI help

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 195ada34..08ddc716 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -91,8 +91,8 @@ def main():
     parser.add_argument(dest='path', nargs='?',
         help='Path where to find the content files')
     parser.add_argument('-t', '--theme-path', dest='theme',
-        help='Path where to find the theme templates. If not specified, it will'
-             'use the default one included with pelican.')
+        help='Path where to find the theme templates. If not specified, it'
+             'will use the default one included with pelican.')
     parser.add_argument('-o', '--output', dest='output',
         help='Where to output the generated files. If not specified, a directory'
              ' will be created, named "output" in the current path.')

From f9819e0c712ad7cb2e06c1b5158d46314b9a70ee Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Tue, 26 Apr 2011 02:39:57 +0200
Subject: [PATCH 0289/2864] another whitespace mistake in the CLI help

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 08ddc716..12d12210 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -97,8 +97,8 @@ def main():
         help='Where to output the generated files. If not specified, a directory'
              ' will be created, named "output" in the current path.')
     parser.add_argument('-m', '--markup', default=None, dest='markup',
-        help='the list of markup language to use (rst or md). Please indicate them'
-             'separated by commas')
+        help='the list of markup language to use (rst or md). Please indicate '
+             'them separated by commas')
     parser.add_argument('-s', '--settings', dest='settings',
         help='the settings of the application. Default to None.')
     parser.add_argument('-k', '--keep-output-directory', dest='keep',

From deb5b8a98f56bf73ced4a1e14227767aa008cd29 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Tue, 26 Apr 2011 02:49:00 +0200
Subject: [PATCH 0290/2864] typos, grammar mistakes, minor whitespace issues

---
 docs/themes.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 9f8b8765..301e090e 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -32,17 +32,17 @@ To make your own theme, you must follow the following structure::
   just examples. Put what you need here.
 
 * `templates` contains all the templates that will be used to generate the content.
-  I've just put the mandatory templates here, you can define your own if it helps 
+  I've just put the mandatory templates here, you can define your own if it helps
   you to organize yourself while doing the theme.
  
 Templates and variables
 =======================
 
 It's using a simple syntax, that you can embbed into your html pages.
-This document describes which templates should exists on a theme, and which
+This document describes which templates should exist on a theme, and which
 variables will be passed to each template, while generating it.
 
-All templates will receive the variables defined in your settings file, if they 
+All templates will receive the variables defined in your settings file, if they
 are in caps. You can access them directly. 
 
 Common variables
@@ -114,7 +114,7 @@ page_name               'category/`category_name`'. Useful for pagination
 article.html
 -------------
 
-This template will be processed for each article. .html files will be outputed
+This template will be processed for each article. .html files will be output
 in output/`article_name`.html. Here are the specific variables it gets.
 
 =============   ===================================================
@@ -152,8 +152,8 @@ page_name               'tag/`tag_name`'. Useful for pagination links.
 Include skribit script
 ======================
 
-In order to support skribit scripts in your themes, you must following these
-actions :
+In order to support skribit scripts in your themes, you must perform these
+actions:
 
  * Copy `skribit_tab_script.html` and `skribit_widget_script.html` in your
    templates directory.

From d2bb85ab6ce534b92457f08ad0333c2a4e90358b Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 25 Apr 2011 23:29:45 +0100
Subject: [PATCH 0291/2864] Thanks Simon Liedtke

---
 THANKS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/THANKS b/THANKS
index 4a8a52a5..39f54e61 100644
--- a/THANKS
+++ b/THANKS
@@ -15,3 +15,4 @@ bugs or giving ideas. Thanks to them !
 - Samuel Martin
 - Marcus Fredriksson
 - Günter Kolousek
+- Simon Liedtke

From 15de7d45c9c0402f3669169ab0605b999d89726e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 25 Apr 2011 23:33:13 +0100
Subject: [PATCH 0292/2864] Little doc fix

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d4340006..363ffc87 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -167,7 +167,7 @@ The `notmyidea` theme can make good use of the following settings. I recommend
 to use them too in your themes.
 
 =======================   =======================================================
-Setting name              what it does ?
+Setting name              what does it do ?
 =======================   =======================================================
 `DISQUS_SITENAME`         Pelican can handle disqus comments, specify the
                           sitename you've filled in on disqus

From ca2030f62c652b8c62ef8c45800634379ab6717a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 26 Apr 2011 00:34:03 +0100
Subject: [PATCH 0293/2864] theme switch

---
 docs/_themes/LICENSE                          |  37 --
 docs/_themes/README                           |  31 --
 docs/_themes/flask/layout.html                |  16 -
 docs/_themes/flask/relations.html             |  19 -
 docs/_themes/flask/static/flasky.css_t        | 387 ------------------
 docs/_themes/flask/static/small_flask.css     |  70 ----
 docs/_themes/flask/theme.conf                 |   7 -
 docs/_themes/flask_small/static/flasky.css_t  | 287 -------------
 docs/_themes/flask_theme_support.py           |  86 ----
 .../{flask_small => pelican}/layout.html      |   0
 docs/_themes/pelican/static/pelican.css_t     | 247 +++++++++++
 .../{flask_small => pelican}/theme.conf       |   4 +-
 docs/conf.py                                  |   4 +-
 13 files changed, 251 insertions(+), 944 deletions(-)
 delete mode 100644 docs/_themes/LICENSE
 delete mode 100644 docs/_themes/README
 delete mode 100644 docs/_themes/flask/layout.html
 delete mode 100644 docs/_themes/flask/relations.html
 delete mode 100644 docs/_themes/flask/static/flasky.css_t
 delete mode 100644 docs/_themes/flask/static/small_flask.css
 delete mode 100644 docs/_themes/flask/theme.conf
 delete mode 100644 docs/_themes/flask_small/static/flasky.css_t
 delete mode 100644 docs/_themes/flask_theme_support.py
 rename docs/_themes/{flask_small => pelican}/layout.html (100%)
 create mode 100644 docs/_themes/pelican/static/pelican.css_t
 rename docs/_themes/{flask_small => pelican}/theme.conf (58%)

diff --git a/docs/_themes/LICENSE b/docs/_themes/LICENSE
deleted file mode 100644
index 8daab7ee..00000000
--- a/docs/_themes/LICENSE
+++ /dev/null
@@ -1,37 +0,0 @@
-Copyright (c) 2010 by Armin Ronacher.
-
-Some rights reserved.
-
-Redistribution and use in source and binary forms of the theme, with or
-without modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the following
-  disclaimer in the documentation and/or other materials provided
-  with the distribution.
-
-* The names of the contributors may not be used to endorse or
-  promote products derived from this software without specific
-  prior written permission.
-
-We kindly ask you to only use these themes in an unmodified manner just
-for Flask and Flask-related products, not for unrelated projects.  If you
-like the visual style and want to use it for your own projects, please
-consider making some larger changes to the themes (such as changing
-font faces, sizes, colors or margins).
-
-THIS THEME IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS THEME, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/_themes/README b/docs/_themes/README
deleted file mode 100644
index b3292bdf..00000000
--- a/docs/_themes/README
+++ /dev/null
@@ -1,31 +0,0 @@
-Flask Sphinx Styles
-===================
-
-This repository contains sphinx styles for Flask and Flask related
-projects.  To use this style in your Sphinx documentation, follow
-this guide:
-
-1. put this folder as _themes into your docs folder.  Alternatively
-   you can also use git submodules to check out the contents there.
-2. add this to your conf.py:
-
-   sys.path.append(os.path.abspath('_themes'))
-   html_theme_path = ['_themes']
-   html_theme = 'flask'
-
-The following themes exist:
-
-- 'flask' - the standard flask documentation theme for large
-  projects
-- 'flask_small' - small one-page theme.  Intended to be used by
-  very small addon libraries for flask.
-
-The following options exist for the flask_small theme:
-
-   [options]
-   index_logo = ''              filename of a picture in _static
-                                to be used as replacement for the
-                                h1 in the index.rst file.
-   index_logo_height = 120px    height of the index logo
-   github_fork = ''             repository name on github for the
-                                "fork me" badge
diff --git a/docs/_themes/flask/layout.html b/docs/_themes/flask/layout.html
deleted file mode 100644
index d7c87927..00000000
--- a/docs/_themes/flask/layout.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{%- extends "basic/layout.html" %}
-{%- block extrahead %}
-  {{ super() }}
-  {% if theme_touch_icon %}
-  <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}" />
-  {% endif %}
-  <link media="only screen and (max-device-width: 480px)" href="{{
-    pathto('_static/small_flask.css', 1) }}" type= "text/css" rel="stylesheet" />
-{% endblock %}
-{%- block relbar2 %}{% endblock %}
-{%- block footer %}
-    <div class="footer">
-      &copy; Copyright {{ copyright }}.
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
-    </div>
-{%- endblock %}
diff --git a/docs/_themes/flask/relations.html b/docs/_themes/flask/relations.html
deleted file mode 100644
index 3bbcde85..00000000
--- a/docs/_themes/flask/relations.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h3>Related Topics</h3>
-<ul>
-  <li><a href="{{ pathto(master_doc) }}">Documentation overview</a><ul>
-  {%- for parent in parents %}
-  <li><a href="{{ parent.link|e }}">{{ parent.title }}</a><ul>
-  {%- endfor %}
-    {%- if prev %}
-      <li>Previous: <a href="{{ prev.link|e }}" title="{{ _('previous chapter')
-        }}">{{ prev.title }}</a></li>
-    {%- endif %}
-    {%- if next %}
-      <li>Next: <a href="{{ next.link|e }}" title="{{ _('next chapter')
-        }}">{{ next.title }}</a></li>
-    {%- endif %}
-  {%- for parent in parents %}
-  </ul></li>
-  {%- endfor %}
-  </ul></li>
-</ul>
diff --git a/docs/_themes/flask/static/flasky.css_t b/docs/_themes/flask/static/flasky.css_t
deleted file mode 100644
index 0de60eee..00000000
--- a/docs/_themes/flask/static/flasky.css_t
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * flasky.css_t
- * ~~~~~~~~~~~~
- *
- * :copyright: Copyright 2010 by Armin Ronacher.
- * :license: Flask Design License, see LICENSE for details.
- */
-
-{% set page_width = '940px' %}
-{% set sidebar_width = '220px' %}
- 
-@import url("basic.css");
- 
-/* -- page layout ----------------------------------------------------------- */
- 
-body {
-    font-family: 'Georgia', serif;
-    font-size: 17px;
-    background-color: white;
-    color: #000;
-    margin: 0;
-    padding: 0;
-}
-
-div.document {
-    width: {{ page_width }};
-    margin: 30px auto 0 auto;
-}
-
-div.documentwrapper {
-    float: left;
-    width: 100%;
-}
-
-div.bodywrapper {
-    margin: 0 0 0 {{ sidebar_width }};
-}
-
-div.sphinxsidebar {
-    width: {{ sidebar_width }};
-}
-
-hr {
-    border: 1px solid #B1B4B6;
-}
- 
-div.body {
-    background-color: #ffffff;
-    color: #3E4349;
-    padding: 0 30px 0 30px;
-}
-
-img.floatingflask {
-    padding: 0 0 10px 10px;
-    float: right;
-}
- 
-div.footer {
-    width: {{ page_width }};
-    margin: 20px auto 30px auto;
-    font-size: 14px;
-    color: #888;
-    text-align: right;
-}
-
-div.footer a {
-    color: #888;
-}
-
-div.related {
-    display: none;
-}
- 
-div.sphinxsidebar a {
-    color: #444;
-    text-decoration: none;
-    border-bottom: 1px dotted #999;
-}
-
-div.sphinxsidebar a:hover {
-    border-bottom: 1px solid #999;
-}
- 
-div.sphinxsidebar {
-    font-size: 14px;
-    line-height: 1.5;
-}
-
-div.sphinxsidebarwrapper {
-    padding: 18px 10px;
-}
-
-div.sphinxsidebarwrapper p.logo {
-    padding: 0 0 20px 0;
-    margin: 0;
-    text-align: center;
-}
- 
-div.sphinxsidebar h3,
-div.sphinxsidebar h4 {
-    font-family: 'Garamond', 'Georgia', serif;
-    color: #444;
-    font-size: 24px;
-    font-weight: normal;
-    margin: 0 0 5px 0;
-    padding: 0;
-}
-
-div.sphinxsidebar h4 {
-    font-size: 20px;
-}
- 
-div.sphinxsidebar h3 a {
-    color: #444;
-}
-
-div.sphinxsidebar p.logo a,
-div.sphinxsidebar h3 a,
-div.sphinxsidebar p.logo a:hover,
-div.sphinxsidebar h3 a:hover {
-    border: none;
-}
- 
-div.sphinxsidebar p {
-    color: #555;
-    margin: 10px 0;
-}
-
-div.sphinxsidebar ul {
-    margin: 10px 0;
-    padding: 0;
-    color: #000;
-}
- 
-div.sphinxsidebar input {
-    border: 1px solid #ccc;
-    font-family: 'Georgia', serif;
-    font-size: 1em;
-}
- 
-/* -- body styles ----------------------------------------------------------- */
- 
-a {
-    color: #004B6B;
-    text-decoration: underline;
-}
- 
-a:hover {
-    color: #6D4100;
-    text-decoration: underline;
-}
- 
-div.body h1,
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6 {
-    font-family: 'Garamond', 'Georgia', serif;
-    font-weight: normal;
-    margin: 30px 0px 10px 0px;
-    padding: 0;
-}
- 
-div.body h1 { margin-top: 0; padding-top: 0; font-size: 240%; }
-div.body h2 { font-size: 180%; }
-div.body h3 { font-size: 150%; }
-div.body h4 { font-size: 130%; }
-div.body h5 { font-size: 100%; }
-div.body h6 { font-size: 100%; }
- 
-a.headerlink {
-    color: #ddd;
-    padding: 0 4px;
-    text-decoration: none;
-}
- 
-a.headerlink:hover {
-    color: #444;
-    background: #eaeaea;
-}
- 
-div.body p, div.body dd, div.body li {
-    line-height: 1.4em;
-}
-
-div.admonition {
-    background: #fafafa;
-    margin: 20px -30px;
-    padding: 10px 30px;
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-}
-
-div.admonition tt.xref, div.admonition a tt {
-    border-bottom: 1px solid #fafafa;
-}
-
-dd div.admonition {
-    margin-left: -60px;
-    padding-left: 60px;
-}
-
-div.admonition p.admonition-title {
-    font-family: 'Garamond', 'Georgia', serif;
-    font-weight: normal;
-    font-size: 24px;
-    margin: 0 0 10px 0;
-    padding: 0;
-    line-height: 1;
-}
-
-div.admonition p.last {
-    margin-bottom: 0;
-}
-
-div.highlight {
-    background-color: white;
-}
-
-dt:target, .highlight {
-    background: #FAF3E8;
-}
-
-div.note {
-    background-color: #eee;
-    border: 1px solid #ccc;
-}
- 
-div.seealso {
-    background-color: #ffc;
-    border: 1px solid #ff6;
-}
- 
-div.topic {
-    background-color: #eee;
-}
- 
-p.admonition-title {
-    display: inline;
-}
- 
-p.admonition-title:after {
-    content: ":";
-}
-
-pre, tt {
-    font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
-    font-size: 0.9em;
-}
-
-img.screenshot {
-}
-
-tt.descname, tt.descclassname {
-    font-size: 0.95em;
-}
-
-tt.descname {
-    padding-right: 0.08em;
-}
-
-img.screenshot {
-    -moz-box-shadow: 2px 2px 4px #eee;
-    -webkit-box-shadow: 2px 2px 4px #eee;
-    box-shadow: 2px 2px 4px #eee;
-}
-
-table.docutils {
-    border: 1px solid #888;
-    -moz-box-shadow: 2px 2px 4px #eee;
-    -webkit-box-shadow: 2px 2px 4px #eee;
-    box-shadow: 2px 2px 4px #eee;
-}
-
-table.docutils td, table.docutils th {
-    border: 1px solid #888;
-    padding: 0.25em 0.7em;
-}
-
-table.field-list, table.footnote {
-    border: none;
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
-}
-
-table.footnote {
-    margin: 15px 0;
-    width: 100%;
-    border: 1px solid #eee;
-    background: #fdfdfd;
-    font-size: 0.9em;
-}
-
-table.footnote + table.footnote {
-    margin-top: -15px;
-    border-top: none;
-}
-
-table.field-list th {
-    padding: 0 0.8em 0 0;
-}
-
-table.field-list td {
-    padding: 0;
-}
-
-table.footnote td.label {
-    width: 0px;
-    padding: 0.3em 0 0.3em 0.5em;
-}
-
-table.footnote td {
-    padding: 0.3em 0.5em;
-}
-
-dl {
-    margin: 0;
-    padding: 0;
-}
-
-dl dd {
-    margin-left: 30px;
-}
-
-blockquote {
-    margin: 0 0 0 30px;
-    padding: 0;
-}
-
-ul, ol {
-    margin: 10px 0 10px 30px;
-    padding: 0;
-}
- 
-pre {
-    background: #eee;
-    padding: 7px 30px;
-    margin: 15px -30px;
-    line-height: 1.3em;
-}
-
-dl pre, blockquote pre, li pre {
-    margin-left: -60px;
-    padding-left: 60px;
-}
-
-dl dl pre {
-    margin-left: -90px;
-    padding-left: 90px;
-}
- 
-tt {
-    background-color: #ecf0f3;
-    color: #222;
-    /* padding: 1px 2px; */
-}
-
-tt.xref, a tt {
-    background-color: #FBFBFB;
-    border-bottom: 1px solid white;
-}
-
-a.reference {
-    text-decoration: none;
-    border-bottom: 1px dotted #004B6B;
-}
-
-a.reference:hover {
-    border-bottom: 1px solid #6D4100;
-}
-
-a.footnote-reference {
-    text-decoration: none;
-    font-size: 0.7em;
-    vertical-align: top;
-    border-bottom: 1px dotted #004B6B;
-}
-
-a.footnote-reference:hover {
-    border-bottom: 1px solid #6D4100;
-}
-
-a:hover tt {
-    background: #EEE;
-}
diff --git a/docs/_themes/flask/static/small_flask.css b/docs/_themes/flask/static/small_flask.css
deleted file mode 100644
index 1c6df309..00000000
--- a/docs/_themes/flask/static/small_flask.css
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * small_flask.css_t
- * ~~~~~~~~~~~~~~~~~
- *
- * :copyright: Copyright 2010 by Armin Ronacher.
- * :license: Flask Design License, see LICENSE for details.
- */
-
-body {
-    margin: 0;
-    padding: 20px 30px;
-}
-
-div.documentwrapper {
-    float: none;
-    background: white;
-}
-
-div.sphinxsidebar {
-    display: block;
-    float: none;
-    width: 102.5%;
-    margin: 50px -30px -20px -30px;
-    padding: 10px 20px;
-    background: #333;
-    color: white;
-}
-
-div.sphinxsidebar h3, div.sphinxsidebar h4, div.sphinxsidebar p,
-div.sphinxsidebar h3 a {
-    color: white;
-}
-
-div.sphinxsidebar a {
-    color: #aaa;
-}
-
-div.sphinxsidebar p.logo {
-    display: none;
-}
-
-div.document {
-    width: 100%;
-    margin: 0;
-}
-
-div.related {
-    display: block;
-    margin: 0;
-    padding: 10px 0 20px 0;
-}
-
-div.related ul,
-div.related ul li {
-    margin: 0;
-    padding: 0;
-}
-
-div.footer {
-    display: none;
-}
-
-div.bodywrapper {
-    margin: 0;
-}
-
-div.body {
-    min-height: 0;
-    padding: 0;
-}
diff --git a/docs/_themes/flask/theme.conf b/docs/_themes/flask/theme.conf
deleted file mode 100644
index 307a1f0d..00000000
--- a/docs/_themes/flask/theme.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = flasky.css
-pygments_style = flask_theme_support.FlaskyStyle
-
-[options]
-touch_icon = 
diff --git a/docs/_themes/flask_small/static/flasky.css_t b/docs/_themes/flask_small/static/flasky.css_t
deleted file mode 100644
index fe2141c5..00000000
--- a/docs/_themes/flask_small/static/flasky.css_t
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * flasky.css_t
- * ~~~~~~~~~~~~
- *
- * Sphinx stylesheet -- flasky theme based on nature theme.
- *
- * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
- 
-@import url("basic.css");
- 
-/* -- page layout ----------------------------------------------------------- */
- 
-body {
-    font-family: 'Georgia', serif;
-    font-size: 17px;
-    color: #000;
-    background: white;
-    margin: 0;
-    padding: 0;
-}
-
-div.documentwrapper {
-    float: left;
-    width: 100%;
-}
-
-div.bodywrapper {
-    margin: 40px auto 0 auto;
-    width: 700px;
-}
-
-hr {
-    border: 1px solid #B1B4B6;
-}
- 
-div.body {
-    background-color: #ffffff;
-    color: #3E4349;
-    padding: 0 30px 30px 30px;
-}
-
-img.floatingflask {
-    padding: 0 0 10px 10px;
-    float: right;
-}
- 
-div.footer {
-    text-align: right;
-    color: #888;
-    padding: 10px;
-    font-size: 14px;
-    width: 650px;
-    margin: 0 auto 40px auto;
-}
- 
-div.footer a {
-    color: #888;
-    text-decoration: underline;
-}
- 
-div.related {
-    line-height: 32px;
-    color: #888;
-}
-
-div.related ul {
-    padding: 0 0 0 10px;
-}
- 
-div.related a {
-    color: #444;
-}
- 
-/* -- body styles ----------------------------------------------------------- */
- 
-a {
-    color: #004B6B;
-    text-decoration: underline;
-}
- 
-a:hover {
-    color: #6D4100;
-    text-decoration: underline;
-}
-
-div.body {
-    padding-bottom: 40px; /* saved for footer */
-}
- 
-div.body h1,
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6 {
-    font-family: 'Garamond', 'Georgia', serif;
-    font-weight: normal;
-    margin: 30px 0px 10px 0px;
-    padding: 0;
-}
-
-{% if theme_index_logo %}
-div.indexwrapper h1 {
-    text-indent: -999999px;
-    background: url({{ theme_index_logo }}) no-repeat center center;
-    height: {{ theme_index_logo_height }};
-}
-{% endif %}
- 
-div.body h2 { font-size: 180%; }
-div.body h3 { font-size: 150%; }
-div.body h4 { font-size: 130%; }
-div.body h5 { font-size: 100%; }
-div.body h6 { font-size: 100%; }
- 
-a.headerlink {
-    color: white;
-    padding: 0 4px;
-    text-decoration: none;
-}
- 
-a.headerlink:hover {
-    color: #444;
-    background: #eaeaea;
-}
- 
-div.body p, div.body dd, div.body li {
-    line-height: 1.4em;
-}
-
-div.admonition {
-    background: #fafafa;
-    margin: 20px -30px;
-    padding: 10px 30px;
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-}
-
-div.admonition p.admonition-title {
-    font-family: 'Garamond', 'Georgia', serif;
-    font-weight: normal;
-    font-size: 24px;
-    margin: 0 0 10px 0;
-    padding: 0;
-    line-height: 1;
-}
-
-div.admonition p.last {
-    margin-bottom: 0;
-}
-
-div.highlight{
-    background-color: white;
-}
-
-dt:target, .highlight {
-    background: #FAF3E8;
-}
-
-div.note {
-    background-color: #eee;
-    border: 1px solid #ccc;
-}
- 
-div.seealso {
-    background-color: #ffc;
-    border: 1px solid #ff6;
-}
- 
-div.topic {
-    background-color: #eee;
-}
- 
-div.warning {
-    background-color: #ffe4e4;
-    border: 1px solid #f66;
-}
- 
-p.admonition-title {
-    display: inline;
-}
- 
-p.admonition-title:after {
-    content: ":";
-}
-
-pre, tt {
-    font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
-    font-size: 0.85em;
-}
-
-img.screenshot {
-}
-
-tt.descname, tt.descclassname {
-    font-size: 0.95em;
-}
-
-tt.descname {
-    padding-right: 0.08em;
-}
-
-img.screenshot {
-    -moz-box-shadow: 2px 2px 4px #eee;
-    -webkit-box-shadow: 2px 2px 4px #eee;
-    box-shadow: 2px 2px 4px #eee;
-}
-
-table.docutils {
-    border: 1px solid #888;
-    -moz-box-shadow: 2px 2px 4px #eee;
-    -webkit-box-shadow: 2px 2px 4px #eee;
-    box-shadow: 2px 2px 4px #eee;
-}
-
-table.docutils td, table.docutils th {
-    border: 1px solid #888;
-    padding: 0.25em 0.7em;
-}
-
-table.field-list, table.footnote {
-    border: none;
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
-}
-
-table.footnote {
-    margin: 15px 0;
-    width: 100%;
-    border: 1px solid #eee;
-}
-
-table.field-list th {
-    padding: 0 0.8em 0 0;
-}
-
-table.field-list td {
-    padding: 0;
-}
-
-table.footnote td {
-    padding: 0.5em;
-}
-
-dl {
-    margin: 0;
-    padding: 0;
-}
-
-dl dd {
-    margin-left: 30px;
-}
- 
-pre {
-    padding: 0;
-    margin: 15px -30px;
-    padding: 8px;
-    line-height: 1.3em;
-    padding: 7px 30px;
-    background: #eee;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-}
-
-dl pre {
-    margin-left: -60px;
-    padding-left: 60px;
-}
-
-tt {
-    background-color: #ecf0f3;
-    color: #222;
-    /* padding: 1px 2px; */
-}
-
-tt.xref, a tt {
-    background-color: #FBFBFB;
-}
-
-a:hover tt {
-    background: #EEE;
-}
diff --git a/docs/_themes/flask_theme_support.py b/docs/_themes/flask_theme_support.py
deleted file mode 100644
index 33f47449..00000000
--- a/docs/_themes/flask_theme_support.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# flasky extensions.  flasky pygments style based on tango style
-from pygments.style import Style
-from pygments.token import Keyword, Name, Comment, String, Error, \
-     Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
-
-
-class FlaskyStyle(Style):
-    background_color = "#f8f8f8"
-    default_style = ""
-
-    styles = {
-        # No corresponding class for the following:
-        #Text:                     "", # class:  ''
-        Whitespace:                "underline #f8f8f8",      # class: 'w'
-        Error:                     "#a40000 border:#ef2929", # class: 'err'
-        Other:                     "#000000",                # class 'x'
-
-        Comment:                   "italic #8f5902", # class: 'c'
-        Comment.Preproc:           "noitalic",       # class: 'cp'
-
-        Keyword:                   "bold #004461",   # class: 'k'
-        Keyword.Constant:          "bold #004461",   # class: 'kc'
-        Keyword.Declaration:       "bold #004461",   # class: 'kd'
-        Keyword.Namespace:         "bold #004461",   # class: 'kn'
-        Keyword.Pseudo:            "bold #004461",   # class: 'kp'
-        Keyword.Reserved:          "bold #004461",   # class: 'kr'
-        Keyword.Type:              "bold #004461",   # class: 'kt'
-
-        Operator:                  "#582800",   # class: 'o'
-        Operator.Word:             "bold #004461",   # class: 'ow' - like keywords
-
-        Punctuation:               "bold #000000",   # class: 'p'
-
-        # because special names such as Name.Class, Name.Function, etc.
-        # are not recognized as such later in the parsing, we choose them
-        # to look the same as ordinary variables.
-        Name:                      "#000000",        # class: 'n'
-        Name.Attribute:            "#c4a000",        # class: 'na' - to be revised
-        Name.Builtin:              "#004461",        # class: 'nb'
-        Name.Builtin.Pseudo:       "#3465a4",        # class: 'bp'
-        Name.Class:                "#000000",        # class: 'nc' - to be revised
-        Name.Constant:             "#000000",        # class: 'no' - to be revised
-        Name.Decorator:            "#888",           # class: 'nd' - to be revised
-        Name.Entity:               "#ce5c00",        # class: 'ni'
-        Name.Exception:            "bold #cc0000",   # class: 'ne'
-        Name.Function:             "#000000",        # class: 'nf'
-        Name.Property:             "#000000",        # class: 'py'
-        Name.Label:                "#f57900",        # class: 'nl'
-        Name.Namespace:            "#000000",        # class: 'nn' - to be revised
-        Name.Other:                "#000000",        # class: 'nx'
-        Name.Tag:                  "bold #004461",   # class: 'nt' - like a keyword
-        Name.Variable:             "#000000",        # class: 'nv' - to be revised
-        Name.Variable.Class:       "#000000",        # class: 'vc' - to be revised
-        Name.Variable.Global:      "#000000",        # class: 'vg' - to be revised
-        Name.Variable.Instance:    "#000000",        # class: 'vi' - to be revised
-
-        Number:                    "#990000",        # class: 'm'
-
-        Literal:                   "#000000",        # class: 'l'
-        Literal.Date:              "#000000",        # class: 'ld'
-
-        String:                    "#4e9a06",        # class: 's'
-        String.Backtick:           "#4e9a06",        # class: 'sb'
-        String.Char:               "#4e9a06",        # class: 'sc'
-        String.Doc:                "italic #8f5902", # class: 'sd' - like a comment
-        String.Double:             "#4e9a06",        # class: 's2'
-        String.Escape:             "#4e9a06",        # class: 'se'
-        String.Heredoc:            "#4e9a06",        # class: 'sh'
-        String.Interpol:           "#4e9a06",        # class: 'si'
-        String.Other:              "#4e9a06",        # class: 'sx'
-        String.Regex:              "#4e9a06",        # class: 'sr'
-        String.Single:             "#4e9a06",        # class: 's1'
-        String.Symbol:             "#4e9a06",        # class: 'ss'
-
-        Generic:                   "#000000",        # class: 'g'
-        Generic.Deleted:           "#a40000",        # class: 'gd'
-        Generic.Emph:              "italic #000000", # class: 'ge'
-        Generic.Error:             "#ef2929",        # class: 'gr'
-        Generic.Heading:           "bold #000080",   # class: 'gh'
-        Generic.Inserted:          "#00A000",        # class: 'gi'
-        Generic.Output:            "#888",           # class: 'go'
-        Generic.Prompt:            "#745334",        # class: 'gp'
-        Generic.Strong:            "bold #000000",   # class: 'gs'
-        Generic.Subheading:        "bold #800080",   # class: 'gu'
-        Generic.Traceback:         "bold #a40000",   # class: 'gt'
-    }
diff --git a/docs/_themes/flask_small/layout.html b/docs/_themes/pelican/layout.html
similarity index 100%
rename from docs/_themes/flask_small/layout.html
rename to docs/_themes/pelican/layout.html
diff --git a/docs/_themes/pelican/static/pelican.css_t b/docs/_themes/pelican/static/pelican.css_t
new file mode 100644
index 00000000..164073e1
--- /dev/null
+++ b/docs/_themes/pelican/static/pelican.css_t
@@ -0,0 +1,247 @@
+/*
+ * pelican.css_t
+ * ~~~~~~~~~~~~
+ *
+ * Sphinx stylesheet -- pelican theme, based on the nature theme
+ *
+ * :copyright: Copyright 2011 by Alexis Metaireau.
+ */
+ 
+@import url("basic.css");
+ 
+/* -- page layout ----------------------------------------------------------- */
+ 
+body {
+    font-family: Arial, sans-serif;
+    font-size: 100%;
+    background-color: white;
+    color: #555;
+    margin: 0;
+    padding: 0;
+}
+
+div.documentwrapper {
+    width: 70%;
+    margin: auto;
+}
+
+div.bodywrapper {
+    margin: 0 0 0 230px;
+}
+
+hr {
+    border: 1px solid #B1B4B6;
+}
+ 
+div.document {
+    background-color: #eee;
+}
+ 
+div.body {
+    background-color: #ffffff;
+    color: #3E4349;
+    padding: 0 30px 30px 30px;
+    font-size: 0.9em;
+}
+ 
+div.footer {
+    color: #555;
+    width: 100%;
+    padding: 13px 0;
+    text-align: center;
+    font-size: 75%;
+}
+ 
+div.footer a {
+    color: #444;
+    text-decoration: underline;
+}
+ 
+div.related {
+    background-color: #6BA81E;
+    line-height: 32px;
+    color: #fff;
+    text-shadow: 0px 1px 0 #444;
+    font-size: 0.9em;
+}
+ 
+div.related a {
+    color: #E2F3CC;
+}
+ 
+div.sphinxsidebar {
+    font-size: 0.75em;
+    line-height: 1.5em;
+}
+
+div.sphinxsidebarwrapper{
+    padding: 20px 0;
+}
+ 
+div.sphinxsidebar h3,
+div.sphinxsidebar h4 {
+    font-family: Arial, sans-serif;
+    color: #222;
+    font-size: 1.2em;
+    font-weight: normal;
+    margin: 0;
+    padding: 5px 10px;
+    background-color: #ddd;
+    text-shadow: 1px 1px 0 white
+}
+
+div.sphinxsidebar h4{
+    font-size: 1.1em;
+}
+ 
+div.sphinxsidebar h3 a {
+    color: #444;
+}
+ 
+ 
+div.sphinxsidebar p {
+    color: #888;
+    padding: 5px 20px;
+}
+ 
+div.sphinxsidebar p.topless {
+}
+ 
+div.sphinxsidebar ul {
+    margin: 10px 20px;
+    padding: 0;
+    color: #000;
+}
+ 
+div.sphinxsidebar a {
+    color: #444;
+}
+ 
+div.sphinxsidebar input {
+    border: 1px solid #ccc;
+    font-family: sans-serif;
+    font-size: 1em;
+}
+
+div.sphinxsidebar input[type=text]{
+    margin-left: 20px;
+}
+ 
+/* -- body styles ----------------------------------------------------------- */
+ 
+a {
+    color: #005B81;
+    text-decoration: none;
+}
+ 
+a:hover {
+    color: #E32E00;
+    text-decoration: underline;
+}
+ 
+div.body h1,
+div.body h2,
+div.body h3,
+div.body h4,
+div.body h5,
+div.body h6 {
+    font-family: Arial, sans-serif;
+    font-weight: normal;
+    color: #212224;
+    margin: 30px 0px 10px 0px;
+    padding: 5px 0 5px 10px;
+    text-shadow: 0px 1px 0 white
+}
+ 
+div.body h1 { 
+    border-top: 20px solid white; 
+    margin-top: 0; 
+    font-size: 250%; 
+    text-align: center;
+}
+div.body h2 { font-size: 150%; background-color: #C8D5E3; }
+div.body h3 { font-size: 120%; background-color: #D8DEE3; }
+div.body h4 { font-size: 110%; background-color: #D8DEE3; }
+div.body h5 { font-size: 100%; background-color: #D8DEE3; }
+div.body h6 { font-size: 100%; background-color: #D8DEE3; }
+ 
+a.headerlink {
+    color: #c60f0f;
+    font-size: 0.8em;
+    padding: 0 4px 0 4px;
+    text-decoration: none;
+}
+ 
+a.headerlink:hover {
+    background-color: #c60f0f;
+    color: white;
+}
+ 
+div.body p, div.body dd, div.body li {
+    line-height: 1.5em;
+}
+ 
+div.admonition p.admonition-title + p {
+    display: inline;
+}
+
+div.highlight{
+    background-color: #111;
+}
+
+div.note {
+    background-color: #eee;
+    border: 1px solid #ccc;
+}
+ 
+div.seealso {
+    background-color: #ffc;
+    border: 1px solid #ff6;
+}
+ 
+div.topic {
+    background-color: #eee;
+}
+ 
+div.warning {
+    background-color: #ffe4e4;
+    border: 1px solid #f66;
+}
+ 
+p.admonition-title {
+    display: inline;
+}
+ 
+p.admonition-title:after {
+    content: ":";
+}
+ 
+pre {
+    padding: 10px;
+    background-color: #111;
+    color: #fff;
+    line-height: 1.2em;
+    border: 1px solid #C6C9CB;
+    font-size: 1.1em;
+    margin: 1.5em 0 1.5em 0;
+    -webkit-box-shadow: 1px 1px 1px #d8d8d8;
+    -moz-box-shadow: 1px 1px 1px #d8d8d8;
+}
+ 
+tt {
+    background-color: #ecf0f3;
+    color: #222;
+    /* padding: 1px 2px; */
+    font-size: 1.1em;
+    font-family: monospace;
+}
+
+.viewcode-back {
+    font-family: Arial, sans-serif;
+}
+
+div.viewcode-block:target {
+    background-color: #f4debf;
+    border-top: 1px solid #ac9;
+    border-bottom: 1px solid #ac9;
+}
diff --git a/docs/_themes/flask_small/theme.conf b/docs/_themes/pelican/theme.conf
similarity index 58%
rename from docs/_themes/flask_small/theme.conf
rename to docs/_themes/pelican/theme.conf
index 07036d14..ffbb7945 100644
--- a/docs/_themes/flask_small/theme.conf
+++ b/docs/_themes/pelican/theme.conf
@@ -1,8 +1,8 @@
 [theme]
 inherit = basic
-stylesheet = flasky.css
+stylesheet = pelican.css
 nosidebar = true
-pygments_style = flask_theme_support.FlaskyStyle
+pygments_style = fruity
 
 [options]
 index_logo_height = 120px
diff --git a/docs/conf.py b/docs/conf.py
index 507e30a3..76167eaf 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,7 +14,6 @@ master_doc = 'index'
 project = u'Pelican'
 copyright = u'2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
-pygments_style = 'sphinx'
 version = "2"
 release = version
 
@@ -24,12 +23,13 @@ release = version
 # a list of builtin themes.
 sys.path.append(os.path.abspath('_themes'))
 html_theme_path = ['_themes']
-html_theme = 'flask_small'
+html_theme = 'pelican'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
+    'nosidebar': True,
     'index_logo': 'pelican.png',
     'github_fork': 'ametaireau/pelican',
 }

From 3d2ae33799fc334aaa24f6be7cf9557c1d3e2811 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 26 Apr 2011 00:40:16 +0100
Subject: [PATCH 0294/2864] update the theme (logo)

---
 docs/_themes/pelican/static/pelican.css_t | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/_themes/pelican/static/pelican.css_t b/docs/_themes/pelican/static/pelican.css_t
index 164073e1..3cb2a3c1 100644
--- a/docs/_themes/pelican/static/pelican.css_t
+++ b/docs/_themes/pelican/static/pelican.css_t
@@ -34,7 +34,6 @@ hr {
 }
  
 div.document {
-    background-color: #eee;
 }
  
 div.body {
@@ -153,12 +152,20 @@ div.body h6 {
     text-shadow: 0px 1px 0 white
 }
  
+{% if theme_index_logo %}
+div.indexwrapper h1 {
+    text-indent: -999999px;
+    background: url({{ theme_index_logo }}) no-repeat center center;
+    height: {{ theme_index_logo_height }};
+}
+{% endif %}
 div.body h1 { 
     border-top: 20px solid white; 
     margin-top: 0; 
     font-size: 250%; 
     text-align: center;
 }
+
 div.body h2 { font-size: 150%; background-color: #C8D5E3; }
 div.body h3 { font-size: 120%; background-color: #D8DEE3; }
 div.body h4 { font-size: 110%; background-color: #D8DEE3; }

From 91cb42d7d887d1899617dd5bcf76685ba8f67865 Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Tue, 26 Apr 2011 12:23:45 +0200
Subject: [PATCH 0295/2864] add a KISS plugin system

---
 pelican/__init__.py | 25 +++++++++++++++++++++++--
 pelican/settings.py |  1 +
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 12d12210..cf99295e 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,5 +1,8 @@
 import argparse
 import os
+import pkgutil
+
+from blinker import signal
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator)
@@ -13,7 +16,7 @@ VERSION = "2.6.0"
 
 class Pelican(object):
     def __init__(self, settings=None, path=None, theme=None, output_path=None,
-            markup=None, keep=False):
+            markup=None, keep=False, plugins_path=None):
         """Read the settings, and performs some checks on the environment
         before doing anything else.
         """
@@ -41,6 +44,15 @@ class Pelican(object):
                 self.theme = theme_path
             else:
                 raise Exception("Impossible to find the theme %s" % theme)
+        
+        plugins_path = plugins_path or settings['PLUGINS_PATH']
+        if plugins_path:
+            plugins_path = os.path.abspath(plugins_path)
+            self.load_plugins(plugins_path)
+        else:
+            self.plugins = None
+        
+        signal('pelican_initialized').send(self)
 
     def run(self):
         """Run the generators and return"""
@@ -81,6 +93,13 @@ class Pelican(object):
 
     def get_writer(self):
         return Writer(self.output_path, settings=self.settings)
+    
+    def load_plugins(self,path):
+        loaded = []
+        for module_loader, name, ispkg in pkgutil.walk_packages(path=[path,]):
+            loaded.append( module_loader.find_module(name).load_module(name) )
+        self.plugins = loaded
+        
 
 
 
@@ -116,6 +135,8 @@ def main():
     parser.add_argument('-r', '--autoreload', dest='autoreload', action='store_true',
             help="Relaunch pelican each time a modification occurs on the content"
                  "files")
+    parser.add_argument('-p', '--plugins', default=None, dest='plugins_path',
+            help='the path of plugins to use')
     args = parser.parse_args()
 
     log.init(args.verbosity)
@@ -134,7 +155,7 @@ def main():
         cls = getattr(module, cls_name)
 
     try:
-        pelican = cls(settings, args.path, args.theme, args.output, markup, args.keep)
+        pelican = cls(settings, args.path, args.theme, args.output, markup, args.keep, args.plugins_path)
         if args.autoreload:
             while True:
                 try:
diff --git a/pelican/settings.py b/pelican/settings.py
index 6c0918a0..3786b7f5 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -37,6 +37,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'WITH_PAGINATION': False,
                    'DEFAULT_PAGINATION': 5,
                    'DEFAULT_ORPHANS': 0,
+                   'PLUGINS_PATH': None,
                   }
 
 def read_settings(filename):

From 4fb5d2b31e755d346e1ff5b7f6d188e0f3ef8b09 Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Tue, 26 Apr 2011 12:26:56 +0200
Subject: [PATCH 0296/2864] add plugin sample

---
 plugins_samples/initialized.py | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 plugins_samples/initialized.py

diff --git a/plugins_samples/initialized.py b/plugins_samples/initialized.py
new file mode 100644
index 00000000..f104c275
--- /dev/null
+++ b/plugins_samples/initialized.py
@@ -0,0 +1,7 @@
+from blinker import signal
+
+
+def test(sender):
+    print "%s initialized !!" % sender
+
+signal('pelican_initialized').connect(test)

From dfe4d4e1320d3652fcf11bfd4983df4bf7fdc8e1 Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Tue, 26 Apr 2011 13:16:09 +0200
Subject: [PATCH 0297/2864] add gravatar plugin and pelican_generate_context
 signal

---
 pelican/generators.py       |  5 +++++
 plugins_samples/gravatar.py | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 plugins_samples/gravatar.py

diff --git a/pelican/generators.py b/pelican/generators.py
index 569d5f50..02131532 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -8,6 +8,8 @@ import os
 import math
 import random
 
+from blinker import signal
+
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
 
@@ -92,6 +94,7 @@ class ArticlesGenerator(Generator):
         self.dates = {}
         self.tags = defaultdict(list)
         self.categories = defaultdict(list)
+        self.signal = {'pelican_generate_context' : signal('pelican_generate_context')}
         super(ArticlesGenerator, self).__init__(*args, **kwargs)
 
     def generate_feeds(self, writer):
@@ -200,6 +203,8 @@ class ArticlesGenerator(Generator):
                 and self.settings['FALLBACK_ON_FS_DATE']:
                     metadatas['date'] = datetime.fromtimestamp(os.stat(f).st_ctime)
 
+            self.signal['pelican_generate_context'].send(self, metadatas=metadatas)
+
             article = Article(content, metadatas, settings=self.settings,
                               filename=f)
             if not is_valid_content(article, f):
diff --git a/plugins_samples/gravatar.py b/plugins_samples/gravatar.py
new file mode 100644
index 00000000..ca08984c
--- /dev/null
+++ b/plugins_samples/gravatar.py
@@ -0,0 +1,20 @@
+import hashlib
+
+from blinker import signal
+
+
+def add_gravatar(generator, metadatas):
+    
+    #first check email
+    if 'email' not in metadatas.keys()\
+        and 'AUTHOR_EMAIL' in generator.settings.keys():
+            metadatas['email'] = generator.settings['AUTHOR_EMAIL']
+            
+    #then add gravatar url
+    if 'email' in metadatas.keys():
+        gravatar_url = "http://www.gravatar.com/avatar/" + \
+                        hashlib.md5(metadatas['email'].lower()).hexdigest()
+        metadatas["author_gravatar"] = gravatar_url
+    
+    
+signal('pelican_generate_context').connect(add_gravatar)

From eef5fc8f9969da8a32a5371dea4c1be897141ca0 Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Tue, 26 Apr 2011 19:44:40 +0200
Subject: [PATCH 0298/2864] rename signal

---
 pelican/generators.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 02131532..38826a49 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -94,7 +94,7 @@ class ArticlesGenerator(Generator):
         self.dates = {}
         self.tags = defaultdict(list)
         self.categories = defaultdict(list)
-        self.signal = {'pelican_generate_context' : signal('pelican_generate_context')}
+        self.signal = {'pelican_article_generate_context' : signal('pelican_article_generate_context')}
         super(ArticlesGenerator, self).__init__(*args, **kwargs)
 
     def generate_feeds(self, writer):
@@ -203,7 +203,7 @@ class ArticlesGenerator(Generator):
                 and self.settings['FALLBACK_ON_FS_DATE']:
                     metadatas['date'] = datetime.fromtimestamp(os.stat(f).st_ctime)
 
-            self.signal['pelican_generate_context'].send(self, metadatas=metadatas)
+            self.signal['pelican_article_generate_context'].send(self, metadatas=metadatas)
 
             article = Article(content, metadatas, settings=self.settings,
                               filename=f)

From 91831eb5259757c3b1da586cb95080f6b719b99a Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Tue, 26 Apr 2011 19:44:55 +0200
Subject: [PATCH 0299/2864] add doc

---
 plugins_samples/gravatar.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/plugins_samples/gravatar.py b/plugins_samples/gravatar.py
index ca08984c..9887e97e 100644
--- a/plugins_samples/gravatar.py
+++ b/plugins_samples/gravatar.py
@@ -1,7 +1,26 @@
 import hashlib
 
 from blinker import signal
+"""
+Gravata plugin for Pelican
+==========================
 
+Simply add author_gravatar variable in article's context, which contain 
+the gravatar url.
+
+Settings:
+---------
+
+Add AUTHOR_EMAIL to your settings file to define default author email
+
+Article metadatas:
+------------------
+
+:email:  article's author email
+
+If one of them are defined the author_gravatar variable is added to 
+article's context.
+"""
 
 def add_gravatar(generator, metadatas):
     
@@ -17,4 +36,4 @@ def add_gravatar(generator, metadatas):
         metadatas["author_gravatar"] = gravatar_url
     
     
-signal('pelican_generate_context').connect(add_gravatar)
+signal('pelican_article_generate_context').connect(add_gravatar)

From 09567fa99ea0cb27ab4f1ca146c909cdacda814c Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Tue, 26 Apr 2011 20:02:05 +0200
Subject: [PATCH 0300/2864] add global license capabability as a plugin

---
 plugins_samples/global_license.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 plugins_samples/global_license.py

diff --git a/plugins_samples/global_license.py b/plugins_samples/global_license.py
new file mode 100644
index 00000000..feae64e2
--- /dev/null
+++ b/plugins_samples/global_license.py
@@ -0,0 +1,23 @@
+from blinker import signal
+
+"""
+License plugin for Pelican
+==========================
+
+Simply add license variable in article's context, which contain 
+the license text.
+
+Settings:
+---------
+
+Add LICENSE to your settings file to define default license.
+
+"""
+
+def add_license(generator, metadatas):
+    if 'license' not in metadatas.keys()\
+        and 'LICENSE' in self.settings.keys():
+            metadatas['license'] = self.settings['LICENSE']
+
+
+signal('pelican_article_generate_context').connect(add_license)

From f4b2b628744efbda99f9b0c43035f1d49c8cecb0 Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Tue, 26 Apr 2011 20:04:44 +0200
Subject: [PATCH 0301/2864] fix mistake

---
 plugins_samples/global_license.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins_samples/global_license.py b/plugins_samples/global_license.py
index feae64e2..eeb20965 100644
--- a/plugins_samples/global_license.py
+++ b/plugins_samples/global_license.py
@@ -16,8 +16,8 @@ Add LICENSE to your settings file to define default license.
 
 def add_license(generator, metadatas):
     if 'license' not in metadatas.keys()\
-        and 'LICENSE' in self.settings.keys():
-            metadatas['license'] = self.settings['LICENSE']
+        and 'LICENSE' in generator.settings.keys():
+            metadatas['license'] = generator.settings['LICENSE']
 
 
 signal('pelican_article_generate_context').connect(add_license)

From 07edd96088f0ac7e4d39f86853eacc64fc8623e5 Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Tue, 26 Apr 2011 23:13:28 +0200
Subject: [PATCH 0302/2864] add blinker to requires

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 936a3171..4744d0fb 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import sys
 
 VERSION = "2.6.0" # find a better way to do so.
 
-requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown']
+requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown', 'blinker']
 if sys.version_info < (2,7):
     requires.append('argparse')
 

From 4a5f4fe6e4cb249659ab83346261d4cfe3cf07fe Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Wed, 27 Apr 2011 11:45:59 +0200
Subject: [PATCH 0303/2864] Fix internal linkref for allow TOC

---
 pelican/writers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index ae407743..3679e249 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -201,7 +201,7 @@ class Writer(object):
             """
             content = input._content
 
-            hrefs = re.compile(r'<\s*[^\>]*href\s*=\s*(["\'])(.*?)\1')
+            hrefs = re.compile(r'<\s*[^\>]*href\s*=(^!#)\s*(["\'])(.*?)\1')
             srcs = re.compile(r'<\s*[^\>]*src\s*=\s*(["\'])(.*?)\1')
 
             matches = hrefs.findall(content)

From 20b0d1d4ae3aff83b49d542652dd44c7ab9872bb Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Wed, 27 Apr 2011 18:09:55 +0200
Subject: [PATCH 0304/2864] Fix little bug when declaring plugins path in
 config file

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index cf99295e..1a618b45 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -47,7 +47,7 @@ class Pelican(object):
         
         plugins_path = plugins_path or settings['PLUGINS_PATH']
         if plugins_path:
-            plugins_path = os.path.abspath(plugins_path)
+            plugins_path = os.path.abspath(os.path.expanduser(plugins_path))
             self.load_plugins(plugins_path)
         else:
             self.plugins = None

From 1264b81bb67fd3c0f33c06287a75d8ef7adff1e1 Mon Sep 17 00:00:00 2001
From: Mikhail Korobov <kmike84@gmail.com>
Date: Fri, 6 May 2011 16:29:15 +0600
Subject: [PATCH 0305/2864] Make setup.py executable

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 setup.py

diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 936a3171..b90802d8
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 from setuptools import setup
 import sys
 
@@ -17,7 +18,7 @@ setup(
     long_description=open('README.rst').read(),
     packages = ['pelican'],
     include_package_data = True,
-    install_requires = requires, 
+    install_requires = requires,
     scripts = ['bin/pelican'],
     classifiers = ['Development Status :: 5 - Production/Stable',
                    'Environment :: Console',

From 06246557c5e299aaf68828af8263c265612f55e7 Mon Sep 17 00:00:00 2001
From: Mikhail Korobov <kmike84@gmail.com>
Date: Fri, 6 May 2011 16:44:12 +0600
Subject: [PATCH 0306/2864] A couple of docstrings are fixed (they were
 refering obsolete params)

---
 pelican/contents.py |  3 +--
 pelican/writers.py  | 11 +++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index dc6bfceb..aa765570 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -6,8 +6,7 @@ class Page(object):
     """Represents a page
     Given a content, and metadatas, create an adequate object.
 
-    :param string: the string to parse, containing the original content.
-    :param markup: the markup language to use while parsing.
+    :param content: the string to parse, containing the original content.
     """
     mandatory_properties = ('title',)
 
diff --git a/pelican/writers.py b/pelican/writers.py
index 3679e249..1bac2c68 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -44,9 +44,8 @@ class Writer(object):
         Return the feed. If no output_path or filename is specified, just return
         the feed object.
 
-        :param articles: the articles to put on the feed.
+        :param elements: the articles to put on the feed.
         :param context: the context to get the feed metadata.
-        :param output_path: where to output the file.
         :param filename: the filename to output.
         :param feed_type: the feed type to use (atom or rss)
         """
@@ -139,7 +138,7 @@ class Writer(object):
                                                    '%s_page' % key: page})
                 if page_num > 0:
                     ext = '.' + paginated_name.rsplit('.')[-1]
-                    paginated_name = paginated_name.replace(ext, 
+                    paginated_name = paginated_name.replace(ext,
                             '%s%s' % (page_num + 1, ext))
 
                 _write_file(template, paginated_localcontext, self.output_path,
@@ -149,7 +148,7 @@ class Writer(object):
             _write_file(template, localcontext, self.output_path, name)
 
     def update_context_contents(self, name, context):
-        """Recursively run the context to find elements (articles, pages, etc) 
+        """Recursively run the context to find elements (articles, pages, etc)
         whose content getter needs to
         be modified in order to deal with relative paths.
 
@@ -188,12 +187,12 @@ class Writer(object):
         return context
 
     def inject_update_method(self, name, item):
-        """Replace the content attribute getter of an element by a function 
+        """Replace the content attribute getter of an element by a function
         that will deals with its relatives paths.
         """
 
         def _update_object_content(name, input):
-            """Change all the relatives paths of the input content to relatives 
+            """Change all the relatives paths of the input content to relatives
             paths suitable fot the ouput content
 
             :param name: path of the output.

From 3a301b18593b401eef3e51b0ecb6f43434869dac Mon Sep 17 00:00:00 2001
From: Mikhail Korobov <kmike84@gmail.com>
Date: Fri, 6 May 2011 16:45:27 +0600
Subject: [PATCH 0307/2864] Python 2.5 compatibility

---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index aa765570..4953bb14 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -89,6 +89,6 @@ def is_valid_content(content, f):
     try:
         content.check_properties()
         return True
-    except NameError as e:
+    except NameError, e:
         error(u"Skipping %s: impossible to find informations about '%s'" % (f, e))
         return False

From f3a8f45de4e1f549937b37f74a48671d1b69f33f Mon Sep 17 00:00:00 2001
From: Mikhail Korobov <kmike84@gmail.com>
Date: Fri, 6 May 2011 16:56:02 +0600
Subject: [PATCH 0308/2864] One more python 2.5 fix

---
 pelican/writers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/writers.py b/pelican/writers.py
index 1bac2c68..65cfb202 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import with_statement
 import os
 import re
 from codecs import open

From 70ea12aec3b3e7feb2e34d100e59532ed22c6180 Mon Sep 17 00:00:00 2001
From: Mikhail Korobov <kmike84@gmail.com>
Date: Fri, 6 May 2011 17:01:34 +0600
Subject: [PATCH 0309/2864] os.walk does not support followlinks kwargs in
 python 2.5

---
 pelican/generators.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 569d5f50..0feb06b9 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -35,7 +35,7 @@ class Generator(object):
             loader=FileSystemLoader(self._templates_path),
             extensions=self.settings.get('JINJA_EXTENSIONS', []),
         )
-        
+
         # get custom Jinja filters from user settings
         custom_filters = self.settings.get('JINJA_FILTERS', {})
         self._env.filters.update(custom_filters)
@@ -63,7 +63,13 @@ class Generator(object):
             extensions = self.markup
 
         files = []
-        for root, dirs, temp_files in os.walk(path, followlinks=True):
+
+        try:
+            iter = os.walk(path, followlinks=True)
+        except TypeError: # python 2.5 does not support followlinks
+            iter = os.walk(path)
+
+        for root, dirs, temp_files in iter:
             for e in exclude:
                 if e in dirs:
                     dirs.remove(e)
@@ -116,11 +122,11 @@ class ArticlesGenerator(Generator):
         if 'TAG_FEED' in self.settings:
             for tag, arts in self.tags.items():
                 arts.sort(key=attrgetter('date'), reverse=True)
-                writer.write_feed(arts, self.context, 
+                writer.write_feed(arts, self.context,
                         self.settings['TAG_FEED'] % tag)
 
                 if 'TAG_FEED_RSS' in self.settings:
-                    writer.write_feed(arts, self.context, 
+                    writer.write_feed(arts, self.context,
                             self.settings['TAG_FEED_RSS'] % tag, feed_type='rss')
 
         translations_feeds = defaultdict(list)
@@ -142,7 +148,7 @@ class ArticlesGenerator(Generator):
             relative_urls = self.settings.get('RELATIVE_URLS')
         )
 
-        # to minimize the number of relative path stuff modification 
+        # to minimize the number of relative path stuff modification
         # in writer, articles pass first
         article_template = self.get_template('article')
         for article in chain(self.translations, self.articles):
@@ -220,7 +226,7 @@ class ArticlesGenerator(Generator):
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
         self.dates = list(self.articles)
-        self.dates.sort(key=attrgetter('date'), 
+        self.dates.sort(key=attrgetter('date'),
                 reverse=self.context['REVERSE_ARCHIVE_ORDER'])
 
         # create tag cloud
@@ -236,7 +242,7 @@ class ArticlesGenerator(Generator):
         if tags:
                 max_count = max(tags)
         steps = self.settings.get('TAG_CLOUD_STEPS')
-        
+
         # calculate word sizes
         self.tag_cloud = [
             (
@@ -327,7 +333,7 @@ class PdfGenerator(Generator):
             # print "Generating pdf for", obj.filename, " in ", output_pdf
             self.pdfcreator.createPdf(text=open(obj.filename), output=output_pdf)
             info(u' [ok] writing %s' % output_pdf)
-    
+
     def generate_context(self):
         pass
 

From 0441127c41c5f7caa194d585ca838121da6e9ac7 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 6 May 2011 19:23:37 +0200
Subject: [PATCH 0310/2864] logging star import cleanups

---
 pelican/log.py   | 4 +++-
 pelican/utils.py | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index 72b7a017..4b3dee71 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,4 +1,6 @@
-from  logging import *
+from logging import CRITICAL, ERROR,  WARN, INFO, DEBUG
+from logging import critical, error, info, warning, warn, debug
+from logging import Formatter, getLogger, StreamHandler
 import sys
 import os
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 732b1830..864717ae 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -6,7 +6,7 @@ from datetime import datetime
 from codecs import open as _open
 from itertools import groupby
 from operator import attrgetter
-from pelican.log import *
+from pelican.log import warning, info
 
 
 def get_date(string):

From 9c99db7119f853264f980e231ca6ea3ac8066a6f Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 6 May 2011 19:24:25 +0200
Subject: [PATCH 0311/2864] better log info for doubls slug/empty slug

---
 pelican/utils.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/utils.py b/pelican/utils.py
index 864717ae..c113efdd 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -164,9 +164,13 @@ def process_translations(content_list):
         len_ = len(default_lang_items)
         if len_ > 1:
             warning(u'there are %s variants of "%s"' % (len_, slug))
+            for x in default_lang_items:
+                warning('    %s' % x.filename)
         elif len_ == 0:
             default_lang_items = items[:1]
 
+        if not slug:
+            warning('empty slug for %r' %( default_lang_items[0].filename,))
         index.extend(default_lang_items)
         translations.extend(filter(
             lambda x: x not in default_lang_items,

From e69b55dbcdc110b588dd4c25e5bde133f3371853 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 6 May 2011 19:25:11 +0200
Subject: [PATCH 0312/2864] use absolute import for the rstdirectives

---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 4e1d7b2e..6cadcd4d 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -3,7 +3,7 @@ try:
     from docutils import core
 
     # import the directives to have pygments support
-    import rstdirectives
+    from pelican import rstdirectives
 except ImportError:
     core = False
 try:

From 3c37704b3b819bee5d441c75a6fd59a64279a0e8 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 6 May 2011 19:26:25 +0200
Subject: [PATCH 0313/2864] use unicode.strip instead of string.strip of the
 string module for metadata processors

---
 pelican/readers.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 6cadcd4d..c69e156e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -11,15 +11,14 @@ try:
 except ImportError:
     Markdown = False
 import re
-import string
 
 from pelican.utils import get_date, open
 
 
 _METADATAS_PROCESSORS = {
-    'tags': lambda x: map(string.strip, x.split(',')),
+    'tags': lambda x: map(unicode.strip, x.split(',')),
     'date': lambda x: get_date(x),
-    'status': string.strip,
+    'status': unicode.strip,
 }
 
 

From e7c75147d25e09f6a92fb2da9af64ee36d42ebfa Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 6 May 2011 19:28:14 +0200
Subject: [PATCH 0314/2864] pass along the source filename of the rst files for
 better errors

---
 pelican/readers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index c69e156e..92bb7bce 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -45,7 +45,9 @@ class RstReader(Reader):
         metadatas = self._parse_metadata(text)
         extra_params = {'input_encoding': 'unicode',
                         'initial_header_level': '2'}
-        rendered_content = core.publish_parts(text, writer_name='html',
+        rendered_content = core.publish_parts(text,
+                                              source_path=filename,
+                                              writer_name='html',
                                               settings_overrides=extra_params)
         title = rendered_content.get('title')
         content = rendered_content.get('body')

From b270c1bac4b6ef5cf30f4f0289cc290eb69520d4 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 6 May 2011 19:29:01 +0200
Subject: [PATCH 0315/2864] stupidly replace rmtree by a pass, since we dont
 want to rmtree the output dir

---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index c113efdd..f9f17489 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -62,7 +62,7 @@ def clean_output_dir(path):
 
     # remove all the existing content from the output folder
     try:
-        shutil.rmtree(path)
+        pass # WEEEEE dont kill
     except Exception:
         pass
 

From 24c3447d6c3cdff80a35e159935c059d4db1714a Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 6 May 2011 21:04:29 +0200
Subject: [PATCH 0316/2864] make file-times directly use walk, also skip
 dot-dirs

---
 pelican/utils.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index f9f17489..42a4fc0c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -192,9 +192,10 @@ def files_changed(path, extensions):
 
     def file_times(path):
         """Return the last time files have been modified"""
-        for top_level in os.listdir(path):
-            for root, dirs, files in os.walk(top_level):
-                for file in filter(with_extension, files):
+        for root, dirs, files in os.walk(path):
+            dirs[:] = [x for x in dirs if x[0] != '.']
+            for file in files:
+                if any(file.endswith(ext) for ext in extensions):
                     yield os.stat(os.path.join(root, file)).st_mtime
 
     global LAST_MTIME

From d03a412e5be455a85ad0a4b624c71bbc30fb1ffb Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 6 May 2011 22:05:13 +0200
Subject: [PATCH 0317/2864] add a sleep to the autoreload loop since we dont
 need too high cpu load

---
 pelican/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 12d12210..c525c66a 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,5 +1,6 @@
 import argparse
 import os
+import time
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator)
@@ -142,6 +143,7 @@ def main():
                         pelican.run()
                 except KeyboardInterrupt:
                     break
+                time.sleep(.5)  # sleep to avoid cpu load
         else:
             pelican.run()
     except Exception, e:

From ffe8e00046bbd085e6732856a9e558cfe27d2ccf Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 6 May 2011 22:09:49 +0200
Subject: [PATCH 0318/2864] move the sleep so we correctly handle keyboard
 interupts

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index c525c66a..52775f94 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -141,9 +141,9 @@ def main():
                 try:
                     if files_changed(pelican.path, pelican.markup):
                         pelican.run()
+                    time.sleep(.5)  # sleep to avoid cpu load
                 except KeyboardInterrupt:
                     break
-                time.sleep(.5)  # sleep to avoid cpu load
         else:
             pelican.run()
     except Exception, e:

From 252ba7d53a4dc7e20306693f2bb569e456b90612 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sat, 7 May 2011 18:53:10 +0200
Subject: [PATCH 0319/2864] pelican.log.warning added to pelican.log.__all__

---
 pelican/log.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/log.py b/pelican/log.py
index 72b7a017..fce2b681 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -94,6 +94,7 @@ __all__ = [
     "debug", 
     "info", 
     "warn", 
+    "warning",
     "error", 
     "critical", 
     "DEBUG", 

From e09444fa89ba6d809ae900448892d6ee6e62ea89 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 7 May 2011 19:27:33 +0100
Subject: [PATCH 0320/2864] Don't delete the output dir as a default behaviour.

Fixes #107
---
 docs/settings.rst   |  2 +-
 pelican/__init__.py | 23 ++++++++++++-----------
 pelican/settings.py |  2 +-
 pelican/utils.py    |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 363ffc87..0b3b7034 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -46,7 +46,7 @@ Setting name (default value)                        what does it do?
 `FEED` (``'feeds/all.atom.xml'``)                   relative url to output the atom feed.
 `FEED_RSS` (``None``, i.e. no RSS)                  relative url to output the rss feed.
 `JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.
-`KEEP_OUTPUT_DIRECTORY` (``False``)                 Keep the output directory and just update all
+`DELETE_OUTPUT_DIRECTORY` (``False``)               Delete the output directory instead of just updating all 
                                                     the generated files.
 `LOCALE` (''[2]_)                                   Change the locale.
 `MARKUP` (``('rst', 'md')``)                        A list of available markup languages you want
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 52775f94..74bb1058 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -14,7 +14,7 @@ VERSION = "2.6.0"
 
 class Pelican(object):
     def __init__(self, settings=None, path=None, theme=None, output_path=None,
-            markup=None, keep=False):
+            markup=None, delete_outputdir=False):
         """Read the settings, and performs some checks on the environment
         before doing anything else.
         """
@@ -32,7 +32,7 @@ class Pelican(object):
         output_path = output_path or settings['OUTPUT_PATH']
         self.output_path = os.path.realpath(output_path)
         self.markup = markup or settings['MARKUP']
-        self.keep = keep or settings['KEEP_OUTPUT_DIRECTORY']
+        self.delete_outputdir = delete_outputdir or settings['DELETE_OUTPUT_DIRECTORY']
 
         # find the theme in pelican.theme if the given one does not exists
         if not os.path.exists(self.theme):
@@ -55,7 +55,7 @@ class Pelican(object):
                 self.theme,
                 self.output_path,
                 self.markup,
-                self.keep
+                self.delete_outputdir
             ) for cls in self.get_generator_classes()
         ]
 
@@ -63,8 +63,10 @@ class Pelican(object):
             if hasattr(p, 'generate_context'):
                 p.generate_context()
 
-        # erase the directory if it is not the source
-        if os.path.realpath(self.path).startswith(self.output_path) and not self.keep:
+        # erase the directory if it is not the source and if that's 
+        # explicitely asked
+        if (self.delete_outputdir and 
+                os.path.realpath(self.path).startswith(self.output_path)):
             clean_output_dir(self.output_path)
 
         writer = self.get_writer()
@@ -101,11 +103,9 @@ def main():
         help='the list of markup language to use (rst or md). Please indicate '
              'them separated by commas')
     parser.add_argument('-s', '--settings', dest='settings',
-        help='the settings of the application. Default to None.')
-    parser.add_argument('-k', '--keep-output-directory', dest='keep',
-            action='store_true',
-        help='Keep the output directory and just update all the generated files.'
-             'Default is to delete the output directory.')
+        help='the settings of the application. Default to False.')
+    parser.add_argument('-d', '--delete-output-directory', dest='delete_outputdir',
+        action='store_true', help='Delete the output directory.')
     parser.add_argument('-v', '--verbose', action='store_const', const=log.INFO, dest='verbosity',
             help='Show all messages')
     parser.add_argument('-q', '--quiet', action='store_const', const=log.CRITICAL, dest='verbosity',
@@ -135,7 +135,8 @@ def main():
         cls = getattr(module, cls_name)
 
     try:
-        pelican = cls(settings, args.path, args.theme, args.output, markup, args.keep)
+        pelican = cls(settings, args.path, args.theme, args.output, markup,
+                args.delete_outputdir)
         if args.autoreload:
             while True:
                 try:
diff --git a/pelican/settings.py b/pelican/settings.py
index 6c0918a0..76a2d3e9 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -21,7 +21,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'CSS_FILE': 'main.css',
                    'REVERSE_ARCHIVE_ORDER': False,
                    'REVERSE_CATEGORY_ORDER': False,
-                   'KEEP_OUTPUT_DIRECTORY': False,
+                   'DELETE_OUTPUT_DIRECTORY': False,
                    'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
                    'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
diff --git a/pelican/utils.py b/pelican/utils.py
index 42a4fc0c..6b456e17 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -62,7 +62,7 @@ def clean_output_dir(path):
 
     # remove all the existing content from the output folder
     try:
-        pass # WEEEEE dont kill
+        shutil.rmtree(path)
     except Exception:
         pass
 

From 56effc24cbc940bf4423ec24693a045700c5f43e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 7 May 2011 19:56:55 +0100
Subject: [PATCH 0321/2864] Add a DEFAULT_METADATA setting.

It is now possible to have soem default metadata defined in the settings. Fixes #98
---
 docs/settings.rst                 | 2 ++
 pelican/contents.py               | 5 ++++-
 pelican/settings.py               | 1 +
 samples/content/cat1/article1.rst | 1 +
 samples/pelican.conf.py           | 3 +++
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 0b3b7034..282ce912 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -32,6 +32,8 @@ Setting name (default value)                        what does it do?
 `DEFAULT_CATEGORY` (``'misc'``)                     The default category to fallback on.
 `DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)           The default date format you want to use.
 `DEFAULT_LANG` (``'en'``)                           The default language to use.
+`DEFAULT_METADATA` (``()``)                         A list containing the default metadata for 
+                                                    each content (articles, pages, etc.)
 `DEFAULT_ORPHANS` (0)                               The minimum number of articles allowed on the
                                                     last page. Use this when you don't want to
                                                     have a last page with very few articles.
diff --git a/pelican/contents.py b/pelican/contents.py
index dc6bfceb..886cfdb2 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -16,7 +16,10 @@ class Page(object):
         self.translations = []
 
         self.status = "published"  # default value
-        for key, value in metadatas.items():
+
+        local_metadata = dict(settings['DEFAULT_METADATA'])
+        local_metadata.update(metadatas)
+        for key, value in local_metadata.items():
             setattr(self, key.lower(), value)
 
         if not hasattr(self, 'author'):
diff --git a/pelican/settings.py b/pelican/settings.py
index 76a2d3e9..c42a8bb0 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -37,6 +37,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'WITH_PAGINATION': False,
                    'DEFAULT_PAGINATION': 5,
                    'DEFAULT_ORPHANS': 0,
+                   'DEFAULT_METADATA': (),
                   }
 
 def read_settings(filename):
diff --git a/samples/content/cat1/article1.rst b/samples/content/cat1/article1.rst
index 4789543b..1148a8f9 100644
--- a/samples/content/cat1/article1.rst
+++ b/samples/content/cat1/article1.rst
@@ -2,5 +2,6 @@ Article 1
 #########
 
 :date: 2011-02-17
+:yeah: oh yeah !
 
 Article 1
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 07c49d01..20eb1605 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -24,4 +24,7 @@ SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
           ('lastfm', 'http://lastfm.com/user/akounet'),
           ('github', 'http://github.com/ametaireau'),)
 
+# global metadata to all the contents
+DEFAULT_METADATA = (('yeah', 'it is'),)
+
 STATIC_PATHS = ["pictures",]

From 52f2a8383a70bf630a94dc6af5995ac2cda746b4 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 7 May 2011 20:00:30 +0100
Subject: [PATCH 0322/2864] Metadata, not metadatas.

---
 docs/internals.rst    | 10 +++++-----
 pelican/contents.py   |  6 +++---
 pelican/generators.py | 16 ++++++++--------
 pelican/readers.py    | 26 +++++++++++++-------------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/docs/internals.rst b/docs/internals.rst
index 12127646..17541c0c 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -49,14 +49,14 @@ Take a look to the Markdown reader::
             md = Markdown(extensions = ['meta', 'codehilite'])
             content = md.convert(text)
             
-            metadatas = {}
+            metadata = {}
             for name, value in md.Meta.items():
-                if name in _METADATAS_FIELDS:
-                    meta = _METADATAS_FIELDS[name](value[0])
+                if name in _METADATA_FIELDS:
+                    meta = _METADATA_FIELDS[name](value[0])
                 else:
                     meta = value[0]
-                metadatas[name.lower()] = meta
-            return content, metadatas
+                metadata[name.lower()] = meta
+            return content, metadata
 
 Simple isn't it ?
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 886cfdb2..6358a34a 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -4,21 +4,21 @@ from pelican.log import *
 
 class Page(object):
     """Represents a page
-    Given a content, and metadatas, create an adequate object.
+    Given a content, and metadata, create an adequate object.
 
     :param string: the string to parse, containing the original content.
     :param markup: the markup language to use while parsing.
     """
     mandatory_properties = ('title',)
 
-    def __init__(self, content, metadatas={}, settings={}, filename=None):
+    def __init__(self, content, metadata={}, settings={}, filename=None):
         self._content = content
         self.translations = []
 
         self.status = "published"  # default value
 
         local_metadata = dict(settings['DEFAULT_METADATA'])
-        local_metadata.update(metadatas)
+        local_metadata.update(metadata)
         for key, value in local_metadata.items():
             setattr(self, key.lower(), value)
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 569d5f50..3948afdc 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -183,10 +183,10 @@ class ArticlesGenerator(Generator):
         files = self.get_files(self.path, exclude=['pages',])
         all_articles = []
         for f in files:
-            content, metadatas = read_file(f)
+            content, metadata = read_file(f)
 
             # if no category is set, use the name of the path as a category
-            if 'category' not in metadatas.keys():
+            if 'category' not in metadata.keys():
 
                 if os.path.dirname(f) == self.path:
                     category = self.settings['DEFAULT_CATEGORY']
@@ -194,13 +194,13 @@ class ArticlesGenerator(Generator):
                     category = os.path.basename(os.path.dirname(f))
 
                 if category != '':
-                    metadatas['category'] = unicode(category)
+                    metadata['category'] = unicode(category)
 
-            if 'date' not in metadatas.keys()\
+            if 'date' not in metadata.keys()\
                 and self.settings['FALLBACK_ON_FS_DATE']:
-                    metadatas['date'] = datetime.fromtimestamp(os.stat(f).st_ctime)
+                    metadata['date'] = datetime.fromtimestamp(os.stat(f).st_ctime)
 
-            article = Article(content, metadatas, settings=self.settings,
+            article = Article(content, metadata, settings=self.settings,
                               filename=f)
             if not is_valid_content(article, f):
                 continue
@@ -273,8 +273,8 @@ class PagesGenerator(Generator):
     def generate_context(self):
         all_pages = []
         for f in self.get_files(os.sep.join((self.path, 'pages'))):
-            content, metadatas = read_file(f)
-            page = Page(content, metadatas, settings=self.settings,
+            content, metadata = read_file(f)
+            page = Page(content, metadata, settings=self.settings,
                         filename=f)
             if not is_valid_content(page, f):
                 continue
diff --git a/pelican/readers.py b/pelican/readers.py
index 92bb7bce..7d799f88 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -15,7 +15,7 @@ import re
 from pelican.utils import get_date, open
 
 
-_METADATAS_PROCESSORS = {
+_METADATA_PROCESSORS = {
     'tags': lambda x: map(unicode.strip, x.split(',')),
     'date': lambda x: get_date(x),
     'status': unicode.strip,
@@ -30,11 +30,11 @@ class RstReader(Reader):
     extension = "rst"
 
     def _parse_metadata(self, content):
-        """Return the dict containing metadatas"""
+        """Return the dict containing metadata"""
         output = {}
         for m in re.compile('^:([a-z]+): (.*)\s', re.M).finditer(content):
             name, value = m.group(1).lower(), m.group(2)
-            output[name] = _METADATAS_PROCESSORS.get(
+            output[name] = _METADATA_PROCESSORS.get(
                 name, lambda x:x
             )(value)
         return output
@@ -42,7 +42,7 @@ class RstReader(Reader):
     def read(self, filename):
         """Parse restructured text"""
         text = open(filename)
-        metadatas = self._parse_metadata(text)
+        metadata = self._parse_metadata(text)
         extra_params = {'input_encoding': 'unicode',
                         'initial_header_level': '2'}
         rendered_content = core.publish_parts(text,
@@ -51,9 +51,9 @@ class RstReader(Reader):
                                               settings_overrides=extra_params)
         title = rendered_content.get('title')
         content = rendered_content.get('body')
-        if not metadatas.has_key('title'):
-            metadatas['title'] = title
-        return content, metadatas
+        if not metadata.has_key('title'):
+            metadata['title'] = title
+        return content, metadata
 
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
@@ -65,13 +65,13 @@ class MarkdownReader(Reader):
         md = Markdown(extensions = ['meta', 'codehilite'])
         content = md.convert(text)
         
-        metadatas = {}
+        metadata = {}
         for name, value in md.Meta.items():
             name = name.lower()
-            metadatas[name] = _METADATAS_PROCESSORS.get(
+            metadata[name] = _METADATA_PROCESSORS.get(
                 name, lambda x:x
             )(value[0])
-        return content, metadatas
+        return content, metadata
 
 
 class HtmlReader(Reader):
@@ -81,13 +81,13 @@ class HtmlReader(Reader):
     def read(self, filename):
         """Parse content and metadata of (x)HTML files"""
         content = open(filename)
-        metadatas = {'title':'unnamed'}
+        metadata = {'title':'unnamed'}
         for i in self._re.findall(content):
             key = i.split(':')[0][5:].strip()
             value = i.split(':')[-1][:-3].strip()
-            metadatas[key.lower()] = value
+            metadata[key.lower()] = value
 
-        return content, metadatas
+        return content, metadata
 
 
 

From 04da794b6bae6f151a946b6edfca7e8d01a6f9f3 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 7 May 2011 22:46:56 +0100
Subject: [PATCH 0323/2864] Add a feature to copy files from src to dest.

Fixes #86
---
 docs/settings.rst                |  9 ++++---
 pelican/generators.py            | 11 ++++++---
 pelican/settings.py              |  1 +
 pelican/utils.py                 | 42 +++++++++++++++++++++++---------
 samples/content/extra/robots.txt |  2 ++
 samples/pelican.conf.py          |  4 +++
 6 files changed, 51 insertions(+), 18 deletions(-)
 create mode 100644 samples/content/extra/robots.txt

diff --git a/docs/settings.rst b/docs/settings.rst
index 282ce912..971c55dc 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -21,7 +21,7 @@ this file will be passed to the templates as well.
 
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?                              
+Setting name (default value)                        what does it do?
 ================================================    =====================================================
 `AUTHOR`                                            Default author (put your name)
 `CATEGORY_FEED` ('feeds/%s.atom.xml'[1]_)           Where to put the atom categories feeds.
@@ -32,7 +32,7 @@ Setting name (default value)                        what does it do?
 `DEFAULT_CATEGORY` (``'misc'``)                     The default category to fallback on.
 `DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)           The default date format you want to use.
 `DEFAULT_LANG` (``'en'``)                           The default language to use.
-`DEFAULT_METADATA` (``()``)                         A list containing the default metadata for 
+`DEFAULT_METADATA` (``()``)                         A list containing the default metadata for
                                                     each content (articles, pages, etc.)
 `DEFAULT_ORPHANS` (0)                               The minimum number of articles allowed on the
                                                     last page. Use this when you don't want to
@@ -47,8 +47,11 @@ Setting name (default value)                        what does it do?
                                                     informations from the metadata
 `FEED` (``'feeds/all.atom.xml'``)                   relative url to output the atom feed.
 `FEED_RSS` (``None``, i.e. no RSS)                  relative url to output the rss feed.
+`FILES_TO_COPY` (``()``, no files)                  A list of tuples (source, destination) of files
+                                                    to copy from the source directory to the
+                                                    output path
 `JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.
-`DELETE_OUTPUT_DIRECTORY` (``False``)               Delete the output directory instead of just updating all 
+`DELETE_OUTPUT_DIRECTORY` (``False``)               Delete the output directory instead of just updating all
                                                     the generated files.
 `LOCALE` (''[2]_)                                   Change the locale.
 `MARKUP` (``('rst', 'md')``)                        A list of available markup languages you want
diff --git a/pelican/generators.py b/pelican/generators.py
index 3948afdc..97c28631 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -11,7 +11,7 @@ import random
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
 
-from pelican.utils import copytree, get_relative_path, process_translations, open
+from pelican.utils import copy, get_relative_path, process_translations, open
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
 from pelican.log import *
@@ -298,9 +298,10 @@ class StaticGenerator(Generator):
 
     def _copy_paths(self, paths, source, destination, output_path,
             final_path=None):
+        """Copy all the paths from source to destination"""
         for path in paths:
-            copytree(path, source, os.path.join(output_path, destination),
-                    final_path)
+            copy(path, source, os.path.join(output_path, destination), final_path, 
+                    overwrite=True)
 
     def generate_output(self, writer):
         self._copy_paths(self.settings['STATIC_PATHS'], self.path,
@@ -308,6 +309,10 @@ class StaticGenerator(Generator):
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
                          'theme', self.output_path, '.')
 
+        # copy all the files needed
+        for source, destination in self.settings['FILES_TO_COPY']:
+            copy(source, self.path, self.output_path, destination, overwrite=True)
+
 
 class PdfGenerator(Generator):
     """Generate PDFs on the output dir, for all articles and pages coming from
diff --git a/pelican/settings.py b/pelican/settings.py
index c42a8bb0..a744f465 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -38,6 +38,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DEFAULT_PAGINATION': 5,
                    'DEFAULT_ORPHANS': 0,
                    'DEFAULT_METADATA': (),
+                   'FILES_TO_COPY': (),
                   }
 
 def read_settings(filename):
diff --git a/pelican/utils.py b/pelican/utils.py
index 6b456e17..41733149 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -42,20 +42,38 @@ def slugify(value):
     value = unicode(re.sub('[^\w\s-]', '', value).strip().lower())
     return re.sub('[-\s]+', '-', value)
 
-def copytree(path, origin, destination, topath=None):
-    """Copy path from origin to destination, silent any errors"""
-    
-    if not topath:
-        topath = path
-    try:
-        fromp = os.path.expanduser(os.path.join(origin, path))
-        to = os.path.expanduser(os.path.join(destination, topath))
-        shutil.copytree(fromp, to)
-        info('copying %s to %s' % (fromp, to))
+def copy(path, source, destination, destination_path=None, overwrite=False):
+    """Copy path from origin to destination.
 
-    except OSError:
-        pass
+    The function is able to copy either files or directories.
 
+    :param path: the path to be copied from the source to the destination
+    :param source: the source dir
+    :param destination: the destination dir
+    :param destination_path: the destination path (optional)
+    :param overwrite: wether to overwrite the destination if already exists or not
+
+    """
+    if not destination_path:
+        destination_path = path
+
+    source_ = os.path.abspath(os.path.expanduser(os.path.join(source, path)))
+    destination_ = os.path.abspath(
+            os.path.expanduser(os.path.join(destination, destination_path)))
+
+    if os.path.isdir(source_):
+        try:
+            shutil.copytree(source_, destination_)
+            info('copying %s to %s' % (source_, destination_))
+        except OSError:
+            if overwrite:
+                shutil.rmtree(destination_)
+                shutil.copytree(source_, destination_)
+                info('replacement of %s with %s' % (source_, destination_))
+
+    elif os.path.isfile(source_):
+        shutil.copy(source_, destination_)
+        info('copying %s to %s' % (source_, destination_))
 
 def clean_output_dir(path):
     """Remove all the files from the output directory"""
diff --git a/samples/content/extra/robots.txt b/samples/content/extra/robots.txt
new file mode 100644
index 00000000..ae5b0d05
--- /dev/null
+++ b/samples/content/extra/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /static/pictures
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 20eb1605..2cb9df27 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -27,4 +27,8 @@ SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
 # global metadata to all the contents
 DEFAULT_METADATA = (('yeah', 'it is'),)
 
+# static paths will be copied under the same name
 STATIC_PATHS = ["pictures",]
+
+# A list of files to copy from the source to the destination
+FILES_TO_COPY = (('extra/robots.txt', 'robots.txt'),)

From ddad637bb34ea2b372f258a2786a13ace81a4a44 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sun, 8 May 2011 13:30:09 +0200
Subject: [PATCH 0324/2864] Added a theme manager. Will be useful to create
 triggers in Debian packages.

---
 tools/pelican-themes | 147 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100755 tools/pelican-themes

diff --git a/tools/pelican-themes b/tools/pelican-themes
new file mode 100755
index 00000000..a8b9ff1c
--- /dev/null
+++ b/tools/pelican-themes
@@ -0,0 +1,147 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os, sys, shutil
+import argparse
+
+
+def err(msg, die=None):
+    sys.stderr.write(str(msg) + '\n')
+    if die:
+        sys.exit((die if type(die) is int else 1))
+
+try:
+    import pelican
+
+    global themes_path
+    themes_path = os.path.join(
+        os.path.dirname(
+            os.path.abspath(
+                pelican.__file__
+            )
+        ),
+        'themes'
+    )
+except:
+    err('Cannot import pelican.\nYou must install Pelican in order to run this script.', -1)
+
+
+__version__ = '0.1'
+
+def main():
+    parser = argparse.ArgumentParser(description="""Install themes for Pelican""")
+
+    parser.add_argument('-l', '--list', dest='list', action="store_true",
+                        help="Show the themes already installed")
+    parser.add_argument('-i', '--install', dest='to_install', nargs='+', metavar="theme path",
+        help='The themes to install ')
+    parser.add_argument('-r', '--remove', dest='to_remove', nargs='+', metavar="theme name",
+        help='The themes to remove')
+    parser.add_argument('-s', '--symlink', dest='to_symlink', nargs='+', metavar="theme path",
+        help="Same as `--install', but create a symbolic link instead of copying the theme. Useful for theme development")
+    parser.add_argument('-v', '--verbose', dest='verbose', action="store_true",
+                        help="Verbose output")
+    parser.add_argument('--version', action='version', version=__version__,
+            help='Print the version of this script')
+    args = parser.parse_args()
+
+
+    if args.list:
+        list(args.verbose)
+    else:
+
+        if args.to_install:
+            if args.verbose:
+                print('Installing themes...')
+
+            for i in args.to_install:
+                install(i, v=args.verbose)
+
+        if args.to_symlink:
+            if args.verbose:
+                print('Linking themes...')
+
+            for i in args.to_symlink:
+                symlink(i, v=args.verbose)
+
+        if args.to_remove:
+            if args.verbose:
+                print('Removing themes...')
+
+            for i in args.to_remove:
+                remove(i, v=args.verbose)
+
+
+
+def themes():
+    for i in os.listdir(themes_path):
+        e = os.path.join(themes_path, i)
+
+        if os.path.isdir(e):
+            if os.path.islink(e):
+                yield (e, os.path.realpath(e))
+            else:
+                yield (e, None)
+
+
+def list(v=False):
+    for t, l in themes():
+        if not v:
+            t = os.path.basename(t)
+        if l:
+            if v:
+                print(t + (" (symbolic link to `" + l + "')"))
+            else:
+                print(t + '@')
+        else:
+            print(t)
+
+
+def remove(theme_name, v=False):
+
+    target = os.path.join(themes_path, theme_name)
+
+
+    if not os.path.exists(target):
+        err(target + ' : no such file or directory')
+    elif os.path.islink(target):
+        if v:
+            print('Removing link `' + target + "'")
+        os.remove(target)
+    elif os.path.isdir(target):
+        if v:
+            print('Removing directory `' + target + "'")
+        shutil.rmtree(target)
+    else:
+        err(target + ' : not a valid theme') 
+
+
+def install(path, v=False):
+    if not os.path.exists(path):
+        err(path + ' : no such file or directory')
+    elif not os.path.isdir(path):
+        err(path + ' : no a directory')
+    else:
+        theme_name = os.path.basename(os.path.normpath(path))
+        theme_path = os.path.join(themes_path, theme_name)
+        try:
+            shutil.copytree(path, theme_path)
+        except Exception, e:
+            err("Cannot copy `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
+
+def symlink(path, v=False):
+    if not os.path.exists(path):
+        err(path + ' : no such file or directory')
+    elif not os.path.isdir(path):
+        err(path + ' : no a directory')
+    else:
+        theme_name = os.path.basename(os.path.normpath(path))
+        theme_path = os.path.join(themes_path, theme_name)
+        try:
+            os.symlink(path, theme_path)
+        except Exception, e:
+            err("Cannot link `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
+
+    
+if __name__ == '__main__':
+    main()

From ec5196e5f0332240875df84275190f2f6279127e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 8 May 2011 14:33:05 +0100
Subject: [PATCH 0325/2864] Don't replace dicts with lists when iterating.

---
 pelican/writers.py | 69 +++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 43 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 65cfb202..eb3c0411 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -150,49 +150,14 @@ class Writer(object):
 
     def update_context_contents(self, name, context):
         """Recursively run the context to find elements (articles, pages, etc)
-        whose content getter needs to
-        be modified in order to deal with relative paths.
+        whose content getter needs to be modified in order to deal with
+        relative paths.
 
         :param name: name of the file to output.
-        :param context: dict that will be passed to the templates.
+        :param context: dict that will be passed to the templates, which need to
+                        be updated.
         """
-        if context is None:
-            return None
-
-        if type(context) == tuple:
-            context = list(context)
-
-        if type(context) == dict:
-            context = list(context.values())
-
-        for i in xrange(len(context)):
-            if type(context[i]) == tuple or type(context[i]) == list:
-                context[i] = self.update_context_contents(name, context[i])
-
-            elif type(context[i]) == dict:
-                context[i] = self.update_context_contents(name, context[i].values())
-
-            elif hasattr(context[i], '_content'):
-                relative_path = get_relative_path(name)
-                item = context[i]
-
-                if item in self.reminder:
-                    if relative_path not in self.reminder[item]:
-                        l = self.reminder[item]
-                        l.append(relative_path)
-                        self.inject_update_method(name, item)
-                else:
-                    l = list(relative_path)
-                    self.reminder[item] = l
-                    self.inject_update_method(name, item)
-        return context
-
-    def inject_update_method(self, name, item):
-        """Replace the content attribute getter of an element by a function
-        that will deals with its relatives paths.
-        """
-
-        def _update_object_content(name, input):
+        def _update_content(name, input):
             """Change all the relatives paths of the input content to relatives
             paths suitable fot the ouput content
 
@@ -219,7 +184,25 @@ class Writer(object):
                     content = content.replace(relative_path, dest_path)
 
             return content
+        
+        if context is None:
+            return
+        if hasattr(context, 'values'):
+            context = context.values()
 
-        if item:
-            setattr(item, "_get_content",
-                partial(_update_object_content, name, item))
+        for item in context:
+            # run recursively on iterables
+            if hasattr(item, '__iter__'):
+                self.update_context_contents(name, item)
+
+            # if it is a content, patch it
+            elif hasattr(item, '_content'):
+                info("content detected %s" % item)
+                relative_path = get_relative_path(name)
+
+                paths = self.reminder.setdefault(item, [])
+                if relative_path not in paths:
+                    paths.append(relative_path)
+                    info("patch _get_content method for %s" % item.title)
+                    setattr(item, "_get_content",
+                            partial(_update_content, name, item))

From 1171d24f3f8db6d3acc23066b293cf2d6829cf72 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 8 May 2011 14:53:10 +0100
Subject: [PATCH 0326/2864] Remove logger infos

---
 pelican/writers.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index eb3c0411..1f560c01 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -197,12 +197,10 @@ class Writer(object):
 
             # if it is a content, patch it
             elif hasattr(item, '_content'):
-                info("content detected %s" % item)
                 relative_path = get_relative_path(name)
 
                 paths = self.reminder.setdefault(item, [])
                 if relative_path not in paths:
                     paths.append(relative_path)
-                    info("patch _get_content method for %s" % item.title)
                     setattr(item, "_get_content",
                             partial(_update_content, name, item))

From 6b44d937809e3e014660b9e76b37bf0738723a9e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 8 May 2011 14:58:57 +0100
Subject: [PATCH 0327/2864] Add the possibility to publish drafts. Fixes #111

---
 docs/getting_started.rst          |  8 ++++++++
 pelican/contents.py               |  3 +++
 pelican/generators.py             | 19 +++++++++++++------
 pelican/settings.py               |  1 +
 samples/content/draft_article.rst |  7 +++++++
 5 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 samples/content/draft_article.rst

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index fc2e171e..823e0f97 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -150,3 +150,11 @@ Autoreload
 It's possible to tell pelican to watch for your modifications, instead of
 manually launching it each time you need. Use the `-r` option, or
 `--autoreload`.
+
+Publishing drafts
+-----------------
+
+If you want to publish an article as a draft, for friends to review it for
+instance, you can add a `status: draft` to its metadata, it will then be
+available under the `drafts` folder, and not be listed under the index page nor
+any category page.
diff --git a/pelican/contents.py b/pelican/contents.py
index a3c6670b..dc05dae4 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -62,6 +62,9 @@ class Page(object):
         if not hasattr(self, 'summary'):
             self.summary = property(lambda self: truncate_html_words(self.content, 50)).__get__(self, Page)
 
+        if not hasattr(self, 'status'):
+            self.status = settings['DEFAULT_STATUS']
+
         # store the settings ref.
         self._settings = settings
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 7657261b..2ba36dcb 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -99,6 +99,7 @@ class ArticlesGenerator(Generator):
         self.tags = defaultdict(list)
         self.categories = defaultdict(list)
         super(ArticlesGenerator, self).__init__(*args, **kwargs)
+        self.drafts = []
 
     def generate_feeds(self, writer):
         """Generate the feeds from the current context, and output files."""
@@ -140,8 +141,7 @@ class ArticlesGenerator(Generator):
 
 
     def generate_pages(self, writer):
-        """Generate the pages on the disk
-        TODO: change the name"""
+        """Generate the pages on the disk"""
 
         write = partial(
             writer.write_file,
@@ -181,6 +181,10 @@ class ArticlesGenerator(Generator):
                 paginated={'articles': articles, 'dates': dates},
                 page_name='category/%s' % cat)
 
+        for article in self.drafts:
+            write('drafts/%s.html' % article.slug, article_template, self.context,
+                    article=article, category=article.category)
+
 
     def generate_context(self):
         """change the context"""
@@ -211,10 +215,13 @@ class ArticlesGenerator(Generator):
             if not is_valid_content(article, f):
                 continue
 
-            if hasattr(article, 'tags'):
-                for tag in article.tags:
-                    self.tags[tag].append(article)
-            all_articles.append(article)
+            if article.status == "published":
+                if hasattr(article, 'tags'):
+                    for tag in article.tags:
+                        self.tags[tag].append(article)
+                all_articles.append(article)
+            elif article.status == "draft":
+                self.drafts.append(article)
 
         self.articles, self.translations = process_translations(all_articles)
 
diff --git a/pelican/settings.py b/pelican/settings.py
index a744f465..a63cec3f 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -39,6 +39,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DEFAULT_ORPHANS': 0,
                    'DEFAULT_METADATA': (),
                    'FILES_TO_COPY': (),
+                   'DEFAULT_STATUS': 'published',
                   }
 
 def read_settings(filename):
diff --git a/samples/content/draft_article.rst b/samples/content/draft_article.rst
new file mode 100644
index 00000000..76ce9a16
--- /dev/null
+++ b/samples/content/draft_article.rst
@@ -0,0 +1,7 @@
+A draft article
+###############
+
+:status: draft
+
+This is a draft article, it should live under the /drafts/ folder and not be
+listed anywhere else.

From aab3ee78dc4ba50f271c6a8b56df4106c30c07a8 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 8 May 2011 16:15:43 +0100
Subject: [PATCH 0328/2864] Split the settings into different sections. Fixes
 #112

---
 docs/getting_started.rst |   4 +-
 docs/settings.rst        | 275 +++++++++++++++++++++++++--------------
 2 files changed, 178 insertions(+), 101 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 823e0f97..eb5a2201 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -155,6 +155,6 @@ Publishing drafts
 -----------------
 
 If you want to publish an article as a draft, for friends to review it for
-instance, you can add a `status: draft` to its metadata, it will then be
-available under the `drafts` folder, and not be listed under the index page nor
+instance, you can add a ``status: draft`` to its metadata, it will then be
+available under the ``drafts`` folder, and not be listed under the index page nor
 any category page.
diff --git a/docs/settings.rst b/docs/settings.rst
index 971c55dc..567039e1 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1,10 +1,7 @@
 Settings
 ########
 
-Specifying the settings
-=======================
-
-Pelican is configurable thanks to a configuration file, that you can pass to
+Pelican is configurable thanks to a configuration file you can pass to
 the command line::
 
     $ pelican -s path/to/your/settingsfile.py path
@@ -16,44 +13,33 @@ example by looking at `/samples/pelican.conf.py
 All the settings identifiers must be set in caps, otherwise they will not be
 processed.
 
-Here are the available settings. Please note that all the settings you put in
-this file will be passed to the templates as well.
+The settings you define in the configuration file will be passed to the
+templates, it allows you to use them to add site-wide contents if you need.
 
+Here is a list of settings for pelican, regarding the different features.
+
+Basic settings
+==============
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?
+Setting name (default value)                        what does it do?                              
 ================================================    =====================================================
 `AUTHOR`                                            Default author (put your name)
-`CATEGORY_FEED` ('feeds/%s.atom.xml'[1]_)           Where to put the atom categories feeds.
-`CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the categories rss feeds.
-`CSS_FILE` (``'main.css'``)                         specify the CSS file you want to load
+`SITENAME` (``'A Pelican Blog'``)                   Your site name
 `DATE_FORMATS` (``{}``)                             If you do manage multiple languages, you can
                                                     set the date formatting here.
 `DEFAULT_CATEGORY` (``'misc'``)                     The default category to fallback on.
 `DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)           The default date format you want to use.
-`DEFAULT_LANG` (``'en'``)                           The default language to use.
-`DEFAULT_METADATA` (``()``)                         A list containing the default metadata for
-                                                    each content (articles, pages, etc.)
-`DEFAULT_ORPHANS` (0)                               The minimum number of articles allowed on the
-                                                    last page. Use this when you don't want to
-                                                    have a last page with very few articles.
-`DEFAULT_PAGINATION` (5)                            The maximum number of articles to include on a
-                                                    page, not including orphans.
 `DISPLAY_PAGES_ON_MENU` (``True``)                  Display or not the pages on the menu of the
                                                     template. Templates can follow or not this
                                                     settings.
 `FALLBACK_ON_FS_DATE` (``True``)                    If True, pelican will use the file system
                                                     dates infos (mtime) if it can't get
                                                     informations from the metadata
-`FEED` (``'feeds/all.atom.xml'``)                   relative url to output the atom feed.
-`FEED_RSS` (``None``, i.e. no RSS)                  relative url to output the rss feed.
-`FILES_TO_COPY` (``()``, no files)                  A list of tuples (source, destination) of files
-                                                    to copy from the source directory to the
-                                                    output path
 `JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.
-`DELETE_OUTPUT_DIRECTORY` (``False``)               Delete the output directory instead of just updating all
+`DELETE_OUTPUT_DIRECTORY` (``False``)               Delete the output directory and just
                                                     the generated files.
-`LOCALE` (''[2]_)                                   Change the locale.
+`LOCALE` (''[1]_)                                   Change the locale.
 `MARKUP` (``('rst', 'md')``)                        A list of available markup languages you want
                                                     to use. For the moment, only available values
                                                     are `rst` and `md`.
@@ -64,97 +50,129 @@ Setting name (default value)                        what does it do?
                                                     `rst2pdf`.
 `RELATIVE_URL` (``True``)                           Defines if pelican should use relative urls or
                                                     not.
-`REVERSE_ARCHIVE_ORDER` (``False``)                 Reverse the archives order. (True makes it in
-                                                    descending order: the newer first)
-`REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True makes it in
-                                                    descending order, default is alphabetically)
 `SITEURL`                                           base URL of your website. Note that this is
                                                     not a way to tell pelican to use relative urls
                                                     or static ones. You should rather use the
                                                     `RELATIVE_URL` setting for such use.
-`SITENAME` (``'A Pelican Blog'``)                   Your site name
-`SKRIBIT_TYPE`                                      The type of skribit widget (TAB or WIDGET).
-`SKRIBIT_TAB_COLOR`                                 Tab color (#XXXXXX, default #333333).
-`SKRIBIT_TAB_HORIZ`                                 Tab Distance from Left (% or distance, default Null).
-`SKRIBIT_TAB_VERT`                                  Tab Distance from Top (% or distance, default 20%).
-`SKRIBIT_TAB_PLACEMENT`                             Tab placement (Top, Bottom, Left or Right,
-                                                    default LEFT).
-`SKRIBIT_TAB_SITENAME`                              Tab identifier (See Skribit part below).
-`SKRIBIT_WIDGET_ID`                                 Widget identifier (See Skribit part below).
 `STATIC_PATHS` (``['images']``)                     The static paths you want to have accessible
                                                     on the output path "static". By default,
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
-`THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
-                                                    values is `static`, but if your theme has
-                                                    other static paths, you can put them here.
+================================================    =====================================================
+
+
+.. [1] Default is the system locale. Default is to delete the output directory.
+
+Feed settings
+=============
+
+By default, pelican uses atom feeds. However, it is possible to use RSS feeds
+instead, at your covenience.
+
+Pelican generates category feeds as well as feeds for all your articles.
+
+================================================    =====================================================
+Setting name (default value)                        what does it do?                              
+================================================    =====================================================
+`CATEGORY_FEED` ('feeds/%s.atom.xml'[2]_)           Where to put the atom categories feeds.
+`CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the categories rss feeds.
+`FEED` (``'feeds/all.atom.xml'``)                   relative url to output the atom feed.
+`FEED_RSS` (``None``, i.e. no RSS)                  relative url to output the rss feed.
+================================================    =====================================================
+
+.. [2] %s is the name of the category.
+
+Pagination
+==========
+
+The default behaviour of pelican is to list all the articles titles alongside
+with a short description of them on the index page. While it works pretty well
+for little to medium blogs, it is convenient to have a way to paginate this.
+
+You can use the following settings to configure the pagination.
+
+================================================    =====================================================
+Setting name (default value)                        what does it do?                              
+================================================    =====================================================
+`DEFAULT_ORPHANS` (0)                               The minimum number of articles allowed on the
+                                                    last page. Use this when you don't want to
+                                                    have a last page with very few articles.
+`DEFAULT_PAGINATION` (5)                            The maximum number of articles to include on a
+                                                    page, not including orphans.
+`WITH_PAGINATION` (``False``)                       Activate pagination.
+================================================    =====================================================
+
+Tag cloud
+=========
+
+If you want to generate a tag cloud with all your tags, you can do so using the
+following settings.
+
+================================================    =====================================================
+Setting name (default value)                        what does it do?                              
+================================================    =====================================================
 `TAG_CLOUD_STEPS` (4)                               Count of different font sizes in the tag
                                                     cloud.
 `TAG_CLOUD_MAX_ITEMS` (100)                         Maximum tags count in the cloud.
+================================================    =====================================================
+
+The default theme does not support tag clouds, but it is pretty easy to add::
+
+    <ul>
+        {% for tag in tag_cloud %}
+            <li class="tag-{{ tag.1 }}"><a href="/tag/{{ tag.0 }}/">{{ tag.0 }}</a></li>
+        {% endfor %}
+    </ul>
+
+You should then also define a CSS with the appropriate classes (tag-0 to tag-N, where
+N matches `TAG_CLOUD_STEPS` -1.
+
+Translations
+============
+
+Pelican offers a way to translate articles. See the section on getting started for 
+more information about that.
+
+================================================    =====================================================
+Setting name (default value)                        what does it do?                              
+================================================    =====================================================
+`DEFAULT_LANG` (``'en'``)                           The default language to use.
+`TRANSLATION_FEED` ('feeds/all-%s.atom.xml'[3]_)    Where to put the RSS feed for translations.
+================================================    =====================================================
+
+.. [3] %s is the language
+
+Ordering contents
+=================
+
+================================================    =====================================================
+Setting name (default value)                        what does it do?                              
+================================================    =====================================================
+`REVERSE_ARCHIVE_ORDER` (``False``)                 Reverse the archives order. (True makes it in
+                                                    descending order: the newer first)
+`REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True makes it in
+                                                    descending order, default is alphabetically)
+================================================    =====================================================
+
+Theming
+=======
+
+Theming is addressed in a dedicated section (see  :ref:`theming-pelican`).
+However, here are the settings that are related to theming.
+
+================================================    =====================================================
+Setting name (default value)                        what does it do?                              
+================================================    =====================================================
 `THEME`                                             theme to use to produce the output. can be the
                                                     complete static path to a theme folder, or
                                                     chosen between the list of default themes (see
                                                     below)
-`TRANSLATION_FEED` ('feeds/all-%s.atom.xml'[3]_)    Where to put the RSS feed for translations.
-`WITH_PAGINATION` (``False``)                       Activate pagination.
+`THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
+                                                    values is `static`, but if your theme has
+                                                    other static paths, you can put them here.
+`CSS_FILE` (``'main.css'``)                         specify the CSS file you want to load
 ================================================    =====================================================
 
-.. [1] %s is the name of the category.
-
-.. [2] Default is the system locale. Default is to delete the output directory.
-
-.. [3] %s is the language
-
-Skribit
-=======
-
-Skribit has two ways to display suggestions : as a sidebar widget or as a
-suggestions tab. You can choose one of the display by setting the SKRIBIT_TYPE
-in your config.
-
-Sidebar widget
---------------
-
-The settings for sidebar widget is :
-
- * SKRIBIT_WIDGET_ID : the identifier of your blog.
-
-All the customizations are done in the skribit web interface.
-
-To retrieve your identifier from the code snippet, you can use this python code::
-
-    import re
-    regex = re.compile('.*http://assets.skribit.com/javascripts/SkribitWidget.\
-        js\?renderTo=writeSkribitHere&amp;blog=(.*)&amp;.*')
-    snippet = '''SNIPPET CONTENT'''
-    snippet = snippet.replace('\n', '')
-    identifier = regex.match(snippet).groups()[0]
-
-Suggestion tab
---------------
-
-The setting for suggestion tab's customizations are :
-
- * SKRIBIT_TAB_COLOR
- * SKRIBIT_TAB_DISTANCE_HORIZ
- * SKRIBIT_TAB_DISTANCE_VERT
- * SKRIBIT_TAB_PLACEMENT
-
-The identifier is :
-
- * SKRIBIT_TAB_SITENAME : the identifier of your blog
-
-To retrieve your sitename from the code snippet, you can use this python code::
-
-    import re
-    regex = re.compile('.*http://skribit.com/lightbox/(.*)\',.*')
-    snippet = '''SNIPPET CONTENT'''
-    snippet = snippet.replace('\n', '')
-    identifier = regex.match(snippet).groups()[0]
-
-Themes
-======
-
 By default, two themes are availablee. You can specify them using the `-t` option:
 
 * notmyidea
@@ -192,3 +210,62 @@ In addition, you can use the "wide" version of the `notmyidea` theme, by
 adding that in your configuration::
 
     CSS_FILE = "wide.css"
+
+Skribit
+-------
+
+Skribit has two ways to display suggestions : as a sidebar widget or as a
+suggestions tab. You can choose one of the display by setting the SKRIBIT_TYPE
+in your config.
+
+ * SKRIBIT_WIDGET_ID : the identifier of your blog.
+
+All the customizations are done in the skribit web interface.
+
+To retrieve your identifier from the code snippet, you can use this python code::
+
+    import re
+    regex = re.compile('.*http://assets.skribit.com/javascripts/SkribitWidget.\
+        js\?renderTo=writeSkribitHere&amp;blog=(.*)&amp;.*')
+    snippet = '''SNIPPET CONTENT'''
+    snippet = snippet.replace('\n', '')
+    identifier = regex.match(snippet).groups()[0]
+
+Suggestion tab
+--------------
+
+The setting for suggestion tab's customizations are :
+
+ * SKRIBIT_TAB_COLOR
+ * SKRIBIT_TAB_DISTANCE_HORIZ
+ * SKRIBIT_TAB_DISTANCE_VERT
+ * SKRIBIT_TAB_PLACEMENT
+
+The identifier is :
+
+ * SKRIBIT_TAB_SITENAME : the identifier of your blog
+
+To retrieve your sitename from the code snippet, you can use this python code::
+
+    import re
+    regex = re.compile('.*http://skribit.com/lightbox/(.*)\',.*')
+    snippet = '''SNIPPET CONTENT'''
+    snippet = snippet.replace('\n', '')
+    identifier = regex.match(snippet).groups()[0]
+
+Skribit settings
+----------------
+
+================================================    =====================================================
+Setting name (default value)                        what does it do?                              
+================================================    =====================================================
+`SKRIBIT_TYPE`                                      The type of skribit widget (TAB or WIDGET).
+`SKRIBIT_TAB_COLOR`                                 Tab color (#XXXXXX, default #333333).
+`SKRIBIT_TAB_HORIZ`                                 Tab Distance from Left (% or distance, default Null).
+`SKRIBIT_TAB_VERT`                                  Tab Distance from Top (% or distance, default 20%).
+`SKRIBIT_TAB_PLACEMENT`                             Tab placement (Top, Bottom, Left or Right,
+                                                    default LEFT).
+`SKRIBIT_TAB_SITENAME`                              Tab identifier (See Skribit part below).
+`SKRIBIT_WIDGET_ID`                                 Widget identifier (See Skribit part below).
+================================================    =====================================================
+

From e7eecb03e0fc6ec586821df01ffc0ebd091830db Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 10 May 2011 23:40:19 +0100
Subject: [PATCH 0329/2864] Add features to the readme

---
 README.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index ae132095..10929c15 100644
--- a/README.rst
+++ b/README.rst
@@ -14,12 +14,14 @@ Features
 
 Pelican currently supports:
 
-* blog articles
+* blog articles and pages
 * comments, via an external service (disqus). Please notice that while
   it's useful, it's an external service, and you'll not manage the
   comments by yourself. It could potentially eat your data.
 * theming support (themes are done using `jinja2 <http://jinjna.pocoo.org>`_)
 * PDF generation of the articles/pages (optional).
+* Translations
+* Syntactic recognition
 
 Have a look to `the documentation <http://alexis.notmyidea.org/pelican/>`_ for
 more informations.

From 0d1edc645059177bf3b9bad6aefa0792e7804edd Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 10 May 2011 23:41:27 +0100
Subject: [PATCH 0330/2864] Add some informations about how to contribute.

This would need a more precise description and some good practices to follow.
---
 docs/contribute.rst | 13 +++++++++++++
 docs/index.rst      |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 docs/contribute.rst

diff --git a/docs/contribute.rst b/docs/contribute.rst
new file mode 100644
index 00000000..74e67a72
--- /dev/null
+++ b/docs/contribute.rst
@@ -0,0 +1,13 @@
+How to contribute ?
+===================
+
+There are features missing from pelican and you now exactly how to implement
+them? That's great! Don't hesitate to fork and make a pull request on github.
+
+Running the test suite
+----------------------
+
+It would even be better if you could add tests for this feature. The tests 
+are located under "pelican/tests" and you will need unittests2 to run them::
+
+    python -m unittest2 discover
diff --git a/docs/index.rst b/docs/index.rst
index a370a94f..39f3d599 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -52,3 +52,4 @@ A french version of the documentation is available at :doc:`fr/index`.
    themes
    internals
    faq
+   contribute

From eb988ab76302490096d2dfbe22c17133f866a694 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 10 May 2011 23:59:21 +0100
Subject: [PATCH 0331/2864] Update the "how to contribute" document.

Also remove an unwanted dep to Markdown and add a dev_requirement.txt file to use with pip.
---
 dev_requirements.txt |  5 +++++
 docs/contribute.rst  | 38 ++++++++++++++++++++++++++++++++------
 setup.py             |  2 +-
 3 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 dev_requirements.txt

diff --git a/dev_requirements.txt b/dev_requirements.txt
new file mode 100644
index 00000000..acafebc0
--- /dev/null
+++ b/dev_requirements.txt
@@ -0,0 +1,5 @@
+Jinja2==2.5.5
+Pygments==1.4
+docutils==0.7
+feedgenerator==1.2.1
+unittest2
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 74e67a72..010b24a3 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -1,13 +1,39 @@
 How to contribute ?
-===================
+###################
+There are many ways to contribute to pelican. You can enhance the
+documentation, add missing features, fix bugs or just report them.
 
-There are features missing from pelican and you now exactly how to implement
-them? That's great! Don't hesitate to fork and make a pull request on github.
+Don't hesitate to fork and make a pull request on github.
+
+Set up the development environment
+==================================
+
+You're free to setup up the environment in any way you like. Here is a way
+using virtualenv and virtualenvwrapper. If you don't have them, you can install
+them using::
+
+    $ pip install virtualenvwrapper
+
+Virtual environments allow you to work on an installation of python which is
+not the one installed on your system. Especially, it will install the different
+projects under a different location.
+
+To create the virtualenv environment, you have to do::
+
+    $ mkvirtualenv pelican --no-site-package
+
+Then you would have to install all the dependencies::
+
+    $ pip install -r dev_requirements.txt
 
 Running the test suite
-----------------------
+======================
 
-It would even be better if you could add tests for this feature. The tests 
-are located under "pelican/tests" and you will need unittests2 to run them::
+Each time you add a feature, there are two things to do regarding tests:
+checking that the tests run in a right way, and be sure that you add tests for
+the feature you are working on or the bug you're fixing.
+
+The tests leaves under "pelican/tests" and you can run them using the
+"discover" feature of unittest2::
 
     python -m unittest2 discover
diff --git a/setup.py b/setup.py
index b90802d8..6fcfbe9c 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 
 VERSION = "2.6.0" # find a better way to do so.
 
-requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'Markdown']
+requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils']
 if sys.version_info < (2,7):
     requires.append('argparse')
 

From cacc6db9a4cbbce979e4ebf90c93c770f6359453 Mon Sep 17 00:00:00 2001
From: Mikhail Korobov <kmike84@gmail.com>
Date: Tue, 10 May 2011 07:55:30 +0600
Subject: [PATCH 0332/2864] ReST metadata parsing using docutils.

---
 pelican/readers.py | 98 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 69 insertions(+), 29 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 7d799f88..11cbde4e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 try:
-    from docutils import core
+    import docutils
+    import docutils.core
+    import docutils.io
+    from docutils.writers.html4css1 import HTMLTranslator
 
     # import the directives to have pygments support
     from pelican import rstdirectives
@@ -21,40 +24,78 @@ _METADATA_PROCESSORS = {
     'status': unicode.strip,
 }
 
+def _process_metadata(name, value):
+    if name in _METADATA_PROCESSORS:
+        return _METADATA_PROCESSORS[name](value)
+    return value
+
 
 class Reader(object):
     enabled = True
 
+
+class _FieldBodyTranslator(HTMLTranslator):
+
+    def astext(self):
+        return ''.join(self.body)
+
+    def visit_field_body(self, node):
+        pass
+
+    def depart_field_body(self, node):
+        pass
+
+
+def render_node_to_html(document, node):
+    visitor = _FieldBodyTranslator(document)
+    node.walkabout(visitor)
+    return visitor.astext()
+
+def get_metadata(document):
+    """Return the dict containing document metadata"""
+    output = {}
+    for docinfo in document.traverse(docutils.nodes.docinfo):
+        for element in docinfo.children:
+            if element.tagname == 'field': # custom fields (e.g. summary)
+                name_elem, body_elem = element.children
+                name = name_elem.astext()
+                value = render_node_to_html(document, body_elem)
+            else: # standard fields (e.g. address)
+                name = element.tagname
+                value = element.astext()
+
+            output[name] = _process_metadata(name, value)
+    return output
+
+
 class RstReader(Reader):
-    enabled = bool(core)
+    enabled = bool(docutils)
     extension = "rst"
 
-    def _parse_metadata(self, content):
-        """Return the dict containing metadata"""
-        output = {}
-        for m in re.compile('^:([a-z]+): (.*)\s', re.M).finditer(content):
-            name, value = m.group(1).lower(), m.group(2)
-            output[name] = _METADATA_PROCESSORS.get(
-                name, lambda x:x
-            )(value)
-        return output
+    def _parse_metadata(self, document):
+        return get_metadata(document)
+
+    def _get_publisher(self, filename):
+        extra_params = {'initial_header_level': '2'}
+        pub = docutils.core.Publisher(destination_class=docutils.io.StringOutput)
+        pub.set_components('standalone', 'restructuredtext', 'html')
+        pub.process_programmatic_settings(None, extra_params, None)
+        pub.set_source(source_path=filename)
+        pub.publish()
+        return pub
 
     def read(self, filename):
-        """Parse restructured text"""
-        text = open(filename)
-        metadata = self._parse_metadata(text)
-        extra_params = {'input_encoding': 'unicode',
-                        'initial_header_level': '2'}
-        rendered_content = core.publish_parts(text,
-                                              source_path=filename,
-                                              writer_name='html',
-                                              settings_overrides=extra_params)
-        title = rendered_content.get('title')
-        content = rendered_content.get('body')
-        if not metadata.has_key('title'):
-            metadata['title'] = title
+        """Parses restructured text"""
+        pub = self._get_publisher(filename)
+        parts = pub.writer.parts
+        content = parts.get('body')
+
+        metadata = self._parse_metadata(pub.document)
+        metadata.setdefault('title', parts.get('title'))
+
         return content, metadata
 
+
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
     extension = "md"
@@ -64,13 +105,11 @@ class MarkdownReader(Reader):
         text = open(filename)
         md = Markdown(extensions = ['meta', 'codehilite'])
         content = md.convert(text)
-        
+
         metadata = {}
         for name, value in md.Meta.items():
             name = name.lower()
-            metadata[name] = _METADATA_PROCESSORS.get(
-                name, lambda x:x
-            )(value[0])
+            metadata[name] = _process_metadata(name, value[0])
         return content, metadata
 
 
@@ -85,7 +124,8 @@ class HtmlReader(Reader):
         for i in self._re.findall(content):
             key = i.split(':')[0][5:].strip()
             value = i.split(':')[-1][:-3].strip()
-            metadata[key.lower()] = value
+            name = key.lower()
+            metadata[name] = _process_metadata(name, value)
 
         return content, metadata
 

From 6cd425e408bf85cd12ba36c536bc3ff8d78c4fc7 Mon Sep 17 00:00:00 2001
From: Mikhail Korobov <kmike84@gmail.com>
Date: Wed, 11 May 2011 09:42:37 +0600
Subject: [PATCH 0333/2864] Basic test for the new rst reader. Locale is also
 converted to fr_FR.utf-8 (I wasn't able to run tests without this)

---
 pelican/tests/test_readers.py     | 27 +++++++++++++++++++++++++++
 samples/content/super_article.rst |  4 +++-
 samples/pelican.conf.py           |  6 +++---
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 pelican/tests/test_readers.py

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
new file mode 100644
index 00000000..5a255209
--- /dev/null
+++ b/pelican/tests/test_readers.py
@@ -0,0 +1,27 @@
+# coding: utf-8
+import unittest2
+import os
+import datetime
+from pelican import readers
+
+CUR_DIR = os.path.dirname(__file__)
+CONTENT_PATH = os.path.join(CUR_DIR, '..', '..', 'samples', 'content')
+
+def _filename(*args):
+    return os.path.join(CONTENT_PATH, *args)
+
+
+class RstReaderTest(unittest2.TestCase):
+
+    def test_metadata(self):
+        reader = readers.RstReader()
+        content, metadata = reader.read(_filename('super_article.rst'))
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'title': 'This is a super article !',
+            'summary': 'Multi-line metadata should be supported\nas well as <strong>inline markup</strong>.',
+            'date': datetime.datetime(2010, 12, 2, 10, 14),
+            'tags': ['foo', 'bar', 'foobar'],
+        }
+        self.assertDictEqual(metadata, expected)
diff --git a/samples/content/super_article.rst b/samples/content/super_article.rst
index b3e22051..03273fad 100644
--- a/samples/content/super_article.rst
+++ b/samples/content/super_article.rst
@@ -5,7 +5,9 @@ This is a super article !
 :date: 2010-12-02 10:14
 :category: yeah
 :author: Alexis Métaireau
-:summary: This is a simple test
+:summary:
+    Multi-line metadata should be supported
+    as well as **inline markup**.
 
 Some content here !
 
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index a3a07fad..8648e7cb 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 AUTHOR = u'Alexis Métaireau'
-SITENAME = u"Alexis' log" 
+SITENAME = u"Alexis' log"
 SITEURL = 'http://blog.notmyidea.org'
 
 GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
-LOCALE = 'fr_FR.utf8'
+LOCALE = 'fr_FR.utf-8'
 DEFAULT_PAGINATION = 2
 
 FEED_RSS = 'feeds/all.rss.xml'
@@ -33,6 +33,6 @@ STATIC_PATHS = ["pictures",]
 # A list of files to copy from the source to the destination
 FILES_TO_COPY = (('extra/robots.txt', 'robots.txt'),)
 
-# foobar will not be used, because it's not in caps. All configuration keys 
+# foobar will not be used, because it's not in caps. All configuration keys
 # have to be in caps
 foobar = "barbaz"

From 0a041c2509e4e7963da65d2d688e432ed3f8cfcb Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 11 May 2011 10:48:39 +0100
Subject: [PATCH 0334/2864] python -m doesnt work for python < 2.7

---
 docs/contribute.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 010b24a3..02af695f 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -36,4 +36,4 @@ the feature you are working on or the bug you're fixing.
 The tests leaves under "pelican/tests" and you can run them using the
 "discover" feature of unittest2::
 
-    python -m unittest2 discover
+    $ unit2 discover

From 278038ee87455399da6b199f7581e2bdcc2d904e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 11 May 2011 11:10:14 +0100
Subject: [PATCH 0335/2864] Add information about TAG_FEED. Fixes #117

---
 docs/settings.rst | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 567039e1..5775edf1 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -22,7 +22,7 @@ Basic settings
 ==============
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?                              
+Setting name (default value)                        what does it do?
 ================================================    =====================================================
 `AUTHOR`                                            Default author (put your name)
 `SITENAME` (``'A Pelican Blog'``)                   Your site name
@@ -69,15 +69,21 @@ Feed settings
 By default, pelican uses atom feeds. However, it is possible to use RSS feeds
 instead, at your covenience.
 
-Pelican generates category feeds as well as feeds for all your articles.
+Pelican generates category feeds as well as feeds for all your articles. It does
+not generate feeds for tags per default, but it is possible to do so using
+the ``TAG_FEED`` and ``TAG_FEED_RSS`` settings:
+
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?                              
+Setting name (default value)                        what does it do?
 ================================================    =====================================================
 `CATEGORY_FEED` ('feeds/%s.atom.xml'[2]_)           Where to put the atom categories feeds.
 `CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the categories rss feeds.
 `FEED` (``'feeds/all.atom.xml'``)                   relative url to output the atom feed.
 `FEED_RSS` (``None``, i.e. no RSS)                  relative url to output the rss feed.
+`TAG_FEED` (``None``, ie no tag feed)               relative url to output the tags atom feed. It should
+                                                    be defined using a "%s" matchin the tag name
+`TAG_FEED_RSS` (``None``, ie no RSS tag feed)       relative url to output the tag RSS feed
 ================================================    =====================================================
 
 .. [2] %s is the name of the category.
@@ -92,7 +98,7 @@ for little to medium blogs, it is convenient to have a way to paginate this.
 You can use the following settings to configure the pagination.
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?                              
+Setting name (default value)                        what does it do?
 ================================================    =====================================================
 `DEFAULT_ORPHANS` (0)                               The minimum number of articles allowed on the
                                                     last page. Use this when you don't want to
@@ -109,7 +115,7 @@ If you want to generate a tag cloud with all your tags, you can do so using the
 following settings.
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?                              
+Setting name (default value)                        what does it do?
 ================================================    =====================================================
 `TAG_CLOUD_STEPS` (4)                               Count of different font sizes in the tag
                                                     cloud.
@@ -130,11 +136,11 @@ N matches `TAG_CLOUD_STEPS` -1.
 Translations
 ============
 
-Pelican offers a way to translate articles. See the section on getting started for 
+Pelican offers a way to translate articles. See the section on getting started for
 more information about that.
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?                              
+Setting name (default value)                        what does it do?
 ================================================    =====================================================
 `DEFAULT_LANG` (``'en'``)                           The default language to use.
 `TRANSLATION_FEED` ('feeds/all-%s.atom.xml'[3]_)    Where to put the RSS feed for translations.
@@ -146,7 +152,7 @@ Ordering contents
 =================
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?                              
+Setting name (default value)                        what does it do?
 ================================================    =====================================================
 `REVERSE_ARCHIVE_ORDER` (``False``)                 Reverse the archives order. (True makes it in
                                                     descending order: the newer first)
@@ -161,7 +167,7 @@ Theming is addressed in a dedicated section (see  :ref:`theming-pelican`).
 However, here are the settings that are related to theming.
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?                              
+Setting name (default value)                        what does it do?
 ================================================    =====================================================
 `THEME`                                             theme to use to produce the output. can be the
                                                     complete static path to a theme folder, or
@@ -257,7 +263,7 @@ Skribit settings
 ----------------
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?                              
+Setting name (default value)                        what does it do?
 ================================================    =====================================================
 `SKRIBIT_TYPE`                                      The type of skribit widget (TAB or WIDGET).
 `SKRIBIT_TAB_COLOR`                                 Tab color (#XXXXXX, default #333333).

From 37474e5ccbf95f557a55f610a768eb57482e125c Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sat, 14 May 2011 12:57:57 +0200
Subject: [PATCH 0336/2864] Some corrections on tools/pelican-themes

---
 tools/pelican-themes | 53 ++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/tools/pelican-themes b/tools/pelican-themes
index a8b9ff1c..38ddf310 100755
--- a/tools/pelican-themes
+++ b/tools/pelican-themes
@@ -27,6 +27,8 @@ except:
 
 
 __version__ = '0.1'
+_BUILTIN_THEMES = ['simple', 'notmyidea']
+
 
 def main():
     parser = argparse.ArgumentParser(description="""Install themes for Pelican""")
@@ -47,9 +49,16 @@ def main():
 
 
     if args.list:
-        list(args.verbose)
+        list_themes(args.verbose)
     else:
 
+        if args.to_remove:
+            if args.verbose:
+                print('Removing themes...')
+
+            for i in args.to_remove:
+                remove(i, v=args.verbose)
+
         if args.to_install:
             if args.verbose:
                 print('Installing themes...')
@@ -64,13 +73,6 @@ def main():
             for i in args.to_symlink:
                 symlink(i, v=args.verbose)
 
-        if args.to_remove:
-            if args.verbose:
-                print('Removing themes...')
-
-            for i in args.to_remove:
-                remove(i, v=args.verbose)
-
 
 
 def themes():
@@ -84,7 +86,7 @@ def themes():
                 yield (e, None)
 
 
-def list(v=False):
+def list_themes(v=False):
     for t, l in themes():
         if not v:
             t = os.path.basename(t)
@@ -99,10 +101,12 @@ def list(v=False):
 
 def remove(theme_name, v=False):
 
+    theme_name = theme_name.replace('/','')
     target = os.path.join(themes_path, theme_name)
 
-
-    if not os.path.exists(target):
+    if theme_name in _BUILTIN_THEMES:
+        err(theme_name + ' is a builtin theme.\nYou cannot remove a builtin theme with this script, remove it by hand if you want.')
+    elif not os.path.exists(target):
         err(target + ' : no such file or directory')
     elif os.path.islink(target):
         if v:
@@ -124,10 +128,15 @@ def install(path, v=False):
     else:
         theme_name = os.path.basename(os.path.normpath(path))
         theme_path = os.path.join(themes_path, theme_name)
-        try:
-            shutil.copytree(path, theme_path)
-        except Exception, e:
-            err("Cannot copy `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
+        if os.path.exists(theme_path):
+            err(path + ' : already exists')
+        else:
+            if v:
+                print("Copying `{p}' to `{t}' ...".format(p=path, t=theme_path))
+            try:
+                shutil.copytree(path, theme_path)
+            except Exception, e:
+                err("Cannot copy `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
 
 def symlink(path, v=False):
     if not os.path.exists(path):
@@ -137,10 +146,16 @@ def symlink(path, v=False):
     else:
         theme_name = os.path.basename(os.path.normpath(path))
         theme_path = os.path.join(themes_path, theme_name)
-        try:
-            os.symlink(path, theme_path)
-        except Exception, e:
-            err("Cannot link `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
+        if os.path.exists(theme_path):
+            err(path + ' : already exists')
+        else:
+            if v:
+                print("Linking `{p}' to `{t}' ...".format(p=path, t=theme_path))
+            try:
+                os.symlink(path, theme_path)
+            except Exception, e:
+                err("Cannot link `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
+
 
     
 if __name__ == '__main__':

From 1cd7ac04832077b34d340e872ea47ac1fdb366f5 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sat, 14 May 2011 15:31:07 +0200
Subject: [PATCH 0337/2864] The metadatas are now case insensitive. Removes a
 tags-related bug.

---
 pelican/readers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 11cbde4e..c597ff8d 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -25,8 +25,8 @@ _METADATA_PROCESSORS = {
 }
 
 def _process_metadata(name, value):
-    if name in _METADATA_PROCESSORS:
-        return _METADATA_PROCESSORS[name](value)
+    if name.lower() in _METADATA_PROCESSORS:
+        return _METADATA_PROCESSORS[name.lower()](value)
     return value
 
 

From 93d0ad25d1e8bf64197a7fe8938554cf75659031 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Sat, 14 May 2011 17:08:04 +0200
Subject: [PATCH 0338/2864] simplify some code in utils.files_changed

---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 41733149..e9c1816c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -206,7 +206,7 @@ def files_changed(path, extensions):
     """Return True if the files have changed since the last check"""
 
     def with_extension(f):
-        return True if True in [f.endswith(ext) for ext in extensions] else False
+        return any(f.endswith(ext) for ext in extensions)
 
     def file_times(path):
         """Return the last time files have been modified"""

From 0bbdc6bc00b1048e9013ff65d63d738331fdb1e7 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Sun, 15 May 2011 12:14:03 +0200
Subject: [PATCH 0339/2864] check also the theme dir in autoreload mode

---
 pelican/__init__.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 74bb1058..c301a925 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -140,7 +140,13 @@ def main():
         if args.autoreload:
             while True:
                 try:
-                    if files_changed(pelican.path, pelican.markup):
+                    # Check source dir for changed files ending with the given
+                    # extension in the settings. In the theme dir is no such
+                    # restriction; all files are recursively checked if they
+                    # have changed, no matter what extension the filenames
+                    # have.
+                    if files_changed(pelican.path, pelican.markup) or \
+                            files_changed(pelican.theme, ['']):
                         pelican.run()
                     time.sleep(.5)  # sleep to avoid cpu load
                 except KeyboardInterrupt:

From 421a8768d410c4a34fb994ffda13a0162e5559f9 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Wed, 18 May 2011 20:26:02 +0200
Subject: [PATCH 0340/2864] Modified setup.py: tools/pelican-themes will now be
 installed as a script...

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 6fcfbe9c..3b12560c 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ setup(
     packages = ['pelican'],
     include_package_data = True,
     install_requires = requires,
-    scripts = ['bin/pelican'],
+    scripts = ['bin/pelican', 'tools/pelican-themes'],
     classifiers = ['Development Status :: 5 - Production/Stable',
                    'Environment :: Console',
                    'License :: OSI Approved :: GNU Affero General Public License v3',

From 5277b9dc16691ce39a30d5fe93d17b5e19f9f552 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 19 May 2011 17:28:45 +0100
Subject: [PATCH 0341/2864] Add the possibility to specify a list of
 alternatives for locales. Fixes #115

---
 docs/settings.rst   |  5 ++++-
 pelican/settings.py | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 5775edf1..ddc41681 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -39,7 +39,10 @@ Setting name (default value)                        what does it do?
 `JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.
 `DELETE_OUTPUT_DIRECTORY` (``False``)               Delete the output directory and just
                                                     the generated files.
-`LOCALE` (''[1]_)                                   Change the locale.
+`LOCALE` (''[1]_)                                   Change the locale. A list of locales can be provided 
+                                                    here or a single string representing one locale.
+                                                    When providing a list, all the locales will be tried 
+                                                    until one works.
 `MARKUP` (``('rst', 'md')``)                        A list of available markup languages you want
                                                     to use. For the moment, only available values
                                                     are `rst` and `md`.
diff --git a/pelican/settings.py b/pelican/settings.py
index 55577d84..e5afa63d 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -53,6 +53,19 @@ def read_settings(filename):
             if key.isupper():
                 context[key] = tempdict[key]
 
+    # if locales is not a list, make it one
+    locales = context['LOCALE']
+
+    if type(locales) is str:
+        locales = [str]
+
+    # try to set the different locales, fallback on the default.
+    for locale_ in context['LOCALE']:
+        try:
+            locale.setlocale(locale.LC_ALL, locale_)
+            break # break if it is successfull
+        except locale.Error:
+            pass
+
     # set the locale
-    locale.setlocale(locale.LC_ALL, context['LOCALE'])
     return context

From f7594912792d6fdbf80c615261fc9371b53c54f0 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 19 May 2011 18:00:17 +0100
Subject: [PATCH 0342/2864] Oops. This is it. See #115.

---
 pelican/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index e5afa63d..eea1ae0b 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -56,8 +56,8 @@ def read_settings(filename):
     # if locales is not a list, make it one
     locales = context['LOCALE']
 
-    if type(locales) is str:
-        locales = [str]
+    if isinstance(locales, basestring):
+        locales = [locales]
 
     # try to set the different locales, fallback on the default.
     for locale_ in context['LOCALE']:

From 44c1fe4840ea6dbeea559b337e78ce956c1f7e6a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 19 May 2011 18:10:21 +0100
Subject: [PATCH 0343/2864] Definitely a bad day for commits. Thanks kmike for
 reviewing

---
 pelican/settings.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index eea1ae0b..08c36a82 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -60,12 +60,14 @@ def read_settings(filename):
         locales = [locales]
 
     # try to set the different locales, fallback on the default.
-    for locale_ in context['LOCALE']:
+    for locale_ in locales:
         try:
             locale.setlocale(locale.LC_ALL, locale_)
             break # break if it is successfull
         except locale.Error:
             pass
+    else:
+        warnings.warn("LOCALE option doesn't contain a correct value")
 
     # set the locale
     return context

From a7baab6a97d001fd28f90285ca679a10bb753d9b Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sun, 22 May 2011 18:57:02 +0200
Subject: [PATCH 0344/2864] Added the manual for pelican-themes

---
 docs/conf.py               |   8 +-
 docs/fr/configuration.rst  |   2 +-
 docs/fr/pelican-themes.rst | 172 +++++++++++++++++++++++++++++++++++++
 docs/pelican-themes.rst    | 166 +++++++++++++++++++++++++++++++++++
 docs/settings.rst          |   3 +
 5 files changed, 348 insertions(+), 3 deletions(-)
 create mode 100644 docs/fr/pelican-themes.rst
 create mode 100644 docs/pelican-themes.rst

diff --git a/docs/conf.py b/docs/conf.py
index 76167eaf..dea52e2d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -147,6 +147,10 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'raclette', u'Raclette Documentation',
-     [u'Alexis Métaireau'], 1)
+    ('index', 'raclette', u'Raclette Documentation',  # why "raclette" ?!
+     [u'Alexis Métaireau'], 1),
+    ('pelican-themes', 'pelican-themes', u'A theme manager for Pelican',
+     [u'Mickaël Raybaud'], 'en.1'),
+    ('fr/pelican-themes', 'pelican-themes', u'Un gestionnaire de thèmes pour Pelican',
+     [u'Mickaël Raybaud'], 'fr.1')
 ]
diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
index 5f61a3ba..695a0b0e 100644
--- a/docs/fr/configuration.rst
+++ b/docs/fr/configuration.rst
@@ -123,7 +123,7 @@ THEME :
 TWITTER_USERNAME :
 	Permet d'afficher un bouton permettant le tweet des articles. 
 
-
+Pelican est fournit avec :doc:`pelican-themes`, un script permettant de gérer les thèmes
 
 
 
diff --git a/docs/fr/pelican-themes.rst b/docs/fr/pelican-themes.rst
new file mode 100644
index 00000000..810fa785
--- /dev/null
+++ b/docs/fr/pelican-themes.rst
@@ -0,0 +1,172 @@
+pelican-themes
+##############
+
+
+
+Description
+===========
+
+``pelican-themes`` est un outil en lignes de commandes pour gérer les thèmes de Pelican.
+
+
+Utilisation:
+""""""""""""
+
+| pelican-themes [-h] [-l] [-i *chemin d'un thème* [*chemin d'un thème* ...]]
+|                      [-r *nom d'un thème* [*nom d'un thème* ...]]
+|                      [-s *chemin d'un thème* [*chemin d'un thème* ...]] [-v] [--version]
+
+Arguments:
+""""""""""
+
+
+-h, --help                      Afficher l'aide et quitter 
+
+-l, --list                      Montrer les thèmes installés
+
+-i chemin, --install chemin     Chemin(s) d'accès d'un ou plusieurs thème à installer
+
+-r nom, --remove nom            Noms d'un ou plusieurs thèmes à installer
+
+-s chemin, --symlink chemin     Fonctionne de la même façon que l'option ``--install``, mais crée un lien symbolique au lieu d'effectuer une copie du thème vers le répertoire des thèmes.
+                                Utile pour le développement de thèmes.
+
+-v, --verbose                   Sortie détaillée 
+
+--version                       Affiche la version du script et quitte
+
+
+
+Exemples
+========
+
+
+Lister les thèmes installés
+"""""""""""""""""""""""""""
+
+``pelican-themes`` peut afficher les thèmes disponibles.
+
+Pour cela, vous pouvez utiliser l'option ``-l`` ou ``--list``, comme ceci:
+
+.. code-block:: console
+
+    $ pelican-themes -l
+    notmyidea
+    two-column@
+    simple
+    $ pelican-themes --list
+    notmyidea
+    two-column@
+    simple
+
+Dans cet exemple, nous voyons qu'il y a trois thèmes d'installés: ``notmyidea``, ``simple`` and ``two-column``.
+
+``two-column`` est suivi d'un ``@`` par ce que c'est un lien symbolique (voir `Créer des liens symboliques`_).
+
+Notez que vous pouvez combiner l'option ``--list`` avec l'option ``--verbose``, pour afficher plus de détails:
+
+.. code-block:: console
+    
+    $ pelican-themes -v -l
+    /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/notmyidea
+    /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/two-column (symbolic link to `/home/skami/Dev/Python/pelican-themes/two-column')
+    /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/simple
+
+
+Installer des thèmes
+""""""""""""""""""""
+
+Vous pouvez installer un ou plusieurs thèmes en utilisant l'option ``-i`` ou ``--install``.
+
+Cette option prends en argument le(s) chemin(s) d'accès du ou des thème(s) que vous voulez installer, et peut se combiner avec l'option ``--verbose``:
+
+.. code-block:: console
+
+    # pelican-themes --install ~/Dev/Python/pelican-themes/notmyidea-cms --verbose
+
+.. code-block:: console
+
+    # pelican-themes --install ~/Dev/Python/pelican-themes/notmyidea-cms\
+                               ~/Dev/Python/pelican-themes/martyalchin \
+                               --verbose
+
+.. code-block:: console
+
+    # pelican-themes -vi ~/Dev/Python/pelican-themes/two-column
+
+
+Supprimer des thèmes
+""""""""""""""""""""
+
+``pelican-themes`` peut aussi supprimer des thèmes précédemment installés grâce à l'option ``-r`` ou ``--remove``.
+
+Cette option prends en argument le ou les nom(s) des thèmes que vous voulez installer, et peux se combiner avec l'option ``--verbose``:
+
+.. code-block:: console
+
+    # pelican-themes --remove two-column
+
+.. code-block:: console
+
+    # pelican-themes -r martyachin notmyidea-cmd -v
+
+
+
+
+
+Créer des liens symboliques
+"""""""""""""""""""""""""""
+
+
+L'option ``-s`` ou ``--symlink`` de ``pelican-themes`` permet de lier symboliquement un thème.
+
+Cette option s'utilise exactement comme l'option ``--install``:
+
+.. code-block:: console
+    
+    # pelican-themes --symlink ~/Dev/Python/pelican-themes/two-column
+
+Dans l'exemple ci dessus, un lien symbolique pointant vers le thème ``two-column`` a été installé dans le répertoire des thèmes de Pelican, toute modification sur le thème ``two-column`` prendra donc effet immédiatement.
+
+Cela peut être pratique pour le développement de thèmes
+
+.. code-block:: console
+
+    $ sudo pelican-themes -s ~/Dev/Python/pelican-themes/two-column
+    $ pelican ~/Blog/content -o /tmp/out -t two-column
+    $ firefox /tmp/out/index.html
+    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/static/css/main.css 
+    $ pelican ~/Blog/content -o /tmp/out -t two-column
+    $ cp /tmp/bg.png ~/Dev/Pelican/pelican-themes/two-coumn/static/img/bg.png
+    $ pelican ~/Blog/content -o /tmp/out -t two-column
+    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/templates/index.html 
+    $ pelican ~/Blog/content -o /tmp/out -t two-column
+
+
+Notez que cette fonctionnalité nécessite d'avoir un système d'exploitation et un système de fichiers supportant les liens symboliques, elle n'est donc pas disponible sous Micro$oft®©™ Fenêtre®©™. 
+
+Faire plusieurs choses à la fois
+""""""""""""""""""""""""""""""""
+
+
+Les options ``--install``, ``--remove`` et ``--symlink`` peuvent être employées en même temps, ce qui permets de réaliser plusieurs opérations en même temps:
+
+.. code-block:: console
+
+    # pelican-themes --remove notmyidea-cms two-column \
+                     --install ~/Dev/Python/pelican-themes/notmyidea-cms-fr \
+                     --symlink ~/Dev/Python/pelican-themes/two-column \
+                     --verbose
+
+Dans cette exemple, le thème ``notmyidea-cms`` sera remplacé par le thème ``notmyidea-cms-fr`` et le thème ``two-column`` sera lié symboliquement...
+
+
+
+À voir également
+================
+
+-   http://docs.notmyidea.org/alexis/pelican/
+-   ``/usr/share/doc/pelican/`` si vous avez installé Pelican par le `dépôt APT <http://skami18.github.com/pelican-packages/>`_
+
+
+
diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
new file mode 100644
index 00000000..bd2dba77
--- /dev/null
+++ b/docs/pelican-themes.rst
@@ -0,0 +1,166 @@
+pelican-themes
+##############
+
+
+
+Description
+===========
+
+``pelican-themes`` is a command line tool for managing themes for Pelican.
+
+
+Usage
+"""""
+
+| pelican-themes [-h] [-l] [-i theme path [theme path ...]]
+|                      [-r theme name [theme name ...]]
+|                      [-s theme path [theme path ...]] [-v] [--version]
+
+Optional arguments:
+"""""""""""""""""""
+
+
+-h, --help                              Show the help an exit
+
+-l, --list                              Show the themes already installed
+
+-i theme_path, --install theme_path     One or more themes to install
+
+-r theme_name, --remove theme_name      One or more themes to remove
+
+-s theme_path, --symlink theme_path     Same as "--install", but create a symbolic link instead of copying the theme.
+                                        Useful for theme development
+
+-v, --verbose                           Verbose output
+
+--version                               Print the version of this script
+
+
+
+Examples
+========
+
+
+Listing the installed themes
+""""""""""""""""""""""""""""
+
+With ``pelican-themes``, you can see the available themes by using the ``-l`` or ``--list`` option:
+
+.. code-block:: console
+
+    $ pelican-themes -l
+    notmyidea
+    two-column@
+    simple
+    $ pelican-themes --list
+    notmyidea
+    two-column@
+    simple
+
+In this example, we can see there is 3 themes available: ``notmyidea``, ``simple`` and ``two-column``.
+
+``two-column`` is prefixed with an ``@`` because this theme is not copied to the Pelican theme path, but just linked to it (see `Creating symbolic links`_ for details about creating symbolic links).
+
+Note that you can combine the ``--list`` option with the ``-v`` or ``--verbose`` option to get a more verbose output, like this:
+
+.. code-block:: console
+    
+    $ pelican-themes -v -l
+    /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/notmyidea
+    /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/two-column (symbolic link to `/home/skami/Dev/Python/pelican-themes/two-column')
+    /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/simple
+
+
+Installing themes
+"""""""""""""""""
+
+You can install one or more themes using the ``-i`` or ``--install`` option.
+This option takes as argument the path(s) of the theme(s) you want to install, and can be combined with the verbose option:
+
+.. code-block:: console
+
+    # pelican-themes --install ~/Dev/Python/pelican-themes/notmyidea-cms --verbose
+
+.. code-block:: console
+
+    # pelican-themes --install ~/Dev/Python/pelican-themes/notmyidea-cms\
+                               ~/Dev/Python/pelican-themes/martyalchin \
+                               --verbose
+
+.. code-block:: console
+
+    # pelican-themes -vi ~/Dev/Python/pelican-themes/two-column
+
+
+Removing themes
+"""""""""""""""
+
+Pelican themes can also removes themes from the Pelican themes path.
+The ``-r`` or ``--remove`` takes as argument the name(s) of the theme(s) you want to remove, and can be combined with the ``--verbose`` option.
+
+.. code-block:: console
+
+    # pelican-themes --remove two-column
+
+.. code-block:: console
+
+    # pelican-themes -r martyachin notmyidea-cmd -v
+
+
+
+
+
+Creating symbolic links
+"""""""""""""""""""""""
+
+``pelican-themes`` can also install themes by creating symbolic links instead of copying the whole themes in the Pelican themes path.
+
+To symbolically link a theme, you can use the ``-s`` or ``--symlink``, which works exactly as the ``--install`` option:
+
+.. code-block:: console
+    
+    # pelican-themes --symlink ~/Dev/Python/pelican-themes/two-column
+
+In this example, the ``two-column`` theme is now symbolically linked to the Pelican themes path, so we can use it, but we can also modify it without having to reinstall it after each modification.
+
+This is useful for theme development:
+
+.. code-block:: console
+
+    $ sudo pelican-themes -s ~/Dev/Python/pelican-themes/two-column
+    $ pelican ~/Blog/content -o /tmp/out -t two-column
+    $ firefox /tmp/out/index.html
+    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/static/css/main.css 
+    $ pelican ~/Blog/content -o /tmp/out -t two-column
+    $ cp /tmp/bg.png ~/Dev/Pelican/pelican-themes/two-coumn/static/img/bg.png
+    $ pelican ~/Blog/content -o /tmp/out -t two-column
+    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/templates/index.html 
+    $ pelican ~/Blog/content -o /tmp/out -t two-column
+
+
+
+Doing several things at once
+""""""""""""""""""""""""""""
+
+The ``--install``, ``--remove`` and ``--symlink`` option are not mutually exclusive, so you can combine them in the same command line to do more than one operation at time, like this:
+
+
+.. code-block:: console
+
+    # pelican-themes --remove notmyidea-cms two-column \
+                     --install ~/Dev/Python/pelican-themes/notmyidea-cms-fr \
+                     --symlink ~/Dev/Python/pelican-themes/two-column \
+                     --verbose
+
+In this example,  the theme ``notmyidea-cms`` is replaced by the theme ``notmyidea-cms-fr`` 
+
+
+
+
+See also
+========
+
+-   http://docs.notmyidea.org/alexis/pelican/
+-   ``/usr/share/doc/pelican/`` if you have installed Pelican using the `APT repository <http://skami18.github.com/pelican-packages/>`_
+
+
diff --git a/docs/settings.rst b/docs/settings.rst
index ddc41681..355716e9 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -195,6 +195,8 @@ Here is `a guide on how to create your theme
 
 You can find a list of themes at http://github.com/ametaireau/pelican-themes.
 
+Pelican comes with :doc:`pelican-themes` a small script for managing themes.
+
 The `notmyidea` theme can make good use of the following settings. I recommend
 to use them too in your themes.
 
@@ -278,3 +280,4 @@ Setting name (default value)                        what does it do?
 `SKRIBIT_WIDGET_ID`                                 Widget identifier (See Skribit part below).
 ================================================    =====================================================
 
+.. _pelican-themes: :doc:`pelican-themes`

From 3f0ce7ec4e6ed6edf8b4881f06db16003bf9b3f7 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Fri, 27 May 2011 19:13:41 +0200
Subject: [PATCH 0345/2864] New version of pelican-themes

- New parameter -c/--clean (remove the broken symlinks)
- Added docstrings
- Some bugs corrected
- Compatibility with the old version is not broken (so the triggers in the debian packages are still working)
---
 tools/pelican-themes | 121 +++++++++++++++++++++++++++++++------------
 1 file changed, 87 insertions(+), 34 deletions(-)

diff --git a/tools/pelican-themes b/tools/pelican-themes
index 38ddf310..efc34c29 100755
--- a/tools/pelican-themes
+++ b/tools/pelican-themes
@@ -4,53 +4,70 @@
 import os, sys, shutil
 import argparse
 
-
-def err(msg, die=None):
-    sys.stderr.write(str(msg) + '\n')
-    if die:
-        sys.exit((die if type(die) is int else 1))
-
 try:
     import pelican
-
-    global themes_path
-    themes_path = os.path.join(
-        os.path.dirname(
-            os.path.abspath(
-                pelican.__file__
-            )
-        ),
-        'themes'
-    )
 except:
     err('Cannot import pelican.\nYou must install Pelican in order to run this script.', -1)
 
 
-__version__ = '0.1'
+global _THEMES_PATH
+_THEMES_PATH = os.path.join(
+    os.path.dirname(
+        os.path.abspath(
+            pelican.__file__
+    )
+    ),
+    'themes'
+)
+
+__version__ = '0.2'
 _BUILTIN_THEMES = ['simple', 'notmyidea']
 
 
+def err(msg, die=None):
+    """Print an error message and exits if an exit code is given"""
+    sys.stderr.write(str(msg) + '\n')
+    if die:
+        sys.exit((die if type(die) is int else 1))
+
+
 def main():
+    """Main function"""
+
     parser = argparse.ArgumentParser(description="""Install themes for Pelican""")
 
-    parser.add_argument('-l', '--list', dest='list', action="store_true",
-                        help="Show the themes already installed")
+    excl= parser.add_mutually_exclusive_group()
+    excl.add_argument('-l', '--list', dest='action', action="store_const", const='list',
+                        help="Show the themes already installed and exit")
+    excl.add_argument('-p', '--path', dest='action', action="store_const", const='path',
+                        help="Show the themes path and exit")
+    excl.add_argument('-V', '--version', action='version', version='pelican-themes v{0}'.format(__version__),
+            help='Print the version of this script')
+
+
     parser.add_argument('-i', '--install', dest='to_install', nargs='+', metavar="theme path",
         help='The themes to install ')
     parser.add_argument('-r', '--remove', dest='to_remove', nargs='+', metavar="theme name",
         help='The themes to remove')
     parser.add_argument('-s', '--symlink', dest='to_symlink', nargs='+', metavar="theme path",
         help="Same as `--install', but create a symbolic link instead of copying the theme. Useful for theme development")
+    parser.add_argument('-c', '--clean', dest='clean', action="store_true",
+                        help="Remove the broken symbolic links of the theme path")
+
+
     parser.add_argument('-v', '--verbose', dest='verbose', action="store_true",
                         help="Verbose output")
-    parser.add_argument('--version', action='version', version=__version__,
-            help='Print the version of this script')
+
+
     args = parser.parse_args()
 
-
-    if args.list:
-        list_themes(args.verbose)
-    else:
+    
+    if args.action:
+        if args.action is 'list':
+            list_themes(args.verbose)
+        elif args.action is 'path':
+            print(_THEMES_PATH)
+    elif args.to_install or args.to_remove or args.to_symlink or args.clean:
 
         if args.to_remove:
             if args.verbose:
@@ -73,20 +90,29 @@ def main():
             for i in args.to_symlink:
                 symlink(i, v=args.verbose)
 
+        if args.clean:
+            if args.verbose:
+                print('Cleaning the themes directory...')
+            
+            clean(v=args.verbose)
+    else:
+        print('No argument given... exiting.')
 
 
 def themes():
-    for i in os.listdir(themes_path):
-        e = os.path.join(themes_path, i)
+    """Returns the list of the themes"""
+    for i in os.listdir(_THEMES_PATH):
+        e = os.path.join(_THEMES_PATH, i)
 
         if os.path.isdir(e):
             if os.path.islink(e):
-                yield (e, os.path.realpath(e))
+                yield (e, os.readlink(e))
             else:
                 yield (e, None)
 
 
 def list_themes(v=False):
+    """Display the list of the themes"""
     for t, l in themes():
         if not v:
             t = os.path.basename(t)
@@ -100,14 +126,13 @@ def list_themes(v=False):
 
 
 def remove(theme_name, v=False):
+    """Removes a theme"""
 
     theme_name = theme_name.replace('/','')
-    target = os.path.join(themes_path, theme_name)
+    target = os.path.join(_THEMES_PATH, theme_name)
 
     if theme_name in _BUILTIN_THEMES:
         err(theme_name + ' is a builtin theme.\nYou cannot remove a builtin theme with this script, remove it by hand if you want.')
-    elif not os.path.exists(target):
-        err(target + ' : no such file or directory')
     elif os.path.islink(target):
         if v:
             print('Removing link `' + target + "'")
@@ -116,18 +141,21 @@ def remove(theme_name, v=False):
         if v:
             print('Removing directory `' + target + "'")
         shutil.rmtree(target)
-    else:
+    elif os.path.exists(target):
         err(target + ' : not a valid theme') 
+    else:
+        err(target + ' : no such file or directory')
 
 
 def install(path, v=False):
+    """Installs a theme"""
     if not os.path.exists(path):
         err(path + ' : no such file or directory')
     elif not os.path.isdir(path):
         err(path + ' : no a directory')
     else:
         theme_name = os.path.basename(os.path.normpath(path))
-        theme_path = os.path.join(themes_path, theme_name)
+        theme_path = os.path.join(_THEMES_PATH, theme_name)
         if os.path.exists(theme_path):
             err(path + ' : already exists')
         else:
@@ -138,14 +166,16 @@ def install(path, v=False):
             except Exception, e:
                 err("Cannot copy `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
 
+
 def symlink(path, v=False):
+    """Symbolically link a theme"""
     if not os.path.exists(path):
         err(path + ' : no such file or directory')
     elif not os.path.isdir(path):
         err(path + ' : no a directory')
     else:
         theme_name = os.path.basename(os.path.normpath(path))
-        theme_path = os.path.join(themes_path, theme_name)
+        theme_path = os.path.join(_THEMES_PATH, theme_name)
         if os.path.exists(theme_path):
             err(path + ' : already exists')
         else:
@@ -157,6 +187,29 @@ def symlink(path, v=False):
                 err("Cannot link `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
 
 
+def is_broken_link(path):
+    """Returns True if the path given as is a broken symlink"""
+    path = os.readlink(path)
+    return not os.path.exists(path)
+
+
+def clean(v=False):
+    """Removes the broken symbolic links"""
+    c=0
+    for path in os.listdir(_THEMES_PATH):
+        path = os.path.join(_THEMES_PATH, path)
+        if os.path.islink(path):
+            if is_broken_link(path):
+                if v:
+                    print('Removing {0}'.format(path))
+                try:
+                    os.remove(path)
+                except OSError, e:
+                    print('Error: cannot remove {0}'.format(path))
+                else:
+                    c+=1
+
+    print("\nRemoved {0} broken links".format(c))
     
 if __name__ == '__main__':
     main()

From 1c6ea5aab2a0bf52f2ed31342897a7c33068b533 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 31 May 2011 12:44:40 +0200
Subject: [PATCH 0346/2864] Fix locale setup in settings.py

---
 pelican/settings.py     | 7 ++++++-
 samples/pelican.conf.py | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 08c36a82..d1826710 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -2,6 +2,8 @@
 import os
 import locale
 
+from pelican import log
+
 DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
                               "themes/notmyidea"])
 _DEFAULT_CONFIG = {'PATH': None,
@@ -60,6 +62,9 @@ def read_settings(filename):
         locales = [locales]
 
     # try to set the different locales, fallback on the default.
+    if not locales:
+        locales = _DEFAULT_CONFIG['LOCALE']
+
     for locale_ in locales:
         try:
             locale.setlocale(locale.LC_ALL, locale_)
@@ -67,7 +72,7 @@ def read_settings(filename):
         except locale.Error:
             pass
     else:
-        warnings.warn("LOCALE option doesn't contain a correct value")
+        log.warn("LOCALE option doesn't contain a correct value")
 
     # set the locale
     return context
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 8648e7cb..2796d561 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -7,7 +7,7 @@ GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
-LOCALE = 'fr_FR.utf-8'
+LOCALE = ""
 DEFAULT_PAGINATION = 2
 
 FEED_RSS = 'feeds/all.rss.xml'

From a5d4027c801213629e70b0c39673a127c82b7f9d Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Wed, 1 Jun 2011 18:57:12 +0200
Subject: [PATCH 0347/2864] Removed the bug #122 and a lone closing tag

---
 pelican/themes/notmyidea/static/css/main.css    | 2 ++
 pelican/themes/notmyidea/templates/taglist.html | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index a3fd60f1..d416aaff 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -340,6 +340,8 @@ img.left, figure.left {float: right; margin: 0 0 2em 2em;}
 /***** Sections *****/
 /* Blog */
 .hentry {
+	display: block;
+	clear: both;
 	border-bottom: 1px solid #eee;
 	padding: 1.5em 0;
 }
diff --git a/pelican/themes/notmyidea/templates/taglist.html b/pelican/themes/notmyidea/templates/taglist.html
index 4259077a..0f4862d0 100644
--- a/pelican/themes/notmyidea/templates/taglist.html
+++ b/pelican/themes/notmyidea/templates/taglist.html
@@ -1,2 +1,2 @@
 {% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}</p>{% endif %}
-{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
+{% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a></p>{% endif %}

From c5ffe377df1a44ee6cc7cbeab5f12bb4c905e413 Mon Sep 17 00:00:00 2001
From: Alen Mujezinovic <flashingpumpkin@gmail.com>
Date: Wed, 1 Jun 2011 14:27:08 -0700
Subject: [PATCH 0348/2864] European date format parsing.

---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index e9c1816c..8e48c2e9 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -15,7 +15,7 @@ def get_date(string):
     If no format matches the given date, raise a ValuEerror
     """
     formats = ['%Y-%m-%d %H:%M', '%Y/%m/%d %H:%M', '%Y-%m-%d', '%Y/%m/%d',
-               '%d/%m/%Y']
+               '%d/%m/%Y', '%d.%m.%Y', '%d.%m.%Y %H:%M']
     for date_format in formats:
         try:
             return datetime.strptime(string, date_format)

From 8b914fcec20b8368039f83688d801505e165dd5f Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Fri, 3 Jun 2011 18:26:27 +0200
Subject: [PATCH 0349/2864] Removed issue #124

---
 docs/getting_started.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index eb5a2201..55cd29d4 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -139,7 +139,8 @@ Pelican is able to regognise the syntax you are using, and to colorize the
 right way your block codes. To do so, you have to use the following syntax::
 
     .. code-block:: identifier
-        your code goes here
+
+       your code goes here
 
 The identifier is one of the lexers available `here
 <http://pygments.org/docs/lexers/>`_.

From 6ba15e6a520e1c8249a049eee834369849da0473 Mon Sep 17 00:00:00 2001
From: Alexis Daboville <alexis.daboville@gmail.com>
Date: Sat, 4 Jun 2011 15:35:44 +0200
Subject: [PATCH 0350/2864] Added a little doc about page.html, fix some typos,
 follow a single convention for '.' at end of lines.

---
 docs/themes.rst | 65 +++++++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 301e090e..83e184f0 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -3,7 +3,7 @@
 How to create themes for pelican
 ################################
 
-Pelican uses the great `jinja2 <http://jinjna.pocoo.org>`_ templating engine to
+Pelican uses the great `jinja2 <http://jinja.pocoo.org>`_ templating engine to
 generate it's HTML output. The jinja2 syntax is really simple. If you want to
 create your own theme, feel free to take inspiration from the "simple" theme,
 which is available `here
@@ -53,17 +53,17 @@ All of those settings will be given to all templates.
 =============   ===================================================
 Variable        Description
 =============   ===================================================
-articles        That's the list of articles, ordsered desc. by date
+articles        That's the list of articles, ordered desc. by date
                 all the elements are `Article` objects, so you can 
                 access their properties (e.g. title, summary, author
-                etc. 
+                etc.).
 dates           The same list of article, but ordered by date,
-                ascending
+                ascending.
 tags            A dict containing each tags (keys), and the list of
                 relative articles.
 categories      A dict containing each category (keys), and the 
                 list of relative articles.
-pages           The list of pages
+pages           The list of pages.
 =============   ===================================================
 
 index.html
@@ -76,12 +76,12 @@ If pagination is active, next pages will remain at output/index`n`.html.
 ===================     ===================================================
 Variable                Description
 ===================     ===================================================
-articles_paginator      A paginator object of article list
-articles_page           The current page of articles
+articles_paginator      A paginator object of article list.
+articles_page           The current page of articles.
 dates_paginator         A paginator object of article list, ordered by date,
-                        ascending
+                        ascending.
 dates_page              The current page of articles, ordered by date,
-                        ascending
+                        ascending.
 page_name               'index'. Useful for pagination links.
 ===================     ===================================================
 
@@ -97,16 +97,16 @@ output/category/`category_name``n`.html.
 ===================     ===================================================
 Variable                Description
 ===================     ===================================================
-category                The name of the category being processed
-articles                Articles of this category
+category                The name of the category being processed.
+articles                Articles of this category.
 dates                   Articles of this category, but ordered by date,
-                        ascending
-articles_paginator      A paginator object of article list
-articles_page           The current page of articles
+                        ascending.
+articles_paginator      A paginator object of article list.
+articles_page           The current page of articles.
 dates_paginator         A paginator object of article list, ordered by date,
-                        ascending
+                        ascending.
 dates_page              The current page of articles, ordered by date,
-                        ascending
+                        ascending.
 page_name               'category/`category_name`'. Useful for pagination
                         links.
 ===================     ===================================================
@@ -120,15 +120,28 @@ in output/`article_name`.html. Here are the specific variables it gets.
 =============   ===================================================
 Variable        Description
 =============   ===================================================
-article         The article object to be displayed
-category        The name of the category of the current article
+article         The article object to be displayed.
+category        The name of the category of the current article.
+=============   ===================================================
+
+page.html
+---------
+
+For each page, this template will be processed. It will create .html files in
+output/`page_name`.html.
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+page            The page object to be displayed. You can access to
+                its title, slug and content.
 =============   ===================================================
 
 tag.html
 --------
 
 For each tag, this template will be processed. It will create .html files in
-/output/tag/`tag_name`.html.
+output/tag/`tag_name`.html.
 
 If pagination is active, next pages will remain at
 output/tag/`tag_name``n`.html.
@@ -136,16 +149,16 @@ output/tag/`tag_name``n`.html.
 ===================     ===================================================
 Variable                Description
 ===================     ===================================================
-tag                     The name of the tag being processed
-articles                Articles related to this tag
+tag                     The name of the tag being processed.
+articles                Articles related to this tag.
 dates                   Articles related to this tag, but ordered by date,
-                        ascending
-articles_paginator      A paginator object of article list
-articles_page           The current page of articles
+                        ascending.
+articles_paginator      A paginator object of article list.
+articles_page           The current page of articles.
 dates_paginator         A paginator object of article list, ordered by date,
-                        ascending
+                        ascending.
 dates_page              The current page of articles, ordered by date,
-                        ascending
+                        ascending.
 page_name               'tag/`tag_name`'. Useful for pagination links.
 ===================     ===================================================
 

From eb16c6e980c1c594091c9789c77e4135c0f1f055 Mon Sep 17 00:00:00 2001
From: Alexis Daboville <alexis.daboville@gmail.com>
Date: Sat, 4 Jun 2011 15:37:51 +0200
Subject: [PATCH 0351/2864] Added a french doc for theming.

---
 docs/fr/index.rst  |   1 +
 docs/fr/themes.rst | 187 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 188 insertions(+)
 create mode 100644 docs/fr/themes.rst

diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index 9d741af2..dca85fac 100644
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -50,6 +50,7 @@ Documentation
    installation
    bases
    configuration
+   themes
    parametres_article
    astuces
    faq
diff --git a/docs/fr/themes.rst b/docs/fr/themes.rst
new file mode 100644
index 00000000..53e6374e
--- /dev/null
+++ b/docs/fr/themes.rst
@@ -0,0 +1,187 @@
+.. _theming-pelican:
+
+Cette page est une traduction de la documentation originale, en anglais et
+disponible `ici <../themes.html>`_.
+
+Comment créer des thèmes pour Pelican
+#####################################
+
+Pelican utlise le très bon moteur de template `jinja2 <http://jinja.pocoo.org>`_
+pour produire de l'HTML. La syntaxe de jinja2 est vraiment très simple. Si vous
+voulez créer votre propre thème, soyez libre de prendre inspiration sur le theme
+"simple" qui est disponible `ici
+<https://github.com/ametaireau/pelican/tree/master/pelican/themes/simple/templates>`_
+
+Structure
+=========
+
+Pour réaliser votre propre thème vous devez respecter la structure suivante ::
+
+    ├── static
+    │   ├── css
+    │   └── images
+    └── templates
+        ├── archives.html    // pour afficher les archives
+        ├── article.html     // généré pour chaque article
+        ├── categories.html  // doit lister toutes les catégories
+        ├── category.html    // généré pour chaque catégorie
+        ├── index.html       // la page d'index, affiche tous les articles
+        ├── page.html        // généré pour chaque page
+        ├── tag.html         // généré pour chaque tag
+        └── tags.html        // doit lister tous les tags. Peut être un nuage de tag.
+
+
+* `static` contient tout le contenu statique. Il sera copié dans le dossier
+  `theme/static`. J'ai mis un dossier css et un image, mais ce sont juste des
+  exemples. Mettez ce dont vous avez besoin ici.
+
+* `templates` contient tous les templates qui vont être utiliser pour générer les
+  pages. J'ai juste mis les templates obligatoires ici, vous pouvez définir les
+  vôtres si cela vous aide à vous organiser pendant que vous réaliser le thème.
+  Vous pouvez par exemple utiliser les directives {% include %} et {% extends %}
+  de jinja2.
+ 
+Templates et variables
+======================
+
+Cela utilise une syntaxe simple, que vous pouvez insérer dans vos pages HTML.
+Ce document décrit les templates qui doivent exister dans un thème, et quelles
+variables seront passées à chaque template, au moment de le générer.
+
+Tous les templates recevront les variables définies dans votre fichier de
+configuration, si elles sont en capitales. Vous pouvez y accéder directement.
+
+Variables communes
+------------------
+
+Toutes ces variables seront passées à chaque template.
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+articles        C'est la liste des articles, ordonnée décroissante
+                par date. Tous les éléments de la liste sont des
+                objets `Article`, vous pouvez donc accéder à leurs
+                propriétés (exemple : title, summary, author, etc).
+dates           La même liste d'articles, ordonnée croissante par
+                date.
+tags            Un dictionnaire contenant tous les tags (clés), et
+                la liste des articles correspondants à chacun
+                d'entre eux (valeur).
+categories      Un dictionnaire contenant toutes les catégories
+                (clés), et la liste des articles correspondants à
+                chacune d'entre elles (valeur).
+pages           La liste des pages.
+=============   ===================================================
+
+index.html
+----------
+
+La page d'accueil de votre blog, sera générée dans output/index.html.
+
+Si la pagination est activée, les pages suivantes seront à l'adresse
+output/index`n`.html.
+
+===================     ===================================================
+Variable                Description
+===================     ===================================================
+articles_paginator      Un objet paginator de la liste d'articles.
+articles_page           La page actuelle d'articles.
+dates_paginator         Un objet paginator de la liste d'articles, ordonné
+                        par date croissante.
+dates_pages             La page actuelle d'articles, ordonnée par date
+                        croissante.
+page_name               'index'.
+===================     ===================================================
+
+category.html
+-------------
+
+Ce template sera généré pour chaque catégorie existante, et se retrouvera
+finalement à output/category/`nom de la catégorie`.html.
+
+Si la pagination est activée, les pages suivantes seront disponibles à
+l'adresse output/category/`nom de la catégorie``n`.html.
+
+===================     ===================================================
+Variable                Description
+===================     ===================================================
+category                La catégorie qui est en train d'être générée.
+articles                Les articles dans cette catégorie.
+dates                   Les articles dans cette catégorie, ordonnés par
+                        date croissante.
+articles_paginator      Un objet paginator de la liste d'articles.
+articles_page           La page actuelle d'articles.
+dates_paginator         Un objet paginator de la liste d'articles, ordonné
+                        par date croissante.
+dates_pages             La page actuelle d'articles, ordonnée par date
+                        croissante.
+page_name               'category/`nom de la catégorie`'.
+===================     ===================================================
+
+article.html
+-------------
+
+Ce template sera généré pour chaque article. Les fichiers .html seront
+disponibles à output/`nom de l'article`.html.
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+article         L'objet article à afficher.
+category        Le nom de la catégorie de l'article actuel.
+=============   ===================================================
+
+page.html
+---------
+
+Pour chaque page ce template sera généré à l'adresse
+output/`nom de la page`.html
+
+=============   ===================================================
+Variable        Description
+=============   ===================================================
+page            L'objet page à afficher. Vous pouvez accéder à son
+                titre (title), slug, et son contenu (content).
+=============   ===================================================
+
+tag.html
+--------
+
+Ce template sera généré pour chaque tag. Cela créera des fichiers .html à
+l'adresse output/tag/`nom du tag`.html.
+
+Si la pagination est activée, les pages suivantes seront disponibles à
+l'adresse output/tag/`nom du tag``n`.html
+
+===================     ===================================================
+Variable                Description
+===================     ===================================================
+tag                     Nom du tag à afficher.
+articles                Une liste des articles contenant ce tag.
+dates                   Une liste des articles contenant ce tag, ordonnée
+                        par date croissante.
+articles_paginator      Un objet paginator de la liste d'articles.
+articles_page           La page actuelle d'articles.
+dates_paginator         Un objet paginator de la liste d'articles, ordonné
+                        par date croissante.
+dates_pages             La page actuelle d'articles, ordonnée par date
+                        croissante.
+page_name               'tag/`nom du tag`'.
+===================     ===================================================
+
+Inclure le script skribit
+=========================
+
+Pour pouvoir supporter les scripts skribit dans vos thèmes, vous devez
+faire ceci :
+
+ * Copier `skribit_tab_script.html` et `skribit_widget_script.html` dans
+   votre dossier de templates.
+ * Ajouter {% include 'skribit_tab_script' %} dans votre <head> pour
+   ajouter le support de l'onglet de suggestions.
+ * Ajouter {% include 'skribit_widget_script' %} là où vous le souhaitez
+   pour ajouter le widget dans la sidebar.
+
+Vous pouvez regarder le thème par défault (notmyidea) pour voir un
+exemple de thème fonctionnel.

From 086df21ce7e991f558d1bf508388ba3ce3adc32b Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 11 Jun 2011 21:43:31 +0200
Subject: [PATCH 0352/2864] bump 2.7.0

---
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index c301a925..0c0227f0 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,7 +9,7 @@ from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 from pelican import log
 
-VERSION = "2.6.0"
+VERSION = "2.7.0"
 
 
 class Pelican(object):
diff --git a/setup.py b/setup.py
index 3b12560c..7ed7038c 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 import sys
 
-VERSION = "2.6.0" # find a better way to do so.
+VERSION = "2.7.0" # find a better way to do so.
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils']
 if sys.version_info < (2,7):

From 83a61da25574d23f7b4dea8e6d31587ff329b050 Mon Sep 17 00:00:00 2001
From: Rory McCann <rory@technomancy.org>
Date: Sun, 12 Jun 2011 18:41:29 +0100
Subject: [PATCH 0353/2864] fix typo to make work if path ends in / (cf. issue
 #131)

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0c0227f0..20f3862e 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -24,7 +24,7 @@ class Pelican(object):
                     ' (see pelican --help for more information)')
 
         if self.path.endswith('/'):
-            self.path = path[:-1]
+            self.path = self.path[:-1]
 
         # define the default settings
         self.settings = settings

From fee2b50cb9e6622b8a02c3bb87d965e05cae1d03 Mon Sep 17 00:00:00 2001
From: Rory McCann <rory@technomancy.org>
Date: Sun, 12 Jun 2011 18:52:42 +0100
Subject: [PATCH 0354/2864] If the PATH settings is set to a non-absolute path,
 then use normalize it relative to the settings file. This should probably be
 done for other settings aswell

---
 pelican/settings.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pelican/settings.py b/pelican/settings.py
index d1826710..98a11216 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -74,5 +74,11 @@ def read_settings(filename):
     else:
         log.warn("LOCALE option doesn't contain a correct value")
 
+    # Make the paths relative to the settings file
+    for path in ['PATH']:
+        if path in context:
+            if not os.path.isabs(context[path]):
+                context[path] = os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(filename), context[path])))
+
     # set the locale
     return context

From 7fc5fa0661a7350ac50940c8396f58547367e684 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 12 Jun 2011 22:18:50 +0200
Subject: [PATCH 0355/2864] Order tag articles per date. Fix #133

---
 pelican/generators.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index 2ba36dcb..a397c002 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -167,6 +167,7 @@ class ArticlesGenerator(Generator):
         # and subfolders after that
         tag_template = self.get_template('tag')
         for tag, articles in self.tags.items():
+            articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write('tag/%s.html' % tag, tag_template, self.context, tag=tag,
                 articles=articles, dates=dates,

From 515e02bcc6f6477de3325b221899b27a32cd518b Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 12 Jun 2011 22:31:26 +0200
Subject: [PATCH 0356/2864] Add the OUTPUT_PATH as a relative path.

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 98a11216..bc866494 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -75,7 +75,7 @@ def read_settings(filename):
         log.warn("LOCALE option doesn't contain a correct value")
 
     # Make the paths relative to the settings file
-    for path in ['PATH']:
+    for path in ['PATH', 'OUTPUT_PATH']:
         if path in context:
             if not os.path.isabs(context[path]):
                 context[path] = os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(filename), context[path])))

From 61884c5de42bf6860e442a64621eed54077669ea Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 12 Jun 2011 22:37:39 +0200
Subject: [PATCH 0357/2864] Bump minor version

---
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 20f3862e..4d942e3b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,7 +9,7 @@ from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 from pelican import log
 
-VERSION = "2.7.0"
+VERSION = "2.7.1"
 
 
 class Pelican(object):
diff --git a/setup.py b/setup.py
index 7ed7038c..198686e0 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 import sys
 
-VERSION = "2.7.0" # find a better way to do so.
+VERSION = "2.7.1" # find a better way to do so.
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils']
 if sys.version_info < (2,7):

From ac0b1a6f823777174a26d9ae402d9ae0b1a730c2 Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 13 Jun 2011 01:25:29 +0200
Subject: [PATCH 0358/2864] check only paths (i.e. not None) for being absolute
 when reading the settings

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index bc866494..356de1b4 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -77,7 +77,7 @@ def read_settings(filename):
     # Make the paths relative to the settings file
     for path in ['PATH', 'OUTPUT_PATH']:
         if path in context:
-            if not os.path.isabs(context[path]):
+            if path is not None and not os.path.isabs(context[path]):
                 context[path] = os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(filename), context[path])))
 
     # set the locale

From 128867630252e05f3d557383a1b7539e7a78893c Mon Sep 17 00:00:00 2001
From: derdon <liedtke.simon@googlemail.com>
Date: Mon, 13 Jun 2011 01:34:36 +0200
Subject: [PATCH 0359/2864] check the actual value in the settings

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 356de1b4..1b32395c 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -77,7 +77,7 @@ def read_settings(filename):
     # Make the paths relative to the settings file
     for path in ['PATH', 'OUTPUT_PATH']:
         if path in context:
-            if path is not None and not os.path.isabs(context[path]):
+            if context[path] is not None and not os.path.isabs(context[path]):
                 context[path] = os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(filename), context[path])))
 
     # set the locale

From 94b15b5260727bbe8babb94bdea7149db8b2573a Mon Sep 17 00:00:00 2001
From: Jochen Breuer <breuer@dajool.com>
Date: Mon, 13 Jun 2011 07:30:33 +0200
Subject: [PATCH 0360/2864] Added template, inlcude in base and some
 documentation for Piwik.

---
 docs/settings.rst                             |  6 ++++++
 pelican/themes/notmyidea/templates/base.html  |  1 +
 pelican/themes/notmyidea/templates/piwik.html | 16 ++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 pelican/themes/notmyidea/templates/piwik.html

diff --git a/docs/settings.rst b/docs/settings.rst
index 355716e9..9c596da3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -208,6 +208,12 @@ Setting name              what does it do ?
 `GITHUB_URL`              Your github URL (if you have one), it will then
                           use it to create a github ribbon.
 `GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
+`PIWIK_URL`               URL to your Piwik server - without 'http://' at the
+                          beginning.
+`PIWIK_SSL_URL`           If the SSL-URL differs from the normal Piwik-URL
+                          you have to include this setting too. (optional)
+`PIWIK_SITE_ID`           ID for the monitored website. You can find the ID
+                          in the Piwik admin interface > settings > websites.
 `LINKS`                   A list of tuples (Title, Url) for links to appear on
                           the header.
 `SOCIAL`                  A list of tuples (Title, Url) to appear in the "social"
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 6a5cfaf5..ad7039a8 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -81,6 +81,7 @@
         </footer><!-- /#contentinfo -->
 
 {% include 'analytics.html' %}
+{% include 'piwik.html' %}
 {% include 'disqus_script.html' %}
 </body>
 </html>
diff --git a/pelican/themes/notmyidea/templates/piwik.html b/pelican/themes/notmyidea/templates/piwik.html
new file mode 100644
index 00000000..ff459af7
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/piwik.html
@@ -0,0 +1,16 @@
+{% if PIWIK_URL and PIWIK_SITE_ID %}
+    <script type="text/javascript">
+    {% if PIWIK_SSL_URL %}
+        var pkBaseURL = (("https:" == document.location.protocol) ? "https://{{ PIWIK_SSL_URL }}/" : "http://{{ PIWIK_URL }}/");
+    {% else %}
+        var pkBaseURL = (("https:" == document.location.protocol) ? "https://{{ PIWIK_URL }}/" : "http://{{ PIWIK_URL }}/");
+    {% endif %}
+    document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+    </script><script type="text/javascript">
+    try {
+    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {{ PIWIK_SITE_ID }});
+    piwikTracker.trackPageView();
+    piwikTracker.enableLinkTracking();
+    } catch( err ) {}
+    </script><noscript><p><img src="http://{{ PIWIK_URL }}/piwik.php?idsite={{ PIWIK_SITE_ID }}" style="border:0" alt="" /></p></noscript>
+{% endif %}
\ No newline at end of file

From 014b3b385217005c5e099e3328d2afc1f4e83b20 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 13 Jun 2011 11:10:25 +0200
Subject: [PATCH 0361/2864] mention the #pelican irc channel on the
 documentation

---
 README.rst     | 3 ++-
 docs/index.rst | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 10929c15..bbc0906d 100644
--- a/README.rst
+++ b/README.rst
@@ -45,4 +45,5 @@ Feedback !
 If you want to see new features in Pelican, dont hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
 
-Contact me at "alexis at notmyidea dot org" for any request/feedback !
+Contact me at "alexis at notmyidea dot org" for any request/feedback! You can
+also join the team at #pelican on irc.freenode.org for quick feedback.
diff --git a/docs/index.rst b/docs/index.rst
index 39f3d599..4e9fa1c2 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -37,7 +37,8 @@ Feedback !
 If you want to see new features in Pelican, dont hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
 
-Contact me at "alexis at notmyidea dot org" for any request/feedback !
+Contact me at "alexis at notmyidea dot org" for any request/feedback! You can
+also join the team at #pelican on irc.freenode.org for quick feedback.
 
 Documentation
 =============

From 78d10b1febed51cfcf2611c4b17ebad8c052ad64 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 13 Jun 2011 14:23:07 +0200
Subject: [PATCH 0362/2864] update the sphinx documentation settings

---
 docs/conf.py | 116 ++-------------------------------------------------
 1 file changed, 3 insertions(+), 113 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index dea52e2d..3cd6c061 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
 import sys, os
 
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('..'))
-
 # -- General configuration -----------------------------------------------------
 templates_path = ['_templates']
 extensions = ['sphinx.ext.autodoc',]
@@ -19,135 +14,30 @@ release = version
 
 # -- Options for HTML output ---------------------------------------------------
 
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
 sys.path.append(os.path.abspath('_themes'))
 html_theme_path = ['_themes']
 html_theme = 'pelican'
 
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
 html_theme_options = {
     'nosidebar': True,
     'index_logo': 'pelican.png',
     'github_fork': 'ametaireau/pelican',
 }
 
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Raclettedoc'
-
+htmlhelp_basename = 'Pelicandoc'
 
 # -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Raclette.tex', u'Raclette Documentation',
+  ('index', 'Pelican.tex', u'Pelican Documentation',
    u'Alexis Métaireau', 'manual'),
 ]
 
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
 # -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'raclette', u'Raclette Documentation',  # why "raclette" ?!
+    ('index', 'pelican', u'pelican documentation',
      [u'Alexis Métaireau'], 1),
     ('pelican-themes', 'pelican-themes', u'A theme manager for Pelican',
      [u'Mickaël Raybaud'], 'en.1'),

From eb7c5674a0c855324957dfbf6fdfe088353dc1ed Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 13 Jun 2011 18:26:31 +0200
Subject: [PATCH 0363/2864] add a link to the IRC channel and the webchat into
 the documentation

---
 README.rst     | 10 +++++++---
 docs/index.rst | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index bbc0906d..bdbdb7da 100644
--- a/README.rst
+++ b/README.rst
@@ -39,11 +39,15 @@ You can access the source code via git on http://github.com/ametaireau/pelican/
 If you feel hackish, have a look to the `pelican's internals explanations
 <http://alexis.notmyidea.org/pelican/internals.html>`_.
 
-Feedback !
-----------
+Feedback / Contact us!
+======================
 
 If you want to see new features in Pelican, dont hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
 
 Contact me at "alexis at notmyidea dot org" for any request/feedback! You can
-also join the team at #pelican on irc.freenode.org for quick feedback.
+also join the team at `#pelican on irc.freenode.org 
+<irc://irc.freenode.net/pelican>`_ 
+(or if you don't have any IRC client, using `the webchat
+<http://webchat.freenode.net/?channels=pelican&uio=d4>`_)
+for quick feedback.
diff --git a/docs/index.rst b/docs/index.rst
index 4e9fa1c2..17c5dd5f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -31,14 +31,18 @@ Source code
 
 You can access the source code via git on http://github.com/ametaireau/pelican/
 
-Feedback !
-==========
+Feedback / Contact us!
+======================
 
 If you want to see new features in Pelican, dont hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
 
 Contact me at "alexis at notmyidea dot org" for any request/feedback! You can
-also join the team at #pelican on irc.freenode.org for quick feedback.
+also join the team at `#pelican on irc.freenode.org 
+<irc://irc.freenode.net/pelican>`_ 
+(or if you don't have any IRC client, using `the webchat
+<http://webchat.freenode.net/?channels=pelican&uio=d4>`_)
+for quick feedback.
 
 Documentation
 =============

From b474a6f4e5f648d9a2ab5d76ec88c8efa2e4fbe3 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 13 Jun 2011 18:42:31 +0200
Subject: [PATCH 0364/2864] remove unnecessary exclamation mark

---
 README.rst     | 4 ++--
 docs/index.rst | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index bdbdb7da..8a6ef04c 100644
--- a/README.rst
+++ b/README.rst
@@ -39,8 +39,8 @@ You can access the source code via git on http://github.com/ametaireau/pelican/
 If you feel hackish, have a look to the `pelican's internals explanations
 <http://alexis.notmyidea.org/pelican/internals.html>`_.
 
-Feedback / Contact us!
-======================
+Feedback / Contact us
+=====================
 
 If you want to see new features in Pelican, dont hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
diff --git a/docs/index.rst b/docs/index.rst
index 17c5dd5f..2897bc63 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -31,8 +31,8 @@ Source code
 
 You can access the source code via git on http://github.com/ametaireau/pelican/
 
-Feedback / Contact us!
-======================
+Feedback / Contact us
+=====================
 
 If you want to see new features in Pelican, dont hesitate to tell me, to clone
 the repository, etc. That's open source, dude!

From 5398da9d76b6e4a9e733aa2da0de104141f79822 Mon Sep 17 00:00:00 2001
From: Borgar <borgar@borgar.net>
Date: Thu, 16 Jun 2011 12:46:40 +0000
Subject: [PATCH 0365/2864] read_settings should be passed a string argument

This solves a crash when user runs with no settings: `pelican .`
---
 pelican/__init__.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 4d942e3b..6348618a 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -102,7 +102,7 @@ def main():
     parser.add_argument('-m', '--markup', default=None, dest='markup',
         help='the list of markup language to use (rst or md). Please indicate '
              'them separated by commas')
-    parser.add_argument('-s', '--settings', dest='settings',
+    parser.add_argument('-s', '--settings', dest='settings', default='',
         help='the settings of the application. Default to False.')
     parser.add_argument('-d', '--delete-output-directory', dest='delete_outputdir',
         action='store_true', help='Delete the output directory.')
@@ -124,8 +124,6 @@ def main():
     # the variable with None.
     markup = [a.strip().lower() for a in args.markup.split(',')] if args.markup else None
 
-    if args.settings is None:
-        settings = {}
     settings = read_settings(args.settings)
 
     cls = settings.get('PELICAN_CLASS')

From e617b08ab6415251cede874437660122eb32377d Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 17 Jun 2011 19:26:28 +0200
Subject: [PATCH 0366/2864] add information about the importer in the
 documentation

---
 docs/getting_started.rst | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 55cd29d4..2187dbb9 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -92,6 +92,20 @@ generate static pages.
 Then, use the `DISPLAY_PAGES_ON_MENU` setting, which will add all the pages to 
 the menu.
 
+Importing an existing blog
+--------------------------
+
+It is possible to import wordpress themes and RSS themes using a script which
+is living in `tools`: importer.
+
+You can call it this way for a wordpress import::
+
+    $ python importer.py --wpfile /your/wordpress/export -o output_dir
+
+And like this for an import from an RSS feed::
+
+    $ python importer.py --feed http://your/rss/feed -o output_dir
+
 Translations
 ------------
 

From 971f3b49375bfca6c4569644309845da06c90a0f Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 17 Jun 2011 19:45:09 +0200
Subject: [PATCH 0367/2864] bump version number

---
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 6348618a..7112fcec 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,7 +9,7 @@ from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 from pelican import log
 
-VERSION = "2.7.1"
+VERSION = "2.7.2"
 
 
 class Pelican(object):
diff --git a/setup.py b/setup.py
index 198686e0..e2bd4c60 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 import sys
 
-VERSION = "2.7.1" # find a better way to do so.
+VERSION = "2.7.2" # find a better way to do so.
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils']
 if sys.version_info < (2,7):

From 96c42c0aa54da788d8e3fdea63011fa4b881c942 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 17 Jun 2011 20:32:59 +0200
Subject: [PATCH 0368/2864] give full credit (with url to the initial theme)
 for the notmyidea theme

---
 pelican/themes/notmyidea/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index ad7039a8..ad0f636f 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -77,7 +77,7 @@
                 Proudly powered by <a href="http://alexis.notmyidea.org/pelican/">pelican</a>, which takes great advantages of <a href="http://python.org">python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://smashingmagazine.com">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 {% include 'analytics.html' %}

From c5a63c953a0f9e068a2563a9c5ab11045eaf4c1e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 17 Jun 2011 23:37:08 +0200
Subject: [PATCH 0369/2864] Remove the dependency to pkgutil for the plugins

---
 pelican/__init__.py                           | 29 +++++++------------
 pelican/generators.py                         |  4 +--
 pelican/plugins/__init__.py                   |  0
 .../plugins}/global_license.py                |  6 ++--
 .../plugins}/gravatar.py                      | 19 ++++++------
 .../plugins}/initialized.py                   |  3 +-
 6 files changed, 28 insertions(+), 33 deletions(-)
 create mode 100644 pelican/plugins/__init__.py
 rename {plugins_samples => pelican/plugins}/global_license.py (72%)
 rename {plugins_samples => pelican/plugins}/gravatar.py (60%)
 rename {plugins_samples => pelican/plugins}/initialized.py (57%)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 846e2554..515434cc 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,7 +1,6 @@
 import argparse
 import os
 import time
-import pkgutil
 
 from blinker import signal
 
@@ -46,15 +45,18 @@ class Pelican(object):
             else:
                 raise Exception("Impossible to find the theme %s" % theme)
         
-        plugins_path = plugins_path or settings['PLUGINS_PATH']
-        if plugins_path:
-            plugins_path = os.path.abspath(os.path.expanduser(plugins_path))
-            self.load_plugins(plugins_path)
-        else:
-            self.plugins = None
-        
+        self.init_plugins()
         signal('pelican_initialized').send(self)
 
+    def init_plugins(self):
+        self.plugins = self.settings['PLUGINS']
+        for plugin in self.plugins:
+            # if it's a string, then import it
+            if isinstance(plugin, str):
+                plugin = __import__(plugin, globals(), locals(), 'module')
+
+            plugin.register()
+
     def run(self):
         """Run the generators and return"""
 
@@ -97,13 +99,6 @@ class Pelican(object):
     def get_writer(self):
         return Writer(self.output_path, settings=self.settings)
     
-    def load_plugins(self, path):
-        loaded = []
-        for module_loader, name, ispkg in pkgutil.walk_packages(path=[path,]):
-            loaded.append(module_loader.find_module(name).load_module(name))
-        self.plugins = loaded
-        
-
 
 
 def main():
@@ -136,8 +131,6 @@ def main():
     parser.add_argument('-r', '--autoreload', dest='autoreload', action='store_true',
             help="Relaunch pelican each time a modification occurs on the content"
                  "files")
-    parser.add_argument('-p', '--plugins', default=None, dest='plugins_path',
-            help='the path of plugins to use')
     args = parser.parse_args()
 
     log.init(args.verbosity)
@@ -155,7 +148,7 @@ def main():
 
     try:
         pelican = cls(settings, args.path, args.theme, args.output, markup,
-                args.delete_outputdir, args.plugins_path)
+                args.delete_outputdir)
         if args.autoreload:
             while True:
                 try:
diff --git a/pelican/generators.py b/pelican/generators.py
index b6619d0e..eb74aff9 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -13,7 +13,7 @@ from blinker import signal
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
 
-from pelican.utils import copytree, get_relative_path, process_translations, open
+from pelican.utils import copy, get_relative_path, process_translations, open
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
 from pelican.log import *
@@ -214,7 +214,7 @@ class ArticlesGenerator(Generator):
                 and self.settings['FALLBACK_ON_FS_DATE']:
                     metadata['date'] = datetime.fromtimestamp(os.stat(f).st_ctime)
 
-            self.signal['pelican_article_generate_context'].send(self, metadatas=metadatas)
+            self.signal['pelican_article_generate_context'].send(self, metadata=metadata)
             article = Article(content, metadata, settings=self.settings,
                               filename=f)
             if not is_valid_content(article, f):
diff --git a/pelican/plugins/__init__.py b/pelican/plugins/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins_samples/global_license.py b/pelican/plugins/global_license.py
similarity index 72%
rename from plugins_samples/global_license.py
rename to pelican/plugins/global_license.py
index eeb20965..b6913831 100644
--- a/plugins_samples/global_license.py
+++ b/pelican/plugins/global_license.py
@@ -14,10 +14,10 @@ Add LICENSE to your settings file to define default license.
 
 """
 
-def add_license(generator, metadatas):
-    if 'license' not in metadatas.keys()\
+def add_license(generator, metadata):
+    if 'license' not in metadata.keys()\
         and 'LICENSE' in generator.settings.keys():
-            metadatas['license'] = generator.settings['LICENSE']
+            metadata['license'] = generator.settings['LICENSE']
 
 
 signal('pelican_article_generate_context').connect(add_license)
diff --git a/plugins_samples/gravatar.py b/pelican/plugins/gravatar.py
similarity index 60%
rename from plugins_samples/gravatar.py
rename to pelican/plugins/gravatar.py
index 9887e97e..2601ada0 100644
--- a/plugins_samples/gravatar.py
+++ b/pelican/plugins/gravatar.py
@@ -13,7 +13,7 @@ Settings:
 
 Add AUTHOR_EMAIL to your settings file to define default author email
 
-Article metadatas:
+Article metadata:
 ------------------
 
 :email:  article's author email
@@ -22,18 +22,19 @@ If one of them are defined the author_gravatar variable is added to
 article's context.
 """
 
-def add_gravatar(generator, metadatas):
+def add_gravatar(generator, metadata):
     
     #first check email
-    if 'email' not in metadatas.keys()\
+    if 'email' not in metadata.keys()\
         and 'AUTHOR_EMAIL' in generator.settings.keys():
-            metadatas['email'] = generator.settings['AUTHOR_EMAIL']
+            metadata['email'] = generator.settings['AUTHOR_EMAIL']
             
     #then add gravatar url
-    if 'email' in metadatas.keys():
+    if 'email' in metadata.keys():
         gravatar_url = "http://www.gravatar.com/avatar/" + \
-                        hashlib.md5(metadatas['email'].lower()).hexdigest()
-        metadatas["author_gravatar"] = gravatar_url
+                        hashlib.md5(metadata['email'].lower()).hexdigest()
+        metadata["author_gravatar"] = gravatar_url
     
-    
-signal('pelican_article_generate_context').connect(add_gravatar)
+
+def register():    
+    signal('pelican_article_generate_context').connect(add_gravatar)
diff --git a/plugins_samples/initialized.py b/pelican/plugins/initialized.py
similarity index 57%
rename from plugins_samples/initialized.py
rename to pelican/plugins/initialized.py
index f104c275..076ba06d 100644
--- a/plugins_samples/initialized.py
+++ b/pelican/plugins/initialized.py
@@ -4,4 +4,5 @@ from blinker import signal
 def test(sender):
     print "%s initialized !!" % sender
 
-signal('pelican_initialized').connect(test)
+def register():
+    signal('pelican_initialized').connect(test)

From 28c0644eb60200e333a9f21f9e8ada5e16307df7 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 18 Jun 2011 01:03:53 +0200
Subject: [PATCH 0370/2864] Plugins doc + minor design changes.

---
 docs/index.rst                    |  2 +
 docs/plugins.rst                  | 75 +++++++++++++++++++++++++++++++
 docs/settings.rst                 |  5 ++-
 pelican/__init__.py               |  4 +-
 pelican/generators.py             |  8 ++--
 pelican/plugins/global_license.py |  6 +--
 pelican/plugins/gravatar.py       |  4 +-
 pelican/plugins/initialized.py    |  5 +--
 pelican/settings.py               |  2 +-
 pelican/signals.py                |  4 ++
 10 files changed, 97 insertions(+), 18 deletions(-)
 create mode 100644 docs/plugins.rst
 create mode 100644 pelican/signals.py

diff --git a/docs/index.rst b/docs/index.rst
index 2897bc63..0e6ba583 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -55,6 +55,8 @@ A french version of the documentation is available at :doc:`fr/index`.
    getting_started
    settings
    themes
+   pelican-themes
+   plugins
    internals
    faq
    contribute
diff --git a/docs/plugins.rst b/docs/plugins.rst
new file mode 100644
index 00000000..6763f5ef
--- /dev/null
+++ b/docs/plugins.rst
@@ -0,0 +1,75 @@
+.. _plugins:
+
+Plugins
+#######
+
+Since version 2.8, pelican manages plugins. Plugins are a way to add feature to
+pelican without having to directly hack pelican code.
+
+Pelican is shipped with a set of core plugins, but you can easily implement
+your own (and this page describes how)
+
+How to use plugins?
+====================
+
+To load plugins, you have to specify a them in your settings file. You have two
+ways to do so:  by specifying strings with the path to the callables: ::
+
+    PLUGINS = ['pelican.plugins.gravatar',] 
+
+Or by importing them and adding them to the list::
+
+    from pelican.plugins import gravatar
+    PLUGINS = [gravatar, ]
+
+If your plugins are not in an importable path, you can specify a `PLUGIN_PATH`
+in the settings::
+
+    PLUGIN_PATH = "plugins"
+    PLUGINS = ["list", "of", "plugins"]
+
+How to create plugins?
+======================
+
+Plugins are based on the concept of signals. Pelican sends signals and plugins
+subscribe to those signals. The list of signals are defined in a following
+section.
+
+The only rule to follow for plugins is to define a `register` callable, in
+which you map the signals to your plugin logic. Let's take a simple exemple::
+
+    from pelican import signals
+
+    def test(sender):
+        print "%s initialized !!" % sender
+
+    def register():
+        signals.initialized.connect(test)
+
+
+List of signals
+===============
+
+Here is the list of currently implemented signals:
+
+=========================   ============================   =====================
+Signal                      Arguments                      Description
+=========================   ============================   =====================
+initialized                 pelican object
+article_generate_context    article_generator, metadata
+=========================   ============================   =====================
+
+The list is currently small, don't hesitate to add signals and make a pull
+request if you need them!
+
+List of plugins
+===============
+
+Not all the list are described here, but a few of them have been extracted from
+pelican core and provided in pelican.plugins. They are described here:
+
+Tag cloud
+---------
+
+Translation
+-----------
diff --git a/docs/settings.rst b/docs/settings.rst
index 9c596da3..9287facd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -51,6 +51,7 @@ Setting name (default value)                        what does it do?
 `PDF_GENERATOR` (``False``)                         Set to True if you want to have PDF versions
                                                     of your documents. You will need to install
                                                     `rst2pdf`.
+`PLUGINS` (``[]``)                                  The list of plugins to load. See :ref:`plugins`.
 `RELATIVE_URL` (``True``)                           Defines if pelican should use relative urls or
                                                     not.
 `SITEURL`                                           base URL of your website. Note that this is
@@ -208,14 +209,14 @@ Setting name              what does it do ?
 `GITHUB_URL`              Your github URL (if you have one), it will then
                           use it to create a github ribbon.
 `GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
+`LINKS`                   A list of tuples (Title, Url) for links to appear on
+                          the header.
 `PIWIK_URL`               URL to your Piwik server - without 'http://' at the
                           beginning.
 `PIWIK_SSL_URL`           If the SSL-URL differs from the normal Piwik-URL
                           you have to include this setting too. (optional)
 `PIWIK_SITE_ID`           ID for the monitored website. You can find the ID
                           in the Piwik admin interface > settings > websites.
-`LINKS`                   A list of tuples (Title, Url) for links to appear on
-                          the header.
 `SOCIAL`                  A list of tuples (Title, Url) to appear in the "social"
                           section.
 `TWITTER_USERNAME`        Allows to add a button on the articles to tweet about
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 515434cc..7121318e 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -2,7 +2,7 @@ import argparse
 import os
 import time
 
-from blinker import signal
+from pelican import signals
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator)
@@ -46,7 +46,7 @@ class Pelican(object):
                 raise Exception("Impossible to find the theme %s" % theme)
         
         self.init_plugins()
-        signal('pelican_initialized').send(self)
+        signals.initialized.send(self)
 
     def init_plugins(self):
         self.plugins = self.settings['PLUGINS']
diff --git a/pelican/generators.py b/pelican/generators.py
index eb74aff9..38fa9da7 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -8,8 +8,6 @@ import os
 import math
 import random
 
-from blinker import signal
-
 from jinja2 import Environment, FileSystemLoader
 from jinja2.exceptions import TemplateNotFound
 
@@ -17,6 +15,7 @@ from pelican.utils import copy, get_relative_path, process_translations, open
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
 from pelican.log import *
+from pelican import signals
 
 
 class Generator(object):
@@ -100,7 +99,6 @@ class ArticlesGenerator(Generator):
         self.dates = {}
         self.tags = defaultdict(list)
         self.categories = defaultdict(list)
-        self.signal = {'pelican_article_generate_context' : signal('pelican_article_generate_context')}
         super(ArticlesGenerator, self).__init__(*args, **kwargs)
         self.drafts = []
 
@@ -214,7 +212,7 @@ class ArticlesGenerator(Generator):
                 and self.settings['FALLBACK_ON_FS_DATE']:
                     metadata['date'] = datetime.fromtimestamp(os.stat(f).st_ctime)
 
-            self.signal['pelican_article_generate_context'].send(self, metadata=metadata)
+            signals.article_generate_context.send(self, metadata=metadata)
             article = Article(content, metadata, settings=self.settings,
                               filename=f)
             if not is_valid_content(article, f):
@@ -318,7 +316,7 @@ class StaticGenerator(Generator):
             final_path=None):
         """Copy all the paths from source to destination"""
         for path in paths:
-            copy(path, source, os.path.join(output_path, destination), final_path, 
+            copy(path, source, os.path.join(output_path, destination), final_path,
                     overwrite=True)
 
     def generate_output(self, writer):
diff --git a/pelican/plugins/global_license.py b/pelican/plugins/global_license.py
index b6913831..463a93b3 100644
--- a/pelican/plugins/global_license.py
+++ b/pelican/plugins/global_license.py
@@ -1,4 +1,4 @@
-from blinker import signal
+from pelican import signals
 
 """
 License plugin for Pelican
@@ -19,5 +19,5 @@ def add_license(generator, metadata):
         and 'LICENSE' in generator.settings.keys():
             metadata['license'] = generator.settings['LICENSE']
 
-
-signal('pelican_article_generate_context').connect(add_license)
+def register():
+    signals.article_generate_context.connect(add_license)
diff --git a/pelican/plugins/gravatar.py b/pelican/plugins/gravatar.py
index 2601ada0..200bb5a5 100644
--- a/pelican/plugins/gravatar.py
+++ b/pelican/plugins/gravatar.py
@@ -1,6 +1,6 @@
 import hashlib
 
-from blinker import signal
+from pelican import signals
 """
 Gravata plugin for Pelican
 ==========================
@@ -37,4 +37,4 @@ def add_gravatar(generator, metadata):
     
 
 def register():    
-    signal('pelican_article_generate_context').connect(add_gravatar)
+    signals.article_generate_context.connect(add_gravatar)
diff --git a/pelican/plugins/initialized.py b/pelican/plugins/initialized.py
index 076ba06d..5e4cf174 100644
--- a/pelican/plugins/initialized.py
+++ b/pelican/plugins/initialized.py
@@ -1,8 +1,7 @@
-from blinker import signal
-
+from pelican import signals
 
 def test(sender):
     print "%s initialized !!" % sender
 
 def register():
-    signal('pelican_initialized').connect(test)
+    signals.initialized.connect(test)
diff --git a/pelican/settings.py b/pelican/settings.py
index 3cc4157a..c1f15b2d 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -42,7 +42,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DEFAULT_METADATA': (),
                    'FILES_TO_COPY': (),
                    'DEFAULT_STATUS': 'published',
-                   'PLUGINS_PATH': None,
+                   'PLUGINS': [],
                   }
 
 def read_settings(filename):
diff --git a/pelican/signals.py b/pelican/signals.py
new file mode 100644
index 00000000..f2bf4547
--- /dev/null
+++ b/pelican/signals.py
@@ -0,0 +1,4 @@
+from blinker import signal
+
+initialized = signal('pelican_initialized')
+article_generate_context = signal('article_generate_context')

From 95b44ef8bff2d6c73713ca0aef0abf33848ee168 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 18 Jun 2011 18:59:44 +0200
Subject: [PATCH 0371/2864] Add Pygments support to the default sourcecode
 directive.

It is now possible to have highlited sourcecode using the ``::`` syntax.
---
 pelican/rstdirectives.py          | 1 +
 samples/content/super_article.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index 4849c9c2..3d7c2fe7 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -35,3 +35,4 @@ class Pygments(Directive):
         return [nodes.raw('', parsed, format='html')]
 
 directives.register_directive('code-block', Pygments)
+directives.register_directive('sourcecode', Pygments)
diff --git a/samples/content/super_article.rst b/samples/content/super_article.rst
index 03273fad..1dfd8e34 100644
--- a/samples/content/super_article.rst
+++ b/samples/content/super_article.rst
@@ -26,7 +26,7 @@ And here comes the cool stuff_.
    :width: 600 px
    :alt: alternate text
 
-.. code-block:: python
+::
 
    >>> from ipdb import set_trace
    >>> set_trace()

From eee004cdb5988a1f520143d60222a4d6c396d61f Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 18 Jun 2011 19:02:57 +0200
Subject: [PATCH 0372/2864] update the documentation about code highlighting

---
 docs/getting_started.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 2187dbb9..a59bc8cf 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -159,6 +159,14 @@ right way your block codes. To do so, you have to use the following syntax::
 The identifier is one of the lexers available `here
 <http://pygments.org/docs/lexers/>`_.
 
+You also can use the default `::` syntax::
+
+    ::
+        
+        your code goes here
+
+It will be assumed that your code is witten in python.
+
 Autoreload
 ----------
 

From 6ac802bcf11ab61b814bb801b1aa750c1c63c74c Mon Sep 17 00:00:00 2001
From: joe di castro <joe@joedicastro.com>
Date: Tue, 21 Jun 2011 03:23:41 -0700
Subject: [PATCH 0373/2864] Enable Markdown Extra by default.

---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index c597ff8d..4c8acd2a 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -103,7 +103,7 @@ class MarkdownReader(Reader):
     def read(self, filename):
         """Parse content and metadata of markdown files"""
         text = open(filename)
-        md = Markdown(extensions = ['meta', 'codehilite'])
+        md = Markdown(extensions = ['meta', 'codehilite', 'extra'])
         content = md.convert(text)
 
         metadata = {}

From 0183882cf78b000745e93d8ac87e2b985e6c26c4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <rodasmario2@gmail.com>
Date: Wed, 22 Jun 2011 12:22:04 -0500
Subject: [PATCH 0374/2864] ignoring tags file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 721af351..8e0f0658 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ docs/fr/_build
 build
 dist
 output
+tags

From a6dc53fe20316523a990e2424fb693a3bfc8a94f Mon Sep 17 00:00:00 2001
From: Borgar <borgar@borgar.net>
Date: Sun, 12 Jun 2011 20:35:48 +0000
Subject: [PATCH 0375/2864] Adding a date format with seconds.

---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 8e48c2e9..2fb76670 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -15,7 +15,7 @@ def get_date(string):
     If no format matches the given date, raise a ValuEerror
     """
     formats = ['%Y-%m-%d %H:%M', '%Y/%m/%d %H:%M', '%Y-%m-%d', '%Y/%m/%d',
-               '%d/%m/%Y', '%d.%m.%Y', '%d.%m.%Y %H:%M']
+               '%d/%m/%Y', '%d.%m.%Y', '%d.%m.%Y %H:%M', '%Y-%m-%d %H:%M:%S']
     for date_format in formats:
         try:
             return datetime.strptime(string, date_format)

From f2ea886ed207531468930479abeb43d6a7a33a4d Mon Sep 17 00:00:00 2001
From: Borgar <borgar@borgar.net>
Date: Fri, 17 Jun 2011 19:11:44 +0000
Subject: [PATCH 0376/2864] Rewrote URL reformatter.

This attempts to fix several issues:

1. The regexp that's supposed to catch href's doesn't work at all and even if it did match anything, it has too many parentheses for the following loop.

2. When a relative URL is replaced then it is done globally on the text and not per instance. So this `<a href="/foo/bar">/foo/bar</a>` will incorrectly get reformatted to `<a href="./static/foo/bar">./static/foo/bar</a>`.

3. Query parameter URLs are rewritten but shouldn't: `<a href="?foo=bar">` gets rewritten to `<a href="./static/?foo=bar">`

4. The joiner is producing too many slashes: `"." + "static" + "/files/image.png"` => `./static//files/image.png`.
---
 pelican/writers.py | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 1f560c01..bc6f6f2a 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -166,24 +166,23 @@ class Writer(object):
             """
             content = input._content
 
-            hrefs = re.compile(r'<\s*[^\>]*href\s*=(^!#)\s*(["\'])(.*?)\1')
-            srcs = re.compile(r'<\s*[^\>]*src\s*=\s*(["\'])(.*?)\1')
+            hrefs = re.compile(r"""
+                (?P<markup><\s*[^\>]*  # match tag with src and href attr
+                    (?:href|src)\s*=\s*
+                )
+                (?P<quote>["\'])       # require value to be quoted
+                (?![#?])               # don't match fragment or query URLs
+                (?![a-z]+:)            # don't match protocol URLS
+                (?P<path>.*?)          # the url value
+                \2""", re.X)
 
-            matches = hrefs.findall(content)
-            matches.extend(srcs.findall(content))
-            relative_paths = []
-            for found in matches:
-                found = found[1]
-                if found not in relative_paths:
-                    relative_paths.append(found)
+            def replacer(m):
+                relative_path = m.group('path')
+                dest_path = os.path.normpath( os.sep.join( (get_relative_path(name),
+                                    "static", relative_path) ) )
+                return m.group('markup') + m.group('quote') + dest_path + m.group('quote')
 
-            for relative_path in relative_paths:
-                if not ":" in relative_path: # we don't want to rewrite protocols
-                    dest_path = os.sep.join((get_relative_path(name), "static",
-                        relative_path))
-                    content = content.replace(relative_path, dest_path)
-
-            return content
+            return hrefs.sub(replacer, content)
         
         if context is None:
             return

From a7d5a9a420fa9269b9555317ad8ef3d7556e3fc5 Mon Sep 17 00:00:00 2001
From: Borgar <borgar@borgar.net>
Date: Fri, 17 Jun 2011 19:09:27 +0000
Subject: [PATCH 0377/2864] Don't rewrite content URLs unless RELATIVE_URLS is
 True.

---
 pelican/writers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index bc6f6f2a..13ab9647 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -111,7 +111,8 @@ class Writer(object):
             localcontext['SITEURL'] = get_relative_path(name)
 
         localcontext.update(kwargs)
-        self.update_context_contents(name, localcontext)
+        if relative_urls:
+            self.update_context_contents(name, localcontext)
 
         # check paginated
         paginated = paginated or {}

From 53e25ce2cf7e1af51ba98ce309e5af4a1a59a1fe Mon Sep 17 00:00:00 2001
From: Borgar <borgar@borgar.net>
Date: Fri, 17 Jun 2011 19:08:20 +0000
Subject: [PATCH 0378/2864] Fixed typo in docs: missing plural s in
 RELATIVE_URLS.

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9c596da3..482a5350 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -51,7 +51,7 @@ Setting name (default value)                        what does it do?
 `PDF_GENERATOR` (``False``)                         Set to True if you want to have PDF versions
                                                     of your documents. You will need to install
                                                     `rst2pdf`.
-`RELATIVE_URL` (``True``)                           Defines if pelican should use relative urls or
+`RELATIVE_URLS` (``True``)                          Defines if pelican should use relative urls or
                                                     not.
 `SITEURL`                                           base URL of your website. Note that this is
                                                     not a way to tell pelican to use relative urls

From 0a26fcbd0d77e87f5e8d56941782de2e9059250f Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@dsi.unimi.it>
Date: Thu, 30 Jun 2011 23:46:29 +0200
Subject: [PATCH 0379/2864] Avoiding to generate 1/1 if pagination is set to
 false

---
 pelican/themes/notmyidea/templates/pagination.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/themes/notmyidea/templates/pagination.html b/pelican/themes/notmyidea/templates/pagination.html
index 9cce0237..74699c4e 100644
--- a/pelican/themes/notmyidea/templates/pagination.html
+++ b/pelican/themes/notmyidea/templates/pagination.html
@@ -1,3 +1,4 @@
+{% if WITH_PAGINATION %}
 <p class="paginator">
     {% if articles_page.has_previous() %}
         {% if articles_page.previous_page_number() == 1 %}
@@ -11,3 +12,4 @@
         <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">&raquo;</a>
     {% endif %}
 </p>
+{% endif %}
\ No newline at end of file

From d8da5ce5909e014b8bb8ee4a5d52c6b8f4993801 Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@dsi.unimi.it>
Date: Thu, 30 Jun 2011 23:49:09 +0200
Subject: [PATCH 0380/2864] Genetare authors pages with all their posts

---
 pelican/generators.py                          | 18 ++++++++++++++++--
 .../notmyidea/templates/article_infos.html     |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 pelican/generators.py

diff --git a/pelican/generators.py b/pelican/generators.py
old mode 100755
new mode 100644
index a397c002..b3495643
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -98,6 +98,7 @@ class ArticlesGenerator(Generator):
         self.dates = {}
         self.tags = defaultdict(list)
         self.categories = defaultdict(list)
+        self.authors = defaultdict(list)
         super(ArticlesGenerator, self).__init__(*args, **kwargs)
         self.drafts = []
 
@@ -182,6 +183,14 @@ class ArticlesGenerator(Generator):
                 paginated={'articles': articles, 'dates': dates},
                 page_name='category/%s' % cat)
 
+        author_template = self.get_template('author')
+        for aut, articles in self.authors:
+            dates = [article for article in self.dates if article in articles]
+            write('author/%s.html' % aut, author_template, self.context,
+                author=aut, articles=articles, dates=dates,
+                paginated={'articles': articles, 'dates': dates},
+                page_name='author/%s' % aut)
+
         for article in self.drafts:
             write('drafts/%s.html' % article.slug, article_template, self.context,
                     article=article, category=article.category)
@@ -229,7 +238,7 @@ class ArticlesGenerator(Generator):
         for article in self.articles:
             # only main articles are listed in categories, not translations
             self.categories[article.category].append(article)
-
+            self.authors[article.author].append(article)
 
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
@@ -269,7 +278,12 @@ class ArticlesGenerator(Generator):
         # order the categories per name
         self.categories = list(self.categories.items())
         self.categories.sort(reverse=self.settings.get('REVERSE_CATEGORY_ORDER'))
-        self._update_context(('articles', 'dates', 'tags', 'categories', 'tag_cloud'))
+
+        self.authors = list(self.authors.items())
+        self.authors.sort()
+
+        self._update_context(('articles', 'dates', 'tags', 'categories', 'tag_cloud', 'authors'))
+
 
 
     def generate_output(self, writer):
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index 3a028a1c..e1803be8 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -5,7 +5,7 @@
 
         {% if article.author %}
         <address class="vcard author">
-                By <a class="url fn" href="#">{{ article.author }}</a>
+                By <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a>
         </address>
         {% endif %}
 <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>

From 9d9355c5972934db005af005d0b4453dbf60fcec Mon Sep 17 00:00:00 2001
From: Michael Yanovich <michael@yanovich.net>
Date: Fri, 1 Jul 2011 16:22:21 -0400
Subject: [PATCH 0381/2864] added ability for pelican to handle non-ascii
 characters when logging

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 7112fcec..4b743d52 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -152,7 +152,7 @@ def main():
         else:
             pelican.run()
     except Exception, e:
-        log.critical(str(e))
+        log.critical(unicode(e))
 
 
 if __name__ == '__main__':

From 3cd84ab3962f6df97ba62d30ab00db09574edb19 Mon Sep 17 00:00:00 2001
From: Mario Rodas <rodasmario2@gmail.com>
Date: Sat, 2 Jul 2011 14:41:39 -0500
Subject: [PATCH 0382/2864] moving tests dir

---
 {pelican/tests => tests}/__init__.py      | 0
 {pelican/tests => tests}/test_contents.py | 0
 {pelican/tests => tests}/test_readers.py  | 0
 {pelican/tests => tests}/test_settings.py | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {pelican/tests => tests}/__init__.py (100%)
 rename {pelican/tests => tests}/test_contents.py (100%)
 rename {pelican/tests => tests}/test_readers.py (100%)
 rename {pelican/tests => tests}/test_settings.py (100%)

diff --git a/pelican/tests/__init__.py b/tests/__init__.py
similarity index 100%
rename from pelican/tests/__init__.py
rename to tests/__init__.py
diff --git a/pelican/tests/test_contents.py b/tests/test_contents.py
similarity index 100%
rename from pelican/tests/test_contents.py
rename to tests/test_contents.py
diff --git a/pelican/tests/test_readers.py b/tests/test_readers.py
similarity index 100%
rename from pelican/tests/test_readers.py
rename to tests/test_readers.py
diff --git a/pelican/tests/test_settings.py b/tests/test_settings.py
similarity index 100%
rename from pelican/tests/test_settings.py
rename to tests/test_settings.py

From dc6934be43d196c1cbf824088bff4292ccbc41b2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <rodasmario2@gmail.com>
Date: Sat, 2 Jul 2011 15:15:21 -0500
Subject: [PATCH 0383/2864] all test pass

---
 pelican/settings.py                     | 13 +++++----
 tests/content/article_with_metadata.rst | 11 +++++++
 tests/default_conf.py                   | 38 +++++++++++++++++++++++++
 tests/test_readers.py                   |  6 ++--
 tests/test_settings.py                  |  5 ++--
 5 files changed, 61 insertions(+), 12 deletions(-)
 create mode 100644 tests/content/article_with_metadata.rst
 create mode 100755 tests/default_conf.py

diff --git a/pelican/settings.py b/pelican/settings.py
index 1b32395c..125d0bb0 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -55,6 +55,13 @@ def read_settings(filename):
             if key.isupper():
                 context[key] = tempdict[key]
 
+        # Make the paths relative to the settings file
+        for path in ['PATH', 'OUTPUT_PATH']:
+            if path in context:
+                if context[path] is not None and not os.path.isabs(context[path]):
+                    # FIXME:
+                    context[path] = os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(filename), context[path])))
+
     # if locales is not a list, make it one
     locales = context['LOCALE']
 
@@ -74,11 +81,5 @@ def read_settings(filename):
     else:
         log.warn("LOCALE option doesn't contain a correct value")
 
-    # Make the paths relative to the settings file
-    for path in ['PATH', 'OUTPUT_PATH']:
-        if path in context:
-            if context[path] is not None and not os.path.isabs(context[path]):
-                context[path] = os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(filename), context[path])))
-
     # set the locale
     return context
diff --git a/tests/content/article_with_metadata.rst b/tests/content/article_with_metadata.rst
new file mode 100644
index 00000000..3410885e
--- /dev/null
+++ b/tests/content/article_with_metadata.rst
@@ -0,0 +1,11 @@
+
+This is a super article !
+#########################
+
+:tags: foo, bar, foobar
+:date: 2010-12-02 10:14
+:category: yeah
+:author: Alexis Métaireau
+:summary:
+    Multi-line metadata should be supported
+    as well as **inline markup**.
diff --git a/tests/default_conf.py b/tests/default_conf.py
new file mode 100755
index 00000000..2796d561
--- /dev/null
+++ b/tests/default_conf.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+AUTHOR = u'Alexis Métaireau'
+SITENAME = u"Alexis' log"
+SITEURL = 'http://blog.notmyidea.org'
+
+GITHUB_URL = 'http://github.com/ametaireau/'
+DISQUS_SITENAME = "blog-notmyidea"
+PDF_GENERATOR = False
+REVERSE_CATEGORY_ORDER = True
+LOCALE = ""
+DEFAULT_PAGINATION = 2
+
+FEED_RSS = 'feeds/all.rss.xml'
+CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'
+
+LINKS = (('Biologeek', 'http://biologeek.org'),
+         ('Filyb', "http://filyb.info/"),
+         ('Libert-fr', "http://www.libert-fr.com"),
+         ('N1k0', "http://prendreuncafe.com/blog/"),
+         (u'Tarek Ziadé', "http://ziade.org/blog"),
+         ('Zubin Mithra', "http://zubin71.wordpress.com/"),)
+
+SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
+          ('lastfm', 'http://lastfm.com/user/akounet'),
+          ('github', 'http://github.com/ametaireau'),)
+
+# global metadata to all the contents
+DEFAULT_METADATA = (('yeah', 'it is'),)
+
+# static paths will be copied under the same name
+STATIC_PATHS = ["pictures",]
+
+# A list of files to copy from the source to the destination
+FILES_TO_COPY = (('extra/robots.txt', 'robots.txt'),)
+
+# foobar will not be used, because it's not in caps. All configuration keys
+# have to be in caps
+foobar = "barbaz"
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 5a255209..bf7504fb 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -5,7 +5,7 @@ import datetime
 from pelican import readers
 
 CUR_DIR = os.path.dirname(__file__)
-CONTENT_PATH = os.path.join(CUR_DIR, '..', '..', 'samples', 'content')
+CONTENT_PATH = os.path.join(CUR_DIR, 'content')
 
 def _filename(*args):
     return os.path.join(CONTENT_PATH, *args)
@@ -13,9 +13,9 @@ def _filename(*args):
 
 class RstReaderTest(unittest2.TestCase):
 
-    def test_metadata(self):
+    def test_article_with_metadata(self):
         reader = readers.RstReader()
-        content, metadata = reader.read(_filename('super_article.rst'))
+        content, metadata = reader.read(_filename('article_with_metadata.rst'))
         expected = {
             'category': 'yeah',
             'author': u'Alexis Métaireau',
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 39680a9f..8391e8c6 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -4,12 +4,11 @@ import os
 from pelican.settings import read_settings, _DEFAULT_CONFIG
 
 SETTINGS = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
-        "../../samples/pelican.conf.py"])
+        "default_conf.py"])
 
 class SettingsTest(TestCase):
 
-
-    def test_read_settings(self):
+    def test_read_settings_from_file(self):
         # providing a file, it should read it, replace the default values and append 
         # new values to the settings, if any
         settings = read_settings(SETTINGS)

From d19b0c975b3b53741ed7407f53de8478b5a9bd7e Mon Sep 17 00:00:00 2001
From: Mario Rodas <rodasmario2@gmail.com>
Date: Sat, 2 Jul 2011 15:53:27 -0500
Subject: [PATCH 0384/2864] test works with python2.5

---
 tests/test_contents.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_contents.py b/tests/test_contents.py
index d013da2f..df2c00e6 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 from unittest2 import TestCase
 
 from pelican.contents import Page

From 53c19cc9a094348110be7b75849d0ac43555c414 Mon Sep 17 00:00:00 2001
From: Mario Rodas <rodasmario2@gmail.com>
Date: Sat, 2 Jul 2011 15:54:24 -0500
Subject: [PATCH 0385/2864] adding tox

---
 .gitignore |  1 +
 tox.ini    | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
index 8e0f0658..5bb92c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ build
 dist
 output
 tags
+.tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..462abf09
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+[tox]
+envlist = py25,py26,py27
+
+[testenv]
+commands=py.test
+deps =
+    Jinja2
+    Pygments
+    docutils
+    feedgenerator
+    unittest2
+    pytest

From 3958cbcce36ac9b6aeef9e5dc1bbe94c25697e71 Mon Sep 17 00:00:00 2001
From: Mario Rodas <rodasmario2@gmail.com>
Date: Sat, 2 Jul 2011 15:55:26 -0500
Subject: [PATCH 0386/2864] removing reqs.txt file: replaced by tox

---
 dev_requirements.txt | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 dev_requirements.txt

diff --git a/dev_requirements.txt b/dev_requirements.txt
deleted file mode 100644
index acafebc0..00000000
--- a/dev_requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Jinja2==2.5.5
-Pygments==1.4
-docutils==0.7
-feedgenerator==1.2.1
-unittest2

From 77aac049fdf0f73534a455af01d4dfe16249538f Mon Sep 17 00:00:00 2001
From: Mario Rodas <rodasmario2@gmail.com>
Date: Sat, 2 Jul 2011 23:47:22 -0500
Subject: [PATCH 0387/2864] improved test_setting.py

---
 tests/test_settings.py | 44 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/tests/test_settings.py b/tests/test_settings.py
index 8391e8c6..e32fcef4 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,33 +1,33 @@
-from unittest2 import TestCase
-import os
+import unittest2
+from os.path import dirname, abspath, join
 
 from pelican.settings import read_settings, _DEFAULT_CONFIG
 
-SETTINGS = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
-        "default_conf.py"])
 
-class SettingsTest(TestCase):
+class TestSettingsFromFile(unittest2.TestCase):
+    """Providing a file, it should read it, replace the default values and
+    append new values to the settings, if any
+    """
+    def setUp(self):
+        self.PATH = abspath(dirname(__file__))
+        default_conf = join(self.PATH, 'default_conf.py')
+        self.settings = read_settings(default_conf)
 
-    def test_read_settings_from_file(self):
-        # providing a file, it should read it, replace the default values and append 
-        # new values to the settings, if any
-        settings = read_settings(SETTINGS)
+    def test_overwrite_existing_settings(self):
+        self.assertEqual(self.settings.get('SITENAME'), u"Alexis' log")
+        self.assertEqual(self.settings.get('SITEURL'),
+                'http://blog.notmyidea.org')
 
-        # overwrite existing settings
-        self.assertEqual(settings.get('SITENAME'), u"Alexis' log")
-        
-        # add new settings
-        self.assertEqual(settings.get('SITEURL'), 'http://blog.notmyidea.org')
-
-        # keep default settings if not defined
-        self.assertEqual(settings.get('DEFAULT_CATEGORY'), 
+    def test_keep_default_settings(self):
+        """keep default settings if not defined"""
+        self.assertEqual(self.settings.get('DEFAULT_CATEGORY'),
             _DEFAULT_CONFIG['DEFAULT_CATEGORY'])
 
-        # do not copy keys not in caps
-        self.assertNotIn('foobar', settings)
+    def test_dont_copy_small_keys(self):
+        """do not copy keys not in caps."""
+        self.assertNotIn('foobar', self.settings)
 
-
-    def test_empty_read_settings(self):
-        # providing no file should return the default values
+    def test_read_empty_settings(self):
+        """providing no file should return the default values."""
         settings = read_settings(None)
         self.assertDictEqual(settings, _DEFAULT_CONFIG)

From dd5aeb678a3130724992ad5e8dee2faa01102d5a Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@dsi.unimi.it>
Date: Sat, 16 Jul 2011 00:44:36 +0200
Subject: [PATCH 0388/2864] Added author.html and authors.html templates and
 modified the docs accordingly

---
 pelican/themes/notmyidea/templates/author.html  | 2 ++
 pelican/themes/notmyidea/templates/authors.html | 0
 2 files changed, 2 insertions(+)
 create mode 100644 pelican/themes/notmyidea/templates/author.html
 create mode 100644 pelican/themes/notmyidea/templates/authors.html

diff --git a/pelican/themes/notmyidea/templates/author.html b/pelican/themes/notmyidea/templates/author.html
new file mode 100644
index 00000000..0b372902
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/author.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ author }}{% endblock %}
diff --git a/pelican/themes/notmyidea/templates/authors.html b/pelican/themes/notmyidea/templates/authors.html
new file mode 100644
index 00000000..e69de29b

From d7f85712dbd61fe4a5fd2f110e414c3def0615d2 Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@dsi.unimi.it>
Date: Sat, 16 Jul 2011 00:44:49 +0200
Subject: [PATCH 0389/2864] Added author.html and authors.html templates and
 modified the docs accordingly

---
 docs/themes.rst | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/themes.rst b/docs/themes.rst
index 83e184f0..223215e4 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -20,6 +20,8 @@ To make your own theme, you must follow the following structure::
     └── templates
         ├── archives.html    // to display archives
         ├── article.html     // processed for each article
+        ├── author.html      // processed for each author
+        ├── authors.html     // must list all the authors
         ├── categories.html  // must list all the categories
         ├── category.html    // processed for each category
         ├── index.html       // the index. List all the articles
@@ -85,6 +87,32 @@ dates_page              The current page of articles, ordered by date,
 page_name               'index'. Useful for pagination links.
 ===================     ===================================================
 
+author.html
+-------------
+
+This template will be processed for each of the existing authors, and will
+finally remain at output/author/`author_name`.html.
+
+If pagination is active, next pages will remain at
+output/author/`author_name``n`.html.
+
+===================     ===================================================
+Variable                Description
+===================     ===================================================
+author                  The name of the author being processed.
+articles                Articles of this author.
+dates                   Articles of this author, but ordered by date,
+                        ascending.
+articles_paginator      A paginator object of article list.
+articles_page           The current page of articles.
+dates_paginator         A paginator object of article list, ordered by date,
+                        ascending.
+dates_page              The current page of articles, ordered by date,
+                        ascending.
+page_name               'author/`author_name`'. Useful for pagination
+                        links.
+===================     ===================================================
+
 category.html
 -------------
 

From bafa2154ff4c0c1e3cce81faa1e57a771629c070 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Tue, 19 Jul 2011 12:18:14 +0200
Subject: [PATCH 0390/2864] Added the `author.html` template to the `simple`
 theme.

---
 pelican/themes/simple/templates/author.html | 7 +++++++
 pelican/themes/simple/templates/index.html  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 pelican/themes/simple/templates/author.html

diff --git a/pelican/themes/simple/templates/author.html b/pelican/themes/simple/templates/author.html
new file mode 100644
index 00000000..e9f78702
--- /dev/null
+++ b/pelican/themes/simple/templates/author.html
@@ -0,0 +1,7 @@
+{% extends "index.html" %}
+
+{% block title %}{{ SITENAME }} - Articles by {{ author }}{% endblock %}
+{% block content_title %}
+<h2>Articles by {{ author }}</h2>
+{% endblock %}
+
diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index 0e4ef141..0b4593a0 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -11,7 +11,7 @@
                 <header> <h2 class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
                 <footer class="post-info">
                     <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr>
-                    {% if article.author %}<address class="vcard author">By <a class="url fn" href="#">{{ article.author }}</a></address>{% endif %}
+                    {% if article.author %}<address class="vcard author">By <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a></address>{% endif %}
                 </footer><!-- /.post-info -->
                 <div class="entry-content"> {{ article.summary }} </div><!-- /.entry-content -->
         </article></li>

From 81722f65b8a9f27cc5bacacdbf7e1744653988cf Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Tue, 19 Jul 2011 12:31:18 +0200
Subject: [PATCH 0391/2864] Template from the `simple` themes can now be
 extended from the other themes

Templates from the `simple` themes can be used in the other themes using
the `extends` keyword:

    {% extends "simple/index.html" %}

This does not affect the behavior of Pelican:, so there is no need to modify
the existing themes.
---
 TODO                  | 1 -
 pelican/generators.py | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/TODO b/TODO
index 9928ced2..9829c9c5 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 * Add a way to support pictures (see how sphinx makes that)
-* Find a way to extend the existing templates instead of rewriting all from scratch.
 * Make the program support UTF8-encoded files as input (and later: any encoding?)
 * Add status support (draft, published, hidden)
 * Add a serve + automatic generation behaviour.
diff --git a/pelican/generators.py b/pelican/generators.py
index b3495643..5b51320d 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -8,7 +8,7 @@ import os
 import math
 import random
 
-from jinja2 import Environment, FileSystemLoader
+from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
 from jinja2.exceptions import TemplateNotFound
 
 from pelican.utils import copy, get_relative_path, process_translations, open
@@ -32,7 +32,10 @@ class Generator(object):
         self._templates = {}
         self._templates_path = os.path.expanduser(os.path.join(self.theme, 'templates'))
         self._env = Environment(
-            loader=FileSystemLoader(self._templates_path),
+            loader=ChoiceLoader([
+                FileSystemLoader(self._templates_path),
+                PrefixLoader({'simple' : FileSystemLoader(os.path.join(os.path.dirname(os.path.abspath(__file__)), "themes", "simple", "templates"))})
+            ]),
             extensions=self.settings.get('JINJA_EXTENSIONS', []),
         )
 
@@ -49,6 +52,7 @@ class Generator(object):
             try:
                 self._templates[name] = self._env.get_template(name + '.html')
             except TemplateNotFound:
+                debug('self._env.list_templates(): {0}'.format(self._env.list_templates())) 
                 raise Exception('[templates] unable to load %s.html from %s' % (
                     name, self._templates_path))
         return self._templates[name]

From 3f844ee5d8d16fb88dc09588d7b0d54ecbe9f95c Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Thu, 21 Jul 2011 18:41:25 +0200
Subject: [PATCH 0392/2864] Removed an URL-related bug in templates

---
 pelican/themes/simple/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index 0b4593a0..fd8545df 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -8,7 +8,7 @@
 <ol id="post-list">
 {% for article in articles_page.object_list %}        
         <li><article class="hentry">    
-                <header> <h2 class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
+                <header> <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
                 <footer class="post-info">
                     <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr>
                     {% if article.author %}<address class="vcard author">By <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a></address>{% endif %}

From dc8b168fc1b062070ed512018b1d45a0804a8ec0 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Thu, 21 Jul 2011 18:43:18 +0200
Subject: [PATCH 0393/2864] Improved the menu in
 themes/simple/templates/index.html. Added a #menu id

---
 pelican/themes/simple/templates/base.html | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 0477053d..172f1ea6 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -9,11 +9,20 @@
         <header id="banner" class="body">
                 <h1><a href="{{ SITEURL }}">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
         </header><!-- /#banner -->
-        {% if categories %}<ul>
-        {% for category, articles in categories %}
-            <li><a href="{{ SITEURL }}/category/{{category}}.html">{{ category }}</a></li> 
+        <nav id="menu"><ul>
+        {% for title, link in MENUITEMS %}
+            <li><a href="{{ link }}">{{ title }}</a></li>
         {% endfor %}
-        </ul> {% endif %}
+        {% if DISPLAY_PAGES_ON_MENU %}
+          {% for p in PAGES %}
+            <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/pages/{{ p.url }}">{{ p.title }}</a></li>
+          {% endfor %}
+        {% else %}
+          {% for cat, null in categories %}
+            <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+          {% endfor %}
+        {% endif %}
+        </ul></nav><!-- /#menu -->
         {% block content %}
         {% endblock %}
         <footer id="contentinfo" class="body">

From 55bc68438005359a524dfe37c9cf2964a5e31084 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Thu, 21 Jul 2011 19:10:38 +0200
Subject: [PATCH 0394/2864] Added a `head` block to the `simple` theme. The
 html lang attribute of the `simple` theme now depends of the `DEFAULT_LANG`
 variable.

---
 pelican/themes/simple/templates/base.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 172f1ea6..dc266773 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -1,8 +1,10 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ DEFAULT_LANG }}">
 <head>
-        <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
+        {% block head %}
+        <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
         <meta charset="utf-8" />
+        {% endblock head %}
 </head>
 
 <body id="index" class="home">

From d77f657aa757644e30d7e1f26af9d61692b6de23 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Fri, 27 May 2011 05:22:55 +0800
Subject: [PATCH 0395/2864] add dotclear importer - a bit ugly but it works !
 some issues remain with end of lines

---
 tools/importer.py | 179 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 145 insertions(+), 34 deletions(-)

diff --git a/tools/importer.py b/tools/importer.py
index 719084b9..612767b3 100755
--- a/tools/importer.py
+++ b/tools/importer.py
@@ -21,30 +21,112 @@ def wp2fields(xml):
             title = item.title.contents[0]
             content = item.fetch('content:encoded')[0].contents[0]
             filename = item.fetch('wp:post_name')[0].contents[0]
-            
+
             raw_date = item.fetch('wp:post_date')[0].contents[0]
             date_object = time.strptime(raw_date, "%Y-%m-%d %H:%M:%S")
             date = time.strftime("%Y-%m-%d %H:%M", date_object)
-            
+
             author = item.fetch('dc:creator')[0].contents[0].title()
             categories = [(cat['nicename'],cat.contents[0]) for cat in item.fetch(domain='category')]
-            
+
             tags = [tag.contents[0].title() for tag in item.fetch(domain='tag', nicename=None)]
-            
-            yield (title, content, filename, date, author, categories, tags)
+
+            yield (title, content, filename, date, author, categories, tags, "html")
+
+def dc2fields(file):
+    """Opens a Dotclear export file, and yield pelican fields"""
+    in_cat = False
+    in_post = False
+    category_list = {}
+    posts = []
+
+    with open(file, 'r', encoding='utf-8') as f:
+
+        for line in f:
+            # remove final \n
+            line = line[:-1]
+
+            if line.startswith('[category'):
+                in_cat = True
+            elif line.startswith('[post'):
+                in_post = True
+            elif in_cat:
+                fields = line.split('","')
+                if not line:
+                    in_cat = False
+                else:
+                    # remove 1st and last ""
+                    fields[0] = fields[0][1:]
+                    # fields[-1] = fields[-1][:-1]
+                    category_list[fields[0]]=fields[2]
+            elif in_post:
+                if not line:
+                    in_post = False
+                    break
+                else:
+                    posts.append(line)
+
+    print "%i posts read." % len(posts)
+
+    for post in posts:
+        fields = post.split('","')
+
+        # post_id = fields[0][1:]
+        # blog_id = fields[1]
+        # user_id = fields[2]
+        cat_id = fields[3]
+        # post_dt = fields[4]
+        # post_tz = fields[5]
+        post_creadt = fields[6]
+        # post_upddt = fields[7]
+        # post_password = fields[8]
+        post_type = fields[9]
+        post_format = fields[10]
+        post_url = fields[11]
+        post_lang = fields[12]
+        post_title = fields[13]
+        post_excerpt = fields[14]
+        post_excerpt_xhtml = fields[15]
+        post_content = fields[16]
+        post_content_xhtml = fields[17]
+        # post_notes = fields[18]
+        # post_words = fields[19]
+        # post_status = fields[20]
+        # post_selected = fields[21]
+        # post_position = fields[22]
+        # post_open_comment = fields[23]
+        # post_open_tb = fields[24]
+        # nb_comment = fields[25]
+        # nb_trackback = fields[26]
+        # post_meta = fields[27]
+        # redirect_url = fields[28][:-1]
+
+        author = ""
+        categories = ""
+        if cat_id:
+            categories = category_list[cat_id]
+        tags = ""
+
+        if post_format == "markdown":
+            content = post_excerpt + post_content
+        else:
+            content = post_excerpt_xhtml + post_content_xhtml
+
+        yield (post_title, content, post_url, post_creadt, author, categories, tags, post_format)
+
 
 def feed2fields(file):
     """Read a feed and yield pelican fields"""
     import feedparser
     d = feedparser.parse(file)
     for entry in d.entries:
-        date = (time.strftime("%Y-%m-%d %H:%M", entry.updated_parsed) 
+        date = (time.strftime("%Y-%m-%d %H:%M", entry.updated_parsed)
                 if hasattr(entry, "updated_parsed") else None)
         author = entry.author if hasattr(entry, "author") else None
         tags = [e['term'] for e in entry.tags] if hasattr(entry, "tags") else None
 
         slug = slugify(entry.title)
-        yield (entry.title, entry.description, slug, date, author, [], tags)
+        yield (entry.title, entry.description, slug, date, author, [], tags, "html")
 
 
 def build_header(title, date, author, categories, tags):
@@ -53,43 +135,68 @@ def build_header(title, date, author, categories, tags):
     if date:
         header += ':date: %s\n' % date
     if categories:
-        header += ':category: %s\n' % ', '.join(categories)
+        header += ':category: %s\n' % categories
     if tags:
         header += ':tags: %s\n' % ', '.join(tags)
     header += '\n'
     return header
 
+def build_markdown_header(title, date, author, categories, tags):
+    """Build a header from a list of fields"""
+    header = 'Title: %s\n' % title
+    if date:
+        header += 'Date: %s\n' % date
+    if categories:
+        header += 'Category: %s\n' % categories
+    if tags:
+        header += 'Tags: %s\n' % ', '.join(tags)
+    header += '\n'
+    return header
 
 def fields2pelican(fields, output_path):
-    for title, content, filename, date, author, categories, tags in fields: 
-        html_filename = os.path.join(output_path, filename+'.html')
-        
-        if(len(categories) == 1):
-            rst_filename = os.path.join(output_path, categories[0][0], filename+'.rst')
-            if not os.path.isdir(os.path.join(output_path, categories[0][0])):
-                os.mkdir(os.path.join(output_path, categories[0][0]))
+    for title, content, filename, date, author, categories, tags, markup in fields:
+        if markup == "markdown":
+            md_filename = os.path.join(output_path, filename+'.md')
+            header = build_markdown_header(title, date, author, categories, tags)
+
+            # content.replace('\r\n', '\n')
+
+            with open(md_filename, 'w', encoding='utf-8') as fp:
+                fp.write(header+content)
+
         else:
+            filename = os.path.basename(filename)
+            html_filename = os.path.join(output_path, filename+'.html')
+
+            # if(len(categories) == 1):
+            #     rst_filename = os.path.join(output_path, categories[0][0], filename+'.rst')
+            #     if not os.path.isdir(os.path.join(output_path, categories[0][0])):
+            #         os.mkdir(os.path.join(output_path, categories[0][0]))
+            # else:
             rst_filename = os.path.join(output_path, filename+'.rst')
 
-        with open(html_filename, 'w', encoding='utf-8') as fp:
-            fp.write(content)
-            
-        os.system('pandoc --from=html --to=rst -o %s %s' % (rst_filename,
-            html_filename))
-        
-        os.remove(html_filename)
-            
-        with open(rst_filename, 'r', encoding='utf-8') as fs:
-            content = fs.read()
-        with open(rst_filename, 'w', encoding='utf-8') as fs:
-            categories = [x[1] for x in categories]
-            header = build_header(title, date, author, categories, tags)
-            fs.write(header + content)
+            with open(html_filename, 'w', encoding='utf-8') as fp:
+                fp.write(content)
+
+            print rst_filename
+            os.system('pandoc --normalize --reference-links --from=html --to=rst -o %s %s' % (rst_filename,
+                html_filename))
+
+            os.remove(html_filename)
+
+            with open(rst_filename, 'r', encoding='utf-8') as fs:
+                content = fs.read()
+            with open(rst_filename, 'w', encoding='utf-8') as fs:
+                # categories = [x[1] for x in categories]
+                header = build_header(title, date, author, categories, tags)
+                fs.write(header + content)
 
 
 def main(input_type, input, output_path):
     if input_type == 'wordpress':
         fields = wp2fields(input)
+    elif input_type == 'dotclear':
+        fields = dc2fields(input)
     elif input_type == 'feed':
         fields = feed2fields(input)
 
@@ -102,17 +209,21 @@ if __name__ == '__main__':
                     "Be sure to have pandoc installed")
 
     parser.add_argument(dest='input', help='The input file to read')
-    parser.add_argument('--wpfile', action='store_true', dest='wpfile', 
+    parser.add_argument('--wpfile', action='store_true', dest='wpfile',
             help='Wordpress XML export')
-    parser.add_argument('--feed', action='store_true', dest='feed', 
+    parser.add_argument('--dotclear', action='store_true', dest='dotclear',
+            help='Dotclear export')
+    parser.add_argument('--feed', action='store_true', dest='feed',
             help='feed to parse')
-    parser.add_argument('-o', '--output', dest='output', default='output', 
+    parser.add_argument('-o', '--output', dest='output', default='output',
             help='Output path')
-    args = parser.parse_args() 
-    
+    args = parser.parse_args()
+
     input_type = None
     if args.wpfile:
         input_type = 'wordpress'
+    elif args.dotclear:
+        input_type = 'dotclear'
     elif args.feed:
         input_type = 'feed'
     else:

From b9aa3d0bfd6904dbdd1ef4e078905449a6a38d91 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 22 Jul 2011 01:56:23 +0200
Subject: [PATCH 0396/2864] add a changelog with features per version

---
 CHANGELOG | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 00000000..57056826
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,80 @@
+3.0
+
+* dotclear importer
+* Markdown extensions
+* Theme extensions
+* Plugins support
+
+2.7
+
+* Uses logging rather than echoing to stdout
+* Support custom jinja filters
+* Compatibility with python 2.5
+* Add a theme manager
+* Packaged for debian
+* Add draft support
+
+2.6
+
+* changes in the output directory structure
+* makes templates easier to work with / create
+* Add RSS support (was only atom previously)
+* Add tag support for the feeds
+* Enhance the documentation
+* Add another theme (brownstone)
+* Add translations
+* Add a way to use "cleaner urls" with a rewrite url module (or equivalent)
+* Add a tag cloud
+* Add an autoreloading feature: the blog is automatically regenerated each time a modification is detected
+* Translate the documentation in french
+* import a blog from an rss feed
+* Pagination support
+* Add skribit support
+
+2.5
+
+* import from wordpress
+* add some new themes (martyalchin / wide-notmyidea)
+* first bug report !
+* linkedin support
+* added a FAQ
+* google analytics support
+* twitter support
+* use relative urls not static ones
+
+2.4
+
+* minor themes changes
+* add disqus support (so we have comments)
+* another code refactoring
+* add config settings about pages
+* blog entries can also be generated in pdf
+
+2.3
+
+* markdown support
+
+2.2
+
+* Prettify output
+* Manages static pages as well
+
+2.1
+
+* Put the notmyidea theme by default
+
+2.0
+
+* Refactoring to be more extensible
+* Change into the setting variables
+
+1.2
+
+* Add a debug option
+* Add feeds per category
+* Use filsystem to get dates if no metadata provided
+* Add pygment support
+
+1.1:
+
+* first working version

From fc2843306f803d1aabf449b60e9840053f4fb06f Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 22 Jul 2011 02:11:18 +0200
Subject: [PATCH 0397/2864] Add a settings.py sample into the documentation.

Fixes #118
---
 docs/settings.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 482a5350..7eb1b12a 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -287,3 +287,9 @@ Setting name (default value)                        what does it do?
 ================================================    =====================================================
 
 .. _pelican-themes: :doc:`pelican-themes`
+
+Example settings
+================
+
+.. literalinclude:: ../samples/pelican.conf.py
+    :language: python

From 53b295b980404f1c0326bbdd5e477340f3850460 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 22 Jul 2011 02:12:10 +0200
Subject: [PATCH 0398/2864] Update the features proposed by pelican on the doc.

---
 docs/fr/index.rst |  1 +
 docs/index.rst    | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index dca85fac..9fd0c0f0 100644
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -54,3 +54,4 @@ Documentation
    parametres_article
    astuces
    faq
+   pelican-themes
diff --git a/docs/index.rst b/docs/index.rst
index 2897bc63..cbc6bb19 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,12 +14,16 @@ Features
 
 Pelican currently supports:
 
-* blog articles
+* blog articles and simple pages
 * comments, via an external service (disqus). Please notice that while
   it's useful, it's an external service, and you'll not manage the
-  comments by yourself. It could potentially eat your data.
-* theming support (themes are done using `jinja2 <http://jinjna.pocoo.org>`_)
+  comments by yourself. It could potentially eat your data. (optional)
+* easy theming (themes are done using `jinja2 <http://jinjna.pocoo.org>`_)
 * PDF generation of the articles/pages (optional).
+* publication of articles in various languages
+* RSS/Atom feeds
+* wordpress/dotclear or RSS imports
+* integration with various tools: twitter/google analytics/skribit (optional)
 
 Why the name "Pelican" ?
 ========================
@@ -56,5 +60,6 @@ A french version of the documentation is available at :doc:`fr/index`.
    settings
    themes
    internals
+   pelican-themes
    faq
    contribute

From 17e7fb450952010fde3777298bcb9c69e86ace7c Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Fri, 22 Jul 2011 18:45:41 +0200
Subject: [PATCH 0399/2864] =?UTF-8?q?Some=20changes=20in=20the=20templates?=
 =?UTF-8?q?=20loading=20system=20=E2=80=94=20documentation=20will=20be=20u?=
 =?UTF-8?q?pdated=20soon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-    The `simple` theme can now be extended with the syntax `{% extends "!simple/index.html" %}`
     instead of `{% extends "simple/index.html" %}` to avoid conflicts with a `simple/` folder.

-    If a template is missing in a theme, it will be replaced by the
     corresponding template of the `simple` theme, so it's possible to
     make a new theme with only two file: a `base.html` file that
     extends the `base.html` file of the `simple` theme, and a CSS
     stylesheet, for example.
---
 pelican/generators.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 5b51320d..d91283f3 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -31,13 +31,16 @@ class Generator(object):
         # templates cache
         self._templates = {}
         self._templates_path = os.path.expanduser(os.path.join(self.theme, 'templates'))
+        simple_loader = FileSystemLoader(os.path.join(os.path.dirname(os.path.abspath(__file__)), "themes", "simple", "templates"))
         self._env = Environment(
             loader=ChoiceLoader([
                 FileSystemLoader(self._templates_path),
-                PrefixLoader({'simple' : FileSystemLoader(os.path.join(os.path.dirname(os.path.abspath(__file__)), "themes", "simple", "templates"))})
+                simple_loader,                              # implicit inheritance
+                PrefixLoader({'!simple' : simple_loader})   # explicit inheritance
             ]),
             extensions=self.settings.get('JINJA_EXTENSIONS', []),
         )
+        debug('self._env.list_templates(): {0}'.format(self._env.list_templates())) 
 
         # get custom Jinja filters from user settings
         custom_filters = self.settings.get('JINJA_FILTERS', {})
@@ -52,7 +55,6 @@ class Generator(object):
             try:
                 self._templates[name] = self._env.get_template(name + '.html')
             except TemplateNotFound:
-                debug('self._env.list_templates(): {0}'.format(self._env.list_templates())) 
                 raise Exception('[templates] unable to load %s.html from %s' % (
                     name, self._templates_path))
         return self._templates[name]

From 52df0dc47ab07cb6b44438993e2d361312b4b374 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sat, 23 Jul 2011 14:53:55 +0200
Subject: [PATCH 0400/2864] Added the documentation for template inheritance

Requires a re-reading by someone speaking English better than me...
---
 docs/_static/theme-basic.zip | Bin 0 -> 1449 bytes
 docs/themes.rst              |  96 +++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 docs/_static/theme-basic.zip

diff --git a/docs/_static/theme-basic.zip b/docs/_static/theme-basic.zip
new file mode 100644
index 0000000000000000000000000000000000000000..d1e4754a44fcedc4c1c16f34b3782c225d13da3c
GIT binary patch
literal 1449
zcmWIWW@h1H0D<tdZ+2h?lwf0!VMt0W&P>)14dG;9W((8w<J_d>S6ac%z{v7~nSlXJ
z1i<xsrK9Q>fa@<w%`M1DEJ-bfm~<vw(~k?gNg_bIIT!?hCUqx;t?LHzRs*pl7L$N3
zOV!IL$;|;fE&;ods(s#k%?3O!-z{6SIal7Dz&+*Nt`%28?b#m~hYD~iyzz1sEYD}q
ze>?NLjPW7=i{?%>6U=(#wrR2My!>G1rlT`v1U_xwrQE(L(%f)Tjl0irVcqV9wdeM|
zwVw5WTWqfF5yn$XK6f;kTIT2;dZJdt<=683ZE3CjyUv8GiV3#2*Urp$td2bTa^u~(
zTj~+vbUhI@oOt2BD=tYafd%(8UroP>%kc!aUgmd{=n_OXCb<|I-Y-^b`Ayx2)hI}K
zFHQY!m-4{A#)^@F;SUo7gA_KSic2bUQuTm_f&<)inU<do5Tm7r-buIf4jJ&Yz5gvT
zPhk2~jpWNA^VD*kk|!PseN-gz=<f4*3Ac}0-4FTs_wUBnJCtf$quB};9Qf&2S#n*-
zhSh8Bs<U<HRQ{N#ip)N{Yr0mb{A`cd3zfcoNu253HWw~ehKjh>+bm9tK6L!WXNgaq
zH*?M2re0ff@K_P&?Z}*|*CeD?X8d7Tc_TsNVXm%ik8Z#fH?ECG89HUMG8XN!3$6^2
z+O0D0qgU_BQm?voMIrLvZ`z&?d1)Zy_{i*g?9Ov<8qc;C=Vo<vO<a<<K;e@>`Nl}A
znLqev^PF&5skrlA*&&tSOZ#){TT3#z1N^z!vXzYXEXdc~#HG`7S5JBU=@WU9mC<hZ
z#3$xF^?h;R;fBil^Vkj>tofH4rmK2RR&CybLe@`RGfvuzJzi+Mb+X1Yvsv<bH+3HW
ze)Hk3?-lU?Z$>6LW?VT@0-7fU7~VR9n6P}w3dxsfv4CtAX0Ajw%K>f{avlYm3d*Bc
zO~sW%A*KQo5W|wjE-a=Z<yWBbp!|x}ct`+XW)WmZX8>)11OPn40F4A?7(7N|W*1~5
z*P|N=$vi+~L74}uvAD7hazOmTW-L-h0-6uXNEqg`vH?Sofei?`f!VPGSk^Ky00373
BtK<Lx

literal 0
HcmV?d00001

diff --git a/docs/themes.rst b/docs/themes.rst
index 223215e4..3d43895f 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -204,3 +204,99 @@ actions:
    support sidebar widget.
 
 You can take a look at notmyidea default theme for working example.
+
+
+Inheritance
+===========
+
+The last version of Pelican supports inheritance from the ``simple`` theme, so you can reuse the templates of the ``simple`` theme in your own themes:
+
+If one of the mandatory files in the ``templates/`` directory of your theme is missing, it will be replaced by the corresponding template from the ``simple`` theme, so if the HTML structure of a template of the ``simple`` theme is right for you, you don't have to rewrite it from scratch.
+
+You can also extend templates of the ``simple`` themes in your own themes by using the ``{% extends %}`` directove as in the following example:
+
+.. code-block:: html+jinja
+
+    {% extends "!simple/index.html" %}   <!-- extends the ``index.html`` template of the ``simple`` theme -->
+
+    {% extends "index.html" %}   <!-- "regular" extending -->
+
+
+Example
+-------
+
+With this system, it is possible to create a theme with just two file.
+
+base.html
+"""""""""
+
+The first file is the ``templates/base.html`` template:
+
+.. code-block:: html+jinja
+
+    {% extends "!simple/base.html" %}
+
+    {% block head %}
+    {{ super() }}
+       <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/style.css" />
+    {% endblock %}
+
+
+1.    On the first line, we extends the ``base.html`` template of the ``simple`` theme, so we don't have to rewrite the entire file.
+2.    On the third line, we open the ``head`` block, that has already been defined in the ``simple`` theme
+3.    On the fourth line, the function ``super()`` keeps the content previously inserted in the ``head`` block.
+4.    On the fifth line, we append a stylesheet to the page
+5.    On the last line, we close the ``head`` block.
+
+This file will be extended by all the others templates, so the stylesheet will be included in all pages.
+
+style.css
+"""""""""
+
+The second file is the ``static/css/style.css`` CSS stylesheet:
+
+.. code-block:: css
+
+    body {
+        font-family : monospace ;
+        font-size : 100% ;
+        background-color : white ;
+        color : #111 ;
+        width : 80% ;
+        min-width : 400px ;
+        min-height : 200px ;
+        padding : 1em ;
+        margin : 5% 10% ;
+        border : thin solid gray ;
+        border-radius : 5px ;
+        display : block ;
+    }
+
+    a:link    { color : blue ; text-decoration : none ;      }
+    a:hover   { color : blue ; text-decoration : underline ; }
+    a:visited { color : blue ;                               }
+
+    h1 a { color : inherit !important }
+    h2 a { color : inherit !important }
+    h3 a { color : inherit !important }
+    h4 a { color : inherit !important }
+    h5 a { color : inherit !important }
+    h6 a { color : inherit !important }
+
+    pre {
+        margin : 2em 1em 2em 4em ;
+    }
+
+    #menu li {
+        display : inline ;
+    }
+
+    #post-list {
+        margin-bottom : 1em ;
+        margin-top : 1em ;
+    }
+
+Download
+""""""""
+
+You can download this example theme :download:`here <_static/theme-basic.zip>`.

From 09d7847c7ec29331edcdb4a68fd3c7649769c44f Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sat, 23 Jul 2011 15:01:46 +0200
Subject: [PATCH 0401/2864] Modified the sphinx settings

It seems the manpages ``pelican-themes.en.1`` and
``pelican-themes.fr.1`` were only used for the Debian packages.

Unforunately, ``dh_manpages`` seems to support installation of manpages
depending of their languages, so i've changed the settings and only
``pelican-themes.1`` is generated, this avoids having to rename the
manpages before packaging...

The documentation about making themes for Pelican is now generated in
the file ``pelican-theming.1``.
---
 docs/conf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 3cd6c061..4c4530e2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -40,7 +40,7 @@ man_pages = [
     ('index', 'pelican', u'pelican documentation',
      [u'Alexis Métaireau'], 1),
     ('pelican-themes', 'pelican-themes', u'A theme manager for Pelican',
-     [u'Mickaël Raybaud'], 'en.1'),
-    ('fr/pelican-themes', 'pelican-themes', u'Un gestionnaire de thèmes pour Pelican',
-     [u'Mickaël Raybaud'], 'fr.1')
+     [u'Mickaël Raybaud'], 1),
+    ('themes', 'pelican-theming', u'How to create themes for Pelican',
+     [u'The Pelican contributors'], 1)
 ]

From 6611107e4856ebef8e63c9aae6e12a122ed0367a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 23 Jul 2011 16:06:58 +0200
Subject: [PATCH 0402/2864] little english review on theme extension

---
 docs/themes.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 3d43895f..2ebfcf49 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -209,11 +209,11 @@ You can take a look at notmyidea default theme for working example.
 Inheritance
 ===========
 
-The last version of Pelican supports inheritance from the ``simple`` theme, so you can reuse the templates of the ``simple`` theme in your own themes:
+Since version 3, pelican supports inheritance from the ``simple`` theme, so you can reuse the templates of the ``simple`` theme in your own themes:
 
-If one of the mandatory files in the ``templates/`` directory of your theme is missing, it will be replaced by the corresponding template from the ``simple`` theme, so if the HTML structure of a template of the ``simple`` theme is right for you, you don't have to rewrite it from scratch.
+If one of the mandatory files in the ``templates/`` directory of your theme is missing, it will be replaced by the matching template from the ``simple`` theme, so if the HTML structure of a template of the ``simple`` theme is right for you, you don't have to rewrite it from scratch.
 
-You can also extend templates of the ``simple`` themes in your own themes by using the ``{% extends %}`` directove as in the following example:
+You can also extend templates of the ``simple`` themes in your own themes by using the ``{% extends %}`` directive as in the following example:
 
 .. code-block:: html+jinja
 
@@ -225,7 +225,7 @@ You can also extend templates of the ``simple`` themes in your own themes by usi
 Example
 -------
 
-With this system, it is possible to create a theme with just two file.
+With this system, it is possible to create a theme with just two files.
 
 base.html
 """""""""
@@ -242,13 +242,13 @@ The first file is the ``templates/base.html`` template:
     {% endblock %}
 
 
-1.    On the first line, we extends the ``base.html`` template of the ``simple`` theme, so we don't have to rewrite the entire file.
-2.    On the third line, we open the ``head`` block, that has already been defined in the ``simple`` theme
+1.    On the first line, we extend the ``base.html`` template of the ``simple`` theme, so we don't have to rewrite the entire file.
+2.    On the third line, we open the ``head`` block which has already been defined in the ``simple`` theme
 3.    On the fourth line, the function ``super()`` keeps the content previously inserted in the ``head`` block.
 4.    On the fifth line, we append a stylesheet to the page
 5.    On the last line, we close the ``head`` block.
 
-This file will be extended by all the others templates, so the stylesheet will be included in all pages.
+This file will be extended by all the other templates, so the stylesheet will be linked from all pages.
 
 style.css
 """""""""

From b892f758a8745667d784b75966f6c4ebfae3ab83 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Tue, 26 Jul 2011 17:45:15 +0200
Subject: [PATCH 0403/2864] Pelican show a warning instead of raising an
 exception if the author of an article is not found an there is no settings
 file

---
 pelican/contents.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/contents.py b/pelican/contents.py
index 30477493..b7bc2502 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -2,6 +2,7 @@
 from pelican.utils import slugify, truncate_html_words
 from pelican.log import *
 from pelican.settings import _DEFAULT_CONFIG
+from os import getenv
 
 class Page(object):
     """Represents a page
@@ -34,6 +35,9 @@ class Page(object):
         if not hasattr(self, 'author'):
             if 'AUTHOR' in settings:
                 self.author = settings['AUTHOR']
+            else:
+                self.author = getenv('USER', 'John Doe')
+                warning("Author of `{0}' unknow, assuming that his name is `{1}'".format(filename or self.title, self.author).decode("utf-8"))
 
         # manage languages
         self.in_default_lang = True

From 068a3d2f1db914082a00a944c4332796e37d7a75 Mon Sep 17 00:00:00 2001
From: mviera <manuel.viera.tirado@gmail.com>
Date: Wed, 27 Jul 2011 01:35:06 +0200
Subject: [PATCH 0404/2864] Year and month in URL. Issue #145

---
 docs/settings.rst                               |  4 ++++
 pelican/generators.py                           | 12 ++++++++++++
 pelican/settings.py                             |  1 +
 pelican/themes/notmyidea/templates/article.html |  2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 7eb1b12a..99899058 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -61,6 +61,10 @@ Setting name (default value)                        what does it do?
                                                     on the output path "static". By default,
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
+`PERMALINK_STRUCTURE` (``'/%Y/%m/'``)               Allows to render URLs for articles sorted by date, 
+                                                    in case you specify a format as specified in the 
+                                                    example. Also, you can specify any other word 
+                                                    that you want.
 ================================================    =====================================================
 
 
diff --git a/pelican/generators.py b/pelican/generators.py
index d91283f3..aafff068 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -7,6 +7,7 @@ from collections import defaultdict
 import os
 import math
 import random
+import urlparse
 
 from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
 from jinja2.exceptions import TemplateNotFound
@@ -159,6 +160,17 @@ class ArticlesGenerator(Generator):
         # in writer, articles pass first
         article_template = self.get_template('article')
         for article in chain(self.translations, self.articles):
+            add_to_url = u''
+            if self.settings.has_key('PERMALINK_STRUCTURE'):
+                permalink_structure = self.settings.get('PERMALINK_STRUCTURE')
+                permalink_structure = permalink_structure.lstrip('/')
+                try:
+                    add_to_url = article.date.strftime(permalink_structure)
+                except:
+                    pass
+
+            article.url = urlparse.urljoin(add_to_url, article.url)
+            article.save_as = urlparse.urljoin(add_to_url, article.save_as)
             write(article.save_as,
                           article_template, self.context, article=article,
                           category=article.category)
diff --git a/pelican/settings.py b/pelican/settings.py
index 125d0bb0..dc87728d 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -42,6 +42,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DEFAULT_METADATA': (),
                    'FILES_TO_COPY': (),
                    'DEFAULT_STATUS': 'published',
+                   'PERMALINK_STRUCTURE': ''
                    }
 
 def read_settings(filename):
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 14fffe4d..6615b63a 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -3,7 +3,7 @@
 {% block content %}        
 <section id="content" class="body">    
 <article>
-        <header> <h1 class="entry-title"><a href="{{ article.url }}"
+        <header> <h1 class="entry-title"><a href="{{ pagename }}"
         rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title
         }}</a></h1> {% include 'twitter.html' %} </header>
         <div class="entry-content">

From 2609004719d2b8bfec9a4d614e6e3d92ec21091a Mon Sep 17 00:00:00 2001
From: mviera <manuel.viera.tirado@gmail.com>
Date: Fri, 29 Jul 2011 01:11:35 +0200
Subject: [PATCH 0405/2864] I change PERMALINK_STRUCTURE to
 ARTICLE_PERMALINK_STRUCTURE and updating the settings.rst documentation.

Also I have implemented other options to this setting, such as the category, the date, the author, this kind of things.

Finally, I have setted the ARTICLE_PERMALINK_STRUCTURE option as null in pelican.conf.py sample file.
---
 docs/settings.rst       | 18 +++++++++++++++---
 pelican/generators.py   | 13 +++++++++----
 pelican/settings.py     |  2 +-
 samples/pelican.conf.py |  3 +++
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 99899058..ba7ebd72 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -61,10 +61,22 @@ Setting name (default value)                        what does it do?
                                                     on the output path "static". By default,
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
-`PERMALINK_STRUCTURE` (``'/%Y/%m/'``)               Allows to render URLs for articles sorted by date, 
+`ARTICLE_PERMALINK_STRUCTURE` (``'/%Y/%m/'``)       Allows to render URLs for articles sorted by date, 
                                                     in case you specify a format as specified in the 
-                                                    example. Also, you can specify any other word 
-                                                    that you want.
+                                                    example. It follows the python datetime directives:
+                                                     * %Y: Year with century as a decimal number.
+                                                     * %m: Month as a decimal number [01,12].
+                                                     * %d: Day of the month as a decimal number [01,31].
+
+                                                     Check the python datetime documentation 
+                                                     at http://bit.ly/cNcJUC for more information.
+                                                    
+                                                    Also, you can use any metadata in the 
+                                                    restructured text files:
+                                                     * category: '%(category)s'
+                                                     * author: '%(author)s'
+                                                     * tags: '%(tags)s'
+                                                     * date: '%(date)s'
 ================================================    =====================================================
 
 
diff --git a/pelican/generators.py b/pelican/generators.py
index aafff068..bc2bd574 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -13,6 +13,7 @@ from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
 from jinja2.exceptions import TemplateNotFound
 
 from pelican.utils import copy, get_relative_path, process_translations, open
+from pelican.utils import slugify
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
 from pelican.log import *
@@ -161,14 +162,18 @@ class ArticlesGenerator(Generator):
         article_template = self.get_template('article')
         for article in chain(self.translations, self.articles):
             add_to_url = u''
-            if self.settings.has_key('PERMALINK_STRUCTURE'):
-                permalink_structure = self.settings.get('PERMALINK_STRUCTURE')
-                permalink_structure = permalink_structure.lstrip('/')
+            if self.settings.has_key('ARTICLE_PERMALINK_STRUCTURE'):
+                article_permalink_structure = self.settings.get('ARTICLE_PERMALINK_STRUCTURE')
+                article_permalink_structure = article_permalink_structure.lstrip('/')
                 try:
-                    add_to_url = article.date.strftime(permalink_structure)
+                    add_to_url = article.date.strftime(article_permalink_structure)
                 except:
                     pass
 
+                add_to_url = add_to_url % article.__dict__
+                add_to_url = [slugify(i) for i in add_to_url.split('/')]
+                add_to_url = os.path.join(*add_to_url)
+
             article.url = urlparse.urljoin(add_to_url, article.url)
             article.save_as = urlparse.urljoin(add_to_url, article.save_as)
             write(article.save_as,
diff --git a/pelican/settings.py b/pelican/settings.py
index dc87728d..af6b1bd9 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -42,7 +42,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DEFAULT_METADATA': (),
                    'FILES_TO_COPY': (),
                    'DEFAULT_STATUS': 'published',
-                   'PERMALINK_STRUCTURE': ''
+                   'ARTICLE_PERMALINK_STRUCTURE': '/%Y/%m/'
                    }
 
 def read_settings(filename):
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 2796d561..9b074416 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -9,6 +9,9 @@ PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
 LOCALE = ""
 DEFAULT_PAGINATION = 2
+# Allows to construct an url like /2011/07/sample-post.html
+# See documentation for more info.
+ARTICLE_PERMALINK_STRUCTURE = ''
 
 FEED_RSS = 'feeds/all.rss.xml'
 CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'

From a13ae91f0bba5b0ce94fb58b39c713f26ccf2a1c Mon Sep 17 00:00:00 2001
From: mviera <manuel.viera.tirado@gmail.com>
Date: Fri, 29 Jul 2011 22:08:21 +0200
Subject: [PATCH 0406/2864] Adding more documentation about
 ARTICLE_PERMALINK_STRUCTURE in settings. Also, i deleted the try except
 because strftime never raises an exception. Issue #145

I set the ARTICLE_PERMALINK_STRUCTURE option as null in settings.py and remove it from pelican sample config file.
---
 docs/settings.rst       | 18 +++++++++++++++---
 pelican/generators.py   | 11 +++++------
 pelican/settings.py     |  2 +-
 samples/pelican.conf.py |  3 ---
 4 files changed, 21 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 pelican/generators.py

diff --git a/docs/settings.rst b/docs/settings.rst
index ba7ebd72..2bdc891f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -61,13 +61,19 @@ Setting name (default value)                        what does it do?
                                                     on the output path "static". By default,
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
-`ARTICLE_PERMALINK_STRUCTURE` (``'/%Y/%m/'``)       Allows to render URLs for articles sorted by date, 
-                                                    in case you specify a format as specified in the 
-                                                    example. It follows the python datetime directives:
+`ARTICLE_PERMALINK_STRUCTURE` (``''``)              Empty by default. Allows to render URLs for 
+                                                    articles sorted by date, in case you specify a 
+                                                    format as specified in the example.
+                                                    It follows the python datetime directives:
                                                      * %Y: Year with century as a decimal number.
                                                      * %m: Month as a decimal number [01,12].
                                                      * %d: Day of the month as a decimal number [01,31].
 
+                                                     Note: if you specify a datetime directive, it will
+                                                     be substituted using the date metadata field into 
+                                                     the rest file. if the date is not specified, pelican
+                                                     will rely on the mtime of your file.
+
                                                      Check the python datetime documentation 
                                                      at http://bit.ly/cNcJUC for more information.
                                                     
@@ -77,6 +83,12 @@ Setting name (default value)                        what does it do?
                                                      * author: '%(author)s'
                                                      * tags: '%(tags)s'
                                                      * date: '%(date)s'
+
+                                                    Example usage:
+                                                     * '/%Y/%m/' it will be something like 
+                                                       '/2011/07/sample-post.html'.
+                                                     * '/%Y/%(category)s/' it will be something like
+                                                       '/2011/life/sample-post.html'.
 ================================================    =====================================================
 
 
diff --git a/pelican/generators.py b/pelican/generators.py
old mode 100644
new mode 100755
index bc2bd574..8d6de666
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -162,14 +162,13 @@ class ArticlesGenerator(Generator):
         article_template = self.get_template('article')
         for article in chain(self.translations, self.articles):
             add_to_url = u''
-            if self.settings.has_key('ARTICLE_PERMALINK_STRUCTURE'):
-                article_permalink_structure = self.settings.get('ARTICLE_PERMALINK_STRUCTURE')
+            if 'ARTICLE_PERMALINK_STRUCTURE' in self.settings:
+                article_permalink_structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
                 article_permalink_structure = article_permalink_structure.lstrip('/')
-                try:
-                    add_to_url = article.date.strftime(article_permalink_structure)
-                except:
-                    pass
 
+                # try to substitute any python datetime directive
+                add_to_url = article.date.strftime(article_permalink_structure)
+                # try to substitute any article metadata in rest file
                 add_to_url = add_to_url % article.__dict__
                 add_to_url = [slugify(i) for i in add_to_url.split('/')]
                 add_to_url = os.path.join(*add_to_url)
diff --git a/pelican/settings.py b/pelican/settings.py
index af6b1bd9..db2984e9 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -42,7 +42,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DEFAULT_METADATA': (),
                    'FILES_TO_COPY': (),
                    'DEFAULT_STATUS': 'published',
-                   'ARTICLE_PERMALINK_STRUCTURE': '/%Y/%m/'
+                   'ARTICLE_PERMALINK_STRUCTURE': ''
                    }
 
 def read_settings(filename):
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 9b074416..2796d561 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -9,9 +9,6 @@ PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
 LOCALE = ""
 DEFAULT_PAGINATION = 2
-# Allows to construct an url like /2011/07/sample-post.html
-# See documentation for more info.
-ARTICLE_PERMALINK_STRUCTURE = ''
 
 FEED_RSS = 'feeds/all.rss.xml'
 CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'

From 73ba522508c78554a7e03dd9fa1a2ad7a11fddad Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <ametaireau@gmail.com>
Date: Fri, 29 Jul 2011 23:35:57 +0300
Subject: [PATCH 0407/2864] Thanks Manuel :)

---
 THANKS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/THANKS b/THANKS
index 39f54e61..2a20100e 100644
--- a/THANKS
+++ b/THANKS
@@ -16,3 +16,4 @@ bugs or giving ideas. Thanks to them !
 - Marcus Fredriksson
 - Günter Kolousek
 - Simon Liedtke
+- Manuel F. Viera

From cd277672d0b28f97cad24eea3325fd7c2d8dece8 Mon Sep 17 00:00:00 2001
From: Borgar <borgar@borgar.net>
Date: Tue, 2 Aug 2011 23:29:34 +0000
Subject: [PATCH 0408/2864] Add a setting to limit feeds to a max number of
 items.

This adds FEED_MAX_ITEMS, which dictates the maximum number of items allowed in a feed.
---
 docs/settings.rst   | 2 ++
 pelican/settings.py | 1 +
 pelican/writers.py  | 7 +++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 2bdc891f..e4e2feaf 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -115,6 +115,8 @@ Setting name (default value)                        what does it do?
 `TAG_FEED` (``None``, ie no tag feed)               relative url to output the tags atom feed. It should
                                                     be defined using a "%s" matchin the tag name
 `TAG_FEED_RSS` (``None``, ie no RSS tag feed)       relative url to output the tag RSS feed
+`FEED_MAX_ITEMS`                                    Maximum number of items allowed in a feed. Feeds are
+                                                    unrestricted by default.
 ================================================    =====================================================
 
 .. [2] %s is the name of the category.
diff --git a/pelican/settings.py b/pelican/settings.py
index db2984e9..e8c4fd21 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -15,6 +15,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'FEED': 'feeds/all.atom.xml',
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
                    'TRANSLATION_FEED': 'feeds/all-%s.atom.xml',
+                   'FEED_MAX_ITEMS': '',
                    'SITENAME': 'A Pelican Blog',
                    'DISPLAY_PAGES_ON_MENU': True,
                    'PDF_GENERATOR': False,
diff --git a/pelican/writers.py b/pelican/writers.py
index 13ab9647..4685cff9 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -58,8 +58,11 @@ class Writer(object):
 
             feed = self._create_new_feed(feed_type, context)
 
-            for item in elements:
-                self._add_item_to_the_feed(feed, item)
+            max_items = len(elements)
+            if self.settings['FEED_MAX_ITEMS']:
+                max_items = min(self.settings['FEED_MAX_ITEMS'], max_items)
+            for i in xrange(max_items):
+                self._add_item_to_the_feed(feed, elements[i])
 
             if filename:
                 complete_path = os.path.join(self.output_path, filename)

From 3b37b4263344e8ec87c1ca0727eed05a4094ad14 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Wed, 3 Aug 2011 17:04:39 +0200
Subject: [PATCH 0409/2864] some improvements for importers: - for dotclear:
 remove seconds in date, remove \\n - fix categories for wordpress (categories
 is a list a string) - refactor a bit the code between markdown and rst

---
 tools/importer.py | 63 ++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/tools/importer.py b/tools/importer.py
index 612767b3..d7a5c98c 100755
--- a/tools/importer.py
+++ b/tools/importer.py
@@ -27,7 +27,9 @@ def wp2fields(xml):
             date = time.strftime("%Y-%m-%d %H:%M", date_object)
 
             author = item.fetch('dc:creator')[0].contents[0].title()
-            categories = [(cat['nicename'],cat.contents[0]) for cat in item.fetch(domain='category')]
+
+            categories = [cat.contents[0] for cat in item.fetch(domain='category')]
+            # caturl = [cat['nicename'] for cat in item.fetch(domain='category')]
 
             tags = [tag.contents[0].title() for tag in item.fetch(domain='tag', nicename=None)]
 
@@ -101,16 +103,22 @@ def dc2fields(file):
         # post_meta = fields[27]
         # redirect_url = fields[28][:-1]
 
+        # remove seconds
+        post_creadt = ':'.join(post_creadt.split(':')[0:2])
+
         author = ""
-        categories = ""
+        categories = []
+        tags = []
+
         if cat_id:
-            categories = category_list[cat_id]
-        tags = ""
+            categories = [category_list[id].strip() for id in cat_id.split(',')]
 
         if post_format == "markdown":
             content = post_excerpt + post_content
         else:
             content = post_excerpt_xhtml + post_content_xhtml
+            content = content.replace('\\n', '')
+            post_format = "html"
 
         yield (post_title, content, post_url, post_creadt, author, categories, tags, post_format)
 
@@ -135,7 +143,7 @@ def build_header(title, date, author, categories, tags):
     if date:
         header += ':date: %s\n' % date
     if categories:
-        header += ':category: %s\n' % categories
+        header += ':category: %s\n' % ', '.join(categories)
     if tags:
         header += ':tags: %s\n' % ', '.join(tags)
     header += '\n'
@@ -147,7 +155,7 @@ def build_markdown_header(title, date, author, categories, tags):
     if date:
         header += 'Date: %s\n' % date
     if categories:
-        header += 'Category: %s\n' % categories
+        header += 'Category: %s\n' % ', '.join(categories)
     if tags:
         header += 'Tags: %s\n' % ', '.join(tags)
     header += '\n'
@@ -156,40 +164,39 @@ def build_markdown_header(title, date, author, categories, tags):
 def fields2pelican(fields, output_path):
     for title, content, filename, date, author, categories, tags, markup in fields:
         if markup == "markdown":
-            md_filename = os.path.join(output_path, filename+'.md')
+            ext = '.md'
             header = build_markdown_header(title, date, author, categories, tags)
-
-            # content.replace('\r\n', '\n')
-
-            with open(md_filename, 'w', encoding='utf-8') as fp:
-                fp.write(header+content)
-
         else:
-            filename = os.path.basename(filename)
-            html_filename = os.path.join(output_path, filename+'.html')
+            ext = '.rst'
+            header = build_header(title, date, author, categories, tags)
 
-            # if(len(categories) == 1):
-            #     rst_filename = os.path.join(output_path, categories[0][0], filename+'.rst')
-            #     if not os.path.isdir(os.path.join(output_path, categories[0][0])):
-            #         os.mkdir(os.path.join(output_path, categories[0][0]))
-            # else:
-            rst_filename = os.path.join(output_path, filename+'.rst')
+        # TODO: add options to put files in directories by categories
+        # if(len(categories) == 1):
+        #     out_filename = os.path.join(output_path, categories[0], filename+'.rst')
+        #     if not os.path.isdir(os.path.join(output_path, categories[0])):
+        #         os.mkdir(os.path.join(output_path, categories[0]))
+        # else:
+
+        filename = os.path.basename(filename)
+        out_filename = os.path.join(output_path, filename+ext)
+        print out_filename
+
+        if markup == "html":
+            html_filename = os.path.join(output_path, filename+'.html')
 
             with open(html_filename, 'w', encoding='utf-8') as fp:
                 fp.write(content)
 
-            print rst_filename
-            os.system('pandoc --normalize --reference-links --from=html --to=rst -o %s %s' % (rst_filename,
+            os.system('pandoc --normalize --reference-links --from=html --to=rst -o %s %s' % (out_filename,
                 html_filename))
 
             os.remove(html_filename)
 
-            with open(rst_filename, 'r', encoding='utf-8') as fs:
+            with open(out_filename, 'r', encoding='utf-8') as fs:
                 content = fs.read()
-            with open(rst_filename, 'w', encoding='utf-8') as fs:
-                # categories = [x[1] for x in categories]
-                header = build_header(title, date, author, categories, tags)
-                fs.write(header + content)
+
+        with open(out_filename, 'w', encoding='utf-8') as fs:
+            fs.write(header + content)
 
 
 def main(input_type, input, output_path):

From 69636a9da0368e625a2ba5aaa5dd1737e7741ef5 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Wed, 3 Aug 2011 19:11:54 +0200
Subject: [PATCH 0410/2864] importer: add an option to put files in directories
 with category names

---
 tools/importer.py | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/tools/importer.py b/tools/importer.py
index d7a5c98c..29409f17 100755
--- a/tools/importer.py
+++ b/tools/importer.py
@@ -161,7 +161,7 @@ def build_markdown_header(title, date, author, categories, tags):
     header += '\n'
     return header
 
-def fields2pelican(fields, output_path):
+def fields2pelican(fields, output_path, dircat=False):
     for title, content, filename, date, author, categories, tags, markup in fields:
         if markup == "markdown":
             ext = '.md'
@@ -170,15 +170,17 @@ def fields2pelican(fields, output_path):
             ext = '.rst'
             header = build_header(title, date, author, categories, tags)
 
-        # TODO: add options to put files in directories by categories
-        # if(len(categories) == 1):
-        #     out_filename = os.path.join(output_path, categories[0], filename+'.rst')
-        #     if not os.path.isdir(os.path.join(output_path, categories[0])):
-        #         os.mkdir(os.path.join(output_path, categories[0]))
-        # else:
-
         filename = os.path.basename(filename)
-        out_filename = os.path.join(output_path, filename+ext)
+
+        # option to put files in directories with categories names
+        if dircat and (len(categories) == 1):
+            catname = categories[0]
+            out_filename = os.path.join(output_path, catname, filename+'.rst')
+            if not os.path.isdir(os.path.join(output_path, catname)):
+                os.mkdir(os.path.join(output_path, catname))
+        else:
+            out_filename = os.path.join(output_path, filename+ext)
+
         print out_filename
 
         if markup == "html":
@@ -187,7 +189,7 @@ def fields2pelican(fields, output_path):
             with open(html_filename, 'w', encoding='utf-8') as fp:
                 fp.write(content)
 
-            os.system('pandoc --normalize --reference-links --from=html --to=rst -o %s %s' % (out_filename,
+            os.system('pandoc --normalize --reference-links --from=html --to=rst -o "%s" "%s"' % (out_filename,
                 html_filename))
 
             os.remove(html_filename)
@@ -199,7 +201,7 @@ def fields2pelican(fields, output_path):
             fs.write(header + content)
 
 
-def main(input_type, input, output_path):
+def main(input_type, input, output_path, dircat=False):
     if input_type == 'wordpress':
         fields = wp2fields(input)
     elif input_type == 'dotclear':
@@ -207,7 +209,7 @@ def main(input_type, input, output_path):
     elif input_type == 'feed':
         fields = feed2fields(input)
 
-    fields2pelican(fields, output_path)
+    fields2pelican(fields, output_path, dircat=dircat)
 
 
 if __name__ == '__main__':
@@ -224,6 +226,8 @@ if __name__ == '__main__':
             help='feed to parse')
     parser.add_argument('-o', '--output', dest='output', default='output',
             help='Output path')
+    parser.add_argument('--dir-cat', action='store_true', dest='dircat',
+            help='Put files in directories with categories name')
     args = parser.parse_args()
 
     input_type = None
@@ -236,4 +240,4 @@ if __name__ == '__main__':
     else:
         print "you must provide either --wpfile or --feed options"
         exit()
-    main(input_type, args.input, args.output)
+    main(input_type, args.input, args.output, dircat=args.dircat)

From a9bb789b14550d28287aacecee3d6dc5afabc819 Mon Sep 17 00:00:00 2001
From: mviera <manuel.viera.tirado@gmail.com>
Date: Wed, 3 Aug 2011 21:59:22 +0200
Subject: [PATCH 0411/2864] Adding markdown module as requirement. Even I
 install pelican in a new virtualenv and i tried to execute the pelican
 command it shows an error such as 'No module md'. Issue #145

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e2bd4c60..3f836293 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 
 VERSION = "2.7.2" # find a better way to do so.
 
-requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils']
+requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'markdown']
 if sys.version_info < (2,7):
     requires.append('argparse')
 

From 319b553f69ea602f106c652cf2c472fcd28b9375 Mon Sep 17 00:00:00 2001
From: mviera <manuel.viera.tirado@gmail.com>
Date: Wed, 3 Aug 2011 22:00:41 +0200
Subject: [PATCH 0412/2864] I developed the ARTICLE_PERMALINK_STRUCTURE option
 into the wrong method, because urls in feed are not being modified. Now, it's
 fixed. Issue #145.

---
 pelican/generators.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 8d6de666..f6ac35a0 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -161,20 +161,6 @@ class ArticlesGenerator(Generator):
         # in writer, articles pass first
         article_template = self.get_template('article')
         for article in chain(self.translations, self.articles):
-            add_to_url = u''
-            if 'ARTICLE_PERMALINK_STRUCTURE' in self.settings:
-                article_permalink_structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
-                article_permalink_structure = article_permalink_structure.lstrip('/')
-
-                # try to substitute any python datetime directive
-                add_to_url = article.date.strftime(article_permalink_structure)
-                # try to substitute any article metadata in rest file
-                add_to_url = add_to_url % article.__dict__
-                add_to_url = [slugify(i) for i in add_to_url.split('/')]
-                add_to_url = os.path.join(*add_to_url)
-
-            article.url = urlparse.urljoin(add_to_url, article.url)
-            article.save_as = urlparse.urljoin(add_to_url, article.save_as)
             write(article.save_as,
                           article_template, self.context, article=article,
                           category=article.category)
@@ -247,6 +233,21 @@ class ArticlesGenerator(Generator):
             if not is_valid_content(article, f):
                 continue
 
+            add_to_url = u''
+            if 'ARTICLE_PERMALINK_STRUCTURE' in self.settings:
+                article_permalink_structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
+                article_permalink_structure = article_permalink_structure.lstrip('/')
+
+                # try to substitute any python datetime directive
+                add_to_url = article.date.strftime(article_permalink_structure)
+                # try to substitute any article metadata in rest file
+                add_to_url = add_to_url % article.__dict__
+                add_to_url = [slugify(i) for i in add_to_url.split('/')]
+                add_to_url = os.path.join(*add_to_url)
+
+            article.url = urlparse.urljoin(add_to_url, article.url)
+            article.save_as = urlparse.urljoin(add_to_url, article.save_as)
+
             if article.status == "published":
                 if hasattr(article, 'tags'):
                     for tag in article.tags:

From e8cac3bffff684c1b99f773c64bd69a0dd0b0d6a Mon Sep 17 00:00:00 2001
From: mviera <manuel.viera.tirado@gmail.com>
Date: Wed, 3 Aug 2011 22:01:45 +0200
Subject: [PATCH 0413/2864] I change article.slug to article.url for always
 referencing the disqus thread to the correct url. Issue #145

---
 pelican/themes/notmyidea/templates/comments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/comments.html b/pelican/themes/notmyidea/templates/comments.html
index ea693afb..bb033c0f 100644
--- a/pelican/themes/notmyidea/templates/comments.html
+++ b/pelican/themes/notmyidea/templates/comments.html
@@ -1 +1 @@
-{% if DISQUS_SITENAME %}<p>There are <a href="{{ SITEURL }}/{{ article.slug }}.html#disqus_thread">comments</a>.</p>{% endif %}
+{% if DISQUS_SITENAME %}<p>There are <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread">comments</a>.</p>{% endif %}

From 7b7695509df31485ac799bfbe2f94b327b98d1cf Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Wed, 3 Aug 2011 22:06:10 +0200
Subject: [PATCH 0414/2864] importer - add documentation

---
 docs/importer.rst | 56 +++++++++++++++++++++++++++++++++++++++++++++++
 docs/index.rst    |  7 +++---
 tools/importer.py |  8 +++----
 3 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 docs/importer.rst

diff --git a/docs/importer.rst b/docs/importer.rst
new file mode 100644
index 00000000..35cd095c
--- /dev/null
+++ b/docs/importer.rst
@@ -0,0 +1,56 @@
+=================================
+ Import from other blog software
+=================================
+
+Description
+===========
+
+``importer.py`` is a command line tool for converting articles from other
+software to ReStructuredText. The supported formats are:
+
+- Wordpress XML export
+- Dotclear export
+- RSS/ATOM feed
+
+The conversion from HTML to ReStructuredText relies on `pandoc
+<http://johnmacfarlane.net/pandoc/>`_. For Dotclear, if the source posts are
+written with Markdown syntax, they will not be converted (as Pelican also
+supports Markdown).
+
+Usage
+"""""
+
+| importer.py [-h] [--wpfile] [--dotclear] [--feed] [-o OUTPUT]
+|                    [--dir-cat]
+|                    input
+
+Optional arguments:
+"""""""""""""""""""
+
+  -h, --help            show this help message and exit
+  --wpfile              Wordpress XML export
+  --dotclear            Dotclear export
+  --feed                Feed to parse
+  -o OUTPUT, --output OUTPUT
+                        Output path
+  --dir-cat             Put files in directories with categories name
+
+Examples
+========
+
+for Wordpress::
+
+    $ python2 tools/importer.py --wpfile -o ~/output ~/posts.xml
+
+for Dotclear::
+
+    $ python2 tools/importer.py --dotclear -o ~/output ~/backup.txt
+
+
+Tests
+=====
+
+To test the module, one can use sample files:
+
+- for Wordpress: http://wpcandy.com/made/the-sample-post-collection
+- for Dotclear: http://themes.dotaddict.org/files/public/downloads/lorem-backup.txt
diff --git a/docs/index.rst b/docs/index.rst
index cbc6bb19..9aba5609 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -42,8 +42,8 @@ If you want to see new features in Pelican, dont hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
 
 Contact me at "alexis at notmyidea dot org" for any request/feedback! You can
-also join the team at `#pelican on irc.freenode.org 
-<irc://irc.freenode.net/pelican>`_ 
+also join the team at `#pelican on irc.freenode.org
+<irc://irc.freenode.net/pelican>`_
 (or if you don't have any IRC client, using `the webchat
 <http://webchat.freenode.net/?channels=pelican&uio=d4>`_)
 for quick feedback.
@@ -55,11 +55,12 @@ A french version of the documentation is available at :doc:`fr/index`.
 
 .. toctree::
    :maxdepth: 2
-   
+
    getting_started
    settings
    themes
    internals
    pelican-themes
+   importer
    faq
    contribute
diff --git a/tools/importer.py b/tools/importer.py
index 29409f17..44f02fbd 100755
--- a/tools/importer.py
+++ b/tools/importer.py
@@ -214,8 +214,8 @@ def main(input_type, input, output_path, dircat=False):
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(
-            description="Transform even feed or XML files to rst files."
-                    "Be sure to have pandoc installed")
+            description="Transform feed, Wordpress or Dotclear files to rst files."
+                        "Be sure to have pandoc installed")
 
     parser.add_argument(dest='input', help='The input file to read')
     parser.add_argument('--wpfile', action='store_true', dest='wpfile',
@@ -223,7 +223,7 @@ if __name__ == '__main__':
     parser.add_argument('--dotclear', action='store_true', dest='dotclear',
             help='Dotclear export')
     parser.add_argument('--feed', action='store_true', dest='feed',
-            help='feed to parse')
+            help='Feed to parse')
     parser.add_argument('-o', '--output', dest='output', default='output',
             help='Output path')
     parser.add_argument('--dir-cat', action='store_true', dest='dircat',
@@ -238,6 +238,6 @@ if __name__ == '__main__':
     elif args.feed:
         input_type = 'feed'
     else:
-        print "you must provide either --wpfile or --feed options"
+        print "you must provide either --wpfile, --dotclear or --feed options"
         exit()
     main(input_type, args.input, args.output, dircat=args.dircat)

From a32dc03616b33af9b1ec4f58b9e99a20b6be829c Mon Sep 17 00:00:00 2001
From: mviera <manuel.viera.tirado@gmail.com>
Date: Wed, 3 Aug 2011 22:11:16 +0200
Subject: [PATCH 0415/2864] Keeping simple theme up-to-date too. Issue #145

---
 pelican/themes/simple/templates/article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 0bfed07a..30d31fb6 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block content %}        
 <section id="content" class="body">    
-        <header> <h2 class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
+        <header> <h2 class="entry-title"><a href="{{ pagename }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
         <footer class="post-info">
                 <abbr class="published" title="{{ article.date.isoformat() }}">
                         {{ article.locale_date }}

From ae4a3cb6da831b7fae33a6e0e7a860313f46ec0e Mon Sep 17 00:00:00 2001
From: mviera <manuel.viera.tirado@gmail.com>
Date: Thu, 4 Aug 2011 00:31:58 +0200
Subject: [PATCH 0416/2864] I have been talking with alexis and he doesn't want
 'markdown' to be installed by default if it's not needed. Issue #145

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 3f836293..e2bd4c60 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 
 VERSION = "2.7.2" # find a better way to do so.
 
-requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'markdown']
+requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils']
 if sys.version_info < (2,7):
     requires.append('argparse')
 

From a5f47cfae9766b8fabc9cd21b17c14b92a34e730 Mon Sep 17 00:00:00 2001
From: Borgar <borgar@borgar.net>
Date: Wed, 15 Jun 2011 23:48:54 +0000
Subject: [PATCH 0417/2864] Allow overriding reader extensions.

This adds an extensions setting all readers in the style of [ext]_EXTENSIONS. So for the MarkdownReader, who's extension is "md", the setting read is MD_EXTENSIONS.

The settings allow overriding the default options passed through the readers. In the case of Markdown the default values are ['codehilite','extra'], but user may change this through the setting:

MD_EXTENSIONS = ['footnotes','abbr','codehilite']
---
 docs/settings.rst     |  4 ++++
 pelican/generators.py |  2 +-
 pelican/readers.py    | 10 +++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e4e2feaf..d6b05cab 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -46,6 +46,10 @@ Setting name (default value)                        what does it do?
 `MARKUP` (``('rst', 'md')``)                        A list of available markup languages you want
                                                     to use. For the moment, only available values
                                                     are `rst` and `md`.
+`MD_EXTENSIONS` (``('codehilite','extra')``)        A list of the extensions that the markdown processor
+                                                    will use. Refer to the extensions chapter in the
+                                                    Python-Markdown documentation for a complete list of
+                                                    supported extensions.
 `OUTPUT_PATH` (``'output/'``)                       Where to output the generated files.
 `PATH` (``None``)                                   path to look at for input files.
 `PDF_GENERATOR` (``False``)                         Set to True if you want to have PDF versions
diff --git a/pelican/generators.py b/pelican/generators.py
index f6ac35a0..2862ec6d 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -211,7 +211,7 @@ class ArticlesGenerator(Generator):
         files = self.get_files(self.path, exclude=['pages',])
         all_articles = []
         for f in files:
-            content, metadata = read_file(f)
+            content, metadata = read_file(f, settings=self.settings)
 
             # if no category is set, use the name of the path as a category
             if 'category' not in metadata.keys():
diff --git a/pelican/readers.py b/pelican/readers.py
index 4c8acd2a..418753fa 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -32,7 +32,7 @@ def _process_metadata(name, value):
 
 class Reader(object):
     enabled = True
-
+    extensions = None
 
 class _FieldBodyTranslator(HTMLTranslator):
 
@@ -99,11 +99,12 @@ class RstReader(Reader):
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
     extension = "md"
+    extensions = ['codehilite', 'extra']
 
     def read(self, filename):
         """Parse content and metadata of markdown files"""
         text = open(filename)
-        md = Markdown(extensions = ['meta', 'codehilite', 'extra'])
+        md = Markdown(extensions=set(self.extensions+['meta']))
         content = md.convert(text)
 
         metadata = {}
@@ -133,13 +134,16 @@ class HtmlReader(Reader):
 
 _EXTENSIONS = dict((cls.extension, cls) for cls in Reader.__subclasses__())
 
-def read_file(filename, fmt=None):
+def read_file(filename, fmt=None, settings=None):
     """Return a reader object using the given format."""
     if not fmt:
         fmt = filename.split('.')[-1]
     if fmt not in _EXTENSIONS.keys():
         raise TypeError('Pelican does not know how to parse %s' % filename)
     reader = _EXTENSIONS[fmt]()
+    settings_key = '%s_EXTENSIONS' % fmt.upper()
+    if settings and settings_key in settings:
+        reader.extensions = settings[settings_key]
     if not reader.enabled:
         raise ValueError("Missing dependencies for %s" % fmt)
     return reader.read(filename)

From 7f1cad26bac87ffd29ec57e84776df8b3d036d49 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 11 Aug 2011 11:21:18 +0200
Subject: [PATCH 0418/2864] typos

---
 docs/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 9aba5609..41c7b269 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,7 +1,7 @@
 Pelican
 #######
 
-Pelican is a simple weblog generator, writen in python.
+Pelican is a simple weblog generator, written in python.
 
 * Write your weblog entries directly with your editor of choice (vim!) and
   directly in restructured text, or markdown.
@@ -18,7 +18,7 @@ Pelican currently supports:
 * comments, via an external service (disqus). Please notice that while
   it's useful, it's an external service, and you'll not manage the
   comments by yourself. It could potentially eat your data. (optional)
-* easy theming (themes are done using `jinja2 <http://jinjna.pocoo.org>`_)
+* easy theming (themes are done using `jinja2 <http://jinja.pocoo.org>`_)
 * PDF generation of the articles/pages (optional).
 * publication of articles in various languages
 * RSS/Atom feeds

From e9f1bb98532417765af818d485051428bb67b000 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 11 Aug 2011 11:24:33 +0200
Subject: [PATCH 0419/2864] add ideas

---
 TODO | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/TODO b/TODO
index 9829c9c5..ca29204d 100644
--- a/TODO
+++ b/TODO
@@ -5,3 +5,5 @@
 * Recompile only the changed files, not all.
 * Add a way to make the coffee (or not)
 * Add a sitemap generator.
+* read templates from the templates folder per default
+* add support of github via ghg import

From c73ae0217033f96c4493d8258bfa6188940c7426 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 11 Aug 2011 22:42:20 +0200
Subject: [PATCH 0420/2864] pep8ize

---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 418753fa..f62d35a9 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -104,7 +104,7 @@ class MarkdownReader(Reader):
     def read(self, filename):
         """Parse content and metadata of markdown files"""
         text = open(filename)
-        md = Markdown(extensions=set(self.extensions+['meta']))
+        md = Markdown(extensions=set(self.extensions + ['meta']))
         content = md.convert(text)
 
         metadata = {}

From 1edbe044a28cd31e5ccde0f67569f5c5dcbfe210 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 11 Aug 2011 23:34:53 +0200
Subject: [PATCH 0421/2864] Include the "pelican-quickstart" script.

This ease the creation of a new blog. I modified slightly the code wrote by @Skami18
here: https://gist.github.com/1025236/dfa695e67482477907c79ae709ab827b20b18b04

This commit also renames the import script to "pelican-import".

Fixes #129.
---
 docs/getting_started.rst              |  19 +-
 docs/importer.rst                     |  15 +-
 docs/settings.rst                     |   2 +-
 pelican/__init__.py                   |   4 +-
 setup.py                              |   2 +-
 tools/{importer.py => pelican-import} |   0
 tools/pelican-quickstart              | 269 ++++++++++++++++++++++++++
 7 files changed, 290 insertions(+), 21 deletions(-)
 rename tools/{importer.py => pelican-import} (100%)
 create mode 100755 tools/pelican-quickstart

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index a59bc8cf..f10afa68 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -83,6 +83,13 @@ the options you can use::
 
     $ pelican --help
 
+Kickstart a blog
+----------------
+
+You also can use the `pelican-quickstart` script to start a new blog in
+seconds, by just answering few questions. Just run `pelican-quickstart` and
+you're done! (Added in pelican 3)
+
 Pages
 -----
 
@@ -95,16 +102,8 @@ the menu.
 Importing an existing blog
 --------------------------
 
-It is possible to import wordpress themes and RSS themes using a script which
-is living in `tools`: importer.
-
-You can call it this way for a wordpress import::
-
-    $ python importer.py --wpfile /your/wordpress/export -o output_dir
-
-And like this for an import from an RSS feed::
-
-    $ python importer.py --feed http://your/rss/feed -o output_dir
+It is possible to import your blog from dotclear, wordpress and an RSS feed using 
+a simple script. See :ref:`import`.
 
 Translations
 ------------
diff --git a/docs/importer.rst b/docs/importer.rst
index 35cd095c..6e5734ae 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -1,3 +1,5 @@
+.. _import:
+
 =================================
  Import from other blog software
 =================================
@@ -5,7 +7,7 @@
 Description
 ===========
 
-``importer.py`` is a command line tool for converting articles from other
+``pelican-import`` is a command line tool for converting articles from other
 software to ReStructuredText. The supported formats are:
 
 - Wordpress XML export
@@ -20,9 +22,9 @@ supports Markdown).
 Usage
 """""
 
-| importer.py [-h] [--wpfile] [--dotclear] [--feed] [-o OUTPUT]
-|                    [--dir-cat]
-|                    input
+| pelican-import [-h] [--wpfile] [--dotclear] [--feed] [-o OUTPUT]
+|                [--dir-cat]
+|                input
 
 Optional arguments:
 """""""""""""""""""
@@ -40,12 +42,11 @@ Examples
 
 for Wordpress::
 
-    $ python2 tools/importer.py --wpfile -o ~/output ~/posts.xml
+    $ pelican-import --wpfile -o ~/output ~/posts.xml
 
 for Dotclear::
 
-    $ python2 tools/importer.py --dotclear -o ~/output ~/backup.txt
-
+    $ pelican-import --dotclear -o ~/output ~/backup.txt
 
 Tests
 =====
diff --git a/docs/settings.rst b/docs/settings.rst
index d6b05cab..7cfb9442 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -200,7 +200,7 @@ Setting name (default value)                        what does it do?
 Theming
 =======
 
-Theming is addressed in a dedicated section (see  :ref:`theming-pelican`).
+Theming is addressed in a dedicated section (see :ref:`theming-pelican`).
 However, here are the settings that are related to theming.
 
 ================================================    =====================================================
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 4b743d52..b68d6aa9 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,7 +9,7 @@ from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 from pelican import log
 
-VERSION = "2.7.2"
+__version__ = "2.7.2"
 
 
 class Pelican(object):
@@ -112,7 +112,7 @@ def main():
             help='Show only critical errors')
     parser.add_argument('-D', '--debug', action='store_const', const=log.DEBUG, dest='verbosity',
             help='Show all message, including debug messages')
-    parser.add_argument('--version', action='version', version=VERSION,
+    parser.add_argument('--version', action='version', version=__version__,
             help='Print the pelican version and exit')
     parser.add_argument('-r', '--autoreload', dest='autoreload', action='store_true',
             help="Relaunch pelican each time a modification occurs on the content"
diff --git a/setup.py b/setup.py
index e2bd4c60..4574fdd6 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ setup(
     packages = ['pelican'],
     include_package_data = True,
     install_requires = requires,
-    scripts = ['bin/pelican', 'tools/pelican-themes'],
+    scripts = ['bin/pelican', 'tools/pelican-themes', 'tools/pelican-import', 'tools/pelican-quickstart'],
     classifiers = ['Development Status :: 5 - Production/Stable',
                    'Environment :: Console',
                    'License :: OSI Approved :: GNU Affero General Public License v3',
diff --git a/tools/importer.py b/tools/pelican-import
similarity index 100%
rename from tools/importer.py
rename to tools/pelican-import
diff --git a/tools/pelican-quickstart b/tools/pelican-quickstart
new file mode 100755
index 00000000..fe7bb31a
--- /dev/null
+++ b/tools/pelican-quickstart
@@ -0,0 +1,269 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*- #
+
+import os, sys, argparse, string
+from pelican import __version__
+
+TEMPLATES={
+	'Makefile' : '''
+PELICAN=$pelican
+PELICANOPTS=$pelicanopts
+
+BASEDIR=$basedir
+INPUTDIR=$$(BASEDIR)/src
+OUTPUTDIR=$$(BASEDIR)/output
+CONFFILE=$$(BASEDIR)/pelican.conf.py
+
+FTP_HOST=$ftp_host
+FTP_USER=$ftp_user
+FTP_TARGET_DIR=$ftp_target_dir
+
+SSH_HOST=$ssh_host
+SSH_USER=$ssh_user
+SSH_TARGET_DIR=$ssh_target_dir
+
+DROPBOX_DIR=$dropbox_dir
+
+help:
+\t@echo 'Makefile for a pelican Web site                                       '
+\t@echo '                                                                      '
+\t@echo 'Usage:                                                                '
+\t@echo '   make html                        (re)generate the web site         '
+\t@echo '   make clean                       remove the generated files        '
+\t@echo '   ftp_upload                       upload the web site using FTP     '
+\t@echo '   ssh_upload                       upload the web site using SSH     '
+\t@echo '   dropbox_upload                   upload the web site using Dropbox '
+\t@echo '                                                                      '
+
+
+html: $$(OUTPUTDIR)/index.html
+\t@echo 'Done'
+
+$$(OUTPUTDIR)/%.html:
+\t$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE)
+
+clean:
+\trm -r $$(OUTPUTDIR)/*
+
+dropbox_upload: $$(OUTPUTDIR)/index.html
+\tcp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
+
+ssh_upload: $$(OUTPUTDIR)/index.html
+\tscp -rv $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST)/$$(SSH_TARGET_DIR)
+
+ftp_upload: $$(OUTPUTDIR)/index.html
+\tlftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUT_DIR)/* $$(FTP_TARGET_DIR) ; quit"
+
+.PHONY: html help clean ftp_upload ssh_upload dropbox_upload
+    ''',
+
+    'pelican.conf.py': '''#!/usr/bin/env python
+# -*- coding: utf-8 -*- #
+
+AUTHOR = u"$author"
+SITENAME = u"$sitename"
+SITEURL = '/'
+
+DEFAULT_LANG='$lang'
+
+# Blogroll
+LINKS =  (
+          ('Pelican', 'http://docs.notmyidea.org/alexis/pelican/'),
+          ('Python.org', 'http://python.org'),
+          ('Jinja2', 'http://jinja.pocoo.org'),
+          ('You can modify those links in your config file', '#')
+         )
+
+# Social widget
+SOCIAL = (
+          ('You can add links in your config file', '#'),
+         )
+
+WITH_PAGINATION = $with_pagination
+DEFAULT_PAGINATION = $default_pagination
+
+
+    '''
+}
+
+CONF = {
+    'pelican' : 'pelican',
+    'pelicanopts' : None,
+    'basedir': '.',
+    'ftp_host': 'localhost',
+    'ftp_user': 'anonymous',
+    'ftp_target_dir': '/',
+    'ssh_host': 'locahost',
+    'ssh_user': 'root',
+    'ssh_target_dir': '/var/www',
+    'dropbox_dir' : '~/Dropbox/Public/',
+    'with_pagination' : True,
+    'default_pagination' : 7,
+    'lang': 'en'
+}
+
+
+class _dict(dict):
+    def __init__(self, *args, **kwargs):
+        dict.__init__(self, *args, **kwargs)
+
+    def __getitem__(self, i):
+        return dict.get(self,i,None)
+
+    def has_key(k):
+        return True
+
+
+def ask(question, answer=str, default=None, l=None):
+    if answer == str:
+        r = ''
+        while True:
+            if default:
+                r = raw_input('> {0} [{1}] '.format(question, default))
+            else:
+                r = raw_input('> {0} '.format(question, default))
+
+            r = r.strip()
+            
+            if len(r) <= 0:
+                if default:
+                    r = default
+                    break
+                else:
+                    print('You must enter something')
+            else:
+                if l and len(r) != l:
+                    print('You must enter a {0} letters long string'.format(l))
+                else:
+                   break
+
+        return r
+
+    elif answer == bool:
+        r = None
+        while True:
+            if default is True:
+                r = raw_input('> {0} (Y/n) '.format(question))
+            elif default is False:
+                r = raw_input('> {0} (y/N) '.format(question))
+            else:
+                r = raw_input('> {0} (y/n) '.format(question))
+
+            r = r.strip().lower()
+
+            if r in ('y', 'yes'):
+                r = True
+                break
+            elif r in ('n', 'no'):
+                r = False
+                break
+            elif not r:
+                r = default
+                break
+            else:
+                print("You must answer `yes' or `no'")
+        return r
+    elif answer == int:
+        r = None
+        while True:
+            if default:
+                r = raw_input('> {0} [{1}] '.format(question, default))
+            else:
+                r = raw_input('> {0} '.format(question))
+
+            r = r.strip()
+
+            if not r:
+                r = default
+                break
+
+            try:
+                r = int(r)
+                break
+            except:
+                print('You must enter an integer')
+        return r
+    else:
+        raise NotImplemented('Arguent `answer` must be str, bool or integer')
+
+
+def main():
+    parser = argparse.ArgumentParser(description="A kickstarter for pelican")
+    parser.add_argument('-p', '--path', default=".", 
+            help="The path to generate the blog into")
+    parser.add_argument('-t', '--title', default=None, metavar="title",
+            help='Set the title of the website')
+    parser.add_argument('-a', '--author', default=None, metavar="author",
+            help='Set the author name of the website')
+    parser.add_argument('-l', '--lang', default=None, metavar="lang", 
+            help='Set the default lang of the website')
+
+    args = parser.parse_args()
+    
+
+    print('''Welcome to pelican-quickstart v{v}.
+
+This script will help you creating a new Pelican based website.
+
+Please answer the following questions so this script can generate the files needed by Pelican.
+
+    '''.format(v=__version__))
+    
+    CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new Web site ?', answer=str, default=args.path))
+    CONF['sitename'] = ask('How will you call your Web site ?', answer=str, default=args.title)
+    CONF['author'] = ask('Who will be the author of this Web site ?', answer=str, default=args.author)
+    CONF['lang'] = ask('What will be the default language  of this Web site ?', str, args.lang or CONF['lang'], 2)
+
+    CONF['with_pagination'] = ask('Do you want to enable article pagination ?', bool, CONF['with_pagination'])
+
+    if CONF['with_pagination']:
+        CONF['default_pagination'] = ask('So how many articles per page do you want ?', int, CONF['default_pagination'])
+
+    mkfile = ask('Do you want to generate a Makefile to easily manage your website ?', bool, True)
+    
+    if mkfile:
+        if ask('Do you want to upload your website using FTP ?', answer=bool, default=False):
+            CONF['ftp_host'] = ask('What is the hostname of your FTP server ?', str, CONF['ftp_host'])
+            CONF['ftp_user'] = ask('What is your username on this server ?', str, CONF['ftp_user'])
+            CONF['ftp_traget_dir'] = ask('Where do you want to put your website on this server ?', str, CONF['ftp_target_dir'])
+
+        if ask('Do you want to upload your website using SSH ?', answer=bool, default=False):
+            CONF['ssh_host'] = ask('What is the hostname of your SSH server ?', str, CONF['ssh_host'])
+            CONF['ssh_user'] = ask('What is your username on this server ?', str, CONF['ssh_user'])
+            CONF['ssh_traget_dir'] = ask('Where do you want to put your website on this server ?', str, CONF['ssh_target_dir'])
+
+        if ask('Do you want to upload your website using Dropbox ?', answer=bool, default=False):
+            CONF['dropbox_dir'] = ask('Where is your Dropbox directory ?', str, CONF['dropbox_dir'])
+
+    try:
+        os.makedirs(os.path.join(CONF['basedir'], 'src'))
+    except OSError, e:
+        print('Error: {0}'.format(e))
+
+    try:
+        os.makedirs(os.path.join(CONF['basedir'], 'output'))
+    except OSError, e:
+        print('Error: {0}'.format(e))
+
+    conf = string.Template(TEMPLATES['pelican.conf.py'])
+    try:
+        with open(os.path.join(CONF['basedir'], 'pelican.conf.py'), 'w') as fd:
+            fd.write(conf.safe_substitute(CONF))
+            fd.close()
+    except OSError, e:
+        print('Error: {0}'.format(e))
+
+    if mkfile:
+        Makefile = string.Template(TEMPLATES['Makefile'])
+
+        try:
+            with open(os.path.join(CONF['basedir'], 'Makefile'), 'w') as fd:
+                fd.write(Makefile.safe_substitute(CONF))
+                fd.close()
+        except OSError, e:
+            print('Error: {0}'.format(e))
+
+    print('Done. Your new project is available at %s' % CONF['basedir'])
+
+if __name__ == '__main__':
+    main()

From 4a6bf81b2ef75116d1bef0c62e645c71ead5c946 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 11 Aug 2011 23:50:04 +0200
Subject: [PATCH 0422/2864] remove skribit support. fixes #154

---
 docs/fr/themes.rst                            | 16 -----
 docs/index.rst                                |  2 +-
 docs/settings.rst                             | 58 -------------------
 docs/themes.rst                               | 16 -----
 pelican/themes/notmyidea/templates/base.html  |  3 -
 .../templates/skribit_tab_script.html         | 14 -----
 .../templates/skribit_widget_script.html      |  8 ---
 7 files changed, 1 insertion(+), 116 deletions(-)
 delete mode 100644 pelican/themes/notmyidea/templates/skribit_tab_script.html
 delete mode 100644 pelican/themes/notmyidea/templates/skribit_widget_script.html

diff --git a/docs/fr/themes.rst b/docs/fr/themes.rst
index 53e6374e..c6f45300 100644
--- a/docs/fr/themes.rst
+++ b/docs/fr/themes.rst
@@ -169,19 +169,3 @@ dates_pages             La page actuelle d'articles, ordonnée par date
                         croissante.
 page_name               'tag/`nom du tag`'.
 ===================     ===================================================
-
-Inclure le script skribit
-=========================
-
-Pour pouvoir supporter les scripts skribit dans vos thèmes, vous devez
-faire ceci :
-
- * Copier `skribit_tab_script.html` et `skribit_widget_script.html` dans
-   votre dossier de templates.
- * Ajouter {% include 'skribit_tab_script' %} dans votre <head> pour
-   ajouter le support de l'onglet de suggestions.
- * Ajouter {% include 'skribit_widget_script' %} là où vous le souhaitez
-   pour ajouter le widget dans la sidebar.
-
-Vous pouvez regarder le thème par défault (notmyidea) pour voir un
-exemple de thème fonctionnel.
diff --git a/docs/index.rst b/docs/index.rst
index 41c7b269..1e0a56f8 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -23,7 +23,7 @@ Pelican currently supports:
 * publication of articles in various languages
 * RSS/Atom feeds
 * wordpress/dotclear or RSS imports
-* integration with various tools: twitter/google analytics/skribit (optional)
+* integration with various tools: twitter/google analytics (optional)
 
 Why the name "Pelican" ?
 ========================
diff --git a/docs/settings.rst b/docs/settings.rst
index 7cfb9442..d08e24da 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -262,64 +262,6 @@ adding that in your configuration::
 
     CSS_FILE = "wide.css"
 
-Skribit
--------
-
-Skribit has two ways to display suggestions : as a sidebar widget or as a
-suggestions tab. You can choose one of the display by setting the SKRIBIT_TYPE
-in your config.
-
- * SKRIBIT_WIDGET_ID : the identifier of your blog.
-
-All the customizations are done in the skribit web interface.
-
-To retrieve your identifier from the code snippet, you can use this python code::
-
-    import re
-    regex = re.compile('.*http://assets.skribit.com/javascripts/SkribitWidget.\
-        js\?renderTo=writeSkribitHere&amp;blog=(.*)&amp;.*')
-    snippet = '''SNIPPET CONTENT'''
-    snippet = snippet.replace('\n', '')
-    identifier = regex.match(snippet).groups()[0]
-
-Suggestion tab
---------------
-
-The setting for suggestion tab's customizations are :
-
- * SKRIBIT_TAB_COLOR
- * SKRIBIT_TAB_DISTANCE_HORIZ
- * SKRIBIT_TAB_DISTANCE_VERT
- * SKRIBIT_TAB_PLACEMENT
-
-The identifier is :
-
- * SKRIBIT_TAB_SITENAME : the identifier of your blog
-
-To retrieve your sitename from the code snippet, you can use this python code::
-
-    import re
-    regex = re.compile('.*http://skribit.com/lightbox/(.*)\',.*')
-    snippet = '''SNIPPET CONTENT'''
-    snippet = snippet.replace('\n', '')
-    identifier = regex.match(snippet).groups()[0]
-
-Skribit settings
-----------------
-
-================================================    =====================================================
-Setting name (default value)                        what does it do?
-================================================    =====================================================
-`SKRIBIT_TYPE`                                      The type of skribit widget (TAB or WIDGET).
-`SKRIBIT_TAB_COLOR`                                 Tab color (#XXXXXX, default #333333).
-`SKRIBIT_TAB_HORIZ`                                 Tab Distance from Left (% or distance, default Null).
-`SKRIBIT_TAB_VERT`                                  Tab Distance from Top (% or distance, default 20%).
-`SKRIBIT_TAB_PLACEMENT`                             Tab placement (Top, Bottom, Left or Right,
-                                                    default LEFT).
-`SKRIBIT_TAB_SITENAME`                              Tab identifier (See Skribit part below).
-`SKRIBIT_WIDGET_ID`                                 Widget identifier (See Skribit part below).
-================================================    =====================================================
-
 .. _pelican-themes: :doc:`pelican-themes`
 
 Example settings
diff --git a/docs/themes.rst b/docs/themes.rst
index 2ebfcf49..a20fd099 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -190,22 +190,6 @@ dates_page              The current page of articles, ordered by date,
 page_name               'tag/`tag_name`'. Useful for pagination links.
 ===================     ===================================================
 
-Include skribit script
-======================
-
-In order to support skribit scripts in your themes, you must perform these
-actions:
-
- * Copy `skribit_tab_script.html` and `skribit_widget_script.html` in your
-   templates directory.
- * Add {% include 'skribit_tab_script.html' %} in your <head> part in order to
-   support suggestions tab.
- * Add {% include 'skribit_widget_script.html' %} where you want in order to
-   support sidebar widget.
-
-You can take a look at notmyidea default theme for working example.
-
-
 Inheritance
 ===========
 
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index ad0f636f..a34b5d5a 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -9,8 +9,6 @@
         <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
 
-        {% include 'skribit_tab_script.html' %}
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -54,7 +52,6 @@
                         </ul>
                 </div><!-- /.blogroll -->
         {% endif %}
-        {% include 'skribit_widget_script.html' %}
         {% if SOCIAL %}
                 <div class="social">
                         <h2>social</h2>
diff --git a/pelican/themes/notmyidea/templates/skribit_tab_script.html b/pelican/themes/notmyidea/templates/skribit_tab_script.html
deleted file mode 100644
index 637bd78f..00000000
--- a/pelican/themes/notmyidea/templates/skribit_tab_script.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% if SKRIBIT_TYPE and SKRIBIT_TYPE == 'TAB' and SKRIBIT_TAB_SITENAME %}
-<link rel="stylesheet" type="text/css" media="screen" charset="utf-8" href="http://assets.skribit.com/stylesheets/SkribitSuggest.css"></link>
-<style type="text/css" media="print" charset="utf-8">a#sk_tab{display:none !important;}</style>
-<script src="http://assets.skribit.com/javascripts/SkribitSuggest.js" type="text/javascript"></script>
-<script type="text/javascript" charset="utf-8">
-      var skribit_settings = {};
-      skribit_settings.placement = "{{ SKRIBIT_TAB_PLACEMENT or 'right' }}";
-      skribit_settings.color = "{{ SKRIBIT_TAB_COLOR or '#333333' }}";
-      skribit_settings.text_color = "{{ SKRIBIT_TAB_TEXT_COLOR or 'white' }}";
-      skribit_settings.distance_vert = "{{ SKRIBIT_TAB_VERT or '20%' }}";
-      skribit_settings.distance_horiz = "{{ SKRIBIT_TAB_HORIZ or '' }}";
-      SkribitSuggest.suggest('http://skribit.com/lightbox/{{ SKRIBIT_TAB_SITENAME }}', skribit_settings);
-</script>
-{% endif %}
\ No newline at end of file
diff --git a/pelican/themes/notmyidea/templates/skribit_widget_script.html b/pelican/themes/notmyidea/templates/skribit_widget_script.html
deleted file mode 100644
index 0e03531b..00000000
--- a/pelican/themes/notmyidea/templates/skribit_widget_script.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% if SKRIBIT_TYPE == 'WIDGET' and SKRIBIT_WIDGET_ID %}
-<div id="writeSkribitHere"></div>
-<script src="http://assets.skribit.com/javascripts/SkribitWidget.js?renderTo=writeSkribitHere&amp;blog={{ SKRIBIT_WIDGET_ID }}&amp;cnt=5"></script>
-<noscript>Sorry, but the
-    <a href="http://skribit.com" title="Skribit - Cure Writer's Block">Skribit</a> widget only works on browsers with JavaScript support.
-    <a href="http://skribit.com/blogs/think-different-think-open" title="Skribit Suggestions for Think Different, Think Open">View suggestions for this blog here.</a>
-</noscript>
-{% endif %}
\ No newline at end of file

From acb65b77af76267f8056a3fb89172d3b82db7820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <remy.hubscher@ionyse.com>
Date: Tue, 16 Aug 2011 11:40:08 +0200
Subject: [PATCH 0423/2864] GMT Time in ATOM feeds

---
 pelican/utils.py   | 9 +++++++++
 pelican/writers.py | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 2fb76670..ed9d0566 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -2,6 +2,8 @@
 import re
 import os
 import shutil
+import time
+import calendar
 from datetime import datetime
 from codecs import open as _open
 from itertools import groupby
@@ -222,3 +224,10 @@ def files_changed(path, extensions):
         LAST_MTIME = mtime
         return True
     return False
+
+def local_to_utc(t):
+    "Convert article time to UTC time for ATOM feeds"
+    secs = time.mktime(t)
+    gmtime = list(time.gmtime(secs))
+    gmtime[8] = 1
+    return datetime.fromtimestamp(time.mktime(gmtime))
diff --git a/pelican/writers.py b/pelican/writers.py
index 4685cff9..9d21b976 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -7,7 +7,7 @@ from functools import partial
 import locale
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
-from pelican.utils import get_relative_path
+from pelican.utils import get_relative_path, local_to_utc
 from pelican.paginator import Paginator
 from pelican.log import *
 
@@ -37,7 +37,7 @@ class Writer(object):
             description=item.content,
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', 'John Doe'),
-            pubdate=item.date)
+            pubdate=local_to_utc(item.date.timetuple()))
 
     def write_feed(self, elements, context, filename=None, feed_type='atom'):
         """Generate a feed with the list of articles provided

From 66ca61dfbbf2e66c523137ec7f05c0fd3c84d752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <remy.hubscher@ionyse.com>
Date: Tue, 16 Aug 2011 11:47:20 +0200
Subject: [PATCH 0424/2864] Patch the makefile to automaticaly create the
 output dir if it doesn't exists, use PWD to work in different computer
 base_dir from scratch

---
 tools/pelican-quickstart | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/pelican-quickstart b/tools/pelican-quickstart
index fe7bb31a..a946772c 100755
--- a/tools/pelican-quickstart
+++ b/tools/pelican-quickstart
@@ -9,7 +9,7 @@ TEMPLATES={
 PELICAN=$pelican
 PELICANOPTS=$pelicanopts
 
-BASEDIR=$basedir
+BASEDIR=$$(PWD)
 INPUTDIR=$$(BASEDIR)/src
 OUTPUTDIR=$$(BASEDIR)/output
 CONFFILE=$$(BASEDIR)/pelican.conf.py
@@ -36,20 +36,21 @@ help:
 \t@echo '                                                                      '
 
 
-html: $$(OUTPUTDIR)/index.html
+html: clean $$(OUTPUTDIR)/index.html
 \t@echo 'Done'
 
 $$(OUTPUTDIR)/%.html:
 \t$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE)
 
 clean:
-\trm -r $$(OUTPUTDIR)/*
+\trm -fr $$(OUTPUTDIR)
+\tmkdir $$(OUTPUTDIR)
 
 dropbox_upload: $$(OUTPUTDIR)/index.html
 \tcp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
 
 ssh_upload: $$(OUTPUTDIR)/index.html
-\tscp -rv $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST)/$$(SSH_TARGET_DIR)
+\tscp -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 ftp_upload: $$(OUTPUTDIR)/index.html
 \tlftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUT_DIR)/* $$(FTP_TARGET_DIR) ; quit"

From 32a6ecbcc582c26fa5d28a0eb16715e69e28418b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <remy.hubscher@ionyse.com>
Date: Tue, 16 Aug 2011 15:11:49 +0200
Subject: [PATCH 0425/2864] Fix timezone bug for ATOM generation

---
 pelican/utils.py         | 16 ++++++++++------
 pelican/writers.py       |  5 +++--
 setup.py                 |  2 +-
 tools/pelican-quickstart |  2 ++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index ed9d0566..cd7507ee 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -4,6 +4,7 @@ import os
 import shutil
 import time
 import calendar
+import pytz
 from datetime import datetime
 from codecs import open as _open
 from itertools import groupby
@@ -225,9 +226,12 @@ def files_changed(path, extensions):
         return True
     return False
 
-def local_to_utc(t):
-    "Convert article time to UTC time for ATOM feeds"
-    secs = time.mktime(t)
-    gmtime = list(time.gmtime(secs))
-    gmtime[8] = 1
-    return datetime.fromtimestamp(time.mktime(gmtime))
+def set_date_tzinfo(d, tz_name=None):
+    """ Date without tzinfo shoudbe utc.
+    This function set the right tz to date that aren't utc and don't have tzinfo
+    """
+    if tz_name is not None:
+        tz = pytz.timezone(tz_name)
+        return tz.localize(d)
+    else:
+        return d
diff --git a/pelican/writers.py b/pelican/writers.py
index 9d21b976..4dfc1ba6 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -7,7 +7,7 @@ from functools import partial
 import locale
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
-from pelican.utils import get_relative_path, local_to_utc
+from pelican.utils import get_relative_path, set_date_tzinfo
 from pelican.paginator import Paginator
 from pelican.log import *
 
@@ -37,7 +37,8 @@ class Writer(object):
             description=item.content,
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', 'John Doe'),
-            pubdate=local_to_utc(item.date.timetuple()))
+            pubdate=set_date_tzinfo(item.date, 
+                                    self.settings.get('TIMEZONE', None)))
 
     def write_feed(self, elements, context, filename=None, feed_type='atom'):
         """Generate a feed with the list of articles provided
diff --git a/setup.py b/setup.py
index 4574fdd6..fed1ba08 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 
 VERSION = "2.7.2" # find a better way to do so.
 
-requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils']
+requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'pytz']
 if sys.version_info < (2,7):
     requires.append('argparse')
 
diff --git a/tools/pelican-quickstart b/tools/pelican-quickstart
index a946772c..e1fb4eff 100755
--- a/tools/pelican-quickstart
+++ b/tools/pelican-quickstart
@@ -65,6 +65,8 @@ AUTHOR = u"$author"
 SITENAME = u"$sitename"
 SITEURL = '/'
 
+TIMEZONE = 'Europe/Paris'
+
 DEFAULT_LANG='$lang'
 
 # Blogroll

From 26eecf082af1b93a06fecbd87ac8f0faabc51a1b Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Tue, 16 Aug 2011 18:43:51 +0200
Subject: [PATCH 0426/2864] Removed another utf-8 related bug

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 2862ec6d..4f19828c 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -219,7 +219,7 @@ class ArticlesGenerator(Generator):
                 if os.path.dirname(f) == self.path:
                     category = self.settings['DEFAULT_CATEGORY']
                 else:
-                    category = os.path.basename(os.path.dirname(f))
+                    category = os.path.basename(os.path.dirname(f)).decode('utf-8')
 
                 if category != '':
                     metadata['category'] = unicode(category)

From e5d4e90b8fdc52e51bbf27e1896ef84b79b4b502 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 17 Aug 2011 10:38:48 +0200
Subject: [PATCH 0427/2864] update the docs on how to view generated blog

---
 docs/getting_started.rst | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index f10afa68..deca0c17 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -180,3 +180,17 @@ If you want to publish an article as a draft, for friends to review it for
 instance, you can add a ``status: draft`` to its metadata, it will then be
 available under the ``drafts`` folder, and not be listed under the index page nor
 any category page.
+
+Viewing the generated files
+---------------------------
+
+The files generated by pelican are static files, so you don't actually need
+something special to see what's hapenning with the generated files.
+
+You can either run your browser on the files on your disk::
+
+    $ firefox output/index.html
+
+Or run a simple web server using python::
+
+    cd output && python -m SimpleHTTPServer

From bee3140fc69cc56cf0e49e4a3c5123e68968ad2e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 18 Aug 2011 13:35:53 +0200
Subject: [PATCH 0428/2864] doc: reorder settings

---
 docs/settings.rst | 58 +++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d08e24da..42ccf2be 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -24,8 +24,35 @@ Basic settings
 ================================================    =====================================================
 Setting name (default value)                        what does it do?
 ================================================    =====================================================
+`ARTICLE_PERMALINK_STRUCTURE` (``''``)              Empty by default. Allows to render URLs for 
+                                                    articles sorted by date, in case you specify a 
+                                                    format as specified in the example.
+                                                    It follows the python datetime directives:
+                                                     * %Y: Year with century as a decimal number.
+                                                     * %m: Month as a decimal number [01,12].
+                                                     * %d: Day of the month as a decimal number [01,31].
+
+                                                     Note: if you specify a datetime directive, it will
+                                                     be substituted using the date metadata field into 
+                                                     the rest file. if the date is not specified, pelican
+                                                     will rely on the mtime of your file.
+
+                                                     Check the python datetime documentation 
+                                                     at http://bit.ly/cNcJUC for more information.
+                                                    
+                                                    Also, you can use any metadata in the 
+                                                    restructured text files:
+                                                     * category: '%(category)s'
+                                                     * author: '%(author)s'
+                                                     * tags: '%(tags)s'
+                                                     * date: '%(date)s'
+
+                                                    Example usage:
+                                                     * '/%Y/%m/' it will be something like 
+                                                       '/2011/07/sample-post.html'.
+                                                     * '/%Y/%(category)s/' it will be something like
+                                                       '/2011/life/sample-post.html'.
 `AUTHOR`                                            Default author (put your name)
-`SITENAME` (``'A Pelican Blog'``)                   Your site name
 `DATE_FORMATS` (``{}``)                             If you do manage multiple languages, you can
                                                     set the date formatting here.
 `DEFAULT_CATEGORY` (``'misc'``)                     The default category to fallback on.
@@ -57,6 +84,7 @@ Setting name (default value)                        what does it do?
                                                     `rst2pdf`.
 `RELATIVE_URLS` (``True``)                          Defines if pelican should use relative urls or
                                                     not.
+`SITENAME` (``'A Pelican Blog'``)                   Your site name
 `SITEURL`                                           base URL of your website. Note that this is
                                                     not a way to tell pelican to use relative urls
                                                     or static ones. You should rather use the
@@ -65,34 +93,6 @@ Setting name (default value)                        what does it do?
                                                     on the output path "static". By default,
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
-`ARTICLE_PERMALINK_STRUCTURE` (``''``)              Empty by default. Allows to render URLs for 
-                                                    articles sorted by date, in case you specify a 
-                                                    format as specified in the example.
-                                                    It follows the python datetime directives:
-                                                     * %Y: Year with century as a decimal number.
-                                                     * %m: Month as a decimal number [01,12].
-                                                     * %d: Day of the month as a decimal number [01,31].
-
-                                                     Note: if you specify a datetime directive, it will
-                                                     be substituted using the date metadata field into 
-                                                     the rest file. if the date is not specified, pelican
-                                                     will rely on the mtime of your file.
-
-                                                     Check the python datetime documentation 
-                                                     at http://bit.ly/cNcJUC for more information.
-                                                    
-                                                    Also, you can use any metadata in the 
-                                                    restructured text files:
-                                                     * category: '%(category)s'
-                                                     * author: '%(author)s'
-                                                     * tags: '%(tags)s'
-                                                     * date: '%(date)s'
-
-                                                    Example usage:
-                                                     * '/%Y/%m/' it will be something like 
-                                                       '/2011/07/sample-post.html'.
-                                                     * '/%Y/%(category)s/' it will be something like
-                                                       '/2011/life/sample-post.html'.
 ================================================    =====================================================
 
 

From 720b8d31683fd8f18c60a103a280004a040acf8d Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 18 Aug 2011 13:47:31 +0200
Subject: [PATCH 0429/2864] doc: update the settings page about latest changes

---
 docs/settings.rst | 64 ++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 42ccf2be..d2d1ebbc 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -24,34 +24,8 @@ Basic settings
 ================================================    =====================================================
 Setting name (default value)                        what does it do?
 ================================================    =====================================================
-`ARTICLE_PERMALINK_STRUCTURE` (``''``)              Empty by default. Allows to render URLs for 
-                                                    articles sorted by date, in case you specify a 
-                                                    format as specified in the example.
-                                                    It follows the python datetime directives:
-                                                     * %Y: Year with century as a decimal number.
-                                                     * %m: Month as a decimal number [01,12].
-                                                     * %d: Day of the month as a decimal number [01,31].
-
-                                                     Note: if you specify a datetime directive, it will
-                                                     be substituted using the date metadata field into 
-                                                     the rest file. if the date is not specified, pelican
-                                                     will rely on the mtime of your file.
-
-                                                     Check the python datetime documentation 
-                                                     at http://bit.ly/cNcJUC for more information.
-                                                    
-                                                    Also, you can use any metadata in the 
-                                                    restructured text files:
-                                                     * category: '%(category)s'
-                                                     * author: '%(author)s'
-                                                     * tags: '%(tags)s'
-                                                     * date: '%(date)s'
-
-                                                    Example usage:
-                                                     * '/%Y/%m/' it will be something like 
-                                                       '/2011/07/sample-post.html'.
-                                                     * '/%Y/%(category)s/' it will be something like
-                                                       '/2011/life/sample-post.html'.
+`ARTICLE_PERMALINK_STRUCTURE` (``''``)              Empty by default. Allows to render URLs in a
+                                                    particular way, see below.
 `AUTHOR`                                            Default author (put your name)
 `DATE_FORMATS` (``{}``)                             If you do manage multiple languages, you can
                                                     set the date formatting here.
@@ -93,11 +67,43 @@ Setting name (default value)                        what does it do?
                                                     on the output path "static". By default,
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
+`TIMEZONE` (Optional)                               The timezone used in the date information, to
+                                                    generate atom and rss feeds.
+                                                    Have a look at `the wikipedia page`_ for more 
+                                                    information
 ================================================    =====================================================
 
-
+.. _the wikipedia page: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 .. [1] Default is the system locale. Default is to delete the output directory.
 
+Article permalink structure
+---------------------------
+Allow to render articles sorted by date, in case you specify a format as
+specified in the example.  It follows the python datetime directives: 
+
+* %Y: Year with century as a decimal number.  
+* %m: Month as a decimal number [01,12].  
+* %d: Day of the month as a decimal number [01,31].
+
+Note: if you specify a datetime directive, it will be substituted using the
+date metadata field into the rest file. if the date is not specified, pelican
+will rely on the mtime of your file.
+
+Check the python datetime documentation at http://bit.ly/cNcJUC for more
+information.
+
+Also, you can use any metadata in the restructured text files: 
+
+* category: '%(category)s' 
+* author: '%(author)s' 
+* tags: '%(tags)s' 
+* date: '%(date)s'
+
+Example usage: 
+
+* '/%Y/%m/' it will be something like '/2011/07/sample-post.html'.  
+* '/%Y/%(category)s/' it will be something like '/2011/life/sample-post.html'.
+
 Feed settings
 =============
 

From 96b52a2283da12c11c0259b9f4eedd368b421254 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 18 Aug 2011 13:58:04 +0200
Subject: [PATCH 0430/2864] issue a warning in case no timezone is defined

---
 docs/settings.rst   | 19 +++++++++++++++----
 pelican/settings.py |  6 ++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d2d1ebbc..fdca2ca3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -67,13 +67,10 @@ Setting name (default value)                        what does it do?
                                                     on the output path "static". By default,
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
-`TIMEZONE` (Optional)                               The timezone used in the date information, to
+`TIMEZONE`                                          The timezone used in the date information, to
                                                     generate atom and rss feeds.
-                                                    Have a look at `the wikipedia page`_ for more 
-                                                    information
 ================================================    =====================================================
 
-.. _the wikipedia page: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 .. [1] Default is the system locale. Default is to delete the output directory.
 
 Article permalink structure
@@ -104,6 +101,20 @@ Example usage:
 * '/%Y/%m/' it will be something like '/2011/07/sample-post.html'.  
 * '/%Y/%(category)s/' it will be something like '/2011/life/sample-post.html'.
 
+Timezone
+--------
+
+If no timezone is defined, UTC is assumed. This means that the generated atom
+and rss feeds will have wrong date information if your locale is not UTC.
+
+Pelican issues a warning in case this setting is not defined, as it was not
+mandatory in old versions.
+
+Have a look at `the wikipedia page`_ to get a list of values to set your
+timezone.
+
+.. _the wikipedia page: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+
 Feed settings
 =============
 
diff --git a/pelican/settings.py b/pelican/settings.py
index e8c4fd21..c7ac35ff 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -83,5 +83,11 @@ def read_settings(filename):
     else:
         log.warn("LOCALE option doesn't contain a correct value")
 
+    if not 'TIMEZONE' in context:
+        log.warn("No timezone information specified in the settings. Assuming your "\
+                "timezone is UTC for feed generation. "\
+                "Check http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "\
+                "for more information")
+
     # set the locale
     return context

From eea6c7477d348e0a12fed89a7d38763c42621977 Mon Sep 17 00:00:00 2001
From: renhbo <renhbo@gmail.com>
Date: Fri, 19 Aug 2011 02:19:44 +0800
Subject: [PATCH 0431/2864] Fix an unicode error on Windows platform.

---
 pelican/contents.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index b7bc2502..d0859a96 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -3,6 +3,7 @@ from pelican.utils import slugify, truncate_html_words
 from pelican.log import *
 from pelican.settings import _DEFAULT_CONFIG
 from os import getenv
+from sys import platform, stdin
 
 class Page(object):
     """Represents a page
@@ -78,8 +79,11 @@ class Page(object):
                 self.date_format = settings['DEFAULT_DATE_FORMAT']
 
         if hasattr(self, 'date'):
-            self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf')
-
+            if platform == 'win32':
+                self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode(stdin.encoding)
+            else:
+                self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf')
+        
         # manage summary
         if not hasattr(self, 'summary'):
             self.summary = property(lambda self: truncate_html_words(self.content, 50)).__get__(self, Page)

From 396db8411cef9cfad53f140984df4a5294ab1801 Mon Sep 17 00:00:00 2001
From: renhbo <renhbo@gmail.com>
Date: Fri, 19 Aug 2011 22:12:17 +0800
Subject: [PATCH 0432/2864] A .bat wraper for pelican in Windows.

---
 bin/pelican.bat | 1 +
 1 file changed, 1 insertion(+)
 create mode 100755 bin/pelican.bat

diff --git a/bin/pelican.bat b/bin/pelican.bat
new file mode 100755
index 00000000..674e1fd7
--- /dev/null
+++ b/bin/pelican.bat
@@ -0,0 +1 @@
+@python "%~dpn0" %*

From e7168c1d18f66d66b3cda74d906821297c97d4e5 Mon Sep 17 00:00:00 2001
From: renhbo <renhbo@gmail.com>
Date: Fri, 19 Aug 2011 22:14:19 +0800
Subject: [PATCH 0433/2864] A .bat wrapper for pelican in Windows.

---
 tools/pelican-import.bat     | 1 +
 tools/pelican-quickstart.bat | 1 +
 tools/pelican-themes.bat     | 1 +
 3 files changed, 3 insertions(+)
 create mode 100755 tools/pelican-import.bat
 create mode 100755 tools/pelican-quickstart.bat
 create mode 100755 tools/pelican-themes.bat

diff --git a/tools/pelican-import.bat b/tools/pelican-import.bat
new file mode 100755
index 00000000..674e1fd7
--- /dev/null
+++ b/tools/pelican-import.bat
@@ -0,0 +1 @@
+@python "%~dpn0" %*
diff --git a/tools/pelican-quickstart.bat b/tools/pelican-quickstart.bat
new file mode 100755
index 00000000..674e1fd7
--- /dev/null
+++ b/tools/pelican-quickstart.bat
@@ -0,0 +1 @@
+@python "%~dpn0" %*
diff --git a/tools/pelican-themes.bat b/tools/pelican-themes.bat
new file mode 100755
index 00000000..674e1fd7
--- /dev/null
+++ b/tools/pelican-themes.bat
@@ -0,0 +1 @@
+@python "%~dpn0" %*

From af93f7683687b335863b89153e98c3eb6cd722be Mon Sep 17 00:00:00 2001
From: renhbo <renhbo@gmail.com>
Date: Fri, 19 Aug 2011 22:35:23 +0800
Subject: [PATCH 0434/2864] A wraper on .bat for pelican in Windows.

---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 4574fdd6..051e258f 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,9 @@ setup(
     packages = ['pelican'],
     include_package_data = True,
     install_requires = requires,
-    scripts = ['bin/pelican', 'tools/pelican-themes', 'tools/pelican-import', 'tools/pelican-quickstart'],
+    scripts = ['bin/pelican', 'tools/pelican-themes', 'tools/pelican-import', 'tools/pelican-quickstart',
+               'bin/pelican.bat', 'tools/pelican-themes.bat', 'tools/pelican-import.bat',
+               'tools/pelican-quickstart.bat'],
     classifiers = ['Development Status :: 5 - Production/Stable',
                    'Environment :: Console',
                    'License :: OSI Approved :: GNU Affero General Public License v3',

From 100d94cd12a9ddd06b060cf6e6a362f6a632b536 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 19 Aug 2011 23:01:01 +0200
Subject: [PATCH 0435/2864] add ghp-import features to push to github pages
 easily

---
 docs/index.rst           |  1 +
 docs/tips.rst            | 33 +++++++++++++++++++++++++++++++++
 tools/pelican-quickstart |  6 +++++-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 docs/tips.rst

diff --git a/docs/index.rst b/docs/index.rst
index 1e0a56f8..c2b4577d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -63,4 +63,5 @@ A french version of the documentation is available at :doc:`fr/index`.
    pelican-themes
    importer
    faq
+   tips
    contribute
diff --git a/docs/tips.rst b/docs/tips.rst
new file mode 100644
index 00000000..9ff7f9ce
--- /dev/null
+++ b/docs/tips.rst
@@ -0,0 +1,33 @@
+Tips
+####
+
+Here are some tips about pelican, which you might find useful.
+
+Publishing to github
+====================
+
+Github comes with an interesting "pages" feature: you can upload things there
+and it will be available directly from their servers. As pelican is a static
+file generator, we can take advantage of this.
+
+The excellent `ghp-import <https://github.com/davisp/ghp-import>`_ makes this
+eally easy. You would have to install it::
+
+    $ pip install ghp-import
+
+Then, considering a repository containing your articles, you would simply have
+to run pelican and upload the output to github::
+
+    $ pelican -s pelican.conf.py .
+    $ ghp-import output
+    $ git push origin gh-pages
+
+And that's it.
+
+If you want you can put that directly into a post commit hook, so each time you
+commit, your blog is up to date on github!
+
+Put the following into `.git/hooks/post-commit`::
+
+    pelican -s pelican.conf.py . && ghp-import output && git push origin
+    gh-pages
diff --git a/tools/pelican-quickstart b/tools/pelican-quickstart
index e1fb4eff..5d708038 100755
--- a/tools/pelican-quickstart
+++ b/tools/pelican-quickstart
@@ -55,7 +55,11 @@ ssh_upload: $$(OUTPUTDIR)/index.html
 ftp_upload: $$(OUTPUTDIR)/index.html
 \tlftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUT_DIR)/* $$(FTP_TARGET_DIR) ; quit"
 
-.PHONY: html help clean ftp_upload ssh_upload dropbox_upload
+github: $$(OUTPUTDIR)/index.html
+\tghp-import $$(OUTPUTDIR)
+\tgit push origin gh-pages
+
+.PHONY: html help clean ftp_upload ssh_upload dropbox_upload github
     ''',
 
     'pelican.conf.py': '''#!/usr/bin/env python

From 5b4e148a2e0c638da6b61dddbfd3886567762f0a Mon Sep 17 00:00:00 2001
From: Michael Yanovich <michael@yanovich.net>
Date: Sat, 20 Aug 2011 09:51:18 -0400
Subject: [PATCH 0436/2864] Updated pelican/generators.py to check if the
 folder exists before trying to create it. It will always generate an OSError
 if the folder already exists even if it has the appropriate permissions.

---
 pelican/generators.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 4f19828c..605bd6f7 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -392,11 +392,12 @@ class PdfGenerator(Generator):
         # since we write our own files
         info(u' Generating PDF files...')
         pdf_path = os.path.join(self.output_path, 'pdf')
-        try:
-            os.mkdir(pdf_path)
-        except OSError:
-            error("Couldn't create the pdf output folder in " + pdf_path)
-            pass
+        if not os.path.exists(pdf_path):
+            try:
+                os.mkdir(pdf_path)
+            except OSError:
+                error("Couldn't create the pdf output folder in " + pdf_path)
+                pass
 
         for article in self.context['articles']:
             self._create_pdf(article, pdf_path)

From fc3ca7ea0e0ff2c12731b0af7c88b822f0c3d1c6 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Mon, 22 Aug 2011 19:42:42 +0200
Subject: [PATCH 0437/2864] fixed aliased replacements were broken when using
 ARTICLE_PERMALINK_STRUCTURE

---
 pelican/generators.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 605bd6f7..f375011f 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -42,7 +42,7 @@ class Generator(object):
             ]),
             extensions=self.settings.get('JINJA_EXTENSIONS', []),
         )
-        debug('self._env.list_templates(): {0}'.format(self._env.list_templates())) 
+        debug('self._env.list_templates(): {0}'.format(self._env.list_templates()))
 
         # get custom Jinja filters from user settings
         custom_filters = self.settings.get('JINJA_FILTERS', {})
@@ -236,7 +236,7 @@ class ArticlesGenerator(Generator):
             add_to_url = u''
             if 'ARTICLE_PERMALINK_STRUCTURE' in self.settings:
                 article_permalink_structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
-                article_permalink_structure = article_permalink_structure.lstrip('/')
+                article_permalink_structure = article_permalink_structure.lstrip('/').replace('%(', "%%(")
 
                 # try to substitute any python datetime directive
                 add_to_url = article.date.strftime(article_permalink_structure)
@@ -280,7 +280,7 @@ class ArticlesGenerator(Generator):
 
         tags = map(itemgetter(1), tag_cloud)
         if tags:
-                max_count = max(tags)
+            max_count = max(tags)
         steps = self.settings.get('TAG_CLOUD_STEPS')
 
         # calculate word sizes
@@ -351,7 +351,7 @@ class StaticGenerator(Generator):
             final_path=None):
         """Copy all the paths from source to destination"""
         for path in paths:
-            copy(path, source, os.path.join(output_path, destination), final_path, 
+            copy(path, source, os.path.join(output_path, destination), final_path,
                     overwrite=True)
 
     def generate_output(self, writer):

From 67485be240edea075933b9c2349d308934e20988 Mon Sep 17 00:00:00 2001
From: Nicolas Steinmetz <nsteinmetz@gmail.com>
Date: Tue, 30 Aug 2011 15:11:30 +0300
Subject: [PATCH 0438/2864] Fix #164, by "slugifying" titles (which for
 generated filename is also better imho) + a few remplacement of ".rst" by the
 "ext" variable.

---
 tools/pelican-import | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/pelican-import b/tools/pelican-import
index 44f02fbd..64ce23f9 100755
--- a/tools/pelican-import
+++ b/tools/pelican-import
@@ -120,7 +120,7 @@ def dc2fields(file):
             content = content.replace('\\n', '')
             post_format = "html"
 
-        yield (post_title, content, post_url, post_creadt, author, categories, tags, post_format)
+        yield (post_title, content, slugify(post_title), post_creadt, author, categories, tags, post_format)
 
 
 def feed2fields(file):
@@ -175,7 +175,7 @@ def fields2pelican(fields, output_path, dircat=False):
         # option to put files in directories with categories names
         if dircat and (len(categories) == 1):
             catname = categories[0]
-            out_filename = os.path.join(output_path, catname, filename+'.rst')
+            out_filename = os.path.join(output_path, catname, filename+ext)
             if not os.path.isdir(os.path.join(output_path, catname)):
                 os.mkdir(os.path.join(output_path, catname))
         else:

From f337f5067bb4a99f18810ec175975d4953824bc3 Mon Sep 17 00:00:00 2001
From: Nicolas Steinmetz <nsteinmetz@gmail.com>
Date: Tue, 30 Aug 2011 16:37:59 +0300
Subject: [PATCH 0439/2864] Fix as in dotclear, format is not "markdown" but
 "wiki". So add an "or" statement.

---
 tools/pelican-import | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/pelican-import b/tools/pelican-import
index 44f02fbd..a85e55f3 100755
--- a/tools/pelican-import
+++ b/tools/pelican-import
@@ -113,7 +113,7 @@ def dc2fields(file):
         if cat_id:
             categories = [category_list[id].strip() for id in cat_id.split(',')]
 
-        if post_format == "markdown":
+        if (post_format == "markdown") or (post_format == "wiki"):
             content = post_excerpt + post_content
         else:
             content = post_excerpt_xhtml + post_content_xhtml
@@ -163,7 +163,7 @@ def build_markdown_header(title, date, author, categories, tags):
 
 def fields2pelican(fields, output_path, dircat=False):
     for title, content, filename, date, author, categories, tags, markup in fields:
-        if markup == "markdown":
+        if (markup == "markdown") or (markup == "wiki"):
             ext = '.md'
             header = build_markdown_header(title, date, author, categories, tags)
         else:

From de790b9e725f21c93cead0efd85933be46d08456 Mon Sep 17 00:00:00 2001
From: Nicolas Steinmetz <nsteinmetz@gmail.com>
Date: Tue, 30 Aug 2011 17:14:05 +0300
Subject: [PATCH 0440/2864] for the --dir-cat option, also slugify category's
 name to avoid encoding or spaces issues or ...

---
 tools/pelican-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pelican-import b/tools/pelican-import
index a85e55f3..be8a1a51 100755
--- a/tools/pelican-import
+++ b/tools/pelican-import
@@ -174,7 +174,7 @@ def fields2pelican(fields, output_path, dircat=False):
 
         # option to put files in directories with categories names
         if dircat and (len(categories) == 1):
-            catname = categories[0]
+            catname = slugify(categories[0])
             out_filename = os.path.join(output_path, catname, filename+'.rst')
             if not os.path.isdir(os.path.join(output_path, catname)):
                 os.mkdir(os.path.join(output_path, catname))

From 8f6da4fa7f5c5094c8a082d5ecc9e0c3589aa890 Mon Sep 17 00:00:00 2001
From: Nicolas Steinmetz <nsteinmetz@gmail.com>
Date: Tue, 30 Aug 2011 22:27:43 +0200
Subject: [PATCH 0441/2864] final fix for dotclear import

---
 tools/pelican-import | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/pelican-import b/tools/pelican-import
index be8a1a51..b8c9197c 100755
--- a/tools/pelican-import
+++ b/tools/pelican-import
@@ -113,14 +113,17 @@ def dc2fields(file):
         if cat_id:
             categories = [category_list[id].strip() for id in cat_id.split(',')]
 
-        if (post_format == "markdown") or (post_format == "wiki"):
+        """
+        Weird - dotclear2 at least does not use markdown ; so wonder about the use case on "markdown"
+        """
+        if post_format == "markdown":
             content = post_excerpt + post_content
         else:
             content = post_excerpt_xhtml + post_content_xhtml
             content = content.replace('\\n', '')
             post_format = "html"
 
-        yield (post_title, content, post_url, post_creadt, author, categories, tags, post_format)
+        yield (post_title, content, slugify(post_title), post_creadt, author, categories, tags, post_format)
 
 
 def feed2fields(file):
@@ -163,7 +166,7 @@ def build_markdown_header(title, date, author, categories, tags):
 
 def fields2pelican(fields, output_path, dircat=False):
     for title, content, filename, date, author, categories, tags, markup in fields:
-        if (markup == "markdown") or (markup == "wiki"):
+        if (markup == "markdown"):
             ext = '.md'
             header = build_markdown_header(title, date, author, categories, tags)
         else:
@@ -175,7 +178,7 @@ def fields2pelican(fields, output_path, dircat=False):
         # option to put files in directories with categories names
         if dircat and (len(categories) == 1):
             catname = slugify(categories[0])
-            out_filename = os.path.join(output_path, catname, filename+'.rst')
+            out_filename = os.path.join(output_path, catname, filename+ext)
             if not os.path.isdir(os.path.join(output_path, catname)):
                 os.mkdir(os.path.join(output_path, catname))
         else:
@@ -189,8 +192,7 @@ def fields2pelican(fields, output_path, dircat=False):
             with open(html_filename, 'w', encoding='utf-8') as fp:
                 fp.write(content)
 
-            os.system('pandoc --normalize --reference-links --from=html --to=rst -o "%s" "%s"' % (out_filename,
-                html_filename))
+            os.system('pandoc --normalize --reference-links --from=html --to=rst -o "%s" "%s"' % (out_filename, html_filename))
 
             os.remove(html_filename)
 

From a50e986f80e7e28e19c4d80a8721b3506064324c Mon Sep 17 00:00:00 2001
From: Nicolas Steinmetz <nsteinmetz@gmail.com>
Date: Tue, 30 Aug 2011 23:49:45 +0200
Subject: [PATCH 0442/2864] add tag import feature for dotclear import

---
 tools/pelican-import | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tools/pelican-import b/tools/pelican-import
index b8c9197c..a57ce25d 100755
--- a/tools/pelican-import
+++ b/tools/pelican-import
@@ -37,6 +37,8 @@ def wp2fields(xml):
 
 def dc2fields(file):
     """Opens a Dotclear export file, and yield pelican fields"""
+    from BeautifulSoup import BeautifulStoneSoup, BeautifulSoup
+
     in_cat = False
     in_post = False
     category_list = {}
@@ -100,7 +102,7 @@ def dc2fields(file):
         # post_open_tb = fields[24]
         # nb_comment = fields[25]
         # nb_trackback = fields[26]
-        # post_meta = fields[27]
+        post_meta = fields[27]
         # redirect_url = fields[28][:-1]
 
         # remove seconds
@@ -113,6 +115,22 @@ def dc2fields(file):
         if cat_id:
             categories = [category_list[id].strip() for id in cat_id.split(',')]
 
+        tag = post_meta.replace('{', '').replace('}', '').replace('a:1:s:3:\\"tag\\";a:', '').replace('a:0:', '')
+        # We handle only line that have tags syntax
+        if len(tag) > 1:
+            if int(tag[:1]) == 1:
+                newtag = tag.split('"')[1]
+                tags.append(unicode(BeautifulStoneSoup(newtag,convertEntities=BeautifulStoneSoup.HTML_ENTITIES )))
+            else:
+                i=1
+                j=1
+                while(i <= int(tag[:1])):
+                    newtag = tag.split('"')[j].replace('\\','')
+                    tags.append(unicode(BeautifulStoneSoup(newtag,convertEntities=BeautifulStoneSoup.HTML_ENTITIES )))
+                    i=i+1
+                    if j < int(tag[:1])*2:
+                        j=j+2
+
         """
         Weird - dotclear2 at least does not use markdown ; so wonder about the use case on "markdown"
         """

From c6c0ee76c2d47017a56ef8442d8616e2dd2fb9d7 Mon Sep 17 00:00:00 2001
From: Marco Milanesi <marcom@openquake.org>
Date: Tue, 6 Sep 2011 18:54:41 +0200
Subject: [PATCH 0443/2864] implemented github activity plugin

---
 pelican/plugins/github_activity.py | 27 +++++++++++++++++++++++++++
 pelican/signals.py                 |  1 +
 pelican/utils.py                   | 12 ++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 pelican/plugins/github_activity.py

diff --git a/pelican/plugins/github_activity.py b/pelican/plugins/github_activity.py
new file mode 100644
index 00000000..d279e616
--- /dev/null
+++ b/pelican/plugins/github_activity.py
@@ -0,0 +1,27 @@
+from pelican import signals
+from pelican.utils import singleton
+
+@singleton
+class GitHubActivity():
+    def __init__(self, generator):
+        try:
+            import feedparser
+            self.ga = feedparser.parse(
+                generator.settings['GITHUB_ACTIVITY_FEED'])
+        except ImportError:
+            raise Exception("unable to find feedparser")
+
+    def fetch(self):
+        return [activity['content'][0]['value'].strip()
+            for activity in self.ga['entries']]
+
+def add_github_activity(generator, metadata):
+    if 'GITHUB_ACTIVITY_FEED' in generator.settings.keys():
+
+        ga = GitHubActivity(generator)
+
+        ga_html_snippets = ga.fetch()
+        generator.context['github_activity'] = ga_html_snippets
+
+def register():
+    signals.article_generate_context.connect(add_github_activity)
diff --git a/pelican/signals.py b/pelican/signals.py
index f2bf4547..fb50252f 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -2,3 +2,4 @@ from blinker import signal
 
 initialized = signal('pelican_initialized')
 article_generate_context = signal('article_generate_context')
+github_activity = signal('github_activity')
diff --git a/pelican/utils.py b/pelican/utils.py
index 8e48c2e9..a67836ca 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -222,3 +222,15 @@ def files_changed(path, extensions):
         LAST_MTIME = mtime
         return True
     return False
+
+def singleton(cls):
+    """
+        Singleton decorator for multiple calls inside plugins
+        for an example see pelican/plugins/github_activity.py
+    """
+    instances = {}
+    def getinstance(*args, **kwargs):
+        if cls not in instances:
+            instances[cls] = cls(*args, **kwargs)
+        return instances[cls]
+    return getinstance

From 3743617d27f5ec5216432636433dc566a7f802c1 Mon Sep 17 00:00:00 2001
From: Marco Milanesi <marcom@openquake.org>
Date: Tue, 6 Sep 2011 18:56:44 +0200
Subject: [PATCH 0444/2864] removed spurious signal

---
 pelican/signals.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/signals.py b/pelican/signals.py
index fb50252f..f2bf4547 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -2,4 +2,3 @@ from blinker import signal
 
 initialized = signal('pelican_initialized')
 article_generate_context = signal('article_generate_context')
-github_activity = signal('github_activity')

From 575905ac53f1af696045f68e0ac469ecd2a2ba9a Mon Sep 17 00:00:00 2001
From: Marco Milanesi <kpanic@gnufunk.org>
Date: Tue, 6 Sep 2011 19:14:21 +0200
Subject: [PATCH 0445/2864] some commentary

copyright infos

some instructions on how to use the plugin
---
 pelican/plugins/github_activity.py | 35 ++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/pelican/plugins/github_activity.py b/pelican/plugins/github_activity.py
index d279e616..bbce2759 100644
--- a/pelican/plugins/github_activity.py
+++ b/pelican/plugins/github_activity.py
@@ -1,8 +1,32 @@
+# -*- coding: utf-8 -*-
+"""
+    Copyright (c) Marco Milanesi <kpanic@gnufunk.org>
+
+    A plugin to list your Github Activity
+    To enable it set in your pelican config file the GITHUB_ACTIVITY_FEED
+    parameter pointing to your github activity feed.
+
+    for example my personal activity feed is:
+
+        https://github.com/kpanic.atom
+
+    in your template just write a for in jinja2 syntax against the
+    github_activity variable.
+
+    github_activity is a list containing raw html from github so you can
+    include it directly in your template
+
+"""
+
 from pelican import signals
 from pelican.utils import singleton
 
+
 @singleton
 class GitHubActivity():
+    """
+        A class created to fetch github activity with feedparser
+    """
     def __init__(self, generator):
         try:
             import feedparser
@@ -12,10 +36,17 @@ class GitHubActivity():
             raise Exception("unable to find feedparser")
 
     def fetch(self):
+        """
+            returns a list of html snippets fetched from github actitivy feed
+        """
         return [activity['content'][0]['value'].strip()
             for activity in self.ga['entries']]
 
+
 def add_github_activity(generator, metadata):
+    """
+        registered handler for the github activity plugin
+    """
     if 'GITHUB_ACTIVITY_FEED' in generator.settings.keys():
 
         ga = GitHubActivity(generator)
@@ -23,5 +54,9 @@ def add_github_activity(generator, metadata):
         ga_html_snippets = ga.fetch()
         generator.context['github_activity'] = ga_html_snippets
 
+
 def register():
+    """
+        Plugin registration
+    """
     signals.article_generate_context.connect(add_github_activity)

From 48d7df72f1a0d9c405cac85b662a70c6c14dc238 Mon Sep 17 00:00:00 2001
From: Marco Milanesi <kpanic@gnufunk.org>
Date: Wed, 7 Sep 2011 17:08:28 +0200
Subject: [PATCH 0446/2864] refactored code and introduced a new signal in
 ArticlesGenerator __init__

---
 pelican/generators.py              |  1 +
 pelican/plugins/github_activity.py | 26 ++++++++++++++++----------
 pelican/signals.py                 |  1 +
 pelican/utils.py                   | 12 ------------
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 38fa9da7..9baf240e 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -101,6 +101,7 @@ class ArticlesGenerator(Generator):
         self.categories = defaultdict(list)
         super(ArticlesGenerator, self).__init__(*args, **kwargs)
         self.drafts = []
+        signals.article_generator_init.send(self)
 
     def generate_feeds(self, writer):
         """Generate the feeds from the current context, and output files."""
diff --git a/pelican/plugins/github_activity.py b/pelican/plugins/github_activity.py
index bbce2759..ba6cd70f 100644
--- a/pelican/plugins/github_activity.py
+++ b/pelican/plugins/github_activity.py
@@ -19,10 +19,8 @@
 """
 
 from pelican import signals
-from pelican.utils import singleton
 
 
-@singleton
 class GitHubActivity():
     """
         A class created to fetch github activity with feedparser
@@ -30,7 +28,7 @@ class GitHubActivity():
     def __init__(self, generator):
         try:
             import feedparser
-            self.ga = feedparser.parse(
+            self.activities = feedparser.parse(
                 generator.settings['GITHUB_ACTIVITY_FEED'])
         except ImportError:
             raise Exception("unable to find feedparser")
@@ -40,23 +38,31 @@ class GitHubActivity():
             returns a list of html snippets fetched from github actitivy feed
         """
         return [activity['content'][0]['value'].strip()
-            for activity in self.ga['entries']]
+            for activity in self.activities['entries']]
 
 
-def add_github_activity(generator, metadata):
+def fetch_github_activity(gen, metadata):
     """
         registered handler for the github activity plugin
+        it puts in generator.context the html needed to be displayed on a
+        template
     """
-    if 'GITHUB_ACTIVITY_FEED' in generator.settings.keys():
 
-        ga = GitHubActivity(generator)
+    if 'GITHUB_ACTIVITY_FEED' in gen.settings.keys():
+        gen.context['github_activity'] = gen.plugin_instance.fetch()
 
-        ga_html_snippets = ga.fetch()
-        generator.context['github_activity'] = ga_html_snippets
+
+def feed_parser_initialization(generator):
+    """
+        Initialization of feed parser
+    """
+
+    generator.plugin_instance = GitHubActivity(generator)
 
 
 def register():
     """
         Plugin registration
     """
-    signals.article_generate_context.connect(add_github_activity)
+    signals.article_generator_init.connect(feed_parser_initialization)
+    signals.article_generate_context.connect(fetch_github_activity)
diff --git a/pelican/signals.py b/pelican/signals.py
index f2bf4547..b1c35794 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -2,3 +2,4 @@ from blinker import signal
 
 initialized = signal('pelican_initialized')
 article_generate_context = signal('article_generate_context')
+article_generator_init = signal('article_generator_init')
diff --git a/pelican/utils.py b/pelican/utils.py
index a67836ca..8e48c2e9 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -222,15 +222,3 @@ def files_changed(path, extensions):
         LAST_MTIME = mtime
         return True
     return False
-
-def singleton(cls):
-    """
-        Singleton decorator for multiple calls inside plugins
-        for an example see pelican/plugins/github_activity.py
-    """
-    instances = {}
-    def getinstance(*args, **kwargs):
-        if cls not in instances:
-            instances[cls] = cls(*args, **kwargs)
-        return instances[cls]
-    return getinstance

From 948ef452ca7d6a02175674b1169fa9c700f72c28 Mon Sep 17 00:00:00 2001
From: Marco Milanesi <kpanic@gnufunk.org>
Date: Wed, 7 Sep 2011 18:55:37 +0200
Subject: [PATCH 0447/2864] documentation for the github activity plugin

---
 docs/plugins.rst | 45 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 6763f5ef..42ecd656 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -52,12 +52,13 @@ List of signals
 
 Here is the list of currently implemented signals:
 
-=========================   ============================   =====================
+=========================   ============================   =========================================
 Signal                      Arguments                      Description
-=========================   ============================   =====================
+=========================   ============================   =========================================
 initialized                 pelican object
 article_generate_context    article_generator, metadata
-=========================   ============================   =====================
+article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
+=========================   ============================   =========================================
 
 The list is currently small, don't hesitate to add signals and make a pull
 request if you need them!
@@ -73,3 +74,41 @@ Tag cloud
 
 Translation
 -----------
+
+Github Activity
+_______________
+
+This plugins introduces a new depencency, you have to install feedparser 
+if you want to use it, these are some ways to do it::
+
+     apt-get install python-feedparser # on debian based distributions like ubuntu
+     sudo easy_install feedparser
+     sudo pip install feedparser
+
+To enable it set in your pelican config file the GITHUB_ACTIVITY_FEED
+parameter pointing to your github activity feed.
+
+for example my personal activity feed is::
+
+     https://github.com/kpanic.atom
+
+and the config line could be::
+
+     GITHUB_ACTIVITY_FEED = 'https://github.com/kpanic.atom'
+
+in your template just write a for in jinja2 syntax against the
+github_activity variable, like for example::
+
+     {% if GITHUB_ACTIVITY_FEED %}
+             <div class="social">
+                     <h2>Github Activity</h2>
+                     {% for activity in github_activity %}
+                             {{ activity }}
+                     {% endfor %}
+             </div><!-- /.social -->
+     {% endif %}
+
+
+github_activity is a list containing raw html from github so you can include it
+directly in your (for example base.html) template and style it in a way that
+your prefer using your css skills

From 87c22dc7acc1a64d05ca207a2ef03bda30a872d7 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sat, 10 Sep 2011 11:37:19 +0200
Subject: [PATCH 0448/2864] Pelican exits 1 or Exception.exitcode if an
 exception is raised

---
 pelican/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index b68d6aa9..5e919780 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -154,6 +154,8 @@ def main():
     except Exception, e:
         log.critical(unicode(e))
 
+        exit(getattr(e, 'exitcode', 1))
+
 
 if __name__ == '__main__':
     main()

From 73d9ab47630c3b17957be4d1aaf302d93ae9afdc Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Fri, 30 Sep 2011 16:25:32 +0200
Subject: [PATCH 0449/2864] Tracebacks are shown in debug mode

---
 pelican/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 5e919780..745b1fbe 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -154,7 +154,10 @@ def main():
     except Exception, e:
         log.critical(unicode(e))
 
-        exit(getattr(e, 'exitcode', 1))
+        if (args.verbosity == log.DEBUG):
+            raise
+        else:
+            exit(getattr(e, 'exitcode', 1))
 
 
 if __name__ == '__main__':

From 358e92cf0444e842cd7f5048b83b4835949cef6e Mon Sep 17 00:00:00 2001
From: Nicolas Steinmetz <nsteinmetz@gmail.com>
Date: Fri, 30 Sep 2011 22:48:16 +0200
Subject: [PATCH 0450/2864] Clean dot clear import

---
 tools/pelican-import | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/pelican-import b/tools/pelican-import
index a57ce25d..4392d9ff 100755
--- a/tools/pelican-import
+++ b/tools/pelican-import
@@ -115,8 +115,8 @@ def dc2fields(file):
         if cat_id:
             categories = [category_list[id].strip() for id in cat_id.split(',')]
 
+        # Get tags related to a post
         tag = post_meta.replace('{', '').replace('}', '').replace('a:1:s:3:\\"tag\\";a:', '').replace('a:0:', '')
-        # We handle only line that have tags syntax
         if len(tag) > 1:
             if int(tag[:1]) == 1:
                 newtag = tag.split('"')[1]
@@ -132,7 +132,8 @@ def dc2fields(file):
                         j=j+2
 
         """
-        Weird - dotclear2 at least does not use markdown ; so wonder about the use case on "markdown"
+        dotclear2 does not use markdown by default unless you use the markdown plugin 
+        Ref: http://plugins.dotaddict.org/dc2/details/formatting-markdown
         """
         if post_format == "markdown":
             content = post_excerpt + post_content

From 5a993de4002cfc83168d5a902fd8b25cef0a2251 Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@dsi.unimi.it>
Date: Mon, 3 Oct 2011 16:11:42 +0200
Subject: [PATCH 0451/2864] Relativize URLs in summary as we do for content

---
 pelican/contents.py | 13 +++++++++++--
 pelican/writers.py  | 20 +++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index d0859a96..4f72f13a 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -85,8 +85,8 @@ class Page(object):
                 self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf')
         
         # manage summary
-        if not hasattr(self, 'summary'):
-            self.summary = property(lambda self: truncate_html_words(self.content, 50)).__get__(self, Page)
+        if not hasattr(self, '_summary'):
+            self._summary = property(lambda self: truncate_html_words(self.content, 50)).__get__(self, Page)
 
         # manage status
         if not hasattr(self, 'status'):
@@ -106,6 +106,15 @@ class Page(object):
             content = self._content
         return content
 
+    @property
+    def summary(self):
+        if hasattr(self, "_get_summary"):
+            summary = self._get_summary()
+        else:
+            summary = self._summary
+        return summary
+
+
 
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')
diff --git a/pelican/writers.py b/pelican/writers.py
index 4dfc1ba6..c57ae299 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -16,7 +16,8 @@ class Writer(object):
 
     def __init__(self, output_path, settings=None):
         self.output_path = output_path
-        self.reminder = dict()
+        self.reminder_content = dict()
+        self.reminder_summary = dict()
         self.settings = settings or {}
 
     def _create_new_feed(self, feed_type, context):
@@ -200,11 +201,20 @@ class Writer(object):
                 self.update_context_contents(name, item)
 
             # if it is a content, patch it
-            elif hasattr(item, '_content'):
-                relative_path = get_relative_path(name)
-
-                paths = self.reminder.setdefault(item, [])
+            else:
+                
+                if hasattr(item, '_content'):
+                    relative_path = get_relative_path(name)
+                paths = self.reminder_content.setdefault(item, [])
                 if relative_path not in paths:
                     paths.append(relative_path)
                     setattr(item, "_get_content",
                             partial(_update_content, name, item))
+                            
+                if hasattr(item, '_summary'):
+                    relative_path = get_relative_path(name)
+                paths = self.reminder_summary.setdefault(item, [])
+                if relative_path not in paths:
+                    paths.append(relative_path)
+                    setattr(item, "_get_summary",
+                            partial(_update_content, name, item))

From 8b36f90db9f76264fdfeb260b137066266f9fa71 Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@dsi.unimi.it>
Date: Tue, 4 Oct 2011 07:31:21 +0200
Subject: [PATCH 0452/2864] Revert "Relativize URLs in summary as we do for
 content"

This reverts commit 5a993de4002cfc83168d5a902fd8b25cef0a2251.
---
 pelican/contents.py | 13 ++-----------
 pelican/writers.py  | 20 +++++---------------
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 4f72f13a..d0859a96 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -85,8 +85,8 @@ class Page(object):
                 self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf')
         
         # manage summary
-        if not hasattr(self, '_summary'):
-            self._summary = property(lambda self: truncate_html_words(self.content, 50)).__get__(self, Page)
+        if not hasattr(self, 'summary'):
+            self.summary = property(lambda self: truncate_html_words(self.content, 50)).__get__(self, Page)
 
         # manage status
         if not hasattr(self, 'status'):
@@ -106,15 +106,6 @@ class Page(object):
             content = self._content
         return content
 
-    @property
-    def summary(self):
-        if hasattr(self, "_get_summary"):
-            summary = self._get_summary()
-        else:
-            summary = self._summary
-        return summary
-
-
 
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')
diff --git a/pelican/writers.py b/pelican/writers.py
index c57ae299..4dfc1ba6 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -16,8 +16,7 @@ class Writer(object):
 
     def __init__(self, output_path, settings=None):
         self.output_path = output_path
-        self.reminder_content = dict()
-        self.reminder_summary = dict()
+        self.reminder = dict()
         self.settings = settings or {}
 
     def _create_new_feed(self, feed_type, context):
@@ -201,20 +200,11 @@ class Writer(object):
                 self.update_context_contents(name, item)
 
             # if it is a content, patch it
-            else:
-                
-                if hasattr(item, '_content'):
-                    relative_path = get_relative_path(name)
-                paths = self.reminder_content.setdefault(item, [])
+            elif hasattr(item, '_content'):
+                relative_path = get_relative_path(name)
+
+                paths = self.reminder.setdefault(item, [])
                 if relative_path not in paths:
                     paths.append(relative_path)
                     setattr(item, "_get_content",
                             partial(_update_content, name, item))
-                            
-                if hasattr(item, '_summary'):
-                    relative_path = get_relative_path(name)
-                paths = self.reminder_summary.setdefault(item, [])
-                if relative_path not in paths:
-                    paths.append(relative_path)
-                    setattr(item, "_get_summary",
-                            partial(_update_content, name, item))

From 5bcc56fed8896a02640faf6f02e6f72bcb115c35 Mon Sep 17 00:00:00 2001
From: Massimo Santini <santini@dsi.unimi.it>
Date: Tue, 4 Oct 2011 07:43:26 +0200
Subject: [PATCH 0453/2864] elativize URLs in summary as we do for content
 (this time by rewriting summary as a property to defer the access to content
 when URLs in it have been relativized by the writer).

---
 pelican/contents.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index d0859a96..eb9378ba 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -84,10 +84,6 @@ class Page(object):
             else:
                 self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf')
         
-        # manage summary
-        if not hasattr(self, 'summary'):
-            self.summary = property(lambda self: truncate_html_words(self.content, 50)).__get__(self, Page)
-
         # manage status
         if not hasattr(self, 'status'):
             self.status = settings['DEFAULT_STATUS']
@@ -106,6 +102,9 @@ class Page(object):
             content = self._content
         return content
 
+    @property
+    def summary(self):
+        return truncate_html_words(self.content, 50)
 
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')

From 3bdb1eae0bfc94b54224b5c5a55d8aeac988ac93 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Fri, 14 Oct 2011 17:21:03 +0200
Subject: [PATCH 0454/2864] Pelican no more use ANSI codes on Windows (CMD.exe
 don't support it)

---
 pelican/log.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/log.py b/pelican/log.py
index ac4420ba..b7167dfc 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -66,7 +66,8 @@ class DummyFormatter(object):
     """
 
     def __new__(cls, *args, **kwargs):
-        if os.isatty(sys.stdout.fileno()): # thanks to http://stackoverflow.com/questions/2086961/how-can-i-determine-if-a-python-script-is-executed-from-crontab/2087031#2087031
+        if os.isatty(sys.stdout.fileno())\
+           and not sys.platform.startswith('win'): 
             return ANSIFormatter(*args, **kwargs)
         else:
             return TextFormatter( *args, **kwargs)

From 83d59d6b93a9300572c5f1adddca524baba5cb43 Mon Sep 17 00:00:00 2001
From: Marco Milanesi <kpanic@gnufunk.org>
Date: Tue, 18 Oct 2011 22:21:43 +0200
Subject: [PATCH 0455/2864] revised github activity to adapt it to new github
 atom feed changes

---
 pelican/plugins/github_activity.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pelican/plugins/github_activity.py b/pelican/plugins/github_activity.py
index ba6cd70f..f2ba1da7 100644
--- a/pelican/plugins/github_activity.py
+++ b/pelican/plugins/github_activity.py
@@ -13,9 +13,20 @@
     in your template just write a for in jinja2 syntax against the
     github_activity variable.
 
-    github_activity is a list containing raw html from github so you can
-    include it directly in your template
+    i.e.
 
+        <div class="social">
+                <h2>Github Activity</h2>
+                <ul>
+
+                {% for entry in github_activity %}
+                    <li><b>{{ entry[0] }}</b><br /> {{ entry[1] }}</li>
+                {% endfor %}
+                </ul>
+        </div><!-- /.github_activity -->
+
+    github_activity is a list containing a list. The first element is the title
+    and the second element is the raw html from github
 """
 
 from pelican import signals
@@ -31,14 +42,20 @@ class GitHubActivity():
             self.activities = feedparser.parse(
                 generator.settings['GITHUB_ACTIVITY_FEED'])
         except ImportError:
-            raise Exception("unable to find feedparser")
+            raise Exception("Unable to find feedparser")
 
     def fetch(self):
         """
             returns a list of html snippets fetched from github actitivy feed
         """
-        return [activity['content'][0]['value'].strip()
-            for activity in self.activities['entries']]
+
+        entries = []
+        for activity in self.activities['entries']:
+            entries.append(
+                    [element for element in [activity['title'],
+                        activity['content'][0]['value']]])
+
+        return entries
 
 
 def fetch_github_activity(gen, metadata):

From 462e637e69e46318411b53eac6d237c8ef498542 Mon Sep 17 00:00:00 2001
From: Marco Milanesi <kpanic@gnufunk.org>
Date: Wed, 19 Oct 2011 11:57:37 +0200
Subject: [PATCH 0456/2864] updated doc

---
 docs/plugins.rst | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 42ecd656..3bf7c532 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -100,15 +100,20 @@ in your template just write a for in jinja2 syntax against the
 github_activity variable, like for example::
 
      {% if GITHUB_ACTIVITY_FEED %}
-             <div class="social">
-                     <h2>Github Activity</h2>
-                     {% for activity in github_activity %}
-                             {{ activity }}
-                     {% endfor %}
-             </div><!-- /.social -->
+        <div class="social">
+                <h2>Github Activity</h2>
+                <ul>
+
+                {% for entry in github_activity %}
+                    <li><b>{{ entry[0] }}</b><br /> {{ entry[1] }}</li>
+                {% endfor %}
+                </ul>
+        </div><!-- /.github_activity -->
      {% endif %}
 
 
-github_activity is a list containing raw html from github so you can include it
-directly in your (for example base.html) template and style it in a way that
-your prefer using your css skills
+
+github_activity is a list containing a list. The first element is the title and
+the second element is the raw html from github so you can include it directly
+in your (for example base.html) template and style it in a way that your prefer
+using your css skills

From ed954ee839b7563894d0c3990ca886bae25a3111 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sun, 23 Oct 2011 19:04:34 +0200
Subject: [PATCH 0457/2864] The .bat files are no longer installed in other
 platforms than Windows

---
 setup.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 67dce1ec..510a6855 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 import sys
+import platform
 
 VERSION = "2.7.2" # find a better way to do so.
 
@@ -8,6 +9,14 @@ requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'pytz']
 if sys.version_info < (2,7):
     requires.append('argparse')
 
+scripts = ['bin/pelican', 'tools/pelican-themes', 'tools/pelican-import', 'tools/pelican-quickstart']
+
+if sys.platform.startswith('win'):
+    scripts += [
+        'bin/pelican.bat', 'tools/pelican-themes.bat', 
+        'tools/pelican-import.bat', 'tools/pelican-quickstart.bat'
+    ]
+
 setup(
     name = "pelican",
     version = VERSION,
@@ -19,9 +28,7 @@ setup(
     packages = ['pelican'],
     include_package_data = True,
     install_requires = requires,
-    scripts = ['bin/pelican', 'tools/pelican-themes', 'tools/pelican-import', 'tools/pelican-quickstart',
-               'bin/pelican.bat', 'tools/pelican-themes.bat', 'tools/pelican-import.bat',
-               'tools/pelican-quickstart.bat'],
+    scripts = scripts,
     classifiers = ['Development Status :: 5 - Production/Stable',
                    'Environment :: Console',
                    'License :: OSI Approved :: GNU Affero General Public License v3',

From 2d5dd70e857eaa09875103232a12acc369fbe629 Mon Sep 17 00:00:00 2001
From: Ranjhith Kalisamy <ranjhith.kumar@gmail.com>
Date: Mon, 24 Oct 2011 00:19:52 +0530
Subject: [PATCH 0458/2864] In import script, add support to output posts in
 markdown format

---
 tools/pelican-import | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/tools/pelican-import b/tools/pelican-import
index 4392d9ff..1c84511f 100755
--- a/tools/pelican-import
+++ b/tools/pelican-import
@@ -183,12 +183,13 @@ def build_markdown_header(title, date, author, categories, tags):
     header += '\n'
     return header
 
-def fields2pelican(fields, output_path, dircat=False):
-    for title, content, filename, date, author, categories, tags, markup in fields:
-        if (markup == "markdown"):
+def fields2pelican(fields, out_markup, output_path, dircat=False):
+    for title, content, filename, date, author, categories, tags, in_markup in fields:
+        if (in_markup == "markdown") or (out_markup == "markdown") :
             ext = '.md'
             header = build_markdown_header(title, date, author, categories, tags)
         else:
+            out_markup = "rst"
             ext = '.rst'
             header = build_header(title, date, author, categories, tags)
 
@@ -205,24 +206,31 @@ def fields2pelican(fields, output_path, dircat=False):
 
         print out_filename
 
-        if markup == "html":
+        if in_markup == "html":
             html_filename = os.path.join(output_path, filename+'.html')
 
             with open(html_filename, 'w', encoding='utf-8') as fp:
+                # Replace simple newlines with <br />+newline so that the HTML file
+                # represents the original post more accurately
+                content = content.replace("\n", "<br />\n")
                 fp.write(content)
 
-            os.system('pandoc --normalize --reference-links --from=html --to=rst -o "%s" "%s"' % (out_filename, html_filename))
+            os.system('pandoc --normalize --reference-links --from=html --to=%s -o "%s" "%s"' % (out_markup, out_filename, html_filename))
 
-            os.remove(html_filename)
+            #os.remove(html_filename)
 
             with open(out_filename, 'r', encoding='utf-8') as fs:
                 content = fs.read()
+                if out_markup == "markdown":
+                    # In markdown, to insert a <br />, end a line with two or more spaces & then a end-of-line
+                    content = content.replace("\\\n ", "  \n")
+                    content = content.replace("\\\n", "  \n")
 
         with open(out_filename, 'w', encoding='utf-8') as fs:
             fs.write(header + content)
 
 
-def main(input_type, input, output_path, dircat=False):
+def main(input_type, input, out_markup, output_path, dircat=False):
     if input_type == 'wordpress':
         fields = wp2fields(input)
     elif input_type == 'dotclear':
@@ -230,7 +238,7 @@ def main(input_type, input, output_path, dircat=False):
     elif input_type == 'feed':
         fields = feed2fields(input)
 
-    fields2pelican(fields, output_path, dircat=dircat)
+    fields2pelican(fields, out_markup, output_path, dircat=dircat)
 
 
 if __name__ == '__main__':
@@ -247,6 +255,8 @@ if __name__ == '__main__':
             help='Feed to parse')
     parser.add_argument('-o', '--output', dest='output', default='output',
             help='Output path')
+    parser.add_argument('-m', '--markup', dest='markup', default='rst',
+            help='Output markup format (supports rst & markdown)')
     parser.add_argument('--dir-cat', action='store_true', dest='dircat',
             help='Put files in directories with categories name')
     args = parser.parse_args()
@@ -261,4 +271,4 @@ if __name__ == '__main__':
     else:
         print "you must provide either --wpfile, --dotclear or --feed options"
         exit()
-    main(input_type, args.input, args.output, dircat=args.dircat)
+    main(input_type, args.input, args.markup, args.output, dircat=args.dircat)

From 3192cf6e37b4d649cc6d8f4051166c2bcb162070 Mon Sep 17 00:00:00 2001
From: Ranjhith Kalisamy <ranjhith.kumar@gmail.com>
Date: Mon, 24 Oct 2011 00:30:58 +0530
Subject: [PATCH 0459/2864] Create output folder if doesn't exist

---
 tools/pelican-import | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/pelican-import b/tools/pelican-import
index 1c84511f..084d966e 100755
--- a/tools/pelican-import
+++ b/tools/pelican-import
@@ -271,4 +271,12 @@ if __name__ == '__main__':
     else:
         print "you must provide either --wpfile, --dotclear or --feed options"
         exit()
+
+    if not os.path.exists(args.output):
+        try:
+            os.mkdir(args.output)
+        except OSError:
+            error("Couldn't create the output folder: " + args.output)
+            exit()
+
     main(input_type, args.input, args.markup, args.output, dircat=args.dircat)

From 0b6896a0ab2866ce9a80deb69ee0677f0d178f0a Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Tue, 25 Oct 2011 18:31:17 +0200
Subject: [PATCH 0460/2864] Adding a summary no more make Pelican crashes

Setting pelican.readers.Article.summary was impossible and raised an
exception because pelican.readers.Article.summary was a @property
---
 pelican/contents.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index eb9378ba..08195c8c 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -88,6 +88,10 @@ class Page(object):
         if not hasattr(self, 'status'):
             self.status = settings['DEFAULT_STATUS']
 
+        # set summary
+        if not hasattr(self, 'summary'):
+            self.summary = truncate_html_words(self.content, 50)
+
     def check_properties(self):
         """test that each mandatory property is set."""
         for prop in self.mandatory_properties:
@@ -102,9 +106,6 @@ class Page(object):
             content = self._content
         return content
 
-    @property
-    def summary(self):
-        return truncate_html_words(self.content, 50)
 
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')

From b9157df1a3f30adf32d03003a42295dfc665fa4d Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sat, 29 Oct 2011 12:57:15 +0200
Subject: [PATCH 0461/2864] Fixes the bug re-introduced in 0b6896a. Thank to
 @mapio for noticing the problem :-)

---
 pelican/contents.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pelican/contents.py b/pelican/contents.py
index 08195c8c..ddcb37b6 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -106,6 +106,18 @@ class Page(object):
             content = self._content
         return content
 
+    def _get_summary(self):
+        """Returns the summary of an article, based on to the content"""
+        return truncate_html_words(self.content, 50)
+
+    def _set_summary(self, summary):
+        """Dummy function"""
+        pass
+
+    summary = property(_get_summary, _set_summary, \
+                       "Summary of the article. Based on the content. Can't be set")
+
+
 
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')

From f248a811076bdf5facfbf75de49e52fef0d6315a Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sat, 29 Oct 2011 18:04:59 +0200
Subject: [PATCH 0462/2864] Plugins are now installed by setuptools

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 18db914f..071d3523 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup(
     author_email = 'alexis@notmyidea.org',
     description = "A tool to generate a static blog, with restructured text (or markdown) input files.",
     long_description=open('README.rst').read(),
-    packages = ['pelican'],
+    packages = ['pelican', 'pelican.plugins'],
     include_package_data = True,
     install_requires = requires,
     scripts = ['bin/pelican', 'tools/pelican-themes'],

From b735f5fa49643bbf87aa58dca53b2e2830bbc0d7 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sun, 30 Oct 2011 14:10:50 +0100
Subject: [PATCH 0463/2864] Plugin loading is logged in debug mode (-D)

---
 pelican/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 7121318e..5b84685d 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -53,8 +53,10 @@ class Pelican(object):
         for plugin in self.plugins:
             # if it's a string, then import it
             if isinstance(plugin, str):
+                log.debug("Loading plugin `{0}' ...".format(plugin))
                 plugin = __import__(plugin, globals(), locals(), 'module')
 
+            log.debug("Registering plugin `{0}' ...".format(plugin.__name__))
             plugin.register()
 
     def run(self):

From c522ce7fbcb37a8ca141c6b2604ba85bfef00125 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Sun, 30 Oct 2011 14:14:10 +0100
Subject: [PATCH 0464/2864] New plugin that provides an ..html:: directive for
 reStructuredText

---
 pelican/plugins/html_rst_directive.py | 63 +++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pelican/plugins/html_rst_directive.py

diff --git a/pelican/plugins/html_rst_directive.py b/pelican/plugins/html_rst_directive.py
new file mode 100644
index 00000000..d14000a0
--- /dev/null
+++ b/pelican/plugins/html_rst_directive.py
@@ -0,0 +1,63 @@
+from docutils import nodes
+from docutils.parsers.rst import directives, Directive
+from pelican import log
+
+"""
+HTML tags for reStructuredText
+==============================
+
+Directives
+----------
+
+.. html::
+    
+    (HTML code)
+
+
+Example
+-------
+
+A search engine:
+
+.. html::
+   <form action="http://seeks.fr/search" method="GET">
+     <input type="text" value="Pelican v2" title="Search" maxlength="2048" name="q" autocomplete="on" />
+     <input type="hidden" name="lang" value="en" />
+     <input type="submit" value="Seeks !" id="search_button" />
+   </form>
+   
+
+A contact form:
+
+.. html::
+   
+    <form method="GET" action="mailto:some email">
+      <p>
+        <input type="text" placeholder="Subject" name="subject">
+        <br />
+        <textarea name="body" placeholder="Message">
+        </textarea>
+        <br />
+        <input type="reset"><input type="submit">
+      </p>
+    </form>
+
+"""
+
+
+class RawHtml(Directive):
+    required_arguments = 0
+    optional_arguments = 0
+    final_argument_whitespace = True
+    has_content = True
+
+    def run(self):
+        html = u' '.join(self.content)
+        node = nodes.raw('', html, format='html')
+        return [node]
+
+
+
+def register():
+    directives.register_directive('html', RawHtml)
+

From 5b7cd45668b5a29484710604d41ce1463d234d68 Mon Sep 17 00:00:00 2001
From: Ranjhith Kalisamy <ranjhith.kumar@gmail.com>
Date: Sun, 30 Oct 2011 23:04:24 +0530
Subject: [PATCH 0465/2864] The intermediate .html file has to be removed
 during the import process.

---
 tools/pelican-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pelican-import b/tools/pelican-import
index 084d966e..1590e956 100755
--- a/tools/pelican-import
+++ b/tools/pelican-import
@@ -217,7 +217,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False):
 
             os.system('pandoc --normalize --reference-links --from=html --to=%s -o "%s" "%s"' % (out_markup, out_filename, html_filename))
 
-            #os.remove(html_filename)
+            os.remove(html_filename)
 
             with open(out_filename, 'r', encoding='utf-8') as fs:
                 content = fs.read()

From 2911a38f40768adadaca5d23125105a84a4b3eab Mon Sep 17 00:00:00 2001
From: Christophe Chauvet <christophe.chauvet@gmail.com>
Date: Sun, 6 Nov 2011 13:16:47 +0100
Subject: [PATCH 0466/2864] Issue #181, when parse tags

---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index f62d35a9..ee3ecd2c 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -19,7 +19,7 @@ from pelican.utils import get_date, open
 
 
 _METADATA_PROCESSORS = {
-    'tags': lambda x: map(unicode.strip, x.split(',')),
+    'tags': lambda x: map(unicode.strip, unicode(x).split(',')),
     'date': lambda x: get_date(x),
     'status': unicode.strip,
 }

From 4144c8d76f473fc062082fc6529fb418f7dcf5f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88kull=20So=CC=81lberg=20Au=C3=B0unsson?=
 <jokull@solberg.is>
Date: Wed, 23 Nov 2011 20:35:18 +0000
Subject: [PATCH 0467/2864] More forgiving date strings.

---
 pelican/utils.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index cd7507ee..27159a89 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -17,8 +17,12 @@ def get_date(string):
 
     If no format matches the given date, raise a ValuEerror
     """
-    formats = ['%Y-%m-%d %H:%M', '%Y/%m/%d %H:%M', '%Y-%m-%d', '%Y/%m/%d',
-               '%d/%m/%Y', '%d.%m.%Y', '%d.%m.%Y %H:%M', '%Y-%m-%d %H:%M:%S']
+    string = re.sub(' +', ' ', string)
+    formats = ['%Y-%m-%d %H:%M', '%Y/%m/%d %H:%M', 
+               '%Y-%m-%d', '%Y/%m/%d',
+               '%d-%m-%Y', '%Y-%d-%m', # Weird ones
+               '%d/%m/%Y', '%d.%m.%Y', 
+               '%d.%m.%Y %H:%M', '%Y-%m-%d %H:%M:%S']
     for date_format in formats:
         try:
             return datetime.strptime(string, date_format)

From 499a67912fbc40a9402803881f6250d5a6eb2d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88kull=20So=CC=81lberg=20Au=C3=B0unsson?=
 <jokull@solberg.is>
Date: Wed, 23 Nov 2011 20:35:45 +0000
Subject: [PATCH 0468/2864] Never fail on generating posts, just skip and log
 exception.

---
 pelican/generators.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index f375011f..77fe55a7 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -211,7 +211,12 @@ class ArticlesGenerator(Generator):
         files = self.get_files(self.path, exclude=['pages',])
         all_articles = []
         for f in files:
-            content, metadata = read_file(f, settings=self.settings)
+            
+            try:
+                content, metadata = read_file(f, settings=self.settings)
+            except Exception, e:
+                warning(u'Could not process %s\n%s' % (f, str(e)))
+                continue
 
             # if no category is set, use the name of the path as a category
             if 'category' not in metadata.keys():
@@ -324,7 +329,11 @@ class PagesGenerator(Generator):
     def generate_context(self):
         all_pages = []
         for f in self.get_files(os.sep.join((self.path, 'pages'))):
-            content, metadata = read_file(f)
+            try:
+                content, metadata = read_file(f)
+            except Exception, e:
+                error(u'Could not process %s\n%s' % (filename, str(e)))
+                continue
             page = Page(content, metadata, settings=self.settings,
                         filename=f)
             if not is_valid_content(page, f):

From c63eb8507059eacfbf6a33a265f11f32439f5079 Mon Sep 17 00:00:00 2001
From: Skami18 <skami@skami-laptop.dyndns.org>
Date: Fri, 25 Nov 2011 18:39:19 +0100
Subject: [PATCH 0469/2864] `exit` replaced by `sys.exit` to avoid crashes on
 cx_Freeze & py2exe (useful for Windows installer)

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 745b1fbe..d5cf2d04 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,5 +1,5 @@
 import argparse
-import os
+import os, sys
 import time
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
@@ -157,7 +157,7 @@ def main():
         if (args.verbosity == log.DEBUG):
             raise
         else:
-            exit(getattr(e, 'exitcode', 1))
+            sys.exit(getattr(e, 'exitcode', 1))
 
 
 if __name__ == '__main__':

From 082cc2a401ba4b6697e2ba8fa8aaf95c3c29b2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88kull=20So=CC=81lberg=20Au=C3=B0unsson?=
 <jokull@solberg.is>
Date: Sat, 26 Nov 2011 22:31:43 +0000
Subject: [PATCH 0470/2864] Warning string formatting needs unicode if filename
 is utf-8

---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index ddcb37b6..1587a1eb 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -38,7 +38,7 @@ class Page(object):
                 self.author = settings['AUTHOR']
             else:
                 self.author = getenv('USER', 'John Doe')
-                warning("Author of `{0}' unknow, assuming that his name is `{1}'".format(filename or self.title, self.author).decode("utf-8"))
+                warning(u"Author of `{0}' unknow, assuming that his name is `{1}'".format(filename or self.title, self.author))
 
         # manage languages
         self.in_default_lang = True

From dc22d2b1310b9ac6afc8669640dea9ee965e94e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88kull=20So=CC=81lberg=20Au=C3=B0unsson?=
 <jokull@solberg.is>
Date: Sat, 26 Nov 2011 23:23:19 +0000
Subject: [PATCH 0471/2864] Added WITH_FUTURE_DATES settings, which if true
 treats future dated content as drafts.

---
 pelican/contents.py | 8 +++++---
 pelican/settings.py | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 1587a1eb..9c2327d4 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -2,6 +2,7 @@
 from pelican.utils import slugify, truncate_html_words
 from pelican.log import *
 from pelican.settings import _DEFAULT_CONFIG
+from datetime import datetime
 from os import getenv
 from sys import platform, stdin
 
@@ -23,8 +24,6 @@ class Page(object):
         self._content = content
         self.translations = []
 
-        self.status = "published"  # default value
-
         local_metadata = dict(settings.get('DEFAULT_METADATA', ()))
         local_metadata.update(metadata)
 
@@ -87,7 +86,10 @@ class Page(object):
         # manage status
         if not hasattr(self, 'status'):
             self.status = settings['DEFAULT_STATUS']
-
+            if not settings['WITH_FUTURE_DATES']:
+                if hasattr(self, 'date') and self.date > datetime.now():
+                    self.status = 'draft'
+        
         # set summary
         if not hasattr(self, 'summary'):
             self.summary = truncate_html_words(self.content, 50)
diff --git a/pelican/settings.py b/pelican/settings.py
index c7ac35ff..f74e085d 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -21,6 +21,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'PDF_GENERATOR': False,
                    'DEFAULT_CATEGORY': 'misc',
                    'FALLBACK_ON_FS_DATE': True,
+                   'WITH_FUTURE_DATES': True,
                    'CSS_FILE': 'main.css',
                    'REVERSE_ARCHIVE_ORDER': False,
                    'REVERSE_CATEGORY_ORDER': False,

From 92b232972e5ca65d279660213b4bb6dcbded2e6e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 27 Nov 2011 18:00:29 +0100
Subject: [PATCH 0472/2864] add information about mardown in the FAQ

---
 docs/faq.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index bee1dd54..dbdf9692 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -36,3 +36,15 @@ a pull request, I'll review them as soon as possible.
 
 You can also contribute by creating themes, and making the documentation
 better.
+
+I want to use markdown, but I got an error
+==========================================
+
+Markdown is not a hard dependency for pelican, so you will need to install it
+by yourself. You can do so by typing::
+
+    $ (sudo) pip install markdown
+
+In case you don't have pip installed, consider installing it by doing::
+
+    $ (sudo) easy_install pip

From fb9a622ca7f1a72934c3d13f018c4c2aba158930 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 27 Nov 2011 18:08:28 +0100
Subject: [PATCH 0473/2864] add CLEAN_URLS to the documentation

---
 docs/settings.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index fdca2ca3..99e99c6f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -27,6 +27,9 @@ Setting name (default value)                        what does it do?
 `ARTICLE_PERMALINK_STRUCTURE` (``''``)              Empty by default. Allows to render URLs in a
                                                     particular way, see below.
 `AUTHOR`                                            Default author (put your name)
+`CLEAN_URL` (``False``)                             If set to `True`, the URLs will not be suffixed by
+                                                    `.html`, so you will have to setup URL rewriting on 
+                                                    your web server.
 `DATE_FORMATS` (``{}``)                             If you do manage multiple languages, you can
                                                     set the date formatting here.
 `DEFAULT_CATEGORY` (``'misc'``)                     The default category to fallback on.

From b2919e9051c888d71a878f1cc3caabe3a6129c04 Mon Sep 17 00:00:00 2001
From: Brian Hsu <brianhsu.hsu@gmail.com>
Date: Tue, 29 Nov 2011 09:53:48 +0800
Subject: [PATCH 0474/2864] Add unique_id to RSS/ATOM feeds.

Reason:

    Without <guid> tag in RSS XML, some RSS reader will show all
    items in RSS as unread item.
---
 pelican/writers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/writers.py b/pelican/writers.py
index 4dfc1ba6..21bb899d 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -34,6 +34,7 @@ class Writer(object):
         feed.add_item(
             title=item.title,
             link='%s/%s' % (self.site_url, item.url),
+            unique_id='%s/%s' % (self.site_url, item.url),
             description=item.content,
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', 'John Doe'),

From b0dcce01cb169a15fa427eb1317e6a9e3edc536a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 29 Nov 2011 16:06:08 +0100
Subject: [PATCH 0475/2864] Don't install the venv in the sources root, this
 can cause troubles with the bin folder

---
 docs/getting_started.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index deca0c17..3e60b63a 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -12,7 +12,7 @@ the simpler one is via `pip <http://pip.openplans.org/>`_::
 If you have the sources, you can install pelican using the distutils command
 install. I recommend to do so in a virtualenv::
 
-    $ virtualenv .
+    $ virtualenv pelican_venv
     $ source bin/activate
     $ python setup.py install
 

From df4e88ff158b81664e6a247d28b3ea757e4a3e13 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 30 Nov 2011 21:11:50 +0100
Subject: [PATCH 0476/2864] add some docs written a long time ago

---
 docs/_static/overall.png | Bin 0 -> 15732 bytes
 docs/_static/uml.jpg     | Bin 0 -> 66995 bytes
 docs/index.rst           |   1 +
 docs/internals.rst       |   5 ++
 docs/report.rst          | 122 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 128 insertions(+)
 create mode 100644 docs/_static/overall.png
 create mode 100644 docs/_static/uml.jpg
 create mode 100644 docs/report.rst

diff --git a/docs/_static/overall.png b/docs/_static/overall.png
new file mode 100644
index 0000000000000000000000000000000000000000..1240a1483242a258a01c26c0b16ca1573211ffe2
GIT binary patch
literal 15732
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
L`?McY%>(`i!C#^4

literal 0
HcmV?d00001

diff --git a/docs/_static/uml.jpg b/docs/_static/uml.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..03655d7e428c153b79be182987b5dcd3fd1ca3f9
GIT binary patch
literal 66995
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
UGyUDHE&4Z7LI2Lz_&<OAKfRd6(*OVf

literal 0
HcmV?d00001

diff --git a/docs/index.rst b/docs/index.rst
index c2b4577d..38ebf49c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -65,3 +65,4 @@ A french version of the documentation is available at :doc:`fr/index`.
    faq
    tips
    contribute
+   report
diff --git a/docs/internals.rst b/docs/internals.rst
index 17541c0c..0e60dacf 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -4,6 +4,11 @@ Pelican internals
 This section describe how pelican is working internally. As you'll see, it's
 quite simple, but a bit of documentation doesn't hurt :)
 
+You can also find in "`:doc:report`" an excerpt of a report the original author
+wrote, with some software design information.
+
+.. _report: :doc:`report`
+
 Overall structure
 =================
 
diff --git a/docs/report.rst b/docs/report.rst
new file mode 100644
index 00000000..dd5d6068
--- /dev/null
+++ b/docs/report.rst
@@ -0,0 +1,122 @@
+Some history about pelican
+##########################
+
+.. warning::
+
+    This page comes from a report the original author (Alexis Métaireau) wrote
+    right after writting pelican, in december 2010. The information may not be 
+    up to date.
+
+Pelican is a simple static blog generator. It parses markup files
+(markdown or restructured text for now), and generate a HTML folder
+with all the files in it.
+I've chosen to use python to implement pelican because it seemed to
+be simple and to fit to my needs. I did not wanted to define a class for
+each thing, but still wanted to keep my things loosely coupled.
+It turns out that it was exactly what I wanted. From time to time,
+thanks to the feedback of some users, it took me a very few time to
+provide fixes on it. So far, I've re-factored the pelican code by two
+times, each time took less than 30 minutes.
+
+Use case
+========
+
+I was previously using wordpress, a solution you can host on a web
+server to manage your blog. Most of the time, I prefer using markup
+languages such as Markdown or RestructuredText to type my articles.
+To do so, I use vim. I think it is important to let the people choose the
+tool they want to write the articles. In my opinion, a blog manager
+should just allow you to take any kind of input and transform it to a
+weblog. That's what pelican does.
+You can write your articles using the tool you want, and the markup
+language you want, and then generate a static HTML weblog
+
+.. image:: _static/overall.png
+
+To be flexible enough, pelican have a template support, so you can
+easily write you own themes if you want to.
+
+Design process
+==============
+
+Pelican came from a need I have. I started by creating a single file
+application, and I have make it grow to support what it does by now.
+To start, I wrote a piece of documentation about what I wanted to do.
+Then, I have created the content I wanted to parse (the restructured
+text files), and started experimenting with the code.
+Pelican was 200 lines long, and contained almost ten functions and one
+class when it was first usable.
+
+I have been facing different problems all over the time, and wanted to
+add features to pelican while using it. The first change I have done was
+to add the support of a settings file. It is possible to pass the options to
+the command line, but can be tedious if there is a lot of them.
+In the same way, I have added the support of different things over
+time: atom feeds, multiple themes, multiple markup support, etc.
+At some point, it appears that the “only one file” mantra was not good
+enough for pelican, so I decided to rework a bit all that, and split this in
+multiple different files.
+
+I’ve separated the logic in different classes and concepts:
+
+* *writers* are responsible of all the writing process of the files.
+  They are responsible of writing .html files, RSS feeds and so on.
+  Since those operations are commonly used, the object is created
+  once, and then passed to the generators.
+
+* *readers* are used to read from various formats (Markdown, and
+  Restructured Text for now, but the system is extensible). Given a
+  file, they return metadata (author, tags, category etc) and
+  content (HTML formated).
+
+* *generators* generate the different outputs. For instance, pelican
+  comes with an ArticlesGenerator and PagesGenerator, into
+  others. Given a configuration, they can do whatever you want
+  them to do. Most of the time it’s generating files from inputs
+  (user inputs and files).
+
+I also deal with contents objects. They can be `Articles`, `Pages`, `Quotes`,
+or whatever you want. They are defined in the contents.py module,
+and represent some content to be used by the program.
+
+In more details
+===============
+
+Here is an overview of the classes involved in pelican.
+
+.. image:: _static/uml.jpg
+
+The interface do not really exists, and I have added it only to clarify the
+whole picture. I do use duck typing, and not interfaces.
+
+Internally, the following process is followed:
+
+* First of all, the command line is parsed, and some content from
+  the user are used to initialize the different generator objects.
+
+* A `context` is created. It contains the settings from the command
+  line and a settings file if provided.
+* The `generate_context` method of each generator is called, updating
+  the context.
+
+* The writer is created, and given to the `generate_output` method of
+  each generator.
+
+I make two calls because it is important that when the output is
+generated by the generators, the context will not change. In other
+words, the first method `generate_context` should modify the context,
+whereas the second `generate_output` method should not.
+
+Then, it is up to the generators to do what the want, in the
+`generate_context` and `generate_content` method.
+Taking the `ArticlesGenerator` class will help to understand some others
+concepts. Here is what happens when calling the `generate_context`
+method:
+
+* Read the folder “path”, looking for restructured text files, load
+  each of them, and construct a content object (`Article`) with it. To do so, 
+  use `Reader` objects.
+* Update the `context` with all those articles.
+
+Then, the `generate_content` method uses the `context` and the `writer` to
+generate the wanted output

From 889cdd4dbde175f9996cf79cdec865c5b852022d Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 30 Nov 2011 21:16:26 +0100
Subject: [PATCH 0477/2864] typo

---
 docs/report.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/report.rst b/docs/report.rst
index dd5d6068..7e0432e2 100644
--- a/docs/report.rst
+++ b/docs/report.rst
@@ -4,7 +4,7 @@ Some history about pelican
 .. warning::
 
     This page comes from a report the original author (Alexis Métaireau) wrote
-    right after writting pelican, in december 2010. The information may not be 
+    right after writing pelican, in december 2010. The information may not be 
     up to date.
 
 Pelican is a simple static blog generator. It parses markup files

From 4a8b3ddb7542276d4eedd676cbb9d43cb8b194fa Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 30 Nov 2011 21:19:42 +0100
Subject: [PATCH 0478/2864] oops, broken link

---
 docs/internals.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/internals.rst b/docs/internals.rst
index 0e60dacf..269fe415 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -4,7 +4,7 @@ Pelican internals
 This section describe how pelican is working internally. As you'll see, it's
 quite simple, but a bit of documentation doesn't hurt :)
 
-You can also find in "`:doc:report`" an excerpt of a report the original author
+You can also find in :doc:`report` an excerpt of a report the original author
 wrote, with some software design information.
 
 .. _report: :doc:`report`

From 651249a6c598eb12f821514cc55f3263cfa847c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88kull=20So=CC=81lberg=20Au=C3=B0unsson?=
 <jokull@solberg.is>
Date: Sun, 27 Nov 2011 11:43:18 +0000
Subject: [PATCH 0479/2864] Bad logic in delete output booleans. Pretty sure
 this is just a check to make sure the posts directory is not inside the
 output.

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index d5cf2d04..edd30968 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -65,8 +65,8 @@ class Pelican(object):
 
         # erase the directory if it is not the source and if that's 
         # explicitely asked
-        if (self.delete_outputdir and 
-                os.path.realpath(self.path).startswith(self.output_path)):
+        if (self.delete_outputdir and not
+                os.path.realpath(self.path).startswith(self.output_path)): 
             clean_output_dir(self.output_path)
 
         writer = self.get_writer()

From 256b92e5c49e51a41ca3fafd8f8654ef8651e922 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Tue, 13 Dec 2011 23:24:59 +0000
Subject: [PATCH 0480/2864] Fix CLEAN_URLS and place articles in
 <slug>/index.html

---
 pelican/contents.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 9c2327d4..d61d3710 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -55,10 +55,18 @@ class Page(object):
         # create save_as from the slug (+lang)
         if not hasattr(self, 'save_as') and hasattr(self, 'slug'):
             if self.in_default_lang:
-                self.save_as = '%s.html' % self.slug
+                if settings.get('CLEAN_URLS', False):
+                    self.save_as = '%s/index.html' % self.slug
+                else:
+                    self.save_as = '%s.html' % self.slug
+
                 clean_url = '%s/' % self.slug
             else:
-                self.save_as = '%s-%s.html' % (self.slug, self.lang)
+                if settings.get('CLEAN_URLS', False):
+                    self.save_as = '%s-%s/index.html' % (self.slug, self.lang)
+                else:
+                    self.save_as = '%s-%s.html' % (self.slug, self.lang)
+
                 clean_url = '%s-%s/' % (self.slug, self.lang)
 
         # change the save_as regarding the settings

From c4fec61d08ec23cae41ff0b5372e953574e61fd2 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 14 Dec 2011 14:34:38 +0100
Subject: [PATCH 0481/2864] Add the dev_requirements.txt file. Fix #195

---
 dev_requirements.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 dev_requirements.txt

diff --git a/dev_requirements.txt b/dev_requirements.txt
new file mode 100644
index 00000000..36059d8a
--- /dev/null
+++ b/dev_requirements.txt
@@ -0,0 +1,5 @@
+Jinja2
+Pygments
+docutils
+feedgenerator
+unittest2

From 2be58aa51a6e577199fc3b76cd9f3fe3c0e96a01 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Thu, 22 Dec 2011 13:56:36 +0000
Subject: [PATCH 0482/2864] Remove WITH_PAGINATION, only have a
 DEFAULT_PAGINATION setting

DEFAULT_PAGINATION can be set to False instead of using WITH_PAGINATION
---
 docs/settings.rst                                  | 6 +++---
 pelican/settings.py                                | 3 +--
 pelican/themes/notmyidea/templates/pagination.html | 4 ++--
 pelican/writers.py                                 | 2 +-
 tools/pelican-quickstart                           | 6 +++---
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 99e99c6f..f1ae827a 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -160,9 +160,9 @@ Setting name (default value)                        what does it do?
 `DEFAULT_ORPHANS` (0)                               The minimum number of articles allowed on the
                                                     last page. Use this when you don't want to
                                                     have a last page with very few articles.
-`DEFAULT_PAGINATION` (5)                            The maximum number of articles to include on a
-                                                    page, not including orphans.
-`WITH_PAGINATION` (``False``)                       Activate pagination.
+`DEFAULT_PAGINATION` (False)                        The maximum number of articles to include on a
+                                                    page, not including orphans. False to disable
+                                                    pagination.
 ================================================    =====================================================
 
 Tag cloud
diff --git a/pelican/settings.py b/pelican/settings.py
index f74e085d..cf6b23e5 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -38,8 +38,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DATE_FORMATS': {},
                    'JINJA_EXTENSIONS': [],
                    'LOCALE': '', # default to user locale
-                   'WITH_PAGINATION': False,
-                   'DEFAULT_PAGINATION': 5,
+                   'DEFAULT_PAGINATION': False,
                    'DEFAULT_ORPHANS': 0,
                    'DEFAULT_METADATA': (),
                    'FILES_TO_COPY': (),
diff --git a/pelican/themes/notmyidea/templates/pagination.html b/pelican/themes/notmyidea/templates/pagination.html
index 74699c4e..83c587ac 100644
--- a/pelican/themes/notmyidea/templates/pagination.html
+++ b/pelican/themes/notmyidea/templates/pagination.html
@@ -1,4 +1,4 @@
-{% if WITH_PAGINATION %}
+{% if DEFAULT_PAGINATION %}
 <p class="paginator">
     {% if articles_page.has_previous() %}
         {% if articles_page.previous_page_number() == 1 %}
@@ -12,4 +12,4 @@
         <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">&raquo;</a>
     {% endif %}
 </p>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/pelican/writers.py b/pelican/writers.py
index 21bb899d..baf20408 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -127,7 +127,7 @@ class Writer(object):
             for key in paginated.iterkeys():
                 object_list = paginated[key]
 
-                if self.settings.get('WITH_PAGINATION'):
+                if self.settings.get('DEFAULT_PAGINATION'):
                     paginators[key] = Paginator(object_list,
                         self.settings.get('DEFAULT_PAGINATION'),
                         self.settings.get('DEFAULT_ORPHANS'))
diff --git a/tools/pelican-quickstart b/tools/pelican-quickstart
index 5d708038..ef6dff53 100755
--- a/tools/pelican-quickstart
+++ b/tools/pelican-quickstart
@@ -86,7 +86,6 @@ SOCIAL = (
           ('You can add links in your config file', '#'),
          )
 
-WITH_PAGINATION = $with_pagination
 DEFAULT_PAGINATION = $default_pagination
 
 
@@ -104,7 +103,6 @@ CONF = {
     'ssh_user': 'root',
     'ssh_target_dir': '/var/www',
     'dropbox_dir' : '~/Dropbox/Public/',
-    'with_pagination' : True,
     'default_pagination' : 7,
     'lang': 'en'
 }
@@ -221,10 +219,12 @@ Please answer the following questions so this script can generate the files need
     CONF['author'] = ask('Who will be the author of this Web site ?', answer=str, default=args.author)
     CONF['lang'] = ask('What will be the default language  of this Web site ?', str, args.lang or CONF['lang'], 2)
 
-    CONF['with_pagination'] = ask('Do you want to enable article pagination ?', bool, CONF['with_pagination'])
+    CONF['with_pagination'] = ask('Do you want to enable article pagination ?', bool, bool(CONF['default_pagination']))
 
     if CONF['with_pagination']:
         CONF['default_pagination'] = ask('So how many articles per page do you want ?', int, CONF['default_pagination'])
+    else:
+        CONF['default_pagination'] = False
 
     mkfile = ask('Do you want to generate a Makefile to easily manage your website ?', bool, True)
     

From 6ca3fd423becbd1acb0a1fb92ab311668e218fa6 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Sat, 24 Dec 2011 00:57:12 +0000
Subject: [PATCH 0483/2864] Fix a bug in the exception handler for a page
 reader

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 77fe55a7..6c878bdd 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -332,7 +332,7 @@ class PagesGenerator(Generator):
             try:
                 content, metadata = read_file(f)
             except Exception, e:
-                error(u'Could not process %s\n%s' % (filename, str(e)))
+                error(u'Could not process %s\n%s' % (f, str(e)))
                 continue
             page = Page(content, metadata, settings=self.settings,
                         filename=f)

From 9543ce049fd2e14ee3dfd4599c6bdc6595c5cccc Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 29 Dec 2011 16:04:46 +0100
Subject: [PATCH 0484/2864] update the documentation to make timezone
 configuration clearer

---
 docs/settings.rst       | 3 ++-
 samples/pelican.conf.py | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index f1ae827a..4eec111b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -71,7 +71,8 @@ Setting name (default value)                        what does it do?
                                                     pelican will copy the 'images' folder to the
                                                     output folder.
 `TIMEZONE`                                          The timezone used in the date information, to
-                                                    generate atom and rss feeds.
+                                                    generate atom and rss feeds. See the "timezone"
+                                                    section below for more info.
 ================================================    =====================================================
 
 .. [1] Default is the system locale. Default is to delete the output directory.
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 2796d561..fb3b091b 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -2,6 +2,7 @@
 AUTHOR = u'Alexis Métaireau'
 SITENAME = u"Alexis' log"
 SITEURL = 'http://blog.notmyidea.org'
+TIMEZONE = "Europe/Paris"
 
 GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
@@ -36,3 +37,4 @@ FILES_TO_COPY = (('extra/robots.txt', 'robots.txt'),)
 # foobar will not be used, because it's not in caps. All configuration keys
 # have to be in caps
 foobar = "barbaz"
+

From 3e8226da1589b3893241e9dcb08e64c633014518 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 12 Jan 2012 11:50:08 +0100
Subject: [PATCH 0485/2864] minor changes to MANIFEST.in

---
 MANIFEST.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 91c3b5ff..a092ecd0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,4 @@
 include *.rst
-global-include *.pyc
-global-exclude *.py
+global-include *.py
 recursive-include pelican *.html *.css *png
 include LICENSE

From 1f4bb6a2e42be169b0273514db888bbbf3a81e2a Mon Sep 17 00:00:00 2001
From: Tobias <tobias.erhardt@gmail.com>
Date: Sun, 12 Feb 2012 18:25:51 +0100
Subject: [PATCH 0486/2864] DOC: fixed typo in 'CLEAN_URLS' was singular in
 docs but only works as plural

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 4eec111b..d81f95e0 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -27,7 +27,7 @@ Setting name (default value)                        what does it do?
 `ARTICLE_PERMALINK_STRUCTURE` (``''``)              Empty by default. Allows to render URLs in a
                                                     particular way, see below.
 `AUTHOR`                                            Default author (put your name)
-`CLEAN_URL` (``False``)                             If set to `True`, the URLs will not be suffixed by
+`CLEAN_URLS` (``False``)                             If set to `True`, the URLs will not be suffixed by
                                                     `.html`, so you will have to setup URL rewriting on 
                                                     your web server.
 `DATE_FORMATS` (``{}``)                             If you do manage multiple languages, you can

From 1ceb2745b1fb8f32fa7e655b1630137cd3d9277e Mon Sep 17 00:00:00 2001
From: Martin Brochhaus <mbrochh@gmail.com>
Date: Mon, 20 Feb 2012 13:18:18 +0100
Subject: [PATCH 0487/2864] Added missing documentation for MENUITEMS setting.

---
 docs/settings.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d81f95e0..0fd8652e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -263,6 +263,8 @@ Setting name              what does it do ?
 `GITHUB_URL`              Your github URL (if you have one), it will then
                           use it to create a github ribbon.
 `GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
+`MENUITEMS`               A list of tuples (Title, Url) for additional menu
+                          items to appear at the beginning of the main menu.
 `PIWIK_URL`               URL to your Piwik server - without 'http://' at the
                           beginning.
 `PIWIK_SSL_URL`           If the SSL-URL differs from the normal Piwik-URL
@@ -271,8 +273,8 @@ Setting name              what does it do ?
                           in the Piwik admin interface > settings > websites.
 `LINKS`                   A list of tuples (Title, Url) for links to appear on
                           the header.
-`SOCIAL`                  A list of tuples (Title, Url) to appear in the "social"
-                          section.
+`SOCIAL`                  A list of tuples (Title, Url) to appear in the
+                          "social" section.
 `TWITTER_USERNAME`        Allows to add a button on the articles to tweet about
                           them. Add you twitter username if you want this
                           button to appear.

From bf314fde6b489a33b94b51ec97436270eff631de Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 20 Feb 2012 13:36:41 +0100
Subject: [PATCH 0488/2864] Remove an useless css background image. Fix #209

---
 pelican/themes/notmyidea/static/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index d416aaff..b3677771 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -15,7 +15,7 @@
 /***** Global *****/
 /* Body */
 body {
-    background: #F5F4EF url('../images/bg.png');
+    background: #F5F4EF;
     color: #000305;
     font-size: 87.5%; /* Base font size: 14px */
     font-family: 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;

From 52fb81a441842b1a4ee17f6a3ae61ccfe91e7fe0 Mon Sep 17 00:00:00 2001
From: Martin Brochhaus <mbrochh@gmail.com>
Date: Mon, 20 Feb 2012 17:39:47 +0100
Subject: [PATCH 0489/2864] Added some fixes to the test suite so that it
 doesn't fail any more.

---
 .gitignore             |  1 +
 docs/contribute.rst    |  1 +
 pelican/contents.py    |  9 ++++---
 tests/default_conf.py  |  1 +
 tests/test_contents.py | 61 +++++++++++++++++++++++++-----------------
 5 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5bb92c09..d033f268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ build
 dist
 output
 tags
+.ropeproject
 .tox
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 02af695f..aaef008b 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -25,6 +25,7 @@ To create the virtualenv environment, you have to do::
 Then you would have to install all the dependencies::
 
     $ pip install -r dev_requirements.txt
+    $ pyhthon setup.py develop
 
 Running the test suite
 ======================
diff --git a/pelican/contents.py b/pelican/contents.py
index d61d3710..54227f0c 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -14,7 +14,8 @@ class Page(object):
     """
     mandatory_properties = ('title',)
 
-    def __init__(self, content, metadata=None, settings=None, filename=None):
+    def __init__(self, content=None, metadata=None, settings=None,
+                 filename=None):
         # init parameters
         if not metadata:
             metadata = {}
@@ -30,7 +31,7 @@ class Page(object):
         # set metadata as attributes
         for key, value in local_metadata.items():
             setattr(self, key.lower(), value)
-        
+
         # default author to the one in settings if not defined
         if not hasattr(self, 'author'):
             if 'AUTHOR' in settings:
@@ -90,14 +91,14 @@ class Page(object):
                 self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode(stdin.encoding)
             else:
                 self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf')
-        
+
         # manage status
         if not hasattr(self, 'status'):
             self.status = settings['DEFAULT_STATUS']
             if not settings['WITH_FUTURE_DATES']:
                 if hasattr(self, 'date') and self.date > datetime.now():
                     self.status = 'draft'
-        
+
         # set summary
         if not hasattr(self, 'summary'):
             self.summary = truncate_html_words(self.content, 50)
diff --git a/tests/default_conf.py b/tests/default_conf.py
index 2796d561..acb7d9da 100755
--- a/tests/default_conf.py
+++ b/tests/default_conf.py
@@ -2,6 +2,7 @@
 AUTHOR = u'Alexis Métaireau'
 SITENAME = u"Alexis' log"
 SITEURL = 'http://blog.notmyidea.org'
+TIMEZONE = 'UTC'
 
 GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
diff --git a/tests/test_contents.py b/tests/test_contents.py
index df2c00e6..4e58ec31 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -6,48 +6,59 @@ from pelican.settings import _DEFAULT_CONFIG
 
 class TestPage(TestCase):
 
+    def setUp(self):
+        super(TestPage, self).setUp()
+        self.page_kwargs = {
+            'content': 'content',
+            'metadata':{
+                'title': 'foo bar',
+                'author': 'Blogger',
+            },
+        }
+
     def test_use_args(self):
-        # creating a page with arguments passed to the connstructor should use
-        # them to initialise object's attributes
-        metadata = {'foo': 'bar', 'foobar': 'baz'}
+        """Creating a page with arguments passed to the connstructor should use
+        them to initialise object's attributes.
+
+        """
+        metadata = {'foo': 'bar', 'foobar': 'baz', 'title': 'foobar', }
         page = Page('content', metadata=metadata)
         for key, value in metadata.items():
             self.assertTrue(hasattr(page, key))
             self.assertEqual(value, getattr(page, key))
-        self.assertEqual(page.content, "content")
+        self.assertEqual(page.content, 'content')
 
     def test_mandatory_properties(self):
-        # if the title is not set, must throw an exception
-        page = Page('content')
-        with self.assertRaises(NameError) as cm:
-            page.check_properties()
-
-        page = Page('content', metadata={'title': 'foobar'})
+        """If the title is not set, must throw an exception."""
+        self.assertRaises(AttributeError, Page, 'content')
+        page = Page(**self.page_kwargs)
         page.check_properties()
 
     def test_slug(self):
-        # if a title is given, it should be used to generate the slug
-        page = Page('content', {'title': 'foobar is foo'})
-        self.assertEqual(page.slug, 'foobar-is-foo')
+        """If a title is given, it should be used to generate the slug."""
+        page = Page(**self.page_kwargs)
+        self.assertEqual(page.slug, 'foo-bar')
 
     def test_defaultlang(self):
-        # if no lang is given, default to the default one
-        page = Page('content')
+        """If no lang is given, default to the default one."""
+        page = Page(**self.page_kwargs)
         self.assertEqual(page.lang, _DEFAULT_CONFIG['DEFAULT_LANG'])
 
         # it is possible to specify the lang in the metadata infos
-        page = Page('content', {'lang': 'fr'})
+        self.page_kwargs['metadata'].update({'lang': 'fr', })
+        page = Page(**self.page_kwargs)
         self.assertEqual(page.lang, 'fr')
 
     def test_save_as(self):
-        # if a lang is not the default lang, save_as should be set accordingly
-        page = Page('content', {'title': 'foobar', 'lang': 'fr'}) #default lang is en
-        self.assertEqual(page.save_as, "foobar-fr.html")
+        """If a lang is not the default lang, save_as should be set
+        accordingly.
 
-        # otherwise, if a title is defined, save_as should be set
-        page = Page('content', {'title': 'foobar'})
-        page.save_as = 'foobar.html'
+        """
+        # if a title is defined, save_as should be set
+        page = Page(**self.page_kwargs)
+        page.save_as = 'foo-bar.html'
 
-        # if no title is given, there is no save_as
-        page = Page('content')
-        self.assertFalse(hasattr(page, 'save_as'))
+        # if a language is defined, save_as should include it accordingly
+        self.page_kwargs['metadata'].update({'lang': 'fr', })
+        page = Page(**self.page_kwargs)
+        self.assertEqual(page.save_as, "foo-bar-fr.html")

From 67472298cad757630d04e014b06e83e9039f23fb Mon Sep 17 00:00:00 2001
From: Martin Brochhaus <mbrochh@gmail.com>
Date: Mon, 20 Feb 2012 17:58:23 +0100
Subject: [PATCH 0490/2864] Added changes as per codereview.

---
 .gitignore             | 1 -
 docs/contribute.rst    | 2 +-
 pelican/contents.py    | 2 +-
 tests/test_contents.py | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d033f268..5bb92c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,4 @@ build
 dist
 output
 tags
-.ropeproject
 .tox
diff --git a/docs/contribute.rst b/docs/contribute.rst
index aaef008b..0aaa5771 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -25,7 +25,7 @@ To create the virtualenv environment, you have to do::
 Then you would have to install all the dependencies::
 
     $ pip install -r dev_requirements.txt
-    $ pyhthon setup.py develop
+    $ python setup.py develop
 
 Running the test suite
 ======================
diff --git a/pelican/contents.py b/pelican/contents.py
index 54227f0c..2d46add1 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -14,7 +14,7 @@ class Page(object):
     """
     mandatory_properties = ('title',)
 
-    def __init__(self, content=None, metadata=None, settings=None,
+    def __init__(self, content, metadata=None, settings=None,
                  filename=None):
         # init parameters
         if not metadata:
diff --git a/tests/test_contents.py b/tests/test_contents.py
index 4e58ec31..8cd5468d 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -17,7 +17,7 @@ class TestPage(TestCase):
         }
 
     def test_use_args(self):
-        """Creating a page with arguments passed to the connstructor should use
+        """Creating a page with arguments passed to the constructor should use
         them to initialise object's attributes.
 
         """

From d1d82db4f7096793feee4e56ff510b0846762b04 Mon Sep 17 00:00:00 2001
From: Jiachen Yang <farseerfc@gmail.com>
Date: Sun, 26 Feb 2012 16:35:04 +0900
Subject: [PATCH 0491/2864] Change date_format to support (locale,format)

---
 pelican/contents.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pelican/contents.py b/pelican/contents.py
index d61d3710..bdf3c9f0 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -5,6 +5,7 @@ from pelican.settings import _DEFAULT_CONFIG
 from datetime import datetime
 from os import getenv
 from sys import platform, stdin
+import locale
 
 class Page(object):
     """Represents a page
@@ -85,6 +86,10 @@ class Page(object):
             else:
                 self.date_format = settings['DEFAULT_DATE_FORMAT']
 
+	if isinstance(self.date_format, tuple):
+		locale.setlocale(locale.LC_ALL, self.date_format[0])
+		self.date_format = self.date_format[1]
+	
         if hasattr(self, 'date'):
             if platform == 'win32':
                 self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode(stdin.encoding)

From e78372f338eee04333d4499fceb098ac5ced1b90 Mon Sep 17 00:00:00 2001
From: Jiachen Yang <farseerfc@gmail.com>
Date: Tue, 28 Feb 2012 01:43:36 +0900
Subject: [PATCH 0492/2864] import unittest if cannot found unittest2

---
 pelican/contents.py    | 6 +++---
 tests/test_contents.py | 5 ++++-
 tests/test_readers.py  | 6 +++++-
 tests/test_settings.py | 6 +++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index bdf3c9f0..f1006875 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -86,9 +86,9 @@ class Page(object):
             else:
                 self.date_format = settings['DEFAULT_DATE_FORMAT']
 
-	if isinstance(self.date_format, tuple):
-		locale.setlocale(locale.LC_ALL, self.date_format[0])
-		self.date_format = self.date_format[1]
+        if isinstance(self.date_format, tuple):
+            locale.setlocale(locale.LC_ALL, self.date_format[0])
+            self.date_format = self.date_format[1]
 	
         if hasattr(self, 'date'):
             if platform == 'win32':
diff --git a/tests/test_contents.py b/tests/test_contents.py
index df2c00e6..3c58d0e5 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -1,5 +1,8 @@
 from __future__ import with_statement
-from unittest2 import TestCase
+try:
+    from unittest2 import TestCase
+except ImportError, e:
+    from unittest import TestCase
 
 from pelican.contents import Page
 from pelican.settings import _DEFAULT_CONFIG
diff --git a/tests/test_readers.py b/tests/test_readers.py
index bf7504fb..211fb9be 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -1,5 +1,9 @@
 # coding: utf-8
-import unittest2
+try:
+    import unittest2
+except ImportError, e:
+    import unittest as unittest2
+
 import os
 import datetime
 from pelican import readers
diff --git a/tests/test_settings.py b/tests/test_settings.py
index e32fcef4..571f66a1 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,4 +1,8 @@
-import unittest2
+try:
+    import unittest2
+except ImportError, e:
+    import unittest as unittest2
+
 from os.path import dirname, abspath, join
 
 from pelican.settings import read_settings, _DEFAULT_CONFIG

From 76ee6c214995cf3c0ecfbcc4928abf87193a7bf7 Mon Sep 17 00:00:00 2001
From: Jiachen Yang <farseerfc@gmail.com>
Date: Tue, 28 Feb 2012 03:08:39 +0900
Subject: [PATCH 0493/2864] Added document and test case for #215

---
 docs/settings.rst      | 54 +++++++++++++++++++++++++++++++++++++++---
 tests/test_contents.py | 33 ++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 0fd8652e..d8ce9b8a 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -31,7 +31,8 @@ Setting name (default value)                        what does it do?
                                                     `.html`, so you will have to setup URL rewriting on 
                                                     your web server.
 `DATE_FORMATS` (``{}``)                             If you do manage multiple languages, you can
-                                                    set the date formatting here.
+                                                    set the date formatting here. See "Date format and locales"
+                                                    section below for details.
 `DEFAULT_CATEGORY` (``'misc'``)                     The default category to fallback on.
 `DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)           The default date format you want to use.
 `DISPLAY_PAGES_ON_MENU` (``True``)                  Display or not the pages on the menu of the
@@ -43,7 +44,7 @@ Setting name (default value)                        what does it do?
 `JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.
 `DELETE_OUTPUT_DIRECTORY` (``False``)               Delete the output directory and just
                                                     the generated files.
-`LOCALE` (''[1]_)                                   Change the locale. A list of locales can be provided 
+`LOCALE` (''[#]_)                                   Change the locale. A list of locales can be provided 
                                                     here or a single string representing one locale.
                                                     When providing a list, all the locales will be tried 
                                                     until one works.
@@ -75,7 +76,7 @@ Setting name (default value)                        what does it do?
                                                     section below for more info.
 ================================================    =====================================================
 
-.. [1] Default is the system locale. Default is to delete the output directory.
+.. [#] Default is the system locale. Default is to delete the output directory.
 
 Article permalink structure
 ---------------------------
@@ -119,6 +120,53 @@ timezone.
 
 .. _the wikipedia page: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
+
+Date format and locale
+----------------------
+
+If no DATE_FORMAT is set, failback to DEFAULT_DATE_FORMAT. If you need to
+maintain multiple languages with different date format, you can set this dict
+using language name( ``lang`` in your posts) as key. About available format
+codes, see `strftime document of python`_ :
+
+    DATE_FORMAT = {
+        'en': '%a, %d %b %Y',
+        'jp': '%Y-%m-%d(%a)',
+    }
+
+You can set locale to further control date format:
+
+    LOCALE = ('usa', 'jpn',  # On Windows
+        'en_US', 'ja_JP'     # On Unix/Linux
+        )
+
+Also, it is possible to set different locale settings for each language, if you
+put (locale, format) tuple in dict, and this will override the LOCALE setting
+above:
+
+    # On Unix/Linux
+    DATE_FORMAT = {
+        'en': ('en_US','%a, %d %b %Y'),
+        'jp': ('ja_JP','%Y-%m-%d(%a)'),
+    }
+
+    # On Windows
+    DATE_FORMAT = {
+        'en': ('usa','%a, %d %b %Y'),
+        'jp': ('jpn','%Y-%m-%d(%a)'),
+    }
+
+For available list of `locales on Windows` . On Unix/Linux usually you can get
+a list of available locales with command ``locale -a``, see manpage `locale(1)`
+for help.
+
+
+.. _strftime document of python: http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+
+.. _locales on Windows: http://msdn.microsoft.com/en-us/library/cdax410z%28VS.71%29.aspx
+
+.. _locale(1): http://linux.die.net/man/1/locale
+
 Feed settings
 =============
 
diff --git a/tests/test_contents.py b/tests/test_contents.py
index 581f3f63..d5648f62 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -65,3 +65,36 @@ class TestPage(TestCase):
         self.page_kwargs['metadata'].update({'lang': 'fr', })
         page = Page(**self.page_kwargs)
         self.assertEqual(page.save_as, "foo-bar-fr.html")
+
+    def test_datetime(self):
+        """If DATETIME is set to a tuple, it should be used to override LOCALE
+        """
+        from datetime import datetime
+        from sys import platform
+        dt = datetime(2015,9,13)
+        # make a deep copy of page_kawgs
+        page_kwargs = {key:self.page_kwargs[key] for key in self.page_kwargs}
+        for key in page_kwargs:
+            if not isinstance(page_kwargs[key], dict): break
+            page_kwargs[key] = {subkey:page_kwargs[key][subkey] for subkey in page_kwargs[key]}
+        # set its date to dt
+        page_kwargs['metadata']['date'] = dt
+        page = Page( **page_kwargs)
+
+        self.assertEqual(page.locale_date, dt.strftime(_DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']))
+
+        
+        page_kwargs['settings'] = {x:_DEFAULT_CONFIG[x] for x in _DEFAULT_CONFIG}
+        # I doubt this can work on all platforms ...
+        if platform == "win32":
+            locale = 'jpn'
+        else:
+            locale = 'ja_JP'
+        page_kwargs['settings']['DATE_FORMATS'] = {'jp':(locale,'%Y-%m-%d(%a)')} 
+        page_kwargs['metadata']['lang'] = 'jp'
+        page = Page( **page_kwargs)
+        self.assertEqual(page.locale_date, u'2015-09-13(\u65e5)')
+        # above is unicode in Japanese: 2015-09-13(��)
+
+
+

From 3ccbe19c8ac552cfb7f4fd03e6f293ada973d928 Mon Sep 17 00:00:00 2001
From: Jiachen Yang <farseerfc@gmail.com>
Date: Tue, 28 Feb 2012 03:37:58 +0900
Subject: [PATCH 0494/2864] typo in docs/settings.rst#date format and locales

---
 docs/settings.rst | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d8ce9b8a..9d34fae0 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -124,9 +124,9 @@ timezone.
 Date format and locale
 ----------------------
 
-If no DATE_FORMAT is set, failback to DEFAULT_DATE_FORMAT. If you need to
+If no DATE_FORMAT is set, fallback to DEFAULT_DATE_FORMAT. If you need to
 maintain multiple languages with different date format, you can set this dict
-using language name( ``lang`` in your posts) as key. About available format
+using language name (``lang`` in your posts) as key. About available format
 codes, see `strftime document of python`_ :
 
     DATE_FORMAT = {
@@ -156,9 +156,8 @@ above:
         'jp': ('jpn','%Y-%m-%d(%a)'),
     }
 
-For available list of `locales on Windows` . On Unix/Linux usually you can get
-a list of available locales with command ``locale -a``, see manpage `locale(1)`
-for help.
+For available list of `locales on Windows`_ . On Unix/Linux usually you can get
+a list of available locales with command ``locale -a``, see manpage `locale(1)`_ for help.
 
 
 .. _strftime document of python: http://docs.python.org/library/datetime.html#strftime-strptime-behavior

From 02b9b964b8e9acb8daf994f5b8d9d7258a240dc8 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 27 Feb 2012 21:06:33 +0100
Subject: [PATCH 0495/2864] restore the use of python rather than pypy in the
 batfiles (windows)

---
 tests/test_contents.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/test_contents.py b/tests/test_contents.py
index d5648f62..9772fac5 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import with_statement
 try:
     from unittest2 import TestCase
@@ -83,18 +84,15 @@ class TestPage(TestCase):
 
         self.assertEqual(page.locale_date, dt.strftime(_DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']))
 
-        
+
         page_kwargs['settings'] = {x:_DEFAULT_CONFIG[x] for x in _DEFAULT_CONFIG}
         # I doubt this can work on all platforms ...
         if platform == "win32":
             locale = 'jpn'
         else:
-            locale = 'ja_JP'
-        page_kwargs['settings']['DATE_FORMATS'] = {'jp':(locale,'%Y-%m-%d(%a)')} 
+            locale = 'ja_JP.utf8'
+        page_kwargs['settings']['DATE_FORMATS'] = {'jp':(locale,'%Y-%m-%d(%a)')}
         page_kwargs['metadata']['lang'] = 'jp'
         page = Page( **page_kwargs)
         self.assertEqual(page.locale_date, u'2015-09-13(\u65e5)')
         # above is unicode in Japanese: 2015-09-13(��)
-
-
-

From 90dab85e131712757d50f152bd95d071dc2704ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Wed, 19 Oct 2011 07:15:16 +0200
Subject: [PATCH 0496/2864] Removed execution mode of generators.py

---
 pelican/generators.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 pelican/generators.py

diff --git a/pelican/generators.py b/pelican/generators.py
old mode 100755
new mode 100644

From c699172fd6b0b9fff0ff58c0d9ee51ed0dc0563b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Wed, 19 Oct 2011 07:27:22 +0200
Subject: [PATCH 0497/2864] Removed useless imports

---
 pelican/generators.py | 2 +-
 pelican/utils.py      | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 6c878bdd..1ac7e1e5 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -12,7 +12,7 @@ import urlparse
 from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
 from jinja2.exceptions import TemplateNotFound
 
-from pelican.utils import copy, get_relative_path, process_translations, open
+from pelican.utils import copy, process_translations, open
 from pelican.utils import slugify
 from pelican.contents import Article, Page, is_valid_content
 from pelican.readers import read_file
diff --git a/pelican/utils.py b/pelican/utils.py
index 27159a89..20faba93 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -2,8 +2,6 @@
 import re
 import os
 import shutil
-import time
-import calendar
 import pytz
 from datetime import datetime
 from codecs import open as _open

From 821fa5460ba77be6249f534d177c97e1336f594b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Wed, 19 Oct 2011 07:42:12 +0200
Subject: [PATCH 0498/2864] Removed execution mode of default_conf.py

---
 tests/default_conf.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 tests/default_conf.py

diff --git a/tests/default_conf.py b/tests/default_conf.py
old mode 100755
new mode 100644

From 9cced6be8367d0709a72ab9808efb7b3dda5a4c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Tue, 21 Feb 2012 17:53:53 +0100
Subject: [PATCH 0499/2864] Sort imports and remove trailing whitespaces

---
 pelican/contents.py      | 16 ++++++++--------
 pelican/generators.py    | 19 ++++++++++---------
 pelican/log.py           | 32 +++++++++++++++-----------------
 pelican/utils.py         | 15 +++++++++------
 pelican/writers.py       | 24 ++++++++++++------------
 tests/test_readers.py    |  3 ++-
 tools/pelican-import     | 29 +++++++++++++++--------------
 tools/pelican-quickstart | 21 ++++++++++-----------
 tools/pelican-themes     | 22 ++++++++++++----------
 9 files changed, 93 insertions(+), 88 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index f3a692c0..49f30316 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
-from pelican.utils import slugify, truncate_html_words
-from pelican.log import *
-from pelican.settings import _DEFAULT_CONFIG
-from datetime import datetime
+import datetime
 from os import getenv
 from sys import platform, stdin
 import locale
 
+from pelican.log import *
+from pelican.settings import _DEFAULT_CONFIG
+from pelican.utils import slugify, truncate_html_words
+
 class Page(object):
     """Represents a page
     Given a content, and metadata, create an adequate object.
@@ -90,7 +91,7 @@ class Page(object):
         if isinstance(self.date_format, tuple):
             locale.setlocale(locale.LC_ALL, self.date_format[0])
             self.date_format = self.date_format[1]
-	
+
         if hasattr(self, 'date'):
             if platform == 'win32':
                 self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode(stdin.encoding)
@@ -101,7 +102,7 @@ class Page(object):
         if not hasattr(self, 'status'):
             self.status = settings['DEFAULT_STATUS']
             if not settings['WITH_FUTURE_DATES']:
-                if hasattr(self, 'date') and self.date > datetime.now():
+                if hasattr(self, 'date') and self.date > datetime.datetime.now():
                     self.status = 'draft'
 
         # set summary
@@ -130,11 +131,10 @@ class Page(object):
         """Dummy function"""
         pass
 
-    summary = property(_get_summary, _set_summary, \
+    summary = property(_get_summary, _set_summary,
                        "Summary of the article. Based on the content. Can't be set")
 
 
-
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 1ac7e1e5..6715126a 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,22 +1,23 @@
 # -*- coding: utf-8 -*-
-from operator import attrgetter, itemgetter
-from itertools import chain
-from functools import partial
-from datetime import datetime
-from collections import defaultdict
 import os
+import datetime
 import math
 import random
 import urlparse
 
+from collections import defaultdict
+from functools import partial
+from itertools import chain
+from operator import attrgetter, itemgetter
+
 from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
 from jinja2.exceptions import TemplateNotFound
 
+from pelican.contents import Article, Page, is_valid_content
+from pelican.log import *
+from pelican.readers import read_file
 from pelican.utils import copy, process_translations, open
 from pelican.utils import slugify
-from pelican.contents import Article, Page, is_valid_content
-from pelican.readers import read_file
-from pelican.log import *
 
 
 class Generator(object):
@@ -231,7 +232,7 @@ class ArticlesGenerator(Generator):
 
             if 'date' not in metadata.keys()\
                 and self.settings['FALLBACK_ON_FS_DATE']:
-                    metadata['date'] = datetime.fromtimestamp(os.stat(f).st_ctime)
+                    metadata['date'] = datetime.datetime.fromtimestamp(os.stat(f).st_ctime)
 
             article = Article(content, metadata, settings=self.settings,
                               filename=f)
diff --git a/pelican/log.py b/pelican/log.py
index b7167dfc..2790aed3 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,8 +1,8 @@
+import os
+import sys
 from logging import CRITICAL, ERROR,  WARN, INFO, DEBUG
 from logging import critical, error, info, warning, warn, debug
 from logging import Formatter, getLogger, StreamHandler
-import sys
-import os
 
 global ANSI
 ANSI = {
@@ -62,20 +62,18 @@ class TextFormatter(Formatter):
 class DummyFormatter(object):
     """
     A dummy class.
-    Return an instance of the appropriate formatter (ANSIFormatter if sys.stdout.isatty() is True, else TextFormatter)
+    Return an instance of the appropriate formatter (ANSIFormatter if
+    sys.stdout.isatty() is True, else TextFormatter)
     """
 
     def __new__(cls, *args, **kwargs):
         if os.isatty(sys.stdout.fileno())\
-           and not sys.platform.startswith('win'): 
+           and not sys.platform.startswith('win'):
             return ANSIFormatter(*args, **kwargs)
         else:
             return TextFormatter( *args, **kwargs)
 
 
-
-
-
 def init(level=None, logger=getLogger(), handler=StreamHandler()):
     fmt = DummyFormatter()
     handler.setFormatter(fmt)
@@ -94,15 +92,15 @@ if __name__ == '__main__':
 
 
 __all__ = [
-    "debug", 
-    "info", 
-    "warn", 
+    "debug",
+    "info",
+    "warn",
     "warning",
-    "error", 
-    "critical", 
-    "DEBUG", 
-    "INFO", 
-    "WARN", 
-    "ERROR", 
+    "error",
+    "critical",
+    "DEBUG",
+    "INFO",
+    "WARN",
+    "ERROR",
     "CRITICAL"
-] 
+]
diff --git a/pelican/utils.py b/pelican/utils.py
index 20faba93..c2daae03 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-import re
 import os
-import shutil
 import pytz
-from datetime import datetime
+import re
+import shutil
+
 from codecs import open as _open
+from datetime import datetime
 from itertools import groupby
 from operator import attrgetter
 from pelican.log import warning, info
@@ -16,10 +17,10 @@ def get_date(string):
     If no format matches the given date, raise a ValuEerror
     """
     string = re.sub(' +', ' ', string)
-    formats = ['%Y-%m-%d %H:%M', '%Y/%m/%d %H:%M', 
+    formats = ['%Y-%m-%d %H:%M', '%Y/%m/%d %H:%M',
                '%Y-%m-%d', '%Y/%m/%d',
                '%d-%m-%Y', '%Y-%d-%m', # Weird ones
-               '%d/%m/%Y', '%d.%m.%Y', 
+               '%d/%m/%Y', '%d.%m.%Y',
                '%d.%m.%Y %H:%M', '%Y-%m-%d %H:%M:%S']
     for date_format in formats:
         try:
@@ -64,7 +65,7 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
 
     source_ = os.path.abspath(os.path.expanduser(os.path.join(source, path)))
     destination_ = os.path.abspath(
-            os.path.expanduser(os.path.join(destination, destination_path)))
+        os.path.expanduser(os.path.join(destination, destination_path)))
 
     if os.path.isdir(source_):
         try:
@@ -80,6 +81,7 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
         shutil.copy(source_, destination_)
         info('copying %s to %s' % (source_, destination_))
 
+
 def clean_output_dir(path):
     """Remove all the files from the output directory"""
 
@@ -228,6 +230,7 @@ def files_changed(path, extensions):
         return True
     return False
 
+
 def set_date_tzinfo(d, tz_name=None):
     """ Date without tzinfo shoudbe utc.
     This function set the right tz to date that aren't utc and don't have tzinfo
diff --git a/pelican/writers.py b/pelican/writers.py
index baf20408..814de40c 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 import os
-import re
 from codecs import open
 from functools import partial
 import locale
+import re
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
-from pelican.utils import get_relative_path, set_date_tzinfo
 from pelican.paginator import Paginator
 from pelican.log import *
+from pelican.utils import get_relative_path, set_date_tzinfo
 
 
 class Writer(object):
@@ -38,8 +38,8 @@ class Writer(object):
             description=item.content,
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', 'John Doe'),
-            pubdate=set_date_tzinfo(item.date, 
-                                    self.settings.get('TIMEZONE', None)))
+            pubdate=set_date_tzinfo(item.date,
+                self.settings.get('TIMEZONE', None)))
 
     def write_feed(self, elements, context, filename=None, feed_type='atom'):
         """Generate a feed with the list of articles provided
@@ -90,7 +90,7 @@ class Writer(object):
         :param context: dict to pass to the templates.
         :param relative_urls: use relative urls or absolutes ones
         :param paginated: dict of article list to paginate - must have the
-                          same length (same list in different orders)
+            same length (same list in different orders)
         :param **kwargs: additional variables to pass to the templates
         """
 
@@ -142,14 +142,14 @@ class Writer(object):
                     paginator = paginators[key]
                     page = paginator.page(page_num+1)
                     paginated_localcontext.update({'%s_paginator' % key: paginator,
-                                                   '%s_page' % key: page})
+                        '%s_page' % key: page})
                 if page_num > 0:
                     ext = '.' + paginated_name.rsplit('.')[-1]
                     paginated_name = paginated_name.replace(ext,
-                            '%s%s' % (page_num + 1, ext))
+                        '%s%s' % (page_num + 1, ext))
 
                 _write_file(template, paginated_localcontext, self.output_path,
-                        paginated_name)
+                    paginated_name)
         else:
             # no pagination
             _write_file(template, localcontext, self.output_path, name)
@@ -161,7 +161,7 @@ class Writer(object):
 
         :param name: name of the file to output.
         :param context: dict that will be passed to the templates, which need to
-                        be updated.
+            be updated.
         """
         def _update_content(name, input):
             """Change all the relatives paths of the input content to relatives
@@ -185,11 +185,11 @@ class Writer(object):
             def replacer(m):
                 relative_path = m.group('path')
                 dest_path = os.path.normpath( os.sep.join( (get_relative_path(name),
-                                    "static", relative_path) ) )
+                    "static", relative_path) ) )
                 return m.group('markup') + m.group('quote') + dest_path + m.group('quote')
 
             return hrefs.sub(replacer, content)
-        
+
         if context is None:
             return
         if hasattr(context, 'values'):
@@ -208,4 +208,4 @@ class Writer(object):
                 if relative_path not in paths:
                     paths.append(relative_path)
                     setattr(item, "_get_content",
-                            partial(_update_content, name, item))
+                        partial(_update_content, name, item))
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 211fb9be..1e920e09 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -4,8 +4,9 @@ try:
 except ImportError, e:
     import unittest as unittest2
 
-import os
 import datetime
+import os
+
 from pelican import readers
 
 CUR_DIR = os.path.dirname(__file__)
diff --git a/tools/pelican-import b/tools/pelican-import
index 1590e956..8dece140 100755
--- a/tools/pelican-import
+++ b/tools/pelican-import
@@ -1,11 +1,12 @@
 #! /usr/bin/env python
 
-from pelican.utils import slugify
+import argparse
+import os
+import time
 
 from codecs import open
-import os
-import argparse
-import time
+
+from pelican.utils import slugify
 
 
 def wp2fields(xml):
@@ -132,7 +133,7 @@ def dc2fields(file):
                         j=j+2
 
         """
-        dotclear2 does not use markdown by default unless you use the markdown plugin 
+        dotclear2 does not use markdown by default unless you use the markdown plugin
         Ref: http://plugins.dotaddict.org/dc2/details/formatting-markdown
         """
         if post_format == "markdown":
@@ -151,7 +152,7 @@ def feed2fields(file):
     d = feedparser.parse(file)
     for entry in d.entries:
         date = (time.strftime("%Y-%m-%d %H:%M", entry.updated_parsed)
-                if hasattr(entry, "updated_parsed") else None)
+            if hasattr(entry, "updated_parsed") else None)
         author = entry.author if hasattr(entry, "author") else None
         tags = [e['term'] for e in entry.tags] if hasattr(entry, "tags") else None
 
@@ -243,22 +244,22 @@ def main(input_type, input, out_markup, output_path, dircat=False):
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(
-            description="Transform feed, Wordpress or Dotclear files to rst files."
-                        "Be sure to have pandoc installed")
+        description="Transform feed, Wordpress or Dotclear files to rst files."
+            "Be sure to have pandoc installed")
 
     parser.add_argument(dest='input', help='The input file to read')
     parser.add_argument('--wpfile', action='store_true', dest='wpfile',
-            help='Wordpress XML export')
+        help='Wordpress XML export')
     parser.add_argument('--dotclear', action='store_true', dest='dotclear',
-            help='Dotclear export')
+        help='Dotclear export')
     parser.add_argument('--feed', action='store_true', dest='feed',
-            help='Feed to parse')
+        help='Feed to parse')
     parser.add_argument('-o', '--output', dest='output', default='output',
-            help='Output path')
+        help='Output path')
     parser.add_argument('-m', '--markup', dest='markup', default='rst',
-            help='Output markup format (supports rst & markdown)')
+        help='Output markup format (supports rst & markdown)')
     parser.add_argument('--dir-cat', action='store_true', dest='dircat',
-            help='Put files in directories with categories name')
+        help='Put files in directories with categories name')
     args = parser.parse_args()
 
     input_type = None
diff --git a/tools/pelican-quickstart b/tools/pelican-quickstart
index ef6dff53..4048c2bf 100755
--- a/tools/pelican-quickstart
+++ b/tools/pelican-quickstart
@@ -5,7 +5,7 @@ import os, sys, argparse, string
 from pelican import __version__
 
 TEMPLATES={
-	'Makefile' : '''
+    'Makefile' : '''
 PELICAN=$pelican
 PELICANOPTS=$pelicanopts
 
@@ -75,10 +75,10 @@ DEFAULT_LANG='$lang'
 
 # Blogroll
 LINKS =  (
-          ('Pelican', 'http://docs.notmyidea.org/alexis/pelican/'),
-          ('Python.org', 'http://python.org'),
-          ('Jinja2', 'http://jinja.pocoo.org'),
-          ('You can modify those links in your config file', '#')
+    ('Pelican', 'http://docs.notmyidea.org/alexis/pelican/'),
+    ('Python.org', 'http://python.org'),
+    ('Jinja2', 'http://jinja.pocoo.org'),
+    ('You can modify those links in your config file', '#')
          )
 
 # Social widget
@@ -129,7 +129,7 @@ def ask(question, answer=str, default=None, l=None):
                 r = raw_input('> {0} '.format(question, default))
 
             r = r.strip()
-            
+
             if len(r) <= 0:
                 if default:
                     r = default
@@ -194,17 +194,16 @@ def ask(question, answer=str, default=None, l=None):
 
 def main():
     parser = argparse.ArgumentParser(description="A kickstarter for pelican")
-    parser.add_argument('-p', '--path', default=".", 
+    parser.add_argument('-p', '--path', default=".",
             help="The path to generate the blog into")
     parser.add_argument('-t', '--title', default=None, metavar="title",
             help='Set the title of the website')
     parser.add_argument('-a', '--author', default=None, metavar="author",
             help='Set the author name of the website')
-    parser.add_argument('-l', '--lang', default=None, metavar="lang", 
+    parser.add_argument('-l', '--lang', default=None, metavar="lang",
             help='Set the default lang of the website')
 
     args = parser.parse_args()
-    
 
     print('''Welcome to pelican-quickstart v{v}.
 
@@ -213,7 +212,7 @@ This script will help you creating a new Pelican based website.
 Please answer the following questions so this script can generate the files needed by Pelican.
 
     '''.format(v=__version__))
-    
+
     CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new Web site ?', answer=str, default=args.path))
     CONF['sitename'] = ask('How will you call your Web site ?', answer=str, default=args.title)
     CONF['author'] = ask('Who will be the author of this Web site ?', answer=str, default=args.author)
@@ -227,7 +226,7 @@ Please answer the following questions so this script can generate the files need
         CONF['default_pagination'] = False
 
     mkfile = ask('Do you want to generate a Makefile to easily manage your website ?', bool, True)
-    
+
     if mkfile:
         if ask('Do you want to upload your website using FTP ?', answer=bool, default=False):
             CONF['ftp_host'] = ask('What is the hostname of your FTP server ?', str, CONF['ftp_host'])
diff --git a/tools/pelican-themes b/tools/pelican-themes
index efc34c29..78df4a48 100755
--- a/tools/pelican-themes
+++ b/tools/pelican-themes
@@ -1,8 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import os, sys, shutil
 import argparse
+import os
+import shutil
+import sys
 
 try:
     import pelican
@@ -38,11 +40,11 @@ def main():
 
     excl= parser.add_mutually_exclusive_group()
     excl.add_argument('-l', '--list', dest='action', action="store_const", const='list',
-                        help="Show the themes already installed and exit")
+        help="Show the themes already installed and exit")
     excl.add_argument('-p', '--path', dest='action', action="store_const", const='path',
-                        help="Show the themes path and exit")
+        help="Show the themes path and exit")
     excl.add_argument('-V', '--version', action='version', version='pelican-themes v{0}'.format(__version__),
-            help='Print the version of this script')
+        help='Print the version of this script')
 
 
     parser.add_argument('-i', '--install', dest='to_install', nargs='+', metavar="theme path",
@@ -52,16 +54,16 @@ def main():
     parser.add_argument('-s', '--symlink', dest='to_symlink', nargs='+', metavar="theme path",
         help="Same as `--install', but create a symbolic link instead of copying the theme. Useful for theme development")
     parser.add_argument('-c', '--clean', dest='clean', action="store_true",
-                        help="Remove the broken symbolic links of the theme path")
+        help="Remove the broken symbolic links of the theme path")
 
 
     parser.add_argument('-v', '--verbose', dest='verbose', action="store_true",
-                        help="Verbose output")
+        help="Verbose output")
 
 
     args = parser.parse_args()
 
-    
+
     if args.action:
         if args.action is 'list':
             list_themes(args.verbose)
@@ -93,7 +95,7 @@ def main():
         if args.clean:
             if args.verbose:
                 print('Cleaning the themes directory...')
-            
+
             clean(v=args.verbose)
     else:
         print('No argument given... exiting.')
@@ -142,7 +144,7 @@ def remove(theme_name, v=False):
             print('Removing directory `' + target + "'")
         shutil.rmtree(target)
     elif os.path.exists(target):
-        err(target + ' : not a valid theme') 
+        err(target + ' : not a valid theme')
     else:
         err(target + ' : no such file or directory')
 
@@ -210,6 +212,6 @@ def clean(v=False):
                     c+=1
 
     print("\nRemoved {0} broken links".format(c))
-    
+
 if __name__ == '__main__':
     main()

From 483bed74b8ba7275771ca77e38f239d0604a9c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Tue, 21 Feb 2012 17:55:44 +0100
Subject: [PATCH 0500/2864] Removed extra whitespace before /usr/bin/env

---
 tools/pelican-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pelican-import b/tools/pelican-import
index 8dece140..3a931afd 100755
--- a/tools/pelican-import
+++ b/tools/pelican-import
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python
 
 import argparse
 import os

From a4e620680c3e0a4b378ba5d6e4e0c6a6bf4c6e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Tue, 28 Feb 2012 17:10:51 +0100
Subject: [PATCH 0501/2864] Add pytz in requirements

---
 dev_requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index 36059d8a..198880ec 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -3,3 +3,4 @@ Pygments
 docutils
 feedgenerator
 unittest2
+pytz

From e0308e352889426c4e39bc1995e1f19d66ee1b33 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 28 Feb 2012 18:59:46 +0100
Subject: [PATCH 0502/2864] bump version

---
 pelican/__init__.py | 6 +++---
 setup.py            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index edd30968..6ea5ab0f 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,7 +9,7 @@ from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 from pelican import log
 
-__version__ = "2.7.2"
+__version__ = "2.8.0"
 
 
 class Pelican(object):
@@ -63,10 +63,10 @@ class Pelican(object):
             if hasattr(p, 'generate_context'):
                 p.generate_context()
 
-        # erase the directory if it is not the source and if that's 
+        # erase the directory if it is not the source and if that's
         # explicitely asked
         if (self.delete_outputdir and not
-                os.path.realpath(self.path).startswith(self.output_path)): 
+                os.path.realpath(self.path).startswith(self.output_path)):
             clean_output_dir(self.output_path)
 
         writer = self.get_writer()
diff --git a/setup.py b/setup.py
index 510a6855..1d6b3615 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
 import sys
 import platform
 
-VERSION = "2.7.2" # find a better way to do so.
+VERSION = "2.8.0" # find a better way to do so.
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'pytz']
 if sys.version_info < (2,7):
@@ -13,7 +13,7 @@ scripts = ['bin/pelican', 'tools/pelican-themes', 'tools/pelican-import', 'tools
 
 if sys.platform.startswith('win'):
     scripts += [
-        'bin/pelican.bat', 'tools/pelican-themes.bat', 
+        'bin/pelican.bat', 'tools/pelican-themes.bat',
         'tools/pelican-import.bat', 'tools/pelican-quickstart.bat'
     ]
 

From 6c5fe3b0cf8708550c672377de8728a1625e5ddd Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 28 Feb 2012 19:09:41 +0100
Subject: [PATCH 0503/2864] prepare next release

---
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 6ea5ab0f..710c9ff1 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,7 +9,7 @@ from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 from pelican import log
 
-__version__ = "2.8.0"
+__version__ = "3.0"
 
 
 class Pelican(object):
diff --git a/setup.py b/setup.py
index 1d6b3615..e01448ed 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
 import sys
 import platform
 
-VERSION = "2.8.0" # find a better way to do so.
+VERSION = "3.0" # find a better way to do so.
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'pytz']
 if sys.version_info < (2,7):

From 917633628ac5e7dfb654fbfb9ce0963d3d3eb3a9 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 29 Feb 2012 18:15:38 +0100
Subject: [PATCH 0504/2864] add some more articles for the tests

---
 samples/content/article2-fr.rst | 9 +++++++++
 samples/content/article2.rst    | 9 +++++++++
 samples/pelican.conf.py         | 2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 samples/content/article2-fr.rst
 create mode 100644 samples/content/article2.rst

diff --git a/samples/content/article2-fr.rst b/samples/content/article2-fr.rst
new file mode 100644
index 00000000..31970f7e
--- /dev/null
+++ b/samples/content/article2-fr.rst
@@ -0,0 +1,9 @@
+Deuxième article
+################
+
+:tags: foo, bar, baz
+:date: 2012-02-29
+:lang: fr
+:slug: second-article
+
+Ceci est un article, en français.
diff --git a/samples/content/article2.rst b/samples/content/article2.rst
new file mode 100644
index 00000000..66f768ea
--- /dev/null
+++ b/samples/content/article2.rst
@@ -0,0 +1,9 @@
+Second article
+##############
+
+:tags: foo, bar, baz
+:date: 2012-02-29
+:lang: en
+:slug: second-article
+
+This is some article, in english
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index fb3b091b..d725265c 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -9,7 +9,7 @@ DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
 LOCALE = ""
-DEFAULT_PAGINATION = 2
+DEFAULT_PAGINATION = 4
 
 FEED_RSS = 'feeds/all.rss.xml'
 CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'

From ddac40e9cbdc002766548ea4d9535ff77e174949 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 3 Mar 2012 18:26:07 +0100
Subject: [PATCH 0505/2864] Include .bat files in the distribution. Fix #221

---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index a092ecd0..fc46d905 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,3 +2,4 @@ include *.rst
 global-include *.py
 recursive-include pelican *.html *.css *png
 include LICENSE
+global-include *.bat

From bde06c401174d74d6c449bae0725f6853f3e726e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 6 Mar 2012 06:13:17 -0800
Subject: [PATCH 0506/2864] Improve English documentation with enhanced
 clarity, grammar, and spelling

---
 README.rst               |  45 +++++----
 docs/contribute.rst      |  36 +++----
 docs/faq.rst             |  55 ++++++-----
 docs/getting_started.rst | 140 ++++++++++++++------------
 docs/importer.rst        |   8 +-
 docs/index.rst           |  41 ++++----
 docs/internals.rst       |  91 +++++++++--------
 docs/pelican-themes.rst  |  14 +--
 docs/settings.rst        | 208 ++++++++++++++++++++-------------------
 docs/themes.rst          | 170 ++++++++++++++++----------------
 docs/tips.rst            |  18 ++--
 11 files changed, 426 insertions(+), 400 deletions(-)

diff --git a/README.rst b/README.rst
index 8a6ef04c..0a27bdcd 100644
--- a/README.rst
+++ b/README.rst
@@ -3,51 +3,54 @@ Pelican
 
 Pelican is a simple weblog generator, written in `Python <http://www.python.org/>`_.
 
-* Write your weblog entries directly with your editor of choice (vim!) and
-  directly in `reStructuredText <http://docutils.sourceforge.net/rst.html>`_, or `Markdown <http://daringfireball.net/projects/markdown/>`_.
-* A simple cli-tool to (re)generate the weblog.
+* Write your weblog entries directly with your editor of choice (vim!) 
+  in `reStructuredText <http://docutils.sourceforge.net/rst.html>`_ or `Markdown <http://daringfireball.net/projects/markdown/>`_
+* Includes a simple CLI tool to (re)generate the weblog
 * Easy to interface with DVCSes and web hooks
-* Completely static output, so easy to host anywhere !
+* Completely static output is easy to host anywhere
 
 Features
 --------
 
 Pelican currently supports:
 
-* blog articles and pages
-* comments, via an external service (disqus). Please notice that while
-  it's useful, it's an external service, and you'll not manage the
-  comments by yourself. It could potentially eat your data.
-* theming support (themes are done using `jinja2 <http://jinjna.pocoo.org>`_)
-* PDF generation of the articles/pages (optional).
-* Translations
-* Syntactic recognition
+* Blog articles and pages
+* Comments, via an external service (Disqus). (Please note that while
+  useful, Disqus is an external service, and thus the comment data will be
+  somewhat outside of your control and potentially subject to data loss.)
+* Theming support (themes are created using `jinja2 <http://jinja.pocoo.org/>`_)
+* PDF generation of the articles/pages (optional)
+* Publication of articles in multiple languages
+* Atom/RSS feeds
+* Code syntax highlighting
+* Import from WordPress, Dotclear, or RSS feeds
+* Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
-Have a look to `the documentation <http://alexis.notmyidea.org/pelican/>`_ for
-more informations.
+Have a look at `the documentation <http://pelican.notmyidea.org/en/latest/>`_ for
+more information.
 
-Why the name "Pelican" ?
+Why the name "Pelican"?
 ------------------------
 
-Heh, you didn't noticed? "Pelican" is an anagram for "Calepin" ;)
+Heh, you didn't notice? "Pelican" is an anagram for "Calepin" ;)
 
 Source code
 -----------
 
-You can access the source code via git on http://github.com/ametaireau/pelican/
+You can access the source code via git at: https://github.com/ametaireau/pelican
 
-If you feel hackish, have a look to the `pelican's internals explanations
-<http://alexis.notmyidea.org/pelican/internals.html>`_.
+If you feel hackish, have a look at the `pelican's internals explanation
+<http://pelican.notmyidea.org/en/latest/internals.html>`_.
 
 Feedback / Contact us
 =====================
 
-If you want to see new features in Pelican, dont hesitate to tell me, to clone
+If you want to see new features in Pelican, don't hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
 
 Contact me at "alexis at notmyidea dot org" for any request/feedback! You can
 also join the team at `#pelican on irc.freenode.org 
 <irc://irc.freenode.net/pelican>`_ 
-(or if you don't have any IRC client, using `the webchat
+(or if you don't have any IRC client, use `the webchat
 <http://webchat.freenode.net/?channels=pelican&uio=d4>`_)
 for quick feedback.
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 0aaa5771..84b99293 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -1,28 +1,28 @@
-How to contribute ?
+How to contribute?
 ###################
-There are many ways to contribute to pelican. You can enhance the
-documentation, add missing features, fix bugs or just report them.
+There are many ways to contribute to Pelican. You can enhance the
+documentation, add missing features, and fix bugs (or just report them).
 
-Don't hesitate to fork and make a pull request on github.
+Don't hesitate to fork and make a pull request on GitHub.
 
-Set up the development environment
-==================================
+Setting up the development environment
+======================================
 
-You're free to setup up the environment in any way you like. Here is a way
-using virtualenv and virtualenvwrapper. If you don't have them, you can install
-them using::
+You're free to set up your development environment any way you like. Here is a
+way using virtualenv and virtualenvwrapper. If you don't have them, you can
+install these packages via::
 
     $ pip install virtualenvwrapper
 
-Virtual environments allow you to work on an installation of python which is
-not the one installed on your system. Especially, it will install the different
-projects under a different location.
+Virtual environments allow you to work on Python projects which are isolated
+from one another so you can use different packages (and package versions) with
+different projects.
 
-To create the virtualenv environment, you have to do::
+To create a virtual environment, use the following syntax::
 
-    $ mkvirtualenv pelican --no-site-package
+    $ mkvirtualenv pelican 
 
-Then you would have to install all the dependencies::
+To manually install the dependencies::
 
     $ pip install -r dev_requirements.txt
     $ python setup.py develop
@@ -31,10 +31,10 @@ Running the test suite
 ======================
 
 Each time you add a feature, there are two things to do regarding tests:
-checking that the tests run in a right way, and be sure that you add tests for
-the feature you are working on or the bug you're fixing.
+checking that the existing tests pass, and adding tests for your new feature
+or for the bug you're fixing.
 
-The tests leaves under "pelican/tests" and you can run them using the
+The tests live in "pelican/tests" and you can run them using the
 "discover" feature of unittest2::
 
     $ unit2 discover
diff --git a/docs/faq.rst b/docs/faq.rst
index dbdf9692..b3dbca87 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -1,50 +1,51 @@
 Frequently Asked Questions (FAQ)
 ################################
 
-Here is a summary of the frequently asked questions for pelican.
+Here is a summary of the frequently asked questions for Pelican.
 
-Is it mandatory to have a configuration file ?
-==============================================
+Is it mandatory to have a configuration file?
+=============================================
 
-No, it's not. Configurations files are just an easy way to configure pelican.
-For the basic operations, it's possible to specify options while invoking
-pelican with the command line (see `pelican --help` for more informations about
-that)
+No, it's not. Configuration files are just an easy way to configure Pelican.
+For basic operations, it's possible to specify options while invoking Pelican
+via the command line. See `pelican --help` for more information.
 
-I'm creating my own theme, how to use pygments ?
-================================================
+I'm creating my own theme. How do I use Pygments for syntax highlighting?
+=========================================================================
 
-Pygment add some classes to the generated content, so the theming of your theme
-will be done thanks to a css file. You can have a look to the one proposed by
-default `on the project website <http://pygments.org/demo/15101/>`_
+Pygments adds some classes to the generated content. These classes are used by
+themes to style code syntax highlighting via CSS. Specifically, you can
+customize the appearance of your syntax highlighting via the `.codehilite pre` 
+class in your theme's CSS file. To see how various styles can be used to render
+Django code, for example, you can use the demo `on the project website
+<http://pygments.org/demo/15101/>`_.
 
-How do I create my own theme ?
+How do I create my own theme?
 ==============================
 
-Please refer yourself to :ref:`theming-pelican`.
+Please refer to :ref:`theming-pelican`.
 
-How can I help ?
+How can I help?
 ================
 
-You have different options to help. First, you can use pelican, and report any
-idea or problem you have on `the bugtracker
+There are several ways to help out. First, you can use Pelican and report any
+suggestions or problems you might have on `the bugtracker
 <http://github.com/ametaireau/pelican/issues>`_.
 
-If you want to contribute, please have a look to `the git repository
-<https://github.com/ametaireau/pelican/>`_, fork it, add your changes and do
-a pull request, I'll review them as soon as possible.
+If you want to contribute, please fork `the git repository
+<https://github.com/ametaireau/pelican/>`_, make your changes, and issue
+a pull request. I'll review your changes as soon as possible.
 
-You can also contribute by creating themes, and making the documentation
-better.
+You can also contribute by creating themes and improving the documentation.
 
-I want to use markdown, but I got an error
-==========================================
+I want to use Markdown, but I got an error.
+===========================================
 
-Markdown is not a hard dependency for pelican, so you will need to install it
-by yourself. You can do so by typing::
+Markdown is not a hard dependency for Pelican, so you will need to explicitly
+install it. You can do so by typing::
 
     $ (sudo) pip install markdown
 
-In case you don't have pip installed, consider installing it by doing::
+In case you don't have pip installed, consider installing it via::
 
     $ (sudo) easy_install pip
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 3e60b63a..1647fee4 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -4,13 +4,12 @@ Getting started
 Installing
 ==========
 
-You're ready? Let's go ! You can install pelican in a lot of different ways,
-the simpler one is via `pip <http://pip.openplans.org/>`_::
+You're ready? Let's go! You can install Pelican via several different methods. The simplest is via `pip <http://pip.openplans.org/>`_::
 
     $ pip install pelican
 
-If you have the sources, you can install pelican using the distutils command
-install. I recommend to do so in a virtualenv::
+If you have the project source, you can install Pelican using the distutils 
+method. I recommend doing so in a virtualenv::
 
     $ virtualenv pelican_venv
     $ source bin/activate
@@ -19,30 +18,30 @@ install. I recommend to do so in a virtualenv::
 Dependencies
 ------------
 
-At this time, pelican is dependent of the following python packages:
+At this time, Pelican is dependent on the following Python packages:
 
-* feedgenerator, to generate the ATOM feeds.
-* jinja2, for templating support.
+* feedgenerator, to generate the Atom feeds
+* jinja2, for templating support
 
-If you're not using python 2.7, you will also need `argparse`.
+If you're not using Python 2.7, you will also need `argparse`.
 
 Optionally:
 
-* docutils, for reST support
-* pygments, to have syntactic colorization with resT input
-* Markdown, for Markdown as an input format
+* pygments, for syntax highlighting
+* docutils, for supporting reStructuredText as an input format
+* Markdown, for supporting Markdown as an input format
 
-Writing articles using pelican
+Writing articles using Pelican
 ==============================
 
-Files metadata
+File metadata
 --------------
 
-Pelican tries to be smart enough to get the informations it needs from the
-file system (for instance, about the category of your articles), but you need to
-provide by hand some of those informations in your files.
+Pelican tries to be smart enough to get the information it needs from the
+file system (for instance, about the category of your articles), but some
+information you need to provide in the form of metadata inside your files.
 
-You could provide the metadata in the restructured text files, using the
+You can provide this metadata in reStructuredText text files via the
 following syntax (give your file the `.rst` extension)::
 
     My super title
@@ -54,31 +53,35 @@ following syntax (give your file the `.rst` extension)::
     :author: Alexis Metaireau
 
 
-You can also use a markdown syntax (with a file ending in `.md`)::
+You can also use Markdown syntax (with a file ending in `.md`)::
 
     Date: 2010-12-03
     Title: My super title
+    Tags: thats, awesome
+    Slug: my-super-post
 
-    Put you content here.
+    This is the content of my super blog post.
 
-Note that none of those are mandatory: if the date is not specified, pelican will
-rely on the mtime of your file, and the category can also be determined by the
-directory where the rst file is. For instance, the category of
-`python/foobar/myfoobar.rst` is `foobar`.
+Note that, aside from the title, none of this metadata is mandatory: if the date
+is not specified, Pelican will rely on the file's "mtime" timestamp, and the
+category can be determined by the directory in which the file resides. For
+example, a file located at `python/foobar/myfoobar.rst` will have a category of
+`foobar`.
 
 Generate your blog
 ------------------
 
-To launch pelican, just use the `pelican` command::
+To launch Pelican, just use the `pelican` command::
 
     $ pelican /path/to/your/content/ [-s path/to/your/settings.py]
 
-And… that's all! You can see your weblog generated on the `content/` folder.
+And… that's all! Your weblog will be generated and saved in the `content/`
+folder.
 
-This one will just generate a simple output, with the default theme. It's not
-really sexy, as it's a simple HTML output (without any style).
+The above command will use the default theme to produce a simple site. It's not
+very sexy, as it's just simple HTML output (without any style).
 
-You can create your own style if you want, have a look to the help to see all
+You can create your own style if you want. Have a look at the help to see all
 the options you can use::
 
     $ pelican --help
@@ -88,7 +91,7 @@ Kickstart a blog
 
 You also can use the `pelican-quickstart` script to start a new blog in
 seconds, by just answering few questions. Just run `pelican-quickstart` and
-you're done! (Added in pelican 3)
+you're done! (Added in Pelican 3.0)
 
 Pages
 -----
@@ -102,26 +105,26 @@ the menu.
 Importing an existing blog
 --------------------------
 
-It is possible to import your blog from dotclear, wordpress and an RSS feed using 
+It is possible to import your blog from Dotclear, WordPress, and RSS feeds using 
 a simple script. See :ref:`import`.
 
 Translations
 ------------
 
 It is possible to translate articles. To do so, you need to add a `lang` meta
-in your articles/pages, and to set a `DEFAULT_LANG` setting (which is en by
-default). 
-Then, only articles with this default language will be listed, and
-each article will have a translation list.
+attribute to your articles/pages and set a `DEFAULT_LANG` setting (which is
+English [en] by default). With those settings in place, only articles with the
+default language will be listed, and each article will be accompanied by a list
+of available translations for that article.
 
-Pelican uses the "slug" of two articles to compare if they are translations of
-each others. So it's possible to define (in restructured text) the slug
-directly.
+Pelican uses the article's URL "slug" to determine if two or more articles are
+translations of one another. The slug can be set manually in the file's
+metadata; if not set explicitly, Pelican will auto-generate the slug from the
+title of the article.
 
-Here is an exemple of two articles (one in english and the other one in
-french).
+Here is an example of two articles, one in English and the other in French.
 
-The english one::
+The English article::
 
     Foobar is not dead
     ##################
@@ -129,9 +132,9 @@ The english one::
     :slug: foobar-is-not-dead
     :lang: en
 
-    That's true, foobar is still alive !
+    That's true, foobar is still alive!
 
-And the french one::
+And the French version::
 
     Foobar n'est pas mort !
     #######################
@@ -141,56 +144,67 @@ And the french one::
 
     Oui oui, foobar est toujours vivant !
 
-Despite the text quality, you can see that only the slug is the same here.
-You're not forced to define the slug that way, and it's completely possible to
-have two translations with the same title (which defines the slug)
+Post content quality notwithstanding, you can see that only item in common
+between the two articles is the slug, which is functioning here as an
+identifier. If you'd rather not explicitly define the slug this way, you must
+then instead ensure that the translated article titles are identical, since the
+slug will be auto-generated from the article title.
 
-Syntactic recognition
+Syntax highlighting
 ---------------------
 
-Pelican is able to regognise the syntax you are using, and to colorize the
-right way your block codes. To do so, you have to use the following syntax::
+Pelican is able to provide colorized syntax highlighting for your code blocks.
+To do so, you have to use the following convention for reStructuredText::
 
     .. code-block:: identifier
 
        your code goes here
 
-The identifier is one of the lexers available `here
-<http://pygments.org/docs/lexers/>`_.
+For Markdown, format your code blocks thusly:
 
-You also can use the default `::` syntax::
+    ::identifier
+    your code goes here
+
+The specified identifier should be one that appears on the 
+`list of available lexers <http://pygments.org/docs/lexers/>`_.
+
+You also can use the default `::` syntax, in which case it will be assumed
+that your code is written in Python. For reStructuredText::
 
     ::
         
         your code goes here
 
-It will be assumed that your code is witten in python.
+For Markdown:
+
+    ::
+    your code goes here
 
 Autoreload
 ----------
 
-It's possible to tell pelican to watch for your modifications, instead of
-manually launching it each time you need. Use the `-r` option, or
-`--autoreload`.
+It's possible to tell Pelican to watch for your modifications, instead of
+manually launching it every time you want to see your changes. To enable this,
+run the `pelican` command with the `-r` or `--autoreload` options.
 
 Publishing drafts
 -----------------
 
-If you want to publish an article as a draft, for friends to review it for
-instance, you can add a ``status: draft`` to its metadata, it will then be
-available under the ``drafts`` folder, and not be listed under the index page nor
-any category page.
+If you want to publish an article as a draft (for friends to review before
+publishing, for example), you can add a ``status: draft`` attribute to its
+metadata. That article will then be output to the ``drafts`` folder and not
+listed on the index page nor on any category page.
 
 Viewing the generated files
 ---------------------------
 
-The files generated by pelican are static files, so you don't actually need
-something special to see what's hapenning with the generated files.
+The files generated by Pelican are static files, so you don't actually need
+anything special to see what's happening with the generated files.
 
-You can either run your browser on the files on your disk::
+You can either use your browser to open the files on your disk::
 
     $ firefox output/index.html
 
-Or run a simple web server using python::
+Or run a simple web server using Python::
 
     cd output && python -m SimpleHTTPServer
diff --git a/docs/importer.rst b/docs/importer.rst
index 6e5734ae..377820af 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -10,11 +10,11 @@ Description
 ``pelican-import`` is a command line tool for converting articles from other
 software to ReStructuredText. The supported formats are:
 
-- Wordpress XML export
+- WordPress XML export
 - Dotclear export
-- RSS/ATOM feed
+- RSS/Atom feed
 
-The conversion from HTML to ReStructuredText relies on `pandoc
+The conversion from HTML to reStructuredText relies on `pandoc
 <http://johnmacfarlane.net/pandoc/>`_. For Dotclear, if the source posts are
 written with Markdown syntax, they will not be converted (as Pelican also
 supports Markdown).
@@ -40,7 +40,7 @@ Optional arguments:
 Examples
 ========
 
-for Wordpress::
+for WordPress::
 
     $ pelican-import --wpfile -o ~/output ~/posts.xml
 
diff --git a/docs/index.rst b/docs/index.rst
index 38ebf49c..c6638997 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,57 +1,58 @@
 Pelican
 #######
 
-Pelican is a simple weblog generator, written in python.
+Pelican is a simple weblog generator, written in Python.
 
-* Write your weblog entries directly with your editor of choice (vim!) and
-  directly in restructured text, or markdown.
-* A simple cli-tool to (re)generate the weblog.
+* Write your weblog entries directly with your editor of choice (vim!) in
+  reStructuredText or Markdown
+* A simple CLI tool to (re)generate the weblog
 * Easy to interface with DVCSes and web hooks
-* Completely static output, so easy to host anywhere !
+* Completely static output is easy to host anywhere
 
 Features
 ========
 
 Pelican currently supports:
 
-* blog articles and simple pages
-* comments, via an external service (disqus). Please notice that while
-  it's useful, it's an external service, and you'll not manage the
-  comments by yourself. It could potentially eat your data. (optional)
-* easy theming (themes are done using `jinja2 <http://jinja.pocoo.org>`_)
-* PDF generation of the articles/pages (optional).
-* publication of articles in various languages
-* RSS/Atom feeds
-* wordpress/dotclear or RSS imports
-* integration with various tools: twitter/google analytics (optional)
+* Blog articles and pages
+* Comments, via an external service (Disqus). (Please note that while
+  useful, Disqus is an external service, and thus the comment data will be
+  somewhat outside of your control and potentially subject to data loss.)
+* Theming support (themes are created using `jinja2 <http://jinja.pocoo.org/>`_)
+* PDF generation of the articles/pages (optional)
+* Publication of articles in multiple languages
+* Atom/RSS feeds
+* Code syntax highlighting
+* Import from WordPress, Dotclear, or RSS feeds
+* Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
 Why the name "Pelican" ?
 ========================
 
-Heh, you didn't noticed? "Pelican" is an anagram for "Calepin" ;)
+Heh, you didn't notice? "Pelican" is an anagram for "Calepin" ;)
 
 Source code
 ===========
 
-You can access the source code via git on http://github.com/ametaireau/pelican/
+You can access the source code via git at http://github.com/ametaireau/pelican/
 
 Feedback / Contact us
 =====================
 
-If you want to see new features in Pelican, dont hesitate to tell me, to clone
+If you want to see new features in Pelican, don't hesitate to tell me, to clone
 the repository, etc. That's open source, dude!
 
 Contact me at "alexis at notmyidea dot org" for any request/feedback! You can
 also join the team at `#pelican on irc.freenode.org
 <irc://irc.freenode.net/pelican>`_
-(or if you don't have any IRC client, using `the webchat
+(or if you don't have any IRC client, use `the webchat
 <http://webchat.freenode.net/?channels=pelican&uio=d4>`_)
 for quick feedback.
 
 Documentation
 =============
 
-A french version of the documentation is available at :doc:`fr/index`.
+A French version of the documentation is available at :doc:`fr/index`.
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/internals.rst b/docs/internals.rst
index 269fe415..f0934825 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -1,49 +1,48 @@
 Pelican internals
 #################
 
-This section describe how pelican is working internally. As you'll see, it's
-quite simple, but a bit of documentation doesn't hurt :)
+This section describe how Pelican works internally. As you'll see, it's
+quite simple, but a bit of documentation doesn't hurt.  :)
 
-You can also find in :doc:`report` an excerpt of a report the original author
-wrote, with some software design information.
+You can also find in the :doc:`report` section an excerpt of a report the
+original author wrote with some software design information.
 
 .. _report: :doc:`report`
 
 Overall structure
 =================
 
-What `pelican` does, is taking a list of files, and processing them, to some
-sort of output. Usually, the files are restructured text and markdown files,
-and the output is a blog, but it can be anything you want.
+What `pelican` does is take a list of files and process them into some
+sort of output. Usually, the input files are reStructuredText and Markdown
+files, and the output is a blog, but both input and output can be anything you
+want.
 
-I've separated the logic in different classes and concepts:
+The logic is separated into different classes and concepts:
 
-* `writers` are responsible of all the writing process of the
-  files. It's writing .html files, RSS feeds and so on. Since those operations 
-  are commonly used, the object is created once, and then passed to the 
-  generators.
+* `writers` are responsible for writing files: .html files, RSS feeds, and so
+  on. Since those operations are commonly used, the object is created once and
+  then passed to the generators.
 
-* `readers` are used to read from various formats (Markdown, and Restructured
-  Text for now, but the system is extensible). Given a file, they return
-  metadata (author, tags, category etc) and content (HTML formated)
+* `readers` are used to read from various formats (Markdown and
+  reStructuredText for now, but the system is extensible). Given a file, they return
+  metadata (author, tags, category, etc.) and content (HTML-formatted).
 
-* `generators` generate the different outputs. For instance, pelican comes with
-  `ArticlesGenerator` and `PageGenerator`, into others. Given
-  a configurations, they can do whatever they want. Most of the time it's
-  generating files from inputs.
+* `generators` generate the different outputs. For instance, Pelican comes with
+  `ArticlesGenerator` and `PageGenerator`. Given a configuration, they can do
+  whatever they want. Most of the time, it's generating files from inputs.
 
-* `pelican` also uses `templates`, so it's easy to write you own theme. The
+* `pelican` also uses `templates`, so it's easy to write your own theme. The
   syntax is `jinja2`, and, trust me, really easy to learn, so don't hesitate
-  a second.
+  to jump in and build your own theme.
 
-How to implement a new reader ?
-===============================
+How to implement a new reader?
+==============================
 
-There is an awesome markup language you want to add to pelican ?
-Well, the only thing you have to do is to create a class that have a `read`
-method, that is returning an HTML content and some metadata.
+Is there an awesome markup language you want to add to Pelican?
+Well, the only thing you have to do is to create a class with a `read`
+method that returns HTML content and some metadata.
 
-Take a look to the Markdown reader::
+Take a look at the Markdown reader::
 
     class MarkdownReader(Reader):
         enabled = bool(Markdown)
@@ -63,31 +62,31 @@ Take a look to the Markdown reader::
                 metadata[name.lower()] = meta
             return content, metadata
 
-Simple isn't it ?
+Simple, isn't it?
 
-If your new reader requires additional Python dependencies then you should wrap
-their `import` statements in `try...except`.  Then inside the reader's class
-set the `enabled` class attribute to mark import success or failure.  This makes
-it possible for users to continue using their favourite markup method without
-needing to install modules for all the additional formats they don't use.
+If your new reader requires additional Python dependencies, then you should wrap
+their `import` statements in a `try...except` block.  Then inside the reader's
+class, set the `enabled` class attribute to mark import success or failure.
+This makes it possible for users to continue using their favourite markup method
+without needing to install modules for formats they don't use.
 
-How to implement a new generator ?
-==================================
+How to implement a new generator?
+=================================
 
-Generators have basically two important methods. You're not forced to create
-both, only the existing ones will be called.
+Generators have two important methods. You're not forced to create
+both; only the existing ones will be called.
 
-* `generate_context`, that is called in a first place, for all the generators.
+* `generate_context`, that is called first, for all the generators.
   Do whatever you have to do, and update the global context if needed. This
   context is shared between all generators, and will be passed to the
-  templates. For instance, the `PageGenerator` `generate_context` method find
-  all the pages, transform them into objects, and populate the context with
-  them. Be careful to *not* output anything using this context at this stage,
-  as it is likely to change by the effect of others generators.
+  templates. For instance, the `PageGenerator` `generate_context` method finds
+  all the pages, transforms them into objects, and populates the context with
+  them. Be careful *not* to output anything using this context at this stage,
+  as it is likely to change by the effect of other generators.
 
-* `generate_output` is then called. And guess what is it made for ? Oh,
-  generating the output :) That's here that you may want to look at the context
-  and call the methods of the `writer` object, that is passed at the first
+* `generate_output` is then called. And guess what is it made for? Oh,
+  generating the output.  :) It's here that you may want to look at the context
+  and call the methods of the `writer` object that is passed as the first
   argument of this function. In the `PageGenerator` example, this method will
-  look at all the pages recorded in the global context, and output a file on
+  look at all the pages recorded in the global context and output a file on
   the disk (using the writer method `write_file`) for each page encountered.
diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index bd2dba77..c7cbc5b7 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -57,11 +57,11 @@ With ``pelican-themes``, you can see the available themes by using the ``-l`` or
     two-column@
     simple
 
-In this example, we can see there is 3 themes available: ``notmyidea``, ``simple`` and ``two-column``.
+In this example, we can see there are three themes available: ``notmyidea``, ``simple``, and ``two-column``.
 
-``two-column`` is prefixed with an ``@`` because this theme is not copied to the Pelican theme path, but just linked to it (see `Creating symbolic links`_ for details about creating symbolic links).
+``two-column`` is prefixed with an ``@`` because this theme is not copied to the Pelican theme path, but is instead just linked to it (see `Creating symbolic links`_ for details about creating symbolic links).
 
-Note that you can combine the ``--list`` option with the ``-v`` or ``--verbose`` option to get a more verbose output, like this:
+Note that you can combine the ``--list`` option with the ``-v`` or ``--verbose`` option to get more verbose output, like this:
 
 .. code-block:: console
     
@@ -95,8 +95,8 @@ This option takes as argument the path(s) of the theme(s) you want to install, a
 Removing themes
 """""""""""""""
 
-Pelican themes can also removes themes from the Pelican themes path.
-The ``-r`` or ``--remove`` takes as argument the name(s) of the theme(s) you want to remove, and can be combined with the ``--verbose`` option.
+The ``pelican-themes`` command can also remove themes from the Pelican themes path.
+The ``-r`` or ``--remove`` option takes as argument the name(s) of the theme(s) you want to remove, and can be combined with the ``--verbose`` option.
 
 .. code-block:: console
 
@@ -113,7 +113,7 @@ The ``-r`` or ``--remove`` takes as argument the name(s) of the theme(s) you wan
 Creating symbolic links
 """""""""""""""""""""""
 
-``pelican-themes`` can also install themes by creating symbolic links instead of copying the whole themes in the Pelican themes path.
+``pelican-themes`` can also install themes by creating symbolic links instead of copying entire themes into the Pelican themes path.
 
 To symbolically link a theme, you can use the ``-s`` or ``--symlink``, which works exactly as the ``--install`` option:
 
@@ -152,7 +152,7 @@ The ``--install``, ``--remove`` and ``--symlink`` option are not mutually exclus
                      --symlink ~/Dev/Python/pelican-themes/two-column \
                      --verbose
 
-In this example,  the theme ``notmyidea-cms`` is replaced by the theme ``notmyidea-cms-fr`` 
+In this example, the theme ``notmyidea-cms`` is replaced by the theme ``notmyidea-cms-fr`` 
 
 
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 9d34fae0..2d40d4ec 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -6,26 +6,26 @@ the command line::
 
     $ pelican -s path/to/your/settingsfile.py path
 
-Settings are given as the form of a python module (a file). You can have an
+Settings are configured in the form of a Python module (a file). You can see an
 example by looking at `/samples/pelican.conf.py
 <https://github.com/ametaireau/pelican/raw/master/samples/pelican.conf.py>`_
 
-All the settings identifiers must be set in caps, otherwise they will not be
+All the setting identifiers must be set in all-caps, otherwise they will not be
 processed.
 
 The settings you define in the configuration file will be passed to the
-templates, it allows you to use them to add site-wide contents if you need.
+templates, which allows you to use your settings to add site-wide content.
 
-Here is a list of settings for pelican, regarding the different features.
+Here is a list of settings for Pelican:
 
 Basic settings
 ==============
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?
+Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`ARTICLE_PERMALINK_STRUCTURE` (``''``)              Empty by default. Allows to render URLs in a
-                                                    particular way, see below.
+`ARTICLE_PERMALINK_STRUCTURE` (``''``)              Empty by default. Enables some customization of URL
+                                                    structure (see below for more detail).
 `AUTHOR`                                            Default author (put your name)
 `CLEAN_URLS` (``False``)                             If set to `True`, the URLs will not be suffixed by
                                                     `.html`, so you will have to setup URL rewriting on 
@@ -33,68 +33,71 @@ Setting name (default value)                        what does it do?
 `DATE_FORMATS` (``{}``)                             If you do manage multiple languages, you can
                                                     set the date formatting here. See "Date format and locales"
                                                     section below for details.
-`DEFAULT_CATEGORY` (``'misc'``)                     The default category to fallback on.
+`DEFAULT_CATEGORY` (``'misc'``)                     The default category to fall back on.
 `DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)           The default date format you want to use.
-`DISPLAY_PAGES_ON_MENU` (``True``)                  Display or not the pages on the menu of the
-                                                    template. Templates can follow or not this
-                                                    settings.
-`FALLBACK_ON_FS_DATE` (``True``)                    If True, pelican will use the file system
-                                                    dates infos (mtime) if it can't get
-                                                    informations from the metadata
+`DISPLAY_PAGES_ON_MENU` (``True``)                  Whether to display pages on the menu of the
+                                                    template. Templates may or not honor this
+                                                    setting.
+`FALLBACK_ON_FS_DATE` (``True``)                    If True, Pelican will use the file system
+                                                    timestamp information (mtime) if it can't get
+                                                    date information from the metadata.
 `JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.
-`DELETE_OUTPUT_DIRECTORY` (``False``)               Delete the output directory and just
+`DELETE_OUTPUT_DIRECTORY` (``False``)               Delete the output directory as well as
                                                     the generated files.
 `LOCALE` (''[#]_)                                   Change the locale. A list of locales can be provided 
                                                     here or a single string representing one locale.
                                                     When providing a list, all the locales will be tried 
                                                     until one works.
 `MARKUP` (``('rst', 'md')``)                        A list of available markup languages you want
-                                                    to use. For the moment, only available values
+                                                    to use. For the moment, the only available values
                                                     are `rst` and `md`.
-`MD_EXTENSIONS` (``('codehilite','extra')``)        A list of the extensions that the markdown processor
+`MD_EXTENSIONS` (``('codehilite','extra')``)        A list of the extensions that the Markdown processor
                                                     will use. Refer to the extensions chapter in the
                                                     Python-Markdown documentation for a complete list of
                                                     supported extensions.
 `OUTPUT_PATH` (``'output/'``)                       Where to output the generated files.
-`PATH` (``None``)                                   path to look at for input files.
+`PATH` (``None``)                                   Path to look at for input files.
 `PDF_GENERATOR` (``False``)                         Set to True if you want to have PDF versions
                                                     of your documents. You will need to install
                                                     `rst2pdf`.
-`RELATIVE_URLS` (``True``)                          Defines if pelican should use relative urls or
+`RELATIVE_URLS` (``True``)                          Defines whether Pelican should use relative URLs or
                                                     not.
 `SITENAME` (``'A Pelican Blog'``)                   Your site name
-`SITEURL`                                           base URL of your website. Note that this is
-                                                    not a way to tell pelican to use relative urls
-                                                    or static ones. You should rather use the
-                                                    `RELATIVE_URL` setting for such use.
+`SITEURL`                                           Base URL of your website. Note that this is
+                                                    not a way to tell Pelican whether to use relative URLs
+                                                    or static ones. You should instead use the
+                                                    `RELATIVE_URL` setting for that purpose.
 `STATIC_PATHS` (``['images']``)                     The static paths you want to have accessible
                                                     on the output path "static". By default,
-                                                    pelican will copy the 'images' folder to the
+                                                    Pelican will copy the 'images' folder to the
                                                     output folder.
 `TIMEZONE`                                          The timezone used in the date information, to
-                                                    generate atom and rss feeds. See the "timezone"
+                                                    generate Atom and RSS feeds. See the "timezone"
                                                     section below for more info.
 ================================================    =====================================================
 
-.. [#] Default is the system locale. Default is to delete the output directory.
+.. [#] Default is the system locale.
+
 
 Article permalink structure
 ---------------------------
-Allow to render articles sorted by date, in case you specify a format as
-specified in the example.  It follows the python datetime directives: 
+
+This setting allows you to output your articles sorted by date, provided that
+you specify a format as specified below. This format follows the Python
+``datetime`` directives: 
 
 * %Y: Year with century as a decimal number.  
 * %m: Month as a decimal number [01,12].  
 * %d: Day of the month as a decimal number [01,31].
 
-Note: if you specify a datetime directive, it will be substituted using the
-date metadata field into the rest file. if the date is not specified, pelican
-will rely on the mtime of your file.
+Note: If you specify a datetime directive, it will be substituted using the
+input files' date metadata attribute. If the date is not specified for a
+particular file, Pelican will rely on the file's mtime timestamp.
 
-Check the python datetime documentation at http://bit.ly/cNcJUC for more
+Check the Python datetime documentation at http://bit.ly/cNcJUC for more
 information.
 
-Also, you can use any metadata in the restructured text files: 
+Also, you can use other file metadata attributes as well: 
 
 * category: '%(category)s' 
 * author: '%(author)s' 
@@ -103,20 +106,19 @@ Also, you can use any metadata in the restructured text files:
 
 Example usage: 
 
-* '/%Y/%m/' it will be something like '/2011/07/sample-post.html'.  
-* '/%Y/%(category)s/' it will be something like '/2011/life/sample-post.html'.
+* '/%Y/%m/' will render something like '/2011/07/sample-post.html'.  
+* '/%Y/%(category)s/' will render something like '/2011/life/sample-post.html'.
 
 Timezone
 --------
 
-If no timezone is defined, UTC is assumed. This means that the generated atom
-and rss feeds will have wrong date information if your locale is not UTC.
+If no timezone is defined, UTC is assumed. This means that the generated Atom
+and RSS feeds will contain incorrect date information if your locale is not UTC.
 
 Pelican issues a warning in case this setting is not defined, as it was not
-mandatory in old versions.
+mandatory in previous versions.
 
-Have a look at `the wikipedia page`_ to get a list of values to set your
-timezone.
+Have a look at `the wikipedia page`_ to get a list of valid timezone values.
 
 .. _the wikipedia page: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
@@ -124,9 +126,9 @@ timezone.
 Date format and locale
 ----------------------
 
-If no DATE_FORMAT is set, fallback to DEFAULT_DATE_FORMAT. If you need to
-maintain multiple languages with different date format, you can set this dict
-using language name (``lang`` in your posts) as key. About available format
+If no DATE_FORMAT is set, fall back to DEFAULT_DATE_FORMAT. If you need to
+maintain multiple languages with different date formats, you can set this dict
+using language name (``lang`` in your posts) as key. Regarding available format
 codes, see `strftime document of python`_ :
 
     DATE_FORMAT = {
@@ -140,8 +142,8 @@ You can set locale to further control date format:
         'en_US', 'ja_JP'     # On Unix/Linux
         )
 
-Also, it is possible to set different locale settings for each language, if you
-put (locale, format) tuple in dict, and this will override the LOCALE setting
+Also, it is possible to set different locale settings for each language. If you
+put (locale, format) tuples in the dict, this will override the LOCALE setting
 above:
 
     # On Unix/Linux
@@ -156,8 +158,9 @@ above:
         'jp': ('jpn','%Y-%m-%d(%a)'),
     }
 
-For available list of `locales on Windows`_ . On Unix/Linux usually you can get
-a list of available locales with command ``locale -a``, see manpage `locale(1)`_ for help.
+This is a list of available `locales on Windows`_ . On Unix/Linux, usually you
+can get a list of available locales via the ``locale -a`` command; see manpage
+`locale(1)`_ for more information.
 
 
 .. _strftime document of python: http://docs.python.org/library/datetime.html#strftime-strptime-behavior
@@ -169,26 +172,26 @@ a list of available locales with command ``locale -a``, see manpage `locale(1)`_
 Feed settings
 =============
 
-By default, pelican uses atom feeds. However, it is possible to use RSS feeds
-instead, at your covenience.
+By default, Pelican uses Atom feeds. However, it is also possible to use RSS
+feeds if you prefer.
 
 Pelican generates category feeds as well as feeds for all your articles. It does
-not generate feeds for tags per default, but it is possible to do so using
+not generate feeds for tags by default, but it is possible to do so using
 the ``TAG_FEED`` and ``TAG_FEED_RSS`` settings:
 
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?
+Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`CATEGORY_FEED` ('feeds/%s.atom.xml'[2]_)           Where to put the atom categories feeds.
-`CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the categories rss feeds.
-`FEED` (``'feeds/all.atom.xml'``)                   relative url to output the atom feed.
-`FEED_RSS` (``None``, i.e. no RSS)                  relative url to output the rss feed.
-`TAG_FEED` (``None``, ie no tag feed)               relative url to output the tags atom feed. It should
-                                                    be defined using a "%s" matchin the tag name
-`TAG_FEED_RSS` (``None``, ie no RSS tag feed)       relative url to output the tag RSS feed
-`FEED_MAX_ITEMS`                                    Maximum number of items allowed in a feed. Feeds are
-                                                    unrestricted by default.
+`CATEGORY_FEED` ('feeds/%s.atom.xml'[2]_)           Where to put the category Atom feeds.
+`CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the category RSS feeds.
+`FEED` (``'feeds/all.atom.xml'``)                   Relative URL to output the Atom feed.
+`FEED_RSS` (``None``, i.e. no RSS)                  Relative URL to output the RSS feed.
+`TAG_FEED` (``None``, ie no tag feed)               Relative URL to output the tag Atom feed. It should
+                                                    be defined using a "%s" match in the tag name.
+`TAG_FEED_RSS` (``None``, ie no RSS tag feed)       Relative URL to output the tag RSS feed
+`FEED_MAX_ITEMS`                                    Maximum number of items allowed in a feed. Feed item
+                                                    quantity is unrestricted by default.
 ================================================    =====================================================
 
 .. [2] %s is the name of the category.
@@ -196,14 +199,15 @@ Setting name (default value)                        what does it do?
 Pagination
 ==========
 
-The default behaviour of pelican is to list all the articles titles alongside
-with a short description of them on the index page. While it works pretty well
-for little to medium blogs, it is convenient to have a way to paginate this.
+The default behaviour of Pelican is to list all the article titles along
+with a short description on the index page. While it works pretty well
+for small-to-medium blogs, for sites with large quantity of articles it would
+be convenient to have a way to paginate the list.
 
 You can use the following settings to configure the pagination.
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?
+Setting name (default value)                        What does it do?
 ================================================    =====================================================
 `DEFAULT_ORPHANS` (0)                               The minimum number of articles allowed on the
                                                     last page. Use this when you don't want to
@@ -220,11 +224,11 @@ If you want to generate a tag cloud with all your tags, you can do so using the
 following settings.
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?
+Setting name (default value)                        What does it do?
 ================================================    =====================================================
 `TAG_CLOUD_STEPS` (4)                               Count of different font sizes in the tag
                                                     cloud.
-`TAG_CLOUD_MAX_ITEMS` (100)                         Maximum tags count in the cloud.
+`TAG_CLOUD_MAX_ITEMS` (100)                         Maximum number of tags in the cloud.
 ================================================    =====================================================
 
 The default theme does not support tag clouds, but it is pretty easy to add::
@@ -235,34 +239,34 @@ The default theme does not support tag clouds, but it is pretty easy to add::
         {% endfor %}
     </ul>
 
-You should then also define a CSS with the appropriate classes (tag-0 to tag-N, where
-N matches `TAG_CLOUD_STEPS` -1.
+You should then also define a CSS style with the appropriate classes (tag-0 to tag-N, where
+N matches `TAG_CLOUD_STEPS` -1).
 
 Translations
 ============
 
-Pelican offers a way to translate articles. See the section on getting started for
-more information about that.
+Pelican offers a way to translate articles. See the Getting Started section for
+more information.
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?
+Setting name (default value)                        What does it do?
 ================================================    =====================================================
 `DEFAULT_LANG` (``'en'``)                           The default language to use.
-`TRANSLATION_FEED` ('feeds/all-%s.atom.xml'[3]_)    Where to put the RSS feed for translations.
+`TRANSLATION_FEED` ('feeds/all-%s.atom.xml'[3]_)    Where to put the feed for translations.
 ================================================    =====================================================
 
 .. [3] %s is the language
 
-Ordering contents
+Ordering content
 =================
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?
+Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`REVERSE_ARCHIVE_ORDER` (``False``)                 Reverse the archives order. (True makes it in
-                                                    descending order: the newer first)
-`REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True makes it in
-                                                    descending order, default is alphabetically)
+`REVERSE_ARCHIVE_ORDER` (``False``)                 Reverse the archives list order. (True: orders by date
+                                                    in descending order, with newer articles first.)
+`REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True: lists by reverse 
+                                                    alphabetical order; default lists alphabetically.)
 ================================================    =====================================================
 
 Theming
@@ -272,45 +276,45 @@ Theming is addressed in a dedicated section (see :ref:`theming-pelican`).
 However, here are the settings that are related to theming.
 
 ================================================    =====================================================
-Setting name (default value)                        what does it do?
+Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`THEME`                                             theme to use to produce the output. can be the
+`THEME`                                             Theme to use to produce the output. Can be the
                                                     complete static path to a theme folder, or
                                                     chosen between the list of default themes (see
                                                     below)
 `THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
-                                                    values is `static`, but if your theme has
+                                                    value is `static`, but if your theme has
                                                     other static paths, you can put them here.
-`CSS_FILE` (``'main.css'``)                         specify the CSS file you want to load
+`CSS_FILE` (``'main.css'``)                         Specify the CSS file you want to load.
 ================================================    =====================================================
 
-By default, two themes are availablee. You can specify them using the `-t` option:
+By default, two themes are available. You can specify them using the `-t` option:
 
 * notmyidea
 * simple (a synonym for "full text" :)
 
-You can define your own theme too, and specify it's emplacement in the same
-way (be sure to specify the full absolute path to it).
+You can define your own theme too, and specify its placement in the same
+manner. (Be sure to specify the full absolute path to it.)
 
 Here is `a guide on how to create your theme
-<http://alexis.notmyidea.org/pelican/themes.html>`_
+<http://pelican.notmyidea.org/en/latest/themes.html>`_
 
 You can find a list of themes at http://github.com/ametaireau/pelican-themes.
 
-Pelican comes with :doc:`pelican-themes` a small script for managing themes.
+Pelican comes with :doc:`pelican-themes`, a small script for managing themes.
 
 The `notmyidea` theme can make good use of the following settings. I recommend
-to use them too in your themes.
+using them in your themes as well.
 
 =======================   =======================================================
-Setting name              what does it do ?
+Setting name              What does it do ?
 =======================   =======================================================
-`DISQUS_SITENAME`         Pelican can handle disqus comments, specify the
-                          sitename you've filled in on disqus
-`GITHUB_URL`              Your github URL (if you have one), it will then
-                          use it to create a github ribbon.
-`GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate google analytics.
-`MENUITEMS`               A list of tuples (Title, Url) for additional menu
+`DISQUS_SITENAME`         Pelican can handle Disqus comments. Specify the
+                          Disqus sitename identifier here.
+`GITHUB_URL`              Your GitHub URL (if you have one). It will then
+                          use this information to create a GitHub ribbon.
+`GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate Google Analytics.
+`MENUITEMS`               A list of tuples (Title, URL) for additional menu
                           items to appear at the beginning of the main menu.
 `PIWIK_URL`               URL to your Piwik server - without 'http://' at the
                           beginning.
@@ -318,17 +322,17 @@ Setting name              what does it do ?
                           you have to include this setting too. (optional)
 `PIWIK_SITE_ID`           ID for the monitored website. You can find the ID
                           in the Piwik admin interface > settings > websites.
-`LINKS`                   A list of tuples (Title, Url) for links to appear on
+`LINKS`                   A list of tuples (Title, URL) for links to appear on
                           the header.
-`SOCIAL`                  A list of tuples (Title, Url) to appear in the
+`SOCIAL`                  A list of tuples (Title, URL) to appear in the
                           "social" section.
-`TWITTER_USERNAME`        Allows to add a button on the articles to tweet about
-                          them. Add you twitter username if you want this
-                          button to appear.
+`TWITTER_USERNAME`        Allows for adding a button to articles to encourage
+                          others to tweet about them. Add your Twitter username
+                          if you want this button to appear.
 =======================   =======================================================
 
-In addition, you can use the "wide" version of the `notmyidea` theme, by
-adding that in your configuration::
+In addition, you can use the "wide" version of the `notmyidea` theme by
+adding the following to your configuration::
 
     CSS_FILE = "wide.css"
 
diff --git a/docs/themes.rst b/docs/themes.rst
index a20fd099..e0583882 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -1,10 +1,10 @@
 .. _theming-pelican:
 
-How to create themes for pelican
+How to create themes for Pelican
 ################################
 
 Pelican uses the great `jinja2 <http://jinja.pocoo.org>`_ templating engine to
-generate it's HTML output. The jinja2 syntax is really simple. If you want to
+generate its HTML output. The jinja2 syntax is really simple. If you want to
 create your own theme, feel free to take inspiration from the "simple" theme,
 which is available `here
 <https://github.com/ametaireau/pelican/tree/master/pelican/themes/simple/templates>`_
@@ -29,179 +29,183 @@ To make your own theme, you must follow the following structure::
         ├── tag.html         // processed for each tag
         └── tags.html        // must list all the tags. Can be a tag cloud.
 
-* `static` contains all the static content. It will be copied on the output
-  `theme/static` folder then. I've put the css and image folders, but they are
+* `static` contains all the static assets, which will be copied to the output
+  `theme/static` folder. I've put the CSS and image folders here, but they are
   just examples. Put what you need here.
 
 * `templates` contains all the templates that will be used to generate the content.
-  I've just put the mandatory templates here, you can define your own if it helps
-  you to organize yourself while doing the theme.
+  I've just put the mandatory templates here; you can define your own if it helps
+  you keep things organized while creating your theme.
  
 Templates and variables
 =======================
 
-It's using a simple syntax, that you can embbed into your html pages.
-This document describes which templates should exist on a theme, and which
-variables will be passed to each template, while generating it.
+The idea is to use a simple syntax that you can embed into your HTML pages.
+This document describes which templates should exist in a theme, and which
+variables will be passed to each template at generation time.
 
 All templates will receive the variables defined in your settings file, if they
-are in caps. You can access them directly. 
+are in all-caps. You can access them directly. 
 
 Common variables
 ----------------
 
-All of those settings will be given to all templates.
+All of these settings will be available to all templates.
 
 =============   ===================================================
 Variable        Description
 =============   ===================================================
-articles        That's the list of articles, ordered desc. by date
-                all the elements are `Article` objects, so you can 
-                access their properties (e.g. title, summary, author
-                etc.).
-dates           The same list of article, but ordered by date,
-                ascending.
-tags            A dict containing each tags (keys), and the list of
-                relative articles.
-categories      A dict containing each category (keys), and the 
-                list of relative articles.
-pages           The list of pages.
+articles        The list of articles, ordered descending by date
+                All the elements are `Article` objects, so you can 
+                access their attributes (e.g. title, summary, author
+                etc.)
+dates           The same list of articles, but ordered by date,
+                ascending
+tags            A key-value dict containing the tags (the keys) and
+                the list of respective articles (the values)
+categories      A key-value dict containing the categories (keys) 
+                and the list of respective articles (values)
+pages           The list of pages
 =============   ===================================================
 
 index.html
 ----------
 
-Home page of your blog, will finally remain at output/index.html.
+This is the home page of your blog, generated at output/index.html.
 
-If pagination is active, next pages will remain at output/index`n`.html.
+If pagination is active, subsequent pages will reside in output/index`n`.html.
 
 ===================     ===================================================
 Variable                Description
 ===================     ===================================================
-articles_paginator      A paginator object of article list.
-articles_page           The current page of articles.
-dates_paginator         A paginator object of article list, ordered by date,
-                        ascending.
+articles_paginator      A paginator object for the list of articles
+articles_page           The current page of articles
+dates_paginator         A paginator object for the article list, ordered by
+                        date, ascending.
 dates_page              The current page of articles, ordered by date,
                         ascending.
-page_name               'index'. Useful for pagination links.
+page_name               'index' -- useful for pagination links
 ===================     ===================================================
 
 author.html
 -------------
 
-This template will be processed for each of the existing authors, and will
-finally remain at output/author/`author_name`.html.
+This template will be processed for each of the existing authors, with
+output generated at output/author/`author_name`.html.
 
-If pagination is active, next pages will remain at
+If pagination is active, subsequent pages will reside at
 output/author/`author_name``n`.html.
 
 ===================     ===================================================
 Variable                Description
 ===================     ===================================================
-author                  The name of the author being processed.
-articles                Articles of this author.
-dates                   Articles of this author, but ordered by date,
-                        ascending.
-articles_paginator      A paginator object of article list.
-articles_page           The current page of articles.
-dates_paginator         A paginator object of article list, ordered by date,
-                        ascending.
+author                  The name of the author being processed
+articles                Articles by this author
+dates                   Articles by this author, but ordered by date,
+                        ascending
+articles_paginator      A paginator object for the list of articles
+articles_page           The current page of articles
+dates_paginator         A paginator object for the article list, ordered by
+                        date, ascending.
 dates_page              The current page of articles, ordered by date,
                         ascending.
-page_name               'author/`author_name`'. Useful for pagination
-                        links.
+page_name               'author/`author_name`' -- useful for pagination
+                        links
 ===================     ===================================================
 
 category.html
 -------------
 
-This template will be processed for each of the existing categories, and will
-finally remain at output/category/`category_name`.html.
+This template will be processed for each of the existing categories, with
+output generated at output/category/`category_name`.html.
 
-If pagination is active, next pages will remain at
+If pagination is active, subsequent pages will reside at
 output/category/`category_name``n`.html.
 
 ===================     ===================================================
 Variable                Description
 ===================     ===================================================
-category                The name of the category being processed.
-articles                Articles of this category.
-dates                   Articles of this category, but ordered by date,
-                        ascending.
-articles_paginator      A paginator object of article list.
-articles_page           The current page of articles.
-dates_paginator         A paginator object of article list, ordered by date,
-                        ascending.
+category                The name of the category being processed
+articles                Articles for this category
+dates                   Articles for this category, but ordered by date,
+                        ascending
+articles_paginator      A paginator object for the list of articles
+articles_page           The current page of articles
+dates_paginator         A paginator object for the list of articles,
+                        ordered by date, ascending
 dates_page              The current page of articles, ordered by date,
-                        ascending.
-page_name               'category/`category_name`'. Useful for pagination
-                        links.
+                        ascending
+page_name               'category/`category_name`' -- useful for pagination
+                        links
 ===================     ===================================================
 
 article.html
 -------------
 
-This template will be processed for each article. .html files will be output
-in output/`article_name`.html. Here are the specific variables it gets.
+This template will be processed for each article, with .html files saved
+as output/`article_name`.html. Here are the specific variables it gets.
 
 =============   ===================================================
 Variable        Description
 =============   ===================================================
-article         The article object to be displayed.
-category        The name of the category of the current article.
+article         The article object to be displayed
+category        The name of the category for the current article
 =============   ===================================================
 
 page.html
 ---------
 
-For each page, this template will be processed. It will create .html files in
-output/`page_name`.html.
+This template will be processed for each page, with corresponding .html files
+saved as output/`page_name`.html.
 
 =============   ===================================================
 Variable        Description
 =============   ===================================================
-page            The page object to be displayed. You can access to
-                its title, slug and content.
+page            The page object to be displayed. You can access its
+                title, slug, and content.
 =============   ===================================================
 
 tag.html
 --------
 
-For each tag, this template will be processed. It will create .html files in
-output/tag/`tag_name`.html.
+This template will be processed for each tag, with corresponding .html files
+saved as output/tag/`tag_name`.html.
 
-If pagination is active, next pages will remain at
+If pagination is active, subsequent pages will reside at
 output/tag/`tag_name``n`.html.
 
 ===================     ===================================================
 Variable                Description
 ===================     ===================================================
-tag                     The name of the tag being processed.
-articles                Articles related to this tag.
+tag                     The name of the tag being processed
+articles                Articles related to this tag
 dates                   Articles related to this tag, but ordered by date,
-                        ascending.
-articles_paginator      A paginator object of article list.
-articles_page           The current page of articles.
-dates_paginator         A paginator object of article list, ordered by date,
-                        ascending.
+                        ascending
+articles_paginator      A paginator object for the list of articles
+articles_page           The current page of articles
+dates_paginator         A paginator object for the list of articles, 
+                        ordered by date, ascending
 dates_page              The current page of articles, ordered by date,
-                        ascending.
-page_name               'tag/`tag_name`'. Useful for pagination links.
+                        ascending
+page_name               'tag/`tag_name`' -- useful for pagination links
 ===================     ===================================================
 
 Inheritance
 ===========
 
-Since version 3, pelican supports inheritance from the ``simple`` theme, so you can reuse the templates of the ``simple`` theme in your own themes:
+Since version 3.0, Pelican supports inheritance from the ``simple`` theme, so
+you can re-use the ``simple`` theme templates in your own themes.
 
-If one of the mandatory files in the ``templates/`` directory of your theme is missing, it will be replaced by the matching template from the ``simple`` theme, so if the HTML structure of a template of the ``simple`` theme is right for you, you don't have to rewrite it from scratch.
+If one of the mandatory files in the ``templates/`` directory of your theme is
+missing, it will be replaced by the matching template from the ``simple`` theme.
+So if the HTML structure of a template in the ``simple`` theme is right for you,
+you don't have to write a new template from scratch.
 
-You can also extend templates of the ``simple`` themes in your own themes by using the ``{% extends %}`` directive as in the following example:
+You can also extend templates from the ``simple`` themes in your own themes by using the ``{% extends %}`` directive as in the following example:
 
 .. code-block:: html+jinja
 
-    {% extends "!simple/index.html" %}   <!-- extends the ``index.html`` template of the ``simple`` theme -->
+    {% extends "!simple/index.html" %}   <!-- extends the ``index.html`` template from the ``simple`` theme -->
 
     {% extends "index.html" %}   <!-- "regular" extending -->
 
@@ -226,10 +230,10 @@ The first file is the ``templates/base.html`` template:
     {% endblock %}
 
 
-1.    On the first line, we extend the ``base.html`` template of the ``simple`` theme, so we don't have to rewrite the entire file.
-2.    On the third line, we open the ``head`` block which has already been defined in the ``simple`` theme
+1.    On the first line, we extend the ``base.html`` template from the ``simple`` theme, so we don't have to rewrite the entire file.
+2.    On the third line, we open the ``head`` block which has already been defined in the ``simple`` theme.
 3.    On the fourth line, the function ``super()`` keeps the content previously inserted in the ``head`` block.
-4.    On the fifth line, we append a stylesheet to the page
+4.    On the fifth line, we append a stylesheet to the page.
 5.    On the last line, we close the ``head`` block.
 
 This file will be extended by all the other templates, so the stylesheet will be linked from all pages.
diff --git a/docs/tips.rst b/docs/tips.rst
index 9ff7f9ce..6ddc3d33 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -1,22 +1,22 @@
 Tips
 ####
 
-Here are some tips about pelican, which you might find useful.
+Here are some tips about Pelican that you might find useful.
 
-Publishing to github
+Publishing to GitHub
 ====================
 
-Github comes with an interesting "pages" feature: you can upload things there
-and it will be available directly from their servers. As pelican is a static
+GitHub comes with an interesting "pages" feature: you can upload things there
+and it will be available directly from their servers. As Pelican is a static
 file generator, we can take advantage of this.
 
 The excellent `ghp-import <https://github.com/davisp/ghp-import>`_ makes this
-eally easy. You would have to install it::
+really easy. You will have to install it::
 
     $ pip install ghp-import
 
-Then, considering a repository containing your articles, you would simply have
-to run pelican and upload the output to github::
+Then, given a repository containing your articles, you would simply have
+to run Pelican and upload the output to GitHub::
 
     $ pelican -s pelican.conf.py .
     $ ghp-import output
@@ -24,8 +24,8 @@ to run pelican and upload the output to github::
 
 And that's it.
 
-If you want you can put that directly into a post commit hook, so each time you
-commit, your blog is up to date on github!
+If you want, you can put that directly into a post-commit hook, so each time you
+commit, your blog is up to date on GitHub!
 
 Put the following into `.git/hooks/post-commit`::
 

From 4861a15774c176e13f6e5ba811cf48762428622d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 6 Mar 2012 08:12:15 -0800
Subject: [PATCH 0507/2864] Update outdated links to documentation and add
 Contribute link to README for issue #227

---
 README.rst                                   | 9 +++++----
 pelican/themes/notmyidea/templates/base.html | 2 +-
 pelican/themes/simple/templates/base.html    | 4 ++--
 setup.py                                     | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index 0a27bdcd..b521d430 100644
--- a/README.rst
+++ b/README.rst
@@ -39,14 +39,15 @@ Source code
 
 You can access the source code via git at: https://github.com/ametaireau/pelican
 
-If you feel hackish, have a look at the `pelican's internals explanation
+If you feel hackish, have a look at the explanation of `Pelican's internals
 <http://pelican.notmyidea.org/en/latest/internals.html>`_.
 
 Feedback / Contact us
-=====================
+---------------------
 
-If you want to see new features in Pelican, don't hesitate to tell me, to clone
-the repository, etc. That's open source, dude!
+If you want to see new features in Pelican, don't hesitate to offer suggestions,
+clone the repository, etc. There are many ways to `contribute 
+<http://pelican.notmyidea.org/en/latest/contribute.html>`_. That's open source, dude!
 
 Contact me at "alexis at notmyidea dot org" for any request/feedback! You can
 also join the team at `#pelican on irc.freenode.org 
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index a34b5d5a..4a4c70c6 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -71,7 +71,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://alexis.notmyidea.org/pelican/">pelican</a>, which takes great advantages of <a href="http://python.org">python</a>.
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index dc266773..a8fad2db 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -29,8 +29,8 @@
         {% endblock %}
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://docs.notmyidea.org/alexis/pelican/">pelican</a>,
-                and obviously <a href="http://python.org">python</a>!
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>,
+                which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/setup.py b/setup.py
index e01448ed..9b299085 100755
--- a/setup.py
+++ b/setup.py
@@ -20,10 +20,10 @@ if sys.platform.startswith('win'):
 setup(
     name = "pelican",
     version = VERSION,
-    url = 'http://alexis.notmyidea.org/pelican/',
+    url = 'http://pelican.notmyidea.org/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',
-    description = "A tool to generate a static blog, with restructured text (or markdown) input files.",
+    description = "A tool to generate a static blog from reStructuredText or Markdown input files.",
     long_description=open('README.rst').read(),
     packages = ['pelican'],
     include_package_data = True,

From 67540997307caac11e4f61567a7edc2440adc9d5 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Thu, 22 Dec 2011 15:13:12 +0000
Subject: [PATCH 0508/2864] Create a Category class which has a url property

---
 pelican/contents.py                           | 20 +++++++++++++++++++
 pelican/generators.py                         |  4 ++--
 pelican/readers.py                            |  2 ++
 .../notmyidea/templates/article_infos.html    |  2 +-
 .../notmyidea/templates/categories.html       |  2 +-
 .../themes/simple/templates/categories.html   |  2 +-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 49f30316..aab6b330 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -143,6 +143,26 @@ class Quote(Page):
     base_properties = ('author', 'date')
 
 
+class Category(object):
+    def __init__(self, category):
+        self.category = unicode(category)
+
+    def __hash__(self):
+        return hash(self.category)
+
+    def __eq__(self, other):
+        return self.category == unicode(other)
+
+    def __str__(self):
+        return str(self.category)
+
+    def __unicode__(self):
+        return self.category
+
+    @property
+    def url(self):
+        return 'category/%s.html' % self
+
 def is_valid_content(content, f):
     try:
         content.check_properties()
diff --git a/pelican/generators.py b/pelican/generators.py
index 6715126a..116c0b0b 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -187,7 +187,7 @@ class ArticlesGenerator(Generator):
         category_template = self.get_template('category')
         for cat, articles in self.categories:
             dates = [article for article in self.dates if article in articles]
-            write('category/%s.html' % cat, category_template, self.context,
+            write(cat.url, category_template, self.context,
                 category=cat, articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
                 page_name='category/%s' % cat)
@@ -228,7 +228,7 @@ class ArticlesGenerator(Generator):
                     category = os.path.basename(os.path.dirname(f)).decode('utf-8')
 
                 if category != '':
-                    metadata['category'] = unicode(category)
+                    metadata['category'] = Category(category)
 
             if 'date' not in metadata.keys()\
                 and self.settings['FALLBACK_ON_FS_DATE']:
diff --git a/pelican/readers.py b/pelican/readers.py
index ee3ecd2c..1a62237a 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -15,6 +15,7 @@ except ImportError:
     Markdown = False
 import re
 
+from pelican.contents import Category
 from pelican.utils import get_date, open
 
 
@@ -22,6 +23,7 @@ _METADATA_PROCESSORS = {
     'tags': lambda x: map(unicode.strip, unicode(x).split(',')),
     'date': lambda x: get_date(x),
     'status': unicode.strip,
+    'category': Category,
 }
 
 def _process_metadata(name, value):
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index e1803be8..09ecd595 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -8,7 +8,7 @@
                 By <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a>
         </address>
         {% endif %}
-<p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
+<p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
 {% include 'taglist.html' %}
 {% include 'translations.html' %}
 </footer><!-- /.post-info -->
diff --git a/pelican/themes/notmyidea/templates/categories.html b/pelican/themes/notmyidea/templates/categories.html
index 7e4bd2c9..e4d9d0a7 100644
--- a/pelican/themes/notmyidea/templates/categories.html
+++ b/pelican/themes/notmyidea/templates/categories.html
@@ -2,7 +2,7 @@
 {% block content %}
 <ul>
 {% for category, articles in categories %}
-    <li>{{ category }}</li>
+    <li><a href="{{ category.url }}">{{ category }}</a></li>
 {% endfor %}
 </ul>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/categories.html b/pelican/themes/simple/templates/categories.html
index 7e4bd2c9..e29be0ca 100644
--- a/pelican/themes/simple/templates/categories.html
+++ b/pelican/themes/simple/templates/categories.html
@@ -2,7 +2,7 @@
 {% block content %}
 <ul>
 {% for category, articles in categories %}
-    <li>{{ category }}</li>
+    <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
 {% endfor %}
 </ul>
 {% endblock %}

From f9ed01bb643ab6ad30d06517751f9002568bd0fd Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Thu, 22 Dec 2011 15:43:44 +0000
Subject: [PATCH 0509/2864] Create a Tag class which has a url property

---
 pelican/contents.py                           | 20 +++++++++++++++++++
 pelican/generators.py                         |  2 +-
 pelican/readers.py                            |  4 ++--
 .../themes/notmyidea/templates/taglist.html   |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index aab6b330..cca01911 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -163,6 +163,26 @@ class Category(object):
     def url(self):
         return 'category/%s.html' % self
 
+class Tag(object):
+    def __init__(self, tag):
+        self.tag = unicode.strip(tag)
+
+    def __hash__(self):
+        return hash(self.tag)
+
+    def __eq__(self, other):
+        return self.tag == unicode(tag)
+
+    def __str__(self):
+        return str(self.tag)
+
+    def __unicode__(self):
+        return self.tag
+
+    @property
+    def url(self):
+        return 'tag/%s.html' % self
+
 def is_valid_content(content, f):
     try:
         content.check_properties()
diff --git a/pelican/generators.py b/pelican/generators.py
index 116c0b0b..816a6755 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -179,7 +179,7 @@ class ArticlesGenerator(Generator):
         for tag, articles in self.tags.items():
             articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
-            write('tag/%s.html' % tag, tag_template, self.context, tag=tag,
+            write(tag.url, tag_template, self.context, tag=tag,
                 articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
                 page_name='tag/%s' % tag)
diff --git a/pelican/readers.py b/pelican/readers.py
index 1a62237a..6011c272 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -15,12 +15,12 @@ except ImportError:
     Markdown = False
 import re
 
-from pelican.contents import Category
+from pelican.contents import Category, Tag
 from pelican.utils import get_date, open
 
 
 _METADATA_PROCESSORS = {
-    'tags': lambda x: map(unicode.strip, unicode(x).split(',')),
+    'tags': lambda x: map(Tag, unicode(x).split(',')),
     'date': lambda x: get_date(x),
     'status': unicode.strip,
     'category': Category,
diff --git a/pelican/themes/notmyidea/templates/taglist.html b/pelican/themes/notmyidea/templates/taglist.html
index 0f4862d0..c792fd7d 100644
--- a/pelican/themes/notmyidea/templates/taglist.html
+++ b/pelican/themes/notmyidea/templates/taglist.html
@@ -1,2 +1,2 @@
-{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}</p>{% endif %}
+{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %}
 {% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a></p>{% endif %}

From ff9c7861497e9056df911bed95d26567b97749d3 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Thu, 22 Dec 2011 16:22:34 +0000
Subject: [PATCH 0510/2864] Create a Author class which has a url property

---
 pelican/contents.py                           | 47 +++++++++----------
 pelican/generators.py                         |  2 +-
 pelican/readers.py                            |  3 +-
 .../notmyidea/templates/article_infos.html    |  2 +-
 pelican/themes/simple/templates/article.html  |  2 +-
 pelican/themes/simple/templates/index.html    |  2 +-
 6 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index cca01911..8cd36186 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -37,9 +37,9 @@ class Page(object):
         # default author to the one in settings if not defined
         if not hasattr(self, 'author'):
             if 'AUTHOR' in settings:
-                self.author = settings['AUTHOR']
+                self.author = Author(settings['AUTHOR'])
             else:
-                self.author = getenv('USER', 'John Doe')
+                self.author = Author(getenv('USER', 'John Doe'))
                 warning(u"Author of `{0}' unknow, assuming that his name is `{1}'".format(filename or self.title, self.author))
 
         # manage languages
@@ -142,47 +142,44 @@ class Article(Page):
 class Quote(Page):
     base_properties = ('author', 'date')
 
-
-class Category(object):
-    def __init__(self, category):
-        self.category = unicode(category)
+class URLWrapper(object):
+    def __init__(self, name):
+        self.name = unicode(name)
 
     def __hash__(self):
-        return hash(self.category)
+        return hash(self.name)
 
     def __eq__(self, other):
-        return self.category == unicode(other)
+        return self.name == unicode(other)
 
     def __str__(self):
-        return str(self.category)
+        return str(self.name)
 
     def __unicode__(self):
-        return self.category
+        return self.name
 
+    @property
+    def url(self):
+        return '%s.html' % self.name
+
+class Category(URLWrapper):
     @property
     def url(self):
         return 'category/%s.html' % self
 
-class Tag(object):
-    def __init__(self, tag):
-        self.tag = unicode.strip(tag)
-
-    def __hash__(self):
-        return hash(self.tag)
-
-    def __eq__(self, other):
-        return self.tag == unicode(tag)
-
-    def __str__(self):
-        return str(self.tag)
-
-    def __unicode__(self):
-        return self.tag
+class Tag(URLWrapper):
+    def __init__(self, name):
+        self.name = unicode.strip(name)
 
     @property
     def url(self):
         return 'tag/%s.html' % self
 
+class Author(URLWrapper):
+    @property
+    def url(self):
+        return 'author/%s.html' % self 
+
 def is_valid_content(content, f):
     try:
         content.check_properties()
diff --git a/pelican/generators.py b/pelican/generators.py
index 816a6755..d9d584a4 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -195,7 +195,7 @@ class ArticlesGenerator(Generator):
         author_template = self.get_template('author')
         for aut, articles in self.authors:
             dates = [article for article in self.dates if article in articles]
-            write('author/%s.html' % aut, author_template, self.context,
+            write(aut.url, author_template, self.context,
                 author=aut, articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
                 page_name='author/%s' % aut)
diff --git a/pelican/readers.py b/pelican/readers.py
index 6011c272..e760b662 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -15,7 +15,7 @@ except ImportError:
     Markdown = False
 import re
 
-from pelican.contents import Category, Tag
+from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, open
 
 
@@ -24,6 +24,7 @@ _METADATA_PROCESSORS = {
     'date': lambda x: get_date(x),
     'status': unicode.strip,
     'category': Category,
+    'author': Author,
 }
 
 def _process_metadata(name, value):
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index 09ecd595..a1993a09 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -5,7 +5,7 @@
 
         {% if article.author %}
         <address class="vcard author">
-                By <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a>
+                By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
         </address>
         {% endif %}
 <p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 30d31fb6..d6c96a13 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -8,7 +8,7 @@
                 </abbr>
                 {% if article.author %}
                 <address class="vcard author">
-                        By <a class="url fn" href="#">{{ article.author }}</a>
+                        By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
                 </address>
                 {% endif %}
         </footer><!-- /.post-info -->
diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index fd8545df..ad2a3b2e 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -11,7 +11,7 @@
                 <header> <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
                 <footer class="post-info">
                     <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr>
-                    {% if article.author %}<address class="vcard author">By <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a></address>{% endif %}
+                    {% if article.author %}<address class="vcard author">By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></address>{% endif %}
                 </footer><!-- /.post-info -->
                 <div class="entry-content"> {{ article.summary }} </div><!-- /.entry-content -->
         </article></li>

From a39787c1a2c32dc936dba9ace73a0fcef0b73098 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Fri, 23 Dec 2011 22:01:32 +0000
Subject: [PATCH 0511/2864] Add settings to change the URL's and SAVE_AS paths

Example usage:

* ARTICLE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'
* ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'

This removes CLEAN_URLS and ARTICLE_PERMALINK_STRUCTURE because these
new settings can produce the same result.
---
 docs/settings.rst     | 54 +++++++++++++++++++++++--------------
 pelican/contents.py   | 62 +++++++++++++++++++++++++++----------------
 pelican/generators.py | 17 +-----------
 pelican/settings.py   |  9 ++++++-
 4 files changed, 82 insertions(+), 60 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 2d40d4ec..b93c8c11 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -24,12 +24,7 @@ Basic settings
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`ARTICLE_PERMALINK_STRUCTURE` (``''``)              Empty by default. Enables some customization of URL
-                                                    structure (see below for more detail).
 `AUTHOR`                                            Default author (put your name)
-`CLEAN_URLS` (``False``)                             If set to `True`, the URLs will not be suffixed by
-                                                    `.html`, so you will have to setup URL rewriting on 
-                                                    your web server.
 `DATE_FORMATS` (``{}``)                             If you do manage multiple languages, you can
                                                     set the date formatting here. See "Date format and locales"
                                                     section below for details.
@@ -79,16 +74,14 @@ Setting name (default value)                        What does it do?
 .. [#] Default is the system locale.
 
 
-Article permalink structure
----------------------------
+URL Settings
+------------
 
-This setting allows you to output your articles sorted by date, provided that
-you specify a format as specified below. This format follows the Python
-``datetime`` directives: 
-
-* %Y: Year with century as a decimal number.  
-* %m: Month as a decimal number [01,12].  
-* %d: Day of the month as a decimal number [01,31].
+You can customize the URL's and locations where files will be saved. The URL's and
+SAVE_AS variables use python's format strings. These variables allow you to place
+your articles in a location such as '{slug}/index.html' and link to then as
+'{slug}' for clean urls. These settings give you the flexibility to place your
+articles and pages anywhere you want.
 
 Note: If you specify a datetime directive, it will be substituted using the
 input files' date metadata attribute. If the date is not specified for a
@@ -99,15 +92,36 @@ information.
 
 Also, you can use other file metadata attributes as well: 
 
-* category: '%(category)s' 
-* author: '%(author)s' 
-* tags: '%(tags)s' 
-* date: '%(date)s'
+* slug
+* date
+* lang
+* author
+* category
 
 Example usage: 
 
-* '/%Y/%m/' will render something like '/2011/07/sample-post.html'.  
-* '/%Y/%(category)s/' will render something like '/2011/life/sample-post.html'.
+* ARTICLE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'
+* ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'
+
+This would save your articles in something like '/posts/2011/Aug/07/sample-post/index.html',
+and the URL to this would be '/posts/2011/Aug/07/sample-post/'.
+
+================================================    =====================================================
+Setting name (default value)                        what does it do?
+================================================    =====================================================
+`ARTICLE_URL` ('{slug}.html')                       The URL to refer to an ARTICLE.
+`ARTICLE_SAVE_AS` ('{slug}.html')                   The place where we will save an article.
+`ARTICLE_LANG_URL` ('{slug}-{lang}.html')           The URL to refer to an ARTICLE which doesn't use the
+                                                    default language.
+`ARTICLE_LANG_SAVE_AS` ('{slug}-{lang}.html'        The place where we will save an article which
+                                                    doesn't use the default language.
+`PAGE_URL` ('pages/{slug}.html')                    The URL we will use to link to a page.
+`PAGE_SAVE_AS` ('pages/{slug}.html')                The location we will save the page.
+`PAGE_LANG_URL` ('pages/{slug}-{lang}.html')        The URL we will use to link to a page which doesn't
+                                                    use the default language.
+`PAGE_LANG_SAVE_AS` ('pages/{slug}-{lang}.html')    The location we will save the page which doesn't
+                                                    use the default language.
+================================================    =====================================================
 
 Timezone
 --------
diff --git a/pelican/contents.py b/pelican/contents.py
index 8cd36186..bc42d41e 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -24,6 +24,7 @@ class Page(object):
         if not settings:
             settings = _DEFAULT_CONFIG
 
+        self.settings = settings
         self._content = content
         self.translations = []
 
@@ -55,29 +56,6 @@ class Page(object):
         if not hasattr(self, 'slug') and hasattr(self, 'title'):
             self.slug = slugify(self.title)
 
-        # create save_as from the slug (+lang)
-        if not hasattr(self, 'save_as') and hasattr(self, 'slug'):
-            if self.in_default_lang:
-                if settings.get('CLEAN_URLS', False):
-                    self.save_as = '%s/index.html' % self.slug
-                else:
-                    self.save_as = '%s.html' % self.slug
-
-                clean_url = '%s/' % self.slug
-            else:
-                if settings.get('CLEAN_URLS', False):
-                    self.save_as = '%s-%s/index.html' % (self.slug, self.lang)
-                else:
-                    self.save_as = '%s-%s.html' % (self.slug, self.lang)
-
-                clean_url = '%s-%s/' % (self.slug, self.lang)
-
-        # change the save_as regarding the settings
-        if settings.get('CLEAN_URLS', False):
-            self.url = clean_url
-        elif hasattr(self, 'save_as'):
-            self.url = self.save_as
-
         if filename:
             self.filename = filename
 
@@ -115,6 +93,30 @@ class Page(object):
             if not hasattr(self, prop):
                 raise NameError(prop)
 
+    @property
+    def url_format(self):
+        return {
+            'slug': getattr(self, 'slug', ''),
+            'lang': getattr(self, 'lang', 'en'),
+            'date': getattr(self, 'date', datetime.now()),
+            'author': self.author,
+            'category': getattr(self, 'category', 'misc'),
+        }
+
+    @property
+    def url(self):
+        if self.in_default_lang:
+            return self.settings.get('PAGE_URL', 'pages/{slug}.html').format(**self.url_format)
+
+        return self.settings.get('PAGE_LANG_URL', 'pages/{slug}-{lang}.html').format(**self.url_format)
+
+    @property
+    def save_as(self):
+        if self.in_default_lang:
+            return self.settings.get('PAGE_SAVE_AS', 'pages/{slug}.html').format(**self.url_format)
+
+        return self.settings.get('PAGE_LANG_SAVE_AS', 'pages/{slug}-{lang}.html').format(**self.url_format)
+
     @property
     def content(self):
         if hasattr(self, "_get_content"):
@@ -138,6 +140,20 @@ class Page(object):
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')
 
+    @property
+    def url(self):
+        if self.in_default_lang:
+            return self.settings.get('ARTICLE_URL', '{slug}.html').format(**self.url_format)
+
+        return self.settings.get('ARTICLE_LANG_URL', '{slug}-{lang}.html').format(**self.url_format)
+
+    @property
+    def save_as(self):
+        if self.in_default_lang:
+            return self.settings.get('ARTICLE_SAVE_AS', '{slug}.html').format(**self.url_format)
+
+        return self.settings.get('ARTICLE_LANG_SAVE_AS', '{slug}-{lang}.html').format(**self.url_format)
+
 
 class Quote(Page):
     base_properties = ('author', 'date')
diff --git a/pelican/generators.py b/pelican/generators.py
index d9d584a4..7ad3d276 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -239,21 +239,6 @@ class ArticlesGenerator(Generator):
             if not is_valid_content(article, f):
                 continue
 
-            add_to_url = u''
-            if 'ARTICLE_PERMALINK_STRUCTURE' in self.settings:
-                article_permalink_structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
-                article_permalink_structure = article_permalink_structure.lstrip('/').replace('%(', "%%(")
-
-                # try to substitute any python datetime directive
-                add_to_url = article.date.strftime(article_permalink_structure)
-                # try to substitute any article metadata in rest file
-                add_to_url = add_to_url % article.__dict__
-                add_to_url = [slugify(i) for i in add_to_url.split('/')]
-                add_to_url = os.path.join(*add_to_url)
-
-            article.url = urlparse.urljoin(add_to_url, article.url)
-            article.save_as = urlparse.urljoin(add_to_url, article.save_as)
-
             if article.status == "published":
                 if hasattr(article, 'tags'):
                     for tag in article.tags:
@@ -348,7 +333,7 @@ class PagesGenerator(Generator):
 
     def generate_output(self, writer):
         for page in chain(self.translations, self.pages):
-            writer.write_file('pages/%s' % page.save_as, self.get_template('page'),
+            writer.write_file(page.save_as, self.get_template('page'),
                     self.context, page=page,
                     relative_urls = self.settings.get('RELATIVE_URLS'))
 
diff --git a/pelican/settings.py b/pelican/settings.py
index cf6b23e5..ec6ec483 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -26,7 +26,14 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'REVERSE_ARCHIVE_ORDER': False,
                    'REVERSE_CATEGORY_ORDER': False,
                    'DELETE_OUTPUT_DIRECTORY': False,
-                   'CLEAN_URLS': False, # use /blah/ instead /blah.html in urls
+                   'ARTICLE_URL': '{slug}.html',
+                   'ARTICLE_SAVE_AS': '{slug}.html',
+                   'ARTICLE_LANG_URL': '{slug}-{lang}.html',
+                   'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html',
+                   'PAGE_URL': 'pages/{slug}.html',
+                   'PAGE_SAVE_AS': 'pages/{slug}.html',
+                   'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
+                   'PAGE_LANG_SAVE_AS': 'pages/{slug}-{lang}.html',
                    'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
                    'TAG_CLOUD_STEPS': 4,

From 44cf2ad400629ea9d85dd598d837a35adcfaed85 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Fri, 23 Dec 2011 23:43:32 +0000
Subject: [PATCH 0512/2864] Support configurable URL's & SAVE_AS path for
 Author, Category and Tag

---
 docs/settings.rst     |  6 +++++
 pelican/contents.py   | 29 +++++++++++++++------
 pelican/generators.py |  8 +++---
 pelican/readers.py    | 60 +++++++++++++++++++++----------------------
 4 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index b93c8c11..69e2adc8 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -121,6 +121,12 @@ Setting name (default value)                        what does it do?
                                                     use the default language.
 `PAGE_LANG_SAVE_AS` ('pages/{slug}-{lang}.html')    The location we will save the page which doesn't
                                                     use the default language.
+`AUTHOR_URL` ('author/{name}.html')                 The URL to use for an author.
+`AUTHOR_SAVE_AS` ('author/{name}.html')             The location to save an author.
+`CATEGORY_URL` ('category/{name}.html')             The URL to use for a category.
+`CATEGORY_SAVE_AS` ('category/{name}.html')         The location to save a category.
+`TAG_URL` ('tag/{name}.html')                       The URL to use for a tag.
+`TAG_SAVE_AS` ('tag/{name}.html')                   The location to save the tag page.
 ================================================    =====================================================
 
 Timezone
diff --git a/pelican/contents.py b/pelican/contents.py
index bc42d41e..316a0e56 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -38,9 +38,9 @@ class Page(object):
         # default author to the one in settings if not defined
         if not hasattr(self, 'author'):
             if 'AUTHOR' in settings:
-                self.author = Author(settings['AUTHOR'])
+                self.author = Author(settings['AUTHOR'], settings)
             else:
-                self.author = Author(getenv('USER', 'John Doe'))
+                self.author = Author(getenv('USER', 'John Doe'), settings)
                 warning(u"Author of `{0}' unknow, assuming that his name is `{1}'".format(filename or self.title, self.author))
 
         # manage languages
@@ -159,8 +159,9 @@ class Quote(Page):
     base_properties = ('author', 'date')
 
 class URLWrapper(object):
-    def __init__(self, name):
+    def __init__(self, name, settings):
         self.name = unicode(name)
+        self.settings = settings
 
     def __hash__(self):
         return hash(self.name)
@@ -181,20 +182,32 @@ class URLWrapper(object):
 class Category(URLWrapper):
     @property
     def url(self):
-        return 'category/%s.html' % self
+        return self.settings.get('CATEGORY_URL', 'category/{name}.html').format(name=self.name)
+
+    @property
+    def save_as(self):
+        return self.settings.get('CATEGORY_SAVE_AS', 'category/{name}.html').format(name=self.name)
 
 class Tag(URLWrapper):
-    def __init__(self, name):
-        self.name = unicode.strip(name)
+    def __init__(self, name, *args, **kwargs):
+        super(Tag, self).__init__(unicode.strip(name), *args, **kwargs)
 
     @property
     def url(self):
-        return 'tag/%s.html' % self
+        return self.settings.get('TAG_URL', 'tag/{name}.html').format(name=self.name)
+
+    @property
+    def save_as(self):
+        return self.settings.get('TAG_SAVE_AS', 'tag/{name}.html').format(name=self.name)
 
 class Author(URLWrapper):
     @property
     def url(self):
-        return 'author/%s.html' % self 
+        return self.settings.get('AUTHOR_URL', 'author/{name}.html').format(name=self.name)
+
+    @property
+    def save_as(self):
+        return self.settings.get('AUTHOR_SAVE_AS', 'author/{name}.html').format(name=self.name)
 
 def is_valid_content(content, f):
     try:
diff --git a/pelican/generators.py b/pelican/generators.py
index 7ad3d276..38bfb5b8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -179,7 +179,7 @@ class ArticlesGenerator(Generator):
         for tag, articles in self.tags.items():
             articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
-            write(tag.url, tag_template, self.context, tag=tag,
+            write(tag.save_as, tag_template, self.context, tag=tag,
                 articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
                 page_name='tag/%s' % tag)
@@ -187,7 +187,7 @@ class ArticlesGenerator(Generator):
         category_template = self.get_template('category')
         for cat, articles in self.categories:
             dates = [article for article in self.dates if article in articles]
-            write(cat.url, category_template, self.context,
+            write(cat.save_as, category_template, self.context,
                 category=cat, articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
                 page_name='category/%s' % cat)
@@ -195,7 +195,7 @@ class ArticlesGenerator(Generator):
         author_template = self.get_template('author')
         for aut, articles in self.authors:
             dates = [article for article in self.dates if article in articles]
-            write(aut.url, author_template, self.context,
+            write(aut.save_as, author_template, self.context,
                 author=aut, articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
                 page_name='author/%s' % aut)
@@ -228,7 +228,7 @@ class ArticlesGenerator(Generator):
                     category = os.path.basename(os.path.dirname(f)).decode('utf-8')
 
                 if category != '':
-                    metadata['category'] = Category(category)
+                    metadata['category'] = Category(category, self.settings)
 
             if 'date' not in metadata.keys()\
                 and self.settings['FALLBACK_ON_FS_DATE']:
diff --git a/pelican/readers.py b/pelican/readers.py
index e760b662..814f81d2 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -15,28 +15,30 @@ except ImportError:
     Markdown = False
 import re
 
-from pelican.contents import Category, Tag, Author
+from pelican.contents import Category, Tag, Author, URLWrapper
 from pelican.utils import get_date, open
 
 
 _METADATA_PROCESSORS = {
-    'tags': lambda x: map(Tag, unicode(x).split(',')),
-    'date': lambda x: get_date(x),
-    'status': unicode.strip,
+    'tags': lambda x, y: [Tag(tag, y) for tag in unicode(x).split(',')],
+    'date': lambda x, y: get_date(x),
+    'status': lambda x,y: unicode.strip(x),
     'category': Category,
     'author': Author,
 }
 
-def _process_metadata(name, value):
-    if name.lower() in _METADATA_PROCESSORS:
-        return _METADATA_PROCESSORS[name.lower()](value)
-    return value
-
-
 class Reader(object):
     enabled = True
     extensions = None
 
+    def __init__(self, settings):
+        self.settings = settings
+
+    def process_metadata(self, name, value):
+        if name.lower() in _METADATA_PROCESSORS:
+            return _METADATA_PROCESSORS[name.lower()](value, self.settings)
+        return value
+
 class _FieldBodyTranslator(HTMLTranslator):
 
     def astext(self):
@@ -54,29 +56,25 @@ def render_node_to_html(document, node):
     node.walkabout(visitor)
     return visitor.astext()
 
-def get_metadata(document):
-    """Return the dict containing document metadata"""
-    output = {}
-    for docinfo in document.traverse(docutils.nodes.docinfo):
-        for element in docinfo.children:
-            if element.tagname == 'field': # custom fields (e.g. summary)
-                name_elem, body_elem = element.children
-                name = name_elem.astext()
-                value = render_node_to_html(document, body_elem)
-            else: # standard fields (e.g. address)
-                name = element.tagname
-                value = element.astext()
-
-            output[name] = _process_metadata(name, value)
-    return output
-
-
 class RstReader(Reader):
     enabled = bool(docutils)
     extension = "rst"
 
     def _parse_metadata(self, document):
-        return get_metadata(document)
+        """Return the dict containing document metadata"""
+        output = {}
+        for docinfo in document.traverse(docutils.nodes.docinfo):
+            for element in docinfo.children:
+                if element.tagname == 'field': # custom fields (e.g. summary)
+                    name_elem, body_elem = element.children
+                    name = name_elem.astext()
+                    value = render_node_to_html(document, body_elem)
+                else: # standard fields (e.g. address)
+                    name = element.tagname
+                    value = element.astext()
+
+                output[name] = self.process_metadata(name, value)
+        return output
 
     def _get_publisher(self, filename):
         extra_params = {'initial_header_level': '2'}
@@ -113,7 +111,7 @@ class MarkdownReader(Reader):
         metadata = {}
         for name, value in md.Meta.items():
             name = name.lower()
-            metadata[name] = _process_metadata(name, value[0])
+            metadata[name] = self.process_metadata(name, value[0])
         return content, metadata
 
 
@@ -129,7 +127,7 @@ class HtmlReader(Reader):
             key = i.split(':')[0][5:].strip()
             value = i.split(':')[-1][:-3].strip()
             name = key.lower()
-            metadata[name] = _process_metadata(name, value)
+            metadata[name] = self.process_metadata(name, value)
 
         return content, metadata
 
@@ -143,7 +141,7 @@ def read_file(filename, fmt=None, settings=None):
         fmt = filename.split('.')[-1]
     if fmt not in _EXTENSIONS.keys():
         raise TypeError('Pelican does not know how to parse %s' % filename)
-    reader = _EXTENSIONS[fmt]()
+    reader = _EXTENSIONS[fmt](settings)
     settings_key = '%s_EXTENSIONS' % fmt.upper()
     if settings and settings_key in settings:
         reader.extensions = settings[settings_key]

From 9ba55c28b4cf22a74879f9a836af7e62fe3d9276 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Sat, 24 Dec 2011 00:37:18 +0000
Subject: [PATCH 0513/2864] Support CLEAN_URLS and ARTICLE_PERMALINK_STRUCTURE
 for backwards compatibility

---
 pelican/__init__.py | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 710c9ff1..e7e90f56 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,5 +1,6 @@
 import argparse
 import os, sys
+import re
 import time
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
@@ -26,6 +27,42 @@ class Pelican(object):
         if self.path.endswith('/'):
             self.path = self.path[:-1]
 
+        if settings.get('CLEAN_URLS', False):
+            log.warning('Found deprecated `CLEAN_URLS` in settings. Modifing'
+                        ' the following settings for the same behaviour.')
+
+            settings['ARTICLE_URL'] = '{slug}/'
+            settings['ARTICLE_LANG_URL'] = '{slug}-{lang}/'
+            settings['PAGE_URL'] = 'pages/{slug}/'
+            settings['PAGE_LANG_URL'] = 'pages/{slug}-{lang}/'
+
+            for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
+                            'PAGE_LANG_URL'):
+                log.warning("%s = '%s'" % (setting, settings[setting]))
+
+        if settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
+            log.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
+                        ' settings.  Modifing the following settings for'
+                        ' the same behaviour.')
+
+            structure = settings['ARTICLE_PERMALINK_STRUCTURE']
+
+            # Convert %(variable) into {variable}.
+            structure = re.sub('%\((\w+)\)s', '{\g<1>}', structure)
+
+            # Convert %x into {date:%x} for strftime
+            structure = re.sub('(%[A-z])', '{date:\g<1>}', structure)
+
+            # Strip a / prefix
+            structure = re.sub('^/', '', structure)
+
+            for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
+                            'PAGE_LANG_URL', 'ARTICLE_SAVE_AS',
+                            'ARTICLE_LANG_SAVE_AS', 'PAGE_SAVE_AS',
+                            'PAGE_LANG_SAVE_AS'):
+                settings[setting] = os.path.join(structure, settings[setting])
+                log.warning("%s = '%s'" % (setting, settings[setting]))
+
         # define the default settings
         self.settings = settings
         self.theme = theme or settings['THEME']

From c5816c9c5a242a3d5c3b26eb0b844fe2f79f52a2 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Thu, 1 Mar 2012 14:19:46 +0000
Subject: [PATCH 0514/2864] Make these patches compatible with upstream master

---
 pelican/contents.py   | 2 +-
 pelican/generators.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 316a0e56..12da22ef 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -98,7 +98,7 @@ class Page(object):
         return {
             'slug': getattr(self, 'slug', ''),
             'lang': getattr(self, 'lang', 'en'),
-            'date': getattr(self, 'date', datetime.now()),
+            'date': getattr(self, 'date', datetime.datetime.now()),
             'author': self.author,
             'category': getattr(self, 'category', 'misc'),
         }
diff --git a/pelican/generators.py b/pelican/generators.py
index 38bfb5b8..12bd20af 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -13,7 +13,7 @@ from operator import attrgetter, itemgetter
 from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
 from jinja2.exceptions import TemplateNotFound
 
-from pelican.contents import Article, Page, is_valid_content
+from pelican.contents import Article, Page, Category, is_valid_content
 from pelican.log import *
 from pelican.readers import read_file
 from pelican.utils import copy, process_translations, open

From 8bf0a22eb0a49cad133958cbd2145febb9e1228d Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 2 Mar 2012 16:32:05 +0100
Subject: [PATCH 0515/2864] fix encoding errors

error was:codeEncodeError: 'ascii' codec can't encode character u'\xe9' [..]
---
 pelican/contents.py   | 28 ++++++++++++++--------------
 pelican/generators.py |  7 +++----
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 12da22ef..90bc189d 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -106,16 +106,16 @@ class Page(object):
     @property
     def url(self):
         if self.in_default_lang:
-            return self.settings.get('PAGE_URL', 'pages/{slug}.html').format(**self.url_format)
+            return self.settings.get('PAGE_URL', u'pages/{slug}.html').format(**self.url_format)
 
-        return self.settings.get('PAGE_LANG_URL', 'pages/{slug}-{lang}.html').format(**self.url_format)
+        return self.settings.get('PAGE_LANG_URL', u'pages/{slug}-{lang}.html').format(**self.url_format)
 
     @property
     def save_as(self):
         if self.in_default_lang:
-            return self.settings.get('PAGE_SAVE_AS', 'pages/{slug}.html').format(**self.url_format)
+            return self.settings.get('PAGE_SAVE_AS', u'pages/{slug}.html').format(**self.url_format)
 
-        return self.settings.get('PAGE_LANG_SAVE_AS', 'pages/{slug}-{lang}.html').format(**self.url_format)
+        return self.settings.get('PAGE_LANG_SAVE_AS', u'pages/{slug}-{lang}.html').format(**self.url_format)
 
     @property
     def content(self):
@@ -143,16 +143,16 @@ class Article(Page):
     @property
     def url(self):
         if self.in_default_lang:
-            return self.settings.get('ARTICLE_URL', '{slug}.html').format(**self.url_format)
+            return self.settings.get('ARTICLE_URL', u'{slug}.html').format(**self.url_format)
 
-        return self.settings.get('ARTICLE_LANG_URL', '{slug}-{lang}.html').format(**self.url_format)
+        return self.settings.get('ARTICLE_LANG_URL', u'{slug}-{lang}.html').format(**self.url_format)
 
     @property
     def save_as(self):
         if self.in_default_lang:
-            return self.settings.get('ARTICLE_SAVE_AS', '{slug}.html').format(**self.url_format)
+            return self.settings.get('ARTICLE_SAVE_AS', u'{slug}.html').format(**self.url_format)
 
-        return self.settings.get('ARTICLE_LANG_SAVE_AS', '{slug}-{lang}.html').format(**self.url_format)
+        return self.settings.get('ARTICLE_LANG_SAVE_AS', u'{slug}-{lang}.html').format(**self.url_format)
 
 
 class Quote(Page):
@@ -182,11 +182,11 @@ class URLWrapper(object):
 class Category(URLWrapper):
     @property
     def url(self):
-        return self.settings.get('CATEGORY_URL', 'category/{name}.html').format(name=self.name)
+        return self.settings.get('CATEGORY_URL', u'category/{name}.html').format(name=self.name)
 
     @property
     def save_as(self):
-        return self.settings.get('CATEGORY_SAVE_AS', 'category/{name}.html').format(name=self.name)
+        return self.settings.get('CATEGORY_SAVE_AS', u'category/{name}.html').format(name=self.name)
 
 class Tag(URLWrapper):
     def __init__(self, name, *args, **kwargs):
@@ -194,20 +194,20 @@ class Tag(URLWrapper):
 
     @property
     def url(self):
-        return self.settings.get('TAG_URL', 'tag/{name}.html').format(name=self.name)
+        return self.settings.get('TAG_URL', u'tag/{name}.html').format(name=self.name)
 
     @property
     def save_as(self):
-        return self.settings.get('TAG_SAVE_AS', 'tag/{name}.html').format(name=self.name)
+        return self.settings.get('TAG_SAVE_AS', u'tag/{name}.html').format(name=self.name)
 
 class Author(URLWrapper):
     @property
     def url(self):
-        return self.settings.get('AUTHOR_URL', 'author/{name}.html').format(name=self.name)
+        return self.settings.get('AUTHOR_URL', u'author/{name}.html').format(name=self.name)
 
     @property
     def save_as(self):
-        return self.settings.get('AUTHOR_SAVE_AS', 'author/{name}.html').format(name=self.name)
+        return self.settings.get('AUTHOR_SAVE_AS', u'author/{name}.html').format(name=self.name)
 
 def is_valid_content(content, f):
     try:
diff --git a/pelican/generators.py b/pelican/generators.py
index 12bd20af..47ebb941 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -182,7 +182,7 @@ class ArticlesGenerator(Generator):
             write(tag.save_as, tag_template, self.context, tag=tag,
                 articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
-                page_name='tag/%s' % tag)
+                page_name=u'tag/%s' % tag)
 
         category_template = self.get_template('category')
         for cat, articles in self.categories:
@@ -190,7 +190,7 @@ class ArticlesGenerator(Generator):
             write(cat.save_as, category_template, self.context,
                 category=cat, articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
-                page_name='category/%s' % cat)
+                page_name=u'category/%s' % cat)
 
         author_template = self.get_template('author')
         for aut, articles in self.authors:
@@ -198,7 +198,7 @@ class ArticlesGenerator(Generator):
             write(aut.save_as, author_template, self.context,
                 author=aut, articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
-                page_name='author/%s' % aut)
+                page_name=u'author/%s' % aut)
 
         for article in self.drafts:
             write('drafts/%s.html' % article.slug, article_template, self.context,
@@ -212,7 +212,6 @@ class ArticlesGenerator(Generator):
         files = self.get_files(self.path, exclude=['pages',])
         all_articles = []
         for f in files:
-            
             try:
                 content, metadata = read_file(f, settings=self.settings)
             except Exception, e:

From bfd0e63e3d4b7a6b006024611e0451f4e39fbd7a Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 2 Mar 2012 23:19:03 +0100
Subject: [PATCH 0516/2864] fix pages urls

---
 pelican/themes/notmyidea/templates/base.html  | 2 +-
 pelican/themes/notmyidea/templates/index.html | 2 +-
 pelican/themes/simple/templates/base.html     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 4a4c70c6..12086dc7 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -31,7 +31,7 @@
                 {% endfor %}
                 {% if DISPLAY_PAGES_ON_MENU %}
                 {% for page in PAGES %}
-                    <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
+                    <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
                 {% endfor %}
                 {% endif %}
                 {% for cat, null in categories %}
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 217bacf2..f81275ae 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -53,7 +53,7 @@
 <section id="content" class="body">    
 <h2>Pages</h2>
 {% for page in PAGES %}
-    <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
+    <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
 {% endfor %}
 </section>
 {% endif %}
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index a8fad2db..a1017219 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -17,7 +17,7 @@
         {% endfor %}
         {% if DISPLAY_PAGES_ON_MENU %}
           {% for p in PAGES %}
-            <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/pages/{{ p.url }}">{{ p.title }}</a></li>
+            <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
           {% endfor %}
         {% else %}
           {% for cat, null in categories %}

From c2b8caed3f75bb7f52065bf21226f8a41ac76519 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Mon, 5 Mar 2012 23:33:25 +0100
Subject: [PATCH 0517/2864] fix test test_article_with_metadata

error was:
ERROR: test_article_with_metadata (tests.test_readers.RstReaderTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/bruno/dev/pelican/tests/test_readers.py", line 22, in test_article_with_metadata
    reader = readers.RstReader()
TypeError: __init__() takes exactly 2 arguments (1 given)
---
 tests/test_readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index 1e920e09..120b3125 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -19,7 +19,7 @@ def _filename(*args):
 class RstReaderTest(unittest2.TestCase):
 
     def test_article_with_metadata(self):
-        reader = readers.RstReader()
+        reader = readers.RstReader({})
         content, metadata = reader.read(_filename('article_with_metadata.rst'))
         expected = {
             'category': 'yeah',

From 8f8933d991fd5e9da1a22cc6e3d2beced83f6c7d Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Mon, 5 Mar 2012 23:48:18 +0100
Subject: [PATCH 0518/2864] fix test test_save_as

ERROR: test_save_as (tests.test_contents.TestPage)
If a lang is not the default lang, save_as should be set
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/bruno/dev/pelican/tests/test_contents.py", line 63, in test_save_as
    page.save_as = 'foo-bar.html'
AttributeError: can't set attribute
---
 tests/test_contents.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_contents.py b/tests/test_contents.py
index 9772fac5..1abb125d 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -60,12 +60,12 @@ class TestPage(TestCase):
         """
         # if a title is defined, save_as should be set
         page = Page(**self.page_kwargs)
-        page.save_as = 'foo-bar.html'
+        self.assertEqual(page.save_as, "pages/foo-bar.html")
 
         # if a language is defined, save_as should include it accordingly
         self.page_kwargs['metadata'].update({'lang': 'fr', })
         page = Page(**self.page_kwargs)
-        self.assertEqual(page.save_as, "foo-bar-fr.html")
+        self.assertEqual(page.save_as, "pages/foo-bar-fr.html")
 
     def test_datetime(self):
         """If DATETIME is set to a tuple, it should be used to override LOCALE

From 352d2047b433983231f1849ddfd81b46e609d940 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 6 Mar 2012 17:57:29 +0100
Subject: [PATCH 0519/2864] MOAR TYPOGRAPHY

---
 README.rst     | 2 +-
 docs/index.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index b521d430..2f66e54c 100644
--- a/README.rst
+++ b/README.rst
@@ -32,7 +32,7 @@ more information.
 Why the name "Pelican"?
 ------------------------
 
-Heh, you didn't notice? "Pelican" is an anagram for "Calepin" ;)
+Heh, you didn't notice? "Pelican" is an anagram for « Calepin » ;)
 
 Source code
 -----------
diff --git a/docs/index.rst b/docs/index.rst
index c6638997..1389f132 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -29,7 +29,7 @@ Pelican currently supports:
 Why the name "Pelican" ?
 ========================
 
-Heh, you didn't notice? "Pelican" is an anagram for "Calepin" ;)
+Heh, you didn't notice? "Pelican" is an anagram for « Calepin » ;)
 
 Source code
 ===========

From 1f32624e8bb33926d7d836ddf3b71772a2efb88e Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Wed, 7 Mar 2012 10:14:47 +0000
Subject: [PATCH 0520/2864] use a try / except to check if argparse is a needed
 dependency

---
 setup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 9b299085..6c3a72a1 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,10 @@ import platform
 VERSION = "3.0" # find a better way to do so.
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'pytz']
-if sys.version_info < (2,7):
+
+try:
+    import argparse
+except ImportError:
     requires.append('argparse')
 
 scripts = ['bin/pelican', 'tools/pelican-themes', 'tools/pelican-import', 'tools/pelican-quickstart']

From 8009324a3be63e4c04e7d5dea0a50cb3a04bc68a Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Wed, 7 Mar 2012 10:33:46 +0000
Subject: [PATCH 0521/2864] restructure the whole way scripts are created,
 using setuptools magic to take care of creating .exe wrappers for windows.

To make this work needed to
- rename modules with a "-" in it (not a valid name)
- add an __init__.py to the tools directory
- create an entry point dictionary which stores the right associations
---
 setup.py                                      | 17 ++++++-------
 tools/__init__.py                             |  0
 tools/pelican-import.bat                      |  1 -
 tools/pelican-quickstart.bat                  |  1 -
 tools/pelican-themes.bat                      |  1 -
 tools/{pelican-import => pelican_import.py}   | 24 +++++++++----------
 ...lican-quickstart => pelican_quickstart.py} |  0
 tools/{pelican-themes => pelican_themes.py}   |  0
 8 files changed, 20 insertions(+), 24 deletions(-)
 create mode 100644 tools/__init__.py
 delete mode 100755 tools/pelican-import.bat
 delete mode 100755 tools/pelican-quickstart.bat
 delete mode 100755 tools/pelican-themes.bat
 rename tools/{pelican-import => pelican_import.py} (98%)
 rename tools/{pelican-quickstart => pelican_quickstart.py} (100%)
 rename tools/{pelican-themes => pelican_themes.py} (100%)

diff --git a/setup.py b/setup.py
index 6c3a72a1..6556193d 100755
--- a/setup.py
+++ b/setup.py
@@ -12,13 +12,14 @@ try:
 except ImportError:
     requires.append('argparse')
 
-scripts = ['bin/pelican', 'tools/pelican-themes', 'tools/pelican-import', 'tools/pelican-quickstart']
-
-if sys.platform.startswith('win'):
-    scripts += [
-        'bin/pelican.bat', 'tools/pelican-themes.bat',
-        'tools/pelican-import.bat', 'tools/pelican-quickstart.bat'
-    ]
+entry_points = {
+    'console_scripts': [
+        'pelican = pelican:main',
+        'pelican-import = tools.pelican_import:main',
+        'pelican-quickstart = tools.pelican_quickstart:main',
+        'pelican-themes = tools.pelican_themes:main'
+   ]     
+}
 
 setup(
     name = "pelican",
@@ -31,7 +32,7 @@ setup(
     packages = ['pelican'],
     include_package_data = True,
     install_requires = requires,
-    scripts = scripts,
+    entry_points = entry_points,
     classifiers = ['Development Status :: 5 - Production/Stable',
                    'Environment :: Console',
                    'License :: OSI Approved :: GNU Affero General Public License v3',
diff --git a/tools/__init__.py b/tools/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tools/pelican-import.bat b/tools/pelican-import.bat
deleted file mode 100755
index 674e1fd7..00000000
--- a/tools/pelican-import.bat
+++ /dev/null
@@ -1 +0,0 @@
-@python "%~dpn0" %*
diff --git a/tools/pelican-quickstart.bat b/tools/pelican-quickstart.bat
deleted file mode 100755
index 674e1fd7..00000000
--- a/tools/pelican-quickstart.bat
+++ /dev/null
@@ -1 +0,0 @@
-@python "%~dpn0" %*
diff --git a/tools/pelican-themes.bat b/tools/pelican-themes.bat
deleted file mode 100755
index 674e1fd7..00000000
--- a/tools/pelican-themes.bat
+++ /dev/null
@@ -1 +0,0 @@
-@python "%~dpn0" %*
diff --git a/tools/pelican-import b/tools/pelican_import.py
similarity index 98%
rename from tools/pelican-import
rename to tools/pelican_import.py
index 3a931afd..261bff4c 100755
--- a/tools/pelican-import
+++ b/tools/pelican_import.py
@@ -231,18 +231,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False):
             fs.write(header + content)
 
 
-def main(input_type, input, out_markup, output_path, dircat=False):
-    if input_type == 'wordpress':
-        fields = wp2fields(input)
-    elif input_type == 'dotclear':
-        fields = dc2fields(input)
-    elif input_type == 'feed':
-        fields = feed2fields(input)
-
-    fields2pelican(fields, out_markup, output_path, dircat=dircat)
-
-
-if __name__ == '__main__':
+def main():
     parser = argparse.ArgumentParser(
         description="Transform feed, Wordpress or Dotclear files to rst files."
             "Be sure to have pandoc installed")
@@ -280,4 +269,13 @@ if __name__ == '__main__':
             error("Couldn't create the output folder: " + args.output)
             exit()
 
-    main(input_type, args.input, args.markup, args.output, dircat=args.dircat)
+    input_type, input, out_markup, output_path, dircat=False = input_type, args.input, args.markup, args.output, args.dircat
+
+    if input_type == 'wordpress':
+        fields = wp2fields(input)
+    elif input_type == 'dotclear':
+        fields = dc2fields(input)
+    elif input_type == 'feed':
+        fields = feed2fields(input)
+
+    fields2pelican(fields, out_markup, output_path, dircat=dircat)
diff --git a/tools/pelican-quickstart b/tools/pelican_quickstart.py
similarity index 100%
rename from tools/pelican-quickstart
rename to tools/pelican_quickstart.py
diff --git a/tools/pelican-themes b/tools/pelican_themes.py
similarity index 100%
rename from tools/pelican-themes
rename to tools/pelican_themes.py

From 7c78f232b4b10a31607815469fb7cf276a807468 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Wed, 7 Mar 2012 10:34:14 +0000
Subject: [PATCH 0522/2864] remove unused imports

---
 setup.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setup.py b/setup.py
index 6556193d..910499de 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 from setuptools import setup
-import sys
-import platform
 
 VERSION = "3.0" # find a better way to do so.
 

From 8f7b08a01cd5a8ff679946996d35f285380ab93d Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Wed, 7 Mar 2012 10:38:08 +0000
Subject: [PATCH 0523/2864] remove now useless if __name__ == '__main__' checks
 and clean up the old pelican script in bin

---
 bin/pelican                 | 3 ---
 bin/pelican.bat             | 1 -
 pelican/__init__.py         | 4 ----
 tools/pelican_import.py     | 1 +
 tools/pelican_quickstart.py | 3 ---
 tools/pelican_themes.py     | 3 ---
 6 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100755 bin/pelican
 delete mode 100755 bin/pelican.bat

diff --git a/bin/pelican b/bin/pelican
deleted file mode 100755
index 3fe2ee57..00000000
--- a/bin/pelican
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-from pelican import main
-main()
diff --git a/bin/pelican.bat b/bin/pelican.bat
deleted file mode 100755
index 674e1fd7..00000000
--- a/bin/pelican.bat
+++ /dev/null
@@ -1 +0,0 @@
-@python "%~dpn0" %*
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 710c9ff1..a0b5704c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -158,7 +158,3 @@ def main():
             raise
         else:
             sys.exit(getattr(e, 'exitcode', 1))
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/pelican_import.py b/tools/pelican_import.py
index 261bff4c..e7f8e051 100755
--- a/tools/pelican_import.py
+++ b/tools/pelican_import.py
@@ -269,6 +269,7 @@ def main():
             error("Couldn't create the output folder: " + args.output)
             exit()
 
+    # TODO: refactor this long assignment
     input_type, input, out_markup, output_path, dircat=False = input_type, args.input, args.markup, args.output, args.dircat
 
     if input_type == 'wordpress':
diff --git a/tools/pelican_quickstart.py b/tools/pelican_quickstart.py
index 4048c2bf..56c22f10 100755
--- a/tools/pelican_quickstart.py
+++ b/tools/pelican_quickstart.py
@@ -270,6 +270,3 @@ Please answer the following questions so this script can generate the files need
             print('Error: {0}'.format(e))
 
     print('Done. Your new project is available at %s' % CONF['basedir'])
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/pelican_themes.py b/tools/pelican_themes.py
index 78df4a48..3d35bb5d 100755
--- a/tools/pelican_themes.py
+++ b/tools/pelican_themes.py
@@ -212,6 +212,3 @@ def clean(v=False):
                     c+=1
 
     print("\nRemoved {0} broken links".format(c))
-
-if __name__ == '__main__':
-    main()

From 4eb20c5d82cf59ae60a765d5af4f723157fed2b6 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Wed, 7 Mar 2012 12:00:32 +0000
Subject: [PATCH 0524/2864] global declaration is only needed if it's necessary
 to modify a module level variable, to declare it and use it read only it's
 not necessary

---
 pelican/log.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/log.py b/pelican/log.py
index 2790aed3..8ec44cad 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -4,7 +4,6 @@ from logging import CRITICAL, ERROR,  WARN, INFO, DEBUG
 from logging import critical, error, info, warning, warn, debug
 from logging import Formatter, getLogger, StreamHandler
 
-global ANSI
 ANSI = {
     'gray' : lambda(text) : u'\033[1;30m' + unicode(text) + u'\033[1;m',
     'red' : lambda(text) : u'\033[1;31m' + unicode(text) + u'\033[1;m',

From 2e0e893a9b1119465c69c5204a03894ab955bcfb Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Wed, 7 Mar 2012 12:14:13 +0000
Subject: [PATCH 0525/2864] fix three print statement

---
 tools/pelican_import.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/pelican_import.py b/tools/pelican_import.py
index e7f8e051..b883f7fc 100755
--- a/tools/pelican_import.py
+++ b/tools/pelican_import.py
@@ -71,7 +71,7 @@ def dc2fields(file):
                 else:
                     posts.append(line)
 
-    print "%i posts read." % len(posts)
+    print("%i posts read." % len(posts))
 
     for post in posts:
         fields = post.split('","')
@@ -205,7 +205,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False):
         else:
             out_filename = os.path.join(output_path, filename+ext)
 
-        print out_filename
+        print(out_filename)
 
         if in_markup == "html":
             html_filename = os.path.join(output_path, filename+'.html')
@@ -259,7 +259,7 @@ def main():
     elif args.feed:
         input_type = 'feed'
     else:
-        print "you must provide either --wpfile, --dotclear or --feed options"
+        print("you must provide either --wpfile, --dotclear or --feed options")
         exit()
 
     if not os.path.exists(args.output):

From 20af8fd378d693c5c0cf59a6c12fad0800945ece Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Wed, 7 Mar 2012 12:17:39 +0000
Subject: [PATCH 0526/2864] refactoring of the ANSI dictionary, removing all
 the repeated code

---
 pelican/log.py | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index 8ec44cad..1cb76e16 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -4,26 +4,36 @@ from logging import CRITICAL, ERROR,  WARN, INFO, DEBUG
 from logging import critical, error, info, warning, warn, debug
 from logging import Formatter, getLogger, StreamHandler
 
-ANSI = {
-    'gray' : lambda(text) : u'\033[1;30m' + unicode(text) + u'\033[1;m',
-    'red' : lambda(text) : u'\033[1;31m' + unicode(text) + u'\033[1;m',
-    'green' : lambda(text) : u'\033[1;32m' + unicode(text) + u'\033[1;m',
-    'yellow' : lambda(text) : u'\033[1;33m' + unicode(text) + u'\033[1;m',
-    'blue' : lambda(text) : u'\033[1;34m' + unicode(text) + u'\033[1;m',
-    'magenta' : lambda(text) : u'\033[1;35m' + unicode(text) + u'\033[1;m',
-    'cyan' : lambda(text) : u'\033[1;36m' + unicode(text) + u'\033[1;m',
-    'white' : lambda(text) : u'\033[1;37m' + unicode(text) + u'\033[1;m',
-    'bgred' : lambda(text) : u'\033[1;41m' + unicode(text) + u'\033[1;m',
-    'bggreen' : lambda(text) : u'\033[1;42m' + unicode(text) + u'\033[1;m',
-    'bgbrown' : lambda(text) : u'\033[1;43m' + unicode(text) + u'\033[1;m',
-    'bgblue' : lambda(text) : u'\033[1;44m' + unicode(text) + u'\033[1;m',
-    'bgmagenta' : lambda(text) : u'\033[1;45m' + unicode(text) + u'\033[1;m',
-    'bgcyan' : lambda(text) : u'\033[1;46m' + unicode(text) + u'\033[1;m',
-    'bggray' : lambda(text) : u'\033[1;47m' + unicode(text) + u'\033[1;m',
-    'bgyellow' : lambda(text) : u'\033[1;43m' + unicode(text) + u'\033[1;m',
-    'bggrey' : lambda(text) : u'\033[1;100m' + unicode(text) + u'\033[1;m'
+
+RESET_TERM = u'\033[1;m'
+
+
+def term_color(code):
+    return lambda text: code + unicode(text) + RESET_TERM
+
+
+COLOR_CODES = {
+    'gray': u'\033[1;30m',
+    'red': u'\033[1;31m',
+    'green': u'\033[1;32m',
+    'yellow': u'\033[1;33m',
+    'blue': u'\033[1;34m',
+    'magenta': u'\033[1;35m',
+    'cyan': u'\033[1;36m',
+    'white': u'\033[1;37m',
+    'bgred': u'\033[1;41m',
+    'bggreen': u'\033[1;42m',
+    'bgbrown': u'\033[1;43m',
+    'bgblue': u'\033[1;44m',
+    'bgmagenta': u'\033[1;45m',
+    'bgcyan': u'\033[1;46m',
+    'bggray': u'\033[1;47m',
+    'bgyellow': u'\033[1;43m',
+    'bggrey': u'\033[1;100m',
 }
 
+ANSI = dict((col, term_color(code)) for col, code in COLOR_CODES.items())
+
 
 class ANSIFormatter(Formatter):
     """

From dd07ddb0b018c94e0ca1c04a9be3cbefdf42b028 Mon Sep 17 00:00:00 2001
From: Meir Kriheli <mkriheli@gmail.com>
Date: Fri, 9 Mar 2012 02:03:15 +0200
Subject: [PATCH 0527/2864] Make sure test passes for dates formatted as utf-8

---
 tests/test_contents.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_contents.py b/tests/test_contents.py
index 9772fac5..e4c98741 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -82,7 +82,8 @@ class TestPage(TestCase):
         page_kwargs['metadata']['date'] = dt
         page = Page( **page_kwargs)
 
-        self.assertEqual(page.locale_date, dt.strftime(_DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']))
+        self.assertEqual(page.locale_date,
+            unicode(dt.strftime(_DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']), 'utf-8'))
 
 
         page_kwargs['settings'] = {x:_DEFAULT_CONFIG[x] for x in _DEFAULT_CONFIG}

From 7240460688a9dcf438cd8f9c8edb931700b2375f Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 9 Mar 2012 15:33:34 +0100
Subject: [PATCH 0528/2864] Update the CHANGELOG for 2.8

---
 CHANGELOG | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 57056826..3d34ad20 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,21 @@
-3.0
+2.8
 
 * dotclear importer
-* Markdown extensions
-* Theme extensions
-* Plugins support
+* Allow the usage of markdown extensions
+* Themes are now easily extensible
+* Don't output pagination information if there is only one page.
+* Add a page per author, with all their articles
+* Improved the test suite
+* Made the themes more easy to extend
+* Removed Skribit support
+* Added a "pelican-quickstart" script
+* Fixed timezone-related issues
+* Add some scripts for windows support
+* Date can be specified in seconds
+* Never fail when generating posts (skip and continue)
+* Allow the use of future dates
+* Support having different timezones per languages.
+* Enhanced the documentation
 
 2.7
 

From 0298d412dc595436df995eed540ea462b7df8161 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 9 Mar 2012 15:36:29 +0100
Subject: [PATCH 0529/2864] updated CHANGELOG

---
 CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 3d34ad20..e68c6f0d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+X.X
+
+* Refactored the way URL are handled.
+* Improved the english documentation
+* Fixed packaging using setuptools entrypoints
+
 2.8
 
 * dotclear importer

From df25dec30a3aee09bc1b75f35419886e5ea77bfd Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 9 Mar 2012 16:17:09 +0100
Subject: [PATCH 0530/2864] Use the with statement when opening files.

---
 pelican/generators.py |  3 ++-
 pelican/readers.py    | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 47ebb941..9d5607e2 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -375,7 +375,8 @@ class PdfGenerator(Generator):
             filename = obj.slug + ".pdf"
             output_pdf=os.path.join(output_path, filename)
             # print "Generating pdf for", obj.filename, " in ", output_pdf
-            self.pdfcreator.createPdf(text=open(obj.filename), output=output_pdf)
+            with open(obj.filename) as f:
+                self.pdfcreator.createPdf(text=f, output=output_pdf)
             info(u' [ok] writing %s' % output_pdf)
 
     def generate_context(self):
diff --git a/pelican/readers.py b/pelican/readers.py
index 814f81d2..c4c12280 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -121,20 +121,20 @@ class HtmlReader(Reader):
 
     def read(self, filename):
         """Parse content and metadata of (x)HTML files"""
-        content = open(filename)
-        metadata = {'title':'unnamed'}
-        for i in self._re.findall(content):
-            key = i.split(':')[0][5:].strip()
-            value = i.split(':')[-1][:-3].strip()
-            name = key.lower()
-            metadata[name] = self.process_metadata(name, value)
-
-        return content, metadata
+        with open(filename) as content:
+            metadata = {'title': 'unnamed'}
+            for i in self._re.findall(content):
+                key = i.split(':')[0][5:].strip()
+                value = i.split(':')[-1][:-3].strip()
+                name = key.lower()
+                metadata[name] = self.process_metadata(name, value)
 
+            return content, metadata
 
 
 _EXTENSIONS = dict((cls.extension, cls) for cls in Reader.__subclasses__())
 
+
 def read_file(filename, fmt=None, settings=None):
     """Return a reader object using the given format."""
     if not fmt:

From 6cde7fd27a6faf062e52bca9e3e2645e487191b3 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 9 Mar 2012 16:21:38 +0100
Subject: [PATCH 0531/2864] PEP8-ify.

Wrap to 80 chars, sanitize imports.
---
 pelican/__init__.py   | 44 ++++++++++++----------
 pelican/contents.py   | 26 ++++++++-----
 pelican/generators.py | 85 +++++++++++++++++++++++--------------------
 pelican/paginator.py  |  3 +-
 pelican/readers.py    | 18 +++++----
 pelican/settings.py   | 25 +++++++------
 pelican/utils.py      | 20 ++++++----
 pelican/writers.py    | 31 +++++++++-------
 8 files changed, 142 insertions(+), 110 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index bbd0b679..8de68d69 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,5 +1,6 @@
 import argparse
-import os, sys
+import os
+import sys
 import re
 import time
 
@@ -69,7 +70,8 @@ class Pelican(object):
         output_path = output_path or settings['OUTPUT_PATH']
         self.output_path = os.path.realpath(output_path)
         self.markup = markup or settings['MARKUP']
-        self.delete_outputdir = delete_outputdir or settings['DELETE_OUTPUT_DIRECTORY']
+        self.delete_outputdir = delete_outputdir \
+                                    or settings['DELETE_OUTPUT_DIRECTORY']
 
         # find the theme in pelican.theme if the given one does not exists
         if not os.path.exists(self.theme):
@@ -112,7 +114,6 @@ class Pelican(object):
             if hasattr(p, 'generate_output'):
                 p.generate_output(writer)
 
-
     def get_generator_classes(self):
         generators = [ArticlesGenerator, PagesGenerator, StaticGenerator]
         if self.settings['PDF_GENERATOR']:
@@ -123,7 +124,6 @@ class Pelican(object):
         return Writer(self.output_path, settings=self.settings)
 
 
-
 def main():
     parser = argparse.ArgumentParser(description="""A tool to generate a
     static blog, with restructured text input files.""")
@@ -134,32 +134,38 @@ def main():
         help='Path where to find the theme templates. If not specified, it'
              'will use the default one included with pelican.')
     parser.add_argument('-o', '--output', dest='output',
-        help='Where to output the generated files. If not specified, a directory'
-             ' will be created, named "output" in the current path.')
+        help='Where to output the generated files. If not specified, a '
+             'directory will be created, named "output" in the current path.')
     parser.add_argument('-m', '--markup', default=None, dest='markup',
         help='the list of markup language to use (rst or md). Please indicate '
              'them separated by commas')
     parser.add_argument('-s', '--settings', dest='settings', default='',
         help='the settings of the application. Default to False.')
-    parser.add_argument('-d', '--delete-output-directory', dest='delete_outputdir',
+    parser.add_argument('-d', '--delete-output-directory',
+                        dest='delete_outputdir',
         action='store_true', help='Delete the output directory.')
-    parser.add_argument('-v', '--verbose', action='store_const', const=log.INFO, dest='verbosity',
-            help='Show all messages')
-    parser.add_argument('-q', '--quiet', action='store_const', const=log.CRITICAL, dest='verbosity',
-            help='Show only critical errors')
-    parser.add_argument('-D', '--debug', action='store_const', const=log.DEBUG, dest='verbosity',
-            help='Show all message, including debug messages')
+    parser.add_argument('-v', '--verbose', action='store_const',
+                        const=log.INFO, dest='verbosity',
+                        help='Show all messages')
+    parser.add_argument('-q', '--quiet', action='store_const',
+                        const=log.CRITICAL, dest='verbosity',
+                        help='Show only critical errors')
+    parser.add_argument('-D', '--debug', action='store_const',
+                        const=log.DEBUG, dest='verbosity',
+                        help='Show all message, including debug messages')
     parser.add_argument('--version', action='version', version=__version__,
             help='Print the pelican version and exit')
-    parser.add_argument('-r', '--autoreload', dest='autoreload', action='store_true',
-            help="Relaunch pelican each time a modification occurs on the content"
-                 "files")
+    parser.add_argument('-r', '--autoreload', dest='autoreload',
+                        action='store_true',
+                        help="Relaunch pelican each time a modification occurs"
+                             " on the content files")
     args = parser.parse_args()
 
     log.init(args.verbosity)
-    # Split the markup languages only if some have been given. Otherwise, populate
-    # the variable with None.
-    markup = [a.strip().lower() for a in args.markup.split(',')] if args.markup else None
+    # Split the markup languages only if some have been given. Otherwise,
+    # populate the variable with None.
+    markup = [a.strip().lower() for a in args.markup.split(',')]\
+              if args.markup else None
 
     settings = read_settings(args.settings)
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 90bc189d..b408ff58 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
-import datetime
+from datetime import datetime
 from os import getenv
 from sys import platform, stdin
 import locale
 
-from pelican.log import *
+from pelican.log import warning, error
 from pelican.settings import _DEFAULT_CONFIG
 from pelican.utils import slugify, truncate_html_words
 
+
 class Page(object):
     """Represents a page
     Given a content, and metadata, create an adequate object.
@@ -41,7 +42,8 @@ class Page(object):
                 self.author = Author(settings['AUTHOR'], settings)
             else:
                 self.author = Author(getenv('USER', 'John Doe'), settings)
-                warning(u"Author of `{0}' unknow, assuming that his name is `{1}'".format(filename or self.title, self.author))
+                warning(u"Author of `{0}' unknow, assuming that his name is "
+                         "`{1}'".format(filename or self.title, self.author))
 
         # manage languages
         self.in_default_lang = True
@@ -71,16 +73,19 @@ class Page(object):
             self.date_format = self.date_format[1]
 
         if hasattr(self, 'date'):
+            encoded_date = self.date.strftime(
+                    self.date_format.encode('ascii', 'xmlcharrefreplace'))
+
             if platform == 'win32':
-                self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode(stdin.encoding)
+                self.locale_date = encoded_date.decode(stdin.encoding)
             else:
-                self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf')
+                self.locale_date = encoded_date.decode('utf')
 
         # manage status
         if not hasattr(self, 'status'):
             self.status = settings['DEFAULT_STATUS']
             if not settings['WITH_FUTURE_DATES']:
-                if hasattr(self, 'date') and self.date > datetime.datetime.now():
+                if hasattr(self, 'date') and self.date > datetime.now():
                     self.status = 'draft'
 
         # set summary
@@ -98,7 +103,7 @@ class Page(object):
         return {
             'slug': getattr(self, 'slug', ''),
             'lang': getattr(self, 'lang', 'en'),
-            'date': getattr(self, 'date', datetime.datetime.now()),
+            'date': getattr(self, 'date', datetime.now()),
             'author': self.author,
             'category': getattr(self, 'category', 'misc'),
         }
@@ -133,8 +138,8 @@ class Page(object):
         """Dummy function"""
         pass
 
-    summary = property(_get_summary, _set_summary,
-                       "Summary of the article. Based on the content. Can't be set")
+    summary = property(_get_summary, _set_summary, "Summary of the article."
+                       "Based on the content. Can't be set")
 
 
 class Article(Page):
@@ -214,5 +219,6 @@ def is_valid_content(content, f):
         content.check_properties()
         return True
     except NameError, e:
-        error(u"Skipping %s: impossible to find informations about '%s'" % (f, e))
+        error(u"Skipping %s: impossible to find informations about '%s'"\
+                % (f, e))
         return False
diff --git a/pelican/generators.py b/pelican/generators.py
index 9d5607e2..ee95545e 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -3,7 +3,6 @@ import os
 import datetime
 import math
 import random
-import urlparse
 
 from collections import defaultdict
 from functools import partial
@@ -14,10 +13,9 @@ from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
 from jinja2.exceptions import TemplateNotFound
 
 from pelican.contents import Article, Page, Category, is_valid_content
-from pelican.log import *
+from pelican.log import warning, error, debug, info
 from pelican.readers import read_file
 from pelican.utils import copy, process_translations, open
-from pelican.utils import slugify
 
 
 class Generator(object):
@@ -33,17 +31,23 @@ class Generator(object):
 
         # templates cache
         self._templates = {}
-        self._templates_path = os.path.expanduser(os.path.join(self.theme, 'templates'))
-        simple_loader = FileSystemLoader(os.path.join(os.path.dirname(os.path.abspath(__file__)), "themes", "simple", "templates"))
+        self._templates_path = os.path.expanduser(
+                os.path.join(self.theme, 'templates'))
+
+        theme_path = os.path.join(os.path.dirname(os.path.abspath(__file__)))
+
+        simple_loader = FileSystemLoader(theme_path,
+                                         "themes", "simple", "templates")
         self._env = Environment(
             loader=ChoiceLoader([
                 FileSystemLoader(self._templates_path),
-                simple_loader,                              # implicit inheritance
-                PrefixLoader({'!simple' : simple_loader})   # explicit inheritance
+                simple_loader,  # implicit inheritance
+                PrefixLoader({'!simple': simple_loader})  # explicit one
             ]),
             extensions=self.settings.get('JINJA_EXTENSIONS', []),
         )
-        debug('self._env.list_templates(): {0}'.format(self._env.list_templates()))
+
+        debug('template list: {0}'.format(self._env.list_templates()))
 
         # get custom Jinja filters from user settings
         custom_filters = self.settings.get('JINJA_FILTERS', {})
@@ -58,8 +62,8 @@ class Generator(object):
             try:
                 self._templates[name] = self._env.get_template(name + '.html')
             except TemplateNotFound:
-                raise Exception('[templates] unable to load %s.html from %s' % (
-                    name, self._templates_path))
+                raise Exception('[templates] unable to load %s.html from %s' \
+                        % (name, self._templates_path))
         return self._templates[name]
 
     def get_files(self, path, exclude=[], extensions=None):
@@ -75,7 +79,7 @@ class Generator(object):
 
         try:
             iter = os.walk(path, followlinks=True)
-        except TypeError: # python 2.5 does not support followlinks
+        except TypeError:  # python 2.5 does not support followlinks
             iter = os.walk(path)
 
         for root, dirs, temp_files in iter:
@@ -102,7 +106,7 @@ class ArticlesGenerator(Generator):
 
     def __init__(self, *args, **kwargs):
         """initialize properties"""
-        self.articles = [] # only articles in default language
+        self.articles = []  # only articles in default language
         self.translations = []
         self.dates = {}
         self.tags = defaultdict(list)
@@ -138,7 +142,8 @@ class ArticlesGenerator(Generator):
 
                 if 'TAG_FEED_RSS' in self.settings:
                     writer.write_feed(arts, self.context,
-                            self.settings['TAG_FEED_RSS'] % tag, feed_type='rss')
+                                      self.settings['TAG_FEED_RSS'] % tag,
+                                      feed_type='rss')
 
         translations_feeds = defaultdict(list)
         for article in chain(self.articles, self.translations):
@@ -149,14 +154,11 @@ class ArticlesGenerator(Generator):
             writer.write_feed(items, self.context,
                               self.settings['TRANSLATION_FEED'] % lang)
 
-
     def generate_pages(self, writer):
         """Generate the pages on the disk"""
 
-        write = partial(
-            writer.write_file,
-            relative_urls = self.settings.get('RELATIVE_URLS')
-        )
+        write = partial(writer.write_file,
+                        relative_urls=self.settings.get('RELATIVE_URLS'))
 
         # to minimize the number of relative path stuff modification
         # in writer, articles pass first
@@ -171,8 +173,10 @@ class ArticlesGenerator(Generator):
             paginated = {}
             if template in PAGINATED_TEMPLATES:
                 paginated = {'articles': self.articles, 'dates': self.dates}
-            write('%s.html' % template, self.get_template(template), self.context,
-                    blog=True, paginated=paginated, page_name=template)
+
+            write('%s.html' % template, self.get_template(template),
+                  self.context, blog=True, paginated=paginated,
+                  page_name=template)
 
         # and subfolders after that
         tag_template = self.get_template('tag')
@@ -201,15 +205,14 @@ class ArticlesGenerator(Generator):
                 page_name=u'author/%s' % aut)
 
         for article in self.drafts:
-            write('drafts/%s.html' % article.slug, article_template, self.context,
-                    article=article, category=article.category)
-
+            write('drafts/%s.html' % article.slug, article_template,
+                  self.context, article=article, category=article.category)
 
     def generate_context(self):
         """change the context"""
 
         # return the list of files to use
-        files = self.get_files(self.path, exclude=['pages',])
+        files = self.get_files(self.path, exclude=['pages', ])
         all_articles = []
         for f in files:
             try:
@@ -224,14 +227,16 @@ class ArticlesGenerator(Generator):
                 if os.path.dirname(f) == self.path:
                     category = self.settings['DEFAULT_CATEGORY']
                 else:
-                    category = os.path.basename(os.path.dirname(f)).decode('utf-8')
+                    category = os.path.basename(os.path.dirname(f))\
+                                .decode('utf-8')
 
                 if category != '':
                     metadata['category'] = Category(category, self.settings)
 
             if 'date' not in metadata.keys()\
                 and self.settings['FALLBACK_ON_FS_DATE']:
-                    metadata['date'] = datetime.datetime.fromtimestamp(os.stat(f).st_ctime)
+                    metadata['date'] = datetime.datetime.fromtimestamp(
+                                        os.stat(f).st_ctime)
 
             article = Article(content, metadata, settings=self.settings,
                               filename=f)
@@ -265,7 +270,7 @@ class ArticlesGenerator(Generator):
             for tag in getattr(article, 'tags', []):
                 tag_cloud[tag] += 1
 
-        tag_cloud = sorted(tag_cloud.items(), key = itemgetter(1), reverse = True)
+        tag_cloud = sorted(tag_cloud.items(), key=itemgetter(1), reverse=True)
         tag_cloud = tag_cloud[:self.settings.get('TAG_CLOUD_MAX_ITEMS')]
 
         tags = map(itemgetter(1), tag_cloud)
@@ -277,9 +282,8 @@ class ArticlesGenerator(Generator):
         self.tag_cloud = [
             (
                 tag,
-                int(
-                    math.floor(steps - (steps - 1) * math.log(count) / (math.log(max_count)or 1))
-                )
+                int(math.floor(steps - (steps - 1) * math.log(count)
+                    / (math.log(max_count)or 1)))
             )
             for tag, count in tag_cloud
         ]
@@ -290,14 +294,13 @@ class ArticlesGenerator(Generator):
 
         # order the categories per name
         self.categories = list(self.categories.items())
-        self.categories.sort(reverse=self.settings.get('REVERSE_CATEGORY_ORDER'))
+        self.categories.sort(reverse=self.settings['REVERSE_CATEGORY_ORDER'])
 
         self.authors = list(self.authors.items())
         self.authors.sort()
 
-        self._update_context(('articles', 'dates', 'tags', 'categories', 'tag_cloud', 'authors'))
-
-
+        self._update_context(('articles', 'dates', 'tags', 'categories',
+                              'tag_cloud', 'authors'))
 
     def generate_output(self, writer):
         self.generate_feeds(writer)
@@ -334,7 +337,7 @@ class PagesGenerator(Generator):
         for page in chain(self.translations, self.pages):
             writer.write_file(page.save_as, self.get_template('page'),
                     self.context, page=page,
-                    relative_urls = self.settings.get('RELATIVE_URLS'))
+                    relative_urls=self.settings.get('RELATIVE_URLS'))
 
 
 class StaticGenerator(Generator):
@@ -345,8 +348,8 @@ class StaticGenerator(Generator):
             final_path=None):
         """Copy all the paths from source to destination"""
         for path in paths:
-            copy(path, source, os.path.join(output_path, destination), final_path,
-                    overwrite=True)
+            copy(path, source, os.path.join(output_path, destination),
+                 final_path, overwrite=True)
 
     def generate_output(self, writer):
         self._copy_paths(self.settings['STATIC_PATHS'], self.path,
@@ -356,7 +359,8 @@ class StaticGenerator(Generator):
 
         # copy all the files needed
         for source, destination in self.settings['FILES_TO_COPY']:
-            copy(source, self.path, self.output_path, destination, overwrite=True)
+            copy(source, self.path, self.output_path, destination,
+                 overwrite=True)
 
 
 class PdfGenerator(Generator):
@@ -365,7 +369,8 @@ class PdfGenerator(Generator):
     def __init__(self, *args, **kwargs):
         try:
             from rst2pdf.createpdf import RstToPdf
-            self.pdfcreator = RstToPdf(breakside=0, stylesheets=['twelvepoint'])
+            self.pdfcreator = RstToPdf(breakside=0,
+                                       stylesheets=['twelvepoint'])
         except ImportError:
             raise Exception("unable to find rst2pdf")
         super(PdfGenerator, self).__init__(*args, **kwargs)
@@ -373,7 +378,7 @@ class PdfGenerator(Generator):
     def _create_pdf(self, obj, output_path):
         if obj.filename.endswith(".rst"):
             filename = obj.slug + ".pdf"
-            output_pdf=os.path.join(output_path, filename)
+            output_pdf = os.path.join(output_path, filename)
             # print "Generating pdf for", obj.filename, " in ", output_pdf
             with open(obj.filename) as f:
                 self.pdfcreator.createPdf(text=f, output=output_pdf)
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 89e081ca..fe871491 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -1,6 +1,7 @@
 # From django.core.paginator
 from math import ceil
 
+
 class Paginator(object):
     def __init__(self, object_list, per_page, orphans=0):
         self.object_list = object_list
@@ -39,6 +40,7 @@ class Paginator(object):
         return range(1, self.num_pages + 1)
     page_range = property(_get_page_range)
 
+
 class Page(object):
     def __init__(self, object_list, number, paginator):
         self.object_list = object_list
@@ -82,4 +84,3 @@ class Page(object):
         if self.number == self.paginator.num_pages:
             return self.paginator.count
         return self.number * self.paginator.per_page
-
diff --git a/pelican/readers.py b/pelican/readers.py
index c4c12280..5bbbfb30 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -6,27 +6,28 @@ try:
     from docutils.writers.html4css1 import HTMLTranslator
 
     # import the directives to have pygments support
-    from pelican import rstdirectives
+    from pelican import rstdirectives  # NOQA
 except ImportError:
     core = False
 try:
     from markdown import Markdown
 except ImportError:
-    Markdown = False
+    Markdown = False  # NOQA
 import re
 
-from pelican.contents import Category, Tag, Author, URLWrapper
+from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, open
 
 
 _METADATA_PROCESSORS = {
     'tags': lambda x, y: [Tag(tag, y) for tag in unicode(x).split(',')],
     'date': lambda x, y: get_date(x),
-    'status': lambda x,y: unicode.strip(x),
+    'status': lambda x, y: unicode.strip(x),
     'category': Category,
     'author': Author,
 }
 
+
 class Reader(object):
     enabled = True
     extensions = None
@@ -39,6 +40,7 @@ class Reader(object):
             return _METADATA_PROCESSORS[name.lower()](value, self.settings)
         return value
 
+
 class _FieldBodyTranslator(HTMLTranslator):
 
     def astext(self):
@@ -56,6 +58,7 @@ def render_node_to_html(document, node):
     node.walkabout(visitor)
     return visitor.astext()
 
+
 class RstReader(Reader):
     enabled = bool(docutils)
     extension = "rst"
@@ -65,11 +68,11 @@ class RstReader(Reader):
         output = {}
         for docinfo in document.traverse(docutils.nodes.docinfo):
             for element in docinfo.children:
-                if element.tagname == 'field': # custom fields (e.g. summary)
+                if element.tagname == 'field':  # custom fields (e.g. summary)
                     name_elem, body_elem = element.children
                     name = name_elem.astext()
                     value = render_node_to_html(document, body_elem)
-                else: # standard fields (e.g. address)
+                else:  # standard fields (e.g. address)
                     name = element.tagname
                     value = element.astext()
 
@@ -78,7 +81,8 @@ class RstReader(Reader):
 
     def _get_publisher(self, filename):
         extra_params = {'initial_header_level': '2'}
-        pub = docutils.core.Publisher(destination_class=docutils.io.StringOutput)
+        pub = docutils.core.Publisher(
+                destination_class=docutils.io.StringOutput)
         pub.set_components('standalone', 'restructuredtext', 'html')
         pub.process_programmatic_settings(None, extra_params, None)
         pub.set_source(source_path=filename)
diff --git a/pelican/settings.py b/pelican/settings.py
index ec6ec483..fcabd518 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
+from os.path import isabs
 import locale
 
 from pelican import log
@@ -10,8 +11,8 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'THEME': DEFAULT_THEME,
                    'OUTPUT_PATH': 'output/',
                    'MARKUP': ('rst', 'md'),
-                   'STATIC_PATHS': ['images',],
-                   'THEME_STATIC_PATHS': ['static',],
+                   'STATIC_PATHS': ['images', ],
+                   'THEME_STATIC_PATHS': ['static', ],
                    'FEED': 'feeds/all.atom.xml',
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
                    'TRANSLATION_FEED': 'feeds/all-%s.atom.xml',
@@ -44,7 +45,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
                    'DATE_FORMATS': {},
                    'JINJA_EXTENSIONS': [],
-                   'LOCALE': '', # default to user locale
+                   'LOCALE': '',  # default to user locale
                    'DEFAULT_PAGINATION': False,
                    'DEFAULT_ORPHANS': 0,
                    'DEFAULT_METADATA': (),
@@ -53,6 +54,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'ARTICLE_PERMALINK_STRUCTURE': ''
                    }
 
+
 def read_settings(filename):
     """Load a Python file into a dictionary.
     """
@@ -67,9 +69,10 @@ def read_settings(filename):
         # Make the paths relative to the settings file
         for path in ['PATH', 'OUTPUT_PATH']:
             if path in context:
-                if context[path] is not None and not os.path.isabs(context[path]):
-                    # FIXME:
-                    context[path] = os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(filename), context[path])))
+                if context[path] is not None and not isabs(context[path]):
+                    context[path] = os.path.abspath(os.path.normpath(
+                        os.path.join(os.path.dirname(filename), context[path]))
+                    )
 
     # if locales is not a list, make it one
     locales = context['LOCALE']
@@ -84,17 +87,17 @@ def read_settings(filename):
     for locale_ in locales:
         try:
             locale.setlocale(locale.LC_ALL, locale_)
-            break # break if it is successfull
+            break  # break if it is successfull
         except locale.Error:
             pass
     else:
         log.warn("LOCALE option doesn't contain a correct value")
 
     if not 'TIMEZONE' in context:
-        log.warn("No timezone information specified in the settings. Assuming your "\
-                "timezone is UTC for feed generation. "\
-                "Check http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "\
-                "for more information")
+        log.warn("No timezone information specified in the settings. Assuming"
+                 " your timezone is UTC for feed generation. Check "
+                 "http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "
+                 "for more information")
 
     # set the locale
     return context
diff --git a/pelican/utils.py b/pelican/utils.py
index c2daae03..93541cc0 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -19,7 +19,7 @@ def get_date(string):
     string = re.sub(' +', ' ', string)
     formats = ['%Y-%m-%d %H:%M', '%Y/%m/%d %H:%M',
                '%Y-%m-%d', '%Y/%m/%d',
-               '%d-%m-%Y', '%Y-%d-%m', # Weird ones
+               '%d-%m-%Y', '%Y-%d-%m',  # Weird ones
                '%d/%m/%Y', '%d.%m.%Y',
                '%d.%m.%Y %H:%M', '%Y-%m-%d %H:%M:%S']
     for date_format in formats:
@@ -48,6 +48,7 @@ def slugify(value):
     value = unicode(re.sub('[^\w\s-]', '', value).strip().lower())
     return re.sub('[-\s]+', '-', value)
 
+
 def copy(path, source, destination, destination_path=None, overwrite=False):
     """Copy path from origin to destination.
 
@@ -57,8 +58,8 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
     :param source: the source dir
     :param destination: the destination dir
     :param destination_path: the destination path (optional)
-    :param overwrite: wether to overwrite the destination if already exists or not
-
+    :param overwrite: wether to overwrite the destination if already exists or
+                      not
     """
     if not destination_path:
         destination_path = path
@@ -109,7 +110,8 @@ def truncate_html_words(s, num, end_text='...'):
     length = int(num)
     if length <= 0:
         return u''
-    html4_singlets = ('br', 'col', 'link', 'base', 'img', 'param', 'area', 'hr', 'input')
+    html4_singlets = ('br', 'col', 'link', 'base', 'img', 'param', 'area',
+                      'hr', 'input')
 
     # Set up regular expressions
     re_words = re.compile(r'&.*?;|<.*?>|(\w[\w-]*)', re.U)
@@ -147,8 +149,9 @@ def truncate_html_words(s, num, end_text='...'):
             except ValueError:
                 pass
             else:
-                # SGML: An end tag closes, back to the matching start tag, all unclosed intervening start tags with omitted end tags
-                open_tags = open_tags[i+1:]
+                # SGML: An end tag closes, back to the matching start tag,
+                # all unclosed intervening start tags with omitted end tags
+                open_tags = open_tags[i + 1:]
         else:
             # Add it to the start of the open tags list
             open_tags.insert(0, tagname)
@@ -195,7 +198,7 @@ def process_translations(content_list):
             default_lang_items = items[:1]
 
         if not slug:
-            warning('empty slug for %r' %( default_lang_items[0].filename,))
+            warning('empty slug for %r' % (default_lang_items[0].filename,))
         index.extend(default_lang_items)
         translations.extend(filter(
             lambda x: x not in default_lang_items,
@@ -233,7 +236,8 @@ def files_changed(path, extensions):
 
 def set_date_tzinfo(d, tz_name=None):
     """ Date without tzinfo shoudbe utc.
-    This function set the right tz to date that aren't utc and don't have tzinfo
+    This function set the right tz to date that aren't utc and don't have
+    tzinfo.
     """
     if tz_name is not None:
         tz = pytz.timezone(tz_name)
diff --git a/pelican/writers.py b/pelican/writers.py
index 814de40c..b27443be 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -8,7 +8,7 @@ import re
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 from pelican.paginator import Paginator
-from pelican.log import *
+from pelican.log import info
 from pelican.utils import get_relative_path, set_date_tzinfo
 
 
@@ -28,7 +28,6 @@ class Writer(object):
             description=context.get('SITESUBTITLE', ''))
         return feed
 
-
     def _add_item_to_the_feed(self, feed, item):
 
         feed.add_item(
@@ -44,8 +43,8 @@ class Writer(object):
     def write_feed(self, elements, context, filename=None, feed_type='atom'):
         """Generate a feed with the list of articles provided
 
-        Return the feed. If no output_path or filename is specified, just return
-        the feed object.
+        Return the feed. If no output_path or filename is specified, just
+        return the feed object.
 
         :param elements: the articles to put on the feed.
         :param context: the context to get the feed metadata.
@@ -56,7 +55,7 @@ class Writer(object):
         locale.setlocale(locale.LC_ALL, 'C')
         try:
             self.site_url = context.get('SITEURL', get_relative_path(filename))
-            self.feed_url= '%s/%s' % (self.site_url, filename)
+            self.feed_url = '%s/%s' % (self.site_url, filename)
 
             feed = self._create_new_feed(feed_type, context)
 
@@ -132,7 +131,7 @@ class Writer(object):
                         self.settings.get('DEFAULT_PAGINATION'),
                         self.settings.get('DEFAULT_ORPHANS'))
                 else:
-                    paginators[key] = Paginator(object_list, len(object_list), 0)
+                    paginators[key] = Paginator(object_list, len(object_list))
 
             # generated pages, and write
             for page_num in range(paginators.values()[0].num_pages):
@@ -140,9 +139,10 @@ class Writer(object):
                 paginated_name = name
                 for key in paginators.iterkeys():
                     paginator = paginators[key]
-                    page = paginator.page(page_num+1)
-                    paginated_localcontext.update({'%s_paginator' % key: paginator,
-                        '%s_page' % key: page})
+                    page = paginator.page(page_num + 1)
+                    paginated_localcontext.update(
+                            {'%s_paginator' % key: paginator,
+                             '%s_page' % key: page})
                 if page_num > 0:
                     ext = '.' + paginated_name.rsplit('.')[-1]
                     paginated_name = paginated_name.replace(ext,
@@ -160,8 +160,8 @@ class Writer(object):
         relative paths.
 
         :param name: name of the file to output.
-        :param context: dict that will be passed to the templates, which need to
-            be updated.
+        :param context: dict that will be passed to the templates, which need
+                        to be updated.
         """
         def _update_content(name, input):
             """Change all the relatives paths of the input content to relatives
@@ -184,9 +184,12 @@ class Writer(object):
 
             def replacer(m):
                 relative_path = m.group('path')
-                dest_path = os.path.normpath( os.sep.join( (get_relative_path(name),
-                    "static", relative_path) ) )
-                return m.group('markup') + m.group('quote') + dest_path + m.group('quote')
+                dest_path = os.path.normpath(
+                                os.sep.join((get_relative_path(name), "static",
+                                relative_path)))
+
+                return m.group('markup') + m.group('quote') + dest_path \
+                        + m.group('quote')
 
             return hrefs.sub(replacer, content)
 

From 8a442e726a7e0fe1f52e1542a9eb6ab1e4b5942e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 9 Mar 2012 16:22:28 +0100
Subject: [PATCH 0532/2864] Don't specify the default when accessing settings.

There is no need to do this, since all the default values are already provided
in the default settings dict (in settings.py)
---
 pelican/contents.py | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index b408ff58..99740168 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -111,16 +111,14 @@ class Page(object):
     @property
     def url(self):
         if self.in_default_lang:
-            return self.settings.get('PAGE_URL', u'pages/{slug}.html').format(**self.url_format)
-
-        return self.settings.get('PAGE_LANG_URL', u'pages/{slug}-{lang}.html').format(**self.url_format)
+            return self.settings['PAGE_URL'].format(**self.url_format)
+        return self.settings['PAGE_LANG_URL'].format(**self.url_format)
 
     @property
     def save_as(self):
         if self.in_default_lang:
-            return self.settings.get('PAGE_SAVE_AS', u'pages/{slug}.html').format(**self.url_format)
-
-        return self.settings.get('PAGE_LANG_SAVE_AS', u'pages/{slug}-{lang}.html').format(**self.url_format)
+            return self.settings['PAGE_SAVE_AS'].format(**self.url_format)
+        return self.settings['PAGE_LANG_SAVE_AS'].format(**self.url_format)
 
     @property
     def content(self):
@@ -148,21 +146,20 @@ class Article(Page):
     @property
     def url(self):
         if self.in_default_lang:
-            return self.settings.get('ARTICLE_URL', u'{slug}.html').format(**self.url_format)
-
-        return self.settings.get('ARTICLE_LANG_URL', u'{slug}-{lang}.html').format(**self.url_format)
+            return self.settings['ARTICLE_URL'].format(**self.url_format)
+        return self.settings['ARTICLE_LANG_URL'].format(**self.url_format)
 
     @property
     def save_as(self):
         if self.in_default_lang:
-            return self.settings.get('ARTICLE_SAVE_AS', u'{slug}.html').format(**self.url_format)
-
-        return self.settings.get('ARTICLE_LANG_SAVE_AS', u'{slug}-{lang}.html').format(**self.url_format)
+            return self.settings['ARTICLE_SAVE_AS'].format(**self.url_format)
+        return self.settings['ARTICLE_LANG_SAVE_AS'].format(**self.url_format)
 
 
 class Quote(Page):
     base_properties = ('author', 'date')
 
+
 class URLWrapper(object):
     def __init__(self, name, settings):
         self.name = unicode(name)
@@ -184,14 +181,16 @@ class URLWrapper(object):
     def url(self):
         return '%s.html' % self.name
 
+
 class Category(URLWrapper):
     @property
     def url(self):
-        return self.settings.get('CATEGORY_URL', u'category/{name}.html').format(name=self.name)
+        return self.settings['CATEGORY_URL'].format(name=self.name)
 
     @property
     def save_as(self):
-        return self.settings.get('CATEGORY_SAVE_AS', u'category/{name}.html').format(name=self.name)
+        return self.settings['CATEGORY_SAVE_AS'].format(name=self.name)
+
 
 class Tag(URLWrapper):
     def __init__(self, name, *args, **kwargs):
@@ -199,20 +198,22 @@ class Tag(URLWrapper):
 
     @property
     def url(self):
-        return self.settings.get('TAG_URL', u'tag/{name}.html').format(name=self.name)
+        return self.settings['TAG_URL'].format(name=self.name)
 
     @property
     def save_as(self):
-        return self.settings.get('TAG_SAVE_AS', u'tag/{name}.html').format(name=self.name)
+        return self.settings['TAG_SAVE_AS'].format(name=self.name)
+
 
 class Author(URLWrapper):
     @property
     def url(self):
-        return self.settings.get('AUTHOR_URL', u'author/{name}.html').format(name=self.name)
+        return self.settings['AUTHOR_URL'].format(name=self.name)
 
     @property
     def save_as(self):
-        return self.settings.get('AUTHOR_SAVE_AS', u'author/{name}.html').format(name=self.name)
+        return self.settings['AUTHOR_SAVE_AS'].format(name=self.name)
+
 
 def is_valid_content(content, f):
     try:

From 542b8b87058b73d25a713ffa62acb69afc97aff0 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 9 Mar 2012 16:27:23 +0100
Subject: [PATCH 0533/2864] add a 'coding standards' section in the
 contributors' guide

---
 docs/contribute.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 84b99293..fcf8d5c0 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -38,3 +38,12 @@ The tests live in "pelican/tests" and you can run them using the
 "discover" feature of unittest2::
 
     $ unit2 discover
+
+Coding standards
+================
+
+Try to respect what is described in the PEP8
+(http://www.python.org/dev/peps/pep-0008/) when providing patches. This can be
+eased by the pep8 tool (http://pypi.python.org/pypi/pep8) or by Flake8, which
+will give you some other cool hints about what's good or wrong
+(http://pypi.python.org/pypi/flake8/)

From 5e26062fd037f267206cbba40c06e271786131ff Mon Sep 17 00:00:00 2001
From: saghul <saghul@gmail.com>
Date: Sat, 10 Mar 2012 11:32:22 +0100
Subject: [PATCH 0534/2864] Fix for issue #233

---
 pelican/generators.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index ee95545e..5def01ab 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -36,8 +36,8 @@ class Generator(object):
 
         theme_path = os.path.join(os.path.dirname(os.path.abspath(__file__)))
 
-        simple_loader = FileSystemLoader(theme_path,
-                                         "themes", "simple", "templates")
+        simple_loader = FileSystemLoader(os.path.join(theme_path,
+                                         "themes", "simple", "templates"))
         self._env = Environment(
             loader=ChoiceLoader([
                 FileSystemLoader(self._templates_path),

From a7ea166fd256b5a25a2942195a08437cf62d4ffe Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 10 Mar 2012 12:21:54 +0100
Subject: [PATCH 0535/2864] fix #233

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 5def01ab..6ba12cf4 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -34,7 +34,7 @@ class Generator(object):
         self._templates_path = os.path.expanduser(
                 os.path.join(self.theme, 'templates'))
 
-        theme_path = os.path.join(os.path.dirname(os.path.abspath(__file__)))
+        theme_path = os.path.dirname(os.path.abspath(__file__))
 
         simple_loader = FileSystemLoader(os.path.join(theme_path,
                                          "themes", "simple", "templates"))

From fd1fbca520f06c10b8100c1272976cfe03c70f56 Mon Sep 17 00:00:00 2001
From: m-r-r <raybaudroigm@gmail.com>
Date: Sat, 10 Mar 2012 12:25:05 +0100
Subject: [PATCH 0536/2864] Removed small errors in pelican-quickstart

---
 tools/pelican_quickstart.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/pelican_quickstart.py b/tools/pelican_quickstart.py
index 56c22f10..04fc20be 100755
--- a/tools/pelican_quickstart.py
+++ b/tools/pelican_quickstart.py
@@ -40,7 +40,7 @@ html: clean $$(OUTPUTDIR)/index.html
 \t@echo 'Done'
 
 $$(OUTPUTDIR)/%.html:
-\t$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE)
+\t$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 clean:
 \trm -fr $$(OUTPUTDIR)
@@ -94,7 +94,7 @@ DEFAULT_PAGINATION = $default_pagination
 
 CONF = {
     'pelican' : 'pelican',
-    'pelicanopts' : None,
+    'pelicanopts' : '',
     'basedir': '.',
     'ftp_host': 'localhost',
     'ftp_user': 'anonymous',
@@ -103,7 +103,7 @@ CONF = {
     'ssh_user': 'root',
     'ssh_target_dir': '/var/www',
     'dropbox_dir' : '~/Dropbox/Public/',
-    'default_pagination' : 7,
+    'default_pagination' : 10,
     'lang': 'en'
 }
 

From 8499ce3340d993fcc61d4d8268df739b9169ea20 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sat, 10 Mar 2012 13:23:50 +0100
Subject: [PATCH 0537/2864] add some url and saveas settings that weren't
 present in the default settings dict

---
 pelican/settings.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pelican/settings.py b/pelican/settings.py
index fcabd518..6ed76f46 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -35,6 +35,12 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'PAGE_SAVE_AS': 'pages/{slug}.html',
                    'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
                    'PAGE_LANG_SAVE_AS': 'pages/{slug}-{lang}.html',
+                   'CATEGORY_URL': 'category/{name}.html',
+                   'CATEGORY_SAVE_AS': 'category/{name}.html',
+                   'TAG_URL': 'tag/{name}.html',
+                   'TAG_SAVE_AS': 'tag/{name}.html',
+                   'AUTHOR_URL': u'author/{name}.html',
+                   'AUTHOR_SAVE_AS': u'author/{name}.html',
                    'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
                    'TAG_CLOUD_STEPS': 4,

From 1c2f631723e12b414a5f2c50ac461fa1e81d0e2a Mon Sep 17 00:00:00 2001
From: draftcode <draftcode@gmail.com>
Date: Sat, 10 Mar 2012 20:04:09 +0900
Subject: [PATCH 0538/2864] Avoid #226.

---
 tests/test_contents.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/tests/test_contents.py b/tests/test_contents.py
index b44d151f..e058e721 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 try:
-    from unittest2 import TestCase
+    from unittest2 import TestCase, skip
 except ImportError, e:
-    from unittest import TestCase
+    from unittest import TestCase, skip
 
 from pelican.contents import Page
 from pelican.settings import _DEFAULT_CONFIG
@@ -94,6 +94,18 @@ class TestPage(TestCase):
             locale = 'ja_JP.utf8'
         page_kwargs['settings']['DATE_FORMATS'] = {'jp':(locale,'%Y-%m-%d(%a)')}
         page_kwargs['metadata']['lang'] = 'jp'
-        page = Page( **page_kwargs)
-        self.assertEqual(page.locale_date, u'2015-09-13(\u65e5)')
-        # above is unicode in Japanese: 2015-09-13(��)
+
+        import locale as locale_module
+        try:
+            page = Page( **page_kwargs)
+            self.assertEqual(page.locale_date, u'2015-09-13(\u65e5)')
+            # above is unicode in Japanese: 2015-09-13(��)
+        except locale_module.Error:
+            # The constructor of ``Page`` will try to set the locale to
+            # ``ja_JP.utf8``. But this attempt will failed when there is no
+            # such locale in the system. You can see which locales there are
+            # in your system with ``locale -a`` command.
+            #
+            # Until we find some other method to test this functionality, we
+            # will simply skip this test.
+            skip("There is no locale %s in this system." % locale)

From 1194764ed1ddcce797fb1895668ccc5e97137c93 Mon Sep 17 00:00:00 2001
From: draftcode <draftcode@gmail.com>
Date: Sat, 10 Mar 2012 21:18:01 +0900
Subject: [PATCH 0539/2864] Do not create feeds when their filenames are set to
 None.

---
 docs/settings.rst        |  4 +++-
 pelican/generators.py    | 47 ++++++++++++++++++++++------------------
 tests/test_generators.py | 36 ++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 22 deletions(-)
 create mode 100644 tests/test_generators.py

diff --git a/docs/settings.rst b/docs/settings.rst
index 69e2adc8..b08b5bcb 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -199,7 +199,6 @@ Pelican generates category feeds as well as feeds for all your articles. It does
 not generate feeds for tags by default, but it is possible to do so using
 the ``TAG_FEED`` and ``TAG_FEED_RSS`` settings:
 
-
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
@@ -214,6 +213,9 @@ Setting name (default value)                        What does it do?
                                                     quantity is unrestricted by default.
 ================================================    =====================================================
 
+If you don't want to generate some of these feeds, set ``None`` to the
+variables above.
+
 .. [2] %s is the name of the category.
 
 Pagination
diff --git a/pelican/generators.py b/pelican/generators.py
index 6ba12cf4..ccfdb39f 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -118,41 +118,46 @@ class ArticlesGenerator(Generator):
     def generate_feeds(self, writer):
         """Generate the feeds from the current context, and output files."""
 
-        writer.write_feed(self.articles, self.context, self.settings['FEED'])
-
-        if 'FEED_RSS' in self.settings:
+        if self.settings.get('FEED'):
             writer.write_feed(self.articles, self.context,
-                    self.settings['FEED_RSS'], feed_type='rss')
+                              self.settings['FEED'])
+
+        if self.settings.get('FEED_RSS'):
+            writer.write_feed(self.articles, self.context,
+                              self.settings['FEED_RSS'], feed_type='rss')
 
         for cat, arts in self.categories:
             arts.sort(key=attrgetter('date'), reverse=True)
-            writer.write_feed(arts, self.context,
-                              self.settings['CATEGORY_FEED'] % cat)
-
-            if 'CATEGORY_FEED_RSS' in self.settings:
+            if self.settings.get('CATEGORY_FEED'):
                 writer.write_feed(arts, self.context,
-                        self.settings['CATEGORY_FEED_RSS'] % cat,
-                        feed_type='rss')
+                                  self.settings['CATEGORY_FEED'] % cat)
 
-        if 'TAG_FEED' in self.settings:
+            if self.settings.get('CATEGORY_FEED_RSS'):
+                writer.write_feed(arts, self.context,
+                                  self.settings['CATEGORY_FEED_RSS'] % cat,
+                                  feed_type='rss')
+
+        if self.settings.get('TAG_FEED') or self.settings.get('TAG_FEED_RSS'):
             for tag, arts in self.tags.items():
                 arts.sort(key=attrgetter('date'), reverse=True)
-                writer.write_feed(arts, self.context,
-                        self.settings['TAG_FEED'] % tag)
+                if self.settings.get('TAG_FEED'):
+                    writer.write_feed(arts, self.context,
+                                      self.settings['TAG_FEED'] % tag)
 
-                if 'TAG_FEED_RSS' in self.settings:
+                if self.settings.get('TAG_FEED_RSS'):
                     writer.write_feed(arts, self.context,
                                       self.settings['TAG_FEED_RSS'] % tag,
                                       feed_type='rss')
 
-        translations_feeds = defaultdict(list)
-        for article in chain(self.articles, self.translations):
-            translations_feeds[article.lang].append(article)
+        if self.settings.get('TRANSLATION_FEED'):
+            translations_feeds = defaultdict(list)
+            for article in chain(self.articles, self.translations):
+                translations_feeds[article.lang].append(article)
 
-        for lang, items in translations_feeds.items():
-            items.sort(key=attrgetter('date'), reverse=True)
-            writer.write_feed(items, self.context,
-                              self.settings['TRANSLATION_FEED'] % lang)
+            for lang, items in translations_feeds.items():
+                items.sort(key=attrgetter('date'), reverse=True)
+                writer.write_feed(items, self.context,
+                                  self.settings['TRANSLATION_FEED'] % lang)
 
     def generate_pages(self, writer):
         """Generate the pages on the disk"""
diff --git a/tests/test_generators.py b/tests/test_generators.py
new file mode 100644
index 00000000..94088c34
--- /dev/null
+++ b/tests/test_generators.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+from __future__ import with_statement
+try:
+    from unittest2 import TestCase
+except ImportError, e:
+    from unittest import TestCase
+
+from pelican.generators import ArticlesGenerator
+from pelican.settings import _DEFAULT_CONFIG
+
+class TestArticlesGenerator(TestCase):
+
+    def test_generate_feeds(self):
+
+        class FakeWriter(object):
+            def __init__(self):
+                self.called = False
+
+            def write_feed(self, *args, **kwargs):
+                self.called = True
+
+        generator = ArticlesGenerator(None, {'FEED': _DEFAULT_CONFIG['FEED']},
+                                      None, _DEFAULT_CONFIG['THEME'], None,
+                                      None)
+        writer = FakeWriter()
+        generator.generate_feeds(writer)
+        assert writer.called, ("The feed should be written, "
+                               "if settings['FEED'] is specified.")
+
+        generator = ArticlesGenerator(None, {'FEED': None}, None,
+                                      _DEFAULT_CONFIG['THEME'], None, None)
+        writer = FakeWriter()
+        generator.generate_feeds(writer)
+        assert not writer.called, ("If settings['FEED'] is None, "
+                                   "the feed should not be generated.")
+

From 3bdc769134a57d6ce62f2d80b095061d91bacb2f Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 01:14:22 +0100
Subject: [PATCH 0540/2864] Factorize some code about URL wrapping.

---
 pelican/contents.py | 69 +++++++++++++++------------------------------
 1 file changed, 22 insertions(+), 47 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 99740168..900061ad 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -2,6 +2,7 @@
 from datetime import datetime
 from os import getenv
 from sys import platform, stdin
+import functools
 import locale
 
 from pelican.log import warning, error
@@ -108,17 +109,13 @@ class Page(object):
             'category': getattr(self, 'category', 'misc'),
         }
 
-    @property
-    def url(self):
-        if self.in_default_lang:
-            return self.settings['PAGE_URL'].format(**self.url_format)
-        return self.settings['PAGE_LANG_URL'].format(**self.url_format)
+    def _expand_settings(self, key):
+        fq_key = ('%s_%s' % (self.__class__.__name__, key)).upper()
+        return self.settings[fq_key].format(**self.url_format)
 
-    @property
-    def save_as(self):
-        if self.in_default_lang:
-            return self.settings['PAGE_SAVE_AS'].format(**self.url_format)
-        return self.settings['PAGE_LANG_SAVE_AS'].format(**self.url_format)
+    def get_url_setting(self, key):
+        key = key if self.in_default_lang else 'lang_%s' % key
+        return self._expand_settings(key)
 
     @property
     def content(self):
@@ -139,22 +136,13 @@ class Page(object):
     summary = property(_get_summary, _set_summary, "Summary of the article."
                        "Based on the content. Can't be set")
 
+    url = property(functools.partial(get_url_setting, key='url'))
+    save_as = property(functools.partial(get_url_setting, key='save_as'))
+
 
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')
 
-    @property
-    def url(self):
-        if self.in_default_lang:
-            return self.settings['ARTICLE_URL'].format(**self.url_format)
-        return self.settings['ARTICLE_LANG_URL'].format(**self.url_format)
-
-    @property
-    def save_as(self):
-        if self.in_default_lang:
-            return self.settings['ARTICLE_SAVE_AS'].format(**self.url_format)
-        return self.settings['ARTICLE_LANG_SAVE_AS'].format(**self.url_format)
-
 
 class Quote(Page):
     base_properties = ('author', 'date')
@@ -163,8 +151,12 @@ class Quote(Page):
 class URLWrapper(object):
     def __init__(self, name, settings):
         self.name = unicode(name)
+        self.slug = slugify(self.name)
         self.settings = settings
 
+    def as_dict(self):
+        return self.__dict__
+
     def __hash__(self):
         return hash(self.name)
 
@@ -177,42 +169,25 @@ class URLWrapper(object):
     def __unicode__(self):
         return self.name
 
-    @property
-    def url(self):
-        return '%s.html' % self.name
+    def _from_settings(self, key):
+        setting = "%s_%s" % (self.__class__.__name__.upper(), key)
+        return self.settings[setting].format(**self.as_dict())
+
+    url = property(functools.partial(_from_settings, key='URL'))
+    save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
 
 
 class Category(URLWrapper):
-    @property
-    def url(self):
-        return self.settings['CATEGORY_URL'].format(name=self.name)
-
-    @property
-    def save_as(self):
-        return self.settings['CATEGORY_SAVE_AS'].format(name=self.name)
+    pass
 
 
 class Tag(URLWrapper):
     def __init__(self, name, *args, **kwargs):
         super(Tag, self).__init__(unicode.strip(name), *args, **kwargs)
 
-    @property
-    def url(self):
-        return self.settings['TAG_URL'].format(name=self.name)
-
-    @property
-    def save_as(self):
-        return self.settings['TAG_SAVE_AS'].format(name=self.name)
-
 
 class Author(URLWrapper):
-    @property
-    def url(self):
-        return self.settings['AUTHOR_URL'].format(name=self.name)
-
-    @property
-    def save_as(self):
-        return self.settings['AUTHOR_SAVE_AS'].format(name=self.name)
+    pass
 
 
 def is_valid_content(content, f):

From 1ec2779f5e4470c6ed19b56d16185c6174ab520c Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 01:16:02 +0100
Subject: [PATCH 0541/2864] Make the readers tests a bit more verbose.

---
 tests/test_readers.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index 120b3125..2d023462 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -1,8 +1,8 @@
 # coding: utf-8
 try:
-    import unittest2
+    import unittest2 as unittest
 except ImportError, e:
-    import unittest as unittest2
+    import unittest
 
 import datetime
 import os
@@ -12,11 +12,12 @@ from pelican import readers
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_PATH = os.path.join(CUR_DIR, 'content')
 
+
 def _filename(*args):
     return os.path.join(CONTENT_PATH, *args)
 
 
-class RstReaderTest(unittest2.TestCase):
+class RstReaderTest(unittest.TestCase):
 
     def test_article_with_metadata(self):
         reader = readers.RstReader({})
@@ -29,4 +30,6 @@ class RstReaderTest(unittest2.TestCase):
             'date': datetime.datetime(2010, 12, 2, 10, 14),
             'tags': ['foo', 'bar', 'foobar'],
         }
-        self.assertDictEqual(metadata, expected)
+
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)

From 1c219d14bb36ea4f12dda3f987a7c843ba2cec40 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 01:16:32 +0100
Subject: [PATCH 0542/2864] Use the slug as default URL for tags and authors.

---
 pelican/settings.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 6ed76f46..d62acf42 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -37,10 +37,10 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'PAGE_LANG_SAVE_AS': 'pages/{slug}-{lang}.html',
                    'CATEGORY_URL': 'category/{name}.html',
                    'CATEGORY_SAVE_AS': 'category/{name}.html',
-                   'TAG_URL': 'tag/{name}.html',
-                   'TAG_SAVE_AS': 'tag/{name}.html',
-                   'AUTHOR_URL': u'author/{name}.html',
-                   'AUTHOR_SAVE_AS': u'author/{name}.html',
+                   'TAG_URL': 'tag/{slug}.html',
+                   'TAG_SAVE_AS': 'tag/{slug}.html',
+                   'AUTHOR_URL': u'author/{slug}.html',
+                   'AUTHOR_SAVE_AS': u'author/{slug}.html',
                    'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
                    'TAG_CLOUD_STEPS': 4,

From 0ca9997e107f67fc4e8eebd0511809e254b11f58 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 6 Mar 2012 00:29:56 +0100
Subject: [PATCH 0543/2864] paths for finding articles and pages are now
 parametrable

---
 pelican/generators.py | 10 ++++++----
 pelican/settings.py   |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 6ba12cf4..ac2cd865 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -211,10 +211,10 @@ class ArticlesGenerator(Generator):
     def generate_context(self):
         """change the context"""
 
-        # return the list of files to use
-        files = self.get_files(self.path, exclude=['pages', ])
         all_articles = []
-        for f in files:
+        for f in self.get_files(
+                os.path.join(self.path, self.settings['ARTICLE_DIR']),
+                exclude=self.settings['ARTICLE_EXCLUDES']):
             try:
                 content, metadata = read_file(f, settings=self.settings)
             except Exception, e:
@@ -316,7 +316,9 @@ class PagesGenerator(Generator):
 
     def generate_context(self):
         all_pages = []
-        for f in self.get_files(os.sep.join((self.path, 'pages'))):
+        for f in self.get_files(
+                os.path.join(self.path, self.settings['PAGE_DIR']),
+                exclude=self.settings['PAGE_EXCLUDES']):
             try:
                 content, metadata = read_file(f)
             except Exception, e:
diff --git a/pelican/settings.py b/pelican/settings.py
index 6ed76f46..1b31582f 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -8,6 +8,10 @@ from pelican import log
 DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
                               "themes/notmyidea"])
 _DEFAULT_CONFIG = {'PATH': None,
+                   'ARTICLE_DIR': '',
+                   'ARTICLE_EXCLUDES': ('pages',),
+                   'PAGE_DIR': 'pages',
+                   'PAGE_EXCLUDES': (),
                    'THEME': DEFAULT_THEME,
                    'OUTPUT_PATH': 'output/',
                    'MARKUP': ('rst', 'md'),

From aef7418bdf2094b8e6edc5b2e6300bf8a60bb851 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 6 Mar 2012 00:45:22 +0100
Subject: [PATCH 0544/2864] add docs for new page/article paths settings

---
 docs/settings.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 69e2adc8..31183be3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -52,6 +52,10 @@ Setting name (default value)                        What does it do?
                                                     supported extensions.
 `OUTPUT_PATH` (``'output/'``)                       Where to output the generated files.
 `PATH` (``None``)                                   Path to look at for input files.
+`PAGE_DIR' (``'pages'``)                            Directory to look at for pages.
+`PAGE_EXCLUDES' (``()``)                            A list of directories to exclude when looking for pages.
+`ARTICLE_DIR' (``''``)                              Directory to look at for articles.
+`ARTICLE_EXCLUDES': (``('pages',)``)                A list of directories to exclude when looking for articles.
 `PDF_GENERATOR` (``False``)                         Set to True if you want to have PDF versions
                                                     of your documents. You will need to install
                                                     `rst2pdf`.

From d6be2fb44cfb39afc41bf4a3ce1dd842d549da06 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 01:59:04 +0100
Subject: [PATCH 0545/2864] Put deprecation code in a separate place

---
 pelican/__init__.py | 83 +++++++++++++++++++++++++--------------------
 pelican/settings.py |  2 +-
 2 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 8de68d69..dcdbdcb6 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -6,7 +6,7 @@ import time
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator)
-from pelican.settings import read_settings
+from pelican.settings import read_settings, _DEFAULT_CONFIG
 from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 from pelican import log
@@ -20,6 +20,9 @@ class Pelican(object):
         """Read the settings, and performs some checks on the environment
         before doing anything else.
         """
+        if settings is None:
+            settings = _DEFAULT_CONFIG
+
         self.path = path or settings['PATH']
         if not self.path:
             raise Exception('you need to specify a path containing the content'
@@ -28,44 +31,11 @@ class Pelican(object):
         if self.path.endswith('/'):
             self.path = self.path[:-1]
 
-        if settings.get('CLEAN_URLS', False):
-            log.warning('Found deprecated `CLEAN_URLS` in settings. Modifing'
-                        ' the following settings for the same behaviour.')
-
-            settings['ARTICLE_URL'] = '{slug}/'
-            settings['ARTICLE_LANG_URL'] = '{slug}-{lang}/'
-            settings['PAGE_URL'] = 'pages/{slug}/'
-            settings['PAGE_LANG_URL'] = 'pages/{slug}-{lang}/'
-
-            for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
-                            'PAGE_LANG_URL'):
-                log.warning("%s = '%s'" % (setting, settings[setting]))
-
-        if settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
-            log.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
-                        ' settings.  Modifing the following settings for'
-                        ' the same behaviour.')
-
-            structure = settings['ARTICLE_PERMALINK_STRUCTURE']
-
-            # Convert %(variable) into {variable}.
-            structure = re.sub('%\((\w+)\)s', '{\g<1>}', structure)
-
-            # Convert %x into {date:%x} for strftime
-            structure = re.sub('(%[A-z])', '{date:\g<1>}', structure)
-
-            # Strip a / prefix
-            structure = re.sub('^/', '', structure)
-
-            for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
-                            'PAGE_LANG_URL', 'ARTICLE_SAVE_AS',
-                            'ARTICLE_LANG_SAVE_AS', 'PAGE_SAVE_AS',
-                            'PAGE_LANG_SAVE_AS'):
-                settings[setting] = os.path.join(structure, settings[setting])
-                log.warning("%s = '%s'" % (setting, settings[setting]))
-
         # define the default settings
         self.settings = settings
+
+        self._handle_deprecation()
+
         self.theme = theme or settings['THEME']
         output_path = output_path or settings['OUTPUT_PATH']
         self.output_path = os.path.realpath(output_path)
@@ -82,6 +52,45 @@ class Pelican(object):
             else:
                 raise Exception("Impossible to find the theme %s" % theme)
 
+    def _handle_deprecation(self):
+
+        if self.settings.get('CLEAN_URLS', False):
+            log.warning('Found deprecated `CLEAN_URLS` in settings. Modifing'
+                        ' the following settings for the same behaviour.')
+
+            self.settings['ARTICLE_URL'] = '{slug}/'
+            self.settings['ARTICLE_LANG_URL'] = '{slug}-{lang}/'
+            self.settings['PAGE_URL'] = 'pages/{slug}/'
+            self.settings['PAGE_LANG_URL'] = 'pages/{slug}-{lang}/'
+
+            for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
+                            'PAGE_LANG_URL'):
+                log.warning("%s = '%s'" % (setting, self.settings[setting]))
+
+        if self.settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
+            log.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
+                        ' settings.  Modifing the following settings for'
+                        ' the same behaviour.')
+
+            structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
+
+            # Convert %(variable) into {variable}.
+            structure = re.sub('%\((\w+)\)s', '{\g<1>}', structure)
+
+            # Convert %x into {date:%x} for strftime
+            structure = re.sub('(%[A-z])', '{date:\g<1>}', structure)
+
+            # Strip a / prefix
+            structure = re.sub('^/', '', structure)
+
+            for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
+                            'PAGE_LANG_URL', 'ARTICLE_SAVE_AS',
+                            'ARTICLE_LANG_SAVE_AS', 'PAGE_SAVE_AS',
+                            'PAGE_LANG_SAVE_AS'):
+                self.settings[setting] = os.path.join(structure,
+                                                      self.settings[setting])
+                log.warning("%s = '%s'" % (setting, self.settings[setting]))
+
     def run(self):
         """Run the generators and return"""
 
diff --git a/pelican/settings.py b/pelican/settings.py
index d62acf42..bfc8e940 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -61,7 +61,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    }
 
 
-def read_settings(filename):
+def read_settings(filename=None):
     """Load a Python file into a dictionary.
     """
     context = _DEFAULT_CONFIG.copy()

From fbf89687cc05c0656e7efc69befde6c790ec66b4 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 01:59:58 +0100
Subject: [PATCH 0546/2864] start functional testing

---
 tests/support.py      | 18 ++++++++++++++++++
 tests/test_pelican.py | 31 +++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 tests/support.py
 create mode 100644 tests/test_pelican.py

diff --git a/tests/support.py b/tests/support.py
new file mode 100644
index 00000000..0cd757a6
--- /dev/null
+++ b/tests/support.py
@@ -0,0 +1,18 @@
+from contextlib import contextmanager
+
+from tempfile import mkdtemp
+from shutil import rmtree
+
+
+@contextmanager
+def temporary_folder():
+    """creates a temporary folder, return it and delete it afterwards.
+
+    This allows to do something like this in tests:
+
+        >>> with temporary_folder() as d:
+            # do whatever you want
+    """
+    tempdir = mkdtemp()
+    yield tempdir
+    rmtree(tempdir)
diff --git a/tests/test_pelican.py b/tests/test_pelican.py
new file mode 100644
index 00000000..dce4fadc
--- /dev/null
+++ b/tests/test_pelican.py
@@ -0,0 +1,31 @@
+import unittest
+import os
+
+from support import temporary_folder
+
+from pelican import Pelican
+from pelican.settings import read_settings
+
+SAMPLES_PATH = os.path.abspath(os.sep.join(
+    (os.path.dirname(os.path.abspath(__file__)), "..", "samples")))
+
+INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
+SAMPLE_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf.py")
+
+
+class TestPelican(unittest.TestCase):
+    # general functional testing for pelican. Basically, this test case tries
+    # to run pelican in different situations and see how it behaves
+
+    def test_basic_generation_works(self):
+        # when running pelican without settings, it should pick up the default
+        # ones and generate the output without raising any exception / issuing
+        # any warning.
+        with temporary_folder() as temp_path:
+            pelican = Pelican(path=INPUT_PATH, output_path=temp_path)
+            pelican.run()
+
+        # the same thing with a specified set of settins should work
+        with temporary_folder() as temp_path:
+            pelican = Pelican(path=INPUT_PATH, output_path=temp_path,
+                              settings=read_settings(SAMPLE_CONFIG))

From d43bd1dcb80801dfabfba661afa81a790816ee28 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 02:48:36 +0100
Subject: [PATCH 0547/2864] Add a way to use Typogrify to enhance the generated
 HTML.

---
 docs/settings.rst         |  5 +++++
 pelican/readers.py        | 14 +++++++++++++-
 pelican/settings.py       |  3 ++-
 tests/content/article.rst |  4 ++++
 tests/test_readers.py     | 17 +++++++++++++++++
 5 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 tests/content/article.rst

diff --git a/docs/settings.rst b/docs/settings.rst
index 69e2adc8..6780c6ae 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -69,6 +69,11 @@ Setting name (default value)                        What does it do?
 `TIMEZONE`                                          The timezone used in the date information, to
                                                     generate Atom and RSS feeds. See the "timezone"
                                                     section below for more info.
+`TYPOGRIFY` (``False``)                             If set to true, some
+                                                    additional transformations will be done on the
+                                                    generated HTML, using the `Typogrify
+                                                    <http://static.mintchaos.com/projects/typogrify/>`_
+                                                    library
 ================================================    =====================================================
 
 .. [#] Default is the system locale.
diff --git a/pelican/readers.py b/pelican/readers.py
index 5bbbfb30..a581e458 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -143,12 +143,24 @@ def read_file(filename, fmt=None, settings=None):
     """Return a reader object using the given format."""
     if not fmt:
         fmt = filename.split('.')[-1]
+
     if fmt not in _EXTENSIONS.keys():
         raise TypeError('Pelican does not know how to parse %s' % filename)
+
     reader = _EXTENSIONS[fmt](settings)
     settings_key = '%s_EXTENSIONS' % fmt.upper()
+
     if settings and settings_key in settings:
         reader.extensions = settings[settings_key]
+
     if not reader.enabled:
         raise ValueError("Missing dependencies for %s" % fmt)
-    return reader.read(filename)
+
+    content, metadata = reader.read(filename)
+
+    # eventually filter the content with typogrify if asked so
+    if settings and settings['TYPOGRIFY']:
+        from typogrify import Typogrify
+        content = Typogrify.typogrify(content)
+
+    return content, metadata
diff --git a/pelican/settings.py b/pelican/settings.py
index bfc8e940..8cb06e90 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -57,7 +57,8 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'DEFAULT_METADATA': (),
                    'FILES_TO_COPY': (),
                    'DEFAULT_STATUS': 'published',
-                   'ARTICLE_PERMALINK_STRUCTURE': ''
+                   'ARTICLE_PERMALINK_STRUCTURE': '',
+                   'TYPOGRIFY': False,
                    }
 
 
diff --git a/tests/content/article.rst b/tests/content/article.rst
new file mode 100644
index 00000000..1707ab03
--- /dev/null
+++ b/tests/content/article.rst
@@ -0,0 +1,4 @@
+Article title
+#############
+
+This is some content. With some stuff to "typogrify".
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 2d023462..d4f0aecf 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -33,3 +33,20 @@ class RstReaderTest(unittest.TestCase):
 
         for key, value in expected.items():
             self.assertEquals(value, metadata[key], key)
+
+    def test_typogrify(self):
+        # if nothing is specified in the settings, the content should be
+        # unmodified
+        content, _ = readers.read_file(_filename('article.rst'))
+        expected = "<p>This is some content. With some stuff to "\
+                   "&quot;typogrify&quot;.</p>\n"
+
+        self.assertEqual(content, expected)
+
+        # otherwise, typogrify should be applied
+        content, _ = readers.read_file(_filename('article.rst'),
+                                       settings={'TYPOGRIFY': True})
+        expected = "<p>This is some content. With some stuff to&nbsp;"\
+                   "&#8220;typogrify&#8221;.</p>\n"
+
+        self.assertEqual(content, expected)

From 6a4f4a55b421f71acfb915d3e3b3027b5934322f Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 02:52:40 +0100
Subject: [PATCH 0548/2864] updated the changelog

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index e68c6f0d..ef9bc070 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ X.X
 * Refactored the way URL are handled.
 * Improved the english documentation
 * Fixed packaging using setuptools entrypoints
+* Added typogrify support
 
 2.8
 

From cfd050b0f29928dd31e4a994c58566f49e23d2c2 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 03:02:12 +0100
Subject: [PATCH 0549/2864] Add a CSS file for typogrify on the notmyidea theme

---
 pelican/themes/notmyidea/static/css/main.css      | 1 +
 pelican/themes/notmyidea/static/css/typogrify.css | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 pelican/themes/notmyidea/static/css/typogrify.css

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index b3677771..7534790f 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -10,6 +10,7 @@
 /* Imports */
 @import url("reset.css");
 @import url("pygment.css");
+@import url("typogrify.css");
 @import url(http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
 
 /***** Global *****/
diff --git a/pelican/themes/notmyidea/static/css/typogrify.css b/pelican/themes/notmyidea/static/css/typogrify.css
new file mode 100644
index 00000000..c9b34dc8
--- /dev/null
+++ b/pelican/themes/notmyidea/static/css/typogrify.css
@@ -0,0 +1,3 @@
+.caps {font-size:.92em;}
+.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}    
+.dquo {margin-left:-.38em;}

From 3c983d62c9ef426e9d08e9a7f3f05ae9090cb304 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 11:25:30 +0100
Subject: [PATCH 0550/2864] change the tests to use the mock library instead of
 a custom mocking system

---
 CHANGELOG                |  1 +
 tests/test_generators.py | 28 ++++++++++------------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ef9bc070..46aa68a5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ X.X
 * Improved the english documentation
 * Fixed packaging using setuptools entrypoints
 * Added typogrify support
+* Added a way to disable feed generation
 
 2.8
 
diff --git a/tests/test_generators.py b/tests/test_generators.py
index 94088c34..20929622 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -1,36 +1,28 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 try:
-    from unittest2 import TestCase
+    import unittest2 as unittest
 except ImportError, e:
-    from unittest import TestCase
+    import unittest  # NOQA
 
 from pelican.generators import ArticlesGenerator
 from pelican.settings import _DEFAULT_CONFIG
 
-class TestArticlesGenerator(TestCase):
+from mock import MagicMock
+
+
+class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_feeds(self):
 
-        class FakeWriter(object):
-            def __init__(self):
-                self.called = False
-
-            def write_feed(self, *args, **kwargs):
-                self.called = True
-
         generator = ArticlesGenerator(None, {'FEED': _DEFAULT_CONFIG['FEED']},
                                       None, _DEFAULT_CONFIG['THEME'], None,
                                       None)
-        writer = FakeWriter()
+        writer = MagicMock()
         generator.generate_feeds(writer)
-        assert writer.called, ("The feed should be written, "
-                               "if settings['FEED'] is specified.")
+        writer.write_feed.assert_called_with([], None, 'feeds/all.atom.xml')
 
         generator = ArticlesGenerator(None, {'FEED': None}, None,
                                       _DEFAULT_CONFIG['THEME'], None, None)
-        writer = FakeWriter()
+        writer = MagicMock()
         generator.generate_feeds(writer)
-        assert not writer.called, ("If settings['FEED'] is None, "
-                                   "the feed should not be generated.")
-
+        self.assertFalse(writer.write_feed.called)

From c393b011c43fb359844484b5e7dcf971e00e7226 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 15:50:53 +0100
Subject: [PATCH 0551/2864] cleaning

---
 pelican/utils.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 93541cc0..eead1ac9 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -169,13 +169,11 @@ def truncate_html_words(s, num, end_text='...'):
 
 
 def process_translations(content_list):
-    """ Finds all translation and returns
-        tuple with two lists (index, translations).
-        Index list includes items in default language
-        or items which have no variant in default language.
+    """ Finds all translation and returns tuple with two lists (index,
+    translations).  Index list includes items in default language or items
+    which have no variant in default language.
 
-        Also, for each content_list item, it
-        sets attribute 'translations'
+    Also, for each content_list item, it sets attribute 'translations'
     """
     content_list.sort(key=attrgetter('slug'))
     grouped_by_slugs = groupby(content_list, attrgetter('slug'))
@@ -185,10 +183,7 @@ def process_translations(content_list):
     for slug, items in grouped_by_slugs:
         items = list(items)
         # find items with default language
-        default_lang_items = filter(
-            attrgetter('in_default_lang'),
-            items
-        )
+        default_lang_items = filter(attrgetter('in_default_lang'), items)
         len_ = len(default_lang_items)
         if len_ > 1:
             warning(u'there are %s variants of "%s"' % (len_, slug))

From 32355f546373a1dcc4faa4d426f71c4552642956 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 15:51:48 +0100
Subject: [PATCH 0552/2864] add some more tests for the utils module

---
 tests/support.py    | 10 +++++-
 tests/test_utils.py | 75 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_utils.py

diff --git a/tests/support.py b/tests/support.py
index 0cd757a6..5829fe78 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -1,8 +1,9 @@
 from contextlib import contextmanager
-
 from tempfile import mkdtemp
 from shutil import rmtree
 
+from pelican.contents import Article
+
 
 @contextmanager
 def temporary_folder():
@@ -16,3 +17,10 @@ def temporary_folder():
     tempdir = mkdtemp()
     yield tempdir
     rmtree(tempdir)
+
+
+def get_article(title, slug, content, lang, extra_metadata=None):
+    metadata = {'slug': slug, 'title': title, 'lang': lang}
+    if extra_metadata is not None:
+        metadata.update(extra_metadata)
+    return Article(content, metadata=metadata)
diff --git a/tests/test_utils.py b/tests/test_utils.py
new file mode 100644
index 00000000..9654825e
--- /dev/null
+++ b/tests/test_utils.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest  # NOQA
+import datetime
+
+from pelican import utils
+from pelican.contents import Article
+
+from support import get_article
+
+
+class TestUtils(unittest.TestCase):
+
+    def test_get_date(self):
+        # valid ones
+        date = datetime.datetime(year=2012, month=11, day=22)
+        date_hour = datetime.datetime(year=2012, month=11, day=22, hour=22,
+                                      minute=11)
+        date_hour_sec = datetime.datetime(year=2012, month=11, day=22, hour=22,
+                                          minute=11, second=10)
+        dates = {'2012-11-22': date,
+                 '2012/11/22': date,
+                 '2012-11-22 22:11': date_hour,
+                 '2012/11/22 22:11': date_hour,
+                 '22-11-2012': date,
+                 '22/11/2012': date,
+                 '22.11.2012': date,
+                 '2012-22-11': date,
+                 '22.11.2012 22:11': date_hour,
+                 '2012-11-22 22:11:10': date_hour_sec}
+
+        for value, expected in dates.items():
+            self.assertEquals(utils.get_date(value), expected, value)
+
+        # invalid ones
+        invalid_dates = ('2010-110-12', 'yay')
+        for item in invalid_dates:
+            self.assertRaises(ValueError, utils.get_date, item)
+
+    def test_slugify(self):
+
+        samples = (('this is a test', 'this-is-a-test'),
+                   ('this        is a test', 'this-is-a-test'),
+                   (u'this → is ← a ↑ test', 'this-is-a-test'),
+                   ('this--is---a test', 'this-is-a-test'))
+
+        for value, expected in samples:
+            self.assertEquals(utils.slugify(value), expected)
+
+    def test_get_relative_path(self):
+
+        samples = (('/test/test', '../../.'),
+                   ('/test/test/', '../../../.'),
+                   ('/', '../.'))
+
+        for value, expected in samples:
+            self.assertEquals(utils.get_relative_path(value), expected)
+
+    def test_process_translations(self):
+        # create a bunch of articles
+        fr_article1 = get_article(lang='fr', slug='yay', title='Un titre',
+                                  content='en français')
+        en_article1 = get_article(lang='en', slug='yay', title='A title',
+                                  content='in english')
+
+        articles = [fr_article1, en_article1]
+
+        index, trans = utils.process_translations(articles)
+
+        self.assertIn(en_article1, index)
+        self.assertIn(fr_article1, trans)
+        self.assertNotIn(en_article1, trans)
+        self.assertNotIn(fr_article1, index)

From 48b318d29e8ba9d84897997ee5d1982b574afb6a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 17:05:46 +0100
Subject: [PATCH 0553/2864] skip typogrify if not installed

---
 tests/test_readers.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index d4f0aecf..c0b8cc41 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -26,7 +26,8 @@ class RstReaderTest(unittest.TestCase):
             'category': 'yeah',
             'author': u'Alexis Métaireau',
             'title': 'This is a super article !',
-            'summary': 'Multi-line metadata should be supported\nas well as <strong>inline markup</strong>.',
+            'summary': 'Multi-line metadata should be supported\nas well as'\
+                       ' <strong>inline markup</strong>.',
             'date': datetime.datetime(2010, 12, 2, 10, 14),
             'tags': ['foo', 'bar', 'foobar'],
         }
@@ -43,10 +44,13 @@ class RstReaderTest(unittest.TestCase):
 
         self.assertEqual(content, expected)
 
-        # otherwise, typogrify should be applied
-        content, _ = readers.read_file(_filename('article.rst'),
-                                       settings={'TYPOGRIFY': True})
-        expected = "<p>This is some content. With some stuff to&nbsp;"\
-                   "&#8220;typogrify&#8221;.</p>\n"
+        try:
+            # otherwise, typogrify should be applied
+            content, _ = readers.read_file(_filename('article.rst'),
+                                           settings={'TYPOGRIFY': True})
+            expected = "<p>This is some content. With some stuff to&nbsp;"\
+                       "&#8220;typogrify&#8221;.</p>\n"
 
-        self.assertEqual(content, expected)
+            self.assertEqual(content, expected)
+        except ImportError:
+            return unittest.skip('need the typogrify distribution')

From 912b1dbc1a25a9a5079b21649a8f0aa8b3db3b68 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 17:05:59 +0100
Subject: [PATCH 0554/2864] test travis-ci

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..bb1f5af1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: python
+python:
+    - "2.6"
+    - "2.7"
+install:
+    - pip install nose --use-mirrors
+    - pip install . --use-mirrors
+script: nosetests -s tests

From d42b6d9ad7682c55e5beae9d90f9f6607cfc9b65 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 17:20:04 +0100
Subject: [PATCH 0555/2864] fix nose

---
 tox.ini | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index 462abf09..e1ca32f2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,13 @@
 [tox]
-envlist = py25,py26,py27
+envlist = py26,py27
 
 [testenv]
-commands=py.test
+commands = nosetests -s tests
 deps =
+    nose
     Jinja2
     Pygments
     docutils
     feedgenerator
     unittest2
-    pytest
+    mock

From 2827a6df47e2c9a08f286183dcb3b5323c98b1b7 Mon Sep 17 00:00:00 2001
From: draftcode <draftcode@gmail.com>
Date: Mon, 12 Mar 2012 01:22:54 +0900
Subject: [PATCH 0556/2864] Fixed some typos.

---
 pelican/__init__.py | 20 ++++++++++----------
 pelican/contents.py |  2 +-
 pelican/utils.py    |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index dcdbdcb6..0b53dbcc 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -25,7 +25,7 @@ class Pelican(object):
 
         self.path = path or settings['PATH']
         if not self.path:
-            raise Exception('you need to specify a path containing the content'
+            raise Exception('You need to specify a path containing the content'
                     ' (see pelican --help for more information)')
 
         if self.path.endswith('/'):
@@ -138,7 +138,7 @@ def main():
     static blog, with restructured text input files.""")
 
     parser.add_argument(dest='path', nargs='?',
-        help='Path where to find the content files')
+        help='Path where to find the content files.')
     parser.add_argument('-t', '--theme-path', dest='theme',
         help='Path where to find the theme templates. If not specified, it'
              'will use the default one included with pelican.')
@@ -146,28 +146,28 @@ def main():
         help='Where to output the generated files. If not specified, a '
              'directory will be created, named "output" in the current path.')
     parser.add_argument('-m', '--markup', default=None, dest='markup',
-        help='the list of markup language to use (rst or md). Please indicate '
-             'them separated by commas')
+        help='The list of markup language to use (rst or md). Please indicate '
+             'them separated by commas.')
     parser.add_argument('-s', '--settings', dest='settings', default='',
-        help='the settings of the application. Default to False.')
+        help='The settings of the application. Default to False.')
     parser.add_argument('-d', '--delete-output-directory',
                         dest='delete_outputdir',
         action='store_true', help='Delete the output directory.')
     parser.add_argument('-v', '--verbose', action='store_const',
                         const=log.INFO, dest='verbosity',
-                        help='Show all messages')
+                        help='Show all messages.')
     parser.add_argument('-q', '--quiet', action='store_const',
                         const=log.CRITICAL, dest='verbosity',
-                        help='Show only critical errors')
+                        help='Show only critical errors.')
     parser.add_argument('-D', '--debug', action='store_const',
                         const=log.DEBUG, dest='verbosity',
-                        help='Show all message, including debug messages')
+                        help='Show all message, including debug messages.')
     parser.add_argument('--version', action='version', version=__version__,
-            help='Print the pelican version and exit')
+            help='Print the pelican version and exit.')
     parser.add_argument('-r', '--autoreload', dest='autoreload',
                         action='store_true',
                         help="Relaunch pelican each time a modification occurs"
-                             " on the content files")
+                             " on the content files.")
     args = parser.parse_args()
 
     log.init(args.verbosity)
diff --git a/pelican/contents.py b/pelican/contents.py
index 900061ad..4f424461 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -43,7 +43,7 @@ class Page(object):
                 self.author = Author(settings['AUTHOR'], settings)
             else:
                 self.author = Author(getenv('USER', 'John Doe'), settings)
-                warning(u"Author of `{0}' unknow, assuming that his name is "
+                warning(u"Author of `{0}' unknown, assuming that his name is "
                          "`{1}'".format(filename or self.title, self.author))
 
         # manage languages
diff --git a/pelican/utils.py b/pelican/utils.py
index eead1ac9..1b84f108 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -14,7 +14,7 @@ from pelican.log import warning, info
 def get_date(string):
     """Return a datetime object from a string.
 
-    If no format matches the given date, raise a ValuEerror
+    If no format matches the given date, raise a ValueError.
     """
     string = re.sub(' +', ' ', string)
     formats = ['%Y-%m-%d %H:%M', '%Y/%m/%d %H:%M',
@@ -58,8 +58,8 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
     :param source: the source dir
     :param destination: the destination dir
     :param destination_path: the destination path (optional)
-    :param overwrite: wether to overwrite the destination if already exists or
-                      not
+    :param overwrite: whether to overwrite the destination if already exists
+                      or not
     """
     if not destination_path:
         destination_path = path

From 3cb18303f6203f84b32e2f4c8bdf48430d7311ff Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 17:26:59 +0100
Subject: [PATCH 0557/2864] fix python 2.6 support

---
 tests/test_contents.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/tests/test_contents.py b/tests/test_contents.py
index e058e721..ed9885b6 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -3,18 +3,19 @@ from __future__ import with_statement
 try:
     from unittest2 import TestCase, skip
 except ImportError, e:
-    from unittest import TestCase, skip
+    from unittest import TestCase, skip  # NOQA
 
 from pelican.contents import Page
 from pelican.settings import _DEFAULT_CONFIG
 
+
 class TestPage(TestCase):
 
     def setUp(self):
         super(TestPage, self).setUp()
         self.page_kwargs = {
             'content': 'content',
-            'metadata':{
+            'metadata': {
                 'title': 'foo bar',
                 'author': 'Blogger',
             },
@@ -72,32 +73,38 @@ class TestPage(TestCase):
         """
         from datetime import datetime
         from sys import platform
-        dt = datetime(2015,9,13)
+        dt = datetime(2015, 9, 13)
         # make a deep copy of page_kawgs
-        page_kwargs = {key:self.page_kwargs[key] for key in self.page_kwargs}
+        page_kwargs = dict([(key, self.page_kwargs[key]) for key in
+                            self.page_kwargs])
         for key in page_kwargs:
-            if not isinstance(page_kwargs[key], dict): break
-            page_kwargs[key] = {subkey:page_kwargs[key][subkey] for subkey in page_kwargs[key]}
+            if not isinstance(page_kwargs[key], dict):
+                break
+            page_kwargs[key] = dict([(subkey, page_kwargs[key][subkey])
+                                     for subkey in page_kwargs[key]])
         # set its date to dt
         page_kwargs['metadata']['date'] = dt
-        page = Page( **page_kwargs)
+        page = Page(**page_kwargs)
 
         self.assertEqual(page.locale_date,
-            unicode(dt.strftime(_DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']), 'utf-8'))
+            unicode(dt.strftime(_DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']),
+                                'utf-8'))
 
+        page_kwargs['settings'] = dict([(x, _DEFAULT_CONFIG[x]) for x in
+                                        _DEFAULT_CONFIG])
 
-        page_kwargs['settings'] = {x:_DEFAULT_CONFIG[x] for x in _DEFAULT_CONFIG}
         # I doubt this can work on all platforms ...
         if platform == "win32":
             locale = 'jpn'
         else:
             locale = 'ja_JP.utf8'
-        page_kwargs['settings']['DATE_FORMATS'] = {'jp':(locale,'%Y-%m-%d(%a)')}
+        page_kwargs['settings']['DATE_FORMATS'] = {'jp': (locale,
+                                                          '%Y-%m-%d(%a)')}
         page_kwargs['metadata']['lang'] = 'jp'
 
         import locale as locale_module
         try:
-            page = Page( **page_kwargs)
+            page = Page(**page_kwargs)
             self.assertEqual(page.locale_date, u'2015-09-13(\u65e5)')
             # above is unicode in Japanese: 2015-09-13(��)
         except locale_module.Error:

From 08b40c7967cdf5ef0780f1f2b4d41d29b31d6578 Mon Sep 17 00:00:00 2001
From: draftcode <draftcode@gmail.com>
Date: Mon, 12 Mar 2012 01:33:30 +0900
Subject: [PATCH 0558/2864] Make names of metadata lower.

---
 pelican/readers.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index a581e458..632c72b9 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -36,8 +36,8 @@ class Reader(object):
         self.settings = settings
 
     def process_metadata(self, name, value):
-        if name.lower() in _METADATA_PROCESSORS:
-            return _METADATA_PROCESSORS[name.lower()](value, self.settings)
+        if name in _METADATA_PROCESSORS:
+            return _METADATA_PROCESSORS[name](value, self.settings)
         return value
 
 
@@ -75,6 +75,7 @@ class RstReader(Reader):
                 else:  # standard fields (e.g. address)
                     name = element.tagname
                     value = element.astext()
+                name = name.lower()
 
                 output[name] = self.process_metadata(name, value)
         return output

From c05b743fa64696625762a09fe2aabb05195a1dfd Mon Sep 17 00:00:00 2001
From: draftcode <draftcode@gmail.com>
Date: Mon, 12 Mar 2012 01:40:27 +0900
Subject: [PATCH 0559/2864] Add mock to dev_requirements.

---
 dev_requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index 198880ec..c7f53682 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -4,3 +4,4 @@ docutils
 feedgenerator
 unittest2
 pytz
+mock

From 9cc7efbe12fea30018eafd0a92c7186304ec8600 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 18:02:57 +0100
Subject: [PATCH 0560/2864] add requirements to travis-ci

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bb1f5af1..8f5dc3a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,6 @@ python:
     - "2.6"
     - "2.7"
 install:
-    - pip install nose --use-mirrors
+    - pip install nose unittest2 mock --use-mirrors
     - pip install . --use-mirrors
 script: nosetests -s tests

From e95b26bf204d684882b711ad6cc817fba16dda7a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 11 Mar 2012 18:07:08 +0100
Subject: [PATCH 0561/2864] Add travis-ci build-image support on the README

---
 README.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.rst b/README.rst
index 2f66e54c..5012bb9c 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,8 @@
 Pelican
 #######
 
+.. image:: https://secure.travis-ci.org/ametaireau/pelican.png?branch=master
+
 Pelican is a simple weblog generator, written in `Python <http://www.python.org/>`_.
 
 * Write your weblog entries directly with your editor of choice (vim!) 

From a4ce10d88e76e60a5da6579d3d04d79ba0d02b7a Mon Sep 17 00:00:00 2001
From: draftcode <draftcode@gmail.com>
Date: Mon, 12 Mar 2012 02:24:26 +0900
Subject: [PATCH 0562/2864] Add a test for readers.

---
 tests/content/article_with_uppercase_metadata.rst | 6 ++++++
 tests/test_readers.py                             | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 tests/content/article_with_uppercase_metadata.rst

diff --git a/tests/content/article_with_uppercase_metadata.rst b/tests/content/article_with_uppercase_metadata.rst
new file mode 100644
index 00000000..e26cdd13
--- /dev/null
+++ b/tests/content/article_with_uppercase_metadata.rst
@@ -0,0 +1,6 @@
+
+This is a super article !
+#########################
+
+:Category: Yeah
+
diff --git a/tests/test_readers.py b/tests/test_readers.py
index d4f0aecf..4472d7fe 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -34,6 +34,14 @@ class RstReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEquals(value, metadata[key], key)
 
+    def test_article_metadata_key_lowercase(self):
+        """Keys of metadata should be lowercase."""
+        reader = readers.RstReader({})
+        content, metadata = reader.read(_filename('article_with_uppercase_metadata.rst'))
+
+        self.assertIn('category', metadata, "Key should be lowercase.")
+        self.assertEquals('Yeah', metadata.get('category'), "Value keeps cases.")
+
     def test_typogrify(self):
         # if nothing is specified in the settings, the content should be
         # unmodified

From 89a481f8e77a96970e03dc0576cb4156fb53c4a1 Mon Sep 17 00:00:00 2001
From: Thanos Lefteris <alefteris@gmail.com>
Date: Sun, 11 Mar 2012 21:00:38 +0200
Subject: [PATCH 0563/2864] Match closing tag

---
 pelican/themes/simple/templates/archives.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/simple/templates/archives.html b/pelican/themes/simple/templates/archives.html
index e6364efa..1ea9b58f 100644
--- a/pelican/themes/simple/templates/archives.html
+++ b/pelican/themes/simple/templates/archives.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
-<h1>Archives for {{ SITENAME }}</h2>
+<h1>Archives for {{ SITENAME }}</h1>
 
 <dl>
 {% for article in dates %}

From acad3e864d6fc729ce08407e619b61da7846f792 Mon Sep 17 00:00:00 2001
From: Thanos Lefteris <alefteris@gmail.com>
Date: Sun, 11 Mar 2012 21:08:18 +0200
Subject: [PATCH 0564/2864] Double-quote HTML attribute

---
 pelican/themes/notmyidea/templates/archives.html | 2 +-
 pelican/themes/simple/templates/archives.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/archives.html b/pelican/themes/notmyidea/templates/archives.html
index 5ba2c817..f7f1c400 100644
--- a/pelican/themes/notmyidea/templates/archives.html
+++ b/pelican/themes/notmyidea/templates/archives.html
@@ -6,7 +6,7 @@
 <dl>
 {% for article in dates %}
     <dt>{{ article.locale_date }}</dt>
-    <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
+    <dd><a href="{{ article.url }}">{{ article.title }}</a></dd>
 {% endfor %}
 </dl>
 </section>
diff --git a/pelican/themes/simple/templates/archives.html b/pelican/themes/simple/templates/archives.html
index e6364efa..c1a9087e 100644
--- a/pelican/themes/simple/templates/archives.html
+++ b/pelican/themes/simple/templates/archives.html
@@ -5,7 +5,7 @@
 <dl>
 {% for article in dates %}
     <dt>{{ article.locale_date }}</dt>
-    <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
+    <dd><a href="{{ article.url }}">{{ article.title }}</a></dd>
 {% endfor %}
 </dl>
 {% endblock %}

From e097175a77d94d41d8979c3fb4718b44c0e067b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Tue, 13 Mar 2012 02:14:38 +0100
Subject: [PATCH 0565/2864] Import not used of BeautifulSoup

---
 tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pelican_import.py b/tools/pelican_import.py
index b883f7fc..c0d8bf1c 100755
--- a/tools/pelican_import.py
+++ b/tools/pelican_import.py
@@ -38,7 +38,7 @@ def wp2fields(xml):
 
 def dc2fields(file):
     """Opens a Dotclear export file, and yield pelican fields"""
-    from BeautifulSoup import BeautifulStoneSoup, BeautifulSoup
+    from BeautifulSoup import BeautifulStoneSoup
 
     in_cat = False
     in_post = False

From c4f96b108f54a1968334767c93eb9d59dcb7f5b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Tue, 13 Mar 2012 02:16:11 +0100
Subject: [PATCH 0566/2864] Don't set unused fields of Dotclear post

---
 tools/pelican_import.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/pelican_import.py b/tools/pelican_import.py
index c0d8bf1c..14f06138 100755
--- a/tools/pelican_import.py
+++ b/tools/pelican_import.py
@@ -85,10 +85,10 @@ def dc2fields(file):
         post_creadt = fields[6]
         # post_upddt = fields[7]
         # post_password = fields[8]
-        post_type = fields[9]
+        # post_type = fields[9]
         post_format = fields[10]
-        post_url = fields[11]
-        post_lang = fields[12]
+        # post_url = fields[11]
+        # post_lang = fields[12]
         post_title = fields[13]
         post_excerpt = fields[14]
         post_excerpt_xhtml = fields[15]

From fec605b5775f0f9dba6e78a99f99dddcf09b8b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Tue, 13 Mar 2012 02:17:06 +0100
Subject: [PATCH 0567/2864] Fix way to handle OSError (error doesn't exist)

A better way would to use sys.stderr.write or PY3 print(file=sys.stderr)
---
 tools/pelican_import.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/pelican_import.py b/tools/pelican_import.py
index 14f06138..12c3597f 100755
--- a/tools/pelican_import.py
+++ b/tools/pelican_import.py
@@ -2,6 +2,7 @@
 
 import argparse
 import os
+import sys
 import time
 
 from codecs import open
@@ -259,14 +260,14 @@ def main():
     elif args.feed:
         input_type = 'feed'
     else:
-        print("you must provide either --wpfile, --dotclear or --feed options")
+        print("You must provide either --wpfile, --dotclear or --feed options")
         exit()
 
     if not os.path.exists(args.output):
         try:
             os.mkdir(args.output)
         except OSError:
-            error("Couldn't create the output folder: " + args.output)
+            print("Unable to create the output folder: " + args.output)
             exit()
 
     # TODO: refactor this long assignment

From d7f0b1637e1f6ed4c0ea54f3e314981c72581292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Tue, 13 Mar 2012 02:20:33 +0100
Subject: [PATCH 0568/2864] Cleanup awful line with TODO in pelican-import

---
 tools/pelican_import.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tools/pelican_import.py b/tools/pelican_import.py
index 12c3597f..8a425776 100755
--- a/tools/pelican_import.py
+++ b/tools/pelican_import.py
@@ -270,14 +270,11 @@ def main():
             print("Unable to create the output folder: " + args.output)
             exit()
 
-    # TODO: refactor this long assignment
-    input_type, input, out_markup, output_path, dircat=False = input_type, args.input, args.markup, args.output, args.dircat
-
     if input_type == 'wordpress':
-        fields = wp2fields(input)
+        fields = wp2fields(args.input)
     elif input_type == 'dotclear':
-        fields = dc2fields(input)
+        fields = dc2fields(args.input)
     elif input_type == 'feed':
-        fields = feed2fields(input)
+        fields = feed2fields(args.input)
 
-    fields2pelican(fields, out_markup, output_path, dircat=dircat)
+    fields2pelican(fields, args.markup, args.output, dircat=args.dircat or False)

From 2f79d5f0526bb2fa6efd4755349d2673298ba608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Tue, 13 Mar 2012 16:52:28 +0100
Subject: [PATCH 0569/2864] Improve error handling when pandoc is missing

---
 tools/pelican_import.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tools/pelican_import.py b/tools/pelican_import.py
index 8a425776..b89740df 100755
--- a/tools/pelican_import.py
+++ b/tools/pelican_import.py
@@ -2,6 +2,7 @@
 
 import argparse
 import os
+import subprocess
 import sys
 import time
 
@@ -217,7 +218,20 @@ def fields2pelican(fields, out_markup, output_path, dircat=False):
                 content = content.replace("\n", "<br />\n")
                 fp.write(content)
 
-            os.system('pandoc --normalize --reference-links --from=html --to=%s -o "%s" "%s"' % (out_markup, out_filename, html_filename))
+            cmd = 'pandoc --normalize --reference-links --from=html --to={0} -o "{1}" "{2}"'.format(
+                out_markup, out_filename, html_filename)
+
+            try:
+                rc = subprocess.call(cmd, shell=True)
+                if rc < 0:
+                    print("Child was terminated by signal %d" % -rc)
+                    exit()
+                elif rc > 0:
+                    print("Please, check your Pandoc installation.")
+                    exit()
+            except OSError, e:
+                print("Pandoc execution failed: %s" % e)
+                exit()
 
             os.remove(html_filename)
 

From ff2426c4ad9e24c52d9a1d02f9c841d4a6438d00 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Tue, 13 Mar 2012 17:10:20 +0100
Subject: [PATCH 0570/2864] Fix for #245: return the summary of an article
 based on the :summary: metadata if it is set, else troncate the content.

---
 pelican/contents.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 4f424461..d8ccf9f3 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -89,9 +89,9 @@ class Page(object):
                 if hasattr(self, 'date') and self.date > datetime.now():
                     self.status = 'draft'
 
-        # set summary
-        if not hasattr(self, 'summary'):
-            self.summary = truncate_html_words(self.content, 50)
+        # store the :summary: metadata if it is set
+        if 'summary' in metadata:
+            self._summary = metadata['summary']
 
     def check_properties(self):
         """test that each mandatory property is set."""
@@ -126,8 +126,12 @@ class Page(object):
         return content
 
     def _get_summary(self):
-        """Returns the summary of an article, based on to the content"""
-        return truncate_html_words(self.content, 50)
+        """Returns the summary of an article, based on the :summary: metadata
+        if it is set, else troncate the content."""
+        if hasattr(self, '_summary'):
+            return self._summary
+        else:
+            return truncate_html_words(self.content, 50)
 
     def _set_summary(self, summary):
         """Dummy function"""

From c4418555223315455be8178c86aab1a980335a8a Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Tue, 13 Mar 2012 17:15:25 +0100
Subject: [PATCH 0571/2864] add a test for the summary metadata

---
 tests/test_contents.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tests/test_contents.py b/tests/test_contents.py
index ed9885b6..8e1407dc 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -8,14 +8,20 @@ except ImportError, e:
 from pelican.contents import Page
 from pelican.settings import _DEFAULT_CONFIG
 
+from jinja2.utils import generate_lorem_ipsum
+
+# generate one paragraph, enclosed with <p>
+TEST_CONTENT = str(generate_lorem_ipsum(n=1))
+TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
 
 class TestPage(TestCase):
 
     def setUp(self):
         super(TestPage, self).setUp()
         self.page_kwargs = {
-            'content': 'content',
+            'content': TEST_CONTENT,
             'metadata': {
+                'summary': TEST_SUMMARY,
                 'title': 'foo bar',
                 'author': 'Blogger',
             },
@@ -27,11 +33,11 @@ class TestPage(TestCase):
 
         """
         metadata = {'foo': 'bar', 'foobar': 'baz', 'title': 'foobar', }
-        page = Page('content', metadata=metadata)
+        page = Page(TEST_CONTENT, metadata=metadata)
         for key, value in metadata.items():
             self.assertTrue(hasattr(page, key))
             self.assertEqual(value, getattr(page, key))
-        self.assertEqual(page.content, 'content')
+        self.assertEqual(page.content, TEST_CONTENT)
 
     def test_mandatory_properties(self):
         """If the title is not set, must throw an exception."""
@@ -39,6 +45,11 @@ class TestPage(TestCase):
         page = Page(**self.page_kwargs)
         page.check_properties()
 
+    def test_summary_from_metadata(self):
+        """If a :summary: metadata is given, it should be used."""
+        page = Page(**self.page_kwargs)
+        self.assertEqual(page.summary, TEST_SUMMARY)
+
     def test_slug(self):
         """If a title is given, it should be used to generate the slug."""
         page = Page(**self.page_kwargs)

From 4f95b9f05c9cf2d5f48786fb6831318e37a1f762 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Wed, 14 Mar 2012 09:38:36 +0100
Subject: [PATCH 0572/2864] remove useless .keys() for key in dict expressions

---
 pelican/generators.py | 5 ++---
 pelican/readers.py    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 2987dcfe..71208430 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -227,7 +227,7 @@ class ArticlesGenerator(Generator):
                 continue
 
             # if no category is set, use the name of the path as a category
-            if 'category' not in metadata.keys():
+            if 'category' not in metadata:
 
                 if os.path.dirname(f) == self.path:
                     category = self.settings['DEFAULT_CATEGORY']
@@ -238,8 +238,7 @@ class ArticlesGenerator(Generator):
                 if category != '':
                     metadata['category'] = Category(category, self.settings)
 
-            if 'date' not in metadata.keys()\
-                and self.settings['FALLBACK_ON_FS_DATE']:
+            if 'date' not in metadata and self.settings['FALLBACK_ON_FS_DATE']:
                     metadata['date'] = datetime.datetime.fromtimestamp(
                                         os.stat(f).st_ctime)
 
diff --git a/pelican/readers.py b/pelican/readers.py
index 632c72b9..d4e13b4d 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -145,7 +145,7 @@ def read_file(filename, fmt=None, settings=None):
     if not fmt:
         fmt = filename.split('.')[-1]
 
-    if fmt not in _EXTENSIONS.keys():
+    if fmt not in _EXTENSIONS:
         raise TypeError('Pelican does not know how to parse %s' % filename)
 
     reader = _EXTENSIONS[fmt](settings)

From 39bdbcfd86bc0f3025ec82b51d86892796356c10 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Wed, 14 Mar 2012 12:36:55 +0100
Subject: [PATCH 0573/2864] files_changed: cleanup and add a test

---
 pelican/utils.py    |  3 ---
 tests/test_utils.py | 22 ++++++++++++++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 1b84f108..7ffd9eb9 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -210,9 +210,6 @@ LAST_MTIME = 0
 def files_changed(path, extensions):
     """Return True if the files have changed since the last check"""
 
-    def with_extension(f):
-        return any(f.endswith(ext) for ext in extensions)
-
     def file_times(path):
         """Return the last time files have been modified"""
         for root, dirs, files in os.walk(path):
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 9654825e..40f710d9 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -3,11 +3,12 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest  # NOQA
+
+import os
 import datetime
+import time
 
 from pelican import utils
-from pelican.contents import Article
-
 from support import get_article
 
 
@@ -73,3 +74,20 @@ class TestUtils(unittest.TestCase):
         self.assertIn(fr_article1, trans)
         self.assertNotIn(en_article1, trans)
         self.assertNotIn(fr_article1, index)
+
+    def test_files_changed(self):
+        "Test if file changes are correctly detected"
+
+        path = os.path.join(os.path.dirname(__file__), 'content')
+        filename = os.path.join(path, 'article_with_metadata.rst')
+        changed = utils.files_changed(path, 'rst')
+        self.assertEquals(changed, True)
+
+        changed = utils.files_changed(path, 'rst')
+        self.assertEquals(changed, False)
+
+        t = time.time()
+        os.utime(filename, (t, t))
+        changed = utils.files_changed(path, 'rst')
+        self.assertEquals(changed, True)
+        self.assertAlmostEqual(utils.LAST_MTIME, t, places=2)

From 4bac1ee7451cda501bb7826f808f11ff12574cf4 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Wed, 14 Mar 2012 19:54:28 +0000
Subject: [PATCH 0574/2864] - remove default=None with argparse is redundant
 since it's the   default value already. - use the
 argparse.ArgumentDefaultsHelpFormatter as the   formatter_class, to print out
 automatically the default values

---
 pelican/__init__.py         |  9 +++++----
 tools/pelican_import.py     |  3 ++-
 tools/pelican_quickstart.py | 10 ++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0b53dbcc..5ffcc3b5 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -135,7 +135,8 @@ class Pelican(object):
 
 def main():
     parser = argparse.ArgumentParser(description="""A tool to generate a
-    static blog, with restructured text input files.""")
+    static blog, with restructured text input files.""",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument(dest='path', nargs='?',
         help='Path where to find the content files.')
@@ -145,11 +146,11 @@ def main():
     parser.add_argument('-o', '--output', dest='output',
         help='Where to output the generated files. If not specified, a '
              'directory will be created, named "output" in the current path.')
-    parser.add_argument('-m', '--markup', default=None, dest='markup',
+    parser.add_argument('-m', '--markup', dest='markup',
         help='The list of markup language to use (rst or md). Please indicate '
              'them separated by commas.')
-    parser.add_argument('-s', '--settings', dest='settings', default='',
-        help='The settings of the application. Default to False.')
+    parser.add_argument('-s', '--settings', dest='settings',
+        help='The settings of the application.')
     parser.add_argument('-d', '--delete-output-directory',
                         dest='delete_outputdir',
         action='store_true', help='Delete the output directory.')
diff --git a/tools/pelican_import.py b/tools/pelican_import.py
index b883f7fc..bfa0f623 100755
--- a/tools/pelican_import.py
+++ b/tools/pelican_import.py
@@ -234,7 +234,8 @@ def fields2pelican(fields, out_markup, output_path, dircat=False):
 def main():
     parser = argparse.ArgumentParser(
         description="Transform feed, Wordpress or Dotclear files to rst files."
-            "Be sure to have pandoc installed")
+            "Be sure to have pandoc installed",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument(dest='input', help='The input file to read')
     parser.add_argument('--wpfile', action='store_true', dest='wpfile',
diff --git a/tools/pelican_quickstart.py b/tools/pelican_quickstart.py
index 04fc20be..4427be65 100755
--- a/tools/pelican_quickstart.py
+++ b/tools/pelican_quickstart.py
@@ -193,14 +193,16 @@ def ask(question, answer=str, default=None, l=None):
 
 
 def main():
-    parser = argparse.ArgumentParser(description="A kickstarter for pelican")
+    parser = argparse.ArgumentParser(
+        description="A kickstarter for pelican",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
     parser.add_argument('-p', '--path', default=".",
             help="The path to generate the blog into")
-    parser.add_argument('-t', '--title', default=None, metavar="title",
+    parser.add_argument('-t', '--title', metavar="title",
             help='Set the title of the website')
-    parser.add_argument('-a', '--author', default=None, metavar="author",
+    parser.add_argument('-a', '--author', metavar="author",
             help='Set the author name of the website')
-    parser.add_argument('-l', '--lang', default=None, metavar="lang",
+    parser.add_argument('-l', '--lang', metavar="lang",
             help='Set the default lang of the website')
 
     args = parser.parse_args()

From ec31832c5cf5f1bdfcf42a6719648c7c5efdffb2 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Wed, 14 Mar 2012 20:04:58 +0000
Subject: [PATCH 0575/2864] - reorganize imports and remove unused import -
 remove trailing spaces at the end of the generated files

---
 tools/pelican_quickstart.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/pelican_quickstart.py b/tools/pelican_quickstart.py
index 04fc20be..f2ec9e88 100755
--- a/tools/pelican_quickstart.py
+++ b/tools/pelican_quickstart.py
@@ -1,10 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*- #
 
-import os, sys, argparse, string
+import os
+import string
+import argparse
+
 from pelican import __version__
 
-TEMPLATES={
+TEMPLATES = {
     'Makefile' : '''
 PELICAN=$pelican
 PELICANOPTS=$pelicanopts
@@ -60,7 +63,7 @@ github: $$(OUTPUTDIR)/index.html
 \tgit push origin gh-pages
 
 .PHONY: html help clean ftp_upload ssh_upload dropbox_upload github
-    ''',
+''',
 
     'pelican.conf.py': '''#!/usr/bin/env python
 # -*- coding: utf-8 -*- #
@@ -87,9 +90,7 @@ SOCIAL = (
          )
 
 DEFAULT_PAGINATION = $default_pagination
-
-
-    '''
+'''
 }
 
 CONF = {

From d01606e86d126e46d63a16a72b5f10bbe8162d01 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Wed, 14 Mar 2012 20:06:13 +0000
Subject: [PATCH 0576/2864] remove unused class _dict

---
 tools/pelican_quickstart.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/tools/pelican_quickstart.py b/tools/pelican_quickstart.py
index f2ec9e88..2358161e 100755
--- a/tools/pelican_quickstart.py
+++ b/tools/pelican_quickstart.py
@@ -109,17 +109,6 @@ CONF = {
 }
 
 
-class _dict(dict):
-    def __init__(self, *args, **kwargs):
-        dict.__init__(self, *args, **kwargs)
-
-    def __getitem__(self, i):
-        return dict.get(self,i,None)
-
-    def has_key(k):
-        return True
-
-
 def ask(question, answer=str, default=None, l=None):
     if answer == str:
         r = ''

From 10fc8a733d7e8f8c99f31101067c77a8ae7c7c6c Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Thu, 15 Mar 2012 00:17:01 +0000
Subject: [PATCH 0577/2864] fix warnings and errors from settings.rst

---
 docs/settings.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9eb46439..c9b58d04 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -160,6 +160,8 @@ maintain multiple languages with different date formats, you can set this dict
 using language name (``lang`` in your posts) as key. Regarding available format
 codes, see `strftime document of python`_ :
 
+.. parsed-literal::
+
     DATE_FORMAT = {
         'en': '%a, %d %b %Y',
         'jp': '%Y-%m-%d(%a)',
@@ -167,6 +169,8 @@ codes, see `strftime document of python`_ :
 
 You can set locale to further control date format:
 
+.. parsed-literal::
+
     LOCALE = ('usa', 'jpn',  # On Windows
         'en_US', 'ja_JP'     # On Unix/Linux
         )
@@ -175,6 +179,7 @@ Also, it is possible to set different locale settings for each language. If you
 put (locale, format) tuples in the dict, this will override the LOCALE setting
 above:
 
+.. parsed-literal::
     # On Unix/Linux
     DATE_FORMAT = {
         'en': ('en_US','%a, %d %b %Y'),

From 7f8f6e8a7e0a4d9b8c313f22e65eb1b4ea055513 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Thu, 15 Mar 2012 00:17:50 +0000
Subject: [PATCH 0578/2864] the sys.path should not contain the _themes
 directory, which is not a python package

---
 docs/conf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 4c4530e2..b4a58992 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,7 +14,6 @@ release = version
 
 # -- Options for HTML output ---------------------------------------------------
 
-sys.path.append(os.path.abspath('_themes'))
 html_theme_path = ['_themes']
 html_theme = 'pelican'
 

From 020c1400e22ec1b3f45e7bf5c4ec404223b83a6a Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Thu, 15 Mar 2012 00:23:07 +0000
Subject: [PATCH 0579/2864] add the pelican path to the sys.path, to be able to
 use autodoc

---
 docs/conf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/conf.py b/docs/conf.py
index b4a58992..6c4e1ce5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 import sys, os
 
+sys.path.append(os.path.abspath('..'))
+
 # -- General configuration -----------------------------------------------------
 templates_path = ['_templates']
 extensions = ['sphinx.ext.autodoc',]

From 99852ebda8e581a9ecf2710761bb35dbcef89734 Mon Sep 17 00:00:00 2001
From: Dana Woodman <dana@danawoodman.com>
Date: Thu, 15 Mar 2012 11:59:58 -0700
Subject: [PATCH 0580/2864] `MD_EXTENSIONS` should be a list not a tuple.

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c9b58d04..b98b649e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -46,7 +46,7 @@ Setting name (default value)                        What does it do?
 `MARKUP` (``('rst', 'md')``)                        A list of available markup languages you want
                                                     to use. For the moment, the only available values
                                                     are `rst` and `md`.
-`MD_EXTENSIONS` (``('codehilite','extra')``)        A list of the extensions that the Markdown processor
+`MD_EXTENSIONS` (``['codehilite','extra']``)        A list of the extensions that the Markdown processor
                                                     will use. Refer to the extensions chapter in the
                                                     Python-Markdown documentation for a complete list of
                                                     supported extensions.

From 2ff3db8f517772c6b9c57fb35a8572827551694b Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Thu, 15 Mar 2012 19:37:49 +0000
Subject: [PATCH 0581/2864] fix the reset term code to make it work also on OSX

---
 pelican/log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/log.py b/pelican/log.py
index 1cb76e16..027743d0 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -5,7 +5,7 @@ from logging import critical, error, info, warning, warn, debug
 from logging import Formatter, getLogger, StreamHandler
 
 
-RESET_TERM = u'\033[1;m'
+RESET_TERM = u'\033[0;m'
 
 
 def term_color(code):

From 74c2449d8f0fe4e6ae8c237835b438f87dfc9aad Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Fri, 16 Mar 2012 14:27:26 +0000
Subject: [PATCH 0582/2864] add version information in __init__.py and import
 them from setup.py and conf.py

---
 docs/conf.py        | 6 ++++--
 pelican/__init__.py | 4 +++-
 setup.py            | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 6c4e1ce5..ac2d67ee 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -3,6 +3,8 @@ import sys, os
 
 sys.path.append(os.path.abspath('..'))
 
+from pelican import __version__, __major__
+
 # -- General configuration -----------------------------------------------------
 templates_path = ['_templates']
 extensions = ['sphinx.ext.autodoc',]
@@ -11,8 +13,8 @@ master_doc = 'index'
 project = u'Pelican'
 copyright = u'2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
-version = "2"
-release = version
+version = __version__
+release = __major__
 
 # -- Options for HTML output ---------------------------------------------------
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 5ffcc3b5..780938a7 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -11,7 +11,9 @@ from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 from pelican import log
 
-__version__ = "3.0"
+__major__ = 3
+__minor__ = 0
+__version__ = "{0}.{1}".format(__major__, __minor__)
 
 
 class Pelican(object):
diff --git a/setup.py b/setup.py
index 910499de..d26ad5f4 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-VERSION = "3.0" # find a better way to do so.
+from pelican import __version__
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'pytz']
 
@@ -21,7 +21,7 @@ entry_points = {
 
 setup(
     name = "pelican",
-    version = VERSION,
+    version = __version__,
     url = 'http://pelican.notmyidea.org/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From df8b71f8110566351db3fdc358fcf8ff65d6bdcf Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Fri, 16 Mar 2012 14:27:51 +0000
Subject: [PATCH 0583/2864] remove unused *bat include

---
 MANIFEST.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index fc46d905..a092ecd0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,3 @@ include *.rst
 global-include *.py
 recursive-include pelican *.html *.css *png
 include LICENSE
-global-include *.bat

From 26078ecc175764c138b8415c70ba85aecbb81565 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Fri, 16 Mar 2012 14:50:26 +0000
Subject: [PATCH 0584/2864] remove unused colors and refactor more how the
 escaping is done

---
 pelican/log.py | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index 027743d0..c5e9b688 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -8,31 +8,25 @@ from logging import Formatter, getLogger, StreamHandler
 RESET_TERM = u'\033[0;m'
 
 
-def term_color(code):
-    return lambda text: code + unicode(text) + RESET_TERM
+def start_color(index):
+    return u'\033[1;{0}m'.format(index)
+
+
+def term_color(color):
+    code = COLOR_CODES[color]
+    return lambda text: start_color(code) + unicode(text) + RESET_TERM
 
 
 COLOR_CODES = {
-    'gray': u'\033[1;30m',
-    'red': u'\033[1;31m',
-    'green': u'\033[1;32m',
-    'yellow': u'\033[1;33m',
-    'blue': u'\033[1;34m',
-    'magenta': u'\033[1;35m',
-    'cyan': u'\033[1;36m',
-    'white': u'\033[1;37m',
-    'bgred': u'\033[1;41m',
-    'bggreen': u'\033[1;42m',
-    'bgbrown': u'\033[1;43m',
-    'bgblue': u'\033[1;44m',
-    'bgmagenta': u'\033[1;45m',
-    'bgcyan': u'\033[1;46m',
-    'bggray': u'\033[1;47m',
-    'bgyellow': u'\033[1;43m',
-    'bggrey': u'\033[1;100m',
+    'red': 31,
+    'yellow': 33,
+    'cyan': 36,
+    'white': 37,
+    'bgred': 41,
+    'bggrey': 100,
 }
 
-ANSI = dict((col, term_color(code)) for col, code in COLOR_CODES.items())
+ANSI = dict((col, term_color(col)) for col in COLOR_CODES)
 
 
 class ANSIFormatter(Formatter):

From 173133dbf34b322511feb36663e189709e505949 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Fri, 16 Mar 2012 14:53:28 +0000
Subject: [PATCH 0585/2864] remove couple of extra spaces

---
 pelican/log.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index c5e9b688..8811b372 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,6 +1,6 @@
 import os
 import sys
-from logging import CRITICAL, ERROR,  WARN, INFO, DEBUG
+from logging import CRITICAL, ERROR, WARN, INFO, DEBUG
 from logging import critical, error, info, warning, warn, debug
 from logging import Formatter, getLogger, StreamHandler
 
@@ -74,7 +74,7 @@ class DummyFormatter(object):
            and not sys.platform.startswith('win'):
             return ANSIFormatter(*args, **kwargs)
         else:
-            return TextFormatter( *args, **kwargs)
+            return TextFormatter(*args, **kwargs)
 
 
 def init(level=None, logger=getLogger(), handler=StreamHandler()):

From 4e4af9d011625f79c04a6ab1d55de892dbaf5149 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Fri, 16 Mar 2012 18:53:08 +0000
Subject: [PATCH 0586/2864] move tools in pelican.tools and add the
 pelican.tools package to setup.py

---
 {tools => pelican/tools}/__init__.py           | 0
 {tools => pelican/tools}/pelican_import.py     | 0
 {tools => pelican/tools}/pelican_quickstart.py | 0
 {tools => pelican/tools}/pelican_themes.py     | 0
 setup.py                                       | 8 ++++----
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {tools => pelican/tools}/__init__.py (100%)
 rename {tools => pelican/tools}/pelican_import.py (100%)
 rename {tools => pelican/tools}/pelican_quickstart.py (100%)
 rename {tools => pelican/tools}/pelican_themes.py (100%)

diff --git a/tools/__init__.py b/pelican/tools/__init__.py
similarity index 100%
rename from tools/__init__.py
rename to pelican/tools/__init__.py
diff --git a/tools/pelican_import.py b/pelican/tools/pelican_import.py
similarity index 100%
rename from tools/pelican_import.py
rename to pelican/tools/pelican_import.py
diff --git a/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
similarity index 100%
rename from tools/pelican_quickstart.py
rename to pelican/tools/pelican_quickstart.py
diff --git a/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
similarity index 100%
rename from tools/pelican_themes.py
rename to pelican/tools/pelican_themes.py
diff --git a/setup.py b/setup.py
index 910499de..a8e0f57d 100755
--- a/setup.py
+++ b/setup.py
@@ -13,9 +13,9 @@ except ImportError:
 entry_points = {
     'console_scripts': [
         'pelican = pelican:main',
-        'pelican-import = tools.pelican_import:main',
-        'pelican-quickstart = tools.pelican_quickstart:main',
-        'pelican-themes = tools.pelican_themes:main'
+        'pelican-import = pelican.tools.pelican_import:main',
+        'pelican-quickstart = pelican.tools.pelican_quickstart:main',
+        'pelican-themes = pelican.tools.pelican_themes:main'
    ]     
 }
 
@@ -27,7 +27,7 @@ setup(
     author_email = 'alexis@notmyidea.org',
     description = "A tool to generate a static blog from reStructuredText or Markdown input files.",
     long_description=open('README.rst').read(),
-    packages = ['pelican'],
+    packages = ['pelican', 'pelican.tools'],
     include_package_data = True,
     install_requires = requires,
     entry_points = entry_points,

From c75ab513daa0c4b78d2f0ebfd23077fcc6b158e2 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 16 Mar 2012 19:59:03 +0100
Subject: [PATCH 0587/2864] use 'summary' rather than ':summary:' in comments

---
 pelican/contents.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index d8ccf9f3..2a7dc22a 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -89,7 +89,7 @@ class Page(object):
                 if hasattr(self, 'date') and self.date > datetime.now():
                     self.status = 'draft'
 
-        # store the :summary: metadata if it is set
+        # store the summary metadata if it is set
         if 'summary' in metadata:
             self._summary = metadata['summary']
 
@@ -126,7 +126,7 @@ class Page(object):
         return content
 
     def _get_summary(self):
-        """Returns the summary of an article, based on the :summary: metadata
+        """Returns the summary of an article, based on the summary metadata
         if it is set, else troncate the content."""
         if hasattr(self, '_summary'):
             return self._summary

From 3dcedb60d83e80ecfd16d6440f21f7cfe110bcef Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 16 Mar 2012 20:56:00 +0100
Subject: [PATCH 0588/2864] add irc support to travis-ci

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8f5dc3a3..89a2ebde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,3 +6,5 @@ install:
     - pip install nose unittest2 mock --use-mirrors
     - pip install . --use-mirrors
 script: nosetests -s tests
+notifications:
+  irc: "irc.freenode.org#pelican"

From 8b846b9fe2eaff627b411ef6af1f9ba1bae2a5b8 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 16 Mar 2012 21:12:48 +0100
Subject: [PATCH 0589/2864] restore back to hardcoded version in setup.py due
 to import hell

---
 setup.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 1f75131b..67bbae80 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-from pelican import __version__
-
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'pytz']
 
 try:
@@ -16,12 +14,12 @@ entry_points = {
         'pelican-import = pelican.tools.pelican_import:main',
         'pelican-quickstart = pelican.tools.pelican_quickstart:main',
         'pelican-themes = pelican.tools.pelican_themes:main'
-   ]     
+   ]
 }
 
 setup(
     name = "pelican",
-    version = __version__,
+    version = "3.0",
     url = 'http://pelican.notmyidea.org/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From 4819a830037ec56466a4d0fb35f6441db663774e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 16 Mar 2012 21:13:24 +0100
Subject: [PATCH 0590/2864] Fix #171. Handle unicode filenames

---
 pelican/contents.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 2a7dc22a..3386dba9 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -42,9 +42,10 @@ class Page(object):
             if 'AUTHOR' in settings:
                 self.author = Author(settings['AUTHOR'], settings)
             else:
+                title = filename.decode('utf-8') if filename else self.title
                 self.author = Author(getenv('USER', 'John Doe'), settings)
                 warning(u"Author of `{0}' unknown, assuming that his name is "
-                         "`{1}'".format(filename or self.title, self.author))
+                         "`{1}'".format(title, self.author))
 
         # manage languages
         self.in_default_lang = True

From cbc609c8f00277efbbb2e17becbc36054526d48f Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 16 Mar 2012 21:23:34 +0100
Subject: [PATCH 0591/2864] only notify build is okay if it was failing
 previously

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 89a2ebde..823c1172 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,7 @@ install:
     - pip install . --use-mirrors
 script: nosetests -s tests
 notifications:
-  irc: "irc.freenode.org#pelican"
+    irc:
+        channels: 
+            - "irc.freenode.org#pelican"
+        on_success: change

From 8819d026002bca0e865aa15c00b061190432ec4c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 16 Mar 2012 20:27:26 -0700
Subject: [PATCH 0592/2864] Allow for serving feeds from a separate domain.

This (indirectly) enables support for FeedBurner. Added docs for
FeedBurner configuration. Clarify how defining the SITEURL attribute
affects URL structure. Closes #177.
---
 docs/settings.rst                            | 55 ++++++++++++++++----
 pelican/settings.py                          |  1 +
 pelican/themes/notmyidea/static/css/main.css |  4 +-
 pelican/themes/notmyidea/templates/base.html |  8 +--
 samples/pelican.conf.py                      |  1 +
 5 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index b98b649e..301f3d34 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -62,10 +62,13 @@ Setting name (default value)                        What does it do?
 `RELATIVE_URLS` (``True``)                          Defines whether Pelican should use relative URLs or
                                                     not.
 `SITENAME` (``'A Pelican Blog'``)                   Your site name
-`SITEURL`                                           Base URL of your website. Note that this is
-                                                    not a way to tell Pelican whether to use relative URLs
-                                                    or static ones. You should instead use the
-                                                    `RELATIVE_URL` setting for that purpose.
+`SITEURL`                                           Base URL of your website. Not defined by default,
+                                                    which means the base URL is assumed to be "/" with a
+                                                    root-relative URL structure. If `SITEURL` is specified
+                                                    explicitly, URLs will be generated with an absolute
+                                                    URL structure (including the domain). If you want to
+                                                    use relative URLs instead of root-relative or absolute
+                                                    URLs, you should instead use the `RELATIVE_URL` setting.
 `STATIC_PATHS` (``['images']``)                     The static paths you want to have accessible
                                                     on the output path "static". By default,
                                                     Pelican will copy the 'images' folder to the
@@ -86,10 +89,10 @@ Setting name (default value)                        What does it do?
 URL Settings
 ------------
 
-You can customize the URL's and locations where files will be saved. The URL's and
-SAVE_AS variables use python's format strings. These variables allow you to place
-your articles in a location such as '{slug}/index.html' and link to then as
-'{slug}' for clean urls. These settings give you the flexibility to place your
+You can customize the URLs and locations where files will be saved. The URLs and
+SAVE_AS variables use Python's format strings. These variables allow you to place
+your articles in a location such as '{slug}/index.html' and link to them as
+'{slug}' for clean URLs. These settings give you the flexibility to place your
 articles and pages anywhere you want.
 
 Note: If you specify a datetime directive, it will be substituted using the
@@ -216,15 +219,26 @@ the ``TAG_FEED`` and ``TAG_FEED_RSS`` settings:
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`CATEGORY_FEED` ('feeds/%s.atom.xml'[2]_)           Where to put the category Atom feeds.
-`CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the category RSS feeds.
+`FEED_DOMAIN` (``None``, i.e. base URL is "/")      The domain prepended to feed URLs. Since feed URLs
+                                                    should always be absolute, it is highly recommended
+                                                    to define this (e.g., "http://feeds.example.com"). If
+                                                    you have already explicitly defined SITEURL (see
+                                                    above) and want to use the same domain for your
+                                                    feeds, you can just set:  `FEED_DOMAIN = SITEURL`
 `FEED` (``'feeds/all.atom.xml'``)                   Relative URL to output the Atom feed.
 `FEED_RSS` (``None``, i.e. no RSS)                  Relative URL to output the RSS feed.
-`TAG_FEED` (``None``, ie no tag feed)               Relative URL to output the tag Atom feed. It should
+`CATEGORY_FEED` ('feeds/%s.atom.xml'[2]_)           Where to put the category Atom feeds.
+`CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the category RSS feeds.
+`TAG_FEED` (``None``, i.e. no tag feed)             Relative URL to output the tag Atom feed. It should
                                                     be defined using a "%s" match in the tag name.
 `TAG_FEED_RSS` (``None``, ie no RSS tag feed)       Relative URL to output the tag RSS feed
 `FEED_MAX_ITEMS`                                    Maximum number of items allowed in a feed. Feed item
                                                     quantity is unrestricted by default.
+`FEED_MAIN_URL` (``'feeds/all.atom.xml'``)          URL appended to domain for the main Atom feed and
+                                                    used to populate its `<link>` in the base template.
+                                                    Useful when you want the feed link to differ from the 
+                                                    filesystem path, such as when using web server
+                                                    aliases/rewrites or FeedBurner (see below).
 ================================================    =====================================================
 
 If you don't want to generate some of these feeds, set ``None`` to the
@@ -232,6 +246,25 @@ variables above.
 
 .. [2] %s is the name of the category.
 
+FeedBurner
+----------
+
+If you want to use FeedBurner for your primary Atom feed, there are two
+primary fields to configure in the `FeedBurner
+<http://feedburner.google.com>`_ interface: "Original Feed" and "Feed Address".
+If using the default Pelican `FEED` attribute and assuming your feeds
+are served from the `www.example.com` domain, you would enter
+`http://www.example.com/feeds/all.atom.xml` in the "Original Feed" field in
+FeedBurner.
+
+For the "Feed Address" field in the FeedBurner interface, you may choose
+whatever suffix you prefer. In your Pelican settings, assign this suffix to
+the `FEED_MAIN_URL` setting. So if your FeedBurner feed address is set to
+`http://feeds.feedburner.com/myblogfeed`, in your Pelican settings you would
+set: `FEED_MAIN_URL = "myblogfeed"`. Then set the `FEED_DOMAIN` setting to
+`http://feeds.feedburner.com`, or `http://feeds.example.com` if you are using
+a CNAME on your own domain (i.e., FeedBurner's "MyBrand" feature).
+
 Pagination
 ==========
 
diff --git a/pelican/settings.py b/pelican/settings.py
index b38a99fd..59dc5922 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -18,6 +18,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'STATIC_PATHS': ['images', ],
                    'THEME_STATIC_PATHS': ['static', ],
                    'FEED': 'feeds/all.atom.xml',
+                   'FEED_MAIN_URL': 'feeds/all.atom.xml',
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
                    'TRANSLATION_FEED': 'feeds/all-%s.atom.xml',
                    'FEED_MAX_ITEMS': '',
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 7534790f..28c98b99 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -26,8 +26,6 @@ body {
     text-align: left;
 }
 
-
-
 /* Headings */
 h1 {font-size: 2em }
 h2 {font-size: 1.571em}	/* 22px */
@@ -304,7 +302,7 @@ img.left, figure.left {float: right; margin: 0 0 2em 2em;}
 		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
 		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[href*='atom.xml'] {background-image: url('../images/icons/rss.png');}
+		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
 
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 12086dc7..0fd388cf 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -4,9 +4,9 @@
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
-        <link href="{{ SITEURL }}/{{ FEED }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_MAIN_URL }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
         {% if FEED_RSS %}
-        <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
 
         <!--[if IE]>
@@ -56,9 +56,9 @@
                 <div class="social">
                         <h2>social</h2>
                         <ul>
-                            <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">atom feed</a></li>
+                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_MAIN_URL }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
                             {% if FEED_RSS %}
-                            <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">rss feed</a></li>
+                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             {% endif %}
 
                         {% for name, link in SOCIAL %}
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index d725265c..de52cd8a 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -11,6 +11,7 @@ REVERSE_CATEGORY_ORDER = True
 LOCALE = ""
 DEFAULT_PAGINATION = 4
 
+FEED_DOMAIN = SITEURL
 FEED_RSS = 'feeds/all.rss.xml'
 CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'
 

From a9f5fdc47b5c42dee41e8ffebd773bcc9c2276ab Mon Sep 17 00:00:00 2001
From: Martin Brochhaus <mbrochh@gmail.com>
Date: Sun, 18 Mar 2012 14:57:53 +0800
Subject: [PATCH 0593/2864] Always using normal capitalization in headlines.

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index b98b649e..b1c35122 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -83,7 +83,7 @@ Setting name (default value)                        What does it do?
 .. [#] Default is the system locale.
 
 
-URL Settings
+URL settings
 ------------
 
 You can customize the URL's and locations where files will be saved. The URL's and

From 9c4b40fd35833a6f68b04316ca5ce8f77f19c325 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 18 Mar 2012 15:12:06 +0100
Subject: [PATCH 0594/2864] Keep raw metadata text (but for summary)

---
 pelican/readers.py                      | 5 ++++-
 tests/content/article_with_metadata.rst | 1 +
 tests/test_readers.py                   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index d4e13b4d..2e269647 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -71,7 +71,10 @@ class RstReader(Reader):
                 if element.tagname == 'field':  # custom fields (e.g. summary)
                     name_elem, body_elem = element.children
                     name = name_elem.astext()
-                    value = render_node_to_html(document, body_elem)
+                    if name == 'summary':
+                        value = render_node_to_html(document, body_elem)
+                    else:
+                        value = body_elem.astext()
                 else:  # standard fields (e.g. address)
                     name = element.tagname
                     value = element.astext()
diff --git a/tests/content/article_with_metadata.rst b/tests/content/article_with_metadata.rst
index 3410885e..d4bac1c0 100644
--- a/tests/content/article_with_metadata.rst
+++ b/tests/content/article_with_metadata.rst
@@ -9,3 +9,4 @@ This is a super article !
 :summary:
     Multi-line metadata should be supported
     as well as **inline markup**.
+:custom_field: http://notmyidea.org
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 058469d4..4c04a212 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -30,6 +30,7 @@ class RstReaderTest(unittest.TestCase):
                        ' <strong>inline markup</strong>.',
             'date': datetime.datetime(2010, 12, 2, 10, 14),
             'tags': ['foo', 'bar', 'foobar'],
+            'custom_field': 'http://notmyidea.org',
         }
 
         for key, value in expected.items():

From ff5921a4697b83050ace01e564def6968c9440d1 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Sun, 18 Mar 2012 21:08:43 +0000
Subject: [PATCH 0595/2864] - move the try/except dance in support.py - use
 relative . imports in test files - remove the "future with import", since
 python < 2.6 is not supported

---
 tests/support.py         | 11 +++++++++++
 tests/test_contents.py   | 13 +++++--------
 tests/test_generators.py |  9 +++------
 tests/test_pelican.py    |  2 +-
 tests/test_readers.py    |  5 +----
 tests/test_settings.py   |  8 ++------
 tests/test_utils.py      |  7 +------
 7 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 5829fe78..4eb07ec4 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -1,9 +1,20 @@
+__all__ = [
+    'temporary_folder',
+    'get_article',
+    'unittest',
+]
+
 from contextlib import contextmanager
 from tempfile import mkdtemp
 from shutil import rmtree
 
 from pelican.contents import Article
 
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 
 @contextmanager
 def temporary_folder():
diff --git a/tests/test_contents.py b/tests/test_contents.py
index 8e1407dc..c6ef29a8 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
-try:
-    from unittest2 import TestCase, skip
-except ImportError, e:
-    from unittest import TestCase, skip  # NOQA
+
+from .support import unittest
 
 from pelican.contents import Page
 from pelican.settings import _DEFAULT_CONFIG
@@ -14,7 +11,8 @@ from jinja2.utils import generate_lorem_ipsum
 TEST_CONTENT = str(generate_lorem_ipsum(n=1))
 TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
 
-class TestPage(TestCase):
+
+class TestPage(unittest.TestCase):
 
     def setUp(self):
         super(TestPage, self).setUp()
@@ -117,7 +115,6 @@ class TestPage(TestCase):
         try:
             page = Page(**page_kwargs)
             self.assertEqual(page.locale_date, u'2015-09-13(\u65e5)')
-            # above is unicode in Japanese: 2015-09-13(��)
         except locale_module.Error:
             # The constructor of ``Page`` will try to set the locale to
             # ``ja_JP.utf8``. But this attempt will failed when there is no
@@ -126,4 +123,4 @@ class TestPage(TestCase):
             #
             # Until we find some other method to test this functionality, we
             # will simply skip this test.
-            skip("There is no locale %s in this system." % locale)
+            unittest.skip("There is no locale %s in this system." % locale)
diff --git a/tests/test_generators.py b/tests/test_generators.py
index 20929622..e30b0c98 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -1,13 +1,10 @@
 # -*- coding: utf-8 -*-
-try:
-    import unittest2 as unittest
-except ImportError, e:
-    import unittest  # NOQA
+
+from mock import MagicMock
 
 from pelican.generators import ArticlesGenerator
 from pelican.settings import _DEFAULT_CONFIG
-
-from mock import MagicMock
+from .support import unittest
 
 
 class TestArticlesGenerator(unittest.TestCase):
diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index dce4fadc..ce270955 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -1,7 +1,7 @@
 import unittest
 import os
 
-from support import temporary_folder
+from .support import temporary_folder
 
 from pelican import Pelican
 from pelican.settings import read_settings
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 4c04a212..3e830e17 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -1,13 +1,10 @@
 # coding: utf-8
-try:
-    import unittest2 as unittest
-except ImportError, e:
-    import unittest
 
 import datetime
 import os
 
 from pelican import readers
+from .support import unittest
 
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_PATH = os.path.join(CUR_DIR, 'content')
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 571f66a1..ae331053 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,14 +1,10 @@
-try:
-    import unittest2
-except ImportError, e:
-    import unittest as unittest2
-
 from os.path import dirname, abspath, join
 
 from pelican.settings import read_settings, _DEFAULT_CONFIG
+from .support import unittest
 
 
-class TestSettingsFromFile(unittest2.TestCase):
+class TestSettingsFromFile(unittest.TestCase):
     """Providing a file, it should read it, replace the default values and
     append new values to the settings, if any
     """
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 40f710d9..06843872 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,15 +1,10 @@
 # -*- coding: utf-8 -*-
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # NOQA
-
 import os
 import datetime
 import time
 
 from pelican import utils
-from support import get_article
+from .support import get_article, unittest
 
 
 class TestUtils(unittest.TestCase):

From 229ebbbcbf5f6ccb1b3c193fb992ab0539c4ac1f Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 20 Mar 2012 01:26:26 +0100
Subject: [PATCH 0596/2864] plugins branch is planned to be merged for 3.0

---
 docs/plugins.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 3bf7c532..f788b32a 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -3,7 +3,7 @@
 Plugins
 #######
 
-Since version 2.8, pelican manages plugins. Plugins are a way to add feature to
+Since version 3.0, pelican manages plugins. Plugins are a way to add feature to
 pelican without having to directly hack pelican code.
 
 Pelican is shipped with a set of core plugins, but you can easily implement

From 67f7fcba264eaa122d86286636531247935eca71 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 20 Mar 2012 01:39:52 +0100
Subject: [PATCH 0597/2864] remove duplicated pelican-themes entry from the
 toctree

---
 docs/index.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index 202bdbd9..7dbac168 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -60,7 +60,6 @@ A French version of the documentation is available at :doc:`fr/index`.
    getting_started
    settings
    themes
-   pelican-themes
    plugins
    internals
    pelican-themes

From 0922efa371c76cb82120dcbe05f36945bacf5ec0 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Tue, 20 Mar 2012 13:01:21 +0000
Subject: [PATCH 0598/2864] change the way logging is done, using the standard
 log tree instead of calling the module-level functions on an unitialised
 logging object.

This allows to
- simplify log.py
- use one logger object for each file
---
 pelican/__init__.py   | 30 +++++++++++++++++-------------
 pelican/contents.py   | 14 +++++++++-----
 pelican/generators.py | 19 +++++++++++--------
 pelican/log.py        | 37 +++++++++++++++----------------------
 pelican/settings.py   | 12 ++++++++----
 pelican/utils.py      | 18 ++++++++++--------
 pelican/writers.py    | 14 +++++++++-----
 7 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 780938a7..2065feaa 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,21 +1,25 @@
-import argparse
 import os
-import sys
 import re
+import sys
 import time
+import logging
+import argparse
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator)
+from pelican.log import init
 from pelican.settings import read_settings, _DEFAULT_CONFIG
 from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
-from pelican import log
 
 __major__ = 3
 __minor__ = 0
 __version__ = "{0}.{1}".format(__major__, __minor__)
 
 
+logger = logging.getLogger(__name__)
+
+
 class Pelican(object):
     def __init__(self, settings=None, path=None, theme=None, output_path=None,
             markup=None, delete_outputdir=False):
@@ -57,7 +61,7 @@ class Pelican(object):
     def _handle_deprecation(self):
 
         if self.settings.get('CLEAN_URLS', False):
-            log.warning('Found deprecated `CLEAN_URLS` in settings. Modifing'
+            logger.warning('Found deprecated `CLEAN_URLS` in settings. Modifing'
                         ' the following settings for the same behaviour.')
 
             self.settings['ARTICLE_URL'] = '{slug}/'
@@ -67,10 +71,10 @@ class Pelican(object):
 
             for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
                             'PAGE_LANG_URL'):
-                log.warning("%s = '%s'" % (setting, self.settings[setting]))
+                logger.warning("%s = '%s'" % (setting, self.settings[setting]))
 
         if self.settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
-            log.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
+            logger.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
                         ' settings.  Modifing the following settings for'
                         ' the same behaviour.')
 
@@ -91,7 +95,7 @@ class Pelican(object):
                             'PAGE_LANG_SAVE_AS'):
                 self.settings[setting] = os.path.join(structure,
                                                       self.settings[setting])
-                log.warning("%s = '%s'" % (setting, self.settings[setting]))
+                logger.warning("%s = '%s'" % (setting, self.settings[setting]))
 
     def run(self):
         """Run the generators and return"""
@@ -157,13 +161,13 @@ def main():
                         dest='delete_outputdir',
         action='store_true', help='Delete the output directory.')
     parser.add_argument('-v', '--verbose', action='store_const',
-                        const=log.INFO, dest='verbosity',
+                        const=logging.INFO, dest='verbosity',
                         help='Show all messages.')
     parser.add_argument('-q', '--quiet', action='store_const',
-                        const=log.CRITICAL, dest='verbosity',
+                        const=logging.CRITICAL, dest='verbosity',
                         help='Show only critical errors.')
     parser.add_argument('-D', '--debug', action='store_const',
-                        const=log.DEBUG, dest='verbosity',
+                        const=logging.DEBUG, dest='verbosity',
                         help='Show all message, including debug messages.')
     parser.add_argument('--version', action='version', version=__version__,
             help='Print the pelican version and exit.')
@@ -173,7 +177,7 @@ def main():
                              " on the content files.")
     args = parser.parse_args()
 
-    log.init(args.verbosity)
+    init(args.verbosity)
     # Split the markup languages only if some have been given. Otherwise,
     # populate the variable with None.
     markup = [a.strip().lower() for a in args.markup.split(',')]\
@@ -207,9 +211,9 @@ def main():
         else:
             pelican.run()
     except Exception, e:
-        log.critical(unicode(e))
+        logger.critical(unicode(e))
 
-        if (args.verbosity == log.DEBUG):
+        if (args.verbosity == logging.DEBUG):
             raise
         else:
             sys.exit(getattr(e, 'exitcode', 1))
diff --git a/pelican/contents.py b/pelican/contents.py
index 3386dba9..ee6b9637 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,15 +1,19 @@
 # -*- coding: utf-8 -*-
+import locale
+import logging
+import functools
+
 from datetime import datetime
 from os import getenv
 from sys import platform, stdin
-import functools
-import locale
 
-from pelican.log import warning, error
+
 from pelican.settings import _DEFAULT_CONFIG
 from pelican.utils import slugify, truncate_html_words
 
 
+logger = logging.getLogger(__name__)
+
 class Page(object):
     """Represents a page
     Given a content, and metadata, create an adequate object.
@@ -44,7 +48,7 @@ class Page(object):
             else:
                 title = filename.decode('utf-8') if filename else self.title
                 self.author = Author(getenv('USER', 'John Doe'), settings)
-                warning(u"Author of `{0}' unknown, assuming that his name is "
+                logger.warning(u"Author of `{0}' unknown, assuming that his name is "
                          "`{1}'".format(title, self.author))
 
         # manage languages
@@ -200,6 +204,6 @@ def is_valid_content(content, f):
         content.check_properties()
         return True
     except NameError, e:
-        error(u"Skipping %s: impossible to find informations about '%s'"\
+        logger.error(u"Skipping %s: impossible to find informations about '%s'"\
                 % (f, e))
         return False
diff --git a/pelican/generators.py b/pelican/generators.py
index 71208430..4e756213 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 import os
-import datetime
 import math
 import random
+import logging
+import datetime
 
 from collections import defaultdict
 from functools import partial
@@ -13,11 +14,13 @@ from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
 from jinja2.exceptions import TemplateNotFound
 
 from pelican.contents import Article, Page, Category, is_valid_content
-from pelican.log import warning, error, debug, info
 from pelican.readers import read_file
 from pelican.utils import copy, process_translations, open
 
 
+logger = logging.getLogger(__name__)
+
+
 class Generator(object):
     """Baseclass generator"""
 
@@ -47,7 +50,7 @@ class Generator(object):
             extensions=self.settings.get('JINJA_EXTENSIONS', []),
         )
 
-        debug('template list: {0}'.format(self._env.list_templates()))
+        logger.debug('template list: {0}'.format(self._env.list_templates()))
 
         # get custom Jinja filters from user settings
         custom_filters = self.settings.get('JINJA_FILTERS', {})
@@ -223,7 +226,7 @@ class ArticlesGenerator(Generator):
             try:
                 content, metadata = read_file(f, settings=self.settings)
             except Exception, e:
-                warning(u'Could not process %s\n%s' % (f, str(e)))
+                logger.warning(u'Could not process %s\n%s' % (f, str(e)))
                 continue
 
             # if no category is set, use the name of the path as a category
@@ -326,7 +329,7 @@ class PagesGenerator(Generator):
             try:
                 content, metadata = read_file(f)
             except Exception, e:
-                error(u'Could not process %s\n%s' % (f, str(e)))
+                logger.error(u'Could not process %s\n%s' % (f, str(e)))
                 continue
             page = Page(content, metadata, settings=self.settings,
                         filename=f)
@@ -388,7 +391,7 @@ class PdfGenerator(Generator):
             # print "Generating pdf for", obj.filename, " in ", output_pdf
             with open(obj.filename) as f:
                 self.pdfcreator.createPdf(text=f, output=output_pdf)
-            info(u' [ok] writing %s' % output_pdf)
+            logger.info(u' [ok] writing %s' % output_pdf)
 
     def generate_context(self):
         pass
@@ -396,13 +399,13 @@ class PdfGenerator(Generator):
     def generate_output(self, writer=None):
         # we don't use the writer passed as argument here
         # since we write our own files
-        info(u' Generating PDF files...')
+        logger.info(u' Generating PDF files...')
         pdf_path = os.path.join(self.output_path, 'pdf')
         if not os.path.exists(pdf_path):
             try:
                 os.mkdir(pdf_path)
             except OSError:
-                error("Couldn't create the pdf output folder in " + pdf_path)
+                logger.error("Couldn't create the pdf output folder in " + pdf_path)
                 pass
 
         for article in self.context['articles']:
diff --git a/pelican/log.py b/pelican/log.py
index 8811b372..64fa87bd 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,8 +1,12 @@
+__all__ = [
+    'init'
+]
+
 import os
 import sys
-from logging import CRITICAL, ERROR, WARN, INFO, DEBUG
-from logging import critical, error, info, warning, warn, debug
-from logging import Formatter, getLogger, StreamHandler
+import logging
+
+from logging import Formatter, getLogger, StreamHandler, DEBUG
 
 
 RESET_TERM = u'\033[0;m'
@@ -78,32 +82,21 @@ class DummyFormatter(object):
 
 
 def init(level=None, logger=getLogger(), handler=StreamHandler()):
+    logger = logging.getLogger()
     fmt = DummyFormatter()
     handler.setFormatter(fmt)
     logger.addHandler(handler)
+
     if level:
         logger.setLevel(level)
 
 
 if __name__ == '__main__':
     init(level=DEBUG)
-    debug('debug')
-    info('info')
-    warning('warning')
-    error('error')
-    critical('critical')
 
-
-__all__ = [
-    "debug",
-    "info",
-    "warn",
-    "warning",
-    "error",
-    "critical",
-    "DEBUG",
-    "INFO",
-    "WARN",
-    "ERROR",
-    "CRITICAL"
-]
+    root_logger = logging.getLogger()
+    root_logger.debug('debug')
+    root_logger.info('info')
+    root_logger.warning('warning')
+    root_logger.error('error')
+    root_logger.critical('critical')
diff --git a/pelican/settings.py b/pelican/settings.py
index b38a99fd..97a2e83d 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,9 +1,13 @@
 # -*- coding: utf-8 -*-
 import os
-from os.path import isabs
 import locale
+import logging
+
+from os.path import isabs
+
+
+logger = logging.getLogger(__name__)
 
-from pelican import log
 
 DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
                               "themes/notmyidea"])
@@ -102,10 +106,10 @@ def read_settings(filename=None):
         except locale.Error:
             pass
     else:
-        log.warn("LOCALE option doesn't contain a correct value")
+        logger.warn("LOCALE option doesn't contain a correct value")
 
     if not 'TIMEZONE' in context:
-        log.warn("No timezone information specified in the settings. Assuming"
+        logger.warn("No timezone information specified in the settings. Assuming"
                  " your timezone is UTC for feed generation. Check "
                  "http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "
                  "for more information")
diff --git a/pelican/utils.py b/pelican/utils.py
index 7ffd9eb9..c74b36bd 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,14 +1,16 @@
 # -*- coding: utf-8 -*-
 import os
-import pytz
 import re
+import pytz
 import shutil
+import logging
 
 from codecs import open as _open
 from datetime import datetime
 from itertools import groupby
 from operator import attrgetter
-from pelican.log import warning, info
+
+logger = logging.getLogger(__name__)
 
 
 def get_date(string):
@@ -71,16 +73,16 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
     if os.path.isdir(source_):
         try:
             shutil.copytree(source_, destination_)
-            info('copying %s to %s' % (source_, destination_))
+            logger.info('copying %s to %s' % (source_, destination_))
         except OSError:
             if overwrite:
                 shutil.rmtree(destination_)
                 shutil.copytree(source_, destination_)
-                info('replacement of %s with %s' % (source_, destination_))
+                logger.info('replacement of %s with %s' % (source_, destination_))
 
     elif os.path.isfile(source_):
         shutil.copy(source_, destination_)
-        info('copying %s to %s' % (source_, destination_))
+        logger.info('copying %s to %s' % (source_, destination_))
 
 
 def clean_output_dir(path):
@@ -186,14 +188,14 @@ def process_translations(content_list):
         default_lang_items = filter(attrgetter('in_default_lang'), items)
         len_ = len(default_lang_items)
         if len_ > 1:
-            warning(u'there are %s variants of "%s"' % (len_, slug))
+            logger.warning(u'there are %s variants of "%s"' % (len_, slug))
             for x in default_lang_items:
-                warning('    %s' % x.filename)
+                logger.warning('    %s' % x.filename)
         elif len_ == 0:
             default_lang_items = items[:1]
 
         if not slug:
-            warning('empty slug for %r' % (default_lang_items[0].filename,))
+            logger.warning('empty slug for %r' % (default_lang_items[0].filename,))
         index.extend(default_lang_items)
         translations.extend(filter(
             lambda x: x not in default_lang_items,
diff --git a/pelican/writers.py b/pelican/writers.py
index b27443be..7bb7ab44 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -1,16 +1,20 @@
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
+
 import os
+import re
+import locale
+import logging
+
 from codecs import open
 from functools import partial
-import locale
-import re
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 from pelican.paginator import Paginator
-from pelican.log import info
 from pelican.utils import get_relative_path, set_date_tzinfo
 
+logger = logging.getLogger(__name__)
+
 
 class Writer(object):
 
@@ -73,7 +77,7 @@ class Writer(object):
                     pass
                 fp = open(complete_path, 'w')
                 feed.write(fp, 'utf-8')
-                info('writing %s' % complete_path)
+                logger.info('writing %s' % complete_path)
 
                 fp.close()
             return feed
@@ -108,7 +112,7 @@ class Writer(object):
                 pass
             with open(filename, 'w', encoding='utf-8') as f:
                 f.write(output)
-            info(u'writing %s' % filename)
+            logger.info(u'writing %s' % filename)
 
         localcontext = context.copy()
         if relative_urls:

From 7cd4d28bb2e57e0154a3cb8b1546b669abdf715f Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 20 Mar 2012 23:31:04 +0100
Subject: [PATCH 0599/2864] better plugins doc

---
 docs/plugins.rst | 41 +++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index f788b32a..db5a4bfc 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -3,17 +3,18 @@
 Plugins
 #######
 
-Since version 3.0, pelican manages plugins. Plugins are a way to add feature to
-pelican without having to directly hack pelican code.
+Since version 3.0, pelican manages plugins. Plugins are a way to add features
+to pelican without having to directly hack pelican code.
 
 Pelican is shipped with a set of core plugins, but you can easily implement
-your own (and this page describes how)
+your own (and this page describes how).
 
 How to use plugins?
 ====================
 
-To load plugins, you have to specify a them in your settings file. You have two
-ways to do so:  by specifying strings with the path to the callables: ::
+To load plugins, you have to specify them in your settings file. You have two
+ways to do so.
+Either by specifying strings with the path to the callables::
 
     PLUGINS = ['pelican.plugins.gravatar',] 
 
@@ -76,28 +77,18 @@ Translation
 -----------
 
 Github Activity
-_______________
+---------------
 
-This plugins introduces a new depencency, you have to install feedparser 
-if you want to use it, these are some ways to do it::
+This plugin makes use of the ``feedparser`` library that you'll need to
+install.
 
-     apt-get install python-feedparser # on debian based distributions like ubuntu
-     sudo easy_install feedparser
-     sudo pip install feedparser
-
-To enable it set in your pelican config file the GITHUB_ACTIVITY_FEED
-parameter pointing to your github activity feed.
-
-for example my personal activity feed is::
-
-     https://github.com/kpanic.atom
-
-and the config line could be::
+Set the GITHUB_ACTIVITY_FEED parameter to your github activity feed.
+For example, my setting would look like::
 
      GITHUB_ACTIVITY_FEED = 'https://github.com/kpanic.atom'
 
-in your template just write a for in jinja2 syntax against the
-github_activity variable, like for example::
+On the templates side, you just have to iterate over the ``github_activity``
+variable, as in the example::
 
      {% if GITHUB_ACTIVITY_FEED %}
         <div class="social">
@@ -113,7 +104,5 @@ github_activity variable, like for example::
 
 
 
-github_activity is a list containing a list. The first element is the title and
-the second element is the raw html from github so you can include it directly
-in your (for example base.html) template and style it in a way that your prefer
-using your css skills
+``github_activity`` is a list of lists. The first element is the title
+and the second element is the raw html from github.

From 8510a07a9e30f52ef7fcdb0561cd15215707d3f9 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 20 Mar 2012 23:34:53 +0100
Subject: [PATCH 0600/2864] isinstance basestring rather than str

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index d5440e6f..eb9b46e4 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -63,7 +63,7 @@ class Pelican(object):
         self.plugins = self.settings['PLUGINS']
         for plugin in self.plugins:
             # if it's a string, then import it
-            if isinstance(plugin, str):
+            if isinstance(plugin, basestring):
                 log.debug("Loading plugin `{0}' ...".format(plugin))
                 plugin = __import__(plugin, globals(), locals(), 'module')
 

From db3d588f64500590889a519be418533e372b2830 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 21 Mar 2012 00:09:44 +0100
Subject: [PATCH 0601/2864] fix typos and whitespace

---
 pelican/plugins/gravatar.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pelican/plugins/gravatar.py b/pelican/plugins/gravatar.py
index 200bb5a5..4ab8ea9c 100644
--- a/pelican/plugins/gravatar.py
+++ b/pelican/plugins/gravatar.py
@@ -2,39 +2,39 @@ import hashlib
 
 from pelican import signals
 """
-Gravata plugin for Pelican
-==========================
+Gravatar plugin for Pelican
+===========================
 
-Simply add author_gravatar variable in article's context, which contain 
+Simply add author_gravatar variable in article's context, which contains
 the gravatar url.
 
 Settings:
 ---------
 
-Add AUTHOR_EMAIL to your settings file to define default author email
+Add AUTHOR_EMAIL to your settings file to define default author email.
 
 Article metadata:
 ------------------
 
 :email:  article's author email
 
-If one of them are defined the author_gravatar variable is added to 
+If one of them are defined, the author_gravatar variable is added to
 article's context.
 """
 
 def add_gravatar(generator, metadata):
-    
+
     #first check email
     if 'email' not in metadata.keys()\
         and 'AUTHOR_EMAIL' in generator.settings.keys():
             metadata['email'] = generator.settings['AUTHOR_EMAIL']
-            
+
     #then add gravatar url
     if 'email' in metadata.keys():
         gravatar_url = "http://www.gravatar.com/avatar/" + \
                         hashlib.md5(metadata['email'].lower()).hexdigest()
         metadata["author_gravatar"] = gravatar_url
-    
 
-def register():    
+
+def register():
     signals.article_generate_context.connect(add_gravatar)

From 50d4901f8686e6aca965178ae103d259aba638a4 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 21 Mar 2012 00:11:25 +0100
Subject: [PATCH 0602/2864] fix whitespace

---
 pelican/plugins/html_rst_directive.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/plugins/html_rst_directive.py b/pelican/plugins/html_rst_directive.py
index d14000a0..d0a656f5 100644
--- a/pelican/plugins/html_rst_directive.py
+++ b/pelican/plugins/html_rst_directive.py
@@ -10,7 +10,7 @@ Directives
 ----------
 
 .. html::
-    
+
     (HTML code)
 
 
@@ -25,12 +25,12 @@ A search engine:
      <input type="hidden" name="lang" value="en" />
      <input type="submit" value="Seeks !" id="search_button" />
    </form>
-   
+
 
 A contact form:
 
 .. html::
-   
+
     <form method="GET" action="mailto:some email">
       <p>
         <input type="text" placeholder="Subject" name="subject">

From bc7c8c14f42c28d66df78eb403de318b0b01d02c Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Thu, 22 Mar 2012 07:02:06 +0000
Subject: [PATCH 0603/2864] - split main and parse arguments in two function -
 add '.' as default value for the path

---
 pelican/__init__.py | 56 ++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 2065feaa..bbcd96bf 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -139,44 +139,58 @@ class Pelican(object):
         return Writer(self.output_path, settings=self.settings)
 
 
-def main():
+def parse_arguments():
     parser = argparse.ArgumentParser(description="""A tool to generate a
     static blog, with restructured text input files.""",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument(dest='path', nargs='?',
-        help='Path where to find the content files.')
+        help='Path where to find the content files.',
+        default='.')
+
     parser.add_argument('-t', '--theme-path', dest='theme',
         help='Path where to find the theme templates. If not specified, it'
              'will use the default one included with pelican.')
+
     parser.add_argument('-o', '--output', dest='output',
         help='Where to output the generated files. If not specified, a '
              'directory will be created, named "output" in the current path.')
+
     parser.add_argument('-m', '--markup', dest='markup',
         help='The list of markup language to use (rst or md). Please indicate '
              'them separated by commas.')
+
     parser.add_argument('-s', '--settings', dest='settings',
         help='The settings of the application.')
-    parser.add_argument('-d', '--delete-output-directory',
-                        dest='delete_outputdir',
-        action='store_true', help='Delete the output directory.')
-    parser.add_argument('-v', '--verbose', action='store_const',
-                        const=logging.INFO, dest='verbosity',
-                        help='Show all messages.')
-    parser.add_argument('-q', '--quiet', action='store_const',
-                        const=logging.CRITICAL, dest='verbosity',
-                        help='Show only critical errors.')
-    parser.add_argument('-D', '--debug', action='store_const',
-                        const=logging.DEBUG, dest='verbosity',
-                        help='Show all message, including debug messages.')
-    parser.add_argument('--version', action='version', version=__version__,
-            help='Print the pelican version and exit.')
-    parser.add_argument('-r', '--autoreload', dest='autoreload',
-                        action='store_true',
-                        help="Relaunch pelican each time a modification occurs"
-                             " on the content files.")
-    args = parser.parse_args()
 
+    parser.add_argument('-d', '--delete-output-directory',
+        dest='delete_outputdir',
+        action='store_true', help='Delete the output directory.')
+
+    parser.add_argument('-v', '--verbose', action='store_const',
+        const=logging.INFO, dest='verbosity',
+        help='Show all messages.')
+
+    parser.add_argument('-q', '--quiet', action='store_const',
+        const=logging.CRITICAL, dest='verbosity',
+        help='Show only critical errors.')
+
+    parser.add_argument('-D', '--debug', action='store_const',
+        const=logging.DEBUG, dest='verbosity',
+        help='Show all message, including debug messages.')
+
+    parser.add_argument('--version', action='version', version=__version__,
+        help='Print the pelican version and exit.')
+
+    parser.add_argument('-r', '--autoreload', dest='autoreload',
+        action='store_true',
+        help="Relaunch pelican each time a modification occurs"
+                             " on the content files.")
+    return parser.parse_args()
+
+
+def main():
+    args = parse_arguments()
     init(args.verbosity)
     # Split the markup languages only if some have been given. Otherwise,
     # populate the variable with None.

From 1623394da8df841f020b841dd1a9cfd154b74f2f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Thu, 22 Mar 2012 07:58:04 -0700
Subject: [PATCH 0604/2864] Add tests for pull request #262

---
 pelican/settings.py     | 48 ++++++++++++++++++++++++++++++++---------
 samples/pelican.conf.py |  4 +---
 tests/test_settings.py  | 21 ++++++++++++++----
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 59dc5922..dcc52460 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -68,26 +68,45 @@ _DEFAULT_CONFIG = {'PATH': None,
 
 
 def read_settings(filename=None):
+    if filename:
+        local_settings = get_settings_from_file(filename)
+    else:
+        local_settings = _DEFAULT_CONFIG
+    configured_settings = configure_settings(local_settings, None, filename)
+    return configured_settings
+
+
+def get_settings_from_file(filename, default_settings=None):
     """Load a Python file into a dictionary.
     """
-    context = _DEFAULT_CONFIG.copy()
+    if default_settings == None:
+        default_settings = _DEFAULT_CONFIG
+    context = default_settings.copy()
     if filename:
         tempdict = {}
         execfile(filename, tempdict)
         for key in tempdict:
             if key.isupper():
                 context[key] = tempdict[key]
+    return context
 
-        # Make the paths relative to the settings file
+
+def configure_settings(settings, default_settings=None, filename=None):
+    """Provide optimizations, error checking, and warnings for loaded settings"""
+    if default_settings is None:
+        default_settings = _DEFAULT_CONFIG
+
+    # Make the paths relative to the settings file
+    if filename:
         for path in ['PATH', 'OUTPUT_PATH']:
-            if path in context:
-                if context[path] is not None and not isabs(context[path]):
-                    context[path] = os.path.abspath(os.path.normpath(
-                        os.path.join(os.path.dirname(filename), context[path]))
+            if path in settings:
+                if settings[path] is not None and not isabs(settings[path]):
+                    settings[path] = os.path.abspath(os.path.normpath(
+                        os.path.join(os.path.dirname(filename), settings[path]))
                     )
 
     # if locales is not a list, make it one
-    locales = context['LOCALE']
+    locales = settings['LOCALE']
 
     if isinstance(locales, basestring):
         locales = [locales]
@@ -105,11 +124,20 @@ def read_settings(filename=None):
     else:
         log.warn("LOCALE option doesn't contain a correct value")
 
-    if not 'TIMEZONE' in context:
+    # If SITEURL is defined but FEED_DOMAIN isn't, set FEED_DOMAIN = SITEURL
+    if ('SITEURL' in settings) and (not 'FEED_DOMAIN' in settings):
+        settings['FEED_DOMAIN'] = settings['SITEURL']
+
+    # Warn if feeds are generated with both SITEURL & FEED_DOMAIN undefined
+    if (('FEED' in settings) or ('FEED_RSS' in settings)) and (not 'FEED_DOMAIN' in settings):
+        log.warn("Since feed URLs should always be absolute, you should specify "
+                 "FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = "
+                 "http://www.example.com')")
+
+    if not 'TIMEZONE' in settings:
         log.warn("No timezone information specified in the settings. Assuming"
                  " your timezone is UTC for feed generation. Check "
                  "http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "
                  "for more information")
 
-    # set the locale
-    return context
+    return settings
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index de52cd8a..bffe57f6 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -11,7 +11,6 @@ REVERSE_CATEGORY_ORDER = True
 LOCALE = ""
 DEFAULT_PAGINATION = 4
 
-FEED_DOMAIN = SITEURL
 FEED_RSS = 'feeds/all.rss.xml'
 CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'
 
@@ -30,7 +29,7 @@ SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
 DEFAULT_METADATA = (('yeah', 'it is'),)
 
 # static paths will be copied under the same name
-STATIC_PATHS = ["pictures",]
+STATIC_PATHS = ["pictures", ]
 
 # A list of files to copy from the source to the destination
 FILES_TO_COPY = (('extra/robots.txt', 'robots.txt'),)
@@ -38,4 +37,3 @@ FILES_TO_COPY = (('extra/robots.txt', 'robots.txt'),)
 # foobar will not be used, because it's not in caps. All configuration keys
 # have to be in caps
 foobar = "barbaz"
-
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 571f66a1..489c624a 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -5,12 +5,13 @@ except ImportError, e:
 
 from os.path import dirname, abspath, join
 
-from pelican.settings import read_settings, _DEFAULT_CONFIG
+from pelican.settings import read_settings, configure_settings, _DEFAULT_CONFIG
 
 
-class TestSettingsFromFile(unittest2.TestCase):
-    """Providing a file, it should read it, replace the default values and
-    append new values to the settings, if any
+class TestSettingsConfiguration(unittest2.TestCase):
+    """Provided a file, it should read it, replace the default values,
+    append new values to the settings (if any), and apply basic settings
+    optimizations.
     """
     def setUp(self):
         self.PATH = abspath(dirname(__file__))
@@ -35,3 +36,15 @@ class TestSettingsFromFile(unittest2.TestCase):
         """providing no file should return the default values."""
         settings = read_settings(None)
         self.assertDictEqual(settings, _DEFAULT_CONFIG)
+
+    def test_configure_settings(self):
+        """Manipulations to settings should be applied correctly."""
+
+        # FEED_DOMAIN, if undefined, should default to SITEURL
+        settings = {'SITEURL': 'http://blog.notmyidea.org', 'LOCALE': ''}
+        configure_settings(settings)
+        self.assertEqual(settings['FEED_DOMAIN'], 'http://blog.notmyidea.org')
+
+        settings = {'FEED_DOMAIN': 'http://feeds.example.com', 'LOCALE': ''}
+        configure_settings(settings)
+        self.assertEqual(settings['FEED_DOMAIN'], 'http://feeds.example.com')

From dbc4d4786b793d980855ed954691af9cacb83a83 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Thu, 22 Mar 2012 16:30:26 +0000
Subject: [PATCH 0605/2864] on my machine leaving the places to 2 or 1 makes
 this test fail, I suppose because it's too fast, while changing it to 0 makes
 it pass.

---
 tests/test_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_utils.py b/tests/test_utils.py
index 40f710d9..5c83103f 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -90,4 +90,4 @@ class TestUtils(unittest.TestCase):
         os.utime(filename, (t, t))
         changed = utils.files_changed(path, 'rst')
         self.assertEquals(changed, True)
-        self.assertAlmostEqual(utils.LAST_MTIME, t, places=2)
+        self.assertAlmostEqual(utils.LAST_MTIME, t, places=0)

From 0ed6cf77434f8e8a86d11bf632c1253bee1e9b32 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Fri, 23 Mar 2012 09:04:57 +0000
Subject: [PATCH 0606/2864] Follow the PATH variable in settings

---
 pelican/__init__.py | 2 +-
 pelican/settings.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index bbcd96bf..c2766646 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -146,7 +146,7 @@ def parse_arguments():
 
     parser.add_argument(dest='path', nargs='?',
         help='Path where to find the content files.',
-        default='.')
+        default=None)
 
     parser.add_argument('-t', '--theme-path', dest='theme',
         help='Path where to find the theme templates. If not specified, it'
diff --git a/pelican/settings.py b/pelican/settings.py
index 0c66b6f0..ea7817ae 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -11,7 +11,7 @@ logger = logging.getLogger(__name__)
 
 DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
                               "themes/notmyidea"])
-_DEFAULT_CONFIG = {'PATH': None,
+_DEFAULT_CONFIG = {'PATH': '.',
                    'ARTICLE_DIR': '',
                    'ARTICLE_EXCLUDES': ('pages',),
                    'PAGE_DIR': 'pages',

From 65b93dbfd4cf01d650914228b727307e9441b9aa Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Fri, 23 Mar 2012 07:16:23 -0700
Subject: [PATCH 0607/2864] Remove trailing slash from SITEURL if present

---
 docs/settings.rst      |  9 +++++----
 pelican/settings.py    | 12 +++++++++---
 tests/test_settings.py |  5 +++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e4a174ad..1ed36844 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -65,10 +65,11 @@ Setting name (default value)                        What does it do?
 `SITEURL`                                           Base URL of your website. Not defined by default,
                                                     which means the base URL is assumed to be "/" with a
                                                     root-relative URL structure. If `SITEURL` is specified
-                                                    explicitly, URLs will be generated with an absolute
-                                                    URL structure (including the domain). If you want to
-                                                    use relative URLs instead of root-relative or absolute
-                                                    URLs, you should instead use the `RELATIVE_URL` setting.
+                                                    explicitly, there should be no trailing slash at the end,
+                                                    and URLs will be generated with an absolute URL structure
+                                                    (including the domain). If you want to use relative URLs
+                                                    instead of root-relative or absolute URLs, you should
+                                                    instead use the `RELATIVE_URL` setting.
 `STATIC_PATHS` (``['images']``)                     The static paths you want to have accessible
                                                     on the output path "static". By default,
                                                     Pelican will copy the 'images' folder to the
diff --git a/pelican/settings.py b/pelican/settings.py
index ea7817ae..9dea1e94 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -128,9 +128,15 @@ def configure_settings(settings, default_settings=None, filename=None):
     else:
         logger.warn("LOCALE option doesn't contain a correct value")
 
-    # If SITEURL is defined but FEED_DOMAIN isn't, set FEED_DOMAIN = SITEURL
-    if ('SITEURL' in settings) and (not 'FEED_DOMAIN' in settings):
-        settings['FEED_DOMAIN'] = settings['SITEURL']
+    if ('SITEURL' in settings):
+        # If SITEURL has a trailing slash, remove it and provide a warning
+        siteurl = settings['SITEURL']
+        if (siteurl[len(siteurl) - 1:] == '/'):
+            settings['SITEURL'] = siteurl[:-1]
+            logger.warn("Removed extraneous trailing slash from SITEURL.")
+        # If SITEURL is defined but FEED_DOMAIN isn't, set FEED_DOMAIN = SITEURL
+        if not 'FEED_DOMAIN' in settings:
+            settings['FEED_DOMAIN'] = settings['SITEURL']
 
     # Warn if feeds are generated with both SITEURL & FEED_DOMAIN undefined
     if (('FEED' in settings) or ('FEED_RSS' in settings)) and (not 'FEED_DOMAIN' in settings):
diff --git a/tests/test_settings.py b/tests/test_settings.py
index fd683d7f..25df74bd 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -36,6 +36,11 @@ class TestSettingsConfiguration(unittest.TestCase):
     def test_configure_settings(self):
         """Manipulations to settings should be applied correctly."""
 
+        # SITEURL should not have a trailing slash
+        settings = {'SITEURL': 'http://blog.notmyidea.org/', 'LOCALE': ''}
+        configure_settings(settings)
+        self.assertEqual(settings['SITEURL'], 'http://blog.notmyidea.org')
+
         # FEED_DOMAIN, if undefined, should default to SITEURL
         settings = {'SITEURL': 'http://blog.notmyidea.org', 'LOCALE': ''}
         configure_settings(settings)

From fc584969c9fca21c83ad8c88efaaee341be626bc Mon Sep 17 00:00:00 2001
From: m-r-r <raybaudroigm@gmail.com>
Date: Fri, 23 Mar 2012 19:31:44 +0100
Subject: [PATCH 0608/2864] patch for bug #271 (Unicode issue in category name)

---
 pelican/contents.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index ee6b9637..8e6f2dca 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -173,14 +173,14 @@ class URLWrapper(object):
         return self.name == unicode(other)
 
     def __str__(self):
-        return str(self.name)
+        return str(self.name.encode('utf-8', 'replace'))
 
     def __unicode__(self):
         return self.name
 
     def _from_settings(self, key):
         setting = "%s_%s" % (self.__class__.__name__.upper(), key)
-        return self.settings[setting].format(**self.as_dict())
+        return unicode(self.settings[setting]).format(**self.as_dict())
 
     url = property(functools.partial(_from_settings, key='URL'))
     save_as = property(functools.partial(_from_settings, key='SAVE_AS'))

From 4efca13c33b8bf122cc56d78478f49557ab52fff Mon Sep 17 00:00:00 2001
From: draftcode <draftcode@gmail.com>
Date: Fri, 16 Mar 2012 15:04:06 +0900
Subject: [PATCH 0609/2864] Fix a bug that ArticlesGenerator doesn't see
 DEFAULT_CATEGORY.

When you set ARTICLE_DIR which is not equal to PATH, ArticlesGenerator
doesn't use DEFAULT_CATEGORY but use ARTICLE_DIR's dirname.
---
 pelican/generators.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 4e756213..d7ebb0b0 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -219,9 +219,10 @@ class ArticlesGenerator(Generator):
     def generate_context(self):
         """change the context"""
 
+        article_path = os.path.join(self.path, self.settings['ARTICLE_DIR'])
         all_articles = []
         for f in self.get_files(
-                os.path.join(self.path, self.settings['ARTICLE_DIR']),
+                article_path,
                 exclude=self.settings['ARTICLE_EXCLUDES']):
             try:
                 content, metadata = read_file(f, settings=self.settings)
@@ -232,7 +233,7 @@ class ArticlesGenerator(Generator):
             # if no category is set, use the name of the path as a category
             if 'category' not in metadata:
 
-                if os.path.dirname(f) == self.path:
+                if os.path.dirname(f) == article_path:
                     category = self.settings['DEFAULT_CATEGORY']
                 else:
                     category = os.path.basename(os.path.dirname(f))\

From cffb44891a8eb436fb4070735873ee774a26eb75 Mon Sep 17 00:00:00 2001
From: draftcode <draftcode@gmail.com>
Date: Sat, 24 Mar 2012 13:52:03 +0900
Subject: [PATCH 0610/2864] Add an test related to articles' category.

---
 .../TestCategory/article_with_category.rst    |  6 +++++
 .../TestCategory/article_without_category.rst |  4 +++
 tests/content/article_without_category.rst    |  6 +++++
 tests/test_generators.py                      | 25 ++++++++++++++++++-
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 tests/content/TestCategory/article_with_category.rst
 create mode 100644 tests/content/TestCategory/article_without_category.rst
 create mode 100644 tests/content/article_without_category.rst

diff --git a/tests/content/TestCategory/article_with_category.rst b/tests/content/TestCategory/article_with_category.rst
new file mode 100644
index 00000000..7ed6e6d1
--- /dev/null
+++ b/tests/content/TestCategory/article_with_category.rst
@@ -0,0 +1,6 @@
+This is an article with category !
+##################################
+
+:category: yeah
+
+This article should be in 'yeah' category.
diff --git a/tests/content/TestCategory/article_without_category.rst b/tests/content/TestCategory/article_without_category.rst
new file mode 100644
index 00000000..4bc5d78d
--- /dev/null
+++ b/tests/content/TestCategory/article_without_category.rst
@@ -0,0 +1,4 @@
+This is an article without category !
+#####################################
+
+This article should be in 'TestCategory' category.
diff --git a/tests/content/article_without_category.rst b/tests/content/article_without_category.rst
new file mode 100644
index 00000000..ff47f6ef
--- /dev/null
+++ b/tests/content/article_without_category.rst
@@ -0,0 +1,6 @@
+
+This is an article without category !
+#####################################
+
+This article should be in the DEFAULT_CATEGORY.
+
diff --git a/tests/test_generators.py b/tests/test_generators.py
index e30b0c98..45461cb7 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 
 from mock import MagicMock
+import os
 
 from pelican.generators import ArticlesGenerator
 from pelican.settings import _DEFAULT_CONFIG
 from .support import unittest
 
+CUR_DIR = os.path.dirname(__file__)
 
 class TestArticlesGenerator(unittest.TestCase):
 
@@ -13,7 +15,7 @@ class TestArticlesGenerator(unittest.TestCase):
 
         generator = ArticlesGenerator(None, {'FEED': _DEFAULT_CONFIG['FEED']},
                                       None, _DEFAULT_CONFIG['THEME'], None,
-                                      None)
+                                      _DEFAULT_CONFIG['MARKUP'])
         writer = MagicMock()
         generator.generate_feeds(writer)
         writer.write_feed.assert_called_with([], None, 'feeds/all.atom.xml')
@@ -23,3 +25,24 @@ class TestArticlesGenerator(unittest.TestCase):
         writer = MagicMock()
         generator.generate_feeds(writer)
         self.assertFalse(writer.write_feed.called)
+
+    def test_generate_context(self):
+
+        settings = _DEFAULT_CONFIG
+        settings['ARTICLE_DIR'] = 'content'
+        settings['DEFAULT_CATEGORY'] = 'Default'
+        generator = ArticlesGenerator(settings.copy(), settings, CUR_DIR,
+                                      _DEFAULT_CONFIG['THEME'], None,
+                                      _DEFAULT_CONFIG['MARKUP'])
+        generator.generate_context()
+        for article in generator.articles:
+            relfilepath = os.path.relpath(article.filename, CUR_DIR)
+            if relfilepath == os.path.join("TestCategory",
+                                           "article_with_category.rst"):
+                self.assertEquals(article.category.name, 'yeah')
+            elif relfilepath == os.path.join("TestCategory",
+                                             "article_without_category.rst"):
+                self.assertEquals(article.category.name, 'TestCategory')
+            elif relfilepath == "article_without_category.rst":
+                self.assertEquals(article.category.name, 'Default')
+

From 9df2e79fb9031fcbd7f6220545bca3cc32f1077b Mon Sep 17 00:00:00 2001
From: draftcode <draftcode@gmail.com>
Date: Sat, 24 Mar 2012 14:36:47 +0900
Subject: [PATCH 0611/2864] Fix #276 #269.

---
 tests/test_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_utils.py b/tests/test_utils.py
index 49874076..e738e295 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -85,4 +85,4 @@ class TestUtils(unittest.TestCase):
         os.utime(filename, (t, t))
         changed = utils.files_changed(path, 'rst')
         self.assertEquals(changed, True)
-        self.assertAlmostEqual(utils.LAST_MTIME, t, places=0)
+        self.assertAlmostEqual(utils.LAST_MTIME, t, delta=1)

From 5aa12b2319e66546370e354c5f3a867d52b3c6a6 Mon Sep 17 00:00:00 2001
From: m-r-r <raybaudroigm@gmail.com>
Date: Sun, 25 Mar 2012 18:47:14 +0200
Subject: [PATCH 0612/2864] pelican/log.py simplified a bit

---
 pelican/log.py | 50 +++++++++++++++++---------------------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index 64fa87bd..9590d7f6 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -11,16 +11,6 @@ from logging import Formatter, getLogger, StreamHandler, DEBUG
 
 RESET_TERM = u'\033[0;m'
 
-
-def start_color(index):
-    return u'\033[1;{0}m'.format(index)
-
-
-def term_color(color):
-    code = COLOR_CODES[color]
-    return lambda text: start_color(code) + unicode(text) + RESET_TERM
-
-
 COLOR_CODES = {
     'red': 31,
     'yellow': 33,
@@ -30,7 +20,11 @@ COLOR_CODES = {
     'bggrey': 100,
 }
 
-ANSI = dict((col, term_color(col)) for col in COLOR_CODES)
+
+def ansi(color, text):
+    """Wrap text in an ansi escape sequence"""
+    code = COLOR_CODES[color]
+    return u'\033[1;{0}m{1}{2}'.format(code, text, RESET_TERM)
 
 
 class ANSIFormatter(Formatter):
@@ -41,17 +35,17 @@ class ANSIFormatter(Formatter):
 
     def format(self, record):
         if record.levelname is 'INFO':
-            return ANSI['cyan']('-> ') + unicode(record.msg)
+            return ansi('cyan', '-> ') + unicode(record.msg)
         elif record.levelname is 'WARNING':
-            return ANSI['yellow'](record.levelname) + ': ' + unicode(record.msg)
+            return ansi('yellow', record.levelname) + ': ' + unicode(record.msg)
         elif record.levelname is 'ERROR':
-            return ANSI['red'](record.levelname) + ': ' + unicode(record.msg)
+            return ansi('red', record.levelname) + ': ' + unicode(record.msg)
         elif record.levelname is 'CRITICAL':
-            return ANSI['bgred'](record.levelname) + ': ' + unicode(record.msg)
+            return ansi('bgred', record.levelname) + ': ' + unicode(record.msg)
         elif record.levelname is 'DEBUG':
-            return ANSI['bggrey'](record.levelname) + ': ' + unicode(record.msg)
+            return ansi('bggrey', record.levelname) + ': ' + unicode(record.msg)
         else:
-            return ANSI['white'](record.levelname) + ': ' + unicode(record.msg)
+            return ansi('white', record.levelname) + ': ' + unicode(record.msg)
 
 
 class TextFormatter(Formatter):
@@ -66,24 +60,14 @@ class TextFormatter(Formatter):
             return record.levelname + ': ' + record.msg
 
 
-class DummyFormatter(object):
-    """
-    A dummy class.
-    Return an instance of the appropriate formatter (ANSIFormatter if
-    sys.stdout.isatty() is True, else TextFormatter)
-    """
-
-    def __new__(cls, *args, **kwargs):
-        if os.isatty(sys.stdout.fileno())\
-           and not sys.platform.startswith('win'):
-            return ANSIFormatter(*args, **kwargs)
-        else:
-            return TextFormatter(*args, **kwargs)
-
-
 def init(level=None, logger=getLogger(), handler=StreamHandler()):
     logger = logging.getLogger()
-    fmt = DummyFormatter()
+
+    if os.isatty(sys.stdout.fileno()) \
+       and not sys.platform.startswith('win'):
+        fmt = ANSIFormatter()
+    else:
+        fmt = TextFormatter()
     handler.setFormatter(fmt)
     logger.addHandler(handler)
 

From 4df6179954e53a9fc7b86572295b2de4e664e0a1 Mon Sep 17 00:00:00 2001
From: Mike Yumatov <mike@yumatov.org>
Date: Sun, 25 Mar 2012 21:39:41 +0400
Subject: [PATCH 0613/2864] Fix markup for single-paragraph summary in reST
 metadata

---
 pelican/readers.py    | 4 ++++
 tests/test_readers.py | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 2e269647..917d8614 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -43,6 +43,10 @@ class Reader(object):
 
 class _FieldBodyTranslator(HTMLTranslator):
 
+    def __init__(self, document):
+        HTMLTranslator.__init__(self, document)
+        self.compact_p = None
+
     def astext(self):
         return ''.join(self.body)
 
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 3e830e17..7b9316b5 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -23,8 +23,9 @@ class RstReaderTest(unittest.TestCase):
             'category': 'yeah',
             'author': u'Alexis Métaireau',
             'title': 'This is a super article !',
-            'summary': 'Multi-line metadata should be supported\nas well as'\
-                       ' <strong>inline markup</strong>.',
+            'summary': u'<p class="first last">Multi-line metadata should be'\
+                       u' supported\nas well as <strong>inline'\
+                       u' markup</strong>.</p>\n',
             'date': datetime.datetime(2010, 12, 2, 10, 14),
             'tags': ['foo', 'bar', 'foobar'],
             'custom_field': 'http://notmyidea.org',

From ed58799f1324e5eef515eefb695e08928b7569be Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Mar 2012 13:33:07 +0200
Subject: [PATCH 0614/2864] don't override globals settings

---
 tests/test_generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index 45461cb7..bc5c8b73 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -28,7 +28,7 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_context(self):
 
-        settings = _DEFAULT_CONFIG
+        settings = _DEFAULT_CONFIG.copy()
         settings['ARTICLE_DIR'] = 'content'
         settings['DEFAULT_CATEGORY'] = 'Default'
         generator = ArticlesGenerator(settings.copy(), settings, CUR_DIR,

From 5ac3fdec50d0addd00f073f5492b8bd1ad408dc4 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Mar 2012 13:40:40 +0200
Subject: [PATCH 0615/2864] add output files for "samples" so that we can make
 functionnal testing

---
 .gitignore                                    |   1 -
 .../basic/a-markdown-powered-article.html     |  89 ++++
 tests/output/basic/archives.html              |  94 ++++
 tests/output/basic/article-1.html             |  90 ++++
 tests/output/basic/article-2.html             |  90 ++++
 tests/output/basic/article-3.html             |  90 ++++
 .../output/basic/author/alexis-metaireau.html | 151 +++++++
 tests/output/basic/author/bruno.html          | 281 ++++++++++++
 tests/output/basic/categories.html            |  74 +++
 tests/output/basic/category/bar.html          | 109 +++++
 tests/output/basic/category/cat1.html         | 208 +++++++++
 tests/output/basic/category/content.html      | 146 ++++++
 tests/output/basic/category/yeah.html         | 110 +++++
 .../output/basic/drafts/a-draft-article.html  |  91 ++++
 tests/output/basic/feeds/all-en.atom.xml      |  25 ++
 tests/output/basic/feeds/all-fr.atom.xml      |   4 +
 tests/output/basic/feeds/all.atom.xml         |  25 ++
 tests/output/basic/feeds/bar.atom.xml         |   8 +
 tests/output/basic/feeds/cat1.atom.xml        |   5 +
 tests/output/basic/feeds/content.atom.xml     |   4 +
 tests/output/basic/feeds/yeah.atom.xml        |  14 +
 tests/output/basic/index.html                 | 359 +++++++++++++++
 tests/output/basic/oh-yeah-fr.html            |  95 ++++
 tests/output/basic/oh-yeah.html               | 100 +++++
 .../basic/pages/this-is-a-test-page.html      |  70 +++
 tests/output/basic/second-article-fr.html     |  95 ++++
 tests/output/basic/second-article.html        |  95 ++++
 tests/output/basic/tag/bar.html               | 229 ++++++++++
 tests/output/basic/tag/baz.html               | 151 +++++++
 tests/output/basic/tag/foo.html               | 185 ++++++++
 tests/output/basic/tag/foobar.html            | 110 +++++
 tests/output/basic/tag/oh.html                | 109 +++++
 tests/output/basic/tag/yeah.html              | 109 +++++
 tests/output/basic/tags.html                  |   0
 tests/output/basic/theme/css/main.css         | 423 ++++++++++++++++++
 tests/output/basic/theme/css/pygment.css      | 205 +++++++++
 tests/output/basic/theme/css/reset.css        |  52 +++
 tests/output/basic/theme/css/typogrify.css    |   3 +
 tests/output/basic/theme/css/wide.css         |  43 ++
 .../basic/theme/images/icons/delicious.png    | Bin 0 -> 963 bytes
 .../basic/theme/images/icons/lastfm.png       | Bin 0 -> 980 bytes
 .../basic/theme/images/icons/linkedin.png     | Bin 0 -> 376 bytes
 tests/output/basic/theme/images/icons/rss.png | Bin 0 -> 896 bytes
 .../basic/theme/images/icons/twitter.png      | Bin 0 -> 835 bytes
 .../output/basic/this-is-a-super-article.html | 101 +++++
 tests/output/basic/unbelievable.html          |  90 ++++
 .../custom/a-markdown-powered-article.html    | 157 +++++++
 tests/output/custom/archives.html             | 149 ++++++
 tests/output/custom/article-1.html            | 158 +++++++
 tests/output/custom/article-2.html            | 158 +++++++
 tests/output/custom/article-3.html            | 158 +++++++
 .../custom/author/alexis-metaireau.html       | 271 +++++++++++
 .../custom/author/alexis-metaireau2.html      | 291 ++++++++++++
 tests/output/custom/categories.html           | 129 ++++++
 tests/output/custom/category/bar.html         | 170 +++++++
 tests/output/custom/category/cat1.html        | 269 +++++++++++
 tests/output/custom/category/content.html     | 207 +++++++++
 tests/output/custom/category/yeah.html        | 171 +++++++
 .../output/custom/drafts/a-draft-article.html | 159 +++++++
 tests/output/custom/feeds/all-en.atom.xml     |  25 ++
 tests/output/custom/feeds/all-fr.atom.xml     |   4 +
 tests/output/custom/feeds/all.atom.xml        |  25 ++
 tests/output/custom/feeds/all.rss.xml         |  25 ++
 tests/output/custom/feeds/bar.atom.xml        |   8 +
 tests/output/custom/feeds/bar.rss.xml         |   8 +
 tests/output/custom/feeds/cat1.atom.xml       |   5 +
 tests/output/custom/feeds/cat1.rss.xml        |   5 +
 tests/output/custom/feeds/content.atom.xml    |   4 +
 tests/output/custom/feeds/content.rss.xml     |   4 +
 tests/output/custom/feeds/yeah.atom.xml       |  14 +
 tests/output/custom/feeds/yeah.rss.xml        |  14 +
 tests/output/custom/index.html                | 276 ++++++++++++
 tests/output/custom/index2.html               | 286 ++++++++++++
 tests/output/custom/oh-yeah-fr.html           | 163 +++++++
 tests/output/custom/oh-yeah.html              | 168 +++++++
 .../custom/pages/this-is-a-test-page.html     | 125 ++++++
 tests/output/custom/robots.txt                |   2 +
 tests/output/custom/second-article-fr.html    | 163 +++++++
 tests/output/custom/second-article.html       | 163 +++++++
 .../output/custom/static/pictures/Fat_Cat.jpg | Bin 0 -> 62675 bytes
 tests/output/custom/static/pictures/Sushi.jpg | Bin 0 -> 28992 bytes
 .../custom/static/pictures/Sushi_Macro.jpg    | Bin 0 -> 38594 bytes
 tests/output/custom/tag/bar.html              | 290 ++++++++++++
 tests/output/custom/tag/baz.html              | 212 +++++++++
 tests/output/custom/tag/foo.html              | 246 ++++++++++
 tests/output/custom/tag/foobar.html           | 171 +++++++
 tests/output/custom/tag/oh.html               | 170 +++++++
 tests/output/custom/tag/yeah.html             | 170 +++++++
 tests/output/custom/tags.html                 |   0
 tests/output/custom/theme/css/main.css        | 423 ++++++++++++++++++
 tests/output/custom/theme/css/pygment.css     | 205 +++++++++
 tests/output/custom/theme/css/reset.css       |  52 +++
 tests/output/custom/theme/css/typogrify.css   |   3 +
 tests/output/custom/theme/css/wide.css        |  43 ++
 .../custom/theme/images/icons/delicious.png   | Bin 0 -> 963 bytes
 .../custom/theme/images/icons/lastfm.png      | Bin 0 -> 980 bytes
 .../custom/theme/images/icons/linkedin.png    | Bin 0 -> 376 bytes
 .../output/custom/theme/images/icons/rss.png  | Bin 0 -> 896 bytes
 .../custom/theme/images/icons/twitter.png     | Bin 0 -> 835 bytes
 .../custom/this-is-a-super-article.html       | 169 +++++++
 tests/output/custom/unbelievable.html         | 158 +++++++
 101 files changed, 10578 insertions(+), 1 deletion(-)
 create mode 100644 tests/output/basic/a-markdown-powered-article.html
 create mode 100644 tests/output/basic/archives.html
 create mode 100644 tests/output/basic/article-1.html
 create mode 100644 tests/output/basic/article-2.html
 create mode 100644 tests/output/basic/article-3.html
 create mode 100644 tests/output/basic/author/alexis-metaireau.html
 create mode 100644 tests/output/basic/author/bruno.html
 create mode 100644 tests/output/basic/categories.html
 create mode 100644 tests/output/basic/category/bar.html
 create mode 100644 tests/output/basic/category/cat1.html
 create mode 100644 tests/output/basic/category/content.html
 create mode 100644 tests/output/basic/category/yeah.html
 create mode 100644 tests/output/basic/drafts/a-draft-article.html
 create mode 100644 tests/output/basic/feeds/all-en.atom.xml
 create mode 100644 tests/output/basic/feeds/all-fr.atom.xml
 create mode 100644 tests/output/basic/feeds/all.atom.xml
 create mode 100644 tests/output/basic/feeds/bar.atom.xml
 create mode 100644 tests/output/basic/feeds/cat1.atom.xml
 create mode 100644 tests/output/basic/feeds/content.atom.xml
 create mode 100644 tests/output/basic/feeds/yeah.atom.xml
 create mode 100644 tests/output/basic/index.html
 create mode 100644 tests/output/basic/oh-yeah-fr.html
 create mode 100644 tests/output/basic/oh-yeah.html
 create mode 100644 tests/output/basic/pages/this-is-a-test-page.html
 create mode 100644 tests/output/basic/second-article-fr.html
 create mode 100644 tests/output/basic/second-article.html
 create mode 100644 tests/output/basic/tag/bar.html
 create mode 100644 tests/output/basic/tag/baz.html
 create mode 100644 tests/output/basic/tag/foo.html
 create mode 100644 tests/output/basic/tag/foobar.html
 create mode 100644 tests/output/basic/tag/oh.html
 create mode 100644 tests/output/basic/tag/yeah.html
 create mode 100644 tests/output/basic/tags.html
 create mode 100644 tests/output/basic/theme/css/main.css
 create mode 100644 tests/output/basic/theme/css/pygment.css
 create mode 100644 tests/output/basic/theme/css/reset.css
 create mode 100644 tests/output/basic/theme/css/typogrify.css
 create mode 100644 tests/output/basic/theme/css/wide.css
 create mode 100644 tests/output/basic/theme/images/icons/delicious.png
 create mode 100644 tests/output/basic/theme/images/icons/lastfm.png
 create mode 100644 tests/output/basic/theme/images/icons/linkedin.png
 create mode 100644 tests/output/basic/theme/images/icons/rss.png
 create mode 100644 tests/output/basic/theme/images/icons/twitter.png
 create mode 100644 tests/output/basic/this-is-a-super-article.html
 create mode 100644 tests/output/basic/unbelievable.html
 create mode 100644 tests/output/custom/a-markdown-powered-article.html
 create mode 100644 tests/output/custom/archives.html
 create mode 100644 tests/output/custom/article-1.html
 create mode 100644 tests/output/custom/article-2.html
 create mode 100644 tests/output/custom/article-3.html
 create mode 100644 tests/output/custom/author/alexis-metaireau.html
 create mode 100644 tests/output/custom/author/alexis-metaireau2.html
 create mode 100644 tests/output/custom/categories.html
 create mode 100644 tests/output/custom/category/bar.html
 create mode 100644 tests/output/custom/category/cat1.html
 create mode 100644 tests/output/custom/category/content.html
 create mode 100644 tests/output/custom/category/yeah.html
 create mode 100644 tests/output/custom/drafts/a-draft-article.html
 create mode 100644 tests/output/custom/feeds/all-en.atom.xml
 create mode 100644 tests/output/custom/feeds/all-fr.atom.xml
 create mode 100644 tests/output/custom/feeds/all.atom.xml
 create mode 100644 tests/output/custom/feeds/all.rss.xml
 create mode 100644 tests/output/custom/feeds/bar.atom.xml
 create mode 100644 tests/output/custom/feeds/bar.rss.xml
 create mode 100644 tests/output/custom/feeds/cat1.atom.xml
 create mode 100644 tests/output/custom/feeds/cat1.rss.xml
 create mode 100644 tests/output/custom/feeds/content.atom.xml
 create mode 100644 tests/output/custom/feeds/content.rss.xml
 create mode 100644 tests/output/custom/feeds/yeah.atom.xml
 create mode 100644 tests/output/custom/feeds/yeah.rss.xml
 create mode 100644 tests/output/custom/index.html
 create mode 100644 tests/output/custom/index2.html
 create mode 100644 tests/output/custom/oh-yeah-fr.html
 create mode 100644 tests/output/custom/oh-yeah.html
 create mode 100644 tests/output/custom/pages/this-is-a-test-page.html
 create mode 100644 tests/output/custom/robots.txt
 create mode 100644 tests/output/custom/second-article-fr.html
 create mode 100644 tests/output/custom/second-article.html
 create mode 100644 tests/output/custom/static/pictures/Fat_Cat.jpg
 create mode 100644 tests/output/custom/static/pictures/Sushi.jpg
 create mode 100644 tests/output/custom/static/pictures/Sushi_Macro.jpg
 create mode 100644 tests/output/custom/tag/bar.html
 create mode 100644 tests/output/custom/tag/baz.html
 create mode 100644 tests/output/custom/tag/foo.html
 create mode 100644 tests/output/custom/tag/foobar.html
 create mode 100644 tests/output/custom/tag/oh.html
 create mode 100644 tests/output/custom/tag/yeah.html
 create mode 100644 tests/output/custom/tags.html
 create mode 100644 tests/output/custom/theme/css/main.css
 create mode 100644 tests/output/custom/theme/css/pygment.css
 create mode 100644 tests/output/custom/theme/css/reset.css
 create mode 100644 tests/output/custom/theme/css/typogrify.css
 create mode 100644 tests/output/custom/theme/css/wide.css
 create mode 100644 tests/output/custom/theme/images/icons/delicious.png
 create mode 100644 tests/output/custom/theme/images/icons/lastfm.png
 create mode 100644 tests/output/custom/theme/images/icons/linkedin.png
 create mode 100644 tests/output/custom/theme/images/icons/rss.png
 create mode 100644 tests/output/custom/theme/images/icons/twitter.png
 create mode 100644 tests/output/custom/this-is-a-super-article.html
 create mode 100644 tests/output/custom/unbelievable.html

diff --git a/.gitignore b/.gitignore
index 5bb92c09..4029b327 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,5 @@ docs/_build
 docs/fr/_build
 build
 dist
-output
 tags
 .tox
diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
new file mode 100644
index 00000000..32a863d6
--- /dev/null
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A markdown powered article</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to A markdown powered article">A markdown powered article</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Wed 20 April 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>You're mutually oblivious.</p>
+        </div><!-- /.entry-content -->
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
new file mode 100644
index 00000000..840dfa02
--- /dev/null
+++ b/tests/output/basic/archives.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+        
+<section id="content" class="body">
+<h1>Archives for A Pelican Blog</h1>
+
+<dl>
+
+    <dt>Fri 15 October 2010</dt>
+    <dd><a href="unbelievable.html">Unbelievable !</a></dd>
+
+    <dt>Wed 20 October 2010</dt>
+    <dd><a href="oh-yeah.html">Oh yeah !</a></dd>
+
+    <dt>Thu 02 December 2010</dt>
+    <dd><a href="this-is-a-super-article.html">This is a super article !</a></dd>
+
+    <dt>Thu 17 February 2011</dt>
+    <dd><a href="article-1.html">Article 1</a></dd>
+
+    <dt>Thu 17 February 2011</dt>
+    <dd><a href="article-2.html">Article 2</a></dd>
+
+    <dt>Thu 17 February 2011</dt>
+    <dd><a href="article-3.html">Article 3</a></dd>
+
+    <dt>Wed 20 April 2011</dt>
+    <dd><a href="a-markdown-powered-article.html">A markdown powered article</a></dd>
+
+    <dt>Wed 29 February 2012</dt>
+    <dd><a href="second-article.html">Second article</a></dd>
+
+</dl>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
new file mode 100644
index 00000000..c1199371
--- /dev/null
+++ b/tests/output/basic/article-1.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Article 1</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>Article 1</p>
+
+        </div><!-- /.entry-content -->
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
new file mode 100644
index 00000000..62dd0368
--- /dev/null
+++ b/tests/output/basic/article-2.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Article 2</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>Article 2</p>
+
+        </div><!-- /.entry-content -->
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
new file mode 100644
index 00000000..9fd6df0a
--- /dev/null
+++ b/tests/output/basic/article-3.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Article 3</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>Article 3</p>
+
+        </div><!-- /.entry-content -->
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
new file mode 100644
index 00000000..eda5498d
--- /dev/null
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - Alexis Métaireau</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href=".././oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info -->
+                Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.
+                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/author/bruno.html b/tests/output/basic/author/bruno.html
new file mode 100644
index 00000000..fdc1da37
--- /dev/null
+++ b/tests/output/basic/author/bruno.html
@@ -0,0 +1,281 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - bruno</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././a-markdown-powered-article.html">A markdown powered article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Wed 20 April 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 1</p>
+
+                <a class="readmore" href=".././article-1.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 2</p>
+
+                <a class="readmore" href=".././article-2.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 3</p>
+
+                <a class="readmore" href=".././article-3.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <p>This is some article, in english</p>
+
+                <a class="readmore" href=".././second-article.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Or completely awesome. Depends the needs.</p>
+
+                <a class="readmore" href=".././unbelievable.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
new file mode 100644
index 00000000..5ffb220d
--- /dev/null
+++ b/tests/output/basic/categories.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+        
+<ul>
+
+    <li><a href="category/content.html">content</a></li>
+
+    <li><a href="category/cat1.html">cat1</a></li>
+
+    <li><a href="category/bar.html">bar</a></li>
+
+    <li><a href="category/yeah.html">yeah</a></li>
+
+</ul>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
new file mode 100644
index 00000000..07dcae9e
--- /dev/null
+++ b/tests/output/basic/category/bar.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - bar</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li class="active"><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href=".././oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                </article>
+                
+                    
+                
+            </aside><!-- /#featured -->
+            
+        
+        
+        
+
+    
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
new file mode 100644
index 00000000..bee9d918
--- /dev/null
+++ b/tests/output/basic/category/cat1.html
@@ -0,0 +1,208 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - cat1</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li class="active"><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././a-markdown-powered-article.html">A markdown powered article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Wed 20 April 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 1</p>
+
+                <a class="readmore" href=".././article-1.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 2</p>
+
+                <a class="readmore" href=".././article-2.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 3</p>
+
+                <a class="readmore" href=".././article-3.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/category/content.html b/tests/output/basic/category/content.html
new file mode 100644
index 00000000..1c09459d
--- /dev/null
+++ b/tests/output/basic/category/content.html
@@ -0,0 +1,146 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - content</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li class="active"><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Or completely awesome. Depends the needs.</p>
+
+                <a class="readmore" href=".././unbelievable.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
new file mode 100644
index 00000000..cc146893
--- /dev/null
+++ b/tests/output/basic/category/yeah.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - yeah</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li class="active"><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info --><p>Some content here !</p>
+<div class="section" id="this-is-a-simple-title">
+<h2>This is a simple title</h2>
+<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<pre class="literal-block">
+&gt;&gt;&gt; from ipdb import set_trace
+&gt;&gt;&gt; set_trace()
+</pre>
+<p>→ And now try with some utf8 hell: ééé</p>
+</div>
+
+                </article>
+                
+                    
+                
+            </aside><!-- /#featured -->
+            
+        
+        
+        
+
+    
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
new file mode 100644
index 00000000..59b6223f
--- /dev/null
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A draft article</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li class="active"><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to A draft article">A draft article</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2012-03-02T14:01:01">
+                Fri 02 March 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>This is a draft article, it should live under the /drafts/ folder and not be
+listed anywhere else.</p>
+
+        </div><!-- /.entry-content -->
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
new file mode 100644
index 00000000..c9fe8270
--- /dev/null
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/all-en.atom.xml" rel="self"></link><id>../.</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>.././a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>.././unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
new file mode 100644
index 00000000..606e5186
--- /dev/null
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/all-fr.atom.xml" rel="self"></link><id>../.</id><updated>2012-03-02T14:01:01Z</updated><entry><title>Trop bien !</title><link href=".././oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01Z</updated><author><name>bruno</name></author><id>.././oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href=".././second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
new file mode 100644
index 00000000..3bb7d2fd
--- /dev/null
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/all.atom.xml" rel="self"></link><id>../.</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>.././a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>.././unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/bar.atom.xml b/tests/output/basic/feeds/bar.atom.xml
new file mode 100644
index 00000000..6ce45518
--- /dev/null
+++ b/tests/output/basic/feeds/bar.atom.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/bar.atom.xml" rel="self"></link><id>../.</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
new file mode 100644
index 00000000..f66c2e73
--- /dev/null
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/cat1.atom.xml" rel="self"></link><id>../.</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>.././a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/content.atom.xml b/tests/output/basic/feeds/content.atom.xml
new file mode 100644
index 00000000..0cf53aa7
--- /dev/null
+++ b/tests/output/basic/feeds/content.atom.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/content.atom.xml" rel="self"></link><id>../.</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>.././unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/yeah.atom.xml b/tests/output/basic/feeds/yeah.atom.xml
new file mode 100644
index 00000000..7fd8e9f2
--- /dev/null
+++ b/tests/output/basic/feeds/yeah.atom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/yeah.atom.xml" rel="self"></link><id>../.</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
new file mode 100644
index 00000000..be97e8c8
--- /dev/null
+++ b/tests/output/basic/index.html
@@ -0,0 +1,359 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="./second-article.html">Second article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href="./second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./a-markdown-powered-article.html" rel="bookmark" title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Wed 20 April 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>You're mutually oblivious.</p>
+                <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 1</p>
+
+                <a class="readmore" href="./article-1.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 2</p>
+
+                <a class="readmore" href="./article-2.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 3</p>
+
+                <a class="readmore" href="./article-3.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info -->
+                Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.
+                <a class="readmore" href="./this-is-a-super-article.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/bar.html">bar</a>. </p>
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href="./oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                <a class="readmore" href="./oh-yeah.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Or completely awesome. Depends the needs.</p>
+
+                <a class="readmore" href="./unbelievable.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
new file mode 100644
index 00000000..55eec103
--- /dev/null
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Trop bien !</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li class="active"><a href="./category/content.html">content</a></li>
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Trop bien !">Trop bien !</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2012-03-02T14:01:01">
+                Fri 02 March 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+
+
+
+Translations: 
+    
+        <a href="./oh-yeah.html">en</a>
+    
+
+</footer><!-- /.post-info -->
+        <p>Et voila du contenu en français</p>
+
+        </div><!-- /.entry-content -->
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
new file mode 100644
index 00000000..4b650e7d
--- /dev/null
+++ b/tests/output/basic/oh-yeah.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Oh yeah !</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li class="active"><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/bar.html">bar</a>. </p>
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href="./oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+        <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+        </div><!-- /.entry-content -->
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
new file mode 100644
index 00000000..0162232c
--- /dev/null
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>This is a test page</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+    <h1 class="entry-title">This is a test page</h1>
+    
+    <p>Just an image.</p>
+<img alt="alternate text" src="../static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
new file mode 100644
index 00000000..704971d2
--- /dev/null
+++ b/tests/output/basic/second-article-fr.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Deuxième article</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li class="active"><a href="./category/content.html">content</a></li>
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Deuxième article">Deuxième article</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href="./second-article.html">en</a>
+    
+
+</footer><!-- /.post-info -->
+        <p>Ceci est un article, en français.</p>
+
+        </div><!-- /.entry-content -->
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
new file mode 100644
index 00000000..94043446
--- /dev/null
+++ b/tests/output/basic/second-article.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Second article</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li class="active"><a href="./category/content.html">content</a></li>
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Second article">Second article</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href="./second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+        <p>This is some article, in english</p>
+
+        </div><!-- /.entry-content -->
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
new file mode 100644
index 00000000..8fc4e143
--- /dev/null
+++ b/tests/output/basic/tag/bar.html
@@ -0,0 +1,229 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - bar</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article.html">en</a>
+    
+
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <p>This is some article, in english</p>
+
+                <a class="readmore" href=".././second-article.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info -->
+                Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.
+                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href=".././oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                <a class="readmore" href=".././oh-yeah.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
new file mode 100644
index 00000000..9f773873
--- /dev/null
+++ b/tests/output/basic/tag/baz.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - baz</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article.html">en</a>
+    
+
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <p>This is some article, in english</p>
+
+                <a class="readmore" href=".././second-article.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
new file mode 100644
index 00000000..73de8459
--- /dev/null
+++ b/tests/output/basic/tag/foo.html
@@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - foo</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article.html">en</a>
+    
+
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <p>This is some article, in english</p>
+
+                <a class="readmore" href=".././second-article.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info -->
+                Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.
+                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
new file mode 100644
index 00000000..55ddfe78
--- /dev/null
+++ b/tests/output/basic/tag/foobar.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - foobar</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info --><p>Some content here !</p>
+<div class="section" id="this-is-a-simple-title">
+<h2>This is a simple title</h2>
+<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<pre class="literal-block">
+&gt;&gt;&gt; from ipdb import set_trace
+&gt;&gt;&gt; set_trace()
+</pre>
+<p>→ And now try with some utf8 hell: ééé</p>
+</div>
+
+                </article>
+                
+                    
+                
+            </aside><!-- /#featured -->
+            
+        
+        
+        
+
+    
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
new file mode 100644
index 00000000..a8839f52
--- /dev/null
+++ b/tests/output/basic/tag/oh.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - oh</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href=".././oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                </article>
+                
+                    
+                
+            </aside><!-- /#featured -->
+            
+        
+        
+        
+
+    
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
new file mode 100644
index 00000000..5ff2b2e0
--- /dev/null
+++ b/tests/output/basic/tag/yeah.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - yeah</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href=".././oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                </article>
+                
+                    
+                
+            </aside><!-- /#featured -->
+            
+        
+        
+        
+
+    
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/tags.html b/tests/output/basic/tags.html
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
new file mode 100644
index 00000000..28c98b99
--- /dev/null
+++ b/tests/output/basic/theme/css/main.css
@@ -0,0 +1,423 @@
+/*
+	Name: Smashing HTML5
+	Date: July 2009
+	Description: Sample layout for HTML5 and CSS3 goodness.
+	Version: 1.0
+	Author: Enrique Ramírez
+	Autor URI: http://enrique-ramirez.com
+*/
+
+/* Imports */
+@import url("reset.css");
+@import url("pygment.css");
+@import url("typogrify.css");
+@import url(http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+
+/***** Global *****/
+/* Body */
+body {
+    background: #F5F4EF;
+    color: #000305;
+    font-size: 87.5%; /* Base font size: 14px */
+    font-family: 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+    line-height: 1.429;
+    margin: 0;
+    padding: 0;
+    text-align: left;
+}
+
+/* Headings */
+h1 {font-size: 2em }
+h2 {font-size: 1.571em}	/* 22px */
+h3 {font-size: 1.429em}	/* 20px */
+h4 {font-size: 1.286em}	/* 18px */
+h5 {font-size: 1.143em}	/* 16px */
+h6 {font-size: 1em}		/* 14px */
+
+h1, h2, h3, h4, h5, h6 {
+	font-weight: 400;
+	line-height: 1.1;
+	margin-bottom: .8em;
+    font-family: 'Yanone Kaffeesatz', arial, serif;
+}
+
+h3, h4, h5, h6 { margin-top: .8em; }
+	
+hr { border: 2px solid #EEEEEE; }
+
+/* Anchors */
+a {outline: 0;}
+a img {border: 0px; text-decoration: none;}
+a:link, a:visited {
+	color: #C74350;
+	padding: 0 1px;
+	text-decoration: underline;
+}
+a:hover, a:active {
+	background-color: #C74350;
+	color: #fff;
+	text-decoration: none;
+	text-shadow: 1px 1px 1px #333;
+}
+
+h1 a:hover {
+    background-color: inherit
+}
+	
+/* Paragraphs */
+p {margin-bottom: 1.143em;}
+
+strong, b {font-weight: bold;}
+em, i {font-style: italic;}
+
+::-moz-selection {background: #F6CF74; color: #fff;}
+::selection {background: #F6CF74; color: #fff;}
+
+/* Lists */
+ul {
+	list-style: outside disc;
+	margin: 1em 0 1.5em 1.5em;
+}
+
+ol {
+	list-style: outside decimal;
+	margin: 1em 0 1.5em 1.5em;
+}
+
+.post-info {
+    float:right;
+    margin:10px;
+    padding:5px;
+}
+
+.post-info p{
+    margin-bottom: 1px;
+}
+
+.readmore { float: right }
+
+dl {margin: 0 0 1.5em 0;}
+dt {font-weight: bold;}
+dd {margin-left: 1.5em;}
+
+pre{background-color: #000; padding: 10px; color: #fff; margin: 10px; overflow: auto;}
+
+/* Quotes */
+blockquote {
+    margin: 20px;
+    font-style: italic;
+}
+cite {}
+
+q {}
+
+/* Tables */
+table {margin: .5em auto 1.5em auto; width: 98%;}
+	
+	/* Thead */
+	thead th {padding: .5em .4em; text-align: left;}
+	thead td {}
+
+	/* Tbody */
+	tbody td {padding: .5em .4em;}
+	tbody th {}
+	
+	tbody .alt td {}
+	tbody .alt th {}
+	
+	/* Tfoot */
+	tfoot th {}
+	tfoot td {}
+	
+/* HTML5 tags */
+header, section, footer,
+aside, nav, article, figure {
+	display: block;
+}
+
+/***** Layout *****/
+.body {clear: both; margin: 0 auto; width: 800px;}
+img.right figure.right {float: right; margin: 0 0 2em 2em;}
+img.left, figure.left {float: right; margin: 0 0 2em 2em;}
+
+/*
+	Header
+*****************/
+#banner {
+	margin: 0 auto;
+	padding: 2.5em 0 0 0;
+}
+
+	/* Banner */
+	#banner h1 {font-size: 3.571em; line-height: 0;}
+	#banner h1 a:link, #banner h1 a:visited {
+		color: #000305;
+		display: block;
+		font-weight: bold;
+		margin: 0 0 .6em .2em;
+		text-decoration: none;
+		width: 427px;
+	}
+	#banner h1 a:hover, #banner h1 a:active {
+		background: none;
+		color: #C74350;
+		text-shadow: none;
+	}
+	
+	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
+	
+	/* Main Nav */
+	#banner nav {
+		background: #000305;
+		font-size: 1.143em;
+		height: 40px;
+		line-height: 30px;
+		margin: 0 auto 2em auto;
+		padding: 0;
+		text-align: center;
+		width: 800px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	
+	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
+	#banner nav li {float: left; display: inline; margin: 0;}
+	
+	#banner nav a:link, #banner nav a:visited {
+		color: #fff;
+		display: inline-block;
+		height: 30px;
+		padding: 5px 1.5em;
+		text-decoration: none;
+	}
+	#banner nav a:hover, #banner nav a:active,
+	#banner nav .active a:link, #banner nav .active a:visited {
+		background: #C74451;
+		color: #fff;
+		text-shadow: none !important;
+	}
+	
+	#banner nav li:first-child a {
+		border-top-left-radius: 5px;
+		-moz-border-radius-topleft: 5px;
+		-webkit-border-top-left-radius: 5px;
+		
+		border-bottom-left-radius: 5px;
+		-moz-border-radius-bottomleft: 5px;
+		-webkit-border-bottom-left-radius: 5px;
+	}
+
+/*
+	Featured
+*****************/
+#featured {
+	background: #fff;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+#featured figure {
+	border: 2px solid #eee;
+	float: right;
+	margin: 0.786em 2em 0 5em;
+	width: 248px;
+}
+#featured figure img {display: block; float: right;}
+
+#featured h2 {color: #C74451; font-size: 1.714em; margin-bottom: 0.333em;}
+#featured h3 {font-size: 1.429em; margin-bottom: .5em;}
+
+#featured h3 a:link, #featured h3 a:visited {color: #000305; text-decoration: none;}
+#featured h3 a:hover, #featured h3 a:active {color: #fff;}
+
+/*
+	Body
+*****************/
+#content {
+	background: #fff;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px 20px;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+/*
+	Extras
+*****************/
+#extras {margin: 0 auto 3em auto; overflow: hidden;}
+
+#extras ul {list-style: none; margin: 0;}
+#extras li {border-bottom: 1px solid #fff;}
+#extras h2 {
+	color: #C74350;
+	font-size: 1.429em;
+	margin-bottom: .25em;
+	padding: 0 3px;
+}
+
+#extras a:link, #extras a:visited {
+	color: #444;
+	display: block;
+	border-bottom: 1px solid #F4E3E3;
+	text-decoration: none;
+	padding: .3em .25em;
+}
+
+#extras a:hover, #extras a:active {color: #fff;}
+
+	/* Blogroll */
+	#extras .blogroll {
+		float: left;
+		width: 615px;
+	}
+	
+	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
+	
+	/* Social */
+	#extras .social {
+		float: right;
+		width: 175px;
+	}
+	
+	#extras div[class='social'] a {
+		background-repeat: no-repeat;
+		background-position: 3px 6px;
+		padding-left: 25px;
+	}
+	
+		/* Icons */
+		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
+		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
+		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
+		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
+		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
+		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
+		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+
+/*
+	About
+*****************/
+#about {
+	background: #fff;
+	font-style: normal;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px;
+	text-align: left;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+#about .primary {float: left; width: 165px;}
+#about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
+#about .photo {float: left; margin: 5px 20px;}
+
+#about .url:link, #about .url:visited {text-decoration: none;}
+
+#about .bio {float: right; width: 500px;}
+
+/*
+	Footer
+*****************/
+#contentinfo {padding-bottom: 2em; text-align: right;}
+
+/***** Sections *****/
+/* Blog */
+.hentry {
+	display: block;
+	clear: both;
+	border-bottom: 1px solid #eee;
+	padding: 1.5em 0;
+}
+li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
+#content > .hentry {padding: 1em 0;}
+.hentry img{display : none ;}
+.entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;}
+.entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
+.entry-title a:visited {background-color: #fff;}
+
+.hentry .post-info * {font-style: normal;}
+
+	/* Content */
+	.hentry footer {margin-bottom: 2em;}
+	.hentry footer address {display: inline;}
+	#posts-list footer address {display: block;}
+
+	/* Blog Index */
+	#posts-list {list-style: none; margin: 0;}
+	#posts-list .hentry {padding-left: 10px; position: relative;}
+	
+	#posts-list footer {
+		left: 10px;
+		position: relative;
+        float: left;
+		top: 0.5em;
+		width: 190px;
+	}
+	
+	/* About the Author */
+	#about-author {
+		background: #f9f9f9;
+		clear: both;
+		font-style: normal;
+		margin: 2em 0;
+		padding: 10px 20px 15px 20px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	
+	#about-author strong {
+		color: #C64350;
+		clear: both;
+		display: block;
+		font-size: 1.429em;
+	}
+	
+	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
+	
+	/* Comments */
+	#comments-list {list-style: none; margin: 0 1em;}
+	#comments-list blockquote {
+		background: #f8f8f8;
+		clear: both;
+		font-style: normal;
+		margin: 0;
+		padding: 15px 20px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
+	
+	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
+	
+	/* Add a Comment */
+	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
+	#add-comment input[type='text'],
+	#add-comment input[type='email'],
+	#add-comment input[type='url'] {float: left; width: 200px;}
+	
+	#add-comment textarea {float: left; height: 150px; width: 495px;}
+	
+	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
+	
+	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
+	#add-comment * {margin-bottom: .5em;}
diff --git a/tests/output/basic/theme/css/pygment.css b/tests/output/basic/theme/css/pygment.css
new file mode 100644
index 00000000..594b0fa3
--- /dev/null
+++ b/tests/output/basic/theme/css/pygment.css
@@ -0,0 +1,205 @@
+.hll {
+background-color:#FFFFCC;
+}
+.c {
+color:#408090;
+font-style:italic;
+}
+.err {
+border:1px solid #FF0000;
+}
+.k {
+color:#007020;
+font-weight:bold;
+}
+.o {
+color:#666666;
+}
+.cm {
+color:#408090;
+font-style:italic;
+}
+.cp {
+color:#007020;
+}
+.c1 {
+color:#408090;
+font-style:italic;
+}
+.cs {
+background-color:#FFF0F0;
+color:#408090;
+}
+.gd {
+color:#A00000;
+}
+.ge {
+font-style:italic;
+}
+.gr {
+color:#FF0000;
+}
+.gh {
+color:#000080;
+font-weight:bold;
+}
+.gi {
+color:#00A000;
+}
+.go {
+color:#303030;
+}
+.gp {
+color:#C65D09;
+font-weight:bold;
+}
+.gs {
+font-weight:bold;
+}
+.gu {
+color:#800080;
+font-weight:bold;
+}
+.gt {
+color:#0040D0;
+}
+.kc {
+color:#007020;
+font-weight:bold;
+}
+.kd {
+color:#007020;
+font-weight:bold;
+}
+.kn {
+color:#007020;
+font-weight:bold;
+}
+.kp {
+color:#007020;
+}
+.kr {
+color:#007020;
+font-weight:bold;
+}
+.kt {
+color:#902000;
+}
+.m {
+color:#208050;
+}
+.s {
+color:#4070A0;
+}
+.na {
+color:#4070A0;
+}
+.nb {
+color:#007020;
+}
+.nc {
+color:#0E84B5;
+font-weight:bold;
+}
+.no {
+color:#60ADD5;
+}
+.nd {
+color:#555555;
+font-weight:bold;
+}
+.ni {
+color:#D55537;
+font-weight:bold;
+}
+.ne {
+color:#007020;
+}
+.nf {
+color:#06287E;
+}
+.nl {
+color:#002070;
+font-weight:bold;
+}
+.nn {
+color:#0E84B5;
+font-weight:bold;
+}
+.nt {
+color:#062873;
+font-weight:bold;
+}
+.nv {
+color:#BB60D5;
+}
+.ow {
+color:#007020;
+font-weight:bold;
+}
+.w {
+color:#BBBBBB;
+}
+.mf {
+color:#208050;
+}
+.mh {
+color:#208050;
+}
+.mi {
+color:#208050;
+}
+.mo {
+color:#208050;
+}
+.sb {
+color:#4070A0;
+}
+.sc {
+color:#4070A0;
+}
+.sd {
+color:#4070A0;
+font-style:italic;
+}
+.s2 {
+color:#4070A0;
+}
+.se {
+color:#4070A0;
+font-weight:bold;
+}
+.sh {
+color:#4070A0;
+}
+.si {
+color:#70A0D0;
+font-style:italic;
+}
+.sx {
+color:#C65D09;
+}
+.sr {
+color:#235388;
+}
+.s1 {
+color:#4070A0;
+}
+.ss {
+color:#517918;
+}
+.bp {
+color:#007020;
+}
+.vc {
+color:#BB60D5;
+}
+.vg {
+color:#BB60D5;
+}
+.vi {
+color:#BB60D5;
+}
+.il {
+color:#208050;
+}
diff --git a/tests/output/basic/theme/css/reset.css b/tests/output/basic/theme/css/reset.css
new file mode 100644
index 00000000..1e217566
--- /dev/null
+++ b/tests/output/basic/theme/css/reset.css
@@ -0,0 +1,52 @@
+/*
+	Name: Reset Stylesheet
+	Description: Resets browser's default CSS
+	Author: Eric Meyer
+	Author URI: http://meyerweb.com/eric/tools/css/reset/
+*/
+
+/* v1.0 | 20080212 */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	background: transparent;
+	border: 0;
+	font-size: 100%;
+	margin: 0;
+	outline: 0;
+	padding: 0;
+	vertical-align: baseline;
+}
+
+body {line-height: 1;}
+
+ol, ul {list-style: none;}
+
+blockquote, q {quotes: none;}
+
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {text-decoration: none;}
+del {text-decoration: line-through;}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
\ No newline at end of file
diff --git a/tests/output/basic/theme/css/typogrify.css b/tests/output/basic/theme/css/typogrify.css
new file mode 100644
index 00000000..c9b34dc8
--- /dev/null
+++ b/tests/output/basic/theme/css/typogrify.css
@@ -0,0 +1,3 @@
+.caps {font-size:.92em;}
+.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}    
+.dquo {margin-left:-.38em;}
diff --git a/tests/output/basic/theme/css/wide.css b/tests/output/basic/theme/css/wide.css
new file mode 100644
index 00000000..3376f4c7
--- /dev/null
+++ b/tests/output/basic/theme/css/wide.css
@@ -0,0 +1,43 @@
+@import url("main.css");
+
+body {
+    font:1.3em/1.3 "Hoefler Text","Georgia",Georgia,serif,sans-serif;
+}
+
+.body, #banner nav, #banner nav ul, #about, #featured, #content{
+    width: inherit;
+}
+
+#banner nav {
+    -moz-border-radius: 0px;
+    margin-bottom: 0px;
+}
+
+#banner nav ul{
+    padding-right: 50px;
+}
+
+#banner nav li{
+    float: right;
+}
+
+#banner nav li:first-child a {
+    -moz-border-radius: 0px;
+}
+
+#banner h1 {
+    margin-bottom: -18px;
+}
+
+#featured, #extras {
+    padding: 50px;
+}
+
+#featured {
+    padding-top: 20px;
+}
+
+#extras {
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
diff --git a/tests/output/basic/theme/images/icons/delicious.png b/tests/output/basic/theme/images/icons/delicious.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6ce246a4602f8f74e75ea8cfe9f5a00daceeb33
GIT binary patch
literal 963
zcmV;!13dhRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH0~|?2
zK~y-6Ws<#bTV))DpZogtjeX;f*md33No`1zmc&$+7>H1WP&XnFV&q?F7ZxN~K<dU&
z5HPW^&;b=H(G3X%3lfo{N@-}DCV?hRT_;Wxe_h`%-+O-y2~&@Bq_aFa($O&h3WY*>
zI2_i~X=|=poxD)3){1kpXG^wzH)G`%n@9Vdqh@z9)$_-#O6KsOno1r{oLaey`u-PV
zY3aS2^Ye4>S8M03dc96IlcH2Q#q{(nf8K*{zJqcRIvv=4D%`zi;68GBwb9|D4{t8%
zQt846H*S2cctHWJrs7#s6F7hZ$1zC814fk;8_#?Ee8=nS(J0;psU1TjL;w;PhJ&dS
zcwv_A5bPl|cU(qMn}nGpl^95_wD?4urU3{L6GZ|*A^{MSNeiu3NEiu6?GVBy>72{R
z(Kx-dQ9hHO)y3kN1By5f00YASh=3wSyiN0ggEI42*?m;bfk;Ru6|SFT?Qivt&gGJQ
z0HsndtkBwf2K^~wWnd3HkV6P8z=FJZQ)jk*(+39!_g7b!7rI@Kjg2Qfe6WUX2W&q4
zm9>AbkbdcF>N7oxr3%(~flSKebasN)?kzQL-rD7rOZ6X4m**v)zbsG|$Ot3_kjmLb
z+1wTp2}Q&gk?16geEG#E(r7f^)S2wL*J3H-dM%>JLs0-C`u2c&Bg;%J0usOo2#^>I
zm0)jQv%0!&tLpjbAH&e6-`@j?5F;iO4{)(<;{=8<Ja#N6FY&$h!onLnDwVd@gP@P^
zIYe=Yh>!1ufW_vcb=v!nPbNJk4W$4<pu4>M$C0YlrpA5WMQe>ngouCATHtwiggqDn
zpmhqZO_X5*2EA^#c=hTvOYiJF4zk%iesGAXz;)Y1(Gb{&Foo+MH+!CqX`1x=E(6=a
z3xd+QN_kS(Y8UUXtUSecY!cc9!)0ttVJ6b(WQk8d`&MSAEB5Bru8L#b@jU;Z?d_F*
zp^)0Ue*NR7wk&I_ae3~mrMKUTm;bu6ve#ZeSa|(Px7SYvp68Eg<s7{{UFl@96N%fm
lfA6iX{uKOwv`ZK3{0A}(g|**FbEW_Q002ovPDHLkV1fyHvk?FQ

literal 0
HcmV?d00001

diff --git a/tests/output/basic/theme/images/icons/lastfm.png b/tests/output/basic/theme/images/icons/lastfm.png
new file mode 100644
index 0000000000000000000000000000000000000000..b09c7876537ad9faa7a7a68ad6c8035d2e32ec3a
GIT binary patch
literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH11(8J
zK~y-6J&{dpR8<^D&%N)?o9`l>DI;xZLzt*k2_&L4MiM1NNsIxFtWXmdy1<VRUAkt;
z#*JZP0?{21<HxFmM57o1EiE*bP=x5TcIdR7nZB8MZ{EB2@1n-l+5B?yOO9Ik^3v{9
zWBpyfTzXL#^95}@r#v%l5=tb=<9KQXMFWutYgb8mJu?0pNm3_mE*ZbkJUig~2Z>`?
zT?efJc?>@Vo&nf_bKo2(1#tonNMf9Fw@oHa9%ZBgewzP>ae_Dt&Y_e70Fh1Pawy}$
zgGB;k2Q^V2@>xK^dK)%+5L*ai5cQu}LEnNlD5W7~ke~zY?x<0Z6aqFnkjcVC6{_Qq
z%b*tPaAOXF9t;#<avxL%VR{~FOGp^vnypByOnMC~@WKH&uy^z7^6IAO$U$hV!Lxf{
z=LjsVAWv1Hwv3&-N7(I@jI@Fxhn|Ol0`{x#(DeqYpTO`CynPg^V^D9v_92p~pXglv
zg?u(mywM>p`dWwBh@GP(GxNkhUPq-2wz)=f;d|VTS>(_pozKqU?$<CUPmp=*7*XvZ
z;c^2fM7r_o&AtG7$9AM25&!%<@vT1zuHT_^<~%B&BQ6wJ+Wivk^IwyG?J(xOH|WjZ
zM;G%&?e5ib(H9rcgIh=)Kf=c4Yph?LA=x`YZ>^1Owke!?hd2rd&Yas!y5|W3+lTtY
z!z}DSdabr?Qi6+9A|etm)g_qyLlP1B=gm)K`S?d7BI4Eq5fQOrB!9hrQs&YV^7qRp
z7QGM0p8UXThn4QPSBP)lMHdUGR-5+ev-GB}(w$#GXS3*$Av)h&Vdd0mg5PeU%O!HV
zMi<nbr(c~ehO$q48oSaW+Gu0r2rrjKRm#}Jp;nt{lft$GWJ{KQxrk>S<yW5j!DREf
z#A~+Dr2%Bv$4|DRoI{~dX%DLvE@jZMBV8#Gd5(UshcO;vtv1>5;aca`gZ*9{qBCi%
zwUAF?iaAuy$I}{@62$Y6SYsQj=uRIhTT$bq7frj6{xp7O*Nmx-Io0hc+Y3_?M%yHe
z262>Cw^!CiWpLK0R<o!^%6I+B(B}#_TmJa{>3;#J&y{nbj~!kB0000<MNUMnLSTZZ
C;k#e}

literal 0
HcmV?d00001

diff --git a/tests/output/basic/theme/images/icons/linkedin.png b/tests/output/basic/theme/images/icons/linkedin.png
new file mode 100644
index 0000000000000000000000000000000000000000..feb04962bfe2fd712cb5003c8c20b43af4c18201
GIT binary patch
literal 376
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1Ig<N%)#SD+I6
z_O)}4-}0QX^Tp@yRa?$nd;UIt$zg}dTMylR@%{H7$0>Wd_Fj7M_G{R}1CBkLw_JJn
z>DQmab*CL>?Ok)>!PFzy{Acg}|Np;3*ZSPGC!W6l5w&pt&tHEg9=P)1$FJ6%7tcO?
zWxgW&B*^ZPAirP+hi5m^K%69RcNc~ZR#^`qhqJ&VvY3H^TNs2H8D`Cq01C2~c>21s
z-{R(FQ&rw_X(1C(sL|8KF+}2W>G_L%hZJ~NFD#lIs%=oPMZxdy|Meo%9>~ox&zv>K
zB$L~r<aZkfgWz=Lyqm20XVxusKG$*l)?2QYAJ>*j<o0AdvsI9iTUyciG3K=Cj_Pdv
zsFgaO=a_kD{%Kv_vzW(gZpy5n+eNW69-p?9c8*Zj*!tyi{epY%eko6V$gGmgC;W7e
S-+7>87(8A5T-G@yGywqOA)@^N

literal 0
HcmV?d00001

diff --git a/tests/output/basic/theme/images/icons/rss.png b/tests/output/basic/theme/images/icons/rss.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d4e85d981cbecb04b76dab5a234dc4690bd15ab
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH0@+DK
zK~y-6O_EE9990yCzjLd)r^ifBchXK`gN{uSqd0=7kbqhEAc*5eg)D?1#7z(k=t4x?
zNsw9SGD{(noh~9MD2X6K0zO7JK4L<2NIQAV^f*1~?yBm#RrlWGqBZ!h4jlgP{QMl@
zU+I@e9$=>SEYtNmqqUus!wx3gi-~73je=sdif|T*ZW7`utw+wuWACgAfSy0TMEK!t
zYE6(SC>(?md;vs&h4d<9>k!o-OF=;&Jh2#spFTJsviuSC-JmTPu0b(`Yz>m@kp2nd
zRUig43#A1DSVeq#S1i(h1~UbNA&f4<@Dez{166^UU6a|4zzqNaQ-P|7a=jCiUOUL}
z3N#kr{$pS>NV;Hq6WHcusMH{MFwq3?pM*wCy57Y0p#2u?K8oJnF^Tc@i}3sB(5is`
z&ujoKf??Y|8_dk3zrBZk^(0()1>IOi0VRT`KZE-Y!JwQ_MM0Ec!G-#oQ7S8B*C&m)
z9zsUnBA@O@&vekimC3b3XJKv+*c=oPA>^RdcGocO^|4z>a{(Sb35%DIBflaWUCfz>
zQFjZBp}hMA+!o*!5JCWhI3vLdv-@E4JLJM)^p8{Mwgoua!=+>7`_};|cRh#oK;+Rv
zNi2+$zuQKub16jv5<!_EKfZ>1d?zwBNAdUx{4b}$ji|JrAT%0~d0eJ=2e~(~foQ~_
z3)4H%r@nxfGD;Ie?>uh)WzrN#E)!KFN;5~c1saqnf>_HU26K%7Xh1@OH8YI!nC9}k
z*h+``4uL_Jq~Ax=P1JxOhzFJ0Nc_*I=gq}q-H_#oZ;@++WIbxRAxOY<w&S;QvduA5
z^(qoa<j!-WTTtv-{7?YgH^<*JD<|JC{sJ7t4Z*4qG?0wJjUkS}SHLM`IV7#UD?1J@
z9k~5k*||6Nio5x0=wE$aT(X)beXR9uYxRy$-R?A+UQd($Ez{g5aeMzK3x}6Z0sI3i
WiC~OGt1?Oe0000<MNUMnLSTZworl%{

literal 0
HcmV?d00001

diff --git a/tests/output/basic/theme/images/icons/twitter.png b/tests/output/basic/theme/images/icons/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6119280123364c3b37171b9ff0b37c1d67ed2b5
GIT binary patch
literal 835
zcmV-J1HAl+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH0-Q-i
zK~y-6Es{%XT~!=M*MIMQ?lVnH1Zip;AE}^N>OiSOJF#OyKaDf}3{E=hP(;vSr6A%!
z5Wx-#wfF#SX!^KKyzg_*IeY(q4&wR%YqFNzI?kWA&ec)m@>XRpwrI3)JeW}#)`N^$
zgVab`nX}wD^EPw$;!wBji+^(4RI1+HGY+Cqifm)dfX5O&g8?8xD-m7bu)#Q5+Am>K
zbbr(X4~2j+mazpK0*CI@F6M$oE^LZu1-)J*_5x2f+6k>wc@UivucXMs7C!nDzMjE;
z3=E3%ye&*SXI-2u=zzx^tZE%6qIz5AoHqjk-%sJY6S%empJ2RS1!|0%$WeBt3M3#G
zFg&L$`Hnf~Lqx#66>Rt6-wad1-%a3A1F!esonhoR7bh-UMhL{z7O9nRg9ebng#bU#
z;Nvw+3OsFL4BS41H;2ZZ0(B9q!fr5m>oS%_Oo}+okbsoo!4jS|5KNp%OdJf@HmDsy
zO&V1c3undz6o&%L9d2yF2fOez8*dN9dt-6WjkSOxqI8lZby8$e#HGsFt|IeRjDqpm
zML6j5KgJ&}?sjk?L0=gaEkZEWxnu^x*ouKGV-T<%#5XgzvxIM_;z0uk!Pqr1>k3VF
z%#~A>m=_FUVuf*a1bYTq;^qW4X5<Vn58%t!;H_x<(4MW?IVq$V79sXIZp8EKTtDYr
z8H=OFs2#e_Srzze?L2JYa)ce6X?9|;L0T16W1w|-RKxx`<MT`6!?BYv_J@HYI2;&n
z^k7b5U9WkvsTgAWDI22&uosQf&iQp=ygD>)ydX*`^pjC>R_4c<bH6T}mLAJi%r}0`
zzIwK}{(Fu$2hP}=ZrQj@U_~g)`<p@qa+6sx8UyY0s%hP6@{-w4{{b|mi<LUa0B`^R
N002ovPDHLkV1i<-Wjp`?

literal 0
HcmV?d00001

diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
new file mode 100644
index 00000000..cb12da2d
--- /dev/null
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>This is a super article !</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info -->
+        <p>Some content here !</p>
+<div class="section" id="this-is-a-simple-title">
+<h2>This is a simple title</h2>
+<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<pre class="literal-block">
+&gt;&gt;&gt; from ipdb import set_trace
+&gt;&gt;&gt; set_trace()
+</pre>
+<p>→ And now try with some utf8 hell: ééé</p>
+</div>
+
+        </div><!-- /.entry-content -->
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
new file mode 100644
index 00000000..4c6e6b07
--- /dev/null
+++ b/tests/output/basic/unbelievable.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Unbelievable !</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href=".">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li class="active"><a href="./category/content.html">content</a></li>
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/bruno.html">bruno</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>Or completely awesome. Depends the needs.</p>
+
+        </div><!-- /.entry-content -->
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
new file mode 100644
index 00000000..c001278a
--- /dev/null
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A markdown powered article</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to A markdown powered article">A markdown powered article</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Wed 20 April 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>You're mutually oblivious.</p>
+        </div><!-- /.entry-content -->
+        
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "a-markdown-powered-article.html";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
new file mode 100644
index 00000000..e9393667
--- /dev/null
+++ b/tests/output/custom/archives.html
@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+        
+<section id="content" class="body">
+<h1>Archives for Alexis' log</h1>
+
+<dl>
+
+    <dt>Fri 15 October 2010</dt>
+    <dd><a href="unbelievable.html">Unbelievable !</a></dd>
+
+    <dt>Wed 20 October 2010</dt>
+    <dd><a href="oh-yeah.html">Oh yeah !</a></dd>
+
+    <dt>Thu 02 December 2010</dt>
+    <dd><a href="this-is-a-super-article.html">This is a super article !</a></dd>
+
+    <dt>Thu 17 February 2011</dt>
+    <dd><a href="article-1.html">Article 1</a></dd>
+
+    <dt>Thu 17 February 2011</dt>
+    <dd><a href="article-2.html">Article 2</a></dd>
+
+    <dt>Thu 17 February 2011</dt>
+    <dd><a href="article-3.html">Article 3</a></dd>
+
+    <dt>Wed 20 April 2011</dt>
+    <dd><a href="a-markdown-powered-article.html">A markdown powered article</a></dd>
+
+    <dt>Wed 29 February 2012</dt>
+    <dd><a href="second-article.html">Second article</a></dd>
+
+</dl>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
new file mode 100644
index 00000000..4bdb8f16
--- /dev/null
+++ b/tests/output/custom/article-1.html
@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Article 1</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>Article 1</p>
+
+        </div><!-- /.entry-content -->
+        
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "article-1.html";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
new file mode 100644
index 00000000..6a0bb442
--- /dev/null
+++ b/tests/output/custom/article-2.html
@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Article 2</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>Article 2</p>
+
+        </div><!-- /.entry-content -->
+        
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "article-2.html";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
new file mode 100644
index 00000000..8410b4f9
--- /dev/null
+++ b/tests/output/custom/article-3.html
@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Article 3</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>Article 3</p>
+
+        </div><!-- /.entry-content -->
+        
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "article-3.html";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
new file mode 100644
index 00000000..89893dd9
--- /dev/null
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -0,0 +1,271 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - Alexis Métaireau</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././a-markdown-powered-article.html">A markdown powered article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Wed 20 April 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 1</p>
+
+                <a class="readmore" href=".././article-1.html">read more</a>
+                <p>There are <a href=".././article-1.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 2</p>
+
+                <a class="readmore" href=".././article-2.html">read more</a>
+                <p>There are <a href=".././article-2.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 3</p>
+
+                <a class="readmore" href=".././article-3.html">read more</a>
+                <p>There are <a href=".././article-3.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+<p class="paginator">
+    
+    Page 1 / 2
+    
+        <a href=".././author/Alexis Métaireau2.html">&raquo;</a>
+    
+</p>
+
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
new file mode 100644
index 00000000..be2c0db2
--- /dev/null
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -0,0 +1,291 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - Alexis Métaireau</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+         
+            
+                <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="3">
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href=".././oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                <a class="readmore" href=".././oh-yeah.html">read more</a>
+                <p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <p>This is some article, in english</p>
+
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info -->
+                Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.
+                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
+                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Or completely awesome. Depends the needs.</p>
+
+                <a class="readmore" href=".././unbelievable.html">read more</a>
+                <p>There are <a href=".././unbelievable.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+<p class="paginator">
+    
+        
+            <a href=".././author/Alexis Métaireau.html">&laquo;</a>
+        
+    
+    Page 2 / 2
+    
+</p>
+
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/categories.html b/tests/output/custom/categories.html
new file mode 100644
index 00000000..a1a44e5b
--- /dev/null
+++ b/tests/output/custom/categories.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+        
+<ul>
+
+    <li><a href="category/cat1.html">cat1</a></li>
+
+    <li><a href="category/bar.html">bar</a></li>
+
+    <li><a href="category/yeah.html">yeah</a></li>
+
+    <li><a href="category/content.html">content</a></li>
+
+</ul>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
new file mode 100644
index 00000000..d2088eae
--- /dev/null
+++ b/tests/output/custom/category/bar.html
@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - bar</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li class="active"><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href=".././oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+                    
+<p class="paginator">
+    
+    Page 1 / 1
+    
+</p>
+
+                
+            </aside><!-- /#featured -->
+            
+        
+        
+        
+
+    
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
new file mode 100644
index 00000000..d0ac8972
--- /dev/null
+++ b/tests/output/custom/category/cat1.html
@@ -0,0 +1,269 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - cat1</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li class="active"><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././a-markdown-powered-article.html">A markdown powered article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Wed 20 April 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 1</p>
+
+                <a class="readmore" href=".././article-1.html">read more</a>
+                <p>There are <a href=".././article-1.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 2</p>
+
+                <a class="readmore" href=".././article-2.html">read more</a>
+                <p>There are <a href=".././article-2.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 3</p>
+
+                <a class="readmore" href=".././article-3.html">read more</a>
+                <p>There are <a href=".././article-3.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+<p class="paginator">
+    
+    Page 1 / 1
+    
+</p>
+
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/category/content.html b/tests/output/custom/category/content.html
new file mode 100644
index 00000000..389d7707
--- /dev/null
+++ b/tests/output/custom/category/content.html
@@ -0,0 +1,207 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - content</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li class="active"><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Or completely awesome. Depends the needs.</p>
+
+                <a class="readmore" href=".././unbelievable.html">read more</a>
+                <p>There are <a href=".././unbelievable.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+<p class="paginator">
+    
+    Page 1 / 1
+    
+</p>
+
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
new file mode 100644
index 00000000..b70b36e7
--- /dev/null
+++ b/tests/output/custom/category/yeah.html
@@ -0,0 +1,171 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - yeah</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li class="active"><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info --><p>Some content here !</p>
+<div class="section" id="this-is-a-simple-title">
+<h2>This is a simple title</h2>
+<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<pre class="literal-block">
+&gt;&gt;&gt; from ipdb import set_trace
+&gt;&gt;&gt; set_trace()
+</pre>
+<p>→ And now try with some utf8 hell: ééé</p>
+</div>
+<p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+                    
+<p class="paginator">
+    
+    Page 1 / 1
+    
+</p>
+
+                
+            </aside><!-- /#featured -->
+            
+        
+        
+        
+
+    
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
new file mode 100644
index 00000000..99f5ad68
--- /dev/null
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A draft article</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li class="active"><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to A draft article">A draft article</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2012-03-02T14:01:01">
+                Fri 02 March 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>This is a draft article, it should live under the /drafts/ folder and not be
+listed anywhere else.</p>
+
+        </div><!-- /.entry-content -->
+        
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "a-draft-article.html";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all-en.atom.xml b/tests/output/custom/feeds/all-en.atom.xml
new file mode 100644
index 00000000..7356cb17
--- /dev/null
+++ b/tests/output/custom/feeds/all-en.atom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all-fr.atom.xml b/tests/output/custom/feeds/all-fr.atom.xml
new file mode 100644
index 00000000..27949d80
--- /dev/null
+++ b/tests/output/custom/feeds/all-fr.atom.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all.atom.xml b/tests/output/custom/feeds/all.atom.xml
new file mode 100644
index 00000000..ef6dbf52
--- /dev/null
+++ b/tests/output/custom/feeds/all.atom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all.rss.xml b/tests/output/custom/feeds/all.rss.xml
new file mode 100644
index 00000000..a3f7eff9
--- /dev/null
+++ b/tests/output/custom/feeds/all.rss.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>http://blog.notmyidea.org/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>http://blog.notmyidea.org/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>http://blog.notmyidea.org/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>http://blog.notmyidea.org/unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/bar.atom.xml b/tests/output/custom/feeds/bar.atom.xml
new file mode 100644
index 00000000..84ac9cda
--- /dev/null
+++ b/tests/output/custom/feeds/bar.atom.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/bar.rss.xml b/tests/output/custom/feeds/bar.rss.xml
new file mode 100644
index 00000000..bb5cb2b4
--- /dev/null
+++ b/tests/output/custom/feeds/bar.rss.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>http://blog.notmyidea.org/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/cat1.atom.xml b/tests/output/custom/feeds/cat1.atom.xml
new file mode 100644
index 00000000..e0f01780
--- /dev/null
+++ b/tests/output/custom/feeds/cat1.atom.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/cat1.rss.xml b/tests/output/custom/feeds/cat1.rss.xml
new file mode 100644
index 00000000..0043b2fb
--- /dev/null
+++ b/tests/output/custom/feeds/cat1.rss.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>http://blog.notmyidea.org/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-3.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/content.atom.xml b/tests/output/custom/feeds/content.atom.xml
new file mode 100644
index 00000000..c141a0aa
--- /dev/null
+++ b/tests/output/custom/feeds/content.atom.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/content.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/content.rss.xml b/tests/output/custom/feeds/content.rss.xml
new file mode 100644
index 00000000..9f36c97e
--- /dev/null
+++ b/tests/output/custom/feeds/content.rss.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/content.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>http://blog.notmyidea.org/unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/yeah.atom.xml b/tests/output/custom/feeds/yeah.atom.xml
new file mode 100644
index 00000000..4c6eed49
--- /dev/null
+++ b/tests/output/custom/feeds/yeah.atom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2010-12-02T10:14:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/yeah.rss.xml b/tests/output/custom/feeds/yeah.rss.xml
new file mode 100644
index 00000000..c4f5512e
--- /dev/null
+++ b/tests/output/custom/feeds/yeah.rss.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Thu, 02 Dec 2010 10:14:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>http://blog.notmyidea.org/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
new file mode 100644
index 00000000..2154ea99
--- /dev/null
+++ b/tests/output/custom/index.html
@@ -0,0 +1,276 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="./second-article.html">Second article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href="./second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./a-markdown-powered-article.html" rel="bookmark" title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Wed 20 April 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>You're mutually oblivious.</p>
+                <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
+                <p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 1</p>
+
+                <a class="readmore" href="./article-1.html">read more</a>
+                <p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 2</p>
+
+                <a class="readmore" href="./article-2.html">read more</a>
+                <p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+<p class="paginator">
+    
+    Page 1 / 2
+    
+        <a href="./index2.html">&raquo;</a>
+    
+</p>
+
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
new file mode 100644
index 00000000..9604afd7
--- /dev/null
+++ b/tests/output/custom/index2.html
@@ -0,0 +1,286 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+         
+            
+                <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="3">
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Article 3</p>
+
+                <a class="readmore" href="./article-3.html">read more</a>
+                <p>There are <a href="./article-3.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info -->
+                Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.
+                <a class="readmore" href="./this-is-a-super-article.html">read more</a>
+                <p>There are <a href="./this-is-a-super-article.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/bar.html">bar</a>. </p>
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href="./oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                <a class="readmore" href="./oh-yeah.html">read more</a>
+                <p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href="./unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Or completely awesome. Depends the needs.</p>
+
+                <a class="readmore" href="./unbelievable.html">read more</a>
+                <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+<p class="paginator">
+    
+        
+            <a href="./index.html">&laquo;</a>
+        
+    
+    Page 2 / 2
+    
+</p>
+
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
new file mode 100644
index 00000000..e692105b
--- /dev/null
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Trop bien !</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li class="active"><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Trop bien !">Trop bien !</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2012-03-02T14:01:01">
+                Fri 02 March 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+
+
+
+Translations: 
+    
+        <a href="./oh-yeah.html">en</a>
+    
+
+</footer><!-- /.post-info -->
+        <p>Et voila du contenu en français</p>
+
+        </div><!-- /.entry-content -->
+        
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "oh-yeah-fr.html";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
new file mode 100644
index 00000000..6ffaad13
--- /dev/null
+++ b/tests/output/custom/oh-yeah.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Oh yeah !</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li class="active"><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/bar.html">bar</a>. </p>
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href="./oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+        <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+        </div><!-- /.entry-content -->
+        
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "oh-yeah.html";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
new file mode 100644
index 00000000..27d6ec69
--- /dev/null
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>This is a test page</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+    <h1 class="entry-title">This is a test page</h1>
+    
+    <p>Just an image.</p>
+<img alt="alternate text" src="../static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/robots.txt b/tests/output/custom/robots.txt
new file mode 100644
index 00000000..ae5b0d05
--- /dev/null
+++ b/tests/output/custom/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /static/pictures
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
new file mode 100644
index 00000000..b3b12af7
--- /dev/null
+++ b/tests/output/custom/second-article-fr.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Deuxième article</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li class="active"><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Deuxième article">Deuxième article</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href="./second-article.html">en</a>
+    
+
+</footer><!-- /.post-info -->
+        <p>Ceci est un article, en français.</p>
+
+        </div><!-- /.entry-content -->
+        
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "second-article-fr.html";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
new file mode 100644
index 00000000..4b31dc69
--- /dev/null
+++ b/tests/output/custom/second-article.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Second article</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li class="active"><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Second article">Second article</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href="./second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+        <p>This is some article, in english</p>
+
+        </div><!-- /.entry-content -->
+        
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "second-article.html";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/static/pictures/Fat_Cat.jpg b/tests/output/custom/static/pictures/Fat_Cat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d8a96d356be94e782aaf36ba4e47168435b56338
GIT binary patch
literal 62675
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

literal 0
HcmV?d00001

diff --git a/tests/output/custom/static/pictures/Sushi.jpg b/tests/output/custom/static/pictures/Sushi.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e49e5f0ab53461187c2cf61ebc1f3befdc937aed
GIT binary patch
literal 28992
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
GKmXZ^k)SRB

literal 0
HcmV?d00001

diff --git a/tests/output/custom/static/pictures/Sushi_Macro.jpg b/tests/output/custom/static/pictures/Sushi_Macro.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..21f935a1bf82808aa2ded423caba3cc9f2911973
GIT binary patch
literal 38594
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
V9RVclK)_SR8Zrq#de{_0|JgZd7T*8>

literal 0
HcmV?d00001

diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
new file mode 100644
index 00000000..069276ad
--- /dev/null
+++ b/tests/output/custom/tag/bar.html
@@ -0,0 +1,290 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - bar</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article.html">en</a>
+    
+
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <p>This is some article, in english</p>
+
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info -->
+                Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.
+                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
+                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href=".././oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                <a class="readmore" href=".././oh-yeah.html">read more</a>
+                <p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+<p class="paginator">
+    
+    Page 1 / 1
+    
+</p>
+
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
new file mode 100644
index 00000000..02d87aa1
--- /dev/null
+++ b/tests/output/custom/tag/baz.html
@@ -0,0 +1,212 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - baz</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article.html">en</a>
+    
+
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <p>This is some article, in english</p>
+
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+<p class="paginator">
+    
+    Page 1 / 1
+    
+</p>
+
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
new file mode 100644
index 00000000..2089003d
--- /dev/null
+++ b/tests/output/custom/tag/foo.html
@@ -0,0 +1,246 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - foo</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article.html">en</a>
+    
+
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/content.html">content</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info -->
+                <p>This is some article, in english</p>
+
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+        
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info -->
+                Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.
+                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
+                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            
+<p class="paginator">
+    
+    Page 1 / 1
+    
+</p>
+
+        
+
+    
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
+
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
new file mode 100644
index 00000000..8187acd5
--- /dev/null
+++ b/tests/output/custom/tag/foobar.html
@@ -0,0 +1,171 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - foobar</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info --><p>Some content here !</p>
+<div class="section" id="this-is-a-simple-title">
+<h2>This is a simple title</h2>
+<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<pre class="literal-block">
+&gt;&gt;&gt; from ipdb import set_trace
+&gt;&gt;&gt; set_trace()
+</pre>
+<p>→ And now try with some utf8 hell: ééé</p>
+</div>
+<p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+                    
+<p class="paginator">
+    
+    Page 1 / 1
+    
+</p>
+
+                
+            </aside><!-- /#featured -->
+            
+        
+        
+        
+
+    
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
new file mode 100644
index 00000000..a27bb302
--- /dev/null
+++ b/tests/output/custom/tag/oh.html
@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - oh</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href=".././oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+                    
+<p class="paginator">
+    
+    Page 1 / 1
+    
+</p>
+
+                
+            </aside><!-- /#featured -->
+            
+        
+        
+        
+
+    
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
new file mode 100644
index 00000000..ac1ef4fa
--- /dev/null
+++ b/tests/output/custom/tag/yeah.html
@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - yeah</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+
+
+Translations: 
+    
+        <a href=".././oh-yeah-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>
+                </article>
+                
+                    
+<p class="paginator">
+    
+    Page 1 / 1
+    
+</p>
+
+                
+            </aside><!-- /#featured -->
+            
+        
+        
+        
+
+    
+
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/tags.html b/tests/output/custom/tags.html
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
new file mode 100644
index 00000000..28c98b99
--- /dev/null
+++ b/tests/output/custom/theme/css/main.css
@@ -0,0 +1,423 @@
+/*
+	Name: Smashing HTML5
+	Date: July 2009
+	Description: Sample layout for HTML5 and CSS3 goodness.
+	Version: 1.0
+	Author: Enrique Ramírez
+	Autor URI: http://enrique-ramirez.com
+*/
+
+/* Imports */
+@import url("reset.css");
+@import url("pygment.css");
+@import url("typogrify.css");
+@import url(http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+
+/***** Global *****/
+/* Body */
+body {
+    background: #F5F4EF;
+    color: #000305;
+    font-size: 87.5%; /* Base font size: 14px */
+    font-family: 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+    line-height: 1.429;
+    margin: 0;
+    padding: 0;
+    text-align: left;
+}
+
+/* Headings */
+h1 {font-size: 2em }
+h2 {font-size: 1.571em}	/* 22px */
+h3 {font-size: 1.429em}	/* 20px */
+h4 {font-size: 1.286em}	/* 18px */
+h5 {font-size: 1.143em}	/* 16px */
+h6 {font-size: 1em}		/* 14px */
+
+h1, h2, h3, h4, h5, h6 {
+	font-weight: 400;
+	line-height: 1.1;
+	margin-bottom: .8em;
+    font-family: 'Yanone Kaffeesatz', arial, serif;
+}
+
+h3, h4, h5, h6 { margin-top: .8em; }
+	
+hr { border: 2px solid #EEEEEE; }
+
+/* Anchors */
+a {outline: 0;}
+a img {border: 0px; text-decoration: none;}
+a:link, a:visited {
+	color: #C74350;
+	padding: 0 1px;
+	text-decoration: underline;
+}
+a:hover, a:active {
+	background-color: #C74350;
+	color: #fff;
+	text-decoration: none;
+	text-shadow: 1px 1px 1px #333;
+}
+
+h1 a:hover {
+    background-color: inherit
+}
+	
+/* Paragraphs */
+p {margin-bottom: 1.143em;}
+
+strong, b {font-weight: bold;}
+em, i {font-style: italic;}
+
+::-moz-selection {background: #F6CF74; color: #fff;}
+::selection {background: #F6CF74; color: #fff;}
+
+/* Lists */
+ul {
+	list-style: outside disc;
+	margin: 1em 0 1.5em 1.5em;
+}
+
+ol {
+	list-style: outside decimal;
+	margin: 1em 0 1.5em 1.5em;
+}
+
+.post-info {
+    float:right;
+    margin:10px;
+    padding:5px;
+}
+
+.post-info p{
+    margin-bottom: 1px;
+}
+
+.readmore { float: right }
+
+dl {margin: 0 0 1.5em 0;}
+dt {font-weight: bold;}
+dd {margin-left: 1.5em;}
+
+pre{background-color: #000; padding: 10px; color: #fff; margin: 10px; overflow: auto;}
+
+/* Quotes */
+blockquote {
+    margin: 20px;
+    font-style: italic;
+}
+cite {}
+
+q {}
+
+/* Tables */
+table {margin: .5em auto 1.5em auto; width: 98%;}
+	
+	/* Thead */
+	thead th {padding: .5em .4em; text-align: left;}
+	thead td {}
+
+	/* Tbody */
+	tbody td {padding: .5em .4em;}
+	tbody th {}
+	
+	tbody .alt td {}
+	tbody .alt th {}
+	
+	/* Tfoot */
+	tfoot th {}
+	tfoot td {}
+	
+/* HTML5 tags */
+header, section, footer,
+aside, nav, article, figure {
+	display: block;
+}
+
+/***** Layout *****/
+.body {clear: both; margin: 0 auto; width: 800px;}
+img.right figure.right {float: right; margin: 0 0 2em 2em;}
+img.left, figure.left {float: right; margin: 0 0 2em 2em;}
+
+/*
+	Header
+*****************/
+#banner {
+	margin: 0 auto;
+	padding: 2.5em 0 0 0;
+}
+
+	/* Banner */
+	#banner h1 {font-size: 3.571em; line-height: 0;}
+	#banner h1 a:link, #banner h1 a:visited {
+		color: #000305;
+		display: block;
+		font-weight: bold;
+		margin: 0 0 .6em .2em;
+		text-decoration: none;
+		width: 427px;
+	}
+	#banner h1 a:hover, #banner h1 a:active {
+		background: none;
+		color: #C74350;
+		text-shadow: none;
+	}
+	
+	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
+	
+	/* Main Nav */
+	#banner nav {
+		background: #000305;
+		font-size: 1.143em;
+		height: 40px;
+		line-height: 30px;
+		margin: 0 auto 2em auto;
+		padding: 0;
+		text-align: center;
+		width: 800px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	
+	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
+	#banner nav li {float: left; display: inline; margin: 0;}
+	
+	#banner nav a:link, #banner nav a:visited {
+		color: #fff;
+		display: inline-block;
+		height: 30px;
+		padding: 5px 1.5em;
+		text-decoration: none;
+	}
+	#banner nav a:hover, #banner nav a:active,
+	#banner nav .active a:link, #banner nav .active a:visited {
+		background: #C74451;
+		color: #fff;
+		text-shadow: none !important;
+	}
+	
+	#banner nav li:first-child a {
+		border-top-left-radius: 5px;
+		-moz-border-radius-topleft: 5px;
+		-webkit-border-top-left-radius: 5px;
+		
+		border-bottom-left-radius: 5px;
+		-moz-border-radius-bottomleft: 5px;
+		-webkit-border-bottom-left-radius: 5px;
+	}
+
+/*
+	Featured
+*****************/
+#featured {
+	background: #fff;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+#featured figure {
+	border: 2px solid #eee;
+	float: right;
+	margin: 0.786em 2em 0 5em;
+	width: 248px;
+}
+#featured figure img {display: block; float: right;}
+
+#featured h2 {color: #C74451; font-size: 1.714em; margin-bottom: 0.333em;}
+#featured h3 {font-size: 1.429em; margin-bottom: .5em;}
+
+#featured h3 a:link, #featured h3 a:visited {color: #000305; text-decoration: none;}
+#featured h3 a:hover, #featured h3 a:active {color: #fff;}
+
+/*
+	Body
+*****************/
+#content {
+	background: #fff;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px 20px;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+/*
+	Extras
+*****************/
+#extras {margin: 0 auto 3em auto; overflow: hidden;}
+
+#extras ul {list-style: none; margin: 0;}
+#extras li {border-bottom: 1px solid #fff;}
+#extras h2 {
+	color: #C74350;
+	font-size: 1.429em;
+	margin-bottom: .25em;
+	padding: 0 3px;
+}
+
+#extras a:link, #extras a:visited {
+	color: #444;
+	display: block;
+	border-bottom: 1px solid #F4E3E3;
+	text-decoration: none;
+	padding: .3em .25em;
+}
+
+#extras a:hover, #extras a:active {color: #fff;}
+
+	/* Blogroll */
+	#extras .blogroll {
+		float: left;
+		width: 615px;
+	}
+	
+	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
+	
+	/* Social */
+	#extras .social {
+		float: right;
+		width: 175px;
+	}
+	
+	#extras div[class='social'] a {
+		background-repeat: no-repeat;
+		background-position: 3px 6px;
+		padding-left: 25px;
+	}
+	
+		/* Icons */
+		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
+		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
+		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
+		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
+		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
+		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
+		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+
+/*
+	About
+*****************/
+#about {
+	background: #fff;
+	font-style: normal;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px;
+	text-align: left;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+#about .primary {float: left; width: 165px;}
+#about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
+#about .photo {float: left; margin: 5px 20px;}
+
+#about .url:link, #about .url:visited {text-decoration: none;}
+
+#about .bio {float: right; width: 500px;}
+
+/*
+	Footer
+*****************/
+#contentinfo {padding-bottom: 2em; text-align: right;}
+
+/***** Sections *****/
+/* Blog */
+.hentry {
+	display: block;
+	clear: both;
+	border-bottom: 1px solid #eee;
+	padding: 1.5em 0;
+}
+li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
+#content > .hentry {padding: 1em 0;}
+.hentry img{display : none ;}
+.entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;}
+.entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
+.entry-title a:visited {background-color: #fff;}
+
+.hentry .post-info * {font-style: normal;}
+
+	/* Content */
+	.hentry footer {margin-bottom: 2em;}
+	.hentry footer address {display: inline;}
+	#posts-list footer address {display: block;}
+
+	/* Blog Index */
+	#posts-list {list-style: none; margin: 0;}
+	#posts-list .hentry {padding-left: 10px; position: relative;}
+	
+	#posts-list footer {
+		left: 10px;
+		position: relative;
+        float: left;
+		top: 0.5em;
+		width: 190px;
+	}
+	
+	/* About the Author */
+	#about-author {
+		background: #f9f9f9;
+		clear: both;
+		font-style: normal;
+		margin: 2em 0;
+		padding: 10px 20px 15px 20px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	
+	#about-author strong {
+		color: #C64350;
+		clear: both;
+		display: block;
+		font-size: 1.429em;
+	}
+	
+	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
+	
+	/* Comments */
+	#comments-list {list-style: none; margin: 0 1em;}
+	#comments-list blockquote {
+		background: #f8f8f8;
+		clear: both;
+		font-style: normal;
+		margin: 0;
+		padding: 15px 20px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
+	
+	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
+	
+	/* Add a Comment */
+	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
+	#add-comment input[type='text'],
+	#add-comment input[type='email'],
+	#add-comment input[type='url'] {float: left; width: 200px;}
+	
+	#add-comment textarea {float: left; height: 150px; width: 495px;}
+	
+	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
+	
+	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
+	#add-comment * {margin-bottom: .5em;}
diff --git a/tests/output/custom/theme/css/pygment.css b/tests/output/custom/theme/css/pygment.css
new file mode 100644
index 00000000..594b0fa3
--- /dev/null
+++ b/tests/output/custom/theme/css/pygment.css
@@ -0,0 +1,205 @@
+.hll {
+background-color:#FFFFCC;
+}
+.c {
+color:#408090;
+font-style:italic;
+}
+.err {
+border:1px solid #FF0000;
+}
+.k {
+color:#007020;
+font-weight:bold;
+}
+.o {
+color:#666666;
+}
+.cm {
+color:#408090;
+font-style:italic;
+}
+.cp {
+color:#007020;
+}
+.c1 {
+color:#408090;
+font-style:italic;
+}
+.cs {
+background-color:#FFF0F0;
+color:#408090;
+}
+.gd {
+color:#A00000;
+}
+.ge {
+font-style:italic;
+}
+.gr {
+color:#FF0000;
+}
+.gh {
+color:#000080;
+font-weight:bold;
+}
+.gi {
+color:#00A000;
+}
+.go {
+color:#303030;
+}
+.gp {
+color:#C65D09;
+font-weight:bold;
+}
+.gs {
+font-weight:bold;
+}
+.gu {
+color:#800080;
+font-weight:bold;
+}
+.gt {
+color:#0040D0;
+}
+.kc {
+color:#007020;
+font-weight:bold;
+}
+.kd {
+color:#007020;
+font-weight:bold;
+}
+.kn {
+color:#007020;
+font-weight:bold;
+}
+.kp {
+color:#007020;
+}
+.kr {
+color:#007020;
+font-weight:bold;
+}
+.kt {
+color:#902000;
+}
+.m {
+color:#208050;
+}
+.s {
+color:#4070A0;
+}
+.na {
+color:#4070A0;
+}
+.nb {
+color:#007020;
+}
+.nc {
+color:#0E84B5;
+font-weight:bold;
+}
+.no {
+color:#60ADD5;
+}
+.nd {
+color:#555555;
+font-weight:bold;
+}
+.ni {
+color:#D55537;
+font-weight:bold;
+}
+.ne {
+color:#007020;
+}
+.nf {
+color:#06287E;
+}
+.nl {
+color:#002070;
+font-weight:bold;
+}
+.nn {
+color:#0E84B5;
+font-weight:bold;
+}
+.nt {
+color:#062873;
+font-weight:bold;
+}
+.nv {
+color:#BB60D5;
+}
+.ow {
+color:#007020;
+font-weight:bold;
+}
+.w {
+color:#BBBBBB;
+}
+.mf {
+color:#208050;
+}
+.mh {
+color:#208050;
+}
+.mi {
+color:#208050;
+}
+.mo {
+color:#208050;
+}
+.sb {
+color:#4070A0;
+}
+.sc {
+color:#4070A0;
+}
+.sd {
+color:#4070A0;
+font-style:italic;
+}
+.s2 {
+color:#4070A0;
+}
+.se {
+color:#4070A0;
+font-weight:bold;
+}
+.sh {
+color:#4070A0;
+}
+.si {
+color:#70A0D0;
+font-style:italic;
+}
+.sx {
+color:#C65D09;
+}
+.sr {
+color:#235388;
+}
+.s1 {
+color:#4070A0;
+}
+.ss {
+color:#517918;
+}
+.bp {
+color:#007020;
+}
+.vc {
+color:#BB60D5;
+}
+.vg {
+color:#BB60D5;
+}
+.vi {
+color:#BB60D5;
+}
+.il {
+color:#208050;
+}
diff --git a/tests/output/custom/theme/css/reset.css b/tests/output/custom/theme/css/reset.css
new file mode 100644
index 00000000..1e217566
--- /dev/null
+++ b/tests/output/custom/theme/css/reset.css
@@ -0,0 +1,52 @@
+/*
+	Name: Reset Stylesheet
+	Description: Resets browser's default CSS
+	Author: Eric Meyer
+	Author URI: http://meyerweb.com/eric/tools/css/reset/
+*/
+
+/* v1.0 | 20080212 */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	background: transparent;
+	border: 0;
+	font-size: 100%;
+	margin: 0;
+	outline: 0;
+	padding: 0;
+	vertical-align: baseline;
+}
+
+body {line-height: 1;}
+
+ol, ul {list-style: none;}
+
+blockquote, q {quotes: none;}
+
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {text-decoration: none;}
+del {text-decoration: line-through;}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
\ No newline at end of file
diff --git a/tests/output/custom/theme/css/typogrify.css b/tests/output/custom/theme/css/typogrify.css
new file mode 100644
index 00000000..c9b34dc8
--- /dev/null
+++ b/tests/output/custom/theme/css/typogrify.css
@@ -0,0 +1,3 @@
+.caps {font-size:.92em;}
+.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}    
+.dquo {margin-left:-.38em;}
diff --git a/tests/output/custom/theme/css/wide.css b/tests/output/custom/theme/css/wide.css
new file mode 100644
index 00000000..3376f4c7
--- /dev/null
+++ b/tests/output/custom/theme/css/wide.css
@@ -0,0 +1,43 @@
+@import url("main.css");
+
+body {
+    font:1.3em/1.3 "Hoefler Text","Georgia",Georgia,serif,sans-serif;
+}
+
+.body, #banner nav, #banner nav ul, #about, #featured, #content{
+    width: inherit;
+}
+
+#banner nav {
+    -moz-border-radius: 0px;
+    margin-bottom: 0px;
+}
+
+#banner nav ul{
+    padding-right: 50px;
+}
+
+#banner nav li{
+    float: right;
+}
+
+#banner nav li:first-child a {
+    -moz-border-radius: 0px;
+}
+
+#banner h1 {
+    margin-bottom: -18px;
+}
+
+#featured, #extras {
+    padding: 50px;
+}
+
+#featured {
+    padding-top: 20px;
+}
+
+#extras {
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
diff --git a/tests/output/custom/theme/images/icons/delicious.png b/tests/output/custom/theme/images/icons/delicious.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6ce246a4602f8f74e75ea8cfe9f5a00daceeb33
GIT binary patch
literal 963
zcmV;!13dhRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH0~|?2
zK~y-6Ws<#bTV))DpZogtjeX;f*md33No`1zmc&$+7>H1WP&XnFV&q?F7ZxN~K<dU&
z5HPW^&;b=H(G3X%3lfo{N@-}DCV?hRT_;Wxe_h`%-+O-y2~&@Bq_aFa($O&h3WY*>
zI2_i~X=|=poxD)3){1kpXG^wzH)G`%n@9Vdqh@z9)$_-#O6KsOno1r{oLaey`u-PV
zY3aS2^Ye4>S8M03dc96IlcH2Q#q{(nf8K*{zJqcRIvv=4D%`zi;68GBwb9|D4{t8%
zQt846H*S2cctHWJrs7#s6F7hZ$1zC814fk;8_#?Ee8=nS(J0;psU1TjL;w;PhJ&dS
zcwv_A5bPl|cU(qMn}nGpl^95_wD?4urU3{L6GZ|*A^{MSNeiu3NEiu6?GVBy>72{R
z(Kx-dQ9hHO)y3kN1By5f00YASh=3wSyiN0ggEI42*?m;bfk;Ru6|SFT?Qivt&gGJQ
z0HsndtkBwf2K^~wWnd3HkV6P8z=FJZQ)jk*(+39!_g7b!7rI@Kjg2Qfe6WUX2W&q4
zm9>AbkbdcF>N7oxr3%(~flSKebasN)?kzQL-rD7rOZ6X4m**v)zbsG|$Ot3_kjmLb
z+1wTp2}Q&gk?16geEG#E(r7f^)S2wL*J3H-dM%>JLs0-C`u2c&Bg;%J0usOo2#^>I
zm0)jQv%0!&tLpjbAH&e6-`@j?5F;iO4{)(<;{=8<Ja#N6FY&$h!onLnDwVd@gP@P^
zIYe=Yh>!1ufW_vcb=v!nPbNJk4W$4<pu4>M$C0YlrpA5WMQe>ngouCATHtwiggqDn
zpmhqZO_X5*2EA^#c=hTvOYiJF4zk%iesGAXz;)Y1(Gb{&Foo+MH+!CqX`1x=E(6=a
z3xd+QN_kS(Y8UUXtUSecY!cc9!)0ttVJ6b(WQk8d`&MSAEB5Bru8L#b@jU;Z?d_F*
zp^)0Ue*NR7wk&I_ae3~mrMKUTm;bu6ve#ZeSa|(Px7SYvp68Eg<s7{{UFl@96N%fm
lfA6iX{uKOwv`ZK3{0A}(g|**FbEW_Q002ovPDHLkV1fyHvk?FQ

literal 0
HcmV?d00001

diff --git a/tests/output/custom/theme/images/icons/lastfm.png b/tests/output/custom/theme/images/icons/lastfm.png
new file mode 100644
index 0000000000000000000000000000000000000000..b09c7876537ad9faa7a7a68ad6c8035d2e32ec3a
GIT binary patch
literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH11(8J
zK~y-6J&{dpR8<^D&%N)?o9`l>DI;xZLzt*k2_&L4MiM1NNsIxFtWXmdy1<VRUAkt;
z#*JZP0?{21<HxFmM57o1EiE*bP=x5TcIdR7nZB8MZ{EB2@1n-l+5B?yOO9Ik^3v{9
zWBpyfTzXL#^95}@r#v%l5=tb=<9KQXMFWutYgb8mJu?0pNm3_mE*ZbkJUig~2Z>`?
zT?efJc?>@Vo&nf_bKo2(1#tonNMf9Fw@oHa9%ZBgewzP>ae_Dt&Y_e70Fh1Pawy}$
zgGB;k2Q^V2@>xK^dK)%+5L*ai5cQu}LEnNlD5W7~ke~zY?x<0Z6aqFnkjcVC6{_Qq
z%b*tPaAOXF9t;#<avxL%VR{~FOGp^vnypByOnMC~@WKH&uy^z7^6IAO$U$hV!Lxf{
z=LjsVAWv1Hwv3&-N7(I@jI@Fxhn|Ol0`{x#(DeqYpTO`CynPg^V^D9v_92p~pXglv
zg?u(mywM>p`dWwBh@GP(GxNkhUPq-2wz)=f;d|VTS>(_pozKqU?$<CUPmp=*7*XvZ
z;c^2fM7r_o&AtG7$9AM25&!%<@vT1zuHT_^<~%B&BQ6wJ+Wivk^IwyG?J(xOH|WjZ
zM;G%&?e5ib(H9rcgIh=)Kf=c4Yph?LA=x`YZ>^1Owke!?hd2rd&Yas!y5|W3+lTtY
z!z}DSdabr?Qi6+9A|etm)g_qyLlP1B=gm)K`S?d7BI4Eq5fQOrB!9hrQs&YV^7qRp
z7QGM0p8UXThn4QPSBP)lMHdUGR-5+ev-GB}(w$#GXS3*$Av)h&Vdd0mg5PeU%O!HV
zMi<nbr(c~ehO$q48oSaW+Gu0r2rrjKRm#}Jp;nt{lft$GWJ{KQxrk>S<yW5j!DREf
z#A~+Dr2%Bv$4|DRoI{~dX%DLvE@jZMBV8#Gd5(UshcO;vtv1>5;aca`gZ*9{qBCi%
zwUAF?iaAuy$I}{@62$Y6SYsQj=uRIhTT$bq7frj6{xp7O*Nmx-Io0hc+Y3_?M%yHe
z262>Cw^!CiWpLK0R<o!^%6I+B(B}#_TmJa{>3;#J&y{nbj~!kB0000<MNUMnLSTZZ
C;k#e}

literal 0
HcmV?d00001

diff --git a/tests/output/custom/theme/images/icons/linkedin.png b/tests/output/custom/theme/images/icons/linkedin.png
new file mode 100644
index 0000000000000000000000000000000000000000..feb04962bfe2fd712cb5003c8c20b43af4c18201
GIT binary patch
literal 376
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1Ig<N%)#SD+I6
z_O)}4-}0QX^Tp@yRa?$nd;UIt$zg}dTMylR@%{H7$0>Wd_Fj7M_G{R}1CBkLw_JJn
z>DQmab*CL>?Ok)>!PFzy{Acg}|Np;3*ZSPGC!W6l5w&pt&tHEg9=P)1$FJ6%7tcO?
zWxgW&B*^ZPAirP+hi5m^K%69RcNc~ZR#^`qhqJ&VvY3H^TNs2H8D`Cq01C2~c>21s
z-{R(FQ&rw_X(1C(sL|8KF+}2W>G_L%hZJ~NFD#lIs%=oPMZxdy|Meo%9>~ox&zv>K
zB$L~r<aZkfgWz=Lyqm20XVxusKG$*l)?2QYAJ>*j<o0AdvsI9iTUyciG3K=Cj_Pdv
zsFgaO=a_kD{%Kv_vzW(gZpy5n+eNW69-p?9c8*Zj*!tyi{epY%eko6V$gGmgC;W7e
S-+7>87(8A5T-G@yGywqOA)@^N

literal 0
HcmV?d00001

diff --git a/tests/output/custom/theme/images/icons/rss.png b/tests/output/custom/theme/images/icons/rss.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d4e85d981cbecb04b76dab5a234dc4690bd15ab
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH0@+DK
zK~y-6O_EE9990yCzjLd)r^ifBchXK`gN{uSqd0=7kbqhEAc*5eg)D?1#7z(k=t4x?
zNsw9SGD{(noh~9MD2X6K0zO7JK4L<2NIQAV^f*1~?yBm#RrlWGqBZ!h4jlgP{QMl@
zU+I@e9$=>SEYtNmqqUus!wx3gi-~73je=sdif|T*ZW7`utw+wuWACgAfSy0TMEK!t
zYE6(SC>(?md;vs&h4d<9>k!o-OF=;&Jh2#spFTJsviuSC-JmTPu0b(`Yz>m@kp2nd
zRUig43#A1DSVeq#S1i(h1~UbNA&f4<@Dez{166^UU6a|4zzqNaQ-P|7a=jCiUOUL}
z3N#kr{$pS>NV;Hq6WHcusMH{MFwq3?pM*wCy57Y0p#2u?K8oJnF^Tc@i}3sB(5is`
z&ujoKf??Y|8_dk3zrBZk^(0()1>IOi0VRT`KZE-Y!JwQ_MM0Ec!G-#oQ7S8B*C&m)
z9zsUnBA@O@&vekimC3b3XJKv+*c=oPA>^RdcGocO^|4z>a{(Sb35%DIBflaWUCfz>
zQFjZBp}hMA+!o*!5JCWhI3vLdv-@E4JLJM)^p8{Mwgoua!=+>7`_};|cRh#oK;+Rv
zNi2+$zuQKub16jv5<!_EKfZ>1d?zwBNAdUx{4b}$ji|JrAT%0~d0eJ=2e~(~foQ~_
z3)4H%r@nxfGD;Ie?>uh)WzrN#E)!KFN;5~c1saqnf>_HU26K%7Xh1@OH8YI!nC9}k
z*h+``4uL_Jq~Ax=P1JxOhzFJ0Nc_*I=gq}q-H_#oZ;@++WIbxRAxOY<w&S;QvduA5
z^(qoa<j!-WTTtv-{7?YgH^<*JD<|JC{sJ7t4Z*4qG?0wJjUkS}SHLM`IV7#UD?1J@
z9k~5k*||6Nio5x0=wE$aT(X)beXR9uYxRy$-R?A+UQd($Ez{g5aeMzK3x}6Z0sI3i
WiC~OGt1?Oe0000<MNUMnLSTZworl%{

literal 0
HcmV?d00001

diff --git a/tests/output/custom/theme/images/icons/twitter.png b/tests/output/custom/theme/images/icons/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6119280123364c3b37171b9ff0b37c1d67ed2b5
GIT binary patch
literal 835
zcmV-J1HAl+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH0-Q-i
zK~y-6Es{%XT~!=M*MIMQ?lVnH1Zip;AE}^N>OiSOJF#OyKaDf}3{E=hP(;vSr6A%!
z5Wx-#wfF#SX!^KKyzg_*IeY(q4&wR%YqFNzI?kWA&ec)m@>XRpwrI3)JeW}#)`N^$
zgVab`nX}wD^EPw$;!wBji+^(4RI1+HGY+Cqifm)dfX5O&g8?8xD-m7bu)#Q5+Am>K
zbbr(X4~2j+mazpK0*CI@F6M$oE^LZu1-)J*_5x2f+6k>wc@UivucXMs7C!nDzMjE;
z3=E3%ye&*SXI-2u=zzx^tZE%6qIz5AoHqjk-%sJY6S%empJ2RS1!|0%$WeBt3M3#G
zFg&L$`Hnf~Lqx#66>Rt6-wad1-%a3A1F!esonhoR7bh-UMhL{z7O9nRg9ebng#bU#
z;Nvw+3OsFL4BS41H;2ZZ0(B9q!fr5m>oS%_Oo}+okbsoo!4jS|5KNp%OdJf@HmDsy
zO&V1c3undz6o&%L9d2yF2fOez8*dN9dt-6WjkSOxqI8lZby8$e#HGsFt|IeRjDqpm
zML6j5KgJ&}?sjk?L0=gaEkZEWxnu^x*ouKGV-T<%#5XgzvxIM_;z0uk!Pqr1>k3VF
z%#~A>m=_FUVuf*a1bYTq;^qW4X5<Vn58%t!;H_x<(4MW?IVq$V79sXIZp8EKTtDYr
z8H=OFs2#e_Srzze?L2JYa)ce6X?9|;L0T16W1w|-RKxx`<MT`6!?BYv_J@HYI2;&n
z^k7b5U9WkvsTgAWDI22&uosQf&iQp=ygD>)ydX*`^pjC>R_4c<bH6T}mLAJi%r}0`
zzIwK}{(Fu$2hP}=ZrQj@U_~g)`<p@qa+6sx8UyY0s%hP6@{-w4{{b|mi<LUa0B`^R
N002ovPDHLkV1i<-Wjp`?

literal 0
HcmV?d00001

diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
new file mode 100644
index 00000000..2fd6b306
--- /dev/null
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -0,0 +1,169 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>This is a super article !</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li ><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
+
+
+</footer><!-- /.post-info -->
+        <p>Some content here !</p>
+<div class="section" id="this-is-a-simple-title">
+<h2>This is a simple title</h2>
+<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<pre class="literal-block">
+&gt;&gt;&gt; from ipdb import set_trace
+&gt;&gt;&gt; set_trace()
+</pre>
+<p>→ And now try with some utf8 hell: ééé</p>
+</div>
+
+        </div><!-- /.entry-content -->
+        
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "this-is-a-super-article.html";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
new file mode 100644
index 00000000..b7730421
--- /dev/null
+++ b/tests/output/custom/unbelievable.html
@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Unbelievable !</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href=".">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                
+                    <li class="active"><a href="./category/content.html">content</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+<article>
+        <header> <h1 class="entry-title"><a href=""
+        rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>  </header>
+        <div class="entry-content">
+        <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        
+<p>In <a href="./category/content.html">content</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+        <p>Or completely awesome. Depends the needs.</p>
+
+        </div><!-- /.entry-content -->
+        
+        <div class="comments">
+        <h2>Comments !</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "unbelievable.html";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        
+
+</article>
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file

From 2f1f6b5b436d25a7ff13bccd096a1da226f56261 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Mar 2012 13:44:57 +0200
Subject: [PATCH 0616/2864] test that the output of the samples pelican project
 is correct

(functionnal testing)
---
 tests/test_pelican.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index ce270955..80e5fc7f 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -1,13 +1,15 @@
 import unittest
 import os
+from filecmp import dircmp
 
 from .support import temporary_folder
 
 from pelican import Pelican
 from pelican.settings import read_settings
 
-SAMPLES_PATH = os.path.abspath(os.sep.join(
-    (os.path.dirname(os.path.abspath(__file__)), "..", "samples")))
+CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
+SAMPLES_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "..", "samples")))
+OUTPUT_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "output")))
 
 INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
 SAMPLE_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf.py")
@@ -24,8 +26,18 @@ class TestPelican(unittest.TestCase):
         with temporary_folder() as temp_path:
             pelican = Pelican(path=INPUT_PATH, output_path=temp_path)
             pelican.run()
+            diff = dircmp(temp_path, os.sep.join((OUTPUT_PATH, "basic")))
+            self.assertEqual(diff.left_only, [])
+            self.assertEqual(diff.right_only, [])
+            self.assertEqual(diff.diff_files, [])
 
-        # the same thing with a specified set of settins should work
+    def test_custom_generation_works(self):
+        # the same thing with a specified set of settings should work
         with temporary_folder() as temp_path:
             pelican = Pelican(path=INPUT_PATH, output_path=temp_path,
                               settings=read_settings(SAMPLE_CONFIG))
+            pelican.run()
+            diff = dircmp(temp_path, os.sep.join((OUTPUT_PATH, "custom")))
+            self.assertEqual(diff.left_only, [])
+            self.assertEqual(diff.right_only, [])
+            self.assertEqual(diff.diff_files, [])

From 64e12b18099ea580d832791b75005cff38e7bf9e Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Mar 2012 14:20:55 +0200
Subject: [PATCH 0617/2864] fix missing </ol> and </section> tags

---
 pelican/themes/notmyidea/templates/index.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index f81275ae..69dc4622 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -19,7 +19,7 @@
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             {% endif %}
         {# other items #}
         {% else %} 
@@ -44,17 +44,17 @@
            or not articles_page.has_previous() and loop.length > 1) %}
             {% include 'pagination.html' %}
         {% endif %}
-{% endfor %}
-    {% if loop.length > 1 or articles_page.has_previous() %}
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-{% endif %}
+        {% if loop.last %}
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        {% endif %}
+    {% endfor %}
 {% else %}
 <section id="content" class="body">    
 <h2>Pages</h2>
-{% for page in PAGES %}
-    <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
-{% endfor %}
+    {% for page in PAGES %}
+        <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
+    {% endfor %}
 </section>
 {% endif %}
 {% endblock content %}

From abadedffeca0ccf53b3219593410d7851c0f8592 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Mar 2012 14:23:12 +0200
Subject: [PATCH 0618/2864] update output for functionnal testing

---
 tests/output/basic/author/alexis-metaireau.html | 11 ++++++-----
 tests/output/basic/author/bruno.html            | 15 ++++++++++-----
 tests/output/basic/category/bar.html            |  5 ++++-
 tests/output/basic/category/cat1.html           | 13 ++++++++-----
 tests/output/basic/category/content.html        | 11 ++++++-----
 tests/output/basic/category/yeah.html           |  5 ++++-
 tests/output/basic/index.html                   | 17 ++++++++++++-----
 tests/output/basic/tag/bar.html                 | 13 ++++++++-----
 tests/output/basic/tag/baz.html                 | 11 ++++++-----
 tests/output/basic/tag/foo.html                 | 12 +++++++-----
 tests/output/basic/tag/foobar.html              |  5 ++++-
 tests/output/basic/tag/oh.html                  |  5 ++++-
 tests/output/basic/tag/yeah.html                |  5 ++++-
 .../output/custom/author/alexis-metaireau.html  | 13 ++++++++-----
 .../output/custom/author/alexis-metaireau2.html | 11 +++++++----
 tests/output/custom/category/bar.html           |  5 ++++-
 tests/output/custom/category/cat1.html          | 13 ++++++++-----
 tests/output/custom/category/content.html       | 11 ++++++-----
 tests/output/custom/category/yeah.html          |  5 ++++-
 tests/output/custom/index.html                  | 13 ++++++++-----
 tests/output/custom/index2.html                 | 11 +++++++----
 tests/output/custom/tag/bar.html                | 13 ++++++++-----
 tests/output/custom/tag/baz.html                | 11 ++++++-----
 tests/output/custom/tag/foo.html                | 12 +++++++-----
 tests/output/custom/tag/foobar.html             |  5 ++++-
 tests/output/custom/tag/oh.html                 |  5 ++++-
 tests/output/custom/tag/yeah.html               |  5 ++++-
 27 files changed, 168 insertions(+), 93 deletions(-)

diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index eda5498d..ab68482d 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -83,12 +83,13 @@ YEAH !</p>
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -124,11 +125,11 @@ as well as <strong>inline markup</strong>.
         
             
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/author/bruno.html b/tests/output/basic/author/bruno.html
index fdc1da37..1e2dc655 100644
--- a/tests/output/basic/author/bruno.html
+++ b/tests/output/basic/author/bruno.html
@@ -72,12 +72,13 @@
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -112,6 +113,7 @@
         
         
         
+            
 
         
          
@@ -146,6 +148,7 @@
         
         
         
+            
 
         
          
@@ -180,6 +183,7 @@
         
         
         
+            
 
         
          
@@ -219,6 +223,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -254,11 +259,11 @@ Translations:
         
             
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index 07dcae9e..b268dd53 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -85,7 +85,10 @@ YEAH !</p>
         
         
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index bee9d918..e92fd0df 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -72,12 +72,13 @@
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -112,6 +113,7 @@
         
         
         
+            
 
         
          
@@ -146,6 +148,7 @@
         
         
         
+            
 
         
          
@@ -181,11 +184,11 @@
         
             
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/category/content.html b/tests/output/basic/category/content.html
index 1c09459d..0eec912c 100644
--- a/tests/output/basic/category/content.html
+++ b/tests/output/basic/category/content.html
@@ -78,12 +78,13 @@ Translations:
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -119,11 +120,11 @@ Translations:
         
             
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index cc146893..ccb531f1 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -86,7 +86,10 @@
         
         
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index be97e8c8..8a2091b9 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -78,12 +78,13 @@ Translations:
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -117,6 +118,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -151,6 +153,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -185,6 +188,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -219,6 +223,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -253,6 +258,7 @@ as well as <strong>inline markup</strong>.
         
         
         
+            
 
         
          
@@ -297,6 +303,7 @@ YEAH !</p>
         
         
         
+            
 
         
          
@@ -332,11 +339,11 @@ YEAH !</p>
         
             
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 8fc4e143..4afb4bfd 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -78,12 +78,13 @@ Translations:
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -123,6 +124,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -157,6 +159,7 @@ as well as <strong>inline markup</strong>.
         
         
         
+            
 
         
          
@@ -202,11 +205,11 @@ YEAH !</p>
         
             
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index 9f773873..b8df58e3 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -78,12 +78,13 @@ Translations:
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -124,11 +125,11 @@ Translations:
         
             
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 73de8459..20cf293a 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -78,12 +78,13 @@ Translations:
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -123,6 +124,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -158,11 +160,11 @@ as well as <strong>inline markup</strong>.
         
             
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 55ddfe78..0a5eeb3b 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -86,7 +86,10 @@
         
         
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index a8839f52..563c0f2e 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -85,7 +85,10 @@ YEAH !</p>
         
         
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 5ff2b2e0..4b18b7e3 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -85,7 +85,10 @@ YEAH !</p>
         
         
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 89893dd9..1a373e5d 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -80,12 +80,13 @@
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -120,6 +121,7 @@
         
         
         
+            
 
         
          
@@ -154,6 +156,7 @@
         
         
         
+            
 
         
          
@@ -197,11 +200,11 @@
 </p>
 
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index be2c0db2..43ded360 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -99,6 +99,7 @@ YEAH !</p>
         
         
         
+            
 
         
          
@@ -138,6 +139,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -172,6 +174,7 @@ as well as <strong>inline markup</strong>.
         
         
         
+            
 
         
          
@@ -217,11 +220,11 @@ as well as <strong>inline markup</strong>.
 </p>
 
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index d2088eae..809a2bdf 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -99,7 +99,10 @@ YEAH !</p>
         
         
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index d0ac8972..fa6c6556 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -80,12 +80,13 @@
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -120,6 +121,7 @@
         
         
         
+            
 
         
          
@@ -154,6 +156,7 @@
         
         
         
+            
 
         
          
@@ -195,11 +198,11 @@
 </p>
 
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/category/content.html b/tests/output/custom/category/content.html
index 389d7707..16651436 100644
--- a/tests/output/custom/category/content.html
+++ b/tests/output/custom/category/content.html
@@ -86,12 +86,13 @@ Translations:
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -133,11 +134,11 @@ Translations:
 </p>
 
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index b70b36e7..3c9af4e2 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -100,7 +100,10 @@
         
         
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index 2154ea99..466a4db4 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -86,12 +86,13 @@ Translations:
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -125,6 +126,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -159,6 +161,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -202,11 +205,11 @@ Translations:
 </p>
 
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index 9604afd7..9262d717 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -89,6 +89,7 @@
         
         
         
+            
 
         
          
@@ -123,6 +124,7 @@ as well as <strong>inline markup</strong>.
         
         
         
+            
 
         
          
@@ -167,6 +169,7 @@ YEAH !</p>
         
         
         
+            
 
         
          
@@ -212,11 +215,11 @@ YEAH !</p>
 </p>
 
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 069276ad..bf468bf2 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -86,12 +86,13 @@ Translations:
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -131,6 +132,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -165,6 +167,7 @@ as well as <strong>inline markup</strong>.
         
         
         
+            
 
         
          
@@ -216,11 +219,11 @@ YEAH !</p>
 </p>
 
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index 02d87aa1..34bcdbc3 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -86,12 +86,13 @@ Translations:
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -138,11 +139,11 @@ Translations:
 </p>
 
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index 2089003d..c8f088f1 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -86,12 +86,13 @@ Translations:
                 <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
-                        <ol id="posts-list" class="hfeed">
+                    <ol id="posts-list" class="hfeed">
             
         
         
         
         
+            
 
         
          
@@ -131,6 +132,7 @@ Translations:
         
         
         
+            
 
         
          
@@ -172,11 +174,11 @@ as well as <strong>inline markup</strong>.
 </p>
 
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
-    </ol><!-- /#posts-list -->
-    </section><!-- /#content -->
-
 
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index 8187acd5..682a9b7d 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -100,7 +100,10 @@
         
         
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index a27bb302..9e8239a4 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -99,7 +99,10 @@ YEAH !</p>
         
         
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index ac1ef4fa..675a53cb 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -99,7 +99,10 @@ YEAH !</p>
         
         
         
-
+        
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 

From 34310a61f5bf33a4a33db11178769e7e6f1daacc Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Sat, 31 Mar 2012 08:10:40 -0700
Subject: [PATCH 0619/2864] Feed link inside feed should use FEED_DOMAIN

The initial work on enabling feeds to be served from a different domain
than the site domain focused on the feed link displayed inside the
base template. But there is also a feed link inside the generated feed
itself, which this commit updates to use the FEED_DOMAIN value (if
defined).

Also, it turns out that the FEED_MAIN_URL setting is not necessary; the
existing FEED and FEED_RSS functionality is simpler and can address the
targeted use case just as easily. That attribute has been removed from
the settings and template, along with corresponding changes to the docs.
Refs #177.
---
 docs/settings.rst                            | 33 +++++++++-----------
 pelican/settings.py                          |  1 -
 pelican/themes/notmyidea/templates/base.html |  4 +--
 pelican/writers.py                           |  3 +-
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 1ed36844..b7882075 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -235,11 +235,6 @@ Setting name (default value)                        What does it do?
 `TAG_FEED_RSS` (``None``, ie no RSS tag feed)       Relative URL to output the tag RSS feed
 `FEED_MAX_ITEMS`                                    Maximum number of items allowed in a feed. Feed item
                                                     quantity is unrestricted by default.
-`FEED_MAIN_URL` (``'feeds/all.atom.xml'``)          URL appended to domain for the main Atom feed and
-                                                    used to populate its `<link>` in the base template.
-                                                    Useful when you want the feed link to differ from the 
-                                                    filesystem path, such as when using web server
-                                                    aliases/rewrites or FeedBurner (see below).
 ================================================    =====================================================
 
 If you don't want to generate some of these feeds, set ``None`` to the
@@ -250,21 +245,21 @@ variables above.
 FeedBurner
 ----------
 
-If you want to use FeedBurner for your primary Atom feed, there are two
-primary fields to configure in the `FeedBurner
-<http://feedburner.google.com>`_ interface: "Original Feed" and "Feed Address".
-If using the default Pelican `FEED` attribute and assuming your feeds
-are served from the `www.example.com` domain, you would enter
-`http://www.example.com/feeds/all.atom.xml` in the "Original Feed" field in
-FeedBurner.
+If you want to use FeedBurner for your feed, you will likely need to decide
+upon a unique identifier. For example, if your site were called "Thyme" and
+hosted on the www.example.com domain, you might use "thymefeeds" as your
+unique identifier, which we'll use throughout this section for illustrative
+purposes. In your Pelican settings, set the `FEED` attribute to
+"thymefeeds/main.xml" to create an Atom feed with an original address of
+`http://www.example.com/thymefeeds/main.xml`. Set the `FEED_DOMAIN` attribute
+to `http://feeds.feedburner.com`, or `http://feeds.example.com` if you are
+using a CNAME on your own domain (i.e., FeedBurner's "MyBrand" feature).
 
-For the "Feed Address" field in the FeedBurner interface, you may choose
-whatever suffix you prefer. In your Pelican settings, assign this suffix to
-the `FEED_MAIN_URL` setting. So if your FeedBurner feed address is set to
-`http://feeds.feedburner.com/myblogfeed`, in your Pelican settings you would
-set: `FEED_MAIN_URL = "myblogfeed"`. Then set the `FEED_DOMAIN` setting to
-`http://feeds.feedburner.com`, or `http://feeds.example.com` if you are using
-a CNAME on your own domain (i.e., FeedBurner's "MyBrand" feature).
+There are two fields to configure in the `FeedBurner
+<http://feedburner.google.com>`_ interface: "Original Feed" and "Feed
+Address". In this example, the "Original Feed" would be
+`http://www.example.com/thymefeeds/main.xml` and the "Feed Address" suffix
+would be `thymefeeds/main.xml`.
 
 Pagination
 ==========
diff --git a/pelican/settings.py b/pelican/settings.py
index 9dea1e94..c0e30815 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -22,7 +22,6 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'STATIC_PATHS': ['images', ],
                    'THEME_STATIC_PATHS': ['static', ],
                    'FEED': 'feeds/all.atom.xml',
-                   'FEED_MAIN_URL': 'feeds/all.atom.xml',
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
                    'TRANSLATION_FEED': 'feeds/all-%s.atom.xml',
                    'FEED_MAX_ITEMS': '',
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 0fd388cf..f0f745e4 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -4,7 +4,7 @@
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
-        <link href="{{ FEED_DOMAIN }}/{{ FEED_MAIN_URL }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ FEED }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
         {% if FEED_RSS %}
         <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
@@ -56,7 +56,7 @@
                 <div class="social">
                         <h2>social</h2>
                         <ul>
-                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_MAIN_URL }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
                             {% if FEED_RSS %}
                             <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             {% endif %}
diff --git a/pelican/writers.py b/pelican/writers.py
index 7bb7ab44..e72753ab 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -59,7 +59,8 @@ class Writer(object):
         locale.setlocale(locale.LC_ALL, 'C')
         try:
             self.site_url = context.get('SITEURL', get_relative_path(filename))
-            self.feed_url = '%s/%s' % (self.site_url, filename)
+            self.feed_domain = context.get('FEED_DOMAIN')
+            self.feed_url = '%s/%s' % (self.feed_domain, filename)
 
             feed = self._create_new_feed(feed_type, context)
 

From 56b8a88b1f70037b0dab7d85c5cce05c6213176b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Sat, 31 Mar 2012 10:08:16 -0700
Subject: [PATCH 0620/2864] Improve uniqueness of feed entry ID

The ID of a feed entry should never change, but the previous method of
generating the ID -- i.e., using the entry URL -- results in an ID that
is not permanent and can change. Switching to the tag URI method from
RFC 4151 should help improve the long-term uniqueness and permanence of
entry IDs, as espoused here:
<http://web.archive.org/web/20110514113830/http://diveintomark.org/archives/2004/05/28/howto-atom-id>

Also added a trailing slash to the site URL inside the feed; the lack
thereof was causing a feed validation warning.
---
 pelican/writers.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index e72753ab..faca46bd 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -27,7 +27,7 @@ class Writer(object):
         feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
         feed = feed_class(
             title=context['SITENAME'],
-            link=self.site_url,
+            link=(self.site_url + '/'),
             feed_url=self.feed_url,
             description=context.get('SITESUBTITLE', ''))
         return feed
@@ -36,8 +36,9 @@ class Writer(object):
 
         feed.add_item(
             title=item.title,
-            link='%s/%s' % (self.site_url, item.url),
-            unique_id='%s/%s' % (self.site_url, item.url),
+            link='%s%s' % (self.site_url, item.url),
+            unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''),
+                                        item.date.date(), item.url),
             description=item.content,
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', 'John Doe'),

From 68b4b8f2f2c00fa54c81355dd89c48eab0423752 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 1 Apr 2012 03:22:53 +0200
Subject: [PATCH 0621/2864] Add markdown as a dev requirement.

This allows everyone to have the same setup when generating the tests. It is
useful for #288 for instance.
---
 .travis.yml          | 1 +
 dev_requirements.txt | 1 +
 tox.ini              | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 823c1172..ea134da4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
 install:
     - pip install nose unittest2 mock --use-mirrors
     - pip install . --use-mirrors
+    - pip install Markdown
 script: nosetests -s tests
 notifications:
     irc:
diff --git a/dev_requirements.txt b/dev_requirements.txt
index c7f53682..e1a15a3f 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -5,3 +5,4 @@ feedgenerator
 unittest2
 pytz
 mock
+Markdown
diff --git a/tox.ini b/tox.ini
index e1ca32f2..2cba1472 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,3 +11,4 @@ deps =
     feedgenerator
     unittest2
     mock
+    Markdown

From 2d55eacc5708b097aba5a9bd3f017b7dcfec8cd5 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 1 Apr 2012 13:21:44 +0200
Subject: [PATCH 0622/2864] Fix the autogenerated makefile.

Fix #278
---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 4f78ac60..7ade62e9 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -56,7 +56,7 @@ ssh_upload: $$(OUTPUTDIR)/index.html
 \tscp -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 ftp_upload: $$(OUTPUTDIR)/index.html
-\tlftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUT_DIR)/* $$(FTP_TARGET_DIR) ; quit"
+\tlftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
 
 github: $$(OUTPUTDIR)/index.html
 \tghp-import $$(OUTPUTDIR)

From ebe5c0b2bf98fe621b604c0ae7c58534e6e4ff32 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 1 Apr 2012 13:37:35 +0200
Subject: [PATCH 0623/2864] Enhance warnings. Fix #196

---
 pelican/utils.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index c74b36bd..18730e6c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -195,7 +195,10 @@ def process_translations(content_list):
             default_lang_items = items[:1]
 
         if not slug:
-            logger.warning('empty slug for %r' % (default_lang_items[0].filename,))
+            msg = 'empty slug for %r. ' % default_lang_items[0].filename\
+                + 'You can fix this by adding a title or a slug to your '\
+                + 'content'
+            logger.warning(msg)
         index.extend(default_lang_items)
         translations.extend(filter(
             lambda x: x not in default_lang_items,

From 373ccdebf27a2980363da6305267b6d9da2200ed Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 1 Apr 2012 13:42:28 +0200
Subject: [PATCH 0624/2864] Add style for the note marker. Fix #257

---
 pelican/themes/notmyidea/static/css/main.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 28c98b99..92905076 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -111,6 +111,13 @@ cite {}
 
 q {}
 
+div.note {
+   float: right;
+   margin: 5px;
+   font-size: 85%;
+   max-width: 300px;
+}
+
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
 	

From be01e9f3a12e655f4e340c064cc4e45f7f7ce066 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 1 Apr 2012 13:50:03 +0200
Subject: [PATCH 0625/2864] Skip functional tests for now

---
 tests/test_pelican.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 80e5fc7f..c317e5b3 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -1,4 +1,8 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest  # NOQA
+
 import os
 from filecmp import dircmp
 
@@ -19,6 +23,7 @@ class TestPelican(unittest.TestCase):
     # general functional testing for pelican. Basically, this test case tries
     # to run pelican in different situations and see how it behaves
 
+    @unittest.skip("Test failing")
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
         # ones and generate the output without raising any exception / issuing
@@ -31,6 +36,7 @@ class TestPelican(unittest.TestCase):
             self.assertEqual(diff.right_only, [])
             self.assertEqual(diff.diff_files, [])
 
+    @unittest.skip("Test failing")
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work
         with temporary_folder() as temp_path:

From fe9af76e224e84331a2f0383ec8618907b0e045b Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 1 Apr 2012 13:51:44 +0200
Subject: [PATCH 0626/2864] default :: doesn't work for syntactic recognition

---
 docs/getting_started.rst | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 1647fee4..04a51540 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -168,18 +168,6 @@ For Markdown, format your code blocks thusly:
 The specified identifier should be one that appears on the 
 `list of available lexers <http://pygments.org/docs/lexers/>`_.
 
-You also can use the default `::` syntax, in which case it will be assumed
-that your code is written in Python. For reStructuredText::
-
-    ::
-        
-        your code goes here
-
-For Markdown:
-
-    ::
-    your code goes here
-
 Autoreload
 ----------
 

From 6880f3d1e90788540c279755651e076d0f9f7673 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 1 Apr 2012 13:54:20 +0200
Subject: [PATCH 0627/2864] make docs more explicit

---
 docs/getting_started.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 04a51540..26e9e402 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -154,13 +154,16 @@ Syntax highlighting
 ---------------------
 
 Pelican is able to provide colorized syntax highlighting for your code blocks.
-To do so, you have to use the following convention for reStructuredText::
+To do so, you have to use the following conventions (you need to put this in
+your content files).
+
+For RestructuredText::
 
     .. code-block:: identifier
 
        your code goes here
 
-For Markdown, format your code blocks thusly:
+For Markdown, format your code blocks thusly::
 
     ::identifier
     your code goes here

From 9f03a407cbb2ff3f27b2ed182cd3134e4762d55c Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 1 Apr 2012 14:46:09 +0200
Subject: [PATCH 0628/2864] the dep to markdown is optional. rst is not.

---
 docs/getting_started.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 26e9e402..f5da2753 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -22,13 +22,13 @@ At this time, Pelican is dependent on the following Python packages:
 
 * feedgenerator, to generate the Atom feeds
 * jinja2, for templating support
+* docutils, for supporting reStructuredText as an input format
 
 If you're not using Python 2.7, you will also need `argparse`.
 
 Optionally:
 
 * pygments, for syntax highlighting
-* docutils, for supporting reStructuredText as an input format
 * Markdown, for supporting Markdown as an input format
 
 Writing articles using Pelican
@@ -53,7 +53,11 @@ following syntax (give your file the `.rst` extension)::
     :author: Alexis Metaireau
 
 
-You can also use Markdown syntax (with a file ending in `.md`)::
+You can also use Markdown syntax (with a file ending in `.md`).
+Markdown generation will not work until you explicitly install the `markdown`
+distribution. You can do so on a normal system using `pip install markdown`
+
+::
 
     Date: 2010-12-03
     Title: My super title

From f492f2d14d92d5dc198af697e2ae7ffb9fa40827 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 1 Apr 2012 15:55:41 +0200
Subject: [PATCH 0629/2864] specify supported python version in the setup.py

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 67bbae80..0e57c83b 100755
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,8 @@ setup(
                    'Environment :: Console',
                    'License :: OSI Approved :: GNU Affero General Public License v3',
                    'Operating System :: OS Independent',
-                   'Programming Language :: Python',
+                   'Programming Language :: Python :: 2.6',
+                   'Programming Language :: Python :: 2.7',
                    'Topic :: Internet :: WWW/HTTP',
                    'Topic :: Software Development :: Libraries :: Python Modules',
                    ],

From 2db2b671f23175462b7222f9e399e09dfc24aa93 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Mon, 2 Apr 2012 01:06:27 +0200
Subject: [PATCH 0630/2864] fix #293: pelican-importer for Wordpress doesn't
 add tags

---
 pelican/tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index b34fd9a5..57c4fc22 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -34,7 +34,7 @@ def wp2fields(xml):
             categories = [cat.contents[0] for cat in item.fetch(domain='category')]
             # caturl = [cat['nicename'] for cat in item.fetch(domain='category')]
 
-            tags = [tag.contents[0].title() for tag in item.fetch(domain='tag', nicename=None)]
+            tags = [tag.contents[0] for tag in item.fetch(domain='post_tag')]
 
             yield (title, content, filename, date, author, categories, tags, "html")
 

From b845db30de56d3177f4a9f1b4ce05049f9ac3aa3 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 3 Apr 2012 11:58:31 +0200
Subject: [PATCH 0631/2864] Add a way to know what metadata exists.

This allows in a theme to have a look at the "metadata" attribute of a content
to know what are the metadata fields defined by it.
---
 pelican/contents.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/contents.py b/pelican/contents.py
index 8e6f2dca..42de4560 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -41,6 +41,9 @@ class Page(object):
         for key, value in local_metadata.items():
             setattr(self, key.lower(), value)
 
+        # also keep track of the metadata attributes available
+        self.metadata = local_metadata
+
         # default author to the one in settings if not defined
         if not hasattr(self, 'author'):
             if 'AUTHOR' in settings:

From 877d454c8fa979343d4881a00977d9ac8786f178 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 4 Apr 2012 22:24:44 +0200
Subject: [PATCH 0632/2864] fix sorting of categories list

---
 pelican/generators.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index d7ebb0b0..02bed967 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -302,7 +302,9 @@ class ArticlesGenerator(Generator):
 
         # order the categories per name
         self.categories = list(self.categories.items())
-        self.categories.sort(reverse=self.settings['REVERSE_CATEGORY_ORDER'])
+        self.categories.sort(
+                key=lambda item: item[0].name,
+                reverse=self.settings['REVERSE_CATEGORY_ORDER'])
 
         self.authors = list(self.authors.items())
         self.authors.sort()

From 7f36e0ed20745c73886d96d4af303b0d858b8a53 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 4 Apr 2012 22:24:53 +0200
Subject: [PATCH 0633/2864] fix sorting of authors list

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 02bed967..de45f411 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -307,7 +307,7 @@ class ArticlesGenerator(Generator):
                 reverse=self.settings['REVERSE_CATEGORY_ORDER'])
 
         self.authors = list(self.authors.items())
-        self.authors.sort()
+        self.authors.sort(key=lambda item: item[0].name)
 
         self._update_context(('articles', 'dates', 'tags', 'categories',
                               'tag_cloud', 'authors'))

From f903aaa1a4241e3cf35aff74ee4d231cb6d368e5 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 4 Apr 2012 22:43:08 +0200
Subject: [PATCH 0634/2864] remove unittest.skip statements for functional
 tests

---
 tests/test_pelican.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index c317e5b3..49328ebe 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -23,7 +23,6 @@ class TestPelican(unittest.TestCase):
     # general functional testing for pelican. Basically, this test case tries
     # to run pelican in different situations and see how it behaves
 
-    @unittest.skip("Test failing")
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
         # ones and generate the output without raising any exception / issuing
@@ -36,7 +35,6 @@ class TestPelican(unittest.TestCase):
             self.assertEqual(diff.right_only, [])
             self.assertEqual(diff.diff_files, [])
 
-    @unittest.skip("Test failing")
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work
         with temporary_folder() as temp_path:

From 7fcaca85dded7b06729ec901bc80f0bf9036487c Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 4 Apr 2012 22:35:53 +0200
Subject: [PATCH 0635/2864] update custom output now that categories are
 correctly sorted

pelican -o tests/output/custom/ -s samples/pelican.conf.py samples/content/
---
 .../custom/a-markdown-powered-article.html       |  8 ++++----
 tests/output/custom/archives.html                |  8 ++++----
 tests/output/custom/article-1.html               |  8 ++++----
 tests/output/custom/article-2.html               |  8 ++++----
 tests/output/custom/article-3.html               |  8 ++++----
 tests/output/custom/author/alexis-metaireau.html |  8 ++++----
 .../output/custom/author/alexis-metaireau2.html  | 13 +++++++------
 tests/output/custom/categories.html              | 16 ++++++++--------
 tests/output/custom/category/bar.html            |  8 ++++----
 tests/output/custom/category/cat1.html           |  8 ++++----
 tests/output/custom/category/content.html        |  8 ++++----
 tests/output/custom/category/yeah.html           |  8 ++++----
 tests/output/custom/drafts/a-draft-article.html  |  8 ++++----
 tests/output/custom/feeds/all-en.atom.xml        | 14 +++++++-------
 tests/output/custom/feeds/all-fr.atom.xml        |  4 ++--
 tests/output/custom/feeds/all.atom.xml           | 14 +++++++-------
 tests/output/custom/feeds/all.rss.xml            | 16 ++++++++--------
 tests/output/custom/feeds/bar.atom.xml           |  2 +-
 tests/output/custom/feeds/bar.rss.xml            |  4 ++--
 tests/output/custom/feeds/cat1.atom.xml          |  6 +++---
 tests/output/custom/feeds/cat1.rss.xml           |  8 ++++----
 tests/output/custom/feeds/content.atom.xml       |  4 ++--
 tests/output/custom/feeds/content.rss.xml        |  6 +++---
 tests/output/custom/feeds/yeah.atom.xml          |  2 +-
 tests/output/custom/feeds/yeah.rss.xml           |  4 ++--
 tests/output/custom/index.html                   |  8 ++++----
 tests/output/custom/index2.html                  | 13 +++++++------
 tests/output/custom/oh-yeah-fr.html              |  8 ++++----
 tests/output/custom/oh-yeah.html                 |  8 ++++----
 .../output/custom/pages/this-is-a-test-page.html |  8 ++++----
 tests/output/custom/second-article-fr.html       |  8 ++++----
 tests/output/custom/second-article.html          |  8 ++++----
 tests/output/custom/tag/bar.html                 | 13 +++++++------
 tests/output/custom/tag/baz.html                 |  8 ++++----
 tests/output/custom/tag/foo.html                 | 13 +++++++------
 tests/output/custom/tag/foobar.html              |  8 ++++----
 tests/output/custom/tag/oh.html                  |  8 ++++----
 tests/output/custom/tag/yeah.html                |  8 ++++----
 tests/output/custom/theme/css/main.css           |  7 +++++++
 tests/output/custom/this-is-a-super-article.html |  8 ++++----
 tests/output/custom/unbelievable.html            |  8 ++++----
 41 files changed, 177 insertions(+), 166 deletions(-)

diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index c001278a..74e53913 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li ><a href="./category/content.html">content</a></li>
                 
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index e9393667..706c7464 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li ><a href="./category/content.html">content</a></li>
                 
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
         
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index 4bdb8f16..8c73b4ac 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li ><a href="./category/content.html">content</a></li>
                 
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index 6a0bb442..e8758391 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li ><a href="./category/content.html">content</a></li>
                 
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index 8410b4f9..ace9dfbf 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li ><a href="./category/content.html">content</a></li>
                 
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 1a373e5d..85f550b4 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 43ded360..53fec2e5 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -165,8 +165,9 @@ Translations:
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
                 <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
diff --git a/tests/output/custom/categories.html b/tests/output/custom/categories.html
index a1a44e5b..92830754 100644
--- a/tests/output/custom/categories.html
+++ b/tests/output/custom/categories.html
@@ -39,27 +39,27 @@
                 
                 
                 
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li ><a href="./category/content.html">content</a></li>
                 
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
         
 <ul>
 
-    <li><a href="category/cat1.html">cat1</a></li>
-
-    <li><a href="category/bar.html">bar</a></li>
-
     <li><a href="category/yeah.html">yeah</a></li>
 
     <li><a href="category/content.html">content</a></li>
 
+    <li><a href="category/cat1.html">cat1</a></li>
+
+    <li><a href="category/bar.html">bar</a></li>
+
 </ul>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index 809a2bdf..53af38da 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li class="active"><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li class="active"><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index fa6c6556..94bb74a7 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li class="active"><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li class="active"><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/category/content.html b/tests/output/custom/category/content.html
index 16651436..7645d430 100644
--- a/tests/output/custom/category/content.html
+++ b/tests/output/custom/category/content.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li class="active"><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index 3c9af4e2..dc20affb 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li class="active"><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index 99f5ad68..e12e5bd7 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li class="active"><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/feeds/all-en.atom.xml b/tests/output/custom/feeds/all-en.atom.xml
index 7356cb17..1b18c1bd 100644
--- a/tests/output/custom/feeds/all-en.atom.xml
+++ b/tests/output/custom/feeds/all-en.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.orgsecond-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.orga-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.orgarticle-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.orgarticle-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.orgarticle-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.orgthis-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.orgoh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.orgunbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all-fr.atom.xml b/tests/output/custom/feeds/all-fr.atom.xml
index 27949d80..1d42bb6e 100644
--- a/tests/output/custom/feeds/all-fr.atom.xml
+++ b/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.orgoh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.orgsecond-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all.atom.xml b/tests/output/custom/feeds/all.atom.xml
index ef6dbf52..9090f431 100644
--- a/tests/output/custom/feeds/all.atom.xml
+++ b/tests/output/custom/feeds/all.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.orgsecond-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.orga-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.orgarticle-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.orgarticle-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.orgarticle-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.orgthis-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.orgoh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.orgunbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all.rss.xml b/tests/output/custom/feeds/all.rss.xml
index a3f7eff9..b726e2d1 100644
--- a/tests/output/custom/feeds/all.rss.xml
+++ b/tests/output/custom/feeds/all.rss.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>http://blog.notmyidea.org/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.orgsecond-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.orga-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.orgarticle-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.orgarticle-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.orgarticle-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.orgthis-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>http://blog.notmyidea.org/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.orgoh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>http://blog.notmyidea.org/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>http://blog.notmyidea.org/unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.orgunbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/bar.atom.xml b/tests/output/custom/feeds/bar.atom.xml
index 84ac9cda..93961545 100644
--- a/tests/output/custom/feeds/bar.atom.xml
+++ b/tests/output/custom/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.orgoh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/tests/output/custom/feeds/bar.rss.xml b/tests/output/custom/feeds/bar.rss.xml
index bb5cb2b4..0a9d0f9d 100644
--- a/tests/output/custom/feeds/bar.rss.xml
+++ b/tests/output/custom/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.orgoh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>http://blog.notmyidea.org/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/cat1.atom.xml b/tests/output/custom/feeds/cat1.atom.xml
index e0f01780..4fce560d 100644
--- a/tests/output/custom/feeds/cat1.atom.xml
+++ b/tests/output/custom/feeds/cat1.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.orga-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.orgarticle-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.orgarticle-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.orgarticle-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/cat1.rss.xml b/tests/output/custom/feeds/cat1.rss.xml
index 0043b2fb..d322572b 100644
--- a/tests/output/custom/feeds/cat1.rss.xml
+++ b/tests/output/custom/feeds/cat1.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>http://blog.notmyidea.org/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/article-3.html</guid></item></channel></rss>
\ No newline at end of file
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.orga-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.orgarticle-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.orgarticle-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.orgarticle-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/content.atom.xml b/tests/output/custom/feeds/content.atom.xml
index c141a0aa..6f93c8f4 100644
--- a/tests/output/custom/feeds/content.atom.xml
+++ b/tests/output/custom/feeds/content.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/content.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/content.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.orgsecond-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.orgunbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/content.rss.xml b/tests/output/custom/feeds/content.rss.xml
index 9f36c97e..74a322e7 100644
--- a/tests/output/custom/feeds/content.rss.xml
+++ b/tests/output/custom/feeds/content.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/content.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>http://blog.notmyidea.org/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>http://blog.notmyidea.org/unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/content.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.orgsecond-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.orgunbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/yeah.atom.xml b/tests/output/custom/feeds/yeah.atom.xml
index 4c6eed49..9a95fa03 100644
--- a/tests/output/custom/feeds/yeah.atom.xml
+++ b/tests/output/custom/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org</id><updated>2010-12-02T10:14:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>http://blog.notmyidea.org/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-12-02T10:14:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.orgthis-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/tests/output/custom/feeds/yeah.rss.xml b/tests/output/custom/feeds/yeah.rss.xml
index c4f5512e..1c5884a2 100644
--- a/tests/output/custom/feeds/yeah.rss.xml
+++ b/tests/output/custom/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Thu, 02 Dec 2010 10:14:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Thu, 02 Dec 2010 10:14:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.orgthis-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>http://blog.notmyidea.org/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index 466a4db4..ae77c625 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li ><a href="./category/content.html">content</a></li>
                 
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index 9262d717..797217ad 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li ><a href="./category/content.html">content</a></li>
                 
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -115,8 +115,9 @@
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href="./this-is-a-super-article.html">read more</a>
                 <p>There are <a href="./this-is-a-super-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index e692105b..b699b41c 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li class="active"><a href="./category/content.html">content</a></li>
                 
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index 6ffaad13..b8263c1b 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li class="active"><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li ><a href="./category/content.html">content</a></li>
                 
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li class="active"><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index 27d6ec69..f176e761 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index b3b12af7..9e5b81ad 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li class="active"><a href="./category/content.html">content</a></li>
                 
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 4b31dc69..a769cee4 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li class="active"><a href="./category/content.html">content</a></li>
                 
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index bf468bf2..5d6237cd 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -158,8 +158,9 @@ Translations:
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
                 <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index 34bcdbc3..e1be3d77 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index c8f088f1..3beabbb1 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -158,8 +158,9 @@ Translations:
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
                 <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index 682a9b7d..2da611ed 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index 9e8239a4..73db4505 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index 675a53cb..f72400a6 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
                     <li ><a href=".././category/content.html">content</a></li>
                 
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
index 28c98b99..92905076 100644
--- a/tests/output/custom/theme/css/main.css
+++ b/tests/output/custom/theme/css/main.css
@@ -111,6 +111,13 @@ cite {}
 
 q {}
 
+div.note {
+   float: right;
+   margin: 5px;
+   font-size: 85%;
+   max-width: 300px;
+}
+
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
 	
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 2fd6b306..9ba6bb9b 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
                 
                     <li ><a href="./category/content.html">content</a></li>
                 
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index b7730421..1b611efe 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -39,14 +39,14 @@
                 
                 
                 
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
                     <li class="active"><a href="./category/content.html">content</a></li>
                 
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                
+                    <li ><a href="./category/bar.html">bar</a></li>
+                
                 </ul></nav>
         </header><!-- /#banner -->
                 

From c4c49678f906897fe276831ab5e5261f16f757ac Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 4 Apr 2012 22:40:03 +0200
Subject: [PATCH 0636/2864] update basic output now that categories are
 correctly sorted

pelican -o tests/output/basic/ samples/content/
---
 tests/output/basic/a-markdown-powered-article.html |  4 ++--
 tests/output/basic/archives.html                   |  4 ++--
 tests/output/basic/article-1.html                  |  4 ++--
 tests/output/basic/article-2.html                  |  4 ++--
 tests/output/basic/article-3.html                  |  4 ++--
 tests/output/basic/author/alexis-metaireau.html    |  9 +++++----
 tests/output/basic/author/bruno.html               |  4 ++--
 tests/output/basic/categories.html                 |  8 ++++----
 tests/output/basic/category/bar.html               |  4 ++--
 tests/output/basic/category/cat1.html              |  4 ++--
 tests/output/basic/category/content.html           |  4 ++--
 tests/output/basic/category/yeah.html              |  4 ++--
 tests/output/basic/drafts/a-draft-article.html     |  4 ++--
 tests/output/basic/feeds/all-en.atom.xml           | 14 +++++++-------
 tests/output/basic/feeds/all-fr.atom.xml           |  4 ++--
 tests/output/basic/feeds/all.atom.xml              | 14 +++++++-------
 tests/output/basic/feeds/bar.atom.xml              |  2 +-
 tests/output/basic/feeds/cat1.atom.xml             |  6 +++---
 tests/output/basic/feeds/content.atom.xml          |  4 ++--
 tests/output/basic/feeds/yeah.atom.xml             |  2 +-
 tests/output/basic/index.html                      |  9 +++++----
 tests/output/basic/oh-yeah-fr.html                 |  4 ++--
 tests/output/basic/oh-yeah.html                    |  4 ++--
 tests/output/basic/pages/this-is-a-test-page.html  |  4 ++--
 tests/output/basic/second-article-fr.html          |  4 ++--
 tests/output/basic/second-article.html             |  4 ++--
 tests/output/basic/tag/bar.html                    |  9 +++++----
 tests/output/basic/tag/baz.html                    |  4 ++--
 tests/output/basic/tag/foo.html                    |  9 +++++----
 tests/output/basic/tag/foobar.html                 |  4 ++--
 tests/output/basic/tag/oh.html                     |  4 ++--
 tests/output/basic/tag/yeah.html                   |  4 ++--
 tests/output/basic/theme/css/main.css              |  7 +++++++
 tests/output/basic/this-is-a-super-article.html    |  4 ++--
 tests/output/basic/unbelievable.html               |  4 ++--
 35 files changed, 98 insertions(+), 87 deletions(-)

diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 32a863d6..d36ba32c 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index 840dfa02..9aedb29d 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index c1199371..e681b991 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 62dd0368..b56d18ba 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 9fd6df0a..0d2525e7 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index ab68482d..6bf631eb 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -115,8 +115,9 @@ YEAH !</p>
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/author/bruno.html b/tests/output/basic/author/bruno.html
index 1e2dc655..f889c94e 100644
--- a/tests/output/basic/author/bruno.html
+++ b/tests/output/basic/author/bruno.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index 5ffb220d..2430cc96 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -44,11 +44,11 @@
         
 <ul>
 
-    <li><a href="category/content.html">content</a></li>
+    <li><a href="category/bar.html">bar</a></li>
 
     <li><a href="category/cat1.html">cat1</a></li>
 
-    <li><a href="category/bar.html">bar</a></li>
+    <li><a href="category/content.html">content</a></li>
 
     <li><a href="category/yeah.html">yeah</a></li>
 
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index b268dd53..77d0187b 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li class="active"><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index e92fd0df..ba43f8f5 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li class="active"><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/category/content.html b/tests/output/basic/category/content.html
index 0eec912c..9f44fa9e 100644
--- a/tests/output/basic/category/content.html
+++ b/tests/output/basic/category/content.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li class="active"><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index ccb531f1..747cad37 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li class="active"><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index 59b6223f..0b7f6899 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li class="active"><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index c9fe8270..66c51fdf 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/all-en.atom.xml" rel="self"></link><id>../.</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>.././a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-en.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="../.this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="../.oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>.././unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index 606e5186..2de714bb 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/all-fr.atom.xml" rel="self"></link><id>../.</id><updated>2012-03-02T14:01:01Z</updated><entry><title>Trop bien !</title><link href=".././oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01Z</updated><author><name>bruno</name></author><id>.././oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href=".././second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-fr.atom.xml" rel="self"></link><id>.././</id><updated>2012-03-02T14:01:01Z</updated><entry><title>Trop bien !</title><link href="../.oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01Z</updated><author><name>bruno</name></author><id>tag:../.,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="../.second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index 3bb7d2fd..c496adf7 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/all.atom.xml" rel="self"></link><id>../.</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>.././a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="../.this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="../.oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>.././unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/bar.atom.xml b/tests/output/basic/feeds/bar.atom.xml
index 6ce45518..066ae95f 100644
--- a/tests/output/basic/feeds/bar.atom.xml
+++ b/tests/output/basic/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/bar.atom.xml" rel="self"></link><id>../.</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/bar.atom.xml" rel="self"></link><id>.././</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href="../.oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
index f66c2e73..3a4af6a6 100644
--- a/tests/output/basic/feeds/cat1.atom.xml
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/cat1.atom.xml" rel="self"></link><id>../.</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>.././a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>.././article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/cat1.atom.xml" rel="self"></link><id>.././</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/content.atom.xml b/tests/output/basic/feeds/content.atom.xml
index 0cf53aa7..e35b840f 100644
--- a/tests/output/basic/feeds/content.atom.xml
+++ b/tests/output/basic/feeds/content.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/content.atom.xml" rel="self"></link><id>../.</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>.././second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>.././unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/content.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/yeah.atom.xml b/tests/output/basic/feeds/yeah.atom.xml
index 7fd8e9f2..5ae933f4 100644
--- a/tests/output/basic/feeds/yeah.atom.xml
+++ b/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="../." rel="alternate"></link><link href=".././feeds/yeah.atom.xml" rel="self"></link><id>../.</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>.././this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/yeah.atom.xml" rel="self"></link><id>.././</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href="../.this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 8a2091b9..9bc1a2f9 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -249,8 +249,9 @@ Translations:
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href="./this-is-a-super-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index 55eec103..b380252e 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li class="active"><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index 4b650e7d..dfa1d178 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 0162232c..cc282243 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index 704971d2..e6244aa8 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li class="active"><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index 94043446..3dec8d70 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li class="active"><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 4afb4bfd..bc4ffc9c 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -150,8 +150,9 @@ Translations:
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index b8df58e3..523e6f71 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 20cf293a..49cc3fd8 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -150,8 +150,9 @@ Translations:
 
 
 </footer><!-- /.post-info -->
-                Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.
+                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 0a5eeb3b..1817aa88 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index 563c0f2e..3ff36f49 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 4b18b7e3..76ca35a3 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/bar.html">bar</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/bar.html">bar</a></li>
+                    <li ><a href=".././category/content.html">content</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index 28c98b99..92905076 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -111,6 +111,13 @@ cite {}
 
 q {}
 
+div.note {
+   float: right;
+   margin: 5px;
+   font-size: 85%;
+   max-width: 300px;
+}
+
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
 	
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index cb12da2d..b2cf0392 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li ><a href="./category/content.html">content</a></li>
                 
                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 4c6e6b07..6380a2a3 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -31,11 +31,11 @@
                 
                 
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/bar.html">bar</a></li>
+                    <li class="active"><a href="./category/content.html">content</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 

From c430ab57ba1c2276f0a150cd8c6467fdb12a01b5 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 4 Apr 2012 22:48:11 +0200
Subject: [PATCH 0637/2864] mock getenv to always return the same value for
 $USER

---
 tests/test_pelican.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 49328ebe..1192dfe1 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -6,6 +6,8 @@ except ImportError:
 import os
 from filecmp import dircmp
 
+from mock import patch
+
 from .support import temporary_folder
 
 from pelican import Pelican
@@ -28,12 +30,15 @@ class TestPelican(unittest.TestCase):
         # ones and generate the output without raising any exception / issuing
         # any warning.
         with temporary_folder() as temp_path:
-            pelican = Pelican(path=INPUT_PATH, output_path=temp_path)
-            pelican.run()
-            diff = dircmp(temp_path, os.sep.join((OUTPUT_PATH, "basic")))
-            self.assertEqual(diff.left_only, [])
-            self.assertEqual(diff.right_only, [])
-            self.assertEqual(diff.diff_files, [])
+            with patch("pelican.contents.getenv") as mock_getenv:
+                # force getenv('USER') to always return the same value
+                mock_getenv.return_value = "Dummy Author"
+                pelican = Pelican(path=INPUT_PATH, output_path=temp_path)
+                pelican.run()
+                diff = dircmp(temp_path, os.sep.join((OUTPUT_PATH, "basic")))
+                self.assertEqual(diff.left_only, [])
+                self.assertEqual(diff.right_only, [])
+                self.assertEqual(diff.diff_files, [])
 
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work

From 912ffe4a912a4e4760015c003dc7d0a6b2cc3c44 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 4 Apr 2012 22:49:12 +0200
Subject: [PATCH 0638/2864] update basic output with $USER="Dummy Author"

USER="Dummy Author" pelican -o tests/output/basic/ samples/content/
---
 tests/output/basic/a-markdown-powered-article.html |  2 +-
 tests/output/basic/article-1.html                  |  2 +-
 tests/output/basic/article-2.html                  |  2 +-
 tests/output/basic/article-3.html                  |  2 +-
 .../basic/author/{bruno.html => dummy-author.html} | 14 +++++++-------
 tests/output/basic/category/cat1.html              |  8 ++++----
 tests/output/basic/category/content.html           |  4 ++--
 tests/output/basic/drafts/a-draft-article.html     |  2 +-
 tests/output/basic/feeds/all-en.atom.xml           | 10 +++++-----
 tests/output/basic/feeds/all-fr.atom.xml           |  4 ++--
 tests/output/basic/feeds/all.atom.xml              | 10 +++++-----
 tests/output/basic/feeds/cat1.atom.xml             |  6 +++---
 tests/output/basic/feeds/content.atom.xml          |  4 ++--
 tests/output/basic/index.html                      | 12 ++++++------
 tests/output/basic/oh-yeah-fr.html                 |  2 +-
 tests/output/basic/second-article-fr.html          |  2 +-
 tests/output/basic/second-article.html             |  2 +-
 tests/output/basic/tag/bar.html                    |  4 ++--
 tests/output/basic/tag/baz.html                    |  4 ++--
 tests/output/basic/tag/foo.html                    |  4 ++--
 tests/output/basic/unbelievable.html               |  2 +-
 21 files changed, 51 insertions(+), 51 deletions(-)
 rename tests/output/basic/author/{bruno.html => dummy-author.html} (92%)

diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index d36ba32c..9cb92c4b 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -54,7 +54,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/cat1.html">cat1</a>. </p>
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index e681b991..5f1d7c1d 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -54,7 +54,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/cat1.html">cat1</a>. </p>
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index b56d18ba..d6dbf74b 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -54,7 +54,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/cat1.html">cat1</a>. </p>
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 0d2525e7..8dc806c1 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -54,7 +54,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/cat1.html">cat1</a>. </p>
diff --git a/tests/output/basic/author/bruno.html b/tests/output/basic/author/dummy-author.html
similarity index 92%
rename from tests/output/basic/author/bruno.html
rename to tests/output/basic/author/dummy-author.html
index f889c94e..cf23f899 100644
--- a/tests/output/basic/author/bruno.html
+++ b/tests/output/basic/author/dummy-author.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <title>A Pelican Blog - bruno</title>
+        <title>A Pelican Blog - Dummy Author</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
@@ -57,7 +57,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/cat1.html">cat1</a>. </p>
@@ -96,7 +96,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/cat1.html">cat1</a>. </p>
@@ -131,7 +131,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/cat1.html">cat1</a>. </p>
@@ -166,7 +166,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/cat1.html">cat1</a>. </p>
@@ -201,7 +201,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/content.html">content</a>. </p>
@@ -241,7 +241,7 @@ Translations:
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/content.html">content</a>. </p>
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index ba43f8f5..1d8d67e8 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -57,7 +57,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/cat1.html">cat1</a>. </p>
@@ -96,7 +96,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/cat1.html">cat1</a>. </p>
@@ -131,7 +131,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/cat1.html">cat1</a>. </p>
@@ -166,7 +166,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/cat1.html">cat1</a>. </p>
diff --git a/tests/output/basic/category/content.html b/tests/output/basic/category/content.html
index 9f44fa9e..19ceef2c 100644
--- a/tests/output/basic/category/content.html
+++ b/tests/output/basic/category/content.html
@@ -57,7 +57,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/content.html">content</a>. </p>
@@ -102,7 +102,7 @@ Translations:
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/content.html">content</a>. </p>
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index 0b7f6899..32a11e69 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -54,7 +54,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/content.html">content</a>. </p>
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index 66c51fdf..e10386d5 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-en.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-en.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="../.this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -21,5 +21,5 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index 2de714bb..3243f840 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-fr.atom.xml" rel="self"></link><id>.././</id><updated>2012-03-02T14:01:01Z</updated><entry><title>Trop bien !</title><link href="../.oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01Z</updated><author><name>bruno</name></author><id>tag:../.,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="../.second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-fr.atom.xml" rel="self"></link><id>.././</id><updated>2012-03-02T14:01:01Z</updated><entry><title>Trop bien !</title><link href="../.oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="../.second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index c496adf7..7cdadf5d 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="../.this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -21,5 +21,5 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
index 3a4af6a6..05b21f75 100644
--- a/tests/output/basic/feeds/cat1.atom.xml
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/cat1.atom.xml" rel="self"></link><id>.././</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/cat1.atom.xml" rel="self"></link><id>.././</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/content.atom.xml b/tests/output/basic/feeds/content.atom.xml
index e35b840f..d255cc8a 100644
--- a/tests/output/basic/feeds/content.atom.xml
+++ b/tests/output/basic/feeds/content.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/content.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>bruno</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>bruno</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/content.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 9bc1a2f9..1f247443 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -57,7 +57,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/content.html">content</a>. </p>
@@ -102,7 +102,7 @@ Translations:
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/cat1.html">cat1</a>. </p>
@@ -136,7 +136,7 @@ Translations:
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/cat1.html">cat1</a>. </p>
@@ -171,7 +171,7 @@ Translations:
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/cat1.html">cat1</a>. </p>
@@ -206,7 +206,7 @@ Translations:
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/cat1.html">cat1</a>. </p>
@@ -322,7 +322,7 @@ YEAH !</p>
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/content.html">content</a>. </p>
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index b380252e..186791b5 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -54,7 +54,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/content.html">content</a>. </p>
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index e6244aa8..9f9838dc 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -54,7 +54,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/content.html">content</a>. </p>
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index 3dec8d70..13f56e4c 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -54,7 +54,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/content.html">content</a>. </p>
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index bc4ffc9c..8ffd84d8 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -57,7 +57,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/content.html">content</a>. </p>
@@ -102,7 +102,7 @@ Translations:
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/content.html">content</a>. </p>
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index 523e6f71..ea01a199 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -57,7 +57,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/content.html">content</a>. </p>
@@ -102,7 +102,7 @@ Translations:
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/content.html">content</a>. </p>
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 49cc3fd8..ea674062 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -57,7 +57,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/content.html">content</a>. </p>
@@ -102,7 +102,7 @@ Translations:
 
         
         <address class="vcard author">
-                By <a class="url fn" href=".././author/bruno.html">bruno</a>
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href=".././category/content.html">content</a>. </p>
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 6380a2a3..581e8318 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -54,7 +54,7 @@
 
         
         <address class="vcard author">
-                By <a class="url fn" href="./author/bruno.html">bruno</a>
+                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
 <p>In <a href="./category/content.html">content</a>. </p>

From 03fdefb158cd495c960c6637bf7f7deb99a9f1de Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 4 Apr 2012 23:18:11 +0200
Subject: [PATCH 0639/2864] add instructions to regenerate the output of
 functional tests

---
 docs/contribute.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index fcf8d5c0..e33f8ab4 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -39,6 +39,14 @@ The tests live in "pelican/tests" and you can run them using the
 
     $ unit2 discover
 
+If you have made changes that affect the output of a pelican generated weblog,
+then you should update the output used by functional tests.
+To do so, you can use the 2 following commands::
+
+    $ pelican -o tests/output/custom/ -s samples/pelican.conf.py \
+        samples/content/
+    $ pelican -o tests/output/basic/ samples/content/
+
 Coding standards
 ================
 

From cfebb37c6464d42432da0694eb6665004b7efedb Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Thu, 5 Apr 2012 06:47:15 +0200
Subject: [PATCH 0640/2864] fix command to regenerate the output of basic
 functional test

the command needs to be prefixed by USER="Dummy Author" which is the author
name value mocked in the corresponding functional test.
---
 docs/contribute.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index e33f8ab4..3960b3f9 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -45,7 +45,7 @@ To do so, you can use the 2 following commands::
 
     $ pelican -o tests/output/custom/ -s samples/pelican.conf.py \
         samples/content/
-    $ pelican -o tests/output/basic/ samples/content/
+    $ USER="Dummy Author" pelican -o tests/output/basic/ samples/content/
 
 Coding standards
 ================

From b509fe70cd90d077242223865b87612d845b851f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <remy.hubscher@ionyse.com>
Date: Fri, 6 Apr 2012 09:55:15 +0200
Subject: [PATCH 0641/2864] Add rsync_upload

---
 pelican/tools/pelican_quickstart.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 7ade62e9..43e2a537 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -52,6 +52,9 @@ clean:
 dropbox_upload: $$(OUTPUTDIR)/index.html
 \tcp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
 
+rsync_upload: $$(OUTPUTDIR)/index.html
+\trsync --delete -rvz -e ssh $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+
 ssh_upload: $$(OUTPUTDIR)/index.html
 \tscp -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 

From 7b657032ae921bde783e75cb97232be1b80932f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albrecht=20M=C3=BChlenschulte?= <albrecht@a7p.org>
Date: Fri, 6 Apr 2012 21:54:11 +0200
Subject: [PATCH 0642/2864] added rsync_upload to the generated Makefile

---
 pelican/tools/pelican_quickstart.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 43e2a537..752113ba 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -28,15 +28,16 @@ SSH_TARGET_DIR=$ssh_target_dir
 DROPBOX_DIR=$dropbox_dir
 
 help:
-\t@echo 'Makefile for a pelican Web site                                       '
-\t@echo '                                                                      '
-\t@echo 'Usage:                                                                '
-\t@echo '   make html                        (re)generate the web site         '
-\t@echo '   make clean                       remove the generated files        '
-\t@echo '   ftp_upload                       upload the web site using FTP     '
-\t@echo '   ssh_upload                       upload the web site using SSH     '
-\t@echo '   dropbox_upload                   upload the web site using Dropbox '
-\t@echo '                                                                      '
+\t@echo 'Makefile for a pelican Web site                                        '
+\t@echo '                                                                       '
+\t@echo 'Usage:                                                                 '
+\t@echo '   make html                        (re)generate the web site          '
+\t@echo '   make clean                       remove the generated files         '
+\t@echo '   ftp_upload                       upload the web site using FTP      '
+\t@echo '   ssh_upload                       upload the web site using SSH      '
+\t@echo '   dropbox_upload                   upload the web site using Dropbox  '
+\t@echo '   rsync_upload                     upload the web site using rsync/ssh'
+\t@echo '                                                                       '
 
 
 html: clean $$(OUTPUTDIR)/index.html
@@ -58,6 +59,9 @@ rsync_upload: $$(OUTPUTDIR)/index.html
 ssh_upload: $$(OUTPUTDIR)/index.html
 \tscp -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
+rsync_upload: $$(OUTPUTDIR)/index.
+\trsync -e ssh -P -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+
 ftp_upload: $$(OUTPUTDIR)/index.html
 \tlftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
 
@@ -65,7 +69,7 @@ github: $$(OUTPUTDIR)/index.html
 \tghp-import $$(OUTPUTDIR)
 \tgit push origin gh-pages
 
-.PHONY: html help clean ftp_upload ssh_upload dropbox_upload github
+.PHONY: html help clean ftp_upload ssh_upload rsync_upload dropbox_upload github
 ''',
 
     'pelican.conf.py': '''#!/usr/bin/env python

From 405cc66637458071ad8e1fd12e85e44ae06a10d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albrecht=20M=C3=BChlenschulte?= <albrecht@a7p.org>
Date: Sat, 7 Apr 2012 11:01:31 +0200
Subject: [PATCH 0643/2864] added missing file extension in make file
 generation (index.html)

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 752113ba..2f63029b 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -59,7 +59,7 @@ rsync_upload: $$(OUTPUTDIR)/index.html
 ssh_upload: $$(OUTPUTDIR)/index.html
 \tscp -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
-rsync_upload: $$(OUTPUTDIR)/index.
+rsync_upload: $$(OUTPUTDIR)/index.html
 \trsync -e ssh -P -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
 ftp_upload: $$(OUTPUTDIR)/index.html

From ae97cbfb72ccb0c5e716cfe546eeb646ab15b3e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
Date: Sat, 7 Apr 2012 17:33:23 +0200
Subject: [PATCH 0644/2864] Fix misspelling of ssh_target_dir in quickstart

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 43e2a537..0365ca62 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -231,7 +231,7 @@ Please answer the following questions so this script can generate the files need
         if ask('Do you want to upload your website using SSH ?', answer=bool, default=False):
             CONF['ssh_host'] = ask('What is the hostname of your SSH server ?', str, CONF['ssh_host'])
             CONF['ssh_user'] = ask('What is your username on this server ?', str, CONF['ssh_user'])
-            CONF['ssh_traget_dir'] = ask('Where do you want to put your website on this server ?', str, CONF['ssh_target_dir'])
+            CONF['ssh_target_dir'] = ask('Where do you want to put your website on this server ?', str, CONF['ssh_target_dir'])
 
         if ask('Do you want to upload your website using Dropbox ?', answer=bool, default=False):
             CONF['dropbox_dir'] = ask('Where is your Dropbox directory ?', str, CONF['dropbox_dir'])

From 28a1e0f432f5727aea672795b889c8955708a50e Mon Sep 17 00:00:00 2001
From: Dafydd Crosby <dtcrsby@gmail.com>
Date: Sat, 7 Apr 2012 18:02:40 -0600
Subject: [PATCH 0645/2864] Fix some typos and grammar

---
 pelican/__init__.py                 | 7 ++++---
 pelican/contents.py                 | 4 ++--
 pelican/generators.py               | 2 +-
 pelican/tools/pelican_quickstart.py | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index c2766646..9afbb6cc 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -61,8 +61,9 @@ class Pelican(object):
     def _handle_deprecation(self):
 
         if self.settings.get('CLEAN_URLS', False):
-            logger.warning('Found deprecated `CLEAN_URLS` in settings. Modifing'
-                        ' the following settings for the same behaviour.')
+            logger.warning('Found deprecated `CLEAN_URLS` in settings. '
+                        ' Modifying the following settings for the 
+                        ' same behaviour.')
 
             self.settings['ARTICLE_URL'] = '{slug}/'
             self.settings['ARTICLE_LANG_URL'] = '{slug}-{lang}/'
@@ -75,7 +76,7 @@ class Pelican(object):
 
         if self.settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
             logger.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
-                        ' settings.  Modifing the following settings for'
+                        ' settings.  Modifying the following settings for'
                         ' the same behaviour.')
 
             structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
diff --git a/pelican/contents.py b/pelican/contents.py
index 42de4560..593822a9 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -63,7 +63,7 @@ class Page(object):
 
             self.in_default_lang = (self.lang == default_lang)
 
-        # create the slug if not existing, fro mthe title
+        # create the slug if not existing, from the title
         if not hasattr(self, 'slug') and hasattr(self, 'title'):
             self.slug = slugify(self.title)
 
@@ -135,7 +135,7 @@ class Page(object):
 
     def _get_summary(self):
         """Returns the summary of an article, based on the summary metadata
-        if it is set, else troncate the content."""
+        if it is set, else truncate the content."""
         if hasattr(self, '_summary'):
             return self._summary
         else:
diff --git a/pelican/generators.py b/pelican/generators.py
index d7ebb0b0..9f4de79b 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -351,7 +351,7 @@ class PagesGenerator(Generator):
 
 
 class StaticGenerator(Generator):
-    """copy static paths (what you want to cpy, like images, medias etc.
+    """copy static paths (what you want to copy, like images, medias etc.
     to output"""
 
     def _copy_paths(self, paths, source, destination, output_path,
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 43e2a537..dffd4391 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -202,7 +202,7 @@ def main():
 
     print('''Welcome to pelican-quickstart v{v}.
 
-This script will help you creating a new Pelican based website.
+This script will help you create a new Pelican-based website.
 
 Please answer the following questions so this script can generate the files needed by Pelican.
 
@@ -211,7 +211,7 @@ Please answer the following questions so this script can generate the files need
     CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new Web site ?', answer=str, default=args.path))
     CONF['sitename'] = ask('How will you call your Web site ?', answer=str, default=args.title)
     CONF['author'] = ask('Who will be the author of this Web site ?', answer=str, default=args.author)
-    CONF['lang'] = ask('What will be the default language  of this Web site ?', str, args.lang or CONF['lang'], 2)
+    CONF['lang'] = ask('What will be the default language of this Web site ?', str, args.lang or CONF['lang'], 2)
 
     CONF['with_pagination'] = ask('Do you want to enable article pagination ?', bool, bool(CONF['default_pagination']))
 

From 1b978bac6d9c6fba967e2686c4fc1db416f317cf Mon Sep 17 00:00:00 2001
From: Matt Bowcock <matt.bowcock@gmail.com>
Date: Mon, 9 Apr 2012 22:45:58 -0400
Subject: [PATCH 0646/2864] Added markdown option to importer documentation.
 Issue #292

---
 docs/importer.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 377820af..d1b37684 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -23,7 +23,7 @@ Usage
 """""
 
 | pelican-import [-h] [--wpfile] [--dotclear] [--feed] [-o OUTPUT]
-|                [--dir-cat]
+|                [-m MARKUP][--dir-cat]
 |                input
 
 Optional arguments:
@@ -35,6 +35,7 @@ Optional arguments:
   --feed                Feed to parse
   -o OUTPUT, --output OUTPUT
                         Output path
+  -m MARKUP             Output markup
   --dir-cat             Put files in directories with categories name
 
 Examples

From 75febf4bfd25557c6c3db5edf09008b17d8ad158 Mon Sep 17 00:00:00 2001
From: Matt Bowcock <matt.bowcock@gmail.com>
Date: Tue, 10 Apr 2012 00:15:12 -0400
Subject: [PATCH 0647/2864] Add support for multiple file extensions per file
 reader.

Conflicts:

	pelican/readers.py
---
 pelican/readers.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index 917d8614..326782ed 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -65,7 +65,11 @@ def render_node_to_html(document, node):
 
 class RstReader(Reader):
     enabled = bool(docutils)
+<<<<<<< HEAD
     extension = "rst"
+=======
+    extension = ['rst']
+>>>>>>> f1de695... Add support for multiple file extensions per file reader.
 
     def _parse_metadata(self, document):
         """Return the dict containing document metadata"""
@@ -111,7 +115,11 @@ class RstReader(Reader):
 
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
+<<<<<<< HEAD
     extension = "md"
+=======
+    extension = ['md', 'markdown', 'mkd']
+>>>>>>> f1de695... Add support for multiple file extensions per file reader.
     extensions = ['codehilite', 'extra']
 
     def read(self, filename):
@@ -128,7 +136,11 @@ class MarkdownReader(Reader):
 
 
 class HtmlReader(Reader):
+<<<<<<< HEAD
     extension = "html"
+=======
+    extension = ['html', 'htm']
+>>>>>>> f1de695... Add support for multiple file extensions per file reader.
     _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
 
     def read(self, filename):

From d4e632dfa8fbcf2ff8ba09deb60fa68f162d453f Mon Sep 17 00:00:00 2001
From: Matt Bowcock <matt.bowcock@gmail.com>
Date: Tue, 10 Apr 2012 00:32:01 -0400
Subject: [PATCH 0648/2864] Unit test failed due to missing trailing comma in
 tuple. Fixed.

---
 pelican/readers.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 326782ed..1ffe4cc0 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -65,11 +65,7 @@ def render_node_to_html(document, node):
 
 class RstReader(Reader):
     enabled = bool(docutils)
-<<<<<<< HEAD
-    extension = "rst"
-=======
     extension = ['rst']
->>>>>>> f1de695... Add support for multiple file extensions per file reader.
 
     def _parse_metadata(self, document):
         """Return the dict containing document metadata"""
@@ -115,11 +111,7 @@ class RstReader(Reader):
 
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
-<<<<<<< HEAD
-    extension = "md"
-=======
     extension = ['md', 'markdown', 'mkd']
->>>>>>> f1de695... Add support for multiple file extensions per file reader.
     extensions = ['codehilite', 'extra']
 
     def read(self, filename):
@@ -136,11 +128,7 @@ class MarkdownReader(Reader):
 
 
 class HtmlReader(Reader):
-<<<<<<< HEAD
-    extension = "html"
-=======
     extension = ['html', 'htm']
->>>>>>> f1de695... Add support for multiple file extensions per file reader.
     _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
 
     def read(self, filename):

From c8323af63d5e3440c12eef968e6858a50d4adbdf Mon Sep 17 00:00:00 2001
From: Matt Bowcock <matt.bowcock@gmail.com>
Date: Tue, 10 Apr 2012 00:40:05 -0400
Subject: [PATCH 0649/2864] Fixed _EXTENSIONS dictionary definition.

---
 pelican/readers.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 1ffe4cc0..c5d9aa00 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -144,7 +144,11 @@ class HtmlReader(Reader):
             return content, metadata
 
 
-_EXTENSIONS = dict((cls.extension, cls) for cls in Reader.__subclasses__())
+_EXTENSIONS = {}
+
+for cls in Reader.__subclasses__():
+    for ext in cls.extension:
+        _EXTENSIONS[ext] = cls
 
 
 def read_file(filename, fmt=None, settings=None):

From 424cfe1b1ed5e7d841d160d019b99b3162badb11 Mon Sep 17 00:00:00 2001
From: Aldiantoro Nugroho <kriwil@gmail.com>
Date: Tue, 10 Apr 2012 17:30:42 +0800
Subject: [PATCH 0650/2864] Fixed hardcoded category url in base.html.

---
 pelican/themes/notmyidea/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index f0f745e4..c9f2c0c8 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -35,7 +35,7 @@
                 {% endfor %}
                 {% endif %}
                 {% for cat, null in categories %}
-                    <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+                    <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
                 {% endfor %}
                 </ul></nav>
         </header><!-- /#banner -->

From 5e6945d380abd03f81f1ca997bc82b4be9fb8ac0 Mon Sep 17 00:00:00 2001
From: Matt Bowcock <matt.bowcock@gmail.com>
Date: Tue, 10 Apr 2012 12:51:16 -0400
Subject: [PATCH 0651/2864] Added facebook icon  to default theme.

---
 .../notmyidea/static/images/icons/facebook.png    | Bin 0 -> 300 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pelican/themes/notmyidea/static/images/icons/facebook.png

diff --git a/pelican/themes/notmyidea/static/images/icons/facebook.png b/pelican/themes/notmyidea/static/images/icons/facebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7914b497369c55feba7defc9a3ea5bec424ecfc
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU{r~^Jb>s{nN~l=<`rQ{G
z*EMNgZp)TeGt$L@YM4rb{DK+IJaKeh4CFB;dAqwXbg;^L06Clm9+AaB8pQTsa66f8
z2V~fKx;Tb#Tu)ADV02S85J*U9G7veylX_i&!&z12Q~+;~Q|gK~r==k=&T|S@G#cDE
zb^5gT;nTtbJUf;eFfcqx6@I<wZW_oS)e_f;l9a@fRIB8oR3OD*WMF8hYha{nXc%H>
vWMyh@WooHyU}$AvU~RtQ2a1N={FKbJO57T}vIJa!8W=oX{an^LB{Ts5Vp3XV

literal 0
HcmV?d00001


From 6888a046362316f98fb3aaf2982ca246ad724f30 Mon Sep 17 00:00:00 2001
From: Aaron Kavlie <akavlie@gmail.com>
Date: Thu, 12 Apr 2012 19:38:59 -0700
Subject: [PATCH 0652/2864] Issue #311

Catch BeautifulSoup ImportError.
---
 pelican/tools/pelican_import.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 57c4fc22..a4d64c67 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -13,7 +13,12 @@ from pelican.utils import slugify
 
 def wp2fields(xml):
     """Opens a wordpress XML file, and yield pelican fields"""
-    from BeautifulSoup import BeautifulStoneSoup
+    try:
+        from BeautifulSoup import BeautifulStoneSoup
+    except ImportError:
+        error = 'Missing dependency ' + \
+                '"BeautifulSoup" required to import Wordpress files.'
+        sys.exit(error)
 
     xmlfile = open(xml, encoding='utf-8').read()
     soup = BeautifulStoneSoup(xmlfile)
@@ -40,7 +45,13 @@ def wp2fields(xml):
 
 def dc2fields(file):
     """Opens a Dotclear export file, and yield pelican fields"""
-    from BeautifulSoup import BeautifulStoneSoup
+    try:
+        from BeautifulSoup import BeautifulStoneSoup
+    except ImportError:
+        error = 'Missing dependency ' + \
+                '"BeautifulSoup" required to import Dotclear files.'
+        sys.exit(error)
+
 
     in_cat = False
     in_post = False

From 23c05ad7dbd46e61d1cd1cfe193510601d7c2299 Mon Sep 17 00:00:00 2001
From: Aaron Kavlie <akavlie@gmail.com>
Date: Thu, 12 Apr 2012 19:53:03 -0700
Subject: [PATCH 0653/2864] Issue #311, #312

Document BeautifulSoup & pandoc deps.
---
 docs/importer.rst | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 377820af..96e9e729 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -19,6 +19,23 @@ The conversion from HTML to reStructuredText relies on `pandoc
 written with Markdown syntax, they will not be converted (as Pelican also
 supports Markdown).
 
+Dependencies
+""""""""""""
+
+``pelican-import`` has two additional dependencies not included with pelican
+by default:
+
+- BeautifulSoup
+- pandoc
+
+BeatifulSoup can be installed like any other Python package::
+
+    $ pip install BeautifulSoup
+
+For pandoc, install a package for your operating system from the 
+`pandoc site <http://johnmacfarlane.net/pandoc/installing.html>`_.
+
+
 Usage
 """""
 
@@ -26,8 +43,8 @@ Usage
 |                [--dir-cat]
 |                input
 
-Optional arguments:
-"""""""""""""""""""
+Optional arguments
+""""""""""""""""""
 
   -h, --help            show this help message and exit
   --wpfile              Wordpress XML export

From a9f798eae170fd8c6c9d5b9b8fbdc6b5141d0ac7 Mon Sep 17 00:00:00 2001
From: Meir Kriheli <mkriheli@gmail.com>
Date: Sun, 15 Apr 2012 00:41:38 +0300
Subject: [PATCH 0654/2864] Document less css generator

---
 docs/index.rst    | 1 +
 docs/settings.rst | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/docs/index.rst b/docs/index.rst
index 1389f132..6ad22670 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -23,6 +23,7 @@ Pelican currently supports:
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
+* Compilation of less css (optional)
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
diff --git a/docs/settings.rst b/docs/settings.rst
index b7882075..48018a89 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -82,10 +82,15 @@ Setting name (default value)                        What does it do?
                                                     generated HTML, using the `Typogrify
                                                     <http://static.mintchaos.com/projects/typogrify/>`_
                                                     library
+`LESS_GENERATOR` (``FALSE``)                        Set to True if you want to enable compiling less
+                                                    files. Requires installtion of `less css`_.
+`LESS_COMPILER` (``'/usr/bin/lessc'``)              The path to less css compiler (`lessc`)
 ================================================    =====================================================
 
 .. [#] Default is the system locale.
 
+.. _less css: http://lesscss.org/
+
 
 URL settings
 ------------

From 50f2cd295f8da11218ecbdd4af7abdafdff2725e Mon Sep 17 00:00:00 2001
From: Meir Kriheli <mkriheli@gmail.com>
Date: Sun, 15 Apr 2012 02:20:20 +0300
Subject: [PATCH 0655/2864] Implement LessCSSGenerator

---
 pelican/__init__.py   |  4 +++-
 pelican/generators.py | 36 ++++++++++++++++++++++++++++++++++++
 pelican/settings.py   |  2 ++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index c2766646..bb9819cd 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -6,7 +6,7 @@ import logging
 import argparse
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
-        StaticGenerator, PdfGenerator)
+        StaticGenerator, PdfGenerator, LessCSSGenerator)
 from pelican.log import init
 from pelican.settings import read_settings, _DEFAULT_CONFIG
 from pelican.utils import clean_output_dir, files_changed
@@ -133,6 +133,8 @@ class Pelican(object):
         generators = [ArticlesGenerator, PagesGenerator, StaticGenerator]
         if self.settings['PDF_GENERATOR']:
             generators.append(PdfGenerator)
+        if self.settings['LESS_GENERATOR']:
+            generators.append(LessCSSGenerator)
         return generators
 
     def get_writer(self):
diff --git a/pelican/generators.py b/pelican/generators.py
index d7ebb0b0..5b90ad96 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -4,6 +4,7 @@ import math
 import random
 import logging
 import datetime
+import subprocess
 
 from collections import defaultdict
 from functools import partial
@@ -414,3 +415,38 @@ class PdfGenerator(Generator):
 
         for page in self.context['pages']:
             self._create_pdf(page, pdf_path)
+
+
+class LessCSSGenerator(Generator):
+    """Compile less css files. This assumes we have `lessc` in our PATH."""
+
+    def generate_context(self):
+        pass
+
+    def _compile(self, less_file, source_dir, dest_dir):
+        base = os.path.relpath(less_file, source_dir)
+        target = os.path.splitext(
+                os.path.join(self.output_path, base))[0] + '.css'
+        target_dir = os.path.dirname(target)
+
+        if not os.path.exists(target_dir):
+            try:
+                os.makedirs(target_dir)
+            except OSError:
+                logger.error("Couldn't create the pdf output folder in " +
+                        target_dir)
+                pass
+
+        cmd = ' '.join([self.settings['LESS_COMPILER'], less_file, target])
+        subprocess.call(cmd, shell=True)
+        logger.info(u' [ok] compiled %s' % base)
+
+    def generate_output(self, writer=None):
+        logger.info(u' Compiling less css')
+
+        for static_path in self.settings['STATIC_PATHS']:
+            for f in self.get_files(
+                    os.path.join(self.path, static_path),
+                    extensions=['less']):
+
+                self._compile(f, self.path, self.output_path)
diff --git a/pelican/settings.py b/pelican/settings.py
index c0e30815..418634a0 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -67,6 +67,8 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'DEFAULT_STATUS': 'published',
                    'ARTICLE_PERMALINK_STRUCTURE': '',
                    'TYPOGRIFY': False,
+                   'LESS_GENERATOR': False,
+                   'LESS_COMPILER': '/usr/bin/lessc',
                    }
 
 

From ddf57ca2957509e4b069a53da20e5842d5ae4dbe Mon Sep 17 00:00:00 2001
From: Meir Kriheli <mkriheli@gmail.com>
Date: Sun, 15 Apr 2012 02:52:19 +0300
Subject: [PATCH 0656/2864] Also compile less css files in theme static

---
 pelican/generators.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 5b90ad96..48d29f84 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -426,7 +426,7 @@ class LessCSSGenerator(Generator):
     def _compile(self, less_file, source_dir, dest_dir):
         base = os.path.relpath(less_file, source_dir)
         target = os.path.splitext(
-                os.path.join(self.output_path, base))[0] + '.css'
+                os.path.join(dest_dir, base))[0] + '.css'
         target_dir = os.path.dirname(target)
 
         if not os.path.exists(target_dir):
@@ -435,7 +435,6 @@ class LessCSSGenerator(Generator):
             except OSError:
                 logger.error("Couldn't create the pdf output folder in " +
                         target_dir)
-                pass
 
         cmd = ' '.join([self.settings['LESS_COMPILER'], less_file, target])
         subprocess.call(cmd, shell=True)
@@ -444,9 +443,21 @@ class LessCSSGenerator(Generator):
     def generate_output(self, writer=None):
         logger.info(u' Compiling less css')
 
+        # walk static paths
         for static_path in self.settings['STATIC_PATHS']:
             for f in self.get_files(
                     os.path.join(self.path, static_path),
                     extensions=['less']):
 
                 self._compile(f, self.path, self.output_path)
+
+        # walk theme static paths
+        theme_output_path = os.path.join(self.output_path, 'theme')
+
+        for static_path in self.settings['THEME_STATIC_PATHS']:
+            theme_static_path = os.path.join(self.theme, static_path)
+            for f in self.get_files(
+                    theme_static_path,
+                    extensions=['less']):
+
+                self._compile(f, theme_static_path, theme_output_path)

From ac8f3fc6537d47d806adaa3cfa57dad836f072f3 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Sun, 15 Apr 2012 14:31:21 +0100
Subject: [PATCH 0657/2864] Fix misspelling of ftp_target_dir in quickstart

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 0365ca62..64288837 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -226,7 +226,7 @@ Please answer the following questions so this script can generate the files need
         if ask('Do you want to upload your website using FTP ?', answer=bool, default=False):
             CONF['ftp_host'] = ask('What is the hostname of your FTP server ?', str, CONF['ftp_host'])
             CONF['ftp_user'] = ask('What is your username on this server ?', str, CONF['ftp_user'])
-            CONF['ftp_traget_dir'] = ask('Where do you want to put your website on this server ?', str, CONF['ftp_target_dir'])
+            CONF['ftp_target_dir'] = ask('Where do you want to put your website on this server ?', str, CONF['ftp_target_dir'])
 
         if ask('Do you want to upload your website using SSH ?', answer=bool, default=False):
             CONF['ssh_host'] = ask('What is the hostname of your SSH server ?', str, CONF['ssh_host'])

From 4c4c2a96040e99f93b7749057dad37a11b1a13d4 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Sun, 15 Apr 2012 14:40:10 +0100
Subject: [PATCH 0658/2864] Add a missing '

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 9afbb6cc..59aef653 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -61,8 +61,8 @@ class Pelican(object):
     def _handle_deprecation(self):
 
         if self.settings.get('CLEAN_URLS', False):
-            logger.warning('Found deprecated `CLEAN_URLS` in settings. '
-                        ' Modifying the following settings for the 
+            logger.warning('Found deprecated `CLEAN_URLS` in settings.'
+                        ' Modifying the following settings for the'
                         ' same behaviour.')
 
             self.settings['ARTICLE_URL'] = '{slug}/'

From 597233c49b797d166553cd42348cc838b4e03f56 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Sun, 15 Apr 2012 15:01:03 +0100
Subject: [PATCH 0659/2864] Fix a broken link in the docs

---
 docs/settings.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index b7882075..7b43f183 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -361,8 +361,7 @@ By default, two themes are available. You can specify them using the `-t` option
 You can define your own theme too, and specify its placement in the same
 manner. (Be sure to specify the full absolute path to it.)
 
-Here is `a guide on how to create your theme
-<http://pelican.notmyidea.org/en/latest/themes.html>`_
+Here is :doc:`a guide on how to create your theme <themes>`
 
 You can find a list of themes at http://github.com/ametaireau/pelican-themes.
 

From e694cdc2b36a6fb902f4b105e5315ec4a0a99bfd Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Sun, 15 Apr 2012 15:08:06 +0100
Subject: [PATCH 0660/2864] docs: Fix some sphinx warnings, and correctly
 format the french FAQ

---
 docs/fr/faq.rst   | 15 ++++++++++-----
 docs/settings.rst |  8 ++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/docs/fr/faq.rst b/docs/fr/faq.rst
index 8cbe0881..d945f447 100644
--- a/docs/fr/faq.rst
+++ b/docs/fr/faq.rst
@@ -1,8 +1,10 @@
-*Foire aux questions (FAQ)*
+Foire aux questions (FAQ)
+#########################
 
 Voici un résumé des questions fréquemment posées pour pelican.
 
-*Est-il obligatoire d'avoir un fichier de configuration ?*
+Est-il obligatoire d'avoir un fichier de configuration ?
+========================================================
 
 Non. Les fichiers de configuration sont juste un moyen facile de configurer
 pelican. Pour les opérations de base, il est possible de spécifier des
@@ -11,17 +13,20 @@ en invoquant pelican avec la ligne de commande (voir pelican --help pour
 plus
 d'informations à ce sujet)
 
-*Je crée mon propre thème, comment utiliser pygments?*
+Je crée mon propre thème, comment utiliser pygments?
+====================================================
 
 Pygment ajoute quelques classes au contenu généré, de sorte qua colorisation
 de votre thème se fait grâce à un fichier css. Vous pouvez jeter un oeil à
 celui proposé par`sur le site du projet <http://pygments.org/demo/15101/>`_
 
-*Comment puis-je créer mon propre thèm*
+Comment puis-je créer mon propre thèm
+=====================================
 
 Vueillez vous référer à :ref:`theming-pelican-fr`.
 
-*Comment puis-je aider?*
+Comment puis-je aider?
+======================
 
 Vous avez plusieurs options pour aider. Tout d'abord, vous pouvez utiliser
 le
diff --git a/docs/settings.rst b/docs/settings.rst
index 7b43f183..427795c2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -52,10 +52,10 @@ Setting name (default value)                        What does it do?
                                                     supported extensions.
 `OUTPUT_PATH` (``'output/'``)                       Where to output the generated files.
 `PATH` (``None``)                                   Path to look at for input files.
-`PAGE_DIR' (``'pages'``)                            Directory to look at for pages.
-`PAGE_EXCLUDES' (``()``)                            A list of directories to exclude when looking for pages.
-`ARTICLE_DIR' (``''``)                              Directory to look at for articles.
-`ARTICLE_EXCLUDES': (``('pages',)``)                A list of directories to exclude when looking for articles.
+`PAGE_DIR` (``'pages'``)                            Directory to look at for pages.
+`PAGE_EXCLUDES` (``()``)                            A list of directories to exclude when looking for pages.
+`ARTICLE_DIR` (``''``)                              Directory to look at for articles.
+`ARTICLE_EXCLUDES`: (``('pages',)``)                A list of directories to exclude when looking for articles.
 `PDF_GENERATOR` (``False``)                         Set to True if you want to have PDF versions
                                                     of your documents. You will need to install
                                                     `rst2pdf`.

From e29b54e5e079594fb3516b276ce2e1553108bf9d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Mon, 16 Apr 2012 09:10:20 -0700
Subject: [PATCH 0661/2864] Replace omitted slash in feed URL generation

This slash was originally present, but I removed it at some point
because it was causing double-slashes. I believe the reason is that I
had a leading slash in my article URL pattern, which in retrospect
should not have been there. Omitting the slash caused problems for other
folks; I should have tested this better. This commit puts the slash back
where it belongs.
---
 pelican/writers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index faca46bd..4dd04a2a 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -36,7 +36,7 @@ class Writer(object):
 
         feed.add_item(
             title=item.title,
-            link='%s%s' % (self.site_url, item.url),
+            link='%s/%s' % (self.site_url, item.url),
             unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''),
                                         item.date.date(), item.url),
             description=item.content,

From 4793cdfab347835ba3119e97d2fe7e889a87249b Mon Sep 17 00:00:00 2001
From: Meir Kriheli <mkriheli@gmail.com>
Date: Mon, 16 Apr 2012 22:55:50 +0300
Subject: [PATCH 0662/2864] Fix typo in less generator docs

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 48018a89..22b4c744 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -83,7 +83,7 @@ Setting name (default value)                        What does it do?
                                                     <http://static.mintchaos.com/projects/typogrify/>`_
                                                     library
 `LESS_GENERATOR` (``FALSE``)                        Set to True if you want to enable compiling less
-                                                    files. Requires installtion of `less css`_.
+                                                    files. Requires installation of `less css`_.
 `LESS_COMPILER` (``'/usr/bin/lessc'``)              The path to less css compiler (`lessc`)
 ================================================    =====================================================
 

From a0d5596605fd62ebfd4c8419f2b1225b90dc6ceb Mon Sep 17 00:00:00 2001
From: Andrew Laski <alaski@gmail.com>
Date: Mon, 16 Apr 2012 20:39:41 -0400
Subject: [PATCH 0663/2864] Modifed question so that it's more clear

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 153bc3ec..8459870a 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -209,7 +209,7 @@ Please answer the following questions so this script can generate the files need
     '''.format(v=__version__))
 
     CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new Web site ?', answer=str, default=args.path))
-    CONF['sitename'] = ask('How will you call your Web site ?', answer=str, default=args.title)
+    CONF['sitename'] = ask('What will be the title of this Web site ?', answer=str, default=args.title)
     CONF['author'] = ask('Who will be the author of this Web site ?', answer=str, default=args.author)
     CONF['lang'] = ask('What will be the default language of this Web site ?', str, args.lang or CONF['lang'], 2)
 

From 6577efc8f466acf8f6e639528959e2915a7f9413 Mon Sep 17 00:00:00 2001
From: Aaron Kavlie <akavlie@gmail.com>
Date: Wed, 18 Apr 2012 00:20:54 -0700
Subject: [PATCH 0664/2864] Wrap paragraphs in <p> tags

---
 pelican/tools/pelican_import.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index a4d64c67..01253960 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -17,7 +17,7 @@ def wp2fields(xml):
         from BeautifulSoup import BeautifulStoneSoup
     except ImportError:
         error = 'Missing dependency ' + \
-                '"BeautifulSoup" required to import Wordpress files.'
+                '"BeautifulSoup" required to import Wordpress XML files.'
         sys.exit(error)
 
     xmlfile = open(xml, encoding='utf-8').read()
@@ -226,7 +226,10 @@ def fields2pelican(fields, out_markup, output_path, dircat=False):
             with open(html_filename, 'w', encoding='utf-8') as fp:
                 # Replace simple newlines with <br />+newline so that the HTML file
                 # represents the original post more accurately
-                content = content.replace("\n", "<br />\n")
+                paragraphs = content.split('\n\n')
+                paragraphs = ['<p>%s</p>' % p for p in paragraphs]
+                new_content = ''.join(paragraphs)
+
                 fp.write(content)
 
             cmd = 'pandoc --normalize --reference-links --from=html --to={0} -o "{1}" "{2}"'.format(

From 9491bb40d4127b29e2dc68d421d96aca3eb32e98 Mon Sep 17 00:00:00 2001
From: Aaron Kavlie <akavlie@gmail.com>
Date: Wed, 18 Apr 2012 00:24:52 -0700
Subject: [PATCH 0665/2864] Add --no-wrap option to pandoc, fixing issue with
 long links names (another fix for issue #314)

---
 pelican/tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 01253960..9a19f33c 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -232,7 +232,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False):
 
                 fp.write(content)
 
-            cmd = 'pandoc --normalize --reference-links --from=html --to={0} -o "{1}" "{2}"'.format(
+            cmd = 'pandoc --normalize --no-wrap --reference-links --from=html --to={0} -o "{1}" "{2}"'.format(
                 out_markup, out_filename, html_filename)
 
             try:

From 6116236ed9a2bf245df2f34361431fb2515b54ab Mon Sep 17 00:00:00 2001
From: Pavel Puchkin <neoascetic@gmail.com>
Date: Wed, 18 Apr 2012 18:56:53 +1100
Subject: [PATCH 0666/2864] `*_SAVE_AS` = None fix

Ability to disable creating some files when their `_SAVE_AS` setting is
set to none-value. Mostly for disabling creating of `authors` stuff
(when there only one user, see #320 for details)
---
 pelican/contents.py | 3 ++-
 pelican/writers.py  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 593822a9..8174f05a 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -183,7 +183,8 @@ class URLWrapper(object):
 
     def _from_settings(self, key):
         setting = "%s_%s" % (self.__class__.__name__.upper(), key)
-        return unicode(self.settings[setting]).format(**self.as_dict())
+        value = self.settings[setting] or ''
+        return unicode(value).format(**self.as_dict())
 
     url = property(functools.partial(_from_settings, key='URL'))
     save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
diff --git a/pelican/writers.py b/pelican/writers.py
index faca46bd..058be333 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -99,6 +99,8 @@ class Writer(object):
         :param **kwargs: additional variables to pass to the templates
         """
 
+        if not name: return
+
         def _write_file(template, localcontext, output_path, name):
             """Render the template write the file."""
             old_locale = locale.setlocale(locale.LC_ALL)

From 55d7cf438b7586b05cd519184f827353c10a3864 Mon Sep 17 00:00:00 2001
From: Pavel Puchkin <neoascetic@gmail.com>
Date: Wed, 18 Apr 2012 19:04:32 +1100
Subject: [PATCH 0667/2864] Note in docs about previous commit

---
 docs/settings.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 427795c2..af5f94dd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -142,6 +142,9 @@ Setting name (default value)                        what does it do?
 `TAG_SAVE_AS` ('tag/{name}.html')                   The location to save the tag page.
 ================================================    =====================================================
 
+Note: when any of `*_SAVE_AS` setting is set to none-value (including an empty string), files will not be
+created.
+
 Timezone
 --------
 

From 9dcf612f9dfae01b1a65864660c289a0ac254707 Mon Sep 17 00:00:00 2001
From: Pavel Puchkin <neoascetic@gmail.com>
Date: Wed, 18 Apr 2012 23:07:57 +1100
Subject: [PATCH 0668/2864] Fixes after review

---
 docs/settings.rst   | 3 +--
 pelican/contents.py | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index af5f94dd..9cae8111 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -142,8 +142,7 @@ Setting name (default value)                        what does it do?
 `TAG_SAVE_AS` ('tag/{name}.html')                   The location to save the tag page.
 ================================================    =====================================================
 
-Note: when any of `*_SAVE_AS` setting is set to none-value (including an empty string), files will not be
-created.
+Note: when any of `*_SAVE_AS` is set to False, files will not be created.
 
 Timezone
 --------
diff --git a/pelican/contents.py b/pelican/contents.py
index 8174f05a..506c4c02 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -183,7 +183,10 @@ class URLWrapper(object):
 
     def _from_settings(self, key):
         setting = "%s_%s" % (self.__class__.__name__.upper(), key)
-        value = self.settings[setting] or ''
+        value = self.settings[setting]
+        value = value is not False and value or ''  # change to '' only False
+        if value == '':
+            logger.warning(u'%s is disabled' % setting)
         return unicode(value).format(**self.as_dict())
 
     url = property(functools.partial(_from_settings, key='URL'))

From 602990b80e403ec2cb8021575aadae9c56370439 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Wed, 18 Apr 2012 07:16:51 -0700
Subject: [PATCH 0669/2864] Use "endswith" to detect trailing slash on SITEURL

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index c0e30815..7a30e56e 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -130,7 +130,7 @@ def configure_settings(settings, default_settings=None, filename=None):
     if ('SITEURL' in settings):
         # If SITEURL has a trailing slash, remove it and provide a warning
         siteurl = settings['SITEURL']
-        if (siteurl[len(siteurl) - 1:] == '/'):
+        if (siteurl.endswith('/')):
             settings['SITEURL'] = siteurl[:-1]
             logger.warn("Removed extraneous trailing slash from SITEURL.")
         # If SITEURL is defined but FEED_DOMAIN isn't, set FEED_DOMAIN = SITEURL

From cc30695b72772a5faab8bfccf217e2e1397b4f9f Mon Sep 17 00:00:00 2001
From: Aaron Kavlie <akavlie@gmail.com>
Date: Wed, 18 Apr 2012 09:29:47 -0700
Subject: [PATCH 0670/2864] Correct comment; switch to new style string
 formatting.

---
 pelican/tools/pelican_import.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 9a19f33c..b45d4fec 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -224,10 +224,10 @@ def fields2pelican(fields, out_markup, output_path, dircat=False):
             html_filename = os.path.join(output_path, filename+'.html')
 
             with open(html_filename, 'w', encoding='utf-8') as fp:
-                # Replace simple newlines with <br />+newline so that the HTML file
-                # represents the original post more accurately
+                # Replace newlines with paragraphs wrapped with <p> so
+                # HTML is valid before conversion
                 paragraphs = content.split('\n\n')
-                paragraphs = ['<p>%s</p>' % p for p in paragraphs]
+                paragraphs = ['<p>{}</p>'.format(p) for p in paragraphs]
                 new_content = ''.join(paragraphs)
 
                 fp.write(content)

From 36a53442821fbdf379e45c309906fdf0a6f30193 Mon Sep 17 00:00:00 2001
From: Aaron Kavlie <akavlie@gmail.com>
Date: Wed, 18 Apr 2012 22:14:53 -0700
Subject: [PATCH 0671/2864] Beautify two-line string concat.

---
 pelican/tools/pelican_import.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index b45d4fec..fdf28d14 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -16,8 +16,8 @@ def wp2fields(xml):
     try:
         from BeautifulSoup import BeautifulStoneSoup
     except ImportError:
-        error = 'Missing dependency ' + \
-                '"BeautifulSoup" required to import Wordpress XML files.'
+        error = ('Missing dependency '
+                 '"BeautifulSoup" required to import Wordpress XML files.')
         sys.exit(error)
 
     xmlfile = open(xml, encoding='utf-8').read()
@@ -48,8 +48,8 @@ def dc2fields(file):
     try:
         from BeautifulSoup import BeautifulStoneSoup
     except ImportError:
-        error = 'Missing dependency ' + \
-                '"BeautifulSoup" required to import Dotclear files.'
+        error = ('Missing dependency '
+                 '"BeautifulSoup" required to import Dotclear files.')
         sys.exit(error)
 
 

From 5cad4c46f06963c58d43dbaf6e2f5addbec663ea Mon Sep 17 00:00:00 2001
From: Aaron Kavlie <akavlie@gmail.com>
Date: Wed, 18 Apr 2012 22:17:43 -0700
Subject: [PATCH 0672/2864] Improve wording of docs re: pelican-import deps.

---
 docs/importer.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 96e9e729..0147f900 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -22,8 +22,7 @@ supports Markdown).
 Dependencies
 """"""""""""
 
-``pelican-import`` has two additional dependencies not included with pelican
-by default:
+``pelican-import`` has two dependencies not required by the rest of pelican:
 
 - BeautifulSoup
 - pandoc

From 5710dc771d6951519eea5209f388fe17b79b973c Mon Sep 17 00:00:00 2001
From: Aaron Kavlie <akavlie@gmail.com>
Date: Wed, 18 Apr 2012 22:28:49 -0700
Subject: [PATCH 0673/2864] Remove --no-wrap; change para formatting to unicode
 string.

---
 pelican/tools/pelican_import.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index fdf28d14..050b1010 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -227,12 +227,12 @@ def fields2pelican(fields, out_markup, output_path, dircat=False):
                 # Replace newlines with paragraphs wrapped with <p> so
                 # HTML is valid before conversion
                 paragraphs = content.split('\n\n')
-                paragraphs = ['<p>{}</p>'.format(p) for p in paragraphs]
+                paragraphs = [u'<p>{}</p>'.format(p) for p in paragraphs]
                 new_content = ''.join(paragraphs)
 
                 fp.write(content)
 
-            cmd = 'pandoc --normalize --no-wrap --reference-links --from=html --to={0} -o "{1}" "{2}"'.format(
+            cmd = 'pandoc --normalize --reference-links --from=html --to={0} -o "{1}" "{2}"'.format(
                 out_markup, out_filename, html_filename)
 
             try:

From 898ac3808f933e33f458822bb77e3f28d0623fc0 Mon Sep 17 00:00:00 2001
From: Pavel Puchkin <neoascetic@gmail.com>
Date: Fri, 20 Apr 2012 11:28:00 +1100
Subject: [PATCH 0674/2864] Last fix?

---
 pelican/contents.py | 9 +++++----
 pelican/writers.py  | 6 +++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 506c4c02..ba374ba1 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -184,10 +184,11 @@ class URLWrapper(object):
     def _from_settings(self, key):
         setting = "%s_%s" % (self.__class__.__name__.upper(), key)
         value = self.settings[setting]
-        value = value is not False and value or ''  # change to '' only False
-        if value == '':
-            logger.warning(u'%s is disabled' % setting)
-        return unicode(value).format(**self.as_dict())
+        if not isinstance(value, (str, unicode)):
+            logger.warning(u'%s is set to %s' % (setting, value))
+            return value
+        else:
+            return unicode(value).format(**self.as_dict())
 
     url = property(functools.partial(_from_settings, key='URL'))
     save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
diff --git a/pelican/writers.py b/pelican/writers.py
index 058be333..6eb00d7e 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -99,7 +99,11 @@ class Writer(object):
         :param **kwargs: additional variables to pass to the templates
         """
 
-        if not name: return
+        if name is False:
+            return
+        elif not name:
+            # other stuff, just return for now
+            return
 
         def _write_file(template, localcontext, output_path, name):
             """Render the template write the file."""

From 1efda9eb74701ca2e56f082327f1970da154ce33 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Mon, 23 Apr 2012 23:29:00 +0200
Subject: [PATCH 0675/2864] test that categories are ordered as expected

---
 tests/test_generators.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index bc5c8b73..dd27d97f 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -46,3 +46,7 @@ class TestArticlesGenerator(unittest.TestCase):
             elif relfilepath == "article_without_category.rst":
                 self.assertEquals(article.category.name, 'Default')
 
+        categories = [cat.name for cat, _ in generator.categories]
+        # assert that the categories are ordered as expected
+        self.assertEquals(
+                categories, ['Default', 'TestCategory', 'Yeah', 'yeah'])

From d4e981f916c445bb13c30d651a3b80c79f79bb06 Mon Sep 17 00:00:00 2001
From: Meir Kriheli <mkriheli@gmail.com>
Date: Sat, 28 Apr 2012 02:41:48 +0300
Subject: [PATCH 0676/2864] unittest helper: Skip if exectuable not found

---
 tests/support.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/support.py b/tests/support.py
index 4eb07ec4..f2b4a075 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -4,6 +4,8 @@ __all__ = [
     'unittest',
 ]
 
+import os
+import subprocess
 from contextlib import contextmanager
 from tempfile import mkdtemp
 from shutil import rmtree
@@ -35,3 +37,21 @@ def get_article(title, slug, content, lang, extra_metadata=None):
     if extra_metadata is not None:
         metadata.update(extra_metadata)
     return Article(content, metadata=metadata)
+
+
+def skipIfNoExecutable(executable, valid_exit_code=1):
+    """Tries to run an executable to make sure it's in the path, Skips the tests
+    if not found.
+    """
+
+    # calling with no params the command should exit with 1
+    with open(os.devnull, 'w') as fnull:
+        try:
+            res = subprocess.call(executable, stdout=fnull, stderr=fnull)
+        except OSError:
+            res = None
+
+    if res != valid_exit_code:
+        return unittest.skip('{0} compiler not found'.format(executable))
+
+    return lambda func: func

From 1d3e38c5dd4d667ae1d702cfb9dfb32749ab8bf4 Mon Sep 17 00:00:00 2001
From: Meir Kriheli <mkriheli@gmail.com>
Date: Sat, 28 Apr 2012 03:03:53 +0300
Subject: [PATCH 0677/2864] Test less generator

---
 tests/test_generators.py | 53 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index bc5c8b73..ce1b9e7e 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -2,10 +2,12 @@
 
 from mock import MagicMock
 import os
+import re
+import subprocess
 
-from pelican.generators import ArticlesGenerator
+from pelican.generators import ArticlesGenerator, LessCSSGenerator
 from pelican.settings import _DEFAULT_CONFIG
-from .support import unittest
+from .support import unittest, temporary_folder, skipIfNoExecutable
 
 CUR_DIR = os.path.dirname(__file__)
 
@@ -46,3 +48,50 @@ class TestArticlesGenerator(unittest.TestCase):
             elif relfilepath == "article_without_category.rst":
                 self.assertEquals(article.category.name, 'Default')
 
+
+class TestLessCSSGenerator(unittest.TestCase):
+
+    LESS_CONTENT = """
+        @color: #4D926F;
+
+        #header {
+          color: @color;
+        }
+        h2 {
+          color: @color;
+        }
+    """
+
+    @skipIfNoExecutable('lessc')
+    def test_less_compiler(self):
+
+        settings = _DEFAULT_CONFIG.copy()
+        settings['STATIC_PATHS'] = ['static']
+        settings['LESS_GENERATOR'] = True
+        settings['LESS_COMPILER'] = 'lessc'
+
+        # we'll nest here for py < 2.7 compat
+        with temporary_folder() as temp_content:
+            with temporary_folder() as temp_output:
+                generator = LessCSSGenerator(None, settings, temp_content,
+                                    _DEFAULT_CONFIG['THEME'], temp_output, None)
+
+                # create a dummy less file
+                less_dir = os.path.join(temp_content, 'static', 'css')
+                less_filename = os.path.join(less_dir, 'test.less')
+
+                less_output = os.path.join(temp_output, 'static', 'css',
+                                    'test.css')
+
+                os.makedirs(less_dir)
+                with open(less_filename, 'w') as less_file:
+                    less_file.write(self.LESS_CONTENT)
+
+                generator.generate_output()
+
+                # we have the file ?
+                self.assertTrue(os.path.exists(less_output))
+
+                # was it compiled ?
+                self.assertIsNotNone(re.search(r'^\s+color:\s*#4D926F;$',
+                    open(less_output).read(), re.MULTILINE | re.IGNORECASE))

From 2b93d6d855f392327ea09bdfccd17075f3d8401e Mon Sep 17 00:00:00 2001
From: Meir Kriheli <mkriheli@gmail.com>
Date: Sat, 28 Apr 2012 03:04:58 +0300
Subject: [PATCH 0678/2864] Remove empty generate_context

---
 pelican/generators.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 16b4e434..4eecd9dc 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -420,9 +420,6 @@ class PdfGenerator(Generator):
 class LessCSSGenerator(Generator):
     """Compile less css files. This assumes we have `lessc` in our PATH."""
 
-    def generate_context(self):
-        pass
-
     def _compile(self, less_file, source_dir, dest_dir):
         base = os.path.relpath(less_file, source_dir)
         target = os.path.splitext(

From f558389006e0f013dbc2f410ab6520cc1b2fbc66 Mon Sep 17 00:00:00 2001
From: Meir Kriheli <mkriheli@gmail.com>
Date: Sat, 28 Apr 2012 03:25:54 +0300
Subject: [PATCH 0679/2864] Remove redundant LESS_COMPILER setting

---
 docs/settings.rst        | 6 +++---
 pelican/__init__.py      | 2 +-
 pelican/generators.py    | 9 +++++++--
 pelican/settings.py      | 1 -
 tests/test_generators.py | 1 -
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 2a1cfe75..a3ac6606 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -82,9 +82,9 @@ Setting name (default value)                        What does it do?
                                                     generated HTML, using the `Typogrify
                                                     <http://static.mintchaos.com/projects/typogrify/>`_
                                                     library
-`LESS_GENERATOR` (``FALSE``)                        Set to True if you want to enable compiling less
-                                                    files. Requires installation of `less css`_.
-`LESS_COMPILER` (``'/usr/bin/lessc'``)              The path to less css compiler (`lessc`)
+`LESS_GENERATOR` (``FALSE``)                        Set to True or complete path to `lessc` (if not
+                                                    found in system PATH) to enable compiling less
+                                                    css files. Requires installation of `less css`_.
 ================================================    =====================================================
 
 .. [#] Default is the system locale.
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 1161f7e2..6b3d12fb 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -134,7 +134,7 @@ class Pelican(object):
         generators = [ArticlesGenerator, PagesGenerator, StaticGenerator]
         if self.settings['PDF_GENERATOR']:
             generators.append(PdfGenerator)
-        if self.settings['LESS_GENERATOR']:
+        if self.settings['LESS_GENERATOR']: # can be True or PATH to lessc
             generators.append(LessCSSGenerator)
         return generators
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 4eecd9dc..37413ddb 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -418,7 +418,7 @@ class PdfGenerator(Generator):
 
 
 class LessCSSGenerator(Generator):
-    """Compile less css files. This assumes we have `lessc` in our PATH."""
+    """Compile less css files."""
 
     def _compile(self, less_file, source_dir, dest_dir):
         base = os.path.relpath(less_file, source_dir)
@@ -433,13 +433,18 @@ class LessCSSGenerator(Generator):
                 logger.error("Couldn't create the pdf output folder in " +
                         target_dir)
 
-        cmd = ' '.join([self.settings['LESS_COMPILER'], less_file, target])
+        cmd = ' '.join([self._lessc, less_file, target])
         subprocess.call(cmd, shell=True)
         logger.info(u' [ok] compiled %s' % base)
 
     def generate_output(self, writer=None):
         logger.info(u' Compiling less css')
 
+        # store out compiler here, so it won't be evaulted on each run of
+        # _compile
+        lg = self.settings['LESS_GENERATOR']
+        self._lessc = lg if isinstance(lg, basestring) else 'lessc'
+
         # walk static paths
         for static_path in self.settings['STATIC_PATHS']:
             for f in self.get_files(
diff --git a/pelican/settings.py b/pelican/settings.py
index 8d8a7d75..771c72c6 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -68,7 +68,6 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'ARTICLE_PERMALINK_STRUCTURE': '',
                    'TYPOGRIFY': False,
                    'LESS_GENERATOR': False,
-                   'LESS_COMPILER': '/usr/bin/lessc',
                    }
 
 
diff --git a/tests/test_generators.py b/tests/test_generators.py
index ce1b9e7e..ecaacfcd 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -68,7 +68,6 @@ class TestLessCSSGenerator(unittest.TestCase):
         settings = _DEFAULT_CONFIG.copy()
         settings['STATIC_PATHS'] = ['static']
         settings['LESS_GENERATOR'] = True
-        settings['LESS_COMPILER'] = 'lessc'
 
         # we'll nest here for py < 2.7 compat
         with temporary_folder() as temp_content:

From 0924a9dd736427ec6b5591170f9f306415e9cd4c Mon Sep 17 00:00:00 2001
From: Meir Kriheli <mkriheli@gmail.com>
Date: Sat, 28 Apr 2012 03:27:30 +0300
Subject: [PATCH 0680/2864] Not pdf, but less folder

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 37413ddb..cc18e999 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -430,7 +430,7 @@ class LessCSSGenerator(Generator):
             try:
                 os.makedirs(target_dir)
             except OSError:
-                logger.error("Couldn't create the pdf output folder in " +
+                logger.error("Couldn't create the less css output folder in " +
                         target_dir)
 
         cmd = ' '.join([self._lessc, less_file, target])

From 17626b5474941259dcc4733e3efb1fe1e8b9f017 Mon Sep 17 00:00:00 2001
From: Meir Kriheli <mkriheli@gmail.com>
Date: Sat, 28 Apr 2012 03:46:43 +0300
Subject: [PATCH 0681/2864] Don't use shell=True

---
 pelican/generators.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index cc18e999..86e48eb8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -433,8 +433,7 @@ class LessCSSGenerator(Generator):
                 logger.error("Couldn't create the less css output folder in " +
                         target_dir)
 
-        cmd = ' '.join([self._lessc, less_file, target])
-        subprocess.call(cmd, shell=True)
+        subprocess.call([self._lessc, less_file, target])
         logger.info(u' [ok] compiled %s' % base)
 
     def generate_output(self, writer=None):

From cc46ac5d4cade47e84fa304639375f57c4938cda Mon Sep 17 00:00:00 2001
From: Stuart Colville <muffinresearchlabs@gmail.com>
Date: Sat, 28 Apr 2012 18:01:19 +0100
Subject: [PATCH 0682/2864] Allow user to customise the save location of direct
 template pages from settings.

---
 pelican/generators.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 9f4de79b..43861b23 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -182,7 +182,15 @@ class ArticlesGenerator(Generator):
             if template in PAGINATED_TEMPLATES:
                 paginated = {'articles': self.articles, 'dates': self.dates}
 
-            write('%s.html' % template, self.get_template(template),
+            save_as = self.settings.get("%s_SAVE_AS" % template.upper(), None)
+            if save_as is None:
+                file_name = '%s.html' % template
+            elif save_as:
+                file_name = save_as
+            else:
+                continue
+
+            write(file_name, self.get_template(template),
                   self.context, blog=True, paginated=paginated,
                   page_name=template)
 

From c7de5e6bff23f98e96b3844cded3391acedc3002 Mon Sep 17 00:00:00 2001
From: Stuart Colville <muffinresearchlabs@gmail.com>
Date: Sat, 28 Apr 2012 18:02:10 +0100
Subject: [PATCH 0683/2864] add docs for customised save location for direct
 template pages and switch to notes directive for notes

---
 docs/settings.rst | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9cae8111..7c19b539 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -39,9 +39,9 @@ Setting name (default value)                        What does it do?
 `JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.
 `DELETE_OUTPUT_DIRECTORY` (``False``)               Delete the output directory as well as
                                                     the generated files.
-`LOCALE` (''[#]_)                                   Change the locale. A list of locales can be provided 
+`LOCALE` (''[#]_)                                   Change the locale. A list of locales can be provided
                                                     here or a single string representing one locale.
-                                                    When providing a list, all the locales will be tried 
+                                                    When providing a list, all the locales will be tried
                                                     until one works.
 `MARKUP` (``('rst', 'md')``)                        A list of available markup languages you want
                                                     to use. For the moment, the only available values
@@ -96,14 +96,15 @@ your articles in a location such as '{slug}/index.html' and link to them as
 '{slug}' for clean URLs. These settings give you the flexibility to place your
 articles and pages anywhere you want.
 
-Note: If you specify a datetime directive, it will be substituted using the
-input files' date metadata attribute. If the date is not specified for a
-particular file, Pelican will rely on the file's mtime timestamp.
+.. note:: 
+    If you specify a datetime directive, it will be substituted using the
+    input files' date metadata attribute. If the date is not specified for a
+    particular file, Pelican will rely on the file's mtime timestamp.
 
 Check the Python datetime documentation at http://bit.ly/cNcJUC for more
 information.
 
-Also, you can use other file metadata attributes as well: 
+Also, you can use other file metadata attributes as well:
 
 * slug
 * date
@@ -111,7 +112,7 @@ Also, you can use other file metadata attributes as well:
 * author
 * category
 
-Example usage: 
+Example usage:
 
 * ARTICLE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'
 * ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'
@@ -142,7 +143,14 @@ Setting name (default value)                        what does it do?
 `TAG_SAVE_AS` ('tag/{name}.html')                   The location to save the tag page.
 ================================================    =====================================================
 
-Note: when any of `*_SAVE_AS` is set to False, files will not be created.
+.. note::
+
+    When any of `*_SAVE_AS` is set to False, files will not be created.
+
+    You can change the file output location of any pages listed in DIRECT_TEMPLATES
+    by providing a setting <TEMPLATE_NAME>_SAVE_AS, where <TEMPLATE_NAME> is the template
+    name in uppercase; e.g. CATEGORIES. If False it will not be created.
+
 
 Timezone
 --------
@@ -332,7 +340,7 @@ Setting name (default value)                        What does it do?
 ================================================    =====================================================
 `REVERSE_ARCHIVE_ORDER` (``False``)                 Reverse the archives list order. (True: orders by date
                                                     in descending order, with newer articles first.)
-`REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True: lists by reverse 
+`REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True: lists by reverse
                                                     alphabetical order; default lists alphabetically.)
 ================================================    =====================================================
 

From 19cfe00397fca3d0d7dca2a4ce6130efd25c1d84 Mon Sep 17 00:00:00 2001
From: Pavel Puchkin <neoascetic@gmail.com>
Date: Sun, 29 Apr 2012 14:45:34 +1100
Subject: [PATCH 0684/2864] Checking for basestring isinstance, not (str,
 unicode)

---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index ba374ba1..f5f3a1dc 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -184,7 +184,7 @@ class URLWrapper(object):
     def _from_settings(self, key):
         setting = "%s_%s" % (self.__class__.__name__.upper(), key)
         value = self.settings[setting]
-        if not isinstance(value, (str, unicode)):
+        if not isinstance(value, basestring):
             logger.warning(u'%s is set to %s' % (setting, value))
             return value
         else:

From e4f011a697f3b3ca430c57108c9633f9acad5d02 Mon Sep 17 00:00:00 2001
From: Stuart Colville <muffinresearchlabs@gmail.com>
Date: Sun, 29 Apr 2012 10:34:20 +0100
Subject: [PATCH 0685/2864] Refactor generators to aid testing

---
 pelican/generators.py | 48 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 43861b23..99f4bef8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -162,20 +162,22 @@ class ArticlesGenerator(Generator):
                 writer.write_feed(items, self.context,
                                   self.settings['TRANSLATION_FEED'] % lang)
 
-    def generate_pages(self, writer):
-        """Generate the pages on the disk"""
-
+    def generate_articles(self, writer):
+        """Generate the articles."""
         write = partial(writer.write_file,
                         relative_urls=self.settings.get('RELATIVE_URLS'))
 
-        # to minimize the number of relative path stuff modification
-        # in writer, articles pass first
         article_template = self.get_template('article')
         for article in chain(self.translations, self.articles):
             write(article.save_as,
                           article_template, self.context, article=article,
                           category=article.category)
 
+    def generate_direct_templates(self, writer):
+        """Generate direct templates pages"""
+        write = partial(writer.write_file,
+                        relative_urls=self.settings.get('RELATIVE_URLS'))
+
         PAGINATED_TEMPLATES = self.settings.get('PAGINATED_DIRECT_TEMPLATES')
         for template in self.settings.get('DIRECT_TEMPLATES'):
             paginated = {}
@@ -194,7 +196,11 @@ class ArticlesGenerator(Generator):
                   self.context, blog=True, paginated=paginated,
                   page_name=template)
 
-        # and subfolders after that
+    def generate_tags(self, writer):
+        """Generate Tags pages."""
+        write = partial(writer.write_file,
+                        relative_urls=self.settings.get('RELATIVE_URLS'))
+
         tag_template = self.get_template('tag')
         for tag, articles in self.tags.items():
             articles.sort(key=attrgetter('date'), reverse=True)
@@ -204,6 +210,11 @@ class ArticlesGenerator(Generator):
                 paginated={'articles': articles, 'dates': dates},
                 page_name=u'tag/%s' % tag)
 
+    def generate_categories(self, writer):
+        """Generate category pages."""
+        write = partial(writer.write_file,
+                        relative_urls=self.settings.get('RELATIVE_URLS'))
+
         category_template = self.get_template('category')
         for cat, articles in self.categories:
             dates = [article for article in self.dates if article in articles]
@@ -212,6 +223,11 @@ class ArticlesGenerator(Generator):
                 paginated={'articles': articles, 'dates': dates},
                 page_name=u'category/%s' % cat)
 
+    def generate_authors(self, writer):
+        """Generate Author pages."""
+        write = partial(writer.write_file,
+                        relative_urls=self.settings.get('RELATIVE_URLS'))
+
         author_template = self.get_template('author')
         for aut, articles in self.authors:
             dates = [article for article in self.dates if article in articles]
@@ -220,10 +236,30 @@ class ArticlesGenerator(Generator):
                 paginated={'articles': articles, 'dates': dates},
                 page_name=u'author/%s' % aut)
 
+    def generate_drafts(self, writer):
+        """Generate drafts pages."""
+        write = partial(writer.write_file,
+                        relative_urls=self.settings.get('RELATIVE_URLS'))
+
+        article_template = self.get_template('article')
         for article in self.drafts:
             write('drafts/%s.html' % article.slug, article_template,
                   self.context, article=article, category=article.category)
 
+    def generate_pages(self, writer):
+        """Generate the pages on the disk"""
+
+        # to minimize the number of relative path stuff modification
+        # in writer, articles pass first
+        self.generate_articles(writer)
+        self.generate_direct_templates(writer)
+
+        # and subfolders after that
+        self.generate_tags(writer)
+        self.generate_categories(writer)
+        self.generate_authors(writer)
+        self.generate_drafts(writer)
+
     def generate_context(self):
         """change the context"""
 

From 5ab1933be7c9a337d20cdeb3857b3da0feeaef06 Mon Sep 17 00:00:00 2001
From: Stuart Colville <muffinresearchlabs@gmail.com>
Date: Sun, 29 Apr 2012 13:45:14 +0100
Subject: [PATCH 0686/2864] added tests for custom save_as for direct templates

---
 tests/test_generators.py | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index bc5c8b73..fc35fde4 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -9,6 +9,7 @@ from .support import unittest
 
 CUR_DIR = os.path.dirname(__file__)
 
+
 class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_feeds(self):
@@ -46,3 +47,42 @@ class TestArticlesGenerator(unittest.TestCase):
             elif relfilepath == "article_without_category.rst":
                 self.assertEquals(article.category.name, 'Default')
 
+    def test_direct_templates_save_as_default(self):
+
+        settings = _DEFAULT_CONFIG.copy()
+        settings['DIRECT_TEMPLATES'] = ['archives']
+        generator = ArticlesGenerator(settings.copy(), settings, None,
+                                      _DEFAULT_CONFIG['THEME'], None,
+                                      _DEFAULT_CONFIG['MARKUP'])
+
+        writer = MagicMock()
+        generator.generate_direct_templates(writer)
+        writer.write_file.assert_called_with("archives.html",
+            generator.get_template("archives"), settings, relative_urls=True,
+            blog=True, paginated={}, page_name='archives')
+
+    def test_direct_templates_save_as_modified(self):
+
+        settings = _DEFAULT_CONFIG.copy()
+        settings['DIRECT_TEMPLATES'] = ['archives']
+        settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
+        generator = ArticlesGenerator(settings, settings, None,
+                                      _DEFAULT_CONFIG['THEME'], None,
+                                      _DEFAULT_CONFIG['MARKUP'])
+        writer = MagicMock()
+        generator.generate_direct_templates(writer)
+        writer.write_file.assert_called_with("archives/index.html",
+            generator.get_template("archives"), settings, relative_urls=True,
+            blog=True, paginated={}, page_name='archives')
+
+    def test_direct_templates_save_as_false(self):
+
+        settings = _DEFAULT_CONFIG.copy()
+        settings['DIRECT_TEMPLATES'] = ['archives']
+        settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
+        generator = ArticlesGenerator(settings, settings, None,
+                                      _DEFAULT_CONFIG['THEME'], None,
+                                      _DEFAULT_CONFIG['MARKUP'])
+        writer = MagicMock()
+        generator.generate_direct_templates(writer)
+        writer.write_file.assert_called_count == 0

From feb1dcc773516129177a2f0d6648e8154e23e8c2 Mon Sep 17 00:00:00 2001
From: Pavel Puchkin <neoascetic@gmail.com>
Date: Mon, 30 Apr 2012 19:43:09 +1100
Subject: [PATCH 0687/2864] Use {slug} instead of {name} for category URL and
 FILENAME formatting

---
 pelican/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 7a30e56e..84d9a0a9 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -43,8 +43,8 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'PAGE_SAVE_AS': 'pages/{slug}.html',
                    'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
                    'PAGE_LANG_SAVE_AS': 'pages/{slug}-{lang}.html',
-                   'CATEGORY_URL': 'category/{name}.html',
-                   'CATEGORY_SAVE_AS': 'category/{name}.html',
+                   'CATEGORY_URL': 'category/{slug}.html',
+                   'CATEGORY_SAVE_AS': 'category/{slug}.html',
                    'TAG_URL': 'tag/{slug}.html',
                    'TAG_SAVE_AS': 'tag/{slug}.html',
                    'AUTHOR_URL': u'author/{slug}.html',

From faecba6035a4d15b7d1f8197026cf77bb95386be Mon Sep 17 00:00:00 2001
From: Matt Bowcock <matt.bowcock@gmail.com>
Date: Tue, 1 May 2012 22:34:32 -0400
Subject: [PATCH 0688/2864] Changed variable name extension to file_extensions.

---
 pelican/readers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index c5d9aa00..868dc965 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -65,7 +65,7 @@ def render_node_to_html(document, node):
 
 class RstReader(Reader):
     enabled = bool(docutils)
-    extension = ['rst']
+    file_extensions = ['rst']
 
     def _parse_metadata(self, document):
         """Return the dict containing document metadata"""
@@ -111,7 +111,7 @@ class RstReader(Reader):
 
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
-    extension = ['md', 'markdown', 'mkd']
+    file_extensions = ['md', 'markdown', 'mkd']
     extensions = ['codehilite', 'extra']
 
     def read(self, filename):
@@ -128,7 +128,7 @@ class MarkdownReader(Reader):
 
 
 class HtmlReader(Reader):
-    extension = ['html', 'htm']
+    file_extensions = ['html', 'htm']
     _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
 
     def read(self, filename):
@@ -147,7 +147,7 @@ class HtmlReader(Reader):
 _EXTENSIONS = {}
 
 for cls in Reader.__subclasses__():
-    for ext in cls.extension:
+    for ext in cls.file_extensions:
         _EXTENSIONS[ext] = cls
 
 

From ec610537be79c90ad6482a8a7372afaa978e539e Mon Sep 17 00:00:00 2001
From: Matt Bowcock <matt.bowcock@gmail.com>
Date: Tue, 1 May 2012 23:19:38 -0400
Subject: [PATCH 0689/2864] Added test for markdown files using extension md
 and mkd. Tests ensure the correct reader is processing file.

---
 tests/content/article_with_md_extension.md   | 7 +++++++
 tests/content/article_with_mkd_extension.mkd | 7 +++++++
 2 files changed, 14 insertions(+)
 create mode 100644 tests/content/article_with_md_extension.md
 create mode 100644 tests/content/article_with_mkd_extension.mkd

diff --git a/tests/content/article_with_md_extension.md b/tests/content/article_with_md_extension.md
new file mode 100644
index 00000000..1fb052aa
--- /dev/null
+++ b/tests/content/article_with_md_extension.md
@@ -0,0 +1,7 @@
+Test Markdown File Header
+=========================
+
+Used for pelican test
+---------------------
+
+The quick brown fox jumped over the lazy dog's back.
diff --git a/tests/content/article_with_mkd_extension.mkd b/tests/content/article_with_mkd_extension.mkd
new file mode 100644
index 00000000..593f6721
--- /dev/null
+++ b/tests/content/article_with_mkd_extension.mkd
@@ -0,0 +1,7 @@
+Test Markdown File Header
+=========================
+
+Used for pelican test
+---------------------
+
+This is another markdown test file.  Uses the mkd extension.

From 3c987d20b1de7b00f2dad8f5d71c11273c7aa89a Mon Sep 17 00:00:00 2001
From: Matt Bowcock <matt.bowcock@gmail.com>
Date: Tue, 1 May 2012 23:30:23 -0400
Subject: [PATCH 0690/2864] Added some metadata to new test files

---
 tests/content/article_with_md_extension.md   |  3 +++
 tests/content/article_with_mkd_extension.mkd |  3 +++
 tests/test_readers.py                        | 22 ++++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/tests/content/article_with_md_extension.md b/tests/content/article_with_md_extension.md
index 1fb052aa..11aa22a2 100644
--- a/tests/content/article_with_md_extension.md
+++ b/tests/content/article_with_md_extension.md
@@ -1,3 +1,6 @@
+title: Test md File
+category: test
+
 Test Markdown File Header
 =========================
 
diff --git a/tests/content/article_with_mkd_extension.mkd b/tests/content/article_with_mkd_extension.mkd
index 593f6721..c946cb87 100644
--- a/tests/content/article_with_mkd_extension.mkd
+++ b/tests/content/article_with_mkd_extension.mkd
@@ -1,3 +1,6 @@
+title: Test mkd File
+category: test
+
 Test Markdown File Header
 =========================
 
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 7b9316b5..de2e9c32 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -61,3 +61,25 @@ class RstReaderTest(unittest.TestCase):
             self.assertEqual(content, expected)
         except ImportError:
             return unittest.skip('need the typogrify distribution')
+
+class MdReaderTest(unittest.TestCase):
+
+    def test_article_with_md_extention(self):
+        # test to ensure the md extension is being processed by the correct reader
+        reader = readers.MarkdownReader({})
+        content, metadata = reader.read(_filename('article_with_md_extension.md'))
+        expected = "<h1>Test Markdown File Header</h1>\n"\
+                "<h2>Used for pelican test</h2>\n"\
+                "<p>The quick brown fox jumped over the lazy dog's back.</p>"
+        
+        self.assertEqual(content, expected)
+
+    def test_article_with_mkd_extension(self):
+        # test to ensure the mkd extension is being processed by the correct reader
+        reader = readers.MarkdownReader({})
+        content, metadata = reader.read(_filename('article_with_mkd_extension.mkd'))
+        expected = "<h1>Test Markdown File Header</h1>\n"\
+                "<h2>Used for pelican test</h2>\n"\
+                "<p>This is another markdown test file.  Uses the mkd extension.</p>"
+        
+        self.assertEqual(content, expected)

From 06ba9acdb850f8c6f2ba21bb35757a8e5277209d Mon Sep 17 00:00:00 2001
From: Stuart Colville <muffinresearch@gmail.com>
Date: Wed, 2 May 2012 09:26:33 +0100
Subject: [PATCH 0691/2864] Pass write function to reduce duplication. Simplify
 logic.

---
 pelican/generators.py    | 59 ++++++++++++++--------------------------
 tests/test_generators.py | 23 ++++++++--------
 2 files changed, 31 insertions(+), 51 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 99f4bef8..86e5db9b 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -162,45 +162,32 @@ class ArticlesGenerator(Generator):
                 writer.write_feed(items, self.context,
                                   self.settings['TRANSLATION_FEED'] % lang)
 
-    def generate_articles(self, writer):
+    def generate_articles(self, write):
         """Generate the articles."""
-        write = partial(writer.write_file,
-                        relative_urls=self.settings.get('RELATIVE_URLS'))
-
         article_template = self.get_template('article')
         for article in chain(self.translations, self.articles):
             write(article.save_as,
                           article_template, self.context, article=article,
                           category=article.category)
 
-    def generate_direct_templates(self, writer):
+    def generate_direct_templates(self, write):
         """Generate direct templates pages"""
-        write = partial(writer.write_file,
-                        relative_urls=self.settings.get('RELATIVE_URLS'))
-
         PAGINATED_TEMPLATES = self.settings.get('PAGINATED_DIRECT_TEMPLATES')
         for template in self.settings.get('DIRECT_TEMPLATES'):
             paginated = {}
             if template in PAGINATED_TEMPLATES:
                 paginated = {'articles': self.articles, 'dates': self.dates}
+            save_as = self.settings.get("%s_SAVE_AS" % template.upper(),
+                                                        '%s.html' % template)
+            if not save_as:
+                 continue
 
-            save_as = self.settings.get("%s_SAVE_AS" % template.upper(), None)
-            if save_as is None:
-                file_name = '%s.html' % template
-            elif save_as:
-                file_name = save_as
-            else:
-                continue
-
-            write(file_name, self.get_template(template),
+            write(save_as, self.get_template(template),
                   self.context, blog=True, paginated=paginated,
                   page_name=template)
 
-    def generate_tags(self, writer):
+    def generate_tags(self, write):
         """Generate Tags pages."""
-        write = partial(writer.write_file,
-                        relative_urls=self.settings.get('RELATIVE_URLS'))
-
         tag_template = self.get_template('tag')
         for tag, articles in self.tags.items():
             articles.sort(key=attrgetter('date'), reverse=True)
@@ -210,11 +197,8 @@ class ArticlesGenerator(Generator):
                 paginated={'articles': articles, 'dates': dates},
                 page_name=u'tag/%s' % tag)
 
-    def generate_categories(self, writer):
+    def generate_categories(self, write):
         """Generate category pages."""
-        write = partial(writer.write_file,
-                        relative_urls=self.settings.get('RELATIVE_URLS'))
-
         category_template = self.get_template('category')
         for cat, articles in self.categories:
             dates = [article for article in self.dates if article in articles]
@@ -223,11 +207,8 @@ class ArticlesGenerator(Generator):
                 paginated={'articles': articles, 'dates': dates},
                 page_name=u'category/%s' % cat)
 
-    def generate_authors(self, writer):
+    def generate_authors(self, write):
         """Generate Author pages."""
-        write = partial(writer.write_file,
-                        relative_urls=self.settings.get('RELATIVE_URLS'))
-
         author_template = self.get_template('author')
         for aut, articles in self.authors:
             dates = [article for article in self.dates if article in articles]
@@ -236,11 +217,8 @@ class ArticlesGenerator(Generator):
                 paginated={'articles': articles, 'dates': dates},
                 page_name=u'author/%s' % aut)
 
-    def generate_drafts(self, writer):
+    def generate_drafts(self, write):
         """Generate drafts pages."""
-        write = partial(writer.write_file,
-                        relative_urls=self.settings.get('RELATIVE_URLS'))
-
         article_template = self.get_template('article')
         for article in self.drafts:
             write('drafts/%s.html' % article.slug, article_template,
@@ -248,17 +226,20 @@ class ArticlesGenerator(Generator):
 
     def generate_pages(self, writer):
         """Generate the pages on the disk"""
+        write = partial(writer.write_file,
+                        relative_urls=self.settings.get('RELATIVE_URLS'))
 
         # to minimize the number of relative path stuff modification
         # in writer, articles pass first
-        self.generate_articles(writer)
-        self.generate_direct_templates(writer)
+        self.generate_articles(write)
+        self.generate_direct_templates(write)
+
 
         # and subfolders after that
-        self.generate_tags(writer)
-        self.generate_categories(writer)
-        self.generate_authors(writer)
-        self.generate_drafts(writer)
+        self.generate_tags(write)
+        self.generate_categories(write)
+        self.generate_authors(write)
+        self.generate_drafts(write)
 
     def generate_context(self):
         """change the context"""
diff --git a/tests/test_generators.py b/tests/test_generators.py
index fc35fde4..dd2ca9cb 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -54,11 +54,10 @@ class TestArticlesGenerator(unittest.TestCase):
         generator = ArticlesGenerator(settings.copy(), settings, None,
                                       _DEFAULT_CONFIG['THEME'], None,
                                       _DEFAULT_CONFIG['MARKUP'])
-
-        writer = MagicMock()
-        generator.generate_direct_templates(writer)
-        writer.write_file.assert_called_with("archives.html",
-            generator.get_template("archives"), settings, relative_urls=True,
+        write = MagicMock()
+        generator.generate_direct_templates(write)
+        write.assert_called_with("archives.html",
+            generator.get_template("archives"), settings,
             blog=True, paginated={}, page_name='archives')
 
     def test_direct_templates_save_as_modified(self):
@@ -69,10 +68,10 @@ class TestArticlesGenerator(unittest.TestCase):
         generator = ArticlesGenerator(settings, settings, None,
                                       _DEFAULT_CONFIG['THEME'], None,
                                       _DEFAULT_CONFIG['MARKUP'])
-        writer = MagicMock()
-        generator.generate_direct_templates(writer)
-        writer.write_file.assert_called_with("archives/index.html",
-            generator.get_template("archives"), settings, relative_urls=True,
+        write = MagicMock()
+        generator.generate_direct_templates(write)
+        write.assert_called_with("archives/index.html",
+            generator.get_template("archives"), settings,
             blog=True, paginated={}, page_name='archives')
 
     def test_direct_templates_save_as_false(self):
@@ -83,6 +82,6 @@ class TestArticlesGenerator(unittest.TestCase):
         generator = ArticlesGenerator(settings, settings, None,
                                       _DEFAULT_CONFIG['THEME'], None,
                                       _DEFAULT_CONFIG['MARKUP'])
-        writer = MagicMock()
-        generator.generate_direct_templates(writer)
-        writer.write_file.assert_called_count == 0
+        write = MagicMock()
+        generator.generate_direct_templates(write)
+        write.assert_called_count == 0

From a60fa59514750ab2cd634c811069f591a7f6326e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albrecht=20M=C3=BChlenschulte?= <albrecht@a7p.org>
Date: Sun, 6 May 2012 01:59:19 +0200
Subject: [PATCH 0692/2864] removed duplication

---
 pelican/tools/pelican_quickstart.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 2f63029b..4725e74d 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -53,14 +53,11 @@ clean:
 dropbox_upload: $$(OUTPUTDIR)/index.html
 \tcp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
 
-rsync_upload: $$(OUTPUTDIR)/index.html
-\trsync --delete -rvz -e ssh $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
-
 ssh_upload: $$(OUTPUTDIR)/index.html
 \tscp -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 rsync_upload: $$(OUTPUTDIR)/index.html
-\trsync -e ssh -P -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+\trsync -e ssh -P -rvz --delete $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
 ftp_upload: $$(OUTPUTDIR)/index.html
 \tlftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"

From 8a842c0de7db1196ced0e7e2d7dc5d46548e5c73 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 6 May 2012 02:43:13 +0200
Subject: [PATCH 0693/2864] merge with master

---
 pelican/generators.py    | 6 ++++--
 tests/test_generators.py | 8 +++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 86e48eb8..9647d397 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -303,10 +303,12 @@ class ArticlesGenerator(Generator):
 
         # order the categories per name
         self.categories = list(self.categories.items())
-        self.categories.sort(reverse=self.settings['REVERSE_CATEGORY_ORDER'])
+        self.categories.sort(
+                key=lambda item: item[0].name,
+                reverse=self.settings['REVERSE_CATEGORY_ORDER'])
 
         self.authors = list(self.authors.items())
-        self.authors.sort()
+        self.authors.sort(key=lambda item: item[0].name)
 
         self._update_context(('articles', 'dates', 'tags', 'categories',
                               'tag_cloud', 'authors'))
diff --git a/tests/test_generators.py b/tests/test_generators.py
index ecaacfcd..e8ce4e21 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -3,7 +3,6 @@
 from mock import MagicMock
 import os
 import re
-import subprocess
 
 from pelican.generators import ArticlesGenerator, LessCSSGenerator
 from pelican.settings import _DEFAULT_CONFIG
@@ -11,6 +10,7 @@ from .support import unittest, temporary_folder, skipIfNoExecutable
 
 CUR_DIR = os.path.dirname(__file__)
 
+
 class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_feeds(self):
@@ -48,6 +48,12 @@ class TestArticlesGenerator(unittest.TestCase):
             elif relfilepath == "article_without_category.rst":
                 self.assertEquals(article.category.name, 'Default')
 
+        categories = [cat.name for cat, _ in generator.categories]
+        # assert that the categories are ordered as expected
+        self.assertEquals(
+                categories, ['Default', 'TestCategory', 'Yeah', 'test',
+                             'yeah'])
+
 
 class TestLessCSSGenerator(unittest.TestCase):
 

From 7c53cc8955b8f38da7fe60a296335694a3a4ee54 Mon Sep 17 00:00:00 2001
From: m-r-r <raybaudroigm@gmail.com>
Date: Sun, 6 May 2012 12:07:13 +0200
Subject: [PATCH 0694/2864] Moved templates in pelican_quistart.py to a
 directory

---
 pelican/tools/pelican_quickstart.py        | 114 ++++-----------------
 pelican/tools/templates/Makefile.in        |  58 +++++++++++
 pelican/tools/templates/pelican.conf.py.in |  25 +++++
 3 files changed, 105 insertions(+), 92 deletions(-)
 create mode 100644 pelican/tools/templates/Makefile.in
 create mode 100644 pelican/tools/templates/pelican.conf.py.in

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 00d81148..ca926667 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -7,95 +7,9 @@ import argparse
 
 from pelican import __version__
 
-TEMPLATES = {
-    'Makefile' : '''
-PELICAN=$pelican
-PELICANOPTS=$pelicanopts
+_TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), \
+                              "templates")
 
-BASEDIR=$$(PWD)
-INPUTDIR=$$(BASEDIR)/src
-OUTPUTDIR=$$(BASEDIR)/output
-CONFFILE=$$(BASEDIR)/pelican.conf.py
-
-FTP_HOST=$ftp_host
-FTP_USER=$ftp_user
-FTP_TARGET_DIR=$ftp_target_dir
-
-SSH_HOST=$ssh_host
-SSH_USER=$ssh_user
-SSH_TARGET_DIR=$ssh_target_dir
-
-DROPBOX_DIR=$dropbox_dir
-
-help:
-\t@echo 'Makefile for a pelican Web site                                        '
-\t@echo '                                                                       '
-\t@echo 'Usage:                                                                 '
-\t@echo '   make html                        (re)generate the web site          '
-\t@echo '   make clean                       remove the generated files         '
-\t@echo '   ftp_upload                       upload the web site using FTP      '
-\t@echo '   ssh_upload                       upload the web site using SSH      '
-\t@echo '   dropbox_upload                   upload the web site using Dropbox  '
-\t@echo '   rsync_upload                     upload the web site using rsync/ssh'
-\t@echo '                                                                       '
-
-
-html: clean $$(OUTPUTDIR)/index.html
-\t@echo 'Done'
-
-$$(OUTPUTDIR)/%.html:
-\t$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
-
-clean:
-\trm -fr $$(OUTPUTDIR)
-\tmkdir $$(OUTPUTDIR)
-
-dropbox_upload: $$(OUTPUTDIR)/index.html
-\tcp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
-
-ssh_upload: $$(OUTPUTDIR)/index.html
-\tscp -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
-
-rsync_upload: $$(OUTPUTDIR)/index.html
-\trsync -e ssh -P -rvz --delete $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
-
-ftp_upload: $$(OUTPUTDIR)/index.html
-\tlftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
-
-github: $$(OUTPUTDIR)/index.html
-\tghp-import $$(OUTPUTDIR)
-\tgit push origin gh-pages
-
-.PHONY: html help clean ftp_upload ssh_upload rsync_upload dropbox_upload github
-''',
-
-    'pelican.conf.py': '''#!/usr/bin/env python
-# -*- coding: utf-8 -*- #
-
-AUTHOR = u"$author"
-SITENAME = u"$sitename"
-SITEURL = '/'
-
-TIMEZONE = 'Europe/Paris'
-
-DEFAULT_LANG='$lang'
-
-# Blogroll
-LINKS =  (
-    ('Pelican', 'http://docs.notmyidea.org/alexis/pelican/'),
-    ('Python.org', 'http://python.org'),
-    ('Jinja2', 'http://jinja.pocoo.org'),
-    ('You can modify those links in your config file', '#')
-         )
-
-# Social widget
-SOCIAL = (
-          ('You can add links in your config file', '#'),
-         )
-
-DEFAULT_PAGINATION = $default_pagination
-'''
-}
 
 CONF = {
     'pelican' : 'pelican',
@@ -113,6 +27,20 @@ CONF = {
 }
 
 
+def get_template(name):
+    template = os.path.join(_TEMPLATES_DIR, "{0}.in".format(name))
+
+    if os.path.isfile(template):
+        raise RuntimeError("Cannot open {0}".format(template))
+
+    with open(tempalte, 'r') as fd:
+        line = fd.readline()
+        while line:
+            yield line
+            line = fd.readline()
+        fd.close()
+
+
 def ask(question, answer=str, default=None, l=None):
     if answer == str:
         r = ''
@@ -247,20 +175,22 @@ Please answer the following questions so this script can generate the files need
     except OSError, e:
         print('Error: {0}'.format(e))
 
-    conf = string.Template(TEMPLATES['pelican.conf.py'])
     try:
         with open(os.path.join(CONF['basedir'], 'pelican.conf.py'), 'w') as fd:
-            fd.write(conf.safe_substitute(CONF))
+            for line in get_template('pelican.conf.py'):
+                template = string.Template(line)
+                fd.write(template.safe_substitute(CONF))
             fd.close()
     except OSError, e:
         print('Error: {0}'.format(e))
 
     if mkfile:
-        Makefile = string.Template(TEMPLATES['Makefile'])
 
         try:
             with open(os.path.join(CONF['basedir'], 'Makefile'), 'w') as fd:
-                fd.write(Makefile.safe_substitute(CONF))
+                for line in get_template('Makefile'):
+                    template = string.Template(line)
+                    fd.write(template.safe_substitute(CONF))
                 fd.close()
         except OSError, e:
             print('Error: {0}'.format(e))
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
new file mode 100644
index 00000000..998d8c97
--- /dev/null
+++ b/pelican/tools/templates/Makefile.in
@@ -0,0 +1,58 @@
+PELICAN=$pelican
+PELICANOPTS=$pelicanopts
+
+BASEDIR=$$(PWD)
+INPUTDIR=$$(BASEDIR)/src
+OUTPUTDIR=$$(BASEDIR)/output
+CONFFILE=$$(BASEDIR)/pelican.conf.py
+
+FTP_HOST=$ftp_host
+FTP_USER=$ftp_user
+FTP_TARGET_DIR=$ftp_target_dir
+
+SSH_HOST=$ssh_host
+SSH_USER=$ssh_user
+SSH_TARGET_DIR=$ssh_target_dir
+
+DROPBOX_DIR=$dropbox_dir
+
+help:
+	@echo 'Makefile for a pelican Web site                                        '
+	@echo '                                                                       '
+	@echo 'Usage:                                                                 '
+	@echo '   make html                        (re)generate the web site          '
+	@echo '   make clean                       remove the generated files         '
+	@echo '   ftp_upload                       upload the web site using FTP      '
+	@echo '   ssh_upload                       upload the web site using SSH      '
+	@echo '   dropbox_upload                   upload the web site using Dropbox  '
+	@echo '   rsync_upload                     upload the web site using rsync/ssh'
+	@echo '                                                                       '
+
+
+html: clean $$(OUTPUTDIR)/index.html
+	@echo 'Done'
+
+$$(OUTPUTDIR)/%.html:
+	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
+
+clean:
+	rm -fr $$(OUTPUTDIR)
+	mkdir $$(OUTPUTDIR)
+
+dropbox_upload: $$(OUTPUTDIR)/index.html
+	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
+
+ssh_upload: $$(OUTPUTDIR)/index.html
+	scp -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
+
+rsync_upload: $$(OUTPUTDIR)/index.html
+	rsync -e ssh -P -rvz --delete $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+
+ftp_upload: $$(OUTPUTDIR)/index.html
+	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
+
+github: $$(OUTPUTDIR)/index.html
+	ghp-import $$(OUTPUTDIR)
+	git push origin gh-pages
+
+.PHONY: html help clean ftp_upload ssh_upload rsync_upload dropbox_upload github
diff --git a/pelican/tools/templates/pelican.conf.py.in b/pelican/tools/templates/pelican.conf.py.in
new file mode 100644
index 00000000..ee56048e
--- /dev/null
+++ b/pelican/tools/templates/pelican.conf.py.in
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*- #
+
+AUTHOR = u"$author"
+SITENAME = u"$sitename"
+SITEURL = '/'
+
+TIMEZONE = 'Europe/Paris'
+
+DEFAULT_LANG='$lang'
+
+# Blogroll
+LINKS =  (
+    ('Pelican', 'http://docs.notmyidea.org/alexis/pelican/'),
+    ('Python.org', 'http://python.org'),
+    ('Jinja2', 'http://jinja.pocoo.org'),
+    ('You can modify those links in your config file', '#')
+         )
+
+# Social widget
+SOCIAL = (
+          ('You can add links in your config file', '#'),
+         )
+
+DEFAULT_PAGINATION = $default_pagination

From d97fc8f666aaaf55cc9405920bbc75f3c91f7298 Mon Sep 17 00:00:00 2001
From: m-r-r <raybaudroigm@gmail.com>
Date: Sun, 6 May 2012 12:32:53 +0200
Subject: [PATCH 0695/2864] Fixed some errors

---
 pelican/tools/pelican_quickstart.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index ca926667..cfd9bb4c 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -30,10 +30,10 @@ CONF = {
 def get_template(name):
     template = os.path.join(_TEMPLATES_DIR, "{0}.in".format(name))
 
-    if os.path.isfile(template):
+    if not os.path.isfile(template):
         raise RuntimeError("Cannot open {0}".format(template))
 
-    with open(tempalte, 'r') as fd:
+    with open(template, 'r') as fd:
         line = fd.readline()
         while line:
             yield line

From 4a0d4461e18dab5c7da3e9900dfbbc7b3e0a5ca7 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Mon, 7 May 2012 12:26:17 +0200
Subject: [PATCH 0696/2864] Apply typogrify on the title.

As it is done when reading the file, we need to remove html tags for the
permalink and the slug (this is done here for the notmyidea and simple themes).

While modifying the themes I also replaced the `pagename` template tag with
`article.url` (`pagename` was an empty variable, no more used ?).
---
 pelican/readers.py                            |  1 +
 .../themes/notmyidea/templates/article.html   | 56 ++++++++++---------
 pelican/themes/simple/templates/article.html  | 36 ++++++------
 pelican/utils.py                              |  2 +
 4 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 868dc965..83565918 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -174,5 +174,6 @@ def read_file(filename, fmt=None, settings=None):
     if settings and settings['TYPOGRIFY']:
         from typogrify import Typogrify
         content = Typogrify.typogrify(content)
+        metadata['title'] = Typogrify.typogrify(metadata['title'])
 
     return content, metadata
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 6615b63a..fc7e5893 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -1,30 +1,34 @@
 {% extends "base.html" %}
-{% block title %}{{ article.title }}{% endblock %}
-{% block content %}        
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href="{{ pagename }}"
-        rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title
-        }}</a></h1> {% include 'twitter.html' %} </header>
-        <div class="entry-content">
-        {% include 'article_infos.html' %}
-        {{ article.content }}
-        </div><!-- /.entry-content -->
-        {% if DISQUS_SITENAME %}
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "{{ article.url }}";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        {% endif %}
+{% block title %}{{ article.title|striptags }}{% endblock %}
+{% block content %}
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="{{ article.url }}" rel="bookmark"
+           title="Permalink to {{ article.title|striptags }}">{{ article.title}}</a></h1>
+      {% include 'twitter.html' %}
+    </header>
 
-</article>
+    <div class="entry-content">
+      {% include 'article_infos.html' %}
+      {{ article.content }}
+    </div><!-- /.entry-content -->
+    {% if DISQUS_SITENAME %}
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "{{ article.url }}";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    {% endif %}
+
+  </article>
 </section>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index d6c96a13..16c34266 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -1,19 +1,23 @@
 {% extends "base.html" %}
-{% block content %}        
-<section id="content" class="body">    
-        <header> <h2 class="entry-title"><a href="{{ pagename }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
-        <footer class="post-info">
-                <abbr class="published" title="{{ article.date.isoformat() }}">
-                        {{ article.locale_date }}
-                </abbr>
-                {% if article.author %}
-                <address class="vcard author">
-                        By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
-                </address>
-                {% endif %}
-        </footer><!-- /.post-info -->
-        <div class="entry-content">
-        {{ article.content }}
-        </div><!-- /.entry-content -->
+{% block content %}
+<section id="content" class="body">
+  <header>
+    <h2 class="entry-title">
+      <a href="{{ article.url }}" rel="bookmark"
+         title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
+  </header>
+  <footer class="post-info">
+    <abbr class="published" title="{{ article.date.isoformat() }}">
+      {{ article.locale_date }}
+    </abbr>
+    {% if article.author %}
+    <address class="vcard author">
+      By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
+    </address>
+    {% endif %}
+  </footer><!-- /.post-info -->
+  <div class="entry-content">
+    {{ article.content }}
+  </div><!-- /.entry-content -->
 </section>
 {% endblock %}
diff --git a/pelican/utils.py b/pelican/utils.py
index 18730e6c..d4e34842 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -8,6 +8,7 @@ import logging
 from codecs import open as _open
 from datetime import datetime
 from itertools import groupby
+from jinja2 import Markup
 from operator import attrgetter
 
 logger = logging.getLogger(__name__)
@@ -44,6 +45,7 @@ def slugify(value):
 
     Took from django sources.
     """
+    value = Markup(value).striptags()
     if type(value) == unicode:
         import unicodedata
         value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')

From e9996b5cc64e4c9dc7c295742e5d1d592ee32511 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Mon, 7 May 2012 13:05:33 +0200
Subject: [PATCH 0697/2864] strip tags for feed titles

---
 pelican/writers.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 593879e2..75971ee9 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -8,8 +8,8 @@ import logging
 
 from codecs import open
 from functools import partial
-
 from feedgenerator import Atom1Feed, Rss201rev2Feed
+from jinja2 import Markup
 from pelican.paginator import Paginator
 from pelican.utils import get_relative_path, set_date_tzinfo
 
@@ -25,8 +25,9 @@ class Writer(object):
 
     def _create_new_feed(self, feed_type, context):
         feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
+        sitename = Markup(context['SITENAME']).striptags()
         feed = feed_class(
-            title=context['SITENAME'],
+            title=sitename,
             link=(self.site_url + '/'),
             feed_url=self.feed_url,
             description=context.get('SITESUBTITLE', ''))
@@ -34,8 +35,9 @@ class Writer(object):
 
     def _add_item_to_the_feed(self, feed, item):
 
+        title = Markup(item.title).striptags()
         feed.add_item(
-            title=item.title,
+            title=title,
             link='%s/%s' % (self.site_url, item.url),
             unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''),
                                         item.date.date(), item.url),

From a6788f83c2304bd5e551cb9e8dd2daf998e5c48b Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Mon, 7 May 2012 17:11:57 +0200
Subject: [PATCH 0698/2864] integrate webassets

---
 pelican/__init__.py   |  5 ++++-
 pelican/generators.py | 21 +++++++++++++++++----
 pelican/settings.py   |  9 +++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 6b3d12fb..97e21ccd 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -126,12 +126,15 @@ class Pelican(object):
 
         writer = self.get_writer()
 
+        generators[1].env.assets_environment = generators[0].assets_env
+        generators[2].env.assets_environment = generators[0].assets_env
+
         for p in generators:
             if hasattr(p, 'generate_output'):
                 p.generate_output(writer)
 
     def get_generator_classes(self):
-        generators = [ArticlesGenerator, PagesGenerator, StaticGenerator]
+        generators = [StaticGenerator, ArticlesGenerator, PagesGenerator]
         if self.settings['PDF_GENERATOR']:
             generators.append(PdfGenerator)
         if self.settings['LESS_GENERATOR']: # can be True or PATH to lessc
diff --git a/pelican/generators.py b/pelican/generators.py
index 9647d397..00701116 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -42,7 +42,7 @@ class Generator(object):
 
         simple_loader = FileSystemLoader(os.path.join(theme_path,
                                          "themes", "simple", "templates"))
-        self._env = Environment(
+        self.env = Environment(
             loader=ChoiceLoader([
                 FileSystemLoader(self._templates_path),
                 simple_loader,  # implicit inheritance
@@ -51,11 +51,11 @@ class Generator(object):
             extensions=self.settings.get('JINJA_EXTENSIONS', []),
         )
 
-        logger.debug('template list: {0}'.format(self._env.list_templates()))
+        logger.debug('template list: {0}'.format(self.env.list_templates()))
 
         # get custom Jinja filters from user settings
         custom_filters = self.settings.get('JINJA_FILTERS', {})
-        self._env.filters.update(custom_filters)
+        self.env.filters.update(custom_filters)
 
     def get_template(self, name):
         """Return the template by name.
@@ -64,7 +64,7 @@ class Generator(object):
         """
         if name not in self._templates:
             try:
-                self._templates[name] = self._env.get_template(name + '.html')
+                self._templates[name] = self.env.get_template(name + '.html')
             except TemplateNotFound:
                 raise Exception('[templates] unable to load %s.html from %s' \
                         % (name, self._templates_path))
@@ -364,7 +364,20 @@ class StaticGenerator(Generator):
             copy(path, source, os.path.join(output_path, destination),
                  final_path, overwrite=True)
 
+    def generate_context(self):
+
+        if self.settings['WEBASSETS']:
+            from webassets import Environment as AssetsEnvironment
+
+            assets_url = self.settings['SITEURL'] + '/theme/'
+            assets_src = os.path.join(self.output_path, 'theme')
+            self.assets_env = AssetsEnvironment(assets_src, assets_url)
+
+            if logging.getLevelName(logger.getEffectiveLevel()) == "DEBUG":
+                self.assets_env.debug = True
+
     def generate_output(self, writer):
+
         self._copy_paths(self.settings['STATIC_PATHS'], self.path,
                          'static', self.output_path)
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
diff --git a/pelican/settings.py b/pelican/settings.py
index 4da66989..647d3e93 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -68,6 +68,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'ARTICLE_PERMALINK_STRUCTURE': '',
                    'TYPOGRIFY': False,
                    'LESS_GENERATOR': False,
+                   'WEBASSETS': False,
                    }
 
 
@@ -150,4 +151,12 @@ def configure_settings(settings, default_settings=None, filename=None):
                  "http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "
                  "for more information")
 
+    if settings['WEBASSETS']:
+        try:
+            from webassets.ext.jinja2 import AssetsExtension
+            settings['JINJA_EXTENSIONS'].append(AssetsExtension)
+        except ImportError:
+            logger.warn("You must install the webassets module to use WEBASSETS.")
+            settings['WEBASSETS'] = False
+
     return settings

From f12a2974668008dbbc3e28c03f11a65159c3b65e Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Mon, 7 May 2012 23:07:44 +0200
Subject: [PATCH 0699/2864] prefix urls with '{{ SITEURL }}/' so that urls
 won't break when #330 is merged

---
 pelican/themes/notmyidea/templates/archives.html   | 2 +-
 pelican/themes/notmyidea/templates/categories.html | 2 +-
 pelican/themes/simple/templates/archives.html      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/archives.html b/pelican/themes/notmyidea/templates/archives.html
index f7f1c400..f6784942 100644
--- a/pelican/themes/notmyidea/templates/archives.html
+++ b/pelican/themes/notmyidea/templates/archives.html
@@ -6,7 +6,7 @@
 <dl>
 {% for article in dates %}
     <dt>{{ article.locale_date }}</dt>
-    <dd><a href="{{ article.url }}">{{ article.title }}</a></dd>
+    <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
 {% endfor %}
 </dl>
 </section>
diff --git a/pelican/themes/notmyidea/templates/categories.html b/pelican/themes/notmyidea/templates/categories.html
index e4d9d0a7..e29be0ca 100644
--- a/pelican/themes/notmyidea/templates/categories.html
+++ b/pelican/themes/notmyidea/templates/categories.html
@@ -2,7 +2,7 @@
 {% block content %}
 <ul>
 {% for category, articles in categories %}
-    <li><a href="{{ category.url }}">{{ category }}</a></li>
+    <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
 {% endfor %}
 </ul>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/archives.html b/pelican/themes/simple/templates/archives.html
index 6c9db183..050f2686 100644
--- a/pelican/themes/simple/templates/archives.html
+++ b/pelican/themes/simple/templates/archives.html
@@ -5,7 +5,7 @@
 <dl>
 {% for article in dates %}
     <dt>{{ article.locale_date }}</dt>
-    <dd><a href="{{ article.url }}">{{ article.title }}</a></dd>
+    <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
 {% endfor %}
 </dl>
 {% endblock %}

From df7b2c968e1b026f24546adbcc5511e597d64615 Mon Sep 17 00:00:00 2001
From: Stuart Colville <muffinresearchlabs@gmail.com>
Date: Wed, 9 May 2012 23:24:31 +0100
Subject: [PATCH 0700/2864] Add documentation for DIRECT_TEMPLATES and
 PAGINATED_DIRECT_TEMPLATES

---
 docs/settings.rst | 139 +++++++++++++++++++++++-----------------------
 1 file changed, 71 insertions(+), 68 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 7c19b539..b5f3c4ad 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -21,68 +21,73 @@ Here is a list of settings for Pelican:
 Basic settings
 ==============
 
-================================================    =====================================================
-Setting name (default value)                        What does it do?
-================================================    =====================================================
-`AUTHOR`                                            Default author (put your name)
-`DATE_FORMATS` (``{}``)                             If you do manage multiple languages, you can
-                                                    set the date formatting here. See "Date format and locales"
-                                                    section below for details.
-`DEFAULT_CATEGORY` (``'misc'``)                     The default category to fall back on.
-`DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)           The default date format you want to use.
-`DISPLAY_PAGES_ON_MENU` (``True``)                  Whether to display pages on the menu of the
-                                                    template. Templates may or not honor this
-                                                    setting.
-`FALLBACK_ON_FS_DATE` (``True``)                    If True, Pelican will use the file system
-                                                    timestamp information (mtime) if it can't get
-                                                    date information from the metadata.
-`JINJA_EXTENSIONS` (``[]``)                         A list of any Jinja2 extensions you want to use.
-`DELETE_OUTPUT_DIRECTORY` (``False``)               Delete the output directory as well as
-                                                    the generated files.
-`LOCALE` (''[#]_)                                   Change the locale. A list of locales can be provided
-                                                    here or a single string representing one locale.
-                                                    When providing a list, all the locales will be tried
-                                                    until one works.
-`MARKUP` (``('rst', 'md')``)                        A list of available markup languages you want
-                                                    to use. For the moment, the only available values
-                                                    are `rst` and `md`.
-`MD_EXTENSIONS` (``['codehilite','extra']``)        A list of the extensions that the Markdown processor
-                                                    will use. Refer to the extensions chapter in the
-                                                    Python-Markdown documentation for a complete list of
-                                                    supported extensions.
-`OUTPUT_PATH` (``'output/'``)                       Where to output the generated files.
-`PATH` (``None``)                                   Path to look at for input files.
-`PAGE_DIR` (``'pages'``)                            Directory to look at for pages.
-`PAGE_EXCLUDES` (``()``)                            A list of directories to exclude when looking for pages.
-`ARTICLE_DIR` (``''``)                              Directory to look at for articles.
-`ARTICLE_EXCLUDES`: (``('pages',)``)                A list of directories to exclude when looking for articles.
-`PDF_GENERATOR` (``False``)                         Set to True if you want to have PDF versions
-                                                    of your documents. You will need to install
-                                                    `rst2pdf`.
-`RELATIVE_URLS` (``True``)                          Defines whether Pelican should use relative URLs or
-                                                    not.
-`SITENAME` (``'A Pelican Blog'``)                   Your site name
-`SITEURL`                                           Base URL of your website. Not defined by default,
-                                                    which means the base URL is assumed to be "/" with a
-                                                    root-relative URL structure. If `SITEURL` is specified
-                                                    explicitly, there should be no trailing slash at the end,
-                                                    and URLs will be generated with an absolute URL structure
-                                                    (including the domain). If you want to use relative URLs
-                                                    instead of root-relative or absolute URLs, you should
-                                                    instead use the `RELATIVE_URL` setting.
-`STATIC_PATHS` (``['images']``)                     The static paths you want to have accessible
-                                                    on the output path "static". By default,
-                                                    Pelican will copy the 'images' folder to the
-                                                    output folder.
-`TIMEZONE`                                          The timezone used in the date information, to
-                                                    generate Atom and RSS feeds. See the "timezone"
-                                                    section below for more info.
-`TYPOGRIFY` (``False``)                             If set to true, some
-                                                    additional transformations will be done on the
-                                                    generated HTML, using the `Typogrify
-                                                    <http://static.mintchaos.com/projects/typogrify/>`_
-                                                    library
-================================================    =====================================================
+=====================================================================   =====================================================================
+Setting name (default value)                                            What does it do?
+=====================================================================   =====================================================================
+`AUTHOR`                                                                Default author (put your name)
+`DATE_FORMATS` (``{}``)                                                 If you do manage multiple languages, you can
+                                                                        set the date formatting here. See "Date format and locales"
+                                                                        section below for details.
+`DEFAULT_CATEGORY` (``'misc'``)                                         The default category to fall back on.
+`DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)                               The default date format you want to use.
+`DISPLAY_PAGES_ON_MENU` (``True``)                                      Whether to display pages on the menu of the
+                                                                        template. Templates may or not honor this
+                                                                        setting.
+`FALLBACK_ON_FS_DATE` (``True``)                                        If True, Pelican will use the file system
+                                                                        timestamp information (mtime) if it can't get
+                                                                        date information from the metadata.
+`JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
+`DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the output directory as well as
+                                                                        the generated files.
+`LOCALE` (''[#]_)                                                       Change the locale. A list of locales can be provided
+                                                                        here or a single string representing one locale.
+                                                                        When providing a list, all the locales will be tried
+                                                                        until one works.
+`MARKUP` (``('rst', 'md')``)                                            A list of available markup languages you want
+                                                                        to use. For the moment, the only available values
+                                                                        are `rst` and `md`.
+`MD_EXTENSIONS` (``['codehilite','extra']``)                            A list of the extensions that the Markdown processor
+                                                                        will use. Refer to the extensions chapter in the
+                                                                        Python-Markdown documentation for a complete list of
+                                                                        supported extensions.
+`OUTPUT_PATH` (``'output/'``)                                           Where to output the generated files.
+`PATH` (``None``)                                                       Path to look at for input files.
+`PAGE_DIR` (``'pages'``)                                                Directory to look at for pages.
+`PAGE_EXCLUDES` (``()``)                                                A list of directories to exclude when looking for pages.
+`ARTICLE_DIR` (``''``)                                                  Directory to look at for articles.
+`ARTICLE_EXCLUDES`: (``('pages',)``)                                    A list of directories to exclude when looking for articles.
+`PDF_GENERATOR` (``False``)                                             Set to True if you want to have PDF versions
+                                                                        of your documents. You will need to install
+                                                                        `rst2pdf`.
+`RELATIVE_URLS` (``True``)                                              Defines whether Pelican should use relative URLs or
+                                                                        not.
+`SITENAME` (``'A Pelican Blog'``)                                       Your site name
+`SITEURL`                                                               Base URL of your website. Not defined by default,
+                                                                        which means the base URL is assumed to be "/" with a
+                                                                        root-relative URL structure. If `SITEURL` is specified
+                                                                        explicitly, there should be no trailing slash at the end,
+                                                                        and URLs will be generated with an absolute URL structure
+                                                                        (including the domain). If you want to use relative URLs
+                                                                        instead of root-relative or absolute URLs, you should
+                                                                        instead use the `RELATIVE_URL` setting.
+`STATIC_PATHS` (``['images']``)                                         The static paths you want to have accessible
+                                                                        on the output path "static". By default,
+                                                                        Pelican will copy the 'images' folder to the
+                                                                        output folder.
+`TIMEZONE`                                                              The timezone used in the date information, to
+                                                                        generate Atom and RSS feeds. See the "timezone"
+                                                                        section below for more info.
+`TYPOGRIFY` (``False``)                                                 If set to true, some
+                                                                        additional transformations will be done on the
+                                                                        generated HTML, using the `Typogrify
+                                                                        <http://static.mintchaos.com/projects/typogrify/>`_
+                                                                        library
+`DIRECT_TEMPLATES` (``('index', 'tags', 'categories', 'archives')``)    List of templates that are used directly to render
+                                                                        content. Typically direct templates are used to generate
+                                                                        index pages for collections of content e.g. tags and
+                                                                        category index pages.
+`PAGINATED_DIRECT_TEMPLATES` (``('index',)``)                           Provides the direct templates that should be paginated.
+=====================================================================   =====================================================================
 
 .. [#] Default is the system locale.
 
@@ -96,7 +101,7 @@ your articles in a location such as '{slug}/index.html' and link to them as
 '{slug}' for clean URLs. These settings give you the flexibility to place your
 articles and pages anywhere you want.
 
-.. note:: 
+.. note::
     If you specify a datetime directive, it will be substituted using the
     input files' date metadata attribute. If the date is not specified for a
     particular file, Pelican will rely on the file's mtime timestamp.
@@ -141,17 +146,15 @@ Setting name (default value)                        what does it do?
 `CATEGORY_SAVE_AS` ('category/{name}.html')         The location to save a category.
 `TAG_URL` ('tag/{name}.html')                       The URL to use for a tag.
 `TAG_SAVE_AS` ('tag/{name}.html')                   The location to save the tag page.
+`<DIRECT_TEMPLATE_NAME>_SAVE_AS`                    The location to save content generated from direct
+                                                    templates. Where <DIRECT_TEMPLATE_NAME> is the
+                                                    upper case template name.
 ================================================    =====================================================
 
 .. note::
 
     When any of `*_SAVE_AS` is set to False, files will not be created.
 
-    You can change the file output location of any pages listed in DIRECT_TEMPLATES
-    by providing a setting <TEMPLATE_NAME>_SAVE_AS, where <TEMPLATE_NAME> is the template
-    name in uppercase; e.g. CATEGORIES. If False it will not be created.
-
-
 Timezone
 --------
 

From 252d00834fe81f9954df4ebc78b26edb0dbea2a2 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Mon, 7 May 2012 13:05:33 +0200
Subject: [PATCH 0701/2864] strip tags for feed titles

---
 pelican/writers.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 593879e2..75971ee9 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -8,8 +8,8 @@ import logging
 
 from codecs import open
 from functools import partial
-
 from feedgenerator import Atom1Feed, Rss201rev2Feed
+from jinja2 import Markup
 from pelican.paginator import Paginator
 from pelican.utils import get_relative_path, set_date_tzinfo
 
@@ -25,8 +25,9 @@ class Writer(object):
 
     def _create_new_feed(self, feed_type, context):
         feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
+        sitename = Markup(context['SITENAME']).striptags()
         feed = feed_class(
-            title=context['SITENAME'],
+            title=sitename,
             link=(self.site_url + '/'),
             feed_url=self.feed_url,
             description=context.get('SITESUBTITLE', ''))
@@ -34,8 +35,9 @@ class Writer(object):
 
     def _add_item_to_the_feed(self, feed, item):
 
+        title = Markup(item.title).striptags()
         feed.add_item(
-            title=item.title,
+            title=title,
             link='%s/%s' % (self.site_url, item.url),
             unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''),
                                         item.date.date(), item.url),

From ec707930ce247f762d7c1a580e3ef6ac974cb0de Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Mon, 7 May 2012 17:11:57 +0200
Subject: [PATCH 0702/2864] integrate webassets

---
 pelican/__init__.py   |  5 ++++-
 pelican/generators.py | 21 +++++++++++++++++----
 pelican/settings.py   |  9 +++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 6b3d12fb..97e21ccd 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -126,12 +126,15 @@ class Pelican(object):
 
         writer = self.get_writer()
 
+        generators[1].env.assets_environment = generators[0].assets_env
+        generators[2].env.assets_environment = generators[0].assets_env
+
         for p in generators:
             if hasattr(p, 'generate_output'):
                 p.generate_output(writer)
 
     def get_generator_classes(self):
-        generators = [ArticlesGenerator, PagesGenerator, StaticGenerator]
+        generators = [StaticGenerator, ArticlesGenerator, PagesGenerator]
         if self.settings['PDF_GENERATOR']:
             generators.append(PdfGenerator)
         if self.settings['LESS_GENERATOR']: # can be True or PATH to lessc
diff --git a/pelican/generators.py b/pelican/generators.py
index 9647d397..00701116 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -42,7 +42,7 @@ class Generator(object):
 
         simple_loader = FileSystemLoader(os.path.join(theme_path,
                                          "themes", "simple", "templates"))
-        self._env = Environment(
+        self.env = Environment(
             loader=ChoiceLoader([
                 FileSystemLoader(self._templates_path),
                 simple_loader,  # implicit inheritance
@@ -51,11 +51,11 @@ class Generator(object):
             extensions=self.settings.get('JINJA_EXTENSIONS', []),
         )
 
-        logger.debug('template list: {0}'.format(self._env.list_templates()))
+        logger.debug('template list: {0}'.format(self.env.list_templates()))
 
         # get custom Jinja filters from user settings
         custom_filters = self.settings.get('JINJA_FILTERS', {})
-        self._env.filters.update(custom_filters)
+        self.env.filters.update(custom_filters)
 
     def get_template(self, name):
         """Return the template by name.
@@ -64,7 +64,7 @@ class Generator(object):
         """
         if name not in self._templates:
             try:
-                self._templates[name] = self._env.get_template(name + '.html')
+                self._templates[name] = self.env.get_template(name + '.html')
             except TemplateNotFound:
                 raise Exception('[templates] unable to load %s.html from %s' \
                         % (name, self._templates_path))
@@ -364,7 +364,20 @@ class StaticGenerator(Generator):
             copy(path, source, os.path.join(output_path, destination),
                  final_path, overwrite=True)
 
+    def generate_context(self):
+
+        if self.settings['WEBASSETS']:
+            from webassets import Environment as AssetsEnvironment
+
+            assets_url = self.settings['SITEURL'] + '/theme/'
+            assets_src = os.path.join(self.output_path, 'theme')
+            self.assets_env = AssetsEnvironment(assets_src, assets_url)
+
+            if logging.getLevelName(logger.getEffectiveLevel()) == "DEBUG":
+                self.assets_env.debug = True
+
     def generate_output(self, writer):
+
         self._copy_paths(self.settings['STATIC_PATHS'], self.path,
                          'static', self.output_path)
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
diff --git a/pelican/settings.py b/pelican/settings.py
index 4da66989..647d3e93 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -68,6 +68,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'ARTICLE_PERMALINK_STRUCTURE': '',
                    'TYPOGRIFY': False,
                    'LESS_GENERATOR': False,
+                   'WEBASSETS': False,
                    }
 
 
@@ -150,4 +151,12 @@ def configure_settings(settings, default_settings=None, filename=None):
                  "http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "
                  "for more information")
 
+    if settings['WEBASSETS']:
+        try:
+            from webassets.ext.jinja2 import AssetsExtension
+            settings['JINJA_EXTENSIONS'].append(AssetsExtension)
+        except ImportError:
+            logger.warn("You must install the webassets module to use WEBASSETS.")
+            settings['WEBASSETS'] = False
+
     return settings

From e6448567a0a98d9c005c1ab955c45a657b814428 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Fri, 11 May 2012 22:19:03 +0200
Subject: [PATCH 0703/2864] add some doc in the code

---
 pelican/__init__.py   | 6 ++++--
 pelican/generators.py | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 97e21ccd..7e546b29 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -126,8 +126,10 @@ class Pelican(object):
 
         writer = self.get_writer()
 
-        generators[1].env.assets_environment = generators[0].assets_env
-        generators[2].env.assets_environment = generators[0].assets_env
+        # pass the assets environment to the generators
+        if self.settings['WEBASSETS']:
+            generators[1].env.assets_environment = generators[0].assets_env
+            generators[2].env.assets_environment = generators[0].assets_env
 
         for p in generators:
             if hasattr(p, 'generate_output'):
diff --git a/pelican/generators.py b/pelican/generators.py
index 30a463b4..f15db15d 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -394,6 +394,9 @@ class StaticGenerator(Generator):
         if self.settings['WEBASSETS']:
             from webassets import Environment as AssetsEnvironment
 
+            # Define the assets environment that will be passed to the
+            # generators. The StaticGenerator must then be run first to have
+            # the assets in the output_path before generating the templates.
             assets_url = self.settings['SITEURL'] + '/theme/'
             assets_src = os.path.join(self.output_path, 'theme')
             self.assets_env = AssetsEnvironment(assets_src, assets_url)

From b7e6d3d98d0a131e1cd93eb95a586fd1ec3d7da5 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 12 May 2012 01:07:17 +0200
Subject: [PATCH 0704/2864] update functional tests output

---
 .../basic/a-markdown-powered-article.html     |  27 +++++----
 tests/output/basic/archives.html              |  16 +++---
 tests/output/basic/article-1.html             |  27 +++++----
 tests/output/basic/article-2.html             |  27 +++++----
 tests/output/basic/article-3.html             |  27 +++++----
 tests/output/basic/categories.html            |   8 +--
 .../output/basic/drafts/a-draft-article.html  |  27 +++++----
 tests/output/basic/feeds/all-en.atom.xml      |  14 ++---
 tests/output/basic/feeds/all-fr.atom.xml      |   4 +-
 tests/output/basic/feeds/all.atom.xml         |  14 ++---
 tests/output/basic/feeds/bar.atom.xml         |   2 +-
 tests/output/basic/feeds/cat1.atom.xml        |   6 +-
 tests/output/basic/feeds/content.atom.xml     |   4 +-
 tests/output/basic/feeds/yeah.atom.xml        |   2 +-
 tests/output/basic/oh-yeah-fr.html            |  27 +++++----
 tests/output/basic/oh-yeah.html               |  27 +++++----
 tests/output/basic/second-article-fr.html     |  27 +++++----
 tests/output/basic/second-article.html        |  27 +++++----
 tests/output/basic/theme/css/wide.css         |  15 +++--
 .../basic/theme/images/icons/facebook.png     | Bin 0 -> 300 bytes
 .../output/basic/this-is-a-super-article.html |  27 +++++----
 tests/output/basic/unbelievable.html          |  27 +++++----
 .../custom/a-markdown-powered-article.html    |  53 ++++++++++--------
 tests/output/custom/archives.html             |  16 +++---
 tests/output/custom/article-1.html            |  53 ++++++++++--------
 tests/output/custom/article-2.html            |  53 ++++++++++--------
 tests/output/custom/article-3.html            |  53 ++++++++++--------
 tests/output/custom/categories.html           |   8 +--
 .../output/custom/drafts/a-draft-article.html |  53 ++++++++++--------
 tests/output/custom/feeds/all-en.atom.xml     |  14 ++---
 tests/output/custom/feeds/all-fr.atom.xml     |   4 +-
 tests/output/custom/feeds/all.atom.xml        |  14 ++---
 tests/output/custom/feeds/all.rss.xml         |  14 ++---
 tests/output/custom/feeds/bar.atom.xml        |   2 +-
 tests/output/custom/feeds/bar.rss.xml         |   2 +-
 tests/output/custom/feeds/cat1.atom.xml       |   6 +-
 tests/output/custom/feeds/cat1.rss.xml        |   6 +-
 tests/output/custom/feeds/content.atom.xml    |   4 +-
 tests/output/custom/feeds/content.rss.xml     |   4 +-
 tests/output/custom/feeds/yeah.atom.xml       |   2 +-
 tests/output/custom/feeds/yeah.rss.xml        |   2 +-
 tests/output/custom/oh-yeah-fr.html           |  53 ++++++++++--------
 tests/output/custom/oh-yeah.html              |  53 ++++++++++--------
 tests/output/custom/second-article-fr.html    |  53 ++++++++++--------
 tests/output/custom/second-article.html       |  53 ++++++++++--------
 tests/output/custom/theme/css/wide.css        |  15 +++--
 .../custom/theme/images/icons/facebook.png    | Bin 0 -> 300 bytes
 .../custom/this-is-a-super-article.html       |  53 ++++++++++--------
 tests/output/custom/unbelievable.html         |  53 ++++++++++--------
 49 files changed, 599 insertions(+), 479 deletions(-)
 create mode 100644 tests/output/basic/theme/images/icons/facebook.png
 create mode 100644 tests/output/custom/theme/images/icons/facebook.png

diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 9cb92c4b..ceadf79a 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -41,13 +41,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to A markdown powered article">A markdown powered article</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="a-markdown-powered-article.html" rel="bookmark"
+           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
@@ -62,11 +67,11 @@
 
 
 </footer><!-- /.post-info -->
-        <p>You're mutually oblivious.</p>
-        </div><!-- /.entry-content -->
-        
+      <p>You're mutually oblivious.</p>
+    </div><!-- /.entry-content -->
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index 9aedb29d..52d00234 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -48,28 +48,28 @@
 <dl>
 
     <dt>Fri 15 October 2010</dt>
-    <dd><a href="unbelievable.html">Unbelievable !</a></dd>
+    <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
 
     <dt>Wed 20 October 2010</dt>
-    <dd><a href="oh-yeah.html">Oh yeah !</a></dd>
+    <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
 
     <dt>Thu 02 December 2010</dt>
-    <dd><a href="this-is-a-super-article.html">This is a super article !</a></dd>
+    <dd><a href="./this-is-a-super-article.html">This is a super article !</a></dd>
 
     <dt>Thu 17 February 2011</dt>
-    <dd><a href="article-1.html">Article 1</a></dd>
+    <dd><a href="./article-1.html">Article 1</a></dd>
 
     <dt>Thu 17 February 2011</dt>
-    <dd><a href="article-2.html">Article 2</a></dd>
+    <dd><a href="./article-2.html">Article 2</a></dd>
 
     <dt>Thu 17 February 2011</dt>
-    <dd><a href="article-3.html">Article 3</a></dd>
+    <dd><a href="./article-3.html">Article 3</a></dd>
 
     <dt>Wed 20 April 2011</dt>
-    <dd><a href="a-markdown-powered-article.html">A markdown powered article</a></dd>
+    <dd><a href="./a-markdown-powered-article.html">A markdown powered article</a></dd>
 
     <dt>Wed 29 February 2012</dt>
-    <dd><a href="second-article.html">Second article</a></dd>
+    <dd><a href="./second-article.html">Second article</a></dd>
 
 </dl>
 </section>
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index 5f1d7c1d..bd6f9716 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -41,13 +41,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="article-1.html" rel="bookmark"
+           title="Permalink to Article 1">Article 1</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
@@ -62,12 +67,12 @@
 
 
 </footer><!-- /.post-info -->
-        <p>Article 1</p>
+      <p>Article 1</p>
 
-        </div><!-- /.entry-content -->
-        
+    </div><!-- /.entry-content -->
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index d6dbf74b..7811204a 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -41,13 +41,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="article-2.html" rel="bookmark"
+           title="Permalink to Article 2">Article 2</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
@@ -62,12 +67,12 @@
 
 
 </footer><!-- /.post-info -->
-        <p>Article 2</p>
+      <p>Article 2</p>
 
-        </div><!-- /.entry-content -->
-        
+    </div><!-- /.entry-content -->
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 8dc806c1..96acb190 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -41,13 +41,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="article-3.html" rel="bookmark"
+           title="Permalink to Article 3">Article 3</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
@@ -62,12 +67,12 @@
 
 
 </footer><!-- /.post-info -->
-        <p>Article 3</p>
+      <p>Article 3</p>
 
-        </div><!-- /.entry-content -->
-        
+    </div><!-- /.entry-content -->
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index 2430cc96..db25ed68 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -44,13 +44,13 @@
         
 <ul>
 
-    <li><a href="category/bar.html">bar</a></li>
+    <li><a href="./category/bar.html">bar</a></li>
 
-    <li><a href="category/cat1.html">cat1</a></li>
+    <li><a href="./category/cat1.html">cat1</a></li>
 
-    <li><a href="category/content.html">content</a></li>
+    <li><a href="./category/content.html">content</a></li>
 
-    <li><a href="category/yeah.html">yeah</a></li>
+    <li><a href="./category/yeah.html">yeah</a></li>
 
 </ul>
 
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index 32a11e69..99b90c33 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -41,13 +41,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to A draft article">A draft article</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="a-draft-article.html" rel="bookmark"
+           title="Permalink to A draft article">A draft article</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
                 Fri 02 March 2012
         </abbr>
@@ -62,13 +67,13 @@
 
 
 </footer><!-- /.post-info -->
-        <p>This is a draft article, it should live under the /drafts/ folder and not be
+      <p>This is a draft article, it should live under the /drafts/ folder and not be
 listed anywhere else.</p>
 
-        </div><!-- /.entry-content -->
-        
+    </div><!-- /.entry-content -->
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index e10386d5..b532e454 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-en.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="../.this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-en.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="../.oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index 3243f840..ce245dee 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-fr.atom.xml" rel="self"></link><id>.././</id><updated>2012-03-02T14:01:01Z</updated><entry><title>Trop bien !</title><link href="../.oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="../.second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-fr.atom.xml" rel="self"></link><id>.././</id><updated>2012-03-02T14:01:01Z</updated><entry><title>Trop bien !</title><link href=".././oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href=".././second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index 7cdadf5d..a0fb9144 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="../.this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="../.oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/bar.atom.xml b/tests/output/basic/feeds/bar.atom.xml
index 066ae95f..15708734 100644
--- a/tests/output/basic/feeds/bar.atom.xml
+++ b/tests/output/basic/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/bar.atom.xml" rel="self"></link><id>.././</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href="../.oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/bar.atom.xml" rel="self"></link><id>.././</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
index 05b21f75..383c8ab7 100644
--- a/tests/output/basic/feeds/cat1.atom.xml
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/cat1.atom.xml" rel="self"></link><id>.././</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="../.a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="../.article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="../.article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="../.article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/cat1.atom.xml" rel="self"></link><id>.././</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/content.atom.xml b/tests/output/basic/feeds/content.atom.xml
index d255cc8a..1fa740b4 100644
--- a/tests/output/basic/feeds/content.atom.xml
+++ b/tests/output/basic/feeds/content.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/content.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="../.second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="../.unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/content.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/yeah.atom.xml b/tests/output/basic/feeds/yeah.atom.xml
index 5ae933f4..e9bb26d0 100644
--- a/tests/output/basic/feeds/yeah.atom.xml
+++ b/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/yeah.atom.xml" rel="self"></link><id>.././</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href="../.this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/yeah.atom.xml" rel="self"></link><id>.././</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index 186791b5..666a961f 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -41,13 +41,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Trop bien !">Trop bien !</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="oh-yeah-fr.html" rel="bookmark"
+           title="Permalink to Trop bien !">Trop bien !</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
                 Fri 02 March 2012
         </abbr>
@@ -67,12 +72,12 @@ Translations:
     
 
 </footer><!-- /.post-info -->
-        <p>Et voila du contenu en français</p>
+      <p>Et voila du contenu en français</p>
 
-        </div><!-- /.entry-content -->
-        
+    </div><!-- /.entry-content -->
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index dfa1d178..c8f1af74 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -41,13 +41,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="oh-yeah.html" rel="bookmark"
+           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
@@ -67,17 +72,17 @@ Translations:
     
 
 </footer><!-- /.post-info -->
-        <div class="section" id="why-not">
+      <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
 <img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-        </div><!-- /.entry-content -->
-        
+    </div><!-- /.entry-content -->
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index 9f9838dc..11960efc 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -41,13 +41,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Deuxième article">Deuxième article</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="second-article-fr.html" rel="bookmark"
+           title="Permalink to Deuxième article">Deuxième article</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -67,12 +72,12 @@ Translations:
     
 
 </footer><!-- /.post-info -->
-        <p>Ceci est un article, en français.</p>
+      <p>Ceci est un article, en français.</p>
 
-        </div><!-- /.entry-content -->
-        
+    </div><!-- /.entry-content -->
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index 13f56e4c..171717ba 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -41,13 +41,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Second article">Second article</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="second-article.html" rel="bookmark"
+           title="Permalink to Second article">Second article</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -67,12 +72,12 @@ Translations:
     
 
 </footer><!-- /.post-info -->
-        <p>This is some article, in english</p>
+      <p>This is some article, in english</p>
 
-        </div><!-- /.entry-content -->
-        
+    </div><!-- /.entry-content -->
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/theme/css/wide.css b/tests/output/basic/theme/css/wide.css
index 3376f4c7..88fd59ce 100644
--- a/tests/output/basic/theme/css/wide.css
+++ b/tests/output/basic/theme/css/wide.css
@@ -4,13 +4,17 @@ body {
     font:1.3em/1.3 "Hoefler Text","Georgia",Georgia,serif,sans-serif;
 }
 
-.body, #banner nav, #banner nav ul, #about, #featured, #content{
-    width: inherit;
+.post-info{
+    display: none;
 }
 
 #banner nav {
+    display: none;
     -moz-border-radius: 0px;
-    margin-bottom: 0px;
+    margin-bottom: 20px;
+    overflow: hidden;
+    font-size: 1em;
+    background: #F5F4EF;
 }
 
 #banner nav ul{
@@ -19,10 +23,11 @@ body {
 
 #banner nav li{
     float: right;
+    color: #000;
 }
 
-#banner nav li:first-child a {
-    -moz-border-radius: 0px;
+#banner nav li a {
+    color: #000;
 }
 
 #banner h1 {
diff --git a/tests/output/basic/theme/images/icons/facebook.png b/tests/output/basic/theme/images/icons/facebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7914b497369c55feba7defc9a3ea5bec424ecfc
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU{r~^Jb>s{nN~l=<`rQ{G
z*EMNgZp)TeGt$L@YM4rb{DK+IJaKeh4CFB;dAqwXbg;^L06Clm9+AaB8pQTsa66f8
z2V~fKx;Tb#Tu)ADV02S85J*U9G7veylX_i&!&z12Q~+;~Q|gK~r==k=&T|S@G#cDE
zb^5gT;nTtbJUf;eFfcqx6@I<wZW_oS)e_f;l9a@fRIB8oR3OD*WMF8hYha{nXc%H>
vWMyh@WooHyU}$AvU~RtQ2a1N={FKbJO57T}vIJa!8W=oX{an^LB{Ts5Vp3XV

literal 0
HcmV?d00001

diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index b2cf0392..1e8c160f 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -41,13 +41,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="this-is-a-super-article.html" rel="bookmark"
+           title="Permalink to This is a super article !">This is a super article !</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
@@ -62,7 +67,7 @@
 
 
 </footer><!-- /.post-info -->
-        <p>Some content here !</p>
+      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
@@ -75,10 +80,10 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
 
-        </div><!-- /.entry-content -->
-        
+    </div><!-- /.entry-content -->
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 581e8318..db018d81 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -41,13 +41,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="unbelievable.html" rel="bookmark"
+           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
@@ -62,12 +67,12 @@
 
 
 </footer><!-- /.post-info -->
-        <p>Or completely awesome. Depends the needs.</p>
+      <p>Or completely awesome. Depends the needs.</p>
 
-        </div><!-- /.entry-content -->
-        
+    </div><!-- /.entry-content -->
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index 74e53913..28486691 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -49,13 +49,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to A markdown powered article">A markdown powered article</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="a-markdown-powered-article.html" rel="bookmark"
+           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
@@ -70,24 +75,24 @@
 
 
 </footer><!-- /.post-info -->
-        <p>You're mutually oblivious.</p>
-        </div><!-- /.entry-content -->
-        
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "a-markdown-powered-article.html";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        
+      <p>You're mutually oblivious.</p>
+    </div><!-- /.entry-content -->
+    
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "a-markdown-powered-article.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index 706c7464..083e6ada 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -56,28 +56,28 @@
 <dl>
 
     <dt>Fri 15 October 2010</dt>
-    <dd><a href="unbelievable.html">Unbelievable !</a></dd>
+    <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
 
     <dt>Wed 20 October 2010</dt>
-    <dd><a href="oh-yeah.html">Oh yeah !</a></dd>
+    <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
 
     <dt>Thu 02 December 2010</dt>
-    <dd><a href="this-is-a-super-article.html">This is a super article !</a></dd>
+    <dd><a href="./this-is-a-super-article.html">This is a super article !</a></dd>
 
     <dt>Thu 17 February 2011</dt>
-    <dd><a href="article-1.html">Article 1</a></dd>
+    <dd><a href="./article-1.html">Article 1</a></dd>
 
     <dt>Thu 17 February 2011</dt>
-    <dd><a href="article-2.html">Article 2</a></dd>
+    <dd><a href="./article-2.html">Article 2</a></dd>
 
     <dt>Thu 17 February 2011</dt>
-    <dd><a href="article-3.html">Article 3</a></dd>
+    <dd><a href="./article-3.html">Article 3</a></dd>
 
     <dt>Wed 20 April 2011</dt>
-    <dd><a href="a-markdown-powered-article.html">A markdown powered article</a></dd>
+    <dd><a href="./a-markdown-powered-article.html">A markdown powered article</a></dd>
 
     <dt>Wed 29 February 2012</dt>
-    <dd><a href="second-article.html">Second article</a></dd>
+    <dd><a href="./second-article.html">Second article</a></dd>
 
 </dl>
 </section>
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index 8c73b4ac..b7c0f46f 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -49,13 +49,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="article-1.html" rel="bookmark"
+           title="Permalink to Article 1">Article 1</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
@@ -70,25 +75,25 @@
 
 
 </footer><!-- /.post-info -->
-        <p>Article 1</p>
+      <p>Article 1</p>
 
-        </div><!-- /.entry-content -->
-        
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "article-1.html";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        
+    </div><!-- /.entry-content -->
+    
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "article-1.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index e8758391..e60d8077 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -49,13 +49,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="article-2.html" rel="bookmark"
+           title="Permalink to Article 2">Article 2</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
@@ -70,25 +75,25 @@
 
 
 </footer><!-- /.post-info -->
-        <p>Article 2</p>
+      <p>Article 2</p>
 
-        </div><!-- /.entry-content -->
-        
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "article-2.html";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        
+    </div><!-- /.entry-content -->
+    
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "article-2.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index ace9dfbf..b79c25f0 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -49,13 +49,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="article-3.html" rel="bookmark"
+           title="Permalink to Article 3">Article 3</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
@@ -70,25 +75,25 @@
 
 
 </footer><!-- /.post-info -->
-        <p>Article 3</p>
+      <p>Article 3</p>
 
-        </div><!-- /.entry-content -->
-        
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "article-3.html";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        
+    </div><!-- /.entry-content -->
+    
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "article-3.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/categories.html b/tests/output/custom/categories.html
index 92830754..95e8c1f3 100644
--- a/tests/output/custom/categories.html
+++ b/tests/output/custom/categories.html
@@ -52,13 +52,13 @@
         
 <ul>
 
-    <li><a href="category/yeah.html">yeah</a></li>
+    <li><a href="./category/yeah.html">yeah</a></li>
 
-    <li><a href="category/content.html">content</a></li>
+    <li><a href="./category/content.html">content</a></li>
 
-    <li><a href="category/cat1.html">cat1</a></li>
+    <li><a href="./category/cat1.html">cat1</a></li>
 
-    <li><a href="category/bar.html">bar</a></li>
+    <li><a href="./category/bar.html">bar</a></li>
 
 </ul>
 
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index e12e5bd7..659a61b9 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -49,13 +49,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to A draft article">A draft article</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="a-draft-article.html" rel="bookmark"
+           title="Permalink to A draft article">A draft article</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
                 Fri 02 March 2012
         </abbr>
@@ -70,26 +75,26 @@
 
 
 </footer><!-- /.post-info -->
-        <p>This is a draft article, it should live under the /drafts/ folder and not be
+      <p>This is a draft article, it should live under the /drafts/ folder and not be
 listed anywhere else.</p>
 
-        </div><!-- /.entry-content -->
-        
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "a-draft-article.html";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        
+    </div><!-- /.entry-content -->
+    
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "a-draft-article.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/feeds/all-en.atom.xml b/tests/output/custom/feeds/all-en.atom.xml
index 1b18c1bd..db5fc2de 100644
--- a/tests/output/custom/feeds/all-en.atom.xml
+++ b/tests/output/custom/feeds/all-en.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.orgsecond-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.orga-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.orgarticle-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.orgarticle-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.orgarticle-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.orgthis-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.orgoh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.orgunbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all-fr.atom.xml b/tests/output/custom/feeds/all-fr.atom.xml
index 1d42bb6e..5d58742c 100644
--- a/tests/output/custom/feeds/all-fr.atom.xml
+++ b/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.orgoh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.orgsecond-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all.atom.xml b/tests/output/custom/feeds/all.atom.xml
index 9090f431..8df5bbdb 100644
--- a/tests/output/custom/feeds/all.atom.xml
+++ b/tests/output/custom/feeds/all.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.orgsecond-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.orga-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.orgarticle-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.orgarticle-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.orgarticle-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.orgthis-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.orgoh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.orgunbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all.rss.xml b/tests/output/custom/feeds/all.rss.xml
index b726e2d1..a8be2152 100644
--- a/tests/output/custom/feeds/all.rss.xml
+++ b/tests/output/custom/feeds/all.rss.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.orgsecond-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.orga-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.orgarticle-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.orgarticle-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.orgarticle-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.orgthis-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.orgoh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.orgunbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/bar.atom.xml b/tests/output/custom/feeds/bar.atom.xml
index 93961545..9b29f6c9 100644
--- a/tests/output/custom/feeds/bar.atom.xml
+++ b/tests/output/custom/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.orgoh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/tests/output/custom/feeds/bar.rss.xml b/tests/output/custom/feeds/bar.rss.xml
index 0a9d0f9d..c958edbf 100644
--- a/tests/output/custom/feeds/bar.rss.xml
+++ b/tests/output/custom/feeds/bar.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.orgoh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/tests/output/custom/feeds/cat1.atom.xml b/tests/output/custom/feeds/cat1.atom.xml
index 4fce560d..72703065 100644
--- a/tests/output/custom/feeds/cat1.atom.xml
+++ b/tests/output/custom/feeds/cat1.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.orga-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.orgarticle-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.orgarticle-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.orgarticle-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/cat1.rss.xml b/tests/output/custom/feeds/cat1.rss.xml
index d322572b..f5871487 100644
--- a/tests/output/custom/feeds/cat1.rss.xml
+++ b/tests/output/custom/feeds/cat1.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.orga-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.orgarticle-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.orgarticle-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.orgarticle-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/content.atom.xml b/tests/output/custom/feeds/content.atom.xml
index 6f93c8f4..52bbf194 100644
--- a/tests/output/custom/feeds/content.atom.xml
+++ b/tests/output/custom/feeds/content.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/content.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.orgsecond-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.orgunbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/content.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/content.rss.xml b/tests/output/custom/feeds/content.rss.xml
index 74a322e7..dcacd17f 100644
--- a/tests/output/custom/feeds/content.rss.xml
+++ b/tests/output/custom/feeds/content.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/content.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.orgsecond-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.orgunbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/content.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/yeah.atom.xml b/tests/output/custom/feeds/yeah.atom.xml
index 9a95fa03..802f6329 100644
--- a/tests/output/custom/feeds/yeah.atom.xml
+++ b/tests/output/custom/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-12-02T10:14:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.orgthis-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-12-02T10:14:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/tests/output/custom/feeds/yeah.rss.xml b/tests/output/custom/feeds/yeah.rss.xml
index 1c5884a2..68e96cf9 100644
--- a/tests/output/custom/feeds/yeah.rss.xml
+++ b/tests/output/custom/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Thu, 02 Dec 2010 10:14:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.orgthis-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Thu, 02 Dec 2010 10:14:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index b699b41c..be931a60 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -49,13 +49,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Trop bien !">Trop bien !</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="oh-yeah-fr.html" rel="bookmark"
+           title="Permalink to Trop bien !">Trop bien !</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
                 Fri 02 March 2012
         </abbr>
@@ -75,25 +80,25 @@ Translations:
     
 
 </footer><!-- /.post-info -->
-        <p>Et voila du contenu en français</p>
+      <p>Et voila du contenu en français</p>
 
-        </div><!-- /.entry-content -->
-        
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "oh-yeah-fr.html";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        
+    </div><!-- /.entry-content -->
+    
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "oh-yeah-fr.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index b8263c1b..4f3f1020 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -49,13 +49,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="oh-yeah.html" rel="bookmark"
+           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
@@ -75,30 +80,30 @@ Translations:
     
 
 </footer><!-- /.post-info -->
-        <div class="section" id="why-not">
+      <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
 <img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-        </div><!-- /.entry-content -->
-        
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "oh-yeah.html";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        
+    </div><!-- /.entry-content -->
+    
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "oh-yeah.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index 9e5b81ad..e386af38 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -49,13 +49,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Deuxième article">Deuxième article</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="second-article-fr.html" rel="bookmark"
+           title="Permalink to Deuxième article">Deuxième article</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -75,25 +80,25 @@ Translations:
     
 
 </footer><!-- /.post-info -->
-        <p>Ceci est un article, en français.</p>
+      <p>Ceci est un article, en français.</p>
 
-        </div><!-- /.entry-content -->
-        
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "second-article-fr.html";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        
+    </div><!-- /.entry-content -->
+    
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "second-article-fr.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index a769cee4..003ebae0 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -49,13 +49,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Second article">Second article</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="second-article.html" rel="bookmark"
+           title="Permalink to Second article">Second article</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -75,25 +80,25 @@ Translations:
     
 
 </footer><!-- /.post-info -->
-        <p>This is some article, in english</p>
+      <p>This is some article, in english</p>
 
-        </div><!-- /.entry-content -->
-        
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "second-article.html";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        
+    </div><!-- /.entry-content -->
+    
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "second-article.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/theme/css/wide.css b/tests/output/custom/theme/css/wide.css
index 3376f4c7..88fd59ce 100644
--- a/tests/output/custom/theme/css/wide.css
+++ b/tests/output/custom/theme/css/wide.css
@@ -4,13 +4,17 @@ body {
     font:1.3em/1.3 "Hoefler Text","Georgia",Georgia,serif,sans-serif;
 }
 
-.body, #banner nav, #banner nav ul, #about, #featured, #content{
-    width: inherit;
+.post-info{
+    display: none;
 }
 
 #banner nav {
+    display: none;
     -moz-border-radius: 0px;
-    margin-bottom: 0px;
+    margin-bottom: 20px;
+    overflow: hidden;
+    font-size: 1em;
+    background: #F5F4EF;
 }
 
 #banner nav ul{
@@ -19,10 +23,11 @@ body {
 
 #banner nav li{
     float: right;
+    color: #000;
 }
 
-#banner nav li:first-child a {
-    -moz-border-radius: 0px;
+#banner nav li a {
+    color: #000;
 }
 
 #banner h1 {
diff --git a/tests/output/custom/theme/images/icons/facebook.png b/tests/output/custom/theme/images/icons/facebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7914b497369c55feba7defc9a3ea5bec424ecfc
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU{r~^Jb>s{nN~l=<`rQ{G
z*EMNgZp)TeGt$L@YM4rb{DK+IJaKeh4CFB;dAqwXbg;^L06Clm9+AaB8pQTsa66f8
z2V~fKx;Tb#Tu)ADV02S85J*U9G7veylX_i&!&z12Q~+;~Q|gK~r==k=&T|S@G#cDE
zb^5gT;nTtbJUf;eFfcqx6@I<wZW_oS)e_f;l9a@fRIB8oR3OD*WMF8hYha{nXc%H>
vWMyh@WooHyU}$AvU~RtQ2a1N={FKbJO57T}vIJa!8W=oX{an^LB{Ts5Vp3XV

literal 0
HcmV?d00001

diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 9ba6bb9b..2b41cdf3 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -49,13 +49,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="this-is-a-super-article.html" rel="bookmark"
+           title="Permalink to This is a super article !">This is a super article !</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
@@ -70,7 +75,7 @@
 
 
 </footer><!-- /.post-info -->
-        <p>Some content here !</p>
+      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
@@ -83,23 +88,23 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
 
-        </div><!-- /.entry-content -->
-        
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "this-is-a-super-article.html";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        
+    </div><!-- /.entry-content -->
+    
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "this-is-a-super-article.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index 1b611efe..4d18012a 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -49,13 +49,18 @@
                 
                 </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
-<article>
-        <header> <h1 class="entry-title"><a href=""
-        rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>  </header>
-        <div class="entry-content">
-        <footer class="post-info">
+        
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="unbelievable.html" rel="bookmark"
+           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+      
+    </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
@@ -70,25 +75,25 @@
 
 
 </footer><!-- /.post-info -->
-        <p>Or completely awesome. Depends the needs.</p>
+      <p>Or completely awesome. Depends the needs.</p>
 
-        </div><!-- /.entry-content -->
-        
-        <div class="comments">
-        <h2>Comments !</h2>
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-               var disqus_identifier = "unbelievable.html";
-               (function() {
-               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-               dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
-        </div>
-        
+    </div><!-- /.entry-content -->
+    
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "unbelievable.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
 
-</article>
+  </article>
 </section>
 
         <section id="extras" class="body">

From a8983b420f97379e306c1c5bd93b548b19b042cb Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 12 May 2012 01:30:09 +0200
Subject: [PATCH 0705/2864] be more verbose when functional tests fail

---
 tests/test_pelican.py | 48 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 1192dfe1..933c82fa 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -36,9 +36,27 @@ class TestPelican(unittest.TestCase):
                 pelican = Pelican(path=INPUT_PATH, output_path=temp_path)
                 pelican.run()
                 diff = dircmp(temp_path, os.sep.join((OUTPUT_PATH, "basic")))
-                self.assertEqual(diff.left_only, [])
-                self.assertEqual(diff.right_only, [])
-                self.assertEqual(diff.diff_files, [])
+                self.assertEqual(diff.left_only, [], msg="some generated " \
+                        "files are absent from the expected functional " \
+                        "tests output.\n" \
+                        "This is probably because the HTML generated files " \
+                        "changed. If these changes are normal, please refer " \
+                        "to docs/contribute.rst to update the expected " \
+                        "output of the functional tests.")
+                self.assertEqual(diff.right_only, [], msg="some files from " \
+                        "the expected functional tests output are absent " \
+                        "from the current output.\n" \
+                        "This is probably because the HTML generated files " \
+                        "changed. If these changes are normal, please refer " \
+                        "to docs/contribute.rst to update the expected " \
+                        "output of the functional tests.")
+                self.assertEqual(diff.diff_files, [], msg="some generated " \
+                        "files differ from the expected functional tests " \
+                        "output.\n" \
+                        "This is probably because the HTML generated files " \
+                        "changed. If these changes are normal, please refer " \
+                        "to docs/contribute.rst to update the expected " \
+                        "output of the functional tests.")
 
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work
@@ -47,6 +65,24 @@ class TestPelican(unittest.TestCase):
                               settings=read_settings(SAMPLE_CONFIG))
             pelican.run()
             diff = dircmp(temp_path, os.sep.join((OUTPUT_PATH, "custom")))
-            self.assertEqual(diff.left_only, [])
-            self.assertEqual(diff.right_only, [])
-            self.assertEqual(diff.diff_files, [])
+            self.assertEqual(diff.left_only, [], msg="some generated " \
+                    "files are absent from the expected functional " \
+                    "tests output.\n" \
+                    "This is probably because the HTML generated files " \
+                    "changed. If these changes are normal, please refer " \
+                    "to docs/contribute.rst to update the expected " \
+                    "output of the functional tests.")
+            self.assertEqual(diff.right_only, [], msg="some files from " \
+                    "the expected functional tests output are absent " \
+                    "from the current output.\n" \
+                    "This is probably because the HTML generated files " \
+                    "changed. If these changes are normal, please refer " \
+                    "to docs/contribute.rst to update the expected " \
+                    "output of the functional tests.")
+            self.assertEqual(diff.diff_files, [], msg="some generated " \
+                    "files differ from the expected functional tests " \
+                    "output.\n" \
+                    "This is probably because the HTML generated files " \
+                    "changed. If these changes are normal, please refer " \
+                    "to docs/contribute.rst to update the expected " \
+                    "output of the functional tests.")

From e82c6512b4703b19f5c142d0cd85b67a88e0040d Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 12 May 2012 02:03:18 +0200
Subject: [PATCH 0706/2864] clean up temporary dirs in tearDown to force
 cleanup even if tests fail

---
 tests/support.py         | 18 ---------
 tests/test_generators.py | 47 ++++++++++++++----------
 tests/test_pelican.py    | 79 +++++++++++++++++++++-------------------
 3 files changed, 69 insertions(+), 75 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index f2b4a075..8b8cbab8 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -1,14 +1,10 @@
 __all__ = [
-    'temporary_folder',
     'get_article',
     'unittest',
 ]
 
 import os
 import subprocess
-from contextlib import contextmanager
-from tempfile import mkdtemp
-from shutil import rmtree
 
 from pelican.contents import Article
 
@@ -18,20 +14,6 @@ except ImportError:
     import unittest
 
 
-@contextmanager
-def temporary_folder():
-    """creates a temporary folder, return it and delete it afterwards.
-
-    This allows to do something like this in tests:
-
-        >>> with temporary_folder() as d:
-            # do whatever you want
-    """
-    tempdir = mkdtemp()
-    yield tempdir
-    rmtree(tempdir)
-
-
 def get_article(title, slug, content, lang, extra_metadata=None):
     metadata = {'slug': slug, 'title': title, 'lang': lang}
     if extra_metadata is not None:
diff --git a/tests/test_generators.py b/tests/test_generators.py
index e62551fa..4e6b0acf 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -3,10 +3,12 @@
 from mock import MagicMock
 import os
 import re
+from tempfile import mkdtemp
+from shutil import rmtree
 
 from pelican.generators import ArticlesGenerator, LessCSSGenerator
 from pelican.settings import _DEFAULT_CONFIG
-from .support import unittest, temporary_folder, skipIfNoExecutable
+from .support import unittest, skipIfNoExecutable
 
 CUR_DIR = os.path.dirname(__file__)
 
@@ -107,6 +109,14 @@ class TestLessCSSGenerator(unittest.TestCase):
         }
     """
 
+    def setUp(self):
+        self.temp_content = mkdtemp()
+        self.temp_output = mkdtemp()
+
+    def tearDown(self):
+        rmtree(self.temp_content)
+        rmtree(self.temp_output)
+
     @skipIfNoExecutable('lessc')
     def test_less_compiler(self):
 
@@ -114,28 +124,25 @@ class TestLessCSSGenerator(unittest.TestCase):
         settings['STATIC_PATHS'] = ['static']
         settings['LESS_GENERATOR'] = True
 
-        # we'll nest here for py < 2.7 compat
-        with temporary_folder() as temp_content:
-            with temporary_folder() as temp_output:
-                generator = LessCSSGenerator(None, settings, temp_content,
-                                _DEFAULT_CONFIG['THEME'], temp_output, None)
+        generator = LessCSSGenerator(None, settings, self.temp_content,
+                        _DEFAULT_CONFIG['THEME'], self.temp_output, None)
 
-                # create a dummy less file
-                less_dir = os.path.join(temp_content, 'static', 'css')
-                less_filename = os.path.join(less_dir, 'test.less')
+        # create a dummy less file
+        less_dir = os.path.join(self.temp_content, 'static', 'css')
+        less_filename = os.path.join(less_dir, 'test.less')
 
-                less_output = os.path.join(temp_output, 'static', 'css',
-                                    'test.css')
+        less_output = os.path.join(self.temp_output, 'static', 'css',
+                            'test.css')
 
-                os.makedirs(less_dir)
-                with open(less_filename, 'w') as less_file:
-                    less_file.write(self.LESS_CONTENT)
+        os.makedirs(less_dir)
+        with open(less_filename, 'w') as less_file:
+            less_file.write(self.LESS_CONTENT)
 
-                generator.generate_output()
+        generator.generate_output()
 
-                # we have the file ?
-                self.assertTrue(os.path.exists(less_output))
+        # we have the file ?
+        self.assertTrue(os.path.exists(less_output))
 
-                # was it compiled ?
-                self.assertIsNotNone(re.search(r'^\s+color:\s*#4D926F;$',
-                    open(less_output).read(), re.MULTILINE | re.IGNORECASE))
+        # was it compiled ?
+        self.assertIsNotNone(re.search(r'^\s+color:\s*#4D926F;$',
+            open(less_output).read(), re.MULTILINE | re.IGNORECASE))
diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 933c82fa..a331690b 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -5,11 +5,11 @@ except ImportError:
 
 import os
 from filecmp import dircmp
+from tempfile import mkdtemp
+from shutil import rmtree
 
 from mock import patch
 
-from .support import temporary_folder
-
 from pelican import Pelican
 from pelican.settings import read_settings
 
@@ -25,46 +25,23 @@ class TestPelican(unittest.TestCase):
     # general functional testing for pelican. Basically, this test case tries
     # to run pelican in different situations and see how it behaves
 
+    def setUp(self):
+        self.temp_path = mkdtemp()
+
+    def tearDown(self):
+        rmtree(self.temp_path)
+
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
         # ones and generate the output without raising any exception / issuing
         # any warning.
-        with temporary_folder() as temp_path:
-            with patch("pelican.contents.getenv") as mock_getenv:
-                # force getenv('USER') to always return the same value
-                mock_getenv.return_value = "Dummy Author"
-                pelican = Pelican(path=INPUT_PATH, output_path=temp_path)
-                pelican.run()
-                diff = dircmp(temp_path, os.sep.join((OUTPUT_PATH, "basic")))
-                self.assertEqual(diff.left_only, [], msg="some generated " \
-                        "files are absent from the expected functional " \
-                        "tests output.\n" \
-                        "This is probably because the HTML generated files " \
-                        "changed. If these changes are normal, please refer " \
-                        "to docs/contribute.rst to update the expected " \
-                        "output of the functional tests.")
-                self.assertEqual(diff.right_only, [], msg="some files from " \
-                        "the expected functional tests output are absent " \
-                        "from the current output.\n" \
-                        "This is probably because the HTML generated files " \
-                        "changed. If these changes are normal, please refer " \
-                        "to docs/contribute.rst to update the expected " \
-                        "output of the functional tests.")
-                self.assertEqual(diff.diff_files, [], msg="some generated " \
-                        "files differ from the expected functional tests " \
-                        "output.\n" \
-                        "This is probably because the HTML generated files " \
-                        "changed. If these changes are normal, please refer " \
-                        "to docs/contribute.rst to update the expected " \
-                        "output of the functional tests.")
-
-    def test_custom_generation_works(self):
-        # the same thing with a specified set of settings should work
-        with temporary_folder() as temp_path:
-            pelican = Pelican(path=INPUT_PATH, output_path=temp_path,
-                              settings=read_settings(SAMPLE_CONFIG))
+        with patch("pelican.contents.getenv") as mock_getenv:
+            # force getenv('USER') to always return the same value
+            mock_getenv.return_value = "Dummy Author"
+            pelican = Pelican(path=INPUT_PATH, output_path=self.temp_path)
             pelican.run()
-            diff = dircmp(temp_path, os.sep.join((OUTPUT_PATH, "custom")))
+            diff = dircmp(
+                    self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
             self.assertEqual(diff.left_only, [], msg="some generated " \
                     "files are absent from the expected functional " \
                     "tests output.\n" \
@@ -86,3 +63,31 @@ class TestPelican(unittest.TestCase):
                     "changed. If these changes are normal, please refer " \
                     "to docs/contribute.rst to update the expected " \
                     "output of the functional tests.")
+
+    def test_custom_generation_works(self):
+        # the same thing with a specified set of settings should work
+        pelican = Pelican(path=INPUT_PATH, output_path=self.temp_path,
+                            settings=read_settings(SAMPLE_CONFIG))
+        pelican.run()
+        diff = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "custom")))
+        self.assertEqual(diff.left_only, [], msg="some generated " \
+                "files are absent from the expected functional " \
+                "tests output.\n" \
+                "This is probably because the HTML generated files " \
+                "changed. If these changes are normal, please refer " \
+                "to docs/contribute.rst to update the expected " \
+                "output of the functional tests.")
+        self.assertEqual(diff.right_only, [], msg="some files from " \
+                "the expected functional tests output are absent " \
+                "from the current output.\n" \
+                "This is probably because the HTML generated files " \
+                "changed. If these changes are normal, please refer " \
+                "to docs/contribute.rst to update the expected " \
+                "output of the functional tests.")
+        self.assertEqual(diff.diff_files, [], msg="some generated " \
+                "files differ from the expected functional tests " \
+                "output.\n" \
+                "This is probably because the HTML generated files " \
+                "changed. If these changes are normal, please refer " \
+                "to docs/contribute.rst to update the expected " \
+                "output of the functional tests.")

From 0444513e90ae987cc6b6948742e0225315a20213 Mon Sep 17 00:00:00 2001
From: m-r-r <raybaudroigm@gmail.com>
Date: Sat, 12 May 2012 11:49:49 +0200
Subject: [PATCH 0707/2864] Trailing slashes removed to avoid category bug

---
 pelican/generators.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index ede948a4..24920450 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -245,7 +245,9 @@ class ArticlesGenerator(Generator):
     def generate_context(self):
         """change the context"""
 
-        article_path = os.path.join(self.path, self.settings['ARTICLE_DIR'])
+        article_path = os.path.normpath(  # we have to remove trailing slashes
+            os.path.join(self.path, self.settings['ARTICLE_DIR'])
+        )
         all_articles = []
         for f in self.get_files(
                 article_path,
@@ -259,8 +261,8 @@ class ArticlesGenerator(Generator):
             # if no category is set, use the name of the path as a category
             if 'category' not in metadata:
 
-                if os.path.dirname(f) == article_path:
-                    category = self.settings['DEFAULT_CATEGORY']
+                if os.path.dirname(f) == article_path:  # if the article is not in a subdirectory
+                    category = self.settings['DEFAULT_CATEGORY'] 
                 else:
                     category = os.path.basename(os.path.dirname(f))\
                                 .decode('utf-8')

From fed8e8b331668963d6d5f944211490541274eace Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Sat, 12 May 2012 23:48:57 +0200
Subject: [PATCH 0708/2864] documentation for webassets

---
 docs/settings.rst | 54 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 85e9f0c3..582cd9d4 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -369,6 +369,7 @@ Setting name (default value)                        What does it do?
                                                     value is `static`, but if your theme has
                                                     other static paths, you can put them here.
 `CSS_FILE` (``'main.css'``)                         Specify the CSS file you want to load.
+`WEBASSETS` (``False``)                             Asset management with `webassets` (see below)
 ================================================    =====================================================
 
 By default, two themes are available. You can specify them using the `-t` option:
@@ -418,7 +419,58 @@ adding the following to your configuration::
 
     CSS_FILE = "wide.css"
 
-.. _pelican-themes: :doc:`pelican-themes`
+Asset management
+----------------
+
+The `WEBASSETS` setting allows to use the `webassets`_ module to manage assets
+(css, js). The module must first be installed::
+
+    pip install webassets
+
+`webassets` allows to concatenate your assets and to use almost all of the
+hype tools of the moment (see the `documentation`_):
+
+* css minifier (`cssmin`, `yuicompressor`, ...)
+* css compiler (`less`, `sass`, ...)
+* js minifier (`uglifyjs`, `yuicompressor`, `closure`, ...)
+
+Others filters include gzip compression, integration of images in css with
+`datauri` and more. Webassets also append a version identifier to your asset
+url to convince browsers to download new versions of your assets when you use
+far future expires headers.
+
+When using it with Pelican, `webassets` is configured to process assets in the
+``OUTPUT_PATH/theme`` directory. You can use it in your templates with a
+template tag, for example:
+
+.. code-block:: jinja
+
+    {% assets filters="cssmin", output="css/style.min.css", "css/inuit.css", "css/pygment-monokai.css", "css/main.css" %}
+        <link rel="stylesheet" href="{{ ASSET_URL }}">
+    {% endassets %}
+
+will produce a minified css file with the version identifier:
+
+.. code-block:: html
+
+    <link href="http://{SITEURL}/theme/css/style.min.css?b3a7c807" rel="stylesheet">
+
+Another example for javascript:
+
+.. code-block:: jinja
+
+    {% assets filters="uglifyjs,gzip", output="js/packed.js", "js/jquery.js", "js/base.js", "js/widgets.js" %}
+        <script src="{{ ASSETS_URL }}"></script>
+    {% endassets %}
+
+will produce a minified and gzipped js file:
+
+.. code-block:: html
+
+    <script src="http://{SITEURL}/theme/js/packed.js?00703b9d"></script>
+
+.. _webassets: https://github.com/miracle2k/webassets
+.. _documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
 
 Example settings
 ================

From ba8ed9fb1806e5f45f30237a13f472034f6b6697 Mon Sep 17 00:00:00 2001
From: sam <lesametlemax@gmail.com>
Date: Sun, 13 May 2012 23:37:33 +0200
Subject: [PATCH 0709/2864] Added strip raw option to wordpress xml importer

---
 pelican/tools/pelican_import.py   |  27 +-
 tests/content/wordpressexport.xml | 578 ++++++++++++++++++++++++++++++
 tests/support.py                  |  88 ++++-
 tests/test_importer.py            |  43 +++
 4 files changed, 728 insertions(+), 8 deletions(-)
 create mode 100644 tests/content/wordpressexport.xml
 create mode 100644 tests/test_importer.py

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 050b1010..f3e9bb48 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -25,8 +25,14 @@ def wp2fields(xml):
     items = soup.rss.channel.findAll('item')
 
     for item in items:
+
         if item.fetch('wp:status')[0].contents[0] == "publish":
-            title = item.title.contents[0]
+
+            try:
+                title = item.title.contents[0]
+            except IndexError:
+                continue
+
             content = item.fetch('content:encoded')[0].contents[0]
             filename = item.fetch('wp:post_name')[0].contents[0]
 
@@ -197,7 +203,7 @@ def build_markdown_header(title, date, author, categories, tags):
     header += '\n'
     return header
 
-def fields2pelican(fields, out_markup, output_path, dircat=False):
+def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=False):
     for title, content, filename, date, author, categories, tags, in_markup in fields:
         if (in_markup == "markdown") or (out_markup == "markdown") :
             ext = '.md'
@@ -230,10 +236,13 @@ def fields2pelican(fields, out_markup, output_path, dircat=False):
                 paragraphs = [u'<p>{}</p>'.format(p) for p in paragraphs]
                 new_content = ''.join(paragraphs)
 
-                fp.write(content)
+                fp.write(new_content)
 
-            cmd = 'pandoc --normalize --reference-links --from=html --to={0} -o "{1}" "{2}"'.format(
-                out_markup, out_filename, html_filename)
+
+            parse_raw = '--parse-raw' if not strip_raw else ''
+            cmd = ('pandoc --normalize --reference-links {0} --from=html'
+                   ' --to={1} -o "{2}" "{3}"').format(
+                    parse_raw, out_markup, out_filename, html_filename)
 
             try:
                 rc = subprocess.call(cmd, shell=True)
@@ -279,6 +288,10 @@ def main():
         help='Output markup format (supports rst & markdown)')
     parser.add_argument('--dir-cat', action='store_true', dest='dircat',
         help='Put files in directories with categories name')
+    parser.add_argument('--strip-raw', action='store_true', dest='strip_raw',
+        help="Strip raw HTML code that can't be converted to "
+             "markup such as flash embeds or iframes (wordpress import only)")
+
     args = parser.parse_args()
 
     input_type = None
@@ -306,4 +319,6 @@ def main():
     elif input_type == 'feed':
         fields = feed2fields(args.input)
 
-    fields2pelican(fields, args.markup, args.output, dircat=args.dircat or False)
+    fields2pelican(fields, args.markup, args.output,
+                   dircat=args.dircat or False,
+                   strip_raw=args.strip_raw or False)
diff --git a/tests/content/wordpressexport.xml b/tests/content/wordpressexport.xml
new file mode 100644
index 00000000..d3e86cba
--- /dev/null
+++ b/tests/content/wordpressexport.xml
@@ -0,0 +1,578 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your site. -->
+<!-- It contains information about your site's posts, pages, comments, categories, and other content. -->
+<!-- You may use this file to transfer that content from one site to another. -->
+<!-- This file is not intended to serve as a complete backup of your site. -->
+
+<!-- To import this information into a WordPress site follow these steps: -->
+<!-- 1. Log in to that site as an administrator. -->
+<!-- 2. Go to Tools: Import in the WordPress admin panel. -->
+<!-- 3. Install the "WordPress" importer from the list. -->
+<!-- 4. Activate & Run Importer. -->
+<!-- 5. Upload this file using the form provided on that page. -->
+<!-- 6. You will first be asked to map the authors in this export file to users -->
+<!--    on the site. For each author, you may choose to map to an -->
+<!--    existing user on the site or to create a new user. -->
+<!-- 7. WordPress will then import each of the posts, pages, comments, categories, etc. -->
+<!--    contained in this file into your site. -->
+
+<!-- generator="WordPress/3.3.1" created="2012-05-13 01:13" -->
+<rss version="2.0"
+    xmlns:excerpt="http://wordpress.org/export/1.1/excerpt/"
+    xmlns:content="http://purl.org/rss/1.0/modules/content/"
+    xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:wp="http://wordpress.org/export/1.1/"
+>
+
+<channel>
+    <title>Pelican test channel</title>
+    <link>http://thisisa.test</link>
+    <description>Not a real feed, just for test</description>
+    <pubDate>Sun, 13 May 2012 01:13:52 +0000</pubDate>
+    <language>en</language>
+    <wp:wxr_version>1.1</wp:wxr_version>
+    <wp:base_site_url>http://thisisa.test</wp:base_site_url>
+    <wp:base_blog_url>http://thisisa.test</wp:base_blog_url>
+
+    <wp:author><wp:author_id>2</wp:author_id><wp:author_login>Bob</wp:author_login><wp:author_email>bob@thisisa.test</wp:author_email><wp:author_display_name><![CDATA[Bob]]></wp:author_display_name><wp:author_first_name><![CDATA[Bob]]></wp:author_first_name><wp:author_last_name><![CDATA[]]></wp:author_last_name></wp:author>
+    <wp:author><wp:author_id>3</wp:author_id><wp:author_login>Jonh</wp:author_login><wp:author_email>jonh@thisisa.test</wp:author_email><wp:author_display_name><![CDATA[Jonh]]></wp:author_display_name><wp:author_first_name><![CDATA[Jonh]]></wp:author_first_name><wp:author_last_name><![CDATA[]]></wp:author_last_name></wp:author>
+
+    <wp:category><wp:term_id>7</wp:term_id><wp:category_nicename>categ-1</wp:category_nicename><wp:category_parent></wp:category_parent><wp:cat_name><![CDATA[Category 1]]></wp:cat_name></wp:category>
+    <wp:category><wp:term_id>11</wp:term_id><wp:category_nicename>categ-2</wp:category_nicename><wp:category_parent></wp:category_parent><wp:cat_name><![CDATA[Category 2]]></wp:cat_name></wp:category>
+    <wp:category><wp:term_id>1</wp:term_id><wp:category_nicename>uncategorized</wp:category_nicename><wp:category_parent></wp:category_parent><wp:cat_name><![CDATA[Uncategorized]]></wp:cat_name></wp:category>
+    <wp:category><wp:term_id>15</wp:term_id><wp:category_nicename>categ-3</wp:category_nicename><wp:category_parent></wp:category_parent><wp:cat_name><![CDATA[Category 3]]></wp:cat_name></wp:category>
+    <wp:tag><wp:term_id>25</wp:term_id><wp:tag_slug>tag-1</wp:tag_slug><wp:tag_name><![CDATA[tag 1]]></wp:tag_name></wp:tag>
+    <wp:tag><wp:term_id>122</wp:term_id><wp:tag_slug>tag2</wp:tag_slug><wp:tag_name><![CDATA[Tag2]]></wp:tag_name></wp:tag>
+    <wp:tag><wp:term_id>68</wp:term_id><wp:tag_slug>tag-3</wp:tag_slug><wp:tag_name><![CDATA[Tag 3]]></wp:tag_name></wp:tag>
+
+    <generator>http://wordpress.org/?v=3.3.1</generator>
+
+    <item>
+        <title>Empty post</title>
+        <link>http://thisisa.test/?attachment_id=24</link>
+        <pubDate>Sat, 04 Feb 2012 03:17:33 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">https://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/Pelican_lakes_entrance02.jpg/240px-Pelican_lakes_entrance02.jpg</guid>
+        <description></description>
+        <content:encoded><![CDATA[]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>24</wp:post_id>
+        <wp:post_date>2012-02-04 03:17:33</wp:post_date>
+        <wp:post_date_gmt>2012-02-04 03:17:33</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>empty-post</wp:post_name>
+        <wp:status>inherit</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>attachment</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <wp:attachment_url>https://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/Pelican_lakes_entrance02.jpg/240px-Pelican_lakes_entrance02.jpg</wp:attachment_url>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attachment_metadata</wp:meta_key>
+            <wp:meta_value><![CDATA[a:5:{s:5:"width";s:3:"150";s:6:"height";s:3:"186";s:14:"hwstring_small";s:22:"height='96' width='77'";s:4:"file";s:20:"2012/02/pelican.png";s:10:"image_meta";a:10:{s:8:"aperture";s:1:"0";s:6:"credit";s:0:"";s:6:"camera";s:0:"";s:7:"caption";s:0:"";s:17:"created_timestamp";s:1:"0";s:9:"copyright";s:0:"";s:12:"focal_length";s:1:"0";s:3:"iso";s:1:"0";s:13:"shutter_speed";s:1:"0";s:5:"title";s:0:"";}}]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attached_file</wp:meta_key>
+            <wp:meta_value><![CDATA[2012/02/stuff.png]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attachment_image_alt</wp:meta_key>
+            <wp:meta_value><![CDATA[Stuff]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+    <item>
+        <title></title>
+        <link>http://thisisa.test/?p=168</link>
+        <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=168</guid>
+        <description></description>
+        <content:encoded><![CDATA[This is a draft with no title]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>168</wp:post_id>
+        <wp:post_date>2012-02-15 21:23:57</wp:post_date>
+        <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name></wp:post_name>
+        <wp:status>draft</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>post</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="categ-1"><![CDATA[Category 1]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+    <item>
+        <title>A normal post</title>
+        <link>http://thisisa.test/?p=173</link>
+        <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=173</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+<ul>
+    <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+    <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+</ul>
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>173</wp:post_id>
+        <wp:post_date>2012-02-16 15:52:55</wp:post_date>
+        <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name></wp:post_name>
+        <wp:status>draft</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>post</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-2"><![CDATA[Category 2]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+    <item>
+        <title>Complete draft</title>
+        <link>http://thisisa.test/?p=176</link>
+        <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=176</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>176</wp:post_id>
+        <wp:post_date>2012-02-17 15:11:55</wp:post_date>
+        <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name></wp:post_name>
+        <wp:status>draft</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>post</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-3"><![CDATA[Category 3]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+    <item>
+        <title>Page</title>
+        <link>http://thisisa.test/contact/</link>
+        <pubDate>Wed, 11 Apr 2012 11:38:08 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?page_id=334</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>334</wp:post_id>
+        <wp:post_date>2012-04-11 06:38:08</wp:post_date>
+        <wp:post_date_gmt>2012-04-11 11:38:08</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>contact</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>page</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <wp:postmeta>
+            <wp:meta_key>sharing_disabled</wp:meta_key>
+            <wp:meta_value><![CDATA[1]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_wp_page_template</wp:meta_key>
+            <wp:meta_value><![CDATA[default]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+    <item>
+        <title>Empty Page</title>
+        <link>http://thisisa.test/empty/</link>
+        <pubDate>Wed, 11 Apr 2012 11:38:08 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?page_id=334</guid>
+        <description></description>
+        <content:encoded><![CDATA[]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>334</wp:post_id>
+        <wp:post_date>2012-04-11 06:38:08</wp:post_date>
+        <wp:post_date_gmt>2012-04-11 11:38:08</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>empty</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>page</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <wp:postmeta>
+            <wp:meta_key>sharing_disabled</wp:meta_key>
+            <wp:meta_value><![CDATA[1]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_wp_page_template</wp:meta_key>
+            <wp:meta_value><![CDATA[default]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+    <item>
+        <title>Special chars: l&#039;é</title>
+        <link>http://thisisa.test/?p=471</link>
+        <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=471</guid>
+        <description></description>
+        <content:encoded><![CDATA[l&#039;é]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>471</wp:post_id>
+        <wp:post_date>2012-04-29 09:44:27</wp:post_date>
+        <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name></wp:post_name>
+        <wp:status>draft</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>post</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-1"><![CDATA[Category 1]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+
+    <item>
+        <title>With excerpt</title>
+        <link>http://thisisa.test/with-excerpt/</link>
+        <pubDate>Sat, 04 Feb 2012 02:03:06 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=8</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></excerpt:encoded>
+        <wp:post_id>8</wp:post_id>
+        <wp:post_date>2012-02-04 02:03:06</wp:post_date>
+        <wp:post_date_gmt>2012-02-04 02:03:06</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>with-excerpt</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>post</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="Category 1"><![CDATA[Category 1]]></category>
+        <category domain="post_tag" nicename="tag-1"><![CDATA[tag 1]]></category>
+        <category domain="post_tag" nicename="tag2"><![CDATA[Tag2]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>et_bigpost</wp:meta_key>
+            <wp:meta_value><![CDATA[0]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_thumbnail_id</wp:meta_key>
+            <wp:meta_value><![CDATA[32]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+    <item>
+        <title>With tags</title>
+        <link>http://thisisa.test/tags/</link>
+        <pubDate>Sat, 04 Feb 2012 21:05:25 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=25</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>25</wp:post_id>
+        <wp:post_date>2012-02-04 21:05:25</wp:post_date>
+        <wp:post_date_gmt>2012-02-04 21:05:25</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>with-tags</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>post</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-3"><![CDATA[Category 3]]></category>
+        <category domain="post_tag" nicename="tag-1"><![CDATA[tag 1]]></category>
+        <category domain="post_tag" nicename="tag-2"><![CDATA[Tag2]]></category>
+        <category domain="post_tag" nicename="tag-3"><![CDATA[Tag 3]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>et_bigpost</wp:meta_key>
+            <wp:meta_value><![CDATA[0]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_thumbnail_id</wp:meta_key>
+            <wp:meta_value><![CDATA[29]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+	<item>
+        <title>With comments</title>
+        <link>http://thisisa.test/with-comments/</link>
+        <pubDate>Wed, 18 Apr 2012 08:36:26 +0000</pubDate>
+        <dc:creator>john</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=422</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>422</wp:post_id>
+        <wp:post_date>2012-04-18 03:36:26</wp:post_date>
+        <wp:post_date_gmt>2012-04-18 08:36:26</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>with-comments</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>post</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-1"><![CDATA[Category 1]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[2]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_thumbnail_id</wp:meta_key>
+            <wp:meta_value><![CDATA[423]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:comment>
+            <wp:comment_id>116</wp:comment_id>
+            <wp:comment_author><![CDATA[User2]]></wp:comment_author>
+            <wp:comment_author_email>User2@mail.test</wp:comment_author_email>
+            <wp:comment_author_url></wp:comment_author_url>
+            <wp:comment_author_IP>127.0.0.1</wp:comment_author_IP>
+            <wp:comment_date>2012-05-06 15:46:06</wp:comment_date>
+            <wp:comment_date_gmt>2012-05-06 20:46:06</wp:comment_date_gmt>
+            <wp:comment_content><![CDATA[Comment content.]]></wp:comment_content>
+            <wp:comment_approved>1</wp:comment_approved>
+            <wp:comment_type></wp:comment_type>
+            <wp:comment_parent>0</wp:comment_parent>
+            <wp:comment_user_id>0</wp:comment_user_id>
+            <wp:commentmeta>
+                <wp:meta_key>akismet_result</wp:meta_key>
+                <wp:meta_value><![CDATA[false]]></wp:meta_value>
+            </wp:commentmeta>
+            <wp:commentmeta>
+                <wp:meta_key>akismet_history</wp:meta_key>
+                <wp:meta_value><![CDATA[a:4:{s:4:"time";s:15:"1336337189.7974";s:7:"message";s:28:"Akismet cleared this comment";s:5:"event";s:9:"check-ham";s:4:"user";s:0:"";}]]></wp:meta_value>
+            </wp:commentmeta>
+            <wp:commentmeta>
+                <wp:meta_key>akismet_as_submitted</wp:meta_key>
+                <wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";s:3:"422";s:14:"comment_author";s:8:"Baronsed";s:20:"comment_author_email";s:15:"User2@mail.test";s:18:"comment_author_url";s:0:"";s:15:"comment_content";s:118:"Dans les listes d'articles où celui-ci apparaît, l'image est trop grande et ralentit le chargement de toute la page.";s:12:"comment_type";s:0:"";s:14:"comment_parent";s:1:"0";s:7:"user_ID";s:1:"0";s:7:"user_ip";s:14:"127.0.0.1";s:10:"user_agent";s:74:"Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:12.0) Gecko/20100101 Firefox/12.0";s:8:"referrer";s:0:"";s:4:"blog";s:19:"http://thisisa.test";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:62:"http://thisisa.test/htop-un-visualiseur-interactif-de-process/";s:9:"user_role";s:0:"";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:8:"Baronsed";s:10:"POST_email";s:15:"User2@mail.test";s:8:"POST_url";s:0:"";s:12:"POST_comment";s:118:"Dans les listes d'articles où celui-ci apparaît, l'image est trop grande et ralentit le chargement de toute la page.";s:11:"POST_submit";s:14:"Submit Comment";s:20:"POST_comment_post_ID";s:3:"422";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"96b66769dc";s:15:"SERVER_SOFTWARE";s:12:"nginx/0.8.55";s:11:"REQUEST_URI";s:21:"/wp-comments-post.php";s:4:"TERM";s:5:"xterm";s:17:"PHP_FCGI_CHILDREN";s:1:"4";s:4:"PATH";s:29:"/sbin:/usr/sbin:/bin:/usr/bin";s:1:"_";s:25:"/usr/local/bin/spawn-fcgi";s:3:"PWD";s:1:"/";s:4:"LANG";s:11:"en_US.UTF-8";s:5:"SHLVL";s:1:"2";s:21:"PHP_FCGI_MAX_REQUESTS";s:4:"1000";s:9:"FCGI_ROLE";s:9:"RESPONDER";s:12:"QUERY_STRING";s:0:"";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"277";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:12:"DOCUMENT_URI";s:21:"/wp-comments-post.php";s:13:"DOCUMENT_ROOT";s:14:"/home/blog";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.1";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:11:"REMOTE_ADDR";s:14:"127.0.0.1";s:11:"REMOTE_PORT";s:5:"52826";s:11:"SERVER_ADDR";s:13:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"SERVER_NAME";s:12:"thisisa.test";s:15:"REDIRECT_STATUS";s:3:"200";s:15:"SCRIPT_FILENAME";s:35:"/home/blog/wp-comments-post.php";s:9:"HTTP_HOST";s:12:"thisisa.test";s:15:"HTTP_USER_AGENT";s:74:"Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:12.0) Gecko/20100101 Firefox/12.0";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:35:"fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:8:"HTTP_DNT";s:1:"1";s:15:"HTTP_CONNECTION";s:10:"keep-alive";s:11:"HTTP_COOKIE";s:0:"";s:17:"HTTP_CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:19:"HTTP_CONTENT_LENGTH";s:3:"277";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1336337164";}]]></wp:meta_value>
+            </wp:commentmeta>
+        </wp:comment>
+        <wp:comment>
+            <wp:comment_id>117</wp:comment_id>
+            <wp:comment_author><![CDATA[Bob]]></wp:comment_author>
+            <wp:comment_author_email>bob@thisisa.test</wp:comment_author_email>
+            <wp:comment_author_url></wp:comment_author_url>
+            <wp:comment_author_IP>127.0.0.1</wp:comment_author_IP>
+            <wp:comment_date>2012-05-06 17:44:06</wp:comment_date>
+            <wp:comment_date_gmt>2012-05-06 22:44:06</wp:comment_date_gmt>
+            <wp:comment_content><![CDATA[Comment content.]]></wp:comment_content>
+            <wp:comment_approved>1</wp:comment_approved>
+            <wp:comment_type></wp:comment_type>
+            <wp:comment_parent>116</wp:comment_parent>
+            <wp:comment_user_id>3</wp:comment_user_id>
+            <wp:commentmeta>
+                <wp:meta_key>akismet_result</wp:meta_key>
+                <wp:meta_value><![CDATA[false]]></wp:meta_value>
+            </wp:commentmeta>
+            <wp:commentmeta>
+                <wp:meta_key>akismet_history</wp:meta_key>
+                <wp:meta_value><![CDATA[a:4:{s:4:"time";s:15:"1336344263.8658";s:7:"message";s:28:"Akismet cleared this comment";s:5:"event";s:9:"check-ham";s:4:"user";s:3:"bob";}]]></wp:meta_value>
+            </wp:commentmeta>
+            <wp:commentmeta>
+                <wp:meta_key>akismet_as_submitted</wp:meta_key>
+                <wp:meta_value><![CDATA[a:74:{s:15:"comment_post_ID";s:3:"422";s:14:"comment_author";s:3:"bob";s:20:"comment_author_email";s:25:"bob@thisisa.test";s:18:"comment_author_url";s:0:"";s:15:"comment_content";s:26:"Merci de l'avoir signalé.";s:14:"comment_parent";s:3:"116";s:7:"user_ID";s:1:"3";s:7:"user_ip";s:14:"127.0.0.1";s:10:"user_agent";s:139:"Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.19 (KHTML, like Gecko) Ubuntu/12.04 Chromium/127.0.0.1 Chrome/127.0.0.1 Safari/535.19";s:8:"referrer";s:29:"http://thisisa.test/wp-admin/";s:4:"blog";s:19:"http://thisisa.test";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:62:"http://thisisa.test/htop-un-visualiseur-interactif-de-process/";s:9:"user_role";s:13:"administrator";s:21:"akismet_comment_nonce";s:6:"passed";s:22:"POST_newcomment_author";s:0:"";s:28:"POST_newcomment_author_email";s:0:"";s:26:"POST_newcomment_author_url";s:0:"";s:12:"POST_user_ID";s:1:"3";s:11:"POST_action";s:15:"replyto-comment";s:15:"POST_comment_ID";s:3:"116";s:20:"POST_comment_post_ID";s:3:"422";s:11:"POST_status";s:0:"";s:13:"POST_position";s:2:"-1";s:13:"POST_checkbox";s:1:"0";s:9:"POST_mode";s:9:"dashboard";s:32:"POST__ajax_nonce-replyto-comment";s:10:"d1ad3bd917";s:32:"POST__wp_unfiltered_html_comment";s:10:"fc11aee860";s:12:"POST_content";s:26:"Merci de l'avoir signalé.";s:7:"POST_id";s:3:"422";s:21:"POST_comments_listing";s:0:"";s:15:"SERVER_SOFTWARE";s:12:"nginx/0.8.55";s:11:"REQUEST_URI";s:24:"/wp-admin/admin-ajax.php";s:4:"TERM";s:5:"xterm";s:17:"PHP_FCGI_CHILDREN";s:1:"4";s:4:"PATH";s:29:"/sbin:/usr/sbin:/bin:/usr/bin";s:1:"_";s:25:"/usr/local/bin/spawn-fcgi";s:3:"PWD";s:1:"/";s:4:"LANG";s:11:"en_US.UTF-8";s:5:"SHLVL";s:1:"2";s:21:"PHP_FCGI_MAX_REQUESTS";s:4:"1000";s:9:"FCGI_ROLE";s:9:"RESPONDER";s:12:"QUERY_STRING";s:0:"";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"322";s:11:"SCRIPT_NAME";s:24:"/wp-admin/admin-ajax.php";s:12:"DOCUMENT_URI";s:24:"/wp-admin/admin-ajax.php";s:13:"DOCUMENT_ROOT";s:14:"/home/blog";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.1";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:11:"REMOTE_ADDR";s:14:"127.0.0.1";s:11:"REMOTE_PORT";s:5:"10252";s:11:"SERVER_ADDR";s:13:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"SERVER_NAME";s:12:"thisisa.test";s:15:"REDIRECT_STATUS";s:3:"200";s:15:"SCRIPT_FILENAME";s:38:"/home/blog/wp-admin/admin-ajax.php";s:9:"HTTP_HOST";s:12:"thisisa.test";s:15:"HTTP_CONNECTION";s:10:"keep-alive";s:19:"HTTP_CONTENT_LENGTH";s:3:"322";s:11:"HTTP_ORIGIN";s:19:"http://thisisa.test";s:21:"HTTP_X_REQUESTED_WITH";s:14:"XMLHttpRequest";s:15:"HTTP_USER_AGENT";s:139:"Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.19 (KHTML, like Gecko) Ubuntu/12.04 Chromium/127.0.0.1 Chrome/127.0.0.1 Safari/535.19";s:17:"HTTP_CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:11:"HTTP_ACCEPT";s:3:"*/*";s:12:"HTTP_REFERER";s:29:"http://thisisa.test/wp-admin/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:35:"fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:8:"PHP_SELF";s:24:"/wp-admin/admin-ajax.php";s:12:"REQUEST_TIME";s:10:"1336344246";}]]></wp:meta_value>
+            </wp:commentmeta>
+        </wp:comment>
+        <wp:comment>
+            <wp:comment_id>156</wp:comment_id>
+            <wp:comment_author><![CDATA[Ping back comment author]]></wp:comment_author>
+            <wp:comment_author_email></wp:comment_author_email>
+            <wp:comment_author_url>http://thisisa.test/to-article-you-ping-back/</wp:comment_author_url>
+            <wp:comment_author_IP>127.0.0.1</wp:comment_author_IP>
+            <wp:comment_date>2012-05-09 19:30:19</wp:comment_date>
+            <wp:comment_date_gmt>2012-05-10 00:30:19</wp:comment_date_gmt>
+            <wp:comment_content><![CDATA[[...]this is a ping pack [...] ]]></wp:comment_content>
+            <wp:comment_approved>trash</wp:comment_approved>
+            <wp:comment_type>pingback</wp:comment_type>
+            <wp:comment_parent>0</wp:comment_parent>
+            <wp:comment_user_id>0</wp:comment_user_id>
+            <wp:commentmeta>
+                <wp:meta_key>akismet_history</wp:meta_key>
+                <wp:meta_value><![CDATA[a:4:{s:4:"time";s:15:"1336610793.7343";s:7:"message";s:39:"bob changed the comment status to trash";s:5:"event";s:12:"status-trash";s:4:"user";s:3:"bob";}]]></wp:meta_value>
+            </wp:commentmeta>
+            <wp:commentmeta>
+                <wp:meta_key>_wp_trash_meta_status</wp:meta_key>
+                <wp:meta_value><![CDATA[0]]></wp:meta_value>
+            </wp:commentmeta>
+            <wp:commentmeta>
+                <wp:meta_key>_wp_trash_meta_time</wp:meta_key>
+                <wp:meta_value><![CDATA[1336610793]]></wp:meta_value>
+            </wp:commentmeta>
+        </wp:comment>
+        <wp:comment>
+            <wp:comment_id>122</wp:comment_id>
+            <wp:comment_author><![CDATA[bob]]></wp:comment_author>
+            <wp:comment_author_email>bob@thisisa.test</wp:comment_author_email>
+            <wp:comment_author_url></wp:comment_author_url>
+            <wp:comment_author_IP>127.0.0.1</wp:comment_author_IP>
+            <wp:comment_date>2012-05-07 14:11:34</wp:comment_date>
+            <wp:comment_date_gmt>2012-05-07 19:11:34</wp:comment_date_gmt>
+            <wp:comment_content><![CDATA[Comment content.]]></wp:comment_content>
+            <wp:comment_approved>1</wp:comment_approved>
+            <wp:comment_type></wp:comment_type>
+            <wp:comment_parent>121</wp:comment_parent>
+            <wp:comment_user_id>3</wp:comment_user_id>
+            <wp:commentmeta>
+                <wp:meta_key>akismet_result</wp:meta_key>
+                <wp:meta_value><![CDATA[false]]></wp:meta_value>
+            </wp:commentmeta>
+            <wp:commentmeta>
+                <wp:meta_key>akismet_history</wp:meta_key>
+                <wp:meta_value><![CDATA[a:4:{s:4:"time";s:15:"1336417895.1821";s:7:"message";s:28:"Akismet cleared this comment";s:5:"event";s:9:"check-ham";s:4:"user";s:3:"bob";}]]></wp:meta_value>
+            </wp:commentmeta>
+            <wp:commentmeta>
+                <wp:meta_key>akismet_as_submitted</wp:meta_key>
+                <wp:meta_value><![CDATA[a:65:{s:15:"comment_post_ID";s:3:"422";s:14:"comment_author";s:3:"bob";s:20:"comment_author_email";s:25:"bob@thisisa.test";s:18:"comment_author_url";s:0:"";s:15:"comment_content";s:832:"Comment content";s:12:"comment_type";s:0:"";s:14:"comment_parent";s:3:"121";s:7:"user_ID";s:1:"3";s:7:"user_ip";s:14:"127.0.0.1";s:10:"user_agent";s:139:"Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.19 (KHTML, like Gecko) Ubuntu/12.04 Chromium/127.0.0.1 Chrome/127.0.0.1 Safari/535.19";s:8:"referrer";s:62:"http://thisisa.test/htop-un-visualiseur-interactif-de-process/";s:4:"blog";s:19:"http://thisisa.test";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:62:"http://thisisa.test/htop-un-visualiseur-interactif-de-process/";s:9:"user_role";s:13:"administrator";s:21:"akismet_comment_nonce";s:6:"passed";s:12:"POST_comment";s:832:"Comment content.";s:11:"POST_submit";s:14:"Submit Comment";s:20:"POST_comment_post_ID";s:3:"422";s:19:"POST_comment_parent";s:3:"121";s:32:"POST__wp_unfiltered_html_comment";s:10:"9dacc22ee8";s:26:"POST_akismet_comment_nonce";s:10:"b9cbdae553";s:15:"SERVER_SOFTWARE";s:12:"nginx/0.8.55";s:11:"REQUEST_URI";s:21:"/wp-comments-post.php";s:4:"TERM";s:5:"xterm";s:17:"PHP_FCGI_CHILDREN";s:1:"4";s:4:"PATH";s:29:"/sbin:/usr/sbin:/bin:/usr/bin";s:1:"_";s:25:"/usr/local/bin/spawn-fcgi";s:3:"PWD";s:1:"/";s:4:"LANG";s:11:"en_US.UTF-8";s:5:"SHLVL";s:1:"2";s:21:"PHP_FCGI_MAX_REQUESTS";s:4:"1000";s:9:"FCGI_ROLE";s:9:"RESPONDER";s:12:"QUERY_STRING";s:0:"";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:4:"1143";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:12:"DOCUMENT_URI";s:21:"/wp-comments-post.php";s:13:"DOCUMENT_ROOT";s:14:"/home/blog";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.1";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:11:"REMOTE_ADDR";s:14:"127.0.0.1";s:11:"REMOTE_PORT";s:5:"10834";s:11:"SERVER_ADDR";s:13:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"SERVER_NAME";s:12:"thisisa.test";s:15:"REDIRECT_STATUS";s:3:"200";s:15:"SCRIPT_FILENAME";s:35:"/home/blog/wp-comments-post.php";s:9:"HTTP_HOST";s:12:"thisisa.test";s:15:"HTTP_CONNECTION";s:10:"keep-alive";s:19:"HTTP_CONTENT_LENGTH";s:4:"1143";s:18:"HTTP_CACHE_CONTROL";s:9:"john-age=0";s:11:"HTTP_ORIGIN";s:19:"http://thisisa.test";s:15:"HTTP_USER_AGENT";s:139:"Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.19 (KHTML, like Gecko) Ubuntu/12.04 Chromium/127.0.0.1 Chrome/127.0.0.1 Safari/535.19";s:17:"HTTP_CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:12:"HTTP_REFERER";s:62:"http://thisisa.test/htop-un-visualiseur-interactif-de-process/";s:20:"HTTP_ACCEPT_ENCODING";s:17:"gzip,deflate,sdch";s:20:"HTTP_ACCEPT_LANGUAGE";s:35:"fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4";s:19:"HTTP_ACCEPT_CHARSET";s:30:"ISO-8859-1,utf-8;q=0.7,*;q=0.3";s:11:"HTTP_COOKIE";s:0:"";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1336417893";}]]></wp:meta_value>
+            </wp:commentmeta>
+        </wp:comment>
+    </item>
+    <item>
+        <title>Post with raw data</title>
+        <link>http://thisisa.test/?p=173</link>
+        <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=173</guid>
+        <description></description>
+        <content:encoded><![CDATA[<h1>Pelicans are scary</h1>
+
+Pelicans are supposed to eat fish, damn it!
+
+<iframe width="420" height="315" src="http://www.youtube.com/embed/QNNl_uWmQXE" frameborder="0" allowfullscreen></iframe>
+
+Bottom line: don't mess up with birds]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>173</wp:post_id>
+        <wp:post_date>2012-02-16 15:52:55</wp:post_date>
+        <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>post-with-raw-data</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>post</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-2"><![CDATA[Category 2]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+</channel>
+</rss>
diff --git a/tests/support.py b/tests/support.py
index f2b4a075..994cd509 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -6,6 +6,11 @@ __all__ = [
 
 import os
 import subprocess
+import re
+import sys
+import cStringIO
+
+from functools import wraps
 from contextlib import contextmanager
 from tempfile import mkdtemp
 from shutil import rmtree
@@ -28,8 +33,87 @@ def temporary_folder():
             # do whatever you want
     """
     tempdir = mkdtemp()
-    yield tempdir
-    rmtree(tempdir)
+    try:
+        yield tempdir
+    finally:
+        rmtree(tempdir)
+
+
+def isplit(s, sep=None):
+    """
+        Behave like str.split but returns a generator instead of a list.
+
+        >>> list(isplit('\tUse the force\n')) == '\tUse the force\n'.split()
+        True
+        >>> list(isplit('\tUse the force\n')) == ['Use', 'the', 'force']
+        True
+        >>> list(isplit('\tUse the force\n', "e")) == '\tUse the force\n'.split("e")
+        True
+        >>> list(isplit('Use the force', "e")) == 'Use the force'.split("e")
+        True
+        >>> list(isplit('Use the force', "e")) == ['Us', ' th', ' forc', '']
+        True
+
+    """
+    sep, hardsep = r'\s+' if sep is None else re.escape(sep), sep is not None
+    exp, pos, l = re.compile(sep), 0, len(s)
+    while True:
+        m = exp.search(s, pos)
+        if not m:
+            if pos < l or hardsep:
+                #      ^ mimic "split()": ''.split() returns []
+                yield s[pos:]
+            break
+        start = m.start()
+        if pos < start or hardsep:
+            #           ^ mimic "split()": includes trailing empty string
+            yield s[pos:start]
+        pos = m.end()
+
+
+def mute(returns_output=False):
+    """
+        Decorate a function that prints to stdout, intercepting the output.
+        If "returns_output" is True, the function will return a generator
+        yielding the printed lines instead of the return values.
+
+        The decorator litterally hijack sys.stdout during each function
+        execution, so be careful with what you apply it to.
+
+        >>> def numbers():
+            print "42"
+            print "1984"
+        ...
+        >>> numbers()
+        42
+        1984
+        >>> mute()(numbers)()
+        >>> list(mute(True)(numbers)())
+        ['42', '1984']
+
+    """
+
+    def decorator(func):
+
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+
+            saved_stdout = sys.stdout
+            sys.stdout = cStringIO.StringIO()
+
+            try:
+                out = func(*args, **kwargs)
+                if returns_output:
+                    out = isplit(sys.stdout.getvalue().strip())
+            finally:
+                sys.stdout = saved_stdout
+
+            return out
+
+        return wrapper
+
+    return decorator
+
 
 
 def get_article(title, slug, content, lang, extra_metadata=None):
diff --git a/tests/test_importer.py b/tests/test_importer.py
new file mode 100644
index 00000000..c6ee9cfb
--- /dev/null
+++ b/tests/test_importer.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+
+import os
+
+from pelican.tools.pelican_import import wp2fields, fields2pelican
+from .support import unittest, temporary_folder, mute
+
+CUR_DIR = os.path.dirname(__file__)
+WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
+
+
+class TestWordpressXmlImporter(unittest.TestCase):
+
+
+    def setUp(self):
+        self.posts = wp2fields(WORDPRESS_XML_SAMPLE)
+
+
+    def test_ignore_empty_posts(self):
+
+        posts = list(self.posts)
+        self.assertTrue(posts)
+        for title, content, fname, date, author, categ, tags, format in posts:
+            self.assertTrue(title.strip())
+
+
+    def test_can_toggle_raw_html_code_parsing(self):
+
+        posts = list(self.posts)
+        r = lambda f: open(f).read()
+        silent_f2p = mute(True)(fields2pelican)
+
+        with temporary_folder() as temp:
+
+            rst_files = (r(f) for f in silent_f2p(posts, 'markdown', temp))
+            self.assertTrue(any('<iframe' in rst for rst in rst_files))
+            rst_files = (r(f) for f in silent_f2p(posts, 'markdown', temp, strip_raw=True))
+            self.assertFalse(any('<iframe' in rst for rst in rst_files))
+            # no effect in rst
+            rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp))
+            self.assertFalse(any('<iframe' in rst for rst in rst_files))
+            rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp, strip_raw=True))
+            self.assertFalse(any('<iframe' in rst for rst in rst_files))

From 2c1c05923d7b46707757bdc24fe289a2ff3d8ac7 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Mon, 14 May 2012 18:33:49 +0100
Subject: [PATCH 0710/2864] Fix a broken URL in the simple template

---
 pelican/themes/simple/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index a1017219..ad2723fd 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -21,7 +21,7 @@
           {% endfor %}
         {% else %}
           {% for cat, null in categories %}
-            <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+            <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
           {% endfor %}
         {% endif %}
         </ul></nav><!-- /#menu -->

From a16c19545f4ca5f1442c7859d3207121c0be4920 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Mon, 14 May 2012 18:46:27 +0100
Subject: [PATCH 0711/2864] Don't duplicate html across themes

---
 pelican/themes/notmyidea/templates/categories.html |  8 --------
 pelican/themes/notmyidea/templates/tags.html       |  0
 pelican/themes/simple/templates/index.html         | 14 +-------------
 .../templates/pagination.html                      |  0
 4 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 pelican/themes/notmyidea/templates/categories.html
 delete mode 100644 pelican/themes/notmyidea/templates/tags.html
 rename pelican/themes/{notmyidea => simple}/templates/pagination.html (100%)

diff --git a/pelican/themes/notmyidea/templates/categories.html b/pelican/themes/notmyidea/templates/categories.html
deleted file mode 100644
index e29be0ca..00000000
--- a/pelican/themes/notmyidea/templates/categories.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "base.html" %}
-{% block content %}
-<ul>
-{% for category, articles in categories %}
-    <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
-{% endfor %}
-</ul>
-{% endblock %}
diff --git a/pelican/themes/notmyidea/templates/tags.html b/pelican/themes/notmyidea/templates/tags.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index ad2a3b2e..dfdb0b45 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -17,18 +17,6 @@
         </article></li>
 {% endfor %}
 </ol><!-- /#posts-list -->
-<p class="paginator">
-    {% if articles_page.has_previous() %}
-        {% if articles_page.previous_page_number() == 1 %}
-            <a href="{{ SITEURL }}/{{ page_name }}.html">&laquo;</a>
-        {% else %}
-            <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">&laquo;</a>
-        {% endif %}
-    {% endif %}
-    Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}
-    {% if articles_page.has_next() %}
-        <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">&raquo;</a>
-    {% endif %}
-</p>
+{% include 'pagination.html' %}
 </section><!-- /#content -->
 {% endblock content %}
diff --git a/pelican/themes/notmyidea/templates/pagination.html b/pelican/themes/simple/templates/pagination.html
similarity index 100%
rename from pelican/themes/notmyidea/templates/pagination.html
rename to pelican/themes/simple/templates/pagination.html

From 40dc019b3092ce0ed92947ace5b96b5b0fdefa8c Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 15 May 2012 11:58:40 +0300
Subject: [PATCH 0712/2864] Update CHANGELOG

---
 CHANGELOG | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 46aa68a5..373892cf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,18 @@
-X.X
+3.0 - XX/XX/XXXX
 
 * Refactored the way URL are handled.
 * Improved the english documentation
 * Fixed packaging using setuptools entrypoints
 * Added typogrify support
 * Added a way to disable feed generation
+* Added support for DIRECT_TEMPLATES
+* Allow multiple extensions for content files
+* Added less support
+* Improved the import script
+* Fixed a bunch of bugs :-)
+* Added functional tests
+* Rsync support in the generated Makefile
+* Improved feed support (easily pluggable with feedburner for instance)
 
 2.8
 

From 849244f61ec3fa3a75448ad134f29f22b40d7350 Mon Sep 17 00:00:00 2001
From: Brandon W Maister <quodlibetor@gmail.com>
Date: Tue, 15 May 2012 17:48:07 -0400
Subject: [PATCH 0713/2864] Add warnings for files skipped due to unknown
 status

---
 pelican/generators.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index ede948a4..6483457d 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -284,6 +284,10 @@ class ArticlesGenerator(Generator):
                 all_articles.append(article)
             elif article.status == "draft":
                 self.drafts.append(article)
+            else:
+                logger.warning(u"Unknown status %s for file %s, skipping it." %
+                               (repr(unicode.encode(article.status, 'utf-8')),
+                                repr(f)))
 
         self.articles, self.translations = process_translations(all_articles)
 

From ef77847762111d165cba14c65dfe5dfb11425530 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 19 May 2012 23:44:37 +0200
Subject: [PATCH 0714/2864] force locale to ascii in functional tests

---
 samples/pelican.conf.py | 2 +-
 tests/test_pelican.py   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index bffe57f6..fffbf1a8 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -8,7 +8,7 @@ GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
-LOCALE = ""
+LOCALE = "C"
 DEFAULT_PAGINATION = 4
 
 FEED_RSS = 'feeds/all.rss.xml'
diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index a331690b..0458d58c 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -7,6 +7,7 @@ import os
 from filecmp import dircmp
 from tempfile import mkdtemp
 from shutil import rmtree
+import locale
 
 from mock import patch
 
@@ -27,9 +28,12 @@ class TestPelican(unittest.TestCase):
 
     def setUp(self):
         self.temp_path = mkdtemp()
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, 'C')
 
     def tearDown(self):
         rmtree(self.temp_path)
+        locale.setlocale(locale.LC_ALL, self.old_locale)
 
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default

From 7192f745547e3d5e9b873e31dac001f373449abd Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 21 May 2012 15:21:16 +0200
Subject: [PATCH 0715/2864] markdown syntax is ':::' not '::' for syntax hl

---
 docs/getting_started.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index f5da2753..313b44e1 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -169,7 +169,7 @@ For RestructuredText::
 
 For Markdown, format your code blocks thusly::
 
-    ::identifier
+    :::identifier
     your code goes here
 
 The specified identifier should be one that appears on the 

From 46daadc1378d47bc3fd66a2676156c5053a04f36 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 8 Jun 2012 11:21:52 +0200
Subject: [PATCH 0716/2864] add a youtube directive to pelican

---
 pelican/rstdirectives.py | 56 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index 3d7c2fe7..cb9c6f77 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -36,3 +36,59 @@ class Pygments(Directive):
 
 directives.register_directive('code-block', Pygments)
 directives.register_directive('sourcecode', Pygments)
+
+
+class YouTube(Directive):
+    """ Embed YouTube video in posts.
+
+    VIDEO_ID is required, with / height are optional integer,
+    and align could be left / center / right.
+
+    Usage:
+    .. youtube:: VIDEO_ID
+        :width: 640
+        :height: 480
+        :align: center
+    """
+
+    def align(argument):
+        """Conversion function for the "align" option."""
+        return directives.choice(argument, ('left', 'center', 'right'))
+
+    required_arguments = 1
+    optional_arguments = 2
+    option_spec = {
+        'width': directives.positive_int,
+        'height': directives.positive_int,
+        'align': align
+    }
+
+    final_argument_whitespace = False
+    has_content = False
+
+    def run(self):
+        videoID = self.arguments[0].strip()
+        width = 420
+        height = 315
+        align = 'left'
+
+        if 'width' in self.options:
+            width = self.options['width']
+
+        if 'height' in self.options:
+            height = self.options['height']
+
+        if 'align' in self.options:
+            align = self.options['align']
+
+        url = 'http://www.youtube.com/embed/%s' % videoID
+        div_block = '<div class="youtube" align="%s">' % align
+        embed_block = '<iframe width="%s" height="%s" src="%s" '\
+                      'frameborder="0"></iframe>' % (width, height, url)
+
+        return [
+            nodes.raw('', div_block, format='html'),
+            nodes.raw('', embed_block, format='html'),
+            nodes.raw('', '</div>', format='html')]
+
+directives.register_directive('youtube', YouTube)

From 3dd63a012e2885fdc3e1de3d63ebe57b0179e568 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 8 Jun 2012 11:23:18 +0200
Subject: [PATCH 0717/2864] Thanks the author of the youtube directive.

---
 pelican/rstdirectives.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index cb9c6f77..9c821310 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -41,6 +41,8 @@ directives.register_directive('sourcecode', Pygments)
 class YouTube(Directive):
     """ Embed YouTube video in posts.
 
+    Courtesy of Brian Hsu: https://gist.github.com/1422773
+
     VIDEO_ID is required, with / height are optional integer,
     and align could be left / center / right.
 

From ae1424a8dd488424ea7aade2205cf1cf60e5c90b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Fri, 8 Jun 2012 09:56:55 -0700
Subject: [PATCH 0718/2864] Strip tags from title when within tag attribute

The change mentioned in #336 stripped tags properly in some places but
seems to have forgotten at least one location in the main index.html
---
 pelican/themes/notmyidea/templates/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 69dc4622..de607152 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -29,7 +29,8 @@
             {% endif %}
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h1>
+                    <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
+                           title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
                 </header>
                 
                 <div class="entry-content">

From 219280d20315a9af491ddca77d8d61bae9488fb0 Mon Sep 17 00:00:00 2001
From: Abhishek L <abhishekl.2006@gmail.com>
Date: Sun, 10 Jun 2012 00:00:49 +0530
Subject: [PATCH 0719/2864] Updated docs, for user and project pages in Github

---
 docs/tips.rst | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/tips.rst b/docs/tips.rst
index 6ddc3d33..14a79a5e 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -10,6 +10,26 @@ GitHub comes with an interesting "pages" feature: you can upload things there
 and it will be available directly from their servers. As Pelican is a static
 file generator, we can take advantage of this.
 
+User Pages
+----------
+Github allows you to create user pages in the form of ``username.github.com``. 
+Whatever is created in master branch will be published. For this purposes just 
+the output generated by pelican needs to pushed at github.
+
+So given a repository containing your articles, just run pelican over the posts 
+and deploy the master branch at github::
+
+    $ pelican -s pelican.conf.py ./path/to/posts -o /path/to/output
+
+Now add all the files in the output directory generated by pelican::
+
+    $ git add /path/to/output/*
+    $ git commit -am "Your Message"
+    $ git push origin master
+
+Project Pages
+-------------
+For creating Project pages, a branch called ``gh-pages`` is used for publishing.
 The excellent `ghp-import <https://github.com/davisp/ghp-import>`_ makes this
 really easy. You will have to install it::
 
@@ -31,3 +51,4 @@ Put the following into `.git/hooks/post-commit`::
 
     pelican -s pelican.conf.py . && ghp-import output && git push origin
     gh-pages
+

From ed8b8bc27e97d22e59c5ab4a84104a368bd0ef62 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 10 Jun 2012 00:24:26 +0200
Subject: [PATCH 0720/2864] Also reload when the settings file changes.

Fix for #360
---
 pelican/__init__.py | 31 ++++++++++++++++++++++---------
 pelican/utils.py    | 22 +++++++++++++++++++---
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 6b3d12fb..23b25730 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,7 +9,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator, LessCSSGenerator)
 from pelican.log import init
 from pelican.settings import read_settings, _DEFAULT_CONFIG
-from pelican.utils import clean_output_dir, files_changed
+from pelican.utils import clean_output_dir, files_changed, file_changed
 from pelican.writers import Writer
 
 __major__ = 3
@@ -134,7 +134,7 @@ class Pelican(object):
         generators = [ArticlesGenerator, PagesGenerator, StaticGenerator]
         if self.settings['PDF_GENERATOR']:
             generators.append(PdfGenerator)
-        if self.settings['LESS_GENERATOR']: # can be True or PATH to lessc
+        if self.settings['LESS_GENERATOR']:  # can be True or PATH to lessc
             generators.append(LessCSSGenerator)
         return generators
 
@@ -192,11 +192,7 @@ def parse_arguments():
     return parser.parse_args()
 
 
-def main():
-    args = parse_arguments()
-    init(args.verbosity)
-    # Split the markup languages only if some have been given. Otherwise,
-    # populate the variable with None.
+def get_instance(args):
     markup = [a.strip().lower() for a in args.markup.split(',')]\
               if args.markup else None
 
@@ -208,9 +204,18 @@ def main():
         module = __import__(module)
         cls = getattr(module, cls_name)
 
+    return cls(settings, args.path, args.theme, args.output, markup,
+               args.delete_outputdir)
+
+
+def main():
+    args = parse_arguments()
+    init(args.verbosity)
+    # Split the markup languages only if some have been given. Otherwise,
+    # populate the variable with None.
+    pelican = get_instance(args)
+
     try:
-        pelican = cls(settings, args.path, args.theme, args.output, markup,
-                args.delete_outputdir)
         if args.autoreload:
             while True:
                 try:
@@ -222,6 +227,14 @@ def main():
                     if files_changed(pelican.path, pelican.markup) or \
                             files_changed(pelican.theme, ['']):
                         pelican.run()
+
+                    # reload also if settings.py changed
+                    if file_changed(args.settings):
+                        logger.info('%s changed, re-generating' %
+                                    args.settings)
+                        pelican = get_instance(args)
+                        pelican.run()
+
                     time.sleep(.5)  # sleep to avoid cpu load
                 except KeyboardInterrupt:
                     break
diff --git a/pelican/utils.py b/pelican/utils.py
index d4e34842..0940bf72 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -4,6 +4,7 @@ import re
 import pytz
 import shutil
 import logging
+from collections import defaultdict
 
 from codecs import open as _open
 from datetime import datetime
@@ -221,9 +222,9 @@ def files_changed(path, extensions):
         """Return the last time files have been modified"""
         for root, dirs, files in os.walk(path):
             dirs[:] = [x for x in dirs if x[0] != '.']
-            for file in files:
-                if any(file.endswith(ext) for ext in extensions):
-                    yield os.stat(os.path.join(root, file)).st_mtime
+            for f in files:
+                if any(f.endswith(ext) for ext in extensions):
+                    yield os.stat(os.path.join(root, f)).st_mtime
 
     global LAST_MTIME
     mtime = max(file_times(path))
@@ -233,6 +234,21 @@ def files_changed(path, extensions):
     return False
 
 
+FILENAMES_MTIMES = defaultdict(int)
+
+
+def file_changed(filename):
+    mtime = os.stat(filename).st_mtime
+    if FILENAMES_MTIMES[filename] == 0:
+        FILENAMES_MTIMES[filename] = mtime
+        return False
+    else:
+        if mtime > FILENAMES_MTIMES[filename]:
+            FILENAMES_MTIMES[filename] = mtime
+            return True
+        return False
+
+
 def set_date_tzinfo(d, tz_name=None):
     """ Date without tzinfo shoudbe utc.
     This function set the right tz to date that aren't utc and don't have

From 298c15bdda06e14afeef271cb12bd85749b21d79 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 10 Jun 2012 12:39:51 +0200
Subject: [PATCH 0721/2864] don't test the markdown reader if markdown isn't
 installed

---
 dev_requirements.txt  | 1 +
 tests/test_readers.py | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index e1a15a3f..927a2cab 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -6,3 +6,4 @@ unittest2
 pytz
 mock
 Markdown
+blinker
diff --git a/tests/test_readers.py b/tests/test_readers.py
index de2e9c32..a921cfc2 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -62,8 +62,10 @@ class RstReaderTest(unittest.TestCase):
         except ImportError:
             return unittest.skip('need the typogrify distribution')
 
+
 class MdReaderTest(unittest.TestCase):
 
+    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_md_extention(self):
         # test to ensure the md extension is being processed by the correct reader
         reader = readers.MarkdownReader({})
@@ -74,6 +76,7 @@ class MdReaderTest(unittest.TestCase):
         
         self.assertEqual(content, expected)
 
+    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_mkd_extension(self):
         # test to ensure the mkd extension is being processed by the correct reader
         reader = readers.MarkdownReader({})

From 68d5ed57e31f51d04d0054f232fa27fe46d70554 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 10 Jun 2012 13:17:52 +0200
Subject: [PATCH 0722/2864] Add beautifulSoup in the dev deps

---
 dev_requirements.txt | 1 +
 tox.ini              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index 927a2cab..ef1dbf31 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -7,3 +7,4 @@ pytz
 mock
 Markdown
 blinker
+BeautifulSoup
diff --git a/tox.ini b/tox.ini
index 2cba1472..a7dc9ec6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,3 +12,4 @@ deps =
     unittest2
     mock
     Markdown
+    BeautifulSoup

From 7c48937ea25acdb492118e85518bcb82d97c59f6 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 10 Jun 2012 13:27:36 +0200
Subject: [PATCH 0723/2864] pandoc is optional

---
 pelican/tools/pelican_import.py | 21 +++++++++++----------
 tests/test_importer.py          | 10 +++++-----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index f3e9bb48..dab3c3a8 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -247,14 +247,15 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
             try:
                 rc = subprocess.call(cmd, shell=True)
                 if rc < 0:
-                    print("Child was terminated by signal %d" % -rc)
-                    exit()
+                    error = "Child was terminated by signal %d" % -rc
+                    exit(error)
+
                 elif rc > 0:
-                    print("Please, check your Pandoc installation.")
-                    exit()
+                    error = "Please, check your Pandoc installation."
+                    exit(error)
             except OSError, e:
-                print("Pandoc execution failed: %s" % e)
-                exit()
+                error = "Pandoc execution failed: %s" % e
+                exit(error)
 
             os.remove(html_filename)
 
@@ -302,15 +303,15 @@ def main():
     elif args.feed:
         input_type = 'feed'
     else:
-        print("You must provide either --wpfile, --dotclear or --feed options")
-        exit()
+        error = "You must provide either --wpfile, --dotclear or --feed options"
+        exit(error)
 
     if not os.path.exists(args.output):
         try:
             os.mkdir(args.output)
         except OSError:
-            print("Unable to create the output folder: " + args.output)
-            exit()
+            error = "Unable to create the output folder: " + args.output
+            exit(error)
 
     if input_type == 'wordpress':
         fields = wp2fields(args.input)
diff --git a/tests/test_importer.py b/tests/test_importer.py
index c6ee9cfb..1dc6fa78 100644
--- a/tests/test_importer.py
+++ b/tests/test_importer.py
@@ -11,11 +11,9 @@ WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
 
 class TestWordpressXmlImporter(unittest.TestCase):
 
-
     def setUp(self):
         self.posts = wp2fields(WORDPRESS_XML_SAMPLE)
 
-
     def test_ignore_empty_posts(self):
 
         posts = list(self.posts)
@@ -23,7 +21,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
         for title, content, fname, date, author, categ, tags, format in posts:
             self.assertTrue(title.strip())
 
-
+    @unittest.skipUnless(os.system('pandoc --version') == 0, 'pandoc is not installed')
     def test_can_toggle_raw_html_code_parsing(self):
 
         posts = list(self.posts)
@@ -34,10 +32,12 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
             rst_files = (r(f) for f in silent_f2p(posts, 'markdown', temp))
             self.assertTrue(any('<iframe' in rst for rst in rst_files))
-            rst_files = (r(f) for f in silent_f2p(posts, 'markdown', temp, strip_raw=True))
+            rst_files = (r(f) for f in silent_f2p(posts, 'markdown', temp,
+                         strip_raw=True))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
             # no effect in rst
             rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
-            rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp, strip_raw=True))
+            rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp,
+                         strip_raw=True))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))

From 4ed8c6a09cbbf68009fdf6f13f1bae72ff727d10 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 10 Jun 2012 13:32:23 +0200
Subject: [PATCH 0724/2864] don't test webassets key if it can be unset

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index b9912a47..9dcba369 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -152,7 +152,7 @@ def configure_settings(settings, default_settings=None, filename=None):
                  "http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "
                  "for more information")
 
-    if settings['WEBASSETS']:
+    if 'WEBASSETS' in settings:
         try:
             from webassets.ext.jinja2 import AssetsExtension
             settings['JINJA_EXTENSIONS'].append(AssetsExtension)

From 7682f657a436806478c256f4e659065ae93fc6f5 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 10 Jun 2012 21:46:32 +0200
Subject: [PATCH 0725/2864] don't do anything with webassets if the setting is
 set to false (default)

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 9dcba369..5769f1f4 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -152,7 +152,7 @@ def configure_settings(settings, default_settings=None, filename=None):
                  "http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "
                  "for more information")
 
-    if 'WEBASSETS' in settings:
+    if 'WEBASSETS' in settings and settings['WEBASSETS'] is not False:
         try:
             from webassets.ext.jinja2 import AssetsExtension
             settings['JINJA_EXTENSIONS'].append(AssetsExtension)

From 191b1cdb0f12231b24f17b74c828242496b55915 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Sun, 10 Jun 2012 21:56:06 +0200
Subject: [PATCH 0726/2864] skip unless deps are installed in tests

---
 tests/test_importer.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/test_importer.py b/tests/test_importer.py
index 1dc6fa78..5504b12e 100644
--- a/tests/test_importer.py
+++ b/tests/test_importer.py
@@ -8,12 +8,20 @@ from .support import unittest, temporary_folder, mute
 CUR_DIR = os.path.dirname(__file__)
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
 
+PANDOC = os.system('pandoc --version') == 0
+try:
+    import BeautifulSoup
+except ImportError:
+    BeautifulSoup = False  # NOQA
+
 
 class TestWordpressXmlImporter(unittest.TestCase):
 
     def setUp(self):
         self.posts = wp2fields(WORDPRESS_XML_SAMPLE)
 
+    @unittest.skipUnless(PANDOC and BeautifulSoup,
+                         'Needs Pandoc and BeautifulSoup')
     def test_ignore_empty_posts(self):
 
         posts = list(self.posts)
@@ -21,7 +29,8 @@ class TestWordpressXmlImporter(unittest.TestCase):
         for title, content, fname, date, author, categ, tags, format in posts:
             self.assertTrue(title.strip())
 
-    @unittest.skipUnless(os.system('pandoc --version') == 0, 'pandoc is not installed')
+    @unittest.skipUnless(PANDOC and BeautifulSoup,
+                         'Needs Pandoc and BeautifulSoup')
     def test_can_toggle_raw_html_code_parsing(self):
 
         posts = list(self.posts)

From 9fb5969c59ca47911679b1c8f994ddf613cec522 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Sun, 10 Jun 2012 17:58:05 -0400
Subject: [PATCH 0727/2864] Allow settings to specify a summary length,
 optionally allowing unlimited summary length

---
 pelican/contents.py | 4 +++-
 pelican/settings.py | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index f5f3a1dc..b8bb0993 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -139,7 +139,9 @@ class Page(object):
         if hasattr(self, '_summary'):
             return self._summary
         else:
-            return truncate_html_words(self.content, 50)
+            if self.settings['SUMMARY_MAX_LENGTH']:
+                return truncate_html_words(self.content, self.settings['SUMMARY_MAX_LENGTH'])
+            return self.content
 
     def _set_summary(self, summary):
         """Dummy function"""
diff --git a/pelican/settings.py b/pelican/settings.py
index 4da66989..a8c8bea4 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -68,6 +68,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'ARTICLE_PERMALINK_STRUCTURE': '',
                    'TYPOGRIFY': False,
                    'LESS_GENERATOR': False,
+                   'SUMARY_MAX_LENGTH': 50,
                    }
 
 

From 876c7f509392d6c245a81e26fd5fd2a81851281f Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Sun, 10 Jun 2012 18:26:53 -0400
Subject: [PATCH 0728/2864] turn utils.open into actual context manager so as
 to better handle encoding warnings

---
 pelican/utils.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index d4e34842..db15a343 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import contextlib
 import os
 import re
 import pytz
@@ -32,10 +33,10 @@ def get_date(string):
             pass
     raise ValueError("'%s' is not a valid date" % string)
 
-
+@contextlib.contextmanager
 def open(filename):
     """Open a file and return it's content"""
-    return _open(filename, encoding='utf-8').read()
+    yield _open(filename, encoding='utf-8').read()
 
 
 def slugify(value):

From c6d1de14f3db63705b35fbe3fd5db3701ea962a4 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Sun, 10 Jun 2012 18:27:38 -0400
Subject: [PATCH 0729/2864] better html parser

---
 pelican/readers.py | 101 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 99 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 83565918..83cb7e3b 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -13,8 +13,11 @@ try:
     from markdown import Markdown
 except ImportError:
     Markdown = False  # NOQA
+import cgi
+from HTMLParser import HTMLParser
 import re
 
+
 from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, open
 
@@ -126,13 +129,12 @@ class MarkdownReader(Reader):
             metadata[name] = self.process_metadata(name, value[0])
         return content, metadata
 
-
+"""
 class HtmlReader(Reader):
     file_extensions = ['html', 'htm']
     _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
 
     def read(self, filename):
-        """Parse content and metadata of (x)HTML files"""
         with open(filename) as content:
             metadata = {'title': 'unnamed'}
             for i in self._re.findall(content):
@@ -142,6 +144,101 @@ class HtmlReader(Reader):
                 metadata[name] = self.process_metadata(name, value)
 
             return content, metadata
+"""
+
+class PelicanHTMLParser(HTMLParser):
+    def __init__(self, settings):
+        HTMLParser.__init__(self)
+        self.body = ''
+        self.metadata = {}
+        self.settings = settings
+
+        self._data_buffer = ''
+
+        self._in_top_level = True
+        self._in_head = False
+        self._in_title = False
+        self._in_body = False
+        self._in_tags = False
+
+    def handle_starttag(self, tag, attrs):
+        if tag == 'head' and self._in_top_level:
+            self._in_top_level = False
+            self._in_head = True
+        elif tag == 'title' and self._in_head:
+            self._in_title = True
+            self._data_buffer = ''
+        elif tag == 'body' and self._in_top_level:
+            self._in_top_level = False
+            self._in_body = True
+            self._data_buffer = ''
+        elif tag == 'meta' and self._in_head:
+            self._handle_meta_tag(attrs)
+
+        elif self._in_body:
+            self._data_buffer += self.build_tag(tag, attrs, False)
+            
+    def handle_endtag(self, tag):
+        if tag == 'head':
+            if self._in_head:
+                self._in_head = False
+                self._in_top_level = True
+        elif tag == 'title':
+            self._in_title = False
+            self.metadata['title'] = self._data_buffer
+        elif tag == 'body':
+            self.body = self._data_buffer
+            self._in_body = False
+            self._in_top_level = True
+        elif self._in_body:
+            self._data_buffer += '</{}>'.format(cgi.escape(tag))
+
+    def handle_startendtag(self, tag, attrs):
+        if tag == 'meta' and self._in_head:
+            self._handle_meta_tag(attrs)
+        if self._in_body:
+            self._data_buffer += self.build_tag(tag, attrs, True)
+
+    def handle_comment(self, data):
+        if self._in_body and data.strip() == 'PELICAN_END_SUMMARY':
+            self.metadata['summary'] = self._data_buffer
+
+    def handle_data(self, data):
+        self._data_buffer += data
+
+    def build_tag(self, tag, attrs, close_tag):
+        result = '<{}'.format(cgi.escape(tag))
+        result += ''.join((' {}="{}"'.format(cgi.escape(k), cgi.escape(v)) for k,v in attrs))
+        if close_tag:
+            return result + ' />'
+        return result + '>'
+
+    def _handle_meta_tag(self, attrs):
+        name = self._attr_value(attrs, 'name')
+        contents = self._attr_value(attrs, 'contents', '')
+        if name == 'keywords':
+            if contents:
+                self.metadata['tags'] = [Tag(unicode(tag), self.settings) for tag in contents.split(',')]
+        elif name == 'date':
+            self.metadata['date'] = get_date(contents)
+        else:
+            self.metadata[name] = contents
+
+    @classmethod
+    def _attr_value(cls, attrs, name, default=None):
+        return next((x[1] for x in attrs if x[0] == name), default)
+
+class HTMLReader(Reader):
+    file_extensions = ['htm', 'html']
+    enabled = True
+
+    def read(self, filename):
+        """Parse content and metadata of markdown files"""
+        with open(filename) as content:
+            parser = PelicanHTMLParser(self.settings)
+            parser.feed(content)
+            parser.close()
+        return parser.body, parser.metadata
 
 
 _EXTENSIONS = {}

From c6f1d0aadaa5e1dd71ad2a6897169f9da4458c2a Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Mon, 11 Jun 2012 08:39:13 -0400
Subject: [PATCH 0730/2864] fix SUMMARY_MAX_LENGTH, document it, and test it

---
 docs/settings.rst      |  6 ++++++
 pelican/settings.py    |  2 +-
 tests/test_contents.py | 38 ++++++++++++++++++++++++++++++--------
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 85e9f0c3..a26c37dd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -90,6 +90,12 @@ Setting name (default value)                                            What doe
                                                                         index pages for collections of content e.g. tags and
                                                                         category index pages.
 `PAGINATED_DIRECT_TEMPLATES` (``('index',)``)                           Provides the direct templates that should be paginated.
+`SUMMARY_MAX_LENGTH` (``50``)                                           When creating a short summary of an article, this will 
+                                                                        be the default length in words of the text created.
+                                                                        This only applies if your content does not otherwise 
+                                                                        specify a summary. Setting to None will cause the summary 
+                                                                        to be a copy of the original content.
+                                                                        
 =====================================================================   =====================================================================
 
 .. [#] Default is the system locale.
diff --git a/pelican/settings.py b/pelican/settings.py
index a8c8bea4..d2a39cd9 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -68,7 +68,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'ARTICLE_PERMALINK_STRUCTURE': '',
                    'TYPOGRIFY': False,
                    'LESS_GENERATOR': False,
-                   'SUMARY_MAX_LENGTH': 50,
+                   'SUMMARY_MAX_LENGTH': 50,
                    }
 
 
diff --git a/tests/test_contents.py b/tests/test_contents.py
index c6ef29a8..e7c9ad01 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -4,6 +4,7 @@ from .support import unittest
 
 from pelican.contents import Page
 from pelican.settings import _DEFAULT_CONFIG
+from pelican.utils import truncate_html_words
 
 from jinja2.utils import generate_lorem_ipsum
 
@@ -48,6 +49,20 @@ class TestPage(unittest.TestCase):
         page = Page(**self.page_kwargs)
         self.assertEqual(page.summary, TEST_SUMMARY)
 
+    def test_summary_max_length(self):
+        """If a :SUMMARY_MAX_LENGTH: is set, and there is no other summary, generated summary
+           should not exceed the given length."""
+        page_kwargs = self._copy_page_kwargs()
+        settings = _DEFAULT_CONFIG.copy()
+        page_kwargs['settings'] = settings
+        del page_kwargs['metadata']['summary']
+        settings['SUMMARY_MAX_LENGTH'] = None
+        page = Page(**page_kwargs)
+        self.assertEqual(page.summary, TEST_CONTENT)
+        settings['SUMMARY_MAX_LENGTH'] = 10
+        page = Page(**page_kwargs)
+        self.assertEqual(page.summary, truncate_html_words(TEST_CONTENT, 10))
+
     def test_slug(self):
         """If a title is given, it should be used to generate the slug."""
         page = Page(**self.page_kwargs)
@@ -83,14 +98,9 @@ class TestPage(unittest.TestCase):
         from datetime import datetime
         from sys import platform
         dt = datetime(2015, 9, 13)
-        # make a deep copy of page_kawgs
-        page_kwargs = dict([(key, self.page_kwargs[key]) for key in
-                            self.page_kwargs])
-        for key in page_kwargs:
-            if not isinstance(page_kwargs[key], dict):
-                break
-            page_kwargs[key] = dict([(subkey, page_kwargs[key][subkey])
-                                     for subkey in page_kwargs[key]])
+
+        page_kwargs = self._copy_page_kwargs()
+
         # set its date to dt
         page_kwargs['metadata']['date'] = dt
         page = Page(**page_kwargs)
@@ -124,3 +134,15 @@ class TestPage(unittest.TestCase):
             # Until we find some other method to test this functionality, we
             # will simply skip this test.
             unittest.skip("There is no locale %s in this system." % locale)
+
+    def _copy_page_kwargs(self):
+        # make a deep copy of page_kwargs
+        page_kwargs = dict([(key, self.page_kwargs[key]) for key in
+                            self.page_kwargs])
+        for key in page_kwargs:
+            if not isinstance(page_kwargs[key], dict):
+                break
+            page_kwargs[key] = dict([(subkey, page_kwargs[key][subkey])
+                                     for subkey in page_kwargs[key]])
+
+        return page_kwargs

From 1c708a70ba7f806ca2cf373b1f3c47d74c52c086 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Mon, 11 Jun 2012 09:00:36 -0400
Subject: [PATCH 0731/2864] Revert "better html parser"

This reverts commit c6d1de14f3db63705b35fbe3fd5db3701ea962a4.
---
 pelican/readers.py | 101 +--------------------------------------------
 1 file changed, 2 insertions(+), 99 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 83cb7e3b..83565918 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -13,11 +13,8 @@ try:
     from markdown import Markdown
 except ImportError:
     Markdown = False  # NOQA
-import cgi
-from HTMLParser import HTMLParser
 import re
 
-
 from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, open
 
@@ -129,12 +126,13 @@ class MarkdownReader(Reader):
             metadata[name] = self.process_metadata(name, value[0])
         return content, metadata
 
-"""
+
 class HtmlReader(Reader):
     file_extensions = ['html', 'htm']
     _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
 
     def read(self, filename):
+        """Parse content and metadata of (x)HTML files"""
         with open(filename) as content:
             metadata = {'title': 'unnamed'}
             for i in self._re.findall(content):
@@ -144,101 +142,6 @@ class HtmlReader(Reader):
                 metadata[name] = self.process_metadata(name, value)
 
             return content, metadata
-"""
-
-class PelicanHTMLParser(HTMLParser):
-    def __init__(self, settings):
-        HTMLParser.__init__(self)
-        self.body = ''
-        self.metadata = {}
-        self.settings = settings
-
-        self._data_buffer = ''
-
-        self._in_top_level = True
-        self._in_head = False
-        self._in_title = False
-        self._in_body = False
-        self._in_tags = False
-
-    def handle_starttag(self, tag, attrs):
-        if tag == 'head' and self._in_top_level:
-            self._in_top_level = False
-            self._in_head = True
-        elif tag == 'title' and self._in_head:
-            self._in_title = True
-            self._data_buffer = ''
-        elif tag == 'body' and self._in_top_level:
-            self._in_top_level = False
-            self._in_body = True
-            self._data_buffer = ''
-        elif tag == 'meta' and self._in_head:
-            self._handle_meta_tag(attrs)
-
-        elif self._in_body:
-            self._data_buffer += self.build_tag(tag, attrs, False)
-            
-    def handle_endtag(self, tag):
-        if tag == 'head':
-            if self._in_head:
-                self._in_head = False
-                self._in_top_level = True
-        elif tag == 'title':
-            self._in_title = False
-            self.metadata['title'] = self._data_buffer
-        elif tag == 'body':
-            self.body = self._data_buffer
-            self._in_body = False
-            self._in_top_level = True
-        elif self._in_body:
-            self._data_buffer += '</{}>'.format(cgi.escape(tag))
-
-    def handle_startendtag(self, tag, attrs):
-        if tag == 'meta' and self._in_head:
-            self._handle_meta_tag(attrs)
-        if self._in_body:
-            self._data_buffer += self.build_tag(tag, attrs, True)
-
-    def handle_comment(self, data):
-        if self._in_body and data.strip() == 'PELICAN_END_SUMMARY':
-            self.metadata['summary'] = self._data_buffer
-
-    def handle_data(self, data):
-        self._data_buffer += data
-
-    def build_tag(self, tag, attrs, close_tag):
-        result = '<{}'.format(cgi.escape(tag))
-        result += ''.join((' {}="{}"'.format(cgi.escape(k), cgi.escape(v)) for k,v in attrs))
-        if close_tag:
-            return result + ' />'
-        return result + '>'
-
-    def _handle_meta_tag(self, attrs):
-        name = self._attr_value(attrs, 'name')
-        contents = self._attr_value(attrs, 'contents', '')
-        if name == 'keywords':
-            if contents:
-                self.metadata['tags'] = [Tag(unicode(tag), self.settings) for tag in contents.split(',')]
-        elif name == 'date':
-            self.metadata['date'] = get_date(contents)
-        else:
-            self.metadata[name] = contents
-
-    @classmethod
-    def _attr_value(cls, attrs, name, default=None):
-        return next((x[1] for x in attrs if x[0] == name), default)
-
-class HTMLReader(Reader):
-    file_extensions = ['htm', 'html']
-    enabled = True
-
-    def read(self, filename):
-        """Parse content and metadata of markdown files"""
-        with open(filename) as content:
-            parser = PelicanHTMLParser(self.settings)
-            parser.feed(content)
-            parser.close()
-        return parser.body, parser.metadata
 
 
 _EXTENSIONS = {}

From d9dba3864486dd3949e69976619bc993aaee387a Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Mon, 11 Jun 2012 09:00:57 -0400
Subject: [PATCH 0732/2864] Revert "turn utils.open into actual context manager
 so as to better handle encoding warnings"

This reverts commit 876c7f509392d6c245a81e26fd5fd2a81851281f.
---
 pelican/utils.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index db15a343..d4e34842 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import contextlib
 import os
 import re
 import pytz
@@ -33,10 +32,10 @@ def get_date(string):
             pass
     raise ValueError("'%s' is not a valid date" % string)
 
-@contextlib.contextmanager
+
 def open(filename):
     """Open a file and return it's content"""
-    yield _open(filename, encoding='utf-8').read()
+    return _open(filename, encoding='utf-8').read()
 
 
 def slugify(value):

From 336d6fd40740d75638f4064a04fb00e83526f2a8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Mon, 11 Jun 2012 12:27:01 -0700
Subject: [PATCH 0733/2864] Getting Started documentation improvements

Expanded installation instructions, added Upgrading section, updated
link to Pip installer, and other minor improvements.
---
 docs/getting_started.rst | 61 +++++++++++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 14 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 313b44e1..8accf658 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -4,17 +4,48 @@ Getting started
 Installing
 ==========
 
-You're ready? Let's go! You can install Pelican via several different methods. The simplest is via `pip <http://pip.openplans.org/>`_::
+You're ready? Let's go! You can install Pelican via several different methods.
+The simplest is via `pip <http://www.pip-installer.org/>`_::
 
     $ pip install pelican
 
-If you have the project source, you can install Pelican using the distutils 
-method. I recommend doing so in a virtualenv::
+If you don't have pip installed, an alternative method is easy_install::
 
-    $ virtualenv pelican_venv
-    $ source bin/activate
+    $ easy_install pelican
+
+While the above is the simplest method, the recommended approach is to create
+a virtual environment for Pelican via `virtualenv <http://www.virtualenv.org/>`_
+and `virtualenvwrapper <http://www.doughellmann.com/projects/virtualenvwrapper/>`_
+before installing Pelican::
+
+    $ pip install virtualenvwrapper
+    $ mkvirtualenv pelican
+
+Once the virtual environment has been created and activated, Pelican can be
+be installed via pip or easy_install as noted above. Alternatively, if you
+have the project source, you can install Pelican using the distutils 
+method::
+
+    $ cd path-to-Pelican-source
     $ python setup.py install
 
+If you have Git installed and prefer to install the latest bleeding-edge
+version of Pelican rather than a stable release, use the following command::
+
+    $ pip install -e git://github.com/ametaireau/pelican#egg=pelican
+
+Upgrading
+---------
+
+If you installed a stable Pelican release via pip or easy_install and wish to
+upgrade to the latest stable release, you can do so by adding `--upgrade` to
+the relevant command. For pip, that would be::
+
+    $ pip install --upgrade pelican
+
+If you installed Pelican via distutils or the bleeding-edge method, simply
+perform the same step to install the most recent version.
+
 Dependencies
 ------------
 
@@ -54,10 +85,9 @@ following syntax (give your file the `.rst` extension)::
 
 
 You can also use Markdown syntax (with a file ending in `.md`).
-Markdown generation will not work until you explicitly install the `markdown`
-distribution. You can do so on a normal system using `pip install markdown`
-
-::
+Markdown generation will not work until you explicitly install the `Markdown`
+package, which can be done via `pip install Markdown`. Metadata syntax for
+Markdown posts should follow this pattern::
 
     Date: 2010-12-03
     Title: My super title
@@ -94,7 +124,7 @@ Kickstart a blog
 ----------------
 
 You also can use the `pelican-quickstart` script to start a new blog in
-seconds, by just answering few questions. Just run `pelican-quickstart` and
+seconds by just answering a few questions. Just run `pelican-quickstart` and
 you're done! (Added in Pelican 3.0)
 
 Pages
@@ -175,12 +205,12 @@ For Markdown, format your code blocks thusly::
 The specified identifier should be one that appears on the 
 `list of available lexers <http://pygments.org/docs/lexers/>`_.
 
-Autoreload
-----------
+Auto-reload
+-----------
 
 It's possible to tell Pelican to watch for your modifications, instead of
-manually launching it every time you want to see your changes. To enable this,
-run the `pelican` command with the `-r` or `--autoreload` options.
+manually re-running it every time you want to see your changes. To enable this,
+run the `pelican` command with the `-r` or `--autoreload` option.
 
 Publishing drafts
 -----------------
@@ -203,3 +233,6 @@ You can either use your browser to open the files on your disk::
 Or run a simple web server using Python::
 
     cd output && python -m SimpleHTTPServer
+
+(Tip: If using the latter method in conjunction with the auto-reload feature,
+ensure that `DELETE_OUTPUT_DIRECTORY` is set to `False` in your settings file.)

From 8c375f016f48a67e147334bb72fee3f717b4d4b8 Mon Sep 17 00:00:00 2001
From: Michael Guntsche <mike@it-loops.com>
Date: Wed, 13 Jun 2012 21:54:40 +0200
Subject: [PATCH 0734/2864] Add template files to MANIFEST.in

Commit 7c53cc8955b8f38d put the templates in a separate directory.
As a result setuptools did not include them any longer.
---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index a092ecd0..13ea58a1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include *.rst
 global-include *.py
-recursive-include pelican *.html *.css *png
+recursive-include pelican *.html *.css *png *.in
 include LICENSE

From ddb345897e41f7fc11a345381ee6392737839a75 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Thu, 14 Jun 2012 10:29:44 -0400
Subject: [PATCH 0735/2864] Add gitorious icon to default theme.

See ametaireau/pelican-themes#38 and ametaireau/pelican-themes#39 for
references.
---
 pelican/themes/notmyidea/static/css/main.css     |   1 +
 .../notmyidea/static/images/icons/gitorious.png  | Bin 0 -> 3675 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 pelican/themes/notmyidea/static/images/icons/gitorious.png

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 92905076..dce9e247 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -312,6 +312,7 @@ img.left, figure.left {float: right; margin: 0 0 2em 2em;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.org');}
 
 /*
 	About
diff --git a/pelican/themes/notmyidea/static/images/icons/gitorious.png b/pelican/themes/notmyidea/static/images/icons/gitorious.png
new file mode 100644
index 0000000000000000000000000000000000000000..6485f5ecc5f6047a052d9adfb686ee154e7233af
GIT binary patch
literal 3675
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
BhXDWp

literal 0
HcmV?d00001


From 44cadf7c1f4c3026f419bf76a638ca77003aabee Mon Sep 17 00:00:00 2001
From: asselinpaul <pa.asselin@gmail.com>
Date: Thu, 14 Jun 2012 23:04:23 +0200
Subject: [PATCH 0736/2864] added GoSquared support

GoSquared(analytics) support added in default themes and documentation
(in French and English)
---
 README.rst                                        |  2 +-
 docs/fr/configuration.rst                         |  3 +++
 docs/settings.rst                                 |  1 +
 pelican/themes/notmyidea/templates/gosquared.html | 14 ++++++++++++++
 pelican/themes/simple/templates/gosquared.html    | 14 ++++++++++++++
 5 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pelican/themes/notmyidea/templates/gosquared.html
 create mode 100644 pelican/themes/simple/templates/gosquared.html

diff --git a/README.rst b/README.rst
index 5012bb9c..4f4edb61 100644
--- a/README.rst
+++ b/README.rst
@@ -26,7 +26,7 @@ Pelican currently supports:
 * Atom/RSS feeds
 * Code syntax highlighting
 * Import from WordPress, Dotclear, or RSS feeds
-* Integration with external tools: Twitter, Google Analytics, etc. (optional)
+* Integration with external tools: Twitter, Google Analytics, GoSquared, etc. (optional)
 
 Have a look at `the documentation <http://pelican.notmyidea.org/en/latest/>`_ for
 more information.
diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
index 695a0b0e..fadaf258 100644
--- a/docs/fr/configuration.rst
+++ b/docs/fr/configuration.rst
@@ -98,6 +98,9 @@ GITHUB_URL :
 
 GOOGLE_ANALYTICS :
 	'UA-XXXX-YYYY' pour activer Google analytics ;
+	
+GOSQUARED_SITENAME :
+	'XXX-YYYYYY-X' pour activer GoSquared ;
 
 JINJA_EXTENSIONS :
 	Liste d'extension Jinja2 que vous souhaitez utiliser ;
diff --git a/docs/settings.rst b/docs/settings.rst
index b36c9953..416c22d4 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -398,6 +398,7 @@ Setting name              What does it do ?
 `GITHUB_URL`              Your GitHub URL (if you have one). It will then
                           use this information to create a GitHub ribbon.
 `GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate Google Analytics.
+`GOSQUARED_SITENAME`      'XXX-YYYYYY-X' to activate GoSquared.
 `MENUITEMS`               A list of tuples (Title, URL) for additional menu
                           items to appear at the beginning of the main menu.
 `PIWIK_URL`               URL to your Piwik server - without 'http://' at the
diff --git a/pelican/themes/notmyidea/templates/gosquared.html b/pelican/themes/notmyidea/templates/gosquared.html
new file mode 100644
index 00000000..f47efcf4
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/gosquared.html
@@ -0,0 +1,14 @@
+{% if GOSQUARED_SITENAME %}
+<script type="text/javascript">
+    var GoSquared={};
+    GoSquared.acct = "{{ GOSQUARED_SITENAME }}";
+    (function(w){
+        function gs(){
+            w._gstc_lt=+(new Date); var d=document;
+            var g = d.createElement("script"); g.type = "text/javascript"; g.async = true; g.src = "//d1l6p2sc9645hc.cloudfront.net/tracker.js";
+            var s = d.getElementsByTagName("script")[0]; s.parentNode.insertBefore(g, s);
+        }
+        w.addEventListener?w.addEventListener("load",gs,false):w.attachEvent("onload",gs);
+    })(window);
+</script>
+{% endif %}
diff --git a/pelican/themes/simple/templates/gosquared.html b/pelican/themes/simple/templates/gosquared.html
new file mode 100644
index 00000000..f47efcf4
--- /dev/null
+++ b/pelican/themes/simple/templates/gosquared.html
@@ -0,0 +1,14 @@
+{% if GOSQUARED_SITENAME %}
+<script type="text/javascript">
+    var GoSquared={};
+    GoSquared.acct = "{{ GOSQUARED_SITENAME }}";
+    (function(w){
+        function gs(){
+            w._gstc_lt=+(new Date); var d=document;
+            var g = d.createElement("script"); g.type = "text/javascript"; g.async = true; g.src = "//d1l6p2sc9645hc.cloudfront.net/tracker.js";
+            var s = d.getElementsByTagName("script")[0]; s.parentNode.insertBefore(g, s);
+        }
+        w.addEventListener?w.addEventListener("load",gs,false):w.attachEvent("onload",gs);
+    })(window);
+</script>
+{% endif %}

From d1dfcdafc229b788bf48f08964836ff17eace4f0 Mon Sep 17 00:00:00 2001
From: asselinpaul <pa.asselin@gmail.com>
Date: Thu, 14 Jun 2012 23:32:23 +0200
Subject: [PATCH 0737/2864] updated

remove GoSqaured from README and template file from the notmyidea theme.
---
 README.rst                                       |   2 +-
 pelican/themes/notmyidea/templates/.DS_Store     | Bin 0 -> 6148 bytes
 .../themes/notmyidea/templates/gosquared.html    |  14 --------------
 3 files changed, 1 insertion(+), 15 deletions(-)
 create mode 100644 pelican/themes/notmyidea/templates/.DS_Store
 delete mode 100644 pelican/themes/notmyidea/templates/gosquared.html

diff --git a/README.rst b/README.rst
index 4f4edb61..5012bb9c 100644
--- a/README.rst
+++ b/README.rst
@@ -26,7 +26,7 @@ Pelican currently supports:
 * Atom/RSS feeds
 * Code syntax highlighting
 * Import from WordPress, Dotclear, or RSS feeds
-* Integration with external tools: Twitter, Google Analytics, GoSquared, etc. (optional)
+* Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
 Have a look at `the documentation <http://pelican.notmyidea.org/en/latest/>`_ for
 more information.
diff --git a/pelican/themes/notmyidea/templates/.DS_Store b/pelican/themes/notmyidea/templates/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/templates/gosquared.html b/pelican/themes/notmyidea/templates/gosquared.html
deleted file mode 100644
index f47efcf4..00000000
--- a/pelican/themes/notmyidea/templates/gosquared.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% if GOSQUARED_SITENAME %}
-<script type="text/javascript">
-    var GoSquared={};
-    GoSquared.acct = "{{ GOSQUARED_SITENAME }}";
-    (function(w){
-        function gs(){
-            w._gstc_lt=+(new Date); var d=document;
-            var g = d.createElement("script"); g.type = "text/javascript"; g.async = true; g.src = "//d1l6p2sc9645hc.cloudfront.net/tracker.js";
-            var s = d.getElementsByTagName("script")[0]; s.parentNode.insertBefore(g, s);
-        }
-        w.addEventListener?w.addEventListener("load",gs,false):w.attachEvent("onload",gs);
-    })(window);
-</script>
-{% endif %}

From cc1988fbda5f191768b9d20ef0f942b572d0bb39 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Thu, 14 Jun 2012 23:08:34 -0400
Subject: [PATCH 0738/2864] new HTMLReader

---
 pelican/readers.py                            | 186 ++++++++----------
 tests/content/article_with_keywords.html      |   6 +
 tests/content/article_with_metadata.html      |  15 ++
 .../article_with_uppercase_metadata.html      |   6 +
 tests/test_readers.py                         |  38 ++++
 5 files changed, 150 insertions(+), 101 deletions(-)
 create mode 100644 tests/content/article_with_keywords.html
 create mode 100644 tests/content/article_with_metadata.html
 create mode 100644 tests/content/article_with_uppercase_metadata.html

diff --git a/pelican/readers.py b/pelican/readers.py
index 83cb7e3b..9ce3e3c0 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -129,117 +129,101 @@ class MarkdownReader(Reader):
             metadata[name] = self.process_metadata(name, value[0])
         return content, metadata
 
-"""
-class HtmlReader(Reader):
-    file_extensions = ['html', 'htm']
-    _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
-
-    def read(self, filename):
-        with open(filename) as content:
-            metadata = {'title': 'unnamed'}
-            for i in self._re.findall(content):
-                key = i.split(':')[0][5:].strip()
-                value = i.split(':')[-1][:-3].strip()
-                name = key.lower()
-                metadata[name] = self.process_metadata(name, value)
-
-            return content, metadata
-"""
-
-class PelicanHTMLParser(HTMLParser):
-    def __init__(self, settings):
-        HTMLParser.__init__(self)
-        self.body = ''
-        self.metadata = {}
-        self.settings = settings
-
-        self._data_buffer = ''
-
-        self._in_top_level = True
-        self._in_head = False
-        self._in_title = False
-        self._in_body = False
-        self._in_tags = False
-
-    def handle_starttag(self, tag, attrs):
-        if tag == 'head' and self._in_top_level:
-            self._in_top_level = False
-            self._in_head = True
-        elif tag == 'title' and self._in_head:
-            self._in_title = True
-            self._data_buffer = ''
-        elif tag == 'body' and self._in_top_level:
-            self._in_top_level = False
-            self._in_body = True
-            self._data_buffer = ''
-        elif tag == 'meta' and self._in_head:
-            self._handle_meta_tag(attrs)
-
-        elif self._in_body:
-            self._data_buffer += self.build_tag(tag, attrs, False)
-            
-    def handle_endtag(self, tag):
-        if tag == 'head':
-            if self._in_head:
-                self._in_head = False
-                self._in_top_level = True
-        elif tag == 'title':
-            self._in_title = False
-            self.metadata['title'] = self._data_buffer
-        elif tag == 'body':
-            self.body = self._data_buffer
-            self._in_body = False
-            self._in_top_level = True
-        elif self._in_body:
-            self._data_buffer += '</{}>'.format(cgi.escape(tag))
-
-    def handle_startendtag(self, tag, attrs):
-        if tag == 'meta' and self._in_head:
-            self._handle_meta_tag(attrs)
-        if self._in_body:
-            self._data_buffer += self.build_tag(tag, attrs, True)
-
-    def handle_comment(self, data):
-        if self._in_body and data.strip() == 'PELICAN_END_SUMMARY':
-            self.metadata['summary'] = self._data_buffer
-
-    def handle_data(self, data):
-        self._data_buffer += data
-
-    def build_tag(self, tag, attrs, close_tag):
-        result = '<{}'.format(cgi.escape(tag))
-        result += ''.join((' {}="{}"'.format(cgi.escape(k), cgi.escape(v)) for k,v in attrs))
-        if close_tag:
-            return result + ' />'
-        return result + '>'
-
-    def _handle_meta_tag(self, attrs):
-        name = self._attr_value(attrs, 'name')
-        contents = self._attr_value(attrs, 'contents', '')
-        if name == 'keywords':
-            if contents:
-                self.metadata['tags'] = [Tag(unicode(tag), self.settings) for tag in contents.split(',')]
-        elif name == 'date':
-            self.metadata['date'] = get_date(contents)
-        else:
-            self.metadata[name] = contents
-
-    @classmethod
-    def _attr_value(cls, attrs, name, default=None):
-        return next((x[1] for x in attrs if x[0] == name), default)
-
 class HTMLReader(Reader):
+    """Parses HTML files as input, looking for meta, title, and body tags"""
     file_extensions = ['htm', 'html']
     enabled = True
 
+    class _HTMLParser(HTMLParser):
+        def __init__(self, settings):
+            HTMLParser.__init__(self)
+            self.body = ''
+            self.metadata = {}
+            self.settings = settings
+
+            self._data_buffer = ''
+
+            self._in_top_level = True
+            self._in_head = False
+            self._in_title = False
+            self._in_body = False
+            self._in_tags = False
+
+        def handle_starttag(self, tag, attrs):
+            if tag == 'head' and self._in_top_level:
+                self._in_top_level = False
+                self._in_head = True
+            elif tag == 'title' and self._in_head:
+                self._in_title = True
+                self._data_buffer = ''
+            elif tag == 'body' and self._in_top_level:
+                self._in_top_level = False
+                self._in_body = True
+                self._data_buffer = ''
+            elif tag == 'meta' and self._in_head:
+                self._handle_meta_tag(attrs)
+
+            elif self._in_body:
+                self._data_buffer += self.build_tag(tag, attrs, False)
+
+        def handle_endtag(self, tag):
+            if tag == 'head':
+                if self._in_head:
+                    self._in_head = False
+                    self._in_top_level = True
+            elif tag == 'title':
+                self._in_title = False
+                self.metadata['title'] = self._data_buffer
+            elif tag == 'body':
+                self.body = self._data_buffer
+                self._in_body = False
+                self._in_top_level = True
+            elif self._in_body:
+                self._data_buffer += '</{}>'.format(cgi.escape(tag))
+
+        def handle_startendtag(self, tag, attrs):
+            if tag == 'meta' and self._in_head:
+                self._handle_meta_tag(attrs)
+            if self._in_body:
+                self._data_buffer += self.build_tag(tag, attrs, True)
+
+        def handle_comment(self, data):
+            if self._in_body and data.strip() == 'PELICAN_END_SUMMARY':
+                self.metadata['summary'] = self._data_buffer
+
+        def handle_data(self, data):
+            self._data_buffer += data
+
+        def build_tag(self, tag, attrs, close_tag):
+            result = '<{}'.format(cgi.escape(tag))
+            result += ''.join((' {}="{}"'.format(cgi.escape(k), cgi.escape(v)) for k,v in attrs))
+            if close_tag:
+                return result + ' />'
+            return result + '>'
+
+        def _handle_meta_tag(self, attrs):
+            name = self._attr_value(attrs, 'name').lower()
+            contents = self._attr_value(attrs, 'contents', '')
+
+            if name == 'keywords':
+                name = 'tags'
+            self.metadata[name] = contents
+
+        @classmethod
+        def _attr_value(cls, attrs, name, default=None):
+            return next((x[1] for x in attrs if x[0] == name), default)
+
     def read(self, filename):
         """Parse content and metadata of markdown files"""
         with open(filename) as content:
-            parser = PelicanHTMLParser(self.settings)
+            parser = self._HTMLParser(self.settings)
             parser.feed(content)
             parser.close()
-        return parser.body, parser.metadata
 
+        metadata = {}
+        for k in parser.metadata:
+            metadata[k] = self.process_metadata(k, parser.metadata[k])
+        return parser.body, metadata
 
 _EXTENSIONS = {}
 
diff --git a/tests/content/article_with_keywords.html b/tests/content/article_with_keywords.html
new file mode 100644
index 00000000..c869f514
--- /dev/null
+++ b/tests/content/article_with_keywords.html
@@ -0,0 +1,6 @@
+<html>
+    <head>
+        <title>This is a super article !</title>
+        <meta name="keywords" contents="foo, bar, foobar" />
+    </head>
+</html>
diff --git a/tests/content/article_with_metadata.html b/tests/content/article_with_metadata.html
new file mode 100644
index 00000000..2bd77241
--- /dev/null
+++ b/tests/content/article_with_metadata.html
@@ -0,0 +1,15 @@
+<html>
+    <head>
+        <title>This is a super article !</title>
+        <meta name="tags" contents="foo, bar, foobar" />
+        <meta name="date" contents="2010-12-02 10:14" />
+        <meta name="category" contents="yeah" />
+        <meta name="author" contents="Alexis Métaireau" />
+        <meta name="custom_field" contents="http://notmyidea.org" />
+    </head>
+    <body>
+        Multi-line metadata should be supported
+        as well as <strong>inline markup</strong>.
+        <!-- PELICAN_END_SUMMARY -->
+    </body>
+</html>
diff --git a/tests/content/article_with_uppercase_metadata.html b/tests/content/article_with_uppercase_metadata.html
new file mode 100644
index 00000000..4fe5a9ee
--- /dev/null
+++ b/tests/content/article_with_uppercase_metadata.html
@@ -0,0 +1,6 @@
+<html>
+    <head>
+        <title>This is a super article !</title>
+        <meta name="Category" contents="Yeah" />
+    </head>
+</html>
diff --git a/tests/test_readers.py b/tests/test_readers.py
index a921cfc2..52887068 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -86,3 +86,41 @@ class MdReaderTest(unittest.TestCase):
                 "<p>This is another markdown test file.  Uses the mkd extension.</p>"
         
         self.assertEqual(content, expected)
+
+class HTMLReaderTest(unittest.TestCase):
+
+    def test_article_with_metadata(self):
+        reader = readers.HTMLReader({})
+        content, metadata = reader.read(_filename('article_with_metadata.html'))
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'title': 'This is a super article !',
+            'summary': u'''
+        Multi-line metadata should be supported
+        as well as <strong>inline markup</strong>.
+        ''',
+            'date': datetime.datetime(2010, 12, 2, 10, 14),
+            'tags': ['foo', 'bar', 'foobar'],
+            'custom_field': 'http://notmyidea.org',
+        }
+
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
+
+    def test_article_with_keywords(self):
+        reader = readers.HTMLReader({})
+        content, metadata = reader.read(_filename('article_with_keywords.html'))
+        expected = {
+            'tags': ['foo', 'bar', 'foobar'],
+        }
+
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
+
+    def test_article_metadata_key_lowercase(self):
+        """Keys of metadata should be lowercase."""
+        reader = readers.HTMLReader({})
+        content, metadata = reader.read(_filename('article_with_uppercase_metadata.html'))
+        self.assertIn('category', metadata, "Key should be lowercase.")
+        self.assertEquals('Yeah', metadata.get('category'), "Value keeps cases.")

From 0373c15e430e168928b645be3b9513f093b97403 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Thu, 14 Jun 2012 23:16:27 -0400
Subject: [PATCH 0739/2864] include html comments properly in reader

---
 pelican/readers.py                       |  2 ++
 tests/content/article_with_comments.html |  7 +++++
 tests/test_readers.py                    | 36 ++++++++++++++++++------
 3 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 tests/content/article_with_comments.html

diff --git a/pelican/readers.py b/pelican/readers.py
index 9ce3e3c0..e3d0e0dd 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -190,6 +190,8 @@ class HTMLReader(Reader):
         def handle_comment(self, data):
             if self._in_body and data.strip() == 'PELICAN_END_SUMMARY':
                 self.metadata['summary'] = self._data_buffer
+            else:
+                self._data_buffer += '<!--{}-->'.format(data)
 
         def handle_data(self, data):
             self._data_buffer += data
diff --git a/tests/content/article_with_comments.html b/tests/content/article_with_comments.html
new file mode 100644
index 00000000..f222682d
--- /dev/null
+++ b/tests/content/article_with_comments.html
@@ -0,0 +1,7 @@
+<html>
+    <body>
+        Summary comment is not included.
+        <!-- PELICAN_END_SUMMARY -->
+        <!--  But this comment is (including extra whitespace)    -->
+    </body>
+</html>
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 52887068..b3e30bfc 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -88,6 +88,33 @@ class MdReaderTest(unittest.TestCase):
         self.assertEqual(content, expected)
 
 class HTMLReaderTest(unittest.TestCase):
+    def test_article_with_comments(self):
+        reader = readers.HTMLReader({})
+        content, metadata = reader.read(_filename('article_with_comments.html'))
+        expected = {
+            'summary': '''
+        Summary comment is not included.
+        ''',
+        }
+
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
+
+        self.assertEquals('''
+        Summary comment is not included.
+        
+        <!--  But this comment is (including extra whitespace)    -->
+    ''', content)
+
+    def test_article_with_keywords(self):
+        reader = readers.HTMLReader({})
+        content, metadata = reader.read(_filename('article_with_keywords.html'))
+        expected = {
+            'tags': ['foo', 'bar', 'foobar'],
+        }
+
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
 
     def test_article_with_metadata(self):
         reader = readers.HTMLReader({})
@@ -108,15 +135,6 @@ class HTMLReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEquals(value, metadata[key], key)
 
-    def test_article_with_keywords(self):
-        reader = readers.HTMLReader({})
-        content, metadata = reader.read(_filename('article_with_keywords.html'))
-        expected = {
-            'tags': ['foo', 'bar', 'foobar'],
-        }
-
-        for key, value in expected.items():
-            self.assertEquals(value, metadata[key], key)
 
     def test_article_metadata_key_lowercase(self):
         """Keys of metadata should be lowercase."""

From c461c6435df87bb0407d3459719e3278ffb5d55c Mon Sep 17 00:00:00 2001
From: Michael Guntsche <mike@it-loops.com>
Date: Sat, 16 Jun 2012 19:53:53 +0200
Subject: [PATCH 0740/2864] Fix HTML5 conformance of the notmyidea template

The W3C validator complained that the pagination <p> was inside an <ol>.
So just move it out of there.
---
 pelican/themes/notmyidea/templates/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index de607152..8752a6b6 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -41,12 +41,12 @@
                 </div><!-- /.entry-content -->
             </article></li>
         {% endif %}
-        {% if loop.last and (articles_page.has_previous() 
-           or not articles_page.has_previous() and loop.length > 1) %}
-            {% include 'pagination.html' %}
-        {% endif %}
         {% if loop.last %}
             </ol><!-- /#posts-list -->
+            {% if loop.last and (articles_page.has_previous() 
+            or not articles_page.has_previous() and loop.length > 1) %}
+                {% include 'pagination.html' %}
+            {% endif %}
             </section><!-- /#content -->
         {% endif %}
     {% endfor %}

From 083f302b194eaeedd76d65b96120f42f54112c22 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Sat, 16 Jun 2012 11:23:55 -0700
Subject: [PATCH 0741/2864] Remove errant .DS_Store and add to .gitignore

---
 .gitignore                                   |   1 +
 pelican/themes/notmyidea/templates/.DS_Store | Bin 6148 -> 0 bytes
 2 files changed, 1 insertion(+)
 delete mode 100644 pelican/themes/notmyidea/templates/.DS_Store

diff --git a/.gitignore b/.gitignore
index 4029b327..9274ba2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .*.swp
 .*.swo
 *.pyc
+.DS_Store
 docs/_build
 docs/fr/_build
 build
diff --git a/pelican/themes/notmyidea/templates/.DS_Store b/pelican/themes/notmyidea/templates/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I


From c608d39aa40b8304f4e2e241564796201e582da4 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Wed, 20 Jun 2012 19:52:17 -0400
Subject: [PATCH 0742/2864] re-import htmlparser

---
 pelican/readers.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index 870c11c8..1916fa1e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -15,6 +15,8 @@ except ImportError:
     Markdown = False  # NOQA
 import re
 
+from htmlparser import HTMLParser
+
 from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, open
 

From caa4442abb145d419a3120c7339ad7ecf91ac56c Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Wed, 20 Jun 2012 19:59:32 -0400
Subject: [PATCH 0743/2864] re-import cgi. properly turn utils.open into a
 context manager

---
 pelican/readers.py | 3 ++-
 pelican/utils.py   | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 1916fa1e..d05ab40f 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -15,7 +15,8 @@ except ImportError:
     Markdown = False  # NOQA
 import re
 
-from htmlparser import HTMLParser
+import cgi
+from HTMLParser import HTMLParser
 
 from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, open
diff --git a/pelican/utils.py b/pelican/utils.py
index 0940bf72..088a8faa 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -34,10 +34,15 @@ def get_date(string):
     raise ValueError("'%s' is not a valid date" % string)
 
 
-def open(filename):
+class open(object):
     """Open a file and return it's content"""
-    return _open(filename, encoding='utf-8').read()
+    def __init__(self, filename):
+        self.filename = filename
+    def __enter__(self):
+        return _open(self.filename, encoding='utf-8').read()
 
+    def __exit__(self, exc_type, exc_value, traceback):
+        pass
 
 def slugify(value):
     """

From 56800a1d43ff9e07659d0f5ad570a9004d44cd74 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Wed, 20 Jun 2012 20:02:41 -0400
Subject: [PATCH 0744/2864] fix failing test with new open context manager

---
 pelican/readers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index d05ab40f..1d06bd6d 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -119,9 +119,9 @@ class MarkdownReader(Reader):
 
     def read(self, filename):
         """Parse content and metadata of markdown files"""
-        text = open(filename)
-        md = Markdown(extensions=set(self.extensions + ['meta']))
-        content = md.convert(text)
+        with open(filename) as text:
+            md = Markdown(extensions=set(self.extensions + ['meta']))
+            content = md.convert(text)
 
         metadata = {}
         for name, value in md.Meta.items():

From c0578eb9ab77c7be4a045f58a7844222ccbe6b95 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Wed, 20 Jun 2012 23:19:06 -0400
Subject: [PATCH 0745/2864] handle escaped chars in html properly

---
 pelican/readers.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index 1d06bd6d..08ef4cf8 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -196,6 +196,12 @@ class HTMLReader(Reader):
         def handle_data(self, data):
             self._data_buffer += data
 
+        def handle_entityref(self, data):
+            self._data_buffer += '&{};'.format(data)
+
+        def handle_charref(self, data):
+            self._data_buffer += '&{};'.format(data)
+            
         def build_tag(self, tag, attrs, close_tag):
             result = '<{}'.format(cgi.escape(tag))
             result += ''.join((' {}="{}"'.format(cgi.escape(k), cgi.escape(v)) for k,v in attrs))

From 036728a194695d463123c714954c25a3d6a826d5 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Thu, 21 Jun 2012 09:05:27 -0400
Subject: [PATCH 0746/2864] properly write out charref's

---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 08ef4cf8..93549d96 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -200,7 +200,7 @@ class HTMLReader(Reader):
             self._data_buffer += '&{};'.format(data)
 
         def handle_charref(self, data):
-            self._data_buffer += '&{};'.format(data)
+            self._data_buffer += '&#{};'.format(data)
             
         def build_tag(self, tag, attrs, close_tag):
             result = '<{}'.format(cgi.escape(tag))

From 847a6fe3cee7f05e36679d6b12fafaf58cfc1045 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Thu, 21 Jun 2012 09:12:38 -0400
Subject: [PATCH 0747/2864] change 'markdown' to HTML in the comments

---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 93549d96..9d200599 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -222,7 +222,7 @@ class HTMLReader(Reader):
             return next((x[1] for x in attrs if x[0] == name), default)
 
     def read(self, filename):
-        """Parse content and metadata of markdown files"""
+        """Parse content and metadata of HTML files"""
         with open(filename) as content:
             parser = self._HTMLParser(self.settings)
             parser.feed(content)

From 387e5c1ab987feaecfad6e6383e94130d6a085f8 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Mon, 25 Jun 2012 08:57:09 -0400
Subject: [PATCH 0748/2864] Add upgrade ability to pelican-themes. Fix typos.

I disliked having to do:

$ pelican-theme -r <theme-name> -i <theme-path>

So I modified install() to handle an upgrade of an existing theme. While doing
so, I noticed that in install() and symlink() the script would error with 'no a
directory' instead of 'not a directory'. So I fixed that for you as well.
---
 pelican/tools/pelican_themes.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 3d35bb5d..a7e0470f 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -48,9 +48,11 @@ def main():
 
 
     parser.add_argument('-i', '--install', dest='to_install', nargs='+', metavar="theme path",
-        help='The themes to install ')
+        help='The themes to install')
     parser.add_argument('-r', '--remove', dest='to_remove', nargs='+', metavar="theme name",
         help='The themes to remove')
+    parser.add_argument('-U', '--upgrade', dest='to_upgrade', nargs='+',
+            metavar="theme path", help='The themes to upgrade')
     parser.add_argument('-s', '--symlink', dest='to_symlink', nargs='+', metavar="theme path",
         help="Same as `--install', but create a symbolic link instead of copying the theme. Useful for theme development")
     parser.add_argument('-c', '--clean', dest='clean', action="store_true",
@@ -85,6 +87,13 @@ def main():
             for i in args.to_install:
                 install(i, v=args.verbose)
 
+        if args.to_upgrade:
+            if args.verbose:
+                print('Upgrading themes...')
+            
+            for i in args.to_upgrade:
+                install(i, v=args.verbose, u=True)
+
         if args.to_symlink:
             if args.verbose:
                 print('Linking themes...')
@@ -149,17 +158,21 @@ def remove(theme_name, v=False):
         err(target + ' : no such file or directory')
 
 
-def install(path, v=False):
+def install(path, v=False, u=False):
     """Installs a theme"""
     if not os.path.exists(path):
         err(path + ' : no such file or directory')
     elif not os.path.isdir(path):
-        err(path + ' : no a directory')
+        err(path + ' : not a directory')
     else:
         theme_name = os.path.basename(os.path.normpath(path))
         theme_path = os.path.join(_THEMES_PATH, theme_name)
-        if os.path.exists(theme_path):
+        exists = os.path.exists(theme_path)
+        if exists and not u:
             err(path + ' : already exists')
+        elif exists and u:
+            remove(theme_name, v)
+            install(path, v)
         else:
             if v:
                 print("Copying `{p}' to `{t}' ...".format(p=path, t=theme_path))
@@ -174,7 +187,7 @@ def symlink(path, v=False):
     if not os.path.exists(path):
         err(path + ' : no such file or directory')
     elif not os.path.isdir(path):
-        err(path + ' : no a directory')
+        err(path + ' : not a directory')
     else:
         theme_name = os.path.basename(os.path.normpath(path))
         theme_path = os.path.join(_THEMES_PATH, theme_name)

From 707536725da13df8ed7b167447039c738068b1c8 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Mon, 25 Jun 2012 11:43:12 -0400
Subject: [PATCH 0749/2864] Failed to commit some important changes.

---
 pelican/tools/pelican_themes.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index a7e0470f..6a021ecc 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -64,6 +64,9 @@ def main():
 
 
     args = parser.parse_args()
+    
+    to_install = args.to_install or args.to_upgrade
+    to_sym = args.to_symlink or args.clean
 
 
     if args.action:
@@ -71,8 +74,7 @@ def main():
             list_themes(args.verbose)
         elif args.action is 'path':
             print(_THEMES_PATH)
-    elif args.to_install or args.to_remove or args.to_symlink or args.clean:
-
+    elif to_install or args.to_remove or to_sym:
         if args.to_remove:
             if args.verbose:
                 print('Removing themes...')

From b2ff07d58cc0949cba20da5b4ceffe8979a6c479 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 26 Jun 2012 16:28:00 +0200
Subject: [PATCH 0750/2864] we need jinja >= 2.4

---
 dev_requirements.txt | 2 +-
 setup.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index ef1dbf31..ec3245d1 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,4 +1,4 @@
-Jinja2
+Jinja2>=2.4
 Pygments
 docutils
 feedgenerator
diff --git a/setup.py b/setup.py
index a8a8fbd9..1603746e 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'pytz', 'blinker']
+requires = ['feedgenerator', 'jinja2 >= 2.4', 'pygments', 'docutils', 'pytz', 'blinker']
 
 try:
     import argparse

From a0e46c91066bd8338d0e067875d6e040fec88477 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Tue, 26 Jun 2012 19:26:43 -0700
Subject: [PATCH 0751/2864] Add support for `status: hidden` in pages Resolves
 #380 If the status metadata is set to 'hidden' on a page it is translated and
 rendered but not linked anywhere in the site.

---
 docs/getting_started.rst              |  4 ++++
 pelican/generators.py                 | 17 +++++++++++++++--
 samples/content/pages/hidden_page.rst |  9 +++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 samples/content/pages/hidden_page.rst

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 8accf658..580c43a1 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -136,6 +136,10 @@ generate static pages.
 Then, use the `DISPLAY_PAGES_ON_MENU` setting, which will add all the pages to 
 the menu.
 
+If you want to exclude any pages from being linked to or listed in the menu
+then add a ``status: hidden`` attribute to it's metadata. This is useful for
+things like making error pages that fit the generated theme of your site.
+
 Importing an existing blog
 --------------------------
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 1ddc13c2..6790fcd6 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -357,10 +357,13 @@ class PagesGenerator(Generator):
 
     def __init__(self, *args, **kwargs):
         self.pages = []
+        self.hidden_pages = []
+        self.hidden_translations = []
         super(PagesGenerator, self).__init__(*args, **kwargs)
 
     def generate_context(self):
         all_pages = []
+        hidden_pages = []
         for f in self.get_files(
                 os.path.join(self.path, self.settings['PAGE_DIR']),
                 exclude=self.settings['PAGE_EXCLUDES']):
@@ -373,15 +376,25 @@ class PagesGenerator(Generator):
                         filename=f)
             if not is_valid_content(page, f):
                 continue
-            all_pages.append(page)
+            if page.status == "published":
+                all_pages.append(page)
+            elif page.status == "hidden":
+                hidden_pages.append(page)
+            else:
+                logger.warning(u"Unknown status %s for file %s, skipping it." %
+                               (repr(unicode.encode(article.status, 'utf-8')),
+                                repr(f)))
+
 
         self.pages, self.translations = process_translations(all_pages)
+        self.hidden_pages, self.hidden_translations = process_translations(hidden_pages)
 
         self._update_context(('pages', ))
         self.context['PAGES'] = self.pages
 
     def generate_output(self, writer):
-        for page in chain(self.translations, self.pages):
+        for page in chain(self.translations, self.pages,
+                            self.hidden_translations, self.hidden_pages):
             writer.write_file(page.save_as, self.get_template('page'),
                     self.context, page=page,
                     relative_urls=self.settings.get('RELATIVE_URLS'))
diff --git a/samples/content/pages/hidden_page.rst b/samples/content/pages/hidden_page.rst
new file mode 100644
index 00000000..ab8704ed
--- /dev/null
+++ b/samples/content/pages/hidden_page.rst
@@ -0,0 +1,9 @@
+This is a test hidden page
+##########################
+
+:category: test
+:status: hidden
+
+This is great for things like error(404) pages
+Anyone can see this page but it's not linked to anywhere!
+

From de251bc9998b1245238e69707c21a0dd5143756b Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Tue, 26 Jun 2012 19:51:48 -0700
Subject: [PATCH 0752/2864] Fixes typo in error message for bad status Bugfix
 #380 We want the bad status of page, not article.

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 6790fcd6..4e9312cc 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -382,7 +382,7 @@ class PagesGenerator(Generator):
                 hidden_pages.append(page)
             else:
                 logger.warning(u"Unknown status %s for file %s, skipping it." %
-                               (repr(unicode.encode(article.status, 'utf-8')),
+                               (repr(unicode.encode(page.status, 'utf-8')),
                                 repr(f)))
 
 

From c2993c4d4e19b1eceb3c367c38005dd89d04b53c Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 27 Jun 2012 07:02:25 -0700
Subject: [PATCH 0753/2864] Documentation typo

---
 docs/getting_started.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 580c43a1..96038c2a 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -137,7 +137,7 @@ Then, use the `DISPLAY_PAGES_ON_MENU` setting, which will add all the pages to
 the menu.
 
 If you want to exclude any pages from being linked to or listed in the menu
-then add a ``status: hidden`` attribute to it's metadata. This is useful for
+then add a ``status: hidden`` attribute to its metadata. This is useful for
 things like making error pages that fit the generated theme of your site.
 
 Importing an existing blog

From 9ad93d36a0cff5e684bff5f4ca9f6b7080ea42d7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Sun, 1 Jul 2012 10:52:39 -0700
Subject: [PATCH 0754/2864] Convert code in docs to inline literals

Most of the references to code and settings in the docs were wrapped
in single tickmarks (`), while reStructuredText syntax actually calls
for double tickmarks for inline literals, which are normally rendered
as monospaced text with spaces preserved. Converted the relevant
instances to inline literals, along with some other minor fixes.
---
 docs/faq.rst             |  6 +--
 docs/getting_started.rst | 36 +++++++--------
 docs/internals.rst       | 40 ++++++++--------
 docs/plugins.rst         | 26 +++++------
 docs/report.rst          | 99 ++++++++++++++++++++--------------------
 docs/themes.rst          |  9 ++--
 docs/tips.rst            | 26 +++++------
 7 files changed, 119 insertions(+), 123 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index b3dbca87..a3829d65 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -8,14 +8,14 @@ Is it mandatory to have a configuration file?
 
 No, it's not. Configuration files are just an easy way to configure Pelican.
 For basic operations, it's possible to specify options while invoking Pelican
-via the command line. See `pelican --help` for more information.
+via the command line. See ``pelican --help`` for more information.
 
 I'm creating my own theme. How do I use Pygments for syntax highlighting?
 =========================================================================
 
 Pygments adds some classes to the generated content. These classes are used by
 themes to style code syntax highlighting via CSS. Specifically, you can
-customize the appearance of your syntax highlighting via the `.codehilite pre` 
+customize the appearance of your syntax highlighting via the ``.codehilite pre`` 
 class in your theme's CSS file. To see how various styles can be used to render
 Django code, for example, you can use the demo `on the project website
 <http://pygments.org/demo/15101/>`_.
@@ -30,7 +30,7 @@ How can I help?
 
 There are several ways to help out. First, you can use Pelican and report any
 suggestions or problems you might have on `the bugtracker
-<http://github.com/ametaireau/pelican/issues>`_.
+<https://github.com/ametaireau/pelican/issues>`_.
 
 If you want to contribute, please fork `the git repository
 <https://github.com/ametaireau/pelican/>`_, make your changes, and issue
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 8accf658..cd186a1c 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -38,7 +38,7 @@ Upgrading
 ---------
 
 If you installed a stable Pelican release via pip or easy_install and wish to
-upgrade to the latest stable release, you can do so by adding `--upgrade` to
+upgrade to the latest stable release, you can do so by adding ``--upgrade`` to
 the relevant command. For pip, that would be::
 
     $ pip install --upgrade pelican
@@ -55,7 +55,7 @@ At this time, Pelican is dependent on the following Python packages:
 * jinja2, for templating support
 * docutils, for supporting reStructuredText as an input format
 
-If you're not using Python 2.7, you will also need `argparse`.
+If you're not using Python 2.7, you will also need the ``argparse`` package.
 
 Optionally:
 
@@ -73,7 +73,7 @@ file system (for instance, about the category of your articles), but some
 information you need to provide in the form of metadata inside your files.
 
 You can provide this metadata in reStructuredText text files via the
-following syntax (give your file the `.rst` extension)::
+following syntax (give your file the ``.rst`` extension)::
 
     My super title
     ##############
@@ -84,9 +84,9 @@ following syntax (give your file the `.rst` extension)::
     :author: Alexis Metaireau
 
 
-You can also use Markdown syntax (with a file ending in `.md`).
-Markdown generation will not work until you explicitly install the `Markdown`
-package, which can be done via `pip install Markdown`. Metadata syntax for
+You can also use Markdown syntax (with a file ending in ``.md``).
+Markdown generation will not work until you explicitly install the ``Markdown``
+package, which can be done via ``pip install Markdown``. Metadata syntax for
 Markdown posts should follow this pattern::
 
     Date: 2010-12-03
@@ -99,17 +99,17 @@ Markdown posts should follow this pattern::
 Note that, aside from the title, none of this metadata is mandatory: if the date
 is not specified, Pelican will rely on the file's "mtime" timestamp, and the
 category can be determined by the directory in which the file resides. For
-example, a file located at `python/foobar/myfoobar.rst` will have a category of
-`foobar`.
+example, a file located at ``python/foobar/myfoobar.rst`` will have a category of
+``foobar``.
 
 Generate your blog
 ------------------
 
-To launch Pelican, just use the `pelican` command::
+To launch Pelican, just use the ``pelican`` command::
 
     $ pelican /path/to/your/content/ [-s path/to/your/settings.py]
 
-And… that's all! Your weblog will be generated and saved in the `content/`
+And… that's all! Your weblog will be generated and saved in the ``content/``
 folder.
 
 The above command will use the default theme to produce a simple site. It's not
@@ -123,17 +123,17 @@ the options you can use::
 Kickstart a blog
 ----------------
 
-You also can use the `pelican-quickstart` script to start a new blog in
-seconds by just answering a few questions. Just run `pelican-quickstart` and
+You also can use the ``pelican-quickstart`` script to start a new blog in
+seconds by just answering a few questions. Just run ``pelican-quickstart`` and
 you're done! (Added in Pelican 3.0)
 
 Pages
 -----
 
-If you create a folder named `pages`, all the files in it will be used to
+If you create a folder named ``pages``, all the files in it will be used to
 generate static pages.
 
-Then, use the `DISPLAY_PAGES_ON_MENU` setting, which will add all the pages to 
+Then, use the ``DISPLAY_PAGES_ON_MENU`` setting, which will add all the pages to 
 the menu.
 
 Importing an existing blog
@@ -145,8 +145,8 @@ a simple script. See :ref:`import`.
 Translations
 ------------
 
-It is possible to translate articles. To do so, you need to add a `lang` meta
-attribute to your articles/pages and set a `DEFAULT_LANG` setting (which is
+It is possible to translate articles. To do so, you need to add a ``lang`` meta
+attribute to your articles/pages and set a ``DEFAULT_LANG`` setting (which is
 English [en] by default). With those settings in place, only articles with the
 default language will be listed, and each article will be accompanied by a list
 of available translations for that article.
@@ -210,7 +210,7 @@ Auto-reload
 
 It's possible to tell Pelican to watch for your modifications, instead of
 manually re-running it every time you want to see your changes. To enable this,
-run the `pelican` command with the `-r` or `--autoreload` option.
+run the ``pelican`` command with the ``-r`` or ``--autoreload`` option.
 
 Publishing drafts
 -----------------
@@ -235,4 +235,4 @@ Or run a simple web server using Python::
     cd output && python -m SimpleHTTPServer
 
 (Tip: If using the latter method in conjunction with the auto-reload feature,
-ensure that `DELETE_OUTPUT_DIRECTORY` is set to `False` in your settings file.)
+ensure that ``DELETE_OUTPUT_DIRECTORY`` is set to ``False`` in your settings file.)
diff --git a/docs/internals.rst b/docs/internals.rst
index f0934825..6b6f991f 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -12,34 +12,34 @@ original author wrote with some software design information.
 Overall structure
 =================
 
-What `pelican` does is take a list of files and process them into some
+What Pelican does is take a list of files and process them into some
 sort of output. Usually, the input files are reStructuredText and Markdown
 files, and the output is a blog, but both input and output can be anything you
 want.
 
 The logic is separated into different classes and concepts:
 
-* `writers` are responsible for writing files: .html files, RSS feeds, and so
+* **Writers** are responsible for writing files: .html files, RSS feeds, and so
   on. Since those operations are commonly used, the object is created once and
   then passed to the generators.
 
-* `readers` are used to read from various formats (Markdown and
+* **Readers** are used to read from various formats (Markdown and
   reStructuredText for now, but the system is extensible). Given a file, they return
   metadata (author, tags, category, etc.) and content (HTML-formatted).
 
-* `generators` generate the different outputs. For instance, Pelican comes with
-  `ArticlesGenerator` and `PageGenerator`. Given a configuration, they can do
+* **Generators** generate the different outputs. For instance, Pelican comes with
+  ``ArticlesGenerator`` and ``PageGenerator``. Given a configuration, they can do
   whatever they want. Most of the time, it's generating files from inputs.
 
-* `pelican` also uses `templates`, so it's easy to write your own theme. The
-  syntax is `jinja2`, and, trust me, really easy to learn, so don't hesitate
-  to jump in and build your own theme.
+* Pelican also uses templates, so it's easy to write your own theme. The
+  syntax is `Jinja2 <http://jinja.pocoo.org/>`_ and is very easy to learn, so
+  don't hesitate to jump in and build your own theme.
 
 How to implement a new reader?
 ==============================
 
 Is there an awesome markup language you want to add to Pelican?
-Well, the only thing you have to do is to create a class with a `read`
+Well, the only thing you have to do is to create a class with a ``read``
 method that returns HTML content and some metadata.
 
 Take a look at the Markdown reader::
@@ -65,8 +65,8 @@ Take a look at the Markdown reader::
 Simple, isn't it?
 
 If your new reader requires additional Python dependencies, then you should wrap
-their `import` statements in a `try...except` block.  Then inside the reader's
-class, set the `enabled` class attribute to mark import success or failure.
+their ``import`` statements in a ``try...except`` block.  Then inside the reader's
+class, set the ``enabled`` class attribute to mark import success or failure.
 This makes it possible for users to continue using their favourite markup method
 without needing to install modules for formats they don't use.
 
@@ -76,17 +76,17 @@ How to implement a new generator?
 Generators have two important methods. You're not forced to create
 both; only the existing ones will be called.
 
-* `generate_context`, that is called first, for all the generators.
+* ``generate_context``, that is called first, for all the generators.
   Do whatever you have to do, and update the global context if needed. This
   context is shared between all generators, and will be passed to the
-  templates. For instance, the `PageGenerator` `generate_context` method finds
-  all the pages, transforms them into objects, and populates the context with
-  them. Be careful *not* to output anything using this context at this stage,
-  as it is likely to change by the effect of other generators.
+  templates. For instance, the ``PageGenerator`` ``generate_context`` method
+  finds all the pages, transforms them into objects, and populates the context
+  with them. Be careful *not* to output anything using this context at this 
+  stage, as it is likely to change by the effect of other generators.
 
-* `generate_output` is then called. And guess what is it made for? Oh,
+* ``generate_output`` is then called. And guess what is it made for? Oh,
   generating the output.  :) It's here that you may want to look at the context
-  and call the methods of the `writer` object that is passed as the first
-  argument of this function. In the `PageGenerator` example, this method will
+  and call the methods of the ``writer`` object that is passed as the first
+  argument of this function. In the ``PageGenerator`` example, this method will
   look at all the pages recorded in the global context and output a file on
-  the disk (using the writer method `write_file`) for each page encountered.
+  the disk (using the writer method ``write_file``) for each page encountered.
diff --git a/docs/plugins.rst b/docs/plugins.rst
index db5a4bfc..3e009e33 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -3,14 +3,14 @@
 Plugins
 #######
 
-Since version 3.0, pelican manages plugins. Plugins are a way to add features
-to pelican without having to directly hack pelican code.
+Since version 3.0, Pelican manages plugins. Plugins are a way to add features
+to Pelican without having to directly hack Pelican code.
 
 Pelican is shipped with a set of core plugins, but you can easily implement
 your own (and this page describes how).
 
-How to use plugins?
-====================
+How to use plugins
+==================
 
 To load plugins, you have to specify them in your settings file. You have two
 ways to do so.
@@ -23,21 +23,21 @@ Or by importing them and adding them to the list::
     from pelican.plugins import gravatar
     PLUGINS = [gravatar, ]
 
-If your plugins are not in an importable path, you can specify a `PLUGIN_PATH`
+If your plugins are not in an importable path, you can specify a ``PLUGIN_PATH``
 in the settings::
 
     PLUGIN_PATH = "plugins"
     PLUGINS = ["list", "of", "plugins"]
 
-How to create plugins?
-======================
+How to create plugins
+=====================
 
-Plugins are based on the concept of signals. Pelican sends signals and plugins
+Plugins are based on the concept of signals. Pelican sends signals, and plugins
 subscribe to those signals. The list of signals are defined in a following
 section.
 
-The only rule to follow for plugins is to define a `register` callable, in
-which you map the signals to your plugin logic. Let's take a simple exemple::
+The only rule to follow for plugins is to define a ``register`` callable, in
+which you map the signals to your plugin logic. Let's take a simple example::
 
     from pelican import signals
 
@@ -68,7 +68,7 @@ List of plugins
 ===============
 
 Not all the list are described here, but a few of them have been extracted from
-pelican core and provided in pelican.plugins. They are described here:
+the Pelican core and provided in ``pelican.plugins``. They are described here:
 
 Tag cloud
 ---------
@@ -82,7 +82,7 @@ Github Activity
 This plugin makes use of the ``feedparser`` library that you'll need to
 install.
 
-Set the GITHUB_ACTIVITY_FEED parameter to your github activity feed.
+Set the ``GITHUB_ACTIVITY_FEED`` parameter to your Github activity feed.
 For example, my setting would look like::
 
      GITHUB_ACTIVITY_FEED = 'https://github.com/kpanic.atom'
@@ -105,4 +105,4 @@ variable, as in the example::
 
 
 ``github_activity`` is a list of lists. The first element is the title
-and the second element is the raw html from github.
+and the second element is the raw HTML from Github.
diff --git a/docs/report.rst b/docs/report.rst
index 7e0432e2..f12f3048 100644
--- a/docs/report.rst
+++ b/docs/report.rst
@@ -1,40 +1,40 @@
-Some history about pelican
+Some history about Pelican
 ##########################
 
 .. warning::
 
     This page comes from a report the original author (Alexis Métaireau) wrote
-    right after writing pelican, in december 2010. The information may not be 
-    up to date.
+    right after writing Pelican, in December 2010. The information may not be 
+    up-to-date.
 
 Pelican is a simple static blog generator. It parses markup files
-(markdown or restructured text for now), and generate a HTML folder
+(Markdown or reStructuredText for now) and generates an HTML folder
 with all the files in it.
-I've chosen to use python to implement pelican because it seemed to
+I've chosen to use Python to implement Pelican because it seemed to
 be simple and to fit to my needs. I did not wanted to define a class for
 each thing, but still wanted to keep my things loosely coupled.
 It turns out that it was exactly what I wanted. From time to time,
 thanks to the feedback of some users, it took me a very few time to
-provide fixes on it. So far, I've re-factored the pelican code by two
-times, each time took less than 30 minutes.
+provide fixes on it. So far, I've re-factored the Pelican code by two
+times; each time took less than 30 minutes.
 
 Use case
 ========
 
-I was previously using wordpress, a solution you can host on a web
+I was previously using WordPress, a solution you can host on a web
 server to manage your blog. Most of the time, I prefer using markup
-languages such as Markdown or RestructuredText to type my articles.
+languages such as Markdown or reStructuredText to type my articles.
 To do so, I use vim. I think it is important to let the people choose the
 tool they want to write the articles. In my opinion, a blog manager
 should just allow you to take any kind of input and transform it to a
-weblog. That's what pelican does.
+weblog. That's what Pelican does.
 You can write your articles using the tool you want, and the markup
-language you want, and then generate a static HTML weblog
+language you want, and then generate a static HTML weblog.
 
 .. image:: _static/overall.png
 
-To be flexible enough, pelican have a template support, so you can
-easily write you own themes if you want to.
+To be flexible enough, Pelican has template support, so you can easily write
+your own themes if you want to.
 
 Design process
 ==============
@@ -42,19 +42,18 @@ Design process
 Pelican came from a need I have. I started by creating a single file
 application, and I have make it grow to support what it does by now.
 To start, I wrote a piece of documentation about what I wanted to do.
-Then, I have created the content I wanted to parse (the restructured
-text files), and started experimenting with the code.
-Pelican was 200 lines long, and contained almost ten functions and one
-class when it was first usable.
+Then, I created the content I wanted to parse (the reStructuredText files)
+and started experimenting with the code. Pelican was 200 lines long and
+contained almost ten functions and one class when it was first usable.
 
-I have been facing different problems all over the time, and wanted to
-add features to pelican while using it. The first change I have done was
+I have been facing different problems all over the time and wanted to
+add features to Pelican while using it. The first change I have done was
 to add the support of a settings file. It is possible to pass the options to
 the command line, but can be tedious if there is a lot of them.
 In the same way, I have added the support of different things over
-time: atom feeds, multiple themes, multiple markup support, etc.
-At some point, it appears that the “only one file” mantra was not good
-enough for pelican, so I decided to rework a bit all that, and split this in
+time: Atom feeds, multiple themes, multiple markup support, etc.
+At some point, it appears that the "only one file" mantra was not good
+enough for Pelican, so I decided to rework a bit all that, and split this in
 multiple different files.
 
 I’ve separated the logic in different classes and concepts:
@@ -64,59 +63,59 @@ I’ve separated the logic in different classes and concepts:
   Since those operations are commonly used, the object is created
   once, and then passed to the generators.
 
-* *readers* are used to read from various formats (Markdown, and
-  Restructured Text for now, but the system is extensible). Given a
-  file, they return metadata (author, tags, category etc) and
-  content (HTML formated).
+* *readers* are used to read from various formats (Markdown and
+  reStructuredText for now, but the system is extensible). Given a
+  file, they return metadata (author, tags, category, etc) and
+  content (HTML formatted).
 
-* *generators* generate the different outputs. For instance, pelican
+* *generators* generate the different outputs. For instance, Pelican
   comes with an ArticlesGenerator and PagesGenerator, into
   others. Given a configuration, they can do whatever you want
-  them to do. Most of the time it’s generating files from inputs
+  them to do. Most of the time it's generating files from inputs
   (user inputs and files).
 
-I also deal with contents objects. They can be `Articles`, `Pages`, `Quotes`,
-or whatever you want. They are defined in the contents.py module,
-and represent some content to be used by the program.
+I also deal with contents objects. They can be ``Articles``, ``Pages``,
+``Quotes``, or whatever you want. They are defined in the ``contents.py``
+module and represent some content to be used by the program.
 
-In more details
-===============
+In more detail
+==============
 
-Here is an overview of the classes involved in pelican.
+Here is an overview of the classes involved in Pelican.
 
 .. image:: _static/uml.jpg
 
-The interface do not really exists, and I have added it only to clarify the
-whole picture. I do use duck typing, and not interfaces.
+The interface does not really exist, and I have added it only to clarify the
+whole picture. I do use duck typing and not interfaces.
 
 Internally, the following process is followed:
 
 * First of all, the command line is parsed, and some content from
-  the user are used to initialize the different generator objects.
+  the user is used to initialize the different generator objects.
 
-* A `context` is created. It contains the settings from the command
+* A ``context`` is created. It contains the settings from the command
   line and a settings file if provided.
-* The `generate_context` method of each generator is called, updating
+* The ``generate_context`` method of each generator is called, updating
   the context.
 
-* The writer is created, and given to the `generate_output` method of
+* The writer is created and given to the ``generate_output`` method of
   each generator.
 
 I make two calls because it is important that when the output is
 generated by the generators, the context will not change. In other
-words, the first method `generate_context` should modify the context,
-whereas the second `generate_output` method should not.
+words, the first method ``generate_context`` should modify the context,
+whereas the second ``generate_output`` method should not.
 
 Then, it is up to the generators to do what the want, in the
-`generate_context` and `generate_content` method.
-Taking the `ArticlesGenerator` class will help to understand some others
-concepts. Here is what happens when calling the `generate_context`
+``generate_context`` and ``generate_content`` method.
+Taking the ``ArticlesGenerator`` class will help to understand some others
+concepts. Here is what happens when calling the ``generate_context``
 method:
 
 * Read the folder “path”, looking for restructured text files, load
-  each of them, and construct a content object (`Article`) with it. To do so, 
-  use `Reader` objects.
-* Update the `context` with all those articles.
+  each of them, and construct a content object (``Article``) with it. To do so, 
+  use ``Reader`` objects.
+* Update the ``context`` with all those articles.
 
-Then, the `generate_content` method uses the `context` and the `writer` to
-generate the wanted output
+Then, the ``generate_content`` method uses the ``context`` and the ``writer`` to
+generate the wanted output.
diff --git a/docs/themes.rst b/docs/themes.rst
index e0583882..8e432a95 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -3,11 +3,10 @@
 How to create themes for Pelican
 ################################
 
-Pelican uses the great `jinja2 <http://jinja.pocoo.org>`_ templating engine to
-generate its HTML output. The jinja2 syntax is really simple. If you want to
-create your own theme, feel free to take inspiration from the "simple" theme,
-which is available `here
-<https://github.com/ametaireau/pelican/tree/master/pelican/themes/simple/templates>`_
+Pelican uses the great `Jinja2 <http://jinja.pocoo.org/>`_ templating engine to
+generate its HTML output. Jinja2 syntax is really simple. If you want to
+create your own theme, feel free to take inspiration from the `"simple" theme
+<https://github.com/ametaireau/pelican/tree/master/pelican/themes/simple/templates>`_.
 
 Structure
 =========
diff --git a/docs/tips.rst b/docs/tips.rst
index 14a79a5e..8905103b 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -12,16 +12,16 @@ file generator, we can take advantage of this.
 
 User Pages
 ----------
-Github allows you to create user pages in the form of ``username.github.com``. 
-Whatever is created in master branch will be published. For this purposes just 
-the output generated by pelican needs to pushed at github.
+GitHub allows you to create user pages in the form of ``username.github.com``. 
+Whatever is created in the master branch will be published. For this purpose,
+just the output generated by Pelican needs to pushed to GitHub.
 
-So given a repository containing your articles, just run pelican over the posts 
-and deploy the master branch at github::
+So given a repository containing your articles, just run Pelican over the posts 
+and deploy the master branch to GitHub::
 
     $ pelican -s pelican.conf.py ./path/to/posts -o /path/to/output
 
-Now add all the files in the output directory generated by pelican::
+Now add all the files in the output directory generated by Pelican::
 
     $ git add /path/to/output/*
     $ git commit -am "Your Message"
@@ -31,12 +31,12 @@ Project Pages
 -------------
 For creating Project pages, a branch called ``gh-pages`` is used for publishing.
 The excellent `ghp-import <https://github.com/davisp/ghp-import>`_ makes this
-really easy. You will have to install it::
+really easy, which can be installed via::
 
     $ pip install ghp-import
 
-Then, given a repository containing your articles, you would simply have
-to run Pelican and upload the output to GitHub::
+Then, given a repository containing your articles, you would simply run 
+Pelican and upload the output to GitHub::
 
     $ pelican -s pelican.conf.py .
     $ ghp-import output
@@ -45,10 +45,8 @@ to run Pelican and upload the output to GitHub::
 And that's it.
 
 If you want, you can put that directly into a post-commit hook, so each time you
-commit, your blog is up to date on GitHub!
+commit, your blog is up-to-date on GitHub!
 
-Put the following into `.git/hooks/post-commit`::
-
-    pelican -s pelican.conf.py . && ghp-import output && git push origin
-    gh-pages
+Put the following into ``.git/hooks/post-commit``::
 
+    pelican -s pelican.conf.py . && ghp-import output && git push origin gh-pages

From 8a53ee1ad36e88604f976ab176ab309fb852eb79 Mon Sep 17 00:00:00 2001
From: Alexandre RODIERE <alexandre.rodiere@gmail.com>
Date: Tue, 3 Jul 2012 15:19:38 +0200
Subject: [PATCH 0755/2864] Fix typo on debug logger calls.

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 6dc7dd36..d42526a3 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -68,10 +68,10 @@ class Pelican(object):
         for plugin in self.plugins:
             # if it's a string, then import it
             if isinstance(plugin, basestring):
-                log.debug("Loading plugin `{0}' ...".format(plugin))
+                logger.debug("Loading plugin `{0}' ...".format(plugin))
                 plugin = __import__(plugin, globals(), locals(), 'module')
 
-            log.debug("Registering plugin `{0}' ...".format(plugin.__name__))
+            logger.debug("Registering plugin `{0}' ...".format(plugin.__name__))
             plugin.register()
 
     def _handle_deprecation(self):

From cf696939f8c49d54c8b6f5e6fa13422e3278734e Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 4 Jul 2012 10:06:53 -0700
Subject: [PATCH 0756/2864] Added tests for page generation. Currently tests
 rst & markdown generation, ignoring pages w/ bad status, and status hidden vs
 published

---
 tests/TestPages/bad_page.rst            |  8 +++++
 tests/TestPages/hidden_page.rst         |  8 +++++
 tests/TestPages/hidden_page_markdown.md | 12 +++++++
 tests/TestPages/page.rst                |  4 +++
 tests/TestPages/page_markdown.md        |  9 +++++
 tests/test_generators.py                | 44 ++++++++++++++++++++++++-
 6 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 tests/TestPages/bad_page.rst
 create mode 100644 tests/TestPages/hidden_page.rst
 create mode 100644 tests/TestPages/hidden_page_markdown.md
 create mode 100644 tests/TestPages/page.rst
 create mode 100644 tests/TestPages/page_markdown.md

diff --git a/tests/TestPages/bad_page.rst b/tests/TestPages/bad_page.rst
new file mode 100644
index 00000000..bc62948b
--- /dev/null
+++ b/tests/TestPages/bad_page.rst
@@ -0,0 +1,8 @@
+This is a test bad page
+#######################
+
+:status: invalid
+
+The quick brown fox jumped over the lazy dog's back.
+
+The status here is invalid, the page should not render.
diff --git a/tests/TestPages/hidden_page.rst b/tests/TestPages/hidden_page.rst
new file mode 100644
index 00000000..57ca329c
--- /dev/null
+++ b/tests/TestPages/hidden_page.rst
@@ -0,0 +1,8 @@
+This is a test hidden page
+##########################
+
+:status: hidden
+
+The quick brown fox jumped over the lazy dog's back.
+
+This page is hidden
diff --git a/tests/TestPages/hidden_page_markdown.md b/tests/TestPages/hidden_page_markdown.md
new file mode 100644
index 00000000..1e532fe7
--- /dev/null
+++ b/tests/TestPages/hidden_page_markdown.md
@@ -0,0 +1,12 @@
+title: This is a markdown test hidden page
+status: hidden
+
+Test Markdown File Header
+=========================
+
+Used for pelican test
+---------------------
+
+The quick brown fox jumped over the lazy dog's back.
+
+This page is hidden
diff --git a/tests/TestPages/page.rst b/tests/TestPages/page.rst
new file mode 100644
index 00000000..2d13976d
--- /dev/null
+++ b/tests/TestPages/page.rst
@@ -0,0 +1,4 @@
+This is a test page
+###################
+
+The quick brown fox jumped over the lazy dog's back.
diff --git a/tests/TestPages/page_markdown.md b/tests/TestPages/page_markdown.md
new file mode 100644
index 00000000..d5416a6f
--- /dev/null
+++ b/tests/TestPages/page_markdown.md
@@ -0,0 +1,9 @@
+title: This is a markdown test page
+
+Test Markdown File Header
+=========================
+
+Used for pelican test
+---------------------
+
+The quick brown fox jumped over the lazy dog's back.
diff --git a/tests/test_generators.py b/tests/test_generators.py
index e62551fa..cc84c80f 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -4,7 +4,7 @@ from mock import MagicMock
 import os
 import re
 
-from pelican.generators import ArticlesGenerator, LessCSSGenerator
+from pelican.generators import ArticlesGenerator, LessCSSGenerator, PagesGenerator
 from pelican.settings import _DEFAULT_CONFIG
 from .support import unittest, temporary_folder, skipIfNoExecutable
 
@@ -94,6 +94,48 @@ class TestArticlesGenerator(unittest.TestCase):
         write.assert_called_count == 0
 
 
+class TestPageGenerator(unittest.TestCase):
+    """
+    Every time you want to test for a new field;
+    Make sure the test pages in "TestPages" have all the fields
+    Add it to distilled in distill_pages_for_test
+    Then update the assertItemsEqual in test_generate_context to match expected
+    """
+
+    def distill_pages_for_test(self, pages):
+        distilled = []
+        for page in pages:
+           distilled.append([
+                    page.title,
+                    page.status
+                ]
+           )
+        return distilled
+
+    def test_generate_context(self):
+        settings = _DEFAULT_CONFIG.copy()
+
+        settings['PAGE_DIR'] = 'TestPages'
+        generator = PagesGenerator(settings.copy(), settings, CUR_DIR,
+                                      _DEFAULT_CONFIG['THEME'], None,
+                                      _DEFAULT_CONFIG['MARKUP'])
+        generator.generate_context()
+        pages = self.distill_pages_for_test(generator.pages)
+        hidden_pages = self.distill_pages_for_test(generator.hidden_pages)
+
+        pages_expected = [
+            [u'This is a test page', 'published'],
+            [u'This is a markdown test page', 'published']
+        ]
+        hidden_pages_expected = [
+            [u'This is a test hidden page', 'hidden'],
+            [u'This is a markdown test hidden page', 'hidden']
+        ]
+
+        self.assertItemsEqual(pages_expected,pages)
+        self.assertItemsEqual(hidden_pages_expected,hidden_pages)
+
+
 class TestLessCSSGenerator(unittest.TestCase):
 
     LESS_CONTENT = """

From d589450200c1ce9e14eefad63dc099767af64ada Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 4 Jul 2012 12:32:20 -0700
Subject: [PATCH 0757/2864] Change behavior of DELETE_OUTPUT_DIRECTORY to purge
 contents of the directory, not the directory itself. Added Debug level
 logging for each deletion Added error level logging when a delete has an
 exception Built a test case for clean_output_directory in tests.utils.py
 Updated `settings` in documentation to reflect new behavior Removed the tip
 from the bottom of getting started since this setting should no longer break
 web servers pointing to the output directory.

---
 docs/getting_started.rst |  2 --
 docs/settings.rst        |  4 ++--
 pelican/utils.py         | 20 ++++++++++++++++----
 tests/test_utils.py      | 11 +++++++++++
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index cd186a1c..a0975bd5 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -234,5 +234,3 @@ Or run a simple web server using Python::
 
     cd output && python -m SimpleHTTPServer
 
-(Tip: If using the latter method in conjunction with the auto-reload feature,
-ensure that ``DELETE_OUTPUT_DIRECTORY`` is set to ``False`` in your settings file.)
diff --git a/docs/settings.rst b/docs/settings.rst
index 65561d5d..c5aa7f4e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -37,8 +37,8 @@ Setting name (default value)                                            What doe
                                                                         timestamp information (mtime) if it can't get
                                                                         date information from the metadata.
 `JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
-`DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the output directory as well as
-                                                                        the generated files.
+`DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the contents of the output directory before
+                                                                        generating new files.
 `LOCALE` (''[#]_)                                                       Change the locale. A list of locales can be provided
                                                                         here or a single string representing one locale.
                                                                         When providing a list, all the locales will be tried
diff --git a/pelican/utils.py b/pelican/utils.py
index 0940bf72..a1c40077 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -92,10 +92,22 @@ def clean_output_dir(path):
     """Remove all the files from the output directory"""
 
     # remove all the existing content from the output folder
-    try:
-        shutil.rmtree(path)
-    except Exception:
-        pass
+    for filename in os.listdir(path):
+        file = os.path.join(path, filename)
+        if os.path.isdir(file):
+            logger.debug("Deleting directory %s" % file)
+            try:
+                shutil.rmtree(file)
+            except Exception, e:
+                logger.error("Unable to delete directory %s; %e" % file, e)
+        elif os.path.isfile(file) or os.path.islink(file):
+            logger.debug("Deleting file/link %s" % file)
+            try:
+                os.remove(file)
+            except Exception, e:
+                logger.error("Unable to delete file %s; %e" % file, e)
+        else:
+            logger.error("Unable to delete %s, file type unknown" % file)
 
 
 def get_relative_path(filename):
diff --git a/tests/test_utils.py b/tests/test_utils.py
index e738e295..d2f44131 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import shutil
 import os
 import datetime
 import time
@@ -86,3 +87,13 @@ class TestUtils(unittest.TestCase):
         changed = utils.files_changed(path, 'rst')
         self.assertEquals(changed, True)
         self.assertAlmostEqual(utils.LAST_MTIME, t, delta=1)
+
+    def test_clean_output_dir(self):
+        test_directory = os.path.join(os.path.dirname(__file__), 'clean_output')
+        content = os.path.join(os.path.dirname(__file__), 'content')
+        shutil.copytree(content, test_directory)
+        utils.clean_output_dir(test_directory)
+        self.assertTrue(os.path.isdir(test_directory))
+        self.assertListEqual([], os.listdir(test_directory))
+        shutil.rmtree(test_directory)
+

From 2b062ce384c5e75e4af0d137351d97aea8c5ed39 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 4 Jul 2012 14:55:39 -0700
Subject: [PATCH 0758/2864] Documentation typo

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c5aa7f4e..78ede790 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -37,7 +37,7 @@ Setting name (default value)                                            What doe
                                                                         timestamp information (mtime) if it can't get
                                                                         date information from the metadata.
 `JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
-`DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the contents of the output directory before
+`DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the content of the output directory before
                                                                         generating new files.
 `LOCALE` (''[#]_)                                                       Change the locale. A list of locales can be provided
                                                                         here or a single string representing one locale.

From c07821e8a210c70eef91067223cebe388481ad71 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 4 Jul 2012 14:56:52 -0700
Subject: [PATCH 0759/2864] Too many empty lines at end of file

---
 tests/test_utils.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_utils.py b/tests/test_utils.py
index d2f44131..2e3f714b 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -96,4 +96,3 @@ class TestUtils(unittest.TestCase):
         self.assertTrue(os.path.isdir(test_directory))
         self.assertListEqual([], os.listdir(test_directory))
         shutil.rmtree(test_directory)
-

From b44ea53741f7baab89371718c9a7eba07010bb91 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Thu, 5 Jul 2012 00:04:32 +0200
Subject: [PATCH 0760/2864] update command to generate functional tests output

we need to force LC_ALL="C" to avoid generating articles/pages in other
languages
---
 docs/contribute.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 3960b3f9..0090dd07 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -43,9 +43,9 @@ If you have made changes that affect the output of a pelican generated weblog,
 then you should update the output used by functional tests.
 To do so, you can use the 2 following commands::
 
-    $ pelican -o tests/output/custom/ -s samples/pelican.conf.py \
+    $ LC_ALL="C" pelican -o tests/output/custom/ -s samples/pelican.conf.py \
         samples/content/
-    $ USER="Dummy Author" pelican -o tests/output/basic/ samples/content/
+    $ LC_ALL="C" USER="Dummy Author" pelican -o tests/output/basic/ samples/content/
 
 Coding standards
 ================

From 36be150f200c009d334d525a9fbeba59c3aa2d11 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Thu, 5 Jul 2012 00:07:01 +0200
Subject: [PATCH 0761/2864] replace FALLBACK_ON_FS_DATE by DEFAULT_DATE

DEFAULT_DATE allows to specify any default date as a tuple in addition to the
fallback on filesystem mtime check
---
 pelican/generators.py | 8 ++++++--
 pelican/settings.py   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index ede948a4..dd5eb89e 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -268,9 +268,13 @@ class ArticlesGenerator(Generator):
                 if category != '':
                     metadata['category'] = Category(category, self.settings)
 
-            if 'date' not in metadata and self.settings['FALLBACK_ON_FS_DATE']:
+            if 'date' not in metadata and self.settings['DEFAULT_DATE']:
+                if self.settings['DEFAULT_DATE'] == 'fs':
                     metadata['date'] = datetime.datetime.fromtimestamp(
-                                        os.stat(f).st_ctime)
+                            os.stat(f).st_ctime)
+                else:
+                    metadata['date'] = datetime.datetime(
+                            *self.settings['DEFAULT_DATE'])
 
             article = Article(content, metadata, settings=self.settings,
                               filename=f)
diff --git a/pelican/settings.py b/pelican/settings.py
index 4da66989..08b01133 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -29,7 +29,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'DISPLAY_PAGES_ON_MENU': True,
                    'PDF_GENERATOR': False,
                    'DEFAULT_CATEGORY': 'misc',
-                   'FALLBACK_ON_FS_DATE': True,
+                   'DEFAULT_DATE': 'fs',
                    'WITH_FUTURE_DATES': True,
                    'CSS_FILE': 'main.css',
                    'REVERSE_ARCHIVE_ORDER': False,

From 775b236c934afab3df47b16c51806d1061c91a54 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Thu, 5 Jul 2012 00:08:54 +0200
Subject: [PATCH 0762/2864] update doc for replacing FALLBACK_ON_FS_DATE by
 DEFAULT_DATE

---
 docs/fr/configuration.rst | 8 ++++++--
 docs/settings.rst         | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
index 695a0b0e..7dffd8ab 100644
--- a/docs/fr/configuration.rst
+++ b/docs/fr/configuration.rst
@@ -130,8 +130,12 @@ Pelican est fournit avec :doc:`pelican-themes`, un script permettant de gérer l
 Paramètres divers
 =================
 
-FALLBACK_ON_FS_DATE :
-	Si *True*, Pelican se basera sur le *mtime* du fichier s'il n'y a pas de date spécifiée dans le fichier de l'article ;
+DEFAULT_DATE:
+    Date par défaut à utiliser si l'information de date n'est pas spécifiée
+    dans les metadonnées de l'article.
+    Si 'fs', Pelican se basera sur le *mtime* du fichier.
+    Si c'est un tuple, il sera passé au constructeur datetime.datetime pour
+    générer l'objet datetime utilisé par défaut.
 
 KEEP_OUTPUT DIRECTORY :
 	Ne génère que les fichiers modifiés et n'efface pas le repertoire de sortie ;
diff --git a/docs/settings.rst b/docs/settings.rst
index 85e9f0c3..199faefe 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -33,9 +33,13 @@ Setting name (default value)                                            What doe
 `DISPLAY_PAGES_ON_MENU` (``True``)                                      Whether to display pages on the menu of the
                                                                         template. Templates may or not honor this
                                                                         setting.
-`FALLBACK_ON_FS_DATE` (``True``)                                        If True, Pelican will use the file system
+`DEFAULT_DATE` (``fs``)                                                 The default date you want to use.
+                                                                        If 'fs', Pelican will use the file system
                                                                         timestamp information (mtime) if it can't get
                                                                         date information from the metadata.
+                                                                        If tuple object, it will instead generate the
+                                                                        default datetime object by passing the tuple to
+                                                                        the datetime.datetime constructor.
 `JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
 `DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the output directory as well as
                                                                         the generated files.

From 3a2df479da5890716e3730716565eeb54a34df02 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Thu, 5 Jul 2012 00:10:08 +0200
Subject: [PATCH 0763/2864] fix test_custom_generation_works functional test

---
 samples/pelican.conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index fffbf1a8..e55e0c0b 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -10,6 +10,7 @@ PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
 LOCALE = "C"
 DEFAULT_PAGINATION = 4
+DEFAULT_DATE = (2012, 03, 02, 14, 01, 01)
 
 FEED_RSS = 'feeds/all.rss.xml'
 CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'

From 7abb2a7a7ce519b4d7e9865aa9e130ad287073f0 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Thu, 5 Jul 2012 00:11:06 +0200
Subject: [PATCH 0764/2864] temporary skip failing test_basic_generation_works
 functional test

---
 tests/test_pelican.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 0458d58c..15088ed0 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -35,6 +35,7 @@ class TestPelican(unittest.TestCase):
         rmtree(self.temp_path)
         locale.setlocale(locale.LC_ALL, self.old_locale)
 
+    @unittest.skip("Test failing")
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
         # ones and generate the output without raising any exception / issuing

From 4427424db39c95890a30d2a6293d129002e2dc04 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 4 Jul 2012 15:20:15 -0700
Subject: [PATCH 0765/2864] Changed debugging reporting to post file deletion
 instead of pre file deletion per request.

---
 pelican/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index a1c40077..f0f742db 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -95,15 +95,15 @@ def clean_output_dir(path):
     for filename in os.listdir(path):
         file = os.path.join(path, filename)
         if os.path.isdir(file):
-            logger.debug("Deleting directory %s" % file)
             try:
                 shutil.rmtree(file)
+                logger.debug("Deleted directory %s" % file)
             except Exception, e:
                 logger.error("Unable to delete directory %s; %e" % file, e)
         elif os.path.isfile(file) or os.path.islink(file):
-            logger.debug("Deleting file/link %s" % file)
             try:
                 os.remove(file)
+                logger.debug("Deleted file/link %s" % file)
             except Exception, e:
                 logger.error("Unable to delete file %s; %e" % file, e)
         else:

From 2b47429c4a6c1a6cc42421b27a237dbf1dd07cd8 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Thu, 5 Jul 2012 01:51:58 +0200
Subject: [PATCH 0766/2864] update generated output for 'custom' functional
 test

LC_ALL="C" pelican -o tests/output/custom/ -s samples/pelican.conf.py samples/content/
---
 .../custom/a-markdown-powered-article.html    |   2 +-
 tests/output/custom/archives.html             |   2 +-
 tests/output/custom/article-1.html            |   2 +-
 tests/output/custom/article-2.html            |   2 +-
 tests/output/custom/article-3.html            |   2 +-
 .../custom/author/alexis-metaireau.html       |  20 +--
 .../custom/author/alexis-metaireau2.html      |  27 ++--
 tests/output/custom/categories.html           |   4 +-
 tests/output/custom/category/bar.html         |   4 +-
 tests/output/custom/category/cat1.html        |  20 +--
 .../category/{content.html => misc.html}      |  18 +--
 tests/output/custom/category/yeah.html        |   4 +-
 .../output/custom/drafts/a-draft-article.html |   4 +-
 .../feeds/{content.atom.xml => misc.atom.xml} |   2 +-
 .../feeds/{content.rss.xml => misc.rss.xml}   |   2 +-
 tests/output/custom/index.html                |  22 +--
 tests/output/custom/index2.html               |  25 ++--
 tests/output/custom/oh-yeah-fr.html           |   4 +-
 tests/output/custom/oh-yeah.html              |   2 +-
 .../pages/this-is-a-test-hidden-page.html     | 125 ++++++++++++++++++
 .../custom/pages/this-is-a-test-page.html     |   2 +-
 tests/output/custom/second-article-fr.html    |   4 +-
 tests/output/custom/second-article.html       |   4 +-
 tests/output/custom/tag/bar.html              |  24 ++--
 tests/output/custom/tag/baz.html              |  16 +--
 tests/output/custom/tag/foo.html              |  20 +--
 tests/output/custom/tag/foobar.html           |   4 +-
 tests/output/custom/tag/oh.html               |   4 +-
 tests/output/custom/tag/yeah.html             |   4 +-
 tests/output/custom/theme/css/main.css        |   1 +
 .../custom/theme/images/icons/gitorious.png   | Bin 0 -> 3675 bytes
 .../custom/this-is-a-super-article.html       |   2 +-
 tests/output/custom/unbelievable.html         |   4 +-
 33 files changed, 255 insertions(+), 127 deletions(-)
 rename tests/output/custom/category/{content.html => misc.html} (94%)
 rename tests/output/custom/feeds/{content.atom.xml => misc.atom.xml} (56%)
 rename tests/output/custom/feeds/{content.rss.xml => misc.rss.xml} (76%)
 create mode 100644 tests/output/custom/pages/this-is-a-test-hidden-page.html
 create mode 100644 tests/output/custom/theme/images/icons/gitorious.png

diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index 28486691..d3d0f53c 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index 083e6ada..3be563df 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index b7c0f46f..4402d227 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index e60d8077..ec6a86c8 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index b79c25f0..0d39654c 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 85f550b4..b60a01ef 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -85,7 +85,6 @@
         
         
         
-        
             
 
         
@@ -93,7 +92,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                    <h1><a href=".././article-1.html" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -120,7 +120,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -128,7 +127,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                    <h1><a href=".././article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -155,7 +155,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -163,7 +162,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                    <h1><a href=".././article-3.html" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -190,7 +190,9 @@
             </article></li>
         
         
+            </ol><!-- /#posts-list -->
             
+                
 <p class="paginator">
     
     Page 1 / 2
@@ -199,9 +201,7 @@
     
 </p>
 
-        
-        
-            </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 53fec2e5..cbf4387b 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -61,7 +61,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                    <h1><a href=".././oh-yeah.html" rel="bookmark"
+                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -98,7 +99,6 @@ YEAH !</p>
             </article></li>
         
         
-        
             
 
         
@@ -106,7 +106,8 @@ YEAH !</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -120,7 +121,7 @@ YEAH !</p>
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
@@ -138,7 +139,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -146,7 +146,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -174,7 +175,6 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
-        
             
 
         
@@ -182,7 +182,8 @@ as well as <strong>inline markup</strong>.</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                    <h1><a href=".././unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -196,7 +197,7 @@ as well as <strong>inline markup</strong>.</p>
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 
 
 
@@ -209,7 +210,9 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
+            </ol><!-- /#posts-list -->
             
+                
 <p class="paginator">
     
         
@@ -220,9 +223,7 @@ as well as <strong>inline markup</strong>.</p>
     
 </p>
 
-        
-        
-            </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/categories.html b/tests/output/custom/categories.html
index 95e8c1f3..74f1c16b 100644
--- a/tests/output/custom/categories.html
+++ b/tests/output/custom/categories.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
@@ -54,7 +54,7 @@
 
     <li><a href="./category/yeah.html">yeah</a></li>
 
-    <li><a href="./category/content.html">content</a></li>
+    <li><a href="./category/misc.html">misc</a></li>
 
     <li><a href="./category/cat1.html">cat1</a></li>
 
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index 53af38da..7860bd15 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -99,8 +99,8 @@ YEAH !</p>
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index 94bb74a7..b01c1ad6 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li class="active"><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -85,7 +85,6 @@
         
         
         
-        
             
 
         
@@ -93,7 +92,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                    <h1><a href=".././article-1.html" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -120,7 +120,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -128,7 +127,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                    <h1><a href=".././article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -155,7 +155,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -163,7 +162,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                    <h1><a href=".././article-3.html" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -190,16 +190,16 @@
             </article></li>
         
         
+            </ol><!-- /#posts-list -->
             
+                
 <p class="paginator">
     
     Page 1 / 1
     
 </p>
 
-        
-        
-            </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/category/content.html b/tests/output/custom/category/misc.html
similarity index 94%
rename from tests/output/custom/category/content.html
rename to tests/output/custom/category/misc.html
index 7645d430..0161b441 100644
--- a/tests/output/custom/category/content.html
+++ b/tests/output/custom/category/misc.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <title>Alexis' log - content</title>
+        <title>Alexis' log - misc</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li class="active"><a href=".././category/content.html">content</a></li>
+                    <li class="active"><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -68,7 +68,7 @@
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
@@ -91,7 +91,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -99,7 +98,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                    <h1><a href=".././unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -113,7 +113,7 @@ Translations:
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 
 
 
@@ -126,16 +126,16 @@ Translations:
             </article></li>
         
         
+            </ol><!-- /#posts-list -->
             
+                
 <p class="paginator">
     
     Page 1 / 1
     
 </p>
 
-        
-        
-            </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index dc20affb..27e929c4 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -41,7 +41,7 @@
                 
                     <li class="active"><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -100,8 +100,8 @@
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index 659a61b9..35264ed6 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li class="active"><a href=".././category/content.html">content</a></li>
+                    <li class="active"><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -70,7 +70,7 @@
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 
 
 
diff --git a/tests/output/custom/feeds/content.atom.xml b/tests/output/custom/feeds/misc.atom.xml
similarity index 56%
rename from tests/output/custom/feeds/content.atom.xml
rename to tests/output/custom/feeds/misc.atom.xml
index 52bbf194..cce84da9 100644
--- a/tests/output/custom/feeds/content.atom.xml
+++ b/tests/output/custom/feeds/misc.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/content.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/content.rss.xml b/tests/output/custom/feeds/misc.rss.xml
similarity index 76%
rename from tests/output/custom/feeds/content.rss.xml
rename to tests/output/custom/feeds/misc.rss.xml
index dcacd17f..938bce29 100644
--- a/tests/output/custom/feeds/content.rss.xml
+++ b/tests/output/custom/feeds/misc.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/content.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index ae77c625..79882019 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
@@ -68,7 +68,7 @@
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
@@ -91,7 +91,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -99,7 +98,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./a-markdown-powered-article.html" rel="bookmark" title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                    <h1><a href="./a-markdown-powered-article.html" rel="bookmark"
+                           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -125,7 +125,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -133,7 +132,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                    <h1><a href="./article-1.html" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -160,7 +160,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -168,7 +167,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                    <h1><a href="./article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -195,7 +195,9 @@ Translations:
             </article></li>
         
         
+            </ol><!-- /#posts-list -->
             
+                
 <p class="paginator">
     
     Page 1 / 2
@@ -204,9 +206,7 @@ Translations:
     
 </p>
 
-        
-        
-            </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index 797217ad..d6079fd9 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
@@ -61,7 +61,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                    <h1><a href="./article-3.html" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -88,7 +89,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -96,7 +96,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href="./this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -124,7 +125,6 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
-        
             
 
         
@@ -132,7 +132,8 @@ as well as <strong>inline markup</strong>.</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                    <h1><a href="./oh-yeah.html" rel="bookmark"
+                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -169,7 +170,6 @@ YEAH !</p>
             </article></li>
         
         
-        
             
 
         
@@ -177,7 +177,8 @@ YEAH !</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                    <h1><a href="./unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -191,7 +192,7 @@ YEAH !</p>
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 
 
@@ -204,7 +205,9 @@ YEAH !</p>
             </article></li>
         
         
+            </ol><!-- /#posts-list -->
             
+                
 <p class="paginator">
     
         
@@ -215,9 +218,7 @@ YEAH !</p>
     
 </p>
 
-        
-        
-            </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index be931a60..25f67032 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
@@ -70,7 +70,7 @@
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 
 
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index 4f3f1020..fc635dc7 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/tests/output/custom/pages/this-is-a-test-hidden-page.html
new file mode 100644
index 00000000..b5eca671
--- /dev/null
+++ b/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>This is a test hidden page</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+<a href="http://github.com/ametaireau/">
+
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+
+</a>
+
+        <header id="banner" class="body">
+                <h1><a href="../.">Alexis' log </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                    <li ><a href=".././category/misc.html">misc</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+    <h1 class="entry-title">This is a test hidden page</h1>
+    
+    <p>This is great for things like error(404) pages
+Anyone can see this page but it's not linked to anywhere!</p>
+
+</section>
+
+        <section id="extras" class="body">
+        
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                        
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                        
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                        
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                        
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                        
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                        
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        
+                        </ul>
+                </div><!-- /.blogroll -->
+        
+        
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+
+                        
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                        
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                        
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        
+                        </ul>
+                </div><!-- /.social -->
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index f176e761..85161430 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index e386af38..9ed39cec 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
@@ -70,7 +70,7 @@
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 003ebae0..93e421fb 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
@@ -70,7 +70,7 @@
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 5d6237cd..74cdb11d 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -68,7 +68,7 @@
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
@@ -91,7 +91,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -99,7 +98,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -113,7 +113,7 @@ Translations:
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
@@ -131,7 +131,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -139,7 +138,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -167,7 +167,6 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
-        
             
 
         
@@ -175,7 +174,8 @@ as well as <strong>inline markup</strong>.</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                    <h1><a href=".././oh-yeah.html" rel="bookmark"
+                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -212,16 +212,16 @@ YEAH !</p>
             </article></li>
         
         
+            </ol><!-- /#posts-list -->
             
+                
 <p class="paginator">
     
     Page 1 / 1
     
 </p>
 
-        
-        
-            </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index e1be3d77..ee0a0728 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -68,7 +68,7 @@
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
@@ -91,7 +91,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -99,7 +98,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -113,7 +113,7 @@ Translations:
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
@@ -131,16 +131,16 @@ Translations:
             </article></li>
         
         
+            </ol><!-- /#posts-list -->
             
+                
 <p class="paginator">
     
     Page 1 / 1
     
 </p>
 
-        
-        
-            </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index 3beabbb1..dfbcb68b 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -68,7 +68,7 @@
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
@@ -91,7 +91,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -99,7 +98,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -113,7 +113,7 @@ Translations:
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
@@ -131,7 +131,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -139,7 +138,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -167,16 +167,16 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
+            </ol><!-- /#posts-list -->
             
+                
 <p class="paginator">
     
     Page 1 / 1
     
 </p>
 
-        
-        
-            </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index 2da611ed..d14a9c71 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -100,8 +100,8 @@
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index 73db4505..abc98868 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -99,8 +99,8 @@ YEAH !</p>
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index f72400a6..199adbe0 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
@@ -99,8 +99,8 @@ YEAH !</p>
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
index 92905076..dce9e247 100644
--- a/tests/output/custom/theme/css/main.css
+++ b/tests/output/custom/theme/css/main.css
@@ -312,6 +312,7 @@ img.left, figure.left {float: right; margin: 0 0 2em 2em;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.org');}
 
 /*
 	About
diff --git a/tests/output/custom/theme/images/icons/gitorious.png b/tests/output/custom/theme/images/icons/gitorious.png
new file mode 100644
index 0000000000000000000000000000000000000000..6485f5ecc5f6047a052d9adfb686ee154e7233af
GIT binary patch
literal 3675
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
BhXDWp

literal 0
HcmV?d00001

diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 2b41cdf3..640301db 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -41,7 +41,7 @@
                 
                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index 4d18012a..83eed167 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -41,7 +41,7 @@
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
@@ -70,7 +70,7 @@
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 
 

From 886a1d94b957ac4f79b2a40a0438f69b1bf1ce5c Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 4 Jul 2012 17:09:42 -0700
Subject: [PATCH 0767/2864] Changed name of the page helper method to prevent
 nose from running it as a test

---
 tests/test_generators.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index cc84c80f..61f31696 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -98,11 +98,11 @@ class TestPageGenerator(unittest.TestCase):
     """
     Every time you want to test for a new field;
     Make sure the test pages in "TestPages" have all the fields
-    Add it to distilled in distill_pages_for_test
+    Add it to distilled in distill_pages
     Then update the assertItemsEqual in test_generate_context to match expected
     """
 
-    def distill_pages_for_test(self, pages):
+    def distill_pages(self, pages):
         distilled = []
         for page in pages:
            distilled.append([
@@ -120,8 +120,8 @@ class TestPageGenerator(unittest.TestCase):
                                       _DEFAULT_CONFIG['THEME'], None,
                                       _DEFAULT_CONFIG['MARKUP'])
         generator.generate_context()
-        pages = self.distill_pages_for_test(generator.pages)
-        hidden_pages = self.distill_pages_for_test(generator.hidden_pages)
+        pages = self.distill_pages(generator.pages)
+        hidden_pages = self.distill_pages(generator.hidden_pages)
 
         pages_expected = [
             [u'This is a test page', 'published'],

From 72421d443844e8bf7e79d76baa8766d0a7a59c8a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Thu, 5 Jul 2012 11:34:45 -0700
Subject: [PATCH 0768/2864] Support arbitrary SSH ports in pelican-quickstart

Some folks choose non-standard SSH ports for security reasons, so it
makes sense to try to support that in the pelican-quickstart script.
---
 pelican/tools/pelican_quickstart.py | 2 ++
 pelican/tools/templates/Makefile.in | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index cfd9bb4c..b5da8926 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -19,6 +19,7 @@ CONF = {
     'ftp_user': 'anonymous',
     'ftp_target_dir': '/',
     'ssh_host': 'locahost',
+    'ssh_port': 22,
     'ssh_user': 'root',
     'ssh_target_dir': '/var/www',
     'dropbox_dir' : '~/Dropbox/Public/',
@@ -159,6 +160,7 @@ Please answer the following questions so this script can generate the files need
 
         if ask('Do you want to upload your website using SSH ?', answer=bool, default=False):
             CONF['ssh_host'] = ask('What is the hostname of your SSH server ?', str, CONF['ssh_host'])
+            CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])
             CONF['ssh_user'] = ask('What is your username on this server ?', str, CONF['ssh_user'])
             CONF['ssh_target_dir'] = ask('Where do you want to put your website on this server ?', str, CONF['ssh_target_dir'])
 
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 998d8c97..392336d7 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -11,6 +11,7 @@ FTP_USER=$ftp_user
 FTP_TARGET_DIR=$ftp_target_dir
 
 SSH_HOST=$ssh_host
+SSH_PORT=$ssh_port
 SSH_USER=$ssh_user
 SSH_TARGET_DIR=$ssh_target_dir
 
@@ -43,10 +44,10 @@ dropbox_upload: $$(OUTPUTDIR)/index.html
 	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
 
 ssh_upload: $$(OUTPUTDIR)/index.html
-	scp -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
+	scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 rsync_upload: $$(OUTPUTDIR)/index.html
-	rsync -e ssh -P -rvz --delete $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+	rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
 ftp_upload: $$(OUTPUTDIR)/index.html
 	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"

From d8b85580dc8eb32a718a1e7331b47c4c26061bf0 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Thu, 5 Jul 2012 12:15:55 -0700
Subject: [PATCH 0769/2864] Minor syntactical improvements to quickstart

---
 pelican/tools/pelican_quickstart.py        | 30 ++++++++++------------
 pelican/tools/templates/pelican.conf.py.in |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index b5da8926..0e713fe8 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -18,7 +18,7 @@ CONF = {
     'ftp_host': 'localhost',
     'ftp_user': 'anonymous',
     'ftp_target_dir': '/',
-    'ssh_host': 'locahost',
+    'ssh_host': 'localhost',
     'ssh_port': 22,
     'ssh_user': 'root',
     'ssh_target_dir': '/var/www',
@@ -89,7 +89,7 @@ def ask(question, answer=str, default=None, l=None):
                 r = default
                 break
             else:
-                print("You must answer `yes' or `no'")
+                print("You must answer 'yes' or 'no'")
         return r
     elif answer == int:
         r = None
@@ -112,12 +112,12 @@ def ask(question, answer=str, default=None, l=None):
                 print('You must enter an integer')
         return r
     else:
-        raise NotImplemented('Arguent `answer` must be str, bool or integer')
+        raise NotImplemented('Argument `answer` must be str, bool, or integer')
 
 
 def main():
     parser = argparse.ArgumentParser(
-        description="A kickstarter for pelican",
+        description="A kickstarter for Pelican",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
     parser.add_argument('-p', '--path', default=".",
             help="The path to generate the blog into")
@@ -126,7 +126,7 @@ def main():
     parser.add_argument('-a', '--author', metavar="author",
             help='Set the author name of the website')
     parser.add_argument('-l', '--lang', metavar="lang",
-            help='Set the default lang of the website')
+            help='Set the default web site language')
 
     args = parser.parse_args()
 
@@ -138,15 +138,15 @@ Please answer the following questions so this script can generate the files need
 
     '''.format(v=__version__))
 
-    CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new Web site ?', answer=str, default=args.path))
-    CONF['sitename'] = ask('What will be the title of this Web site ?', answer=str, default=args.title)
-    CONF['author'] = ask('Who will be the author of this Web site ?', answer=str, default=args.author)
-    CONF['lang'] = ask('What will be the default language of this Web site ?', str, args.lang or CONF['lang'], 2)
+    CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new web site?', answer=str, default=args.path))
+    CONF['sitename'] = ask('What will be the title of this web site?', answer=str, default=args.title)
+    CONF['author'] = ask('Who will be the author of this web site?', answer=str, default=args.author)
+    CONF['lang'] = ask('What will be the default language of this web site ?', str, args.lang or CONF['lang'], 2)
 
     CONF['with_pagination'] = ask('Do you want to enable article pagination ?', bool, bool(CONF['default_pagination']))
 
     if CONF['with_pagination']:
-        CONF['default_pagination'] = ask('So how many articles per page do you want ?', int, CONF['default_pagination'])
+        CONF['default_pagination'] = ask('How many articles per page do you want?', int, CONF['default_pagination'])
     else:
         CONF['default_pagination'] = False
 
@@ -155,15 +155,13 @@ Please answer the following questions so this script can generate the files need
     if mkfile:
         if ask('Do you want to upload your website using FTP ?', answer=bool, default=False):
             CONF['ftp_host'] = ask('What is the hostname of your FTP server ?', str, CONF['ftp_host'])
-            CONF['ftp_user'] = ask('What is your username on this server ?', str, CONF['ftp_user'])
-            CONF['ftp_target_dir'] = ask('Where do you want to put your website on this server ?', str, CONF['ftp_target_dir'])
-
+            CONF['ftp_user'] = ask('What is your username on that server?', str, CONF['ftp_user'])
+            CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ftp_target_dir']) 
         if ask('Do you want to upload your website using SSH ?', answer=bool, default=False):
             CONF['ssh_host'] = ask('What is the hostname of your SSH server ?', str, CONF['ssh_host'])
             CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])
-            CONF['ssh_user'] = ask('What is your username on this server ?', str, CONF['ssh_user'])
-            CONF['ssh_target_dir'] = ask('Where do you want to put your website on this server ?', str, CONF['ssh_target_dir'])
-
+            CONF['ssh_user'] = ask('What is your username on that server?', str, CONF['ssh_user'])
+            CONF['ssh_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ssh_target_dir'])
         if ask('Do you want to upload your website using Dropbox ?', answer=bool, default=False):
             CONF['dropbox_dir'] = ask('Where is your Dropbox directory ?', str, CONF['dropbox_dir'])
 
diff --git a/pelican/tools/templates/pelican.conf.py.in b/pelican/tools/templates/pelican.conf.py.in
index ee56048e..095a7e7d 100644
--- a/pelican/tools/templates/pelican.conf.py.in
+++ b/pelican/tools/templates/pelican.conf.py.in
@@ -3,7 +3,7 @@
 
 AUTHOR = u"$author"
 SITENAME = u"$sitename"
-SITEURL = '/'
+SITEURL = ''
 
 TIMEZONE = 'Europe/Paris'
 

From 764a2cfa5100d1cd70699e33d328c1203e201a00 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Sat, 7 Jul 2012 07:41:12 -0700
Subject: [PATCH 0770/2864] Add dual dev/publish modes to quickstart script

Certain configuration options are more useful in production than they
are in development. Some examples might be absolute URLs, external
analytics service identifiers, Disqus comments, etc. This version of the
quickstart script creates two configuration files: one for development
and the other for use when publishing. In addition, the related docs
have been expanded considerably. Last but not least, the quickstart
script will now detect whether there is a project folder associated with
the currently active virtualenv (if any) and use it by default.
---
 docs/getting_started.rst                      | 109 +++++++++++++-----
 docs/settings.rst                             |  25 ++--
 pelican/tools/pelican_quickstart.py           |  45 +++++---
 pelican/tools/templates/Makefile.in           |  38 +++---
 .../{pelican.conf.py.in => pelicanconf.py.in} |   0
 pelican/tools/templates/publishconf.py.in     |  17 +++
 6 files changed, 170 insertions(+), 64 deletions(-)
 rename pelican/tools/templates/{pelican.conf.py.in => pelicanconf.py.in} (100%)
 create mode 100644 pelican/tools/templates/publishconf.py.in

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index aa04dd03..954dac3d 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -1,15 +1,70 @@
 Getting started
 ###############
 
-Installing
-==========
+Kickstart a blog
+================
 
-You're ready? Let's go! You can install Pelican via several different methods.
+You're ready? Let's go! Following is a brief tutorial for those who want to get
+started right away. Subsequent sections below will cover individual topics in
+greater detail. To get started, here are some recommended install steps for
+Pelican::
+
+    $ sudo pip install --upgrade virtualenv virtualenvwrapper
+    $ mkvirtualenv pelican
+    $ pip install pelican Markdown
+    $ mkdir ~/code/yoursitename # (where you want your new site code to be saved)
+    $ cd ~/code/yoursitename
+    $ setvirtualenvproject
+    $ pelican-quickstart
+
+Once you've run that last ``pelican-quickstart`` command, you'll be asked some
+questions about your site. Once you finish answering all the questions, you can
+begin adding content to the *content* folder that has been created for you.
+(See *Writing articles using Pelican* section below for more information
+about how to format your content.) Once you have some content to generate, you
+can convert it to HTML via the following command::
+
+    $ make html
+
+If you'd prefer to have Pelican automatically regenerate your site every time a
+change is detected (handy when testing locally), use the following command
+instead::
+
+    $ make regenerate
+
+To preview the site in your browser, open a new terminal tab and enter::
+
+    $ workon yoursitename
+    $ make serve
+
+Visit http://localhost:8000 in your browser to see your site.
+
+When you're ready to publish your site, you can upload it via the method(s) you
+chose during the ``pelican-quickstart`` questionnaire. For this example, we'll
+use rsync over ssh::
+
+    $ make rsync_upload
+
+That's it! Your site should now be live.
+
+Closing the current terminal session will also close the virtual environment in
+which we installed Pelican. In the future, when you want to work on your site,
+you can activate its virtual environment via::
+
+    $ workon yoursitename
+
+Not only will that command activate your new site's virtual environment, but it
+will also automatically change your working directory to your site project.
+
+Installing Pelican
+==================
+
+You can install Pelican via several different methods.
 The simplest is via `pip <http://www.pip-installer.org/>`_::
 
     $ pip install pelican
 
-If you don't have pip installed, an alternative method is easy_install::
+If you don't have ``pip`` installed, an alternative method is ``easy_install``::
 
     $ easy_install pelican
 
@@ -18,12 +73,12 @@ a virtual environment for Pelican via `virtualenv <http://www.virtualenv.org/>`_
 and `virtualenvwrapper <http://www.doughellmann.com/projects/virtualenvwrapper/>`_
 before installing Pelican::
 
-    $ pip install virtualenvwrapper
+    $ sudo pip install --upgrade virtualenv virtualenvwrapper
     $ mkvirtualenv pelican
 
 Once the virtual environment has been created and activated, Pelican can be
-be installed via pip or easy_install as noted above. Alternatively, if you
-have the project source, you can install Pelican using the distutils 
+be installed via ``pip`` or ``easy_install`` as noted above. Alternatively, if
+you have the project source, you can install Pelican using the distutils 
 method::
 
     $ cd path-to-Pelican-source
@@ -34,6 +89,11 @@ version of Pelican rather than a stable release, use the following command::
 
     $ pip install -e git://github.com/ametaireau/pelican#egg=pelican
 
+If you plan on using Markdown as a markup format, you'll need to install the
+Markdown library as well::
+
+    $ pip install Markdown
+
 Upgrading
 ---------
 
@@ -83,7 +143,6 @@ following syntax (give your file the ``.rst`` extension)::
     :category: yeah
     :author: Alexis Metaireau
 
-
 You can also use Markdown syntax (with a file ending in ``.md``).
 Markdown generation will not work until you explicitly install the ``Markdown``
 package, which can be done via ``pip install Markdown``. Metadata syntax for
@@ -105,27 +164,28 @@ example, a file located at ``python/foobar/myfoobar.rst`` will have a category o
 Generate your blog
 ------------------
 
-To launch Pelican, just use the ``pelican`` command::
+The ``make`` shortcut commands mentioned in the ``Kickstart a blog`` section
+are mostly wrappers around the ``pelican`` command that generates the HTML from
+the content. The ``pelican`` command can also be run directly::
 
     $ pelican /path/to/your/content/ [-s path/to/your/settings.py]
 
-And… that's all! Your weblog will be generated and saved in the ``content/``
-folder.
+The above command will generate your weblog and save it in the ``content/``
+folder, using the default theme to produce a simple site. It's not
+very sexy, as it's just simple HTML output (without any style). You can create
+your own style if you want.
 
-The above command will use the default theme to produce a simple site. It's not
-very sexy, as it's just simple HTML output (without any style).
-
-You can create your own style if you want. Have a look at the help to see all
-the options you can use::
+Pelican has other command-line switches available. Have a look at the help to
+see all the options you can use::
 
     $ pelican --help
 
-Kickstart a blog
-----------------
+Auto-reload
+-----------
 
-You also can use the ``pelican-quickstart`` script to start a new blog in
-seconds by just answering a few questions. Just run ``pelican-quickstart`` and
-you're done! (Added in Pelican 3.0)
+It's possible to tell Pelican to watch for your modifications, instead of
+manually re-running it every time you want to see your changes. To enable this,
+run the ``pelican`` command with the ``-r`` or ``--autoreload`` option.
 
 Pages
 -----
@@ -209,13 +269,6 @@ For Markdown, format your code blocks thusly::
 The specified identifier should be one that appears on the 
 `list of available lexers <http://pygments.org/docs/lexers/>`_.
 
-Auto-reload
------------
-
-It's possible to tell Pelican to watch for your modifications, instead of
-manually re-running it every time you want to see your changes. To enable this,
-run the ``pelican`` command with the ``-r`` or ``--autoreload`` option.
-
 Publishing drafts
 -----------------
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 78ede790..3c557e87 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -59,18 +59,16 @@ Setting name (default value)                                            What doe
 `PDF_GENERATOR` (``False``)                                             Set to True if you want to have PDF versions
                                                                         of your documents. You will need to install
                                                                         `rst2pdf`.
-`RELATIVE_URLS` (``True``)                                              Defines whether Pelican should use relative URLs or
-                                                                        not.
+`RELATIVE_URLS` (``True``)                                              Defines whether Pelican should use document-relative URLs or
+                                                                        not. If set to ``False``, Pelican will use the SITEURL
+                                                                        setting to construct absolute URLs.
 `PLUGINS` (``[]``)                                                      The list of plugins to load. See :ref:`plugins`.
 `SITENAME` (``'A Pelican Blog'``)                                       Your site name
 `SITEURL`                                                               Base URL of your website. Not defined by default,
-                                                                        which means the base URL is assumed to be "/" with a
-                                                                        root-relative URL structure. If `SITEURL` is specified
-                                                                        explicitly, there should be no trailing slash at the end,
-                                                                        and URLs will be generated with an absolute URL structure
-                                                                        (including the domain). If you want to use relative URLs
-                                                                        instead of root-relative or absolute URLs, you should
-                                                                        instead use the `RELATIVE_URL` setting.
+                                                                        so it is best to specify your SITEURL; if you do not, feeds
+                                                                        will not be generated with properly-formed URLs. You should 
+                                                                        include ``http://`` and your domain, with no trailing
+                                                                        slash at the end. Example: ``SITEURL = 'http://mydomain.com'``
 `STATIC_PATHS` (``['images']``)                                         The static paths you want to have accessible
                                                                         on the output path "static". By default,
                                                                         Pelican will copy the 'images' folder to the
@@ -107,6 +105,15 @@ Setting name (default value)                                            What doe
 URL settings
 ------------
 
+The first thing to understand is that there are currently two supported methods
+for URL formation: *relative* and *absolute*. Document-relative URLs are useful
+when testing locally, and absolute URLs are reliable and most useful when
+publishing. One method of supporting both is to have one Pelican configuration
+file for local development and another for publishing. To see an example of this
+type of setup, use the ``pelican-quickstart`` script as described at the top of
+the :doc:`Getting Started<getting_started>` page, which will produce two separate
+configuration files for local development and publishing, respectively.
+
 You can customize the URLs and locations where files will be saved. The URLs and
 SAVE_AS variables use Python's format strings. These variables allow you to place
 your articles in a location such as '{slug}/index.html' and link to them as
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 0e713fe8..f747d048 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -24,6 +24,7 @@ CONF = {
     'ssh_target_dir': '/var/www',
     'dropbox_dir' : '~/Dropbox/Public/',
     'default_pagination' : 10,
+    'siteurl': '',
     'lang': 'en'
 }
 
@@ -138,35 +139,44 @@ Please answer the following questions so this script can generate the files need
 
     '''.format(v=__version__))
 
-    CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new web site?', answer=str, default=args.path))
+    project = os.path.join(os.environ['VIRTUAL_ENV'], '.project')
+    if os.path.isfile(project):
+        CONF['basedir'] = open(project, 'r').read().rstrip("\n")
+        print('Using project associated with current virtual environment. Will save to:\n%s\n' % CONF['basedir'])
+    else:
+        CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new web site?', answer=str, default=args.path))
+
     CONF['sitename'] = ask('What will be the title of this web site?', answer=str, default=args.title)
     CONF['author'] = ask('Who will be the author of this web site?', answer=str, default=args.author)
-    CONF['lang'] = ask('What will be the default language of this web site ?', str, args.lang or CONF['lang'], 2)
+    CONF['lang'] = ask('What will be the default language of this web site?', str, args.lang or CONF['lang'], 2)
 
-    CONF['with_pagination'] = ask('Do you want to enable article pagination ?', bool, bool(CONF['default_pagination']))
+    if ask('Do you want to specify a URL prefix? e.g., http://example.com  ', answer=bool, default=True):
+        CONF['siteurl'] = ask('What is your URL prefix? (see above example; no trailing slash)', str, CONF['siteurl'])
+
+    CONF['with_pagination'] = ask('Do you want to enable article pagination?', bool, bool(CONF['default_pagination']))
 
     if CONF['with_pagination']:
         CONF['default_pagination'] = ask('How many articles per page do you want?', int, CONF['default_pagination'])
     else:
         CONF['default_pagination'] = False
 
-    mkfile = ask('Do you want to generate a Makefile to easily manage your website ?', bool, True)
+    mkfile = ask('Do you want to generate a Makefile to easily manage your website?', bool, True)
 
     if mkfile:
-        if ask('Do you want to upload your website using FTP ?', answer=bool, default=False):
-            CONF['ftp_host'] = ask('What is the hostname of your FTP server ?', str, CONF['ftp_host'])
+        if ask('Do you want to upload your website using FTP?', answer=bool, default=False):
+            CONF['ftp_host'] = ask('What is the hostname of your FTP server?', str, CONF['ftp_host'])
             CONF['ftp_user'] = ask('What is your username on that server?', str, CONF['ftp_user'])
             CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ftp_target_dir']) 
-        if ask('Do you want to upload your website using SSH ?', answer=bool, default=False):
-            CONF['ssh_host'] = ask('What is the hostname of your SSH server ?', str, CONF['ssh_host'])
+        if ask('Do you want to upload your website using SSH?', answer=bool, default=False):
+            CONF['ssh_host'] = ask('What is the hostname of your SSH server?', str, CONF['ssh_host'])
             CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])
             CONF['ssh_user'] = ask('What is your username on that server?', str, CONF['ssh_user'])
             CONF['ssh_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ssh_target_dir'])
-        if ask('Do you want to upload your website using Dropbox ?', answer=bool, default=False):
-            CONF['dropbox_dir'] = ask('Where is your Dropbox directory ?', str, CONF['dropbox_dir'])
+        if ask('Do you want to upload your website using Dropbox?', answer=bool, default=False):
+            CONF['dropbox_dir'] = ask('Where is your Dropbox directory?', str, CONF['dropbox_dir'])
 
     try:
-        os.makedirs(os.path.join(CONF['basedir'], 'src'))
+        os.makedirs(os.path.join(CONF['basedir'], 'content'))
     except OSError, e:
         print('Error: {0}'.format(e))
 
@@ -176,8 +186,17 @@ Please answer the following questions so this script can generate the files need
         print('Error: {0}'.format(e))
 
     try:
-        with open(os.path.join(CONF['basedir'], 'pelican.conf.py'), 'w') as fd:
-            for line in get_template('pelican.conf.py'):
+        with open(os.path.join(CONF['basedir'], 'pelicanconf.py'), 'w') as fd:
+            for line in get_template('pelicanconf.py'):
+                template = string.Template(line)
+                fd.write(template.safe_substitute(CONF))
+            fd.close()
+    except OSError, e:
+        print('Error: {0}'.format(e))
+
+    try:
+        with open(os.path.join(CONF['basedir'], 'publishconf.py'), 'w') as fd:
+            for line in get_template('publishconf.py'):
                 template = string.Template(line)
                 fd.write(template.safe_substitute(CONF))
             fd.close()
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 392336d7..3a3fe74c 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -2,9 +2,10 @@ PELICAN=$pelican
 PELICANOPTS=$pelicanopts
 
 BASEDIR=$$(PWD)
-INPUTDIR=$$(BASEDIR)/src
+INPUTDIR=$$(BASEDIR)/content
 OUTPUTDIR=$$(BASEDIR)/output
-CONFFILE=$$(BASEDIR)/pelican.conf.py
+CONFFILE=$$(BASEDIR)/pelicanconf.py
+PUBLISHCONF=$$(BASEDIR)/publishconf.py
 
 FTP_HOST=$ftp_host
 FTP_USER=$ftp_user
@@ -23,10 +24,11 @@ help:
 	@echo 'Usage:                                                                 '
 	@echo '   make html                        (re)generate the web site          '
 	@echo '   make clean                       remove the generated files         '
-	@echo '   ftp_upload                       upload the web site using FTP      '
-	@echo '   ssh_upload                       upload the web site using SSH      '
-	@echo '   dropbox_upload                   upload the web site using Dropbox  '
-	@echo '   rsync_upload                     upload the web site using rsync/ssh'
+	@echo '   make publish                     generate using production settings '
+	@echo '   ftp_upload                       upload the web site via FTP        '
+	@echo '   ssh_upload                       upload the web site via SSH        '
+	@echo '   dropbox_upload                   upload the web site via Dropbox    '
+	@echo '   rsync_upload                     upload the web site via rsync/ssh  '
 	@echo '                                                                       '
 
 
@@ -37,23 +39,31 @@ $$(OUTPUTDIR)/%.html:
 	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 clean:
-	rm -fr $$(OUTPUTDIR)
-	mkdir $$(OUTPUTDIR)
+	find $$(OUTPUTDIR) -mindepth 1 -delete
 
-dropbox_upload: $$(OUTPUTDIR)/index.html
+regenerate: clean
+	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
+
+serve:
+	cd $$(OUTPUTDIR) && python -m SimpleHTTPServer
+
+publish:
+	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(PUBLISHCONF) $$(PELICANOPTS)
+
+dropbox_upload: publish
 	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
 
-ssh_upload: $$(OUTPUTDIR)/index.html
+ssh_upload: publish
 	scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
-rsync_upload: $$(OUTPUTDIR)/index.html
+rsync_upload: publish
 	rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
-ftp_upload: $$(OUTPUTDIR)/index.html
+ftp_upload: publish
 	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
 
-github: $$(OUTPUTDIR)/index.html
+github: publish
 	ghp-import $$(OUTPUTDIR)
 	git push origin gh-pages
 
-.PHONY: html help clean ftp_upload ssh_upload rsync_upload dropbox_upload github
+.PHONY: html help clean regenerate serve publish ftp_upload ssh_upload rsync_upload dropbox_upload github
diff --git a/pelican/tools/templates/pelican.conf.py.in b/pelican/tools/templates/pelicanconf.py.in
similarity index 100%
rename from pelican/tools/templates/pelican.conf.py.in
rename to pelican/tools/templates/pelicanconf.py.in
diff --git a/pelican/tools/templates/publishconf.py.in b/pelican/tools/templates/publishconf.py.in
new file mode 100644
index 00000000..391eb9fa
--- /dev/null
+++ b/pelican/tools/templates/publishconf.py.in
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*- #
+
+from pelicanconf import *
+
+SITEURL = '$siteurl'
+
+DELETE_OUTPUT_DIRECTORY = True
+
+# Following items are often useful when publishing
+
+# Uncomment following line for absolute URLs in production:
+#RELATIVE_URLS = False
+
+#DISQUS_SITENAME = ""
+#GOOGLE_ANALYTICS = ""
+

From 18b4d65c4eefcc020e7094b1886a105d8fc107e0 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Sat, 7 Jul 2012 08:45:50 -0700
Subject: [PATCH 0771/2864] Clarify quickstart docs and remove spurious line

---
 docs/getting_started.rst                  | 117 +++++++++++-----------
 pelican/tools/templates/publishconf.py.in |   1 -
 2 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 954dac3d..93d578a0 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -1,65 +1,10 @@
 Getting started
 ###############
 
-Kickstart a blog
-================
-
-You're ready? Let's go! Following is a brief tutorial for those who want to get
-started right away. Subsequent sections below will cover individual topics in
-greater detail. To get started, here are some recommended install steps for
-Pelican::
-
-    $ sudo pip install --upgrade virtualenv virtualenvwrapper
-    $ mkvirtualenv pelican
-    $ pip install pelican Markdown
-    $ mkdir ~/code/yoursitename # (where you want your new site code to be saved)
-    $ cd ~/code/yoursitename
-    $ setvirtualenvproject
-    $ pelican-quickstart
-
-Once you've run that last ``pelican-quickstart`` command, you'll be asked some
-questions about your site. Once you finish answering all the questions, you can
-begin adding content to the *content* folder that has been created for you.
-(See *Writing articles using Pelican* section below for more information
-about how to format your content.) Once you have some content to generate, you
-can convert it to HTML via the following command::
-
-    $ make html
-
-If you'd prefer to have Pelican automatically regenerate your site every time a
-change is detected (handy when testing locally), use the following command
-instead::
-
-    $ make regenerate
-
-To preview the site in your browser, open a new terminal tab and enter::
-
-    $ workon yoursitename
-    $ make serve
-
-Visit http://localhost:8000 in your browser to see your site.
-
-When you're ready to publish your site, you can upload it via the method(s) you
-chose during the ``pelican-quickstart`` questionnaire. For this example, we'll
-use rsync over ssh::
-
-    $ make rsync_upload
-
-That's it! Your site should now be live.
-
-Closing the current terminal session will also close the virtual environment in
-which we installed Pelican. In the future, when you want to work on your site,
-you can activate its virtual environment via::
-
-    $ workon yoursitename
-
-Not only will that command activate your new site's virtual environment, but it
-will also automatically change your working directory to your site project.
-
 Installing Pelican
 ==================
 
-You can install Pelican via several different methods.
+You're ready? Let's go! You can install Pelican via several different methods.
 The simplest is via `pip <http://www.pip-installer.org/>`_::
 
     $ pip install pelican
@@ -75,6 +20,7 @@ before installing Pelican::
 
     $ sudo pip install --upgrade virtualenv virtualenvwrapper
     $ mkvirtualenv pelican
+    $ pip install pelican
 
 Once the virtual environment has been created and activated, Pelican can be
 be installed via ``pip`` or ``easy_install`` as noted above. Alternatively, if
@@ -122,6 +68,59 @@ Optionally:
 * pygments, for syntax highlighting
 * Markdown, for supporting Markdown as an input format
 
+Kickstart a blog
+================
+
+Following is a brief tutorial for those who want to get started right away.
+We're going to assume Pelican was installed in a virtual environment via the
+following steps (if you're not using a virtual environment for Pelican, you can
+skip to the ``pelican-quickstart`` command)::
+
+    $ sudo pip install --upgrade virtualenv virtualenvwrapper
+    $ mkvirtualenv pelican
+    $ pip install pelican Markdown
+
+Next we'll create a directory to house our site content and configuration files,
+which can be located any place you prefer, and associate this new project with
+the currently-active virtual environment::
+
+    $ mkdir ~/code/yoursitename
+    $ cd ~/code/yoursitename
+    $ setvirtualenvproject
+
+Now we can run the ``pelican-quickstart`` command, which will ask some questions
+about your site::
+
+    $ pelican-quickstart
+
+Once you finish answering all the questions, you can begin adding content to the
+*content* folder that has been created for you. (See *Writing articles using
+Pelican* section below for more information about how to format your content.)
+Once you have some content to generate, you can convert it to HTML via the
+following command::
+
+    $ make html
+
+If you'd prefer to have Pelican automatically regenerate your site every time a
+change is detected (handy when testing locally), use the following command
+instead::
+
+    $ make regenerate
+
+To serve the site so it can be previewed in your browser::
+
+    $ make serve
+
+Visit http://localhost:8000 in your browser to see your site.
+
+When you're ready to publish your site, you can upload it via the method(s) you
+chose during the ``pelican-quickstart`` questionnaire. For this example, we'll
+use rsync over ssh::
+
+    $ make rsync_upload
+
+That's it! Your site should now be live.
+
 Writing articles using Pelican
 ==============================
 
@@ -171,9 +170,9 @@ the content. The ``pelican`` command can also be run directly::
     $ pelican /path/to/your/content/ [-s path/to/your/settings.py]
 
 The above command will generate your weblog and save it in the ``content/``
-folder, using the default theme to produce a simple site. It's not
-very sexy, as it's just simple HTML output (without any style). You can create
-your own style if you want.
+folder, using the default theme to produce a simple site. The default theme is
+simple HTML without styling and is provided so folks may use it as a basis for
+creating their own themes.
 
 Pelican has other command-line switches available. Have a look at the help to
 see all the options you can use::
diff --git a/pelican/tools/templates/publishconf.py.in b/pelican/tools/templates/publishconf.py.in
index 391eb9fa..113a7318 100644
--- a/pelican/tools/templates/publishconf.py.in
+++ b/pelican/tools/templates/publishconf.py.in
@@ -14,4 +14,3 @@ DELETE_OUTPUT_DIRECTORY = True
 
 #DISQUS_SITENAME = ""
 #GOOGLE_ANALYTICS = ""
-

From dc21efbe10dc6552f882bdf69e4a210da100977a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 7 Jul 2012 10:33:47 -0700
Subject: [PATCH 0772/2864] Improved quickstart config formatting. Fixes #401.

---
 pelican/tools/templates/pelicanconf.py.in | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in
index 095a7e7d..07e286cd 100644
--- a/pelican/tools/templates/pelicanconf.py.in
+++ b/pelican/tools/templates/pelicanconf.py.in
@@ -7,19 +7,16 @@ SITEURL = ''
 
 TIMEZONE = 'Europe/Paris'
 
-DEFAULT_LANG='$lang'
+DEFAULT_LANG = '$lang'
 
 # Blogroll
-LINKS =  (
-    ('Pelican', 'http://docs.notmyidea.org/alexis/pelican/'),
-    ('Python.org', 'http://python.org'),
-    ('Jinja2', 'http://jinja.pocoo.org'),
-    ('You can modify those links in your config file', '#')
-         )
+LINKS =  (('Pelican', 'http://docs.notmyidea.org/alexis/pelican/'),
+          ('Python.org', 'http://python.org'),
+          ('Jinja2', 'http://jinja.pocoo.org'),
+          ('You can modify those links in your config file', '#'),)
 
 # Social widget
-SOCIAL = (
-          ('You can add links in your config file', '#'),
-         )
+SOCIAL = (('You can add links in your config file', '#'),
+          ('Another social link', '#'),)
 
 DEFAULT_PAGINATION = $default_pagination

From dff5b3589bf4d437cc6c250423066049f3ec1adc Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Sat, 7 Jul 2012 12:15:35 -0700
Subject: [PATCH 0773/2864] Add per page templates. Closes #376 Also set up
 helper classes in test_generators.py for cleaner tests

---
 docs/faq.rst                                  | 11 ++++
 pelican/contents.py                           | 11 ++++
 pelican/generators.py                         | 15 +++---
 tests/TestPages/hidden_page_with_template.rst | 11 ++++
 tests/TestPages/page_with_template.rst        |  8 +++
 tests/content/article_with_template.rst       |  8 +++
 tests/test_contents.py                        | 25 ++++++++-
 tests/test_generators.py                      | 54 +++++++++++++++++--
 8 files changed, 128 insertions(+), 15 deletions(-)
 create mode 100644 tests/TestPages/hidden_page_with_template.rst
 create mode 100644 tests/TestPages/page_with_template.rst
 create mode 100644 tests/content/article_with_template.rst

diff --git a/docs/faq.rst b/docs/faq.rst
index a3829d65..3eec6e84 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -49,3 +49,14 @@ install it. You can do so by typing::
 In case you don't have pip installed, consider installing it via::
 
     $ (sudo) easy_install pip
+
+How do I assign custom templates on a per page basis?
+=====================================================
+
+It's as simple as adding an extra line of metadata to any pages or articles you
+want to have it's own template.
+
+    :template: template_name
+
+Then just make sure to have the template installed in to your theme as
+``template_name.html``.
\ No newline at end of file
diff --git a/pelican/contents.py b/pelican/contents.py
index b8bb0993..a5e3be8f 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -21,6 +21,7 @@ class Page(object):
     :param content: the string to parse, containing the original content.
     """
     mandatory_properties = ('title',)
+    default_template = 'page'
 
     def __init__(self, content, metadata=None, settings=None,
                  filename=None):
@@ -44,6 +45,9 @@ class Page(object):
         # also keep track of the metadata attributes available
         self.metadata = local_metadata
 
+        #default template if it's not defined in page
+        self.template = self._get_template()
+
         # default author to the one in settings if not defined
         if not hasattr(self, 'author'):
             if 'AUTHOR' in settings:
@@ -153,9 +157,16 @@ class Page(object):
     url = property(functools.partial(get_url_setting, key='url'))
     save_as = property(functools.partial(get_url_setting, key='save_as'))
 
+    def _get_template(self):
+        if hasattr(self, 'template') and self.template is not None:
+            return self.template
+        else:
+            return self.default_template
+
 
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')
+    default_template = 'article'
 
 
 class Quote(Page):
diff --git a/pelican/generators.py b/pelican/generators.py
index 4e9312cc..8526a56d 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -167,11 +167,9 @@ class ArticlesGenerator(Generator):
 
     def generate_articles(self, write):
         """Generate the articles."""
-        article_template = self.get_template('article')
         for article in chain(self.translations, self.articles):
-            write(article.save_as,
-                          article_template, self.context, article=article,
-                          category=article.category)
+            write(article.save_as, self.get_template(article.template),
+                self.context, article=article, category=article.category)
 
     def generate_direct_templates(self, write):
         """Generate direct templates pages"""
@@ -222,10 +220,10 @@ class ArticlesGenerator(Generator):
 
     def generate_drafts(self, write):
         """Generate drafts pages."""
-        article_template = self.get_template('article')
         for article in self.drafts:
-            write('drafts/%s.html' % article.slug, article_template,
-                  self.context, article=article, category=article.category)
+            write('drafts/%s.html' % article.slug,
+                self.get_template(article.template), self.context,
+                article=article, category=article.category)
 
     def generate_pages(self, writer):
         """Generate the pages on the disk"""
@@ -385,7 +383,6 @@ class PagesGenerator(Generator):
                                (repr(unicode.encode(page.status, 'utf-8')),
                                 repr(f)))
 
-
         self.pages, self.translations = process_translations(all_pages)
         self.hidden_pages, self.hidden_translations = process_translations(hidden_pages)
 
@@ -395,7 +392,7 @@ class PagesGenerator(Generator):
     def generate_output(self, writer):
         for page in chain(self.translations, self.pages,
                             self.hidden_translations, self.hidden_pages):
-            writer.write_file(page.save_as, self.get_template('page'),
+            writer.write_file(page.save_as, self.get_template(page.template),
                     self.context, page=page,
                     relative_urls=self.settings.get('RELATIVE_URLS'))
 
diff --git a/tests/TestPages/hidden_page_with_template.rst b/tests/TestPages/hidden_page_with_template.rst
new file mode 100644
index 00000000..36104a09
--- /dev/null
+++ b/tests/TestPages/hidden_page_with_template.rst
@@ -0,0 +1,11 @@
+This is a test hidden page with a custom template
+#################################################
+
+:status: hidden
+:template: custom
+
+The quick brown fox jumped over the lazy dog's back.
+
+This page is hidden
+
+This page has a custom template to be called when rendered
diff --git a/tests/TestPages/page_with_template.rst b/tests/TestPages/page_with_template.rst
new file mode 100644
index 00000000..9388dc2f
--- /dev/null
+++ b/tests/TestPages/page_with_template.rst
@@ -0,0 +1,8 @@
+This is a test page with a preset template
+##########################################
+
+:template: custom
+
+The quick brown fox jumped over the lazy dog's back.
+
+This article has a custom template to be called when rendered
diff --git a/tests/content/article_with_template.rst b/tests/content/article_with_template.rst
new file mode 100644
index 00000000..eb55738c
--- /dev/null
+++ b/tests/content/article_with_template.rst
@@ -0,0 +1,8 @@
+Article with template
+#####################
+
+:template: custom
+
+This article has a custom template to be called when rendered
+
+This is some content. With some stuff to "typogrify".
diff --git a/tests/test_contents.py b/tests/test_contents.py
index e7c9ad01..bc028ea8 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -2,7 +2,7 @@
 
 from .support import unittest
 
-from pelican.contents import Page
+from pelican.contents import Page, Article
 from pelican.settings import _DEFAULT_CONFIG
 from pelican.utils import truncate_html_words
 
@@ -135,6 +135,17 @@ class TestPage(unittest.TestCase):
             # will simply skip this test.
             unittest.skip("There is no locale %s in this system." % locale)
 
+    def test_template(self):
+        """
+        Pages default to page, metadata overwrites
+        """
+        default_page = Page(**self.page_kwargs)
+        self.assertEqual('page', default_page.template)
+        page_kwargs = self._copy_page_kwargs()
+        page_kwargs['metadata']['template'] = 'custom'
+        custom_page = Page(**page_kwargs)
+        self.assertEqual('custom', custom_page.template)
+
     def _copy_page_kwargs(self):
         # make a deep copy of page_kwargs
         page_kwargs = dict([(key, self.page_kwargs[key]) for key in
@@ -146,3 +157,15 @@ class TestPage(unittest.TestCase):
                                      for subkey in page_kwargs[key]])
 
         return page_kwargs
+
+class TestArticle(TestPage):
+    def test_template(self):
+        """
+        Articles default to article, metadata overwrites
+        """
+        default_article = Article(**self.page_kwargs)
+        self.assertEqual('article', default_article.template)
+        article_kwargs = self._copy_page_kwargs()
+        article_kwargs['metadata']['template'] = 'custom'
+        custom_article = Article(**article_kwargs)
+        self.assertEqual('custom', custom_article.template)
diff --git a/tests/test_generators.py b/tests/test_generators.py
index 61f31696..3b0a4b46 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -13,6 +13,37 @@ CUR_DIR = os.path.dirname(__file__)
 
 class TestArticlesGenerator(unittest.TestCase):
 
+    def setUp(self):
+        super(TestArticlesGenerator, self).setUp()
+        self.generator = None
+
+    def get_populated_generator(self):
+        """
+        We only need to pull all the test articles once, but read from it
+         for each test.
+        """
+        if self.generator is None:
+            settings = _DEFAULT_CONFIG.copy()
+            settings['ARTICLE_DIR'] = 'content'
+            settings['DEFAULT_CATEGORY'] = 'Default'
+            self.generator = ArticlesGenerator(settings.copy(), settings,
+                                CUR_DIR, _DEFAULT_CONFIG['THEME'], None,
+                                _DEFAULT_CONFIG['MARKUP'])
+            self.generator.generate_context()
+        return self.generator
+
+    def distill_articles(self, articles):
+        distilled = []
+        for page in articles:
+           distilled.append([
+                    page.title,
+                    page.status,
+                    page.category.name,
+                    page.template
+                ]
+           )
+        return distilled
+
     def test_generate_feeds(self):
 
         generator = ArticlesGenerator(None, {'FEED': _DEFAULT_CONFIG['FEED']},
@@ -93,6 +124,16 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_direct_templates(write)
         write.assert_called_count == 0
 
+    def test_per_article_template(self):
+        """
+        Custom template articles get the field but standard/unset are None
+        """
+        generator = self.get_populated_generator()
+        articles = self.distill_articles(generator.articles)
+        custom_template = ['Article with template', 'published', 'Default', 'custom']
+        standard_template = ['This is a super article !', 'published', 'Yeah', 'article']
+        self.assertIn(custom_template, articles)
+        self.assertIn(standard_template, articles)
 
 class TestPageGenerator(unittest.TestCase):
     """
@@ -107,7 +148,8 @@ class TestPageGenerator(unittest.TestCase):
         for page in pages:
            distilled.append([
                     page.title,
-                    page.status
+                    page.status,
+                    page.template
                 ]
            )
         return distilled
@@ -124,12 +166,14 @@ class TestPageGenerator(unittest.TestCase):
         hidden_pages = self.distill_pages(generator.hidden_pages)
 
         pages_expected = [
-            [u'This is a test page', 'published'],
-            [u'This is a markdown test page', 'published']
+            [u'This is a test page', 'published', 'page'],
+            [u'This is a markdown test page', 'published', 'page'],
+            [u'This is a test page with a preset template', 'published', 'custom']
         ]
         hidden_pages_expected = [
-            [u'This is a test hidden page', 'hidden'],
-            [u'This is a markdown test hidden page', 'hidden']
+            [u'This is a test hidden page', 'hidden', 'page'],
+            [u'This is a markdown test hidden page', 'hidden', 'page'],
+            [u'This is a test hidden page with a custom template', 'hidden', 'custom']
         ]
 
         self.assertItemsEqual(pages_expected,pages)

From a1f27d9189461da533a8cc4334e7701e33ab8ff3 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Sat, 7 Jul 2012 16:59:58 -0700
Subject: [PATCH 0774/2864] Small change to fix #406

---
 pelican/tools/templates/publishconf.py.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/tools/templates/publishconf.py.in b/pelican/tools/templates/publishconf.py.in
index 113a7318..a4516332 100644
--- a/pelican/tools/templates/publishconf.py.in
+++ b/pelican/tools/templates/publishconf.py.in
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*- #
 
+import sys
+sys.path.append('.')
 from pelicanconf import *
 
 SITEURL = '$siteurl'

From 38ffcfd4c40b5d054cfc99772d84a05cf8bd3e2e Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Sun, 8 Jul 2012 17:50:18 -0700
Subject: [PATCH 0775/2864] Added the delevop_server script This script and the
 small changes to quick start's makefile make for easily launching and killing
 of pelican --debug --autoreload and SimpleHTTPServer. This is extra useful
 for working on templates.

---
 pelican/tools/pelican_quickstart.py          | 11 ++-
 pelican/tools/templates/Makefile.in          |  3 +-
 pelican/tools/templates/develop_server.sh.in | 83 ++++++++++++++++++++
 3 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100755 pelican/tools/templates/develop_server.sh.in

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index f747d048..577a435d 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -160,7 +160,7 @@ Please answer the following questions so this script can generate the files need
     else:
         CONF['default_pagination'] = False
 
-    mkfile = ask('Do you want to generate a Makefile to easily manage your website?', bool, True)
+    mkfile = ask('Do you want to generate a Makefile and develop server script to easily manage your website?', bool, True)
 
     if mkfile:
         if ask('Do you want to upload your website using FTP?', answer=bool, default=False):
@@ -214,4 +214,13 @@ Please answer the following questions so this script can generate the files need
         except OSError, e:
             print('Error: {0}'.format(e))
 
+        try:
+            with open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w') as fd:
+                for line in get_template('develop_server.sh'):
+                    template = string.Template(line)
+                    fd.write(template.safe_substitute(CONF))
+                fd.close()
+        except OSError, e:
+            print('Error: {0}'.format(e))
+
     print('Done. Your new project is available at %s' % CONF['basedir'])
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 3a3fe74c..df00ffbf 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -25,6 +25,7 @@ help:
 	@echo '   make html                        (re)generate the web site          '
 	@echo '   make clean                       remove the generated files         '
 	@echo '   make publish                     generate using production settings '
+	@echo '   make serve                       run develop_server.sh restart      '
 	@echo '   ftp_upload                       upload the web site via FTP        '
 	@echo '   ssh_upload                       upload the web site via SSH        '
 	@echo '   dropbox_upload                   upload the web site via Dropbox    '
@@ -45,7 +46,7 @@ regenerate: clean
 	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 serve:
-	cd $$(OUTPUTDIR) && python -m SimpleHTTPServer
+	$$(BASEDIR)/develop_server.sh restart
 
 publish:
 	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(PUBLISHCONF) $$(PELICANOPTS)
diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
new file mode 100755
index 00000000..2f8c07dd
--- /dev/null
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -0,0 +1,83 @@
+#!/bin/bash
+##
+# This section should match your Makefile
+##
+PELICAN=$pelican
+PELICANOPTS=$pelicanopts
+
+BASEDIR=$$(PWD)
+INPUTDIR=$$BASEDIR/content
+OUTPUTDIR=$$BASEDIR/output
+CONFFILE=$$BASEDIR/pelicanconf.py
+
+###
+# Don't change stuff below here unless you are sure
+###
+
+SRV_PID=$$BASEDIR/srv.pid
+PELICAN_PID=$$BASEDIR/pelican.pid
+
+function usage(){
+  echo "usage: $$0 (stop) (start) (restart)"
+  echo "This starts pelican in debug and reload mode and then launches"
+  echo "A SimpleHTTP server to help site development. It doesn't read"
+  echo "your pelican options so you edit any paths in your Makefile"
+  echo "you will need to edit it as well"
+  exit 3
+}
+
+function shut_down(){
+  if [[ -f $$SRV_PID ]]; then
+    PID=$$(cat $$SRV_PID)
+    PROCESS=$$(ps -p $$PID | tail -n 1 | awk '{print $$4}')
+    if [[ $$PROCESS == python ]]; then
+      echo "Killing SimpleHTTPServer"
+      kill $$PID
+    else
+      echo "Stale PID, deleting"
+    fi
+    rm $$SRV_PID
+  else
+    echo "SimpleHTTPServer PIDFile not found"
+  fi
+
+  if [[ -f $$PELICAN_PID ]]; then
+    PID=$$(cat $$PELICAN_PID)
+    PROCESS=$$(ps -p $$PID | tail -n 1 | awk '{print $$4}')
+    if [[ $$PROCESS != "" ]]; then
+      echo "Killing Pelican"
+      kill $$PID
+    else
+      echo "Stale PID, deleting"
+    fi
+    rm $$PELICAN_PID
+  else
+    echo "Pelican PIDFile not found"
+  fi
+}
+
+function start_up(){
+  echo "Starting up Pelican and SimpleHTTPServer"
+  shift
+  $$PELICAN --debug --autoreload -r $$INPUTDIR -o $$OUTPUTDIR -s $$CONFFILE $$PELICANOPTS &
+  echo $$! > $$PELICAN_PID
+  cd $$OUTPUTDIR
+  python -m SimpleHTTPServer &
+  echo $$! > $$SRV_PID
+  cd $$BASEDIR
+}
+
+###
+#  MAIN
+###
+[[ $$# -ne 1 ]] && usage
+if [[ $$1 == "stop" ]]; then
+  shut_down
+elif [[ $$1 == "restart" ]]; then
+  shut_down
+  start_up
+elif [[ $$1 == "start" ]]; then
+  start_up
+else
+  usage
+fi

From 10e668a87cd0e1fba125d04bcf93465600c81ba6 Mon Sep 17 00:00:00 2001
From: solsTiCe d'Hiver <solstice.dhiver@gmail.com>
Date: Mon, 9 Jul 2012 15:25:13 +0200
Subject: [PATCH 0776/2864] Fix issue #175

Force world-readable permission on files and directory of the
themes installed by pelican-themes.
Only on posix system i.e. mostly non Windows

Rationale:
If the theme's files have only -rw------- permissions, once installed
 system wide and owned by root, they will not be accessible to any user but only
root.
---
 pelican/tools/pelican_themes.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 6a021ecc..0083dd50 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -180,8 +180,19 @@ def install(path, v=False, u=False):
                 print("Copying `{p}' to `{t}' ...".format(p=path, t=theme_path))
             try:
                 shutil.copytree(path, theme_path)
-            except Exception, e:
+
+                if os.name == 'posix':
+                    for root, dirs, files in os.walk(theme_path):
+                        for d in dirs:
+                            dname = os.path.join(root, d)
+                            os.chmod(dname, 0755)
+                        for f in files:
+                            fname = os.path.join(root, f)
+                            os.chmod(fname, 0644)
+            except shutil.Error, e:
                 err("Cannot copy `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
+            except OSError, e:
+                err("Cannot change permissions of files or directory in `{r}':\n{e}".format(r=theme_path, e=str(e)), die=False)
 
 
 def symlink(path, v=False):

From 4acbbb8d0fa157fbb0cb10e2b0c6abc428f8ffab Mon Sep 17 00:00:00 2001
From: solsTiCe d'Hiver <solstice.dhiver@gmail.com>
Date: Mon, 9 Jul 2012 19:48:53 +0200
Subject: [PATCH 0777/2864] Use logging module instead of err function

---
 pelican/tools/pelican_themes.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 0083dd50..2fe4f459 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -192,7 +192,9 @@ def install(path, v=False, u=False):
             except shutil.Error, e:
                 err("Cannot copy `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
             except OSError, e:
-                err("Cannot change permissions of files or directory in `{r}':\n{e}".format(r=theme_path, e=str(e)), die=False)
+                import logging
+                logger = logging.getLogger(__name__)
+                logger.warning("Cannot change permissions of files or directory in `{r}':\n{e}".format(r=theme_path, e=str(e)))
 
 
 def symlink(path, v=False):

From 842817f110481c280b7a121e96a9a818c8354f6a Mon Sep 17 00:00:00 2001
From: solsTiCe d'Hiver <solstice.dhiver@gmail.com>
Date: Mon, 9 Jul 2012 20:05:21 +0200
Subject: [PATCH 0778/2864] Revert "Use logging module instead of err function"

This reverts commit 4acbbb8d0fa157fbb0cb10e2b0c6abc428f8ffab.

I don't know how to use logging/logger

This throws:
No handlers could be found for logger "pelican.tools.pelican_themes"
---
 pelican/tools/pelican_themes.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 2fe4f459..0083dd50 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -192,9 +192,7 @@ def install(path, v=False, u=False):
             except shutil.Error, e:
                 err("Cannot copy `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
             except OSError, e:
-                import logging
-                logger = logging.getLogger(__name__)
-                logger.warning("Cannot change permissions of files or directory in `{r}':\n{e}".format(r=theme_path, e=str(e)))
+                err("Cannot change permissions of files or directory in `{r}':\n{e}".format(r=theme_path, e=str(e)), die=False)
 
 
 def symlink(path, v=False):

From a0d2d3446649066e7f03560953b5962d9fdcadf5 Mon Sep 17 00:00:00 2001
From: solsTiCe d'Hiver <solstice.dhiver@gmail.com>
Date: Mon, 9 Jul 2012 20:07:31 +0200
Subject: [PATCH 0779/2864] shutil.copytree seems to throw OSError exception
 too

So revert to previous Exception handling
---
 pelican/tools/pelican_themes.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 0083dd50..d13e60e9 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -181,18 +181,19 @@ def install(path, v=False, u=False):
             try:
                 shutil.copytree(path, theme_path)
 
-                if os.name == 'posix':
-                    for root, dirs, files in os.walk(theme_path):
-                        for d in dirs:
-                            dname = os.path.join(root, d)
-                            os.chmod(dname, 0755)
-                        for f in files:
-                            fname = os.path.join(root, f)
-                            os.chmod(fname, 0644)
-            except shutil.Error, e:
+                try:
+                    if os.name == 'posix':
+                        for root, dirs, files in os.walk(theme_path):
+                            for d in dirs:
+                                dname = os.path.join(root, d)
+                                os.chmod(dname, 0755)
+                            for f in files:
+                                fname = os.path.join(root, f)
+                                os.chmod(fname, 0644)
+                except OSError, e:
+                    err("Cannot change permissions of files or directory in `{r}':\n{e}".format(r=theme_path, e=str(e)), die=False)
+            except Exception, e:
                 err("Cannot copy `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
-            except OSError, e:
-                err("Cannot change permissions of files or directory in `{r}':\n{e}".format(r=theme_path, e=str(e)), die=False)
 
 
 def symlink(path, v=False):

From a86d5fda71a2d2ce7295cb385641331b139bf361 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Mon, 9 Jul 2012 22:43:51 -0400
Subject: [PATCH 0780/2864] add documentation for html reader

---
 docs/getting_started.rst | 30 ++++++++++++++++++++++++++++++
 docs/internals.rst       |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 93d578a0..d60cce83 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -154,6 +154,36 @@ Markdown posts should follow this pattern::
 
     This is the content of my super blog post.
 
+Lastly, you can use Vanilla HTML (files ending in ``.htm`` and ``.html``). Pelican 
+interprets the HTML in a very straightforward manner, reading meta data out
+of ``meta`` tags, the title out of the ``title`` tag, and the body out of the 
+``body`` tag::
+
+    <html>
+        <head>
+            <title>My super title</title>
+            <meta name="tags" contents="thats, awesome" />
+            <meta name="date" contents="2012-07-09 22:28" />
+            <meta name="category" contents="yeah" />
+            <meta name="author" contents="Alexis Métaireau" />
+        </head>
+        <body>
+            This is the content of my super blog post.
+            <!-- PELICAN_END_SUMMARY -->
+            Content continues down here.
+        </body>
+    </html>
+
+With HTML, there are two simple exceptions to the standard metadata. First, 
+``tags`` can be specified either with the ``tags`` metadata, as is standard in 
+Pelican, or with the ``keywords`` metadata, as is standard in HTML. The two can 
+be used interchangeably. The second note is that summaries are done differently 
+in HTML posts. Either a ``summary`` metadata tag can be supplied, or, as seen 
+above, you can place an HTML comment, ``<!-- PELICAN_END_SUMMARY -->``, that 
+Pelican will recognize. Everything before the comment will be treated as a 
+summary. The content of the post will contain everything in the body tag, with 
+the special comment stripped out.
+
 Note that, aside from the title, none of this metadata is mandatory: if the date
 is not specified, Pelican will rely on the file's "mtime" timestamp, and the
 category can be determined by the directory in which the file resides. For
diff --git a/docs/internals.rst b/docs/internals.rst
index 6b6f991f..a94d1c56 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -23,7 +23,7 @@ The logic is separated into different classes and concepts:
   on. Since those operations are commonly used, the object is created once and
   then passed to the generators.
 
-* **Readers** are used to read from various formats (Markdown and
+* **Readers** are used to read from various formats (HTML, Markdown and
   reStructuredText for now, but the system is extensible). Given a file, they return
   metadata (author, tags, category, etc.) and content (HTML-formatted).
 

From 4ec6cefe1db92c0bc6cea9a95c810e3f5b455865 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Mon, 9 Jul 2012 22:45:34 -0400
Subject: [PATCH 0781/2864] fix grammar

---
 docs/getting_started.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index d60cce83..5e553815 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -154,7 +154,7 @@ Markdown posts should follow this pattern::
 
     This is the content of my super blog post.
 
-Lastly, you can use Vanilla HTML (files ending in ``.htm`` and ``.html``). Pelican 
+Lastly, you can use vanilla HTML (files ending in ``.htm`` and ``.html``). Pelican 
 interprets the HTML in a very straightforward manner, reading meta data out
 of ``meta`` tags, the title out of the ``title`` tag, and the body out of the 
 ``body`` tag::

From ddc0aa0e8260f5ab61eb16369632a18c1ee21648 Mon Sep 17 00:00:00 2001
From: Samrat Man Singh <samratmansingh@gmail.com>
Date: Tue, 10 Jul 2012 11:06:07 +0545
Subject: [PATCH 0782/2864] Related posts is now working, but needs some actual
 logic.

---
 pelican/generators.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 4e9312cc..a7180e98 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -116,6 +116,7 @@ class ArticlesGenerator(Generator):
         self.dates = {}
         self.tags = defaultdict(list)
         self.categories = defaultdict(list)
+        self.related_posts = []
         self.authors = defaultdict(list)
         super(ArticlesGenerator, self).__init__(*args, **kwargs)
         self.drafts = []
@@ -344,8 +345,14 @@ class ArticlesGenerator(Generator):
         self.authors = list(self.authors.items())
         self.authors.sort(key=lambda item: item[0].name)
 
+        for article in self.articles:
+            article.related_posts = []
+            print article
+            potential_related = all_articles.remove(article)
+            article.related_posts = potential_related[:5]
+    
         self._update_context(('articles', 'dates', 'tags', 'categories',
-                              'tag_cloud', 'authors'))
+                              'tag_cloud', 'authors', 'related_posts'))
 
     def generate_output(self, writer):
         self.generate_feeds(writer)

From 4d23ffc1121b553f9b2da6bb9f035fe63437456a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Tue, 10 Jul 2012 13:40:38 +0200
Subject: [PATCH 0783/2864] Updated the functional tests to match latest
 changes.

---
 .../basic/a-markdown-powered-article.html     |   2 +-
 tests/output/basic/archives.html              |   2 +-
 tests/output/basic/article-1.html             |   2 +-
 tests/output/basic/article-2.html             |   2 +-
 tests/output/basic/article-3.html             |   2 +-
 .../output/basic/author/alexis-metaireau.html |  12 +-
 tests/output/basic/author/dummy-author.html   |  32 ++--
 tests/output/basic/categories.html            |   4 +-
 tests/output/basic/category/bar.html          |   4 +-
 tests/output/basic/category/cat1.html         |  20 +--
 tests/output/basic/category/misc.html         | 147 ++++++++++++++++++
 tests/output/basic/category/yeah.html         |   4 +-
 .../output/basic/drafts/a-draft-article.html  |   8 +-
 tests/output/basic/feeds/all-fr.atom.xml      |   2 +-
 tests/output/basic/feeds/misc.atom.xml        |   4 +
 tests/output/basic/index.html                 |  40 ++---
 tests/output/basic/oh-yeah-fr.html            |   8 +-
 tests/output/basic/oh-yeah.html               |   2 +-
 .../pages/this-is-a-test-hidden-page.html     |  70 +++++++++
 .../basic/pages/this-is-a-test-page.html      |   2 +-
 tests/output/basic/second-article-fr.html     |   4 +-
 tests/output/basic/second-article.html        |   4 +-
 tests/output/basic/tag/bar.html               |  36 ++---
 tests/output/basic/tag/baz.html               |  28 ++--
 tests/output/basic/tag/foo.html               |  32 ++--
 tests/output/basic/tag/foobar.html            |   4 +-
 tests/output/basic/tag/oh.html                |   4 +-
 tests/output/basic/tag/yeah.html              |   4 +-
 tests/output/basic/theme/css/main.css         |   1 +
 .../basic/theme/images/icons/gitorious.png    | Bin 0 -> 3675 bytes
 .../output/basic/this-is-a-super-article.html |   2 +-
 tests/output/basic/unbelievable.html          |   4 +-
 tests/output/custom/tag/bar.html              |  20 +--
 tests/output/custom/tag/baz.html              |  20 +--
 tests/output/custom/tag/foo.html              |  20 +--
 35 files changed, 387 insertions(+), 165 deletions(-)
 create mode 100644 tests/output/basic/category/misc.html
 create mode 100644 tests/output/basic/feeds/misc.atom.xml
 create mode 100644 tests/output/basic/pages/this-is-a-test-hidden-page.html
 create mode 100644 tests/output/basic/theme/images/icons/gitorious.png

diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index ceadf79a..bfa09fdf 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -35,7 +35,7 @@
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index 52d00234..dac96a47 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index bd6f9716..ab1d71d7 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -35,7 +35,7 @@
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 7811204a..52cfff0d 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -35,7 +35,7 @@
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 96acb190..ef97a56d 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -35,7 +35,7 @@
                 
                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index 6bf631eb..ad7b8bee 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -88,7 +88,6 @@ YEAH !</p>
         
         
         
-        
             
 
         
@@ -96,7 +95,8 @@ YEAH !</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -124,10 +124,10 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/author/dummy-author.html b/tests/output/basic/author/dummy-author.html
index cf23f899..54c81100 100644
--- a/tests/output/basic/author/dummy-author.html
+++ b/tests/output/basic/author/dummy-author.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -77,7 +77,6 @@
         
         
         
-        
             
 
         
@@ -85,7 +84,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                    <h1><a href=".././article-1.html" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -112,7 +112,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -120,7 +119,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                    <h1><a href=".././article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -147,7 +147,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -155,7 +154,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                    <h1><a href=".././article-3.html" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -182,7 +182,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -190,7 +189,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -204,7 +204,7 @@
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
@@ -222,7 +222,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -230,7 +229,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                    <h1><a href=".././unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -244,7 +244,7 @@ Translations:
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 
 
 
@@ -257,10 +257,10 @@ Translations:
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index db25ed68..d13d0b92 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -48,7 +48,7 @@
 
     <li><a href="./category/cat1.html">cat1</a></li>
 
-    <li><a href="./category/content.html">content</a></li>
+    <li><a href="./category/misc.html">misc</a></li>
 
     <li><a href="./category/yeah.html">yeah</a></li>
 
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index 77d0187b..a80656a5 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -85,8 +85,8 @@ YEAH !</p>
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index 1d8d67e8..3d062ac7 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -35,7 +35,7 @@
                 
                     <li class="active"><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -77,7 +77,6 @@
         
         
         
-        
             
 
         
@@ -85,7 +84,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                    <h1><a href=".././article-1.html" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -112,7 +112,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -120,7 +119,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                    <h1><a href=".././article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -147,7 +147,6 @@
             </article></li>
         
         
-        
             
 
         
@@ -155,7 +154,8 @@
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                    <h1><a href=".././article-3.html" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -182,10 +182,10 @@
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
new file mode 100644
index 00000000..ff344111
--- /dev/null
+++ b/tests/output/basic/category/misc.html
@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>A Pelican Blog - misc</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li class="active"><a href=".././category/misc.html">misc</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+
+            
+
+        
+        
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
+        </address>
+        
+<p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
+
+
+Translations: 
+    
+        <a href=".././second-article-fr.html">fr</a>
+    
+
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+
+                </article>
+                
+            </aside><!-- /#featured -->
+            
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+            
+        
+        
+        
+            
+
+        
+         
+            
+            <li><article class="hentry">    
+                <header>
+                    <h1><a href=".././unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+        
+        <address class="vcard author">
+                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
+        </address>
+        
+<p>In <a href=".././category/misc.html">misc</a>. </p>
+
+
+
+</footer><!-- /.post-info -->
+                <p>Or completely awesome. Depends the needs.</p>
+
+                <a class="readmore" href=".././unbelievable.html">read more</a>
+                
+                </div><!-- /.entry-content -->
+            </article></li>
+        
+        
+            </ol><!-- /#posts-list -->
+            
+                
+            
+            </section><!-- /#content -->
+        
+    
+
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index 747cad37..1d4d7f04 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li class="active"><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -86,8 +86,8 @@
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index 99b90c33..af0f2476 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href=".././category/content.html">content</a></li>
+                    <li class="active"><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -53,8 +53,8 @@
 
     <div class="entry-content">
       <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
-                Fri 02 March 2012
+        <abbr class="published" title="2012-05-19T23:55:50.764304">
+                Sat 19 May 2012
         </abbr>
 
         
@@ -62,7 +62,7 @@
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 
 
 
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index ce245dee..274bd548 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-fr.atom.xml" rel="self"></link><id>.././</id><updated>2012-03-02T14:01:01Z</updated><entry><title>Trop bien !</title><link href=".././oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-fr.atom.xml" rel="self"></link><id>.././</id><updated>2012-05-19T23:55:50Z</updated><entry><title>Trop bien !</title><link href=".././oh-yeah-fr.html" rel="alternate"></link><updated>2012-05-19T23:55:50Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-05-19:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </summary></entry><entry><title>Deuxième article</title><link href=".././second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml
new file mode 100644
index 00000000..db33d39b
--- /dev/null
+++ b/tests/output/basic/feeds/misc.atom.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/misc.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 1f247443..fe6c2279 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -60,7 +60,7 @@
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
@@ -83,7 +83,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -91,7 +90,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./a-markdown-powered-article.html" rel="bookmark" title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                    <h1><a href="./a-markdown-powered-article.html" rel="bookmark"
+                           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -117,7 +117,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -125,7 +124,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
+                    <h1><a href="./article-1.html" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -152,7 +152,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -160,7 +159,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
+                    <h1><a href="./article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -187,7 +187,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -195,7 +194,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
+                    <h1><a href="./article-3.html" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -222,7 +222,6 @@ Translations:
             </article></li>
         
         
-        
             
 
         
@@ -230,7 +229,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href="./this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -258,7 +258,6 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
-        
             
 
         
@@ -266,7 +265,8 @@ as well as <strong>inline markup</strong>.</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                    <h1><a href="./oh-yeah.html" rel="bookmark"
+                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -303,7 +303,6 @@ YEAH !</p>
             </article></li>
         
         
-        
             
 
         
@@ -311,7 +310,8 @@ YEAH !</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href="./unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                    <h1><a href="./unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -325,7 +325,7 @@ YEAH !</p>
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 
 
@@ -338,10 +338,10 @@ YEAH !</p>
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index 666a961f..4856347f 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -53,8 +53,8 @@
 
     <div class="entry-content">
       <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
-                Fri 02 March 2012
+        <abbr class="published" title="2012-05-19T23:55:50.764304">
+                Sat 19 May 2012
         </abbr>
 
         
@@ -62,7 +62,7 @@
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 
 
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index c8f1af74..bd0c75ee 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html
new file mode 100644
index 00000000..4412d600
--- /dev/null
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>This is a test hidden page</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        
+
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
+                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+
+        <header id="banner" class="body">
+                <h1><a href="../.">A Pelican Blog </a></h1>
+                <nav><ul>
+                
+                
+                
+                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                
+                
+                
+                    <li ><a href=".././category/bar.html">bar</a></li>
+                
+                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                
+                    <li ><a href=".././category/misc.html">misc</a></li>
+                
+                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                
+                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+    <h1 class="entry-title">This is a test hidden page</h1>
+    
+    <p>This is great for things like error(404) pages
+Anyone can see this page but it's not linked to anywhere!</p>
+
+</section>
+
+        <section id="extras" class="body">
+        
+        
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index cc282243..14a78a29 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index 11960efc..a3701245 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -62,7 +62,7 @@
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index 171717ba..cbae942b 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -62,7 +62,7 @@
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 8ffd84d8..47a427cb 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -49,7 +49,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -60,16 +60,16 @@
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
 
                 </article>
                 
@@ -83,7 +83,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -91,7 +90,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -105,25 +105,24 @@ Translations:
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
         
         
-        
             
 
         
@@ -131,7 +130,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -159,7 +159,6 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
-        
             
 
         
@@ -167,7 +166,8 @@ as well as <strong>inline markup</strong>.</p>
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                    <h1><a href=".././oh-yeah.html" rel="bookmark"
+                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -204,10 +204,10 @@ YEAH !</p>
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index ea01a199..d5c2904f 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -49,7 +49,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -60,16 +60,16 @@
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
 
                 </article>
                 
@@ -83,7 +83,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -91,7 +90,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -105,28 +105,28 @@ Translations:
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index ea674062..ba5ee57d 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -49,7 +49,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -60,16 +60,16 @@
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
 
                 </article>
                 
@@ -83,7 +83,6 @@ Translations:
         
         
         
-        
             
 
         
@@ -91,7 +90,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -105,25 +105,24 @@ Translations:
                 By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href=".././category/content.html">content</a>. </p>
+<p>In <a href=".././category/misc.html">misc</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
         
         
-        
             
 
         
@@ -131,7 +130,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                        <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
+                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -159,10 +159,10 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
         
         
-            
-        
-        
             </ol><!-- /#posts-list -->
+            
+                
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 1817aa88..782a0128 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -86,8 +86,8 @@
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index 3ff36f49..675e12cc 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -85,8 +85,8 @@ YEAH !</p>
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 76ca35a3..312523a0 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href=".././category/cat1.html">cat1</a></li>
                 
-                    <li ><a href=".././category/content.html">content</a></li>
+                    <li ><a href=".././category/misc.html">misc</a></li>
                 
                     <li ><a href=".././category/yeah.html">yeah</a></li>
                 
@@ -85,8 +85,8 @@ YEAH !</p>
         
         
         
-        
             </ol><!-- /#posts-list -->
+            
             </section><!-- /#content -->
         
     
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index 92905076..dce9e247 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -312,6 +312,7 @@ img.left, figure.left {float: right; margin: 0 0 2em 2em;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.org');}
 
 /*
 	About
diff --git a/tests/output/basic/theme/images/icons/gitorious.png b/tests/output/basic/theme/images/icons/gitorious.png
new file mode 100644
index 0000000000000000000000000000000000000000..6485f5ecc5f6047a052d9adfb686ee154e7233af
GIT binary patch
literal 3675
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
BhXDWp

literal 0
HcmV?d00001

diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 1e8c160f..6b890f2a 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li ><a href="./category/content.html">content</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
                 
                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
                 
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index db018d81..3f9cc830 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -35,7 +35,7 @@
                 
                     <li ><a href="./category/cat1.html">cat1</a></li>
                 
-                    <li class="active"><a href="./category/content.html">content</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
                 
                     <li ><a href="./category/yeah.html">yeah</a></li>
                 
@@ -62,7 +62,7 @@
                 By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
         </address>
         
-<p>In <a href="./category/content.html">content</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 
 
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 74cdb11d..fe007074 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -57,7 +57,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +74,11 @@
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +98,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +119,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index ee0a0728..8e202cbe 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -57,7 +57,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +74,11 @@
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +98,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +119,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index dfbcb68b..6e2cbf11 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -57,7 +57,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +74,11 @@
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +98,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +119,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         

From a0812eeb17bc338f21ecec24deddba36f0a41cc7 Mon Sep 17 00:00:00 2001
From: Samrat Man Singh <samratmansingh@gmail.com>
Date: Tue, 10 Jul 2012 19:52:59 +0545
Subject: [PATCH 0784/2864] Several changes to related_posts.

---
 pelican/generators.py | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index a7180e98..5fd7db20 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -344,14 +344,40 @@ class ArticlesGenerator(Generator):
 
         self.authors = list(self.authors.items())
         self.authors.sort(key=lambda item: item[0].name)
-
+        
+        # related_posts
         for article in self.articles:
             article.related_posts = []
-            print article
-            potential_related = all_articles.remove(article)
-            article.related_posts = potential_related[:5]
-    
-        self._update_context(('articles', 'dates', 'tags', 'categories',
+            relation_score = {}
+            if article.tags:
+                article_tags = article.tags
+                for tag in article_tags:
+                    try:
+                        for related_article in self.tags[tag]:
+                            article.related_posts.append(related_article)
+                        article.related_posts.reverse()
+
+                    except:
+                        article.related_posts = potential_related[:5]
+
+            elif len(article.related_posts) == 0:  # article doesn't have tags
+                print "No tags for ", article.title
+                article.related_posts = all_articles[:5].reverse()
+
+            relation_score = dict( \
+                zip(set(article.related_posts), \
+                map(article.related_posts.count, \
+                set(article.related_posts))))
+
+            ranked_related = sorted(relation_score, key=relation_score.get)
+            article.related_posts = ranked_related
+
+            try:  # make sure article doesn't appear in its own related posts
+                article.related_posts.remove(article)
+            except:
+                pass
+            
+            self._update_context(('articles', 'dates', 'tags', 'categories',
                               'tag_cloud', 'authors', 'related_posts'))
 
     def generate_output(self, writer):

From 53a1c21a981fc5f20f45e5aeef5cd4be496bc041 Mon Sep 17 00:00:00 2001
From: Samrat Man Singh <samratmansingh@gmail.com>
Date: Tue, 10 Jul 2012 20:43:43 +0545
Subject: [PATCH 0785/2864] More changes to related_posts

---
 pelican/generators.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 5fd7db20..3706a70c 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -349,20 +349,16 @@ class ArticlesGenerator(Generator):
         for article in self.articles:
             article.related_posts = []
             relation_score = {}
-            if article.tags:
+            try:
                 article_tags = article.tags
                 for tag in article_tags:
-                    try:
-                        for related_article in self.tags[tag]:
-                            article.related_posts.append(related_article)
-                        article.related_posts.reverse()
+                    for related_article in self.tags[tag]:
+                        article.related_posts.append(related_article)
+                    article.related_posts.reverse()
 
-                    except:
-                        article.related_posts = potential_related[:5]
-
-            elif len(article.related_posts) == 0:  # article doesn't have tags
-                print "No tags for ", article.title
-                article.related_posts = all_articles[:5].reverse()
+            except:  # can't find any related posts
+                pass
+                #article.related_posts = all_articles[:5].reverse()
 
             relation_score = dict( \
                 zip(set(article.related_posts), \
@@ -370,6 +366,7 @@ class ArticlesGenerator(Generator):
                 set(article.related_posts))))
 
             ranked_related = sorted(relation_score, key=relation_score.get)
+
             article.related_posts = ranked_related
 
             try:  # make sure article doesn't appear in its own related posts

From d9b5ee10dedb8700480ad924bdf486393bff7f5b Mon Sep 17 00:00:00 2001
From: Samrat Man Singh <samratmansingh@gmail.com>
Date: Wed, 11 Jul 2012 01:16:19 +0545
Subject: [PATCH 0786/2864] moved related_posts to plugin

---
 pelican/generators.py            | 31 +-----------------------------
 pelican/plugins/related_posts.py | 33 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 pelican/plugins/related_posts.py

diff --git a/pelican/generators.py b/pelican/generators.py
index 0258543e..58280339 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -346,37 +346,8 @@ class ArticlesGenerator(Generator):
 
         self.authors = list(self.authors.items())
         self.authors.sort(key=lambda item: item[0].name)
-        
-        # related_posts
-        for article in self.articles:
-            article.related_posts = []
-            relation_score = {}
-            try:
-                article_tags = article.tags
-                for tag in article_tags:
-                    for related_article in self.tags[tag]:
-                        article.related_posts.append(related_article)
-                    article.related_posts.reverse()
-
-            except:  # can't find any related posts
-                pass
-                #article.related_posts = all_articles[:5].reverse()
-
-            relation_score = dict( \
-                zip(set(article.related_posts), \
-                map(article.related_posts.count, \
-                set(article.related_posts))))
-
-            ranked_related = sorted(relation_score, key=relation_score.get)
-
-            article.related_posts = ranked_related
-
-            try:  # make sure article doesn't appear in its own related posts
-                article.related_posts.remove(article)
-            except:
-                pass
             
-            self._update_context(('articles', 'dates', 'tags', 'categories',
+        self._update_context(('articles', 'dates', 'tags', 'categories',
                               'tag_cloud', 'authors', 'related_posts'))
 
     def generate_output(self, writer):
diff --git a/pelican/plugins/related_posts.py b/pelican/plugins/related_posts.py
new file mode 100644
index 00000000..25fe2e67
--- /dev/null
+++ b/pelican/plugins/related_posts.py
@@ -0,0 +1,33 @@
+from pelican import signals
+
+"""
+Related posts plugin for Pelican
+================================
+
+Adds related_posts variable to article's context
+"""
+related_posts = []
+def add_related_posts(generator, metadata):
+    if 'tags' in metadata:
+        for tag in metadata['tags']:
+            #print tag
+            for related_article in generator.tags[tag]:
+                related_posts.append(related_article)
+        
+        if len(related_posts) < 1:
+            return
+        
+        relation_score = dict( \
+                zip(set(related_posts), \
+                map(related_posts.count, \
+                set(related_posts))))
+        ranked_related = sorted(relation_score, key=relation_score.get)
+        ranked_related.reverse()
+        
+        metadata["related_posts"] = ranked_related[:5]
+
+    else:
+        return
+
+def register():
+    signals.article_generate_context.connect(add_related_posts)

From d2a28350ff085f7aeb80cc40162941b54cefab16 Mon Sep 17 00:00:00 2001
From: Samrat Man Singh <samratmansingh@gmail.com>
Date: Wed, 11 Jul 2012 01:34:01 +0545
Subject: [PATCH 0787/2864] don't reverse ranked_posts

---
 pelican/plugins/related_posts.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/plugins/related_posts.py b/pelican/plugins/related_posts.py
index 25fe2e67..b697d488 100644
--- a/pelican/plugins/related_posts.py
+++ b/pelican/plugins/related_posts.py
@@ -22,7 +22,6 @@ def add_related_posts(generator, metadata):
                 map(related_posts.count, \
                 set(related_posts))))
         ranked_related = sorted(relation_score, key=relation_score.get)
-        ranked_related.reverse()
         
         metadata["related_posts"] = ranked_related[:5]
 

From 2b933faaf2f9aba9158d56c49367e423ea1a2ea3 Mon Sep 17 00:00:00 2001
From: Samrat Man Singh <samratmansingh@gmail.com>
Date: Wed, 11 Jul 2012 08:52:00 +0545
Subject: [PATCH 0788/2864] Add usage and intallation instructions

---
 pelican/plugins/related_posts.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pelican/plugins/related_posts.py b/pelican/plugins/related_posts.py
index b697d488..808d6f47 100644
--- a/pelican/plugins/related_posts.py
+++ b/pelican/plugins/related_posts.py
@@ -5,7 +5,29 @@ Related posts plugin for Pelican
 ================================
 
 Adds related_posts variable to article's context
+
+Settings
+--------
+To enable, add 
+    
+    from pelican.plugins import related_posts
+    PLUGINS = [related_posts]
+
+to your settings.py.
+
+Usage
+-----
+    {% if article.related_posts %}
+        <ul>
+        {% for related_post in article.related_posts %}
+            <li>{{ related_post }}</li>
+        {% endfor %}
+        </ul>
+    {% endif %}
+
+
 """
+
 related_posts = []
 def add_related_posts(generator, metadata):
     if 'tags' in metadata:

From 9ef8df9a1968a9325183050fe77034903734ca4d Mon Sep 17 00:00:00 2001
From: Samrat Man Singh <samratmansingh@gmail.com>
Date: Wed, 11 Jul 2012 14:53:45 +0545
Subject: [PATCH 0789/2864] Remove else: return

---
 pelican/plugins/related_posts.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pelican/plugins/related_posts.py b/pelican/plugins/related_posts.py
index 808d6f47..1c56cc01 100644
--- a/pelican/plugins/related_posts.py
+++ b/pelican/plugins/related_posts.py
@@ -47,8 +47,5 @@ def add_related_posts(generator, metadata):
         
         metadata["related_posts"] = ranked_related[:5]
 
-    else:
-        return
-
 def register():
     signals.article_generate_context.connect(add_related_posts)

From 70ed05625fe1903dafc176e53a98839c240c41ce Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 11 Jul 2012 20:30:56 -0700
Subject: [PATCH 0790/2864] Catch and report exceptions in Auto-reload Fixes
 #399 Also updated the keyboard interrupt to report before quit.

---
 pelican/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index d42526a3..77db7498 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -258,7 +258,13 @@ def main():
 
                     time.sleep(.5)  # sleep to avoid cpu load
                 except KeyboardInterrupt:
+                    logger.warning("Keyboard interrupt, quitting.")
                     break
+                except Exception, e:
+                    logger.warning(
+                        "Caught exception \"{}\". Reloading.".format(e)
+                    )
+                    continue
         else:
             pelican.run()
     except Exception, e:

From 3c5f6e188769be378f7b824f8e5e6b1cfb162241 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 11 Jul 2012 21:04:01 -0700
Subject: [PATCH 0791/2864] Inconsistent warning/error, pages failing switched
 to warning. Fixes #397

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 8526a56d..295be529 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -368,7 +368,7 @@ class PagesGenerator(Generator):
             try:
                 content, metadata = read_file(f)
             except Exception, e:
-                logger.error(u'Could not process %s\n%s' % (f, str(e)))
+                logger.warning(u'Could not process %s\n%s' % (f, str(e)))
                 continue
             page = Page(content, metadata, settings=self.settings,
                         filename=f)

From 1e7c939953edbb26c16ef6404100904e3af85438 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 12 Jul 2012 15:29:08 +0200
Subject: [PATCH 0792/2864] pep8-ify

---
 pelican/plugins/related_posts.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pelican/plugins/related_posts.py b/pelican/plugins/related_posts.py
index 1c56cc01..67715023 100644
--- a/pelican/plugins/related_posts.py
+++ b/pelican/plugins/related_posts.py
@@ -8,8 +8,8 @@ Adds related_posts variable to article's context
 
 Settings
 --------
-To enable, add 
-    
+To enable, add
+
     from pelican.plugins import related_posts
     PLUGINS = [related_posts]
 
@@ -29,23 +29,24 @@ Usage
 """
 
 related_posts = []
+
+
 def add_related_posts(generator, metadata):
     if 'tags' in metadata:
         for tag in metadata['tags']:
             #print tag
             for related_article in generator.tags[tag]:
                 related_posts.append(related_article)
-        
+
         if len(related_posts) < 1:
             return
-        
-        relation_score = dict( \
-                zip(set(related_posts), \
-                map(related_posts.count, \
-                set(related_posts))))
+
+        relation_score = dict(zip(set(related_posts), map(related_posts.count,
+                              set(related_posts))))
         ranked_related = sorted(relation_score, key=relation_score.get)
-        
+
         metadata["related_posts"] = ranked_related[:5]
 
+
 def register():
     signals.article_generate_context.connect(add_related_posts)

From ec23c94645611e195b57dab9af8744603b123611 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Thu, 12 Jul 2012 07:32:08 -0700
Subject: [PATCH 0793/2864] Made the develop server init script it's own
 question per req. Cleaned up an improper whitespace found on 207 as well.

---
 pelican/tools/pelican_quickstart.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 577a435d..b9a1ec24 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -160,7 +160,8 @@ Please answer the following questions so this script can generate the files need
     else:
         CONF['default_pagination'] = False
 
-    mkfile = ask('Do you want to generate a Makefile and develop server script to easily manage your website?', bool, True)
+    mkfile = ask('Do you want to generate a Makefile to easily manage your website?', bool, True)
+    develop = ask('Do you want to generate a local develop server init script?', bool, True)
 
     if mkfile:
         if ask('Do you want to upload your website using FTP?', answer=bool, default=False):
@@ -204,7 +205,6 @@ Please answer the following questions so this script can generate the files need
         print('Error: {0}'.format(e))
 
     if mkfile:
-
         try:
             with open(os.path.join(CONF['basedir'], 'Makefile'), 'w') as fd:
                 for line in get_template('Makefile'):
@@ -214,6 +214,7 @@ Please answer the following questions so this script can generate the files need
         except OSError, e:
             print('Error: {0}'.format(e))
 
+    if develop:
         try:
             with open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w') as fd:
                 for line in get_template('develop_server.sh'):

From d9817f9a96390d04bec9070007d9ceaf890f0456 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Sat, 14 Jul 2012 17:05:04 -0700
Subject: [PATCH 0794/2864] Test for FEED & FEED_RSS before generation. Then we
 bypass all feed generation of both are set to None or throw a warning if
 SITEURL is unset. Updated all documentation, to make sure the usage and
 warning is clear.

---
 docs/faq.rst          | 21 ++++++++++++++++++++-
 docs/settings.rst     |  3 ++-
 pelican/generators.py |  6 ++++++
 pelican/settings.py   |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 3eec6e84..1241c5ab 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -59,4 +59,23 @@ want to have it's own template.
     :template: template_name
 
 Then just make sure to have the template installed in to your theme as
-``template_name.html``.
\ No newline at end of file
+``template_name.html``.
+
+What if I want to disable feed generation?
+==========================================
+
+To disable all feed generation set ``FEED`` and ``FEED_RSS`` to ``None`` in
+your settings. Please note ``None`` and ``''`` are not the same thing. The
+word None should not be surrounded by quotes.
+
+I'm getting a warning about Feeds generated without SITEURL being set properly
+==============================================================================
+
+RSS and arom3 feeds require all URLs and links in them to be absolute. In order
+to properly generate all URLs properly in perlican you will need to set
+``SITEURL`` to the full path of your blog. By default, when using the ``make html``
+to test build your site ``SITEURL`` is disabled so you should receive this
+warning.
+If configured properly no other make commands should have this message.
+
+Feeds still are generated when this error comes up, but may not validate.
diff --git a/docs/settings.rst b/docs/settings.rst
index 0a1af584..6c7b112e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -274,7 +274,8 @@ Setting name (default value)                        What does it do?
 ================================================    =====================================================
 
 If you don't want to generate some of these feeds, set ``None`` to the
-variables above.
+variables above. If you don't want to generate any feeds set both ``FEED``
+and ``FEED_RSS`` to none.
 
 .. [2] %s is the name of the category.
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 14616949..dba3b1d8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -124,6 +124,12 @@ class ArticlesGenerator(Generator):
 
     def generate_feeds(self, writer):
         """Generate the feeds from the current context, and output files."""
+        if self.settings.get('FEED') is None and self.settings.get('FEED_RSS') is None:
+            return
+        elif self.settings.get('SITEURL') is '':
+            logger.warning(
+                'Feeds generated without SITEURL set properly may not be vaild'
+            )
 
         if self.settings.get('FEED'):
             writer.write_feed(self.articles, self.context,
diff --git a/pelican/settings.py b/pelican/settings.py
index 41b8baa9..fc042841 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -25,6 +25,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
                    'TRANSLATION_FEED': 'feeds/all-%s.atom.xml',
                    'FEED_MAX_ITEMS': '',
+                   'SITEURL': '',
                    'SITENAME': 'A Pelican Blog',
                    'DISPLAY_PAGES_ON_MENU': True,
                    'PDF_GENERATOR': False,

From 79e480a89486acc79802cd8c2f7f0f62964590a2 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Sat, 14 Jul 2012 17:53:10 -0700
Subject: [PATCH 0795/2864] Change default REVERSE_ARCHIVE_ORDER to true
 Updated documentation and updated tests to reflect correct default order
 Fixes #304

---
 docs/settings.rst                 |  2 +-
 pelican/settings.py               |  2 +-
 tests/output/basic/archives.html  | 22 +++++++++++-----------
 tests/output/basic/tag/bar.html   | 16 ++++++++--------
 tests/output/basic/tag/baz.html   | 16 ++++++++--------
 tests/output/basic/tag/foo.html   | 16 ++++++++--------
 tests/output/custom/archives.html | 22 +++++++++++-----------
 tests/output/custom/tag/bar.html  | 20 ++++++++++----------
 tests/output/custom/tag/baz.html  | 20 ++++++++++----------
 tests/output/custom/tag/foo.html  | 20 ++++++++++----------
 10 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 0a1af584..54d95b9d 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -364,7 +364,7 @@ Ordering content
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`REVERSE_ARCHIVE_ORDER` (``False``)                 Reverse the archives list order. (True: orders by date
+`REVERSE_ARCHIVE_ORDER` (``True``)                 Reverse the archives list order. (True: orders by date
                                                     in descending order, with newer articles first.)
 `REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True: lists by reverse
                                                     alphabetical order; default lists alphabetically.)
diff --git a/pelican/settings.py b/pelican/settings.py
index 41b8baa9..dbecfd47 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -32,7 +32,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'DEFAULT_DATE': 'fs',
                    'WITH_FUTURE_DATES': True,
                    'CSS_FILE': 'main.css',
-                   'REVERSE_ARCHIVE_ORDER': False,
+                   'REVERSE_ARCHIVE_ORDER': True,
                    'REVERSE_CATEGORY_ORDER': False,
                    'DELETE_OUTPUT_DIRECTORY': False,
                    'ARTICLE_URL': '{slug}.html',
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index dac96a47..704fc836 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -47,14 +47,11 @@
 
 <dl>
 
-    <dt>Fri 15 October 2010</dt>
-    <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
+    <dt>Wed 29 February 2012</dt>
+    <dd><a href="./second-article.html">Second article</a></dd>
 
-    <dt>Wed 20 October 2010</dt>
-    <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
-
-    <dt>Thu 02 December 2010</dt>
-    <dd><a href="./this-is-a-super-article.html">This is a super article !</a></dd>
+    <dt>Wed 20 April 2011</dt>
+    <dd><a href="./a-markdown-powered-article.html">A markdown powered article</a></dd>
 
     <dt>Thu 17 February 2011</dt>
     <dd><a href="./article-1.html">Article 1</a></dd>
@@ -65,11 +62,14 @@
     <dt>Thu 17 February 2011</dt>
     <dd><a href="./article-3.html">Article 3</a></dd>
 
-    <dt>Wed 20 April 2011</dt>
-    <dd><a href="./a-markdown-powered-article.html">A markdown powered article</a></dd>
+    <dt>Thu 02 December 2010</dt>
+    <dd><a href="./this-is-a-super-article.html">This is a super article !</a></dd>
 
-    <dt>Wed 29 February 2012</dt>
-    <dd><a href="./second-article.html">Second article</a></dd>
+    <dt>Wed 20 October 2010</dt>
+    <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
+
+    <dt>Fri 15 October 2010</dt>
+    <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
 
 </dl>
 </section>
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 47a427cb..99c2cb7f 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -49,7 +49,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -66,10 +66,10 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 
                 </article>
                 
@@ -90,8 +90,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -111,13 +111,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <a class="readmore" href=".././second-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index d5c2904f..1cd80a0b 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -49,7 +49,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -66,10 +66,10 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 
                 </article>
                 
@@ -90,8 +90,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -111,13 +111,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <a class="readmore" href=".././second-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index ba5ee57d..36798b17 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -49,7 +49,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -66,10 +66,10 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 
                 </article>
                 
@@ -90,8 +90,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -111,13 +111,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <a class="readmore" href=".././second-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index 3be563df..d370ee71 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -55,14 +55,11 @@
 
 <dl>
 
-    <dt>Fri 15 October 2010</dt>
-    <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
+    <dt>Wed 29 February 2012</dt>
+    <dd><a href="./second-article.html">Second article</a></dd>
 
-    <dt>Wed 20 October 2010</dt>
-    <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
-
-    <dt>Thu 02 December 2010</dt>
-    <dd><a href="./this-is-a-super-article.html">This is a super article !</a></dd>
+    <dt>Wed 20 April 2011</dt>
+    <dd><a href="./a-markdown-powered-article.html">A markdown powered article</a></dd>
 
     <dt>Thu 17 February 2011</dt>
     <dd><a href="./article-1.html">Article 1</a></dd>
@@ -73,11 +70,14 @@
     <dt>Thu 17 February 2011</dt>
     <dd><a href="./article-3.html">Article 3</a></dd>
 
-    <dt>Wed 20 April 2011</dt>
-    <dd><a href="./a-markdown-powered-article.html">A markdown powered article</a></dd>
+    <dt>Thu 02 December 2010</dt>
+    <dd><a href="./this-is-a-super-article.html">This is a super article !</a></dd>
 
-    <dt>Wed 29 February 2012</dt>
-    <dd><a href="./second-article.html">Second article</a></dd>
+    <dt>Wed 20 October 2010</dt>
+    <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
+
+    <dt>Fri 15 October 2010</dt>
+    <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
 
 </dl>
 </section>
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index fe007074..74cdb11d 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -57,7 +57,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +74,11 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +98,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +119,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
-                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index 8e202cbe..ee0a0728 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -57,7 +57,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +74,11 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +98,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +119,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
-                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index 6e2cbf11..dfbcb68b 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -57,7 +57,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +74,11 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +98,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +119,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
-                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         

From 6393df3bfea06d2a9aabd83e5ac0caf955ea0781 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Sat, 14 Jul 2012 18:08:11 -0700
Subject: [PATCH 0796/2864] Fix Spelling

---
 docs/faq.rst          | 4 ++--
 pelican/generators.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 1241c5ab..f754986e 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -71,8 +71,8 @@ word None should not be surrounded by quotes.
 I'm getting a warning about Feeds generated without SITEURL being set properly
 ==============================================================================
 
-RSS and arom3 feeds require all URLs and links in them to be absolute. In order
-to properly generate all URLs properly in perlican you will need to set
+RSS and atom3 feeds require all URLs and links in them to be absolute. In order
+to properly generate all URLs properly in pelican you will need to set
 ``SITEURL`` to the full path of your blog. By default, when using the ``make html``
 to test build your site ``SITEURL`` is disabled so you should receive this
 warning.
diff --git a/pelican/generators.py b/pelican/generators.py
index dba3b1d8..081c9ead 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -128,7 +128,7 @@ class ArticlesGenerator(Generator):
             return
         elif self.settings.get('SITEURL') is '':
             logger.warning(
-                'Feeds generated without SITEURL set properly may not be vaild'
+                'Feeds generated without SITEURL set properly may not be valid'
             )
 
         if self.settings.get('FEED'):

From 1e8b05984a9664df8ac48fa8eafde1a7083e5e47 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Sat, 14 Jul 2012 18:26:33 -0700
Subject: [PATCH 0797/2864] Add reference to FAQ statement about feeds

---
 docs/faq.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index f754986e..caa40eff 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -71,8 +71,8 @@ word None should not be surrounded by quotes.
 I'm getting a warning about Feeds generated without SITEURL being set properly
 ==============================================================================
 
-RSS and atom3 feeds require all URLs and links in them to be absolute. In order
-to properly generate all URLs properly in pelican you will need to set
+`RSS and atom3 feeds require all URLs and links in them to be absolute <http://validator.w3.org/feed/docs/rss2.html#comments>`_.
+In order to properly generate all URLs properly in pelican you will need to set
 ``SITEURL`` to the full path of your blog. By default, when using the ``make html``
 to test build your site ``SITEURL`` is disabled so you should receive this
 warning.

From 63cff4c9a077abbfdcba078c2992c5087aeacb14 Mon Sep 17 00:00:00 2001
From: Marcel Hellkamp <marc@gsites.de>
Date: Sun, 15 Jul 2012 23:41:07 +0300
Subject: [PATCH 0798/2864] Fixed left and right aligned images in main.css

---
 pelican/themes/notmyidea/static/css/main.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index dce9e247..0648bf2e 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -144,8 +144,8 @@ aside, nav, article, figure {
 
 /***** Layout *****/
 .body {clear: both; margin: 0 auto; width: 800px;}
-img.right figure.right {float: right; margin: 0 0 2em 2em;}
-img.left, figure.left {float: right; margin: 0 0 2em 2em;}
+img.right, figure.right {float: right; margin: 0 0 2em 2em;}
+img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 
 /*
 	Header

From 6f40e452e1b136a988ce34e033a4c0fc606481a0 Mon Sep 17 00:00:00 2001
From: Leonard Huang <lueotw@gmail.com>
Date: Mon, 16 Jul 2012 11:36:20 +0800
Subject: [PATCH 0799/2864] Add unidecode for translating slugs in asian
 languages

---
 pelican/utils.py    | 2 ++
 setup.py            | 2 +-
 tests/test_utils.py | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index f0f742db..53e6e52b 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -49,6 +49,8 @@ def slugify(value):
     value = Markup(value).striptags()
     if type(value) == unicode:
         import unicodedata
+        from unidecode import unidecode
+        value = unicode(unidecode(value))
         value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
     value = unicode(re.sub('[^\w\s-]', '', value).strip().lower())
     return re.sub('[-\s]+', '-', value)
diff --git a/setup.py b/setup.py
index 1603746e..b48757d6 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-requires = ['feedgenerator', 'jinja2 >= 2.4', 'pygments', 'docutils', 'pytz', 'blinker']
+requires = ['feedgenerator', 'jinja2 >= 2.4', 'pygments', 'docutils', 'pytz', 'blinker', 'unidecode']
 
 try:
     import argparse
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 2e3f714b..2ea756dc 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -41,7 +41,9 @@ class TestUtils(unittest.TestCase):
         samples = (('this is a test', 'this-is-a-test'),
                    ('this        is a test', 'this-is-a-test'),
                    (u'this → is ← a ↑ test', 'this-is-a-test'),
-                   ('this--is---a test', 'this-is-a-test'))
+                   ('this--is---a test', 'this-is-a-test'),
+                   (u'unicode測試許功蓋，你看到了嗎？', 'unicodece-shi-xu-gong-gai-ni-kan-dao-liao-ma'),
+                   (u'大飯原発４号機、１８日夜起動へ', 'da-fan-yuan-fa-4hao-ji-18ri-ye-qi-dong-he'),)
 
         for value, expected in samples:
             self.assertEquals(utils.slugify(value), expected)

From 18183632dc510c7e9a2810e73f2de8a23567b601 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Mon, 16 Jul 2012 08:42:05 -0700
Subject: [PATCH 0800/2864] Fixed the wording for the quickstart

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index b9a1ec24..f25e50aa 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -161,7 +161,7 @@ Please answer the following questions so this script can generate the files need
         CONF['default_pagination'] = False
 
     mkfile = ask('Do you want to generate a Makefile to easily manage your website?', bool, True)
-    develop = ask('Do you want to generate a local develop server init script?', bool, True)
+    develop = ask('Do you want an auto-reload & simpleHTTP script to assist with theme and site development?', bool, True)
 
     if mkfile:
         if ask('Do you want to upload your website using FTP?', answer=bool, default=False):

From 5f958ae84d8aa77ab66d1fedc169b1c66ebdb099 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Mon, 16 Jul 2012 09:35:05 -0700
Subject: [PATCH 0801/2864] Refactor atom feed names for clarity FEED ->
 FEED_ATOM TAG_FEED -> TAG_FEED_ATOM CATEGORY_FEED -> CATEGORY_FEED_ATOM

---
 docs/faq.rst                                 |  2 +-
 docs/fr/configuration.rst                    |  6 +++---
 docs/settings.rst                            | 12 ++++++------
 pelican/generators.py                        | 16 ++++++++--------
 pelican/settings.py                          |  6 +++---
 pelican/themes/notmyidea/templates/base.html |  4 ++--
 tests/test_generators.py                     |  4 ++--
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index caa40eff..71acb78e 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -64,7 +64,7 @@ Then just make sure to have the template installed in to your theme as
 What if I want to disable feed generation?
 ==========================================
 
-To disable all feed generation set ``FEED`` and ``FEED_RSS`` to ``None`` in
+To disable all feed generation set ``FEED_ATOM`` and ``FEED_RSS`` to ``None`` in
 your settings. Please note ``None`` and ``''`` are not the same thing. The
 word None should not be surrounded by quotes.
 
diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
index 895802d6..e0ae083b 100644
--- a/docs/fr/configuration.rst
+++ b/docs/fr/configuration.rst
@@ -52,19 +52,19 @@ détails au prochain chapitre.
 Flux de syndication
 ===================
 
-CATEGORY_FEED : 
+CATEGORY_FEED_ATOM :
 	Chemin d’écriture des flux Atom liés aux catégories ;
 
 CATEGORY_FEED_RSS : 
 	Idem pour les flux rss (Optionnel);
 
-FEED :
+FEED_ATOM :
 	Chemin du flux Atom global ;
 
 FEED_RSS :
 	Chemin du flux Rss global (Optionnel);
 
-TAG_FEED :
+TAG_FEED_ATOM :
 	Chemin des flux Atom pour les tags (Optionnel);
 
 TAG_FEED_RSS :
diff --git a/docs/settings.rst b/docs/settings.rst
index 6c7b112e..48196e4b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -251,7 +251,7 @@ feeds if you prefer.
 
 Pelican generates category feeds as well as feeds for all your articles. It does
 not generate feeds for tags by default, but it is possible to do so using
-the ``TAG_FEED`` and ``TAG_FEED_RSS`` settings:
+the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
@@ -262,11 +262,11 @@ Setting name (default value)                        What does it do?
                                                     you have already explicitly defined SITEURL (see
                                                     above) and want to use the same domain for your
                                                     feeds, you can just set:  `FEED_DOMAIN = SITEURL`
-`FEED` (``'feeds/all.atom.xml'``)                   Relative URL to output the Atom feed.
+`FEED_ATOM` (``'feeds/all.atom.xml'``)              Relative URL to output the Atom feed.
 `FEED_RSS` (``None``, i.e. no RSS)                  Relative URL to output the RSS feed.
-`CATEGORY_FEED` ('feeds/%s.atom.xml'[2]_)           Where to put the category Atom feeds.
+`CATEGORY_FEED_ATOM` ('feeds/%s.atom.xml'[2]_)      Where to put the category Atom feeds.
 `CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the category RSS feeds.
-`TAG_FEED` (``None``, i.e. no tag feed)             Relative URL to output the tag Atom feed. It should
+`TAG_FEED_ATOM` (``None``, i.e. no tag feed)        Relative URL to output the tag Atom feed. It should
                                                     be defined using a "%s" match in the tag name.
 `TAG_FEED_RSS` (``None``, ie no RSS tag feed)       Relative URL to output the tag RSS feed
 `FEED_MAX_ITEMS`                                    Maximum number of items allowed in a feed. Feed item
@@ -274,7 +274,7 @@ Setting name (default value)                        What does it do?
 ================================================    =====================================================
 
 If you don't want to generate some of these feeds, set ``None`` to the
-variables above. If you don't want to generate any feeds set both ``FEED``
+variables above. If you don't want to generate any feeds set both ``FEED_ATOM``
 and ``FEED_RSS`` to none.
 
 .. [2] %s is the name of the category.
@@ -286,7 +286,7 @@ If you want to use FeedBurner for your feed, you will likely need to decide
 upon a unique identifier. For example, if your site were called "Thyme" and
 hosted on the www.example.com domain, you might use "thymefeeds" as your
 unique identifier, which we'll use throughout this section for illustrative
-purposes. In your Pelican settings, set the `FEED` attribute to
+purposes. In your Pelican settings, set the `FEED_ATOM` attribute to
 "thymefeeds/main.xml" to create an Atom feed with an original address of
 `http://www.example.com/thymefeeds/main.xml`. Set the `FEED_DOMAIN` attribute
 to `http://feeds.feedburner.com`, or `http://feeds.example.com` if you are
diff --git a/pelican/generators.py b/pelican/generators.py
index 081c9ead..3cf770eb 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -124,16 +124,16 @@ class ArticlesGenerator(Generator):
 
     def generate_feeds(self, writer):
         """Generate the feeds from the current context, and output files."""
-        if self.settings.get('FEED') is None and self.settings.get('FEED_RSS') is None:
+        if self.settings.get('FEED_ATOM') is None and self.settings.get('FEED_RSS') is None:
             return
         elif self.settings.get('SITEURL') is '':
             logger.warning(
                 'Feeds generated without SITEURL set properly may not be valid'
             )
 
-        if self.settings.get('FEED'):
+        if self.settings.get('FEED_ATOM'):
             writer.write_feed(self.articles, self.context,
-                              self.settings['FEED'])
+                              self.settings['FEED_ATOM'])
 
         if self.settings.get('FEED_RSS'):
             writer.write_feed(self.articles, self.context,
@@ -141,21 +141,21 @@ class ArticlesGenerator(Generator):
 
         for cat, arts in self.categories:
             arts.sort(key=attrgetter('date'), reverse=True)
-            if self.settings.get('CATEGORY_FEED'):
+            if self.settings.get('CATEGORY_FEED_ATOM'):
                 writer.write_feed(arts, self.context,
-                                  self.settings['CATEGORY_FEED'] % cat)
+                                  self.settings['CATEGORY_FEED_ATOM'] % cat)
 
             if self.settings.get('CATEGORY_FEED_RSS'):
                 writer.write_feed(arts, self.context,
                                   self.settings['CATEGORY_FEED_RSS'] % cat,
                                   feed_type='rss')
 
-        if self.settings.get('TAG_FEED') or self.settings.get('TAG_FEED_RSS'):
+        if self.settings.get('TAG_FEED_ATOM') or self.settings.get('TAG_FEED_RSS'):
             for tag, arts in self.tags.items():
                 arts.sort(key=attrgetter('date'), reverse=True)
-                if self.settings.get('TAG_FEED'):
+                if self.settings.get('TAG_FEED_ATOM'):
                     writer.write_feed(arts, self.context,
-                                      self.settings['TAG_FEED'] % tag)
+                                      self.settings['TAG_FEED_ATOM'] % tag)
 
                 if self.settings.get('TAG_FEED_RSS'):
                     writer.write_feed(arts, self.context,
diff --git a/pelican/settings.py b/pelican/settings.py
index fc042841..f98551cf 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -21,8 +21,8 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'MARKUP': ('rst', 'md'),
                    'STATIC_PATHS': ['images', ],
                    'THEME_STATIC_PATHS': ['static', ],
-                   'FEED': 'feeds/all.atom.xml',
-                   'CATEGORY_FEED': 'feeds/%s.atom.xml',
+                   'FEED_ATOM': 'feeds/all.atom.xml',
+                   'CATEGORY_FEED_ATOM': 'feeds/%s.atom.xml',
                    'TRANSLATION_FEED': 'feeds/all-%s.atom.xml',
                    'FEED_MAX_ITEMS': '',
                    'SITEURL': '',
@@ -143,7 +143,7 @@ def configure_settings(settings, default_settings=None, filename=None):
             settings['FEED_DOMAIN'] = settings['SITEURL']
 
     # Warn if feeds are generated with both SITEURL & FEED_DOMAIN undefined
-    if (('FEED' in settings) or ('FEED_RSS' in settings)) and (not 'FEED_DOMAIN' in settings):
+    if (('FEED_ATOM' in settings) or ('FEED_RSS' in settings)) and (not 'FEED_DOMAIN' in settings):
         logger.warn("Since feed URLs should always be absolute, you should specify "
                  "FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = "
                  "http://www.example.com')")
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index c9f2c0c8..0994aac9 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -4,7 +4,7 @@
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
-        <link href="{{ FEED_DOMAIN }}/{{ FEED }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
         {% if FEED_RSS %}
         <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
@@ -56,7 +56,7 @@
                 <div class="social">
                         <h2>social</h2>
                         <ul>
-                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
                             {% if FEED_RSS %}
                             <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             {% endif %}
diff --git a/tests/test_generators.py b/tests/test_generators.py
index 28a82089..e984b484 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -48,14 +48,14 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_feeds(self):
 
-        generator = ArticlesGenerator(None, {'FEED': _DEFAULT_CONFIG['FEED']},
+        generator = ArticlesGenerator(None, {'FEED_ATOM': _DEFAULT_CONFIG['FEED_ATOM']},
                                       None, _DEFAULT_CONFIG['THEME'], None,
                                       _DEFAULT_CONFIG['MARKUP'])
         writer = MagicMock()
         generator.generate_feeds(writer)
         writer.write_feed.assert_called_with([], None, 'feeds/all.atom.xml')
 
-        generator = ArticlesGenerator(None, {'FEED': None}, None,
+        generator = ArticlesGenerator(None, {'FEED_ATOM': None}, None,
                                       _DEFAULT_CONFIG['THEME'], None, None)
         writer = MagicMock()
         generator.generate_feeds(writer)

From e626f771c433c1315f7a7599d51855ec58f6b4f7 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Mon, 16 Jul 2012 13:47:39 -0700
Subject: [PATCH 0802/2864] Add Themes and FAQ documentation on the new
 FEED_ATOM Added all the FEED_ATOM variables to _handle_deprecation Put
 FEED_ATOM around `if` in notmyidea

---
 docs/faq.rst                                 | 33 ++++++++++++++++++++
 docs/themes.rst                              | 16 ++++++++++
 pelican/__init__.py                          | 21 +++++++++++++
 pelican/themes/notmyidea/templates/base.html |  2 ++
 4 files changed, 72 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index 71acb78e..c6bf209b 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -79,3 +79,36 @@ warning.
 If configured properly no other make commands should have this message.
 
 Feeds still are generated when this error comes up, but may not validate.
+
+My feeds are broken since I upgraded to 3.0
+===========================================
+
+Starting in 3.0 we changed the more confusing FEED options to say FEED_ATOM
+like the RRS feed options. Here is an exact list of the changes::
+
+    FEED -> FEED_ATOM
+    TAG_FEED -> TAG_FEED_ATOM
+    CATEGORY_FEED -> CATEGORY_FEED_ATOM
+
+Older 2.x themes that referenced these may not link properly. Please update
+your themes for 3 on. Here is some example code you can use for the header
+
+.. code-block:: html+jinja
+    {% if FEED_ATOM %}
+    <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+    {% endif %}
+    {% if FEED_RSS %}
+    <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+    {% endif %}
+    {% if CATEGORY_FEED_ATOM %}
+    <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
+    {% endif %}
+    {% if CATEGORY_FEED_RSS %}
+    <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+    {% endif %}
+    {% if TAG_FEED_ATOM %}
+    <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
+    {% endif %}
+    {% if TAG_FEED_RSS %}
+    <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
+    {% endif %}
diff --git a/docs/themes.rst b/docs/themes.rst
index 8e432a95..bd5d9525 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -189,6 +189,22 @@ dates_page              The current page of articles, ordered by date,
 page_name               'tag/`tag_name`' -- useful for pagination links
 ===================     ===================================================
 
+Feeds
+=====
+
+The feed variables changed in 3.0. Each variable now explicitly lists ATOM or
+RSS in the name. ATOM is still the default. Old themes will need to be updated.
+Here is a complete list of the feed variables::
+
+    FEED_ATOM
+    FEED_RSS
+    CATEGORY_FEED_ATOM
+    CATEGORY_FEED_RSS
+    TAG_FEED_ATOM
+    TAG_FEED_RSS
+    TRANSLATION_FEED
+
+
 Inheritance
 ===========
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 77db7498..5696b0dd 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -114,6 +114,27 @@ class Pelican(object):
                                                       self.settings[setting])
                 logger.warning("%s = '%s'" % (setting, self.settings[setting]))
 
+        if self.settings.get('FEED', False):
+            logger.warning('Found depreciated `FEED` in settings. Modify FEED'
+            ' to FEED_ATOM in your settings and theme for the same behavior.'
+            ' Temporarily setting FEED_ATOM for backwards compatibility.')
+            self.settings['FEED_ATOM'] = self.settings['FEED']
+
+        if self.settings.get('TAG_FEED', False):
+            logger.warning('Found depreciated `TAG_FEED` in settings. Modify '
+            ' TAG_FEED to TAG_FEED_ATOM in your settings and theme for the '
+            'same behavior. Temporarily setting TAG_FEED_ATOM for backwards '
+            'compatibility.')
+            self.settings['TAG_FEED_ATOM'] = self.settings['TAG_FEED']
+
+        if self.settings.get('CATEGORY_FEED', False):
+            logger.warning('Found depreciated `CATEGORY_FEED` in settings. '
+            'Modify CATEGORY_FEED to CATEGORY_FEED_ATOM in your settings and '
+            'theme for the same behavior. Temporarily setting '
+            'CATEGORY_FEED_ATOM for backwards compatibility.')
+            self.settings['CATEGORY_FEED_ATOM'] = self.settings['CATEGORY_FEED']
+
+
     def run(self):
         """Run the generators and return"""
 
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 0994aac9..9d35caa0 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -4,7 +4,9 @@
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
+        {% if FEED_ATOM %}
         <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+        {% endif %}
         {% if FEED_RSS %}
         <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}

From 4a9d2e86cf761e0931a3a32f75b7351cf93d153f Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Mon, 16 Jul 2012 14:52:19 -0700
Subject: [PATCH 0803/2864] Moved all rss headers from FAQ into base

---
 docs/faq.rst                              | 23 ++---------------------
 pelican/themes/simple/templates/base.html | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index c6bf209b..d5a2c81b 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -91,24 +91,5 @@ like the RRS feed options. Here is an exact list of the changes::
     CATEGORY_FEED -> CATEGORY_FEED_ATOM
 
 Older 2.x themes that referenced these may not link properly. Please update
-your themes for 3 on. Here is some example code you can use for the header
-
-.. code-block:: html+jinja
-    {% if FEED_ATOM %}
-    <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
-    {% endif %}
-    {% if FEED_RSS %}
-    <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
-    {% endif %}
-    {% if CATEGORY_FEED_ATOM %}
-    <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
-    {% endif %}
-    {% if CATEGORY_FEED_RSS %}
-    <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
-    {% endif %}
-    {% if TAG_FEED_ATOM %}
-    <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
-    {% endif %}
-    {% if TAG_FEED_RSS %}
-    <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
-    {% endif %}
+your themes for 3 on. For an example of complete RSS headers and usage please
+check out the simple theme.
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index ad2723fd..61375e8a 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -4,6 +4,24 @@
         {% block head %}
         <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
         <meta charset="utf-8" />
+        {% if FEED_ATOM %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+        {% endif %}
+        {% if FEED_RSS %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+        {% endif %}
+        {% if CATEGORY_FEED_ATOM %}
+        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
+        {% endif %}
+        {% if CATEGORY_FEED_RSS %}
+        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+        {% endif %}
+        {% if TAG_FEED_ATOM %}
+        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
+        {% endif %}
+        {% if TAG_FEED_RSS %}
+        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
+        {% endif %}
         {% endblock head %}
 </head>
 

From 636fd6cc380f2537924532a587c70e96a386e25c Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Tue, 17 Jul 2012 13:30:06 +0200
Subject: [PATCH 0804/2864] Add support for abbreviations to reST translator
 (fixes #395).

---
 pelican/readers.py        | 13 +++++++++++++
 pelican/rstdirectives.py  | 20 ++++++++++++++++++--
 tests/content/article.rst |  2 ++
 tests/test_readers.py     |  8 ++++++--
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 83565918..3591c1b8 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -63,6 +63,18 @@ def render_node_to_html(document, node):
     return visitor.astext()
 
 
+class PelicanHTMLTranslator(HTMLTranslator):
+
+    def visit_abbreviation(self, node):
+        attrs = {}
+        if node.hasattr('explanation'):
+            attrs['title'] = node['explanation']
+        self.body.append(self.starttag(node, 'abbr', '', **attrs))
+
+    def depart_abbreviation(self, node):
+        self.body.append('</abbr>')
+
+
 class RstReader(Reader):
     enabled = bool(docutils)
     file_extensions = ['rst']
@@ -92,6 +104,7 @@ class RstReader(Reader):
         pub = docutils.core.Publisher(
                 destination_class=docutils.io.StringOutput)
         pub.set_components('standalone', 'restructuredtext', 'html')
+        pub.writer.translator_class = PelicanHTMLTranslator
         pub.process_programmatic_settings(None, extra_params, None)
         pub.set_source(source_path=filename)
         pub.publish()
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index 9c821310..b1f1242c 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-from docutils import nodes
-from docutils.parsers.rst import directives, Directive
+from docutils import nodes, utils
+from docutils.parsers.rst import directives, roles, Directive
 from pygments.formatters import HtmlFormatter
 from pygments import highlight
 from pygments.lexers import get_lexer_by_name, TextLexer
+import re
 
 INLINESTYLES = False
 DEFAULT = HtmlFormatter(noclasses=INLINESTYLES)
@@ -94,3 +95,18 @@ class YouTube(Directive):
             nodes.raw('', '</div>', format='html')]
 
 directives.register_directive('youtube', YouTube)
+
+_abbr_re = re.compile('\((.*)\)$')
+
+class abbreviation(nodes.Inline, nodes.TextElement): pass
+
+def abbr_role(typ, rawtext, text, lineno, inliner, options={}, content=[]):
+	text = utils.unescape(text)
+	m = _abbr_re.search(text)
+	if m is None:
+		return [abbreviation(text, text)], []
+	abbr = text[:m.start()].strip()
+	expl = m.group(1)
+	return [abbreviation(abbr, abbr, explanation=expl)], []
+
+roles.register_local_role('abbr', abbr_role)
diff --git a/tests/content/article.rst b/tests/content/article.rst
index 1707ab03..7109c29b 100644
--- a/tests/content/article.rst
+++ b/tests/content/article.rst
@@ -2,3 +2,5 @@ Article title
 #############
 
 This is some content. With some stuff to "typogrify".
+
+Now with added support for :abbr:`TLA (three letter acronym)`.
diff --git a/tests/test_readers.py b/tests/test_readers.py
index a921cfc2..02d6c122 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -47,7 +47,9 @@ class RstReaderTest(unittest.TestCase):
         # unmodified
         content, _ = readers.read_file(_filename('article.rst'))
         expected = "<p>This is some content. With some stuff to "\
-                   "&quot;typogrify&quot;.</p>\n"
+                   "&quot;typogrify&quot;.</p>\n<p>Now with added "\
+                   'support for <abbr title="three letter acronym">'\
+                   'TLA</abbr>.</p>\n'
 
         self.assertEqual(content, expected)
 
@@ -56,7 +58,9 @@ class RstReaderTest(unittest.TestCase):
             content, _ = readers.read_file(_filename('article.rst'),
                                            settings={'TYPOGRIFY': True})
             expected = "<p>This is some content. With some stuff to&nbsp;"\
-                       "&#8220;typogrify&#8221;.</p>\n"
+                       "&#8220;typogrify&#8221;.</p>\n<p>Now with added "\
+                       'support for <abbr title="three letter acronym">'\
+                       'TLA</abbr>.</p>\n'
 
             self.assertEqual(content, expected)
         except ImportError:

From da5db5aac9311d62ddbb5f34060c50ec6ab17138 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Wed, 18 Jul 2012 18:22:31 +0200
Subject: [PATCH 0805/2864] Add documentation for abbr in reST.

---
 docs/getting_started.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 93d578a0..4d9af804 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -142,6 +142,11 @@ following syntax (give your file the ``.rst`` extension)::
     :category: yeah
     :author: Alexis Metaireau
 
+Pelican implements an extension of reStructuredText to enable support for the
+``abbr`` HTML tag. To use it, write something like this in your post::
+
+    This will be turned into :abbr:`HTML (HyperText Markup Language)`.
+
 You can also use Markdown syntax (with a file ending in ``.md``).
 Markdown generation will not work until you explicitly install the ``Markdown``
 package, which can be done via ``pip install Markdown``. Metadata syntax for

From a84d0bf5c581d8e92c7a5367c10ec6b683c88d04 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Wed, 18 Jul 2012 18:28:34 +0200
Subject: [PATCH 0806/2864] Add CHANGELOG note about abbr

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 373892cf..02a6f4f7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@
 * Added functional tests
 * Rsync support in the generated Makefile
 * Improved feed support (easily pluggable with feedburner for instance)
+* Added support for abbr in reST
 
 2.8
 

From d6f358182a6d4d4e5863002490ed6e94977cd865 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Wed, 18 Jul 2012 18:41:09 +0200
Subject: [PATCH 0807/2864] Move changelog into docs

---
 CHANGELOG => docs/changelog.rst | 17 ++++++++++++++++-
 docs/index.rst                  |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)
 rename CHANGELOG => docs/changelog.rst (96%)

diff --git a/CHANGELOG b/docs/changelog.rst
similarity index 96%
rename from CHANGELOG
rename to docs/changelog.rst
index 02a6f4f7..15d9110c 100644
--- a/CHANGELOG
+++ b/docs/changelog.rst
@@ -1,4 +1,8 @@
+Release history
+###############
+
 3.0 - XX/XX/XXXX
+================
 
 * Refactored the way URL are handled.
 * Improved the english documentation
@@ -16,6 +20,7 @@
 * Added support for abbr in reST
 
 2.8
+===
 
 * dotclear importer
 * Allow the usage of markdown extensions
@@ -35,6 +40,7 @@
 * Enhanced the documentation
 
 2.7
+===
 
 * Uses logging rather than echoing to stdout
 * Support custom jinja filters
@@ -44,6 +50,7 @@
 * Add draft support
 
 2.6
+===
 
 * changes in the output directory structure
 * makes templates easier to work with / create
@@ -61,6 +68,7 @@
 * Add skribit support
 
 2.5
+===
 
 * import from wordpress
 * add some new themes (martyalchin / wide-notmyidea)
@@ -72,6 +80,7 @@
 * use relative urls not static ones
 
 2.4
+===
 
 * minor themes changes
 * add disqus support (so we have comments)
@@ -80,30 +89,36 @@
 * blog entries can also be generated in pdf
 
 2.3
+===
 
 * markdown support
 
 2.2
+===
 
 * Prettify output
 * Manages static pages as well
 
 2.1
+===
 
 * Put the notmyidea theme by default
 
 2.0
+===
 
 * Refactoring to be more extensible
 * Change into the setting variables
 
 1.2
+===
 
 * Add a debug option
 * Add feeds per category
 * Use filsystem to get dates if no metadata provided
 * Add pygment support
 
-1.1:
+1.1
+===
 
 * first working version
diff --git a/docs/index.rst b/docs/index.rst
index 34a1355c..32045019 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -69,3 +69,4 @@ A French version of the documentation is available at :doc:`fr/index`.
    tips
    contribute
    report
+   changelog

From 3277a219fd3fd6fc8b5f3a7fa8c42694fedf3d04 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Wed, 18 Jul 2012 18:51:15 +0200
Subject: [PATCH 0808/2864] Add some reST markup to changelog, tweak language

---
 docs/changelog.rst | 104 ++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 15d9110c..062e4a36 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,94 +4,94 @@ Release history
 3.0 - XX/XX/XXXX
 ================
 
-* Refactored the way URL are handled.
-* Improved the english documentation
-* Fixed packaging using setuptools entrypoints
-* Added typogrify support
+* Refactored the way URLs are handled
+* Improved the English documentation
+* Fixed packaging using ``setuptools`` entrypoints
+* Added ``typogrify`` support
 * Added a way to disable feed generation
-* Added support for DIRECT_TEMPLATES
+* Added support for ``DIRECT_TEMPLATES``
 * Allow multiple extensions for content files
 * Added less support
 * Improved the import script
 * Fixed a bunch of bugs :-)
 * Added functional tests
 * Rsync support in the generated Makefile
-* Improved feed support (easily pluggable with feedburner for instance)
-* Added support for abbr in reST
+* Improved feed support (easily pluggable with Feedburner for instance)
+* Added support for ``abbr`` in reST
 
 2.8
 ===
 
-* dotclear importer
-* Allow the usage of markdown extensions
+* Dotclear importer
+* Allow the usage of Markdown extensions
 * Themes are now easily extensible
-* Don't output pagination information if there is only one page.
+* Don't output pagination information if there is only one page
 * Add a page per author, with all their articles
 * Improved the test suite
-* Made the themes more easy to extend
+* Made the themes easier to extend
 * Removed Skribit support
-* Added a "pelican-quickstart" script
+* Added a ``pelican-quickstart`` script
 * Fixed timezone-related issues
-* Add some scripts for windows support
+* Added some scripts for Windows support
 * Date can be specified in seconds
 * Never fail when generating posts (skip and continue)
 * Allow the use of future dates
-* Support having different timezones per languages.
+* Support having different timezones per language
 * Enhanced the documentation
 
 2.7
 ===
 
-* Uses logging rather than echoing to stdout
-* Support custom jinja filters
-* Compatibility with python 2.5
-* Add a theme manager
-* Packaged for debian
-* Add draft support
+* Use ``logging`` rather than echoing to stdout
+* Support custom Jinja filters
+* Compatibility with Python 2.5
+* Added a theme manager
+* Packaged for Debian
+* Added draft support
 
 2.6
 ===
 
-* changes in the output directory structure
-* makes templates easier to work with / create
-* Add RSS support (was only atom previously)
-* Add tag support for the feeds
+* Changes in the output directory structure
+* Makes templates easier to work with / create
+* Added RSS support (was Atom-only)
+* Added tag support for the feeds
 * Enhance the documentation
-* Add another theme (brownstone)
-* Add translations
-* Add a way to use "cleaner urls" with a rewrite url module (or equivalent)
-* Add a tag cloud
-* Add an autoreloading feature: the blog is automatically regenerated each time a modification is detected
-* Translate the documentation in french
-* import a blog from an rss feed
+* Added another theme (brownstone)
+* Added translations
+* Added a way to use cleaner URLs with a rewrite url module (or equivalent)
+* Added a tag cloud
+* Added an autoreloading feature: the blog is automatically regenerated each time a modification is detected
+* Translate the documentation into French
+* Import a blog from an RSS feed
 * Pagination support
-* Add skribit support
+* Added Skribit support
 
 2.5
 ===
 
-* import from wordpress
-* add some new themes (martyalchin / wide-notmyidea)
-* first bug report !
-* linkedin support
-* added a FAQ
-* google analytics support
-* twitter support
-* use relative urls not static ones
+* Import from Wordpress
+* Added some new themes (martyalchin / wide-notmyidea)
+* First bug report!
+* Linkedin support
+* Added a FAQ
+* Google Analytics support
+* Twitter support
+* Use relative URLs, not static ones
 
 2.4
 ===
 
-* minor themes changes
-* add disqus support (so we have comments)
-* another code refactoring
-* add config settings about pages
-* blog entries can also be generated in pdf
+* Minor themes changes
+* Add Disqus support (so we have comments)
+* Another code refactoring
+* Added config settings about pages
+* Blog entries can also be generated in PDF
 
 2.3
 ===
 
-* markdown support
+* Markdown support
 
 2.2
 ===
@@ -102,7 +102,7 @@ Release history
 2.1
 ===
 
-* Put the notmyidea theme by default
+* Make notmyidea the default theme
 
 2.0
 ===
@@ -113,12 +113,12 @@ Release history
 1.2
 ===
 
-* Add a debug option
-* Add feeds per category
-* Use filsystem to get dates if no metadata provided
-* Add pygment support
+* Added a debug option
+* Added per-category feeds
+* Use filesystem to get dates if no metadata is provided
+* Add Pygments support
 
 1.1
 ===
 
-* first working version
+* First working version

From 73351e1eab9fe22843863290eb83aeaf4a42099f Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Wed, 18 Jul 2012 18:59:23 +0200
Subject: [PATCH 0809/2864] Add dates to changelog

---
 docs/changelog.rst | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 062e4a36..4508b39e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,7 @@
 Release history
 ###############
 
-3.0 - XX/XX/XXXX
+3.0 (XXXX-XX-XX)
 ================
 
 * Refactored the way URLs are handled
@@ -19,8 +19,8 @@ Release history
 * Improved feed support (easily pluggable with Feedburner for instance)
 * Added support for ``abbr`` in reST
 
-2.8
-===
+2.8 (2012-02-28)
+================
 
 * Dotclear importer
 * Allow the usage of Markdown extensions
@@ -39,8 +39,8 @@ Release history
 * Support having different timezones per language
 * Enhanced the documentation
 
-2.7
-===
+2.7.0 (2011-06-11)
+==================
 
 * Use ``logging`` rather than echoing to stdout
 * Support custom Jinja filters
@@ -49,8 +49,8 @@ Release history
 * Packaged for Debian
 * Added draft support
 
-2.6
-===
+2.6.0 (2011-03-08)
+==================
 
 * Changes in the output directory structure
 * Makes templates easier to work with / create
@@ -67,8 +67,8 @@ Release history
 * Pagination support
 * Added Skribit support
 
-2.5
-===
+2.5.0 (2010-11-20)
+==================
 
 * Import from Wordpress
 * Added some new themes (martyalchin / wide-notmyidea)
@@ -79,8 +79,8 @@ Release history
 * Twitter support
 * Use relative URLs, not static ones
 
-2.4
-===
+2.4 (2010-11-06)
+================
 
 * Minor themes changes
 * Add Disqus support (so we have comments)
@@ -88,37 +88,37 @@ Release history
 * Added config settings about pages
 * Blog entries can also be generated in PDF
 
-2.3
-===
+2.3 (2010-10-31)
+================
 
 * Markdown support
 
-2.2
-===
+2.2 (2010-10-30)
+================
 
 * Prettify output
 * Manages static pages as well
 
-2.1
-===
+2.1 (2010-10-30)
+================
 
 * Make notmyidea the default theme
 
-2.0
-===
+2.0 (2010-10-30)
+================
 
 * Refactoring to be more extensible
 * Change into the setting variables
 
-1.2
-===
+1.2 (2010-09-28)
+================
 
 * Added a debug option
 * Added per-category feeds
 * Use filesystem to get dates if no metadata is provided
 * Add Pygments support
 
-1.1
-===
+1.1 (2010-08-19)
+================
 
 * First working version

From fe91caf32532a03ee7669ca2725544ca9480ea79 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 18 Jul 2012 11:18:48 -0700
Subject: [PATCH 0810/2864] Changed wording of the setting to
 NEWEST_FIRST_ARCHIVES Also updated documentation and tested to make sure
 behavior matches expected wording

---
 docs/fr/configuration.rst | 2 +-
 docs/settings.rst         | 4 ++--
 pelican/generators.py     | 2 +-
 pelican/settings.py       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
index 895802d6..c144a014 100644
--- a/docs/fr/configuration.rst
+++ b/docs/fr/configuration.rst
@@ -111,7 +111,7 @@ LINKS :
 PDF_PROCESSOR :
 	Génère ou non les articles et pages au format pdf ;
 
-REVERSE_ARCHIVE_ORDER :
+NEWEST_FIRST_ARCHIVES :
 	Met les articles plus récent en tête de l'archive ;
 
 SOCIAL :
diff --git a/docs/settings.rst b/docs/settings.rst
index 54d95b9d..b5bae7ab 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -364,8 +364,8 @@ Ordering content
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`REVERSE_ARCHIVE_ORDER` (``True``)                 Reverse the archives list order. (True: orders by date
-                                                    in descending order, with newer articles first.)
+`NEWEST_FIRST_ARCHIVES` (``True``)                  Order archives by newest first by date. (False: 
+                                                    orders by date with older articles first.)
 `REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True: lists by reverse
                                                     alphabetical order; default lists alphabetically.)
 ================================================    =====================================================
diff --git a/pelican/generators.py b/pelican/generators.py
index 14616949..b42c9a03 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -308,7 +308,7 @@ class ArticlesGenerator(Generator):
         self.articles.sort(key=attrgetter('date'), reverse=True)
         self.dates = list(self.articles)
         self.dates.sort(key=attrgetter('date'),
-                reverse=self.context['REVERSE_ARCHIVE_ORDER'])
+                reverse=self.context['NEWEST_FIRST_ARCHIVES'])
 
         # create tag cloud
         tag_cloud = defaultdict(int)
diff --git a/pelican/settings.py b/pelican/settings.py
index dbecfd47..86f08d92 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -32,7 +32,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'DEFAULT_DATE': 'fs',
                    'WITH_FUTURE_DATES': True,
                    'CSS_FILE': 'main.css',
-                   'REVERSE_ARCHIVE_ORDER': True,
+                   'NEWEST_FIRST_ARCHIVES': True,
                    'REVERSE_CATEGORY_ORDER': False,
                    'DELETE_OUTPUT_DIRECTORY': False,
                    'ARTICLE_URL': '{slug}.html',

From 625c1d167d999246be8e67bc0e0cf68d80c09900 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 18 Jul 2012 11:30:02 -0700
Subject: [PATCH 0811/2864] Documentation Fix

---
 docs/faq.rst        | 2 +-
 pelican/__init__.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index d5a2c81b..2d4536a1 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -71,7 +71,7 @@ word None should not be surrounded by quotes.
 I'm getting a warning about Feeds generated without SITEURL being set properly
 ==============================================================================
 
-`RSS and atom3 feeds require all URLs and links in them to be absolute <http://validator.w3.org/feed/docs/rss2.html#comments>`_.
+`RSS and atom feeds require all URLs and links in them to be absolute <http://validator.w3.org/feed/docs/rss2.html#comments>`_.
 In order to properly generate all URLs properly in pelican you will need to set
 ``SITEURL`` to the full path of your blog. By default, when using the ``make html``
 to test build your site ``SITEURL`` is disabled so you should receive this
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 5696b0dd..9bdc34a8 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -115,20 +115,20 @@ class Pelican(object):
                 logger.warning("%s = '%s'" % (setting, self.settings[setting]))
 
         if self.settings.get('FEED', False):
-            logger.warning('Found depreciated `FEED` in settings. Modify FEED'
+            logger.warning('Found deprecated `FEED` in settings. Modify FEED'
             ' to FEED_ATOM in your settings and theme for the same behavior.'
             ' Temporarily setting FEED_ATOM for backwards compatibility.')
             self.settings['FEED_ATOM'] = self.settings['FEED']
 
         if self.settings.get('TAG_FEED', False):
-            logger.warning('Found depreciated `TAG_FEED` in settings. Modify '
+            logger.warning('Found deprecated `TAG_FEED` in settings. Modify '
             ' TAG_FEED to TAG_FEED_ATOM in your settings and theme for the '
             'same behavior. Temporarily setting TAG_FEED_ATOM for backwards '
             'compatibility.')
             self.settings['TAG_FEED_ATOM'] = self.settings['TAG_FEED']
 
         if self.settings.get('CATEGORY_FEED', False):
-            logger.warning('Found depreciated `CATEGORY_FEED` in settings. '
+            logger.warning('Found deprecated `CATEGORY_FEED` in settings. '
             'Modify CATEGORY_FEED to CATEGORY_FEED_ATOM in your settings and '
             'theme for the same behavior. Temporarily setting '
             'CATEGORY_FEED_ATOM for backwards compatibility.')

From 597dba1391a8b8d7d827269cfc9022786398e7f5 Mon Sep 17 00:00:00 2001
From: Joshua Adelman <joshua.adelman@gmail.com>
Date: Thu, 19 Jul 2012 20:59:48 -0400
Subject: [PATCH 0812/2864] Added signals to plugin for pages generation

---
 docs/plugins.rst      | 2 ++
 pelican/generators.py | 4 +++-
 pelican/signals.py    | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 3e009e33..3acecebe 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -59,6 +59,8 @@ Signal                      Arguments                      Description
 initialized                 pelican object
 article_generate_context    article_generator, metadata
 article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
+pages_generate_context      pages_generator, metadata
+pages_generator_init        pages_generator                invoked in the PagesGenerator.__init__
 =========================   ============================   =========================================
 
 The list is currently small, don't hesitate to add signals and make a pull
diff --git a/pelican/generators.py b/pelican/generators.py
index 14616949..4401d403 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -363,7 +363,8 @@ class PagesGenerator(Generator):
         self.hidden_pages = []
         self.hidden_translations = []
         super(PagesGenerator, self).__init__(*args, **kwargs)
-
+        signals.pages_generator_init.send(self)
+ 
     def generate_context(self):
         all_pages = []
         hidden_pages = []
@@ -388,6 +389,7 @@ class PagesGenerator(Generator):
                                (repr(unicode.encode(page.status, 'utf-8')),
                                 repr(f)))
 
+        signals.pages_generate_context.send(self,metadata=metadata) 
         self.pages, self.translations = process_translations(all_pages)
         self.hidden_pages, self.hidden_translations = process_translations(hidden_pages)
 
diff --git a/pelican/signals.py b/pelican/signals.py
index b1c35794..4d9ab512 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -3,3 +3,5 @@ from blinker import signal
 initialized = signal('pelican_initialized')
 article_generate_context = signal('article_generate_context')
 article_generator_init = signal('article_generator_init')
+pages_generate_context = signal('pages_generate_context')
+pages_generator_init = signal('pages_generator_init')

From d48dd63755e6d4ffb08c18dd2039ccc95eecce6d Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Fri, 20 Jul 2012 10:50:31 +0200
Subject: [PATCH 0813/2864] Include THANKS in distribution

---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 13ea58a1..40093c01 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include *.rst
 global-include *.py
 recursive-include pelican *.html *.css *png *.in
-include LICENSE
+include LICENSE THANKS

From bfd3f37bf4632312f4143a9d32e7cccad95e91cf Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Fri, 20 Jul 2012 11:13:35 +0200
Subject: [PATCH 0814/2864] Include test assets in distribution

---
 MANIFEST.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 40093c01..bec6d1a3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,3 +2,5 @@ include *.rst
 global-include *.py
 recursive-include pelican *.html *.css *png *.in
 include LICENSE THANKS
+recursive-include tests *
+recursive-exclude tests *.pyc

From 20d5c1ab13125e9758cc661d98012346e1804bbf Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 20 Jul 2012 12:57:48 +0200
Subject: [PATCH 0815/2864] update the desired output so the tests pass

---
 .../basic/a-markdown-powered-article.html     |  2 ++
 tests/output/basic/archives.html              |  2 ++
 tests/output/basic/article-1.html             |  2 ++
 tests/output/basic/article-2.html             |  2 ++
 tests/output/basic/article-3.html             |  2 ++
 .../output/basic/author/alexis-metaireau.html |  2 ++
 tests/output/basic/author/dummy-author.html   |  2 ++
 tests/output/basic/categories.html            |  2 ++
 tests/output/basic/category/bar.html          |  2 ++
 tests/output/basic/category/cat1.html         |  2 ++
 tests/output/basic/category/misc.html         |  2 ++
 tests/output/basic/category/yeah.html         |  2 ++
 .../output/basic/drafts/a-draft-article.html  |  2 ++
 tests/output/basic/feeds/all-en.atom.xml      | 14 ++++++------
 tests/output/basic/feeds/all-fr.atom.xml      |  4 ++--
 tests/output/basic/feeds/all.atom.xml         | 14 ++++++------
 tests/output/basic/feeds/bar.atom.xml         |  2 +-
 tests/output/basic/feeds/cat1.atom.xml        |  6 ++---
 tests/output/basic/feeds/misc.atom.xml        |  4 ++--
 tests/output/basic/feeds/yeah.atom.xml        |  2 +-
 tests/output/basic/index.html                 |  2 ++
 tests/output/basic/oh-yeah-fr.html            |  2 ++
 tests/output/basic/oh-yeah.html               |  2 ++
 .../pages/this-is-a-test-hidden-page.html     |  2 ++
 .../basic/pages/this-is-a-test-page.html      |  2 ++
 tests/output/basic/second-article-fr.html     |  2 ++
 tests/output/basic/second-article.html        |  2 ++
 tests/output/basic/tag/bar.html               | 18 ++++++++-------
 tests/output/basic/tag/baz.html               | 18 ++++++++-------
 tests/output/basic/tag/foo.html               | 18 ++++++++-------
 tests/output/basic/tag/foobar.html            |  2 ++
 tests/output/basic/tag/oh.html                |  2 ++
 tests/output/basic/tag/yeah.html              |  2 ++
 tests/output/basic/theme/css/main.css         |  4 ++--
 .../output/basic/this-is-a-super-article.html |  2 ++
 tests/output/basic/unbelievable.html          |  2 ++
 .../custom/a-markdown-powered-article.html    |  2 ++
 tests/output/custom/archives.html             |  2 ++
 tests/output/custom/article-1.html            |  2 ++
 tests/output/custom/article-2.html            |  2 ++
 tests/output/custom/article-3.html            |  2 ++
 .../custom/author/alexis-metaireau.html       |  2 ++
 .../custom/author/alexis-metaireau2.html      |  2 ++
 tests/output/custom/categories.html           |  2 ++
 tests/output/custom/category/bar.html         |  2 ++
 tests/output/custom/category/cat1.html        |  2 ++
 tests/output/custom/category/misc.html        |  2 ++
 tests/output/custom/category/yeah.html        |  2 ++
 .../output/custom/drafts/a-draft-article.html |  2 ++
 tests/output/custom/index.html                |  2 ++
 tests/output/custom/index2.html               |  2 ++
 tests/output/custom/oh-yeah-fr.html           |  2 ++
 tests/output/custom/oh-yeah.html              |  2 ++
 .../pages/this-is-a-test-hidden-page.html     |  2 ++
 .../custom/pages/this-is-a-test-page.html     |  2 ++
 tests/output/custom/second-article-fr.html    |  2 ++
 tests/output/custom/second-article.html       |  2 ++
 tests/output/custom/tag/bar.html              | 22 ++++++++++---------
 tests/output/custom/tag/baz.html              | 22 ++++++++++---------
 tests/output/custom/tag/foo.html              | 22 ++++++++++---------
 tests/output/custom/tag/foobar.html           |  2 ++
 tests/output/custom/tag/oh.html               |  2 ++
 tests/output/custom/tag/yeah.html             |  2 ++
 tests/output/custom/theme/css/main.css        |  4 ++--
 .../custom/this-is-a-super-article.html       |  2 ++
 tests/output/custom/unbelievable.html         |  2 ++
 66 files changed, 195 insertions(+), 81 deletions(-)

diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index bfa09fdf..6662f7d2 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -4,8 +4,10 @@
         <title>A markdown powered article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index 704fc836..0b9c664e 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index ab1d71d7..97813af8 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -4,8 +4,10 @@
         <title>Article 1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 52cfff0d..54157cc6 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -4,8 +4,10 @@
         <title>Article 2</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index ef97a56d..7b9af9f9 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -4,8 +4,10 @@
         <title>Article 3</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index ad7b8bee..61df3206 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - Alexis Métaireau</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/author/dummy-author.html b/tests/output/basic/author/dummy-author.html
index 54c81100..85b921fe 100644
--- a/tests/output/basic/author/dummy-author.html
+++ b/tests/output/basic/author/dummy-author.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - Dummy Author</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index d13d0b92..08669b1f 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index a80656a5..0ad8f799 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index 3d062ac7..c54353e0 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - cat1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index ff344111..80978d5f 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - misc</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index 1d4d7f04..69a709f0 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index af0f2476..9996974d 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -4,8 +4,10 @@
         <title>A draft article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index b532e454..16163dc0 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-en.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index 274bd548..c60e2bfe 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all-fr.atom.xml" rel="self"></link><id>.././</id><updated>2012-05-19T23:55:50Z</updated><entry><title>Trop bien !</title><link href=".././oh-yeah-fr.html" rel="alternate"></link><updated>2012-05-19T23:55:50Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-05-19:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href=".././second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-05-19T23:55:50Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-05-19T23:55:50Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-05-19:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index a0fb9144..27c92e6d 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/all.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -15,11 +15,11 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/bar.atom.xml b/tests/output/basic/feeds/bar.atom.xml
index 15708734..7b842a63 100644
--- a/tests/output/basic/feeds/bar.atom.xml
+++ b/tests/output/basic/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/bar.atom.xml" rel="self"></link><id>.././</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href=".././oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
index 383c8ab7..4ff8e6ca 100644
--- a/tests/output/basic/feeds/cat1.atom.xml
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/cat1.atom.xml" rel="self"></link><id>.././</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href=".././a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href=".././article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href=".././article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href=".././article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml
index db33d39b..ec3c79bc 100644
--- a/tests/output/basic/feeds/misc.atom.xml
+++ b/tests/output/basic/feeds/misc.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/misc.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/yeah.atom.xml b/tests/output/basic/feeds/yeah.atom.xml
index e9bb26d0..fabeb52f 100644
--- a/tests/output/basic/feeds/yeah.atom.xml
+++ b/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/yeah.atom.xml" rel="self"></link><id>.././</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href=".././this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:../.,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index fe6c2279..7bb846bc 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index 4856347f..5442864a 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -4,8 +4,10 @@
         <title>Trop bien !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index bd0c75ee..1dffc0eb 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -4,8 +4,10 @@
         <title>Oh yeah !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 4412d600..864d1109 100644
--- a/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -4,8 +4,10 @@
         <title>This is a test hidden page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 14a78a29..58807c1d 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -4,8 +4,10 @@
         <title>This is a test page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index a3701245..b7c023ee 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -4,8 +4,10 @@
         <title>Deuxième article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index cbae942b..3a607a51 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -4,8 +4,10 @@
         <title>Second article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 99c2cb7f..6b80b5fe 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@@ -49,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -66,10 +68,10 @@
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
 
                 </article>
                 
@@ -90,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -111,13 +113,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index 1cd80a0b..10c19b91 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - baz</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@@ -49,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -66,10 +68,10 @@
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
 
                 </article>
                 
@@ -90,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -111,13 +113,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 36798b17..5a025bab 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - foo</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@@ -49,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -66,10 +68,10 @@
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
 
                 </article>
                 
@@ -90,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -111,13 +113,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 782a0128..7a64add9 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - foobar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index 675e12cc..a08fb39c 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - oh</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 312523a0..3c175905 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -4,8 +4,10 @@
         <title>A Pelican Blog - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index dce9e247..0648bf2e 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -144,8 +144,8 @@ aside, nav, article, figure {
 
 /***** Layout *****/
 .body {clear: both; margin: 0 auto; width: 800px;}
-img.right figure.right {float: right; margin: 0 0 2em 2em;}
-img.left, figure.left {float: right; margin: 0 0 2em 2em;}
+img.right, figure.right {float: right; margin: 0 0 2em 2em;}
+img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 
 /*
 	Header
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 6b890f2a..0e77b70e 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -4,8 +4,10 @@
         <title>This is a super article !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 3f9cc830..407d7289 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -4,8 +4,10 @@
         <title>Unbelievable !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
         
+        
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index d3d0f53c..785440c2 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -4,8 +4,10 @@
         <title>A markdown powered article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index d370ee71..ed74e782 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -4,8 +4,10 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index 4402d227..be593d9b 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -4,8 +4,10 @@
         <title>Article 1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index ec6a86c8..a10950ad 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -4,8 +4,10 @@
         <title>Article 2</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index 0d39654c..76b03ced 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -4,8 +4,10 @@
         <title>Article 3</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index b60a01ef..3fb51b8b 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - Alexis Métaireau</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index cbf4387b..594304bc 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - Alexis Métaireau</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/categories.html b/tests/output/custom/categories.html
index 74f1c16b..81ef2b76 100644
--- a/tests/output/custom/categories.html
+++ b/tests/output/custom/categories.html
@@ -4,8 +4,10 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index 7860bd15..5183aaf8 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index b01c1ad6..160e4e4e 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - cat1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index 0161b441..54608de8 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - misc</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index 27e929c4..032a9333 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index 35264ed6..59d5c6af 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -4,8 +4,10 @@
         <title>A draft article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index 79882019..fbdc2f38 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -4,8 +4,10 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index d6079fd9..52b2f723 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -4,8 +4,10 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index 25f67032..46eaffe6 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -4,8 +4,10 @@
         <title>Trop bien !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index fc635dc7..90478b4b 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -4,8 +4,10 @@
         <title>Oh yeah !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/tests/output/custom/pages/this-is-a-test-hidden-page.html
index b5eca671..231b1c8a 100644
--- a/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -4,8 +4,10 @@
         <title>This is a test hidden page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index 85161430..d45bfac2 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -4,8 +4,10 @@
         <title>This is a test page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index 9ed39cec..8446d6aa 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -4,8 +4,10 @@
         <title>Deuxième article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 93e421fb..0b287424 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -4,8 +4,10 @@
         <title>Second article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 74cdb11d..3d3c27c2 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
@@ -57,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +76,11 @@
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +121,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index ee0a0728..83466283 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - baz</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
@@ -57,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +76,11 @@
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +121,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index dfbcb68b..d8d58f41 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - foo</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
@@ -57,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -74,11 +76,11 @@
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -98,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
+                    <h1><a href=".././second-article-fr.html" rel="bookmark"
+                           title="Permalink to Deuxième article">Deuxième article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -119,14 +121,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
 </footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+                <p>Ceci est un article, en français.</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index d14a9c71..0d2ce6af 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - foobar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index abc98868..99d40c14 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - oh</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index 199adbe0..f1884cc6 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -4,8 +4,10 @@
         <title>Alexis' log - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
index dce9e247..0648bf2e 100644
--- a/tests/output/custom/theme/css/main.css
+++ b/tests/output/custom/theme/css/main.css
@@ -144,8 +144,8 @@ aside, nav, article, figure {
 
 /***** Layout *****/
 .body {clear: both; margin: 0 auto; width: 800px;}
-img.right figure.right {float: right; margin: 0 0 2em 2em;}
-img.left, figure.left {float: right; margin: 0 0 2em 2em;}
+img.right, figure.right {float: right; margin: 0 0 2em 2em;}
+img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 
 /*
 	Header
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 640301db..d12936d2 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -4,8 +4,10 @@
         <title>This is a super article !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index 83eed167..742a9c0d 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -4,8 +4,10 @@
         <title>Unbelievable !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         
+        
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
 

From 607502446981bcda29ad07a68f65b83118ff3aff Mon Sep 17 00:00:00 2001
From: Joshua Adelman <joshua.adelman@gmail.com>
Date: Fri, 20 Jul 2012 07:38:16 -0400
Subject: [PATCH 0816/2864] Modify system path to ensure current directory is
 included

---
 pelican/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 9bdc34a8..ba48c4c7 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -60,9 +60,15 @@ class Pelican(object):
             else:
                 raise Exception("Impossible to find the theme %s" % theme)
 
+        self.init_path()
         self.init_plugins()
         signals.initialized.send(self)
 
+    def init_path(self):
+        if not any(p in sys.path for p in ['', '.']):
+            logger.debug("Adding current directory to system path")
+            sys.path.insert(0, '')
+
     def init_plugins(self):
         self.plugins = self.settings['PLUGINS']
         for plugin in self.plugins:

From 172555bbceaed599a219fc9b7c1676f7eb79a6ba Mon Sep 17 00:00:00 2001
From: Iuri de Silvio <iurisilvio@gmail.com>
Date: Fri, 20 Jul 2012 21:23:27 -0300
Subject: [PATCH 0817/2864] Use async Google Analytics code.

---
 pelican/themes/notmyidea/templates/analytics.html | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
index ba174fcc..4de2c86b 100644
--- a/pelican/themes/notmyidea/templates/analytics.html
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -1,11 +1,12 @@
 {% if GOOGLE_ANALYTICS %}
     <script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', '{{GOOGLE_ANALYTICS}}']);
+    _gaq.push(['_trackPageview']);
+    (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
     </script>
-    <script type="text/javascript">
-    try {
-        var pageTracker = _gat._getTracker("{{GOOGLE_ANALYTICS}}");
-    pageTracker._trackPageview();
-    } catch(err) {}</script>
 {% endif %}
\ No newline at end of file

From b0d860b7e050051b8231aef65d7825d56ede03ad Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Sun, 22 Jul 2012 09:08:47 -0700
Subject: [PATCH 0818/2864] Fixed bad signal placement for pages The signal
 needs to be in the loop that iterates through the pages since it runs on each
 page and uses the page metadata. Also fixed for pep8 Fix #432

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index c041d06a..ae9334da 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -382,6 +382,7 @@ class PagesGenerator(Generator):
             except Exception, e:
                 logger.warning(u'Could not process %s\n%s' % (f, str(e)))
                 continue
+            signals.pages_generate_context.send(self, metadata=metadata )
             page = Page(content, metadata, settings=self.settings,
                         filename=f)
             if not is_valid_content(page, f):
@@ -395,7 +396,6 @@ class PagesGenerator(Generator):
                                (repr(unicode.encode(page.status, 'utf-8')),
                                 repr(f)))
 
-        signals.pages_generate_context.send(self,metadata=metadata) 
         self.pages, self.translations = process_translations(all_pages)
         self.hidden_pages, self.hidden_translations = process_translations(hidden_pages)
 

From 5cb009d782a94d5260d0e3e6cff961531a1fb8d1 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 23 Jul 2012 18:37:12 +0200
Subject: [PATCH 0819/2864] if not virtualenv is defined, fallback on '.'

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index f25e50aa..9eef105e 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -139,7 +139,7 @@ Please answer the following questions so this script can generate the files need
 
     '''.format(v=__version__))
 
-    project = os.path.join(os.environ['VIRTUAL_ENV'], '.project')
+    project = os.path.join(os.environ.get('VIRTUAL_ENV', '.'), '.project')
     if os.path.isfile(project):
         CONF['basedir'] = open(project, 'r').read().rstrip("\n")
         print('Using project associated with current virtual environment. Will save to:\n%s\n' % CONF['basedir'])

From 0494cd14069c47bb90f7f05044e5ded068f6340e Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 23 Jul 2012 18:56:21 +0200
Subject: [PATCH 0820/2864] remove the selection color in the default theme

---
 pelican/themes/notmyidea/static/css/main.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 0648bf2e..b21445c2 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -70,9 +70,6 @@ p {margin-bottom: 1.143em;}
 strong, b {font-weight: bold;}
 em, i {font-style: italic;}
 
-::-moz-selection {background: #F6CF74; color: #fff;}
-::selection {background: #F6CF74; color: #fff;}
-
 /* Lists */
 ul {
 	list-style: outside disc;

From d5f1747993dbc5d29a8ef25d453e746c955122a9 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 23 Jul 2012 18:56:47 +0200
Subject: [PATCH 0821/2864] we don't need to have a max size for the title on
 the default theme

---
 pelican/themes/notmyidea/static/css/main.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index b21445c2..bd1eba75 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -160,7 +160,6 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		font-weight: bold;
 		margin: 0 0 .6em .2em;
 		text-decoration: none;
-		width: 427px;
 	}
 	#banner h1 a:hover, #banner h1 a:active {
 		background: none;

From 22c88e4de3e1edd67c5334c2c4f54b1178c9fec2 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Thu, 26 Jul 2012 22:02:06 +0200
Subject: [PATCH 0822/2864] update typogrify support

---
 pelican/readers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 3591c1b8..e3ea154d 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -185,8 +185,8 @@ def read_file(filename, fmt=None, settings=None):
 
     # eventually filter the content with typogrify if asked so
     if settings and settings['TYPOGRIFY']:
-        from typogrify import Typogrify
-        content = Typogrify.typogrify(content)
-        metadata['title'] = Typogrify.typogrify(metadata['title'])
+        from typogrify.filters import typogrify
+        content = typogrify(content)
+        metadata['title'] = typogrify(metadata['title'])
 
     return content, metadata

From cf71ed75a44d48a7dbed3b1e412cc8d0f3ef44e7 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 27 Jul 2012 00:27:08 +0200
Subject: [PATCH 0823/2864] the repositories are now hosted under 'getpelican'

---
 docs/conf.py             | 2 +-
 docs/faq.rst             | 4 ++--
 docs/fr/index.rst        | 2 +-
 docs/fr/installation.rst | 2 +-
 docs/fr/themes.rst       | 2 +-
 docs/getting_started.rst | 2 +-
 docs/index.rst           | 2 +-
 docs/settings.rst        | 4 ++--
 docs/themes.rst          | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index ac2d67ee..2a11fe3e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -24,7 +24,7 @@ html_theme = 'pelican'
 html_theme_options = {
     'nosidebar': True,
     'index_logo': 'pelican.png',
-    'github_fork': 'ametaireau/pelican',
+    'github_fork': 'getpelican/pelican',
 }
 
 html_static_path = ['_static']
diff --git a/docs/faq.rst b/docs/faq.rst
index 2d4536a1..35f39b75 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -30,10 +30,10 @@ How can I help?
 
 There are several ways to help out. First, you can use Pelican and report any
 suggestions or problems you might have on `the bugtracker
-<https://github.com/ametaireau/pelican/issues>`_.
+<https://github.com/getpelican/pelican/issues>`_.
 
 If you want to contribute, please fork `the git repository
-<https://github.com/ametaireau/pelican/>`_, make your changes, and issue
+<https://github.com/getpelican/pelican/>`_, make your changes, and issue
 a pull request. I'll review your changes as soon as possible.
 
 You can also contribute by creating themes and improving the documentation.
diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index 9fd0c0f0..2deb5050 100644
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -30,7 +30,7 @@ Code source
 ===========
 
 Vous pouvez accéder au code source via git à l'adresse 
-http://github.com/ametaireau/pelican/
+http://github.com/getpelican/pelican/
 
 Feedback !
 ==========
diff --git a/docs/fr/installation.rst b/docs/fr/installation.rst
index e853979d..da327725 100644
--- a/docs/fr/installation.rst
+++ b/docs/fr/installation.rst
@@ -24,7 +24,7 @@ Pour installer Pelican en reprenant le code via Github, nous aurons besoin du pa
 git-core pour récupérez les sources de Pelican. Puis nous procédons à l’installation ::
 
 	# apt-get install git-core
-	$ git clone https://github.com/ametaireau/pelican.git
+	$ git clone https://github.com/getpelican/pelican.git
 	$ cd pelican
 	# python setup.py install
 
diff --git a/docs/fr/themes.rst b/docs/fr/themes.rst
index c6f45300..20d9d41f 100644
--- a/docs/fr/themes.rst
+++ b/docs/fr/themes.rst
@@ -10,7 +10,7 @@ Pelican utlise le très bon moteur de template `jinja2 <http://jinja.pocoo.org>`
 pour produire de l'HTML. La syntaxe de jinja2 est vraiment très simple. Si vous
 voulez créer votre propre thème, soyez libre de prendre inspiration sur le theme
 "simple" qui est disponible `ici
-<https://github.com/ametaireau/pelican/tree/master/pelican/themes/simple/templates>`_
+<https://github.com/getpelican/pelican/tree/master/pelican/themes/simple/templates>`_
 
 Structure
 =========
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 4d9af804..3733812b 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -33,7 +33,7 @@ method::
 If you have Git installed and prefer to install the latest bleeding-edge
 version of Pelican rather than a stable release, use the following command::
 
-    $ pip install -e git://github.com/ametaireau/pelican#egg=pelican
+    $ pip install -e git://github.com/getpelican/pelican#egg=pelican
 
 If you plan on using Markdown as a markup format, you'll need to install the
 Markdown library as well::
diff --git a/docs/index.rst b/docs/index.rst
index 32045019..04266643 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -35,7 +35,7 @@ Heh, you didn't notice? "Pelican" is an anagram for « Calepin » ;)
 Source code
 ===========
 
-You can access the source code via git at http://github.com/ametaireau/pelican/
+You can access the source code via git at http://github.com/getpelican/pelican/
 
 Feedback / Contact us
 =====================
diff --git a/docs/settings.rst b/docs/settings.rst
index 380ef32d..2d45d463 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -8,7 +8,7 @@ the command line::
 
 Settings are configured in the form of a Python module (a file). You can see an
 example by looking at `/samples/pelican.conf.py
-<https://github.com/ametaireau/pelican/raw/master/samples/pelican.conf.py>`_
+<https://github.com/getpelican/pelican/raw/master/samples/pelican.conf.py>`_
 
 All the setting identifiers must be set in all-caps, otherwise they will not be
 processed.
@@ -401,7 +401,7 @@ manner. (Be sure to specify the full absolute path to it.)
 
 Here is :doc:`a guide on how to create your theme <themes>`
 
-You can find a list of themes at http://github.com/ametaireau/pelican-themes.
+You can find a list of themes at http://github.com/getpelican/pelican-themes.
 
 Pelican comes with :doc:`pelican-themes`, a small script for managing themes.
 
diff --git a/docs/themes.rst b/docs/themes.rst
index bd5d9525..25cdd682 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -6,7 +6,7 @@ How to create themes for Pelican
 Pelican uses the great `Jinja2 <http://jinja.pocoo.org/>`_ templating engine to
 generate its HTML output. Jinja2 syntax is really simple. If you want to
 create your own theme, feel free to take inspiration from the `"simple" theme
-<https://github.com/ametaireau/pelican/tree/master/pelican/themes/simple/templates>`_.
+<https://github.com/getpelican/pelican/tree/master/pelican/themes/simple/templates>`_.
 
 Structure
 =========

From f3280071c13d9dc555f1b041940f5e59b974c7d4 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 27 Jul 2012 00:31:02 +0200
Subject: [PATCH 0824/2864] change the link to pelican in the default theme

---
 pelican/themes/notmyidea/templates/base.html              | 2 +-
 pelican/themes/simple/templates/base.html                 | 2 +-
 tests/output/basic/a-markdown-powered-article.html        | 2 +-
 tests/output/basic/archives.html                          | 2 +-
 tests/output/basic/article-1.html                         | 2 +-
 tests/output/basic/article-2.html                         | 2 +-
 tests/output/basic/article-3.html                         | 2 +-
 tests/output/basic/author/alexis-metaireau.html           | 2 +-
 tests/output/basic/author/dummy-author.html               | 2 +-
 tests/output/basic/categories.html                        | 2 +-
 tests/output/basic/category/bar.html                      | 2 +-
 tests/output/basic/category/cat1.html                     | 2 +-
 tests/output/basic/category/misc.html                     | 2 +-
 tests/output/basic/category/yeah.html                     | 2 +-
 tests/output/basic/drafts/a-draft-article.html            | 6 +++---
 tests/output/basic/feeds/all-fr.atom.xml                  | 2 +-
 tests/output/basic/index.html                             | 2 +-
 tests/output/basic/oh-yeah-fr.html                        | 6 +++---
 tests/output/basic/oh-yeah.html                           | 2 +-
 tests/output/basic/pages/this-is-a-test-hidden-page.html  | 2 +-
 tests/output/basic/pages/this-is-a-test-page.html         | 2 +-
 tests/output/basic/second-article-fr.html                 | 2 +-
 tests/output/basic/second-article.html                    | 2 +-
 tests/output/basic/tag/bar.html                           | 2 +-
 tests/output/basic/tag/baz.html                           | 2 +-
 tests/output/basic/tag/foo.html                           | 2 +-
 tests/output/basic/tag/foobar.html                        | 2 +-
 tests/output/basic/tag/oh.html                            | 2 +-
 tests/output/basic/tag/yeah.html                          | 2 +-
 tests/output/basic/theme/css/main.css                     | 4 ----
 tests/output/basic/this-is-a-super-article.html           | 2 +-
 tests/output/basic/unbelievable.html                      | 2 +-
 tests/output/custom/a-markdown-powered-article.html       | 2 +-
 tests/output/custom/archives.html                         | 2 +-
 tests/output/custom/article-1.html                        | 2 +-
 tests/output/custom/article-2.html                        | 2 +-
 tests/output/custom/article-3.html                        | 2 +-
 tests/output/custom/author/alexis-metaireau.html          | 2 +-
 tests/output/custom/author/alexis-metaireau2.html         | 2 +-
 tests/output/custom/categories.html                       | 2 +-
 tests/output/custom/category/bar.html                     | 2 +-
 tests/output/custom/category/cat1.html                    | 2 +-
 tests/output/custom/category/misc.html                    | 2 +-
 tests/output/custom/category/yeah.html                    | 2 +-
 tests/output/custom/drafts/a-draft-article.html           | 2 +-
 tests/output/custom/index.html                            | 2 +-
 tests/output/custom/index2.html                           | 2 +-
 tests/output/custom/oh-yeah-fr.html                       | 2 +-
 tests/output/custom/oh-yeah.html                          | 2 +-
 tests/output/custom/pages/this-is-a-test-hidden-page.html | 2 +-
 tests/output/custom/pages/this-is-a-test-page.html        | 2 +-
 tests/output/custom/second-article-fr.html                | 2 +-
 tests/output/custom/second-article.html                   | 2 +-
 tests/output/custom/tag/bar.html                          | 2 +-
 tests/output/custom/tag/baz.html                          | 2 +-
 tests/output/custom/tag/foo.html                          | 2 +-
 tests/output/custom/tag/foobar.html                       | 2 +-
 tests/output/custom/tag/oh.html                           | 2 +-
 tests/output/custom/tag/yeah.html                         | 2 +-
 tests/output/custom/theme/css/main.css                    | 4 ----
 tests/output/custom/this-is-a-super-article.html          | 2 +-
 tests/output/custom/unbelievable.html                     | 2 +-
 62 files changed, 64 insertions(+), 72 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 9d35caa0..6ab87c5a 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -73,7 +73,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 61375e8a..1f55a40f 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -47,7 +47,7 @@
         {% endblock %}
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>,
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
                 which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 6662f7d2..6f41ddde 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -83,7 +83,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index 0b9c664e..058b47f3 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -83,7 +83,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index 97813af8..2a389510 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -84,7 +84,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 54157cc6..798ec4a5 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -84,7 +84,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 7b9af9f9..49bad541 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -84,7 +84,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index 61df3206..f1089963 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -142,7 +142,7 @@ as well as <strong>inline markup</strong>.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/author/dummy-author.html b/tests/output/basic/author/dummy-author.html
index 85b921fe..bd47adde 100644
--- a/tests/output/basic/author/dummy-author.html
+++ b/tests/output/basic/author/dummy-author.html
@@ -275,7 +275,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index 08669b1f..f9bd569b 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -63,7 +63,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index 0ad8f799..b3c51675 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -101,7 +101,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index c54353e0..5f376e6a 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -200,7 +200,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index 80978d5f..fb862c5a 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -136,7 +136,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index 69a709f0..5dcf2857 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -102,7 +102,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index 9996974d..24c1c3bc 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -55,8 +55,8 @@
 
     <div class="entry-content">
       <footer class="post-info">
-        <abbr class="published" title="2012-05-19T23:55:50.764304">
-                Sat 19 May 2012
+        <abbr class="published" title="2012-07-26T22:04:43.481849">
+                Thu 26 July 2012
         </abbr>
 
         
@@ -85,7 +85,7 @@ listed anywhere else.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index c60e2bfe..39220a4f 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-05-19T23:55:50Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-05-19T23:55:50Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-05-19:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-07-26T22:04:43Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-07-26T22:04:43Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-07-26:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </summary></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 7bb846bc..18673102 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -356,7 +356,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index 5442864a..cfcb7f1a 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -55,8 +55,8 @@
 
     <div class="entry-content">
       <footer class="post-info">
-        <abbr class="published" title="2012-05-19T23:55:50.764304">
-                Sat 19 May 2012
+        <abbr class="published" title="2012-07-26T22:04:43.481849">
+                Thu 26 July 2012
         </abbr>
 
         
@@ -89,7 +89,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index 1dffc0eb..b172f2eb 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -94,7 +94,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 864d1109..e3b3f5f5 100644
--- a/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -59,7 +59,7 @@ Anyone can see this page but it's not linked to anywhere!</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 58807c1d..f68a97d6 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -59,7 +59,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index b7c023ee..6dcc1a91 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -89,7 +89,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index 3a607a51..e33300aa 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -89,7 +89,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 6b80b5fe..f58ba6bd 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -222,7 +222,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index 10c19b91..a5f9d9cc 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -141,7 +141,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 5a025bab..2756f57d 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -177,7 +177,7 @@ as well as <strong>inline markup</strong>.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 7a64add9..bd4a7b66 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -102,7 +102,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index a08fb39c..b77856dd 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -101,7 +101,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 3c175905..90f34fe0 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -101,7 +101,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index 0648bf2e..bd1eba75 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -70,9 +70,6 @@ p {margin-bottom: 1.143em;}
 strong, b {font-weight: bold;}
 em, i {font-style: italic;}
 
-::-moz-selection {background: #F6CF74; color: #fff;}
-::selection {background: #F6CF74; color: #fff;}
-
 /* Lists */
 ul {
 	list-style: outside disc;
@@ -163,7 +160,6 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		font-weight: bold;
 		margin: 0 0 .6em .2em;
 		text-decoration: none;
-		width: 427px;
 	}
 	#banner h1 a:hover, #banner h1 a:active {
 		background: none;
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 0e77b70e..2d9cfe74 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -95,7 +95,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 407d7289..b08103a4 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -84,7 +84,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index 785440c2..9ca4763c 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -141,7 +141,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index ed74e782..fe2ad2c4 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -128,7 +128,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index be593d9b..b0e0f879 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -142,7 +142,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index a10950ad..973b870a 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -142,7 +142,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index 76b03ced..7697a4ef 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -142,7 +142,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 3fb51b8b..55dcebc9 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -253,7 +253,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 594304bc..48e2ef1c 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -275,7 +275,7 @@ as well as <strong>inline markup</strong>.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/categories.html b/tests/output/custom/categories.html
index 81ef2b76..bad9dcfd 100644
--- a/tests/output/custom/categories.html
+++ b/tests/output/custom/categories.html
@@ -108,7 +108,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index 5183aaf8..e645f4e2 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -152,7 +152,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index 160e4e4e..4d76e095 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -251,7 +251,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index 54608de8..a0ac83a5 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -187,7 +187,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index 032a9333..ece5f0eb 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -153,7 +153,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index 59d5c6af..e38fb7b2 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -143,7 +143,7 @@ listed anywhere else.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index fbdc2f38..80913795 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -258,7 +258,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index 52b2f723..1eb336b6 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -270,7 +270,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index 46eaffe6..fb669e9b 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -147,7 +147,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index 90478b4b..c4eb421f 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -152,7 +152,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 231b1c8a..913a5974 100644
--- a/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -104,7 +104,7 @@ Anyone can see this page but it's not linked to anywhere!</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index d45bfac2..87e4925f 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -104,7 +104,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index 8446d6aa..1100df29 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -147,7 +147,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 0b287424..7a908526 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -147,7 +147,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 3d3c27c2..087b94b4 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -273,7 +273,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index 83466283..9aab4ffc 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -192,7 +192,7 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index d8d58f41..42f12a61 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -228,7 +228,7 @@ as well as <strong>inline markup</strong>.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index 0d2ce6af..cad2dae3 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -153,7 +153,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index 99d40c14..53d45369 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -152,7 +152,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index f1884cc6..bfd7b4cd 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -152,7 +152,7 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
index 0648bf2e..bd1eba75 100644
--- a/tests/output/custom/theme/css/main.css
+++ b/tests/output/custom/theme/css/main.css
@@ -70,9 +70,6 @@ p {margin-bottom: 1.143em;}
 strong, b {font-weight: bold;}
 em, i {font-style: italic;}
 
-::-moz-selection {background: #F6CF74; color: #fff;}
-::selection {background: #F6CF74; color: #fff;}
-
 /* Lists */
 ul {
 	list-style: outside disc;
@@ -163,7 +160,6 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		font-weight: bold;
 		margin: 0 0 .6em .2em;
 		text-decoration: none;
-		width: 427px;
 	}
 	#banner h1 a:hover, #banner h1 a:active {
 		background: none;
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index d12936d2..f1e3fa40 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -153,7 +153,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index 742a9c0d..e08b2952 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -142,7 +142,7 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
                 </address><!-- /#about -->
 
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>

From 0e4d493d9324aa59e48d433eef717d7fef19b887 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Fri, 27 Jul 2012 00:34:47 +0200
Subject: [PATCH 0825/2864] typogrify also does some changes on the abbr

---
 tests/test_readers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_readers.py b/tests/test_readers.py
index 02d6c122..299aa378 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -57,10 +57,10 @@ class RstReaderTest(unittest.TestCase):
             # otherwise, typogrify should be applied
             content, _ = readers.read_file(_filename('article.rst'),
                                            settings={'TYPOGRIFY': True})
-            expected = "<p>This is some content. With some stuff to&nbsp;"\
+            expected = u"<p>This is some content. With some stuff to&nbsp;"\
                        "&#8220;typogrify&#8221;.</p>\n<p>Now with added "\
                        'support for <abbr title="three letter acronym">'\
-                       'TLA</abbr>.</p>\n'
+                       '<span class="caps">TLA</span></abbr>.</p>\n'
 
             self.assertEqual(content, expected)
         except ImportError:

From f4eea743db2ae1fd8cc2ce80488462e1657435be Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Tue, 31 Jul 2012 09:41:45 -0700
Subject: [PATCH 0826/2864] Update Pelican project domain in a few more places

---
 README.rst | 2 +-
 setup.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 5012bb9c..ba227805 100644
--- a/README.rst
+++ b/README.rst
@@ -28,7 +28,7 @@ Pelican currently supports:
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
-Have a look at `the documentation <http://pelican.notmyidea.org/en/latest/>`_ for
+Have a look at `the documentation <http://docs.getpelican.com/latest/>`_ for
 more information.
 
 Why the name "Pelican"?
diff --git a/setup.py b/setup.py
index b48757d6..96d7b8e6 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ entry_points = {
 setup(
     name = "pelican",
     version = "3.0",
-    url = 'http://pelican.notmyidea.org/',
+    url = 'http://getpelican.com/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',
     description = "A tool to generate a static blog from reStructuredText or Markdown input files.",

From 9df639b4036125d9d08612ccf32690c438a4e0e1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Tue, 31 Jul 2012 11:51:38 -0700
Subject: [PATCH 0827/2864] Settings docs: some values need quotes, some don't

Some folks have run into trouble when configuring settings because
they wrap integer values in quotes or forget quotes for string-based
values. Added clarification to docs that will hopefully reduce confusion
in the future.
---
 docs/settings.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 2d45d463..65c13169 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -11,7 +11,10 @@ example by looking at `/samples/pelican.conf.py
 <https://github.com/getpelican/pelican/raw/master/samples/pelican.conf.py>`_
 
 All the setting identifiers must be set in all-caps, otherwise they will not be
-processed.
+processed. Setting values that are numbers (5, 20, etc.), booleans (True,
+False, None, etc.), dictionaries, or tuples should *not* be enclosed in
+quotation marks. All other values (i.e., strings) *must* be enclosed in
+quotation marks.
 
 The settings you define in the configuration file will be passed to the
 templates, which allows you to use your settings to add site-wide content.

From baeec62e07b68a00637d7cfa045199f2b2b8e49d Mon Sep 17 00:00:00 2001
From: Julian Berman <Julian+git@GrayVines.com>
Date: Wed, 1 Aug 2012 13:02:15 -0400
Subject: [PATCH 0828/2864] Ignore coverage.py

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9274ba2d..9f9404ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ build
 dist
 tags
 .tox
+.coverage
+htmlcov

From 7cb18a088ee37521bcdbd668a321f754bf83c28d Mon Sep 17 00:00:00 2001
From: Julian Berman <Julian+git@GrayVines.com>
Date: Wed, 1 Aug 2012 13:36:47 -0400
Subject: [PATCH 0829/2864] Reimplement settings loading to preserve __file__

---
 pelican/settings.py | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index e9888f94..645a9809 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import imp
+import inspect
 import os
 import locale
 import logging
@@ -84,21 +86,31 @@ def read_settings(filename=None):
     return configured_settings
 
 
-def get_settings_from_file(filename, default_settings=None):
-    """Load a Python file into a dictionary.
+def get_settings_from_module(module=None, default_settings=_DEFAULT_CONFIG):
     """
-    if default_settings == None:
-        default_settings = _DEFAULT_CONFIG
+    Load settings from a module, returning a dict.
+
+    """
+
     context = default_settings.copy()
-    if filename:
-        tempdict = {}
-        execfile(filename, tempdict)
-        for key in tempdict:
-            if key.isupper():
-                context[key] = tempdict[key]
+    if module is not None:
+         context.update(
+             (k, v) for k, v in inspect.getmembers(module) if k.isupper()
+         )
     return context
 
 
+def get_settings_from_file(filename, default_settings=_DEFAULT_CONFIG):
+    """
+    Load settings from a file path, returning a dict.
+
+    """
+
+    name = os.path.basename(filename).rpartition(".")[0]
+    module = imp.load_source(name, filename)
+    return get_settings_from_module(module, default_settings=default_settings)
+
+
 def configure_settings(settings, default_settings=None, filename=None):
     """Provide optimizations, error checking, and warnings for loaded settings"""
     if default_settings is None:

From 24d5a6053ed2b3d69d0fc0691ee38d4577512862 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Wed, 1 Aug 2012 18:20:12 -0700
Subject: [PATCH 0830/2864] Various fixes and improvements to the docs

---
 docs/changelog.rst      |  8 ++---
 docs/contribute.rst     | 38 +++++++++++++-------
 docs/faq.rst            | 80 +++++++++++++++++++++++++----------------
 docs/index.rst          | 20 +++++------
 docs/pelican-themes.rst |  2 --
 docs/plugins.rst        |  6 ++--
 docs/settings.rst       |  7 ++--
 7 files changed, 94 insertions(+), 67 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4508b39e..da77f97e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,7 @@
 Release history
 ###############
 
-3.0 (XXXX-XX-XX)
+3.0.0 (XXXX-XX-XX)
 ================
 
 * Refactored the way URLs are handled
@@ -11,15 +11,15 @@ Release history
 * Added a way to disable feed generation
 * Added support for ``DIRECT_TEMPLATES``
 * Allow multiple extensions for content files
-* Added less support
+* Added LESS support
 * Improved the import script
-* Fixed a bunch of bugs :-)
 * Added functional tests
 * Rsync support in the generated Makefile
 * Improved feed support (easily pluggable with Feedburner for instance)
 * Added support for ``abbr`` in reST
+* Fixed a bunch of bugs :-)
 
-2.8 (2012-02-28)
+2.8.0 (2012-02-28)
 ================
 
 * Dotclear importer
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 0090dd07..82419f17 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -3,14 +3,17 @@ How to contribute?
 There are many ways to contribute to Pelican. You can enhance the
 documentation, add missing features, and fix bugs (or just report them).
 
-Don't hesitate to fork and make a pull request on GitHub.
+Don't hesitate to fork and make a pull request on GitHub. When doing so, please
+create a new feature branch as opposed to making your commits in the master
+branch.
 
 Setting up the development environment
 ======================================
 
 You're free to set up your development environment any way you like. Here is a
-way using virtualenv and virtualenvwrapper. If you don't have them, you can
-install these packages via::
+way using the `virtualenv <http://www.virtualenv.org/>`_ and `virtualenvwrapper
+<http://www.doughellmann.com/projects/virtualenvwrapper/>`_ tools. If you don't
+have them, you can install these both of these packages via::
 
     $ pip install virtualenvwrapper
 
@@ -22,26 +25,34 @@ To create a virtual environment, use the following syntax::
 
     $ mkvirtualenv pelican 
 
-To manually install the dependencies::
+To clone the Pelican source::
 
+    $ git clone https://github.com/getpelican/pelican.git src/pelican
+
+To install the development dependencies::
+
+    $ cd src/pelican
     $ pip install -r dev_requirements.txt
+
+To install Pelican and its dependencies::
+
     $ python setup.py develop
 
 Running the test suite
 ======================
 
 Each time you add a feature, there are two things to do regarding tests:
-checking that the existing tests pass, and adding tests for your new feature
-or for the bug you're fixing.
+checking that the existing tests pass, and adding tests for the new feature
+or bugfix.
 
 The tests live in "pelican/tests" and you can run them using the
 "discover" feature of unittest2::
 
     $ unit2 discover
 
-If you have made changes that affect the output of a pelican generated weblog,
+If you have made changes that affect the output of a Pelican-generated weblog,
 then you should update the output used by functional tests.
-To do so, you can use the 2 following commands::
+To do so, you can use the following two commands::
 
     $ LC_ALL="C" pelican -o tests/output/custom/ -s samples/pelican.conf.py \
         samples/content/
@@ -50,8 +61,9 @@ To do so, you can use the 2 following commands::
 Coding standards
 ================
 
-Try to respect what is described in the PEP8
-(http://www.python.org/dev/peps/pep-0008/) when providing patches. This can be
-eased by the pep8 tool (http://pypi.python.org/pypi/pep8) or by Flake8, which
-will give you some other cool hints about what's good or wrong
-(http://pypi.python.org/pypi/flake8/)
+Try to respect what is described in the `PEP8 specification
+<http://www.python.org/dev/peps/pep-0008/>`_ when providing patches. This can be
+eased via the `pep8 <http://pypi.python.org/pypi/pep8>`_ or `flake8
+<http://pypi.python.org/pypi/flake8/>`_ tools, the latter of which in
+particular will give you some useful hints about ways in which the 
+code/formatting can be improved.
diff --git a/docs/faq.rst b/docs/faq.rst
index 35f39b75..542d1b74 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -3,6 +3,33 @@ Frequently Asked Questions (FAQ)
 
 Here is a summary of the frequently asked questions for Pelican.
 
+What's the best way to communicate a problem, question, or suggestion?
+======================================================================
+
+If you have a problem, question, or suggestion, please start by striking up a
+conversation on `#pelican on Freenode <irc://irc.freenode.net/pelican>`_.
+Those who don't have an IRC client handy can jump in immediately via
+`IRC webchat <http://webchat.freenode.net/?channels=pelican&uio=d4>`_. Because
+of differing time zones, you may not get an immediate response to your question,
+but please be patient and stay logged into IRC — someone will almost always
+respond.
+
+If you are unable to resolve your issue or if you have a feature request, please
+refer to the `issue tracker <https://github.com/getpelican/pelican/issues>`_.
+
+How can I help?
+================
+
+There are several ways to help out. First, you can use Pelican and report any
+suggestions or problems you might have via IRC or the issue tracker.
+
+If you want to contribute, please fork `the git repository
+<https://github.com/getpelican/pelican/>`_, create a new feature branch, make
+your changes, and issue a pull request. Someone will review your changes as soon
+as possible. Please refer to the :ref:`contribute` section for more details.
+
+You can also contribute by creating themes and improving the documentation.
+
 Is it mandatory to have a configuration file?
 =============================================
 
@@ -25,19 +52,6 @@ How do I create my own theme?
 
 Please refer to :ref:`theming-pelican`.
 
-How can I help?
-================
-
-There are several ways to help out. First, you can use Pelican and report any
-suggestions or problems you might have on `the bugtracker
-<https://github.com/getpelican/pelican/issues>`_.
-
-If you want to contribute, please fork `the git repository
-<https://github.com/getpelican/pelican/>`_, make your changes, and issue
-a pull request. I'll review your changes as soon as possible.
-
-You can also contribute by creating themes and improving the documentation.
-
 I want to use Markdown, but I got an error.
 ===========================================
 
@@ -50,11 +64,11 @@ In case you don't have pip installed, consider installing it via::
 
     $ (sudo) easy_install pip
 
-How do I assign custom templates on a per page basis?
+How do I assign custom templates on a per-page basis?
 =====================================================
 
 It's as simple as adding an extra line of metadata to any pages or articles you
-want to have it's own template.
+want to have its own template.
 
     :template: template_name
 
@@ -66,30 +80,34 @@ What if I want to disable feed generation?
 
 To disable all feed generation set ``FEED_ATOM`` and ``FEED_RSS`` to ``None`` in
 your settings. Please note ``None`` and ``''`` are not the same thing. The
-word None should not be surrounded by quotes.
+word ``None`` should not be surrounded by quotes.
 
-I'm getting a warning about Feeds generated without SITEURL being set properly
+I'm getting a warning about feeds generated without SITEURL being set properly
 ==============================================================================
 
-`RSS and atom feeds require all URLs and links in them to be absolute <http://validator.w3.org/feed/docs/rss2.html#comments>`_.
-In order to properly generate all URLs properly in pelican you will need to set
-``SITEURL`` to the full path of your blog. By default, when using the ``make html``
-to test build your site ``SITEURL`` is disabled so you should receive this
-warning.
-If configured properly no other make commands should have this message.
+`RSS and Atom feeds require all URLs and links in them to be absolute
+<http://validator.w3.org/feed/docs/rss2.html#comments>`_.
+In order to properly generate all URLs properly in Pelican you will need to set
+``SITEURL`` to the full path of your blog. When using ``make html`` and the
+default Makefile provided by the `pelican-quickstart` bootstrap script to test
+build your site, it's normal to see this warning since ``SITEURL`` is 
+deliberately left undefined. If configured properly no other ``make`` commands
+should result in this warning.
 
-Feeds still are generated when this error comes up, but may not validate.
+Feeds are still generated when this warning is displayed but may not validate.
 
-My feeds are broken since I upgraded to 3.0
-===========================================
+My feeds are broken since I upgraded to Pelican 3.0
+===================================================
 
-Starting in 3.0 we changed the more confusing FEED options to say FEED_ATOM
-like the RRS feed options. Here is an exact list of the changes::
+Starting in 3.0, some of the FEED setting names were changed to more explicitly
+refer to the Atom feeds they inherently represent (much like the FEED_RSS
+setting names). Here is an exact list of the renamed setting names::
 
     FEED -> FEED_ATOM
     TAG_FEED -> TAG_FEED_ATOM
     CATEGORY_FEED -> CATEGORY_FEED_ATOM
 
-Older 2.x themes that referenced these may not link properly. Please update
-your themes for 3 on. For an example of complete RSS headers and usage please
-check out the simple theme.
+Older 2.x themes that referenced the old setting names may not link properly.
+In order to rectify this, please update your theme for compatibility with 3.0+
+by changing the relevant values in your template files. For an example of 
+complete feed headers and usage please check out the ``simple`` theme.
diff --git a/docs/index.rst b/docs/index.rst
index 04266643..711f28bc 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,7 +1,7 @@
 Pelican
 #######
 
-Pelican is a simple weblog generator, written in Python.
+Pelican is a static site generator, written in Python.
 
 * Write your weblog entries directly with your editor of choice (vim!) in
   reStructuredText or Markdown
@@ -18,16 +18,16 @@ Pelican currently supports:
 * Comments, via an external service (Disqus). (Please note that while
   useful, Disqus is an external service, and thus the comment data will be
   somewhat outside of your control and potentially subject to data loss.)
-* Theming support (themes are created using `jinja2 <http://jinja.pocoo.org/>`_)
+* Theming support (themes are created using `Jinja2 <http://jinja.pocoo.org/>`_)
 * PDF generation of the articles/pages (optional)
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
-* Compilation of less css (optional)
+* Compilation of `LESS CSS <http://lesscss.org/>`_ (optional)
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
-Why the name "Pelican" ?
+Why the name "Pelican"?
 ========================
 
 Heh, you didn't notice? "Pelican" is an anagram for « Calepin » ;)
@@ -35,18 +35,18 @@ Heh, you didn't notice? "Pelican" is an anagram for « Calepin » ;)
 Source code
 ===========
 
-You can access the source code via git at http://github.com/getpelican/pelican/
+You can access the source code at: http://github.com/getpelican/pelican/
 
 Feedback / Contact us
 =====================
 
-If you want to see new features in Pelican, don't hesitate to tell me, to clone
+If you want to see new features in Pelican, don't hesitate to chime in, clone
 the repository, etc. That's open source, dude!
 
-Contact me at "alexis at notmyidea dot org" for any request/feedback! You can
-also join the team at `#pelican on irc.freenode.org
-<irc://irc.freenode.net/pelican>`_
-(or if you don't have any IRC client, use `the webchat
+Send a message to "alexis at notmyidea dot org" with any requests/feedback! You
+can also join the team at
+`#pelican on Freenode <irc://irc.freenode.net/pelican>`_ (or if you don't have 
+a IRC client handy, use `the webchat
 <http://webchat.freenode.net/?channels=pelican&uio=d4>`_)
 for quick feedback.
 
diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index c7cbc5b7..a074a0a2 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -162,5 +162,3 @@ See also
 
 -   http://docs.notmyidea.org/alexis/pelican/
 -   ``/usr/share/doc/pelican/`` if you have installed Pelican using the `APT repository <http://skami18.github.com/pelican-packages/>`_
-
-
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 3acecebe..53858668 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -78,13 +78,13 @@ Tag cloud
 Translation
 -----------
 
-Github Activity
+GitHub activity
 ---------------
 
 This plugin makes use of the ``feedparser`` library that you'll need to
 install.
 
-Set the ``GITHUB_ACTIVITY_FEED`` parameter to your Github activity feed.
+Set the ``GITHUB_ACTIVITY_FEED`` parameter to your GitHub activity feed.
 For example, my setting would look like::
 
      GITHUB_ACTIVITY_FEED = 'https://github.com/kpanic.atom'
@@ -107,4 +107,4 @@ variable, as in the example::
 
 
 ``github_activity`` is a list of lists. The first element is the title
-and the second element is the raw HTML from Github.
+and the second element is the raw HTML from GitHub.
diff --git a/docs/settings.rst b/docs/settings.rst
index 65c13169..9ea6071d 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -83,11 +83,10 @@ Setting name (default value)                                            What doe
 `TIMEZONE`                                                              The timezone used in the date information, to
                                                                         generate Atom and RSS feeds. See the "timezone"
                                                                         section below for more info.
-`TYPOGRIFY` (``False``)                                                 If set to true, some
-                                                                        additional transformations will be done on the
-                                                                        generated HTML, using the `Typogrify
+`TYPOGRIFY` (``False``)                                                 If set to True, several typographical improvements will be
+                                                                        incorporated into the generated HTML via the `Typogrify
                                                                         <http://static.mintchaos.com/projects/typogrify/>`_
-                                                                        library
+                                                                        library, which can be installed via: ``pip install typogrify``
 `LESS_GENERATOR` (``FALSE``)                                            Set to True or complete path to `lessc` (if not
                                                                         found in system PATH) to enable compiling less
                                                                         css files. Requires installation of `less css`_.

From 7ee6fdd9e6431571507f6b7a84a93567e52eb596 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Fri, 3 Aug 2012 08:26:19 -0700
Subject: [PATCH 0831/2864] Make develop_server.sh executable. Refs #443.

The pelican-quickstart command generates a develop_server.sh file that
must have executable permissions in order to run.
---
 pelican/tools/pelican_quickstart.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 9eef105e..c8064bf1 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -221,6 +221,7 @@ Please answer the following questions so this script can generate the files need
                     template = string.Template(line)
                     fd.write(template.safe_substitute(CONF))
                 fd.close()
+                os.chmod((os.path.join(CONF['basedir'], 'develop_server.sh')), 0755)
         except OSError, e:
             print('Error: {0}'.format(e))
 

From aeb6a4842f9881394c3e0e4827a64f5f1ed739ef Mon Sep 17 00:00:00 2001
From: Clint Howarth <clint.howarth@gmail.com>
Date: Fri, 3 Aug 2012 23:34:46 -0300
Subject: [PATCH 0832/2864] Update README to new project home

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index ba227805..7b01f00d 100644
--- a/README.rst
+++ b/README.rst
@@ -39,7 +39,7 @@ Heh, you didn't notice? "Pelican" is an anagram for « Calepin » ;)
 Source code
 -----------
 
-You can access the source code via git at: https://github.com/ametaireau/pelican
+You can access the source code via git at: https://github.com/getpelican/pelican
 
 If you feel hackish, have a look at the explanation of `Pelican's internals
 <http://pelican.notmyidea.org/en/latest/internals.html>`_.

From b72692baaf986f004af1ffe9c3372d78382b5399 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Sat, 4 Aug 2012 17:13:57 +0200
Subject: [PATCH 0833/2864] README: The build status should point to new repo

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 7b01f00d..d93f0a4b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 Pelican
 #######
 
-.. image:: https://secure.travis-ci.org/ametaireau/pelican.png?branch=master
+.. image:: https://secure.travis-ci.org/getpelican/pelican.png?branch=master
 
 Pelican is a simple weblog generator, written in `Python <http://www.python.org/>`_.
 

From beb4dccc8c7abbeca41e65ceedba46b893b53af5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 4 Aug 2012 11:15:44 -0700
Subject: [PATCH 0834/2864] Doc links changed to new domain. Other doc fixes.

---
 README.rst         | 21 +++++++++++----------
 docs/changelog.rst |  4 ++--
 docs/faq.rst       |  3 ++-
 docs/index.rst     | 17 +++++++++--------
 docs/settings.rst  |  2 +-
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/README.rst b/README.rst
index d93f0a4b..12a98fb8 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@ Pelican
 
 .. image:: https://secure.travis-ci.org/getpelican/pelican.png?branch=master
 
-Pelican is a simple weblog generator, written in `Python <http://www.python.org/>`_.
+Pelican is a static site generator, written in `Python <http://www.python.org/>`_.
 
 * Write your weblog entries directly with your editor of choice (vim!) 
   in `reStructuredText <http://docutils.sourceforge.net/rst.html>`_ or `Markdown <http://daringfireball.net/projects/markdown/>`_
@@ -20,11 +20,12 @@ Pelican currently supports:
 * Comments, via an external service (Disqus). (Please note that while
   useful, Disqus is an external service, and thus the comment data will be
   somewhat outside of your control and potentially subject to data loss.)
-* Theming support (themes are created using `jinja2 <http://jinja.pocoo.org/>`_)
+* Theming support (themes are created using `Jinja2 <http://jinja.pocoo.org/>`_)
 * PDF generation of the articles/pages (optional)
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
+* Compilation of `LESS CSS <http://lesscss.org/>`_ (optional)
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
@@ -34,26 +35,26 @@ more information.
 Why the name "Pelican"?
 ------------------------
 
-Heh, you didn't notice? "Pelican" is an anagram for « Calepin » ;)
+"Pelican" is an anagram for *calepin*, which means "notebook" in French. ;)
 
 Source code
 -----------
 
-You can access the source code via git at: https://github.com/getpelican/pelican
+You can access the source code at: https://github.com/getpelican/pelican
 
 If you feel hackish, have a look at the explanation of `Pelican's internals
-<http://pelican.notmyidea.org/en/latest/internals.html>`_.
+<http://docs.getpelican.com/en/latest/internals.html>`_.
 
 Feedback / Contact us
 ---------------------
 
 If you want to see new features in Pelican, don't hesitate to offer suggestions,
 clone the repository, etc. There are many ways to `contribute 
-<http://pelican.notmyidea.org/en/latest/contribute.html>`_. That's open source, dude!
+<http://docs.getpelican.com/en/latest/contribute.html>`_. That's open source, dude!
 
-Contact me at "alexis at notmyidea dot org" for any request/feedback! You can
-also join the team at `#pelican on irc.freenode.org 
-<irc://irc.freenode.net/pelican>`_ 
-(or if you don't have any IRC client, use `the webchat
+Send a message to "alexis at notmyidea dot org" with any requests/feedback! You
+can also join the team at
+`#pelican on Freenode <irc://irc.freenode.net/pelican>`_ (or if you don't have 
+a IRC client handy, use `the webchat
 <http://webchat.freenode.net/?channels=pelican&uio=d4>`_)
 for quick feedback.
diff --git a/docs/changelog.rst b/docs/changelog.rst
index da77f97e..f6365d75 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,7 +2,7 @@ Release history
 ###############
 
 3.0.0 (XXXX-XX-XX)
-================
+==================
 
 * Refactored the way URLs are handled
 * Improved the English documentation
@@ -20,7 +20,7 @@ Release history
 * Fixed a bunch of bugs :-)
 
 2.8.0 (2012-02-28)
-================
+==================
 
 * Dotclear importer
 * Allow the usage of Markdown extensions
diff --git a/docs/faq.rst b/docs/faq.rst
index 542d1b74..dd7428eb 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -26,7 +26,8 @@ suggestions or problems you might have via IRC or the issue tracker.
 If you want to contribute, please fork `the git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make
 your changes, and issue a pull request. Someone will review your changes as soon
-as possible. Please refer to the :ref:`contribute` section for more details.
+as possible. Please refer to the :doc:`How to Contribute <contribute>` section 
+for more details.
 
 You can also contribute by creating themes and improving the documentation.
 
diff --git a/docs/index.rst b/docs/index.rst
index 711f28bc..196d9de1 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,11 +1,11 @@
 Pelican
 #######
 
-Pelican is a static site generator, written in Python.
+Pelican is a static site generator, written in `Python <http://www.python.org/>`_.
 
-* Write your weblog entries directly with your editor of choice (vim!) in
-  reStructuredText or Markdown
-* A simple CLI tool to (re)generate the weblog
+* Write your weblog entries directly with your editor of choice (vim!) 
+  in `reStructuredText <http://docutils.sourceforge.net/rst.html>`_ or `Markdown <http://daringfireball.net/projects/markdown/>`_
+* Includes a simple CLI tool to (re)generate the weblog
 * Easy to interface with DVCSes and web hooks
 * Completely static output is easy to host anywhere
 
@@ -30,18 +30,19 @@ Pelican currently supports:
 Why the name "Pelican"?
 ========================
 
-Heh, you didn't notice? "Pelican" is an anagram for « Calepin » ;)
+"Pelican" is an anagram for *calepin*, which means "notebook" in French. ;)
 
 Source code
 ===========
 
-You can access the source code at: http://github.com/getpelican/pelican/
+You can access the source code at: https://github.com/getpelican/pelican
 
 Feedback / Contact us
 =====================
 
-If you want to see new features in Pelican, don't hesitate to chime in, clone
-the repository, etc. That's open source, dude!
+If you want to see new features in Pelican, don't hesitate to offer suggestions,
+clone the repository, etc. There are many ways to :doc:`contribute<contribute>`.
+That's open source, dude!
 
 Send a message to "alexis at notmyidea dot org" with any requests/feedback! You
 can also join the team at
diff --git a/docs/settings.rst b/docs/settings.rst
index 9ea6071d..c219ed12 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -468,7 +468,7 @@ template tag, for example:
 .. code-block:: jinja
 
     {% assets filters="cssmin", output="css/style.min.css", "css/inuit.css", "css/pygment-monokai.css", "css/main.css" %}
-        <link rel="stylesheet" href="{{ ASSET_URL }}">
+        <link rel="stylesheet" href="{{ ASSETS_URL }}">
     {% endassets %}
 
 will produce a minified css file with the version identifier:

From 0c0253660556cd40a003349e2a7d615b7d7d4741 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Sun, 5 Aug 2012 17:25:39 -0700
Subject: [PATCH 0835/2864] Give devserver its own make target

Restore "make serve" to a non-backgrounded SimpleHTTPServer process and
give the develop_server.sh its own make target at "make devserver".
Add a few missing make targets to the help list and re-order targets for
consistency. Add note to docs regarding how to stop the devserver.
---
 docs/getting_started.rst            | 14 ++++++++++++--
 pelican/tools/templates/Makefile.in | 20 +++++++++++++-------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 3733812b..1ab7c642 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -107,11 +107,21 @@ instead::
 
     $ make regenerate
 
-To serve the site so it can be previewed in your browser::
+To serve the site so it can be previewed in your browser at
+http://localhost:8000::
 
     $ make serve
 
-Visit http://localhost:8000 in your browser to see your site.
+Normally you would need to run ``make regenerate`` and ``make serve`` in two
+separate terminal sessions, but you can run both at once via::
+
+    $ make devserver
+
+The above command will simultaneously run Pelican in regeneration mode as well
+as serve the output at http://localhost:8000. Once you are done testing your
+changes, you should stop the development server via::
+
+    $ ./develop_server stop
 
 When you're ready to publish your site, you can upload it via the method(s) you
 chose during the ``pelican-quickstart`` questionnaire. For this example, we'll
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index df00ffbf..9a26e315 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -24,12 +24,15 @@ help:
 	@echo 'Usage:                                                                 '
 	@echo '   make html                        (re)generate the web site          '
 	@echo '   make clean                       remove the generated files         '
+	@echo '   make regenerate                  regenerate files upon modification '
 	@echo '   make publish                     generate using production settings '
-	@echo '   make serve                       run develop_server.sh restart      '
-	@echo '   ftp_upload                       upload the web site via FTP        '
+	@echo '   make serve                       serve site at http://localhost:8000'
+	@echo '   make devserver                   start/restart develop_server.sh    '
 	@echo '   ssh_upload                       upload the web site via SSH        '
+	@echo '   rsync_upload                     upload the web site via rsync+ssh  '
 	@echo '   dropbox_upload                   upload the web site via Dropbox    '
-	@echo '   rsync_upload                     upload the web site via rsync/ssh  '
+	@echo '   ftp_upload                       upload the web site via FTP        '
+	@echo '   github                           upload the web site via gh-pages   '
 	@echo '                                                                       '
 
 
@@ -46,20 +49,23 @@ regenerate: clean
 	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 serve:
+	cd $$(OUTPUTDIR) && python -m SimpleHTTPServer
+
+devserver:
 	$$(BASEDIR)/develop_server.sh restart
 
 publish:
 	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(PUBLISHCONF) $$(PELICANOPTS)
 
-dropbox_upload: publish
-	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
-
 ssh_upload: publish
 	scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 rsync_upload: publish
 	rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
+dropbox_upload: publish
+	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
+
 ftp_upload: publish
 	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
 
@@ -67,4 +73,4 @@ github: publish
 	ghp-import $$(OUTPUTDIR)
 	git push origin gh-pages
 
-.PHONY: html help clean regenerate serve publish ftp_upload ssh_upload rsync_upload dropbox_upload github
+.PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload github

From 8f7a3044ec55a9dc8f7a62a41f05cb33a62cd91d Mon Sep 17 00:00:00 2001
From: Feth Arezki <feth@tuttu.info>
Date: Mon, 6 Aug 2012 15:13:04 +0300
Subject: [PATCH 0836/2864] Update docs/getting_started.rst

virtualenvwrapper requires a shell restart
---
 docs/getting_started.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 1ab7c642..c954cf9f 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -19,6 +19,10 @@ and `virtualenvwrapper <http://www.doughellmann.com/projects/virtualenvwrapper/>
 before installing Pelican::
 
     $ sudo pip install --upgrade virtualenv virtualenvwrapper
+
+Note that virtualenvwrapper, being a shell hack, usually requires that a new shell
+be started in order to be sourced. Continue -perhaps in a new shell::
+
     $ mkvirtualenv pelican
     $ pip install pelican
 

From a3e24949af4a7b846003ca4c2e450967eb8a67f6 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 6 Aug 2012 06:11:54 -0700
Subject: [PATCH 0837/2864] Provide specific links to virtualenvwrapper docs

Rather than detail how to install and configure virtualenvwrapper, it
seems best to instead link to the appropriate external docs.
---
 docs/getting_started.rst | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index c954cf9f..5150fcf6 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -14,17 +14,15 @@ If you don't have ``pip`` installed, an alternative method is ``easy_install``::
     $ easy_install pelican
 
 While the above is the simplest method, the recommended approach is to create
-a virtual environment for Pelican via `virtualenv <http://www.virtualenv.org/>`_
-and `virtualenvwrapper <http://www.doughellmann.com/projects/virtualenvwrapper/>`_
-before installing Pelican::
-
-    $ sudo pip install --upgrade virtualenv virtualenvwrapper
-
-Note that virtualenvwrapper, being a shell hack, usually requires that a new shell
-be started in order to be sourced. Continue -perhaps in a new shell::
+a virtual environment for Pelican via virtualenv_ and virtualenvwrapper_ before
+installing Pelican. Assuming you've followed the virtualenvwrapper
+`installation <http://virtualenvwrapper.readthedocs.org/en/latest/install.html>`_
+and `shell configuration 
+<http://virtualenvwrapper.readthedocs.org/en/latest/install.html#shell-startup-file>`_
+steps, you can then open a new terminal session and create a new virtual
+environment for Pelican::
 
     $ mkvirtualenv pelican
-    $ pip install pelican
 
 Once the virtual environment has been created and activated, Pelican can be
 be installed via ``pip`` or ``easy_install`` as noted above. Alternatively, if
@@ -47,9 +45,9 @@ Markdown library as well::
 Upgrading
 ---------
 
-If you installed a stable Pelican release via pip or easy_install and wish to
-upgrade to the latest stable release, you can do so by adding ``--upgrade`` to
-the relevant command. For pip, that would be::
+If you installed a stable Pelican release via ``pip`` or ``easy_install`` and
+wish to upgrade to the latest stable release, you can do so by adding
+``--upgrade`` to the relevant command. For pip, that would be::
 
     $ pip install --upgrade pelican
 
@@ -76,11 +74,11 @@ Kickstart a blog
 ================
 
 Following is a brief tutorial for those who want to get started right away.
-We're going to assume Pelican was installed in a virtual environment via the
-following steps (if you're not using a virtual environment for Pelican, you can
-skip to the ``pelican-quickstart`` command)::
+We're going to assume that virtualenv_ and virtualenvwrapper_ are installed and
+configured; if you've installed Pelican outside of a virtual environment,
+you can skip to the ``pelican-quickstart`` command. Let's first create a new
+virtual environment and install Pelican into it::
 
-    $ sudo pip install --upgrade virtualenv virtualenvwrapper
     $ mkvirtualenv pelican
     $ pip install pelican Markdown
 
@@ -309,3 +307,5 @@ Or run a simple web server using Python::
 
     cd output && python -m SimpleHTTPServer
 
+.. _virtualenv: http://www.virtualenv.org/
+.. _virtualenvwrapper: http://www.doughellmann.com/projects/virtualenvwrapper/

From c0e3926b0dd031ddd7b176cd27ba51ae9db0cb92 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 6 Aug 2012 07:40:10 -0700
Subject: [PATCH 0838/2864] Prepare for 3.0 release, make README more readable

Since PyPI doesn't seem to handle anything but the most basic of reST
formatting, moving the inline links to the end of the file should
improve readability when the file is viewed in its raw form. Also
updated changelog with the 3.0 release date.
---
 README.rst         | 42 +++++++++++++++++++++++++-----------------
 docs/changelog.rst |  2 +-
 docs/index.rst     | 39 ++++++++++++++++++++++++---------------
 3 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/README.rst b/README.rst
index 12a98fb8..9ff87539 100644
--- a/README.rst
+++ b/README.rst
@@ -1,12 +1,12 @@
 Pelican
-#######
+=======
 
 .. image:: https://secure.travis-ci.org/getpelican/pelican.png?branch=master
 
-Pelican is a static site generator, written in `Python <http://www.python.org/>`_.
+Pelican is a static site generator, written in Python_.
 
 * Write your weblog entries directly with your editor of choice (vim!) 
-  in `reStructuredText <http://docutils.sourceforge.net/rst.html>`_ or `Markdown <http://daringfireball.net/projects/markdown/>`_
+  in reStructuredText_ or Markdown_
 * Includes a simple CLI tool to (re)generate the weblog
 * Easy to interface with DVCSes and web hooks
 * Completely static output is easy to host anywhere
@@ -20,20 +20,19 @@ Pelican currently supports:
 * Comments, via an external service (Disqus). (Please note that while
   useful, Disqus is an external service, and thus the comment data will be
   somewhat outside of your control and potentially subject to data loss.)
-* Theming support (themes are created using `Jinja2 <http://jinja.pocoo.org/>`_)
+* Theming support (themes are created using Jinja2_ templates)
 * PDF generation of the articles/pages (optional)
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
-* Compilation of `LESS CSS <http://lesscss.org/>`_ (optional)
+* Compilation of `LESS CSS`_ (optional)
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
-Have a look at `the documentation <http://docs.getpelican.com/latest/>`_ for
-more information.
+Have a look at the `Pelican documentation`_ for more information.
 
 Why the name "Pelican"?
-------------------------
+-----------------------
 
 "Pelican" is an anagram for *calepin*, which means "notebook" in French. ;)
 
@@ -42,19 +41,28 @@ Source code
 
 You can access the source code at: https://github.com/getpelican/pelican
 
-If you feel hackish, have a look at the explanation of `Pelican's internals
-<http://docs.getpelican.com/en/latest/internals.html>`_.
+If you feel hackish, have a look at the explanation of `Pelican's internals`_.
 
 Feedback / Contact us
 ---------------------
 
 If you want to see new features in Pelican, don't hesitate to offer suggestions,
-clone the repository, etc. There are many ways to `contribute 
-<http://docs.getpelican.com/en/latest/contribute.html>`_. That's open source, dude!
+clone the repository, etc. There are many ways to contribute_. That's open
+source, dude!
 
 Send a message to "alexis at notmyidea dot org" with any requests/feedback! You
-can also join the team at
-`#pelican on Freenode <irc://irc.freenode.net/pelican>`_ (or if you don't have 
-a IRC client handy, use `the webchat
-<http://webchat.freenode.net/?channels=pelican&uio=d4>`_)
-for quick feedback.
+can also join the team at `#pelican on Freenode`_ (or if you don't have an IRC
+client handy, use the webchat_ for quick feedback.
+
+.. Links
+
+.. _Python: http://www.python.org/
+.. _reStructuredText: http://docutils.sourceforge.net/rst.html
+.. _Markdown: http://daringfireball.net/projects/markdown/
+.. _Jinja2: http://jinja.pocoo.org/
+.. _`LESS CSS`: http://lesscss.org/
+.. _`Pelican documentation`: http://docs.getpelican.com/latest/
+.. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
+.. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
+.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
+.. _contribute: http://docs.getpelican.com/en/latest/contribute.html
\ No newline at end of file
diff --git a/docs/changelog.rst b/docs/changelog.rst
index f6365d75..1d50b9d0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,7 @@
 Release history
 ###############
 
-3.0.0 (XXXX-XX-XX)
+3.0.0 (2012-08-06)
 ==================
 
 * Refactored the way URLs are handled
diff --git a/docs/index.rst b/docs/index.rst
index 196d9de1..b04557eb 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,16 +1,16 @@
 Pelican
-#######
+=======
 
-Pelican is a static site generator, written in `Python <http://www.python.org/>`_.
+Pelican is a static site generator, written in Python_.
 
 * Write your weblog entries directly with your editor of choice (vim!) 
-  in `reStructuredText <http://docutils.sourceforge.net/rst.html>`_ or `Markdown <http://daringfireball.net/projects/markdown/>`_
+  in reStructuredText_ or Markdown_
 * Includes a simple CLI tool to (re)generate the weblog
 * Easy to interface with DVCSes and web hooks
 * Completely static output is easy to host anywhere
 
 Features
-========
+--------
 
 Pelican currently supports:
 
@@ -18,41 +18,38 @@ Pelican currently supports:
 * Comments, via an external service (Disqus). (Please note that while
   useful, Disqus is an external service, and thus the comment data will be
   somewhat outside of your control and potentially subject to data loss.)
-* Theming support (themes are created using `Jinja2 <http://jinja.pocoo.org/>`_)
+* Theming support (themes are created using Jinja2_ templates)
 * PDF generation of the articles/pages (optional)
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
-* Compilation of `LESS CSS <http://lesscss.org/>`_ (optional)
+* Compilation of `LESS CSS`_ (optional)
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
 Why the name "Pelican"?
-========================
+-----------------------
 
 "Pelican" is an anagram for *calepin*, which means "notebook" in French. ;)
 
 Source code
-===========
+-----------
 
 You can access the source code at: https://github.com/getpelican/pelican
 
 Feedback / Contact us
-=====================
+---------------------
 
 If you want to see new features in Pelican, don't hesitate to offer suggestions,
 clone the repository, etc. There are many ways to :doc:`contribute<contribute>`.
 That's open source, dude!
 
 Send a message to "alexis at notmyidea dot org" with any requests/feedback! You
-can also join the team at
-`#pelican on Freenode <irc://irc.freenode.net/pelican>`_ (or if you don't have 
-a IRC client handy, use `the webchat
-<http://webchat.freenode.net/?channels=pelican&uio=d4>`_)
-for quick feedback.
+can also join the team at `#pelican on Freenode`_ (or if you don't have an IRC
+client handy, use the webchat_ for quick feedback.
 
 Documentation
-=============
+-------------
 
 A French version of the documentation is available at :doc:`fr/index`.
 
@@ -71,3 +68,15 @@ A French version of the documentation is available at :doc:`fr/index`.
    contribute
    report
    changelog
+
+.. Links
+
+.. _Python: http://www.python.org/
+.. _reStructuredText: http://docutils.sourceforge.net/rst.html
+.. _Markdown: http://daringfireball.net/projects/markdown/
+.. _Jinja2: http://jinja.pocoo.org/
+.. _`LESS CSS`: http://lesscss.org/
+.. _`Pelican documentation`: http://docs.getpelican.com/latest/
+.. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
+.. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
+.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
\ No newline at end of file

From 1eaaf4d8d8b342deec2ebcf7ec8d9cf73a2335ab Mon Sep 17 00:00:00 2001
From: Feth AREZKI <feth@tuttu.info>
Date: Mon, 6 Aug 2012 18:12:54 +0200
Subject: [PATCH 0839/2864] add travis-ci url -> see why build breaks

that deleted some trailing spaces
---
 README.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index ba227805..06fc6831 100644
--- a/README.rst
+++ b/README.rst
@@ -3,9 +3,11 @@ Pelican
 
 .. image:: https://secure.travis-ci.org/ametaireau/pelican.png?branch=master
 
+See why: http://travis-ci.org/#!/getpelican/pelican
+
 Pelican is a simple weblog generator, written in `Python <http://www.python.org/>`_.
 
-* Write your weblog entries directly with your editor of choice (vim!) 
+* Write your weblog entries directly with your editor of choice (vim!)
   in `reStructuredText <http://docutils.sourceforge.net/rst.html>`_ or `Markdown <http://daringfireball.net/projects/markdown/>`_
 * Includes a simple CLI tool to (re)generate the weblog
 * Easy to interface with DVCSes and web hooks
@@ -48,12 +50,12 @@ Feedback / Contact us
 ---------------------
 
 If you want to see new features in Pelican, don't hesitate to offer suggestions,
-clone the repository, etc. There are many ways to `contribute 
+clone the repository, etc. There are many ways to `contribute
 <http://pelican.notmyidea.org/en/latest/contribute.html>`_. That's open source, dude!
 
 Contact me at "alexis at notmyidea dot org" for any request/feedback! You can
-also join the team at `#pelican on irc.freenode.org 
-<irc://irc.freenode.net/pelican>`_ 
+also join the team at `#pelican on irc.freenode.org
+<irc://irc.freenode.net/pelican>`_
 (or if you don't have any IRC client, use `the webchat
 <http://webchat.freenode.net/?channels=pelican&uio=d4>`_)
 for quick feedback.

From e18a63e99243150b5839c1bedde1d1e1050cf005 Mon Sep 17 00:00:00 2001
From: Feth AREZKI <feth@tuttu.info>
Date: Mon, 6 Aug 2012 18:30:11 +0200
Subject: [PATCH 0840/2864] make image clickable. also fix url :)

---
 README.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 06fc6831..109f6b9f 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,9 @@
 Pelican
 #######
 
-.. image:: https://secure.travis-ci.org/ametaireau/pelican.png?branch=master
-
-See why: http://travis-ci.org/#!/getpelican/pelican
+.. image:: https://secure.travis-ci.org/getpelican/pelican.png?branch=master
+   :target: http://travis-ci.org/#!/getpelican/pelican
+   :alt: Travis-ci: continuous integration status.
 
 Pelican is a simple weblog generator, written in `Python <http://www.python.org/>`_.
 

From 68cf8d5c3d4369c5f92d321bfb85d8968e2ccb31 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Wed, 8 Aug 2012 08:45:04 -0700
Subject: [PATCH 0841/2864] Update Pelican 3.0 release date in changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1d50b9d0..173a7cf2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,7 @@
 Release history
 ###############
 
-3.0.0 (2012-08-06)
+3.0.0 (2012-08-08)
 ==================
 
 * Refactored the way URLs are handled

From 3bf377fd5f01a07cd58400f2e0bd3bb558495a7c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Wed, 8 Aug 2012 09:29:04 -0700
Subject: [PATCH 0842/2864] Minor doc fixes

---
 docs/changelog.rst       | 10 +++++-----
 docs/getting_started.rst |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 173a7cf2..064818c9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,7 @@
 Release history
 ###############
 
-3.0.0 (2012-08-08)
+3.0 (2012-08-08)
 ==================
 
 * Refactored the way URLs are handled
@@ -19,7 +19,7 @@ Release history
 * Added support for ``abbr`` in reST
 * Fixed a bunch of bugs :-)
 
-2.8.0 (2012-02-28)
+2.8 (2012-02-28)
 ==================
 
 * Dotclear importer
@@ -39,7 +39,7 @@ Release history
 * Support having different timezones per language
 * Enhanced the documentation
 
-2.7.0 (2011-06-11)
+2.7 (2011-06-11)
 ==================
 
 * Use ``logging`` rather than echoing to stdout
@@ -49,7 +49,7 @@ Release history
 * Packaged for Debian
 * Added draft support
 
-2.6.0 (2011-03-08)
+2.6 (2011-03-08)
 ==================
 
 * Changes in the output directory structure
@@ -67,7 +67,7 @@ Release history
 * Pagination support
 * Added Skribit support
 
-2.5.0 (2010-11-20)
+2.5 (2010-11-20)
 ==================
 
 * Import from Wordpress
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 5150fcf6..282d6c23 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -123,7 +123,7 @@ The above command will simultaneously run Pelican in regeneration mode as well
 as serve the output at http://localhost:8000. Once you are done testing your
 changes, you should stop the development server via::
 
-    $ ./develop_server stop
+    $ ./develop_server.sh stop
 
 When you're ready to publish your site, you can upload it via the method(s) you
 chose during the ``pelican-quickstart`` questionnaire. For this example, we'll

From 532001c8511c7e30de87114d5db233328bce1e55 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Wed, 8 Aug 2012 10:21:29 -0700
Subject: [PATCH 0843/2864] Add FAQ entry re: arbitrary metadata in templates

---
 docs/faq.rst | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index dd7428eb..598f8448 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -65,6 +65,20 @@ In case you don't have pip installed, consider installing it via::
 
     $ (sudo) easy_install pip
 
+Can I use arbitrary meta-data in my templates?
+==============================================
+
+Yes. For example, to include a modified date in a Markdown post, one could
+include the following at the top of the article:
+
+    Modified: 2012-08-08
+
+That meta-data can then be accessed in the template:
+
+    {% if article.modified %}
+    Last modified: {{ article.full }}
+    {% endif %}
+
 How do I assign custom templates on a per-page basis?
 =====================================================
 

From 440a68636b5e7f04fb63446e84ce9c322a95ca37 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Wed, 8 Aug 2012 10:27:45 -0700
Subject: [PATCH 0844/2864] Fix silly mistakes in last doc update

---
 docs/faq.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 598f8448..4efefaf2 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -69,14 +69,14 @@ Can I use arbitrary meta-data in my templates?
 ==============================================
 
 Yes. For example, to include a modified date in a Markdown post, one could
-include the following at the top of the article:
+include the following at the top of the article::
 
     Modified: 2012-08-08
 
-That meta-data can then be accessed in the template:
+That meta-data can then be accessed in the template::
 
     {% if article.modified %}
-    Last modified: {{ article.full }}
+    Last modified: {{ article.modified}}
     {% endif %}
 
 How do I assign custom templates on a per-page basis?

From cadcfa43c3337aaa3461d0fa197d19b02b38fd6a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 8 Aug 2012 12:18:02 -0700
Subject: [PATCH 0845/2864] Increment version to 3.1 in changelog and setup.py

---
 docs/changelog.rst | 5 +++++
 setup.py           | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 064818c9..6cea6d93 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+3.1 (XXXX-XX-XX)
+================
+
+* Improve handling of links to intra-site resources
+
 3.0 (2012-08-08)
 ==================
 
diff --git a/setup.py b/setup.py
index 96d7b8e6..90c469ca 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ entry_points = {
 
 setup(
     name = "pelican",
-    version = "3.0",
+    version = "3.1",
     url = 'http://getpelican.com/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From 10f75524fc6824496afea0104f754cbd5e46d9f9 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 13 Aug 2012 20:55:26 +0200
Subject: [PATCH 0846/2864] PEP8-ify

---
 setup.py | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/setup.py b/setup.py
index 90c469ca..472f0f73 100755
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-requires = ['feedgenerator', 'jinja2 >= 2.4', 'pygments', 'docutils', 'pytz', 'blinker', 'unidecode']
+requires = ['feedgenerator', 'jinja2 >= 2.4', 'pygments', 'docutils', 'pytz',
+            'blinker', 'unidecode']
 
 try:
-    import argparse
+    import argparse  # NOQA
 except ImportError:
     requires.append('argparse')
 
@@ -18,24 +19,26 @@ entry_points = {
 }
 
 setup(
-    name = "pelican",
-    version = "3.1",
-    url = 'http://getpelican.com/',
-    author = 'Alexis Metaireau',
-    author_email = 'alexis@notmyidea.org',
-    description = "A tool to generate a static blog from reStructuredText or Markdown input files.",
+    name="pelican",
+    version="3.1",
+    url='http://getpelican.com/',
+    author='Alexis Metaireau',
+    author_email='alexis@notmyidea.org',
+    description="A tool to generate a static blog from reStructuredText or "\
+                "Markdown input files.",
     long_description=open('README.rst').read(),
-    packages = ['pelican', 'pelican.tools', 'pelican.plugins'],
-    include_package_data = True,
-    install_requires = requires,
-    entry_points = entry_points,
-    classifiers = ['Development Status :: 5 - Production/Stable',
-                   'Environment :: Console',
-                   'License :: OSI Approved :: GNU Affero General Public License v3',
-                   'Operating System :: OS Independent',
-                   'Programming Language :: Python :: 2.6',
-                   'Programming Language :: Python :: 2.7',
-                   'Topic :: Internet :: WWW/HTTP',
-                   'Topic :: Software Development :: Libraries :: Python Modules',
-                   ],
+    packages=['pelican', 'pelican.tools', 'pelican.plugins'],
+    include_package_data=True,
+    install_requires=requires,
+    entry_points=entry_points,
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+         'Environment :: Console',
+         'License :: OSI Approved :: GNU Affero General Public License v3',
+         'Operating System :: OS Independent',
+         'Programming Language :: Python :: 2.6',
+         'Programming Language :: Python :: 2.7',
+         'Topic :: Internet :: WWW/HTTP',
+         'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
 )

From ec14df9fbbb04d824705259f1bdcf0d527025490 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 13 Aug 2012 20:56:43 +0200
Subject: [PATCH 0847/2864] add a way to run setup.py test

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 472f0f73..97c8ca64 100755
--- a/setup.py
+++ b/setup.py
@@ -41,4 +41,5 @@ setup(
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Software Development :: Libraries :: Python Modules',
     ],
+    test_suite='tests',
 )

From 515847fdd24a952af4f858b05e6a9aebcf8d056f Mon Sep 17 00:00:00 2001
From: Zoresvit <zoresvit@gmail.com>
Date: Thu, 16 Aug 2012 14:17:46 +0300
Subject: [PATCH 0848/2864] Include index in format() string.

Argument index is included in .format() method format string in order to be friendly with various Python versions and consistent with the rest of the code.
---
 pelican/tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index dab3c3a8..b6437c92 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -233,7 +233,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
                 # Replace newlines with paragraphs wrapped with <p> so
                 # HTML is valid before conversion
                 paragraphs = content.split('\n\n')
-                paragraphs = [u'<p>{}</p>'.format(p) for p in paragraphs]
+                paragraphs = [u'<p>{0}</p>'.format(p) for p in paragraphs]
                 new_content = ''.join(paragraphs)
 
                 fp.write(new_content)

From 892761f73222233777b90da9634bacc95001ad93 Mon Sep 17 00:00:00 2001
From: Zoresvit <zoresvit@gmail.com>
Date: Thu, 16 Aug 2012 14:19:10 +0300
Subject: [PATCH 0849/2864] Fixed description of copying themes/static content.

The content from `static` directory is actually copied into `theme/`, not `theme/static/`.
---
 docs/themes.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 25cdd682..d3dd4d9e 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -29,7 +29,7 @@ To make your own theme, you must follow the following structure::
         └── tags.html        // must list all the tags. Can be a tag cloud.
 
 * `static` contains all the static assets, which will be copied to the output
-  `theme/static` folder. I've put the CSS and image folders here, but they are
+  `theme` folder. I've put the CSS and image folders here, but they are
   just examples. Put what you need here.
 
 * `templates` contains all the templates that will be used to generate the content.

From ef3cad54219382f7290ce5bc0da05ac1d2dc7c42 Mon Sep 17 00:00:00 2001
From: Wladislaw Merezhko <infinitylx@infinitylx.org.ua>
Date: Sat, 18 Aug 2012 20:32:43 +0300
Subject: [PATCH 0850/2864] Fixing pdf generation issue

---
 pelican/generators.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index ae9334da..a1901889 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -6,6 +6,7 @@ import logging
 import datetime
 import subprocess
 
+from codecs import open
 from collections import defaultdict
 from functools import partial
 from itertools import chain
@@ -16,7 +17,7 @@ from jinja2.exceptions import TemplateNotFound
 
 from pelican.contents import Article, Page, Category, is_valid_content
 from pelican.readers import read_file
-from pelican.utils import copy, process_translations, open
+from pelican.utils import copy, process_translations
 from pelican import signals
 
 
@@ -269,7 +270,7 @@ class ArticlesGenerator(Generator):
             if 'category' not in metadata:
 
                 if os.path.dirname(f) == article_path:  # if the article is not in a subdirectory
-                    category = self.settings['DEFAULT_CATEGORY'] 
+                    category = self.settings['DEFAULT_CATEGORY']
                 else:
                     category = os.path.basename(os.path.dirname(f))\
                                 .decode('utf-8')
@@ -352,7 +353,7 @@ class ArticlesGenerator(Generator):
 
         self.authors = list(self.authors.items())
         self.authors.sort(key=lambda item: item[0].name)
-            
+
         self._update_context(('articles', 'dates', 'tags', 'categories',
                               'tag_cloud', 'authors', 'related_posts'))
 
@@ -370,7 +371,7 @@ class PagesGenerator(Generator):
         self.hidden_translations = []
         super(PagesGenerator, self).__init__(*args, **kwargs)
         signals.pages_generator_init.send(self)
- 
+
     def generate_context(self):
         all_pages = []
         hidden_pages = []
@@ -467,7 +468,7 @@ class PdfGenerator(Generator):
             output_pdf = os.path.join(output_path, filename)
             # print "Generating pdf for", obj.filename, " in ", output_pdf
             with open(obj.filename) as f:
-                self.pdfcreator.createPdf(text=f, output=output_pdf)
+                self.pdfcreator.createPdf(text=f.read(), output=output_pdf)
             logger.info(u' [ok] writing %s' % output_pdf)
 
     def generate_context(self):

From b1866c8f92b691969820d9485864f4f9189f5a19 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 21 Aug 2012 09:04:37 -0700
Subject: [PATCH 0851/2864] Change email address in docs to "authors@" alias

---
 README.rst     | 2 +-
 docs/index.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 3a62d0ca..018f73ba 100644
--- a/README.rst
+++ b/README.rst
@@ -52,7 +52,7 @@ If you want to see new features in Pelican, don't hesitate to offer
 suggestions, clone the repository, etc. There are many ways to contribute_.
 That's open source, dude!
 
-Send a message to "alexis at notmyidea dot org" with any requests/feedback! You
+Send a message to "authors at getpelican dot com" with any requests/feedback! You
 can also join the team at `#pelican on Freenode`_ (or if you don't have an IRC
 client handy, use the webchat_ for quick feedback.
 
diff --git a/docs/index.rst b/docs/index.rst
index b04557eb..477b4342 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -44,7 +44,7 @@ If you want to see new features in Pelican, don't hesitate to offer suggestions,
 clone the repository, etc. There are many ways to :doc:`contribute<contribute>`.
 That's open source, dude!
 
-Send a message to "alexis at notmyidea dot org" with any requests/feedback! You
+Send a message to "authors at getpelican dot com" with any requests/feedback! You
 can also join the team at `#pelican on Freenode`_ (or if you don't have an IRC
 client handy, use the webchat_ for quick feedback.
 

From be5b5e880dce407ad3b80d73020aa55b4aa30fab Mon Sep 17 00:00:00 2001
From: Eric Case <eric.case@gmail.com>
Date: Tue, 21 Aug 2012 14:14:10 -0700
Subject: [PATCH 0852/2864] added a missing space

---
 docs/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 4efefaf2..c5c751e6 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -76,7 +76,7 @@ include the following at the top of the article::
 That meta-data can then be accessed in the template::
 
     {% if article.modified %}
-    Last modified: {{ article.modified}}
+    Last modified: {{ article.modified }}
     {% endif %}
 
 How do I assign custom templates on a per-page basis?

From e9a0717aeab4a9fb8eb59795a19a043b1e88ef55 Mon Sep 17 00:00:00 2001
From: Nico Di Rocco <dirocco.nico@gmail.com>
Date: Wed, 22 Aug 2012 23:05:07 +0200
Subject: [PATCH 0853/2864] Added a new signal `finalized` that is dispatched
 when pelican finishes.

This signal can then be used for post processing.
---
 docs/plugins.rst    | 1 +
 pelican/__init__.py | 2 ++
 pelican/signals.py  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 53858668..bce17ddb 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -57,6 +57,7 @@ Here is the list of currently implemented signals:
 Signal                      Arguments                      Description
 =========================   ============================   =========================================
 initialized                 pelican object
+finalized                   pelican object
 article_generate_context    article_generator, metadata
 article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
 pages_generate_context      pages_generator, metadata
diff --git a/pelican/__init__.py b/pelican/__init__.py
index ba48c4c7..803e289a 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -178,6 +178,8 @@ class Pelican(object):
             if hasattr(p, 'generate_output'):
                 p.generate_output(writer)
 
+        signals.finalized.send(self)
+
     def get_generator_classes(self):
         generators = [StaticGenerator, ArticlesGenerator, PagesGenerator]
         if self.settings['PDF_GENERATOR']:
diff --git a/pelican/signals.py b/pelican/signals.py
index 4d9ab512..ddd59621 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -1,6 +1,7 @@
 from blinker import signal
 
 initialized = signal('pelican_initialized')
+finalized = signal('pelican_finalized')
 article_generate_context = signal('article_generate_context')
 article_generator_init = signal('article_generator_init')
 pages_generate_context = signal('pages_generate_context')

From 62f190d574c5738efa5782885cf4c40d33cb2142 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Thu, 23 Aug 2012 07:58:39 -0700
Subject: [PATCH 0854/2864] use lowercase pwd since only Mac OS X allows
 uppercase commands Fix #473

---
 pelican/tools/templates/Makefile.in          | 2 +-
 pelican/tools/templates/develop_server.sh.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 9a26e315..1445f0b0 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -1,7 +1,7 @@
 PELICAN=$pelican
 PELICANOPTS=$pelicanopts
 
-BASEDIR=$$(PWD)
+BASEDIR=$$(pwd)
 INPUTDIR=$$(BASEDIR)/content
 OUTPUTDIR=$$(BASEDIR)/output
 CONFFILE=$$(BASEDIR)/pelicanconf.py
diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index 2f8c07dd..b1e3b60c 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -5,7 +5,7 @@
 PELICAN=$pelican
 PELICANOPTS=$pelicanopts
 
-BASEDIR=$$(PWD)
+BASEDIR=$$(pwd)
 INPUTDIR=$$BASEDIR/content
 OUTPUTDIR=$$BASEDIR/output
 CONFFILE=$$BASEDIR/pelicanconf.py

From 86da6d1f2e954ae575f0b3a78d39eb3106a11c46 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Thu, 23 Aug 2012 11:05:07 -0700
Subject: [PATCH 0855/2864] Check for value error caused by no valid files
 found with files_changed This causes an infinite loop when in auto-reload Fix
 #467 Fix #451 Fix #443

---
 pelican/utils.py    | 12 ++++++++----
 tests/test_utils.py | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 53e6e52b..c79c7cee 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -241,10 +241,14 @@ def files_changed(path, extensions):
                     yield os.stat(os.path.join(root, f)).st_mtime
 
     global LAST_MTIME
-    mtime = max(file_times(path))
-    if mtime > LAST_MTIME:
-        LAST_MTIME = mtime
-        return True
+    try:
+        mtime = max(file_times(path))
+        if mtime > LAST_MTIME:
+            LAST_MTIME = mtime
+            return True
+    except ValueError:
+        logger.info("No files found in path")
+        return False
     return False
 
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 2ea756dc..7ea0cf23 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -74,7 +74,8 @@ class TestUtils(unittest.TestCase):
         self.assertNotIn(fr_article1, index)
 
     def test_files_changed(self):
-        "Test if file changes are correctly detected"
+        """Test if file changes are correctly detected
+        Make sure to handle not getting any files correctly"""
 
         path = os.path.join(os.path.dirname(__file__), 'content')
         filename = os.path.join(path, 'article_with_metadata.rst')
@@ -90,6 +91,18 @@ class TestUtils(unittest.TestCase):
         self.assertEquals(changed, True)
         self.assertAlmostEqual(utils.LAST_MTIME, t, delta=1)
 
+        empty_path = os.path.join(os.path.dirname(__file__), 'empty')
+        try:
+            os.mkdir(empty_path)
+            os.mkdir(os.path.join(empty_path, "empty_folder"))
+            shutil.copy(__file__, empty_path)
+            changed = utils.files_changed(empty_path, 'rst')
+            self.assertFalse(changed)
+        except OSError:
+            self.fail("OSError Exception in test_files_changed test")
+        finally:
+            shutil.rmtree(empty_path, True)
+
     def test_clean_output_dir(self):
         test_directory = os.path.join(os.path.dirname(__file__), 'clean_output')
         content = os.path.join(os.path.dirname(__file__), 'content')

From a37ba369ef49ae1643a5b7602860c6be804cf8ad Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Thu, 23 Aug 2012 12:44:22 -0700
Subject: [PATCH 0856/2864] Implemented better "valid files not found"
 behavior. Used an exception so show error state. Used a bool flag to make
 sure the error is only shown once PER error. Updated tests to check for the
 correct Exception raised

---
 pelican/__init__.py | 9 ++++++++-
 pelican/utils.py    | 6 ++++--
 tests/test_utils.py | 4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index ba48c4c7..64e334d4 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -11,7 +11,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator, LessCSSGenerator)
 from pelican.log import init
 from pelican.settings import read_settings, _DEFAULT_CONFIG
-from pelican.utils import clean_output_dir, files_changed, file_changed
+from pelican.utils import clean_output_dir, files_changed, file_changed, NoFilesError
 from pelican.writers import Writer
 
 __major__ = 3
@@ -265,6 +265,7 @@ def main():
 
     try:
         if args.autoreload:
+            files_found_error = True
             while True:
                 try:
                     # Check source dir for changed files ending with the given
@@ -274,6 +275,8 @@ def main():
                     # have.
                     if files_changed(pelican.path, pelican.markup) or \
                             files_changed(pelican.theme, ['']):
+                        if files_found_error == False:
+                            files_found_error = True
                         pelican.run()
 
                     # reload also if settings.py changed
@@ -287,6 +290,10 @@ def main():
                 except KeyboardInterrupt:
                     logger.warning("Keyboard interrupt, quitting.")
                     break
+                except NoFilesError:
+                    if files_found_error == True:
+                        logger.warning("No valid files found in content. Nothing to generate.")
+                        files_found_error = False
                 except Exception, e:
                     logger.warning(
                         "Caught exception \"{}\". Reloading.".format(e)
diff --git a/pelican/utils.py b/pelican/utils.py
index c79c7cee..ca3015ce 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -14,6 +14,9 @@ from operator import attrgetter
 
 logger = logging.getLogger(__name__)
 
+class NoFilesError(Exception):
+    pass
+
 
 def get_date(string):
     """Return a datetime object from a string.
@@ -247,8 +250,7 @@ def files_changed(path, extensions):
             LAST_MTIME = mtime
             return True
     except ValueError:
-        logger.info("No files found in path")
-        return False
+        raise NoFilesError("No files with the given extension(s) found.")
     return False
 
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 7ea0cf23..0ebaf346 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -96,8 +96,8 @@ class TestUtils(unittest.TestCase):
             os.mkdir(empty_path)
             os.mkdir(os.path.join(empty_path, "empty_folder"))
             shutil.copy(__file__, empty_path)
-            changed = utils.files_changed(empty_path, 'rst')
-            self.assertFalse(changed)
+            with self.assertRaises(NoFilesError):
+                utils.files_changed(empty_path, 'rst')
         except OSError:
             self.fail("OSError Exception in test_files_changed test")
         finally:

From 95af2e46ec95647a055a029bc81b531ecca86bb6 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Thu, 23 Aug 2012 13:13:41 -0700
Subject: [PATCH 0857/2864] Missed a line in commit.

---
 tests/test_utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_utils.py b/tests/test_utils.py
index 0ebaf346..148e322a 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -6,6 +6,7 @@ import time
 
 from pelican import utils
 from .support import get_article, unittest
+from pelican.utils import NoFilesError
 
 
 class TestUtils(unittest.TestCase):

From 831e1d04b98e872770af578bc3bedc84d42cd933 Mon Sep 17 00:00:00 2001
From: David Marble <davidmarble@gmail.com>
Date: Thu, 23 Aug 2012 18:31:45 -0700
Subject: [PATCH 0858/2864] docs: Pelican outputs to output/ not content/.
 Markdown ::: syntax must be indented

---
 docs/getting_started.rst | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 282d6c23..b7cbe951 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -186,7 +186,7 @@ the content. The ``pelican`` command can also be run directly::
 
     $ pelican /path/to/your/content/ [-s path/to/your/settings.py]
 
-The above command will generate your weblog and save it in the ``content/``
+The above command will generate your weblog and save it in the ``output/``
 folder, using the default theme to produce a simple site. The default theme is
 simple HTML without styling and is provided so folks may use it as a basis for
 creating their own themes.
@@ -271,19 +271,21 @@ Pelican is able to provide colorized syntax highlighting for your code blocks.
 To do so, you have to use the following conventions (you need to put this in
 your content files).
 
-For RestructuredText::
+For RestructuredText, use the code-block directive::
 
     .. code-block:: identifier
 
-       your code goes here
+       <indented code block goes here>
 
-For Markdown, format your code blocks thusly::
+For Markdown, include the language identifier just above code blocks::
 
-    :::identifier
-    your code goes here
+        :::identifier
+        <code goes here>
+    
+    (indent both the identifier and code)
 
-The specified identifier should be one that appears on the 
-`list of available lexers <http://pygments.org/docs/lexers/>`_.
+The specified identifier (e.g. ``python``, ``ruby``) should be one that 
+appears on the `list of available lexers <http://pygments.org/docs/lexers/>`_.
 
 Publishing drafts
 -----------------

From 9435b381ed042db13292d2fb474c400d0c595f91 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Fri, 24 Aug 2012 13:14:14 -0700
Subject: [PATCH 0859/2864] Cleaned up tests. Used assertItemsEqual in article
 generation to create more precise tests than with an elif chain Separated out
 categories out into their own named test for clarity Closes #405

---
 tests/test_generators.py | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index e984b484..3a4ea1e3 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -63,29 +63,26 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_context(self):
 
-        settings = _DEFAULT_CONFIG.copy()
-        settings['ARTICLE_DIR'] = 'content'
-        settings['DEFAULT_CATEGORY'] = 'Default'
-        generator = ArticlesGenerator(settings.copy(), settings, CUR_DIR,
-                                      _DEFAULT_CONFIG['THEME'], None,
-                                      _DEFAULT_CONFIG['MARKUP'])
-        generator.generate_context()
-        for article in generator.articles:
-            relfilepath = os.path.relpath(article.filename, CUR_DIR)
-            if relfilepath == os.path.join("TestCategory",
-                                           "article_with_category.rst"):
-                self.assertEquals(article.category.name, 'yeah')
-            elif relfilepath == os.path.join("TestCategory",
-                                             "article_without_category.rst"):
-                self.assertEquals(article.category.name, 'TestCategory')
-            elif relfilepath == "article_without_category.rst":
-                self.assertEquals(article.category.name, 'Default')
+        generator = self.get_populated_generator()
+        articles = self.distill_articles(generator.articles)
+        articles_expected = [
+            [u'Article title', 'published', 'Default', 'article'],
+            [u'Article with template', 'published', 'Default', 'custom'],
+            [u'Test md File', 'published', 'test', 'article'],
+            [u'This is a super article !', 'published', 'Yeah', 'article'],
+            [u'This is an article with category !', 'published', 'yeah', 'article'],
+            [u'This is an article without category !', 'published', 'Default', 'article'],
+            [u'This is an article without category !', 'published', 'TestCategory', 'article'],
+            [u'This is a super article !', 'published', 'yeah', 'article']
+        ]
+        self.assertItemsEqual(articles_expected, articles)
 
+    def test_generate_categories(self):
+
+        generator = self.get_populated_generator()
         categories = [cat.name for cat, _ in generator.categories]
-        # assert that the categories are ordered as expected
-        self.assertEquals(
-                categories, ['Default', 'TestCategory', 'Yeah', 'test',
-                             'yeah'])
+        categories_expected = ['Default', 'TestCategory', 'Yeah', 'test', 'yeah']
+        self.assertEquals(categories, categories_expected)
 
     def test_direct_templates_save_as_default(self):
 

From d1d737777c97146037e7b0c32dc973fe93cd6dc1 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Sat, 25 Aug 2012 22:50:19 +0200
Subject: [PATCH 0860/2864] fix issue #480

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c219ed12..9ea6071d 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -468,7 +468,7 @@ template tag, for example:
 .. code-block:: jinja
 
     {% assets filters="cssmin", output="css/style.min.css", "css/inuit.css", "css/pygment-monokai.css", "css/main.css" %}
-        <link rel="stylesheet" href="{{ ASSETS_URL }}">
+        <link rel="stylesheet" href="{{ ASSET_URL }}">
     {% endassets %}
 
 will produce a minified css file with the version identifier:

From 472063e98c6a7e170c0cad34e2ef040ddc1b21e4 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Sat, 25 Aug 2012 23:16:50 +0200
Subject: [PATCH 0861/2864] add some doc for webassets: - usage of the sass
 compiler as discussed in PR #441 - debug mode and compilers (#481)

---
 docs/settings.rst | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9ea6071d..ad08f020 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -73,7 +73,7 @@ Setting name (default value)                                            What doe
 `SITENAME` (``'A Pelican Blog'``)                                       Your site name
 `SITEURL`                                                               Base URL of your website. Not defined by default,
                                                                         so it is best to specify your SITEURL; if you do not, feeds
-                                                                        will not be generated with properly-formed URLs. You should 
+                                                                        will not be generated with properly-formed URLs. You should
                                                                         include ``http://`` and your domain, with no trailing
                                                                         slash at the end. Example: ``SITEURL = 'http://mydomain.com'``
 `STATIC_PATHS` (``['images']``)                                         The static paths you want to have accessible
@@ -95,12 +95,12 @@ Setting name (default value)                                            What doe
                                                                         index pages for collections of content e.g. tags and
                                                                         category index pages.
 `PAGINATED_DIRECT_TEMPLATES` (``('index',)``)                           Provides the direct templates that should be paginated.
-`SUMMARY_MAX_LENGTH` (``50``)                                           When creating a short summary of an article, this will 
+`SUMMARY_MAX_LENGTH` (``50``)                                           When creating a short summary of an article, this will
                                                                         be the default length in words of the text created.
-                                                                        This only applies if your content does not otherwise 
-                                                                        specify a summary. Setting to None will cause the summary 
+                                                                        This only applies if your content does not otherwise
+                                                                        specify a summary. Setting to None will cause the summary
                                                                         to be a copy of the original content.
-                                                                        
+
 =====================================================================   =====================================================================
 
 .. [#] Default is the system locale.
@@ -367,7 +367,7 @@ Ordering content
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`NEWEST_FIRST_ARCHIVES` (``True``)                  Order archives by newest first by date. (False: 
+`NEWEST_FIRST_ARCHIVES` (``True``)                  Order archives by newest first by date. (False:
                                                     orders by date with older articles first.)
 `REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True: lists by reverse
                                                     alphabetical order; default lists alphabetically.)
@@ -477,6 +477,15 @@ will produce a minified css file with the version identifier:
 
     <link href="http://{SITEURL}/theme/css/style.min.css?b3a7c807" rel="stylesheet">
 
+The filters can be combined, for example to use the `sass` compiler and minify
+the output::
+
+.. code-block:: jinja
+
+{% assets filters="sass,cssmin", output="css/style.min.css", "css/style.scss" %}
+    <link rel="stylesheet" href="{{ ASSET_URL }}">
+{% endassets %}
+
 Another example for javascript:
 
 .. code-block:: jinja
@@ -491,6 +500,12 @@ will produce a minified and gzipped js file:
 
     <script src="http://{SITEURL}/theme/js/packed.js?00703b9d"></script>
 
+Pelican's debug mode is propagated to webassets to disable asset packaging,
+and instead work with the uncompressed assets. However, this also means that
+the `less` and `sass` files are not compiled, this should be fixed in a future
+version of webassets (cf. the related `bug report
+<https://github.com/getpelican/pelican/issues/481>`_).
+
 .. _webassets: https://github.com/miracle2k/webassets
 .. _documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
 

From 000210d875a9eab01f4133595311598de5634388 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 27 Aug 2012 13:09:25 -0700
Subject: [PATCH 0862/2864] Improve devserver durability. Refs #473.

Three changes:

1. Fix inconsistent "pwd" behavior by using make's $(CURDIR) builtin.
2. Change bash shebang to the more-portable form.
3. Tell users when Pelican and SimpleHTTPServer have been backgrounded.
---
 pelican/tools/templates/Makefile.in          | 2 +-
 pelican/tools/templates/develop_server.sh.in | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 1445f0b0..4c5a4fcb 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -1,7 +1,7 @@
 PELICAN=$pelican
 PELICANOPTS=$pelicanopts
 
-BASEDIR=$$(pwd)
+BASEDIR=$$(CURDIR)
 INPUTDIR=$$(BASEDIR)/content
 OUTPUTDIR=$$(BASEDIR)/output
 CONFFILE=$$(BASEDIR)/pelicanconf.py
diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index b1e3b60c..3e97610b 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ##
 # This section should match your Makefile
 ##
@@ -65,6 +65,7 @@ function start_up(){
   python -m SimpleHTTPServer &
   echo $$! > $$SRV_PID
   cd $$BASEDIR
+  sleep 1 && echo 'Pelican and SimpleHTTPServer processes now running in background.'
 }
 
 ###

From bba3caa697313a26c632275a0b32fb99c8d0d90d Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Mon, 27 Aug 2012 18:40:02 +0200
Subject: [PATCH 0863/2864] avoid repeatition in the functional tests

---
 tests/test_pelican.py | 56 +++++++++++--------------------------------
 1 file changed, 14 insertions(+), 42 deletions(-)

diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 15088ed0..78f083f9 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -35,6 +35,18 @@ class TestPelican(unittest.TestCase):
         rmtree(self.temp_path)
         locale.setlocale(locale.LC_ALL, self.old_locale)
 
+    def assertFilesEqual(self, diff):
+        msg = "some generated files differ from the expected functional " \
+              "tests output.\n" \
+              "This is probably because the HTML generated files " \
+              "changed. If these changes are normal, please refer " \
+              "to docs/contribute.rst to update the expected " \
+              "output of the functional tests."
+
+        self.assertEqual(diff.left_only, [], msg=msg)
+        self.assertEqual(diff.right_only, [], msg=msg)
+        self.assertEqual(diff.diff_files, [], msg=msg)
+
     @unittest.skip("Test failing")
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
@@ -47,27 +59,7 @@ class TestPelican(unittest.TestCase):
             pelican.run()
             diff = dircmp(
                     self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
-            self.assertEqual(diff.left_only, [], msg="some generated " \
-                    "files are absent from the expected functional " \
-                    "tests output.\n" \
-                    "This is probably because the HTML generated files " \
-                    "changed. If these changes are normal, please refer " \
-                    "to docs/contribute.rst to update the expected " \
-                    "output of the functional tests.")
-            self.assertEqual(diff.right_only, [], msg="some files from " \
-                    "the expected functional tests output are absent " \
-                    "from the current output.\n" \
-                    "This is probably because the HTML generated files " \
-                    "changed. If these changes are normal, please refer " \
-                    "to docs/contribute.rst to update the expected " \
-                    "output of the functional tests.")
-            self.assertEqual(diff.diff_files, [], msg="some generated " \
-                    "files differ from the expected functional tests " \
-                    "output.\n" \
-                    "This is probably because the HTML generated files " \
-                    "changed. If these changes are normal, please refer " \
-                    "to docs/contribute.rst to update the expected " \
-                    "output of the functional tests.")
+            self.assertFilesEqual(diff)
 
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work
@@ -75,24 +67,4 @@ class TestPelican(unittest.TestCase):
                             settings=read_settings(SAMPLE_CONFIG))
         pelican.run()
         diff = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "custom")))
-        self.assertEqual(diff.left_only, [], msg="some generated " \
-                "files are absent from the expected functional " \
-                "tests output.\n" \
-                "This is probably because the HTML generated files " \
-                "changed. If these changes are normal, please refer " \
-                "to docs/contribute.rst to update the expected " \
-                "output of the functional tests.")
-        self.assertEqual(diff.right_only, [], msg="some files from " \
-                "the expected functional tests output are absent " \
-                "from the current output.\n" \
-                "This is probably because the HTML generated files " \
-                "changed. If these changes are normal, please refer " \
-                "to docs/contribute.rst to update the expected " \
-                "output of the functional tests.")
-        self.assertEqual(diff.diff_files, [], msg="some generated " \
-                "files differ from the expected functional tests " \
-                "output.\n" \
-                "This is probably because the HTML generated files " \
-                "changed. If these changes are normal, please refer " \
-                "to docs/contribute.rst to update the expected " \
-                "output of the functional tests.")
+        self.assertFilesEqual(diff)

From 0ec0cf9d0e822f25eee92910689a2763c377d8c2 Mon Sep 17 00:00:00 2001
From: Dirk Makowski <dmakowski@gmx.net>
Date: Tue, 28 Aug 2012 00:38:17 +0200
Subject: [PATCH 0864/2864] Patch to allow relative ASSET_URL Previously,
 webassets' ASSET_URL always was absolute. This patch allows a relative
 ASSET_URL, depending on Pelican's RELATIVE_URLS setting.

Hint for templates:
-------------------
Current version of webassets seem to remove any relative
paths at the beginning of the URL. So, if RELATIVE_URLS
is on, ASSET_URL will start with 'theme/', regardless if we
set assets_url here to './theme/' or to 'theme/'.
XXX However, this breaks the ASSET_URL if user navigates to
a sub-URL, e.g. if he clicks on a category. To workaround this
issue, I use
    <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
instead of
    <link rel="stylesheet" href="{{ ASSET_URL }}">

Maybe this hint is worth to be included in the documentation.
I have it also written as comments in the source.
---
 pelican/generators.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index ae9334da..9876da3b 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -429,7 +429,23 @@ class StaticGenerator(Generator):
             # Define the assets environment that will be passed to the
             # generators. The StaticGenerator must then be run first to have
             # the assets in the output_path before generating the templates.
-            assets_url = self.settings['SITEURL'] + '/theme/'
+
+            # Let ASSET_URL honor Pelican's RELATIVE_URLS setting.
+            # Hint for templates:
+            # Current version of webassets seem to remove any relative
+            # paths at the beginning of the URL. So, if RELATIVE_URLS
+            # is on, ASSET_URL will start with 'theme/', regardless if we
+            # set assets_url here to './theme/' or to 'theme/'.
+            # XXX However, this breaks the ASSET_URL if user navigates to
+            # a sub-URL, e.g. if he clicks on a category. To workaround this
+            # issue, I use
+            #     <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
+            # instead of
+            #     <link rel="stylesheet" href="{{ ASSET_URL }}">
+            if self.settings.get('RELATIVE_URLS'):
+                assets_url = './theme/'
+            else:
+                assets_url = self.settings['SITEURL'] + '/theme/'
             assets_src = os.path.join(self.output_path, 'theme')
             self.assets_env = AssetsEnvironment(assets_src, assets_url)
 

From 644fd4ed5f95715d2207b146de9e0eafeee96f37 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Wed, 29 Aug 2012 12:17:59 -0700
Subject: [PATCH 0865/2864] Deep copy _DEFAULT_SETTINGS instead of linking.
 This caused the defaults to be overwritten and edge case bugs with tests. The
 test for empty setting needed to be updated to reflect that the method for
 setting up the local settings sets extra settings.

---
 pelican/__init__.py    |  3 ++-
 pelican/contents.py    |  3 ++-
 pelican/settings.py    | 10 +++++-----
 tests/test_settings.py |  8 ++++++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index ba48c4c7..8c4930f9 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,3 +1,4 @@
+import copy
 import os
 import re
 import sys
@@ -29,7 +30,7 @@ class Pelican(object):
         before doing anything else.
         """
         if settings is None:
-            settings = _DEFAULT_CONFIG
+            settings = copy.deepcopy(_DEFAULT_CONFIG)
 
         self.path = path or settings['PATH']
         if not self.path:
diff --git a/pelican/contents.py b/pelican/contents.py
index a5e3be8f..851607a5 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import copy
 import locale
 import logging
 import functools
@@ -29,7 +30,7 @@ class Page(object):
         if not metadata:
             metadata = {}
         if not settings:
-            settings = _DEFAULT_CONFIG
+            settings = copy.deepcopy(_DEFAULT_CONFIG)
 
         self.settings = settings
         self._content = content
diff --git a/pelican/settings.py b/pelican/settings.py
index 645a9809..92c68ddc 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import copy
 import imp
 import inspect
 import os
@@ -81,7 +82,7 @@ def read_settings(filename=None):
     if filename:
         local_settings = get_settings_from_file(filename)
     else:
-        local_settings = _DEFAULT_CONFIG
+        local_settings = copy.deepcopy(_DEFAULT_CONFIG)
     configured_settings = configure_settings(local_settings, None, filename)
     return configured_settings
 
@@ -89,10 +90,9 @@ def read_settings(filename=None):
 def get_settings_from_module(module=None, default_settings=_DEFAULT_CONFIG):
     """
     Load settings from a module, returning a dict.
-
     """
 
-    context = default_settings.copy()
+    context = copy.deepcopy(default_settings)
     if module is not None:
          context.update(
              (k, v) for k, v in inspect.getmembers(module) if k.isupper()
@@ -114,7 +114,7 @@ def get_settings_from_file(filename, default_settings=_DEFAULT_CONFIG):
 def configure_settings(settings, default_settings=None, filename=None):
     """Provide optimizations, error checking, and warnings for loaded settings"""
     if default_settings is None:
-        default_settings = _DEFAULT_CONFIG
+        default_settings = copy.deepcopy(_DEFAULT_CONFIG)
 
     # Make the paths relative to the settings file
     if filename:
@@ -138,7 +138,7 @@ def configure_settings(settings, default_settings=None, filename=None):
     for locale_ in locales:
         try:
             locale.setlocale(locale.LC_ALL, locale_)
-            break  # break if it is successfull
+            break  # break if it is successful
         except locale.Error:
             pass
     else:
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 25df74bd..7b534616 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,6 +1,7 @@
+import copy
 from os.path import dirname, abspath, join
 
-from pelican.settings import read_settings, configure_settings, _DEFAULT_CONFIG
+from pelican.settings import read_settings, configure_settings, _DEFAULT_CONFIG, DEFAULT_THEME
 from .support import unittest
 
 
@@ -31,7 +32,10 @@ class TestSettingsConfiguration(unittest.TestCase):
     def test_read_empty_settings(self):
         """providing no file should return the default values."""
         settings = read_settings(None)
-        self.assertDictEqual(settings, _DEFAULT_CONFIG)
+        expected = copy.deepcopy(_DEFAULT_CONFIG)
+        expected["FEED_DOMAIN"] = '' #This is added by configure settings
+        self.maxDiff = None
+        self.assertDictEqual(settings, expected)
 
     def test_configure_settings(self):
         """Manipulations to settings should be applied correctly."""

From 663d1e7347116b46746c728278747658a4c36ea1 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Thu, 30 Aug 2012 14:50:52 -0700
Subject: [PATCH 0866/2864] Added extra tests to help prevent regression.

---
 tests/test_settings.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/test_settings.py b/tests/test_settings.py
index 7b534616..873df824 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -37,6 +37,22 @@ class TestSettingsConfiguration(unittest.TestCase):
         self.maxDiff = None
         self.assertDictEqual(settings, expected)
 
+    def test_settings_return_independent(self):
+        """Make sure that the results from one settings call doesn't
+        effect past or future instances."""
+        self.PATH = abspath(dirname(__file__))
+        default_conf = join(self.PATH, 'default_conf.py')
+        settings = read_settings(default_conf)
+        settings['SITEURL'] = 'new-value'
+        new_settings = read_settings(default_conf)
+        self.assertNotEqual(new_settings['SITEURL'], settings['SITEURL'])
+
+    def test_defaults_not_overwritten(self):
+        """This assumes 'SITENAME': 'A Pelican Blog'"""
+        settings = read_settings(None)
+        settings['SITENAME'] = 'Not a Pelican Blog'
+        self.assertNotEqual(settings['SITENAME'], _DEFAULT_CONFIG['SITENAME'])
+
     def test_configure_settings(self):
         """Manipulations to settings should be applied correctly."""
 

From c1b0e83a44676d1a13aaf394f6279df2db06cc7f Mon Sep 17 00:00:00 2001
From: Nico Di Rocco <dirocco.nico@gmail.com>
Date: Fri, 31 Aug 2012 22:17:19 +0200
Subject: [PATCH 0867/2864] Added description for the finalized signal in the
 docs

---
 docs/plugins.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index bce17ddb..f95cb684 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -53,16 +53,16 @@ List of signals
 
 Here is the list of currently implemented signals:
 
-=========================   ============================   =========================================
+=========================   ============================   ===========================================================================
 Signal                      Arguments                      Description
-=========================   ============================   =========================================
+=========================   ============================   ===========================================================================
 initialized                 pelican object
-finalized                   pelican object
+finalized                   pelican object                 invoked after all the generators are executed and just before pelican exits
 article_generate_context    article_generator, metadata
 article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
 pages_generate_context      pages_generator, metadata
 pages_generator_init        pages_generator                invoked in the PagesGenerator.__init__
-=========================   ============================   =========================================
+=========================   ============================   ===========================================================================
 
 The list is currently small, don't hesitate to add signals and make a pull
 request if you need them!

From b91197271694e101ec3faa90c01f7cfbff692aea Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Fri, 31 Aug 2012 23:12:09 -0400
Subject: [PATCH 0868/2864] Add Gittip to social icons.

This allows someone to include their gittip link so people can donate to them.
---
 pelican/themes/notmyidea/static/css/main.css      |   3 ++-
 .../notmyidea/static/images/icons/gittip.png      | Bin 0 -> 671 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 pelican/themes/notmyidea/static/images/icons/gittip.png

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index bd1eba75..b4ba7888 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -308,7 +308,8 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
-		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.org');}
+		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
+        .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 
 /*
 	About
diff --git a/pelican/themes/notmyidea/static/images/icons/gittip.png b/pelican/themes/notmyidea/static/images/icons/gittip.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb12a1391ace96a9d4cedffebedd7db7d6a84d48
GIT binary patch
literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq(
z0|^AkZL;YA00JLLL_t(I%cYY)XcJ)=#((d3xhB;?Z4q3Q2+iPN8`Po0btyO{gS$f$
z>?&0%sHg=UtYR`L-82b;;35bKaWNLW7QsJgH?8zfG)VDJ#Ui$(&Fhf6cnLcB4F~sq
z&+|Tazk5#bRx06;FS(?XPM@lt5s_ga>K!ksYDGjcxuW~t*8&JYI_Z!rx}*|LUW5@q
z{j<PQKvXH@OK!^dNFe!*LVu@=zfFO;T+tm!C7fnTD&gc2Mg-Wb*V){x6OMEv(j2F%
zY^<+iSq8f+j5a3~@+CJV>7>&K%=-!BSF%K72e^Ox7SrX27-KkiWRTI*7g_!Knd|3I
zva$Zlm&dGlZ0}VOIjpL3?Dz?WjwZ3~E)ES2@nz)`k!{;KJ9(3EB*M;~UV3-$;ko++
zV~nb5IONe50Aoy(tO%+~dh8rO*Va(g)?QPio=k>~|EWZTnaAZ8ED<3Tve~h#r^P}<
zn5jI%vO>NrYJ!Ao)kR)Cd+G&r&{yT-@&Yesr`z@ou;ky^b{A9EE>W*<psH<V5#h##
zF~X7Vpnu7zYK1^%V{41cr$$@v?3=R_<NWx(+VN0YF(Q)bY+bFoKz3pr5kW+_JC$Yb
z#cYekA54<5Ucak;i^uluM~F)R;7YAZ?ZYC=^KU6XxJM{tx3$qL(w+7yEB(O`Z8T`8
zVp-Ndt86?oxuQD&6oMgQOwg>}wU8^i1L<TlSpN5S{tclW`<m8?-?RV#002ovPDHLk
FV1iF3E`tC7

literal 0
HcmV?d00001


From fc749755df7a3a06b04ba2b1d0ae349f98f27a0d Mon Sep 17 00:00:00 2001
From: guillermooo <guilan70@hotmail.com>
Date: Sun, 2 Sep 2012 09:26:58 +0200
Subject: [PATCH 0869/2864] fix encoding problem in Windows

---
 pelican/tools/pelican_quickstart.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index c8064bf1..8fe7b69e 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -4,6 +4,8 @@
 import os
 import string
 import argparse
+import sys
+import codecs
 
 from pelican import __version__
 
@@ -29,6 +31,16 @@ CONF = {
 }
 
 
+def decoding_maybe(f):
+    running_windows = (os.name == 'nt')
+    def wrapper(*args, **kwargs):
+        out = f(*args, **kwargs)
+        if isinstance(out, basestring) and running_windows:
+            return out.decode(sys.stdin.encoding)
+        return out
+    return wrapper
+
+
 def get_template(name):
     template = os.path.join(_TEMPLATES_DIR, "{0}.in".format(name))
 
@@ -43,6 +55,7 @@ def get_template(name):
         fd.close()
 
 
+@decoding_maybe
 def ask(question, answer=str, default=None, l=None):
     if answer == str:
         r = ''
@@ -167,7 +180,7 @@ Please answer the following questions so this script can generate the files need
         if ask('Do you want to upload your website using FTP?', answer=bool, default=False):
             CONF['ftp_host'] = ask('What is the hostname of your FTP server?', str, CONF['ftp_host'])
             CONF['ftp_user'] = ask('What is your username on that server?', str, CONF['ftp_user'])
-            CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ftp_target_dir']) 
+            CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ftp_target_dir'])
         if ask('Do you want to upload your website using SSH?', answer=bool, default=False):
             CONF['ssh_host'] = ask('What is the hostname of your SSH server?', str, CONF['ssh_host'])
             CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])
@@ -187,7 +200,7 @@ Please answer the following questions so this script can generate the files need
         print('Error: {0}'.format(e))
 
     try:
-        with open(os.path.join(CONF['basedir'], 'pelicanconf.py'), 'w') as fd:
+        with codecs.open(os.path.join(CONF['basedir'], 'pelicanconf.py'), 'w', 'utf-8') as fd:
             for line in get_template('pelicanconf.py'):
                 template = string.Template(line)
                 fd.write(template.safe_substitute(CONF))

From 39db9ddcfde6199d7b89232d222b2b5a9c3e1e6b Mon Sep 17 00:00:00 2001
From: Florian Jacob <fjacob@lavabit.com>
Date: Sun, 2 Sep 2012 10:09:08 +0200
Subject: [PATCH 0870/2864] Get HtmlReader to work again wrote unit tests and
 documentation, improved regular expression. The HtmlReader is enabled by
 default now and parses metadata in html files of the form: <!-- key:value -->

---
 docs/getting_started.rst                      | 11 +++++++
 docs/settings.rst                             |  4 +--
 pelican/readers.py                            | 31 +++++++++++++------
 pelican/settings.py                           |  2 +-
 tests/content/article_with_html_metadata.html | 13 ++++++++
 tests/test_generators.py                      |  3 +-
 tests/test_readers.py                         | 21 +++++++++++++
 7 files changed, 71 insertions(+), 14 deletions(-)
 create mode 100644 tests/content/article_with_html_metadata.html

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index b7cbe951..3f622dee 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -171,6 +171,17 @@ Markdown posts should follow this pattern::
 
     This is the content of my super blog post.
 
+Your third option is to write raw html (by ending your file in ``.html``)::
+
+    <!-- title: My super title -->
+    <!-- date: 2010-12-03 10:20 -->
+    <!-- tags: thats, awesome -->
+    <!-- category: yeah -->
+
+    <p>
+        This is the content of my super blog post.
+    </p>
+
 Note that, aside from the title, none of this metadata is mandatory: if the date
 is not specified, Pelican will rely on the file's "mtime" timestamp, and the
 category can be determined by the directory in which the file resides. For
diff --git a/docs/settings.rst b/docs/settings.rst
index ad08f020..340b2e92 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -50,9 +50,9 @@ Setting name (default value)                                            What doe
                                                                         here or a single string representing one locale.
                                                                         When providing a list, all the locales will be tried
                                                                         until one works.
-`MARKUP` (``('rst', 'md')``)                                            A list of available markup languages you want
+`MARKUP` (``('rst', 'md', 'html')``)                                    A list of available markup languages you want
                                                                         to use. For the moment, the only available values
-                                                                        are `rst` and `md`.
+                                                                        are `rst`, `md` and `html`.
 `MD_EXTENSIONS` (``['codehilite','extra']``)                            A list of the extensions that the Markdown processor
                                                                         will use. Refer to the extensions chapter in the
                                                                         Python-Markdown documentation for a complete list of
diff --git a/pelican/readers.py b/pelican/readers.py
index e3ea154d..c9ae882a 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -142,19 +142,30 @@ class MarkdownReader(Reader):
 
 class HtmlReader(Reader):
     file_extensions = ['html', 'htm']
-    _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
+    # re.DOTALL and .*? (minimal match of an arbitrary number of characters)
+    # allow multi-line metadata to be matched correctly
+    _re = re.compile('<\!--([^\:]*):(.*?)-->', re.DOTALL)
 
     def read(self, filename):
-        """Parse content and metadata of (x)HTML files"""
-        with open(filename) as content:
-            metadata = {'title': 'unnamed'}
-            for i in self._re.findall(content):
-                key = i.split(':')[0][5:].strip()
-                value = i.split(':')[-1][:-3].strip()
-                name = key.lower()
-                metadata[name] = self.process_metadata(name, value)
+        """Parse content and metadata of (x)HTML files.
 
-            return content, metadata
+        Matches for metadata tags in the form <!-- name:value -->
+        Activated when you add 'html' to your MARKUP settings variable
+
+        """
+        content = open(filename)
+        metadata = {'title': 'unnamed'}
+        for comment in self._re.findall(content):
+            key = comment[0].strip().lower()
+            value = comment[1].strip()
+
+            # remove identation from multi-line metadata
+            value = re.sub('[ \t]+', ' ', value)
+            value = re.sub(' ?\n ?', '\n', value)
+
+            metadata[key] = self.process_metadata(key, value)
+
+        return content, metadata
 
 
 _EXTENSIONS = {}
diff --git a/pelican/settings.py b/pelican/settings.py
index 92c68ddc..82caece7 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -21,7 +21,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'PAGE_EXCLUDES': (),
                    'THEME': DEFAULT_THEME,
                    'OUTPUT_PATH': 'output/',
-                   'MARKUP': ('rst', 'md'),
+                   'MARKUP': ('rst', 'md', 'html'),
                    'STATIC_PATHS': ['images', ],
                    'THEME_STATIC_PATHS': ['static', ],
                    'FEED_ATOM': 'feeds/all.atom.xml',
diff --git a/tests/content/article_with_html_metadata.html b/tests/content/article_with_html_metadata.html
new file mode 100644
index 00000000..89ef4789
--- /dev/null
+++ b/tests/content/article_with_html_metadata.html
@@ -0,0 +1,13 @@
+<!-- title: A great html article with metadata -->
+<!-- tags: foo, bar, foobar -->
+<!-- date: 2010-12-02 10:14 -->
+<!-- category: yeah -->
+<!-- author: Alexis Métaireau -->
+<!-- summary:
+    Multi-line metadata should be supported
+    as well as <strong>inline markup</strong>.
+    -->
+<!-- custom_field: http://notmyidea.org -->
+
+<h1>This is an article in html with metadata</h1>
+<p>It features very interesting insights.</p>
diff --git a/tests/test_generators.py b/tests/test_generators.py
index 3a4ea1e3..3c86df92 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -73,7 +73,8 @@ class TestArticlesGenerator(unittest.TestCase):
             [u'This is an article with category !', 'published', 'yeah', 'article'],
             [u'This is an article without category !', 'published', 'Default', 'article'],
             [u'This is an article without category !', 'published', 'TestCategory', 'article'],
-            [u'This is a super article !', 'published', 'yeah', 'article']
+            [u'This is a super article !', 'published', 'yeah', 'article'],
+            [u'A great html article with metadata', 'published', u'yeah', 'article']
         ]
         self.assertItemsEqual(articles_expected, articles)
 
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 299aa378..a9437eac 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -90,3 +90,24 @@ class MdReaderTest(unittest.TestCase):
                 "<p>This is another markdown test file.  Uses the mkd extension.</p>"
         
         self.assertEqual(content, expected)
+
+
+class HtmlReaderTest(unittest.TestCase):
+
+    def test_article_with_metadata(self):
+        reader = readers.HtmlReader({})
+        content, metadata = reader.read(_filename('article_with_html_metadata.html'))
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'title': 'A great html article with metadata',
+            'summary': u'Multi-line metadata should be'\
+                       u' supported\nas well as <strong>inline'\
+                       u' markup</strong>.',
+            'date': datetime.datetime(2010, 12, 2, 10, 14),
+            'tags': ['foo', 'bar', 'foobar'],
+            'custom_field': 'http://notmyidea.org',
+        }
+
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)

From c02926e2adc6bad1930b919b37f40a4b9b86eee1 Mon Sep 17 00:00:00 2001
From: guillermooo <guillermo.lopez@outlook.com>
Date: Sun, 2 Sep 2012 10:59:33 +0200
Subject: [PATCH 0871/2864] fix encoding issues in Linux

---
 pelican/tools/pelican_quickstart.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 8fe7b69e..388718ec 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -31,23 +31,23 @@ CONF = {
 }
 
 
-def decoding_maybe(f):
-    running_windows = (os.name == 'nt')
+def decoding_strings(f):
     def wrapper(*args, **kwargs):
         out = f(*args, **kwargs)
-        if isinstance(out, basestring) and running_windows:
+        if isinstance(out, basestring):
+            # todo: make encoding configurable?
             return out.decode(sys.stdin.encoding)
         return out
     return wrapper
 
 
-def get_template(name):
+def get_template(name, as_encoding='utf-8'):
     template = os.path.join(_TEMPLATES_DIR, "{0}.in".format(name))
 
     if not os.path.isfile(template):
         raise RuntimeError("Cannot open {0}".format(template))
 
-    with open(template, 'r') as fd:
+    with codecs.open(template, 'r', as_encoding) as fd:
         line = fd.readline()
         while line:
             yield line
@@ -55,7 +55,7 @@ def get_template(name):
         fd.close()
 
 
-@decoding_maybe
+@decoding_strings
 def ask(question, answer=str, default=None, l=None):
     if answer == str:
         r = ''
@@ -209,7 +209,7 @@ Please answer the following questions so this script can generate the files need
         print('Error: {0}'.format(e))
 
     try:
-        with open(os.path.join(CONF['basedir'], 'publishconf.py'), 'w') as fd:
+        with codecs.open(os.path.join(CONF['basedir'], 'publishconf.py'), 'w', 'utf-8') as fd:
             for line in get_template('publishconf.py'):
                 template = string.Template(line)
                 fd.write(template.safe_substitute(CONF))
@@ -219,7 +219,7 @@ Please answer the following questions so this script can generate the files need
 
     if mkfile:
         try:
-            with open(os.path.join(CONF['basedir'], 'Makefile'), 'w') as fd:
+            with codecs.open(os.path.join(CONF['basedir'], 'Makefile'), 'w', 'utf-8') as fd:
                 for line in get_template('Makefile'):
                     template = string.Template(line)
                     fd.write(template.safe_substitute(CONF))
@@ -229,7 +229,7 @@ Please answer the following questions so this script can generate the files need
 
     if develop:
         try:
-            with open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w') as fd:
+            with codecs.open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w', 'utf-8') as fd:
                 for line in get_template('develop_server.sh'):
                     template = string.Template(line)
                     fd.write(template.safe_substitute(CONF))

From 229b0e4dcc50daa32ffaf48234f58d1e694ecb7a Mon Sep 17 00:00:00 2001
From: m-r-r <raybaudroigm@gmail.com>
Date: Tue, 21 Aug 2012 13:08:21 +0200
Subject: [PATCH 0872/2864] Sitemap plugin & `get_generators` signal

This is a combination of 13 commits:

1. New signal for registering custom generators
2. New plugin: pelican.plugins.sitemap
3. pelican.plugins.sitemap: more settings
4. pelican.plugins.sitemap: translations are indexed
5. pelican.plugins.sitemap: added documentation
6. pelican.plugins.sitemap: added XML DTD & W3C dates
7. pelican.plugins.sitemap: removed a <changefreq> bug
8. the `get_generators` can now return a tuple
9. pelican.plugins.sitemap: cleaned the code
10. pelican.plugin.sitemap: settings changes
11. sitemap plugin: improved configuration & documentation
12. sitemap plugin: :set spell
13. sitemap plugin: removed useless whitespaces
---
 docs/plugins.rst           |  79 ++++++++++++++
 pelican/__init__.py        |  14 ++-
 pelican/plugins/sitemap.py | 208 +++++++++++++++++++++++++++++++++++++
 pelican/signals.py         |   1 +
 4 files changed, 301 insertions(+), 1 deletion(-)
 create mode 100644 pelican/plugins/sitemap.py

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 53858668..99c0429a 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -59,6 +59,9 @@ Signal                      Arguments                      Description
 initialized                 pelican object
 article_generate_context    article_generator, metadata
 article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
+get_generators              generators                     invoked in Pelican.get_generator_classes,
+                                                           can return a Generator, or several
+                                                           generator in a tuple or in a list.
 pages_generate_context      pages_generator, metadata
 pages_generator_init        pages_generator                invoked in the PagesGenerator.__init__
 =========================   ============================   =========================================
@@ -108,3 +111,79 @@ variable, as in the example::
 
 ``github_activity`` is a list of lists. The first element is the title
 and the second element is the raw HTML from GitHub.
+
+
+Sitemap
+-------
+
+The plugin generates a sitemap of the blog.
+It can generates plain text sitemaps or XML sitemaps.
+
+Configuration
+"""""""""""""
+
+You can use the setting ``SITEMAP`` variable to configure the behavior of the
+plugin.
+
+The ``SITEMAP`` variable must be a Python dictionary, it can contain tree keys:
+
+
+- ``format``, which set the output format of the plugin (``xml`` or ``txt``)
+
+- ``priorities``, which is a dictionary with three keys:
+
+  - ``articles``, the priority for the URLs of the articles and their
+    translations
+
+  - ``pages``, the priority for the URLs of the static pages
+
+  - ``indexes``, the priority for the URLs of the index pages, such as tags,
+     author pages, categories indexes, archives, etc...
+
+  All the values of this dictionary must be decimal numbers between ``0`` and ``1``.
+
+- ``changefreqs``, which is a dictionary with three items:
+
+  - ``articles``, the update frequency of the articles
+
+  - ``pages``, the update frequency of the pages
+
+  - ``indexes``, the update frequency of the index pages
+
+  An valid value is  ``always``, ``hourly``, ``daily``, ``weekly``, ``monthly``,
+  ``yearly`` or ``never``.
+
+
+If a key is missing or a value is incorrect, it will be replaced with the
+default value.
+
+The sitemap is saved in ``<output_path>/sitemap.<format>``.
+
+.. note::
+   ``priorities`` and ``changefreqs`` are informations for search engines.
+   They are only used in the XML sitemaps.
+   For more information: <http://www.sitemaps.org/protocol.html#xmlTagDefinitions>
+
+
+Example
+"""""""
+
+Here is an example of configuration (it's also the default settings):
+
+.. code-block:: python
+
+    PLUGINS=['pelican.plugins.sitemap',]
+
+    SITEMAP = {
+        'format': 'xml',
+        'priorities': {
+            'articles': 0.5,
+            'indexes': 0.5,
+            'pages': 0.5
+        },
+        'changefreqs': {
+            'articles': 'monthly',
+            'indexes': 'daily',
+            'pages': 'monthly'
+        }
+    }
diff --git a/pelican/__init__.py b/pelican/__init__.py
index a69752d8..b9f9bb22 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -8,7 +8,7 @@ import argparse
 
 from pelican import signals
 
-from pelican.generators import (ArticlesGenerator, PagesGenerator,
+from pelican.generators import (Generator, ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator, LessCSSGenerator)
 from pelican.log import init
 from pelican.settings import read_settings, _DEFAULT_CONFIG
@@ -185,6 +185,18 @@ class Pelican(object):
             generators.append(PdfGenerator)
         if self.settings['LESS_GENERATOR']:  # can be True or PATH to lessc
             generators.append(LessCSSGenerator)
+
+        for pair in signals.get_generators.send(self):
+            (funct, value) = pair
+
+            if not isinstance(value, (tuple, list)):
+                value = (value, )
+
+            for v in value:
+                if isinstance(v, type):
+                    logger.debug('Found generator: {0}'.format(v))
+                    generators.append(v)
+
         return generators
 
     def get_writer(self):
diff --git a/pelican/plugins/sitemap.py b/pelican/plugins/sitemap.py
new file mode 100644
index 00000000..6402ba9c
--- /dev/null
+++ b/pelican/plugins/sitemap.py
@@ -0,0 +1,208 @@
+import os.path
+
+from datetime import datetime
+from logging import debug, warning, error, info
+from codecs import open
+
+from pelican import signals, contents
+
+TXT_HEADER = u"""{0}/index.html
+{0}/archives.html
+{0}/tags.html
+{0}/categories.html
+"""
+
+XML_HEADER = u"""<?xml version="1.0" encoding="utf-8"?>
+<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
+         xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+
+  <url>
+    <loc>{0}/index.html</loc>
+    <lastmod>{1}</lastmod>
+    <changefreq>{2}</changefreq>
+    <priority>{3}</priority>
+  </url>
+
+  <url>
+    <loc>{0}/archives.html</loc>
+    <lastmod>{1}</lastmod>
+    <changefreq>{2}</changefreq>
+    <priority>{3}</priority>
+  </url>
+
+  <url>
+    <loc>{0}/tags.html</loc>
+    <lastmod>{1}</lastmod>
+    <changefreq>{2}</changefreq>
+    <priority>{3}</priority>
+  </url>
+
+  <url>
+    <loc>{0}/categories.html</loc>
+    <lastmod>{1}</lastmod>
+    <changefreq>{2}</changefreq>
+    <priority>{3}</priority>
+  </url>
+"""
+
+XML_URL = u"""
+  <url>
+    <loc>{0}/{1}</loc>
+    <lastmod>{2}</lastmod>
+    <changefreq>{3}</changefreq>
+    <priority>{4}</priority>
+  </url>
+"""
+
+XML_FOOTER = u"""
+</urlset>
+"""
+
+
+def format_date(date):
+    if date.tzinfo:
+        tz = date.strftime('%s')
+        tz = tz[:-2] + ':' + tz[-2:]
+    else:
+        tz = "-00:00"
+    return date.strftime("%Y-%m-%dT%H:%M:%S") + tz
+
+
+
+class SitemapGenerator(object):
+
+    def __init__(self, context, settings, path, theme, output_path, *null):
+
+        self.output_path = output_path
+        self.context = context
+        self.now = datetime.now()
+        self.siteurl = settings.get('SITEURL')
+
+        self.format = 'xml'
+
+        self.changefreqs = {
+            'articles': 'monthly',
+            'indexes': 'daily',
+            'pages': 'monthly'
+        }
+
+        self.priorities = {
+            'articles': 0.5,
+            'indexes': 0.5,
+            'pages': 0.5
+        }
+
+        config = settings.get('SITEMAP', {})
+
+        if not isinstance(config, dict):
+            warning("sitemap plugin: the SITEMAP setting must be a dict")
+        else:
+            fmt = config.get('format')
+            pris = config.get('priorities')
+            chfreqs = config.get('changefreqs')
+
+            if fmt not in ('xml', 'txt'):
+                warning("sitemap plugin: SITEMAP['format'] must be `txt' or `xml'")
+                warning("sitemap plugin: Setting SITEMAP['format'] on `xml'")
+            elif fmt == 'txt':
+                self.format = fmt
+                return
+
+            valid_keys = ('articles', 'indexes', 'pages')
+            valid_chfreqs = ('always', 'hourly', 'daily', 'weekly', 'monthly',
+                    'yearly', 'never')
+
+            if isinstance(pris, dict):
+                for k, v in pris.iteritems():
+                    if k in valid_keys and not isinstance(v, (int, float)):
+                        default = self.priorities[k]
+                        warning("sitemap plugin: priorities must be numbers")
+                        warning("sitemap plugin: setting SITEMAP['priorities']"
+                                "['{0}'] on {1}".format(k, default))
+                        pris[k] = default
+                self.priorities.update(pris)
+            elif pris is not None:
+                warning("sitemap plugin: SITEMAP['priorities'] must be a dict")
+                warning("sitemap plugin: using the default values")
+
+            if isinstance(chfreqs, dict):
+                for k, v in chfreqs.iteritems():
+                    if k in valid_keys and v not in valid_chfreqs:
+                        default = self.changefreqs[k]
+                        warning("sitemap plugin: invalid changefreq `{0}'".format(v))
+                        warning("sitemap plugin: setting SITEMAP['changefreqs']"
+                                "['{0}'] on '{1}'".format(k, default))
+                        chfreqs[k] = default
+                self.changefreqs.update(chfreqs)
+            elif chfreqs is not None:
+                warning("sitemap plugin: SITEMAP['changefreqs'] must be a dict")
+                warning("sitemap plugin: using the default values")
+
+
+
+    def write_url(self, page, fd):
+
+        if getattr(page, 'status', 'published') != 'published':
+            return
+
+        lastmod = format_date(getattr(page, 'date', self.now))
+
+        if isinstance(page, contents.Article):
+            pri = self.priorities['articles']
+            chfreq = self.changefreqs['articles']
+        elif isinstance(page, contents.Page):
+            pri = self.priorities['pages']
+            chfreq = self.changefreqs['pages']
+        else:
+            pri = self.priorities['indexes']
+            chfreq = self.changefreqs['indexes']
+
+
+        if self.format == 'xml':
+            fd.write(XML_URL.format(self.siteurl, page.url, lastmod, chfreq, pri))
+        else:
+            fd.write(self.siteurl + '/' + loc + '\n')
+
+
+    def generate_output(self, writer):
+        path = os.path.join(self.output_path, 'sitemap.{0}'.format(self.format))
+
+        pages = self.context['pages'] + self.context['articles'] \
+                + [ c for (c, a) in self.context['categories']] \
+                + [ t for (t, a) in self.context['tags']] \
+                + [ a for (a, b) in self.context['authors']]
+
+        for article in self.context['articles']:
+            pages += article.translations
+
+
+        info('writing {0}'.format(path))
+
+        with open(path, 'w', encoding='utf-8') as fd:
+
+            if self.format == 'xml':
+                fd.write(XML_HEADER.format(
+                        self.siteurl,
+                        format_date(self.now),
+                        self.changefreqs['indexes'],
+                        self.priorities['indexes']
+                    )
+                )
+            else:
+                fd.write(TXT_HEADER.format(self.siteurl))
+
+            for page in pages:
+                self.write_url(page, fd)
+
+            if self.format == 'xml':
+                fd.write(XML_FOOTER)
+
+
+
+def get_generators(generators):
+    return SitemapGenerator
+
+
+def register():
+    signals.get_generators.connect(get_generators)
diff --git a/pelican/signals.py b/pelican/signals.py
index 4d9ab512..7ee88a0a 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -3,5 +3,6 @@ from blinker import signal
 initialized = signal('pelican_initialized')
 article_generate_context = signal('article_generate_context')
 article_generator_init = signal('article_generator_init')
+get_generators = signal('get_generators')
 pages_generate_context = signal('pages_generate_context')
 pages_generator_init = signal('pages_generator_init')

From 6100773c2476e333f739674910caf48da001abef Mon Sep 17 00:00:00 2001
From: Rachid Belaid <rachid.belaid@gmail.com>
Date: Sun, 2 Sep 2012 19:20:42 +0100
Subject: [PATCH 0873/2864] Add a new signal content_object_init It's sent when
 a new content object is created: Page, Article

---
 docs/plugins.rst    | 33 +++++++++++++++++++++++++++------
 pelican/contents.py |  4 +++-
 pelican/signals.py  |  1 +
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 53858668..c65fc79e 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -48,24 +48,45 @@ which you map the signals to your plugin logic. Let's take a simple example::
         signals.initialized.connect(test)
 
 
+
 List of signals
 ===============
 
 Here is the list of currently implemented signals:
 
-=========================   ============================   =========================================
-Signal                      Arguments                      Description
-=========================   ============================   =========================================
+=========================   =======================================   =========================================
+Signal                      Arguments                                 Description
+=========================   =======================================   =========================================
 initialized                 pelican object
 article_generate_context    article_generator, metadata
-article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
+article_generator_init      article_generator                         invoked in the ArticlesGenerator.__init__
 pages_generate_context      pages_generator, metadata
-pages_generator_init        pages_generator                invoked in the PagesGenerator.__init__
-=========================   ============================   =========================================
+pages_generator_init        pages_generator                           invoked in the PagesGenerator.__init__
+content_object_init         Content class (Page, Article), instance 
+=========================   =======================================   =========================================
 
 The list is currently small, don't hesitate to add signals and make a pull
 request if you need them!
 
+.. note:: 
+          
+   The signal ``content_object_init`` can send different type of object as 
+   argument. If you want to register only one type of object then you will
+   need to specify the sender when you are connecting to the signal.
+   
+   ::
+   
+       from pelican import signals
+       from pelican import contents
+       
+       def test(sender, instance):
+               print "%s : %s content initialized !!" % (sender, instance)
+       
+       def register():
+               signals.content_object_init.connect(test, sender=contents.Article)
+       
+
+
 List of plugins
 ===============
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 851607a5..b5701732 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -11,7 +11,7 @@ from sys import platform, stdin
 
 from pelican.settings import _DEFAULT_CONFIG
 from pelican.utils import slugify, truncate_html_words
-
+from pelican import signals
 
 logger = logging.getLogger(__name__)
 
@@ -106,6 +106,8 @@ class Page(object):
         if 'summary' in metadata:
             self._summary = metadata['summary']
 
+        signals.content_object_init.send(self.__class__, instance=self)
+
     def check_properties(self):
         """test that each mandatory property is set."""
         for prop in self.mandatory_properties:
diff --git a/pelican/signals.py b/pelican/signals.py
index 4d9ab512..17b4b7e6 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -5,3 +5,4 @@ article_generate_context = signal('article_generate_context')
 article_generator_init = signal('article_generator_init')
 pages_generate_context = signal('pages_generate_context')
 pages_generator_init = signal('pages_generator_init')
+content_object_init = signal('content_object_init')

From dcb50a20b230871a8538ca37f52b602917ce7fbe Mon Sep 17 00:00:00 2001
From: Rachid Belaid <rachid.belaid@gmail.com>
Date: Sun, 2 Sep 2012 19:55:31 +0100
Subject: [PATCH 0874/2864] Add test for the new signal

---
 tests/test_contents.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/test_contents.py b/tests/test_contents.py
index bc028ea8..6b0f93ea 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -5,7 +5,7 @@ from .support import unittest
 from pelican.contents import Page, Article
 from pelican.settings import _DEFAULT_CONFIG
 from pelican.utils import truncate_html_words
-
+from pelican.signals import content_object_init
 from jinja2.utils import generate_lorem_ipsum
 
 # generate one paragraph, enclosed with <p>
@@ -158,6 +158,17 @@ class TestPage(unittest.TestCase):
 
         return page_kwargs
 
+    def test_signal(self):
+        """If a title is given, it should be used to generate the slug."""
+
+        def receiver_test_function(sender,instance):
+            pass
+
+        content_object_init.connect(receiver_test_function ,sender=Page)
+        page = Page(**self.page_kwargs)
+        self.assertTrue(content_object_init.has_receivers_for(Page))
+
+
 class TestArticle(TestPage):
     def test_template(self):
         """

From c462237b9d2f937cec96745b98728f85cbf92b37 Mon Sep 17 00:00:00 2001
From: Rachid Belaid <rachid.belaid@gmail.com>
Date: Mon, 3 Sep 2012 00:57:23 +0100
Subject: [PATCH 0875/2864] Add new setting EXTRA_TEMPLATES_PATHS This setting
 allow to use template which are not in the theme. Should help to build more
 generic themes around the content.

---
 docs/settings.rst     | 4 ++++
 pelican/generators.py | 7 +++++--
 pelican/settings.py   | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index ad08f020..2f5027b9 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -100,6 +100,10 @@ Setting name (default value)                                            What doe
                                                                         This only applies if your content does not otherwise
                                                                         specify a summary. Setting to None will cause the summary
                                                                         to be a copy of the original content.
+`EXTRA_TEMPLATES_PATHS` (``[]``)                                        A list of paths you want Jinja2 to look for the templates.
+                                                                        Can be used to separate templates from the theme.
+                                                                        Example: projects, resume, profile ...
+                                                                        This templates need to use ``DIRECT_TEMPLATES`` setting
 
 =====================================================================   =====================================================================
 
diff --git a/pelican/generators.py b/pelican/generators.py
index ae9334da..de10a126 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -36,8 +36,11 @@ class Generator(object):
 
         # templates cache
         self._templates = {}
-        self._templates_path = os.path.expanduser(
-                os.path.join(self.theme, 'templates'))
+        self._templates_path = []
+        self._templates_path.append(os.path.expanduser(
+                os.path.join(self.theme, 'templates')))
+        self._templates_path += self.settings.get('EXTRA_TEMPLATES_PATHS', [])
+
 
         theme_path = os.path.dirname(os.path.abspath(__file__))
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 92c68ddc..c1ebe9b6 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -58,6 +58,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'TAG_CLOUD_STEPS': 4,
                    'TAG_CLOUD_MAX_ITEMS': 100,
                    'DIRECT_TEMPLATES': ('index', 'tags', 'categories', 'archives'),
+                   'EXTRA_TEMPLATES_PATHS' : [],
                    'PAGINATED_DIRECT_TEMPLATES': ('index', ),
                    'PELICAN_CLASS': 'pelican.Pelican',
                    'DEFAULT_DATE_FORMAT': '%a %d %B %Y',

From 566530ca188923fdd65a259bf12f38a78527165e Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Sun, 2 Sep 2012 15:18:46 -0700
Subject: [PATCH 0876/2864] Add the unit2 tests to tox

Remove unnecessary dependencies
These dependencies are installed when tox runs setup.py
---
 tox.ini | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tox.ini b/tox.ini
index a7dc9ec6..4a0e148c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,13 +2,11 @@
 envlist = py26,py27
 
 [testenv]
-commands = nosetests -s tests
+commands =
+    nosetests -s tests
+    unit2 discover []
 deps =
     nose
-    Jinja2
-    Pygments
-    docutils
-    feedgenerator
     unittest2
     mock
     Markdown

From 77a538e588e13edbb3ea701a82abfb3f61478205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20L=C3=83=C2=B3pez?= <guilan70@hotmail.com>
Date: Tue, 4 Sep 2012 00:29:02 +0200
Subject: [PATCH 0877/2864] always return Unix-like relative paths, even on
 Windows

---
 pelican/writers.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/writers.py b/pelican/writers.py
index 75971ee9..bac06bc5 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -202,6 +202,10 @@ class Writer(object):
                                 os.sep.join((get_relative_path(name), "static",
                                 relative_path)))
 
+                # On Windows, make sure we end up with Unix-like paths.
+                if os.name == 'nt':
+                    dest_path = dest_path.replace('\\', '/')
+
                 return m.group('markup') + m.group('quote') + dest_path \
                         + m.group('quote')
 

From 41fdfa63b11957c564e42fb128dc1f89873c41a4 Mon Sep 17 00:00:00 2001
From: Trae Blain <trae@traeblain.com>
Date: Sat, 23 Jun 2012 16:39:02 -0500
Subject: [PATCH 0878/2864] Fixed page_name call to adapt to the link structure
 provided by the Settings file. Also updated the documentation accordingly.

Update documentation to cover new page_name behavior

Fixed page_name to adapt to the links provided by the Settings file. Includes documentation updates as well.

Updated terms to maintain better syntax and consistancy

Added docstring to _from_settings() to clarify the get_page_name argument that was added. Explains why/when this argument is used.

Revert contents.py back to commit 2f29c51

Re-added docstring to _get_settings method, but this time not deleting things I shouldn't

Corrected readability change that was altered during revert.
---
 docs/settings.rst     | 12 ++++++------
 docs/themes.rst       | 23 ++++++++++++-----------
 pelican/contents.py   | 12 ++++++++++--
 pelican/generators.py |  6 +++---
 4 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 65561d5d..5eb97edd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -152,12 +152,12 @@ Setting name (default value)                        what does it do?
                                                     use the default language.
 `PAGE_LANG_SAVE_AS` ('pages/{slug}-{lang}.html')    The location we will save the page which doesn't
                                                     use the default language.
-`AUTHOR_URL` ('author/{name}.html')                 The URL to use for an author.
-`AUTHOR_SAVE_AS` ('author/{name}.html')             The location to save an author.
-`CATEGORY_URL` ('category/{name}.html')             The URL to use for a category.
-`CATEGORY_SAVE_AS` ('category/{name}.html')         The location to save a category.
-`TAG_URL` ('tag/{name}.html')                       The URL to use for a tag.
-`TAG_SAVE_AS` ('tag/{name}.html')                   The location to save the tag page.
+`AUTHOR_URL` ('author/{slug}.html')                 The URL to use for an author.
+`AUTHOR_SAVE_AS` ('author/{slug}.html')             The location to save an author.
+`CATEGORY_URL` ('category/{slug}.html')             The URL to use for a category.
+`CATEGORY_SAVE_AS` ('category/{slug}.html')         The location to save a category.
+`TAG_URL` ('tag/{slug}.html')                       The URL to use for a tag.
+`TAG_SAVE_AS` ('tag/{slug}.html')                   The location to save the tag page.
 `<DIRECT_TEMPLATE_NAME>_SAVE_AS`                    The location to save content generated from direct
                                                     templates. Where <DIRECT_TEMPLATE_NAME> is the
                                                     upper case template name.
diff --git a/docs/themes.rst b/docs/themes.rst
index e0583882..7b251dc1 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -93,8 +93,8 @@ author.html
 This template will be processed for each of the existing authors, with
 output generated at output/author/`author_name`.html.
 
-If pagination is active, subsequent pages will reside at
-output/author/`author_name``n`.html.
+If pagination is active, subsequent pages will reside as defined by setting
+AUTHOR_SAVE_AS (`Default:` output/author/`author_name'n'`.html).
 
 ===================     ===================================================
 Variable                Description
@@ -109,8 +109,8 @@ dates_paginator         A paginator object for the article list, ordered by
                         date, ascending.
 dates_page              The current page of articles, ordered by date,
                         ascending.
-page_name               'author/`author_name`' -- useful for pagination
-                        links
+page_name               AUTHOR_URL where everything after `{slug}` is 
+                        removed -- useful for pagination links
 ===================     ===================================================
 
 category.html
@@ -119,8 +119,8 @@ category.html
 This template will be processed for each of the existing categories, with
 output generated at output/category/`category_name`.html.
 
-If pagination is active, subsequent pages will reside at
-output/category/`category_name``n`.html.
+If pagination is active, subsequent pages will reside as defined by setting
+CATEGORY_SAVE_AS (`Default:` output/category/`category_name'n'`.html).
 
 ===================     ===================================================
 Variable                Description
@@ -135,8 +135,8 @@ dates_paginator         A paginator object for the list of articles,
                         ordered by date, ascending
 dates_page              The current page of articles, ordered by date,
                         ascending
-page_name               'category/`category_name`' -- useful for pagination
-                        links
+page_name               CATEGORY_URL where everything after `{slug}` is 
+                        removed -- useful for pagination links
 ===================     ===================================================
 
 article.html
@@ -171,8 +171,8 @@ tag.html
 This template will be processed for each tag, with corresponding .html files
 saved as output/tag/`tag_name`.html.
 
-If pagination is active, subsequent pages will reside at
-output/tag/`tag_name``n`.html.
+If pagination is active, subsequent pages will reside as defined in setting
+TAG_SAVE_AS (`Default:` output/tag/`tag_name'n'`.html).
 
 ===================     ===================================================
 Variable                Description
@@ -187,7 +187,8 @@ dates_paginator         A paginator object for the list of articles,
                         ordered by date, ascending
 dates_page              The current page of articles, ordered by date,
                         ascending
-page_name               'tag/`tag_name`' -- useful for pagination links
+page_name               TAG_URL where everything after `{slug}` is removed
+                        -- useful for pagination links
 ===================     ===================================================
 
 Inheritance
diff --git a/pelican/contents.py b/pelican/contents.py
index b8bb0993..ad08d468 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -183,15 +183,23 @@ class URLWrapper(object):
     def __unicode__(self):
         return self.name
 
-    def _from_settings(self, key):
+    def _from_settings(self, key, get_page_name=False):
+        """Returns URL information as defined in settings. 
+        When get_page_name=True returns URL without anything after {slug}
+        e.g. if in settings: CATEGORY_URL="cat/{slug}.html" this returns "cat/{slug}"
+        Useful for pagination."""
         setting = "%s_%s" % (self.__class__.__name__.upper(), key)
         value = self.settings[setting]
         if not isinstance(value, basestring):
             logger.warning(u'%s is set to %s' % (setting, value))
             return value
         else:
-            return unicode(value).format(**self.as_dict())
+            if get_page_name:
+                return unicode(value[:value.find('{slug}') + len('{slug}')]).format(**self.as_dict())
+            else:
+                return unicode(value).format(**self.as_dict())
 
+    page_name = property(functools.partial(_from_settings, key='URL', get_page_name=True))
     url = property(functools.partial(_from_settings, key='URL'))
     save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 1ddc13c2..be88d2b2 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -198,7 +198,7 @@ class ArticlesGenerator(Generator):
             write(tag.save_as, tag_template, self.context, tag=tag,
                 articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
-                page_name=u'tag/%s' % tag)
+                page_name=tag.page_name)
 
     def generate_categories(self, write):
         """Generate category pages."""
@@ -208,7 +208,7 @@ class ArticlesGenerator(Generator):
             write(cat.save_as, category_template, self.context,
                 category=cat, articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
-                page_name=u'category/%s' % cat)
+                page_name=cat.page_name)
 
     def generate_authors(self, write):
         """Generate Author pages."""
@@ -218,7 +218,7 @@ class ArticlesGenerator(Generator):
             write(aut.save_as, author_template, self.context,
                 author=aut, articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
-                page_name=u'author/%s' % aut)
+                page_name=aut.page_name)
 
     def generate_drafts(self, write):
         """Generate drafts pages."""

From 2c85fb0d19906cd4a9f4cc19b67eff10b7a5e206 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Tue, 4 Sep 2012 15:17:59 -0700
Subject: [PATCH 0879/2864] Clean up Dev Requirements and add typogrify &
 webassets typogrify & webassets are optional packages for usage but should be
 included for testing by developers and CI dev_requirements also had packages
 that setup.py covers already. Added comments for redundancy

---
 dev_requirements.txt | 10 ++++------
 tox.ini              |  2 ++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index ec3245d1..acf01773 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,10 +1,8 @@
-Jinja2>=2.4
-Pygments
-docutils
-feedgenerator
+# Tests
 unittest2
-pytz
 mock
+# Optional Packages
 Markdown
-blinker
 BeautifulSoup
+typogrify
+webassets
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 4a0e148c..f7d9cf82 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,3 +11,5 @@ deps =
     mock
     Markdown
     BeautifulSoup
+    typogrify
+    webassets

From ff3c12fd711f3dc75b67f910a8c0900510709ea0 Mon Sep 17 00:00:00 2001
From: Nico Di Rocco <dirocco.nico@gmail.com>
Date: Fri, 7 Sep 2012 08:56:33 +0200
Subject: [PATCH 0880/2864] Added possible uses for the finalized signal to the
 docs

---
 docs/plugins.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index a90d077e..36e89f3d 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -58,6 +58,9 @@ Signal                      Arguments                      Description
 =========================   ============================   ===========================================================================
 initialized                 pelican object
 finalized                   pelican object                 invoked after all the generators are executed and just before pelican exits
+                                                           usefull for custom post processing actions, such as: 
+                                                           - minifying js/css assets.
+                                                           - notify/ping search engines with an updated sitemap.
 article_generate_context    article_generator, metadata
 article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
 get_generators              generators                     invoked in Pelican.get_generator_classes,

From 0c2625e59d0059d502a6761facd8fbb6e9beff76 Mon Sep 17 00:00:00 2001
From: Wladislaw Merezhko <infinitylx@infinitylx.org.ua>
Date: Sat, 8 Sep 2012 13:07:51 +0300
Subject: [PATCH 0881/2864] Change name of utils.open function to pelican_open
 and refactor this change across project.

---
 pelican/readers.py | 6 +++---
 pelican/utils.py   | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index e3ea154d..30038f7a 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -16,7 +16,7 @@ except ImportError:
 import re
 
 from pelican.contents import Category, Tag, Author
-from pelican.utils import get_date, open
+from pelican.utils import get_date, pelican_open
 
 
 _METADATA_PROCESSORS = {
@@ -129,7 +129,7 @@ class MarkdownReader(Reader):
 
     def read(self, filename):
         """Parse content and metadata of markdown files"""
-        text = open(filename)
+        text = pelican_open(filename)
         md = Markdown(extensions=set(self.extensions + ['meta']))
         content = md.convert(text)
 
@@ -146,7 +146,7 @@ class HtmlReader(Reader):
 
     def read(self, filename):
         """Parse content and metadata of (x)HTML files"""
-        with open(filename) as content:
+        with pelican_open(filename) as content:
             metadata = {'title': 'unnamed'}
             for i in self._re.findall(content):
                 key = i.split(':')[0][5:].strip()
diff --git a/pelican/utils.py b/pelican/utils.py
index ca3015ce..60ecee34 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -6,7 +6,7 @@ import shutil
 import logging
 from collections import defaultdict
 
-from codecs import open as _open
+from codecs import open
 from datetime import datetime
 from itertools import groupby
 from jinja2 import Markup
@@ -14,6 +14,7 @@ from operator import attrgetter
 
 logger = logging.getLogger(__name__)
 
+
 class NoFilesError(Exception):
     pass
 
@@ -37,9 +38,9 @@ def get_date(string):
     raise ValueError("'%s' is not a valid date" % string)
 
 
-def open(filename):
+def pelican_open(filename):
     """Open a file and return it's content"""
-    return _open(filename, encoding='utf-8').read()
+    return open(filename, encoding='utf-8').read()
 
 
 def slugify(value):

From 8b44fa6a2dedec57ad48f791c3474cc59cd39bff Mon Sep 17 00:00:00 2001
From: Wladislaw Merezhko <infinitylx@infinitylx.org.ua>
Date: Sat, 8 Sep 2012 18:24:15 +0300
Subject: [PATCH 0882/2864] Add two new parameters for creating pdf

* PDF_STYLE - name of custom style to use when generating pdf
* PDF_STYLE_PATH - path where custom style is located
---
 pelican/generators.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index a1901889..71039517 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -189,7 +189,7 @@ class ArticlesGenerator(Generator):
             save_as = self.settings.get("%s_SAVE_AS" % template.upper(),
                                                         '%s.html' % template)
             if not save_as:
-                 continue
+                continue
 
             write(save_as, self.get_template(template),
                   self.context, blog=True, paginated=paginated,
@@ -454,13 +454,20 @@ class PdfGenerator(Generator):
     """Generate PDFs on the output dir, for all articles and pages coming from
     rst"""
     def __init__(self, *args, **kwargs):
+        super(PdfGenerator, self).__init__(*args, **kwargs)
         try:
             from rst2pdf.createpdf import RstToPdf
+            pdf_style_path = os.path.join(self.settings['PDF_STYLE_PATH']) \
+                                if 'PDF_STYLE_PATH' in self.settings.keys() \
+                                else ''
+            pdf_style = self.settings['PDF_STYLE'] if 'PDF_STYLE' \
+                                                    in self.settings.keys() \
+                                                    else 'twelvepoint'
             self.pdfcreator = RstToPdf(breakside=0,
-                                       stylesheets=['twelvepoint'])
+                                       stylesheets=[pdf_style],
+                                       style_path=[pdf_style_path])
         except ImportError:
             raise Exception("unable to find rst2pdf")
-        super(PdfGenerator, self).__init__(*args, **kwargs)
 
     def _create_pdf(self, obj, output_path):
         if obj.filename.endswith(".rst"):

From 1da88a647ada62d07c285c5c8c0fc577d6abc427 Mon Sep 17 00:00:00 2001
From: epatters <ejpatters@gmail.com>
Date: Sat, 8 Sep 2012 21:39:10 -0700
Subject: [PATCH 0883/2864] BUG: Typogrify not applied to pages.

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index ae9334da..94edb3b2 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -378,7 +378,7 @@ class PagesGenerator(Generator):
                 os.path.join(self.path, self.settings['PAGE_DIR']),
                 exclude=self.settings['PAGE_EXCLUDES']):
             try:
-                content, metadata = read_file(f)
+                content, metadata = read_file(f, settings=self.settings)
             except Exception, e:
                 logger.warning(u'Could not process %s\n%s' % (f, str(e)))
                 continue

From 3054e71f5b137522dfc2ffd5d96762c32daac0e6 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 10 Sep 2012 20:48:13 -0700
Subject: [PATCH 0884/2864] Minor doc changes, including those for webassets

---
 docs/getting_started.rst | 15 ++++++------
 docs/settings.rst        | 53 ++++++++++++++++++++--------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index b7cbe951..985718b5 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -17,7 +17,7 @@ While the above is the simplest method, the recommended approach is to create
 a virtual environment for Pelican via virtualenv_ and virtualenvwrapper_ before
 installing Pelican. Assuming you've followed the virtualenvwrapper
 `installation <http://virtualenvwrapper.readthedocs.org/en/latest/install.html>`_
-and `shell configuration 
+and `shell configuration
 <http://virtualenvwrapper.readthedocs.org/en/latest/install.html#shell-startup-file>`_
 steps, you can then open a new terminal session and create a new virtual
 environment for Pelican::
@@ -26,7 +26,7 @@ environment for Pelican::
 
 Once the virtual environment has been created and activated, Pelican can be
 be installed via ``pip`` or ``easy_install`` as noted above. Alternatively, if
-you have the project source, you can install Pelican using the distutils 
+you have the project source, you can install Pelican using the distutils
 method::
 
     $ cd path-to-Pelican-source
@@ -209,7 +209,7 @@ Pages
 If you create a folder named ``pages``, all the files in it will be used to
 generate static pages.
 
-Then, use the ``DISPLAY_PAGES_ON_MENU`` setting, which will add all the pages to 
+Then, use the ``DISPLAY_PAGES_ON_MENU`` setting, which will add all the pages to
 the menu.
 
 If you want to exclude any pages from being linked to or listed in the menu
@@ -219,7 +219,7 @@ things like making error pages that fit the generated theme of your site.
 Importing an existing blog
 --------------------------
 
-It is possible to import your blog from Dotclear, WordPress, and RSS feeds using 
+It is possible to import your blog from Dotclear, WordPress, and RSS feeds using
 a simple script. See :ref:`import`.
 
 Translations
@@ -277,14 +277,13 @@ For RestructuredText, use the code-block directive::
 
        <indented code block goes here>
 
-For Markdown, include the language identifier just above code blocks::
+For Markdown, include the language identifier just above the code block,
+indenting both the identifier and code::
 
         :::identifier
         <code goes here>
-    
-    (indent both the identifier and code)
 
-The specified identifier (e.g. ``python``, ``ruby``) should be one that 
+The specified identifier (e.g. ``python``, ``ruby``) should be one that
 appears on the `list of available lexers <http://pygments.org/docs/lexers/>`_.
 
 Publishing drafts
diff --git a/docs/settings.rst b/docs/settings.rst
index ad08f020..0dd7f07b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -444,26 +444,27 @@ adding the following to your configuration::
 Asset management
 ----------------
 
-The `WEBASSETS` setting allows to use the `webassets`_ module to manage assets
-(css, js). The module must first be installed::
+The `WEBASSETS` setting allows you to use the `webassets`_ module to manage
+assets such as CSS and JS files. The module must first be installed::
 
     pip install webassets
 
-`webassets` allows to concatenate your assets and to use almost all of the
-hype tools of the moment (see the `documentation`_):
+The `webassets` module allows you to perform a number of useful asset management
+functions, including:
 
-* css minifier (`cssmin`, `yuicompressor`, ...)
-* css compiler (`less`, `sass`, ...)
-* js minifier (`uglifyjs`, `yuicompressor`, `closure`, ...)
+* CSS minifier (`cssmin`, `yuicompressor`, ...)
+* CSS compiler (`less`, `sass`, ...)
+* JS minifier (`uglifyjs`, `yuicompressor`, `closure`, ...)
 
-Others filters include gzip compression, integration of images in css with
-`datauri` and more. Webassets also append a version identifier to your asset
-url to convince browsers to download new versions of your assets when you use
-far future expires headers.
+Others filters include gzip compression, integration of images in CSS via data
+URIs, and more. `webassets` can also append a version identifier to your asset
+URL to convince browsers to download new versions of your assets when you use
+far-future expires headers. Please refer to the `webassets documentation`_ for
+more information.
 
-When using it with Pelican, `webassets` is configured to process assets in the
-``OUTPUT_PATH/theme`` directory. You can use it in your templates with a
-template tag, for example:
+When using with Pelican, `webassets` is configured to process assets in the
+``OUTPUT_PATH/theme`` directory. You can use `webassets` in your templates by
+including one or more template tags. For example...
 
 .. code-block:: jinja
 
@@ -471,22 +472,22 @@ template tag, for example:
         <link rel="stylesheet" href="{{ ASSET_URL }}">
     {% endassets %}
 
-will produce a minified css file with the version identifier:
+... will produce a minified css file with a version identifier:
 
 .. code-block:: html
 
     <link href="http://{SITEURL}/theme/css/style.min.css?b3a7c807" rel="stylesheet">
 
-The filters can be combined, for example to use the `sass` compiler and minify
-the output::
+These filters can be combined. Here is an example that uses the SASS compiler
+and minifies the output:
 
 .. code-block:: jinja
 
-{% assets filters="sass,cssmin", output="css/style.min.css", "css/style.scss" %}
-    <link rel="stylesheet" href="{{ ASSET_URL }}">
-{% endassets %}
+    {% assets filters="sass,cssmin", output="css/style.min.css", "css/style.scss" %}
+        <link rel="stylesheet" href="{{ ASSET_URL }}">
+    {% endassets %}
 
-Another example for javascript:
+Another example for Javascript:
 
 .. code-block:: jinja
 
@@ -494,20 +495,20 @@ Another example for javascript:
         <script src="{{ ASSETS_URL }}"></script>
     {% endassets %}
 
-will produce a minified and gzipped js file:
+The above will produce a minified and gzipped JS file:
 
 .. code-block:: html
 
     <script src="http://{SITEURL}/theme/js/packed.js?00703b9d"></script>
 
-Pelican's debug mode is propagated to webassets to disable asset packaging,
+Pelican's debug mode is propagated to `webassets` to disable asset packaging
 and instead work with the uncompressed assets. However, this also means that
-the `less` and `sass` files are not compiled, this should be fixed in a future
-version of webassets (cf. the related `bug report
+the LESS and SASS files are not compiled. This should be fixed in a future
+version of `webassets` (cf. the related `bug report
 <https://github.com/getpelican/pelican/issues/481>`_).
 
 .. _webassets: https://github.com/miracle2k/webassets
-.. _documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
+.. _webassets documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
 
 Example settings
 ================

From 20daa2845253bab2cd6ad09b3e9396d65f951b21 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 10 Sep 2012 20:50:45 -0700
Subject: [PATCH 0885/2864] Eliminate extraneous whitespace

---
 docs/contribute.rst     |  4 ++--
 docs/faq.rst            |  8 ++++----
 docs/importer.rst       |  2 +-
 docs/index.rst          |  4 ++--
 docs/internals.rst      |  4 ++--
 docs/pelican-themes.rst | 10 +++++-----
 docs/plugins.rst        |  2 +-
 docs/report.rst         |  4 ++--
 docs/themes.rst         | 10 +++++-----
 docs/tips.rst           |  6 +++---
 10 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 82419f17..0820d5c3 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -23,7 +23,7 @@ different projects.
 
 To create a virtual environment, use the following syntax::
 
-    $ mkvirtualenv pelican 
+    $ mkvirtualenv pelican
 
 To clone the Pelican source::
 
@@ -65,5 +65,5 @@ Try to respect what is described in the `PEP8 specification
 <http://www.python.org/dev/peps/pep-0008/>`_ when providing patches. This can be
 eased via the `pep8 <http://pypi.python.org/pypi/pep8>`_ or `flake8
 <http://pypi.python.org/pypi/flake8/>`_ tools, the latter of which in
-particular will give you some useful hints about ways in which the 
+particular will give you some useful hints about ways in which the
 code/formatting can be improved.
diff --git a/docs/faq.rst b/docs/faq.rst
index c5c751e6..e76bea6a 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -26,7 +26,7 @@ suggestions or problems you might have via IRC or the issue tracker.
 If you want to contribute, please fork `the git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make
 your changes, and issue a pull request. Someone will review your changes as soon
-as possible. Please refer to the :doc:`How to Contribute <contribute>` section 
+as possible. Please refer to the :doc:`How to Contribute <contribute>` section
 for more details.
 
 You can also contribute by creating themes and improving the documentation.
@@ -43,7 +43,7 @@ I'm creating my own theme. How do I use Pygments for syntax highlighting?
 
 Pygments adds some classes to the generated content. These classes are used by
 themes to style code syntax highlighting via CSS. Specifically, you can
-customize the appearance of your syntax highlighting via the ``.codehilite pre`` 
+customize the appearance of your syntax highlighting via the ``.codehilite pre``
 class in your theme's CSS file. To see how various styles can be used to render
 Django code, for example, you can use the demo `on the project website
 <http://pygments.org/demo/15101/>`_.
@@ -105,7 +105,7 @@ I'm getting a warning about feeds generated without SITEURL being set properly
 In order to properly generate all URLs properly in Pelican you will need to set
 ``SITEURL`` to the full path of your blog. When using ``make html`` and the
 default Makefile provided by the `pelican-quickstart` bootstrap script to test
-build your site, it's normal to see this warning since ``SITEURL`` is 
+build your site, it's normal to see this warning since ``SITEURL`` is
 deliberately left undefined. If configured properly no other ``make`` commands
 should result in this warning.
 
@@ -124,5 +124,5 @@ setting names). Here is an exact list of the renamed setting names::
 
 Older 2.x themes that referenced the old setting names may not link properly.
 In order to rectify this, please update your theme for compatibility with 3.0+
-by changing the relevant values in your template files. For an example of 
+by changing the relevant values in your template files. For an example of
 complete feed headers and usage please check out the ``simple`` theme.
diff --git a/docs/importer.rst b/docs/importer.rst
index ccf3ffe2..ba96d9c2 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -31,7 +31,7 @@ BeatifulSoup can be installed like any other Python package::
 
     $ pip install BeautifulSoup
 
-For pandoc, install a package for your operating system from the 
+For pandoc, install a package for your operating system from the
 `pandoc site <http://johnmacfarlane.net/pandoc/installing.html>`_.
 
 
diff --git a/docs/index.rst b/docs/index.rst
index 477b4342..3fc1cf9f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,7 +3,7 @@ Pelican
 
 Pelican is a static site generator, written in Python_.
 
-* Write your weblog entries directly with your editor of choice (vim!) 
+* Write your weblog entries directly with your editor of choice (vim!)
   in reStructuredText_ or Markdown_
 * Includes a simple CLI tool to (re)generate the weblog
 * Easy to interface with DVCSes and web hooks
@@ -79,4 +79,4 @@ A French version of the documentation is available at :doc:`fr/index`.
 .. _`Pelican documentation`: http://docs.getpelican.com/latest/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
 .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
-.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
\ No newline at end of file
+.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
diff --git a/docs/internals.rst b/docs/internals.rst
index 6b6f991f..a6264476 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -52,7 +52,7 @@ Take a look at the Markdown reader::
             text = open(filename)
             md = Markdown(extensions = ['meta', 'codehilite'])
             content = md.convert(text)
-            
+
             metadata = {}
             for name, value in md.Meta.items():
                 if name in _METADATA_FIELDS:
@@ -81,7 +81,7 @@ both; only the existing ones will be called.
   context is shared between all generators, and will be passed to the
   templates. For instance, the ``PageGenerator`` ``generate_context`` method
   finds all the pages, transforms them into objects, and populates the context
-  with them. Be careful *not* to output anything using this context at this 
+  with them. Be careful *not* to output anything using this context at this
   stage, as it is likely to change by the effect of other generators.
 
 * ``generate_output`` is then called. And guess what is it made for? Oh,
diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index a074a0a2..23be8355 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -64,7 +64,7 @@ In this example, we can see there are three themes available: ``notmyidea``, ``s
 Note that you can combine the ``--list`` option with the ``-v`` or ``--verbose`` option to get more verbose output, like this:
 
 .. code-block:: console
-    
+
     $ pelican-themes -v -l
     /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/notmyidea
     /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/two-column (symbolic link to `/home/skami/Dev/Python/pelican-themes/two-column')
@@ -118,7 +118,7 @@ Creating symbolic links
 To symbolically link a theme, you can use the ``-s`` or ``--symlink``, which works exactly as the ``--install`` option:
 
 .. code-block:: console
-    
+
     # pelican-themes --symlink ~/Dev/Python/pelican-themes/two-column
 
 In this example, the ``two-column`` theme is now symbolically linked to the Pelican themes path, so we can use it, but we can also modify it without having to reinstall it after each modification.
@@ -130,11 +130,11 @@ This is useful for theme development:
     $ sudo pelican-themes -s ~/Dev/Python/pelican-themes/two-column
     $ pelican ~/Blog/content -o /tmp/out -t two-column
     $ firefox /tmp/out/index.html
-    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/static/css/main.css 
+    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/static/css/main.css
     $ pelican ~/Blog/content -o /tmp/out -t two-column
     $ cp /tmp/bg.png ~/Dev/Pelican/pelican-themes/two-coumn/static/img/bg.png
     $ pelican ~/Blog/content -o /tmp/out -t two-column
-    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/templates/index.html 
+    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/templates/index.html
     $ pelican ~/Blog/content -o /tmp/out -t two-column
 
 
@@ -152,7 +152,7 @@ The ``--install``, ``--remove`` and ``--symlink`` option are not mutually exclus
                      --symlink ~/Dev/Python/pelican-themes/two-column \
                      --verbose
 
-In this example, the theme ``notmyidea-cms`` is replaced by the theme ``notmyidea-cms-fr`` 
+In this example, the theme ``notmyidea-cms`` is replaced by the theme ``notmyidea-cms-fr``
 
 
 
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 99c0429a..7743c552 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -16,7 +16,7 @@ To load plugins, you have to specify them in your settings file. You have two
 ways to do so.
 Either by specifying strings with the path to the callables::
 
-    PLUGINS = ['pelican.plugins.gravatar',] 
+    PLUGINS = ['pelican.plugins.gravatar',]
 
 Or by importing them and adding them to the list::
 
diff --git a/docs/report.rst b/docs/report.rst
index f12f3048..f3ddff31 100644
--- a/docs/report.rst
+++ b/docs/report.rst
@@ -4,7 +4,7 @@ Some history about Pelican
 .. warning::
 
     This page comes from a report the original author (Alexis Métaireau) wrote
-    right after writing Pelican, in December 2010. The information may not be 
+    right after writing Pelican, in December 2010. The information may not be
     up-to-date.
 
 Pelican is a simple static blog generator. It parses markup files
@@ -113,7 +113,7 @@ concepts. Here is what happens when calling the ``generate_context``
 method:
 
 * Read the folder “path”, looking for restructured text files, load
-  each of them, and construct a content object (``Article``) with it. To do so, 
+  each of them, and construct a content object (``Article``) with it. To do so,
   use ``Reader`` objects.
 * Update the ``context`` with all those articles.
 
diff --git a/docs/themes.rst b/docs/themes.rst
index d3dd4d9e..7598a28c 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -35,7 +35,7 @@ To make your own theme, you must follow the following structure::
 * `templates` contains all the templates that will be used to generate the content.
   I've just put the mandatory templates here; you can define your own if it helps
   you keep things organized while creating your theme.
- 
+
 Templates and variables
 =======================
 
@@ -44,7 +44,7 @@ This document describes which templates should exist in a theme, and which
 variables will be passed to each template at generation time.
 
 All templates will receive the variables defined in your settings file, if they
-are in all-caps. You can access them directly. 
+are in all-caps. You can access them directly.
 
 Common variables
 ----------------
@@ -55,14 +55,14 @@ All of these settings will be available to all templates.
 Variable        Description
 =============   ===================================================
 articles        The list of articles, ordered descending by date
-                All the elements are `Article` objects, so you can 
+                All the elements are `Article` objects, so you can
                 access their attributes (e.g. title, summary, author
                 etc.)
 dates           The same list of articles, but ordered by date,
                 ascending
 tags            A key-value dict containing the tags (the keys) and
                 the list of respective articles (the values)
-categories      A key-value dict containing the categories (keys) 
+categories      A key-value dict containing the categories (keys)
                 and the list of respective articles (values)
 pages           The list of pages
 =============   ===================================================
@@ -182,7 +182,7 @@ dates                   Articles related to this tag, but ordered by date,
                         ascending
 articles_paginator      A paginator object for the list of articles
 articles_page           The current page of articles
-dates_paginator         A paginator object for the list of articles, 
+dates_paginator         A paginator object for the list of articles,
                         ordered by date, ascending
 dates_page              The current page of articles, ordered by date,
                         ascending
diff --git a/docs/tips.rst b/docs/tips.rst
index 8905103b..abb739b1 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -12,11 +12,11 @@ file generator, we can take advantage of this.
 
 User Pages
 ----------
-GitHub allows you to create user pages in the form of ``username.github.com``. 
+GitHub allows you to create user pages in the form of ``username.github.com``.
 Whatever is created in the master branch will be published. For this purpose,
 just the output generated by Pelican needs to pushed to GitHub.
 
-So given a repository containing your articles, just run Pelican over the posts 
+So given a repository containing your articles, just run Pelican over the posts
 and deploy the master branch to GitHub::
 
     $ pelican -s pelican.conf.py ./path/to/posts -o /path/to/output
@@ -35,7 +35,7 @@ really easy, which can be installed via::
 
     $ pip install ghp-import
 
-Then, given a repository containing your articles, you would simply run 
+Then, given a repository containing your articles, you would simply run
 Pelican and upload the output to GitHub::
 
     $ pelican -s pelican.conf.py .

From 161f60e5696a9d51bedd3d774c7fd298e5980746 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 11 Sep 2012 06:50:33 -0700
Subject: [PATCH 0886/2864] Add a list of plugins to the docs. Closes #493.

---
 docs/plugins.rst                  | 106 +++++++++++++++++++++++-------
 pelican/plugins/global_license.py |   7 +-
 pelican/plugins/gravatar.py       |  10 +--
 3 files changed, 93 insertions(+), 30 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 7743c552..0808ce04 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -72,14 +72,22 @@ request if you need them!
 List of plugins
 ===============
 
-Not all the list are described here, but a few of them have been extracted from
-the Pelican core and provided in ``pelican.plugins``. They are described here:
+The following plugins are currently included with Pelican under ``pelican.plugins``:
 
-Tag cloud
----------
+* `GitHub activity`_
+* `Global license`_
+* `Gravatar`_
+* `HTML tags for reStructuredText`_
+* `Related posts`_
+* `Sitemap`_
 
-Translation
------------
+Ideas for plugins that haven't been written yet:
+
+* Tag cloud
+* Translation
+
+Plugin descriptions
+===================
 
 GitHub activity
 ---------------
@@ -112,23 +120,78 @@ variable, as in the example::
 ``github_activity`` is a list of lists. The first element is the title
 and the second element is the raw HTML from GitHub.
 
+Global license
+--------------
+
+This plugin allows you to define a LICENSE setting and adds the contents of that
+license variable to the article's context, making that variable available to use
+from within your theme's templates.
+
+Gravatar
+--------
+
+This plugin assigns the ``author_gravatar`` variable to the Gravatar URL and
+makes the variable available within the article's context. You can add
+AUTHOR_EMAIL to your settings file to define the default author's email
+address. Obviously, that email address must be associated with a Gravatar
+account.
+
+Alternatively, you can provide an email address from within article metadata::
+
+    :email:  john.doe@example.com
+
+If the email address is defined via at least one of the two methods above,
+the ``author_gravatar`` variable is added to the article's context.
+
+HTML tags for reStructuredText
+------------------------------
+
+This plugin allows you to use HTML tags from within reST documents. Following
+is a usage example, which is in this case a contact form::
+
+    .. html::
+
+        <form method="GET" action="mailto:some email">
+          <p>
+            <input type="text" placeholder="Subject" name="subject">
+            <br />
+            <textarea name="body" placeholder="Message">
+            </textarea>
+            <br />
+            <input type="reset"><input type="submit">
+          </p>
+        </form>
+
+Related posts
+-------------
+
+This plugin adds the ``related_posts`` variable to the article's context.
+To enable, add the following to your settings file::
+
+    from pelican.plugins import related_posts
+    PLUGINS = [related_posts]
+
+You can then use the ``article.related_posts`` variable in your templates.
+For example::
+
+    {% if article.related_posts %}
+        <ul>
+        {% for related_post in article.related_posts %}
+            <li>{{ related_post }}</li>
+        {% endfor %}
+        </ul>
+    {% endif %}
 
 Sitemap
 -------
 
-The plugin generates a sitemap of the blog.
-It can generates plain text sitemaps or XML sitemaps.
-
-Configuration
-"""""""""""""
-
-You can use the setting ``SITEMAP`` variable to configure the behavior of the
+The sitemap plugin generates plain-text or XML sitemaps. You can use the
+``SITEMAP`` variable in your settings file to configure the behavior of the
 plugin.
 
-The ``SITEMAP`` variable must be a Python dictionary, it can contain tree keys:
+The ``SITEMAP`` variable must be a Python dictionary, it can contain three keys:
 
-
-- ``format``, which set the output format of the plugin (``xml`` or ``txt``)
+- ``format``, which sets the output format of the plugin (``xml`` or ``txt``)
 
 - ``priorities``, which is a dictionary with three keys:
 
@@ -150,9 +213,8 @@ The ``SITEMAP`` variable must be a Python dictionary, it can contain tree keys:
 
   - ``indexes``, the update frequency of the index pages
 
-  An valid value is  ``always``, ``hourly``, ``daily``, ``weekly``, ``monthly``,
-  ``yearly`` or ``never``.
-
+  Valid frequency values are ``always``, ``hourly``, ``daily``, ``weekly``, ``monthly``,
+  ``yearly`` and ``never``.
 
 If a key is missing or a value is incorrect, it will be replaced with the
 default value.
@@ -164,11 +226,9 @@ The sitemap is saved in ``<output_path>/sitemap.<format>``.
    They are only used in the XML sitemaps.
    For more information: <http://www.sitemaps.org/protocol.html#xmlTagDefinitions>
 
+**Example**
 
-Example
-"""""""
-
-Here is an example of configuration (it's also the default settings):
+Here is an example configuration (it's also the default settings):
 
 .. code-block:: python
 
diff --git a/pelican/plugins/global_license.py b/pelican/plugins/global_license.py
index 463a93b3..9a0f5206 100644
--- a/pelican/plugins/global_license.py
+++ b/pelican/plugins/global_license.py
@@ -4,13 +4,14 @@ from pelican import signals
 License plugin for Pelican
 ==========================
 
-Simply add license variable in article's context, which contain 
-the license text.
+This plugin allows you to define a LICENSE setting and adds the contents of that
+license variable to the article's context, making that variable available to use
+from within your theme's templates.
 
 Settings:
 ---------
 
-Add LICENSE to your settings file to define default license.
+Define LICENSE in your settings file with the contents of your default license.
 
 """
 
diff --git a/pelican/plugins/gravatar.py b/pelican/plugins/gravatar.py
index 4ab8ea9c..a4d11456 100644
--- a/pelican/plugins/gravatar.py
+++ b/pelican/plugins/gravatar.py
@@ -5,20 +5,22 @@ from pelican import signals
 Gravatar plugin for Pelican
 ===========================
 
-Simply add author_gravatar variable in article's context, which contains
-the gravatar url.
+This plugin assigns the ``author_gravatar`` variable to the Gravatar URL and
+makes the variable available within the article's context.
 
 Settings:
 ---------
 
-Add AUTHOR_EMAIL to your settings file to define default author email.
+Add AUTHOR_EMAIL to your settings file to define the default author's email
+address. Obviously, that email address must be associated with a Gravatar
+account.
 
 Article metadata:
 ------------------
 
 :email:  article's author email
 
-If one of them are defined, the author_gravatar variable is added to
+If one of them are defined, the author_gravatar variable is added to the
 article's context.
 """
 

From 728d6076e51b680d3800b7089dc586a78bee7309 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 11 Sep 2012 07:29:34 -0700
Subject: [PATCH 0887/2864] Clarify docs for specifying theme. Closes #475.

---
 docs/settings.rst | 48 ++++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 0dd7f07b..30747ae0 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -373,19 +373,19 @@ Setting name (default value)                        What does it do?
                                                     alphabetical order; default lists alphabetically.)
 ================================================    =====================================================
 
-Theming
-=======
+Themes
+======
 
-Theming is addressed in a dedicated section (see :ref:`theming-pelican`).
-However, here are the settings that are related to theming.
+Creating Pelican themes is addressed in a dedicated section (see :ref:`theming-pelican`).
+However, here are the settings that are related to themes.
 
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`THEME`                                             Theme to use to produce the output. Can be the
-                                                    complete static path to a theme folder, or
-                                                    chosen between the list of default themes (see
-                                                    below)
+`THEME`                                             Theme to use to produce the output. Can be a relative
+                                                    or absolute path to a theme folder, or the name of a
+                                                    default theme or a theme installed via
+                                                    ``pelican-themes`` (see below).
 `THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
                                                     value is `static`, but if your theme has
                                                     other static paths, you can put them here.
@@ -393,22 +393,32 @@ Setting name (default value)                        What does it do?
 `WEBASSETS` (``False``)                             Asset management with `webassets` (see below)
 ================================================    =====================================================
 
-By default, two themes are available. You can specify them using the `-t` option:
+
+By default, two themes are available. You can specify them using the `THEME` setting or by passing the
+``-t`` option to the ``pelican`` command:
 
 * notmyidea
-* simple (a synonym for "full text" :)
-
-You can define your own theme too, and specify its placement in the same
-manner. (Be sure to specify the full absolute path to it.)
-
-Here is :doc:`a guide on how to create your theme <themes>`
-
-You can find a list of themes at http://github.com/getpelican/pelican-themes.
+* simple (a synonym for "plain text" :)
 
+There are a number of other themes available at http://github.com/getpelican/pelican-themes.
 Pelican comes with :doc:`pelican-themes`, a small script for managing themes.
 
-The `notmyidea` theme can make good use of the following settings. I recommend
-using them in your themes as well.
+You can define your own theme, either by starting from scratch or by duplicating
+and modifying a pre-existing theme. Here is :doc:`a guide on how to create your theme <themes>`.
+
+Following are example ways to specify your preferred theme::
+
+    # Specify name of a built-in theme
+    THEME = "notmyidea"
+    # Specify name of a theme installed via the pelican-themes tool
+    THEME = "chunk"
+    # Specify a customized theme, via path relative to the settings file
+    THEME = "themes/mycustomtheme"
+    # Specify a customized theme, via absolute path
+    THEME = "~/projects/mysite/themes/mycustomtheme"
+
+The built-in `notmyidea` theme can make good use of the following settings. Feel
+free to use them in your themes as well.
 
 =======================   =======================================================
 Setting name              What does it do ?

From 3af7e2251d36aef0862ce66fa5a4130e18fc2023 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 11 Sep 2012 09:27:26 -0700
Subject: [PATCH 0888/2864] Clarify specifying paths in settings. Closes #477.

---
 docs/settings.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 30747ae0..2db98259 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -16,6 +16,9 @@ False, None, etc.), dictionaries, or tuples should *not* be enclosed in
 quotation marks. All other values (i.e., strings) *must* be enclosed in
 quotation marks.
 
+Unless otherwise specified, settings that refer to paths can be either absolute or relative to the
+configuration file.
+
 The settings you define in the configuration file will be passed to the
 templates, which allows you to use your settings to add site-wide content.
 
@@ -58,10 +61,10 @@ Setting name (default value)                                            What doe
                                                                         Python-Markdown documentation for a complete list of
                                                                         supported extensions.
 `OUTPUT_PATH` (``'output/'``)                                           Where to output the generated files.
-`PATH` (``None``)                                                       Path to look at for input files.
-`PAGE_DIR` (``'pages'``)                                                Directory to look at for pages.
+`PATH` (``None``)                                                       Path to content directory to be processed by Pelican.
+`PAGE_DIR` (``'pages'``)                                                Directory to look at for pages, relative to `PATH`.
 `PAGE_EXCLUDES` (``()``)                                                A list of directories to exclude when looking for pages.
-`ARTICLE_DIR` (``''``)                                                  Directory to look at for articles.
+`ARTICLE_DIR` (``''``)                                                  Directory to look at for articles, relative to `PATH`.
 `ARTICLE_EXCLUDES`: (``('pages',)``)                                    A list of directories to exclude when looking for articles.
 `PDF_GENERATOR` (``False``)                                             Set to True if you want to have PDF versions
                                                                         of your documents. You will need to install

From 56e2c67f7f3907af7752bf363bb459588e646ff1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 14 Sep 2012 10:06:42 -0700
Subject: [PATCH 0889/2864] Add Typogrify to docs as optional dependency

---
 docs/getting_started.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 985718b5..85a1b559 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -69,6 +69,7 @@ Optionally:
 
 * pygments, for syntax highlighting
 * Markdown, for supporting Markdown as an input format
+* Typogrify, for typographical enhancements
 
 Kickstart a blog
 ================

From 0a1a868b378d16800719be4b9663a78021815f26 Mon Sep 17 00:00:00 2001
From: Nico Di Rocco <dirocco.nico@gmail.com>
Date: Fri, 7 Sep 2012 08:46:38 +0200
Subject: [PATCH 0890/2864] Added sourcefile generator that generates .text
 files

---
 docs/plugins.rst      | 10 +++-------
 docs/settings.rst     |  3 +++
 pelican/__init__.py   |  6 +++---
 pelican/generators.py | 10 ++++++++++
 pelican/settings.py   |  1 +
 pelican/signals.py    |  1 -
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 654b18f7..0808ce04 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -53,14 +53,10 @@ List of signals
 
 Here is the list of currently implemented signals:
 
-=========================   ============================   ===========================================================================
+=========================   ============================   =========================================
 Signal                      Arguments                      Description
-=========================   ============================   ===========================================================================
+=========================   ============================   =========================================
 initialized                 pelican object
-finalized                   pelican object                 invoked after all the generators are executed and just before pelican exits
-                                                           usefull for custom post processing actions, such as: 
-                                                           - minifying js/css assets.
-                                                           - notify/ping search engines with an updated sitemap.
 article_generate_context    article_generator, metadata
 article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
 get_generators              generators                     invoked in Pelican.get_generator_classes,
@@ -68,7 +64,7 @@ get_generators              generators                     invoked in Pelican.ge
                                                            generator in a tuple or in a list.
 pages_generate_context      pages_generator, metadata
 pages_generator_init        pages_generator                invoked in the PagesGenerator.__init__
-=========================   ============================   ===========================================================================
+=========================   ============================   =========================================
 
 The list is currently small, don't hesitate to add signals and make a pull
 request if you need them!
diff --git a/docs/settings.rst b/docs/settings.rst
index 2db98259..a0411e0b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -69,6 +69,9 @@ Setting name (default value)                                            What doe
 `PDF_GENERATOR` (``False``)                                             Set to True if you want to have PDF versions
                                                                         of your documents. You will need to install
                                                                         `rst2pdf`.
+`OUTPUT_SOURCES` (``False``)                                            Set to True if you want to copy the articles and pages in their
+                                                                        original format (e.g. Markdown or ReStructeredText) to the
+                                                                        specified OUTPUT_PATH.
 `RELATIVE_URLS` (``True``)                                              Defines whether Pelican should use document-relative URLs or
                                                                         not. If set to ``False``, Pelican will use the SITEURL
                                                                         setting to construct absolute URLs.
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0af52c44..620f8406 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,7 +9,7 @@ import argparse
 from pelican import signals
 
 from pelican.generators import (Generator, ArticlesGenerator, PagesGenerator,
-        StaticGenerator, PdfGenerator, LessCSSGenerator)
+        StaticGenerator, PdfGenerator, LessCSSGenerator, SourceFileGenerator)
 from pelican.log import init
 from pelican.settings import read_settings, _DEFAULT_CONFIG
 from pelican.utils import clean_output_dir, files_changed, file_changed, NoFilesError
@@ -179,14 +179,14 @@ class Pelican(object):
             if hasattr(p, 'generate_output'):
                 p.generate_output(writer)
 
-        signals.finalized.send(self)
-
     def get_generator_classes(self):
         generators = [StaticGenerator, ArticlesGenerator, PagesGenerator]
         if self.settings['PDF_GENERATOR']:
             generators.append(PdfGenerator)
         if self.settings['LESS_GENERATOR']:  # can be True or PATH to lessc
             generators.append(LessCSSGenerator)
+        if self.settings['OUTPUT_SOURCES']:
+            generators.append(SourceFileGenerator)
 
         for pair in signals.get_generators.send(self):
             (funct, value) = pair
diff --git a/pelican/generators.py b/pelican/generators.py
index 94edb3b2..b28e5c6d 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -491,6 +491,16 @@ class PdfGenerator(Generator):
         for page in self.context['pages']:
             self._create_pdf(page, pdf_path)
 
+class SourceFileGenerator(Generator):
+    def _create_source(self, obj, output_path):
+        filename = os.path.splitext(obj.save_as)[0]
+        dest = os.path.join(output_path, filename + '.text')
+        copy('', obj.filename, dest)
+
+    def generate_output(self, writer=None):
+        logger.info(u' Generating source files...')
+        for object in chain(self.context['articles'], self.context['pages']):
+            self._create_source(object, self.output_path)
 
 class LessCSSGenerator(Generator):
     """Compile less css files."""
diff --git a/pelican/settings.py b/pelican/settings.py
index 92c68ddc..df105673 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -32,6 +32,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'SITENAME': 'A Pelican Blog',
                    'DISPLAY_PAGES_ON_MENU': True,
                    'PDF_GENERATOR': False,
+                   'OUTPUT_SOURCES': False,
                    'DEFAULT_CATEGORY': 'misc',
                    'DEFAULT_DATE': 'fs',
                    'WITH_FUTURE_DATES': True,
diff --git a/pelican/signals.py b/pelican/signals.py
index 408d84c9..7ee88a0a 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -1,7 +1,6 @@
 from blinker import signal
 
 initialized = signal('pelican_initialized')
-finalized = signal('pelican_finalized')
 article_generate_context = signal('article_generate_context')
 article_generator_init = signal('article_generator_init')
 get_generators = signal('get_generators')

From 6466bb4384155189c765022496586a24ddb31742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <hubscher.remy@gmail.com>
Date: Mon, 17 Sep 2012 14:47:05 +0200
Subject: [PATCH 0891/2864] fix-pelican-rsync_upload-makefile

---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 4c5a4fcb..8e5c80f9 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -61,7 +61,7 @@ ssh_upload: publish
 	scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 rsync_upload: publish
-	rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+	rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR) $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
 dropbox_upload: publish
 	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)

From b1099477f958e1e2049c5a7d906349ed2ec394c7 Mon Sep 17 00:00:00 2001
From: Remi Rampin <remirampin@gmail.com>
Date: Mon, 17 Sep 2012 22:36:35 -0400
Subject: [PATCH 0892/2864] Fixed escaping in files generated from quickstart

Variables are properly escaped before they are replaced in the
templates.
---
 pelican/tools/pelican_quickstart.py       | 14 +++++++++++---
 pelican/tools/templates/pelicanconf.py.in |  6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index c8064bf1..3ec8d55c 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -167,7 +167,7 @@ Please answer the following questions so this script can generate the files need
         if ask('Do you want to upload your website using FTP?', answer=bool, default=False):
             CONF['ftp_host'] = ask('What is the hostname of your FTP server?', str, CONF['ftp_host'])
             CONF['ftp_user'] = ask('What is your username on that server?', str, CONF['ftp_user'])
-            CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ftp_target_dir']) 
+            CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ftp_target_dir'])
         if ask('Do you want to upload your website using SSH?', answer=bool, default=False):
             CONF['ssh_host'] = ask('What is the hostname of your SSH server?', str, CONF['ssh_host'])
             CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])
@@ -188,9 +188,12 @@ Please answer the following questions so this script can generate the files need
 
     try:
         with open(os.path.join(CONF['basedir'], 'pelicanconf.py'), 'w') as fd:
+            conf_python = dict()
+            for key, value in CONF.iteritems():
+                conf_python[key] = repr(value)
             for line in get_template('pelicanconf.py'):
                 template = string.Template(line)
-                fd.write(template.safe_substitute(CONF))
+                fd.write(template.safe_substitute(conf_python))
             fd.close()
     except OSError, e:
         print('Error: {0}'.format(e))
@@ -215,11 +218,16 @@ Please answer the following questions so this script can generate the files need
             print('Error: {0}'.format(e))
 
     if develop:
+        conf_shell = dict()
+        for key, value in CONF.iteritems():
+            if isinstance(value, basestring) and ' ' in value:
+                value = '"' + value.replace('"', '\\"') + '"'
+            conf_shell[key] = value
         try:
             with open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w') as fd:
                 for line in get_template('develop_server.sh'):
                     template = string.Template(line)
-                    fd.write(template.safe_substitute(CONF))
+                    fd.write(template.safe_substitute(conf_shell))
                 fd.close()
                 os.chmod((os.path.join(CONF['basedir'], 'develop_server.sh')), 0755)
         except OSError, e:
diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in
index 07e286cd..d59a7989 100644
--- a/pelican/tools/templates/pelicanconf.py.in
+++ b/pelican/tools/templates/pelicanconf.py.in
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*- #
 
-AUTHOR = u"$author"
-SITENAME = u"$sitename"
+AUTHOR = $author
+SITENAME = $sitename
 SITEURL = ''
 
 TIMEZONE = 'Europe/Paris'
 
-DEFAULT_LANG = '$lang'
+DEFAULT_LANG = $lang
 
 # Blogroll
 LINKS =  (('Pelican', 'http://docs.notmyidea.org/alexis/pelican/'),

From e096fb66fb13cfb5c5869fbd13c761255605f41a Mon Sep 17 00:00:00 2001
From: Chris Streeter <chris@chrisstreeter.com>
Date: Wed, 19 Sep 2012 10:24:51 -0700
Subject: [PATCH 0893/2864] Correctly use the right variable for webassets

According to [the webasset docs](http://webassets.readthedocs.org/en/latest/integration/jinja2.html#using-the-tag)
the variable should be `ASSET_URL` instead of `ASSETS_URL`.
---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 2db98259..4d865a7f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -505,7 +505,7 @@ Another example for Javascript:
 .. code-block:: jinja
 
     {% assets filters="uglifyjs,gzip", output="js/packed.js", "js/jquery.js", "js/base.js", "js/widgets.js" %}
-        <script src="{{ ASSETS_URL }}"></script>
+        <script src="{{ ASSET_URL }}"></script>
     {% endassets %}
 
 The above will produce a minified and gzipped JS file:

From 36e86a585412d4a00f1f6e3b88bc9a86c2a86b42 Mon Sep 17 00:00:00 2001
From: Chris Streeter <chris@chrisstreeter.com>
Date: Sun, 23 Sep 2012 13:55:22 -0700
Subject: [PATCH 0894/2864] Apply the string formatting to {TAG,CATEGORY}_FEED
 urls.

---
 pelican/themes/simple/templates/base.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 1f55a40f..c1d9cb78 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -11,16 +11,16 @@
         <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
         {% if CATEGORY_FEED_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
         {% endif %}
         {% if CATEGORY_FEED_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
         {% endif %}
         {% if TAG_FEED_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
         {% endif %}
         {% if TAG_FEED_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
         {% endif %}
         {% endblock head %}
 </head>

From cf3697199a39a8088f8fbb894d4018c5995f3842 Mon Sep 17 00:00:00 2001
From: Perry Roper <perryroper@gmail.com>
Date: Wed, 26 Sep 2012 19:58:15 +0100
Subject: [PATCH 0895/2864] Output author details in pelican_import

---
 pelican/tools/pelican_import.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index b6437c92..8b9d4adf 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -184,6 +184,8 @@ def build_header(title, date, author, categories, tags):
     header = '%s\n%s\n' % (title, '#' * len(title))
     if date:
         header += ':date: %s\n' % date
+    if author:
+        header += ':author %s\n' % author
     if categories:
         header += ':category: %s\n' % ', '.join(categories)
     if tags:
@@ -196,6 +198,8 @@ def build_markdown_header(title, date, author, categories, tags):
     header = 'Title: %s\n' % title
     if date:
         header += 'Date: %s\n' % date
+    if author:
+        header += 'Author: %s\n' % author
     if categories:
         header += 'Category: %s\n' % ', '.join(categories)
     if tags:

From 6afc9f7902168eb5f511095f860905e7d859c781 Mon Sep 17 00:00:00 2001
From: Perry Roper <perryroper@gmail.com>
Date: Wed, 26 Sep 2012 19:59:47 +0100
Subject: [PATCH 0896/2864] Add missing colon

---
 pelican/tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 8b9d4adf..a5caa301 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -185,7 +185,7 @@ def build_header(title, date, author, categories, tags):
     if date:
         header += ':date: %s\n' % date
     if author:
-        header += ':author %s\n' % author
+        header += ':author: %s\n' % author
     if categories:
         header += ':category: %s\n' % ', '.join(categories)
     if tags:

From 4f5253bcb39e0ba6feddbd091cfa48883628e5ae Mon Sep 17 00:00:00 2001
From: stephane <stephane@lutetium.(none)>
Date: Thu, 27 Sep 2012 19:49:42 +0200
Subject: [PATCH 0897/2864] Add MARKDOWN_EXTENTIONS configuration parameter to
 enable Markdown extentions of your choice. Ex: MARKDOWN_EXTENTIONS = [ 'toc',
 ] enable TOC markup to generate Table of Contents.

---
 pelican/readers.py  | 6 +++---
 pelican/settings.py | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 30038f7a..38e7834f 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -18,7 +18,6 @@ import re
 from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, pelican_open
 
-
 _METADATA_PROCESSORS = {
     'tags': lambda x, y: [Tag(tag, y) for tag in unicode(x).split(',')],
     'date': lambda x, y: get_date(x),
@@ -125,12 +124,13 @@ class RstReader(Reader):
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
     file_extensions = ['md', 'markdown', 'mkd']
-    extensions = ['codehilite', 'extra']
+    extensions = ['codehilite', 'extra' ]
 
     def read(self, filename):
         """Parse content and metadata of markdown files"""
+        markdown_extentions = self.settings.get('MARKDOWN_EXTENTIONS', [])
         text = pelican_open(filename)
-        md = Markdown(extensions=set(self.extensions + ['meta']))
+        md = Markdown(extensions=set(self.extensions + markdown_extentions + ['meta']))
         content = md.convert(text)
 
         metadata = {}
diff --git a/pelican/settings.py b/pelican/settings.py
index 92c68ddc..f2511844 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -75,6 +75,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'SUMMARY_MAX_LENGTH': 50,
                    'WEBASSETS': False,
                    'PLUGINS': [],
+                   'MARKDOWN_EXTENTIONS': [],
                    }
 
 

From a7dd21ffafb399b88183e6e71fd022d9f947f439 Mon Sep 17 00:00:00 2001
From: Nico Di Rocco <dirocco.nico@gmail.com>
Date: Fri, 28 Sep 2012 14:59:05 +0200
Subject: [PATCH 0898/2864] Added a new setting OUTPUT_SOURCES_EXTENSION

Using this configurable setting users can control what extension will be
appended to filenames by the SourcesGenerator.

The default is to use the ``.text`` extension.
---
 docs/settings.rst     |  3 +++
 pelican/generators.py |  5 ++++-
 pelican/settings.py   | 13 +++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index a0411e0b..9997f474 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -72,6 +72,9 @@ Setting name (default value)                                            What doe
 `OUTPUT_SOURCES` (``False``)                                            Set to True if you want to copy the articles and pages in their
                                                                         original format (e.g. Markdown or ReStructeredText) to the
                                                                         specified OUTPUT_PATH.
+`OUTPUT_SOURCES_EXTENSION` (``.text``)                                  Controls the extension that will be used by the SourcesGenerator.
+                                                                        Defaults to .text. If the first character is not a `.` the
+                                                                        dot character will be prepended to the extension.
 `RELATIVE_URLS` (``True``)                                              Defines whether Pelican should use document-relative URLs or
                                                                         not. If set to ``False``, Pelican will use the SITEURL
                                                                         setting to construct absolute URLs.
diff --git a/pelican/generators.py b/pelican/generators.py
index b28e5c6d..e9646825 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -492,9 +492,12 @@ class PdfGenerator(Generator):
             self._create_pdf(page, pdf_path)
 
 class SourceFileGenerator(Generator):
+    def generate_context(self):
+        self.output_extension = self.settings['OUTPUT_SOURCES_EXTENSION']
+
     def _create_source(self, obj, output_path):
         filename = os.path.splitext(obj.save_as)[0]
-        dest = os.path.join(output_path, filename + '.text')
+        dest = os.path.join(output_path, filename + self.output_extension)
         copy('', obj.filename, dest)
 
     def generate_output(self, writer=None):
diff --git a/pelican/settings.py b/pelican/settings.py
index df105673..dce1d8ac 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -33,6 +33,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'DISPLAY_PAGES_ON_MENU': True,
                    'PDF_GENERATOR': False,
                    'OUTPUT_SOURCES': False,
+                   'OUTPUT_SOURCES_EXTENSION': '.text',
                    'DEFAULT_CATEGORY': 'misc',
                    'DEFAULT_DATE': 'fs',
                    'WITH_FUTURE_DATES': True,
@@ -175,4 +176,16 @@ def configure_settings(settings, default_settings=None, filename=None):
             logger.warn("You must install the webassets module to use WEBASSETS.")
             settings['WEBASSETS'] = False
 
+    if 'OUTPUT_SOURCES_EXTENSION' in settings:
+        try:
+            if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'], str):
+                raise ValueError
+            elif '.' is not settings['OUTPUT_SOURCES_EXTENSION'][0]:
+                settings['OUTPUT_SOURCES_EXTENSION'] = '.' + settings['OUTPUT_SOURCES_EXTENSION']
+        except(ValueError, IndexError):
+            logger.warn("Detected misconfiguration with OUTPUT_SOURCES_EXTENSION."
+                       " falling back to the default extension " +
+                       _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
+            settings['OUTPUT_SOURCES_EXTENSION'] = _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION']
+
     return settings

From 55783fc3a1d6793c4674ce7d5e2e913f4d371f73 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Fri, 28 Sep 2012 08:53:59 -0700
Subject: [PATCH 0899/2864] Add sleep to no files exception to avoid CPU load

---
 pelican/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0af52c44..6281675b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -309,6 +309,7 @@ def main():
                     if files_found_error == True:
                         logger.warning("No valid files found in content. Nothing to generate.")
                         files_found_error = False
+                    time.sleep(1)  # sleep to avoid cpu load
                 except Exception, e:
                     logger.warning(
                         "Caught exception \"{}\". Reloading.".format(e)

From 226aa2d8f31125e0320e1c78c3f96ff52899b3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bunel?= <stephane@lutetium.(none)>
Date: Fri, 28 Sep 2012 22:54:01 +0200
Subject: [PATCH 0900/2864] Update docs and tests for MARKDOWN_EXTENTIONS

---
 tests/content/article_with_markdown_markup_extentions.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 tests/content/article_with_markdown_markup_extentions.md

diff --git a/tests/content/article_with_markdown_markup_extentions.md b/tests/content/article_with_markdown_markup_extentions.md
new file mode 100644
index 00000000..201cc5e9
--- /dev/null
+++ b/tests/content/article_with_markdown_markup_extentions.md
@@ -0,0 +1,8 @@
+Title: Test Markdown extentions
+
+[TOC]
+
+## Level1
+
+### Level2
+

From 45c836fdf54c38763fffd65d485b35981b0e9f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bunel?= <stephane@lutetium.(none)>
Date: Fri, 28 Sep 2012 23:09:57 +0200
Subject: [PATCH 0901/2864] Update docs and tests for MARKDOWN_EXTENTIONS

---
 docs/fr/configuration.rst |  6 ++----
 docs/settings.rst         |  2 +-
 pelican/readers.py        | 10 +++++++---
 pelican/settings.py       |  2 +-
 tests/test_readers.py     | 19 +++++++++++++++++++
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
index 151eff3a..35965ed6 100644
--- a/docs/fr/configuration.rst
+++ b/docs/fr/configuration.rst
@@ -155,7 +155,5 @@ SITEURL :
 STATIC_PATHS :
 	Les chemins statiques que vous voulez avoir accès sur le chemin de sortie "statique" ;
 
-
-
-
-
+MARKDOWN_EXTENTIONS :
+	Liste des extentions Markdown que vous souhaitez utiliser ;
diff --git a/docs/settings.rst b/docs/settings.rst
index 4d865a7f..384c1a19 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -103,7 +103,7 @@ Setting name (default value)                                            What doe
                                                                         This only applies if your content does not otherwise
                                                                         specify a summary. Setting to None will cause the summary
                                                                         to be a copy of the original content.
-
+`MARKDOWN_EXTENSIONS` (``['toc',]``)                                    A list of any Markdown extensions you want to use.
 =====================================================================   =====================================================================
 
 .. [#] Default is the system locale.
diff --git a/pelican/readers.py b/pelican/readers.py
index 38e7834f..1c2ac666 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -101,7 +101,7 @@ class RstReader(Reader):
     def _get_publisher(self, filename):
         extra_params = {'initial_header_level': '2'}
         pub = docutils.core.Publisher(
-                destination_class=docutils.io.StringOutput)
+            destination_class=docutils.io.StringOutput)
         pub.set_components('standalone', 'restructuredtext', 'html')
         pub.writer.translator_class = PelicanHTMLTranslator
         pub.process_programmatic_settings(None, extra_params, None)
@@ -124,13 +124,17 @@ class RstReader(Reader):
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
     file_extensions = ['md', 'markdown', 'mkd']
-    extensions = ['codehilite', 'extra' ]
+    extensions = ['codehilite', 'extra']
 
     def read(self, filename):
         """Parse content and metadata of markdown files"""
         markdown_extentions = self.settings.get('MARKDOWN_EXTENTIONS', [])
+        if isinstance(markdown_extentions, (str, unicode)):
+            markdown_extentions = [m.strip() for m in
+                                   markdown_extentions.split(',')]
         text = pelican_open(filename)
-        md = Markdown(extensions=set(self.extensions + markdown_extentions + ['meta']))
+        md = Markdown(extensions=set(
+            self.extensions + markdown_extentions + ['meta']))
         content = md.convert(text)
 
         metadata = {}
diff --git a/pelican/settings.py b/pelican/settings.py
index f2511844..ad0ff8fc 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -75,7 +75,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'SUMMARY_MAX_LENGTH': 50,
                    'WEBASSETS': False,
                    'PLUGINS': [],
-                   'MARKDOWN_EXTENTIONS': [],
+                   'MARKDOWN_EXTENTIONS': [ 'toc', ],
                    }
 
 
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 299aa378..d831252d 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -90,3 +90,22 @@ class MdReaderTest(unittest.TestCase):
                 "<p>This is another markdown test file.  Uses the mkd extension.</p>"
         
         self.assertEqual(content, expected)
+
+    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
+    def test_article_with_markdown_markup_extension(self):
+        # test to ensure the markdown markup extension is being processed as expected
+        reader = readers.MarkdownReader({})
+        reader.settings.update(dict(MARKDOWN_EXTENTIONS=['toc']))
+        content, metadata = reader.read(_filename('article_with_markdown_markup_extentions.md'))
+        expected = '<div class="toc">\n'\
+            '<ul>\n'\
+            '<li><a href="#level1">Level1</a><ul>\n'\
+            '<li><a href="#level2">Level2</a></li>\n'\
+            '</ul>\n'\
+            '</li>\n'\
+            '</ul>\n'\
+            '</div>\n'\
+            '<h2 id="level1">Level1</h2>\n'\
+            '<h3 id="level2">Level2</h3>'
+
+        self.assertEqual(content, expected)

From 1beff31bd87026725e0b6d8585c1fb95b3b2944d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bunel?= <stephane@lutetium.(none)>
Date: Fri, 28 Sep 2012 23:29:10 +0200
Subject: [PATCH 0902/2864] FIX test_generate_context() to include new file
 content/article_with_markdown_markup_extentions.md

---
 tests/test_generators.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index 3a4ea1e3..caad4725 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -69,6 +69,7 @@ class TestArticlesGenerator(unittest.TestCase):
             [u'Article title', 'published', 'Default', 'article'],
             [u'Article with template', 'published', 'Default', 'custom'],
             [u'Test md File', 'published', 'test', 'article'],
+            [u'Test Markdown extentions', 'published', u'Default', 'article'],
             [u'This is a super article !', 'published', 'Yeah', 'article'],
             [u'This is an article with category !', 'published', 'yeah', 'article'],
             [u'This is an article without category !', 'published', 'Default', 'article'],

From 0bb323f63cb429eef64b5381c9312b37b3864e08 Mon Sep 17 00:00:00 2001
From: Thanos Lefteris <alefteris@gmail.com>
Date: Mon, 1 Oct 2012 17:54:20 +0300
Subject: [PATCH 0903/2864] Monospace default values of settings

---
 docs/settings.rst | 62 +++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 4d865a7f..68cc4734 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -147,37 +147,37 @@ Also, you can use other file metadata attributes as well:
 
 Example usage:
 
-* ARTICLE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'
-* ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'
+* ARTICLE_URL = ``'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'``
+* ARTICLE_SAVE_AS = ``'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'``
 
 This would save your articles in something like '/posts/2011/Aug/07/sample-post/index.html',
 and the URL to this would be '/posts/2011/Aug/07/sample-post/'.
 
-================================================    =====================================================
-Setting name (default value)                        what does it do?
-================================================    =====================================================
-`ARTICLE_URL` ('{slug}.html')                       The URL to refer to an ARTICLE.
-`ARTICLE_SAVE_AS` ('{slug}.html')                   The place where we will save an article.
-`ARTICLE_LANG_URL` ('{slug}-{lang}.html')           The URL to refer to an ARTICLE which doesn't use the
-                                                    default language.
-`ARTICLE_LANG_SAVE_AS` ('{slug}-{lang}.html'        The place where we will save an article which
-                                                    doesn't use the default language.
-`PAGE_URL` ('pages/{slug}.html')                    The URL we will use to link to a page.
-`PAGE_SAVE_AS` ('pages/{slug}.html')                The location we will save the page.
-`PAGE_LANG_URL` ('pages/{slug}-{lang}.html')        The URL we will use to link to a page which doesn't
-                                                    use the default language.
-`PAGE_LANG_SAVE_AS` ('pages/{slug}-{lang}.html')    The location we will save the page which doesn't
-                                                    use the default language.
-`AUTHOR_URL` ('author/{name}.html')                 The URL to use for an author.
-`AUTHOR_SAVE_AS` ('author/{name}.html')             The location to save an author.
-`CATEGORY_URL` ('category/{name}.html')             The URL to use for a category.
-`CATEGORY_SAVE_AS` ('category/{name}.html')         The location to save a category.
-`TAG_URL` ('tag/{name}.html')                       The URL to use for a tag.
-`TAG_SAVE_AS` ('tag/{name}.html')                   The location to save the tag page.
-`<DIRECT_TEMPLATE_NAME>_SAVE_AS`                    The location to save content generated from direct
-                                                    templates. Where <DIRECT_TEMPLATE_NAME> is the
-                                                    upper case template name.
-================================================    =====================================================
+====================================================    =====================================================
+Setting name (default value)                            What does it do?
+====================================================    =====================================================
+`ARTICLE_URL` (``'{slug}.html'``)                       The URL to refer to an ARTICLE.
+`ARTICLE_SAVE_AS` (``'{slug}.html'``)                   The place where we will save an article.
+`ARTICLE_LANG_URL` (``'{slug}-{lang}.html'``)           The URL to refer to an ARTICLE which doesn't use the
+                                                        default language.
+`ARTICLE_LANG_SAVE_AS` (``'{slug}-{lang}.html'``)       The place where we will save an article which
+                                                        doesn't use the default language.
+`PAGE_URL` (``'pages/{slug}.html'``)                    The URL we will use to link to a page.
+`PAGE_SAVE_AS` (``'pages/{slug}.html'``)                The location we will save the page.
+`PAGE_LANG_URL` (``'pages/{slug}-{lang}.html'``)        The URL we will use to link to a page which doesn't
+                                                        use the default language.
+`PAGE_LANG_SAVE_AS` (``'pages/{slug}-{lang}.html'``)    The location we will save the page which doesn't
+                                                        use the default language.
+`AUTHOR_URL` (``'author/{name}.html'``)                 The URL to use for an author.
+`AUTHOR_SAVE_AS` (``'author/{name}.html'``)             The location to save an author.
+`CATEGORY_URL` (``'category/{name}.html'``)             The URL to use for a category.
+`CATEGORY_SAVE_AS` (``'category/{name}.html'``)         The location to save a category.
+`TAG_URL` (``'tag/{name}.html'``)                       The URL to use for a tag.
+`TAG_SAVE_AS` (``'tag/{name}.html'``)                   The location to save the tag page.
+`<DIRECT_TEMPLATE_NAME>_SAVE_AS`                        The location to save content generated from direct
+                                                        templates. Where <DIRECT_TEMPLATE_NAME> is the
+                                                        upper case template name.
+====================================================    =====================================================
 
 .. note::
 
@@ -316,10 +316,10 @@ You can use the following settings to configure the pagination.
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`DEFAULT_ORPHANS` (0)                               The minimum number of articles allowed on the
+`DEFAULT_ORPHANS` (``0``)                           The minimum number of articles allowed on the
                                                     last page. Use this when you don't want to
                                                     have a last page with very few articles.
-`DEFAULT_PAGINATION` (False)                        The maximum number of articles to include on a
+`DEFAULT_PAGINATION` (``False``)                    The maximum number of articles to include on a
                                                     page, not including orphans. False to disable
                                                     pagination.
 ================================================    =====================================================
@@ -333,9 +333,9 @@ following settings.
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`TAG_CLOUD_STEPS` (4)                               Count of different font sizes in the tag
+`TAG_CLOUD_STEPS` (``4``)                           Count of different font sizes in the tag
                                                     cloud.
-`TAG_CLOUD_MAX_ITEMS` (100)                         Maximum number of tags in the cloud.
+`TAG_CLOUD_MAX_ITEMS` (``100``)                     Maximum number of tags in the cloud.
 ================================================    =====================================================
 
 The default theme does not support tag clouds, but it is pretty easy to add::

From 15875b8bd1ed2f143925121fc8e06595ff0f78b1 Mon Sep 17 00:00:00 2001
From: "Brian St. Pierre" <brian@bstpierre.org>
Date: Mon, 1 Oct 2012 19:46:02 -0400
Subject: [PATCH 0904/2864] Fix DELETE_OUTPUT_DIRECTORY crash when no output
 dir

---
 pelican/utils.py    | 11 +++++++++++
 tests/test_utils.py | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/pelican/utils.py b/pelican/utils.py
index 60ecee34..7e9ab4cb 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -97,6 +97,17 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
 def clean_output_dir(path):
     """Remove all the files from the output directory"""
 
+    if not os.path.exists(path):
+        logger.debug("Directory already removed: %s" % path)
+        return
+
+    if not os.path.isdir(path):
+        try:
+            os.remove(path)
+        except Exception, e:
+            logger.error("Unable to delete file %s; %e" % path, e)
+        return
+
     # remove all the existing content from the output folder
     for filename in os.listdir(path):
         file = os.path.join(path, filename)
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 148e322a..58118d4f 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -112,3 +112,16 @@ class TestUtils(unittest.TestCase):
         self.assertTrue(os.path.isdir(test_directory))
         self.assertListEqual([], os.listdir(test_directory))
         shutil.rmtree(test_directory)
+
+    def test_clean_output_dir_not_there(self):
+        test_directory = os.path.join(os.path.dirname(__file__), 'does_not_exist')
+        utils.clean_output_dir(test_directory)
+        self.assertTrue(not os.path.exists(test_directory))
+
+    def test_clean_output_dir_is_file(self):
+        test_directory = os.path.join(os.path.dirname(__file__), 'this_is_a_file')
+        f = open(test_directory, 'w')
+        f.write('')
+        f.close()
+        utils.clean_output_dir(test_directory)
+        self.assertTrue(not os.path.exists(test_directory))

From 01293dedaa0c676bd98efed202d486f60c7cbb0d Mon Sep 17 00:00:00 2001
From: "Brian St. Pierre" <brian@bstpierre.org>
Date: Mon, 1 Oct 2012 20:32:18 -0400
Subject: [PATCH 0905/2864] Fix #530: FILES_TO_COPY error when dest dir missing

If the destination directory specified by FILES_TO_COPY does not
exist, site generation crashes with a CRITICAL error. This creates the
destination if it does not exist.
---
 pelican/utils.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pelican/utils.py b/pelican/utils.py
index 60ecee34..a95b9c7d 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -90,6 +90,12 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
                 logger.info('replacement of %s with %s' % (source_, destination_))
 
     elif os.path.isfile(source_):
+        try:
+            dest_dir = os.path.dirname(destination_)
+            if not os.path.exists(dest_dir):
+                os.makedirs(dest_dir)
+        except OSError, e:
+            logger.error("copying: %s -> %s: %r" % (source_, dest_dir, e))
         shutil.copy(source_, destination_)
         logger.info('copying %s to %s' % (source_, destination_))
 

From c53a06a5d5183ce54bd94262b3af30611a59ee86 Mon Sep 17 00:00:00 2001
From: Nico Di Rocco <dirocco.nico@gmail.com>
Date: Wed, 3 Oct 2012 22:06:45 +0200
Subject: [PATCH 0906/2864] Simplified configuration option to be more flexible

As @ametaireau suggested: instead of having logic that prepends the
OUTPUT_SOURCES_EXTENSION with a '.' we allow the user more
flexibility to control the extension that can be used.
---
 docs/settings.rst   | 4 ++--
 pelican/settings.py | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9997f474..e9bf54ff 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -73,8 +73,8 @@ Setting name (default value)                                            What doe
                                                                         original format (e.g. Markdown or ReStructeredText) to the
                                                                         specified OUTPUT_PATH.
 `OUTPUT_SOURCES_EXTENSION` (``.text``)                                  Controls the extension that will be used by the SourcesGenerator.
-                                                                        Defaults to .text. If the first character is not a `.` the
-                                                                        dot character will be prepended to the extension.
+                                                                        Defaults to ``.text``. If not a valid string the default value
+                                                                        will be used.
 `RELATIVE_URLS` (``True``)                                              Defines whether Pelican should use document-relative URLs or
                                                                         not. If set to ``False``, Pelican will use the SITEURL
                                                                         setting to construct absolute URLs.
diff --git a/pelican/settings.py b/pelican/settings.py
index dce1d8ac..cd76aa22 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -177,15 +177,10 @@ def configure_settings(settings, default_settings=None, filename=None):
             settings['WEBASSETS'] = False
 
     if 'OUTPUT_SOURCES_EXTENSION' in settings:
-        try:
-            if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'], str):
-                raise ValueError
-            elif '.' is not settings['OUTPUT_SOURCES_EXTENSION'][0]:
-                settings['OUTPUT_SOURCES_EXTENSION'] = '.' + settings['OUTPUT_SOURCES_EXTENSION']
-        except(ValueError, IndexError):
+        if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'], str):
+            settings['OUTPUT_SOURCES_EXTENSION'] = _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION']
             logger.warn("Detected misconfiguration with OUTPUT_SOURCES_EXTENSION."
                        " falling back to the default extension " +
                        _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
-            settings['OUTPUT_SOURCES_EXTENSION'] = _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION']
 
     return settings

From d9d58b0510801327e634e988108f3682ffa20905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bunel?= <stephane@lutetium.(none)>
Date: Wed, 3 Oct 2012 22:28:00 +0200
Subject: [PATCH 0907/2864] FIX: "extentions" -> "extensions"

---
 ...p_extentions.md => article_with_markdown_markup_extensions.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/content/{article_with_markdown_markup_extentions.md => article_with_markdown_markup_extensions.md} (100%)

diff --git a/tests/content/article_with_markdown_markup_extentions.md b/tests/content/article_with_markdown_markup_extensions.md
similarity index 100%
rename from tests/content/article_with_markdown_markup_extentions.md
rename to tests/content/article_with_markdown_markup_extensions.md

From ee46becaf9e7c4c585d9f8b3fd5f112bf9ef11df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bunel?= <stephane@lutetium.(none)>
Date: Wed, 3 Oct 2012 22:29:59 +0200
Subject: [PATCH 0908/2864] FIX: Standardizing "extentions" to "extensions"

---
 pelican/readers.py       | 10 +++++-----
 pelican/settings.py      |  2 +-
 tests/test_generators.py |  2 +-
 tests/test_readers.py    |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 1c2ac666..55d5ceaa 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -128,13 +128,13 @@ class MarkdownReader(Reader):
 
     def read(self, filename):
         """Parse content and metadata of markdown files"""
-        markdown_extentions = self.settings.get('MARKDOWN_EXTENTIONS', [])
-        if isinstance(markdown_extentions, (str, unicode)):
-            markdown_extentions = [m.strip() for m in
-                                   markdown_extentions.split(',')]
+        markdown_extensions = self.settings.get('MARKDOWN_EXTENsIONS', [])
+        if isinstance(markdown_extensions, (str, unicode)):
+            markdown_extensions = [m.strip() for m in
+                                   markdown_extensions.split(',')]
         text = pelican_open(filename)
         md = Markdown(extensions=set(
-            self.extensions + markdown_extentions + ['meta']))
+            self.extensions + markdown_extensions + ['meta']))
         content = md.convert(text)
 
         metadata = {}
diff --git a/pelican/settings.py b/pelican/settings.py
index ad0ff8fc..c454c27b 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -75,7 +75,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'SUMMARY_MAX_LENGTH': 50,
                    'WEBASSETS': False,
                    'PLUGINS': [],
-                   'MARKDOWN_EXTENTIONS': [ 'toc', ],
+                   'MARKDOWN_EXTENSIONS': ['toc', ],
                    }
 
 
diff --git a/tests/test_generators.py b/tests/test_generators.py
index caad4725..374172d8 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -69,7 +69,7 @@ class TestArticlesGenerator(unittest.TestCase):
             [u'Article title', 'published', 'Default', 'article'],
             [u'Article with template', 'published', 'Default', 'custom'],
             [u'Test md File', 'published', 'test', 'article'],
-            [u'Test Markdown extentions', 'published', u'Default', 'article'],
+            [u'Test Markdown extensions', 'published', u'Default', 'article'],
             [u'This is a super article !', 'published', 'Yeah', 'article'],
             [u'This is an article with category !', 'published', 'yeah', 'article'],
             [u'This is an article without category !', 'published', 'Default', 'article'],
diff --git a/tests/test_readers.py b/tests/test_readers.py
index d831252d..1b3a879c 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -95,8 +95,8 @@ class MdReaderTest(unittest.TestCase):
     def test_article_with_markdown_markup_extension(self):
         # test to ensure the markdown markup extension is being processed as expected
         reader = readers.MarkdownReader({})
-        reader.settings.update(dict(MARKDOWN_EXTENTIONS=['toc']))
-        content, metadata = reader.read(_filename('article_with_markdown_markup_extentions.md'))
+        reader.settings.update(dict(MARKDOWN_EXTENSIONS=['toc']))
+        content, metadata = reader.read(_filename('article_with_markdown_markup_extensions.md'))
         expected = '<div class="toc">\n'\
             '<ul>\n'\
             '<li><a href="#level1">Level1</a><ul>\n'\

From e0674aad874bcbe64a2a4e0504d84f3363e71b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bunel?= <stephane@lutetium.(none)>
Date: Wed, 3 Oct 2012 22:37:18 +0200
Subject: [PATCH 0909/2864] FIX: Standardizing "extentions" to "extensions"

---
 docs/fr/configuration.rst                                | 2 +-
 tests/content/article_with_markdown_markup_extensions.md | 2 +-
 tests/test_readers.py                                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
index 35965ed6..abfc7ef5 100644
--- a/docs/fr/configuration.rst
+++ b/docs/fr/configuration.rst
@@ -155,5 +155,5 @@ SITEURL :
 STATIC_PATHS :
 	Les chemins statiques que vous voulez avoir accès sur le chemin de sortie "statique" ;
 
-MARKDOWN_EXTENTIONS :
+MARKDOWN_EXTENSIONS :
 	Liste des extentions Markdown que vous souhaitez utiliser ;
diff --git a/tests/content/article_with_markdown_markup_extensions.md b/tests/content/article_with_markdown_markup_extensions.md
index 201cc5e9..6cf56403 100644
--- a/tests/content/article_with_markdown_markup_extensions.md
+++ b/tests/content/article_with_markdown_markup_extensions.md
@@ -1,4 +1,4 @@
-Title: Test Markdown extentions
+Title: Test Markdown extensions
 
 [TOC]
 
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 1b3a879c..38b7197a 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -70,7 +70,7 @@ class RstReaderTest(unittest.TestCase):
 class MdReaderTest(unittest.TestCase):
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
-    def test_article_with_md_extention(self):
+    def test_article_with_md_extension(self):
         # test to ensure the md extension is being processed by the correct reader
         reader = readers.MarkdownReader({})
         content, metadata = reader.read(_filename('article_with_md_extension.md'))

From 5e895317f6ba250f2fd80d6e77a67c42035d4706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bunel?= <stephane@lutetium.(none)>
Date: Wed, 3 Oct 2012 22:42:07 +0200
Subject: [PATCH 0910/2864] FIX: Standardizing "extentions" to "extensions"

---
 pelican/readers.py    | 2 +-
 tests/test_readers.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 55d5ceaa..c53ff5b1 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -128,7 +128,7 @@ class MarkdownReader(Reader):
 
     def read(self, filename):
         """Parse content and metadata of markdown files"""
-        markdown_extensions = self.settings.get('MARKDOWN_EXTENsIONS', [])
+        markdown_extensions = self.settings.get('MARKDOWN_EXTENSIONS', [])
         if isinstance(markdown_extensions, (str, unicode)):
             markdown_extensions = [m.strip() for m in
                                    markdown_extensions.split(',')]
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 38b7197a..406027c1 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -95,7 +95,7 @@ class MdReaderTest(unittest.TestCase):
     def test_article_with_markdown_markup_extension(self):
         # test to ensure the markdown markup extension is being processed as expected
         reader = readers.MarkdownReader({})
-        reader.settings.update(dict(MARKDOWN_EXTENSIONS=['toc']))
+        reader.settings.update(dict(MARKDOWN_EXTENSIONS=['toc', ]))
         content, metadata = reader.read(_filename('article_with_markdown_markup_extensions.md'))
         expected = '<div class="toc">\n'\
             '<ul>\n'\

From b1f65f6c9f702011df4a8719d016b943282fbac4 Mon Sep 17 00:00:00 2001
From: "Brian St. Pierre" <brian@bstpierre.org>
Date: Sat, 6 Oct 2012 22:34:49 -0400
Subject: [PATCH 0911/2864] Fix #535: pagination on files without an extension

---
 pelican/writers.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 75971ee9..65f0b338 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -148,9 +148,9 @@ class Writer(object):
                     paginators[key] = Paginator(object_list, len(object_list))
 
             # generated pages, and write
+            name_root, ext = os.path.splitext(name)
             for page_num in range(paginators.values()[0].num_pages):
                 paginated_localcontext = localcontext.copy()
-                paginated_name = name
                 for key in paginators.iterkeys():
                     paginator = paginators[key]
                     page = paginator.page(page_num + 1)
@@ -158,9 +158,10 @@ class Writer(object):
                             {'%s_paginator' % key: paginator,
                              '%s_page' % key: page})
                 if page_num > 0:
-                    ext = '.' + paginated_name.rsplit('.')[-1]
-                    paginated_name = paginated_name.replace(ext,
-                        '%s%s' % (page_num + 1, ext))
+                    paginated_name = '%s%s%s' % (
+                        name_root, page_num + 1, ext)
+                else:
+                    paginated_name = name
 
                 _write_file(template, paginated_localcontext, self.output_path,
                     paginated_name)

From 3606debb1574051505ab25e56ee311f43dd18f0b Mon Sep 17 00:00:00 2001
From: "Brian St. Pierre" <brian@bstpierre.org>
Date: Sun, 7 Oct 2012 20:31:20 -0400
Subject: [PATCH 0912/2864] Fix #537: sitemap.xml contains pages that don't
 exist

---
 pelican/plugins/sitemap.py | 57 +++++++++++++-------------------------
 1 file changed, 20 insertions(+), 37 deletions(-)

diff --git a/pelican/plugins/sitemap.py b/pelican/plugins/sitemap.py
index 6402ba9c..07747760 100644
--- a/pelican/plugins/sitemap.py
+++ b/pelican/plugins/sitemap.py
@@ -1,3 +1,4 @@
+import collections
 import os.path
 
 from datetime import datetime
@@ -16,34 +17,6 @@ XML_HEADER = u"""<?xml version="1.0" encoding="utf-8"?>
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
          xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-
-  <url>
-    <loc>{0}/index.html</loc>
-    <lastmod>{1}</lastmod>
-    <changefreq>{2}</changefreq>
-    <priority>{3}</priority>
-  </url>
-
-  <url>
-    <loc>{0}/archives.html</loc>
-    <lastmod>{1}</lastmod>
-    <changefreq>{2}</changefreq>
-    <priority>{3}</priority>
-  </url>
-
-  <url>
-    <loc>{0}/tags.html</loc>
-    <lastmod>{1}</lastmod>
-    <changefreq>{2}</changefreq>
-    <priority>{3}</priority>
-  </url>
-
-  <url>
-    <loc>{0}/categories.html</loc>
-    <lastmod>{1}</lastmod>
-    <changefreq>{2}</changefreq>
-    <priority>{3}</priority>
-  </url>
 """
 
 XML_URL = u"""
@@ -146,6 +119,10 @@ class SitemapGenerator(object):
         if getattr(page, 'status', 'published') != 'published':
             return
 
+        page_path = os.path.join(self.output_path, page.url)
+        if not os.path.exists(page_path):
+            return
+
         lastmod = format_date(getattr(page, 'date', self.now))
 
         if isinstance(page, contents.Article):
@@ -176,22 +153,29 @@ class SitemapGenerator(object):
         for article in self.context['articles']:
             pages += article.translations
 
-
         info('writing {0}'.format(path))
 
         with open(path, 'w', encoding='utf-8') as fd:
 
             if self.format == 'xml':
-                fd.write(XML_HEADER.format(
-                        self.siteurl,
-                        format_date(self.now),
-                        self.changefreqs['indexes'],
-                        self.priorities['indexes']
-                    )
-                )
+                fd.write(XML_HEADER)
             else:
                 fd.write(TXT_HEADER.format(self.siteurl))
 
+            FakePage = collections.namedtuple('FakePage',
+                                              ['status',
+                                               'date',
+                                               'url'])
+
+            for standard_page_url in ['index.html',
+                                      'archives.html',
+                                      'tags.html',
+                                      'categories.html']:
+                fake = FakePage(status='published',
+                                date=self.now,
+                                url=standard_page_url)
+                self.write_url(fake, fd)
+
             for page in pages:
                 self.write_url(page, fd)
 
@@ -199,7 +183,6 @@ class SitemapGenerator(object):
                 fd.write(XML_FOOTER)
 
 
-
 def get_generators(generators):
     return SitemapGenerator
 

From b9c0f07f57488a8f07ea14f3cee2e6a30f13e6a5 Mon Sep 17 00:00:00 2001
From: Wladislaw Merezhko <infinitylx@infinitylx.org.ua>
Date: Sat, 18 Aug 2012 20:32:43 +0300
Subject: [PATCH 0913/2864] Fixing pdf generation issue

---
 pelican/generators.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index de10a126..6fe1ad57 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -6,6 +6,7 @@ import logging
 import datetime
 import subprocess
 
+from codecs import open
 from collections import defaultdict
 from functools import partial
 from itertools import chain
@@ -16,7 +17,7 @@ from jinja2.exceptions import TemplateNotFound
 
 from pelican.contents import Article, Page, Category, is_valid_content
 from pelican.readers import read_file
-from pelican.utils import copy, process_translations, open
+from pelican.utils import copy, process_translations
 from pelican import signals
 
 
@@ -272,7 +273,7 @@ class ArticlesGenerator(Generator):
             if 'category' not in metadata:
 
                 if os.path.dirname(f) == article_path:  # if the article is not in a subdirectory
-                    category = self.settings['DEFAULT_CATEGORY'] 
+                    category = self.settings['DEFAULT_CATEGORY']
                 else:
                     category = os.path.basename(os.path.dirname(f))\
                                 .decode('utf-8')
@@ -355,7 +356,7 @@ class ArticlesGenerator(Generator):
 
         self.authors = list(self.authors.items())
         self.authors.sort(key=lambda item: item[0].name)
-            
+
         self._update_context(('articles', 'dates', 'tags', 'categories',
                               'tag_cloud', 'authors', 'related_posts'))
 
@@ -373,7 +374,7 @@ class PagesGenerator(Generator):
         self.hidden_translations = []
         super(PagesGenerator, self).__init__(*args, **kwargs)
         signals.pages_generator_init.send(self)
- 
+
     def generate_context(self):
         all_pages = []
         hidden_pages = []
@@ -470,7 +471,7 @@ class PdfGenerator(Generator):
             output_pdf = os.path.join(output_path, filename)
             # print "Generating pdf for", obj.filename, " in ", output_pdf
             with open(obj.filename) as f:
-                self.pdfcreator.createPdf(text=f, output=output_pdf)
+                self.pdfcreator.createPdf(text=f.read(), output=output_pdf)
             logger.info(u' [ok] writing %s' % output_pdf)
 
     def generate_context(self):

From 519d664a40c1a0adaa1208b93cecf9d82c2ec1e3 Mon Sep 17 00:00:00 2001
From: Nico Di Rocco <dirocco.nico@gmail.com>
Date: Wed, 22 Aug 2012 23:05:07 +0200
Subject: [PATCH 0914/2864] Added a new signal `finalized` that is dispatched
 when pelican finishes.

This signal can then be used for post processing.
---
 docs/plugins.rst    | 1 +
 pelican/__init__.py | 2 ++
 pelican/signals.py  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 53858668..bce17ddb 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -57,6 +57,7 @@ Here is the list of currently implemented signals:
 Signal                      Arguments                      Description
 =========================   ============================   =========================================
 initialized                 pelican object
+finalized                   pelican object
 article_generate_context    article_generator, metadata
 article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
 pages_generate_context      pages_generator, metadata
diff --git a/pelican/__init__.py b/pelican/__init__.py
index a69752d8..056612a8 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -179,6 +179,8 @@ class Pelican(object):
             if hasattr(p, 'generate_output'):
                 p.generate_output(writer)
 
+        signals.finalized.send(self)
+
     def get_generator_classes(self):
         generators = [StaticGenerator, ArticlesGenerator, PagesGenerator]
         if self.settings['PDF_GENERATOR']:
diff --git a/pelican/signals.py b/pelican/signals.py
index 4d9ab512..ddd59621 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -1,6 +1,7 @@
 from blinker import signal
 
 initialized = signal('pelican_initialized')
+finalized = signal('pelican_finalized')
 article_generate_context = signal('article_generate_context')
 article_generator_init = signal('article_generator_init')
 pages_generate_context = signal('pages_generate_context')

From 5e45aaab784999aa6af0b314201d4a65902e1d40 Mon Sep 17 00:00:00 2001
From: Dirk Makowski <dmakowski@gmx.net>
Date: Tue, 28 Aug 2012 00:38:17 +0200
Subject: [PATCH 0915/2864] Patch to allow relative ASSET_URL Previously,
 webassets' ASSET_URL always was absolute. This patch allows a relative
 ASSET_URL, depending on Pelican's RELATIVE_URLS setting.

Hint for templates:
-------------------
Current version of webassets seem to remove any relative
paths at the beginning of the URL. So, if RELATIVE_URLS
is on, ASSET_URL will start with 'theme/', regardless if we
set assets_url here to './theme/' or to 'theme/'.
XXX However, this breaks the ASSET_URL if user navigates to
a sub-URL, e.g. if he clicks on a category. To workaround this
issue, I use
    <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
instead of
    <link rel="stylesheet" href="{{ ASSET_URL }}">

Maybe this hint is worth to be included in the documentation.
I have it also written as comments in the source.
---
 pelican/generators.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 6fe1ad57..ed2bbe96 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -433,7 +433,23 @@ class StaticGenerator(Generator):
             # Define the assets environment that will be passed to the
             # generators. The StaticGenerator must then be run first to have
             # the assets in the output_path before generating the templates.
-            assets_url = self.settings['SITEURL'] + '/theme/'
+
+            # Let ASSET_URL honor Pelican's RELATIVE_URLS setting.
+            # Hint for templates:
+            # Current version of webassets seem to remove any relative
+            # paths at the beginning of the URL. So, if RELATIVE_URLS
+            # is on, ASSET_URL will start with 'theme/', regardless if we
+            # set assets_url here to './theme/' or to 'theme/'.
+            # XXX However, this breaks the ASSET_URL if user navigates to
+            # a sub-URL, e.g. if he clicks on a category. To workaround this
+            # issue, I use
+            #     <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
+            # instead of
+            #     <link rel="stylesheet" href="{{ ASSET_URL }}">
+            if self.settings.get('RELATIVE_URLS'):
+                assets_url = './theme/'
+            else:
+                assets_url = self.settings['SITEURL'] + '/theme/'
             assets_src = os.path.join(self.output_path, 'theme')
             self.assets_env = AssetsEnvironment(assets_src, assets_url)
 

From 966065767ae08bdd738985822dfdb45794a1c985 Mon Sep 17 00:00:00 2001
From: Nico Di Rocco <dirocco.nico@gmail.com>
Date: Fri, 31 Aug 2012 22:17:19 +0200
Subject: [PATCH 0916/2864] Added description for the finalized signal in the
 docs

---
 docs/plugins.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index bce17ddb..f95cb684 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -53,16 +53,16 @@ List of signals
 
 Here is the list of currently implemented signals:
 
-=========================   ============================   =========================================
+=========================   ============================   ===========================================================================
 Signal                      Arguments                      Description
-=========================   ============================   =========================================
+=========================   ============================   ===========================================================================
 initialized                 pelican object
-finalized                   pelican object
+finalized                   pelican object                 invoked after all the generators are executed and just before pelican exits
 article_generate_context    article_generator, metadata
 article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
 pages_generate_context      pages_generator, metadata
 pages_generator_init        pages_generator                invoked in the PagesGenerator.__init__
-=========================   ============================   =========================================
+=========================   ============================   ===========================================================================
 
 The list is currently small, don't hesitate to add signals and make a pull
 request if you need them!

From 0073c64e217ede34c411f90f601f5c03f3bab3c6 Mon Sep 17 00:00:00 2001
From: m-r-r <raybaudroigm@gmail.com>
Date: Tue, 21 Aug 2012 13:08:21 +0200
Subject: [PATCH 0917/2864] Sitemap plugin & `get_generators` signal

This is a combination of 13 commits:

1. New signal for registering custom generators
2. New plugin: pelican.plugins.sitemap
3. pelican.plugins.sitemap: more settings
4. pelican.plugins.sitemap: translations are indexed
5. pelican.plugins.sitemap: added documentation
6. pelican.plugins.sitemap: added XML DTD & W3C dates
7. pelican.plugins.sitemap: removed a <changefreq> bug
8. the `get_generators` can now return a tuple
9. pelican.plugins.sitemap: cleaned the code
10. pelican.plugin.sitemap: settings changes
11. sitemap plugin: improved configuration & documentation
12. sitemap plugin: :set spell
13. sitemap plugin: removed useless whitespaces
---
 docs/plugins.rst           |  79 ++++++++++++++
 pelican/__init__.py        |  14 ++-
 pelican/plugins/sitemap.py | 208 +++++++++++++++++++++++++++++++++++++
 pelican/signals.py         |   1 +
 4 files changed, 301 insertions(+), 1 deletion(-)
 create mode 100644 pelican/plugins/sitemap.py

diff --git a/docs/plugins.rst b/docs/plugins.rst
index f95cb684..a90d077e 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -60,6 +60,9 @@ initialized                 pelican object
 finalized                   pelican object                 invoked after all the generators are executed and just before pelican exits
 article_generate_context    article_generator, metadata
 article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
+get_generators              generators                     invoked in Pelican.get_generator_classes,
+                                                           can return a Generator, or several
+                                                           generator in a tuple or in a list.
 pages_generate_context      pages_generator, metadata
 pages_generator_init        pages_generator                invoked in the PagesGenerator.__init__
 =========================   ============================   ===========================================================================
@@ -109,3 +112,79 @@ variable, as in the example::
 
 ``github_activity`` is a list of lists. The first element is the title
 and the second element is the raw HTML from GitHub.
+
+
+Sitemap
+-------
+
+The plugin generates a sitemap of the blog.
+It can generates plain text sitemaps or XML sitemaps.
+
+Configuration
+"""""""""""""
+
+You can use the setting ``SITEMAP`` variable to configure the behavior of the
+plugin.
+
+The ``SITEMAP`` variable must be a Python dictionary, it can contain tree keys:
+
+
+- ``format``, which set the output format of the plugin (``xml`` or ``txt``)
+
+- ``priorities``, which is a dictionary with three keys:
+
+  - ``articles``, the priority for the URLs of the articles and their
+    translations
+
+  - ``pages``, the priority for the URLs of the static pages
+
+  - ``indexes``, the priority for the URLs of the index pages, such as tags,
+     author pages, categories indexes, archives, etc...
+
+  All the values of this dictionary must be decimal numbers between ``0`` and ``1``.
+
+- ``changefreqs``, which is a dictionary with three items:
+
+  - ``articles``, the update frequency of the articles
+
+  - ``pages``, the update frequency of the pages
+
+  - ``indexes``, the update frequency of the index pages
+
+  An valid value is  ``always``, ``hourly``, ``daily``, ``weekly``, ``monthly``,
+  ``yearly`` or ``never``.
+
+
+If a key is missing or a value is incorrect, it will be replaced with the
+default value.
+
+The sitemap is saved in ``<output_path>/sitemap.<format>``.
+
+.. note::
+   ``priorities`` and ``changefreqs`` are informations for search engines.
+   They are only used in the XML sitemaps.
+   For more information: <http://www.sitemaps.org/protocol.html#xmlTagDefinitions>
+
+
+Example
+"""""""
+
+Here is an example of configuration (it's also the default settings):
+
+.. code-block:: python
+
+    PLUGINS=['pelican.plugins.sitemap',]
+
+    SITEMAP = {
+        'format': 'xml',
+        'priorities': {
+            'articles': 0.5,
+            'indexes': 0.5,
+            'pages': 0.5
+        },
+        'changefreqs': {
+            'articles': 'monthly',
+            'indexes': 'daily',
+            'pages': 'monthly'
+        }
+    }
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 056612a8..0af52c44 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -8,7 +8,7 @@ import argparse
 
 from pelican import signals
 
-from pelican.generators import (ArticlesGenerator, PagesGenerator,
+from pelican.generators import (Generator, ArticlesGenerator, PagesGenerator,
         StaticGenerator, PdfGenerator, LessCSSGenerator)
 from pelican.log import init
 from pelican.settings import read_settings, _DEFAULT_CONFIG
@@ -187,6 +187,18 @@ class Pelican(object):
             generators.append(PdfGenerator)
         if self.settings['LESS_GENERATOR']:  # can be True or PATH to lessc
             generators.append(LessCSSGenerator)
+
+        for pair in signals.get_generators.send(self):
+            (funct, value) = pair
+
+            if not isinstance(value, (tuple, list)):
+                value = (value, )
+
+            for v in value:
+                if isinstance(v, type):
+                    logger.debug('Found generator: {0}'.format(v))
+                    generators.append(v)
+
         return generators
 
     def get_writer(self):
diff --git a/pelican/plugins/sitemap.py b/pelican/plugins/sitemap.py
new file mode 100644
index 00000000..6402ba9c
--- /dev/null
+++ b/pelican/plugins/sitemap.py
@@ -0,0 +1,208 @@
+import os.path
+
+from datetime import datetime
+from logging import debug, warning, error, info
+from codecs import open
+
+from pelican import signals, contents
+
+TXT_HEADER = u"""{0}/index.html
+{0}/archives.html
+{0}/tags.html
+{0}/categories.html
+"""
+
+XML_HEADER = u"""<?xml version="1.0" encoding="utf-8"?>
+<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
+         xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+
+  <url>
+    <loc>{0}/index.html</loc>
+    <lastmod>{1}</lastmod>
+    <changefreq>{2}</changefreq>
+    <priority>{3}</priority>
+  </url>
+
+  <url>
+    <loc>{0}/archives.html</loc>
+    <lastmod>{1}</lastmod>
+    <changefreq>{2}</changefreq>
+    <priority>{3}</priority>
+  </url>
+
+  <url>
+    <loc>{0}/tags.html</loc>
+    <lastmod>{1}</lastmod>
+    <changefreq>{2}</changefreq>
+    <priority>{3}</priority>
+  </url>
+
+  <url>
+    <loc>{0}/categories.html</loc>
+    <lastmod>{1}</lastmod>
+    <changefreq>{2}</changefreq>
+    <priority>{3}</priority>
+  </url>
+"""
+
+XML_URL = u"""
+  <url>
+    <loc>{0}/{1}</loc>
+    <lastmod>{2}</lastmod>
+    <changefreq>{3}</changefreq>
+    <priority>{4}</priority>
+  </url>
+"""
+
+XML_FOOTER = u"""
+</urlset>
+"""
+
+
+def format_date(date):
+    if date.tzinfo:
+        tz = date.strftime('%s')
+        tz = tz[:-2] + ':' + tz[-2:]
+    else:
+        tz = "-00:00"
+    return date.strftime("%Y-%m-%dT%H:%M:%S") + tz
+
+
+
+class SitemapGenerator(object):
+
+    def __init__(self, context, settings, path, theme, output_path, *null):
+
+        self.output_path = output_path
+        self.context = context
+        self.now = datetime.now()
+        self.siteurl = settings.get('SITEURL')
+
+        self.format = 'xml'
+
+        self.changefreqs = {
+            'articles': 'monthly',
+            'indexes': 'daily',
+            'pages': 'monthly'
+        }
+
+        self.priorities = {
+            'articles': 0.5,
+            'indexes': 0.5,
+            'pages': 0.5
+        }
+
+        config = settings.get('SITEMAP', {})
+
+        if not isinstance(config, dict):
+            warning("sitemap plugin: the SITEMAP setting must be a dict")
+        else:
+            fmt = config.get('format')
+            pris = config.get('priorities')
+            chfreqs = config.get('changefreqs')
+
+            if fmt not in ('xml', 'txt'):
+                warning("sitemap plugin: SITEMAP['format'] must be `txt' or `xml'")
+                warning("sitemap plugin: Setting SITEMAP['format'] on `xml'")
+            elif fmt == 'txt':
+                self.format = fmt
+                return
+
+            valid_keys = ('articles', 'indexes', 'pages')
+            valid_chfreqs = ('always', 'hourly', 'daily', 'weekly', 'monthly',
+                    'yearly', 'never')
+
+            if isinstance(pris, dict):
+                for k, v in pris.iteritems():
+                    if k in valid_keys and not isinstance(v, (int, float)):
+                        default = self.priorities[k]
+                        warning("sitemap plugin: priorities must be numbers")
+                        warning("sitemap plugin: setting SITEMAP['priorities']"
+                                "['{0}'] on {1}".format(k, default))
+                        pris[k] = default
+                self.priorities.update(pris)
+            elif pris is not None:
+                warning("sitemap plugin: SITEMAP['priorities'] must be a dict")
+                warning("sitemap plugin: using the default values")
+
+            if isinstance(chfreqs, dict):
+                for k, v in chfreqs.iteritems():
+                    if k in valid_keys and v not in valid_chfreqs:
+                        default = self.changefreqs[k]
+                        warning("sitemap plugin: invalid changefreq `{0}'".format(v))
+                        warning("sitemap plugin: setting SITEMAP['changefreqs']"
+                                "['{0}'] on '{1}'".format(k, default))
+                        chfreqs[k] = default
+                self.changefreqs.update(chfreqs)
+            elif chfreqs is not None:
+                warning("sitemap plugin: SITEMAP['changefreqs'] must be a dict")
+                warning("sitemap plugin: using the default values")
+
+
+
+    def write_url(self, page, fd):
+
+        if getattr(page, 'status', 'published') != 'published':
+            return
+
+        lastmod = format_date(getattr(page, 'date', self.now))
+
+        if isinstance(page, contents.Article):
+            pri = self.priorities['articles']
+            chfreq = self.changefreqs['articles']
+        elif isinstance(page, contents.Page):
+            pri = self.priorities['pages']
+            chfreq = self.changefreqs['pages']
+        else:
+            pri = self.priorities['indexes']
+            chfreq = self.changefreqs['indexes']
+
+
+        if self.format == 'xml':
+            fd.write(XML_URL.format(self.siteurl, page.url, lastmod, chfreq, pri))
+        else:
+            fd.write(self.siteurl + '/' + loc + '\n')
+
+
+    def generate_output(self, writer):
+        path = os.path.join(self.output_path, 'sitemap.{0}'.format(self.format))
+
+        pages = self.context['pages'] + self.context['articles'] \
+                + [ c for (c, a) in self.context['categories']] \
+                + [ t for (t, a) in self.context['tags']] \
+                + [ a for (a, b) in self.context['authors']]
+
+        for article in self.context['articles']:
+            pages += article.translations
+
+
+        info('writing {0}'.format(path))
+
+        with open(path, 'w', encoding='utf-8') as fd:
+
+            if self.format == 'xml':
+                fd.write(XML_HEADER.format(
+                        self.siteurl,
+                        format_date(self.now),
+                        self.changefreqs['indexes'],
+                        self.priorities['indexes']
+                    )
+                )
+            else:
+                fd.write(TXT_HEADER.format(self.siteurl))
+
+            for page in pages:
+                self.write_url(page, fd)
+
+            if self.format == 'xml':
+                fd.write(XML_FOOTER)
+
+
+
+def get_generators(generators):
+    return SitemapGenerator
+
+
+def register():
+    signals.get_generators.connect(get_generators)
diff --git a/pelican/signals.py b/pelican/signals.py
index ddd59621..408d84c9 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -4,5 +4,6 @@ initialized = signal('pelican_initialized')
 finalized = signal('pelican_finalized')
 article_generate_context = signal('article_generate_context')
 article_generator_init = signal('article_generator_init')
+get_generators = signal('get_generators')
 pages_generate_context = signal('pages_generate_context')
 pages_generator_init = signal('pages_generator_init')

From d0e5c3c1518c2d1a1649580c69454d6ef719a055 Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Sun, 2 Sep 2012 15:18:46 -0700
Subject: [PATCH 0918/2864] Add the unit2 tests to tox

Remove unnecessary dependencies
These dependencies are installed when tox runs setup.py
---
 tox.ini | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tox.ini b/tox.ini
index a7dc9ec6..4a0e148c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,13 +2,11 @@
 envlist = py26,py27
 
 [testenv]
-commands = nosetests -s tests
+commands =
+    nosetests -s tests
+    unit2 discover []
 deps =
     nose
-    Jinja2
-    Pygments
-    docutils
-    feedgenerator
     unittest2
     mock
     Markdown

From 914653f140dabc12b56d098115cfa324974db3cb Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Tue, 4 Sep 2012 15:17:59 -0700
Subject: [PATCH 0919/2864] Clean up Dev Requirements and add typogrify &
 webassets typogrify & webassets are optional packages for usage but should be
 included for testing by developers and CI dev_requirements also had packages
 that setup.py covers already. Added comments for redundancy

---
 dev_requirements.txt | 10 ++++------
 tox.ini              |  2 ++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index ec3245d1..acf01773 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,10 +1,8 @@
-Jinja2>=2.4
-Pygments
-docutils
-feedgenerator
+# Tests
 unittest2
-pytz
 mock
+# Optional Packages
 Markdown
-blinker
 BeautifulSoup
+typogrify
+webassets
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 4a0e148c..f7d9cf82 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,3 +11,5 @@ deps =
     mock
     Markdown
     BeautifulSoup
+    typogrify
+    webassets

From 31afafda0f2338a4f51220a2272e370845a55c39 Mon Sep 17 00:00:00 2001
From: Nico Di Rocco <dirocco.nico@gmail.com>
Date: Fri, 7 Sep 2012 08:56:33 +0200
Subject: [PATCH 0920/2864] Added possible uses for the finalized signal to the
 docs

---
 docs/plugins.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index a90d077e..36e89f3d 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -58,6 +58,9 @@ Signal                      Arguments                      Description
 =========================   ============================   ===========================================================================
 initialized                 pelican object
 finalized                   pelican object                 invoked after all the generators are executed and just before pelican exits
+                                                           usefull for custom post processing actions, such as: 
+                                                           - minifying js/css assets.
+                                                           - notify/ping search engines with an updated sitemap.
 article_generate_context    article_generator, metadata
 article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
 get_generators              generators                     invoked in Pelican.get_generator_classes,

From 7ffa9e21d8c83fe541394d711bcf585b9ca6b07a Mon Sep 17 00:00:00 2001
From: Wladislaw Merezhko <infinitylx@infinitylx.org.ua>
Date: Sat, 8 Sep 2012 13:07:51 +0300
Subject: [PATCH 0921/2864] Change name of utils.open function to pelican_open
 and refactor this change across project.

---
 pelican/readers.py | 6 +++---
 pelican/utils.py   | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index e3ea154d..30038f7a 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -16,7 +16,7 @@ except ImportError:
 import re
 
 from pelican.contents import Category, Tag, Author
-from pelican.utils import get_date, open
+from pelican.utils import get_date, pelican_open
 
 
 _METADATA_PROCESSORS = {
@@ -129,7 +129,7 @@ class MarkdownReader(Reader):
 
     def read(self, filename):
         """Parse content and metadata of markdown files"""
-        text = open(filename)
+        text = pelican_open(filename)
         md = Markdown(extensions=set(self.extensions + ['meta']))
         content = md.convert(text)
 
@@ -146,7 +146,7 @@ class HtmlReader(Reader):
 
     def read(self, filename):
         """Parse content and metadata of (x)HTML files"""
-        with open(filename) as content:
+        with pelican_open(filename) as content:
             metadata = {'title': 'unnamed'}
             for i in self._re.findall(content):
                 key = i.split(':')[0][5:].strip()
diff --git a/pelican/utils.py b/pelican/utils.py
index ca3015ce..60ecee34 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -6,7 +6,7 @@ import shutil
 import logging
 from collections import defaultdict
 
-from codecs import open as _open
+from codecs import open
 from datetime import datetime
 from itertools import groupby
 from jinja2 import Markup
@@ -14,6 +14,7 @@ from operator import attrgetter
 
 logger = logging.getLogger(__name__)
 
+
 class NoFilesError(Exception):
     pass
 
@@ -37,9 +38,9 @@ def get_date(string):
     raise ValueError("'%s' is not a valid date" % string)
 
 
-def open(filename):
+def pelican_open(filename):
     """Open a file and return it's content"""
-    return _open(filename, encoding='utf-8').read()
+    return open(filename, encoding='utf-8').read()
 
 
 def slugify(value):

From 3a6196ccd191ed0f0a8170afdcd25cd043345710 Mon Sep 17 00:00:00 2001
From: Wladislaw Merezhko <infinitylx@infinitylx.org.ua>
Date: Sat, 8 Sep 2012 18:24:15 +0300
Subject: [PATCH 0922/2864] Add two new parameters for creating pdf

* PDF_STYLE - name of custom style to use when generating pdf
* PDF_STYLE_PATH - path where custom style is located
---
 pelican/generators.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index ed2bbe96..3f95322f 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -192,7 +192,7 @@ class ArticlesGenerator(Generator):
             save_as = self.settings.get("%s_SAVE_AS" % template.upper(),
                                                         '%s.html' % template)
             if not save_as:
-                 continue
+                continue
 
             write(save_as, self.get_template(template),
                   self.context, blog=True, paginated=paginated,
@@ -473,13 +473,20 @@ class PdfGenerator(Generator):
     """Generate PDFs on the output dir, for all articles and pages coming from
     rst"""
     def __init__(self, *args, **kwargs):
+        super(PdfGenerator, self).__init__(*args, **kwargs)
         try:
             from rst2pdf.createpdf import RstToPdf
+            pdf_style_path = os.path.join(self.settings['PDF_STYLE_PATH']) \
+                                if 'PDF_STYLE_PATH' in self.settings.keys() \
+                                else ''
+            pdf_style = self.settings['PDF_STYLE'] if 'PDF_STYLE' \
+                                                    in self.settings.keys() \
+                                                    else 'twelvepoint'
             self.pdfcreator = RstToPdf(breakside=0,
-                                       stylesheets=['twelvepoint'])
+                                       stylesheets=[pdf_style],
+                                       style_path=[pdf_style_path])
         except ImportError:
             raise Exception("unable to find rst2pdf")
-        super(PdfGenerator, self).__init__(*args, **kwargs)
 
     def _create_pdf(self, obj, output_path):
         if obj.filename.endswith(".rst"):

From ac67587b79913f497b116d1aadab60e04012ce78 Mon Sep 17 00:00:00 2001
From: epatters <ejpatters@gmail.com>
Date: Sat, 8 Sep 2012 21:39:10 -0700
Subject: [PATCH 0923/2864] BUG: Typogrify not applied to pages.

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 3f95322f..f4366f53 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -382,7 +382,7 @@ class PagesGenerator(Generator):
                 os.path.join(self.path, self.settings['PAGE_DIR']),
                 exclude=self.settings['PAGE_EXCLUDES']):
             try:
-                content, metadata = read_file(f)
+                content, metadata = read_file(f, settings=self.settings)
             except Exception, e:
                 logger.warning(u'Could not process %s\n%s' % (f, str(e)))
                 continue

From 007cd9b8fdaa9bc6238f4998586c47eea2c74a7b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 10 Sep 2012 20:48:13 -0700
Subject: [PATCH 0924/2864] Minor doc changes, including those for webassets

---
 docs/getting_started.rst | 15 ++++++------
 docs/settings.rst        | 53 ++++++++++++++++++++--------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index b7cbe951..985718b5 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -17,7 +17,7 @@ While the above is the simplest method, the recommended approach is to create
 a virtual environment for Pelican via virtualenv_ and virtualenvwrapper_ before
 installing Pelican. Assuming you've followed the virtualenvwrapper
 `installation <http://virtualenvwrapper.readthedocs.org/en/latest/install.html>`_
-and `shell configuration 
+and `shell configuration
 <http://virtualenvwrapper.readthedocs.org/en/latest/install.html#shell-startup-file>`_
 steps, you can then open a new terminal session and create a new virtual
 environment for Pelican::
@@ -26,7 +26,7 @@ environment for Pelican::
 
 Once the virtual environment has been created and activated, Pelican can be
 be installed via ``pip`` or ``easy_install`` as noted above. Alternatively, if
-you have the project source, you can install Pelican using the distutils 
+you have the project source, you can install Pelican using the distutils
 method::
 
     $ cd path-to-Pelican-source
@@ -209,7 +209,7 @@ Pages
 If you create a folder named ``pages``, all the files in it will be used to
 generate static pages.
 
-Then, use the ``DISPLAY_PAGES_ON_MENU`` setting, which will add all the pages to 
+Then, use the ``DISPLAY_PAGES_ON_MENU`` setting, which will add all the pages to
 the menu.
 
 If you want to exclude any pages from being linked to or listed in the menu
@@ -219,7 +219,7 @@ things like making error pages that fit the generated theme of your site.
 Importing an existing blog
 --------------------------
 
-It is possible to import your blog from Dotclear, WordPress, and RSS feeds using 
+It is possible to import your blog from Dotclear, WordPress, and RSS feeds using
 a simple script. See :ref:`import`.
 
 Translations
@@ -277,14 +277,13 @@ For RestructuredText, use the code-block directive::
 
        <indented code block goes here>
 
-For Markdown, include the language identifier just above code blocks::
+For Markdown, include the language identifier just above the code block,
+indenting both the identifier and code::
 
         :::identifier
         <code goes here>
-    
-    (indent both the identifier and code)
 
-The specified identifier (e.g. ``python``, ``ruby``) should be one that 
+The specified identifier (e.g. ``python``, ``ruby``) should be one that
 appears on the `list of available lexers <http://pygments.org/docs/lexers/>`_.
 
 Publishing drafts
diff --git a/docs/settings.rst b/docs/settings.rst
index 2f5027b9..bd22f872 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -448,26 +448,27 @@ adding the following to your configuration::
 Asset management
 ----------------
 
-The `WEBASSETS` setting allows to use the `webassets`_ module to manage assets
-(css, js). The module must first be installed::
+The `WEBASSETS` setting allows you to use the `webassets`_ module to manage
+assets such as CSS and JS files. The module must first be installed::
 
     pip install webassets
 
-`webassets` allows to concatenate your assets and to use almost all of the
-hype tools of the moment (see the `documentation`_):
+The `webassets` module allows you to perform a number of useful asset management
+functions, including:
 
-* css minifier (`cssmin`, `yuicompressor`, ...)
-* css compiler (`less`, `sass`, ...)
-* js minifier (`uglifyjs`, `yuicompressor`, `closure`, ...)
+* CSS minifier (`cssmin`, `yuicompressor`, ...)
+* CSS compiler (`less`, `sass`, ...)
+* JS minifier (`uglifyjs`, `yuicompressor`, `closure`, ...)
 
-Others filters include gzip compression, integration of images in css with
-`datauri` and more. Webassets also append a version identifier to your asset
-url to convince browsers to download new versions of your assets when you use
-far future expires headers.
+Others filters include gzip compression, integration of images in CSS via data
+URIs, and more. `webassets` can also append a version identifier to your asset
+URL to convince browsers to download new versions of your assets when you use
+far-future expires headers. Please refer to the `webassets documentation`_ for
+more information.
 
-When using it with Pelican, `webassets` is configured to process assets in the
-``OUTPUT_PATH/theme`` directory. You can use it in your templates with a
-template tag, for example:
+When using with Pelican, `webassets` is configured to process assets in the
+``OUTPUT_PATH/theme`` directory. You can use `webassets` in your templates by
+including one or more template tags. For example...
 
 .. code-block:: jinja
 
@@ -475,22 +476,22 @@ template tag, for example:
         <link rel="stylesheet" href="{{ ASSET_URL }}">
     {% endassets %}
 
-will produce a minified css file with the version identifier:
+... will produce a minified css file with a version identifier:
 
 .. code-block:: html
 
     <link href="http://{SITEURL}/theme/css/style.min.css?b3a7c807" rel="stylesheet">
 
-The filters can be combined, for example to use the `sass` compiler and minify
-the output::
+These filters can be combined. Here is an example that uses the SASS compiler
+and minifies the output:
 
 .. code-block:: jinja
 
-{% assets filters="sass,cssmin", output="css/style.min.css", "css/style.scss" %}
-    <link rel="stylesheet" href="{{ ASSET_URL }}">
-{% endassets %}
+    {% assets filters="sass,cssmin", output="css/style.min.css", "css/style.scss" %}
+        <link rel="stylesheet" href="{{ ASSET_URL }}">
+    {% endassets %}
 
-Another example for javascript:
+Another example for Javascript:
 
 .. code-block:: jinja
 
@@ -498,20 +499,20 @@ Another example for javascript:
         <script src="{{ ASSETS_URL }}"></script>
     {% endassets %}
 
-will produce a minified and gzipped js file:
+The above will produce a minified and gzipped JS file:
 
 .. code-block:: html
 
     <script src="http://{SITEURL}/theme/js/packed.js?00703b9d"></script>
 
-Pelican's debug mode is propagated to webassets to disable asset packaging,
+Pelican's debug mode is propagated to `webassets` to disable asset packaging
 and instead work with the uncompressed assets. However, this also means that
-the `less` and `sass` files are not compiled, this should be fixed in a future
-version of webassets (cf. the related `bug report
+the LESS and SASS files are not compiled. This should be fixed in a future
+version of `webassets` (cf. the related `bug report
 <https://github.com/getpelican/pelican/issues/481>`_).
 
 .. _webassets: https://github.com/miracle2k/webassets
-.. _documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
+.. _webassets documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
 
 Example settings
 ================

From 9dcf4e5438f0a8ff31b1720b124d367ad7380dc0 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 10 Sep 2012 20:50:45 -0700
Subject: [PATCH 0925/2864] Eliminate extraneous whitespace

---
 docs/contribute.rst     |  4 ++--
 docs/faq.rst            |  8 ++++----
 docs/importer.rst       |  2 +-
 docs/index.rst          |  4 ++--
 docs/internals.rst      |  4 ++--
 docs/pelican-themes.rst | 10 +++++-----
 docs/plugins.rst        |  2 +-
 docs/report.rst         |  4 ++--
 docs/themes.rst         | 10 +++++-----
 docs/tips.rst           |  6 +++---
 10 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 82419f17..0820d5c3 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -23,7 +23,7 @@ different projects.
 
 To create a virtual environment, use the following syntax::
 
-    $ mkvirtualenv pelican 
+    $ mkvirtualenv pelican
 
 To clone the Pelican source::
 
@@ -65,5 +65,5 @@ Try to respect what is described in the `PEP8 specification
 <http://www.python.org/dev/peps/pep-0008/>`_ when providing patches. This can be
 eased via the `pep8 <http://pypi.python.org/pypi/pep8>`_ or `flake8
 <http://pypi.python.org/pypi/flake8/>`_ tools, the latter of which in
-particular will give you some useful hints about ways in which the 
+particular will give you some useful hints about ways in which the
 code/formatting can be improved.
diff --git a/docs/faq.rst b/docs/faq.rst
index c5c751e6..e76bea6a 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -26,7 +26,7 @@ suggestions or problems you might have via IRC or the issue tracker.
 If you want to contribute, please fork `the git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make
 your changes, and issue a pull request. Someone will review your changes as soon
-as possible. Please refer to the :doc:`How to Contribute <contribute>` section 
+as possible. Please refer to the :doc:`How to Contribute <contribute>` section
 for more details.
 
 You can also contribute by creating themes and improving the documentation.
@@ -43,7 +43,7 @@ I'm creating my own theme. How do I use Pygments for syntax highlighting?
 
 Pygments adds some classes to the generated content. These classes are used by
 themes to style code syntax highlighting via CSS. Specifically, you can
-customize the appearance of your syntax highlighting via the ``.codehilite pre`` 
+customize the appearance of your syntax highlighting via the ``.codehilite pre``
 class in your theme's CSS file. To see how various styles can be used to render
 Django code, for example, you can use the demo `on the project website
 <http://pygments.org/demo/15101/>`_.
@@ -105,7 +105,7 @@ I'm getting a warning about feeds generated without SITEURL being set properly
 In order to properly generate all URLs properly in Pelican you will need to set
 ``SITEURL`` to the full path of your blog. When using ``make html`` and the
 default Makefile provided by the `pelican-quickstart` bootstrap script to test
-build your site, it's normal to see this warning since ``SITEURL`` is 
+build your site, it's normal to see this warning since ``SITEURL`` is
 deliberately left undefined. If configured properly no other ``make`` commands
 should result in this warning.
 
@@ -124,5 +124,5 @@ setting names). Here is an exact list of the renamed setting names::
 
 Older 2.x themes that referenced the old setting names may not link properly.
 In order to rectify this, please update your theme for compatibility with 3.0+
-by changing the relevant values in your template files. For an example of 
+by changing the relevant values in your template files. For an example of
 complete feed headers and usage please check out the ``simple`` theme.
diff --git a/docs/importer.rst b/docs/importer.rst
index ccf3ffe2..ba96d9c2 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -31,7 +31,7 @@ BeatifulSoup can be installed like any other Python package::
 
     $ pip install BeautifulSoup
 
-For pandoc, install a package for your operating system from the 
+For pandoc, install a package for your operating system from the
 `pandoc site <http://johnmacfarlane.net/pandoc/installing.html>`_.
 
 
diff --git a/docs/index.rst b/docs/index.rst
index 477b4342..3fc1cf9f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,7 +3,7 @@ Pelican
 
 Pelican is a static site generator, written in Python_.
 
-* Write your weblog entries directly with your editor of choice (vim!) 
+* Write your weblog entries directly with your editor of choice (vim!)
   in reStructuredText_ or Markdown_
 * Includes a simple CLI tool to (re)generate the weblog
 * Easy to interface with DVCSes and web hooks
@@ -79,4 +79,4 @@ A French version of the documentation is available at :doc:`fr/index`.
 .. _`Pelican documentation`: http://docs.getpelican.com/latest/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
 .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
-.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
\ No newline at end of file
+.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
diff --git a/docs/internals.rst b/docs/internals.rst
index 6b6f991f..a6264476 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -52,7 +52,7 @@ Take a look at the Markdown reader::
             text = open(filename)
             md = Markdown(extensions = ['meta', 'codehilite'])
             content = md.convert(text)
-            
+
             metadata = {}
             for name, value in md.Meta.items():
                 if name in _METADATA_FIELDS:
@@ -81,7 +81,7 @@ both; only the existing ones will be called.
   context is shared between all generators, and will be passed to the
   templates. For instance, the ``PageGenerator`` ``generate_context`` method
   finds all the pages, transforms them into objects, and populates the context
-  with them. Be careful *not* to output anything using this context at this 
+  with them. Be careful *not* to output anything using this context at this
   stage, as it is likely to change by the effect of other generators.
 
 * ``generate_output`` is then called. And guess what is it made for? Oh,
diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index a074a0a2..23be8355 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -64,7 +64,7 @@ In this example, we can see there are three themes available: ``notmyidea``, ``s
 Note that you can combine the ``--list`` option with the ``-v`` or ``--verbose`` option to get more verbose output, like this:
 
 .. code-block:: console
-    
+
     $ pelican-themes -v -l
     /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/notmyidea
     /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/two-column (symbolic link to `/home/skami/Dev/Python/pelican-themes/two-column')
@@ -118,7 +118,7 @@ Creating symbolic links
 To symbolically link a theme, you can use the ``-s`` or ``--symlink``, which works exactly as the ``--install`` option:
 
 .. code-block:: console
-    
+
     # pelican-themes --symlink ~/Dev/Python/pelican-themes/two-column
 
 In this example, the ``two-column`` theme is now symbolically linked to the Pelican themes path, so we can use it, but we can also modify it without having to reinstall it after each modification.
@@ -130,11 +130,11 @@ This is useful for theme development:
     $ sudo pelican-themes -s ~/Dev/Python/pelican-themes/two-column
     $ pelican ~/Blog/content -o /tmp/out -t two-column
     $ firefox /tmp/out/index.html
-    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/static/css/main.css 
+    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/static/css/main.css
     $ pelican ~/Blog/content -o /tmp/out -t two-column
     $ cp /tmp/bg.png ~/Dev/Pelican/pelican-themes/two-coumn/static/img/bg.png
     $ pelican ~/Blog/content -o /tmp/out -t two-column
-    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/templates/index.html 
+    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/templates/index.html
     $ pelican ~/Blog/content -o /tmp/out -t two-column
 
 
@@ -152,7 +152,7 @@ The ``--install``, ``--remove`` and ``--symlink`` option are not mutually exclus
                      --symlink ~/Dev/Python/pelican-themes/two-column \
                      --verbose
 
-In this example, the theme ``notmyidea-cms`` is replaced by the theme ``notmyidea-cms-fr`` 
+In this example, the theme ``notmyidea-cms`` is replaced by the theme ``notmyidea-cms-fr``
 
 
 
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 36e89f3d..dfc66dbd 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -16,7 +16,7 @@ To load plugins, you have to specify them in your settings file. You have two
 ways to do so.
 Either by specifying strings with the path to the callables::
 
-    PLUGINS = ['pelican.plugins.gravatar',] 
+    PLUGINS = ['pelican.plugins.gravatar',]
 
 Or by importing them and adding them to the list::
 
diff --git a/docs/report.rst b/docs/report.rst
index f12f3048..f3ddff31 100644
--- a/docs/report.rst
+++ b/docs/report.rst
@@ -4,7 +4,7 @@ Some history about Pelican
 .. warning::
 
     This page comes from a report the original author (Alexis Métaireau) wrote
-    right after writing Pelican, in December 2010. The information may not be 
+    right after writing Pelican, in December 2010. The information may not be
     up-to-date.
 
 Pelican is a simple static blog generator. It parses markup files
@@ -113,7 +113,7 @@ concepts. Here is what happens when calling the ``generate_context``
 method:
 
 * Read the folder “path”, looking for restructured text files, load
-  each of them, and construct a content object (``Article``) with it. To do so, 
+  each of them, and construct a content object (``Article``) with it. To do so,
   use ``Reader`` objects.
 * Update the ``context`` with all those articles.
 
diff --git a/docs/themes.rst b/docs/themes.rst
index d3dd4d9e..7598a28c 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -35,7 +35,7 @@ To make your own theme, you must follow the following structure::
 * `templates` contains all the templates that will be used to generate the content.
   I've just put the mandatory templates here; you can define your own if it helps
   you keep things organized while creating your theme.
- 
+
 Templates and variables
 =======================
 
@@ -44,7 +44,7 @@ This document describes which templates should exist in a theme, and which
 variables will be passed to each template at generation time.
 
 All templates will receive the variables defined in your settings file, if they
-are in all-caps. You can access them directly. 
+are in all-caps. You can access them directly.
 
 Common variables
 ----------------
@@ -55,14 +55,14 @@ All of these settings will be available to all templates.
 Variable        Description
 =============   ===================================================
 articles        The list of articles, ordered descending by date
-                All the elements are `Article` objects, so you can 
+                All the elements are `Article` objects, so you can
                 access their attributes (e.g. title, summary, author
                 etc.)
 dates           The same list of articles, but ordered by date,
                 ascending
 tags            A key-value dict containing the tags (the keys) and
                 the list of respective articles (the values)
-categories      A key-value dict containing the categories (keys) 
+categories      A key-value dict containing the categories (keys)
                 and the list of respective articles (values)
 pages           The list of pages
 =============   ===================================================
@@ -182,7 +182,7 @@ dates                   Articles related to this tag, but ordered by date,
                         ascending
 articles_paginator      A paginator object for the list of articles
 articles_page           The current page of articles
-dates_paginator         A paginator object for the list of articles, 
+dates_paginator         A paginator object for the list of articles,
                         ordered by date, ascending
 dates_page              The current page of articles, ordered by date,
                         ascending
diff --git a/docs/tips.rst b/docs/tips.rst
index 8905103b..abb739b1 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -12,11 +12,11 @@ file generator, we can take advantage of this.
 
 User Pages
 ----------
-GitHub allows you to create user pages in the form of ``username.github.com``. 
+GitHub allows you to create user pages in the form of ``username.github.com``.
 Whatever is created in the master branch will be published. For this purpose,
 just the output generated by Pelican needs to pushed to GitHub.
 
-So given a repository containing your articles, just run Pelican over the posts 
+So given a repository containing your articles, just run Pelican over the posts
 and deploy the master branch to GitHub::
 
     $ pelican -s pelican.conf.py ./path/to/posts -o /path/to/output
@@ -35,7 +35,7 @@ really easy, which can be installed via::
 
     $ pip install ghp-import
 
-Then, given a repository containing your articles, you would simply run 
+Then, given a repository containing your articles, you would simply run
 Pelican and upload the output to GitHub::
 
     $ pelican -s pelican.conf.py .

From c659695c5d9173023ce3e6753b91e96b840aa16c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 11 Sep 2012 06:50:33 -0700
Subject: [PATCH 0926/2864] Add a list of plugins to the docs. Closes #493.

---
 docs/plugins.rst                  | 106 +++++++++++++++++++++++-------
 pelican/plugins/global_license.py |   7 +-
 pelican/plugins/gravatar.py       |  10 +--
 3 files changed, 93 insertions(+), 30 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index dfc66dbd..654b18f7 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -76,14 +76,22 @@ request if you need them!
 List of plugins
 ===============
 
-Not all the list are described here, but a few of them have been extracted from
-the Pelican core and provided in ``pelican.plugins``. They are described here:
+The following plugins are currently included with Pelican under ``pelican.plugins``:
 
-Tag cloud
----------
+* `GitHub activity`_
+* `Global license`_
+* `Gravatar`_
+* `HTML tags for reStructuredText`_
+* `Related posts`_
+* `Sitemap`_
 
-Translation
------------
+Ideas for plugins that haven't been written yet:
+
+* Tag cloud
+* Translation
+
+Plugin descriptions
+===================
 
 GitHub activity
 ---------------
@@ -116,23 +124,78 @@ variable, as in the example::
 ``github_activity`` is a list of lists. The first element is the title
 and the second element is the raw HTML from GitHub.
 
+Global license
+--------------
+
+This plugin allows you to define a LICENSE setting and adds the contents of that
+license variable to the article's context, making that variable available to use
+from within your theme's templates.
+
+Gravatar
+--------
+
+This plugin assigns the ``author_gravatar`` variable to the Gravatar URL and
+makes the variable available within the article's context. You can add
+AUTHOR_EMAIL to your settings file to define the default author's email
+address. Obviously, that email address must be associated with a Gravatar
+account.
+
+Alternatively, you can provide an email address from within article metadata::
+
+    :email:  john.doe@example.com
+
+If the email address is defined via at least one of the two methods above,
+the ``author_gravatar`` variable is added to the article's context.
+
+HTML tags for reStructuredText
+------------------------------
+
+This plugin allows you to use HTML tags from within reST documents. Following
+is a usage example, which is in this case a contact form::
+
+    .. html::
+
+        <form method="GET" action="mailto:some email">
+          <p>
+            <input type="text" placeholder="Subject" name="subject">
+            <br />
+            <textarea name="body" placeholder="Message">
+            </textarea>
+            <br />
+            <input type="reset"><input type="submit">
+          </p>
+        </form>
+
+Related posts
+-------------
+
+This plugin adds the ``related_posts`` variable to the article's context.
+To enable, add the following to your settings file::
+
+    from pelican.plugins import related_posts
+    PLUGINS = [related_posts]
+
+You can then use the ``article.related_posts`` variable in your templates.
+For example::
+
+    {% if article.related_posts %}
+        <ul>
+        {% for related_post in article.related_posts %}
+            <li>{{ related_post }}</li>
+        {% endfor %}
+        </ul>
+    {% endif %}
 
 Sitemap
 -------
 
-The plugin generates a sitemap of the blog.
-It can generates plain text sitemaps or XML sitemaps.
-
-Configuration
-"""""""""""""
-
-You can use the setting ``SITEMAP`` variable to configure the behavior of the
+The sitemap plugin generates plain-text or XML sitemaps. You can use the
+``SITEMAP`` variable in your settings file to configure the behavior of the
 plugin.
 
-The ``SITEMAP`` variable must be a Python dictionary, it can contain tree keys:
+The ``SITEMAP`` variable must be a Python dictionary, it can contain three keys:
 
-
-- ``format``, which set the output format of the plugin (``xml`` or ``txt``)
+- ``format``, which sets the output format of the plugin (``xml`` or ``txt``)
 
 - ``priorities``, which is a dictionary with three keys:
 
@@ -154,9 +217,8 @@ The ``SITEMAP`` variable must be a Python dictionary, it can contain tree keys:
 
   - ``indexes``, the update frequency of the index pages
 
-  An valid value is  ``always``, ``hourly``, ``daily``, ``weekly``, ``monthly``,
-  ``yearly`` or ``never``.
-
+  Valid frequency values are ``always``, ``hourly``, ``daily``, ``weekly``, ``monthly``,
+  ``yearly`` and ``never``.
 
 If a key is missing or a value is incorrect, it will be replaced with the
 default value.
@@ -168,11 +230,9 @@ The sitemap is saved in ``<output_path>/sitemap.<format>``.
    They are only used in the XML sitemaps.
    For more information: <http://www.sitemaps.org/protocol.html#xmlTagDefinitions>
 
+**Example**
 
-Example
-"""""""
-
-Here is an example of configuration (it's also the default settings):
+Here is an example configuration (it's also the default settings):
 
 .. code-block:: python
 
diff --git a/pelican/plugins/global_license.py b/pelican/plugins/global_license.py
index 463a93b3..9a0f5206 100644
--- a/pelican/plugins/global_license.py
+++ b/pelican/plugins/global_license.py
@@ -4,13 +4,14 @@ from pelican import signals
 License plugin for Pelican
 ==========================
 
-Simply add license variable in article's context, which contain 
-the license text.
+This plugin allows you to define a LICENSE setting and adds the contents of that
+license variable to the article's context, making that variable available to use
+from within your theme's templates.
 
 Settings:
 ---------
 
-Add LICENSE to your settings file to define default license.
+Define LICENSE in your settings file with the contents of your default license.
 
 """
 
diff --git a/pelican/plugins/gravatar.py b/pelican/plugins/gravatar.py
index 4ab8ea9c..a4d11456 100644
--- a/pelican/plugins/gravatar.py
+++ b/pelican/plugins/gravatar.py
@@ -5,20 +5,22 @@ from pelican import signals
 Gravatar plugin for Pelican
 ===========================
 
-Simply add author_gravatar variable in article's context, which contains
-the gravatar url.
+This plugin assigns the ``author_gravatar`` variable to the Gravatar URL and
+makes the variable available within the article's context.
 
 Settings:
 ---------
 
-Add AUTHOR_EMAIL to your settings file to define default author email.
+Add AUTHOR_EMAIL to your settings file to define the default author's email
+address. Obviously, that email address must be associated with a Gravatar
+account.
 
 Article metadata:
 ------------------
 
 :email:  article's author email
 
-If one of them are defined, the author_gravatar variable is added to
+If one of them are defined, the author_gravatar variable is added to the
 article's context.
 """
 

From f7a28dc6611a5c8ef2f2c03566e48bec4ae4a035 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 11 Sep 2012 07:29:34 -0700
Subject: [PATCH 0927/2864] Clarify docs for specifying theme. Closes #475.

---
 docs/settings.rst | 48 ++++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index bd22f872..6da1fb14 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -377,19 +377,19 @@ Setting name (default value)                        What does it do?
                                                     alphabetical order; default lists alphabetically.)
 ================================================    =====================================================
 
-Theming
-=======
+Themes
+======
 
-Theming is addressed in a dedicated section (see :ref:`theming-pelican`).
-However, here are the settings that are related to theming.
+Creating Pelican themes is addressed in a dedicated section (see :ref:`theming-pelican`).
+However, here are the settings that are related to themes.
 
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`THEME`                                             Theme to use to produce the output. Can be the
-                                                    complete static path to a theme folder, or
-                                                    chosen between the list of default themes (see
-                                                    below)
+`THEME`                                             Theme to use to produce the output. Can be a relative
+                                                    or absolute path to a theme folder, or the name of a
+                                                    default theme or a theme installed via
+                                                    ``pelican-themes`` (see below).
 `THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
                                                     value is `static`, but if your theme has
                                                     other static paths, you can put them here.
@@ -397,22 +397,32 @@ Setting name (default value)                        What does it do?
 `WEBASSETS` (``False``)                             Asset management with `webassets` (see below)
 ================================================    =====================================================
 
-By default, two themes are available. You can specify them using the `-t` option:
+
+By default, two themes are available. You can specify them using the `THEME` setting or by passing the
+``-t`` option to the ``pelican`` command:
 
 * notmyidea
-* simple (a synonym for "full text" :)
-
-You can define your own theme too, and specify its placement in the same
-manner. (Be sure to specify the full absolute path to it.)
-
-Here is :doc:`a guide on how to create your theme <themes>`
-
-You can find a list of themes at http://github.com/getpelican/pelican-themes.
+* simple (a synonym for "plain text" :)
 
+There are a number of other themes available at http://github.com/getpelican/pelican-themes.
 Pelican comes with :doc:`pelican-themes`, a small script for managing themes.
 
-The `notmyidea` theme can make good use of the following settings. I recommend
-using them in your themes as well.
+You can define your own theme, either by starting from scratch or by duplicating
+and modifying a pre-existing theme. Here is :doc:`a guide on how to create your theme <themes>`.
+
+Following are example ways to specify your preferred theme::
+
+    # Specify name of a built-in theme
+    THEME = "notmyidea"
+    # Specify name of a theme installed via the pelican-themes tool
+    THEME = "chunk"
+    # Specify a customized theme, via path relative to the settings file
+    THEME = "themes/mycustomtheme"
+    # Specify a customized theme, via absolute path
+    THEME = "~/projects/mysite/themes/mycustomtheme"
+
+The built-in `notmyidea` theme can make good use of the following settings. Feel
+free to use them in your themes as well.
 
 =======================   =======================================================
 Setting name              What does it do ?

From c08ab18bffd5f5349095381096b48bf62b29eefc Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 11 Sep 2012 09:27:26 -0700
Subject: [PATCH 0928/2864] Clarify specifying paths in settings. Closes #477.

---
 docs/settings.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 6da1fb14..9b3295a6 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -16,6 +16,9 @@ False, None, etc.), dictionaries, or tuples should *not* be enclosed in
 quotation marks. All other values (i.e., strings) *must* be enclosed in
 quotation marks.
 
+Unless otherwise specified, settings that refer to paths can be either absolute or relative to the
+configuration file.
+
 The settings you define in the configuration file will be passed to the
 templates, which allows you to use your settings to add site-wide content.
 
@@ -58,10 +61,10 @@ Setting name (default value)                                            What doe
                                                                         Python-Markdown documentation for a complete list of
                                                                         supported extensions.
 `OUTPUT_PATH` (``'output/'``)                                           Where to output the generated files.
-`PATH` (``None``)                                                       Path to look at for input files.
-`PAGE_DIR` (``'pages'``)                                                Directory to look at for pages.
+`PATH` (``None``)                                                       Path to content directory to be processed by Pelican.
+`PAGE_DIR` (``'pages'``)                                                Directory to look at for pages, relative to `PATH`.
 `PAGE_EXCLUDES` (``()``)                                                A list of directories to exclude when looking for pages.
-`ARTICLE_DIR` (``''``)                                                  Directory to look at for articles.
+`ARTICLE_DIR` (``''``)                                                  Directory to look at for articles, relative to `PATH`.
 `ARTICLE_EXCLUDES`: (``('pages',)``)                                    A list of directories to exclude when looking for articles.
 `PDF_GENERATOR` (``False``)                                             Set to True if you want to have PDF versions
                                                                         of your documents. You will need to install

From cd85151f97bef9d50f2f92e3cfc05657ea037ddb Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 14 Sep 2012 10:06:42 -0700
Subject: [PATCH 0929/2864] Add Typogrify to docs as optional dependency

---
 docs/getting_started.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 985718b5..85a1b559 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -69,6 +69,7 @@ Optionally:
 
 * pygments, for syntax highlighting
 * Markdown, for supporting Markdown as an input format
+* Typogrify, for typographical enhancements
 
 Kickstart a blog
 ================

From 61fe02f4116c78579b92338909086b408056fdce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <hubscher.remy@gmail.com>
Date: Mon, 17 Sep 2012 14:47:05 +0200
Subject: [PATCH 0930/2864] fix-pelican-rsync_upload-makefile

---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 4c5a4fcb..8e5c80f9 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -61,7 +61,7 @@ ssh_upload: publish
 	scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 rsync_upload: publish
-	rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+	rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR) $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
 dropbox_upload: publish
 	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)

From 7d1c362635275012007398cfa1fa174247fa5b50 Mon Sep 17 00:00:00 2001
From: Remi Rampin <remirampin@gmail.com>
Date: Mon, 17 Sep 2012 22:36:35 -0400
Subject: [PATCH 0931/2864] Fixed escaping in files generated from quickstart

Variables are properly escaped before they are replaced in the
templates.
---
 pelican/tools/pelican_quickstart.py       | 14 +++++++++++---
 pelican/tools/templates/pelicanconf.py.in |  6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index c8064bf1..3ec8d55c 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -167,7 +167,7 @@ Please answer the following questions so this script can generate the files need
         if ask('Do you want to upload your website using FTP?', answer=bool, default=False):
             CONF['ftp_host'] = ask('What is the hostname of your FTP server?', str, CONF['ftp_host'])
             CONF['ftp_user'] = ask('What is your username on that server?', str, CONF['ftp_user'])
-            CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ftp_target_dir']) 
+            CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ftp_target_dir'])
         if ask('Do you want to upload your website using SSH?', answer=bool, default=False):
             CONF['ssh_host'] = ask('What is the hostname of your SSH server?', str, CONF['ssh_host'])
             CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])
@@ -188,9 +188,12 @@ Please answer the following questions so this script can generate the files need
 
     try:
         with open(os.path.join(CONF['basedir'], 'pelicanconf.py'), 'w') as fd:
+            conf_python = dict()
+            for key, value in CONF.iteritems():
+                conf_python[key] = repr(value)
             for line in get_template('pelicanconf.py'):
                 template = string.Template(line)
-                fd.write(template.safe_substitute(CONF))
+                fd.write(template.safe_substitute(conf_python))
             fd.close()
     except OSError, e:
         print('Error: {0}'.format(e))
@@ -215,11 +218,16 @@ Please answer the following questions so this script can generate the files need
             print('Error: {0}'.format(e))
 
     if develop:
+        conf_shell = dict()
+        for key, value in CONF.iteritems():
+            if isinstance(value, basestring) and ' ' in value:
+                value = '"' + value.replace('"', '\\"') + '"'
+            conf_shell[key] = value
         try:
             with open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w') as fd:
                 for line in get_template('develop_server.sh'):
                     template = string.Template(line)
-                    fd.write(template.safe_substitute(CONF))
+                    fd.write(template.safe_substitute(conf_shell))
                 fd.close()
                 os.chmod((os.path.join(CONF['basedir'], 'develop_server.sh')), 0755)
         except OSError, e:
diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in
index 07e286cd..d59a7989 100644
--- a/pelican/tools/templates/pelicanconf.py.in
+++ b/pelican/tools/templates/pelicanconf.py.in
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*- #
 
-AUTHOR = u"$author"
-SITENAME = u"$sitename"
+AUTHOR = $author
+SITENAME = $sitename
 SITEURL = ''
 
 TIMEZONE = 'Europe/Paris'
 
-DEFAULT_LANG = '$lang'
+DEFAULT_LANG = $lang
 
 # Blogroll
 LINKS =  (('Pelican', 'http://docs.notmyidea.org/alexis/pelican/'),

From da1efcd8478c2b98f744c3844a8fd3ce3422fb1d Mon Sep 17 00:00:00 2001
From: Chris Streeter <chris@chrisstreeter.com>
Date: Wed, 19 Sep 2012 10:24:51 -0700
Subject: [PATCH 0932/2864] Correctly use the right variable for webassets

According to [the webasset docs](http://webassets.readthedocs.org/en/latest/integration/jinja2.html#using-the-tag)
the variable should be `ASSET_URL` instead of `ASSETS_URL`.
---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9b3295a6..3bb9c173 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -509,7 +509,7 @@ Another example for Javascript:
 .. code-block:: jinja
 
     {% assets filters="uglifyjs,gzip", output="js/packed.js", "js/jquery.js", "js/base.js", "js/widgets.js" %}
-        <script src="{{ ASSETS_URL }}"></script>
+        <script src="{{ ASSET_URL }}"></script>
     {% endassets %}
 
 The above will produce a minified and gzipped JS file:

From d718bc2eba7b0e4d3a81531175cf4d7f40f972d6 Mon Sep 17 00:00:00 2001
From: Chris Streeter <chris@chrisstreeter.com>
Date: Sun, 23 Sep 2012 13:55:22 -0700
Subject: [PATCH 0933/2864] Apply the string formatting to {TAG,CATEGORY}_FEED
 urls.

---
 pelican/themes/simple/templates/base.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 1f55a40f..c1d9cb78 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -11,16 +11,16 @@
         <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
         {% if CATEGORY_FEED_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
         {% endif %}
         {% if CATEGORY_FEED_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
         {% endif %}
         {% if TAG_FEED_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
         {% endif %}
         {% if TAG_FEED_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
         {% endif %}
         {% endblock head %}
 </head>

From ffc8ec7a5bee49c8b71bfc3e1cd1f2c3254ac1ac Mon Sep 17 00:00:00 2001
From: tBunnyMan <WagThatTail@Me.com>
Date: Fri, 28 Sep 2012 08:53:59 -0700
Subject: [PATCH 0934/2864] Add sleep to no files exception to avoid CPU load

---
 pelican/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0af52c44..6281675b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -309,6 +309,7 @@ def main():
                     if files_found_error == True:
                         logger.warning("No valid files found in content. Nothing to generate.")
                         files_found_error = False
+                    time.sleep(1)  # sleep to avoid cpu load
                 except Exception, e:
                     logger.warning(
                         "Caught exception \"{}\". Reloading.".format(e)

From ee36f53cb248903f6fb0a88cc607f163ff539c69 Mon Sep 17 00:00:00 2001
From: Thanos Lefteris <alefteris@gmail.com>
Date: Mon, 1 Oct 2012 17:54:20 +0300
Subject: [PATCH 0935/2864] Monospace default values of settings

---
 docs/settings.rst | 62 +++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 3bb9c173..d721ede1 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -151,37 +151,37 @@ Also, you can use other file metadata attributes as well:
 
 Example usage:
 
-* ARTICLE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'
-* ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'
+* ARTICLE_URL = ``'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'``
+* ARTICLE_SAVE_AS = ``'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'``
 
 This would save your articles in something like '/posts/2011/Aug/07/sample-post/index.html',
 and the URL to this would be '/posts/2011/Aug/07/sample-post/'.
 
-================================================    =====================================================
-Setting name (default value)                        what does it do?
-================================================    =====================================================
-`ARTICLE_URL` ('{slug}.html')                       The URL to refer to an ARTICLE.
-`ARTICLE_SAVE_AS` ('{slug}.html')                   The place where we will save an article.
-`ARTICLE_LANG_URL` ('{slug}-{lang}.html')           The URL to refer to an ARTICLE which doesn't use the
-                                                    default language.
-`ARTICLE_LANG_SAVE_AS` ('{slug}-{lang}.html'        The place where we will save an article which
-                                                    doesn't use the default language.
-`PAGE_URL` ('pages/{slug}.html')                    The URL we will use to link to a page.
-`PAGE_SAVE_AS` ('pages/{slug}.html')                The location we will save the page.
-`PAGE_LANG_URL` ('pages/{slug}-{lang}.html')        The URL we will use to link to a page which doesn't
-                                                    use the default language.
-`PAGE_LANG_SAVE_AS` ('pages/{slug}-{lang}.html')    The location we will save the page which doesn't
-                                                    use the default language.
-`AUTHOR_URL` ('author/{name}.html')                 The URL to use for an author.
-`AUTHOR_SAVE_AS` ('author/{name}.html')             The location to save an author.
-`CATEGORY_URL` ('category/{name}.html')             The URL to use for a category.
-`CATEGORY_SAVE_AS` ('category/{name}.html')         The location to save a category.
-`TAG_URL` ('tag/{name}.html')                       The URL to use for a tag.
-`TAG_SAVE_AS` ('tag/{name}.html')                   The location to save the tag page.
-`<DIRECT_TEMPLATE_NAME>_SAVE_AS`                    The location to save content generated from direct
-                                                    templates. Where <DIRECT_TEMPLATE_NAME> is the
-                                                    upper case template name.
-================================================    =====================================================
+====================================================    =====================================================
+Setting name (default value)                            What does it do?
+====================================================    =====================================================
+`ARTICLE_URL` (``'{slug}.html'``)                       The URL to refer to an ARTICLE.
+`ARTICLE_SAVE_AS` (``'{slug}.html'``)                   The place where we will save an article.
+`ARTICLE_LANG_URL` (``'{slug}-{lang}.html'``)           The URL to refer to an ARTICLE which doesn't use the
+                                                        default language.
+`ARTICLE_LANG_SAVE_AS` (``'{slug}-{lang}.html'``)       The place where we will save an article which
+                                                        doesn't use the default language.
+`PAGE_URL` (``'pages/{slug}.html'``)                    The URL we will use to link to a page.
+`PAGE_SAVE_AS` (``'pages/{slug}.html'``)                The location we will save the page.
+`PAGE_LANG_URL` (``'pages/{slug}-{lang}.html'``)        The URL we will use to link to a page which doesn't
+                                                        use the default language.
+`PAGE_LANG_SAVE_AS` (``'pages/{slug}-{lang}.html'``)    The location we will save the page which doesn't
+                                                        use the default language.
+`AUTHOR_URL` (``'author/{name}.html'``)                 The URL to use for an author.
+`AUTHOR_SAVE_AS` (``'author/{name}.html'``)             The location to save an author.
+`CATEGORY_URL` (``'category/{name}.html'``)             The URL to use for a category.
+`CATEGORY_SAVE_AS` (``'category/{name}.html'``)         The location to save a category.
+`TAG_URL` (``'tag/{name}.html'``)                       The URL to use for a tag.
+`TAG_SAVE_AS` (``'tag/{name}.html'``)                   The location to save the tag page.
+`<DIRECT_TEMPLATE_NAME>_SAVE_AS`                        The location to save content generated from direct
+                                                        templates. Where <DIRECT_TEMPLATE_NAME> is the
+                                                        upper case template name.
+====================================================    =====================================================
 
 .. note::
 
@@ -320,10 +320,10 @@ You can use the following settings to configure the pagination.
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`DEFAULT_ORPHANS` (0)                               The minimum number of articles allowed on the
+`DEFAULT_ORPHANS` (``0``)                           The minimum number of articles allowed on the
                                                     last page. Use this when you don't want to
                                                     have a last page with very few articles.
-`DEFAULT_PAGINATION` (False)                        The maximum number of articles to include on a
+`DEFAULT_PAGINATION` (``False``)                    The maximum number of articles to include on a
                                                     page, not including orphans. False to disable
                                                     pagination.
 ================================================    =====================================================
@@ -337,9 +337,9 @@ following settings.
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
-`TAG_CLOUD_STEPS` (4)                               Count of different font sizes in the tag
+`TAG_CLOUD_STEPS` (``4``)                           Count of different font sizes in the tag
                                                     cloud.
-`TAG_CLOUD_MAX_ITEMS` (100)                         Maximum number of tags in the cloud.
+`TAG_CLOUD_MAX_ITEMS` (``100``)                     Maximum number of tags in the cloud.
 ================================================    =====================================================
 
 The default theme does not support tag clouds, but it is pretty easy to add::

From 7892c33ec959dac68f7708be7f130f97a812f1e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 12 Oct 2012 22:20:47 +0200
Subject: [PATCH 0936/2864] Fix the settings about DATE_FORMAT*S*. Fix 540

---
 docs/settings.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d721ede1..03f1e4fa 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -204,14 +204,14 @@ Have a look at `the wikipedia page`_ to get a list of valid timezone values.
 Date format and locale
 ----------------------
 
-If no DATE_FORMAT is set, fall back to DEFAULT_DATE_FORMAT. If you need to
+If no DATE_FORMATS is set, fall back to DEFAULT_DATE_FORMAT. If you need to
 maintain multiple languages with different date formats, you can set this dict
 using language name (``lang`` in your posts) as key. Regarding available format
 codes, see `strftime document of python`_ :
 
 .. parsed-literal::
 
-    DATE_FORMAT = {
+    DATE_FORMATS = {
         'en': '%a, %d %b %Y',
         'jp': '%Y-%m-%d(%a)',
     }
@@ -230,13 +230,13 @@ above:
 
 .. parsed-literal::
     # On Unix/Linux
-    DATE_FORMAT = {
+    DATE_FORMATS = {
         'en': ('en_US','%a, %d %b %Y'),
         'jp': ('ja_JP','%Y-%m-%d(%a)'),
     }
 
     # On Windows
-    DATE_FORMAT = {
+    DATE_FORMATS = {
         'en': ('usa','%a, %d %b %Y'),
         'jp': ('jpn','%Y-%m-%d(%a)'),
     }

From 9add2151c37a499efb8655dc87f0685112b2a2b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 12 Oct 2012 22:37:58 +0200
Subject: [PATCH 0937/2864] Don't force the number of categories to be equal to
 1. Fixes #521

---
 pelican/tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index b6437c92..c2d259f2 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -216,7 +216,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
         filename = os.path.basename(filename)
 
         # option to put files in directories with categories names
-        if dircat and (len(categories) == 1):
+        if dircat and (len(categories) > 0):
             catname = slugify(categories[0])
             out_filename = os.path.join(output_path, catname, filename+ext)
             if not os.path.isdir(os.path.join(output_path, catname)):

From cce962f3f00adb602849b93e88a32a2ba48aa37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 12 Oct 2012 22:56:45 +0200
Subject: [PATCH 0938/2864] Change the background color of the code-blocks on
 the default theme. Fix #511

---
 pelican/themes/notmyidea/static/css/main.css    | 2 +-
 pelican/themes/notmyidea/static/css/pygment.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index b4ba7888..3d94200b 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -97,7 +97,7 @@ dl {margin: 0 0 1.5em 0;}
 dt {font-weight: bold;}
 dd {margin-left: 1.5em;}
 
-pre{background-color: #000; padding: 10px; color: #fff; margin: 10px; overflow: auto;}
+pre{background-color:  rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
 
 /* Quotes */
 blockquote {
diff --git a/pelican/themes/notmyidea/static/css/pygment.css b/pelican/themes/notmyidea/static/css/pygment.css
index 594b0fa3..fdd056f6 100644
--- a/pelican/themes/notmyidea/static/css/pygment.css
+++ b/pelican/themes/notmyidea/static/css/pygment.css
@@ -1,5 +1,5 @@
 .hll {
-background-color:#FFFFCC;
+background-color:#eee;
 }
 .c {
 color:#408090;

From 34218ee132e59e5ae77535500a209085f8b28a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 12 Oct 2012 23:28:18 +0200
Subject: [PATCH 0939/2864] fix the tests

---
 .../output/basic/drafts/a-draft-article.html  |  4 ++--
 tests/output/basic/feeds/all-fr.atom.xml      |  2 +-
 tests/output/basic/oh-yeah-fr.html            |  4 ++--
 tests/output/basic/tag/bar.html               | 16 +++++++--------
 tests/output/basic/tag/baz.html               | 16 +++++++--------
 tests/output/basic/tag/foo.html               | 16 +++++++--------
 tests/output/basic/theme/css/main.css         |  5 +++--
 tests/output/basic/theme/css/pygment.css      |  2 +-
 tests/output/custom/tag/bar.html              | 20 +++++++++----------
 tests/output/custom/tag/baz.html              | 20 +++++++++----------
 tests/output/custom/tag/foo.html              | 20 +++++++++----------
 tests/output/custom/theme/css/main.css        |  5 +++--
 tests/output/custom/theme/css/pygment.css     |  2 +-
 13 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index 24c1c3bc..7da9c416 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -55,8 +55,8 @@
 
     <div class="entry-content">
       <footer class="post-info">
-        <abbr class="published" title="2012-07-26T22:04:43.481849">
-                Thu 26 July 2012
+        <abbr class="published" title="2012-09-17T15:02:39.591671">
+                Mon 17 September 2012
         </abbr>
 
         
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index 39220a4f..979e21ef 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-07-26T22:04:43Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-07-26T22:04:43Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-07-26:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-09-17T15:02:39Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-09-17T15:02:39Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-09-17:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </summary></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index cfcb7f1a..335428ef 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -55,8 +55,8 @@
 
     <div class="entry-content">
       <footer class="post-info">
-        <abbr class="published" title="2012-07-26T22:04:43.481849">
-                Thu 26 July 2012
+        <abbr class="published" title="2012-09-17T15:02:39.591671">
+                Mon 17 September 2012
         </abbr>
 
         
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index f58ba6bd..77462fe6 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -51,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -68,10 +68,10 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 
                 </article>
                 
@@ -92,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -113,13 +113,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <a class="readmore" href=".././second-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index a5f9d9cc..4ebe1f1d 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -51,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -68,10 +68,10 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 
                 </article>
                 
@@ -92,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -113,13 +113,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <a class="readmore" href=".././second-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 2756f57d..d1e2dbb8 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -51,7 +51,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -68,10 +68,10 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 
                 </article>
                 
@@ -92,8 +92,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -113,13 +113,13 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
+                <a class="readmore" href=".././second-article.html">read more</a>
                 
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index bd1eba75..3d94200b 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -97,7 +97,7 @@ dl {margin: 0 0 1.5em 0;}
 dt {font-weight: bold;}
 dd {margin-left: 1.5em;}
 
-pre{background-color: #000; padding: 10px; color: #fff; margin: 10px; overflow: auto;}
+pre{background-color:  rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
 
 /* Quotes */
 blockquote {
@@ -308,7 +308,8 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
-		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.org');}
+		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
+        .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 
 /*
 	About
diff --git a/tests/output/basic/theme/css/pygment.css b/tests/output/basic/theme/css/pygment.css
index 594b0fa3..fdd056f6 100644
--- a/tests/output/basic/theme/css/pygment.css
+++ b/tests/output/basic/theme/css/pygment.css
@@ -1,5 +1,5 @@
 .hll {
-background-color:#FFFFCC;
+background-color:#eee;
 }
 .c {
 color:#408090;
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 087b94b4..03ce0de3 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -59,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -76,11 +76,11 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -100,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -121,14 +121,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
-                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index 9aab4ffc..e32cc9ea 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -59,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -76,11 +76,11 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -100,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -121,14 +121,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
-                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index 42f12a61..9c295933 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -59,7 +59,7 @@
         
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -76,11 +76,11 @@
 
 Translations: 
     
-        <a href=".././second-article-fr.html">fr</a>
+        <a href=".././second-article.html">en</a>
     
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
+</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
                 
             </aside><!-- /#featured -->
@@ -100,8 +100,8 @@ Translations:
             
             <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article-fr.html" rel="bookmark"
-                           title="Permalink to Deuxième article">Deuxième article</a></h1>
+                    <h1><a href=".././second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
@@ -121,14 +121,14 @@ Translations:
 
 Translations: 
     
-        <a href=".././second-article.html">en</a>
+        <a href=".././second-article-fr.html">fr</a>
     
 
 </footer><!-- /.post-info -->
-                <p>Ceci est un article, en français.</p>
+                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article-fr.html">read more</a>
-                <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
+                <a class="readmore" href=".././second-article.html">read more</a>
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </div><!-- /.entry-content -->
             </article></li>
         
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
index bd1eba75..3d94200b 100644
--- a/tests/output/custom/theme/css/main.css
+++ b/tests/output/custom/theme/css/main.css
@@ -97,7 +97,7 @@ dl {margin: 0 0 1.5em 0;}
 dt {font-weight: bold;}
 dd {margin-left: 1.5em;}
 
-pre{background-color: #000; padding: 10px; color: #fff; margin: 10px; overflow: auto;}
+pre{background-color:  rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
 
 /* Quotes */
 blockquote {
@@ -308,7 +308,8 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
-		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.org');}
+		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
+        .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 
 /*
 	About
diff --git a/tests/output/custom/theme/css/pygment.css b/tests/output/custom/theme/css/pygment.css
index 594b0fa3..fdd056f6 100644
--- a/tests/output/custom/theme/css/pygment.css
+++ b/tests/output/custom/theme/css/pygment.css
@@ -1,5 +1,5 @@
 .hll {
-background-color:#FFFFCC;
+background-color:#eee;
 }
 .c {
 color:#408090;

From 51c08601dc8c79095d001aabe992243bdc75a9be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sat, 13 Oct 2012 01:10:52 +0200
Subject: [PATCH 0940/2864] oops

---
 docs/plugins.rst | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 632408f0..00e8ba04 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -54,17 +54,15 @@ List of signals
 
 Here is the list of currently implemented signals:
 
-=========================   =======================================   =========================================
-Signal                      Arguments                                 Description
-=========================   =======================================   =========================================
->>>>>>> rach/master
+=========================   ============================   ===========================================================================
+Signal                      Arguments                      Description
+=========================   ============================   ===========================================================================
 initialized                 pelican object
 finalized                   pelican object                 invoked after all the generators are executed and just before pelican exits
                                                            usefull for custom post processing actions, such as: 
                                                            - minifying js/css assets.
                                                            - notify/ping search engines with an updated sitemap.
 article_generate_context    article_generator, metadata
-<<<<<<< HEAD
 article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
 get_generators              generators                     invoked in Pelican.get_generator_classes,
                                                            can return a Generator, or several

From 41b93f3dccda613ef252e00722fdaae6938fb328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sat, 13 Oct 2012 02:12:41 +0200
Subject: [PATCH 0941/2864] add gittip to the output

---
 tests/output/basic/theme/images/icons/gittip.png  | Bin 0 -> 671 bytes
 tests/output/custom/theme/images/icons/gittip.png | Bin 0 -> 671 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/output/basic/theme/images/icons/gittip.png
 create mode 100644 tests/output/custom/theme/images/icons/gittip.png

diff --git a/tests/output/basic/theme/images/icons/gittip.png b/tests/output/basic/theme/images/icons/gittip.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb12a1391ace96a9d4cedffebedd7db7d6a84d48
GIT binary patch
literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq(
z0|^AkZL;YA00JLLL_t(I%cYY)XcJ)=#((d3xhB;?Z4q3Q2+iPN8`Po0btyO{gS$f$
z>?&0%sHg=UtYR`L-82b;;35bKaWNLW7QsJgH?8zfG)VDJ#Ui$(&Fhf6cnLcB4F~sq
z&+|Tazk5#bRx06;FS(?XPM@lt5s_ga>K!ksYDGjcxuW~t*8&JYI_Z!rx}*|LUW5@q
z{j<PQKvXH@OK!^dNFe!*LVu@=zfFO;T+tm!C7fnTD&gc2Mg-Wb*V){x6OMEv(j2F%
zY^<+iSq8f+j5a3~@+CJV>7>&K%=-!BSF%K72e^Ox7SrX27-KkiWRTI*7g_!Knd|3I
zva$Zlm&dGlZ0}VOIjpL3?Dz?WjwZ3~E)ES2@nz)`k!{;KJ9(3EB*M;~UV3-$;ko++
zV~nb5IONe50Aoy(tO%+~dh8rO*Va(g)?QPio=k>~|EWZTnaAZ8ED<3Tve~h#r^P}<
zn5jI%vO>NrYJ!Ao)kR)Cd+G&r&{yT-@&Yesr`z@ou;ky^b{A9EE>W*<psH<V5#h##
zF~X7Vpnu7zYK1^%V{41cr$$@v?3=R_<NWx(+VN0YF(Q)bY+bFoKz3pr5kW+_JC$Yb
z#cYekA54<5Ucak;i^uluM~F)R;7YAZ?ZYC=^KU6XxJM{tx3$qL(w+7yEB(O`Z8T`8
zVp-Ndt86?oxuQD&6oMgQOwg>}wU8^i1L<TlSpN5S{tclW`<m8?-?RV#002ovPDHLk
FV1iF3E`tC7

literal 0
HcmV?d00001

diff --git a/tests/output/custom/theme/images/icons/gittip.png b/tests/output/custom/theme/images/icons/gittip.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb12a1391ace96a9d4cedffebedd7db7d6a84d48
GIT binary patch
literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq(
z0|^AkZL;YA00JLLL_t(I%cYY)XcJ)=#((d3xhB;?Z4q3Q2+iPN8`Po0btyO{gS$f$
z>?&0%sHg=UtYR`L-82b;;35bKaWNLW7QsJgH?8zfG)VDJ#Ui$(&Fhf6cnLcB4F~sq
z&+|Tazk5#bRx06;FS(?XPM@lt5s_ga>K!ksYDGjcxuW~t*8&JYI_Z!rx}*|LUW5@q
z{j<PQKvXH@OK!^dNFe!*LVu@=zfFO;T+tm!C7fnTD&gc2Mg-Wb*V){x6OMEv(j2F%
zY^<+iSq8f+j5a3~@+CJV>7>&K%=-!BSF%K72e^Ox7SrX27-KkiWRTI*7g_!Knd|3I
zva$Zlm&dGlZ0}VOIjpL3?Dz?WjwZ3~E)ES2@nz)`k!{;KJ9(3EB*M;~UV3-$;ko++
zV~nb5IONe50Aoy(tO%+~dh8rO*Va(g)?QPio=k>~|EWZTnaAZ8ED<3Tve~h#r^P}<
zn5jI%vO>NrYJ!Ao)kR)Cd+G&r&{yT-@&Yesr`z@ou;ky^b{A9EE>W*<psH<V5#h##
zF~X7Vpnu7zYK1^%V{41cr$$@v?3=R_<NWx(+VN0YF(Q)bY+bFoKz3pr5kW+_JC$Yb
z#cYekA54<5Ucak;i^uluM~F)R;7YAZ?ZYC=^KU6XxJM{tx3$qL(w+7yEB(O`Z8T`8
zVp-Ndt86?oxuQD&6oMgQOwg>}wU8^i1L<TlSpN5S{tclW`<m8?-?RV#002ovPDHLk
FV1iF3E`tC7

literal 0
HcmV?d00001


From 22f3c40385366efa27edbaed9886aeaaf9a9dde5 Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Sat, 13 Oct 2012 19:17:16 +0200
Subject: [PATCH 0942/2864] Add a new signal article_generator_finalized,
 called at the end of ArticleGenerator.generate_context

---
 docs/plugins.rst      | 33 +++++++++++++++++----------------
 pelican/generators.py |  2 ++
 pelican/signals.py    |  1 +
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 00e8ba04..c275c57c 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -54,22 +54,23 @@ List of signals
 
 Here is the list of currently implemented signals:
 
-=========================   ============================   ===========================================================================
-Signal                      Arguments                      Description
-=========================   ============================   ===========================================================================
-initialized                 pelican object
-finalized                   pelican object                 invoked after all the generators are executed and just before pelican exits
-                                                           usefull for custom post processing actions, such as: 
-                                                           - minifying js/css assets.
-                                                           - notify/ping search engines with an updated sitemap.
-article_generate_context    article_generator, metadata
-article_generator_init      article_generator              invoked in the ArticlesGenerator.__init__
-get_generators              generators                     invoked in Pelican.get_generator_classes,
-                                                           can return a Generator, or several
-                                                           generator in a tuple or in a list.
-pages_generate_context      pages_generator, metadata
-pages_generator_init        pages_generator                invoked in the PagesGenerator.__init__
-=========================   ============================   ===========================================================================
+=============================   ============================   ===========================================================================
+Signal                          Arguments                       Description
+=============================   ============================   ===========================================================================
+initialized                     pelican object
+finalized                       pelican object                  invoked after all the generators are executed and just before pelican exits
+                                                                usefull for custom post processing actions, such as: 
+                                                                - minifying js/css assets.
+                                                                - notify/ping search engines with an updated sitemap.
+article_generate_context        article_generator, metadata
+article_generator_init          article_generator               invoked in the ArticlesGenerator.__init__
+article_generator_finalized     article_generator               invoked at the end of ArticlesGenerator.generate_context
+get_generators                  generators                      invoked in Pelican.get_generator_classes,
+                                                                can return a Generator, or several
+                                                                generator in a tuple or in a list.
+pages_generate_context          pages_generator, metadata
+pages_generator_init            pages_generator                 invoked in the PagesGenerator.__init__
+=============================   ============================   ===========================================================================
 
 The list is currently small, don't hesitate to add signals and make a pull
 request if you need them!
diff --git a/pelican/generators.py b/pelican/generators.py
index 461c8b46..ff5ebdba 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -360,6 +360,8 @@ class ArticlesGenerator(Generator):
         self._update_context(('articles', 'dates', 'tags', 'categories',
                               'tag_cloud', 'authors', 'related_posts'))
 
+        signals.article_generator_finalized.send(self)
+
     def generate_output(self, writer):
         self.generate_feeds(writer)
         self.generate_pages(writer)
diff --git a/pelican/signals.py b/pelican/signals.py
index f3e16e76..73e718b5 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -4,6 +4,7 @@ initialized = signal('pelican_initialized')
 finalized = signal('pelican_finalized')
 article_generate_context = signal('article_generate_context')
 article_generator_init = signal('article_generator_init')
+article_generator_finalized = signal('article_generate_finalized')
 get_generators = signal('get_generators')
 pages_generate_context = signal('pages_generate_context')
 pages_generator_init = signal('pages_generator_init')

From 178d63b154b2b0582b367447eaf34ecb7d5465db Mon Sep 17 00:00:00 2001
From: FELD Boris <lothiraldan@gmail.com>
Date: Sat, 13 Oct 2012 19:21:20 +0200
Subject: [PATCH 0943/2864] Add a multi_part plugin

It list all parts of a blog post, helping to create a navigation menu between all the parts
---
 pelican/plugins/multi_part.py | 59 +++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 pelican/plugins/multi_part.py

diff --git a/pelican/plugins/multi_part.py b/pelican/plugins/multi_part.py
new file mode 100644
index 00000000..0581b501
--- /dev/null
+++ b/pelican/plugins/multi_part.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+"""
+Copyright (c) FELD Boris <lothiraldan@gmail.com>
+
+Multiple part support
+=====================
+
+Create a navigation menu for multi-part related_posts
+
+Article metadata:
+------------------
+
+:parts:  a unique identifier for multi-part posts, must be the same in each
+post part.
+
+Usage
+-----
+    {% if article.metadata.parts_articles %}
+        <ol>
+        {% for part_article in article.metadata.parts_articles %}
+            {% if part_article == article %}
+                <li>
+                    <a href='{{ SITEURL }}/{{ part_article.url }}'><b>{{ part_article.title }}</b>
+                    </a>
+                </li>
+            {% else %}
+                <li>
+                    <a href='{{ SITEURL }}/{{ part_article.url }}'>{{ part_article.title }}
+                    </a>
+                </li>
+            {% endif %}
+        {% endfor %}
+        </ol>
+    {% endif %}
+"""
+from collections import defaultdict
+
+from pelican import signals
+
+
+def aggregate_multi_part(generator):
+        multi_part = defaultdict(list)
+
+        for article in generator.articles:
+            if 'parts' in article.metadata:
+                multi_part[article.metadata['parts']].append(article)
+
+        for part_id in multi_part:
+            parts = multi_part[part_id]
+
+            # Sort by date
+            parts.sort(key=lambda x: x.metadata['date'])
+
+            for article in parts:
+                article.metadata['parts_articles'] = parts
+
+
+def register():
+    signals.article_generator_finalized.connect(aggregate_multi_part)

From 136e2e46d8d62dc448f8d29fe8bb32e789bc5ddc Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Mon, 15 Oct 2012 22:49:24 +0200
Subject: [PATCH 0944/2864] remove useless default_settings param in
 configure_settings

---
 pelican/settings.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 7d0f6cdb..a5e0491c 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -87,7 +87,7 @@ def read_settings(filename=None):
         local_settings = get_settings_from_file(filename)
     else:
         local_settings = copy.deepcopy(_DEFAULT_CONFIG)
-    configured_settings = configure_settings(local_settings, None, filename)
+    configured_settings = configure_settings(local_settings, filename)
     return configured_settings
 
 
@@ -115,11 +115,8 @@ def get_settings_from_file(filename, default_settings=_DEFAULT_CONFIG):
     return get_settings_from_module(module, default_settings=default_settings)
 
 
-def configure_settings(settings, default_settings=None, filename=None):
+def configure_settings(settings, filename=None):
     """Provide optimizations, error checking, and warnings for loaded settings"""
-    if default_settings is None:
-        default_settings = copy.deepcopy(_DEFAULT_CONFIG)
-
     # Make the paths relative to the settings file
     if filename:
         for path in ['PATH', 'OUTPUT_PATH']:

From 4029f2ec826775cae2929818c064a7d5f2188134 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 16 Oct 2012 01:35:35 +0200
Subject: [PATCH 0945/2864] refactoring so that command line options override
 settings

and Pelican class now accepts a single parameter ``settings``
---
 pelican/__init__.py    | 70 ++++++++++++++++++------------------------
 pelican/settings.py    | 49 +++++++++++++++++++----------
 tests/test_pelican.py  | 13 ++++++--
 tests/test_settings.py | 13 +++++---
 4 files changed, 81 insertions(+), 64 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 9bcac779..b93dee06 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,4 +1,3 @@
-import copy
 import os
 import re
 import sys
@@ -12,7 +11,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 StaticGenerator, PdfGenerator,
                                 LessCSSGenerator, SourceFileGenerator)
 from pelican.log import init
-from pelican.settings import read_settings, _DEFAULT_CONFIG
+from pelican.settings import read_settings
 from pelican.utils import (clean_output_dir, files_changed, file_changed,
                            NoFilesError)
 from pelican.writers import Writer
@@ -26,42 +25,21 @@ logger = logging.getLogger(__name__)
 
 
 class Pelican(object):
-    def __init__(self, settings=None, path=None, theme=None, output_path=None,
-            markup=None, delete_outputdir=False, plugin_path=None):
-        """Read the settings, and performs some checks on the environment
-        before doing anything else.
+    def __init__(self, settings):
+        """
+        Pelican initialisation, performs some checks on the environment before
+        doing anything else.
         """
-        if settings is None:
-            settings = copy.deepcopy(_DEFAULT_CONFIG)
-
-        self.path = path or settings['PATH']
-        if not self.path:
-            raise Exception('You need to specify a path containing the content'
-                    ' (see pelican --help for more information)')
-
-        if self.path.endswith('/'):
-            self.path = self.path[:-1]
 
         # define the default settings
         self.settings = settings
-
         self._handle_deprecation()
 
-        self.theme = theme or settings['THEME']
-        output_path = output_path or settings['OUTPUT_PATH']
-        self.output_path = os.path.realpath(output_path)
-        self.markup = markup or settings['MARKUP']
-        self.delete_outputdir = delete_outputdir \
-                                    or settings['DELETE_OUTPUT_DIRECTORY']
-
-        # find the theme in pelican.theme if the given one does not exists
-        if not os.path.exists(self.theme):
-            theme_path = os.sep.join([os.path.dirname(
-                os.path.abspath(__file__)), "themes/%s" % self.theme])
-            if os.path.exists(theme_path):
-                self.theme = theme_path
-            else:
-                raise Exception("Impossible to find the theme %s" % theme)
+        self.path = settings['PATH']
+        self.theme = settings['THEME']
+        self.output_path = settings['OUTPUT_PATH']
+        self.markup = settings['MARKUP']
+        self.delete_outputdir = settings['DELETE_OUTPUT_DIRECTORY']
 
         self.init_path()
         self.init_plugins()
@@ -259,11 +237,26 @@ def parse_arguments():
     return parser.parse_args()
 
 
-def get_instance(args):
-    markup = [a.strip().lower() for a in args.markup.split(',')]\
-              if args.markup else None
+def get_config(args):
+    config = {}
+    if args.path:
+        config['PATH'] = os.path.abspath(os.path.expanduser(args.path))
+    if args.output:
+        config['OUTPUT_PATH'] = \
+                os.path.abspath(os.path.expanduser(args.output))
+    if args.markup:
+        config['MARKUP'] = [a.strip().lower() for a in args.markup.split(',')]
+    if args.theme:
+        abstheme = os.path.abspath(os.path.expanduser(args.theme))
+        config['THEME'] = abstheme if os.path.exists(abstheme) else args.theme
+    if args.delete_outputdir is not None:
+        config['DELETE_OUTPUT_DIRECTORY'] = args.delete_outputdir
+    return config
 
-    settings = read_settings(args.settings)
+
+def get_instance(args):
+
+    settings = read_settings(args.settings, override=get_config(args))
 
     cls = settings.get('PELICAN_CLASS')
     if isinstance(cls, basestring):
@@ -271,15 +264,12 @@ def get_instance(args):
         module = __import__(module)
         cls = getattr(module, cls_name)
 
-    return cls(settings, args.path, args.theme, args.output, markup,
-               args.delete_outputdir)
+    return cls(settings)
 
 
 def main():
     args = parse_arguments()
     init(args.verbosity)
-    # Split the markup languages only if some have been given. Otherwise,
-    # populate the variable with None.
     pelican = get_instance(args)
 
     try:
diff --git a/pelican/settings.py b/pelican/settings.py
index a5e0491c..27a0c51f 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -82,13 +82,24 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    }
 
 
-def read_settings(filename=None):
+def read_settings(filename=None, override=None):
     if filename:
         local_settings = get_settings_from_file(filename)
+        # Make the paths relative to the settings file
+        for p in ['PATH', 'OUTPUT_PATH', 'THEME']:
+            if p in local_settings and local_settings[p] is not None \
+                    and not isabs(local_settings[p]):
+                absp = os.path.abspath(os.path.normpath(os.path.join(
+                            os.path.dirname(filename), local_settings[p])))
+                if p != 'THEME' or os.path.exists(p):
+                    local_settings[p] = absp
     else:
         local_settings = copy.deepcopy(_DEFAULT_CONFIG)
-    configured_settings = configure_settings(local_settings, filename)
-    return configured_settings
+
+    if override:
+        local_settings.update(override)
+
+    return configure_settings(local_settings)
 
 
 def get_settings_from_module(module=None, default_settings=_DEFAULT_CONFIG):
@@ -98,9 +109,8 @@ def get_settings_from_module(module=None, default_settings=_DEFAULT_CONFIG):
 
     context = copy.deepcopy(default_settings)
     if module is not None:
-         context.update(
-             (k, v) for k, v in inspect.getmembers(module) if k.isupper()
-         )
+        context.update(
+                (k, v) for k, v in inspect.getmembers(module) if k.isupper())
     return context
 
 
@@ -115,16 +125,23 @@ def get_settings_from_file(filename, default_settings=_DEFAULT_CONFIG):
     return get_settings_from_module(module, default_settings=default_settings)
 
 
-def configure_settings(settings, filename=None):
-    """Provide optimizations, error checking, and warnings for loaded settings"""
-    # Make the paths relative to the settings file
-    if filename:
-        for path in ['PATH', 'OUTPUT_PATH']:
-            if path in settings:
-                if settings[path] is not None and not isabs(settings[path]):
-                    settings[path] = os.path.abspath(os.path.normpath(
-                        os.path.join(os.path.dirname(filename), settings[path]))
-                    )
+def configure_settings(settings):
+    """
+    Provide optimizations, error checking, and warnings for loaded settings
+    """
+    if not 'PATH' in settings or not os.path.isdir(settings['PATH']):
+        raise Exception('You need to specify a path containing the content'
+                ' (see pelican --help for more information)')
+
+    # find the theme in pelican.theme if the given one does not exists
+    if not os.path.isdir(settings['THEME']):
+        theme_path = os.sep.join([os.path.dirname(
+            os.path.abspath(__file__)), "themes/%s" % settings['THEME']])
+        if os.path.exists(theme_path):
+            settings['THEME'] = theme_path
+        else:
+            raise Exception("Impossible to find the theme %s"
+                    % settings['THEME'])
 
     # if locales is not a list, make it one
     locales = settings['LOCALE']
diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 78f083f9..10b40d38 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -55,7 +55,11 @@ class TestPelican(unittest.TestCase):
         with patch("pelican.contents.getenv") as mock_getenv:
             # force getenv('USER') to always return the same value
             mock_getenv.return_value = "Dummy Author"
-            pelican = Pelican(path=INPUT_PATH, output_path=self.temp_path)
+            settings = read_settings(filename=None, override={
+                'PATH': INPUT_PATH,
+                'OUTPUT_PATH': self.temp_path,
+                })
+            pelican = Pelican(settings=settings)
             pelican.run()
             diff = dircmp(
                     self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
@@ -63,8 +67,11 @@ class TestPelican(unittest.TestCase):
 
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work
-        pelican = Pelican(path=INPUT_PATH, output_path=self.temp_path,
-                            settings=read_settings(SAMPLE_CONFIG))
+        settings = read_settings(filename=SAMPLE_CONFIG, override={
+            'PATH': INPUT_PATH,
+            'OUTPUT_PATH': self.temp_path,
+            })
+        pelican = Pelican(settings=settings)
         pelican.run()
         diff = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "custom")))
         self.assertFilesEqual(diff)
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 873df824..379e3deb 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -56,16 +56,19 @@ class TestSettingsConfiguration(unittest.TestCase):
     def test_configure_settings(self):
         """Manipulations to settings should be applied correctly."""
 
-        # SITEURL should not have a trailing slash
-        settings = {'SITEURL': 'http://blog.notmyidea.org/', 'LOCALE': ''}
+        settings = {
+                'SITEURL': 'http://blog.notmyidea.org/',
+                'LOCALE': '',
+                'PATH': '.',
+                'THEME': DEFAULT_THEME,
+                }
         configure_settings(settings)
+        # SITEURL should not have a trailing slash
         self.assertEqual(settings['SITEURL'], 'http://blog.notmyidea.org')
 
         # FEED_DOMAIN, if undefined, should default to SITEURL
-        settings = {'SITEURL': 'http://blog.notmyidea.org', 'LOCALE': ''}
-        configure_settings(settings)
         self.assertEqual(settings['FEED_DOMAIN'], 'http://blog.notmyidea.org')
 
-        settings = {'FEED_DOMAIN': 'http://feeds.example.com', 'LOCALE': ''}
+        settings['FEED_DOMAIN'] = 'http://feeds.example.com'
         configure_settings(settings)
         self.assertEqual(settings['FEED_DOMAIN'], 'http://feeds.example.com')

From 94877e033b37e4d226528af935f45d4119f283d6 Mon Sep 17 00:00:00 2001
From: Brendan Wholihan <bwholihan@yahoo.co.uk>
Date: Thu, 18 Oct 2012 19:55:00 +0100
Subject: [PATCH 0946/2864] So that Authors display and output can be disabled
 for single user sites, allow the AUTHOR setting to be set to an empty string
 ''. An author is needed, but was defaults to OS user, or 'John Doe'. If a
 blank author is provided, it generated authors/.html file, and templates
 display just "by " Updated generators.py and templates to ignore Authors
 objects which have a blank name

---
 pelican/generators.py                                 | 11 ++++++-----
 pelican/themes/notmyidea/templates/article_infos.html |  2 +-
 pelican/themes/simple/templates/article.html          |  2 +-
 pelican/themes/simple/templates/index.html            |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 461c8b46..3056d6f7 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -223,11 +223,12 @@ class ArticlesGenerator(Generator):
         """Generate Author pages."""
         author_template = self.get_template('author')
         for aut, articles in self.authors:
-            dates = [article for article in self.dates if article in articles]
-            write(aut.save_as, author_template, self.context,
-                author=aut, articles=articles, dates=dates,
-                paginated={'articles': articles, 'dates': dates},
-                page_name=u'author/%s' % aut)
+            if aut.name:   # ignore authors with blank names
+                dates = [article for article in self.dates if article in articles]
+                write(aut.save_as, author_template, self.context,
+                    author=aut, articles=articles, dates=dates,
+                    paginated={'articles': articles, 'dates': dates},
+                    page_name=u'author/%s' % aut)
 
     def generate_drafts(self, write):
         """Generate drafts pages."""
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index a1993a09..78326fd1 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -3,7 +3,7 @@
                 {{ article.locale_date }}
         </abbr>
 
-        {% if article.author %}
+        {% if article.author.name %}
         <address class="vcard author">
                 By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
         </address>
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 16c34266..349b3107 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -10,7 +10,7 @@
     <abbr class="published" title="{{ article.date.isoformat() }}">
       {{ article.locale_date }}
     </abbr>
-    {% if article.author %}
+    {% if article.author.name %}
     <address class="vcard author">
       By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
     </address>
diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index dfdb0b45..ec278c4b 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -11,7 +11,7 @@
                 <header> <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
                 <footer class="post-info">
                     <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr>
-                    {% if article.author %}<address class="vcard author">By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></address>{% endif %}
+                    {% if article.author.name %}<address class="vcard author">By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></address>{% endif %}
                 </footer><!-- /.post-info -->
                 <div class="entry-content"> {{ article.summary }} </div><!-- /.entry-content -->
         </article></li>

From bc0f7ae4f63193b4c3cab76b69b834961a2e4949 Mon Sep 17 00:00:00 2001
From: Brendan Wholihan <bwholihan@yahoo.co.uk>
Date: Sat, 20 Oct 2012 16:35:24 +0100
Subject: [PATCH 0947/2864] Amended utils copy so that a warning is produced if
 a source file is not found in FILES_TO_COPY whilst copying. eg if there is a
 typo in the file name, or the file is moved.

---
 pelican/utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 7e9ab4cb..045bd206 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -92,7 +92,8 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
     elif os.path.isfile(source_):
         shutil.copy(source_, destination_)
         logger.info('copying %s to %s' % (source_, destination_))
-
+    else:
+        logger.warning('skipped copy %s to %s' % (source_, destination_))
 
 def clean_output_dir(path):
     """Remove all the files from the output directory"""

From a11726783ee2a4b359405b90c86d9af9b8e93a24 Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Mon, 22 Oct 2012 16:34:55 +0200
Subject: [PATCH 0948/2864] TRANSLATION_FEED is now split into
 TRANSLATION_FEED_ATOM and TRANSLATION_FEED_RSS to match the other feed
 configuration keys

Incidentally, Pelican can now generate RSS translation feeds.
---
 docs/fr/configuration.rst |  7 +++++--
 docs/settings.rst         | 13 +++++++------
 docs/themes.rst           |  3 ++-
 pelican/__init__.py       |  8 ++++++++
 pelican/generators.py     | 11 ++++++++---
 pelican/settings.py       |  2 +-
 6 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
index abfc7ef5..76f03a61 100644
--- a/docs/fr/configuration.rst
+++ b/docs/fr/configuration.rst
@@ -77,8 +77,11 @@ Traductions
 DEFAULT_LANG :
 	Le langage par défaut à utiliser. «*en*» par défaut ;
 
-TRANSLATION_FEED :
-	Chemin du flux pour les traductions.
+TRANSLATION_FEED_ATOM :
+	Chemin du flux Atom pour les traductions.
+
+TRANSLATION_FEED_RSS :
+	Chemin du flux RSS pour les traductions.
 
 
 Thèmes
diff --git a/docs/settings.rst b/docs/settings.rst
index ff59e0d3..7e381e78 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -366,12 +366,13 @@ Translations
 Pelican offers a way to translate articles. See the Getting Started section for
 more information.
 
-================================================    =====================================================
-Setting name (default value)                        What does it do?
-================================================    =====================================================
-`DEFAULT_LANG` (``'en'``)                           The default language to use.
-`TRANSLATION_FEED` ('feeds/all-%s.atom.xml'[3]_)    Where to put the feed for translations.
-================================================    =====================================================
+=====================================================    =====================================================
+Setting name (default value)                             What does it do?
+=====================================================    =====================================================
+`DEFAULT_LANG` (``'en'``)                                The default language to use.
+`TRANSLATION_FEED_ATOM` ('feeds/all-%s.atom.xml'[3]_)    Where to put the Atom feed for translations.
+`TRANSLATION_FEED_RSS` (``None``, i.e. no RSS)           Where to put the RSS feed for translations.
+=====================================================    =====================================================
 
 .. [3] %s is the language
 
diff --git a/docs/themes.rst b/docs/themes.rst
index 7598a28c..091ff5b8 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -202,7 +202,8 @@ Here is a complete list of the feed variables::
     CATEGORY_FEED_RSS
     TAG_FEED_ATOM
     TAG_FEED_RSS
-    TRANSLATION_FEED
+    TRANSLATION_FEED_ATOM
+    TRANSLATION_FEED_RSS
 
 
 Inheritance
diff --git a/pelican/__init__.py b/pelican/__init__.py
index b93dee06..2f37b17a 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -122,6 +122,14 @@ class Pelican(object):
             self.settings['CATEGORY_FEED_ATOM'] =\
                     self.settings['CATEGORY_FEED']
 
+        if self.settings.get('TRANSLATION_FEED', False):
+            logger.warning('Found deprecated `TRANSLATION_FEED` in settings. '
+            'Modify TRANSLATION_FEED to TRANSLATION_FEED_ATOM in your settings and '
+            'theme for the same behavior. Temporarily setting '
+            'TRANSLATION_FEED_ATOM for backwards compatibility.')
+            self.settings['TRANSLATION_FEED_ATOM'] =\
+                    self.settings['TRANSLATION_FEED']
+
     def run(self):
         """Run the generators and return"""
 
diff --git a/pelican/generators.py b/pelican/generators.py
index ff5ebdba..3d298630 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -166,15 +166,20 @@ class ArticlesGenerator(Generator):
                                       self.settings['TAG_FEED_RSS'] % tag,
                                       feed_type='rss')
 
-        if self.settings.get('TRANSLATION_FEED'):
+        if self.settings.get('TRANSLATION_FEED_ATOM') or self.settings.get('TRANSLATION_FEED_RSS'):
             translations_feeds = defaultdict(list)
             for article in chain(self.articles, self.translations):
                 translations_feeds[article.lang].append(article)
 
             for lang, items in translations_feeds.items():
                 items.sort(key=attrgetter('date'), reverse=True)
-                writer.write_feed(items, self.context,
-                                  self.settings['TRANSLATION_FEED'] % lang)
+                if self.settings.get('TRANSLATION_FEED_ATOM'):
+                    writer.write_feed(items, self.context,
+                                    self.settings['TRANSLATION_FEED_ATOM'] % lang)
+                if self.settings.get('TRANSLATION_FEED_RSS'):
+                    writer.write_feed(items, self.context,
+                                    self.settings['TRANSLATION_FEED_RSS'] % lang,
+                                      feed_type='rss')
 
     def generate_articles(self, write):
         """Generate the articles."""
diff --git a/pelican/settings.py b/pelican/settings.py
index 27a0c51f..4d1ed81e 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -26,7 +26,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'THEME_STATIC_PATHS': ['static', ],
                    'FEED_ATOM': 'feeds/all.atom.xml',
                    'CATEGORY_FEED_ATOM': 'feeds/%s.atom.xml',
-                   'TRANSLATION_FEED': 'feeds/all-%s.atom.xml',
+                   'TRANSLATION_FEED_ATOM': 'feeds/all-%s.atom.xml',
                    'FEED_MAX_ITEMS': '',
                    'SITEURL': '',
                    'SITENAME': 'A Pelican Blog',

From 0856b72c3cc97f46bd71a5963a00c8d4e5f8a85d Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Mon, 22 Oct 2012 23:05:18 +0200
Subject: [PATCH 0949/2864] cosmetics

lines should be < 80 chars
---
 pelican/__init__.py   |  4 ++--
 pelican/generators.py | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 2f37b17a..9809b19b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -124,8 +124,8 @@ class Pelican(object):
 
         if self.settings.get('TRANSLATION_FEED', False):
             logger.warning('Found deprecated `TRANSLATION_FEED` in settings. '
-            'Modify TRANSLATION_FEED to TRANSLATION_FEED_ATOM in your settings and '
-            'theme for the same behavior. Temporarily setting '
+            'Modify TRANSLATION_FEED to TRANSLATION_FEED_ATOM in your '
+            'settings and theme for the same behavior. Temporarily setting '
             'TRANSLATION_FEED_ATOM for backwards compatibility.')
             self.settings['TRANSLATION_FEED_ATOM'] =\
                     self.settings['TRANSLATION_FEED']
diff --git a/pelican/generators.py b/pelican/generators.py
index 3d298630..24bf76a1 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -128,7 +128,8 @@ class ArticlesGenerator(Generator):
 
     def generate_feeds(self, writer):
         """Generate the feeds from the current context, and output files."""
-        if self.settings.get('FEED_ATOM') is None and self.settings.get('FEED_RSS') is None:
+        if self.settings.get('FEED_ATOM') is None \
+                and self.settings.get('FEED_RSS') is None:
             return
         elif self.settings.get('SITEURL') is '':
             logger.warning(
@@ -154,7 +155,8 @@ class ArticlesGenerator(Generator):
                                   self.settings['CATEGORY_FEED_RSS'] % cat,
                                   feed_type='rss')
 
-        if self.settings.get('TAG_FEED_ATOM') or self.settings.get('TAG_FEED_RSS'):
+        if self.settings.get('TAG_FEED_ATOM') \
+                or self.settings.get('TAG_FEED_RSS'):
             for tag, arts in self.tags.items():
                 arts.sort(key=attrgetter('date'), reverse=True)
                 if self.settings.get('TAG_FEED_ATOM'):
@@ -166,7 +168,8 @@ class ArticlesGenerator(Generator):
                                       self.settings['TAG_FEED_RSS'] % tag,
                                       feed_type='rss')
 
-        if self.settings.get('TRANSLATION_FEED_ATOM') or self.settings.get('TRANSLATION_FEED_RSS'):
+        if self.settings.get('TRANSLATION_FEED_ATOM') or \
+                self.settings.get('TRANSLATION_FEED_RSS'):
             translations_feeds = defaultdict(list)
             for article in chain(self.articles, self.translations):
                 translations_feeds[article.lang].append(article)
@@ -175,11 +178,11 @@ class ArticlesGenerator(Generator):
                 items.sort(key=attrgetter('date'), reverse=True)
                 if self.settings.get('TRANSLATION_FEED_ATOM'):
                     writer.write_feed(items, self.context,
-                                    self.settings['TRANSLATION_FEED_ATOM'] % lang)
+                            self.settings['TRANSLATION_FEED_ATOM'] % lang)
                 if self.settings.get('TRANSLATION_FEED_RSS'):
                     writer.write_feed(items, self.context,
-                                    self.settings['TRANSLATION_FEED_RSS'] % lang,
-                                      feed_type='rss')
+                            self.settings['TRANSLATION_FEED_RSS'] % lang,
+                            feed_type='rss')
 
     def generate_articles(self, write):
         """Generate the articles."""

From d38b32abfd0d27946a750bb2041b120ed74eb8ff Mon Sep 17 00:00:00 2001
From: Thanos Lefteris <alefteris@gmail.com>
Date: Mon, 1 Oct 2012 19:06:40 +0300
Subject: [PATCH 0950/2864] Docs for FILES_TO_COPY setting

---
 docs/settings.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 7e381e78..af6bc8c0 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -46,9 +46,12 @@ Setting name (default value)                                            What doe
                                                                         If tuple object, it will instead generate the
                                                                         default datetime object by passing the tuple to
                                                                         the datetime.datetime constructor.
-`JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
 `DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the content of the output directory before
                                                                         generating new files.
+`FILES_TO_COPY` (``()``)                                                A list of files to copy from the source (inside the content 
+                                                                        directory) to the destination (inside the output directory).
+                                                                        For example: ``(('extra/robots.txt', 'robots.txt'),)``.
+`JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
 `LOCALE` (''[#]_)                                                       Change the locale. A list of locales can be provided
                                                                         here or a single string representing one locale.
                                                                         When providing a list, all the locales will be tried

From b6cc6bd2d4c2842c0856726caee649acaf3642f0 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Thu, 25 Oct 2012 14:24:13 +0200
Subject: [PATCH 0951/2864] remove useless try/except clause

exception will be caught and logged later in Pelican stack
---
 pelican/utils.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index a95b9c7d..94de9344 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -87,15 +87,13 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
             if overwrite:
                 shutil.rmtree(destination_)
                 shutil.copytree(source_, destination_)
-                logger.info('replacement of %s with %s' % (source_, destination_))
+                logger.info('replacement of %s with %s' % (source_,
+                    destination_))
 
     elif os.path.isfile(source_):
-        try:
-            dest_dir = os.path.dirname(destination_)
-            if not os.path.exists(dest_dir):
-                os.makedirs(dest_dir)
-        except OSError, e:
-            logger.error("copying: %s -> %s: %r" % (source_, dest_dir, e))
+        dest_dir = os.path.dirname(destination_)
+        if not os.path.exists(dest_dir):
+            os.makedirs(dest_dir)
         shutil.copy(source_, destination_)
         logger.info('copying %s to %s' % (source_, destination_))
 

From b349bdd80f33394ff824c0245cd48862cb537ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Thu, 25 Oct 2012 14:37:05 +0200
Subject: [PATCH 0952/2864] Make it obvious in the docs that you need to indent
 the identifier as well

---
 docs/getting_started.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 85a1b559..93c626c0 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -281,6 +281,8 @@ For RestructuredText, use the code-block directive::
 For Markdown, include the language identifier just above the code block,
 indenting both the identifier and code::
 
+    A block of text.
+
         :::identifier
         <code goes here>
 

From ae8cf9defdaae215f9b3b514436db35f8375b0f9 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Thu, 25 Oct 2012 22:43:58 +0200
Subject: [PATCH 0953/2864] refactor the check of executable for unit tests

pandoc was checked directly with a `os.system` call, and the output with version
and copyright of pandoc was displayed when running tests.

- replace the pandoc check with the `skipIfNoExecutable` function.
- in `skipIfNoExecutable`, the `valid_exit_code` is not needed, the executable
  is not found if an `OSError` exception is catched.
---
 tests/support.py       | 14 +++++++-------
 tests/test_importer.py |  9 +++------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index e5bfcca1..13bbfb15 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -114,7 +114,6 @@ def mute(returns_output=False):
     return decorator
 
 
-
 def get_article(title, slug, content, lang, extra_metadata=None):
     metadata = {'slug': slug, 'title': title, 'lang': lang}
     if extra_metadata is not None:
@@ -122,19 +121,20 @@ def get_article(title, slug, content, lang, extra_metadata=None):
     return Article(content, metadata=metadata)
 
 
-def skipIfNoExecutable(executable, valid_exit_code=1):
-    """Tries to run an executable to make sure it's in the path, Skips the tests
-    if not found.
+def skipIfNoExecutable(executable):
+    """Skip test if `executable` is not found
+
+    Tries to run `executable` with subprocess to make sure it's in the path,
+    and skips the tests if not found (if subprocess raises a `OSError`).
     """
 
-    # calling with no params the command should exit with 1
     with open(os.devnull, 'w') as fnull:
         try:
             res = subprocess.call(executable, stdout=fnull, stderr=fnull)
         except OSError:
             res = None
 
-    if res != valid_exit_code:
-        return unittest.skip('{0} compiler not found'.format(executable))
+    if res is None:
+        return unittest.skip('{0} executable not found'.format(executable))
 
     return lambda func: func
diff --git a/tests/test_importer.py b/tests/test_importer.py
index 5504b12e..d4ff8205 100644
--- a/tests/test_importer.py
+++ b/tests/test_importer.py
@@ -3,25 +3,24 @@
 import os
 
 from pelican.tools.pelican_import import wp2fields, fields2pelican
-from .support import unittest, temporary_folder, mute
+from .support import unittest, temporary_folder, mute, skipIfNoExecutable
 
 CUR_DIR = os.path.dirname(__file__)
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
 
-PANDOC = os.system('pandoc --version') == 0
 try:
     import BeautifulSoup
 except ImportError:
     BeautifulSoup = False  # NOQA
 
 
+@skipIfNoExecutable(['pandoc', '--version'])
+@unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
 class TestWordpressXmlImporter(unittest.TestCase):
 
     def setUp(self):
         self.posts = wp2fields(WORDPRESS_XML_SAMPLE)
 
-    @unittest.skipUnless(PANDOC and BeautifulSoup,
-                         'Needs Pandoc and BeautifulSoup')
     def test_ignore_empty_posts(self):
 
         posts = list(self.posts)
@@ -29,8 +28,6 @@ class TestWordpressXmlImporter(unittest.TestCase):
         for title, content, fname, date, author, categ, tags, format in posts:
             self.assertTrue(title.strip())
 
-    @unittest.skipUnless(PANDOC and BeautifulSoup,
-                         'Needs Pandoc and BeautifulSoup')
     def test_can_toggle_raw_html_code_parsing(self):
 
         posts = list(self.posts)

From f7a2f8ea479437050af56995e5dd7767e4429b91 Mon Sep 17 00:00:00 2001
From: Brendan Wholihan <bwholihan@yahoo.co.uk>
Date: Fri, 26 Oct 2012 18:20:05 +0100
Subject: [PATCH 0954/2864] Removed AUTHOR defaulting to OS User /John Doe, so
 both a blank or undefined (None) author is possible. Reverted templates back
 to checking author object, since a None object is possible. Name could be
 checked for blank if required ATOM spec states an author element should be
 provided, so passes a blank name if not specified Updated unit test

---
 pelican/contents.py                               |  7 +------
 pelican/generators.py                             | 15 ++++++++-------
 .../themes/notmyidea/templates/article_infos.html |  2 +-
 pelican/themes/simple/templates/article.html      |  2 +-
 pelican/themes/simple/templates/index.html        |  2 +-
 pelican/writers.py                                |  2 +-
 tests/test_contents.py                            |  7 +++++--
 7 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index b5701732..17801cc1 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -53,11 +53,6 @@ class Page(object):
         if not hasattr(self, 'author'):
             if 'AUTHOR' in settings:
                 self.author = Author(settings['AUTHOR'], settings)
-            else:
-                title = filename.decode('utf-8') if filename else self.title
-                self.author = Author(getenv('USER', 'John Doe'), settings)
-                logger.warning(u"Author of `{0}' unknown, assuming that his name is "
-                         "`{1}'".format(title, self.author))
 
         # manage languages
         self.in_default_lang = True
@@ -120,7 +115,7 @@ class Page(object):
             'slug': getattr(self, 'slug', ''),
             'lang': getattr(self, 'lang', 'en'),
             'date': getattr(self, 'date', datetime.now()),
-            'author': self.author,
+            'author': getattr(self, 'author', ''),
             'category': getattr(self, 'category', 'misc'),
         }
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 3056d6f7..f385ea45 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -223,12 +223,11 @@ class ArticlesGenerator(Generator):
         """Generate Author pages."""
         author_template = self.get_template('author')
         for aut, articles in self.authors:
-            if aut.name:   # ignore authors with blank names
-                dates = [article for article in self.dates if article in articles]
-                write(aut.save_as, author_template, self.context,
-                    author=aut, articles=articles, dates=dates,
-                    paginated={'articles': articles, 'dates': dates},
-                    page_name=u'author/%s' % aut)
+            dates = [article for article in self.dates if article in articles]
+            write(aut.save_as, author_template, self.context,
+                author=aut, articles=articles, dates=dates,
+                paginated={'articles': articles, 'dates': dates},
+                page_name=u'author/%s' % aut)
 
     def generate_drafts(self, write):
         """Generate drafts pages."""
@@ -313,7 +312,9 @@ class ArticlesGenerator(Generator):
         for article in self.articles:
             # only main articles are listed in categories, not translations
             self.categories[article.category].append(article)
-            self.authors[article.author].append(article)
+            # ignore blank authors as well as undefined
+            if hasattr(article,'author') and article.author.name != '':
+                self.authors[article.author].append(article)
 
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index 78326fd1..a1993a09 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -3,7 +3,7 @@
                 {{ article.locale_date }}
         </abbr>
 
-        {% if article.author.name %}
+        {% if article.author %}
         <address class="vcard author">
                 By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
         </address>
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 349b3107..16c34266 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -10,7 +10,7 @@
     <abbr class="published" title="{{ article.date.isoformat() }}">
       {{ article.locale_date }}
     </abbr>
-    {% if article.author.name %}
+    {% if article.author %}
     <address class="vcard author">
       By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
     </address>
diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index ec278c4b..dfdb0b45 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -11,7 +11,7 @@
                 <header> <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
                 <footer class="post-info">
                     <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr>
-                    {% if article.author.name %}<address class="vcard author">By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></address>{% endif %}
+                    {% if article.author %}<address class="vcard author">By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></address>{% endif %}
                 </footer><!-- /.post-info -->
                 <div class="entry-content"> {{ article.summary }} </div><!-- /.entry-content -->
         </article></li>
diff --git a/pelican/writers.py b/pelican/writers.py
index 65f0b338..b9ce77c4 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -43,7 +43,7 @@ class Writer(object):
                                         item.date.date(), item.url),
             description=item.content,
             categories=item.tags if hasattr(item, 'tags') else None,
-            author_name=getattr(item, 'author', 'John Doe'),
+            author_name=getattr(item, 'author', ''),
             pubdate=set_date_tzinfo(item.date,
                 self.settings.get('TIMEZONE', None)))
 
diff --git a/tests/test_contents.py b/tests/test_contents.py
index 6b0f93ea..8683d674 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -40,8 +40,11 @@ class TestPage(unittest.TestCase):
 
     def test_mandatory_properties(self):
         """If the title is not set, must throw an exception."""
-        self.assertRaises(AttributeError, Page, 'content')
-        page = Page(**self.page_kwargs)
+        page = Page('content')
+        with self.assertRaises(NameError) as cm:
+            page.check_properties()
+
+        page = Page('content', metadata={'title': 'foobar'})
         page.check_properties()
 
     def test_summary_from_metadata(self):

From 318518ee1f0d384c62ad48d4c4d827ef70d090ed Mon Sep 17 00:00:00 2001
From: Edward Delaporte <edthedev@gmail.com>
Date: Sun, 28 Oct 2012 14:32:48 -0500
Subject: [PATCH 0955/2864] Added a second link to the issue tracker - for
 those who jump directly to the section without seeing the earlier section.

---
 docs/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index e76bea6a..4225ab5f 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -21,7 +21,7 @@ How can I help?
 ================
 
 There are several ways to help out. First, you can use Pelican and report any
-suggestions or problems you might have via IRC or the issue tracker.
+suggestions or problems you might have via IRC or the `issue tracker <https://github.com/getpelican/pelican/issues>`_.
 
 If you want to contribute, please fork `the git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make

From 47c972e21a6f3f118cfac142503a7722e80199e7 Mon Sep 17 00:00:00 2001
From: Martin Brochhaus <mbrochh@gmail.com>
Date: Sun, 23 Sep 2012 10:04:51 +0200
Subject: [PATCH 0956/2864] Added USE_FOLDER_AS_CATEGORY setting.

This allows users to organize their files in ways where the subfolder name
would not make a good category name (i.e. /2012/09/). Set this to ``False``
and the subfolder will no longer be used as a standard category,
`DEFAULT_CATEGORY` will be used instead.
---
 docs/getting_started.rst |  4 +++-
 docs/settings.rst        |  4 ++++
 pelican/contents.py      |  3 ++-
 pelican/generators.py    | 11 +++++++----
 pelican/settings.py      |  1 +
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 93c626c0..09840e8a 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -176,7 +176,9 @@ Note that, aside from the title, none of this metadata is mandatory: if the date
 is not specified, Pelican will rely on the file's "mtime" timestamp, and the
 category can be determined by the directory in which the file resides. For
 example, a file located at ``python/foobar/myfoobar.rst`` will have a category of
-``foobar``.
+``foobar``. If you would like to organize your files in other ways where the
+name of the subfolder would not be a good category name, you can set the
+setting ``USE_FOLDER_AS_CATEGORY`` to ``False``.
 
 Generate your blog
 ------------------
diff --git a/docs/settings.rst b/docs/settings.rst
index af6bc8c0..1e3704d2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -34,6 +34,10 @@ Setting name (default value)                                            What doe
 `DATE_FORMATS` (``{}``)                                                 If you do manage multiple languages, you can
                                                                         set the date formatting here. See "Date format and locales"
                                                                         section below for details.
+`USE_FOLDER_AS_CATEGORY` (``True``)                                     When you don't specify a category in your post metadata and set this
+                                                                        setting to ``True`` and organize your articles in subfolders, the
+                                                                        subfolder will become the category of your post. If set to ``False``
+                                                                        ``DEFAULT_CATEGORY`` will be used as a fallback.
 `DEFAULT_CATEGORY` (``'misc'``)                                         The default category to fall back on.
 `DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)                               The default date format you want to use.
 `DISPLAY_PAGES_ON_MENU` (``True``)                                      Whether to display pages on the menu of the
diff --git a/pelican/contents.py b/pelican/contents.py
index 0dee19f3..74a66934 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -121,7 +121,8 @@ class Page(object):
             'lang': getattr(self, 'lang', 'en'),
             'date': getattr(self, 'date', datetime.now()),
             'author': self.author,
-            'category': getattr(self, 'category', 'misc'),
+            'category': getattr(self, 'category',
+                self.settings['DEFAULT_CATEGORY']),
         }
 
     def _expand_settings(self, key):
diff --git a/pelican/generators.py b/pelican/generators.py
index fdec93fa..c38409a1 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -280,11 +280,14 @@ class ArticlesGenerator(Generator):
             # if no category is set, use the name of the path as a category
             if 'category' not in metadata:
 
-                if os.path.dirname(f) == article_path:  # if the article is not in a subdirectory
-                    category = self.settings['DEFAULT_CATEGORY']
-                else:
+                if (self.settings['USE_FOLDER_AS_CATEGORY']
+                    and os.path.dirname(f) != article_path):
+                    # if the article is in a subdirectory
                     category = os.path.basename(os.path.dirname(f))\
-                                .decode('utf-8')
+                        .decode('utf-8')
+                else:
+                    # if the article is not in a subdirectory
+                    category = self.settings['DEFAULT_CATEGORY']
 
                 if category != '':
                     metadata['category'] = Category(category, self.settings)
diff --git a/pelican/settings.py b/pelican/settings.py
index 4d1ed81e..610d0733 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -34,6 +34,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'PDF_GENERATOR': False,
                    'OUTPUT_SOURCES': False,
                    'OUTPUT_SOURCES_EXTENSION': '.text',
+                   'USE_FOLDER_AS_CATEGORY': True,
                    'DEFAULT_CATEGORY': 'misc',
                    'DEFAULT_DATE': 'fs',
                    'WITH_FUTURE_DATES': True,

From c0ed9e1cffc413c386816cc1c4b23fc6d6b5a994 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sun, 28 Oct 2012 20:54:39 +0100
Subject: [PATCH 0957/2864] add test for USE_FOLDER_AS_CATEGORY setting (#517)

---
 tests/test_generators.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index 374172d8..8caa7213 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -85,6 +85,20 @@ class TestArticlesGenerator(unittest.TestCase):
         categories_expected = ['Default', 'TestCategory', 'Yeah', 'test', 'yeah']
         self.assertEquals(categories, categories_expected)
 
+    def test_do_not_use_folder_as_category(self):
+
+        settings = _DEFAULT_CONFIG.copy()
+        settings['ARTICLE_DIR'] = 'content'
+        settings['DEFAULT_CATEGORY'] = 'Default'
+        settings['USE_FOLDER_AS_CATEGORY'] = False
+        generator = ArticlesGenerator(settings.copy(), settings,
+                            CUR_DIR, _DEFAULT_CONFIG['THEME'], None,
+                            _DEFAULT_CONFIG['MARKUP'])
+        generator.generate_context()
+
+        categories = [cat.name for cat, _ in generator.categories]
+        self.assertEquals(categories, ['Default', 'Yeah', 'test', 'yeah'])
+
     def test_direct_templates_save_as_default(self):
 
         settings = _DEFAULT_CONFIG.copy()

From 4349a5e815d2a2bb0373b7712504940c1f141c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 28 Oct 2012 23:52:16 +0100
Subject: [PATCH 0958/2864] Update settings documentation. Fix #562

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 72c507a7..f8ccb8f7 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -190,8 +190,8 @@ Setting name (default value)                            What does it do?
 `AUTHOR_SAVE_AS` (``'author/{name}.html'``)             The location to save an author.
 `CATEGORY_URL` (``'category/{name}.html'``)             The URL to use for a category.
 `CATEGORY_SAVE_AS` (``'category/{name}.html'``)         The location to save a category.
-`TAG_URL` (``'tag/{name}.html'``)                       The URL to use for a tag.
-`TAG_SAVE_AS` (``'tag/{name}.html'``)                   The location to save the tag page.
+`TAG_URL` (``'tag/{slug}.html'``)                       The URL to use for a tag.
+`TAG_SAVE_AS` (``'tag/{slug}.html'``)                   The location to save the tag page.
 `<DIRECT_TEMPLATE_NAME>_SAVE_AS`                        The location to save content generated from direct
                                                         templates. Where <DIRECT_TEMPLATE_NAME> is the
                                                         upper case template name.

From 84c708b74baca100e37a918f4f97fefc0ae062ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Mon, 29 Oct 2012 00:36:42 +0100
Subject: [PATCH 0959/2864] Revert "Get HtmlReader to work again"

This reverts commit 39db9ddcfde6199d7b89232d222b2b5a9c3e1e6b.

Conflicts:

	tests/test_readers.py
---
 docs/getting_started.rst                      | 11 -------
 docs/settings.rst                             |  4 +--
 pelican/readers.py                            | 31 ++++++-------------
 pelican/settings.py                           |  2 +-
 tests/content/article_with_html_metadata.html | 13 --------
 tests/test_generators.py                      |  3 +-
 tests/test_readers.py                         | 21 -------------
 7 files changed, 14 insertions(+), 71 deletions(-)
 delete mode 100644 tests/content/article_with_html_metadata.html

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index add77c17..09840e8a 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -172,17 +172,6 @@ Markdown posts should follow this pattern::
 
     This is the content of my super blog post.
 
-Your third option is to write raw html (by ending your file in ``.html``)::
-
-    <!-- title: My super title -->
-    <!-- date: 2010-12-03 10:20 -->
-    <!-- tags: thats, awesome -->
-    <!-- category: yeah -->
-
-    <p>
-        This is the content of my super blog post.
-    </p>
-
 Note that, aside from the title, none of this metadata is mandatory: if the date
 is not specified, Pelican will rely on the file's "mtime" timestamp, and the
 category can be determined by the directory in which the file resides. For
diff --git a/docs/settings.rst b/docs/settings.rst
index f8ccb8f7..79878755 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -60,9 +60,9 @@ Setting name (default value)                                            What doe
                                                                         here or a single string representing one locale.
                                                                         When providing a list, all the locales will be tried
                                                                         until one works.
-`MARKUP` (``('rst', 'md', 'html')``)                                    A list of available markup languages you want
+`MARKUP` (``('rst', 'md')``)                                            A list of available markup languages you want
                                                                         to use. For the moment, the only available values
-                                                                        are `rst`, `md` and `html`.
+                                                                        are `rst` and `md`.
 `MD_EXTENSIONS` (``['codehilite','extra']``)                            A list of the extensions that the Markdown processor
                                                                         will use. Refer to the extensions chapter in the
                                                                         Python-Markdown documentation for a complete list of
diff --git a/pelican/readers.py b/pelican/readers.py
index b5a3ba31..42995688 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -147,30 +147,19 @@ class MarkdownReader(Reader):
 
 class HtmlReader(Reader):
     file_extensions = ['html', 'htm']
-    # re.DOTALL and .*? (minimal match of an arbitrary number of characters)
-    # allow multi-line metadata to be matched correctly
-    _re = re.compile('<\!--([^\:]*):(.*?)-->', re.DOTALL)
+    _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
 
     def read(self, filename):
-        """Parse content and metadata of (x)HTML files.
+        """Parse content and metadata of (x)HTML files"""
+        with open(filename) as content:
+            metadata = {'title': 'unnamed'}
+            for i in self._re.findall(content):
+                key = i.split(':')[0][5:].strip()
+                value = i.split(':')[-1][:-3].strip()
+                name = key.lower()
+                metadata[name] = self.process_metadata(name, value)
 
-        Matches for metadata tags in the form <!-- name:value -->
-        Activated when you add 'html' to your MARKUP settings variable
-
-        """
-        content = open(filename)
-        metadata = {'title': 'unnamed'}
-        for comment in self._re.findall(content):
-            key = comment[0].strip().lower()
-            value = comment[1].strip()
-
-            # remove identation from multi-line metadata
-            value = re.sub('[ \t]+', ' ', value)
-            value = re.sub(' ?\n ?', '\n', value)
-
-            metadata[key] = self.process_metadata(key, value)
-
-        return content, metadata
+            return content, metadata
 
 
 _EXTENSIONS = {}
diff --git a/pelican/settings.py b/pelican/settings.py
index 4d297332..610d0733 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -21,7 +21,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'PAGE_EXCLUDES': (),
                    'THEME': DEFAULT_THEME,
                    'OUTPUT_PATH': 'output/',
-                   'MARKUP': ('rst', 'md', 'html'),
+                   'MARKUP': ('rst', 'md'),
                    'STATIC_PATHS': ['images', ],
                    'THEME_STATIC_PATHS': ['static', ],
                    'FEED_ATOM': 'feeds/all.atom.xml',
diff --git a/tests/content/article_with_html_metadata.html b/tests/content/article_with_html_metadata.html
deleted file mode 100644
index 89ef4789..00000000
--- a/tests/content/article_with_html_metadata.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- title: A great html article with metadata -->
-<!-- tags: foo, bar, foobar -->
-<!-- date: 2010-12-02 10:14 -->
-<!-- category: yeah -->
-<!-- author: Alexis Métaireau -->
-<!-- summary:
-    Multi-line metadata should be supported
-    as well as <strong>inline markup</strong>.
-    -->
-<!-- custom_field: http://notmyidea.org -->
-
-<h1>This is an article in html with metadata</h1>
-<p>It features very interesting insights.</p>
diff --git a/tests/test_generators.py b/tests/test_generators.py
index 0907cc37..8caa7213 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -74,8 +74,7 @@ class TestArticlesGenerator(unittest.TestCase):
             [u'This is an article with category !', 'published', 'yeah', 'article'],
             [u'This is an article without category !', 'published', 'Default', 'article'],
             [u'This is an article without category !', 'published', 'TestCategory', 'article'],
-            [u'This is a super article !', 'published', 'yeah', 'article'],
-            [u'A great html article with metadata', 'published', u'yeah', 'article']
+            [u'This is a super article !', 'published', 'yeah', 'article']
         ]
         self.assertItemsEqual(articles_expected, articles)
 
diff --git a/tests/test_readers.py b/tests/test_readers.py
index a9c06861..406027c1 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -109,24 +109,3 @@ class MdReaderTest(unittest.TestCase):
             '<h3 id="level2">Level2</h3>'
 
         self.assertEqual(content, expected)
-
-
-class HtmlReaderTest(unittest.TestCase):
-
-    def test_article_with_metadata(self):
-        reader = readers.HtmlReader({})
-        content, metadata = reader.read(_filename('article_with_html_metadata.html'))
-        expected = {
-            'category': 'yeah',
-            'author': u'Alexis Métaireau',
-            'title': 'A great html article with metadata',
-            'summary': u'Multi-line metadata should be'\
-                       u' supported\nas well as <strong>inline'\
-                       u' markup</strong>.',
-            'date': datetime.datetime(2010, 12, 2, 10, 14),
-            'tags': ['foo', 'bar', 'foobar'],
-            'custom_field': 'http://notmyidea.org',
-        }
-
-        for key, value in expected.items():
-            self.assertEquals(value, metadata[key], key)

From 7127676f714195ff1cfa28fa3790c8bde02bcc8b Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 5 Mar 2012 15:52:14 +0100
Subject: [PATCH 0960/2864] added a static pages generator

Conflicts:
	pelican/__init__.py
	pelican/generators.py
	pelican/settings.py
---
 pelican/__init__.py   |  6 ++++--
 pelican/generators.py | 33 +++++++++++++++++++++++++++++++--
 pelican/settings.py   |  1 +
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 9809b19b..2a8c0703 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,7 +9,8 @@ from pelican import signals
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 StaticGenerator, PdfGenerator,
-                                LessCSSGenerator, SourceFileGenerator)
+                                LessCSSGenerator, SourceFileGenerator,
+                                StaticPageGenerator)
 from pelican.log import init
 from pelican.settings import read_settings
 from pelican.utils import (clean_output_dir, files_changed, file_changed,
@@ -170,7 +171,8 @@ class Pelican(object):
         signals.finalized.send(self)
 
     def get_generator_classes(self):
-        generators = [StaticGenerator, ArticlesGenerator, PagesGenerator]
+        generators = [StaticGenerator, ArticlesGenerator, PagesGenerator,
+                StaticPageGenerator]
         if self.settings['PDF_GENERATOR']:
             generators.append(PdfGenerator)
         if self.settings['LESS_GENERATOR']:  # can be True or PATH to lessc
diff --git a/pelican/generators.py b/pelican/generators.py
index c38409a1..81bcbc97 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -5,6 +5,7 @@ import random
 import logging
 import datetime
 import subprocess
+from os.path import exists, getmtime
 
 from codecs import open
 from collections import defaultdict
@@ -12,8 +13,8 @@ from functools import partial
 from itertools import chain
 from operator import attrgetter, itemgetter
 
-from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
-from jinja2.exceptions import TemplateNotFound
+from jinja2 import (Environment, FileSystemLoader, PrefixLoader, ChoiceLoader,
+                    BaseLoader, TemplateNotFound)
 
 from pelican.contents import Article, Page, Category, is_valid_content
 from pelican.readers import read_file
@@ -110,6 +111,34 @@ class Generator(object):
             self.context[item] = value
 
 
+class _FileLoader(BaseLoader):
+
+    def __init__(self, path):
+        self.path = path
+
+    def get_source(self, environment, template):
+        path = template
+        if not exists(path):
+            raise TemplateNotFound(template)
+        mtime = getmtime(path)
+        with file(path) as f:
+            source = f.read().decode('utf-8')
+        return source, path, lambda: mtime == getmtime(path)
+
+
+class StaticPageGenerator(Generator):
+
+    def generate_output(self, writer):
+        for urlpath, source in self.settings['STATIC_PAGES'].items():
+            self.env.loader.loaders.insert(0, _FileLoader(source))
+            try:
+                template = self.env.get_template(source)
+                rurls = self.settings.get('RELATIVE_URLS')
+                writer.write_file(urlpath.strip('/'), template, self.context, rurls)
+            finally:
+                del self.env.loader.loaders[0]
+
+
 class ArticlesGenerator(Generator):
     """Generate blog articles"""
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 610d0733..a3f94e24 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -80,6 +80,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'WEBASSETS': False,
                    'PLUGINS': [],
                    'MARKDOWN_EXTENSIONS': ['toc', ],
+                   'STATIC_PAGES': {}
                    }
 
 

From a91f1cab5d1ccb92cf33452f7f065b15825e20b8 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Fri, 16 Mar 2012 21:12:41 +0100
Subject: [PATCH 0961/2864] activate the static page generator only if the
 option is used

Conflicts:
	pelican/__init__.py
---
 pelican/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 2a8c0703..64a61e0c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -171,8 +171,10 @@ class Pelican(object):
         signals.finalized.send(self)
 
     def get_generator_classes(self):
-        generators = [StaticGenerator, ArticlesGenerator, PagesGenerator,
-                StaticPageGenerator]
+        generators = [StaticGenerator, ArticlesGenerator, PagesGenerator]
+
+        if self.settings['STATIC_PAGES']:
+            generators.append(StaticPageGenerator)
         if self.settings['PDF_GENERATOR']:
             generators.append(PdfGenerator)
         if self.settings['LESS_GENERATOR']:  # can be True or PATH to lessc

From 083a8cc172c3b0832d2b2afe2b217e4d593eb7cf Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Sun, 18 Mar 2012 09:59:12 +0100
Subject: [PATCH 0962/2864] added some doc about STATIC_PAGES

Conflicts:
	docs/settings.rst
---
 docs/settings.rst | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 1e3704d2..749e0431 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -92,6 +92,9 @@ Setting name (default value)                                            What doe
                                                                         will not be generated with properly-formed URLs. You should
                                                                         include ``http://`` and your domain, with no trailing
                                                                         slash at the end. Example: ``SITEURL = 'http://mydomain.com'``
+`STATIC_PAGES` (``None``)                                               A mapping containing static pages that will
+                                                                        be rendered with the blog entries. See
+                                                                        :ref:`static_pages`.
 `STATIC_PATHS` (``['images']``)                                         The static paths you want to have accessible
                                                                         on the output path "static". By default,
                                                                         Pelican will copy the 'images' folder to the
@@ -266,6 +269,25 @@ can get a list of available locales via the ``locale -a`` command; see manpage
 
 .. _locale(1): http://linux.die.net/man/1/locale
 
+
+.. _static_pages:
+
+Static pages
+============
+
+If you want to generate static pages besides your blog entries, you can point
+any HTML or HTML template file with a path pointing to the file and the
+URL it will match.
+
+For instance, if you have a blog with four static pages, for a list of
+books, your resume and a contact page, you could have::
+
+    STATIC_PAGES = {'/books.html': 'static/books.html',
+                    '/resume.html': 'static/resume.html',
+                    '/contact.html': 'static/contact.html'}
+
+
+
 Feed settings
 =============
 

From e0e1b3eecff7941324df065271af1f95af3855ad Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 30 Oct 2012 00:27:18 +0100
Subject: [PATCH 0963/2864] rename STATIC_PAGES to TEMPLATE_PAGES

---
 docs/settings.rst     | 25 +++++++++++--------------
 pelican/__init__.py   |  6 +++---
 pelican/generators.py |  7 ++++---
 pelican/settings.py   |  2 +-
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 749e0431..bf9ac2ac 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -92,9 +92,8 @@ Setting name (default value)                                            What doe
                                                                         will not be generated with properly-formed URLs. You should
                                                                         include ``http://`` and your domain, with no trailing
                                                                         slash at the end. Example: ``SITEURL = 'http://mydomain.com'``
-`STATIC_PAGES` (``None``)                                               A mapping containing static pages that will
-                                                                        be rendered with the blog entries. See
-                                                                        :ref:`static_pages`.
+`TEMPLATE_PAGES` (``None``)                                             A mapping containing template pages that will be rendered with
+                                                                        the blog entries. See :ref:`template_pages`.
 `STATIC_PATHS` (``['images']``)                                         The static paths you want to have accessible
                                                                         on the output path "static". By default,
                                                                         Pelican will copy the 'images' folder to the
@@ -270,24 +269,22 @@ can get a list of available locales via the ``locale -a`` command; see manpage
 .. _locale(1): http://linux.die.net/man/1/locale
 
 
-.. _static_pages:
+.. _template_pages:
 
-Static pages
-============
+Template pages
+==============
 
-If you want to generate static pages besides your blog entries, you can point
-any HTML or HTML template file with a path pointing to the file and the
-URL it will match.
+If you want to generate custom pages besides your blog entries, you can point
+any Jinja2 template file with a path pointing to the file and the URL it will
+match.
 
-For instance, if you have a blog with four static pages, for a list of
-books, your resume and a contact page, you could have::
+For instance, if you have a blog with four static pages, for a list of books,
+your resume and a contact page, you could have::
 
-    STATIC_PAGES = {'/books.html': 'static/books.html',
+    TEMPLATE_PAGES = {'/books.html': 'static/books.html',
                     '/resume.html': 'static/resume.html',
                     '/contact.html': 'static/contact.html'}
 
-
-
 Feed settings
 =============
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 64a61e0c..804fe5b4 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -10,7 +10,7 @@ from pelican import signals
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 StaticGenerator, PdfGenerator,
                                 LessCSSGenerator, SourceFileGenerator,
-                                StaticPageGenerator)
+                                TemplatePagesGenerator)
 from pelican.log import init
 from pelican.settings import read_settings
 from pelican.utils import (clean_output_dir, files_changed, file_changed,
@@ -173,8 +173,8 @@ class Pelican(object):
     def get_generator_classes(self):
         generators = [StaticGenerator, ArticlesGenerator, PagesGenerator]
 
-        if self.settings['STATIC_PAGES']:
-            generators.append(StaticPageGenerator)
+        if self.settings['TEMPLATE_PAGES']:
+            generators.append(TemplatePagesGenerator)
         if self.settings['PDF_GENERATOR']:
             generators.append(PdfGenerator)
         if self.settings['LESS_GENERATOR']:  # can be True or PATH to lessc
diff --git a/pelican/generators.py b/pelican/generators.py
index 81bcbc97..c7b29bab 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -126,15 +126,16 @@ class _FileLoader(BaseLoader):
         return source, path, lambda: mtime == getmtime(path)
 
 
-class StaticPageGenerator(Generator):
+class TemplatePagesGenerator(Generator):
 
     def generate_output(self, writer):
-        for urlpath, source in self.settings['STATIC_PAGES'].items():
+        for urlpath, source in self.settings['TEMPLATE_PAGES'].items():
             self.env.loader.loaders.insert(0, _FileLoader(source))
             try:
                 template = self.env.get_template(source)
                 rurls = self.settings.get('RELATIVE_URLS')
-                writer.write_file(urlpath.strip('/'), template, self.context, rurls)
+                writer.write_file(
+                        urlpath.strip('/'), template, self.context, rurls)
             finally:
                 del self.env.loader.loaders[0]
 
diff --git a/pelican/settings.py b/pelican/settings.py
index a3f94e24..35752fee 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -80,7 +80,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'WEBASSETS': False,
                    'PLUGINS': [],
                    'MARKDOWN_EXTENSIONS': ['toc', ],
-                   'STATIC_PAGES': {}
+                   'TEMPLATE_PAGES': {}
                    }
 
 

From 54eee3f28abdc82d16cee3a5edfbb5e075dc9acd Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 30 Oct 2012 02:33:01 +0100
Subject: [PATCH 0964/2864] update TemplatePagesGenerator:

* bugfix: now supports custom path for path where to find the content files
* TEMPLATE_PAGES settings is now of the form:
    { 'jinja2/src/file.html': 'dest/file.html' }
* update doc
---
 docs/settings.rst     | 12 ++++++------
 pelican/generators.py | 21 ++++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index bf9ac2ac..55becc8b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -275,15 +275,15 @@ Template pages
 ==============
 
 If you want to generate custom pages besides your blog entries, you can point
-any Jinja2 template file with a path pointing to the file and the URL it will
-match.
+any Jinja2 template file with a path pointing to the file and the destination
+path for the generated file.
 
-For instance, if you have a blog with four static pages, for a list of books,
+For instance, if you have a blog with three static pages, for a list of books,
 your resume and a contact page, you could have::
 
-    TEMPLATE_PAGES = {'/books.html': 'static/books.html',
-                    '/resume.html': 'static/resume.html',
-                    '/contact.html': 'static/contact.html'}
+    TEMPLATE_PAGES = {'src/books.html': 'dest/books.html',
+                    'src/resume.html': 'dest/resume.html',
+                    'src/contact.html': 'dest/contact.html'}
 
 Feed settings
 =============
diff --git a/pelican/generators.py b/pelican/generators.py
index c7b29bab..f056484a 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -5,7 +5,6 @@ import random
 import logging
 import datetime
 import subprocess
-from os.path import exists, getmtime
 
 from codecs import open
 from collections import defaultdict
@@ -113,29 +112,29 @@ class Generator(object):
 
 class _FileLoader(BaseLoader):
 
-    def __init__(self, path):
+    def __init__(self, path, basedir):
         self.path = path
+        self.fullpath = os.path.join(basedir, path)
 
     def get_source(self, environment, template):
-        path = template
-        if not exists(path):
+        if template != self.path or not os.path.exists(self.fullpath):
             raise TemplateNotFound(template)
-        mtime = getmtime(path)
-        with file(path) as f:
+        mtime = os.path.getmtime(self.fullpath)
+        with file(self.fullpath) as f:
             source = f.read().decode('utf-8')
-        return source, path, lambda: mtime == getmtime(path)
+        return source, self.fullpath, \
+                lambda: mtime == os.path.getmtime(self.fullpath)
 
 
 class TemplatePagesGenerator(Generator):
 
     def generate_output(self, writer):
-        for urlpath, source in self.settings['TEMPLATE_PAGES'].items():
-            self.env.loader.loaders.insert(0, _FileLoader(source))
+        for source, dest in self.settings['TEMPLATE_PAGES'].items():
+            self.env.loader.loaders.insert(0, _FileLoader(source, self.path))
             try:
                 template = self.env.get_template(source)
                 rurls = self.settings.get('RELATIVE_URLS')
-                writer.write_file(
-                        urlpath.strip('/'), template, self.context, rurls)
+                writer.write_file(dest, template, self.context, rurls)
             finally:
                 del self.env.loader.loaders[0]
 

From 3734c48489fc07cc57b61a462cb2ca0489a7746f Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 30 Oct 2012 02:33:22 +0100
Subject: [PATCH 0965/2864] add test for TemplatePagesGenerator

---
 tests/test_generators.py | 48 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index 8caa7213..accdb699 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -6,7 +6,9 @@ import re
 from tempfile import mkdtemp
 from shutil import rmtree
 
-from pelican.generators import ArticlesGenerator, LessCSSGenerator, PagesGenerator
+from pelican.generators import ArticlesGenerator, LessCSSGenerator, \
+        PagesGenerator, TemplatePagesGenerator
+from pelican.writers import Writer
 from pelican.settings import _DEFAULT_CONFIG
 from .support import unittest, skipIfNoExecutable
 
@@ -194,6 +196,50 @@ class TestPageGenerator(unittest.TestCase):
         self.assertItemsEqual(hidden_pages_expected,hidden_pages)
 
 
+class TestTemplatePagesGenerator(unittest.TestCase):
+
+    TEMPLATE_CONTENT = "foo: {{ foo }}"
+
+    def setUp(self):
+        self.temp_content = mkdtemp()
+        self.temp_output = mkdtemp()
+
+    def tearDown(self):
+        rmtree(self.temp_content)
+        rmtree(self.temp_output)
+
+    def test_generate_output(self):
+
+        settings = _DEFAULT_CONFIG.copy()
+        settings['STATIC_PATHS'] = ['static']
+        settings['TEMPLATE_PAGES'] = {
+                'template/source.html': 'generated/file.html'
+                }
+
+        generator = TemplatePagesGenerator({'foo': 'bar'}, settings,
+                self.temp_content, '', self.temp_output, None)
+
+        # create a dummy template file
+        template_dir = os.path.join(self.temp_content, 'template')
+        template_filename = os.path.join(template_dir, 'source.html')
+        os.makedirs(template_dir)
+        with open(template_filename, 'w') as template_file:
+            template_file.write(self.TEMPLATE_CONTENT)
+
+        writer = Writer(self.temp_output, settings=settings)
+        generator.generate_output(writer)
+
+        output_filename = os.path.join(
+                self.temp_output, 'generated', 'file.html')
+
+        # output file has been generated
+        self.assertTrue(os.path.exists(output_filename))
+
+        # output content is correct
+        with open(output_filename, 'r') as output_file:
+            self.assertEquals(output_file.read(), 'foo: bar')
+
+
 class TestLessCSSGenerator(unittest.TestCase):
 
     LESS_CONTENT = """

From bfc963a0657f9d49001f5d4092f0f793b9e50899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Tue, 30 Oct 2012 18:57:06 +0100
Subject: [PATCH 0966/2864] We pass lists, not dicst!

---
 docs/themes.rst       | 11 ++++++-----
 pelican/generators.py |  2 --
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index d06c97a8..e482bc9b 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -60,9 +60,10 @@ articles        The list of articles, ordered descending by date
                 etc.)
 dates           The same list of articles, but ordered by date,
                 ascending
-tags            A key-value dict containing the tags (the keys) and
-                the list of respective articles (the values)
-categories      A key-value dict containing the categories (keys)
+tags            A list of (tag, articles) tuples, containing all
+                the tags.
+categories      A list of (category, articles) tuples, containing
+                all the categories.
                 and the list of respective articles (values)
 pages           The list of pages
 =============   ===================================================
@@ -108,7 +109,7 @@ dates_paginator         A paginator object for the article list, ordered by
                         date, ascending.
 dates_page              The current page of articles, ordered by date,
                         ascending.
-page_name               AUTHOR_URL where everything after `{slug}` is 
+page_name               AUTHOR_URL where everything after `{slug}` is
                         removed -- useful for pagination links
 ===================     ===================================================
 
@@ -134,7 +135,7 @@ dates_paginator         A paginator object for the list of articles,
                         ordered by date, ascending
 dates_page              The current page of articles, ordered by date,
                         ascending
-page_name               CATEGORY_URL where everything after `{slug}` is 
+page_name               CATEGORY_URL where everything after `{slug}` is
                         removed -- useful for pagination links
 ===================     ===================================================
 
diff --git a/pelican/generators.py b/pelican/generators.py
index f056484a..01f4701c 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -42,7 +42,6 @@ class Generator(object):
                 os.path.join(self.theme, 'templates')))
         self._templates_path += self.settings.get('EXTRA_TEMPLATES_PATHS', [])
 
-
         theme_path = os.path.dirname(os.path.abspath(__file__))
 
         simple_loader = FileSystemLoader(os.path.join(theme_path,
@@ -283,7 +282,6 @@ class ArticlesGenerator(Generator):
         self.generate_articles(write)
         self.generate_direct_templates(write)
 
-
         # and subfolders after that
         self.generate_tags(write)
         self.generate_categories(write)

From e2c3701757fd182d0b6a6449c07f767d9d98235c Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Sat, 3 Nov 2012 21:55:56 +1000
Subject: [PATCH 0967/2864] Decode HTML entities in titles on WP import

---
 docs/changelog.rst                |  1 +
 pelican/tools/pelican_import.py   |  4 ++-
 tests/content/wordpressexport.xml | 60 +++++++++++++++++++++++++++++--
 tests/test_importer.py            | 10 ++++++
 4 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6cea6d93..5771abda 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Release history
 ================
 
 * Improve handling of links to intra-site resources
+* Decode HTML entities within WordPress post titles on import
 
 3.0 (2012-08-08)
 ==================
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index fc28c6a4..fceac4b5 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import argparse
+from HTMLParser import HTMLParser
 import os
 import subprocess
 import sys
@@ -29,7 +30,8 @@ def wp2fields(xml):
         if item.fetch('wp:status')[0].contents[0] == "publish":
 
             try:
-                title = item.title.contents[0]
+                # Use HTMLParser due to issues with BeautifulSoup 3
+                title = HTMLParser().unescape(item.title.contents[0])
             except IndexError:
                 continue
 
diff --git a/tests/content/wordpressexport.xml b/tests/content/wordpressexport.xml
index d3e86cba..0d68f180 100644
--- a/tests/content/wordpressexport.xml
+++ b/tests/content/wordpressexport.xml
@@ -112,10 +112,10 @@
     </item>
     <item>
         <title>A normal post</title>
-        <link>http://thisisa.test/?p=173</link>
+        <link>http://thisisa.test/?p=174</link>
         <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
         <dc:creator>bob</dc:creator>
-        <guid isPermaLink="false">http://thisisa.test/?p=173</guid>
+        <guid isPermaLink="false">http://thisisa.test/?p=174</guid>
         <description></description>
         <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
 tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
@@ -146,7 +146,7 @@ consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
 cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
 proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
         <excerpt:encoded><![CDATA[]]></excerpt:encoded>
-        <wp:post_id>173</wp:post_id>
+        <wp:post_id>174</wp:post_id>
         <wp:post_date>2012-02-16 15:52:55</wp:post_date>
         <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
         <wp:comment_status>open</wp:comment_status>
@@ -574,5 +574,59 @@ Bottom line: don't mess up with birds]]></content:encoded>
             <wp:meta_value><![CDATA[3]]></wp:meta_value>
         </wp:postmeta>
     </item>
+    <item>
+        <title>A normal post with some &lt;html&gt; entities in the title. You can&#039;t miss them.</title>
+        <link>http://thisisa.test/?p=175</link>
+        <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=175</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+<ul>
+    <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+    <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+</ul>
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>175</wp:post_id>
+        <wp:post_date>2012-02-16 15:52:55</wp:post_date>
+        <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>html-entity-test</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>post</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-2"><![CDATA[Category 2]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
 </channel>
 </rss>
diff --git a/tests/test_importer.py b/tests/test_importer.py
index d4ff8205..959a556a 100644
--- a/tests/test_importer.py
+++ b/tests/test_importer.py
@@ -47,3 +47,13 @@ class TestWordpressXmlImporter(unittest.TestCase):
             rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp,
                          strip_raw=True))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
+
+    def test_decode_html_entities_in_titles(self):
+        posts = list(self.posts)
+        test_posts = [post for post in posts if post[2] == 'html-entity-test']
+        self.assertTrue(len(test_posts) == 1)
+        
+        post = test_posts[0]
+        title = post[0]
+        self.assertTrue(title, "A normal post with some <html> entities in the title. You can't miss them.")
+        self.assertTrue('&' not in title)

From 868ef2079ce0acc481426865fec00fadd6812a63 Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Sat, 3 Nov 2012 22:07:55 +1000
Subject: [PATCH 0968/2864] Add GitHub social icon support in default theme

Conflicts:
	docs/changelog.rst
---
 docs/changelog.rst                                |   1 +
 pelican/themes/notmyidea/static/css/main.css      |   3 ++-
 .../notmyidea/static/images/icons/github.png      | Bin 0 -> 360 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 pelican/themes/notmyidea/static/images/icons/github.png

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6cea6d93..dd49e080 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Release history
 ================
 
 * Improve handling of links to intra-site resources
+* Add GitHub social icon support in default theme
 
 3.0 (2012-08-08)
 ==================
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 3d94200b..8f514524 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -309,7 +309,8 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
-        .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+		.social a[href*='github.com'] {background-image: url('../images/icons/github.png');}
+		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 
 /*
 	About
diff --git a/pelican/themes/notmyidea/static/images/icons/github.png b/pelican/themes/notmyidea/static/images/icons/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..2746e5637f8e249273ce8d9fd7ab12f05422dbae
GIT binary patch
literal 360
zcmV-u0hj)XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uy}8c9S!R5;6}(=kg!K@bGsPpwi3f>l5W2!gGZVCxUC6Cn^tWo2vY
zpRlzO1R-E+8xRCR2-w*e>;fXBkcbkS5zhFM2reA&xSg53-MP15daPkJ`vLm?7zen=
z7_V95oE^*})^Ld-j<8YW)^j!trdB1;K^J==RJF7lOsDGF&sfG;uH3~PdijoV63o+N
zJNIa3e;#nvIuE8D4ya?4zE<%uLtu=}U`MDgq7jSUBDOTgrIld&Xe>@7AMrj%;MaR7
zTY%<_Hcku6N8yr5w*qJ;aa<5Duu~Lmh4aJ4r&x52E8G?WHwCuRMj>@meLIikTcB68
z+YJ_!L)^y;9<YVaiD!P8+#uMg(M-k30rryn5extQoxcDA@?gGAo7i3e0000<MNUMn
GLSTX?{*&MU

literal 0
HcmV?d00001


From 4afc32c4256d23623711f25e16fc6ae04a9851ed Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Sat, 3 Nov 2012 22:21:02 +1000
Subject: [PATCH 0969/2864] GitHub icon also works for git.io addresses in
 social

---
 pelican/themes/notmyidea/static/css/main.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 8f514524..c859925d 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -309,7 +309,8 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
-		.social a[href*='github.com'] {background-image: url('../images/icons/github.png');}
+		.social a[href*='github.com'],
+		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
 		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 
 /*

From 705ab7b0f8a0c780de14c7ee8e37ac559f7923f4 Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Sat, 3 Nov 2012 22:27:33 +1000
Subject: [PATCH 0970/2864] Improve linkedin icon

---
 docs/changelog.rst                             |   1 +
 .../notmyidea/static/images/icons/linkedin.png | Bin 376 -> 2159 bytes
 2 files changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6cea6d93..5d0c6ac2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Release history
 ================
 
 * Improve handling of links to intra-site resources
+* Improved appearance of LinkedIn icon in default theme
 
 3.0 (2012-08-08)
 ==================
diff --git a/pelican/themes/notmyidea/static/images/icons/linkedin.png b/pelican/themes/notmyidea/static/images/icons/linkedin.png
index feb04962bfe2fd712cb5003c8c20b43af4c18201..ee0ec7738d57b46cd634311d8df7a7d3e3ddf65e 100644
GIT binary patch
literal 2159
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
LodPdg1m^z*g5@fm

literal 376
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1Ig<N%)#SD+I6
z_O)}4-}0QX^Tp@yRa?$nd;UIt$zg}dTMylR@%{H7$0>Wd_Fj7M_G{R}1CBkLw_JJn
z>DQmab*CL>?Ok)>!PFzy{Acg}|Np;3*ZSPGC!W6l5w&pt&tHEg9=P)1$FJ6%7tcO?
zWxgW&B*^ZPAirP+hi5m^K%69RcNc~ZR#^`qhqJ&VvY3H^TNs2H8D`Cq01C2~c>21s
z-{R(FQ&rw_X(1C(sL|8KF+}2W>G_L%hZJ~NFD#lIs%=oPMZxdy|Meo%9>~ox&zv>K
zB$L~r<aZkfgWz=Lyqm20XVxusKG$*l)?2QYAJ>*j<o0AdvsI9iTUyciG3K=Cj_Pdv
zsFgaO=a_kD{%Kv_vzW(gZpy5n+eNW69-p?9c8*Zj*!tyi{epY%eko6V$gGmgC;W7e
S-+7>87(8A5T-G@yGywqOA)@^N


From 9fdd378687507774d4ea6a6aaac8ab2253bc573b Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Sun, 4 Nov 2012 12:25:02 +1000
Subject: [PATCH 0971/2864] Add Google+ social icon

---
 docs/changelog.rst                                |   2 +-
 pelican/themes/notmyidea/static/css/main.css      |   1 +
 .../notmyidea/static/images/icons/google-plus.png | Bin 0 -> 527 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 pelican/themes/notmyidea/static/images/icons/google-plus.png

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 12d6d278..346a7176 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,7 +6,7 @@ Release history
 
 * Improve handling of links to intra-site resources
 * Improved appearance of LinkedIn icon in default theme
-* Add GitHub social icon support in default theme
+* Add GitHub and Google+ social icons support in default theme
 
 3.0 (2012-08-08)
 ==================
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index c859925d..29cce82c 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -312,6 +312,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='github.com'],
 		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
 		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
 
 /*
 	About
diff --git a/pelican/themes/notmyidea/static/images/icons/google-plus.png b/pelican/themes/notmyidea/static/images/icons/google-plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..849849b8149b3f451c06069ee31d3ccc422b5b9d
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0005jNkl<ZC{ts&
z>upIAVz}dFal_O6CT?`r$q<OnIT-@g097*F^02#8Kk4J~li%L`{SOBpuDq)BzUFQQ
zM5i4LfWl`S4T0>dZe|RxF1`7_spN)-$>qSnr+Xd&<$fJ%zV2pn8HP?e=mP~$IqCyN
zF1ea8{QrOcp`Xzu7o&?n<PrPsB~bSB>k`Wo_Ihvx6oRvX8V=lcH8|%4MYopS2TFfk
z6nV<i63D;=Kn+hGCFq^D*E?kgLg!j`fvlJre8gHCj({RCwhqJpzyH6j&pKhFa}10w
z%((FX*QL9`P%cp9kd+ot1CRu=kJ@N6eEkOGetNs8=xng-*~$r@-rRduZF|s46OQ&-
zY5-O2wa_?VsR=|3CxYW{&Rg<g*WS<Xfa2d@)Z6VfQ{RJxcA2U{5JZsSu(|pU6V)9i
z!B5`&|M&mHqXH8!7bjvkV4}L!P<e}??%9nm{{Q^{|Hs`2rA}ZG?1<rf+tf$<4?Nqr
z?7^C4k54}M2MWmdFS|mw=qqkSMH|3ehOc{j4!NnX)0JNjLRyEqw|@Tx(sMUi2P}d>
z5H$=ZOypN-%Oa!Ag=>ER18#9RnmB~ZuuoTRt+vb>6cqXJ>;E@hj;MlAH2|AClb&N>
RYp4JK002ovPDHLkV1iYl{2>4U

literal 0
HcmV?d00001


From 121bc0ad5e1b6f6556f0d70f93b3c03d8bcee1de Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Sun, 4 Nov 2012 12:49:05 +1000
Subject: [PATCH 0972/2864] Optimize social icons

---
 docs/changelog.rst                             |   1 +
 .../static/images/icons/delicious.png          | Bin 963 -> 958 bytes
 .../notmyidea/static/images/icons/facebook.png | Bin 300 -> 202 bytes
 .../notmyidea/static/images/icons/github.png   | Bin 360 -> 346 bytes
 .../static/images/icons/gitorious.png          | Bin 3675 -> 227 bytes
 .../notmyidea/static/images/icons/gittip.png   | Bin 671 -> 487 bytes
 .../static/images/icons/google-plus.png        | Bin 527 -> 527 bytes
 .../notmyidea/static/images/icons/lastfm.png   | Bin 980 -> 975 bytes
 .../notmyidea/static/images/icons/linkedin.png | Bin 2159 -> 896 bytes
 .../notmyidea/static/images/icons/rss.png      | Bin 896 -> 879 bytes
 .../notmyidea/static/images/icons/twitter.png  | Bin 835 -> 830 bytes
 11 files changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 346a7176..9407d4ac 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Release history
 * Improve handling of links to intra-site resources
 * Improved appearance of LinkedIn icon in default theme
 * Add GitHub and Google+ social icons support in default theme
+* Optimize social icons
 
 3.0 (2012-08-08)
 ==================
diff --git a/pelican/themes/notmyidea/static/images/icons/delicious.png b/pelican/themes/notmyidea/static/images/icons/delicious.png
index c6ce246a4602f8f74e75ea8cfe9f5a00daceeb33..3dccdd848ec99fba9950e8195d4e73867ada2738 100644
GIT binary patch
delta 825
zcmV-91IGNr2fhc8l7AOTL_t(I5e31$ZyR+Sz~RsR?&phr@k{KwZtJ8rq)AI+DoYGR
zC_<<k5ePBzFO-D^2^NsLF%$$$Y%Fv@g-Uco0>Oerq^Ob`+NMdMNmJK})5LG*d-L6W
zc^(6xSS(h?<8dRCv6pJK*-N!ry|lD=zU=6Cvvz*9eR|Y8ZGZP?(}Q5zu4Ye;Yw6U<
z%$bdQs2_ec*4Ey;wY<Faeyx7dZZsO?vT4fYGtAE~^4ER%_Is$5px1-FXTrVv2Hs<j
zSDQUP{^-`4E|)KTaP#ID3IG5A075!##q+i%bO8mfYmiDtOsZ+NUkv!=u0Pb1Npb*E
z2Y?A8049dvVt;89Kg!V`gENNqzQ-i)Vp=KE=1B78)u-CB3_yT{I2Hg*6Cfd*5jvfS
zC>Bn;5kze=d5?*!aR(Wra;~tbOQk6n6iE^S28IC;10{@PkM=_sWfib<N2t6Dv5-nB
zydcHqKk6Nw&!>g}N~Hk+008J5K8N8Pi863TKFA4#Hh*A4LHxOMyT9w><KqXd*7{1n
z@3X!Alt&LYah#ByN58T8-!(EXeM4hmK&f2Co-UG2Tb#|!&^frRrmfotymF=S<Jrox
z6be@bDgs%7lmJpazbZR>A|jE91R@fPNF*X6Uw!$hG@H#gbvAe5wL~g-eup^rQ51og
zp);b<%zv>^j{y^y03niqp-c{sG_BT_qiPrDe~O}j;qVY7MvR0=e89tT48Q~+iXe(0
z5da7Szq_*X#=c5t?5!{y68J805+M>0_z_^U^LUHy(Gvhb05FsS1cCng`k$w&UZ0x|
z0uQY<A~7NXU;;&6^d~r@F#uYp(b_^87GN;w_kT;*uYYLk{rx9lE>|E3Pp}ktUY9r?
z14j_0@d5$B_Z=+DVmR~|IWB$}mM>H*v$|ft{9t3_8G-9yY7Y#LsVRkJX3(iJpMCzF
zEX-G(o!tYKB)aGO!M}TZ8^dBTeR$)>Cv9!p_HOg)(${Nmzm=^2eRt!qyLG(s`nCRG
zm@*E1KbX?WJ$-q;+RNr<%sY4f7_?eHhX4RqE;sleG7W{b<gJ)y00000NkvXXu0mjf
D8IXcW

delta 830
zcmV-E1Ht^h2g3)Dl7AdYL_t(Ijb)O(Z(C&?g`fNS^^JYwkJxqH)=6zhla|C(mKcao
zgitpk5MtzCXcrbFSU~E=P!KS&vCsh(D$xxI1Pc<8qDpCKn<jxKO<gBW6MtRbFW-BA
z3<*<@bfmL9I?~ZG01Aadc{m)_(`jq2TAjR5t=5Wjvu8`Tet$P(<rbSq`<<g^cQV!U
z$E`}{@SvJX9!{KExr_S#7h`GZy_@s%bMIGc=dF6ZPBxRGR651<^elhggKxfrauGTm
z*nTS9y=UM)a(T7U;iC_4F6mO~!Us2Qe6Dyw0j;LuSyK}@fC9%cNX7$3l@uG#d;EOI
z>+8`d-UX>0Lw_Sg01_C6gQ*jEVV3R?>>)IFTt-owgqb9j7)Y+P_(Yqg0SFKiMFKz~
z0T7c(3$0d27zs!15W*(uoXg13IK8w{K9ir-#p0L)iZ~7c1H%A_fFee`P4j_+GV@s3
zeN@hYNJu6XuAgM>Z}pDO<&u2>rBW}f(As+j{V8H)V1ExhkV6P8z=FJZQ)jk*(+39!
z_g7b!7rI@Kjg2Qfe6WUX2W&q4m9>AbkbdcF>N7oxr3%(~flSKebasN)?kzQL-rD7r
zOZ6X4m**v)zbsG|$Ot3_kjmLb+1wTp2}Q&gk?16geEG#E(r7f^)S2wL*J3H-dM%>J
zLs0-C`hWI-dLzqBEdmn22ndiE43%JSU$eTpZma6~=^w+;r{CWLi4Y?u6c2E*ZQ}%n
zFg$iFCol26_QJv&J1Uj7)`Osr?>R(qh=`Bxg@DE8qjlQ*k548&CJm(kL7=<5{Kt{1
z)uzUM-$iSUNQ8)g(punocZ59{0-$vYtxc3+0)Ga*Znt>#>NQL6>^u&#**t!5h^fGJ
z+eFb2*oQEM>mN6Jo{edm^!qLY+rbNh(z!}`QrBu1@2{*p#dmBH+6BX9Y)oM$(&%J~
zPe1!sW~M9l=GLx?W8LvQ|DWycm42a++Pi-J<EFMOYpZd2?yIG@--?(2y0fy^UO!lP
z{WnUt*G~nW=Z|US9KAeU>147KiQBh-@2#%>6#Rd*OBd_>2Qm$Xwckl|rT_o{07*qo
IM6N<$f};<VTL1t6

diff --git a/pelican/themes/notmyidea/static/images/icons/facebook.png b/pelican/themes/notmyidea/static/images/icons/facebook.png
index a7914b497369c55feba7defc9a3ea5bec424ecfc..74e7ad52f362b56d584df459bc5141395c32b7ed 100644
GIT binary patch
delta 16
XcmZ3(bc%7pK~4rwS3j3^P6<r_F@FWd

delta 114
zcmX@bxQ1!M!EDtM*NBpo#FA92<f2p{#b9J$XsByoq-$sxVrXP#YHnp}scm3rWnf@!
jzTyW10|P=sZhlH;S|x4`UReSzKn)C@u6{1-oD!M<njIfp

diff --git a/pelican/themes/notmyidea/static/images/icons/github.png b/pelican/themes/notmyidea/static/images/icons/github.png
index 2746e5637f8e249273ce8d9fd7ab12f05422dbae..6c52b486c5e392261c24d53fe2609e54d4f07c5d 100644
GIT binary patch
delta 298
zcmV+_0oDHK0@?zQIe!dEL_t(I%azlyN&{gK1mLd?2v$}?DnYOktc0{afNdZkq!I*M
zTVKM~Dj*1fw6+I=AOx;W74QLsQ~}{^Ch`+5r~a_q@$bys&h8$&PakKAzJHt{=4kMl
zXmU5~BKGi%6>f1{<c@N;3Z~a4FhzyS5ZWwV1T$?b`vd!UOn=E0-cje-;69k;ww*b~
zd7lK_7L#Dc;ebP|<Ldxl9Rdwbf?bDefJMYke<3%)3umw`uovYnf&R8YX#qwZHXe$R
z|5%VtUj;Bq;;tY*6{QQd-X7yJBYMFMZ-u~Xfo&b5kg9zBJj=2XsEdhJ!M3jQEW3Y`
wmE8y|aGl(A*CQ$`npn3quuksJ=TE=$H_pXv&+a*=O8@`>07*qoM6N<$f&|Zqx&QzG

delta 312
zcmV-80muH@0_XyeIe!{SL_t(I%cavXOG7~r1mI7tQVD`pKnMtet(9Qw53my<5J+WZ
zYwMq|wGsp&U~3x?1VISc*%<5sBBYRr5}Ogu_>u@N9PhZDnZ4b)w_tj#VKw^!`u-RP
zxW^c;S>v1?%p%rsi6M@#QRLQhHVmd#CD1_^dm&V{v>QyP>VMkLSjJhd+{GPw`HpcC
z%+q8$_h@H-9&pt<52hUssAH7AR`D@IV2sURN2o8N5sTg;wlv43m0<g5EKVdJ@jgf3
z*Lx^ifaZ)gP7BLN;gU(W0%#_2To5m?Qxt85^TWocSagjm+!g{i1-8;gA$3!IJCEgC
zpjWip4HlF`+%d-s9<YVaiD!P8+#uMg(M-k30rryn5extQoxcDA@?gGAo7i3e0000<
KMNUMnLSTY|XpJub

diff --git a/pelican/themes/notmyidea/static/images/icons/gitorious.png b/pelican/themes/notmyidea/static/images/icons/gitorious.png
index 6485f5ecc5f6047a052d9adfb686ee154e7233af..3eeb3ecec36a73ff505e04ecdecbcc4792ef6786 100644
GIT binary patch
delta 199
zcmV;&0672K9OD6yB!4_mOjJbxdO9bDQz(m9HIZRZpK)ubh)uJ7cde3mxs-3gmU_mX
zpuexJ#ki)~zOmiL)z#I~?BD9@>fQ0@|NsA$KGRG9003f1L_t&-(|ye`5`Z8K0Ko$#
z3IP-G|9`cS8ED+{nj_01Be_koAnlp75qc?o2`=J4p}Suqmq2^}LK)BUG$EY#9zOeh
z21r&_4>(k-B_NrZDX5wKgt~2Y2}1&6nnZ{!;tLK&3GEfRNsIsh002ovPDHLkV1iD^
BTdx2B

literal 3675
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
BhXDWp

diff --git a/pelican/themes/notmyidea/static/images/icons/gittip.png b/pelican/themes/notmyidea/static/images/icons/gittip.png
index bb12a1391ace96a9d4cedffebedd7db7d6a84d48..af949625ac83d2441215c81650e897c97d9e5d95 100644
GIT binary patch
delta 390
zcmV;10eSwP1?K~hYJUM|Nkl<ZILl*TfPw^X8!(;dW22JbZ9M}>-vZ)aP<#t2rh=>%
z4uBFcLlywp|AF`)lt#v2F_0Q$J;*j+Ou*EHfuU+HqPPTPDok^%yZQe}XCt6Z)(A~N
zcBHfM{}?w@xFIl?fc=bY!<BO<|9|=X>HpjbZD7OVJuUzD)PENK|M2eZ|NFOZ{Lct+
zMRt)212k~{fo$2ZY~Ftm`1kK0n4Z<s^uMJf11<)_$M)^~9|trPs%HiRG_=9a+_YlB
ze;5EM{{8zG*k+i4Ao|3C-9Q5@U@o}D0F5TFKzVBTe?p+Qt{B-1zfcT_aX0&a_V^*7
zRhSw<wm*Jw_kVwsi!p`)w~zxd+28*Eub)5Q&PEQCyl5ZvXuSmwL}ZET%ovn_1A(5}
zB9y2_4n!4<#NurQ)&K*GruHBQ9BMS8CnOjK#s8G{>i?_eO#`O~^wbDXNGM6!8_gwN
kR<Jn7pOh)eOq6D40B`F5$B|gKmH+?%07*qoM6N<$g7gx+%K!iX

delta 576
zcmV-G0>Ay|1D^$uYJUPBNkl<ZILoDzKWGzS7{-6^cey6jL2VISlnBk>U>nq-!*wY*
zC4;*|6YMHgDyXOh9jsz9Dcv*)g5V+u32`wNycWSfXg96&Pc%sJPsJj(q|NJ)yLbsY
z`3(p6eb4hgcfWg1@K!3}kT1EUlTM$io)M8@AnF}2scJ<;GJm<E``*_A2tYdNkSn^R
z5>8%(5kUR3z*0a|DdbCT%J)bh`Hez<r;EQ$fw^4K9Y`gdW=bmI<Pk;$*sRyt+^iFh
zbR*Inr>bnMuVYyTyDN+~Cl&G~Hznz$(+AA^3FB9?L}LfIfBP2G<%bw!ICx}`(bE@M
z{rZ{f=TEY+{(sAt$E<j4?^O{wtg3SC_z8xNCb8`<4h;_RW#to*ZQD6Jd6RG?!p@#v
zdUx;Px%&iTjH+rl<k1!YV@#8*2&zhY>>NMW)=<^fUQ?r<OoomBsYHaC$K@6*5g`<^
z*|Dpq#X>}wsXW56LcT0&f`n_;MP5C7>IHPrSLNgK0)H=Or`z@ou;ky^b{A9EE>W*<
zpsH<V5#h##F~X7Vpnu7zYK1^%V{41cr$$@v?3=R_<NWx(+VN0YF(Q)bY+bFoKz3pr
z5kW+_JC$Yb#cYekA54<5Ucak;i^uluM~F)R;7YAZ?ZYC=^KU6XxJM{tx3$qL(w+7y
zEB(O`Z8<b(sA5^xKdWp!Gr6KW02G2DVocDi-nEb`x&!HCGg$ujcm55b9s8QriQlvU
O0000<MNUMnLSTaH2O8!8

diff --git a/pelican/themes/notmyidea/static/images/icons/google-plus.png b/pelican/themes/notmyidea/static/images/icons/google-plus.png
index 849849b8149b3f451c06069ee31d3ccc422b5b9d..3c6b74324031611f20c0a3810131aa74fd0a5a9f 100644
GIT binary patch
delta 474
zcmV<00VV#A1djxeDgn=tD;a;;K$Q%)JnZh&Px^TL<hOT!|HHwDE3YcOueqB6(P;+*
zpuibNLm>OAn;FBaOK-k!D!Jidayc;Y>7GYGxnGBxue+IChM|)V`ar=`j`~3MC07%M
z|NqZF^fS8TVssIRJYwIy1j>GXU1E8{UJs6dLU1-v!-3nb2Irih=+=L-`#|Zhiy}{X
zTK>ldfEu1WO3*uPuXoB0gwD0>0$DLL_=vSO905gOY#oOGfB%15pLN1U=NK4Wm~r9%
zuS<7>p<Ez3WTgev03?Czqc++MU%vslpWZGiIvebIwsOL!H}{@Z+a9#igrj|y8bB3$
zEi?{TY620%iQu@K^Ok?S*tPfbJD~XY7xi{~&D8fGp<SkG5Cq{e95z?qVWPUjB>2gj
z|Ns7fcvN5l=Hf&Q2TWAA8Y*uw)IGcL#s8oG|NprApwtO0f*moOZ=3pP|AA*4mpxds
z?D5G5|3E?a{$*F_7JbEysAvP2Wca$b=a8HFI$inoAf$Dud+Sd3Um!hqlXccZ1)&I{
zhT(*X{3>l(WVE?(?GIqUEe=N$haiT1x^io^W!9je$cJD5zv*&ZgDwt20Gm6Lp2R#O
QHvj+t07*qoM6N<$g1pf14FCWD

delta 474
zcmV<00VV#A1djxeDgjfGD;a;)097*F^02#8Kk4J~li%L`{SOBpuDq)BzUFQQM5i4L
zfWl`S4T0>dZe|RxF1`7_spN)-$>qSnr+Xd&<$fJ%zV2pn8HP?e=mP~$IqCyNF1ea8
z{QrOcp`Xzu7o&?n<PrPsB~bSB>k`Wo_Ihvx6oRvX8V=lcH8|%4MYn&J-3Lm4T@-oB
z(-O$Q1V9Z>9wq3Vw%0pl2SVpsc7d#z8GOWA8;*b?Ft!fE|G)pgt<O4PqjL<5F3h;_
z|JS9v!B8$x<dBsXPy>(zvX9zmGkpC9<bHa)sOW64>)FZ)pWfViR&9IGN)wLuS!w`P
z?6uH1V5td23@3u)Zq9#O@?zKC&+mZZ-(S?*?KM;1gM@aOszDG$km0bo`VJG-9VWp~
z-u(af|HGpK6EGJiVmM%;y46s5i=pn>jW7QH{Qv*Q-3O&kU=i$y;e6ZFNBa*v+qmq(
znq`kqKKKU;$oDV1LbvEEZbU^Jz+8r}dwUMKsjt(OUk^fBhq_L;e*Xp1b2nKBEP_A~
zH4G<A<X36SBBRZPYkvR(ZgDu8IE2fvPgicOw#*t76#4M$|2JKZsDe;60Gm6Lo?~EZ
Qr~m)}07*qoM6N<$f(DT7CjbBd

diff --git a/pelican/themes/notmyidea/static/images/icons/lastfm.png b/pelican/themes/notmyidea/static/images/icons/lastfm.png
index b09c7876537ad9faa7a7a68ad6c8035d2e32ec3a..3a6c6262b644dadbcf6cce5dfe4fed9740a9ec1f 100644
GIT binary patch
delta 842
zcmV-Q1GW6r2hRtPl7A>kL_t(I5e30dY!p=-!13>U^LF-sk?xk2w$KnZDpdlBD2<Us
z2~iSbKqDvA#DgC2Plz5pbL8U1a4~`C4T$m2sf0wM7y&IUG?q|==(cw0w%y&%?#%4W
zdp|!PwfgntJ(<?V`+l|ZvMv`(+IUWRX2zscNYf|r)GCS=B7ZT~u95LVa{fAL+9Yc(
z8^6^)H{|<=ND^4v0IdOe0zU(u0oZ|a;2bCgNeT`~6P$8)OfE?uXRHQ(7Mug;AW0Et
z!8w#t03ZT@6bdNg!NVm2V}~{I0E&4)!A2K0Lr5${35Wte3r@knf;K3nA!CrB2i^X-
zQIC}ZHhYlE!+&HQ>Jw1Np_ZC(a~^^ahDtECA8NxevjB}{B#LnDPOMcfyN(rj=^z~3
z2O_Yt2K5OzdI(zU@cdrbH3rM8$TM|ltYGKw6ZLx)Bb}hk;TK`3g#G3RbhCvTq%b-H
z?;eBtPH47Z`v~duFZ8bbMlqiy+3b;&eXS#G%&u|L*?$F+pKqWt2HRdIz4#;U<{WZ(
ziryFJaSs}pQzyy2bDX&Gh-jsS6Jp)^{nkJLy<<Bvh)I6^ljQc_1UK%|J9`0DERd8+
zEbn=R?uBp3zHtQe!CQn2576aeS-bm<Lj2W5^zarkCyugt<vJVJW=Z!=60Uc#?JlL$
z?~%j-!GGEF0I>Hd0y}`_qa!RHICj0UZAyYm(;_00EH@>X`%6+0`S0z|WaY#sA|m28
z0ud3hQ7r$wc}nK9lk)GYCzrgBcRu}**NtlZ@2`^FxrZ*7P@OK_Gv^4WuhCyvMCbG9
zu@QRTU1jz38G=7<p{o@NyT=#R-Dh8)DMzwjdw&|c+9BTTVv`uJkVn<3*wmrc+Gvx(
zb^~Nfo<X&YXC2koUiiu6i-pu{chHp~WYot`x1yXwp-@>5s}(L|(1{~ks}OsRK^S6;
zhghpkeqyxIyZ!Khmqh4X7HcgOGnjG#Rq*k&#$^QYJS5TB)*8AufZA5n#P}uCEoDDX
zo<rL`YwA0l>W9jPQAVP8n?&(2j;iX1Rc%xbXN~H#%WAB8&##Sqsc>`EPd}XbAE?ij
UbKR<!LjV8(07*qoM6N<$f`wO{82|tP

delta 847
zcmV-V1F-zh2h<0Ul7B5pL_t(IjXjY~Y*bYoN6)?Q&YSNdohc)2X+xN(R0$-aG)597
zL`jSRjjT`;7rMZY5M8=v$;ORgV*=3~5aY+HghZnl0WB>wmQaM~w07vUoteIwd2imk
z_wS;{)!F=V@=K0d`SQ~4RAc>Jzg&7z7xM*eJf}P}Z4yc($$#T`Y6V3DkqB#7NqIdo
z{u)VACv7enztKE9;QI%OV_01WtpRxqKLwrv*nxB494G~G0uD%GoN~8KCQcq@qym1L
z|A%pcI1A39lmY;eP2_SY<H3VP0%Hd?Q6KVIK*4$&HhK_S2xAcSpIAZPf;K3nA!U%D
z1MTjpQI8Y?Hh(&h$-+bxs^gH$pcd<JV-A8I3>08;A5;cmdLC*^NEqUptw^g(dJQY^
z!T~t2ck}A<>Za((L1?VOvwL9Y2rR82PgS9|jGenj*zJ^zw1Ogso`-<~_N(vE^#-b+
z!0-^feH5x=P;bEYA(E+|=v@AVd^SzI(IGDST8G$(oqwYwGxNkhUPq-2wz)=f;d|VT
zS>(_pozKqU?$<CUPmp=*7*XvZ;c^2fM7r_o&AtG7$9AM25&!%<@vT1zuHT_^<~%B&
zBQ6wJ+Wivk^IwyG?J(xOH|WjZM;G%&?e5ib(H9rcgIh=)Kf=c4Yph?LA=x`YZ>^1O
zwke!?hkrN<2+o|_OuFX@0^5iB!^14>KYFdUZBl}ZQz9Y~FV!WO{X-HF`RC0~Wcm0<
zA|m3}0}&CiVI+UOep2Sr6Y}@VCl<XA$DaJaYloHYw^xX7-$fS-s8*Zy>9h2vuF{=f
zKxeb)ks&(YTw&$ZX@cKwqRS<6yG9q(ou^-&E`NryPkS1>(jwYuW8(-fmqk^|*u<e$
zn`o25wgY5KmVUX2XC38Np8LUM^SQ)pw$P;kWZ1_~wxXOvp-^cLs}(L~(6J+3DG_;&
zey@iy9%8LF+4138=hlP$UL2w`X{@!7PhpBVRL;lK8kZ8p^N?6$8>{F}A1Yf><D(Z%
zyGW4!G=65+jH!+})$J+U3sVwC+a!zzag<fJSJp;laMq|+v#3VOcm2xH=L$Dl{`mdr
Ze*vh^m2;tw9bNzc002ovPDHLkV1lnjoZSEb

diff --git a/pelican/themes/notmyidea/static/images/icons/linkedin.png b/pelican/themes/notmyidea/static/images/icons/linkedin.png
index ee0ec7738d57b46cd634311d8df7a7d3e3ddf65e..d29c1201bcb0c278d49f573f9ef95ebfe932fb5b 100644
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0006vP)t-s00000
zXtV%nvH)we0Bp1bYqSDvv;b|j1Z}kdZ?*t$w+L;u2yM0nZnXw(wF7Uq1aGzoZnXt(
zwgYgr0CBblZ?*t&w*+vu0CKhfa<>O?w*+yx0CTqhbhrm|xBzvz1a!FqcDf06xd(T;
z33s;)cDV|7y9#-^3VFK@c)AREx(#`{5P7-@d%OyJybgN24|=>3db|^QyApf54}859
zd%O~SycB-F6oS7Mg1{Mpz#M|W8-~Ilg~A_(!XJpjA&SHzio+v{!z7EtC5yx+i^M05
z#Vn4-Esn-Ak;gHT$1;-0GLy(NlgLGp$T^kDI+e;fmdQGn$vT$GJeSHnm&-hv%0ZaR
zL72=xnae?$%tn~XLYmA%o6JO<%t)NhPo2(7pw3U9&{Ck$Q=!sTqR>>M(N?3<R;1Ec
zq|{ud(_^L5S*X%pr_^4j)nBL8UZ~VwsMTPo)nTdCW~tL=s@7_()orfWYp>RCuhwv{
z*>JGebFkNQvDtL7*>thma<bTUvD$O8+jX+qc(d4iwcLBR+I+X#f4AL&x!Z!d-h;W_
zgSp;-y4{1i-h{i~gT38^z21nt--o^3ioM^Az~PI*-<8MWmdE0k$K#;M<e|&tqRZu<
z%;clZ=BLf(r_Sf6&*!Vo=c~`>snF-F(C4es=&jS~wAARd)#<j?>bKVFwb$yn*z3L7
z?7rLWzuWJ^-|oob@6YA&(B<*a=JM9)^VjM0*y{D#>-FC4_2%;U|Ns9Oj;1#N0004W
zQchC<K<3zH0002@Nkl<Z7}Ev8!Ae3w6b9h`oSCa$HEflT6=_799wq2;+PCNddXA_?
z@6aNsK!REYQsyGHn|Q~2XXec5`v{lhi5Q#!@aBpx22P9xz|ls^CwAcvhSOI|&`c5<
z1^+Eiy2ox&c~d!G&P%&;lhIePRh5$ewz-aGPd<LeUi=!pd|n1vujhx;+q2!-2=aa-
z8HaMG)35vOBO-e`C?l`k26c+i>pR786}b)xDJsVI4<4<s<`flDDQd$Bp%hL*p<Y3%
zgj5M@?4WBJ=&CX3NRy@U^7-hVXHQ&=zuzdMc5f3nkKQy<Nz3gM@@+}Xh*@BmW&IEI
W8i?#El2Z);0000<MNUMnLSTaIozvC;

literal 2159
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
LodPdg1m^z*g5@fm

diff --git a/pelican/themes/notmyidea/static/images/icons/rss.png b/pelican/themes/notmyidea/static/images/icons/rss.png
index 7d4e85d981cbecb04b76dab5a234dc4690bd15ab..7862c65afeb66ba9cc7e9576a3a62b850b2e184d 100644
GIT binary patch
delta 745
zcmV<F0v7#%2k!=ul7GlaL_t(I5e30Zh*f0(0O0RG=ggfkXPnV#w1Kig&7ujS0)<@k
zKqA{z;3AN~HWDP%A|l#_#4Kv*GBDiL!l0ngAOeLR)~1IkmN<>(%-Gy<?&I8h?mg%H
zeO~~GUmtnM_}KF{O-yJnZ#QhsN$UG0*%ry<z@WV(I4h*L)PGsS^ke736Ynhri06+l
zsDFCb*c4%uK}kKN8X!eM_d59s=@@yJNPPIjp|t+xqx~UV{KUjA;xw&g1}*YsIydS5
zO>YSq$rgqMYKkaS-FvbSn$Jl_*=W(eMC&poDl`J)JE%~!DK`*EMrc$FSLQO^8wa$m
zGC9wK$0%|-i+>cWv@WxDg^@ApiX=q<AehW_SEdxJ%)Y~}qaq-Hif>=$&o7xCAqD^v
z#6g|deBW*3JH<af5Wjhv3$KZ{FN%m#p8bLc4ze*MAVfk`7nJqHauSVPli#EoF#U+o
z{$BWepLk|Y+_(xHJj={(iarq`sQbjm>|&y~+ElCyQ-AY3ev(6%g(JTUw-+U69u><w
zB#Gg@FDchiMFe$CB9uv}i(t!M)_xE!92WmNC2pSQ=&G{Y6MlRX40pVssE}6TAnFwK
zI{(cku`$y%=nztdx$yHF!l!o&qca9io>2XEnzC(V_9^w`BzdLGqpGA|C0Rn+wz0^j
z?cy_E@qbEgm}IP;SMGdOw~NjdX(KgEX5{O{I!aTrI2>doH`Iu=P<Ir`xL!Xqb@6@0
z$ef97fsI9-W>f60i3vdvDq<LGhw9hUJCjSt7VEq(RMYw~74lVM{X`vV$=p`edSAZQ
zGdj@_vQ)pU{JS_X*nQ~Z0Ofbb-%hTb{BZCON@B9fpol>oYn>itk1VAcp^W5xI@5cu
zZ9A~AKLF(C-r5t&Td&v6>o10~v()W06-6~$6!EUQv9*lprj>4|c_*3L8?xDbpUod$
bI0gR$D~Vu?3V6ai00000NkvXXu0mjfF-~l$

delta 762
zcmV<W0tNl=27m{Ul7HDrL_t(IjZKnEh#XZEhQD*Gx~IoXPj}KzVuOxN5~DbRsE~kJ
z_#lYmMujYdAjC}&4Cq2c+)0pG=rT(olASIhC@6^_LIOTUH$GxQbVxgS%=9=t>F%oP
zx>fhy<DxbAuMQmk@BI86;a};OM;>6N_AJx&I-|9nl*0}t+<%LSXEBX}Vzi2I7Kv^W
z;wr62&dFo%tO|ghKfXlx;caS7kSQn}gc5uKM1Y0#DrD;r)gVhjK_5J^7=@ocI3Tk8
z5%t}mEf}srF@$UllIxKE3FB2D1~Ut#1p-(_e0o<b(tids1%n}sF2e8<IKTr{ftg*C
z*^a;s00C2hs(*)ay%UpOJIL?~G#23gV_-8#x?p<~*yd%Z)F5~;(FE|Hghoud-o*Bx
z{TA##ir(HaiShM|@cZY`s(}8_Yyd5SVcR_$%*>;|y@!7FBwTm}-B?BeC4#3vgZmD_
zpqx-eL6l&@h5DLNDl25yCylorLPp;rpYBJ`bkM<-$$zy&XJKv+*c=oPA>^RdcGocO
z^|4z>a{(Sb35%DIBflaWUCfz>QFjZBp}hMA+!o*!5JCWhI3vLdv-@E4JLJM)^p8{M
zwgoua!=+>7`_};|cRh#oK;+RvNi2+$zuQKub16jv5<!_EKfZ>1d?zwBNAdUx{4b}$
zji|JrAb&I(ka=9Dcn7&Rv4LpBpbOJG(WkzEmoiEdL+?Cp{$<h>NG=mqBT6$zwgnoL
zD1unaA_jAf0BAr$f;BUY^O)xHyVy#H`VN6Xm!#iE(@oTXAczN*+DQD*r{~SZW8IMD
zh;NZ=gk(KxxgkivbhhKSa<a`aQ}rqmN94|PqjOtO>{<L!0Ngjn-!v;H-!J|G9K;R5
zst`1gjKPf|j=)#IDP%b$t-UKd4lW(I{aV?%H};CV`D*B2eO_F$nkId$^=)hQj!@n1
sG@4#dlm0E!+$V8+|0fHFmreov11pJOj6|z4N&o-=07*qoM6N<$g1Rth%K!iX

diff --git a/pelican/themes/notmyidea/static/images/icons/twitter.png b/pelican/themes/notmyidea/static/images/icons/twitter.png
index d6119280123364c3b37171b9ff0b37c1d67ed2b5..d0ef3cc1b36ab79ac7931c2269b70f3662950a97 100644
GIT binary patch
delta 696
zcmV;p0!RJB2EGQ6l7E*;L_t(I5e30ZYh6_s$Kl_**4q2r(!@lNrnd2t3W}u;lsdE%
zI~MfQIMdJIq_Yl11RW{`5eJ1L*g>HdFQ5%gFKObr@3Z$_>;3yYcI!BQ-Z@vtk;_|^
zz1*Sk!tr26WmpXvvlgk9v@&P8apqm--o=q_*;oJOuB}wPzkg>OM4=Sf#+U(5Bx-{p
zAVDV)UEr|6I9l4TVN>*AT!V)~z?jI`0uF&gcN!OS!6FwnMRbC?j>J0fbfcZnIh6;|
zEAd*2JnG<+zu?;$?8m^cI4`=ww0G9U$$}nu(!;9JaU!bTGUvP*5cp{dKc2$19rz66
z!z$2VG(?WFGk;Ye0l9$TIc3Rr%sC$-0`9M1djS7sm<s-B1CLvHvxfIZk>6dMx^NjG
z5K~vAPQndZKn52A+?~OvYd9(Jtb+;g!y&vqGHw@WidYqPgULIWu`J@Gh_eg{NEse3
z;du+e#HqxIg8|zHjRUAn<BDPdnj#WV911XZxUmHv?SI0vY`i-ZA56r3H`W4*h|+12
z)Ju^?5tk}wyNb*^F%HHT7vW$40AT#-;$9CI5)714(INy>lS^h8jI9{BG64bGL3}rZ
z+e`R<Djv3Q5R6?Dv%b(~$6Ps8iFv^wCRP|%$FOIRC2pR;#*Ccd)ggTS2D}rEpF2RJ
zcTz|(EPp~AaNLR)*|~nsxiS$)t<gC2y|XIt_u6^X!sQ4%IMeLJV8gU3swP0^@VJ5f
zbH<mK#K#jSVeF3rMQ}JY-l}0vVco2Gx~Ujp`zaga1+W*5v)=h_VZ1&vZoDK)DGZWP
z0R{MF<~(Q$XQgJ@iTTE_**DJ@*Z;`z=FpjV+c7U&mkF#0W%*!Js6cKqD@JReow}Mf
ey-r>+yYoLZrHhp#%l(i50000<MNUMnLSTX@0ZY>W

delta 701
zcmV;u0z&=12EzuBl7E~@L_t(IjV+Q(Yh6_wN7sMveeN?&Oay6a8y~5lSn5EjLp!l!
zK|hT%{R~bz>rh0{VWlAAKoG$W3bptEZD{(qO}y`O&pCVle-7gM0Bf?A-8#;nw$9a2
z<nmT!FScm3a6Fh%8P<c0S%cI_TA8!lIP*4h_u^2u?2CVL+kaH5-rX|}qEL!#W6XfZ
z5<P<fAVDh;UEr|6I9l2-VN-N})B_KNfH9V_1snp0?$j>kf<-QDif9GBUL^JcPd3^K
zty6grof5C4$io&s`V+pM!F~)3iu1fJOgm>?oGj>o#~rL{9VeoCTjrcM0|MVq;ky&K
zwgaDFyk7-sjDMQQQFf*ZBp??sJf|%AjydN;M8LfjZ1>^c3{%11P2f=julL}cVdOU#
zCoWt@2*lJDsg-bp29Uvp06)**<26hQJZ)hN+&+XihsK=(brGw=ZZLW4GL}V5ia5=X
zfRy3E5}q{>Oq@te91Pets2xB}8dVevXT}5+hXTwUZhvgS2fOez8*dN9dt-6WjkSOx
zqI8lZby8$e#HGsFt|IeRjDqpmML6j5KgJ&}?sjk?L0=gaEkZEWxnu^x*ouKGV-T<%
z#5XgzvxIM_;z0uk!Pqr1>k3VF%#~A>m=_FUVuf*a1bYTq;^qW4X5<Vn58%t!;H_x<
z(4MW?Ie#gn7#1P+Ic~)B>|8(RTp5d_#;6^-&RG@sYwbL2;Btf=oN0Dqut8cCRb!xa
zcvQpwIpgz7;={3%F!qOmA~+lvZ}ebJVO_6zvZ)wi`zafv1+W*5)6V&IVZ1stZoD8$
zDfE+3aaQKXnRCA`oR%KTR?Ihk&AxiJxc+;NH#P^(*qd(IxJ+P0D9ihsLIrY@Suq*|
j?ewZ?-D&cY*-!rgG^LA`I>-QU00000NkvXXu0mjf)N@7!


From 528747684d171287cdadc5513a7f03d1d05e4786 Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Sun, 4 Nov 2012 14:08:58 +1000
Subject: [PATCH 0973/2864] Split post content on all types of line endings for
 adding paragraph tags

---
 docs/changelog.rst              | 2 ++
 pelican/tools/pelican_import.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6cea6d93..4ba292a1 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,8 @@ Release history
 ================
 
 * Improve handling of links to intra-site resources
+* Ensure WordPress import adds paragraphs in for all types of line endings
+  in post content.
 
 3.0 (2012-08-08)
 ==================
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index fc28c6a4..bedd07f0 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -236,7 +236,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
             with open(html_filename, 'w', encoding='utf-8') as fp:
                 # Replace newlines with paragraphs wrapped with <p> so
                 # HTML is valid before conversion
-                paragraphs = content.split('\n\n')
+                paragraphs = content.splitlines()
                 paragraphs = [u'<p>{0}</p>'.format(p) for p in paragraphs]
                 new_content = ''.join(paragraphs)
 

From d0f5875f66b1a80b6011aeb626bb4ebe430ccdd0 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Mon, 22 Oct 2012 23:04:25 +0200
Subject: [PATCH 0974/2864] remove the LessCSSGenerator and the related config
 option

---
 pelican/__init__.py   |  5 +----
 pelican/generators.py | 46 -------------------------------------------
 pelican/settings.py   |  1 -
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 804fe5b4..443d330b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,8 +9,7 @@ from pelican import signals
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 StaticGenerator, PdfGenerator,
-                                LessCSSGenerator, SourceFileGenerator,
-                                TemplatePagesGenerator)
+                                SourceFileGenerator, TemplatePagesGenerator)
 from pelican.log import init
 from pelican.settings import read_settings
 from pelican.utils import (clean_output_dir, files_changed, file_changed,
@@ -177,8 +176,6 @@ class Pelican(object):
             generators.append(TemplatePagesGenerator)
         if self.settings['PDF_GENERATOR']:
             generators.append(PdfGenerator)
-        if self.settings['LESS_GENERATOR']:  # can be True or PATH to lessc
-            generators.append(LessCSSGenerator)
         if self.settings['OUTPUT_SOURCES']:
             generators.append(SourceFileGenerator)
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 01f4701c..33d0ff20 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -571,49 +571,3 @@ class SourceFileGenerator(Generator):
         logger.info(u' Generating source files...')
         for object in chain(self.context['articles'], self.context['pages']):
             self._create_source(object, self.output_path)
-
-class LessCSSGenerator(Generator):
-    """Compile less css files."""
-
-    def _compile(self, less_file, source_dir, dest_dir):
-        base = os.path.relpath(less_file, source_dir)
-        target = os.path.splitext(
-                os.path.join(dest_dir, base))[0] + '.css'
-        target_dir = os.path.dirname(target)
-
-        if not os.path.exists(target_dir):
-            try:
-                os.makedirs(target_dir)
-            except OSError:
-                logger.error("Couldn't create the less css output folder in " +
-                        target_dir)
-
-        subprocess.call([self._lessc, less_file, target])
-        logger.info(u' [ok] compiled %s' % base)
-
-    def generate_output(self, writer=None):
-        logger.info(u' Compiling less css')
-
-        # store out compiler here, so it won't be evaulted on each run of
-        # _compile
-        lg = self.settings['LESS_GENERATOR']
-        self._lessc = lg if isinstance(lg, basestring) else 'lessc'
-
-        # walk static paths
-        for static_path in self.settings['STATIC_PATHS']:
-            for f in self.get_files(
-                    os.path.join(self.path, static_path),
-                    extensions=['less']):
-
-                self._compile(f, self.path, self.output_path)
-
-        # walk theme static paths
-        theme_output_path = os.path.join(self.output_path, 'theme')
-
-        for static_path in self.settings['THEME_STATIC_PATHS']:
-            theme_static_path = os.path.join(self.theme, static_path)
-            for f in self.get_files(
-                    theme_static_path,
-                    extensions=['less']):
-
-                self._compile(f, theme_static_path, theme_output_path)
diff --git a/pelican/settings.py b/pelican/settings.py
index 35752fee..fa58d8b1 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -75,7 +75,6 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'DEFAULT_STATUS': 'published',
                    'ARTICLE_PERMALINK_STRUCTURE': '',
                    'TYPOGRIFY': False,
-                   'LESS_GENERATOR': False,
                    'SUMMARY_MAX_LENGTH': 50,
                    'WEBASSETS': False,
                    'PLUGINS': [],

From 5f51cffe0810c0d450c1dcac2288b5da6a0f38fb Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Mon, 22 Oct 2012 23:09:59 +0200
Subject: [PATCH 0975/2864] update docs: remove mentions of lesscss compiling
 and replace with webassets

---
 README.rst        | 4 ++--
 docs/index.rst    | 4 ++--
 docs/settings.rst | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index 018f73ba..b2648bf1 100644
--- a/README.rst
+++ b/README.rst
@@ -27,7 +27,7 @@ Pelican currently supports:
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
-* Compilation of `LESS CSS`_ (optional)
+* Asset management with `webassets`_ (optional)
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
@@ -62,9 +62,9 @@ client handy, use the webchat_ for quick feedback.
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Markdown: http://daringfireball.net/projects/markdown/
 .. _Jinja2: http://jinja.pocoo.org/
-.. _`LESS CSS`: http://lesscss.org/
 .. _`Pelican documentation`: http://docs.getpelican.com/latest/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
 .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
 .. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
 .. _contribute: http://docs.getpelican.com/en/latest/contribute.html
+.. _webassets: https://github.com/miracle2k/webassets
diff --git a/docs/index.rst b/docs/index.rst
index 3fc1cf9f..fd99b449 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -23,7 +23,7 @@ Pelican currently supports:
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
-* Compilation of `LESS CSS`_ (optional)
+* Asset management with `webassets`_ (optional)
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
@@ -75,8 +75,8 @@ A French version of the documentation is available at :doc:`fr/index`.
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Markdown: http://daringfireball.net/projects/markdown/
 .. _Jinja2: http://jinja.pocoo.org/
-.. _`LESS CSS`: http://lesscss.org/
 .. _`Pelican documentation`: http://docs.getpelican.com/latest/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
 .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
 .. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
+.. _webassets: https://github.com/miracle2k/webassets
diff --git a/docs/settings.rst b/docs/settings.rst
index 6bcc7292..ca2c7b0f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -105,9 +105,6 @@ Setting name (default value)                                            What doe
                                                                         incorporated into the generated HTML via the `Typogrify
                                                                         <http://static.mintchaos.com/projects/typogrify/>`_
                                                                         library, which can be installed via: ``pip install typogrify``
-`LESS_GENERATOR` (``FALSE``)                                            Set to True or complete path to `lessc` (if not
-                                                                        found in system PATH) to enable compiling less
-                                                                        css files. Requires installation of `less css`_.
 `DIRECT_TEMPLATES` (``('index', 'tags', 'categories', 'archives')``)    List of templates that are used directly to render
                                                                         content. Typically direct templates are used to generate
                                                                         index pages for collections of content e.g. tags and
@@ -128,8 +125,6 @@ Setting name (default value)                                            What doe
 
 .. [#] Default is the system locale.
 
-.. _less css: http://lesscss.org/
-
 
 URL settings
 ------------

From b66a37ccb1e0b69ec786c6f9a4397cc87e482ecf Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Wed, 24 Oct 2012 22:51:45 +0200
Subject: [PATCH 0976/2864] Unit tests for webassets

remove the unit tests for the lesscss generator (TestLessCSSGenerator class) and
replace it with tests for webassets:

- add a sample scss file
- run pelican with example files
- compare the generated css file with a reference one
- look in the html code for the correct link tag
---
 tests/test_generators.py                     | 85 ++++++++++----------
 tests/themes/assets/static/css/style.min.css |  1 +
 tests/themes/assets/static/css/style.scss    | 19 +++++
 tests/themes/assets/templates/base.html      |  7 ++
 4 files changed, 68 insertions(+), 44 deletions(-)
 create mode 100644 tests/themes/assets/static/css/style.min.css
 create mode 100644 tests/themes/assets/static/css/style.scss
 create mode 100644 tests/themes/assets/templates/base.html

diff --git a/tests/test_generators.py b/tests/test_generators.py
index accdb699..ba923980 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -1,15 +1,18 @@
 # -*- coding: utf-8 -*-
 
 from mock import MagicMock
+import hashlib
 import os
-import re
+
+from codecs import open
 from tempfile import mkdtemp
 from shutil import rmtree
 
-from pelican.generators import ArticlesGenerator, LessCSSGenerator, \
-        PagesGenerator, TemplatePagesGenerator
+from pelican import Pelican
+from pelican.generators import ArticlesGenerator, PagesGenerator, \
+    TemplatePagesGenerator
 from pelican.writers import Writer
-from pelican.settings import _DEFAULT_CONFIG
+from pelican.settings import _DEFAULT_CONFIG, read_settings
 from .support import unittest, skipIfNoExecutable
 
 CUR_DIR = os.path.dirname(__file__)
@@ -240,53 +243,47 @@ class TestTemplatePagesGenerator(unittest.TestCase):
             self.assertEquals(output_file.read(), 'foo: bar')
 
 
-class TestLessCSSGenerator(unittest.TestCase):
-
-    LESS_CONTENT = """
-        @color: #4D926F;
-
-        #header {
-          color: @color;
-        }
-        h2 {
-          color: @color;
-        }
+@skipIfNoExecutable(['scss', '-v'])
+@skipIfNoExecutable(['cssmin', '--version'])
+class TestWebAssets(unittest.TestCase):
+    """
+    scss style.scss style.ref.css
     """
 
     def setUp(self):
-        self.temp_content = mkdtemp()
-        self.temp_output = mkdtemp()
+        self.temp_path = mkdtemp()
+        self.theme_dir = os.path.join(CUR_DIR, 'themes', 'assets')
+
+        self.settings = read_settings(override={
+            'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
+            'OUTPUT_PATH': self.temp_path,
+            'WEBASSETS': True,
+            'THEME': self.theme_dir,
+        })
+        pelican = Pelican(settings=self.settings)
+        pelican.run()
+
+        self.css_ref = open(os.path.join(self.theme_dir, 'static', 'css',
+                                         'style.min.css')).read()
+        self.version = hashlib.md5(self.css_ref).hexdigest()[0:8]
 
     def tearDown(self):
-        rmtree(self.temp_content)
-        rmtree(self.temp_output)
+        rmtree(self.temp_path)
 
-    @skipIfNoExecutable('lessc')
-    def test_less_compiler(self):
+    def test_compilation(self):
+        "Compare the compiled css with the reference"
 
-        settings = _DEFAULT_CONFIG.copy()
-        settings['STATIC_PATHS'] = ['static']
-        settings['LESS_GENERATOR'] = True
+        gen_file = os.path.join(self.temp_path, 'theme', 'gen',
+                                'style.{0}.min.css'.format(self.version))
 
-        generator = LessCSSGenerator(None, settings, self.temp_content,
-                        _DEFAULT_CONFIG['THEME'], self.temp_output, None)
+        self.assertTrue(os.path.isfile(gen_file))
+        css_new = open(gen_file).read()
+        self.assertEqual(css_new, self.css_ref)
 
-        # create a dummy less file
-        less_dir = os.path.join(self.temp_content, 'static', 'css')
-        less_filename = os.path.join(less_dir, 'test.less')
+    def test_template(self):
+        "Look in the output index.html file for the link tag"
 
-        less_output = os.path.join(self.temp_output, 'static', 'css',
-                            'test.css')
-
-        os.makedirs(less_dir)
-        with open(less_filename, 'w') as less_file:
-            less_file.write(self.LESS_CONTENT)
-
-        generator.generate_output()
-
-        # we have the file ?
-        self.assertTrue(os.path.exists(less_output))
-
-        # was it compiled ?
-        self.assertIsNotNone(re.search(r'^\s+color:\s*#4D926F;$',
-            open(less_output).read(), re.MULTILINE | re.IGNORECASE))
+        link_tag = '<link rel="stylesheet" ' + \
+                   'href="theme/gen/style.{0}.min.css">'.format(self.version)
+        html = open(os.path.join(self.temp_path, 'index.html')).read()
+        self.assertRegexpMatches(html, link_tag)
diff --git a/tests/themes/assets/static/css/style.min.css b/tests/themes/assets/static/css/style.min.css
new file mode 100644
index 00000000..daf9c3cb
--- /dev/null
+++ b/tests/themes/assets/static/css/style.min.css
@@ -0,0 +1 @@
+body{font:14px/1.5 "Droid Sans",sans-serif;background-color:#e4e4e4;color:#242424}a{color:red}a:hover{color:orange}
\ No newline at end of file
diff --git a/tests/themes/assets/static/css/style.scss b/tests/themes/assets/static/css/style.scss
new file mode 100644
index 00000000..10cd05be
--- /dev/null
+++ b/tests/themes/assets/static/css/style.scss
@@ -0,0 +1,19 @@
+/* -*- scss-compile-at-save: nil -*- */
+
+$baseFontFamily : "Droid Sans", sans-serif;
+$textColor      : #242424;
+$bodyBackground : #e4e4e4;
+
+body {
+  font: 14px/1.5 $baseFontFamily;
+  background-color: $bodyBackground;
+  color: $textColor;
+}
+
+a {
+  color: red;
+
+  &:hover {
+    color: orange;
+  }
+}
diff --git a/tests/themes/assets/templates/base.html b/tests/themes/assets/templates/base.html
new file mode 100644
index 00000000..13b3fb10
--- /dev/null
+++ b/tests/themes/assets/templates/base.html
@@ -0,0 +1,7 @@
+{% extends "!simple/base.html" %}
+
+{% block head %}
+  {% assets filters="scss,cssmin", output="gen/style.%(version)s.min.css", "css/style.scss" %}
+    <link rel="stylesheet" href="{{ ASSET_URL }}">
+  {% endassets %}
+{% endblock %}

From 1b20319074d1a187ad60e3bcc4c567429d09198d Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Wed, 24 Oct 2012 23:34:38 +0200
Subject: [PATCH 0977/2864] add a warning for the users of the LESS_GENERATOR
 setting

---
 pelican/settings.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index fa58d8b1..2c318997 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -132,7 +132,7 @@ def configure_settings(settings):
     """
     if not 'PATH' in settings or not os.path.isdir(settings['PATH']):
         raise Exception('You need to specify a path containing the content'
-                ' (see pelican --help for more information)')
+                        ' (see pelican --help for more information)')
 
     # find the theme in pelican.theme if the given one does not exists
     if not os.path.isdir(settings['THEME']):
@@ -142,7 +142,7 @@ def configure_settings(settings):
             settings['THEME'] = theme_path
         else:
             raise Exception("Impossible to find the theme %s"
-                    % settings['THEME'])
+                            % settings['THEME'])
 
     # if locales is not a list, make it one
     locales = settings['LOCALE']
@@ -185,12 +185,17 @@ def configure_settings(settings):
                  "http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "
                  "for more information")
 
+    if 'LESS_GENERATOR' in settings:
+        logger.warn("The LESS_GENERATOR setting has been removed in favor "
+                    "of WEBASSETS")
+
     if 'WEBASSETS' in settings and settings['WEBASSETS'] is not False:
         try:
             from webassets.ext.jinja2 import AssetsExtension
             settings['JINJA_EXTENSIONS'].append(AssetsExtension)
         except ImportError:
-            logger.warn("You must install the webassets module to use WEBASSETS.")
+            logger.warn("You must install the webassets module to use "
+                        "WEBASSETS")
             settings['WEBASSETS'] = False
 
     if 'OUTPUT_SOURCES_EXTENSION' in settings:

From d6ec9b2028a68404735cd53a1f9c40ced267e711 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 6 Nov 2012 23:58:17 +0100
Subject: [PATCH 0978/2864] update "custom" output for functional tests

LC_ALL=C pelican -o tests/output/custom/ -s samples/pelican.conf.py samples/content/

we really need to merge #539 so that functional tests won't succeed if
output is different...
---
 .../output/custom/author/alexis-metaireau.html |   2 +-
 .../custom/author/alexis-metaireau2.html       |   2 +-
 tests/output/custom/theme/css/main.css         |   5 ++++-
 .../custom/theme/images/icons/delicious.png    | Bin 963 -> 958 bytes
 .../custom/theme/images/icons/facebook.png     | Bin 300 -> 202 bytes
 .../custom/theme/images/icons/github.png       | Bin 0 -> 346 bytes
 .../custom/theme/images/icons/gitorious.png    | Bin 3675 -> 227 bytes
 .../custom/theme/images/icons/gittip.png       | Bin 671 -> 487 bytes
 .../custom/theme/images/icons/google-plus.png  | Bin 0 -> 527 bytes
 .../custom/theme/images/icons/lastfm.png       | Bin 980 -> 975 bytes
 .../custom/theme/images/icons/linkedin.png     | Bin 376 -> 896 bytes
 tests/output/custom/theme/images/icons/rss.png | Bin 896 -> 879 bytes
 .../custom/theme/images/icons/twitter.png      | Bin 835 -> 830 bytes
 13 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 tests/output/custom/theme/images/icons/github.png
 create mode 100644 tests/output/custom/theme/images/icons/google-plus.png

diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 55dcebc9..c64aacb9 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -199,7 +199,7 @@
     
     Page 1 / 2
     
-        <a href=".././author/Alexis Métaireau2.html">&raquo;</a>
+        <a href=".././author/alexis-metaireau2.html">&raquo;</a>
     
 </p>
 
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 48e2ef1c..53f001fa 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -218,7 +218,7 @@ as well as <strong>inline markup</strong>.</p>
 <p class="paginator">
     
         
-            <a href=".././author/Alexis Métaireau.html">&laquo;</a>
+            <a href=".././author/alexis-metaireau.html">&laquo;</a>
         
     
     Page 2 / 2
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
index 3d94200b..29cce82c 100644
--- a/tests/output/custom/theme/css/main.css
+++ b/tests/output/custom/theme/css/main.css
@@ -309,7 +309,10 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
-        .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+		.social a[href*='github.com'],
+		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
+		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
 
 /*
 	About
diff --git a/tests/output/custom/theme/images/icons/delicious.png b/tests/output/custom/theme/images/icons/delicious.png
index c6ce246a4602f8f74e75ea8cfe9f5a00daceeb33..3dccdd848ec99fba9950e8195d4e73867ada2738 100644
GIT binary patch
delta 825
zcmV-91IGNr2fhc8l7AOTL_t(I5e31$ZyR+Sz~RsR?&phr@k{KwZtJ8rq)AI+DoYGR
zC_<<k5ePBzFO-D^2^NsLF%$$$Y%Fv@g-Uco0>Oerq^Ob`+NMdMNmJK})5LG*d-L6W
zc^(6xSS(h?<8dRCv6pJK*-N!ry|lD=zU=6Cvvz*9eR|Y8ZGZP?(}Q5zu4Ye;Yw6U<
z%$bdQs2_ec*4Ey;wY<Faeyx7dZZsO?vT4fYGtAE~^4ER%_Is$5px1-FXTrVv2Hs<j
zSDQUP{^-`4E|)KTaP#ID3IG5A075!##q+i%bO8mfYmiDtOsZ+NUkv!=u0Pb1Npb*E
z2Y?A8049dvVt;89Kg!V`gENNqzQ-i)Vp=KE=1B78)u-CB3_yT{I2Hg*6Cfd*5jvfS
zC>Bn;5kze=d5?*!aR(Wra;~tbOQk6n6iE^S28IC;10{@PkM=_sWfib<N2t6Dv5-nB
zydcHqKk6Nw&!>g}N~Hk+008J5K8N8Pi863TKFA4#Hh*A4LHxOMyT9w><KqXd*7{1n
z@3X!Alt&LYah#ByN58T8-!(EXeM4hmK&f2Co-UG2Tb#|!&^frRrmfotymF=S<Jrox
z6be@bDgs%7lmJpazbZR>A|jE91R@fPNF*X6Uw!$hG@H#gbvAe5wL~g-eup^rQ51og
zp);b<%zv>^j{y^y03niqp-c{sG_BT_qiPrDe~O}j;qVY7MvR0=e89tT48Q~+iXe(0
z5da7Szq_*X#=c5t?5!{y68J805+M>0_z_^U^LUHy(Gvhb05FsS1cCng`k$w&UZ0x|
z0uQY<A~7NXU;;&6^d~r@F#uYp(b_^87GN;w_kT;*uYYLk{rx9lE>|E3Pp}ktUY9r?
z14j_0@d5$B_Z=+DVmR~|IWB$}mM>H*v$|ft{9t3_8G-9yY7Y#LsVRkJX3(iJpMCzF
zEX-G(o!tYKB)aGO!M}TZ8^dBTeR$)>Cv9!p_HOg)(${Nmzm=^2eRt!qyLG(s`nCRG
zm@*E1KbX?WJ$-q;+RNr<%sY4f7_?eHhX4RqE;sleG7W{b<gJ)y00000NkvXXu0mjf
D8IXcW

delta 830
zcmV-E1Ht^h2g3)Dl7AdYL_t(Ijb)O(Z(C&?g`fNS^^JYwkJxqH)=6zhla|C(mKcao
zgitpk5MtzCXcrbFSU~E=P!KS&vCsh(D$xxI1Pc<8qDpCKn<jxKO<gBW6MtRbFW-BA
z3<*<@bfmL9I?~ZG01Aadc{m)_(`jq2TAjR5t=5Wjvu8`Tet$P(<rbSq`<<g^cQV!U
z$E`}{@SvJX9!{KExr_S#7h`GZy_@s%bMIGc=dF6ZPBxRGR651<^elhggKxfrauGTm
z*nTS9y=UM)a(T7U;iC_4F6mO~!Us2Qe6Dyw0j;LuSyK}@fC9%cNX7$3l@uG#d;EOI
z>+8`d-UX>0Lw_Sg01_C6gQ*jEVV3R?>>)IFTt-owgqb9j7)Y+P_(Yqg0SFKiMFKz~
z0T7c(3$0d27zs!15W*(uoXg13IK8w{K9ir-#p0L)iZ~7c1H%A_fFee`P4j_+GV@s3
zeN@hYNJu6XuAgM>Z}pDO<&u2>rBW}f(As+j{V8H)V1ExhkV6P8z=FJZQ)jk*(+39!
z_g7b!7rI@Kjg2Qfe6WUX2W&q4m9>AbkbdcF>N7oxr3%(~flSKebasN)?kzQL-rD7r
zOZ6X4m**v)zbsG|$Ot3_kjmLb+1wTp2}Q&gk?16geEG#E(r7f^)S2wL*J3H-dM%>J
zLs0-C`hWI-dLzqBEdmn22ndiE43%JSU$eTpZma6~=^w+;r{CWLi4Y?u6c2E*ZQ}%n
zFg$iFCol26_QJv&J1Uj7)`Osr?>R(qh=`Bxg@DE8qjlQ*k548&CJm(kL7=<5{Kt{1
z)uzUM-$iSUNQ8)g(punocZ59{0-$vYtxc3+0)Ga*Znt>#>NQL6>^u&#**t!5h^fGJ
z+eFb2*oQEM>mN6Jo{edm^!qLY+rbNh(z!}`QrBu1@2{*p#dmBH+6BX9Y)oM$(&%J~
zPe1!sW~M9l=GLx?W8LvQ|DWycm42a++Pi-J<EFMOYpZd2?yIG@--?(2y0fy^UO!lP
z{WnUt*G~nW=Z|US9KAeU>147KiQBh-@2#%>6#Rd*OBd_>2Qm$Xwckl|rT_o{07*qo
IM6N<$f};<VTL1t6

diff --git a/tests/output/custom/theme/images/icons/facebook.png b/tests/output/custom/theme/images/icons/facebook.png
index a7914b497369c55feba7defc9a3ea5bec424ecfc..74e7ad52f362b56d584df459bc5141395c32b7ed 100644
GIT binary patch
delta 16
XcmZ3(bc%7pK~4rwS3j3^P6<r_F@FWd

delta 114
zcmX@bxQ1!M!EDtM*NBpo#FA92<f2p{#b9J$XsByoq-$sxVrXP#YHnp}scm3rWnf@!
jzTyW10|P=sZhlH;S|x4`UReSzKn)C@u6{1-oD!M<njIfp

diff --git a/tests/output/custom/theme/images/icons/github.png b/tests/output/custom/theme/images/icons/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c52b486c5e392261c24d53fe2609e54d4f07c5d
GIT binary patch
literal 346
zcmV-g0j2(lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uy}3`s;mR5;6()3HheVGso1uMG%RRzfO4uoA3<v_61sARwd?1Y28Q
z!qzGv2!XV=2ZA63u1yv20fbZm;cO=I6E3Izu-x(Q%-qiI9=lH;XNkUloFV3D@R?|G
zH|!$z@Qf91aa`n%a<>Ym*CsGUh074yEL{XMZ7cf&`*=*r72Z+j+2B5y<+hzU#(AFv
z+!m8y#^HcNtmEqdUmXGsPJ&&BYk)<>PJbac!3$@wEwC5mE`k2GKxqL+9X1|{k^fkb
zPG1EuO5&~{J{6@4w%#7&G9!Ay3~z<NYk_SYqmZh6{XEOE5vYraRl&Bd@+`Z5la<{F
sEO4FNbk`~?npn3quuksJ=TE=$H_pXv&+a*=O8@`>07*qoM6N<$f=VTic>n+a

literal 0
HcmV?d00001

diff --git a/tests/output/custom/theme/images/icons/gitorious.png b/tests/output/custom/theme/images/icons/gitorious.png
index 6485f5ecc5f6047a052d9adfb686ee154e7233af..3eeb3ecec36a73ff505e04ecdecbcc4792ef6786 100644
GIT binary patch
delta 199
zcmV;&0672K9OD6yB!4_mOjJbxdO9bDQz(m9HIZRZpK)ubh)uJ7cde3mxs-3gmU_mX
zpuexJ#ki)~zOmiL)z#I~?BD9@>fQ0@|NsA$KGRG9003f1L_t&-(|ye`5`Z8K0Ko$#
z3IP-G|9`cS8ED+{nj_01Be_koAnlp75qc?o2`=J4p}Suqmq2^}LK)BUG$EY#9zOeh
z21r&_4>(k-B_NrZDX5wKgt~2Y2}1&6nnZ{!;tLK&3GEfRNsIsh002ovPDHLkV1iD^
BTdx2B

literal 3675
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
BhXDWp

diff --git a/tests/output/custom/theme/images/icons/gittip.png b/tests/output/custom/theme/images/icons/gittip.png
index bb12a1391ace96a9d4cedffebedd7db7d6a84d48..af949625ac83d2441215c81650e897c97d9e5d95 100644
GIT binary patch
delta 390
zcmV;10eSwP1?K~hYJUM|Nkl<ZILl*TfPw^X8!(;dW22JbZ9M}>-vZ)aP<#t2rh=>%
z4uBFcLlywp|AF`)lt#v2F_0Q$J;*j+Ou*EHfuU+HqPPTPDok^%yZQe}XCt6Z)(A~N
zcBHfM{}?w@xFIl?fc=bY!<BO<|9|=X>HpjbZD7OVJuUzD)PENK|M2eZ|NFOZ{Lct+
zMRt)212k~{fo$2ZY~Ftm`1kK0n4Z<s^uMJf11<)_$M)^~9|trPs%HiRG_=9a+_YlB
ze;5EM{{8zG*k+i4Ao|3C-9Q5@U@o}D0F5TFKzVBTe?p+Qt{B-1zfcT_aX0&a_V^*7
zRhSw<wm*Jw_kVwsi!p`)w~zxd+28*Eub)5Q&PEQCyl5ZvXuSmwL}ZET%ovn_1A(5}
zB9y2_4n!4<#NurQ)&K*GruHBQ9BMS8CnOjK#s8G{>i?_eO#`O~^wbDXNGM6!8_gwN
kR<Jn7pOh)eOq6D40B`F5$B|gKmH+?%07*qoM6N<$g7gx+%K!iX

delta 576
zcmV-G0>Ay|1D^$uYJUPBNkl<ZILoDzKWGzS7{-6^cey6jL2VISlnBk>U>nq-!*wY*
zC4;*|6YMHgDyXOh9jsz9Dcv*)g5V+u32`wNycWSfXg96&Pc%sJPsJj(q|NJ)yLbsY
z`3(p6eb4hgcfWg1@K!3}kT1EUlTM$io)M8@AnF}2scJ<;GJm<E``*_A2tYdNkSn^R
z5>8%(5kUR3z*0a|DdbCT%J)bh`Hez<r;EQ$fw^4K9Y`gdW=bmI<Pk;$*sRyt+^iFh
zbR*Inr>bnMuVYyTyDN+~Cl&G~Hznz$(+AA^3FB9?L}LfIfBP2G<%bw!ICx}`(bE@M
z{rZ{f=TEY+{(sAt$E<j4?^O{wtg3SC_z8xNCb8`<4h;_RW#to*ZQD6Jd6RG?!p@#v
zdUx;Px%&iTjH+rl<k1!YV@#8*2&zhY>>NMW)=<^fUQ?r<OoomBsYHaC$K@6*5g`<^
z*|Dpq#X>}wsXW56LcT0&f`n_;MP5C7>IHPrSLNgK0)H=Or`z@ou;ky^b{A9EE>W*<
zpsH<V5#h##F~X7Vpnu7zYK1^%V{41cr$$@v?3=R_<NWx(+VN0YF(Q)bY+bFoKz3pr
z5kW+_JC$Yb#cYekA54<5Ucak;i^uluM~F)R;7YAZ?ZYC=^KU6XxJM{tx3$qL(w+7y
zEB(O`Z8<b(sA5^xKdWp!Gr6KW02G2DVocDi-nEb`x&!HCGg$ujcm55b9s8QriQlvU
O0000<MNUMnLSTaH2O8!8

diff --git a/tests/output/custom/theme/images/icons/google-plus.png b/tests/output/custom/theme/images/icons/google-plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c6b74324031611f20c0a3810131aa74fd0a5a9f
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0005jNkl<ZD9>ZK
z>upIAVz}dFal_O6CT?`r$q<OnIT-@kK$Q%)JnZh&Px^TL<hOT!|HHwDE3YcOueqB6
z(P;+*puibNLm>OAn;FBaOK-k!D!Jidayc;Y>7GYGxnGBxue+IChM|)V`ar=`j`~3M
zC07%M|NqZF^fS8TVssIRJYwIy1j>GXU1E8{UJs6dLU1-v!-3nb2Irih=+?6PK<TfG
zB2Rf*{>KJ@8lF5#&^v9fcghZg&b90USur#Ch_yBx0YzYJ9ftpZ|9@Mbb;3sH7#Llc
zapC{3OLv2zTp&7Rr3KUgB!TRsHrfndzX7?Q-YzOS8|-?va>A!K_nuYT9<<VgqkWbd
zKoxr}G!9s50ujTB;JBOfmb}=t_wzfT`1cp}c6-g#_aLENrfLub;W8XHSKncxy2B*+
z$(#TG{(pE>U;^giL<|Q^RJR%`Z!y$8yYa>Upa1{=xci{g2`qvgF`RFk`e^@wXB(G2
zShMW$$p`;HLHGV;SLhaf#f_+F1DIs^y0_<$oBBFk`Sl>Ab*Ovm_g^4AcawG2Lj|D-
zqK4swiTo;US!A@iaP1FZz%33(6Ney%eY$dMwPn_zpvZ?`|G(*ST!StSLI9gPlb*yp
RBR2p5002ovPDHLkV1g3B{|5j7

literal 0
HcmV?d00001

diff --git a/tests/output/custom/theme/images/icons/lastfm.png b/tests/output/custom/theme/images/icons/lastfm.png
index b09c7876537ad9faa7a7a68ad6c8035d2e32ec3a..3a6c6262b644dadbcf6cce5dfe4fed9740a9ec1f 100644
GIT binary patch
delta 842
zcmV-Q1GW6r2hRtPl7A>kL_t(I5e30dY!p=-!13>U^LF-sk?xk2w$KnZDpdlBD2<Us
z2~iSbKqDvA#DgC2Plz5pbL8U1a4~`C4T$m2sf0wM7y&IUG?q|==(cw0w%y&%?#%4W
zdp|!PwfgntJ(<?V`+l|ZvMv`(+IUWRX2zscNYf|r)GCS=B7ZT~u95LVa{fAL+9Yc(
z8^6^)H{|<=ND^4v0IdOe0zU(u0oZ|a;2bCgNeT`~6P$8)OfE?uXRHQ(7Mug;AW0Et
z!8w#t03ZT@6bdNg!NVm2V}~{I0E&4)!A2K0Lr5${35Wte3r@knf;K3nA!CrB2i^X-
zQIC}ZHhYlE!+&HQ>Jw1Np_ZC(a~^^ahDtECA8NxevjB}{B#LnDPOMcfyN(rj=^z~3
z2O_Yt2K5OzdI(zU@cdrbH3rM8$TM|ltYGKw6ZLx)Bb}hk;TK`3g#G3RbhCvTq%b-H
z?;eBtPH47Z`v~duFZ8bbMlqiy+3b;&eXS#G%&u|L*?$F+pKqWt2HRdIz4#;U<{WZ(
ziryFJaSs}pQzyy2bDX&Gh-jsS6Jp)^{nkJLy<<Bvh)I6^ljQc_1UK%|J9`0DERd8+
zEbn=R?uBp3zHtQe!CQn2576aeS-bm<Lj2W5^zarkCyugt<vJVJW=Z!=60Uc#?JlL$
z?~%j-!GGEF0I>Hd0y}`_qa!RHICj0UZAyYm(;_00EH@>X`%6+0`S0z|WaY#sA|m28
z0ud3hQ7r$wc}nK9lk)GYCzrgBcRu}**NtlZ@2`^FxrZ*7P@OK_Gv^4WuhCyvMCbG9
zu@QRTU1jz38G=7<p{o@NyT=#R-Dh8)DMzwjdw&|c+9BTTVv`uJkVn<3*wmrc+Gvx(
zb^~Nfo<X&YXC2koUiiu6i-pu{chHp~WYot`x1yXwp-@>5s}(L|(1{~ks}OsRK^S6;
zhghpkeqyxIyZ!Khmqh4X7HcgOGnjG#Rq*k&#$^QYJS5TB)*8AufZA5n#P}uCEoDDX
zo<rL`YwA0l>W9jPQAVP8n?&(2j;iX1Rc%xbXN~H#%WAB8&##Sqsc>`EPd}XbAE?ij
UbKR<!LjV8(07*qoM6N<$f`wO{82|tP

delta 847
zcmV-V1F-zh2h<0Ul7B5pL_t(IjXjY~Y*bYoN6)?Q&YSNdohc)2X+xN(R0$-aG)597
zL`jSRjjT`;7rMZY5M8=v$;ORgV*=3~5aY+HghZnl0WB>wmQaM~w07vUoteIwd2imk
z_wS;{)!F=V@=K0d`SQ~4RAc>Jzg&7z7xM*eJf}P}Z4yc($$#T`Y6V3DkqB#7NqIdo
z{u)VACv7enztKE9;QI%OV_01WtpRxqKLwrv*nxB494G~G0uD%GoN~8KCQcq@qym1L
z|A%pcI1A39lmY;eP2_SY<H3VP0%Hd?Q6KVIK*4$&HhK_S2xAcSpIAZPf;K3nA!U%D
z1MTjpQI8Y?Hh(&h$-+bxs^gH$pcd<JV-A8I3>08;A5;cmdLC*^NEqUptw^g(dJQY^
z!T~t2ck}A<>Za((L1?VOvwL9Y2rR82PgS9|jGenj*zJ^zw1Ogso`-<~_N(vE^#-b+
z!0-^feH5x=P;bEYA(E+|=v@AVd^SzI(IGDST8G$(oqwYwGxNkhUPq-2wz)=f;d|VT
zS>(_pozKqU?$<CUPmp=*7*XvZ;c^2fM7r_o&AtG7$9AM25&!%<@vT1zuHT_^<~%B&
zBQ6wJ+Wivk^IwyG?J(xOH|WjZM;G%&?e5ib(H9rcgIh=)Kf=c4Yph?LA=x`YZ>^1O
zwke!?hkrN<2+o|_OuFX@0^5iB!^14>KYFdUZBl}ZQz9Y~FV!WO{X-HF`RC0~Wcm0<
zA|m3}0}&CiVI+UOep2Sr6Y}@VCl<XA$DaJaYloHYw^xX7-$fS-s8*Zy>9h2vuF{=f
zKxeb)ks&(YTw&$ZX@cKwqRS<6yG9q(ou^-&E`NryPkS1>(jwYuW8(-fmqk^|*u<e$
zn`o25wgY5KmVUX2XC38Np8LUM^SQ)pw$P;kWZ1_~wxXOvp-^cLs}(L~(6J+3DG_;&
zey@iy9%8LF+4138=hlP$UL2w`X{@!7PhpBVRL;lK8kZ8p^N?6$8>{F}A1Yf><D(Z%
zyGW4!G=65+jH!+})$J+U3sVwC+a!zzag<fJSJp;laMq|+v#3VOcm2xH=L$Dl{`mdr
Ze*vh^m2;tw9bNzc002ovPDHLkV1lnjoZSEb

diff --git a/tests/output/custom/theme/images/icons/linkedin.png b/tests/output/custom/theme/images/icons/linkedin.png
index feb04962bfe2fd712cb5003c8c20b43af4c18201..d29c1201bcb0c278d49f573f9ef95ebfe932fb5b 100644
GIT binary patch
delta 874
zcmV-w1C{*v0)PjQBYy%nP)t-s00000XtV%nvH)we0Bp1bYqSDvv;b|j1Z}kdZ?*t$
zw+L;u2yM0nZnXw(wF7Uq1aGzoZnXt(wgYgr0CBblZ?*t&w*+vu0CKhfa<>O?w*+yx
z0CTqhbhrm|xBzvz1a!FqcDf06xd(T;33s;)cDV|7y9#-^3V(UK4tTl@dAbdGx)6D~
z346Q>d%O;MybpT35_-H7db<*PyAOQ56??oAe7qEXzZ8PM6@tJSfxsMsz#E3bAcevo
zhQc3+!Xb*pB8tN!io+y}!zGKvCX2);jm0dE#x0J<GLgqIlE*TV$TE}2Gn2?gk;plf
z$~u+GIhM&fmVe1QmdZSr$~~9MJekTtn9D(!%s-jSL7B`(n94$$%tD*YM4Ze>oX$_3
z&P$-qPoL0IpwUyI(p93+RHM;WqtaHS(paR_T&B}wrP5ib(q5<3UZ>Sxr`2Al)Ly97
zV5rq$snuqw(`KsHYOK|5uGnj@)^D%YaIe{Lu-9|2*MD=d*>thlbg|lUve<R8+H<no
zb+X!cv)FvK+<Uj$e7D+vx7~ud+k&~?gSp*<x!!=f-GjQ`guCB^z1@Vp-iW;4hrQj3
zz2A($;fulFmB-?i$KsdA<Dkjpq08i=%jKWU<fF~zr_JW4&gZAk=c~@=tIy}D(C4hs
z=d01^t$)+$wAARd)#<j?>bKVFwb$yn*z3L7?7rLWzuWJ^-|oob@6YA&(B<*a=JM9)
z^VjM0*y{D#>-FC4_2%;U|Ns9Oj;1#N0004WQchC<K<3zH0002@Nkl<Z7}Ev8!Ae3w
z6b9h`oSCa$HEflT6=_799wq2;+PCNddXA_??|;xDs6c{R1ybfBwVQayduQg%>H7$m
z<cS!Z0PyCDE(T7F1;Eip$|rW=4~ElMOVCUb8U_C?PrAo$QF&82U(QRra+A?lu~n6l
z|F*e~W=}qT#$Nmyy?kB<Sg+@Y)7!J%*$DD}BN>Nsr_-<d?IR+4Iw&Kr-3E1v(Ca(J
zaAOs@4hbnL#`g~%t+3`46;df`!wI1jPC=nwL8^pQ32W@2YZ~aPG3ZE>rSbCl=$>a!
zT#UcpD5G|76F86FG*L;*?Gy5CNz8~@V3=k75A+&{>?x8{4FCWD07*qoM6N<$f^Ejt
Ar~m)}

delta 350
zcmV-k0iphY2lxVzBYyw^b5ch_0Itp)=>Px#V^B;~MGyc0KZmWH$J$Alx#;uvdbG^e
z=kH&n!$6a@!rkci`}{$ayo$Zj;O+HRp};|mv$WLV^7{O7uFF80y{ypSmBiLho4f!2
z|3HebZLP@V@Az7wzxn$7k-*gO`1*yp(aquNH>hjL00001bbnG#Qvg8b*k%9#00Cl4
zM??UK1szBL000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk_1|=i3(xCzX004nW
zL_t&-({<0$4#FS|1<<0CRVy%Xv>;CX|F0C5;2xYeX_}lgX$wGf`-TVr5tjpQ*#$4m
zuBAiHh{xLP3Ri^q)}<J2jA-UPAQ~Q}c!}{`%Qd)rYcE=<Ec2W;NGbe<r;MWvN}Xhy
wQrmJ}nB&Vi8$(zpD7Ey{f1uv(`XiO$10-V(6Xm>4&j0`b07*qoM6N<$f`s&<#{d8T

diff --git a/tests/output/custom/theme/images/icons/rss.png b/tests/output/custom/theme/images/icons/rss.png
index 7d4e85d981cbecb04b76dab5a234dc4690bd15ab..7862c65afeb66ba9cc7e9576a3a62b850b2e184d 100644
GIT binary patch
delta 745
zcmV<F0v7#%2k!=ul7GlaL_t(I5e30Zh*f0(0O0RG=ggfkXPnV#w1Kig&7ujS0)<@k
zKqA{z;3AN~HWDP%A|l#_#4Kv*GBDiL!l0ngAOeLR)~1IkmN<>(%-Gy<?&I8h?mg%H
zeO~~GUmtnM_}KF{O-yJnZ#QhsN$UG0*%ry<z@WV(I4h*L)PGsS^ke736Ynhri06+l
zsDFCb*c4%uK}kKN8X!eM_d59s=@@yJNPPIjp|t+xqx~UV{KUjA;xw&g1}*YsIydS5
zO>YSq$rgqMYKkaS-FvbSn$Jl_*=W(eMC&poDl`J)JE%~!DK`*EMrc$FSLQO^8wa$m
zGC9wK$0%|-i+>cWv@WxDg^@ApiX=q<AehW_SEdxJ%)Y~}qaq-Hif>=$&o7xCAqD^v
z#6g|deBW*3JH<af5Wjhv3$KZ{FN%m#p8bLc4ze*MAVfk`7nJqHauSVPli#EoF#U+o
z{$BWepLk|Y+_(xHJj={(iarq`sQbjm>|&y~+ElCyQ-AY3ev(6%g(JTUw-+U69u><w
zB#Gg@FDchiMFe$CB9uv}i(t!M)_xE!92WmNC2pSQ=&G{Y6MlRX40pVssE}6TAnFwK
zI{(cku`$y%=nztdx$yHF!l!o&qca9io>2XEnzC(V_9^w`BzdLGqpGA|C0Rn+wz0^j
z?cy_E@qbEgm}IP;SMGdOw~NjdX(KgEX5{O{I!aTrI2>doH`Iu=P<Ir`xL!Xqb@6@0
z$ef97fsI9-W>f60i3vdvDq<LGhw9hUJCjSt7VEq(RMYw~74lVM{X`vV$=p`edSAZQ
zGdj@_vQ)pU{JS_X*nQ~Z0Ofbb-%hTb{BZCON@B9fpol>oYn>itk1VAcp^W5xI@5cu
zZ9A~AKLF(C-r5t&Td&v6>o10~v()W06-6~$6!EUQv9*lprj>4|c_*3L8?xDbpUod$
bI0gR$D~Vu?3V6ai00000NkvXXu0mjfF-~l$

delta 762
zcmV<W0tNl=27m{Ul7HDrL_t(IjZKnEh#XZEhQD*Gx~IoXPj}KzVuOxN5~DbRsE~kJ
z_#lYmMujYdAjC}&4Cq2c+)0pG=rT(olASIhC@6^_LIOTUH$GxQbVxgS%=9=t>F%oP
zx>fhy<DxbAuMQmk@BI86;a};OM;>6N_AJx&I-|9nl*0}t+<%LSXEBX}Vzi2I7Kv^W
z;wr62&dFo%tO|ghKfXlx;caS7kSQn}gc5uKM1Y0#DrD;r)gVhjK_5J^7=@ocI3Tk8
z5%t}mEf}srF@$UllIxKE3FB2D1~Ut#1p-(_e0o<b(tids1%n}sF2e8<IKTr{ftg*C
z*^a;s00C2hs(*)ay%UpOJIL?~G#23gV_-8#x?p<~*yd%Z)F5~;(FE|Hghoud-o*Bx
z{TA##ir(HaiShM|@cZY`s(}8_Yyd5SVcR_$%*>;|y@!7FBwTm}-B?BeC4#3vgZmD_
zpqx-eL6l&@h5DLNDl25yCylorLPp;rpYBJ`bkM<-$$zy&XJKv+*c=oPA>^RdcGocO
z^|4z>a{(Sb35%DIBflaWUCfz>QFjZBp}hMA+!o*!5JCWhI3vLdv-@E4JLJM)^p8{M
zwgoua!=+>7`_};|cRh#oK;+RvNi2+$zuQKub16jv5<!_EKfZ>1d?zwBNAdUx{4b}$
zji|JrAb&I(ka=9Dcn7&Rv4LpBpbOJG(WkzEmoiEdL+?Cp{$<h>NG=mqBT6$zwgnoL
zD1unaA_jAf0BAr$f;BUY^O)xHyVy#H`VN6Xm!#iE(@oTXAczN*+DQD*r{~SZW8IMD
zh;NZ=gk(KxxgkivbhhKSa<a`aQ}rqmN94|PqjOtO>{<L!0Ngjn-!v;H-!J|G9K;R5
zst`1gjKPf|j=)#IDP%b$t-UKd4lW(I{aV?%H};CV`D*B2eO_F$nkId$^=)hQj!@n1
sG@4#dlm0E!+$V8+|0fHFmreov11pJOj6|z4N&o-=07*qoM6N<$g1Rth%K!iX

diff --git a/tests/output/custom/theme/images/icons/twitter.png b/tests/output/custom/theme/images/icons/twitter.png
index d6119280123364c3b37171b9ff0b37c1d67ed2b5..d0ef3cc1b36ab79ac7931c2269b70f3662950a97 100644
GIT binary patch
delta 696
zcmV;p0!RJB2EGQ6l7E*;L_t(I5e30ZYh6_s$Kl_**4q2r(!@lNrnd2t3W}u;lsdE%
zI~MfQIMdJIq_Yl11RW{`5eJ1L*g>HdFQ5%gFKObr@3Z$_>;3yYcI!BQ-Z@vtk;_|^
zz1*Sk!tr26WmpXvvlgk9v@&P8apqm--o=q_*;oJOuB}wPzkg>OM4=Sf#+U(5Bx-{p
zAVDV)UEr|6I9l4TVN>*AT!V)~z?jI`0uF&gcN!OS!6FwnMRbC?j>J0fbfcZnIh6;|
zEAd*2JnG<+zu?;$?8m^cI4`=ww0G9U$$}nu(!;9JaU!bTGUvP*5cp{dKc2$19rz66
z!z$2VG(?WFGk;Ye0l9$TIc3Rr%sC$-0`9M1djS7sm<s-B1CLvHvxfIZk>6dMx^NjG
z5K~vAPQndZKn52A+?~OvYd9(Jtb+;g!y&vqGHw@WidYqPgULIWu`J@Gh_eg{NEse3
z;du+e#HqxIg8|zHjRUAn<BDPdnj#WV911XZxUmHv?SI0vY`i-ZA56r3H`W4*h|+12
z)Ju^?5tk}wyNb*^F%HHT7vW$40AT#-;$9CI5)714(INy>lS^h8jI9{BG64bGL3}rZ
z+e`R<Djv3Q5R6?Dv%b(~$6Ps8iFv^wCRP|%$FOIRC2pR;#*Ccd)ggTS2D}rEpF2RJ
zcTz|(EPp~AaNLR)*|~nsxiS$)t<gC2y|XIt_u6^X!sQ4%IMeLJV8gU3swP0^@VJ5f
zbH<mK#K#jSVeF3rMQ}JY-l}0vVco2Gx~Ujp`zaga1+W*5v)=h_VZ1&vZoDK)DGZWP
z0R{MF<~(Q$XQgJ@iTTE_**DJ@*Z;`z=FpjV+c7U&mkF#0W%*!Js6cKqD@JReow}Mf
ey-r>+yYoLZrHhp#%l(i50000<MNUMnLSTX@0ZY>W

delta 701
zcmV;u0z&=12EzuBl7E~@L_t(IjV+Q(Yh6_wN7sMveeN?&Oay6a8y~5lSn5EjLp!l!
zK|hT%{R~bz>rh0{VWlAAKoG$W3bptEZD{(qO}y`O&pCVle-7gM0Bf?A-8#;nw$9a2
z<nmT!FScm3a6Fh%8P<c0S%cI_TA8!lIP*4h_u^2u?2CVL+kaH5-rX|}qEL!#W6XfZ
z5<P<fAVDh;UEr|6I9l2-VN-N})B_KNfH9V_1snp0?$j>kf<-QDif9GBUL^JcPd3^K
zty6grof5C4$io&s`V+pM!F~)3iu1fJOgm>?oGj>o#~rL{9VeoCTjrcM0|MVq;ky&K
zwgaDFyk7-sjDMQQQFf*ZBp??sJf|%AjydN;M8LfjZ1>^c3{%11P2f=julL}cVdOU#
zCoWt@2*lJDsg-bp29Uvp06)**<26hQJZ)hN+&+XihsK=(brGw=ZZLW4GL}V5ia5=X
zfRy3E5}q{>Oq@te91Pets2xB}8dVevXT}5+hXTwUZhvgS2fOez8*dN9dt-6WjkSOx
zqI8lZby8$e#HGsFt|IeRjDqpmML6j5KgJ&}?sjk?L0=gaEkZEWxnu^x*ouKGV-T<%
z#5XgzvxIM_;z0uk!Pqr1>k3VF%#~A>m=_FUVuf*a1bYTq;^qW4X5<Vn58%t!;H_x<
z(4MW?Ie#gn7#1P+Ic~)B>|8(RTp5d_#;6^-&RG@sYwbL2;Btf=oN0Dqut8cCRb!xa
zcvQpwIpgz7;={3%F!qOmA~+lvZ}ebJVO_6zvZ)wi`zafv1+W*5)6V&IVZ1stZoD8$
zDfE+3aaQKXnRCA`oR%KTR?Ihk&AxiJxc+;NH#P^(*qd(IxJ+P0D9ihsLIrY@Suq*|
j?ewZ?-D&cY*-!rgG^LA`I>-QU00000NkvXXu0mjf)N@7!


From df66579fc2706110def6c66031058e1078bdc0f9 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 9 Oct 2012 00:56:15 +0200
Subject: [PATCH 0979/2864] directory comparison should be recursive in
 functional tests

---
 tests/test_pelican.py | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 10b40d38..762663d2 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -22,6 +22,21 @@ INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
 SAMPLE_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf.py")
 
 
+def recursiveDiff(dcmp):
+    diff = {
+            'diff_files': [os.sep.join((dcmp.right, f))
+                for f in dcmp.diff_files],
+            'left_only': [os.sep.join((dcmp.right, f))
+                for f in dcmp.left_only],
+            'right_only': [os.sep.join((dcmp.right, f))
+                for f in dcmp.right_only],
+            }
+    for sub_dcmp in dcmp.subdirs.values():
+        for k, v in recursiveDiff(sub_dcmp).iteritems():
+            diff[k] += v
+    return diff
+
+
 class TestPelican(unittest.TestCase):
     # general functional testing for pelican. Basically, this test case tries
     # to run pelican in different situations and see how it behaves
@@ -43,9 +58,9 @@ class TestPelican(unittest.TestCase):
               "to docs/contribute.rst to update the expected " \
               "output of the functional tests."
 
-        self.assertEqual(diff.left_only, [], msg=msg)
-        self.assertEqual(diff.right_only, [], msg=msg)
-        self.assertEqual(diff.diff_files, [], msg=msg)
+        self.assertEqual(diff['left_only'], [], msg=msg)
+        self.assertEqual(diff['right_only'], [], msg=msg)
+        self.assertEqual(diff['diff_files'], [], msg=msg)
 
     @unittest.skip("Test failing")
     def test_basic_generation_works(self):
@@ -61,9 +76,8 @@ class TestPelican(unittest.TestCase):
                 })
             pelican = Pelican(settings=settings)
             pelican.run()
-            diff = dircmp(
-                    self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
-            self.assertFilesEqual(diff)
+            dcmp = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
+            self.assertFilesEqual(recursiveDiff(dcmp))
 
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work
@@ -73,5 +87,5 @@ class TestPelican(unittest.TestCase):
             })
         pelican = Pelican(settings=settings)
         pelican.run()
-        diff = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "custom")))
-        self.assertFilesEqual(diff)
+        dcmp = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "custom")))
+        self.assertFilesEqual(recursiveDiff(dcmp))

From 4cfb0cd24ef1ddc2de6951bb5e0f74ae1f2d7c71 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Mon, 5 Nov 2012 23:40:38 +0100
Subject: [PATCH 0980/2864] Move Webassets in a plugin

---
 pelican/__init__.py       |  5 ---
 pelican/generators.py     | 31 -------------------
 pelican/plugins/assets.py | 64 +++++++++++++++++++++++++++++++++++++++
 pelican/settings.py       | 12 +-------
 tests/test_generators.py  |  2 +-
 5 files changed, 66 insertions(+), 48 deletions(-)
 create mode 100644 pelican/plugins/assets.py

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 443d330b..c0f33687 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -158,11 +158,6 @@ class Pelican(object):
 
         writer = self.get_writer()
 
-        # pass the assets environment to the generators
-        if self.settings['WEBASSETS']:
-            generators[1].env.assets_environment = generators[0].assets_env
-            generators[2].env.assets_environment = generators[0].assets_env
-
         for p in generators:
             if hasattr(p, 'generate_output'):
                 p.generate_output(writer)
diff --git a/pelican/generators.py b/pelican/generators.py
index 33d0ff20..00b0d6d3 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -465,37 +465,6 @@ class StaticGenerator(Generator):
             copy(path, source, os.path.join(output_path, destination),
                  final_path, overwrite=True)
 
-    def generate_context(self):
-
-        if self.settings['WEBASSETS']:
-            from webassets import Environment as AssetsEnvironment
-
-            # Define the assets environment that will be passed to the
-            # generators. The StaticGenerator must then be run first to have
-            # the assets in the output_path before generating the templates.
-
-            # Let ASSET_URL honor Pelican's RELATIVE_URLS setting.
-            # Hint for templates:
-            # Current version of webassets seem to remove any relative
-            # paths at the beginning of the URL. So, if RELATIVE_URLS
-            # is on, ASSET_URL will start with 'theme/', regardless if we
-            # set assets_url here to './theme/' or to 'theme/'.
-            # XXX However, this breaks the ASSET_URL if user navigates to
-            # a sub-URL, e.g. if he clicks on a category. To workaround this
-            # issue, I use
-            #     <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
-            # instead of
-            #     <link rel="stylesheet" href="{{ ASSET_URL }}">
-            if self.settings.get('RELATIVE_URLS'):
-                assets_url = './theme/'
-            else:
-                assets_url = self.settings['SITEURL'] + '/theme/'
-            assets_src = os.path.join(self.output_path, 'theme')
-            self.assets_env = AssetsEnvironment(assets_src, assets_url)
-
-            if logging.getLevelName(logger.getEffectiveLevel()) == "DEBUG":
-                self.assets_env.debug = True
-
     def generate_output(self, writer):
 
         self._copy_paths(self.settings['STATIC_PATHS'], self.path,
diff --git a/pelican/plugins/assets.py b/pelican/plugins/assets.py
new file mode 100644
index 00000000..58f9f863
--- /dev/null
+++ b/pelican/plugins/assets.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+"""
+Asset management plugin for Pelican
+===================================
+
+This plugin allows you to use the `webassets`_ module to manage assets such as
+CSS and JS files.
+
+Hint for templates: Current version of webassets seems to remove any relative
+paths at the beginning of the URL. So, if ``RELATIVE_URLS`` is on,
+``ASSET_URL`` will start with ``theme/``, regardless if we set ``assets_url``
+here to ``./theme/`` or to ``theme/``.
+
+However, this breaks the ``ASSET_URL`` if user navigates to a sub-URL, e.g. if
+he clicks on a category. A workaround for this issue is to use::
+
+    <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
+
+instead of::
+
+    <link rel="stylesheet" href="{{ ASSET_URL }}">
+
+.. _webassets: https://webassets.readthedocs.org/
+
+"""
+
+import os
+import logging
+
+from pelican import signals
+from webassets import Environment
+from webassets.ext.jinja2 import AssetsExtension
+
+
+def add_jinja2_ext(pelican):
+    """Add Webassets to Jinja2 extensions in Pelican settings."""
+
+    pelican.settings['JINJA_EXTENSIONS'].append(AssetsExtension)
+
+
+def create_assets_env(generator):
+    """Define the assets environment and pass it to the generator."""
+
+    logger = logging.getLogger(__name__)
+
+    # Let ASSET_URL honor Pelican's RELATIVE_URLS setting.
+    if generator.settings.get('RELATIVE_URLS'):
+        assets_url = './theme/'
+    else:
+        assets_url = generator.settings['SITEURL'] + '/theme/'
+    assets_src = os.path.join(generator.output_path, 'theme')
+
+    generator.env.assets_environment = Environment(assets_src, assets_url)
+
+    if logging.getLevelName(logger.getEffectiveLevel()) == "DEBUG":
+        generator.env.assets_environment.debug = True
+
+
+def register():
+    """Plugin registration."""
+
+    signals.initialized.connect(add_jinja2_ext)
+    signals.article_generator_init.connect(create_assets_env)
+    signals.pages_generator_init.connect(create_assets_env)
diff --git a/pelican/settings.py b/pelican/settings.py
index 2c318997..b4fe04f4 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -76,7 +76,6 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'ARTICLE_PERMALINK_STRUCTURE': '',
                    'TYPOGRIFY': False,
                    'SUMMARY_MAX_LENGTH': 50,
-                   'WEBASSETS': False,
                    'PLUGINS': [],
                    'MARKDOWN_EXTENSIONS': ['toc', ],
                    'TEMPLATE_PAGES': {}
@@ -187,16 +186,7 @@ def configure_settings(settings):
 
     if 'LESS_GENERATOR' in settings:
         logger.warn("The LESS_GENERATOR setting has been removed in favor "
-                    "of WEBASSETS")
-
-    if 'WEBASSETS' in settings and settings['WEBASSETS'] is not False:
-        try:
-            from webassets.ext.jinja2 import AssetsExtension
-            settings['JINJA_EXTENSIONS'].append(AssetsExtension)
-        except ImportError:
-            logger.warn("You must install the webassets module to use "
-                        "WEBASSETS")
-            settings['WEBASSETS'] = False
+                    "of the Webassets plugin")
 
     if 'OUTPUT_SOURCES_EXTENSION' in settings:
         if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'], str):
diff --git a/tests/test_generators.py b/tests/test_generators.py
index ba923980..6b714082 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -257,7 +257,7 @@ class TestWebAssets(unittest.TestCase):
         self.settings = read_settings(override={
             'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
             'OUTPUT_PATH': self.temp_path,
-            'WEBASSETS': True,
+            'PLUGINS': ['pelican.plugins.assets', ],
             'THEME': self.theme_dir,
         })
         pelican = Pelican(settings=self.settings)

From 4c15ec9f86e499d2dc9b39087ea1aaf1795f25e6 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Tue, 6 Nov 2012 00:04:45 +0100
Subject: [PATCH 0981/2864] Move webassets doc to the plugins page

---
 docs/plugins.rst  | 89 ++++++++++++++++++++++++++++++++++++++++++-----
 docs/settings.rst | 72 +-------------------------------------
 2 files changed, 81 insertions(+), 80 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index c275c57c..83ef264c 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -59,7 +59,7 @@ Signal                          Arguments                       Description
 =============================   ============================   ===========================================================================
 initialized                     pelican object
 finalized                       pelican object                  invoked after all the generators are executed and just before pelican exits
-                                                                usefull for custom post processing actions, such as: 
+                                                                usefull for custom post processing actions, such as:
                                                                 - minifying js/css assets.
                                                                 - notify/ping search engines with an updated sitemap.
 article_generate_context        article_generator, metadata
@@ -75,23 +75,23 @@ pages_generator_init            pages_generator                 invoked in the P
 The list is currently small, don't hesitate to add signals and make a pull
 request if you need them!
 
-.. note:: 
-          
-   The signal ``content_object_init`` can send different type of object as 
+.. note::
+
+   The signal ``content_object_init`` can send different type of object as
    argument. If you want to register only one type of object then you will
    need to specify the sender when you are connecting to the signal.
-   
+
    ::
-   
+
        from pelican import signals
        from pelican import contents
-       
+
        def test(sender, instance):
                print "%s : %s content initialized !!" % (sender, instance)
-       
+
        def register():
                signals.content_object_init.connect(test, sender=contents.Article)
-       
+
 
 
 List of plugins
@@ -99,6 +99,7 @@ List of plugins
 
 The following plugins are currently included with Pelican under ``pelican.plugins``:
 
+* `Asset management`_
 * `GitHub activity`_
 * `Global license`_
 * `Gravatar`_
@@ -114,6 +115,76 @@ Ideas for plugins that haven't been written yet:
 Plugin descriptions
 ===================
 
+Asset management
+----------------
+
+This plugin allows you to use the `webassets`_ module to manage assets such as
+CSS and JS files. The module must first be installed::
+
+    pip install webassets
+
+The `webassets` module allows you to perform a number of useful asset management
+functions, including:
+
+* CSS minifier (`cssmin`, `yuicompressor`, ...)
+* CSS compiler (`less`, `sass`, ...)
+* JS minifier (`uglifyjs`, `yuicompressor`, `closure`, ...)
+
+Others filters include gzip compression, integration of images in CSS via data
+URIs, and more. `webassets` can also append a version identifier to your asset
+URL to convince browsers to download new versions of your assets when you use
+far-future expires headers. Please refer to the `webassets documentation`_ for
+more information.
+
+When using with Pelican, `webassets` is configured to process assets in the
+``OUTPUT_PATH/theme`` directory. You can use `webassets` in your templates by
+including one or more template tags. For example...
+
+.. code-block:: jinja
+
+    {% assets filters="cssmin", output="css/style.min.css", "css/inuit.css", "css/pygment-monokai.css", "css/main.css" %}
+        <link rel="stylesheet" href="{{ ASSET_URL }}">
+    {% endassets %}
+
+... will produce a minified css file with a version identifier:
+
+.. code-block:: html
+
+    <link href="http://{SITEURL}/theme/css/style.min.css?b3a7c807" rel="stylesheet">
+
+These filters can be combined. Here is an example that uses the SASS compiler
+and minifies the output:
+
+.. code-block:: jinja
+
+    {% assets filters="sass,cssmin", output="css/style.min.css", "css/style.scss" %}
+        <link rel="stylesheet" href="{{ ASSET_URL }}">
+    {% endassets %}
+
+Another example for Javascript:
+
+.. code-block:: jinja
+
+    {% assets filters="uglifyjs,gzip", output="js/packed.js", "js/jquery.js", "js/base.js", "js/widgets.js" %}
+        <script src="{{ ASSET_URL }}"></script>
+    {% endassets %}
+
+The above will produce a minified and gzipped JS file:
+
+.. code-block:: html
+
+    <script src="http://{SITEURL}/theme/js/packed.js?00703b9d"></script>
+
+Pelican's debug mode is propagated to `webassets` to disable asset packaging
+and instead work with the uncompressed assets. However, this also means that
+the LESS and SASS files are not compiled. This should be fixed in a future
+version of `webassets` (cf. the related `bug report
+<https://github.com/getpelican/pelican/issues/481>`_).
+
+.. _webassets: https://github.com/miracle2k/webassets
+.. _webassets documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
+
+
 GitHub activity
 ---------------
 
diff --git a/docs/settings.rst b/docs/settings.rst
index ca2c7b0f..c4ac3584 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -52,7 +52,7 @@ Setting name (default value)                                            What doe
                                                                         the datetime.datetime constructor.
 `DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the content of the output directory before
                                                                         generating new files.
-`FILES_TO_COPY` (``()``)                                                A list of files to copy from the source (inside the content 
+`FILES_TO_COPY` (``()``)                                                A list of files to copy from the source (inside the content
                                                                         directory) to the destination (inside the output directory).
                                                                         For example: ``(('extra/robots.txt', 'robots.txt'),)``.
 `JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
@@ -426,7 +426,6 @@ Setting name (default value)                        What does it do?
                                                     value is `static`, but if your theme has
                                                     other static paths, you can put them here.
 `CSS_FILE` (``'main.css'``)                         Specify the CSS file you want to load.
-`WEBASSETS` (``False``)                             Asset management with `webassets` (see below)
 ================================================    =====================================================
 
 
@@ -487,75 +486,6 @@ adding the following to your configuration::
 
     CSS_FILE = "wide.css"
 
-Asset management
-----------------
-
-The `WEBASSETS` setting allows you to use the `webassets`_ module to manage
-assets such as CSS and JS files. The module must first be installed::
-
-    pip install webassets
-
-The `webassets` module allows you to perform a number of useful asset management
-functions, including:
-
-* CSS minifier (`cssmin`, `yuicompressor`, ...)
-* CSS compiler (`less`, `sass`, ...)
-* JS minifier (`uglifyjs`, `yuicompressor`, `closure`, ...)
-
-Others filters include gzip compression, integration of images in CSS via data
-URIs, and more. `webassets` can also append a version identifier to your asset
-URL to convince browsers to download new versions of your assets when you use
-far-future expires headers. Please refer to the `webassets documentation`_ for
-more information.
-
-When using with Pelican, `webassets` is configured to process assets in the
-``OUTPUT_PATH/theme`` directory. You can use `webassets` in your templates by
-including one or more template tags. For example...
-
-.. code-block:: jinja
-
-    {% assets filters="cssmin", output="css/style.min.css", "css/inuit.css", "css/pygment-monokai.css", "css/main.css" %}
-        <link rel="stylesheet" href="{{ ASSET_URL }}">
-    {% endassets %}
-
-... will produce a minified css file with a version identifier:
-
-.. code-block:: html
-
-    <link href="http://{SITEURL}/theme/css/style.min.css?b3a7c807" rel="stylesheet">
-
-These filters can be combined. Here is an example that uses the SASS compiler
-and minifies the output:
-
-.. code-block:: jinja
-
-    {% assets filters="sass,cssmin", output="css/style.min.css", "css/style.scss" %}
-        <link rel="stylesheet" href="{{ ASSET_URL }}">
-    {% endassets %}
-
-Another example for Javascript:
-
-.. code-block:: jinja
-
-    {% assets filters="uglifyjs,gzip", output="js/packed.js", "js/jquery.js", "js/base.js", "js/widgets.js" %}
-        <script src="{{ ASSET_URL }}"></script>
-    {% endassets %}
-
-The above will produce a minified and gzipped JS file:
-
-.. code-block:: html
-
-    <script src="http://{SITEURL}/theme/js/packed.js?00703b9d"></script>
-
-Pelican's debug mode is propagated to `webassets` to disable asset packaging
-and instead work with the uncompressed assets. However, this also means that
-the LESS and SASS files are not compiled. This should be fixed in a future
-version of `webassets` (cf. the related `bug report
-<https://github.com/getpelican/pelican/issues/481>`_).
-
-.. _webassets: https://github.com/miracle2k/webassets
-.. _webassets documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
-
 Example settings
 ================
 

From 7088135f5e31202cac4894cf6d7f3514c4a86d61 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Tue, 6 Nov 2012 01:00:28 +0100
Subject: [PATCH 0982/2864] Add tests for webassets: test absolute url and
 Jinja configuration

---
 tests/test_generators.py | 85 +++++++++++++++++++++++++++++++---------
 1 file changed, 67 insertions(+), 18 deletions(-)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index 6b714082..8a839ba1 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -8,6 +8,11 @@ from codecs import open
 from tempfile import mkdtemp
 from shutil import rmtree
 
+try:
+    import webassets
+except ImportError:
+    webassets = None
+
 from pelican import Pelican
 from pelican.generators import ArticlesGenerator, PagesGenerator, \
     TemplatePagesGenerator
@@ -243,6 +248,7 @@ class TestTemplatePagesGenerator(unittest.TestCase):
             self.assertEquals(output_file.read(), 'foo: bar')
 
 
+@unittest.skipUnless(webassets, "webassets isn't installed")
 @skipIfNoExecutable(['scss', '-v'])
 @skipIfNoExecutable(['cssmin', '--version'])
 class TestWebAssets(unittest.TestCase):
@@ -250,28 +256,52 @@ class TestWebAssets(unittest.TestCase):
     scss style.scss style.ref.css
     """
 
-    def setUp(self):
-        self.temp_path = mkdtemp()
-        self.theme_dir = os.path.join(CUR_DIR, 'themes', 'assets')
+    @classmethod
+    def setUpClass(cls):
+        """Run pelican with two settings (absolute and relative urls)."""
 
-        self.settings = read_settings(override={
+        cls.theme_dir = os.path.join(CUR_DIR, 'themes', 'assets')
+
+        cls.temp_path = mkdtemp()
+        cls.settings = read_settings(override={
             'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
-            'OUTPUT_PATH': self.temp_path,
+            'OUTPUT_PATH': cls.temp_path,
             'PLUGINS': ['pelican.plugins.assets', ],
-            'THEME': self.theme_dir,
+            'THEME': cls.theme_dir,
         })
-        pelican = Pelican(settings=self.settings)
+        pelican = Pelican(settings=cls.settings)
         pelican.run()
 
-        self.css_ref = open(os.path.join(self.theme_dir, 'static', 'css',
-                                         'style.min.css')).read()
-        self.version = hashlib.md5(self.css_ref).hexdigest()[0:8]
+        # run Pelican a second time with absolute urls
+        cls.temp_path2 = mkdtemp()
+        cls.settings2 = read_settings(override={
+            'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
+            'OUTPUT_PATH': cls.temp_path2,
+            'PLUGINS': ['pelican.plugins.assets', ],
+            'THEME': cls.theme_dir,
+            'RELATIVE_URLS': False,
+            'SITEURL': 'http://localhost'
+        })
+        pelican2 = Pelican(settings=cls.settings2)
+        pelican2.run()
 
-    def tearDown(self):
-        rmtree(self.temp_path)
+        cls.css_ref = open(os.path.join(cls.theme_dir, 'static', 'css',
+                                        'style.min.css')).read()
+        cls.version = hashlib.md5(cls.css_ref).hexdigest()[0:8]
+
+    @classmethod
+    def tearDownClass(cls):
+        rmtree(cls.temp_path)
+        rmtree(cls.temp_path2)
+
+    def test_jinja2_ext(self):
+        """Test that the Jinja2 extension was correctly added."""
+
+        from webassets.ext.jinja2 import AssetsExtension
+        self.assertIn(AssetsExtension, self.settings['JINJA_EXTENSIONS'])
 
     def test_compilation(self):
-        "Compare the compiled css with the reference"
+        """Compare the compiled css with the reference."""
 
         gen_file = os.path.join(self.temp_path, 'theme', 'gen',
                                 'style.{0}.min.css'.format(self.version))
@@ -280,10 +310,29 @@ class TestWebAssets(unittest.TestCase):
         css_new = open(gen_file).read()
         self.assertEqual(css_new, self.css_ref)
 
-    def test_template(self):
-        "Look in the output index.html file for the link tag"
+    def check_link_tag(self, css_file, html_file):
+        """Check the presence of `css_file` in `html_file`."""
 
-        link_tag = '<link rel="stylesheet" ' + \
-                   'href="theme/gen/style.{0}.min.css">'.format(self.version)
-        html = open(os.path.join(self.temp_path, 'index.html')).read()
+        link_tag = '<link rel="stylesheet" href="{css_file}">'.\
+                   format(css_file=css_file)
+        html = open(html_file).read()
         self.assertRegexpMatches(html, link_tag)
+
+    def test_template(self):
+        """Look in the output index.html file for the link tag."""
+
+        css_file = 'theme/gen/style.{0}.min.css'.format(self.version)
+        html_files = ['index.html', 'archives.html',
+                      'this-is-an-article-with-category.html']
+        for f in html_files:
+            self.check_link_tag(css_file, os.path.join(self.temp_path, f))
+
+    def test_absolute_url(self):
+        """Look in the output index.html file for the link tag with abs url."""
+
+        css_file = 'http://localhost/theme/gen/style.{0}.min.css'.\
+                   format(self.version)
+        html_files = ['index.html', 'archives.html',
+                      'this-is-an-article-with-category.html']
+        for f in html_files:
+            self.check_link_tag(css_file, os.path.join(self.temp_path2, f))

From 721a422e5e65746fc35445fb32b8a4477b8285a7 Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Sat, 20 Oct 2012 16:03:14 +0200
Subject: [PATCH 0983/2864] The all Atom and RSS feed generators should include
 all articles, regardless of the article's language or the site's. Fixes #550.

---
 pelican/generators.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 01f4701c..2ee9eea8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -164,12 +164,20 @@ class ArticlesGenerator(Generator):
                 'Feeds generated without SITEURL set properly may not be valid'
             )
 
+        # Isuue #550: FEED_ATOM and FEED_RSS should include all articles, regardless of the language
+        all_articles = list(self.articles)
+
+        for article in self.articles:
+            all_articles.extend(article.translations)
+
+        all_articles.sort(key=attrgetter('date'), reverse=True)
+
         if self.settings.get('FEED_ATOM'):
-            writer.write_feed(self.articles, self.context,
+            writer.write_feed(all_articles, self.context,
                               self.settings['FEED_ATOM'])
 
         if self.settings.get('FEED_RSS'):
-            writer.write_feed(self.articles, self.context,
+            writer.write_feed(all_articles, self.context,
                               self.settings['FEED_RSS'], feed_type='rss')
 
         for cat, arts in self.categories:

From 593acfc37a64510b87c744676eaca1b587f32394 Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Sat, 20 Oct 2012 16:53:10 +0200
Subject: [PATCH 0984/2864] Remove comment

---
 pelican/generators.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 2ee9eea8..966bd36c 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -164,7 +164,6 @@ class ArticlesGenerator(Generator):
                 'Feeds generated without SITEURL set properly may not be valid'
             )
 
-        # Isuue #550: FEED_ATOM and FEED_RSS should include all articles, regardless of the language
         all_articles = list(self.articles)
 
         for article in self.articles:

From c7d87feec31627ae2351950b01cad2a0e30de627 Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Mon, 22 Oct 2012 23:37:52 +0200
Subject: [PATCH 0985/2864] Reverted FEED_ATOM and FEED_RSS to their original
 behaviour and added FEED_ALL_ATOM and FEED_ALL_RSS

FEED_(ATOM|RSS) generated feeds include the version in the default language of a translated article,
whereas FEED_ALL(ATOM|RSS) would include *really* all posts, regardless of their language.
---
 docs/fr/configuration.rst |  8 +++++++-
 docs/settings.rst         |  7 ++++---
 docs/themes.rst           |  2 ++
 pelican/generators.py     | 30 +++++++++++++++++-------------
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
index 76f03a61..e3fb8542 100644
--- a/docs/fr/configuration.rst
+++ b/docs/fr/configuration.rst
@@ -59,11 +59,17 @@ CATEGORY_FEED_RSS :
 	Idem pour les flux rss (Optionnel);
 
 FEED_ATOM :
-	Chemin du flux Atom global ;
+	Chemin du flux Atom global;
 
 FEED_RSS :
 	Chemin du flux Rss global (Optionnel);
 
+FEED_ALL_ATOM :
+	Chemin du flux Atom global qui inclut la totalité des posts, indépendamment de la langue;
+
+FEED_ALL_RSS :
+	Chemin du flux Rss global  qui inclut la totalité des posts, indépendamment de la langue (Optionnel);
+
 TAG_FEED_ATOM :
 	Chemin des flux Atom pour les tags (Optionnel);
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 6bcc7292..eeca4c3a 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -306,6 +306,8 @@ Setting name (default value)                        What does it do?
                                                     feeds, you can just set:  `FEED_DOMAIN = SITEURL`
 `FEED_ATOM` (``'feeds/all.atom.xml'``)              Relative URL to output the Atom feed.
 `FEED_RSS` (``None``, i.e. no RSS)                  Relative URL to output the RSS feed.
+`FEED_ALL_ATOM` (``None``, i.e. no all feed)        Relative URL to output the all posts Atom feed.
+`FEED_ALL_RSS` (``None``, i.e. no all RSS)          Relative URL to output the all posts RSS feed.
 `CATEGORY_FEED_ATOM` ('feeds/%s.atom.xml'[2]_)      Where to put the category Atom feeds.
 `CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the category RSS feeds.
 `TAG_FEED_ATOM` (``None``, i.e. no tag feed)        Relative URL to output the tag Atom feed. It should
@@ -315,9 +317,8 @@ Setting name (default value)                        What does it do?
                                                     quantity is unrestricted by default.
 ================================================    =====================================================
 
-If you don't want to generate some of these feeds, set ``None`` to the
-variables above. If you don't want to generate any feeds set both ``FEED_ATOM``
-and ``FEED_RSS`` to none.
+If you don't want to generate some or any of these feeds, set ``None`` to the
+variables above.
 
 .. [2] %s is the name of the category.
 
diff --git a/docs/themes.rst b/docs/themes.rst
index e482bc9b..664b4466 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -200,6 +200,8 @@ Here is a complete list of the feed variables::
 
     FEED_ATOM
     FEED_RSS
+    FEED_ALL_ATOM
+    FEED_ALL_RSS
     CATEGORY_FEED_ATOM
     CATEGORY_FEED_RSS
     TAG_FEED_ATOM
diff --git a/pelican/generators.py b/pelican/generators.py
index 966bd36c..33316a94 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -156,29 +156,33 @@ class ArticlesGenerator(Generator):
 
     def generate_feeds(self, writer):
         """Generate the feeds from the current context, and output files."""
-        if self.settings.get('FEED_ATOM') is None \
-                and self.settings.get('FEED_RSS') is None:
-            return
-        elif self.settings.get('SITEURL') is '':
+        if self.settings.get('SITEURL') is '':
             logger.warning(
                 'Feeds generated without SITEURL set properly may not be valid'
             )
 
-        all_articles = list(self.articles)
-
-        for article in self.articles:
-            all_articles.extend(article.translations)
-
-        all_articles.sort(key=attrgetter('date'), reverse=True)
-
         if self.settings.get('FEED_ATOM'):
-            writer.write_feed(all_articles, self.context,
+            writer.write_feed(self.articles, self.context,
                               self.settings['FEED_ATOM'])
 
         if self.settings.get('FEED_RSS'):
-            writer.write_feed(all_articles, self.context,
+            writer.write_feed(self.articles, self.context,
                               self.settings['FEED_RSS'], feed_type='rss')
 
+        if self.settings.get('FEED_ALL_ATOM') or self.settings.get('FEED_ALL_RSS'):
+            all_articles = list(self.articles)
+            for article in self.articles:
+                all_articles.extend(article.translations)
+            all_articles.sort(key=attrgetter('date'), reverse=True)
+
+            if self.settings.get('FEED_ALL_ATOM'):
+                writer.write_feed(all_articles, self.context,
+                                  self.settings['FEED_ALL_ATOM'])
+
+            if self.settings.get('FEED_ALL_RSS'):
+                writer.write_feed(all_articles, self.context,
+                                  self.settings['FEED_ALL_RSS'], feed_type='rss')
+
         for cat, arts in self.categories:
             arts.sort(key=attrgetter('date'), reverse=True)
             if self.settings.get('CATEGORY_FEED_ATOM'):

From 559367075996d414c5f0b832cd85ccb07402d4ad Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Thu, 25 Oct 2012 16:49:24 +0200
Subject: [PATCH 0986/2864] The default settings sets up FEED_ALL_ATOM (instead
 of FEED_ATOM) to all.atom.xml

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 35752fee..052a58a1 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -24,7 +24,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'MARKUP': ('rst', 'md'),
                    'STATIC_PATHS': ['images', ],
                    'THEME_STATIC_PATHS': ['static', ],
-                   'FEED_ATOM': 'feeds/all.atom.xml',
+                   'FEED_ALL_ATOM': 'feeds/all.atom.xml',
                    'CATEGORY_FEED_ATOM': 'feeds/%s.atom.xml',
                    'TRANSLATION_FEED_ATOM': 'feeds/all-%s.atom.xml',
                    'FEED_MAX_ITEMS': '',

From 537e9df3ed107360d92ac7153e42aa0c9d773029 Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Thu, 25 Oct 2012 16:50:27 +0200
Subject: [PATCH 0987/2864] Reworked the "unset feed_domain" warning to handle
 all feed variables

---
 pelican/settings.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 052a58a1..237e8d22 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -175,7 +175,15 @@ def configure_settings(settings):
             settings['FEED_DOMAIN'] = settings['SITEURL']
 
     # Warn if feeds are generated with both SITEURL & FEED_DOMAIN undefined
-    if (('FEED_ATOM' in settings) or ('FEED_RSS' in settings)) and (not 'FEED_DOMAIN' in settings):
+    feed_keys = ['FEED_ATOM', 'FEED_RSS',\
+                 'FEED_ALL_ATOM', 'FEED_ALL_RSS',\
+                 'CATEGORY_FEED_ATOM', 'CATEGORY_FEED_RSS',\
+                 'TAG_FEED_ATOM', 'TAG_FEED_RSS',\
+                 'TRANSLATION_FEED_ATOM', 'TRANSLATION_FEED_RSS',\
+                ]
+
+    generate_feed = bool([k for k, v in settings.iteritems() if k in feed_keys and v])
+    if generate_feed and not('FEED_DOMAIN' in settings):
         logger.warn("Since feed URLs should always be absolute, you should specify "
                  "FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = "
                  "http://www.example.com')")

From 93905e828d5b72bad7361d493e9f2db29d096e60 Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Thu, 25 Oct 2012 16:56:28 +0200
Subject: [PATCH 0988/2864] Split long if condition in 2 lines

---
 pelican/generators.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 33316a94..fc59c905 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -169,7 +169,8 @@ class ArticlesGenerator(Generator):
             writer.write_feed(self.articles, self.context,
                               self.settings['FEED_RSS'], feed_type='rss')
 
-        if self.settings.get('FEED_ALL_ATOM') or self.settings.get('FEED_ALL_RSS'):
+        if self.settings.get('FEED_ALL_ATOM') or \
+                self.settings.get('FEED_ALL_RSS'):
             all_articles = list(self.articles)
             for article in self.articles:
                 all_articles.extend(article.translations)

From a79904c0751fdc01c24ed22d78147974ced472c7 Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Tue, 30 Oct 2012 11:06:33 +0100
Subject: [PATCH 0989/2864] Update the generators tests to use FEED_ALL_ATOM as
 the default set atom feed instead of FEED_ATOM

---
 tests/test_generators.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index accdb699..a4c047aa 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -50,14 +50,14 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_feeds(self):
 
-        generator = ArticlesGenerator(None, {'FEED_ATOM': _DEFAULT_CONFIG['FEED_ATOM']},
+        generator = ArticlesGenerator(None, {'FEED_ALL_ATOM': _DEFAULT_CONFIG['FEED_ALL_ATOM']},
                                       None, _DEFAULT_CONFIG['THEME'], None,
                                       _DEFAULT_CONFIG['MARKUP'])
         writer = MagicMock()
         generator.generate_feeds(writer)
         writer.write_feed.assert_called_with([], None, 'feeds/all.atom.xml')
 
-        generator = ArticlesGenerator(None, {'FEED_ATOM': None}, None,
+        generator = ArticlesGenerator(None, {'FEED_ALL_ATOM': None}, None,
                                       _DEFAULT_CONFIG['THEME'], None, None)
         writer = MagicMock()
         generator.generate_feeds(writer)

From fd18f2efa98bcd02595658b23039946968eec57d Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Tue, 30 Oct 2012 21:05:57 +0100
Subject: [PATCH 0990/2864] Generate links for FEED_ALL_ATOM and FEED_ALL_RSS
 in the simple them's head.

---
 pelican/themes/simple/templates/base.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index c1d9cb78..3ea2e8b9 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -4,6 +4,12 @@
         {% block head %}
         <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
         <meta charset="utf-8" />
+        {% if FEED_ALL_ATOM %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
+        {% endif %}
+        {% if FEED_ALL_RSS %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" />
+        {% endif %}
         {% if FEED_ATOM %}
         <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
         {% endif %}

From b6db45420c7edbd495344fe986d468b030e9a5ee Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Tue, 30 Oct 2012 21:06:43 +0100
Subject: [PATCH 0991/2864] Default to using FEED_ALL_ATOM instead of FEED_ATOM
 (and likewise for RSS) in the notmyidea theme

---
 pelican/themes/notmyidea/templates/base.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 6ab87c5a..45c2c3a2 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -4,11 +4,11 @@
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
-        {% if FEED_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+        {% if FEED_ALL_ATOM %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
         {% endif %}
-        {% if FEED_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+        {% if FEED_ALL_RSS %}
+        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
 
         <!--[if IE]>
@@ -58,9 +58,9 @@
                 <div class="social">
                         <h2>social</h2>
                         <ul>
-                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            {% if FEED_RSS %}
-                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            {% if FEED_ALL_RSS %}
+                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             {% endif %}
 
                         {% for name, link in SOCIAL %}

From 578f9ea21eb036fcc323ca3b6b3f59505e855d86 Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Tue, 30 Oct 2012 21:09:10 +0100
Subject: [PATCH 0992/2864] Update the test sample config to set FEED_ALL_RSS
 instead of FEED_RSS (fixes the custom generation tests)

---
 samples/pelican.conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index e55e0c0b..ce51c0fd 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -12,7 +12,7 @@ LOCALE = "C"
 DEFAULT_PAGINATION = 4
 DEFAULT_DATE = (2012, 03, 02, 14, 01, 01)
 
-FEED_RSS = 'feeds/all.rss.xml'
+FEED_ALL_RSS = 'feeds/all.rss.xml'
 CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'
 
 LINKS = (('Biologeek', 'http://biologeek.org'),

From 8a72b11e3d8dd8e5ed296f2f275802092c7edb8f Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Wed, 31 Oct 2012 12:49:17 +0100
Subject: [PATCH 0993/2864] code style: remove unnecessary trailing \

---
 pelican/settings.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 237e8d22..a27fc025 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -175,11 +175,11 @@ def configure_settings(settings):
             settings['FEED_DOMAIN'] = settings['SITEURL']
 
     # Warn if feeds are generated with both SITEURL & FEED_DOMAIN undefined
-    feed_keys = ['FEED_ATOM', 'FEED_RSS',\
-                 'FEED_ALL_ATOM', 'FEED_ALL_RSS',\
-                 'CATEGORY_FEED_ATOM', 'CATEGORY_FEED_RSS',\
-                 'TAG_FEED_ATOM', 'TAG_FEED_RSS',\
-                 'TRANSLATION_FEED_ATOM', 'TRANSLATION_FEED_RSS',\
+    feed_keys = ['FEED_ATOM', 'FEED_RSS',
+                 'FEED_ALL_ATOM', 'FEED_ALL_RSS',
+                 'CATEGORY_FEED_ATOM', 'CATEGORY_FEED_RSS',
+                 'TAG_FEED_ATOM', 'TAG_FEED_RSS',
+                 'TRANSLATION_FEED_ATOM', 'TRANSLATION_FEED_RSS',
                 ]
 
     generate_feed = bool([k for k, v in settings.iteritems() if k in feed_keys and v])

From 13f444260ca492d60ecc99221bd20f007e97f5ec Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Wed, 31 Oct 2012 12:57:06 +0100
Subject: [PATCH 0994/2864] Avoid iterating over all settings keys to detect if
 a feed is enabled

---
 pelican/settings.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index a27fc025..d667c95f 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -182,8 +182,7 @@ def configure_settings(settings):
                  'TRANSLATION_FEED_ATOM', 'TRANSLATION_FEED_RSS',
                 ]
 
-    generate_feed = bool([k for k, v in settings.iteritems() if k in feed_keys and v])
-    if generate_feed and not('FEED_DOMAIN' in settings):
+    if not settings.get('FEED_DOMAIN') and any(settings.get(k) for k in feed_keys):
         logger.warn("Since feed URLs should always be absolute, you should specify "
                  "FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = "
                  "http://www.example.com')")

From cf95b02bc05b99f8f68414497855992ec7620f81 Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Wed, 7 Nov 2012 02:11:10 +0100
Subject: [PATCH 0995/2864] Update the faq and changelog

---
 docs/changelog.rst | 3 +++
 docs/faq.rst       | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b7c64190..c225a499 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,9 @@ Release history
 * Improved appearance of LinkedIn icon in default theme
 * Add GitHub and Google+ social icons support in default theme
 * Optimize social icons
+* Add ``FEED_ALL_ATOM`` and ``FEED_ALL_RSS`` to generate feeds containing all posts regardless of their language
+* Split ``TRANSLATION_FEED`` into ``TRANSLATION_FEED_ATOM`` and ``TRANSLATION_FEED_RSS``
+* The different feeds can now be enabled/disabled individually
 
 3.0 (2012-08-08)
 ==================
diff --git a/docs/faq.rst b/docs/faq.rst
index 4225ab5f..b060108a 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -118,7 +118,8 @@ Starting in 3.0, some of the FEED setting names were changed to more explicitly
 refer to the Atom feeds they inherently represent (much like the FEED_RSS
 setting names). Here is an exact list of the renamed setting names::
 
-    FEED -> FEED_ATOM
+    FEED -> FEED_ALL_ATOM
+    TRANSLATION_FEED -> TRANSLATION_FEED_ATOM
     TAG_FEED -> TAG_FEED_ATOM
     CATEGORY_FEED -> CATEGORY_FEED_ATOM
 

From 1b81f8b830a5637fa51aedc2e35b2fb5aed4bf3e Mon Sep 17 00:00:00 2001
From: jawher <jawher.moussa@gmail.com>
Date: Wed, 7 Nov 2012 20:52:59 +0100
Subject: [PATCH 0996/2864] Move SITEURL check for feed generation from 
 generators.py to settings.py

---
 pelican/generators.py |  4 ----
 pelican/settings.py   | 12 ++++++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index fc59c905..77989df9 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -156,10 +156,6 @@ class ArticlesGenerator(Generator):
 
     def generate_feeds(self, writer):
         """Generate the feeds from the current context, and output files."""
-        if self.settings.get('SITEURL') is '':
-            logger.warning(
-                'Feeds generated without SITEURL set properly may not be valid'
-            )
 
         if self.settings.get('FEED_ATOM'):
             writer.write_feed(self.articles, self.context,
diff --git a/pelican/settings.py b/pelican/settings.py
index d667c95f..d1532bc7 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -182,10 +182,14 @@ def configure_settings(settings):
                  'TRANSLATION_FEED_ATOM', 'TRANSLATION_FEED_RSS',
                 ]
 
-    if not settings.get('FEED_DOMAIN') and any(settings.get(k) for k in feed_keys):
-        logger.warn("Since feed URLs should always be absolute, you should specify "
-                 "FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = "
-                 "http://www.example.com')")
+    if any(settings.get(k) for k in feed_keys):
+        if not settings.get('FEED_DOMAIN'):
+            logger.warn("Since feed URLs should always be absolute, you should specify "
+                     "FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = "
+                     "http://www.example.com')")
+
+        if not settings.get('SITEURL'):
+            logger.warn("Feeds generated without SITEURL set properly may not be valid")
 
     if not 'TIMEZONE' in settings:
         logger.warn("No timezone information specified in the settings. Assuming"

From e56d2b14c831191ee7f26557f778e0b9add9337e Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Mon, 12 Nov 2012 23:44:12 +0100
Subject: [PATCH 0997/2864] docfix: updates docs/settings.rst and docs/faq.rst

---
 docs/faq.rst      | 24 ++++++++++++++++++------
 docs/settings.rst | 12 ++++++++----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index b060108a..735fe9d0 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -93,9 +93,15 @@ Then just make sure to have the template installed in to your theme as
 What if I want to disable feed generation?
 ==========================================
 
-To disable all feed generation set ``FEED_ATOM`` and ``FEED_RSS`` to ``None`` in
-your settings. Please note ``None`` and ``''`` are not the same thing. The
-word ``None`` should not be surrounded by quotes.
+To disable all feed generation, all feed settings should be set to ``None``.
+Since other feed settings already defaults to ``None``, you only need to set
+the following settings::
+
+    FEED_ALL_ATOM = None
+    CATEGORY_FEED_ATOM = None
+
+Please note that ``None`` and ``''`` are not the same thing. The word ``None``
+should not be surrounded by quotes.
 
 I'm getting a warning about feeds generated without SITEURL being set properly
 ==============================================================================
@@ -111,18 +117,24 @@ should result in this warning.
 
 Feeds are still generated when this warning is displayed but may not validate.
 
-My feeds are broken since I upgraded to Pelican 3.0
+My feeds are broken since I upgraded to Pelican 3.x
 ===================================================
 
 Starting in 3.0, some of the FEED setting names were changed to more explicitly
 refer to the Atom feeds they inherently represent (much like the FEED_RSS
 setting names). Here is an exact list of the renamed setting names::
 
-    FEED -> FEED_ALL_ATOM
-    TRANSLATION_FEED -> TRANSLATION_FEED_ATOM
+    FEED -> FEED_ATOM
     TAG_FEED -> TAG_FEED_ATOM
     CATEGORY_FEED -> CATEGORY_FEED_ATOM
 
+Starting in 3.1, the new feed ``FEED_ALL_ATOM`` has been introduced: this
+feed will aggregate all posts regardless of their language. It is generated to
+``'feeds/all.atom.xml'`` by default and ``FEED_ATOM`` now defaults to ``None``.
+The following FEED setting has also been renamed::
+
+    TRANSLATION_FEED -> TRANSLATION_FEED_ATOM
+
 Older 2.x themes that referenced the old setting names may not link properly.
 In order to rectify this, please update your theme for compatibility with 3.0+
 by changing the relevant values in your template files. For an example of
diff --git a/docs/settings.rst b/docs/settings.rst
index eeca4c3a..94ce65a0 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -303,11 +303,15 @@ Setting name (default value)                        What does it do?
                                                     to define this (e.g., "http://feeds.example.com"). If
                                                     you have already explicitly defined SITEURL (see
                                                     above) and want to use the same domain for your
-                                                    feeds, you can just set:  `FEED_DOMAIN = SITEURL`
-`FEED_ATOM` (``'feeds/all.atom.xml'``)              Relative URL to output the Atom feed.
+                                                    feeds, you can just set:  ``FEED_DOMAIN = SITEURL``.
+`FEED_ATOM` (``None``, i.e. no Atom feed)           Relative URL to output the Atom feed.
 `FEED_RSS` (``None``, i.e. no RSS)                  Relative URL to output the RSS feed.
-`FEED_ALL_ATOM` (``None``, i.e. no all feed)        Relative URL to output the all posts Atom feed.
-`FEED_ALL_RSS` (``None``, i.e. no all RSS)          Relative URL to output the all posts RSS feed.
+`FEED_ALL_ATOM` (``'feeds/all.atom.xml'``)          Relative URL to output the all posts Atom feed:
+                                                    this feed will contain all posts regardless of their
+                                                    language.
+`FEED_ALL_RSS` (``None``, i.e. no all RSS)          Relative URL to output the all posts RSS feed:
+                                                    this feed will contain all posts regardless of their
+                                                    language.
 `CATEGORY_FEED_ATOM` ('feeds/%s.atom.xml'[2]_)      Where to put the category Atom feeds.
 `CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the category RSS feeds.
 `TAG_FEED_ATOM` (``None``, i.e. no tag feed)        Relative URL to output the tag Atom feed. It should

From 960c35596ce69f79ccd46fce2cf4be5bd281a3ff Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Mon, 12 Nov 2012 23:56:29 +0100
Subject: [PATCH 0998/2864] update "custom" output for functional tests

LC_ALL=C pelican -o tests/output/custom/ -s samples/pelican.conf.py samples/content/
---
 tests/output/custom/feeds/all.atom.xml | 4 +++-
 tests/output/custom/feeds/all.rss.xml  | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/output/custom/feeds/all.atom.xml b/tests/output/custom/feeds/all.atom.xml
index 8df5bbdb..b72f1e15 100644
--- a/tests/output/custom/feeds/all.atom.xml
+++ b/tests/output/custom/feeds/all.atom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
diff --git a/tests/output/custom/feeds/all.rss.xml b/tests/output/custom/feeds/all.rss.xml
index a8be2152..8fbf7b04 100644
--- a/tests/output/custom/feeds/all.rss.xml
+++ b/tests/output/custom/feeds/all.rss.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;

From 8336df2b9bf2d79864264fd560c14dd36c395167 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 13 Nov 2012 01:41:36 +0100
Subject: [PATCH 0999/2864] update changelog: blank author are now allowed

(refs: #555)
---
 docs/changelog.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index c225a499..3d1786bf 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,6 +14,9 @@ Release history
 * Add ``FEED_ALL_ATOM`` and ``FEED_ALL_RSS`` to generate feeds containing all posts regardless of their language
 * Split ``TRANSLATION_FEED`` into ``TRANSLATION_FEED_ATOM`` and ``TRANSLATION_FEED_RSS``
 * The different feeds can now be enabled/disabled individually
+* Allow for blank author: if ``AUTHOR`` setting is not set, author won't
+  default to ``${USER}`` anymore and a post won't contain any author
+  information if the post author is empty.
 
 3.0 (2012-08-08)
 ==================

From ec42fa837f9f09e19cadf4ad38974ad4f7c43faf Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 13 Nov 2012 01:46:43 +0100
Subject: [PATCH 1000/2864] docfix: fix default values for _URL and _SAVE_AS
 settings

(AUTHOR_URL, AUTHOR_SAVE_AS, CATEGORY_URL, CATEGORY_SAVE_AS)
---
 docs/settings.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 94ce65a0..d8ef221d 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -188,10 +188,10 @@ Setting name (default value)                            What does it do?
                                                         use the default language.
 `PAGE_LANG_SAVE_AS` (``'pages/{slug}-{lang}.html'``)    The location we will save the page which doesn't
                                                         use the default language.
-`AUTHOR_URL` (``'author/{name}.html'``)                 The URL to use for an author.
-`AUTHOR_SAVE_AS` (``'author/{name}.html'``)             The location to save an author.
-`CATEGORY_URL` (``'category/{name}.html'``)             The URL to use for a category.
-`CATEGORY_SAVE_AS` (``'category/{name}.html'``)         The location to save a category.
+`AUTHOR_URL` (``'author/{slug}.html'``)                 The URL to use for an author.
+`AUTHOR_SAVE_AS` (``'author/{slug}.html'``)             The location to save an author.
+`CATEGORY_URL` (``'category/{slug}.html'``)             The URL to use for a category.
+`CATEGORY_SAVE_AS` (``'category/{slug}.html'``)         The location to save a category.
 `TAG_URL` (``'tag/{slug}.html'``)                       The URL to use for a tag.
 `TAG_SAVE_AS` (``'tag/{slug}.html'``)                   The location to save the tag page.
 `<DIRECT_TEMPLATE_NAME>_SAVE_AS`                        The location to save content generated from direct

From 6d745f32c07edb6cc20a5a0c7e5d952a749e9dee Mon Sep 17 00:00:00 2001
From: Erik Hetzner <egh@e6h.org>
Date: Wed, 14 Nov 2012 22:12:46 -0800
Subject: [PATCH 1001/2864] add preread signal

---
 pelican/generators.py | 1 +
 pelican/signals.py    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index 0d2209be..d7476850 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -307,6 +307,7 @@ class ArticlesGenerator(Generator):
                 article_path,
                 exclude=self.settings['ARTICLE_EXCLUDES']):
             try:
+                signals.article_generate_preread.send(self)
                 content, metadata = read_file(f, settings=self.settings)
             except Exception, e:
                 logger.warning(u'Could not process %s\n%s' % (f, str(e)))
diff --git a/pelican/signals.py b/pelican/signals.py
index 73e718b5..241c2da2 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -2,6 +2,7 @@ from blinker import signal
 
 initialized = signal('pelican_initialized')
 finalized = signal('pelican_finalized')
+article_generate_preread = signal('article_generate_preread')
 article_generate_context = signal('article_generate_context')
 article_generator_init = signal('article_generator_init')
 article_generator_finalized = signal('article_generate_finalized')

From 43b1555e5d89adc27e7561e056f27acf97e339ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Thu, 15 Nov 2012 20:06:40 +0100
Subject: [PATCH 1002/2864] Mention that FILES_TO_COPY is able to copy dirs.

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d8ef221d..b418dfff 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -52,8 +52,8 @@ Setting name (default value)                                            What doe
                                                                         the datetime.datetime constructor.
 `DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the content of the output directory before
                                                                         generating new files.
-`FILES_TO_COPY` (``()``)                                                A list of files to copy from the source (inside the content 
-                                                                        directory) to the destination (inside the output directory).
+`FILES_TO_COPY` (``()``)                                                A list of files (or directories to copy from the source (inside the
+                                                                        content directory) to the destination (inside the output directory).
                                                                         For example: ``(('extra/robots.txt', 'robots.txt'),)``.
 `JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
 `LOCALE` (''[#]_)                                                       Change the locale. A list of locales can be provided

From 55232405533ee56a6b7e629b12c140c040812476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Thu, 15 Nov 2012 20:09:06 +0100
Subject: [PATCH 1003/2864] What would be a commit without his "fix typo"
 brother, uh?

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index b418dfff..b278b17d 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -52,7 +52,7 @@ Setting name (default value)                                            What doe
                                                                         the datetime.datetime constructor.
 `DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the content of the output directory before
                                                                         generating new files.
-`FILES_TO_COPY` (``()``)                                                A list of files (or directories to copy from the source (inside the
+`FILES_TO_COPY` (``()``)                                                A list of files (or directories) to copy from the source (inside the
                                                                         content directory) to the destination (inside the output directory).
                                                                         For example: ``(('extra/robots.txt', 'robots.txt'),)``.
 `JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.

From fb562ec7d30b21c7a628054f6ddba703380e92af Mon Sep 17 00:00:00 2001
From: Erik Hetzner <egh@e6h.org>
Date: Fri, 16 Nov 2012 08:09:35 -0800
Subject: [PATCH 1004/2864] add docs for article_generate_preread signal

---
 docs/plugins.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index c275c57c..dc9359fe 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -63,6 +63,8 @@ finalized                       pelican object                  invoked after al
                                                                 - minifying js/css assets.
                                                                 - notify/ping search engines with an updated sitemap.
 article_generate_context        article_generator, metadata
+article_generate_preread        article_generator               invoked before a article is read in ArticlesGenerator.generate_context;
+                                                                use if code needs to do something before every article is parsed
 article_generator_init          article_generator               invoked in the ArticlesGenerator.__init__
 article_generator_finalized     article_generator               invoked at the end of ArticlesGenerator.generate_context
 get_generators                  generators                      invoked in Pelican.get_generator_classes,

From 7ff0d0e6867abbc0f35afb4cc7404ec4da17bc84 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Sat, 17 Nov 2012 01:00:44 +0100
Subject: [PATCH 1005/2864] Move webassets tests in their own file.

---
 tests/support.py         |  20 ++++++--
 tests/test_generators.py | 101 +--------------------------------------
 tests/test_webassets.py  |  98 +++++++++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+), 103 deletions(-)
 create mode 100644 tests/test_webassets.py

diff --git a/tests/support.py b/tests/support.py
index 13bbfb15..52a410ff 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -3,11 +3,12 @@ __all__ = [
     'unittest',
 ]
 
-import os
-import subprocess
-import re
-import sys
 import cStringIO
+import importlib
+import os
+import re
+import subprocess
+import sys
 
 from functools import wraps
 from contextlib import contextmanager
@@ -138,3 +139,14 @@ def skipIfNoExecutable(executable):
         return unittest.skip('{0} executable not found'.format(executable))
 
     return lambda func: func
+
+
+def module_exists(module_name):
+    """Test if a module is importable."""
+
+    try:
+        importlib.import_module(module_name)
+    except ImportError:
+        return False
+    else:
+        return True
diff --git a/tests/test_generators.py b/tests/test_generators.py
index 8a839ba1..95a55cdb 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -1,24 +1,17 @@
 # -*- coding: utf-8 -*-
 
 from mock import MagicMock
-import hashlib
 import os
 
 from codecs import open
 from tempfile import mkdtemp
 from shutil import rmtree
 
-try:
-    import webassets
-except ImportError:
-    webassets = None
-
-from pelican import Pelican
 from pelican.generators import ArticlesGenerator, PagesGenerator, \
     TemplatePagesGenerator
 from pelican.writers import Writer
-from pelican.settings import _DEFAULT_CONFIG, read_settings
-from .support import unittest, skipIfNoExecutable
+from pelican.settings import _DEFAULT_CONFIG
+from .support import unittest
 
 CUR_DIR = os.path.dirname(__file__)
 
@@ -246,93 +239,3 @@ class TestTemplatePagesGenerator(unittest.TestCase):
         # output content is correct
         with open(output_filename, 'r') as output_file:
             self.assertEquals(output_file.read(), 'foo: bar')
-
-
-@unittest.skipUnless(webassets, "webassets isn't installed")
-@skipIfNoExecutable(['scss', '-v'])
-@skipIfNoExecutable(['cssmin', '--version'])
-class TestWebAssets(unittest.TestCase):
-    """
-    scss style.scss style.ref.css
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        """Run pelican with two settings (absolute and relative urls)."""
-
-        cls.theme_dir = os.path.join(CUR_DIR, 'themes', 'assets')
-
-        cls.temp_path = mkdtemp()
-        cls.settings = read_settings(override={
-            'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
-            'OUTPUT_PATH': cls.temp_path,
-            'PLUGINS': ['pelican.plugins.assets', ],
-            'THEME': cls.theme_dir,
-        })
-        pelican = Pelican(settings=cls.settings)
-        pelican.run()
-
-        # run Pelican a second time with absolute urls
-        cls.temp_path2 = mkdtemp()
-        cls.settings2 = read_settings(override={
-            'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
-            'OUTPUT_PATH': cls.temp_path2,
-            'PLUGINS': ['pelican.plugins.assets', ],
-            'THEME': cls.theme_dir,
-            'RELATIVE_URLS': False,
-            'SITEURL': 'http://localhost'
-        })
-        pelican2 = Pelican(settings=cls.settings2)
-        pelican2.run()
-
-        cls.css_ref = open(os.path.join(cls.theme_dir, 'static', 'css',
-                                        'style.min.css')).read()
-        cls.version = hashlib.md5(cls.css_ref).hexdigest()[0:8]
-
-    @classmethod
-    def tearDownClass(cls):
-        rmtree(cls.temp_path)
-        rmtree(cls.temp_path2)
-
-    def test_jinja2_ext(self):
-        """Test that the Jinja2 extension was correctly added."""
-
-        from webassets.ext.jinja2 import AssetsExtension
-        self.assertIn(AssetsExtension, self.settings['JINJA_EXTENSIONS'])
-
-    def test_compilation(self):
-        """Compare the compiled css with the reference."""
-
-        gen_file = os.path.join(self.temp_path, 'theme', 'gen',
-                                'style.{0}.min.css'.format(self.version))
-
-        self.assertTrue(os.path.isfile(gen_file))
-        css_new = open(gen_file).read()
-        self.assertEqual(css_new, self.css_ref)
-
-    def check_link_tag(self, css_file, html_file):
-        """Check the presence of `css_file` in `html_file`."""
-
-        link_tag = '<link rel="stylesheet" href="{css_file}">'.\
-                   format(css_file=css_file)
-        html = open(html_file).read()
-        self.assertRegexpMatches(html, link_tag)
-
-    def test_template(self):
-        """Look in the output index.html file for the link tag."""
-
-        css_file = 'theme/gen/style.{0}.min.css'.format(self.version)
-        html_files = ['index.html', 'archives.html',
-                      'this-is-an-article-with-category.html']
-        for f in html_files:
-            self.check_link_tag(css_file, os.path.join(self.temp_path, f))
-
-    def test_absolute_url(self):
-        """Look in the output index.html file for the link tag with abs url."""
-
-        css_file = 'http://localhost/theme/gen/style.{0}.min.css'.\
-                   format(self.version)
-        html_files = ['index.html', 'archives.html',
-                      'this-is-an-article-with-category.html']
-        for f in html_files:
-            self.check_link_tag(css_file, os.path.join(self.temp_path2, f))
diff --git a/tests/test_webassets.py b/tests/test_webassets.py
new file mode 100644
index 00000000..0f7a59ce
--- /dev/null
+++ b/tests/test_webassets.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+
+import hashlib
+import os
+from codecs import open
+from tempfile import mkdtemp
+from shutil import rmtree
+
+from pelican import Pelican
+from pelican.settings import read_settings
+from .support import unittest, skipIfNoExecutable, module_exists
+
+CUR_DIR = os.path.dirname(__file__)
+
+
+@unittest.skipUnless(module_exists('webassets'), "webassets isn't installed")
+@skipIfNoExecutable(['scss', '-v'])
+@skipIfNoExecutable(['cssmin', '--version'])
+class TestWebAssets(unittest.TestCase):
+
+    def setUp(self):
+        """Run pelican with two settings (absolute and relative urls)."""
+
+        self.theme_dir = os.path.join(CUR_DIR, 'themes', 'assets')
+
+        self.temp_path = mkdtemp()
+        self.settings = read_settings(override={
+            'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
+            'OUTPUT_PATH': self.temp_path,
+            'PLUGINS': ['pelican.plugins.assets', ],
+            'THEME': self.theme_dir,
+        })
+        pelican = Pelican(settings=self.settings)
+        pelican.run()
+
+        # run Pelican a second time with absolute urls
+        self.temp_path2 = mkdtemp()
+        self.settings2 = read_settings(override={
+            'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
+            'OUTPUT_PATH': self.temp_path2,
+            'PLUGINS': ['pelican.plugins.assets', ],
+            'THEME': self.theme_dir,
+            'RELATIVE_URLS': False,
+            'SITEURL': 'http://localhost'
+        })
+        pelican2 = Pelican(settings=self.settings2)
+        pelican2.run()
+
+        self.css_ref = open(os.path.join(self.theme_dir, 'static', 'css',
+                                         'style.min.css')).read()
+        self.version = hashlib.md5(self.css_ref).hexdigest()[0:8]
+
+    def tearDown(self):
+        rmtree(self.temp_path)
+        rmtree(self.temp_path2)
+
+    def test_jinja2_ext(self):
+        """Test that the Jinja2 extension was correctly added."""
+
+        from webassets.ext.jinja2 import AssetsExtension
+        self.assertIn(AssetsExtension, self.settings['JINJA_EXTENSIONS'])
+
+    def test_compilation(self):
+        """Compare the compiled css with the reference."""
+
+        gen_file = os.path.join(self.temp_path, 'theme', 'gen',
+                                'style.{0}.min.css'.format(self.version))
+
+        self.assertTrue(os.path.isfile(gen_file))
+        css_new = open(gen_file).read()
+        self.assertEqual(css_new, self.css_ref)
+
+    def check_link_tag(self, css_file, html_file):
+        """Check the presence of `css_file` in `html_file`."""
+
+        link_tag = '<link rel="stylesheet" href="{css_file}">'.\
+                   format(css_file=css_file)
+        html = open(html_file).read()
+        self.assertRegexpMatches(html, link_tag)
+
+    def test_template(self):
+        """Look in the output index.html file for the link tag."""
+
+        css_file = 'theme/gen/style.{0}.min.css'.format(self.version)
+        html_files = ['index.html', 'archives.html',
+                      'this-is-an-article-with-category.html']
+        for f in html_files:
+            self.check_link_tag(css_file, os.path.join(self.temp_path, f))
+
+    def test_absolute_url(self):
+        """Look in the output index.html file for the link tag with abs url."""
+
+        css_file = 'http://localhost/theme/gen/style.{0}.min.css'.\
+                   format(self.version)
+        html_files = ['index.html', 'archives.html',
+                      'this-is-an-article-with-category.html']
+        for f in html_files:
+            self.check_link_tag(css_file, os.path.join(self.temp_path2, f))

From 09c893f3a354e6ae6928dc3123fa3d96ff0555ad Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Tue, 20 Nov 2012 00:07:44 +0100
Subject: [PATCH 1006/2864] Add a new signal `generator_init`, invoked at the
 end of `Generator.__init__`.

---
 docs/plugins.rst      | 1 +
 pelican/generators.py | 2 ++
 pelican/signals.py    | 1 +
 3 files changed, 4 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 83ef264c..94b22bca 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -62,6 +62,7 @@ finalized                       pelican object                  invoked after al
                                                                 usefull for custom post processing actions, such as:
                                                                 - minifying js/css assets.
                                                                 - notify/ping search engines with an updated sitemap.
+generator_init                  generator                       invoked in the Generator.__init__
 article_generate_context        article_generator, metadata
 article_generator_init          article_generator               invoked in the ArticlesGenerator.__init__
 article_generator_finalized     article_generator               invoked at the end of ArticlesGenerator.generate_context
diff --git a/pelican/generators.py b/pelican/generators.py
index 00b0d6d3..43cec021 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -61,6 +61,8 @@ class Generator(object):
         custom_filters = self.settings.get('JINJA_FILTERS', {})
         self.env.filters.update(custom_filters)
 
+        signals.generator_init.send(self)
+
     def get_template(self, name):
         """Return the template by name.
         Use self.theme to get the templates to use, and return a list of
diff --git a/pelican/signals.py b/pelican/signals.py
index 73e718b5..dd5724dc 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -2,6 +2,7 @@ from blinker import signal
 
 initialized = signal('pelican_initialized')
 finalized = signal('pelican_finalized')
+generator_init = signal('generator_init')
 article_generate_context = signal('article_generate_context')
 article_generator_init = signal('article_generator_init')
 article_generator_finalized = signal('article_generate_finalized')

From 00d1ea6157f61a82365e72518740378eee87d4c2 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Tue, 20 Nov 2012 00:09:52 +0100
Subject: [PATCH 1007/2864] Use the new generator_init signal for the assets
 plugin.

This allows to have the assets_environment in all generators.
---
 pelican/plugins/assets.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/plugins/assets.py b/pelican/plugins/assets.py
index 58f9f863..b32eee82 100644
--- a/pelican/plugins/assets.py
+++ b/pelican/plugins/assets.py
@@ -60,5 +60,4 @@ def register():
     """Plugin registration."""
 
     signals.initialized.connect(add_jinja2_ext)
-    signals.article_generator_init.connect(create_assets_env)
-    signals.pages_generator_init.connect(create_assets_env)
+    signals.generator_init.connect(create_assets_env)

From 67af48eed4c61168d9e8c16452d6e8c9fa6d4924 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Tue, 20 Nov 2012 00:22:18 +0100
Subject: [PATCH 1008/2864] travis configuration for webassets tests: install
 webassets, cssmin and sass.

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ea134da4..bb9a22e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,18 @@ language: python
 python:
     - "2.6"
     - "2.7"
+before_install:
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq ruby-sass
 install:
     - pip install nose unittest2 mock --use-mirrors
     - pip install . --use-mirrors
     - pip install Markdown
+    - pip install webassets
+    - pip install cssmin
 script: nosetests -s tests
 notifications:
     irc:
-        channels: 
+        channels:
             - "irc.freenode.org#pelican"
         on_success: change

From f413a8da79754f9b78274ba8a16b41c906cf4e25 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Tue, 20 Nov 2012 23:39:06 +0100
Subject: [PATCH 1009/2864] Change webassets configuration for relative urls.

Set the ASSET_URL to be relative to the 'theme/' url, which requires to use
{{ SITEURL }}/{{ ASSET_URL }} in the template and make it works with both
relative and absolute urls.
---
 docs/plugins.rst                        | 11 +++++++----
 pelican/plugins/assets.py               | 23 ++++-------------------
 tests/test_webassets.py                 |  6 +++++-
 tests/themes/assets/templates/base.html |  2 +-
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 94b22bca..d2e44337 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -139,12 +139,15 @@ more information.
 
 When using with Pelican, `webassets` is configured to process assets in the
 ``OUTPUT_PATH/theme`` directory. You can use `webassets` in your templates by
-including one or more template tags. For example...
+including one or more template tags. The jinja variable ``{{ ASSET_URL }}`` to
+use in the templates is configured to be relative to the ``theme/`` url.
+Hence, it must be used with the ``{{ SITEURL }}`` variable which allows to
+have relative urls. For example...
 
 .. code-block:: jinja
 
     {% assets filters="cssmin", output="css/style.min.css", "css/inuit.css", "css/pygment-monokai.css", "css/main.css" %}
-        <link rel="stylesheet" href="{{ ASSET_URL }}">
+        <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
     {% endassets %}
 
 ... will produce a minified css file with a version identifier:
@@ -159,7 +162,7 @@ and minifies the output:
 .. code-block:: jinja
 
     {% assets filters="sass,cssmin", output="css/style.min.css", "css/style.scss" %}
-        <link rel="stylesheet" href="{{ ASSET_URL }}">
+        <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
     {% endassets %}
 
 Another example for Javascript:
@@ -167,7 +170,7 @@ Another example for Javascript:
 .. code-block:: jinja
 
     {% assets filters="uglifyjs,gzip", output="js/packed.js", "js/jquery.js", "js/base.js", "js/widgets.js" %}
-        <script src="{{ ASSET_URL }}"></script>
+        <script src="{{ SITEURL }}/{{ ASSET_URL }}"></script>
     {% endassets %}
 
 The above will produce a minified and gzipped JS file:
diff --git a/pelican/plugins/assets.py b/pelican/plugins/assets.py
index b32eee82..b5d1cf76 100644
--- a/pelican/plugins/assets.py
+++ b/pelican/plugins/assets.py
@@ -6,20 +6,11 @@ Asset management plugin for Pelican
 This plugin allows you to use the `webassets`_ module to manage assets such as
 CSS and JS files.
 
-Hint for templates: Current version of webassets seems to remove any relative
-paths at the beginning of the URL. So, if ``RELATIVE_URLS`` is on,
-``ASSET_URL`` will start with ``theme/``, regardless if we set ``assets_url``
-here to ``./theme/`` or to ``theme/``.
-
-However, this breaks the ``ASSET_URL`` if user navigates to a sub-URL, e.g. if
-he clicks on a category. A workaround for this issue is to use::
+The ASSET_URL is set to a relative url to honor Pelican's RELATIVE_URLS
+setting. This requires the use of SITEURL in the templates::
 
     <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
 
-instead of::
-
-    <link rel="stylesheet" href="{{ ASSET_URL }}">
-
 .. _webassets: https://webassets.readthedocs.org/
 
 """
@@ -41,17 +32,11 @@ def add_jinja2_ext(pelican):
 def create_assets_env(generator):
     """Define the assets environment and pass it to the generator."""
 
-    logger = logging.getLogger(__name__)
-
-    # Let ASSET_URL honor Pelican's RELATIVE_URLS setting.
-    if generator.settings.get('RELATIVE_URLS'):
-        assets_url = './theme/'
-    else:
-        assets_url = generator.settings['SITEURL'] + '/theme/'
+    assets_url = 'theme/'
     assets_src = os.path.join(generator.output_path, 'theme')
-
     generator.env.assets_environment = Environment(assets_src, assets_url)
 
+    logger = logging.getLogger(__name__)
     if logging.getLevelName(logger.getEffectiveLevel()) == "DEBUG":
         generator.env.assets_environment.debug = True
 
diff --git a/tests/test_webassets.py b/tests/test_webassets.py
index 0f7a59ce..e47e7f81 100644
--- a/tests/test_webassets.py
+++ b/tests/test_webassets.py
@@ -81,12 +81,16 @@ class TestWebAssets(unittest.TestCase):
     def test_template(self):
         """Look in the output index.html file for the link tag."""
 
-        css_file = 'theme/gen/style.{0}.min.css'.format(self.version)
+        css_file = './theme/gen/style.{0}.min.css'.format(self.version)
         html_files = ['index.html', 'archives.html',
                       'this-is-an-article-with-category.html']
         for f in html_files:
             self.check_link_tag(css_file, os.path.join(self.temp_path, f))
 
+        self.check_link_tag(
+            '.././theme/gen/style.{0}.min.css'.format(self.version),
+            os.path.join(self.temp_path, 'category/misc.html'))
+
     def test_absolute_url(self):
         """Look in the output index.html file for the link tag with abs url."""
 
diff --git a/tests/themes/assets/templates/base.html b/tests/themes/assets/templates/base.html
index 13b3fb10..05a32d06 100644
--- a/tests/themes/assets/templates/base.html
+++ b/tests/themes/assets/templates/base.html
@@ -2,6 +2,6 @@
 
 {% block head %}
   {% assets filters="scss,cssmin", output="gen/style.%(version)s.min.css", "css/style.scss" %}
-    <link rel="stylesheet" href="{{ ASSET_URL }}">
+    <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
   {% endassets %}
 {% endblock %}

From e006cf04bbe5fa362578e239b966a649d154fe5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Pievil=C3=A4inen?= <tomi.pievilainen@iki.fi>
Date: Wed, 21 Nov 2012 14:01:37 +0200
Subject: [PATCH 1010/2864] Kill SimpleHTTPServer also on OS X

---
 pelican/tools/templates/develop_server.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index 3e97610b..41764728 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -30,7 +30,7 @@ function shut_down(){
   if [[ -f $$SRV_PID ]]; then
     PID=$$(cat $$SRV_PID)
     PROCESS=$$(ps -p $$PID | tail -n 1 | awk '{print $$4}')
-    if [[ $$PROCESS == python ]]; then
+    if [[ $$PROCESS != "" ]]; then
       echo "Killing SimpleHTTPServer"
       kill $$PID
     else

From 4aeb65512da5b5b53601d331810f4af3990864bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Wed, 21 Nov 2012 13:03:22 +0100
Subject: [PATCH 1011/2864] delete the TODO file

---
 TODO | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 TODO

diff --git a/TODO b/TODO
deleted file mode 100644
index ca29204d..00000000
--- a/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-* Add a way to support pictures (see how sphinx makes that)
-* Make the program support UTF8-encoded files as input (and later: any encoding?)
-* Add status support (draft, published, hidden)
-* Add a serve + automatic generation behaviour.
-* Recompile only the changed files, not all.
-* Add a way to make the coffee (or not)
-* Add a sitemap generator.
-* read templates from the templates folder per default
-* add support of github via ghg import

From a9cdf3c5a1911586530fb825a7a55d2ef7c88a41 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 21 Nov 2012 14:24:40 +0100
Subject: [PATCH 1012/2864] remove old import statement

---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 4acef788..bb2b5a6e 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -5,7 +5,6 @@ import logging
 import functools
 
 from datetime import datetime
-from os import getenv
 from sys import platform, stdin
 
 
@@ -15,6 +14,7 @@ from pelican import signals
 
 logger = logging.getLogger(__name__)
 
+
 class Page(object):
     """Represents a page
     Given a content, and metadata, create an adequate object.

From 429991c3f99dc3cb94267491052e34cf94cca5db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Pievil=C3=A4inen?= <tomi.pievilainen@iki.fi>
Date: Wed, 21 Nov 2012 14:41:09 +0200
Subject: [PATCH 1013/2864] List of translations for simple and notmyidea pages

---
 pelican/themes/notmyidea/templates/article_infos.html | 3 ++-
 pelican/themes/notmyidea/templates/page.html          | 2 ++
 pelican/themes/notmyidea/templates/translations.html  | 2 ++
 pelican/themes/simple/templates/article.html          | 2 ++
 pelican/themes/simple/templates/page.html             | 3 +++
 pelican/themes/simple/templates/translations.html     | 9 +++++++++
 6 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pelican/themes/simple/templates/translations.html

diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index a1993a09..4b86716d 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -10,5 +10,6 @@
         {% endif %}
 <p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
 {% include 'taglist.html' %}
-{% include 'translations.html' %}
+{% import 'translations.html' as translations with context %}
+{{ translations.translations_for(article) }}
 </footer><!-- /.post-info -->
diff --git a/pelican/themes/notmyidea/templates/page.html b/pelican/themes/notmyidea/templates/page.html
index 9635fb8d..60409d5c 100644
--- a/pelican/themes/notmyidea/templates/page.html
+++ b/pelican/themes/notmyidea/templates/page.html
@@ -3,6 +3,8 @@
 {% block content %}        
 <section id="content" class="body">    
     <h1 class="entry-title">{{ page.title }}</h1>
+    {% import 'translations.html' as translations with context %}
+    {{ translations.translations_for(page) }}
     {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
     the pdf</a>{% endif %}
     {{ page.content }}
diff --git a/pelican/themes/notmyidea/templates/translations.html b/pelican/themes/notmyidea/templates/translations.html
index 0079883e..ca03a2c9 100644
--- a/pelican/themes/notmyidea/templates/translations.html
+++ b/pelican/themes/notmyidea/templates/translations.html
@@ -1,6 +1,8 @@
+{% macro translations_for(article) %}
 {% if article.translations %}
 Translations: 
     {% for translation in article.translations %}
         <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
     {% endfor %}
 {% endif %}
+{% endmacro %}
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 16c34266..86b14f62 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -5,6 +5,8 @@
     <h2 class="entry-title">
       <a href="{{ article.url }}" rel="bookmark"
          title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
+ {% import 'translations.html' as translations with context %}
+ {{ translations.translations_for(article) }}
   </header>
   <footer class="post-info">
     <abbr class="published" title="{{ article.date.isoformat() }}">
diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
index 6308d588..3a0dc4a9 100644
--- a/pelican/themes/simple/templates/page.html
+++ b/pelican/themes/simple/templates/page.html
@@ -2,5 +2,8 @@
 {% block title %}{{ page.title }}{%endblock%}
 {% block content %}
     <h1>{{ page.title }}</h1>
+    {% import 'translations.html' as translations with context %}
+    {{ translations.translations_for(page) }}
+
     {{ page.content }}
 {% endblock %}
diff --git a/pelican/themes/simple/templates/translations.html b/pelican/themes/simple/templates/translations.html
new file mode 100644
index 00000000..db8c372d
--- /dev/null
+++ b/pelican/themes/simple/templates/translations.html
@@ -0,0 +1,9 @@
+{% macro translations_for(article) %}
+{% if article.translations %}
+Translations: 
+{% for translation in article.translations %}
+<a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
+{% endfor %}
+{% endif %}
+{% endmacro %}
+

From 3e454045e9036131e30729f5755c27ef3134ba9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Pievil=C3=A4inen?= <tomi.pievilainen@iki.fi>
Date: Wed, 21 Nov 2012 15:45:00 +0200
Subject: [PATCH 1014/2864] Update test data

---
 tests/output/custom/a-markdown-powered-article.html  |  3 +++
 tests/output/custom/article-1.html                   |  3 +++
 tests/output/custom/article-2.html                   |  3 +++
 tests/output/custom/article-3.html                   |  3 +++
 tests/output/custom/author/alexis-metaireau.html     | 12 ++++++++++++
 tests/output/custom/author/alexis-metaireau2.html    | 12 ++++++++++++
 tests/output/custom/category/bar.html                |  3 +++
 tests/output/custom/category/cat1.html               | 12 ++++++++++++
 tests/output/custom/category/misc.html               |  6 ++++++
 tests/output/custom/category/yeah.html               |  3 +++
 tests/output/custom/drafts/a-draft-article.html      |  3 +++
 tests/output/custom/index.html                       | 12 ++++++++++++
 tests/output/custom/index2.html                      | 12 ++++++++++++
 tests/output/custom/oh-yeah-fr.html                  |  3 +++
 tests/output/custom/oh-yeah.html                     |  3 +++
 .../custom/pages/this-is-a-test-hidden-page.html     |  4 ++++
 tests/output/custom/pages/this-is-a-test-page.html   |  4 ++++
 tests/output/custom/second-article-fr.html           |  3 +++
 tests/output/custom/second-article.html              |  3 +++
 tests/output/custom/tag/bar.html                     | 12 ++++++++++++
 tests/output/custom/tag/baz.html                     |  6 ++++++
 tests/output/custom/tag/foo.html                     |  9 +++++++++
 tests/output/custom/tag/foobar.html                  |  3 +++
 tests/output/custom/tag/oh.html                      |  3 +++
 tests/output/custom/tag/yeah.html                    |  3 +++
 tests/output/custom/this-is-a-super-article.html     |  3 +++
 tests/output/custom/unbelievable.html                |  3 +++
 27 files changed, 149 insertions(+)

diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index 9ca4763c..6e495efb 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>You're mutually oblivious.</p>
     </div><!-- /.entry-content -->
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index b0e0f879..e94373a9 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>Article 1</p>
 
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index 973b870a..f39bb27b 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>Article 2</p>
 
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index 7697a4ef..f0cc6c34 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>Article 3</p>
 
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index c64aacb9..42b84647 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -74,6 +74,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
@@ -113,6 +116,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 1</p>
 
@@ -148,6 +154,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 2</p>
 
@@ -183,6 +192,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 3</p>
 
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 53f001fa..32b55f6f 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -82,11 +82,14 @@
 <p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -127,11 +130,14 @@ YEAH !</p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <p>This is some article, in english</p>
 
@@ -167,6 +173,9 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
@@ -203,6 +212,9 @@ as well as <strong>inline markup</strong>.</p>
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Or completely awesome. Depends the needs.</p>
 
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index e645f4e2..87263d13 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index 4d76e095..af5ad56c 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -74,6 +74,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>
                 </article>
                 
@@ -113,6 +116,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 1</p>
 
@@ -148,6 +154,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 2</p>
 
@@ -183,6 +192,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 3</p>
 
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index a0ac83a5..90948668 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
                 </article>
@@ -119,6 +122,9 @@ Translations:
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Or completely awesome. Depends the needs.</p>
 
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index ece5f0eb..a848c4a4 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -74,6 +74,9 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index e38fb7b2..bcfd1243 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>This is a draft article, it should live under the /drafts/ folder and not be
 listed anywhere else.</p>
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index 80913795..3bcea824 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -74,11 +74,14 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href="./second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>
                 </article>
@@ -119,6 +122,9 @@ Translations:
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>You're mutually oblivious.</p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
@@ -153,6 +159,9 @@ Translations:
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 1</p>
 
@@ -188,6 +197,9 @@ Translations:
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 2</p>
 
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index 1eb336b6..bba153f4 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -82,6 +82,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Article 3</p>
 
@@ -117,6 +120,9 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
@@ -153,11 +159,14 @@ as well as <strong>inline markup</strong>.</p>
 <p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href="./oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -198,6 +207,9 @@ YEAH !</p>
 
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p>Or completely awesome. Depends the needs.</p>
 
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index fb669e9b..ddc17b30 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -76,11 +76,14 @@
 
 
 
+
+
 Translations: 
     
         <a href="./oh-yeah.html">en</a>
     
 
+
 </footer><!-- /.post-info -->
       <p>Et voila du contenu en français</p>
 
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index c4eb421f..a48044ab 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -76,11 +76,14 @@
 <p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href="./oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
       <div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 913a5974..2b489963 100644
--- a/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -55,6 +55,10 @@
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test hidden page</h1>
     
+    
+
+
+    
     <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index 87e4925f..7d74011d 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -55,6 +55,10 @@
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test page</h1>
     
+    
+
+
+    
     <p>Just an image.</p>
 <img alt="alternate text" src="../static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index 1100df29..cd1ee194 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -76,11 +76,14 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href="./second-article.html">en</a>
     
 
+
 </footer><!-- /.post-info -->
       <p>Ceci est un article, en français.</p>
 
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 7a908526..ebabacc3 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -76,11 +76,14 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href="./second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
       <p>This is some article, in english</p>
 
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 03ce0de3..b9ef8402 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article.html">en</a>
     
 
+
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
@@ -119,11 +122,14 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <p>This is some article, in english</p>
 
@@ -159,6 +165,9 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
@@ -195,11 +204,14 @@ as well as <strong>inline markup</strong>.</p>
 <p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index e32cc9ea..29c1fae9 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article.html">en</a>
     
 
+
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
@@ -119,11 +122,14 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <p>This is some article, in english</p>
 
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index 9c295933..04415b2c 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article.html">en</a>
     
 
+
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
 <p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
                 </article>
@@ -119,11 +122,14 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././second-article-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info -->
                 <p>This is some article, in english</p>
 
@@ -159,6 +165,9 @@ Translations:
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info -->
                 <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index cad2dae3..38c4c61e 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -74,6 +74,9 @@
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index 53d45369..498b3fde 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index bfd7b4cd..16d325f2 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -74,11 +74,14 @@
 <p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 
 
+
+
 Translations: 
     
         <a href=".././oh-yeah-fr.html">fr</a>
     
 
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index f1e3fa40..8d024437 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -76,6 +76,9 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index e08b2952..1a1b0788 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -76,6 +76,9 @@
 
 
 
+
+
+
 </footer><!-- /.post-info -->
       <p>Or completely awesome. Depends the needs.</p>
 

From 587184c778b69381392626147d6910a8ea0d71b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Wed, 21 Nov 2012 16:38:27 +0100
Subject: [PATCH 1015/2864] trim the blocks when generating templates.

---
 pelican/generators.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index d7476850..e0aaa130 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -47,6 +47,7 @@ class Generator(object):
         simple_loader = FileSystemLoader(os.path.join(theme_path,
                                          "themes", "simple", "templates"))
         self.env = Environment(
+            trim_blocks=True,
             loader=ChoiceLoader([
                 FileSystemLoader(self._templates_path),
                 simple_loader,  # implicit inheritance

From 09ddd92efc29f042a0c349dcb63e38caa7ece047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Wed, 21 Nov 2012 16:39:05 +0100
Subject: [PATCH 1016/2864] update the output for functional tests

---
 .../basic/a-markdown-powered-article.html     |  57 +---
 tests/output/basic/archives.html              |  50 +---
 tests/output/basic/article-1.html             |  57 +---
 tests/output/basic/article-2.html             |  57 +---
 tests/output/basic/article-3.html             |  57 +---
 .../output/basic/author/alexis-metaireau.html | 105 ++-----
 tests/output/basic/categories.html            |  46 +--
 tests/output/basic/category/bar.html          |  78 ++----
 tests/output/basic/category/cat1.html         | 152 +++-------
 tests/output/basic/category/misc.html         | 107 ++-----
 tests/output/basic/category/yeah.html         |  71 ++---
 .../output/basic/drafts/a-draft-article.html  |  57 +---
 tests/output/basic/feeds/all-en.atom.xml      |  10 +-
 tests/output/basic/feeds/all-fr.atom.xml      |   4 +-
 tests/output/basic/feeds/all.atom.xml         |  12 +-
 tests/output/basic/feeds/cat1.atom.xml        |   6 +-
 tests/output/basic/feeds/misc.atom.xml        |   4 +-
 tests/output/basic/index.html                 | 262 +++++-------------
 tests/output/basic/oh-yeah-fr.html            |  62 +----
 tests/output/basic/oh-yeah.html               |  63 ++---
 .../pages/this-is-a-test-hidden-page.html     |  42 +--
 .../basic/pages/this-is-a-test-page.html      |  42 +--
 tests/output/basic/second-article-fr.html     |  64 +----
 tests/output/basic/second-article.html        |  64 +----
 tests/output/basic/tag/bar.html               | 169 +++--------
 tests/output/basic/tag/baz.html               | 114 ++------
 tests/output/basic/tag/foo.html               | 138 +++------
 tests/output/basic/tag/foobar.html            |  71 ++---
 tests/output/basic/tag/oh.html                |  78 ++----
 tests/output/basic/tag/yeah.html              |  78 ++----
 tests/output/basic/theme/css/main.css         |   5 +-
 .../basic/theme/images/icons/delicious.png    | Bin 963 -> 958 bytes
 .../basic/theme/images/icons/facebook.png     | Bin 300 -> 202 bytes
 .../basic/theme/images/icons/github.png       | Bin 0 -> 346 bytes
 .../basic/theme/images/icons/gitorious.png    | Bin 3675 -> 227 bytes
 .../basic/theme/images/icons/gittip.png       | Bin 671 -> 487 bytes
 .../basic/theme/images/icons/google-plus.png  | Bin 0 -> 527 bytes
 .../basic/theme/images/icons/lastfm.png       | Bin 980 -> 975 bytes
 .../basic/theme/images/icons/linkedin.png     | Bin 376 -> 896 bytes
 tests/output/basic/theme/images/icons/rss.png | Bin 896 -> 879 bytes
 .../basic/theme/images/icons/twitter.png      | Bin 835 -> 830 bytes
 .../output/basic/this-is-a-super-article.html |  56 +---
 tests/output/basic/unbelievable.html          |  57 +---
 .../custom/a-markdown-powered-article.html    | 110 ++------
 tests/output/custom/archives.html             |  98 ++-----
 tests/output/custom/article-1.html            | 110 ++------
 tests/output/custom/article-2.html            | 110 ++------
 tests/output/custom/article-3.html            | 110 ++------
 .../custom/author/alexis-metaireau.html       | 220 ++++-----------
 .../custom/author/alexis-metaireau2.html      | 236 +++++-----------
 tests/output/custom/categories.html           |  94 ++-----
 tests/output/custom/category/bar.html         | 140 +++-------
 tests/output/custom/category/cat1.html        | 217 ++++-----------
 tests/output/custom/category/misc.html        | 170 +++---------
 tests/output/custom/category/yeah.html        | 133 +++------
 .../output/custom/drafts/a-draft-article.html | 110 ++------
 tests/output/custom/index.html                | 227 ++++-----------
 tests/output/custom/index2.html               | 229 ++++-----------
 tests/output/custom/oh-yeah-fr.html           | 115 ++------
 tests/output/custom/oh-yeah.html              | 117 +++-----
 .../pages/this-is-a-test-hidden-page.html     |  94 ++-----
 .../custom/pages/this-is-a-test-page.html     |  94 ++-----
 tests/output/custom/second-article-fr.html    | 117 +++-----
 tests/output/custom/second-article.html       | 117 +++-----
 tests/output/custom/tag/bar.html              | 238 +++++-----------
 tests/output/custom/tag/baz.html              | 177 +++---------
 tests/output/custom/tag/foo.html              | 204 ++++----------
 tests/output/custom/tag/foobar.html           | 133 +++------
 tests/output/custom/tag/oh.html               | 140 +++-------
 tests/output/custom/tag/yeah.html             | 140 +++-------
 .../custom/this-is-a-super-article.html       | 110 ++------
 tests/output/custom/unbelievable.html         | 110 ++------
 72 files changed, 1652 insertions(+), 4863 deletions(-)
 create mode 100644 tests/output/basic/theme/images/icons/github.png
 create mode 100644 tests/output/basic/theme/images/icons/google-plus.png

diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 6f41ddde..5a29c0b7 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -4,11 +4,8 @@
         <title>A markdown powered article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,36 +19,23 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="a-markdown-powered-article.html" rel="bookmark"
            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -59,27 +43,15 @@
                 Wed 20 April 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-      <p>You're mutually oblivious.</p>
+</footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
     </div><!-- /.entry-content -->
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -89,8 +61,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index 058b47f3..fc2af483 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,64 +19,40 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
 <h1>Archives for A Pelican Blog</h1>
 
 <dl>
-
     <dt>Wed 29 February 2012</dt>
     <dd><a href="./second-article.html">Second article</a></dd>
-
     <dt>Wed 20 April 2011</dt>
     <dd><a href="./a-markdown-powered-article.html">A markdown powered article</a></dd>
-
     <dt>Thu 17 February 2011</dt>
     <dd><a href="./article-1.html">Article 1</a></dd>
-
     <dt>Thu 17 February 2011</dt>
     <dd><a href="./article-2.html">Article 2</a></dd>
-
     <dt>Thu 17 February 2011</dt>
     <dd><a href="./article-3.html">Article 3</a></dd>
-
     <dt>Thu 02 December 2010</dt>
     <dd><a href="./this-is-a-super-article.html">This is a super article !</a></dd>
-
     <dt>Wed 20 October 2010</dt>
     <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
-
     <dt>Fri 15 October 2010</dt>
     <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
-
 </dl>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -89,8 +62,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index 2a389510..85644e68 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -4,11 +4,8 @@
         <title>Article 1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,36 +19,23 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="article-1.html" rel="bookmark"
            title="Permalink to Article 1">Article 1</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -59,28 +43,16 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-      <p>Article 1</p>
+</footer><!-- /.post-info -->      <p>Article 1</p>
 
     </div><!-- /.entry-content -->
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -90,8 +62,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 798ec4a5..e32851bb 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -4,11 +4,8 @@
         <title>Article 2</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,36 +19,23 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="article-2.html" rel="bookmark"
            title="Permalink to Article 2">Article 2</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -59,28 +43,16 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-      <p>Article 2</p>
+</footer><!-- /.post-info -->      <p>Article 2</p>
 
     </div><!-- /.entry-content -->
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -90,8 +62,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 49bad541..29406243 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -4,11 +4,8 @@
         <title>Article 3</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,36 +19,23 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="article-3.html" rel="bookmark"
            title="Permalink to Article 3">Article 3</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -59,28 +43,16 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-      <p>Article 3</p>
+</footer><!-- /.post-info -->      <p>Article 3</p>
 
     </div><!-- /.entry-content -->
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -90,8 +62,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index f1089963..014127c5 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog - Alexis Métaireau</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
@@ -57,45 +40,29 @@
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
+            <a href=".././oh-yeah-fr.html">fr</a>
     
-        <a href=".././oh-yeah-fr.html">fr</a>
-    
-
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-
                 </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -107,38 +74,21 @@ YEAH !</p>
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
-
-
-</footer><!-- /.post-info -->
-                <p class="first last">Multi-line metadata should be supported
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                            </ol><!-- /#posts-list -->
+                                                    </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -148,8 +98,5 @@ as well as <strong>inline markup</strong>.</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index f9bd569b..e94987b8 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,44 +19,24 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<ul>
-
+        <ul>
     <li><a href="./category/bar.html">bar</a></li>
-
     <li><a href="./category/cat1.html">cat1</a></li>
-
     <li><a href="./category/misc.html">misc</a></li>
-
     <li><a href="./category/yeah.html">yeah</a></li>
-
 </ul>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -69,8 +46,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index b3c51675..b47d7522 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li class="active"><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li class="active"><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
@@ -57,47 +40,25 @@
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
+            <a href=".././oh-yeah-fr.html">fr</a>
     
-        <a href=".././oh-yeah-fr.html">fr</a>
-    
-
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-
                 </article>
-                
-                    
-                
-            </aside><!-- /#featured -->
-            
-        
-        
-        
-            </ol><!-- /#posts-list -->
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                                                                </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -107,8 +68,5 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index 5f376e6a..3d592144 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog - cat1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li class="active"><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li class="active"><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././a-markdown-powered-article.html">A markdown powered article</a></h1> 
                     <footer class="post-info">
@@ -57,34 +40,18 @@
                 Wed 20 April 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-                </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
@@ -96,30 +63,17 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-                <p>Article 1</p>
+</footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href=".././article-1.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
@@ -131,30 +85,17 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-                <p>Article 2</p>
+</footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href=".././article-2.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
@@ -166,37 +107,17 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-                <p>Article 3</p>
+</footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href=".././article-3.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                            </ol><!-- /#posts-list -->
+                                                    </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -206,8 +127,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index fb862c5a..5ebcfe92 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog - misc</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li class="active"><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
@@ -57,40 +40,21 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article-fr.html">fr</a>
     
-        <a href=".././second-article-fr.html">fr</a>
-    
-
 </footer><!-- /.post-info --><p>This is some article, in english</p>
-
                 </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
@@ -102,37 +66,17 @@ Translations:
                 Fri 15 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-                <p>Or completely awesome. Depends the needs.</p>
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 
                 <a class="readmore" href=".././unbelievable.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                            </ol><!-- /#posts-list -->
+                                                    </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -142,8 +86,5 @@ Translations:
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index 5dcf2857..5aef966a 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li class="active"><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li class="active"><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
                     <footer class="post-info">
@@ -57,15 +40,11 @@
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
-
-
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -78,27 +57,12 @@
 </pre>
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
-
                 </article>
-                
-                    
-                
-            </aside><!-- /#featured -->
-            
-        
-        
-        
-            </ol><!-- /#posts-list -->
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                                                                </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -108,8 +72,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
index 7da9c416..71e778ce 100644
--- a/tests/output/basic/drafts/a-draft-article.html
+++ b/tests/output/basic/drafts/a-draft-article.html
@@ -4,11 +4,8 @@
         <title>A draft article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,36 +19,23 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li class="active"><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="a-draft-article.html" rel="bookmark"
            title="Permalink to A draft article">A draft article</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -59,29 +43,17 @@
                 Mon 17 September 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-      <p>This is a draft article, it should live under the /drafts/ folder and not be
+</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
 listed anywhere else.</p>
 
     </div><!-- /.entry-content -->
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -91,8 +63,5 @@ listed anywhere else.</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index 16163dc0..c7e53da6 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -21,5 +21,5 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index 979e21ef..2cfb5ea6 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-09-17T15:02:39Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-09-17T15:02:39Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-09-17:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-09-17T15:02:39Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-09-17T15:02:39Z</updated><author><name></name></author><id>tag:,2012-09-17:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index 27c92e6d..a439882f 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-09-17T15:02:39Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-09-17T15:02:39Z</updated><author><name></name></author><id>tag:,2012-09-17:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -21,5 +23,5 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
index 4ff8e6ca..68e6f4cf 100644
--- a/tests/output/basic/feeds/cat1.atom.xml
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml
index ec3c79bc..dce36d06 100644
--- a/tests/output/basic/feeds/misc.atom.xml
+++ b/tests/output/basic/feeds/misc.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 18673102..8a063033 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="./second-article.html">Second article</a></h1> 
                     <footer class="post-info">
@@ -57,40 +40,21 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
-
-
-Translations: 
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
+            <a href="./second-article-fr.html">fr</a>
     
-        <a href="./second-article-fr.html">fr</a>
-    
-
 </footer><!-- /.post-info --><p>This is some article, in english</p>
-
                 </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./a-markdown-powered-article.html" rel="bookmark"
                            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
@@ -102,29 +66,16 @@ Translations:
                 Wed 20 April 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-                <p>You're mutually oblivious.</p>
+</footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
@@ -136,30 +87,17 @@ Translations:
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-                <p>Article 1</p>
+</footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="./article-1.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
@@ -171,30 +109,17 @@ Translations:
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-                <p>Article 2</p>
+</footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="./article-2.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
@@ -206,30 +131,17 @@ Translations:
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-                <p>Article 3</p>
+</footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="./article-3.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -241,31 +153,21 @@ Translations:
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/yeah.html">yeah</a>. </p>
+        <p>In <a href="./category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
-
-
-</footer><!-- /.post-info -->
-                <p class="first last">Multi-line metadata should be supported
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="./this-is-a-super-article.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
@@ -277,22 +179,14 @@ as well as <strong>inline markup</strong>.</p>
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
-
-
-Translations: 
+        <p>In <a href="./category/bar.html">bar</a>. </p>
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: 
+            <a href="./oh-yeah-fr.html">fr</a>
     
-        <a href="./oh-yeah-fr.html">fr</a>
-    
-
-</footer><!-- /.post-info -->
-                <div class="section" id="why-not">
+</footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
@@ -300,17 +194,12 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="./oh-yeah.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
@@ -322,37 +211,17 @@ YEAH !</p>
                 Fri 15 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
+        <p>In <a href="./category/misc.html">misc</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-                <p>Or completely awesome. Depends the needs.</p>
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 
                 <a class="readmore" href="./unbelievable.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                            </ol><!-- /#posts-list -->
+                                                    </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -362,8 +231,5 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
index 335428ef..5143907f 100644
--- a/tests/output/basic/oh-yeah-fr.html
+++ b/tests/output/basic/oh-yeah-fr.html
@@ -4,11 +4,8 @@
         <title>Trop bien !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,36 +19,23 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="oh-yeah-fr.html" rel="bookmark"
            title="Permalink to Trop bien !">Trop bien !</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -59,33 +43,18 @@
                 Mon 17 September 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
-
-
-
+        <p>In <a href="./category/misc.html">misc</a>. </p>
 Translations: 
+            <a href="./oh-yeah.html">en</a>
     
-        <a href="./oh-yeah.html">en</a>
-    
-
-</footer><!-- /.post-info -->
-      <p>Et voila du contenu en français</p>
+</footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
 
     </div><!-- /.entry-content -->
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -95,8 +64,5 @@ Translations:
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index b172f2eb..0e06699d 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -4,11 +4,8 @@
         <title>Oh yeah !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,36 +19,23 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li class="active"><a href="./category/bar.html">bar</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li class="active"><a href="./category/bar.html">bar</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="oh-yeah.html" rel="bookmark"
            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -59,22 +43,14 @@
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
-
-
-Translations: 
+        <p>In <a href="./category/bar.html">bar</a>. </p>
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: 
+            <a href="./oh-yeah-fr.html">fr</a>
     
-        <a href="./oh-yeah-fr.html">fr</a>
-    
-
-</footer><!-- /.post-info -->
-      <div class="section" id="why-not">
+</footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
@@ -83,14 +59,10 @@ YEAH !</p>
 
     </div><!-- /.entry-content -->
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -100,8 +72,5 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html
index e3b3f5f5..a8c624d5 100644
--- a/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -4,11 +4,8 @@
         <title>This is a test hidden page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,40 +19,26 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test hidden page</h1>
-    
-    <p>This is great for things like error(404) pages
+        
+        <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -65,8 +48,5 @@ Anyone can see this page but it's not linked to anywhere!</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index f68a97d6..1584309c 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -4,11 +4,8 @@
         <title>This is a test page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,40 +19,26 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test page</h1>
-    
-    <p>Just an image.</p>
+        
+        <p>Just an image.</p>
 <img alt="alternate text" src="../static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -65,8 +48,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index 6dcc1a91..742bfa20 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -4,11 +4,8 @@
         <title>Deuxième article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,36 +19,23 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="second-article-fr.html" rel="bookmark"
            title="Permalink to Deuxième article">Deuxième article</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -59,33 +43,18 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
-
-
-Translations: 
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
+            <a href="./second-article.html">en</a>
     
-        <a href="./second-article.html">en</a>
-    
-
-</footer><!-- /.post-info -->
-      <p>Ceci est un article, en français.</p>
+</footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
     </div><!-- /.entry-content -->
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -95,8 +64,5 @@ Translations:
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index e33300aa..a672f9c6 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -4,11 +4,8 @@
         <title>Second article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,36 +19,23 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="second-article.html" rel="bookmark"
            title="Permalink to Second article">Second article</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -59,33 +43,18 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
-
-
-Translations: 
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
+            <a href="./second-article-fr.html">fr</a>
     
-        <a href="./second-article-fr.html">fr</a>
-    
-
-</footer><!-- /.post-info -->
-      <p>This is some article, in english</p>
+</footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
     </div><!-- /.entry-content -->
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -95,8 +64,5 @@ Translations:
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 77462fe6..4bc5adc0 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
@@ -57,40 +40,21 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article.html">en</a>
     
-        <a href=".././second-article.html">en</a>
-    
-
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-
                 </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
@@ -102,35 +66,19 @@ Translations:
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article-fr.html">fr</a>
     
-        <a href=".././second-article-fr.html">fr</a>
-    
-
-</footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href=".././second-article.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -142,31 +90,21 @@ Translations:
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
-
-
-</footer><!-- /.post-info -->
-                <p class="first last">Multi-line metadata should be supported
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
@@ -178,22 +116,14 @@ as well as <strong>inline markup</strong>.</p>
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
+            <a href=".././oh-yeah-fr.html">fr</a>
     
-        <a href=".././oh-yeah-fr.html">fr</a>
-    
-
-</footer><!-- /.post-info -->
-                <div class="section" id="why-not">
+</footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
@@ -201,24 +131,12 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href=".././oh-yeah.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                            </ol><!-- /#posts-list -->
+                                                    </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -228,8 +146,5 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index 4ebe1f1d..21dc22f5 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog - baz</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
@@ -57,40 +40,21 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article.html">en</a>
     
-        <a href=".././second-article.html">en</a>
-    
-
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-
                 </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
@@ -102,42 +66,19 @@ Translations:
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article-fr.html">fr</a>
     
-        <a href=".././second-article-fr.html">fr</a>
-    
-
-</footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href=".././second-article.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                            </ol><!-- /#posts-list -->
+                                                    </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -147,8 +88,5 @@ Translations:
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index d1e2dbb8..e5997631 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog - foo</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
@@ -57,40 +40,21 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article.html">en</a>
     
-        <a href=".././second-article.html">en</a>
-    
-
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-
                 </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
@@ -102,35 +66,19 @@ Translations:
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article-fr.html">fr</a>
     
-        <a href=".././second-article-fr.html">fr</a>
-    
-
-</footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href=".././second-article.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -142,38 +90,21 @@ Translations:
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
-
-
-</footer><!-- /.post-info -->
-                <p class="first last">Multi-line metadata should be supported
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
-                
-                </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                            </ol><!-- /#posts-list -->
+                                                    </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -183,8 +114,5 @@ as well as <strong>inline markup</strong>.</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index bd4a7b66..211a73bd 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog - foobar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
                     <footer class="post-info">
@@ -57,15 +40,11 @@
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
-
-
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -78,27 +57,12 @@
 </pre>
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
-
                 </article>
-                
-                    
-                
-            </aside><!-- /#featured -->
-            
-        
-        
-        
-            </ol><!-- /#posts-list -->
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                                                                </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -108,8 +72,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index b77856dd..a286ca8d 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog - oh</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
@@ -57,47 +40,25 @@
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
+            <a href=".././oh-yeah-fr.html">fr</a>
     
-        <a href=".././oh-yeah-fr.html">fr</a>
-    
-
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-
                 </article>
-                
-                    
-                
-            </aside><!-- /#featured -->
-            
-        
-        
-        
-            </ol><!-- /#posts-list -->
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                                                                </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -107,8 +68,5 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 90f34fe0..1e91b765 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -4,11 +4,8 @@
         <title>A Pelican Blog - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,34 +19,20 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href="../.">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
@@ -57,47 +40,25 @@
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
-
-
-Translations: 
+        <p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
+            <a href=".././oh-yeah-fr.html">fr</a>
     
-        <a href=".././oh-yeah-fr.html">fr</a>
-    
-
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-
                 </article>
-                
-                    
-                
-            </aside><!-- /#featured -->
-            
-        
-        
-        
-            </ol><!-- /#posts-list -->
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                                                                </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -107,8 +68,5 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index 3d94200b..29cce82c 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -309,7 +309,10 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
-        .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+		.social a[href*='github.com'],
+		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
+		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
 
 /*
 	About
diff --git a/tests/output/basic/theme/images/icons/delicious.png b/tests/output/basic/theme/images/icons/delicious.png
index c6ce246a4602f8f74e75ea8cfe9f5a00daceeb33..3dccdd848ec99fba9950e8195d4e73867ada2738 100644
GIT binary patch
delta 825
zcmV-91IGNr2fhc8l7AOTL_t(I5e31$ZyR+Sz~RsR?&phr@k{KwZtJ8rq)AI+DoYGR
zC_<<k5ePBzFO-D^2^NsLF%$$$Y%Fv@g-Uco0>Oerq^Ob`+NMdMNmJK})5LG*d-L6W
zc^(6xSS(h?<8dRCv6pJK*-N!ry|lD=zU=6Cvvz*9eR|Y8ZGZP?(}Q5zu4Ye;Yw6U<
z%$bdQs2_ec*4Ey;wY<Faeyx7dZZsO?vT4fYGtAE~^4ER%_Is$5px1-FXTrVv2Hs<j
zSDQUP{^-`4E|)KTaP#ID3IG5A075!##q+i%bO8mfYmiDtOsZ+NUkv!=u0Pb1Npb*E
z2Y?A8049dvVt;89Kg!V`gENNqzQ-i)Vp=KE=1B78)u-CB3_yT{I2Hg*6Cfd*5jvfS
zC>Bn;5kze=d5?*!aR(Wra;~tbOQk6n6iE^S28IC;10{@PkM=_sWfib<N2t6Dv5-nB
zydcHqKk6Nw&!>g}N~Hk+008J5K8N8Pi863TKFA4#Hh*A4LHxOMyT9w><KqXd*7{1n
z@3X!Alt&LYah#ByN58T8-!(EXeM4hmK&f2Co-UG2Tb#|!&^frRrmfotymF=S<Jrox
z6be@bDgs%7lmJpazbZR>A|jE91R@fPNF*X6Uw!$hG@H#gbvAe5wL~g-eup^rQ51og
zp);b<%zv>^j{y^y03niqp-c{sG_BT_qiPrDe~O}j;qVY7MvR0=e89tT48Q~+iXe(0
z5da7Szq_*X#=c5t?5!{y68J805+M>0_z_^U^LUHy(Gvhb05FsS1cCng`k$w&UZ0x|
z0uQY<A~7NXU;;&6^d~r@F#uYp(b_^87GN;w_kT;*uYYLk{rx9lE>|E3Pp}ktUY9r?
z14j_0@d5$B_Z=+DVmR~|IWB$}mM>H*v$|ft{9t3_8G-9yY7Y#LsVRkJX3(iJpMCzF
zEX-G(o!tYKB)aGO!M}TZ8^dBTeR$)>Cv9!p_HOg)(${Nmzm=^2eRt!qyLG(s`nCRG
zm@*E1KbX?WJ$-q;+RNr<%sY4f7_?eHhX4RqE;sleG7W{b<gJ)y00000NkvXXu0mjf
D8IXcW

delta 830
zcmV-E1Ht^h2g3)Dl7AdYL_t(Ijb)O(Z(C&?g`fNS^^JYwkJxqH)=6zhla|C(mKcao
zgitpk5MtzCXcrbFSU~E=P!KS&vCsh(D$xxI1Pc<8qDpCKn<jxKO<gBW6MtRbFW-BA
z3<*<@bfmL9I?~ZG01Aadc{m)_(`jq2TAjR5t=5Wjvu8`Tet$P(<rbSq`<<g^cQV!U
z$E`}{@SvJX9!{KExr_S#7h`GZy_@s%bMIGc=dF6ZPBxRGR651<^elhggKxfrauGTm
z*nTS9y=UM)a(T7U;iC_4F6mO~!Us2Qe6Dyw0j;LuSyK}@fC9%cNX7$3l@uG#d;EOI
z>+8`d-UX>0Lw_Sg01_C6gQ*jEVV3R?>>)IFTt-owgqb9j7)Y+P_(Yqg0SFKiMFKz~
z0T7c(3$0d27zs!15W*(uoXg13IK8w{K9ir-#p0L)iZ~7c1H%A_fFee`P4j_+GV@s3
zeN@hYNJu6XuAgM>Z}pDO<&u2>rBW}f(As+j{V8H)V1ExhkV6P8z=FJZQ)jk*(+39!
z_g7b!7rI@Kjg2Qfe6WUX2W&q4m9>AbkbdcF>N7oxr3%(~flSKebasN)?kzQL-rD7r
zOZ6X4m**v)zbsG|$Ot3_kjmLb+1wTp2}Q&gk?16geEG#E(r7f^)S2wL*J3H-dM%>J
zLs0-C`hWI-dLzqBEdmn22ndiE43%JSU$eTpZma6~=^w+;r{CWLi4Y?u6c2E*ZQ}%n
zFg$iFCol26_QJv&J1Uj7)`Osr?>R(qh=`Bxg@DE8qjlQ*k548&CJm(kL7=<5{Kt{1
z)uzUM-$iSUNQ8)g(punocZ59{0-$vYtxc3+0)Ga*Znt>#>NQL6>^u&#**t!5h^fGJ
z+eFb2*oQEM>mN6Jo{edm^!qLY+rbNh(z!}`QrBu1@2{*p#dmBH+6BX9Y)oM$(&%J~
zPe1!sW~M9l=GLx?W8LvQ|DWycm42a++Pi-J<EFMOYpZd2?yIG@--?(2y0fy^UO!lP
z{WnUt*G~nW=Z|US9KAeU>147KiQBh-@2#%>6#Rd*OBd_>2Qm$Xwckl|rT_o{07*qo
IM6N<$f};<VTL1t6

diff --git a/tests/output/basic/theme/images/icons/facebook.png b/tests/output/basic/theme/images/icons/facebook.png
index a7914b497369c55feba7defc9a3ea5bec424ecfc..74e7ad52f362b56d584df459bc5141395c32b7ed 100644
GIT binary patch
delta 16
XcmZ3(bc%7pK~4rwS3j3^P6<r_F@FWd

delta 114
zcmX@bxQ1!M!EDtM*NBpo#FA92<f2p{#b9J$XsByoq-$sxVrXP#YHnp}scm3rWnf@!
jzTyW10|P=sZhlH;S|x4`UReSzKn)C@u6{1-oD!M<njIfp

diff --git a/tests/output/basic/theme/images/icons/github.png b/tests/output/basic/theme/images/icons/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c52b486c5e392261c24d53fe2609e54d4f07c5d
GIT binary patch
literal 346
zcmV-g0j2(lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uy}3`s;mR5;6()3HheVGso1uMG%RRzfO4uoA3<v_61sARwd?1Y28Q
z!qzGv2!XV=2ZA63u1yv20fbZm;cO=I6E3Izu-x(Q%-qiI9=lH;XNkUloFV3D@R?|G
zH|!$z@Qf91aa`n%a<>Ym*CsGUh074yEL{XMZ7cf&`*=*r72Z+j+2B5y<+hzU#(AFv
z+!m8y#^HcNtmEqdUmXGsPJ&&BYk)<>PJbac!3$@wEwC5mE`k2GKxqL+9X1|{k^fkb
zPG1EuO5&~{J{6@4w%#7&G9!Ay3~z<NYk_SYqmZh6{XEOE5vYraRl&Bd@+`Z5la<{F
sEO4FNbk`~?npn3quuksJ=TE=$H_pXv&+a*=O8@`>07*qoM6N<$f=VTic>n+a

literal 0
HcmV?d00001

diff --git a/tests/output/basic/theme/images/icons/gitorious.png b/tests/output/basic/theme/images/icons/gitorious.png
index 6485f5ecc5f6047a052d9adfb686ee154e7233af..3eeb3ecec36a73ff505e04ecdecbcc4792ef6786 100644
GIT binary patch
delta 199
zcmV;&0672K9OD6yB!4_mOjJbxdO9bDQz(m9HIZRZpK)ubh)uJ7cde3mxs-3gmU_mX
zpuexJ#ki)~zOmiL)z#I~?BD9@>fQ0@|NsA$KGRG9003f1L_t&-(|ye`5`Z8K0Ko$#
z3IP-G|9`cS8ED+{nj_01Be_koAnlp75qc?o2`=J4p}Suqmq2^}LK)BUG$EY#9zOeh
z21r&_4>(k-B_NrZDX5wKgt~2Y2}1&6nnZ{!;tLK&3GEfRNsIsh002ovPDHLkV1iD^
BTdx2B

literal 3675
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
BhXDWp

diff --git a/tests/output/basic/theme/images/icons/gittip.png b/tests/output/basic/theme/images/icons/gittip.png
index bb12a1391ace96a9d4cedffebedd7db7d6a84d48..af949625ac83d2441215c81650e897c97d9e5d95 100644
GIT binary patch
delta 390
zcmV;10eSwP1?K~hYJUM|Nkl<ZILl*TfPw^X8!(;dW22JbZ9M}>-vZ)aP<#t2rh=>%
z4uBFcLlywp|AF`)lt#v2F_0Q$J;*j+Ou*EHfuU+HqPPTPDok^%yZQe}XCt6Z)(A~N
zcBHfM{}?w@xFIl?fc=bY!<BO<|9|=X>HpjbZD7OVJuUzD)PENK|M2eZ|NFOZ{Lct+
zMRt)212k~{fo$2ZY~Ftm`1kK0n4Z<s^uMJf11<)_$M)^~9|trPs%HiRG_=9a+_YlB
ze;5EM{{8zG*k+i4Ao|3C-9Q5@U@o}D0F5TFKzVBTe?p+Qt{B-1zfcT_aX0&a_V^*7
zRhSw<wm*Jw_kVwsi!p`)w~zxd+28*Eub)5Q&PEQCyl5ZvXuSmwL}ZET%ovn_1A(5}
zB9y2_4n!4<#NurQ)&K*GruHBQ9BMS8CnOjK#s8G{>i?_eO#`O~^wbDXNGM6!8_gwN
kR<Jn7pOh)eOq6D40B`F5$B|gKmH+?%07*qoM6N<$g7gx+%K!iX

delta 576
zcmV-G0>Ay|1D^$uYJUPBNkl<ZILoDzKWGzS7{-6^cey6jL2VISlnBk>U>nq-!*wY*
zC4;*|6YMHgDyXOh9jsz9Dcv*)g5V+u32`wNycWSfXg96&Pc%sJPsJj(q|NJ)yLbsY
z`3(p6eb4hgcfWg1@K!3}kT1EUlTM$io)M8@AnF}2scJ<;GJm<E``*_A2tYdNkSn^R
z5>8%(5kUR3z*0a|DdbCT%J)bh`Hez<r;EQ$fw^4K9Y`gdW=bmI<Pk;$*sRyt+^iFh
zbR*Inr>bnMuVYyTyDN+~Cl&G~Hznz$(+AA^3FB9?L}LfIfBP2G<%bw!ICx}`(bE@M
z{rZ{f=TEY+{(sAt$E<j4?^O{wtg3SC_z8xNCb8`<4h;_RW#to*ZQD6Jd6RG?!p@#v
zdUx;Px%&iTjH+rl<k1!YV@#8*2&zhY>>NMW)=<^fUQ?r<OoomBsYHaC$K@6*5g`<^
z*|Dpq#X>}wsXW56LcT0&f`n_;MP5C7>IHPrSLNgK0)H=Or`z@ou;ky^b{A9EE>W*<
zpsH<V5#h##F~X7Vpnu7zYK1^%V{41cr$$@v?3=R_<NWx(+VN0YF(Q)bY+bFoKz3pr
z5kW+_JC$Yb#cYekA54<5Ucak;i^uluM~F)R;7YAZ?ZYC=^KU6XxJM{tx3$qL(w+7y
zEB(O`Z8<b(sA5^xKdWp!Gr6KW02G2DVocDi-nEb`x&!HCGg$ujcm55b9s8QriQlvU
O0000<MNUMnLSTaH2O8!8

diff --git a/tests/output/basic/theme/images/icons/google-plus.png b/tests/output/basic/theme/images/icons/google-plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c6b74324031611f20c0a3810131aa74fd0a5a9f
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0005jNkl<ZD9>ZK
z>upIAVz}dFal_O6CT?`r$q<OnIT-@kK$Q%)JnZh&Px^TL<hOT!|HHwDE3YcOueqB6
z(P;+*puibNLm>OAn;FBaOK-k!D!Jidayc;Y>7GYGxnGBxue+IChM|)V`ar=`j`~3M
zC07%M|NqZF^fS8TVssIRJYwIy1j>GXU1E8{UJs6dLU1-v!-3nb2Irih=+?6PK<TfG
zB2Rf*{>KJ@8lF5#&^v9fcghZg&b90USur#Ch_yBx0YzYJ9ftpZ|9@Mbb;3sH7#Llc
zapC{3OLv2zTp&7Rr3KUgB!TRsHrfndzX7?Q-YzOS8|-?va>A!K_nuYT9<<VgqkWbd
zKoxr}G!9s50ujTB;JBOfmb}=t_wzfT`1cp}c6-g#_aLENrfLub;W8XHSKncxy2B*+
z$(#TG{(pE>U;^giL<|Q^RJR%`Z!y$8yYa>Upa1{=xci{g2`qvgF`RFk`e^@wXB(G2
zShMW$$p`;HLHGV;SLhaf#f_+F1DIs^y0_<$oBBFk`Sl>Ab*Ovm_g^4AcawG2Lj|D-
zqK4swiTo;US!A@iaP1FZz%33(6Ney%eY$dMwPn_zpvZ?`|G(*ST!StSLI9gPlb*yp
RBR2p5002ovPDHLkV1g3B{|5j7

literal 0
HcmV?d00001

diff --git a/tests/output/basic/theme/images/icons/lastfm.png b/tests/output/basic/theme/images/icons/lastfm.png
index b09c7876537ad9faa7a7a68ad6c8035d2e32ec3a..3a6c6262b644dadbcf6cce5dfe4fed9740a9ec1f 100644
GIT binary patch
delta 842
zcmV-Q1GW6r2hRtPl7A>kL_t(I5e30dY!p=-!13>U^LF-sk?xk2w$KnZDpdlBD2<Us
z2~iSbKqDvA#DgC2Plz5pbL8U1a4~`C4T$m2sf0wM7y&IUG?q|==(cw0w%y&%?#%4W
zdp|!PwfgntJ(<?V`+l|ZvMv`(+IUWRX2zscNYf|r)GCS=B7ZT~u95LVa{fAL+9Yc(
z8^6^)H{|<=ND^4v0IdOe0zU(u0oZ|a;2bCgNeT`~6P$8)OfE?uXRHQ(7Mug;AW0Et
z!8w#t03ZT@6bdNg!NVm2V}~{I0E&4)!A2K0Lr5${35Wte3r@knf;K3nA!CrB2i^X-
zQIC}ZHhYlE!+&HQ>Jw1Np_ZC(a~^^ahDtECA8NxevjB}{B#LnDPOMcfyN(rj=^z~3
z2O_Yt2K5OzdI(zU@cdrbH3rM8$TM|ltYGKw6ZLx)Bb}hk;TK`3g#G3RbhCvTq%b-H
z?;eBtPH47Z`v~duFZ8bbMlqiy+3b;&eXS#G%&u|L*?$F+pKqWt2HRdIz4#;U<{WZ(
ziryFJaSs}pQzyy2bDX&Gh-jsS6Jp)^{nkJLy<<Bvh)I6^ljQc_1UK%|J9`0DERd8+
zEbn=R?uBp3zHtQe!CQn2576aeS-bm<Lj2W5^zarkCyugt<vJVJW=Z!=60Uc#?JlL$
z?~%j-!GGEF0I>Hd0y}`_qa!RHICj0UZAyYm(;_00EH@>X`%6+0`S0z|WaY#sA|m28
z0ud3hQ7r$wc}nK9lk)GYCzrgBcRu}**NtlZ@2`^FxrZ*7P@OK_Gv^4WuhCyvMCbG9
zu@QRTU1jz38G=7<p{o@NyT=#R-Dh8)DMzwjdw&|c+9BTTVv`uJkVn<3*wmrc+Gvx(
zb^~Nfo<X&YXC2koUiiu6i-pu{chHp~WYot`x1yXwp-@>5s}(L|(1{~ks}OsRK^S6;
zhghpkeqyxIyZ!Khmqh4X7HcgOGnjG#Rq*k&#$^QYJS5TB)*8AufZA5n#P}uCEoDDX
zo<rL`YwA0l>W9jPQAVP8n?&(2j;iX1Rc%xbXN~H#%WAB8&##Sqsc>`EPd}XbAE?ij
UbKR<!LjV8(07*qoM6N<$f`wO{82|tP

delta 847
zcmV-V1F-zh2h<0Ul7B5pL_t(IjXjY~Y*bYoN6)?Q&YSNdohc)2X+xN(R0$-aG)597
zL`jSRjjT`;7rMZY5M8=v$;ORgV*=3~5aY+HghZnl0WB>wmQaM~w07vUoteIwd2imk
z_wS;{)!F=V@=K0d`SQ~4RAc>Jzg&7z7xM*eJf}P}Z4yc($$#T`Y6V3DkqB#7NqIdo
z{u)VACv7enztKE9;QI%OV_01WtpRxqKLwrv*nxB494G~G0uD%GoN~8KCQcq@qym1L
z|A%pcI1A39lmY;eP2_SY<H3VP0%Hd?Q6KVIK*4$&HhK_S2xAcSpIAZPf;K3nA!U%D
z1MTjpQI8Y?Hh(&h$-+bxs^gH$pcd<JV-A8I3>08;A5;cmdLC*^NEqUptw^g(dJQY^
z!T~t2ck}A<>Za((L1?VOvwL9Y2rR82PgS9|jGenj*zJ^zw1Ogso`-<~_N(vE^#-b+
z!0-^feH5x=P;bEYA(E+|=v@AVd^SzI(IGDST8G$(oqwYwGxNkhUPq-2wz)=f;d|VT
zS>(_pozKqU?$<CUPmp=*7*XvZ;c^2fM7r_o&AtG7$9AM25&!%<@vT1zuHT_^<~%B&
zBQ6wJ+Wivk^IwyG?J(xOH|WjZM;G%&?e5ib(H9rcgIh=)Kf=c4Yph?LA=x`YZ>^1O
zwke!?hkrN<2+o|_OuFX@0^5iB!^14>KYFdUZBl}ZQz9Y~FV!WO{X-HF`RC0~Wcm0<
zA|m3}0}&CiVI+UOep2Sr6Y}@VCl<XA$DaJaYloHYw^xX7-$fS-s8*Zy>9h2vuF{=f
zKxeb)ks&(YTw&$ZX@cKwqRS<6yG9q(ou^-&E`NryPkS1>(jwYuW8(-fmqk^|*u<e$
zn`o25wgY5KmVUX2XC38Np8LUM^SQ)pw$P;kWZ1_~wxXOvp-^cLs}(L~(6J+3DG_;&
zey@iy9%8LF+4138=hlP$UL2w`X{@!7PhpBVRL;lK8kZ8p^N?6$8>{F}A1Yf><D(Z%
zyGW4!G=65+jH!+})$J+U3sVwC+a!zzag<fJSJp;laMq|+v#3VOcm2xH=L$Dl{`mdr
Ze*vh^m2;tw9bNzc002ovPDHLkV1lnjoZSEb

diff --git a/tests/output/basic/theme/images/icons/linkedin.png b/tests/output/basic/theme/images/icons/linkedin.png
index feb04962bfe2fd712cb5003c8c20b43af4c18201..d29c1201bcb0c278d49f573f9ef95ebfe932fb5b 100644
GIT binary patch
delta 874
zcmV-w1C{*v0)PjQBYy%nP)t-s00000XtV%nvH)we0Bp1bYqSDvv;b|j1Z}kdZ?*t$
zw+L;u2yM0nZnXw(wF7Uq1aGzoZnXt(wgYgr0CBblZ?*t&w*+vu0CKhfa<>O?w*+yx
z0CTqhbhrm|xBzvz1a!FqcDf06xd(T;33s;)cDV|7y9#-^3V(UK4tTl@dAbdGx)6D~
z346Q>d%O;MybpT35_-H7db<*PyAOQ56??oAe7qEXzZ8PM6@tJSfxsMsz#E3bAcevo
zhQc3+!Xb*pB8tN!io+y}!zGKvCX2);jm0dE#x0J<GLgqIlE*TV$TE}2Gn2?gk;plf
z$~u+GIhM&fmVe1QmdZSr$~~9MJekTtn9D(!%s-jSL7B`(n94$$%tD*YM4Ze>oX$_3
z&P$-qPoL0IpwUyI(p93+RHM;WqtaHS(paR_T&B}wrP5ib(q5<3UZ>Sxr`2Al)Ly97
zV5rq$snuqw(`KsHYOK|5uGnj@)^D%YaIe{Lu-9|2*MD=d*>thlbg|lUve<R8+H<no
zb+X!cv)FvK+<Uj$e7D+vx7~ud+k&~?gSp*<x!!=f-GjQ`guCB^z1@Vp-iW;4hrQj3
zz2A($;fulFmB-?i$KsdA<Dkjpq08i=%jKWU<fF~zr_JW4&gZAk=c~@=tIy}D(C4hs
z=d01^t$)+$wAARd)#<j?>bKVFwb$yn*z3L7?7rLWzuWJ^-|oob@6YA&(B<*a=JM9)
z^VjM0*y{D#>-FC4_2%;U|Ns9Oj;1#N0004WQchC<K<3zH0002@Nkl<Z7}Ev8!Ae3w
z6b9h`oSCa$HEflT6=_799wq2;+PCNddXA_??|;xDs6c{R1ybfBwVQayduQg%>H7$m
z<cS!Z0PyCDE(T7F1;Eip$|rW=4~ElMOVCUb8U_C?PrAo$QF&82U(QRra+A?lu~n6l
z|F*e~W=}qT#$Nmyy?kB<Sg+@Y)7!J%*$DD}BN>Nsr_-<d?IR+4Iw&Kr-3E1v(Ca(J
zaAOs@4hbnL#`g~%t+3`46;df`!wI1jPC=nwL8^pQ32W@2YZ~aPG3ZE>rSbCl=$>a!
zT#UcpD5G|76F86FG*L;*?Gy5CNz8~@V3=k75A+&{>?x8{4FCWD07*qoM6N<$f^Ejt
Ar~m)}

delta 350
zcmV-k0iphY2lxVzBYyw^b5ch_0Itp)=>Px#V^B;~MGyc0KZmWH$J$Alx#;uvdbG^e
z=kH&n!$6a@!rkci`}{$ayo$Zj;O+HRp};|mv$WLV^7{O7uFF80y{ypSmBiLho4f!2
z|3HebZLP@V@Az7wzxn$7k-*gO`1*yp(aquNH>hjL00001bbnG#Qvg8b*k%9#00Cl4
zM??UK1szBL000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk_1|=i3(xCzX004nW
zL_t&-({<0$4#FS|1<<0CRVy%Xv>;CX|F0C5;2xYeX_}lgX$wGf`-TVr5tjpQ*#$4m
zuBAiHh{xLP3Ri^q)}<J2jA-UPAQ~Q}c!}{`%Qd)rYcE=<Ec2W;NGbe<r;MWvN}Xhy
wQrmJ}nB&Vi8$(zpD7Ey{f1uv(`XiO$10-V(6Xm>4&j0`b07*qoM6N<$f`s&<#{d8T

diff --git a/tests/output/basic/theme/images/icons/rss.png b/tests/output/basic/theme/images/icons/rss.png
index 7d4e85d981cbecb04b76dab5a234dc4690bd15ab..7862c65afeb66ba9cc7e9576a3a62b850b2e184d 100644
GIT binary patch
delta 745
zcmV<F0v7#%2k!=ul7GlaL_t(I5e30Zh*f0(0O0RG=ggfkXPnV#w1Kig&7ujS0)<@k
zKqA{z;3AN~HWDP%A|l#_#4Kv*GBDiL!l0ngAOeLR)~1IkmN<>(%-Gy<?&I8h?mg%H
zeO~~GUmtnM_}KF{O-yJnZ#QhsN$UG0*%ry<z@WV(I4h*L)PGsS^ke736Ynhri06+l
zsDFCb*c4%uK}kKN8X!eM_d59s=@@yJNPPIjp|t+xqx~UV{KUjA;xw&g1}*YsIydS5
zO>YSq$rgqMYKkaS-FvbSn$Jl_*=W(eMC&poDl`J)JE%~!DK`*EMrc$FSLQO^8wa$m
zGC9wK$0%|-i+>cWv@WxDg^@ApiX=q<AehW_SEdxJ%)Y~}qaq-Hif>=$&o7xCAqD^v
z#6g|deBW*3JH<af5Wjhv3$KZ{FN%m#p8bLc4ze*MAVfk`7nJqHauSVPli#EoF#U+o
z{$BWepLk|Y+_(xHJj={(iarq`sQbjm>|&y~+ElCyQ-AY3ev(6%g(JTUw-+U69u><w
zB#Gg@FDchiMFe$CB9uv}i(t!M)_xE!92WmNC2pSQ=&G{Y6MlRX40pVssE}6TAnFwK
zI{(cku`$y%=nztdx$yHF!l!o&qca9io>2XEnzC(V_9^w`BzdLGqpGA|C0Rn+wz0^j
z?cy_E@qbEgm}IP;SMGdOw~NjdX(KgEX5{O{I!aTrI2>doH`Iu=P<Ir`xL!Xqb@6@0
z$ef97fsI9-W>f60i3vdvDq<LGhw9hUJCjSt7VEq(RMYw~74lVM{X`vV$=p`edSAZQ
zGdj@_vQ)pU{JS_X*nQ~Z0Ofbb-%hTb{BZCON@B9fpol>oYn>itk1VAcp^W5xI@5cu
zZ9A~AKLF(C-r5t&Td&v6>o10~v()W06-6~$6!EUQv9*lprj>4|c_*3L8?xDbpUod$
bI0gR$D~Vu?3V6ai00000NkvXXu0mjfF-~l$

delta 762
zcmV<W0tNl=27m{Ul7HDrL_t(IjZKnEh#XZEhQD*Gx~IoXPj}KzVuOxN5~DbRsE~kJ
z_#lYmMujYdAjC}&4Cq2c+)0pG=rT(olASIhC@6^_LIOTUH$GxQbVxgS%=9=t>F%oP
zx>fhy<DxbAuMQmk@BI86;a};OM;>6N_AJx&I-|9nl*0}t+<%LSXEBX}Vzi2I7Kv^W
z;wr62&dFo%tO|ghKfXlx;caS7kSQn}gc5uKM1Y0#DrD;r)gVhjK_5J^7=@ocI3Tk8
z5%t}mEf}srF@$UllIxKE3FB2D1~Ut#1p-(_e0o<b(tids1%n}sF2e8<IKTr{ftg*C
z*^a;s00C2hs(*)ay%UpOJIL?~G#23gV_-8#x?p<~*yd%Z)F5~;(FE|Hghoud-o*Bx
z{TA##ir(HaiShM|@cZY`s(}8_Yyd5SVcR_$%*>;|y@!7FBwTm}-B?BeC4#3vgZmD_
zpqx-eL6l&@h5DLNDl25yCylorLPp;rpYBJ`bkM<-$$zy&XJKv+*c=oPA>^RdcGocO
z^|4z>a{(Sb35%DIBflaWUCfz>QFjZBp}hMA+!o*!5JCWhI3vLdv-@E4JLJM)^p8{M
zwgoua!=+>7`_};|cRh#oK;+RvNi2+$zuQKub16jv5<!_EKfZ>1d?zwBNAdUx{4b}$
zji|JrAb&I(ka=9Dcn7&Rv4LpBpbOJG(WkzEmoiEdL+?Cp{$<h>NG=mqBT6$zwgnoL
zD1unaA_jAf0BAr$f;BUY^O)xHyVy#H`VN6Xm!#iE(@oTXAczN*+DQD*r{~SZW8IMD
zh;NZ=gk(KxxgkivbhhKSa<a`aQ}rqmN94|PqjOtO>{<L!0Ngjn-!v;H-!J|G9K;R5
zst`1gjKPf|j=)#IDP%b$t-UKd4lW(I{aV?%H};CV`D*B2eO_F$nkId$^=)hQj!@n1
sG@4#dlm0E!+$V8+|0fHFmreov11pJOj6|z4N&o-=07*qoM6N<$g1Rth%K!iX

diff --git a/tests/output/basic/theme/images/icons/twitter.png b/tests/output/basic/theme/images/icons/twitter.png
index d6119280123364c3b37171b9ff0b37c1d67ed2b5..d0ef3cc1b36ab79ac7931c2269b70f3662950a97 100644
GIT binary patch
delta 696
zcmV;p0!RJB2EGQ6l7E*;L_t(I5e30ZYh6_s$Kl_**4q2r(!@lNrnd2t3W}u;lsdE%
zI~MfQIMdJIq_Yl11RW{`5eJ1L*g>HdFQ5%gFKObr@3Z$_>;3yYcI!BQ-Z@vtk;_|^
zz1*Sk!tr26WmpXvvlgk9v@&P8apqm--o=q_*;oJOuB}wPzkg>OM4=Sf#+U(5Bx-{p
zAVDV)UEr|6I9l4TVN>*AT!V)~z?jI`0uF&gcN!OS!6FwnMRbC?j>J0fbfcZnIh6;|
zEAd*2JnG<+zu?;$?8m^cI4`=ww0G9U$$}nu(!;9JaU!bTGUvP*5cp{dKc2$19rz66
z!z$2VG(?WFGk;Ye0l9$TIc3Rr%sC$-0`9M1djS7sm<s-B1CLvHvxfIZk>6dMx^NjG
z5K~vAPQndZKn52A+?~OvYd9(Jtb+;g!y&vqGHw@WidYqPgULIWu`J@Gh_eg{NEse3
z;du+e#HqxIg8|zHjRUAn<BDPdnj#WV911XZxUmHv?SI0vY`i-ZA56r3H`W4*h|+12
z)Ju^?5tk}wyNb*^F%HHT7vW$40AT#-;$9CI5)714(INy>lS^h8jI9{BG64bGL3}rZ
z+e`R<Djv3Q5R6?Dv%b(~$6Ps8iFv^wCRP|%$FOIRC2pR;#*Ccd)ggTS2D}rEpF2RJ
zcTz|(EPp~AaNLR)*|~nsxiS$)t<gC2y|XIt_u6^X!sQ4%IMeLJV8gU3swP0^@VJ5f
zbH<mK#K#jSVeF3rMQ}JY-l}0vVco2Gx~Ujp`zaga1+W*5v)=h_VZ1&vZoDK)DGZWP
z0R{MF<~(Q$XQgJ@iTTE_**DJ@*Z;`z=FpjV+c7U&mkF#0W%*!Js6cKqD@JReow}Mf
ey-r>+yYoLZrHhp#%l(i50000<MNUMnLSTX@0ZY>W

delta 701
zcmV;u0z&=12EzuBl7E~@L_t(IjV+Q(Yh6_wN7sMveeN?&Oay6a8y~5lSn5EjLp!l!
zK|hT%{R~bz>rh0{VWlAAKoG$W3bptEZD{(qO}y`O&pCVle-7gM0Bf?A-8#;nw$9a2
z<nmT!FScm3a6Fh%8P<c0S%cI_TA8!lIP*4h_u^2u?2CVL+kaH5-rX|}qEL!#W6XfZ
z5<P<fAVDh;UEr|6I9l2-VN-N})B_KNfH9V_1snp0?$j>kf<-QDif9GBUL^JcPd3^K
zty6grof5C4$io&s`V+pM!F~)3iu1fJOgm>?oGj>o#~rL{9VeoCTjrcM0|MVq;ky&K
zwgaDFyk7-sjDMQQQFf*ZBp??sJf|%AjydN;M8LfjZ1>^c3{%11P2f=julL}cVdOU#
zCoWt@2*lJDsg-bp29Uvp06)**<26hQJZ)hN+&+XihsK=(brGw=ZZLW4GL}V5ia5=X
zfRy3E5}q{>Oq@te91Pets2xB}8dVevXT}5+hXTwUZhvgS2fOez8*dN9dt-6WjkSOx
zqI8lZby8$e#HGsFt|IeRjDqpmML6j5KgJ&}?sjk?L0=gaEkZEWxnu^x*ouKGV-T<%
z#5XgzvxIM_;z0uk!Pqr1>k3VF%#~A>m=_FUVuf*a1bYTq;^qW4X5<Vn58%t!;H_x<
z(4MW?Ie#gn7#1P+Ic~)B>|8(RTp5d_#;6^-&RG@sYwbL2;Btf=oN0Dqut8cCRb!xa
zcvQpwIpgz7;={3%F!qOmA~+lvZ}ebJVO_6zvZ)wi`zafv1+W*5)6V&IVZ1stZoD8$
zDfE+3aaQKXnRCA`oR%KTR?Ihk&AxiJxc+;NH#P^(*qd(IxJ+P0D9ihsLIrY@Suq*|
j?ewZ?-D&cY*-!rgG^LA`I>-QU00000NkvXXu0mjf)N@7!

diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 2d9cfe74..54b03422 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -4,11 +4,8 @@
         <title>This is a super article !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,36 +19,23 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="this-is-a-super-article.html" rel="bookmark"
            title="Permalink to This is a super article !">This is a super article !</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -59,17 +43,12 @@
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/yeah.html">yeah</a>. </p>
+        <p>In <a href="./category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
-
-
-</footer><!-- /.post-info -->
-      <p>Some content here !</p>
+</footer><!-- /.post-info -->      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
@@ -84,14 +63,10 @@
 
     </div><!-- /.entry-content -->
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -101,8 +76,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index b08103a4..6f2c86ce 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -4,11 +4,8 @@
         <title>Unbelievable !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -22,36 +19,23 @@
 </head>
 
 <body id="index" class="home">
-
         <header id="banner" class="body">
                 <h1><a href=".">A Pelican Blog </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="unbelievable.html" rel="bookmark"
            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -59,28 +43,16 @@
                 Fri 15 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
-                By <a class="url fn" href="./author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
+        <p>In <a href="./category/misc.html">misc</a>. </p>
 
-
-
-</footer><!-- /.post-info -->
-      <p>Or completely awesome. Depends the needs.</p>
+</footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
 
     </div><!-- /.entry-content -->
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
+                        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -90,8 +62,5 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index 6e495efb..aca81bbf 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -4,13 +4,9 @@
         <title>A markdown powered article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,42 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="a-markdown-powered-article.html" rel="bookmark"
            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -67,23 +47,14 @@
                 Wed 20 April 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-      <p>You're mutually oblivious.</p>
+</footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
     </div><!-- /.entry-content -->
-    
-    <div class="comments">
+        <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -96,51 +67,32 @@
       </script>
     </div>
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -150,9 +102,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -162,6 +111,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index fe2ad2c4..5fcca41e 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -4,13 +4,9 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,107 +20,65 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
 <h1>Archives for Alexis' log</h1>
 
 <dl>
-
     <dt>Wed 29 February 2012</dt>
     <dd><a href="./second-article.html">Second article</a></dd>
-
     <dt>Wed 20 April 2011</dt>
     <dd><a href="./a-markdown-powered-article.html">A markdown powered article</a></dd>
-
     <dt>Thu 17 February 2011</dt>
     <dd><a href="./article-1.html">Article 1</a></dd>
-
     <dt>Thu 17 February 2011</dt>
     <dd><a href="./article-2.html">Article 2</a></dd>
-
     <dt>Thu 17 February 2011</dt>
     <dd><a href="./article-3.html">Article 3</a></dd>
-
     <dt>Thu 02 December 2010</dt>
     <dd><a href="./this-is-a-super-article.html">This is a super article !</a></dd>
-
     <dt>Wed 20 October 2010</dt>
     <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
-
     <dt>Fri 15 October 2010</dt>
     <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
-
 </dl>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -134,9 +88,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -146,6 +97,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index e94373a9..85be4fd3 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -4,13 +4,9 @@
         <title>Article 1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,42 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="article-1.html" rel="bookmark"
            title="Permalink to Article 1">Article 1</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -67,24 +47,15 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-      <p>Article 1</p>
+</footer><!-- /.post-info -->      <p>Article 1</p>
 
     </div><!-- /.entry-content -->
-    
-    <div class="comments">
+        <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -97,51 +68,32 @@
       </script>
     </div>
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -151,9 +103,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -163,6 +112,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index f39bb27b..7c00b698 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -4,13 +4,9 @@
         <title>Article 2</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,42 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="article-2.html" rel="bookmark"
            title="Permalink to Article 2">Article 2</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -67,24 +47,15 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-      <p>Article 2</p>
+</footer><!-- /.post-info -->      <p>Article 2</p>
 
     </div><!-- /.entry-content -->
-    
-    <div class="comments">
+        <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -97,51 +68,32 @@
       </script>
     </div>
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -151,9 +103,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -163,6 +112,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index f0cc6c34..42e6e9ca 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -4,13 +4,9 @@
         <title>Article 3</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,42 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="article-3.html" rel="bookmark"
            title="Permalink to Article 3">Article 3</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -67,24 +47,15 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-      <p>Article 3</p>
+</footer><!-- /.post-info -->      <p>Article 3</p>
 
     </div><!-- /.entry-content -->
-    
-    <div class="comments">
+        <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -97,51 +68,32 @@
       </script>
     </div>
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -151,9 +103,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -163,6 +112,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 42b84647..f809217d 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - Alexis Métaireau</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././a-markdown-powered-article.html">A markdown powered article</a></h1> 
                     <footer class="post-info">
@@ -65,37 +44,21 @@
                 Wed 20 April 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
@@ -107,33 +70,20 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 1</p>
+</footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href=".././article-1.html">read more</a>
-                <p>There are <a href=".././article-1.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
@@ -145,33 +95,20 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 2</p>
+</footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href=".././article-2.html">read more</a>
-                <p>There are <a href=".././article-2.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
@@ -183,85 +120,46 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 3</p>
+</footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href=".././article-3.html">read more</a>
-                <p>There are <a href=".././article-3.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-<p class="paginator">
-    
-    Page 1 / 2
-    
-        <a href=".././author/alexis-metaireau2.html">&raquo;</a>
-    
-</p>
-
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+        Page 1 / 2
+            <a href=".././author/alexis-metaireau2.html">&raquo;</a>
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -271,9 +169,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -283,6 +178,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 32b55f6f..459e7bc6 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - Alexis Métaireau</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,44 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-         
-            
-                <section id="content" class="body">
+                 
+                            <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
-            
-            <li><article class="hentry">    
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
@@ -73,25 +51,14 @@
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
+            <a href=".././oh-yeah-fr.html">fr</a>
     
-        <a href=".././oh-yeah-fr.html">fr</a>
-    
-
-
-</footer><!-- /.post-info -->
-                <div class="section" id="why-not">
+</footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
@@ -99,17 +66,12 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href=".././oh-yeah.html">read more</a>
-                <p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
@@ -121,38 +83,22 @@ YEAH !</p>
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article-fr.html">fr</a>
     
-        <a href=".././second-article-fr.html">fr</a>
-    
-
-
-</footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -164,34 +110,21 @@ Translations:
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p class="first last">Multi-line metadata should be supported
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
-                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
@@ -203,87 +136,46 @@ as well as <strong>inline markup</strong>.</p>
                 Fri 15 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Or completely awesome. Depends the needs.</p>
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 
                 <a class="readmore" href=".././unbelievable.html">read more</a>
-                <p>There are <a href=".././unbelievable.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-<p class="paginator">
-    
-        
-            <a href=".././author/alexis-metaireau.html">&laquo;</a>
-        
-    
-    Page 2 / 2
-    
-</p>
-
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+                        <a href=".././author/alexis-metaireau.html">&laquo;</a>
+                Page 2 / 2
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -293,9 +185,6 @@ as well as <strong>inline markup</strong>.</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -305,6 +194,5 @@ as well as <strong>inline markup</strong>.</p>
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/categories.html b/tests/output/custom/categories.html
index bad9dcfd..f7e811d5 100644
--- a/tests/output/custom/categories.html
+++ b/tests/output/custom/categories.html
@@ -4,13 +4,9 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,87 +20,49 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<ul>
-
+        <ul>
     <li><a href="./category/yeah.html">yeah</a></li>
-
     <li><a href="./category/misc.html">misc</a></li>
-
     <li><a href="./category/cat1.html">cat1</a></li>
-
     <li><a href="./category/bar.html">bar</a></li>
-
 </ul>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -114,9 +72,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -126,6 +81,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index 87263d13..709b4ee8 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li class="active"><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
@@ -65,93 +44,50 @@
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
+            <a href=".././oh-yeah-fr.html">fr</a>
     
-        <a href=".././oh-yeah-fr.html">fr</a>
-    
-
-
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-                    
-<p class="paginator">
-    
-    Page 1 / 1
-    
-</p>
-
-                
-            </aside><!-- /#featured -->
-            
-        
-        
-        
-            </ol><!-- /#posts-list -->
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
+                                    <p class="paginator">
+        Page 1 / 1
+    </p>
+                            </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -161,9 +97,6 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -173,6 +106,5 @@ YEAH !</p>
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index af5ad56c..383a8cbf 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - cat1</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li class="active"><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li class="active"><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././a-markdown-powered-article.html">A markdown powered article</a></h1> 
                     <footer class="post-info">
@@ -65,37 +44,21 @@
                 Wed 20 April 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
@@ -107,33 +70,20 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 1</p>
+</footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href=".././article-1.html">read more</a>
-                <p>There are <a href=".././article-1.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
@@ -145,33 +95,20 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 2</p>
+</footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href=".././article-2.html">read more</a>
-                <p>There are <a href=".././article-2.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
@@ -183,83 +120,45 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 3</p>
+</footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href=".././article-3.html">read more</a>
-                <p>There are <a href=".././article-3.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-<p class="paginator">
-    
-    Page 1 / 1
-    
-</p>
-
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+        Page 1 / 1
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -269,9 +168,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -281,6 +177,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index 90948668..d01c8b2d 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - misc</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li class="active"><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li class="active"><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
                     <footer class="post-info">
@@ -65,43 +44,24 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article-fr.html">fr</a>
     
-        <a href=".././second-article-fr.html">fr</a>
-    
-
-
 </footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
@@ -113,83 +73,45 @@ Translations:
                 Fri 15 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Or completely awesome. Depends the needs.</p>
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 
                 <a class="readmore" href=".././unbelievable.html">read more</a>
-                <p>There are <a href=".././unbelievable.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-<p class="paginator">
-    
-    Page 1 / 1
-    
-</p>
-
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+        Page 1 / 1
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -199,9 +121,6 @@ Translations:
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -211,6 +130,5 @@ Translations:
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index a848c4a4..af7f0ba2 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li class="active"><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li class="active"><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
                     <footer class="post-info">
@@ -65,18 +44,11 @@
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
-
-
-
-
-
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -89,70 +61,37 @@
 </pre>
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
-<p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-                    
-<p class="paginator">
-    
-    Page 1 / 1
-    
-</p>
-
-                
-            </aside><!-- /#featured -->
-            
-        
-        
-        
-            </ol><!-- /#posts-list -->
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+<p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
+                                    <p class="paginator">
+        Page 1 / 1
+    </p>
+                            </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -162,9 +101,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -174,6 +110,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index bcfd1243..0c4244eb 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -4,13 +4,9 @@
         <title>A draft article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,42 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li class="active"><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li class="active"><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="a-draft-article.html" rel="bookmark"
            title="Permalink to A draft article">A draft article</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -67,25 +47,16 @@
                 Fri 02 March 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-      <p>This is a draft article, it should live under the /drafts/ folder and not be
+</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
 listed anywhere else.</p>
 
     </div><!-- /.entry-content -->
-    
-    <div class="comments">
+        <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -98,51 +69,32 @@ listed anywhere else.</p>
       </script>
     </div>
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -152,9 +104,6 @@ listed anywhere else.</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -164,6 +113,5 @@ listed anywhere else.</p>
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index 3bcea824..5d95c9d0 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -4,13 +4,9 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="./second-article.html">Second article</a></h1> 
                     <footer class="post-info">
@@ -65,43 +44,24 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
+            <a href="./second-article-fr.html">fr</a>
     
-        <a href="./second-article-fr.html">fr</a>
-    
-
-
 </footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+<p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./a-markdown-powered-article.html" rel="bookmark"
                            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
@@ -113,32 +73,19 @@ Translations:
                 Wed 20 April 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>You're mutually oblivious.</p>
+</footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
-                <p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
@@ -150,33 +97,20 @@ Translations:
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 1</p>
+</footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="./article-1.html">read more</a>
-                <p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
@@ -188,85 +122,46 @@ Translations:
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 2</p>
+</footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="./article-2.html">read more</a>
-                <p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-<p class="paginator">
-    
-    Page 1 / 2
-    
-        <a href="./index2.html">&raquo;</a>
-    
-</p>
-
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+        Page 1 / 2
+            <a href="./index2.html">&raquo;</a>
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -276,9 +171,6 @@ Translations:
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -288,6 +180,5 @@ Translations:
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index bba153f4..481819a8 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -4,13 +4,9 @@
         <title>Alexis' log</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,44 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-         
-            
-                <section id="content" class="body">
+                 
+                            <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
-            
-            <li><article class="hentry">    
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
@@ -73,33 +51,20 @@
                 Thu 17 February 2011
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 3</p>
+</footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="./article-3.html">read more</a>
-                <p>There are <a href="./article-3.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href="./article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -111,34 +76,21 @@
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/yeah.html">yeah</a>. </p>
+        <p>In <a href="./category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p class="first last">Multi-line metadata should be supported
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="./this-is-a-super-article.html">read more</a>
-                <p>There are <a href="./this-is-a-super-article.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href="./this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
@@ -150,25 +102,14 @@ as well as <strong>inline markup</strong>.</p>
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href="./category/bar.html">bar</a>. </p>
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: 
+            <a href="./oh-yeah-fr.html">fr</a>
     
-        <a href="./oh-yeah-fr.html">fr</a>
-    
-
-
-</footer><!-- /.post-info -->
-                <div class="section" id="why-not">
+</footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
@@ -176,17 +117,12 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="./oh-yeah.html">read more</a>
-                <p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href="./unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
@@ -198,87 +134,46 @@ YEAH !</p>
                 Fri 15 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
+        <p>In <a href="./category/misc.html">misc</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p>Or completely awesome. Depends the needs.</p>
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 
                 <a class="readmore" href="./unbelievable.html">read more</a>
-                <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-<p class="paginator">
-    
-        
-            <a href="./index.html">&laquo;</a>
-        
-    
-    Page 2 / 2
-    
-</p>
-
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+                        <a href="./index.html">&laquo;</a>
+                Page 2 / 2
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -288,9 +183,6 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -300,6 +192,5 @@ YEAH !</p>
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index ddc17b30..e9be2020 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -4,13 +4,9 @@
         <title>Trop bien !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,42 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="oh-yeah-fr.html" rel="bookmark"
            title="Permalink to Trop bien !">Trop bien !</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -67,29 +47,17 @@
                 Fri 02 March 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
-
-
-
-
-
+        <p>In <a href="./category/misc.html">misc</a>. </p>
 Translations: 
+            <a href="./oh-yeah.html">en</a>
     
-        <a href="./oh-yeah.html">en</a>
-    
-
-
-</footer><!-- /.post-info -->
-      <p>Et voila du contenu en français</p>
+</footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
 
     </div><!-- /.entry-content -->
-    
-    <div class="comments">
+        <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -102,51 +70,32 @@ Translations:
       </script>
     </div>
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -156,9 +105,6 @@ Translations:
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -168,6 +114,5 @@ Translations:
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index a48044ab..e0c37caa 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -4,13 +4,9 @@
         <title>Oh yeah !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,42 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li class="active"><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="oh-yeah.html" rel="bookmark"
            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -67,25 +47,14 @@
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href="./category/bar.html">bar</a>. </p>
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: 
+            <a href="./oh-yeah-fr.html">fr</a>
     
-        <a href="./oh-yeah-fr.html">fr</a>
-    
-
-
-</footer><!-- /.post-info -->
-      <div class="section" id="why-not">
+</footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
@@ -93,8 +62,7 @@ YEAH !</p>
 </div>
 
     </div><!-- /.entry-content -->
-    
-    <div class="comments">
+        <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -107,51 +75,32 @@ YEAH !</p>
       </script>
     </div>
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -161,9 +110,6 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -173,6 +119,5 @@ YEAH !</p>
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 2b489963..500011e0 100644
--- a/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -4,13 +4,9 @@
         <title>This is a test hidden page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,87 +20,51 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test hidden page</h1>
-    
-    
-
-
-    
-    <p>This is great for things like error(404) pages
+        
+        <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -114,9 +74,6 @@ Anyone can see this page but it's not linked to anywhere!</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -126,6 +83,5 @@ Anyone can see this page but it's not linked to anywhere!</p>
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index 7d74011d..81c2bffb 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -4,13 +4,9 @@
         <title>This is a test page</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,87 +20,51 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test page</h1>
-    
-    
-
-
-    
-    <p>Just an image.</p>
+        
+        <p>Just an image.</p>
 <img alt="alternate text" src="../static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -114,9 +74,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -126,6 +83,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index cd1ee194..b71b9244 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -4,13 +4,9 @@
         <title>Deuxième article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,42 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="second-article-fr.html" rel="bookmark"
            title="Permalink to Deuxième article">Deuxième article</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -67,29 +47,17 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
+            <a href="./second-article.html">en</a>
     
-        <a href="./second-article.html">en</a>
-    
-
-
-</footer><!-- /.post-info -->
-      <p>Ceci est un article, en français.</p>
+</footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
     </div><!-- /.entry-content -->
-    
-    <div class="comments">
+        <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -102,51 +70,32 @@ Translations:
       </script>
     </div>
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -156,9 +105,6 @@ Translations:
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -168,6 +114,5 @@ Translations:
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index ebabacc3..52872f27 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -4,13 +4,9 @@
         <title>Second article</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,42 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="second-article.html" rel="bookmark"
            title="Permalink to Second article">Second article</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -67,29 +47,17 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
+            <a href="./second-article-fr.html">fr</a>
     
-        <a href="./second-article-fr.html">fr</a>
-    
-
-
-</footer><!-- /.post-info -->
-      <p>This is some article, in english</p>
+</footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
     </div><!-- /.entry-content -->
-    
-    <div class="comments">
+        <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -102,51 +70,32 @@ Translations:
       </script>
     </div>
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -156,9 +105,6 @@ Translations:
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -168,6 +114,5 @@ Translations:
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index b9ef8402..8b478d55 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - bar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
@@ -65,43 +44,24 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article.html">en</a>
     
-        <a href=".././second-article.html">en</a>
-    
-
-
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
@@ -113,38 +73,22 @@ Translations:
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article-fr.html">fr</a>
     
-        <a href=".././second-article-fr.html">fr</a>
-    
-
-
-</footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -156,34 +100,21 @@ Translations:
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p class="first last">Multi-line metadata should be supported
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
-                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
@@ -195,25 +126,14 @@ as well as <strong>inline markup</strong>.</p>
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
+            <a href=".././oh-yeah-fr.html">fr</a>
     
-        <a href=".././oh-yeah-fr.html">fr</a>
-    
-
-
-</footer><!-- /.post-info -->
-                <div class="section" id="why-not">
+</footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
@@ -221,67 +141,37 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href=".././oh-yeah.html">read more</a>
-                <p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-<p class="paginator">
-    
-    Page 1 / 1
-    
-</p>
-
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+        Page 1 / 1
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -291,9 +181,6 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -303,6 +190,5 @@ YEAH !</p>
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index 29c1fae9..02f55ddb 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - baz</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
@@ -65,43 +44,24 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article.html">en</a>
     
-        <a href=".././second-article.html">en</a>
-    
-
-
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
@@ -113,88 +73,47 @@ Translations:
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article-fr.html">fr</a>
     
-        <a href=".././second-article-fr.html">fr</a>
-    
-
-
-</footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-<p class="paginator">
-    
-    Page 1 / 1
-    
-</p>
-
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+        Page 1 / 1
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -204,9 +123,6 @@ Translations:
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -216,6 +132,5 @@ Translations:
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index 04415b2c..9e84459a 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - foo</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
@@ -65,43 +44,24 @@
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article.html">en</a>
     
-        <a href=".././second-article.html">en</a>
-    
-
-
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
+<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
+                                                
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
@@ -113,38 +73,22 @@ Translations:
                 Wed 29 February 2012
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/misc.html">misc</a>. </p>
+<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
+            <a href=".././second-article-fr.html">fr</a>
     
-        <a href=".././second-article-fr.html">fr</a>
-    
-
-
-</footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            
+                            
 
-        
-         
-            
-            <li><article class="hentry">    
+                 
+                        <li><article class="hentry">    
                 <header>
                     <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -156,84 +100,46 @@ Translations:
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
-
-
-
-
-
-</footer><!-- /.post-info -->
-                <p class="first last">Multi-line metadata should be supported
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
-                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
-                </div><!-- /.entry-content -->
+                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-<p class="paginator">
-    
-    Page 1 / 1
-    
-</p>
-
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+        Page 1 / 1
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -243,9 +149,6 @@ as well as <strong>inline markup</strong>.</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -255,6 +158,5 @@ as well as <strong>inline markup</strong>.</p>
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index 38c4c61e..28d250e6 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - foobar</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
                     <footer class="post-info">
@@ -65,18 +44,11 @@
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/yeah.html">yeah</a>. </p>
+        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
 <p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
-
-
-
-
-
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -89,70 +61,37 @@
 </pre>
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
-<p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-                    
-<p class="paginator">
-    
-    Page 1 / 1
-    
-</p>
-
-                
-            </aside><!-- /#featured -->
-            
-        
-        
-        
-            </ol><!-- /#posts-list -->
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+<p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
+                                    <p class="paginator">
+        Page 1 / 1
+    </p>
+                            </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -162,9 +101,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -174,6 +110,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index 498b3fde..4894ff3a 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - oh</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
@@ -65,93 +44,50 @@
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
+            <a href=".././oh-yeah-fr.html">fr</a>
     
-        <a href=".././oh-yeah-fr.html">fr</a>
-    
-
-
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-                    
-<p class="paginator">
-    
-    Page 1 / 1
-    
-</p>
-
-                
-            </aside><!-- /#featured -->
-            
-        
-        
-        
-            </ol><!-- /#posts-list -->
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
+                                    <p class="paginator">
+        Page 1 / 1
+    </p>
+                            </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -161,9 +97,6 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -173,6 +106,5 @@ YEAH !</p>
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index 16d325f2..36f40b4e 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -4,13 +4,9 @@
         <title>Alexis' log - yeah</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,40 +20,23 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href="../.">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                    <li ><a href=".././category/misc.html">misc</a></li>
+                                    <li ><a href=".././category/cat1.html">cat1</a></li>
+                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
                 
-
             
 
-        
-        
-            <aside id="featured" class="body">
+                            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
@@ -65,93 +44,50 @@
                 Wed 20 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
-
-
-
-
-Translations: 
+        <p>In <a href=".././category/bar.html">bar</a>. </p>
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
+            <a href=".././oh-yeah-fr.html">fr</a>
     
-        <a href=".././oh-yeah-fr.html">fr</a>
-    
-
-
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>
-                </article>
-                
-                    
-<p class="paginator">
-    
-    Page 1 / 1
-    
-</p>
-
-                
-            </aside><!-- /#featured -->
-            
-        
-        
-        
-            </ol><!-- /#posts-list -->
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-                <div class="blogroll">
+<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
+                                    <p class="paginator">
+        Page 1 / 1
+    </p>
+                            </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -161,9 +97,6 @@ YEAH !</p>
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -173,6 +106,5 @@ YEAH !</p>
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 8d024437..e931d0a0 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -4,13 +4,9 @@
         <title>This is a super article !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,42 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li ><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="this-is-a-super-article.html" rel="bookmark"
            title="Permalink to This is a super article !">This is a super article !</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -67,20 +47,12 @@
                 Thu 02 December 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/yeah.html">yeah</a>. </p>
+        <p>In <a href="./category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
-
-
-
-
-
-</footer><!-- /.post-info -->
-      <p>Some content here !</p>
+</footer><!-- /.post-info -->      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
@@ -94,8 +66,7 @@
 </div>
 
     </div><!-- /.entry-content -->
-    
-    <div class="comments">
+        <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -108,51 +79,32 @@
       </script>
     </div>
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -162,9 +114,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -174,6 +123,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index 1a1b0788..fa03883d 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -4,13 +4,9 @@
         <title>Unbelievable !</title>
         <meta charset="utf-8" />
         <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        
-        
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
-
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
@@ -24,42 +20,26 @@
 </head>
 
 <body id="index" class="home">
-
 <a href="http://github.com/ametaireau/">
-
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-
 </a>
-
         <header id="banner" class="body">
                 <h1><a href=".">Alexis' log </a></h1>
                 <nav><ul>
-                
-                
-                
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href="./category/yeah.html">yeah</a></li>
-                
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                
-                    <li ><a href="./category/cat1.html">cat1</a></li>
-                
-                    <li ><a href="./category/bar.html">bar</a></li>
-                
-                </ul></nav>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
         </header><!-- /#banner -->
-        
-<section id="content" class="body">
+        <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="unbelievable.html" rel="bookmark"
            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-      
-    </header>
+          </header>
 
     <div class="entry-content">
       <footer class="post-info">
@@ -67,24 +47,15 @@
                 Fri 15 October 2010
         </abbr>
 
-        
-        <address class="vcard author">
+                <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        
-<p>In <a href="./category/misc.html">misc</a>. </p>
+        <p>In <a href="./category/misc.html">misc</a>. </p>
 
-
-
-
-
-
-</footer><!-- /.post-info -->
-      <p>Or completely awesome. Depends the needs.</p>
+</footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
 
     </div><!-- /.entry-content -->
-    
-    <div class="comments">
+        <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -97,51 +68,32 @@
       </script>
     </div>
     
-
   </article>
 </section>
-
         <section id="extras" class="body">
-        
-                <div class="blogroll">
+                        <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                        
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                        
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                        
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                        
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                        
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
                 </div><!-- /.blogroll -->
-        
-        
-                <div class="social">
+                                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-
-                        
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                        
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                        
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        
-                        </ul>
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
                 </div><!-- /.social -->
-        
-        </section><!-- /#extras -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
@@ -151,9 +103,6 @@
                 <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
-
-
-
 <script type="text/javascript">
     var disqus_shortname = 'blog-notmyidea';
     (function () {
@@ -163,6 +112,5 @@
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
-
 </body>
 </html>
\ No newline at end of file

From 816e8d88e0b6622cf7eb7d4a9357e22dbaff12f2 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Thu, 22 Nov 2012 13:22:49 +0100
Subject: [PATCH 1017/2864] Change webasset tests organization to avoid running
 pelican twice for each test.

As setUp is run for each test, the previous implementation was running pelican
twice (once for relative urls and once for absolute) for each test, which was not
really optimal :-).

Solution: make a base class which is inherated by a class for relative urls and
another for absolute urls.
---
 tests/test_webassets.py | 85 ++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/tests/test_webassets.py b/tests/test_webassets.py
index e47e7f81..52a7fa17 100644
--- a/tests/test_webassets.py
+++ b/tests/test_webassets.py
@@ -11,48 +11,47 @@ from pelican.settings import read_settings
 from .support import unittest, skipIfNoExecutable, module_exists
 
 CUR_DIR = os.path.dirname(__file__)
+THEME_DIR = os.path.join(CUR_DIR, 'themes', 'assets')
+CSS_REF = open(os.path.join(THEME_DIR, 'static', 'css',
+                            'style.min.css')).read()
+CSS_HASH = hashlib.md5(CSS_REF).hexdigest()[0:8]
 
 
 @unittest.skipUnless(module_exists('webassets'), "webassets isn't installed")
 @skipIfNoExecutable(['scss', '-v'])
 @skipIfNoExecutable(['cssmin', '--version'])
 class TestWebAssets(unittest.TestCase):
+    """Base class for testing webassets."""
 
-    def setUp(self):
-        """Run pelican with two settings (absolute and relative urls)."""
-
-        self.theme_dir = os.path.join(CUR_DIR, 'themes', 'assets')
-
+    def setUp(self, override=None):
         self.temp_path = mkdtemp()
-        self.settings = read_settings(override={
+        settings = {
             'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
             'OUTPUT_PATH': self.temp_path,
             'PLUGINS': ['pelican.plugins.assets', ],
-            'THEME': self.theme_dir,
-        })
+            'THEME': THEME_DIR,
+        }
+        if override:
+            settings.update(override)
+
+        self.settings = read_settings(override=settings)
         pelican = Pelican(settings=self.settings)
         pelican.run()
 
-        # run Pelican a second time with absolute urls
-        self.temp_path2 = mkdtemp()
-        self.settings2 = read_settings(override={
-            'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
-            'OUTPUT_PATH': self.temp_path2,
-            'PLUGINS': ['pelican.plugins.assets', ],
-            'THEME': self.theme_dir,
-            'RELATIVE_URLS': False,
-            'SITEURL': 'http://localhost'
-        })
-        pelican2 = Pelican(settings=self.settings2)
-        pelican2.run()
-
-        self.css_ref = open(os.path.join(self.theme_dir, 'static', 'css',
-                                         'style.min.css')).read()
-        self.version = hashlib.md5(self.css_ref).hexdigest()[0:8]
-
     def tearDown(self):
         rmtree(self.temp_path)
-        rmtree(self.temp_path2)
+
+    def check_link_tag(self, css_file, html_file):
+        """Check the presence of `css_file` in `html_file`."""
+
+        link_tag = '<link rel="stylesheet" href="{css_file}">'.\
+                   format(css_file=css_file)
+        html = open(html_file).read()
+        self.assertRegexpMatches(html, link_tag)
+
+
+class TestWebAssetsRelativeURLS(TestWebAssets):
+    """Test pelican with relative urls."""
 
     def test_jinja2_ext(self):
         """Test that the Jinja2 extension was correctly added."""
@@ -64,39 +63,39 @@ class TestWebAssets(unittest.TestCase):
         """Compare the compiled css with the reference."""
 
         gen_file = os.path.join(self.temp_path, 'theme', 'gen',
-                                'style.{0}.min.css'.format(self.version))
-
+                                'style.{0}.min.css'.format(CSS_HASH))
         self.assertTrue(os.path.isfile(gen_file))
+
         css_new = open(gen_file).read()
-        self.assertEqual(css_new, self.css_ref)
-
-    def check_link_tag(self, css_file, html_file):
-        """Check the presence of `css_file` in `html_file`."""
-
-        link_tag = '<link rel="stylesheet" href="{css_file}">'.\
-                   format(css_file=css_file)
-        html = open(html_file).read()
-        self.assertRegexpMatches(html, link_tag)
+        self.assertEqual(css_new, CSS_REF)
 
     def test_template(self):
-        """Look in the output index.html file for the link tag."""
+        """Look in the output files for the link tag."""
 
-        css_file = './theme/gen/style.{0}.min.css'.format(self.version)
+        css_file = './theme/gen/style.{0}.min.css'.format(CSS_HASH)
         html_files = ['index.html', 'archives.html',
                       'this-is-an-article-with-category.html']
         for f in html_files:
             self.check_link_tag(css_file, os.path.join(self.temp_path, f))
 
         self.check_link_tag(
-            '.././theme/gen/style.{0}.min.css'.format(self.version),
+            '.././theme/gen/style.{0}.min.css'.format(CSS_HASH),
             os.path.join(self.temp_path, 'category/misc.html'))
 
+
+class TestWebAssetsAbsoluteURLS(TestWebAssets):
+    """Test pelican with absolute urls."""
+
+    def setUp(self):
+        TestWebAssets.setUp(self, override={'RELATIVE_URLS': False,
+                                            'SITEURL': 'http://localhost'})
+
     def test_absolute_url(self):
-        """Look in the output index.html file for the link tag with abs url."""
+        """Look in the output files for the link tag with absolute url."""
 
         css_file = 'http://localhost/theme/gen/style.{0}.min.css'.\
-                   format(self.version)
+                   format(CSS_HASH)
         html_files = ['index.html', 'archives.html',
                       'this-is-an-article-with-category.html']
         for f in html_files:
-            self.check_link_tag(css_file, os.path.join(self.temp_path2, f))
+            self.check_link_tag(css_file, os.path.join(self.temp_path, f))

From 5fd6eac47723a5fbc286778167dd673a013a438a Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 23 Nov 2012 15:38:41 +0100
Subject: [PATCH 1018/2864] update changelog (new webassets plugin)

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3d1786bf..abf323c8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -17,6 +17,8 @@ Release history
 * Allow for blank author: if ``AUTHOR`` setting is not set, author won't
   default to ``${USER}`` anymore and a post won't contain any author
   information if the post author is empty.
+* LESS and Webassets support removed from Pelican core in favor of a Webassets
+  plugin.
 
 3.0 (2012-08-08)
 ==================

From 1c44f49d1b927fce9a3c4d3129e7bd85319fcd40 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 23 Nov 2012 15:50:54 +0100
Subject: [PATCH 1019/2864] remove importlib dependency

importlib is only available for python >= 2.7
---
 tests/support.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 52a410ff..5b63eeba 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -4,7 +4,6 @@ __all__ = [
 ]
 
 import cStringIO
-import importlib
 import os
 import re
 import subprocess
@@ -145,7 +144,7 @@ def module_exists(module_name):
     """Test if a module is importable."""
 
     try:
-        importlib.import_module(module_name)
+        __import__(module_name)
     except ImportError:
         return False
     else:

From a6f328516a8ac6486fdcfbc00b65eca7868e1990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Pievil=C3=A4inen?= <tomi.pievilainen@iki.fi>
Date: Sat, 24 Nov 2012 13:18:49 +0200
Subject: [PATCH 1020/2864] Metadata parity for RST/MD, document summary.

---
 docs/getting_started.rst | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 09840e8a..9dc6ab59 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -153,7 +153,9 @@ following syntax (give your file the ``.rst`` extension)::
     :date: 2010-10-03 10:20
     :tags: thats, awesome
     :category: yeah
+    :slug: my-super-post
     :author: Alexis Metaireau
+    :summary: Short version for index and feeds
 
 Pelican implements an extension of reStructuredText to enable support for the
 ``abbr`` HTML tag. To use it, write something like this in your post::
@@ -165,10 +167,13 @@ Markdown generation will not work until you explicitly install the ``Markdown``
 package, which can be done via ``pip install Markdown``. Metadata syntax for
 Markdown posts should follow this pattern::
 
-    Date: 2010-12-03
     Title: My super title
+    Date: 2010-12-03 10:20
     Tags: thats, awesome
+    Category: yeah
     Slug: my-super-post
+    Author: Alexis Metaireau
+    Summary: Short version for index and feeds
 
     This is the content of my super blog post.
 
@@ -178,7 +183,9 @@ category can be determined by the directory in which the file resides. For
 example, a file located at ``python/foobar/myfoobar.rst`` will have a category of
 ``foobar``. If you would like to organize your files in other ways where the
 name of the subfolder would not be a good category name, you can set the
-setting ``USE_FOLDER_AS_CATEGORY`` to ``False``.
+setting ``USE_FOLDER_AS_CATEGORY`` to ``False``. If summary isn't given, setting
+``SUMMARY_MAX_LENGTH`` determines how many words from the beginning of an article
+are used as the summary.
 
 Generate your blog
 ------------------

From 4de668159dfb5afd18532ad8a08f75953d1d36d3 Mon Sep 17 00:00:00 2001
From: Michael Reneer <michaelreneer@gmail.com>
Date: Mon, 26 Nov 2012 11:26:33 -0500
Subject: [PATCH 1021/2864] Update docs/settings.rst

Updated the documentation for the MARKUP setting to reflect the current supported markup file extensions.
---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index ba9a7a69..eb88233e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -60,9 +60,9 @@ Setting name (default value)                                            What doe
                                                                         here or a single string representing one locale.
                                                                         When providing a list, all the locales will be tried
                                                                         until one works.
-`MARKUP` (``('rst', 'md')``)                                            A list of available markup languages you want
+`MARKUP` (``('rst', 'md', 'markdown', 'mkd')``)                         A list of available markup languages you want
                                                                         to use. For the moment, the only available values
-                                                                        are `rst` and `md`.
+                                                                        are `rst`, `md`, `markdown`, and `mkd`.
 `MD_EXTENSIONS` (``['codehilite','extra']``)                            A list of the extensions that the Markdown processor
                                                                         will use. Refer to the extensions chapter in the
                                                                         Python-Markdown documentation for a complete list of

From 103ae436c9f404e2d25cf9deab7ab2476e9f2f84 Mon Sep 17 00:00:00 2001
From: Michael Reneer <michaelreneer@gmail.com>
Date: Mon, 26 Nov 2012 13:03:25 -0500
Subject: [PATCH 1022/2864] Update docs/settings.rst

Updated commit based on the discussion in the pull request.
---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index eb88233e..be091596 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -60,9 +60,9 @@ Setting name (default value)                                            What doe
                                                                         here or a single string representing one locale.
                                                                         When providing a list, all the locales will be tried
                                                                         until one works.
-`MARKUP` (``('rst', 'md', 'markdown', 'mkd')``)                         A list of available markup languages you want
+`MARKUP` (``('rst', 'md')``)                                            A list of available markup languages you want
                                                                         to use. For the moment, the only available values
-                                                                        are `rst`, `md`, `markdown`, and `mkd`.
+                                                                        are `rst`, `md`, `markdown`, `mkd`, `html`, and `htm`.
 `MD_EXTENSIONS` (``['codehilite','extra']``)                            A list of the extensions that the Markdown processor
                                                                         will use. Refer to the extensions chapter in the
                                                                         Python-Markdown documentation for a complete list of

From fa82e19c1ffa18bfb5e03a8311727a022525c53f Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 24 Nov 2012 00:26:46 +0100
Subject: [PATCH 1023/2864] change default value for DEFAULT_DATE to None

(was 'fs' => guess from file mtime)
---
 docs/settings.rst     | 2 +-
 pelican/generators.py | 2 +-
 pelican/settings.py   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index be091596..a7cf107b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -43,7 +43,7 @@ Setting name (default value)                                            What doe
 `DISPLAY_PAGES_ON_MENU` (``True``)                                      Whether to display pages on the menu of the
                                                                         template. Templates may or not honor this
                                                                         setting.
-`DEFAULT_DATE` (``fs``)                                                 The default date you want to use.
+`DEFAULT_DATE` (``None``)                                               The default date you want to use.
                                                                         If 'fs', Pelican will use the file system
                                                                         timestamp information (mtime) if it can't get
                                                                         date information from the metadata.
diff --git a/pelican/generators.py b/pelican/generators.py
index b1d9ec12..020a3711 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -331,7 +331,7 @@ class ArticlesGenerator(Generator):
                 if category != '':
                     metadata['category'] = Category(category, self.settings)
 
-            if 'date' not in metadata and self.settings['DEFAULT_DATE']:
+            if 'date' not in metadata and self.settings.get('DEFAULT_DATE'):
                 if self.settings['DEFAULT_DATE'] == 'fs':
                     metadata['date'] = datetime.datetime.fromtimestamp(
                             os.stat(f).st_ctime)
diff --git a/pelican/settings.py b/pelican/settings.py
index 49879f84..d2c0cef5 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -36,7 +36,6 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'OUTPUT_SOURCES_EXTENSION': '.text',
                    'USE_FOLDER_AS_CATEGORY': True,
                    'DEFAULT_CATEGORY': 'misc',
-                   'DEFAULT_DATE': 'fs',
                    'WITH_FUTURE_DATES': True,
                    'CSS_FILE': 'main.css',
                    'NEWEST_FIRST_ARCHIVES': True,

From 4d6ddd0af3775c992fed642153c0cb96c66fed23 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 24 Nov 2012 00:41:25 +0100
Subject: [PATCH 1024/2864] fix failing tests

---
 tests/content/TestCategory/article_with_category.rst | 1 +
 tests/test_generators.py                             | 3 +++
 tests/test_webassets.py                              | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/content/TestCategory/article_with_category.rst b/tests/content/TestCategory/article_with_category.rst
index 7ed6e6d1..69ffa98b 100644
--- a/tests/content/TestCategory/article_with_category.rst
+++ b/tests/content/TestCategory/article_with_category.rst
@@ -2,5 +2,6 @@ This is an article with category !
 ##################################
 
 :category: yeah
+:date: 1970-01-01
 
 This article should be in 'yeah' category.
diff --git a/tests/test_generators.py b/tests/test_generators.py
index ba7ff240..f8f6a3f4 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -31,6 +31,7 @@ class TestArticlesGenerator(unittest.TestCase):
             settings = _DEFAULT_CONFIG.copy()
             settings['ARTICLE_DIR'] = 'content'
             settings['DEFAULT_CATEGORY'] = 'Default'
+            settings['DEFAULT_DATE'] = (1970, 01, 01)
             self.generator = ArticlesGenerator(settings.copy(), settings,
                                 CUR_DIR, _DEFAULT_CONFIG['THEME'], None,
                                 _DEFAULT_CONFIG['MARKUP'])
@@ -93,6 +94,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = _DEFAULT_CONFIG.copy()
         settings['ARTICLE_DIR'] = 'content'
         settings['DEFAULT_CATEGORY'] = 'Default'
+        settings['DEFAULT_DATE'] = (1970, 01, 01)
         settings['USE_FOLDER_AS_CATEGORY'] = False
         generator = ArticlesGenerator(settings.copy(), settings,
                             CUR_DIR, _DEFAULT_CONFIG['THEME'], None,
@@ -175,6 +177,7 @@ class TestPageGenerator(unittest.TestCase):
         settings = _DEFAULT_CONFIG.copy()
 
         settings['PAGE_DIR'] = 'TestPages'
+        settings['DEFAULT_DATE'] = (1970, 01, 01)
         generator = PagesGenerator(settings.copy(), settings, CUR_DIR,
                                       _DEFAULT_CONFIG['THEME'], None,
                                       _DEFAULT_CONFIG['MARKUP'])
diff --git a/tests/test_webassets.py b/tests/test_webassets.py
index 52a7fa17..afe1674d 100644
--- a/tests/test_webassets.py
+++ b/tests/test_webassets.py
@@ -80,7 +80,7 @@ class TestWebAssetsRelativeURLS(TestWebAssets):
 
         self.check_link_tag(
             '.././theme/gen/style.{0}.min.css'.format(CSS_HASH),
-            os.path.join(self.temp_path, 'category/misc.html'))
+            os.path.join(self.temp_path, 'category/yeah.html'))
 
 
 class TestWebAssetsAbsoluteURLS(TestWebAssets):

From 080c884c1ad52587ccff7d742422625c06e3a8a1 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 24 Nov 2012 00:46:03 +0100
Subject: [PATCH 1025/2864] restore test_basic_generation_works functional test

---
 tests/test_pelican.py | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 762663d2..39c820c8 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -62,22 +62,17 @@ class TestPelican(unittest.TestCase):
         self.assertEqual(diff['right_only'], [], msg=msg)
         self.assertEqual(diff['diff_files'], [], msg=msg)
 
-    @unittest.skip("Test failing")
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
-        # ones and generate the output without raising any exception / issuing
-        # any warning.
-        with patch("pelican.contents.getenv") as mock_getenv:
-            # force getenv('USER') to always return the same value
-            mock_getenv.return_value = "Dummy Author"
-            settings = read_settings(filename=None, override={
-                'PATH': INPUT_PATH,
-                'OUTPUT_PATH': self.temp_path,
-                })
-            pelican = Pelican(settings=settings)
-            pelican.run()
-            dcmp = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
-            self.assertFilesEqual(recursiveDiff(dcmp))
+        # ones and generate correct output without raising any exception
+        settings = read_settings(filename=None, override={
+            'PATH': INPUT_PATH,
+            'OUTPUT_PATH': self.temp_path,
+            })
+        pelican = Pelican(settings=settings)
+        pelican.run()
+        dcmp = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
+        self.assertFilesEqual(recursiveDiff(dcmp))
 
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work

From 07ccf477d06a2a2c1b0290ef33628b86a99324d6 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 24 Nov 2012 00:29:48 +0100
Subject: [PATCH 1026/2864] update "basic" output for functional tests so that
 test pass

LC_ALL="C" pelican -o tests/output/basic/ samples/content/
---
 .../output/basic/author/alexis-metaireau.html |   4 +-
 tests/output/basic/author/dummy-author.html   | 288 ------------------
 tests/output/basic/category/bar.html          |   4 +-
 tests/output/basic/category/content.html      | 147 ---------
 .../output/basic/drafts/a-draft-article.html  |  67 ----
 tests/output/basic/feeds/all-fr.atom.xml      |   3 +-
 tests/output/basic/feeds/all.atom.xml         |   3 +-
 tests/output/basic/feeds/content.atom.xml     |   4 -
 tests/output/basic/index.html                 |   4 +-
 tests/output/basic/oh-yeah-fr.html            |  68 -----
 tests/output/basic/oh-yeah.html               |   4 +-
 tests/output/basic/tag/bar.html               |   4 +-
 tests/output/basic/tag/oh.html                |   4 +-
 tests/output/basic/tag/yeah.html              |   4 +-
 14 files changed, 9 insertions(+), 599 deletions(-)
 delete mode 100644 tests/output/basic/author/dummy-author.html
 delete mode 100644 tests/output/basic/category/content.html
 delete mode 100644 tests/output/basic/drafts/a-draft-article.html
 delete mode 100644 tests/output/basic/feeds/content.atom.xml
 delete mode 100644 tests/output/basic/oh-yeah-fr.html

diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index 014127c5..07caba91 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -44,9 +44,7 @@
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
-            <a href=".././oh-yeah-fr.html">fr</a>
-    
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/basic/author/dummy-author.html b/tests/output/basic/author/dummy-author.html
deleted file mode 100644
index bd47adde..00000000
--- a/tests/output/basic/author/dummy-author.html
+++ /dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-        <title>A Pelican Blog - Dummy Author</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-        
-
-        <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
-
-</head>
-
-<body id="index" class="home">
-
-        <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
-                <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li ><a href=".././category/misc.html">misc</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
-        </header><!-- /#banner -->
-                
-
-            
-
-        
-        
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href=".././a-markdown-powered-article.html">A markdown powered article</a></h1> 
-                    <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
-                Wed 20 April 2011
-        </abbr>
-
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
-
-
-
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-                </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-            
-
-        
-         
-            
-            <li><article class="hentry">    
-                <header>
-                    <h1><a href=".././article-1.html" rel="bookmark"
-                           title="Permalink to Article 1">Article 1</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
-        </abbr>
-
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 1</p>
-
-                <a class="readmore" href=".././article-1.html">read more</a>
-                
-                </div><!-- /.entry-content -->
-            </article></li>
-        
-        
-            
-
-        
-         
-            
-            <li><article class="hentry">    
-                <header>
-                    <h1><a href=".././article-2.html" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
-        </abbr>
-
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 2</p>
-
-                <a class="readmore" href=".././article-2.html">read more</a>
-                
-                </div><!-- /.entry-content -->
-            </article></li>
-        
-        
-            
-
-        
-         
-            
-            <li><article class="hentry">    
-                <header>
-                    <h1><a href=".././article-3.html" rel="bookmark"
-                           title="Permalink to Article 3">Article 3</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
-        </abbr>
-
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/cat1.html">cat1</a>. </p>
-
-
-
-</footer><!-- /.post-info -->
-                <p>Article 3</p>
-
-                <a class="readmore" href=".././article-3.html">read more</a>
-                
-                </div><!-- /.entry-content -->
-            </article></li>
-        
-        
-            
-
-        
-         
-            
-            <li><article class="hentry">    
-                <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
-        </abbr>
-
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-Translations: 
-    
-        <a href=".././second-article-fr.html">fr</a>
-    
-
-</footer><!-- /.post-info -->
-                <p>This is some article, in english</p>
-
-                <a class="readmore" href=".././second-article.html">read more</a>
-                
-                </div><!-- /.entry-content -->
-            </article></li>
-        
-        
-            
-
-        
-         
-            
-            <li><article class="hentry">    
-                <header>
-                    <h1><a href=".././unbelievable.html" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
-        </abbr>
-
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/misc.html">misc</a>. </p>
-
-
-
-</footer><!-- /.post-info -->
-                <p>Or completely awesome. Depends the needs.</p>
-
-                <a class="readmore" href=".././unbelievable.html">read more</a>
-                
-                </div><!-- /.entry-content -->
-            </article></li>
-        
-        
-            </ol><!-- /#posts-list -->
-            
-                
-            
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
-
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
-                </address><!-- /#about -->
-
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
-
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index b47d7522..4fe9447c 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -44,9 +44,7 @@
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
-            <a href=".././oh-yeah-fr.html">fr</a>
-    
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/basic/category/content.html b/tests/output/basic/category/content.html
deleted file mode 100644
index 19ceef2c..00000000
--- a/tests/output/basic/category/content.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-        <title>A Pelican Blog - content</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        
-
-        <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
-
-</head>
-
-<body id="index" class="home">
-
-        <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
-                <nav><ul>
-                
-                
-                
-                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                
-                
-                
-                    <li ><a href=".././category/bar.html">bar</a></li>
-                
-                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                
-                    <li class="active"><a href=".././category/content.html">content</a></li>
-                
-                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                
-                </ul></nav>
-        </header><!-- /#banner -->
-                
-
-            
-
-        
-        
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
-        </abbr>
-
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/content.html">content</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>
-
-
-Translations: 
-    
-        <a href=".././second-article-fr.html">fr</a>
-    
-
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-
-                </article>
-                
-            </aside><!-- /#featured -->
-            
-                <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-            
-        
-        
-        
-        
-            
-
-        
-         
-            
-            <li><article class="hentry">    
-                <header>
-                        <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
-        </abbr>
-
-        
-        <address class="vcard author">
-                By <a class="url fn" href=".././author/dummy-author.html">Dummy Author</a>
-        </address>
-        
-<p>In <a href=".././category/content.html">content</a>. </p>
-
-
-
-</footer><!-- /.post-info -->
-                <p>Or completely awesome. Depends the needs.</p>
-
-                <a class="readmore" href=".././unbelievable.html">read more</a>
-                
-                </div><!-- /.entry-content -->
-            </article></li>
-        
-        
-            
-        
-        
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
-        
-    
-
-
-        <section id="extras" class="body">
-        
-        
-        </section><!-- /#extras -->
-
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
-                </address><!-- /#about -->
-
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
-
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/output/basic/drafts/a-draft-article.html b/tests/output/basic/drafts/a-draft-article.html
deleted file mode 100644
index 71e778ce..00000000
--- a/tests/output/basic/drafts/a-draft-article.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-        <title>A draft article</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
-        <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
-
-</head>
-
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
-                <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                </ul></nav>
-        </header><!-- /#banner -->
-        <section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="a-draft-article.html" rel="bookmark"
-           title="Permalink to A draft article">A draft article</a></h1>
-          </header>
-
-    <div class="entry-content">
-      <footer class="post-info">
-        <abbr class="published" title="2012-09-17T15:02:39.591671">
-                Mon 17 September 2012
-        </abbr>
-
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-
-</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
-listed anywhere else.</p>
-
-    </div><!-- /.entry-content -->
-    
-  </article>
-</section>
-        <section id="extras" class="body">
-                        </section><!-- /#extras -->
-
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
-                </address><!-- /#about -->
-
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/tests/output/basic/feeds/all-fr.atom.xml
index 2cfb5ea6..98b9a681 100644
--- a/tests/output/basic/feeds/all-fr.atom.xml
+++ b/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-09-17T15:02:39Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-09-17T15:02:39Z</updated><author><name></name></author><id>tag:,2012-09-17:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index a439882f..c715db8c 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-09-17T15:02:39Z</updated><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><updated>2012-09-17T15:02:39Z</updated><author><name></name></author><id>tag:,2012-09-17:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
diff --git a/tests/output/basic/feeds/content.atom.xml b/tests/output/basic/feeds/content.atom.xml
deleted file mode 100644
index 1fa740b4..00000000
--- a/tests/output/basic/feeds/content.atom.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href=".././" rel="alternate"></link><link href="None/feeds/content.atom.xml" rel="self"></link><id>.././</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href=".././second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href=".././unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name>Dummy Author</name></author><id>tag:../.,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 8a063033..04a4fd12 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -183,9 +183,7 @@ as well as <strong>inline markup</strong>.</p>
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         <p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: 
-            <a href="./oh-yeah-fr.html">fr</a>
-    
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/basic/oh-yeah-fr.html b/tests/output/basic/oh-yeah-fr.html
deleted file mode 100644
index 5143907f..00000000
--- a/tests/output/basic/oh-yeah-fr.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-        <title>Trop bien !</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
-        <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
-</head>
-
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
-                <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
-        </header><!-- /#banner -->
-        <section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="oh-yeah-fr.html" rel="bookmark"
-           title="Permalink to Trop bien !">Trop bien !</a></h1>
-          </header>
-
-    <div class="entry-content">
-      <footer class="post-info">
-        <abbr class="published" title="2012-09-17T15:02:39.591671">
-                Mon 17 September 2012
-        </abbr>
-
-        <p>In <a href="./category/misc.html">misc</a>. </p>
-Translations: 
-            <a href="./oh-yeah.html">en</a>
-    
-</footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
-
-    </div><!-- /.entry-content -->
-    
-  </article>
-</section>
-        <section id="extras" class="body">
-                        </section><!-- /#extras -->
-
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
-                </address><!-- /#about -->
-
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index 0e06699d..1c7bb43e 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -47,9 +47,7 @@
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         <p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: 
-            <a href="./oh-yeah-fr.html">fr</a>
-    
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 4bc5adc0..f2d0bf72 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -120,9 +120,7 @@ as well as <strong>inline markup</strong>.</p>
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
-            <a href=".././oh-yeah-fr.html">fr</a>
-    
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index a286ca8d..36731c8c 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -44,9 +44,7 @@
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
-            <a href=".././oh-yeah-fr.html">fr</a>
-    
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 1e91b765..fb6909b4 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -44,9 +44,7 @@
                 By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
-            <a href=".././oh-yeah-fr.html">fr</a>
-    
+<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !

From ce0723cf48a5bc0c77e6e93e4e5a9bc5dc945315 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 24 Nov 2012 00:48:47 +0100
Subject: [PATCH 1027/2864] update contribute.rst doc

$USER environment variable is no longer needed
---
 docs/contribute.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 0820d5c3..c302dcc6 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -56,7 +56,7 @@ To do so, you can use the following two commands::
 
     $ LC_ALL="C" pelican -o tests/output/custom/ -s samples/pelican.conf.py \
         samples/content/
-    $ LC_ALL="C" USER="Dummy Author" pelican -o tests/output/basic/ samples/content/
+    $ LC_ALL="C" pelican -o tests/output/basic/ samples/content/
 
 Coding standards
 ================

From 447e627286264c3460ba91373a0636bbd2e68730 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 28 Nov 2012 00:41:40 +0100
Subject: [PATCH 1028/2864] update changelog to reflect changes from #592

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index abf323c8..1f0769da 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -19,6 +19,8 @@ Release history
   information if the post author is empty.
 * LESS and Webassets support removed from Pelican core in favor of a Webassets
   plugin.
+* The ``DEFAULT_DATE`` setting now defaults to None, which means that articles
+  won't be generated anymore unless a date metadata is specified.
 
 3.0 (2012-08-08)
 ==================

From 70566223227550c7a74cd19bf5e3cc8b6b59f607 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 27 Nov 2012 16:01:05 -0800
Subject: [PATCH 1029/2864] Fix missing SITEURL and base home link

1. Following up on bbinet's changes in f12a297, ensure that the notmyidea
theme's article.html template includes the SITEURL variable when
constructing URL links.

2. Add missing slash to the base.html template so that clicking on the
site header at top left refers to "/" instead of "" when SITEURL is not
defined. Otherwise, the "" target will cause the browser to load the
current page and not the site's root (as one would expect).
---
 pelican/themes/notmyidea/templates/article.html           | 2 +-
 pelican/themes/notmyidea/templates/base.html              | 2 +-
 tests/output/basic/a-markdown-powered-article.html        | 4 ++--
 tests/output/basic/archives.html                          | 2 +-
 tests/output/basic/article-1.html                         | 4 ++--
 tests/output/basic/article-2.html                         | 4 ++--
 tests/output/basic/article-3.html                         | 4 ++--
 tests/output/basic/author/alexis-metaireau.html           | 2 +-
 tests/output/basic/categories.html                        | 2 +-
 tests/output/basic/category/bar.html                      | 2 +-
 tests/output/basic/category/cat1.html                     | 2 +-
 tests/output/basic/category/misc.html                     | 2 +-
 tests/output/basic/category/yeah.html                     | 2 +-
 tests/output/basic/index.html                             | 2 +-
 tests/output/basic/oh-yeah.html                           | 4 ++--
 tests/output/basic/pages/this-is-a-test-hidden-page.html  | 2 +-
 tests/output/basic/pages/this-is-a-test-page.html         | 2 +-
 tests/output/basic/second-article-fr.html                 | 4 ++--
 tests/output/basic/second-article.html                    | 4 ++--
 tests/output/basic/tag/bar.html                           | 2 +-
 tests/output/basic/tag/baz.html                           | 2 +-
 tests/output/basic/tag/foo.html                           | 2 +-
 tests/output/basic/tag/foobar.html                        | 2 +-
 tests/output/basic/tag/oh.html                            | 2 +-
 tests/output/basic/tag/yeah.html                          | 2 +-
 tests/output/basic/this-is-a-super-article.html           | 4 ++--
 tests/output/basic/unbelievable.html                      | 4 ++--
 tests/output/custom/a-markdown-powered-article.html       | 4 ++--
 tests/output/custom/archives.html                         | 2 +-
 tests/output/custom/article-1.html                        | 4 ++--
 tests/output/custom/article-2.html                        | 4 ++--
 tests/output/custom/article-3.html                        | 4 ++--
 tests/output/custom/author/alexis-metaireau.html          | 2 +-
 tests/output/custom/author/alexis-metaireau2.html         | 2 +-
 tests/output/custom/categories.html                       | 2 +-
 tests/output/custom/category/bar.html                     | 2 +-
 tests/output/custom/category/cat1.html                    | 2 +-
 tests/output/custom/category/misc.html                    | 2 +-
 tests/output/custom/category/yeah.html                    | 2 +-
 tests/output/custom/drafts/a-draft-article.html           | 4 ++--
 tests/output/custom/index.html                            | 2 +-
 tests/output/custom/index2.html                           | 2 +-
 tests/output/custom/oh-yeah-fr.html                       | 4 ++--
 tests/output/custom/oh-yeah.html                          | 4 ++--
 tests/output/custom/pages/this-is-a-test-hidden-page.html | 2 +-
 tests/output/custom/pages/this-is-a-test-page.html        | 2 +-
 tests/output/custom/second-article-fr.html                | 4 ++--
 tests/output/custom/second-article.html                   | 4 ++--
 tests/output/custom/tag/bar.html                          | 2 +-
 tests/output/custom/tag/baz.html                          | 2 +-
 tests/output/custom/tag/foo.html                          | 2 +-
 tests/output/custom/tag/foobar.html                       | 2 +-
 tests/output/custom/tag/oh.html                           | 2 +-
 tests/output/custom/tag/yeah.html                         | 2 +-
 tests/output/custom/this-is-a-super-article.html          | 4 ++--
 tests/output/custom/unbelievable.html                     | 4 ++--
 56 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index fc7e5893..737d3789 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -5,7 +5,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="{{ article.url }}" rel="bookmark"
+        <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
            title="Permalink to {{ article.title|striptags }}">{{ article.title}}</a></h1>
       {% include 'twitter.html' %}
     </header>
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 45c2c3a2..f8b02662 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -26,7 +26,7 @@
 <body id="index" class="home">
 {% include 'github.html' %}
         <header id="banner" class="body">
-                <h1><a href="{{ SITEURL }}">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
+                <h1><a href="{{ SITEURL }}/">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
                 <nav><ul>
                 {% for title, link in MENUITEMS %}
                     <li><a href="{{ link }}">{{ title }}</a></li>
diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 5a29c0b7..f3e60892 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
@@ -33,7 +33,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="a-markdown-powered-article.html" rel="bookmark"
+        <a href="./a-markdown-powered-article.html" rel="bookmark"
            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
           </header>
 
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index fc2af483..0bccff9b 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index 85644e68..b372d6ca 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
@@ -33,7 +33,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="article-1.html" rel="bookmark"
+        <a href="./article-1.html" rel="bookmark"
            title="Permalink to Article 1">Article 1</a></h1>
           </header>
 
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index e32851bb..1a18cb47 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
@@ -33,7 +33,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="article-2.html" rel="bookmark"
+        <a href="./article-2.html" rel="bookmark"
            title="Permalink to Article 2">Article 2</a></h1>
           </header>
 
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 29406243..6b83b062 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
@@ -33,7 +33,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="article-3.html" rel="bookmark"
+        <a href="./article-3.html" rel="bookmark"
            title="Permalink to Article 3">Article 3</a></h1>
           </header>
 
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index 07caba91..1953d75a 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index e94987b8..f945d04a 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index 4fe9447c..093d9964 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index 3d592144..ac6f1b00 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index 5ebcfe92..bb6ea566 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index 5aef966a..b02e92b6 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 04a4fd12..3f37bdd5 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index 1c7bb43e..2e7b9cbf 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="./category/bar.html">bar</a></li>
@@ -33,7 +33,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="oh-yeah.html" rel="bookmark"
+        <a href="./oh-yeah.html" rel="bookmark"
            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
           </header>
 
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html
index a8c624d5..34326d38 100644
--- a/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 1584309c..92a1a79d 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index 742bfa20..aa30292e 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
@@ -33,7 +33,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="second-article-fr.html" rel="bookmark"
+        <a href="./second-article-fr.html" rel="bookmark"
            title="Permalink to Deuxième article">Deuxième article</a></h1>
           </header>
 
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index a672f9c6..7319c87f 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
@@ -33,7 +33,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="second-article.html" rel="bookmark"
+        <a href="./second-article.html" rel="bookmark"
            title="Permalink to Second article">Second article</a></h1>
           </header>
 
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index f2d0bf72..2fb30766 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index 21dc22f5..b8264554 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index e5997631..7156ab4e 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 211a73bd..29ecd821 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index 36731c8c..09932f2d 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index fb6909b4..0537a49a 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../.">A Pelican Blog </a></h1>
+                <h1><a href=".././">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/bar.html">bar</a></li>
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 54b03422..4b47c6ba 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
@@ -33,7 +33,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="this-is-a-super-article.html" rel="bookmark"
+        <a href="./this-is-a-super-article.html" rel="bookmark"
            title="Permalink to This is a super article !">This is a super article !</a></h1>
           </header>
 
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 6f2c86ce..b21867f1 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -20,7 +20,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".">A Pelican Blog </a></h1>
+                <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
@@ -33,7 +33,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="unbelievable.html" rel="bookmark"
+        <a href="./unbelievable.html" rel="bookmark"
            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
           </header>
 
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index aca81bbf..aea2639b 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
@@ -37,7 +37,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="a-markdown-powered-article.html" rel="bookmark"
+        <a href="./a-markdown-powered-article.html" rel="bookmark"
            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
           </header>
 
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index 5fcca41e..44bc876e 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index 85be4fd3..a07b669b 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
@@ -37,7 +37,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="article-1.html" rel="bookmark"
+        <a href="./article-1.html" rel="bookmark"
            title="Permalink to Article 1">Article 1</a></h1>
           </header>
 
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index 7c00b698..fd95b709 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
@@ -37,7 +37,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="article-2.html" rel="bookmark"
+        <a href="./article-2.html" rel="bookmark"
            title="Permalink to Article 2">Article 2</a></h1>
           </header>
 
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index 42e6e9ca..4bd5fd09 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
@@ -37,7 +37,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="article-3.html" rel="bookmark"
+        <a href="./article-3.html" rel="bookmark"
            title="Permalink to Article 3">Article 3</a></h1>
           </header>
 
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index f809217d..3b857d65 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 459e7bc6..41e225ba 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/categories.html b/tests/output/custom/categories.html
index f7e811d5..64da26b4 100644
--- a/tests/output/custom/categories.html
+++ b/tests/output/custom/categories.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index 709b4ee8..9383ab7a 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index 383a8cbf..8b9987b8 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index d01c8b2d..370d937b 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index af7f0ba2..632e20ec 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index 0c4244eb..55c48e78 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
@@ -37,7 +37,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="a-draft-article.html" rel="bookmark"
+        <a href=".././a-draft-article.html" rel="bookmark"
            title="Permalink to A draft article">A draft article</a></h1>
           </header>
 
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index 5d95c9d0..a6838a84 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index 481819a8..ba4e4f1a 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index e9be2020..0c1fdcdb 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
@@ -37,7 +37,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="oh-yeah-fr.html" rel="bookmark"
+        <a href="./oh-yeah-fr.html" rel="bookmark"
            title="Permalink to Trop bien !">Trop bien !</a></h1>
           </header>
 
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index e0c37caa..ce14133e 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
@@ -37,7 +37,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="oh-yeah.html" rel="bookmark"
+        <a href="./oh-yeah.html" rel="bookmark"
            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
           </header>
 
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 500011e0..43bc428a 100644
--- a/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index 81c2bffb..de90b8a6 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index b71b9244..95ad3bd7 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
@@ -37,7 +37,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="second-article-fr.html" rel="bookmark"
+        <a href="./second-article-fr.html" rel="bookmark"
            title="Permalink to Deuxième article">Deuxième article</a></h1>
           </header>
 
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 52872f27..9c2b6de3 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
@@ -37,7 +37,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="second-article.html" rel="bookmark"
+        <a href="./second-article.html" rel="bookmark"
            title="Permalink to Second article">Second article</a></h1>
           </header>
 
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 8b478d55..b3422fe3 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index 02f55ddb..4284cbfd 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index 9e84459a..73ec0423 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index 28d250e6..7f98309f 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index 4894ff3a..ee066b33 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index 36f40b4e..9a707121 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../.">Alexis' log </a></h1>
+                <h1><a href=".././">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href=".././category/yeah.html">yeah</a></li>
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index e931d0a0..50daa573 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
@@ -37,7 +37,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="this-is-a-super-article.html" rel="bookmark"
+        <a href="./this-is-a-super-article.html" rel="bookmark"
            title="Permalink to This is a super article !">This is a super article !</a></h1>
           </header>
 
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index fa03883d..5333cfdb 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -24,7 +24,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
                                                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
@@ -37,7 +37,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="unbelievable.html" rel="bookmark"
+        <a href="./unbelievable.html" rel="bookmark"
            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
           </header>
 

From 2bdbbc3faf7bed127b843ad37ffa490c5dbf00d4 Mon Sep 17 00:00:00 2001
From: Matt Layman <matthewlayman@gmail.com>
Date: Thu, 22 Nov 2012 20:47:59 -0500
Subject: [PATCH 1030/2864] Fixed line ending problems by adding a
 .gitattributes file

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..dfe07704
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

From c749671778972a6d53ef3501c74f18037c52d86d Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Thu, 29 Nov 2012 14:52:24 +0100
Subject: [PATCH 1031/2864] Reimplemented the gzip compression as a plugin.

Extending the Writer wasn't the complete answer because the static
generator also copies some files. Instead, I implemented the work as a
plugin that attaches to the finalized event.
---
 pelican/plugins/gzip_cache.py | 78 +++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 pelican/plugins/gzip_cache.py

diff --git a/pelican/plugins/gzip_cache.py b/pelican/plugins/gzip_cache.py
new file mode 100644
index 00000000..784a6ca0
--- /dev/null
+++ b/pelican/plugins/gzip_cache.py
@@ -0,0 +1,78 @@
+# Copyright (c) 2012 Matt Layman
+'''A plugin to create .gz cache files for optimization.'''
+
+import gzip
+import logging
+import os
+
+from pelican import signals
+
+logger = logging.getLogger(__name__)
+
+# A list of file types to exclude from possible compression
+EXCLUDE_TYPES = [
+    # Compressed types
+    '.bz2',
+    '.gz',
+
+    # Audio types
+    '.aac',
+    '.flac',
+    '.mp3',
+    '.wma',
+
+    # Image types
+    '.gif',
+    '.jpg',
+    '.jpeg',
+    '.png',
+
+    # Video types
+    '.avi',
+    '.mov',
+    '.mp4',
+]
+
+def create_gzip_cache(pelican):
+    '''Create a gzip cache file for every file that a webserver would
+    reasonably want to cache (e.g., text type files).
+
+    :param pelican: The Pelican instance
+    '''
+    for dirpath, _, filenames in os.walk(pelican.settings['OUTPUT_PATH']):
+        for name in filenames:
+            if should_compress(name):
+                filepath = os.path.join(dirpath, name)
+                create_gzip_file(filepath)
+
+def should_compress(filename):
+    '''Check if the filename is a type of file that should be compressed.
+
+    :param filename: A file name to check against
+    '''
+    for extension in EXCLUDE_TYPES:
+        if filename.endswith(extension):
+            return False
+
+    return True
+
+def create_gzip_file(filepath):
+    '''Create a gzipped file in the same directory with a filepath.gz name.
+
+    :param filepath: A file to compress
+    '''
+    compressed_path = filepath + '.gz'
+
+    with open(filepath, 'rb') as uncompressed:
+        try:
+            logger.debug('Compressing: %s' % filepath)
+            compressed = gzip.open(compressed_path, 'wb')
+            compressed.writelines(uncompressed)
+        except Exception, ex:
+            logger.critical('Gzip compression failed: %s' % ex)
+        finally:
+            compressed.close()
+
+def register():
+    signals.finalized.connect(create_gzip_cache)
+

From 3342d3b9b94aa2ae9c4c45456753a3fa800ec791 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Thu, 29 Nov 2012 14:49:03 +0100
Subject: [PATCH 1032/2864] Added some documentation about the gzip plugin.

---
 docs/plugins.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index f871a88c..c6b18200 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -106,6 +106,7 @@ The following plugins are currently included with Pelican under ``pelican.plugin
 * `GitHub activity`_
 * `Global license`_
 * `Gravatar`_
+* `Gzip cache`_
 * `HTML tags for reStructuredText`_
 * `Related posts`_
 * `Sitemap`_
@@ -245,6 +246,17 @@ Alternatively, you can provide an email address from within article metadata::
 If the email address is defined via at least one of the two methods above,
 the ``author_gravatar`` variable is added to the article's context.
 
+Gzip cache
+----------
+
+Certain web servers (e.g., Nginx) can use a static cache of gzip compressed
+files to prevent the server from compressing files during an HTTP call. Since
+compression occurs at another time, these compressed files can be compressed
+at a higher compression level for increased optimization.
+
+The ``gzip_cache`` plugin compresses all common text type files into a ``.gz``
+file within the same directory as the original file.
+
 HTML tags for reStructuredText
 ------------------------------
 

From 8fe68aa035c9162a612c062e4c43608f4e2e3792 Mon Sep 17 00:00:00 2001
From: Matt Layman <matthewlayman@gmail.com>
Date: Sun, 25 Nov 2012 22:12:54 -0500
Subject: [PATCH 1033/2864] Added some unit tests for the gzip cache plugin

---
 tests/test_plugins.py | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 tests/test_plugins.py

diff --git a/tests/test_plugins.py b/tests/test_plugins.py
new file mode 100644
index 00000000..f6581018
--- /dev/null
+++ b/tests/test_plugins.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+'''Core plugins unit tests'''
+
+import os
+import tempfile
+
+from pelican.plugins import gzip_cache
+
+from support import unittest, temporary_folder
+
+class TestGzipCache(unittest.TestCase):
+    '''Unit tests for the gzip cache plugin'''
+
+    def test_should_compress(self):
+        '''Test that some filetypes should compress and others shouldn't.'''
+        self.assertTrue(gzip_cache.should_compress('foo.html'))
+        self.assertTrue(gzip_cache.should_compress('bar.css'))
+        self.assertTrue(gzip_cache.should_compress('baz.js'))
+        self.assertTrue(gzip_cache.should_compress('foo.txt'))
+
+        self.assertFalse(gzip_cache.should_compress('foo.gz'))
+        self.assertFalse(gzip_cache.should_compress('bar.png'))
+        self.assertFalse(gzip_cache.should_compress('baz.mp3'))
+        self.assertFalse(gzip_cache.should_compress('foo.mov'))
+
+    def test_creates_gzip_file(self):
+        '''Test that a file matching the input filename with a .gz extension is
+        created.'''
+        # The plugin walks over the output content after the finalized signal
+        # so it is safe to assume that the file exists (otherwise walk would
+        # not report it). Therefore, create a dummy file to use.
+        with temporary_folder() as tempdir:
+            (_, a_html_filename) = tempfile.mkstemp(suffix='.html', dir=tempdir)
+            gzip_cache.create_gzip_file(a_html_filename)
+            self.assertTrue(os.path.exists(a_html_filename + '.gz'))
+

From a86fdfc779b8d29088a9372bd1b2bc0d996d0cb9 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Thu, 29 Nov 2012 15:16:57 +0100
Subject: [PATCH 1034/2864] update changelog: add gzip_cache plugin

---
 docs/changelog.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1f0769da..f60c6e47 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -21,6 +21,9 @@ Release history
   plugin.
 * The ``DEFAULT_DATE`` setting now defaults to None, which means that articles
   won't be generated anymore unless a date metadata is specified.
+* Add the gzip_cache plugin which compresses common text files into a ``.gz``
+  file within the same directory as the original file to prevent the server
+  (e.g. Nginx) from compressing files during an HTTP call.
 
 3.0 (2012-08-08)
 ==================

From c731edcdebeab95572ee475d8d2931be22fd0d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Thu, 29 Nov 2012 19:16:00 +0100
Subject: [PATCH 1035/2864] pages should be in the content folder

---
 docs/getting_started.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 9dc6ab59..467363de 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -216,8 +216,8 @@ run the ``pelican`` command with the ``-r`` or ``--autoreload`` option.
 Pages
 -----
 
-If you create a folder named ``pages``, all the files in it will be used to
-generate static pages.
+If you create a folder named ``pages``, itself in the content folder, all the
+files in it will be used to generate static pages.
 
 Then, use the ``DISPLAY_PAGES_ON_MENU`` setting, which will add all the pages to
 the menu.

From 088c810b002843a8e7ac901590e57071ffafa0e6 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Wed, 28 Nov 2012 22:28:27 +0100
Subject: [PATCH 1036/2864] Change the way to compute relative paths to avoid
 the leading `.././` when using relative urls.

---
 pelican/utils.py        | 8 ++++++--
 tests/test_utils.py     | 6 +++---
 tests/test_webassets.py | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 767dc117..79387357 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -133,8 +133,12 @@ def clean_output_dir(path):
 
 
 def get_relative_path(filename):
-    """Return the relative path to the given filename"""
-    return '../' * filename.count('/') + '.'
+    """Return the relative path from the given filename to the root path."""
+    nslashes = filename.count('/')
+    if nslashes == 0:
+        return '.'
+    else:
+        return '/'.join(['..'] * nslashes)
 
 
 def truncate_html_words(s, num, end_text='...'):
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 58118d4f..eda1388a 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -51,9 +51,9 @@ class TestUtils(unittest.TestCase):
 
     def test_get_relative_path(self):
 
-        samples = (('/test/test', '../../.'),
-                   ('/test/test/', '../../../.'),
-                   ('/', '../.'))
+        samples = (('test/test.html', '..'),
+                   ('test/test/test.html', '../..'),
+                   ('test.html', '.'))
 
         for value, expected in samples:
             self.assertEquals(utils.get_relative_path(value), expected)
diff --git a/tests/test_webassets.py b/tests/test_webassets.py
index afe1674d..ceba7775 100644
--- a/tests/test_webassets.py
+++ b/tests/test_webassets.py
@@ -79,7 +79,7 @@ class TestWebAssetsRelativeURLS(TestWebAssets):
             self.check_link_tag(css_file, os.path.join(self.temp_path, f))
 
         self.check_link_tag(
-            '.././theme/gen/style.{0}.min.css'.format(CSS_HASH),
+            '../theme/gen/style.{0}.min.css'.format(CSS_HASH),
             os.path.join(self.temp_path, 'category/yeah.html'))
 
 

From 5df258c5f04210b4fcadcd1582a381534c396097 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Wed, 28 Nov 2012 22:35:35 +0100
Subject: [PATCH 1037/2864] Update the basic and custom tests output.

---
 .../output/basic/author/alexis-metaireau.html | 38 +++++-----
 tests/output/basic/category/bar.html          | 28 ++++----
 tests/output/basic/category/cat1.html         | 42 +++++------
 tests/output/basic/category/misc.html         | 34 ++++-----
 tests/output/basic/category/yeah.html         | 28 ++++----
 .../pages/this-is-a-test-hidden-page.html     | 20 +++---
 .../basic/pages/this-is-a-test-page.html      | 20 +++---
 tests/output/basic/tag/bar.html               | 58 +++++++--------
 tests/output/basic/tag/baz.html               | 38 +++++-----
 tests/output/basic/tag/foo.html               | 48 ++++++-------
 tests/output/basic/tag/foobar.html            | 28 ++++----
 tests/output/basic/tag/oh.html                | 28 ++++----
 tests/output/basic/tag/yeah.html              | 28 ++++----
 .../custom/author/alexis-metaireau.html       | 60 ++++++++--------
 .../custom/author/alexis-metaireau2.html      | 72 +++++++++----------
 tests/output/custom/category/bar.html         | 32 ++++-----
 tests/output/custom/category/cat1.html        | 58 +++++++--------
 tests/output/custom/category/misc.html        | 42 +++++------
 tests/output/custom/category/yeah.html        | 30 ++++----
 .../output/custom/drafts/a-draft-article.html | 26 +++----
 .../pages/this-is-a-test-hidden-page.html     | 20 +++---
 .../custom/pages/this-is-a-test-page.html     | 20 +++---
 tests/output/custom/tag/bar.html              | 72 +++++++++----------
 tests/output/custom/tag/baz.html              | 46 ++++++------
 tests/output/custom/tag/foo.html              | 58 +++++++--------
 tests/output/custom/tag/foobar.html           | 30 ++++----
 tests/output/custom/tag/oh.html               | 32 ++++-----
 tests/output/custom/tag/yeah.html             | 32 ++++-----
 28 files changed, 534 insertions(+), 534 deletions(-)

diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index 1953d75a..106e3581 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -3,30 +3,30 @@
 <head>
         <title>A Pelican Blog - Alexis Métaireau</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -34,17 +34,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -62,7 +62,7 @@ YEAH !</p>
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
@@ -73,14 +73,14 @@ YEAH !</p>
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
+                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index 093d9964..88475376 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -3,30 +3,30 @@
 <head>
         <title>A Pelican Blog - bar</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li class="active"><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -34,17 +34,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index ac6f1b00..180b8f20 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -3,30 +3,30 @@
 <head>
         <title>A Pelican Blog - cat1</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li class="active"><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li class="active"><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -34,13 +34,13 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././a-markdown-powered-article.html">A markdown powered article</a></h1> 
+                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>                </article>
                             </aside><!-- /#featured -->
@@ -53,7 +53,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././article-1.html" rel="bookmark"
+                    <h1><a href="../article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
@@ -63,11 +63,11 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href=".././article-1.html">read more</a>
+                <a class="readmore" href="../article-1.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -75,7 +75,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././article-2.html" rel="bookmark"
+                    <h1><a href="../article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
@@ -85,11 +85,11 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href=".././article-2.html">read more</a>
+                <a class="readmore" href="../article-2.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -97,7 +97,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././article-3.html" rel="bookmark"
+                    <h1><a href="../article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
@@ -107,11 +107,11 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href=".././article-3.html">read more</a>
+                <a class="readmore" href="../article-3.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index bb6ea566..d708da2a 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -3,30 +3,30 @@
 <head>
         <title>A Pelican Blog - misc</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -34,15 +34,15 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article-fr.html">fr</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
@@ -56,7 +56,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././unbelievable.html" rel="bookmark"
+                    <h1><a href="../unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
@@ -66,11 +66,11 @@
                 Fri 15 October 2010
         </abbr>
 
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 
-                <a class="readmore" href=".././unbelievable.html">read more</a>
+                <a class="readmore" href="../unbelievable.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index b02e92b6..a414eb6f 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -3,30 +3,30 @@
 <head>
         <title>A Pelican Blog - yeah</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li class="active"><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li class="active"><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -34,17 +34,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
+                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 34326d38..655ae272 100644
--- a/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -3,30 +3,30 @@
 <head>
         <title>This is a test hidden page</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 92a1a79d..177dab2f 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -3,30 +3,30 @@
 <head>
         <title>This is a test page</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 2fb30766..fd0d453c 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -3,30 +3,30 @@
 <head>
         <title>A Pelican Blog - bar</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -34,15 +34,15 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article.html">en</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article.html">en</a>
     
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
                 </article>
@@ -56,7 +56,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
+                    <h1><a href="../second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
@@ -66,13 +66,13 @@
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article-fr.html">fr</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href="../second-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -80,7 +80,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
@@ -91,14 +91,14 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
+                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -106,7 +106,7 @@ as well as <strong>inline markup</strong>.</p>
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././oh-yeah.html" rel="bookmark"
+                    <h1><a href="../oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
@@ -117,10 +117,10 @@ as well as <strong>inline markup</strong>.</p>
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -128,7 +128,7 @@ YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-                <a class="readmore" href=".././oh-yeah.html">read more</a>
+                <a class="readmore" href="../oh-yeah.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index b8264554..f6c56d4b 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -3,30 +3,30 @@
 <head>
         <title>A Pelican Blog - baz</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -34,15 +34,15 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article.html">en</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article.html">en</a>
     
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
                 </article>
@@ -56,7 +56,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
+                    <h1><a href="../second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
@@ -66,13 +66,13 @@
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article-fr.html">fr</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href="../second-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 7156ab4e..4ee92b7d 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -3,30 +3,30 @@
 <head>
         <title>A Pelican Blog - foo</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -34,15 +34,15 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article.html">en</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article.html">en</a>
     
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
                 </article>
@@ -56,7 +56,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
+                    <h1><a href="../second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
@@ -66,13 +66,13 @@
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article-fr.html">fr</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
+                <a class="readmore" href="../second-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -80,7 +80,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
@@ -91,14 +91,14 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
+                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 29ecd821..18c19770 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -3,30 +3,30 @@
 <head>
         <title>A Pelican Blog - foobar</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -34,17 +34,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
+                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index 09932f2d..3279c1a6 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -3,30 +3,30 @@
 <head>
         <title>A Pelican Blog - oh</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -34,17 +34,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 0537a49a..31aa542a 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -3,30 +3,30 @@
 <head>
         <title>A Pelican Blog - yeah</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href=".././">A Pelican Blog </a></h1>
+                <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/bar.html">bar</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -34,17 +34,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>
+        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 3b857d65..422b873e 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - Alexis Métaireau</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -38,18 +38,18 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././a-markdown-powered-article.html">A markdown powered article</a></h1> 
+                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -60,7 +60,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././article-1.html" rel="bookmark"
+                    <h1><a href="../article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
@@ -71,21 +71,21 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href=".././article-1.html">read more</a>
-                <p>There are <a href=".././article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../article-1.html">read more</a>
+                <p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             
 
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././article-2.html" rel="bookmark"
+                    <h1><a href="../article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
@@ -96,21 +96,21 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href=".././article-2.html">read more</a>
-                <p>There are <a href=".././article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../article-2.html">read more</a>
+                <p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             
 
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././article-3.html" rel="bookmark"
+                    <h1><a href="../article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
@@ -121,19 +121,19 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href=".././article-3.html">read more</a>
-                <p>There are <a href=".././article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../article-3.html">read more</a>
+                <p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
         Page 1 / 2
-            <a href=".././author/alexis-metaireau2.html">&raquo;</a>
+            <a href="../author/alexis-metaireau2.html">&raquo;</a>
     </p>
                         </section><!-- /#content -->
                     <section id="extras" class="body">
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 41e225ba..6a92f6d6 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - Alexis Métaireau</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -41,7 +41,7 @@
                     <ol id="posts-list" class="hfeed" start="3">
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././oh-yeah.html" rel="bookmark"
+                    <h1><a href="../oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
@@ -52,11 +52,11 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
-            <a href=".././oh-yeah-fr.html">fr</a>
+        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
+            <a href="../oh-yeah-fr.html">fr</a>
     
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -65,15 +65,15 @@ YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-                <a class="readmore" href=".././oh-yeah.html">read more</a>
-                <p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../oh-yeah.html">read more</a>
+                <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             
 
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
+                    <h1><a href="../second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
@@ -84,23 +84,23 @@ YEAH !</p>
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article-fr.html">fr</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../second-article.html">read more</a>
+                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             
 
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
@@ -111,22 +111,22 @@ YEAH !</p>
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
-                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
+                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             
 
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././unbelievable.html" rel="bookmark"
+                    <h1><a href="../unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
@@ -137,18 +137,18 @@ as well as <strong>inline markup</strong>.</p>
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 
-                <a class="readmore" href=".././unbelievable.html">read more</a>
-                <p>There are <a href=".././unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../unbelievable.html">read more</a>
+                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
-                        <a href=".././author/alexis-metaireau.html">&laquo;</a>
+                        <a href="../author/alexis-metaireau.html">&laquo;</a>
                 Page 2 / 2
     </p>
                         </section><!-- /#content -->
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index 9383ab7a..253d64ea 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - bar</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -38,18 +38,18 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
-            <a href=".././oh-yeah-fr.html">fr</a>
+        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
+            <a href="../oh-yeah-fr.html">fr</a>
     
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -57,7 +57,7 @@
 YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
         Page 1 / 1
     </p>
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index 8b9987b8..92694b44 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - cat1</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li class="active"><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li class="active"><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -38,18 +38,18 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././a-markdown-powered-article.html">A markdown powered article</a></h1> 
+                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href=".././a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -60,7 +60,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././article-1.html" rel="bookmark"
+                    <h1><a href="../article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
@@ -71,21 +71,21 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href=".././article-1.html">read more</a>
-                <p>There are <a href=".././article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../article-1.html">read more</a>
+                <p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             
 
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././article-2.html" rel="bookmark"
+                    <h1><a href="../article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
@@ -96,21 +96,21 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href=".././article-2.html">read more</a>
-                <p>There are <a href=".././article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../article-2.html">read more</a>
+                <p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             
 
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././article-3.html" rel="bookmark"
+                    <h1><a href="../article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
@@ -121,14 +121,14 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/cat1.html">cat1</a>. </p>
+        <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href=".././article-3.html">read more</a>
-                <p>There are <a href=".././article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../article-3.html">read more</a>
+                <p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index 370d937b..c848c9c3 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - misc</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -38,21 +38,21 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article-fr.html">fr</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -63,7 +63,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././unbelievable.html" rel="bookmark"
+                    <h1><a href="../unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
@@ -74,14 +74,14 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 
-                <a class="readmore" href=".././unbelievable.html">read more</a>
-                <p>There are <a href=".././unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../unbelievable.html">read more</a>
+                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index 632e20ec..c39e1a86 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - yeah</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li class="active"><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -38,17 +38,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
+                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -61,7 +61,7 @@
 </pre>
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
-<p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
         Page 1 / 1
     </p>
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index 55c48e78..840b0dfc 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -3,7 +3,7 @@
 <head>
         <title>A draft article</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,20 +24,20 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
-        <a href=".././a-draft-article.html" rel="bookmark"
+        <a href="../a-draft-article.html" rel="bookmark"
            title="Permalink to A draft article">A draft article</a></h1>
           </header>
 
@@ -48,9 +48,9 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
 listed anywhere else.</p>
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 43bc428a..5c3b1da1 100644
--- a/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -3,7 +3,7 @@
 <head>
         <title>This is a test hidden page</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index de90b8a6..5df98726 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -3,7 +3,7 @@
 <head>
         <title>This is a test page</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index b3422fe3..85bc5a07 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - bar</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -38,21 +38,21 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article.html">en</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article.html">en</a>
     
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -63,7 +63,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
+                    <h1><a href="../second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
@@ -74,23 +74,23 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article-fr.html">fr</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../second-article.html">read more</a>
+                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             
 
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
@@ -101,22 +101,22 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
-                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
+                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             
 
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././oh-yeah.html" rel="bookmark"
+                    <h1><a href="../oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
@@ -127,11 +127,11 @@ as well as <strong>inline markup</strong>.</p>
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
-            <a href=".././oh-yeah-fr.html">fr</a>
+        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
+            <a href="../oh-yeah-fr.html">fr</a>
     
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -140,8 +140,8 @@ YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-                <a class="readmore" href=".././oh-yeah.html">read more</a>
-                <p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../oh-yeah.html">read more</a>
+                <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index 4284cbfd..3064aa34 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - baz</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -38,21 +38,21 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article.html">en</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article.html">en</a>
     
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -63,7 +63,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
+                    <h1><a href="../second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
@@ -74,16 +74,16 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article-fr.html">fr</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../second-article.html">read more</a>
+                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index 73ec0423..c6e99849 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - foo</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -38,21 +38,21 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article.html">en</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article.html">en</a>
     
 </footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href=".././second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -63,7 +63,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././second-article.html" rel="bookmark"
+                    <h1><a href="../second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
@@ -74,23 +74,23 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/misc.html">misc</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/baz.html">baz</a></p>Translations: 
-            <a href=".././second-article-fr.html">fr</a>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
+            <a href="../second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href=".././second-article.html">read more</a>
-                <p>There are <a href=".././second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../second-article.html">read more</a>
+                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             
 
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href=".././this-is-a-super-article.html" rel="bookmark"
+                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
@@ -101,15 +101,15 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href=".././this-is-a-super-article.html">read more</a>
-                <p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
+                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index 7f98309f..b7a257e4 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - foobar</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -38,17 +38,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././this-is-a-super-article.html">This is a super article !</a></h1> 
+                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/yeah.html">yeah</a>. </p>
-<p>tags: <a href=".././tag/foo.html">foo</a><a href=".././tag/bar.html">bar</a><a href=".././tag/foobar.html">foobar</a></p>
+        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -61,7 +61,7 @@
 </pre>
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
-<p>There are <a href=".././this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
         Page 1 / 1
     </p>
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index ee066b33..451b1031 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - oh</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -38,18 +38,18 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
-            <a href=".././oh-yeah-fr.html">fr</a>
+        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
+            <a href="../oh-yeah-fr.html">fr</a>
     
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -57,7 +57,7 @@
 YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
         Page 1 / 1
     </p>
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index 9a707121..151eb64c 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -3,7 +3,7 @@
 <head>
         <title>Alexis' log - yeah</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href=".././theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
@@ -11,11 +11,11 @@
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie.css"/>
-                <script src=".././js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href=".././css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -24,13 +24,13 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href=".././">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href=".././pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href=".././category/yeah.html">yeah</a></li>
-                                    <li ><a href=".././category/misc.html">misc</a></li>
-                                    <li ><a href=".././category/cat1.html">cat1</a></li>
-                                    <li ><a href=".././category/bar.html">bar</a></li>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -38,18 +38,18 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href=".././oh-yeah.html">Oh yeah !</a></h1> 
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href=".././author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href=".././category/bar.html">bar</a>. </p>
-<p>tags: <a href=".././tag/oh.html">oh</a><a href=".././tag/bar.html">bar</a><a href=".././tag/yeah.html">yeah</a></p>Translations: 
-            <a href=".././oh-yeah-fr.html">fr</a>
+        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
+            <a href="../oh-yeah-fr.html">fr</a>
     
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -57,7 +57,7 @@
 YEAH !</p>
 <img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-<p>There are <a href=".././oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
         Page 1 / 1
     </p>

From c74abe579bc2b855b6487254bc7a79fab0718c84 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Nov 2012 10:46:32 +0100
Subject: [PATCH 1038/2864] Don't rewrite URLs

Remove the code that was appending ../static in front of some URLs, and add a
way to do cross-content linking.
---
 pelican/__init__.py                       |  4 +-
 pelican/contents.py                       | 96 +++++++++++++++++++++--
 pelican/generators.py                     | 71 ++++++++++++-----
 pelican/utils.py                          | 38 ++++++++-
 pelican/writers.py                        | 67 ----------------
 samples/content/another_super_article.rst |  2 +-
 samples/content/cat1/markdown-article.md  |  3 +
 samples/content/pages/test_page.rst       |  2 +-
 samples/content/super_article.rst         |  4 +-
 samples/content/unbelievable.rst          |  3 +
 tests/support.py                          |  8 ++
 tests/test_generators.py                  | 55 +++++++------
 12 files changed, 228 insertions(+), 125 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index c0f33687..52d371ec 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -134,6 +134,7 @@ class Pelican(object):
         """Run the generators and return"""
 
         context = self.settings.copy()
+        filenames = {}  # share the dict between all the generators
         generators = [
             cls(
                 context,
@@ -142,7 +143,8 @@ class Pelican(object):
                 self.theme,
                 self.output_path,
                 self.markup,
-                self.delete_outputdir
+                self.delete_outputdir,
+                filenames=filenames
             ) for cls in self.get_generator_classes()
         ]
 
diff --git a/pelican/contents.py b/pelican/contents.py
index bb2b5a6e..0d599771 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -3,13 +3,16 @@ import copy
 import locale
 import logging
 import functools
+import os
+import re
+import urlparse
 
 from datetime import datetime
 from sys import platform, stdin
 
 
 from pelican.settings import _DEFAULT_CONFIG
-from pelican.utils import slugify, truncate_html_words
+from pelican.utils import slugify, truncate_html_words, memoized
 from pelican import signals
 
 logger = logging.getLogger(__name__)
@@ -25,7 +28,7 @@ class Page(object):
     default_template = 'page'
 
     def __init__(self, content, metadata=None, settings=None,
-                 filename=None):
+                 filename=None, context=None):
         # init parameters
         if not metadata:
             metadata = {}
@@ -34,6 +37,7 @@ class Page(object):
 
         self.settings = settings
         self._content = content
+        self._context = context
         self.translations = []
 
         local_metadata = dict(settings.get('DEFAULT_METADATA', ()))
@@ -128,12 +132,56 @@ class Page(object):
         key = key if self.in_default_lang else 'lang_%s' % key
         return self._expand_settings(key)
 
+    def _update_content(self, content):
+        """Change all the relative paths of the content to relative paths
+        suitable for the ouput content.
+
+        :param content: content resource that will be passed to the templates.
+        """
+        hrefs = re.compile(r"""
+            (?P<markup><\s*[^\>]*  # match tag with src and href attr
+                (?:href|src)\s*=)
+
+            (?P<quote>["\'])      # require value to be quoted
+            (?P<path>\|(?P<what>.*?)\|(?P<value>.*?))  # the url value
+            \2""", re.X)
+
+        def replacer(m):
+            what = m.group('what')
+            value = m.group('value')
+            origin = m.group('path')
+            # we support only filename for now. the plan is to support
+            # categories, tags, etc. in the future, but let's keep things
+            # simple for now.
+            if what == 'filename':
+                if value.startswith('/'):
+                    value = value[1:]
+                else:
+                    # relative to the filename of this content
+                    value = self.get_relative_filename(
+                        os.path.join(self.relative_dir, value)
+                    )
+
+                if value in self._context['filenames']:
+                    origin = urlparse.urljoin(self._context['SITEURL'],
+                             self._context['filenames'][value].url)
+                else:
+                    logger.warning(u"Unable to find {fn}, skipping url"
+                                    " replacement".format(fn=value))
+
+            return m.group('markup') + m.group('quote') + origin \
+                    + m.group('quote')
+
+        return hrefs.sub(replacer, content)
+
     @property
+    @memoized
     def content(self):
         if hasattr(self, "_get_content"):
             content = self._get_content()
         else:
             content = self._content
+        content = self._update_content(content)
         return content
 
     def _get_summary(self):
@@ -143,7 +191,8 @@ class Page(object):
             return self._summary
         else:
             if self.settings['SUMMARY_MAX_LENGTH']:
-                return truncate_html_words(self.content, self.settings['SUMMARY_MAX_LENGTH'])
+                return truncate_html_words(self.content,
+                        self.settings['SUMMARY_MAX_LENGTH'])
             return self.content
 
     def _set_summary(self, summary):
@@ -162,6 +211,27 @@ class Page(object):
         else:
             return self.default_template
 
+    def get_relative_filename(self, filename=None):
+        """Return the relative path (from the content path) to the given
+        filename.
+
+        If no filename is specified, use the filename of this content object.
+        """
+        if not filename:
+            filename = self.filename
+
+        return os.path.relpath(
+            os.path.abspath(os.path.join(self.settings['PATH'], filename)),
+            os.path.abspath(self.settings['PATH'])
+        )
+
+    @property
+    def relative_dir(self):
+        return os.path.dirname(os.path.relpath(
+            os.path.abspath(self.filename),
+            os.path.abspath(self.settings['PATH']))
+        )
+
 
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')
@@ -227,11 +297,27 @@ class Author(URLWrapper):
     pass
 
 
+class StaticContent(object):
+    def __init__(self, src, dst=None, settings=None):
+        if not settings:
+            settings = copy.deepcopy(_DEFAULT_CONFIG)
+        self.src = src
+        self.url = dst or src
+        self.filepath = os.path.join(settings['PATH'], src)
+        self.save_as = os.path.join(settings['OUTPUT_PATH'], self.url)
+
+    def __str__(self):
+        return str(self.filepath.encode('utf-8', 'replace'))
+
+    def __unicode__(self):
+        return self.filepath
+
+
 def is_valid_content(content, f):
     try:
         content.check_properties()
         return True
     except NameError, e:
-        logger.error(u"Skipping %s: impossible to find informations about '%s'"\
-                % (f, e))
+        logger.error(u"Skipping %s: impossible to find informations about"
+                      "'%s'" % (f, e))
         return False
diff --git a/pelican/generators.py b/pelican/generators.py
index 020a3711..2da7d8bd 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -5,6 +5,7 @@ import random
 import logging
 import datetime
 import subprocess
+import shutil
 
 from codecs import open
 from collections import defaultdict
@@ -15,9 +16,10 @@ from operator import attrgetter, itemgetter
 from jinja2 import (Environment, FileSystemLoader, PrefixLoader, ChoiceLoader,
                     BaseLoader, TemplateNotFound)
 
-from pelican.contents import Article, Page, Category, is_valid_content
+from pelican.contents import Article, Page, Category, StaticContent, \
+        is_valid_content
 from pelican.readers import read_file
-from pelican.utils import copy, process_translations
+from pelican.utils import copy, process_translations, mkdir_p
 from pelican import signals
 
 
@@ -61,6 +63,7 @@ class Generator(object):
         # get custom Jinja filters from user settings
         custom_filters = self.settings.get('JINJA_FILTERS', {})
         self.env.filters.update(custom_filters)
+        self.context['filenames'] = kwargs.get('filenames', {})
 
         signals.generator_init.send(self)
 
@@ -82,8 +85,10 @@ class Generator(object):
 
         :param path: the path to search the file on
         :param exclude: the list of path to exclude
+        :param extensions: the list of allowed extensions (if False, all
+            extensions are allowed)
         """
-        if not extensions:
+        if extensions is None:
             extensions = self.markup
 
         files = []
@@ -97,10 +102,17 @@ class Generator(object):
             for e in exclude:
                 if e in dirs:
                     dirs.remove(e)
-            files.extend([os.sep.join((root, f)) for f in temp_files
-                if True in [f.endswith(ext) for ext in extensions]])
+            for f in temp_files:
+                if extensions is False or \
+                        (True in [f.endswith(ext) for ext in extensions]):
+                    files.append(os.sep.join((root, f)))
         return files
 
+    def add_filename(self, content):
+        location = os.path.relpath(os.path.abspath(content.filename),
+                                   os.path.abspath(self.path))
+        self.context['filenames'][location] = content
+
     def _update_context(self, items):
         """Update the context with the given items from the currrent
         processor.
@@ -300,7 +312,7 @@ class ArticlesGenerator(Generator):
         self.generate_drafts(write)
 
     def generate_context(self):
-        """change the context"""
+        """Add the articles into the shared context"""
 
         article_path = os.path.normpath(  # we have to remove trailing slashes
             os.path.join(self.path, self.settings['ARTICLE_DIR'])
@@ -341,10 +353,12 @@ class ArticlesGenerator(Generator):
 
             signals.article_generate_context.send(self, metadata=metadata)
             article = Article(content, metadata, settings=self.settings,
-                              filename=f)
+                              filename=f, context=self.context)
             if not is_valid_content(article, f):
                 continue
 
+            self.add_filename(article)
+
             if article.status == "published":
                 if hasattr(article, 'tags'):
                     for tag in article.tags:
@@ -440,11 +454,14 @@ class PagesGenerator(Generator):
             except Exception, e:
                 logger.warning(u'Could not process %s\n%s' % (f, str(e)))
                 continue
-            signals.pages_generate_context.send(self, metadata=metadata )
+            signals.pages_generate_context.send(self, metadata=metadata)
             page = Page(content, metadata, settings=self.settings,
-                        filename=f)
+                        filename=f, context=self.context)
             if not is_valid_content(page, f):
                 continue
+
+            self.add_filename(page)
+
             if page.status == "published":
                 all_pages.append(page)
             elif page.status == "hidden":
@@ -479,17 +496,33 @@ class StaticGenerator(Generator):
             copy(path, source, os.path.join(output_path, destination),
                  final_path, overwrite=True)
 
-    def generate_output(self, writer):
+    def generate_context(self):
+        self.staticfiles = []
 
-        self._copy_paths(self.settings['STATIC_PATHS'], self.path,
-                         'static', self.output_path)
+        # walk static paths
+        for static_path in self.settings['STATIC_PATHS']:
+            for f in self.get_files(
+                    os.path.join(self.path, static_path), extensions=False):
+                f_rel = os.path.relpath(f, self.path)
+                # TODO remove this hardcoded 'static' subdirectory
+                sc = StaticContent(f_rel, os.path.join('static', f_rel),
+                        settings=self.settings)
+                self.staticfiles.append(sc)
+                self.context['filenames'][f_rel] = sc
+        # same thing for FILES_TO_COPY
+        for src, dest in self.settings['FILES_TO_COPY']:
+            sc = StaticContent(src, dest, settings=self.settings)
+            self.staticfiles.append(sc)
+            self.context['filenames'][src] = sc
+
+    def generate_output(self, writer):
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
                          'theme', self.output_path, '.')
-
-        # copy all the files needed
-        for source, destination in self.settings['FILES_TO_COPY']:
-            copy(source, self.path, self.output_path, destination,
-                 overwrite=True)
+        # copy all StaticContent files
+        for sc in self.staticfiles:
+            mkdir_p(os.path.dirname(sc.save_as))
+            shutil.copy(sc.filepath, sc.save_as)
+            logger.info('copying %s to %s' % (sc.filepath, sc.save_as))
 
 
 class PdfGenerator(Generator):
@@ -532,8 +565,8 @@ class PdfGenerator(Generator):
             try:
                 os.mkdir(pdf_path)
             except OSError:
-                logger.error("Couldn't create the pdf output folder in " + pdf_path)
-                pass
+                logger.error("Couldn't create the pdf output folder in " +
+                             pdf_path)
 
         for article in self.context['articles']:
             self._create_pdf(article, pdf_path)
diff --git a/pelican/utils.py b/pelican/utils.py
index 79387357..6ca797c4 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -4,7 +4,9 @@ import re
 import pytz
 import shutil
 import logging
-from collections import defaultdict
+import errno
+from collections import defaultdict, Hashable
+from functools import partial
 
 from codecs import open
 from datetime import datetime
@@ -19,6 +21,32 @@ class NoFilesError(Exception):
     pass
 
 
+class memoized(object):
+   '''Decorator. Caches a function's return value each time it is called.
+   If called later with the same arguments, the cached value is returned
+   (not reevaluated).
+   '''
+   def __init__(self, func):
+      self.func = func
+      self.cache = {}
+   def __call__(self, *args):
+      if not isinstance(args, Hashable):
+         # uncacheable. a list, for instance.
+         # better to not cache than blow up.
+         return self.func(*args)
+      if args in self.cache:
+         return self.cache[args]
+      else:
+         value = self.func(*args)
+         self.cache[args] = value
+         return value
+   def __repr__(self):
+      '''Return the function's docstring.'''
+      return self.func.__doc__
+   def __get__(self, obj, objtype):
+      '''Support instance methods.'''
+      return partial(self.__call__, obj)
+
 def get_date(string):
     """Return a datetime object from a string.
 
@@ -300,3 +328,11 @@ def set_date_tzinfo(d, tz_name=None):
         return tz.localize(d)
     else:
         return d
+
+
+def mkdir_p(path):
+    try:
+        os.makedirs(path)
+    except OSError, e:
+        if e.errno != errno.EEXIST:
+            raise
diff --git a/pelican/writers.py b/pelican/writers.py
index b932a805..b24a90dd 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -2,12 +2,10 @@
 from __future__ import with_statement
 
 import os
-import re
 import locale
 import logging
 
 from codecs import open
-from functools import partial
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 from jinja2 import Markup
 from pelican.paginator import Paginator
@@ -129,8 +127,6 @@ class Writer(object):
             localcontext['SITEURL'] = get_relative_path(name)
 
         localcontext.update(kwargs)
-        if relative_urls:
-            self.update_context_contents(name, localcontext)
 
         # check paginated
         paginated = paginated or {}
@@ -168,66 +164,3 @@ class Writer(object):
         else:
             # no pagination
             _write_file(template, localcontext, self.output_path, name)
-
-    def update_context_contents(self, name, context):
-        """Recursively run the context to find elements (articles, pages, etc)
-        whose content getter needs to be modified in order to deal with
-        relative paths.
-
-        :param name: name of the file to output.
-        :param context: dict that will be passed to the templates, which need
-                        to be updated.
-        """
-        def _update_content(name, input):
-            """Change all the relatives paths of the input content to relatives
-            paths suitable fot the ouput content
-
-            :param name: path of the output.
-            :param input: input resource that will be passed to the templates.
-            """
-            content = input._content
-
-            hrefs = re.compile(r"""
-                (?P<markup><\s*[^\>]*  # match tag with src and href attr
-                    (?:href|src)\s*=\s*
-                )
-                (?P<quote>["\'])       # require value to be quoted
-                (?![#?])               # don't match fragment or query URLs
-                (?![a-z]+:)            # don't match protocol URLS
-                (?P<path>.*?)          # the url value
-                \2""", re.X)
-
-            def replacer(m):
-                relative_path = m.group('path')
-                dest_path = os.path.normpath(
-                                os.sep.join((get_relative_path(name), "static",
-                                relative_path)))
-
-                # On Windows, make sure we end up with Unix-like paths.
-                if os.name == 'nt':
-                    dest_path = dest_path.replace('\\', '/')
-
-                return m.group('markup') + m.group('quote') + dest_path \
-                        + m.group('quote')
-
-            return hrefs.sub(replacer, content)
-
-        if context is None:
-            return
-        if hasattr(context, 'values'):
-            context = context.values()
-
-        for item in context:
-            # run recursively on iterables
-            if hasattr(item, '__iter__'):
-                self.update_context_contents(name, item)
-
-            # if it is a content, patch it
-            elif hasattr(item, '_content'):
-                relative_path = get_relative_path(name)
-
-                paths = self.reminder.setdefault(item, [])
-                if relative_path not in paths:
-                    paths.append(relative_path)
-                    setattr(item, "_get_content",
-                        partial(_update_content, name, item))
diff --git a/samples/content/another_super_article.rst b/samples/content/another_super_article.rst
index 5ec1e2b8..e6e0a92c 100644
--- a/samples/content/another_super_article.rst
+++ b/samples/content/another_super_article.rst
@@ -14,7 +14,7 @@ Why not ?
 After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !
 
-.. image:: pictures/Sushi.jpg
+.. image:: |filename|/pictures/Sushi.jpg
    :height: 450 px
    :width: 600 px
    :alt: alternate text
diff --git a/samples/content/cat1/markdown-article.md b/samples/content/cat1/markdown-article.md
index 3bf56dc0..5307b47a 100644
--- a/samples/content/cat1/markdown-article.md
+++ b/samples/content/cat1/markdown-article.md
@@ -2,3 +2,6 @@ Title: A markdown powered article
 Date: 2011-04-20
 
 You're mutually oblivious.
+
+[a root-relative link to unbelievable](|filename|/unbelievable.rst)
+[a file-relative link to unbelievable](|filename|../unbelievable.rst)
diff --git a/samples/content/pages/test_page.rst b/samples/content/pages/test_page.rst
index 06f91c10..2285f17b 100644
--- a/samples/content/pages/test_page.rst
+++ b/samples/content/pages/test_page.rst
@@ -5,7 +5,7 @@ This is a test page
 
 Just an image.
 
-.. image:: pictures/Fat_Cat.jpg
+.. image:: |filename|/pictures/Fat_Cat.jpg
    :height: 450 px
    :width: 600 px
    :alt: alternate text
diff --git a/samples/content/super_article.rst b/samples/content/super_article.rst
index 1dfd8e34..76e57683 100644
--- a/samples/content/super_article.rst
+++ b/samples/content/super_article.rst
@@ -16,12 +16,12 @@ This is a simple title
 
 And here comes the cool stuff_.
 
-.. image:: pictures/Sushi.jpg
+.. image:: |filename|/pictures/Sushi.jpg
    :height: 450 px
    :width: 600 px
    :alt: alternate text
 
-.. image:: pictures/Sushi_Macro.jpg
+.. image:: |filename|/pictures/Sushi_Macro.jpg
    :height: 450 px
    :width: 600 px
    :alt: alternate text
diff --git a/samples/content/unbelievable.rst b/samples/content/unbelievable.rst
index 11443e9a..20cb9dc7 100644
--- a/samples/content/unbelievable.rst
+++ b/samples/content/unbelievable.rst
@@ -4,3 +4,6 @@ Unbelievable !
 :date: 2010-10-15 20:30
 
 Or completely awesome. Depends the needs.
+
+`a root-relative link to markdown-article <|filename|/cat1/markdown-article.md>`_
+`a file-relative link to markdown-article <|filename|cat1/markdown-article.md>`_
diff --git a/tests/support.py b/tests/support.py
index 5b63eeba..b6db5195 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -15,6 +15,7 @@ from tempfile import mkdtemp
 from shutil import rmtree
 
 from pelican.contents import Article
+from pelican.settings import _DEFAULT_CONFIG
 
 try:
     import unittest2 as unittest
@@ -149,3 +150,10 @@ def module_exists(module_name):
         return False
     else:
         return True
+
+
+def get_settings():
+    settings = _DEFAULT_CONFIG.copy()
+    settings['DIRECT_TEMPLATES'] = ['archives']
+    settings['filenames'] = {}
+    return settings
diff --git a/tests/test_generators.py b/tests/test_generators.py
index f8f6a3f4..d2ad6f01 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -11,7 +11,7 @@ from pelican.generators import ArticlesGenerator, PagesGenerator, \
     TemplatePagesGenerator
 from pelican.writers import Writer
 from pelican.settings import _DEFAULT_CONFIG
-from .support import unittest
+from .support import unittest, get_settings
 
 CUR_DIR = os.path.dirname(__file__)
 
@@ -28,20 +28,20 @@ class TestArticlesGenerator(unittest.TestCase):
          for each test.
         """
         if self.generator is None:
-            settings = _DEFAULT_CONFIG.copy()
+            settings = get_settings()
             settings['ARTICLE_DIR'] = 'content'
             settings['DEFAULT_CATEGORY'] = 'Default'
             settings['DEFAULT_DATE'] = (1970, 01, 01)
             self.generator = ArticlesGenerator(settings.copy(), settings,
-                                CUR_DIR, _DEFAULT_CONFIG['THEME'], None,
-                                _DEFAULT_CONFIG['MARKUP'])
+                                CUR_DIR, settings['THEME'], None,
+                                settings['MARKUP'])
             self.generator.generate_context()
         return self.generator
 
     def distill_articles(self, articles):
         distilled = []
         for page in articles:
-           distilled.append([
+            distilled.append([
                     page.title,
                     page.status,
                     page.category.name,
@@ -51,16 +51,16 @@ class TestArticlesGenerator(unittest.TestCase):
         return distilled
 
     def test_generate_feeds(self):
-
-        generator = ArticlesGenerator(None, {'FEED_ALL_ATOM': _DEFAULT_CONFIG['FEED_ALL_ATOM']},
-                                      None, _DEFAULT_CONFIG['THEME'], None,
-                                      _DEFAULT_CONFIG['MARKUP'])
+        settings = get_settings()
+        generator = ArticlesGenerator(settings,
+                {'FEED_ALL_ATOM': settings['FEED_ALL_ATOM']}, None,
+                settings['THEME'], None, settings['MARKUP'])
         writer = MagicMock()
         generator.generate_feeds(writer)
-        writer.write_feed.assert_called_with([], None, 'feeds/all.atom.xml')
+        writer.write_feed.assert_called_with([], settings, 'feeds/all.atom.xml')
 
-        generator = ArticlesGenerator(None, {'FEED_ALL_ATOM': None}, None,
-                                      _DEFAULT_CONFIG['THEME'], None, None)
+        generator = ArticlesGenerator(settings, {'FEED_ALL_ATOM': None}, None,
+                                      settings['THEME'], None, None)
         writer = MagicMock()
         generator.generate_feeds(writer)
         self.assertFalse(writer.write_feed.called)
@@ -106,11 +106,10 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_direct_templates_save_as_default(self):
 
-        settings = _DEFAULT_CONFIG.copy()
-        settings['DIRECT_TEMPLATES'] = ['archives']
-        generator = ArticlesGenerator(settings.copy(), settings, None,
-                                      _DEFAULT_CONFIG['THEME'], None,
-                                      _DEFAULT_CONFIG['MARKUP'])
+        settings = get_settings()
+        generator = ArticlesGenerator(settings, settings, None,
+                                      settings['THEME'], None,
+                                      settings['MARKUP'])
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_with("archives.html",
@@ -119,12 +118,12 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_direct_templates_save_as_modified(self):
 
-        settings = _DEFAULT_CONFIG.copy()
+        settings = get_settings()
         settings['DIRECT_TEMPLATES'] = ['archives']
         settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
         generator = ArticlesGenerator(settings, settings, None,
-                                      _DEFAULT_CONFIG['THEME'], None,
-                                      _DEFAULT_CONFIG['MARKUP'])
+                                      settings['THEME'], None,
+                                      settings['MARKUP'])
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_with("archives/index.html",
@@ -133,12 +132,12 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_direct_templates_save_as_false(self):
 
-        settings = _DEFAULT_CONFIG.copy()
+        settings = get_settings()
         settings['DIRECT_TEMPLATES'] = ['archives']
         settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
         generator = ArticlesGenerator(settings, settings, None,
-                                      _DEFAULT_CONFIG['THEME'], None,
-                                      _DEFAULT_CONFIG['MARKUP'])
+                                      settings['THEME'], None,
+                                      settings['MARKUP'])
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_count == 0
@@ -174,13 +173,13 @@ class TestPageGenerator(unittest.TestCase):
         return distilled
 
     def test_generate_context(self):
-        settings = _DEFAULT_CONFIG.copy()
-
+        settings = get_settings()
         settings['PAGE_DIR'] = 'TestPages'
         settings['DEFAULT_DATE'] = (1970, 01, 01)
+
         generator = PagesGenerator(settings.copy(), settings, CUR_DIR,
-                                      _DEFAULT_CONFIG['THEME'], None,
-                                      _DEFAULT_CONFIG['MARKUP'])
+                                      settings['THEME'], None,
+                                      settings['MARKUP'])
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
         hidden_pages = self.distill_pages(generator.hidden_pages)
@@ -214,7 +213,7 @@ class TestTemplatePagesGenerator(unittest.TestCase):
 
     def test_generate_output(self):
 
-        settings = _DEFAULT_CONFIG.copy()
+        settings = get_settings()
         settings['STATIC_PATHS'] = ['static']
         settings['TEMPLATE_PAGES'] = {
                 'template/source.html': 'generated/file.html'

From b5b35c9fc8532e1a72b7907039079bef895c2f9e Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Nov 2012 10:58:32 +0100
Subject: [PATCH 1039/2864] update functional tests output

$ LC_ALL="C" pelican -o tests/output/custom/ -s samples/pelican.conf.py \
    samples/content/
$ LC_ALL="C" pelican -o tests/output/basic/ samples/content/
---
 tests/output/basic/a-markdown-powered-article.html  |  2 ++
 tests/output/basic/author/alexis-metaireau.html     |  2 +-
 tests/output/basic/category/bar.html                |  2 +-
 tests/output/basic/category/cat1.html               |  4 +++-
 tests/output/basic/category/misc.html               |  2 ++
 tests/output/basic/category/yeah.html               |  4 ++--
 tests/output/basic/feeds/all-en.atom.xml            | 12 ++++++++----
 tests/output/basic/feeds/all.atom.xml               | 12 ++++++++----
 tests/output/basic/feeds/bar.atom.xml               |  2 +-
 tests/output/basic/feeds/cat1.atom.xml              |  4 +++-
 tests/output/basic/feeds/misc.atom.xml              |  2 ++
 tests/output/basic/feeds/yeah.atom.xml              |  4 ++--
 tests/output/basic/index.html                       |  6 +++++-
 tests/output/basic/oh-yeah.html                     |  2 +-
 tests/output/basic/pages/this-is-a-test-page.html   |  2 +-
 tests/output/basic/tag/bar.html                     |  2 +-
 tests/output/basic/tag/foobar.html                  |  4 ++--
 tests/output/basic/tag/oh.html                      |  2 +-
 tests/output/basic/tag/yeah.html                    |  2 +-
 tests/output/basic/this-is-a-super-article.html     |  4 ++--
 tests/output/basic/unbelievable.html                |  2 ++
 tests/output/custom/a-markdown-powered-article.html |  2 ++
 tests/output/custom/author/alexis-metaireau.html    |  4 +++-
 tests/output/custom/author/alexis-metaireau2.html   |  4 +++-
 tests/output/custom/category/bar.html               |  2 +-
 tests/output/custom/category/cat1.html              |  4 +++-
 tests/output/custom/category/misc.html              |  2 ++
 tests/output/custom/category/yeah.html              |  4 ++--
 tests/output/custom/feeds/all-en.atom.xml           | 12 ++++++++----
 tests/output/custom/feeds/all.atom.xml              | 12 ++++++++----
 tests/output/custom/feeds/all.rss.xml               | 12 ++++++++----
 tests/output/custom/feeds/bar.atom.xml              |  2 +-
 tests/output/custom/feeds/bar.rss.xml               |  2 +-
 tests/output/custom/feeds/cat1.atom.xml             |  4 +++-
 tests/output/custom/feeds/cat1.rss.xml              |  4 +++-
 tests/output/custom/feeds/misc.atom.xml             |  2 ++
 tests/output/custom/feeds/misc.rss.xml              |  2 ++
 tests/output/custom/feeds/yeah.atom.xml             |  4 ++--
 tests/output/custom/feeds/yeah.rss.xml              |  4 ++--
 tests/output/custom/index.html                      |  2 ++
 tests/output/custom/index2.html                     |  4 +++-
 tests/output/custom/oh-yeah.html                    |  2 +-
 tests/output/custom/pages/this-is-a-test-page.html  |  2 +-
 tests/output/custom/tag/bar.html                    |  2 +-
 tests/output/custom/tag/foobar.html                 |  4 ++--
 tests/output/custom/tag/oh.html                     |  2 +-
 tests/output/custom/tag/yeah.html                   |  2 +-
 tests/output/custom/this-is-a-super-article.html    |  4 ++--
 tests/output/custom/unbelievable.html               |  2 ++
 49 files changed, 123 insertions(+), 63 deletions(-)

diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index f3e60892..0e4e31f0 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -46,6 +46,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
+<p><a href="unbelievable.html">a root-relative link to unbelievable</a>
+<a href="unbelievable.html">a file-relative link to unbelievable</a></p>
     </div><!-- /.entry-content -->
     
   </article>
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index 106e3581..e6f65a11 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -49,7 +49,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
                             </aside><!-- /#featured -->
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index 88475376..896d9222 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -49,7 +49,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
                                                                 </aside><!-- /#featured -->
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index 180b8f20..bc149fc6 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -42,7 +42,9 @@
 
         <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p>                </article>
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
+<p><a href="unbelievable.html">a root-relative link to unbelievable</a>
+<a href="unbelievable.html">a file-relative link to unbelievable</a></p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index d708da2a..6a088793 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -69,6 +69,8 @@
         <p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
                                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index a414eb6f..37dfde63 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -49,8 +49,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index c7e53da6..bc5418a7 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
@@ -19,7 +21,9 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index c715db8c..645c5890 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
@@ -20,7 +22,9 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/bar.atom.xml b/tests/output/basic/feeds/bar.atom.xml
index 7b842a63..2c988122 100644
--- a/tests/output/basic/feeds/bar.atom.xml
+++ b/tests/output/basic/feeds/bar.atom.xml
@@ -3,6 +3,6 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
index 68e6f4cf..3d8100fd 100644
--- a/tests/output/basic/feeds/cat1.atom.xml
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml
index dce36d06..8e5477ba 100644
--- a/tests/output/basic/feeds/misc.atom.xml
+++ b/tests/output/basic/feeds/misc.atom.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/yeah.atom.xml b/tests/output/basic/feeds/yeah.atom.xml
index fabeb52f..78d1a2d0 100644
--- a/tests/output/basic/feeds/yeah.atom.xml
+++ b/tests/output/basic/feeds/yeah.atom.xml
@@ -3,8 +3,8 @@
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 3f37bdd5..9c00402e 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -69,6 +69,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
+<p><a href="unbelievable.html">a root-relative link to unbelievable</a>
+<a href="unbelievable.html">a file-relative link to unbelievable</a></p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
@@ -188,7 +190,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="./oh-yeah.html">read more</a>
@@ -212,6 +214,8 @@ YEAH !</p>
         <p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="./unbelievable.html">read more</a>
                                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index 2e7b9cbf..ab090b58 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -52,7 +52,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
     </div><!-- /.entry-content -->
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 177dab2f..43e2c2d4 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -34,7 +34,7 @@
     <h1 class="entry-title">This is a test page</h1>
         
         <p>Just an image.</p>
-<img alt="alternate text" src="../static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index fd0d453c..06b012cb 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -125,7 +125,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 18c19770..11f21b6d 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -49,8 +49,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index 3279c1a6..d88192a0 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -49,7 +49,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
                                                                 </aside><!-- /#featured -->
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 31aa542a..8533dbdc 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -49,7 +49,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
                                                                 </aside><!-- /#featured -->
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 4b47c6ba..0188c07e 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -52,8 +52,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index b21867f1..95bc7b85 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -46,6 +46,8 @@
         <p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
     </div><!-- /.entry-content -->
     
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index aea2639b..52d0e5f9 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -53,6 +53,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
+<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
+<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p>
     </div><!-- /.entry-content -->
         <div class="comments">
       <h2>Comments !</h2>
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 422b873e..5a36c27e 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -49,7 +49,9 @@
         </address>
         <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
+<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
+<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 6a92f6d6..e456805b 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -62,7 +62,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
@@ -142,6 +142,8 @@ as well as <strong>inline markup</strong>.</p>
         <p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
                 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index 253d64ea..d291b9df 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -55,7 +55,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index 92694b44..9316faf0 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -49,7 +49,9 @@
         </address>
         <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
+<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
+<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index c848c9c3..6609ce25 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -79,6 +79,8 @@
         <p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
                 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index c39e1a86..587e2f97 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -53,8 +53,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/custom/feeds/all-en.atom.xml b/tests/output/custom/feeds/all-en.atom.xml
index db5fc2de..f8eb3219 100644
--- a/tests/output/custom/feeds/all-en.atom.xml
+++ b/tests/output/custom/feeds/all-en.atom.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
@@ -19,7 +21,9 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all.atom.xml b/tests/output/custom/feeds/all.atom.xml
index b72f1e15..b009d135 100644
--- a/tests/output/custom/feeds/all.atom.xml
+++ b/tests/output/custom/feeds/all.atom.xml
@@ -2,15 +2,17 @@
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
@@ -21,7 +23,9 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/all.rss.xml b/tests/output/custom/feeds/all.rss.xml
index 8fbf7b04..786cb097 100644
--- a/tests/output/custom/feeds/all.rss.xml
+++ b/tests/output/custom/feeds/all.rss.xml
@@ -2,15 +2,17 @@
 <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
@@ -21,7 +23,9 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/bar.atom.xml b/tests/output/custom/feeds/bar.atom.xml
index 9b29f6c9..9945f938 100644
--- a/tests/output/custom/feeds/bar.atom.xml
+++ b/tests/output/custom/feeds/bar.atom.xml
@@ -3,6 +3,6 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/bar.rss.xml b/tests/output/custom/feeds/bar.rss.xml
index c958edbf..a7495c36 100644
--- a/tests/output/custom/feeds/bar.rss.xml
+++ b/tests/output/custom/feeds/bar.rss.xml
@@ -3,6 +3,6 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/cat1.atom.xml b/tests/output/custom/feeds/cat1.atom.xml
index 72703065..5454ce4d 100644
--- a/tests/output/custom/feeds/cat1.atom.xml
+++ b/tests/output/custom/feeds/cat1.atom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/cat1.rss.xml b/tests/output/custom/feeds/cat1.rss.xml
index f5871487..349c3fe6 100644
--- a/tests/output/custom/feeds/cat1.rss.xml
+++ b/tests/output/custom/feeds/cat1.rss.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/misc.atom.xml b/tests/output/custom/feeds/misc.atom.xml
index cce84da9..dbf8bbfd 100644
--- a/tests/output/custom/feeds/misc.atom.xml
+++ b/tests/output/custom/feeds/misc.atom.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/misc.rss.xml b/tests/output/custom/feeds/misc.rss.xml
index 938bce29..bbc5a48e 100644
--- a/tests/output/custom/feeds/misc.rss.xml
+++ b/tests/output/custom/feeds/misc.rss.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/tests/output/custom/feeds/yeah.atom.xml b/tests/output/custom/feeds/yeah.atom.xml
index 802f6329..d2307359 100644
--- a/tests/output/custom/feeds/yeah.atom.xml
+++ b/tests/output/custom/feeds/yeah.atom.xml
@@ -3,8 +3,8 @@
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
diff --git a/tests/output/custom/feeds/yeah.rss.xml b/tests/output/custom/feeds/yeah.rss.xml
index 68e96cf9..a54e48e4 100644
--- a/tests/output/custom/feeds/yeah.rss.xml
+++ b/tests/output/custom/feeds/yeah.rss.xml
@@ -3,8 +3,8 @@
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index a6838a84..7b7cb84b 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -79,6 +79,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
+<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
+<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
                 <p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index ba4e4f1a..8e308821 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -113,7 +113,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="./oh-yeah.html">read more</a>
@@ -140,6 +140,8 @@ YEAH !</p>
         <p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="./unbelievable.html">read more</a>
                 <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index ce14133e..aafcc69d 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -58,7 +58,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
     </div><!-- /.entry-content -->
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index 5df98726..6cb1c582 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -38,7 +38,7 @@
     <h1 class="entry-title">This is a test page</h1>
         
         <p>Just an image.</p>
-<img alt="alternate text" src="../static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 85bc5a07..319f9595 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -137,7 +137,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index b7a257e4..c8653686 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -53,8 +53,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index 451b1031..ddec0f41 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -55,7 +55,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index 151eb64c..a000affd 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -55,7 +55,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 50daa573..0f1e198b 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -56,8 +56,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index 5333cfdb..f22a05a2 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -53,6 +53,8 @@
         <p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
     </div><!-- /.entry-content -->
         <div class="comments">

From a6dd3178b1f8285aec57a31004e49590ada79a0c Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Nov 2012 15:10:51 +0100
Subject: [PATCH 1040/2864] test that 4 occurences of log "skipping url
 replacement" are found

---
 tests/support.py      | 17 +++++++++++++++++
 tests/test_pelican.py |  9 +++++++++
 2 files changed, 26 insertions(+)

diff --git a/tests/support.py b/tests/support.py
index b6db5195..1bbaf47e 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -8,6 +8,8 @@ import os
 import re
 import subprocess
 import sys
+import logging
+from logging.handlers import BufferingHandler
 
 from functools import wraps
 from contextlib import contextmanager
@@ -157,3 +159,18 @@ def get_settings():
     settings['DIRECT_TEMPLATES'] = ['archives']
     settings['filenames'] = {}
     return settings
+
+
+class LogCountHandler(BufferingHandler):
+    """
+    Capturing and counting logged messages.
+    """
+
+    def __init__(self, capacity=1000):
+        logging.handlers.BufferingHandler.__init__(self, capacity)
+
+    def count_logs(self, msg=None, level=None):
+        return len([l for l in self.buffer
+            if (msg is None or re.match(msg, l.getMessage()))
+            and (level is None or l.levelno == level)
+            ])
diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 39c820c8..514b4cba 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -8,11 +8,13 @@ from filecmp import dircmp
 from tempfile import mkdtemp
 from shutil import rmtree
 import locale
+import logging
 
 from mock import patch
 
 from pelican import Pelican
 from pelican.settings import read_settings
+from .support import LogCountHandler
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
 SAMPLES_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "..", "samples")))
@@ -42,6 +44,8 @@ class TestPelican(unittest.TestCase):
     # to run pelican in different situations and see how it behaves
 
     def setUp(self):
+        self.logcount_handler = LogCountHandler()
+        logging.getLogger().addHandler(self.logcount_handler)
         self.temp_path = mkdtemp()
         self.old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, 'C')
@@ -49,6 +53,7 @@ class TestPelican(unittest.TestCase):
     def tearDown(self):
         rmtree(self.temp_path)
         locale.setlocale(locale.LC_ALL, self.old_locale)
+        logging.getLogger().removeHandler(self.logcount_handler)
 
     def assertFilesEqual(self, diff):
         msg = "some generated files differ from the expected functional " \
@@ -73,6 +78,10 @@ class TestPelican(unittest.TestCase):
         pelican.run()
         dcmp = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
         self.assertFilesEqual(recursiveDiff(dcmp))
+        self.assertEqual(self.logcount_handler.count_logs(
+            msg="Unable to find.*skipping url replacement",
+            level=logging.WARNING,
+            ), 4, msg="bad number of occurences found for this log")
 
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work

From a0504aeabe91f9107801661fa6bf6a6d46dc38a8 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 1 Dec 2012 18:22:43 +0100
Subject: [PATCH 1041/2864] add support for relative cross-site links

---
 pelican/__init__.py      |  5 ++---
 pelican/contents.py      | 24 +++++++++++++-----------
 pelican/generators.py    |  1 -
 pelican/writers.py       |  6 ++++--
 tests/test_contents.py   |  6 +++++-
 tests/test_generators.py |  1 +
 tests/test_pelican.py    |  2 +-
 7 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 52d371ec..a175e2a8 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -134,7 +134,8 @@ class Pelican(object):
         """Run the generators and return"""
 
         context = self.settings.copy()
-        filenames = {}  # share the dict between all the generators
+        context['filenames'] = {}  # share the dict between all the generators
+        context['localsiteurl'] = self.settings.get('SITEURL')  # share
         generators = [
             cls(
                 context,
@@ -143,8 +144,6 @@ class Pelican(object):
                 self.theme,
                 self.output_path,
                 self.markup,
-                self.delete_outputdir,
-                filenames=filenames
             ) for cls in self.get_generator_classes()
         ]
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 0d599771..522892ba 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -5,7 +5,6 @@ import logging
 import functools
 import os
 import re
-import urlparse
 
 from datetime import datetime
 from sys import platform, stdin
@@ -132,11 +131,13 @@ class Page(object):
         key = key if self.in_default_lang else 'lang_%s' % key
         return self._expand_settings(key)
 
-    def _update_content(self, content):
+    def _update_content(self, content, siteurl):
         """Change all the relative paths of the content to relative paths
         suitable for the ouput content.
 
         :param content: content resource that will be passed to the templates.
+        :param siteurl: siteurl which is locally generated by the writer in
+            case of RELATIVE_URLS.
         """
         hrefs = re.compile(r"""
             (?P<markup><\s*[^\>]*  # match tag with src and href attr
@@ -163,8 +164,8 @@ class Page(object):
                     )
 
                 if value in self._context['filenames']:
-                    origin = urlparse.urljoin(self._context['SITEURL'],
-                             self._context['filenames'][value].url)
+                    origin = '/'.join((siteurl,
+                             self._context['filenames'][value].url))
                 else:
                     logger.warning(u"Unable to find {fn}, skipping url"
                                     " replacement".format(fn=value))
@@ -174,15 +175,16 @@ class Page(object):
 
         return hrefs.sub(replacer, content)
 
-    @property
     @memoized
+    def get_content(self, siteurl):
+        return self._update_content(
+                self._get_content() if hasattr(self, "_get_content")
+                    else self._content,
+                siteurl)
+
+    @property
     def content(self):
-        if hasattr(self, "_get_content"):
-            content = self._get_content()
-        else:
-            content = self._content
-        content = self._update_content(content)
-        return content
+        return self.get_content(self._context['localsiteurl'])
 
     def _get_summary(self):
         """Returns the summary of an article, based on the summary metadata
diff --git a/pelican/generators.py b/pelican/generators.py
index 2da7d8bd..b5c1b944 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -63,7 +63,6 @@ class Generator(object):
         # get custom Jinja filters from user settings
         custom_filters = self.settings.get('JINJA_FILTERS', {})
         self.env.filters.update(custom_filters)
-        self.context['filenames'] = kwargs.get('filenames', {})
 
         signals.generator_init.send(self)
 
diff --git a/pelican/writers.py b/pelican/writers.py
index b24a90dd..42ddfb13 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -39,7 +39,7 @@ class Writer(object):
             link='%s/%s' % (self.site_url, item.url),
             unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''),
                                         item.date.date(), item.url),
-            description=item.content,
+            description=item.get_content(self.site_url),
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', ''),
             pubdate=set_date_tzinfo(item.date,
@@ -124,7 +124,9 @@ class Writer(object):
 
         localcontext = context.copy()
         if relative_urls:
-            localcontext['SITEURL'] = get_relative_path(name)
+            relative_path = get_relative_path(name)
+            context['localsiteurl'] = relative_path
+            localcontext['SITEURL'] = relative_path
 
         localcontext.update(kwargs)
 
diff --git a/tests/test_contents.py b/tests/test_contents.py
index 8683d674..a8b9877f 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -19,6 +19,9 @@ class TestPage(unittest.TestCase):
         super(TestPage, self).setUp()
         self.page_kwargs = {
             'content': TEST_CONTENT,
+            'context': {
+                'localsiteurl': '',
+            },
             'metadata': {
                 'summary': TEST_SUMMARY,
                 'title': 'foo bar',
@@ -32,7 +35,8 @@ class TestPage(unittest.TestCase):
 
         """
         metadata = {'foo': 'bar', 'foobar': 'baz', 'title': 'foobar', }
-        page = Page(TEST_CONTENT, metadata=metadata)
+        page = Page(TEST_CONTENT, metadata=metadata,
+                context={'localsiteurl': ''})
         for key, value in metadata.items():
             self.assertTrue(hasattr(page, key))
             self.assertEqual(value, getattr(page, key))
diff --git a/tests/test_generators.py b/tests/test_generators.py
index d2ad6f01..7abaf687 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -96,6 +96,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 01, 01)
         settings['USE_FOLDER_AS_CATEGORY'] = False
+        settings['filenames'] = {}
         generator = ArticlesGenerator(settings.copy(), settings,
                             CUR_DIR, _DEFAULT_CONFIG['THEME'], None,
                             _DEFAULT_CONFIG['MARKUP'])
diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 514b4cba..e5de0608 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -81,7 +81,7 @@ class TestPelican(unittest.TestCase):
         self.assertEqual(self.logcount_handler.count_logs(
             msg="Unable to find.*skipping url replacement",
             level=logging.WARNING,
-            ), 4, msg="bad number of occurences found for this log")
+            ), 10, msg="bad number of occurences found for this log")
 
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work

From 523ac9f64cd5851771387c10b2dd85a326edec80 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 1 Dec 2012 18:22:54 +0100
Subject: [PATCH 1042/2864] update functional test output (relative cross-site
 links support)

$ LC_ALL="C" pelican -o tests/output/custom/ -s samples/pelican.conf.py \
    samples/content/
$ LC_ALL="C" pelican -o tests/output/basic/ samples/content/
---
 tests/output/basic/a-markdown-powered-article.html  | 4 ++--
 tests/output/basic/category/cat1.html               | 4 ++--
 tests/output/basic/category/misc.html               | 4 ++--
 tests/output/basic/feeds/all-en.atom.xml            | 8 ++++----
 tests/output/basic/feeds/all.atom.xml               | 8 ++++----
 tests/output/basic/feeds/cat1.atom.xml              | 4 ++--
 tests/output/basic/feeds/misc.atom.xml              | 4 ++--
 tests/output/basic/index.html                       | 8 ++++----
 tests/output/basic/unbelievable.html                | 4 ++--
 tests/output/custom/a-markdown-powered-article.html | 4 ++--
 tests/output/custom/author/alexis-metaireau.html    | 4 ++--
 tests/output/custom/author/alexis-metaireau2.html   | 6 +++---
 tests/output/custom/category/bar.html               | 2 +-
 tests/output/custom/category/cat1.html              | 4 ++--
 tests/output/custom/category/misc.html              | 4 ++--
 tests/output/custom/category/yeah.html              | 4 ++--
 tests/output/custom/index.html                      | 4 ++--
 tests/output/custom/index2.html                     | 6 +++---
 tests/output/custom/oh-yeah.html                    | 2 +-
 tests/output/custom/pages/this-is-a-test-page.html  | 2 +-
 tests/output/custom/tag/bar.html                    | 2 +-
 tests/output/custom/tag/foobar.html                 | 4 ++--
 tests/output/custom/tag/oh.html                     | 2 +-
 tests/output/custom/tag/yeah.html                   | 2 +-
 tests/output/custom/this-is-a-super-article.html    | 4 ++--
 tests/output/custom/unbelievable.html               | 4 ++--
 26 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 0e4e31f0..80a12212 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -46,8 +46,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
-<p><a href="unbelievable.html">a root-relative link to unbelievable</a>
-<a href="unbelievable.html">a file-relative link to unbelievable</a></p>
+<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
+<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
     </div><!-- /.entry-content -->
     
   </article>
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index bc149fc6..b8ae397e 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -43,8 +43,8 @@
         <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="unbelievable.html">a root-relative link to unbelievable</a>
-<a href="unbelievable.html">a file-relative link to unbelievable</a></p>                </article>
+<p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
+<a href="../unbelievable.html">a file-relative link to unbelievable</a></p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index 6a088793..86cf5470 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -69,8 +69,8 @@
         <p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
                                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index bc5418a7..fc05c4b3 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+&lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -24,6 +24,6 @@ YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index 645c5890..f3a1a6f4 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -2,8 +2,8 @@
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+&lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -25,6 +25,6 @@ YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml
index 3d8100fd..2fa534aa 100644
--- a/tests/output/basic/feeds/cat1.atom.xml
+++ b/tests/output/basic/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+&lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml
index 8e5477ba..40ad44c5 100644
--- a/tests/output/basic/feeds/misc.atom.xml
+++ b/tests/output/basic/feeds/misc.atom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 9c00402e..97bb5256 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -69,8 +69,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="unbelievable.html">a root-relative link to unbelievable</a>
-<a href="unbelievable.html">a file-relative link to unbelievable</a></p>
+<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
+<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
@@ -214,8 +214,8 @@ YEAH !</p>
         <p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="./unbelievable.html">read more</a>
                                 </div><!-- /.entry-content -->
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 95bc7b85..36a1703c 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -46,8 +46,8 @@
         <p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
     </div><!-- /.entry-content -->
     
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index 52d0e5f9..49c0d422 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -53,8 +53,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
-<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
-<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p>
+<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
+<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
     </div><!-- /.entry-content -->
         <div class="comments">
       <h2>Comments !</h2>
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 5a36c27e..eb39ae57 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -50,8 +50,8 @@
         <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
-<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
+<p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
+<a href="../unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index e456805b..a87c85af 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -62,7 +62,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
@@ -142,8 +142,8 @@ as well as <strong>inline markup</strong>.</p>
         <p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
                 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index d291b9df..253d64ea 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -55,7 +55,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index 9316faf0..8c265d41 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -50,8 +50,8 @@
         <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
-<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
+<p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
+<a href="../unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index 6609ce25..24a53791 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -79,8 +79,8 @@
         <p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
                 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index 587e2f97..c39e1a86 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -53,8 +53,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index 7b7cb84b..eab96fa1 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -79,8 +79,8 @@
         <p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="http://blog.notmyidea.org/unbelievable.html">a root-relative link to unbelievable</a>
-<a href="http://blog.notmyidea.org/unbelievable.html">a file-relative link to unbelievable</a></p>
+<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
+<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
                 <p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index 8e308821..5269ed70 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -113,7 +113,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="./oh-yeah.html">read more</a>
@@ -140,8 +140,8 @@ YEAH !</p>
         <p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="./unbelievable.html">read more</a>
                 <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index aafcc69d..cb30a7d6 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -58,7 +58,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
     </div><!-- /.entry-content -->
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index 6cb1c582..5df98726 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -38,7 +38,7 @@
     <h1 class="entry-title">This is a test page</h1>
         
         <p>Just an image.</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 319f9595..85bc5a07 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -137,7 +137,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index c8653686..b7a257e4 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -53,8 +53,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index ddec0f41..451b1031 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -55,7 +55,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index a000affd..151eb64c 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -55,7 +55,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 0f1e198b..98d22351 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -56,8 +56,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index f22a05a2..691f28f6 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -53,8 +53,8 @@
         <p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
     </div><!-- /.entry-content -->
         <div class="comments">

From 81cb774a8e807453a82921aa31f2f1325b6a3d23 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 1 Dec 2012 21:35:15 +0100
Subject: [PATCH 1043/2864] add docs for cross-site linking

---
 docs/getting_started.rst | 44 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 467363de..bc3d2bbe 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -226,6 +226,50 @@ If you want to exclude any pages from being linked to or listed in the menu
 then add a ``status: hidden`` attribute to its metadata. This is useful for
 things like making error pages that fit the generated theme of your site.
 
+Linking to internal content
+---------------------------
+
+Since Pelican 3.1, you now have the ability to do cross-site linking.
+
+To link to an internal content, you will have to use the following syntax:
+``|filename|path/to/file``.
+
+For example, you may want to add links between "article1" and "article2" given
+the structure::
+
+    website/
+    ├── content
+    │   ├── article1.rst
+    │   └── cat/
+    │       └── article2.md
+    └── pelican.conf.py
+
+In this example, ``article1.rst`` could look like::
+
+    Title: The first article
+    Date: 2012-12-01
+
+    See below cross-site links examples in restructured text.
+
+    `a root-relative link <|filename|/cat/article2.md>`_
+    `a file-relative link <|filename|cat/article2.md>`_
+
+and ``article2.md``::
+
+    Title: The second article
+    Date: 2012-12-01
+
+    See below cross-site links examples in markdown.
+
+    [a root-relative link](|filename|/article1.rst)
+    [a file-relative link](|filename|../article1.rst)
+
+.. note::
+
+    You can use the same syntax to link to internal pages or even static
+    content (like images) which would be available in a directory listed in
+    ``settings["STATIC_PATHS"]``.
+
 Importing an existing blog
 --------------------------
 

From 891a66ad8bd0913c064f176db3dba405f83b7aaa Mon Sep 17 00:00:00 2001
From: Michael Reneer <michaelreneer@gmail.com>
Date: Sun, 2 Dec 2012 13:11:47 -0500
Subject: [PATCH 1044/2864] Updated documentation to reflect addition of new
 markdown types.

---
 docs/getting_started.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index bc3d2bbe..7b44034c 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -162,10 +162,10 @@ Pelican implements an extension of reStructuredText to enable support for the
 
     This will be turned into :abbr:`HTML (HyperText Markup Language)`.
 
-You can also use Markdown syntax (with a file ending in ``.md``).
-Markdown generation will not work until you explicitly install the ``Markdown``
-package, which can be done via ``pip install Markdown``. Metadata syntax for
-Markdown posts should follow this pattern::
+You can also use Markdown syntax (with a file ending in ``.md``, ``.markdown``,
+or ``.mkd``). Markdown generation will not work until you explicitly install the
+``Markdown`` package, which can be done via ``pip install Markdown``. Metadata
+syntax for Markdown posts should follow this pattern::
 
     Title: My super title
     Date: 2010-12-03 10:20

From 49f481e399af45bf12f53afd129bd6a873dc2f27 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Sun, 28 Oct 2012 07:37:53 -0700
Subject: [PATCH 1045/2864] Add asciidoc reader support

http://www.methods.co.nz/asciidoc/index.html

Processes files ending in .asc with asciidoc. Extra arguments can be
passed by using the ASCIIDOC_OPTIONS config setting
---
 docs/changelog.rst                           |  1 +
 docs/getting_started.rst                     |  4 ++
 docs/index.rst                               |  3 +-
 docs/internals.rst                           | 10 ++---
 docs/settings.rst                            |  2 +
 pelican/readers.py                           | 36 ++++++++++++++++
 tests/content/article_with_asc_extension.asc | 12 ++++++
 tests/content/article_with_asc_options.asc   |  9 ++++
 tests/test_readers.py                        | 43 ++++++++++++++++++++
 9 files changed, 114 insertions(+), 6 deletions(-)
 create mode 100644 tests/content/article_with_asc_extension.asc
 create mode 100644 tests/content/article_with_asc_options.asc

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f60c6e47..f25ee3d9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -24,6 +24,7 @@ Release history
 * Add the gzip_cache plugin which compresses common text files into a ``.gz``
   file within the same directory as the original file to prevent the server
   (e.g. Nginx) from compressing files during an HTTP call.
+* Add AsciiDoc support
 
 3.0 (2012-08-08)
 ==================
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index bc3d2bbe..8959f536 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -42,6 +42,10 @@ Markdown library as well::
 
     $ pip install Markdown
 
+If you want to use AsciiDoc you need to install it from `source
+<http://www.methods.co.nz/asciidoc/INSTALL.html>`_ or use your operating
+system's package manager.
+
 Upgrading
 ---------
 
diff --git a/docs/index.rst b/docs/index.rst
index fd99b449..8206727c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -4,7 +4,7 @@ Pelican
 Pelican is a static site generator, written in Python_.
 
 * Write your weblog entries directly with your editor of choice (vim!)
-  in reStructuredText_ or Markdown_
+  in reStructuredText_, Markdown_ or AsciiDoc_
 * Includes a simple CLI tool to (re)generate the weblog
 * Easy to interface with DVCSes and web hooks
 * Completely static output is easy to host anywhere
@@ -74,6 +74,7 @@ A French version of the documentation is available at :doc:`fr/index`.
 .. _Python: http://www.python.org/
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Markdown: http://daringfireball.net/projects/markdown/
+.. _AsciiDoc: http://www.methods.co.nz/asciidoc/index.html
 .. _Jinja2: http://jinja.pocoo.org/
 .. _`Pelican documentation`: http://docs.getpelican.com/latest/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
diff --git a/docs/internals.rst b/docs/internals.rst
index a6264476..280e14d7 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -12,8 +12,8 @@ original author wrote with some software design information.
 Overall structure
 =================
 
-What Pelican does is take a list of files and process them into some
-sort of output. Usually, the input files are reStructuredText and Markdown
+What Pelican does is take a list of files and process them into some sort of
+output. Usually, the input files are reStructuredText, Markdown and AsciiDoc
 files, and the output is a blog, but both input and output can be anything you
 want.
 
@@ -23,9 +23,9 @@ The logic is separated into different classes and concepts:
   on. Since those operations are commonly used, the object is created once and
   then passed to the generators.
 
-* **Readers** are used to read from various formats (Markdown and
-  reStructuredText for now, but the system is extensible). Given a file, they return
-  metadata (author, tags, category, etc.) and content (HTML-formatted).
+* **Readers** are used to read from various formats (AsciiDoc, Markdown and
+  reStructuredText for now, but the system is extensible). Given a file, they
+  return metadata (author, tags, category, etc.) and content (HTML-formatted).
 
 * **Generators** generate the different outputs. For instance, Pelican comes with
   ``ArticlesGenerator`` and ``PageGenerator``. Given a configuration, they can do
diff --git a/docs/settings.rst b/docs/settings.rst
index a7cf107b..7d73afe0 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -121,6 +121,8 @@ Setting name (default value)                                            What doe
                                                                         This templates need to use ``DIRECT_TEMPLATES`` setting
 
 `MARKDOWN_EXTENSIONS` (``['toc',]``)                                    A list of any Markdown extensions you want to use.
+`ASCIIDOC_OPTIONS` (``[]``)                                             A list of options to pass to asciidoc, see the `manpage
+                                                                        <http://www.methods.co.nz/asciidoc/manpage.html>`_
 =====================================================================   =====================================================================
 
 .. [#] Default is the system locale.
diff --git a/pelican/readers.py b/pelican/readers.py
index 42995688..f04b4a03 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -13,6 +13,11 @@ try:
     from markdown import Markdown
 except ImportError:
     Markdown = False  # NOQA
+try:
+    from asciidocapi import AsciiDocAPI
+    asciidoc = True
+except ImportError:
+    asciidoc = False
 import re
 
 from pelican.contents import Category, Tag, Author
@@ -162,6 +167,37 @@ class HtmlReader(Reader):
             return content, metadata
 
 
+class AsciiDocReader(Reader):
+    enabled = bool(asciidoc)
+    file_extensions = ['asc']
+    default_options = ["--no-header-footer", "-a newline=\\n"]
+
+    def read(self, filename):
+        """Parse content and metadata of asciidoc files"""
+        from cStringIO import StringIO
+        text = StringIO(pelican_open(filename))
+        content = StringIO()
+        ad = AsciiDocAPI()
+
+        options = self.settings.get('ASCIIDOC_OPTIONS', [])
+        if isinstance(options, (str, unicode)):
+            options = [m.strip() for m in options.split(',')]
+        options = self.default_options + options
+        for o in options:
+            ad.options(*o.split())
+
+        ad.execute(text, content, backend="html4")
+        content = content.getvalue()
+
+        metadata = {}
+        for name, value in ad.asciidoc.document.attributes.items():
+            name = name.lower()
+            metadata[name] = self.process_metadata(name, value)
+        if 'doctitle' in metadata:
+            metadata['title'] = metadata['doctitle']
+        return content, metadata
+
+
 _EXTENSIONS = {}
 
 for cls in Reader.__subclasses__():
diff --git a/tests/content/article_with_asc_extension.asc b/tests/content/article_with_asc_extension.asc
new file mode 100644
index 00000000..9ce2166c
--- /dev/null
+++ b/tests/content/article_with_asc_extension.asc
@@ -0,0 +1,12 @@
+Test AsciiDoc File Header
+=========================
+:Author: Author O. Article
+:Email: <author@nowhere.com>
+:Date: 2011-09-15 09:05
+:Category: Blog
+:Tags: Linux, Python, Pelican
+
+Used for pelican test
+---------------------
+
+The quick brown fox jumped over the lazy dog's back.
diff --git a/tests/content/article_with_asc_options.asc b/tests/content/article_with_asc_options.asc
new file mode 100644
index 00000000..bafb3a4a
--- /dev/null
+++ b/tests/content/article_with_asc_options.asc
@@ -0,0 +1,9 @@
+Test AsciiDoc File Header
+=========================
+
+Used for pelican test
+---------------------
+
+version {revision}
+
+The quick brown fox jumped over the lazy dog's back.
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 406027c1..c9d22c18 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -109,3 +109,46 @@ class MdReaderTest(unittest.TestCase):
             '<h3 id="level2">Level2</h3>'
 
         self.assertEqual(content, expected)
+
+class AdReaderTest(unittest.TestCase):
+
+    @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
+    def test_article_with_asc_extension(self):
+        # test to ensure the asc extension is being processed by the correct reader
+        reader = readers.AsciiDocReader({})
+        content, metadata = reader.read(_filename('article_with_asc_extension.asc'))
+        expected = '<hr>\n<h2><a name="_used_for_pelican_test"></a>Used for pelican test</h2>\n'\
+                   '<p>The quick brown fox jumped over the lazy dog&#8217;s back.</p>\n'
+        self.assertEqual(content, expected)
+        expected = {
+            'category': 'Blog',
+            'author': 'Author O. Article',
+            'title': 'Test AsciiDoc File Header',
+            'date': datetime.datetime(2011, 9, 15, 9, 5),
+            'tags': ['Linux', 'Python', 'Pelican'],
+        }
+
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
+
+
+        expected = {
+            'category': 'Blog',
+            'author': 'Author O. Article',
+            'title': 'Test AsciiDoc File Header',
+            'date': datetime.datetime(2011, 9, 15, 9, 5),
+            'tags': ['Linux', 'Python', 'Pelican'],
+        }
+
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
+
+    @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
+    def test_article_with_asc_options(self):
+        # test to ensure the ASCIIDOC_OPTIONS is being used
+        reader = readers.AsciiDocReader(dict(ASCIIDOC_OPTIONS=["-a revision=1.0.42"]))
+        content, metadata = reader.read(_filename('article_with_asc_options.asc'))
+        expected = '<hr>\n<h2><a name="_used_for_pelican_test"></a>Used for pelican test</h2>\n'\
+                   '<p>version 1.0.42</p>\n'\
+                   '<p>The quick brown fox jumped over the lazy dog&#8217;s back.</p>\n'
+        self.assertEqual(content, expected)

From a0049f9fcddf967d036a88fcf17169982f3fc993 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 2 Dec 2012 16:10:11 -0800
Subject: [PATCH 1046/2864] Strip tags from title in simple index. Fixes #612

This fix was applied previously to the relevant places in both the
"simple" and "notmyidea" themes, but the simple theme's index.html file
was apparently neglected.
---
 pelican/themes/simple/templates/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index dfdb0b45..5bb94dfc 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -1,14 +1,14 @@
 {% extends "base.html" %}
-{% block content %}        
+{% block content %}
 <section id="content">
 {% block content_title %}
 <h2>All articles</h2>
 {% endblock %}
 
 <ol id="post-list">
-{% for article in articles_page.object_list %}        
-        <li><article class="hentry">    
-                <header> <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> </header>
+{% for article in articles_page.object_list %}
+        <li><article class="hentry">
+                <header> <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2> </header>
                 <footer class="post-info">
                     <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr>
                     {% if article.author %}<address class="vcard author">By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></address>{% endif %}

From debd6fb3b4a472c80a8fc7924eddf6e79856e725 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 28 Nov 2012 00:29:30 +0100
Subject: [PATCH 1047/2864] add FILENAME_METADATA setting to extract metadata
 from filename

FILENAME_METADATA default to '(?P<date>\d{4}-\d{2}-\d{2}).*' which will allow
to extract date metadata from the filename.
---
 pelican/readers.py  | 14 +++++++++++++-
 pelican/settings.py | 12 +++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index f04b4a03..ad2b0f74 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import os
+import re
 try:
     import docutils
     import docutils.core
@@ -207,8 +209,9 @@ for cls in Reader.__subclasses__():
 
 def read_file(filename, fmt=None, settings=None):
     """Return a reader object using the given format."""
+    base, ext = os.path.splitext(os.path.basename(filename))
     if not fmt:
-        fmt = filename.split('.')[-1]
+        fmt = ext[1:]
 
     if fmt not in _EXTENSIONS:
         raise TypeError('Pelican does not know how to parse %s' % filename)
@@ -230,4 +233,13 @@ def read_file(filename, fmt=None, settings=None):
         content = typogrify(content)
         metadata['title'] = typogrify(metadata['title'])
 
+    filename_metadata = settings and settings.get('FILENAME_METADATA')
+    if filename_metadata:
+        match = re.match(filename_metadata, base)
+        if match:
+            for k, v in match.groupdict().iteritems():
+                if k not in metadata:
+                    k = k.lower()  # metadata must be lowercase
+                    metadata[k] = reader.process_metadata(k, v)
+
     return content, metadata
diff --git a/pelican/settings.py b/pelican/settings.py
index d2c0cef5..a98f3538 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -5,6 +5,7 @@ import inspect
 import os
 import locale
 import logging
+import re
 
 from os.path import isabs
 
@@ -60,7 +61,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'TAG_CLOUD_STEPS': 4,
                    'TAG_CLOUD_MAX_ITEMS': 100,
                    'DIRECT_TEMPLATES': ('index', 'tags', 'categories', 'archives'),
-                   'EXTRA_TEMPLATES_PATHS' : [],
+                   'EXTRA_TEMPLATES_PATHS': [],
                    'PAGINATED_DIRECT_TEMPLATES': ('index', ),
                    'PELICAN_CLASS': 'pelican.Pelican',
                    'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
@@ -70,6 +71,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'DEFAULT_PAGINATION': False,
                    'DEFAULT_ORPHANS': 0,
                    'DEFAULT_METADATA': (),
+                   'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*',
                    'FILES_TO_COPY': (),
                    'DEFAULT_STATUS': 'published',
                    'ARTICLE_PERMALINK_STRUCTURE': '',
@@ -205,4 +207,12 @@ def configure_settings(settings):
                        " falling back to the default extension " +
                        _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
 
+    filename_metadata = settings.get('FILENAME_METADATA')
+    if filename_metadata and not isinstance(filename_metadata, basestring):
+        logger.error("Detected misconfiguration with FILENAME_METADATA"
+                " setting (must be string or compiled pattern), falling"
+                "back to the default")
+        settings['FILENAME_METADATA'] = \
+                _DEFAULT_CONFIG['FILENAME_METADATA']
+
     return settings

From 3a25f82c4fc95c4654a7d85eb0fdd85e39cfb904 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Wed, 28 Nov 2012 01:01:15 +0100
Subject: [PATCH 1048/2864] update docs/settings.rst for both DEFAULT_METADATA
 and FILENAME_METADATA

---
 docs/settings.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 7d73afe0..2ce44dfb 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -50,6 +50,16 @@ Setting name (default value)                                            What doe
                                                                         If tuple object, it will instead generate the
                                                                         default datetime object by passing the tuple to
                                                                         the datetime.datetime constructor.
+`DEFAULT_METADATA` (``()``)                                             The default metadata you want to use for all articles
+                                                                        and pages.
+`FILENAME_METADATA` (``'(?P<date>\d{4}-\d{2}-\d{2}).*'``)               The regexp that will be used to extract any metadata
+                                                                        from the filename. All named groups that are matched
+                                                                        will be set in the metadata object.
+                                                                        The default value will only extract the date from
+                                                                        the filename.
+                                                                        For example, if you would like to extract both the
+                                                                        date and the slug, you could set something like:
+                                                                        ``'(?P<date>\d{4}-\d{2}-\d{2})_(?<slug>.*)'``.
 `DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the content of the output directory before
                                                                         generating new files.
 `FILES_TO_COPY` (``()``)                                                A list of files (or directories) to copy from the source (inside the

From dfab8ed5b96a03ac35394acc3123ca0b79eb552e Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Nov 2012 01:12:59 +0100
Subject: [PATCH 1049/2864] test the "metadata from filename" feature

---
 pelican/readers.py                            |  2 +-
 ...2012-11-29_rst_w_filename_meta#foo-bar.rst |  6 ++
 .../2012-11-30_md_w_filename_meta#foo-bar.md  |  6 ++
 tests/test_readers.py                         | 93 +++++++++++++++++++
 4 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst
 create mode 100644 tests/content/2012-11-30_md_w_filename_meta#foo-bar.md

diff --git a/pelican/readers.py b/pelican/readers.py
index ad2b0f74..74cec02f 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -228,7 +228,7 @@ def read_file(filename, fmt=None, settings=None):
     content, metadata = reader.read(filename)
 
     # eventually filter the content with typogrify if asked so
-    if settings and settings['TYPOGRIFY']:
+    if settings and settings.get('TYPOGRIFY'):
         from typogrify.filters import typogrify
         content = typogrify(content)
         metadata['title'] = typogrify(metadata['title'])
diff --git a/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst b/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst
new file mode 100644
index 00000000..43f05a15
--- /dev/null
+++ b/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst
@@ -0,0 +1,6 @@
+
+Rst with filename metadata
+##########################
+
+:category: yeah
+:author: Alexis Métaireau
diff --git a/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md b/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md
new file mode 100644
index 00000000..cdccfc8a
--- /dev/null
+++ b/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md
@@ -0,0 +1,6 @@
+category: yeah
+author: Alexis Métaireau
+
+Markdown with filename metadata
+===============================
+
diff --git a/tests/test_readers.py b/tests/test_readers.py
index c9d22c18..dcfee809 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -34,6 +34,50 @@ class RstReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEquals(value, metadata[key], key)
 
+    def test_article_with_filename_metadata(self):
+        content, metadata = readers.read_file(
+                _filename('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
+                settings={})
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'title': 'Rst with filename metadata',
+        }
+        for key, value in metadata.items():
+            self.assertEquals(value, expected[key], key)
+
+        content, metadata = readers.read_file(
+                _filename('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
+                settings={
+                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*'
+                    })
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'title': 'Rst with filename metadata',
+            'date': datetime.datetime(2012, 11, 29),
+        }
+        for key, value in metadata.items():
+            self.assertEquals(value, expected[key], key)
+
+        content, metadata = readers.read_file(
+                _filename('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
+                settings={
+                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2})_' \
+                                         '_(?P<Slug>.*)' \
+                                         '#(?P<MyMeta>.*)-(?P<author>.*)'
+                    })
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'title': 'Rst with filename metadata',
+            'date': datetime.datetime(2012, 11, 29),
+            'slug': 'article_with_filename_metadata',
+            'mymeta': 'foo',
+        }
+        for key, value in metadata.items():
+            self.assertEquals(value, expected[key], key)
+
     def test_article_metadata_key_lowercase(self):
         """Keys of metadata should be lowercase."""
         reader = readers.RstReader({})
@@ -80,6 +124,13 @@ class MdReaderTest(unittest.TestCase):
         
         self.assertEqual(content, expected)
 
+        expected = {
+            'category': 'test',
+            'title': 'Test md File',
+        }
+        for key, value in metadata.items():
+            self.assertEquals(value, expected[key], key)
+
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_mkd_extension(self):
         # test to ensure the mkd extension is being processed by the correct reader
@@ -110,6 +161,48 @@ class MdReaderTest(unittest.TestCase):
 
         self.assertEqual(content, expected)
 
+    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
+    def test_article_with_filename_metadata(self):
+        content, metadata = readers.read_file(
+                _filename('2012-11-30_md_w_filename_meta#foo-bar.md'),
+                settings={})
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+        }
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
+
+        content, metadata = readers.read_file(
+                _filename('2012-11-30_md_w_filename_meta#foo-bar.md'),
+                settings={
+                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*'
+                    })
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'date': datetime.datetime(2012, 11, 30),
+        }
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
+
+        content, metadata = readers.read_file(
+                _filename('2012-11-30_md_w_filename_meta#foo-bar.md'),
+                settings={
+                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2})'
+                                         '_(?P<Slug>.*)'
+                                         '#(?P<MyMeta>.*)-(?P<author>.*)'
+                    })
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'date': datetime.datetime(2012, 11, 30),
+            'slug': 'md_w_filename_meta',
+            'mymeta': 'foo',
+        }
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
+
 class AdReaderTest(unittest.TestCase):
 
     @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")

From 92b9ccb08a077675984986c4f36fedf73c0e803b Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Nov 2012 01:29:11 +0100
Subject: [PATCH 1050/2864] fix failing
 TestArticlesGenerator.test_generate_context test

new file have been added to the content directory so articles_expected needs to
be updated
---
 tests/test_generators.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index 7abaf687..90b19227 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -73,6 +73,7 @@ class TestArticlesGenerator(unittest.TestCase):
             [u'Article title', 'published', 'Default', 'article'],
             [u'Article with template', 'published', 'Default', 'custom'],
             [u'Test md File', 'published', 'test', 'article'],
+            [u'Rst with filename metadata', 'published', u'yeah', 'article'],
             [u'Test Markdown extensions', 'published', u'Default', 'article'],
             [u'This is a super article !', 'published', 'Yeah', 'article'],
             [u'This is an article with category !', 'published', 'yeah', 'article'],

From fc13ae8e7605db6cac1f3e7dfac5aa9777d088b0 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Nov 2012 01:48:28 +0100
Subject: [PATCH 1051/2864] add new file to functional test content to showcase
 FILENAME_METADATA

and update functional tests output
---
 .../content/2012-11-30_filename-metadata.rst  |   4 +
 tests/output/basic/archives.html              |   2 +
 tests/output/basic/category/misc.html         |  40 ++++--
 tests/output/basic/feeds/all-en.atom.xml      |   3 +-
 tests/output/basic/feeds/all.atom.xml         |   3 +-
 tests/output/basic/feeds/misc.atom.xml        |   3 +-
 .../basic/filename_metadata-example.html      |  66 ++++++++++
 tests/output/basic/index.html                 |  40 ++++--
 tests/output/custom/archives.html             |   2 +
 .../custom/author/alexis-metaireau.html       |   2 +-
 .../custom/author/alexis-metaireau2.html      |  55 ++++-----
 .../custom/author/alexis-metaireau3.html      | 115 +++++++++++++++++
 tests/output/custom/category/misc.html        |  43 +++++--
 tests/output/custom/feeds/all-en.atom.xml     |   3 +-
 tests/output/custom/feeds/all.atom.xml        |   3 +-
 tests/output/custom/feeds/all.rss.xml         |   3 +-
 tests/output/custom/feeds/misc.atom.xml       |   3 +-
 tests/output/custom/feeds/misc.rss.xml        |   3 +-
 .../custom/filename_metadata-example.html     | 116 ++++++++++++++++++
 tests/output/custom/index.html                |  70 +++++------
 tests/output/custom/index2.html               |  55 ++++-----
 tests/output/custom/index3.html               | 115 +++++++++++++++++
 22 files changed, 622 insertions(+), 127 deletions(-)
 create mode 100644 samples/content/2012-11-30_filename-metadata.rst
 create mode 100644 tests/output/basic/filename_metadata-example.html
 create mode 100644 tests/output/custom/author/alexis-metaireau3.html
 create mode 100644 tests/output/custom/filename_metadata-example.html
 create mode 100644 tests/output/custom/index3.html

diff --git a/samples/content/2012-11-30_filename-metadata.rst b/samples/content/2012-11-30_filename-metadata.rst
new file mode 100644
index 00000000..b048103d
--- /dev/null
+++ b/samples/content/2012-11-30_filename-metadata.rst
@@ -0,0 +1,4 @@
+FILENAME_METADATA example
+#########################
+
+Some cool stuff!
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index 0bccff9b..cb06dfa1 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -33,6 +33,8 @@
 <h1>Archives for A Pelican Blog</h1>
 
 <dl>
+    <dt>Fri 30 November 2012</dt>
+    <dd><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></dd>
     <dt>Wed 29 February 2012</dt>
     <dd><a href="./second-article.html">Second article</a></dd>
     <dt>Wed 20 April 2011</dt>
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index 86cf5470..2d62b852 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -34,8 +34,32 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
                     <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
+
+                 
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="../second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -44,14 +68,12 @@
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
             <a href="../second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="../second-article.html">read more</a>
+                                </div><!-- /.entry-content -->
+            </article></li>
+                            
 
                  
                         <li><article class="hentry">    
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml
index fc05c4b3..54c87905 100644
--- a/tests/output/basic/feeds/all-en.atom.xml
+++ b/tests/output/basic/feeds/all-en.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml
index f3a1a6f4..3081adc6 100644
--- a/tests/output/basic/feeds/all.atom.xml
+++ b/tests/output/basic/feeds/all.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
diff --git a/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml
index 40ad44c5..e71bd151 100644
--- a/tests/output/basic/feeds/misc.atom.xml
+++ b/tests/output/basic/feeds/misc.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
diff --git a/tests/output/basic/filename_metadata-example.html b/tests/output/basic/filename_metadata-example.html
new file mode 100644
index 00000000..b7ae95a7
--- /dev/null
+++ b/tests/output/basic/filename_metadata-example.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>FILENAME_METADATA example</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+        <header id="banner" class="body">
+                <h1><a href="./">A Pelican Blog </a></h1>
+                <nav><ul>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+        <section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="./filename_metadata-example.html" rel="bookmark"
+           title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
+          </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->      <p>Some cool stuff!</p>
+
+    </div><!-- /.entry-content -->
+    
+  </article>
+</section>
+        <section id="extras" class="body">
+                        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 97bb5256..488d1b08 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -34,8 +34,32 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="./second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
                     <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
+
+                 
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="./second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -44,14 +68,12 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
             <a href="./second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="./second-article.html">read more</a>
+                                </div><!-- /.entry-content -->
+            </article></li>
+                            
 
                  
                         <li><article class="hentry">    
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index 44bc876e..632387a4 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -37,6 +37,8 @@
 <h1>Archives for Alexis' log</h1>
 
 <dl>
+    <dt>Fri 30 November 2012</dt>
+    <dd><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></dd>
     <dt>Wed 29 February 2012</dt>
     <dd><a href="./second-article.html">Second article</a></dd>
     <dt>Wed 20 April 2011</dt>
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index eb39ae57..8bb0dd1c 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -134,7 +134,7 @@
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
-        Page 1 / 2
+        Page 1 / 3
             <a href="../author/alexis-metaireau2.html">&raquo;</a>
     </p>
                         </section><!-- /#content -->
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index a87c85af..59926d8c 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -39,6 +39,31 @@
                  
                             <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="../filename_metadata-example.html" rel="bookmark"
+                           title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Some cool stuff!</p>
+
+                <a class="readmore" href="../filename_metadata-example.html">read more</a>
+                <p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            
+
+                 
                         <li><article class="hentry">    
                 <header>
                     <h1><a href="../oh-yeah.html" rel="bookmark"
@@ -121,37 +146,11 @@ as well as <strong>inline markup</strong>.</p>
                 <a class="readmore" href="../this-is-a-super-article.html">read more</a>
                 <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="../unbelievable.html" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
-        </abbr>
-
-                <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
-
-                <a class="readmore" href="../unbelievable.html">read more</a>
-                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
                         <a href="../author/alexis-metaireau.html">&laquo;</a>
-                Page 2 / 2
+                Page 2 / 3
+            <a href="../author/alexis-metaireau3.html">&raquo;</a>
     </p>
                         </section><!-- /#content -->
                     <section id="extras" class="body">
diff --git a/tests/output/custom/author/alexis-metaireau3.html b/tests/output/custom/author/alexis-metaireau3.html
new file mode 100644
index 00000000..5f2ecbb1
--- /dev/null
+++ b/tests/output/custom/author/alexis-metaireau3.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log - Alexis Métaireau</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+                
+            
+
+                 
+                            <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="3">
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="../unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+
+                <a class="readmore" href="../unbelievable.html">read more</a>
+                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+                        <a href="../author/alexis-metaireau2.html">&laquo;</a>
+                Page 3 / 3
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
+                </div><!-- /.blogroll -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index 24a53791..33acbd70 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -38,8 +38,35 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
                     <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+<p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
+
+                 
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="../second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -51,14 +78,12 @@
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
             <a href="../second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="../second-article.html">read more</a>
+                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            
 
                  
                         <li><article class="hentry">    
diff --git a/tests/output/custom/feeds/all-en.atom.xml b/tests/output/custom/feeds/all-en.atom.xml
index f8eb3219..5c8f9241 100644
--- a/tests/output/custom/feeds/all-en.atom.xml
+++ b/tests/output/custom/feeds/all-en.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
diff --git a/tests/output/custom/feeds/all.atom.xml b/tests/output/custom/feeds/all.atom.xml
index b009d135..ae5fe30c 100644
--- a/tests/output/custom/feeds/all.atom.xml
+++ b/tests/output/custom/feeds/all.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
diff --git a/tests/output/custom/feeds/all.rss.xml b/tests/output/custom/feeds/all.rss.xml
index 786cb097..0ce2c837 100644
--- a/tests/output/custom/feeds/all.rss.xml
+++ b/tests/output/custom/feeds/all.rss.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
diff --git a/tests/output/custom/feeds/misc.atom.xml b/tests/output/custom/feeds/misc.atom.xml
index dbf8bbfd..45c996f3 100644
--- a/tests/output/custom/feeds/misc.atom.xml
+++ b/tests/output/custom/feeds/misc.atom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
diff --git a/tests/output/custom/feeds/misc.rss.xml b/tests/output/custom/feeds/misc.rss.xml
index bbc5a48e..a0fa290d 100644
--- a/tests/output/custom/feeds/misc.rss.xml
+++ b/tests/output/custom/feeds/misc.rss.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 29 Feb 2012 00:00:00 +0100</lastBuildDate><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
diff --git a/tests/output/custom/filename_metadata-example.html b/tests/output/custom/filename_metadata-example.html
new file mode 100644
index 00000000..8f6353cb
--- /dev/null
+++ b/tests/output/custom/filename_metadata-example.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>FILENAME_METADATA example</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+        <section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="./filename_metadata-example.html" rel="bookmark"
+           title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
+          </header>
+
+    <div class="entry-content">
+      <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->      <p>Some cool stuff!</p>
+
+    </div><!-- /.entry-content -->
+        <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "filename_metadata-example.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+    
+  </article>
+</section>
+        <section id="extras" class="body">
+                        <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
+                </div><!-- /.blogroll -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index eab96fa1..cc905735 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -38,8 +38,35 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="./second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
                     <footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+<p>There are <a href="./filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
+
+                 
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="./second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
@@ -51,14 +78,12 @@
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
             <a href="./second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="./second-article.html">read more</a>
+                <p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            
 
                  
                         <li><article class="hentry">    
@@ -109,34 +134,9 @@
                 <a class="readmore" href="./article-1.html">read more</a>
                 <p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="./article-2.html" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
-        </abbr>
-
-                <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
-
-</footer><!-- /.post-info -->                <p>Article 2</p>
-
-                <a class="readmore" href="./article-2.html">read more</a>
-                <p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
-        Page 1 / 2
+        Page 1 / 3
             <a href="./index2.html">&raquo;</a>
     </p>
                         </section><!-- /#content -->
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index 5269ed70..f0d2f948 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -39,6 +39,31 @@
                  
                             <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="./article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 2</p>
+
+                <a class="readmore" href="./article-2.html">read more</a>
+                <p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            
+
+                 
                         <li><article class="hentry">    
                 <header>
                     <h1><a href="./article-3.html" rel="bookmark"
@@ -119,37 +144,11 @@ YEAH !</p>
                 <a class="readmore" href="./oh-yeah.html">read more</a>
                 <p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="./unbelievable.html" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
-        </abbr>
-
-                <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
-
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
-
-                <a class="readmore" href="./unbelievable.html">read more</a>
-                <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
                         <a href="./index.html">&laquo;</a>
-                Page 2 / 2
+                Page 2 / 3
+            <a href="./index3.html">&raquo;</a>
     </p>
                         </section><!-- /#content -->
                     <section id="extras" class="body">
diff --git a/tests/output/custom/index3.html b/tests/output/custom/index3.html
new file mode 100644
index 00000000..60f8633d
--- /dev/null
+++ b/tests/output/custom/index3.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+                
+            
+
+                 
+                            <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="3">
+                        <li><article class="hentry">    
+                <header>
+                    <h1><a href="./unbelievable.html" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+                
+                <div class="entry-content">
+                <footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Fri 15 October 2010
+        </abbr>
+
+                <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+        <p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+
+                <a class="readmore" href="./unbelievable.html">read more</a>
+                <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                            </ol><!-- /#posts-list -->
+                            <p class="paginator">
+                        <a href="./index2.html">&laquo;</a>
+                Page 3 / 3
+    </p>
+                        </section><!-- /#content -->
+                    <section id="extras" class="body">
+                        <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
+                </div><!-- /.blogroll -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file

From 070fa1ff9dcb7603e0c555168f27bb057694a6b2 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Nov 2012 02:19:38 +0100
Subject: [PATCH 1052/2864] add more docs about FILENAME_METADATA

---
 docs/changelog.rst       |  2 ++
 docs/getting_started.rst | 29 ++++++++++++++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f25ee3d9..ab3a4233 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -25,6 +25,8 @@ Release history
   file within the same directory as the original file to prevent the server
   (e.g. Nginx) from compressing files during an HTTP call.
 * Add AsciiDoc support
+* Add ``FILENAME_METADATA`` new setting which adds support for metadata
+  extraction from the filename.
 
 3.0 (2012-08-08)
 ==================
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 73378fc4..6be7fbb2 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -181,15 +181,26 @@ syntax for Markdown posts should follow this pattern::
 
     This is the content of my super blog post.
 
-Note that, aside from the title, none of this metadata is mandatory: if the date
-is not specified, Pelican will rely on the file's "mtime" timestamp, and the
-category can be determined by the directory in which the file resides. For
-example, a file located at ``python/foobar/myfoobar.rst`` will have a category of
-``foobar``. If you would like to organize your files in other ways where the
-name of the subfolder would not be a good category name, you can set the
-setting ``USE_FOLDER_AS_CATEGORY`` to ``False``. If summary isn't given, setting
-``SUMMARY_MAX_LENGTH`` determines how many words from the beginning of an article
-are used as the summary.
+Note that, aside from the title, none of this metadata is mandatory: if the
+date is not specified, Pelican can rely on the file's "mtime" timestamp through
+the ``DEFAULT_DATE`` setting, and the category can be determined by the
+directory in which the file resides. For example, a file located at
+``python/foobar/myfoobar.rst`` will have a category of ``foobar``. If you would
+like to organize your files in other ways where the name of the subfolder would
+not be a good category name, you can set the setting ``USE_FOLDER_AS_CATEGORY``
+to ``False``. If summary isn't given, setting ``SUMMARY_MAX_LENGTH`` determines
+how many words from the beginning of an article are used as the summary.
+
+You can also extract any metadata from the filename through a regexp to be set
+in the ``FILENAME_METADATA`` setting.
+All named groups that are matched will be set in the metadata object. The
+default value for the ``FILENAME_METADATA`` setting will only extract the date
+from the filename. For example, if you would like to extract both the date and
+the slug, you could set something like:
+``'(?P<date>\d{4}-\d{2}-\d{2})_(?<slug>.*)'``.
+
+Please note that the metadata available inside your files takes precedence over
+the metadata extracted from the filename.
 
 Generate your blog
 ------------------

From f86e1128f0b535efc8e20f1da2d1c045991051b7 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 30 Nov 2012 09:48:30 +0100
Subject: [PATCH 1053/2864] docfix: fix example of FILENAME_METADATA regexp

---
 docs/getting_started.rst | 2 +-
 docs/settings.rst        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 6be7fbb2..b0b5bf92 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -197,7 +197,7 @@ All named groups that are matched will be set in the metadata object. The
 default value for the ``FILENAME_METADATA`` setting will only extract the date
 from the filename. For example, if you would like to extract both the date and
 the slug, you could set something like:
-``'(?P<date>\d{4}-\d{2}-\d{2})_(?<slug>.*)'``.
+``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
 
 Please note that the metadata available inside your files takes precedence over
 the metadata extracted from the filename.
diff --git a/docs/settings.rst b/docs/settings.rst
index 2ce44dfb..fc019757 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -59,7 +59,7 @@ Setting name (default value)                                            What doe
                                                                         the filename.
                                                                         For example, if you would like to extract both the
                                                                         date and the slug, you could set something like:
-                                                                        ``'(?P<date>\d{4}-\d{2}-\d{2})_(?<slug>.*)'``.
+                                                                        ``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
 `DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the content of the output directory before
                                                                         generating new files.
 `FILES_TO_COPY` (``()``)                                                A list of files (or directories) to copy from the source (inside the

From 6236e8f66ba262731563599ecfdc5be0a2d7addf Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 3 Dec 2012 12:59:31 -0800
Subject: [PATCH 1054/2864] Updated changelog to include recent changes

---
 docs/changelog.rst | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ab3a4233..a68ed53d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,28 +5,31 @@ Release history
 ================
 
 * Improve handling of links to intra-site resources
-* Ensure WordPress import adds paragraphs in for all types of line endings
-  in post content.
+* Ensure WordPress import adds paragraphs for all types of line endings
+  in post content
 * Decode HTML entities within WordPress post titles on import
-* Improved appearance of LinkedIn icon in default theme
+* Improve appearance of LinkedIn icon in default theme
 * Add GitHub and Google+ social icons support in default theme
 * Optimize social icons
 * Add ``FEED_ALL_ATOM`` and ``FEED_ALL_RSS`` to generate feeds containing all posts regardless of their language
 * Split ``TRANSLATION_FEED`` into ``TRANSLATION_FEED_ATOM`` and ``TRANSLATION_FEED_RSS``
-* The different feeds can now be enabled/disabled individually
+* Different feeds can now be enabled/disabled individually
 * Allow for blank author: if ``AUTHOR`` setting is not set, author won't
-  default to ``${USER}`` anymore and a post won't contain any author
-  information if the post author is empty.
-* LESS and Webassets support removed from Pelican core in favor of a Webassets
-  plugin.
-* The ``DEFAULT_DATE`` setting now defaults to None, which means that articles
-  won't be generated anymore unless a date metadata is specified.
-* Add the gzip_cache plugin which compresses common text files into a ``.gz``
-  file within the same directory as the original file to prevent the server
-  (e.g. Nginx) from compressing files during an HTTP call.
-* Add AsciiDoc support
-* Add ``FILENAME_METADATA`` new setting which adds support for metadata
-  extraction from the filename.
+  default to ``${USER}`` anymore, and a post won't contain any author
+  information if the post author is empty
+* Move LESS and Webassets support from Pelican core to plugin
+* The ``DEFAULT_DATE`` setting now defaults to ``None``, which means that
+  articles won't be generated unless date metadata is specified
+* Add ``FILENAME_METADATA`` setting to support metadata extraction from filename
+* Add ``gzip_cache`` plugin to compress common text files into a ``.gz``
+  file within the same directory as the original file, preventing the server
+  (e.g. Nginx) from having to compress files during an HTTP call
+* Add support for AsciiDoc-formatted content
+* Add ``USE_FOLDER_AS_CATEGORY`` setting so that feature can be toggled on/off
+* Support arbitrary Jinja template files
+* Restore basic functional tests
+* New signals: ``generator_init``, ``get_generators``, and
+  ``article_generate_preread``
 
 3.0 (2012-08-08)
 ==================

From 8bb86d3e5d5e7fa6b95e6143c35a37c559c460f8 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Mon, 3 Dec 2012 22:35:08 +0100
Subject: [PATCH 1055/2864] revert #523

we don't need a new MARKDOWN_EXTENSIONS setting because the equivalent setting
MD_EXTENSIONS already exists.
---
 docs/fr/configuration.rst | 3 ---
 docs/settings.rst         | 2 --
 pelican/readers.py        | 7 +------
 pelican/settings.py       | 1 -
 tests/test_readers.py     | 6 +++---
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
index e3fb8542..5388dae3 100644
--- a/docs/fr/configuration.rst
+++ b/docs/fr/configuration.rst
@@ -163,6 +163,3 @@ SITEURL :
 
 STATIC_PATHS :
 	Les chemins statiques que vous voulez avoir accès sur le chemin de sortie "statique" ;
-
-MARKDOWN_EXTENSIONS :
-	Liste des extentions Markdown que vous souhaitez utiliser ;
diff --git a/docs/settings.rst b/docs/settings.rst
index fc019757..f629a4d6 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -129,8 +129,6 @@ Setting name (default value)                                            What doe
                                                                         Can be used to separate templates from the theme.
                                                                         Example: projects, resume, profile ...
                                                                         This templates need to use ``DIRECT_TEMPLATES`` setting
-
-`MARKDOWN_EXTENSIONS` (``['toc',]``)                                    A list of any Markdown extensions you want to use.
 `ASCIIDOC_OPTIONS` (``[]``)                                             A list of options to pass to asciidoc, see the `manpage
                                                                         <http://www.methods.co.nz/asciidoc/manpage.html>`_
 =====================================================================   =====================================================================
diff --git a/pelican/readers.py b/pelican/readers.py
index 74cec02f..4dc041ae 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -136,13 +136,8 @@ class MarkdownReader(Reader):
 
     def read(self, filename):
         """Parse content and metadata of markdown files"""
-        markdown_extensions = self.settings.get('MARKDOWN_EXTENSIONS', [])
-        if isinstance(markdown_extensions, (str, unicode)):
-            markdown_extensions = [m.strip() for m in
-                                   markdown_extensions.split(',')]
         text = pelican_open(filename)
-        md = Markdown(extensions=set(
-            self.extensions + markdown_extensions + ['meta']))
+        md = Markdown(extensions=set(self.extensions + ['meta']))
         content = md.convert(text)
 
         metadata = {}
diff --git a/pelican/settings.py b/pelican/settings.py
index a98f3538..692fc983 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -78,7 +78,6 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'TYPOGRIFY': False,
                    'SUMMARY_MAX_LENGTH': 50,
                    'PLUGINS': [],
-                   'MARKDOWN_EXTENSIONS': ['toc', ],
                    'TEMPLATE_PAGES': {}
                    }
 
diff --git a/tests/test_readers.py b/tests/test_readers.py
index dcfee809..937a98e3 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -145,9 +145,9 @@ class MdReaderTest(unittest.TestCase):
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_markdown_markup_extension(self):
         # test to ensure the markdown markup extension is being processed as expected
-        reader = readers.MarkdownReader({})
-        reader.settings.update(dict(MARKDOWN_EXTENSIONS=['toc', ]))
-        content, metadata = reader.read(_filename('article_with_markdown_markup_extensions.md'))
+        content, metadata = readers.read_file(
+                _filename('article_with_markdown_markup_extensions.md'),
+                settings={'MD_EXTENSIONS': ['toc', 'codehilite', 'extra']})
         expected = '<div class="toc">\n'\
             '<ul>\n'\
             '<li><a href="#level1">Level1</a><ul>\n'\

From f604cc4df88e0c3e1e1ddb91aa1df2b0b6f21af5 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Mon, 3 Dec 2012 22:56:05 +0100
Subject: [PATCH 1056/2864] update functional tests to test TEMPLATE_PAGES
 feature

closes #614: cannot reproduce this issue.
---
 samples/content/pages/jinja2_template.html |  6 ++
 samples/pelican.conf.py                    |  3 +
 tests/output/custom/jinja2_template.html   | 82 ++++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 samples/content/pages/jinja2_template.html
 create mode 100644 tests/output/custom/jinja2_template.html

diff --git a/samples/content/pages/jinja2_template.html b/samples/content/pages/jinja2_template.html
new file mode 100644
index 00000000..1b0dc4e4
--- /dev/null
+++ b/samples/content/pages/jinja2_template.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+{% block content %}
+
+Some text
+
+{% endblock %}
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index ce51c0fd..0ac4cd2c 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -35,6 +35,9 @@ STATIC_PATHS = ["pictures", ]
 # A list of files to copy from the source to the destination
 FILES_TO_COPY = (('extra/robots.txt', 'robots.txt'),)
 
+# custom page generated with a jinja2 template
+TEMPLATE_PAGES = {'pages/jinja2_template.html': 'jinja2_template.html'}
+
 # foobar will not be used, because it's not in caps. All configuration keys
 # have to be in caps
 foobar = "barbaz"
diff --git a/tests/output/custom/jinja2_template.html b/tests/output/custom/jinja2_template.html
new file mode 100644
index 00000000..2def2d4e
--- /dev/null
+++ b/tests/output/custom/jinja2_template.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Alexis' log</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
+                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                    <li ><a href="./category/misc.html">misc</a></li>
+                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                    <li ><a href="./category/bar.html">bar</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+        
+Some text
+
+        <section id="extras" class="body">
+                        <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
+                </div><!-- /.blogroll -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file

From 21e808782268cdfafe4f05a3d10152b86778d4eb Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 4 Dec 2012 00:48:29 +0100
Subject: [PATCH 1057/2864] fix weird implementation for extension removal

this leads to raising exception when slug was not used to generate the url
---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 522892ba..d675a2ad 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -277,7 +277,7 @@ class URLWrapper(object):
             return value
         else:
             if get_page_name:
-                return unicode(value[:value.find('{slug}') + len('{slug}')]).format(**self.as_dict())
+                return unicode(os.path.splitext(value)[0]).format(**self.as_dict())
             else:
                 return unicode(value).format(**self.as_dict())
 

From 89fd11d5829de860f78a836ff57e9104093115f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Tue, 4 Dec 2012 01:21:57 +0100
Subject: [PATCH 1058/2864] tagging 3.1

---
 docs/changelog.rst | 4 ++--
 setup.py           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a68ed53d..7c0675f9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,7 @@
 Release history
 ###############
 
-3.1 (XXXX-XX-XX)
+3.1 (2012-12-04)
 ================
 
 * Improve handling of links to intra-site resources
@@ -32,7 +32,7 @@ Release history
   ``article_generate_preread``
 
 3.0 (2012-08-08)
-==================
+================
 
 * Refactored the way URLs are handled
 * Improved the English documentation
diff --git a/setup.py b/setup.py
index 97c8ca64..26121423 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ setup(
     version="3.1",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
-    author_email='alexis@notmyidea.org',
+    author_email='authors@getpelican.com',
     description="A tool to generate a static blog from reStructuredText or "\
                 "Markdown input files.",
     long_description=open('README.rst').read(),

From be2a3f4030e9f5f1f4b2f6d657c9f18347d6af9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Tue, 4 Dec 2012 01:27:16 +0100
Subject: [PATCH 1059/2864] bump version number

---
 docs/changelog.rst  | 5 +++++
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7c0675f9..05454e17 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+3.2 (XXXX-XX-XX)
+================
+
+* ???
+
 3.1 (2012-12-04)
 ================
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index a175e2a8..6a7ee708 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -17,7 +17,7 @@ from pelican.utils import (clean_output_dir, files_changed, file_changed,
 from pelican.writers import Writer
 
 __major__ = 3
-__minor__ = 0
+__minor__ = 2
 __version__ = "{0}.{1}".format(__major__, __minor__)
 
 
diff --git a/setup.py b/setup.py
index 26121423..326a3195 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ entry_points = {
 
 setup(
     name="pelican",
-    version="3.1",
+    version="3.2",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',

From a07b56c02bfa5ddac8de359e215d9571ee2ba96c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 3 Dec 2012 16:31:55 -0800
Subject: [PATCH 1060/2864] Doc fixes and improvements

---
 docs/faq.rst             | 36 ++++++++--------
 docs/getting_started.rst | 50 ++++++++++++-----------
 docs/index.rst           |  2 +-
 docs/plugins.rst         | 88 ++++++++++++++++++++--------------------
 docs/settings.rst        | 75 ++++++++++++++++------------------
 5 files changed, 127 insertions(+), 124 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 735fe9d0..a8617b30 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -1,7 +1,7 @@
 Frequently Asked Questions (FAQ)
 ################################
 
-Here is a summary of the frequently asked questions for Pelican.
+Here are some frequently asked questions about Pelican.
 
 What's the best way to communicate a problem, question, or suggestion?
 ======================================================================
@@ -21,7 +21,8 @@ How can I help?
 ================
 
 There are several ways to help out. First, you can use Pelican and report any
-suggestions or problems you might have via IRC or the `issue tracker <https://github.com/getpelican/pelican/issues>`_.
+suggestions or problems you might have via IRC or the `issue tracker
+<https://github.com/getpelican/pelican/issues>`_.
 
 If you want to contribute, please fork `the git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make
@@ -57,13 +58,14 @@ I want to use Markdown, but I got an error.
 ===========================================
 
 Markdown is not a hard dependency for Pelican, so you will need to explicitly
-install it. You can do so by typing::
+install it. You can do so by typing the following, including ``sudo`` if
+required::
 
-    $ (sudo) pip install markdown
+    (sudo) pip install markdown
 
-In case you don't have pip installed, consider installing it via::
+If you don't have pip installed, consider installing the pip installer via::
 
-    $ (sudo) easy_install pip
+    (sudo) easy_install pip
 
 Can I use arbitrary meta-data in my templates?
 ==============================================
@@ -87,15 +89,15 @@ want to have its own template.
 
     :template: template_name
 
-Then just make sure to have the template installed in to your theme as
-``template_name.html``.
+Then just make sure your theme contains the relevant template file (e.g.
+``template_name.html``).
 
 What if I want to disable feed generation?
 ==========================================
 
 To disable all feed generation, all feed settings should be set to ``None``.
-Since other feed settings already defaults to ``None``, you only need to set
-the following settings::
+All but two feed settings already default to ``None``, so if you want to disable
+all feed generation, you only need to specify the following settings::
 
     FEED_ALL_ATOM = None
     CATEGORY_FEED_ATOM = None
@@ -129,13 +131,13 @@ setting names). Here is an exact list of the renamed setting names::
     CATEGORY_FEED -> CATEGORY_FEED_ATOM
 
 Starting in 3.1, the new feed ``FEED_ALL_ATOM`` has been introduced: this
-feed will aggregate all posts regardless of their language. It is generated to
-``'feeds/all.atom.xml'`` by default and ``FEED_ATOM`` now defaults to ``None``.
-The following FEED setting has also been renamed::
+feed will aggregate all posts regardless of their language. This setting
+generates ``'feeds/all.atom.xml'`` by default and ``FEED_ATOM`` now defaults to
+``None``. The following feed setting has also been renamed::
 
     TRANSLATION_FEED -> TRANSLATION_FEED_ATOM
 
-Older 2.x themes that referenced the old setting names may not link properly.
-In order to rectify this, please update your theme for compatibility with 3.0+
-by changing the relevant values in your template files. For an example of
-complete feed headers and usage please check out the ``simple`` theme.
+Older themes that referenced the old setting names may not link properly.
+In order to rectify this, please update your theme for compatibility by changing
+the relevant values in your template files. For an example of complete feed
+headers and usage please check out the ``simple`` theme.
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index b0b5bf92..3e527611 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -161,7 +161,7 @@ following syntax (give your file the ``.rst`` extension)::
     :author: Alexis Metaireau
     :summary: Short version for index and feeds
 
-Pelican implements an extension of reStructuredText to enable support for the
+Pelican implements an extension to reStructuredText to enable support for the
 ``abbr`` HTML tag. To use it, write something like this in your post::
 
     This will be turned into :abbr:`HTML (HyperText Markup Language)`.
@@ -188,16 +188,17 @@ directory in which the file resides. For example, a file located at
 ``python/foobar/myfoobar.rst`` will have a category of ``foobar``. If you would
 like to organize your files in other ways where the name of the subfolder would
 not be a good category name, you can set the setting ``USE_FOLDER_AS_CATEGORY``
-to ``False``. If summary isn't given, setting ``SUMMARY_MAX_LENGTH`` determines
-how many words from the beginning of an article are used as the summary.
+to ``False``. If there is no summary metadata for a given post, the
+``SUMMARY_MAX_LENGTH`` setting can be used to specify how many words from the
+beginning of an article are used as the summary.
 
-You can also extract any metadata from the filename through a regexp to be set
-in the ``FILENAME_METADATA`` setting.
+You can also extract any metadata from the filename through a regular
+expression to be set in the ``FILENAME_METADATA`` setting.
 All named groups that are matched will be set in the metadata object. The
 default value for the ``FILENAME_METADATA`` setting will only extract the date
 from the filename. For example, if you would like to extract both the date and
 the slug, you could set something like:
-``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
+``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``
 
 Please note that the metadata available inside your files takes precedence over
 the metadata extracted from the filename.
@@ -205,7 +206,7 @@ the metadata extracted from the filename.
 Generate your blog
 ------------------
 
-The ``make`` shortcut commands mentioned in the ``Kickstart a blog`` section
+The ``make`` shortcut commands mentioned in the *Kickstart a blog* section
 are mostly wrappers around the ``pelican`` command that generates the HTML from
 the content. The ``pelican`` command can also be run directly::
 
@@ -231,11 +232,11 @@ run the ``pelican`` command with the ``-r`` or ``--autoreload`` option.
 Pages
 -----
 
-If you create a folder named ``pages``, itself in the content folder, all the
+If you create a folder named ``pages`` inside the content folder, all the
 files in it will be used to generate static pages.
 
-Then, use the ``DISPLAY_PAGES_ON_MENU`` setting, which will add all the pages to
-the menu.
+Then, use the ``DISPLAY_PAGES_ON_MENU`` setting to add all those pages to
+the primary navigation menu.
 
 If you want to exclude any pages from being linked to or listed in the menu
 then add a ``status: hidden`` attribute to its metadata. This is useful for
@@ -244,9 +245,13 @@ things like making error pages that fit the generated theme of your site.
 Linking to internal content
 ---------------------------
 
-Since Pelican 3.1, you now have the ability to do cross-site linking.
+From Pelican 3.1 onwards, it is now possible to specify intra-site links to
+files in the *source content* hierarchy instead of files in the *generated*
+hierarchy. This makes it easier to link from the current post to other posts
+and images that may be sitting alongside the current post (instead of having
+to determine where those resources will be placed after site generation).
 
-To link to an internal content, you will have to use the following syntax:
+To link to internal content, use the following syntax:
 ``|filename|path/to/file``.
 
 For example, you may want to add links between "article1" and "article2" given
@@ -264,20 +269,20 @@ In this example, ``article1.rst`` could look like::
     Title: The first article
     Date: 2012-12-01
 
-    See below cross-site links examples in restructured text.
+    See below intra-site link examples in reStructuredText format.
 
-    `a root-relative link <|filename|/cat/article2.md>`_
-    `a file-relative link <|filename|cat/article2.md>`_
+    `a link relative to content root <|filename|/cat/article2.md>`_
+    `a link relative to current file <|filename|cat/article2.md>`_
 
 and ``article2.md``::
 
     Title: The second article
     Date: 2012-12-01
 
-    See below cross-site links examples in markdown.
+    See below intra-site link examples in Markdown format.
 
-    [a root-relative link](|filename|/article1.rst)
-    [a file-relative link](|filename|../article1.rst)
+    [a link relative to content root](|filename|/article1.rst)
+    [a link relative to current file](|filename|../article1.rst)
 
 .. note::
 
@@ -334,13 +339,12 @@ then instead ensure that the translated article titles are identical, since the
 slug will be auto-generated from the article title.
 
 Syntax highlighting
----------------------
+-------------------
 
 Pelican is able to provide colorized syntax highlighting for your code blocks.
-To do so, you have to use the following conventions (you need to put this in
-your content files).
+To do so, you have to use the following conventions inside your content files.
 
-For RestructuredText, use the code-block directive::
+For reStructuredText, use the code-block directive::
 
     .. code-block:: identifier
 
@@ -373,7 +377,7 @@ anything special to see what's happening with the generated files.
 
 You can either use your browser to open the files on your disk::
 
-    $ firefox output/index.html
+    firefox output/index.html
 
 Or run a simple web server using Python::
 
diff --git a/docs/index.rst b/docs/index.rst
index 8206727c..ebe1ace6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -4,7 +4,7 @@ Pelican
 Pelican is a static site generator, written in Python_.
 
 * Write your weblog entries directly with your editor of choice (vim!)
-  in reStructuredText_, Markdown_ or AsciiDoc_
+  in reStructuredText_, Markdown_, or AsciiDoc_
 * Includes a simple CLI tool to (re)generate the weblog
 * Easy to interface with DVCSes and web hooks
 * Completely static output is easy to host anywhere
diff --git a/docs/plugins.rst b/docs/plugins.rst
index c6b18200..6555e647 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -3,25 +3,25 @@
 Plugins
 #######
 
-Since version 3.0, Pelican manages plugins. Plugins are a way to add features
-to Pelican without having to directly hack Pelican code.
+Beginning with version 3.0, Pelican supports plugins. Plugins are a way to add
+features to Pelican without having to directly modify the Pelican core.
 
-Pelican is shipped with a set of core plugins, but you can easily implement
-your own (and this page describes how).
+Pelican is shipped with a set of bundled plugins, but you can easily implement
+your own. This page describes how to use and create plugins.
 
 How to use plugins
 ==================
 
-To load plugins, you have to specify them in your settings file. You have two
-ways to do so.
-Either by specifying strings with the path to the callables::
+To load plugins, you have to specify them in your settings file. There are two
+ways to do so. The first method is to specify strings with the path to the
+callables::
 
     PLUGINS = ['pelican.plugins.gravatar',]
 
-Or by importing them and adding them to the list::
+Alternatively, another method is to import them and add them to the list::
 
     from pelican.plugins import gravatar
-    PLUGINS = [gravatar, ]
+    PLUGINS = [gravatar,]
 
 If your plugins are not in an importable path, you can specify a ``PLUGIN_PATH``
 in the settings::
@@ -33,7 +33,7 @@ How to create plugins
 =====================
 
 Plugins are based on the concept of signals. Pelican sends signals, and plugins
-subscribe to those signals. The list of signals are defined in a following
+subscribe to those signals. The list of signals are defined in a subsequent
 section.
 
 The only rule to follow for plugins is to define a ``register`` callable, in
@@ -75,13 +75,13 @@ pages_generate_context          pages_generator, metadata
 pages_generator_init            pages_generator                 invoked in the PagesGenerator.__init__
 =============================   ============================   ===========================================================================
 
-The list is currently small, don't hesitate to add signals and make a pull
+The list is currently small, so don't hesitate to add signals and make a pull
 request if you need them!
 
 .. note::
 
-   The signal ``content_object_init`` can send different type of object as
-   argument. If you want to register only one type of object then you will
+   The signal ``content_object_init`` can send a different type of object as
+   the argument. If you want to register only one type of object then you will
    need to specify the sender when you are connecting to the signal.
 
    ::
@@ -122,30 +122,30 @@ Plugin descriptions
 Asset management
 ----------------
 
-This plugin allows you to use the `webassets`_ module to manage assets such as
+This plugin allows you to use the `Webassets`_ module to manage assets such as
 CSS and JS files. The module must first be installed::
 
     pip install webassets
 
-The `webassets` module allows you to perform a number of useful asset management
+The Webassets module allows you to perform a number of useful asset management
 functions, including:
 
-* CSS minifier (`cssmin`, `yuicompressor`, ...)
-* CSS compiler (`less`, `sass`, ...)
-* JS minifier (`uglifyjs`, `yuicompressor`, `closure`, ...)
+* CSS minifier (``cssmin``, ``yuicompressor``, ...)
+* CSS compiler (``less``, ``sass``, ...)
+* JS minifier (``uglifyjs``, ``yuicompressor``, ``closure``, ...)
 
 Others filters include gzip compression, integration of images in CSS via data
-URIs, and more. `webassets` can also append a version identifier to your asset
+URIs, and more. Webassets can also append a version identifier to your asset
 URL to convince browsers to download new versions of your assets when you use
-far-future expires headers. Please refer to the `webassets documentation`_ for
+far-future expires headers. Please refer to the `Webassets documentation`_ for
 more information.
 
-When using with Pelican, `webassets` is configured to process assets in the
-``OUTPUT_PATH/theme`` directory. You can use `webassets` in your templates by
-including one or more template tags. The jinja variable ``{{ ASSET_URL }}`` to
-use in the templates is configured to be relative to the ``theme/`` url.
-Hence, it must be used with the ``{{ SITEURL }}`` variable which allows to
-have relative urls. For example...
+When used with Pelican, Webassets is configured to process assets in the
+``OUTPUT_PATH/theme`` directory. You can use Webassets in your templates by
+including one or more template tags. The Jinja variable ``{{ ASSET_URL }}`` can
+be used in templates and is relative to the ``theme/`` url. The
+``{{ ASSET_URL }}`` variable should be used in conjunction with the
+``{{ SITEURL }}`` variable in order to generate URLs properly. For example:
 
 .. code-block:: jinja
 
@@ -153,7 +153,7 @@ have relative urls. For example...
         <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
     {% endassets %}
 
-... will produce a minified css file with a version identifier:
+... will produce a minified css file with a version identifier that looks like:
 
 .. code-block:: html
 
@@ -182,29 +182,29 @@ The above will produce a minified and gzipped JS file:
 
     <script src="http://{SITEURL}/theme/js/packed.js?00703b9d"></script>
 
-Pelican's debug mode is propagated to `webassets` to disable asset packaging
+Pelican's debug mode is propagated to Webassets to disable asset packaging
 and instead work with the uncompressed assets. However, this also means that
 the LESS and SASS files are not compiled. This should be fixed in a future
-version of `webassets` (cf. the related `bug report
+version of Webassets (cf. the related `bug report
 <https://github.com/getpelican/pelican/issues/481>`_).
 
-.. _webassets: https://github.com/miracle2k/webassets
-.. _webassets documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
+.. _Webassets: https://github.com/miracle2k/webassets
+.. _Webassets documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
 
 
 GitHub activity
 ---------------
 
-This plugin makes use of the ``feedparser`` library that you'll need to
+This plugin makes use of the `feedparser`_ library that you'll need to
 install.
 
 Set the ``GITHUB_ACTIVITY_FEED`` parameter to your GitHub activity feed.
-For example, my setting would look like::
+For example, to track Pelican project activity, the setting would be::
 
-     GITHUB_ACTIVITY_FEED = 'https://github.com/kpanic.atom'
+     GITHUB_ACTIVITY_FEED = 'https://github.com/getpelican.atom'
 
-On the templates side, you just have to iterate over the ``github_activity``
-variable, as in the example::
+On the template side, you just have to iterate over the ``github_activity``
+variable, as in this example::
 
      {% if GITHUB_ACTIVITY_FEED %}
         <div class="social">
@@ -218,15 +218,15 @@ variable, as in the example::
         </div><!-- /.github_activity -->
      {% endif %}
 
-
-
-``github_activity`` is a list of lists. The first element is the title
+``github_activity`` is a list of lists. The first element is the title,
 and the second element is the raw HTML from GitHub.
 
+.. _feedparser: https://crate.io/packages/feedparser/
+
 Global license
 --------------
 
-This plugin allows you to define a LICENSE setting and adds the contents of that
+This plugin allows you to define a ``LICENSE`` setting and adds the contents of that
 license variable to the article's context, making that variable available to use
 from within your theme's templates.
 
@@ -235,7 +235,7 @@ Gravatar
 
 This plugin assigns the ``author_gravatar`` variable to the Gravatar URL and
 makes the variable available within the article's context. You can add
-AUTHOR_EMAIL to your settings file to define the default author's email
+``AUTHOR_EMAIL`` to your settings file to define the default author's email
 address. Obviously, that email address must be associated with a Gravatar
 account.
 
@@ -249,7 +249,7 @@ the ``author_gravatar`` variable is added to the article's context.
 Gzip cache
 ----------
 
-Certain web servers (e.g., Nginx) can use a static cache of gzip compressed
+Certain web servers (e.g., Nginx) can use a static cache of gzip-compressed
 files to prevent the server from compressing files during an HTTP call. Since
 compression occurs at another time, these compressed files can be compressed
 at a higher compression level for increased optimization.
@@ -303,7 +303,7 @@ The sitemap plugin generates plain-text or XML sitemaps. You can use the
 ``SITEMAP`` variable in your settings file to configure the behavior of the
 plugin.
 
-The ``SITEMAP`` variable must be a Python dictionary, it can contain three keys:
+The ``SITEMAP`` variable must be a Python dictionary and can contain three keys:
 
 - ``format``, which sets the output format of the plugin (``xml`` or ``txt``)
 
@@ -336,7 +336,7 @@ default value.
 The sitemap is saved in ``<output_path>/sitemap.<format>``.
 
 .. note::
-   ``priorities`` and ``changefreqs`` are informations for search engines.
+   ``priorities`` and ``changefreqs`` are information for search engines.
    They are only used in the XML sitemaps.
    For more information: <http://www.sitemaps.org/protocol.html#xmlTagDefinitions>
 
diff --git a/docs/settings.rst b/docs/settings.rst
index f629a4d6..baf9f60c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -16,8 +16,8 @@ False, None, etc.), dictionaries, or tuples should *not* be enclosed in
 quotation marks. All other values (i.e., strings) *must* be enclosed in
 quotation marks.
 
-Unless otherwise specified, settings that refer to paths can be either absolute or relative to the
-configuration file.
+Unless otherwise specified, settings that refer to paths can be either absolute
+or relative to the configuration file.
 
 The settings you define in the configuration file will be passed to the
 templates, which allows you to use your settings to add site-wide content.
@@ -31,12 +31,11 @@ Basic settings
 Setting name (default value)                                            What does it do?
 =====================================================================   =====================================================================
 `AUTHOR`                                                                Default author (put your name)
-`DATE_FORMATS` (``{}``)                                                 If you do manage multiple languages, you can
-                                                                        set the date formatting here. See "Date format and locales"
-                                                                        section below for details.
-`USE_FOLDER_AS_CATEGORY` (``True``)                                     When you don't specify a category in your post metadata and set this
-                                                                        setting to ``True`` and organize your articles in subfolders, the
-                                                                        subfolder will become the category of your post. If set to ``False``
+`DATE_FORMATS` (``{}``)                                                 If you manage multiple languages, you can set the date formatting
+                                                                        here. See the "Date format and locales" section below for details.
+`USE_FOLDER_AS_CATEGORY` (``True``)                                     When you don't specify a category in your post metadata, set this
+                                                                        setting to ``True``, and organize your articles in subfolders, the
+                                                                        subfolder will become the category of your post. If set to ``False``,
                                                                         ``DEFAULT_CATEGORY`` will be used as a fallback.
 `DEFAULT_CATEGORY` (``'misc'``)                                         The default category to fall back on.
 `DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)                               The default date format you want to use.
@@ -44,12 +43,12 @@ Setting name (default value)                                            What doe
                                                                         template. Templates may or not honor this
                                                                         setting.
 `DEFAULT_DATE` (``None``)                                               The default date you want to use.
-                                                                        If 'fs', Pelican will use the file system
+                                                                        If ``fs``, Pelican will use the file system
                                                                         timestamp information (mtime) if it can't get
                                                                         date information from the metadata.
-                                                                        If tuple object, it will instead generate the
-                                                                        default datetime object by passing the tuple to
-                                                                        the datetime.datetime constructor.
+                                                                        If set to a tuple object, the default datetime object will instead
+                                                                        be generated by passing the tuple to the
+                                                                        ``datetime.datetime`` constructor.
 `DEFAULT_METADATA` (``()``)                                             The default metadata you want to use for all articles
                                                                         and pages.
 `FILENAME_METADATA` (``'(?P<date>\d{4}-\d{2}-\d{2}).*'``)               The regexp that will be used to extract any metadata
@@ -83,11 +82,10 @@ Setting name (default value)                                            What doe
 `PAGE_EXCLUDES` (``()``)                                                A list of directories to exclude when looking for pages.
 `ARTICLE_DIR` (``''``)                                                  Directory to look at for articles, relative to `PATH`.
 `ARTICLE_EXCLUDES`: (``('pages',)``)                                    A list of directories to exclude when looking for articles.
-`PDF_GENERATOR` (``False``)                                             Set to True if you want to have PDF versions
-                                                                        of your documents. You will need to install
-                                                                        `rst2pdf`.
+`PDF_GENERATOR` (``False``)                                             Set to ``True`` if you want PDF versions of your documents to be.
+                                                                        generated. You will need to install ``rst2pdf``.
 `OUTPUT_SOURCES` (``False``)                                            Set to True if you want to copy the articles and pages in their
-                                                                        original format (e.g. Markdown or ReStructeredText) to the
+                                                                        original format (e.g. Markdown or reStructuredText) to the
                                                                         specified OUTPUT_PATH.
 `OUTPUT_SOURCES_EXTENSION` (``.text``)                                  Controls the extension that will be used by the SourcesGenerator.
                                                                         Defaults to ``.text``. If not a valid string the default value
@@ -106,10 +104,10 @@ Setting name (default value)                                            What doe
                                                                         the blog entries. See :ref:`template_pages`.
 `STATIC_PATHS` (``['images']``)                                         The static paths you want to have accessible
                                                                         on the output path "static". By default,
-                                                                        Pelican will copy the 'images' folder to the
+                                                                        Pelican will copy the "images" folder to the
                                                                         output folder.
 `TIMEZONE`                                                              The timezone used in the date information, to
-                                                                        generate Atom and RSS feeds. See the "timezone"
+                                                                        generate Atom and RSS feeds. See the *Timezone*
                                                                         section below for more info.
 `TYPOGRIFY` (``False``)                                                 If set to True, several typographical improvements will be
                                                                         incorporated into the generated HTML via the `Typogrify
@@ -117,19 +115,19 @@ Setting name (default value)                                            What doe
                                                                         library, which can be installed via: ``pip install typogrify``
 `DIRECT_TEMPLATES` (``('index', 'tags', 'categories', 'archives')``)    List of templates that are used directly to render
                                                                         content. Typically direct templates are used to generate
-                                                                        index pages for collections of content e.g. tags and
-                                                                        category index pages.
+                                                                        index pages for collections of content (e.g. tags and
+                                                                        category index pages).
 `PAGINATED_DIRECT_TEMPLATES` (``('index',)``)                           Provides the direct templates that should be paginated.
 `SUMMARY_MAX_LENGTH` (``50``)                                           When creating a short summary of an article, this will
                                                                         be the default length in words of the text created.
                                                                         This only applies if your content does not otherwise
-                                                                        specify a summary. Setting to None will cause the summary
+                                                                        specify a summary. Setting to ``None`` will cause the summary
                                                                         to be a copy of the original content.
-`EXTRA_TEMPLATES_PATHS` (``[]``)                                        A list of paths you want Jinja2 to look for the templates.
+`EXTRA_TEMPLATES_PATHS` (``[]``)                                        A list of paths you want Jinja2 to search for templates.
                                                                         Can be used to separate templates from the theme.
                                                                         Example: projects, resume, profile ...
-                                                                        This templates need to use ``DIRECT_TEMPLATES`` setting
-`ASCIIDOC_OPTIONS` (``[]``)                                             A list of options to pass to asciidoc, see the `manpage
+                                                                        These templates need to use ``DIRECT_TEMPLATES`` setting.
+`ASCIIDOC_OPTIONS` (``[]``)                                             A list of options to pass to AsciiDoc. See the `manpage
                                                                         <http://www.methods.co.nz/asciidoc/manpage.html>`_
 =====================================================================   =====================================================================
 
@@ -145,13 +143,13 @@ when testing locally, and absolute URLs are reliable and most useful when
 publishing. One method of supporting both is to have one Pelican configuration
 file for local development and another for publishing. To see an example of this
 type of setup, use the ``pelican-quickstart`` script as described at the top of
-the :doc:`Getting Started<getting_started>` page, which will produce two separate
+the :doc:`Getting Started <getting_started>` page, which will produce two separate
 configuration files for local development and publishing, respectively.
 
 You can customize the URLs and locations where files will be saved. The URLs and
 SAVE_AS variables use Python's format strings. These variables allow you to place
-your articles in a location such as '{slug}/index.html' and link to them as
-'{slug}' for clean URLs. These settings give you the flexibility to place your
+your articles in a location such as ``{slug}/index.html`` and link to them as
+``{slug}`` for clean URLs. These settings give you the flexibility to place your
 articles and pages anywhere you want.
 
 .. note::
@@ -175,8 +173,8 @@ Example usage:
 * ARTICLE_URL = ``'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'``
 * ARTICLE_SAVE_AS = ``'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'``
 
-This would save your articles in something like '/posts/2011/Aug/07/sample-post/index.html',
-and the URL to this would be '/posts/2011/Aug/07/sample-post/'.
+This would save your articles in something like ``/posts/2011/Aug/07/sample-post/index.html``,
+and the URL to this would be ``/posts/2011/Aug/07/sample-post/``.
 
 ====================================================    =====================================================
 Setting name (default value)                            What does it do?
@@ -206,7 +204,7 @@ Setting name (default value)                            What does it do?
 
 .. note::
 
-    When any of `*_SAVE_AS` is set to False, files will not be created.
+    When any of the `*_SAVE_AS` settings is set to False, files will not be created.
 
 Timezone
 --------
@@ -283,12 +281,12 @@ If you want to generate custom pages besides your blog entries, you can point
 any Jinja2 template file with a path pointing to the file and the destination
 path for the generated file.
 
-For instance, if you have a blog with three static pages, for a list of books,
-your resume and a contact page, you could have::
+For instance, if you have a blog with three static pages — a list of books,
+your resume, and a contact page — you could have::
 
     TEMPLATE_PAGES = {'src/books.html': 'dest/books.html',
-                    'src/resume.html': 'dest/resume.html',
-                    'src/contact.html': 'dest/contact.html'}
+                      'src/resume.html': 'dest/resume.html',
+                      'src/contact.html': 'dest/contact.html'}
 
 Feed settings
 =============
@@ -326,8 +324,7 @@ Setting name (default value)                        What does it do?
                                                     quantity is unrestricted by default.
 ================================================    =====================================================
 
-If you don't want to generate some or any of these feeds, set ``None`` to the
-variables above.
+If you don't want to generate some or any of these feeds, set the above variables to ``None``.
 
 .. [2] %s is the name of the category.
 
@@ -399,7 +396,7 @@ N matches `TAG_CLOUD_STEPS` -1).
 Translations
 ============
 
-Pelican offers a way to translate articles. See the Getting Started section for
+Pelican offers a way to translate articles. See the :doc:`Getting Started <getting_started>` section for
 more information.
 
 =====================================================    =====================================================
@@ -467,7 +464,7 @@ Following are example ways to specify your preferred theme::
     # Specify a customized theme, via absolute path
     THEME = "~/projects/mysite/themes/mycustomtheme"
 
-The built-in `notmyidea` theme can make good use of the following settings. Feel
+The built-in ``notmyidea`` theme can make good use of the following settings. Feel
 free to use them in your themes as well.
 
 =======================   =======================================================
@@ -496,7 +493,7 @@ Setting name              What does it do ?
                           if you want this button to appear.
 =======================   =======================================================
 
-In addition, you can use the "wide" version of the `notmyidea` theme by
+In addition, you can use the "wide" version of the ``notmyidea`` theme by
 adding the following to your configuration::
 
     CSS_FILE = "wide.css"

From f92c0cb69dad13491f93872af79d3a14ec6a1e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Tue, 4 Dec 2012 01:43:19 +0100
Subject: [PATCH 1061/2864] update the version scheme to support micro versions

---
 pelican/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 6a7ee708..e2ea7f76 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -18,7 +18,8 @@ from pelican.writers import Writer
 
 __major__ = 3
 __minor__ = 2
-__version__ = "{0}.{1}".format(__major__, __minor__)
+__micro__ = 0
+__version__ = "{0}.{1}.{2}".format(__major__, __minor__, __micro__)
 
 
 logger = logging.getLogger(__name__)

From 625afa0621866d1bbc29ade89551b096d4362838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Tue, 4 Dec 2012 01:53:52 +0100
Subject: [PATCH 1062/2864] add the changelog to the text on PyPI

---
 MANIFEST.in | 2 +-
 setup.py    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index bec6d1a3..2f2ea824 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 include *.rst
 global-include *.py
 recursive-include pelican *.html *.css *png *.in
-include LICENSE THANKS
+include LICENSE THANKS docs/changelog.rst
 recursive-include tests *
 recursive-exclude tests *.pyc
diff --git a/setup.py b/setup.py
index 326a3195..15ddebd6 100755
--- a/setup.py
+++ b/setup.py
@@ -18,15 +18,20 @@ entry_points = {
    ]
 }
 
+
+README = open('README.rst').read()
+CHANGELOG = open('docs/changelog.rst').read()
+
+
 setup(
     name="pelican",
     version="3.2",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',
-    description="A tool to generate a static blog from reStructuredText or "\
+    description="A tool to generate a static blog from reStructuredText or "
                 "Markdown input files.",
-    long_description=open('README.rst').read(),
+    long_description=README + '\n' + CHANGELOG,
     packages=['pelican', 'pelican.tools', 'pelican.plugins'],
     include_package_data=True,
     install_requires=requires,

From 9f66333d7726513138b9d839b853ba54e8fc308b Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Tue, 4 Dec 2012 02:08:13 +0100
Subject: [PATCH 1063/2864] fix rst issue

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 05454e17..ea476ca8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,7 @@ Release history
 3.2 (XXXX-XX-XX)
 ================
 
-* ???
+* [...]
 
 3.1 (2012-12-04)
 ================

From 694f318614ef6f8ccccf273ecf9ff5cb33ac99c3 Mon Sep 17 00:00:00 2001
From: Roman Skvazh <roman.skvazh@gmail.com>
Date: Thu, 6 Dec 2012 21:15:25 +0400
Subject: [PATCH 1064/2864] Update docs/plugins.rst

Change yuicompressor to yui_js and yui_css
---
 docs/plugins.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 6555e647..d9964287 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -130,9 +130,9 @@ CSS and JS files. The module must first be installed::
 The Webassets module allows you to perform a number of useful asset management
 functions, including:
 
-* CSS minifier (``cssmin``, ``yuicompressor``, ...)
+* CSS minifier (``cssmin``, ``yui_css``, ...)
 * CSS compiler (``less``, ``sass``, ...)
-* JS minifier (``uglifyjs``, ``yuicompressor``, ``closure``, ...)
+* JS minifier (``uglifyjs``, ``yui_js``, ``closure``, ...)
 
 Others filters include gzip compression, integration of images in CSS via data
 URIs, and more. Webassets can also append a version identifier to your asset

From a5772bf3d6e0563b109dc1f2cb19743cf6a19aef Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 7 Dec 2012 00:10:30 +0100
Subject: [PATCH 1065/2864] allow override page url and save_as values directly
 from the metadata

this is similar to the template override implemented in #404
---
 pelican/contents.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/contents.py b/pelican/contents.py
index d675a2ad..77ee70f8 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -44,6 +44,8 @@ class Page(object):
 
         # set metadata as attributes
         for key, value in local_metadata.items():
+            if key in ('save_as', 'url'):
+                key = 'override_' + key
             setattr(self, key.lower(), value)
 
         # also keep track of the metadata attributes available
@@ -128,6 +130,8 @@ class Page(object):
         return self.settings[fq_key].format(**self.url_format)
 
     def get_url_setting(self, key):
+        if hasattr(self, 'override_' + key):
+            return getattr(self, 'override_' + key)
         key = key if self.in_default_lang else 'lang_%s' % key
         return self._expand_settings(key)
 

From 00c7451200fd75056ebecb7cd681bda08b55d70a Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 7 Dec 2012 00:14:00 +0100
Subject: [PATCH 1066/2864] add functional test for save_as/url override

and update functional tests output
---
 samples/content/pages/override_url_saveas.rst |  9 ++
 .../basic/a-markdown-powered-article.html     |  3 +-
 tests/output/basic/archives.html              |  3 +-
 tests/output/basic/article-1.html             |  3 +-
 tests/output/basic/article-2.html             |  3 +-
 tests/output/basic/article-3.html             |  3 +-
 .../output/basic/author/alexis-metaireau.html |  3 +-
 tests/output/basic/categories.html            |  3 +-
 tests/output/basic/category/bar.html          |  3 +-
 tests/output/basic/category/cat1.html         |  3 +-
 tests/output/basic/category/misc.html         |  3 +-
 tests/output/basic/category/yeah.html         |  3 +-
 .../basic/filename_metadata-example.html      |  3 +-
 tests/output/basic/index.html                 |  3 +-
 tests/output/basic/oh-yeah.html               |  3 +-
 tests/output/basic/override/index.html        | 53 +++++++++++
 .../pages/this-is-a-test-hidden-page.html     |  3 +-
 .../basic/pages/this-is-a-test-page.html      |  3 +-
 tests/output/basic/second-article-fr.html     |  3 +-
 tests/output/basic/second-article.html        |  3 +-
 tests/output/basic/tag/bar.html               |  3 +-
 tests/output/basic/tag/baz.html               |  3 +-
 tests/output/basic/tag/foo.html               |  3 +-
 tests/output/basic/tag/foobar.html            |  3 +-
 tests/output/basic/tag/oh.html                |  3 +-
 tests/output/basic/tag/yeah.html              |  3 +-
 .../output/basic/this-is-a-super-article.html |  3 +-
 tests/output/basic/unbelievable.html          |  3 +-
 .../custom/a-markdown-powered-article.html    |  3 +-
 tests/output/custom/archives.html             |  3 +-
 tests/output/custom/article-1.html            |  3 +-
 tests/output/custom/article-2.html            |  3 +-
 tests/output/custom/article-3.html            |  3 +-
 .../custom/author/alexis-metaireau.html       |  3 +-
 .../custom/author/alexis-metaireau2.html      |  3 +-
 .../custom/author/alexis-metaireau3.html      |  3 +-
 tests/output/custom/categories.html           |  3 +-
 tests/output/custom/category/bar.html         |  3 +-
 tests/output/custom/category/cat1.html        |  3 +-
 tests/output/custom/category/misc.html        |  3 +-
 tests/output/custom/category/yeah.html        |  3 +-
 .../output/custom/drafts/a-draft-article.html |  3 +-
 .../custom/filename_metadata-example.html     |  3 +-
 tests/output/custom/index.html                |  3 +-
 tests/output/custom/index2.html               |  3 +-
 tests/output/custom/index3.html               |  3 +-
 tests/output/custom/jinja2_template.html      |  3 +-
 tests/output/custom/oh-yeah-fr.html           |  3 +-
 tests/output/custom/oh-yeah.html              |  3 +-
 tests/output/custom/override/index.html       | 88 +++++++++++++++++++
 .../pages/this-is-a-test-hidden-page.html     |  3 +-
 .../custom/pages/this-is-a-test-page.html     |  3 +-
 tests/output/custom/second-article-fr.html    |  3 +-
 tests/output/custom/second-article.html       |  3 +-
 tests/output/custom/tag/bar.html              |  3 +-
 tests/output/custom/tag/baz.html              |  3 +-
 tests/output/custom/tag/foo.html              |  3 +-
 tests/output/custom/tag/foobar.html           |  3 +-
 tests/output/custom/tag/oh.html               |  3 +-
 tests/output/custom/tag/yeah.html             |  3 +-
 .../custom/this-is-a-super-article.html       |  3 +-
 tests/output/custom/unbelievable.html         |  3 +-
 62 files changed, 268 insertions(+), 59 deletions(-)
 create mode 100644 samples/content/pages/override_url_saveas.rst
 create mode 100644 tests/output/basic/override/index.html
 create mode 100644 tests/output/custom/override/index.html

diff --git a/samples/content/pages/override_url_saveas.rst b/samples/content/pages/override_url_saveas.rst
new file mode 100644
index 00000000..8a515f60
--- /dev/null
+++ b/samples/content/pages/override_url_saveas.rst
@@ -0,0 +1,9 @@
+Override url/save_as
+####################
+
+:date: 2012-12-07
+:url: override/
+:save_as: override/index.html
+
+Test page which overrides save_as and url so that this page will be generated
+at a custom location.
diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 80a12212..9b9da171 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index cb06dfa1..dfe0ce50 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index b372d6ca..974b785a 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 1a18cb47..9f0b4887 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 6b83b062..724f53f7 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index e6f65a11..3479672b 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index f945d04a..25fba44b 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index 896d9222..29e74908 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index b8ae397e..6fbfedb2 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li class="active"><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index 2d62b852..47e0d3a6 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index 37dfde63..93a27507 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/filename_metadata-example.html b/tests/output/basic/filename_metadata-example.html
index b7ae95a7..98381724 100644
--- a/tests/output/basic/filename_metadata-example.html
+++ b/tests/output/basic/filename_metadata-example.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 488d1b08..c499c85a 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index ab090b58..5186424e 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/override/index.html b/tests/output/basic/override/index.html
new file mode 100644
index 00000000..e6de769c
--- /dev/null
+++ b/tests/output/basic/override/index.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Override url/save_as</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+        <header id="banner" class="body">
+                <h1><a href="../">A Pelican Blog </a></h1>
+                <nav><ul>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+    <h1 class="entry-title">Override url/save_as</h1>
+        
+        <p>Test page which overrides save_as and url so that this page will be generated
+at a custom location.</p>
+
+</section>
+        <section id="extras" class="body">
+                        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 655ae272..56214cbe 100644
--- a/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 43e2c2d4..dd3e60fe 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index aa30292e..6826f532 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index 7319c87f..84556ac1 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 06b012cb..f5efeb8a 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index f6c56d4b..c51bd77b 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 4ee92b7d..47609394 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 11f21b6d..30b33908 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index d88192a0..b873b2a9 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 8533dbdc..ca339776 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 0188c07e..f4d5a7ab 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 36a1703c..c86cbd34 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -22,7 +22,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index 49c0d422..be71022c 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/archives.html b/tests/output/custom/archives.html
index 632387a4..aaece637 100644
--- a/tests/output/custom/archives.html
+++ b/tests/output/custom/archives.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index a07b669b..2616e332 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index fd95b709..64cf12a8 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index 4bd5fd09..919e04e3 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 8bb0dd1c..9b08f340 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 59926d8c..dba92905 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/author/alexis-metaireau3.html b/tests/output/custom/author/alexis-metaireau3.html
index 5f2ecbb1..865ad010 100644
--- a/tests/output/custom/author/alexis-metaireau3.html
+++ b/tests/output/custom/author/alexis-metaireau3.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/categories.html b/tests/output/custom/categories.html
index 64da26b4..25015ab9 100644
--- a/tests/output/custom/categories.html
+++ b/tests/output/custom/categories.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html
index 253d64ea..8f9fdefb 100644
--- a/tests/output/custom/category/bar.html
+++ b/tests/output/custom/category/bar.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html
index 8c265d41..29d99bed 100644
--- a/tests/output/custom/category/cat1.html
+++ b/tests/output/custom/category/cat1.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li class="active"><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html
index 33acbd70..ab39c20f 100644
--- a/tests/output/custom/category/misc.html
+++ b/tests/output/custom/category/misc.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html
index c39e1a86..b9cb6de3 100644
--- a/tests/output/custom/category/yeah.html
+++ b/tests/output/custom/category/yeah.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index 840b0dfc..f763aa42 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/filename_metadata-example.html b/tests/output/custom/filename_metadata-example.html
index 8f6353cb..af05059b 100644
--- a/tests/output/custom/filename_metadata-example.html
+++ b/tests/output/custom/filename_metadata-example.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index cc905735..df3c094d 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html
index f0d2f948..85dc6a24 100644
--- a/tests/output/custom/index2.html
+++ b/tests/output/custom/index2.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/index3.html b/tests/output/custom/index3.html
index 60f8633d..25ed3361 100644
--- a/tests/output/custom/index3.html
+++ b/tests/output/custom/index3.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/jinja2_template.html b/tests/output/custom/jinja2_template.html
index 2def2d4e..31df8b21 100644
--- a/tests/output/custom/jinja2_template.html
+++ b/tests/output/custom/jinja2_template.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index 0c1fdcdb..07d4abec 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index cb30a7d6..899efc1d 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/override/index.html b/tests/output/custom/override/index.html
new file mode 100644
index 00000000..84142880
--- /dev/null
+++ b/tests/output/custom/override/index.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <title>Override url/save_as</title>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        
+        <!--[if IE]>
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+        <!--[if lte IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
+                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+
+        <!--[if lt IE 7]>
+                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                    <li ><a href="../category/misc.html">misc</a></li>
+                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                    <li ><a href="../category/bar.html">bar</a></li>
+                                </ul></nav>
+        </header><!-- /#banner -->
+                
+<section id="content" class="body">    
+    <h1 class="entry-title">Override url/save_as</h1>
+        
+        <p>Test page which overrides save_as and url so that this page will be generated
+at a custom location.</p>
+
+</section>
+        <section id="extras" class="body">
+                        <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
+                                                    <li><a href="http://filyb.info/">Filyb</a></li>
+                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                                </ul>
+                </div><!-- /.blogroll -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            
+                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                                    <li><a href="http://github.com/ametaireau">github</a></li>
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 5c3b1da1..5fcbe122 100644
--- a/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html
index 5df98726..29492171 100644
--- a/tests/output/custom/pages/this-is-a-test-page.html
+++ b/tests/output/custom/pages/this-is-a-test-page.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index 95ad3bd7..8ebbb2b4 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 9c2b6de3..7a543597 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html
index 85bc5a07..99723b47 100644
--- a/tests/output/custom/tag/bar.html
+++ b/tests/output/custom/tag/bar.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/baz.html b/tests/output/custom/tag/baz.html
index 3064aa34..03959e62 100644
--- a/tests/output/custom/tag/baz.html
+++ b/tests/output/custom/tag/baz.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/foo.html b/tests/output/custom/tag/foo.html
index c6e99849..66d52f6f 100644
--- a/tests/output/custom/tag/foo.html
+++ b/tests/output/custom/tag/foo.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html
index b7a257e4..93d8282d 100644
--- a/tests/output/custom/tag/foobar.html
+++ b/tests/output/custom/tag/foobar.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index 451b1031..dd60851e 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html
index 151eb64c..59b591cc 100644
--- a/tests/output/custom/tag/yeah.html
+++ b/tests/output/custom/tag/yeah.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 98d22351..3cbd9e5f 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index 691f28f6..2ffc143d 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -26,7 +26,8 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>

From 802c9d1111e832eace3bc24ae6810e72d5e7c7d4 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 7 Dec 2012 01:02:44 +0100
Subject: [PATCH 1067/2864] add docs for save_as/url override from metadata
 feature

---
 docs/faq.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index a8617b30..9429a44f 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -92,6 +92,22 @@ want to have its own template.
 Then just make sure your theme contains the relevant template file (e.g.
 ``template_name.html``).
 
+How can I override the generated url of a specific page or article?
+===================================================================
+
+It's as simple as specifying the ``url`` and ``save_as`` special metadata to
+any pages or articles you want to override the generated url.
+Here is an example rst page::
+
+    Override url/save_as page
+    #########################
+
+    :url: override/url/
+    :save_as: override/url/index.html
+
+You're done, the page will be written to ``override/url/index.html``
+and Pelican will use url ``override/url/`` to link to this page.
+
 What if I want to disable feed generation?
 ==========================================
 

From b0ff693839be55e58ff141b08776587ed7d9bf5d Mon Sep 17 00:00:00 2001
From: Trae Blain <trae@traeblain.com>
Date: Fri, 7 Dec 2012 14:40:44 -0600
Subject: [PATCH 1068/2864] Updated plugins documentation to include actual
 callable names of each plugin included.

---
 docs/plugins.rst | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 6555e647..105be574 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -100,16 +100,16 @@ request if you need them!
 List of plugins
 ===============
 
-The following plugins are currently included with Pelican under ``pelican.plugins``:
+The following plugins are currently included with Pelican:
 
-* `Asset management`_
-* `GitHub activity`_
-* `Global license`_
-* `Gravatar`_
-* `Gzip cache`_
-* `HTML tags for reStructuredText`_
-* `Related posts`_
-* `Sitemap`_
+* `Asset management`_ ``pelican.plugins.assets``
+* `GitHub activity`_ ``pelican.plugins.github_activity``
+* `Global license`_ ``pelican.plugins.global_license``
+* `Gravatar`_ ``pelican.plugins.gravatar``
+* `Gzip cache`_ ``pelican.plugins.gzip_cache``
+* `HTML tags for reStructuredText`_ ``pelican.plugins.html_rst_directive``
+* `Related posts`_ ``pelican.plugins.related_posts``
+* `Sitemap`_ ``pelican.plugins.sitemap``
 
 Ideas for plugins that haven't been written yet:
 

From f79c844855195be990bc8c096b5b174c07708854 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sun, 9 Dec 2012 08:30:17 +0100
Subject: [PATCH 1069/2864] remote duplicated import statement (thanks
 @traeblain)

---
 pelican/readers.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 4dc041ae..61255dee 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -20,7 +20,6 @@ try:
     asciidoc = True
 except ImportError:
     asciidoc = False
-import re
 
 from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, pelican_open

From 733e41a6a7a976c29a1f580dc064e599677da54f Mon Sep 17 00:00:00 2001
From: Michael Reneer <michaelreneer@gmail.com>
Date: Tue, 11 Dec 2012 00:34:15 -0500
Subject: [PATCH 1070/2864] Updated markdown reader to parse summary metadata
 as markup.

---
 pelican/readers.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 61255dee..4164847d 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -142,7 +142,12 @@ class MarkdownReader(Reader):
         metadata = {}
         for name, value in md.Meta.items():
             name = name.lower()
-            metadata[name] = self.process_metadata(name, value[0])
+            if name == "summary":
+                summary_values = "\n".join(str(item) for item in value)
+                summary = md.convert(summary_values)
+                metadata[name] = self.process_metadata(name, summary)
+            else:
+                metadata[name] = self.process_metadata(name, value[0])
         return content, metadata
 
 

From f66c16bd52ff3e9fe0a9c0833e22f53ede89b531 Mon Sep 17 00:00:00 2001
From: Michael Reneer <michaelreneer@gmail.com>
Date: Tue, 11 Dec 2012 00:37:06 -0500
Subject: [PATCH 1071/2864] Updated unit tests to test markdown summary
 metadata.

---
 ...cle_with_markdown_and_summary_metadata_multi.md |  7 +++++++
 ...le_with_markdown_and_summary_metadata_single.md |  5 +++++
 tests/test_generators.py                           |  2 ++
 tests/test_readers.py                              | 14 ++++++++++++++
 4 files changed, 28 insertions(+)
 create mode 100644 tests/content/article_with_markdown_and_summary_metadata_multi.md
 create mode 100644 tests/content/article_with_markdown_and_summary_metadata_single.md

diff --git a/tests/content/article_with_markdown_and_summary_metadata_multi.md b/tests/content/article_with_markdown_and_summary_metadata_multi.md
new file mode 100644
index 00000000..b6ef666c
--- /dev/null
+++ b/tests/content/article_with_markdown_and_summary_metadata_multi.md
@@ -0,0 +1,7 @@
+Title: Article with markdown and summary metadata multi
+Date: 2012-10-31
+Summary:
+    A multi-line summary should be supported
+    as well as **inline markup**.
+
+This is some content.
diff --git a/tests/content/article_with_markdown_and_summary_metadata_single.md b/tests/content/article_with_markdown_and_summary_metadata_single.md
new file mode 100644
index 00000000..a7d6f09b
--- /dev/null
+++ b/tests/content/article_with_markdown_and_summary_metadata_single.md
@@ -0,0 +1,5 @@
+Title: Article with markdown and summary metadata single
+Date: 2012-10-30
+Summary: A single-line summary should be supported as well as **inline markup**.
+
+This is some content.
diff --git a/tests/test_generators.py b/tests/test_generators.py
index 90b19227..fb1dbe9c 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -71,6 +71,8 @@ class TestArticlesGenerator(unittest.TestCase):
         articles = self.distill_articles(generator.articles)
         articles_expected = [
             [u'Article title', 'published', 'Default', 'article'],
+            [u'Article with markdown and summary metadata single', 'published', u'Default', 'article'],
+            [u'Article with markdown and summary metadata multi', 'published', u'Default', 'article'],
             [u'Article with template', 'published', 'Default', 'custom'],
             [u'Test md File', 'published', 'test', 'article'],
             [u'Rst with filename metadata', 'published', u'yeah', 'article'],
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 937a98e3..ae325d62 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -203,6 +203,20 @@ class MdReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEquals(value, metadata[key], key)
 
+    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
+    def test_article_with_summary_metadata(self):
+        reader = readers.MarkdownReader({})
+        content, metadata = reader.read(
+            _filename('article_with_markdown_and_summary_metadata_single.md'))
+        expected_summary = u'<p>A single-line summary should be supported'\
+                           u' as well as <strong>inline markup</strong>.</p>'
+        self.assertEquals(expected_summary, metadata['summary'], 'summary')
+        content, metadata = reader.read(
+            _filename('article_with_markdown_and_summary_metadata_multi.md'))
+        expected_summary =  u'<p>A multi-line summary should be supported'\
+                            u'\nas well as <strong>inline markup</strong>.</p>'
+        self.assertEquals(expected_summary, metadata['summary'], 'summary')
+
 class AdReaderTest(unittest.TestCase):
 
     @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")

From b35947f7a65c2991cb5ea20d5d16dd094c0d43e2 Mon Sep 17 00:00:00 2001
From: Michael Reneer <michaelreneer@gmail.com>
Date: Tue, 11 Dec 2012 00:48:47 -0500
Subject: [PATCH 1072/2864] Cleaned up markdown read.

---
 pelican/readers.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 4164847d..6bd2822d 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -133,21 +133,27 @@ class MarkdownReader(Reader):
     file_extensions = ['md', 'markdown', 'mkd']
     extensions = ['codehilite', 'extra']
 
+    def _parse_metadata(self, meta):
+        """Return the dict containing document metadata"""
+        md = Markdown(extensions=set(self.extensions + ['meta']))
+        output = {}
+        for name, value in meta.items():
+            name = name.lower()
+            if name == "summary":
+                summary_values = "\n".join(str(item) for item in value)
+                summary = md.convert(summary_values)
+                output[name] = self.process_metadata(name, summary)
+            else:
+                output[name] = self.process_metadata(name, value[0])
+        return output
+
     def read(self, filename):
         """Parse content and metadata of markdown files"""
         text = pelican_open(filename)
         md = Markdown(extensions=set(self.extensions + ['meta']))
         content = md.convert(text)
 
-        metadata = {}
-        for name, value in md.Meta.items():
-            name = name.lower()
-            if name == "summary":
-                summary_values = "\n".join(str(item) for item in value)
-                summary = md.convert(summary_values)
-                metadata[name] = self.process_metadata(name, summary)
-            else:
-                metadata[name] = self.process_metadata(name, value[0])
+        metadata = self._parse_metadata(md.Meta)
         return content, metadata
 
 

From b4c5d7cf62c21e9f195144704d331dc5f85b5e54 Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Wed, 7 Nov 2012 19:14:12 +1000
Subject: [PATCH 1073/2864] Store slugs in posts by default on Pelican import

---
 docs/changelog.rst              |  2 ++
 docs/importer.rst               | 31 +++++++++++++++++++++++--------
 pelican/tools/pelican_import.py | 27 +++++++++++++++++++--------
 tests/test_importer.py          | 20 ++++++++++++++++++++
 4 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b7c64190..748f5120 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,8 @@ Release history
 3.1 (XXXX-XX-XX)
 ================
 
+* Importer now stores slugs within files by default. This can be disabled with
+  the ``--disable-slugs`` option.
 * Improve handling of links to intra-site resources
 * Ensure WordPress import adds paragraphs in for all types of line endings
   in post content.
diff --git a/docs/importer.rst b/docs/importer.rst
index ba96d9c2..ad4e3984 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -39,29 +39,44 @@ Usage
 """""
 
 | pelican-import [-h] [--wpfile] [--dotclear] [--feed] [-o OUTPUT]
-|                [-m MARKUP][--dir-cat]
+|                [-m MARKUP] [--dir-cat] [--strip-raw] [--disable-slugs]
 |                input
 
+Positional arguments
+====================
+
+  input                 The input file to read
+
 Optional arguments
 """"""""""""""""""
 
   -h, --help            show this help message and exit
-  --wpfile              Wordpress XML export
-  --dotclear            Dotclear export
-  --feed                Feed to parse
+  --wpfile              Wordpress XML export (default: False)
+  --dotclear            Dotclear export (default: False)
+  --feed                Feed to parse (default: False)
   -o OUTPUT, --output OUTPUT
-                        Output path
-  -m MARKUP             Output markup
+                        Output path (default: output)
+  -m MARKUP, --markup MARKUP
+                        Output markup format (supports rst & markdown)
+                        (default: rst)
   --dir-cat             Put files in directories with categories name
+                        (default: False)
+  --strip-raw           Strip raw HTML code that can't be converted to markup
+                        such as flash embeds or iframes (wordpress import
+                        only) (default: False)
+  --disable-slugs       Disable storing slugs from imported posts within
+                        output. With this disabled, your Pelican URLs may not
+                        be consistent with your original posts. (default:
+                        False)
 
 Examples
 ========
 
-for WordPress::
+For WordPress::
 
     $ pelican-import --wpfile -o ~/output ~/posts.xml
 
-for Dotclear::
+For Dotclear::
 
     $ pelican-import --dotclear -o ~/output ~/backup.txt
 
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 053dcffc..fdd1ac51 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -181,7 +181,7 @@ def feed2fields(file):
         yield (entry.title, entry.description, slug, date, author, [], tags, "html")
 
 
-def build_header(title, date, author, categories, tags):
+def build_header(title, date, author, categories, tags, slug):
     """Build a header from a list of fields"""
     header = '%s\n%s\n' % (title, '#' * len(title))
     if date:
@@ -192,10 +192,12 @@ def build_header(title, date, author, categories, tags):
         header += ':category: %s\n' % ', '.join(categories)
     if tags:
         header += ':tags: %s\n' % ', '.join(tags)
+    if slug:
+        header += ':slug: %s\n' % slug
     header += '\n'
     return header
 
-def build_markdown_header(title, date, author, categories, tags):
+def build_markdown_header(title, date, author, categories, tags, slug):
     """Build a header from a list of fields"""
     header = 'Title: %s\n' % title
     if date:
@@ -206,18 +208,21 @@ def build_markdown_header(title, date, author, categories, tags):
         header += 'Category: %s\n' % ', '.join(categories)
     if tags:
         header += 'Tags: %s\n' % ', '.join(tags)
+    if slug:
+        header += 'Slug: %s\n' % slug
     header += '\n'
     return header
 
-def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=False):
+def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=False, disable_slugs=False):
     for title, content, filename, date, author, categories, tags, in_markup in fields:
+        slug = not disable_slugs and filename or None
         if (in_markup == "markdown") or (out_markup == "markdown") :
             ext = '.md'
-            header = build_markdown_header(title, date, author, categories, tags)
+            header = build_markdown_header(title, date, author, categories, tags, slug)
         else:
             out_markup = "rst"
             ext = '.rst'
-            header = build_header(title, date, author, categories, tags)
+            header = build_header(title, date, author, categories, tags, slug)
 
         filename = os.path.basename(filename)
 
@@ -278,8 +283,8 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Transform feed, Wordpress or Dotclear files to rst files."
-            "Be sure to have pandoc installed",
+        description="Transform feed, Wordpress or Dotclear files to reST (rst) "
+                    "or Markdown (md) files. Be sure to have pandoc installed.",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument(dest='input', help='The input file to read')
@@ -298,6 +303,11 @@ def main():
     parser.add_argument('--strip-raw', action='store_true', dest='strip_raw',
         help="Strip raw HTML code that can't be converted to "
              "markup such as flash embeds or iframes (wordpress import only)")
+    parser.add_argument('--disable-slugs', action='store_true',
+        dest='disable_slugs',
+        help='Disable storing slugs from imported posts within output. '
+             'With this disabled, your Pelican URLs may not be consistent '
+             'with your original posts.')
 
     args = parser.parse_args()
 
@@ -328,4 +338,5 @@ def main():
 
     fields2pelican(fields, args.markup, args.output,
                    dircat=args.dircat or False,
-                   strip_raw=args.strip_raw or False)
+                   strip_raw=args.strip_raw or False,
+                   disable_slugs=args.disable_slugs or False)
diff --git a/tests/test_importer.py b/tests/test_importer.py
index 959a556a..449a7643 100644
--- a/tests/test_importer.py
+++ b/tests/test_importer.py
@@ -48,6 +48,26 @@ class TestWordpressXmlImporter(unittest.TestCase):
                          strip_raw=True))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
 
+    def test_can_toggle_slug_storage(self):
+
+        posts = list(self.posts)
+        r = lambda f: open(f).read()
+        silent_f2p = mute(True)(fields2pelican)
+
+        with temporary_folder() as temp:
+
+            rst_files = (r(f) for f in silent_f2p(posts, 'markdown', temp))
+            self.assertTrue(all('Slug:' in rst for rst in rst_files))
+            rst_files = (r(f) for f in silent_f2p(posts, 'markdown', temp,
+                         disable_slugs=True))
+            self.assertFalse(any('Slug:' in rst for rst in rst_files))
+
+            rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp))
+            self.assertTrue(all(':slug:' in rst for rst in rst_files))
+            rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp,
+                         disable_slugs=True))
+            self.assertFalse(any(':slug:' in rst for rst in rst_files))
+
     def test_decode_html_entities_in_titles(self):
         posts = list(self.posts)
         test_posts = [post for post in posts if post[2] == 'html-entity-test']

From 02f984f7efe9481dbaa2517cfc11ec826421925f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Tue, 18 Dec 2012 12:33:49 +0100
Subject: [PATCH 1074/2864] update the version of jinja needed, 2.6 is out

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 15ddebd6..b6a54414 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-requires = ['feedgenerator', 'jinja2 >= 2.4', 'pygments', 'docutils', 'pytz',
+requires = ['feedgenerator', 'jinja2 >= 2.6', 'pygments', 'docutils', 'pytz',
             'blinker', 'unidecode']
 
 try:

From 30c8825fa23636df8d051628679e40ec06d8bdc9 Mon Sep 17 00:00:00 2001
From: Thanos Lefteris <alefteris@gmail.com>
Date: Tue, 25 Dec 2012 23:36:44 +0200
Subject: [PATCH 1075/2864] Docs update of the pelican core install depedencies

---
 docs/getting_started.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 3e527611..1c9ea1a3 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -61,17 +61,20 @@ perform the same step to install the most recent version.
 Dependencies
 ------------
 
-At this time, Pelican is dependent on the following Python packages:
+At this time, Pelican core is dependent on the following Python packages:
 
 * feedgenerator, to generate the Atom feeds
 * jinja2, for templating support
+* pygments, for syntax highlighting
 * docutils, for supporting reStructuredText as an input format
+* pytz, for timezone definitions
+* blinker, an object-to-object and broadcast signaling system
+* unidecode, for ASCII transliterations of Unicode text
 
 If you're not using Python 2.7, you will also need the ``argparse`` package.
 
 Optionally:
 
-* pygments, for syntax highlighting
 * Markdown, for supporting Markdown as an input format
 * Typogrify, for typographical enhancements
 

From a0b29d980f86985b0181b92cfc803bfdbc7c0a8e Mon Sep 17 00:00:00 2001
From: Thanos Lefteris <alefteris@gmail.com>
Date: Tue, 25 Dec 2012 23:59:53 +0200
Subject: [PATCH 1076/2864] PyPI links for pelican depedencies

---
 docs/getting_started.rst | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 1c9ea1a3..0952c7d9 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -63,20 +63,26 @@ Dependencies
 
 At this time, Pelican core is dependent on the following Python packages:
 
-* feedgenerator, to generate the Atom feeds
-* jinja2, for templating support
-* pygments, for syntax highlighting
-* docutils, for supporting reStructuredText as an input format
-* pytz, for timezone definitions
-* blinker, an object-to-object and broadcast signaling system
-* unidecode, for ASCII transliterations of Unicode text
+* `feedgenerator <http://pypi.python.org/pypi/feedgenerator>`_, to generate the
+  Atom feeds
+* `jinja2 <http://pypi.python.org/pypi/Jinja2>`_, for templating support
+* `pygments <http://pypi.python.org/pypi/Pygments>`_, for syntax highlighting
+* `docutils <http://pypi.python.org/pypi/docutils>`_, for supporting
+  reStructuredText as an input format
+* `pytz <http://pypi.python.org/pypi/pytz>`_, for timezone definitions
+* `blinker <http://pypi.python.org/pypi/blinker>`_, an object-to-object and
+  broadcast signaling system
+* `unidecode <http://pypi.python.org/pypi/Unidecode>`_, for ASCII
+  transliterations of Unicode text
 
 If you're not using Python 2.7, you will also need the ``argparse`` package.
 
 Optionally:
 
-* Markdown, for supporting Markdown as an input format
-* Typogrify, for typographical enhancements
+* `markdown <http://pypi.python.org/pypi/Markdown>`_, for supporting Markdown as
+  an input format
+* `typogrify <http://pypi.python.org/pypi/typogrify>`_, for typographical
+  enhancements
 
 Kickstart a blog
 ================

From fcc74be26756f707ab29bd47593006673c29be22 Mon Sep 17 00:00:00 2001
From: "Wraithan (Chris McDonald)" <xwraithanx@gmail.com>
Date: Sat, 29 Dec 2012 09:52:21 -0800
Subject: [PATCH 1077/2864] pep8/style matching

---
 pelican/rstdirectives.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index b1f1242c..c677144d 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -98,15 +98,18 @@ directives.register_directive('youtube', YouTube)
 
 _abbr_re = re.compile('\((.*)\)$')
 
-class abbreviation(nodes.Inline, nodes.TextElement): pass
+
+class abbreviation(nodes.Inline, nodes.TextElement):
+    pass
+
 
 def abbr_role(typ, rawtext, text, lineno, inliner, options={}, content=[]):
-	text = utils.unescape(text)
-	m = _abbr_re.search(text)
-	if m is None:
-		return [abbreviation(text, text)], []
-	abbr = text[:m.start()].strip()
-	expl = m.group(1)
-	return [abbreviation(abbr, abbr, explanation=expl)], []
+    text = utils.unescape(text)
+    m = _abbr_re.search(text)
+    if m is None:
+        return [abbreviation(text, text)], []
+    abbr = text[:m.start()].strip()
+    expl = m.group(1)
+    return [abbreviation(abbr, abbr, explanation=expl)], []
 
 roles.register_local_role('abbr', abbr_role)

From 369bb476e9d71b7e3613466168c45b1e24309d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@gmail.com>
Date: Tue, 1 Jan 2013 00:36:08 +0100
Subject: [PATCH 1078/2864] Improve Publishing to GitHub section of the doc

---
 docs/tips.rst | 97 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 32 deletions(-)

diff --git a/docs/tips.rst b/docs/tips.rst
index abb739b1..64695db0 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -6,47 +6,80 @@ Here are some tips about Pelican that you might find useful.
 Publishing to GitHub
 ====================
 
-GitHub comes with an interesting "pages" feature: you can upload things there
-and it will be available directly from their servers. As Pelican is a static
-file generator, we can take advantage of this.
-
-User Pages
-----------
-GitHub allows you to create user pages in the form of ``username.github.com``.
-Whatever is created in the master branch will be published. For this purpose,
-just the output generated by Pelican needs to pushed to GitHub.
-
-So given a repository containing your articles, just run Pelican over the posts
-and deploy the master branch to GitHub::
-
-    $ pelican -s pelican.conf.py ./path/to/posts -o /path/to/output
-
-Now add all the files in the output directory generated by Pelican::
-
-    $ git add /path/to/output/*
-    $ git commit -am "Your Message"
-    $ git push origin master
+`GitHub Pages <https://help.github.com/categories/20/articles>`_ offer an easy
+and convenient way to publish Pelican sites. There are `two types of GitHub
+Pages <https://help.github.com/articles/user-organization-and-project-pages>`_:
+*Project Pages* and *User Pages*. Pelican sites can be published as both
+Project Pages and User Pages.
 
 Project Pages
 -------------
-For creating Project pages, a branch called ``gh-pages`` is used for publishing.
-The excellent `ghp-import <https://github.com/davisp/ghp-import>`_ makes this
-really easy, which can be installed via::
 
-    $ pip install ghp-import
+To publish a Pelican site as Project Pages you need to *push* the content of
+the ``output`` dir generated by Pelican to a repository's ``gh-pages`` branch
+on GitHub.
 
-Then, given a repository containing your articles, you would simply run
-Pelican and upload the output to GitHub::
+The excellent `ghp-import <https://github.com/davisp/ghp-import>`_, which can
+be installed with ``easy_install`` or ``pip``, makes this process really easy.
 
-    $ pelican -s pelican.conf.py .
+For example, if the sources of your Pelican site are contained in a GitHub
+repository, and if you want to publish your Pelican site as Project Pages of
+this repository, you can then use the following::
+
+    $ pelican content -o output pelicanconf.py
     $ ghp-import output
     $ git push origin gh-pages
 
-And that's it.
+The ``ghp-import output`` command updates the local ``gh-pages`` branch with
+the content of the ``output`` directory (creating the branch if it doesn't
+already exist). The ``git push origin gh-pages`` command updates the remote
+``gh-pages`` branch, effectively publishing the Pelican site.
 
-If you want, you can put that directly into a post-commit hook, so each time you
-commit, your blog is up-to-date on GitHub!
+.. note::
 
-Put the following into ``.git/hooks/post-commit``::
+    The ``github`` target of the Makefile created by the ``pelican-quickstart``
+    command publishes the Pelican site as Project Pages as described above.
 
-    pelican -s pelican.conf.py . && ghp-import output && git push origin gh-pages
+User Pages
+----------
+
+To publish a Pelican site as User Pages you need to *push* the content of the
+``output`` dir generated by Pelican to the ``master`` branch of your
+``<username>.github.com`` repository on GitHub.
+
+Again, you can take advantage of ``ghp-import``::
+
+    $ pelican content -o output pelicanconf.py
+    $ ghp-import output
+    $ git push git@github.com:elemoine/elemoine.github.com.git gh-pages:master
+
+The ``git push`` command pushes the local ``gh-pages`` branch (freshly updated
+by the ``ghp-import`` command) to the ``elemoine.github.com`` repository's
+``master`` branch on GitHub.
+
+.. note::
+
+    To publish your Pelican site as User Pages feel free to adjust the the
+    ``github`` target of the Makefile.
+
+Extra Tips
+----------
+
+Tip #1:
+
+To automatically update your Pelican site on each commit you can create
+a post-commit hook. For example, you can add the following to
+``.git/hooks/post-commit``::
+
+    pelican pelican content -o output pelicanconf.py && ghp-import output && git push origin gh-pages
+
+Tip #2:
+
+To use a `custom domain
+<https://help.github.com/articles/setting-up-a-custom-domain-with-pages>`_ with
+GitHub Pages you need to have a ``CNAME`` file at the root of your pages. For
+that you will add ``CNAME`` file to your ``content``, dir and use the
+``FILES_TO_COPY`` setting variable to tell Pelican to copy that file
+to the ``output`` dir. For example::
+
+    FILES_TO_COPY = (('extra/CNAME', 'CNAME'),)

From 8cc0da67e1138af0e2bb2c344f6fff3d92004ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Wed, 2 Jan 2013 11:39:37 +0100
Subject: [PATCH 1079/2864] Fix the THANKS file.

---
 THANKS | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 127 insertions(+), 18 deletions(-)

diff --git a/THANKS b/THANKS
index 2a20100e..6d6ee886 100644
--- a/THANKS
+++ b/THANKS
@@ -1,19 +1,128 @@
-Some people have helped to improve pelican by contributing features, reporting
-bugs or giving ideas. Thanks to them !
+Pelican is a project by Alexis Métaireau <http://notmyidea.org> but there is
+a quite big number of people that contributed or implemented key features over
+time.  We try to keep this list up to date, but you can have a look at the nice
+graphs proposed by github about contributors here:
+https://github.com/getpelican/pelican/graphs/contributors
 
-- Dan Jacka
-- solsTiCe on linuxfr for reporting bugs
-- Guillaume B (Gui13)
-- Ronny Pfannschmidt
-- Jérome Renard
-- Nicolas Martin
-- David Kulak
-- Arnaud Bos
-- nblock (Florian)
-- Bruno Bord
-- Laureline Guérin
-- Samuel Martin
-- Marcus Fredriksson
-- Günter Kolousek
-- Simon Liedtke
-- Manuel F. Viera
+If you want to contibute, check the documentation section about how to do so
+<http://docs.getpelican.com/en/latest/contribute.html>
+
+Aaron Kavlie
+Abhishek L
+Albrecht Mühlenschulte
+Aldiantoro Nugroho
+Alen Mujezinovic
+Alessandro Martin
+Alexander Artemenko
+Alexandre RODIERE
+Alexis Daboville
+Alexis Metaireau
+Alexis Métaireau
+Allan Whatmough
+Andrea Crotti
+Andrew Laski
+Arnaud BOS
+asselinpaul
+Borgar
+Brandon W Maister
+Brendan Wholihan
+Brian C. Lane
+Brian Hsu
+Brian St. Pierre
+Bruno Binet
+BunnyMan
+Chris Streeter
+Christophe Chauvet
+Clint Howarth
+Dafydd Crosby
+Dana Woodman
+dave mankoff
+David Beitey
+David Marble
+derdon
+Dirkjan Ochtman
+Dirk Makowski
+draftcode
+Edward Delaporte
+epatters
+Eric Case
+Erik Hetzner
+FELD Boris
+Feth Arezki
+Feth AREZKI
+Florian Jacob
+Florian Preinstorfer
+Freeculture
+Guillaume
+Guillaume B
+Guillermo López
+guillermooo
+Ian Cordasco
+Iuri de Silvio
+James Rowe
+jawher
+Jerome
+Jiachen Yang
+Jochen Breuer
+joe di castro
+Jökull Sólberg Auðunsson
+Joshua Adelman
+Julian Berman
+justinmayer
+Justin Mayer
+Kyle Fuller
+Laureline Guerin
+Leonard Huang
+Marcel Hellkamp
+Marco Milanesi
+Marcus Fredriksson
+Mario Rodas
+Martin Brochhaus
+Massimo Santini
+Matt Bowcock
+Matt Layman
+Meir Kriheli
+Michael Guntsche
+Michael Reneer
+Michael Yanovich
+Mike Yumatov
+Mikhail Korobov
+m-r-r
+mviera
+Nico Di Rocco
+Nicolas Duhamel
+Nicolas Perriault
+Nicolas Steinmetz
+Pavel Puchkin
+Perry Roper
+Philippe Pepiot
+Rachid Belaid
+Ranjhith Kalisamy
+Remi Rampin
+Rémy HUBSCHER
+renhbo
+Roman Skvazh
+Ronny Pfannschmidt
+Rory McCann
+saghul
+sam
+Samrat Man Singh
+Simon
+Simon Liedtke
+skami
+Skami18
+solsTiCe d'Hiver
+stephane
+Stéphane Bunel
+Stéphane Raimbault
+Stuart Colville
+Tarek Ziade
+tBunnyMan
+Thanos Lefteris
+the Bunny Man
+Tobias
+Tomi Pieviläinen
+Trae Blain
+Tshepang Lekhonkhobe
+Wladislaw Merezhko
+Zoresvit

From be040715f984ceee69812c081b901653f8f08e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Wed, 2 Jan 2013 13:46:55 +0100
Subject: [PATCH 1080/2864] remove duplicates

---
 THANKS | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/THANKS b/THANKS
index 6d6ee886..eeaf2309 100644
--- a/THANKS
+++ b/THANKS
@@ -16,7 +16,6 @@ Alessandro Martin
 Alexander Artemenko
 Alexandre RODIERE
 Alexis Daboville
-Alexis Metaireau
 Alexis Métaireau
 Allan Whatmough
 Andrea Crotti
@@ -49,7 +48,6 @@ Eric Case
 Erik Hetzner
 FELD Boris
 Feth Arezki
-Feth AREZKI
 Florian Jacob
 Florian Preinstorfer
 Freeculture
@@ -107,17 +105,13 @@ Rory McCann
 saghul
 sam
 Samrat Man Singh
-Simon
 Simon Liedtke
-skami
 Skami18
 solsTiCe d'Hiver
-stephane
 Stéphane Bunel
 Stéphane Raimbault
 Stuart Colville
 Tarek Ziade
-tBunnyMan
 Thanos Lefteris
 the Bunny Man
 Tobias

From a71465217b4aba4e7585846617ca92923c65f6f4 Mon Sep 17 00:00:00 2001
From: Trae Blain <trae@traeblain.com>
Date: Fri, 21 Dec 2012 17:13:04 -0600
Subject: [PATCH 1081/2864] Update webassets plugin to allow user to pass
 configuration settings to Webassets through their settings file. Also removed
 language about DEBUG not compiling CSS since as of at least webassets 0.8
 this is no longer an issue.

---
 docs/plugins.rst          | 17 +++++++++++++----
 pelican/plugins/assets.py |  4 ++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 7e09810b..bbeb5930 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -183,10 +183,19 @@ The above will produce a minified and gzipped JS file:
     <script src="http://{SITEURL}/theme/js/packed.js?00703b9d"></script>
 
 Pelican's debug mode is propagated to Webassets to disable asset packaging
-and instead work with the uncompressed assets. However, this also means that
-the LESS and SASS files are not compiled. This should be fixed in a future
-version of Webassets (cf. the related `bug report
-<https://github.com/getpelican/pelican/issues/481>`_).
+and instead work with the uncompressed assets.
+
+Many of Webasset's available compilers have additional configuration options
+(i.e. 'Less', 'Sass', 'Stylus', 'Closure_js').  You can pass these options to
+Webassets using the ``ASSET_CONFIG`` in your settings file.
+
+The following will handle Google Closure's compilation level and locate
+LessCSS's binary:
+
+.. code-block:: python
+
+    ASSET_CONFIG = (('closure_compressor_optimization', 'WHITESPACE_ONLY'),
+                    ('less_bin', 'lessc.cmd'), )
 
 .. _Webassets: https://github.com/miracle2k/webassets
 .. _Webassets documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
diff --git a/pelican/plugins/assets.py b/pelican/plugins/assets.py
index b5d1cf76..877373f6 100644
--- a/pelican/plugins/assets.py
+++ b/pelican/plugins/assets.py
@@ -36,6 +36,10 @@ def create_assets_env(generator):
     assets_src = os.path.join(generator.output_path, 'theme')
     generator.env.assets_environment = Environment(assets_src, assets_url)
 
+    if 'ASSET_CONFIG' in generator.settings:
+        for item in generator.settings['ASSET_CONFIG']:
+            generator.env.assets_environment.config[item[0]] = item[1]
+
     logger = logging.getLogger(__name__)
     if logging.getLevelName(logger.getEffectiveLevel()) == "DEBUG":
         generator.env.assets_environment.debug = True

From 9eb5ad77ef5faa57987aff8322f76abdddffc426 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 3 Jan 2013 12:19:27 -0500
Subject: [PATCH 1082/2864] settings: Fix abspath existence check for path
 settings

The path to check is `absp`.  `p` is the setting name.
---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 692fc983..203003a4 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -91,7 +91,7 @@ def read_settings(filename=None, override=None):
                     and not isabs(local_settings[p]):
                 absp = os.path.abspath(os.path.normpath(os.path.join(
                             os.path.dirname(filename), local_settings[p])))
-                if p != 'THEME' or os.path.exists(p):
+                if p != 'THEME' or os.path.exists(absp):
                     local_settings[p] = absp
     else:
         local_settings = copy.deepcopy(_DEFAULT_CONFIG)

From 88b5a27ddf9f2334108825ef3fbac44868cc5d60 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 3 Jan 2013 18:10:08 -0500
Subject: [PATCH 1083/2864] contents: Page.url_format should expose all
 metadata

I want to add `directory` metadata to each page in `content/pages/` to
place my non-article pages by hand:

  PAGE_URL = '{directory}/{slug}'
  PAGE_SAVE_AS = '{directory}/{slug}/index.html'

To do this, I need the `directory` metadata for formatting the URL.
---
 pelican/contents.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index d675a2ad..b986a34e 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -114,14 +114,16 @@ class Page(object):
 
     @property
     def url_format(self):
-        return {
+        metadata = copy.copy(self.metadata)
+        metadata.update({
             'slug': getattr(self, 'slug', ''),
             'lang': getattr(self, 'lang', 'en'),
             'date': getattr(self, 'date', datetime.now()),
             'author': getattr(self, 'author', ''),
             'category': getattr(self, 'category',
                 self.settings['DEFAULT_CATEGORY']),
-        }
+            })
+        return metadata
 
     def _expand_settings(self, key):
         fq_key = ('%s_%s' % (self.__class__.__name__, key)).upper()

From 696caac9b0495e29b33c84897c2ecd44e8e7afe0 Mon Sep 17 00:00:00 2001
From: Peter Desmet <peter.desmet.work@gmail.com>
Date: Mon, 7 Jan 2013 10:49:51 +0100
Subject: [PATCH 1084/2864] Fixed a typo

BeatifulSoup -> Beautiful Soup
---
 docs/importer.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index ad4e3984..c9fa3be0 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -24,10 +24,10 @@ Dependencies
 
 ``pelican-import`` has two dependencies not required by the rest of pelican:
 
-- BeautifulSoup
+- Beautiful Soup
 - pandoc
 
-BeatifulSoup can be installed like any other Python package::
+Beautiful Soup can be installed like any other Python package::
 
     $ pip install BeautifulSoup
 

From 71995d5e1bec6f34ef836e1dc7416e27dd3cfe30 Mon Sep 17 00:00:00 2001
From: Dirk Makowski <dmakowski@gmx.net>
Date: Fri, 11 Jan 2013 02:57:43 +0100
Subject: [PATCH 1085/2864] Port pelican to python 3.

Stays compatible with 2.x series, thanks to an unified codebase.
---
 .gitignore                                   |   2 +
 .travis.yml                                  |   4 +-
 dev_requirements.txt                         |   7 +-
 docs/changelog.rst                           |   2 +-
 docs/conf.py                                 |  21 ++--
 pelican/__init__.py                          |  14 ++-
 pelican/contents.py                          |  45 ++++---
 pelican/generators.py                        |  36 +++---
 pelican/log.py                               |  36 +++---
 pelican/paginator.py                         |   5 +-
 pelican/plugins/assets.py                    |   1 +
 pelican/plugins/github_activity.py           |   1 +
 pelican/plugins/gzip_cache.py                |   2 +-
 pelican/plugins/html_rst_directive.py        |   5 +-
 pelican/plugins/initialized.py               |   4 +-
 pelican/plugins/related_posts.py             |   4 +-
 pelican/plugins/sitemap.py                   |  15 ++-
 pelican/readers.py                           |  10 +-
 pelican/rstdirectives.py                     |   4 +-
 pelican/server.py                            |  20 ++++
 pelican/settings.py                          |  16 +--
 pelican/signals.py                           |   2 +
 pelican/tools/pelican_import.py              |  51 +++++---
 pelican/tools/pelican_quickstart.py          |  82 +++++++------
 pelican/tools/pelican_themes.py              |  17 +--
 pelican/tools/templates/Makefile.in          |   2 +-
 pelican/tools/templates/develop_server.sh.in |  12 +-
 pelican/utils.py                             | 120 ++++++++++++++++---
 pelican/writers.py                           |  19 +--
 samples/pelican.conf.py                      |  10 +-
 setup.py                                     |   4 +-
 tests/default_conf.py                        |   7 +-
 tests/support.py                             |   6 +-
 tests/test_contents.py                       |   6 +-
 tests/test_generators.py                     |  43 +++----
 tests/test_importer.py                       |  23 +---
 tests/test_pelican.py                        |   6 +-
 tests/test_plugins.py                        |   2 +-
 tests/test_readers.py                        |  39 ++----
 tests/test_settings.py                       |   4 +-
 tests/test_utils.py                          |   7 +-
 tests/test_webassets.py                      |   1 +
 tox.ini                                      |  65 +++++++++-
 43 files changed, 495 insertions(+), 287 deletions(-)
 create mode 100644 pelican/server.py

diff --git a/.gitignore b/.gitignore
index 9f9404ef..1ae0e9f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ tags
 .tox
 .coverage
 htmlcov
+six-*.egg/
+*.orig
diff --git a/.travis.yml b/.travis.yml
index bb9a22e4..e92b0abc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,13 @@ language: python
 python:
     - "2.6"
     - "2.7"
+#    - "3.2"
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq ruby-sass
 install:
-    - pip install nose unittest2 mock --use-mirrors
+    - pip install nose mock --use-mirrors
+    - if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install --use-mirrors unittest2py3k; else pip install --use-mirrors unittest2; fi
     - pip install . --use-mirrors
     - pip install Markdown
     - pip install webassets
diff --git a/dev_requirements.txt b/dev_requirements.txt
index acf01773..e0189d35 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,8 +1,9 @@
 # Tests
-unittest2
 mock
+
 # Optional Packages
 Markdown
-BeautifulSoup
+BeautifulSoup4
+lxml
 typogrify
-webassets
\ No newline at end of file
+webassets
diff --git a/docs/changelog.rst b/docs/changelog.rst
index e29c94c0..aa18ea9e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,7 @@ Release history
 3.2 (XXXX-XX-XX)
 ================
 
-* [...]
+* Support for Python 3!
 
 3.1 (2012-12-04)
 ================
diff --git a/docs/conf.py b/docs/conf.py
index 2a11fe3e..6c8ececa 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import sys, os
 
 sys.path.append(os.path.abspath('..'))
@@ -10,8 +11,8 @@ templates_path = ['_templates']
 extensions = ['sphinx.ext.autodoc',]
 source_suffix = '.rst'
 master_doc = 'index'
-project = u'Pelican'
-copyright = u'2010, Alexis Metaireau and contributors'
+project = 'Pelican'
+copyright = '2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 version = __version__
 release = __major__
@@ -34,16 +35,16 @@ htmlhelp_basename = 'Pelicandoc'
 
 # -- Options for LaTeX output --------------------------------------------------
 latex_documents = [
-  ('index', 'Pelican.tex', u'Pelican Documentation',
-   u'Alexis Métaireau', 'manual'),
+  ('index', 'Pelican.tex', 'Pelican Documentation',
+   'Alexis Métaireau', 'manual'),
 ]
 
 # -- Options for manual page output --------------------------------------------
 man_pages = [
-    ('index', 'pelican', u'pelican documentation',
-     [u'Alexis Métaireau'], 1),
-    ('pelican-themes', 'pelican-themes', u'A theme manager for Pelican',
-     [u'Mickaël Raybaud'], 1),
-    ('themes', 'pelican-theming', u'How to create themes for Pelican',
-     [u'The Pelican contributors'], 1)
+    ('index', 'pelican', 'pelican documentation',
+     ['Alexis Métaireau'], 1),
+    ('pelican-themes', 'pelican-themes', 'A theme manager for Pelican',
+     ['Mickaël Raybaud'], 1),
+    ('themes', 'pelican-theming', 'How to create themes for Pelican',
+     ['The Pelican contributors'], 1)
 ]
diff --git a/pelican/__init__.py b/pelican/__init__.py
index e2ea7f76..566cb3b0 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+import six
+
 import os
 import re
 import sys
@@ -55,7 +59,7 @@ class Pelican(object):
         self.plugins = self.settings['PLUGINS']
         for plugin in self.plugins:
             # if it's a string, then import it
-            if isinstance(plugin, basestring):
+            if isinstance(plugin, six.string_types):
                 logger.debug("Loading plugin `{0}' ...".format(plugin))
                 plugin = __import__(plugin, globals(), locals(), 'module')
 
@@ -265,7 +269,7 @@ def get_instance(args):
     settings = read_settings(args.settings, override=get_config(args))
 
     cls = settings.get('PELICAN_CLASS')
-    if isinstance(cls, basestring):
+    if isinstance(cls, six.string_types):
         module, cls_name = cls.rsplit('.', 1)
         module = __import__(module)
         cls = getattr(module, cls_name)
@@ -311,15 +315,15 @@ def main():
                                        "Nothing to generate.")
                         files_found_error = False
                     time.sleep(1)  # sleep to avoid cpu load
-                except Exception, e:
+                except Exception as e:
                     logger.warning(
                         "Caught exception \"{}\". Reloading.".format(e)
                     )
                     continue
         else:
             pelican.run()
-    except Exception, e:
-        logger.critical(unicode(e))
+    except Exception as e:
+        logger.critical(e)
 
         if (args.verbosity == logging.DEBUG):
             raise
diff --git a/pelican/contents.py b/pelican/contents.py
index d675a2ad..4655d4cc 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+import six
+
 import copy
 import locale
 import logging
@@ -11,8 +14,10 @@ from sys import platform, stdin
 
 
 from pelican.settings import _DEFAULT_CONFIG
-from pelican.utils import slugify, truncate_html_words, memoized
+from pelican.utils import (slugify, truncate_html_words, memoized,
+    python_2_unicode_compatible)
 from pelican import signals
+import pelican.utils
 
 logger = logging.getLogger(__name__)
 
@@ -85,13 +90,8 @@ class Page(object):
             self.date_format = self.date_format[1]
 
         if hasattr(self, 'date'):
-            encoded_date = self.date.strftime(
-                    self.date_format.encode('ascii', 'xmlcharrefreplace'))
-
-            if platform == 'win32':
-                self.locale_date = encoded_date.decode(stdin.encoding)
-            else:
-                self.locale_date = encoded_date.decode('utf')
+            self.locale_date = pelican.utils.strftime(self.date,
+                self.date_format)
 
         # manage status
         if not hasattr(self, 'status'):
@@ -167,7 +167,7 @@ class Page(object):
                     origin = '/'.join((siteurl,
                              self._context['filenames'][value].url))
                 else:
-                    logger.warning(u"Unable to find {fn}, skipping url"
+                    logger.warning("Unable to find {fn}, skipping url"
                                     " replacement".format(fn=value))
 
             return m.group('markup') + m.group('quote') + origin \
@@ -243,10 +243,10 @@ class Article(Page):
 class Quote(Page):
     base_properties = ('author', 'date')
 
-
+@python_2_unicode_compatible
 class URLWrapper(object):
     def __init__(self, name, settings):
-        self.name = unicode(name)
+        self.name = name
         self.slug = slugify(self.name)
         self.settings = settings
 
@@ -257,12 +257,9 @@ class URLWrapper(object):
         return hash(self.name)
 
     def __eq__(self, other):
-        return self.name == unicode(other)
+        return self.name == other
 
     def __str__(self):
-        return str(self.name.encode('utf-8', 'replace'))
-
-    def __unicode__(self):
         return self.name
 
     def _from_settings(self, key, get_page_name=False):
@@ -272,14 +269,14 @@ class URLWrapper(object):
         Useful for pagination."""
         setting = "%s_%s" % (self.__class__.__name__.upper(), key)
         value = self.settings[setting]
-        if not isinstance(value, basestring):
-            logger.warning(u'%s is set to %s' % (setting, value))
+        if not isinstance(value, six.string_types):
+            logger.warning('%s is set to %s' % (setting, value))
             return value
         else:
             if get_page_name:
-                return unicode(os.path.splitext(value)[0]).format(**self.as_dict())
+                return os.path.splitext(value)[0].format(**self.as_dict())
             else:
-                return unicode(value).format(**self.as_dict())
+                return value.format(**self.as_dict())
 
     page_name = property(functools.partial(_from_settings, key='URL', get_page_name=True))
     url = property(functools.partial(_from_settings, key='URL'))
@@ -292,13 +289,14 @@ class Category(URLWrapper):
 
 class Tag(URLWrapper):
     def __init__(self, name, *args, **kwargs):
-        super(Tag, self).__init__(unicode.strip(name), *args, **kwargs)
+        super(Tag, self).__init__(name.strip(), *args, **kwargs)
 
 
 class Author(URLWrapper):
     pass
 
 
+@python_2_unicode_compatible
 class StaticContent(object):
     def __init__(self, src, dst=None, settings=None):
         if not settings:
@@ -309,9 +307,6 @@ class StaticContent(object):
         self.save_as = os.path.join(settings['OUTPUT_PATH'], self.url)
 
     def __str__(self):
-        return str(self.filepath.encode('utf-8', 'replace'))
-
-    def __unicode__(self):
         return self.filepath
 
 
@@ -319,7 +314,7 @@ def is_valid_content(content, f):
     try:
         content.check_properties()
         return True
-    except NameError, e:
-        logger.error(u"Skipping %s: impossible to find informations about"
+    except NameError as e:
+        logger.error("Skipping %s: impossible to find informations about"
                       "'%s'" % (f, e))
         return False
diff --git a/pelican/generators.py b/pelican/generators.py
index b5c1b944..0d2fa6a9 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+
 import os
 import math
 import random
 import logging
 import datetime
-import subprocess
 import shutil
 
 from codecs import open
@@ -119,7 +120,7 @@ class Generator(object):
         for item in items:
             value = getattr(self, item)
             if hasattr(value, 'items'):
-                value = value.items()
+                value = list(value.items())
             self.context[item] = value
 
 
@@ -133,8 +134,8 @@ class _FileLoader(BaseLoader):
         if template != self.path or not os.path.exists(self.fullpath):
             raise TemplateNotFound(template)
         mtime = os.path.getmtime(self.fullpath)
-        with file(self.fullpath) as f:
-            source = f.read().decode('utf-8')
+        with open(self.fullpath, 'r', encoding='utf-8') as f:
+            source = f.read()
         return source, self.fullpath, \
                 lambda: mtime == os.path.getmtime(self.fullpath)
 
@@ -323,8 +324,8 @@ class ArticlesGenerator(Generator):
             try:
                 signals.article_generate_preread.send(self)
                 content, metadata = read_file(f, settings=self.settings)
-            except Exception, e:
-                logger.warning(u'Could not process %s\n%s' % (f, str(e)))
+            except Exception as e:
+                logger.warning('Could not process %s\n%s' % (f, str(e)))
                 continue
 
             # if no category is set, use the name of the path as a category
@@ -333,8 +334,7 @@ class ArticlesGenerator(Generator):
                 if (self.settings['USE_FOLDER_AS_CATEGORY']
                     and os.path.dirname(f) != article_path):
                     # if the article is in a subdirectory
-                    category = os.path.basename(os.path.dirname(f))\
-                        .decode('utf-8')
+                    category = os.path.basename(os.path.dirname(f))
                 else:
                     # if the article is not in a subdirectory
                     category = self.settings['DEFAULT_CATEGORY']
@@ -366,8 +366,8 @@ class ArticlesGenerator(Generator):
             elif article.status == "draft":
                 self.drafts.append(article)
             else:
-                logger.warning(u"Unknown status %s for file %s, skipping it." %
-                               (repr(unicode.encode(article.status, 'utf-8')),
+                logger.warning("Unknown status %s for file %s, skipping it." %
+                               (repr(article.status),
                                 repr(f)))
 
         self.articles, self.translations = process_translations(all_articles)
@@ -394,7 +394,7 @@ class ArticlesGenerator(Generator):
         tag_cloud = sorted(tag_cloud.items(), key=itemgetter(1), reverse=True)
         tag_cloud = tag_cloud[:self.settings.get('TAG_CLOUD_MAX_ITEMS')]
 
-        tags = map(itemgetter(1), tag_cloud)
+        tags = list(map(itemgetter(1), tag_cloud))
         if tags:
             max_count = max(tags)
         steps = self.settings.get('TAG_CLOUD_STEPS')
@@ -450,8 +450,8 @@ class PagesGenerator(Generator):
                 exclude=self.settings['PAGE_EXCLUDES']):
             try:
                 content, metadata = read_file(f, settings=self.settings)
-            except Exception, e:
-                logger.warning(u'Could not process %s\n%s' % (f, str(e)))
+            except Exception as e:
+                logger.warning('Could not process %s\n%s' % (f, str(e)))
                 continue
             signals.pages_generate_context.send(self, metadata=metadata)
             page = Page(content, metadata, settings=self.settings,
@@ -466,8 +466,8 @@ class PagesGenerator(Generator):
             elif page.status == "hidden":
                 hidden_pages.append(page)
             else:
-                logger.warning(u"Unknown status %s for file %s, skipping it." %
-                               (repr(unicode.encode(page.status, 'utf-8')),
+                logger.warning("Unknown status %s for file %s, skipping it." %
+                               (repr(page.status),
                                 repr(f)))
 
         self.pages, self.translations = process_translations(all_pages)
@@ -550,7 +550,7 @@ class PdfGenerator(Generator):
             # print "Generating pdf for", obj.filename, " in ", output_pdf
             with open(obj.filename) as f:
                 self.pdfcreator.createPdf(text=f.read(), output=output_pdf)
-            logger.info(u' [ok] writing %s' % output_pdf)
+            logger.info(' [ok] writing %s' % output_pdf)
 
     def generate_context(self):
         pass
@@ -558,7 +558,7 @@ class PdfGenerator(Generator):
     def generate_output(self, writer=None):
         # we don't use the writer passed as argument here
         # since we write our own files
-        logger.info(u' Generating PDF files...')
+        logger.info(' Generating PDF files...')
         pdf_path = os.path.join(self.output_path, 'pdf')
         if not os.path.exists(pdf_path):
             try:
@@ -583,6 +583,6 @@ class SourceFileGenerator(Generator):
         copy('', obj.filename, dest)
 
     def generate_output(self, writer=None):
-        logger.info(u' Generating source files...')
+        logger.info(' Generating source files...')
         for object in chain(self.context['articles'], self.context['pages']):
             self._create_source(object, self.output_path)
diff --git a/pelican/log.py b/pelican/log.py
index 9590d7f6..2ce11ea2 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+
 __all__ = [
     'init'
 ]
@@ -9,7 +12,7 @@ import logging
 from logging import Formatter, getLogger, StreamHandler, DEBUG
 
 
-RESET_TERM = u'\033[0;m'
+RESET_TERM = '\033[0;m'
 
 COLOR_CODES = {
     'red': 31,
@@ -24,37 +27,38 @@ COLOR_CODES = {
 def ansi(color, text):
     """Wrap text in an ansi escape sequence"""
     code = COLOR_CODES[color]
-    return u'\033[1;{0}m{1}{2}'.format(code, text, RESET_TERM)
+    return '\033[1;{0}m{1}{2}'.format(code, text, RESET_TERM)
 
 
 class ANSIFormatter(Formatter):
     """
-    Convert a `logging.LogReport' object into colored text, using ANSI escape sequences.
+    Convert a `logging.LogRecord' object into colored text, using ANSI escape sequences.
     """
     ## colors:
 
     def format(self, record):
-        if record.levelname is 'INFO':
-            return ansi('cyan', '-> ') + unicode(record.msg)
-        elif record.levelname is 'WARNING':
-            return ansi('yellow', record.levelname) + ': ' + unicode(record.msg)
-        elif record.levelname is 'ERROR':
-            return ansi('red', record.levelname) + ': ' + unicode(record.msg)
-        elif record.levelname is 'CRITICAL':
-            return ansi('bgred', record.levelname) + ': ' + unicode(record.msg)
-        elif record.levelname is 'DEBUG':
-            return ansi('bggrey', record.levelname) + ': ' + unicode(record.msg)
+        msg = str(record.msg)
+        if record.levelname == 'INFO':
+            return ansi('cyan', '-> ') + msg
+        elif record.levelname == 'WARNING':
+            return ansi('yellow', record.levelname) + ': ' + msg
+        elif record.levelname == 'ERROR':
+            return ansi('red', record.levelname) + ': ' + msg
+        elif record.levelname == 'CRITICAL':
+            return ansi('bgred', record.levelname) + ': ' + msg
+        elif record.levelname == 'DEBUG':
+            return ansi('bggrey', record.levelname) + ': ' + msg
         else:
-            return ansi('white', record.levelname) + ': ' + unicode(record.msg)
+            return ansi('white', record.levelname) + ': ' + msg
 
 
 class TextFormatter(Formatter):
     """
-    Convert a `logging.LogReport' object into text.
+    Convert a `logging.LogRecord' object into text.
     """
 
     def format(self, record):
-        if not record.levelname or record.levelname is 'INFO':
+        if not record.levelname or record.levelname == 'INFO':
             return record.msg
         else:
             return record.levelname + ': ' + record.msg
diff --git a/pelican/paginator.py b/pelican/paginator.py
index fe871491..067215c2 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+
 # From django.core.paginator
 from math import ceil
 
@@ -37,7 +40,7 @@ class Paginator(object):
         Returns a 1-based range of pages for iterating through within
         a template for loop.
         """
-        return range(1, self.num_pages + 1)
+        return list(range(1, self.num_pages + 1))
     page_range = property(_get_page_range)
 
 
diff --git a/pelican/plugins/assets.py b/pelican/plugins/assets.py
index b5d1cf76..9c819a4b 100644
--- a/pelican/plugins/assets.py
+++ b/pelican/plugins/assets.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Asset management plugin for Pelican
 ===================================
diff --git a/pelican/plugins/github_activity.py b/pelican/plugins/github_activity.py
index f2ba1da7..cc139efc 100644
--- a/pelican/plugins/github_activity.py
+++ b/pelican/plugins/github_activity.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
 """
     Copyright (c) Marco Milanesi <kpanic@gnufunk.org>
 
diff --git a/pelican/plugins/gzip_cache.py b/pelican/plugins/gzip_cache.py
index 784a6ca0..9080629e 100644
--- a/pelican/plugins/gzip_cache.py
+++ b/pelican/plugins/gzip_cache.py
@@ -68,7 +68,7 @@ def create_gzip_file(filepath):
             logger.debug('Compressing: %s' % filepath)
             compressed = gzip.open(compressed_path, 'wb')
             compressed.writelines(uncompressed)
-        except Exception, ex:
+        except Exception as ex:
             logger.critical('Gzip compression failed: %s' % ex)
         finally:
             compressed.close()
diff --git a/pelican/plugins/html_rst_directive.py b/pelican/plugins/html_rst_directive.py
index d0a656f5..2b2bceb3 100644
--- a/pelican/plugins/html_rst_directive.py
+++ b/pelican/plugins/html_rst_directive.py
@@ -1,6 +1,7 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 from docutils import nodes
 from docutils.parsers.rst import directives, Directive
-from pelican import log
 
 """
 HTML tags for reStructuredText
@@ -52,7 +53,7 @@ class RawHtml(Directive):
     has_content = True
 
     def run(self):
-        html = u' '.join(self.content)
+        html = ' '.join(self.content)
         node = nodes.raw('', html, format='html')
         return [node]
 
diff --git a/pelican/plugins/initialized.py b/pelican/plugins/initialized.py
index 5e4cf174..b4b5ab76 100644
--- a/pelican/plugins/initialized.py
+++ b/pelican/plugins/initialized.py
@@ -1,7 +1,9 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
 from pelican import signals
 
 def test(sender):
-    print "%s initialized !!" % sender
+    print("%s initialized !!" % sender)
 
 def register():
     signals.initialized.connect(test)
diff --git a/pelican/plugins/related_posts.py b/pelican/plugins/related_posts.py
index 67715023..c2765c3c 100644
--- a/pelican/plugins/related_posts.py
+++ b/pelican/plugins/related_posts.py
@@ -41,8 +41,8 @@ def add_related_posts(generator, metadata):
         if len(related_posts) < 1:
             return
 
-        relation_score = dict(zip(set(related_posts), map(related_posts.count,
-                              set(related_posts))))
+        relation_score = dict(list(zip(set(related_posts), list(map(related_posts.count,
+                              set(related_posts))))))
         ranked_related = sorted(relation_score, key=relation_score.get)
 
         metadata["related_posts"] = ranked_related[:5]
diff --git a/pelican/plugins/sitemap.py b/pelican/plugins/sitemap.py
index ebce1f04..0ade1288 100644
--- a/pelican/plugins/sitemap.py
+++ b/pelican/plugins/sitemap.py
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 import collections
 import os.path
 
@@ -7,19 +10,19 @@ from codecs import open
 
 from pelican import signals, contents
 
-TXT_HEADER = u"""{0}/index.html
+TXT_HEADER = """{0}/index.html
 {0}/archives.html
 {0}/tags.html
 {0}/categories.html
 """
 
-XML_HEADER = u"""<?xml version="1.0" encoding="utf-8"?>
+XML_HEADER = """<?xml version="1.0" encoding="utf-8"?>
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
 xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 """
 
-XML_URL = u"""
+XML_URL = """
 <url>
 <loc>{0}/{1}</loc>
 <lastmod>{2}</lastmod>
@@ -28,7 +31,7 @@ XML_URL = u"""
 </url>
 """
 
-XML_FOOTER = u"""
+XML_FOOTER = """
 </urlset>
 """
 
@@ -86,7 +89,7 @@ class SitemapGenerator(object):
                     'yearly', 'never')
 
             if isinstance(pris, dict):
-                for k, v in pris.iteritems():
+                for k, v in pris.items():
                     if k in valid_keys and not isinstance(v, (int, float)):
                         default = self.priorities[k]
                         warning("sitemap plugin: priorities must be numbers")
@@ -99,7 +102,7 @@ class SitemapGenerator(object):
                 warning("sitemap plugin: using the default values")
 
             if isinstance(chfreqs, dict):
-                for k, v in chfreqs.iteritems():
+                for k, v in chfreqs.items():
                     if k in valid_keys and v not in valid_chfreqs:
                         default = self.changefreqs[k]
                         warning("sitemap plugin: invalid changefreq `{0}'".format(v))
diff --git a/pelican/readers.py b/pelican/readers.py
index 6bd2822d..b182b6fa 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+import six
+
 import os
 import re
 try:
@@ -20,15 +23,16 @@ try:
     asciidoc = True
 except ImportError:
     asciidoc = False
+import re
 
 from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, pelican_open
 
 
 _METADATA_PROCESSORS = {
-    'tags': lambda x, y: [Tag(tag, y) for tag in unicode(x).split(',')],
+    'tags': lambda x, y: [Tag(tag, y) for tag in x.split(',')],
     'date': lambda x, y: get_date(x),
-    'status': lambda x, y: unicode.strip(x),
+    'status': lambda x, y: x.strip(),
     'category': Category,
     'author': Author,
 }
@@ -242,7 +246,7 @@ def read_file(filename, fmt=None, settings=None):
     if filename_metadata:
         match = re.match(filename_metadata, base)
         if match:
-            for k, v in match.groupdict().iteritems():
+            for k, v in match.groupdict().items():
                 if k not in metadata:
                     k = k.lower()  # metadata must be lowercase
                     metadata[k] = reader.process_metadata(k, v)
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index c677144d..fb4a6c93 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+
 from docutils import nodes, utils
 from docutils.parsers.rst import directives, roles, Directive
 from pygments.formatters import HtmlFormatter
@@ -32,7 +34,7 @@ class Pygments(Directive):
         # take an arbitrary option if more than one is given
         formatter = self.options and VARIANTS[self.options.keys()[0]] \
                     or DEFAULT
-        parsed = highlight(u'\n'.join(self.content), lexer, formatter)
+        parsed = highlight('\n'.join(self.content), lexer, formatter)
         return [nodes.raw('', parsed, format='html')]
 
 directives.register_directive('code-block', Pygments)
diff --git a/pelican/server.py b/pelican/server.py
new file mode 100644
index 00000000..0f5a71d2
--- /dev/null
+++ b/pelican/server.py
@@ -0,0 +1,20 @@
+from __future__ import print_function
+try:
+    import SimpleHTTPServer as srvmod
+except ImportError:
+    import http.server as srvmod
+
+try:
+    import SocketServer as socketserver
+except ImportError:
+    import socketserver
+
+PORT = 8000
+
+Handler = srvmod.SimpleHTTPRequestHandler
+
+httpd = socketserver.TCPServer(("", PORT), Handler)
+
+print("serving at port", PORT)
+httpd.serve_forever()
+
diff --git a/pelican/settings.py b/pelican/settings.py
index 692fc983..0748f991 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+import six
+
 import copy
 import imp
 import inspect
 import os
 import locale
 import logging
-import re
 
 from os.path import isabs
 
@@ -54,8 +56,8 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'CATEGORY_SAVE_AS': 'category/{slug}.html',
                    'TAG_URL': 'tag/{slug}.html',
                    'TAG_SAVE_AS': 'tag/{slug}.html',
-                   'AUTHOR_URL': u'author/{slug}.html',
-                   'AUTHOR_SAVE_AS': u'author/{slug}.html',
+                   'AUTHOR_URL': 'author/{slug}.html',
+                   'AUTHOR_SAVE_AS': 'author/{slug}.html',
                    'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
                    'TAG_CLOUD_STEPS': 4,
@@ -146,7 +148,7 @@ def configure_settings(settings):
     # if locales is not a list, make it one
     locales = settings['LOCALE']
 
-    if isinstance(locales, basestring):
+    if isinstance(locales, six.string_types):
         locales = [locales]
 
     # try to set the different locales, fallback on the default.
@@ -155,7 +157,7 @@ def configure_settings(settings):
 
     for locale_ in locales:
         try:
-            locale.setlocale(locale.LC_ALL, locale_)
+            locale.setlocale(locale.LC_ALL, str(locale_))
             break  # break if it is successful
         except locale.Error:
             pass
@@ -200,14 +202,14 @@ def configure_settings(settings):
                     "of the Webassets plugin")
 
     if 'OUTPUT_SOURCES_EXTENSION' in settings:
-        if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'], str):
+        if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'], six.string_types):
             settings['OUTPUT_SOURCES_EXTENSION'] = _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION']
             logger.warn("Detected misconfiguration with OUTPUT_SOURCES_EXTENSION."
                        " falling back to the default extension " +
                        _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
 
     filename_metadata = settings.get('FILENAME_METADATA')
-    if filename_metadata and not isinstance(filename_metadata, basestring):
+    if filename_metadata and not isinstance(filename_metadata, six.string_types):
         logger.error("Detected misconfiguration with FILENAME_METADATA"
                 " setting (must be string or compiled pattern), falling"
                 "back to the default")
diff --git a/pelican/signals.py b/pelican/signals.py
index d592599a..1367a117 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
 from blinker import signal
 
 initialized = signal('pelican_initialized')
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index fdd1ac51..b1a2865f 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -1,7 +1,12 @@
 #!/usr/bin/env python
 
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
 import argparse
-from HTMLParser import HTMLParser
+try:
+    from html.parser import HTMLParser
+except ImportError:
+    from HTMLParser import HTMLParser
 import os
 import subprocess
 import sys
@@ -15,14 +20,14 @@ from pelican.utils import slugify
 def wp2fields(xml):
     """Opens a wordpress XML file, and yield pelican fields"""
     try:
-        from BeautifulSoup import BeautifulStoneSoup
+        from bs4 import BeautifulSoup
     except ImportError:
         error = ('Missing dependency '
-                 '"BeautifulSoup" required to import Wordpress XML files.')
+                 '"BeautifulSoup4" and "lxml" required to import Wordpress XML files.')
         sys.exit(error)
 
     xmlfile = open(xml, encoding='utf-8').read()
-    soup = BeautifulStoneSoup(xmlfile)
+    soup = BeautifulSoup(xmlfile, "xml")
     items = soup.rss.channel.findAll('item')
 
     for item in items:
@@ -54,10 +59,10 @@ def wp2fields(xml):
 def dc2fields(file):
     """Opens a Dotclear export file, and yield pelican fields"""
     try:
-        from BeautifulSoup import BeautifulStoneSoup
+        from bs4 import BeautifulSoup
     except ImportError:
         error = ('Missing dependency '
-                 '"BeautifulSoup" required to import Dotclear files.')
+                 '"BeautifulSoup4" and "lxml" required to import Dotclear files.')
         sys.exit(error)
 
 
@@ -142,13 +147,27 @@ def dc2fields(file):
         if len(tag) > 1:
             if int(tag[:1]) == 1:
                 newtag = tag.split('"')[1]
-                tags.append(unicode(BeautifulStoneSoup(newtag,convertEntities=BeautifulStoneSoup.HTML_ENTITIES )))
+                tags.append(
+                    BeautifulSoup(
+                        newtag
+                        , "xml"
+                    )
+                    # bs4 always outputs UTF-8
+                    .decode('utf-8')
+                )
             else:
                 i=1
                 j=1
                 while(i <= int(tag[:1])):
                     newtag = tag.split('"')[j].replace('\\','')
-                    tags.append(unicode(BeautifulStoneSoup(newtag,convertEntities=BeautifulStoneSoup.HTML_ENTITIES )))
+                    tags.append(
+                        BeautifulSoup(
+                            newtag
+                            , "xml"
+                        )
+                        # bs4 always outputs UTF-8
+                        .decode('utf-8')
+                    )
                     i=i+1
                     if j < int(tag[:1])*2:
                         j=j+2
@@ -244,7 +263,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
                 # Replace newlines with paragraphs wrapped with <p> so
                 # HTML is valid before conversion
                 paragraphs = content.splitlines()
-                paragraphs = [u'<p>{0}</p>'.format(p) for p in paragraphs]
+                paragraphs = ['<p>{0}</p>'.format(p) for p in paragraphs]
                 new_content = ''.join(paragraphs)
 
                 fp.write(new_content)
@@ -264,7 +283,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
                 elif rc > 0:
                     error = "Please, check your Pandoc installation."
                     exit(error)
-            except OSError, e:
+            except OSError as e:
                 error = "Pandoc execution failed: %s" % e
                 exit(error)
 
@@ -284,7 +303,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
 def main():
     parser = argparse.ArgumentParser(
         description="Transform feed, Wordpress or Dotclear files to reST (rst) "
-                    "or Markdown (md) files. Be sure to have pandoc installed.",
+            "or Markdown (md) files. Be sure to have pandoc installed",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument(dest='input', help='The input file to read')
@@ -304,10 +323,10 @@ def main():
         help="Strip raw HTML code that can't be converted to "
              "markup such as flash embeds or iframes (wordpress import only)")
     parser.add_argument('--disable-slugs', action='store_true',
-        dest='disable_slugs',
-        help='Disable storing slugs from imported posts within output. '
-             'With this disabled, your Pelican URLs may not be consistent '
-             'with your original posts.')
+    dest='disable_slugs',
+    help='Disable storing slugs from imported posts within output. '
+         'With this disabled, your Pelican URLs may not be consistent '
+         'with your original posts.')
 
     args = parser.parse_args()
 
@@ -339,4 +358,4 @@ def main():
     fields2pelican(fields, args.markup, args.output,
                    dircat=args.dircat or False,
                    strip_raw=args.strip_raw or False,
-                   disable_slugs=args.disable_slugs or False)
+                   strip_slugs=args.disable_slugs or False)
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 447a80c5..9f25f2fe 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*- #
+
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+import six
 
 import os
 import string
@@ -29,11 +32,22 @@ CONF = {
     'lang': 'en'
 }
 
+def _input_compat(prompt):
+    if six.PY3:
+        r = input(prompt)
+    else:
+        r = raw_input(prompt).decode('utf-8')
+    return r
+
+if six.PY3:
+    str_compat = str
+else:
+    str_compat = unicode
 
 def decoding_strings(f):
     def wrapper(*args, **kwargs):
         out = f(*args, **kwargs)
-        if isinstance(out, basestring):
+        if isinstance(out, six.string_types):
             # todo: make encoding configurable?
             return out.decode(sys.stdin.encoding)
         return out
@@ -55,14 +69,14 @@ def get_template(name, as_encoding='utf-8'):
 
 
 @decoding_strings
-def ask(question, answer=str, default=None, l=None):
-    if answer == str:
+def ask(question, answer=str_compat, default=None, l=None):
+    if answer == str_compat:
         r = ''
         while True:
             if default:
-                r = raw_input('> {0} [{1}] '.format(question, default))
+                r = _input_compat('> {0} [{1}] '.format(question, default))
             else:
-                r = raw_input('> {0} '.format(question, default))
+                r = _input_compat('> {0} '.format(question, default))
 
             r = r.strip()
 
@@ -84,11 +98,11 @@ def ask(question, answer=str, default=None, l=None):
         r = None
         while True:
             if default is True:
-                r = raw_input('> {0} (Y/n) '.format(question))
+                r = _input_compat('> {0} (Y/n) '.format(question))
             elif default is False:
-                r = raw_input('> {0} (y/N) '.format(question))
+                r = _input_compat('> {0} (y/N) '.format(question))
             else:
-                r = raw_input('> {0} (y/n) '.format(question))
+                r = _input_compat('> {0} (y/n) '.format(question))
 
             r = r.strip().lower()
 
@@ -108,9 +122,9 @@ def ask(question, answer=str, default=None, l=None):
         r = None
         while True:
             if default:
-                r = raw_input('> {0} [{1}] '.format(question, default))
+                r = _input_compat('> {0} [{1}] '.format(question, default))
             else:
-                r = raw_input('> {0} '.format(question))
+                r = _input_compat('> {0} '.format(question))
 
             r = r.strip()
 
@@ -125,7 +139,7 @@ def ask(question, answer=str, default=None, l=None):
                 print('You must enter an integer')
         return r
     else:
-        raise NotImplemented('Argument `answer` must be str, bool, or integer')
+        raise NotImplemented('Argument `answer` must be str_compat, bool, or integer')
 
 
 def main():
@@ -158,14 +172,14 @@ needed by Pelican.
         print('Using project associated with current virtual environment.'
               'Will save to:\n%s\n' % CONF['basedir'])
     else:
-        CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new web site?', answer=str, default=args.path))
+        CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new web site?', answer=str_compat, default=args.path))
 
-    CONF['sitename'] = ask('What will be the title of this web site?', answer=str, default=args.title)
-    CONF['author'] = ask('Who will be the author of this web site?', answer=str, default=args.author)
-    CONF['lang'] = ask('What will be the default language of this web site?', str, args.lang or CONF['lang'], 2)
+    CONF['sitename'] = ask('What will be the title of this web site?', answer=str_compat, default=args.title)
+    CONF['author'] = ask('Who will be the author of this web site?', answer=str_compat, default=args.author)
+    CONF['lang'] = ask('What will be the default language of this web site?', str_compat, args.lang or CONF['lang'], 2)
 
     if ask('Do you want to specify a URL prefix? e.g., http://example.com  ', answer=bool, default=True):
-        CONF['siteurl'] = ask('What is your URL prefix? (see above example; no trailing slash)', str, CONF['siteurl'])
+        CONF['siteurl'] = ask('What is your URL prefix? (see above example; no trailing slash)', str_compat, CONF['siteurl'])
 
     CONF['with_pagination'] = ask('Do you want to enable article pagination?', bool, bool(CONF['default_pagination']))
 
@@ -179,38 +193,38 @@ needed by Pelican.
 
     if mkfile:
         if ask('Do you want to upload your website using FTP?', answer=bool, default=False):
-            CONF['ftp_host'] = ask('What is the hostname of your FTP server?', str, CONF['ftp_host'])
-            CONF['ftp_user'] = ask('What is your username on that server?', str, CONF['ftp_user'])
-            CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ftp_target_dir'])
+            CONF['ftp_host'] = ask('What is the hostname of your FTP server?', str_compat, CONF['ftp_host'])
+            CONF['ftp_user'] = ask('What is your username on that server?', str_compat, CONF['ftp_user'])
+            CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str_compat, CONF['ftp_target_dir'])
         if ask('Do you want to upload your website using SSH?', answer=bool, default=False):
-            CONF['ssh_host'] = ask('What is the hostname of your SSH server?', str, CONF['ssh_host'])
+            CONF['ssh_host'] = ask('What is the hostname of your SSH server?', str_compat, CONF['ssh_host'])
             CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])
-            CONF['ssh_user'] = ask('What is your username on that server?', str, CONF['ssh_user'])
-            CONF['ssh_target_dir'] = ask('Where do you want to put your web site on that server?', str, CONF['ssh_target_dir'])
+            CONF['ssh_user'] = ask('What is your username on that server?', str_compat, CONF['ssh_user'])
+            CONF['ssh_target_dir'] = ask('Where do you want to put your web site on that server?', str_compat, CONF['ssh_target_dir'])
         if ask('Do you want to upload your website using Dropbox?', answer=bool, default=False):
-            CONF['dropbox_dir'] = ask('Where is your Dropbox directory?', str, CONF['dropbox_dir'])
+            CONF['dropbox_dir'] = ask('Where is your Dropbox directory?', str_compat, CONF['dropbox_dir'])
 
     try:
         os.makedirs(os.path.join(CONF['basedir'], 'content'))
-    except OSError, e:
+    except OSError as e:
         print('Error: {0}'.format(e))
 
     try:
         os.makedirs(os.path.join(CONF['basedir'], 'output'))
-    except OSError, e:
+    except OSError as e:
         print('Error: {0}'.format(e))
 
     try:
         with codecs.open(os.path.join(CONF['basedir'], 'pelicanconf.py'), 'w', 'utf-8') as fd:
             conf_python = dict()
-            for key, value in CONF.iteritems():
+            for key, value in CONF.items():
                 conf_python[key] = repr(value)
 
             for line in get_template('pelicanconf.py'):
                 template = string.Template(line)
                 fd.write(template.safe_substitute(conf_python))
             fd.close()
-    except OSError, e:
+    except OSError as e:
         print('Error: {0}'.format(e))
 
     try:
@@ -219,7 +233,7 @@ needed by Pelican.
                 template = string.Template(line)
                 fd.write(template.safe_substitute(CONF))
             fd.close()
-    except OSError, e:
+    except OSError as e:
         print('Error: {0}'.format(e))
 
     if mkfile:
@@ -229,13 +243,13 @@ needed by Pelican.
                     template = string.Template(line)
                     fd.write(template.safe_substitute(CONF))
                 fd.close()
-        except OSError, e:
+        except OSError as e:
             print('Error: {0}'.format(e))
 
     if develop:
         conf_shell = dict()
-        for key, value in CONF.iteritems():
-            if isinstance(value, basestring) and ' ' in value:
+        for key, value in CONF.items():
+            if isinstance(value, six.string_types) and ' ' in value:
                 value = '"' + value.replace('"', '\\"') + '"'
             conf_shell[key] = value
         try:
@@ -244,8 +258,8 @@ needed by Pelican.
                     template = string.Template(line)
                     fd.write(template.safe_substitute(conf_shell))
                 fd.close()
-                os.chmod((os.path.join(CONF['basedir'], 'develop_server.sh')), 0755)
-        except OSError, e:
+                os.chmod((os.path.join(CONF['basedir'], 'develop_server.sh')), 493) # mode 0o755
+        except OSError as e:
             print('Error: {0}'.format(e))
 
     print('Done. Your new project is available at %s' % CONF['basedir'])
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index d13e60e9..8d71535d 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+
+import six
 
 import argparse
 import os
@@ -28,7 +31,7 @@ _BUILTIN_THEMES = ['simple', 'notmyidea']
 
 def err(msg, die=None):
     """Print an error message and exits if an exit code is given"""
-    sys.stderr.write(str(msg) + '\n')
+    sys.stderr.write(msg + '\n')
     if die:
         sys.exit((die if type(die) is int else 1))
 
@@ -186,13 +189,13 @@ def install(path, v=False, u=False):
                         for root, dirs, files in os.walk(theme_path):
                             for d in dirs:
                                 dname = os.path.join(root, d)
-                                os.chmod(dname, 0755)
+                                os.chmod(dname, 493) # 0o755
                             for f in files:
                                 fname = os.path.join(root, f)
-                                os.chmod(fname, 0644)
-                except OSError, e:
+                                os.chmod(fname, 420) # 0o644
+                except OSError as e:
                     err("Cannot change permissions of files or directory in `{r}':\n{e}".format(r=theme_path, e=str(e)), die=False)
-            except Exception, e:
+            except Exception as e:
                 err("Cannot copy `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
 
 
@@ -212,7 +215,7 @@ def symlink(path, v=False):
                 print("Linking `{p}' to `{t}' ...".format(p=path, t=theme_path))
             try:
                 os.symlink(path, theme_path)
-            except Exception, e:
+            except Exception as e:
                 err("Cannot link `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
 
 
@@ -233,7 +236,7 @@ def clean(v=False):
                     print('Removing {0}'.format(path))
                 try:
                     os.remove(path)
-                except OSError, e:
+                except OSError as e:
                     print('Error: cannot remove {0}'.format(path))
                 else:
                     c+=1
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 8e5c80f9..8dd91630 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -49,7 +49,7 @@ regenerate: clean
 	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 serve:
-	cd $$(OUTPUTDIR) && python -m SimpleHTTPServer
+	cd $$(OUTPUTDIR) && python -m pelican.server
 
 devserver:
 	$$(BASEDIR)/develop_server.sh restart
diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index 41764728..1eda47c4 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -20,7 +20,7 @@ PELICAN_PID=$$BASEDIR/pelican.pid
 function usage(){
   echo "usage: $$0 (stop) (start) (restart)"
   echo "This starts pelican in debug and reload mode and then launches"
-  echo "A SimpleHTTP server to help site development. It doesn't read"
+  echo "A pelican.server to help site development. It doesn't read"
   echo "your pelican options so you edit any paths in your Makefile"
   echo "you will need to edit it as well"
   exit 3
@@ -31,14 +31,14 @@ function shut_down(){
     PID=$$(cat $$SRV_PID)
     PROCESS=$$(ps -p $$PID | tail -n 1 | awk '{print $$4}')
     if [[ $$PROCESS != "" ]]; then
-      echo "Killing SimpleHTTPServer"
+      echo "Killing pelican.server"
       kill $$PID
     else
       echo "Stale PID, deleting"
     fi
     rm $$SRV_PID
   else
-    echo "SimpleHTTPServer PIDFile not found"
+    echo "pelican.server PIDFile not found"
   fi
 
   if [[ -f $$PELICAN_PID ]]; then
@@ -57,15 +57,15 @@ function shut_down(){
 }
 
 function start_up(){
-  echo "Starting up Pelican and SimpleHTTPServer"
+  echo "Starting up Pelican and pelican.server"
   shift
   $$PELICAN --debug --autoreload -r $$INPUTDIR -o $$OUTPUTDIR -s $$CONFFILE $$PELICANOPTS &
   echo $$! > $$PELICAN_PID
   cd $$OUTPUTDIR
-  python -m SimpleHTTPServer &
+  python -m pelican.server &
   echo $$! > $$SRV_PID
   cd $$BASEDIR
-  sleep 1 && echo 'Pelican and SimpleHTTPServer processes now running in background.'
+  sleep 1 && echo 'Pelican and pelican.server processes now running in background.'
 }
 
 ###
diff --git a/pelican/utils.py b/pelican/utils.py
index 6ca797c4..3a41d04e 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+import six
+
 import os
 import re
 import pytz
 import shutil
 import logging
 import errno
+import locale
 from collections import defaultdict, Hashable
 from functools import partial
 
@@ -17,6 +21,77 @@ from operator import attrgetter
 logger = logging.getLogger(__name__)
 
 
+def strftime(date, date_format):
+    """
+    Replacement for the builtin strftime().
+
+    This :func:`strftime()` is compatible to Python 2 and 3. In both cases,
+    input and output is always unicode.
+        
+    Still, Python 3's :func:`strftime()` seems to somehow "normalize" unicode
+    chars in the format string. So if e.g. your format string contains 'ø' or
+    'ä', the result will be 'o' and 'a'.
+
+    See here for an `extensive testcase <https://github.com/dmdm/test_strftime>`_.
+
+    :param date: Any object that sports a :meth:`strftime()` method.
+    :param date_format: Format string, can always be unicode.
+    :returns: Unicode string with formatted date.
+    """
+    # As tehkonst confirmed, above mentioned testcase runs correctly on
+    # Python 2 and 3 on Windows as well. Thanks.
+    if six.PY3:
+        # It could be so easy... *sigh*
+        return date.strftime(date_format)
+        # TODO Perhaps we should refactor again, so that the
+        # xmlcharrefreplace-regex-dance is always done, regardless
+        # of the Python version.
+    else:
+        # We must ensure that the format string is an encoded byte
+        # string, ASCII only WTF!!!
+        # But with "xmlcharrefreplace" our formatted date will produce
+        # *yuck* like this:
+        #        "Øl trinken beim Besäufnis"
+        #    --> "&#216;l trinken beim Bes&#228;ufnis"
+        date_format = date_format.encode('ascii',
+            errors="xmlcharrefreplace")
+        result = date.strftime(date_format)
+        # strftime() returns an encoded byte string
+        # which we must decode into unicode.
+        lang_code, enc = locale.getlocale(locale.LC_ALL)
+        if enc:
+            result = result.decode(enc)
+        else:
+            result = unicode(result)
+        # Convert XML character references back to unicode characters.
+        if "&#" in result:
+            result = re.sub(r'&#(?P<num>\d+);'
+                , lambda m: unichr(int(m.group('num')))
+                , result
+            )
+        return result
+
+
+
+#----------------------------------------------------------------------------
+# Stolen from Django: django.utils.encoding
+#
+
+def python_2_unicode_compatible(klass):
+    """
+    A decorator that defines __unicode__ and __str__ methods under Python 2.
+    Under Python 3 it does nothing.
+
+    To support Python 2 and 3 with a single code base, define a __str__ method
+    returning text and apply this decorator to the class.
+    """
+    if not six.PY3:
+        klass.__unicode__ = klass.__str__
+        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
+    return klass
+
+#----------------------------------------------------------------------------
+
 class NoFilesError(Exception):
     pass
 
@@ -78,14 +153,24 @@ def slugify(value):
 
     Took from django sources.
     """
+    # TODO Maybe steal again from current Django 1.5dev
     value = Markup(value).striptags()
-    if type(value) == unicode:
-        import unicodedata
-        from unidecode import unidecode
-        value = unicode(unidecode(value))
-        value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
-    value = unicode(re.sub('[^\w\s-]', '', value).strip().lower())
-    return re.sub('[-\s]+', '-', value)
+    # value must be unicode per se
+    import unicodedata
+    from unidecode import unidecode
+    # unidecode returns str in Py2 and 3, so in Py2 we have to make
+    # it unicode again
+    value = unidecode(value)
+    if isinstance(value, six.binary_type):
+        value = value.decode('ascii')
+    # still unicode
+    value = unicodedata.normalize('NFKD', value)
+    value = re.sub('[^\w\s-]', '', value).strip().lower()
+    value = re.sub('[-\s]+', '-', value)
+    # we want only ASCII chars
+    value = value.encode('ascii', 'ignore')
+    # but Pelican should generally use only unicode
+    return value.decode('ascii')
 
 
 def copy(path, source, destination, destination_path=None, overwrite=False):
@@ -137,7 +222,7 @@ def clean_output_dir(path):
     if not os.path.isdir(path):
         try:
             os.remove(path)
-        except Exception, e:
+        except Exception as e:
             logger.error("Unable to delete file %s; %e" % path, e)
         return
 
@@ -148,13 +233,13 @@ def clean_output_dir(path):
             try:
                 shutil.rmtree(file)
                 logger.debug("Deleted directory %s" % file)
-            except Exception, e:
+            except Exception as e:
                 logger.error("Unable to delete directory %s; %e" % file, e)
         elif os.path.isfile(file) or os.path.islink(file):
             try:
                 os.remove(file)
                 logger.debug("Deleted file/link %s" % file)
-            except Exception, e:
+            except Exception as e:
                 logger.error("Unable to delete file %s; %e" % file, e)
         else:
             logger.error("Unable to delete %s, file type unknown" % file)
@@ -180,7 +265,7 @@ def truncate_html_words(s, num, end_text='...'):
     """
     length = int(num)
     if length <= 0:
-        return u''
+        return ''
     html4_singlets = ('br', 'col', 'link', 'base', 'img', 'param', 'area',
                       'hr', 'input')
 
@@ -254,10 +339,10 @@ def process_translations(content_list):
     for slug, items in grouped_by_slugs:
         items = list(items)
         # find items with default language
-        default_lang_items = filter(attrgetter('in_default_lang'), items)
+        default_lang_items = list(filter(attrgetter('in_default_lang'), items))
         len_ = len(default_lang_items)
         if len_ > 1:
-            logger.warning(u'there are %s variants of "%s"' % (len_, slug))
+            logger.warning('there are %s variants of "%s"' % (len_, slug))
             for x in default_lang_items:
                 logger.warning('    %s' % x.filename)
         elif len_ == 0:
@@ -269,12 +354,9 @@ def process_translations(content_list):
                 + 'content'
             logger.warning(msg)
         index.extend(default_lang_items)
-        translations.extend(filter(
-            lambda x: x not in default_lang_items,
-            items
-        ))
+        translations.extend([x for x in items if x not in default_lang_items])
         for a in items:
-            a.translations = filter(lambda x: x != a, items)
+            a.translations = [x for x in items if x != a]
     return index, translations
 
 
@@ -333,6 +415,6 @@ def set_date_tzinfo(d, tz_name=None):
 def mkdir_p(path):
     try:
         os.makedirs(path)
-    except OSError, e:
+    except OSError as e:
         if e.errno != errno.EEXIST:
             raise
diff --git a/pelican/writers.py b/pelican/writers.py
index 42ddfb13..8374ea3e 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
+from __future__ import with_statement, unicode_literals, print_function
+import six
 
 import os
 import locale
@@ -57,7 +58,7 @@ class Writer(object):
         :param feed_type: the feed type to use (atom or rss)
         """
         old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
+        locale.setlocale(locale.LC_ALL, str('C'))
         try:
             self.site_url = context.get('SITEURL', get_relative_path(filename))
             self.feed_domain = context.get('FEED_DOMAIN')
@@ -68,7 +69,7 @@ class Writer(object):
             max_items = len(elements)
             if self.settings['FEED_MAX_ITEMS']:
                 max_items = min(self.settings['FEED_MAX_ITEMS'], max_items)
-            for i in xrange(max_items):
+            for i in range(max_items):
                 self._add_item_to_the_feed(feed, elements[i])
 
             if filename:
@@ -77,7 +78,7 @@ class Writer(object):
                     os.makedirs(os.path.dirname(complete_path))
                 except Exception:
                     pass
-                fp = open(complete_path, 'w')
+                fp = open(complete_path, 'w', encoding='utf-8' if six.PY3 else None)
                 feed.write(fp, 'utf-8')
                 logger.info('writing %s' % complete_path)
 
@@ -108,7 +109,7 @@ class Writer(object):
         def _write_file(template, localcontext, output_path, name):
             """Render the template write the file."""
             old_locale = locale.setlocale(locale.LC_ALL)
-            locale.setlocale(locale.LC_ALL, 'C')
+            locale.setlocale(locale.LC_ALL, str('C'))
             try:
                 output = template.render(localcontext)
             finally:
@@ -120,7 +121,7 @@ class Writer(object):
                 pass
             with open(filename, 'w', encoding='utf-8') as f:
                 f.write(output)
-            logger.info(u'writing %s' % filename)
+            logger.info('writing %s' % filename)
 
         localcontext = context.copy()
         if relative_urls:
@@ -135,7 +136,7 @@ class Writer(object):
         if paginated:
             # pagination needed, init paginators
             paginators = {}
-            for key in paginated.iterkeys():
+            for key in paginated.keys():
                 object_list = paginated[key]
 
                 if self.settings.get('DEFAULT_PAGINATION'):
@@ -147,9 +148,9 @@ class Writer(object):
 
             # generated pages, and write
             name_root, ext = os.path.splitext(name)
-            for page_num in range(paginators.values()[0].num_pages):
+            for page_num in range(list(paginators.values())[0].num_pages):
                 paginated_localcontext = localcontext.copy()
-                for key in paginators.iterkeys():
+                for key in paginators.keys():
                     paginator = paginators[key]
                     page = paginator.page(page_num + 1)
                     paginated_localcontext.update(
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 0ac4cd2c..714a418c 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
-AUTHOR = u'Alexis Métaireau'
-SITENAME = u"Alexis' log"
+from __future__ import unicode_literals
+
+AUTHOR = 'Alexis Métaireau'
+SITENAME = "Alexis' log"
 SITEURL = 'http://blog.notmyidea.org'
 TIMEZONE = "Europe/Paris"
 
@@ -10,7 +12,7 @@ PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
 LOCALE = "C"
 DEFAULT_PAGINATION = 4
-DEFAULT_DATE = (2012, 03, 02, 14, 01, 01)
+DEFAULT_DATE = (2012, 3, 2, 14, 1, 1)
 
 FEED_ALL_RSS = 'feeds/all.rss.xml'
 CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'
@@ -19,7 +21,7 @@ LINKS = (('Biologeek', 'http://biologeek.org'),
          ('Filyb', "http://filyb.info/"),
          ('Libert-fr', "http://www.libert-fr.com"),
          ('N1k0', "http://prendreuncafe.com/blog/"),
-         (u'Tarek Ziadé', "http://ziade.org/blog"),
+         ('Tarek Ziadé', "http://ziade.org/blog"),
          ('Zubin Mithra', "http://zubin71.wordpress.com/"),)
 
 SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
diff --git a/setup.py b/setup.py
index b6a54414..13afd8cf 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-requires = ['feedgenerator', 'jinja2 >= 2.6', 'pygments', 'docutils', 'pytz',
-            'blinker', 'unidecode']
+requires = ['feedgenerator>=1.5', 'jinja2 >= 2.6', 'pygments', 'docutils', 'pytz',
+            'blinker', 'unidecode', 'six']
 
 try:
     import argparse  # NOQA
diff --git a/tests/default_conf.py b/tests/default_conf.py
index acb7d9da..09548fdd 100644
--- a/tests/default_conf.py
+++ b/tests/default_conf.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-AUTHOR = u'Alexis Métaireau'
-SITENAME = u"Alexis' log"
+from __future__ import unicode_literals, print_function
+AUTHOR = 'Alexis Métaireau'
+SITENAME = "Alexis' log"
 SITEURL = 'http://blog.notmyidea.org'
 TIMEZONE = 'UTC'
 
@@ -18,7 +19,7 @@ LINKS = (('Biologeek', 'http://biologeek.org'),
          ('Filyb', "http://filyb.info/"),
          ('Libert-fr', "http://www.libert-fr.com"),
          ('N1k0', "http://prendreuncafe.com/blog/"),
-         (u'Tarek Ziadé', "http://ziade.org/blog"),
+         ('Tarek Ziadé', "http://ziade.org/blog"),
          ('Zubin Mithra', "http://zubin71.wordpress.com/"),)
 
 SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
diff --git a/tests/support.py b/tests/support.py
index 1bbaf47e..6011e6cd 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -1,13 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
 __all__ = [
     'get_article',
     'unittest',
 ]
 
-import cStringIO
 import os
 import re
 import subprocess
 import sys
+from six import StringIO
 import logging
 from logging.handlers import BufferingHandler
 
@@ -101,7 +103,7 @@ def mute(returns_output=False):
         def wrapper(*args, **kwargs):
 
             saved_stdout = sys.stdout
-            sys.stdout = cStringIO.StringIO()
+            sys.stdout = StringIO()
 
             try:
                 out = func(*args, **kwargs)
diff --git a/tests/test_contents.py b/tests/test_contents.py
index a8b9877f..eb7b6514 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -113,8 +113,8 @@ class TestPage(unittest.TestCase):
         page = Page(**page_kwargs)
 
         self.assertEqual(page.locale_date,
-            unicode(dt.strftime(_DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']),
-                                'utf-8'))
+            dt.strftime(_DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']))
+
 
         page_kwargs['settings'] = dict([(x, _DEFAULT_CONFIG[x]) for x in
                                         _DEFAULT_CONFIG])
@@ -131,7 +131,7 @@ class TestPage(unittest.TestCase):
         import locale as locale_module
         try:
             page = Page(**page_kwargs)
-            self.assertEqual(page.locale_date, u'2015-09-13(\u65e5)')
+            self.assertEqual(page.locale_date, '2015-09-13(\u65e5)')
         except locale_module.Error:
             # The constructor of ``Page`` will try to set the locale to
             # ``ja_JP.utf8``. But this attempt will failed when there is no
diff --git a/tests/test_generators.py b/tests/test_generators.py
index fb1dbe9c..50f5fe3e 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
 
 from mock import MagicMock
 import os
@@ -31,7 +32,7 @@ class TestArticlesGenerator(unittest.TestCase):
             settings = get_settings()
             settings['ARTICLE_DIR'] = 'content'
             settings['DEFAULT_CATEGORY'] = 'Default'
-            settings['DEFAULT_DATE'] = (1970, 01, 01)
+            settings['DEFAULT_DATE'] = (1970, 1, 1)
             self.generator = ArticlesGenerator(settings.copy(), settings,
                                 CUR_DIR, settings['THEME'], None,
                                 settings['MARKUP'])
@@ -70,18 +71,18 @@ class TestArticlesGenerator(unittest.TestCase):
         generator = self.get_populated_generator()
         articles = self.distill_articles(generator.articles)
         articles_expected = [
-            [u'Article title', 'published', 'Default', 'article'],
-            [u'Article with markdown and summary metadata single', 'published', u'Default', 'article'],
-            [u'Article with markdown and summary metadata multi', 'published', u'Default', 'article'],
-            [u'Article with template', 'published', 'Default', 'custom'],
-            [u'Test md File', 'published', 'test', 'article'],
-            [u'Rst with filename metadata', 'published', u'yeah', 'article'],
-            [u'Test Markdown extensions', 'published', u'Default', 'article'],
-            [u'This is a super article !', 'published', 'Yeah', 'article'],
-            [u'This is an article with category !', 'published', 'yeah', 'article'],
-            [u'This is an article without category !', 'published', 'Default', 'article'],
-            [u'This is an article without category !', 'published', 'TestCategory', 'article'],
-            [u'This is a super article !', 'published', 'yeah', 'article']
+            ['Article title', 'published', 'Default', 'article'],
+            ['Article with markdown and summary metadata single', 'published', 'Default', 'article'],
+            ['Article with markdown and summary metadata multi', 'published', 'Default', 'article'],
+            ['Article with template', 'published', 'Default', 'custom'],
+            ['Test md File', 'published', 'test', 'article'],
+            ['Rst with filename metadata', 'published', 'yeah', 'article'],
+            ['Test Markdown extensions', 'published', 'Default', 'article'],
+            ['This is a super article !', 'published', 'Yeah', 'article'],
+            ['This is an article with category !', 'published', 'yeah', 'article'],
+            ['This is an article without category !', 'published', 'Default', 'article'],
+            ['This is an article without category !', 'published', 'TestCategory', 'article'],
+            ['This is a super article !', 'published', 'yeah', 'article']
         ]
         self.assertItemsEqual(articles_expected, articles)
 
@@ -97,7 +98,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = _DEFAULT_CONFIG.copy()
         settings['ARTICLE_DIR'] = 'content'
         settings['DEFAULT_CATEGORY'] = 'Default'
-        settings['DEFAULT_DATE'] = (1970, 01, 01)
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['USE_FOLDER_AS_CATEGORY'] = False
         settings['filenames'] = {}
         generator = ArticlesGenerator(settings.copy(), settings,
@@ -179,7 +180,7 @@ class TestPageGenerator(unittest.TestCase):
     def test_generate_context(self):
         settings = get_settings()
         settings['PAGE_DIR'] = 'TestPages'
-        settings['DEFAULT_DATE'] = (1970, 01, 01)
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
 
         generator = PagesGenerator(settings.copy(), settings, CUR_DIR,
                                       settings['THEME'], None,
@@ -189,14 +190,14 @@ class TestPageGenerator(unittest.TestCase):
         hidden_pages = self.distill_pages(generator.hidden_pages)
 
         pages_expected = [
-            [u'This is a test page', 'published', 'page'],
-            [u'This is a markdown test page', 'published', 'page'],
-            [u'This is a test page with a preset template', 'published', 'custom']
+            ['This is a test page', 'published', 'page'],
+            ['This is a markdown test page', 'published', 'page'],
+            ['This is a test page with a preset template', 'published', 'custom']
         ]
         hidden_pages_expected = [
-            [u'This is a test hidden page', 'hidden', 'page'],
-            [u'This is a markdown test hidden page', 'hidden', 'page'],
-            [u'This is a test hidden page with a custom template', 'hidden', 'custom']
+            ['This is a test hidden page', 'hidden', 'page'],
+            ['This is a markdown test hidden page', 'hidden', 'page'],
+            ['This is a test hidden page with a custom template', 'hidden', 'custom']
         ]
 
         self.assertItemsEqual(pages_expected,pages)
diff --git a/tests/test_importer.py b/tests/test_importer.py
index 449a7643..a79cd493 100644
--- a/tests/test_importer.py
+++ b/tests/test_importer.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
 
 import os
 
@@ -9,7 +10,7 @@ CUR_DIR = os.path.dirname(__file__)
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
 
 try:
-    import BeautifulSoup
+    from bs4 import BeautifulSoup
 except ImportError:
     BeautifulSoup = False  # NOQA
 
@@ -48,26 +49,6 @@ class TestWordpressXmlImporter(unittest.TestCase):
                          strip_raw=True))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
 
-    def test_can_toggle_slug_storage(self):
-
-        posts = list(self.posts)
-        r = lambda f: open(f).read()
-        silent_f2p = mute(True)(fields2pelican)
-
-        with temporary_folder() as temp:
-
-            rst_files = (r(f) for f in silent_f2p(posts, 'markdown', temp))
-            self.assertTrue(all('Slug:' in rst for rst in rst_files))
-            rst_files = (r(f) for f in silent_f2p(posts, 'markdown', temp,
-                         disable_slugs=True))
-            self.assertFalse(any('Slug:' in rst for rst in rst_files))
-
-            rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp))
-            self.assertTrue(all(':slug:' in rst for rst in rst_files))
-            rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp,
-                         disable_slugs=True))
-            self.assertFalse(any(':slug:' in rst for rst in rst_files))
-
     def test_decode_html_entities_in_titles(self):
         posts = list(self.posts)
         test_posts = [post for post in posts if post[2] == 'html-entity-test']
diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index e5de0608..4d2a7dfc 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
 try:
     import unittest2 as unittest
 except ImportError:
@@ -34,7 +36,7 @@ def recursiveDiff(dcmp):
                 for f in dcmp.right_only],
             }
     for sub_dcmp in dcmp.subdirs.values():
-        for k, v in recursiveDiff(sub_dcmp).iteritems():
+        for k, v in recursiveDiff(sub_dcmp).items():
             diff[k] += v
     return diff
 
@@ -48,7 +50,7 @@ class TestPelican(unittest.TestCase):
         logging.getLogger().addHandler(self.logcount_handler)
         self.temp_path = mkdtemp()
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
+        locale.setlocale(locale.LC_ALL, str('C'))
 
     def tearDown(self):
         rmtree(self.temp_path)
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index f6581018..0a5be921 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -6,7 +6,7 @@ import tempfile
 
 from pelican.plugins import gzip_cache
 
-from support import unittest, temporary_folder
+from .support import unittest, temporary_folder
 
 class TestGzipCache(unittest.TestCase):
     '''Unit tests for the gzip cache plugin'''
diff --git a/tests/test_readers.py b/tests/test_readers.py
index ae325d62..e3cea629 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -1,4 +1,5 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
 
 import datetime
 import os
@@ -21,11 +22,11 @@ class RstReaderTest(unittest.TestCase):
         content, metadata = reader.read(_filename('article_with_metadata.rst'))
         expected = {
             'category': 'yeah',
-            'author': u'Alexis Métaireau',
+            'author': 'Alexis Métaireau',
             'title': 'This is a super article !',
-            'summary': u'<p class="first last">Multi-line metadata should be'\
-                       u' supported\nas well as <strong>inline'\
-                       u' markup</strong>.</p>\n',
+            'summary': '<p class="first last">Multi-line metadata should be'\
+                       ' supported\nas well as <strong>inline'\
+                       ' markup</strong>.</p>\n',
             'date': datetime.datetime(2010, 12, 2, 10, 14),
             'tags': ['foo', 'bar', 'foobar'],
             'custom_field': 'http://notmyidea.org',
@@ -40,7 +41,7 @@ class RstReaderTest(unittest.TestCase):
                 settings={})
         expected = {
             'category': 'yeah',
-            'author': u'Alexis Métaireau',
+            'author': 'Alexis Métaireau',
             'title': 'Rst with filename metadata',
         }
         for key, value in metadata.items():
@@ -53,7 +54,7 @@ class RstReaderTest(unittest.TestCase):
                     })
         expected = {
             'category': 'yeah',
-            'author': u'Alexis Métaireau',
+            'author': 'Alexis Métaireau',
             'title': 'Rst with filename metadata',
             'date': datetime.datetime(2012, 11, 29),
         }
@@ -69,7 +70,7 @@ class RstReaderTest(unittest.TestCase):
                     })
         expected = {
             'category': 'yeah',
-            'author': u'Alexis Métaireau',
+            'author': 'Alexis Métaireau',
             'title': 'Rst with filename metadata',
             'date': datetime.datetime(2012, 11, 29),
             'slug': 'article_with_filename_metadata',
@@ -101,7 +102,7 @@ class RstReaderTest(unittest.TestCase):
             # otherwise, typogrify should be applied
             content, _ = readers.read_file(_filename('article.rst'),
                                            settings={'TYPOGRIFY': True})
-            expected = u"<p>This is some content. With some stuff to&nbsp;"\
+            expected = "<p>This is some content. With some stuff to&nbsp;"\
                        "&#8220;typogrify&#8221;.</p>\n<p>Now with added "\
                        'support for <abbr title="three letter acronym">'\
                        '<span class="caps">TLA</span></abbr>.</p>\n'
@@ -168,7 +169,7 @@ class MdReaderTest(unittest.TestCase):
                 settings={})
         expected = {
             'category': 'yeah',
-            'author': u'Alexis Métaireau',
+            'author': 'Alexis Métaireau',
         }
         for key, value in expected.items():
             self.assertEquals(value, metadata[key], key)
@@ -180,7 +181,7 @@ class MdReaderTest(unittest.TestCase):
                     })
         expected = {
             'category': 'yeah',
-            'author': u'Alexis Métaireau',
+            'author': 'Alexis Métaireau',
             'date': datetime.datetime(2012, 11, 30),
         }
         for key, value in expected.items():
@@ -195,7 +196,7 @@ class MdReaderTest(unittest.TestCase):
                     })
         expected = {
             'category': 'yeah',
-            'author': u'Alexis Métaireau',
+            'author': 'Alexis Métaireau',
             'date': datetime.datetime(2012, 11, 30),
             'slug': 'md_w_filename_meta',
             'mymeta': 'foo',
@@ -203,20 +204,6 @@ class MdReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEquals(value, metadata[key], key)
 
-    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
-    def test_article_with_summary_metadata(self):
-        reader = readers.MarkdownReader({})
-        content, metadata = reader.read(
-            _filename('article_with_markdown_and_summary_metadata_single.md'))
-        expected_summary = u'<p>A single-line summary should be supported'\
-                           u' as well as <strong>inline markup</strong>.</p>'
-        self.assertEquals(expected_summary, metadata['summary'], 'summary')
-        content, metadata = reader.read(
-            _filename('article_with_markdown_and_summary_metadata_multi.md'))
-        expected_summary =  u'<p>A multi-line summary should be supported'\
-                            u'\nas well as <strong>inline markup</strong>.</p>'
-        self.assertEquals(expected_summary, metadata['summary'], 'summary')
-
 class AdReaderTest(unittest.TestCase):
 
     @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 379e3deb..0e610c55 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
 import copy
 from os.path import dirname, abspath, join
 
@@ -16,7 +18,7 @@ class TestSettingsConfiguration(unittest.TestCase):
         self.settings = read_settings(default_conf)
 
     def test_overwrite_existing_settings(self):
-        self.assertEqual(self.settings.get('SITENAME'), u"Alexis' log")
+        self.assertEqual(self.settings.get('SITENAME'), "Alexis' log")
         self.assertEqual(self.settings.get('SITEURL'),
                 'http://blog.notmyidea.org')
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index eda1388a..eddb3e25 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
 import shutil
 import os
 import datetime
@@ -41,10 +42,10 @@ class TestUtils(unittest.TestCase):
 
         samples = (('this is a test', 'this-is-a-test'),
                    ('this        is a test', 'this-is-a-test'),
-                   (u'this → is ← a ↑ test', 'this-is-a-test'),
+                   ('this → is ← a ↑ test', 'this-is-a-test'),
                    ('this--is---a test', 'this-is-a-test'),
-                   (u'unicode測試許功蓋，你看到了嗎？', 'unicodece-shi-xu-gong-gai-ni-kan-dao-liao-ma'),
-                   (u'大飯原発４号機、１８日夜起動へ', 'da-fan-yuan-fa-4hao-ji-18ri-ye-qi-dong-he'),)
+                   ('unicode測試許功蓋，你看到了嗎？', 'unicodece-shi-xu-gong-gai-ni-kan-dao-liao-ma'),
+                   ('大飯原発４号機、１８日夜起動へ', 'da-fan-yuan-fa-4hao-ji-18ri-ye-qi-dong-he'),)
 
         for value, expected in samples:
             self.assertEquals(utils.slugify(value), expected)
diff --git a/tests/test_webassets.py b/tests/test_webassets.py
index ceba7775..87b2789c 100644
--- a/tests/test_webassets.py
+++ b/tests/test_webassets.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# from __future__ import unicode_literals
 
 import hashlib
 import os
diff --git a/tox.ini b/tox.ini
index f7d9cf82..8c3961b9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,74 @@
+# This tests the unified codebase (py26-py32) of Pelican.
+# depends on some external libraries that aren't released yet.
+#
+# To run Pelican, you will already have checked out and installed them.
+#
+# Now we must tell tox about this package, otherwise tox would load the old
+# libraries from PyPi.
+# 
+# Run tox from the libraries source tree. It will save its package in
+# the distshare directory from where the tests here will pick it up.
+#
+# Do that for
+# https://github.com/dmdm/smartypants.git
+#
+# and typogrify:
+# https://github.com/dmdm/typogrify/tree/py3k
+#
+# and webassets:
+# https://github.com/dmdm/webassets/tree/py3k
+#
+#
+# CAVEAT:
+# -------
+#
+# 1/
+# Please be aware that my ports of typogrify and webassets are just 2to3'd.
+# They are not backwards compatible with Python 2.
+#
+# 2/
+# Webassets still has unresolved issues, so I deactivated it for Py32 tests.
+
+
 [tox]
-envlist = py26,py27
+envlist = py26,py27,py32
 
 [testenv]
 commands =
-    nosetests -s tests
     unit2 discover []
+    nosetests -s tests
+deps =
+
+[testenv:py26]
 deps =
     nose
     unittest2
     mock
     Markdown
-    BeautifulSoup
+    BeautifulSoup4
+    feedgenerator
     typogrify
     webassets
+
+[testenv:py27]
+deps =
+    nose
+    unittest2
+    mock
+    Markdown
+    BeautifulSoup4
+    feedgenerator
+    typogrify
+    webassets
+
+[testenv:py32]
+deps =
+    nose
+    unittest2py3k
+    mock
+    Markdown
+    BeautifulSoup4
+    feedgenerator
+#    {distshare}/smartypants-1.6.0.3.zip
+#    {distshare}/typogrify-2.0.0.zip
+#    {distshare}/webassets-0.8.dev.zip

From d1b238638cb39442a0154740c43a89c608cee634 Mon Sep 17 00:00:00 2001
From: Dirk Makowski <dmakowski@gmx.net>
Date: Fri, 11 Jan 2013 03:21:06 +0100
Subject: [PATCH 1086/2864] Update the "how to contribute" docs with py3k info.

---
 docs/contribute.rst | 56 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index c302dcc6..3ab86263 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -58,6 +58,21 @@ To do so, you can use the following two commands::
         samples/content/
     $ LC_ALL="C" pelican -o tests/output/basic/ samples/content/
 
+testing for python3
+-------------------
+
+On Python 3, if you have installed the Py3k compatible versions of the
+plugins manual testing with ``unit2 discover`` is also straightforward.
+
+However, you must tell tox to use those Py3k libraries. If you forget this,
+tox will pull the regular packages from PyPi and the tests will fail.
+
+Tell tox about the local packages thusly: enter the source directory of
+smartypants and run tox there. Do this again for typogrify and webassets.
+Smartypants and typogrify do not have real tests, and webassets will fail
+noisily, but as a result we get these libraries neatly packaged in tox's
+distshare directory. And this we need to run tox for Pelican.
+
 Coding standards
 ================
 
@@ -67,3 +82,44 @@ eased via the `pep8 <http://pypi.python.org/pypi/pep8>`_ or `flake8
 <http://pypi.python.org/pypi/flake8/>`_ tools, the latter of which in
 particular will give you some useful hints about ways in which the
 code/formatting can be improved.
+
+Python3 support
+===============
+
+Here are some tips that may be useful when doing some code for both python2 and
+python3 at the same time:
+
+- Assume, every string and literal is unicode (import unicode_literals):
+ 
+  - Do not use prefix ``u'``.
+  - Do not encode/decode strings in the middle of sth. Follow the code to the
+    source (or target) of a string and encode/decode at the first/last possible
+    point.
+  - In other words, write your functions to expect and to return unicode.
+  - Encode/decode strings if e.g. the source is a Python function that is known
+    to handle this badly, e.g. strftime() in Python 2.
+
+- Use new syntax: print function, "except ... *as* e" (not comma) etc.
+- Refactor method calls like ``dict.iteritems()``, ``xrange()`` etc. in a way
+  that runs without code change in both Python versions.
+- Do not use magic method ``__unicode()__`` in new classes. Use only ``__str()__``
+  and decorate the class with ``@python_2_unicode_compatible``.
+- Do not start int literals with a zero. This is a syntax error in Py3k.
+- Unfortunately I did not find an octal notation that is valid in both
+  Pythons. Use decimal instead.
+- use six, e.g.:
+
+  - ``isinstance(.., basestring) -> isinstance(.., six.string_types)``
+  - ``isinstance(.., unicode) -> isinstance(.., six.text_type)``
+
+- ``setlocale()`` in Python 2 bails when we give the locale name as unicode,
+  and since we are using ``from __future__ import unicode_literals``, we do
+  that everywhere!  As a workaround, I enclosed the localename with ``str()``;
+  in Python 2 this casts the name to a byte string, in Python 3 this should do
+  nothing, because the locale name already had been unicode.
+
+- Kept range() almost everywhere as-is (2to3 suggests list(range())), just
+  changed it where I felt necessary.
+
+- Changed xrange() back to range(), so it is valid in both Python versions.
+

From 1197e09626b9c3607b8a287fff769e9c34c01503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 11 Jan 2013 18:44:35 +0100
Subject: [PATCH 1087/2864] Revert previously erased changes

---
 pelican/tools/pelican_import.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index b1a2865f..c373cfd4 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -303,7 +303,7 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
 def main():
     parser = argparse.ArgumentParser(
         description="Transform feed, Wordpress or Dotclear files to reST (rst) "
-            "or Markdown (md) files. Be sure to have pandoc installed",
+                    "or Markdown (md) files. Be sure to have pandoc installed.",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument(dest='input', help='The input file to read')
@@ -323,10 +323,10 @@ def main():
         help="Strip raw HTML code that can't be converted to "
              "markup such as flash embeds or iframes (wordpress import only)")
     parser.add_argument('--disable-slugs', action='store_true',
-    dest='disable_slugs',
-    help='Disable storing slugs from imported posts within output. '
-         'With this disabled, your Pelican URLs may not be consistent '
-         'with your original posts.')
+        dest='disable_slugs',
+        help='Disable storing slugs from imported posts within output. '
+             'With this disabled, your Pelican URLs may not be consistent '
+             'with your original posts.')
 
     args = parser.parse_args()
 
@@ -358,4 +358,4 @@ def main():
     fields2pelican(fields, args.markup, args.output,
                    dircat=args.dircat or False,
                    strip_raw=args.strip_raw or False,
-                   strip_slugs=args.disable_slugs or False)
+                   disable_slugs=args.disable_slugs or False)

From 4ac094966e06eac5d540debbd166162297a768d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 11 Jan 2013 18:47:22 +0100
Subject: [PATCH 1088/2864] remove py2.6 support

---
 tox.ini | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/tox.ini b/tox.ini
index 8c3961b9..bc6578ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,7 +31,7 @@
 
 
 [tox]
-envlist = py26,py27,py32
+envlist = py27,py32
 
 [testenv]
 commands =
@@ -39,17 +39,6 @@ commands =
     nosetests -s tests
 deps =
 
-[testenv:py26]
-deps =
-    nose
-    unittest2
-    mock
-    Markdown
-    BeautifulSoup4
-    feedgenerator
-    typogrify
-    webassets
-
 [testenv:py27]
 deps =
     nose

From 149ca493e0b904a6bafd234cf05d3ea568878dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 11 Jan 2013 18:55:04 +0100
Subject: [PATCH 1089/2864] Annotate py3k code when needed.

---
 pelican/generators.py           | 2 +-
 pelican/plugins/sitemap.py      | 2 ++
 pelican/readers.py              | 1 +
 pelican/tools/pelican_import.py | 4 +++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 0d2fa6a9..ce102a31 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -120,7 +120,7 @@ class Generator(object):
         for item in items:
             value = getattr(self, item)
             if hasattr(value, 'items'):
-                value = list(value.items())
+                value = list(value.items())  # py3k safeguard for iterators
             self.context[item] = value
 
 
diff --git a/pelican/plugins/sitemap.py b/pelican/plugins/sitemap.py
index 0ade1288..8043baad 100644
--- a/pelican/plugins/sitemap.py
+++ b/pelican/plugins/sitemap.py
@@ -89,6 +89,7 @@ class SitemapGenerator(object):
                     'yearly', 'never')
 
             if isinstance(pris, dict):
+                # We use items for Py3k compat. .iteritems() otherwise
                 for k, v in pris.items():
                     if k in valid_keys and not isinstance(v, (int, float)):
                         default = self.priorities[k]
@@ -102,6 +103,7 @@ class SitemapGenerator(object):
                 warning("sitemap plugin: using the default values")
 
             if isinstance(chfreqs, dict):
+                # .items() for py3k compat.
                 for k, v in chfreqs.items():
                     if k in valid_keys and v not in valid_chfreqs:
                         default = self.changefreqs[k]
diff --git a/pelican/readers.py b/pelican/readers.py
index b182b6fa..5c2ae58c 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -246,6 +246,7 @@ def read_file(filename, fmt=None, settings=None):
     if filename_metadata:
         match = re.match(filename_metadata, base)
         if match:
+            # .items() for py3k compat.
             for k, v in match.groupdict().items():
                 if k not in metadata:
                     k = k.lower()  # metadata must be lowercase
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index c373cfd4..33041b0e 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -4,9 +4,11 @@
 from __future__ import unicode_literals, print_function
 import argparse
 try:
+    # py3k import
     from html.parser import HTMLParser
 except ImportError:
-    from HTMLParser import HTMLParser
+    # py2 import
+    from HTMLParser import HTMLParser  # NOQA
 import os
 import subprocess
 import sys

From d7caaded3fcb2f0a45125973fc0672c1355252f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 11 Jan 2013 21:24:04 +0100
Subject: [PATCH 1090/2864] Use the en-us locale for functional tests

---
 tests/test_pelican.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index e5de0608..4c451794 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -10,8 +10,6 @@ from shutil import rmtree
 import locale
 import logging
 
-from mock import patch
-
 from pelican import Pelican
 from pelican.settings import read_settings
 from .support import LogCountHandler
@@ -73,6 +71,7 @@ class TestPelican(unittest.TestCase):
         settings = read_settings(filename=None, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
+            'LOCALE': locale.normalize('en_US'),
             })
         pelican = Pelican(settings=settings)
         pelican.run()
@@ -88,6 +87,7 @@ class TestPelican(unittest.TestCase):
         settings = read_settings(filename=SAMPLE_CONFIG, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
+            'LOCALE': locale.normalize('en_US'),
             })
         pelican = Pelican(settings=settings)
         pelican.run()

From 476f2980ceaa553d65e127b12f34e8687543e17f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Tue, 15 Jan 2013 14:23:00 +0100
Subject: [PATCH 1091/2864] Damn, I forgot to update travis.

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e92b0abc..7ccdafd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,7 @@
 language: python
 python:
-    - "2.6"
     - "2.7"
-#    - "3.2"
+    - "3.2"
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq ruby-sass

From 2c434ebac1c64ac2da85cdeeadeaf2c3bd5307cc Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 3 Jan 2013 13:54:56 -0500
Subject: [PATCH 1092/2864] contents: Add rich comparisons to URLWrapper for
 easy sorting

There have been earlier attempts to sort categories and authors
[1,2,3], but they either sorted based on the object id [3], or only
sorted the main author and categories list.

This patch uses rich comparisons (keyed off URLWrapper.name, but
easily adjustable in subclasses) to make the objects sortable without
specifying a key for each sort.  For example, now

  {% for tag, articles in tags|sort %}

works as expected in a Jinja template.

The functools.total_ordering decorator fills in the missing rich
comparisons [4,5].

[1]: 877d454c8fa979343d4881a00977d9ac8786f178
[2]: 7f36e0ed20745c73886d96d4af303b0d858b8a53
[3]: d0ec18f4dbd623c55bdf4928ee7c363f699ef696
[4]: http://docs.python.org/2/library/functools.html#functools.total_ordering
[5]: http://docs.python.org/3/library/functools.html#functools.total_ordering
---
 pelican/contents.py   | 16 +++++++++++++++-
 pelican/generators.py |  3 +--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 4655d4cc..bd257ad8 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -243,7 +243,9 @@ class Article(Page):
 class Quote(Page):
     base_properties = ('author', 'date')
 
+
 @python_2_unicode_compatible
+@functools.total_ordering
 class URLWrapper(object):
     def __init__(self, name, settings):
         self.name = name
@@ -256,8 +258,20 @@ class URLWrapper(object):
     def __hash__(self):
         return hash(self.name)
 
+    def _key(self):
+        return self.name
+
+    def _normalize_key(self, key):
+        return six.text_type(key)
+
     def __eq__(self, other):
-        return self.name == other
+        return self._key() == self._normalize_key(other)
+
+    def __ne__(self, other):
+        return self._key() != self._normalize_key(other)
+
+    def __lt__(self, other):
+        return self._key() < self._normalize_key(other)
 
     def __str__(self):
         return self.name
diff --git a/pelican/generators.py b/pelican/generators.py
index ce102a31..49b6bc1d 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -416,11 +416,10 @@ class ArticlesGenerator(Generator):
         # order the categories per name
         self.categories = list(self.categories.items())
         self.categories.sort(
-                key=lambda item: item[0].name,
                 reverse=self.settings['REVERSE_CATEGORY_ORDER'])
 
         self.authors = list(self.authors.items())
-        self.authors.sort(key=lambda item: item[0].name)
+        self.authors.sort()
 
         self._update_context(('articles', 'dates', 'tags', 'categories',
                               'tag_cloud', 'authors', 'related_posts'))

From 656b5150ff26988d71d41fb32f2f75aeca665617 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Tue, 15 Jan 2013 16:32:11 -0500
Subject: [PATCH 1093/2864] docs/themes.rst: Document URLWrapper sorting for
 use in Jinja templates

---
 docs/themes.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/themes.rst b/docs/themes.rst
index 664b4466..19fd9274 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -68,6 +68,19 @@ categories      A list of (category, articles) tuples, containing
 pages           The list of pages
 =============   ===================================================
 
+Sorting
+-------
+
+URL wrappers (currently categories, tags, and authors), have
+comparison methods that allow them to be easily sorted by name:
+
+    {% for tag, articles in tags|sort %}
+
+If you want to sort based on different criteria, `Jinja's sort
+command`__ has a number of options.
+
+__ http://jinja.pocoo.org/docs/templates/#sort
+
 index.html
 ----------
 

From bebb94c15be1ae7ff7ec241f6e1de5aa18556654 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Tue, 15 Jan 2013 22:50:58 -0500
Subject: [PATCH 1094/2864] test_contents.py: Add URLWrapper comparison tests

The name switch between wrapper_a and wrapper_b ensures that we're not
secretly comparing some other field (e.g. id(object)).
---
 tests/test_contents.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/tests/test_contents.py b/tests/test_contents.py
index eb7b6514..9b5673bd 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 from .support import unittest
 
-from pelican.contents import Page, Article
+from pelican.contents import Page, Article, URLWrapper
 from pelican.settings import _DEFAULT_CONFIG
 from pelican.utils import truncate_html_words
 from pelican.signals import content_object_init
@@ -187,3 +188,31 @@ class TestArticle(TestPage):
         article_kwargs['metadata']['template'] = 'custom'
         custom_article = Article(**article_kwargs)
         self.assertEqual('custom', custom_article.template)
+
+
+class TestURLWrapper(unittest.TestCase):
+    def test_comparisons(self):
+        """URLWrappers are sorted by name
+        """
+        wrapper_a = URLWrapper(name='first', settings={})
+        wrapper_b = URLWrapper(name='last', settings={})
+        self.assertFalse(wrapper_a > wrapper_b)
+        self.assertFalse(wrapper_a >= wrapper_b)
+        self.assertFalse(wrapper_a == wrapper_b)
+        self.assertTrue(wrapper_a != wrapper_b)
+        self.assertTrue(wrapper_a <= wrapper_b)
+        self.assertTrue(wrapper_a < wrapper_b)
+        wrapper_b.name = 'first'
+        self.assertFalse(wrapper_a > wrapper_b)
+        self.assertTrue(wrapper_a >= wrapper_b)
+        self.assertTrue(wrapper_a == wrapper_b)
+        self.assertFalse(wrapper_a != wrapper_b)
+        self.assertTrue(wrapper_a <= wrapper_b)
+        self.assertFalse(wrapper_a < wrapper_b)
+        wrapper_a.name = 'last'
+        self.assertTrue(wrapper_a > wrapper_b)
+        self.assertTrue(wrapper_a >= wrapper_b)
+        self.assertFalse(wrapper_a == wrapper_b)
+        self.assertTrue(wrapper_a != wrapper_b)
+        self.assertFalse(wrapper_a <= wrapper_b)
+        self.assertFalse(wrapper_a < wrapper_b)

From 733ab8ae6ce59749ca9152bb5ad5cdca50a3e688 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Tue, 15 Jan 2013 23:05:48 -0500
Subject: [PATCH 1095/2864] test_contents: Add tests for metadata export from
 Page.url_format

---
 tests/test_contents.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/test_contents.py b/tests/test_contents.py
index a8b9877f..ba94e14e 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -99,6 +99,16 @@ class TestPage(unittest.TestCase):
         page = Page(**self.page_kwargs)
         self.assertEqual(page.save_as, "pages/foo-bar-fr.html")
 
+    def test_metadata_url_format(self):
+        """Arbitrary metadata should be passed through url_format()
+        """
+        page = Page(**self.page_kwargs)
+        self.assertIn('summary', page.url_format.keys())
+        page.metadata['directory'] = 'test-dir'
+        page.settings = _DEFAULT_CONFIG.copy()
+        page.settings['PAGE_SAVE_AS'] = '{directory}/{slug}'
+        self.assertEqual(page.save_as, 'test-dir/foo-bar')
+
     def test_datetime(self):
         """If DATETIME is set to a tuple, it should be used to override LOCALE
         """

From d2a221c8998dff7adb4baa75c4c0f2953187cb7f Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 17 Jan 2013 09:49:03 -0500
Subject: [PATCH 1096/2864] contents: Encode Unicode locales for Python 2 in
 Page.__init__

Python 2.7 chokes on Unicode locales:

  $ python2.7
  >>> import locale
  >>> locale.setlocale(locale.LC_ALL, u'ja_JP.utf8')
  Traceback (most recent call last):
    ...
  ValueError: too many values to unpack

With the addition of:

  from __future__ import unicode_literals

to tests/test_contents.py in:

  commit bebb94c15be1ae7ff7ec241f6e1de5aa18556654
  Author: W. Trevor King <wking@tremily.us>
  Date:   Tue Jan 15 22:50:58 2013 -0500

    test_contents.py: Add URLWrapper comparison tests

the locale strings in TestPage.test_datetime are interpreted as
Unicode.  Rather than fixing the encoding there, this patch updates
Page to handle Unicode locales automatically.
---
 pelican/contents.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index bd257ad8..dc38e32f 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -8,6 +8,7 @@ import logging
 import functools
 import os
 import re
+import sys
 
 from datetime import datetime
 from sys import platform, stdin
@@ -86,7 +87,10 @@ class Page(object):
                 self.date_format = settings['DEFAULT_DATE_FORMAT']
 
         if isinstance(self.date_format, tuple):
-            locale.setlocale(locale.LC_ALL, self.date_format[0])
+            locale_string = self.date_format[0]
+            if sys.version_info < (3, ) and isinstance(locale_string, six.text_type):
+                locale_string = locale_string.encode('ascii')
+            locale.setlocale(locale.LC_ALL, locale_string)
             self.date_format = self.date_format[1]
 
         if hasattr(self, 'date'):

From 61f05672e651f185a6e78dc5827502ba0ff93137 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 13:08:08 -0500
Subject: [PATCH 1097/2864] content: Convert StaticContent.filepath to
 .filename

For reasons that are unclear to me, StaticContent introduces the
`filepath` attribute rather than using the existing (and semantically
equivalent) Page.filename.  This has caused confusion before [1], and
it's probably a good idea to merge the two.

While I was touching the line, I also updated the string formatting in
StaticGenerator.generate_output to use the forward compatible
'{}'.format() syntax.

[1]: https://github.com/getpelican/pelican/issues/162#issuecomment-3000363
---
 pelican/contents.py   | 4 ++--
 pelican/generators.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 43333e18..89e0397d 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -305,11 +305,11 @@ class StaticContent(object):
             settings = copy.deepcopy(_DEFAULT_CONFIG)
         self.src = src
         self.url = dst or src
-        self.filepath = os.path.join(settings['PATH'], src)
+        self.filename = os.path.join(settings['PATH'], src)
         self.save_as = os.path.join(settings['OUTPUT_PATH'], self.url)
 
     def __str__(self):
-        return self.filepath
+        return self.filename
 
 
 def is_valid_content(content, f):
diff --git a/pelican/generators.py b/pelican/generators.py
index ce102a31..664f666c 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -520,8 +520,8 @@ class StaticGenerator(Generator):
         # copy all StaticContent files
         for sc in self.staticfiles:
             mkdir_p(os.path.dirname(sc.save_as))
-            shutil.copy(sc.filepath, sc.save_as)
-            logger.info('copying %s to %s' % (sc.filepath, sc.save_as))
+            shutil.copy(sc.filename, sc.save_as)
+            logger.info('copying {} to {}'.format(sc.filename, sc.save_as))
 
 
 class PdfGenerator(Generator):

From 004adfa5ccbb840a585bff6dd6bfd7f65cfeaad9 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 10:50:09 -0500
Subject: [PATCH 1098/2864] content: Convert Path.filename to .source_path

Making everything consistent is a bit awkward, since this is a
commonly used attribute, but I've done my best.

Reasons for not consolidating on `filename`:

* It is often used for the "basename" (last component in the path).
  Using `source_path` makes it clear that this attribute can contain
  multiple components.

Reasons for not consolidating on `filepath`:

* It is barely used in the Pelican source, and therefore easy to
  change.
* `path` is more Pythonic.  The only place `filepath` ever show up in
  the documentation for `os`, `os.path`, and `shutil` is in the
  `os.path.relpath` documentation [1].

Reasons for not consolidating on `path`:

* The Page elements have both a source (this attribute) and a
  destination (.save_as).  To avoid confusion for developers not aware
  of this, make it painfully obvious that this attribute is for the
  source.  Explicit is better than implicit ;).

Where I was touching the line, I also updated the string formatting in
StaticGenerator.generate_output to use the forward compatible
'{}'.format() syntax.

[1]: http://docs.python.org/2/library/os.path.html#os.path.relpath
---
 pelican/contents.py   | 29 +++++++++++++++--------------
 pelican/generators.py | 28 ++++++++++++++--------------
 pelican/readers.py    | 34 +++++++++++++++++-----------------
 pelican/settings.py   | 14 +++++++-------
 pelican/utils.py      | 33 +++++++++++++++++----------------
 pelican/writers.py    | 22 +++++++++++-----------
 6 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 89e0397d..88518b0a 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -32,7 +32,7 @@ class Page(object):
     default_template = 'page'
 
     def __init__(self, content, metadata=None, settings=None,
-                 filename=None, context=None):
+                 source_path=None, context=None):
         # init parameters
         if not metadata:
             metadata = {}
@@ -75,8 +75,8 @@ class Page(object):
         if not hasattr(self, 'slug') and hasattr(self, 'title'):
             self.slug = slugify(self.title)
 
-        if filename:
-            self.filename = filename
+        if source_path:
+            self.source_path = source_path
 
         # manage the date format
         if not hasattr(self, 'date_format'):
@@ -160,8 +160,8 @@ class Page(object):
                 if value.startswith('/'):
                     value = value[1:]
                 else:
-                    # relative to the filename of this content
-                    value = self.get_relative_filename(
+                    # relative to the source path of this content
+                    value = self.get_relative_source_path(
                         os.path.join(self.relative_dir, value)
                     )
 
@@ -215,24 +215,25 @@ class Page(object):
         else:
             return self.default_template
 
-    def get_relative_filename(self, filename=None):
+    def get_relative_source_path(self, source_path=None):
         """Return the relative path (from the content path) to the given
-        filename.
+        source_path.
 
-        If no filename is specified, use the filename of this content object.
+        If no source path is specified, use the source path of this
+        content object.
         """
-        if not filename:
-            filename = self.filename
+        if not source_path:
+            source_path = self.source_path
 
         return os.path.relpath(
-            os.path.abspath(os.path.join(self.settings['PATH'], filename)),
+            os.path.abspath(os.path.join(self.settings['PATH'], source_path)),
             os.path.abspath(self.settings['PATH'])
         )
 
     @property
     def relative_dir(self):
         return os.path.dirname(os.path.relpath(
-            os.path.abspath(self.filename),
+            os.path.abspath(self.source_path),
             os.path.abspath(self.settings['PATH']))
         )
 
@@ -305,11 +306,11 @@ class StaticContent(object):
             settings = copy.deepcopy(_DEFAULT_CONFIG)
         self.src = src
         self.url = dst or src
-        self.filename = os.path.join(settings['PATH'], src)
+        self.source_path = os.path.join(settings['PATH'], src)
         self.save_as = os.path.join(settings['OUTPUT_PATH'], self.url)
 
     def __str__(self):
-        return self.filename
+        return self.source_path
 
 
 def is_valid_content(content, f):
diff --git a/pelican/generators.py b/pelican/generators.py
index 664f666c..01d9fc9b 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -108,8 +108,8 @@ class Generator(object):
                     files.append(os.sep.join((root, f)))
         return files
 
-    def add_filename(self, content):
-        location = os.path.relpath(os.path.abspath(content.filename),
+    def add_source_path(self, content):
+        location = os.path.relpath(os.path.abspath(content.source_path),
                                    os.path.abspath(self.path))
         self.context['filenames'][location] = content
 
@@ -352,11 +352,11 @@ class ArticlesGenerator(Generator):
 
             signals.article_generate_context.send(self, metadata=metadata)
             article = Article(content, metadata, settings=self.settings,
-                              filename=f, context=self.context)
+                              source_path=f, context=self.context)
             if not is_valid_content(article, f):
                 continue
 
-            self.add_filename(article)
+            self.add_source_path(article)
 
             if article.status == "published":
                 if hasattr(article, 'tags'):
@@ -455,11 +455,11 @@ class PagesGenerator(Generator):
                 continue
             signals.pages_generate_context.send(self, metadata=metadata)
             page = Page(content, metadata, settings=self.settings,
-                        filename=f, context=self.context)
+                        source_path=f, context=self.context)
             if not is_valid_content(page, f):
                 continue
 
-            self.add_filename(page)
+            self.add_source_path(page)
 
             if page.status == "published":
                 all_pages.append(page)
@@ -520,8 +520,8 @@ class StaticGenerator(Generator):
         # copy all StaticContent files
         for sc in self.staticfiles:
             mkdir_p(os.path.dirname(sc.save_as))
-            shutil.copy(sc.filename, sc.save_as)
-            logger.info('copying {} to {}'.format(sc.filename, sc.save_as))
+            shutil.copy(sc.source_path, sc.save_as)
+            logger.info('copying {} to {}'.format(sc.source_path, sc.save_as))
 
 
 class PdfGenerator(Generator):
@@ -544,11 +544,11 @@ class PdfGenerator(Generator):
             raise Exception("unable to find rst2pdf")
 
     def _create_pdf(self, obj, output_path):
-        if obj.filename.endswith(".rst"):
+        if obj.source_path.endswith('.rst'):
             filename = obj.slug + ".pdf"
             output_pdf = os.path.join(output_path, filename)
-            # print "Generating pdf for", obj.filename, " in ", output_pdf
-            with open(obj.filename) as f:
+            # print('Generating pdf for', obj.source_path, 'in', output_pdf)
+            with open(obj.source_path) as f:
                 self.pdfcreator.createPdf(text=f.read(), output=output_pdf)
             logger.info(' [ok] writing %s' % output_pdf)
 
@@ -578,9 +578,9 @@ class SourceFileGenerator(Generator):
         self.output_extension = self.settings['OUTPUT_SOURCES_EXTENSION']
 
     def _create_source(self, obj, output_path):
-        filename = os.path.splitext(obj.save_as)[0]
-        dest = os.path.join(output_path, filename + self.output_extension)
-        copy('', obj.filename, dest)
+        output_path = os.path.splitext(obj.save_as)[0]
+        dest = os.path.join(output_path, output_path + self.output_extension)
+        copy('', obj.source_path, dest)
 
     def generate_output(self, writer=None):
         logger.info(' Generating source files...')
diff --git a/pelican/readers.py b/pelican/readers.py
index 5c2ae58c..440bbdf8 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -109,20 +109,20 @@ class RstReader(Reader):
                 output[name] = self.process_metadata(name, value)
         return output
 
-    def _get_publisher(self, filename):
+    def _get_publisher(self, source_path):
         extra_params = {'initial_header_level': '2'}
         pub = docutils.core.Publisher(
             destination_class=docutils.io.StringOutput)
         pub.set_components('standalone', 'restructuredtext', 'html')
         pub.writer.translator_class = PelicanHTMLTranslator
         pub.process_programmatic_settings(None, extra_params, None)
-        pub.set_source(source_path=filename)
+        pub.set_source(source_path=source_path)
         pub.publish()
         return pub
 
-    def read(self, filename):
+    def read(self, source_path):
         """Parses restructured text"""
-        pub = self._get_publisher(filename)
+        pub = self._get_publisher(source_path)
         parts = pub.writer.parts
         content = parts.get('body')
 
@@ -151,9 +151,9 @@ class MarkdownReader(Reader):
                 output[name] = self.process_metadata(name, value[0])
         return output
 
-    def read(self, filename):
+    def read(self, source_path):
         """Parse content and metadata of markdown files"""
-        text = pelican_open(filename)
+        text = pelican_open(source_path)
         md = Markdown(extensions=set(self.extensions + ['meta']))
         content = md.convert(text)
 
@@ -165,9 +165,9 @@ class HtmlReader(Reader):
     file_extensions = ['html', 'htm']
     _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
 
-    def read(self, filename):
+    def read(self, source_path):
         """Parse content and metadata of (x)HTML files"""
-        with open(filename) as content:
+        with open(source_path) as content:
             metadata = {'title': 'unnamed'}
             for i in self._re.findall(content):
                 key = i.split(':')[0][5:].strip()
@@ -183,10 +183,10 @@ class AsciiDocReader(Reader):
     file_extensions = ['asc']
     default_options = ["--no-header-footer", "-a newline=\\n"]
 
-    def read(self, filename):
+    def read(self, source_path):
         """Parse content and metadata of asciidoc files"""
         from cStringIO import StringIO
-        text = StringIO(pelican_open(filename))
+        text = StringIO(pelican_open(source_path))
         content = StringIO()
         ad = AsciiDocAPI()
 
@@ -216,14 +216,14 @@ for cls in Reader.__subclasses__():
         _EXTENSIONS[ext] = cls
 
 
-def read_file(filename, fmt=None, settings=None):
+def read_file(path, fmt=None, settings=None):
     """Return a reader object using the given format."""
-    base, ext = os.path.splitext(os.path.basename(filename))
+    base, ext = os.path.splitext(os.path.basename(path))
     if not fmt:
         fmt = ext[1:]
 
     if fmt not in _EXTENSIONS:
-        raise TypeError('Pelican does not know how to parse %s' % filename)
+        raise TypeError('Pelican does not know how to parse {}'.format(path))
 
     reader = _EXTENSIONS[fmt](settings)
     settings_key = '%s_EXTENSIONS' % fmt.upper()
@@ -234,7 +234,7 @@ def read_file(filename, fmt=None, settings=None):
     if not reader.enabled:
         raise ValueError("Missing dependencies for %s" % fmt)
 
-    content, metadata = reader.read(filename)
+    content, metadata = reader.read(path)
 
     # eventually filter the content with typogrify if asked so
     if settings and settings.get('TYPOGRIFY'):
@@ -242,9 +242,9 @@ def read_file(filename, fmt=None, settings=None):
         content = typogrify(content)
         metadata['title'] = typogrify(metadata['title'])
 
-    filename_metadata = settings and settings.get('FILENAME_METADATA')
-    if filename_metadata:
-        match = re.match(filename_metadata, base)
+    file_metadata = settings and settings.get('FILENAME_METADATA')
+    if file_metadata:
+        match = re.match(file_metadata, base)
         if match:
             # .items() for py3k compat.
             for k, v in match.groupdict().items():
diff --git a/pelican/settings.py b/pelican/settings.py
index 9c0d8434..e4e0501d 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -84,15 +84,15 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    }
 
 
-def read_settings(filename=None, override=None):
-    if filename:
-        local_settings = get_settings_from_file(filename)
+def read_settings(path=None, override=None):
+    if path:
+        local_settings = get_settings_from_file(path)
         # Make the paths relative to the settings file
         for p in ['PATH', 'OUTPUT_PATH', 'THEME']:
             if p in local_settings and local_settings[p] is not None \
                     and not isabs(local_settings[p]):
                 absp = os.path.abspath(os.path.normpath(os.path.join(
-                            os.path.dirname(filename), local_settings[p])))
+                            os.path.dirname(path), local_settings[p])))
                 if p != 'THEME' or os.path.exists(absp):
                     local_settings[p] = absp
     else:
@@ -116,14 +116,14 @@ def get_settings_from_module(module=None, default_settings=_DEFAULT_CONFIG):
     return context
 
 
-def get_settings_from_file(filename, default_settings=_DEFAULT_CONFIG):
+def get_settings_from_file(path, default_settings=_DEFAULT_CONFIG):
     """
     Load settings from a file path, returning a dict.
 
     """
 
-    name = os.path.basename(filename).rpartition(".")[0]
-    module = imp.load_source(name, filename)
+    name = os.path.basename(path).rpartition('.')[0]
+    module = imp.load_source(name, path)
     return get_settings_from_module(module, default_settings=default_settings)
 
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 3a41d04e..48ed0757 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -141,9 +141,9 @@ def get_date(string):
     raise ValueError("'%s' is not a valid date" % string)
 
 
-def pelican_open(filename):
+def pelican_open(path):
     """Open a file and return it's content"""
-    return open(filename, encoding='utf-8').read()
+    return open(path, encoding='utf-8').read()
 
 
 def slugify(value):
@@ -245,9 +245,9 @@ def clean_output_dir(path):
             logger.error("Unable to delete %s, file type unknown" % file)
 
 
-def get_relative_path(filename):
-    """Return the relative path from the given filename to the root path."""
-    nslashes = filename.count('/')
+def get_relative_path(path):
+    """Return the relative path from the given path to the root path."""
+    nslashes = path.count('/')
     if nslashes == 0:
         return '.'
     else:
@@ -344,15 +344,16 @@ def process_translations(content_list):
         if len_ > 1:
             logger.warning('there are %s variants of "%s"' % (len_, slug))
             for x in default_lang_items:
-                logger.warning('    %s' % x.filename)
+                logger.warning('    {}'.format(x.source_path))
         elif len_ == 0:
             default_lang_items = items[:1]
 
         if not slug:
-            msg = 'empty slug for %r. ' % default_lang_items[0].filename\
-                + 'You can fix this by adding a title or a slug to your '\
-                + 'content'
-            logger.warning(msg)
+            logger.warning((
+                    'empty slug for {!r}. '
+                    'You can fix this by adding a title or a slug to your '
+                    'content'
+                    ).format(default_lang_items[0].source_path))
         index.extend(default_lang_items)
         translations.extend([x for x in items if x not in default_lang_items])
         for a in items:
@@ -388,14 +389,14 @@ def files_changed(path, extensions):
 FILENAMES_MTIMES = defaultdict(int)
 
 
-def file_changed(filename):
-    mtime = os.stat(filename).st_mtime
-    if FILENAMES_MTIMES[filename] == 0:
-        FILENAMES_MTIMES[filename] = mtime
+def file_changed(path):
+    mtime = os.stat(path).st_mtime
+    if FILENAMES_MTIMES[path] == 0:
+        FILENAMES_MTIMES[path] = mtime
         return False
     else:
-        if mtime > FILENAMES_MTIMES[filename]:
-            FILENAMES_MTIMES[filename] = mtime
+        if mtime > FILENAMES_MTIMES[path]:
+            FILENAMES_MTIMES[path] = mtime
             return True
         return False
 
diff --git a/pelican/writers.py b/pelican/writers.py
index 8374ea3e..429507a0 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -46,23 +46,23 @@ class Writer(object):
             pubdate=set_date_tzinfo(item.date,
                 self.settings.get('TIMEZONE', None)))
 
-    def write_feed(self, elements, context, filename=None, feed_type='atom'):
+    def write_feed(self, elements, context, path=None, feed_type='atom'):
         """Generate a feed with the list of articles provided
 
-        Return the feed. If no output_path or filename is specified, just
+        Return the feed. If no path or output_path is specified, just
         return the feed object.
 
         :param elements: the articles to put on the feed.
         :param context: the context to get the feed metadata.
-        :param filename: the filename to output.
+        :param path: the path to output.
         :param feed_type: the feed type to use (atom or rss)
         """
         old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, str('C'))
         try:
-            self.site_url = context.get('SITEURL', get_relative_path(filename))
+            self.site_url = context.get('SITEURL', get_relative_path(path))
             self.feed_domain = context.get('FEED_DOMAIN')
-            self.feed_url = '%s/%s' % (self.feed_domain, filename)
+            self.feed_url = '{}/{}'.format(self.feed_domain, path)
 
             feed = self._create_new_feed(feed_type, context)
 
@@ -72,8 +72,8 @@ class Writer(object):
             for i in range(max_items):
                 self._add_item_to_the_feed(feed, elements[i])
 
-            if filename:
-                complete_path = os.path.join(self.output_path, filename)
+            if path:
+                complete_path = os.path.join(self.output_path, path)
                 try:
                     os.makedirs(os.path.dirname(complete_path))
                 except Exception:
@@ -114,14 +114,14 @@ class Writer(object):
                 output = template.render(localcontext)
             finally:
                 locale.setlocale(locale.LC_ALL, old_locale)
-            filename = os.sep.join((output_path, name))
+            path = os.path.join(output_path, name)
             try:
-                os.makedirs(os.path.dirname(filename))
+                os.makedirs(os.path.dirname(path))
             except Exception:
                 pass
-            with open(filename, 'w', encoding='utf-8') as f:
+            with open(path, 'w', encoding='utf-8') as f:
                 f.write(output)
-            logger.info('writing %s' % filename)
+            logger.info('writing {}'.format(path))
 
         localcontext = context.copy()
         if relative_urls:

From 9b574361c90e8bc394b17903802935e60ecbe3f0 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 11:17:23 -0500
Subject: [PATCH 1099/2864] doc: convert Markdown example to source_path and
 modernize

---
 docs/internals.rst | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/internals.rst b/docs/internals.rst
index 280e14d7..cadd300b 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -47,19 +47,17 @@ Take a look at the Markdown reader::
     class MarkdownReader(Reader):
         enabled = bool(Markdown)
 
-        def read(self, filename):
+        def read(self, source_path):
             """Parse content and metadata of markdown files"""
-            text = open(filename)
+            text = pelican_open(source_path)
             md = Markdown(extensions = ['meta', 'codehilite'])
             content = md.convert(text)
 
             metadata = {}
             for name, value in md.Meta.items():
-                if name in _METADATA_FIELDS:
-                    meta = _METADATA_FIELDS[name](value[0])
-                else:
-                    meta = value[0]
-                metadata[name.lower()] = meta
+                name = name.lower()
+                meta = self.process_metadata(name, value[0])
+                metadata[name] = meta
             return content, metadata
 
 Simple, isn't it?

From 54a9132aea663dcdc6d8deb350e3c3e3a3381907 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 11:22:49 -0500
Subject: [PATCH 1100/2864] tests: Update tests after filename/filepath ->
 source_path

---
 tests/test_generators.py | 10 +++++-----
 tests/test_pelican.py    |  4 ++--
 tests/test_readers.py    | 32 ++++++++++++++++----------------
 tests/test_utils.py      | 12 ++++++------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/tests/test_generators.py b/tests/test_generators.py
index 50f5fe3e..54fe7e61 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -229,20 +229,20 @@ class TestTemplatePagesGenerator(unittest.TestCase):
 
         # create a dummy template file
         template_dir = os.path.join(self.temp_content, 'template')
-        template_filename = os.path.join(template_dir, 'source.html')
+        template_path = os.path.join(template_dir, 'source.html')
         os.makedirs(template_dir)
-        with open(template_filename, 'w') as template_file:
+        with open(template_path, 'w') as template_file:
             template_file.write(self.TEMPLATE_CONTENT)
 
         writer = Writer(self.temp_output, settings=settings)
         generator.generate_output(writer)
 
-        output_filename = os.path.join(
+        output_path = os.path.join(
                 self.temp_output, 'generated', 'file.html')
 
         # output file has been generated
-        self.assertTrue(os.path.exists(output_filename))
+        self.assertTrue(os.path.exists(output_path))
 
         # output content is correct
-        with open(output_filename, 'r') as output_file:
+        with open(output_path, 'r') as output_file:
             self.assertEquals(output_file.read(), 'foo: bar')
diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index 6a082676..ca0e22cc 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -70,7 +70,7 @@ class TestPelican(unittest.TestCase):
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
         # ones and generate correct output without raising any exception
-        settings = read_settings(filename=None, override={
+        settings = read_settings(path=None, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
             'LOCALE': locale.normalize('en_US'),
@@ -86,7 +86,7 @@ class TestPelican(unittest.TestCase):
 
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work
-        settings = read_settings(filename=SAMPLE_CONFIG, override={
+        settings = read_settings(path=SAMPLE_CONFIG, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
             'LOCALE': locale.normalize('en_US'),
diff --git a/tests/test_readers.py b/tests/test_readers.py
index e3cea629..75e664d5 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -11,7 +11,7 @@ CUR_DIR = os.path.dirname(__file__)
 CONTENT_PATH = os.path.join(CUR_DIR, 'content')
 
 
-def _filename(*args):
+def _path(*args):
     return os.path.join(CONTENT_PATH, *args)
 
 
@@ -19,7 +19,7 @@ class RstReaderTest(unittest.TestCase):
 
     def test_article_with_metadata(self):
         reader = readers.RstReader({})
-        content, metadata = reader.read(_filename('article_with_metadata.rst'))
+        content, metadata = reader.read(_path('article_with_metadata.rst'))
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -37,7 +37,7 @@ class RstReaderTest(unittest.TestCase):
 
     def test_article_with_filename_metadata(self):
         content, metadata = readers.read_file(
-                _filename('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
+                _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
                 settings={})
         expected = {
             'category': 'yeah',
@@ -48,7 +48,7 @@ class RstReaderTest(unittest.TestCase):
             self.assertEquals(value, expected[key], key)
 
         content, metadata = readers.read_file(
-                _filename('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
+                _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
                 settings={
                     'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*'
                     })
@@ -62,7 +62,7 @@ class RstReaderTest(unittest.TestCase):
             self.assertEquals(value, expected[key], key)
 
         content, metadata = readers.read_file(
-                _filename('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
+                _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
                 settings={
                     'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2})_' \
                                          '_(?P<Slug>.*)' \
@@ -82,7 +82,7 @@ class RstReaderTest(unittest.TestCase):
     def test_article_metadata_key_lowercase(self):
         """Keys of metadata should be lowercase."""
         reader = readers.RstReader({})
-        content, metadata = reader.read(_filename('article_with_uppercase_metadata.rst'))
+        content, metadata = reader.read(_path('article_with_uppercase_metadata.rst'))
 
         self.assertIn('category', metadata, "Key should be lowercase.")
         self.assertEquals('Yeah', metadata.get('category'), "Value keeps cases.")
@@ -90,7 +90,7 @@ class RstReaderTest(unittest.TestCase):
     def test_typogrify(self):
         # if nothing is specified in the settings, the content should be
         # unmodified
-        content, _ = readers.read_file(_filename('article.rst'))
+        content, _ = readers.read_file(_path('article.rst'))
         expected = "<p>This is some content. With some stuff to "\
                    "&quot;typogrify&quot;.</p>\n<p>Now with added "\
                    'support for <abbr title="three letter acronym">'\
@@ -100,7 +100,7 @@ class RstReaderTest(unittest.TestCase):
 
         try:
             # otherwise, typogrify should be applied
-            content, _ = readers.read_file(_filename('article.rst'),
+            content, _ = readers.read_file(_path('article.rst'),
                                            settings={'TYPOGRIFY': True})
             expected = "<p>This is some content. With some stuff to&nbsp;"\
                        "&#8220;typogrify&#8221;.</p>\n<p>Now with added "\
@@ -118,7 +118,7 @@ class MdReaderTest(unittest.TestCase):
     def test_article_with_md_extension(self):
         # test to ensure the md extension is being processed by the correct reader
         reader = readers.MarkdownReader({})
-        content, metadata = reader.read(_filename('article_with_md_extension.md'))
+        content, metadata = reader.read(_path('article_with_md_extension.md'))
         expected = "<h1>Test Markdown File Header</h1>\n"\
                 "<h2>Used for pelican test</h2>\n"\
                 "<p>The quick brown fox jumped over the lazy dog's back.</p>"
@@ -136,7 +136,7 @@ class MdReaderTest(unittest.TestCase):
     def test_article_with_mkd_extension(self):
         # test to ensure the mkd extension is being processed by the correct reader
         reader = readers.MarkdownReader({})
-        content, metadata = reader.read(_filename('article_with_mkd_extension.mkd'))
+        content, metadata = reader.read(_path('article_with_mkd_extension.mkd'))
         expected = "<h1>Test Markdown File Header</h1>\n"\
                 "<h2>Used for pelican test</h2>\n"\
                 "<p>This is another markdown test file.  Uses the mkd extension.</p>"
@@ -147,7 +147,7 @@ class MdReaderTest(unittest.TestCase):
     def test_article_with_markdown_markup_extension(self):
         # test to ensure the markdown markup extension is being processed as expected
         content, metadata = readers.read_file(
-                _filename('article_with_markdown_markup_extensions.md'),
+                _path('article_with_markdown_markup_extensions.md'),
                 settings={'MD_EXTENSIONS': ['toc', 'codehilite', 'extra']})
         expected = '<div class="toc">\n'\
             '<ul>\n'\
@@ -165,7 +165,7 @@ class MdReaderTest(unittest.TestCase):
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_filename_metadata(self):
         content, metadata = readers.read_file(
-                _filename('2012-11-30_md_w_filename_meta#foo-bar.md'),
+                _path('2012-11-30_md_w_filename_meta#foo-bar.md'),
                 settings={})
         expected = {
             'category': 'yeah',
@@ -175,7 +175,7 @@ class MdReaderTest(unittest.TestCase):
             self.assertEquals(value, metadata[key], key)
 
         content, metadata = readers.read_file(
-                _filename('2012-11-30_md_w_filename_meta#foo-bar.md'),
+                _path('2012-11-30_md_w_filename_meta#foo-bar.md'),
                 settings={
                     'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*'
                     })
@@ -188,7 +188,7 @@ class MdReaderTest(unittest.TestCase):
             self.assertEquals(value, metadata[key], key)
 
         content, metadata = readers.read_file(
-                _filename('2012-11-30_md_w_filename_meta#foo-bar.md'),
+                _path('2012-11-30_md_w_filename_meta#foo-bar.md'),
                 settings={
                     'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2})'
                                          '_(?P<Slug>.*)'
@@ -210,7 +210,7 @@ class AdReaderTest(unittest.TestCase):
     def test_article_with_asc_extension(self):
         # test to ensure the asc extension is being processed by the correct reader
         reader = readers.AsciiDocReader({})
-        content, metadata = reader.read(_filename('article_with_asc_extension.asc'))
+        content, metadata = reader.read(_path('article_with_asc_extension.asc'))
         expected = '<hr>\n<h2><a name="_used_for_pelican_test"></a>Used for pelican test</h2>\n'\
                    '<p>The quick brown fox jumped over the lazy dog&#8217;s back.</p>\n'
         self.assertEqual(content, expected)
@@ -241,7 +241,7 @@ class AdReaderTest(unittest.TestCase):
     def test_article_with_asc_options(self):
         # test to ensure the ASCIIDOC_OPTIONS is being used
         reader = readers.AsciiDocReader(dict(ASCIIDOC_OPTIONS=["-a revision=1.0.42"]))
-        content, metadata = reader.read(_filename('article_with_asc_options.asc'))
+        content, metadata = reader.read(_path('article_with_asc_options.asc'))
         expected = '<hr>\n<h2><a name="_used_for_pelican_test"></a>Used for pelican test</h2>\n'\
                    '<p>version 1.0.42</p>\n'\
                    '<p>The quick brown fox jumped over the lazy dog&#8217;s back.</p>\n'
diff --git a/tests/test_utils.py b/tests/test_utils.py
index eddb3e25..ea4f839c 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -79,17 +79,17 @@ class TestUtils(unittest.TestCase):
         """Test if file changes are correctly detected
         Make sure to handle not getting any files correctly"""
 
-        path = os.path.join(os.path.dirname(__file__), 'content')
-        filename = os.path.join(path, 'article_with_metadata.rst')
-        changed = utils.files_changed(path, 'rst')
+        dirname = os.path.join(os.path.dirname(__file__), 'content')
+        path = os.path.join(dirname, 'article_with_metadata.rst')
+        changed = utils.files_changed(dirname, 'rst')
         self.assertEquals(changed, True)
 
-        changed = utils.files_changed(path, 'rst')
+        changed = utils.files_changed(dirname, 'rst')
         self.assertEquals(changed, False)
 
         t = time.time()
-        os.utime(filename, (t, t))
-        changed = utils.files_changed(path, 'rst')
+        os.utime(path, (t, t))
+        changed = utils.files_changed(dirname, 'rst')
         self.assertEquals(changed, True)
         self.assertAlmostEqual(utils.LAST_MTIME, t, delta=1)
 

From c3c3037a1d726f3a1e1b04a3ee0b7d88cf1c5226 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 07:29:23 -0500
Subject: [PATCH 1101/2864] utils: Teach mkdir_p to fail if the existing target
 isn't a directory

Existing symlinks to directories will still pass, because isdir()
follows symbolic links.
---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 3a41d04e..40406b1a 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -416,5 +416,5 @@ def mkdir_p(path):
     try:
         os.makedirs(path)
     except OSError as e:
-        if e.errno != errno.EEXIST:
+        if e.errno != errno.EEXIST or not os.path.isdir(path):
             raise

From ec50e18a3e4ed6e823126778df39c606ce7c3036 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 13:02:30 -0500
Subject: [PATCH 1102/2864] utils: Add deprecated_attribute decorator

---
 pelican/utils.py    | 43 +++++++++++++++++++++++++++++++++++++++++++
 tests/test_utils.py | 11 +++++++++++
 2 files changed, 54 insertions(+)

diff --git a/pelican/utils.py b/pelican/utils.py
index 48ed0757..9c3bd7be 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -6,6 +6,7 @@ import os
 import re
 import pytz
 import shutil
+import traceback
 import logging
 import errno
 import locale
@@ -122,6 +123,48 @@ class memoized(object):
       '''Support instance methods.'''
       return partial(self.__call__, obj)
 
+
+def deprecated_attribute(old, new, since=None, remove=None, doc=None):
+    """Attribute deprecation decorator for gentle upgrades
+
+    For example:
+
+        class MyClass (object):
+            @deprecated_attribute(
+                old='abc', new='xyz', since=(3, 2, 0), remove=(4, 1, 3))
+            def abc(): return None
+
+            def __init__(self):
+                xyz = 5
+
+    Note that the decorator needs a dummy method to attach to, but the
+    content of the dummy method is ignored.
+    """
+    def _warn():
+        version = '.'.join(six.text_type(x) for x in since)
+        message = ['{} has been deprecated since {}'.format(old, version)]
+        if remove:
+            version = '.'.join(six.text_type(x) for x in remove)
+            message.append(
+                ' and will be removed by version {}'.format(version))
+        message.append('.  Use {} instead.'.format(new))
+        logger.warning(''.join(message))
+        logger.debug(''.join(
+                six.text_type(x) for x in traceback.format_stack()))
+
+    def fget(self):
+        _warn()
+        return getattr(self, new)
+
+    def fset(self, value):
+        _warn()
+        setattr(self, new, value)
+
+    def decorator(dummy):
+        return property(fget=fget, fset=fset, doc=doc)
+
+    return decorator
+
 def get_date(string):
     """Return a datetime object from a string.
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index ea4f839c..75e87c04 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -11,6 +11,17 @@ from pelican.utils import NoFilesError
 
 
 class TestUtils(unittest.TestCase):
+    _new_attribute = 'new_value'
+
+    @utils.deprecated_attribute(
+        old='_old_attribute', new='_new_attribute',
+        since=(3, 1, 0), remove=(4, 1, 3))
+    def _old_attribute(): return None
+
+    def test_deprecated_attribute(self):
+        value = self._old_attribute
+        self.assertEquals(value, self._new_attribute)
+        # TODO: check log warning
 
     def test_get_date(self):
         # valid ones

From 13cd0a4cb3f62b8166ff3957e3385c405b28f34d Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 13:03:19 -0500
Subject: [PATCH 1103/2864] contents: Add deprecation warnings for
 Page.filename and StaticContent.filepath

---
 pelican/contents.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 88518b0a..0dc0f0e9 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -15,7 +15,7 @@ from sys import platform, stdin
 
 from pelican.settings import _DEFAULT_CONFIG
 from pelican.utils import (slugify, truncate_html_words, memoized,
-    python_2_unicode_compatible)
+    python_2_unicode_compatible, deprecated_attribute)
 from pelican import signals
 import pelican.utils
 
@@ -31,6 +31,10 @@ class Page(object):
     mandatory_properties = ('title',)
     default_template = 'page'
 
+    @deprecated_attribute(old='filename', new='source_path', since=(3, 2, 0))
+    def filename():
+        return None
+
     def __init__(self, content, metadata=None, settings=None,
                  source_path=None, context=None):
         # init parameters
@@ -301,6 +305,10 @@ class Author(URLWrapper):
 
 @python_2_unicode_compatible
 class StaticContent(object):
+    @deprecated_attribute(old='filepath', new='source_path', since=(3, 2, 0))
+    def filepath():
+        return None
+
     def __init__(self, src, dst=None, settings=None):
         if not settings:
             settings = copy.deepcopy(_DEFAULT_CONFIG)

From 4fcdaa91e96988e2754b9aec5e141e7219baae89 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 18 Jan 2013 07:27:35 -0500
Subject: [PATCH 1104/2864] tests/support: Factor LogCountHandler testing out
 into LoggedTestCase

To avoid duplicating boilerplate when we need to test logged messages
outside of TestPelican.
---
 tests/support.py      | 21 +++++++++++++++++++++
 tests/test_pelican.py | 19 +++++++------------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 6011e6cd..209cc665 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -176,3 +176,24 @@ class LogCountHandler(BufferingHandler):
             if (msg is None or re.match(msg, l.getMessage()))
             and (level is None or l.levelno == level)
             ])
+
+
+class LoggedTestCase(unittest.TestCase):
+    """A test case that captures log messages
+    """
+
+    def setUp(self):
+        super(LoggedTestCase, self).setUp()
+        self._logcount_handler = LogCountHandler()
+        logging.getLogger().addHandler(self._logcount_handler)
+
+    def tearDown(self):
+        logging.getLogger().removeHandler(self._logcount_handler)
+        super(LoggedTestCase, self).tearDown()
+
+    def assertLogCountEqual(self, count=None, msg=None, **kwargs):
+        actual = self._logcount_handler.count_logs(msg=msg, **kwargs)
+        self.assertEqual(
+            actual, count,
+            msg='expected {} occurrences of {!r}, but found {}'.format(
+                count, msg, actual))
diff --git a/tests/test_pelican.py b/tests/test_pelican.py
index ca0e22cc..49e20b0a 100644
--- a/tests/test_pelican.py
+++ b/tests/test_pelican.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # NOQA
 
 import os
 from filecmp import dircmp
@@ -14,7 +10,7 @@ import logging
 
 from pelican import Pelican
 from pelican.settings import read_settings
-from .support import LogCountHandler
+from .support import LoggedTestCase
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
 SAMPLES_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "..", "samples")))
@@ -39,13 +35,12 @@ def recursiveDiff(dcmp):
     return diff
 
 
-class TestPelican(unittest.TestCase):
+class TestPelican(LoggedTestCase):
     # general functional testing for pelican. Basically, this test case tries
     # to run pelican in different situations and see how it behaves
 
     def setUp(self):
-        self.logcount_handler = LogCountHandler()
-        logging.getLogger().addHandler(self.logcount_handler)
+        super(TestPelican, self).setUp()
         self.temp_path = mkdtemp()
         self.old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, str('C'))
@@ -53,7 +48,7 @@ class TestPelican(unittest.TestCase):
     def tearDown(self):
         rmtree(self.temp_path)
         locale.setlocale(locale.LC_ALL, self.old_locale)
-        logging.getLogger().removeHandler(self.logcount_handler)
+        super(TestPelican, self).tearDown()
 
     def assertFilesEqual(self, diff):
         msg = "some generated files differ from the expected functional " \
@@ -79,10 +74,10 @@ class TestPelican(unittest.TestCase):
         pelican.run()
         dcmp = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
         self.assertFilesEqual(recursiveDiff(dcmp))
-        self.assertEqual(self.logcount_handler.count_logs(
+        self.assertLogCountEqual(
+            count=10,
             msg="Unable to find.*skipping url replacement",
-            level=logging.WARNING,
-            ), 10, msg="bad number of occurences found for this log")
+            level=logging.WARNING)
 
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work

From 13b36a5c34b7a64f36662d537c2fa192994048df Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 18 Jan 2013 07:33:42 -0500
Subject: [PATCH 1105/2864] test_utils: Add log count checks to
 test_deprecated_attribute

---
 tests/test_utils.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/test_utils.py b/tests/test_utils.py
index 75e87c04..c176325e 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
+import logging
 import shutil
 import os
 import datetime
 import time
 
 from pelican import utils
-from .support import get_article, unittest
+from .support import get_article, LoggedTestCase
 from pelican.utils import NoFilesError
 
 
-class TestUtils(unittest.TestCase):
+class TestUtils(LoggedTestCase):
     _new_attribute = 'new_value'
 
     @utils.deprecated_attribute(
@@ -21,7 +22,11 @@ class TestUtils(unittest.TestCase):
     def test_deprecated_attribute(self):
         value = self._old_attribute
         self.assertEquals(value, self._new_attribute)
-        # TODO: check log warning
+        self.assertLogCountEqual(
+            count=1,
+            msg=('_old_attribute has been deprecated since 3.1.0 and will be '
+                 'removed by version 4.1.3.  Use _new_attribute instead'),
+            level=logging.WARNING)
 
     def test_get_date(self):
         # valid ones

From 6686f1c9bd2aaae633f97e48dac60ac82c9f7c68 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 18 Jan 2013 17:49:09 -0500
Subject: [PATCH 1106/2864] setup.py: Update trove classifiers to Python 2.7,
 3.2, and 3.3

---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 13afd8cf..4c791008 100755
--- a/setup.py
+++ b/setup.py
@@ -41,8 +41,10 @@ setup(
          'Environment :: Console',
          'License :: OSI Approved :: GNU Affero General Public License v3',
          'Operating System :: OS Independent',
-         'Programming Language :: Python :: 2.6',
          'Programming Language :: Python :: 2.7',
+         'Programming Language :: Python :: 3',
+         'Programming Language :: Python :: 3.2',
+         'Programming Language :: Python :: 3.3',
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Software Development :: Libraries :: Python Modules',
     ],

From 5466ffd61476205feb2a9a7fef737714b12ebf74 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 18 Jan 2013 19:45:39 -0500
Subject: [PATCH 1107/2864] .travis.yml: Test on Python 3.3 as well as 2.7 and
 3.2

If we advertise 3.3 support in setup.py, we should test for it.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 7ccdafd5..20f6b57e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 python:
     - "2.7"
     - "3.2"
+    - "3.3"
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq ruby-sass

From 763244dad53404a4ec126beca92d3f30d1325af2 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 18 Jan 2013 19:46:58 -0500
Subject: [PATCH 1108/2864] tox.ini: Test on Python 3.3 as well as 2.7 and 3.2

I just copied the 3.2 environment for 3.3.  They should be similar,
but it's possible some packages have extra issues on 3.3.
---
 tox.ini | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index bc6578ac..6d1a134a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,7 +31,7 @@
 
 
 [tox]
-envlist = py27,py32
+envlist = py27,py32,py33
 
 [testenv]
 commands =
@@ -61,3 +61,15 @@ deps =
 #    {distshare}/smartypants-1.6.0.3.zip
 #    {distshare}/typogrify-2.0.0.zip
 #    {distshare}/webassets-0.8.dev.zip
+
+[testenv:py33]
+deps =
+    nose
+    unittest2py3k
+    mock
+    Markdown
+    BeautifulSoup4
+    feedgenerator
+#    {distshare}/smartypants-1.6.0.3.zip
+#    {distshare}/typogrify-2.0.0.zip
+#    {distshare}/webassets-0.8.dev.zip

From b01ddbb29c3f6fb1de1794f20e19630cc8810fda Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 19 Jan 2013 16:44:12 +0100
Subject: [PATCH 1109/2864] fix python 3.3 travis build

unittest2py3k is requiredfor python 3.3 (instead of unittest2)
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 20f6b57e..6048335f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_install:
  - sudo apt-get install -qq ruby-sass
 install:
     - pip install nose mock --use-mirrors
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install --use-mirrors unittest2py3k; else pip install --use-mirrors unittest2; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors unittest2; else pip install --use-mirrors unittest2py3k; fi
     - pip install . --use-mirrors
     - pip install Markdown
     - pip install webassets

From 67a67846aaa248c4e79f74fd6f42f8f47e641437 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Sat, 19 Jan 2013 17:10:12 +0100
Subject: [PATCH 1110/2864] temporary deactivate travis tests for Python 3.3

the functional tests currently fail on Python 3.3 because the feeds output
differs. (see #688)

this is a temporary fix that will make travis happy while we provide a valid
fix for this issue.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6048335f..8b292101 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 python:
     - "2.7"
     - "3.2"
-    - "3.3"
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq ruby-sass

From 0a6294a2a3bbd0d1447e1dc1e05b5e4fc2f633d1 Mon Sep 17 00:00:00 2001
From: Eric <github@webdesignhero.com>
Date: Sun, 20 Jan 2013 17:27:28 -0600
Subject: [PATCH 1111/2864] More clear example for related posts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The existing related posts example doesn't show properties for the collection, this could be confusing to individuals who are not programmers, because as it was the code would render five bullet points.

I am also looking to add some type of loop control or if statement to the loop to detect duplicate, I tried t a dictionary sort filter through jinja, bu that through an error, the following is not guarantted to work then:


		{% set LASTARTICLE = "notset" %}
		{% if article.related_posts %}
			<ul>
			{% for related_post in article.related_posts|dictsort(false, 'url')  %}
				{% if not (LASTARTICLE == related_post.url) %}
				   <li><a href="{{ related_post.url }}">{{ related_post.title }}</a></li>
				{% endif %}
				{% set LASTARTICLE = related_post.url %}
			{% endfor %}
			</ul>
		{% endif %}

the dicsort does not work (is this not a dict, I'm not a python guy so I'm just hacking at it.
---
 docs/plugins.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 7e09810b..ca9a0dde 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -291,7 +291,7 @@ For example::
     {% if article.related_posts %}
         <ul>
         {% for related_post in article.related_posts %}
-            <li>{{ related_post }}</li>
+            <li><a href="{{ related_post.url }}">{{ related_post.title }}</a></li>
         {% endfor %}
         </ul>
     {% endif %}

From 688dee2dca7fdd60bf94af72d928d912f8a5ddbb Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Tue, 18 Dec 2012 14:03:05 +0100
Subject: [PATCH 1112/2864] Improve importer documentation.

---
 docs/importer.rst | 54 +++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index c9fa3be0..7ca3142d 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -4,54 +4,56 @@
  Import from other blog software
 =================================
 
+
 Description
 ===========
 
-``pelican-import`` is a command line tool for converting articles from other
-software to ReStructuredText. The supported formats are:
+``pelican-import`` is a command-line tool for converting articles from other
+software to ReStructuredText or Markdown. The supported import formats are:
 
 - WordPress XML export
 - Dotclear export
 - RSS/Atom feed
 
-The conversion from HTML to reStructuredText relies on `pandoc
-<http://johnmacfarlane.net/pandoc/>`_. For Dotclear, if the source posts are
-written with Markdown syntax, they will not be converted (as Pelican also
-supports Markdown).
+The conversion from HTML to reStructuredText or Markdown relies on `Pandoc`_.
+For Dotclear, if the source posts are written with Markdown syntax, they will
+not be converted (as Pelican also supports Markdown).
+
 
 Dependencies
-""""""""""""
+============
 
-``pelican-import`` has two dependencies not required by the rest of pelican:
+``pelican-import`` has some dependencies not required by the rest of pelican:
 
-- Beautiful Soup
-- pandoc
+- *BeautifulSoup*, for WordPress and Dotclear import. Can be installed like
+  any other Python package (``pip install BeautifulSoup``).
+- *Feedparser*, for feed import (``pip install feedparser``).
+- *Pandoc*, see the `Pandoc site`_ for installation instructions on your
+  operating system.
 
-Beautiful Soup can be installed like any other Python package::
-
-    $ pip install BeautifulSoup
-
-For pandoc, install a package for your operating system from the
-`pandoc site <http://johnmacfarlane.net/pandoc/installing.html>`_.
+.. _Pandoc: http://johnmacfarlane.net/pandoc/
+.. _Pandoc site: http://johnmacfarlane.net/pandoc/installing.html
 
 
 Usage
-"""""
+=====
 
-| pelican-import [-h] [--wpfile] [--dotclear] [--feed] [-o OUTPUT]
-|                [-m MARKUP] [--dir-cat] [--strip-raw] [--disable-slugs]
-|                input
+::
+
+    pelican-import [-h] [--wpfile] [--dotclear] [--feed] [-o OUTPUT]
+                   [-m MARKUP] [--dir-cat] [--strip-raw] [--disable-slugs]
+                   input
 
 Positional arguments
-====================
+--------------------
 
   input                 The input file to read
 
 Optional arguments
-""""""""""""""""""
+------------------
 
-  -h, --help            show this help message and exit
-  --wpfile              Wordpress XML export (default: False)
+  -h, --help            Show this help message and exit
+  --wpfile              WordPress XML export (default: False)
   --dotclear            Dotclear export (default: False)
   --feed                Feed to parse (default: False)
   -o OUTPUT, --output OUTPUT
@@ -69,6 +71,7 @@ Optional arguments
                         be consistent with your original posts. (default:
                         False)
 
+
 Examples
 ========
 
@@ -80,10 +83,11 @@ For Dotclear::
 
     $ pelican-import --dotclear -o ~/output ~/backup.txt
 
+
 Tests
 =====
 
 To test the module, one can use sample files:
 
-- for Wordpress: http://wpcandy.com/made/the-sample-post-collection
+- for WordPress: http://wpcandy.com/made/the-sample-post-collection
 - for Dotclear: http://themes.dotaddict.org/files/public/downloads/lorem-backup.txt

From 56a276d92e709b87a7f6f078e2e5fe93ad429cc5 Mon Sep 17 00:00:00 2001
From: Michael Reneer <michaelreneer@gmail.com>
Date: Mon, 10 Dec 2012 23:32:35 -0500
Subject: [PATCH 1113/2864] Added unit test to test the markdown file
 extension.

---
 .../content/article_with_markdown_extension.markdown  | 10 ++++++++++
 tests/test_readers.py                                 | 11 +++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 tests/content/article_with_markdown_extension.markdown

diff --git a/tests/content/article_with_markdown_extension.markdown b/tests/content/article_with_markdown_extension.markdown
new file mode 100644
index 00000000..94e92871
--- /dev/null
+++ b/tests/content/article_with_markdown_extension.markdown
@@ -0,0 +1,10 @@
+title: Test markdown File
+category: test
+
+Test Markdown File Header
+=========================
+
+Used for pelican test
+---------------------
+
+This is another markdown test file.  Uses the markdown extension.
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 75e664d5..474b1b4b 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -143,6 +143,17 @@ class MdReaderTest(unittest.TestCase):
         
         self.assertEqual(content, expected)
 
+    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
+    def test_article_with_mkd_extension(self):
+        # test to ensure the markdown extension is being processed by the correct reader
+        reader = readers.MarkdownReader({})
+        content, metadata = reader.read(_filename('article_with_markdown_extension.markdown'))
+        expected = "<h1>Test Markdown File Header</h1>\n"\
+                "<h2>Used for pelican test</h2>\n"\
+                "<p>This is another markdown test file.  Uses the markdown extension.</p>"
+        
+        self.assertEqual(content, expected)
+
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_markdown_markup_extension(self):
         # test to ensure the markdown markup extension is being processed as expected

From a441596b072ee124ca5720b211dc2605880c279e Mon Sep 17 00:00:00 2001
From: Michael Reneer <michaelreneer@gmail.com>
Date: Tue, 11 Dec 2012 10:23:43 -0500
Subject: [PATCH 1114/2864] Cleaned up markdown test cases:

- test_article_with_md_extension
- test_article_with_mkd_extension
- test_article_with_markdown_extension

and replaced with:

- test_article_with_metadata
- test_article_with_file_extensions
---
 tests/content/article_with_md_extension.md |  7 ++-
 tests/test_readers.py                      | 51 ++++++++++++----------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/tests/content/article_with_md_extension.md b/tests/content/article_with_md_extension.md
index 11aa22a2..1f111796 100644
--- a/tests/content/article_with_md_extension.md
+++ b/tests/content/article_with_md_extension.md
@@ -1,5 +1,8 @@
-title: Test md File
-category: test
+Title: Test md File
+Category: test
+Tags: foo, bar, foobar
+Date: 2010-12-02 10:14
+Summary: I have a lot to test
 
 Test Markdown File Header
 =========================
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 474b1b4b..f7cf71d9 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -115,43 +115,46 @@ class RstReaderTest(unittest.TestCase):
 class MdReaderTest(unittest.TestCase):
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
-    def test_article_with_md_extension(self):
-        # test to ensure the md extension is being processed by the correct reader
+    def test_article_with_metadata(self):
         reader = readers.MarkdownReader({})
-        content, metadata = reader.read(_path('article_with_md_extension.md'))
-        expected = "<h1>Test Markdown File Header</h1>\n"\
-                "<h2>Used for pelican test</h2>\n"\
-                "<p>The quick brown fox jumped over the lazy dog's back.</p>"
-        
-        self.assertEqual(content, expected)
-
+        content, metadata = reader.read(
+            _path('article_with_md_extension.md'))
         expected = {
             'category': 'test',
             'title': 'Test md File',
+            'summary': '<p>I have a lot to test</p>',
+            'date': datetime.datetime(2010, 12, 2, 10, 14),
+            'tags': ['foo', 'bar', 'foobar'],
         }
         for key, value in metadata.items():
             self.assertEquals(value, expected[key], key)
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
-    def test_article_with_mkd_extension(self):
-        # test to ensure the mkd extension is being processed by the correct reader
+    def test_article_with_file_extensions(self):
         reader = readers.MarkdownReader({})
-        content, metadata = reader.read(_path('article_with_mkd_extension.mkd'))
+        # test to ensure the md file extension is being processed by the
+        # correct reader
+        content, metadata = reader.read(
+            _path('article_with_md_extension.md'))
         expected = "<h1>Test Markdown File Header</h1>\n"\
                 "<h2>Used for pelican test</h2>\n"\
-                "<p>This is another markdown test file.  Uses the mkd extension.</p>"
-        
+                "<p>The quick brown fox jumped over the lazy dog's back.</p>"
         self.assertEqual(content, expected)
-
-    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
-    def test_article_with_mkd_extension(self):
-        # test to ensure the markdown extension is being processed by the correct reader
-        reader = readers.MarkdownReader({})
-        content, metadata = reader.read(_filename('article_with_markdown_extension.markdown'))
-        expected = "<h1>Test Markdown File Header</h1>\n"\
-                "<h2>Used for pelican test</h2>\n"\
-                "<p>This is another markdown test file.  Uses the markdown extension.</p>"
-        
+        # test to ensure the mkd file extension is being processed by the
+        # correct reader
+        content, metadata = reader.read(
+            _path('article_with_mkd_extension.mkd'))
+        expected = "<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"\
+                   " test</h2>\n<p>This is another markdown test file.  Uses"\
+                   " the mkd extension.</p>"
+        self.assertEqual(content, expected)
+        # test to ensure the markdown file extension is being processed by the
+        # correct reader
+        content, metadata = reader.read(
+            _path('article_with_markdown_extension.markdown'))
+        expected = "<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"\
+                   " test</h2>\n<p>This is another markdown test file.  Uses"\
+                   " the markdown extension.</p>"
         self.assertEqual(content, expected)
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")

From 0288bf1f68095e5be48c3ebb065a6b47ffe7e13a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C4=B1dvan=20=C3=96rsvuran?= <flasherdn@gmail.com>
Date: Wed, 19 Dec 2012 16:26:00 +0200
Subject: [PATCH 1115/2864] added IGNORE_FILES setting for autoreload

---
 pelican/__init__.py | 5 +++--
 pelican/settings.py | 3 ++-
 pelican/utils.py    | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 566cb3b0..a4d61b73 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -44,6 +44,7 @@ class Pelican(object):
         self.theme = settings['THEME']
         self.output_path = settings['OUTPUT_PATH']
         self.markup = settings['MARKUP']
+        self.ignore_files = settings['IGNORE_FILES']
         self.delete_outputdir = settings['DELETE_OUTPUT_DIRECTORY']
 
         self.init_path()
@@ -292,8 +293,8 @@ def main():
                     # restriction; all files are recursively checked if they
                     # have changed, no matter what extension the filenames
                     # have.
-                    if files_changed(pelican.path, pelican.markup) or \
-                            files_changed(pelican.theme, ['']):
+                    if files_changed(pelican.path, pelican.markup, pelican.ignore_files) or \
+                            files_changed(pelican.theme, [''], pelican.ignore_files):
                         if not files_found_error:
                             files_found_error = True
                         pelican.run()
diff --git a/pelican/settings.py b/pelican/settings.py
index e4e0501d..8d6c1608 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -80,7 +80,8 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'TYPOGRIFY': False,
                    'SUMMARY_MAX_LENGTH': 50,
                    'PLUGINS': [],
-                   'TEMPLATE_PAGES': {}
+                   'TEMPLATE_PAGES': {},
+                   'IGNORE_FILES': []
                    }
 
 
diff --git a/pelican/utils.py b/pelican/utils.py
index edf5068b..cfbc3c23 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -10,6 +10,7 @@ import traceback
 import logging
 import errno
 import locale
+import fnmatch
 from collections import defaultdict, Hashable
 from functools import partial
 
@@ -406,8 +407,7 @@ def process_translations(content_list):
 
 LAST_MTIME = 0
 
-
-def files_changed(path, extensions):
+def files_changed(path, extensions, ignores=[]):
     """Return True if the files have changed since the last check"""
 
     def file_times(path):
@@ -415,7 +415,8 @@ def files_changed(path, extensions):
         for root, dirs, files in os.walk(path):
             dirs[:] = [x for x in dirs if x[0] != '.']
             for f in files:
-                if any(f.endswith(ext) for ext in extensions):
+                if any(f.endswith(ext) for ext in extensions) \
+                        and not any(fnmatch.fnmatch(f, ignore) for ignore in ignores):
                     yield os.stat(os.path.join(root, f)).st_mtime
 
     global LAST_MTIME

From 5f3a3e4582f84cf4407875dff945a3d42f79b368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20HERVIER?= <khertan@khertan.net>
Date: Thu, 24 Jan 2013 14:10:26 +0100
Subject: [PATCH 1116/2864] Update pelican/contents.py

Put a space in error message to not concatain word 'about' and the missing tag
---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 5bde3c0a..d7d7e558 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -344,6 +344,6 @@ def is_valid_content(content, f):
         content.check_properties()
         return True
     except NameError as e:
-        logger.error("Skipping %s: impossible to find informations about"
+        logger.error("Skipping %s: impossible to find informations about "
                       "'%s'" % (f, e))
         return False

From 357f3a3da211cffeda1501e1c8fb54dc069694f6 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Thu, 21 Jun 2012 09:05:27 -0400
Subject: [PATCH 1117/2864] properly write out charref's

---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 6fe8e894..de3df66f 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -235,7 +235,7 @@ class HTMLReader(Reader):
             self._data_buffer += '&{};'.format(data)
 
         def handle_charref(self, data):
-            self._data_buffer += '&{};'.format(data)
+            self._data_buffer += '&#{};'.format(data)
             
         def build_tag(self, tag, attrs, close_tag):
             result = '<{}'.format(cgi.escape(tag))

From 5f639b9a3b79213d5fd631216888af71990723c2 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Mon, 28 Jan 2013 21:46:54 -0500
Subject: [PATCH 1118/2864] git rebase master

---
 pelican/readers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index de3df66f..60fabe82 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -257,8 +257,8 @@ class HTMLReader(Reader):
             return next((x[1] for x in attrs if x[0] == name), default)
 
     def read(self, filename):
-        """Parse content and metadata of markdown files"""
-        with pelican_open(filename) as content:
+        """Parse content and metadata of HTML files"""
+        with open(filename) as content:
             parser = self._HTMLParser(self.settings)
             parser.feed(content)
             parser.close()

From bf6f16e3839be680296c8325922606410bb86d8a Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Mon, 9 Jul 2012 22:43:51 -0400
Subject: [PATCH 1119/2864] add documentation for html reader

---
 docs/getting_started.rst | 36 ++++++++++++++++++++++++++++++++++++
 docs/internals.rst       |  4 ++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 0952c7d9..7592a5ef 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -190,6 +190,42 @@ syntax for Markdown posts should follow this pattern::
 
     This is the content of my super blog post.
 
+Lastly, you can use Vanilla HTML (files ending in ``.htm`` and ``.html``). Pelican 
+interprets the HTML in a very straightforward manner, reading meta data out
+of ``meta`` tags, the title out of the ``title`` tag, and the body out of the 
+``body`` tag::
+
+    <html>
+        <head>
+            <title>My super title</title>
+            <meta name="tags" contents="thats, awesome" />
+            <meta name="date" contents="2012-07-09 22:28" />
+            <meta name="category" contents="yeah" />
+            <meta name="author" contents="Alexis Métaireau" />
+        </head>
+        <body>
+            This is the content of my super blog post.
+            <!-- PELICAN_END_SUMMARY -->
+            Content continues down here.
+        </body>
+    </html>
+
+With HTML, there are two simple exceptions to the standard metadata. First, 
+``tags`` can be specified either with the ``tags`` metadata, as is standard in 
+Pelican, or with the ``keywords`` metadata, as is standard in HTML. The two can 
+be used interchangeably. The second note is that summaries are done differently 
+in HTML posts. Either a ``summary`` metadata tag can be supplied, or, as seen 
+above, you can place an HTML comment, ``<!-- PELICAN_END_SUMMARY -->``, that 
+Pelican will recognize. Everything before the comment will be treated as a 
+summary. The content of the post will contain everything in the body tag, with 
+the special comment stripped out.
+
+Note that, aside from the title, none of this metadata is mandatory: if the date
+is not specified, Pelican will rely on the file's "mtime" timestamp, and the
+category can be determined by the directory in which the file resides. For
+example, a file located at ``python/foobar/myfoobar.rst`` will have a category of
+``foobar``.
+
 Note that, aside from the title, none of this metadata is mandatory: if the
 date is not specified, Pelican can rely on the file's "mtime" timestamp through
 the ``DEFAULT_DATE`` setting, and the category can be determined by the
diff --git a/docs/internals.rst b/docs/internals.rst
index cadd300b..704122ba 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -23,8 +23,8 @@ The logic is separated into different classes and concepts:
   on. Since those operations are commonly used, the object is created once and
   then passed to the generators.
 
-* **Readers** are used to read from various formats (AsciiDoc, Markdown and
-  reStructuredText for now, but the system is extensible). Given a file, they
+* **Readers** are used to read from various formats (AsciiDoc, HTML, Markdown and
+  reStructuredText for now, but the system is extensible). Given a file, they 
   return metadata (author, tags, category, etc.) and content (HTML-formatted).
 
 * **Generators** generate the different outputs. For instance, Pelican comes with

From e6a4fe3fc40f003ad9ecba183f12a2fdc6a5adeb Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Mon, 9 Jul 2012 22:45:34 -0400
Subject: [PATCH 1120/2864] fix grammar

---
 docs/getting_started.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 7592a5ef..c7f2e257 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -190,7 +190,7 @@ syntax for Markdown posts should follow this pattern::
 
     This is the content of my super blog post.
 
-Lastly, you can use Vanilla HTML (files ending in ``.htm`` and ``.html``). Pelican 
+Lastly, you can use vanilla HTML (files ending in ``.htm`` and ``.html``). Pelican 
 interprets the HTML in a very straightforward manner, reading meta data out
 of ``meta`` tags, the title out of the ``title`` tag, and the body out of the 
 ``body`` tag::

From 7b59b34a73560b3eeb6c737a5e8ce2e5b9c4c36b Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Mon, 28 Jan 2013 22:11:06 -0500
Subject: [PATCH 1121/2864] get tests passing

---
 pelican/readers.py                       | 10 ++++-----
 tests/content/article_with_comments.html |  7 ++++---
 tests/content/article_with_metadata.html |  2 +-
 tests/test_readers.py                    | 26 +++++++-----------------
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 60fabe82..9b8be192 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -223,10 +223,10 @@ class HTMLReader(Reader):
                 self._data_buffer += self.build_tag(tag, attrs, True)
 
         def handle_comment(self, data):
-            if self._in_body and data.strip() == 'PELICAN_END_SUMMARY':
-                self.metadata['summary'] = self._data_buffer
-            else:
-                self._data_buffer += '<!--{}-->'.format(data)
+        #    if self._in_body and data.strip() == 'PELICAN_END_SUMMARY':
+        #        self.metadata['summary'] = self._data_buffer
+        #    else:
+            self._data_buffer += '<!--{}-->'.format(data)
 
         def handle_data(self, data):
             self._data_buffer += data
@@ -258,7 +258,7 @@ class HTMLReader(Reader):
 
     def read(self, filename):
         """Parse content and metadata of HTML files"""
-        with open(filename) as content:
+        with pelican_open(filename) as content:
             parser = self._HTMLParser(self.settings)
             parser.feed(content)
             parser.close()
diff --git a/tests/content/article_with_comments.html b/tests/content/article_with_comments.html
index f222682d..289e4a66 100644
--- a/tests/content/article_with_comments.html
+++ b/tests/content/article_with_comments.html
@@ -1,7 +1,8 @@
 <html>
+    <head>
+    </head>
     <body>
-        Summary comment is not included.
-        <!-- PELICAN_END_SUMMARY -->
-        <!--  But this comment is (including extra whitespace)    -->
+        Body content
+        <!--  This comment is included (including extra whitespace)   -->
     </body>
 </html>
diff --git a/tests/content/article_with_metadata.html b/tests/content/article_with_metadata.html
index 2bd77241..b108ac8a 100644
--- a/tests/content/article_with_metadata.html
+++ b/tests/content/article_with_metadata.html
@@ -5,11 +5,11 @@
         <meta name="date" contents="2010-12-02 10:14" />
         <meta name="category" contents="yeah" />
         <meta name="author" contents="Alexis Métaireau" />
+        <meta name="summary" contents="Summary and stuff" />
         <meta name="custom_field" contents="http://notmyidea.org" />
     </head>
     <body>
         Multi-line metadata should be supported
         as well as <strong>inline markup</strong>.
-        <!-- PELICAN_END_SUMMARY -->
     </body>
 </html>
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 8cee4c1a..49130669 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -264,25 +264,16 @@ class AdReaderTest(unittest.TestCase):
 class HTMLReaderTest(unittest.TestCase):
     def test_article_with_comments(self):
         reader = readers.HTMLReader({})
-        content, metadata = reader.read(_filename('article_with_comments.html'))
-        expected = {
-            'summary': '''
-        Summary comment is not included.
-        ''',
-        }
-
-        for key, value in expected.items():
-            self.assertEquals(value, metadata[key], key)
+        content, metadata = reader.read(_path('article_with_comments.html'))
 
         self.assertEquals('''
-        Summary comment is not included.
-        
-        <!--  But this comment is (including extra whitespace)    -->
+        Body content
+        <!--  This comment is included (including extra whitespace)   -->
     ''', content)
 
     def test_article_with_keywords(self):
         reader = readers.HTMLReader({})
-        content, metadata = reader.read(_filename('article_with_keywords.html'))
+        content, metadata = reader.read(_path('article_with_keywords.html'))
         expected = {
             'tags': ['foo', 'bar', 'foobar'],
         }
@@ -292,15 +283,12 @@ class HTMLReaderTest(unittest.TestCase):
 
     def test_article_with_metadata(self):
         reader = readers.HTMLReader({})
-        content, metadata = reader.read(_filename('article_with_metadata.html'))
+        content, metadata = reader.read(_path('article_with_metadata.html'))
         expected = {
             'category': 'yeah',
             'author': u'Alexis Métaireau',
             'title': 'This is a super article !',
-            'summary': u'''
-        Multi-line metadata should be supported
-        as well as <strong>inline markup</strong>.
-        ''',
+            'summary': u'''Summary and stuff''',
             'date': datetime.datetime(2010, 12, 2, 10, 14),
             'tags': ['foo', 'bar', 'foobar'],
             'custom_field': 'http://notmyidea.org',
@@ -313,6 +301,6 @@ class HTMLReaderTest(unittest.TestCase):
     def test_article_metadata_key_lowercase(self):
         """Keys of metadata should be lowercase."""
         reader = readers.HTMLReader({})
-        content, metadata = reader.read(_filename('article_with_uppercase_metadata.html'))
+        content, metadata = reader.read(_path('article_with_uppercase_metadata.html'))
         self.assertIn('category', metadata, "Key should be lowercase.")
         self.assertEquals('Yeah', metadata.get('category'), "Value keeps cases.")

From 2a3d7d031949e0b3ae693b8867350d3e40bb7f13 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Mon, 28 Jan 2013 22:21:45 -0500
Subject: [PATCH 1122/2864] fix python3 support

---
 pelican/readers.py    | 5 ++++-
 tests/test_readers.py | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 9b8be192..8667a299 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -26,7 +26,10 @@ except ImportError:
 import re
 
 import cgi
-from HTMLParser import HTMLParser
+try:
+    from html.parser import HTMLParser
+except ImportError:
+    from HTMLParser import HTMLParser
 
 from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, pelican_open
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 49130669..39bc2067 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -286,9 +286,9 @@ class HTMLReaderTest(unittest.TestCase):
         content, metadata = reader.read(_path('article_with_metadata.html'))
         expected = {
             'category': 'yeah',
-            'author': u'Alexis Métaireau',
+            'author': 'Alexis Métaireau',
             'title': 'This is a super article !',
-            'summary': u'''Summary and stuff''',
+            'summary': 'Summary and stuff',
             'date': datetime.datetime(2010, 12, 2, 10, 14),
             'tags': ['foo', 'bar', 'foobar'],
             'custom_field': 'http://notmyidea.org',

From d5bfec3a8b7ee4eef9f7359b93a8ce86cf2d701a Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Mon, 28 Jan 2013 22:25:15 -0500
Subject: [PATCH 1123/2864] update documentation and remove commented out code

---
 docs/getting_started.rst | 12 +++---------
 pelican/readers.py       |  3 ---
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index c7f2e257..7155efce 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -202,23 +202,17 @@ of ``meta`` tags, the title out of the ``title`` tag, and the body out of the
             <meta name="date" contents="2012-07-09 22:28" />
             <meta name="category" contents="yeah" />
             <meta name="author" contents="Alexis Métaireau" />
+            <meta name="summary" contents="Short version for index and feeds" />
         </head>
         <body>
             This is the content of my super blog post.
-            <!-- PELICAN_END_SUMMARY -->
-            Content continues down here.
         </body>
     </html>
 
-With HTML, there are two simple exceptions to the standard metadata. First, 
+With HTML, there is one simple exception to the standard metadata.
 ``tags`` can be specified either with the ``tags`` metadata, as is standard in 
 Pelican, or with the ``keywords`` metadata, as is standard in HTML. The two can 
-be used interchangeably. The second note is that summaries are done differently 
-in HTML posts. Either a ``summary`` metadata tag can be supplied, or, as seen 
-above, you can place an HTML comment, ``<!-- PELICAN_END_SUMMARY -->``, that 
-Pelican will recognize. Everything before the comment will be treated as a 
-summary. The content of the post will contain everything in the body tag, with 
-the special comment stripped out.
+be used interchangeably.
 
 Note that, aside from the title, none of this metadata is mandatory: if the date
 is not specified, Pelican will rely on the file's "mtime" timestamp, and the
diff --git a/pelican/readers.py b/pelican/readers.py
index 8667a299..ecb49f9c 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -226,9 +226,6 @@ class HTMLReader(Reader):
                 self._data_buffer += self.build_tag(tag, attrs, True)
 
         def handle_comment(self, data):
-        #    if self._in_body and data.strip() == 'PELICAN_END_SUMMARY':
-        #        self.metadata['summary'] = self._data_buffer
-        #    else:
             self._data_buffer += '<!--{}-->'.format(data)
 
         def handle_data(self, data):

From 0285bbcec41e4ff7605e1f3e83f153586733d1c5 Mon Sep 17 00:00:00 2001
From: Igor Kalnitsky <igor@kalnitsky.org>
Date: Fri, 8 Feb 2013 01:47:20 +0200
Subject: [PATCH 1124/2864] Fix bug with docutils' code directive.

Since version 0.9 `docutils` supports `code` directive. But this directive
can generate fullname classes for the `pygments` style classes.

For example, the following code

```reStructuredText
.. code:: c++

    GetFoo()->do_something();
```

generate the following output

```html
<pre class="code c++ literal-block">
  <span class="name">GetFoo</span>
  <span class="punctuation">()</span>
  <span class="operator">-&gt;</span>
  <span class="name">do_something</span>
  <span class="punctuation">();</span>
</pre>
```

Note, that fullname classes were used, when we need a short one

```html
<pre class="code c++ literal-block">
  <span class="n">GetFoo</span>
  <span class="p">()</span>
  <span class="o">-&gt;</span>
  <span class="n">do_something</span>
  <span class="p">();</span>
</pre>
```
---
 pelican/readers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 440bbdf8..f53f7350 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -110,7 +110,8 @@ class RstReader(Reader):
         return output
 
     def _get_publisher(self, source_path):
-        extra_params = {'initial_header_level': '2'}
+        extra_params = {'initial_header_level': '2',
+                        'syntax_highlight': 'short'}
         pub = docutils.core.Publisher(
             destination_class=docutils.io.StringOutput)
         pub.set_components('standalone', 'restructuredtext', 'html')

From 8ba6a4d19d5d31d7b183332d812236b4b69d8dcd Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Sat, 9 Feb 2013 09:27:45 -0500
Subject: [PATCH 1125/2864] fix documentation

---
 docs/getting_started.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 7155efce..4aeddbfb 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -215,10 +215,10 @@ Pelican, or with the ``keywords`` metadata, as is standard in HTML. The two can
 be used interchangeably.
 
 Note that, aside from the title, none of this metadata is mandatory: if the date
-is not specified, Pelican will rely on the file's "mtime" timestamp, and the
-category can be determined by the directory in which the file resides. For
-example, a file located at ``python/foobar/myfoobar.rst`` will have a category of
-``foobar``.
+is not specified and DEFAULT_DATE is None, Pelican will rely on the file's 
+"mtime" timestamp, and the category can be determined by the directory in which 
+the file resides. For example, a file located at ``python/foobar/myfoobar.rst`` 
+will have a category of ``foobar``.
 
 Note that, aside from the title, none of this metadata is mandatory: if the
 date is not specified, Pelican can rely on the file's "mtime" timestamp through

From 5f5b300ba5c2703c015ca5b0db540cb824cf2bd6 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Sat, 9 Feb 2013 09:51:02 -0500
Subject: [PATCH 1126/2864] fix documentation

---
 docs/getting_started.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 4aeddbfb..afea8c01 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -215,7 +215,7 @@ Pelican, or with the ``keywords`` metadata, as is standard in HTML. The two can
 be used interchangeably.
 
 Note that, aside from the title, none of this metadata is mandatory: if the date
-is not specified and DEFAULT_DATE is None, Pelican will rely on the file's 
+is not specified and DEFAULT_DATE is 'fs', Pelican will rely on the file's 
 "mtime" timestamp, and the category can be determined by the directory in which 
 the file resides. For example, a file located at ``python/foobar/myfoobar.rst`` 
 will have a category of ``foobar``.

From 64ce845bae17b6c4fb943dd889e04517821295df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin-Costel=20H=C4=83loiu?= <vially.ichb@gmail.com>
Date: Sun, 10 Feb 2013 00:38:18 +0200
Subject: [PATCH 1127/2864] Fix typo

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index baf9f60c..7280f105 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -40,7 +40,7 @@ Setting name (default value)                                            What doe
 `DEFAULT_CATEGORY` (``'misc'``)                                         The default category to fall back on.
 `DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)                               The default date format you want to use.
 `DISPLAY_PAGES_ON_MENU` (``True``)                                      Whether to display pages on the menu of the
-                                                                        template. Templates may or not honor this
+                                                                        template. Templates may or may not honor this
                                                                         setting.
 `DEFAULT_DATE` (``None``)                                               The default date you want to use.
                                                                         If ``fs``, Pelican will use the file system

From 7ec9ea92aa5e1c7105850e47d41ce92f1e622a9c Mon Sep 17 00:00:00 2001
From: Randall Degges <rdegges@gmail.com>
Date: Sat, 9 Feb 2013 21:29:51 -0800
Subject: [PATCH 1128/2864] Fixing issue #712.

This commit adds documentation to the getting started guide which describes that
articles must contain a manually set 'date' metadata attribute unless the
DEFAULT_DATE setting is specified.

This fixes some incorrect documentation behavior discussed in the ticket.
---
 docs/getting_started.rst | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index afea8c01..7a7eadfb 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -220,16 +220,17 @@ is not specified and DEFAULT_DATE is 'fs', Pelican will rely on the file's
 the file resides. For example, a file located at ``python/foobar/myfoobar.rst`` 
 will have a category of ``foobar``.
 
-Note that, aside from the title, none of this metadata is mandatory: if the
-date is not specified, Pelican can rely on the file's "mtime" timestamp through
-the ``DEFAULT_DATE`` setting, and the category can be determined by the
-directory in which the file resides. For example, a file located at
-``python/foobar/myfoobar.rst`` will have a category of ``foobar``. If you would
-like to organize your files in other ways where the name of the subfolder would
-not be a good category name, you can set the setting ``USE_FOLDER_AS_CATEGORY``
-to ``False``. If there is no summary metadata for a given post, the
-``SUMMARY_MAX_LENGTH`` setting can be used to specify how many words from the
-beginning of an article are used as the summary.
+Note that, aside from the title and date, none of this metadata is mandatory.
+If the date is not specified and you have ``DEFAULT_DATE`` set, Pelican will
+use that instead, making the ``date`` metadata attribute optional. The category
+can be determined by the directory in which the file resides. For example, a
+file located at ``python/foobar/myfoobar.rst`` will have a category of
+``foobar``. If you would like to organize your files in other ways where the
+name of the subfolder would not be a good category name, you can set the
+setting ``USE_FOLDER_AS_CATEGORY`` to ``False``. If there is no summary
+metadata for a given post, the ``SUMMARY_MAX_LENGTH`` setting can be used to
+specify how many words from the beginning of an article are used as the
+summary.
 
 You can also extract any metadata from the filename through a regular
 expression to be set in the ``FILENAME_METADATA`` setting.

From 08439bdcf17d7cb9c43e97bd88656abc7a07f53f Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Sun, 10 Feb 2013 11:02:52 -0500
Subject: [PATCH 1129/2864] fix null attributes in html parser

---
 pelican/readers.py                              |  5 ++++-
 tests/content/article_with_null_attributes.html |  8 ++++++++
 tests/test_readers.py                           | 10 ++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tests/content/article_with_null_attributes.html

diff --git a/pelican/readers.py b/pelican/readers.py
index 46db3c96..a3c4364b 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -240,7 +240,10 @@ class HTMLReader(Reader):
             
         def build_tag(self, tag, attrs, close_tag):
             result = '<{}'.format(cgi.escape(tag))
-            result += ''.join((' {}="{}"'.format(cgi.escape(k), cgi.escape(v)) for k,v in attrs))
+            for k,v in attrs:
+                result += ' ' + cgi.escape(k)
+                if v is not None:
+                    result += '="{}"'.format(cgi.escape(v))
             if close_tag:
                 return result + ' />'
             return result + '>'
diff --git a/tests/content/article_with_null_attributes.html b/tests/content/article_with_null_attributes.html
new file mode 100644
index 00000000..68da704c
--- /dev/null
+++ b/tests/content/article_with_null_attributes.html
@@ -0,0 +1,8 @@
+<html>
+    <head>
+    </head>
+    <body>
+        Ensure that empty attributes are copied properly.
+        <input name="test" disabled style="" />
+    </body>
+</html>
diff --git a/tests/test_readers.py b/tests/test_readers.py
index 39bc2067..be544caa 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -298,9 +298,19 @@ class HTMLReaderTest(unittest.TestCase):
             self.assertEquals(value, metadata[key], key)
 
 
+    def test_article_with_null_attributes(self):
+        reader = readers.HTMLReader({})
+        content, metadata = reader.read(_path('article_with_null_attributes.html'))
+
+        self.assertEquals('''
+        Ensure that empty attributes are copied properly.
+        <input name="test" disabled style="" />
+    ''', content)
+
     def test_article_metadata_key_lowercase(self):
         """Keys of metadata should be lowercase."""
         reader = readers.HTMLReader({})
         content, metadata = reader.read(_path('article_with_uppercase_metadata.html'))
         self.assertIn('category', metadata, "Key should be lowercase.")
         self.assertEquals('Yeah', metadata.get('category'), "Value keeps cases.")
+

From de446447002a623c5f2c8506692ce499bcc3e96f Mon Sep 17 00:00:00 2001
From: Chris Streeter <chris@chrisstreeter.com>
Date: Sun, 10 Feb 2013 12:42:54 -0800
Subject: [PATCH 1130/2864] Add a pages_generator_finalized signal.

I wrote a plugin that I'd like to also be able to run on pages in
addition to articles. Adding this signal will let me update the content
when a page is finished being generated.
---
 docs/plugins.rst      | 1 +
 pelican/generators.py | 2 ++
 pelican/signals.py    | 1 +
 3 files changed, 4 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index c48e1c15..43128176 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -73,6 +73,7 @@ get_generators                  generators                      invoked in Pelic
                                                                 generator in a tuple or in a list.
 pages_generate_context          pages_generator, metadata
 pages_generator_init            pages_generator                 invoked in the PagesGenerator.__init__
+pages_generator_finalized       pages_generator                 invoked at the end of PagesGenerator.generate_context
 =============================   ============================   ===========================================================================
 
 The list is currently small, so don't hesitate to add signals and make a pull
diff --git a/pelican/generators.py b/pelican/generators.py
index dda8c431..14c681f4 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -475,6 +475,8 @@ class PagesGenerator(Generator):
         self._update_context(('pages', ))
         self.context['PAGES'] = self.pages
 
+        signals.pages_generator_finalized.send(self)
+
     def generate_output(self, writer):
         for page in chain(self.translations, self.pages,
                             self.hidden_translations, self.hidden_pages):
diff --git a/pelican/signals.py b/pelican/signals.py
index 1367a117..92bc6249 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -12,4 +12,5 @@ article_generator_finalized = signal('article_generate_finalized')
 get_generators = signal('get_generators')
 pages_generate_context = signal('pages_generate_context')
 pages_generator_init = signal('pages_generator_init')
+pages_generator_finalized = signal('pages_generator_finalized')
 content_object_init = signal('content_object_init')

From 5737534302e724347a625fd988e2790af441e573 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Sun, 10 Feb 2013 20:17:06 -0500
Subject: [PATCH 1131/2864] fix string formatting errors

---
 pelican/utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 9780c119..e8589d55 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -273,7 +273,7 @@ def clean_output_dir(path):
         try:
             os.remove(path)
         except Exception as e:
-            logger.error("Unable to delete file %s; %e" % path, e)
+            logger.error("Unable to delete file %s; %e" % (path, e))
         return
 
     # remove all the existing content from the output folder
@@ -284,13 +284,13 @@ def clean_output_dir(path):
                 shutil.rmtree(file)
                 logger.debug("Deleted directory %s" % file)
             except Exception as e:
-                logger.error("Unable to delete directory %s; %e" % file, e)
+                logger.error("Unable to delete directory %s; %e" % (file, e))
         elif os.path.isfile(file) or os.path.islink(file):
             try:
                 os.remove(file)
                 logger.debug("Deleted file/link %s" % file)
             except Exception as e:
-                logger.error("Unable to delete file %s; %e" % file, e)
+                logger.error("Unable to delete file %s; %e" % (file, e))
         else:
             logger.error("Unable to delete %s, file type unknown" % file)
 

From 21ad904abc7ced352d76c8d34005ef9c43dd0251 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Sun, 10 Feb 2013 20:21:28 -0500
Subject: [PATCH 1132/2864] format exceptions as strings

---
 pelican/utils.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index e8589d55..72ff868a 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -273,7 +273,7 @@ def clean_output_dir(path):
         try:
             os.remove(path)
         except Exception as e:
-            logger.error("Unable to delete file %s; %e" % (path, e))
+            logger.error("Unable to delete file %s; %s" % (path, str(e)))
         return
 
     # remove all the existing content from the output folder
@@ -284,13 +284,14 @@ def clean_output_dir(path):
                 shutil.rmtree(file)
                 logger.debug("Deleted directory %s" % file)
             except Exception as e:
-                logger.error("Unable to delete directory %s; %e" % (file, e))
+                logger.error("Unable to delete directory %s; %s" % (
+                        file, str(e)))
         elif os.path.isfile(file) or os.path.islink(file):
             try:
                 os.remove(file)
                 logger.debug("Deleted file/link %s" % file)
             except Exception as e:
-                logger.error("Unable to delete file %s; %e" % (file, e))
+                logger.error("Unable to delete file %s; %s" % (file, str(e)))
         else:
             logger.error("Unable to delete %s, file type unknown" % file)
 

From 3f4406dd6b7a2183f17af85e05360f444ad2f46a Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Sat, 9 Feb 2013 19:43:32 -0500
Subject: [PATCH 1133/2864] support inline summary specification

update documentation

change summary cutoff to a plugin

remove backup file

fix 3.2 tests

update summary plugin initialization and documentation

update documentation

fix documentation formatting
---
 docs/getting_started.rst   | 19 +++++------
 docs/plugins.rst           | 32 +++++++++++++++++++
 pelican/contents.py        | 10 +++---
 pelican/plugins/summary.py | 62 ++++++++++++++++++++++++++++++++++++
 tests/test_plugins.py      | 64 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 170 insertions(+), 17 deletions(-)
 create mode 100644 pelican/plugins/summary.py

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 7a7eadfb..8338d608 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -218,19 +218,14 @@ Note that, aside from the title, none of this metadata is mandatory: if the date
 is not specified and DEFAULT_DATE is 'fs', Pelican will rely on the file's 
 "mtime" timestamp, and the category can be determined by the directory in which 
 the file resides. For example, a file located at ``python/foobar/myfoobar.rst`` 
-will have a category of ``foobar``.
+will have a category of ``foobar``. If you would like to organize your files in 
+other ways where the name of the subfolder would not be a good category name, 
+you can set the setting ``USE_FOLDER_AS_CATEGORY`` to ``False``.
 
-Note that, aside from the title and date, none of this metadata is mandatory.
-If the date is not specified and you have ``DEFAULT_DATE`` set, Pelican will
-use that instead, making the ``date`` metadata attribute optional. The category
-can be determined by the directory in which the file resides. For example, a
-file located at ``python/foobar/myfoobar.rst`` will have a category of
-``foobar``. If you would like to organize your files in other ways where the
-name of the subfolder would not be a good category name, you can set the
-setting ``USE_FOLDER_AS_CATEGORY`` to ``False``. If there is no summary
-metadata for a given post, the ``SUMMARY_MAX_LENGTH`` setting can be used to
-specify how many words from the beginning of an article are used as the
-summary.
+If there is no summary metadata for a given post, the ``SUMMARY_MAX_LENGTH`` 
+setting can be used to specify how many words from the beginning of an article 
+are used as the summary. Summaries can also be specified inline with the body 
+using the :ref:`Summary Plugin <plugin-summary>`.
 
 You can also extract any metadata from the filename through a regular
 expression to be set in the ``FILENAME_METADATA`` setting.
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 43128176..77b114cf 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -111,6 +111,7 @@ The following plugins are currently included with Pelican:
 * `HTML tags for reStructuredText`_ ``pelican.plugins.html_rst_directive``
 * `Related posts`_ ``pelican.plugins.related_posts``
 * `Sitemap`_ ``pelican.plugins.sitemap``
+* `Summary`_ ``pelican.plugins.summary``
 
 Ideas for plugins that haven't been written yet:
 
@@ -371,3 +372,34 @@ Here is an example configuration (it's also the default settings):
             'pages': 'monthly'
         }
     }
+
+.. _plugin-summary:
+
+Summary
+-------------
+
+This plugin allows easy, variable length summaries directly embedded into the 
+body of your articles. It introduces two new settings: ``SUMMARY_BEGIN_MARKER``
+and ``SUMMARY_END_MARKER``: strings which can be placed directly into an article
+to mark the beginning and end of a summary. When found, the standard 
+``SUMMARY_MAX_LENGTH`` setting will be ignored. The markers themselves will also
+be removed from your articles before they are published. The default values
+are ``<!-- PELICAN_BEGIN_SUMMARY -->`` and ``<!-- PELICAN_END_SUMMARY -->``.
+For example::
+
+    Title: My super title
+    Date: 2010-12-03 10:20
+    Tags: thats, awesome
+    Category: yeah
+    Slug: my-super-post
+    Author: Alexis Metaireau
+    
+    This is the content of my super blog post.
+    <!-- PELICAN_END_SUMMARY -->
+    and this content occurs after the summary.
+
+Here, the summary is taken to be the first line of the post. Because no
+beginning marker was found, it starts at the top of the body. It is possible
+to leave out the end marker instead, in which case the summary will start at the
+beginning marker and continue to the end of the body.
+
diff --git a/pelican/contents.py b/pelican/contents.py
index d7d7e558..8a9be817 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -201,11 +201,11 @@ class Page(object):
         if it is set, else truncate the content."""
         if hasattr(self, '_summary'):
             return self._summary
-        else:
-            if self.settings['SUMMARY_MAX_LENGTH']:
-                return truncate_html_words(self.content,
-                        self.settings['SUMMARY_MAX_LENGTH'])
-            return self.content
+
+        if self.settings['SUMMARY_MAX_LENGTH']:
+            return truncate_html_words(self.content,
+                    self.settings['SUMMARY_MAX_LENGTH'])
+        return self.content
 
     def _set_summary(self, summary):
         """Dummy function"""
diff --git a/pelican/plugins/summary.py b/pelican/plugins/summary.py
new file mode 100644
index 00000000..cd433b7c
--- /dev/null
+++ b/pelican/plugins/summary.py
@@ -0,0 +1,62 @@
+import types
+
+from pelican import signals
+
+def initialized(pelican):
+    from pelican.settings import _DEFAULT_CONFIG
+    _DEFAULT_CONFIG.setdefault('SUMMARY_BEGIN_MARKER',
+                               '<!-- PELICAN_BEGIN_SUMMARY -->')
+    _DEFAULT_CONFIG.setdefault('SUMMARY_END_MARKER',
+                               '<!-- PELICAN_END_SUMMARY -->')
+    if pelican:
+        pelican.settings.setdefault('SUMMARY_BEGIN_MARKER',
+                                    '<!-- PELICAN_BEGIN_SUMMARY -->')
+        pelican.settings.setdefault('SUMMARY_END_MARKER',
+                                    '<!-- PELICAN_END_SUMMARY -->')
+
+def content_object_init(PageClass, instance):
+    # if summary is already specified, use it
+    if 'summary' in instance.metadata:
+        return
+
+    try:
+        content = instance.content
+    except:
+        # in some tests, this fails because a context has not been set
+        return
+
+    # monkey patch a new function around get_content that removes summary
+    # markers
+    prev_get_content = instance.get_content
+    def get_content(self, siteurl):
+        content = prev_get_content(siteurl)
+        self.settings['SUMMARY_BEGIN_MARKER'] = '<!-- PELICAN_BEGIN_SUMMARY -->'
+        self.settings['SUMMARY_END_MARKER'] = '<!-- PELICAN_END_SUMMARY -->'
+        if self.settings['SUMMARY_BEGIN_MARKER']:
+            content = content.replace(
+                self.settings['SUMMARY_BEGIN_MARKER'], '', 1)
+        if self.settings['SUMMARY_END_MARKER']:
+            content = content.replace(
+                self.settings['SUMMARY_END_MARKER'], '', 1)
+        return content
+    instance.get_content = types.MethodType(get_content, instance)
+    
+    # extract out our summary
+    begin_summary = -1
+    end_summary = -1
+    if instance.settings['SUMMARY_BEGIN_MARKER']:
+        begin_summary = content.find(instance.settings['SUMMARY_BEGIN_MARKER'])
+    if instance.settings['SUMMARY_END_MARKER']:
+        end_summary = content.find(instance.settings['SUMMARY_END_MARKER'])
+    if begin_summary != -1 or end_summary != -1:
+        # the beginning position has to take into account the length
+        # of the marker
+        begin_summary = (begin_summary + 
+                         len(instance.settings['SUMMARY_BEGIN_MARKER'])
+                         if begin_summary != -1 else 0)
+        end_summary = end_summary if end_summary != -1 else None
+        instance._summary = content[begin_summary:end_summary]
+
+def register():
+    signals.initialized.connect(initialized)
+    signals.content_object_init.connect(content_object_init)
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index 0a5be921..9d6d43e6 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -4,8 +4,10 @@
 import os
 import tempfile
 
+from pelican.contents import Page
 from pelican.plugins import gzip_cache
 
+from .test_contents import TEST_CONTENT, TEST_SUMMARY
 from .support import unittest, temporary_folder
 
 class TestGzipCache(unittest.TestCase):
@@ -34,3 +36,65 @@ class TestGzipCache(unittest.TestCase):
             gzip_cache.create_gzip_file(a_html_filename)
             self.assertTrue(os.path.exists(a_html_filename + '.gz'))
 
+class TestSummary(unittest.TestCase):
+    def setUp(self):
+        super(TestSummary, self).setUp()
+
+        from pelican.plugins import summary
+
+        summary.register()
+        summary.initialized(None)
+        self.page_kwargs = {
+            'content': TEST_CONTENT,
+            'context': {
+                'localsiteurl': '',
+            },
+            'metadata': {
+                'summary': TEST_SUMMARY,
+                'title': 'foo bar',
+                'author': 'Blogger',
+            },
+        }
+
+    def _copy_page_kwargs(self):
+        # make a deep copy of page_kwargs
+        page_kwargs = dict([(key, self.page_kwargs[key]) for key in
+                            self.page_kwargs])
+        for key in page_kwargs:
+            if not isinstance(page_kwargs[key], dict):
+                break
+            page_kwargs[key] = dict([(subkey, page_kwargs[key][subkey])
+                                     for subkey in page_kwargs[key]])
+
+        return page_kwargs
+
+    def test_end_summary(self):
+        page_kwargs = self._copy_page_kwargs()
+        del page_kwargs['metadata']['summary']
+        page_kwargs['content'] = (
+            TEST_SUMMARY + '<!-- PELICAN_END_SUMMARY -->' + TEST_CONTENT)
+        page = Page(**page_kwargs)
+        # test both the summary and the marker removal
+        self.assertEqual(page.summary, TEST_SUMMARY)
+        self.assertEqual(page.content, TEST_SUMMARY + TEST_CONTENT)
+
+    def test_begin_summary(self):
+        page_kwargs = self._copy_page_kwargs()
+        del page_kwargs['metadata']['summary']
+        page_kwargs['content'] = (
+            'FOOBAR<!-- PELICAN_BEGIN_SUMMARY -->' + TEST_CONTENT)
+        page = Page(**page_kwargs)
+        # test both the summary and the marker removal
+        self.assertEqual(page.summary, TEST_CONTENT)
+        self.assertEqual(page.content, 'FOOBAR' + TEST_CONTENT)
+
+    def test_begin_end_summary(self):
+        page_kwargs = self._copy_page_kwargs()
+        del page_kwargs['metadata']['summary']
+        page_kwargs['content'] = (
+                'FOOBAR<!-- PELICAN_BEGIN_SUMMARY -->' + TEST_SUMMARY + 
+                '<!-- PELICAN_END_SUMMARY -->' + TEST_CONTENT)
+        page = Page(**page_kwargs)
+        # test both the summary and the marker removal
+        self.assertEqual(page.summary, TEST_SUMMARY)
+        self.assertEqual(page.content, 'FOOBAR' + TEST_SUMMARY + TEST_CONTENT)

From c977e0aa25dc3dc2b94c4984fb882d6ca9287f5a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 23 Feb 2013 16:13:46 -0800
Subject: [PATCH 1134/2864] Fix Travis image link target in README

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index b2648bf1..d158cdfa 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@ Pelican
 =======
 
 .. image:: https://secure.travis-ci.org/getpelican/pelican.png?branch=master
-   :target: http://travis-ci.org/#!/getpelican/pelican
+   :target: http://travis-ci.org/getpelican/pelican
    :alt: Travis-ci: continuous integration status.
 
 Pelican is a static site generator, written in Python_.

From ed907b4094c49d5014716bca82a77265bcc49091 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 1 Mar 2013 00:06:05 +0100
Subject: [PATCH 1135/2864] PageClass arg is useless in content_object_init

---
 pelican/contents.py        | 2 +-
 pelican/plugins/summary.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 8a9be817..873e89cd 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -112,7 +112,7 @@ class Page(object):
         if 'summary' in metadata:
             self._summary = metadata['summary']
 
-        signals.content_object_init.send(self.__class__, instance=self)
+        signals.content_object_init.send(self)
 
     def check_properties(self):
         """test that each mandatory property is set."""
diff --git a/pelican/plugins/summary.py b/pelican/plugins/summary.py
index cd433b7c..8b1b3ae3 100644
--- a/pelican/plugins/summary.py
+++ b/pelican/plugins/summary.py
@@ -14,7 +14,7 @@ def initialized(pelican):
         pelican.settings.setdefault('SUMMARY_END_MARKER',
                                     '<!-- PELICAN_END_SUMMARY -->')
 
-def content_object_init(PageClass, instance):
+def content_object_init(instance):
     # if summary is already specified, use it
     if 'summary' in instance.metadata:
         return

From d68d2debf92bbd6528334ef19fb593cac441aab6 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 1 Mar 2013 00:06:52 +0100
Subject: [PATCH 1136/2864] remove hardcoded values for SUMMARY_BEGIN_MARKER
 and SUMMARY_END_MARKER

---
 pelican/plugins/summary.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pelican/plugins/summary.py b/pelican/plugins/summary.py
index 8b1b3ae3..0549ca7d 100644
--- a/pelican/plugins/summary.py
+++ b/pelican/plugins/summary.py
@@ -30,8 +30,6 @@ def content_object_init(instance):
     prev_get_content = instance.get_content
     def get_content(self, siteurl):
         content = prev_get_content(siteurl)
-        self.settings['SUMMARY_BEGIN_MARKER'] = '<!-- PELICAN_BEGIN_SUMMARY -->'
-        self.settings['SUMMARY_END_MARKER'] = '<!-- PELICAN_END_SUMMARY -->'
         if self.settings['SUMMARY_BEGIN_MARKER']:
             content = content.replace(
                 self.settings['SUMMARY_BEGIN_MARKER'], '', 1)

From 03f87057c2110acf3d9f605aa68ddad42eb15ae2 Mon Sep 17 00:00:00 2001
From: Bruno Binet <bruno.binet@gmail.com>
Date: Fri, 1 Mar 2013 01:34:18 +0100
Subject: [PATCH 1137/2864] update summary plugin so that tests are fixed
 (hopefully)

---
 pelican/plugins/summary.py | 47 ++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/pelican/plugins/summary.py b/pelican/plugins/summary.py
index 0549ca7d..b32d59c5 100644
--- a/pelican/plugins/summary.py
+++ b/pelican/plugins/summary.py
@@ -19,17 +19,8 @@ def content_object_init(instance):
     if 'summary' in instance.metadata:
         return
 
-    try:
-        content = instance.content
-    except:
-        # in some tests, this fails because a context has not been set
-        return
-
-    # monkey patch a new function around get_content that removes summary
-    # markers
-    prev_get_content = instance.get_content
-    def get_content(self, siteurl):
-        content = prev_get_content(siteurl)
+    def _get_content(self):
+        content = self._content
         if self.settings['SUMMARY_BEGIN_MARKER']:
             content = content.replace(
                 self.settings['SUMMARY_BEGIN_MARKER'], '', 1)
@@ -37,23 +28,25 @@ def content_object_init(instance):
             content = content.replace(
                 self.settings['SUMMARY_END_MARKER'], '', 1)
         return content
-    instance.get_content = types.MethodType(get_content, instance)
-    
+    instance._get_content = types.MethodType(_get_content, instance)
+
     # extract out our summary
-    begin_summary = -1
-    end_summary = -1
-    if instance.settings['SUMMARY_BEGIN_MARKER']:
-        begin_summary = content.find(instance.settings['SUMMARY_BEGIN_MARKER'])
-    if instance.settings['SUMMARY_END_MARKER']:
-        end_summary = content.find(instance.settings['SUMMARY_END_MARKER'])
-    if begin_summary != -1 or end_summary != -1:
-        # the beginning position has to take into account the length
-        # of the marker
-        begin_summary = (begin_summary + 
-                         len(instance.settings['SUMMARY_BEGIN_MARKER'])
-                         if begin_summary != -1 else 0)
-        end_summary = end_summary if end_summary != -1 else None
-        instance._summary = content[begin_summary:end_summary]
+    if not hasattr(instance, '_summary'):
+        content = instance._content
+        begin_summary = -1
+        end_summary = -1
+        if instance.settings['SUMMARY_BEGIN_MARKER']:
+            begin_summary = content.find(instance.settings['SUMMARY_BEGIN_MARKER'])
+        if instance.settings['SUMMARY_END_MARKER']:
+            end_summary = content.find(instance.settings['SUMMARY_END_MARKER'])
+        if begin_summary != -1 or end_summary != -1:
+            # the beginning position has to take into account the length
+            # of the marker
+            begin_summary = (begin_summary +
+                            len(instance.settings['SUMMARY_BEGIN_MARKER'])
+                            if begin_summary != -1 else 0)
+            end_summary = end_summary if end_summary != -1 else None
+            instance._summary = content[begin_summary:end_summary]
 
 def register():
     signals.initialized.connect(initialized)

From 20662c2a43ca5d214cdf88f0668b27b2c05df7db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 3 Mar 2013 19:44:57 -0800
Subject: [PATCH 1138/2864] flake8-ed the tests

---
 tests/default_conf.py    |  2 +-
 tests/support.py         | 67 +++++++++++++++++--------------------
 tests/test_contents.py   | 56 +++++++++++++------------------
 tests/test_generators.py | 52 +++++++++++++++++------------
 tests/test_importer.py   |  5 +--
 tests/test_plugins.py    | 13 ++++----
 tests/test_readers.py    | 72 +++++++++++++++++++++++-----------------
 tests/test_settings.py   |  5 +--
 tests/test_utils.py      | 18 ++++++----
 tests/test_webassets.py  |  8 ++---
 10 files changed, 155 insertions(+), 143 deletions(-)

diff --git a/tests/default_conf.py b/tests/default_conf.py
index 09548fdd..bc3a7dff 100644
--- a/tests/default_conf.py
+++ b/tests/default_conf.py
@@ -30,7 +30,7 @@ SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
 DEFAULT_METADATA = (('yeah', 'it is'),)
 
 # static paths will be copied under the same name
-STATIC_PATHS = ["pictures",]
+STATIC_PATHS = ["pictures", ]
 
 # A list of files to copy from the source to the destination
 FILES_TO_COPY = (('extra/robots.txt', 'robots.txt'),)
diff --git a/tests/support.py b/tests/support.py
index 209cc665..b81e6eff 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
-__all__ = [
-    'get_article',
-    'unittest',
-]
+__all__ = ['get_article', 'unittest', ]
 
 import os
 import re
@@ -44,19 +41,19 @@ def temporary_folder():
 
 
 def isplit(s, sep=None):
-    """
-        Behave like str.split but returns a generator instead of a list.
+    """Behaves like str.split but returns a generator instead of a list.
 
-        >>> list(isplit('\tUse the force\n')) == '\tUse the force\n'.split()
-        True
-        >>> list(isplit('\tUse the force\n')) == ['Use', 'the', 'force']
-        True
-        >>> list(isplit('\tUse the force\n', "e")) == '\tUse the force\n'.split("e")
-        True
-        >>> list(isplit('Use the force', "e")) == 'Use the force'.split("e")
-        True
-        >>> list(isplit('Use the force', "e")) == ['Us', ' th', ' forc', '']
-        True
+    >>> list(isplit('\tUse the force\n')) == '\tUse the force\n'.split()
+    True
+    >>> list(isplit('\tUse the force\n')) == ['Use', 'the', 'force']
+    True
+    >>> (list(isplit('\tUse the force\n', "e"))
+         == '\tUse the force\n'.split("e"))
+    True
+    >>> list(isplit('Use the force', "e")) == 'Use the force'.split("e")
+    True
+    >>> list(isplit('Use the force', "e")) == ['Us', ' th', ' forc', '']
+    True
 
     """
     sep, hardsep = r'\s+' if sep is None else re.escape(sep), sep is not None
@@ -76,24 +73,23 @@ def isplit(s, sep=None):
 
 
 def mute(returns_output=False):
-    """
-        Decorate a function that prints to stdout, intercepting the output.
-        If "returns_output" is True, the function will return a generator
-        yielding the printed lines instead of the return values.
+    """Decorate a function that prints to stdout, intercepting the output.
+    If "returns_output" is True, the function will return a generator
+    yielding the printed lines instead of the return values.
 
-        The decorator litterally hijack sys.stdout during each function
-        execution, so be careful with what you apply it to.
+    The decorator litterally hijack sys.stdout during each function
+    execution, so be careful with what you apply it to.
 
-        >>> def numbers():
-            print "42"
-            print "1984"
-        ...
-        >>> numbers()
-        42
-        1984
-        >>> mute()(numbers)()
-        >>> list(mute(True)(numbers)())
-        ['42', '1984']
+    >>> def numbers():
+        print "42"
+        print "1984"
+    ...
+    >>> numbers()
+    42
+    1984
+    >>> mute()(numbers)()
+    >>> list(mute(True)(numbers)())
+    ['42', '1984']
 
     """
 
@@ -164,9 +160,7 @@ def get_settings():
 
 
 class LogCountHandler(BufferingHandler):
-    """
-    Capturing and counting logged messages.
-    """
+    """Capturing and counting logged messages."""
 
     def __init__(self, capacity=1000):
         logging.handlers.BufferingHandler.__init__(self, capacity)
@@ -179,8 +173,7 @@ class LogCountHandler(BufferingHandler):
 
 
 class LoggedTestCase(unittest.TestCase):
-    """A test case that captures log messages
-    """
+    """A test case that captures log messages."""
 
     def setUp(self):
         super(LoggedTestCase, self).setUp()
diff --git a/tests/test_contents.py b/tests/test_contents.py
index 9bb77ec3..c837ea03 100644
--- a/tests/test_contents.py
+++ b/tests/test_contents.py
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from datetime import datetime
+from sys import platform
+
 from .support import unittest
 
 from pelican.contents import Page, Article, URLWrapper
@@ -31,10 +34,8 @@ class TestPage(unittest.TestCase):
         }
 
     def test_use_args(self):
-        """Creating a page with arguments passed to the constructor should use
-        them to initialise object's attributes.
-
-        """
+        # Creating a page with arguments passed to the constructor should use
+        # them to initialise object's attributes.
         metadata = {'foo': 'bar', 'foobar': 'baz', 'title': 'foobar', }
         page = Page(TEST_CONTENT, metadata=metadata,
                 context={'localsiteurl': ''})
@@ -44,22 +45,22 @@ class TestPage(unittest.TestCase):
         self.assertEqual(page.content, TEST_CONTENT)
 
     def test_mandatory_properties(self):
-        """If the title is not set, must throw an exception."""
+        # If the title is not set, must throw an exception.
         page = Page('content')
-        with self.assertRaises(NameError) as cm:
+        with self.assertRaises(NameError):
             page.check_properties()
 
         page = Page('content', metadata={'title': 'foobar'})
         page.check_properties()
 
     def test_summary_from_metadata(self):
-        """If a :summary: metadata is given, it should be used."""
+        # If a :summary: metadata is given, it should be used
         page = Page(**self.page_kwargs)
         self.assertEqual(page.summary, TEST_SUMMARY)
 
     def test_summary_max_length(self):
-        """If a :SUMMARY_MAX_LENGTH: is set, and there is no other summary, generated summary
-           should not exceed the given length."""
+        # If a :SUMMARY_MAX_LENGTH: is set, and there is no other summary,
+        # generated summary should not exceed the given length.
         page_kwargs = self._copy_page_kwargs()
         settings = _DEFAULT_CONFIG.copy()
         page_kwargs['settings'] = settings
@@ -72,12 +73,12 @@ class TestPage(unittest.TestCase):
         self.assertEqual(page.summary, truncate_html_words(TEST_CONTENT, 10))
 
     def test_slug(self):
-        """If a title is given, it should be used to generate the slug."""
+        # If a title is given, it should be used to generate the slug.
         page = Page(**self.page_kwargs)
         self.assertEqual(page.slug, 'foo-bar')
 
     def test_defaultlang(self):
-        """If no lang is given, default to the default one."""
+        # If no lang is given, default to the default one.
         page = Page(**self.page_kwargs)
         self.assertEqual(page.lang, _DEFAULT_CONFIG['DEFAULT_LANG'])
 
@@ -87,10 +88,9 @@ class TestPage(unittest.TestCase):
         self.assertEqual(page.lang, 'fr')
 
     def test_save_as(self):
-        """If a lang is not the default lang, save_as should be set
-        accordingly.
+        # If a lang is not the default lang, save_as should be set
+        # accordingly.
 
-        """
         # if a title is defined, save_as should be set
         page = Page(**self.page_kwargs)
         self.assertEqual(page.save_as, "pages/foo-bar.html")
@@ -101,8 +101,7 @@ class TestPage(unittest.TestCase):
         self.assertEqual(page.save_as, "pages/foo-bar-fr.html")
 
     def test_metadata_url_format(self):
-        """Arbitrary metadata should be passed through url_format()
-        """
+        # Arbitrary metadata should be passed through url_format()
         page = Page(**self.page_kwargs)
         self.assertIn('summary', page.url_format.keys())
         page.metadata['directory'] = 'test-dir'
@@ -111,10 +110,7 @@ class TestPage(unittest.TestCase):
         self.assertEqual(page.save_as, 'test-dir/foo-bar')
 
     def test_datetime(self):
-        """If DATETIME is set to a tuple, it should be used to override LOCALE
-        """
-        from datetime import datetime
-        from sys import platform
+        # If DATETIME is set to a tuple, it should be used to override LOCALE
         dt = datetime(2015, 9, 13)
 
         page_kwargs = self._copy_page_kwargs()
@@ -126,7 +122,6 @@ class TestPage(unittest.TestCase):
         self.assertEqual(page.locale_date,
             dt.strftime(_DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']))
 
-
         page_kwargs['settings'] = dict([(x, _DEFAULT_CONFIG[x]) for x in
                                         _DEFAULT_CONFIG])
 
@@ -154,9 +149,7 @@ class TestPage(unittest.TestCase):
             unittest.skip("There is no locale %s in this system." % locale)
 
     def test_template(self):
-        """
-        Pages default to page, metadata overwrites
-        """
+        # Pages default to page, metadata overwrites
         default_page = Page(**self.page_kwargs)
         self.assertEqual('page', default_page.template)
         page_kwargs = self._copy_page_kwargs()
@@ -177,21 +170,19 @@ class TestPage(unittest.TestCase):
         return page_kwargs
 
     def test_signal(self):
-        """If a title is given, it should be used to generate the slug."""
+        # If a title is given, it should be used to generate the slug.
 
-        def receiver_test_function(sender,instance):
+        def receiver_test_function(sender, instance):
             pass
 
-        content_object_init.connect(receiver_test_function ,sender=Page)
-        page = Page(**self.page_kwargs)
+        content_object_init.connect(receiver_test_function, sender=Page)
+        Page(**self.page_kwargs)
         self.assertTrue(content_object_init.has_receivers_for(Page))
 
 
 class TestArticle(TestPage):
     def test_template(self):
-        """
-        Articles default to article, metadata overwrites
-        """
+        # Articles default to article, metadata overwrites
         default_article = Article(**self.page_kwargs)
         self.assertEqual('article', default_article.template)
         article_kwargs = self._copy_page_kwargs()
@@ -202,8 +193,7 @@ class TestArticle(TestPage):
 
 class TestURLWrapper(unittest.TestCase):
     def test_comparisons(self):
-        """URLWrappers are sorted by name
-        """
+        # URLWrappers are sorted by name
         wrapper_a = URLWrapper(name='first', settings={})
         wrapper_b = URLWrapper(name='last', settings={})
         self.assertFalse(wrapper_a > wrapper_b)
diff --git a/tests/test_generators.py b/tests/test_generators.py
index 54fe7e61..7a6e67fb 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -26,7 +26,7 @@ class TestArticlesGenerator(unittest.TestCase):
     def get_populated_generator(self):
         """
         We only need to pull all the test articles once, but read from it
-         for each test.
+        for each test.
         """
         if self.generator is None:
             settings = get_settings()
@@ -58,7 +58,8 @@ class TestArticlesGenerator(unittest.TestCase):
                 settings['THEME'], None, settings['MARKUP'])
         writer = MagicMock()
         generator.generate_feeds(writer)
-        writer.write_feed.assert_called_with([], settings, 'feeds/all.atom.xml')
+        writer.write_feed.assert_called_with([], settings,
+                                             'feeds/all.atom.xml')
 
         generator = ArticlesGenerator(settings, {'FEED_ALL_ATOM': None}, None,
                                       settings['THEME'], None, None)
@@ -72,16 +73,21 @@ class TestArticlesGenerator(unittest.TestCase):
         articles = self.distill_articles(generator.articles)
         articles_expected = [
             ['Article title', 'published', 'Default', 'article'],
-            ['Article with markdown and summary metadata single', 'published', 'Default', 'article'],
-            ['Article with markdown and summary metadata multi', 'published', 'Default', 'article'],
+            ['Article with markdown and summary metadata single', 'published',
+             'Default', 'article'],
+            ['Article with markdown and summary metadata multi', 'published',
+             'Default', 'article'],
             ['Article with template', 'published', 'Default', 'custom'],
             ['Test md File', 'published', 'test', 'article'],
             ['Rst with filename metadata', 'published', 'yeah', 'article'],
             ['Test Markdown extensions', 'published', 'Default', 'article'],
             ['This is a super article !', 'published', 'Yeah', 'article'],
-            ['This is an article with category !', 'published', 'yeah', 'article'],
-            ['This is an article without category !', 'published', 'Default', 'article'],
-            ['This is an article without category !', 'published', 'TestCategory', 'article'],
+            ['This is an article with category !', 'published', 'yeah',
+              'article'],
+            ['This is an article without category !', 'published', 'Default',
+             'article'],
+            ['This is an article without category !', 'published',
+             'TestCategory', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article']
         ]
         self.assertItemsEqual(articles_expected, articles)
@@ -90,7 +96,8 @@ class TestArticlesGenerator(unittest.TestCase):
 
         generator = self.get_populated_generator()
         categories = [cat.name for cat, _ in generator.categories]
-        categories_expected = ['Default', 'TestCategory', 'Yeah', 'test', 'yeah']
+        categories_expected = ['Default', 'TestCategory', 'Yeah', 'test',
+                               'yeah']
         self.assertEquals(categories, categories_expected)
 
     def test_do_not_use_folder_as_category(self):
@@ -153,23 +160,24 @@ class TestArticlesGenerator(unittest.TestCase):
         """
         generator = self.get_populated_generator()
         articles = self.distill_articles(generator.articles)
-        custom_template = ['Article with template', 'published', 'Default', 'custom']
-        standard_template = ['This is a super article !', 'published', 'Yeah', 'article']
+        custom_template = ['Article with template', 'published', 'Default',
+                           'custom']
+        standard_template = ['This is a super article !', 'published', 'Yeah',
+                             'article']
         self.assertIn(custom_template, articles)
         self.assertIn(standard_template, articles)
 
+
 class TestPageGenerator(unittest.TestCase):
-    """
-    Every time you want to test for a new field;
-    Make sure the test pages in "TestPages" have all the fields
-    Add it to distilled in distill_pages
-    Then update the assertItemsEqual in test_generate_context to match expected
-    """
+    # Note: Every time you want to test for a new field; Make sure the test
+    # pages in "TestPages" have all the fields Add it to distilled in
+    # distill_pages Then update the assertItemsEqual in test_generate_context
+    # to match expected
 
     def distill_pages(self, pages):
         distilled = []
         for page in pages:
-           distilled.append([
+            distilled.append([
                     page.title,
                     page.status,
                     page.template
@@ -192,16 +200,18 @@ class TestPageGenerator(unittest.TestCase):
         pages_expected = [
             ['This is a test page', 'published', 'page'],
             ['This is a markdown test page', 'published', 'page'],
-            ['This is a test page with a preset template', 'published', 'custom']
+            ['This is a test page with a preset template', 'published',
+             'custom']
         ]
         hidden_pages_expected = [
             ['This is a test hidden page', 'hidden', 'page'],
             ['This is a markdown test hidden page', 'hidden', 'page'],
-            ['This is a test hidden page with a custom template', 'hidden', 'custom']
+            ['This is a test hidden page with a custom template', 'hidden',
+             'custom']
         ]
 
-        self.assertItemsEqual(pages_expected,pages)
-        self.assertItemsEqual(hidden_pages_expected,hidden_pages)
+        self.assertItemsEqual(pages_expected, pages)
+        self.assertItemsEqual(hidden_pages_expected, hidden_pages)
 
 
 class TestTemplatePagesGenerator(unittest.TestCase):
diff --git a/tests/test_importer.py b/tests/test_importer.py
index a79cd493..38177918 100644
--- a/tests/test_importer.py
+++ b/tests/test_importer.py
@@ -53,8 +53,9 @@ class TestWordpressXmlImporter(unittest.TestCase):
         posts = list(self.posts)
         test_posts = [post for post in posts if post[2] == 'html-entity-test']
         self.assertTrue(len(test_posts) == 1)
-        
+
         post = test_posts[0]
         title = post[0]
-        self.assertTrue(title, "A normal post with some <html> entities in the title. You can't miss them.")
+        self.assertTrue(title, "A normal post with some <html> entities in the"
+                               " title. You can't miss them.")
         self.assertTrue('&' not in title)
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index 9d6d43e6..f5da4ab1 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -10,11 +10,11 @@ from pelican.plugins import gzip_cache
 from .test_contents import TEST_CONTENT, TEST_SUMMARY
 from .support import unittest, temporary_folder
 
+
 class TestGzipCache(unittest.TestCase):
-    '''Unit tests for the gzip cache plugin'''
 
     def test_should_compress(self):
-        '''Test that some filetypes should compress and others shouldn't.'''
+        # Some filetypes should compress and others shouldn't.
         self.assertTrue(gzip_cache.should_compress('foo.html'))
         self.assertTrue(gzip_cache.should_compress('bar.css'))
         self.assertTrue(gzip_cache.should_compress('baz.js'))
@@ -26,16 +26,17 @@ class TestGzipCache(unittest.TestCase):
         self.assertFalse(gzip_cache.should_compress('foo.mov'))
 
     def test_creates_gzip_file(self):
-        '''Test that a file matching the input filename with a .gz extension is
-        created.'''
+        # A file matching the input filename with a .gz extension is created.
+
         # The plugin walks over the output content after the finalized signal
         # so it is safe to assume that the file exists (otherwise walk would
         # not report it). Therefore, create a dummy file to use.
         with temporary_folder() as tempdir:
-            (_, a_html_filename) = tempfile.mkstemp(suffix='.html', dir=tempdir)
+            _, a_html_filename = tempfile.mkstemp(suffix='.html', dir=tempdir)
             gzip_cache.create_gzip_file(a_html_filename)
             self.assertTrue(os.path.exists(a_html_filename + '.gz'))
 
+
 class TestSummary(unittest.TestCase):
     def setUp(self):
         super(TestSummary, self).setUp()
@@ -92,7 +93,7 @@ class TestSummary(unittest.TestCase):
         page_kwargs = self._copy_page_kwargs()
         del page_kwargs['metadata']['summary']
         page_kwargs['content'] = (
-                'FOOBAR<!-- PELICAN_BEGIN_SUMMARY -->' + TEST_SUMMARY + 
+                'FOOBAR<!-- PELICAN_BEGIN_SUMMARY -->' + TEST_SUMMARY +
                 '<!-- PELICAN_END_SUMMARY -->' + TEST_CONTENT)
         page = Page(**page_kwargs)
         # test both the summary and the marker removal
diff --git a/tests/test_readers.py b/tests/test_readers.py
index be544caa..5e9e82b7 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -24,8 +24,8 @@ class RstReaderTest(unittest.TestCase):
             'category': 'yeah',
             'author': 'Alexis Métaireau',
             'title': 'This is a super article !',
-            'summary': '<p class="first last">Multi-line metadata should be'\
-                       ' supported\nas well as <strong>inline'\
+            'summary': '<p class="first last">Multi-line metadata should be'
+                       ' supported\nas well as <strong>inline'
                        ' markup</strong>.</p>\n',
             'date': datetime.datetime(2010, 12, 2, 10, 14),
             'tags': ['foo', 'bar', 'foobar'],
@@ -64,8 +64,8 @@ class RstReaderTest(unittest.TestCase):
         content, metadata = readers.read_file(
                 _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
                 settings={
-                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2})_' \
-                                         '_(?P<Slug>.*)' \
+                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2})_'
+                                         '_(?P<Slug>.*)'
                                          '#(?P<MyMeta>.*)-(?P<author>.*)'
                     })
         expected = {
@@ -82,19 +82,21 @@ class RstReaderTest(unittest.TestCase):
     def test_article_metadata_key_lowercase(self):
         """Keys of metadata should be lowercase."""
         reader = readers.RstReader({})
-        content, metadata = reader.read(_path('article_with_uppercase_metadata.rst'))
+        content, metadata = reader.read(
+                _path('article_with_uppercase_metadata.rst'))
 
-        self.assertIn('category', metadata, "Key should be lowercase.")
-        self.assertEquals('Yeah', metadata.get('category'), "Value keeps cases.")
+        self.assertIn('category', metadata, 'Key should be lowercase.')
+        self.assertEquals('Yeah', metadata.get('category'),
+                          'Value keeps case.')
 
     def test_typogrify(self):
         # if nothing is specified in the settings, the content should be
         # unmodified
         content, _ = readers.read_file(_path('article.rst'))
-        expected = "<p>This is some content. With some stuff to "\
-                   "&quot;typogrify&quot;.</p>\n<p>Now with added "\
-                   'support for <abbr title="three letter acronym">'\
-                   'TLA</abbr>.</p>\n'
+        expected = ('<p>This is some content. With some stuff to '
+                   '&quot;typogrify&quot;.</p>\n<p>Now with added '
+                   'support for <abbr title="three letter acronym">'
+                   'TLA</abbr>.</p>\n')
 
         self.assertEqual(content, expected)
 
@@ -102,10 +104,10 @@ class RstReaderTest(unittest.TestCase):
             # otherwise, typogrify should be applied
             content, _ = readers.read_file(_path('article.rst'),
                                            settings={'TYPOGRIFY': True})
-            expected = "<p>This is some content. With some stuff to&nbsp;"\
-                       "&#8220;typogrify&#8221;.</p>\n<p>Now with added "\
-                       'support for <abbr title="three letter acronym">'\
-                       '<span class="caps">TLA</span></abbr>.</p>\n'
+            expected = ('<p>This is some content. With some stuff to&nbsp;'
+                        '&#8220;typogrify&#8221;.</p>\n<p>Now with added '
+                        'support for <abbr title="three letter acronym">'
+                        '<span class="caps">TLA</span></abbr>.</p>\n')
 
             self.assertEqual(content, expected)
         except ImportError:
@@ -159,7 +161,8 @@ class MdReaderTest(unittest.TestCase):
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_markdown_markup_extension(self):
-        # test to ensure the markdown markup extension is being processed as expected
+        # test to ensure the markdown markup extension is being processed as
+        # expected
         content, metadata = readers.read_file(
                 _path('article_with_markdown_markup_extensions.md'),
                 settings={'MD_EXTENSIONS': ['toc', 'codehilite', 'extra']})
@@ -218,15 +221,19 @@ class MdReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEquals(value, metadata[key], key)
 
+
 class AdReaderTest(unittest.TestCase):
 
     @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
     def test_article_with_asc_extension(self):
-        # test to ensure the asc extension is being processed by the correct reader
+        # Ensure the asc extension is being processed by the correct reader
         reader = readers.AsciiDocReader({})
-        content, metadata = reader.read(_path('article_with_asc_extension.asc'))
-        expected = '<hr>\n<h2><a name="_used_for_pelican_test"></a>Used for pelican test</h2>\n'\
-                   '<p>The quick brown fox jumped over the lazy dog&#8217;s back.</p>\n'
+        content, metadata = reader.read(
+                                _path('article_with_asc_extension.asc'))
+        expected = ('<hr>\n<h2><a name="_used_for_pelican_test">'
+                   '</a>Used for pelican test</h2>\n'
+                   '<p>The quick brown fox jumped over'
+                   ' the lazy dog&#8217;s back.</p>\n')
         self.assertEqual(content, expected)
         expected = {
             'category': 'Blog',
@@ -239,7 +246,6 @@ class AdReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEquals(value, metadata[key], key)
 
-
         expected = {
             'category': 'Blog',
             'author': 'Author O. Article',
@@ -254,13 +260,16 @@ class AdReaderTest(unittest.TestCase):
     @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
     def test_article_with_asc_options(self):
         # test to ensure the ASCIIDOC_OPTIONS is being used
-        reader = readers.AsciiDocReader(dict(ASCIIDOC_OPTIONS=["-a revision=1.0.42"]))
+        reader = readers.AsciiDocReader(
+                dict(ASCIIDOC_OPTIONS=["-a revision=1.0.42"]))
         content, metadata = reader.read(_path('article_with_asc_options.asc'))
-        expected = '<hr>\n<h2><a name="_used_for_pelican_test"></a>Used for pelican test</h2>\n'\
-                   '<p>version 1.0.42</p>\n'\
-                   '<p>The quick brown fox jumped over the lazy dog&#8217;s back.</p>\n'
+        expected = ('<hr>\n<h2><a name="_used_for_pelican_test"></a>Used for'
+                    ' pelican test</h2>\n<p>version 1.0.42</p>\n'
+                    '<p>The quick brown fox jumped over the lazy'
+                    ' dog&#8217;s back.</p>\n')
         self.assertEqual(content, expected)
 
+
 class HTMLReaderTest(unittest.TestCase):
     def test_article_with_comments(self):
         reader = readers.HTMLReader({})
@@ -297,10 +306,10 @@ class HTMLReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEquals(value, metadata[key], key)
 
-
     def test_article_with_null_attributes(self):
         reader = readers.HTMLReader({})
-        content, metadata = reader.read(_path('article_with_null_attributes.html'))
+        content, metadata = reader.read(
+                _path('article_with_null_attributes.html'))
 
         self.assertEquals('''
         Ensure that empty attributes are copied properly.
@@ -310,7 +319,8 @@ class HTMLReaderTest(unittest.TestCase):
     def test_article_metadata_key_lowercase(self):
         """Keys of metadata should be lowercase."""
         reader = readers.HTMLReader({})
-        content, metadata = reader.read(_path('article_with_uppercase_metadata.html'))
-        self.assertIn('category', metadata, "Key should be lowercase.")
-        self.assertEquals('Yeah', metadata.get('category'), "Value keeps cases.")
-
+        content, metadata = reader.read(
+                _path('article_with_uppercase_metadata.html'))
+        self.assertIn('category', metadata, 'Key should be lowercase.')
+        self.assertEquals('Yeah', metadata.get('category'),
+                          'Value keeps cases.')
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 0e610c55..2f2b6dc6 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -3,7 +3,8 @@ from __future__ import unicode_literals, print_function
 import copy
 from os.path import dirname, abspath, join
 
-from pelican.settings import read_settings, configure_settings, _DEFAULT_CONFIG, DEFAULT_THEME
+from pelican.settings import (read_settings, configure_settings,
+                              _DEFAULT_CONFIG, DEFAULT_THEME)
 from .support import unittest
 
 
@@ -35,7 +36,7 @@ class TestSettingsConfiguration(unittest.TestCase):
         """providing no file should return the default values."""
         settings = read_settings(None)
         expected = copy.deepcopy(_DEFAULT_CONFIG)
-        expected["FEED_DOMAIN"] = '' #This is added by configure settings
+        expected['FEED_DOMAIN'] = ''  # Added by configure settings
         self.maxDiff = None
         self.assertDictEqual(settings, expected)
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index c176325e..0da1dcfa 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -17,7 +17,8 @@ class TestUtils(LoggedTestCase):
     @utils.deprecated_attribute(
         old='_old_attribute', new='_new_attribute',
         since=(3, 1, 0), remove=(4, 1, 3))
-    def _old_attribute(): return None
+    def _old_attribute():
+        return None
 
     def test_deprecated_attribute(self):
         value = self._old_attribute
@@ -60,8 +61,10 @@ class TestUtils(LoggedTestCase):
                    ('this        is a test', 'this-is-a-test'),
                    ('this → is ← a ↑ test', 'this-is-a-test'),
                    ('this--is---a test', 'this-is-a-test'),
-                   ('unicode測試許功蓋，你看到了嗎？', 'unicodece-shi-xu-gong-gai-ni-kan-dao-liao-ma'),
-                   ('大飯原発４号機、１８日夜起動へ', 'da-fan-yuan-fa-4hao-ji-18ri-ye-qi-dong-he'),)
+                   ('unicode測試許功蓋，你看到了嗎？',
+                    'unicodece-shi-xu-gong-gai-ni-kan-dao-liao-ma'),
+                   ('大飯原発４号機、１８日夜起動へ',
+                    'da-fan-yuan-fa-4hao-ji-18ri-ye-qi-dong-he'),)
 
         for value, expected in samples:
             self.assertEquals(utils.slugify(value), expected)
@@ -122,7 +125,8 @@ class TestUtils(LoggedTestCase):
             shutil.rmtree(empty_path, True)
 
     def test_clean_output_dir(self):
-        test_directory = os.path.join(os.path.dirname(__file__), 'clean_output')
+        test_directory = os.path.join(os.path.dirname(__file__),
+                                      'clean_output')
         content = os.path.join(os.path.dirname(__file__), 'content')
         shutil.copytree(content, test_directory)
         utils.clean_output_dir(test_directory)
@@ -131,12 +135,14 @@ class TestUtils(LoggedTestCase):
         shutil.rmtree(test_directory)
 
     def test_clean_output_dir_not_there(self):
-        test_directory = os.path.join(os.path.dirname(__file__), 'does_not_exist')
+        test_directory = os.path.join(os.path.dirname(__file__),
+                                      'does_not_exist')
         utils.clean_output_dir(test_directory)
         self.assertTrue(not os.path.exists(test_directory))
 
     def test_clean_output_dir_is_file(self):
-        test_directory = os.path.join(os.path.dirname(__file__), 'this_is_a_file')
+        test_directory = os.path.join(os.path.dirname(__file__),
+                                      'this_is_a_file')
         f = open(test_directory, 'w')
         f.write('')
         f.close()
diff --git a/tests/test_webassets.py b/tests/test_webassets.py
index 87b2789c..c2ba44da 100644
--- a/tests/test_webassets.py
+++ b/tests/test_webassets.py
@@ -45,8 +45,8 @@ class TestWebAssets(unittest.TestCase):
     def check_link_tag(self, css_file, html_file):
         """Check the presence of `css_file` in `html_file`."""
 
-        link_tag = '<link rel="stylesheet" href="{css_file}">'.\
-                   format(css_file=css_file)
+        link_tag = ('<link rel="stylesheet" href="{css_file}">'
+                    .format(css_file=css_file))
         html = open(html_file).read()
         self.assertRegexpMatches(html, link_tag)
 
@@ -94,8 +94,8 @@ class TestWebAssetsAbsoluteURLS(TestWebAssets):
     def test_absolute_url(self):
         """Look in the output files for the link tag with absolute url."""
 
-        css_file = 'http://localhost/theme/gen/style.{0}.min.css'.\
-                   format(CSS_HASH)
+        css_file = ('http://localhost/theme/gen/style.{0}.min.css'
+                    .format(CSS_HASH))
         html_files = ['index.html', 'archives.html',
                       'this-is-an-article-with-category.html']
         for f in html_files:

From 519dcdbcb3c9d4fb87677adbdf846922d1a1a4a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 3 Mar 2013 20:12:31 -0800
Subject: [PATCH 1139/2864] Manual pass on sources for better standards.

---
 pelican/__init__.py   | 14 +++++---
 pelican/contents.py   | 18 ++++++----
 pelican/generators.py | 39 ++++++++++++---------
 pelican/log.py        | 11 +++---
 pelican/readers.py    |  8 ++---
 pelican/server.py     |  5 ++-
 pelican/settings.py   | 57 ++++++++++++++++++-------------
 pelican/utils.py      | 79 +++++++++++++++++++++++--------------------
 pelican/writers.py    |  8 ++---
 9 files changed, 135 insertions(+), 104 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index a4d61b73..f57d2af7 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -293,8 +293,15 @@ def main():
                     # restriction; all files are recursively checked if they
                     # have changed, no matter what extension the filenames
                     # have.
-                    if files_changed(pelican.path, pelican.markup, pelican.ignore_files) or \
-                            files_changed(pelican.theme, [''], pelican.ignore_files):
+                    if (files_changed(
+                            pelican.path,
+                            pelican.markup,
+                            pelican.ignore_files)
+                        or files_changed(
+                            pelican.theme,
+                            [''],
+                            pelican.ignore_files
+                    )):
                         if not files_found_error:
                             files_found_error = True
                         pelican.run()
@@ -318,8 +325,7 @@ def main():
                     time.sleep(1)  # sleep to avoid cpu load
                 except Exception as e:
                     logger.warning(
-                        "Caught exception \"{}\". Reloading.".format(e)
-                    )
+                            'Caught exception "{0}". Reloading.'.format(e))
                     continue
         else:
             pelican.run()
diff --git a/pelican/contents.py b/pelican/contents.py
index 873e89cd..3ead073f 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -11,7 +11,6 @@ import re
 import sys
 
 from datetime import datetime
-from sys import platform, stdin
 
 
 from pelican.settings import _DEFAULT_CONFIG
@@ -92,7 +91,8 @@ class Page(object):
 
         if isinstance(self.date_format, tuple):
             locale_string = self.date_format[0]
-            if sys.version_info < (3, ) and isinstance(locale_string, six.text_type):
+            if sys.version_info < (3, ) and isinstance(locale_string,
+                                                       six.text_type):
                 locale_string = locale_string.encode('ascii')
             locale.setlocale(locale.LC_ALL, locale_string)
             self.date_format = self.date_format[1]
@@ -288,10 +288,13 @@ class URLWrapper(object):
         return self.name
 
     def _from_settings(self, key, get_page_name=False):
-        """Returns URL information as defined in settings. 
-        When get_page_name=True returns URL without anything after {slug}
-        e.g. if in settings: CATEGORY_URL="cat/{slug}.html" this returns "cat/{slug}"
-        Useful for pagination."""
+        """Returns URL information as defined in settings.
+
+        When get_page_name=True returns URL without anything after {slug} e.g.
+        if in settings: CATEGORY_URL="cat/{slug}.html" this returns
+        "cat/{slug}" Useful for pagination.
+
+        """
         setting = "%s_%s" % (self.__class__.__name__.upper(), key)
         value = self.settings[setting]
         if not isinstance(value, six.string_types):
@@ -303,7 +306,8 @@ class URLWrapper(object):
             else:
                 return value.format(**self.as_dict())
 
-    page_name = property(functools.partial(_from_settings, key='URL', get_page_name=True))
+    page_name = property(functools.partial(_from_settings, key='URL',
+                         get_page_name=True))
     url = property(functools.partial(_from_settings, key='URL'))
     save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 14c681f4..540a9468 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -14,11 +14,14 @@ from functools import partial
 from itertools import chain
 from operator import attrgetter, itemgetter
 
-from jinja2 import (Environment, FileSystemLoader, PrefixLoader, ChoiceLoader,
-                    BaseLoader, TemplateNotFound)
+from jinja2 import (
+        Environment, FileSystemLoader, PrefixLoader, ChoiceLoader, BaseLoader,
+        TemplateNotFound
+)
 
-from pelican.contents import Article, Page, Category, StaticContent, \
-        is_valid_content
+from pelican.contents import (
+        Article, Page, Category, StaticContent, is_valid_content
+)
 from pelican.readers import read_file
 from pelican.utils import copy, process_translations, mkdir_p
 from pelican import signals
@@ -76,8 +79,9 @@ class Generator(object):
             try:
                 self._templates[name] = self.env.get_template(name + '.html')
             except TemplateNotFound:
-                raise Exception('[templates] unable to load %s.html from %s' \
-                        % (name, self._templates_path))
+                raise Exception(
+                        ('[templates] unable to load %s.html from %s'
+                         % (name, self._templates_path)))
         return self._templates[name]
 
     def get_files(self, path, exclude=[], extensions=None):
@@ -165,8 +169,8 @@ class ArticlesGenerator(Generator):
         self.categories = defaultdict(list)
         self.related_posts = []
         self.authors = defaultdict(list)
-        super(ArticlesGenerator, self).__init__(*args, **kwargs)
         self.drafts = []
+        super(ArticlesGenerator, self).__init__(*args, **kwargs)
         signals.article_generator_init.send(self)
 
     def generate_feeds(self, writer):
@@ -180,8 +184,8 @@ class ArticlesGenerator(Generator):
             writer.write_feed(self.articles, self.context,
                               self.settings['FEED_RSS'], feed_type='rss')
 
-        if self.settings.get('FEED_ALL_ATOM') or \
-                self.settings.get('FEED_ALL_RSS'):
+        if (self.settings.get('FEED_ALL_ATOM')
+                or self.settings.get('FEED_ALL_RSS')):
             all_articles = list(self.articles)
             for article in self.articles:
                 all_articles.extend(article.translations)
@@ -193,7 +197,8 @@ class ArticlesGenerator(Generator):
 
             if self.settings.get('FEED_ALL_RSS'):
                 writer.write_feed(all_articles, self.context,
-                                  self.settings['FEED_ALL_RSS'], feed_type='rss')
+                                  self.settings['FEED_ALL_RSS'],
+                                  feed_type='rss')
 
         for cat, arts in self.categories:
             arts.sort(key=attrgetter('date'), reverse=True)
@@ -206,8 +211,8 @@ class ArticlesGenerator(Generator):
                                   self.settings['CATEGORY_FEED_RSS'] % cat,
                                   feed_type='rss')
 
-        if self.settings.get('TAG_FEED_ATOM') \
-                or self.settings.get('TAG_FEED_RSS'):
+        if (self.settings.get('TAG_FEED_ATOM')
+                or self.settings.get('TAG_FEED_RSS')):
             for tag, arts in self.tags.items():
                 arts.sort(key=attrgetter('date'), reverse=True)
                 if self.settings.get('TAG_FEED_ATOM'):
@@ -219,8 +224,8 @@ class ArticlesGenerator(Generator):
                                       self.settings['TAG_FEED_RSS'] % tag,
                                       feed_type='rss')
 
-        if self.settings.get('TRANSLATION_FEED_ATOM') or \
-                self.settings.get('TRANSLATION_FEED_RSS'):
+        if (self.settings.get('TRANSLATION_FEED_ATOM')
+                or self.settings.get('TRANSLATION_FEED_RSS')):
             translations_feeds = defaultdict(list)
             for article in chain(self.articles, self.translations):
                 translations_feeds[article.lang].append(article)
@@ -376,7 +381,7 @@ class ArticlesGenerator(Generator):
             # only main articles are listed in categories, not translations
             self.categories[article.category].append(article)
             # ignore blank authors as well as undefined
-            if hasattr(article,'author') and article.author.name != '':
+            if hasattr(article, 'author') and article.author.name != '':
                 self.authors[article.author].append(article)
 
         # sort the articles by date
@@ -470,7 +475,8 @@ class PagesGenerator(Generator):
                                 repr(f)))
 
         self.pages, self.translations = process_translations(all_pages)
-        self.hidden_pages, self.hidden_translations = process_translations(hidden_pages)
+        self.hidden_pages, self.hidden_translations = (
+                process_translations(hidden_pages))
 
         self._update_context(('pages', ))
         self.context['PAGES'] = self.pages
@@ -574,6 +580,7 @@ class PdfGenerator(Generator):
         for page in self.context['pages']:
             self._create_pdf(page, pdf_path)
 
+
 class SourceFileGenerator(Generator):
     def generate_context(self):
         self.output_extension = self.settings['OUTPUT_SOURCES_EXTENSION']
diff --git a/pelican/log.py b/pelican/log.py
index 2ce11ea2..818db05f 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -31,11 +31,10 @@ def ansi(color, text):
 
 
 class ANSIFormatter(Formatter):
-    """
-    Convert a `logging.LogRecord' object into colored text, using ANSI escape sequences.
-    """
-    ## colors:
+    """Convert a `logging.LogRecord' object into colored text, using ANSI
+       escape sequences.
 
+    """
     def format(self, record):
         msg = str(record.msg)
         if record.levelname == 'INFO':
@@ -67,8 +66,8 @@ class TextFormatter(Formatter):
 def init(level=None, logger=getLogger(), handler=StreamHandler()):
     logger = logging.getLogger()
 
-    if os.isatty(sys.stdout.fileno()) \
-       and not sys.platform.startswith('win'):
+    if (os.isatty(sys.stdout.fileno())
+            and not sys.platform.startswith('win')):
         fmt = ANSIFormatter()
     else:
         fmt = TextFormatter()
diff --git a/pelican/readers.py b/pelican/readers.py
index a3c4364b..6f99a6a1 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
-import six
 
 import os
 import re
@@ -23,7 +22,6 @@ try:
     asciidoc = True
 except ImportError:
     asciidoc = False
-import re
 
 import cgi
 try:
@@ -168,6 +166,7 @@ class MarkdownReader(Reader):
         metadata = self._parse_metadata(md.Meta)
         return content, metadata
 
+
 class HTMLReader(Reader):
     """Parses HTML files as input, looking for meta, title, and body tags"""
     file_extensions = ['htm', 'html']
@@ -237,10 +236,10 @@ class HTMLReader(Reader):
 
         def handle_charref(self, data):
             self._data_buffer += '&#{};'.format(data)
-            
+
         def build_tag(self, tag, attrs, close_tag):
             result = '<{}'.format(cgi.escape(tag))
-            for k,v in attrs:
+            for k, v in attrs:
                 result += ' ' + cgi.escape(k)
                 if v is not None:
                     result += '="{}"'.format(cgi.escape(v))
@@ -272,6 +271,7 @@ class HTMLReader(Reader):
             metadata[k] = self.process_metadata(k, parser.metadata[k])
         return parser.body, metadata
 
+
 class AsciiDocReader(Reader):
     enabled = bool(asciidoc)
     file_extensions = ['asc']
diff --git a/pelican/server.py b/pelican/server.py
index 0f5a71d2..b427a6c3 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -2,12 +2,12 @@ from __future__ import print_function
 try:
     import SimpleHTTPServer as srvmod
 except ImportError:
-    import http.server as srvmod
+    import http.server as srvmod  # NOQA
 
 try:
     import SocketServer as socketserver
 except ImportError:
-    import socketserver
+    import socketserver  # NOQA
 
 PORT = 8000
 
@@ -17,4 +17,3 @@ httpd = socketserver.TCPServer(("", PORT), Handler)
 
 print("serving at port", PORT)
 httpd.serve_forever()
-
diff --git a/pelican/settings.py b/pelican/settings.py
index 8d6c1608..1180d0b2 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -62,7 +62,8 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'DEFAULT_LANG': 'en',
                    'TAG_CLOUD_STEPS': 4,
                    'TAG_CLOUD_MAX_ITEMS': 100,
-                   'DIRECT_TEMPLATES': ('index', 'tags', 'categories', 'archives'),
+                   'DIRECT_TEMPLATES': ('index', 'tags', 'categories',
+                                        'archives'),
                    'EXTRA_TEMPLATES_PATHS': [],
                    'PAGINATED_DIRECT_TEMPLATES': ('index', ),
                    'PELICAN_CLASS': 'pelican.Pelican',
@@ -171,7 +172,8 @@ def configure_settings(settings):
         if (siteurl.endswith('/')):
             settings['SITEURL'] = siteurl[:-1]
             logger.warn("Removed extraneous trailing slash from SITEURL.")
-        # If SITEURL is defined but FEED_DOMAIN isn't, set FEED_DOMAIN = SITEURL
+        # If SITEURL is defined but FEED_DOMAIN isn't,
+        # set FEED_DOMAIN to SITEURL
         if not 'FEED_DOMAIN' in settings:
             settings['FEED_DOMAIN'] = settings['SITEURL']
 
@@ -185,36 +187,45 @@ def configure_settings(settings):
 
     if any(settings.get(k) for k in feed_keys):
         if not settings.get('FEED_DOMAIN'):
-            logger.warn("Since feed URLs should always be absolute, you should specify "
-                     "FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = "
-                     "http://www.example.com')")
+            logger.warn(
+                "Since feed URLs should always be absolute, you should specify"
+                " FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = "
+                "http://www.example.com')")
 
         if not settings.get('SITEURL'):
-            logger.warn("Feeds generated without SITEURL set properly may not be valid")
+            logger.warn('Feeds generated without SITEURL set properly may not'
+                        ' be valid')
 
     if not 'TIMEZONE' in settings:
-        logger.warn("No timezone information specified in the settings. Assuming"
-                 " your timezone is UTC for feed generation. Check "
-                 "http://docs.notmyidea.org/alexis/pelican/settings.html#timezone "
-                 "for more information")
+        logger.warn(
+            'No timezone information specified in the settings. Assuming'
+            ' your timezone is UTC for feed generation. Check '
+            'http://docs.notmyidea.org/alexis/pelican/settings.html#timezone '
+            'for more information')
 
     if 'LESS_GENERATOR' in settings:
-        logger.warn("The LESS_GENERATOR setting has been removed in favor "
-                    "of the Webassets plugin")
+        logger.warn(
+            'The LESS_GENERATOR setting has been removed in favor '
+            'of the Webassets plugin')
 
     if 'OUTPUT_SOURCES_EXTENSION' in settings:
-        if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'], six.string_types):
-            settings['OUTPUT_SOURCES_EXTENSION'] = _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION']
-            logger.warn("Detected misconfiguration with OUTPUT_SOURCES_EXTENSION."
-                       " falling back to the default extension " +
-                       _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
+        if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'],
+                          six.string_types):
+            settings['OUTPUT_SOURCES_EXTENSION'] = (
+                    _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
+            logger.warn(
+                'Detected misconfiguration with OUTPUT_SOURCES_EXTENSION, '
+                'falling back to the default extension ' +
+                _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
 
     filename_metadata = settings.get('FILENAME_METADATA')
-    if filename_metadata and not isinstance(filename_metadata, six.string_types):
-        logger.error("Detected misconfiguration with FILENAME_METADATA"
-                " setting (must be string or compiled pattern), falling"
-                "back to the default")
-        settings['FILENAME_METADATA'] = \
-                _DEFAULT_CONFIG['FILENAME_METADATA']
+    if filename_metadata and not isinstance(filename_metadata,
+                                            six.string_types):
+        logger.error(
+            'Detected misconfiguration with FILENAME_METADATA '
+            'setting (must be string or compiled pattern), falling '
+            'back to the default')
+        settings['FILENAME_METADATA'] = (
+                _DEFAULT_CONFIG['FILENAME_METADATA'])
 
     return settings
diff --git a/pelican/utils.py b/pelican/utils.py
index 72ff868a..a761917a 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -29,12 +29,13 @@ def strftime(date, date_format):
 
     This :func:`strftime()` is compatible to Python 2 and 3. In both cases,
     input and output is always unicode.
-        
+
     Still, Python 3's :func:`strftime()` seems to somehow "normalize" unicode
     chars in the format string. So if e.g. your format string contains 'ø' or
     'ä', the result will be 'o' and 'a'.
 
-    See here for an `extensive testcase <https://github.com/dmdm/test_strftime>`_.
+    See here for an `extensive testcase
+    <https://github.com/dmdm/test_strftime>`_.
 
     :param date: Any object that sports a :meth:`strftime()` method.
     :param date_format: Format string, can always be unicode.
@@ -67,18 +68,12 @@ def strftime(date, date_format):
             result = unicode(result)
         # Convert XML character references back to unicode characters.
         if "&#" in result:
-            result = re.sub(r'&#(?P<num>\d+);'
-                , lambda m: unichr(int(m.group('num')))
-                , result
-            )
+            result = re.sub(r'&#(?P<num>\d+);',
+                            lambda m: unichr(int(m.group('num'))),
+                            result)
         return result
 
 
-
-#----------------------------------------------------------------------------
-# Stolen from Django: django.utils.encoding
-#
-
 def python_2_unicode_compatible(klass):
     """
     A decorator that defines __unicode__ and __str__ methods under Python 2.
@@ -86,43 +81,48 @@ def python_2_unicode_compatible(klass):
 
     To support Python 2 and 3 with a single code base, define a __str__ method
     returning text and apply this decorator to the class.
+
+    From django.utils.encoding.
     """
     if not six.PY3:
         klass.__unicode__ = klass.__str__
         klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
     return klass
 
-#----------------------------------------------------------------------------
 
 class NoFilesError(Exception):
     pass
 
 
 class memoized(object):
-   '''Decorator. Caches a function's return value each time it is called.
-   If called later with the same arguments, the cached value is returned
-   (not reevaluated).
-   '''
-   def __init__(self, func):
-      self.func = func
-      self.cache = {}
-   def __call__(self, *args):
-      if not isinstance(args, Hashable):
-         # uncacheable. a list, for instance.
-         # better to not cache than blow up.
-         return self.func(*args)
-      if args in self.cache:
-         return self.cache[args]
-      else:
-         value = self.func(*args)
-         self.cache[args] = value
-         return value
-   def __repr__(self):
-      '''Return the function's docstring.'''
-      return self.func.__doc__
-   def __get__(self, obj, objtype):
-      '''Support instance methods.'''
-      return partial(self.__call__, obj)
+    """Function decorator to cache return values.
+
+    If called later with the same arguments, the cached value is returned
+    (not reevaluated).
+
+    """
+    def __init__(self, func):
+        self.func = func
+        self.cache = {}
+
+    def __call__(self, *args):
+        if not isinstance(args, Hashable):
+            # uncacheable. a list, for instance.
+            # better to not cache than blow up.
+            return self.func(*args)
+        if args in self.cache:
+            return self.cache[args]
+        else:
+            value = self.func(*args)
+            self.cache[args] = value
+            return value
+
+    def __repr__(self):
+        return self.func.__doc__
+
+    def __get__(self, obj, objtype):
+        '''Support instance methods.'''
+        return partial(self.__call__, obj)
 
 
 def deprecated_attribute(old, new, since=None, remove=None, doc=None):
@@ -166,6 +166,7 @@ def deprecated_attribute(old, new, since=None, remove=None, doc=None):
 
     return decorator
 
+
 def get_date(string):
     """Return a datetime object from a string.
 
@@ -196,6 +197,7 @@ class pelican_open(object):
     def __exit__(self, exc_type, exc_value, traceback):
         pass
 
+
 def slugify(value):
     """
     Normalizes string, converts to lowercase, removes non-alpha characters,
@@ -262,6 +264,7 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
     else:
         logger.warning('skipped copy %s to %s' % (source_, destination_))
 
+
 def clean_output_dir(path):
     """Remove all the files from the output directory"""
 
@@ -414,6 +417,7 @@ def process_translations(content_list):
 
 LAST_MTIME = 0
 
+
 def files_changed(path, extensions, ignores=[]):
     """Return True if the files have changed since the last check"""
 
@@ -423,7 +427,8 @@ def files_changed(path, extensions, ignores=[]):
             dirs[:] = [x for x in dirs if x[0] != '.']
             for f in files:
                 if any(f.endswith(ext) for ext in extensions) \
-                        and not any(fnmatch.fnmatch(f, ignore) for ignore in ignores):
+                        and not any(fnmatch.fnmatch(f, ignore)
+                                    for ignore in ignores):
                     yield os.stat(os.path.join(root, f)).st_mtime
 
     global LAST_MTIME
diff --git a/pelican/writers.py b/pelican/writers.py
index 429507a0..43b95062 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -78,11 +78,11 @@ class Writer(object):
                     os.makedirs(os.path.dirname(complete_path))
                 except Exception:
                     pass
-                fp = open(complete_path, 'w', encoding='utf-8' if six.PY3 else None)
-                feed.write(fp, 'utf-8')
-                logger.info('writing %s' % complete_path)
 
-                fp.close()
+                encoding = 'utf-8' if six.PY3 else None
+                with open(complete_path, 'w', encoding=encoding) as fp:
+                    feed.write(fp, 'utf-8')
+                    logger.info('writing %s' % complete_path)
             return feed
         finally:
             locale.setlocale(locale.LC_ALL, old_locale)

From 3e364bb8a483b3124ca671382336372a91b9e648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 3 Mar 2013 21:00:52 -0800
Subject: [PATCH 1140/2864] Don't overwrite output_path. Fix #750

---
 pelican/generators.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 540a9468..ede0b7b3 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -585,12 +585,13 @@ class SourceFileGenerator(Generator):
     def generate_context(self):
         self.output_extension = self.settings['OUTPUT_SOURCES_EXTENSION']
 
-    def _create_source(self, obj, output_path):
-        output_path = os.path.splitext(obj.save_as)[0]
-        dest = os.path.join(output_path, output_path + self.output_extension)
+    def _create_source(self, obj):
+        output_path, _ = os.path.splitext(obj.save_as)
+        dest = os.path.join(self.output_path,
+                            output_path + self.output_extension)
         copy('', obj.source_path, dest)
 
     def generate_output(self, writer=None):
         logger.info(' Generating source files...')
-        for object in chain(self.context['articles'], self.context['pages']):
-            self._create_source(object, self.output_path)
+        for obj in chain(self.context['articles'], self.context['pages']):
+            self._create_source(obj)

From 07f4163300da31200bf9f5538c80d88420cfb250 Mon Sep 17 00:00:00 2001
From: Sasha Hart <s@sashahart.net>
Date: Sat, 2 Mar 2013 20:05:13 -0600
Subject: [PATCH 1141/2864] make develop_server.sh notify/cleanup when pelican
 or server don't start

After waiting for pelican and server to come up, if either one has
died then give a more helpful message and clean up. Previously did not
check for this, so script informed user that everything was running even
if one or both parts failed for whatever reason.

This is meant to provide a little more user-friendliness
in those cases where user has a develop_server.sh in project directory
but forgot to (re)install pelican, activate relevant virtualenv, etc.
as well as other unforeseen situations where one of the processes does
not start.
---
 pelican/tools/templates/develop_server.sh.in | 38 +++++++++++++-------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index 1eda47c4..ab81a298 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -26,11 +26,14 @@ function usage(){
   exit 3
 }
 
+function alive() {
+  kill -0 $$1 >/dev/null 2>&1
+}
+
 function shut_down(){
-  if [[ -f $$SRV_PID ]]; then
-    PID=$$(cat $$SRV_PID)
-    PROCESS=$$(ps -p $$PID | tail -n 1 | awk '{print $$4}')
-    if [[ $$PROCESS != "" ]]; then
+  PID=$$(cat $$SRV_PID)
+  if [[ $$? -eq 0 ]]; then
+    if alive $PID; then
       echo "Killing pelican.server"
       kill $$PID
     else
@@ -41,10 +44,9 @@ function shut_down(){
     echo "pelican.server PIDFile not found"
   fi
 
-  if [[ -f $$PELICAN_PID ]]; then
-    PID=$$(cat $$PELICAN_PID)
-    PROCESS=$$(ps -p $$PID | tail -n 1 | awk '{print $$4}')
-    if [[ $$PROCESS != "" ]]; then
+  PID=$$(cat $$PELICAN_PID)
+  if [[ $$? -eq 0 ]]; then
+    if alive $$PID; then
       echo "Killing Pelican"
       kill $$PID
     else
@@ -60,12 +62,22 @@ function start_up(){
   echo "Starting up Pelican and pelican.server"
   shift
   $$PELICAN --debug --autoreload -r $$INPUTDIR -o $$OUTPUTDIR -s $$CONFFILE $$PELICANOPTS &
-  echo $$! > $$PELICAN_PID
+  pelican_pid=$$!
+  echo $$pelican_pid > $$PELICAN_PID
   cd $$OUTPUTDIR
   python -m pelican.server &
-  echo $$! > $$SRV_PID
+  srv_pid=$$!
+  echo $$srv_pid > $$SRV_PID
   cd $$BASEDIR
-  sleep 1 && echo 'Pelican and pelican.server processes now running in background.'
+  sleep 1
+  if ! alive $$pelican_pid ; then
+    echo "Pelican didn't start. Is the pelican package installed?"
+    return 1
+  elif ! alive $$srv_pid ; then
+    echo "pelican.server didn't start. Is the pelican package installed?"
+    return 1
+  fi
+  echo 'Pelican and pelican.server processes now running in background.'
 }
 
 ###
@@ -78,7 +90,9 @@ elif [[ $$1 == "restart" ]]; then
   shut_down
   start_up
 elif [[ $$1 == "start" ]]; then
-  start_up
+  if ! start_up; then
+    shut_down
+  fi
 else
   usage
 fi

From 45c42dfe9a1a8acfc88eb99bdb3d0abd758268aa Mon Sep 17 00:00:00 2001
From: Mark Caudill <mark@markcaudill.me>
Date: Mon, 25 Feb 2013 13:53:29 -0500
Subject: [PATCH 1142/2864] Clarify internal linking.

---
 docs/getting_started.rst | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 8338d608..905eafcf 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -286,11 +286,10 @@ hierarchy. This makes it easier to link from the current post to other posts
 and images that may be sitting alongside the current post (instead of having
 to determine where those resources will be placed after site generation).
 
-To link to internal content, use the following syntax:
+To link to internal content (files in the ``content`` directory), use the
+following syntax:
 ``|filename|path/to/file``.
 
-For example, you may want to add links between "article1" and "article2" given
-the structure::
 
     website/
     ├── content
@@ -319,11 +318,30 @@ and ``article2.md``::
     [a link relative to content root](|filename|/article1.rst)
     [a link relative to current file](|filename|../article1.rst)
 
-.. note::
+Embedding non-article or non-page content is slightly different in that the
+directories need to be specified in ``pelicanconf.py`` file. The ``images``
+directory is configured for this by default but others will need to be added
+manually.
 
-    You can use the same syntax to link to internal pages or even static
-    content (like images) which would be available in a directory listed in
-    ``settings["STATIC_PATHS"]``.
+    content
+    ├── images
+    │   └── han.jpg
+    └── misc
+        └── image-test.md
+
+And ``image-test.md`` would include::
+
+    ![Alt Text](|filename|/images/han.jpg)
+
+Any content can be linked in this way. What happens is that the ``images``
+directory gets copied to ``output/static/`` upon publishing. This is
+because ``images`` is in the ``settings["STATIC_PATHS"]`` list by default. If
+you want to have another directory, say ``pdfs`` you would need to add the
+following to ``pelicanconf.py``::
+
+    STATIC_PATHS = ['images', 'pdfs']
+
+And then the ``pdfs`` directory would also be copied to ``output/static/``.
 
 Importing an existing blog
 --------------------------

From 8a6d96b289880b40bf5225f048fbef6b0a80e80b Mon Sep 17 00:00:00 2001
From: Steve Schwarz <steve@agilitynerd.com>
Date: Sun, 24 Feb 2013 17:59:24 -0600
Subject: [PATCH 1143/2864] pelican_import fix for bs4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Quick fix for this traceback:
$ pelican-import --wpfile ~/Downloads/mysite.wordpress.2013-02-24.xml 
Traceback (most recent call last):
  File "/Users/me/.virtualenvs/pelican/bin/pelican-import", line 8, in <module>
    load_entry_point('pelican==3.2', 'console_scripts', 'pelican-import')()
  File "/Users/me/.virtualenvs/pelican/src/pelican/pelican/tools/pelican_import.py", line 363, in main
    disable_slugs=args.disable_slugs or False)
  File "/Users/me/.virtualenvs/pelican/src/pelican/pelican/tools/pelican_import.py", line 238, in fields2pelican
    for title, content, filename, date, author, categories, tags, in_markup in fields:
  File "/Users/me/.virtualenvs/pelican/src/pelican/pelican/tools/pelican_import.py", line 37, in wp2fields
    if item.fetch('wp:status')[0].contents[0] == "publish":
TypeError: 'NoneType' object is not callable

I'm a BeautifulSoup novice but these changes allowed me to import two of my wordpress.xml files.
---
 pelican/tools/pelican_import.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 33041b0e..04747509 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -34,7 +34,7 @@ def wp2fields(xml):
 
     for item in items:
 
-        if item.fetch('wp:status')[0].contents[0] == "publish":
+        if item.find('status').string == "publish":
 
             try:
                 # Use HTMLParser due to issues with BeautifulSoup 3
@@ -42,19 +42,18 @@ def wp2fields(xml):
             except IndexError:
                 continue
 
-            content = item.fetch('content:encoded')[0].contents[0]
-            filename = item.fetch('wp:post_name')[0].contents[0]
+            content = item.find('encoded').string
+            filename = item.find('post_name').string
 
-            raw_date = item.fetch('wp:post_date')[0].contents[0]
+            raw_date = item.find('post_date').string
             date_object = time.strptime(raw_date, "%Y-%m-%d %H:%M:%S")
             date = time.strftime("%Y-%m-%d %H:%M", date_object)
+            author = item.find('creator').string
 
-            author = item.fetch('dc:creator')[0].contents[0].title()
+            categories = [cat.string for cat in item.findAll(name='category')]
+            # caturl = [cat['nicename'] for cat in item.find(domain='category')]
 
-            categories = [cat.contents[0] for cat in item.fetch(domain='category')]
-            # caturl = [cat['nicename'] for cat in item.fetch(domain='category')]
-
-            tags = [tag.contents[0] for tag in item.fetch(domain='post_tag')]
+            tags = [tag.string for tag in item.findAll(name='post_tag')]
 
             yield (title, content, filename, date, author, categories, tags, "html")
 

From 986733e8fbc80590413f1bb9cae54719391aeaa6 Mon Sep 17 00:00:00 2001
From: Steve Schwarz <steve@agilitynerd.com>
Date: Tue, 26 Feb 2013 07:32:05 -0600
Subject: [PATCH 1144/2864] Corrected parsing of categories/tags

---
 pelican/tools/pelican_import.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 04747509..b3587a13 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -49,11 +49,11 @@ def wp2fields(xml):
             date_object = time.strptime(raw_date, "%Y-%m-%d %H:%M:%S")
             date = time.strftime("%Y-%m-%d %H:%M", date_object)
             author = item.find('creator').string
-
-            categories = [cat.string for cat in item.findAll(name='category')]
+ 
+            categories = [cat.string for cat in item.findAll('category', {'domain' : 'category'})]
             # caturl = [cat['nicename'] for cat in item.find(domain='category')]
 
-            tags = [tag.string for tag in item.findAll(name='post_tag')]
+            tags = [tag.string for tag in item.findAll('category', {'domain' : 'post_tag'})]
 
             yield (title, content, filename, date, author, categories, tags, "html")
 

From 4e4080c5230e81ab631e997ef6258b0dcef81538 Mon Sep 17 00:00:00 2001
From: John Kristensen <john@jerrykan.com>
Date: Sun, 24 Feb 2013 18:04:04 +1100
Subject: [PATCH 1145/2864] Check output directory exists before doing a clean

 - if the output directory does not exist the 'make clean' command fails,
   which also means that the 'make html' command which would otherwise
   create the output directory also fails without generating the output
---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 8dd91630..b15f48ae 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -43,7 +43,7 @@ $$(OUTPUTDIR)/%.html:
 	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 clean:
-	find $$(OUTPUTDIR) -mindepth 1 -delete
+	[ ! -d $$(OUTPUTDIR) ] || find $$(OUTPUTDIR) -mindepth 1 -delete
 
 regenerate: clean
 	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)

From e721727476f984b7d4e991e13c80a88f3d605e4d Mon Sep 17 00:00:00 2001
From: Eric <github@webdesignhero.com>
Date: Sat, 23 Feb 2013 22:59:22 -0600
Subject: [PATCH 1146/2864] Allow explicit setting of markdown extensions

These additions are to make it easier to disable pygments or any other
extension the user may not want. In the previous version, these plugins are
hardcoded, but by making it a variable in the config, it is possible to not use
pygments or easily load extra markdown plugins if needed; you can have multiple
plugins in one virtual environment and have different configs load them as
needed.

In my `pelicanconf.py` I then have the following:

    MD_EXTENSIONS = ['extra', 'syntaxhighlighter']

where `syntaxhighlighter` is a custom markdown extension I am working on to use
syntax highlighter instead of pygments for code highlighting.
---
 pelican/readers.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 6f99a6a1..99dc6e54 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -140,17 +140,23 @@ class RstReader(Reader):
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
     file_extensions = ['md', 'markdown', 'mkd']
-    extensions = ['codehilite', 'extra']
+    default_extensions = ['codehilite', 'extra']
+
+    def __init__(self, *args, **kwargs):
+        super(MarkdownReader, self).__init__(*args, **kwargs)
+        self.extensions = self.settings.get('MD_EXTENSIONS',
+                                            self.default_extensions)
+        self.extensions.append('meta')
+        self._md = Markdown(extensions=self.extensions)
 
     def _parse_metadata(self, meta):
         """Return the dict containing document metadata"""
-        md = Markdown(extensions=set(self.extensions + ['meta']))
         output = {}
         for name, value in meta.items():
             name = name.lower()
             if name == "summary":
                 summary_values = "\n".join(str(item) for item in value)
-                summary = md.convert(summary_values)
+                summary = self._md.convert(summary_values)
                 output[name] = self.process_metadata(name, summary)
             else:
                 output[name] = self.process_metadata(name, value[0])
@@ -160,10 +166,9 @@ class MarkdownReader(Reader):
         """Parse content and metadata of markdown files"""
 
         with pelican_open(source_path) as text:
-            md = Markdown(extensions=set(self.extensions + ['meta']))
-            content = md.convert(text)
+            content = self._md.convert(text)
 
-        metadata = self._parse_metadata(md.Meta)
+        metadata = self._parse_metadata(self._md.Meta)
         return content, metadata
 
 

From 1bbfdf96a0e8af29437ef2522e003ae64fac5a9e Mon Sep 17 00:00:00 2001
From: Steve Schwarz <steve@agilitynerd.com>
Date: Sat, 23 Feb 2013 16:43:48 -0600
Subject: [PATCH 1147/2864] Display feed(s) in footer if no SOCIAL links

For sites where there are no SOCIAL links defined the FEED_ALL_ATOM and/or the FEED_ALL_RSS links are not displayed.
Also update the functional tests output.
---
 pelican/themes/notmyidea/templates/base.html             | 2 +-
 tests/output/basic/a-markdown-powered-article.html       | 9 ++++++++-
 tests/output/basic/archives.html                         | 9 ++++++++-
 tests/output/basic/article-1.html                        | 9 ++++++++-
 tests/output/basic/article-2.html                        | 9 ++++++++-
 tests/output/basic/article-3.html                        | 9 ++++++++-
 tests/output/basic/author/alexis-metaireau.html          | 9 ++++++++-
 tests/output/basic/categories.html                       | 9 ++++++++-
 tests/output/basic/category/bar.html                     | 9 ++++++++-
 tests/output/basic/category/cat1.html                    | 9 ++++++++-
 tests/output/basic/category/misc.html                    | 9 ++++++++-
 tests/output/basic/category/yeah.html                    | 9 ++++++++-
 tests/output/basic/filename_metadata-example.html        | 9 ++++++++-
 tests/output/basic/index.html                            | 9 ++++++++-
 tests/output/basic/oh-yeah.html                          | 9 ++++++++-
 tests/output/basic/pages/this-is-a-test-hidden-page.html | 9 ++++++++-
 tests/output/basic/pages/this-is-a-test-page.html        | 9 ++++++++-
 tests/output/basic/second-article-fr.html                | 9 ++++++++-
 tests/output/basic/second-article.html                   | 9 ++++++++-
 tests/output/basic/tag/bar.html                          | 9 ++++++++-
 tests/output/basic/tag/baz.html                          | 9 ++++++++-
 tests/output/basic/tag/foo.html                          | 9 ++++++++-
 tests/output/basic/tag/foobar.html                       | 9 ++++++++-
 tests/output/basic/tag/oh.html                           | 9 ++++++++-
 tests/output/basic/tag/yeah.html                         | 9 ++++++++-
 tests/output/basic/this-is-a-super-article.html          | 9 ++++++++-
 tests/output/basic/unbelievable.html                     | 9 ++++++++-
 27 files changed, 209 insertions(+), 27 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index f8b02662..6b11cb09 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -54,7 +54,7 @@
                         </ul>
                 </div><!-- /.blogroll -->
         {% endif %}
-        {% if SOCIAL %}
+        {% if SOCIAL or FEED_ALL_ATOM or FEED_ALL_RSS %}
                 <div class="social">
                         <h2>social</h2>
                         <ul>
diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html
index 80a12212..aa43a448 100644
--- a/tests/output/basic/a-markdown-powered-article.html
+++ b/tests/output/basic/a-markdown-powered-article.html
@@ -53,7 +53,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/archives.html b/tests/output/basic/archives.html
index cb06dfa1..07a62bcc 100644
--- a/tests/output/basic/archives.html
+++ b/tests/output/basic/archives.html
@@ -54,7 +54,14 @@
 </dl>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/article-1.html b/tests/output/basic/article-1.html
index b372d6ca..de3717fa 100644
--- a/tests/output/basic/article-1.html
+++ b/tests/output/basic/article-1.html
@@ -52,7 +52,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/article-2.html b/tests/output/basic/article-2.html
index 1a18cb47..ebe9b8a7 100644
--- a/tests/output/basic/article-2.html
+++ b/tests/output/basic/article-2.html
@@ -52,7 +52,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/article-3.html b/tests/output/basic/article-3.html
index 6b83b062..42762c26 100644
--- a/tests/output/basic/article-3.html
+++ b/tests/output/basic/article-3.html
@@ -52,7 +52,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/author/alexis-metaireau.html b/tests/output/basic/author/alexis-metaireau.html
index e6f65a11..c6e75b8b 100644
--- a/tests/output/basic/author/alexis-metaireau.html
+++ b/tests/output/basic/author/alexis-metaireau.html
@@ -86,7 +86,14 @@ as well as <strong>inline markup</strong>.</p>
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/categories.html b/tests/output/basic/categories.html
index f945d04a..8dd4c810 100644
--- a/tests/output/basic/categories.html
+++ b/tests/output/basic/categories.html
@@ -36,7 +36,14 @@
     <li><a href="./category/yeah.html">yeah</a></li>
 </ul>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/category/bar.html b/tests/output/basic/category/bar.html
index 896d9222..d9fcd2a5 100644
--- a/tests/output/basic/category/bar.html
+++ b/tests/output/basic/category/bar.html
@@ -56,7 +56,14 @@ YEAH !</p>
                                                 </ol><!-- /#posts-list -->
                         </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html
index b8ae397e..ad18cd9a 100644
--- a/tests/output/basic/category/cat1.html
+++ b/tests/output/basic/category/cat1.html
@@ -119,7 +119,14 @@
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html
index 2d62b852..7e8307a0 100644
--- a/tests/output/basic/category/misc.html
+++ b/tests/output/basic/category/misc.html
@@ -100,7 +100,14 @@
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/category/yeah.html b/tests/output/basic/category/yeah.html
index 37dfde63..7c6cb721 100644
--- a/tests/output/basic/category/yeah.html
+++ b/tests/output/basic/category/yeah.html
@@ -62,7 +62,14 @@
                                                 </ol><!-- /#posts-list -->
                         </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/filename_metadata-example.html b/tests/output/basic/filename_metadata-example.html
index b7ae95a7..730e9c41 100644
--- a/tests/output/basic/filename_metadata-example.html
+++ b/tests/output/basic/filename_metadata-example.html
@@ -52,7 +52,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html
index 488d1b08..f44ffbc9 100644
--- a/tests/output/basic/index.html
+++ b/tests/output/basic/index.html
@@ -245,7 +245,14 @@ YEAH !</p>
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/oh-yeah.html b/tests/output/basic/oh-yeah.html
index ab090b58..1900e76c 100644
--- a/tests/output/basic/oh-yeah.html
+++ b/tests/output/basic/oh-yeah.html
@@ -60,7 +60,14 @@ YEAH !</p>
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 655ae272..3447b3a5 100644
--- a/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -38,7 +38,14 @@ Anyone can see this page but it's not linked to anywhere!</p>
 
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/tests/output/basic/pages/this-is-a-test-page.html
index 43e2c2d4..c9192c94 100644
--- a/tests/output/basic/pages/this-is-a-test-page.html
+++ b/tests/output/basic/pages/this-is-a-test-page.html
@@ -38,7 +38,14 @@
 
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/second-article-fr.html b/tests/output/basic/second-article-fr.html
index aa30292e..a5abce27 100644
--- a/tests/output/basic/second-article-fr.html
+++ b/tests/output/basic/second-article-fr.html
@@ -54,7 +54,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/second-article.html b/tests/output/basic/second-article.html
index 7319c87f..f6b42fec 100644
--- a/tests/output/basic/second-article.html
+++ b/tests/output/basic/second-article.html
@@ -54,7 +54,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/bar.html b/tests/output/basic/tag/bar.html
index 06b012cb..891f5c35 100644
--- a/tests/output/basic/tag/bar.html
+++ b/tests/output/basic/tag/bar.html
@@ -134,7 +134,14 @@ YEAH !</p>
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/baz.html b/tests/output/basic/tag/baz.html
index f6c56d4b..ce7c1c62 100644
--- a/tests/output/basic/tag/baz.html
+++ b/tests/output/basic/tag/baz.html
@@ -78,7 +78,14 @@
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/foo.html b/tests/output/basic/tag/foo.html
index 4ee92b7d..dffd1768 100644
--- a/tests/output/basic/tag/foo.html
+++ b/tests/output/basic/tag/foo.html
@@ -104,7 +104,14 @@ as well as <strong>inline markup</strong>.</p>
                             </ol><!-- /#posts-list -->
                                                     </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/foobar.html b/tests/output/basic/tag/foobar.html
index 11f21b6d..108353c2 100644
--- a/tests/output/basic/tag/foobar.html
+++ b/tests/output/basic/tag/foobar.html
@@ -62,7 +62,14 @@
                                                 </ol><!-- /#posts-list -->
                         </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/oh.html b/tests/output/basic/tag/oh.html
index d88192a0..6e1a31ad 100644
--- a/tests/output/basic/tag/oh.html
+++ b/tests/output/basic/tag/oh.html
@@ -56,7 +56,14 @@ YEAH !</p>
                                                 </ol><!-- /#posts-list -->
                         </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/tag/yeah.html b/tests/output/basic/tag/yeah.html
index 8533dbdc..c201b5c0 100644
--- a/tests/output/basic/tag/yeah.html
+++ b/tests/output/basic/tag/yeah.html
@@ -56,7 +56,14 @@ YEAH !</p>
                                                 </ol><!-- /#posts-list -->
                         </section><!-- /#content -->
                     <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/this-is-a-super-article.html b/tests/output/basic/this-is-a-super-article.html
index 0188c07e..e098e2cf 100644
--- a/tests/output/basic/this-is-a-super-article.html
+++ b/tests/output/basic/this-is-a-super-article.html
@@ -66,7 +66,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html
index 36a1703c..a56096d9 100644
--- a/tests/output/basic/unbelievable.html
+++ b/tests/output/basic/unbelievable.html
@@ -54,7 +54,14 @@
   </article>
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">

From a7a71da6df64de5b1ce7f92d133a68f14d6ba8f8 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Thu, 21 Feb 2013 15:57:25 +0100
Subject: [PATCH 1148/2864] Fix a test in the asciidoc reader, and add asciidoc
 to travis so that the related tests will not be skipped.

---
 .travis.yml        | 3 ++-
 pelican/readers.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8b292101..569ea7b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,9 @@ python:
     - "3.2"
 before_install:
  - sudo apt-get update -qq
- - sudo apt-get install -qq ruby-sass
+ - sudo apt-get install -qq --no-install-recommends asciidoc ruby-sass
 install:
+    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
     - pip install nose mock --use-mirrors
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors unittest2; else pip install --use-mirrors unittest2py3k; fi
     - pip install . --use-mirrors
diff --git a/pelican/readers.py b/pelican/readers.py
index 99dc6e54..1623fb7f 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -285,7 +285,8 @@ class AsciiDocReader(Reader):
     def read(self, source_path):
         """Parse content and metadata of asciidoc files"""
         from cStringIO import StringIO
-        text = StringIO(pelican_open(source_path))
+        with pelican_open(source_path) as source:
+            text = StringIO(source)
         content = StringIO()
         ad = AsciiDocAPI()
 

From 824edb88238f7a7799ac1219c2994d0ac763094f Mon Sep 17 00:00:00 2001
From: Richard Duivenvoorde <richard@duif.net>
Date: Thu, 21 Feb 2013 12:38:51 +0100
Subject: [PATCH 1149/2864] rsync additions

- adding / otherwise you will endup with output on remote
- adding --cvs-exclude (to not sync cvs stuff)
---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index b15f48ae..c16fd7c0 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -61,7 +61,7 @@ ssh_upload: publish
 	scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 rsync_upload: publish
-	rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR) $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+	rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
 
 dropbox_upload: publish
 	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)

From a13e31a76b46a37c78461ab7201098de9fa189a5 Mon Sep 17 00:00:00 2001
From: Richard Duivenvoorde <richard@duif.net>
Date: Thu, 21 Feb 2013 12:43:42 +0100
Subject: [PATCH 1150/2864] adding a stopsever target for make

---
 pelican/tools/templates/Makefile.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index c16fd7c0..35c41bb7 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -28,6 +28,7 @@ help:
 	@echo '   make publish                     generate using production settings '
 	@echo '   make serve                       serve site at http://localhost:8000'
 	@echo '   make devserver                   start/restart develop_server.sh    '
+	@echo '   make stopserver                  stop local server                  '
 	@echo '   ssh_upload                       upload the web site via SSH        '
 	@echo '   rsync_upload                     upload the web site via rsync+ssh  '
 	@echo '   dropbox_upload                   upload the web site via Dropbox    '
@@ -54,6 +55,11 @@ serve:
 devserver:
 	$$(BASEDIR)/develop_server.sh restart
 
+stopserver:
+_   kill -9 `cat pelican.pid`
+_   kill -9 `cat srv.pid`
+_   @echo 'Stopped Pelican and SimpleHTTPServer processes running in background.
+
 publish:
 	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(PUBLISHCONF) $$(PELICANOPTS)
 

From 60ae7aa667e5143079c59da3f2ff0beb981ca50d Mon Sep 17 00:00:00 2001
From: yegle <cnyegle@gmail.com>
Date: Sun, 17 Feb 2013 10:44:14 -0500
Subject: [PATCH 1151/2864] Fix: hashlib.md5 funcition only accepts bytes as
 input

---
 pelican/plugins/gravatar.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/plugins/gravatar.py b/pelican/plugins/gravatar.py
index a4d11456..2b8520df 100644
--- a/pelican/plugins/gravatar.py
+++ b/pelican/plugins/gravatar.py
@@ -1,4 +1,5 @@
 import hashlib
+import six
 
 from pelican import signals
 """
@@ -33,8 +34,9 @@ def add_gravatar(generator, metadata):
 
     #then add gravatar url
     if 'email' in metadata.keys():
+        email_bytes = six.b(metadata['email']).lower()
         gravatar_url = "http://www.gravatar.com/avatar/" + \
-                        hashlib.md5(metadata['email'].lower()).hexdigest()
+                        hashlib.md5(email_bytes).hexdigest()
         metadata["author_gravatar"] = gravatar_url
 
 

From 205792e9d4fb974491cf4465cda5c866414e5d25 Mon Sep 17 00:00:00 2001
From: Andrew Spiers <andrew@andrewspiers.net>
Date: Fri, 15 Feb 2013 00:43:47 +1100
Subject: [PATCH 1152/2864] string types have no decode method in py3

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 9f25f2fe..6d4264d3 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -47,7 +47,7 @@ else:
 def decoding_strings(f):
     def wrapper(*args, **kwargs):
         out = f(*args, **kwargs)
-        if isinstance(out, six.string_types):
+        if isinstance(out, six.string_types) and not six.PY3:
             # todo: make encoding configurable?
             return out.decode(sys.stdin.encoding)
         return out

From 4a63695ae2cc871bd2849bc718b7bb2dfc6bc44c Mon Sep 17 00:00:00 2001
From: nfletton <nigel@thebluehut.com>
Date: Sat, 9 Feb 2013 17:23:59 -0700
Subject: [PATCH 1153/2864] Fixed pagination link error when
 <DIRECT_TEMPLATE_NAME>_SAVE_AS setting used.

The unit test for this scenario was passing as it was testing for an incorrect 'page_name' variable being set.
---
 pelican/generators.py    | 4 ++--
 tests/test_generators.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index ede0b7b3..e3ebf994 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -259,8 +259,8 @@ class ArticlesGenerator(Generator):
                 continue
 
             write(save_as, self.get_template(template),
-                  self.context, blog=True, paginated=paginated,
-                  page_name=template)
+                self.context, blog=True, paginated=paginated,
+                page_name=os.path.splitext(save_as)[0])
 
     def generate_tags(self, write):
         """Generate Tags pages."""
diff --git a/tests/test_generators.py b/tests/test_generators.py
index 7a6e67fb..48c7bf91 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -140,7 +140,7 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_direct_templates(write)
         write.assert_called_with("archives/index.html",
             generator.get_template("archives"), settings,
-            blog=True, paginated={}, page_name='archives')
+            blog=True, paginated={}, page_name='archives/index')
 
     def test_direct_templates_save_as_false(self):
 

From 44351aaf3126ea54508aef0db92ad4f556dc4e34 Mon Sep 17 00:00:00 2001
From: dave mankoff <mankyd@gmail.com>
Date: Sat, 9 Feb 2013 18:01:40 -0500
Subject: [PATCH 1154/2864] delete output directory properly

---
 pelican/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index f57d2af7..0e3db788 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -224,7 +224,9 @@ def parse_arguments():
 
     parser.add_argument('-d', '--delete-output-directory',
         dest='delete_outputdir',
-        action='store_true', help='Delete the output directory.')
+        action='store_true', 
+        default=None,
+        help='Delete the output directory.')
 
     parser.add_argument('-v', '--verbose', action='store_const',
         const=logging.INFO, dest='verbosity',

From ccef2a6f13b495b507d8b595c5c0b9083d7d0fac Mon Sep 17 00:00:00 2001
From: Eric <github@webdesignhero.com>
Date: Wed, 23 Jan 2013 18:35:25 -0600
Subject: [PATCH 1155/2864] Settings file is pelicanconf.py now.

---
 pelican/plugins/related_posts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/plugins/related_posts.py b/pelican/plugins/related_posts.py
index c2765c3c..29c39435 100644
--- a/pelican/plugins/related_posts.py
+++ b/pelican/plugins/related_posts.py
@@ -13,7 +13,7 @@ To enable, add
     from pelican.plugins import related_posts
     PLUGINS = [related_posts]
 
-to your settings.py.
+to your settings's file pelicanconf.py .
 
 Usage
 -----

From 11bdb437d2c773096c06c0f62a37d2e9ed2e778b Mon Sep 17 00:00:00 2001
From: Eric <github@webdesignhero.com>
Date: Thu, 24 Jan 2013 19:57:22 -0600
Subject: [PATCH 1156/2864] added unique filtering and config limit param

I hacked some code from other modules and some quick googling, first time with py so this may need to be cleaned up.

The functionality is to have a config var in pythonconfig.py and to remove the duplicates `sorted(set())`
---
 pelican/plugins/related_posts.py | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/pelican/plugins/related_posts.py b/pelican/plugins/related_posts.py
index 29c39435..dc52de9a 100644
--- a/pelican/plugins/related_posts.py
+++ b/pelican/plugins/related_posts.py
@@ -13,14 +13,21 @@ To enable, add
     from pelican.plugins import related_posts
     PLUGINS = [related_posts]
 
-to your settings's file pelicanconf.py .
+to your pelicanconf.py.
+
+Control the number of entries with in the config file with:
+
+RELATED_POSTS = {
+   'numentries': 6,
+}
+
 
 Usage
 -----
     {% if article.related_posts %}
         <ul>
         {% for related_post in article.related_posts %}
-            <li>{{ related_post }}</li>
+            <li><a href="{{ related_post.url }}">{{ related_post.title }}</a></li>
         {% endfor %}
         </ul>
     {% endif %}
@@ -40,12 +47,24 @@ def add_related_posts(generator, metadata):
 
         if len(related_posts) < 1:
             return
+        
+        metadata["related_posts"] = sorted(set(related_posts))
 
         relation_score = dict(list(zip(set(related_posts), list(map(related_posts.count,
                               set(related_posts))))))
         ranked_related = sorted(relation_score, key=relation_score.get)
+        
+        #Load the confg file and get the number of entries specified there
+        settings =  generator.settings
+        config = settings.get('RELATED_POSTS', {})
 
-        metadata["related_posts"] = ranked_related[:5]
+        #check if the related_posts var is set in the pythonconfig.py
+        if not isinstance(config, dict):
+            info("realted_links plugin: Using default number of related links ("+numentries+")")
+        else:
+            numentries = config.get('numentries', 5)
+        
+        metadata["related_posts"] = ranked_related[:numentries]
 
 
 def register():

From 6f5d8eae9637533a65ac768982175fe65edf2e5f Mon Sep 17 00:00:00 2001
From: Eric <github@webdesignhero.com>
Date: Tue, 29 Jan 2013 22:08:47 -0600
Subject: [PATCH 1157/2864] Relative URL issues with the related post examples

I noted that if you set the `ARTICLE_URL` site variable to have some depth and just create relative links, they will not link correctly.

by prefacing the link with `{{ SITEURL}}/` it seems to ensure proper links are created and works with the `make devserver` mode
---
 docs/plugins.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 77b114cf..3537f16b 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -302,7 +302,7 @@ For example::
     {% if article.related_posts %}
         <ul>
         {% for related_post in article.related_posts %}
-            <li><a href="{{ related_post.url }}">{{ related_post.title }}</a></li>
+            <li><a href="{{ SITEURL }}/{{ related_post.url }}">{{ related_post.title }}</a></li>
         {% endfor %}
         </ul>
     {% endif %}

From 92e9f3b31378e4a3d12d5d2c2933b50d7f4c64f1 Mon Sep 17 00:00:00 2001
From: Joseph Reagle <joseph.2011@reagle.org>
Date: Wed, 23 Jan 2013 12:38:29 -0500
Subject: [PATCH 1158/2864] bom detection and removal

---
 pelican/utils.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index a761917a..8f9afcc0 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -14,7 +14,7 @@ import fnmatch
 from collections import defaultdict, Hashable
 from functools import partial
 
-from codecs import open
+from codecs import open, BOM_UTF8
 from datetime import datetime
 from itertools import groupby
 from jinja2 import Markup
@@ -192,7 +192,10 @@ class pelican_open(object):
         self.filename = filename
 
     def __enter__(self):
-        return open(self.filename, encoding='utf-8').read()
+        content = open(self.filename, encoding='utf-8').read()
+        if content[0] == BOM_UTF8.decode('utf8'):
+            content = content[1:]
+        return content
 
     def __exit__(self, exc_type, exc_value, traceback):
         pass

From 9ed4e77049d15428cf25b14ebd9118f38a0b26a7 Mon Sep 17 00:00:00 2001
From: Joseph Reagle <joseph.2011@reagle.org>
Date: Wed, 23 Jan 2013 12:34:12 -0500
Subject: [PATCH 1159/2864] improve spacing of p and nested lists

---
 pelican/themes/notmyidea/static/css/main.css | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 29cce82c..ae8fe3d6 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -65,7 +65,8 @@ h1 a:hover {
 }
 	
 /* Paragraphs */
-p {margin-bottom: 1.143em;}
+p { margin-top: 1em;
+    margin-bottom: 1em;}
 
 strong, b {font-weight: bold;}
 em, i {font-style: italic;}
@@ -73,12 +74,12 @@ em, i {font-style: italic;}
 /* Lists */
 ul {
 	list-style: outside disc;
-	margin: 1em 0 1.5em 1.5em;
+	margin: 0.5em 0 0 1.5em;
 }
 
 ol {
 	list-style: outside decimal;
-	margin: 1em 0 1.5em 1.5em;
+	margin: 0.5em 0 0 1.5em;
 }
 
 .post-info {
@@ -88,6 +89,7 @@ ol {
 }
 
 .post-info p{
+    margin-top: 1px;
     margin-bottom: 1px;
 }
 

From 168d713df8f58fb8030443f9f0ea71b798284da5 Mon Sep 17 00:00:00 2001
From: Joseph Reagle <joseph.2011@reagle.org>
Date: Wed, 23 Jan 2013 12:46:41 -0500
Subject: [PATCH 1160/2864] ul/li have no top/bottom margins, but list do

---
 pelican/themes/notmyidea/static/css/main.css |  6 ++++--
 tests/output/basic/theme/css/main.css        | 10 +++++++---
 tests/output/custom/theme/css/main.css       | 10 +++++++---
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index ae8fe3d6..0295f6b2 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -74,14 +74,16 @@ em, i {font-style: italic;}
 /* Lists */
 ul {
 	list-style: outside disc;
-	margin: 0.5em 0 0 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
 ol {
 	list-style: outside decimal;
-	margin: 0.5em 0 0 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
+li { margin-top: 0.5em;}
+
 .post-info {
     float:right;
     margin:10px;
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index 29cce82c..0295f6b2 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -65,7 +65,8 @@ h1 a:hover {
 }
 	
 /* Paragraphs */
-p {margin-bottom: 1.143em;}
+p { margin-top: 1em;
+    margin-bottom: 1em;}
 
 strong, b {font-weight: bold;}
 em, i {font-style: italic;}
@@ -73,14 +74,16 @@ em, i {font-style: italic;}
 /* Lists */
 ul {
 	list-style: outside disc;
-	margin: 1em 0 1.5em 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
 ol {
 	list-style: outside decimal;
-	margin: 1em 0 1.5em 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
+li { margin-top: 0.5em;}
+
 .post-info {
     float:right;
     margin:10px;
@@ -88,6 +91,7 @@ ol {
 }
 
 .post-info p{
+    margin-top: 1px;
     margin-bottom: 1px;
 }
 
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
index 29cce82c..0295f6b2 100644
--- a/tests/output/custom/theme/css/main.css
+++ b/tests/output/custom/theme/css/main.css
@@ -65,7 +65,8 @@ h1 a:hover {
 }
 	
 /* Paragraphs */
-p {margin-bottom: 1.143em;}
+p { margin-top: 1em;
+    margin-bottom: 1em;}
 
 strong, b {font-weight: bold;}
 em, i {font-style: italic;}
@@ -73,14 +74,16 @@ em, i {font-style: italic;}
 /* Lists */
 ul {
 	list-style: outside disc;
-	margin: 1em 0 1.5em 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
 ol {
 	list-style: outside decimal;
-	margin: 1em 0 1.5em 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
+li { margin-top: 0.5em;}
+
 .post-info {
     float:right;
     margin:10px;
@@ -88,6 +91,7 @@ ol {
 }
 
 .post-info p{
+    margin-top: 1px;
     margin-bottom: 1px;
 }
 

From 7cafcf6c24e25608f112989c7ffdfb282dbfeffd Mon Sep 17 00:00:00 2001
From: Eric <github@webdesignhero.com>
Date: Mon, 14 Jan 2013 19:33:03 -0600
Subject: [PATCH 1161/2864] Fix the tag cloud example

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 7280f105..5babedbd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -386,7 +386,7 @@ The default theme does not support tag clouds, but it is pretty easy to add::
 
     <ul>
         {% for tag in tag_cloud %}
-            <li class="tag-{{ tag.1 }}"><a href="/tag/{{ tag.0 }}/">{{ tag.0 }}</a></li>
+            <li class="tag-{{ tag.1 }}"><a href="/tag/{{ tag.0|string|replace(" ", "-" ) }}.html">{{ tag.0 }}</a></li>
         {% endfor %}
     </ul>
 

From 4f6467ce08628a72ecf1373b2fe660bb819a635f Mon Sep 17 00:00:00 2001
From: Leroy Jiang <ley@imley.net>
Date: Sat, 5 Jan 2013 16:22:32 +0800
Subject: [PATCH 1162/2864] add disqus_url to comment js block

---
 pelican/themes/notmyidea/templates/article.html     |  3 ++-
 tests/output/custom/a-markdown-powered-article.html |  1 +
 tests/output/custom/article-1.html                  |  1 +
 tests/output/custom/article-2.html                  |  1 +
 tests/output/custom/article-3.html                  |  1 +
 tests/output/custom/drafts/a-draft-article.html     | 12 ------------
 tests/output/custom/filename_metadata-example.html  |  1 +
 tests/output/custom/oh-yeah-fr.html                 |  1 +
 tests/output/custom/oh-yeah.html                    |  1 +
 tests/output/custom/second-article-fr.html          |  1 +
 tests/output/custom/second-article.html             |  1 +
 tests/output/custom/this-is-a-super-article.html    |  1 +
 tests/output/custom/unbelievable.html               |  1 +
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 737d3789..516fd3b5 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -14,12 +14,13 @@
       {% include 'article_infos.html' %}
       {{ article.content }}
     </div><!-- /.entry-content -->
-    {% if DISQUS_SITENAME %}
+    {% if DISQUS_SITENAME and SITEURL and article.status != "draft" %}
     <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "{{ article.url }}";
+        var disqus_url = "{{ SITEURL }}/{{ article.url }}";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html
index be71022c..90586fe2 100644
--- a/tests/output/custom/a-markdown-powered-article.html
+++ b/tests/output/custom/a-markdown-powered-article.html
@@ -62,6 +62,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "a-markdown-powered-article.html";
+        var disqus_url = "./a-markdown-powered-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/article-1.html b/tests/output/custom/article-1.html
index 2616e332..ebad4b48 100644
--- a/tests/output/custom/article-1.html
+++ b/tests/output/custom/article-1.html
@@ -61,6 +61,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "article-1.html";
+        var disqus_url = "./article-1.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/article-2.html b/tests/output/custom/article-2.html
index 64cf12a8..81536509 100644
--- a/tests/output/custom/article-2.html
+++ b/tests/output/custom/article-2.html
@@ -61,6 +61,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "article-2.html";
+        var disqus_url = "./article-2.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/article-3.html b/tests/output/custom/article-3.html
index 919e04e3..677c000e 100644
--- a/tests/output/custom/article-3.html
+++ b/tests/output/custom/article-3.html
@@ -61,6 +61,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "article-3.html";
+        var disqus_url = "./article-3.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/drafts/a-draft-article.html b/tests/output/custom/drafts/a-draft-article.html
index f763aa42..eb50cac5 100644
--- a/tests/output/custom/drafts/a-draft-article.html
+++ b/tests/output/custom/drafts/a-draft-article.html
@@ -57,18 +57,6 @@
 listed anywhere else.</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_identifier = "a-draft-article.html";
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-    </div>
     
   </article>
 </section>
diff --git a/tests/output/custom/filename_metadata-example.html b/tests/output/custom/filename_metadata-example.html
index af05059b..432a1cdf 100644
--- a/tests/output/custom/filename_metadata-example.html
+++ b/tests/output/custom/filename_metadata-example.html
@@ -61,6 +61,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "filename_metadata-example.html";
+        var disqus_url = "./filename_metadata-example.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/oh-yeah-fr.html b/tests/output/custom/oh-yeah-fr.html
index 07d4abec..10debbcd 100644
--- a/tests/output/custom/oh-yeah-fr.html
+++ b/tests/output/custom/oh-yeah-fr.html
@@ -63,6 +63,7 @@ Translations:
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "oh-yeah-fr.html";
+        var disqus_url = "./oh-yeah-fr.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html
index 899efc1d..bd51d7a5 100644
--- a/tests/output/custom/oh-yeah.html
+++ b/tests/output/custom/oh-yeah.html
@@ -68,6 +68,7 @@ YEAH !</p>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "oh-yeah.html";
+        var disqus_url = "./oh-yeah.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/second-article-fr.html b/tests/output/custom/second-article-fr.html
index 8ebbb2b4..b3fbefb7 100644
--- a/tests/output/custom/second-article-fr.html
+++ b/tests/output/custom/second-article-fr.html
@@ -63,6 +63,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "second-article-fr.html";
+        var disqus_url = "./second-article-fr.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/second-article.html b/tests/output/custom/second-article.html
index 7a543597..2bd3dea6 100644
--- a/tests/output/custom/second-article.html
+++ b/tests/output/custom/second-article.html
@@ -63,6 +63,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "second-article.html";
+        var disqus_url = "./second-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html
index 3cbd9e5f..565d5aa3 100644
--- a/tests/output/custom/this-is-a-super-article.html
+++ b/tests/output/custom/this-is-a-super-article.html
@@ -72,6 +72,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "this-is-a-super-article.html";
+        var disqus_url = "./this-is-a-super-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index 2ffc143d..be5c1f1a 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -63,6 +63,7 @@
       <div id="disqus_thread"></div>
       <script type="text/javascript">
         var disqus_identifier = "unbelievable.html";
+        var disqus_url = "./unbelievable.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';

From a2d585084e9db7d6ecaa89415c30f2ee0d722368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Wed, 6 Mar 2013 00:04:26 -0800
Subject: [PATCH 1163/2864] update the output files

---
 tests/output/basic/override/index.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/output/basic/override/index.html b/tests/output/basic/override/index.html
index e6de769c..fedb4125 100644
--- a/tests/output/basic/override/index.html
+++ b/tests/output/basic/override/index.html
@@ -39,7 +39,14 @@ at a custom location.</p>
 
 </section>
         <section id="extras" class="body">
-                        </section><!-- /#extras -->
+                                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            
+                                                </ul>
+                </div><!-- /.social -->
+                </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">

From 2692586abe8fe9fe6ec6c4d422b5306a8e6523ea Mon Sep 17 00:00:00 2001
From: Irfan Ahmad <erfaan@gmail.com>
Date: Wed, 19 Dec 2012 17:06:44 +0500
Subject: [PATCH 1164/2864] Fixes #645 - Making cross-content linking windows
 compatible

---
 pelican/contents.py   | 3 +++
 pelican/generators.py | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pelican/contents.py b/pelican/contents.py
index de2b7512..c33511c1 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -340,6 +340,9 @@ class StaticContent(object):
             settings = copy.deepcopy(_DEFAULT_CONFIG)
         self.src = src
         self.url = dst or src
+        # On Windows, make sure we end up with Unix-like paths.
+        if os.name == 'nt':
+            self.url = self.url.replace('\\', '/')
         self.source_path = os.path.join(settings['PATH'], src)
         self.save_as = os.path.join(settings['OUTPUT_PATH'], self.url)
 
diff --git a/pelican/generators.py b/pelican/generators.py
index e3ebf994..606a1aa7 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -510,6 +510,9 @@ class StaticGenerator(Generator):
             for f in self.get_files(
                     os.path.join(self.path, static_path), extensions=False):
                 f_rel = os.path.relpath(f, self.path)
+                # On Windows, make sure we end up with Unix-like paths.
+                if os.name == 'nt':
+                    f_rel = f_rel.replace('\\', '/')
                 # TODO remove this hardcoded 'static' subdirectory
                 sc = StaticContent(f_rel, os.path.join('static', f_rel),
                         settings=self.settings)

From 547f8d2e83807c0dc5ce4f4409d5061528514e74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Wed, 6 Mar 2013 00:41:27 -0800
Subject: [PATCH 1165/2864] Move the tests into pelican. Fix #500

---
 .travis.yml                                         |   2 +-
 {tests => pelican/tests}/TestPages/bad_page.rst     |   0
 {tests => pelican/tests}/TestPages/hidden_page.rst  |   0
 .../tests}/TestPages/hidden_page_markdown.md        |   0
 .../tests}/TestPages/hidden_page_with_template.rst  |   0
 {tests => pelican/tests}/TestPages/page.rst         |   0
 {tests => pelican/tests}/TestPages/page_markdown.md |   0
 .../tests}/TestPages/page_with_template.rst         |   0
 {tests => pelican/tests}/__init__.py                |   0
 .../2012-11-29_rst_w_filename_meta#foo-bar.rst      |   0
 .../2012-11-30_md_w_filename_meta#foo-bar.md        |   0
 .../content/TestCategory/article_with_category.rst  |   0
 .../TestCategory/article_without_category.rst       |   0
 {tests => pelican/tests}/content/article.rst        |   0
 .../tests}/content/article_with_asc_extension.asc   |   0
 .../tests}/content/article_with_asc_options.asc     |   0
 .../tests}/content/article_with_comments.html       |   0
 .../tests}/content/article_with_keywords.html       |   0
 ...icle_with_markdown_and_summary_metadata_multi.md |   0
 ...cle_with_markdown_and_summary_metadata_single.md |   0
 .../article_with_markdown_extension.markdown        |   0
 .../article_with_markdown_markup_extensions.md      |   0
 .../tests}/content/article_with_md_extension.md     |   0
 .../tests}/content/article_with_metadata.html       |   0
 .../tests}/content/article_with_metadata.rst        |   0
 .../tests}/content/article_with_mkd_extension.mkd   |   0
 .../content/article_with_null_attributes.html       |   0
 .../tests}/content/article_with_template.rst        |   0
 .../content/article_with_uppercase_metadata.html    |   0
 .../content/article_with_uppercase_metadata.rst     |   0
 .../tests}/content/article_without_category.rst     |   0
 .../tests}/content/wordpressexport.xml              |   0
 {tests => pelican/tests}/default_conf.py            |   0
 .../output/basic/a-markdown-powered-article.html    |   0
 {tests => pelican/tests}/output/basic/archives.html |   0
 .../tests}/output/basic/article-1.html              |   0
 .../tests}/output/basic/article-2.html              |   0
 .../tests}/output/basic/article-3.html              |   0
 .../output/basic/author/alexis-metaireau.html       |   0
 .../tests}/output/basic/categories.html             |   0
 .../tests}/output/basic/category/bar.html           |   0
 .../tests}/output/basic/category/cat1.html          |   0
 .../tests}/output/basic/category/misc.html          |   0
 .../tests}/output/basic/category/yeah.html          |   0
 .../tests}/output/basic/feeds/all-en.atom.xml       |   0
 .../tests}/output/basic/feeds/all-fr.atom.xml       |   0
 .../tests}/output/basic/feeds/all.atom.xml          |   0
 .../tests}/output/basic/feeds/bar.atom.xml          |   0
 .../tests}/output/basic/feeds/cat1.atom.xml         |   0
 .../tests}/output/basic/feeds/misc.atom.xml         |   0
 .../tests}/output/basic/feeds/yeah.atom.xml         |   0
 .../output/basic/filename_metadata-example.html     |   0
 {tests => pelican/tests}/output/basic/index.html    |   0
 {tests => pelican/tests}/output/basic/oh-yeah.html  |   0
 .../tests}/output/basic/override/index.html         |   0
 .../basic/pages/this-is-a-test-hidden-page.html     |   0
 .../output/basic/pages/this-is-a-test-page.html     |   0
 .../tests}/output/basic/second-article-fr.html      |   0
 .../tests}/output/basic/second-article.html         |   0
 {tests => pelican/tests}/output/basic/tag/bar.html  |   0
 {tests => pelican/tests}/output/basic/tag/baz.html  |   0
 {tests => pelican/tests}/output/basic/tag/foo.html  |   0
 .../tests}/output/basic/tag/foobar.html             |   0
 {tests => pelican/tests}/output/basic/tag/oh.html   |   0
 {tests => pelican/tests}/output/basic/tag/yeah.html |   0
 {tests => pelican/tests}/output/basic/tags.html     |   0
 .../tests}/output/basic/theme/css/main.css          |   0
 .../tests}/output/basic/theme/css/pygment.css       |   0
 .../tests}/output/basic/theme/css/reset.css         |   0
 .../tests}/output/basic/theme/css/typogrify.css     |   0
 .../tests}/output/basic/theme/css/wide.css          |   0
 .../output/basic/theme/images/icons/delicious.png   | Bin
 .../output/basic/theme/images/icons/facebook.png    | Bin
 .../output/basic/theme/images/icons/github.png      | Bin
 .../output/basic/theme/images/icons/gitorious.png   | Bin
 .../output/basic/theme/images/icons/gittip.png      | Bin
 .../output/basic/theme/images/icons/google-plus.png | Bin
 .../output/basic/theme/images/icons/lastfm.png      | Bin
 .../output/basic/theme/images/icons/linkedin.png    | Bin
 .../tests}/output/basic/theme/images/icons/rss.png  | Bin
 .../output/basic/theme/images/icons/twitter.png     | Bin
 .../output/basic/this-is-a-super-article.html       |   0
 .../tests}/output/basic/unbelievable.html           |   0
 .../output/custom/a-markdown-powered-article.html   |   0
 .../tests}/output/custom/archives.html              |   0
 .../tests}/output/custom/article-1.html             |   0
 .../tests}/output/custom/article-2.html             |   0
 .../tests}/output/custom/article-3.html             |   0
 .../output/custom/author/alexis-metaireau.html      |   0
 .../output/custom/author/alexis-metaireau2.html     |   0
 .../output/custom/author/alexis-metaireau3.html     |   0
 .../tests}/output/custom/categories.html            |   0
 .../tests}/output/custom/category/bar.html          |   0
 .../tests}/output/custom/category/cat1.html         |   0
 .../tests}/output/custom/category/misc.html         |   0
 .../tests}/output/custom/category/yeah.html         |   0
 .../output/custom/drafts/a-draft-article.html       |   0
 .../tests}/output/custom/feeds/all-en.atom.xml      |   0
 .../tests}/output/custom/feeds/all-fr.atom.xml      |   0
 .../tests}/output/custom/feeds/all.atom.xml         |   0
 .../tests}/output/custom/feeds/all.rss.xml          |   0
 .../tests}/output/custom/feeds/bar.atom.xml         |   0
 .../tests}/output/custom/feeds/bar.rss.xml          |   0
 .../tests}/output/custom/feeds/cat1.atom.xml        |   0
 .../tests}/output/custom/feeds/cat1.rss.xml         |   0
 .../tests}/output/custom/feeds/misc.atom.xml        |   0
 .../tests}/output/custom/feeds/misc.rss.xml         |   0
 .../tests}/output/custom/feeds/yeah.atom.xml        |   0
 .../tests}/output/custom/feeds/yeah.rss.xml         |   0
 .../output/custom/filename_metadata-example.html    |   0
 {tests => pelican/tests}/output/custom/index.html   |   0
 {tests => pelican/tests}/output/custom/index2.html  |   0
 {tests => pelican/tests}/output/custom/index3.html  |   0
 .../tests}/output/custom/jinja2_template.html       |   0
 .../tests}/output/custom/oh-yeah-fr.html            |   0
 {tests => pelican/tests}/output/custom/oh-yeah.html |   0
 .../tests}/output/custom/override/index.html        |   0
 .../custom/pages/this-is-a-test-hidden-page.html    |   0
 .../output/custom/pages/this-is-a-test-page.html    |   0
 {tests => pelican/tests}/output/custom/robots.txt   |   0
 .../tests}/output/custom/second-article-fr.html     |   0
 .../tests}/output/custom/second-article.html        |   0
 .../output/custom/static/pictures/Fat_Cat.jpg       | Bin
 .../tests}/output/custom/static/pictures/Sushi.jpg  | Bin
 .../output/custom/static/pictures/Sushi_Macro.jpg   | Bin
 {tests => pelican/tests}/output/custom/tag/bar.html |   0
 {tests => pelican/tests}/output/custom/tag/baz.html |   0
 {tests => pelican/tests}/output/custom/tag/foo.html |   0
 .../tests}/output/custom/tag/foobar.html            |   0
 {tests => pelican/tests}/output/custom/tag/oh.html  |   0
 .../tests}/output/custom/tag/yeah.html              |   0
 {tests => pelican/tests}/output/custom/tags.html    |   0
 .../tests}/output/custom/theme/css/main.css         |   0
 .../tests}/output/custom/theme/css/pygment.css      |   0
 .../tests}/output/custom/theme/css/reset.css        |   0
 .../tests}/output/custom/theme/css/typogrify.css    |   0
 .../tests}/output/custom/theme/css/wide.css         |   0
 .../output/custom/theme/images/icons/delicious.png  | Bin
 .../output/custom/theme/images/icons/facebook.png   | Bin
 .../output/custom/theme/images/icons/github.png     | Bin
 .../output/custom/theme/images/icons/gitorious.png  | Bin
 .../output/custom/theme/images/icons/gittip.png     | Bin
 .../custom/theme/images/icons/google-plus.png       | Bin
 .../output/custom/theme/images/icons/lastfm.png     | Bin
 .../output/custom/theme/images/icons/linkedin.png   | Bin
 .../tests}/output/custom/theme/images/icons/rss.png | Bin
 .../output/custom/theme/images/icons/twitter.png    | Bin
 .../output/custom/this-is-a-super-article.html      |   0
 .../tests}/output/custom/unbelievable.html          |   0
 {tests => pelican/tests}/support.py                 |   0
 {tests => pelican/tests}/test_contents.py           |   0
 {tests => pelican/tests}/test_generators.py         |   2 +-
 {tests => pelican/tests}/test_importer.py           |   3 ++-
 {tests => pelican/tests}/test_pelican.py            |   5 +++--
 {tests => pelican/tests}/test_plugins.py            |   4 ++--
 {tests => pelican/tests}/test_readers.py            |   2 +-
 {tests => pelican/tests}/test_settings.py           |   2 +-
 {tests => pelican/tests}/test_utils.py              |   0
 {tests => pelican/tests}/test_webassets.py          |   0
 .../tests}/themes/assets/static/css/style.min.css   |   0
 .../tests}/themes/assets/static/css/style.scss      |   0
 .../tests}/themes/assets/templates/base.html        |   0
 setup.py                                            |   2 +-
 tox.ini                                             |   2 +-
 164 files changed, 13 insertions(+), 11 deletions(-)
 rename {tests => pelican/tests}/TestPages/bad_page.rst (100%)
 rename {tests => pelican/tests}/TestPages/hidden_page.rst (100%)
 rename {tests => pelican/tests}/TestPages/hidden_page_markdown.md (100%)
 rename {tests => pelican/tests}/TestPages/hidden_page_with_template.rst (100%)
 rename {tests => pelican/tests}/TestPages/page.rst (100%)
 rename {tests => pelican/tests}/TestPages/page_markdown.md (100%)
 rename {tests => pelican/tests}/TestPages/page_with_template.rst (100%)
 rename {tests => pelican/tests}/__init__.py (100%)
 rename {tests => pelican/tests}/content/2012-11-29_rst_w_filename_meta#foo-bar.rst (100%)
 rename {tests => pelican/tests}/content/2012-11-30_md_w_filename_meta#foo-bar.md (100%)
 rename {tests => pelican/tests}/content/TestCategory/article_with_category.rst (100%)
 rename {tests => pelican/tests}/content/TestCategory/article_without_category.rst (100%)
 rename {tests => pelican/tests}/content/article.rst (100%)
 rename {tests => pelican/tests}/content/article_with_asc_extension.asc (100%)
 rename {tests => pelican/tests}/content/article_with_asc_options.asc (100%)
 rename {tests => pelican/tests}/content/article_with_comments.html (100%)
 rename {tests => pelican/tests}/content/article_with_keywords.html (100%)
 rename {tests => pelican/tests}/content/article_with_markdown_and_summary_metadata_multi.md (100%)
 rename {tests => pelican/tests}/content/article_with_markdown_and_summary_metadata_single.md (100%)
 rename {tests => pelican/tests}/content/article_with_markdown_extension.markdown (100%)
 rename {tests => pelican/tests}/content/article_with_markdown_markup_extensions.md (100%)
 rename {tests => pelican/tests}/content/article_with_md_extension.md (100%)
 rename {tests => pelican/tests}/content/article_with_metadata.html (100%)
 rename {tests => pelican/tests}/content/article_with_metadata.rst (100%)
 rename {tests => pelican/tests}/content/article_with_mkd_extension.mkd (100%)
 rename {tests => pelican/tests}/content/article_with_null_attributes.html (100%)
 rename {tests => pelican/tests}/content/article_with_template.rst (100%)
 rename {tests => pelican/tests}/content/article_with_uppercase_metadata.html (100%)
 rename {tests => pelican/tests}/content/article_with_uppercase_metadata.rst (100%)
 rename {tests => pelican/tests}/content/article_without_category.rst (100%)
 rename {tests => pelican/tests}/content/wordpressexport.xml (100%)
 rename {tests => pelican/tests}/default_conf.py (100%)
 rename {tests => pelican/tests}/output/basic/a-markdown-powered-article.html (100%)
 rename {tests => pelican/tests}/output/basic/archives.html (100%)
 rename {tests => pelican/tests}/output/basic/article-1.html (100%)
 rename {tests => pelican/tests}/output/basic/article-2.html (100%)
 rename {tests => pelican/tests}/output/basic/article-3.html (100%)
 rename {tests => pelican/tests}/output/basic/author/alexis-metaireau.html (100%)
 rename {tests => pelican/tests}/output/basic/categories.html (100%)
 rename {tests => pelican/tests}/output/basic/category/bar.html (100%)
 rename {tests => pelican/tests}/output/basic/category/cat1.html (100%)
 rename {tests => pelican/tests}/output/basic/category/misc.html (100%)
 rename {tests => pelican/tests}/output/basic/category/yeah.html (100%)
 rename {tests => pelican/tests}/output/basic/feeds/all-en.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/all-fr.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/all.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/bar.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/cat1.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/misc.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/feeds/yeah.atom.xml (100%)
 rename {tests => pelican/tests}/output/basic/filename_metadata-example.html (100%)
 rename {tests => pelican/tests}/output/basic/index.html (100%)
 rename {tests => pelican/tests}/output/basic/oh-yeah.html (100%)
 rename {tests => pelican/tests}/output/basic/override/index.html (100%)
 rename {tests => pelican/tests}/output/basic/pages/this-is-a-test-hidden-page.html (100%)
 rename {tests => pelican/tests}/output/basic/pages/this-is-a-test-page.html (100%)
 rename {tests => pelican/tests}/output/basic/second-article-fr.html (100%)
 rename {tests => pelican/tests}/output/basic/second-article.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/bar.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/baz.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/foo.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/foobar.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/oh.html (100%)
 rename {tests => pelican/tests}/output/basic/tag/yeah.html (100%)
 rename {tests => pelican/tests}/output/basic/tags.html (100%)
 rename {tests => pelican/tests}/output/basic/theme/css/main.css (100%)
 rename {tests => pelican/tests}/output/basic/theme/css/pygment.css (100%)
 rename {tests => pelican/tests}/output/basic/theme/css/reset.css (100%)
 rename {tests => pelican/tests}/output/basic/theme/css/typogrify.css (100%)
 rename {tests => pelican/tests}/output/basic/theme/css/wide.css (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/delicious.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/facebook.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/github.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/gitorious.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/gittip.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/google-plus.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/lastfm.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/linkedin.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/rss.png (100%)
 rename {tests => pelican/tests}/output/basic/theme/images/icons/twitter.png (100%)
 rename {tests => pelican/tests}/output/basic/this-is-a-super-article.html (100%)
 rename {tests => pelican/tests}/output/basic/unbelievable.html (100%)
 rename {tests => pelican/tests}/output/custom/a-markdown-powered-article.html (100%)
 rename {tests => pelican/tests}/output/custom/archives.html (100%)
 rename {tests => pelican/tests}/output/custom/article-1.html (100%)
 rename {tests => pelican/tests}/output/custom/article-2.html (100%)
 rename {tests => pelican/tests}/output/custom/article-3.html (100%)
 rename {tests => pelican/tests}/output/custom/author/alexis-metaireau.html (100%)
 rename {tests => pelican/tests}/output/custom/author/alexis-metaireau2.html (100%)
 rename {tests => pelican/tests}/output/custom/author/alexis-metaireau3.html (100%)
 rename {tests => pelican/tests}/output/custom/categories.html (100%)
 rename {tests => pelican/tests}/output/custom/category/bar.html (100%)
 rename {tests => pelican/tests}/output/custom/category/cat1.html (100%)
 rename {tests => pelican/tests}/output/custom/category/misc.html (100%)
 rename {tests => pelican/tests}/output/custom/category/yeah.html (100%)
 rename {tests => pelican/tests}/output/custom/drafts/a-draft-article.html (100%)
 rename {tests => pelican/tests}/output/custom/feeds/all-en.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/all-fr.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/all.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/all.rss.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/bar.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/bar.rss.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/cat1.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/cat1.rss.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/misc.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/misc.rss.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/yeah.atom.xml (100%)
 rename {tests => pelican/tests}/output/custom/feeds/yeah.rss.xml (100%)
 rename {tests => pelican/tests}/output/custom/filename_metadata-example.html (100%)
 rename {tests => pelican/tests}/output/custom/index.html (100%)
 rename {tests => pelican/tests}/output/custom/index2.html (100%)
 rename {tests => pelican/tests}/output/custom/index3.html (100%)
 rename {tests => pelican/tests}/output/custom/jinja2_template.html (100%)
 rename {tests => pelican/tests}/output/custom/oh-yeah-fr.html (100%)
 rename {tests => pelican/tests}/output/custom/oh-yeah.html (100%)
 rename {tests => pelican/tests}/output/custom/override/index.html (100%)
 rename {tests => pelican/tests}/output/custom/pages/this-is-a-test-hidden-page.html (100%)
 rename {tests => pelican/tests}/output/custom/pages/this-is-a-test-page.html (100%)
 rename {tests => pelican/tests}/output/custom/robots.txt (100%)
 rename {tests => pelican/tests}/output/custom/second-article-fr.html (100%)
 rename {tests => pelican/tests}/output/custom/second-article.html (100%)
 rename {tests => pelican/tests}/output/custom/static/pictures/Fat_Cat.jpg (100%)
 rename {tests => pelican/tests}/output/custom/static/pictures/Sushi.jpg (100%)
 rename {tests => pelican/tests}/output/custom/static/pictures/Sushi_Macro.jpg (100%)
 rename {tests => pelican/tests}/output/custom/tag/bar.html (100%)
 rename {tests => pelican/tests}/output/custom/tag/baz.html (100%)
 rename {tests => pelican/tests}/output/custom/tag/foo.html (100%)
 rename {tests => pelican/tests}/output/custom/tag/foobar.html (100%)
 rename {tests => pelican/tests}/output/custom/tag/oh.html (100%)
 rename {tests => pelican/tests}/output/custom/tag/yeah.html (100%)
 rename {tests => pelican/tests}/output/custom/tags.html (100%)
 rename {tests => pelican/tests}/output/custom/theme/css/main.css (100%)
 rename {tests => pelican/tests}/output/custom/theme/css/pygment.css (100%)
 rename {tests => pelican/tests}/output/custom/theme/css/reset.css (100%)
 rename {tests => pelican/tests}/output/custom/theme/css/typogrify.css (100%)
 rename {tests => pelican/tests}/output/custom/theme/css/wide.css (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/delicious.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/facebook.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/github.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/gitorious.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/gittip.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/google-plus.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/lastfm.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/linkedin.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/rss.png (100%)
 rename {tests => pelican/tests}/output/custom/theme/images/icons/twitter.png (100%)
 rename {tests => pelican/tests}/output/custom/this-is-a-super-article.html (100%)
 rename {tests => pelican/tests}/output/custom/unbelievable.html (100%)
 rename {tests => pelican/tests}/support.py (100%)
 rename {tests => pelican/tests}/test_contents.py (100%)
 rename {tests => pelican/tests}/test_generators.py (99%)
 rename {tests => pelican/tests}/test_importer.py (94%)
 rename {tests => pelican/tests}/test_pelican.py (96%)
 rename {tests => pelican/tests}/test_plugins.py (96%)
 rename {tests => pelican/tests}/test_readers.py (99%)
 rename {tests => pelican/tests}/test_settings.py (98%)
 rename {tests => pelican/tests}/test_utils.py (100%)
 rename {tests => pelican/tests}/test_webassets.py (100%)
 rename {tests => pelican/tests}/themes/assets/static/css/style.min.css (100%)
 rename {tests => pelican/tests}/themes/assets/static/css/style.scss (100%)
 rename {tests => pelican/tests}/themes/assets/templates/base.html (100%)

diff --git a/.travis.yml b/.travis.yml
index 569ea7b6..04ea768b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ install:
     - pip install Markdown
     - pip install webassets
     - pip install cssmin
-script: nosetests -s tests
+script: nosetests -s pelican
 notifications:
     irc:
         channels:
diff --git a/tests/TestPages/bad_page.rst b/pelican/tests/TestPages/bad_page.rst
similarity index 100%
rename from tests/TestPages/bad_page.rst
rename to pelican/tests/TestPages/bad_page.rst
diff --git a/tests/TestPages/hidden_page.rst b/pelican/tests/TestPages/hidden_page.rst
similarity index 100%
rename from tests/TestPages/hidden_page.rst
rename to pelican/tests/TestPages/hidden_page.rst
diff --git a/tests/TestPages/hidden_page_markdown.md b/pelican/tests/TestPages/hidden_page_markdown.md
similarity index 100%
rename from tests/TestPages/hidden_page_markdown.md
rename to pelican/tests/TestPages/hidden_page_markdown.md
diff --git a/tests/TestPages/hidden_page_with_template.rst b/pelican/tests/TestPages/hidden_page_with_template.rst
similarity index 100%
rename from tests/TestPages/hidden_page_with_template.rst
rename to pelican/tests/TestPages/hidden_page_with_template.rst
diff --git a/tests/TestPages/page.rst b/pelican/tests/TestPages/page.rst
similarity index 100%
rename from tests/TestPages/page.rst
rename to pelican/tests/TestPages/page.rst
diff --git a/tests/TestPages/page_markdown.md b/pelican/tests/TestPages/page_markdown.md
similarity index 100%
rename from tests/TestPages/page_markdown.md
rename to pelican/tests/TestPages/page_markdown.md
diff --git a/tests/TestPages/page_with_template.rst b/pelican/tests/TestPages/page_with_template.rst
similarity index 100%
rename from tests/TestPages/page_with_template.rst
rename to pelican/tests/TestPages/page_with_template.rst
diff --git a/tests/__init__.py b/pelican/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to pelican/tests/__init__.py
diff --git a/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst b/pelican/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst
similarity index 100%
rename from tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst
rename to pelican/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst
diff --git a/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md b/pelican/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md
similarity index 100%
rename from tests/content/2012-11-30_md_w_filename_meta#foo-bar.md
rename to pelican/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md
diff --git a/tests/content/TestCategory/article_with_category.rst b/pelican/tests/content/TestCategory/article_with_category.rst
similarity index 100%
rename from tests/content/TestCategory/article_with_category.rst
rename to pelican/tests/content/TestCategory/article_with_category.rst
diff --git a/tests/content/TestCategory/article_without_category.rst b/pelican/tests/content/TestCategory/article_without_category.rst
similarity index 100%
rename from tests/content/TestCategory/article_without_category.rst
rename to pelican/tests/content/TestCategory/article_without_category.rst
diff --git a/tests/content/article.rst b/pelican/tests/content/article.rst
similarity index 100%
rename from tests/content/article.rst
rename to pelican/tests/content/article.rst
diff --git a/tests/content/article_with_asc_extension.asc b/pelican/tests/content/article_with_asc_extension.asc
similarity index 100%
rename from tests/content/article_with_asc_extension.asc
rename to pelican/tests/content/article_with_asc_extension.asc
diff --git a/tests/content/article_with_asc_options.asc b/pelican/tests/content/article_with_asc_options.asc
similarity index 100%
rename from tests/content/article_with_asc_options.asc
rename to pelican/tests/content/article_with_asc_options.asc
diff --git a/tests/content/article_with_comments.html b/pelican/tests/content/article_with_comments.html
similarity index 100%
rename from tests/content/article_with_comments.html
rename to pelican/tests/content/article_with_comments.html
diff --git a/tests/content/article_with_keywords.html b/pelican/tests/content/article_with_keywords.html
similarity index 100%
rename from tests/content/article_with_keywords.html
rename to pelican/tests/content/article_with_keywords.html
diff --git a/tests/content/article_with_markdown_and_summary_metadata_multi.md b/pelican/tests/content/article_with_markdown_and_summary_metadata_multi.md
similarity index 100%
rename from tests/content/article_with_markdown_and_summary_metadata_multi.md
rename to pelican/tests/content/article_with_markdown_and_summary_metadata_multi.md
diff --git a/tests/content/article_with_markdown_and_summary_metadata_single.md b/pelican/tests/content/article_with_markdown_and_summary_metadata_single.md
similarity index 100%
rename from tests/content/article_with_markdown_and_summary_metadata_single.md
rename to pelican/tests/content/article_with_markdown_and_summary_metadata_single.md
diff --git a/tests/content/article_with_markdown_extension.markdown b/pelican/tests/content/article_with_markdown_extension.markdown
similarity index 100%
rename from tests/content/article_with_markdown_extension.markdown
rename to pelican/tests/content/article_with_markdown_extension.markdown
diff --git a/tests/content/article_with_markdown_markup_extensions.md b/pelican/tests/content/article_with_markdown_markup_extensions.md
similarity index 100%
rename from tests/content/article_with_markdown_markup_extensions.md
rename to pelican/tests/content/article_with_markdown_markup_extensions.md
diff --git a/tests/content/article_with_md_extension.md b/pelican/tests/content/article_with_md_extension.md
similarity index 100%
rename from tests/content/article_with_md_extension.md
rename to pelican/tests/content/article_with_md_extension.md
diff --git a/tests/content/article_with_metadata.html b/pelican/tests/content/article_with_metadata.html
similarity index 100%
rename from tests/content/article_with_metadata.html
rename to pelican/tests/content/article_with_metadata.html
diff --git a/tests/content/article_with_metadata.rst b/pelican/tests/content/article_with_metadata.rst
similarity index 100%
rename from tests/content/article_with_metadata.rst
rename to pelican/tests/content/article_with_metadata.rst
diff --git a/tests/content/article_with_mkd_extension.mkd b/pelican/tests/content/article_with_mkd_extension.mkd
similarity index 100%
rename from tests/content/article_with_mkd_extension.mkd
rename to pelican/tests/content/article_with_mkd_extension.mkd
diff --git a/tests/content/article_with_null_attributes.html b/pelican/tests/content/article_with_null_attributes.html
similarity index 100%
rename from tests/content/article_with_null_attributes.html
rename to pelican/tests/content/article_with_null_attributes.html
diff --git a/tests/content/article_with_template.rst b/pelican/tests/content/article_with_template.rst
similarity index 100%
rename from tests/content/article_with_template.rst
rename to pelican/tests/content/article_with_template.rst
diff --git a/tests/content/article_with_uppercase_metadata.html b/pelican/tests/content/article_with_uppercase_metadata.html
similarity index 100%
rename from tests/content/article_with_uppercase_metadata.html
rename to pelican/tests/content/article_with_uppercase_metadata.html
diff --git a/tests/content/article_with_uppercase_metadata.rst b/pelican/tests/content/article_with_uppercase_metadata.rst
similarity index 100%
rename from tests/content/article_with_uppercase_metadata.rst
rename to pelican/tests/content/article_with_uppercase_metadata.rst
diff --git a/tests/content/article_without_category.rst b/pelican/tests/content/article_without_category.rst
similarity index 100%
rename from tests/content/article_without_category.rst
rename to pelican/tests/content/article_without_category.rst
diff --git a/tests/content/wordpressexport.xml b/pelican/tests/content/wordpressexport.xml
similarity index 100%
rename from tests/content/wordpressexport.xml
rename to pelican/tests/content/wordpressexport.xml
diff --git a/tests/default_conf.py b/pelican/tests/default_conf.py
similarity index 100%
rename from tests/default_conf.py
rename to pelican/tests/default_conf.py
diff --git a/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
similarity index 100%
rename from tests/output/basic/a-markdown-powered-article.html
rename to pelican/tests/output/basic/a-markdown-powered-article.html
diff --git a/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
similarity index 100%
rename from tests/output/basic/archives.html
rename to pelican/tests/output/basic/archives.html
diff --git a/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
similarity index 100%
rename from tests/output/basic/article-1.html
rename to pelican/tests/output/basic/article-1.html
diff --git a/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
similarity index 100%
rename from tests/output/basic/article-2.html
rename to pelican/tests/output/basic/article-2.html
diff --git a/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
similarity index 100%
rename from tests/output/basic/article-3.html
rename to pelican/tests/output/basic/article-3.html
diff --git a/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
similarity index 100%
rename from tests/output/basic/author/alexis-metaireau.html
rename to pelican/tests/output/basic/author/alexis-metaireau.html
diff --git a/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
similarity index 100%
rename from tests/output/basic/categories.html
rename to pelican/tests/output/basic/categories.html
diff --git a/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
similarity index 100%
rename from tests/output/basic/category/bar.html
rename to pelican/tests/output/basic/category/bar.html
diff --git a/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
similarity index 100%
rename from tests/output/basic/category/cat1.html
rename to pelican/tests/output/basic/category/cat1.html
diff --git a/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
similarity index 100%
rename from tests/output/basic/category/misc.html
rename to pelican/tests/output/basic/category/misc.html
diff --git a/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
similarity index 100%
rename from tests/output/basic/category/yeah.html
rename to pelican/tests/output/basic/category/yeah.html
diff --git a/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/all-en.atom.xml
rename to pelican/tests/output/basic/feeds/all-en.atom.xml
diff --git a/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/all-fr.atom.xml
rename to pelican/tests/output/basic/feeds/all-fr.atom.xml
diff --git a/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/all.atom.xml
rename to pelican/tests/output/basic/feeds/all.atom.xml
diff --git a/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/bar.atom.xml
rename to pelican/tests/output/basic/feeds/bar.atom.xml
diff --git a/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/cat1.atom.xml
rename to pelican/tests/output/basic/feeds/cat1.atom.xml
diff --git a/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/misc.atom.xml
rename to pelican/tests/output/basic/feeds/misc.atom.xml
diff --git a/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
similarity index 100%
rename from tests/output/basic/feeds/yeah.atom.xml
rename to pelican/tests/output/basic/feeds/yeah.atom.xml
diff --git a/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
similarity index 100%
rename from tests/output/basic/filename_metadata-example.html
rename to pelican/tests/output/basic/filename_metadata-example.html
diff --git a/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
similarity index 100%
rename from tests/output/basic/index.html
rename to pelican/tests/output/basic/index.html
diff --git a/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
similarity index 100%
rename from tests/output/basic/oh-yeah.html
rename to pelican/tests/output/basic/oh-yeah.html
diff --git a/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
similarity index 100%
rename from tests/output/basic/override/index.html
rename to pelican/tests/output/basic/override/index.html
diff --git a/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
similarity index 100%
rename from tests/output/basic/pages/this-is-a-test-hidden-page.html
rename to pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
diff --git a/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
similarity index 100%
rename from tests/output/basic/pages/this-is-a-test-page.html
rename to pelican/tests/output/basic/pages/this-is-a-test-page.html
diff --git a/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
similarity index 100%
rename from tests/output/basic/second-article-fr.html
rename to pelican/tests/output/basic/second-article-fr.html
diff --git a/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
similarity index 100%
rename from tests/output/basic/second-article.html
rename to pelican/tests/output/basic/second-article.html
diff --git a/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
similarity index 100%
rename from tests/output/basic/tag/bar.html
rename to pelican/tests/output/basic/tag/bar.html
diff --git a/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
similarity index 100%
rename from tests/output/basic/tag/baz.html
rename to pelican/tests/output/basic/tag/baz.html
diff --git a/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
similarity index 100%
rename from tests/output/basic/tag/foo.html
rename to pelican/tests/output/basic/tag/foo.html
diff --git a/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
similarity index 100%
rename from tests/output/basic/tag/foobar.html
rename to pelican/tests/output/basic/tag/foobar.html
diff --git a/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
similarity index 100%
rename from tests/output/basic/tag/oh.html
rename to pelican/tests/output/basic/tag/oh.html
diff --git a/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
similarity index 100%
rename from tests/output/basic/tag/yeah.html
rename to pelican/tests/output/basic/tag/yeah.html
diff --git a/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
similarity index 100%
rename from tests/output/basic/tags.html
rename to pelican/tests/output/basic/tags.html
diff --git a/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
similarity index 100%
rename from tests/output/basic/theme/css/main.css
rename to pelican/tests/output/basic/theme/css/main.css
diff --git a/tests/output/basic/theme/css/pygment.css b/pelican/tests/output/basic/theme/css/pygment.css
similarity index 100%
rename from tests/output/basic/theme/css/pygment.css
rename to pelican/tests/output/basic/theme/css/pygment.css
diff --git a/tests/output/basic/theme/css/reset.css b/pelican/tests/output/basic/theme/css/reset.css
similarity index 100%
rename from tests/output/basic/theme/css/reset.css
rename to pelican/tests/output/basic/theme/css/reset.css
diff --git a/tests/output/basic/theme/css/typogrify.css b/pelican/tests/output/basic/theme/css/typogrify.css
similarity index 100%
rename from tests/output/basic/theme/css/typogrify.css
rename to pelican/tests/output/basic/theme/css/typogrify.css
diff --git a/tests/output/basic/theme/css/wide.css b/pelican/tests/output/basic/theme/css/wide.css
similarity index 100%
rename from tests/output/basic/theme/css/wide.css
rename to pelican/tests/output/basic/theme/css/wide.css
diff --git a/tests/output/basic/theme/images/icons/delicious.png b/pelican/tests/output/basic/theme/images/icons/delicious.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/delicious.png
rename to pelican/tests/output/basic/theme/images/icons/delicious.png
diff --git a/tests/output/basic/theme/images/icons/facebook.png b/pelican/tests/output/basic/theme/images/icons/facebook.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/facebook.png
rename to pelican/tests/output/basic/theme/images/icons/facebook.png
diff --git a/tests/output/basic/theme/images/icons/github.png b/pelican/tests/output/basic/theme/images/icons/github.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/github.png
rename to pelican/tests/output/basic/theme/images/icons/github.png
diff --git a/tests/output/basic/theme/images/icons/gitorious.png b/pelican/tests/output/basic/theme/images/icons/gitorious.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/gitorious.png
rename to pelican/tests/output/basic/theme/images/icons/gitorious.png
diff --git a/tests/output/basic/theme/images/icons/gittip.png b/pelican/tests/output/basic/theme/images/icons/gittip.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/gittip.png
rename to pelican/tests/output/basic/theme/images/icons/gittip.png
diff --git a/tests/output/basic/theme/images/icons/google-plus.png b/pelican/tests/output/basic/theme/images/icons/google-plus.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/google-plus.png
rename to pelican/tests/output/basic/theme/images/icons/google-plus.png
diff --git a/tests/output/basic/theme/images/icons/lastfm.png b/pelican/tests/output/basic/theme/images/icons/lastfm.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/lastfm.png
rename to pelican/tests/output/basic/theme/images/icons/lastfm.png
diff --git a/tests/output/basic/theme/images/icons/linkedin.png b/pelican/tests/output/basic/theme/images/icons/linkedin.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/linkedin.png
rename to pelican/tests/output/basic/theme/images/icons/linkedin.png
diff --git a/tests/output/basic/theme/images/icons/rss.png b/pelican/tests/output/basic/theme/images/icons/rss.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/rss.png
rename to pelican/tests/output/basic/theme/images/icons/rss.png
diff --git a/tests/output/basic/theme/images/icons/twitter.png b/pelican/tests/output/basic/theme/images/icons/twitter.png
similarity index 100%
rename from tests/output/basic/theme/images/icons/twitter.png
rename to pelican/tests/output/basic/theme/images/icons/twitter.png
diff --git a/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
similarity index 100%
rename from tests/output/basic/this-is-a-super-article.html
rename to pelican/tests/output/basic/this-is-a-super-article.html
diff --git a/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
similarity index 100%
rename from tests/output/basic/unbelievable.html
rename to pelican/tests/output/basic/unbelievable.html
diff --git a/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
similarity index 100%
rename from tests/output/custom/a-markdown-powered-article.html
rename to pelican/tests/output/custom/a-markdown-powered-article.html
diff --git a/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
similarity index 100%
rename from tests/output/custom/archives.html
rename to pelican/tests/output/custom/archives.html
diff --git a/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
similarity index 100%
rename from tests/output/custom/article-1.html
rename to pelican/tests/output/custom/article-1.html
diff --git a/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
similarity index 100%
rename from tests/output/custom/article-2.html
rename to pelican/tests/output/custom/article-2.html
diff --git a/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
similarity index 100%
rename from tests/output/custom/article-3.html
rename to pelican/tests/output/custom/article-3.html
diff --git a/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
similarity index 100%
rename from tests/output/custom/author/alexis-metaireau.html
rename to pelican/tests/output/custom/author/alexis-metaireau.html
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
similarity index 100%
rename from tests/output/custom/author/alexis-metaireau2.html
rename to pelican/tests/output/custom/author/alexis-metaireau2.html
diff --git a/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
similarity index 100%
rename from tests/output/custom/author/alexis-metaireau3.html
rename to pelican/tests/output/custom/author/alexis-metaireau3.html
diff --git a/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
similarity index 100%
rename from tests/output/custom/categories.html
rename to pelican/tests/output/custom/categories.html
diff --git a/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
similarity index 100%
rename from tests/output/custom/category/bar.html
rename to pelican/tests/output/custom/category/bar.html
diff --git a/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
similarity index 100%
rename from tests/output/custom/category/cat1.html
rename to pelican/tests/output/custom/category/cat1.html
diff --git a/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
similarity index 100%
rename from tests/output/custom/category/misc.html
rename to pelican/tests/output/custom/category/misc.html
diff --git a/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
similarity index 100%
rename from tests/output/custom/category/yeah.html
rename to pelican/tests/output/custom/category/yeah.html
diff --git a/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
similarity index 100%
rename from tests/output/custom/drafts/a-draft-article.html
rename to pelican/tests/output/custom/drafts/a-draft-article.html
diff --git a/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/all-en.atom.xml
rename to pelican/tests/output/custom/feeds/all-en.atom.xml
diff --git a/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/all-fr.atom.xml
rename to pelican/tests/output/custom/feeds/all-fr.atom.xml
diff --git a/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/all.atom.xml
rename to pelican/tests/output/custom/feeds/all.atom.xml
diff --git a/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
similarity index 100%
rename from tests/output/custom/feeds/all.rss.xml
rename to pelican/tests/output/custom/feeds/all.rss.xml
diff --git a/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/bar.atom.xml
rename to pelican/tests/output/custom/feeds/bar.atom.xml
diff --git a/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
similarity index 100%
rename from tests/output/custom/feeds/bar.rss.xml
rename to pelican/tests/output/custom/feeds/bar.rss.xml
diff --git a/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/cat1.atom.xml
rename to pelican/tests/output/custom/feeds/cat1.atom.xml
diff --git a/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
similarity index 100%
rename from tests/output/custom/feeds/cat1.rss.xml
rename to pelican/tests/output/custom/feeds/cat1.rss.xml
diff --git a/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/misc.atom.xml
rename to pelican/tests/output/custom/feeds/misc.atom.xml
diff --git a/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
similarity index 100%
rename from tests/output/custom/feeds/misc.rss.xml
rename to pelican/tests/output/custom/feeds/misc.rss.xml
diff --git a/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
similarity index 100%
rename from tests/output/custom/feeds/yeah.atom.xml
rename to pelican/tests/output/custom/feeds/yeah.atom.xml
diff --git a/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
similarity index 100%
rename from tests/output/custom/feeds/yeah.rss.xml
rename to pelican/tests/output/custom/feeds/yeah.rss.xml
diff --git a/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
similarity index 100%
rename from tests/output/custom/filename_metadata-example.html
rename to pelican/tests/output/custom/filename_metadata-example.html
diff --git a/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
similarity index 100%
rename from tests/output/custom/index.html
rename to pelican/tests/output/custom/index.html
diff --git a/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
similarity index 100%
rename from tests/output/custom/index2.html
rename to pelican/tests/output/custom/index2.html
diff --git a/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
similarity index 100%
rename from tests/output/custom/index3.html
rename to pelican/tests/output/custom/index3.html
diff --git a/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
similarity index 100%
rename from tests/output/custom/jinja2_template.html
rename to pelican/tests/output/custom/jinja2_template.html
diff --git a/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
similarity index 100%
rename from tests/output/custom/oh-yeah-fr.html
rename to pelican/tests/output/custom/oh-yeah-fr.html
diff --git a/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
similarity index 100%
rename from tests/output/custom/oh-yeah.html
rename to pelican/tests/output/custom/oh-yeah.html
diff --git a/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
similarity index 100%
rename from tests/output/custom/override/index.html
rename to pelican/tests/output/custom/override/index.html
diff --git a/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
similarity index 100%
rename from tests/output/custom/pages/this-is-a-test-hidden-page.html
rename to pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
similarity index 100%
rename from tests/output/custom/pages/this-is-a-test-page.html
rename to pelican/tests/output/custom/pages/this-is-a-test-page.html
diff --git a/tests/output/custom/robots.txt b/pelican/tests/output/custom/robots.txt
similarity index 100%
rename from tests/output/custom/robots.txt
rename to pelican/tests/output/custom/robots.txt
diff --git a/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
similarity index 100%
rename from tests/output/custom/second-article-fr.html
rename to pelican/tests/output/custom/second-article-fr.html
diff --git a/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
similarity index 100%
rename from tests/output/custom/second-article.html
rename to pelican/tests/output/custom/second-article.html
diff --git a/tests/output/custom/static/pictures/Fat_Cat.jpg b/pelican/tests/output/custom/static/pictures/Fat_Cat.jpg
similarity index 100%
rename from tests/output/custom/static/pictures/Fat_Cat.jpg
rename to pelican/tests/output/custom/static/pictures/Fat_Cat.jpg
diff --git a/tests/output/custom/static/pictures/Sushi.jpg b/pelican/tests/output/custom/static/pictures/Sushi.jpg
similarity index 100%
rename from tests/output/custom/static/pictures/Sushi.jpg
rename to pelican/tests/output/custom/static/pictures/Sushi.jpg
diff --git a/tests/output/custom/static/pictures/Sushi_Macro.jpg b/pelican/tests/output/custom/static/pictures/Sushi_Macro.jpg
similarity index 100%
rename from tests/output/custom/static/pictures/Sushi_Macro.jpg
rename to pelican/tests/output/custom/static/pictures/Sushi_Macro.jpg
diff --git a/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
similarity index 100%
rename from tests/output/custom/tag/bar.html
rename to pelican/tests/output/custom/tag/bar.html
diff --git a/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
similarity index 100%
rename from tests/output/custom/tag/baz.html
rename to pelican/tests/output/custom/tag/baz.html
diff --git a/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
similarity index 100%
rename from tests/output/custom/tag/foo.html
rename to pelican/tests/output/custom/tag/foo.html
diff --git a/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
similarity index 100%
rename from tests/output/custom/tag/foobar.html
rename to pelican/tests/output/custom/tag/foobar.html
diff --git a/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
similarity index 100%
rename from tests/output/custom/tag/oh.html
rename to pelican/tests/output/custom/tag/oh.html
diff --git a/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
similarity index 100%
rename from tests/output/custom/tag/yeah.html
rename to pelican/tests/output/custom/tag/yeah.html
diff --git a/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
similarity index 100%
rename from tests/output/custom/tags.html
rename to pelican/tests/output/custom/tags.html
diff --git a/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
similarity index 100%
rename from tests/output/custom/theme/css/main.css
rename to pelican/tests/output/custom/theme/css/main.css
diff --git a/tests/output/custom/theme/css/pygment.css b/pelican/tests/output/custom/theme/css/pygment.css
similarity index 100%
rename from tests/output/custom/theme/css/pygment.css
rename to pelican/tests/output/custom/theme/css/pygment.css
diff --git a/tests/output/custom/theme/css/reset.css b/pelican/tests/output/custom/theme/css/reset.css
similarity index 100%
rename from tests/output/custom/theme/css/reset.css
rename to pelican/tests/output/custom/theme/css/reset.css
diff --git a/tests/output/custom/theme/css/typogrify.css b/pelican/tests/output/custom/theme/css/typogrify.css
similarity index 100%
rename from tests/output/custom/theme/css/typogrify.css
rename to pelican/tests/output/custom/theme/css/typogrify.css
diff --git a/tests/output/custom/theme/css/wide.css b/pelican/tests/output/custom/theme/css/wide.css
similarity index 100%
rename from tests/output/custom/theme/css/wide.css
rename to pelican/tests/output/custom/theme/css/wide.css
diff --git a/tests/output/custom/theme/images/icons/delicious.png b/pelican/tests/output/custom/theme/images/icons/delicious.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/delicious.png
rename to pelican/tests/output/custom/theme/images/icons/delicious.png
diff --git a/tests/output/custom/theme/images/icons/facebook.png b/pelican/tests/output/custom/theme/images/icons/facebook.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/facebook.png
rename to pelican/tests/output/custom/theme/images/icons/facebook.png
diff --git a/tests/output/custom/theme/images/icons/github.png b/pelican/tests/output/custom/theme/images/icons/github.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/github.png
rename to pelican/tests/output/custom/theme/images/icons/github.png
diff --git a/tests/output/custom/theme/images/icons/gitorious.png b/pelican/tests/output/custom/theme/images/icons/gitorious.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/gitorious.png
rename to pelican/tests/output/custom/theme/images/icons/gitorious.png
diff --git a/tests/output/custom/theme/images/icons/gittip.png b/pelican/tests/output/custom/theme/images/icons/gittip.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/gittip.png
rename to pelican/tests/output/custom/theme/images/icons/gittip.png
diff --git a/tests/output/custom/theme/images/icons/google-plus.png b/pelican/tests/output/custom/theme/images/icons/google-plus.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/google-plus.png
rename to pelican/tests/output/custom/theme/images/icons/google-plus.png
diff --git a/tests/output/custom/theme/images/icons/lastfm.png b/pelican/tests/output/custom/theme/images/icons/lastfm.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/lastfm.png
rename to pelican/tests/output/custom/theme/images/icons/lastfm.png
diff --git a/tests/output/custom/theme/images/icons/linkedin.png b/pelican/tests/output/custom/theme/images/icons/linkedin.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/linkedin.png
rename to pelican/tests/output/custom/theme/images/icons/linkedin.png
diff --git a/tests/output/custom/theme/images/icons/rss.png b/pelican/tests/output/custom/theme/images/icons/rss.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/rss.png
rename to pelican/tests/output/custom/theme/images/icons/rss.png
diff --git a/tests/output/custom/theme/images/icons/twitter.png b/pelican/tests/output/custom/theme/images/icons/twitter.png
similarity index 100%
rename from tests/output/custom/theme/images/icons/twitter.png
rename to pelican/tests/output/custom/theme/images/icons/twitter.png
diff --git a/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
similarity index 100%
rename from tests/output/custom/this-is-a-super-article.html
rename to pelican/tests/output/custom/this-is-a-super-article.html
diff --git a/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
similarity index 100%
rename from tests/output/custom/unbelievable.html
rename to pelican/tests/output/custom/unbelievable.html
diff --git a/tests/support.py b/pelican/tests/support.py
similarity index 100%
rename from tests/support.py
rename to pelican/tests/support.py
diff --git a/tests/test_contents.py b/pelican/tests/test_contents.py
similarity index 100%
rename from tests/test_contents.py
rename to pelican/tests/test_contents.py
diff --git a/tests/test_generators.py b/pelican/tests/test_generators.py
similarity index 99%
rename from tests/test_generators.py
rename to pelican/tests/test_generators.py
index 48c7bf91..e6f2a5be 100644
--- a/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -12,7 +12,7 @@ from pelican.generators import ArticlesGenerator, PagesGenerator, \
     TemplatePagesGenerator
 from pelican.writers import Writer
 from pelican.settings import _DEFAULT_CONFIG
-from .support import unittest, get_settings
+from pelican.tests.support import unittest, get_settings
 
 CUR_DIR = os.path.dirname(__file__)
 
diff --git a/tests/test_importer.py b/pelican/tests/test_importer.py
similarity index 94%
rename from tests/test_importer.py
rename to pelican/tests/test_importer.py
index 38177918..3d297160 100644
--- a/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -4,7 +4,8 @@ from __future__ import unicode_literals, print_function
 import os
 
 from pelican.tools.pelican_import import wp2fields, fields2pelican
-from .support import unittest, temporary_folder, mute, skipIfNoExecutable
+from pelican.tests.support import (unittest, temporary_folder, mute,
+                                   skipIfNoExecutable)
 
 CUR_DIR = os.path.dirname(__file__)
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
diff --git a/tests/test_pelican.py b/pelican/tests/test_pelican.py
similarity index 96%
rename from tests/test_pelican.py
rename to pelican/tests/test_pelican.py
index 49e20b0a..97bab11f 100644
--- a/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -10,10 +10,11 @@ import logging
 
 from pelican import Pelican
 from pelican.settings import read_settings
-from .support import LoggedTestCase
+from pelican.tests.support import LoggedTestCase
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
-SAMPLES_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "..", "samples")))
+SAMPLES_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "..", "..",
+                                            "samples")))
 OUTPUT_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "output")))
 
 INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
diff --git a/tests/test_plugins.py b/pelican/tests/test_plugins.py
similarity index 96%
rename from tests/test_plugins.py
rename to pelican/tests/test_plugins.py
index f5da4ab1..73a0fb7a 100644
--- a/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -7,8 +7,8 @@ import tempfile
 from pelican.contents import Page
 from pelican.plugins import gzip_cache
 
-from .test_contents import TEST_CONTENT, TEST_SUMMARY
-from .support import unittest, temporary_folder
+from pelican.tests.test_contents import TEST_CONTENT, TEST_SUMMARY
+from pelican.tests.support import unittest, temporary_folder
 
 
 class TestGzipCache(unittest.TestCase):
diff --git a/tests/test_readers.py b/pelican/tests/test_readers.py
similarity index 99%
rename from tests/test_readers.py
rename to pelican/tests/test_readers.py
index 5e9e82b7..50e9e0ba 100644
--- a/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -5,7 +5,7 @@ import datetime
 import os
 
 from pelican import readers
-from .support import unittest
+from pelican.tests.support import unittest
 
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_PATH = os.path.join(CUR_DIR, 'content')
diff --git a/tests/test_settings.py b/pelican/tests/test_settings.py
similarity index 98%
rename from tests/test_settings.py
rename to pelican/tests/test_settings.py
index 2f2b6dc6..b50169f6 100644
--- a/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -5,7 +5,7 @@ from os.path import dirname, abspath, join
 
 from pelican.settings import (read_settings, configure_settings,
                               _DEFAULT_CONFIG, DEFAULT_THEME)
-from .support import unittest
+from pelican.tests.support import unittest
 
 
 class TestSettingsConfiguration(unittest.TestCase):
diff --git a/tests/test_utils.py b/pelican/tests/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to pelican/tests/test_utils.py
diff --git a/tests/test_webassets.py b/pelican/tests/test_webassets.py
similarity index 100%
rename from tests/test_webassets.py
rename to pelican/tests/test_webassets.py
diff --git a/tests/themes/assets/static/css/style.min.css b/pelican/tests/themes/assets/static/css/style.min.css
similarity index 100%
rename from tests/themes/assets/static/css/style.min.css
rename to pelican/tests/themes/assets/static/css/style.min.css
diff --git a/tests/themes/assets/static/css/style.scss b/pelican/tests/themes/assets/static/css/style.scss
similarity index 100%
rename from tests/themes/assets/static/css/style.scss
rename to pelican/tests/themes/assets/static/css/style.scss
diff --git a/tests/themes/assets/templates/base.html b/pelican/tests/themes/assets/templates/base.html
similarity index 100%
rename from tests/themes/assets/templates/base.html
rename to pelican/tests/themes/assets/templates/base.html
diff --git a/setup.py b/setup.py
index 4c791008..b2bc2a60 100755
--- a/setup.py
+++ b/setup.py
@@ -48,5 +48,5 @@ setup(
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Software Development :: Libraries :: Python Modules',
     ],
-    test_suite='tests',
+    test_suite='pelican.tests',
 )
diff --git a/tox.ini b/tox.ini
index 6d1a134a..3058542b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,7 +36,7 @@ envlist = py27,py32,py33
 [testenv]
 commands =
     unit2 discover []
-    nosetests -s tests
+    nosetests -s pelican
 deps =
 
 [testenv:py27]

From 3f26f9af5be695443228c10810059fe6860f43ae Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 09:20:40 -0500
Subject: [PATCH 1166/2864] generators: Teach Generator.get_files to handle
 non-directory input

This makes it easier for StaticGenerator to walk FILES_TO_COPY, where
the input may be a directory or a bare filename.

Non-traversable file types (e.g. everything but directories and
symlinks to directories) are not checked against the exclude list.
The user-level effect of this is that explicit entries in STATIC_PATHS
or FILES_TO_COPY will override a hypothetical STATIC_EXCLUDES setting,
which seems like a reasonable approach.

I also removed the Python 2.5 compatibility check for `followlinks` in
os.walk, since Pelican is now Python >=2.7.
---
 pelican/generators.py | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 606a1aa7..30ac7884 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -84,6 +84,21 @@ class Generator(object):
                          % (name, self._templates_path)))
         return self._templates[name]
 
+    def _include_path(self, path, extensions=None):
+        """Inclusion logic for .get_files(), returns True/False
+
+        :param path: the path which might be including
+        :param extensions: the list of allowed extensions (if False, all
+            extensions are allowed)
+        """
+        if extensions is None:
+            extensions = self.markup
+        basename = os.path.basename(path)
+        if extensions is False or \
+                (True in [basename.endswith(ext) for ext in extensions]):
+            return True
+        return False
+
     def get_files(self, path, exclude=[], extensions=None):
         """Return a list of files to use, based on rules
 
@@ -92,24 +107,19 @@ class Generator(object):
         :param extensions: the list of allowed extensions (if False, all
             extensions are allowed)
         """
-        if extensions is None:
-            extensions = self.markup
-
         files = []
 
-        try:
-            iter = os.walk(path, followlinks=True)
-        except TypeError:  # python 2.5 does not support followlinks
-            iter = os.walk(path)
-
-        for root, dirs, temp_files in iter:
-            for e in exclude:
-                if e in dirs:
-                    dirs.remove(e)
-            for f in temp_files:
-                if extensions is False or \
-                        (True in [f.endswith(ext) for ext in extensions]):
-                    files.append(os.sep.join((root, f)))
+        if os.path.isdir(path):
+            for root, dirs, temp_files in os.walk(path, followlinks=True):
+                for e in exclude:
+                    if e in dirs:
+                        dirs.remove(e)
+                for f in temp_files:
+                    fp = os.path.join(root, f)
+                    if self._include_path(fp, extensions):
+                        files.append(fp)
+        elif os.path.exists(path) and self._include_path(path, extensions):
+            files.append(path)  # can't walk non-directories
         return files
 
     def add_source_path(self, content):

From 2cb89ce528a6611c0df9b40b300364676fbf0479 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Wed, 6 Mar 2013 09:20:35 -0500
Subject: [PATCH 1167/2864] docs/contribute.rst: Update tests/output generation
 for moved tests

This brings the docs back up to date after 547f8d2 (Move the tests
into pelican. Fix #500, 2013-04-06).
---
 docs/contribute.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 3ab86263..2069765c 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -54,9 +54,9 @@ If you have made changes that affect the output of a Pelican-generated weblog,
 then you should update the output used by functional tests.
 To do so, you can use the following two commands::
 
-    $ LC_ALL="C" pelican -o tests/output/custom/ -s samples/pelican.conf.py \
+    $ LC_ALL="C" pelican -o pelican/tests/output/custom/ -s samples/pelican.conf.py \
         samples/content/
-    $ LC_ALL="C" pelican -o tests/output/basic/ samples/content/
+    $ LC_ALL="C" pelican -o pelican/tests/output/basic/ samples/content/
 
 testing for python3
 -------------------

From 964f7d96d6e505f8a6dea40cbdf7b8ab750abafc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Wed, 6 Mar 2013 11:46:17 -0800
Subject: [PATCH 1168/2864] endswith can take a list as an argument ;)

---
 pelican/generators.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 30ac7884..d09bf676 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -94,8 +94,7 @@ class Generator(object):
         if extensions is None:
             extensions = self.markup
         basename = os.path.basename(path)
-        if extensions is False or \
-                (True in [basename.endswith(ext) for ext in extensions]):
+        if extensions is False or basename.endswith(extensions):
             return True
         return False
 
@@ -150,8 +149,8 @@ class _FileLoader(BaseLoader):
         mtime = os.path.getmtime(self.fullpath)
         with open(self.fullpath, 'r', encoding='utf-8') as f:
             source = f.read()
-        return source, self.fullpath, \
-                lambda: mtime == os.path.getmtime(self.fullpath)
+        return (source, self.fullpath,
+                lambda: mtime == os.path.getmtime(self.fullpath))
 
 
 class TemplatePagesGenerator(Generator):
@@ -551,12 +550,14 @@ class PdfGenerator(Generator):
         super(PdfGenerator, self).__init__(*args, **kwargs)
         try:
             from rst2pdf.createpdf import RstToPdf
-            pdf_style_path = os.path.join(self.settings['PDF_STYLE_PATH']) \
-                                if 'PDF_STYLE_PATH' in self.settings.keys() \
-                                else ''
-            pdf_style = self.settings['PDF_STYLE'] if 'PDF_STYLE' \
-                                                    in self.settings.keys() \
-                                                    else 'twelvepoint'
+            if 'PDF_STYLE_PATH' in self.settings.keys():
+                pdf_style_path = os.path.join(self.settings['PDF_STYLE_PATH'])
+            else:
+                pdf_style_path = ''
+
+            if 'PDF_STYLE' in self.settings.keys():
+                pdf_style = self.settings.get('PDF_STYLE', 'twelvepoint')
+
             self.pdfcreator = RstToPdf(breakside=0,
                                        stylesheets=[pdf_style],
                                        style_path=[pdf_style_path])

From 372e8c07cf905b225226e34336a444d8382182f7 Mon Sep 17 00:00:00 2001
From: Thomas Thurman <thomas@thurman.org.uk>
Date: Sat, 9 Mar 2013 21:27:19 +0000
Subject: [PATCH 1169/2864] Fixed the stopserver command to use the correct
 Makefile syntax

---
 pelican/tools/templates/Makefile.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 35c41bb7..784a53e4 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -56,9 +56,9 @@ devserver:
 	$$(BASEDIR)/develop_server.sh restart
 
 stopserver:
-_   kill -9 `cat pelican.pid`
-_   kill -9 `cat srv.pid`
-_   @echo 'Stopped Pelican and SimpleHTTPServer processes running in background.
+	kill -9 `cat pelican.pid`
+	kill -9 `cat srv.pid`
+	@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
 
 publish:
 	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(PUBLISHCONF) $$(PELICANOPTS)

From a76bca9b0dbdb246c04df4459a0e04ee9195164d Mon Sep 17 00:00:00 2001
From: Talha Mansoor <talha131@gmail.com>
Date: Sun, 10 Mar 2013 11:28:54 +0500
Subject: [PATCH 1170/2864] Fixes the reST syntax of an example in the docs

reST example of the section "Linking to internal content" had incorrect
metadata. Moreover, time was missing from the date of both markdown and
reST example.

This was pointed out by [lefromage at #pelican](https://botbot.me/freenode/pelican/msg/2235275/)
---
 docs/getting_started.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 905eafcf..f7d76645 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -300,8 +300,10 @@ following syntax:
 
 In this example, ``article1.rst`` could look like::
 
-    Title: The first article
-    Date: 2012-12-01
+    The first article
+    #################
+
+    :date: 2012-12-01 10:02
 
     See below intra-site link examples in reStructuredText format.
 
@@ -311,7 +313,7 @@ In this example, ``article1.rst`` could look like::
 and ``article2.md``::
 
     Title: The second article
-    Date: 2012-12-01
+    Date: 2012-12-01 10:02
 
     See below intra-site link examples in Markdown format.
 

From bfaa5f9d5c0b4dfee4836ae250a24f4d7ee1f172 Mon Sep 17 00:00:00 2001
From: Jered Boxman <jered@boxman.me>
Date: Sun, 10 Mar 2013 14:34:17 +0100
Subject: [PATCH 1171/2864] Added clearification in docs for PAGE_SAVE_AS

I discussed this option in the IRC channel, because I don't think it's
very clear. When I first read the list of options I was under the
impression that Pelican could do rewriting of urls. I discovered that
this isn't the case, so I discusses this in the IRC channel and got the
encouragement to submit a pull request.
---
 docs/settings.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 5babedbd..bae7a9f3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -186,7 +186,9 @@ Setting name (default value)                            What does it do?
 `ARTICLE_LANG_SAVE_AS` (``'{slug}-{lang}.html'``)       The place where we will save an article which
                                                         doesn't use the default language.
 `PAGE_URL` (``'pages/{slug}.html'``)                    The URL we will use to link to a page.
-`PAGE_SAVE_AS` (``'pages/{slug}.html'``)                The location we will save the page.
+`PAGE_SAVE_AS` (``'pages/{slug}.html'``)                The location we will save the page. This value has to be
+                                                        the same as PAGE_URL or you need to use a rewrite in
+                                                        your server config.
 `PAGE_LANG_URL` (``'pages/{slug}-{lang}.html'``)        The URL we will use to link to a page which doesn't
                                                         use the default language.
 `PAGE_LANG_SAVE_AS` (``'pages/{slug}-{lang}.html'``)    The location we will save the page which doesn't

From b9e2825da627abf7517b7bb89c9c7fd922119148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 10 Mar 2013 20:15:37 -0700
Subject: [PATCH 1172/2864] Put ASCII-art tree into a code-block element.

Fix #766
---
 docs/getting_started.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index f7d76645..c9675198 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -287,8 +287,7 @@ and images that may be sitting alongside the current post (instead of having
 to determine where those resources will be placed after site generation).
 
 To link to internal content (files in the ``content`` directory), use the
-following syntax:
-``|filename|path/to/file``.
+following syntax: ``|filename|path/to/file``::
 
 
     website/
@@ -323,7 +322,7 @@ and ``article2.md``::
 Embedding non-article or non-page content is slightly different in that the
 directories need to be specified in ``pelicanconf.py`` file. The ``images``
 directory is configured for this by default but others will need to be added
-manually.
+manually::
 
     content
     ├── images

From fa77c3d66ae08e4d68f28364ce3c9699cce11c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 10 Mar 2013 22:30:36 -0700
Subject: [PATCH 1173/2864] This should be a warning, not an error :)

---
 pelican/contents.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index c33511c1..bcff3cd5 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -355,6 +355,6 @@ def is_valid_content(content, f):
         content.check_properties()
         return True
     except NameError as e:
-        logger.error("Skipping %s: impossible to find informations about "
-                      "'%s'" % (f, e))
+        logger.warning("Skipping %s: impossible to find informations about "
+                        "'%s'" % (f, e))
         return False

From 5aeca4826c496462ff191e6e6c498e4dad6c2cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 10 Mar 2013 22:42:46 -0700
Subject: [PATCH 1174/2864] Use comments in tests, not docstrings.

---
 pelican/tests/test_readers.py   |  4 ++--
 pelican/tests/test_settings.py  | 14 +++++++-------
 pelican/tests/test_utils.py     |  4 ++--
 pelican/tests/test_webassets.py |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 50e9e0ba..ec88781b 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -80,7 +80,7 @@ class RstReaderTest(unittest.TestCase):
             self.assertEquals(value, expected[key], key)
 
     def test_article_metadata_key_lowercase(self):
-        """Keys of metadata should be lowercase."""
+        # Keys of metadata should be lowercase.
         reader = readers.RstReader({})
         content, metadata = reader.read(
                 _path('article_with_uppercase_metadata.rst'))
@@ -317,7 +317,7 @@ class HTMLReaderTest(unittest.TestCase):
     ''', content)
 
     def test_article_metadata_key_lowercase(self):
-        """Keys of metadata should be lowercase."""
+        # Keys of metadata should be lowercase.
         reader = readers.HTMLReader({})
         content, metadata = reader.read(
                 _path('article_with_uppercase_metadata.html'))
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index b50169f6..d9bca2e5 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -24,16 +24,16 @@ class TestSettingsConfiguration(unittest.TestCase):
                 'http://blog.notmyidea.org')
 
     def test_keep_default_settings(self):
-        """keep default settings if not defined"""
+        # Keep default settings if not defined.
         self.assertEqual(self.settings.get('DEFAULT_CATEGORY'),
             _DEFAULT_CONFIG['DEFAULT_CATEGORY'])
 
     def test_dont_copy_small_keys(self):
-        """do not copy keys not in caps."""
+        # Do not copy keys not in caps.
         self.assertNotIn('foobar', self.settings)
 
     def test_read_empty_settings(self):
-        """providing no file should return the default values."""
+        # Providing no file should return the default values.
         settings = read_settings(None)
         expected = copy.deepcopy(_DEFAULT_CONFIG)
         expected['FEED_DOMAIN'] = ''  # Added by configure settings
@@ -41,8 +41,8 @@ class TestSettingsConfiguration(unittest.TestCase):
         self.assertDictEqual(settings, expected)
 
     def test_settings_return_independent(self):
-        """Make sure that the results from one settings call doesn't
-        effect past or future instances."""
+        # Make sure that the results from one settings call doesn't
+        # effect past or future instances.
         self.PATH = abspath(dirname(__file__))
         default_conf = join(self.PATH, 'default_conf.py')
         settings = read_settings(default_conf)
@@ -51,13 +51,13 @@ class TestSettingsConfiguration(unittest.TestCase):
         self.assertNotEqual(new_settings['SITEURL'], settings['SITEURL'])
 
     def test_defaults_not_overwritten(self):
-        """This assumes 'SITENAME': 'A Pelican Blog'"""
+        # This assumes 'SITENAME': 'A Pelican Blog'
         settings = read_settings(None)
         settings['SITENAME'] = 'Not a Pelican Blog'
         self.assertNotEqual(settings['SITENAME'], _DEFAULT_CONFIG['SITENAME'])
 
     def test_configure_settings(self):
-        """Manipulations to settings should be applied correctly."""
+        #Manipulations to settings should be applied correctly.
 
         settings = {
                 'SITEURL': 'http://blog.notmyidea.org/',
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 0da1dcfa..ab9ae226 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -95,8 +95,8 @@ class TestUtils(LoggedTestCase):
         self.assertNotIn(fr_article1, index)
 
     def test_files_changed(self):
-        """Test if file changes are correctly detected
-        Make sure to handle not getting any files correctly"""
+        # Test if file changes are correctly detected
+        # Make sure to handle not getting any files correctly.
 
         dirname = os.path.join(os.path.dirname(__file__), 'content')
         path = os.path.join(dirname, 'article_with_metadata.rst')
diff --git a/pelican/tests/test_webassets.py b/pelican/tests/test_webassets.py
index c2ba44da..22c0ae78 100644
--- a/pelican/tests/test_webassets.py
+++ b/pelican/tests/test_webassets.py
@@ -55,13 +55,13 @@ class TestWebAssetsRelativeURLS(TestWebAssets):
     """Test pelican with relative urls."""
 
     def test_jinja2_ext(self):
-        """Test that the Jinja2 extension was correctly added."""
+        # Test that the Jinja2 extension was correctly added.
 
         from webassets.ext.jinja2 import AssetsExtension
         self.assertIn(AssetsExtension, self.settings['JINJA_EXTENSIONS'])
 
     def test_compilation(self):
-        """Compare the compiled css with the reference."""
+        # Compare the compiled css with the reference.
 
         gen_file = os.path.join(self.temp_path, 'theme', 'gen',
                                 'style.{0}.min.css'.format(CSS_HASH))
@@ -71,7 +71,7 @@ class TestWebAssetsRelativeURLS(TestWebAssets):
         self.assertEqual(css_new, CSS_REF)
 
     def test_template(self):
-        """Look in the output files for the link tag."""
+        # Look in the output files for the link tag.
 
         css_file = './theme/gen/style.{0}.min.css'.format(CSS_HASH)
         html_files = ['index.html', 'archives.html',
@@ -92,7 +92,7 @@ class TestWebAssetsAbsoluteURLS(TestWebAssets):
                                             'SITEURL': 'http://localhost'})
 
     def test_absolute_url(self):
-        """Look in the output files for the link tag with absolute url."""
+        # Look in the output files for the link tag with absolute url.
 
         css_file = ('http://localhost/theme/gen/style.{0}.min.css'
                     .format(CSS_HASH))

From 14cf5f014ca3576052524e43f0a3fdeff8283741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 10 Mar 2013 20:11:36 -0700
Subject: [PATCH 1175/2864] Some doc + various enhancements

---
 pelican/contents.py           | 144 +++++++++++-----------------------
 pelican/settings.py           |  18 ++---
 pelican/tests/test_pelican.py |   1 +
 pelican/urlwrappers.py        |  79 +++++++++++++++++++
 pelican/utils.py              |  22 +++---
 5 files changed, 146 insertions(+), 118 deletions(-)
 create mode 100644 pelican/urlwrappers.py

diff --git a/pelican/contents.py b/pelican/contents.py
index bcff3cd5..b242b5d9 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -13,34 +13,36 @@ import sys
 from datetime import datetime
 
 
-from pelican.settings import _DEFAULT_CONFIG
-from pelican.utils import (slugify, truncate_html_words, memoized,
-    python_2_unicode_compatible, deprecated_attribute)
 from pelican import signals
-import pelican.utils
+from pelican.settings import _DEFAULT_CONFIG
+from pelican.utils import (slugify, truncate_html_words, memoized, strftime,
+                           python_2_unicode_compatible, deprecated_attribute)
+
+# Import these so that they're avalaible when you import from pelican.contents.
+from pelican.urlwrappers import (URLWrapper, Author, Category, Tag)  # NOQA
 
 logger = logging.getLogger(__name__)
 
 
-class Page(object):
-    """Represents a page
-    Given a content, and metadata, create an adequate object.
+class Content(object):
+    """Represents a content.
 
     :param content: the string to parse, containing the original content.
-    """
-    mandatory_properties = ('title',)
-    default_template = 'page'
+    :param metadata: the metadata associated to this page (optional).
+    :param settings: the settings dictionary (optional).
+    :param source_path: The location of the source of this content (if any).
+    :param context: The shared context between generators.
 
+    """
     @deprecated_attribute(old='filename', new='source_path', since=(3, 2, 0))
     def filename():
         return None
 
     def __init__(self, content, metadata=None, settings=None,
                  source_path=None, context=None):
-        # init parameters
-        if not metadata:
+        if metadata is None:
             metadata = {}
-        if not settings:
+        if settings is None:
             settings = copy.deepcopy(_DEFAULT_CONFIG)
 
         self.settings = settings
@@ -68,6 +70,8 @@ class Page(object):
             if 'AUTHOR' in settings:
                 self.author = Author(settings['AUTHOR'], settings)
 
+        # XXX Split all the following code into pieces, there is too much here.
+
         # manage languages
         self.in_default_lang = True
         if 'DEFAULT_LANG' in settings:
@@ -100,8 +104,7 @@ class Page(object):
             self.date_format = self.date_format[1]
 
         if hasattr(self, 'date'):
-            self.locale_date = pelican.utils.strftime(self.date,
-                self.date_format)
+            self.locale_date = strftime(self.date, self.date_format)
 
         # manage status
         if not hasattr(self, 'status'):
@@ -117,13 +120,14 @@ class Page(object):
         signals.content_object_init.send(self)
 
     def check_properties(self):
-        """test that each mandatory property is set."""
+        """Test mandatory properties are set."""
         for prop in self.mandatory_properties:
             if not hasattr(self, prop):
                 raise NameError(prop)
 
     @property
     def url_format(self):
+        """Returns the URL, formatted with the proper values"""
         metadata = copy.copy(self.metadata)
         metadata.update({
             'slug': getattr(self, 'slug', ''),
@@ -146,12 +150,14 @@ class Page(object):
         return self._expand_settings(key)
 
     def _update_content(self, content, siteurl):
-        """Change all the relative paths of the content to relative paths
+        """Update the content attribute.
+
+        Change all the relative paths of the content to relative paths
         suitable for the ouput content.
 
         :param content: content resource that will be passed to the templates.
         :param siteurl: siteurl which is locally generated by the writer in
-            case of RELATIVE_URLS.
+                        case of RELATIVE_URLS.
         """
         hrefs = re.compile(r"""
             (?P<markup><\s*[^\>]*  # match tag with src and href attr
@@ -165,9 +171,12 @@ class Page(object):
             what = m.group('what')
             value = m.group('value')
             origin = m.group('path')
+
             # we support only filename for now. the plan is to support
             # categories, tags, etc. in the future, but let's keep things
             # simple for now.
+
+            # XXX Put this in a different location.
             if what == 'filename':
                 if value.startswith('/'):
                     value = value[1:]
@@ -191,18 +200,23 @@ class Page(object):
 
     @memoized
     def get_content(self, siteurl):
-        return self._update_content(
-                self._get_content() if hasattr(self, "_get_content")
-                    else self._content,
-                siteurl)
+
+        if hasattr(self, '_get_content'):
+            content = self._get_content()
+        else:
+            content = self._content
+        return self._update_content(content, siteurl)
 
     @property
     def content(self):
         return self.get_content(self._context['localsiteurl'])
 
     def _get_summary(self):
-        """Returns the summary of an article, based on the summary metadata
-        if it is set, else truncate the content."""
+        """Returns the summary of an article.
+
+        This is based on the summary metadata if set, otherwise truncate the
+        content.
+        """
         if hasattr(self, '_summary'):
             return self._summary
 
@@ -217,7 +231,6 @@ class Page(object):
 
     summary = property(_get_summary, _set_summary, "Summary of the article."
                        "Based on the content. Can't be set")
-
     url = property(functools.partial(get_url_setting, key='url'))
     save_as = property(functools.partial(get_url_setting, key='save_as'))
 
@@ -250,6 +263,11 @@ class Page(object):
         )
 
 
+class Page(Content):
+    mandatory_properties = ('title',)
+    default_template = 'page'
+
+
 class Article(Page):
     mandatory_properties = ('title', 'date', 'category')
     default_template = 'article'
@@ -259,78 +277,9 @@ class Quote(Page):
     base_properties = ('author', 'date')
 
 
-@python_2_unicode_compatible
-@functools.total_ordering
-class URLWrapper(object):
-    def __init__(self, name, settings):
-        self.name = name
-        self.slug = slugify(self.name)
-        self.settings = settings
-
-    def as_dict(self):
-        return self.__dict__
-
-    def __hash__(self):
-        return hash(self.name)
-
-    def _key(self):
-        return self.name
-
-    def _normalize_key(self, key):
-        return six.text_type(key)
-
-    def __eq__(self, other):
-        return self._key() == self._normalize_key(other)
-
-    def __ne__(self, other):
-        return self._key() != self._normalize_key(other)
-
-    def __lt__(self, other):
-        return self._key() < self._normalize_key(other)
-
-    def __str__(self):
-        return self.name
-
-    def _from_settings(self, key, get_page_name=False):
-        """Returns URL information as defined in settings.
-
-        When get_page_name=True returns URL without anything after {slug} e.g.
-        if in settings: CATEGORY_URL="cat/{slug}.html" this returns
-        "cat/{slug}" Useful for pagination.
-
-        """
-        setting = "%s_%s" % (self.__class__.__name__.upper(), key)
-        value = self.settings[setting]
-        if not isinstance(value, six.string_types):
-            logger.warning('%s is set to %s' % (setting, value))
-            return value
-        else:
-            if get_page_name:
-                return os.path.splitext(value)[0].format(**self.as_dict())
-            else:
-                return value.format(**self.as_dict())
-
-    page_name = property(functools.partial(_from_settings, key='URL',
-                         get_page_name=True))
-    url = property(functools.partial(_from_settings, key='URL'))
-    save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
-
-
-class Category(URLWrapper):
-    pass
-
-
-class Tag(URLWrapper):
-    def __init__(self, name, *args, **kwargs):
-        super(Tag, self).__init__(name.strip(), *args, **kwargs)
-
-
-class Author(URLWrapper):
-    pass
-
-
 @python_2_unicode_compatible
 class StaticContent(object):
+
     @deprecated_attribute(old='filepath', new='source_path', since=(3, 2, 0))
     def filepath():
         return None
@@ -340,6 +289,7 @@ class StaticContent(object):
             settings = copy.deepcopy(_DEFAULT_CONFIG)
         self.src = src
         self.url = dst or src
+
         # On Windows, make sure we end up with Unix-like paths.
         if os.name == 'nt':
             self.url = self.url.replace('\\', '/')
@@ -355,6 +305,6 @@ def is_valid_content(content, f):
         content.check_properties()
         return True
     except NameError as e:
-        logger.warning("Skipping %s: impossible to find informations about "
-                        "'%s'" % (f, e))
+        logger.error("Skipping %s: impossible to find informations about "
+                      "'%s'" % (f, e))
         return False
diff --git a/pelican/settings.py b/pelican/settings.py
index 1180d0b2..914f963b 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -70,7 +70,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
                    'DATE_FORMATS': {},
                    'JINJA_EXTENSIONS': [],
-                   'LOCALE': '',  # default to user locale
+                   'LOCALE': '',  # defaults to user locale
                    'DEFAULT_PAGINATION': False,
                    'DEFAULT_ORPHANS': 0,
                    'DEFAULT_METADATA': (),
@@ -107,9 +107,7 @@ def read_settings(path=None, override=None):
 
 
 def get_settings_from_module(module=None, default_settings=_DEFAULT_CONFIG):
-    """
-    Load settings from a module, returning a dict.
-    """
+    """Loads settings from a module, returns a dictionary."""
 
     context = copy.deepcopy(default_settings)
     if module is not None:
@@ -119,10 +117,7 @@ def get_settings_from_module(module=None, default_settings=_DEFAULT_CONFIG):
 
 
 def get_settings_from_file(path, default_settings=_DEFAULT_CONFIG):
-    """
-    Load settings from a file path, returning a dict.
-
-    """
+    """Loads settings from a file path, returning a dict."""
 
     name = os.path.basename(path).rpartition('.')[0]
     module = imp.load_source(name, path)
@@ -130,14 +125,15 @@ def get_settings_from_file(path, default_settings=_DEFAULT_CONFIG):
 
 
 def configure_settings(settings):
-    """
-    Provide optimizations, error checking, and warnings for loaded settings
+    """Provide optimizations, error checking and warnings for the given
+    settings.
+
     """
     if not 'PATH' in settings or not os.path.isdir(settings['PATH']):
         raise Exception('You need to specify a path containing the content'
                         ' (see pelican --help for more information)')
 
-    # find the theme in pelican.theme if the given one does not exists
+    # lookup the theme in "pelican/themes" if the given one doesn't exist
     if not os.path.isdir(settings['THEME']):
         theme_path = os.sep.join([os.path.dirname(
             os.path.abspath(__file__)), "themes/%s" % settings['THEME']])
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 97bab11f..04fd7d2b 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -44,6 +44,7 @@ class TestPelican(LoggedTestCase):
         super(TestPelican, self).setUp()
         self.temp_path = mkdtemp()
         self.old_locale = locale.setlocale(locale.LC_ALL)
+        self.maxDiff = None
         locale.setlocale(locale.LC_ALL, str('C'))
 
     def tearDown(self):
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
new file mode 100644
index 00000000..943077b0
--- /dev/null
+++ b/pelican/urlwrappers.py
@@ -0,0 +1,79 @@
+import os
+import functools
+import logging
+
+import six
+
+from pelican.utils import (slugify, python_2_unicode_compatible)
+
+logger = logging.getLogger(__name__)
+
+
+@python_2_unicode_compatible
+@functools.total_ordering
+class URLWrapper(object):
+    def __init__(self, name, settings):
+        self.name = name
+        self.slug = slugify(self.name)
+        self.settings = settings
+
+    def as_dict(self):
+        return self.__dict__
+
+    def __hash__(self):
+        return hash(self.name)
+
+    def _key(self):
+        return self.name
+
+    def _normalize_key(self, key):
+        return six.text_type(key)
+
+    def __eq__(self, other):
+        return self._key() == self._normalize_key(other)
+
+    def __ne__(self, other):
+        return self._key() != self._normalize_key(other)
+
+    def __lt__(self, other):
+        return self._key() < self._normalize_key(other)
+
+    def __str__(self):
+        return self.name
+
+    def _from_settings(self, key, get_page_name=False):
+        """Returns URL information as defined in settings.
+
+        When get_page_name=True returns URL without anything after {slug} e.g.
+        if in settings: CATEGORY_URL="cat/{slug}.html" this returns
+        "cat/{slug}" Useful for pagination.
+
+        """
+        setting = "%s_%s" % (self.__class__.__name__.upper(), key)
+        value = self.settings[setting]
+        if not isinstance(value, six.string_types):
+            logger.warning('%s is set to %s' % (setting, value))
+            return value
+        else:
+            if get_page_name:
+                return os.path.splitext(value)[0].format(**self.as_dict())
+            else:
+                return value.format(**self.as_dict())
+
+    page_name = property(functools.partial(_from_settings, key='URL',
+                         get_page_name=True))
+    url = property(functools.partial(_from_settings, key='URL'))
+    save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
+
+
+class Category(URLWrapper):
+    pass
+
+
+class Tag(URLWrapper):
+    def __init__(self, name, *args, **kwargs):
+        super(Tag, self).__init__(name.strip(), *args, **kwargs)
+
+
+class Author(URLWrapper):
+    pass
diff --git a/pelican/utils.py b/pelican/utils.py
index 8f9afcc0..2278984d 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -312,13 +312,13 @@ def get_relative_path(path):
 
 
 def truncate_html_words(s, num, end_text='...'):
-    """Truncates HTML to a certain number of words (not counting tags and
-    comments). Closes opened tags if they were correctly closed in the given
-    html. Takes an optional argument of what should be used to notify that the
-    string has been truncated, defaulting to ellipsis (...).
+    """Truncates HTML to a certain number of words.
 
-    Newlines in the HTML are preserved.
-    From the django framework.
+    (not counting tags and comments). Closes opened tags if they were correctly
+    closed in the given html. Takes an optional argument of what should be used
+    to notify that the string has been truncated, defaulting to ellipsis (...).
+
+    Newlines in the HTML are preserved. (From the django framework).
     """
     length = int(num)
     if length <= 0:
@@ -382,11 +382,13 @@ def truncate_html_words(s, num, end_text='...'):
 
 
 def process_translations(content_list):
-    """ Finds all translation and returns tuple with two lists (index,
-    translations).  Index list includes items in default language or items
-    which have no variant in default language.
+    """ Finds translation and returns them.
 
-    Also, for each content_list item, it sets attribute 'translations'
+    Returns a tuple with two lists (index, translations).  Index list includes
+    items in default language or items which have no variant in default
+    language.
+
+    For each content_list item, sets the 'translations' attribute.
     """
     content_list.sort(key=attrgetter('slug'))
     grouped_by_slugs = groupby(content_list, attrgetter('slug'))

From c6856dec441b2bed31664f311f0ebe98df21eab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 10 Mar 2013 23:09:43 -0700
Subject: [PATCH 1176/2864] Replace \ with / when replacing the URLs. See #763

---
 pelican/contents.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index b242b5d9..e0bf8adf 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -189,12 +189,13 @@ class Content(object):
                 if value in self._context['filenames']:
                     origin = '/'.join((siteurl,
                              self._context['filenames'][value].url))
+                    origin = origin.replace('\\', '/')  # Fow windows paths.
                 else:
                     logger.warning("Unable to find {fn}, skipping url"
                                     " replacement".format(fn=value))
 
-            return m.group('markup') + m.group('quote') + origin \
-                    + m.group('quote')
+            return ''.join((m.group('markup'), m.group('quote'), origin,
+                            m.group('quote')))
 
         return hrefs.sub(replacer, content)
 

From 9cbf5c0cbe234971b8f8b2df3b09e1fb08f26a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 10 Mar 2013 23:11:41 -0700
Subject: [PATCH 1177/2864] deactivate travis for now

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 04ea768b..6040a8b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,3 @@ install:
     - pip install webassets
     - pip install cssmin
 script: nosetests -s pelican
-notifications:
-    irc:
-        channels:
-            - "irc.freenode.org#pelican"
-        on_success: change

From 49bf80ec39939c408db82925b079a6eddfeae1b0 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 13:54:08 -0500
Subject: [PATCH 1178/2864] contents: Convert StaticContent to Static, a Page
 subclass

Static needs a lot of the same handling as other pages, so make it a
subclass of Page.  The rename from StaticContent to Static makes for
cleaner configuration settings (STATIC_URL instead of
STATICCONTENT_URL).

All currently generated Static instances override the save_as
attribute explicitly on initialization, but it isn't hard to imagine
wanting to adjust STATIC file output based on metadata (e.g. extracted
from their source filename).  With this union, the framework for
manipulating URLs and filenames is shared between all source file
types.
---
 pelican/contents.py   | 104 +++++++++++++++++++++++++++++++++++-------
 pelican/generators.py |  30 +++++++-----
 pelican/settings.py   |   2 +
 3 files changed, 109 insertions(+), 27 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index e0bf8adf..185d80c4 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -85,8 +85,7 @@ class Content(object):
         if not hasattr(self, 'slug') and hasattr(self, 'title'):
             self.slug = slugify(self.title)
 
-        if source_path:
-            self.source_path = source_path
+        self.source_path = source_path
 
         # manage the date format
         if not hasattr(self, 'date_format'):
@@ -119,6 +118,14 @@ class Content(object):
 
         signals.content_object_init.send(self)
 
+    def __str__(self):
+        if self.source_path is None:
+            return repr(self)
+        elif six.PY3:
+            return self.source_path or repr(self)
+        else:
+            return str(self.source_path.encode('utf-8', 'replace'))
+
     def check_properties(self):
         """Test mandatory properties are set."""
         for prop in self.mandatory_properties:
@@ -130,6 +137,7 @@ class Content(object):
         """Returns the URL, formatted with the proper values"""
         metadata = copy.copy(self.metadata)
         metadata.update({
+            'path': self.metadata.get('path', self.get_relative_source_path()),
             'slug': getattr(self, 'slug', ''),
             'lang': getattr(self, 'lang', 'en'),
             'date': getattr(self, 'date', datetime.now()),
@@ -250,6 +258,8 @@ class Content(object):
         """
         if not source_path:
             source_path = self.source_path
+        if source_path is None:
+            return None
 
         return os.path.relpath(
             os.path.abspath(os.path.join(self.settings['PATH'], source_path)),
@@ -279,26 +289,88 @@ class Quote(Page):
 
 
 @python_2_unicode_compatible
-class StaticContent(object):
+@functools.total_ordering
+class URLWrapper(object):
+    def __init__(self, name, settings):
+        self.name = name
+        self.slug = slugify(self.name)
+        self.settings = settings
 
+    def as_dict(self):
+        return self.__dict__
+
+    def __hash__(self):
+        return hash(self.name)
+
+    def _key(self):
+        return self.name
+
+    def _normalize_key(self, key):
+        return six.text_type(key)
+
+    def __eq__(self, other):
+        return self._key() == self._normalize_key(other)
+
+    def __ne__(self, other):
+        return self._key() != self._normalize_key(other)
+
+    def __lt__(self, other):
+        return self._key() < self._normalize_key(other)
+
+    def __str__(self):
+        return self.name
+
+    def _from_settings(self, key, get_page_name=False):
+        """Returns URL information as defined in settings.
+
+        When get_page_name=True returns URL without anything after {slug} e.g.
+        if in settings: CATEGORY_URL="cat/{slug}.html" this returns
+        "cat/{slug}" Useful for pagination.
+
+        """
+        setting = "%s_%s" % (self.__class__.__name__.upper(), key)
+        value = self.settings[setting]
+        if not isinstance(value, six.string_types):
+            logger.warning('%s is set to %s' % (setting, value))
+            return value
+        else:
+            if get_page_name:
+                return os.path.splitext(value)[0].format(**self.as_dict())
+            else:
+                return value.format(**self.as_dict())
+
+    page_name = property(functools.partial(_from_settings, key='URL',
+                         get_page_name=True))
+    url = property(functools.partial(_from_settings, key='URL'))
+    save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
+
+
+class Category(URLWrapper):
+    pass
+
+
+class Tag(URLWrapper):
+    def __init__(self, name, *args, **kwargs):
+        super(Tag, self).__init__(name.strip(), *args, **kwargs)
+
+
+class Author(URLWrapper):
+    pass
+
+
+@python_2_unicode_compatible
+class Static(Page):
     @deprecated_attribute(old='filepath', new='source_path', since=(3, 2, 0))
     def filepath():
         return None
 
-    def __init__(self, src, dst=None, settings=None):
-        if not settings:
-            settings = copy.deepcopy(_DEFAULT_CONFIG)
-        self.src = src
-        self.url = dst or src
+    @deprecated_attribute(old='src', new='source_path', since=(3, 2, 0))
+    def src():
+        return None
 
-        # On Windows, make sure we end up with Unix-like paths.
-        if os.name == 'nt':
-            self.url = self.url.replace('\\', '/')
-        self.source_path = os.path.join(settings['PATH'], src)
-        self.save_as = os.path.join(settings['OUTPUT_PATH'], self.url)
-
-    def __str__(self):
-        return self.source_path
+    @deprecated_attribute(old='dst', new='save_as', since=(3, 2, 0))
+    def dst():
+        return None
 
 
 def is_valid_content(content, f):
diff --git a/pelican/generators.py b/pelican/generators.py
index d09bf676..d39db188 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -20,7 +20,7 @@ from jinja2 import (
 )
 
 from pelican.contents import (
-        Article, Page, Category, StaticContent, is_valid_content
+        Article, Page, Category, Static, is_valid_content
 )
 from pelican.readers import read_file
 from pelican.utils import copy, process_translations, mkdir_p
@@ -122,8 +122,7 @@ class Generator(object):
         return files
 
     def add_source_path(self, content):
-        location = os.path.relpath(os.path.abspath(content.source_path),
-                                   os.path.abspath(self.path))
+        location = content.get_relative_source_path()
         self.context['filenames'][location] = content
 
     def _update_context(self, items):
@@ -523,23 +522,32 @@ class StaticGenerator(Generator):
                 if os.name == 'nt':
                     f_rel = f_rel.replace('\\', '/')
                 # TODO remove this hardcoded 'static' subdirectory
-                sc = StaticContent(f_rel, os.path.join('static', f_rel),
-                        settings=self.settings)
+                sc = Static(
+                    content=None,
+                    metadata={'save_as': os.path.join('static', f_rel)},
+                    settings=self.settings,
+                    source_path=f_rel)
                 self.staticfiles.append(sc)
-                self.context['filenames'][f_rel] = sc
+                self.add_source_path(sc)
         # same thing for FILES_TO_COPY
         for src, dest in self.settings['FILES_TO_COPY']:
-            sc = StaticContent(src, dest, settings=self.settings)
+            sc = Static(
+                content=None,
+                metadata={'save_as': dest},
+                settings=self.settings,
+                source_path=src)
             self.staticfiles.append(sc)
-            self.context['filenames'][src] = sc
+            self.add_source_path(sc)
 
     def generate_output(self, writer):
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
                          'theme', self.output_path, '.')
-        # copy all StaticContent files
+        # copy all Static files
         for sc in self.staticfiles:
-            mkdir_p(os.path.dirname(sc.save_as))
-            shutil.copy(sc.source_path, sc.save_as)
+            source_path = os.path.join(self.path, sc.source_path)
+            save_as = os.path.join(self.output_path, sc.save_as)
+            mkdir_p(os.path.dirname(save_as))
+            shutil.copy(source_path, save_as)
             logger.info('copying {} to {}'.format(sc.source_path, sc.save_as))
 
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 914f963b..856c5969 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -52,6 +52,8 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'PAGE_SAVE_AS': 'pages/{slug}.html',
                    'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
                    'PAGE_LANG_SAVE_AS': 'pages/{slug}-{lang}.html',
+                   'STATIC_URL': '{path}',
+                   'STATIC_SAVE_AS': '{path}',
                    'CATEGORY_URL': 'category/{slug}.html',
                    'CATEGORY_SAVE_AS': 'category/{slug}.html',
                    'TAG_URL': 'tag/{slug}.html',

From 33c60a78cd897c5ff662b9c3f7da2e4bb003222f Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Wed, 6 Mar 2013 10:06:42 -0500
Subject: [PATCH 1179/2864] pelican/utils: Add split_all() and rework static
 URL generation

I think the conversion from native paths to URLs is best put off until
we are actually trying to generate the URL.  The old handling
(introduced in 2692586, Fixes #645 - Making cross-content linking
windows compatible, 2012-12-19) converted the path at StaticContent
initialization, which left you with a bogus StaticContent.src.

Once we drop the 'static' subdirectory, we will be able to drop the
`dest` and `url` parts from the StaticGenerator.generate_context()
handling, which will leave things looking a good deal cleaner than
they do now.
---
 pelican/contents.py   |  6 ++++--
 pelican/generators.py | 11 +++++++----
 pelican/utils.py      | 21 +++++++++++++++++++++
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 185d80c4..1f659de7 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -16,7 +16,8 @@ from datetime import datetime
 from pelican import signals
 from pelican.settings import _DEFAULT_CONFIG
 from pelican.utils import (slugify, truncate_html_words, memoized, strftime,
-                           python_2_unicode_compatible, deprecated_attribute)
+                           python_2_unicode_compatible, deprecated_attribute,
+                           split_all)
 
 # Import these so that they're avalaible when you import from pelican.contents.
 from pelican.urlwrappers import (URLWrapper, Author, Category, Tag)  # NOQA
@@ -136,8 +137,9 @@ class Content(object):
     def url_format(self):
         """Returns the URL, formatted with the proper values"""
         metadata = copy.copy(self.metadata)
+        path = self.metadata.get('path', self.get_relative_source_path())
         metadata.update({
-            'path': self.metadata.get('path', self.get_relative_source_path()),
+            'path': '/'.join(split_all(path)),
             'slug': getattr(self, 'slug', ''),
             'lang': getattr(self, 'lang', 'en'),
             'date': getattr(self, 'date', datetime.now()),
diff --git a/pelican/generators.py b/pelican/generators.py
index d39db188..099a2a8d 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -25,6 +25,7 @@ from pelican.contents import (
 from pelican.readers import read_file
 from pelican.utils import copy, process_translations, mkdir_p
 from pelican import signals
+import pelican.utils
 
 
 logger = logging.getLogger(__name__)
@@ -518,13 +519,15 @@ class StaticGenerator(Generator):
             for f in self.get_files(
                     os.path.join(self.path, static_path), extensions=False):
                 f_rel = os.path.relpath(f, self.path)
-                # On Windows, make sure we end up with Unix-like paths.
-                if os.name == 'nt':
-                    f_rel = f_rel.replace('\\', '/')
                 # TODO remove this hardcoded 'static' subdirectory
+                dest = os.path.join('static', f_rel)
+                url = '/'.join(pelican.utils.split_all(dest))
                 sc = Static(
                     content=None,
-                    metadata={'save_as': os.path.join('static', f_rel)},
+                    metadata={
+                        'save_as': dest,
+                        'url': url,
+                        },
                     settings=self.settings,
                     source_path=f_rel)
                 self.staticfiles.append(sc)
diff --git a/pelican/utils.py b/pelican/utils.py
index 2278984d..4e1c8156 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -480,3 +480,24 @@ def mkdir_p(path):
     except OSError as e:
         if e.errno != errno.EEXIST or not os.path.isdir(path):
             raise
+
+
+def split_all(path):
+    """Split a path into a list of components
+
+    While os.path.split() splits a single component off the back of
+    `path`, this function splits all components:
+
+    >>> split_all(os.path.join('a', 'b', 'c'))
+    ['a', 'b', 'c']
+    """
+    components = []
+    while path:
+        head,tail = os.path.split(path)
+        if tail:
+            components.insert(0, tail)
+        elif head == path:
+            components.insert(0, head)
+            break
+        path = head
+    return components

From ab035795bc843ddf668ca1038e6b76a7480294e9 Mon Sep 17 00:00:00 2001
From: tehkonst <teh.kos@gmail.com>
Date: Tue, 27 Nov 2012 16:06:55 +0400
Subject: [PATCH 1180/2864] fix slug for feed urls

Conflicts:

	pelican/contents.py
---
 pelican/generators.py                     |  8 ++++----
 pelican/themes/simple/templates/base.html | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 099a2a8d..a7fef150 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -213,11 +213,11 @@ class ArticlesGenerator(Generator):
             arts.sort(key=attrgetter('date'), reverse=True)
             if self.settings.get('CATEGORY_FEED_ATOM'):
                 writer.write_feed(arts, self.context,
-                                  self.settings['CATEGORY_FEED_ATOM'] % cat)
+                                  self.settings['CATEGORY_FEED_ATOM'] % cat.slug)
 
             if self.settings.get('CATEGORY_FEED_RSS'):
                 writer.write_feed(arts, self.context,
-                                  self.settings['CATEGORY_FEED_RSS'] % cat,
+                                  self.settings['CATEGORY_FEED_RSS'] % cat.slug,
                                   feed_type='rss')
 
         if (self.settings.get('TAG_FEED_ATOM')
@@ -226,11 +226,11 @@ class ArticlesGenerator(Generator):
                 arts.sort(key=attrgetter('date'), reverse=True)
                 if self.settings.get('TAG_FEED_ATOM'):
                     writer.write_feed(arts, self.context,
-                                      self.settings['TAG_FEED_ATOM'] % tag)
+                                      self.settings['TAG_FEED_ATOM'] % tag.slug)
 
                 if self.settings.get('TAG_FEED_RSS'):
                     writer.write_feed(arts, self.context,
-                                      self.settings['TAG_FEED_RSS'] % tag,
+                                      self.settings['TAG_FEED_RSS'] % tag.slug,
                                       feed_type='rss')
 
         if (self.settings.get('TRANSLATION_FEED_ATOM')
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 3ea2e8b9..212aef5e 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -16,17 +16,17 @@
         {% if FEED_RSS %}
         <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
-        {% if CATEGORY_FEED_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
+        {% if CATEGORY_FEED_ATOM and category %}
+        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
         {% endif %}
-        {% if CATEGORY_FEED_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+        {% if CATEGORY_FEED_RSS and category %}
+        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
         {% endif %}
-        {% if TAG_FEED_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
+        {% if TAG_FEED_ATOM and tag %}
+        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
         {% endif %}
-        {% if TAG_FEED_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
+        {% if TAG_FEED_RSS and tag %}
+        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
         {% endif %}
         {% endblock head %}
 </head>

From 37f6190c69e743ad93e6084ac48540c24ade6324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 10 Mar 2013 23:42:08 -0700
Subject: [PATCH 1181/2864] URLWrapper moved!

---
 pelican/contents.py | 70 ---------------------------------------------
 1 file changed, 70 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 1f659de7..05761be6 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -290,76 +290,6 @@ class Quote(Page):
     base_properties = ('author', 'date')
 
 
-@python_2_unicode_compatible
-@functools.total_ordering
-class URLWrapper(object):
-    def __init__(self, name, settings):
-        self.name = name
-        self.slug = slugify(self.name)
-        self.settings = settings
-
-    def as_dict(self):
-        return self.__dict__
-
-    def __hash__(self):
-        return hash(self.name)
-
-    def _key(self):
-        return self.name
-
-    def _normalize_key(self, key):
-        return six.text_type(key)
-
-    def __eq__(self, other):
-        return self._key() == self._normalize_key(other)
-
-    def __ne__(self, other):
-        return self._key() != self._normalize_key(other)
-
-    def __lt__(self, other):
-        return self._key() < self._normalize_key(other)
-
-    def __str__(self):
-        return self.name
-
-    def _from_settings(self, key, get_page_name=False):
-        """Returns URL information as defined in settings.
-
-        When get_page_name=True returns URL without anything after {slug} e.g.
-        if in settings: CATEGORY_URL="cat/{slug}.html" this returns
-        "cat/{slug}" Useful for pagination.
-
-        """
-        setting = "%s_%s" % (self.__class__.__name__.upper(), key)
-        value = self.settings[setting]
-        if not isinstance(value, six.string_types):
-            logger.warning('%s is set to %s' % (setting, value))
-            return value
-        else:
-            if get_page_name:
-                return os.path.splitext(value)[0].format(**self.as_dict())
-            else:
-                return value.format(**self.as_dict())
-
-    page_name = property(functools.partial(_from_settings, key='URL',
-                         get_page_name=True))
-    url = property(functools.partial(_from_settings, key='URL'))
-    save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
-
-
-class Category(URLWrapper):
-    pass
-
-
-class Tag(URLWrapper):
-    def __init__(self, name, *args, **kwargs):
-        super(Tag, self).__init__(name.strip(), *args, **kwargs)
-
-
-class Author(URLWrapper):
-    pass
-
-
 @python_2_unicode_compatible
 class Static(Page):
     @deprecated_attribute(old='filepath', new='source_path', since=(3, 2, 0))

From e045515b91dc8c0b56c32f92aa9ba3bfc4e272cf Mon Sep 17 00:00:00 2001
From: William Light <wrl@illest.net>
Date: Fri, 11 Jan 2013 01:01:31 +0100
Subject: [PATCH 1182/2864] add "output_file" Jinja context variable

"output_file" contains the name of the HTML file that pelican is
currently rendering.
---
 docs/themes.rst    | 3 +++
 pelican/writers.py | 1 +
 2 files changed, 4 insertions(+)

diff --git a/docs/themes.rst b/docs/themes.rst
index 19fd9274..95af399a 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -54,6 +54,9 @@ All of these settings will be available to all templates.
 =============   ===================================================
 Variable        Description
 =============   ===================================================
+output_file     The name of the file currently being generated. For
+                instance, when Pelican is rendering the homepage,
+                output_file will be "index.html".
 articles        The list of articles, ordered descending by date
                 All the elements are `Article` objects, so you can
                 access their attributes (e.g. title, summary, author
diff --git a/pelican/writers.py b/pelican/writers.py
index 43b95062..8e611556 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -129,6 +129,7 @@ class Writer(object):
             context['localsiteurl'] = relative_path
             localcontext['SITEURL'] = relative_path
 
+        localcontext['output_file'] = name
         localcontext.update(kwargs)
 
         # check paginated

From 14d548fc440cbe7974f6b9ebf922bfaf9c2486ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Mon, 11 Mar 2013 23:07:54 -0700
Subject: [PATCH 1183/2864] Introduce all_articles where articles is shadowed.

---
 pelican/generators.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index a7fef150..c56366b3 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -213,12 +213,13 @@ class ArticlesGenerator(Generator):
             arts.sort(key=attrgetter('date'), reverse=True)
             if self.settings.get('CATEGORY_FEED_ATOM'):
                 writer.write_feed(arts, self.context,
-                                  self.settings['CATEGORY_FEED_ATOM'] % cat.slug)
+                                  self.settings['CATEGORY_FEED_ATOM']
+                                  % cat.slug)
 
             if self.settings.get('CATEGORY_FEED_RSS'):
                 writer.write_feed(arts, self.context,
-                                  self.settings['CATEGORY_FEED_RSS'] % cat.slug,
-                                  feed_type='rss')
+                                  self.settings['CATEGORY_FEED_RSS']
+                                  % cat.slug, feed_type='rss')
 
         if (self.settings.get('TAG_FEED_ATOM')
                 or self.settings.get('TAG_FEED_RSS')):
@@ -226,7 +227,8 @@ class ArticlesGenerator(Generator):
                 arts.sort(key=attrgetter('date'), reverse=True)
                 if self.settings.get('TAG_FEED_ATOM'):
                     writer.write_feed(arts, self.context,
-                                      self.settings['TAG_FEED_ATOM'] % tag.slug)
+                                      self.settings['TAG_FEED_ATOM']
+                                      % tag.slug)
 
                 if self.settings.get('TAG_FEED_RSS'):
                     writer.write_feed(arts, self.context,
@@ -280,7 +282,7 @@ class ArticlesGenerator(Generator):
             write(tag.save_as, tag_template, self.context, tag=tag,
                 articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
-                page_name=tag.page_name)
+                page_name=tag.page_name, all_articles=self.articles)
 
     def generate_categories(self, write):
         """Generate category pages."""
@@ -290,7 +292,7 @@ class ArticlesGenerator(Generator):
             write(cat.save_as, category_template, self.context,
                 category=cat, articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
-                page_name=cat.page_name)
+                page_name=cat.page_name, all_articles=self.articles)
 
     def generate_authors(self, write):
         """Generate Author pages."""
@@ -300,14 +302,15 @@ class ArticlesGenerator(Generator):
             write(aut.save_as, author_template, self.context,
                 author=aut, articles=articles, dates=dates,
                 paginated={'articles': articles, 'dates': dates},
-                page_name=aut.page_name)
+                page_name=aut.page_name, all_articles=self.articles)
 
     def generate_drafts(self, write):
         """Generate drafts pages."""
         for article in self.drafts:
             write('drafts/%s.html' % article.slug,
                 self.get_template(article.template), self.context,
-                article=article, category=article.category)
+                article=article, category=article.category,
+                all_articles=self.articles)
 
     def generate_pages(self, writer):
         """Generate the pages on the disk"""

From fc45d8d7917fd7c9bfd5c0443d61c655ef0ce3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Mon, 11 Mar 2013 23:11:21 -0700
Subject: [PATCH 1184/2864] update the docs regarding all_articles

---
 docs/themes.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 95af399a..aba1ed4b 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -60,7 +60,9 @@ output_file     The name of the file currently being generated. For
 articles        The list of articles, ordered descending by date
                 All the elements are `Article` objects, so you can
                 access their attributes (e.g. title, summary, author
-                etc.)
+                etc.). Sometimes this is shadowed (for instance in
+                the tags page). You will then find info about it
+                in the `all_articles` variable.
 dates           The same list of articles, but ordered by date,
                 ascending
 tags            A list of (tag, articles) tuples, containing all

From 12c43b7d4d9d429ddedcb729d84fa0a2e6eaff0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Tue, 12 Mar 2013 12:19:53 -0700
Subject: [PATCH 1185/2864] Make METADATA_PROCESSORS and EXTENSIONS public.

---
 pelican/readers.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 1623fb7f..8ce060a8 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -33,7 +33,7 @@ from pelican.contents import Category, Tag, Author
 from pelican.utils import get_date, pelican_open
 
 
-_METADATA_PROCESSORS = {
+METADATA_PROCESSORS = {
     'tags': lambda x, y: [Tag(tag, y) for tag in x.split(',')],
     'date': lambda x, y: get_date(x),
     'status': lambda x, y: x.strip(),
@@ -50,8 +50,8 @@ class Reader(object):
         self.settings = settings
 
     def process_metadata(self, name, value):
-        if name in _METADATA_PROCESSORS:
-            return _METADATA_PROCESSORS[name](value, self.settings)
+        if name in METADATA_PROCESSORS:
+            return METADATA_PROCESSORS[name](value, self.settings)
         return value
 
 
@@ -309,11 +309,11 @@ class AsciiDocReader(Reader):
         return content, metadata
 
 
-_EXTENSIONS = {}
+EXTENSIONS = {}
 
 for cls in Reader.__subclasses__():
     for ext in cls.file_extensions:
-        _EXTENSIONS[ext] = cls
+        EXTENSIONS[ext] = cls
 
 
 def read_file(path, fmt=None, settings=None):
@@ -322,10 +322,10 @@ def read_file(path, fmt=None, settings=None):
     if not fmt:
         fmt = ext[1:]
 
-    if fmt not in _EXTENSIONS:
+    if fmt not in EXTENSIONS:
         raise TypeError('Pelican does not know how to parse {}'.format(path))
 
-    reader = _EXTENSIONS[fmt](settings)
+    reader = EXTENSIONS[fmt](settings)
     settings_key = '%s_EXTENSIONS' % fmt.upper()
 
     if settings and settings_key in settings:

From c46ca5d5d10336c1ee13626d4504d717c6ed8465 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 14:25:12 -0500
Subject: [PATCH 1186/2864] readers: Split parse_path_metadata from read_file

For easier re-use.  I also extract the path metadata first, so
metadata explicitly listed in the file contents will take precedence
over metadata parsed from the filename.
---
 pelican/readers.py | 48 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 8ce060a8..fb8c4bd4 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -334,7 +334,10 @@ def read_file(path, fmt=None, settings=None):
     if not reader.enabled:
         raise ValueError("Missing dependencies for %s" % fmt)
 
-    content, metadata = reader.read(path)
+    metadata = parse_path_metadata(
+        path=path, settings=settings, process=reader.process_metadata)
+    content, reader_metadata = reader.read(path)
+    metadata.update(reader_metadata)
 
     # eventually filter the content with typogrify if asked so
     if settings and settings.get('TYPOGRIFY'):
@@ -342,14 +345,37 @@ def read_file(path, fmt=None, settings=None):
         content = typogrify(content)
         metadata['title'] = typogrify(metadata['title'])
 
-    file_metadata = settings and settings.get('FILENAME_METADATA')
-    if file_metadata:
-        match = re.match(file_metadata, base)
-        if match:
-            # .items() for py3k compat.
-            for k, v in match.groupdict().items():
-                if k not in metadata:
-                    k = k.lower()  # metadata must be lowercase
-                    metadata[k] = reader.process_metadata(k, v)
-
     return content, metadata
+
+def parse_path_metadata(path, settings=None, process=None):
+    """Extract a metadata dictionary from a file's path
+
+    >>> import pprint
+    >>> settings = {
+    ...     'FILENAME_METADATA': '(?P<slug>[^.]*).*',
+    ...     }
+    >>> reader = Reader(settings=settings)
+    >>> metadata = parse_path_metadata(
+    ...     path='my-cat/2013-01-01/my-slug.html',
+    ...     settings=settings,
+    ...     process=reader.process_metadata)
+    >>> pprint.pprint(metadata)
+    {'slug': 'my-slug'}
+    """
+    metadata = {}
+    base, ext = os.path.splitext(os.path.basename(path))
+    if settings:
+        for key,data in [('FILENAME_METADATA', base),
+                         ]:
+            regexp = settings.get(key)
+            if regexp:
+                match = re.match(regexp, data)
+                if match:
+                    # .items() for py3k compat.
+                    for k, v in match.groupdict().items():
+                        if k not in metadata:
+                            k = k.lower()  # metadata must be lowercase
+                            if process:
+                                v = process(k, v)
+                            metadata[k] = v
+    return metadata

From bfa8851af0a227896140bcabdcef22e493b46955 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 14:30:40 -0500
Subject: [PATCH 1187/2864] Add the PATH_METADATA setting

Sometimes the base filename doesn't have everything you need.

Remember that os.sep is platform dependent, so using it in a regular
expression for this setting may not be portable (boo MS Windows!).
---
 docs/settings.rst   | 2 ++
 pelican/readers.py  | 9 +++++++--
 pelican/settings.py | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index bae7a9f3..c1b3e305 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -59,6 +59,8 @@ Setting name (default value)                                            What doe
                                                                         For example, if you would like to extract both the
                                                                         date and the slug, you could set something like:
                                                                         ``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
+`PATH_METADATA` (``''``)                                                Like ``FILENAME_METADATA``, but parsed from a page's
+                                                                        full path relative to the content source directory.
 `DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the content of the output directory before
                                                                         generating new files.
 `FILES_TO_COPY` (``()``)                                                A list of files (or directories) to copy from the source (inside the
diff --git a/pelican/readers.py b/pelican/readers.py
index fb8c4bd4..3fd3650b 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -353,19 +353,24 @@ def parse_path_metadata(path, settings=None, process=None):
     >>> import pprint
     >>> settings = {
     ...     'FILENAME_METADATA': '(?P<slug>[^.]*).*',
+    ...     'PATH_METADATA':
+    ...         '(?P<category>[^/]*)/(?P<date>\d{4}-\d{2}-\d{2})/.*',
     ...     }
     >>> reader = Reader(settings=settings)
     >>> metadata = parse_path_metadata(
     ...     path='my-cat/2013-01-01/my-slug.html',
     ...     settings=settings,
     ...     process=reader.process_metadata)
-    >>> pprint.pprint(metadata)
-    {'slug': 'my-slug'}
+    >>> pprint.pprint(metadata)  # doctest: +ELLIPSIS
+    {'category': <pelican.urlwrappers.Category object at ...>,
+     'date': datetime.datetime(2013, 1, 1, 0, 0),
+     'slug': 'my-slug'}
     """
     metadata = {}
     base, ext = os.path.splitext(os.path.basename(path))
     if settings:
         for key,data in [('FILENAME_METADATA', base),
+                         ('PATH_METADATA', path),
                          ]:
             regexp = settings.get(key)
             if regexp:
diff --git a/pelican/settings.py b/pelican/settings.py
index 856c5969..46901ffb 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -77,6 +77,7 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'DEFAULT_ORPHANS': 0,
                    'DEFAULT_METADATA': (),
                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*',
+                   'PATH_METADATA': '',
                    'FILES_TO_COPY': (),
                    'DEFAULT_STATUS': 'published',
                    'ARTICLE_PERMALINK_STRUCTURE': '',

From 9a62b5ec629a5f864b07a651fe048f66e0f6d81f Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 20:52:04 -0500
Subject: [PATCH 1188/2864] contents: Add URLWrapper.__repr__

This makes it easier to troubleshoot collections of URLWrappers,
because printing the collection will give you something you can
actually read ;).
---
 pelican/urlwrappers.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 943077b0..393d4c87 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -41,6 +41,9 @@ class URLWrapper(object):
     def __str__(self):
         return self.name
 
+    def __repr__(self):
+        return '<{} {}>'.format(type(self).__name__, str(self))
+
     def _from_settings(self, key, get_page_name=False):
         """Returns URL information as defined in settings.
 

From 62ab60d0b17235ee1edf7dc776bd2e4ac6556e49 Mon Sep 17 00:00:00 2001
From: lexual <lex@jbadigital.com>
Date: Fri, 15 Mar 2013 15:04:33 +1100
Subject: [PATCH 1189/2864] Added S3 support for pelican quickstart.

---
 pelican/tools/pelican_quickstart.py | 3 +++
 pelican/tools/templates/Makefile.in | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 6d4264d3..213595c1 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -26,6 +26,7 @@ CONF = {
     'ssh_port': 22,
     'ssh_user': 'root',
     'ssh_target_dir': '/var/www',
+    's3_bucket': 'my_s3_bucket',
     'dropbox_dir': '~/Dropbox/Public/',
     'default_pagination': 10,
     'siteurl': '',
@@ -203,6 +204,8 @@ needed by Pelican.
             CONF['ssh_target_dir'] = ask('Where do you want to put your web site on that server?', str_compat, CONF['ssh_target_dir'])
         if ask('Do you want to upload your website using Dropbox?', answer=bool, default=False):
             CONF['dropbox_dir'] = ask('Where is your Dropbox directory?', str_compat, CONF['dropbox_dir'])
+        if ask('Do you want to upload your website using S3?', answer=bool, default=False):
+            CONF['s3_bucket'] = ask('What is the name of your S3 bucket?', str_compat, CONF['s3_bucket'])
 
     try:
         os.makedirs(os.path.join(CONF['basedir'], 'content'))
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 784a53e4..e20fc612 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -16,6 +16,8 @@ SSH_PORT=$ssh_port
 SSH_USER=$ssh_user
 SSH_TARGET_DIR=$ssh_target_dir
 
+S3_BUCKET=$s3_bucket
+
 DROPBOX_DIR=$dropbox_dir
 
 help:
@@ -33,6 +35,7 @@ help:
 	@echo '   rsync_upload                     upload the web site via rsync+ssh  '
 	@echo '   dropbox_upload                   upload the web site via Dropbox    '
 	@echo '   ftp_upload                       upload the web site via FTP        '
+	@echo '   s3_upload                        upload the web site via S3         '
 	@echo '   github                           upload the web site via gh-pages   '
 	@echo '                                                                       '
 
@@ -75,8 +78,11 @@ dropbox_upload: publish
 ftp_upload: publish
 	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
 
+s3_upload: publish
+	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed
+
 github: publish
 	ghp-import $$(OUTPUTDIR)
 	git push origin gh-pages
 
-.PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload github
+.PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload github

From f92c80021611afd5fc2e82e11f198f23e9663161 Mon Sep 17 00:00:00 2001
From: John Mastro <john.b.mastro@gmail.com>
Date: Sat, 9 Mar 2013 21:01:47 -0800
Subject: [PATCH 1190/2864] Add a period archives feature and brief docs.

Allows users to have per-year, per-month, and per-day archives of posts
automatically generated. The feature is disabled by default; to enable
it a user must supply format strings for a period's respective
`_SAVE_AS` setting.
---
 docs/settings.rst     | 27 +++++++++++++++++++++++++++
 docs/themes.rst       | 21 +++++++++++----------
 pelican/generators.py | 43 ++++++++++++++++++++++++++++++++++++++++++-
 pelican/settings.py   |  3 +++
 4 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c1b3e305..761b51d8 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -178,6 +178,27 @@ Example usage:
 This would save your articles in something like ``/posts/2011/Aug/07/sample-post/index.html``,
 and the URL to this would be ``/posts/2011/Aug/07/sample-post/``.
 
+Pelican can optionally create per-year, per-month, and per-day archives of your
+posts. These secondary archives are disabled by default but are automatically
+enabled if you supply format strings for their respective `_SAVE_AS` settings.
+Period archives fit intuitively with the hierarchical model of web URLs and can
+make it easier for readers to navigate through the posts you've written over time.
+
+Example usage:
+
+* YEAR_ARCHIVE_SAVE_AS = ``'posts/{date:%Y}/index.html'``
+* MONTH_ARCHIVE_SAVE_AS = ``'posts/{date:%Y}/{date:%b}/index.html'``
+
+With these settings, Pelican will create an archive of all your posts for the year
+at (for instance) 'posts/2011/index.html', and an archive of all your posts for
+the month at 'posts/2011/Aug/index.html'.
+
+.. note::
+    Period archives work best when the final path segment is 'index.html'.
+    This way a reader can remove a portion of your URL and automatically
+    arrive at an appropriate archive of posts, without having to specify
+    a page name.
+
 ====================================================    =====================================================
 Setting name (default value)                            What does it do?
 ====================================================    =====================================================
@@ -204,6 +225,12 @@ Setting name (default value)                            What does it do?
 `<DIRECT_TEMPLATE_NAME>_SAVE_AS`                        The location to save content generated from direct
                                                         templates. Where <DIRECT_TEMPLATE_NAME> is the
                                                         upper case template name.
+`YEAR_ARCHIVE_SAVE_AS` (False)                          The location to save per-year archives of your
+                                                        posts.
+`MONTH_ARCHIVE_SAVE_AS` (False)                         The location to save per-month archives of your
+                                                        posts.
+`DAY_ARCHIVE_SAVE_AS` (False)                           The location to save per-day archives of your
+                                                        posts.
 ====================================================    =====================================================
 
 .. note::
diff --git a/docs/themes.rst b/docs/themes.rst
index aba1ed4b..1e003967 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -17,16 +17,17 @@ To make your own theme, you must follow the following structure::
     │   ├── css
     │   └── images
     └── templates
-        ├── archives.html    // to display archives
-        ├── article.html     // processed for each article
-        ├── author.html      // processed for each author
-        ├── authors.html     // must list all the authors
-        ├── categories.html  // must list all the categories
-        ├── category.html    // processed for each category
-        ├── index.html       // the index. List all the articles
-        ├── page.html        // processed for each page
-        ├── tag.html         // processed for each tag
-        └── tags.html        // must list all the tags. Can be a tag cloud.
+        ├── archives.html         // to display archives
+        ├── period_archives.html  // to display time-period archives
+        ├── article.html          // processed for each article
+        ├── author.html           // processed for each author
+        ├── authors.html          // must list all the authors
+        ├── categories.html       // must list all the categories
+        ├── category.html         // processed for each category
+        ├── index.html            // the index. List all the articles
+        ├── page.html             // processed for each page
+        ├── tag.html              // processed for each tag
+        └── tags.html             // must list all the tags. Can be a tag cloud.
 
 * `static` contains all the static assets, which will be copied to the output
   `theme` folder. I've put the CSS and image folders here, but they are
diff --git a/pelican/generators.py b/pelican/generators.py
index c56366b3..d4b2e231 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -11,7 +11,7 @@ import shutil
 from codecs import open
 from collections import defaultdict
 from functools import partial
-from itertools import chain
+from itertools import chain, groupby
 from operator import attrgetter, itemgetter
 
 from jinja2 import (
@@ -257,6 +257,46 @@ class ArticlesGenerator(Generator):
             write(article.save_as, self.get_template(article.template),
                 self.context, article=article, category=article.category)
 
+    def generate_period_archives(self, write):
+        """Generate per-year, per-month, and per-day archives."""
+        try:
+            template = self.get_template('period_archives')
+        except Exception:
+            template = self.get_template('archives')
+
+        def _generate_period_archives(dates, key, save_as_fmt):
+            """Generate period archives from `dates`, grouped by
+            `key` and written to `save_as`.
+            """
+            # `dates` is already sorted by date
+            for _period, group in groupby(dates, key=key):
+                archive = list(group)
+                # arbitrarily grab the first date so that the usual
+                # format string syntax can be used for specifying the
+                # period archive dates
+                date = archive[0].date
+                save_as = save_as_fmt.format(date=date)
+                write(save_as, template, self.context,
+                      dates=archive, blog=True)
+
+        period_save_as = {
+                'year' : self.settings.get('YEAR_ARCHIVE_SAVE_AS'),
+                'month': self.settings.get('MONTH_ARCHIVE_SAVE_AS'),
+                'day'  : self.settings.get('DAY_ARCHIVE_SAVE_AS')
+                }
+
+        period_date_key = {
+                'year' : attrgetter('date.year'),
+                'month': attrgetter('date.year', 'date.month'),
+                'day'  : attrgetter('date.year', 'date.month', 'date.day')
+                }
+
+        for period in 'year', 'month', 'day':
+            save_as = period_save_as[period]
+            if save_as:
+                key = period_date_key[period]
+                _generate_period_archives(self.dates, key, save_as)
+
     def generate_direct_templates(self, write):
         """Generate direct templates pages"""
         PAGINATED_TEMPLATES = self.settings.get('PAGINATED_DIRECT_TEMPLATES')
@@ -320,6 +360,7 @@ class ArticlesGenerator(Generator):
         # to minimize the number of relative path stuff modification
         # in writer, articles pass first
         self.generate_articles(write)
+        self.generate_period_archives(write)
         self.generate_direct_templates(write)
 
         # and subfolders after that
diff --git a/pelican/settings.py b/pelican/settings.py
index 46901ffb..d8981a0f 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -60,6 +60,9 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'TAG_SAVE_AS': 'tag/{slug}.html',
                    'AUTHOR_URL': 'author/{slug}.html',
                    'AUTHOR_SAVE_AS': 'author/{slug}.html',
+                   'YEAR_ARCHIVE_SAVE_AS': False,
+                   'MONTH_ARCHIVE_SAVE_AS': False,
+                   'DAY_ARCHIVE_SAVE_AS': False,
                    'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
                    'TAG_CLOUD_STEPS': 4,

From d4b41bd11d4871acab9149bbf07b86b7546416f6 Mon Sep 17 00:00:00 2001
From: "George V. Reilly" <george@reilly.org>
Date: Tue, 15 Jan 2013 00:06:21 -0800
Subject: [PATCH 1191/2864] Multiple Social icons

aboutme, bitbucket, google-groups, hackernews, reddit,
slideshare, speakerdeck, vimeo, youtube

Also, fix spacing below a line-block.

Try this in resT::

	| First line
	| Second line
	| Third line

	New paragraph.

	Another paragraph.

Notice how the line-block runs into the first paragraph without the new CSS.
---
 pelican/tests/output/basic/theme/css/main.css |  19 ++++++++++++++----
 .../basic/theme/images/icons/aboutme.png      | Bin 0 -> 751 bytes
 .../basic/theme/images/icons/bitbucket.png    | Bin 0 -> 3714 bytes
 .../theme/images/icons/google-groups.png      | Bin 0 -> 803 bytes
 .../basic/theme/images/icons/hackernews.png   | Bin 0 -> 3273 bytes
 .../basic/theme/images/icons/reddit.png       | Bin 0 -> 693 bytes
 .../basic/theme/images/icons/slideshare.png   | Bin 0 -> 535 bytes
 .../basic/theme/images/icons/speakerdeck.png  | Bin 0 -> 1049 bytes
 .../output/basic/theme/images/icons/vimeo.png | Bin 0 -> 544 bytes
 .../basic/theme/images/icons/youtube.png      | Bin 0 -> 458 bytes
 .../tests/output/custom/theme/css/main.css    |  19 ++++++++++++++----
 .../custom/theme/images/icons/aboutme.png     | Bin 0 -> 751 bytes
 .../custom/theme/images/icons/bitbucket.png   | Bin 0 -> 3714 bytes
 .../theme/images/icons/google-groups.png      | Bin 0 -> 803 bytes
 .../custom/theme/images/icons/hackernews.png  | Bin 0 -> 3273 bytes
 .../custom/theme/images/icons/reddit.png      | Bin 0 -> 693 bytes
 .../custom/theme/images/icons/slideshare.png  | Bin 0 -> 535 bytes
 .../custom/theme/images/icons/speakerdeck.png | Bin 0 -> 1049 bytes
 .../custom/theme/images/icons/vimeo.png       | Bin 0 -> 544 bytes
 .../custom/theme/images/icons/youtube.png     | Bin 0 -> 458 bytes
 pelican/themes/notmyidea/static/css/main.css  |  19 ++++++++++++++----
 .../notmyidea/static/images/icons/aboutme.png | Bin 0 -> 751 bytes
 .../static/images/icons/bitbucket.png         | Bin 0 -> 3714 bytes
 .../static/images/icons/google-groups.png     | Bin 0 -> 803 bytes
 .../static/images/icons/hackernews.png        | Bin 0 -> 3273 bytes
 .../notmyidea/static/images/icons/reddit.png  | Bin 0 -> 693 bytes
 .../static/images/icons/slideshare.png        | Bin 0 -> 535 bytes
 .../static/images/icons/speakerdeck.png       | Bin 0 -> 1049 bytes
 .../notmyidea/static/images/icons/vimeo.png   | Bin 0 -> 544 bytes
 .../notmyidea/static/images/icons/youtube.png | Bin 0 -> 458 bytes
 .../theme/images/icons/google-groups.png      | Bin 0 -> 803 bytes
 .../output/basic/theme/images/icons/vimeo.png | Bin 0 -> 544 bytes
 .../basic/theme/images/icons/youtube.png      | Bin 0 -> 458 bytes
 .../theme/images/icons/google-groups.png      | Bin 0 -> 803 bytes
 .../custom/theme/images/icons/vimeo.png       | Bin 0 -> 544 bytes
 .../custom/theme/images/icons/youtube.png     | Bin 0 -> 458 bytes
 36 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 pelican/tests/output/basic/theme/images/icons/aboutme.png
 create mode 100644 pelican/tests/output/basic/theme/images/icons/bitbucket.png
 create mode 100644 pelican/tests/output/basic/theme/images/icons/google-groups.png
 create mode 100644 pelican/tests/output/basic/theme/images/icons/hackernews.png
 create mode 100644 pelican/tests/output/basic/theme/images/icons/reddit.png
 create mode 100644 pelican/tests/output/basic/theme/images/icons/slideshare.png
 create mode 100644 pelican/tests/output/basic/theme/images/icons/speakerdeck.png
 create mode 100644 pelican/tests/output/basic/theme/images/icons/vimeo.png
 create mode 100644 pelican/tests/output/basic/theme/images/icons/youtube.png
 create mode 100644 pelican/tests/output/custom/theme/images/icons/aboutme.png
 create mode 100644 pelican/tests/output/custom/theme/images/icons/bitbucket.png
 create mode 100644 pelican/tests/output/custom/theme/images/icons/google-groups.png
 create mode 100644 pelican/tests/output/custom/theme/images/icons/hackernews.png
 create mode 100644 pelican/tests/output/custom/theme/images/icons/reddit.png
 create mode 100644 pelican/tests/output/custom/theme/images/icons/slideshare.png
 create mode 100644 pelican/tests/output/custom/theme/images/icons/speakerdeck.png
 create mode 100644 pelican/tests/output/custom/theme/images/icons/vimeo.png
 create mode 100644 pelican/tests/output/custom/theme/images/icons/youtube.png
 create mode 100644 pelican/themes/notmyidea/static/images/icons/aboutme.png
 create mode 100644 pelican/themes/notmyidea/static/images/icons/bitbucket.png
 create mode 100644 pelican/themes/notmyidea/static/images/icons/google-groups.png
 create mode 100644 pelican/themes/notmyidea/static/images/icons/hackernews.png
 create mode 100644 pelican/themes/notmyidea/static/images/icons/reddit.png
 create mode 100644 pelican/themes/notmyidea/static/images/icons/slideshare.png
 create mode 100644 pelican/themes/notmyidea/static/images/icons/speakerdeck.png
 create mode 100644 pelican/themes/notmyidea/static/images/icons/vimeo.png
 create mode 100644 pelican/themes/notmyidea/static/images/icons/youtube.png
 create mode 100644 tests/output/basic/theme/images/icons/google-groups.png
 create mode 100644 tests/output/basic/theme/images/icons/vimeo.png
 create mode 100644 tests/output/basic/theme/images/icons/youtube.png
 create mode 100644 tests/output/custom/theme/images/icons/google-groups.png
 create mode 100644 tests/output/custom/theme/images/icons/vimeo.png
 create mode 100644 tests/output/custom/theme/images/icons/youtube.png

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 0295f6b2..24a673dc 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -65,6 +65,7 @@ h1 a:hover {
 }
 	
 /* Paragraphs */
+div.line-block,
 p { margin-top: 1em;
     margin-bottom: 1em;}
 
@@ -305,18 +306,28 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	}
 	
 		/* Icons */
+		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
+		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
 		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
 		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
-		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
-		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
 		.social a[href*='github.com'],
 		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
 		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
+		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
+		.social a[href*='news.ycombinator.com'],
+		.social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
+		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
+		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
+		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
+		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
+		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
+		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
+		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
+		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
 
 /*
 	About
diff --git a/pelican/tests/output/basic/theme/images/icons/aboutme.png b/pelican/tests/output/basic/theme/images/icons/aboutme.png
new file mode 100644
index 0000000000000000000000000000000000000000..9609df3bd9d766cd4b827fb0a8339b700c1abf24
GIT binary patch
literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Ta>O
z6XFU~z-^brZ51PwI9(_Kh^7g}PZf%vA`~}SFm|F~be~{E7r$Q>mqnyt>;%CWAnF&0
z>J^CU7KrHN4{PNQZsheU=5fy8Gz;Yisssv#ckqX`@rAbXg*5X8HSz`4@%dHr`jqpy
z=5RZtaF_)12GsKU*YNsP@%UEo0L8sad4MK(6mq-eal2-7IizygC9)g&bNiP6KWohG
zS-|Cz#pRUFX_v@p6U%1c!{t%H>ygjnp2z8w&f}cUVI9k18Od!O&8Fwc>5|Q96~*D0
z#%UhPVH?k3;LWPz#^I34reVi!8_%X{#by@DrewmR<-%&@&nzOxqVB+|@6E{0!>ne@
zqU+A2Y{jhQ!lY=<q~X9QZ^Ec*%OGo*Ey1r33?s&pAirP+hi5m^fE>;OkH}&m?E%Ja
zC$sH<jJ=*Njv*44Lr+}~IuyX*dNEnZE1;`^i>aw(BO9N_QK10Mpk${dC;$Iv-Sgs1
z>}GlM0tE(@$Z4WS9~SJov+DT=kEZa@(E0WcEcx0FsV`5Db6NC!V}woNM4#AY#y4|V
zcGfJc2;H@B=ic4*7ff{9i&|5ruCcY7__a#1S1tN{P32SRuV!D_tlt0mk+S{xzkezF
zn-7Y&EBC3-DcWUz;LL;X@g_ZzKBs5>H{b4a!=6dHduc-B)u;`Jo`r8<+{W~Vq2`0N
zaE8$A3qX&kmbgZgq$HN4S|t~y0x1R~14Cn717lr7(-1=oD?>9YBLiInb1MS_`T5Fb
hC>nC}Q!>*kF*O*PK{PbaT?tCT44$rjF6*2UngApI;B){0

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/images/icons/bitbucket.png b/pelican/tests/output/basic/theme/images/icons/bitbucket.png
new file mode 100644
index 0000000000000000000000000000000000000000..d05ba1610eab6ec3f9a4dcae689d4d88bda5433f
GIT binary patch
literal 3714
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
YMmB*MwFfr>em`u4_ARY)4g0YF1Gb&y!T<mO

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/images/icons/google-groups.png b/pelican/tests/output/basic/theme/images/icons/google-groups.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de15e68f4d1e4176b46fe6346d42f53e3296b21
GIT binary patch
literal 803
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Mpyt
z6XFU~@c;jRouXIDNvA)3c>3}ElMnA6zkmDa-J1t*U*CKC>h7DDcV4}?_43)x7td}y
ze|qiNlPk|2Uv}&N<J$Y%sr#2h=TEz~AGR&ut(v}BG=4R&|6*GE*|_?XVb#Z{k1o0N
z{C4X6<<RldrscbN-4~OZ&rcp+bngD`2-Ma7)3)`8B~VxWSF^e=_U%9IT7P{1{@twZ
zvq{Y-qw0@_6(1fyxM0`*WAV}d3y=Ias`_Y9@!`?^^R}(u7ajS(=*U0I#%~r4Ul$zy
zx8Tsfhxg7~H-GEg@^|Lm-_v*hYTfwf!QFGOU)-{61S<HiU;h67owJ6O9}LRh-@AS0
z#nT%`)t~gr-rc!%+PLPEUg_K0H%={FIAg(r>GS4Ioi}&t+__Wd%$cHF^5*9C6Zh|&
zS-fcGqD3=xieDc*uvxqCB`~<QtYuvY3^<mOAU|M?e6KxrOC}M>XH4>TcVYa`q<as@
zdFbil7$R}m^h9MeW1vLa$MA2un|cb*v=~lWYdp0;VruOvk*OP}Xngs*-%0<~zvnyW
z$u}I$+H5^XZ~O7;H=pOvU|7?bpmE0ahejvoBh4mV34ayK&i-X7jy}pa&O6Qgyk^R2
z@qY&<a*FG#cy$(4mc}|2+$(r$<e#}JXyqoUrqy~Ydv9AWx?}Eo&8cAfPrvC&d+m~?
z4jo>+>QZfU<G+>%sx2Z(n*wUnoNHS?EYjGdv*%IzuiFv_(<LfgxBZ^1*%Uwf?DO~X
z-Tr@0i!vR!{=LfFATlq3|D~>s)h|m2&VR<uFU3DER#7b}zVrv^S=AEPh?11Vl2ohY
zqEsNoU}RuutZQJXYiJx|U}R-zXa!^&SXdbt9ArN;6-7gCeoAIqCAtO!D`PW=29XVF
QRX`04p00i_>zopr01MEB^#A|>

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/images/icons/hackernews.png b/pelican/tests/output/basic/theme/images/icons/hackernews.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc7a82d4d68068d5fb032885b93e670c385ae1b4
GIT binary patch
literal 3273
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/images/icons/reddit.png b/pelican/tests/output/basic/theme/images/icons/reddit.png
new file mode 100644
index 0000000000000000000000000000000000000000..71ae1215ac8ea274f089cc4aa55eaf8a546dea67
GIT binary patch
literal 693
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l=u_i
z6XJU9!~dgqznysSYyY)(LD8wHg|!_s7AIvDr=+IWbj|FUyDmPfbnU^D@i|oqvC+T2
zfAR7QKKbzX`4|5(OPiMMJXcWD5f&BKH-E#%6Zd-;ZmH~=t*LKT-acd2`lE+#eLng4
z-?H5&V^gy8DqHgFdQ!4-yLx+<E?&50^QQUp=2kZ}L?@=@6qMb&bIZ=gs<XZA^S3Ym
z{{1VjZYV6sU$<`Ezhz7Q3Gn|rd~m|z9q#V#|2A#-XJqj2+?l+BqPsu-1;?bGKXY=$
z%2k&xUHb6h!`<)y)*Qa>=H<6<_s-L&Pd7F;*45Q*JaIQPE<GzdXZ_mMmoJ{bdHw3*
z9p@@KW~3K4B<EJluQvk)5NCl$WHFHT0Ash4*>*t27Ec$)5Q)pF{a1yW0vK4|Z{2Op
zxVv9ALPN>y#sB}^FBbIe>i@l=m`}0(f_~hg1e2M%VYC10t~mU%sCtiG><?xWiA5$d
zov)O{{8fTq@|?Ak;yL~FQ)|-7n3c~grYSB7%QuOxxR7P`%GBxBT)nEljBJ19cFi?Y
zJS=E1@52N2<OGu|i-K!rWL>;j!>H3bbpwl7vG1Cry)A3^Ox`}h>{0RYe+4#k^`Bq<
zxS_r_@XG7AtF(UYlz;cYLxy?X@e@GjGpLrhMwFx^mZVxG7o`Fz1|tJQV_gGdT|?6l
zLklYdGb;lFT?2C<ImhI8H;RVb{FKbJN^}jTRwkwp4HtB7W`eBnboFyt=akR{0GX0A
AmjD0&

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/images/icons/slideshare.png b/pelican/tests/output/basic/theme/images/icons/slideshare.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecc97410138bb3c457a898b1e868b22ae9db9989
GIT binary patch
literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfjR2nz*S~-N{{H>@*RNkce*F0U
z{rk6X-@bnR`sK@)&!0bk{P^+1hY#=Hzkm1c-M6<d-oAbN>eZ{4FJC@?{`}dqXP+Kk
zfBg9I&8M#)J$iKg$*Tts9^Acq_w>EzpARqEaQ@!6eO+r#-}<z-?bG(EnMZEFU)j{U
z{o<QxDb?$a=dU@vZ2pulJ+g1Ryl2jw`L4q*WzoUcEgso(w|r`m{@5h-y21KGt>n8>
zu{U`lyUMLC`*)c4@4l3;wx-<Gq<7b=G@+FRjyfG%U&QjqSJgBY#cDUL(P>(%(zHRk
zY87AMB8Ie?|NsBbO`N?A=tqx|AirQBmq@T5pE`yXT^3ECnaey~977}|Sr4A{I}{+o
zaN%=YK67fKl);XLhVMN72>h>4j>!~t_j$}=vE_wj;Wj1)-!<nL8zwL@?458yC$D?*
z>S-z}KHD!>)!zx?ko4cYZua^>?$dWqKR+B>HaC57^UvfAaqpaV<uBr;H{$nQpPKaL
zwtfD!!1j*q@1|^-d1s2K;_0XI!p8)-c>es*Q+RSF`|DQgH%v`O+{1V2ALnUm<nUs4
dVP-J--|@jj(URrLY@mx7JYD@<);T3K0RY7iJHY?|

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/images/icons/speakerdeck.png b/pelican/tests/output/basic/theme/images/icons/speakerdeck.png
new file mode 100644
index 0000000000000000000000000000000000000000..087d0931caa301f8a1bba1497e1b91b7a7f105a4
GIT binary patch
literal 1049
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)ORJo
zC&X36Qpczy)Vv|qtS-i^KE}L0*0?lOuQ1qcbDjH^di}y+y|QqP!eEVpVC8Ior7S<$
zRBzc7Z^?L1sRU2)Xm_y)H_-@J;Sd+WKxYAeM*&|)eqRTEZwEe4dwvgleoqH}M{A*k
zFrmaSekW@-6-5Cz2O#2iwYT3?W4EE&Zez8>rW*T=)%F`}tXEZ-FE2F%qGdo-V!pi0
zdUd7Ql2Vg}#l{PZj29FdFDNouRBSZ2NPl*|!JGnvIfaIE3w5UE>P*Se>d(~b&Cu#i
z*94*-AWGAokfk#vSF=A$y(3K`#!V!^PRQRzI?P!<(p@UlS<uf$GR94#GhMYKUAZwy
z$k#^P+a{nQciFD31rs_7C$z8FvpuLXPs-O`$j3&xAyKt6L#ZiMp*lgp%UUVGb?S;G
zpFV$Xnm4^^?zEY!mT8CkC{)MG)h5Z5#_)Ss@z@!QIGVep#5$zJxTeI3I$H498u7bZ
z$<-uDmBmXI#fZfD3PpGbMtJatx(bB4352=xhq;Nw`$-kYisi?M=0%GY#E1eJ`O#u|
z(Lxy!Lg^8L>EVLu5dvx9f@$GG8Ik-+VSI_9d<h}E2_XW>VSI6+ys<zO!V??J6BGQb
z?f5oe#A}oU`2|<sc=Gu1;~O{r{ks9AF~RkJ|E^a9l}zT~&jsq?Ebxdd2GSm2>~=ES
z4wz7QJY5_^BrYc>B%~yzC8jbmrirPUv9Xo$@%rlK%F4#-%F4>-`suOd+14`GGBZ2Z
zIx90L*9zyc$psr58y9nXdwUma8*2y0vDsxyM@uVg*vhOFU0uh<$nLJ5E*>6kZeE_w
z@6YbYrl_AUA8-G^q2YkS{Raa2iEI-uZ1~V|V#SLYH+KAJIie!ScJaxSD_g$woLSTJ
zX3mv6DTZtx_xx!(wCK^KNtZT#>iXkV$kw^))vQ~)ezhH2w(HijX<D9aE3a+acJ14>
zzH8ggT|2ifER${KyLs>Ky?eLs-#^Y;;oZMeB%i4H&a+A767ZjEQ~Byi<|iJmuFL6X
zSeha?J1&`I)ZEpyYSye-Rssx~p{$||UzYnt><E|>3Jf6C64!{5l*E!$tK_0oAjM#0
zU}&ssV61Cs8e(W+WoT$+XryakZe?KbBv`K%MMG|WN@iLmrUnB`h=%CJhhl*m7(8A5
KT-G@yGywnx3UT@X

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/images/icons/vimeo.png b/pelican/tests/output/basic/theme/images/icons/vimeo.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba472022f0fcf7ecdd8f4847a8a3bde90789bc7
GIT binary patch
literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/images/icons/youtube.png b/pelican/tests/output/basic/theme/images/icons/youtube.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e
GIT binary patch
literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 0295f6b2..24a673dc 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -65,6 +65,7 @@ h1 a:hover {
 }
 	
 /* Paragraphs */
+div.line-block,
 p { margin-top: 1em;
     margin-bottom: 1em;}
 
@@ -305,18 +306,28 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	}
 	
 		/* Icons */
+		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
+		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
 		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
 		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
-		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
-		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
 		.social a[href*='github.com'],
 		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
 		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
+		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
+		.social a[href*='news.ycombinator.com'],
+		.social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
+		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
+		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
+		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
+		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
+		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
+		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
+		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
+		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
 
 /*
 	About
diff --git a/pelican/tests/output/custom/theme/images/icons/aboutme.png b/pelican/tests/output/custom/theme/images/icons/aboutme.png
new file mode 100644
index 0000000000000000000000000000000000000000..9609df3bd9d766cd4b827fb0a8339b700c1abf24
GIT binary patch
literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Ta>O
z6XFU~z-^brZ51PwI9(_Kh^7g}PZf%vA`~}SFm|F~be~{E7r$Q>mqnyt>;%CWAnF&0
z>J^CU7KrHN4{PNQZsheU=5fy8Gz;Yisssv#ckqX`@rAbXg*5X8HSz`4@%dHr`jqpy
z=5RZtaF_)12GsKU*YNsP@%UEo0L8sad4MK(6mq-eal2-7IizygC9)g&bNiP6KWohG
zS-|Cz#pRUFX_v@p6U%1c!{t%H>ygjnp2z8w&f}cUVI9k18Od!O&8Fwc>5|Q96~*D0
z#%UhPVH?k3;LWPz#^I34reVi!8_%X{#by@DrewmR<-%&@&nzOxqVB+|@6E{0!>ne@
zqU+A2Y{jhQ!lY=<q~X9QZ^Ec*%OGo*Ey1r33?s&pAirP+hi5m^fE>;OkH}&m?E%Ja
zC$sH<jJ=*Njv*44Lr+}~IuyX*dNEnZE1;`^i>aw(BO9N_QK10Mpk${dC;$Iv-Sgs1
z>}GlM0tE(@$Z4WS9~SJov+DT=kEZa@(E0WcEcx0FsV`5Db6NC!V}woNM4#AY#y4|V
zcGfJc2;H@B=ic4*7ff{9i&|5ruCcY7__a#1S1tN{P32SRuV!D_tlt0mk+S{xzkezF
zn-7Y&EBC3-DcWUz;LL;X@g_ZzKBs5>H{b4a!=6dHduc-B)u;`Jo`r8<+{W~Vq2`0N
zaE8$A3qX&kmbgZgq$HN4S|t~y0x1R~14Cn717lr7(-1=oD?>9YBLiInb1MS_`T5Fb
hC>nC}Q!>*kF*O*PK{PbaT?tCT44$rjF6*2UngApI;B){0

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/images/icons/bitbucket.png b/pelican/tests/output/custom/theme/images/icons/bitbucket.png
new file mode 100644
index 0000000000000000000000000000000000000000..d05ba1610eab6ec3f9a4dcae689d4d88bda5433f
GIT binary patch
literal 3714
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
YMmB*MwFfr>em`u4_ARY)4g0YF1Gb&y!T<mO

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/images/icons/google-groups.png b/pelican/tests/output/custom/theme/images/icons/google-groups.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de15e68f4d1e4176b46fe6346d42f53e3296b21
GIT binary patch
literal 803
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Mpyt
z6XFU~@c;jRouXIDNvA)3c>3}ElMnA6zkmDa-J1t*U*CKC>h7DDcV4}?_43)x7td}y
ze|qiNlPk|2Uv}&N<J$Y%sr#2h=TEz~AGR&ut(v}BG=4R&|6*GE*|_?XVb#Z{k1o0N
z{C4X6<<RldrscbN-4~OZ&rcp+bngD`2-Ma7)3)`8B~VxWSF^e=_U%9IT7P{1{@twZ
zvq{Y-qw0@_6(1fyxM0`*WAV}d3y=Ias`_Y9@!`?^^R}(u7ajS(=*U0I#%~r4Ul$zy
zx8Tsfhxg7~H-GEg@^|Lm-_v*hYTfwf!QFGOU)-{61S<HiU;h67owJ6O9}LRh-@AS0
z#nT%`)t~gr-rc!%+PLPEUg_K0H%={FIAg(r>GS4Ioi}&t+__Wd%$cHF^5*9C6Zh|&
zS-fcGqD3=xieDc*uvxqCB`~<QtYuvY3^<mOAU|M?e6KxrOC}M>XH4>TcVYa`q<as@
zdFbil7$R}m^h9MeW1vLa$MA2un|cb*v=~lWYdp0;VruOvk*OP}Xngs*-%0<~zvnyW
z$u}I$+H5^XZ~O7;H=pOvU|7?bpmE0ahejvoBh4mV34ayK&i-X7jy}pa&O6Qgyk^R2
z@qY&<a*FG#cy$(4mc}|2+$(r$<e#}JXyqoUrqy~Ydv9AWx?}Eo&8cAfPrvC&d+m~?
z4jo>+>QZfU<G+>%sx2Z(n*wUnoNHS?EYjGdv*%IzuiFv_(<LfgxBZ^1*%Uwf?DO~X
z-Tr@0i!vR!{=LfFATlq3|D~>s)h|m2&VR<uFU3DER#7b}zVrv^S=AEPh?11Vl2ohY
zqEsNoU}RuutZQJXYiJx|U}R-zXa!^&SXdbt9ArN;6-7gCeoAIqCAtO!D`PW=29XVF
QRX`04p00i_>zopr01MEB^#A|>

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/images/icons/hackernews.png b/pelican/tests/output/custom/theme/images/icons/hackernews.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc7a82d4d68068d5fb032885b93e670c385ae1b4
GIT binary patch
literal 3273
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/images/icons/reddit.png b/pelican/tests/output/custom/theme/images/icons/reddit.png
new file mode 100644
index 0000000000000000000000000000000000000000..71ae1215ac8ea274f089cc4aa55eaf8a546dea67
GIT binary patch
literal 693
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l=u_i
z6XJU9!~dgqznysSYyY)(LD8wHg|!_s7AIvDr=+IWbj|FUyDmPfbnU^D@i|oqvC+T2
zfAR7QKKbzX`4|5(OPiMMJXcWD5f&BKH-E#%6Zd-;ZmH~=t*LKT-acd2`lE+#eLng4
z-?H5&V^gy8DqHgFdQ!4-yLx+<E?&50^QQUp=2kZ}L?@=@6qMb&bIZ=gs<XZA^S3Ym
z{{1VjZYV6sU$<`Ezhz7Q3Gn|rd~m|z9q#V#|2A#-XJqj2+?l+BqPsu-1;?bGKXY=$
z%2k&xUHb6h!`<)y)*Qa>=H<6<_s-L&Pd7F;*45Q*JaIQPE<GzdXZ_mMmoJ{bdHw3*
z9p@@KW~3K4B<EJluQvk)5NCl$WHFHT0Ash4*>*t27Ec$)5Q)pF{a1yW0vK4|Z{2Op
zxVv9ALPN>y#sB}^FBbIe>i@l=m`}0(f_~hg1e2M%VYC10t~mU%sCtiG><?xWiA5$d
zov)O{{8fTq@|?Ak;yL~FQ)|-7n3c~grYSB7%QuOxxR7P`%GBxBT)nEljBJ19cFi?Y
zJS=E1@52N2<OGu|i-K!rWL>;j!>H3bbpwl7vG1Cry)A3^Ox`}h>{0RYe+4#k^`Bq<
zxS_r_@XG7AtF(UYlz;cYLxy?X@e@GjGpLrhMwFx^mZVxG7o`Fz1|tJQV_gGdT|?6l
zLklYdGb;lFT?2C<ImhI8H;RVb{FKbJN^}jTRwkwp4HtB7W`eBnboFyt=akR{0GX0A
AmjD0&

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/images/icons/slideshare.png b/pelican/tests/output/custom/theme/images/icons/slideshare.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecc97410138bb3c457a898b1e868b22ae9db9989
GIT binary patch
literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfjR2nz*S~-N{{H>@*RNkce*F0U
z{rk6X-@bnR`sK@)&!0bk{P^+1hY#=Hzkm1c-M6<d-oAbN>eZ{4FJC@?{`}dqXP+Kk
zfBg9I&8M#)J$iKg$*Tts9^Acq_w>EzpARqEaQ@!6eO+r#-}<z-?bG(EnMZEFU)j{U
z{o<QxDb?$a=dU@vZ2pulJ+g1Ryl2jw`L4q*WzoUcEgso(w|r`m{@5h-y21KGt>n8>
zu{U`lyUMLC`*)c4@4l3;wx-<Gq<7b=G@+FRjyfG%U&QjqSJgBY#cDUL(P>(%(zHRk
zY87AMB8Ie?|NsBbO`N?A=tqx|AirQBmq@T5pE`yXT^3ECnaey~977}|Sr4A{I}{+o
zaN%=YK67fKl);XLhVMN72>h>4j>!~t_j$}=vE_wj;Wj1)-!<nL8zwL@?458yC$D?*
z>S-z}KHD!>)!zx?ko4cYZua^>?$dWqKR+B>HaC57^UvfAaqpaV<uBr;H{$nQpPKaL
zwtfD!!1j*q@1|^-d1s2K;_0XI!p8)-c>es*Q+RSF`|DQgH%v`O+{1V2ALnUm<nUs4
dVP-J--|@jj(URrLY@mx7JYD@<);T3K0RY7iJHY?|

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/images/icons/speakerdeck.png b/pelican/tests/output/custom/theme/images/icons/speakerdeck.png
new file mode 100644
index 0000000000000000000000000000000000000000..087d0931caa301f8a1bba1497e1b91b7a7f105a4
GIT binary patch
literal 1049
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)ORJo
zC&X36Qpczy)Vv|qtS-i^KE}L0*0?lOuQ1qcbDjH^di}y+y|QqP!eEVpVC8Ior7S<$
zRBzc7Z^?L1sRU2)Xm_y)H_-@J;Sd+WKxYAeM*&|)eqRTEZwEe4dwvgleoqH}M{A*k
zFrmaSekW@-6-5Cz2O#2iwYT3?W4EE&Zez8>rW*T=)%F`}tXEZ-FE2F%qGdo-V!pi0
zdUd7Ql2Vg}#l{PZj29FdFDNouRBSZ2NPl*|!JGnvIfaIE3w5UE>P*Se>d(~b&Cu#i
z*94*-AWGAokfk#vSF=A$y(3K`#!V!^PRQRzI?P!<(p@UlS<uf$GR94#GhMYKUAZwy
z$k#^P+a{nQciFD31rs_7C$z8FvpuLXPs-O`$j3&xAyKt6L#ZiMp*lgp%UUVGb?S;G
zpFV$Xnm4^^?zEY!mT8CkC{)MG)h5Z5#_)Ss@z@!QIGVep#5$zJxTeI3I$H498u7bZ
z$<-uDmBmXI#fZfD3PpGbMtJatx(bB4352=xhq;Nw`$-kYisi?M=0%GY#E1eJ`O#u|
z(Lxy!Lg^8L>EVLu5dvx9f@$GG8Ik-+VSI_9d<h}E2_XW>VSI6+ys<zO!V??J6BGQb
z?f5oe#A}oU`2|<sc=Gu1;~O{r{ks9AF~RkJ|E^a9l}zT~&jsq?Ebxdd2GSm2>~=ES
z4wz7QJY5_^BrYc>B%~yzC8jbmrirPUv9Xo$@%rlK%F4#-%F4>-`suOd+14`GGBZ2Z
zIx90L*9zyc$psr58y9nXdwUma8*2y0vDsxyM@uVg*vhOFU0uh<$nLJ5E*>6kZeE_w
z@6YbYrl_AUA8-G^q2YkS{Raa2iEI-uZ1~V|V#SLYH+KAJIie!ScJaxSD_g$woLSTJ
zX3mv6DTZtx_xx!(wCK^KNtZT#>iXkV$kw^))vQ~)ezhH2w(HijX<D9aE3a+acJ14>
zzH8ggT|2ifER${KyLs>Ky?eLs-#^Y;;oZMeB%i4H&a+A767ZjEQ~Byi<|iJmuFL6X
zSeha?J1&`I)ZEpyYSye-Rssx~p{$||UzYnt><E|>3Jf6C64!{5l*E!$tK_0oAjM#0
zU}&ssV61Cs8e(W+WoT$+XryakZe?KbBv`K%MMG|WN@iLmrUnB`h=%CJhhl*m7(8A5
KT-G@yGywnx3UT@X

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/images/icons/vimeo.png b/pelican/tests/output/custom/theme/images/icons/vimeo.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba472022f0fcf7ecdd8f4847a8a3bde90789bc7
GIT binary patch
literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/images/icons/youtube.png b/pelican/tests/output/custom/theme/images/icons/youtube.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e
GIT binary patch
literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 0295f6b2..24a673dc 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -65,6 +65,7 @@ h1 a:hover {
 }
 	
 /* Paragraphs */
+div.line-block,
 p { margin-top: 1em;
     margin-bottom: 1em;}
 
@@ -305,18 +306,28 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	}
 	
 		/* Icons */
+		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
+		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
 		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
 		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
-		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
-		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
 		.social a[href*='github.com'],
 		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
 		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
+		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
+		.social a[href*='news.ycombinator.com'],
+		.social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
+		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
+		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
+		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
+		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
+		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
+		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
+		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
+		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
 
 /*
 	About
diff --git a/pelican/themes/notmyidea/static/images/icons/aboutme.png b/pelican/themes/notmyidea/static/images/icons/aboutme.png
new file mode 100644
index 0000000000000000000000000000000000000000..9609df3bd9d766cd4b827fb0a8339b700c1abf24
GIT binary patch
literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Ta>O
z6XFU~z-^brZ51PwI9(_Kh^7g}PZf%vA`~}SFm|F~be~{E7r$Q>mqnyt>;%CWAnF&0
z>J^CU7KrHN4{PNQZsheU=5fy8Gz;Yisssv#ckqX`@rAbXg*5X8HSz`4@%dHr`jqpy
z=5RZtaF_)12GsKU*YNsP@%UEo0L8sad4MK(6mq-eal2-7IizygC9)g&bNiP6KWohG
zS-|Cz#pRUFX_v@p6U%1c!{t%H>ygjnp2z8w&f}cUVI9k18Od!O&8Fwc>5|Q96~*D0
z#%UhPVH?k3;LWPz#^I34reVi!8_%X{#by@DrewmR<-%&@&nzOxqVB+|@6E{0!>ne@
zqU+A2Y{jhQ!lY=<q~X9QZ^Ec*%OGo*Ey1r33?s&pAirP+hi5m^fE>;OkH}&m?E%Ja
zC$sH<jJ=*Njv*44Lr+}~IuyX*dNEnZE1;`^i>aw(BO9N_QK10Mpk${dC;$Iv-Sgs1
z>}GlM0tE(@$Z4WS9~SJov+DT=kEZa@(E0WcEcx0FsV`5Db6NC!V}woNM4#AY#y4|V
zcGfJc2;H@B=ic4*7ff{9i&|5ruCcY7__a#1S1tN{P32SRuV!D_tlt0mk+S{xzkezF
zn-7Y&EBC3-DcWUz;LL;X@g_ZzKBs5>H{b4a!=6dHduc-B)u;`Jo`r8<+{W~Vq2`0N
zaE8$A3qX&kmbgZgq$HN4S|t~y0x1R~14Cn717lr7(-1=oD?>9YBLiInb1MS_`T5Fb
hC>nC}Q!>*kF*O*PK{PbaT?tCT44$rjF6*2UngApI;B){0

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/images/icons/bitbucket.png b/pelican/themes/notmyidea/static/images/icons/bitbucket.png
new file mode 100644
index 0000000000000000000000000000000000000000..d05ba1610eab6ec3f9a4dcae689d4d88bda5433f
GIT binary patch
literal 3714
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
YMmB*MwFfr>em`u4_ARY)4g0YF1Gb&y!T<mO

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/images/icons/google-groups.png b/pelican/themes/notmyidea/static/images/icons/google-groups.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de15e68f4d1e4176b46fe6346d42f53e3296b21
GIT binary patch
literal 803
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Mpyt
z6XFU~@c;jRouXIDNvA)3c>3}ElMnA6zkmDa-J1t*U*CKC>h7DDcV4}?_43)x7td}y
ze|qiNlPk|2Uv}&N<J$Y%sr#2h=TEz~AGR&ut(v}BG=4R&|6*GE*|_?XVb#Z{k1o0N
z{C4X6<<RldrscbN-4~OZ&rcp+bngD`2-Ma7)3)`8B~VxWSF^e=_U%9IT7P{1{@twZ
zvq{Y-qw0@_6(1fyxM0`*WAV}d3y=Ias`_Y9@!`?^^R}(u7ajS(=*U0I#%~r4Ul$zy
zx8Tsfhxg7~H-GEg@^|Lm-_v*hYTfwf!QFGOU)-{61S<HiU;h67owJ6O9}LRh-@AS0
z#nT%`)t~gr-rc!%+PLPEUg_K0H%={FIAg(r>GS4Ioi}&t+__Wd%$cHF^5*9C6Zh|&
zS-fcGqD3=xieDc*uvxqCB`~<QtYuvY3^<mOAU|M?e6KxrOC}M>XH4>TcVYa`q<as@
zdFbil7$R}m^h9MeW1vLa$MA2un|cb*v=~lWYdp0;VruOvk*OP}Xngs*-%0<~zvnyW
z$u}I$+H5^XZ~O7;H=pOvU|7?bpmE0ahejvoBh4mV34ayK&i-X7jy}pa&O6Qgyk^R2
z@qY&<a*FG#cy$(4mc}|2+$(r$<e#}JXyqoUrqy~Ydv9AWx?}Eo&8cAfPrvC&d+m~?
z4jo>+>QZfU<G+>%sx2Z(n*wUnoNHS?EYjGdv*%IzuiFv_(<LfgxBZ^1*%Uwf?DO~X
z-Tr@0i!vR!{=LfFATlq3|D~>s)h|m2&VR<uFU3DER#7b}zVrv^S=AEPh?11Vl2ohY
zqEsNoU}RuutZQJXYiJx|U}R-zXa!^&SXdbt9ArN;6-7gCeoAIqCAtO!D`PW=29XVF
QRX`04p00i_>zopr01MEB^#A|>

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/images/icons/hackernews.png b/pelican/themes/notmyidea/static/images/icons/hackernews.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc7a82d4d68068d5fb032885b93e670c385ae1b4
GIT binary patch
literal 3273
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

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/images/icons/reddit.png b/pelican/themes/notmyidea/static/images/icons/reddit.png
new file mode 100644
index 0000000000000000000000000000000000000000..71ae1215ac8ea274f089cc4aa55eaf8a546dea67
GIT binary patch
literal 693
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l=u_i
z6XJU9!~dgqznysSYyY)(LD8wHg|!_s7AIvDr=+IWbj|FUyDmPfbnU^D@i|oqvC+T2
zfAR7QKKbzX`4|5(OPiMMJXcWD5f&BKH-E#%6Zd-;ZmH~=t*LKT-acd2`lE+#eLng4
z-?H5&V^gy8DqHgFdQ!4-yLx+<E?&50^QQUp=2kZ}L?@=@6qMb&bIZ=gs<XZA^S3Ym
z{{1VjZYV6sU$<`Ezhz7Q3Gn|rd~m|z9q#V#|2A#-XJqj2+?l+BqPsu-1;?bGKXY=$
z%2k&xUHb6h!`<)y)*Qa>=H<6<_s-L&Pd7F;*45Q*JaIQPE<GzdXZ_mMmoJ{bdHw3*
z9p@@KW~3K4B<EJluQvk)5NCl$WHFHT0Ash4*>*t27Ec$)5Q)pF{a1yW0vK4|Z{2Op
zxVv9ALPN>y#sB}^FBbIe>i@l=m`}0(f_~hg1e2M%VYC10t~mU%sCtiG><?xWiA5$d
zov)O{{8fTq@|?Ak;yL~FQ)|-7n3c~grYSB7%QuOxxR7P`%GBxBT)nEljBJ19cFi?Y
zJS=E1@52N2<OGu|i-K!rWL>;j!>H3bbpwl7vG1Cry)A3^Ox`}h>{0RYe+4#k^`Bq<
zxS_r_@XG7AtF(UYlz;cYLxy?X@e@GjGpLrhMwFx^mZVxG7o`Fz1|tJQV_gGdT|?6l
zLklYdGb;lFT?2C<ImhI8H;RVb{FKbJN^}jTRwkwp4HtB7W`eBnboFyt=akR{0GX0A
AmjD0&

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/images/icons/slideshare.png b/pelican/themes/notmyidea/static/images/icons/slideshare.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecc97410138bb3c457a898b1e868b22ae9db9989
GIT binary patch
literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfjR2nz*S~-N{{H>@*RNkce*F0U
z{rk6X-@bnR`sK@)&!0bk{P^+1hY#=Hzkm1c-M6<d-oAbN>eZ{4FJC@?{`}dqXP+Kk
zfBg9I&8M#)J$iKg$*Tts9^Acq_w>EzpARqEaQ@!6eO+r#-}<z-?bG(EnMZEFU)j{U
z{o<QxDb?$a=dU@vZ2pulJ+g1Ryl2jw`L4q*WzoUcEgso(w|r`m{@5h-y21KGt>n8>
zu{U`lyUMLC`*)c4@4l3;wx-<Gq<7b=G@+FRjyfG%U&QjqSJgBY#cDUL(P>(%(zHRk
zY87AMB8Ie?|NsBbO`N?A=tqx|AirQBmq@T5pE`yXT^3ECnaey~977}|Sr4A{I}{+o
zaN%=YK67fKl);XLhVMN72>h>4j>!~t_j$}=vE_wj;Wj1)-!<nL8zwL@?458yC$D?*
z>S-z}KHD!>)!zx?ko4cYZua^>?$dWqKR+B>HaC57^UvfAaqpaV<uBr;H{$nQpPKaL
zwtfD!!1j*q@1|^-d1s2K;_0XI!p8)-c>es*Q+RSF`|DQgH%v`O+{1V2ALnUm<nUs4
dVP-J--|@jj(URrLY@mx7JYD@<);T3K0RY7iJHY?|

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/images/icons/speakerdeck.png b/pelican/themes/notmyidea/static/images/icons/speakerdeck.png
new file mode 100644
index 0000000000000000000000000000000000000000..087d0931caa301f8a1bba1497e1b91b7a7f105a4
GIT binary patch
literal 1049
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)ORJo
zC&X36Qpczy)Vv|qtS-i^KE}L0*0?lOuQ1qcbDjH^di}y+y|QqP!eEVpVC8Ior7S<$
zRBzc7Z^?L1sRU2)Xm_y)H_-@J;Sd+WKxYAeM*&|)eqRTEZwEe4dwvgleoqH}M{A*k
zFrmaSekW@-6-5Cz2O#2iwYT3?W4EE&Zez8>rW*T=)%F`}tXEZ-FE2F%qGdo-V!pi0
zdUd7Ql2Vg}#l{PZj29FdFDNouRBSZ2NPl*|!JGnvIfaIE3w5UE>P*Se>d(~b&Cu#i
z*94*-AWGAokfk#vSF=A$y(3K`#!V!^PRQRzI?P!<(p@UlS<uf$GR94#GhMYKUAZwy
z$k#^P+a{nQciFD31rs_7C$z8FvpuLXPs-O`$j3&xAyKt6L#ZiMp*lgp%UUVGb?S;G
zpFV$Xnm4^^?zEY!mT8CkC{)MG)h5Z5#_)Ss@z@!QIGVep#5$zJxTeI3I$H498u7bZ
z$<-uDmBmXI#fZfD3PpGbMtJatx(bB4352=xhq;Nw`$-kYisi?M=0%GY#E1eJ`O#u|
z(Lxy!Lg^8L>EVLu5dvx9f@$GG8Ik-+VSI_9d<h}E2_XW>VSI6+ys<zO!V??J6BGQb
z?f5oe#A}oU`2|<sc=Gu1;~O{r{ks9AF~RkJ|E^a9l}zT~&jsq?Ebxdd2GSm2>~=ES
z4wz7QJY5_^BrYc>B%~yzC8jbmrirPUv9Xo$@%rlK%F4#-%F4>-`suOd+14`GGBZ2Z
zIx90L*9zyc$psr58y9nXdwUma8*2y0vDsxyM@uVg*vhOFU0uh<$nLJ5E*>6kZeE_w
z@6YbYrl_AUA8-G^q2YkS{Raa2iEI-uZ1~V|V#SLYH+KAJIie!ScJaxSD_g$woLSTJ
zX3mv6DTZtx_xx!(wCK^KNtZT#>iXkV$kw^))vQ~)ezhH2w(HijX<D9aE3a+acJ14>
zzH8ggT|2ifER${KyLs>Ky?eLs-#^Y;;oZMeB%i4H&a+A767ZjEQ~Byi<|iJmuFL6X
zSeha?J1&`I)ZEpyYSye-Rssx~p{$||UzYnt><E|>3Jf6C64!{5l*E!$tK_0oAjM#0
zU}&ssV61Cs8e(W+WoT$+XryakZe?KbBv`K%MMG|WN@iLmrUnB`h=%CJhhl*m7(8A5
KT-G@yGywnx3UT@X

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/images/icons/vimeo.png b/pelican/themes/notmyidea/static/images/icons/vimeo.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba472022f0fcf7ecdd8f4847a8a3bde90789bc7
GIT binary patch
literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/images/icons/youtube.png b/pelican/themes/notmyidea/static/images/icons/youtube.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e
GIT binary patch
literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT

literal 0
HcmV?d00001

diff --git a/tests/output/basic/theme/images/icons/google-groups.png b/tests/output/basic/theme/images/icons/google-groups.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de15e68f4d1e4176b46fe6346d42f53e3296b21
GIT binary patch
literal 803
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Mpyt
z6XFU~@c;jRouXIDNvA)3c>3}ElMnA6zkmDa-J1t*U*CKC>h7DDcV4}?_43)x7td}y
ze|qiNlPk|2Uv}&N<J$Y%sr#2h=TEz~AGR&ut(v}BG=4R&|6*GE*|_?XVb#Z{k1o0N
z{C4X6<<RldrscbN-4~OZ&rcp+bngD`2-Ma7)3)`8B~VxWSF^e=_U%9IT7P{1{@twZ
zvq{Y-qw0@_6(1fyxM0`*WAV}d3y=Ias`_Y9@!`?^^R}(u7ajS(=*U0I#%~r4Ul$zy
zx8Tsfhxg7~H-GEg@^|Lm-_v*hYTfwf!QFGOU)-{61S<HiU;h67owJ6O9}LRh-@AS0
z#nT%`)t~gr-rc!%+PLPEUg_K0H%={FIAg(r>GS4Ioi}&t+__Wd%$cHF^5*9C6Zh|&
zS-fcGqD3=xieDc*uvxqCB`~<QtYuvY3^<mOAU|M?e6KxrOC}M>XH4>TcVYa`q<as@
zdFbil7$R}m^h9MeW1vLa$MA2un|cb*v=~lWYdp0;VruOvk*OP}Xngs*-%0<~zvnyW
z$u}I$+H5^XZ~O7;H=pOvU|7?bpmE0ahejvoBh4mV34ayK&i-X7jy}pa&O6Qgyk^R2
z@qY&<a*FG#cy$(4mc}|2+$(r$<e#}JXyqoUrqy~Ydv9AWx?}Eo&8cAfPrvC&d+m~?
z4jo>+>QZfU<G+>%sx2Z(n*wUnoNHS?EYjGdv*%IzuiFv_(<LfgxBZ^1*%Uwf?DO~X
z-Tr@0i!vR!{=LfFATlq3|D~>s)h|m2&VR<uFU3DER#7b}zVrv^S=AEPh?11Vl2ohY
zqEsNoU}RuutZQJXYiJx|U}R-zXa!^&SXdbt9ArN;6-7gCeoAIqCAtO!D`PW=29XVF
QRX`04p00i_>zopr01MEB^#A|>

literal 0
HcmV?d00001

diff --git a/tests/output/basic/theme/images/icons/vimeo.png b/tests/output/basic/theme/images/icons/vimeo.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba472022f0fcf7ecdd8f4847a8a3bde90789bc7
GIT binary patch
literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

literal 0
HcmV?d00001

diff --git a/tests/output/basic/theme/images/icons/youtube.png b/tests/output/basic/theme/images/icons/youtube.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e
GIT binary patch
literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT

literal 0
HcmV?d00001

diff --git a/tests/output/custom/theme/images/icons/google-groups.png b/tests/output/custom/theme/images/icons/google-groups.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de15e68f4d1e4176b46fe6346d42f53e3296b21
GIT binary patch
literal 803
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Mpyt
z6XFU~@c;jRouXIDNvA)3c>3}ElMnA6zkmDa-J1t*U*CKC>h7DDcV4}?_43)x7td}y
ze|qiNlPk|2Uv}&N<J$Y%sr#2h=TEz~AGR&ut(v}BG=4R&|6*GE*|_?XVb#Z{k1o0N
z{C4X6<<RldrscbN-4~OZ&rcp+bngD`2-Ma7)3)`8B~VxWSF^e=_U%9IT7P{1{@twZ
zvq{Y-qw0@_6(1fyxM0`*WAV}d3y=Ias`_Y9@!`?^^R}(u7ajS(=*U0I#%~r4Ul$zy
zx8Tsfhxg7~H-GEg@^|Lm-_v*hYTfwf!QFGOU)-{61S<HiU;h67owJ6O9}LRh-@AS0
z#nT%`)t~gr-rc!%+PLPEUg_K0H%={FIAg(r>GS4Ioi}&t+__Wd%$cHF^5*9C6Zh|&
zS-fcGqD3=xieDc*uvxqCB`~<QtYuvY3^<mOAU|M?e6KxrOC}M>XH4>TcVYa`q<as@
zdFbil7$R}m^h9MeW1vLa$MA2un|cb*v=~lWYdp0;VruOvk*OP}Xngs*-%0<~zvnyW
z$u}I$+H5^XZ~O7;H=pOvU|7?bpmE0ahejvoBh4mV34ayK&i-X7jy}pa&O6Qgyk^R2
z@qY&<a*FG#cy$(4mc}|2+$(r$<e#}JXyqoUrqy~Ydv9AWx?}Eo&8cAfPrvC&d+m~?
z4jo>+>QZfU<G+>%sx2Z(n*wUnoNHS?EYjGdv*%IzuiFv_(<LfgxBZ^1*%Uwf?DO~X
z-Tr@0i!vR!{=LfFATlq3|D~>s)h|m2&VR<uFU3DER#7b}zVrv^S=AEPh?11Vl2ohY
zqEsNoU}RuutZQJXYiJx|U}R-zXa!^&SXdbt9ArN;6-7gCeoAIqCAtO!D`PW=29XVF
QRX`04p00i_>zopr01MEB^#A|>

literal 0
HcmV?d00001

diff --git a/tests/output/custom/theme/images/icons/vimeo.png b/tests/output/custom/theme/images/icons/vimeo.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba472022f0fcf7ecdd8f4847a8a3bde90789bc7
GIT binary patch
literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

literal 0
HcmV?d00001

diff --git a/tests/output/custom/theme/images/icons/youtube.png b/tests/output/custom/theme/images/icons/youtube.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e
GIT binary patch
literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT

literal 0
HcmV?d00001


From 7fa0d3063d5fcd564d5fcd23ce7cf3a42a9228bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Delval?= <felix@ravelsoft.com>
Date: Sat, 16 Mar 2013 19:29:10 +0100
Subject: [PATCH 1192/2864] Creating a more explicit error message at server
 creation

---
 pelican/server.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pelican/server.py b/pelican/server.py
index b427a6c3..602d3b21 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -1,4 +1,5 @@
 from __future__ import print_function
+import sys
 try:
     import SimpleHTTPServer as srvmod
 except ImportError:
@@ -13,7 +14,12 @@ PORT = 8000
 
 Handler = srvmod.SimpleHTTPRequestHandler
 
-httpd = socketserver.TCPServer(("", PORT), Handler)
+try:
+    httpd = socketserver.TCPServer(("", PORT), Handler)
+except OSError as e:
+    print("Could not listen on port", PORT)
+    sys.exit(getattr(e, 'exitcode', 1))
+
 
 print("serving at port", PORT)
 httpd.serve_forever()

From a3206dbe9e508ead94ab1164ed39de4d265c1267 Mon Sep 17 00:00:00 2001
From: Ivan Dyedov <idyedov@50onred.com>
Date: Sun, 17 Mar 2013 23:09:49 -0400
Subject: [PATCH 1193/2864] fix for #783 - AttributeError: 'NoneType' object
 has no attribute 'find' when using summary plugin with static files

---
 pelican/plugins/summary.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/plugins/summary.py b/pelican/plugins/summary.py
index b32d59c5..6822353c 100644
--- a/pelican/plugins/summary.py
+++ b/pelican/plugins/summary.py
@@ -31,7 +31,7 @@ def content_object_init(instance):
     instance._get_content = types.MethodType(_get_content, instance)
 
     # extract out our summary
-    if not hasattr(instance, '_summary'):
+    if not hasattr(instance, '_summary') and instance._content is not None:
         content = instance._content
         begin_summary = -1
         end_summary = -1

From 9eda0f79bdf6335887051a906e3ce7662dd2edbb Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 18 Mar 2013 17:36:35 -0700
Subject: [PATCH 1194/2864] External resources should be scheme-independent

By using "//" instead of "http://" when referring to external resources
such as fonts (e.g., from within CSS files), warnings about "insecure"
content can be avoided.
---
 pelican/tests/output/basic/theme/css/main.css  | 2 +-
 pelican/tests/output/custom/theme/css/main.css | 2 +-
 pelican/themes/notmyidea/static/css/main.css   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 0295f6b2..a1d6931e 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -11,7 +11,7 @@
 @import url("reset.css");
 @import url("pygment.css");
 @import url("typogrify.css");
-@import url(http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+@import url(//fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
 
 /***** Global *****/
 /* Body */
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 0295f6b2..a1d6931e 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -11,7 +11,7 @@
 @import url("reset.css");
 @import url("pygment.css");
 @import url("typogrify.css");
-@import url(http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+@import url(//fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
 
 /***** Global *****/
 /* Body */
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 0295f6b2..a1d6931e 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -11,7 +11,7 @@
 @import url("reset.css");
 @import url("pygment.css");
 @import url("typogrify.css");
-@import url(http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+@import url(//fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
 
 /***** Global *****/
 /* Body */

From e73f7e9f841a1a4cb346dc3644c0a34f8d9260cf Mon Sep 17 00:00:00 2001
From: "Wraithan (Chris McDonald)" <xwraithanx@gmail.com>
Date: Mon, 18 Mar 2013 17:51:17 -0700
Subject: [PATCH 1195/2864] documentation for IGNORE_FILES

---
 docs/settings.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index c1b3e305..726e1205 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -74,6 +74,9 @@ Setting name (default value)                                            What doe
 `MARKUP` (``('rst', 'md')``)                                            A list of available markup languages you want
                                                                         to use. For the moment, the only available values
                                                                         are `rst`, `md`, `markdown`, `mkd`, `html`, and `htm`.
+`IGNORE_FILES` (``[]``)                                                 A list of file globbing patterns to match against the
+                                                                        source files to be ignored by the processor. For example
+                                                                        ``['.#*']`` will ignore emacs temporary files.
 `MD_EXTENSIONS` (``['codehilite','extra']``)                            A list of the extensions that the Markdown processor
                                                                         will use. Refer to the extensions chapter in the
                                                                         Python-Markdown documentation for a complete list of

From 66aae01493cfe4f9060147720a28816ef0e428ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Delval?= <felix@ravelsoft.com>
Date: Tue, 19 Mar 2013 12:15:58 +0100
Subject: [PATCH 1196/2864] Adding a message for gracefully shutting down dev
 server

---
 pelican/server.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pelican/server.py b/pelican/server.py
index 602d3b21..fd99b209 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -22,4 +22,8 @@ except OSError as e:
 
 
 print("serving at port", PORT)
-httpd.serve_forever()
+try:
+    httpd.serve_forever()
+except KeyboardInterrupt as e:
+    print("shutting down server")
+    httpd.socket.close()
\ No newline at end of file

From c6b943bfe9413e6a1b47007ba91f384eab56c498 Mon Sep 17 00:00:00 2001
From: Axel Haustant <axel.haustant@valtech.fr>
Date: Tue, 19 Mar 2013 13:05:03 +0100
Subject: [PATCH 1197/2864] Added missing JINJA_FILTERS documentation

---
 docs/settings.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index c1b3e305..6b663d76 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -67,6 +67,10 @@ Setting name (default value)                                            What doe
                                                                         content directory) to the destination (inside the output directory).
                                                                         For example: ``(('extra/robots.txt', 'robots.txt'),)``.
 `JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
+`JINJA_FILTERSS` (``{}``)                                               A list of custom Jinja2 filters you want to use.
+                                                                        The dictionnary should map the filtername to the filter function.
+                                                                        For exemple: ``{'urlencode': urlencode_filter}``
+                                                                        See `Jinja custom filters documentation`_.
 `LOCALE` (''[#]_)                                                       Change the locale. A list of locales can be provided
                                                                         here or a single string representing one locale.
                                                                         When providing a list, all the locales will be tried
@@ -507,3 +511,6 @@ Example settings
 
 .. literalinclude:: ../samples/pelican.conf.py
     :language: python
+
+
+.. _Jinja custom filters documentation: http://jinja.pocoo.org/docs/api/#custom-filters

From c36fce8b6a85231824bcc68cba854884f7b22ef1 Mon Sep 17 00:00:00 2001
From: Axel Haustant <axel.haustant@valtech.fr>
Date: Tue, 19 Mar 2013 13:16:56 +0100
Subject: [PATCH 1198/2864] Added missing SITESUBTITLE documentation

---
 docs/settings.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 6b663d76..72108009 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -478,6 +478,7 @@ free to use them in your themes as well.
 =======================   =======================================================
 Setting name              What does it do ?
 =======================   =======================================================
+`SITESUBTITLE`            A subitle to appear in the header.
 `DISQUS_SITENAME`         Pelican can handle Disqus comments. Specify the
                           Disqus sitename identifier here.
 `GITHUB_URL`              Your GitHub URL (if you have one). It will then

From 7fb51e94bbc3e17e333f27cc66c1801e79f26448 Mon Sep 17 00:00:00 2001
From: Axel Haustant <axel.haustant.ext@mappy.com>
Date: Wed, 20 Mar 2013 16:08:54 +0100
Subject: [PATCH 1199/2864] Fix typos

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 72108009..6c12c4b2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -67,7 +67,7 @@ Setting name (default value)                                            What doe
                                                                         content directory) to the destination (inside the output directory).
                                                                         For example: ``(('extra/robots.txt', 'robots.txt'),)``.
 `JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
-`JINJA_FILTERSS` (``{}``)                                               A list of custom Jinja2 filters you want to use.
+`JINJA_FILTERS` (``{}``)                                                A list of custom Jinja2 filters you want to use.
                                                                         The dictionnary should map the filtername to the filter function.
                                                                         For exemple: ``{'urlencode': urlencode_filter}``
                                                                         See `Jinja custom filters documentation`_.
@@ -478,7 +478,7 @@ free to use them in your themes as well.
 =======================   =======================================================
 Setting name              What does it do ?
 =======================   =======================================================
-`SITESUBTITLE`            A subitle to appear in the header.
+`SITESUBTITLE`            A subtitle to appear in the header.
 `DISQUS_SITENAME`         Pelican can handle Disqus comments. Specify the
                           Disqus sitename identifier here.
 `GITHUB_URL`              Your GitHub URL (if you have one). It will then

From e235cadda44dfef0c2135fc992ec6db1b7ebbb57 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Wed, 20 Mar 2013 21:21:47 +0100
Subject: [PATCH 1200/2864] Fix typos

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 6c12c4b2..59893146 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -68,8 +68,8 @@ Setting name (default value)                                            What doe
                                                                         For example: ``(('extra/robots.txt', 'robots.txt'),)``.
 `JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
 `JINJA_FILTERS` (``{}``)                                                A list of custom Jinja2 filters you want to use.
-                                                                        The dictionnary should map the filtername to the filter function.
-                                                                        For exemple: ``{'urlencode': urlencode_filter}``
+                                                                        The dictionary should map the filtername to the filter function.
+                                                                        For example: ``{'urlencode': urlencode_filter}``
                                                                         See `Jinja custom filters documentation`_.
 `LOCALE` (''[#]_)                                                       Change the locale. A list of locales can be provided
                                                                         here or a single string representing one locale.

From 1ff16f248b67cb6188c6b2127c03808e0a1e6cd0 Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Thu, 21 Mar 2013 15:44:52 +1000
Subject: [PATCH 1201/2864] Raise exceptions from the autoreload loop if debug
 is enabled

---
 docs/changelog.rst  | 2 ++
 pelican/__init__.py | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index aa18ea9e..f9c315ac 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,8 @@ Release history
 ================
 
 * Support for Python 3!
+* Ensure exceptions are raised if they take place during processing
+  with autoreload enabled with debug enabled.
 
 3.1 (2012-12-04)
 ================
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0e3db788..0e9bfb67 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -326,6 +326,9 @@ def main():
                         files_found_error = False
                     time.sleep(1)  # sleep to avoid cpu load
                 except Exception as e:
+                    if (args.verbosity == logging.DEBUG):
+                        logger.critical(e.args)
+                        raise
                     logger.warning(
                             'Caught exception "{0}". Reloading.'.format(e))
                     continue

From 5fcb18ea603258148dca96cf223f5629f94673e0 Mon Sep 17 00:00:00 2001
From: "Wraithan (Chris McDonald)" <xwraithanx@gmail.com>
Date: Thu, 21 Mar 2013 03:33:32 -0700
Subject: [PATCH 1202/2864] Add help directly to publishconf.py

---
 pelican/tools/templates/publishconf.py.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/tools/templates/publishconf.py.in b/pelican/tools/templates/publishconf.py.in
index a4516332..7115a6a1 100644
--- a/pelican/tools/templates/publishconf.py.in
+++ b/pelican/tools/templates/publishconf.py.in
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*- #
 
+# This file is only used if you use `make publish` or
+# explicitly specify it as your config file.
+
 import sys
 sys.path.append('.')
 from pelicanconf import *

From 173e17d992d4640ea6035d675770754ba1ca131b Mon Sep 17 00:00:00 2001
From: Chris Elston <celston@katalix.com>
Date: Thu, 21 Mar 2013 11:28:06 +0000
Subject: [PATCH 1203/2864] Simple theme article permalink missing SITEURL

This change modifies the simple template so that the SITEURL
prefix is added to the article permalink found within the article
page itself.
---
 pelican/themes/simple/templates/article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 86b14f62..98cc852c 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -3,7 +3,7 @@
 <section id="content" class="body">
   <header>
     <h2 class="entry-title">
-      <a href="{{ article.url }}" rel="bookmark"
+      <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
          title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
  {% import 'translations.html' as translations with context %}
  {{ translations.translations_for(article) }}

From e5e455e0e5dbff99acae4d03f7ff3507f615e806 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 14:46:17 -0500
Subject: [PATCH 1204/2864] Replace os.sep.join with the more robust
 os.path.join

From the Python docs for os.sep [1]:

  Note that knowing this is not sufficient to be able to parse or
  concatenate pathnames - use os.path.split() and os.path.join()...

Where I touched a line, I also changed double quoted string literals
to single quotes, since they are used more often in the source:

  wking@mjolnir ~/src/pelican $ git grep "'" pelican/*.py | wc -l
  683
  wking@mjolnir ~/src/pelican $ git grep '"' pelican/*.py | wc -l
  181

[1]: http://docs.python.org/3/library/os.html#os.sep
---
 pelican/generators.py         |  2 +-
 pelican/settings.py           | 30 +++++++++++++++++-------------
 pelican/tests/test_pelican.py | 16 ++++++++--------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index d4b2e231..f0d78d2c 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -347,7 +347,7 @@ class ArticlesGenerator(Generator):
     def generate_drafts(self, write):
         """Generate drafts pages."""
         for article in self.drafts:
-            write('drafts/%s.html' % article.slug,
+            write(os.path.join('drafts', '%s.html' % article.slug),
                 self.get_template(article.template), self.context,
                 article=article, category=article.category,
                 all_articles=self.articles)
diff --git a/pelican/settings.py b/pelican/settings.py
index d8981a0f..ac773c17 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -15,21 +15,22 @@ from os.path import isabs
 logger = logging.getLogger(__name__)
 
 
-DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
-                              "themes/notmyidea"])
+DEFAULT_THEME = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                             'themes', 'notmyidea')
 _DEFAULT_CONFIG = {'PATH': '.',
                    'ARTICLE_DIR': '',
                    'ARTICLE_EXCLUDES': ('pages',),
                    'PAGE_DIR': 'pages',
                    'PAGE_EXCLUDES': (),
                    'THEME': DEFAULT_THEME,
-                   'OUTPUT_PATH': 'output/',
+                   'OUTPUT_PATH': 'output',
                    'MARKUP': ('rst', 'md'),
                    'STATIC_PATHS': ['images', ],
                    'THEME_STATIC_PATHS': ['static', ],
-                   'FEED_ALL_ATOM': 'feeds/all.atom.xml',
-                   'CATEGORY_FEED_ATOM': 'feeds/%s.atom.xml',
-                   'TRANSLATION_FEED_ATOM': 'feeds/all-%s.atom.xml',
+                   'FEED_ALL_ATOM': os.path.join('feeds', 'all.atom.xml'),
+                   'CATEGORY_FEED_ATOM': os.path.join('feeds', '%s.atom.xml'),
+                   'TRANSLATION_FEED_ATOM': os.path.join(
+                       'feeds', 'all-%s.atom.xml'),
                    'FEED_MAX_ITEMS': '',
                    'SITEURL': '',
                    'SITENAME': 'A Pelican Blog',
@@ -49,17 +50,18 @@ _DEFAULT_CONFIG = {'PATH': '.',
                    'ARTICLE_LANG_URL': '{slug}-{lang}.html',
                    'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html',
                    'PAGE_URL': 'pages/{slug}.html',
-                   'PAGE_SAVE_AS': 'pages/{slug}.html',
+                   'PAGE_SAVE_AS': os.path.join('pages', '{slug}.html'),
                    'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
-                   'PAGE_LANG_SAVE_AS': 'pages/{slug}-{lang}.html',
+                   'PAGE_LANG_SAVE_AS': os.path.join(
+                       'pages', '{slug}-{lang}.html'),
                    'STATIC_URL': '{path}',
                    'STATIC_SAVE_AS': '{path}',
                    'CATEGORY_URL': 'category/{slug}.html',
-                   'CATEGORY_SAVE_AS': 'category/{slug}.html',
+                   'CATEGORY_SAVE_AS': os.path.join('category', '{slug}.html'),
                    'TAG_URL': 'tag/{slug}.html',
-                   'TAG_SAVE_AS': 'tag/{slug}.html',
+                   'TAG_SAVE_AS': os.path.join('tag', '{slug}.html'),
                    'AUTHOR_URL': 'author/{slug}.html',
-                   'AUTHOR_SAVE_AS': 'author/{slug}.html',
+                   'AUTHOR_SAVE_AS': os.path.join('author', '{slug}.html'),
                    'YEAR_ARCHIVE_SAVE_AS': False,
                    'MONTH_ARCHIVE_SAVE_AS': False,
                    'DAY_ARCHIVE_SAVE_AS': False,
@@ -141,8 +143,10 @@ def configure_settings(settings):
 
     # lookup the theme in "pelican/themes" if the given one doesn't exist
     if not os.path.isdir(settings['THEME']):
-        theme_path = os.sep.join([os.path.dirname(
-            os.path.abspath(__file__)), "themes/%s" % settings['THEME']])
+        theme_path = os.path.join(
+            os.path.dirname(os.path.abspath(__file__)),
+            'themes',
+            settings['THEME'])
         if os.path.exists(theme_path):
             settings['THEME'] = theme_path
         else:
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 04fd7d2b..0b94bd02 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -13,9 +13,9 @@ from pelican.settings import read_settings
 from pelican.tests.support import LoggedTestCase
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
-SAMPLES_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "..", "..",
-                                            "samples")))
-OUTPUT_PATH = os.path.abspath(os.sep.join((CURRENT_DIR, "output")))
+SAMPLES_PATH = os.path.abspath(os.path.join(
+        CURRENT_DIR, '..', '..', 'samples'))
+OUTPUT_PATH = os.path.abspath(os.path.join(CURRENT_DIR, 'output'))
 
 INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
 SAMPLE_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf.py")
@@ -23,11 +23,11 @@ SAMPLE_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf.py")
 
 def recursiveDiff(dcmp):
     diff = {
-            'diff_files': [os.sep.join((dcmp.right, f))
+            'diff_files': [os.path.join(dcmp.right, f)
                 for f in dcmp.diff_files],
-            'left_only': [os.sep.join((dcmp.right, f))
+            'left_only': [os.path.join(dcmp.right, f)
                 for f in dcmp.left_only],
-            'right_only': [os.sep.join((dcmp.right, f))
+            'right_only': [os.path.join(dcmp.right, f)
                 for f in dcmp.right_only],
             }
     for sub_dcmp in dcmp.subdirs.values():
@@ -74,7 +74,7 @@ class TestPelican(LoggedTestCase):
             })
         pelican = Pelican(settings=settings)
         pelican.run()
-        dcmp = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
+        dcmp = dircmp(self.temp_path, os.path.join(OUTPUT_PATH, 'basic'))
         self.assertFilesEqual(recursiveDiff(dcmp))
         self.assertLogCountEqual(
             count=10,
@@ -90,5 +90,5 @@ class TestPelican(LoggedTestCase):
             })
         pelican = Pelican(settings=settings)
         pelican.run()
-        dcmp = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "custom")))
+        dcmp = dircmp(self.temp_path, os.path.join(OUTPUT_PATH, 'custom'))
         self.assertFilesEqual(recursiveDiff(dcmp))

From a5c1fdac58cea8d408a1e36284173004944ed0f0 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 15:09:47 -0500
Subject: [PATCH 1205/2864] settings: Use splitext to remove extensions, not
 rpartition

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index ac773c17..834b90af 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -127,7 +127,7 @@ def get_settings_from_module(module=None, default_settings=_DEFAULT_CONFIG):
 def get_settings_from_file(path, default_settings=_DEFAULT_CONFIG):
     """Loads settings from a file path, returning a dict."""
 
-    name = os.path.basename(path).rpartition('.')[0]
+    name, ext = os.path.splitext(os.path.basename(path))
     module = imp.load_source(name, path)
     return get_settings_from_module(module, default_settings=default_settings)
 

From b59da89e80552ab9ace9a116049dd14b5f1f3946 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 11 Mar 2013 08:25:47 -0400
Subject: [PATCH 1206/2864] Convert '.' and '..' to the less magical os.curdir
 and os.pardir

While I'm cleaning up path manipulation, I might as well make things
more semantic.
---
 docs/conf.py                              | 2 +-
 pelican/__init__.py                       | 2 +-
 pelican/generators.py                     | 2 +-
 pelican/settings.py                       | 2 +-
 pelican/tests/test_pelican.py             | 2 +-
 pelican/tests/test_settings.py            | 3 ++-
 pelican/tests/test_utils.py               | 6 +++---
 pelican/tools/pelican_quickstart.py       | 7 ++++---
 pelican/tools/templates/publishconf.py.in | 3 ++-
 pelican/utils.py                          | 6 +++---
 10 files changed, 19 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 pelican/tools/templates/publishconf.py.in

diff --git a/docs/conf.py b/docs/conf.py
index 6c8ececa..40de84c7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import sys, os
 
-sys.path.append(os.path.abspath('..'))
+sys.path.append(os.path.abspath(os.pardir))
 
 from pelican import __version__, __major__
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0e3db788..2c67c5f3 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -52,7 +52,7 @@ class Pelican(object):
         signals.initialized.send(self)
 
     def init_path(self):
-        if not any(p in sys.path for p in ['', '.']):
+        if not any(p in sys.path for p in ['', os.curdir]):
             logger.debug("Adding current directory to system path")
             sys.path.insert(0, '')
 
diff --git a/pelican/generators.py b/pelican/generators.py
index f0d78d2c..97315a26 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -588,7 +588,7 @@ class StaticGenerator(Generator):
 
     def generate_output(self, writer):
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
-                         'theme', self.output_path, '.')
+                         'theme', self.output_path, os.curdir)
         # copy all Static files
         for sc in self.staticfiles:
             source_path = os.path.join(self.path, sc.source_path)
diff --git a/pelican/settings.py b/pelican/settings.py
index 834b90af..25685d72 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -17,7 +17,7 @@ logger = logging.getLogger(__name__)
 
 DEFAULT_THEME = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                              'themes', 'notmyidea')
-_DEFAULT_CONFIG = {'PATH': '.',
+_DEFAULT_CONFIG = {'PATH': os.curdir,
                    'ARTICLE_DIR': '',
                    'ARTICLE_EXCLUDES': ('pages',),
                    'PAGE_DIR': 'pages',
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 0b94bd02..c8f1daf5 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -14,7 +14,7 @@ from pelican.tests.support import LoggedTestCase
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
 SAMPLES_PATH = os.path.abspath(os.path.join(
-        CURRENT_DIR, '..', '..', 'samples'))
+        CURRENT_DIR, os.pardir, os.pardir, 'samples'))
 OUTPUT_PATH = os.path.abspath(os.path.join(CURRENT_DIR, 'output'))
 
 INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index d9bca2e5..5f1f4ede 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
 import copy
+import os
 from os.path import dirname, abspath, join
 
 from pelican.settings import (read_settings, configure_settings,
@@ -62,7 +63,7 @@ class TestSettingsConfiguration(unittest.TestCase):
         settings = {
                 'SITEURL': 'http://blog.notmyidea.org/',
                 'LOCALE': '',
-                'PATH': '.',
+                'PATH': os.curdir,
                 'THEME': DEFAULT_THEME,
                 }
         configure_settings(settings)
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index ab9ae226..ae2e0a13 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -71,9 +71,9 @@ class TestUtils(LoggedTestCase):
 
     def test_get_relative_path(self):
 
-        samples = (('test/test.html', '..'),
-                   ('test/test/test.html', '../..'),
-                   ('test.html', '.'))
+        samples = (('test/test.html', os.pardir),
+                   ('test/test/test.html', os.path.join(os.pardir, os.pardir)),
+                   ('test.html', os.curdir))
 
         for value, expected in samples:
             self.assertEquals(utils.get_relative_path(value), expected)
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 6d4264d3..02aa62d3 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -18,7 +18,7 @@ _TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
 CONF = {
     'pelican': 'pelican',
     'pelicanopts': '',
-    'basedir': '.',
+    'basedir': os.curdir,
     'ftp_host': 'localhost',
     'ftp_user': 'anonymous',
     'ftp_target_dir': '/',
@@ -146,7 +146,7 @@ def main():
     parser = argparse.ArgumentParser(
         description="A kickstarter for Pelican",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-    parser.add_argument('-p', '--path', default=".",
+    parser.add_argument('-p', '--path', default=os.curdir,
             help="The path to generate the blog into")
     parser.add_argument('-t', '--title', metavar="title",
             help='Set the title of the website')
@@ -166,7 +166,8 @@ needed by Pelican.
 
     '''.format(v=__version__))
 
-    project = os.path.join(os.environ.get('VIRTUAL_ENV', '.'), '.project')
+    project = os.path.join(
+        os.environ.get('VIRTUAL_ENV', os.curdir), '.project')
     if os.path.isfile(project):
         CONF['basedir'] = open(project, 'r').read().rstrip("\n")
         print('Using project associated with current virtual environment.'
diff --git a/pelican/tools/templates/publishconf.py.in b/pelican/tools/templates/publishconf.py.in
old mode 100644
new mode 100755
index 7115a6a1..8fd2a4f7
--- a/pelican/tools/templates/publishconf.py.in
+++ b/pelican/tools/templates/publishconf.py.in
@@ -4,8 +4,9 @@
 # This file is only used if you use `make publish` or
 # explicitly specify it as your config file.
 
+import os
 import sys
-sys.path.append('.')
+sys.path.append(os.curdir)
 from pelicanconf import *
 
 SITEURL = '$siteurl'
diff --git a/pelican/utils.py b/pelican/utils.py
index 4e1c8156..a0473ecb 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -306,9 +306,9 @@ def get_relative_path(path):
     """Return the relative path from the given path to the root path."""
     nslashes = path.count('/')
     if nslashes == 0:
-        return '.'
+        return os.curdir
     else:
-        return '/'.join(['..'] * nslashes)
+        return '/'.join([os.pardir] * nslashes)
 
 
 def truncate_html_words(s, num, end_text='...'):
@@ -429,7 +429,7 @@ def files_changed(path, extensions, ignores=[]):
     def file_times(path):
         """Return the last time files have been modified"""
         for root, dirs, files in os.walk(path):
-            dirs[:] = [x for x in dirs if x[0] != '.']
+            dirs[:] = [x for x in dirs if x[0] != os.curdir]
             for f in files:
                 if any(f.endswith(ext) for ext in extensions) \
                         and not any(fnmatch.fnmatch(f, ignore)

From ae4fc5a25ebefbe1c2a5f80f2bb45b55ee727065 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 11 Mar 2013 08:38:33 -0400
Subject: [PATCH 1207/2864] utils: Add path_to_url() and generalize
 get_relative_path()

The old get_relative_path() implementation assumed os.sep == '/',
which doesn't hold on MS Windows.  The new implementation uses
split_all() for a more general component count.

I added path_to_url(), because the:

  '/'.join(split_all(path))

idiom was showing up in a number of cases, and it's easier to
understand what's going on when that reads:

  path_to_url(path)

This will fix a number of places where I think paths and URLs were
conflated, and should improve MS Windows support.
---
 pelican/contents.py         |  4 ++--
 pelican/generators.py       |  2 +-
 pelican/tests/test_utils.py |  5 +++--
 pelican/utils.py            | 15 ++++++++++++---
 pelican/writers.py          | 12 +++++++-----
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 05761be6..38300914 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -17,7 +17,7 @@ from pelican import signals
 from pelican.settings import _DEFAULT_CONFIG
 from pelican.utils import (slugify, truncate_html_words, memoized, strftime,
                            python_2_unicode_compatible, deprecated_attribute,
-                           split_all)
+                           path_to_url)
 
 # Import these so that they're avalaible when you import from pelican.contents.
 from pelican.urlwrappers import (URLWrapper, Author, Category, Tag)  # NOQA
@@ -139,7 +139,7 @@ class Content(object):
         metadata = copy.copy(self.metadata)
         path = self.metadata.get('path', self.get_relative_source_path())
         metadata.update({
-            'path': '/'.join(split_all(path)),
+            'path': path_to_url(path),
             'slug': getattr(self, 'slug', ''),
             'lang': getattr(self, 'lang', 'en'),
             'date': getattr(self, 'date', datetime.now()),
diff --git a/pelican/generators.py b/pelican/generators.py
index 97315a26..43127099 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -565,7 +565,7 @@ class StaticGenerator(Generator):
                 f_rel = os.path.relpath(f, self.path)
                 # TODO remove this hardcoded 'static' subdirectory
                 dest = os.path.join('static', f_rel)
-                url = '/'.join(pelican.utils.split_all(dest))
+                url = pelican.utils.path_to_url(dest)
                 sc = Static(
                     content=None,
                     metadata={
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index ae2e0a13..78c90aeb 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -71,8 +71,9 @@ class TestUtils(LoggedTestCase):
 
     def test_get_relative_path(self):
 
-        samples = (('test/test.html', os.pardir),
-                   ('test/test/test.html', os.path.join(os.pardir, os.pardir)),
+        samples = ((os.path.join('test', 'test.html'), os.pardir),
+                   (os.path.join('test', 'test', 'test.html'),
+                    os.path.join(os.pardir, os.pardir)),
                    ('test.html', os.curdir))
 
         for value, expected in samples:
diff --git a/pelican/utils.py b/pelican/utils.py
index a0473ecb..417e5b15 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -304,11 +304,20 @@ def clean_output_dir(path):
 
 def get_relative_path(path):
     """Return the relative path from the given path to the root path."""
-    nslashes = path.count('/')
-    if nslashes == 0:
+    components = split_all(path)
+    if len(components) <= 1:
         return os.curdir
     else:
-        return '/'.join([os.pardir] * nslashes)
+        parents = [os.pardir] * (len(components) - 1)
+        return os.path.join(*parents)
+
+
+def path_to_url(path):
+    """Return the URL corresponding to a given path."""
+    if os.sep == '/':
+        return path
+    else:
+        '/'.join(split_all(path))
 
 
 def truncate_html_words(s, num, end_text='...'):
diff --git a/pelican/writers.py b/pelican/writers.py
index 8e611556..ea93dae6 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -10,7 +10,7 @@ from codecs import open
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 from jinja2 import Markup
 from pelican.paginator import Paginator
-from pelican.utils import get_relative_path, set_date_tzinfo
+from pelican.utils import get_relative_path, path_to_url, set_date_tzinfo
 
 logger = logging.getLogger(__name__)
 
@@ -60,7 +60,9 @@ class Writer(object):
         old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, str('C'))
         try:
-            self.site_url = context.get('SITEURL', get_relative_path(path))
+            self.site_url = context.get(
+                'SITEURL', path_to_url(get_relative_path(path)))
+
             self.feed_domain = context.get('FEED_DOMAIN')
             self.feed_url = '{}/{}'.format(self.feed_domain, path)
 
@@ -125,9 +127,9 @@ class Writer(object):
 
         localcontext = context.copy()
         if relative_urls:
-            relative_path = get_relative_path(name)
-            context['localsiteurl'] = relative_path
-            localcontext['SITEURL'] = relative_path
+            relative_url = path_to_url(get_relative_path(name))
+            context['localsiteurl'] = relative_url
+            localcontext['SITEURL'] = relative_url
 
         localcontext['output_file'] = name
         localcontext.update(kwargs)

From f147d9ec4a8e5fe00034066b8feacd8ad8b77bf3 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 15:57:58 -0500
Subject: [PATCH 1208/2864] readers: Add 'static' to the base Reader's
 extensions

Instead of just being a base class, we can use it to parse static
files.  It won't actually do any parsing, but we will get path
metadata extraction from read_file, and this will make the
StaticGenerator implementation simpler.
---
 pelican/readers.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 3fd3650b..8dcabb01 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -44,6 +44,7 @@ METADATA_PROCESSORS = {
 
 class Reader(object):
     enabled = True
+    file_extensions = ['static']
     extensions = None
 
     def __init__(self, settings):
@@ -54,6 +55,12 @@ class Reader(object):
             return METADATA_PROCESSORS[name](value, self.settings)
         return value
 
+    def read(self, source_path):
+        "No-op parser"
+        content = None
+        metadata = {}
+        return content, metadata
+
 
 class _FieldBodyTranslator(HTMLTranslator):
 
@@ -311,7 +318,7 @@ class AsciiDocReader(Reader):
 
 EXTENSIONS = {}
 
-for cls in Reader.__subclasses__():
+for cls in [Reader] + Reader.__subclasses__():
     for ext in cls.file_extensions:
         EXTENSIONS[ext] = cls
 

From 29cdb37af3ba021071f7705191d1dabd48afbbe5 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 16:12:34 -0500
Subject: [PATCH 1209/2864] generators: Use the static format to read Static
 metadata

This cuts down on the remaining difference between static files and
articles/pages.  The main difference is that path-based metadata is
now parsed for static content.
---
 pelican/generators.py | 15 +++++++++------
 pelican/readers.py    |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 43127099..f748766a 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -563,21 +563,24 @@ class StaticGenerator(Generator):
             for f in self.get_files(
                     os.path.join(self.path, static_path), extensions=False):
                 f_rel = os.path.relpath(f, self.path)
+                content, metadata = read_file(
+                    f, fmt='static', settings=self.settings)
                 # TODO remove this hardcoded 'static' subdirectory
-                dest = os.path.join('static', f_rel)
-                url = pelican.utils.path_to_url(dest)
+                metadata['save_as'] = os.path.join('static', f_rel)
+                metadata['url'] = pelican.utils.path_to_url(metadata['save_as'])
                 sc = Static(
                     content=None,
-                    metadata={
-                        'save_as': dest,
-                        'url': url,
-                        },
+                    metadata=metadata,
                     settings=self.settings,
                     source_path=f_rel)
                 self.staticfiles.append(sc)
                 self.add_source_path(sc)
         # same thing for FILES_TO_COPY
         for src, dest in self.settings['FILES_TO_COPY']:
+            content, metadata = read_file(
+                src, fmt='static', settings=self.settings)
+            metadata['save_as'] = dest
+            metadata['url'] = pelican.utils.path_to_url(metadata['save_as'])
             sc = Static(
                 content=None,
                 metadata={'save_as': dest},
diff --git a/pelican/readers.py b/pelican/readers.py
index 8dcabb01..a6ff9118 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -347,7 +347,7 @@ def read_file(path, fmt=None, settings=None):
     metadata.update(reader_metadata)
 
     # eventually filter the content with typogrify if asked so
-    if settings and settings.get('TYPOGRIFY'):
+    if content and settings and settings.get('TYPOGRIFY'):
         from typogrify.filters import typogrify
         content = typogrify(content)
         metadata['title'] = typogrify(metadata['title'])

From b69046f98da4b59d6bc206a5440c086992b67634 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Sat, 23 Mar 2013 16:07:43 +0100
Subject: [PATCH 1210/2864] Install webassets & cssmin only for Python 2.

webassets is not py3 compatible yet. This will avoid a failed install of
webassets for each py3 Travis build.
---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6040a8b8..3a309d0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ install:
     - pip install nose mock --use-mirrors
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors unittest2; else pip install --use-mirrors unittest2py3k; fi
     - pip install . --use-mirrors
-    - pip install Markdown
-    - pip install webassets
-    - pip install cssmin
+    - pip install --use-mirrors Markdown
+    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors webassets cssmin; fi
 script: nosetests -s pelican

From 5e4622b229aa69a5355215980c6dc4330beb5420 Mon Sep 17 00:00:00 2001
From: Chenguang Wang <w3cing@gmail.com>
Date: Fri, 1 Feb 2013 15:35:48 -0800
Subject: [PATCH 1211/2864] make pelican-quickstart and the Makefile it
 generates support py3k.

---
 pelican/tools/pelican_quickstart.py          | 22 +++++++++++++++++---
 pelican/tools/templates/Makefile.in          |  2 +-
 pelican/tools/templates/develop_server.sh.in |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 7fdaa489..a6045256 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -37,6 +37,7 @@ def _input_compat(prompt):
     if six.PY3:
         r = input(prompt)
     else:
+        # FIXME: why use this with @decoding_strings?
         r = raw_input(prompt).decode('utf-8')
     return r
 
@@ -50,7 +51,10 @@ def decoding_strings(f):
         out = f(*args, **kwargs)
         if isinstance(out, six.string_types) and not six.PY3:
             # todo: make encoding configurable?
-            return out.decode(sys.stdin.encoding)
+            if six.PY3:
+                return out
+            else:
+                return out.decode(sys.stdin.encoding)
         return out
     return wrapper
 
@@ -243,7 +247,14 @@ needed by Pelican.
     if mkfile:
         try:
             with codecs.open(os.path.join(CONF['basedir'], 'Makefile'), 'w', 'utf-8') as fd:
-                for line in get_template('Makefile'):
+                mkfile_template_name = 'Makefile'
+                py_v = 'PY=python'
+                if six.PY3:
+                    py_v = 'PY=python3'
+                template = string.Template(py_v)
+                fd.write(template.safe_substitute(CONF))
+                fd.write('\n')
+                for line in get_template(mkfile_template_name):
                     template = string.Template(line)
                     fd.write(template.safe_substitute(CONF))
                 fd.close()
@@ -258,7 +269,12 @@ needed by Pelican.
             conf_shell[key] = value
         try:
             with codecs.open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w', 'utf-8') as fd:
-                for line in get_template('develop_server.sh'):
+                lines = list(get_template('develop_server.sh'))
+                py_v = 'PY=python\n'
+                if six.PY3:
+                    py_v = 'PY=python3\n'
+                lines = lines[:4] + [py_v] + lines[4:]
+                for line in lines:
                     template = string.Template(line)
                     fd.write(template.safe_substitute(conf_shell))
                 fd.close()
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index e20fc612..50fe7081 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -53,7 +53,7 @@ regenerate: clean
 	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 serve:
-	cd $$(OUTPUTDIR) && python -m pelican.server
+	cd $$(OUTPUTDIR) && $(PY) -m pelican.server
 
 devserver:
 	$$(BASEDIR)/develop_server.sh restart
diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index ab81a298..65c54622 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -65,7 +65,7 @@ function start_up(){
   pelican_pid=$$!
   echo $$pelican_pid > $$PELICAN_PID
   cd $$OUTPUTDIR
-  python -m pelican.server &
+  $PY -m pelican.server &
   srv_pid=$$!
   echo $$srv_pid > $$SRV_PID
   cd $$BASEDIR

From bd54cb1b88526e81a9582b1a0f24ad2ac94dae48 Mon Sep 17 00:00:00 2001
From: Dave King <dave@davbo.org>
Date: Sat, 12 Jan 2013 19:08:24 +0000
Subject: [PATCH 1212/2864] Prevent people from setting STATIC_PATHS to a str

Previously you could accidentally set for example site/css and pelican would iterate through the string and attempt to copy '/' into your output.
---
 pelican/settings.py            | 10 ++++++++++
 pelican/tests/test_settings.py | 16 ++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/pelican/settings.py b/pelican/settings.py
index 25685d72..fd6b9b40 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -234,4 +234,14 @@ def configure_settings(settings):
         settings['FILENAME_METADATA'] = (
                 _DEFAULT_CONFIG['FILENAME_METADATA'])
 
+    # Save people from accidentally setting site/css vs [site/css]
+    path_keys = ['STATIC_PATHS', 'THEME_STATIC_PATHS']
+    for PATH_KEY in filter(lambda k: k in settings, path_keys):
+            if isinstance(settings[PATH_KEY], six.string_types):
+                logger.warn("Detected misconfiguration with %s setting (must "
+                        "be a list of paths), falling back to the default"
+                        % PATH_KEY)
+                settings[PATH_KEY] = \
+                        _DEFAULT_CONFIG[PATH_KEY]
+
     return settings
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 5f1f4ede..da251675 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -57,6 +57,22 @@ class TestSettingsConfiguration(unittest.TestCase):
         settings['SITENAME'] = 'Not a Pelican Blog'
         self.assertNotEqual(settings['SITENAME'], _DEFAULT_CONFIG['SITENAME'])
 
+    def test_path_settings_safety(self):
+        """Don't let people setting the static path listings to strs"""
+        settings = {'STATIC_PATHS': 'foo/bar',
+                'THEME_STATIC_PATHS': 'bar/baz',
+                # These 4 settings are required to run configure_settings
+                'PATH': '.',
+                'THEME': DEFAULT_THEME,
+                'SITEURL': 'http://blog.notmyidea.org/',
+                'LOCALE': '',
+                }
+        configure_settings(settings)
+        self.assertEqual(settings['STATIC_PATHS'],
+                _DEFAULT_CONFIG['STATIC_PATHS'])
+        self.assertEqual(settings['THEME_STATIC_PATHS'],
+                _DEFAULT_CONFIG['THEME_STATIC_PATHS'])
+
     def test_configure_settings(self):
         #Manipulations to settings should be applied correctly.
 

From cb5f66ffe0e05ff0de0ad18604727d6dc87fe787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sat, 23 Mar 2013 19:56:45 -0700
Subject: [PATCH 1213/2864] Check all lists are not strings.

---
 pelican/settings.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index fd6b9b40..da770775 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -234,14 +234,25 @@ def configure_settings(settings):
         settings['FILENAME_METADATA'] = (
                 _DEFAULT_CONFIG['FILENAME_METADATA'])
 
-    # Save people from accidentally setting site/css vs [site/css]
-    path_keys = ['STATIC_PATHS', 'THEME_STATIC_PATHS']
+    # Save people from accidentally setting a string rather than a list
+    path_keys = (
+            'ARTICLE_EXCLUDES',
+            'DEFAULT_METADATA',
+            'DIRECT_TEMPLATES',
+            'EXTRA_TEMPLATES_PATHS',
+            'FILES_TO_COPY',
+            'IGNORE_FILES',
+            'JINJA_EXTENSIONS',
+            'MARKUP',
+            'PAGINATED_DIRECT_TEMPLATES',
+            'PLUGINS',
+            'STATIC_PATHS',
+            'THEME_STATIC_PATHS',)
     for PATH_KEY in filter(lambda k: k in settings, path_keys):
             if isinstance(settings[PATH_KEY], six.string_types):
                 logger.warn("Detected misconfiguration with %s setting (must "
-                        "be a list of paths), falling back to the default"
+                        "be a list), falling back to the default"
                         % PATH_KEY)
-                settings[PATH_KEY] = \
-                        _DEFAULT_CONFIG[PATH_KEY]
+                settings[PATH_KEY] = _DEFAULT_CONFIG[PATH_KEY]
 
     return settings

From 385a18563cf9b3a16c8f23184b4d8f3d8c7dadba Mon Sep 17 00:00:00 2001
From: Irfan Ahmad <erfaan@gmail.com>
Date: Mon, 10 Dec 2012 03:03:48 +0500
Subject: [PATCH 1214/2864] Fixes #630

---
 pelican/tests/test_utils.py | 6 +++++-
 pelican/utils.py            | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 78c90aeb..78e888eb 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -74,7 +74,11 @@ class TestUtils(LoggedTestCase):
         samples = ((os.path.join('test', 'test.html'), os.pardir),
                    (os.path.join('test', 'test', 'test.html'),
                     os.path.join(os.pardir, os.pardir)),
-                   ('test.html', os.curdir))
+                   ('test.html', os.curdir),
+                   (os.path.join('/test', 'test.html'), os.pardir),
+                   (os.path.join('/test', 'test', 'test.html'),
+                    os.path.join(os.pardir, os.pardir)),
+                   ('/test.html', os.curdir),)
 
         for value, expected in samples:
             self.assertEquals(utils.get_relative_path(value), expected)
diff --git a/pelican/utils.py b/pelican/utils.py
index 417e5b15..3ae88402 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -501,8 +501,9 @@ def split_all(path):
     ['a', 'b', 'c']
     """
     components = []
+    path = path.lstrip('/')
     while path:
-        head,tail = os.path.split(path)
+        head, tail = os.path.split(path)
         if tail:
             components.insert(0, tail)
         elif head == path:

From b06fbd78cc6093d73fea8f11bc3610a097d5b1d7 Mon Sep 17 00:00:00 2001
From: Will Dowling <will@autodeist.com>
Date: Mon, 25 Mar 2013 10:39:22 +0000
Subject: [PATCH 1215/2864] Load a default-named configuration file if present

---
 pelican/__init__.py | 10 ++++++++--
 pelican/utils.py    |  8 ++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index a2bdefa4..a57ecb4c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -17,7 +17,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
 from pelican.log import init
 from pelican.settings import read_settings
 from pelican.utils import (clean_output_dir, files_changed, file_changed,
-                           NoFilesError)
+                           file_exists, NoFilesError)
 from pelican.writers import Writer
 
 __major__ = 3
@@ -25,6 +25,8 @@ __minor__ = 2
 __micro__ = 0
 __version__ = "{0}.{1}.{2}".format(__major__, __minor__, __micro__)
 
+DEFAULT_CONFIG_NAME = 'pelicanconf.py'
+
 
 logger = logging.getLogger(__name__)
 
@@ -269,7 +271,11 @@ def get_config(args):
 
 def get_instance(args):
 
-    settings = read_settings(args.settings, override=get_config(args))
+    config_file = args.settings
+    if config_file is None and file_exists(DEFAULT_CONFIG_NAME):
+            config_file = DEFAULT_CONFIG_NAME
+
+    settings = read_settings(config_file, override=get_config(args))
 
     cls = settings.get('PELICAN_CLASS')
     if isinstance(cls, six.string_types):
diff --git a/pelican/utils.py b/pelican/utils.py
index 3ae88402..36d2995c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -268,6 +268,14 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
         logger.warning('skipped copy %s to %s' % (source_, destination_))
 
 
+def file_exists(path):
+    """Checks path exists and is a file
+
+    :param path: the path to be checked
+    """
+    return os.path.exists(path) and os.path.isfile(path)
+
+
 def clean_output_dir(path):
     """Remove all the files from the output directory"""
 

From 608e398386b88476facfa86632d95b6b1da0bf62 Mon Sep 17 00:00:00 2001
From: Will Dowling <will@autodeist.com>
Date: Mon, 25 Mar 2013 10:45:43 +0000
Subject: [PATCH 1216/2864] Removing utils.file_exists and replacing with
 os.path.isfile

---
 pelican/__init__.py | 4 ++--
 pelican/utils.py    | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index a57ecb4c..3be8ceb8 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -17,7 +17,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
 from pelican.log import init
 from pelican.settings import read_settings
 from pelican.utils import (clean_output_dir, files_changed, file_changed,
-                           file_exists, NoFilesError)
+                           NoFilesError)
 from pelican.writers import Writer
 
 __major__ = 3
@@ -272,7 +272,7 @@ def get_config(args):
 def get_instance(args):
 
     config_file = args.settings
-    if config_file is None and file_exists(DEFAULT_CONFIG_NAME):
+    if config_file is None and os.path.isfile(DEFAULT_CONFIG_NAME):
             config_file = DEFAULT_CONFIG_NAME
 
     settings = read_settings(config_file, override=get_config(args))
diff --git a/pelican/utils.py b/pelican/utils.py
index 36d2995c..3ae88402 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -268,14 +268,6 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
         logger.warning('skipped copy %s to %s' % (source_, destination_))
 
 
-def file_exists(path):
-    """Checks path exists and is a file
-
-    :param path: the path to be checked
-    """
-    return os.path.exists(path) and os.path.isfile(path)
-
-
 def clean_output_dir(path):
     """Remove all the files from the output directory"""
 

From 3dcfe1846c4eeb6b09c37d4904dcd6e989e1bc0b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 25 Mar 2013 10:03:41 -0700
Subject: [PATCH 1217/2864] Remove multi_part plugin

As part of our continuing effort to move plugins their own repository,
this plugin was moved to the pelican-plugins repository.
---
 pelican/plugins/multi_part.py | 59 -----------------------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 pelican/plugins/multi_part.py

diff --git a/pelican/plugins/multi_part.py b/pelican/plugins/multi_part.py
deleted file mode 100644
index 0581b501..00000000
--- a/pelican/plugins/multi_part.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Copyright (c) FELD Boris <lothiraldan@gmail.com>
-
-Multiple part support
-=====================
-
-Create a navigation menu for multi-part related_posts
-
-Article metadata:
-------------------
-
-:parts:  a unique identifier for multi-part posts, must be the same in each
-post part.
-
-Usage
------
-    {% if article.metadata.parts_articles %}
-        <ol>
-        {% for part_article in article.metadata.parts_articles %}
-            {% if part_article == article %}
-                <li>
-                    <a href='{{ SITEURL }}/{{ part_article.url }}'><b>{{ part_article.title }}</b>
-                    </a>
-                </li>
-            {% else %}
-                <li>
-                    <a href='{{ SITEURL }}/{{ part_article.url }}'>{{ part_article.title }}
-                    </a>
-                </li>
-            {% endif %}
-        {% endfor %}
-        </ol>
-    {% endif %}
-"""
-from collections import defaultdict
-
-from pelican import signals
-
-
-def aggregate_multi_part(generator):
-        multi_part = defaultdict(list)
-
-        for article in generator.articles:
-            if 'parts' in article.metadata:
-                multi_part[article.metadata['parts']].append(article)
-
-        for part_id in multi_part:
-            parts = multi_part[part_id]
-
-            # Sort by date
-            parts.sort(key=lambda x: x.metadata['date'])
-
-            for article in parts:
-                article.metadata['parts_articles'] = parts
-
-
-def register():
-    signals.article_generator_finalized.connect(aggregate_multi_part)

From 0d43017704ebab869f635277a05f30bd43951588 Mon Sep 17 00:00:00 2001
From: Will Dowling <will@autodeist.com>
Date: Tue, 26 Mar 2013 10:37:37 +0800
Subject: [PATCH 1218/2864] Adding information to argparse help

---
 pelican/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 3be8ceb8..61638727 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -222,7 +222,8 @@ def parse_arguments():
              'them separated by commas.')
 
     parser.add_argument('-s', '--settings', dest='settings',
-        help='The settings of the application.')
+        help='The settings of the application, this defaults to {0} if a file, '
+        'exists with this name.'.format(DEFAULT_CONFIG_NAME))
 
     parser.add_argument('-d', '--delete-output-directory',
         dest='delete_outputdir',

From de6973977403e2ccf75de0b91704bd60f38361df Mon Sep 17 00:00:00 2001
From: Will Dowling <will@autodeist.com>
Date: Tue, 26 Mar 2013 02:42:11 +0000
Subject: [PATCH 1219/2864] Fixing help text

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 61638727..aa283f11 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -222,8 +222,8 @@ def parse_arguments():
              'them separated by commas.')
 
     parser.add_argument('-s', '--settings', dest='settings',
-        help='The settings of the application, this defaults to {0} if a file, '
-        'exists with this name.'.format(DEFAULT_CONFIG_NAME))
+        help='The settings of the application, this is automatically set to '
+        '{0} if a file exists with this name.'.format(DEFAULT_CONFIG_NAME))
 
     parser.add_argument('-d', '--delete-output-directory',
         dest='delete_outputdir',

From 58f77012dd937000661ca26f26561d27ff4df86a Mon Sep 17 00:00:00 2001
From: Colin Dunklau <colin.dunklau@gmail.com>
Date: Tue, 26 Mar 2013 00:12:59 -0500
Subject: [PATCH 1220/2864] Nuked spurious ./tests directory

Only images, someone added a bit too much to the index
---
 .../basic/theme/images/icons/google-groups.png    | Bin 803 -> 0 bytes
 tests/output/basic/theme/images/icons/vimeo.png   | Bin 544 -> 0 bytes
 tests/output/basic/theme/images/icons/youtube.png | Bin 458 -> 0 bytes
 .../custom/theme/images/icons/google-groups.png   | Bin 803 -> 0 bytes
 tests/output/custom/theme/images/icons/vimeo.png  | Bin 544 -> 0 bytes
 .../output/custom/theme/images/icons/youtube.png  | Bin 458 -> 0 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tests/output/basic/theme/images/icons/google-groups.png
 delete mode 100644 tests/output/basic/theme/images/icons/vimeo.png
 delete mode 100644 tests/output/basic/theme/images/icons/youtube.png
 delete mode 100644 tests/output/custom/theme/images/icons/google-groups.png
 delete mode 100644 tests/output/custom/theme/images/icons/vimeo.png
 delete mode 100644 tests/output/custom/theme/images/icons/youtube.png

diff --git a/tests/output/basic/theme/images/icons/google-groups.png b/tests/output/basic/theme/images/icons/google-groups.png
deleted file mode 100644
index 5de15e68f4d1e4176b46fe6346d42f53e3296b21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 803
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Mpyt
z6XFU~@c;jRouXIDNvA)3c>3}ElMnA6zkmDa-J1t*U*CKC>h7DDcV4}?_43)x7td}y
ze|qiNlPk|2Uv}&N<J$Y%sr#2h=TEz~AGR&ut(v}BG=4R&|6*GE*|_?XVb#Z{k1o0N
z{C4X6<<RldrscbN-4~OZ&rcp+bngD`2-Ma7)3)`8B~VxWSF^e=_U%9IT7P{1{@twZ
zvq{Y-qw0@_6(1fyxM0`*WAV}d3y=Ias`_Y9@!`?^^R}(u7ajS(=*U0I#%~r4Ul$zy
zx8Tsfhxg7~H-GEg@^|Lm-_v*hYTfwf!QFGOU)-{61S<HiU;h67owJ6O9}LRh-@AS0
z#nT%`)t~gr-rc!%+PLPEUg_K0H%={FIAg(r>GS4Ioi}&t+__Wd%$cHF^5*9C6Zh|&
zS-fcGqD3=xieDc*uvxqCB`~<QtYuvY3^<mOAU|M?e6KxrOC}M>XH4>TcVYa`q<as@
zdFbil7$R}m^h9MeW1vLa$MA2un|cb*v=~lWYdp0;VruOvk*OP}Xngs*-%0<~zvnyW
z$u}I$+H5^XZ~O7;H=pOvU|7?bpmE0ahejvoBh4mV34ayK&i-X7jy}pa&O6Qgyk^R2
z@qY&<a*FG#cy$(4mc}|2+$(r$<e#}JXyqoUrqy~Ydv9AWx?}Eo&8cAfPrvC&d+m~?
z4jo>+>QZfU<G+>%sx2Z(n*wUnoNHS?EYjGdv*%IzuiFv_(<LfgxBZ^1*%Uwf?DO~X
z-Tr@0i!vR!{=LfFATlq3|D~>s)h|m2&VR<uFU3DER#7b}zVrv^S=AEPh?11Vl2ohY
zqEsNoU}RuutZQJXYiJx|U}R-zXa!^&SXdbt9ArN;6-7gCeoAIqCAtO!D`PW=29XVF
QRX`04p00i_>zopr01MEB^#A|>

diff --git a/tests/output/basic/theme/images/icons/vimeo.png b/tests/output/basic/theme/images/icons/vimeo.png
deleted file mode 100644
index dba472022f0fcf7ecdd8f4847a8a3bde90789bc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

diff --git a/tests/output/basic/theme/images/icons/youtube.png b/tests/output/basic/theme/images/icons/youtube.png
deleted file mode 100644
index ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT

diff --git a/tests/output/custom/theme/images/icons/google-groups.png b/tests/output/custom/theme/images/icons/google-groups.png
deleted file mode 100644
index 5de15e68f4d1e4176b46fe6346d42f53e3296b21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 803
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Mpyt
z6XFU~@c;jRouXIDNvA)3c>3}ElMnA6zkmDa-J1t*U*CKC>h7DDcV4}?_43)x7td}y
ze|qiNlPk|2Uv}&N<J$Y%sr#2h=TEz~AGR&ut(v}BG=4R&|6*GE*|_?XVb#Z{k1o0N
z{C4X6<<RldrscbN-4~OZ&rcp+bngD`2-Ma7)3)`8B~VxWSF^e=_U%9IT7P{1{@twZ
zvq{Y-qw0@_6(1fyxM0`*WAV}d3y=Ias`_Y9@!`?^^R}(u7ajS(=*U0I#%~r4Ul$zy
zx8Tsfhxg7~H-GEg@^|Lm-_v*hYTfwf!QFGOU)-{61S<HiU;h67owJ6O9}LRh-@AS0
z#nT%`)t~gr-rc!%+PLPEUg_K0H%={FIAg(r>GS4Ioi}&t+__Wd%$cHF^5*9C6Zh|&
zS-fcGqD3=xieDc*uvxqCB`~<QtYuvY3^<mOAU|M?e6KxrOC}M>XH4>TcVYa`q<as@
zdFbil7$R}m^h9MeW1vLa$MA2un|cb*v=~lWYdp0;VruOvk*OP}Xngs*-%0<~zvnyW
z$u}I$+H5^XZ~O7;H=pOvU|7?bpmE0ahejvoBh4mV34ayK&i-X7jy}pa&O6Qgyk^R2
z@qY&<a*FG#cy$(4mc}|2+$(r$<e#}JXyqoUrqy~Ydv9AWx?}Eo&8cAfPrvC&d+m~?
z4jo>+>QZfU<G+>%sx2Z(n*wUnoNHS?EYjGdv*%IzuiFv_(<LfgxBZ^1*%Uwf?DO~X
z-Tr@0i!vR!{=LfFATlq3|D~>s)h|m2&VR<uFU3DER#7b}zVrv^S=AEPh?11Vl2ohY
zqEsNoU}RuutZQJXYiJx|U}R-zXa!^&SXdbt9ArN;6-7gCeoAIqCAtO!D`PW=29XVF
QRX`04p00i_>zopr01MEB^#A|>

diff --git a/tests/output/custom/theme/images/icons/vimeo.png b/tests/output/custom/theme/images/icons/vimeo.png
deleted file mode 100644
index dba472022f0fcf7ecdd8f4847a8a3bde90789bc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

diff --git a/tests/output/custom/theme/images/icons/youtube.png b/tests/output/custom/theme/images/icons/youtube.png
deleted file mode 100644
index ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT


From e6f3126ba6989fcd9d760c86c119ac61d76b0353 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 26 Mar 2013 01:28:42 -0400
Subject: [PATCH 1221/2864] Fix for issue #219: tags should list only main
 articles, not translations

---
 pelican/generators.py                    | 10 +++---
 pelican/tests/output/basic/tag/bar.html  | 42 +++++-----------------
 pelican/tests/output/basic/tag/baz.html  | 40 ++++-----------------
 pelican/tests/output/basic/tag/foo.html  | 42 +++++-----------------
 pelican/tests/output/custom/tag/bar.html | 45 +++++-------------------
 pelican/tests/output/custom/tag/baz.html | 43 ++++------------------
 pelican/tests/output/custom/tag/foo.html | 45 +++++-------------------
 7 files changed, 54 insertions(+), 213 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index f748766a..02412440 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -417,9 +417,6 @@ class ArticlesGenerator(Generator):
             self.add_source_path(article)
 
             if article.status == "published":
-                if hasattr(article, 'tags'):
-                    for tag in article.tags:
-                        self.tags[tag].append(article)
                 all_articles.append(article)
             elif article.status == "draft":
                 self.drafts.append(article)
@@ -431,12 +428,17 @@ class ArticlesGenerator(Generator):
         self.articles, self.translations = process_translations(all_articles)
 
         for article in self.articles:
-            # only main articles are listed in categories, not translations
+            # only main articles are listed in categories and tags
+            # not translations
             self.categories[article.category].append(article)
+            if hasattr(article, 'tags'):
+                for tag in article.tags:
+                    self.tags[tag].append(article)
             # ignore blank authors as well as undefined
             if hasattr(article, 'author') and article.author.name != '':
                 self.authors[article.author].append(article)
 
+
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
         self.dates = list(self.articles)
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 219f0e00..793cf737 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -35,48 +35,24 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article.html">en</a>
-    
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="../second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
-        </abbr>
-
         <p>In <a href="../category/misc.html">misc</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
             <a href="../second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
-
-                <a class="readmore" href="../second-article.html">read more</a>
-                                </div><!-- /.entry-content -->
-            </article></li>
-                            
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
 
                  
                         <li><article class="hentry">    
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 97c9f387..5ca0c5de 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -35,49 +35,21 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article.html">en</a>
-    
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="../second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
-        </abbr>
-
         <p>In <a href="../category/misc.html">misc</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
             <a href="../second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
-
-                <a class="readmore" href="../second-article.html">read more</a>
-                                </div><!-- /.entry-content -->
-            </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+                </article>
+                                                                </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
+                        </section><!-- /#content -->
                     <section id="extras" class="body">
                                 <div class="social">
                         <h2>social</h2>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index b08b7f9e..e830de6b 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -35,48 +35,24 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article.html">en</a>
-    
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="../second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
-        </abbr>
-
         <p>In <a href="../category/misc.html">misc</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
             <a href="../second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
-
-                <a class="readmore" href="../second-article.html">read more</a>
-                                </div><!-- /.entry-content -->
-            </article></li>
-                            
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
 
                  
                         <li><article class="hentry">    
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 99723b47..dbd7c48a 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -39,7 +39,7 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -49,44 +49,17 @@
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article.html">en</a>
-    
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href="../second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="../second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
-        </abbr>
-
-                <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
             <a href="../second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
-
-                <a class="readmore" href="../second-article.html">read more</a>
-                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                            
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
 
                  
                         <li><article class="hentry">    
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 03959e62..4094477f 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -39,7 +39,7 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -49,47 +49,16 @@
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article.html">en</a>
-    
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href="../second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="../second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
-        </abbr>
-
-                <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
             <a href="../second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
-
-                <a class="readmore" href="../second-article.html">read more</a>
-                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
+                                    <p class="paginator">
         Page 1 / 1
     </p>
+                            </aside><!-- /#featured -->
+                                                </ol><!-- /#posts-list -->
                         </section><!-- /#content -->
                     <section id="extras" class="body">
                         <div class="blogroll">
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 66d52f6f..7c12ea5a 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -39,7 +39,7 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> 
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
@@ -49,44 +49,17 @@
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
         <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article.html">en</a>
-    
-</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
-<p>There are <a href="../second-article-fr.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-                                                
-
-                 
-                        <li><article class="hentry">    
-                <header>
-                    <h1><a href="../second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
-                
-                <div class="entry-content">
-                <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
-        </abbr>
-
-                <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
             <a href="../second-article-fr.html">fr</a>
     
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
-
-                <a class="readmore" href="../second-article.html">read more</a>
-                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                            
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
+                            </aside><!-- /#featured -->
+                            <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+                                                
 
                  
                         <li><article class="hentry">    

From fad824ef5a5bb57532dce5fef0b1654289f27d46 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Fri, 1 Mar 2013 12:40:19 +0100
Subject: [PATCH 1222/2864] Fix webassets tests when running on a system with a
 different locale.

---
 pelican/tests/test_webassets.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/tests/test_webassets.py b/pelican/tests/test_webassets.py
index 22c0ae78..c96b0c18 100644
--- a/pelican/tests/test_webassets.py
+++ b/pelican/tests/test_webassets.py
@@ -2,6 +2,7 @@
 # from __future__ import unicode_literals
 
 import hashlib
+import locale
 import os
 from codecs import open
 from tempfile import mkdtemp
@@ -31,6 +32,7 @@ class TestWebAssets(unittest.TestCase):
             'OUTPUT_PATH': self.temp_path,
             'PLUGINS': ['pelican.plugins.assets', ],
             'THEME': THEME_DIR,
+            'LOCALE': locale.normalize('en_US'),
         }
         if override:
             settings.update(override)

From edbac49f2bf96eb433d993fdbbc9de9b974c3995 Mon Sep 17 00:00:00 2001
From: Colin Dunklau <colin.dunklau@gmail.com>
Date: Tue, 26 Mar 2013 00:38:07 -0500
Subject: [PATCH 1223/2864] Nitpicking - tempdir naming, also backslashes are
 bad

Tempdirs should have useful prefixes to aid in collecting information
    about failed tests.
Implicit concatenation is better than backslash line continuation.
---
 pelican/tests/test_generators.py |  8 ++---
 pelican/tests/test_pelican.py    | 14 ++++-----
 pelican/tests/test_readers.py    | 51 ++++++++++++++++----------------
 pelican/tests/test_webassets.py  |  2 +-
 4 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index e6f2a5be..1e5a7339 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -8,8 +8,8 @@ from codecs import open
 from tempfile import mkdtemp
 from shutil import rmtree
 
-from pelican.generators import ArticlesGenerator, PagesGenerator, \
-    TemplatePagesGenerator
+from pelican.generators import (ArticlesGenerator, PagesGenerator,
+                                TemplatePagesGenerator)
 from pelican.writers import Writer
 from pelican.settings import _DEFAULT_CONFIG
 from pelican.tests.support import unittest, get_settings
@@ -219,8 +219,8 @@ class TestTemplatePagesGenerator(unittest.TestCase):
     TEMPLATE_CONTENT = "foo: {{ foo }}"
 
     def setUp(self):
-        self.temp_content = mkdtemp()
-        self.temp_output = mkdtemp()
+        self.temp_content = mkdtemp(prefix='pelicantests.')
+        self.temp_output = mkdtemp(prefix='pelicantests.')
 
     def tearDown(self):
         rmtree(self.temp_content)
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index c8f1daf5..5fd037f3 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -42,7 +42,7 @@ class TestPelican(LoggedTestCase):
 
     def setUp(self):
         super(TestPelican, self).setUp()
-        self.temp_path = mkdtemp()
+        self.temp_path = mkdtemp(prefix='pelicantests.')
         self.old_locale = locale.setlocale(locale.LC_ALL)
         self.maxDiff = None
         locale.setlocale(locale.LC_ALL, str('C'))
@@ -53,12 +53,12 @@ class TestPelican(LoggedTestCase):
         super(TestPelican, self).tearDown()
 
     def assertFilesEqual(self, diff):
-        msg = "some generated files differ from the expected functional " \
-              "tests output.\n" \
-              "This is probably because the HTML generated files " \
-              "changed. If these changes are normal, please refer " \
-              "to docs/contribute.rst to update the expected " \
-              "output of the functional tests."
+        msg = ("some generated files differ from the expected functional "
+               "tests output.\n"
+               "This is probably because the HTML generated files "
+               "changed. If these changes are normal, please refer "
+               "to docs/contribute.rst to update the expected "
+               "output of the functional tests.")
 
         self.assertEqual(diff['left_only'], [], msg=msg)
         self.assertEqual(diff['right_only'], [], msg=msg)
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index ec88781b..137add2f 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -94,9 +94,9 @@ class RstReaderTest(unittest.TestCase):
         # unmodified
         content, _ = readers.read_file(_path('article.rst'))
         expected = ('<p>This is some content. With some stuff to '
-                   '&quot;typogrify&quot;.</p>\n<p>Now with added '
-                   'support for <abbr title="three letter acronym">'
-                   'TLA</abbr>.</p>\n')
+                    '&quot;typogrify&quot;.</p>\n<p>Now with added '
+                    'support for <abbr title="three letter acronym">'
+                    'TLA</abbr>.</p>\n')
 
         self.assertEqual(content, expected)
 
@@ -138,25 +138,26 @@ class MdReaderTest(unittest.TestCase):
         # correct reader
         content, metadata = reader.read(
             _path('article_with_md_extension.md'))
-        expected = "<h1>Test Markdown File Header</h1>\n"\
-                "<h2>Used for pelican test</h2>\n"\
-                "<p>The quick brown fox jumped over the lazy dog's back.</p>"
+        expected = (
+                "<h1>Test Markdown File Header</h1>\n"
+                "<h2>Used for pelican test</h2>\n"
+                "<p>The quick brown fox jumped over the lazy dog's back.</p>")
         self.assertEqual(content, expected)
         # test to ensure the mkd file extension is being processed by the
         # correct reader
         content, metadata = reader.read(
             _path('article_with_mkd_extension.mkd'))
-        expected = "<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"\
-                   " test</h2>\n<p>This is another markdown test file.  Uses"\
-                   " the mkd extension.</p>"
+        expected = ("<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"
+                    " test</h2>\n<p>This is another markdown test file.  Uses"
+                    " the mkd extension.</p>")
         self.assertEqual(content, expected)
         # test to ensure the markdown file extension is being processed by the
         # correct reader
         content, metadata = reader.read(
             _path('article_with_markdown_extension.markdown'))
-        expected = "<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"\
-                   " test</h2>\n<p>This is another markdown test file.  Uses"\
-                   " the markdown extension.</p>"
+        expected = ("<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"
+                    " test</h2>\n<p>This is another markdown test file.  Uses"
+                    " the markdown extension.</p>")
         self.assertEqual(content, expected)
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
@@ -166,16 +167,16 @@ class MdReaderTest(unittest.TestCase):
         content, metadata = readers.read_file(
                 _path('article_with_markdown_markup_extensions.md'),
                 settings={'MD_EXTENSIONS': ['toc', 'codehilite', 'extra']})
-        expected = '<div class="toc">\n'\
-            '<ul>\n'\
-            '<li><a href="#level1">Level1</a><ul>\n'\
-            '<li><a href="#level2">Level2</a></li>\n'\
-            '</ul>\n'\
-            '</li>\n'\
-            '</ul>\n'\
-            '</div>\n'\
-            '<h2 id="level1">Level1</h2>\n'\
-            '<h3 id="level2">Level2</h3>'
+        expected = ('<div class="toc">\n'
+                    '<ul>\n'
+                    '<li><a href="#level1">Level1</a><ul>\n'
+                    '<li><a href="#level2">Level2</a></li>\n'
+                    '</ul>\n'
+                    '</li>\n'
+                    '</ul>\n'
+                    '</div>\n'
+                    '<h2 id="level1">Level1</h2>\n'
+                    '<h3 id="level2">Level2</h3>')
 
         self.assertEqual(content, expected)
 
@@ -231,9 +232,9 @@ class AdReaderTest(unittest.TestCase):
         content, metadata = reader.read(
                                 _path('article_with_asc_extension.asc'))
         expected = ('<hr>\n<h2><a name="_used_for_pelican_test">'
-                   '</a>Used for pelican test</h2>\n'
-                   '<p>The quick brown fox jumped over'
-                   ' the lazy dog&#8217;s back.</p>\n')
+                    '</a>Used for pelican test</h2>\n'
+                    '<p>The quick brown fox jumped over'
+                    ' the lazy dog&#8217;s back.</p>\n')
         self.assertEqual(content, expected)
         expected = {
             'category': 'Blog',
diff --git a/pelican/tests/test_webassets.py b/pelican/tests/test_webassets.py
index 22c0ae78..904c44ad 100644
--- a/pelican/tests/test_webassets.py
+++ b/pelican/tests/test_webassets.py
@@ -25,7 +25,7 @@ class TestWebAssets(unittest.TestCase):
     """Base class for testing webassets."""
 
     def setUp(self, override=None):
-        self.temp_path = mkdtemp()
+        self.temp_path = mkdtemp(prefix='pelicantests.')
         settings = {
             'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
             'OUTPUT_PATH': self.temp_path,

From 8710982d2a49afff772305388649f469b3958ac6 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 26 Mar 2013 23:17:59 -0400
Subject: [PATCH 1224/2864] fixed related_posts plugin

---
 docs/plugins.rst                 |  6 +--
 pelican/plugins/related_posts.py | 76 +++++++++-----------------------
 2 files changed, 23 insertions(+), 59 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 3537f16b..9985f25e 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -291,10 +291,10 @@ Related posts
 -------------
 
 This plugin adds the ``related_posts`` variable to the article's context.
-To enable, add the following to your settings file::
+By default, up to 5 articles are listed. You can customize this value by 
+defining ``RELATED_POSTS_MAX`` in your settings file::
 
-    from pelican.plugins import related_posts
-    PLUGINS = [related_posts]
+    RELATED_POSTS_MAX = 10
 
 You can then use the ``article.related_posts`` variable in your templates.
 For example::
diff --git a/pelican/plugins/related_posts.py b/pelican/plugins/related_posts.py
index dc52de9a..81999002 100644
--- a/pelican/plugins/related_posts.py
+++ b/pelican/plugins/related_posts.py
@@ -1,71 +1,35 @@
-from pelican import signals
-
 """
 Related posts plugin for Pelican
 ================================
 
 Adds related_posts variable to article's context
-
-Settings
---------
-To enable, add
-
-    from pelican.plugins import related_posts
-    PLUGINS = [related_posts]
-
-to your pelicanconf.py.
-
-Control the number of entries with in the config file with:
-
-RELATED_POSTS = {
-   'numentries': 6,
-}
-
-
-Usage
------
-    {% if article.related_posts %}
-        <ul>
-        {% for related_post in article.related_posts %}
-            <li><a href="{{ related_post.url }}">{{ related_post.title }}</a></li>
-        {% endfor %}
-        </ul>
-    {% endif %}
-
-
 """
 
-related_posts = []
+from pelican import signals
+from collections import Counter
 
 
-def add_related_posts(generator, metadata):
-    if 'tags' in metadata:
-        for tag in metadata['tags']:
-            #print tag
-            for related_article in generator.tags[tag]:
-                related_posts.append(related_article)
+def add_related_posts(generator):
+    # get the max number of entries from settings
+    # or fall back to default (5)
+    numentries = generator.settings.get('RELATED_POSTS_MAX', 5)
 
-        if len(related_posts) < 1:
-            return
-        
-        metadata["related_posts"] = sorted(set(related_posts))
+    for article in generator.articles:
+        # no tag, no relation
+        if not hasattr(article, 'tags'):
+            continue
 
-        relation_score = dict(list(zip(set(related_posts), list(map(related_posts.count,
-                              set(related_posts))))))
-        ranked_related = sorted(relation_score, key=relation_score.get)
-        
-        #Load the confg file and get the number of entries specified there
-        settings =  generator.settings
-        config = settings.get('RELATED_POSTS', {})
+        # score = number of common tags
+        scores = Counter()
+        for tag in article.tags:
+            scores += Counter(generator.tags[tag])
 
-        #check if the related_posts var is set in the pythonconfig.py
-        if not isinstance(config, dict):
-            info("realted_links plugin: Using default number of related links ("+numentries+")")
-        else:
-            numentries = config.get('numentries', 5)
-        
-        metadata["related_posts"] = ranked_related[:numentries]
+        # remove itself
+        scores.pop(article)
+
+        article.related_posts = [other for other, count 
+            in scores.most_common(numentries)]
 
 
 def register():
-    signals.article_generate_context.connect(add_related_posts)
+    signals.article_generator_finalized.connect(add_related_posts)
\ No newline at end of file

From ba200c30af233b816eb3218fabeb92f2db5a116c Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 27 Mar 2013 18:17:11 -0400
Subject: [PATCH 1225/2864] Fix for issue #392

---
 pelican/tests/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/tests/__init__.py b/pelican/tests/__init__.py
index e69de29b..32353ea2 100644
--- a/pelican/tests/__init__.py
+++ b/pelican/tests/__init__.py
@@ -0,0 +1,2 @@
+import logging
+logging.getLogger().addHandler(logging.NullHandler())

From 999980c07c21681fc79ce7990bcdbdaf66dfcca3 Mon Sep 17 00:00:00 2001
From: James King <james@agentultra.com>
Date: Mon, 25 Mar 2013 15:28:53 -0400
Subject: [PATCH 1226/2864] Added WordPress content decoding to importer

---
 .../tests/content/wordpress_content_decoded   | 48 ++++++++++
 .../tests/content/wordpress_content_encoded   | 55 ++++++++++++
 pelican/tests/content/wordpressexport.xml     | 54 ++++++++++++
 pelican/tests/test_importer.py                | 65 +++++++++++---
 pelican/tools/pelican_import.py               | 87 +++++++++++++++++--
 5 files changed, 290 insertions(+), 19 deletions(-)
 create mode 100644 pelican/tests/content/wordpress_content_decoded
 create mode 100644 pelican/tests/content/wordpress_content_encoded

diff --git a/pelican/tests/content/wordpress_content_decoded b/pelican/tests/content/wordpress_content_decoded
new file mode 100644
index 00000000..6e91338c
--- /dev/null
+++ b/pelican/tests/content/wordpress_content_decoded
@@ -0,0 +1,48 @@
+<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+<p><object width="425" height="350"><param name="movie" value="http://www.youtube.com/v/XSrW-wAWZe4"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/XSrW-wAWZe4" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350"></embed></object></p>
+<blockquote><p>
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p></blockquote>
+<ul>
+<li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+<li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+</ul>
+<pre>
+<code>
+  a = [1, 2, 3]
+  b = [4, 5, 6]
+  for i in zip(a, b):
+    print i
+</code>
+</pre>
+<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
diff --git a/pelican/tests/content/wordpress_content_encoded b/pelican/tests/content/wordpress_content_encoded
new file mode 100644
index 00000000..da35de3b
--- /dev/null
+++ b/pelican/tests/content/wordpress_content_encoded
@@ -0,0 +1,55 @@
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+<object width="425" height="350"><param name="movie" value="http://www.youtube.com/v/XSrW-wAWZe4"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/XSrW-wAWZe4" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350"></embed></object>
+
+<blockquote>
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+</blockquote>
+<ul>
+<li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+<li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+</ul>
+
+<pre>
+<code>
+  a = [1, 2, 3]
+  b = [4, 5, 6]
+  for i in zip(a, b):
+    print i
+</code>
+</pre>
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
diff --git a/pelican/tests/content/wordpressexport.xml b/pelican/tests/content/wordpressexport.xml
index 0d68f180..56d9a458 100644
--- a/pelican/tests/content/wordpressexport.xml
+++ b/pelican/tests/content/wordpressexport.xml
@@ -628,5 +628,59 @@ proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></con
             <wp:meta_value><![CDATA[3]]></wp:meta_value>
         </wp:postmeta>
     </item>
+    <item>
+        <title>Code in List</title>
+        <link>http://thisisa.test/?p=175</link>
+        <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=175</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+<ul>
+    <li>List Item One!</li>
+    <li>List Item Two!</li>
+<li>This is a code sample
+<pre>
+<code>
+  a = [1, 2, 3]
+  b = [4, 5, 6]
+  for i in zip(a, b):
+    print i
+</code>
+</pre></li>
+    <li>List Item Four!</li>
+</ul>
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>175</wp:post_id>
+        <wp:post_date>2012-02-16 15:52:55</wp:post_date>
+        <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>code-in-list-test</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>post</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-2"><![CDATA[Category 2]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
 </channel>
 </rss>
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 3d297160..61424774 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -2,13 +2,20 @@
 from __future__ import unicode_literals, print_function
 
 import os
+import re
 
-from pelican.tools.pelican_import import wp2fields, fields2pelican
+from pelican.tools.pelican_import import wp2fields, fields2pelican, decode_wp_content
 from pelican.tests.support import (unittest, temporary_folder, mute,
                                    skipIfNoExecutable)
 
 CUR_DIR = os.path.dirname(__file__)
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
+WORDPRESS_ENCODED_CONTENT_SAMPLE = os.path.join(CUR_DIR,
+                                                'content',
+                                                'wordpress_content_encoded')
+WORDPRESS_DECODED_CONTENT_SAMPLE = os.path.join(CUR_DIR,
+                                                'content',
+                                                'wordpress_content_decoded')
 
 try:
     from bs4 import BeautifulSoup
@@ -21,38 +28,33 @@ except ImportError:
 class TestWordpressXmlImporter(unittest.TestCase):
 
     def setUp(self):
-        self.posts = wp2fields(WORDPRESS_XML_SAMPLE)
+        self.posts = list(wp2fields(WORDPRESS_XML_SAMPLE))
 
     def test_ignore_empty_posts(self):
-
-        posts = list(self.posts)
-        self.assertTrue(posts)
-        for title, content, fname, date, author, categ, tags, format in posts:
+        self.assertTrue(self.posts)
+        for title, content, fname, date, author, categ, tags, format in self.posts:
             self.assertTrue(title.strip())
 
     def test_can_toggle_raw_html_code_parsing(self):
-
-        posts = list(self.posts)
         r = lambda f: open(f).read()
         silent_f2p = mute(True)(fields2pelican)
 
         with temporary_folder() as temp:
 
-            rst_files = (r(f) for f in silent_f2p(posts, 'markdown', temp))
+            rst_files = (r(f) for f in silent_f2p(self.posts, 'markdown', temp))
             self.assertTrue(any('<iframe' in rst for rst in rst_files))
-            rst_files = (r(f) for f in silent_f2p(posts, 'markdown', temp,
+            rst_files = (r(f) for f in silent_f2p(self.posts, 'markdown', temp,
                          strip_raw=True))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
             # no effect in rst
-            rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp))
+            rst_files = (r(f) for f in silent_f2p(self.posts, 'rst', temp))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
-            rst_files = (r(f) for f in silent_f2p(posts, 'rst', temp,
+            rst_files = (r(f) for f in silent_f2p(self.posts, 'rst', temp,
                          strip_raw=True))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
 
     def test_decode_html_entities_in_titles(self):
-        posts = list(self.posts)
-        test_posts = [post for post in posts if post[2] == 'html-entity-test']
+        test_posts = [post for post in self.posts if post[2] == 'html-entity-test']
         self.assertTrue(len(test_posts) == 1)
 
         post = test_posts[0]
@@ -60,3 +62,38 @@ class TestWordpressXmlImporter(unittest.TestCase):
         self.assertTrue(title, "A normal post with some <html> entities in the"
                                " title. You can't miss them.")
         self.assertTrue('&' not in title)
+
+    def test_decode_wp_content_returns_empty(self):
+        """ Check that given an empty string we return an empty string."""
+        self.assertEqual(decode_wp_content(""), "")
+
+    def test_decode_wp_content(self):
+        """ Check that we can decode a wordpress content string."""
+        with open(WORDPRESS_ENCODED_CONTENT_SAMPLE, 'r') as encoded_file:
+            encoded_content = encoded_file.read()
+            with open(WORDPRESS_DECODED_CONTENT_SAMPLE, 'r') as decoded_file:
+                decoded_content = decoded_file.read()
+                self.assertEqual(decode_wp_content(encoded_content, br=False), decoded_content)
+
+    def test_preserve_verbatim_formatting(self):
+        r = lambda f: open(f).read()
+        silent_f2p = mute(True)(fields2pelican)
+        test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)
+        with temporary_folder() as temp:
+            md = [r(f) for f in silent_f2p(test_post, 'markdown', temp)][0]
+            self.assertTrue(re.search(r'\s+a = \[1, 2, 3\]', md))
+            self.assertTrue(re.search(r'\s+b = \[4, 5, 6\]', md))
+
+            for_line = re.search(r'\s+for i in zip\(a, b\):', md).group(0)
+            print_line = re.search(r'\s+print i', md).group(0)
+            self.assertTrue(for_line.rindex('for') < print_line.rindex('print'))
+
+    def test_code_in_list(self):
+        r = lambda f: open(f).read()
+        silent_f2p = mute(True)(fields2pelican)
+        test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)
+        with temporary_folder() as temp:
+            md = [r(f) for f in silent_f2p(test_post, 'markdown', temp)][0]
+            sample_line = re.search(r'-   This is a code sample', md).group(0)
+            code_line = re.search(r'\s+a = \[1, 2, 3\]', md).group(0)
+            self.assertTrue(sample_line.rindex('This') < code_line.rindex('a'))
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index b3587a13..53998eff 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -10,6 +10,7 @@ except ImportError:
     # py2 import
     from HTMLParser import HTMLParser  # NOQA
 import os
+import re
 import subprocess
 import sys
 import time
@@ -19,6 +20,79 @@ from codecs import open
 from pelican.utils import slugify
 
 
+def decode_wp_content(content, br=True):
+    pre_tags = {}
+    if content.strip() == "":
+        return ""
+
+    content += "\n"
+    if "<pre" in content:
+        pre_parts = content.split("</pre>")
+        last_pre = pre_parts.pop()
+        content = ""
+        pre_index = 0
+
+        for pre_part in pre_parts:
+            start = pre_part.index("<pre")
+            if start == -1:
+                content = content + pre_part
+                continue
+            name = "<pre wp-pre-tag-{0}></pre>".format(pre_index)
+            pre_tags[name] = pre_part[start:] + "</pre>"
+            content = content + pre_part[0:start] + name
+            pre_index += 1
+        content = content + last_pre
+
+    content = re.sub(r'<br />\s*<br />', "\n\n", content)
+    allblocks = ('(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|'
+                 'td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|'
+                 'map|area|blockquote|address|math|style|p|h[1-6]|hr|'
+                 'fieldset|noscript|samp|legend|section|article|aside|'
+                 'hgroup|header|footer|nav|figure|figcaption|details|'
+                 'menu|summary)')
+    content = re.sub(r'(<' + allblocks + r'[^>]*>)', "\n\\1", content)
+    content = re.sub(r'(</' + allblocks + r'>)', "\\1\n\n", content)
+    #    content = content.replace("\r\n", "\n")
+    if "<object" in content:
+        # no <p> inside object/embed
+        content = re.sub(r'\s*<param([^>]*)>\s*', "<param\\1>", content)
+        content = re.sub(r'\s*</embed>\s*', '</embed>', content)
+        #    content = re.sub(r'/\n\n+/', '\n\n', content)
+    pgraphs = filter(lambda s: s != "", re.split(r'\n\s*\n', content))
+    content = ""
+    for p in pgraphs:
+        content = content + "<p>" + p.strip() + "</p>\n"
+    # under certain strange conditions it could create a P of entirely whitespace
+    content = re.sub(r'<p>\s*</p>', '', content)
+    content = re.sub(r'<p>([^<]+)</(div|address|form)>', "<p>\\1</p></\\2>", content)
+    # don't wrap tags
+    content = re.sub(r'<p>\s*(</?' + allblocks + r'[^>]*>)\s*</p>', "\\1", content)
+    #problem with nested lists
+    content = re.sub(r'<p>(<li.*)</p>', "\\1", content)
+    content = re.sub(r'<p><blockquote([^>]*)>', "<blockquote\\1><p>", content)
+    content = content.replace('</blockquote></p>', '</p></blockquote>')
+    content = re.sub(r'<p>\s*(</?' + allblocks + '[^>]*>)', "\\1", content)
+    content = re.sub(r'(</?' + allblocks + '[^>]*>)\s*</p>', "\\1", content)
+    if br:
+        def _preserve_newline(match):
+            return match.group(0).replace("\n", "<WPPreserveNewline />")
+        content = re.sub(r'/<(script|style).*?<\/\\1>/s', _preserve_newline, content)
+        # optionally make line breaks
+        content = re.sub(r'(?<!<br />)\s*\n', "<br />\n", content)
+        content = content.replace("<WPPreserveNewline />", "\n")
+    content = re.sub(r'(</?' + allblocks + r'[^>]*>)\s*<br />', "\\1", content)
+    content = re.sub(r'<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)', '\\1', content)
+    content = re.sub(r'\n</p>', "</p>", content)
+
+    if pre_tags:
+        def _multi_replace(dic, string):
+            pattern = r'|'.join(map(re.escape, dic.keys()))
+            return re.sub(pattern, lambda m: dic[m.group()], string)
+        content = _multi_replace(pre_tags, content)
+
+    return content
+
+
 def wp2fields(xml):
     """Opens a wordpress XML file, and yield pelican fields"""
     try:
@@ -55,7 +129,7 @@ def wp2fields(xml):
 
             tags = [tag.string for tag in item.findAll('category', {'domain' : 'post_tag'})]
 
-            yield (title, content, filename, date, author, categories, tags, "html")
+            yield (title, content, filename, date, author, categories, tags, "wp-html")
 
 def dc2fields(file):
     """Opens a Dotclear export file, and yield pelican fields"""
@@ -257,15 +331,18 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
 
         print(out_filename)
 
-        if in_markup == "html":
+        if in_markup in ("html", "wp-html"):
             html_filename = os.path.join(output_path, filename+'.html')
 
             with open(html_filename, 'w', encoding='utf-8') as fp:
                 # Replace newlines with paragraphs wrapped with <p> so
                 # HTML is valid before conversion
-                paragraphs = content.splitlines()
-                paragraphs = ['<p>{0}</p>'.format(p) for p in paragraphs]
-                new_content = ''.join(paragraphs)
+                if in_markup == "wp-html":
+                    new_content = decode_wp_content(content)
+                else:
+                    paragraphs = content.splitlines()
+                    paragraphs = ['<p>{0}</p>'.format(p) for p in paragraphs]
+                    new_content = ''.join(paragraphs)
 
                 fp.write(new_content)
 

From 58faf9462e5aa196d35c8d54266e576308146cf5 Mon Sep 17 00:00:00 2001
From: Irfan Ahmad <erfaan@gmail.com>
Date: Sun, 24 Mar 2013 19:19:26 +0500
Subject: [PATCH 1227/2864] Implement Posterous import - fixes #608

---
 docs/importer.rst               | 15 ++++++--
 pelican/tools/pelican_import.py | 61 ++++++++++++++++++++++++++++++++-
 2 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 7ca3142d..ea3335ba 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -13,6 +13,7 @@ software to ReStructuredText or Markdown. The supported import formats are:
 
 - WordPress XML export
 - Dotclear export
+- Posterous API
 - RSS/Atom feed
 
 The conversion from HTML to reStructuredText or Markdown relies on `Pandoc`_.
@@ -40,14 +41,16 @@ Usage
 
 ::
 
-    pelican-import [-h] [--wpfile] [--dotclear] [--feed] [-o OUTPUT]
+    pelican-import [-h] [--wpfile] [--dotclear] [--posterous] [--feed] [-o OUTPUT]
                    [-m MARKUP] [--dir-cat] [--strip-raw] [--disable-slugs]
-                   input
+                   [-e EMAIL] [-p PASSWORD]
+                   input|api_token
 
 Positional arguments
 --------------------
 
   input                 The input file to read
+  api_token             [Posterous only] api_token can be obtained from http://posterous.com/api/
 
 Optional arguments
 ------------------
@@ -55,6 +58,7 @@ Optional arguments
   -h, --help            Show this help message and exit
   --wpfile              WordPress XML export (default: False)
   --dotclear            Dotclear export (default: False)
+  --posterous           Posterous API (default: False)
   --feed                Feed to parse (default: False)
   -o OUTPUT, --output OUTPUT
                         Output path (default: output)
@@ -70,6 +74,10 @@ Optional arguments
                         output. With this disabled, your Pelican URLs may not
                         be consistent with your original posts. (default:
                         False)
+  -e EMAIL, --email=EMAIL
+                        Email used to authenticate Posterous API
+  -p PASSWORD, --password=PASSWORD
+                        Password used to authenticate Posterous API
 
 
 Examples
@@ -83,6 +91,9 @@ For Dotclear::
 
     $ pelican-import --dotclear -o ~/output ~/backup.txt
 
+for Posterous::
+
+    $ pelican-import --posterous -o ~/output --email=<email_address> --password=<password> <api_token>
 
 Tests
 =====
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 53998eff..a3bac84c 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -261,6 +261,55 @@ def dc2fields(file):
         yield (post_title, content, slugify(post_title), post_creadt, author, categories, tags, post_format)
 
 
+def posterous2fields(api_token, email, password):
+    """Imports posterous posts"""
+    import base64
+    from datetime import datetime, timedelta
+    try:
+        # py3k import
+        import json
+    except ImportError:
+        # py2 import
+        import simplejson as json
+
+    try:
+        # py3k import
+        import urllib.request as urllib_request
+    except ImportError:
+        # py2 import
+        import urllib2 as urllib_request
+
+
+    def get_posterous_posts(api_token, email, password, page = 1):
+        base64string = base64.encodestring(("%s:%s" % (email, password)).encode('utf-8')).replace(b'\n', b'')
+        url = "http://posterous.com/api/v2/users/me/sites/primary/posts?api_token=%s&page=%d" % (api_token, page)
+        request = urllib_request.Request(url)
+        request.add_header("Authorization", "Basic %s" % base64string.decode())
+        handle = urllib_request.urlopen(request)
+        posts = json.loads(handle.read().decode('utf-8'))
+        return posts
+
+    page = 1
+    posts = get_posterous_posts(api_token, email, password, page)
+    while len(posts) > 0:
+        posts = get_posterous_posts(api_token, email, password, page)
+        page += 1
+
+        for post in posts:
+            slug = post.get('slug')
+            if not slug:
+                slug = slugify(post.get('title'))
+            tags = [tag.get('name') for tag in post.get('tags')]
+            raw_date = post.get('display_date')
+            date_object = datetime.strptime(raw_date[:-6], "%Y/%m/%d %H:%M:%S")
+            offset = int(raw_date[-5:])
+            delta = timedelta(hours = offset / 100)
+            date_object -= delta
+            date = date_object.strftime("%Y-%m-%d %H:%M")
+
+            yield (post.get('title'), post.get('body_cleaned'), slug, date,
+                post.get('user').get('display_name'), [], tags, "html")
+
 def feed2fields(file):
     """Read a feed and yield pelican fields"""
     import feedparser
@@ -389,6 +438,8 @@ def main():
         help='Wordpress XML export')
     parser.add_argument('--dotclear', action='store_true', dest='dotclear',
         help='Dotclear export')
+    parser.add_argument('--posterous', action='store_true', dest='posterous',
+        help='Posterous export')
     parser.add_argument('--feed', action='store_true', dest='feed',
         help='Feed to parse')
     parser.add_argument('-o', '--output', dest='output', default='output',
@@ -405,6 +456,10 @@ def main():
         help='Disable storing slugs from imported posts within output. '
              'With this disabled, your Pelican URLs may not be consistent '
              'with your original posts.')
+    parser.add_argument('-e', '--email', dest='email',
+        help="Email address (posterous import only)")
+    parser.add_argument('-p', '--password', dest='password',
+        help="Password (posterous import only)")
 
     args = parser.parse_args()
 
@@ -413,10 +468,12 @@ def main():
         input_type = 'wordpress'
     elif args.dotclear:
         input_type = 'dotclear'
+    elif args.posterous:
+        input_type = 'posterous'
     elif args.feed:
         input_type = 'feed'
     else:
-        error = "You must provide either --wpfile, --dotclear or --feed options"
+        error = "You must provide either --wpfile, --dotclear, --posterous or --feed options"
         exit(error)
 
     if not os.path.exists(args.output):
@@ -430,6 +487,8 @@ def main():
         fields = wp2fields(args.input)
     elif input_type == 'dotclear':
         fields = dc2fields(args.input)
+    elif input_type == 'posterous':
+        fields = posterous2fields(args.input, args.email, args.password)
     elif input_type == 'feed':
         fields = feed2fields(args.input)
 

From e042e11c2357ce77eea867af5dd28f0fe02216d0 Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Mon, 1 Apr 2013 21:52:30 +1000
Subject: [PATCH 1228/2864] Add new option for controlling whether to display
 categories on menu or not

Conflicts:
	docs/changelog.rst
	pelican/tests/output/basic/tag/bar.html
	pelican/tests/output/basic/tag/baz.html
	pelican/tests/output/basic/tag/foo.html
	pelican/tests/output/custom/tag/bar.html
	pelican/tests/output/custom/tag/baz.html
	pelican/tests/output/custom/tag/foo.html
---
 docs/changelog.rst                                        | 2 ++
 docs/settings.rst                                         | 3 +++
 pelican/settings.py                                       | 1 +
 .../tests/output/basic/a-markdown-powered-article.html    | 4 ++--
 pelican/tests/output/basic/archives.html                  | 4 ++--
 pelican/tests/output/basic/article-1.html                 | 4 ++--
 pelican/tests/output/basic/article-2.html                 | 4 ++--
 pelican/tests/output/basic/article-3.html                 | 4 ++--
 pelican/tests/output/basic/author/alexis-metaireau.html   | 4 ++--
 pelican/tests/output/basic/categories.html                | 4 ++--
 pelican/tests/output/basic/category/bar.html              | 4 ++--
 pelican/tests/output/basic/category/cat1.html             | 4 ++--
 pelican/tests/output/basic/category/misc.html             | 4 ++--
 pelican/tests/output/basic/category/yeah.html             | 4 ++--
 pelican/tests/output/basic/filename_metadata-example.html | 4 ++--
 pelican/tests/output/basic/index.html                     | 4 ++--
 pelican/tests/output/basic/oh-yeah.html                   | 4 ++--
 pelican/tests/output/basic/override/index.html            | 4 ++--
 .../output/basic/pages/this-is-a-test-hidden-page.html    | 4 ++--
 pelican/tests/output/basic/pages/this-is-a-test-page.html | 4 ++--
 pelican/tests/output/basic/second-article-fr.html         | 4 ++--
 pelican/tests/output/basic/second-article.html            | 4 ++--
 pelican/tests/output/basic/tag/bar.html                   | 4 ++--
 pelican/tests/output/basic/tag/baz.html                   | 4 ++--
 pelican/tests/output/basic/tag/foo.html                   | 4 ++--
 pelican/tests/output/basic/tag/foobar.html                | 4 ++--
 pelican/tests/output/basic/tag/oh.html                    | 4 ++--
 pelican/tests/output/basic/tag/yeah.html                  | 4 ++--
 pelican/tests/output/basic/this-is-a-super-article.html   | 4 ++--
 pelican/tests/output/basic/unbelievable.html              | 4 ++--
 .../tests/output/custom/a-markdown-powered-article.html   | 4 ++--
 pelican/tests/output/custom/archives.html                 | 4 ++--
 pelican/tests/output/custom/article-1.html                | 4 ++--
 pelican/tests/output/custom/article-2.html                | 4 ++--
 pelican/tests/output/custom/article-3.html                | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau.html  | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau2.html | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau3.html | 4 ++--
 pelican/tests/output/custom/categories.html               | 4 ++--
 pelican/tests/output/custom/category/bar.html             | 4 ++--
 pelican/tests/output/custom/category/cat1.html            | 4 ++--
 pelican/tests/output/custom/category/misc.html            | 4 ++--
 pelican/tests/output/custom/category/yeah.html            | 4 ++--
 pelican/tests/output/custom/drafts/a-draft-article.html   | 4 ++--
 .../tests/output/custom/filename_metadata-example.html    | 4 ++--
 pelican/tests/output/custom/index.html                    | 4 ++--
 pelican/tests/output/custom/index2.html                   | 4 ++--
 pelican/tests/output/custom/index3.html                   | 4 ++--
 pelican/tests/output/custom/jinja2_template.html          | 4 ++--
 pelican/tests/output/custom/oh-yeah-fr.html               | 4 ++--
 pelican/tests/output/custom/oh-yeah.html                  | 4 ++--
 pelican/tests/output/custom/override/index.html           | 4 ++--
 .../output/custom/pages/this-is-a-test-hidden-page.html   | 4 ++--
 .../tests/output/custom/pages/this-is-a-test-page.html    | 4 ++--
 pelican/tests/output/custom/second-article-fr.html        | 4 ++--
 pelican/tests/output/custom/second-article.html           | 4 ++--
 pelican/tests/output/custom/tag/bar.html                  | 4 ++--
 pelican/tests/output/custom/tag/baz.html                  | 4 ++--
 pelican/tests/output/custom/tag/foo.html                  | 4 ++--
 pelican/tests/output/custom/tag/foobar.html               | 4 ++--
 pelican/tests/output/custom/tag/oh.html                   | 4 ++--
 pelican/tests/output/custom/tag/yeah.html                 | 4 ++--
 pelican/tests/output/custom/this-is-a-super-article.html  | 4 ++--
 pelican/tests/output/custom/unbelievable.html             | 4 ++--
 pelican/themes/notmyidea/templates/base.html              | 4 +++-
 pelican/themes/simple/templates/base.html                 | 8 +++++---
 66 files changed, 136 insertions(+), 126 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f9c315ac..51f1a0ff 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,8 @@ Release history
 * Support for Python 3!
 * Ensure exceptions are raised if they take place during processing
   with autoreload enabled with debug enabled.
+* Provide ability to show or hide categories from menu using
+  ``DISPLAY_CATEGORIES_ON_MENU`` option.
 
 3.1 (2012-12-04)
 ================
diff --git a/docs/settings.rst b/docs/settings.rst
index 34bd78a0..e6d4d324 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -42,6 +42,9 @@ Setting name (default value)                                            What doe
 `DISPLAY_PAGES_ON_MENU` (``True``)                                      Whether to display pages on the menu of the
                                                                         template. Templates may or may not honor this
                                                                         setting.
+`DISPLAY_CATEGORIES_ON_MENU` (``True``)                                 Whether to display categories on the menu of the
+                                                                        template. Templates may or not honor this
+                                                                        setting.
 `DEFAULT_DATE` (``None``)                                               The default date you want to use.
                                                                         If ``fs``, Pelican will use the file system
                                                                         timestamp information (mtime) if it can't get
diff --git a/pelican/settings.py b/pelican/settings.py
index da770775..3ff83b6b 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -35,6 +35,7 @@ _DEFAULT_CONFIG = {'PATH': os.curdir,
                    'SITEURL': '',
                    'SITENAME': 'A Pelican Blog',
                    'DISPLAY_PAGES_ON_MENU': True,
+                   'DISPLAY_CATEGORIES_ON_MENU': True,
                    'PDF_GENERATOR': False,
                    'OUTPUT_SOURCES': False,
                    'OUTPUT_SOURCES_EXTENSION': '.text',
diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index e105cfe7..251b3aab 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 26895a93..06b3e6e6 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
 <h1>Archives for A Pelican Blog</h1>
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index bc951630..fb425644 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 0a3d5ea7..39d55c6b 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 7ab2f05d..e7e59440 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index ccbe7084..8b83c8a6 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 9b930634..cdcbb04f 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <ul>
     <li><a href="./category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 8b28c767..f815a45b 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index c785e7df..1922f57a 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li class="active"><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 7ec4aae2..cdf2a437 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 1d0b68b6..fc108e93 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li class="active"><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 8a0ade2f..3b971617 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 31f83113..657ea233 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index aafe76bd..761ae0ff 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index fedb4125..20995de3 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
 <section id="content" class="body">    
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index b2f0254f..6f1f71ee 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
 <section id="content" class="body">    
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index 3149f59f..ce9ffd2c 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
 <section id="content" class="body">    
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index b91a081c..67c206af 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 991f9045..e779e0da 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 793cf737..6d4138f2 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 5ca0c5de..dd44e38a 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index e830de6b..0812ed7c 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index a95e5041..83ace5e3 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index 5ab924de..4694dadf 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index e09e7051..5d4358cb 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/bar.html">bar</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index f8d13dd5..7a4971a7 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 37b9d5a2..bb297236 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -22,13 +22,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/bar.html">bar</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/yeah.html">yeah</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 90586fe2..3499ac40 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index aaece637..18105799 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
 <h1>Archives for Alexis' log</h1>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index ebad4b48..84b5946f 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 81536509..ac5c3e20 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 677c000e..34899e3b 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index 9b08f340..cf241fdf 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index dba92905..312a2bed 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 865ad010..0419984c 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 25015ab9..011d1ef4 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <ul>
     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 8f9fdefb..68ec424c 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 29d99bed..39377513 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li class="active"><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index ab39c20f..1f851030 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index b9cb6de3..edaaf543 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index eb50cac5..c70b3d87 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 432a1cdf..377baac1 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index df3c094d..a008617e 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 85dc6a24..c0d352f6 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 25ed3361..53e4d1f6 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 31df8b21..4932fd1d 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         
 Some text
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 10debbcd..1184c381 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index bd51d7a5..0fd32bcd 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 84142880..353553bb 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
 <section id="content" class="body">    
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 5fcbe122..c827c380 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
 <section id="content" class="body">    
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 29492171..07baf855 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
 <section id="content" class="body">    
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index b3fbefb7..56077a89 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 2bd3dea6..2cd1d2e5 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index dbd7c48a..8ec3a2b0 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 4094477f..98e10102 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 7c12ea5a..4a77477d 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 93d8282d..b0e0b51c 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index dd60851e..861077f6 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 59b591cc..528df431 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="../category/yeah.html">yeah</a></li>
                                     <li ><a href="../category/misc.html">misc</a></li>
                                     <li ><a href="../category/cat1.html">cat1</a></li>
                                     <li ><a href="../category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
                 
             
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 565d5aa3..058f2f2b 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
                                     <li ><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index be5c1f1a..8ed9c54c 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -26,13 +26,13 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                                    <li><a href="./override/">Override url/save_as</a></li>
+                                                    <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li ><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
                                     <li ><a href="./category/cat1.html">cat1</a></li>
                                     <li ><a href="./category/bar.html">bar</a></li>
-                                </ul></nav>
+                                                </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 6b11cb09..42a2cec1 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -31,14 +31,16 @@
                 {% for title, link in MENUITEMS %}
                     <li><a href="{{ link }}">{{ title }}</a></li>
                 {% endfor %}
-                {% if DISPLAY_PAGES_ON_MENU %}
+                {% if DISPLAY_PAGES_ON_MENU -%}
                 {% for page in PAGES %}
                     <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
                 {% endfor %}
                 {% endif %}
+                {% if DISPLAY_CATEGORIES_ON_MENU -%}
                 {% for cat, null in categories %}
                     <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
                 {% endfor %}
+                {% endif %}
                 </ul></nav>
         </header><!-- /#banner -->
         {% block content %}
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 212aef5e..7973d774 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -44,9 +44,11 @@
             <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
           {% endfor %}
         {% else %}
-          {% for cat, null in categories %}
-            <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
-          {% endfor %}
+          {% if DISPLAY_CATEGORIES_ON_MENU %}
+            {% for cat, null in categories %}
+              <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
+            {% endfor %}
+          {% endif %}
         {% endif %}
         </ul></nav><!-- /#menu -->
         {% block content %}

From 9936538d8b60c5a2b5e2f3eece4525e70fbea55d Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 2 Apr 2013 18:09:21 -0400
Subject: [PATCH 1229/2864] unify css class for pygments

---
 docs/faq.rst       |  2 +-
 docs/settings.rst  | 13 +++++++++----
 pelican/readers.py |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 9429a44f..d083ee7d 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -44,7 +44,7 @@ I'm creating my own theme. How do I use Pygments for syntax highlighting?
 
 Pygments adds some classes to the generated content. These classes are used by
 themes to style code syntax highlighting via CSS. Specifically, you can
-customize the appearance of your syntax highlighting via the ``.codehilite pre``
+customize the appearance of your syntax highlighting via the ``.highlight pre``
 class in your theme's CSS file. To see how various styles can be used to render
 Django code, for example, you can use the demo `on the project website
 <http://pygments.org/demo/15101/>`_.
diff --git a/docs/settings.rst b/docs/settings.rst
index e6d4d324..db5c0164 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -84,10 +84,15 @@ Setting name (default value)                                            What doe
 `IGNORE_FILES` (``[]``)                                                 A list of file globbing patterns to match against the
                                                                         source files to be ignored by the processor. For example
                                                                         ``['.#*']`` will ignore emacs temporary files.
-`MD_EXTENSIONS` (``['codehilite','extra']``)                            A list of the extensions that the Markdown processor
-                                                                        will use. Refer to the extensions chapter in the
-                                                                        Python-Markdown documentation for a complete list of
-                                                                        supported extensions.
+`MD_EXTENSIONS` (``['codehilite(css_class=highlight)','extra']``)       A list of the extensions that the Markdown processor
+                                                                        will use. Refer to the Python Markdown documentation's
+                                                                        `Extensions section <http://pythonhosted.org/Markdown/extensions/>`_
+                                                                        for a complete list of supported extensions. (Note that
+                                                                        defining this in your settings file will override and
+                                                                        replace the default values. If your goal is to *add*
+                                                                        to the default values for this setting, you'll need to
+                                                                        include them explicitly and enumerate the full list of
+                                                                        desired Markdown extensions.)
 `OUTPUT_PATH` (``'output/'``)                                           Where to output the generated files.
 `PATH` (``None``)                                                       Path to content directory to be processed by Pelican.
 `PAGE_DIR` (``'pages'``)                                                Directory to look at for pages, relative to `PATH`.
diff --git a/pelican/readers.py b/pelican/readers.py
index a6ff9118..ba4cd15a 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -147,7 +147,7 @@ class RstReader(Reader):
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
     file_extensions = ['md', 'markdown', 'mkd']
-    default_extensions = ['codehilite', 'extra']
+    default_extensions = ['codehilite(css_class=highlight)', 'extra']
 
     def __init__(self, *args, **kwargs):
         super(MarkdownReader, self).__init__(*args, **kwargs)

From 0548b62441596ef604a358bd7a15cbc31e2d5e7f Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 3 Apr 2013 19:17:50 -0400
Subject: [PATCH 1230/2864] fix for issue #761: handle unicode correctly in
 summary for Markdown

---
 pelican/log.py                                 |  6 +++---
 pelican/readers.py                             |  2 +-
 ...ticle_with_markdown_and_nonascii_summary.md | 18 ++++++++++++++++++
 pelican/tests/test_generators.py               |  7 ++++---
 pelican/tests/test_readers.py                  | 13 +++++++++++++
 5 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 pelican/tests/content/article_with_markdown_and_nonascii_summary.md

diff --git a/pelican/log.py b/pelican/log.py
index 818db05f..bde8037e 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -36,7 +36,7 @@ class ANSIFormatter(Formatter):
 
     """
     def format(self, record):
-        msg = str(record.msg)
+        msg = record.getMessage()
         if record.levelname == 'INFO':
             return ansi('cyan', '-> ') + msg
         elif record.levelname == 'WARNING':
@@ -58,9 +58,9 @@ class TextFormatter(Formatter):
 
     def format(self, record):
         if not record.levelname or record.levelname == 'INFO':
-            return record.msg
+            return record.getMessage()
         else:
-            return record.levelname + ': ' + record.msg
+            return record.levelname + ': ' + record.getMessage()
 
 
 def init(level=None, logger=getLogger(), handler=StreamHandler()):
diff --git a/pelican/readers.py b/pelican/readers.py
index ba4cd15a..6c23ce19 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -162,7 +162,7 @@ class MarkdownReader(Reader):
         for name, value in meta.items():
             name = name.lower()
             if name == "summary":
-                summary_values = "\n".join(str(item) for item in value)
+                summary_values = "\n".join(value)
                 summary = self._md.convert(summary_values)
                 output[name] = self.process_metadata(name, summary)
             else:
diff --git a/pelican/tests/content/article_with_markdown_and_nonascii_summary.md b/pelican/tests/content/article_with_markdown_and_nonascii_summary.md
new file mode 100644
index 00000000..e26cc009
--- /dev/null
+++ b/pelican/tests/content/article_with_markdown_and_nonascii_summary.md
@@ -0,0 +1,18 @@
+Title: マックOS X 10.8でパイソンとVirtualenvをインストールと設定
+Slug: python-virtualenv-on-mac-osx-mountain-lion-10.8
+Date: 2012-12-20
+Tags: パイソン, マック
+Category: 指導書
+Summary: パイソンとVirtualenvをまっくでインストールする方法について明確に説明します。
+
+Writing unicode is certainly fun.
+
+パイソンとVirtualenvをまっくでインストールする方法について明確に説明します。
+
+And let's mix languages.
+
+первый пост
+
+Now another.
+
+İlk yazı çok özel değil.
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 1e5a7339..43c9058d 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -88,7 +88,8 @@ class TestArticlesGenerator(unittest.TestCase):
              'article'],
             ['This is an article without category !', 'published',
              'TestCategory', 'article'],
-            ['This is a super article !', 'published', 'yeah', 'article']
+            ['This is a super article !', 'published', 'yeah', 'article'],
+            ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定', 'published', '指導書', 'article']
         ]
         self.assertItemsEqual(articles_expected, articles)
 
@@ -97,7 +98,7 @@ class TestArticlesGenerator(unittest.TestCase):
         generator = self.get_populated_generator()
         categories = [cat.name for cat, _ in generator.categories]
         categories_expected = ['Default', 'TestCategory', 'Yeah', 'test',
-                               'yeah']
+                               'yeah', '指導書']
         self.assertEquals(categories, categories_expected)
 
     def test_do_not_use_folder_as_category(self):
@@ -114,7 +115,7 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_context()
 
         categories = [cat.name for cat, _ in generator.categories]
-        self.assertEquals(categories, ['Default', 'Yeah', 'test', 'yeah'])
+        self.assertEquals(categories, ['Default', 'Yeah', 'test', 'yeah', '指導書'])
 
     def test_direct_templates_save_as_default(self):
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 137add2f..9c644541 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -131,6 +131,19 @@ class MdReaderTest(unittest.TestCase):
         for key, value in metadata.items():
             self.assertEquals(value, expected[key], key)
 
+        content, metadata = reader.read(
+            _path('article_with_markdown_and_nonascii_summary.md'))
+        expected = {
+            'title': 'マックOS X 10.8でパイソンとVirtualenvをインストールと設定',
+            'summary': '<p>パイソンとVirtualenvをまっくでインストールする方法について明確に説明します。</p>',
+            'category': '指導書',
+            'date': datetime.datetime(2012, 12, 20),
+            'tags': ['パイソン', 'マック'],
+            'slug': 'python-virtualenv-on-mac-osx-mountain-lion-10.8',
+        }
+        for key, value in metadata.items():
+            self.assertEquals(value, expected[key], key)
+
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_file_extensions(self):
         reader = readers.MarkdownReader({})

From c2924402ad4c4531fe3c79f39dacf331daa7d85a Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 5 Apr 2013 02:32:58 -0400
Subject: [PATCH 1231/2864] Fix for issue #428: Use PLUGIN_PATH properly

---
 docs/plugins.rst    |  3 ++-
 pelican/__init__.py | 20 +++++++++++++++-----
 pelican/settings.py |  5 +++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 9985f25e..857180f0 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -24,7 +24,8 @@ Alternatively, another method is to import them and add them to the list::
     PLUGINS = [gravatar,]
 
 If your plugins are not in an importable path, you can specify a ``PLUGIN_PATH``
-in the settings::
+in the settings. ``PLUGIN_PATH`` can be an absolute path or a path relative to
+the settings file::
 
     PLUGIN_PATH = "plugins"
     PLUGINS = ["list", "of", "plugins"]
diff --git a/pelican/__init__.py b/pelican/__init__.py
index a2bdefa4..7072f484 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -57,15 +57,25 @@ class Pelican(object):
             sys.path.insert(0, '')
 
     def init_plugins(self):
-        self.plugins = self.settings['PLUGINS']
-        for plugin in self.plugins:
+        self.plugins = []
+        logger.debug('Temporarily adding PLUGIN_PATH to system path')
+        _sys_path = sys.path[:]
+        sys.path.insert(0, self.settings['PLUGIN_PATH'])
+        for plugin in self.settings['PLUGINS']:
             # if it's a string, then import it
             if isinstance(plugin, six.string_types):
-                logger.debug("Loading plugin `{0}' ...".format(plugin))
-                plugin = __import__(plugin, globals(), locals(), 'module')
+                logger.debug("Loading plugin `{0}`".format(plugin))
+                try:
+                    plugin = __import__(plugin, globals(), locals(), 'module')
+                except ImportError as e:
+                    logger.error("Can't find plugin `{0}`: {1}".format(plugin, e))
+                    continue
 
-            logger.debug("Registering plugin `{0}'".format(plugin.__name__))
+            logger.debug("Registering plugin `{0}`".format(plugin.__name__))
             plugin.register()
+            self.plugins.append(plugin)
+        logger.debug('Restoring system path')
+        sys.path = _sys_path
 
     def _handle_deprecation(self):
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 3ff83b6b..df1de0c7 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -89,6 +89,7 @@ _DEFAULT_CONFIG = {'PATH': os.curdir,
                    'ARTICLE_PERMALINK_STRUCTURE': '',
                    'TYPOGRIFY': False,
                    'SUMMARY_MAX_LENGTH': 50,
+                   'PLUGIN_PATH': '',
                    'PLUGINS': [],
                    'TEMPLATE_PAGES': {},
                    'IGNORE_FILES': []
@@ -99,12 +100,12 @@ def read_settings(path=None, override=None):
     if path:
         local_settings = get_settings_from_file(path)
         # Make the paths relative to the settings file
-        for p in ['PATH', 'OUTPUT_PATH', 'THEME']:
+        for p in ['PATH', 'OUTPUT_PATH', 'THEME', 'PLUGIN_PATH']:
             if p in local_settings and local_settings[p] is not None \
                     and not isabs(local_settings[p]):
                 absp = os.path.abspath(os.path.normpath(os.path.join(
                             os.path.dirname(path), local_settings[p])))
-                if p != 'THEME' or os.path.exists(absp):
+                if p not in ('THEME', 'PLUGIN_PATH') or os.path.exists(absp):
                     local_settings[p] = absp
     else:
         local_settings = copy.deepcopy(_DEFAULT_CONFIG)

From eb640b09e6d63c8b6c1e0a07aaabf0c657f922ff Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sat, 6 Apr 2013 17:48:19 +0100
Subject: [PATCH 1232/2864] Add translation metadata support.

Allows user to control which posts are the translations independently of the
DEFAULT_LANG setting.
---
 docs/getting_started.rst    | 13 +++++++++++++
 pelican/tests/test_utils.py | 28 +++++++++++++++++++++++++++-
 pelican/utils.py            | 16 ++++++++++++++--
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index c9675198..5195e30e 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -392,6 +392,19 @@ identifier. If you'd rather not explicitly define the slug this way, you must
 then instead ensure that the translated article titles are identical, since the
 slug will be auto-generated from the article title.
 
+If you do not want the original version of one specific article to be detected
+by the ``DEFAULT_LANG`` setting, use the ``translation`` metadata to specify
+which posts are translations::
+
+    Foobar is not dead
+    ##################
+
+    :slug: foobar-is-not-dead
+    :lang: en
+    :translation: true
+
+    That's true, foobar is still alive!
+
 Syntax highlighting
 -------------------
 
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 78e888eb..9865b10b 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -85,12 +85,28 @@ class TestUtils(LoggedTestCase):
 
     def test_process_translations(self):
         # create a bunch of articles
+        # 1: no translation metadata
         fr_article1 = get_article(lang='fr', slug='yay', title='Un titre',
                                   content='en français')
         en_article1 = get_article(lang='en', slug='yay', title='A title',
                                   content='in english')
+        # 2: reverse which one is the translation thanks to metadata
+        fr_article2 = get_article(lang='fr', slug='yay2', title='Un titre',
+                                  content='en français')
+        en_article2 = get_article(lang='en', slug='yay2', title='A title',
+                                  content='in english',
+                                  extra_metadata={'translation': 'true'})
+        # 3: back to default language detection if all items have the
+        #    translation metadata
+        fr_article3 = get_article(lang='fr', slug='yay3', title='Un titre',
+                                  content='en français',
+                                  extra_metadata={'translation': 'yep'})
+        en_article3 = get_article(lang='en', slug='yay3', title='A title',
+                                  content='in english',
+                                  extra_metadata={'translation': 'yes'})
 
-        articles = [fr_article1, en_article1]
+        articles = [fr_article1, en_article1, fr_article2, en_article2,
+                    fr_article3, en_article3]
 
         index, trans = utils.process_translations(articles)
 
@@ -99,6 +115,16 @@ class TestUtils(LoggedTestCase):
         self.assertNotIn(en_article1, trans)
         self.assertNotIn(fr_article1, index)
 
+        self.assertIn(fr_article2, index)
+        self.assertIn(en_article2, trans)
+        self.assertNotIn(fr_article2, trans)
+        self.assertNotIn(en_article2, index)
+
+        self.assertIn(en_article3, index)
+        self.assertIn(fr_article3, trans)
+        self.assertNotIn(en_article3, trans)
+        self.assertNotIn(fr_article3, index)
+
     def test_files_changed(self):
         # Test if file changes are correctly detected
         # Make sure to handle not getting any files correctly.
diff --git a/pelican/utils.py b/pelican/utils.py
index 3ae88402..44abb1bd 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -395,7 +395,9 @@ def process_translations(content_list):
 
     Returns a tuple with two lists (index, translations).  Index list includes
     items in default language or items which have no variant in default
-    language.
+    language. Items with the `translation` metadata set to something else than
+    `False` or `false` will be used as translations, unless all the items with
+    the same slug have that metadata.
 
     For each content_list item, sets the 'translations' attribute.
     """
@@ -406,8 +408,18 @@ def process_translations(content_list):
 
     for slug, items in grouped_by_slugs:
         items = list(items)
+        # items with `translation` metadata will be used as translations…
+        default_lang_items = list(filter(
+                lambda i: i.metadata.get('translation', 'false').lower()
+                        == 'false',
+                items))
+        # …unless all items with that slug are translations
+        if not default_lang_items:
+            default_lang_items = items
+
         # find items with default language
-        default_lang_items = list(filter(attrgetter('in_default_lang'), items))
+        default_lang_items = list(filter(attrgetter('in_default_lang'),
+                default_lang_items))
         len_ = len(default_lang_items)
         if len_ > 1:
             logger.warning('there are %s variants of "%s"' % (len_, slug))

From d0489758ade73fb92a6a3042770e0960aaf03c02 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 7 Apr 2013 14:43:07 -0700
Subject: [PATCH 1233/2864] Minor English grammar correction

---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 38300914..5b19c341 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -310,6 +310,6 @@ def is_valid_content(content, f):
         content.check_properties()
         return True
     except NameError as e:
-        logger.error("Skipping %s: impossible to find informations about "
+        logger.error("Skipping %s: impossible to find information about "
                       "'%s'" % (f, e))
         return False

From 45dc17f41f5e43b69b63ad14fbdb888ccc881918 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 10 Apr 2013 16:58:25 -0700
Subject: [PATCH 1234/2864] Current default theme design is MIT licensed

---
 pelican/tests/output/basic/theme/css/main.css  | 5 +++--
 pelican/tests/output/custom/theme/css/main.css | 5 +++--
 pelican/themes/notmyidea/static/css/main.css   | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 57224443..00f30e90 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -3,8 +3,9 @@
 	Date: July 2009
 	Description: Sample layout for HTML5 and CSS3 goodness.
 	Version: 1.0
-	Author: Enrique Ramírez
-	Autor URI: http://enrique-ramirez.com
+    License: MIT <http://opensource.org/licenses/MIT>
+    Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+	Original author: Enrique Ramírez <http://enrique-ramirez.com/>
 */
 
 /* Imports */
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 57224443..00f30e90 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -3,8 +3,9 @@
 	Date: July 2009
 	Description: Sample layout for HTML5 and CSS3 goodness.
 	Version: 1.0
-	Author: Enrique Ramírez
-	Autor URI: http://enrique-ramirez.com
+    License: MIT <http://opensource.org/licenses/MIT>
+    Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+	Original author: Enrique Ramírez <http://enrique-ramirez.com/>
 */
 
 /* Imports */
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 57224443..00f30e90 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -3,8 +3,9 @@
 	Date: July 2009
 	Description: Sample layout for HTML5 and CSS3 goodness.
 	Version: 1.0
-	Author: Enrique Ramírez
-	Autor URI: http://enrique-ramirez.com
+    License: MIT <http://opensource.org/licenses/MIT>
+    Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+	Original author: Enrique Ramírez <http://enrique-ramirez.com/>
 */
 
 /* Imports */

From 679d4aa801993c2ab8ac72d73f110fd364d84127 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 10 Apr 2013 17:14:19 -0700
Subject: [PATCH 1235/2864] Main CSS file uses tabs, not spaces

---
 pelican/tests/output/basic/theme/css/main.css  | 4 ++--
 pelican/tests/output/custom/theme/css/main.css | 4 ++--
 pelican/themes/notmyidea/static/css/main.css   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 00f30e90..7f4ca363 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -3,8 +3,8 @@
 	Date: July 2009
 	Description: Sample layout for HTML5 and CSS3 goodness.
 	Version: 1.0
-    License: MIT <http://opensource.org/licenses/MIT>
-    Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+	License: MIT <http://opensource.org/licenses/MIT>
+	Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
 	Original author: Enrique Ramírez <http://enrique-ramirez.com/>
 */
 
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 00f30e90..7f4ca363 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -3,8 +3,8 @@
 	Date: July 2009
 	Description: Sample layout for HTML5 and CSS3 goodness.
 	Version: 1.0
-    License: MIT <http://opensource.org/licenses/MIT>
-    Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+	License: MIT <http://opensource.org/licenses/MIT>
+	Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
 	Original author: Enrique Ramírez <http://enrique-ramirez.com/>
 */
 
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 00f30e90..7f4ca363 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -3,8 +3,8 @@
 	Date: July 2009
 	Description: Sample layout for HTML5 and CSS3 goodness.
 	Version: 1.0
-    License: MIT <http://opensource.org/licenses/MIT>
-    Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+	License: MIT <http://opensource.org/licenses/MIT>
+	Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
 	Original author: Enrique Ramírez <http://enrique-ramirez.com/>
 */
 

From 0a8678a8ae8e08969e85221e4f82214b8057793a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 11 Apr 2013 12:15:18 -0700
Subject: [PATCH 1236/2864] Change RELATIVE_URLS default to False - Fixes #829

---
 docs/contribute.rst                           |  4 +-
 docs/settings.rst                             |  6 +-
 pelican/settings.py                           |  2 +-
 .../basic/a-markdown-powered-article.html     | 30 +++---
 pelican/tests/output/basic/archives.html      | 40 ++++----
 pelican/tests/output/basic/article-1.html     | 26 ++---
 pelican/tests/output/basic/article-2.html     | 26 ++---
 pelican/tests/output/basic/article-3.html     | 26 ++---
 .../output/basic/author/alexis-metaireau.html | 40 ++++----
 pelican/tests/output/basic/categories.html    | 30 +++---
 pelican/tests/output/basic/category/bar.html  | 30 +++---
 pelican/tests/output/basic/category/cat1.html | 48 +++++-----
 pelican/tests/output/basic/category/misc.html | 46 ++++-----
 pelican/tests/output/basic/category/yeah.html | 30 +++---
 .../basic/filename_metadata-example.html      | 26 ++---
 pelican/tests/output/basic/index.html         | 94 +++++++++----------
 pelican/tests/output/basic/oh-yeah.html       | 30 +++---
 .../tests/output/basic/override/index.html    | 22 ++---
 .../pages/this-is-a-test-hidden-page.html     | 22 ++---
 .../basic/pages/this-is-a-test-page.html      | 22 ++---
 .../tests/output/basic/second-article-fr.html | 30 +++---
 .../tests/output/basic/second-article.html    | 30 +++---
 pelican/tests/output/basic/tag/bar.html       | 50 +++++-----
 pelican/tests/output/basic/tag/baz.html       | 30 +++---
 pelican/tests/output/basic/tag/foo.html       | 40 ++++----
 pelican/tests/output/basic/tag/foobar.html    | 30 +++---
 pelican/tests/output/basic/tag/oh.html        | 30 +++---
 pelican/tests/output/basic/tag/yeah.html      | 30 +++---
 .../output/basic/this-is-a-super-article.html | 30 +++---
 pelican/tests/output/basic/unbelievable.html  | 30 +++---
 pelican/tests/test_pelican.py                 |  2 +-
 pelican/tests/test_webassets.py               |  6 +-
 pelican/tools/templates/pelicanconf.py.in     |  3 +
 pelican/tools/templates/publishconf.py.in     |  4 +-
 pelican/writers.py                            |  2 +-
 samples/pelican.conf.py                       |  3 +
 36 files changed, 478 insertions(+), 472 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 2069765c..e53fabf5 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -54,9 +54,9 @@ If you have made changes that affect the output of a Pelican-generated weblog,
 then you should update the output used by functional tests.
 To do so, you can use the following two commands::
 
-    $ LC_ALL="C" pelican -o pelican/tests/output/custom/ -s samples/pelican.conf.py \
+    $ pelican -o pelican/tests/output/custom/ -s samples/pelican.conf.py \
         samples/content/
-    $ LC_ALL="C" pelican -o pelican/tests/output/basic/ samples/content/
+    $ pelican -o pelican/tests/output/basic/ samples/content/
 
 testing for python3
 -------------------
diff --git a/docs/settings.rst b/docs/settings.rst
index db5c0164..83348228 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -107,9 +107,9 @@ Setting name (default value)                                            What doe
 `OUTPUT_SOURCES_EXTENSION` (``.text``)                                  Controls the extension that will be used by the SourcesGenerator.
                                                                         Defaults to ``.text``. If not a valid string the default value
                                                                         will be used.
-`RELATIVE_URLS` (``True``)                                              Defines whether Pelican should use document-relative URLs or
-                                                                        not. If set to ``False``, Pelican will use the SITEURL
-                                                                        setting to construct absolute URLs.
+`RELATIVE_URLS` (``False``)                                             Defines whether Pelican should use document-relative URLs or
+                                                                        not. Only set this to ``True`` when developing/testing and only
+                                                                        if you fully understand the effect it can have on links/feeds.
 `PLUGINS` (``[]``)                                                      The list of plugins to load. See :ref:`plugins`.
 `SITENAME` (``'A Pelican Blog'``)                                       Your site name
 `SITEURL`                                                               Base URL of your website. Not defined by default,
diff --git a/pelican/settings.py b/pelican/settings.py
index df1de0c7..319df7f8 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -66,7 +66,7 @@ _DEFAULT_CONFIG = {'PATH': os.curdir,
                    'YEAR_ARCHIVE_SAVE_AS': False,
                    'MONTH_ARCHIVE_SAVE_AS': False,
                    'DAY_ARCHIVE_SAVE_AS': False,
-                   'RELATIVE_URLS': True,
+                   'RELATIVE_URLS': False,
                    'DEFAULT_LANG': 'en',
                    'TAG_CLOUD_STEPS': 4,
                    'TAG_CLOUD_MAX_ITEMS': 100,
diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 251b3aab..021f2720 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -3,38 +3,38 @@
 <head>
         <title>A markdown powered article</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="./a-markdown-powered-article.html" rel="bookmark"
+        <a href="/a-markdown-powered-article.html" rel="bookmark"
            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
           </header>
 
@@ -44,11 +44,11 @@
                 Wed 20 April 2011
         </abbr>
 
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
-<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
-<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
+<p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
+<a href="/unbelievable.html">a file-relative link to unbelievable</a></p>
     </div><!-- /.entry-content -->
     
   </article>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 06b3e6e6..c941849e 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
@@ -35,23 +35,23 @@
 
 <dl>
     <dt>Fri 30 November 2012</dt>
-    <dd><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></dd>
+    <dd><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></dd>
     <dt>Wed 29 February 2012</dt>
-    <dd><a href="./second-article.html">Second article</a></dd>
+    <dd><a href="/second-article.html">Second article</a></dd>
     <dt>Wed 20 April 2011</dt>
-    <dd><a href="./a-markdown-powered-article.html">A markdown powered article</a></dd>
+    <dd><a href="/a-markdown-powered-article.html">A markdown powered article</a></dd>
     <dt>Thu 17 February 2011</dt>
-    <dd><a href="./article-1.html">Article 1</a></dd>
+    <dd><a href="/article-1.html">Article 1</a></dd>
     <dt>Thu 17 February 2011</dt>
-    <dd><a href="./article-2.html">Article 2</a></dd>
+    <dd><a href="/article-2.html">Article 2</a></dd>
     <dt>Thu 17 February 2011</dt>
-    <dd><a href="./article-3.html">Article 3</a></dd>
+    <dd><a href="/article-3.html">Article 3</a></dd>
     <dt>Thu 02 December 2010</dt>
-    <dd><a href="./this-is-a-super-article.html">This is a super article !</a></dd>
+    <dd><a href="/this-is-a-super-article.html">This is a super article !</a></dd>
     <dt>Wed 20 October 2010</dt>
-    <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
+    <dd><a href="/oh-yeah.html">Oh yeah !</a></dd>
     <dt>Fri 15 October 2010</dt>
-    <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
+    <dd><a href="/unbelievable.html">Unbelievable !</a></dd>
 </dl>
 </section>
         <section id="extras" class="body">
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index fb425644..a86bcbd0 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -3,38 +3,38 @@
 <head>
         <title>Article 1</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="./article-1.html" rel="bookmark"
+        <a href="/article-1.html" rel="bookmark"
            title="Permalink to Article 1">Article 1</a></h1>
           </header>
 
@@ -44,7 +44,7 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 1</p>
 
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 39d55c6b..da74685d 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -3,38 +3,38 @@
 <head>
         <title>Article 2</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="./article-2.html" rel="bookmark"
+        <a href="/article-2.html" rel="bookmark"
            title="Permalink to Article 2">Article 2</a></h1>
           </header>
 
@@ -44,7 +44,7 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 2</p>
 
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index e7e59440..03641539 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -3,38 +3,38 @@
 <head>
         <title>Article 3</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="./article-3.html" rel="bookmark"
+        <a href="/article-3.html" rel="bookmark"
            title="Permalink to Article 3">Article 3</a></h1>
           </header>
 
@@ -44,7 +44,7 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 3</p>
 
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 8b83c8a6..9c47c7a0 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog - Alexis Métaireau</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,17 +35,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>
+        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -63,7 +63,7 @@ YEAH !</p>
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
+                    <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
@@ -74,14 +74,14 @@ YEAH !</p>
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
+        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
+                <a class="readmore" href="/this-is-a-super-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index cdcbb04f..8f6d9f41 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -3,38 +3,38 @@
 <head>
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <ul>
-    <li><a href="./category/bar.html">bar</a></li>
-    <li><a href="./category/cat1.html">cat1</a></li>
-    <li><a href="./category/misc.html">misc</a></li>
-    <li><a href="./category/yeah.html">yeah</a></li>
+    <li><a href="/category/bar.html">bar</a></li>
+    <li><a href="/category/cat1.html">cat1</a></li>
+    <li><a href="/category/misc.html">misc</a></li>
+    <li><a href="/category/yeah.html">yeah</a></li>
 </ul>
         <section id="extras" class="body">
                                 <div class="social">
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index f815a45b..deca8aed 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog - bar</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li class="active"><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,17 +35,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>
+        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 1922f57a..90edd920 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog - cat1</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li class="active"><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,17 +35,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1> 
+                    <h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
-<a href="../unbelievable.html">a file-relative link to unbelievable</a></p>                </article>
+<p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
+<a href="/unbelievable.html">a file-relative link to unbelievable</a></p>                </article>
                             </aside><!-- /#featured -->
                             <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -56,7 +56,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="../article-1.html" rel="bookmark"
+                    <h1><a href="/article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
@@ -66,11 +66,11 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="../article-1.html">read more</a>
+                <a class="readmore" href="/article-1.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -78,7 +78,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="../article-2.html" rel="bookmark"
+                    <h1><a href="/article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
@@ -88,11 +88,11 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="../article-2.html">read more</a>
+                <a class="readmore" href="/article-2.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -100,7 +100,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="../article-3.html" rel="bookmark"
+                    <h1><a href="/article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
@@ -110,11 +110,11 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="../article-3.html">read more</a>
+                <a class="readmore" href="/article-3.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index cdf2a437..f966bf89 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog - misc</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,13 +35,13 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
+                    <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
                 </article>
@@ -55,7 +55,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="../second-article.html" rel="bookmark"
+                    <h1><a href="/second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
@@ -65,13 +65,13 @@
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
+            <a href="/second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="../second-article.html">read more</a>
+                <a class="readmore" href="/second-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -79,7 +79,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="../unbelievable.html" rel="bookmark"
+                    <h1><a href="/unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
@@ -89,13 +89,13 @@
                 Fri 15 October 2010
         </abbr>
 
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
-                <a class="readmore" href="../unbelievable.html">read more</a>
+                <a class="readmore" href="/unbelievable.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index fc108e93..bce27b13 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog - yeah</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li class="active"><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,17 +35,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1> 
+                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
+        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 3b971617..0c7f6753 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -3,38 +3,38 @@
 <head>
         <title>FILENAME_METADATA example</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="./filename_metadata-example.html" rel="bookmark"
+        <a href="/filename_metadata-example.html" rel="bookmark"
            title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
           </header>
 
@@ -44,7 +44,7 @@
                 Fri 30 November 2012
         </abbr>
 
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Some cool stuff!</p>
 
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 657ea233..d109f535 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,13 +35,13 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
+                    <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
                 </article>
@@ -55,7 +55,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="./second-article.html" rel="bookmark"
+                    <h1><a href="/second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
@@ -65,13 +65,13 @@
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
-            <a href="./second-article-fr.html">fr</a>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
+            <a href="/second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="./second-article.html">read more</a>
+                <a class="readmore" href="/second-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -79,7 +79,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="./a-markdown-powered-article.html" rel="bookmark"
+                    <h1><a href="/a-markdown-powered-article.html" rel="bookmark"
                            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
                 
@@ -89,12 +89,12 @@
                 Wed 20 April 2011
         </abbr>
 
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
-<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
-                <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
+<p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
+<a href="/unbelievable.html">a file-relative link to unbelievable</a></p>
+                <a class="readmore" href="/a-markdown-powered-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -102,7 +102,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="./article-1.html" rel="bookmark"
+                    <h1><a href="/article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
@@ -112,11 +112,11 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="./article-1.html">read more</a>
+                <a class="readmore" href="/article-1.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -124,7 +124,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="./article-2.html" rel="bookmark"
+                    <h1><a href="/article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
@@ -134,11 +134,11 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="./article-2.html">read more</a>
+                <a class="readmore" href="/article-2.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -146,7 +146,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="./article-3.html" rel="bookmark"
+                    <h1><a href="/article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
@@ -156,11 +156,11 @@
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+        <p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="./article-3.html">read more</a>
+                <a class="readmore" href="/article-3.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -168,7 +168,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="./this-is-a-super-article.html" rel="bookmark"
+                    <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
@@ -179,14 +179,14 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
+        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="./this-is-a-super-article.html">read more</a>
+                <a class="readmore" href="/this-is-a-super-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -194,7 +194,7 @@ as well as <strong>inline markup</strong>.</p>
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="./oh-yeah.html" rel="bookmark"
+                    <h1><a href="/oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
@@ -205,10 +205,10 @@ as well as <strong>inline markup</strong>.</p>
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
+        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -216,7 +216,7 @@ YEAH !</p>
 <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-                <a class="readmore" href="./oh-yeah.html">read more</a>
+                <a class="readmore" href="/oh-yeah.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -224,7 +224,7 @@ YEAH !</p>
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="./unbelievable.html" rel="bookmark"
+                    <h1><a href="/unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
@@ -234,13 +234,13 @@ YEAH !</p>
                 Fri 15 October 2010
         </abbr>
 
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
-                <a class="readmore" href="./unbelievable.html">read more</a>
+                <a class="readmore" href="/unbelievable.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 761ae0ff..82b90905 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -3,38 +3,38 @@
 <head>
         <title>Oh yeah !</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href="./category/bar.html">bar</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li class="active"><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="./oh-yeah.html" rel="bookmark"
+        <a href="/oh-yeah.html" rel="bookmark"
            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
           </header>
 
@@ -45,10 +45,10 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>
+        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 20995de3..82c1e184 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -3,31 +3,31 @@
 <head>
         <title>Override url/save_as</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 6f1f71ee..06e4bcc1 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -3,31 +3,31 @@
 <head>
         <title>This is a test hidden page</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index ce9ffd2c..c40fc879 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -3,31 +3,31 @@
 <head>
         <title>This is a test page</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 67c206af..6b3f422e 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -3,38 +3,38 @@
 <head>
         <title>Deuxième article</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="./second-article-fr.html" rel="bookmark"
+        <a href="/second-article-fr.html" rel="bookmark"
            title="Permalink to Deuxième article">Deuxième article</a></h1>
           </header>
 
@@ -44,9 +44,9 @@
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
-            <a href="./second-article.html">en</a>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
+            <a href="/second-article.html">en</a>
     
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index e779e0da..657e1e5d 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -3,38 +3,38 @@
 <head>
         <title>Second article</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="./second-article.html" rel="bookmark"
+        <a href="/second-article.html" rel="bookmark"
            title="Permalink to Second article">Second article</a></h1>
           </header>
 
@@ -44,9 +44,9 @@
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
-            <a href="./second-article-fr.html">fr</a>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
+            <a href="/second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 6d4138f2..725cd165 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog - bar</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,15 +35,15 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
+            <a href="/second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
@@ -57,7 +57,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
+                    <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
@@ -68,14 +68,14 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
+        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
+                <a class="readmore" href="/this-is-a-super-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             
@@ -83,7 +83,7 @@ as well as <strong>inline markup</strong>.</p>
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="../oh-yeah.html" rel="bookmark"
+                    <h1><a href="/oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
@@ -94,10 +94,10 @@ as well as <strong>inline markup</strong>.</p>
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>
+        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -105,7 +105,7 @@ YEAH !</p>
 <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-                <a class="readmore" href="../oh-yeah.html">read more</a>
+                <a class="readmore" href="/oh-yeah.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index dd44e38a..6a8baa42 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog - baz</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,15 +35,15 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
+            <a href="/second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 0812ed7c..d8e06ee3 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog - foo</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,15 +35,15 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
+                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
+            <a href="/second-article-fr.html">fr</a>
     
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
@@ -57,7 +57,7 @@
                  
                         <li><article class="hentry">    
                 <header>
-                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
+                    <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
@@ -68,14 +68,14 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
+        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
+                <a class="readmore" href="/this-is-a-super-article.html">read more</a>
                                 </div><!-- /.entry-content -->
             </article></li>
                             </ol><!-- /#posts-list -->
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 83ace5e3..ab728689 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog - foobar</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,17 +35,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1> 
+                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
+        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index 4694dadf..d0bd6e6f 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog - oh</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,17 +35,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>
+        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 5d4358cb..c730f7f2 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -3,31 +3,31 @@
 <head>
         <title>A Pelican Blog - yeah</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="../">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/bar.html">bar</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
@@ -35,17 +35,17 @@
 
                             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
                     <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>
+        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 7a4971a7..0ace28c7 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -3,38 +3,38 @@
 <head>
         <title>This is a super article !</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li ><a href="/category/misc.html">misc</a></li>
+                                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="./this-is-a-super-article.html" rel="bookmark"
+        <a href="/this-is-a-super-article.html" rel="bookmark"
            title="Permalink to This is a super article !">This is a super article !</a></h1>
           </header>
 
@@ -45,10 +45,10 @@
         </abbr>
 
                 <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
+        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index bb297236..11a68fc5 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -3,38 +3,38 @@
 <head>
         <title>Unbelievable !</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
+                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
 
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="./">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/bar.html">bar</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                                    <li ><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="./unbelievable.html" rel="bookmark"
+        <a href="/unbelievable.html" rel="bookmark"
            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
           </header>
 
@@ -44,11 +44,11 @@
                 Fri 15 October 2010
         </abbr>
 
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+        <p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+<a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
     </div><!-- /.entry-content -->
     
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 5fd037f3..4baa4418 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -77,7 +77,7 @@ class TestPelican(LoggedTestCase):
         dcmp = dircmp(self.temp_path, os.path.join(OUTPUT_PATH, 'basic'))
         self.assertFilesEqual(recursiveDiff(dcmp))
         self.assertLogCountEqual(
-            count=10,
+            count=4,
             msg="Unable to find.*skipping url replacement",
             level=logging.WARNING)
 
diff --git a/pelican/tests/test_webassets.py b/pelican/tests/test_webassets.py
index a9760b37..fe5d6309 100644
--- a/pelican/tests/test_webassets.py
+++ b/pelican/tests/test_webassets.py
@@ -56,6 +56,9 @@ class TestWebAssets(unittest.TestCase):
 class TestWebAssetsRelativeURLS(TestWebAssets):
     """Test pelican with relative urls."""
 
+    def setUp(self):
+        TestWebAssets.setUp(self, override={'RELATIVE_URLS': True})
+
     def test_jinja2_ext(self):
         # Test that the Jinja2 extension was correctly added.
 
@@ -90,8 +93,7 @@ class TestWebAssetsAbsoluteURLS(TestWebAssets):
     """Test pelican with absolute urls."""
 
     def setUp(self):
-        TestWebAssets.setUp(self, override={'RELATIVE_URLS': False,
-                                            'SITEURL': 'http://localhost'})
+        TestWebAssets.setUp(self, override={'SITEURL': 'http://localhost'})
 
     def test_absolute_url(self):
         # Look in the output files for the link tag with absolute url.
diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in
index d59a7989..9ef94553 100644
--- a/pelican/tools/templates/pelicanconf.py.in
+++ b/pelican/tools/templates/pelicanconf.py.in
@@ -20,3 +20,6 @@ SOCIAL = (('You can add links in your config file', '#'),
           ('Another social link', '#'),)
 
 DEFAULT_PAGINATION = $default_pagination
+
+# Uncomment following line if you want document-relative URLs when developing
+#RELATIVE_URLS = True
diff --git a/pelican/tools/templates/publishconf.py.in b/pelican/tools/templates/publishconf.py.in
index 8fd2a4f7..20e5ced9 100755
--- a/pelican/tools/templates/publishconf.py.in
+++ b/pelican/tools/templates/publishconf.py.in
@@ -10,13 +10,11 @@ sys.path.append(os.curdir)
 from pelicanconf import *
 
 SITEURL = '$siteurl'
+RELATIVE_URLS = False
 
 DELETE_OUTPUT_DIRECTORY = True
 
 # Following items are often useful when publishing
 
-# Uncomment following line for absolute URLs in production:
-#RELATIVE_URLS = False
-
 #DISQUS_SITENAME = ""
 #GOOGLE_ANALYTICS = ""
diff --git a/pelican/writers.py b/pelican/writers.py
index ea93dae6..c762bbe4 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -89,7 +89,7 @@ class Writer(object):
         finally:
             locale.setlocale(locale.LC_ALL, old_locale)
 
-    def write_file(self, name, template, context, relative_urls=True,
+    def write_file(self, name, template, context, relative_urls=False,
         paginated=None, **kwargs):
         """Render the template and write the file.
 
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 714a418c..70edd5f8 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -6,6 +6,9 @@ SITENAME = "Alexis' log"
 SITEURL = 'http://blog.notmyidea.org'
 TIMEZONE = "Europe/Paris"
 
+# can be useful in development, but set to False when you're ready to publish
+RELATIVE_URLS = True
+
 GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False

From 7364f77c0c5ac81599bead8b1721b61e0c68e58d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 11 Apr 2013 19:23:34 -0700
Subject: [PATCH 1237/2864] Document supported Python versions

---
 docs/getting_started.rst | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 5195e30e..baee098a 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -4,8 +4,13 @@ Getting started
 Installing Pelican
 ==================
 
-You're ready? Let's go! You can install Pelican via several different methods.
-The simplest is via `pip <http://www.pip-installer.org/>`_::
+Pelican currently runs best on Python 2.7.x; earlier versions of Python are not
+supported. There is provisional support for Python 3.2 and higher, although
+there may be rough edges, particularly with regards to optional 3rd-party
+components.
+
+You can install Pelican via several different methods. The simplest is via
+`pip <http://www.pip-installer.org/>`_::
 
     $ pip install pelican
 
@@ -13,6 +18,9 @@ If you don't have ``pip`` installed, an alternative method is ``easy_install``::
 
     $ easy_install pelican
 
+(Keep in mind that operating systems will often require you to prefix the above
+commands with ``sudo`` in order to install Pelican system-wide.)
+
 While the above is the simplest method, the recommended approach is to create
 a virtual environment for Pelican via virtualenv_ and virtualenvwrapper_ before
 installing Pelican. Assuming you've followed the virtualenvwrapper

From 0d7c3e1b0a771d002906307e72058e7f488795c3 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 11 Apr 2013 19:27:20 -0700
Subject: [PATCH 1238/2864] Remove allusion to Python versions less than 2.7

---
 docs/getting_started.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index baee098a..4b2d3b4a 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -83,8 +83,6 @@ At this time, Pelican core is dependent on the following Python packages:
 * `unidecode <http://pypi.python.org/pypi/Unidecode>`_, for ASCII
   transliterations of Unicode text
 
-If you're not using Python 2.7, you will also need the ``argparse`` package.
-
 Optionally:
 
 * `markdown <http://pypi.python.org/pypi/Markdown>`_, for supporting Markdown as

From 8e254e8cd7fb9bb177c0b3ef9f2f365e04ea8b46 Mon Sep 17 00:00:00 2001
From: unknown <jimperio@gmail.com>
Date: Fri, 12 Apr 2013 15:44:53 +0800
Subject: [PATCH 1239/2864] Fixed path_to_url when os.sep is not '/'.

---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 44abb1bd..73abd358 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -317,7 +317,7 @@ def path_to_url(path):
     if os.sep == '/':
         return path
     else:
-        '/'.join(split_all(path))
+        return '/'.join(split_all(path))
 
 
 def truncate_html_words(s, num, end_text='...'):

From cb509c1b7085cbbcacfae5f50594e6ed6c76ee02 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 12 Apr 2013 10:51:48 -0400
Subject: [PATCH 1240/2864] .mailmap: Add mappings to consolidate author names
 and emails

See "MAPPING AUTHORS" in git-shortlog(1) for syntax details.

I don't think I've accidentally merged two distinct people together,
but I added

  Guillaume B <guitreize@gmail.com>

to avoid someone accidentally merging him into

  Guillaume <guillaume@lame.homelinux.com>

I'm pretty sure these are two different Guillaumes.
---
 .mailmap | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..8dd40fb6
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,24 @@
+Alexis Métaireau <alexis@notmyidea.org>
+Alexis Métaireau <alexis@notmyidea.org> <alexis, notmyidea, org>
+Alexis Métaireau <alexis@notmyidea.org> <ametaireau@gmail.com>
+Axel Haustant <noirbizarre@gmail.com> <axel.haustant.ext@mappy.com>
+Axel Haustant <noirbizarre@gmail.com> <axel.haustant@valtech.fr>
+Dave Mankoff <mankyd@gmail.com>
+Feth Arezki <feth@tuttu.info>
+Guillaume <guillaume@lame.homelinux.com>
+Guillaume <guillaume@lame.homelinux.com> <guillaume@mint.(none)>
+Guillaume B <guitreize@gmail.com>
+Guillermo López <guilan70@hotmail.com>
+Guillermo López <guilan70@hotmail.com> <guillermo.lopez@outlook.com>
+Jomel Imperio <jimperio@gmail.com>
+Justin Mayer <entrop@gmail.com>
+Justin Mayer <entrop@gmail.com> <entroP@gmail.com>
+Marco Milanesi <kpanic@gnufunk.org> <marcom@openquake.org>
+Massimo Santini <santini@dsi.unimi.it> <santini@spillane.docenti.dsi.unimi.it>
+Rémy HUBSCHER <hubscher.remy@gmail.com> <remy.hubscher@ionyse.com>
+Simon Conseil <contact@saimon.org>
+Simon Liedtke <liedtke.simon@googlemail.com>
+Skami18 <skami@skami-laptop.dyndns.org>
+Stuart Colville <muffinresearchlabs@gmail.com> <muffinresearch@gmail.com>
+Stéphane Bunel <stephane@lutetium.(none)>
+tBunnyMan <WagThatTail@Me.com>

From 886c8d649c28bb169e91030c1531dfc2c6290dfd Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 12 Apr 2013 08:48:42 -0700
Subject: [PATCH 1241/2864] Better defaults for quickstart settings files

Since feed generation is usually unnecessary during development (and can
produce potentially-confusing warnings when SITEURL is not set), running
"make html" will now skip feed generation by default. Feed generation
settings have been added to publishconf.py so feeds will be generated
when the site is published.

Also corrected some URLs in pelicanconf.py.
---
 pelican/tools/templates/pelicanconf.py.in | 11 ++++++++---
 pelican/tools/templates/publishconf.py.in |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in
index 9ef94553..265b59c2 100644
--- a/pelican/tools/templates/pelicanconf.py.in
+++ b/pelican/tools/templates/pelicanconf.py.in
@@ -9,10 +9,15 @@ TIMEZONE = 'Europe/Paris'
 
 DEFAULT_LANG = $lang
 
+# Feed generation is usually not desired when developing
+FEED_ALL_ATOM = None
+CATEGORY_FEED_ATOM = None
+TRANSLATION_FEED_ATOM = None
+
 # Blogroll
-LINKS =  (('Pelican', 'http://docs.notmyidea.org/alexis/pelican/'),
-          ('Python.org', 'http://python.org'),
-          ('Jinja2', 'http://jinja.pocoo.org'),
+LINKS =  (('Pelican', 'http://getpelican.com/'),
+          ('Python.org', 'http://python.org/'),
+          ('Jinja2', 'http://jinja.pocoo.org/'),
           ('You can modify those links in your config file', '#'),)
 
 # Social widget
diff --git a/pelican/tools/templates/publishconf.py.in b/pelican/tools/templates/publishconf.py.in
index 20e5ced9..4c4f052a 100755
--- a/pelican/tools/templates/publishconf.py.in
+++ b/pelican/tools/templates/publishconf.py.in
@@ -12,6 +12,9 @@ from pelicanconf import *
 SITEURL = '$siteurl'
 RELATIVE_URLS = False
 
+FEED_ALL_ATOM = 'feeds/all.atom.xml'
+CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
+
 DELETE_OUTPUT_DIRECTORY = True
 
 # Following items are often useful when publishing

From c4b3ad58e8c1f23501e881801dad60daf266e8d2 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 12 Apr 2013 23:39:39 -0400
Subject: [PATCH 1242/2864] remove plugins, update docs and update dependecies

---
 .travis.yml                                   |   3 +-
 dev_requirements.txt                          |   1 -
 docs/plugins.rst                              | 328 +-----------------
 pelican/plugins/__init__.py                   |   0
 pelican/plugins/assets.py                     |  53 ---
 pelican/plugins/github_activity.py            |  86 -----
 pelican/plugins/global_license.py             |  24 --
 pelican/plugins/gravatar.py                   |  44 ---
 pelican/plugins/gzip_cache.py                 |  78 -----
 pelican/plugins/html_rst_directive.py         |  64 ----
 pelican/plugins/initialized.py                |   9 -
 pelican/plugins/related_posts.py              |  35 --
 pelican/plugins/sitemap.py                    | 195 -----------
 pelican/plugins/summary.py                    |  53 ---
 pelican/tests/test_plugins.py                 | 101 ------
 pelican/tests/test_webassets.py               | 106 ------
 .../themes/assets/static/css/style.min.css    |   1 -
 .../tests/themes/assets/static/css/style.scss |  19 -
 .../tests/themes/assets/templates/base.html   |   7 -
 setup.py                                      |   2 +-
 20 files changed, 16 insertions(+), 1193 deletions(-)
 delete mode 100644 pelican/plugins/__init__.py
 delete mode 100644 pelican/plugins/assets.py
 delete mode 100644 pelican/plugins/github_activity.py
 delete mode 100644 pelican/plugins/global_license.py
 delete mode 100644 pelican/plugins/gravatar.py
 delete mode 100644 pelican/plugins/gzip_cache.py
 delete mode 100644 pelican/plugins/html_rst_directive.py
 delete mode 100644 pelican/plugins/initialized.py
 delete mode 100644 pelican/plugins/related_posts.py
 delete mode 100644 pelican/plugins/sitemap.py
 delete mode 100644 pelican/plugins/summary.py
 delete mode 100644 pelican/tests/test_plugins.py
 delete mode 100644 pelican/tests/test_webassets.py
 delete mode 100644 pelican/tests/themes/assets/static/css/style.min.css
 delete mode 100644 pelican/tests/themes/assets/static/css/style.scss
 delete mode 100644 pelican/tests/themes/assets/templates/base.html

diff --git a/.travis.yml b/.travis.yml
index 3a309d0d..19cb7e89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,11 @@ python:
     - "3.2"
 before_install:
  - sudo apt-get update -qq
- - sudo apt-get install -qq --no-install-recommends asciidoc ruby-sass
+ - sudo apt-get install -qq --no-install-recommends asciidoc
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
     - pip install nose mock --use-mirrors
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors unittest2; else pip install --use-mirrors unittest2py3k; fi
     - pip install . --use-mirrors
     - pip install --use-mirrors Markdown
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors webassets cssmin; fi
 script: nosetests -s pelican
diff --git a/dev_requirements.txt b/dev_requirements.txt
index e0189d35..fa2634a0 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -6,4 +6,3 @@ Markdown
 BeautifulSoup4
 lxml
 typogrify
-webassets
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 857180f0..21a962e2 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -6,9 +6,6 @@ Plugins
 Beginning with version 3.0, Pelican supports plugins. Plugins are a way to add
 features to Pelican without having to directly modify the Pelican core.
 
-Pelican is shipped with a set of bundled plugins, but you can easily implement
-your own. This page describes how to use and create plugins.
-
 How to use plugins
 ==================
 
@@ -16,12 +13,12 @@ To load plugins, you have to specify them in your settings file. There are two
 ways to do so. The first method is to specify strings with the path to the
 callables::
 
-    PLUGINS = ['pelican.plugins.gravatar',]
+    PLUGINS = ['package.myplugin',]
 
 Alternatively, another method is to import them and add them to the list::
 
-    from pelican.plugins import gravatar
-    PLUGINS = [gravatar,]
+    from package import myplugin
+    PLUGINS = [myplugin,]
 
 If your plugins are not in an importable path, you can specify a ``PLUGIN_PATH``
 in the settings. ``PLUGIN_PATH`` can be an absolute path or a path relative to
@@ -30,6 +27,17 @@ the settings file::
     PLUGIN_PATH = "plugins"
     PLUGINS = ["list", "of", "plugins"]
 
+Where to find plugins
+=====================
+
+We maintain a separate repository of plugins for people to share and use. 
+Please see the `pelican-plugins`_ repository for the official place for plugins.
+
+.. _pelican-plugins: https://github.com/getpelican/pelican-plugins
+
+Please note that while we will give best effort, the submitted plugins are all 
+community driven and supported.
+
 How to create plugins
 =====================
 
@@ -96,311 +104,3 @@ request if you need them!
 
        def register():
                signals.content_object_init.connect(test, sender=contents.Article)
-
-
-
-List of plugins
-===============
-
-The following plugins are currently included with Pelican:
-
-* `Asset management`_ ``pelican.plugins.assets``
-* `GitHub activity`_ ``pelican.plugins.github_activity``
-* `Global license`_ ``pelican.plugins.global_license``
-* `Gravatar`_ ``pelican.plugins.gravatar``
-* `Gzip cache`_ ``pelican.plugins.gzip_cache``
-* `HTML tags for reStructuredText`_ ``pelican.plugins.html_rst_directive``
-* `Related posts`_ ``pelican.plugins.related_posts``
-* `Sitemap`_ ``pelican.plugins.sitemap``
-* `Summary`_ ``pelican.plugins.summary``
-
-Ideas for plugins that haven't been written yet:
-
-* Tag cloud
-* Translation
-
-Plugin descriptions
-===================
-
-Asset management
-----------------
-
-This plugin allows you to use the `Webassets`_ module to manage assets such as
-CSS and JS files. The module must first be installed::
-
-    pip install webassets
-
-The Webassets module allows you to perform a number of useful asset management
-functions, including:
-
-* CSS minifier (``cssmin``, ``yui_css``, ...)
-* CSS compiler (``less``, ``sass``, ...)
-* JS minifier (``uglifyjs``, ``yui_js``, ``closure``, ...)
-
-Others filters include gzip compression, integration of images in CSS via data
-URIs, and more. Webassets can also append a version identifier to your asset
-URL to convince browsers to download new versions of your assets when you use
-far-future expires headers. Please refer to the `Webassets documentation`_ for
-more information.
-
-When used with Pelican, Webassets is configured to process assets in the
-``OUTPUT_PATH/theme`` directory. You can use Webassets in your templates by
-including one or more template tags. The Jinja variable ``{{ ASSET_URL }}`` can
-be used in templates and is relative to the ``theme/`` url. The
-``{{ ASSET_URL }}`` variable should be used in conjunction with the
-``{{ SITEURL }}`` variable in order to generate URLs properly. For example:
-
-.. code-block:: jinja
-
-    {% assets filters="cssmin", output="css/style.min.css", "css/inuit.css", "css/pygment-monokai.css", "css/main.css" %}
-        <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
-    {% endassets %}
-
-... will produce a minified css file with a version identifier that looks like:
-
-.. code-block:: html
-
-    <link href="http://{SITEURL}/theme/css/style.min.css?b3a7c807" rel="stylesheet">
-
-These filters can be combined. Here is an example that uses the SASS compiler
-and minifies the output:
-
-.. code-block:: jinja
-
-    {% assets filters="sass,cssmin", output="css/style.min.css", "css/style.scss" %}
-        <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
-    {% endassets %}
-
-Another example for Javascript:
-
-.. code-block:: jinja
-
-    {% assets filters="uglifyjs,gzip", output="js/packed.js", "js/jquery.js", "js/base.js", "js/widgets.js" %}
-        <script src="{{ SITEURL }}/{{ ASSET_URL }}"></script>
-    {% endassets %}
-
-The above will produce a minified and gzipped JS file:
-
-.. code-block:: html
-
-    <script src="http://{SITEURL}/theme/js/packed.js?00703b9d"></script>
-
-Pelican's debug mode is propagated to Webassets to disable asset packaging
-and instead work with the uncompressed assets.
-
-Many of Webasset's available compilers have additional configuration options
-(i.e. 'Less', 'Sass', 'Stylus', 'Closure_js').  You can pass these options to
-Webassets using the ``ASSET_CONFIG`` in your settings file.
-
-The following will handle Google Closure's compilation level and locate
-LessCSS's binary:
-
-.. code-block:: python
-
-    ASSET_CONFIG = (('closure_compressor_optimization', 'WHITESPACE_ONLY'),
-                    ('less_bin', 'lessc.cmd'), )
-
-.. _Webassets: https://github.com/miracle2k/webassets
-.. _Webassets documentation: http://webassets.readthedocs.org/en/latest/builtin_filters.html
-
-
-GitHub activity
----------------
-
-This plugin makes use of the `feedparser`_ library that you'll need to
-install.
-
-Set the ``GITHUB_ACTIVITY_FEED`` parameter to your GitHub activity feed.
-For example, to track Pelican project activity, the setting would be::
-
-     GITHUB_ACTIVITY_FEED = 'https://github.com/getpelican.atom'
-
-On the template side, you just have to iterate over the ``github_activity``
-variable, as in this example::
-
-     {% if GITHUB_ACTIVITY_FEED %}
-        <div class="social">
-                <h2>Github Activity</h2>
-                <ul>
-
-                {% for entry in github_activity %}
-                    <li><b>{{ entry[0] }}</b><br /> {{ entry[1] }}</li>
-                {% endfor %}
-                </ul>
-        </div><!-- /.github_activity -->
-     {% endif %}
-
-``github_activity`` is a list of lists. The first element is the title,
-and the second element is the raw HTML from GitHub.
-
-.. _feedparser: https://crate.io/packages/feedparser/
-
-Global license
---------------
-
-This plugin allows you to define a ``LICENSE`` setting and adds the contents of that
-license variable to the article's context, making that variable available to use
-from within your theme's templates.
-
-Gravatar
---------
-
-This plugin assigns the ``author_gravatar`` variable to the Gravatar URL and
-makes the variable available within the article's context. You can add
-``AUTHOR_EMAIL`` to your settings file to define the default author's email
-address. Obviously, that email address must be associated with a Gravatar
-account.
-
-Alternatively, you can provide an email address from within article metadata::
-
-    :email:  john.doe@example.com
-
-If the email address is defined via at least one of the two methods above,
-the ``author_gravatar`` variable is added to the article's context.
-
-Gzip cache
-----------
-
-Certain web servers (e.g., Nginx) can use a static cache of gzip-compressed
-files to prevent the server from compressing files during an HTTP call. Since
-compression occurs at another time, these compressed files can be compressed
-at a higher compression level for increased optimization.
-
-The ``gzip_cache`` plugin compresses all common text type files into a ``.gz``
-file within the same directory as the original file.
-
-HTML tags for reStructuredText
-------------------------------
-
-This plugin allows you to use HTML tags from within reST documents. Following
-is a usage example, which is in this case a contact form::
-
-    .. html::
-
-        <form method="GET" action="mailto:some email">
-          <p>
-            <input type="text" placeholder="Subject" name="subject">
-            <br />
-            <textarea name="body" placeholder="Message">
-            </textarea>
-            <br />
-            <input type="reset"><input type="submit">
-          </p>
-        </form>
-
-Related posts
--------------
-
-This plugin adds the ``related_posts`` variable to the article's context.
-By default, up to 5 articles are listed. You can customize this value by 
-defining ``RELATED_POSTS_MAX`` in your settings file::
-
-    RELATED_POSTS_MAX = 10
-
-You can then use the ``article.related_posts`` variable in your templates.
-For example::
-
-    {% if article.related_posts %}
-        <ul>
-        {% for related_post in article.related_posts %}
-            <li><a href="{{ SITEURL }}/{{ related_post.url }}">{{ related_post.title }}</a></li>
-        {% endfor %}
-        </ul>
-    {% endif %}
-
-Sitemap
--------
-
-The sitemap plugin generates plain-text or XML sitemaps. You can use the
-``SITEMAP`` variable in your settings file to configure the behavior of the
-plugin.
-
-The ``SITEMAP`` variable must be a Python dictionary and can contain three keys:
-
-- ``format``, which sets the output format of the plugin (``xml`` or ``txt``)
-
-- ``priorities``, which is a dictionary with three keys:
-
-  - ``articles``, the priority for the URLs of the articles and their
-    translations
-
-  - ``pages``, the priority for the URLs of the static pages
-
-  - ``indexes``, the priority for the URLs of the index pages, such as tags,
-     author pages, categories indexes, archives, etc...
-
-  All the values of this dictionary must be decimal numbers between ``0`` and ``1``.
-
-- ``changefreqs``, which is a dictionary with three items:
-
-  - ``articles``, the update frequency of the articles
-
-  - ``pages``, the update frequency of the pages
-
-  - ``indexes``, the update frequency of the index pages
-
-  Valid frequency values are ``always``, ``hourly``, ``daily``, ``weekly``, ``monthly``,
-  ``yearly`` and ``never``.
-
-If a key is missing or a value is incorrect, it will be replaced with the
-default value.
-
-The sitemap is saved in ``<output_path>/sitemap.<format>``.
-
-.. note::
-   ``priorities`` and ``changefreqs`` are information for search engines.
-   They are only used in the XML sitemaps.
-   For more information: <http://www.sitemaps.org/protocol.html#xmlTagDefinitions>
-
-**Example**
-
-Here is an example configuration (it's also the default settings):
-
-.. code-block:: python
-
-    PLUGINS=['pelican.plugins.sitemap',]
-
-    SITEMAP = {
-        'format': 'xml',
-        'priorities': {
-            'articles': 0.5,
-            'indexes': 0.5,
-            'pages': 0.5
-        },
-        'changefreqs': {
-            'articles': 'monthly',
-            'indexes': 'daily',
-            'pages': 'monthly'
-        }
-    }
-
-.. _plugin-summary:
-
-Summary
--------------
-
-This plugin allows easy, variable length summaries directly embedded into the 
-body of your articles. It introduces two new settings: ``SUMMARY_BEGIN_MARKER``
-and ``SUMMARY_END_MARKER``: strings which can be placed directly into an article
-to mark the beginning and end of a summary. When found, the standard 
-``SUMMARY_MAX_LENGTH`` setting will be ignored. The markers themselves will also
-be removed from your articles before they are published. The default values
-are ``<!-- PELICAN_BEGIN_SUMMARY -->`` and ``<!-- PELICAN_END_SUMMARY -->``.
-For example::
-
-    Title: My super title
-    Date: 2010-12-03 10:20
-    Tags: thats, awesome
-    Category: yeah
-    Slug: my-super-post
-    Author: Alexis Metaireau
-    
-    This is the content of my super blog post.
-    <!-- PELICAN_END_SUMMARY -->
-    and this content occurs after the summary.
-
-Here, the summary is taken to be the first line of the post. Because no
-beginning marker was found, it starts at the top of the body. It is possible
-to leave out the end marker instead, in which case the summary will start at the
-beginning marker and continue to the end of the body.
-
diff --git a/pelican/plugins/__init__.py b/pelican/plugins/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/pelican/plugins/assets.py b/pelican/plugins/assets.py
deleted file mode 100644
index 5708224c..00000000
--- a/pelican/plugins/assets.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-"""
-Asset management plugin for Pelican
-===================================
-
-This plugin allows you to use the `webassets`_ module to manage assets such as
-CSS and JS files.
-
-The ASSET_URL is set to a relative url to honor Pelican's RELATIVE_URLS
-setting. This requires the use of SITEURL in the templates::
-
-    <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
-
-.. _webassets: https://webassets.readthedocs.org/
-
-"""
-
-import os
-import logging
-
-from pelican import signals
-from webassets import Environment
-from webassets.ext.jinja2 import AssetsExtension
-
-
-def add_jinja2_ext(pelican):
-    """Add Webassets to Jinja2 extensions in Pelican settings."""
-
-    pelican.settings['JINJA_EXTENSIONS'].append(AssetsExtension)
-
-
-def create_assets_env(generator):
-    """Define the assets environment and pass it to the generator."""
-
-    assets_url = 'theme/'
-    assets_src = os.path.join(generator.output_path, 'theme')
-    generator.env.assets_environment = Environment(assets_src, assets_url)
-
-    if 'ASSET_CONFIG' in generator.settings:
-        for item in generator.settings['ASSET_CONFIG']:
-            generator.env.assets_environment.config[item[0]] = item[1]
-
-    logger = logging.getLogger(__name__)
-    if logging.getLevelName(logger.getEffectiveLevel()) == "DEBUG":
-        generator.env.assets_environment.debug = True
-
-
-def register():
-    """Plugin registration."""
-
-    signals.initialized.connect(add_jinja2_ext)
-    signals.generator_init.connect(create_assets_env)
diff --git a/pelican/plugins/github_activity.py b/pelican/plugins/github_activity.py
deleted file mode 100644
index cc139efc..00000000
--- a/pelican/plugins/github_activity.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
-"""
-    Copyright (c) Marco Milanesi <kpanic@gnufunk.org>
-
-    A plugin to list your Github Activity
-    To enable it set in your pelican config file the GITHUB_ACTIVITY_FEED
-    parameter pointing to your github activity feed.
-
-    for example my personal activity feed is:
-
-        https://github.com/kpanic.atom
-
-    in your template just write a for in jinja2 syntax against the
-    github_activity variable.
-
-    i.e.
-
-        <div class="social">
-                <h2>Github Activity</h2>
-                <ul>
-
-                {% for entry in github_activity %}
-                    <li><b>{{ entry[0] }}</b><br /> {{ entry[1] }}</li>
-                {% endfor %}
-                </ul>
-        </div><!-- /.github_activity -->
-
-    github_activity is a list containing a list. The first element is the title
-    and the second element is the raw html from github
-"""
-
-from pelican import signals
-
-
-class GitHubActivity():
-    """
-        A class created to fetch github activity with feedparser
-    """
-    def __init__(self, generator):
-        try:
-            import feedparser
-            self.activities = feedparser.parse(
-                generator.settings['GITHUB_ACTIVITY_FEED'])
-        except ImportError:
-            raise Exception("Unable to find feedparser")
-
-    def fetch(self):
-        """
-            returns a list of html snippets fetched from github actitivy feed
-        """
-
-        entries = []
-        for activity in self.activities['entries']:
-            entries.append(
-                    [element for element in [activity['title'],
-                        activity['content'][0]['value']]])
-
-        return entries
-
-
-def fetch_github_activity(gen, metadata):
-    """
-        registered handler for the github activity plugin
-        it puts in generator.context the html needed to be displayed on a
-        template
-    """
-
-    if 'GITHUB_ACTIVITY_FEED' in gen.settings.keys():
-        gen.context['github_activity'] = gen.plugin_instance.fetch()
-
-
-def feed_parser_initialization(generator):
-    """
-        Initialization of feed parser
-    """
-
-    generator.plugin_instance = GitHubActivity(generator)
-
-
-def register():
-    """
-        Plugin registration
-    """
-    signals.article_generator_init.connect(feed_parser_initialization)
-    signals.article_generate_context.connect(fetch_github_activity)
diff --git a/pelican/plugins/global_license.py b/pelican/plugins/global_license.py
deleted file mode 100644
index 9a0f5206..00000000
--- a/pelican/plugins/global_license.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from pelican import signals
-
-"""
-License plugin for Pelican
-==========================
-
-This plugin allows you to define a LICENSE setting and adds the contents of that
-license variable to the article's context, making that variable available to use
-from within your theme's templates.
-
-Settings:
----------
-
-Define LICENSE in your settings file with the contents of your default license.
-
-"""
-
-def add_license(generator, metadata):
-    if 'license' not in metadata.keys()\
-        and 'LICENSE' in generator.settings.keys():
-            metadata['license'] = generator.settings['LICENSE']
-
-def register():
-    signals.article_generate_context.connect(add_license)
diff --git a/pelican/plugins/gravatar.py b/pelican/plugins/gravatar.py
deleted file mode 100644
index 2b8520df..00000000
--- a/pelican/plugins/gravatar.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import hashlib
-import six
-
-from pelican import signals
-"""
-Gravatar plugin for Pelican
-===========================
-
-This plugin assigns the ``author_gravatar`` variable to the Gravatar URL and
-makes the variable available within the article's context.
-
-Settings:
----------
-
-Add AUTHOR_EMAIL to your settings file to define the default author's email
-address. Obviously, that email address must be associated with a Gravatar
-account.
-
-Article metadata:
-------------------
-
-:email:  article's author email
-
-If one of them are defined, the author_gravatar variable is added to the
-article's context.
-"""
-
-def add_gravatar(generator, metadata):
-
-    #first check email
-    if 'email' not in metadata.keys()\
-        and 'AUTHOR_EMAIL' in generator.settings.keys():
-            metadata['email'] = generator.settings['AUTHOR_EMAIL']
-
-    #then add gravatar url
-    if 'email' in metadata.keys():
-        email_bytes = six.b(metadata['email']).lower()
-        gravatar_url = "http://www.gravatar.com/avatar/" + \
-                        hashlib.md5(email_bytes).hexdigest()
-        metadata["author_gravatar"] = gravatar_url
-
-
-def register():
-    signals.article_generate_context.connect(add_gravatar)
diff --git a/pelican/plugins/gzip_cache.py b/pelican/plugins/gzip_cache.py
deleted file mode 100644
index 9080629e..00000000
--- a/pelican/plugins/gzip_cache.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright (c) 2012 Matt Layman
-'''A plugin to create .gz cache files for optimization.'''
-
-import gzip
-import logging
-import os
-
-from pelican import signals
-
-logger = logging.getLogger(__name__)
-
-# A list of file types to exclude from possible compression
-EXCLUDE_TYPES = [
-    # Compressed types
-    '.bz2',
-    '.gz',
-
-    # Audio types
-    '.aac',
-    '.flac',
-    '.mp3',
-    '.wma',
-
-    # Image types
-    '.gif',
-    '.jpg',
-    '.jpeg',
-    '.png',
-
-    # Video types
-    '.avi',
-    '.mov',
-    '.mp4',
-]
-
-def create_gzip_cache(pelican):
-    '''Create a gzip cache file for every file that a webserver would
-    reasonably want to cache (e.g., text type files).
-
-    :param pelican: The Pelican instance
-    '''
-    for dirpath, _, filenames in os.walk(pelican.settings['OUTPUT_PATH']):
-        for name in filenames:
-            if should_compress(name):
-                filepath = os.path.join(dirpath, name)
-                create_gzip_file(filepath)
-
-def should_compress(filename):
-    '''Check if the filename is a type of file that should be compressed.
-
-    :param filename: A file name to check against
-    '''
-    for extension in EXCLUDE_TYPES:
-        if filename.endswith(extension):
-            return False
-
-    return True
-
-def create_gzip_file(filepath):
-    '''Create a gzipped file in the same directory with a filepath.gz name.
-
-    :param filepath: A file to compress
-    '''
-    compressed_path = filepath + '.gz'
-
-    with open(filepath, 'rb') as uncompressed:
-        try:
-            logger.debug('Compressing: %s' % filepath)
-            compressed = gzip.open(compressed_path, 'wb')
-            compressed.writelines(uncompressed)
-        except Exception as ex:
-            logger.critical('Gzip compression failed: %s' % ex)
-        finally:
-            compressed.close()
-
-def register():
-    signals.finalized.connect(create_gzip_cache)
-
diff --git a/pelican/plugins/html_rst_directive.py b/pelican/plugins/html_rst_directive.py
deleted file mode 100644
index 2b2bceb3..00000000
--- a/pelican/plugins/html_rst_directive.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-from docutils import nodes
-from docutils.parsers.rst import directives, Directive
-
-"""
-HTML tags for reStructuredText
-==============================
-
-Directives
-----------
-
-.. html::
-
-    (HTML code)
-
-
-Example
--------
-
-A search engine:
-
-.. html::
-   <form action="http://seeks.fr/search" method="GET">
-     <input type="text" value="Pelican v2" title="Search" maxlength="2048" name="q" autocomplete="on" />
-     <input type="hidden" name="lang" value="en" />
-     <input type="submit" value="Seeks !" id="search_button" />
-   </form>
-
-
-A contact form:
-
-.. html::
-
-    <form method="GET" action="mailto:some email">
-      <p>
-        <input type="text" placeholder="Subject" name="subject">
-        <br />
-        <textarea name="body" placeholder="Message">
-        </textarea>
-        <br />
-        <input type="reset"><input type="submit">
-      </p>
-    </form>
-
-"""
-
-
-class RawHtml(Directive):
-    required_arguments = 0
-    optional_arguments = 0
-    final_argument_whitespace = True
-    has_content = True
-
-    def run(self):
-        html = ' '.join(self.content)
-        node = nodes.raw('', html, format='html')
-        return [node]
-
-
-
-def register():
-    directives.register_directive('html', RawHtml)
-
diff --git a/pelican/plugins/initialized.py b/pelican/plugins/initialized.py
deleted file mode 100644
index b4b5ab76..00000000
--- a/pelican/plugins/initialized.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
-from pelican import signals
-
-def test(sender):
-    print("%s initialized !!" % sender)
-
-def register():
-    signals.initialized.connect(test)
diff --git a/pelican/plugins/related_posts.py b/pelican/plugins/related_posts.py
deleted file mode 100644
index 81999002..00000000
--- a/pelican/plugins/related_posts.py
+++ /dev/null
@@ -1,35 +0,0 @@
-"""
-Related posts plugin for Pelican
-================================
-
-Adds related_posts variable to article's context
-"""
-
-from pelican import signals
-from collections import Counter
-
-
-def add_related_posts(generator):
-    # get the max number of entries from settings
-    # or fall back to default (5)
-    numentries = generator.settings.get('RELATED_POSTS_MAX', 5)
-
-    for article in generator.articles:
-        # no tag, no relation
-        if not hasattr(article, 'tags'):
-            continue
-
-        # score = number of common tags
-        scores = Counter()
-        for tag in article.tags:
-            scores += Counter(generator.tags[tag])
-
-        # remove itself
-        scores.pop(article)
-
-        article.related_posts = [other for other, count 
-            in scores.most_common(numentries)]
-
-
-def register():
-    signals.article_generator_finalized.connect(add_related_posts)
\ No newline at end of file
diff --git a/pelican/plugins/sitemap.py b/pelican/plugins/sitemap.py
deleted file mode 100644
index 8043baad..00000000
--- a/pelican/plugins/sitemap.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import collections
-import os.path
-
-from datetime import datetime
-from logging import warning, info
-from codecs import open
-
-from pelican import signals, contents
-
-TXT_HEADER = """{0}/index.html
-{0}/archives.html
-{0}/tags.html
-{0}/categories.html
-"""
-
-XML_HEADER = """<?xml version="1.0" encoding="utf-8"?>
-<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
-xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-"""
-
-XML_URL = """
-<url>
-<loc>{0}/{1}</loc>
-<lastmod>{2}</lastmod>
-<changefreq>{3}</changefreq>
-<priority>{4}</priority>
-</url>
-"""
-
-XML_FOOTER = """
-</urlset>
-"""
-
-
-def format_date(date):
-    if date.tzinfo:
-        tz = date.strftime('%s')
-        tz = tz[:-2] + ':' + tz[-2:]
-    else:
-        tz = "-00:00"
-    return date.strftime("%Y-%m-%dT%H:%M:%S") + tz
-
-
-class SitemapGenerator(object):
-
-    def __init__(self, context, settings, path, theme, output_path, *null):
-
-        self.output_path = output_path
-        self.context = context
-        self.now = datetime.now()
-        self.siteurl = settings.get('SITEURL')
-
-        self.format = 'xml'
-
-        self.changefreqs = {
-            'articles': 'monthly',
-            'indexes': 'daily',
-            'pages': 'monthly'
-        }
-
-        self.priorities = {
-            'articles': 0.5,
-            'indexes': 0.5,
-            'pages': 0.5
-        }
-
-        config = settings.get('SITEMAP', {})
-
-        if not isinstance(config, dict):
-            warning("sitemap plugin: the SITEMAP setting must be a dict")
-        else:
-            fmt = config.get('format')
-            pris = config.get('priorities')
-            chfreqs = config.get('changefreqs')
-
-            if fmt not in ('xml', 'txt'):
-                warning("sitemap plugin: SITEMAP['format'] must be `txt' or `xml'")
-                warning("sitemap plugin: Setting SITEMAP['format'] on `xml'")
-            elif fmt == 'txt':
-                self.format = fmt
-                return
-
-            valid_keys = ('articles', 'indexes', 'pages')
-            valid_chfreqs = ('always', 'hourly', 'daily', 'weekly', 'monthly',
-                    'yearly', 'never')
-
-            if isinstance(pris, dict):
-                # We use items for Py3k compat. .iteritems() otherwise
-                for k, v in pris.items():
-                    if k in valid_keys and not isinstance(v, (int, float)):
-                        default = self.priorities[k]
-                        warning("sitemap plugin: priorities must be numbers")
-                        warning("sitemap plugin: setting SITEMAP['priorities']"
-                                "['{0}'] on {1}".format(k, default))
-                        pris[k] = default
-                self.priorities.update(pris)
-            elif pris is not None:
-                warning("sitemap plugin: SITEMAP['priorities'] must be a dict")
-                warning("sitemap plugin: using the default values")
-
-            if isinstance(chfreqs, dict):
-                # .items() for py3k compat.
-                for k, v in chfreqs.items():
-                    if k in valid_keys and v not in valid_chfreqs:
-                        default = self.changefreqs[k]
-                        warning("sitemap plugin: invalid changefreq `{0}'".format(v))
-                        warning("sitemap plugin: setting SITEMAP['changefreqs']"
-                                "['{0}'] on '{1}'".format(k, default))
-                        chfreqs[k] = default
-                self.changefreqs.update(chfreqs)
-            elif chfreqs is not None:
-                warning("sitemap plugin: SITEMAP['changefreqs'] must be a dict")
-                warning("sitemap plugin: using the default values")
-
-
-
-    def write_url(self, page, fd):
-
-        if getattr(page, 'status', 'published') != 'published':
-            return
-
-        page_path = os.path.join(self.output_path, page.url)
-        if not os.path.exists(page_path):
-            return
-
-        lastmod = format_date(getattr(page, 'date', self.now))
-
-        if isinstance(page, contents.Article):
-            pri = self.priorities['articles']
-            chfreq = self.changefreqs['articles']
-        elif isinstance(page, contents.Page):
-            pri = self.priorities['pages']
-            chfreq = self.changefreqs['pages']
-        else:
-            pri = self.priorities['indexes']
-            chfreq = self.changefreqs['indexes']
-
-
-        if self.format == 'xml':
-            fd.write(XML_URL.format(self.siteurl, page.url, lastmod, chfreq, pri))
-        else:
-            fd.write(self.siteurl + '/' + loc + '\n')
-
-
-    def generate_output(self, writer):
-        path = os.path.join(self.output_path, 'sitemap.{0}'.format(self.format))
-
-        pages = self.context['pages'] + self.context['articles'] \
-                + [ c for (c, a) in self.context['categories']] \
-                + [ t for (t, a) in self.context['tags']] \
-                + [ a for (a, b) in self.context['authors']]
-
-        for article in self.context['articles']:
-            pages += article.translations
-
-        info('writing {0}'.format(path))
-
-        with open(path, 'w', encoding='utf-8') as fd:
-
-            if self.format == 'xml':
-                fd.write(XML_HEADER)
-            else:
-                fd.write(TXT_HEADER.format(self.siteurl))
-
-            FakePage = collections.namedtuple('FakePage',
-                                              ['status',
-                                               'date',
-                                               'url'])
-
-            for standard_page_url in ['index.html',
-                                      'archives.html',
-                                      'tags.html',
-                                      'categories.html']:
-                fake = FakePage(status='published',
-                                date=self.now,
-                                url=standard_page_url)
-                self.write_url(fake, fd)
-
-            for page in pages:
-                self.write_url(page, fd)
-
-            if self.format == 'xml':
-                fd.write(XML_FOOTER)
-
-
-def get_generators(generators):
-    return SitemapGenerator
-
-
-def register():
-    signals.get_generators.connect(get_generators)
diff --git a/pelican/plugins/summary.py b/pelican/plugins/summary.py
deleted file mode 100644
index 6822353c..00000000
--- a/pelican/plugins/summary.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import types
-
-from pelican import signals
-
-def initialized(pelican):
-    from pelican.settings import _DEFAULT_CONFIG
-    _DEFAULT_CONFIG.setdefault('SUMMARY_BEGIN_MARKER',
-                               '<!-- PELICAN_BEGIN_SUMMARY -->')
-    _DEFAULT_CONFIG.setdefault('SUMMARY_END_MARKER',
-                               '<!-- PELICAN_END_SUMMARY -->')
-    if pelican:
-        pelican.settings.setdefault('SUMMARY_BEGIN_MARKER',
-                                    '<!-- PELICAN_BEGIN_SUMMARY -->')
-        pelican.settings.setdefault('SUMMARY_END_MARKER',
-                                    '<!-- PELICAN_END_SUMMARY -->')
-
-def content_object_init(instance):
-    # if summary is already specified, use it
-    if 'summary' in instance.metadata:
-        return
-
-    def _get_content(self):
-        content = self._content
-        if self.settings['SUMMARY_BEGIN_MARKER']:
-            content = content.replace(
-                self.settings['SUMMARY_BEGIN_MARKER'], '', 1)
-        if self.settings['SUMMARY_END_MARKER']:
-            content = content.replace(
-                self.settings['SUMMARY_END_MARKER'], '', 1)
-        return content
-    instance._get_content = types.MethodType(_get_content, instance)
-
-    # extract out our summary
-    if not hasattr(instance, '_summary') and instance._content is not None:
-        content = instance._content
-        begin_summary = -1
-        end_summary = -1
-        if instance.settings['SUMMARY_BEGIN_MARKER']:
-            begin_summary = content.find(instance.settings['SUMMARY_BEGIN_MARKER'])
-        if instance.settings['SUMMARY_END_MARKER']:
-            end_summary = content.find(instance.settings['SUMMARY_END_MARKER'])
-        if begin_summary != -1 or end_summary != -1:
-            # the beginning position has to take into account the length
-            # of the marker
-            begin_summary = (begin_summary +
-                            len(instance.settings['SUMMARY_BEGIN_MARKER'])
-                            if begin_summary != -1 else 0)
-            end_summary = end_summary if end_summary != -1 else None
-            instance._summary = content[begin_summary:end_summary]
-
-def register():
-    signals.initialized.connect(initialized)
-    signals.content_object_init.connect(content_object_init)
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
deleted file mode 100644
index 73a0fb7a..00000000
--- a/pelican/tests/test_plugins.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# -*- coding: utf-8 -*-
-'''Core plugins unit tests'''
-
-import os
-import tempfile
-
-from pelican.contents import Page
-from pelican.plugins import gzip_cache
-
-from pelican.tests.test_contents import TEST_CONTENT, TEST_SUMMARY
-from pelican.tests.support import unittest, temporary_folder
-
-
-class TestGzipCache(unittest.TestCase):
-
-    def test_should_compress(self):
-        # Some filetypes should compress and others shouldn't.
-        self.assertTrue(gzip_cache.should_compress('foo.html'))
-        self.assertTrue(gzip_cache.should_compress('bar.css'))
-        self.assertTrue(gzip_cache.should_compress('baz.js'))
-        self.assertTrue(gzip_cache.should_compress('foo.txt'))
-
-        self.assertFalse(gzip_cache.should_compress('foo.gz'))
-        self.assertFalse(gzip_cache.should_compress('bar.png'))
-        self.assertFalse(gzip_cache.should_compress('baz.mp3'))
-        self.assertFalse(gzip_cache.should_compress('foo.mov'))
-
-    def test_creates_gzip_file(self):
-        # A file matching the input filename with a .gz extension is created.
-
-        # The plugin walks over the output content after the finalized signal
-        # so it is safe to assume that the file exists (otherwise walk would
-        # not report it). Therefore, create a dummy file to use.
-        with temporary_folder() as tempdir:
-            _, a_html_filename = tempfile.mkstemp(suffix='.html', dir=tempdir)
-            gzip_cache.create_gzip_file(a_html_filename)
-            self.assertTrue(os.path.exists(a_html_filename + '.gz'))
-
-
-class TestSummary(unittest.TestCase):
-    def setUp(self):
-        super(TestSummary, self).setUp()
-
-        from pelican.plugins import summary
-
-        summary.register()
-        summary.initialized(None)
-        self.page_kwargs = {
-            'content': TEST_CONTENT,
-            'context': {
-                'localsiteurl': '',
-            },
-            'metadata': {
-                'summary': TEST_SUMMARY,
-                'title': 'foo bar',
-                'author': 'Blogger',
-            },
-        }
-
-    def _copy_page_kwargs(self):
-        # make a deep copy of page_kwargs
-        page_kwargs = dict([(key, self.page_kwargs[key]) for key in
-                            self.page_kwargs])
-        for key in page_kwargs:
-            if not isinstance(page_kwargs[key], dict):
-                break
-            page_kwargs[key] = dict([(subkey, page_kwargs[key][subkey])
-                                     for subkey in page_kwargs[key]])
-
-        return page_kwargs
-
-    def test_end_summary(self):
-        page_kwargs = self._copy_page_kwargs()
-        del page_kwargs['metadata']['summary']
-        page_kwargs['content'] = (
-            TEST_SUMMARY + '<!-- PELICAN_END_SUMMARY -->' + TEST_CONTENT)
-        page = Page(**page_kwargs)
-        # test both the summary and the marker removal
-        self.assertEqual(page.summary, TEST_SUMMARY)
-        self.assertEqual(page.content, TEST_SUMMARY + TEST_CONTENT)
-
-    def test_begin_summary(self):
-        page_kwargs = self._copy_page_kwargs()
-        del page_kwargs['metadata']['summary']
-        page_kwargs['content'] = (
-            'FOOBAR<!-- PELICAN_BEGIN_SUMMARY -->' + TEST_CONTENT)
-        page = Page(**page_kwargs)
-        # test both the summary and the marker removal
-        self.assertEqual(page.summary, TEST_CONTENT)
-        self.assertEqual(page.content, 'FOOBAR' + TEST_CONTENT)
-
-    def test_begin_end_summary(self):
-        page_kwargs = self._copy_page_kwargs()
-        del page_kwargs['metadata']['summary']
-        page_kwargs['content'] = (
-                'FOOBAR<!-- PELICAN_BEGIN_SUMMARY -->' + TEST_SUMMARY +
-                '<!-- PELICAN_END_SUMMARY -->' + TEST_CONTENT)
-        page = Page(**page_kwargs)
-        # test both the summary and the marker removal
-        self.assertEqual(page.summary, TEST_SUMMARY)
-        self.assertEqual(page.content, 'FOOBAR' + TEST_SUMMARY + TEST_CONTENT)
diff --git a/pelican/tests/test_webassets.py b/pelican/tests/test_webassets.py
deleted file mode 100644
index fe5d6309..00000000
--- a/pelican/tests/test_webassets.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-# from __future__ import unicode_literals
-
-import hashlib
-import locale
-import os
-from codecs import open
-from tempfile import mkdtemp
-from shutil import rmtree
-
-from pelican import Pelican
-from pelican.settings import read_settings
-from .support import unittest, skipIfNoExecutable, module_exists
-
-CUR_DIR = os.path.dirname(__file__)
-THEME_DIR = os.path.join(CUR_DIR, 'themes', 'assets')
-CSS_REF = open(os.path.join(THEME_DIR, 'static', 'css',
-                            'style.min.css')).read()
-CSS_HASH = hashlib.md5(CSS_REF).hexdigest()[0:8]
-
-
-@unittest.skipUnless(module_exists('webassets'), "webassets isn't installed")
-@skipIfNoExecutable(['scss', '-v'])
-@skipIfNoExecutable(['cssmin', '--version'])
-class TestWebAssets(unittest.TestCase):
-    """Base class for testing webassets."""
-
-    def setUp(self, override=None):
-        self.temp_path = mkdtemp(prefix='pelicantests.')
-        settings = {
-            'PATH': os.path.join(CUR_DIR, 'content', 'TestCategory'),
-            'OUTPUT_PATH': self.temp_path,
-            'PLUGINS': ['pelican.plugins.assets', ],
-            'THEME': THEME_DIR,
-            'LOCALE': locale.normalize('en_US'),
-        }
-        if override:
-            settings.update(override)
-
-        self.settings = read_settings(override=settings)
-        pelican = Pelican(settings=self.settings)
-        pelican.run()
-
-    def tearDown(self):
-        rmtree(self.temp_path)
-
-    def check_link_tag(self, css_file, html_file):
-        """Check the presence of `css_file` in `html_file`."""
-
-        link_tag = ('<link rel="stylesheet" href="{css_file}">'
-                    .format(css_file=css_file))
-        html = open(html_file).read()
-        self.assertRegexpMatches(html, link_tag)
-
-
-class TestWebAssetsRelativeURLS(TestWebAssets):
-    """Test pelican with relative urls."""
-
-    def setUp(self):
-        TestWebAssets.setUp(self, override={'RELATIVE_URLS': True})
-
-    def test_jinja2_ext(self):
-        # Test that the Jinja2 extension was correctly added.
-
-        from webassets.ext.jinja2 import AssetsExtension
-        self.assertIn(AssetsExtension, self.settings['JINJA_EXTENSIONS'])
-
-    def test_compilation(self):
-        # Compare the compiled css with the reference.
-
-        gen_file = os.path.join(self.temp_path, 'theme', 'gen',
-                                'style.{0}.min.css'.format(CSS_HASH))
-        self.assertTrue(os.path.isfile(gen_file))
-
-        css_new = open(gen_file).read()
-        self.assertEqual(css_new, CSS_REF)
-
-    def test_template(self):
-        # Look in the output files for the link tag.
-
-        css_file = './theme/gen/style.{0}.min.css'.format(CSS_HASH)
-        html_files = ['index.html', 'archives.html',
-                      'this-is-an-article-with-category.html']
-        for f in html_files:
-            self.check_link_tag(css_file, os.path.join(self.temp_path, f))
-
-        self.check_link_tag(
-            '../theme/gen/style.{0}.min.css'.format(CSS_HASH),
-            os.path.join(self.temp_path, 'category/yeah.html'))
-
-
-class TestWebAssetsAbsoluteURLS(TestWebAssets):
-    """Test pelican with absolute urls."""
-
-    def setUp(self):
-        TestWebAssets.setUp(self, override={'SITEURL': 'http://localhost'})
-
-    def test_absolute_url(self):
-        # Look in the output files for the link tag with absolute url.
-
-        css_file = ('http://localhost/theme/gen/style.{0}.min.css'
-                    .format(CSS_HASH))
-        html_files = ['index.html', 'archives.html',
-                      'this-is-an-article-with-category.html']
-        for f in html_files:
-            self.check_link_tag(css_file, os.path.join(self.temp_path, f))
diff --git a/pelican/tests/themes/assets/static/css/style.min.css b/pelican/tests/themes/assets/static/css/style.min.css
deleted file mode 100644
index daf9c3cb..00000000
--- a/pelican/tests/themes/assets/static/css/style.min.css
+++ /dev/null
@@ -1 +0,0 @@
-body{font:14px/1.5 "Droid Sans",sans-serif;background-color:#e4e4e4;color:#242424}a{color:red}a:hover{color:orange}
\ No newline at end of file
diff --git a/pelican/tests/themes/assets/static/css/style.scss b/pelican/tests/themes/assets/static/css/style.scss
deleted file mode 100644
index 10cd05be..00000000
--- a/pelican/tests/themes/assets/static/css/style.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- scss-compile-at-save: nil -*- */
-
-$baseFontFamily : "Droid Sans", sans-serif;
-$textColor      : #242424;
-$bodyBackground : #e4e4e4;
-
-body {
-  font: 14px/1.5 $baseFontFamily;
-  background-color: $bodyBackground;
-  color: $textColor;
-}
-
-a {
-  color: red;
-
-  &:hover {
-    color: orange;
-  }
-}
diff --git a/pelican/tests/themes/assets/templates/base.html b/pelican/tests/themes/assets/templates/base.html
deleted file mode 100644
index 05a32d06..00000000
--- a/pelican/tests/themes/assets/templates/base.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "!simple/base.html" %}
-
-{% block head %}
-  {% assets filters="scss,cssmin", output="gen/style.%(version)s.min.css", "css/style.scss" %}
-    <link rel="stylesheet" href="{{ SITEURL }}/{{ ASSET_URL }}">
-  {% endassets %}
-{% endblock %}
diff --git a/setup.py b/setup.py
index b2bc2a60..8f65f82e 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ setup(
     description="A tool to generate a static blog from reStructuredText or "
                 "Markdown input files.",
     long_description=README + '\n' + CHANGELOG,
-    packages=['pelican', 'pelican.tools', 'pelican.plugins'],
+    packages=['pelican', 'pelican.tools'],
     include_package_data=True,
     install_requires=requires,
     entry_points=entry_points,

From 091007ddf72a9e2724711d6d8b1309d81d8dafae Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 12 Apr 2013 21:47:54 -0700
Subject: [PATCH 1243/2864] Add contributors to THANKS. Minor language edits.

---
 THANKS | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/THANKS b/THANKS
index eeaf2309..6ef6ed20 100644
--- a/THANKS
+++ b/THANKS
@@ -1,10 +1,10 @@
-Pelican is a project by Alexis Métaireau <http://notmyidea.org> but there is
-a quite big number of people that contributed or implemented key features over
-time.  We try to keep this list up to date, but you can have a look at the nice
-graphs proposed by github about contributors here:
-https://github.com/getpelican/pelican/graphs/contributors
+Pelican is a project originally created by Alexis Métaireau
+<http://notmyidea.org/>, but there are a large number of people that have
+contributed or implemented key features over time. We do our best to keep this
+list up-to-date, but you can also have a look at the nice contributor graphs
+produced by GitHub: https://github.com/getpelican/pelican/graphs/contributors
 
-If you want to contibute, check the documentation section about how to do so
+If you want to contibute, check the documentation section about how to do so:
 <http://docs.getpelican.com/en/latest/contribute.html>
 
 Aaron Kavlie
@@ -38,6 +38,7 @@ Dana Woodman
 dave mankoff
 David Beitey
 David Marble
+Deniz Turgut (Avaris)
 derdon
 Dirkjan Ochtman
 Dirk Makowski
@@ -66,7 +67,6 @@ joe di castro
 Jökull Sólberg Auðunsson
 Joshua Adelman
 Julian Berman
-justinmayer
 Justin Mayer
 Kyle Fuller
 Laureline Guerin
@@ -105,6 +105,7 @@ Rory McCann
 saghul
 sam
 Samrat Man Singh
+Simon Conseil
 Simon Liedtke
 Skami18
 solsTiCe d'Hiver

From a4c16e1b532c4113a39e379520009a1ae89cd151 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sat, 13 Apr 2013 20:37:26 +0100
Subject: [PATCH 1244/2864] Warn user in case of missing title. Fixes #440.

When a WP XML file is imported, items with missing title are generated with a
title which is probably not the good one (instead of being dropped), and a
warning is displayed to the user.
---
 pelican/tools/pelican_import.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index a3bac84c..63baa6ba 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -14,10 +14,14 @@ import re
 import subprocess
 import sys
 import time
+import logging
 
 from codecs import open
 
 from pelican.utils import slugify
+from pelican.log import init
+
+logger = logging.getLogger(__name__)
 
 
 def decode_wp_content(content, br=True):
@@ -114,7 +118,8 @@ def wp2fields(xml):
                 # Use HTMLParser due to issues with BeautifulSoup 3
                 title = HTMLParser().unescape(item.title.contents[0])
             except IndexError:
-                continue
+                title = 'No title [%s]' % item.find('post_name').string
+                logger.warn('Post "%s" is lacking a proper title' % title)
 
             content = item.find('encoded').string
             filename = item.find('post_name').string
@@ -492,6 +497,8 @@ def main():
     elif input_type == 'feed':
         fields = feed2fields(args.input)
 
+    init() # init logging
+
     fields2pelican(fields, args.markup, args.output,
                    dircat=args.dircat or False,
                    strip_raw=args.strip_raw or False,

From bc4bd773a0374fd0d169d41666b6c16b67219474 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 13 Apr 2013 16:36:05 -0400
Subject: [PATCH 1245/2864] remove unittest2 and fix various warnings in py3

---
 .travis.yml                      |  5 ++---
 pelican/readers.py               | 17 +++++++++-------
 pelican/settings.py              | 28 ++++++++++++++++----------
 pelican/tests/support.py         |  6 +-----
 pelican/tests/test_generators.py | 14 ++++++-------
 pelican/tests/test_importer.py   | 12 ++++++++---
 pelican/tests/test_readers.py    | 34 ++++++++++++++++----------------
 pelican/tests/test_utils.py      | 14 ++++++-------
 pelican/tools/pelican_import.py  |  4 +++-
 pelican/utils.py                 |  3 ++-
 10 files changed, 76 insertions(+), 61 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 19cb7e89..608979c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,7 @@ before_install:
  - sudo apt-get install -qq --no-install-recommends asciidoc
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
-    - pip install nose mock --use-mirrors
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors unittest2; else pip install --use-mirrors unittest2py3k; fi
+    - pip install mock --use-mirrors
     - pip install . --use-mirrors
     - pip install --use-mirrors Markdown
-script: nosetests -s pelican
+script: python -m unittest discover
diff --git a/pelican/readers.py b/pelican/readers.py
index 6c23ce19..d075a039 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -22,8 +22,10 @@ try:
     asciidoc = True
 except ImportError:
     asciidoc = False
-
-import cgi
+try:
+    from html import escape
+except ImportError:
+    from cgi import escape
 try:
     from html.parser import HTMLParser
 except ImportError:
@@ -122,7 +124,8 @@ class RstReader(Reader):
 
     def _get_publisher(self, source_path):
         extra_params = {'initial_header_level': '2',
-                        'syntax_highlight': 'short'}
+                        'syntax_highlight': 'short',
+                        'input_encoding': 'utf-8'}
         pub = docutils.core.Publisher(
             destination_class=docutils.io.StringOutput)
         pub.set_components('standalone', 'restructuredtext', 'html')
@@ -229,7 +232,7 @@ class HTMLReader(Reader):
                 self._in_body = False
                 self._in_top_level = True
             elif self._in_body:
-                self._data_buffer += '</{}>'.format(cgi.escape(tag))
+                self._data_buffer += '</{}>'.format(escape(tag))
 
         def handle_startendtag(self, tag, attrs):
             if tag == 'meta' and self._in_head:
@@ -250,11 +253,11 @@ class HTMLReader(Reader):
             self._data_buffer += '&#{};'.format(data)
 
         def build_tag(self, tag, attrs, close_tag):
-            result = '<{}'.format(cgi.escape(tag))
+            result = '<{}'.format(escape(tag))
             for k, v in attrs:
-                result += ' ' + cgi.escape(k)
+                result += ' ' + escape(k)
                 if v is not None:
-                    result += '="{}"'.format(cgi.escape(v))
+                    result += '="{}"'.format(escape(v))
             if close_tag:
                 return result + ' />'
             return result + '>'
diff --git a/pelican/settings.py b/pelican/settings.py
index 319df7f8..9f853393 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -3,12 +3,20 @@ from __future__ import unicode_literals, print_function
 import six
 
 import copy
-import imp
 import inspect
 import os
 import locale
 import logging
 
+try:
+    # SourceFileLoader is the recommended way in 3.3+
+    from importlib.machinery import SourceFileLoader
+    load_source = lambda name, path: SourceFileLoader(name, path).load_module()
+except ImportError:
+    # but it does not exist in 3.2-, so fall back to imp
+    import imp
+    load_source = imp.load_source
+
 from os.path import isabs
 
 
@@ -130,7 +138,7 @@ def get_settings_from_file(path, default_settings=_DEFAULT_CONFIG):
     """Loads settings from a file path, returning a dict."""
 
     name, ext = os.path.splitext(os.path.basename(path))
-    module = imp.load_source(name, path)
+    module = load_source(name, path)
     return get_settings_from_module(module, default_settings=default_settings)
 
 
@@ -172,14 +180,14 @@ def configure_settings(settings):
         except locale.Error:
             pass
     else:
-        logger.warn("LOCALE option doesn't contain a correct value")
+        logger.warning("LOCALE option doesn't contain a correct value")
 
     if ('SITEURL' in settings):
         # If SITEURL has a trailing slash, remove it and provide a warning
         siteurl = settings['SITEURL']
         if (siteurl.endswith('/')):
             settings['SITEURL'] = siteurl[:-1]
-            logger.warn("Removed extraneous trailing slash from SITEURL.")
+            logger.warning("Removed extraneous trailing slash from SITEURL.")
         # If SITEURL is defined but FEED_DOMAIN isn't,
         # set FEED_DOMAIN to SITEURL
         if not 'FEED_DOMAIN' in settings:
@@ -195,24 +203,24 @@ def configure_settings(settings):
 
     if any(settings.get(k) for k in feed_keys):
         if not settings.get('FEED_DOMAIN'):
-            logger.warn(
+            logger.warning(
                 "Since feed URLs should always be absolute, you should specify"
                 " FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = "
                 "http://www.example.com')")
 
         if not settings.get('SITEURL'):
-            logger.warn('Feeds generated without SITEURL set properly may not'
+            logger.warning('Feeds generated without SITEURL set properly may not'
                         ' be valid')
 
     if not 'TIMEZONE' in settings:
-        logger.warn(
+        logger.warning(
             'No timezone information specified in the settings. Assuming'
             ' your timezone is UTC for feed generation. Check '
             'http://docs.notmyidea.org/alexis/pelican/settings.html#timezone '
             'for more information')
 
     if 'LESS_GENERATOR' in settings:
-        logger.warn(
+        logger.warning(
             'The LESS_GENERATOR setting has been removed in favor '
             'of the Webassets plugin')
 
@@ -221,7 +229,7 @@ def configure_settings(settings):
                           six.string_types):
             settings['OUTPUT_SOURCES_EXTENSION'] = (
                     _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
-            logger.warn(
+            logger.warning(
                 'Detected misconfiguration with OUTPUT_SOURCES_EXTENSION, '
                 'falling back to the default extension ' +
                 _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
@@ -252,7 +260,7 @@ def configure_settings(settings):
             'THEME_STATIC_PATHS',)
     for PATH_KEY in filter(lambda k: k in settings, path_keys):
             if isinstance(settings[PATH_KEY], six.string_types):
-                logger.warn("Detected misconfiguration with %s setting (must "
+                logger.warning("Detected misconfiguration with %s setting (must "
                         "be a list), falling back to the default"
                         % PATH_KEY)
                 settings[PATH_KEY] = _DEFAULT_CONFIG[PATH_KEY]
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index b81e6eff..d7466c63 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -9,6 +9,7 @@ import sys
 from six import StringIO
 import logging
 from logging.handlers import BufferingHandler
+import unittest
 
 from functools import wraps
 from contextlib import contextmanager
@@ -18,11 +19,6 @@ from shutil import rmtree
 from pelican.contents import Article
 from pelican.settings import _DEFAULT_CONFIG
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 
 @contextmanager
 def temporary_folder():
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 43c9058d..c2a5cc67 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -91,7 +91,7 @@ class TestArticlesGenerator(unittest.TestCase):
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定', 'published', '指導書', 'article']
         ]
-        self.assertItemsEqual(articles_expected, articles)
+        self.assertEqual(sorted(articles_expected), sorted(articles))
 
     def test_generate_categories(self):
 
@@ -99,7 +99,7 @@ class TestArticlesGenerator(unittest.TestCase):
         categories = [cat.name for cat, _ in generator.categories]
         categories_expected = ['Default', 'TestCategory', 'Yeah', 'test',
                                'yeah', '指導書']
-        self.assertEquals(categories, categories_expected)
+        self.assertEqual(categories, categories_expected)
 
     def test_do_not_use_folder_as_category(self):
 
@@ -115,7 +115,7 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_context()
 
         categories = [cat.name for cat, _ in generator.categories]
-        self.assertEquals(categories, ['Default', 'Yeah', 'test', 'yeah', '指導書'])
+        self.assertEqual(categories, ['Default', 'Yeah', 'test', 'yeah', '指導書'])
 
     def test_direct_templates_save_as_default(self):
 
@@ -172,7 +172,7 @@ class TestArticlesGenerator(unittest.TestCase):
 class TestPageGenerator(unittest.TestCase):
     # Note: Every time you want to test for a new field; Make sure the test
     # pages in "TestPages" have all the fields Add it to distilled in
-    # distill_pages Then update the assertItemsEqual in test_generate_context
+    # distill_pages Then update the assertEqual in test_generate_context
     # to match expected
 
     def distill_pages(self, pages):
@@ -211,8 +211,8 @@ class TestPageGenerator(unittest.TestCase):
              'custom']
         ]
 
-        self.assertItemsEqual(pages_expected, pages)
-        self.assertItemsEqual(hidden_pages_expected, hidden_pages)
+        self.assertEqual(sorted(pages_expected), sorted(pages))
+        self.assertEqual(sorted(hidden_pages_expected), sorted(hidden_pages))
 
 
 class TestTemplatePagesGenerator(unittest.TestCase):
@@ -256,4 +256,4 @@ class TestTemplatePagesGenerator(unittest.TestCase):
 
         # output content is correct
         with open(output_path, 'r') as output_file:
-            self.assertEquals(output_file.read(), 'foo: bar')
+            self.assertEqual(output_file.read(), 'foo: bar')
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 61424774..c18f447f 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -36,7 +36,9 @@ class TestWordpressXmlImporter(unittest.TestCase):
             self.assertTrue(title.strip())
 
     def test_can_toggle_raw_html_code_parsing(self):
-        r = lambda f: open(f).read()
+        def r(f):
+            with open(f) as infile:
+                return infile.read()
         silent_f2p = mute(True)(fields2pelican)
 
         with temporary_folder() as temp:
@@ -76,7 +78,9 @@ class TestWordpressXmlImporter(unittest.TestCase):
                 self.assertEqual(decode_wp_content(encoded_content, br=False), decoded_content)
 
     def test_preserve_verbatim_formatting(self):
-        r = lambda f: open(f).read()
+        def r(f):
+            with open(f) as infile:
+                return infile.read()
         silent_f2p = mute(True)(fields2pelican)
         test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)
         with temporary_folder() as temp:
@@ -89,7 +93,9 @@ class TestWordpressXmlImporter(unittest.TestCase):
             self.assertTrue(for_line.rindex('for') < print_line.rindex('print'))
 
     def test_code_in_list(self):
-        r = lambda f: open(f).read()
+        def r(f):
+            with open(f) as infile:
+                return infile.read()
         silent_f2p = mute(True)(fields2pelican)
         test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)
         with temporary_folder() as temp:
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 9c644541..49fe0c81 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -33,7 +33,7 @@ class RstReaderTest(unittest.TestCase):
         }
 
         for key, value in expected.items():
-            self.assertEquals(value, metadata[key], key)
+            self.assertEqual(value, metadata[key], key)
 
     def test_article_with_filename_metadata(self):
         content, metadata = readers.read_file(
@@ -45,7 +45,7 @@ class RstReaderTest(unittest.TestCase):
             'title': 'Rst with filename metadata',
         }
         for key, value in metadata.items():
-            self.assertEquals(value, expected[key], key)
+            self.assertEqual(value, expected[key], key)
 
         content, metadata = readers.read_file(
                 _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
@@ -59,7 +59,7 @@ class RstReaderTest(unittest.TestCase):
             'date': datetime.datetime(2012, 11, 29),
         }
         for key, value in metadata.items():
-            self.assertEquals(value, expected[key], key)
+            self.assertEqual(value, expected[key], key)
 
         content, metadata = readers.read_file(
                 _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
@@ -77,7 +77,7 @@ class RstReaderTest(unittest.TestCase):
             'mymeta': 'foo',
         }
         for key, value in metadata.items():
-            self.assertEquals(value, expected[key], key)
+            self.assertEqual(value, expected[key], key)
 
     def test_article_metadata_key_lowercase(self):
         # Keys of metadata should be lowercase.
@@ -86,7 +86,7 @@ class RstReaderTest(unittest.TestCase):
                 _path('article_with_uppercase_metadata.rst'))
 
         self.assertIn('category', metadata, 'Key should be lowercase.')
-        self.assertEquals('Yeah', metadata.get('category'),
+        self.assertEqual('Yeah', metadata.get('category'),
                           'Value keeps case.')
 
     def test_typogrify(self):
@@ -129,7 +129,7 @@ class MdReaderTest(unittest.TestCase):
             'tags': ['foo', 'bar', 'foobar'],
         }
         for key, value in metadata.items():
-            self.assertEquals(value, expected[key], key)
+            self.assertEqual(value, expected[key], key)
 
         content, metadata = reader.read(
             _path('article_with_markdown_and_nonascii_summary.md'))
@@ -142,7 +142,7 @@ class MdReaderTest(unittest.TestCase):
             'slug': 'python-virtualenv-on-mac-osx-mountain-lion-10.8',
         }
         for key, value in metadata.items():
-            self.assertEquals(value, expected[key], key)
+            self.assertEqual(value, expected[key], key)
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_file_extensions(self):
@@ -203,7 +203,7 @@ class MdReaderTest(unittest.TestCase):
             'author': 'Alexis Métaireau',
         }
         for key, value in expected.items():
-            self.assertEquals(value, metadata[key], key)
+            self.assertEqual(value, metadata[key], key)
 
         content, metadata = readers.read_file(
                 _path('2012-11-30_md_w_filename_meta#foo-bar.md'),
@@ -216,7 +216,7 @@ class MdReaderTest(unittest.TestCase):
             'date': datetime.datetime(2012, 11, 30),
         }
         for key, value in expected.items():
-            self.assertEquals(value, metadata[key], key)
+            self.assertEqual(value, metadata[key], key)
 
         content, metadata = readers.read_file(
                 _path('2012-11-30_md_w_filename_meta#foo-bar.md'),
@@ -233,7 +233,7 @@ class MdReaderTest(unittest.TestCase):
             'mymeta': 'foo',
         }
         for key, value in expected.items():
-            self.assertEquals(value, metadata[key], key)
+            self.assertEqual(value, metadata[key], key)
 
 
 class AdReaderTest(unittest.TestCase):
@@ -258,7 +258,7 @@ class AdReaderTest(unittest.TestCase):
         }
 
         for key, value in expected.items():
-            self.assertEquals(value, metadata[key], key)
+            self.assertEqual(value, metadata[key], key)
 
         expected = {
             'category': 'Blog',
@@ -269,7 +269,7 @@ class AdReaderTest(unittest.TestCase):
         }
 
         for key, value in expected.items():
-            self.assertEquals(value, metadata[key], key)
+            self.assertEqual(value, metadata[key], key)
 
     @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
     def test_article_with_asc_options(self):
@@ -289,7 +289,7 @@ class HTMLReaderTest(unittest.TestCase):
         reader = readers.HTMLReader({})
         content, metadata = reader.read(_path('article_with_comments.html'))
 
-        self.assertEquals('''
+        self.assertEqual('''
         Body content
         <!--  This comment is included (including extra whitespace)   -->
     ''', content)
@@ -302,7 +302,7 @@ class HTMLReaderTest(unittest.TestCase):
         }
 
         for key, value in expected.items():
-            self.assertEquals(value, metadata[key], key)
+            self.assertEqual(value, metadata[key], key)
 
     def test_article_with_metadata(self):
         reader = readers.HTMLReader({})
@@ -318,14 +318,14 @@ class HTMLReaderTest(unittest.TestCase):
         }
 
         for key, value in expected.items():
-            self.assertEquals(value, metadata[key], key)
+            self.assertEqual(value, metadata[key], key)
 
     def test_article_with_null_attributes(self):
         reader = readers.HTMLReader({})
         content, metadata = reader.read(
                 _path('article_with_null_attributes.html'))
 
-        self.assertEquals('''
+        self.assertEqual('''
         Ensure that empty attributes are copied properly.
         <input name="test" disabled style="" />
     ''', content)
@@ -336,5 +336,5 @@ class HTMLReaderTest(unittest.TestCase):
         content, metadata = reader.read(
                 _path('article_with_uppercase_metadata.html'))
         self.assertIn('category', metadata, 'Key should be lowercase.')
-        self.assertEquals('Yeah', metadata.get('category'),
+        self.assertEqual('Yeah', metadata.get('category'),
                           'Value keeps cases.')
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 9865b10b..f5e530f3 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -22,7 +22,7 @@ class TestUtils(LoggedTestCase):
 
     def test_deprecated_attribute(self):
         value = self._old_attribute
-        self.assertEquals(value, self._new_attribute)
+        self.assertEqual(value, self._new_attribute)
         self.assertLogCountEqual(
             count=1,
             msg=('_old_attribute has been deprecated since 3.1.0 and will be '
@@ -48,7 +48,7 @@ class TestUtils(LoggedTestCase):
                  '2012-11-22 22:11:10': date_hour_sec}
 
         for value, expected in dates.items():
-            self.assertEquals(utils.get_date(value), expected, value)
+            self.assertEqual(utils.get_date(value), expected, value)
 
         # invalid ones
         invalid_dates = ('2010-110-12', 'yay')
@@ -67,7 +67,7 @@ class TestUtils(LoggedTestCase):
                     'da-fan-yuan-fa-4hao-ji-18ri-ye-qi-dong-he'),)
 
         for value, expected in samples:
-            self.assertEquals(utils.slugify(value), expected)
+            self.assertEqual(utils.slugify(value), expected)
 
     def test_get_relative_path(self):
 
@@ -81,7 +81,7 @@ class TestUtils(LoggedTestCase):
                    ('/test.html', os.curdir),)
 
         for value, expected in samples:
-            self.assertEquals(utils.get_relative_path(value), expected)
+            self.assertEqual(utils.get_relative_path(value), expected)
 
     def test_process_translations(self):
         # create a bunch of articles
@@ -132,15 +132,15 @@ class TestUtils(LoggedTestCase):
         dirname = os.path.join(os.path.dirname(__file__), 'content')
         path = os.path.join(dirname, 'article_with_metadata.rst')
         changed = utils.files_changed(dirname, 'rst')
-        self.assertEquals(changed, True)
+        self.assertEqual(changed, True)
 
         changed = utils.files_changed(dirname, 'rst')
-        self.assertEquals(changed, False)
+        self.assertEqual(changed, False)
 
         t = time.time()
         os.utime(path, (t, t))
         changed = utils.files_changed(dirname, 'rst')
-        self.assertEquals(changed, True)
+        self.assertEqual(changed, True)
         self.assertAlmostEqual(utils.LAST_MTIME, t, delta=1)
 
         empty_path = os.path.join(os.path.dirname(__file__), 'empty')
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index a3bac84c..31db20be 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -102,7 +102,9 @@ def wp2fields(xml):
                  '"BeautifulSoup4" and "lxml" required to import Wordpress XML files.')
         sys.exit(error)
 
-    xmlfile = open(xml, encoding='utf-8').read()
+
+    with open(xml, encoding='utf-8') as infile:
+        xmlfile = infile.read()
     soup = BeautifulSoup(xmlfile, "xml")
     items = soup.rss.channel.findAll('item')
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 73abd358..7e7b9ccb 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -192,7 +192,8 @@ class pelican_open(object):
         self.filename = filename
 
     def __enter__(self):
-        content = open(self.filename, encoding='utf-8').read()
+        with open(self.filename, encoding='utf-8') as infile:
+            content = infile.read()
         if content[0] == BOM_UTF8.decode('utf8'):
             content = content[1:]
         return content

From 68921fe94d307cfb8c80d8f3292d9f8464260794 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 13 Apr 2013 17:07:48 -0400
Subject: [PATCH 1246/2864] remove warning for FEED_DOMAIN when SITEURL
 undefined

---
 pelican/settings.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 9f853393..989644fc 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -202,12 +202,6 @@ def configure_settings(settings):
                 ]
 
     if any(settings.get(k) for k in feed_keys):
-        if not settings.get('FEED_DOMAIN'):
-            logger.warning(
-                "Since feed URLs should always be absolute, you should specify"
-                " FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = "
-                "http://www.example.com')")
-
         if not settings.get('SITEURL'):
             logger.warning('Feeds generated without SITEURL set properly may not'
                         ' be valid')

From 40643ce5545805727ef4853d22640ad4b7efc115 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sat, 13 Apr 2013 22:56:45 +0200
Subject: [PATCH 1247/2864] Cleanup tox and remove mentions of webassets.

Nose and unittest2 have been removed from pelican's dependencies, and webassets
moved to pelican-plugins.
---
 README.rst     |  2 --
 docs/index.rst |  2 --
 tox.ini        | 26 ++++----------------------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/README.rst b/README.rst
index d158cdfa..20c3f217 100644
--- a/README.rst
+++ b/README.rst
@@ -27,7 +27,6 @@ Pelican currently supports:
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
-* Asset management with `webassets`_ (optional)
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
@@ -67,4 +66,3 @@ client handy, use the webchat_ for quick feedback.
 .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
 .. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
 .. _contribute: http://docs.getpelican.com/en/latest/contribute.html
-.. _webassets: https://github.com/miracle2k/webassets
diff --git a/docs/index.rst b/docs/index.rst
index ebe1ace6..e45118e5 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -23,7 +23,6 @@ Pelican currently supports:
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
-* Asset management with `webassets`_ (optional)
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
@@ -80,4 +79,3 @@ A French version of the documentation is available at :doc:`fr/index`.
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
 .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
 .. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
-.. _webassets: https://github.com/miracle2k/webassets
diff --git a/tox.ini b/tox.ini
index 3058542b..fe32d48f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@
 #
 # Now we must tell tox about this package, otherwise tox would load the old
 # libraries from PyPi.
-# 
+#
 # Run tox from the libraries source tree. It will save its package in
 # the distshare directory from where the tests here will pick it up.
 #
@@ -15,19 +15,11 @@
 # and typogrify:
 # https://github.com/dmdm/typogrify/tree/py3k
 #
-# and webassets:
-# https://github.com/dmdm/webassets/tree/py3k
-#
-#
 # CAVEAT:
 # -------
 #
-# 1/
-# Please be aware that my ports of typogrify and webassets are just 2to3'd.
-# They are not backwards compatible with Python 2.
-#
-# 2/
-# Webassets still has unresolved issues, so I deactivated it for Py32 tests.
+# Please be aware that my port of typogrify is just 2to3'd.
+# It is not backwards compatible with Python 2.
 
 
 [tox]
@@ -35,41 +27,31 @@ envlist = py27,py32,py33
 
 [testenv]
 commands =
-    unit2 discover []
-    nosetests -s pelican
+    python -m unittest discover
 deps =
 
 [testenv:py27]
 deps =
-    nose
-    unittest2
     mock
     Markdown
     BeautifulSoup4
     feedgenerator
     typogrify
-    webassets
 
 [testenv:py32]
 deps =
-    nose
-    unittest2py3k
     mock
     Markdown
     BeautifulSoup4
     feedgenerator
 #    {distshare}/smartypants-1.6.0.3.zip
 #    {distshare}/typogrify-2.0.0.zip
-#    {distshare}/webassets-0.8.dev.zip
 
 [testenv:py33]
 deps =
-    nose
-    unittest2py3k
     mock
     Markdown
     BeautifulSoup4
     feedgenerator
 #    {distshare}/smartypants-1.6.0.3.zip
 #    {distshare}/typogrify-2.0.0.zip
-#    {distshare}/webassets-0.8.dev.zip

From a6167f64f169b721fd44dfae763925f4e7aa0c3a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 13 Apr 2013 16:55:13 -0700
Subject: [PATCH 1248/2864] Add CONTRIBUTING file; include in contribute.rst

GitHub recently added a feature that looks for a CONTRIBUTING file in
repo root and displays it whenever a user creates an issue or submits a
pull request. I took this opportunity to put some contribution
submission guidelines into that file, including it dynamically inside
our existing docs/contribute.rst file to eliminate unnecessary
redundancy.
---
 CONTRIBUTING.rst    |  37 ++++++++++++++
 docs/contribute.rst | 116 ++++++++++++++++++++++++++------------------
 2 files changed, 106 insertions(+), 47 deletions(-)
 create mode 100644 CONTRIBUTING.rst

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
new file mode 100644
index 00000000..310f79b3
--- /dev/null
+++ b/CONTRIBUTING.rst
@@ -0,0 +1,37 @@
+Contribution submission guidelines
+==================================
+
+* Consider whether your new feature might be better suited as a
+  :doc:`plugin<plugins>`. Folks are usually available in the
+  `#pelican IRC channel`_ to help make that determination.
+* `Create a new git branch`_ specific to your change (as opposed to making
+  your commits in the master branch).
+* **Don't put multiple fixes/features in the same branch / pull request.**
+  For example, if you're hacking on a new feature and find a bugfix that
+  doesn't *require* your new feature, **make a new distinct branch and pull
+  request** for the bugfix.
+* Adhere to PEP8 coding standards whenever possible.
+* Check for unnecessary whitespace via ``git diff --check`` before committing.
+* **Add docs and tests for your changes**.
+* **Run all the tests on both Python 2.7+ and 3.2+** to ensure nothing was
+  accidentally broken.
+* First line of your commit message should start with present-tense verb, be 50
+  characters or less, and include the relevant issue number(s) if applicable.
+  *Example:* ``Ensure proper PLUGIN_PATH behavior. Refs #428.`` If the commit
+  *completely fixes* an existing bug report, please use ``Fixes #585`` or ``Fix
+  #585`` syntax (so the relevant issue is automatically closed upon PR merge).
+* After the first line of the commit message, add two returns and then a more
+  detailed explanation (when relevant).
+* **Use** ``hub pull-request`` when submitting code for a **pre-existing GitHub
+  Issue**. This isn't an absolute requirement, but makes the maintainers' lives
+  much easier! Specifically: `install hub
+  <https://github.com/defunkt/hub/#installation>`_ and then run `hub
+  pull-request <https://github.com/defunkt/hub/#git-pull-request>`_ to turn the
+  issue into a pull request containing your code.
+
+Check out our `Git Tips`_ page or ask on the `#pelican IRC channel`_ if you
+need assistance or have any questions about these guidelines.
+
+.. _`#pelican IRC channel`: http://webchat.freenode.net/?channels=pelican&uio=d4
+.. _`Create a new git branch`: https://github.com/getpelican/pelican/wiki/Git-Tips#making-your-changes
+.. _`Git Tips`: https://github.com/getpelican/pelican/wiki/Git-Tips
diff --git a/docs/contribute.rst b/docs/contribute.rst
index e53fabf5..b50532bd 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -1,29 +1,34 @@
-How to contribute?
-###################
-There are many ways to contribute to Pelican. You can enhance the
-documentation, add missing features, and fix bugs (or just report them).
+How to contribute
+#################
 
-Don't hesitate to fork and make a pull request on GitHub. When doing so, please
-create a new feature branch as opposed to making your commits in the master
-branch.
+There are many ways to contribute to Pelican. You can improve the
+documentation, add missing features, and fix bugs (or just report them). You
+can also help out by reviewing and commenting on
+`existing issues <https://github.com/getpelican/pelican/issues>`_.
+
+Don't hesitate to fork Pelican and submit a pull request on GitHub. When doing
+so, please adhere to the following guidelines.
+
+.. include:: ../CONTRIBUTING.rst
 
 Setting up the development environment
 ======================================
 
-You're free to set up your development environment any way you like. Here is a
-way using the `virtualenv <http://www.virtualenv.org/>`_ and `virtualenvwrapper
-<http://www.doughellmann.com/projects/virtualenvwrapper/>`_ tools. If you don't
-have them, you can install these both of these packages via::
+While there are many ways to set up one's development environment, following
+is a method that uses `virtualenv <http://www.virtualenv.org/>`_. If you don't
+have ``virtualenv`` installed, you can install it via::
 
-    $ pip install virtualenvwrapper
+    $ pip install virtualenv
 
 Virtual environments allow you to work on Python projects which are isolated
 from one another so you can use different packages (and package versions) with
 different projects.
 
-To create a virtual environment, use the following syntax::
+To create and activate a virtual environment, use the following syntax::
 
-    $ mkvirtualenv pelican
+    $ virtualenv pelican ~/virtualenvs/pelican
+    $ cd ~/virtualenvs/pelican
+    $ . bin/activate
 
 To clone the Pelican source::
 
@@ -38,59 +43,76 @@ To install Pelican and its dependencies::
 
     $ python setup.py develop
 
+Coding standards
+================
+
+Try to respect what is described in the `PEP8 specification
+<http://www.python.org/dev/peps/pep-0008/>`_ when making contributions. This
+can be eased via the `pep8 <http://pypi.python.org/pypi/pep8>`_ or `flake8
+<http://pypi.python.org/pypi/flake8/>`_ tools, the latter of which in
+particular will give you some useful hints about ways in which the
+code/formatting can be improved.
+
+Building the docs
+=================
+
+If you make changes to the documentation, you should preview your changes
+before committing them::
+
+    $ pip install sphinx
+    $ cd src/pelican/docs
+    $ make html
+
+Open ``_build/html/index.html`` in your browser to preview the documentation.
+
 Running the test suite
 ======================
 
 Each time you add a feature, there are two things to do regarding tests:
-checking that the existing tests pass, and adding tests for the new feature
+check that the existing tests pass, and add tests for the new feature
 or bugfix.
 
-The tests live in "pelican/tests" and you can run them using the
-"discover" feature of unittest2::
+The tests live in ``pelican/tests`` and you can run them using the
+"discover" feature of ``unittest``::
 
-    $ unit2 discover
+    $ python -m unittest discover
 
-If you have made changes that affect the output of a Pelican-generated weblog,
-then you should update the output used by functional tests.
-To do so, you can use the following two commands::
+After making your changes and running the tests, you may see a test failure
+mentioning that "some generated files differ from the expected functional tests
+output." If you have made changes that affect the HTML output generated by
+Pelican, and the changes to that output are expected and deemed correct given
+the nature of your changes, then you should update the output used by the
+functional tests. To do so, you can use the following two commands::
 
     $ pelican -o pelican/tests/output/custom/ -s samples/pelican.conf.py \
         samples/content/
     $ pelican -o pelican/tests/output/basic/ samples/content/
 
-testing for python3
--------------------
+Testing on Python 3.x
+---------------------
 
-On Python 3, if you have installed the Py3k compatible versions of the
-plugins manual testing with ``unit2 discover`` is also straightforward.
+Testing on Python 3.x currently requires some extra steps: installing
+Python 3.x-compatible versions of dependent packages and plugins.
 
-However, you must tell tox to use those Py3k libraries. If you forget this,
-tox will pull the regular packages from PyPi and the tests will fail.
+However, you must tell ``tox`` to use those Python 3.x-compatible libraries.
+If you forget this, ``tox`` will pull the regular packages from PyPI, and the
+tests will fail.
 
-Tell tox about the local packages thusly: enter the source directory of
-smartypants and run tox there. Do this again for typogrify and webassets.
-Smartypants and typogrify do not have real tests, and webassets will fail
-noisily, but as a result we get these libraries neatly packaged in tox's
-distshare directory. And this we need to run tox for Pelican.
+Tell ``tox`` about the local packages thusly: enter the source directory of
+smartypants and run ``tox`` there. Do this again for the ``typogrify`` and
+``webassets`` packages. SmartyPants and Typogrify do not have real tests, and
+``webassets`` will fail noisily, but as a result we get these libraries neatly
+packaged in tox's ``distshare`` directory, which we need in order to run
+``tox`` for Pelican.
 
-Coding standards
-================
+Python 3.x development tips
+===========================
 
-Try to respect what is described in the `PEP8 specification
-<http://www.python.org/dev/peps/pep-0008/>`_ when providing patches. This can be
-eased via the `pep8 <http://pypi.python.org/pypi/pep8>`_ or `flake8
-<http://pypi.python.org/pypi/flake8/>`_ tools, the latter of which in
-particular will give you some useful hints about ways in which the
-code/formatting can be improved.
+Here are some tips that may be useful when doing some code for both Python 2.7
+and Python 3.x at the same time:
 
-Python3 support
-===============
+- Assume every string and literal is unicode (import unicode_literals):
 
-Here are some tips that may be useful when doing some code for both python2 and
-python3 at the same time:
-
-- Assume, every string and literal is unicode (import unicode_literals):
- 
   - Do not use prefix ``u'``.
   - Do not encode/decode strings in the middle of sth. Follow the code to the
     source (or target) of a string and encode/decode at the first/last possible

From b2aabdc02ba98111cad0229a1af645a49e0e5f97 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sun, 14 Apr 2013 09:48:20 +0100
Subject: [PATCH 1249/2864] Do not generate invalid filenames. Fixes #814.

Turn invalid characters into underscores, remove leading dots and enforce
a maximum length. Should be fine on main file systems used by Windows, Mac OS
and Linux.
Thanks to @Avaris for helping to clean my code.
---
 pelican/tools/pelican_import.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 420c3fba..9e477c2c 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -376,6 +376,15 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
 
         filename = os.path.basename(filename)
 
+        # Enforce filename restrictions for various filesystems at once; see
+        # http://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
+        # we do not need to filter words because an extension will be appended
+        filename = re.sub(r'[<>:"/\\|?*^% ]', '-', filename) # invalid chars
+        filename = filename.lstrip('.') # should not start with a dot
+        if not filename:
+            filename = '_'
+        filename = filename[:249] # allow for 5 extra characters
+
         # option to put files in directories with categories names
         if dircat and (len(categories) > 0):
             catname = slugify(categories[0])

From a2a3f5a393c487810a01976148a47acfc6f232d5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 14 Apr 2013 07:57:13 -0700
Subject: [PATCH 1250/2864] Minor improvements to contributing guidelines

---
 CONTRIBUTING.rst | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 310f79b3..41c38cc7 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,9 +1,9 @@
 Contribution submission guidelines
 ==================================
 
-* Consider whether your new feature might be better suited as a
-  :doc:`plugin<plugins>`. Folks are usually available in the
-  `#pelican IRC channel`_ to help make that determination.
+* Consider whether your new feature might be better suited as a plugin_. Folks
+  are usually available in the `#pelican IRC channel`_ if help is needed to
+  make that determination.
 * `Create a new git branch`_ specific to your change (as opposed to making
   your commits in the master branch).
 * **Don't put multiple fixes/features in the same branch / pull request.**
@@ -13,25 +13,28 @@ Contribution submission guidelines
 * Adhere to PEP8 coding standards whenever possible.
 * Check for unnecessary whitespace via ``git diff --check`` before committing.
 * **Add docs and tests for your changes**.
-* **Run all the tests on both Python 2.7+ and 3.2+** to ensure nothing was
+* `Run all the tests`_ **on both Python 2.7+ and 3.2+** to ensure nothing was
   accidentally broken.
 * First line of your commit message should start with present-tense verb, be 50
   characters or less, and include the relevant issue number(s) if applicable.
   *Example:* ``Ensure proper PLUGIN_PATH behavior. Refs #428.`` If the commit
   *completely fixes* an existing bug report, please use ``Fixes #585`` or ``Fix
   #585`` syntax (so the relevant issue is automatically closed upon PR merge).
-* After the first line of the commit message, add two returns and then a more
+* After the first line of the commit message, add a blank line and then a more
   detailed explanation (when relevant).
-* **Use** ``hub pull-request`` when submitting code for a **pre-existing GitHub
-  Issue**. This isn't an absolute requirement, but makes the maintainers' lives
-  much easier! Specifically: `install hub
-  <https://github.com/defunkt/hub/#installation>`_ and then run `hub
-  pull-request <https://github.com/defunkt/hub/#git-pull-request>`_ to turn the
-  issue into a pull request containing your code.
+* If you have previously filed a GitHub issue and want to contribute code that
+  addresses that issue, **please use** ``hub pull-request`` instead of using
+  GitHub's web UI to submit the pull request. This isn't an absolute
+  requirement, but makes the maintainers' lives much easier! Specifically:
+  `install hub <https://github.com/defunkt/hub/#installation>`_ and then run
+  `hub pull-request <https://github.com/defunkt/hub/#git-pull-request>`_ to
+  turn your GitHub issue into a pull request containing your code.
 
 Check out our `Git Tips`_ page or ask on the `#pelican IRC channel`_ if you
 need assistance or have any questions about these guidelines.
 
+.. _`plugin`: http://docs.getpelican.com/en/latest/plugins.html
 .. _`#pelican IRC channel`: http://webchat.freenode.net/?channels=pelican&uio=d4
 .. _`Create a new git branch`: https://github.com/getpelican/pelican/wiki/Git-Tips#making-your-changes
+.. _`Run all the tests`: http://docs.getpelican.com/en/latest/contribute.html#running-the-test-suite
 .. _`Git Tips`: https://github.com/getpelican/pelican/wiki/Git-Tips

From ebee8e9b438f4dcea2e3d336bbe870f08bb8bceb Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 14 Apr 2013 09:41:27 -0700
Subject: [PATCH 1251/2864] Update FAQ and changelog

---
 docs/changelog.rst | 13 +++++++--
 docs/faq.rst       | 73 ++++++++++++++++++++++++++++------------------
 2 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 51f1a0ff..2549504a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,10 +5,17 @@ Release history
 ================
 
 * Support for Python 3!
-* Ensure exceptions are raised if they take place during processing
-  with autoreload enabled with debug enabled.
+* Override page save-to location from meta-data (enables using a static page as
+  the site's home page, for example)
+* Time period archives (per-year, per-month, and per-day archives of posts)
+* Posterous blog import
+* Improve WordPress blog import
+* Migrate plugins to separate repository
+* Improve HTML parser
 * Provide ability to show or hide categories from menu using
-  ``DISPLAY_CATEGORIES_ON_MENU`` option.
+  ``DISPLAY_CATEGORIES_ON_MENU`` option
+* Auto-regeneration can be told to ignore files via ``IGNORE_FILES`` setting
+* Document-relative URL generation (``RELATIVE_URLS``) is now off by default
 
 3.1 (2012-12-04)
 ================
diff --git a/docs/faq.rst b/docs/faq.rst
index d083ee7d..5df8c502 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -12,7 +12,7 @@ Those who don't have an IRC client handy can jump in immediately via
 `IRC webchat <http://webchat.freenode.net/?channels=pelican&uio=d4>`_. Because
 of differing time zones, you may not get an immediate response to your question,
 but please be patient and stay logged into IRC — someone will almost always
-respond.
+respond if you wait long enough (it may take a few hours).
 
 If you are unable to resolve your issue or if you have a feature request, please
 refer to the `issue tracker <https://github.com/getpelican/pelican/issues>`_.
@@ -20,9 +20,11 @@ refer to the `issue tracker <https://github.com/getpelican/pelican/issues>`_.
 How can I help?
 ================
 
-There are several ways to help out. First, you can use Pelican and report any
+There are several ways to help out. First, you can report any Pelican
 suggestions or problems you might have via IRC or the `issue tracker
-<https://github.com/getpelican/pelican/issues>`_.
+<https://github.com/getpelican/pelican/issues>`_. If submitting an issue
+report, please check the existing issue list first in order to avoid submitting
+a duplicate issue.
 
 If you want to contribute, please fork `the git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make
@@ -35,7 +37,7 @@ You can also contribute by creating themes and improving the documentation.
 Is it mandatory to have a configuration file?
 =============================================
 
-No, it's not. Configuration files are just an easy way to configure Pelican.
+Configuration files are optional and are just an easy way to configure Pelican.
 For basic operations, it's possible to specify options while invoking Pelican
 via the command line. See ``pelican --help`` for more information.
 
@@ -58,14 +60,14 @@ I want to use Markdown, but I got an error.
 ===========================================
 
 Markdown is not a hard dependency for Pelican, so you will need to explicitly
-install it. You can do so by typing the following, including ``sudo`` if
-required::
+install it. You can do so by typing the following command, prepending ``sudo``
+if permissions require it::
 
-    (sudo) pip install markdown
+    pip install markdown
 
-If you don't have pip installed, consider installing the pip installer via::
+If you don't have ``pip`` installed, consider installing it via::
 
-    (sudo) easy_install pip
+    easy_install pip
 
 Can I use arbitrary meta-data in my templates?
 ==============================================
@@ -84,20 +86,24 @@ That meta-data can then be accessed in the template::
 How do I assign custom templates on a per-page basis?
 =====================================================
 
-It's as simple as adding an extra line of metadata to any pages or articles you
-want to have its own template.
+It's as simple as adding an extra line of meta-data to any pages or articles
+you want to have its own template. For example, this is how it would be handled
+for content in reST format::
 
     :template: template_name
 
+For content in Markdown format::
+
+    Template: template_name
+
 Then just make sure your theme contains the relevant template file (e.g.
 ``template_name.html``).
 
-How can I override the generated url of a specific page or article?
+How can I override the generated URL of a specific page or article?
 ===================================================================
 
-It's as simple as specifying the ``url`` and ``save_as`` special metadata to
-any pages or articles you want to override the generated url.
-Here is an example rst page::
+Include ``url`` and ``save_as`` meta-data in any pages or articles that you want
+to override the generated URL. Here is an example page in reST format::
 
     Override url/save_as page
     #########################
@@ -105,18 +111,32 @@ Here is an example rst page::
     :url: override/url/
     :save_as: override/url/index.html
 
-You're done, the page will be written to ``override/url/index.html``
+With this meta-data, the page will be written to ``override/url/index.html``
 and Pelican will use url ``override/url/`` to link to this page.
 
+How can I use a static page as my home page?
+============================================
+
+The override feature mentioned above can be used to specify a static page as
+your home page. The following Markdown example could be stored in
+``content/pages/home.md``::
+
+    Title: Welcome to My Site
+    URL: /
+    save_as: index.html
+
+    Thank you for visiting. Welcome!
+
 What if I want to disable feed generation?
 ==========================================
 
-To disable all feed generation, all feed settings should be set to ``None``.
-All but two feed settings already default to ``None``, so if you want to disable
-all feed generation, you only need to specify the following settings::
+To disable feed generation, all feed settings should be set to ``None``.
+All but three feed settings already default to ``None``, so if you want to
+disable all feed generation, you only need to specify the following settings::
 
     FEED_ALL_ATOM = None
     CATEGORY_FEED_ATOM = None
+    TRANSLATION_FEED_ATOM = None
 
 Please note that ``None`` and ``''`` are not the same thing. The word ``None``
 should not be surrounded by quotes.
@@ -124,23 +144,20 @@ should not be surrounded by quotes.
 I'm getting a warning about feeds generated without SITEURL being set properly
 ==============================================================================
 
-`RSS and Atom feeds require all URLs and links in them to be absolute
+`RSS and Atom feeds require all URL links to be absolute
 <http://validator.w3.org/feed/docs/rss2.html#comments>`_.
-In order to properly generate all URLs properly in Pelican you will need to set
-``SITEURL`` to the full path of your blog. When using ``make html`` and the
-default Makefile provided by the `pelican-quickstart` bootstrap script to test
-build your site, it's normal to see this warning since ``SITEURL`` is
-deliberately left undefined. If configured properly no other ``make`` commands
-should result in this warning.
+In order to properly generate links in Pelican you will need to set ``SITEURL``
+to the full path of your site.
 
-Feeds are still generated when this warning is displayed but may not validate.
+Feeds are still generated when this warning is displayed, but links within may
+be malformed and thus the feed may not validate.
 
 My feeds are broken since I upgraded to Pelican 3.x
 ===================================================
 
 Starting in 3.0, some of the FEED setting names were changed to more explicitly
 refer to the Atom feeds they inherently represent (much like the FEED_RSS
-setting names). Here is an exact list of the renamed setting names::
+setting names). Here is an exact list of the renamed settings::
 
     FEED -> FEED_ATOM
     TAG_FEED -> TAG_FEED_ATOM

From 73ca6a1316688342af1e2bbae729c4200f3ab224 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sun, 14 Apr 2013 15:55:18 +0100
Subject: [PATCH 1252/2864] Add non unique slug warnings for translations

---
 pelican/utils.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 7e7b9ccb..11a08917 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -418,15 +418,22 @@ def process_translations(content_list):
         if not default_lang_items:
             default_lang_items = items
 
+        # display warnings if several items have the same lang
+        for lang, lang_items in groupby(items, attrgetter('lang')):
+            lang_items = list(lang_items)
+            len_ = len(lang_items)
+            if len_ > 1:
+                logger.warning('There are %s variants of "%s" with lang %s' \
+                        % (len_, slug, lang))
+                for x in lang_items:
+                    logger.warning('    %s' % x.source_path)
+
         # find items with default language
         default_lang_items = list(filter(attrgetter('in_default_lang'),
                 default_lang_items))
-        len_ = len(default_lang_items)
-        if len_ > 1:
-            logger.warning('there are %s variants of "%s"' % (len_, slug))
-            for x in default_lang_items:
-                logger.warning('    {}'.format(x.source_path))
-        elif len_ == 0:
+
+        # if there is no article with default language, take an other one
+        if not default_lang_items:
             default_lang_items = items[:1]
 
         if not slug:

From ff7410ce2ada85b486a67ae11874d60d135ff939 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sun, 14 Apr 2013 15:56:39 +0100
Subject: [PATCH 1253/2864] Check URL overwrite. Fixes #446.

Check that template-generated files don't overwrite each other. Log a critical
message otherwise, and exit with non-zero status.
---
 pelican/writers.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index c762bbe4..f848d498 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -21,6 +21,7 @@ class Writer(object):
         self.output_path = output_path
         self.reminder = dict()
         self.settings = settings or {}
+        self._written_files = set()
 
     def _create_new_feed(self, feed_type, context):
         feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
@@ -46,6 +47,16 @@ class Writer(object):
             pubdate=set_date_tzinfo(item.date,
                 self.settings.get('TIMEZONE', None)))
 
+    def _open_w(self, filename, encoding):
+        """Open a file to write some content to it.
+
+        Exit if we have already written to that file.
+        """
+        if filename in self._written_files:
+            raise IOError('File %s is to be overwritten' % filename)
+        self._written_files.add(filename)
+        return open(filename, 'w', encoding=encoding)
+
     def write_feed(self, elements, context, path=None, feed_type='atom'):
         """Generate a feed with the list of articles provided
 
@@ -82,7 +93,7 @@ class Writer(object):
                     pass
 
                 encoding = 'utf-8' if six.PY3 else None
-                with open(complete_path, 'w', encoding=encoding) as fp:
+                with self._open_w(complete_path, encoding) as fp:
                     feed.write(fp, 'utf-8')
                     logger.info('writing %s' % complete_path)
             return feed
@@ -121,7 +132,7 @@ class Writer(object):
                 os.makedirs(os.path.dirname(path))
             except Exception:
                 pass
-            with open(path, 'w', encoding='utf-8') as f:
+            with self._open_w(path, 'utf-8') as f:
                 f.write(output)
             logger.info('writing {}'.format(path))
 

From a3e8a2d18dc3ae07fc91891511e2def1de6dfd26 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 14 Apr 2013 17:03:19 -0400
Subject: [PATCH 1254/2864] __import__ fails for unicode 'fromlist' in Py2.x

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 7072f484..707fa8f0 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -66,7 +66,7 @@ class Pelican(object):
             if isinstance(plugin, six.string_types):
                 logger.debug("Loading plugin `{0}`".format(plugin))
                 try:
-                    plugin = __import__(plugin, globals(), locals(), 'module')
+                    plugin = __import__(plugin, globals(), locals(), str('module'))
                 except ImportError as e:
                     logger.error("Can't find plugin `{0}`: {1}".format(plugin, e))
                     continue

From ec8e257fde383cfa2387b8af1b254ac69ae1d7b5 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sun, 14 Apr 2013 19:34:05 +0100
Subject: [PATCH 1255/2864] Output sources for translations as well.

---
 pelican/generators.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index 02412440..7ce1e28b 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -669,3 +669,5 @@ class SourceFileGenerator(Generator):
         logger.info(' Generating source files...')
         for obj in chain(self.context['articles'], self.context['pages']):
             self._create_source(obj)
+            for obj_trans in obj.translations:
+                self._create_source(obj_trans)

From 7b0165696e5077ccf84b2b89bc38d93152fc0fc1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 14 Apr 2013 15:04:38 -0700
Subject: [PATCH 1256/2864] Clarify docs regarding pages. Fixes #847.

---
 docs/getting_started.rst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 4b2d3b4a..8437ef6e 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -274,10 +274,11 @@ Pages
 -----
 
 If you create a folder named ``pages`` inside the content folder, all the
-files in it will be used to generate static pages.
+files in it will be used to generate static pages, such as **About** or
+**Contact** pages. (See example filesystem layout below.)
 
-Then, use the ``DISPLAY_PAGES_ON_MENU`` setting to add all those pages to
-the primary navigation menu.
+You can use the ``DISPLAY_PAGES_ON_MENU`` setting to control whether all those
+pages are displayed in the primary navigation menu. (Default is ``True``.)
 
 If you want to exclude any pages from being linked to or listed in the menu
 then add a ``status: hidden`` attribute to its metadata. This is useful for
@@ -299,8 +300,9 @@ following syntax: ``|filename|path/to/file``::
     website/
     ├── content
     │   ├── article1.rst
-    │   └── cat/
-    │       └── article2.md
+    │   ├── cat/
+    │   │   └── article2.md
+    │   └── pages
     └── pelican.conf.py
 
 In this example, ``article1.rst`` could look like::

From 8be7c0dbae5bd094379d74fd47acb41a56f18afd Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 16 Apr 2013 10:13:47 -0700
Subject: [PATCH 1257/2864] Minor documentation improvements

---
 docs/contribute.rst |  2 +-
 docs/faq.rst        | 24 ++++++++++++------------
 docs/importer.rst   |  5 +++--
 docs/index.rst      | 12 ++++++------
 docs/plugins.rst    | 11 +++++------
 docs/settings.rst   |  8 ++++----
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index b50532bd..ffdda986 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -26,7 +26,7 @@ different projects.
 
 To create and activate a virtual environment, use the following syntax::
 
-    $ virtualenv pelican ~/virtualenvs/pelican
+    $ virtualenv ~/virtualenvs/pelican
     $ cd ~/virtualenvs/pelican
     $ . bin/activate
 
diff --git a/docs/faq.rst b/docs/faq.rst
index 5df8c502..02486947 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -10,11 +10,11 @@ If you have a problem, question, or suggestion, please start by striking up a
 conversation on `#pelican on Freenode <irc://irc.freenode.net/pelican>`_.
 Those who don't have an IRC client handy can jump in immediately via
 `IRC webchat <http://webchat.freenode.net/?channels=pelican&uio=d4>`_. Because
-of differing time zones, you may not get an immediate response to your question,
-but please be patient and stay logged into IRC — someone will almost always
-respond if you wait long enough (it may take a few hours).
+of differing time zones, you may not get an immediate response to your
+question, but please be patient and stay logged into IRC — someone will almost
+always respond if you wait long enough (it may take a few hours).
 
-If you are unable to resolve your issue or if you have a feature request, please
+If you're unable to resolve your issue or if you have a feature request, please
 refer to the `issue tracker <https://github.com/getpelican/pelican/issues>`_.
 
 How can I help?
@@ -28,9 +28,9 @@ a duplicate issue.
 
 If you want to contribute, please fork `the git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make
-your changes, and issue a pull request. Someone will review your changes as soon
-as possible. Please refer to the :doc:`How to Contribute <contribute>` section
-for more details.
+your changes, and issue a pull request. Someone will review your changes as
+soon as possible. Please refer to the :doc:`How to Contribute <contribute>`
+section for more details.
 
 You can also contribute by creating themes and improving the documentation.
 
@@ -69,7 +69,7 @@ If you don't have ``pip`` installed, consider installing it via::
 
     easy_install pip
 
-Can I use arbitrary meta-data in my templates?
+Can I use arbitrary metadata in my templates?
 ==============================================
 
 Yes. For example, to include a modified date in a Markdown post, one could
@@ -77,7 +77,7 @@ include the following at the top of the article::
 
     Modified: 2012-08-08
 
-That meta-data can then be accessed in the template::
+That metadata can then be accessed in the template::
 
     {% if article.modified %}
     Last modified: {{ article.modified }}
@@ -86,7 +86,7 @@ That meta-data can then be accessed in the template::
 How do I assign custom templates on a per-page basis?
 =====================================================
 
-It's as simple as adding an extra line of meta-data to any pages or articles
+It's as simple as adding an extra line of metadata to any page or article that
 you want to have its own template. For example, this is how it would be handled
 for content in reST format::
 
@@ -102,7 +102,7 @@ Then just make sure your theme contains the relevant template file (e.g.
 How can I override the generated URL of a specific page or article?
 ===================================================================
 
-Include ``url`` and ``save_as`` meta-data in any pages or articles that you want
+Include ``url`` and ``save_as`` metadata in any pages or articles that you want
 to override the generated URL. Here is an example page in reST format::
 
     Override url/save_as page
@@ -111,7 +111,7 @@ to override the generated URL. Here is an example page in reST format::
     :url: override/url/
     :save_as: override/url/index.html
 
-With this meta-data, the page will be written to ``override/url/index.html``
+With this metadata, the page will be written to ``override/url/index.html``
 and Pelican will use url ``override/url/`` to link to this page.
 
 How can I use a static page as my home page?
diff --git a/docs/importer.rst b/docs/importer.rst
index ea3335ba..bb24b4b9 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -9,7 +9,7 @@ Description
 ===========
 
 ``pelican-import`` is a command-line tool for converting articles from other
-software to ReStructuredText or Markdown. The supported import formats are:
+software to reStructuredText or Markdown. The supported import formats are:
 
 - WordPress XML export
 - Dotclear export
@@ -24,7 +24,7 @@ not be converted (as Pelican also supports Markdown).
 Dependencies
 ============
 
-``pelican-import`` has some dependencies not required by the rest of pelican:
+``pelican-import`` has some dependencies not required by the rest of Pelican:
 
 - *BeautifulSoup*, for WordPress and Dotclear import. Can be installed like
   any other Python package (``pip install BeautifulSoup``).
@@ -95,6 +95,7 @@ for Posterous::
 
     $ pelican-import --posterous -o ~/output --email=<email_address> --password=<password> <api_token>
 
+
 Tests
 =====
 
diff --git a/docs/index.rst b/docs/index.rst
index e45118e5..eceb407f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,10 +3,10 @@ Pelican
 
 Pelican is a static site generator, written in Python_.
 
-* Write your weblog entries directly with your editor of choice (vim!)
-  in reStructuredText_, Markdown_, or AsciiDoc_
-* Includes a simple CLI tool to (re)generate the weblog
-* Easy to interface with DVCSes and web hooks
+* Write your content directly with your editor of choice (vim!)
+  in reStructuredText_, Markdown_, or AsciiDoc_ formats
+* Includes a simple CLI tool to (re)generate your site
+* Easy to interface with distributed version control systems and web hooks
 * Completely static output is easy to host anywhere
 
 Features
@@ -14,15 +14,15 @@ Features
 
 Pelican currently supports:
 
-* Blog articles and pages
+* Articles (e.g., blog posts) and pages (e.g., "About", "Projects", "Contact")
 * Comments, via an external service (Disqus). (Please note that while
   useful, Disqus is an external service, and thus the comment data will be
   somewhat outside of your control and potentially subject to data loss.)
 * Theming support (themes are created using Jinja2_ templates)
-* PDF generation of the articles/pages (optional)
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
+* PDF generation of the articles/pages (optional)
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 21a962e2..aa43a750 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -30,13 +30,14 @@ the settings file::
 Where to find plugins
 =====================
 
-We maintain a separate repository of plugins for people to share and use. 
-Please see the `pelican-plugins`_ repository for the official place for plugins.
+We maintain a separate repository of plugins for people to share and use.
+Please visit the `pelican-plugins`_ repository for a list of available plugins.
 
 .. _pelican-plugins: https://github.com/getpelican/pelican-plugins
 
-Please note that while we will give best effort, the submitted plugins are all 
-community driven and supported.
+Please note that while we do our best to review and maintain these plugins,
+they are submitted by the Pelican community and thus may have varying levels of
+support and interoperability.
 
 How to create plugins
 =====================
@@ -56,8 +57,6 @@ which you map the signals to your plugin logic. Let's take a simple example::
     def register():
         signals.initialized.connect(test)
 
-
-
 List of signals
 ===============
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 83348228..e11b5a1d 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -269,10 +269,10 @@ Have a look at `the wikipedia page`_ to get a list of valid timezone values.
 Date format and locale
 ----------------------
 
-If no DATE_FORMATS is set, fall back to DEFAULT_DATE_FORMAT. If you need to
-maintain multiple languages with different date formats, you can set this dict
-using language name (``lang`` in your posts) as key. Regarding available format
-codes, see `strftime document of python`_ :
+If no DATE_FORMATS are set, Pelican will fall back to DEFAULT_DATE_FORMAT. If
+you need to maintain multiple languages with different date formats, you can
+set this dict using the language name (``lang`` metadata in your post content)
+as the key. Regarding available format codes, see `strftime document of python`_ :
 
 .. parsed-literal::
 

From 48f7132ba829e8151c9e7c59341df628658b14a5 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 16 Apr 2013 20:53:27 -0400
Subject: [PATCH 1258/2864] refactored utils.strftime

---
 pelican/tests/support.py    | 13 ++++++
 pelican/tests/test_utils.py | 66 ++++++++++++++++++++++++++++-
 pelican/utils.py            | 82 ++++++++++++++++++-------------------
 3 files changed, 117 insertions(+), 44 deletions(-)

diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index d7466c63..c02a3e34 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -10,6 +10,7 @@ from six import StringIO
 import logging
 from logging.handlers import BufferingHandler
 import unittest
+import locale
 
 from functools import wraps
 from contextlib import contextmanager
@@ -148,6 +149,18 @@ def module_exists(module_name):
         return True
 
 
+def locale_available(locale_):
+    old_locale = locale.setlocale(locale.LC_TIME)
+
+    try:
+        locale.setlocale(locale.LC_TIME, str(locale_))
+    except locale.Error:
+        return False
+    else:
+        locale.setlocale(locale.LC_TIME, old_locale)
+        return True
+
+
 def get_settings():
     settings = _DEFAULT_CONFIG.copy()
     settings['DIRECT_TEMPLATES'] = ['archives']
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index f5e530f3..768bbc44 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -5,9 +5,11 @@ import shutil
 import os
 import datetime
 import time
+import locale
+from sys import platform
 
 from pelican import utils
-from .support import get_article, LoggedTestCase
+from .support import get_article, LoggedTestCase, locale_available, unittest
 from pelican.utils import NoFilesError
 
 
@@ -179,3 +181,65 @@ class TestUtils(LoggedTestCase):
         f.close()
         utils.clean_output_dir(test_directory)
         self.assertTrue(not os.path.exists(test_directory))
+
+    def test_strftime(self):
+        d = datetime.date(2012, 8, 29)
+
+        # simple formatting
+        self.assertEqual(utils.strftime(d, '%d/%m/%y'), '29/08/12')
+        self.assertEqual(utils.strftime(d, '%d/%m/%Y'), '29/08/2012')
+
+        # % escaped
+        self.assertEqual(utils.strftime(d, '%d%%%m%%%y'), '29%08%12')
+        self.assertEqual(utils.strftime(d, '%d %% %m %% %y'), '29 % 08 % 12')
+        # not valid % formatter
+        self.assertEqual(utils.strftime(d, '10% reduction in %Y'),
+                         '10% reduction in 2012')
+        self.assertEqual(utils.strftime(d, '%10 reduction in %Y'),
+                         '%10 reduction in 2012')
+
+        # with text
+        self.assertEqual(utils.strftime(d, 'Published in %d-%m-%Y'),
+                         'Published in 29-08-2012')
+
+        # with non-ascii text
+        self.assertEqual(utils.strftime(d, '%d/%m/%Y Øl trinken beim Besäufnis'),
+                         '29/08/2012 Øl trinken beim Besäufnis')
+
+
+    # test the output of utils.strftime in a different locale
+    # right now, this uses Turkish locale
+    # why Turkish? because I know Turkish :). And it produces non-ascii output
+    # Feel free to extend with different locales
+    @unittest.skipUnless(locale_available('tr_TR') or
+                         locale_available('Turkish'),
+                         'Turkish locale needed')
+    def test_strftime_locale_dependent(self):
+        # store current locale
+        old_locale = locale.setlocale(locale.LC_TIME)
+
+        if platform == 'win32':
+            locale.setlocale(locale.LC_TIME, str('Turkish'))
+        else:
+            locale.setlocale(locale.LC_TIME, str('tr_TR'))
+
+        d = datetime.date(2012, 8, 29)
+
+        # simple
+        self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 Ağustos 2012')
+        self.assertEqual(utils.strftime(d, '%d %b %Y'), '29 Ağu 2012')
+        self.assertEqual(utils.strftime(d, '%a, %d %b %Y'),
+                         'Çrş, 29 Ağu 2012')
+        self.assertEqual(utils.strftime(d, '%A, %d %B %Y'),
+                         'Çarşamba, 29 Ağustos 2012')
+
+        # with text
+        self.assertEqual(utils.strftime(d, 'Yayınlanma tarihi: %A, %d %B %Y'),
+            'Yayınlanma tarihi: Çarşamba, 29 Ağustos 2012')
+
+        # non-ascii format candidate (someone might pass it... for some reason)
+        self.assertEqual(utils.strftime(d, '%Y yılında %üretim artışı'),
+            '2012 yılında %üretim artışı')
+
+        # restore locale back
+        locale.setlocale(locale.LC_TIME, old_locale)
diff --git a/pelican/utils.py b/pelican/utils.py
index 7e7b9ccb..2519bdf6 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -24,54 +24,50 @@ logger = logging.getLogger(__name__)
 
 
 def strftime(date, date_format):
-    """
-    Replacement for the builtin strftime().
+    '''
+    Replacement for built-in strftime
 
-    This :func:`strftime()` is compatible to Python 2 and 3. In both cases,
-    input and output is always unicode.
+    This is necessary because of the way Py2 handles date format strings.
+    Specifically, Py2 strftime takes a bytestring. In the case of text output
+    (e.g. %b, %a, etc), the output is encoded with an encoding defined by
+    locale.LC_TIME. Things get messy if the formatting string has chars that
+    are not valid in LC_TIME defined encoding.
 
-    Still, Python 3's :func:`strftime()` seems to somehow "normalize" unicode
-    chars in the format string. So if e.g. your format string contains 'ø' or
-    'ä', the result will be 'o' and 'a'.
+    This works by 'grabbing' possible format strings (those starting with %),
+    formatting them with the date, (if necessary) decoding the output and
+    replacing formatted output back.
+    '''
 
-    See here for an `extensive testcase
-    <https://github.com/dmdm/test_strftime>`_.
+    # grab candidate format options
+    format_options = '%+.?'
+    candidates = re.findall(format_options, date_format)
 
-    :param date: Any object that sports a :meth:`strftime()` method.
-    :param date_format: Format string, can always be unicode.
-    :returns: Unicode string with formatted date.
-    """
-    # As tehkonst confirmed, above mentioned testcase runs correctly on
-    # Python 2 and 3 on Windows as well. Thanks.
-    if six.PY3:
-        # It could be so easy... *sigh*
-        return date.strftime(date_format)
-        # TODO Perhaps we should refactor again, so that the
-        # xmlcharrefreplace-regex-dance is always done, regardless
-        # of the Python version.
-    else:
-        # We must ensure that the format string is an encoded byte
-        # string, ASCII only WTF!!!
-        # But with "xmlcharrefreplace" our formatted date will produce
-        # *yuck* like this:
-        #        "Øl trinken beim Besäufnis"
-        #    --> "&#216;l trinken beim Bes&#228;ufnis"
-        date_format = date_format.encode('ascii',
-            errors="xmlcharrefreplace")
-        result = date.strftime(date_format)
-        # strftime() returns an encoded byte string
-        # which we must decode into unicode.
-        lang_code, enc = locale.getlocale(locale.LC_ALL)
-        if enc:
-            result = result.decode(enc)
+    # replace candidates with placeholders for later % formatting
+    template = re.sub(format_options, '%s', date_format)
+
+    # we need to convert formatted dates back to unicode in Py2
+    # LC_TIME determines the encoding for built-in strftime outputs
+    lang_code, enc = locale.getlocale(locale.LC_TIME)
+
+    formatted_candidates = []
+    for candidate in candidates:
+        try:
+            # a valid format string should be ascii
+            candidate.encode('ascii')
+        except UnicodeEncodeError:
+            # if it fails, it's not a valid format option
+            # put the candidate back as it was
+            formatted = candidate
         else:
-            result = unicode(result)
-        # Convert XML character references back to unicode characters.
-        if "&#" in result:
-            result = re.sub(r'&#(?P<num>\d+);',
-                            lambda m: unichr(int(m.group('num'))),
-                            result)
-        return result
+            # if it's ascii, pass it to strftime to format
+            formatted = date.strftime(candidate)
+            # convert Py2 result to unicode
+            if not six.PY3 and enc is not None:
+                formatted = formatted.decode(enc)
+        formatted_candidates.append(formatted)
+
+    # put formatted candidates back and return
+    return template % tuple(formatted_candidates)
 
 
 def python_2_unicode_compatible(klass):

From bef5e4479e95cbef617536e0df2ba03a1319af33 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 16 Apr 2013 19:45:46 -0700
Subject: [PATCH 1259/2864] Getting Started documentation overhaul

---
 docs/getting_started.rst | 242 ++++++++++++++++++++-------------------
 1 file changed, 126 insertions(+), 116 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 8437ef6e..350cfb69 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -14,7 +14,8 @@ You can install Pelican via several different methods. The simplest is via
 
     $ pip install pelican
 
-If you don't have ``pip`` installed, an alternative method is ``easy_install``::
+If you don't have ``pip`` installed, an alternative method is
+``easy_install``::
 
     $ easy_install pelican
 
@@ -22,18 +23,16 @@ If you don't have ``pip`` installed, an alternative method is ``easy_install``::
 commands with ``sudo`` in order to install Pelican system-wide.)
 
 While the above is the simplest method, the recommended approach is to create
-a virtual environment for Pelican via virtualenv_ and virtualenvwrapper_ before
-installing Pelican. Assuming you've followed the virtualenvwrapper
-`installation <http://virtualenvwrapper.readthedocs.org/en/latest/install.html>`_
-and `shell configuration
-<http://virtualenvwrapper.readthedocs.org/en/latest/install.html#shell-startup-file>`_
-steps, you can then open a new terminal session and create a new virtual
-environment for Pelican::
+a virtual environment for Pelican via virtualenv_ before installing Pelican.
+Assuming you have virtualenv_ installed, you can then open a new terminal
+session and create a new virtual environment for Pelican::
 
-    $ mkvirtualenv pelican
+    $ virtualenv ~/virtualenvs/pelican
+    $ cd ~/virtualenvs/pelican
+    $ . bin/activate
 
 Once the virtual environment has been created and activated, Pelican can be
-be installed via ``pip`` or ``easy_install`` as noted above. Alternatively, if
+be installed via ``pip install pelican`` as noted above. Alternatively, if
 you have the project source, you can install Pelican using the distutils
 method::
 
@@ -54,6 +53,42 @@ If you want to use AsciiDoc you need to install it from `source
 <http://www.methods.co.nz/asciidoc/INSTALL.html>`_ or use your operating
 system's package manager.
 
+Basic usage
+-----------
+
+Once Pelican is installed, you can use it to convert your Markdown or reST
+content into HTML via the ``pelican`` command, specifying the path to your
+content and (optionally) the path to your settings file::
+
+$ pelican /path/to/your/content/ [-s path/to/your/settings.py]
+
+The above command will generate your site and save it in the ``output/``
+folder, using the default theme to produce a simple site. The default theme
+consists of very simple HTML without styling and is provided so folks may use
+it as a basis for creating their own themes.
+
+You can also tell Pelican to watch for your modifications, instead of
+manually re-running it every time you want to see your changes. To enable this,
+run the ``pelican`` command with the ``-r`` or ``--autoreload`` option.
+
+Pelican has other command-line switches available. Have a look at the help to
+see all the options you can use::
+
+    $ pelican --help
+
+Viewing the generated files
+---------------------------
+
+The files generated by Pelican are static files, so you don't actually need
+anything special to view them. You can either use your browser to open the
+files on your disk::
+
+    firefox output/index.html
+
+Or run a simple web server using Python::
+
+    cd output && python -m SimpleHTTPServer
+
 Upgrading
 ---------
 
@@ -69,7 +104,8 @@ perform the same step to install the most recent version.
 Dependencies
 ------------
 
-At this time, Pelican core is dependent on the following Python packages:
+When Pelican is installed, the following dependent Python packages should be
+automatically installed without any action on your part:
 
 * `feedgenerator <http://pypi.python.org/pypi/feedgenerator>`_, to generate the
   Atom feeds
@@ -83,53 +119,57 @@ At this time, Pelican core is dependent on the following Python packages:
 * `unidecode <http://pypi.python.org/pypi/Unidecode>`_, for ASCII
   transliterations of Unicode text
 
-Optionally:
+If you want the following optional packages, you will need to install them
+manually via ``pip``:
 
 * `markdown <http://pypi.python.org/pypi/Markdown>`_, for supporting Markdown as
   an input format
 * `typogrify <http://pypi.python.org/pypi/typogrify>`_, for typographical
   enhancements
 
-Kickstart a blog
-================
+Kickstart your site
+===================
 
-Following is a brief tutorial for those who want to get started right away.
-We're going to assume that virtualenv_ and virtualenvwrapper_ are installed and
-configured; if you've installed Pelican outside of a virtual environment,
-you can skip to the ``pelican-quickstart`` command. Let's first create a new
-virtual environment and install Pelican into it::
-
-    $ mkvirtualenv pelican
-    $ pip install pelican Markdown
-
-Next we'll create a directory to house our site content and configuration files,
-which can be located any place you prefer, and associate this new project with
-the currently-active virtual environment::
-
-    $ mkdir ~/code/yoursitename
-    $ cd ~/code/yoursitename
-    $ setvirtualenvproject
-
-Now we can run the ``pelican-quickstart`` command, which will ask some questions
-about your site::
+Once Pelican has been installed, you can create a skeleton project via the
+``pelican-quickstart`` command, which begins by asking some questions about
+your site::
 
     $ pelican-quickstart
 
-Once you finish answering all the questions, you can begin adding content to the
-*content* folder that has been created for you. (See *Writing articles using
-Pelican* section below for more information about how to format your content.)
-Once you have some content to generate, you can convert it to HTML via the
-following command::
+Once you finish answering all the questions, your project will consist of the
+following hierarchy (except for "pages", which you can optionally add yourself
+if you plan to create non-chronological content)::
+
+    yourproject/
+    ├── content
+    │   └── (pages)
+    ├── output
+    ├── develop_server.sh
+    ├── Makefile
+    ├── pelicanconf.py       # Main settings file
+    └── publishconf.py       # Settings to use when ready to publish
+
+The next step is to begin to adding content to the *content* folder that has
+been created for you. (See *Writing articles using Pelican* section below for
+more information about how to format your content.)
+
+Once you have written some content to generate, you can use the ``pelican``
+command to generate your site, which will be placed in the output folder.
+Alternatively, you can use automation tools that "wrap" the ``pelican`` command
+to simplify the process of generating, previewing, and uploading your site. One
+such tool is the ``Makefile`` that's automatically created for you when you use
+``pelican-quickstart`` to create a skeleton project. To use ``make`` to
+generate your site, run::
 
     $ make html
 
 If you'd prefer to have Pelican automatically regenerate your site every time a
-change is detected (handy when testing locally), use the following command
-instead::
+change is detected (which is handy when testing locally), use the following
+command instead::
 
     $ make regenerate
 
-To serve the site so it can be previewed in your browser at
+To serve the generated site so it can be previewed in your browser at
 http://localhost:8000::
 
     $ make serve
@@ -153,18 +193,29 @@ use rsync over ssh::
 
 That's it! Your site should now be live.
 
-Writing articles using Pelican
-==============================
+Writing content using Pelican
+=============================
+
+Articles and pages
+------------------
+
+Pelican considers "articles" to be chronological content, such as posts on a
+blog, and thus associated with a date.
+
+The idea behind "pages" is that they are usually not temporal in nature and are
+used for content that does not change very often (e.g., "About" or "Contact"
+pages).
 
 File metadata
---------------
+-------------
 
 Pelican tries to be smart enough to get the information it needs from the
 file system (for instance, about the category of your articles), but some
 information you need to provide in the form of metadata inside your files.
 
-You can provide this metadata in reStructuredText text files via the
-following syntax (give your file the ``.rst`` extension)::
+If you are writing your content in reStructuredText format, you can provide
+this metadata in text files via the following syntax (give your file the
+``.rst`` extension)::
 
     My super title
     ##############
@@ -182,23 +233,23 @@ Pelican implements an extension to reStructuredText to enable support for the
     This will be turned into :abbr:`HTML (HyperText Markup Language)`.
 
 You can also use Markdown syntax (with a file ending in ``.md``, ``.markdown``,
-or ``.mkd``). Markdown generation will not work until you explicitly install the
-``Markdown`` package, which can be done via ``pip install Markdown``. Metadata
-syntax for Markdown posts should follow this pattern::
+or ``.mkd``). Markdown generation requires that you first explicitly install
+the ``Markdown`` package, which can be done via ``pip install Markdown``.
+Metadata syntax for Markdown posts should follow this pattern::
 
     Title: My super title
     Date: 2010-12-03 10:20
-    Tags: thats, awesome
-    Category: yeah
+    Category: Python
+    Tags: pelican, publishing
     Slug: my-super-post
     Author: Alexis Metaireau
     Summary: Short version for index and feeds
 
     This is the content of my super blog post.
 
-Lastly, you can use vanilla HTML (files ending in ``.htm`` and ``.html``). Pelican 
-interprets the HTML in a very straightforward manner, reading meta data out
-of ``meta`` tags, the title out of the ``title`` tag, and the body out of the 
+Pelican can also process HTML files ending in ``.html`` and ``.htm``. Pelican
+interprets the HTML in a very straightforward manner, reading metadata from
+``meta`` tags, the title from the ``title`` tag, and the body out from the
 ``body`` tag::
 
     <html>
@@ -215,61 +266,34 @@ of ``meta`` tags, the title out of the ``title`` tag, and the body out of the
         </body>
     </html>
 
-With HTML, there is one simple exception to the standard metadata.
-``tags`` can be specified either with the ``tags`` metadata, as is standard in 
-Pelican, or with the ``keywords`` metadata, as is standard in HTML. The two can 
-be used interchangeably.
+With HTML, there is one simple exception to the standard metadata: ``tags`` can
+be specified either via the ``tags`` metadata, as is standard in Pelican, or
+via the ``keywords`` metadata, as is standard in HTML. The two can be used
+interchangeably.
 
-Note that, aside from the title, none of this metadata is mandatory: if the date
-is not specified and DEFAULT_DATE is 'fs', Pelican will rely on the file's 
-"mtime" timestamp, and the category can be determined by the directory in which 
-the file resides. For example, a file located at ``python/foobar/myfoobar.rst`` 
-will have a category of ``foobar``. If you would like to organize your files in 
-other ways where the name of the subfolder would not be a good category name, 
-you can set the setting ``USE_FOLDER_AS_CATEGORY`` to ``False``.
+Note that, aside from the title, none of this article metadata is mandatory:
+if the date is not specified and ``DEFAULT_DATE`` is set to ``fs``, Pelican
+will rely on the file's "mtime" timestamp, and the category can be determined
+by the directory in which the file resides. For example, a file located at
+``python/foobar/myfoobar.rst`` will have a category of ``foobar``. If you would
+like to organize your files in other ways where the name of the subfolder would
+not be a good category name, you can set the setting ``USE_FOLDER_AS_CATEGORY``
+to ``False``.
 
-If there is no summary metadata for a given post, the ``SUMMARY_MAX_LENGTH`` 
-setting can be used to specify how many words from the beginning of an article 
-are used as the summary. Summaries can also be specified inline with the body 
-using the :ref:`Summary Plugin <plugin-summary>`.
+If you do not explicitly specify summary metadata for a given post, the
+``SUMMARY_MAX_LENGTH`` setting can be used to specify how many words from the
+beginning of an article are used as the summary.
 
 You can also extract any metadata from the filename through a regular
-expression to be set in the ``FILENAME_METADATA`` setting.
-All named groups that are matched will be set in the metadata object. The
-default value for the ``FILENAME_METADATA`` setting will only extract the date
-from the filename. For example, if you would like to extract both the date and
-the slug, you could set something like:
-``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``
+expression to be set in the ``FILENAME_METADATA`` setting. All named groups
+that are matched will be set in the metadata object. The default value for the
+``FILENAME_METADATA`` setting will only extract the date from the filename. For
+example, if you would like to extract both the date and the slug, you could set
+something like: ``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``
 
 Please note that the metadata available inside your files takes precedence over
 the metadata extracted from the filename.
 
-Generate your blog
-------------------
-
-The ``make`` shortcut commands mentioned in the *Kickstart a blog* section
-are mostly wrappers around the ``pelican`` command that generates the HTML from
-the content. The ``pelican`` command can also be run directly::
-
-    $ pelican /path/to/your/content/ [-s path/to/your/settings.py]
-
-The above command will generate your weblog and save it in the ``output/``
-folder, using the default theme to produce a simple site. The default theme is
-simple HTML without styling and is provided so folks may use it as a basis for
-creating their own themes.
-
-Pelican has other command-line switches available. Have a look at the help to
-see all the options you can use::
-
-    $ pelican --help
-
-Auto-reload
------------
-
-It's possible to tell Pelican to watch for your modifications, instead of
-manually re-running it every time you want to see your changes. To enable this,
-run the ``pelican`` command with the ``-r`` or ``--autoreload`` option.
-
 Pages
 -----
 
@@ -303,6 +327,7 @@ following syntax: ``|filename|path/to/file``::
     │   ├── cat/
     │   │   └── article2.md
     │   └── pages
+    │       └── about.md
     └── pelican.conf.py
 
 In this example, ``article1.rst`` could look like::
@@ -444,19 +469,4 @@ publishing, for example), you can add a ``status: draft`` attribute to its
 metadata. That article will then be output to the ``drafts`` folder and not
 listed on the index page nor on any category page.
 
-Viewing the generated files
----------------------------
-
-The files generated by Pelican are static files, so you don't actually need
-anything special to see what's happening with the generated files.
-
-You can either use your browser to open the files on your disk::
-
-    firefox output/index.html
-
-Or run a simple web server using Python::
-
-    cd output && python -m SimpleHTTPServer
-
 .. _virtualenv: http://www.virtualenv.org/
-.. _virtualenvwrapper: http://www.doughellmann.com/projects/virtualenvwrapper/

From cdcfdf4605df578e2399078f376decd4190c63bd Mon Sep 17 00:00:00 2001
From: Vlad Niculae <vlad@vene.ro>
Date: Wed, 17 Apr 2013 17:28:36 +0900
Subject: [PATCH 1260/2864] DOC: fix the Markdown example for static index page
 URL override

---
 docs/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 02486947..e59bb4ae 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -122,7 +122,7 @@ your home page. The following Markdown example could be stored in
 ``content/pages/home.md``::
 
     Title: Welcome to My Site
-    URL: /
+    URL: 
     save_as: index.html
 
     Thank you for visiting. Welcome!

From 3aea29fb2b52b6c436347503136e07f99cef60d0 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Wed, 17 Apr 2013 19:13:40 +0100
Subject: [PATCH 1261/2864] Fix bug with MacOS in utils.strftime

Force using C89 directives (i.e. mentioned in the Python documentation).
---
 pelican/tests/test_utils.py |  6 ++----
 pelican/utils.py            | 15 +++++----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 768bbc44..d2d0293e 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -211,7 +211,7 @@ class TestUtils(LoggedTestCase):
     # right now, this uses Turkish locale
     # why Turkish? because I know Turkish :). And it produces non-ascii output
     # Feel free to extend with different locales
-    @unittest.skipUnless(locale_available('tr_TR') or
+    @unittest.skipUnless(locale_available('tr_TR.UTF-8') or
                          locale_available('Turkish'),
                          'Turkish locale needed')
     def test_strftime_locale_dependent(self):
@@ -221,15 +221,13 @@ class TestUtils(LoggedTestCase):
         if platform == 'win32':
             locale.setlocale(locale.LC_TIME, str('Turkish'))
         else:
-            locale.setlocale(locale.LC_TIME, str('tr_TR'))
+            locale.setlocale(locale.LC_TIME, str('tr_TR.UTF-8'))
 
         d = datetime.date(2012, 8, 29)
 
         # simple
         self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 Ağustos 2012')
         self.assertEqual(utils.strftime(d, '%d %b %Y'), '29 Ağu 2012')
-        self.assertEqual(utils.strftime(d, '%a, %d %b %Y'),
-                         'Çrş, 29 Ağu 2012')
         self.assertEqual(utils.strftime(d, '%A, %d %B %Y'),
                          'Çarşamba, 29 Ağustos 2012')
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 2519bdf6..aa807de2 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -39,7 +39,7 @@ def strftime(date, date_format):
     '''
 
     # grab candidate format options
-    format_options = '%+.?'
+    format_options = '%.'
     candidates = re.findall(format_options, date_format)
 
     # replace candidates with placeholders for later % formatting
@@ -51,19 +51,14 @@ def strftime(date, date_format):
 
     formatted_candidates = []
     for candidate in candidates:
-        try:
-            # a valid format string should be ascii
-            candidate.encode('ascii')
-        except UnicodeEncodeError:
-            # if it fails, it's not a valid format option
-            # put the candidate back as it was
-            formatted = candidate
-        else:
-            # if it's ascii, pass it to strftime to format
+        # test for valid C89 directives only
+        if candidate[1] in 'aAbBcdfHIjmMpSUwWxXyYzZ%':
             formatted = date.strftime(candidate)
             # convert Py2 result to unicode
             if not six.PY3 and enc is not None:
                 formatted = formatted.decode(enc)
+        else:
+            formatted = candidate
         formatted_candidates.append(formatted)
 
     # put formatted candidates back and return

From d83af30195b11e4e1c1444047c9bc6b3427e35f2 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Wed, 17 Apr 2013 09:57:48 +0100
Subject: [PATCH 1262/2864] Add French version for testing utils.strftime

Do not use abbreviated locale versions of month/whatever, because it seems that
this is not standard (e.g. MacOS abbreviating differently than GNU/Linux).
---
 pelican/tests/test_utils.py | 41 ++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index d2d0293e..e40046bd 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -208,13 +208,11 @@ class TestUtils(LoggedTestCase):
 
 
     # test the output of utils.strftime in a different locale
-    # right now, this uses Turkish locale
-    # why Turkish? because I know Turkish :). And it produces non-ascii output
-    # Feel free to extend with different locales
+    # Turkish locale
     @unittest.skipUnless(locale_available('tr_TR.UTF-8') or
                          locale_available('Turkish'),
                          'Turkish locale needed')
-    def test_strftime_locale_dependent(self):
+    def test_strftime_locale_dependent_turkish(self):
         # store current locale
         old_locale = locale.setlocale(locale.LC_TIME)
 
@@ -227,7 +225,6 @@ class TestUtils(LoggedTestCase):
 
         # simple
         self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 Ağustos 2012')
-        self.assertEqual(utils.strftime(d, '%d %b %Y'), '29 Ağu 2012')
         self.assertEqual(utils.strftime(d, '%A, %d %B %Y'),
                          'Çarşamba, 29 Ağustos 2012')
 
@@ -241,3 +238,37 @@ class TestUtils(LoggedTestCase):
 
         # restore locale back
         locale.setlocale(locale.LC_TIME, old_locale)
+
+
+    # test the output of utils.strftime in a different locale
+    # French locale
+    @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
+                         locale_available('French'),
+                         'French locale needed')
+    def test_strftime_locale_dependent_french(self):
+        # store current locale
+        old_locale = locale.setlocale(locale.LC_TIME)
+
+        if platform == 'win32':
+            locale.setlocale(locale.LC_TIME, str('French'))
+        else:
+            locale.setlocale(locale.LC_TIME, str('fr_FR.UTF-8'))
+
+        d = datetime.date(2012, 8, 29)
+
+        # simple
+        self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 août 2012')
+
+        # depending on OS, the first letter is m or M
+        self.assertTrue(utils.strftime(d, '%A') in ('mercredi', 'Mercredi'))
+
+        # with text
+        self.assertEqual(utils.strftime(d, 'Écrit le %d %B %Y'),
+            'Écrit le 29 août 2012')
+
+        # non-ascii format candidate (someone might pass it... for some reason)
+        self.assertEqual(utils.strftime(d, '%écrits en %Y'),
+            '%écrits en 2012')
+
+        # restore locale back
+        locale.setlocale(locale.LC_TIME, old_locale)

From 08f27e0134602bd425cbd0f98500604fdb9d1f9f Mon Sep 17 00:00:00 2001
From: Emily Strickland <emily@zubon.org>
Date: Wed, 17 Apr 2013 21:14:52 -0700
Subject: [PATCH 1263/2864] Accept `mdown` file extension for Markdown files.

This extension is sometimes used for Markdown files and is the default
for a few editors, such as Sublime Text.
---
 docs/getting_started.rst                               |  9 +++++----
 docs/settings.rst                                      |  2 +-
 pelican/readers.py                                     |  2 +-
 .../tests/content/article_with_mdown_extension.mdown   | 10 ++++++++++
 pelican/tests/test_readers.py                          |  8 ++++++++
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 pelican/tests/content/article_with_mdown_extension.mdown

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 350cfb69..0c1448fb 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -232,10 +232,11 @@ Pelican implements an extension to reStructuredText to enable support for the
 
     This will be turned into :abbr:`HTML (HyperText Markup Language)`.
 
-You can also use Markdown syntax (with a file ending in ``.md``, ``.markdown``,
-or ``.mkd``). Markdown generation requires that you first explicitly install
-the ``Markdown`` package, which can be done via ``pip install Markdown``.
-Metadata syntax for Markdown posts should follow this pattern::
+You can also use Markdown syntax (with a file ending in ``.md``,
+``.markdown``, ``.mkd``, or ``.mdown``). Markdown generation requires that you
+first explicitly install the ``Markdown`` package, which can be done via ``pip
+install Markdown``. Metadata syntax for Markdown posts should follow this
+pattern::
 
     Title: My super title
     Date: 2010-12-03 10:20
diff --git a/docs/settings.rst b/docs/settings.rst
index e11b5a1d..0212fd24 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -80,7 +80,7 @@ Setting name (default value)                                            What doe
                                                                         until one works.
 `MARKUP` (``('rst', 'md')``)                                            A list of available markup languages you want
                                                                         to use. For the moment, the only available values
-                                                                        are `rst`, `md`, `markdown`, `mkd`, `html`, and `htm`.
+                                                                        are `rst`, `md`, `markdown`, `mkd`, `mdown`, `html`, and `htm`.
 `IGNORE_FILES` (``[]``)                                                 A list of file globbing patterns to match against the
                                                                         source files to be ignored by the processor. For example
                                                                         ``['.#*']`` will ignore emacs temporary files.
diff --git a/pelican/readers.py b/pelican/readers.py
index d075a039..797994cb 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -149,7 +149,7 @@ class RstReader(Reader):
 
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
-    file_extensions = ['md', 'markdown', 'mkd']
+    file_extensions = ['md', 'markdown', 'mkd', 'mdown']
     default_extensions = ['codehilite(css_class=highlight)', 'extra']
 
     def __init__(self, *args, **kwargs):
diff --git a/pelican/tests/content/article_with_mdown_extension.mdown b/pelican/tests/content/article_with_mdown_extension.mdown
new file mode 100644
index 00000000..bdaf74cd
--- /dev/null
+++ b/pelican/tests/content/article_with_mdown_extension.mdown
@@ -0,0 +1,10 @@
+title: Test mdown File
+category: test
+
+Test Markdown File Header
+=========================
+
+Used for pelican test
+---------------------
+
+This is another markdown test file.  Uses the mdown extension.
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 49fe0c81..5381a776 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -172,6 +172,14 @@ class MdReaderTest(unittest.TestCase):
                     " test</h2>\n<p>This is another markdown test file.  Uses"
                     " the markdown extension.</p>")
         self.assertEqual(content, expected)
+        # test to ensure the mdown file extension is being processed by the
+        # correct reader
+        content, metadata = reader.read(
+            _path('article_with_mdown_extension.mdown'))
+        expected = ("<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"
+                    " test</h2>\n<p>This is another markdown test file.  Uses"
+                    " the mdown extension.</p>")
+        self.assertEqual(content, expected)
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_markdown_markup_extension(self):

From a07052ff861d0a18f0657dc2b05a46ebf8b89516 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Thu, 18 Apr 2013 02:26:01 -0400
Subject: [PATCH 1264/2864] force argparse output to be unicode in Py2

---
 pelican/__init__.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 707fa8f0..c377a04e 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -8,6 +8,7 @@ import sys
 import time
 import logging
 import argparse
+import locale
 
 from pelican import signals
 
@@ -274,6 +275,18 @@ def get_config(args):
         config['THEME'] = abstheme if os.path.exists(abstheme) else args.theme
     if args.delete_outputdir is not None:
         config['DELETE_OUTPUT_DIRECTORY'] = args.delete_outputdir
+
+    # argparse returns bytes in Py2. There is no definite answer as to which
+    # encoding argparse (or sys.argv) uses.
+    # "Best" option seems to be locale.getpreferredencoding()
+    # ref: http://mail.python.org/pipermail/python-list/2006-October/405766.html
+    if not six.PY3:
+        enc = locale.getpreferredencoding()
+        for key in config:
+            if key in ('PATH', 'OUTPUT_PATH', 'THEME'):
+                config[key] = config[key].decode(enc)
+            if key == "MARKUP":
+                config[key] = [a.decode(enc) for a in config[key]]
     return config
 
 

From 5ccbbcc7d16931a27b4153d7b4d20df6f5c93925 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 19 Apr 2013 13:35:20 -0400
Subject: [PATCH 1265/2864] add feedback to user and refactor 'autoreload' code

---
 pelican/__init__.py           | 70 ++++++++++++++++++++++-------------
 pelican/tests/test_pelican.py |  6 +--
 pelican/tests/test_utils.py   | 29 +++++++++------
 pelican/utils.py              | 68 ++++++++++++++++------------------
 4 files changed, 97 insertions(+), 76 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 707fa8f0..4e6cc72a 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -16,8 +16,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 SourceFileGenerator, TemplatePagesGenerator)
 from pelican.log import init
 from pelican.settings import read_settings
-from pelican.utils import (clean_output_dir, files_changed, file_changed,
-                           NoFilesError)
+from pelican.utils import clean_output_dir, folder_watcher, file_watcher
 from pelican.writers import Writer
 
 __major__ = 3
@@ -148,6 +147,7 @@ class Pelican(object):
 
     def run(self):
         """Run the generators and return"""
+        start_time = time.time()
 
         context = self.settings.copy()
         context['filenames'] = {}  # share the dict between all the generators
@@ -181,6 +181,14 @@ class Pelican(object):
 
         signals.finalized.send(self)
 
+        articles_generator = next(g for g in generators if isinstance(g, ArticlesGenerator))
+        pages_generator = next(g for g in generators if isinstance(g, PagesGenerator))
+
+        print('Done: Processed {} articles and {} pages in {:.2f} seconds.'.format(
+            len(articles_generator.articles) + len(articles_generator.translations),
+            len(pages_generator.pages) + len(pages_generator.translations),
+            time.time() - start_time))
+
     def get_generator_classes(self):
         generators = [StaticGenerator, ArticlesGenerator, PagesGenerator]
 
@@ -295,9 +303,19 @@ def main():
     init(args.verbosity)
     pelican = get_instance(args)
 
+    watchers = {'content': folder_watcher(pelican.path,
+                                          pelican.markup,
+                                          pelican.ignore_files),
+                'theme': folder_watcher(pelican.theme,
+                                        [''],
+                                        pelican.ignore_files),
+                'settings': file_watcher(args.settings)}
+
     try:
         if args.autoreload:
-            files_found_error = True
+            print('  --- AutoReload Mode: Monitoring `content`, `theme` and `settings`'
+                  ' for changes. ---')
+
             while True:
                 try:
                     # Check source dir for changed files ending with the given
@@ -305,45 +323,45 @@ def main():
                     # restriction; all files are recursively checked if they
                     # have changed, no matter what extension the filenames
                     # have.
-                    if (files_changed(
-                            pelican.path,
-                            pelican.markup,
-                            pelican.ignore_files)
-                        or files_changed(
-                            pelican.theme,
-                            [''],
-                            pelican.ignore_files
-                    )):
-                        if not files_found_error:
-                            files_found_error = True
-                        pelican.run()
+                    modified = {k: next(v) for k, v in watchers.items()}
 
-                    # reload also if settings.py changed
-                    if file_changed(args.settings):
-                        logger.info('%s changed, re-generating' %
-                                    args.settings)
+                    if modified['settings']:
                         pelican = get_instance(args)
+
+                    if any(modified.values()):
+                        print('\n-> Modified: {}. re-generating...'.format(
+                                ', '.join(k for k, v in modified.items() if v)))
+
+                        if modified['content'] is None:
+                            logger.warning('No valid files found in content.')
+
+                        if modified['theme'] is None:
+                            logger.warning('Empty theme folder. Using `basic` theme.')
+ 
                         pelican.run()
 
                     time.sleep(.5)  # sleep to avoid cpu load
+
                 except KeyboardInterrupt:
                     logger.warning("Keyboard interrupt, quitting.")
                     break
-                except NoFilesError:
-                    if files_found_error:
-                        logger.warning("No valid files found in content. "
-                                       "Nothing to generate.")
-                        files_found_error = False
-                    time.sleep(1)  # sleep to avoid cpu load
+
                 except Exception as e:
                     if (args.verbosity == logging.DEBUG):
                         logger.critical(e.args)
                         raise
                     logger.warning(
                             'Caught exception "{0}". Reloading.'.format(e))
-                    continue
+
         else:
+            if next(watchers['content']) is None:
+                logger.warning('No valid files found in content.')
+
+            if next(watchers['theme']) is None:
+                logger.warning('Empty theme folder. Using `basic` theme.')
+
             pelican.run()
+
     except Exception as e:
         logger.critical(e)
 
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 4baa4418..d6c0d8e9 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -10,7 +10,7 @@ import logging
 
 from pelican import Pelican
 from pelican.settings import read_settings
-from pelican.tests.support import LoggedTestCase
+from pelican.tests.support import LoggedTestCase, mute
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
 SAMPLES_PATH = os.path.abspath(os.path.join(
@@ -73,7 +73,7 @@ class TestPelican(LoggedTestCase):
             'LOCALE': locale.normalize('en_US'),
             })
         pelican = Pelican(settings=settings)
-        pelican.run()
+        mute(True)(pelican.run)()
         dcmp = dircmp(self.temp_path, os.path.join(OUTPUT_PATH, 'basic'))
         self.assertFilesEqual(recursiveDiff(dcmp))
         self.assertLogCountEqual(
@@ -89,6 +89,6 @@ class TestPelican(LoggedTestCase):
             'LOCALE': locale.normalize('en_US'),
             })
         pelican = Pelican(settings=settings)
-        pelican.run()
+        mute(True)(pelican.run)()
         dcmp = dircmp(self.temp_path, os.path.join(OUTPUT_PATH, 'custom'))
         self.assertFilesEqual(recursiveDiff(dcmp))
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index e40046bd..f89c2907 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -10,7 +10,6 @@ from sys import platform
 
 from pelican import utils
 from .support import get_article, LoggedTestCase, locale_available, unittest
-from pelican.utils import NoFilesError
 
 
 class TestUtils(LoggedTestCase):
@@ -127,31 +126,39 @@ class TestUtils(LoggedTestCase):
         self.assertNotIn(en_article3, trans)
         self.assertNotIn(fr_article3, index)
 
-    def test_files_changed(self):
+    def test_watchers(self):
         # Test if file changes are correctly detected
         # Make sure to handle not getting any files correctly.
 
         dirname = os.path.join(os.path.dirname(__file__), 'content')
+        folder_watcher = utils.folder_watcher(dirname, ['rst'])
+
         path = os.path.join(dirname, 'article_with_metadata.rst')
-        changed = utils.files_changed(dirname, 'rst')
-        self.assertEqual(changed, True)
+        file_watcher = utils.file_watcher(path)
 
-        changed = utils.files_changed(dirname, 'rst')
-        self.assertEqual(changed, False)
+        # first check returns True
+        self.assertEqual(next(folder_watcher), True)
+        self.assertEqual(next(file_watcher), True)
 
+        # next check without modification returns False
+        self.assertEqual(next(folder_watcher), False)
+        self.assertEqual(next(file_watcher), False)
+
+        # after modification, returns True
         t = time.time()
         os.utime(path, (t, t))
-        changed = utils.files_changed(dirname, 'rst')
-        self.assertEqual(changed, True)
-        self.assertAlmostEqual(utils.LAST_MTIME, t, delta=1)
+        self.assertEqual(next(folder_watcher), True)
+        self.assertEqual(next(file_watcher), True)
 
         empty_path = os.path.join(os.path.dirname(__file__), 'empty')
         try:
             os.mkdir(empty_path)
             os.mkdir(os.path.join(empty_path, "empty_folder"))
             shutil.copy(__file__, empty_path)
-            with self.assertRaises(NoFilesError):
-                utils.files_changed(empty_path, 'rst')
+
+            # if no files of interest, returns None
+            watcher = utils.folder_watcher(empty_path, ['rst'])
+            self.assertEqual(next(watcher), None)
         except OSError:
             self.fail("OSError Exception in test_files_changed test")
         finally:
diff --git a/pelican/utils.py b/pelican/utils.py
index aa807de2..c6f108f9 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -11,7 +11,7 @@ import logging
 import errno
 import locale
 import fnmatch
-from collections import defaultdict, Hashable
+from collections import Hashable
 from functools import partial
 
 from codecs import open, BOM_UTF8
@@ -81,10 +81,6 @@ def python_2_unicode_compatible(klass):
     return klass
 
 
-class NoFilesError(Exception):
-    pass
-
-
 class memoized(object):
     """Function decorator to cache return values.
 
@@ -433,46 +429,46 @@ def process_translations(content_list):
     return index, translations
 
 
-LAST_MTIME = 0
+def folder_watcher(path, extensions, ignores=[]):
+    '''Generator for monitoring a folder for modifications.
 
-
-def files_changed(path, extensions, ignores=[]):
-    """Return True if the files have changed since the last check"""
+    Returns a boolean indicating if files are changed since last check.
+    Returns None if there are no matching files in the folder'''
 
     def file_times(path):
-        """Return the last time files have been modified"""
+        '''Return `mtime` for each file in path'''
+
         for root, dirs, files in os.walk(path):
-            dirs[:] = [x for x in dirs if x[0] != os.curdir]
+            dirs[:] = [x for x in dirs if not x.startswith(os.curdir)]
+
             for f in files:
-                if any(f.endswith(ext) for ext in extensions) \
-                        and not any(fnmatch.fnmatch(f, ignore)
-                                    for ignore in ignores):
+                if (f.endswith(tuple(extensions)) and
+                    not any(fnmatch.fnmatch(f, ignore) for ignore in ignores)):
                     yield os.stat(os.path.join(root, f)).st_mtime
 
-    global LAST_MTIME
-    try:
-        mtime = max(file_times(path))
+    LAST_MTIME = 0
+    while True:
+        try:
+            mtime = max(file_times(path))
+            if mtime > LAST_MTIME:
+                LAST_MTIME = mtime
+                yield True
+        except ValueError:
+            yield None
+        else:
+            yield False
+
+
+def file_watcher(path):
+    '''Generator for monitoring a file for modifications'''
+    LAST_MTIME = 0
+    while True:
+        mtime = os.stat(path).st_mtime
         if mtime > LAST_MTIME:
             LAST_MTIME = mtime
-            return True
-    except ValueError:
-        raise NoFilesError("No files with the given extension(s) found.")
-    return False
-
-
-FILENAMES_MTIMES = defaultdict(int)
-
-
-def file_changed(path):
-    mtime = os.stat(path).st_mtime
-    if FILENAMES_MTIMES[path] == 0:
-        FILENAMES_MTIMES[path] = mtime
-        return False
-    else:
-        if mtime > FILENAMES_MTIMES[path]:
-            FILENAMES_MTIMES[path] = mtime
-            return True
-        return False
+            yield True
+        else:
+            yield False
 
 
 def set_date_tzinfo(d, tz_name=None):

From 870ec0efe89a138596b4e22edf2fe1e0d8eeed4f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 19 Apr 2013 11:12:20 -0700
Subject: [PATCH 1266/2864] Fix outdated link to documentation

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 989644fc..66dda1f4 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -210,7 +210,7 @@ def configure_settings(settings):
         logger.warning(
             'No timezone information specified in the settings. Assuming'
             ' your timezone is UTC for feed generation. Check '
-            'http://docs.notmyidea.org/alexis/pelican/settings.html#timezone '
+            'http://docs.getpelican.com/en/latest/settings.html#timezone '
             'for more information')
 
     if 'LESS_GENERATOR' in settings:

From 8c7ea8df981a7afbffdd2b5df136c7ccb7dbe3b3 Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Fri, 19 Apr 2013 23:06:59 +0100
Subject: [PATCH 1267/2864] Import wordpress pages to pages/ subdir with
 --dir-page option

When importing from Wordpress, the --dir-page directive (disabled by
default) automatically adds files to the pages/ when they are recognised
as pages, as opposed to posts.
---
 docs/importer.rst               |  4 +++-
 pelican/tests/test_importer.py  | 21 +++++++++++++++++-
 pelican/tools/pelican_import.py | 38 +++++++++++++++++++++++++++------
 3 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index bb24b4b9..86b67767 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -42,7 +42,7 @@ Usage
 ::
 
     pelican-import [-h] [--wpfile] [--dotclear] [--posterous] [--feed] [-o OUTPUT]
-                   [-m MARKUP] [--dir-cat] [--strip-raw] [--disable-slugs]
+                   [-m MARKUP] [--dir-cat] [--dir-page] [--strip-raw] [--disable-slugs]
                    [-e EMAIL] [-p PASSWORD]
                    input|api_token
 
@@ -67,6 +67,8 @@ Optional arguments
                         (default: rst)
   --dir-cat             Put files in directories with categories name
                         (default: False)
+  --dir-page            Put files recognised as pages in "pages/" sub-
+                          directory (wordpress import only) (default: False)
   --strip-raw           Strip raw HTML code that can't be converted to markup
                         such as flash embeds or iframes (wordpress import
                         only) (default: False)
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index c18f447f..cb095426 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -32,9 +32,28 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
     def test_ignore_empty_posts(self):
         self.assertTrue(self.posts)
-        for title, content, fname, date, author, categ, tags, format in self.posts:
+        for title, content, fname, date, author, categ, tags, kind, format in self.posts:
             self.assertTrue(title.strip())
 
+    def test_recognise_page_kind(self):
+        """ Check that we recognise pages in wordpress, as opposed to posts """
+        self.assertTrue(self.posts)
+        # Collect (title, filename, kind) of non-empty posts recognised as page
+        pages_data = []
+        for title, content, fname, date, author, categ, tags, kind, format in self.posts:
+            if kind == 'page':
+                pages_data.append((title, fname))
+        self.assertEqual(2, len(pages_data))
+        self.assertEqual(('Page', 'contact'), pages_data[0])
+        self.assertEqual(('Empty Page', 'empty'), pages_data[1])
+
+    def test_dirpage_directive_for_page_kind(self):
+        silent_f2p = mute(True)(fields2pelican)
+        test_post = filter(lambda p: p[0].startswith("Empty Page"), self.posts)
+        with temporary_folder() as temp:
+            fname = list(silent_f2p(test_post, 'markdown', temp, dirpage=True))[0]
+            self.assertTrue(fname.endswith('pages%sempty.md' % os.path.sep))
+
     def test_can_toggle_raw_html_code_parsing(self):
         def r(f):
             with open(f) as infile:
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 9e477c2c..5d0937fd 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -136,7 +136,12 @@ def wp2fields(xml):
 
             tags = [tag.string for tag in item.findAll('category', {'domain' : 'post_tag'})]
 
-            yield (title, content, filename, date, author, categories, tags, "wp-html")
+            kind = 'article'
+            if item.find('post_type').string == 'page':
+                kind = 'page'
+
+            yield (title, content, filename, date, author, categories, tags,
+                   kind, "wp-html")
 
 def dc2fields(file):
     """Opens a Dotclear export file, and yield pelican fields"""
@@ -265,7 +270,10 @@ def dc2fields(file):
             content = content.replace('\\n', '')
             post_format = "html"
 
-        yield (post_title, content, slugify(post_title), post_creadt, author, categories, tags, post_format)
+        kind = 'article'  # TODO: Recognise pages
+
+        yield (post_title, content, slugify(post_title), post_creadt, author,
+               categories, tags, kind, post_format)
 
 
 def posterous2fields(api_token, email, password):
@@ -313,9 +321,10 @@ def posterous2fields(api_token, email, password):
             delta = timedelta(hours = offset / 100)
             date_object -= delta
             date = date_object.strftime("%Y-%m-%d %H:%M")
+            kind = 'article'  # TODO: Recognise pages
 
             yield (post.get('title'), post.get('body_cleaned'), slug, date,
-                post.get('user').get('display_name'), [], tags, "html")
+                post.get('user').get('display_name'), [], tags, kind, "html")
 
 def feed2fields(file):
     """Read a feed and yield pelican fields"""
@@ -328,7 +337,9 @@ def feed2fields(file):
         tags = [e['term'] for e in entry.tags] if hasattr(entry, "tags") else None
 
         slug = slugify(entry.title)
-        yield (entry.title, entry.description, slug, date, author, [], tags, "html")
+        kind = 'article'
+        yield (entry.title, entry.description, slug, date, author, [], tags,
+               kind, "html")
 
 
 def build_header(title, date, author, categories, tags, slug):
@@ -363,8 +374,11 @@ def build_markdown_header(title, date, author, categories, tags, slug):
     header += '\n'
     return header
 
-def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=False, disable_slugs=False):
-    for title, content, filename, date, author, categories, tags, in_markup in fields:
+def fields2pelican(fields, out_markup, output_path,
+        dircat=False, strip_raw=False, disable_slugs=False,
+        dirpage=False, filename_template=None):
+    for (title, content, filename, date, author, categories, tags,
+            kind, in_markup) in fields:
         slug = not disable_slugs and filename or None
         if (in_markup == "markdown") or (out_markup == "markdown") :
             ext = '.md'
@@ -385,8 +399,14 @@ def fields2pelican(fields, out_markup, output_path, dircat=False, strip_raw=Fals
             filename = '_'
         filename = filename[:249] # allow for 5 extra characters
 
+        # option to put page posts in pages/ subdirectory
+        if dirpage and kind == 'page':
+            pages_dir = os.path.join(output_path, 'pages')
+            if not os.path.isdir(pages_dir):
+                os.mkdir(pages_dir)
+            out_filename = os.path.join(pages_dir, filename+ext)
         # option to put files in directories with categories names
-        if dircat and (len(categories) > 0):
+        elif dircat and (len(categories) > 0):
             catname = slugify(categories[0])
             out_filename = os.path.join(output_path, catname, filename+ext)
             if not os.path.isdir(os.path.join(output_path, catname)):
@@ -464,6 +484,9 @@ def main():
         help='Output markup format (supports rst & markdown)')
     parser.add_argument('--dir-cat', action='store_true', dest='dircat',
         help='Put files in directories with categories name')
+    parser.add_argument('--dir-page', action='store_true', dest='dirpage',
+        help=('Put files recognised as pages in "pages/" sub-directory'
+              ' (wordpress import only)'))
     parser.add_argument('--strip-raw', action='store_true', dest='strip_raw',
         help="Strip raw HTML code that can't be converted to "
              "markup such as flash embeds or iframes (wordpress import only)")
@@ -512,5 +535,6 @@ def main():
 
     fields2pelican(fields, args.markup, args.output,
                    dircat=args.dircat or False,
+                   dirpage=args.dirpage or False,
                    strip_raw=args.strip_raw or False,
                    disable_slugs=args.disable_slugs or False)

From e86f4eedcf83066e4e16d82ceec43bf2deb43b8e Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 19 Apr 2013 23:35:09 -0400
Subject: [PATCH 1268/2864] bugfix and tests for no settings path (no -s
 option)

---
 pelican/tests/test_utils.py |  4 ++++
 pelican/utils.py            | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index f89c2907..18babca7 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -150,6 +150,10 @@ class TestUtils(LoggedTestCase):
         self.assertEqual(next(folder_watcher), True)
         self.assertEqual(next(file_watcher), True)
 
+        # file watcher with None or empty path should return None
+        self.assertEqual(next(utils.file_watcher('')), None)
+        self.assertEqual(next(utils.file_watcher(None)), None)
+
         empty_path = os.path.join(os.path.dirname(__file__), 'empty')
         try:
             os.mkdir(empty_path)
diff --git a/pelican/utils.py b/pelican/utils.py
index c6f108f9..39a3f8f4 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -463,12 +463,15 @@ def file_watcher(path):
     '''Generator for monitoring a file for modifications'''
     LAST_MTIME = 0
     while True:
-        mtime = os.stat(path).st_mtime
-        if mtime > LAST_MTIME:
-            LAST_MTIME = mtime
-            yield True
+        if path:
+            mtime = os.stat(path).st_mtime
+            if mtime > LAST_MTIME:
+                LAST_MTIME = mtime
+                yield True
+            else:
+                yield False
         else:
-            yield False
+            yield None
 
 
 def set_date_tzinfo(d, tz_name=None):

From bdd702384f4d4ed8812ac96e52593b85f546b66b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 20 Apr 2013 08:08:31 -0700
Subject: [PATCH 1269/2864] Improve wording of "cannot find" errors

---
 pelican/contents.py | 2 +-
 pelican/settings.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 5b19c341..a5604856 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -310,6 +310,6 @@ def is_valid_content(content, f):
         content.check_properties()
         return True
     except NameError as e:
-        logger.error("Skipping %s: impossible to find information about "
+        logger.error("Skipping %s: could not find information about "
                       "'%s'" % (f, e))
         return False
diff --git a/pelican/settings.py b/pelican/settings.py
index 66dda1f4..30ba231c 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -160,7 +160,7 @@ def configure_settings(settings):
         if os.path.exists(theme_path):
             settings['THEME'] = theme_path
         else:
-            raise Exception("Impossible to find the theme %s"
+            raise Exception("Could not find the theme %s"
                             % settings['THEME'])
 
     # if locales is not a list, make it one

From 70a72545ce7dea13e2d584bc287fcb4846e0042e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 20 Apr 2013 09:08:46 -0700
Subject: [PATCH 1270/2864] Add content_object_init to list of signals

---
 docs/plugins.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index aa43a750..064ba73d 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -82,6 +82,7 @@ get_generators                  generators                      invoked in Pelic
 pages_generate_context          pages_generator, metadata
 pages_generator_init            pages_generator                 invoked in the PagesGenerator.__init__
 pages_generator_finalized       pages_generator                 invoked at the end of PagesGenerator.generate_context
+content_object_init             content_object                  invoked at the end of Content.__init__ (see note below)
 =============================   ============================   ===========================================================================
 
 The list is currently small, so don't hesitate to add signals and make a pull

From 2790446906db9f0c15f59ad1e4e5cd98a0ede316 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 20 Apr 2013 15:56:07 -0400
Subject: [PATCH 1271/2864] adds a 'strftime' jinja fiter that uses LOCALE

---
 docs/themes.rst       | 20 +++++++++++++++++++-
 pelican/generators.py |  5 ++++-
 pelican/utils.py      | 20 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 1e003967..ddf509f8 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -78,7 +78,7 @@ Sorting
 -------
 
 URL wrappers (currently categories, tags, and authors), have
-comparison methods that allow them to be easily sorted by name:
+comparison methods that allow them to be easily sorted by name::
 
     {% for tag, articles in tags|sort %}
 
@@ -87,6 +87,24 @@ command`__ has a number of options.
 
 __ http://jinja.pocoo.org/docs/templates/#sort
 
+
+Date Formatting
+---------------
+
+Pelican formats the date with according to your settings and locale 
+(``DATE_FORMATS``/``DEFAULT_DATE_FORMAT``) and provides a 
+``locale_date`` attribute. On the other hand, ``date`` attribute will
+be a `datetime`_ object. If you need custom formatting for a date 
+different than your settings, use the Jinja filter ``strftime`` 
+that comes with Pelican. Usage is same as Python `strftime`_ format, 
+but the filter will do the right thing and format your date according
+to the locale given in your settings::
+
+    {{ article.date|strftime('%d %B %Y') }}
+
+.. _datetime: http://docs.python.org/2/library/datetime.html#datetime-objects
+.. _strftime: http://docs.python.org/2/library/datetime.html#strftime-strptime-behavior
+
 index.html
 ----------
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 7ce1e28b..f2fa0e33 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -23,7 +23,7 @@ from pelican.contents import (
         Article, Page, Category, Static, is_valid_content
 )
 from pelican.readers import read_file
-from pelican.utils import copy, process_translations, mkdir_p
+from pelican.utils import copy, process_translations, mkdir_p, DateFormatter
 from pelican import signals
 import pelican.utils
 
@@ -65,6 +65,9 @@ class Generator(object):
 
         logger.debug('template list: {0}'.format(self.env.list_templates()))
 
+        # provide utils.strftime as a jinja filter
+        self.env.filters.update({'strftime': DateFormatter()})
+
         # get custom Jinja filters from user settings
         custom_filters = self.settings.get('JINJA_FILTERS', {})
         self.env.filters.update(custom_filters)
diff --git a/pelican/utils.py b/pelican/utils.py
index 39a3f8f4..9e8a779d 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -65,6 +65,26 @@ def strftime(date, date_format):
     return template % tuple(formatted_candidates)
 
 
+class DateFormatter(object):
+    '''A date formatter object used as a jinja filter
+    
+    Uses the `strftime` implementation and makes sure jinja uses the locale 
+    defined in LOCALE setting
+    '''
+    
+    def __init__(self):
+        self.locale = locale.setlocale(locale.LC_TIME)
+
+    def __call__(self, date, date_format):
+        old_locale = locale.setlocale(locale.LC_TIME)
+        locale.setlocale(locale.LC_TIME, self.locale)
+
+        formatted = strftime(date, date_format)
+
+        locale.setlocale(locale.LC_TIME, old_locale)
+        return formatted
+
+
 def python_2_unicode_compatible(klass):
     """
     A decorator that defines __unicode__ and __str__ methods under Python 2.

From d59a59dc831a53739453eb10b4136fb46f2bbb7c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 21 Apr 2013 15:00:40 -0700
Subject: [PATCH 1272/2864] Unicode all the things, incl. our settings files

---
 pelican/tools/templates/pelicanconf.py.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in
index 265b59c2..5d96051d 100644
--- a/pelican/tools/templates/pelicanconf.py.in
+++ b/pelican/tools/templates/pelicanconf.py.in
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*- #
+from __future__ import unicode_literals
 
 AUTHOR = $author
 SITENAME = $sitename

From 740bb46e6d6d9ad82403a8838b375ad03310fd39 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 21 Apr 2013 15:18:31 -0700
Subject: [PATCH 1273/2864] MOAR Unicode for generated settings files

---
 pelican/tools/templates/publishconf.py.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/tools/templates/publishconf.py.in b/pelican/tools/templates/publishconf.py.in
index 4c4f052a..d1ed994d 100755
--- a/pelican/tools/templates/publishconf.py.in
+++ b/pelican/tools/templates/publishconf.py.in
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*- #
+from __future__ import unicode_literals
 
 # This file is only used if you use `make publish` or
 # explicitly specify it as your config file.

From 62a9b055954c3c4938cb22918994a8296d1482b7 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Mon, 22 Apr 2013 19:54:52 -0400
Subject: [PATCH 1274/2864] added tests for DateFormatter

---
 pelican/tests/test_utils.py | 83 +++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 18babca7..3dafc5f9 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -7,7 +7,11 @@ import datetime
 import time
 import locale
 from sys import platform
+from tempfile import mkdtemp
 
+from pelican.generators import TemplatePagesGenerator
+from pelican.writers import Writer
+from pelican.settings import read_settings
 from pelican import utils
 from .support import get_article, LoggedTestCase, locale_available, unittest
 
@@ -283,3 +287,82 @@ class TestUtils(LoggedTestCase):
 
         # restore locale back
         locale.setlocale(locale.LC_TIME, old_locale)
+
+
+class TestDateFormatter(unittest.TestCase):
+    '''Tests that the output of DateFormatter jinja filter is same as
+    utils.strftime'''
+
+    def setUp(self):
+        # prepare a temp content and output folder
+        self.temp_content = mkdtemp(prefix='pelicantests.')
+        self.temp_output = mkdtemp(prefix='pelicantests.')
+
+        # prepare a template file
+        template_dir = os.path.join(self.temp_content, 'template')
+        template_path = os.path.join(template_dir, 'source.html')
+        os.makedirs(template_dir)
+        with open(template_path, 'w') as template_file:
+            template_file.write('date = {{ date|strftime("%A, %d %B %Y") }}')
+        self.date = datetime.date(2012, 8, 29)
+
+
+    def tearDown(self):
+        shutil.rmtree(self.temp_content)
+        shutil.rmtree(self.temp_output)
+
+
+    @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
+                         locale_available('French'),
+                         'French locale needed')
+    def test_french_locale(self):
+        settings = read_settings(
+            override = {'LOCALE': locale.normalize('fr_FR.UTF-8'),
+                        'TEMPLATE_PAGES': {'template/source.html':
+                                           'generated/file.html'}})
+
+        generator = TemplatePagesGenerator({'date': self.date}, settings,
+                self.temp_content, '', self.temp_output, None)
+        generator.env.filters.update({'strftime': utils.DateFormatter()})
+
+        writer = Writer(self.temp_output, settings=settings)
+        generator.generate_output(writer)
+
+        output_path = os.path.join(
+                self.temp_output, 'generated', 'file.html')
+
+        # output file has been generated
+        self.assertTrue(os.path.exists(output_path))
+
+        # output content is correct
+        with utils.pelican_open(output_path) as output_file:
+            self.assertEqual(output_file,
+                             utils.strftime(self.date, 'date = %A, %d %B %Y'))
+
+
+    @unittest.skipUnless(locale_available('tr_TR.UTF-8') or
+                         locale_available('Turkish'),
+                         'Turkish locale needed')
+    def test_turkish_locale(self):
+        settings = read_settings(
+            override = {'LOCALE': locale.normalize('tr_TR.UTF-8'),
+                        'TEMPLATE_PAGES': {'template/source.html':
+                                           'generated/file.html'}})
+
+        generator = TemplatePagesGenerator({'date': self.date}, settings,
+                self.temp_content, '', self.temp_output, None)
+        generator.env.filters.update({'strftime': utils.DateFormatter()})
+
+        writer = Writer(self.temp_output, settings=settings)
+        generator.generate_output(writer)
+
+        output_path = os.path.join(
+                self.temp_output, 'generated', 'file.html')
+
+        # output file has been generated
+        self.assertTrue(os.path.exists(output_path))
+
+        # output content is correct
+        with utils.pelican_open(output_path) as output_file:
+            self.assertEqual(output_file,
+                             utils.strftime(self.date, 'date = %A, %d %B %Y'))

From f3340c11526e6eb2a11f5e8ca22742e095c2bcdf Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Mon, 22 Apr 2013 20:00:27 -0400
Subject: [PATCH 1275/2864] added FR and TR locale generation to travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 608979c1..fa0c2f0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq --no-install-recommends asciidoc
+ - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
     - pip install mock --use-mirrors

From 09a332aff3865f2e2cf2090d09014df739ac383d Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Mon, 22 Apr 2013 20:07:53 -0400
Subject: [PATCH 1276/2864] reset locale after DateFormatter test

---
 pelican/tests/test_utils.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 3dafc5f9..8b0dc13e 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -310,6 +310,8 @@ class TestDateFormatter(unittest.TestCase):
     def tearDown(self):
         shutil.rmtree(self.temp_content)
         shutil.rmtree(self.temp_output)
+        # reset locale to default
+        locale.setlocale(locale.LC_ALL, '')
 
 
     @unittest.skipUnless(locale_available('fr_FR.UTF-8') or

From be8837963a0d5ad54dee9b63218c8e20217ed14e Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Mon, 22 Apr 2013 20:50:11 -0400
Subject: [PATCH 1277/2864] ignore emacs lock files and exception handling for
 watchers

---
 docs/settings.rst   |  6 +++---
 pelican/__init__.py |  6 ++++--
 pelican/settings.py |  2 +-
 pelican/utils.py    | 12 ++++++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 0212fd24..9ff9c8e3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -81,9 +81,9 @@ Setting name (default value)                                            What doe
 `MARKUP` (``('rst', 'md')``)                                            A list of available markup languages you want
                                                                         to use. For the moment, the only available values
                                                                         are `rst`, `md`, `markdown`, `mkd`, `mdown`, `html`, and `htm`.
-`IGNORE_FILES` (``[]``)                                                 A list of file globbing patterns to match against the
-                                                                        source files to be ignored by the processor. For example
-                                                                        ``['.#*']`` will ignore emacs temporary files.
+`IGNORE_FILES` (``['.#*']``)                                            A list of file globbing patterns to match against the
+                                                                        source files to be ignored by the processor. For example,
+                                                                        the default ``['.#*']`` will ignore emacs lock files.
 `MD_EXTENSIONS` (``['codehilite(css_class=highlight)','extra']``)       A list of the extensions that the Markdown processor
                                                                         will use. Refer to the Python Markdown documentation's
                                                                         `Extensions section <http://pythonhosted.org/Markdown/extensions/>`_
diff --git a/pelican/__init__.py b/pelican/__init__.py
index b88ec711..37f057f9 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -353,8 +353,6 @@ def main():
  
                         pelican.run()
 
-                    time.sleep(.5)  # sleep to avoid cpu load
-
                 except KeyboardInterrupt:
                     logger.warning("Keyboard interrupt, quitting.")
                     break
@@ -366,6 +364,10 @@ def main():
                     logger.warning(
                             'Caught exception "{0}". Reloading.'.format(e))
 
+                finally:
+                    time.sleep(.5)  # sleep to avoid cpu load
+
+
         else:
             if next(watchers['content']) is None:
                 logger.warning('No valid files found in content.')
diff --git a/pelican/settings.py b/pelican/settings.py
index 30ba231c..091999a7 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -100,7 +100,7 @@ _DEFAULT_CONFIG = {'PATH': os.curdir,
                    'PLUGIN_PATH': '',
                    'PLUGINS': [],
                    'TEMPLATE_PAGES': {},
-                   'IGNORE_FILES': []
+                   'IGNORE_FILES': ['.#*']
                    }
 
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 39a3f8f4..0fb6443a 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -444,7 +444,10 @@ def folder_watcher(path, extensions, ignores=[]):
             for f in files:
                 if (f.endswith(tuple(extensions)) and
                     not any(fnmatch.fnmatch(f, ignore) for ignore in ignores)):
-                    yield os.stat(os.path.join(root, f)).st_mtime
+                    try:
+                        yield os.stat(os.path.join(root, f)).st_mtime
+                    except OSError as e:
+                        logger.warning('Caught Exception: {}'.format(e))
 
     LAST_MTIME = 0
     while True:
@@ -464,7 +467,12 @@ def file_watcher(path):
     LAST_MTIME = 0
     while True:
         if path:
-            mtime = os.stat(path).st_mtime
+            try:
+                mtime = os.stat(path).st_mtime
+            except OSError as e:
+                logger.warning('Caught Exception: {}'.format(e))
+                continue
+
             if mtime > LAST_MTIME:
                 LAST_MTIME = mtime
                 yield True

From 5ffadd22838e4fa081e23c8b13f4111eca9911d5 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Mon, 22 Apr 2013 22:18:17 +0200
Subject: [PATCH 1278/2864] Add `DOCUTILS_SETTINGS` to allow to customize the
 docutils Publisher.

---
 pelican/readers.py            | 10 ++++++++++
 pelican/tests/test_readers.py |  6 ++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 797994cb..ae634c80 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -102,6 +102,9 @@ class RstReader(Reader):
     enabled = bool(docutils)
     file_extensions = ['rst']
 
+    def __init__(self, *args, **kwargs):
+        super(RstReader, self).__init__(*args, **kwargs)
+
     def _parse_metadata(self, document):
         """Return the dict containing document metadata"""
         output = {}
@@ -126,6 +129,10 @@ class RstReader(Reader):
         extra_params = {'initial_header_level': '2',
                         'syntax_highlight': 'short',
                         'input_encoding': 'utf-8'}
+        user_params = self.settings.get('DOCUTILS_SETTINGS')
+        if user_params:
+            extra_params.update(user_params)
+
         pub = docutils.core.Publisher(
             destination_class=docutils.io.StringOutput)
         pub.set_components('standalone', 'restructuredtext', 'html')
@@ -335,6 +342,9 @@ def read_file(path, fmt=None, settings=None):
     if fmt not in EXTENSIONS:
         raise TypeError('Pelican does not know how to parse {}'.format(path))
 
+    if settings is None:
+        settings = {}
+
     reader = EXTENSIONS[fmt](settings)
     settings_key = '%s_EXTENSIONS' % fmt.upper()
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 5381a776..386c0172 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -37,8 +37,7 @@ class RstReaderTest(unittest.TestCase):
 
     def test_article_with_filename_metadata(self):
         content, metadata = readers.read_file(
-                _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
-                settings={})
+                _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'))
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -204,8 +203,7 @@ class MdReaderTest(unittest.TestCase):
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_filename_metadata(self):
         content, metadata = readers.read_file(
-                _path('2012-11-30_md_w_filename_meta#foo-bar.md'),
-                settings={})
+                _path('2012-11-30_md_w_filename_meta#foo-bar.md'))
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',

From 4d2355bc573da90050af13ef9629d3576edce6c6 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Mon, 22 Apr 2013 13:10:33 +0200
Subject: [PATCH 1279/2864] Clean up and improve <head> of notmyidea theme

- remove useless IE stuff (links to files that do not exist)
- use DEFAULT_LANG for the lang attribute
- move charset at the top
---
 pelican/themes/notmyidea/templates/base.html | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 42a2cec1..9bf4b12b 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ DEFAULT_LANG }}">
 <head>
+        <meta charset="utf-8">
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
+        <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}">
         {% if FEED_ALL_ATOM %}
         <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
         {% endif %}
@@ -12,15 +12,8 @@
         {% endif %}
 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
-                <script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">

From f15f5708bf805000f22c844bec4fde0b9fbe9b85 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 23 Apr 2013 06:57:36 -0700
Subject: [PATCH 1280/2864] Update test output for improved notmyidea <head>

---
 .../output/basic/a-markdown-powered-article.html  | 15 ++++-----------
 pelican/tests/output/basic/archives.html          | 15 ++++-----------
 pelican/tests/output/basic/article-1.html         | 15 ++++-----------
 pelican/tests/output/basic/article-2.html         | 15 ++++-----------
 pelican/tests/output/basic/article-3.html         | 15 ++++-----------
 .../output/basic/author/alexis-metaireau.html     | 15 ++++-----------
 pelican/tests/output/basic/categories.html        | 15 ++++-----------
 pelican/tests/output/basic/category/bar.html      | 15 ++++-----------
 pelican/tests/output/basic/category/cat1.html     | 15 ++++-----------
 pelican/tests/output/basic/category/misc.html     | 15 ++++-----------
 pelican/tests/output/basic/category/yeah.html     | 15 ++++-----------
 .../output/basic/filename_metadata-example.html   | 15 ++++-----------
 pelican/tests/output/basic/index.html             | 15 ++++-----------
 pelican/tests/output/basic/oh-yeah.html           | 15 ++++-----------
 pelican/tests/output/basic/override/index.html    | 15 ++++-----------
 .../basic/pages/this-is-a-test-hidden-page.html   | 15 ++++-----------
 .../output/basic/pages/this-is-a-test-page.html   | 15 ++++-----------
 pelican/tests/output/basic/second-article-fr.html | 15 ++++-----------
 pelican/tests/output/basic/second-article.html    | 15 ++++-----------
 pelican/tests/output/basic/tag/bar.html           | 15 ++++-----------
 pelican/tests/output/basic/tag/baz.html           | 15 ++++-----------
 pelican/tests/output/basic/tag/foo.html           | 15 ++++-----------
 pelican/tests/output/basic/tag/foobar.html        | 15 ++++-----------
 pelican/tests/output/basic/tag/oh.html            | 15 ++++-----------
 pelican/tests/output/basic/tag/yeah.html          | 15 ++++-----------
 .../output/basic/this-is-a-super-article.html     | 15 ++++-----------
 pelican/tests/output/basic/unbelievable.html      | 15 ++++-----------
 .../output/custom/a-markdown-powered-article.html | 15 ++++-----------
 pelican/tests/output/custom/archives.html         | 15 ++++-----------
 pelican/tests/output/custom/article-1.html        | 15 ++++-----------
 pelican/tests/output/custom/article-2.html        | 15 ++++-----------
 pelican/tests/output/custom/article-3.html        | 15 ++++-----------
 .../output/custom/author/alexis-metaireau.html    | 15 ++++-----------
 .../output/custom/author/alexis-metaireau2.html   | 15 ++++-----------
 .../output/custom/author/alexis-metaireau3.html   | 15 ++++-----------
 pelican/tests/output/custom/categories.html       | 15 ++++-----------
 pelican/tests/output/custom/category/bar.html     | 15 ++++-----------
 pelican/tests/output/custom/category/cat1.html    | 15 ++++-----------
 pelican/tests/output/custom/category/misc.html    | 15 ++++-----------
 pelican/tests/output/custom/category/yeah.html    | 15 ++++-----------
 .../output/custom/drafts/a-draft-article.html     | 15 ++++-----------
 .../output/custom/filename_metadata-example.html  | 15 ++++-----------
 pelican/tests/output/custom/index.html            | 15 ++++-----------
 pelican/tests/output/custom/index2.html           | 15 ++++-----------
 pelican/tests/output/custom/index3.html           | 15 ++++-----------
 pelican/tests/output/custom/jinja2_template.html  | 15 ++++-----------
 pelican/tests/output/custom/oh-yeah-fr.html       | 15 ++++-----------
 pelican/tests/output/custom/oh-yeah.html          | 15 ++++-----------
 pelican/tests/output/custom/override/index.html   | 15 ++++-----------
 .../custom/pages/this-is-a-test-hidden-page.html  | 15 ++++-----------
 .../output/custom/pages/this-is-a-test-page.html  | 15 ++++-----------
 .../tests/output/custom/second-article-fr.html    | 15 ++++-----------
 pelican/tests/output/custom/second-article.html   | 15 ++++-----------
 pelican/tests/output/custom/tag/bar.html          | 15 ++++-----------
 pelican/tests/output/custom/tag/baz.html          | 15 ++++-----------
 pelican/tests/output/custom/tag/foo.html          | 15 ++++-----------
 pelican/tests/output/custom/tag/foobar.html       | 15 ++++-----------
 pelican/tests/output/custom/tag/oh.html           | 15 ++++-----------
 pelican/tests/output/custom/tag/yeah.html         | 15 ++++-----------
 .../output/custom/this-is-a-super-article.html    | 15 ++++-----------
 pelican/tests/output/custom/unbelievable.html     | 15 ++++-----------
 61 files changed, 244 insertions(+), 671 deletions(-)

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 021f2720..94b6e4ca 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A markdown powered article</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index c941849e..57f4a57a 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index a86bcbd0..cfe91009 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Article 1</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index da74685d..70f38852 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Article 2</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 03641539..20e58fcc 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Article 3</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 9c47c7a0..7f7a8c6b 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog - Alexis Métaireau</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 8f6d9f41..a5eb2621 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index deca8aed..9e3b52f1 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog - bar</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 90edd920..c8912fc2 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog - cat1</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index f966bf89..af223812 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog - misc</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index bce27b13..f401e3d2 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog - yeah</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 0c7f6753..3092742b 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>FILENAME_METADATA example</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index d109f535..c5b9fec3 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 82b90905..62834917 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Oh yeah !</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 82c1e184..e75c75f7 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Override url/save_as</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 06e4bcc1..6b5ae4c8 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>This is a test hidden page</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index c40fc879..9f1572af 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>This is a test page</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 6b3f422e..f0c166de 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Deuxième article</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 657e1e5d..6cc42c66 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Second article</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 725cd165..20824993 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog - bar</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 6a8baa42..65632313 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog - baz</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index d8e06ee3..05a02a5f 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog - foo</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index ab728689..c683f1a1 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog - foobar</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index d0bd6e6f..610a7aa3 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog - oh</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index c730f7f2..2afb8bd3 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A Pelican Blog - yeah</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 0ace28c7..617b8c6d 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>This is a super article !</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 11a68fc5..73c95423 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Unbelievable !</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="/theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="/theme/css/main.css">
                 <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
                 
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie.css"/>
-                <script src="/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="/css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 3499ac40..7b953a61 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A markdown powered article</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 18105799..8437e350 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 84b5946f..c52fdd9a 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Article 1</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index ac5c3e20..7a045bdc 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Article 2</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 34899e3b..f887218c 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Article 3</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index cf241fdf..f18b8ce8 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - Alexis Métaireau</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 312a2bed..23346f5b 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - Alexis Métaireau</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 0419984c..4eda0b62 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - Alexis Métaireau</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 011d1ef4..146d7f3a 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 68ec424c..2c1fc646 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - bar</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 39377513..10c4ce76 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - cat1</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 1f851030..121c9451 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - misc</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index edaaf543..6894e3ee 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - yeah</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index c70b3d87..493eb611 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>A draft article</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 377baac1..626e8c64 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>FILENAME_METADATA example</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index a008617e..1a1d89e9 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index c0d352f6..8ed54b6e 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 53e4d1f6..cf285ea2 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 4932fd1d..95077c2f 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 1184c381..e34e6078 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Trop bien !</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 0fd32bcd..f9f1f1fb 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Oh yeah !</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 353553bb..ad9fb8b1 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Override url/save_as</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index c827c380..b4ac59b0 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>This is a test hidden page</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 07baf855..571211d9 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>This is a test page</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 56077a89..3d5fbd29 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Deuxième article</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 2cd1d2e5..be83983e 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Second article</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 8ec3a2b0..2fed02c2 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - bar</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 98e10102..a6d23907 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - baz</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 4a77477d..04cb7529 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - foo</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index b0e0b51c..71c2d430 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - foobar</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 861077f6..361b1fd2 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - oh</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 528df431..9bbd214b 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Alexis' log - yeah</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="../theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="../theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie.css"/>
-                <script src="../js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="../css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 058f2f2b..000bd555 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>This is a super article !</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 8ed9c54c..e7253497 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+        <meta charset="utf-8">
         <title>Unbelievable !</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="./theme/css/main.css" type="text/css" />
+        <link rel="stylesheet" href="./theme/css/main.css">
                 <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
                         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
         
         <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie.css"/>
-                <script src="./js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="./css/ie6.css"/><![endif]-->
-
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
 </head>
 
 <body id="index" class="home">

From 6db2ad213063462a1463240c912e8d19ac8a969b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 23 Apr 2013 07:32:42 -0700
Subject: [PATCH 1281/2864] Remove "Done" after running "make html"

Pelican now provides better user feedback (see #857), so echoing "Done"
after a "make html" run has become redundant.
---
 pelican/tools/templates/Makefile.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 50fe7081..221568aa 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -41,7 +41,6 @@ help:
 
 
 html: clean $$(OUTPUTDIR)/index.html
-	@echo 'Done'
 
 $$(OUTPUTDIR)/%.html:
 	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)

From 63ddcf22d99b0bb453c2d2f1b4d25d4e37e687a8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 23 Apr 2013 08:09:50 -0700
Subject: [PATCH 1282/2864] Add new contributors to THANKS

---
 THANKS | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/THANKS b/THANKS
index 6ef6ed20..e4eed231 100644
--- a/THANKS
+++ b/THANKS
@@ -20,8 +20,11 @@ Alexis Métaireau
 Allan Whatmough
 Andrea Crotti
 Andrew Laski
+Andrew Spiers
 Arnaud BOS
 asselinpaul
+Axel Haustant
+Benoît HERVIER
 Borgar
 Brandon W Maister
 Brendan Wholihan
@@ -30,12 +33,17 @@ Brian Hsu
 Brian St. Pierre
 Bruno Binet
 BunnyMan
+Chenguang Wang
+Chris Elston
+Chris McDonald (Wraithan)
 Chris Streeter
 Christophe Chauvet
 Clint Howarth
+Colin Dunklau
 Dafydd Crosby
 Dana Woodman
-dave mankoff
+Dave King
+Dave Mankoff
 David Beitey
 David Marble
 Deniz Turgut (Avaris)
@@ -44,6 +52,7 @@ Dirkjan Ochtman
 Dirk Makowski
 draftcode
 Edward Delaporte
+Emily Strickland
 epatters
 Eric Case
 Erik Hetzner
@@ -51,30 +60,43 @@ FELD Boris
 Feth Arezki
 Florian Jacob
 Florian Preinstorfer
+Félix Delval
 Freeculture
+George V. Reilly
 Guillaume
 Guillaume B
-Guillermo López
+Guillermo López
 guillermooo
 Ian Cordasco
+Igor Kalnitsky
+Irfan Ahmad
 Iuri de Silvio
+Ivan Dyedov
+James King
 James Rowe
 jawher
+Jered Boxman
 Jerome
 Jiachen Yang
 Jochen Breuer
 joe di castro
+John Kristensen
+John Mastro
 Jökull Sólberg Auðunsson
+Jomel Imperio
+Joseph Reagle
 Joshua Adelman
 Julian Berman
 Justin Mayer
 Kyle Fuller
 Laureline Guerin
 Leonard Huang
+Leroy Jiang
 Marcel Hellkamp
 Marco Milanesi
 Marcus Fredriksson
 Mario Rodas
+Mark Caudill
 Martin Brochhaus
 Massimo Santini
 Matt Bowcock
@@ -91,17 +113,23 @@ Nico Di Rocco
 Nicolas Duhamel
 Nicolas Perriault
 Nicolas Steinmetz
+Paul Asselin
 Pavel Puchkin
 Perry Roper
+Peter Desmet
 Philippe Pepiot
 Rachid Belaid
+Randall Degges
 Ranjhith Kalisamy
 Remi Rampin
 Rémy HUBSCHER
 renhbo
+Richard Duivenvoorde
+Rogdham
 Roman Skvazh
 Ronny Pfannschmidt
 Rory McCann
+Rıdvan Örsvuran
 saghul
 sam
 Samrat Man Singh
@@ -109,15 +137,21 @@ Simon Conseil
 Simon Liedtke
 Skami18
 solsTiCe d'Hiver
+Steve Schwarz
 Stéphane Bunel
 Stéphane Raimbault
 Stuart Colville
+Talha Mansoor
 Tarek Ziade
 Thanos Lefteris
-the Bunny Man
+Thomas Thurman
 Tobias
 Tomi Pieviläinen
 Trae Blain
 Tshepang Lekhonkhobe
+Valentin-Costel Hăloiu
+Vlad Niculae
+William Light
 Wladislaw Merezhko
+W. Trevor King
 Zoresvit

From 4fa2c30d3f95b1e1914ce020378f169ee9510ac2 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 23 Apr 2013 11:17:45 -0700
Subject: [PATCH 1283/2864] Add new changelog items and link to Tutorials wiki

---
 docs/changelog.rst       | 6 +++++-
 docs/getting_started.rst | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2549504a..0b15dd57 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,7 @@
 Release history
 ###############
 
-3.2 (XXXX-XX-XX)
+3.2 (2013-04-23)
 ================
 
 * Support for Python 3!
@@ -15,6 +15,10 @@ Release history
 * Provide ability to show or hide categories from menu using
   ``DISPLAY_CATEGORIES_ON_MENU`` option
 * Auto-regeneration can be told to ignore files via ``IGNORE_FILES`` setting
+* Improve post-generation feedback to user
+* For multilingual posts, use meta-data to designate which is the original
+  and which is the translation
+* Add ``.mdown`` to list of supported Markdown file extensions
 * Document-relative URL generation (``RELATIVE_URLS``) is now off by default
 
 3.1 (2012-12-04)
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 0c1448fb..c93e0844 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -76,6 +76,10 @@ see all the options you can use::
 
     $ pelican --help
 
+Continue reading below for more detail, and check out the Pelican wiki's
+`Tutorials <https://github.com/getpelican/pelican/wiki/Tutorials>`_ page for
+links to community-published tutorials.
+
 Viewing the generated files
 ---------------------------
 

From ba84658503151d70d2437c201a5105da720cae38 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 24 Apr 2013 09:39:36 -0700
Subject: [PATCH 1284/2864] Add 3.2 release date to changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0b15dd57..b55da1f8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,7 @@
 Release history
 ###############
 
-3.2 (2013-04-23)
+3.2 (2013-04-24)
 ================
 
 * Support for Python 3!

From 0397274fed63c03512b558b88120a7103b6ddd56 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 24 Apr 2013 13:21:28 -0700
Subject: [PATCH 1285/2864] Prepare for next version

---
 docs/changelog.rst | 3 +++
 setup.py           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b55da1f8..fcec0b53 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,9 @@
 Release history
 ###############
 
+3.3 (XXXX-XX-XX)
+================
+
 3.2 (2013-04-24)
 ================
 
diff --git a/setup.py b/setup.py
index 8f65f82e..afb907fa 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.2",
+    version="3.3",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',

From 9af62414dbcb6e5462257c84f26547e0dd9bec41 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 26 Apr 2013 19:37:31 -0400
Subject: [PATCH 1286/2864] Fixes #708 SUMMARY_MAX_LENGTH=0 should return empty
 string

---
 pelican/contents.py            | 9 +++++----
 pelican/tests/test_contents.py | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index a5604856..b130b174 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -231,10 +231,11 @@ class Content(object):
         if hasattr(self, '_summary'):
             return self._summary
 
-        if self.settings['SUMMARY_MAX_LENGTH']:
-            return truncate_html_words(self.content,
-                    self.settings['SUMMARY_MAX_LENGTH'])
-        return self.content
+        if self.settings['SUMMARY_MAX_LENGTH'] is None:
+            return self.content
+
+        return truncate_html_words(self.content,
+                self.settings['SUMMARY_MAX_LENGTH'])
 
     def _set_summary(self, summary):
         """Dummy function"""
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index c837ea03..0ec6bf21 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -71,6 +71,9 @@ class TestPage(unittest.TestCase):
         settings['SUMMARY_MAX_LENGTH'] = 10
         page = Page(**page_kwargs)
         self.assertEqual(page.summary, truncate_html_words(TEST_CONTENT, 10))
+        settings['SUMMARY_MAX_LENGTH'] = 0
+        page = Page(**page_kwargs)
+        self.assertEqual(page.summary, '')
 
     def test_slug(self):
         # If a title is given, it should be used to generate the slug.

From 34f05d4ba649d16bf0e3d94b160838635dd48dc1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 2 May 2013 17:18:19 -0700
Subject: [PATCH 1287/2864] Add warning to docs re: DELETE_OUTPUT_DIRECTORY

---
 docs/settings.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9ff9c8e3..3a32ad22 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -64,8 +64,10 @@ Setting name (default value)                                            What doe
                                                                         ``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
 `PATH_METADATA` (``''``)                                                Like ``FILENAME_METADATA``, but parsed from a page's
                                                                         full path relative to the content source directory.
-`DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the content of the output directory before
-                                                                        generating new files.
+`DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the output directory, and **all** of its contents, before
+                                                                        generating new files. This can be useful in preventing older,
+                                                                        unnecessary files from persisting in your output. However, **this is
+                                                                        a destructive setting and should be handled with extreme care.**
 `FILES_TO_COPY` (``()``)                                                A list of files (or directories) to copy from the source (inside the
                                                                         content directory) to the destination (inside the output directory).
                                                                         For example: ``(('extra/robots.txt', 'robots.txt'),)``.

From 91337940d3e0ea1700b361210957d867cd199b2c Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sun, 14 Apr 2013 18:13:32 +0100
Subject: [PATCH 1288/2864] Make tags and cats case insensitive. Fixes #704.

More precisely, group tags or categories without considering the case.
This fixes the bug where two categories with just the case as difference were
considered as distinct, but generate the same file: one overwriting the other.

Thanks to @Avaris for helping with the tests.
---
 pelican/tests/test_generators.py | 35 ++++++++++++++++++++++++++------
 pelican/urlwrappers.py           | 24 +++++++++++++++++-----
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index c2a5cc67..13156d3b 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -89,17 +89,29 @@ class TestArticlesGenerator(unittest.TestCase):
             ['This is an article without category !', 'published',
              'TestCategory', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
-            ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定', 'published', '指導書', 'article']
+            ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定',
+             'published', '指導書', 'article']
         ]
         self.assertEqual(sorted(articles_expected), sorted(articles))
 
     def test_generate_categories(self):
 
         generator = self.get_populated_generator()
+        # test for name
+        # categories are grouped by slug; if two categories have the same slug
+        # but different names they will be grouped together, the first one in
+        # terms of process order will define the name for that category
         categories = [cat.name for cat, _ in generator.categories]
-        categories_expected = ['Default', 'TestCategory', 'Yeah', 'test',
-                               'yeah', '指導書']
-        self.assertEqual(categories, categories_expected)
+        categories_alternatives = (
+            sorted(['Default', 'TestCategory', 'Yeah', 'test', '指導書']),
+            sorted(['Default', 'TestCategory', 'yeah', 'test', '指導書']),
+        )
+        self.assertTrue(sorted(categories) in categories_alternatives)
+        # test for slug
+        categories = [cat.slug for cat, _ in generator.categories]
+        categories_expected = ['default', 'testcategory', 'yeah', 'test',
+                               'zhi-dao-shu']
+        self.assertEqual(sorted(categories), sorted(categories_expected))
 
     def test_do_not_use_folder_as_category(self):
 
@@ -113,9 +125,20 @@ class TestArticlesGenerator(unittest.TestCase):
                             CUR_DIR, _DEFAULT_CONFIG['THEME'], None,
                             _DEFAULT_CONFIG['MARKUP'])
         generator.generate_context()
-
+        # test for name
+        # categories are grouped by slug; if two categories have the same slug
+        # but different names they will be grouped together, the first one in
+        # terms of process order will define the name for that category
         categories = [cat.name for cat, _ in generator.categories]
-        self.assertEqual(categories, ['Default', 'Yeah', 'test', 'yeah', '指導書'])
+        categories_alternatives = (
+            sorted(['Default', 'Yeah', 'test', '指導書']),
+            sorted(['Default', 'yeah', 'test', '指導書']),
+        )
+        self.assertTrue(sorted(categories) in categories_alternatives)
+        # test for slug
+        categories = [cat.slug for cat, _ in generator.categories]
+        categories_expected = ['default', 'yeah', 'test', 'zhi-dao-shu']
+        self.assertEqual(sorted(categories), sorted(categories_expected))
 
     def test_direct_templates_save_as_default(self):
 
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 393d4c87..b0df61ad 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -13,21 +13,35 @@ logger = logging.getLogger(__name__)
 @functools.total_ordering
 class URLWrapper(object):
     def __init__(self, name, settings):
+        # next 2 lines are redundant with the setter of the name property
+        # but are here for clarity
+        self._name = name
+        self.slug = slugify(name)
         self.name = name
-        self.slug = slugify(self.name)
         self.settings = settings
 
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        self._name = name
+        self.slug = slugify(name)
+
     def as_dict(self):
-        return self.__dict__
+        d = self.__dict__
+        d['name'] = self.name
+        return d
 
     def __hash__(self):
-        return hash(self.name)
+        return hash(self.slug)
 
     def _key(self):
-        return self.name
+        return self.slug
 
     def _normalize_key(self, key):
-        return six.text_type(key)
+        return six.text_type(slugify(key))
 
     def __eq__(self, other):
         return self._key() == self._normalize_key(other)

From 084818b3999c0d2656fd04dc0731b3f51f32152b Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 4 May 2013 04:55:42 -0400
Subject: [PATCH 1289/2864] Handle critical exception logging correctly in
 localized systems

Python generates certain exception messages (like IOError) in system
language, if locale is set. This ensures that the message is properly
converted to unicode in Python 2.
---
 pelican/__init__.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 37f057f9..74499da4 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -378,7 +378,13 @@ def main():
             pelican.run()
 
     except Exception as e:
-        logger.critical(e)
+        # localized systems have errors in native language if locale is set
+        # so convert the message to unicode with the correct encoding
+        msg = str(e)
+        if not six.PY3:
+            msg = msg.decode(locale.getpreferredencoding(False))
+
+        logger.critical(msg)
 
         if (args.verbosity == logging.DEBUG):
             raise

From 43f4d0df7a0778df8a4a868780fc0a2d8dbee7b7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 6 May 2013 06:51:54 -0700
Subject: [PATCH 1290/2864] Add reST example to arbitrary metadata FAQ entry

---
 docs/faq.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index e59bb4ae..f8bc2dca 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -77,7 +77,11 @@ include the following at the top of the article::
 
     Modified: 2012-08-08
 
-That metadata can then be accessed in the template::
+For reStructuredText, this metadata should of course be prefixed with a colon::
+
+    :Modified: 2012-08-08
+
+This metadata can then be accessed in the template::
 
     {% if article.modified %}
     Last modified: {{ article.modified }}

From e9ca508e8e54e62d909a2c6737a87983a6e641e5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 6 May 2013 07:28:25 -0700
Subject: [PATCH 1291/2864] Add more detail to Pygments FAQ entry. Fixes #821

---
 docs/faq.rst | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index f8bc2dca..a8043e07 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -48,8 +48,17 @@ Pygments adds some classes to the generated content. These classes are used by
 themes to style code syntax highlighting via CSS. Specifically, you can
 customize the appearance of your syntax highlighting via the ``.highlight pre``
 class in your theme's CSS file. To see how various styles can be used to render
-Django code, for example, you can use the demo `on the project website
-<http://pygments.org/demo/15101/>`_.
+Django code, for example, use the style selector drop-down at top-right on the
+`Pygments project demo site <http://pygments.org/demo/15101/>`_.
+
+You can use the following example commands to generate a starting CSS file from
+a Pygments built-in style (in this case, "monokai") and then copy the generated
+CSS file to your new theme::
+
+    pygmentize -S monokai -f html -a .highlight > pygment.css
+    cp pygment.css path/to/theme/static/css/
+
+Don't forget to import your ``pygment.css`` file from your main CSS file.
 
 How do I create my own theme?
 ==============================

From 5fa3504ad08b38bdd88602ba239e7a22f55a8dfb Mon Sep 17 00:00:00 2001
From: Joe Shaw <joeshaw@litl.com>
Date: Wed, 8 May 2013 09:40:20 -0400
Subject: [PATCH 1292/2864] use string find() instead of index().  Fixes #880.

We're expecting a non-match to return -1, which is what find() does,
but index() instead throws a ValueError.
---
 pelican/tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 9e477c2c..8ebb7659 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -37,7 +37,7 @@ def decode_wp_content(content, br=True):
         pre_index = 0
 
         for pre_part in pre_parts:
-            start = pre_part.index("<pre")
+            start = pre_part.find("<pre")
             if start == -1:
                 content = content + pre_part
                 continue

From fa1550ceaab0e153467f1aa62226f97c5501036d Mon Sep 17 00:00:00 2001
From: ben2367 <benjamin.port@ben2367.fr>
Date: Thu, 9 May 2013 01:39:07 +0200
Subject: [PATCH 1293/2864] Update importer documentation

Dependencies were not the good one, wordpress importer needs BeautifulSoup4 and lxml
---
 docs/importer.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index bb24b4b9..6625c044 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -26,8 +26,8 @@ Dependencies
 
 ``pelican-import`` has some dependencies not required by the rest of Pelican:
 
-- *BeautifulSoup*, for WordPress and Dotclear import. Can be installed like
-  any other Python package (``pip install BeautifulSoup``).
+- *BeautifulSoup4* and *lxml*, for WordPress and Dotclear import. Can be installed like
+  any other Python package (``pip install BeautifulSoup4 lxml``).
 - *Feedparser*, for feed import (``pip install feedparser``).
 - *Pandoc*, see the `Pandoc site`_ for installation instructions on your
   operating system.

From 75f214103e208ee4a0d065692d83cafbd2300e26 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 10 May 2013 03:50:33 -0400
Subject: [PATCH 1294/2864] Markdown summary should not include content
 footnote

Markdown instance carries state for subsequent uses. Content
and summary parsing is done with the same instance. Since
footnotes are processed with an extension and stored as state,
content footnote is duplicated for summary.

This PR adds a ``.reset()`` call before summary parsing to clear
the state. It also adds a test case with footnotes.
---
 pelican/readers.py                            |  2 +
 .../article_with_markdown_and_footnote.md     |  8 ++++
 pelican/tests/test_generators.py              |  4 +-
 pelican/tests/test_readers.py                 | 37 +++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 pelican/tests/content/article_with_markdown_and_footnote.md

diff --git a/pelican/readers.py b/pelican/readers.py
index 797994cb..ca39a1c2 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -166,6 +166,8 @@ class MarkdownReader(Reader):
             name = name.lower()
             if name == "summary":
                 summary_values = "\n".join(value)
+                # reset the markdown instance to clear any state
+                self._md.reset()
                 summary = self._md.convert(summary_values)
                 output[name] = self.process_metadata(name, summary)
             else:
diff --git a/pelican/tests/content/article_with_markdown_and_footnote.md b/pelican/tests/content/article_with_markdown_and_footnote.md
new file mode 100644
index 00000000..dc257d62
--- /dev/null
+++ b/pelican/tests/content/article_with_markdown_and_footnote.md
@@ -0,0 +1,8 @@
+Title: Article with markdown containing footnotes
+Date: 2012-10-31
+Summary: Summary with **inline** markup *should* be supported.
+
+This is some content[^1] with some footnotes[^footnote]
+
+[^1]: Numbered footnote
+[^footnote]: Named footnote
\ No newline at end of file
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 13156d3b..fa57322d 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -90,7 +90,9 @@ class TestArticlesGenerator(unittest.TestCase):
              'TestCategory', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定',
-             'published', '指導書', 'article']
+             'published', '指導書', 'article'],
+            ['Article with markdown containing footnotes', 'published',
+             'Default', 'article']
         ]
         self.assertEqual(sorted(articles_expected), sorted(articles))
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 5381a776..9d2ea50a 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -144,6 +144,43 @@ class MdReaderTest(unittest.TestCase):
         for key, value in metadata.items():
             self.assertEqual(value, expected[key], key)
 
+
+    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
+    def test_article_with_footnote(self):
+        reader = readers.MarkdownReader({})
+        content, metadata = reader.read(
+            _path('article_with_markdown_and_footnote.md'))
+        expected_content = (
+            '<p>This is some content'
+            '<sup id="fnref:1"><a class="footnote-ref" href="#fn:1" '
+            'rel="footnote">1</a></sup>'
+            ' with some footnotes'
+            '<sup id="fnref:footnote"><a class="footnote-ref" '
+            'href="#fn:footnote" rel="footnote">2</a></sup></p>\n'
+            
+            '<div class="footnote">\n'
+            '<hr />\n<ol>\n<li id="fn:1">\n'
+            '<p>Numbered footnote&#160;'
+            '<a class="footnote-backref" href="#fnref:1" rev="footnote" '
+            'title="Jump back to footnote 1 in the text">&#8617;</a></p>\n'
+            '</li>\n<li id="fn:footnote">\n'
+            '<p>Named footnote&#160;'
+            '<a class="footnote-backref" href="#fnref:footnote" rev="footnote" '
+            'title="Jump back to footnote 2 in the text">&#8617;</a></p>\n'
+            '</li>\n</ol>\n</div>')
+        expected_metadata = {
+            'title': 'Article with markdown containing footnotes',
+            'summary': (
+                '<p>Summary with <strong>inline</strong> markup '
+                '<em>should</em> be supported.</p>'),
+            'date': datetime.datetime(2012, 10, 31),
+            'slug': 'article-with-markdown-containing-footnotes',
+        }
+        self.assertEqual(content, expected_content)
+        for key, value in metadata.items():
+            self.assertEqual(value, expected_metadata[key], key)
+
+
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_file_extensions(self):
         reader = readers.MarkdownReader({})

From ead50cca621829148aa599d91c3935cff3bc304d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Mon, 13 May 2013 13:53:52 +1000
Subject: [PATCH 1295/2864] some cleanup

---
 pelican/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 53024e3d..6e9e676b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -246,7 +246,7 @@ def parse_arguments():
 
     parser.add_argument('-d', '--delete-output-directory',
         dest='delete_outputdir',
-        action='store_true', 
+        action='store_true',
         default=None,
         help='Delete the output directory.')
 
@@ -357,7 +357,7 @@ def main():
 
                         if modified['theme'] is None:
                             logger.warning('Empty theme folder. Using `basic` theme.')
- 
+
                         pelican.run()
 
                 except KeyboardInterrupt:
@@ -374,7 +374,6 @@ def main():
                 finally:
                     time.sleep(.5)  # sleep to avoid cpu load
 
-
         else:
             if next(watchers['content']) is None:
                 logger.warning('No valid files found in content.')

From 19de7539f453134f7a85b9af16b4b4a295a44df3 Mon Sep 17 00:00:00 2001
From: Dominique Plante <dominique.plante@gmail.com>
Date: Tue, 14 May 2013 23:41:18 -0700
Subject: [PATCH 1296/2864] adhere to PEP8 coding standards

---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index afb907fa..122cad67 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-requires = ['feedgenerator>=1.5', 'jinja2 >= 2.6', 'pygments', 'docutils', 'pytz',
-            'blinker', 'unidecode', 'six']
+requires = ['feedgenerator>=1.5', 'jinja2 >= 2.6', 'pygments', 'docutils',
+            'pytz', 'blinker', 'unidecode', 'six']
 
 try:
     import argparse  # NOQA
@@ -15,7 +15,7 @@ entry_points = {
         'pelican-import = pelican.tools.pelican_import:main',
         'pelican-quickstart = pelican.tools.pelican_quickstart:main',
         'pelican-themes = pelican.tools.pelican_themes:main'
-   ]
+    ]
 }
 
 

From 7024fe11922cbfc0b7f5df224ba269711e918f3d Mon Sep 17 00:00:00 2001
From: Dominique Plante <dominique.plante@gmail.com>
Date: Wed, 15 May 2013 22:18:35 -0700
Subject: [PATCH 1297/2864] adhere to pep8

---
 pelican/contents.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index b130b174..fec8af14 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -145,8 +145,8 @@ class Content(object):
             'date': getattr(self, 'date', datetime.now()),
             'author': getattr(self, 'author', ''),
             'category': getattr(self, 'category',
-                self.settings['DEFAULT_CATEGORY']),
-            })
+                                self.settings['DEFAULT_CATEGORY']),
+        })
         return metadata
 
     def _expand_settings(self, key):
@@ -202,7 +202,7 @@ class Content(object):
                     origin = origin.replace('\\', '/')  # Fow windows paths.
                 else:
                     logger.warning("Unable to find {fn}, skipping url"
-                                    " replacement".format(fn=value))
+                                   " replacement".format(fn=value))
 
             return ''.join((m.group('markup'), m.group('quote'), origin,
                             m.group('quote')))
@@ -235,7 +235,7 @@ class Content(object):
             return self.content
 
         return truncate_html_words(self.content,
-                self.settings['SUMMARY_MAX_LENGTH'])
+                                   self.settings['SUMMARY_MAX_LENGTH'])
 
     def _set_summary(self, summary):
         """Dummy function"""
@@ -312,5 +312,5 @@ def is_valid_content(content, f):
         return True
     except NameError as e:
         logger.error("Skipping %s: could not find information about "
-                      "'%s'" % (f, e))
+                     "'%s'" % (f, e))
         return False

From 2856f49b3a25f932ca055036541237b3f5d36283 Mon Sep 17 00:00:00 2001
From: "mr.Shu" <mr@shu.io>
Date: Sat, 18 May 2013 08:20:50 +0200
Subject: [PATCH 1298/2864] Updated pelican.server not started error message.

---
 pelican/tools/templates/develop_server.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index 65c54622..6dd11e6d 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -74,7 +74,7 @@ function start_up(){
     echo "Pelican didn't start. Is the pelican package installed?"
     return 1
   elif ! alive $$srv_pid ; then
-    echo "pelican.server didn't start. Is the pelican package installed?"
+    echo "pelican.server didn't start. Is there something else which uses port 8000?"
     return 1
   fi
   echo 'Pelican and pelican.server processes now running in background.'

From 6c9d158609f10963e83c9bc18e355f9ce2673869 Mon Sep 17 00:00:00 2001
From: Dominique Plante <dominique.plante@gmail.com>
Date: Sat, 18 May 2013 06:33:49 -0700
Subject: [PATCH 1299/2864] makes Pelican-quickstart debuggable in PyCharm

---
 pelican/tools/pelican_quickstart.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index a6045256..8d697fa3 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -283,3 +283,6 @@ needed by Pelican.
             print('Error: {0}'.format(e))
 
     print('Done. Your new project is available at %s' % CONF['basedir'])
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file

From 675d6c81cd6ca88c8018bd608c46735ab29ba8b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 19 May 2013 22:28:53 +1000
Subject: [PATCH 1300/2864] Include the md / rst files in the dist

---
 MANIFEST.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 2f2ea824..77619971 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,4 @@
 include *.rst
 global-include *.py
-recursive-include pelican *.html *.css *png *.in
+recursive-include pelican *.html *.css *png *.in *.rst *.md
 include LICENSE THANKS docs/changelog.rst
-recursive-include tests *
-recursive-exclude tests *.pyc

From 7a3bc410d0757ee4bec22ffaf6920e2f27878fbd Mon Sep 17 00:00:00 2001
From: Dominique Plante <dominique.plante@gmail.com>
Date: Thu, 23 May 2013 21:53:46 -0700
Subject: [PATCH 1301/2864] Add test for the case where we try to read a file
 with an unhandled extension

---
 .../content/article_with_metadata.unknownextension   | 12 ++++++++++++
 pelican/tests/test_readers.py                        | 11 +++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pelican/tests/content/article_with_metadata.unknownextension

diff --git a/pelican/tests/content/article_with_metadata.unknownextension b/pelican/tests/content/article_with_metadata.unknownextension
new file mode 100644
index 00000000..d4bac1c0
--- /dev/null
+++ b/pelican/tests/content/article_with_metadata.unknownextension
@@ -0,0 +1,12 @@
+
+This is a super article !
+#########################
+
+:tags: foo, bar, foobar
+:date: 2010-12-02 10:14
+:category: yeah
+:author: Alexis Métaireau
+:summary:
+    Multi-line metadata should be supported
+    as well as **inline markup**.
+:custom_field: http://notmyidea.org
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 47cb70ee..c3c7eaef 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -14,6 +14,17 @@ CONTENT_PATH = os.path.join(CUR_DIR, 'content')
 def _path(*args):
     return os.path.join(CONTENT_PATH, *args)
 
+class ReaderTests(unittest.TestCase):
+    def test_readfile_unknown_extension(self):
+        f = _path('article_with_metadata.unknownextension')
+        with self.assertRaises(TypeError) as cm:
+            readers.read_file(f)
+        ex = cm.exception
+        self.assertEqual('Pelican does not know how to parse ' + f, ex.message)
+        #, setattr, root.c1.c2, 'text',  "test")
+        #  self.assertTrue(1 == 0)
+        #  except TypeError:
+        #  self.assertTrue(1 == 1)
 
 class RstReaderTest(unittest.TestCase):
 

From 0ecae1f50d193c18980f5c023fe93b6d94e48c13 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sun, 26 May 2013 11:38:55 +0100
Subject: [PATCH 1302/2864] Encoding issue in pelican-quickstart. Fixes #904

---
 pelican/tools/pelican_quickstart.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index a6045256..e62bc5ca 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -37,8 +37,7 @@ def _input_compat(prompt):
     if six.PY3:
         r = input(prompt)
     else:
-        # FIXME: why use this with @decoding_strings?
-        r = raw_input(prompt).decode('utf-8')
+        r = raw_input(prompt)
     return r
 
 if six.PY3:

From f8cf685c30590d16dbd59bbc627f96eec5a4dc89 Mon Sep 17 00:00:00 2001
From: Chris Brannon <chris@the-brannons.com>
Date: Mon, 27 May 2013 14:49:16 +1000
Subject: [PATCH 1303/2864] Use the builtin "open" on Python 3.

---
 pelican/writers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index f848d498..27246e4f 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -6,7 +6,9 @@ import os
 import locale
 import logging
 
-from codecs import open
+if not six.PY3:
+    from codecs import open
+
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 from jinja2 import Markup
 from pelican.paginator import Paginator

From 2bf91e54cd94f884ea63d41067e4bd7f44963dbd Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 26 May 2013 11:17:46 +0200
Subject: [PATCH 1304/2864] Tox: use git urls for py3 versions of smartypants
 and typogrify

+ This make it easier to use tox with py3: no need to checkout manually
  typogrify and smartypants repos and use tox's distshare.
+ Remove feedgenerator as it is already a dependy for pelican.
---
 tox.ini | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index fe32d48f..65f398bc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,7 +35,6 @@ deps =
     mock
     Markdown
     BeautifulSoup4
-    feedgenerator
     typogrify
 
 [testenv:py32]
@@ -52,6 +51,5 @@ deps =
     mock
     Markdown
     BeautifulSoup4
-    feedgenerator
-#    {distshare}/smartypants-1.6.0.3.zip
-#    {distshare}/typogrify-2.0.0.zip
+    git+https://github.com/dmdm/smartypants.git#egg=smartypants
+    git+https://github.com/dmdm/typogrify.git@py3k#egg=typogrify

From 529d0d99c5d5789bf3b91c7235fcad89c44bd108 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 26 May 2013 11:18:34 +0200
Subject: [PATCH 1305/2864] Update version requirement with feedgenerator 1.6

feedgenerator 1.6 changes the order of attributes in feeds, so we must use this
version to have consistent functionnal tests.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 122cad67..cd05b924 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-requires = ['feedgenerator>=1.5', 'jinja2 >= 2.6', 'pygments', 'docutils',
+requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.6', 'pygments', 'docutils',
             'pytz', 'blinker', 'unidecode', 'six']
 
 try:

From fd018d7ceb47c761f9e4e8bc30f85e4f06fa847a Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sat, 25 May 2013 00:09:06 +0200
Subject: [PATCH 1306/2864] Update tests output with feedgenerator 1.6

feedgenerator 1.6 includes a change to write feed attributes in a consistent
order between py2.7 and py3.3.
---
 pelican/tests/output/custom/feeds/all.rss.xml  | 2 +-
 pelican/tests/output/custom/feeds/bar.rss.xml  | 2 +-
 pelican/tests/output/custom/feeds/cat1.rss.xml | 2 +-
 pelican/tests/output/custom/feeds/misc.rss.xml | 2 +-
 pelican/tests/output/custom/feeds/yeah.rss.xml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 0ce2c837..89176ac0 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index a7495c36..148411be 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index 349c3fe6..62b93fd1 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index a0fa290d..1d295abc 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index a54e48e4..b252c26a 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Thu, 02 Dec 2010 10:14:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Thu, 02 Dec 2010 10:14:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;

From 427a5ca3c38a7ac32d3e894691124470fd054011 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sat, 25 May 2013 00:23:52 +0200
Subject: [PATCH 1307/2864] Include feeds and mkd files in the dist package.

This files are needed to run the tests.
---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 77619971..136243c0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include *.rst
 global-include *.py
-recursive-include pelican *.html *.css *png *.in *.rst *.md
+recursive-include pelican *.html *.css *png *.in *.rst *.md *.mkd *.xml
 include LICENSE THANKS docs/changelog.rst

From 7057d3742bfdbed91dec87c315686024758d9ed2 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 26 May 2013 12:44:32 +0200
Subject: [PATCH 1308/2864] Drop python 3.2 support and move to python 3.3.

Jinja 2.7 (released 2013-05-20) supports only Python3 >=3.3 so it is time to
drop Python 3.2 and move to 3.3
---
 .travis.yml              |  2 +-
 CONTRIBUTING.rst         |  2 +-
 docs/contribute.rst      | 31 ++++++++++++++-----------------
 docs/getting_started.rst |  7 +++----
 setup.py                 |  7 +------
 tox.ini                  | 34 ++--------------------------------
 6 files changed, 22 insertions(+), 61 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa0c2f0a..1ff512b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 python:
     - "2.7"
-    - "3.2"
+    - "3.3"
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq --no-install-recommends asciidoc
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 41c38cc7..b28b22a3 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -13,7 +13,7 @@ Contribution submission guidelines
 * Adhere to PEP8 coding standards whenever possible.
 * Check for unnecessary whitespace via ``git diff --check`` before committing.
 * **Add docs and tests for your changes**.
-* `Run all the tests`_ **on both Python 2.7+ and 3.2+** to ensure nothing was
+* `Run all the tests`_ **on both Python 2.7 and 3.3** to ensure nothing was
   accidentally broken.
 * First line of your commit message should start with present-tense verb, be 50
   characters or less, and include the relevant issue number(s) if applicable.
diff --git a/docs/contribute.rst b/docs/contribute.rst
index ffdda986..80d07644 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -43,6 +43,10 @@ To install Pelican and its dependencies::
 
     $ python setup.py develop
 
+Or using ``pip``::
+
+    $ pip install -e .
+
 Coding standards
 ================
 
@@ -88,28 +92,22 @@ functional tests. To do so, you can use the following two commands::
         samples/content/
     $ pelican -o pelican/tests/output/basic/ samples/content/
 
-Testing on Python 3.x
----------------------
+Testing on Python 2 and 3
+-------------------------
 
-Testing on Python 3.x currently requires some extra steps: installing
-Python 3.x-compatible versions of dependent packages and plugins.
+Testing on Python 3 currently requires some extra steps: installing
+Python 3-compatible versions of dependent packages and plugins.
 
-However, you must tell ``tox`` to use those Python 3.x-compatible libraries.
-If you forget this, ``tox`` will pull the regular packages from PyPI, and the
-tests will fail.
+Tox_ is a useful tool to run tests on both versions. It will install the
+Python 3-compatible version of dependent packages.
 
-Tell ``tox`` about the local packages thusly: enter the source directory of
-smartypants and run ``tox`` there. Do this again for the ``typogrify`` and
-``webassets`` packages. SmartyPants and Typogrify do not have real tests, and
-``webassets`` will fail noisily, but as a result we get these libraries neatly
-packaged in tox's ``distshare`` directory, which we need in order to run
-``tox`` for Pelican.
+.. _Tox: http://testrun.org/tox/latest/
 
-Python 3.x development tips
-===========================
+Python 3 development tips
+=========================
 
 Here are some tips that may be useful when doing some code for both Python 2.7
-and Python 3.x at the same time:
+and Python 3 at the same time:
 
 - Assume every string and literal is unicode (import unicode_literals):
 
@@ -144,4 +142,3 @@ and Python 3.x at the same time:
   changed it where I felt necessary.
 
 - Changed xrange() back to range(), so it is valid in both Python versions.
-
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index c93e0844..ddffb5ff 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -4,10 +4,9 @@ Getting started
 Installing Pelican
 ==================
 
-Pelican currently runs best on Python 2.7.x; earlier versions of Python are not
-supported. There is provisional support for Python 3.2 and higher, although
-there may be rough edges, particularly with regards to optional 3rd-party
-components.
+Pelican currently runs best on Python 2.7.x; earlier versions of Python are
+not supported. There is provisional support for Python 3.3, although there may
+be rough edges, particularly with regards to optional 3rd-party components.
 
 You can install Pelican via several different methods. The simplest is via
 `pip <http://www.pip-installer.org/>`_::
diff --git a/setup.py b/setup.py
index cd05b924..83beb461 100755
--- a/setup.py
+++ b/setup.py
@@ -4,11 +4,6 @@ from setuptools import setup
 requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.6', 'pygments', 'docutils',
             'pytz', 'blinker', 'unidecode', 'six']
 
-try:
-    import argparse  # NOQA
-except ImportError:
-    requires.append('argparse')
-
 entry_points = {
     'console_scripts': [
         'pelican = pelican:main',
@@ -41,9 +36,9 @@ setup(
          'Environment :: Console',
          'License :: OSI Approved :: GNU Affero General Public License v3',
          'Operating System :: OS Independent',
+         'Programming Language :: Python :: 2',
          'Programming Language :: Python :: 2.7',
          'Programming Language :: Python :: 3',
-         'Programming Language :: Python :: 3.2',
          'Programming Language :: Python :: 3.3',
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Software Development :: Libraries :: Python Modules',
diff --git a/tox.ini b/tox.ini
index 65f398bc..d9d759e9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,29 +1,8 @@
-# This tests the unified codebase (py26-py32) of Pelican.
+# This tests the unified codebase (py27, py33) of Pelican.
 # depends on some external libraries that aren't released yet.
-#
-# To run Pelican, you will already have checked out and installed them.
-#
-# Now we must tell tox about this package, otherwise tox would load the old
-# libraries from PyPi.
-#
-# Run tox from the libraries source tree. It will save its package in
-# the distshare directory from where the tests here will pick it up.
-#
-# Do that for
-# https://github.com/dmdm/smartypants.git
-#
-# and typogrify:
-# https://github.com/dmdm/typogrify/tree/py3k
-#
-# CAVEAT:
-# -------
-#
-# Please be aware that my port of typogrify is just 2to3'd.
-# It is not backwards compatible with Python 2.
-
 
 [tox]
-envlist = py27,py32,py33
+envlist = py27,py33
 
 [testenv]
 commands =
@@ -37,15 +16,6 @@ deps =
     BeautifulSoup4
     typogrify
 
-[testenv:py32]
-deps =
-    mock
-    Markdown
-    BeautifulSoup4
-    feedgenerator
-#    {distshare}/smartypants-1.6.0.3.zip
-#    {distshare}/typogrify-2.0.0.zip
-
 [testenv:py33]
 deps =
     mock

From c6de4430a0adedbe1eb2e08df9713e92ce56dde5 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sun, 2 Jun 2013 09:37:59 -0400
Subject: [PATCH 1309/2864] tests/test_readers.py: Remove redundant 'expected'
 check in AdReaderTest

AdReaderTest.test_article_with_asc_extension() has had duplicate
checks on the expected metadata since it was created by 49f481e3 (Add
asciidoc reader support, 2013-10-28).  This commit removes the
duplicate entry.
---
 pelican/tests/test_readers.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 47cb70ee..f3427066 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -303,17 +303,6 @@ class AdReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEqual(value, metadata[key], key)
 
-        expected = {
-            'category': 'Blog',
-            'author': 'Author O. Article',
-            'title': 'Test AsciiDoc File Header',
-            'date': datetime.datetime(2011, 9, 15, 9, 5),
-            'tags': ['Linux', 'Python', 'Pelican'],
-        }
-
-        for key, value in expected.items():
-            self.assertEqual(value, metadata[key], key)
-
     @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
     def test_article_with_asc_options(self):
         # test to ensure the ASCIIDOC_OPTIONS is being used

From e9dc1dd478679847cd914dd3104bcc525503719b Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sun, 24 Mar 2013 08:38:19 -0400
Subject: [PATCH 1310/2864] settings: Make DEFAULT_CONFIG public

This dictionary is accessed by plugins (like `summary`) which add new
settings, so it should be public (i.e. no prefixed underscore).

The changed name length would have led to a re-indenting of the
default contents anyway, so I shifted them all to four spaces.
---
 pelican/contents.py              |   4 +-
 pelican/settings.py              | 169 +++++++++++++++----------------
 pelican/tests/support.py         |   4 +-
 pelican/tests/test_contents.py   |  14 +--
 pelican/tests/test_generators.py |  10 +-
 pelican/tests/test_settings.py   |  12 +--
 6 files changed, 105 insertions(+), 108 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index fec8af14..135c4866 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -14,7 +14,7 @@ from datetime import datetime
 
 
 from pelican import signals
-from pelican.settings import _DEFAULT_CONFIG
+from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import (slugify, truncate_html_words, memoized, strftime,
                            python_2_unicode_compatible, deprecated_attribute,
                            path_to_url)
@@ -44,7 +44,7 @@ class Content(object):
         if metadata is None:
             metadata = {}
         if settings is None:
-            settings = copy.deepcopy(_DEFAULT_CONFIG)
+            settings = copy.deepcopy(DEFAULT_CONFIG)
 
         self.settings = settings
         self._content = content
diff --git a/pelican/settings.py b/pelican/settings.py
index 091999a7..b6092fb3 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -25,84 +25,81 @@ logger = logging.getLogger(__name__)
 
 DEFAULT_THEME = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                              'themes', 'notmyidea')
-_DEFAULT_CONFIG = {'PATH': os.curdir,
-                   'ARTICLE_DIR': '',
-                   'ARTICLE_EXCLUDES': ('pages',),
-                   'PAGE_DIR': 'pages',
-                   'PAGE_EXCLUDES': (),
-                   'THEME': DEFAULT_THEME,
-                   'OUTPUT_PATH': 'output',
-                   'MARKUP': ('rst', 'md'),
-                   'STATIC_PATHS': ['images', ],
-                   'THEME_STATIC_PATHS': ['static', ],
-                   'FEED_ALL_ATOM': os.path.join('feeds', 'all.atom.xml'),
-                   'CATEGORY_FEED_ATOM': os.path.join('feeds', '%s.atom.xml'),
-                   'TRANSLATION_FEED_ATOM': os.path.join(
-                       'feeds', 'all-%s.atom.xml'),
-                   'FEED_MAX_ITEMS': '',
-                   'SITEURL': '',
-                   'SITENAME': 'A Pelican Blog',
-                   'DISPLAY_PAGES_ON_MENU': True,
-                   'DISPLAY_CATEGORIES_ON_MENU': True,
-                   'PDF_GENERATOR': False,
-                   'OUTPUT_SOURCES': False,
-                   'OUTPUT_SOURCES_EXTENSION': '.text',
-                   'USE_FOLDER_AS_CATEGORY': True,
-                   'DEFAULT_CATEGORY': 'misc',
-                   'WITH_FUTURE_DATES': True,
-                   'CSS_FILE': 'main.css',
-                   'NEWEST_FIRST_ARCHIVES': True,
-                   'REVERSE_CATEGORY_ORDER': False,
-                   'DELETE_OUTPUT_DIRECTORY': False,
-                   'ARTICLE_URL': '{slug}.html',
-                   'ARTICLE_SAVE_AS': '{slug}.html',
-                   'ARTICLE_LANG_URL': '{slug}-{lang}.html',
-                   'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html',
-                   'PAGE_URL': 'pages/{slug}.html',
-                   'PAGE_SAVE_AS': os.path.join('pages', '{slug}.html'),
-                   'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
-                   'PAGE_LANG_SAVE_AS': os.path.join(
-                       'pages', '{slug}-{lang}.html'),
-                   'STATIC_URL': '{path}',
-                   'STATIC_SAVE_AS': '{path}',
-                   'CATEGORY_URL': 'category/{slug}.html',
-                   'CATEGORY_SAVE_AS': os.path.join('category', '{slug}.html'),
-                   'TAG_URL': 'tag/{slug}.html',
-                   'TAG_SAVE_AS': os.path.join('tag', '{slug}.html'),
-                   'AUTHOR_URL': 'author/{slug}.html',
-                   'AUTHOR_SAVE_AS': os.path.join('author', '{slug}.html'),
-                   'YEAR_ARCHIVE_SAVE_AS': False,
-                   'MONTH_ARCHIVE_SAVE_AS': False,
-                   'DAY_ARCHIVE_SAVE_AS': False,
-                   'RELATIVE_URLS': False,
-                   'DEFAULT_LANG': 'en',
-                   'TAG_CLOUD_STEPS': 4,
-                   'TAG_CLOUD_MAX_ITEMS': 100,
-                   'DIRECT_TEMPLATES': ('index', 'tags', 'categories',
-                                        'archives'),
-                   'EXTRA_TEMPLATES_PATHS': [],
-                   'PAGINATED_DIRECT_TEMPLATES': ('index', ),
-                   'PELICAN_CLASS': 'pelican.Pelican',
-                   'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
-                   'DATE_FORMATS': {},
-                   'JINJA_EXTENSIONS': [],
-                   'LOCALE': '',  # defaults to user locale
-                   'DEFAULT_PAGINATION': False,
-                   'DEFAULT_ORPHANS': 0,
-                   'DEFAULT_METADATA': (),
-                   'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*',
-                   'PATH_METADATA': '',
-                   'FILES_TO_COPY': (),
-                   'DEFAULT_STATUS': 'published',
-                   'ARTICLE_PERMALINK_STRUCTURE': '',
-                   'TYPOGRIFY': False,
-                   'SUMMARY_MAX_LENGTH': 50,
-                   'PLUGIN_PATH': '',
-                   'PLUGINS': [],
-                   'TEMPLATE_PAGES': {},
-                   'IGNORE_FILES': ['.#*']
-                   }
-
+DEFAULT_CONFIG = {
+    'PATH': os.curdir,
+    'ARTICLE_DIR': '',
+    'ARTICLE_EXCLUDES': ('pages',),
+    'PAGE_DIR': 'pages',
+    'PAGE_EXCLUDES': (),
+    'THEME': DEFAULT_THEME,
+    'OUTPUT_PATH': 'output',
+    'MARKUP': ('rst', 'md'),
+    'STATIC_PATHS': ['images', ],
+    'THEME_STATIC_PATHS': ['static', ],
+    'FEED_ALL_ATOM': os.path.join('feeds', 'all.atom.xml'),
+    'CATEGORY_FEED_ATOM': os.path.join('feeds', '%s.atom.xml'),
+    'TRANSLATION_FEED_ATOM': os.path.join('feeds', 'all-%s.atom.xml'),
+    'FEED_MAX_ITEMS': '',
+    'SITEURL': '',
+    'SITENAME': 'A Pelican Blog',
+    'DISPLAY_PAGES_ON_MENU': True,
+    'DISPLAY_CATEGORIES_ON_MENU': True,
+    'PDF_GENERATOR': False,
+    'OUTPUT_SOURCES': False,
+    'OUTPUT_SOURCES_EXTENSION': '.text',
+    'USE_FOLDER_AS_CATEGORY': True,
+    'DEFAULT_CATEGORY': 'misc',
+    'WITH_FUTURE_DATES': True,
+    'CSS_FILE': 'main.css',
+    'NEWEST_FIRST_ARCHIVES': True,
+    'REVERSE_CATEGORY_ORDER': False,
+    'DELETE_OUTPUT_DIRECTORY': False,
+    'ARTICLE_URL': '{slug}.html',
+    'ARTICLE_SAVE_AS': '{slug}.html',
+    'ARTICLE_LANG_URL': '{slug}-{lang}.html',
+    'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html',
+    'PAGE_URL': 'pages/{slug}.html',
+    'PAGE_SAVE_AS': os.path.join('pages', '{slug}.html'),
+    'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
+    'PAGE_LANG_SAVE_AS': os.path.join('pages', '{slug}-{lang}.html'),
+    'STATIC_URL': '{path}',
+    'STATIC_SAVE_AS': '{path}',
+    'CATEGORY_URL': 'category/{slug}.html',
+    'CATEGORY_SAVE_AS': os.path.join('category', '{slug}.html'),
+    'TAG_URL': 'tag/{slug}.html',
+    'TAG_SAVE_AS': os.path.join('tag', '{slug}.html'),
+    'AUTHOR_URL': 'author/{slug}.html',
+    'AUTHOR_SAVE_AS': os.path.join('author', '{slug}.html'),
+    'YEAR_ARCHIVE_SAVE_AS': False,
+    'MONTH_ARCHIVE_SAVE_AS': False,
+    'DAY_ARCHIVE_SAVE_AS': False,
+    'RELATIVE_URLS': False,
+    'DEFAULT_LANG': 'en',
+    'TAG_CLOUD_STEPS': 4,
+    'TAG_CLOUD_MAX_ITEMS': 100,
+    'DIRECT_TEMPLATES': ('index', 'tags', 'categories', 'archives'),
+    'EXTRA_TEMPLATES_PATHS': [],
+    'PAGINATED_DIRECT_TEMPLATES': ('index', ),
+    'PELICAN_CLASS': 'pelican.Pelican',
+    'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
+    'DATE_FORMATS': {},
+    'JINJA_EXTENSIONS': [],
+    'LOCALE': '',  # defaults to user locale
+    'DEFAULT_PAGINATION': False,
+    'DEFAULT_ORPHANS': 0,
+    'DEFAULT_METADATA': (),
+    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*',
+    'PATH_METADATA': '',
+    'FILES_TO_COPY': (),
+    'DEFAULT_STATUS': 'published',
+    'ARTICLE_PERMALINK_STRUCTURE': '',
+    'TYPOGRIFY': False,
+    'SUMMARY_MAX_LENGTH': 50,
+    'PLUGIN_PATH': '',
+    'PLUGINS': [],
+    'TEMPLATE_PAGES': {},
+    'IGNORE_FILES': ['.#*'],
+    }
 
 def read_settings(path=None, override=None):
     if path:
@@ -116,7 +113,7 @@ def read_settings(path=None, override=None):
                 if p not in ('THEME', 'PLUGIN_PATH') or os.path.exists(absp):
                     local_settings[p] = absp
     else:
-        local_settings = copy.deepcopy(_DEFAULT_CONFIG)
+        local_settings = copy.deepcopy(DEFAULT_CONFIG)
 
     if override:
         local_settings.update(override)
@@ -124,7 +121,7 @@ def read_settings(path=None, override=None):
     return configure_settings(local_settings)
 
 
-def get_settings_from_module(module=None, default_settings=_DEFAULT_CONFIG):
+def get_settings_from_module(module=None, default_settings=DEFAULT_CONFIG):
     """Loads settings from a module, returns a dictionary."""
 
     context = copy.deepcopy(default_settings)
@@ -134,7 +131,7 @@ def get_settings_from_module(module=None, default_settings=_DEFAULT_CONFIG):
     return context
 
 
-def get_settings_from_file(path, default_settings=_DEFAULT_CONFIG):
+def get_settings_from_file(path, default_settings=DEFAULT_CONFIG):
     """Loads settings from a file path, returning a dict."""
 
     name, ext = os.path.splitext(os.path.basename(path))
@@ -171,7 +168,7 @@ def configure_settings(settings):
 
     # try to set the different locales, fallback on the default.
     if not locales:
-        locales = _DEFAULT_CONFIG['LOCALE']
+        locales = DEFAULT_CONFIG['LOCALE']
 
     for locale_ in locales:
         try:
@@ -222,11 +219,11 @@ def configure_settings(settings):
         if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'],
                           six.string_types):
             settings['OUTPUT_SOURCES_EXTENSION'] = (
-                    _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
+                    DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
             logger.warning(
                 'Detected misconfiguration with OUTPUT_SOURCES_EXTENSION, '
                 'falling back to the default extension ' +
-                _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
+                DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
 
     filename_metadata = settings.get('FILENAME_METADATA')
     if filename_metadata and not isinstance(filename_metadata,
@@ -236,7 +233,7 @@ def configure_settings(settings):
             'setting (must be string or compiled pattern), falling '
             'back to the default')
         settings['FILENAME_METADATA'] = (
-                _DEFAULT_CONFIG['FILENAME_METADATA'])
+                DEFAULT_CONFIG['FILENAME_METADATA'])
 
     # Save people from accidentally setting a string rather than a list
     path_keys = (
@@ -257,6 +254,6 @@ def configure_settings(settings):
                 logger.warning("Detected misconfiguration with %s setting (must "
                         "be a list), falling back to the default"
                         % PATH_KEY)
-                settings[PATH_KEY] = _DEFAULT_CONFIG[PATH_KEY]
+                settings[PATH_KEY] = DEFAULT_CONFIG[PATH_KEY]
 
     return settings
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index c02a3e34..eb869a57 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -18,7 +18,7 @@ from tempfile import mkdtemp
 from shutil import rmtree
 
 from pelican.contents import Article
-from pelican.settings import _DEFAULT_CONFIG
+from pelican.settings import DEFAULT_CONFIG
 
 
 @contextmanager
@@ -162,7 +162,7 @@ def locale_available(locale_):
 
 
 def get_settings():
-    settings = _DEFAULT_CONFIG.copy()
+    settings = DEFAULT_CONFIG.copy()
     settings['DIRECT_TEMPLATES'] = ['archives']
     settings['filenames'] = {}
     return settings
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 0ec6bf21..a0918851 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -7,7 +7,7 @@ from sys import platform
 from .support import unittest
 
 from pelican.contents import Page, Article, URLWrapper
-from pelican.settings import _DEFAULT_CONFIG
+from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import truncate_html_words
 from pelican.signals import content_object_init
 from jinja2.utils import generate_lorem_ipsum
@@ -62,7 +62,7 @@ class TestPage(unittest.TestCase):
         # If a :SUMMARY_MAX_LENGTH: is set, and there is no other summary,
         # generated summary should not exceed the given length.
         page_kwargs = self._copy_page_kwargs()
-        settings = _DEFAULT_CONFIG.copy()
+        settings = DEFAULT_CONFIG.copy()
         page_kwargs['settings'] = settings
         del page_kwargs['metadata']['summary']
         settings['SUMMARY_MAX_LENGTH'] = None
@@ -83,7 +83,7 @@ class TestPage(unittest.TestCase):
     def test_defaultlang(self):
         # If no lang is given, default to the default one.
         page = Page(**self.page_kwargs)
-        self.assertEqual(page.lang, _DEFAULT_CONFIG['DEFAULT_LANG'])
+        self.assertEqual(page.lang, DEFAULT_CONFIG['DEFAULT_LANG'])
 
         # it is possible to specify the lang in the metadata infos
         self.page_kwargs['metadata'].update({'lang': 'fr', })
@@ -108,7 +108,7 @@ class TestPage(unittest.TestCase):
         page = Page(**self.page_kwargs)
         self.assertIn('summary', page.url_format.keys())
         page.metadata['directory'] = 'test-dir'
-        page.settings = _DEFAULT_CONFIG.copy()
+        page.settings = DEFAULT_CONFIG.copy()
         page.settings['PAGE_SAVE_AS'] = '{directory}/{slug}'
         self.assertEqual(page.save_as, 'test-dir/foo-bar')
 
@@ -123,10 +123,10 @@ class TestPage(unittest.TestCase):
         page = Page(**page_kwargs)
 
         self.assertEqual(page.locale_date,
-            dt.strftime(_DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']))
+            dt.strftime(DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']))
 
-        page_kwargs['settings'] = dict([(x, _DEFAULT_CONFIG[x]) for x in
-                                        _DEFAULT_CONFIG])
+        page_kwargs['settings'] = dict([(x, DEFAULT_CONFIG[x]) for x in
+                                        DEFAULT_CONFIG])
 
         # I doubt this can work on all platforms ...
         if platform == "win32":
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index fa57322d..f20f0b4a 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -11,7 +11,7 @@ from shutil import rmtree
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 TemplatePagesGenerator)
 from pelican.writers import Writer
-from pelican.settings import _DEFAULT_CONFIG
+from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import unittest, get_settings
 
 CUR_DIR = os.path.dirname(__file__)
@@ -117,15 +117,15 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_do_not_use_folder_as_category(self):
 
-        settings = _DEFAULT_CONFIG.copy()
+        settings = DEFAULT_CONFIG.copy()
         settings['ARTICLE_DIR'] = 'content'
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['USE_FOLDER_AS_CATEGORY'] = False
         settings['filenames'] = {}
-        generator = ArticlesGenerator(settings.copy(), settings,
-                            CUR_DIR, _DEFAULT_CONFIG['THEME'], None,
-                            _DEFAULT_CONFIG['MARKUP'])
+        generator = ArticlesGenerator(
+            settings.copy(), settings, CUR_DIR, DEFAULT_CONFIG['THEME'], None,
+            DEFAULT_CONFIG['MARKUP'])
         generator.generate_context()
         # test for name
         # categories are grouped by slug; if two categories have the same slug
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index da251675..b1e813e1 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -5,7 +5,7 @@ import os
 from os.path import dirname, abspath, join
 
 from pelican.settings import (read_settings, configure_settings,
-                              _DEFAULT_CONFIG, DEFAULT_THEME)
+                              DEFAULT_CONFIG, DEFAULT_THEME)
 from pelican.tests.support import unittest
 
 
@@ -27,7 +27,7 @@ class TestSettingsConfiguration(unittest.TestCase):
     def test_keep_default_settings(self):
         # Keep default settings if not defined.
         self.assertEqual(self.settings.get('DEFAULT_CATEGORY'),
-            _DEFAULT_CONFIG['DEFAULT_CATEGORY'])
+            DEFAULT_CONFIG['DEFAULT_CATEGORY'])
 
     def test_dont_copy_small_keys(self):
         # Do not copy keys not in caps.
@@ -36,7 +36,7 @@ class TestSettingsConfiguration(unittest.TestCase):
     def test_read_empty_settings(self):
         # Providing no file should return the default values.
         settings = read_settings(None)
-        expected = copy.deepcopy(_DEFAULT_CONFIG)
+        expected = copy.deepcopy(DEFAULT_CONFIG)
         expected['FEED_DOMAIN'] = ''  # Added by configure settings
         self.maxDiff = None
         self.assertDictEqual(settings, expected)
@@ -55,7 +55,7 @@ class TestSettingsConfiguration(unittest.TestCase):
         # This assumes 'SITENAME': 'A Pelican Blog'
         settings = read_settings(None)
         settings['SITENAME'] = 'Not a Pelican Blog'
-        self.assertNotEqual(settings['SITENAME'], _DEFAULT_CONFIG['SITENAME'])
+        self.assertNotEqual(settings['SITENAME'], DEFAULT_CONFIG['SITENAME'])
 
     def test_path_settings_safety(self):
         """Don't let people setting the static path listings to strs"""
@@ -69,9 +69,9 @@ class TestSettingsConfiguration(unittest.TestCase):
                 }
         configure_settings(settings)
         self.assertEqual(settings['STATIC_PATHS'],
-                _DEFAULT_CONFIG['STATIC_PATHS'])
+                DEFAULT_CONFIG['STATIC_PATHS'])
         self.assertEqual(settings['THEME_STATIC_PATHS'],
-                _DEFAULT_CONFIG['THEME_STATIC_PATHS'])
+                DEFAULT_CONFIG['THEME_STATIC_PATHS'])
 
     def test_configure_settings(self):
         #Manipulations to settings should be applied correctly.

From 1d4d86c876f6a2b29a850212d915b3a0139c4a88 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sun, 24 Mar 2013 10:13:52 -0400
Subject: [PATCH 1311/2864] settings: Rework the LESS_GENERATOR removal warning
 for easy extension

Setting migration is something that will happen for multiple settings,
and the more we can standardize the reporting procedure, the easier it
will be to add new warnings.
---
 pelican/settings.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index b6092fb3..b9d46632 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -210,11 +210,6 @@ def configure_settings(settings):
             'http://docs.getpelican.com/en/latest/settings.html#timezone '
             'for more information')
 
-    if 'LESS_GENERATOR' in settings:
-        logger.warning(
-            'The LESS_GENERATOR setting has been removed in favor '
-            'of the Webassets plugin')
-
     if 'OUTPUT_SOURCES_EXTENSION' in settings:
         if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'],
                           six.string_types):
@@ -256,4 +251,13 @@ def configure_settings(settings):
                         % PATH_KEY)
                 settings[PATH_KEY] = DEFAULT_CONFIG[PATH_KEY]
 
+    for old,new,doc in [
+            ('LESS_GENERATOR', 'the Webassets plugin', None),
+            ]:
+        if old in settings:
+            message = 'The {} setting has been removed in favor of {}'
+            if doc:
+                message += ', see {} for details'
+            logger.warning(message)
+
     return settings

From 851191529428a92f7bed5ca9a121590b87ccd939 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sun, 24 Mar 2013 14:01:54 -0400
Subject: [PATCH 1312/2864] settings: Cleanup configure_settings()
 (standardization & types)

This pulls out some general patterns to make it easier to apply
existing processing to new settings.
---
 pelican/settings.py | 53 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index b9d46632..35f333aa 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -84,7 +84,7 @@ DEFAULT_CONFIG = {
     'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
     'DATE_FORMATS': {},
     'JINJA_EXTENSIONS': [],
-    'LOCALE': '',  # defaults to user locale
+    'LOCALE': [],  # defaults to user locale
     'DEFAULT_PAGINATION': False,
     'DEFAULT_ORPHANS': 0,
     'DEFAULT_METADATA': (),
@@ -160,15 +160,34 @@ def configure_settings(settings):
             raise Exception("Could not find the theme %s"
                             % settings['THEME'])
 
-    # if locales is not a list, make it one
-    locales = settings['LOCALE']
+    # standardize strings to lowercase strings
+    for key in [
+            'DEFAULT_LANG',
+            ]:
+        if key in settings:
+            settings[key] = settings[key].lower()
 
-    if isinstance(locales, six.string_types):
-        locales = [locales]
+    # standardize strings to lists
+    for key in [
+            'LOCALE',
+            ]:
+        if key in settings and isinstance(settings[key], six.string_types):
+            settings[key] = [settings[key]]
+
+    # check settings that must be a particular type
+    for key, types in [
+            ('OUTPUT_SOURCES_EXTENSION', six.string_types),
+            ('FILENAME_METADATA', six.string_types),
+            ]:
+        if key in settings and not isinstance(settings[key], types):
+            value = settings.pop(key)
+            logger.warn(
+                'Detected misconfigured {} ({}), '
+                'falling back to the default ({})'.format(
+                    key, value, DEFAULT_CONFIG[key]))
 
     # try to set the different locales, fallback on the default.
-    if not locales:
-        locales = DEFAULT_CONFIG['LOCALE']
+    locales = settings.get('LOCALE', DEFAULT_CONFIG['LOCALE'])
 
     for locale_ in locales:
         try:
@@ -210,26 +229,6 @@ def configure_settings(settings):
             'http://docs.getpelican.com/en/latest/settings.html#timezone '
             'for more information')
 
-    if 'OUTPUT_SOURCES_EXTENSION' in settings:
-        if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'],
-                          six.string_types):
-            settings['OUTPUT_SOURCES_EXTENSION'] = (
-                    DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
-            logger.warning(
-                'Detected misconfiguration with OUTPUT_SOURCES_EXTENSION, '
-                'falling back to the default extension ' +
-                DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
-
-    filename_metadata = settings.get('FILENAME_METADATA')
-    if filename_metadata and not isinstance(filename_metadata,
-                                            six.string_types):
-        logger.error(
-            'Detected misconfiguration with FILENAME_METADATA '
-            'setting (must be string or compiled pattern), falling '
-            'back to the default')
-        settings['FILENAME_METADATA'] = (
-                DEFAULT_CONFIG['FILENAME_METADATA'])
-
     # Save people from accidentally setting a string rather than a list
     path_keys = (
             'ARTICLE_EXCLUDES',

From c8e7d95b34a8165bf4606c521c653b6fc716ac02 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sun, 24 Mar 2013 15:08:33 -0400
Subject: [PATCH 1313/2864] tests.support: Use kwargs overrides in
 get_settings()

This avoids harcoding test-specific overrides, and makes it easy to
setup a settings dictionary based on DEFAULT_CONFIG for testing.
Because you can trust Pelican to use settings based on DEFAULT_CONFIG,
you are free to go about using:

  settings[my_key]

instead of:

  settings.get(my_key, some_fallback)

or:

  if my_key in settings:
      ...

if you know that `my_key` is in DEFAULT_CONFIG.
---
 pelican/tests/support.py         |  10 ++-
 pelican/tests/test_contents.py   |  10 ++-
 pelican/tests/test_generators.py |   6 +-
 pelican/tests/test_readers.py    | 108 +++++++++++++++----------------
 4 files changed, 66 insertions(+), 68 deletions(-)

diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index eb869a57..a4fd2c35 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -161,10 +161,14 @@ def locale_available(locale_):
         return True
 
 
-def get_settings():
+def get_settings(**kwargs):
+    """Provide tweaked setting dictionaries for testing
+
+    Set keyword arguments to override specific settings.
+    """
     settings = DEFAULT_CONFIG.copy()
-    settings['DIRECT_TEMPLATES'] = ['archives']
-    settings['filenames'] = {}
+    for key,value in kwargs.items():
+        settings[key] = value
     return settings
 
 
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index a0918851..c081639d 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 from datetime import datetime
 from sys import platform
 
-from .support import unittest
+from .support import unittest, get_settings
 
 from pelican.contents import Page, Article, URLWrapper
 from pelican.settings import DEFAULT_CONFIG
@@ -62,7 +62,7 @@ class TestPage(unittest.TestCase):
         # If a :SUMMARY_MAX_LENGTH: is set, and there is no other summary,
         # generated summary should not exceed the given length.
         page_kwargs = self._copy_page_kwargs()
-        settings = DEFAULT_CONFIG.copy()
+        settings = get_settings()
         page_kwargs['settings'] = settings
         del page_kwargs['metadata']['summary']
         settings['SUMMARY_MAX_LENGTH'] = None
@@ -108,8 +108,7 @@ class TestPage(unittest.TestCase):
         page = Page(**self.page_kwargs)
         self.assertIn('summary', page.url_format.keys())
         page.metadata['directory'] = 'test-dir'
-        page.settings = DEFAULT_CONFIG.copy()
-        page.settings['PAGE_SAVE_AS'] = '{directory}/{slug}'
+        page.settings = get_settings(PAGE_SAVE_AS='{directory}/{slug}')
         self.assertEqual(page.save_as, 'test-dir/foo-bar')
 
     def test_datetime(self):
@@ -125,8 +124,7 @@ class TestPage(unittest.TestCase):
         self.assertEqual(page.locale_date,
             dt.strftime(DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']))
 
-        page_kwargs['settings'] = dict([(x, DEFAULT_CONFIG[x]) for x in
-                                        DEFAULT_CONFIG])
+        page_kwargs['settings'] = get_settings()
 
         # I doubt this can work on all platforms ...
         if platform == "win32":
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index f20f0b4a..cb54b5ec 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -29,7 +29,7 @@ class TestArticlesGenerator(unittest.TestCase):
         for each test.
         """
         if self.generator is None:
-            settings = get_settings()
+            settings = get_settings(filenames={})
             settings['ARTICLE_DIR'] = 'content'
             settings['DEFAULT_CATEGORY'] = 'Default'
             settings['DEFAULT_DATE'] = (1970, 1, 1)
@@ -144,7 +144,7 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_direct_templates_save_as_default(self):
 
-        settings = get_settings()
+        settings = get_settings(filenames={})
         generator = ArticlesGenerator(settings, settings, None,
                                       settings['THEME'], None,
                                       settings['MARKUP'])
@@ -212,7 +212,7 @@ class TestPageGenerator(unittest.TestCase):
         return distilled
 
     def test_generate_context(self):
-        settings = get_settings()
+        settings = get_settings(filenames={})
         settings['PAGE_DIR'] = 'TestPages'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index f3427066..9fb3320d 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -5,7 +5,7 @@ import datetime
 import os
 
 from pelican import readers
-from pelican.tests.support import unittest
+from pelican.tests.support import unittest, get_settings
 
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_PATH = os.path.join(CUR_DIR, 'content')
@@ -15,11 +15,18 @@ def _path(*args):
     return os.path.join(CONTENT_PATH, *args)
 
 
-class RstReaderTest(unittest.TestCase):
+class ReaderTest(unittest.TestCase):
+
+    def read_file(self, path, **kwargs):
+        # Isolate from future API changes to readers.read_file
+        return readers.read_file(
+            _path(path), settings=get_settings(**kwargs))
+
+
+class RstReaderTest(ReaderTest):
 
     def test_article_with_metadata(self):
-        reader = readers.RstReader({})
-        content, metadata = reader.read(_path('article_with_metadata.rst'))
+        content, metadata = self.read_file(path='article_with_metadata.rst')
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -36,8 +43,9 @@ class RstReaderTest(unittest.TestCase):
             self.assertEqual(value, metadata[key], key)
 
     def test_article_with_filename_metadata(self):
-        content, metadata = readers.read_file(
-                _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'))
+        content, metadata = self.read_file(
+            path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
+            FILENAME_METADATA=None)
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -46,11 +54,9 @@ class RstReaderTest(unittest.TestCase):
         for key, value in metadata.items():
             self.assertEqual(value, expected[key], key)
 
-        content, metadata = readers.read_file(
-                _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
-                settings={
-                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*'
-                    })
+        content, metadata = self.read_file(
+            path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
+            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2}).*')
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -60,13 +66,12 @@ class RstReaderTest(unittest.TestCase):
         for key, value in metadata.items():
             self.assertEqual(value, expected[key], key)
 
-        content, metadata = readers.read_file(
-                _path('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
-                settings={
-                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2})_'
-                                         '_(?P<Slug>.*)'
-                                         '#(?P<MyMeta>.*)-(?P<author>.*)'
-                    })
+        content, metadata = self.read_file(
+            path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
+            FILENAME_METADATA=(
+                '(?P<date>\d{4}-\d{2}-\d{2})_'
+                '_(?P<Slug>.*)'
+                '#(?P<MyMeta>.*)-(?P<author>.*)'))
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -91,7 +96,7 @@ class RstReaderTest(unittest.TestCase):
     def test_typogrify(self):
         # if nothing is specified in the settings, the content should be
         # unmodified
-        content, _ = readers.read_file(_path('article.rst'))
+        content, _ = self.read_file(path='article.rst')
         expected = ('<p>This is some content. With some stuff to '
                     '&quot;typogrify&quot;.</p>\n<p>Now with added '
                     'support for <abbr title="three letter acronym">'
@@ -101,8 +106,7 @@ class RstReaderTest(unittest.TestCase):
 
         try:
             # otherwise, typogrify should be applied
-            content, _ = readers.read_file(_path('article.rst'),
-                                           settings={'TYPOGRIFY': True})
+            content, _ = self.read_file(path='article.rst', TYPOGRIFY=True)
             expected = ('<p>This is some content. With some stuff to&nbsp;'
                         '&#8220;typogrify&#8221;.</p>\n<p>Now with added '
                         'support for <abbr title="three letter acronym">'
@@ -113,7 +117,7 @@ class RstReaderTest(unittest.TestCase):
             return unittest.skip('need the typogrify distribution')
 
 
-class MdReaderTest(unittest.TestCase):
+class MdReaderTest(ReaderTest):
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_metadata(self):
@@ -221,9 +225,9 @@ class MdReaderTest(unittest.TestCase):
     def test_article_with_markdown_markup_extension(self):
         # test to ensure the markdown markup extension is being processed as
         # expected
-        content, metadata = readers.read_file(
-                _path('article_with_markdown_markup_extensions.md'),
-                settings={'MD_EXTENSIONS': ['toc', 'codehilite', 'extra']})
+        content, metadata = self.read_file(
+            path='article_with_markdown_markup_extensions.md',
+            MD_EXTENSIONS=['toc', 'codehilite', 'extra'])
         expected = ('<div class="toc">\n'
                     '<ul>\n'
                     '<li><a href="#level1">Level1</a><ul>\n'
@@ -239,8 +243,9 @@ class MdReaderTest(unittest.TestCase):
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_filename_metadata(self):
-        content, metadata = readers.read_file(
-                _path('2012-11-30_md_w_filename_meta#foo-bar.md'))
+        content, metadata = self.read_file(
+            path='2012-11-30_md_w_filename_meta#foo-bar.md',
+            FILENAME_METADATA=None)
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -248,11 +253,9 @@ class MdReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEqual(value, metadata[key], key)
 
-        content, metadata = readers.read_file(
-                _path('2012-11-30_md_w_filename_meta#foo-bar.md'),
-                settings={
-                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*'
-                    })
+        content, metadata = self.read_file(
+            path='2012-11-30_md_w_filename_meta#foo-bar.md',
+            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2}).*')
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -261,13 +264,12 @@ class MdReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEqual(value, metadata[key], key)
 
-        content, metadata = readers.read_file(
-                _path('2012-11-30_md_w_filename_meta#foo-bar.md'),
-                settings={
-                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2})'
-                                         '_(?P<Slug>.*)'
-                                         '#(?P<MyMeta>.*)-(?P<author>.*)'
-                    })
+        content, metadata = self.read_file(
+            path='2012-11-30_md_w_filename_meta#foo-bar.md',
+            FILENAME_METADATA=(
+                '(?P<date>\d{4}-\d{2}-\d{2})'
+                '_(?P<Slug>.*)'
+                '#(?P<MyMeta>.*)-(?P<author>.*)'))
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -279,14 +281,13 @@ class MdReaderTest(unittest.TestCase):
             self.assertEqual(value, metadata[key], key)
 
 
-class AdReaderTest(unittest.TestCase):
+class AdReaderTest(ReaderTest):
 
     @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
     def test_article_with_asc_extension(self):
         # Ensure the asc extension is being processed by the correct reader
-        reader = readers.AsciiDocReader({})
-        content, metadata = reader.read(
-                                _path('article_with_asc_extension.asc'))
+        content, metadata = self.read_file(
+            path='article_with_asc_extension.asc')
         expected = ('<hr>\n<h2><a name="_used_for_pelican_test">'
                     '</a>Used for pelican test</h2>\n'
                     '<p>The quick brown fox jumped over'
@@ -316,10 +317,9 @@ class AdReaderTest(unittest.TestCase):
         self.assertEqual(content, expected)
 
 
-class HTMLReaderTest(unittest.TestCase):
+class HTMLReaderTest(ReaderTest):
     def test_article_with_comments(self):
-        reader = readers.HTMLReader({})
-        content, metadata = reader.read(_path('article_with_comments.html'))
+        content, metadata = self.read_file(path='article_with_comments.html')
 
         self.assertEqual('''
         Body content
@@ -327,8 +327,7 @@ class HTMLReaderTest(unittest.TestCase):
     ''', content)
 
     def test_article_with_keywords(self):
-        reader = readers.HTMLReader({})
-        content, metadata = reader.read(_path('article_with_keywords.html'))
+        content, metadata = self.read_file(path='article_with_keywords.html')
         expected = {
             'tags': ['foo', 'bar', 'foobar'],
         }
@@ -337,8 +336,7 @@ class HTMLReaderTest(unittest.TestCase):
             self.assertEqual(value, metadata[key], key)
 
     def test_article_with_metadata(self):
-        reader = readers.HTMLReader({})
-        content, metadata = reader.read(_path('article_with_metadata.html'))
+        content, metadata = self.read_file(path='article_with_metadata.html')
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -353,9 +351,8 @@ class HTMLReaderTest(unittest.TestCase):
             self.assertEqual(value, metadata[key], key)
 
     def test_article_with_null_attributes(self):
-        reader = readers.HTMLReader({})
-        content, metadata = reader.read(
-                _path('article_with_null_attributes.html'))
+        content, metadata = self.read_file(
+            path='article_with_null_attributes.html')
 
         self.assertEqual('''
         Ensure that empty attributes are copied properly.
@@ -364,9 +361,8 @@ class HTMLReaderTest(unittest.TestCase):
 
     def test_article_metadata_key_lowercase(self):
         # Keys of metadata should be lowercase.
-        reader = readers.HTMLReader({})
-        content, metadata = reader.read(
-                _path('article_with_uppercase_metadata.html'))
+        content, metadata = self.read_file(
+            path='article_with_uppercase_metadata.html')
         self.assertIn('category', metadata, 'Key should be lowercase.')
         self.assertEqual('Yeah', metadata.get('category'),
                           'Value keeps cases.')

From 8ff34e6c5d5d534223d4059addb83c1e9f5648b0 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sun, 24 Mar 2013 15:45:36 -0400
Subject: [PATCH 1314/2864] Replace settings.get(key) with settings[key] for
 default settings

If a setting exists in DEFAULT_CONFIG, assume it will be there
(instead of checking and/or providing a local default).  The earlier
code was split between the two idioms, which was confusing.
---
 pelican/__init__.py              |  4 ++--
 pelican/contents.py              |  2 +-
 pelican/generators.py            | 32 +++++++++++++-------------------
 pelican/readers.py               |  8 +++-----
 pelican/settings.py              |  5 +++++
 pelican/tests/test_generators.py |  8 ++++----
 pelican/tests/test_readers.py    |  8 ++++----
 pelican/writers.py               |  6 +++---
 8 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 6e9e676b..7f406c4f 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -154,7 +154,7 @@ class Pelican(object):
 
         context = self.settings.copy()
         context['filenames'] = {}  # share the dict between all the generators
-        context['localsiteurl'] = self.settings.get('SITEURL')  # share
+        context['localsiteurl'] = self.settings['SITEURL']  # share
         generators = [
             cls(
                 context,
@@ -309,7 +309,7 @@ def get_instance(args):
 
     settings = read_settings(config_file, override=get_config(args))
 
-    cls = settings.get('PELICAN_CLASS')
+    cls = settings['PELICAN_CLASS']
     if isinstance(cls, six.string_types):
         module, cls_name = cls.rsplit('.', 1)
         module = __import__(module)
diff --git a/pelican/contents.py b/pelican/contents.py
index 135c4866..5f2e66b0 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -51,7 +51,7 @@ class Content(object):
         self._context = context
         self.translations = []
 
-        local_metadata = dict(settings.get('DEFAULT_METADATA', ()))
+        local_metadata = dict(settings['DEFAULT_METADATA'])
         local_metadata.update(metadata)
 
         # set metadata as attributes
diff --git a/pelican/generators.py b/pelican/generators.py
index f2fa0e33..75b61df2 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -47,7 +47,7 @@ class Generator(object):
         self._templates_path = []
         self._templates_path.append(os.path.expanduser(
                 os.path.join(self.theme, 'templates')))
-        self._templates_path += self.settings.get('EXTRA_TEMPLATES_PATHS', [])
+        self._templates_path += self.settings['EXTRA_TEMPLATES_PATHS']
 
         theme_path = os.path.dirname(os.path.abspath(__file__))
 
@@ -60,7 +60,7 @@ class Generator(object):
                 simple_loader,  # implicit inheritance
                 PrefixLoader({'!simple': simple_loader})  # explicit one
             ]),
-            extensions=self.settings.get('JINJA_EXTENSIONS', []),
+            extensions=self.settings['JINJA_EXTENSIONS'],
         )
 
         logger.debug('template list: {0}'.format(self.env.list_templates()))
@@ -69,7 +69,7 @@ class Generator(object):
         self.env.filters.update({'strftime': DateFormatter()})
 
         # get custom Jinja filters from user settings
-        custom_filters = self.settings.get('JINJA_FILTERS', {})
+        custom_filters = self.settings['JINJA_FILTERS']
         self.env.filters.update(custom_filters)
 
         signals.generator_init.send(self)
@@ -163,7 +163,7 @@ class TemplatePagesGenerator(Generator):
             self.env.loader.loaders.insert(0, _FileLoader(source, self.path))
             try:
                 template = self.env.get_template(source)
-                rurls = self.settings.get('RELATIVE_URLS')
+                rurls = self.settings['RELATIVE_URLS']
                 writer.write_file(dest, template, self.context, rurls)
             finally:
                 del self.env.loader.loaders[0]
@@ -283,9 +283,9 @@ class ArticlesGenerator(Generator):
                       dates=archive, blog=True)
 
         period_save_as = {
-                'year' : self.settings.get('YEAR_ARCHIVE_SAVE_AS'),
-                'month': self.settings.get('MONTH_ARCHIVE_SAVE_AS'),
-                'day'  : self.settings.get('DAY_ARCHIVE_SAVE_AS')
+                'year' : self.settings['YEAR_ARCHIVE_SAVE_AS'],
+                'month': self.settings['MONTH_ARCHIVE_SAVE_AS'],
+                'day'  : self.settings['DAY_ARCHIVE_SAVE_AS'],
                 }
 
         period_date_key = {
@@ -302,8 +302,8 @@ class ArticlesGenerator(Generator):
 
     def generate_direct_templates(self, write):
         """Generate direct templates pages"""
-        PAGINATED_TEMPLATES = self.settings.get('PAGINATED_DIRECT_TEMPLATES')
-        for template in self.settings.get('DIRECT_TEMPLATES'):
+        PAGINATED_TEMPLATES = self.settings['PAGINATED_DIRECT_TEMPLATES']
+        for template in self.settings['DIRECT_TEMPLATES']:
             paginated = {}
             if template in PAGINATED_TEMPLATES:
                 paginated = {'articles': self.articles, 'dates': self.dates}
@@ -358,7 +358,7 @@ class ArticlesGenerator(Generator):
     def generate_pages(self, writer):
         """Generate the pages on the disk"""
         write = partial(writer.write_file,
-                        relative_urls=self.settings.get('RELATIVE_URLS'))
+                        relative_urls=self.settings['RELATIVE_URLS'])
 
         # to minimize the number of relative path stuff modification
         # in writer, articles pass first
@@ -546,7 +546,7 @@ class PagesGenerator(Generator):
                             self.hidden_translations, self.hidden_pages):
             writer.write_file(page.save_as, self.get_template(page.template),
                     self.context, page=page,
-                    relative_urls=self.settings.get('RELATIVE_URLS'))
+                    relative_urls=self.settings['RELATIVE_URLS'])
 
 
 class StaticGenerator(Generator):
@@ -613,14 +613,8 @@ class PdfGenerator(Generator):
         super(PdfGenerator, self).__init__(*args, **kwargs)
         try:
             from rst2pdf.createpdf import RstToPdf
-            if 'PDF_STYLE_PATH' in self.settings.keys():
-                pdf_style_path = os.path.join(self.settings['PDF_STYLE_PATH'])
-            else:
-                pdf_style_path = ''
-
-            if 'PDF_STYLE' in self.settings.keys():
-                pdf_style = self.settings.get('PDF_STYLE', 'twelvepoint')
-
+            pdf_style_path = os.path.join(self.settings['PDF_STYLE_PATH'])
+            pdf_style = self.settings['PDF_STYLE']
             self.pdfcreator = RstToPdf(breakside=0,
                                        stylesheets=[pdf_style],
                                        style_path=[pdf_style_path])
diff --git a/pelican/readers.py b/pelican/readers.py
index b5fed611..816464ef 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -157,12 +157,10 @@ class RstReader(Reader):
 class MarkdownReader(Reader):
     enabled = bool(Markdown)
     file_extensions = ['md', 'markdown', 'mkd', 'mdown']
-    default_extensions = ['codehilite(css_class=highlight)', 'extra']
 
     def __init__(self, *args, **kwargs):
         super(MarkdownReader, self).__init__(*args, **kwargs)
-        self.extensions = self.settings.get('MD_EXTENSIONS',
-                                            self.default_extensions)
+        self.extensions = self.settings['MD_EXTENSIONS']
         self.extensions.append('meta')
         self._md = Markdown(extensions=self.extensions)
 
@@ -309,7 +307,7 @@ class AsciiDocReader(Reader):
         content = StringIO()
         ad = AsciiDocAPI()
 
-        options = self.settings.get('ASCIIDOC_OPTIONS', [])
+        options = self.settings['ASCIIDOC_OPTIONS']
         if isinstance(options, (str, unicode)):
             options = [m.strip() for m in options.split(',')]
         options = self.default_options + options
@@ -362,7 +360,7 @@ def read_file(path, fmt=None, settings=None):
     metadata.update(reader_metadata)
 
     # eventually filter the content with typogrify if asked so
-    if content and settings and settings.get('TYPOGRIFY'):
+    if content and settings and settings['TYPOGRIFY']:
         from typogrify.filters import typogrify
         content = typogrify(content)
         metadata['title'] = typogrify(metadata['title'])
diff --git a/pelican/settings.py b/pelican/settings.py
index 35f333aa..34a2b42a 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -64,6 +64,8 @@ DEFAULT_CONFIG = {
     'PAGE_LANG_SAVE_AS': os.path.join('pages', '{slug}-{lang}.html'),
     'STATIC_URL': '{path}',
     'STATIC_SAVE_AS': '{path}',
+    'PDF_STYLE_PATH': '',
+    'PDF_STYLE': 'twelvepoint',
     'CATEGORY_URL': 'category/{slug}.html',
     'CATEGORY_SAVE_AS': os.path.join('category', '{slug}.html'),
     'TAG_URL': 'tag/{slug}.html',
@@ -83,7 +85,10 @@ DEFAULT_CONFIG = {
     'PELICAN_CLASS': 'pelican.Pelican',
     'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
     'DATE_FORMATS': {},
+    'ASCIIDOC_OPTIONS': [],
+    'MD_EXTENSIONS': ['codehilite(css_class=highlight)', 'extra'],
     'JINJA_EXTENSIONS': [],
+    'JINJA_FILTERS': {},
     'LOCALE': [],  # defaults to user locale
     'DEFAULT_PAGINATION': False,
     'DEFAULT_ORPHANS': 0,
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index cb54b5ec..e3b8e20a 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -53,16 +53,16 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_feeds(self):
         settings = get_settings()
-        generator = ArticlesGenerator(settings,
-                {'FEED_ALL_ATOM': settings['FEED_ALL_ATOM']}, None,
+        generator = ArticlesGenerator(settings, settings, None,
                 settings['THEME'], None, settings['MARKUP'])
         writer = MagicMock()
         generator.generate_feeds(writer)
         writer.write_feed.assert_called_with([], settings,
                                              'feeds/all.atom.xml')
 
-        generator = ArticlesGenerator(settings, {'FEED_ALL_ATOM': None}, None,
-                                      settings['THEME'], None, None)
+        generator = ArticlesGenerator(
+            settings, get_settings(FEED_ALL_ATOM=None), None,
+            settings['THEME'], None, None)
         writer = MagicMock()
         generator.generate_feeds(writer)
         self.assertFalse(writer.write_feed.called)
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 9fb3320d..a48301f9 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -85,7 +85,7 @@ class RstReaderTest(ReaderTest):
 
     def test_article_metadata_key_lowercase(self):
         # Keys of metadata should be lowercase.
-        reader = readers.RstReader({})
+        reader = readers.RstReader(settings=get_settings())
         content, metadata = reader.read(
                 _path('article_with_uppercase_metadata.rst'))
 
@@ -121,7 +121,7 @@ class MdReaderTest(ReaderTest):
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_metadata(self):
-        reader = readers.MarkdownReader({})
+        reader = readers.MarkdownReader(settings=get_settings())
         content, metadata = reader.read(
             _path('article_with_md_extension.md'))
         expected = {
@@ -150,7 +150,7 @@ class MdReaderTest(ReaderTest):
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_footnote(self):
-        reader = readers.MarkdownReader({})
+        reader = readers.MarkdownReader(settings=get_settings())
         content, metadata = reader.read(
             _path('article_with_markdown_and_footnote.md'))
         expected_content = (
@@ -186,7 +186,7 @@ class MdReaderTest(ReaderTest):
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_file_extensions(self):
-        reader = readers.MarkdownReader({})
+        reader = readers.MarkdownReader(settings=get_settings())
         # test to ensure the md file extension is being processed by the
         # correct reader
         content, metadata = reader.read(
diff --git a/pelican/writers.py b/pelican/writers.py
index 27246e4f..fe37b25d 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -155,10 +155,10 @@ class Writer(object):
             for key in paginated.keys():
                 object_list = paginated[key]
 
-                if self.settings.get('DEFAULT_PAGINATION'):
+                if self.settings['DEFAULT_PAGINATION']:
                     paginators[key] = Paginator(object_list,
-                        self.settings.get('DEFAULT_PAGINATION'),
-                        self.settings.get('DEFAULT_ORPHANS'))
+                        self.settings['DEFAULT_PAGINATION'],
+                        self.settings['DEFAULT_ORPHANS'])
                 else:
                     paginators[key] = Paginator(object_list, len(object_list))
 

From 3f91165f094228b061150fc587816457e619aef1 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Tue, 21 May 2013 17:15:56 +0200
Subject: [PATCH 1315/2864] Ensure that markup is a tuple.

`self.markup` is a list when using the `-m|--markup` cli option, but testing the
extension with `endswith` works only with tuples.
---
 pelican/generators.py            |  2 +-
 pelican/tests/test_generators.py | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index f2fa0e33..94c425f9 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -96,7 +96,7 @@ class Generator(object):
             extensions are allowed)
         """
         if extensions is None:
-            extensions = self.markup
+            extensions = tuple(self.markup)
         basename = os.path.basename(path)
         if extensions is False or basename.endswith(extensions):
             return True
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index fa57322d..8922a8eb 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
 
-from mock import MagicMock
 import os
-
 from codecs import open
-from tempfile import mkdtemp
+from mock import MagicMock
 from shutil import rmtree
+from tempfile import mkdtemp
 
-from pelican.generators import (ArticlesGenerator, PagesGenerator,
+from pelican.generators import (Generator, ArticlesGenerator, PagesGenerator,
                                 TemplatePagesGenerator)
 from pelican.writers import Writer
 from pelican.settings import _DEFAULT_CONFIG
@@ -17,6 +16,25 @@ from pelican.tests.support import unittest, get_settings
 CUR_DIR = os.path.dirname(__file__)
 
 
+class TestGenerator(unittest.TestCase):
+    def setUp(self):
+        self.settings = get_settings()
+        self.generator = Generator(self.settings.copy(), self.settings,
+                                   CUR_DIR, self.settings['THEME'], None,
+                                   self.settings['MARKUP'])
+
+    def test_include_path(self):
+        filename = os.path.join(CUR_DIR, 'content', 'article.rst')
+        include_path = self.generator._include_path
+        self.assertTrue(include_path(filename))
+        self.assertTrue(include_path(filename, extensions=('rst',)))
+        self.assertFalse(include_path(filename, extensions=('md',)))
+
+        # markup must be a tuple, test that this works also with a list
+        self.generator.markup = ['rst', 'md']
+        self.assertTrue(include_path(filename))
+
+
 class TestArticlesGenerator(unittest.TestCase):
 
     def setUp(self):

From ba3e14dd1d89bed8fcac11c5b67fd614cf52d053 Mon Sep 17 00:00:00 2001
From: Thanos Lefteris <alefteris@gmail.com>
Date: Mon, 3 Jun 2013 18:23:07 +0300
Subject: [PATCH 1316/2864] Docs: Add six, markupsafe to install dependencies

---
 docs/getting_started.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index ddffb5ff..b41f8c18 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -121,6 +121,10 @@ automatically installed without any action on your part:
   broadcast signaling system
 * `unidecode <http://pypi.python.org/pypi/Unidecode>`_, for ASCII
   transliterations of Unicode text
+* `six <http://pypi.python.org/pypi/six>`_,  for Python 2 and 3 compatibility
+  utilities
+* `MarkupSafe <http://pypi.python.org/pypi/MarkupSafe>`_, for a markup safe
+  string implementation
 
 If you want the following optional packages, you will need to install them
 manually via ``pip``:

From cc156299660458125f47b4c52836c4c58291b3d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 7 Jun 2013 00:50:51 +0200
Subject: [PATCH 1317/2864] Don't include all the .py files in the root folder

---
 MANIFEST.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 136243c0..dcf9ea45 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,3 @@
 include *.rst
-global-include *.py
-recursive-include pelican *.html *.css *png *.in *.rst *.md *.mkd *.xml
+recursive-include pelican *.html *.css *png *.in *.rst *.md *.mkd *.xml *.py
 include LICENSE THANKS docs/changelog.rst

From edcc027d894a6933661340c203cb9cc717d2b99f Mon Sep 17 00:00:00 2001
From: Richard Brooksby <rptb1+github@pobox.com>
Date: Sat, 8 Jun 2013 23:40:16 +0100
Subject: [PATCH 1318/2864] Added lxml to the list of dependencies for the tox
 tests.

My system python installs are completely clean except for virtualenv, so tox needs a complete set of non-default modules.
---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index d9d759e9..8763c963 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,7 @@ deps =
     Markdown
     BeautifulSoup4
     typogrify
+    lxml
 
 [testenv:py33]
 deps =
@@ -23,3 +24,4 @@ deps =
     BeautifulSoup4
     git+https://github.com/dmdm/smartypants.git#egg=smartypants
     git+https://github.com/dmdm/typogrify.git@py3k#egg=typogrify
+    lxml

From 1fcf4a6550d6ef8ffb3d8c24376cae63f939f5c9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 10 Jun 2013 19:42:53 -0700
Subject: [PATCH 1319/2864] Add documentation for ARCHIVES_SAVE_AS setting

While this setting has existed for some time, there does not seem to
have been any documentation for it until now.
---
 docs/settings.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 3a32ad22..0a04f804 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -242,6 +242,7 @@ Setting name (default value)                            What does it do?
 `<DIRECT_TEMPLATE_NAME>_SAVE_AS`                        The location to save content generated from direct
                                                         templates. Where <DIRECT_TEMPLATE_NAME> is the
                                                         upper case template name.
+`ARCHIVES_SAVE_AS` (``'archives.html'``)                The location to save the article archives page.
 `YEAR_ARCHIVE_SAVE_AS` (False)                          The location to save per-year archives of your
                                                         posts.
 `MONTH_ARCHIVE_SAVE_AS` (False)                         The location to save per-month archives of your

From 228fc82fc9c09493748e7fdf949fc1942cad0a7e Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Tue, 11 Jun 2013 21:40:13 -0400
Subject: [PATCH 1320/2864] utils: Add some ISO 8601 forms to get_date()

Support the forms listed by the W3C [1].  I also removed the
'%Y-%d-%m' form, which can be confused with the '%Y-%m-%d' ISO form.
The new ISO forms can use 'Z' to designate UTC or '[+-]HHMM' to
specify offsets from UTC.  Other time zone designators are not
supported.

The '%z' directive has only been supported since Python 3.2 [2], so if
you're running Pelican on Python 2.7, you're stuck with 'Z' for UTC.
Conveniently, we get ValueErrors for both invalid directives and
data/format missmatches, so we don't need special handling for the 2.7
case inside get_date().

[1]: http://www.w3.org/TR/NOTE-datetime
[2]: http://bugs.python.org/issue6641
---
 docs/getting_started.rst    |  6 ++++-
 pelican/tests/test_utils.py | 52 +++++++++++++++++++++++++------------
 pelican/utils.py            | 50 +++++++++++++++++++++++------------
 3 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index b41f8c18..7cd3267e 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -286,7 +286,10 @@ by the directory in which the file resides. For example, a file located at
 ``python/foobar/myfoobar.rst`` will have a category of ``foobar``. If you would
 like to organize your files in other ways where the name of the subfolder would
 not be a good category name, you can set the setting ``USE_FOLDER_AS_CATEGORY``
-to ``False``.
+to ``False``.  When parsing dates given in the page metadata, Pelican supports
+the W3C's `suggested subset ISO 8601`__.
+
+__ `W3C ISO 8601`_
 
 If you do not explicitly specify summary metadata for a given post, the
 ``SUMMARY_MAX_LENGTH`` setting can be used to specify how many words from the
@@ -478,3 +481,4 @@ metadata. That article will then be output to the ``drafts`` folder and not
 listed on the index page nor on any category page.
 
 .. _virtualenv: http://www.virtualenv.org/
+.. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 8b0dc13e..77e3bccb 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -6,7 +6,7 @@ import os
 import datetime
 import time
 import locale
-from sys import platform
+from sys import platform, version_info
 from tempfile import mkdtemp
 
 from pelican.generators import TemplatePagesGenerator
@@ -37,26 +37,44 @@ class TestUtils(LoggedTestCase):
     def test_get_date(self):
         # valid ones
         date = datetime.datetime(year=2012, month=11, day=22)
-        date_hour = datetime.datetime(year=2012, month=11, day=22, hour=22,
-                                      minute=11)
-        date_hour_sec = datetime.datetime(year=2012, month=11, day=22, hour=22,
-                                          minute=11, second=10)
-        dates = {'2012-11-22': date,
-                 '2012/11/22': date,
-                 '2012-11-22 22:11': date_hour,
-                 '2012/11/22 22:11': date_hour,
-                 '22-11-2012': date,
-                 '22/11/2012': date,
-                 '22.11.2012': date,
-                 '2012-22-11': date,
-                 '22.11.2012 22:11': date_hour,
-                 '2012-11-22 22:11:10': date_hour_sec}
+        date_hour = datetime.datetime(
+            year=2012, month=11, day=22, hour=22, minute=11)
+        date_hour_sec = datetime.datetime(
+            year=2012, month=11, day=22, hour=22, minute=11, second=10)
+        date_hour_sec_z = datetime.datetime(
+            year=2012, month=11, day=22, hour=22, minute=11, second=10,
+            tzinfo=datetime.timezone.utc)
+        date_hour_sec_0430 = datetime.datetime(
+            year=2012, month=11, day=22, hour=22, minute=11, second=10,
+            tzinfo=datetime.timezone(datetime.timedelta(hours=4, minutes=30)))
+        date_hour_sec_frac_z = datetime.datetime(
+            year=2012, month=11, day=22, hour=22, minute=11, second=10,
+            microsecond=123000, tzinfo=datetime.timezone.utc)
+        dates = {
+            '2012-11-22': date,
+            '2012/11/22': date,
+            '2012-11-22 22:11': date_hour,
+            '2012/11/22 22:11': date_hour,
+            '22-11-2012': date,
+            '22/11/2012': date,
+            '22.11.2012': date,
+            '22.11.2012 22:11': date_hour,
+            '2012-11-22 22:11:10': date_hour_sec,
+            '2012-11-22T22:11:10Z': date_hour_sec_z,
+            '2012-11-22T22:11:10+0430': date_hour_sec_0430,
+            '2012-11-22T22:11:10.123Z': date_hour_sec_frac_z,
+            }
+
+        # invalid ones
+        invalid_dates = ['2010-110-12', 'yay']
+
+        if version_info < (3, 2):
+            dates.pop('2012-11-22T22:11:10-0500')
+            invalid_dates.append('2012-11-22T22:11:10-0500')
 
         for value, expected in dates.items():
             self.assertEqual(utils.get_date(value), expected, value)
 
-        # invalid ones
-        invalid_dates = ('2010-110-12', 'yay')
         for item in invalid_dates:
             self.assertRaises(ValueError, utils.get_date, item)
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 4e7bdbd1..e2e69121 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -15,7 +15,7 @@ from collections import Hashable
 from functools import partial
 
 from codecs import open, BOM_UTF8
-from datetime import datetime
+from datetime import datetime, timezone
 from itertools import groupby
 from jinja2 import Markup
 from operator import attrgetter
@@ -180,17 +180,39 @@ def get_date(string):
     If no format matches the given date, raise a ValueError.
     """
     string = re.sub(' +', ' ', string)
-    formats = ['%Y-%m-%d %H:%M', '%Y/%m/%d %H:%M',
-               '%Y-%m-%d', '%Y/%m/%d',
-               '%d-%m-%Y', '%Y-%d-%m',  # Weird ones
-               '%d/%m/%Y', '%d.%m.%Y',
-               '%d.%m.%Y %H:%M', '%Y-%m-%d %H:%M:%S']
+    formats = [
+        # ISO 8601
+        '%Y',
+        '%Y-%m',
+        '%Y-%m-%d',
+        '%Y-%m-%dT%H:%M%z',
+        '%Y-%m-%dT%H:%MZ',
+        '%Y-%m-%dT%H:%M',
+        '%Y-%m-%dT%H:%M:%S%z',
+        '%Y-%m-%dT%H:%M:%SZ',
+        '%Y-%m-%dT%H:%M:%S',
+        '%Y-%m-%dT%H:%M:%S.%f%z',
+        '%Y-%m-%dT%H:%M:%S.%fZ',
+        '%Y-%m-%dT%H:%M:%S.%f',
+        # end ISO 8601 forms
+        '%Y-%m-%d %H:%M',
+        '%Y-%m-%d %H:%M:%S',
+        '%Y/%m/%d %H:%M',
+        '%Y/%m/%d',
+        '%d-%m-%Y',
+        '%d.%m.%Y %H:%M',
+        '%d.%m.%Y',
+        '%d/%m/%Y',
+        ]
     for date_format in formats:
         try:
-            return datetime.strptime(string, date_format)
+            date = datetime.strptime(string, date_format)
         except ValueError:
-            pass
-    raise ValueError("'%s' is not a valid date" % string)
+            continue
+        if date_format.endswith('Z'):
+            date = date.replace(tzinfo=timezone.utc)
+        return date
+    raise ValueError('{0!r} is not a valid date'.format(string))
 
 
 class pelican_open(object):
@@ -510,15 +532,11 @@ def file_watcher(path):
 
 
 def set_date_tzinfo(d, tz_name=None):
-    """ Date without tzinfo shoudbe utc.
-    This function set the right tz to date that aren't utc and don't have
-    tzinfo.
-    """
-    if tz_name is not None:
+    """Set the timezone for dates that don't have tzinfo"""
+    if tz_name and not d.tzinfo:
         tz = pytz.timezone(tz_name)
         return tz.localize(d)
-    else:
-        return d
+    return d
 
 
 def mkdir_p(path):

From 1102143c330573f25a0fad29349cc131b171e67c Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Tue, 11 Jun 2013 22:32:51 -0400
Subject: [PATCH 1321/2864] utils: Use pytz instead of datetime.timezone for
 timezones

datetime.timezone is new in Python 3.2 [1], so pytz allows us to keep
support for Python 2.7.

[1]: http://docs.python.org/dev/library/datetime.html#datetime.timezone
---
 pelican/tests/test_utils.py | 12 +++++++-----
 pelican/utils.py            |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 77e3bccb..911d6266 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -9,6 +9,8 @@ import locale
 from sys import platform, version_info
 from tempfile import mkdtemp
 
+import pytz
+
 from pelican.generators import TemplatePagesGenerator
 from pelican.writers import Writer
 from pelican.settings import read_settings
@@ -43,13 +45,13 @@ class TestUtils(LoggedTestCase):
             year=2012, month=11, day=22, hour=22, minute=11, second=10)
         date_hour_sec_z = datetime.datetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10,
-            tzinfo=datetime.timezone.utc)
-        date_hour_sec_0430 = datetime.datetime(
+            tzinfo=pytz.timezone('UTC'))
+        date_hour_sec_est = datetime.datetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10,
-            tzinfo=datetime.timezone(datetime.timedelta(hours=4, minutes=30)))
+            tzinfo=pytz.timezone('EST'))
         date_hour_sec_frac_z = datetime.datetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10,
-            microsecond=123000, tzinfo=datetime.timezone.utc)
+            microsecond=123000, tzinfo=pytz.timezone('UTC'))
         dates = {
             '2012-11-22': date,
             '2012/11/22': date,
@@ -61,7 +63,7 @@ class TestUtils(LoggedTestCase):
             '22.11.2012 22:11': date_hour,
             '2012-11-22 22:11:10': date_hour_sec,
             '2012-11-22T22:11:10Z': date_hour_sec_z,
-            '2012-11-22T22:11:10+0430': date_hour_sec_0430,
+            '2012-11-22T22:11:10-0500': date_hour_sec_est,
             '2012-11-22T22:11:10.123Z': date_hour_sec_frac_z,
             }
 
diff --git a/pelican/utils.py b/pelican/utils.py
index e2e69121..9ba234a5 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -15,7 +15,7 @@ from collections import Hashable
 from functools import partial
 
 from codecs import open, BOM_UTF8
-from datetime import datetime, timezone
+from datetime import datetime
 from itertools import groupby
 from jinja2 import Markup
 from operator import attrgetter
@@ -210,7 +210,7 @@ def get_date(string):
         except ValueError:
             continue
         if date_format.endswith('Z'):
-            date = date.replace(tzinfo=timezone.utc)
+            date = date.replace(tzinfo=pytz.timezone('UTC'))
         return date
     raise ValueError('{0!r} is not a valid date'.format(string))
 

From 5a61600bc9948c318ccad79943df2f51756adcd8 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Wed, 12 Jun 2013 14:52:23 -0400
Subject: [PATCH 1322/2864] tests: Avoid hidden logic with better .assert*()
 method choices

We'll get better failure messages if we use an assertion method that
understands the comparison we're trying to make.  If you make the
comparison by hand and assertTrue(), you don't get much constructive
feedback ;).
---
 pelican/tests/test_generators.py | 4 ++--
 pelican/tests/test_importer.py   | 4 ++--
 pelican/tests/test_utils.py      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index e3b8e20a..48aff498 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -108,7 +108,7 @@ class TestArticlesGenerator(unittest.TestCase):
             sorted(['Default', 'TestCategory', 'Yeah', 'test', '指導書']),
             sorted(['Default', 'TestCategory', 'yeah', 'test', '指導書']),
         )
-        self.assertTrue(sorted(categories) in categories_alternatives)
+        self.assertIn(sorted(categories), categories_alternatives)
         # test for slug
         categories = [cat.slug for cat, _ in generator.categories]
         categories_expected = ['default', 'testcategory', 'yeah', 'test',
@@ -136,7 +136,7 @@ class TestArticlesGenerator(unittest.TestCase):
             sorted(['Default', 'Yeah', 'test', '指導書']),
             sorted(['Default', 'yeah', 'test', '指導書']),
         )
-        self.assertTrue(sorted(categories) in categories_alternatives)
+        self.assertIn(sorted(categories), categories_alternatives)
         # test for slug
         categories = [cat.slug for cat, _ in generator.categories]
         categories_expected = ['default', 'yeah', 'test', 'zhi-dao-shu']
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index cb095426..53809e7e 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -76,13 +76,13 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
     def test_decode_html_entities_in_titles(self):
         test_posts = [post for post in self.posts if post[2] == 'html-entity-test']
-        self.assertTrue(len(test_posts) == 1)
+        self.assertEqual(len(test_posts), 1)
 
         post = test_posts[0]
         title = post[0]
         self.assertTrue(title, "A normal post with some <html> entities in the"
                                " title. You can't miss them.")
-        self.assertTrue('&' not in title)
+        self.assertNotIn('&', title)
 
     def test_decode_wp_content_returns_empty(self):
         """ Check that given an empty string we return an empty string."""
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 8b0dc13e..1d538ca0 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -186,7 +186,7 @@ class TestUtils(LoggedTestCase):
         test_directory = os.path.join(os.path.dirname(__file__),
                                       'does_not_exist')
         utils.clean_output_dir(test_directory)
-        self.assertTrue(not os.path.exists(test_directory))
+        self.assertFalse(os.path.exists(test_directory))
 
     def test_clean_output_dir_is_file(self):
         test_directory = os.path.join(os.path.dirname(__file__),
@@ -195,7 +195,7 @@ class TestUtils(LoggedTestCase):
         f.write('')
         f.close()
         utils.clean_output_dir(test_directory)
-        self.assertTrue(not os.path.exists(test_directory))
+        self.assertFalse(os.path.exists(test_directory))
 
     def test_strftime(self):
         d = datetime.date(2012, 8, 29)

From ecf56829300b731711b46177cee86345d504096f Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 14:21:38 -0500
Subject: [PATCH 1323/2864] readers: Instrument read_file to return Content
 objects

The assorted generators all use read_file() to read in the file
contents and metadata.  Previously, they sometimes parse additional
metadata, fire off signals, and initialize a pelican.contents.Content
subclass on their own.  We can reduce duplicated code and increase
consistency by shifting all that stuff into read_file() itself, and
this commit is a step in that direction.
---
 pelican/readers.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 816464ef..beaa8814 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -31,7 +31,7 @@ try:
 except ImportError:
     from HTMLParser import HTMLParser
 
-from pelican.contents import Category, Tag, Author
+from pelican.contents import Page, Category, Tag, Author
 from pelican.utils import get_date, pelican_open
 
 
@@ -333,8 +333,15 @@ for cls in [Reader] + Reader.__subclasses__():
         EXTENSIONS[ext] = cls
 
 
-def read_file(path, fmt=None, settings=None):
-    """Return a reader object using the given format."""
+def read_file(base_path, path, content_class=Page, fmt=None,
+              settings=None, context=None,
+              preread_signal=None, preread_sender=None,
+              context_signal=None, context_sender=None):
+    """Return a content object parsed with the given format."""
+    if preread_signal:
+        preread_signal.send(preread_sender)
+    path = os.path.abspath(os.path.join(base_path, path))
+    source_path = os.path.relpath(path, base_path)
     base, ext = os.path.splitext(os.path.basename(path))
     if not fmt:
         fmt = ext[1:]
@@ -355,7 +362,7 @@ def read_file(path, fmt=None, settings=None):
         raise ValueError("Missing dependencies for %s" % fmt)
 
     metadata = parse_path_metadata(
-        path=path, settings=settings, process=reader.process_metadata)
+        path=source_path, settings=settings, process=reader.process_metadata)
     content, reader_metadata = reader.read(path)
     metadata.update(reader_metadata)
 
@@ -365,7 +372,14 @@ def read_file(path, fmt=None, settings=None):
         content = typogrify(content)
         metadata['title'] = typogrify(metadata['title'])
 
-    return content, metadata
+    if context_signal:
+        context_signal.send(context_sender, metadata=metadata)
+    return content_class(
+        content=content,
+        metadata=metadata,
+        settings=settings,
+        source_path=path,
+        context=context)
 
 def parse_path_metadata(path, settings=None, process=None):
     """Extract a metadata dictionary from a file's path

From 4e118eff010c4048889063ecdad804f0435ad00b Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sat, 5 Jan 2013 21:27:30 -0500
Subject: [PATCH 1324/2864] readers: Add debugging logging to read_file

---
 pelican/readers.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index beaa8814..974290e6 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
 
+import logging
 import os
 import re
 try:
@@ -35,6 +36,8 @@ from pelican.contents import Page, Category, Tag, Author
 from pelican.utils import get_date, pelican_open
 
 
+logger = logging.getLogger(__name__)
+
 METADATA_PROCESSORS = {
     'tags': lambda x, y: [Tag(tag, y) for tag in x.split(',')],
     'date': lambda x, y: get_date(x),
@@ -343,6 +346,8 @@ def read_file(base_path, path, content_class=Page, fmt=None,
     path = os.path.abspath(os.path.join(base_path, path))
     source_path = os.path.relpath(path, base_path)
     base, ext = os.path.splitext(os.path.basename(path))
+    logger.debug('read file {} -> {}'.format(
+            source_path, content_class.__name__))
     if not fmt:
         fmt = ext[1:]
 

From e38e170656f174528601601c5315484525b6abd9 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 3 Jun 2013 15:09:18 -0400
Subject: [PATCH 1325/2864] readers: Log signal sending for read_file()

---
 pelican/readers.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 974290e6..2de00b51 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -341,8 +341,6 @@ def read_file(base_path, path, content_class=Page, fmt=None,
               preread_signal=None, preread_sender=None,
               context_signal=None, context_sender=None):
     """Return a content object parsed with the given format."""
-    if preread_signal:
-        preread_signal.send(preread_sender)
     path = os.path.abspath(os.path.join(base_path, path))
     source_path = os.path.relpath(path, base_path)
     base, ext = os.path.splitext(os.path.basename(path))
@@ -354,6 +352,11 @@ def read_file(base_path, path, content_class=Page, fmt=None,
     if fmt not in EXTENSIONS:
         raise TypeError('Pelican does not know how to parse {}'.format(path))
 
+    if preread_signal:
+        logger.debug('signal {}.send({})'.format(
+                preread_signal, preread_sender))
+        preread_signal.send(preread_sender)
+
     if settings is None:
         settings = {}
 
@@ -378,6 +381,8 @@ def read_file(base_path, path, content_class=Page, fmt=None,
         metadata['title'] = typogrify(metadata['title'])
 
     if context_signal:
+        logger.debug('signal {}.send({}, <metadata>)'.format(
+                context_signal, context_sender))
         context_signal.send(context_sender, metadata=metadata)
     return content_class(
         content=content,

From effe7e5e126343e9b787d0434e79599c499b8443 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 18:53:12 -0500
Subject: [PATCH 1326/2864] signals: Sort signals into categories

---
 pelican/signals.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pelican/signals.py b/pelican/signals.py
index 92bc6249..ad2985b5 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -2,15 +2,27 @@
 from __future__ import unicode_literals, print_function
 from blinker import signal
 
+# Run-level signals:
+
 initialized = signal('pelican_initialized')
+get_generators = signal('get_generators')
 finalized = signal('pelican_finalized')
-article_generate_preread = signal('article_generate_preread')
+
+# Generator-level signals
+
 generator_init = signal('generator_init')
-article_generate_context = signal('article_generate_context')
+
 article_generator_init = signal('article_generator_init')
 article_generator_finalized = signal('article_generate_finalized')
-get_generators = signal('get_generators')
-pages_generate_context = signal('pages_generate_context')
+
 pages_generator_init = signal('pages_generator_init')
 pages_generator_finalized = signal('pages_generator_finalized')
+
+# Page-level signals
+
+article_generate_preread = signal('article_generate_preread')
+article_generate_context = signal('article_generate_context')
+
+pages_generate_context = signal('pages_generate_context')
+
 content_object_init = signal('content_object_init')

From 386cd1f3f0e6c573cc8965ace2e9bf492452cf70 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 19:01:41 -0500
Subject: [PATCH 1327/2864] signals: Add missing signals

Note that the `pages_*` names are plural , while the `article_*` names
are singular.  I'll fix this once I update the PagesGenerator.
---
 pelican/signals.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pelican/signals.py b/pelican/signals.py
index ad2985b5..34bde68a 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -18,11 +18,18 @@ article_generator_finalized = signal('article_generate_finalized')
 pages_generator_init = signal('pages_generator_init')
 pages_generator_finalized = signal('pages_generator_finalized')
 
+static_generator_init = signal('static_generator_init')
+static_generator_finalized = signal('static_generator_finalized')
+
 # Page-level signals
 
 article_generate_preread = signal('article_generate_preread')
 article_generate_context = signal('article_generate_context')
 
+pages_generate_preread = signal('pages_generate_preread')
 pages_generate_context = signal('pages_generate_context')
 
+static_generate_preread = signal('static_generate_preread')
+static_generate_context = signal('static_generate_context')
+
 content_object_init = signal('content_object_init')

From f2d6f77462976f5ea291481cba40e041d42d9e8c Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sat, 5 Jan 2013 21:33:28 -0500
Subject: [PATCH 1328/2864] signals: Fix *_generate_* signals -> *_generator_*

For example, article_generate_preread is now article_generator_preread
for consistency with the other preread and context signals.
---
 pelican/signals.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pelican/signals.py b/pelican/signals.py
index 34bde68a..877b0a6b 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -13,7 +13,7 @@ finalized = signal('pelican_finalized')
 generator_init = signal('generator_init')
 
 article_generator_init = signal('article_generator_init')
-article_generator_finalized = signal('article_generate_finalized')
+article_generator_finalized = signal('article_generator_finalized')
 
 pages_generator_init = signal('pages_generator_init')
 pages_generator_finalized = signal('pages_generator_finalized')
@@ -23,13 +23,13 @@ static_generator_finalized = signal('static_generator_finalized')
 
 # Page-level signals
 
-article_generate_preread = signal('article_generate_preread')
-article_generate_context = signal('article_generate_context')
+article_generator_preread = signal('article_generator_preread')
+article_generator_context = signal('article_generator_context')
 
-pages_generate_preread = signal('pages_generate_preread')
-pages_generate_context = signal('pages_generate_context')
+pages_generator_preread = signal('pages_generator_preread')
+pages_generator_context = signal('pages_generator_context')
 
-static_generate_preread = signal('static_generate_preread')
-static_generate_context = signal('static_generate_context')
+static_generator_preread = signal('static_generator_preread')
+static_generator_context = signal('static_generator_context')
 
 content_object_init = signal('content_object_init')

From a9c530281e1928e9f9f3c2cb78312db784505ca1 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 18:14:28 -0500
Subject: [PATCH 1329/2864] Move Article metadata extraction from generators to
 readers

There's no reason why this information should be Article-specific.

This commit breaks the other generators for the moment.  I'll fix them
shortly.
---
 pelican/generators.py | 41 ++++++++---------------------------
 pelican/readers.py    | 50 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 75b61df2..7daa55d2 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -5,7 +5,6 @@ import os
 import math
 import random
 import logging
-import datetime
 import shutil
 
 from codecs import open
@@ -19,9 +18,7 @@ from jinja2 import (
         TemplateNotFound
 )
 
-from pelican.contents import (
-        Article, Page, Category, Static, is_valid_content
-)
+from pelican.contents import Article, Page, Static, is_valid_content
 from pelican.readers import read_file
 from pelican.utils import copy, process_translations, mkdir_p, DateFormatter
 from pelican import signals
@@ -383,37 +380,17 @@ class ArticlesGenerator(Generator):
                 article_path,
                 exclude=self.settings['ARTICLE_EXCLUDES']):
             try:
-                signals.article_generate_preread.send(self)
-                content, metadata = read_file(f, settings=self.settings)
+                article = read_file(
+                    base_path=self.path, path=f, content_class=Article,
+                    settings=self.settings, context=self.context,
+                    preread_signal=signals.article_generator_preread,
+                    preread_sender=self,
+                    context_signal=signals.article_generator_context,
+                    context_sender=self)
             except Exception as e:
-                logger.warning('Could not process %s\n%s' % (f, str(e)))
+                logger.warning('Could not process {}\n{}'.format(f, e))
                 continue
 
-            # if no category is set, use the name of the path as a category
-            if 'category' not in metadata:
-
-                if (self.settings['USE_FOLDER_AS_CATEGORY']
-                    and os.path.dirname(f) != article_path):
-                    # if the article is in a subdirectory
-                    category = os.path.basename(os.path.dirname(f))
-                else:
-                    # if the article is not in a subdirectory
-                    category = self.settings['DEFAULT_CATEGORY']
-
-                if category != '':
-                    metadata['category'] = Category(category, self.settings)
-
-            if 'date' not in metadata and self.settings.get('DEFAULT_DATE'):
-                if self.settings['DEFAULT_DATE'] == 'fs':
-                    metadata['date'] = datetime.datetime.fromtimestamp(
-                            os.stat(f).st_ctime)
-                else:
-                    metadata['date'] = datetime.datetime(
-                            *self.settings['DEFAULT_DATE'])
-
-            signals.article_generate_context.send(self, metadata=metadata)
-            article = Article(content, metadata, settings=self.settings,
-                              source_path=f, context=self.context)
             if not is_valid_content(article, f):
                 continue
 
diff --git a/pelican/readers.py b/pelican/readers.py
index 2de00b51..3cf69dcf 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
 
+import datetime
 import logging
 import os
 import re
@@ -369,8 +370,13 @@ def read_file(base_path, path, content_class=Page, fmt=None,
     if not reader.enabled:
         raise ValueError("Missing dependencies for %s" % fmt)
 
-    metadata = parse_path_metadata(
-        path=source_path, settings=settings, process=reader.process_metadata)
+    metadata = default_metadata(
+        settings=settings, process=reader.process_metadata)
+    metadata.update(path_metadata(
+            full_path=path, source_path=source_path, settings=settings))
+    metadata.update(parse_path_metadata(
+            source_path=source_path, settings=settings,
+            process=reader.process_metadata))
     content, reader_metadata = reader.read(path)
     metadata.update(reader_metadata)
 
@@ -391,7 +397,29 @@ def read_file(base_path, path, content_class=Page, fmt=None,
         source_path=path,
         context=context)
 
-def parse_path_metadata(path, settings=None, process=None):
+
+def default_metadata(settings=None, process=None):
+    metadata = {}
+    if settings:
+        if 'DEFAULT_CATEGORY' in settings:
+            value = settings['DEFAULT_CATEGORY']
+            if process:
+                value = process('category', value)
+            metadata['category'] = value
+        if 'DEFAULT_DATE' in settings and settings['DEFAULT_DATE'] != 'fs':
+            metadata['date'] = datetime.datetime(*settings['DEFAULT_DATE'])
+    return metadata
+
+
+def path_metadata(full_path, source_path, settings=None):
+    metadata = {}
+    if settings and settings.get('DEFAULT_DATE', None) == 'fs':
+        metadata['date'] = datetime.datetime.fromtimestamp(
+            os.stat(path).st_ctime)
+    return metadata
+
+
+def parse_path_metadata(source_path, settings=None, process=None):
     """Extract a metadata dictionary from a file's path
 
     >>> import pprint
@@ -402,7 +430,7 @@ def parse_path_metadata(path, settings=None, process=None):
     ...     }
     >>> reader = Reader(settings=settings)
     >>> metadata = parse_path_metadata(
-    ...     path='my-cat/2013-01-01/my-slug.html',
+    ...     source_path='my-cat/2013-01-01/my-slug.html',
     ...     settings=settings,
     ...     process=reader.process_metadata)
     >>> pprint.pprint(metadata)  # doctest: +ELLIPSIS
@@ -411,13 +439,19 @@ def parse_path_metadata(path, settings=None, process=None):
      'slug': 'my-slug'}
     """
     metadata = {}
-    base, ext = os.path.splitext(os.path.basename(path))
+    dirname, basename = os.path.split(source_path)
+    base, ext = os.path.splitext(basename)
+    subdir = os.path.basename(dirname)
     if settings:
+        checks = []
         for key,data in [('FILENAME_METADATA', base),
-                         ('PATH_METADATA', path),
+                         ('PATH_METADATA', source_path),
                          ]:
-            regexp = settings.get(key)
-            if regexp:
+            checks.append((settings.get(key, None), data))
+        if settings.get('USE_FOLDER_AS_CATEGORY', None):
+            checks.insert(0, ('(?P<category>.*)', subdir))
+        for regexp,data in checks:
+            if regexp and data:
                 match = re.match(regexp, data)
                 if match:
                     # .items() for py3k compat.

From 7be16dd5247e07952c009cb439734722acf019ac Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 18:19:26 -0500
Subject: [PATCH 1330/2864] generators: Update PagesGenerator to use new
 read_file

Also standardize signal names.  If `article_generator_*` is singular,
`page_generator_*` should be as well.  Fix it from the older
`pages_generator_*`.
---
 docs/plugins.rst      |  6 +++---
 pelican/generators.py | 18 +++++++++++-------
 pelican/signals.py    |  8 ++++----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 064ba73d..9e262962 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -79,9 +79,9 @@ article_generator_finalized     article_generator               invoked at the e
 get_generators                  generators                      invoked in Pelican.get_generator_classes,
                                                                 can return a Generator, or several
                                                                 generator in a tuple or in a list.
-pages_generate_context          pages_generator, metadata
-pages_generator_init            pages_generator                 invoked in the PagesGenerator.__init__
-pages_generator_finalized       pages_generator                 invoked at the end of PagesGenerator.generate_context
+page_generate_context           page_generator, metadata
+page_generator_init             page_generator                  invoked in the PagesGenerator.__init__
+page_generator_finalized        page_generator                  invoked at the end of PagesGenerator.generate_context
 content_object_init             content_object                  invoked at the end of Content.__init__ (see note below)
 =============================   ============================   ===========================================================================
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 7daa55d2..a4cd273e 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -479,7 +479,7 @@ class PagesGenerator(Generator):
         self.hidden_pages = []
         self.hidden_translations = []
         super(PagesGenerator, self).__init__(*args, **kwargs)
-        signals.pages_generator_init.send(self)
+        signals.page_generator_init.send(self)
 
     def generate_context(self):
         all_pages = []
@@ -488,13 +488,17 @@ class PagesGenerator(Generator):
                 os.path.join(self.path, self.settings['PAGE_DIR']),
                 exclude=self.settings['PAGE_EXCLUDES']):
             try:
-                content, metadata = read_file(f, settings=self.settings)
+                page = read_file(
+                    base_path=self.path, path=f, content_class=Page,
+                    settings=self.settings, context=self.context,
+                    preread_signal=signals.page_generator_preread,
+                    preread_sender=self,
+                    context_signal=signals.page_generator_context,
+                    context_sender=self)
             except Exception as e:
-                logger.warning('Could not process %s\n%s' % (f, str(e)))
+                logger.warning('Could not process {}\n{}'.format(f, e))
                 continue
-            signals.pages_generate_context.send(self, metadata=metadata)
-            page = Page(content, metadata, settings=self.settings,
-                        source_path=f, context=self.context)
+
             if not is_valid_content(page, f):
                 continue
 
@@ -516,7 +520,7 @@ class PagesGenerator(Generator):
         self._update_context(('pages', ))
         self.context['PAGES'] = self.pages
 
-        signals.pages_generator_finalized.send(self)
+        signals.page_generator_finalized.send(self)
 
     def generate_output(self, writer):
         for page in chain(self.translations, self.pages,
diff --git a/pelican/signals.py b/pelican/signals.py
index 877b0a6b..cb010d37 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -15,8 +15,8 @@ generator_init = signal('generator_init')
 article_generator_init = signal('article_generator_init')
 article_generator_finalized = signal('article_generator_finalized')
 
-pages_generator_init = signal('pages_generator_init')
-pages_generator_finalized = signal('pages_generator_finalized')
+page_generator_init = signal('page_generator_init')
+page_generator_finalized = signal('page_generator_finalized')
 
 static_generator_init = signal('static_generator_init')
 static_generator_finalized = signal('static_generator_finalized')
@@ -26,8 +26,8 @@ static_generator_finalized = signal('static_generator_finalized')
 article_generator_preread = signal('article_generator_preread')
 article_generator_context = signal('article_generator_context')
 
-pages_generator_preread = signal('pages_generator_preread')
-pages_generator_context = signal('pages_generator_context')
+page_generator_preread = signal('page_generator_preread')
+page_generator_context = signal('page_generator_context')
 
 static_generator_preread = signal('static_generator_preread')
 static_generator_context = signal('static_generator_context')

From 1bc5b100eceab6b0ad90ab7ebecd896dbbc2bc93 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sat, 5 Jan 2013 07:21:47 -0500
Subject: [PATCH 1331/2864] generators: Convert StaticGenerator to use the new
 read_file

---
 pelican/generators.py | 45 ++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index a4cd273e..b777efec 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -548,32 +548,29 @@ class StaticGenerator(Generator):
         for static_path in self.settings['STATIC_PATHS']:
             for f in self.get_files(
                     os.path.join(self.path, static_path), extensions=False):
-                f_rel = os.path.relpath(f, self.path)
-                content, metadata = read_file(
-                    f, fmt='static', settings=self.settings)
-                # TODO remove this hardcoded 'static' subdirectory
-                metadata['save_as'] = os.path.join('static', f_rel)
-                metadata['url'] = pelican.utils.path_to_url(metadata['save_as'])
-                sc = Static(
-                    content=None,
-                    metadata=metadata,
-                    settings=self.settings,
-                    source_path=f_rel)
-                self.staticfiles.append(sc)
-                self.add_source_path(sc)
+                static = read_file(
+                    base_path=self.path, path=f, content_class=Static,
+                    fmt='static',
+                    settings=self.settings, context=self.context,
+                    preread_signal=signals.static_generator_preread,
+                    preread_sender=self,
+                    context_signal=signals.static_generator_context,
+                    context_sender=self)
+                self.staticfiles.append(static)
+                self.add_source_path(static)
+
         # same thing for FILES_TO_COPY
         for src, dest in self.settings['FILES_TO_COPY']:
-            content, metadata = read_file(
-                src, fmt='static', settings=self.settings)
-            metadata['save_as'] = dest
-            metadata['url'] = pelican.utils.path_to_url(metadata['save_as'])
-            sc = Static(
-                content=None,
-                metadata={'save_as': dest},
-                settings=self.settings,
-                source_path=src)
-            self.staticfiles.append(sc)
-            self.add_source_path(sc)
+            static = read_file(
+                base_path=self.path, path=f, content_class=Static,
+                fmt='static',
+                settings=self.settings, context=self.context,
+                preread_signal=signals.static_generator_preread,
+                preread_sender=self,
+                context_signal=signals.static_generator_context,
+                context_sender=self)
+            self.staticfiles.append(static)
+            self.add_source_path(static)
 
     def generate_output(self, writer):
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,

From 1ca0e06a273c45a52b4aab019ae95e580c6c58da Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 3 Jun 2013 15:14:11 -0400
Subject: [PATCH 1332/2864] Remove the FILES_TO_COPY setting

We no longer instantiate the Static object in the StaticGenerator, so
we can't set the save_as argument anymore.  If you want to adjust the
output path, use the upcoming EXTRA_PATH_METADATA setting.
---
 docs/settings.rst     |  3 ---
 pelican/generators.py | 13 -------------
 pelican/settings.py   |  1 -
 3 files changed, 17 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 0a04f804..a75badfc 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -68,9 +68,6 @@ Setting name (default value)                                            What doe
                                                                         generating new files. This can be useful in preventing older,
                                                                         unnecessary files from persisting in your output. However, **this is
                                                                         a destructive setting and should be handled with extreme care.**
-`FILES_TO_COPY` (``()``)                                                A list of files (or directories) to copy from the source (inside the
-                                                                        content directory) to the destination (inside the output directory).
-                                                                        For example: ``(('extra/robots.txt', 'robots.txt'),)``.
 `JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
 `JINJA_FILTERS` (``{}``)                                                A list of custom Jinja2 filters you want to use.
                                                                         The dictionary should map the filtername to the filter function.
diff --git a/pelican/generators.py b/pelican/generators.py
index b777efec..c48f8067 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -559,19 +559,6 @@ class StaticGenerator(Generator):
                 self.staticfiles.append(static)
                 self.add_source_path(static)
 
-        # same thing for FILES_TO_COPY
-        for src, dest in self.settings['FILES_TO_COPY']:
-            static = read_file(
-                base_path=self.path, path=f, content_class=Static,
-                fmt='static',
-                settings=self.settings, context=self.context,
-                preread_signal=signals.static_generator_preread,
-                preread_sender=self,
-                context_signal=signals.static_generator_context,
-                context_sender=self)
-            self.staticfiles.append(static)
-            self.add_source_path(static)
-
     def generate_output(self, writer):
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
                          'theme', self.output_path, os.curdir)
diff --git a/pelican/settings.py b/pelican/settings.py
index 34a2b42a..5386d172 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -95,7 +95,6 @@ DEFAULT_CONFIG = {
     'DEFAULT_METADATA': (),
     'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*',
     'PATH_METADATA': '',
-    'FILES_TO_COPY': (),
     'DEFAULT_STATUS': 'published',
     'ARTICLE_PERMALINK_STRUCTURE': '',
     'TYPOGRIFY': False,

From d43dc1b9d6ba5f0f99c6de44db214f296558c701 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 3 Jun 2013 15:15:53 -0400
Subject: [PATCH 1333/2864] Add the EXTRA_PATH_METADATA setting

Useful for altering static output paths when you don't want to encode
extra metadata in the static file's source path.
---
 docs/settings.rst   | 1 +
 pelican/readers.py  | 9 ++++++---
 pelican/settings.py | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index a75badfc..c7d7f199 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -64,6 +64,7 @@ Setting name (default value)                                            What doe
                                                                         ``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
 `PATH_METADATA` (``''``)                                                Like ``FILENAME_METADATA``, but parsed from a page's
                                                                         full path relative to the content source directory.
+`EXTRA_PATH_METADATA` (``{}``)                                          Extra metadata dictionaries keyed by relative path.
 `DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the output directory, and **all** of its contents, before
                                                                         generating new files. This can be useful in preventing older,
                                                                         unnecessary files from persisting in your output. However, **this is
diff --git a/pelican/readers.py b/pelican/readers.py
index 3cf69dcf..3e00b430 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -413,9 +413,12 @@ def default_metadata(settings=None, process=None):
 
 def path_metadata(full_path, source_path, settings=None):
     metadata = {}
-    if settings and settings.get('DEFAULT_DATE', None) == 'fs':
-        metadata['date'] = datetime.datetime.fromtimestamp(
-            os.stat(path).st_ctime)
+    if settings:
+        if settings.get('DEFAULT_DATE', None) == 'fs':
+            metadata['date'] = datetime.datetime.fromtimestamp(
+                os.stat(full_path).st_ctime)
+        metadata.update(settings.get('EXTRA_PATH_METADATA', {}).get(
+                source_path, {}))
     return metadata
 
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 5386d172..13896032 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -95,6 +95,7 @@ DEFAULT_CONFIG = {
     'DEFAULT_METADATA': (),
     'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*',
     'PATH_METADATA': '',
+    'EXTRA_PATH_METADATA': {},
     'DEFAULT_STATUS': 'published',
     'ARTICLE_PERMALINK_STRUCTURE': '',
     'TYPOGRIFY': False,

From 7de7bd0e3715f2227ce84fcf198dcc98cc3a0582 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sat, 5 Jan 2013 07:43:11 -0500
Subject: [PATCH 1334/2864] Update sample configurations from FILES_TO_COPY to
 EXTRA_PATH_METADATA

---
 pelican/tests/default_conf.py | 13 +++++++++----
 samples/pelican.conf.py       | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/pelican/tests/default_conf.py b/pelican/tests/default_conf.py
index bc3a7dff..80a990b5 100644
--- a/pelican/tests/default_conf.py
+++ b/pelican/tests/default_conf.py
@@ -29,11 +29,16 @@ SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
 # global metadata to all the contents
 DEFAULT_METADATA = (('yeah', 'it is'),)
 
-# static paths will be copied under the same name
-STATIC_PATHS = ["pictures", ]
+# path-specific metadata
+EXTRA_PATH_METADATA = {
+    'extra/robots.txt': {'path': 'robots.txt'},
+    }
 
-# A list of files to copy from the source to the destination
-FILES_TO_COPY = (('extra/robots.txt', 'robots.txt'),)
+# static paths will be copied without parsing their contents
+STATIC_PATHS = [
+    'pictures',
+    'extra/robots.txt',
+    ]
 
 # foobar will not be used, because it's not in caps. All configuration keys
 # have to be in caps
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 70edd5f8..ad2042fd 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -34,11 +34,19 @@ SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
 # global metadata to all the contents
 DEFAULT_METADATA = (('yeah', 'it is'),)
 
-# static paths will be copied under the same name
-STATIC_PATHS = ["pictures", ]
+# path-specific metadata
+EXTRA_PATH_METADATA = {
+    'extra/robots.txt': {'path': 'robots.txt'},
+    'pictures/Fat_Cat.jpg': {'path': 'static/pictures/Fat_Cat.jpg'},
+    'pictures/Sushi.jpg': {'path': 'static/pictures/Sushi.jpg'},
+    'pictures/Sushi_Macro.jpg': {'path': 'static/pictures/Sushi_Macro.jpg'},
+    }
 
-# A list of files to copy from the source to the destination
-FILES_TO_COPY = (('extra/robots.txt', 'robots.txt'),)
+# static paths will be copied without parsing their contents
+STATIC_PATHS = [
+    'pictures',
+    'extra/robots.txt',
+    ]
 
 # custom page generated with a jinja2 template
 TEMPLATE_PAGES = {'pages/jinja2_template.html': 'jinja2_template.html'}

From 06121eda76f22e03d43ce40c5c69d45d97447253 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 3 Jun 2013 15:21:17 -0400
Subject: [PATCH 1335/2864] test_readers: Update to new readers.read_file

---
 pelican/tests/test_readers.py | 72 +++++++++++++++++------------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index a48301f9..14d42325 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -20,13 +20,13 @@ class ReaderTest(unittest.TestCase):
     def read_file(self, path, **kwargs):
         # Isolate from future API changes to readers.read_file
         return readers.read_file(
-            _path(path), settings=get_settings(**kwargs))
+            base_path=CONTENT_PATH, path=path, settings=get_settings(**kwargs))
 
 
 class RstReaderTest(ReaderTest):
 
     def test_article_with_metadata(self):
-        content, metadata = self.read_file(path='article_with_metadata.rst')
+        page = self.read_file(path='article_with_metadata.rst')
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -40,10 +40,10 @@ class RstReaderTest(ReaderTest):
         }
 
         for key, value in expected.items():
-            self.assertEqual(value, metadata[key], key)
+            self.assertEqual(value, page.metadata[key], key)
 
     def test_article_with_filename_metadata(self):
-        content, metadata = self.read_file(
+        page = self.read_file(
             path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
             FILENAME_METADATA=None)
         expected = {
@@ -51,10 +51,10 @@ class RstReaderTest(ReaderTest):
             'author': 'Alexis Métaireau',
             'title': 'Rst with filename metadata',
         }
-        for key, value in metadata.items():
+        for key, value in page.metadata.items():
             self.assertEqual(value, expected[key], key)
 
-        content, metadata = self.read_file(
+        page = self.read_file(
             path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
             FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2}).*')
         expected = {
@@ -63,10 +63,10 @@ class RstReaderTest(ReaderTest):
             'title': 'Rst with filename metadata',
             'date': datetime.datetime(2012, 11, 29),
         }
-        for key, value in metadata.items():
+        for key, value in page.metadata.items():
             self.assertEqual(value, expected[key], key)
 
-        content, metadata = self.read_file(
+        page = self.read_file(
             path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
             FILENAME_METADATA=(
                 '(?P<date>\d{4}-\d{2}-\d{2})_'
@@ -80,7 +80,7 @@ class RstReaderTest(ReaderTest):
             'slug': 'article_with_filename_metadata',
             'mymeta': 'foo',
         }
-        for key, value in metadata.items():
+        for key, value in page.metadata.items():
             self.assertEqual(value, expected[key], key)
 
     def test_article_metadata_key_lowercase(self):
@@ -96,23 +96,23 @@ class RstReaderTest(ReaderTest):
     def test_typogrify(self):
         # if nothing is specified in the settings, the content should be
         # unmodified
-        content, _ = self.read_file(path='article.rst')
+        page = self.read_file(path='article.rst')
         expected = ('<p>This is some content. With some stuff to '
                     '&quot;typogrify&quot;.</p>\n<p>Now with added '
                     'support for <abbr title="three letter acronym">'
                     'TLA</abbr>.</p>\n')
 
-        self.assertEqual(content, expected)
+        self.assertEqual(page.content, expected)
 
         try:
             # otherwise, typogrify should be applied
-            content, _ = self.read_file(path='article.rst', TYPOGRIFY=True)
+            page = self.read_file(path='article.rst', TYPOGRIFY=True)
             expected = ('<p>This is some content. With some stuff to&nbsp;'
                         '&#8220;typogrify&#8221;.</p>\n<p>Now with added '
                         'support for <abbr title="three letter acronym">'
                         '<span class="caps">TLA</span></abbr>.</p>\n')
 
-            self.assertEqual(content, expected)
+            self.assertEqual(page.content, expected)
         except ImportError:
             return unittest.skip('need the typogrify distribution')
 
@@ -225,7 +225,7 @@ class MdReaderTest(ReaderTest):
     def test_article_with_markdown_markup_extension(self):
         # test to ensure the markdown markup extension is being processed as
         # expected
-        content, metadata = self.read_file(
+        page = self.read_file(
             path='article_with_markdown_markup_extensions.md',
             MD_EXTENSIONS=['toc', 'codehilite', 'extra'])
         expected = ('<div class="toc">\n'
@@ -239,11 +239,11 @@ class MdReaderTest(ReaderTest):
                     '<h2 id="level1">Level1</h2>\n'
                     '<h3 id="level2">Level2</h3>')
 
-        self.assertEqual(content, expected)
+        self.assertEqual(page.content, expected)
 
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_filename_metadata(self):
-        content, metadata = self.read_file(
+        page = self.read_file(
             path='2012-11-30_md_w_filename_meta#foo-bar.md',
             FILENAME_METADATA=None)
         expected = {
@@ -251,9 +251,9 @@ class MdReaderTest(ReaderTest):
             'author': 'Alexis Métaireau',
         }
         for key, value in expected.items():
-            self.assertEqual(value, metadata[key], key)
+            self.assertEqual(value, page.metadata[key], key)
 
-        content, metadata = self.read_file(
+        page = self.read_file(
             path='2012-11-30_md_w_filename_meta#foo-bar.md',
             FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2}).*')
         expected = {
@@ -262,9 +262,9 @@ class MdReaderTest(ReaderTest):
             'date': datetime.datetime(2012, 11, 30),
         }
         for key, value in expected.items():
-            self.assertEqual(value, metadata[key], key)
+            self.assertEqual(value, page.metadata[key], key)
 
-        content, metadata = self.read_file(
+        page = self.read_file(
             path='2012-11-30_md_w_filename_meta#foo-bar.md',
             FILENAME_METADATA=(
                 '(?P<date>\d{4}-\d{2}-\d{2})'
@@ -278,7 +278,7 @@ class MdReaderTest(ReaderTest):
             'mymeta': 'foo',
         }
         for key, value in expected.items():
-            self.assertEqual(value, metadata[key], key)
+            self.assertEqual(value, page.metadata[key], key)
 
 
 class AdReaderTest(ReaderTest):
@@ -286,13 +286,13 @@ class AdReaderTest(ReaderTest):
     @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
     def test_article_with_asc_extension(self):
         # Ensure the asc extension is being processed by the correct reader
-        content, metadata = self.read_file(
+        page = self.read_file(
             path='article_with_asc_extension.asc')
         expected = ('<hr>\n<h2><a name="_used_for_pelican_test">'
                     '</a>Used for pelican test</h2>\n'
                     '<p>The quick brown fox jumped over'
                     ' the lazy dog&#8217;s back.</p>\n')
-        self.assertEqual(content, expected)
+        self.assertEqual(page.content, expected)
         expected = {
             'category': 'Blog',
             'author': 'Author O. Article',
@@ -302,7 +302,7 @@ class AdReaderTest(ReaderTest):
         }
 
         for key, value in expected.items():
-            self.assertEqual(value, metadata[key], key)
+            self.assertEqual(value, page.metadata[key], key)
 
     @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
     def test_article_with_asc_options(self):
@@ -319,24 +319,24 @@ class AdReaderTest(ReaderTest):
 
 class HTMLReaderTest(ReaderTest):
     def test_article_with_comments(self):
-        content, metadata = self.read_file(path='article_with_comments.html')
+        page = self.read_file(path='article_with_comments.html')
 
         self.assertEqual('''
         Body content
         <!--  This comment is included (including extra whitespace)   -->
-    ''', content)
+    ''', page.content)
 
     def test_article_with_keywords(self):
-        content, metadata = self.read_file(path='article_with_keywords.html')
+        page = self.read_file(path='article_with_keywords.html')
         expected = {
             'tags': ['foo', 'bar', 'foobar'],
         }
 
         for key, value in expected.items():
-            self.assertEqual(value, metadata[key], key)
+            self.assertEqual(value, page.metadata[key], key)
 
     def test_article_with_metadata(self):
-        content, metadata = self.read_file(path='article_with_metadata.html')
+        page = self.read_file(path='article_with_metadata.html')
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -348,21 +348,19 @@ class HTMLReaderTest(ReaderTest):
         }
 
         for key, value in expected.items():
-            self.assertEqual(value, metadata[key], key)
+            self.assertEqual(value, page.metadata[key], key)
 
     def test_article_with_null_attributes(self):
-        content, metadata = self.read_file(
-            path='article_with_null_attributes.html')
+        page = self.read_file(path='article_with_null_attributes.html')
 
         self.assertEqual('''
         Ensure that empty attributes are copied properly.
         <input name="test" disabled style="" />
-    ''', content)
+    ''', page.content)
 
     def test_article_metadata_key_lowercase(self):
         # Keys of metadata should be lowercase.
-        content, metadata = self.read_file(
-            path='article_with_uppercase_metadata.html')
-        self.assertIn('category', metadata, 'Key should be lowercase.')
-        self.assertEqual('Yeah', metadata.get('category'),
+        page = self.read_file(path='article_with_uppercase_metadata.html')
+        self.assertIn('category', page.metadata, 'Key should be lowercase.')
+        self.assertEqual('Yeah', page.metadata.get('category'),
                           'Value keeps cases.')

From f63325aa9a459b2c510bd16297a381544a1571ea Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 3 Jun 2013 15:26:23 -0400
Subject: [PATCH 1336/2864] test_generators: Replace CUR_DIR with CONTENT_DIR
 for subdir cat. detection

In situations where I've cleared ARTICLE_DIR, I've done so to ensure
that there are no directories that will override the DEFAULT_CATEGORY
due to USE_FOLDER_AS_CATEGORY.
---
 pelican/tests/test_generators.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 48aff498..f5ed6b85 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -15,6 +15,7 @@ from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import unittest, get_settings
 
 CUR_DIR = os.path.dirname(__file__)
+CONTENT_DIR = os.path.join(CUR_DIR, 'content')
 
 
 class TestArticlesGenerator(unittest.TestCase):
@@ -30,12 +31,10 @@ class TestArticlesGenerator(unittest.TestCase):
         """
         if self.generator is None:
             settings = get_settings(filenames={})
-            settings['ARTICLE_DIR'] = 'content'
             settings['DEFAULT_CATEGORY'] = 'Default'
             settings['DEFAULT_DATE'] = (1970, 1, 1)
             self.generator = ArticlesGenerator(settings.copy(), settings,
-                                CUR_DIR, settings['THEME'], None,
-                                settings['MARKUP'])
+                CONTENT_DIR, settings['THEME'], None,  settings['MARKUP'])
             self.generator.generate_context()
         return self.generator
 
@@ -118,14 +117,13 @@ class TestArticlesGenerator(unittest.TestCase):
     def test_do_not_use_folder_as_category(self):
 
         settings = DEFAULT_CONFIG.copy()
-        settings['ARTICLE_DIR'] = 'content'
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['USE_FOLDER_AS_CATEGORY'] = False
         settings['filenames'] = {}
         generator = ArticlesGenerator(
-            settings.copy(), settings, CUR_DIR, DEFAULT_CONFIG['THEME'], None,
-            DEFAULT_CONFIG['MARKUP'])
+            settings.copy(), settings, CONTENT_DIR, DEFAULT_CONFIG['THEME'],
+            None, DEFAULT_CONFIG['MARKUP'])
         generator.generate_context()
         # test for name
         # categories are grouped by slug; if two categories have the same slug
@@ -213,12 +211,12 @@ class TestPageGenerator(unittest.TestCase):
 
     def test_generate_context(self):
         settings = get_settings(filenames={})
-        settings['PAGE_DIR'] = 'TestPages'
+        settings['PAGE_DIR'] = 'TestPages'  # relative to CUR_DIR
         settings['DEFAULT_DATE'] = (1970, 1, 1)
 
-        generator = PagesGenerator(settings.copy(), settings, CUR_DIR,
-                                      settings['THEME'], None,
-                                      settings['MARKUP'])
+        generator = PagesGenerator(
+            settings.copy(), settings, CUR_DIR, settings['THEME'], None,
+            settings['MARKUP'])
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
         hidden_pages = self.distill_pages(generator.hidden_pages)

From fdde17281d36f28cf7084a21daafa77eea9fe3cb Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 4 Jan 2013 19:47:55 -0500
Subject: [PATCH 1337/2864] contents: Page fallbacks for context and
 localsiteurl

---
 pelican/contents.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 5f2e66b0..fd33bc4c 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -48,6 +48,8 @@ class Content(object):
 
         self.settings = settings
         self._content = content
+        if context is None:
+            context = {}
         self._context = context
         self.translations = []
 
@@ -220,7 +222,7 @@ class Content(object):
 
     @property
     def content(self):
-        return self.get_content(self._context['localsiteurl'])
+        return self.get_content(self._context.get('localsiteurl', ''))
 
     def _get_summary(self):
         """Returns the summary of an article.

From 29f0aa39d2239122782fa5c1a547827cf7acedb0 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 22 Mar 2013 00:13:37 -0400
Subject: [PATCH 1338/2864] content: Don't update static content

---
 pelican/contents.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/contents.py b/pelican/contents.py
index fd33bc4c..1b604f19 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -171,6 +171,9 @@ class Content(object):
         :param siteurl: siteurl which is locally generated by the writer in
                         case of RELATIVE_URLS.
         """
+        if not content:
+            return content
+
         hrefs = re.compile(r"""
             (?P<markup><\s*[^\>]*  # match tag with src and href attr
                 (?:href|src)\s*=)

From 4058cfdea44725c520dc574c033476892c235d58 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sun, 24 Mar 2013 10:19:01 -0400
Subject: [PATCH 1339/2864] settings: Add a warning for folks using
 FILES_TO_COPY.

---
 pelican/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/settings.py b/pelican/settings.py
index 13896032..35e76346 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -257,6 +257,8 @@ def configure_settings(settings):
 
     for old,new,doc in [
             ('LESS_GENERATOR', 'the Webassets plugin', None),
+            ('FILES_TO_COPY', 'STATIC_PATHS and EXTRA_PATH_METADATA',
+             'https://github.com/getpelican/pelican/pull/795'),
             ]:
         if old in settings:
             message = 'The {} setting has been removed in favor of {}'

From 38c22e83b6bfe7fdcd4f8987063cd240d5655539 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 3 Jun 2013 15:29:54 -0400
Subject: [PATCH 1340/2864] readers: Ensure the reader class is enabled before
 instantiating

Otherwise the MarkdownReader fails with:

  'bool' object is not callable

if Markdown is not installed.

Reported-by: Deniz Turgut <dturgut@gmail.com>
---
 pelican/readers.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 3e00b430..bd9f5914 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -361,15 +361,17 @@ def read_file(base_path, path, content_class=Page, fmt=None,
     if settings is None:
         settings = {}
 
-    reader = EXTENSIONS[fmt](settings)
+    reader_class = EXTENSIONS[fmt]
+    if not reader_class.enabled:
+        raise ValueError('Missing dependencies for {}'.format(fmt))
+
+    reader = reader_class(settings)
+
     settings_key = '%s_EXTENSIONS' % fmt.upper()
 
     if settings and settings_key in settings:
         reader.extensions = settings[settings_key]
 
-    if not reader.enabled:
-        raise ValueError("Missing dependencies for %s" % fmt)
-
     metadata = default_metadata(
         settings=settings, process=reader.process_metadata)
     metadata.update(path_metadata(

From 8797f0ebefee5df4edef6f9a8a98685e1cc1ee92 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 7 Jun 2013 14:56:21 -0400
Subject: [PATCH 1341/2864] docs/plugins.rst: Document signal name changes

---
 docs/plugins.rst | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 9e262962..9bf08ff3 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -104,3 +104,22 @@ request if you need them!
 
        def register():
                signals.content_object_init.connect(test, sender=contents.Article)
+
+.. note::
+
+   After Pelican 3.2, signal names were standardized.  Older plugins
+   may need to be updated to use the new names:
+
+   ==========================  ===========================
+   Old name                    New name
+   ==========================  ===========================
+   article_generate_context    article_generator_context
+   article_generate_finalized  article_generator_finalized
+   article_generate_preread    article_generator_preread
+   pages_generate_context      page_generator_context
+   pages_generate_preread      page_generator_preread
+   pages_generator_finalized   page_generator_finalized
+   pages_generator_init        page_generator_init
+   static_generate_context     static_generator_context
+   static_generate_preread     static_generator_preread
+   ==========================  ===========================

From ce0a9b697e08fee069cda6c12a8b9921c183830c Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 18 Jan 2013 19:00:45 -0500
Subject: [PATCH 1342/2864] Document path metadata extraction

---
 docs/getting_started.rst |  2 ++
 docs/settings.rst        | 49 ++++++++++++++++++++++++++++++++++++++++
 pelican/settings.py      |  2 +-
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index b41f8c18..b2e0aeda 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -213,6 +213,8 @@ The idea behind "pages" is that they are usually not temporal in nature and are
 used for content that does not change very often (e.g., "About" or "Contact"
 pages).
 
+.. _internal_metadata:
+
 File metadata
 -------------
 
diff --git a/docs/settings.rst b/docs/settings.rst
index c7d7f199..ffcddc7a 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -62,9 +62,12 @@ Setting name (default value)                                            What doe
                                                                         For example, if you would like to extract both the
                                                                         date and the slug, you could set something like:
                                                                         ``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
+                                                                        See :ref:`path_metadata`.
 `PATH_METADATA` (``''``)                                                Like ``FILENAME_METADATA``, but parsed from a page's
                                                                         full path relative to the content source directory.
+                                                                        See :ref:`path_metadata`.
 `EXTRA_PATH_METADATA` (``{}``)                                          Extra metadata dictionaries keyed by relative path.
+                                                                        See :ref:`path_metadata`.
 `DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the output directory, and **all** of its contents, before
                                                                         generating new files. This can be useful in preventing older,
                                                                         unnecessary files from persisting in your output. However, **this is
@@ -335,6 +338,52 @@ your resume, and a contact page — you could have::
                       'src/resume.html': 'dest/resume.html',
                       'src/contact.html': 'dest/contact.html'}
 
+
+.. _path_metadata:
+
+Path metadata
+=============
+
+Not all metadata needs to be `embedded in source file itself`__.  For
+example, blog posts are often named following a ``YYYY-MM-DD-SLUG.rst``
+pattern, or nested into ``YYYY/MM/DD-SLUG`` directories.  To extract
+metadata from the filename or path, set ``FILENAME_METADATA`` or
+``PATH_METADATA`` to regular expressions that use Python's `group name
+notation`_ ``(?P<name>…)``.  If you want to attach additional metadata
+but don't want to encode it in the path, you can set
+``EXTRA_PATH_METADATA``:
+
+.. parsed-literal::
+
+    EXTRA_PATH_METADATA = {
+        'relative/path/to/file-1': {
+            'key-1a': 'value-1a',
+            'key-1b': 'value-1b',
+            },
+        'relative/path/to/file-2': {
+            'key-2': 'value-2',
+            },
+        }
+
+This can be a convenient way to shift the installed location of a
+particular file:
+
+.. parsed-literal::
+
+    # Take advantage of the following defaults
+    # STATIC_SAVE_AS = '{path}'
+    # STATIC_URL = '{path}'
+    STATIC_PATHS = [
+        'extra/robots.txt',
+        ]
+    EXTRA_PATH_METADATA = {
+        'extra/robots.txt': {'path': 'robots.txt'},
+        }
+
+__ internal_metadata__
+.. _group name notation:
+   http://docs.python.org/3/library/re.html#regular-expression-syntax
+
 Feed settings
 =============
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 35e76346..df3ad6b6 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -258,7 +258,7 @@ def configure_settings(settings):
     for old,new,doc in [
             ('LESS_GENERATOR', 'the Webassets plugin', None),
             ('FILES_TO_COPY', 'STATIC_PATHS and EXTRA_PATH_METADATA',
-             'https://github.com/getpelican/pelican/pull/795'),
+             'https://github.com/getpelican/pelican/blob/master/docs/settings.rst#path-metadata'),
             ]:
         if old in settings:
             message = 'The {} setting has been removed in favor of {}'

From 9b42b2a13082e325fabf3f8e4b3f86b3b775bfe7 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Wed, 12 Jun 2013 16:07:24 -0400
Subject: [PATCH 1343/2864] generators: get_files() should use paths relative
 to Generator.path

All paths should be relative to Generator.path unless we're actively
accessing the filesystem.  This makes the argument less ambiguous, so
we have less likelyhood of joining paths multiple times.
---
 pelican/generators.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index c48f8067..a01281dc 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -102,23 +102,25 @@ class Generator(object):
     def get_files(self, path, exclude=[], extensions=None):
         """Return a list of files to use, based on rules
 
-        :param path: the path to search the file on
+        :param path: the path to search (relative to self.path)
         :param exclude: the list of path to exclude
         :param extensions: the list of allowed extensions (if False, all
             extensions are allowed)
         """
         files = []
+        root = os.path.join(self.path, path)
 
-        if os.path.isdir(path):
-            for root, dirs, temp_files in os.walk(path, followlinks=True):
+        if os.path.isdir(root):
+            for dirpath, dirs, temp_files in os.walk(root, followlinks=True):
                 for e in exclude:
                     if e in dirs:
                         dirs.remove(e)
+                reldir = os.path.relpath(dirpath, self.path)
                 for f in temp_files:
-                    fp = os.path.join(root, f)
+                    fp = os.path.join(reldir, f)
                     if self._include_path(fp, extensions):
                         files.append(fp)
-        elif os.path.exists(path) and self._include_path(path, extensions):
+        elif os.path.exists(root) and self._include_path(path, extensions):
             files.append(path)  # can't walk non-directories
         return files
 
@@ -372,12 +374,9 @@ class ArticlesGenerator(Generator):
     def generate_context(self):
         """Add the articles into the shared context"""
 
-        article_path = os.path.normpath(  # we have to remove trailing slashes
-            os.path.join(self.path, self.settings['ARTICLE_DIR'])
-        )
         all_articles = []
         for f in self.get_files(
-                article_path,
+                self.settings['ARTICLE_DIR'],
                 exclude=self.settings['ARTICLE_EXCLUDES']):
             try:
                 article = read_file(
@@ -485,7 +484,7 @@ class PagesGenerator(Generator):
         all_pages = []
         hidden_pages = []
         for f in self.get_files(
-                os.path.join(self.path, self.settings['PAGE_DIR']),
+                self.settings['PAGE_DIR'],
                 exclude=self.settings['PAGE_EXCLUDES']):
             try:
                 page = read_file(
@@ -547,7 +546,7 @@ class StaticGenerator(Generator):
         # walk static paths
         for static_path in self.settings['STATIC_PATHS']:
             for f in self.get_files(
-                    os.path.join(self.path, static_path), extensions=False):
+                    static_path, extensions=False):
                 static = read_file(
                     base_path=self.path, path=f, content_class=Static,
                     fmt='static',

From 180cf9165fd0f35d57c51b4cc4111f1a5a92858c Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 13 Jun 2013 21:12:43 -0400
Subject: [PATCH 1344/2864] settings: Fix deprecation warning in
 configure_settings()

The broken code came from my 1d4d86c (settings: Rework the
LESS_GENERATOR removal warning for easy extension, 2013-03-24), where
I put formatting placeholders ({}) into the warning message, but
forgot to fill them in :/.
---
 pelican/settings.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index df3ad6b6..c6cc6c3c 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -261,9 +261,10 @@ def configure_settings(settings):
              'https://github.com/getpelican/pelican/blob/master/docs/settings.rst#path-metadata'),
             ]:
         if old in settings:
-            message = 'The {} setting has been removed in favor of {}'
+            message = 'The {} setting has been removed in favor of {}'.format(
+                old, new)
             if doc:
-                message += ', see {} for details'
+                message += ', see {} for details'.format(doc)
             logger.warning(message)
 
     return settings

From dfb29b53880ecd8c5f6ee99c09040d84fa17c57b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 15 Jun 2013 12:24:48 -0700
Subject: [PATCH 1345/2864] Update changelog

---
 docs/changelog.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index fcec0b53..0804c8b0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,17 @@ Release history
 3.3 (XXXX-XX-XX)
 ================
 
+* Rename signals for better consistency (some plugins may need to be updated)
+* Move metadata extraction from generators to readers; metadata extraction no
+  longer article-specific
+* Deprecate ``FILES_TO_COPY`` in favor of ``STATIC_PATHS`` and
+  ``EXTRA_PATH_METADATA``
+
+3.2.1 and 3.2.2
+===============
+
+* Facilitate inclusion in FreeBSD Ports Collection
+
 3.2 (2013-04-24)
 ================
 

From 0dee76f2598336a70d3c4535fd49217566971a44 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sat, 5 Jan 2013 08:42:50 -0500
Subject: [PATCH 1346/2864] samples: Remove EXTRA_PATH_METADATA entries for
 pictures

I'd added them earlier to test that a configuration edit could
preserve the original output locations.  However, it is likely that
you have quite a number of static files, and we shouldn't recommend
listing explicit paths for all of them.  With this configuration
change, the pictures will be copied into the output directory using
their original relative path (e.g. `pictures/Fat_Cat.jpg` without the
`static`).  Any |filename|-style links will be updated automatically.

If you *want* the pictures to end up in a `static` directory, it's
easier to just organize your source that way.
---
 .../output/custom/author/alexis-metaireau2.html     |   2 +-
 pelican/tests/output/custom/category/bar.html       |   2 +-
 pelican/tests/output/custom/category/yeah.html      |   4 ++--
 pelican/tests/output/custom/feeds/all-en.atom.xml   |   6 +++---
 pelican/tests/output/custom/feeds/all.atom.xml      |   6 +++---
 pelican/tests/output/custom/feeds/all.rss.xml       |   6 +++---
 pelican/tests/output/custom/feeds/bar.atom.xml      |   2 +-
 pelican/tests/output/custom/feeds/bar.rss.xml       |   2 +-
 pelican/tests/output/custom/feeds/yeah.atom.xml     |   4 ++--
 pelican/tests/output/custom/feeds/yeah.rss.xml      |   4 ++--
 pelican/tests/output/custom/index2.html             |   2 +-
 pelican/tests/output/custom/oh-yeah.html            |   2 +-
 .../output/custom/pages/this-is-a-test-page.html    |   2 +-
 .../output/custom/{static => }/pictures/Fat_Cat.jpg | Bin
 .../output/custom/{static => }/pictures/Sushi.jpg   | Bin
 .../custom/{static => }/pictures/Sushi_Macro.jpg    | Bin
 pelican/tests/output/custom/robots.txt              |   2 +-
 pelican/tests/output/custom/tag/bar.html            |   2 +-
 pelican/tests/output/custom/tag/foobar.html         |   4 ++--
 pelican/tests/output/custom/tag/oh.html             |   2 +-
 pelican/tests/output/custom/tag/yeah.html           |   2 +-
 .../output/custom/this-is-a-super-article.html      |   4 ++--
 samples/content/extra/robots.txt                    |   2 +-
 samples/pelican.conf.py                             |   3 ---
 24 files changed, 31 insertions(+), 34 deletions(-)
 rename pelican/tests/output/custom/{static => }/pictures/Fat_Cat.jpg (100%)
 rename pelican/tests/output/custom/{static => }/pictures/Sushi.jpg (100%)
 rename pelican/tests/output/custom/{static => }/pictures/Sushi_Macro.jpg (100%)

diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 23346f5b..9f4a31e8 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -81,7 +81,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 2c1fc646..f7f1bbf3 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -49,7 +49,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 6894e3ee..f7cc8d12 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -47,8 +47,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 5c8f9241..49d45cde 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -10,8 +10,8 @@
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
@@ -22,7 +22,7 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index ae5fe30c..3187c2aa 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -12,8 +12,8 @@
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
@@ -24,7 +24,7 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 89176ac0..8d07bec7 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -12,8 +12,8 @@
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
@@ -24,7 +24,7 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index 9945f938..99b7cc45 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -3,6 +3,6 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index 148411be..94bd93f2 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -3,6 +3,6 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index d2307359..1a152174 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -3,8 +3,8 @@
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index b252c26a..85f93686 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -3,8 +3,8 @@
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 8ed54b6e..b8e2ac1a 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -132,7 +132,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="./static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="./oh-yeah.html">read more</a>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index f9f1f1fb..2f6ca309 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -52,7 +52,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="./static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
     </div><!-- /.entry-content -->
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 571211d9..b4cb678c 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -32,7 +32,7 @@
     <h1 class="entry-title">This is a test page</h1>
         
         <p>Just an image.</p>
-<img alt="alternate text" src="../static/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
diff --git a/pelican/tests/output/custom/static/pictures/Fat_Cat.jpg b/pelican/tests/output/custom/pictures/Fat_Cat.jpg
similarity index 100%
rename from pelican/tests/output/custom/static/pictures/Fat_Cat.jpg
rename to pelican/tests/output/custom/pictures/Fat_Cat.jpg
diff --git a/pelican/tests/output/custom/static/pictures/Sushi.jpg b/pelican/tests/output/custom/pictures/Sushi.jpg
similarity index 100%
rename from pelican/tests/output/custom/static/pictures/Sushi.jpg
rename to pelican/tests/output/custom/pictures/Sushi.jpg
diff --git a/pelican/tests/output/custom/static/pictures/Sushi_Macro.jpg b/pelican/tests/output/custom/pictures/Sushi_Macro.jpg
similarity index 100%
rename from pelican/tests/output/custom/static/pictures/Sushi_Macro.jpg
rename to pelican/tests/output/custom/pictures/Sushi_Macro.jpg
diff --git a/pelican/tests/output/custom/robots.txt b/pelican/tests/output/custom/robots.txt
index ae5b0d05..19a6e299 100644
--- a/pelican/tests/output/custom/robots.txt
+++ b/pelican/tests/output/custom/robots.txt
@@ -1,2 +1,2 @@
 User-agent: *
-Disallow: /static/pictures
+Disallow: /pictures
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 2fed02c2..d1805e50 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -104,7 +104,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 71c2d430..2c50c8ae 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -47,8 +47,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="../static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 361b1fd2..b798964e 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -49,7 +49,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 9bbd214b..54ad93c6 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -49,7 +49,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="../static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
                                     <p class="paginator">
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 000bd555..1fdd8897 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -50,8 +50,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="./static/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="./static/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="./pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/samples/content/extra/robots.txt b/samples/content/extra/robots.txt
index ae5b0d05..19a6e299 100644
--- a/samples/content/extra/robots.txt
+++ b/samples/content/extra/robots.txt
@@ -1,2 +1,2 @@
 User-agent: *
-Disallow: /static/pictures
+Disallow: /pictures
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index ad2042fd..4d5cd06d 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -37,9 +37,6 @@ DEFAULT_METADATA = (('yeah', 'it is'),)
 # path-specific metadata
 EXTRA_PATH_METADATA = {
     'extra/robots.txt': {'path': 'robots.txt'},
-    'pictures/Fat_Cat.jpg': {'path': 'static/pictures/Fat_Cat.jpg'},
-    'pictures/Sushi.jpg': {'path': 'static/pictures/Sushi.jpg'},
-    'pictures/Sushi_Macro.jpg': {'path': 'static/pictures/Sushi_Macro.jpg'},
     }
 
 # static paths will be copied without parsing their contents

From 8f295f7a037e0d512181946b9b87636f4a853e26 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Jun 2013 08:53:45 -0700
Subject: [PATCH 1347/2864] PyPI now has CDN; Travis shouldn't use mirrors

Now that PyPI utilizes a CDN, the "--use-mirrors" setting slows down the
install process and has essentially been deprecated.
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ff512b6..918fd3f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_install:
  - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
-    - pip install mock --use-mirrors
-    - pip install . --use-mirrors
-    - pip install --use-mirrors Markdown
+    - pip install mock
+    - pip install .
+    - pip install Markdown
 script: python -m unittest discover

From 0d1866b393e79a76ab2b416eb22ac6a924b3849b Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sat, 5 Jan 2013 11:39:06 -0500
Subject: [PATCH 1348/2864] Pelican.run: Use keyword arguments when
 initializing generators

This makes it easier to add new arguments to Generator subclasses.
---
 pelican/__init__.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 7f406c4f..78a16e27 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -157,12 +157,12 @@ class Pelican(object):
         context['localsiteurl'] = self.settings['SITEURL']  # share
         generators = [
             cls(
-                context,
-                self.settings,
-                self.path,
-                self.theme,
-                self.output_path,
-                self.markup,
+                context=context,
+                settings=self.settings,
+                path=self.path,
+                theme=self.theme,
+                output_path=self.output_path,
+                markup=self.markup,
             ) for cls in self.get_generator_classes()
         ]
 

From 6e527e7416cc51b07c4a83b41f050bcf12618fdc Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sat, 5 Jan 2013 14:23:02 -0500
Subject: [PATCH 1349/2864] test_generators: Use keyword arguments to
 initialize Generators

---
 pelican/tests/test_generators.py | 54 +++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index f5ed6b85..54f4a232 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -33,8 +33,10 @@ class TestArticlesGenerator(unittest.TestCase):
             settings = get_settings(filenames={})
             settings['DEFAULT_CATEGORY'] = 'Default'
             settings['DEFAULT_DATE'] = (1970, 1, 1)
-            self.generator = ArticlesGenerator(settings.copy(), settings,
-                CONTENT_DIR, settings['THEME'], None,  settings['MARKUP'])
+            self.generator = ArticlesGenerator(
+                context=settings.copy(), settings=settings,
+                path=CONTENT_DIR, theme=settings['THEME'],
+                output_path=None, markup=settings['MARKUP'])
             self.generator.generate_context()
         return self.generator
 
@@ -52,16 +54,19 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_feeds(self):
         settings = get_settings()
-        generator = ArticlesGenerator(settings, settings, None,
-                settings['THEME'], None, settings['MARKUP'])
+        generator = ArticlesGenerator(
+            context=settings, settings=settings,
+            path=None, theme=settings['THEME'],
+            output_path=None, markup=settings['MARKUP'])
         writer = MagicMock()
         generator.generate_feeds(writer)
         writer.write_feed.assert_called_with([], settings,
                                              'feeds/all.atom.xml')
 
         generator = ArticlesGenerator(
-            settings, get_settings(FEED_ALL_ATOM=None), None,
-            settings['THEME'], None, None)
+            context=settings, settings=get_settings(FEED_ALL_ATOM=None),
+            path=None, theme=settings['THEME'],
+            output_path=None, markup=None)
         writer = MagicMock()
         generator.generate_feeds(writer)
         self.assertFalse(writer.write_feed.called)
@@ -122,8 +127,9 @@ class TestArticlesGenerator(unittest.TestCase):
         settings['USE_FOLDER_AS_CATEGORY'] = False
         settings['filenames'] = {}
         generator = ArticlesGenerator(
-            settings.copy(), settings, CONTENT_DIR, DEFAULT_CONFIG['THEME'],
-            None, DEFAULT_CONFIG['MARKUP'])
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=DEFAULT_CONFIG['THEME'],
+            output_path=None, markup=DEFAULT_CONFIG['MARKUP'])
         generator.generate_context()
         # test for name
         # categories are grouped by slug; if two categories have the same slug
@@ -143,9 +149,10 @@ class TestArticlesGenerator(unittest.TestCase):
     def test_direct_templates_save_as_default(self):
 
         settings = get_settings(filenames={})
-        generator = ArticlesGenerator(settings, settings, None,
-                                      settings['THEME'], None,
-                                      settings['MARKUP'])
+        generator = ArticlesGenerator(
+            context=settings, settings=settings,
+            path=None, theme=settings['THEME'],
+            output_path=None, markup=settings['MARKUP'])
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_with("archives.html",
@@ -157,9 +164,10 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings()
         settings['DIRECT_TEMPLATES'] = ['archives']
         settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
-        generator = ArticlesGenerator(settings, settings, None,
-                                      settings['THEME'], None,
-                                      settings['MARKUP'])
+        generator = ArticlesGenerator(
+            context=settings, settings=settings,
+            path=None, theme=settings['THEME'],
+            output_path=None, markup=settings['MARKUP'])
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_with("archives/index.html",
@@ -171,9 +179,10 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings()
         settings['DIRECT_TEMPLATES'] = ['archives']
         settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
-        generator = ArticlesGenerator(settings, settings, None,
-                                      settings['THEME'], None,
-                                      settings['MARKUP'])
+        generator = ArticlesGenerator(
+            context=settings, settings=settings,
+            path=None, theme=settings['THEME'],
+            output_path=None, markup=settings['MARKUP'])
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_count == 0
@@ -215,8 +224,9 @@ class TestPageGenerator(unittest.TestCase):
         settings['DEFAULT_DATE'] = (1970, 1, 1)
 
         generator = PagesGenerator(
-            settings.copy(), settings, CUR_DIR, settings['THEME'], None,
-            settings['MARKUP'])
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'],
+            output_path=None, markup=settings['MARKUP'])
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
         hidden_pages = self.distill_pages(generator.hidden_pages)
@@ -258,8 +268,10 @@ class TestTemplatePagesGenerator(unittest.TestCase):
                 'template/source.html': 'generated/file.html'
                 }
 
-        generator = TemplatePagesGenerator({'foo': 'bar'}, settings,
-                self.temp_content, '', self.temp_output, None)
+        generator = TemplatePagesGenerator(
+            context={'foo': 'bar'}, settings=settings,
+            path=self.temp_content, theme='',
+            output_path=self.temp_output, markup=None)
 
         # create a dummy template file
         template_dir = os.path.join(self.temp_content, 'template')

From 12dd35ef360e30f7fb5cc107069cacbe5c43595b Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sat, 5 Jan 2013 11:41:33 -0500
Subject: [PATCH 1350/2864] generators: Remove wonky argument handling from
 Generator.__init__

---
 pelican/generators.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index a01281dc..3ebcb648 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -31,10 +31,14 @@ logger = logging.getLogger(__name__)
 class Generator(object):
     """Baseclass generator"""
 
-    def __init__(self, *args, **kwargs):
-        for idx, item in enumerate(('context', 'settings', 'path', 'theme',
-                'output_path', 'markup')):
-            setattr(self, item, args[idx])
+    def __init__(self, context, settings, path, theme, output_path, markup,
+                 **kwargs):
+        self.context = context
+        self.settings = settings
+        self.path = path
+        self.theme = theme
+        self.output_path = output_path
+        self.markup = markup
 
         for arg, value in kwargs.items():
             setattr(self, arg, value)

From 39dd4a025581cfa3b4d6256a3b8f327b26372e1d Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Fri, 14 Jun 2013 12:12:19 -0700
Subject: [PATCH 1351/2864] Changed meta tag "contents" attribute to "content",
 to conform to HTML spec. Fixes #918

---
 docs/getting_started.rst                          | 10 +++++-----
 pelican/readers.py                                | 15 ++++++++++++---
 pelican/tests/content/article_with_keywords.html  |  2 +-
 pelican/tests/content/article_with_metadata.html  | 12 ++++++------
 .../article_with_metadata_and_contents.html       | 15 +++++++++++++++
 .../content/article_with_uppercase_metadata.html  |  2 +-
 pelican/tests/test_readers.py                     | 15 +++++++++++++++
 7 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 pelican/tests/content/article_with_metadata_and_contents.html

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 383acdc4..1e31f26d 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -265,11 +265,11 @@ interprets the HTML in a very straightforward manner, reading metadata from
     <html>
         <head>
             <title>My super title</title>
-            <meta name="tags" contents="thats, awesome" />
-            <meta name="date" contents="2012-07-09 22:28" />
-            <meta name="category" contents="yeah" />
-            <meta name="author" contents="Alexis Métaireau" />
-            <meta name="summary" contents="Short version for index and feeds" />
+            <meta name="tags" content="thats, awesome" />
+            <meta name="date" content="2012-07-09 22:28" />
+            <meta name="category" content="yeah" />
+            <meta name="author" content="Alexis Métaireau" />
+            <meta name="summary" content="Short version for index and feeds" />
         </head>
         <body>
             This is the content of my super blog post.
diff --git a/pelican/readers.py b/pelican/readers.py
index bd9f5914..fb2ccfc4 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -5,6 +5,7 @@ import datetime
 import logging
 import os
 import re
+import logging
 try:
     import docutils
     import docutils.core
@@ -47,6 +48,8 @@ METADATA_PROCESSORS = {
     'author': Author,
 }
 
+logger = logging.getLogger(__name__)
+
 
 class Reader(object):
     enabled = True
@@ -199,7 +202,7 @@ class HTMLReader(Reader):
     enabled = True
 
     class _HTMLParser(HTMLParser):
-        def __init__(self, settings):
+        def __init__(self, settings, filename):
             HTMLParser.__init__(self)
             self.body = ''
             self.metadata = {}
@@ -207,6 +210,8 @@ class HTMLReader(Reader):
 
             self._data_buffer = ''
 
+            self._filename = filename
+
             self._in_top_level = True
             self._in_head = False
             self._in_title = False
@@ -275,7 +280,11 @@ class HTMLReader(Reader):
 
         def _handle_meta_tag(self, attrs):
             name = self._attr_value(attrs, 'name').lower()
-            contents = self._attr_value(attrs, 'contents', '')
+            contents = self._attr_value(attrs, 'content', '')
+            if not contents:
+                contents = self._attr_value(attrs, 'contents', '')
+                if contents:
+                    logger.warning("Meta tag attribute 'contents' used in file %s, should be changed to 'content'", self._filename)
 
             if name == 'keywords':
                 name = 'tags'
@@ -288,7 +297,7 @@ class HTMLReader(Reader):
     def read(self, filename):
         """Parse content and metadata of HTML files"""
         with pelican_open(filename) as content:
-            parser = self._HTMLParser(self.settings)
+            parser = self._HTMLParser(self.settings, filename)
             parser.feed(content)
             parser.close()
 
diff --git a/pelican/tests/content/article_with_keywords.html b/pelican/tests/content/article_with_keywords.html
index c869f514..0744c754 100644
--- a/pelican/tests/content/article_with_keywords.html
+++ b/pelican/tests/content/article_with_keywords.html
@@ -1,6 +1,6 @@
 <html>
     <head>
         <title>This is a super article !</title>
-        <meta name="keywords" contents="foo, bar, foobar" />
+        <meta name="keywords" content="foo, bar, foobar" />
     </head>
 </html>
diff --git a/pelican/tests/content/article_with_metadata.html b/pelican/tests/content/article_with_metadata.html
index b108ac8a..b501ea29 100644
--- a/pelican/tests/content/article_with_metadata.html
+++ b/pelican/tests/content/article_with_metadata.html
@@ -1,12 +1,12 @@
 <html>
     <head>
         <title>This is a super article !</title>
-        <meta name="tags" contents="foo, bar, foobar" />
-        <meta name="date" contents="2010-12-02 10:14" />
-        <meta name="category" contents="yeah" />
-        <meta name="author" contents="Alexis Métaireau" />
-        <meta name="summary" contents="Summary and stuff" />
-        <meta name="custom_field" contents="http://notmyidea.org" />
+        <meta name="tags" content="foo, bar, foobar" />
+        <meta name="date" content="2010-12-02 10:14" />
+        <meta name="category" content="yeah" />
+        <meta name="author" content="Alexis Métaireau" />
+        <meta name="summary" content="Summary and stuff" />
+        <meta name="custom_field" content="http://notmyidea.org" />
     </head>
     <body>
         Multi-line metadata should be supported
diff --git a/pelican/tests/content/article_with_metadata_and_contents.html b/pelican/tests/content/article_with_metadata_and_contents.html
new file mode 100644
index 00000000..b108ac8a
--- /dev/null
+++ b/pelican/tests/content/article_with_metadata_and_contents.html
@@ -0,0 +1,15 @@
+<html>
+    <head>
+        <title>This is a super article !</title>
+        <meta name="tags" contents="foo, bar, foobar" />
+        <meta name="date" contents="2010-12-02 10:14" />
+        <meta name="category" contents="yeah" />
+        <meta name="author" contents="Alexis Métaireau" />
+        <meta name="summary" contents="Summary and stuff" />
+        <meta name="custom_field" contents="http://notmyidea.org" />
+    </head>
+    <body>
+        Multi-line metadata should be supported
+        as well as <strong>inline markup</strong>.
+    </body>
+</html>
diff --git a/pelican/tests/content/article_with_uppercase_metadata.html b/pelican/tests/content/article_with_uppercase_metadata.html
index 4fe5a9ee..b4cedf39 100644
--- a/pelican/tests/content/article_with_uppercase_metadata.html
+++ b/pelican/tests/content/article_with_uppercase_metadata.html
@@ -1,6 +1,6 @@
 <html>
     <head>
         <title>This is a super article !</title>
-        <meta name="Category" contents="Yeah" />
+        <meta name="Category" content="Yeah" />
     </head>
 </html>
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 14d42325..c67b8a1f 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -350,6 +350,21 @@ class HTMLReaderTest(ReaderTest):
         for key, value in expected.items():
             self.assertEqual(value, page.metadata[key], key)
 
+    def test_article_with_metadata_and_contents_attrib(self):
+        page = self.read_file(path='article_with_metadata_and_contents.html')
+        expected = {
+            'category': 'yeah',
+            'author': 'Alexis Métaireau',
+            'title': 'This is a super article !',
+            'summary': 'Summary and stuff',
+            'date': datetime.datetime(2010, 12, 2, 10, 14),
+            'tags': ['foo', 'bar', 'foobar'],
+            'custom_field': 'http://notmyidea.org',
+        }
+        for key, value in expected.items():
+            self.assertEqual(value, page.metadata[key], key)
+
+
     def test_article_with_null_attributes(self):
         page = self.read_file(path='article_with_null_attributes.html')
 

From d8c9fb31d0d1a0f5f3f5319dbabbf50e36fd255b Mon Sep 17 00:00:00 2001
From: Danilo Bargen <gezuru@gmail.com>
Date: Thu, 20 Jun 2013 00:13:57 +0200
Subject: [PATCH 1352/2864] Better duck typing in isinstance check

---
 pelican/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 78a16e27..1739aae3 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,6 +9,7 @@ import time
 import logging
 import argparse
 import locale
+import collections
 
 from pelican import signals
 
@@ -205,7 +206,7 @@ class Pelican(object):
         for pair in signals.get_generators.send(self):
             (funct, value) = pair
 
-            if not isinstance(value, (tuple, list)):
+            if not isinstance(value, collections.Iterable):
                 value = (value, )
 
             for v in value:

From dd9f55c8bb0979d230c42cd28bb8b6fbe6d41d98 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 22 Jun 2013 12:28:37 -0700
Subject: [PATCH 1353/2864] Clean up minor text formatting, spelling, grammar

---
 pelican/utils.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 9ba234a5..fea7b953 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -67,11 +67,11 @@ def strftime(date, date_format):
 
 class DateFormatter(object):
     '''A date formatter object used as a jinja filter
-    
-    Uses the `strftime` implementation and makes sure jinja uses the locale 
+
+    Uses the `strftime` implementation and makes sure jinja uses the locale
     defined in LOCALE setting
     '''
-    
+
     def __init__(self):
         self.locale = locale.setlocale(locale.LC_TIME)
 
@@ -216,7 +216,7 @@ def get_date(string):
 
 
 class pelican_open(object):
-    """Open a file and return it's content"""
+    """Open a file and return its content"""
     def __init__(self, filename):
         self.filename = filename
 
@@ -236,7 +236,7 @@ def slugify(value):
     Normalizes string, converts to lowercase, removes non-alpha characters,
     and converts spaces to hyphens.
 
-    Took from django sources.
+    Took from Django sources.
     """
     # TODO Maybe steal again from current Django 1.5dev
     value = Markup(value).striptags()

From e9fec3b1dc32cf9df20fc9774a63065bc14ddad8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 24 Jun 2013 13:05:00 -0700
Subject: [PATCH 1354/2864] Remove "clean" task from "make html"; fixes #637

This change removes the "clean" task from the "html" and "regenerate"
tasks in the default Makefile generated by pelican-quickstart. The
previous behavior ignored whether the DELETE_OUTPUT_DIRECTORY
setting was set to True or not and deleted everything in the output
directory every time the "make html" or "make regenerate" task was run.
In addition to violating the Principle of Least Astonishment, there was
also the potential for data loss if the user wasn't careful when
defining the output directory location in the Makefile.

The new behavior therefore relies primarily on the
DELETE_OUTPUT_DIRECTORY setting to control if and when the output
directory is cleaned. The default settings and Makefile generated by the
pelican-quickstart command, for example, no longer clean the output
directory when the "make html" task is run. If the user wants to change
this behavior and have the output directory cleaned on every "make html"
run, the recommended method would be to set DELETE_OUTPUT_DIRECTORY to
True in pelicanconf.py. Alternatively, the user can manually run "make
clean", with the caveat that the output directory and its contents will
be entirely destroyed, including any otherwise to-be-retained files or
folders specified in the OUTPUT_RETENTION setting. It is for that reason
that relying on the DELETE_OUTPUT_DIRECTORY setting is instead
recommended.

As before, DELETE_OUTPUT_DIRECTORY is set to True in the publishconf.py
settings file generated by the pelican-quickstart script. This way, any
potentially old and irrelevant files will be automatically removed
before the latest version of the site is transferred to the production
server environment.

In summary, this change allows for the sanest possible default settings,
while still allowing end users to customize output cleaning to their
preferred behavior with a minimum of confusion.
---
 pelican/tools/templates/Makefile.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 221568aa..8890db6f 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -40,15 +40,13 @@ help:
 	@echo '                                                                       '
 
 
-html: clean $$(OUTPUTDIR)/index.html
-
-$$(OUTPUTDIR)/%.html:
+html:
 	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 clean:
 	[ ! -d $$(OUTPUTDIR) ] || find $$(OUTPUTDIR) -mindepth 1 -delete
 
-regenerate: clean
+regenerate:
 	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 serve:

From bf0a50880d35f803ec5c929bfe60b026accf9307 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 24 Jun 2013 13:40:32 -0700
Subject: [PATCH 1355/2864] Revert "make clean" behavior to rm -rf. Fixes #773

The change to the "make clean" task in 764a2cf from "rm -rf" to instead
relying on GNU "find" appears to have broken cross-platform portability,
likely causing problems on *BSD and other platforms. This commit reverts
that change back to the previous "rm -rf" behavior.
---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 8890db6f..4bc764ca 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -44,7 +44,7 @@ html:
 	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 clean:
-	[ ! -d $$(OUTPUTDIR) ] || find $$(OUTPUTDIR) -mindepth 1 -delete
+	[ ! -d $$(OUTPUTDIR) ] || rm -rf $$(OUTPUTDIR)
 
 regenerate:
 	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)

From 6f36b0a2460a41eabb1edd0bd70318c52ddadd47 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 23 Jun 2013 11:44:53 -0700
Subject: [PATCH 1356/2864] Keep certain files when cleaning output; fix #574

If DELETE_OUTPUT_DIRECTORY is set to True, all files and directories are
deleted from the output directory. There are, however, several reasons
one might want to retain certain files/directories and avoid their
deletion from the output directory. One such use case is version control
system data: a versioned output directory can facilitate deployment via
Heroku and/or allow the user to easily revert to a prior version of the
site without having to rely on regeneration via Pelican.

This change introduces the OUTPUT_RETENTION setting, a tuple of
filenames that will be preserved when the clean_output_dir function in
pelican.utils is run. Setting OUTPUT_RETENTION = (".hg", ".git") would,
for example, prevent the relevant VCS data from being deleted when the
output directory is cleaned.
---
 docs/settings.rst           |  3 +++
 pelican/__init__.py         |  3 ++-
 pelican/settings.py         |  1 +
 pelican/tests/test_utils.py |  9 ++++++---
 pelican/utils.py            | 11 +++++++----
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index ffcddc7a..97662cce 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -72,6 +72,9 @@ Setting name (default value)                                            What doe
                                                                         generating new files. This can be useful in preventing older,
                                                                         unnecessary files from persisting in your output. However, **this is
                                                                         a destructive setting and should be handled with extreme care.**
+`OUTPUT_RETENTION` (``()``)                                             A tuple of filenames that should be retained and not deleted from the
+                                                                        output directory. One use case would be the preservation of version
+                                                                        control data. For example: ``(".hg", ".git", ".bzr")``
 `JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
 `JINJA_FILTERS` (``{}``)                                                A list of custom Jinja2 filters you want to use.
                                                                         The dictionary should map the filtername to the filter function.
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 1739aae3..53216421 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -49,6 +49,7 @@ class Pelican(object):
         self.markup = settings['MARKUP']
         self.ignore_files = settings['IGNORE_FILES']
         self.delete_outputdir = settings['DELETE_OUTPUT_DIRECTORY']
+        self.output_retention = settings['OUTPUT_RETENTION']
 
         self.init_path()
         self.init_plugins()
@@ -175,7 +176,7 @@ class Pelican(object):
         # explicitely asked
         if (self.delete_outputdir and not
                 os.path.realpath(self.path).startswith(self.output_path)):
-            clean_output_dir(self.output_path)
+            clean_output_dir(self.output_path, self.output_retention)
 
         writer = self.get_writer()
 
diff --git a/pelican/settings.py b/pelican/settings.py
index c6cc6c3c..1c9b48c3 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -54,6 +54,7 @@ DEFAULT_CONFIG = {
     'NEWEST_FIRST_ARCHIVES': True,
     'REVERSE_CATEGORY_ORDER': False,
     'DELETE_OUTPUT_DIRECTORY': False,
+    'OUTPUT_RETENTION': (),
     'ARTICLE_URL': '{slug}.html',
     'ARTICLE_SAVE_AS': '{slug}.html',
     'ARTICLE_LANG_URL': '{slug}-{lang}.html',
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 0713e5ed..ab35d991 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -193,28 +193,31 @@ class TestUtils(LoggedTestCase):
             shutil.rmtree(empty_path, True)
 
     def test_clean_output_dir(self):
+        retention = ()
         test_directory = os.path.join(os.path.dirname(__file__),
                                       'clean_output')
         content = os.path.join(os.path.dirname(__file__), 'content')
         shutil.copytree(content, test_directory)
-        utils.clean_output_dir(test_directory)
+        utils.clean_output_dir(test_directory, retention)
         self.assertTrue(os.path.isdir(test_directory))
         self.assertListEqual([], os.listdir(test_directory))
         shutil.rmtree(test_directory)
 
     def test_clean_output_dir_not_there(self):
+        retention = ()
         test_directory = os.path.join(os.path.dirname(__file__),
                                       'does_not_exist')
-        utils.clean_output_dir(test_directory)
+        utils.clean_output_dir(test_directory, retention)
         self.assertFalse(os.path.exists(test_directory))
 
     def test_clean_output_dir_is_file(self):
+        retention = ()
         test_directory = os.path.join(os.path.dirname(__file__),
                                       'this_is_a_file')
         f = open(test_directory, 'w')
         f.write('')
         f.close()
-        utils.clean_output_dir(test_directory)
+        utils.clean_output_dir(test_directory, retention)
         self.assertFalse(os.path.exists(test_directory))
 
     def test_strftime(self):
diff --git a/pelican/utils.py b/pelican/utils.py
index fea7b953..2c70ae8c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -298,8 +298,8 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
         logger.warning('skipped copy %s to %s' % (source_, destination_))
 
 
-def clean_output_dir(path):
-    """Remove all the files from the output directory"""
+def clean_output_dir(path, retention):
+    """Remove all files from output directory except those in retention list"""
 
     if not os.path.exists(path):
         logger.debug("Directory already removed: %s" % path)
@@ -312,10 +312,13 @@ def clean_output_dir(path):
             logger.error("Unable to delete file %s; %s" % (path, str(e)))
         return
 
-    # remove all the existing content from the output folder
+    # remove existing content from output folder unless in retention list
     for filename in os.listdir(path):
         file = os.path.join(path, filename)
-        if os.path.isdir(file):
+        if any(filename == retain for retain in retention):
+            logger.debug("Skipping deletion; %s is on retention list: %s" \
+                         % (filename, file))
+        elif os.path.isdir(file):
             try:
                 shutil.rmtree(file)
                 logger.debug("Deleted directory %s" % file)

From 7d37cfa7485e3a8cb1f8e0ac6001be66fb553bbc Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 25 Jun 2013 19:17:40 -0700
Subject: [PATCH 1357/2864] Missing -s flag added to command on tips doc page

---
 docs/tips.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tips.rst b/docs/tips.rst
index 64695db0..e29f73d2 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -26,7 +26,7 @@ For example, if the sources of your Pelican site are contained in a GitHub
 repository, and if you want to publish your Pelican site as Project Pages of
 this repository, you can then use the following::
 
-    $ pelican content -o output pelicanconf.py
+    $ pelican content -o output -s pelicanconf.py
     $ ghp-import output
     $ git push origin gh-pages
 

From 12fd53c27e133ed4e79c2f5a85ea8fb038c23b12 Mon Sep 17 00:00:00 2001
From: bas smit <bas@baslab.org>
Date: Wed, 26 Jun 2013 13:25:20 +0200
Subject: [PATCH 1358/2864] Add debug target to the template makefile

If the DEBUG variable is set (e.g. DEBUG=1 make target) debugging will
be enabled by using pelicans -D flag.
---
 pelican/tools/templates/Makefile.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 221568aa..fd553550 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -20,6 +20,11 @@ S3_BUCKET=$s3_bucket
 
 DROPBOX_DIR=$dropbox_dir
 
+DEBUG ?= 0
+ifeq ($(DEBUG), 1)
+	PELICANOPTS += -D
+endif 
+
 help:
 	@echo 'Makefile for a pelican Web site                                        '
 	@echo '                                                                       '

From 0d63b4520a302d5fb8e249c1d98c0043c566315b Mon Sep 17 00:00:00 2001
From: bas smit <bas@baslab.org>
Date: Wed, 26 Jun 2013 13:58:35 +0200
Subject: [PATCH 1359/2864] Add info about debugging to the help output of the
 makefile

---
 pelican/tools/templates/Makefile.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index fd553550..80cf4737 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -43,7 +43,8 @@ help:
 	@echo '   s3_upload                        upload the web site via S3         '
 	@echo '   github                           upload the web site via gh-pages   '
 	@echo '                                                                       '
-
+	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html'
+	@echo '                                                                       '
 
 html: clean $$(OUTPUTDIR)/index.html
 

From 5d000ca2904e84c12c255a7b930fc9c38639c580 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 26 Jun 2013 06:39:09 -0700
Subject: [PATCH 1360/2864] Add more missing -s flags to tips doc page

---
 docs/tips.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tips.rst b/docs/tips.rst
index e29f73d2..430d6488 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -49,7 +49,7 @@ To publish a Pelican site as User Pages you need to *push* the content of the
 
 Again, you can take advantage of ``ghp-import``::
 
-    $ pelican content -o output pelicanconf.py
+    $ pelican content -o output -s pelicanconf.py
     $ ghp-import output
     $ git push git@github.com:elemoine/elemoine.github.com.git gh-pages:master
 
@@ -71,7 +71,7 @@ To automatically update your Pelican site on each commit you can create
 a post-commit hook. For example, you can add the following to
 ``.git/hooks/post-commit``::
 
-    pelican pelican content -o output pelicanconf.py && ghp-import output && git push origin gh-pages
+    pelican pelican content -o output -s pelicanconf.py && ghp-import output && git push origin gh-pages
 
 Tip #2:
 

From 931d57160602db2b12d06d4c2a2124504addbd93 Mon Sep 17 00:00:00 2001
From: Danilo Bargen <gezuru@gmail.com>
Date: Fri, 28 Jun 2013 00:53:26 +0200
Subject: [PATCH 1361/2864] More explicit settings docs concerning list
 templates

I think the author list and tag list are so common that they should be
listed explicitly in the settings.
---
 docs/settings.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 97662cce..1444e174 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -237,12 +237,16 @@ Setting name (default value)                            What does it do?
                                                         use the default language.
 `PAGE_LANG_SAVE_AS` (``'pages/{slug}-{lang}.html'``)    The location we will save the page which doesn't
                                                         use the default language.
-`AUTHOR_URL` (``'author/{slug}.html'``)                 The URL to use for an author.
-`AUTHOR_SAVE_AS` (``'author/{slug}.html'``)             The location to save an author.
 `CATEGORY_URL` (``'category/{slug}.html'``)             The URL to use for a category.
 `CATEGORY_SAVE_AS` (``'category/{slug}.html'``)         The location to save a category.
 `TAG_URL` (``'tag/{slug}.html'``)                       The URL to use for a tag.
 `TAG_SAVE_AS` (``'tag/{slug}.html'``)                   The location to save the tag page.
+`TAGS_URL` (``'tag/{slug}.html'``)                      The URL to use for the tag list.
+`TAGS_SAVE_AS` (``'tags.html'``)                        The location to save the tag list.
+`AUTHOR_URL` (``'author/{slug}.html'``)                 The URL to use for an author.
+`AUTHOR_SAVE_AS` (``'author/{slug}.html'``)             The location to save an author.
+`AUTHORS_URL` (``'authors.html'``)                      The URL to use for the author list.
+`AUTHORS_SAVE_AS` (``'authors.html'``)                  The location to save the author list.
 `<DIRECT_TEMPLATE_NAME>_SAVE_AS`                        The location to save content generated from direct
                                                         templates. Where <DIRECT_TEMPLATE_NAME> is the
                                                         upper case template name.

From 298151237e9f418aabcf4d70333dc3550a519914 Mon Sep 17 00:00:00 2001
From: Andrew Ma <ajma@live.com>
Date: Wed, 3 Jul 2013 22:36:52 -0700
Subject: [PATCH 1362/2864] Adding stackoverflow to social icons

---
 pelican/themes/notmyidea/static/css/main.css      |   1 +
 .../static/images/icons/stackoverflow.png         | Bin 0 -> 916 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 pelican/themes/notmyidea/static/images/icons/stackoverflow.png

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 7f4ca363..fa0bcf1c 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -326,6 +326,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
 		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
+		.social a[href*='stackoverflow.com'] {background-image: url('../images/icons/stackoverflow.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
 		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
diff --git a/pelican/themes/notmyidea/static/images/icons/stackoverflow.png b/pelican/themes/notmyidea/static/images/icons/stackoverflow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5b65e9990dbf423ff652b297f1d0172c8c1cf27
GIT binary patch
literal 916
zcmeAS@N?(olHy`uVBq!ia0vp^0w65F1|<EHm6d=LTavfC%YQK7jQD;BD8gCb5m^kR
zJ;2!QWVRgx1Jfl>7sn8f<3~fRJ+vJ~_8MEyP6_>_pwTJhc%)&)Mu9Ed(YG|jmTlZ9
z@KIP<Fo$WHQdEb+NB2cr!?F@*x~WcWQrH*};BxJ~kV?wIl+D(kyA=I9o*Z3%X!qH~
z=V#_rf4h??P_t1awPMF!*<^+u&DgkSs}Cw1KkVFh_ikRf$t<5|MN3OQg!AsWJA3x?
z=Tn$ws2y7<5P$dXQ;pLyi!T;g#hZP|OUZtH_rwJOhGd52%jd|-giM(@aoe_;GlQOA
zOqX8y>eZ^FK^-?9GB|W>{Q7m)EC+@8;a3mYxk}1?tCE&x6kxKjd-nU)D+_Cb1MZtP
zf6ioHdF7Ur;v^T%WC`(qYnHY?KFysk()nSxK=;)vJ-w30K5t&s)3<F~St;X;WePH~
zh5HuVx_r3z$m3M^1(`o<Qd9NRIV7ar;^!+Q<jnf~nM3hNgez-*P1&@5g_$8&dwHGG
z(p@h;-no1CE+>ykMV9;LODnQ81ohPJtCw>uw6%3rniLY9y-{G%>&K7poH)Ybf9hcZ
zPx7%K&0{68BG<3+JpQ<G*RL-j0wu8me0+1xEnRv$+RIz&#%=EQ)W}Ib!VUsVj9!{Y
ze>`j393DPNr7J)G`t`kgi;Fv5%&IGQ?s!oY8v6HF>egkKm6gM^6?fU09+hB7{`$2g
z!Dr>|-0l5+On2^2_f4p`m-+THD#}N=VM2Fz(!8K!0$xisQhfv_dG-h{GMTvHCdbLN
z^XFvvX21P9HE8+fMNXk>uPs~lGBfn<J-us+OL<a^7|MSC-FugBg5US=#%v9R?(FH-
z)~t+*4E^j3iianp9%B%glp1T!)6M$eq2lDioeUzbmtVd5v0I?O{>^9g#*-%#3?x$4
ze30#20|W~;m8*zxxBvb3Dl3rX#Piv+IUi<hWO%Xb`s}kzH*&bS)zxQRyYS&dz#9Kk
zrW$5pG0&gR`nLV^o<NNwrFNh0*KzKTP8I&~Mx*YI!_F7=tN#7wsAGO;?Rm1by(<Km
z%vDQVBT7;dOH!?pi&B9UgOP!uv95u+u7Pogk&%_Lft7(JkZWaN@XXL<8H$G7{FKbJ
jN`wZ(5JM9yQ!^`56Nm<eE8p$|H86O(`njxgN@xNA9t@M#

literal 0
HcmV?d00001


From bed53d1c0b786cd7bb753d568a9df7c6540d48d5 Mon Sep 17 00:00:00 2001
From: Andrew Ma <ajma@live.com>
Date: Fri, 28 Jun 2013 15:09:36 -0700
Subject: [PATCH 1363/2864] Updating unit tests

---
 pelican/tests/output/basic/theme/css/main.css     |   1 +
 .../basic/theme/images/icons/stackoverflow.png    | Bin 0 -> 916 bytes
 pelican/tests/output/custom/theme/css/main.css    |   1 +
 .../custom/theme/images/icons/stackoverflow.png   | Bin 0 -> 916 bytes
 4 files changed, 2 insertions(+)
 create mode 100644 pelican/tests/output/basic/theme/images/icons/stackoverflow.png
 create mode 100644 pelican/tests/output/custom/theme/images/icons/stackoverflow.png

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 7f4ca363..fa0bcf1c 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -326,6 +326,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
 		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
+		.social a[href*='stackoverflow.com'] {background-image: url('../images/icons/stackoverflow.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
 		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
diff --git a/pelican/tests/output/basic/theme/images/icons/stackoverflow.png b/pelican/tests/output/basic/theme/images/icons/stackoverflow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5b65e9990dbf423ff652b297f1d0172c8c1cf27
GIT binary patch
literal 916
zcmeAS@N?(olHy`uVBq!ia0vp^0w65F1|<EHm6d=LTavfC%YQK7jQD;BD8gCb5m^kR
zJ;2!QWVRgx1Jfl>7sn8f<3~fRJ+vJ~_8MEyP6_>_pwTJhc%)&)Mu9Ed(YG|jmTlZ9
z@KIP<Fo$WHQdEb+NB2cr!?F@*x~WcWQrH*};BxJ~kV?wIl+D(kyA=I9o*Z3%X!qH~
z=V#_rf4h??P_t1awPMF!*<^+u&DgkSs}Cw1KkVFh_ikRf$t<5|MN3OQg!AsWJA3x?
z=Tn$ws2y7<5P$dXQ;pLyi!T;g#hZP|OUZtH_rwJOhGd52%jd|-giM(@aoe_;GlQOA
zOqX8y>eZ^FK^-?9GB|W>{Q7m)EC+@8;a3mYxk}1?tCE&x6kxKjd-nU)D+_Cb1MZtP
zf6ioHdF7Ur;v^T%WC`(qYnHY?KFysk()nSxK=;)vJ-w30K5t&s)3<F~St;X;WePH~
zh5HuVx_r3z$m3M^1(`o<Qd9NRIV7ar;^!+Q<jnf~nM3hNgez-*P1&@5g_$8&dwHGG
z(p@h;-no1CE+>ykMV9;LODnQ81ohPJtCw>uw6%3rniLY9y-{G%>&K7poH)Ybf9hcZ
zPx7%K&0{68BG<3+JpQ<G*RL-j0wu8me0+1xEnRv$+RIz&#%=EQ)W}Ib!VUsVj9!{Y
ze>`j393DPNr7J)G`t`kgi;Fv5%&IGQ?s!oY8v6HF>egkKm6gM^6?fU09+hB7{`$2g
z!Dr>|-0l5+On2^2_f4p`m-+THD#}N=VM2Fz(!8K!0$xisQhfv_dG-h{GMTvHCdbLN
z^XFvvX21P9HE8+fMNXk>uPs~lGBfn<J-us+OL<a^7|MSC-FugBg5US=#%v9R?(FH-
z)~t+*4E^j3iianp9%B%glp1T!)6M$eq2lDioeUzbmtVd5v0I?O{>^9g#*-%#3?x$4
ze30#20|W~;m8*zxxBvb3Dl3rX#Piv+IUi<hWO%Xb`s}kzH*&bS)zxQRyYS&dz#9Kk
zrW$5pG0&gR`nLV^o<NNwrFNh0*KzKTP8I&~Mx*YI!_F7=tN#7wsAGO;?Rm1by(<Km
z%vDQVBT7;dOH!?pi&B9UgOP!uv95u+u7Pogk&%_Lft7(JkZWaN@XXL<8H$G7{FKbJ
jN`wZ(5JM9yQ!^`56Nm<eE8p$|H86O(`njxgN@xNA9t@M#

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 7f4ca363..fa0bcf1c 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -326,6 +326,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
 		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
 		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
+		.social a[href*='stackoverflow.com'] {background-image: url('../images/icons/stackoverflow.png');}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
 		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
diff --git a/pelican/tests/output/custom/theme/images/icons/stackoverflow.png b/pelican/tests/output/custom/theme/images/icons/stackoverflow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5b65e9990dbf423ff652b297f1d0172c8c1cf27
GIT binary patch
literal 916
zcmeAS@N?(olHy`uVBq!ia0vp^0w65F1|<EHm6d=LTavfC%YQK7jQD;BD8gCb5m^kR
zJ;2!QWVRgx1Jfl>7sn8f<3~fRJ+vJ~_8MEyP6_>_pwTJhc%)&)Mu9Ed(YG|jmTlZ9
z@KIP<Fo$WHQdEb+NB2cr!?F@*x~WcWQrH*};BxJ~kV?wIl+D(kyA=I9o*Z3%X!qH~
z=V#_rf4h??P_t1awPMF!*<^+u&DgkSs}Cw1KkVFh_ikRf$t<5|MN3OQg!AsWJA3x?
z=Tn$ws2y7<5P$dXQ;pLyi!T;g#hZP|OUZtH_rwJOhGd52%jd|-giM(@aoe_;GlQOA
zOqX8y>eZ^FK^-?9GB|W>{Q7m)EC+@8;a3mYxk}1?tCE&x6kxKjd-nU)D+_Cb1MZtP
zf6ioHdF7Ur;v^T%WC`(qYnHY?KFysk()nSxK=;)vJ-w30K5t&s)3<F~St;X;WePH~
zh5HuVx_r3z$m3M^1(`o<Qd9NRIV7ar;^!+Q<jnf~nM3hNgez-*P1&@5g_$8&dwHGG
z(p@h;-no1CE+>ykMV9;LODnQ81ohPJtCw>uw6%3rniLY9y-{G%>&K7poH)Ybf9hcZ
zPx7%K&0{68BG<3+JpQ<G*RL-j0wu8me0+1xEnRv$+RIz&#%=EQ)W}Ib!VUsVj9!{Y
ze>`j393DPNr7J)G`t`kgi;Fv5%&IGQ?s!oY8v6HF>egkKm6gM^6?fU09+hB7{`$2g
z!Dr>|-0l5+On2^2_f4p`m-+THD#}N=VM2Fz(!8K!0$xisQhfv_dG-h{GMTvHCdbLN
z^XFvvX21P9HE8+fMNXk>uPs~lGBfn<J-us+OL<a^7|MSC-FugBg5US=#%v9R?(FH-
z)~t+*4E^j3iianp9%B%glp1T!)6M$eq2lDioeUzbmtVd5v0I?O{>^9g#*-%#3?x$4
ze30#20|W~;m8*zxxBvb3Dl3rX#Piv+IUi<hWO%Xb`s}kzH*&bS)zxQRyYS&dz#9Kk
zrW$5pG0&gR`nLV^o<NNwrFNh0*KzKTP8I&~Mx*YI!_F7=tN#7wsAGO;?Rm1by(<Km
z%vDQVBT7;dOH!?pi&B9UgOP!uv95u+u7Pogk&%_Lft7(JkZWaN@XXL<8H$G7{FKbJ
jN`wZ(5JM9yQ!^`56Nm<eE8p$|H86O(`njxgN@xNA9t@M#

literal 0
HcmV?d00001


From ddb6d89be3a2dbda6574a6c751ab4ec68476444a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 28 Jun 2013 19:59:00 -0700
Subject: [PATCH 1364/2864] Document how to stop generation of certain pages

The documentation doesn't make it very clear how to prevent certain
pages from being generated, such as the Authors, Tags, and Categories
collection pages. This change makes it slightly more obvious how to
prevent these pages from being generated. Fixes #940.
---
 docs/settings.rst | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 1444e174..78a0ddf7 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -138,8 +138,9 @@ Setting name (default value)                                            What doe
                                                                         library, which can be installed via: ``pip install typogrify``
 `DIRECT_TEMPLATES` (``('index', 'tags', 'categories', 'archives')``)    List of templates that are used directly to render
                                                                         content. Typically direct templates are used to generate
-                                                                        index pages for collections of content (e.g. tags and
-                                                                        category index pages).
+                                                                        index pages for collections of content (e.g., tags and
+                                                                        category index pages). If the tag and category collections
+                                                                        are not needed, set ``DIRECT_TEMPLATES = ('index', 'archives')``
 `PAGINATED_DIRECT_TEMPLATES` (``('index',)``)                           Provides the direct templates that should be paginated.
 `SUMMARY_MAX_LENGTH` (``50``)                                           When creating a short summary of an article, this will
                                                                         be the default length in words of the text created.
@@ -261,7 +262,10 @@ Setting name (default value)                            What does it do?
 
 .. note::
 
-    When any of the `*_SAVE_AS` settings is set to False, files will not be created.
+    If you do not want one or more of the default pages to be created (e.g.,
+    you are the only author on your site and thus do not need an Authors page),
+    set the corresponding ``*_SAVE_AS`` setting to ``False`` to prevent the
+    relevant page from being generated.
 
 Timezone
 --------

From 39518e15efc6535ef654b0e9e526239db62d7ac8 Mon Sep 17 00:00:00 2001
From: Andy Pearce <andy@andy-pearce.com>
Date: Fri, 14 Jun 2013 15:54:06 +0100
Subject: [PATCH 1365/2864] Allow text substitutions when generating slugs

The `slugify()` function used by Pelican is in general very good at
coming up with something both readable and URL-safe. However, there are
a few specific cases where it causes conflicts. One that I've run into
is using the strings `C++` and `C` as tags, both of which transform to
the slug `c`. This commit adds an optional `SLUG_SUBSTITUTIONS` setting
which is a list of 2-tuples of substitutions to be carried out
case-insensitively just prior to stripping out non-alphanumeric
characters. This allows cases like `C++` to be transformed to `CPP` or
similar. This can also improve the readability of slugs.
---
 docs/settings.rst           |  4 ++++
 pelican/contents.py         |  3 ++-
 pelican/settings.py         |  1 +
 pelican/tests/test_utils.py | 11 +++++++++++
 pelican/urlwrappers.py      | 11 ++++++-----
 pelican/utils.py            |  8 +++++---
 6 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 78a0ddf7..61ccc2b2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -258,6 +258,10 @@ Setting name (default value)                            What does it do?
                                                         posts.
 `DAY_ARCHIVE_SAVE_AS` (False)                           The location to save per-day archives of your
                                                         posts.
+`SLUG_SUBSTITUTIONS`  (``()``)                          Substitutions to make prior to stripping out
+                                                        non-alphanumerics when generating slugs. Specified
+                                                        as a list of 2-tuples of ``(from, to)`` which are
+                                                        applied in order.
 ====================================================    =====================================================
 
 .. note::
diff --git a/pelican/contents.py b/pelican/contents.py
index 1b604f19..d56335dd 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -86,7 +86,8 @@ class Content(object):
 
         # create the slug if not existing, from the title
         if not hasattr(self, 'slug') and hasattr(self, 'title'):
-            self.slug = slugify(self.title)
+            self.slug = slugify(self.title,
+                                settings.get('SLUG_SUBSTITUTIONS', ()))
 
         self.source_path = source_path
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 1c9b48c3..01203504 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -105,6 +105,7 @@ DEFAULT_CONFIG = {
     'PLUGINS': [],
     'TEMPLATE_PAGES': {},
     'IGNORE_FILES': ['.#*'],
+    'SLUG_SUBSTITUTIONS': (),
     }
 
 def read_settings(path=None, override=None):
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index ab35d991..0e65003a 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -94,6 +94,17 @@ class TestUtils(LoggedTestCase):
         for value, expected in samples:
             self.assertEqual(utils.slugify(value), expected)
 
+    def test_slugify_substitute(self):
+
+        samples = (('C++ is based on C', 'cpp-is-based-on-c'),
+                   ('C+++ test C+ test', 'cpp-test-c-test'),
+                   ('c++, c#, C#, C++', 'cpp-c-sharp-c-sharp-cpp'),
+                   ('c++-streams', 'cpp-streams'),)
+
+        subs = (('C++', 'CPP'), ('C#', 'C-SHARP'))
+        for value, expected in samples:
+            self.assertEqual(utils.slugify(value, subs), expected)
+
     def test_get_relative_path(self):
 
         samples = ((os.path.join('test', 'test.html'), os.pardir),
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index b0df61ad..acb8e07d 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -15,10 +15,10 @@ class URLWrapper(object):
     def __init__(self, name, settings):
         # next 2 lines are redundant with the setter of the name property
         # but are here for clarity
-        self._name = name
-        self.slug = slugify(name)
-        self.name = name
         self.settings = settings
+        self._name = name
+        self.slug = slugify(name, self.settings.get('SLUG_SUBSTITUTIONS', ()))
+        self.name = name
 
     @property
     def name(self):
@@ -27,7 +27,7 @@ class URLWrapper(object):
     @name.setter
     def name(self, name):
         self._name = name
-        self.slug = slugify(name)
+        self.slug = slugify(name, self.settings.get('SLUG_SUBSTITUTIONS', ()))
 
     def as_dict(self):
         d = self.__dict__
@@ -41,7 +41,8 @@ class URLWrapper(object):
         return self.slug
 
     def _normalize_key(self, key):
-        return six.text_type(slugify(key))
+        subs = self.settings.get('SLUG_SUBSTITUTIONS', ())
+        return six.text_type(slugify(key, subs))
 
     def __eq__(self, other):
         return self._key() == self._normalize_key(other)
diff --git a/pelican/utils.py b/pelican/utils.py
index 2c70ae8c..b1524036 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -231,7 +231,7 @@ class pelican_open(object):
         pass
 
 
-def slugify(value):
+def slugify(value, substitutions=()):
     """
     Normalizes string, converts to lowercase, removes non-alpha characters,
     and converts spaces to hyphens.
@@ -249,8 +249,10 @@ def slugify(value):
     if isinstance(value, six.binary_type):
         value = value.decode('ascii')
     # still unicode
-    value = unicodedata.normalize('NFKD', value)
-    value = re.sub('[^\w\s-]', '', value).strip().lower()
+    value = unicodedata.normalize('NFKD', value).lower()
+    for src, dst in substitutions:
+        value = value.replace(src.lower(), dst.lower())
+    value = re.sub('[^\w\s-]', '', value).strip()
     value = re.sub('[-\s]+', '-', value)
     # we want only ASCII chars
     value = value.encode('ascii', 'ignore')

From 3da4c2e13e4146e1d0a58fd0e7267bb4ad957881 Mon Sep 17 00:00:00 2001
From: Stefan hr Berder <hr@bonz.org>
Date: Sun, 7 Jul 2013 12:44:21 +0200
Subject: [PATCH 1366/2864] add port option to pelican.server

---
 pelican/server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/server.py b/pelican/server.py
index fd99b209..24f3ae04 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -10,7 +10,7 @@ try:
 except ImportError:
     import socketserver  # NOQA
 
-PORT = 8000
+PORT = len(sys.argv) == 2 and int(sys.argv[1]) or 8000
 
 Handler = srvmod.SimpleHTTPRequestHandler
 
@@ -26,4 +26,4 @@ try:
     httpd.serve_forever()
 except KeyboardInterrupt as e:
     print("shutting down server")
-    httpd.socket.close()
\ No newline at end of file
+    httpd.socket.close()

From 00a1cbb6b84d9faad2d7dde01b068ff113b0184e Mon Sep 17 00:00:00 2001
From: Lingzhu Xiang <xlz@zotac-zboxid82>
Date: Sat, 4 May 2013 06:13:11 +0800
Subject: [PATCH 1367/2864] Support importing Tumblr

Try to integrate Tumblr's various post types without using
additonal templates.
---
 docs/importer.rst               | 14 ++++--
 pelican/tools/pelican_import.py | 88 ++++++++++++++++++++++++++++++++-
 2 files changed, 98 insertions(+), 4 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 9a0c513e..057fecd8 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -14,6 +14,7 @@ software to reStructuredText or Markdown. The supported import formats are:
 - WordPress XML export
 - Dotclear export
 - Posterous API
+- Tumblr API
 - RSS/Atom feed
 
 The conversion from HTML to reStructuredText or Markdown relies on `Pandoc`_.
@@ -41,16 +42,17 @@ Usage
 
 ::
 
-    pelican-import [-h] [--wpfile] [--dotclear] [--posterous] [--feed] [-o OUTPUT]
+    pelican-import [-h] [--wpfile] [--dotclear] [--posterous] [--tumblr] [--feed] [-o OUTPUT]
                    [-m MARKUP] [--dir-cat] [--dir-page] [--strip-raw] [--disable-slugs]
-                   [-e EMAIL] [-p PASSWORD]
-                   input|api_token
+                   [-e EMAIL] [-p PASSWORD] [-b BLOGNAME]
+                   input|api_token|api_key
 
 Positional arguments
 --------------------
 
   input                 The input file to read
   api_token             [Posterous only] api_token can be obtained from http://posterous.com/api/
+  api_key               [Tumblr only] api_key can be obtained from http://www.tumblr.com/oauth/apps
 
 Optional arguments
 ------------------
@@ -59,6 +61,7 @@ Optional arguments
   --wpfile              WordPress XML export (default: False)
   --dotclear            Dotclear export (default: False)
   --posterous           Posterous API (default: False)
+  --tumblr              Tumblr API (default: False)
   --feed                Feed to parse (default: False)
   -o OUTPUT, --output OUTPUT
                         Output path (default: output)
@@ -80,6 +83,8 @@ Optional arguments
                         Email used to authenticate Posterous API
   -p PASSWORD, --password=PASSWORD
                         Password used to authenticate Posterous API
+  -b BLOGNAME, --blogname=BLOGNAME
+                        Blog name used in Tumblr API
 
 
 Examples
@@ -97,6 +102,9 @@ for Posterous::
 
     $ pelican-import --posterous -o ~/output --email=<email_address> --password=<password> <api_token>
 
+For Tumblr::
+
+    $ pelican-import --tumblr -o ~/output --blogname=<blogname> <api_token>
 
 Tests
 =====
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 630142e7..5f637c73 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -326,6 +326,84 @@ def posterous2fields(api_token, email, password):
             yield (post.get('title'), post.get('body_cleaned'), slug, date,
                 post.get('user').get('display_name'), [], tags, kind, "html")
 
+
+def tumblr2fields(api_key, blogname):
+    """ Imports Tumblr posts (API v2)"""
+    from time import strftime, localtime
+    try:
+        # py3k import
+        import json
+    except ImportError:
+        # py2 import
+        import simplejson as json
+
+    try:
+        # py3k import
+        import urllib.request as urllib_request
+    except ImportError:
+        # py2 import
+        import urllib2 as urllib_request
+
+    def get_tumblr_posts(api_key, blogname, offset=0):
+        url = "http://api.tumblr.com/v2/blog/%s.tumblr.com/posts?api_key=%s&offset=%d&filter=raw" % (blogname, api_key, offset)
+        request = urllib_request.Request(url)
+        handle = urllib_request.urlopen(request)
+        posts = json.loads(handle.read().decode('utf-8'))
+        return posts.get('response').get('posts')
+
+    offset = 0
+    posts = get_tumblr_posts(api_key, blogname, offset)
+    while len(posts) > 0:
+        for post in posts:
+            title = post.get('title') or post.get('source_title')
+            slug = post.get('slug') or slugify(title)
+            tags = post.get('tags')
+            timestamp = post.get('timestamp')
+            date = strftime("%Y-%m-%d %H:%M:%S", localtime(int(timestamp)))
+            slug = strftime("%Y-%m-%d-", localtime(int(timestamp))) + slug
+            format = post.get('format')
+            content = post.get('body')
+            type = post.get('type')
+            if type == 'photo':
+                if format == 'markdown':
+                    fmtstr = '![%s](%s)'
+                else:
+                    fmtstr = '<img alt="%s" src="%s" />'
+                content = '\n'.join(fmtstr % (photo.get('caption'), photo.get('original_size').get('url')) for photo in post.get('photos'))
+            elif type == 'quote':
+                if format == 'markdown':
+                    fmtstr = '\n\n&mdash; %s'
+                else:
+                    fmtstr = '<p>&mdash; %s</p>'
+                content = post.get('text') + fmtstr % post.get('source')
+            elif type == 'link':
+                if format == 'markdown':
+                    fmtstr = '[via](%s)\n\n'
+                else:
+                    fmtstr = '<p><a href="%s">via</a></p>\n'
+                content = fmtstr % post.get('url') + post.get('description')
+            elif type == 'audio':
+                if format == 'markdown':
+                    fmtstr = '[via](%s)\n\n'
+                else:
+                    fmtstr = '<p><a href="%s">via</a></p>\n'
+                content = fmtstr % post.get('source_url') + post.get('caption') + post.get('player')
+            elif type == 'video':
+                if format == 'markdown':
+                    fmtstr = '[via](%s)\n\n'
+                else:
+                    fmtstr = '<p><a href="%s">via</a></p>\n'
+                content = fmtstr % post.get('source_url') + post.get('caption') + '\n'.join(player.get('embed_code') for player in post.get('player'))
+            elif type == 'answer':
+                title = post.get('question')
+                content = '<p><a href="%s" rel="external nofollow">%s</a>: %s</p>\n%s' % (post.get('asking_name'), post.get('asking_url'), post.get('question'), post.get('answer'))
+
+            yield (title, content, slug, date, post.get('blog_name'), [type], tags, format)
+
+        offset += len(posts)
+        posts = get_tumblr_posts(api_key, blogname, offset)
+
+
 def feed2fields(file):
     """Read a feed and yield pelican fields"""
     import feedparser
@@ -476,6 +554,8 @@ def main():
         help='Dotclear export')
     parser.add_argument('--posterous', action='store_true', dest='posterous',
         help='Posterous export')
+    parser.add_argument('--tumblr', action='store_true', dest='tumblr',
+        help='Tumblr export')
     parser.add_argument('--feed', action='store_true', dest='feed',
         help='Feed to parse')
     parser.add_argument('-o', '--output', dest='output', default='output',
@@ -499,6 +579,8 @@ def main():
         help="Email address (posterous import only)")
     parser.add_argument('-p', '--password', dest='password',
         help="Password (posterous import only)")
+    parser.add_argument('-b', '--blogname', dest='blogname',
+        help="Blog name (Tumblr import only)")
 
     args = parser.parse_args()
 
@@ -509,10 +591,12 @@ def main():
         input_type = 'dotclear'
     elif args.posterous:
         input_type = 'posterous'
+    elif args.tumblr:
+        input_type = 'tumblr'
     elif args.feed:
         input_type = 'feed'
     else:
-        error = "You must provide either --wpfile, --dotclear, --posterous or --feed options"
+        error = "You must provide either --wpfile, --dotclear, --posterous, --tumblr or --feed options"
         exit(error)
 
     if not os.path.exists(args.output):
@@ -528,6 +612,8 @@ def main():
         fields = dc2fields(args.input)
     elif input_type == 'posterous':
         fields = posterous2fields(args.input, args.email, args.password)
+    elif input_type == 'tumblr':
+        fields = tumblr2fields(args.input, args.blogname)
     elif input_type == 'feed':
         fields = feed2fields(args.input)
 

From 75263fa852fae5ed6e591c18fe1afad8fe5a7b0f Mon Sep 17 00:00:00 2001
From: Lingzhu Xiang <xlz@zotac-zboxid82>
Date: Sun, 5 May 2013 02:09:24 +0800
Subject: [PATCH 1368/2864] Fix importing Tumblr photo caption

Besides each photo's caption, the general caption is also needed.

While we're at it, also add a linefeed at the end of file.
---
 pelican/tools/pelican_import.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 5f637c73..3c40dd56 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -370,6 +370,7 @@ def tumblr2fields(api_key, blogname):
                 else:
                     fmtstr = '<img alt="%s" src="%s" />'
                 content = '\n'.join(fmtstr % (photo.get('caption'), photo.get('original_size').get('url')) for photo in post.get('photos'))
+                content += '\n\n' + post.get('caption')
             elif type == 'quote':
                 if format == 'markdown':
                     fmtstr = '\n\n&mdash; %s'
@@ -398,6 +399,8 @@ def tumblr2fields(api_key, blogname):
                 title = post.get('question')
                 content = '<p><a href="%s" rel="external nofollow">%s</a>: %s</p>\n%s' % (post.get('asking_name'), post.get('asking_url'), post.get('question'), post.get('answer'))
 
+            content = content.rstrip() + '\n'
+
             yield (title, content, slug, date, post.get('blog_name'), [type], tags, format)
 
         offset += len(posts)

From 241ac2400a33d6ad804012ae11b36a38e223476f Mon Sep 17 00:00:00 2001
From: Lingzhu Xiang <xlz@zotac-zboxid82>
Date: Sun, 5 May 2013 22:53:21 +0800
Subject: [PATCH 1369/2864] Use better titles than None for Tumblr posts
 without title

---
 pelican/tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 3c40dd56..3b5c55f2 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -355,7 +355,7 @@ def tumblr2fields(api_key, blogname):
     posts = get_tumblr_posts(api_key, blogname, offset)
     while len(posts) > 0:
         for post in posts:
-            title = post.get('title') or post.get('source_title')
+            title = post.get('title') or post.get('source_title') or post.get('type').capitalize()
             slug = post.get('slug') or slugify(title)
             tags = post.get('tags')
             timestamp = post.get('timestamp')

From 3a5db543bb8fa385ac10347d81d98778959619bc Mon Sep 17 00:00:00 2001
From: Stefan hr Berder <hr@bonz.org>
Date: Sun, 7 Jul 2013 13:27:50 +0200
Subject: [PATCH 1370/2864] add port parameter to bash script

---
 pelican/tools/templates/develop_server.sh.in | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index 6dd11e6d..16b61518 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -18,7 +18,7 @@ SRV_PID=$$BASEDIR/srv.pid
 PELICAN_PID=$$BASEDIR/pelican.pid
 
 function usage(){
-  echo "usage: $$0 (stop) (start) (restart)"
+  echo "usage: $$0 (stop) (start) (restart) [port]"
   echo "This starts pelican in debug and reload mode and then launches"
   echo "A pelican.server to help site development. It doesn't read"
   echo "your pelican options so you edit any paths in your Makefile"
@@ -59,13 +59,14 @@ function shut_down(){
 }
 
 function start_up(){
+  local port=$$1
   echo "Starting up Pelican and pelican.server"
   shift
   $$PELICAN --debug --autoreload -r $$INPUTDIR -o $$OUTPUTDIR -s $$CONFFILE $$PELICANOPTS &
   pelican_pid=$$!
   echo $$pelican_pid > $$PELICAN_PID
   cd $$OUTPUTDIR
-  $PY -m pelican.server &
+  $PY -m pelican.server $$port &
   srv_pid=$$!
   echo $$srv_pid > $$SRV_PID
   cd $$BASEDIR
@@ -83,15 +84,18 @@ function start_up(){
 ###
 #  MAIN
 ###
-[[ $$# -ne 1 ]] && usage
+[[ ($$# -eq 0) || ($$# -gt 2) ]] && usage
+port=''
+[[ $$# -eq 2 ]] && port=$$2
+
 if [[ $$1 == "stop" ]]; then
   shut_down
 elif [[ $$1 == "restart" ]]; then
   shut_down
-  start_up
+  start_up $$port
 elif [[ $$1 == "start" ]]; then
-  if ! start_up; then
-    shut_down
+  if ! start_up $$port; then
+    shut_down 
   fi
 else
   usage

From 689632835eb2119c2f822456dee6c11def11ced5 Mon Sep 17 00:00:00 2001
From: Stefan hr Berder <hr@bonz.org>
Date: Sun, 7 Jul 2013 14:28:15 +0200
Subject: [PATCH 1371/2864] add port option to Makefile target serve/devserver

---
 pelican/tools/templates/Makefile.in | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 4bc764ca..f2e0ccc9 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -28,8 +28,8 @@ help:
 	@echo '   make clean                       remove the generated files         '
 	@echo '   make regenerate                  regenerate files upon modification '
 	@echo '   make publish                     generate using production settings '
-	@echo '   make serve                       serve site at http://localhost:8000'
-	@echo '   make devserver                   start/restart develop_server.sh    '
+	@echo '   make serve [PORT=8000]           serve site at http://localhost:8000'
+	@echo '   make devserver [PORT=8000]       start/restart develop_server.sh    '
 	@echo '   make stopserver                  stop local server                  '
 	@echo '   ssh_upload                       upload the web site via SSH        '
 	@echo '   rsync_upload                     upload the web site via rsync+ssh  '
@@ -50,10 +50,18 @@ regenerate:
 	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 serve:
+ifdef PORT
+	cd $$(OUTPUTDIR) && $(PY) -m pelican.server $$(PORT)
+else
 	cd $$(OUTPUTDIR) && $(PY) -m pelican.server
+endif
 
 devserver:
+ifdef PORT
+	$$(BASEDIR)/develop_server.sh restart $$(PORT)
+else
 	$$(BASEDIR)/develop_server.sh restart
+endif
 
 stopserver:
 	kill -9 `cat pelican.pid`

From cb650c1c992a92c25040387d77ecc774e6f5a4ac Mon Sep 17 00:00:00 2001
From: Benjamin Port <benjamin.port@ben2367.fr>
Date: Thu, 9 May 2013 05:06:12 +0200
Subject: [PATCH 1372/2864] Add filter-author option to importer

Allow to import post from only one author when importing data
---
 docs/importer.rst               | 1 +
 pelican/tools/pelican_import.py | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 9a0c513e..228471da 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -69,6 +69,7 @@ Optional arguments
                         (default: False)
   --dir-page            Put files recognised as pages in "pages/" sub-
                           directory (wordpress import only) (default: False)
+  --filter-author       Import only post from the specified author.
   --strip-raw           Strip raw HTML code that can't be converted to markup
                         such as flash embeds or iframes (wordpress import
                         only) (default: False)
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 630142e7..59b767f9 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -376,9 +376,11 @@ def build_markdown_header(title, date, author, categories, tags, slug):
 
 def fields2pelican(fields, out_markup, output_path,
         dircat=False, strip_raw=False, disable_slugs=False,
-        dirpage=False, filename_template=None):
+        dirpage=False, filename_template=None, filter_author=None):
     for (title, content, filename, date, author, categories, tags,
             kind, in_markup) in fields:
+        if filter_author and filter_author != author:
+            continue
         slug = not disable_slugs and filename or None
         if (in_markup == "markdown") or (out_markup == "markdown") :
             ext = '.md'
@@ -487,6 +489,8 @@ def main():
     parser.add_argument('--dir-page', action='store_true', dest='dirpage',
         help=('Put files recognised as pages in "pages/" sub-directory'
               ' (wordpress import only)'))
+    parser.add_argument('--filter-author', dest='author',
+        help='Import only post from the specified author')
     parser.add_argument('--strip-raw', action='store_true', dest='strip_raw',
         help="Strip raw HTML code that can't be converted to "
              "markup such as flash embeds or iframes (wordpress import only)")
@@ -537,4 +541,5 @@ def main():
                    dircat=args.dircat or False,
                    dirpage=args.dirpage or False,
                    strip_raw=args.strip_raw or False,
-                   disable_slugs=args.disable_slugs or False)
+                   disable_slugs=args.disable_slugs or False,
+                   filter_author=args.author)

From 6c5444eb6833cda2ea9129321c3a4ba43505b772 Mon Sep 17 00:00:00 2001
From: Nick Moore <nick@zoic.org>
Date: Sun, 14 Jul 2013 23:01:16 +1000
Subject: [PATCH 1373/2864] do slug_substitutions on category and author ...

---
 pelican/contents.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index d56335dd..ed213c31 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -141,14 +141,21 @@ class Content(object):
         """Returns the URL, formatted with the proper values"""
         metadata = copy.copy(self.metadata)
         path = self.metadata.get('path', self.get_relative_source_path())
+        default_category = self.settings['DEFAULT_CATEGORY']
+        slug_substitutions = self.settings.get('SLUG_SUBSTITUTIONS', ())
         metadata.update({
             'path': path_to_url(path),
             'slug': getattr(self, 'slug', ''),
             'lang': getattr(self, 'lang', 'en'),
             'date': getattr(self, 'date', datetime.now()),
-            'author': getattr(self, 'author', ''),
-            'category': getattr(self, 'category',
-                                self.settings['DEFAULT_CATEGORY']),
+            'author': slugify(
+                getattr(self, 'author', ''),
+                slug_substitutions
+            ),
+            'category': slugify(
+                getattr(self, 'category', default_category),
+                slug_substitutions
+            )
         })
         return metadata
 

From 9b7ae20aa9182e7d3c10bea111716bb4e12edbd8 Mon Sep 17 00:00:00 2001
From: Nick Moore <nick@zoic.org>
Date: Mon, 15 Jul 2013 00:22:05 +1000
Subject: [PATCH 1374/2864] test for author & category slugification

---
 pelican/tests/test_contents.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index c081639d..af97db3f 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -191,6 +191,20 @@ class TestArticle(TestPage):
         custom_article = Article(**article_kwargs)
         self.assertEqual('custom', custom_article.template)
 
+    def test_slugify_category_author(self):
+        settings = get_settings()
+        settings['SLUG_SUBSTITUTIONS'] = [ ('C#', 'csharp') ]
+        settings['ARTICLE_URL'] = '{author}/{category}/{slug}/'
+        settings['ARTICLE_SAVE_AS'] = '{author}/{category}/{slug}/index.html'
+        article_kwargs = self._copy_page_kwargs()
+        article_kwargs['metadata']['author'] = "O'Brien"
+        article_kwargs['metadata']['category'] = 'C# & stuff'
+        article_kwargs['metadata']['title'] = 'fnord'
+        article_kwargs['settings'] = settings
+        article = Article(**article_kwargs)
+        self.assertEqual(article.url, 'obrien/csharp-stuff/fnord/')
+        self.assertEqual(article.save_as, 'obrien/csharp-stuff/fnord/index.html')
+
 
 class TestURLWrapper(unittest.TestCase):
     def test_comparisons(self):

From 4ca5d908ff767fc07a95a8b31487dcbb9416e2e5 Mon Sep 17 00:00:00 2001
From: Chris Howie <me@chrishowie.com>
Date: Mon, 15 Jul 2013 16:48:08 -0400
Subject: [PATCH 1375/2864] Update tag cloud documentation for
 SLUG_SUBSTITUTIONS

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 61ccc2b2..2c16ca83 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -497,7 +497,7 @@ The default theme does not support tag clouds, but it is pretty easy to add::
 
     <ul>
         {% for tag in tag_cloud %}
-            <li class="tag-{{ tag.1 }}"><a href="/tag/{{ tag.0|string|replace(" ", "-" ) }}.html">{{ tag.0 }}</a></li>
+            <li class="tag-{{ tag.1 }}"><a href="{{ tag.0.url }}">{{ tag.0 }}</a></li>
         {% endfor %}
     </ul>
 

From f43742c3f0b6b3a260ff5c338d7c4309865b0b54 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 15 Jul 2013 14:25:39 -0700
Subject: [PATCH 1376/2864] Add missing SITEURL variable to tag cloud docs

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 2c16ca83..eb0d028f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -493,11 +493,11 @@ Setting name (default value)                        What does it do?
 `TAG_CLOUD_MAX_ITEMS` (``100``)                     Maximum number of tags in the cloud.
 ================================================    =====================================================
 
-The default theme does not support tag clouds, but it is pretty easy to add::
+The default theme does not include a tag cloud, but it is pretty easy to add::
 
     <ul>
         {% for tag in tag_cloud %}
-            <li class="tag-{{ tag.1 }}"><a href="{{ tag.0.url }}">{{ tag.0 }}</a></li>
+            <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li>
         {% endfor %}
     </ul>
 

From c5008f61e0a480afb954a5258748eec576ee9a72 Mon Sep 17 00:00:00 2001
From: Jude N <jude@pwan.org>
Date: Tue, 16 Jul 2013 23:44:53 -0400
Subject: [PATCH 1377/2864] Adding a FEED_ALL_ATOM check in the "social" div.

The head section has a tests for FEED_ALL_ATOM when building the atom link.  This diff add a similar test in the "social" div.
---
 pelican/themes/notmyidea/templates/base.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 9bf4b12b..e44e20fd 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -53,7 +53,9 @@
                 <div class="social">
                         <h2>social</h2>
                         <ul>
+                            {% if FEED_ALL_ATOM %}
                             <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            {% endif %}
                             {% if FEED_ALL_RSS %}
                             <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             {% endif %}

From 3445066b11ef1123f3a32bb6b87fac5bfe3be293 Mon Sep 17 00:00:00 2001
From: Russ Webber <russkel@look-me-up-on-github>
Date: Thu, 18 Jul 2013 09:44:46 +0800
Subject: [PATCH 1378/2864] fix an exception not correctly reporting if the
 locale is not set

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 53216421..a9aa916c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -390,7 +390,7 @@ def main():
         # so convert the message to unicode with the correct encoding
         msg = str(e)
         if not six.PY3:
-            msg = msg.decode(locale.getpreferredencoding(False))
+            msg = msg.decode(locale.getpreferredencoding())
 
         logger.critical(msg)
 

From e32c893aa1d7863186a9a4f1b733ba5f5c74603d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 18 Jul 2013 10:26:45 -0700
Subject: [PATCH 1379/2864] Support Gaug.es analytics in notmyidea theme

---
 .../themes/notmyidea/templates/analytics.html   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
index 4de2c86b..c3499c81 100644
--- a/pelican/themes/notmyidea/templates/analytics.html
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -9,4 +9,19 @@
         var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
     </script>
-{% endif %}
\ No newline at end of file
+{% endif %}
+{% if GAUGES %}
+    <script type="text/javascript">
+    var _gauges = _gauges || [];
+    (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '{{GAUGES}}');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+    })();
+    </script>
+{% endif %}

From 2ace30cdb0a80e481c9acc749c9afa0f403d7443 Mon Sep 17 00:00:00 2001
From: Russ Webber <russ@rw.id.au>
Date: Sun, 21 Jul 2013 13:31:11 +0800
Subject: [PATCH 1380/2864] fix it not setting the default locale

If LOCALE was not specified in the settings file it would default
to [] insted of [''], where '' is used by locale.setlocale
to mean the user's default locale.
---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 01203504..5c1bd8f3 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -90,7 +90,7 @@ DEFAULT_CONFIG = {
     'MD_EXTENSIONS': ['codehilite(css_class=highlight)', 'extra'],
     'JINJA_EXTENSIONS': [],
     'JINJA_FILTERS': {},
-    'LOCALE': [],  # defaults to user locale
+    'LOCALE': [''],  # defaults to user locale
     'DEFAULT_PAGINATION': False,
     'DEFAULT_ORPHANS': 0,
     'DEFAULT_METADATA': (),

From b527fd594db86bf68ec01b1d6ae6dd4c518f9b04 Mon Sep 17 00:00:00 2001
From: Russ Webber <russ@rw.id.au>
Date: Sun, 21 Jul 2013 14:12:21 +0800
Subject: [PATCH 1381/2864] added testing for default locale setting

removed LOCALE="" from default conf as it looks weird and you
shouldn't need to set a blank LOCALE for the system to work.
---
 pelican/tests/default_conf.py  |  1 -
 pelican/tests/test_settings.py | 12 ++++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/default_conf.py b/pelican/tests/default_conf.py
index 80a990b5..62594894 100644
--- a/pelican/tests/default_conf.py
+++ b/pelican/tests/default_conf.py
@@ -9,7 +9,6 @@ GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
-LOCALE = ""
 DEFAULT_PAGINATION = 2
 
 FEED_RSS = 'feeds/all.rss.xml'
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index b1e813e1..7907a551 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals, print_function
 import copy
 import os
+import locale
 from os.path import dirname, abspath, join
 
 from pelican.settings import (read_settings, configure_settings,
@@ -92,3 +93,14 @@ class TestSettingsConfiguration(unittest.TestCase):
         settings['FEED_DOMAIN'] = 'http://feeds.example.com'
         configure_settings(settings)
         self.assertEqual(settings['FEED_DOMAIN'], 'http://feeds.example.com')
+
+    def test_default_encoding(self):
+        # test that the default locale is set if
+        # locale is not specified in the settings
+
+        #reset locale to python default
+        locale.setlocale(locale.LC_ALL, str('C'))
+        self.assertEqual(self.settings['LOCALE'], DEFAULT_CONFIG['LOCALE'])
+
+        configure_settings(self.settings)
+        self.assertEqual(locale.getlocale(), locale.getdefaultlocale())

From 0ddabb95c3dbf4c396968407ad0ba5aad56c8b86 Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle.mahan@gmail.com>
Date: Sat, 27 Jul 2013 12:05:14 -0700
Subject: [PATCH 1382/2864] Modify notmyidea to include class="active" on pages

---
 .../tests/output/basic/a-markdown-powered-article.html |  6 +++---
 pelican/tests/output/basic/archives.html               |  8 ++++----
 pelican/tests/output/basic/article-1.html              |  6 +++---
 pelican/tests/output/basic/article-2.html              |  6 +++---
 pelican/tests/output/basic/article-3.html              |  6 +++---
 .../tests/output/basic/author/alexis-metaireau.html    |  8 ++++----
 pelican/tests/output/basic/categories.html             |  8 ++++----
 pelican/tests/output/basic/category/bar.html           |  6 +++---
 pelican/tests/output/basic/category/cat1.html          |  6 +++---
 pelican/tests/output/basic/category/misc.html          |  6 +++---
 pelican/tests/output/basic/category/yeah.html          |  6 +++---
 .../tests/output/basic/filename_metadata-example.html  |  6 +++---
 pelican/tests/output/basic/index.html                  |  8 ++++----
 pelican/tests/output/basic/oh-yeah.html                |  6 +++---
 pelican/tests/output/basic/override/index.html         | 10 +++++-----
 .../output/basic/pages/this-is-a-test-hidden-page.html |  8 ++++----
 .../tests/output/basic/pages/this-is-a-test-page.html  | 10 +++++-----
 pelican/tests/output/basic/second-article-fr.html      |  6 +++---
 pelican/tests/output/basic/second-article.html         |  6 +++---
 pelican/tests/output/basic/tag/bar.html                |  8 ++++----
 pelican/tests/output/basic/tag/baz.html                |  8 ++++----
 pelican/tests/output/basic/tag/foo.html                |  8 ++++----
 pelican/tests/output/basic/tag/foobar.html             |  8 ++++----
 pelican/tests/output/basic/tag/oh.html                 |  8 ++++----
 pelican/tests/output/basic/tag/yeah.html               |  8 ++++----
 .../tests/output/basic/this-is-a-super-article.html    |  6 +++---
 pelican/tests/output/basic/unbelievable.html           |  6 +++---
 .../output/custom/a-markdown-powered-article.html      |  6 +++---
 pelican/tests/output/custom/archives.html              |  8 ++++----
 pelican/tests/output/custom/article-1.html             |  6 +++---
 pelican/tests/output/custom/article-2.html             |  6 +++---
 pelican/tests/output/custom/article-3.html             |  6 +++---
 .../tests/output/custom/author/alexis-metaireau.html   |  8 ++++----
 .../tests/output/custom/author/alexis-metaireau2.html  |  8 ++++----
 .../tests/output/custom/author/alexis-metaireau3.html  |  8 ++++----
 pelican/tests/output/custom/categories.html            |  8 ++++----
 pelican/tests/output/custom/category/bar.html          |  6 +++---
 pelican/tests/output/custom/category/cat1.html         |  6 +++---
 pelican/tests/output/custom/category/misc.html         |  6 +++---
 pelican/tests/output/custom/category/yeah.html         |  6 +++---
 .../tests/output/custom/drafts/a-draft-article.html    |  6 +++---
 .../tests/output/custom/filename_metadata-example.html |  6 +++---
 pelican/tests/output/custom/index.html                 |  8 ++++----
 pelican/tests/output/custom/index2.html                |  8 ++++----
 pelican/tests/output/custom/index3.html                |  8 ++++----
 pelican/tests/output/custom/jinja2_template.html       |  8 ++++----
 pelican/tests/output/custom/oh-yeah-fr.html            |  6 +++---
 pelican/tests/output/custom/oh-yeah.html               |  6 +++---
 pelican/tests/output/custom/override/index.html        | 10 +++++-----
 .../custom/pages/this-is-a-test-hidden-page.html       |  8 ++++----
 .../tests/output/custom/pages/this-is-a-test-page.html | 10 +++++-----
 pelican/tests/output/custom/second-article-fr.html     |  6 +++---
 pelican/tests/output/custom/second-article.html        |  6 +++---
 pelican/tests/output/custom/tag/bar.html               |  8 ++++----
 pelican/tests/output/custom/tag/baz.html               |  8 ++++----
 pelican/tests/output/custom/tag/foo.html               |  8 ++++----
 pelican/tests/output/custom/tag/foobar.html            |  8 ++++----
 pelican/tests/output/custom/tag/oh.html                |  8 ++++----
 pelican/tests/output/custom/tag/yeah.html              |  8 ++++----
 .../tests/output/custom/this-is-a-super-article.html   |  6 +++---
 pelican/tests/output/custom/unbelievable.html          |  6 +++---
 pelican/themes/notmyidea/templates/base.html           |  6 +++---
 62 files changed, 221 insertions(+), 221 deletions(-)

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 94b6e4ca..29c6d0d6 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
                                     <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 57f4a57a..9edb3c1b 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index cfe91009..eee7adfe 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
                                     <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 70f38852..5449a8be 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
                                     <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 20e58fcc..55449726 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
                                     <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 7f7a8c6b..1c67b6fa 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index a5eb2621..7a85b52a 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <ul>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 9e3b52f1..78894c94 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -18,9 +18,9 @@
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index c8912fc2..43226146 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
                                     <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index af223812..4aebcdf1 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index f401e3d2..b6f59771 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -17,9 +17,9 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
                                     <li class="active"><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 3092742b..4ceef81f 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index c5b9fec3..49c1883c 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 62834917..498e9cac 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -18,9 +18,9 @@
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index e75c75f7..2cc639d2 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -15,12 +15,12 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
+                                                    <li class="active"><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 6b5ae4c8..cd582b96 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index 9f1572af..8ba85e1d 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -16,11 +16,11 @@
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li class="active"><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index f0c166de..44965a76 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 6cc42c66..780d9b20 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 20824993..e23071e8 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 65632313..e429b6d8 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 05a02a5f..17fac77a 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index c683f1a1..cb8dfec2 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index 610a7aa3..f79e6e0e 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 2afb8bd3..dc3c1212 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 617b8c6d..85ad0ad8 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -17,9 +17,9 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
+                                    <li><a href="/category/misc.html">misc</a></li>
                                     <li class="active"><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 73c95423..3cc9a557 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -17,10 +17,10 @@
                 <nav><ul>
                                                     <li><a href="/override/">Override url/save_as</a></li>
                                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
+                                                                    <li><a href="/category/bar.html">bar</a></li>
+                                    <li><a href="/category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
+                                    <li><a href="/category/yeah.html">yeah</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 7b953a61..6a2f1fc5 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 8437e350..b1704bdb 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index c52fdd9a..c77bd4cf 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 7a045bdc..f93b8a85 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index f887218c..c87abf66 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
                                     <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index f18b8ce8..dd699031 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 9f4a31e8..8a245e43 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 4eda0b62..574f408f 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 146d7f3a..ddbc1832 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <ul>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index f7f1bbf3..4198d868 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -21,9 +21,9 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 10c4ce76..50a7a80b 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
                                     <li class="active"><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 121c9451..f2afbaeb 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index f7cc8d12..fa3e018f 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -22,9 +22,9 @@
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 493eb611..40854732 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 626e8c64..db0e2b19 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 1a1d89e9..68f51f06 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index b8e2ac1a..449eadef 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index cf285ea2..5fec650d 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 95077c2f..fcd60de6 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index e34e6078..f18d3f07 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 2f6ca309..c0e77d00 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -21,9 +21,9 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
                                     <li class="active"><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index ad9fb8b1..ca8490d6 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -19,12 +19,12 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
+                                                    <li class="active"><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index b4ac59b0..89275001 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index b4cb678c..d969d152 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -20,11 +20,11 @@
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                    <li class="active"><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 3d5fbd29..16ca3cc9 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index be83983e..4740eded 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index d1805e50..5f26883b 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index a6d23907..46aa6095 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 04cb7529..04d37f1b 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 2c50c8ae..961e381a 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index b798964e..5452f4d3 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 54ad93c6..d71c8a37 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="../override/">Override url/save_as</a></li>
                                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
+                                                                    <li><a href="../category/yeah.html">yeah</a></li>
+                                    <li><a href="../category/misc.html">misc</a></li>
+                                    <li><a href="../category/cat1.html">cat1</a></li>
+                                    <li><a href="../category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
                 
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 1fdd8897..8d9df71b 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -22,9 +22,9 @@
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                                                                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li><a href="./category/misc.html">misc</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index e7253497..ee743526 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -21,10 +21,10 @@
                 <nav><ul>
                                                     <li><a href="./override/">Override url/save_as</a></li>
                                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
+                                                                    <li><a href="./category/yeah.html">yeah</a></li>
                                     <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
+                                    <li><a href="./category/cat1.html">cat1</a></li>
+                                    <li><a href="./category/bar.html">bar</a></li>
                                                 </ul></nav>
         </header><!-- /#banner -->
         <section id="content" class="body">
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 9bf4b12b..f35b73ac 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -25,13 +25,13 @@
                     <li><a href="{{ link }}">{{ title }}</a></li>
                 {% endfor %}
                 {% if DISPLAY_PAGES_ON_MENU -%}
-                {% for page in PAGES %}
-                    <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
+                {% for pg in PAGES %}
+                    <li{% if pg == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ pg.url }}">{{ pg.title }}</a></li>
                 {% endfor %}
                 {% endif %}
                 {% if DISPLAY_CATEGORIES_ON_MENU -%}
                 {% for cat, null in categories %}
-                    <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
+                    <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
                 {% endfor %}
                 {% endif %}
                 </ul></nav>

From c5eecd23eb3d7498210701c278cbb9365cfb45ff Mon Sep 17 00:00:00 2001
From: Ross McFarland <rwmcfa1@gmail.com>
Date: Sat, 29 Dec 2012 09:05:40 -0800
Subject: [PATCH 1383/2864] PAGINATION_URL/PAGINATION_SAVE_AS implementation

allows the use of custom urls for pagination similar to *_URLS
---
 pelican/paginator.py                          | 44 ++++++++++++++++---
 pelican/settings.py                           |  2 +
 .../custom/author/alexis-metaireau2.html      |  4 +-
 .../custom/author/alexis-metaireau3.html      |  4 +-
 pelican/tests/output/custom/index2.html       |  4 +-
 pelican/tests/output/custom/index3.html       |  4 +-
 .../themes/simple/templates/pagination.html   |  8 +---
 pelican/writers.py                            | 29 ++++++------
 8 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/pelican/paginator.py b/pelican/paginator.py
index 067215c2..5fc6357e 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -2,14 +2,26 @@
 from __future__ import unicode_literals, print_function
 
 # From django.core.paginator
+import functools
+import logging
+
 from math import ceil
 
+logger = logging.getLogger(__name__)
 
 class Paginator(object):
-    def __init__(self, object_list, per_page, orphans=0):
+    def __init__(self, name, object_list, settings):
+        self.name = name
         self.object_list = object_list
-        self.per_page = per_page
-        self.orphans = orphans
+        self.settings = settings
+
+        if settings.get('DEFAULT_PAGINATION'):
+            self.per_page = settings.get('DEFAULT_PAGINATION')
+            self.orphans = settings.get('DEFAULT_ORPHANS')
+        else:
+            self.per_page = len(object_list)
+            self.orphans = 0
+
         self._num_pages = self._count = None
 
     def page(self, number):
@@ -18,7 +30,8 @@ class Paginator(object):
         top = bottom + self.per_page
         if top + self.orphans >= self.count:
             top = self.count
-        return Page(self.object_list[bottom:top], number, self)
+        return Page(self.name, self.object_list[bottom:top], number, self,
+                    self.settings)
 
     def _get_count(self):
         "Returns the total number of objects, across all pages."
@@ -45,10 +58,12 @@ class Paginator(object):
 
 
 class Page(object):
-    def __init__(self, object_list, number, paginator):
+    def __init__(self, name, object_list, number, paginator, settings):
+        self.name = name
         self.object_list = object_list
         self.number = number
         self.paginator = paginator
+        self.settings = settings
 
     def __repr__(self):
         return '<Page %s of %s>' % (self.number, self.paginator.num_pages)
@@ -87,3 +102,22 @@ class Page(object):
         if self.number == self.paginator.num_pages:
             return self.paginator.count
         return self.number * self.paginator.per_page
+
+    def _from_settings(self, key):
+        """Returns URL information as defined in settings. Similar to
+        URLWrapper._from_settings, but specialized to deal with pagination
+        logic."""
+        setting = "%s_%s" % ('PAGINATION', key)
+        value = self.settings[setting]
+        if not isinstance(value, basestring):
+            logger.warning(u'%s is set to %s' % (setting, value))
+            return value
+        else:
+            context = self.__dict__
+            if self.number == 1:
+                # no page numbers on the first page
+                context['number'] = ''
+            return unicode(value).format(**context)
+
+    url = property(functools.partial(_from_settings, key='URL'))
+    save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
diff --git a/pelican/settings.py b/pelican/settings.py
index 01203504..b65a6df7 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -73,6 +73,8 @@ DEFAULT_CONFIG = {
     'TAG_SAVE_AS': os.path.join('tag', '{slug}.html'),
     'AUTHOR_URL': 'author/{slug}.html',
     'AUTHOR_SAVE_AS': os.path.join('author', '{slug}.html'),
+    'PAGINATION_URL': '{name}{number}.html',
+    'PAGINATION_SAVE_AS': '{name}{number}.html',
     'YEAR_ARCHIVE_SAVE_AS': False,
     'MONTH_ARCHIVE_SAVE_AS': False,
     'DAY_ARCHIVE_SAVE_AS': False,
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 9f4a31e8..5d92303c 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -142,8 +142,8 @@ as well as <strong>inline markup</strong>.</p>
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
-                        <a href="../author/alexis-metaireau.html">&laquo;</a>
-                Page 2 / 3
+            <a href="../author/alexis-metaireau.html">&laquo;</a>
+        Page 2 / 3
             <a href="../author/alexis-metaireau3.html">&raquo;</a>
     </p>
                         </section><!-- /#content -->
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 4eda0b62..64468725 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -59,8 +59,8 @@
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
-                        <a href="../author/alexis-metaireau2.html">&laquo;</a>
-                Page 3 / 3
+            <a href="../author/alexis-metaireau2.html">&laquo;</a>
+        Page 3 / 3
     </p>
                         </section><!-- /#content -->
                     <section id="extras" class="body">
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index b8e2ac1a..7de87a34 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -140,8 +140,8 @@ YEAH !</p>
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
-                        <a href="./index.html">&laquo;</a>
-                Page 2 / 3
+            <a href="./index.html">&laquo;</a>
+        Page 2 / 3
             <a href="./index3.html">&raquo;</a>
     </p>
                         </section><!-- /#content -->
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index cf285ea2..18435df8 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -59,8 +59,8 @@
             </article></li>
                             </ol><!-- /#posts-list -->
                             <p class="paginator">
-                        <a href="./index2.html">&laquo;</a>
-                Page 3 / 3
+            <a href="./index2.html">&laquo;</a>
+        Page 3 / 3
     </p>
                         </section><!-- /#content -->
                     <section id="extras" class="body">
diff --git a/pelican/themes/simple/templates/pagination.html b/pelican/themes/simple/templates/pagination.html
index 83c587ac..4219a5c3 100644
--- a/pelican/themes/simple/templates/pagination.html
+++ b/pelican/themes/simple/templates/pagination.html
@@ -1,15 +1,11 @@
 {% if DEFAULT_PAGINATION %}
 <p class="paginator">
     {% if articles_page.has_previous() %}
-        {% if articles_page.previous_page_number() == 1 %}
-            <a href="{{ SITEURL }}/{{ page_name }}.html">&laquo;</a>
-        {% else %}
-            <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">&laquo;</a>
-        {% endif %}
+        <a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&laquo;</a>
     {% endif %}
     Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}
     {% if articles_page.has_next() %}
-        <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">&raquo;</a>
+        <a href="{{ SITEURL }}/{{ articles_next_page.url }}">&raquo;</a>
     {% endif %}
 </p>
 {% endif %}
diff --git a/pelican/writers.py b/pelican/writers.py
index fe37b25d..1113a5ba 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -150,36 +150,37 @@ class Writer(object):
         # check paginated
         paginated = paginated or {}
         if paginated:
+            name_root, ext = os.path.splitext(name)
+
             # pagination needed, init paginators
             paginators = {}
             for key in paginated.keys():
                 object_list = paginated[key]
 
-                if self.settings['DEFAULT_PAGINATION']:
-                    paginators[key] = Paginator(object_list,
-                        self.settings['DEFAULT_PAGINATION'],
-                        self.settings['DEFAULT_ORPHANS'])
-                else:
-                    paginators[key] = Paginator(object_list, len(object_list))
+                paginators[key] = Paginator(
+                    name_root,
+                    object_list,
+                    self.settings,
+                )
 
             # generated pages, and write
-            name_root, ext = os.path.splitext(name)
             for page_num in range(list(paginators.values())[0].num_pages):
                 paginated_localcontext = localcontext.copy()
                 for key in paginators.keys():
                     paginator = paginators[key]
+                    previous_page = paginator.page(page_num) \
+                            if page_num > 0 else None
                     page = paginator.page(page_num + 1)
+                    next_page = paginator.page(page_num + 2) \
+                            if page_num + 1 < paginator.num_pages else None
                     paginated_localcontext.update(
                             {'%s_paginator' % key: paginator,
-                             '%s_page' % key: page})
-                if page_num > 0:
-                    paginated_name = '%s%s%s' % (
-                        name_root, page_num + 1, ext)
-                else:
-                    paginated_name = name
+                             '%s_page' % key: page,
+                             '%s_previous_page' % key: previous_page,
+                             '%s_next_page' % key: next_page})
 
                 _write_file(template, paginated_localcontext, self.output_path,
-                    paginated_name)
+                            page.save_as)
         else:
             # no pagination
             _write_file(template, localcontext, self.output_path, name)

From e07b39dfcb4748066ade21ed75f41295ecd8ac7e Mon Sep 17 00:00:00 2001
From: Ross McFarland <rwmcfa1@gmail.com>
Date: Sat, 29 Dec 2012 17:44:35 -0800
Subject: [PATCH 1384/2864] more robust PAGINATION_(URL|SAVE_AS) support

- add base_name and number_seperator to context to give more flexibility
  when naming things
---
 pelican/paginator.py | 9 ++++++++-
 pelican/writers.py   | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pelican/paginator.py b/pelican/paginator.py
index 5fc6357e..6be64b39 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals, print_function
 # From django.core.paginator
 import functools
 import logging
+import os
 
 from math import ceil
 
@@ -114,10 +115,16 @@ class Page(object):
             return value
         else:
             context = self.__dict__
+            context['base_name'] = os.path.dirname(self.name)
+            context['number_sep'] = '/'
             if self.number == 1:
                 # no page numbers on the first page
                 context['number'] = ''
-            return unicode(value).format(**context)
+                context['number_sep'] = ''
+            ret = unicode(value).format(**context)
+            if ret[0] == '/':
+                ret = ret[1:]
+            return ret
 
     url = property(functools.partial(_from_settings, key='URL'))
     save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
diff --git a/pelican/writers.py b/pelican/writers.py
index 1113a5ba..25f49aeb 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -150,7 +150,7 @@ class Writer(object):
         # check paginated
         paginated = paginated or {}
         if paginated:
-            name_root, ext = os.path.splitext(name)
+            name_root = os.path.splitext(name)[0]
 
             # pagination needed, init paginators
             paginators = {}

From 0caa101ec73ef392cb2a38d3de0e732b7d544b55 Mon Sep 17 00:00:00 2001
From: Ross McFarland <rwmcfa1@gmail.com>
Date: Sun, 31 Mar 2013 07:41:14 -0700
Subject: [PATCH 1385/2864] use six.string_types for python 3 compat

---
 pelican/paginator.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/paginator.py b/pelican/paginator.py
index 6be64b39..a03ef2af 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
+import six
 
 # From django.core.paginator
 import functools
@@ -110,7 +111,7 @@ class Page(object):
         logic."""
         setting = "%s_%s" % ('PAGINATION', key)
         value = self.settings[setting]
-        if not isinstance(value, basestring):
+        if not isinstance(value, six.string_types):
             logger.warning(u'%s is set to %s' % (setting, value))
             return value
         else:

From 71e83635ea062c7b9cfdaca941f57e70628ba5ae Mon Sep 17 00:00:00 2001
From: Ross McFarland <rwmcfa1@gmail.com>
Date: Sun, 12 May 2013 17:59:44 -0700
Subject: [PATCH 1386/2864] remove u prefix from string literal, using
 unicode_literals

---
 pelican/paginator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/paginator.py b/pelican/paginator.py
index a03ef2af..e29a32fe 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -112,7 +112,7 @@ class Page(object):
         setting = "%s_%s" % ('PAGINATION', key)
         value = self.settings[setting]
         if not isinstance(value, six.string_types):
-            logger.warning(u'%s is set to %s' % (setting, value))
+            logger.warning('%s is set to %s' % (setting, value))
             return value
         else:
             context = self.__dict__

From 95890a2a611100a833ee727a4a39d5334b017ddf Mon Sep 17 00:00:00 2001
From: Nathan Yergler <nathan@yergler.net>
Date: Mon, 29 Jul 2013 08:10:28 -0400
Subject: [PATCH 1387/2864] Allow definition of pagination rules by page index.

---
 pelican/paginator.py | 20 ++++++++++++++++++--
 pelican/settings.py  | 15 +++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/pelican/paginator.py b/pelican/paginator.py
index e29a32fe..b5db2d7d 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals, print_function
 import six
 
 # From django.core.paginator
+from collections import namedtuple
 import functools
 import logging
 import os
@@ -11,6 +12,13 @@ from math import ceil
 
 logger = logging.getLogger(__name__)
 
+
+PaginationRule = namedtuple(
+    'PaginationRule',
+    'min_page URL SAVE_AS',
+)
+
+
 class Paginator(object):
     def __init__(self, name, object_list, settings):
         self.name = name
@@ -109,8 +117,16 @@ class Page(object):
         """Returns URL information as defined in settings. Similar to
         URLWrapper._from_settings, but specialized to deal with pagination
         logic."""
-        setting = "%s_%s" % ('PAGINATION', key)
-        value = self.settings[setting]
+
+        rule = None
+
+        # find the last matching pagination rule
+        for p in self.settings['PAGINATION_PATTERNS']:
+            if p.min_page <= self.number:
+                rule = p
+
+        value = getattr(rule, key)
+
         if not isinstance(value, six.string_types):
             logger.warning('%s is set to %s' % (setting, value))
             return value
diff --git a/pelican/settings.py b/pelican/settings.py
index b65a6df7..ff5f4ce4 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -73,8 +73,9 @@ DEFAULT_CONFIG = {
     'TAG_SAVE_AS': os.path.join('tag', '{slug}.html'),
     'AUTHOR_URL': 'author/{slug}.html',
     'AUTHOR_SAVE_AS': os.path.join('author', '{slug}.html'),
-    'PAGINATION_URL': '{name}{number}.html',
-    'PAGINATION_SAVE_AS': '{name}{number}.html',
+    'PAGINATION_PATTERNS': [
+        (0, '{name}{number}.html', '{name}{number}.html'),
+    ],
     'YEAR_ARCHIVE_SAVE_AS': False,
     'MONTH_ARCHIVE_SAVE_AS': False,
     'DAY_ARCHIVE_SAVE_AS': False,
@@ -238,6 +239,16 @@ def configure_settings(settings):
             'http://docs.getpelican.com/en/latest/settings.html#timezone '
             'for more information')
 
+    # fix up pagination rules
+    from pelican.paginator import PaginationRule
+    pagination_rules = [
+        PaginationRule(*r) for r in settings['PAGINATION_PATTERNS']
+    ]
+    settings['PAGINATION_PATTERNS'] = sorted(
+        pagination_rules,
+        key=lambda r: r[0],
+    )
+
     # Save people from accidentally setting a string rather than a list
     path_keys = (
             'ARTICLE_EXCLUDES',

From 30192b2318b71cac718f8e116edc288611701085 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 29 Jul 2013 11:03:14 -0700
Subject: [PATCH 1388/2864] Add fabfile generation to pelican-quickstart

This commit adds optional fabfile.py generation during the
pelican-quickstart process. Reasons include:

* "make" is cumbersome to install on Windows
* Fabric runs in any Python environment
* fabfile is just Python and thus more flexible and extensible

This is an initial implementation and does not currently provide as many
upload options as its Makefile counterpart.

Refs #584.
---
 docs/getting_started.rst              | 83 ++++++++++++++++++++++++---
 pelican/tools/pelican_quickstart.py   | 14 ++++-
 pelican/tools/templates/fabfile.py.in | 47 +++++++++++++++
 3 files changed, 133 insertions(+), 11 deletions(-)
 create mode 100644 pelican/tools/templates/fabfile.py.in

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 383acdc4..b8ffbf43 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -152,21 +152,87 @@ if you plan to create non-chronological content)::
     │   └── (pages)
     ├── output
     ├── develop_server.sh
+    ├── fabfile.py
     ├── Makefile
     ├── pelicanconf.py       # Main settings file
     └── publishconf.py       # Settings to use when ready to publish
 
 The next step is to begin to adding content to the *content* folder that has
-been created for you. (See *Writing articles using Pelican* section below for
-more information about how to format your content.)
+been created for you. (See the **Writing content using Pelican** section below
+for more information about how to format your content.)
 
 Once you have written some content to generate, you can use the ``pelican``
 command to generate your site, which will be placed in the output folder.
-Alternatively, you can use automation tools that "wrap" the ``pelican`` command
-to simplify the process of generating, previewing, and uploading your site. One
-such tool is the ``Makefile`` that's automatically created for you when you use
-``pelican-quickstart`` to create a skeleton project. To use ``make`` to
-generate your site, run::
+
+Automation tools
+================
+
+While the ``pelican`` command is the canonical way to generate your site,
+automation tools can be used to streamline the generation and publication
+flow. One of the questions asked during the ``pelican-quickstart`` process
+described above pertains to whether you want to automate site generation and
+publication. If you answered "yes" to that question, a ``fabfile.py`` and
+``Makefile`` will be generated in the root of your project. These files,
+pre-populated with certain information gleaned from other answers provided
+during the ``pelican-quickstart`` process, are meant as a starting point and
+should be customized to fit your particular needs and usage patterns. If you
+find one or both of these automation tools to be of limited utility, these
+files can deleted at any time and will not affect usage of the canonical
+``pelican`` command.
+
+Following are automation tools that "wrap" the ``pelican`` command and can
+simplify the process of generating, previewing, and uploading your site.
+
+Fabric
+------
+
+The advantage of Fabric_ is that it is written in Python and thus can be used
+in a wide range of environments. The downside is that it must be installed
+separately. Use the following command to install Fabric, prefixing with
+``sudo`` if your environment requires it::
+
+    $ pip install Fabric
+
+Take a moment to open the ``fabfile.py`` file that was generated in your
+project root. You will see a number of commands, any one of which can be
+renamed, removed, and/or customized to your liking. Using the out-of-the-box
+configuration, you can generate your site via::
+
+    $ fab build
+
+If you'd prefer to have Pelican automatically regenerate your site every time a
+change is detected (which is handy when testing locally), use the following
+command instead::
+
+    $ fab regenerate
+
+To serve the generated site so it can be previewed in your browser at
+http://localhost:8000/::
+
+    $ fab serve
+
+If during the ``pelican-quickstart`` process you answered "yes" when asked
+whether you want to upload your site via SSH, you can use the following command
+to publish your site via rsync over SSH::
+
+    $ fab publish
+
+These are just a few of the commands available by default, so feel free to
+explore ``fabfile.py`` and see what other commands are available. More
+importantly, don't hesitate to customize ``fabfile.py`` to suit your specific
+needs and preferences.
+
+Make
+----
+
+A ``Makefile`` is also automatically created for you when you say "yes" to
+the relevant question during the ``pelican-quickstart`` process. The advantage
+of this method is that the ``make`` command is built into most POSIX systems
+and thus doesn't require installing anything else in order to use it. The
+downside is that non-POSIX systems (e.g., Windows) do not include ``make``,
+and installing it on those systems can be a non-trivial task.
+
+If you want to use ``make`` to generate your site, run::
 
     $ make html
 
@@ -177,7 +243,7 @@ command instead::
     $ make regenerate
 
 To serve the generated site so it can be previewed in your browser at
-http://localhost:8000::
+http://localhost:8000/::
 
     $ make serve
 
@@ -484,3 +550,4 @@ listed on the index page nor on any category page.
 
 .. _virtualenv: http://www.virtualenv.org/
 .. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
+.. _Fabric: http://fabfile.org/
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index e62bc5ca..46ba1a82 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -193,10 +193,10 @@ needed by Pelican.
     else:
         CONF['default_pagination'] = False
 
-    mkfile = ask('Do you want to generate a Makefile to easily manage your website?', bool, True)
+    automation = ask('Do you want to generate a Fabfile/Makefile to automate generation and publishing?', bool, True)
     develop = ask('Do you want an auto-reload & simpleHTTP script to assist with theme and site development?', bool, True)
 
-    if mkfile:
+    if automation:
         if ask('Do you want to upload your website using FTP?', answer=bool, default=False):
             CONF['ftp_host'] = ask('What is the hostname of your FTP server?', str_compat, CONF['ftp_host'])
             CONF['ftp_user'] = ask('What is your username on that server?', str_compat, CONF['ftp_user'])
@@ -243,7 +243,15 @@ needed by Pelican.
     except OSError as e:
         print('Error: {0}'.format(e))
 
-    if mkfile:
+    if automation:
+        try:
+            with codecs.open(os.path.join(CONF['basedir'], 'fabfile.py'), 'w', 'utf-8') as fd:
+                for line in get_template('fabfile.py'):
+                    template = string.Template(line)
+                    fd.write(template.safe_substitute(CONF))
+                fd.close()
+        except OSError as e:
+            print('Error: {0}'.format(e))
         try:
             with codecs.open(os.path.join(CONF['basedir'], 'Makefile'), 'w', 'utf-8') as fd:
                 mkfile_template_name = 'Makefile'
diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.in
new file mode 100644
index 00000000..e991b763
--- /dev/null
+++ b/pelican/tools/templates/fabfile.py.in
@@ -0,0 +1,47 @@
+from fabric.api import *
+import fabric.contrib.project as project
+import os
+
+# Local path configuration (can be absolute or relative to fabfile)
+env.deploy_path = 'output'
+
+# Remote server configuration
+production = '$ssh_user@$ssh_host:$ssh_port'
+dest_path = '$ssh_target_dir'
+
+DEPLOY_PATH = env.deploy_path
+
+def clean():
+    if os.path.isdir(DEPLOY_PATH):
+        local('rm -rf {deploy_path}'.format(**env))
+        local('mkdir {deploy_path}'.format(**env))
+
+def build():
+    local('pelican -s pelicanconf.py')
+
+def rebuild():
+    clean()
+    build()
+
+def regenerate():
+    local('pelican -r -s pelicanconf.py')
+
+def serve():
+    local('cd {deploy_path} && python -m SimpleHTTPServer'.format(**env))
+
+def reserve():
+    build()
+    serve()
+
+def preview():
+    local('pelican -s publishconf.py')
+
+@hosts(production)
+def publish():
+    local('pelican -s publishconf.py')
+    project.rsync_project(
+        remote_dir=dest_path,
+        exclude=".DS_Store",
+        local_dir=DEPLOY_PATH.rstrip('/') + '/',
+        delete=True
+    )

From 0e0775b74a1e4131ffa2f38f501458210c365fa3 Mon Sep 17 00:00:00 2001
From: Philipp Klose <me@thehippo.de>
Date: Wed, 31 Jul 2013 22:43:02 +0200
Subject: [PATCH 1389/2864] Fix file endings for examples

reStructured should use reStructured for linked documents. Markdown should use Markdown for linked documents.
---
 docs/getting_started.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index b8ffbf43..ee9e2d17 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -418,8 +418,8 @@ In this example, ``article1.rst`` could look like::
 
     See below intra-site link examples in reStructuredText format.
 
-    `a link relative to content root <|filename|/cat/article2.md>`_
-    `a link relative to current file <|filename|cat/article2.md>`_
+    `a link relative to content root <|filename|/cat/article2.rst>`_
+    `a link relative to current file <|filename|cat/article2.rst>`_
 
 and ``article2.md``::
 
@@ -428,8 +428,8 @@ and ``article2.md``::
 
     See below intra-site link examples in Markdown format.
 
-    [a link relative to content root](|filename|/article1.rst)
-    [a link relative to current file](|filename|../article1.rst)
+    [a link relative to content root](|filename|/article1.md)
+    [a link relative to current file](|filename|../article1.md)
 
 Embedding non-article or non-page content is slightly different in that the
 directories need to be specified in ``pelicanconf.py`` file. The ``images``

From 51dc02f29836bebc3e809640aa5b3aa2d33ba8f9 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Wed, 31 Jul 2013 23:08:42 +0100
Subject: [PATCH 1390/2864] Add documentation for WITH_FUTURE_DATES

Closes #952
---
 docs/settings.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index eb0d028f..9a38d499 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -153,6 +153,8 @@ Setting name (default value)                                            What doe
                                                                         These templates need to use ``DIRECT_TEMPLATES`` setting.
 `ASCIIDOC_OPTIONS` (``[]``)                                             A list of options to pass to AsciiDoc. See the `manpage
                                                                         <http://www.methods.co.nz/asciidoc/manpage.html>`_
+`WITH_FUTURE_DATES` (``True``)                                          If disabled, content with dates in the future will get a
+                                                                        default status of draft.
 =====================================================================   =====================================================================
 
 .. [#] Default is the system locale.

From 9abc08ea9f6c8c58edae77a7c4cb9c8364b2729d Mon Sep 17 00:00:00 2001
From: Nathan Yergler <nathan@eventbrite.com>
Date: Wed, 31 Jul 2013 18:57:21 -0700
Subject: [PATCH 1391/2864] Don't assume that PAGINATION_PATTERNS will always
 be present.

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index ff5f4ce4..59f1354f 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -242,7 +242,7 @@ def configure_settings(settings):
     # fix up pagination rules
     from pelican.paginator import PaginationRule
     pagination_rules = [
-        PaginationRule(*r) for r in settings['PAGINATION_PATTERNS']
+        PaginationRule(*r) for r in settings.get('PAGINATION_PATTERNS', [])
     ]
     settings['PAGINATION_PATTERNS'] = sorted(
         pagination_rules,

From 89034f8b3f099fd00240548bb6f5a515ea298ecc Mon Sep 17 00:00:00 2001
From: Russ Webber <russkel@look-me-up-on-github>
Date: Thu, 18 Jul 2013 10:36:44 +0800
Subject: [PATCH 1392/2864] added THEME_STATIC_DIR setting

The theme static output directory path is now customisable via settings.
i.e. you can now use 'assets' instead of 'theme'.
---
 docs/settings.rst                            | 3 +++
 pelican/generators.py                        | 3 ++-
 pelican/settings.py                          | 1 +
 pelican/themes/notmyidea/templates/base.html | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9a38d499..a4299be6 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -547,6 +547,9 @@ Setting name (default value)                        What does it do?
                                                     or absolute path to a theme folder, or the name of a
                                                     default theme or a theme installed via
                                                     ``pelican-themes`` (see below).
+`THEME_STATIC_DIR` (``'theme'``)                    Destination directory in the output path where
+                                                    Pelican will place the files collected from
+                                                    `THEME_STATIC_PATHS`. Default is `theme`.
 `THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
                                                     value is `static`, but if your theme has
                                                     other static paths, you can put them here.
diff --git a/pelican/generators.py b/pelican/generators.py
index 0dc3667f..166ff616 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -564,7 +564,8 @@ class StaticGenerator(Generator):
 
     def generate_output(self, writer):
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
-                         'theme', self.output_path, os.curdir)
+                         self.settings['THEME_STATIC_DIR'], self.output_path,
+                         os.curdir)
         # copy all Static files
         for sc in self.staticfiles:
             source_path = os.path.join(self.path, sc.source_path)
diff --git a/pelican/settings.py b/pelican/settings.py
index 01203504..e631fab3 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -35,6 +35,7 @@ DEFAULT_CONFIG = {
     'OUTPUT_PATH': 'output',
     'MARKUP': ('rst', 'md'),
     'STATIC_PATHS': ['images', ],
+    'THEME_STATIC_DIR': 'theme',
     'THEME_STATIC_PATHS': ['static', ],
     'FEED_ALL_ATOM': os.path.join('feeds', 'all.atom.xml'),
     'CATEGORY_FEED_ATOM': os.path.join('feeds', '%s.atom.xml'),
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 9bf4b12b..a9edad6d 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -3,7 +3,7 @@
 <head>
         <meta charset="utf-8">
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
-        <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}">
+        <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}">
         {% if FEED_ALL_ATOM %}
         <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
         {% endif %}

From 74c7c72fb3dbe481bd891f447eb1e4056bcbb9a4 Mon Sep 17 00:00:00 2001
From: Nathan Yergler <nathan@eventbrite.com>
Date: Wed, 31 Jul 2013 21:31:08 -0700
Subject: [PATCH 1393/2864] Use six.u instead of unicode.

---
 pelican/paginator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/paginator.py b/pelican/paginator.py
index b5db2d7d..39ea0e3a 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -138,7 +138,7 @@ class Page(object):
                 # no page numbers on the first page
                 context['number'] = ''
                 context['number_sep'] = ''
-            ret = unicode(value).format(**context)
+            ret = six.u(value).format(**context)
             if ret[0] == '/':
                 ret = ret[1:]
             return ret

From 4fa9184b01642d1c2738db627f57353134ca65e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Thu, 1 Aug 2013 14:38:00 +0200
Subject: [PATCH 1394/2864] Start a section about plugin recipes in the docs

---
 docs/plugins.rst | 66 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 9bf08ff3..93307afb 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -123,3 +123,69 @@ request if you need them!
    static_generate_context     static_generator_context
    static_generate_preread     static_generator_preread
    ==========================  ===========================
+
+Recipes
+=======
+
+We eventually realised some of the recipes to create plugins would be best
+shared in the documentation somewhere, so here they are!
+
+How to create a new reader
+--------------------------
+
+One thing you might want is to add the support for your very own input
+format. While it might make sense to add this feature in pelican core, we
+wisely chose to avoid this situation, and have the different readers defined in
+plugins.
+
+The rationale behind this choice is mainly that plugins are really easy to
+write and don't slow down pelican itself when they're not active.
+
+No more talking, here is the example::
+
+    from pelican import signals
+    from pelican.readers import EXTENSIONS, Reader
+
+    # Create a new reader class, inheriting from the pelican.reader.Reader
+    class NewReader(Reader):
+        enabled = True  # Yeah, you probably want that :-)
+
+        # The list of extensions you want this reader to match with.
+        # In the case multiple readers use the same extensions, the latest will
+        # win (so the one you're defining here, most probably).
+        file_extensions = ['yeah']
+
+        # You need to have a read method, which takes a filename and returns
+        # some content and the associated metadata.
+        def read(self, filename):
+            metadata = {'title': 'Oh yeah',
+                        'category': 'Foo',
+                        'date': '2012-12-01'}
+
+            parsed = {}
+            for key, value in metadata.items():
+                parsed[key] = self.process_metadata(key, value)
+
+            return "Some content", parsed
+
+    def add_reader(arg):
+        EXTENSIONS['yeah'] = NewReader
+
+    # this is how pelican works.
+    def register():
+        signals.initialized.connect(add_reader)
+
+
+Adding a new generator
+----------------------
+
+Adding a new generator is also really easy. You might want to have a look at
+:doc:`internals` for more information on how to create your own generator.
+
+::
+
+    def get_generators(generators):
+        # define a new generator here if you need to
+        return generators
+
+    signals.get_generators.connect(get_generators)

From 4c1b5c342947a4fdbd63dcc99c2bb0d487c6b4ec Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 1 Aug 2013 15:13:32 -0700
Subject: [PATCH 1395/2864] Correct URL for pip install editable in docs

Refs # 975
---
 docs/getting_started.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index ee9e2d17..d09e40c7 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -41,7 +41,7 @@ method::
 If you have Git installed and prefer to install the latest bleeding-edge
 version of Pelican rather than a stable release, use the following command::
 
-    $ pip install -e git://github.com/getpelican/pelican#egg=pelican
+    $ pip install -e git+https://github.com/getpelican/pelican.git#egg=pelican
 
 If you plan on using Markdown as a markup format, you'll need to install the
 Markdown library as well::

From 03e9d0182d03779632d96bbce2e9f67d32e4eeaf Mon Sep 17 00:00:00 2001
From: karl <karl+github@la-grange.net>
Date: Sat, 3 Aug 2013 00:31:43 -0400
Subject: [PATCH 1396/2864] Fixing documentation according to  Issue #362.

The documentation as it is right now produces a  CRITICAL: 'article' is
undefined
---
 docs/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index a8043e07..8eafba3f 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -92,7 +92,7 @@ For reStructuredText, this metadata should of course be prefixed with a colon::
 
 This metadata can then be accessed in the template::
 
-    {% if article.modified %}
+    {% if article and article.modified %}
     Last modified: {{ article.modified }}
     {% endif %}
 

From 6a0d19ef5c22ad8434f70bc650944419dcd98f8f Mon Sep 17 00:00:00 2001
From: karl <karl+github@la-grange.net>
Date: Sat, 3 Aug 2013 12:47:44 -0400
Subject: [PATCH 1397/2864] Adding context to the documentation for metadata

Giving a longer description Thanks to justin mayer for #995
---
 docs/faq.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 8eafba3f..bb348d45 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -90,12 +90,16 @@ For reStructuredText, this metadata should of course be prefixed with a colon::
 
     :Modified: 2012-08-08
 
-This metadata can then be accessed in the template::
+This metadata can then be accessed in templates such as `article.html` via::
 
-    {% if article and article.modified %}
+    {% if article.modified %}
     Last modified: {{ article.modified }}
     {% endif %}
 
+If you want to include metadata in templates outside the article context (e.g., `base.html`), the `if` statement should instead be:
+
+    {% if article and article.modified %}
+
 How do I assign custom templates on a per-page basis?
 =====================================================
 

From 92f5c06ba63e06964ea8a444f606fdd7683bff0b Mon Sep 17 00:00:00 2001
From: Nicholas Kuechler <nkuechler@gmail.com>
Date: Sat, 3 Aug 2013 14:58:52 -0500
Subject: [PATCH 1398/2864] Group PDF related settings together.

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index e631fab3..7a7f091a 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -45,7 +45,6 @@ DEFAULT_CONFIG = {
     'SITENAME': 'A Pelican Blog',
     'DISPLAY_PAGES_ON_MENU': True,
     'DISPLAY_CATEGORIES_ON_MENU': True,
-    'PDF_GENERATOR': False,
     'OUTPUT_SOURCES': False,
     'OUTPUT_SOURCES_EXTENSION': '.text',
     'USE_FOLDER_AS_CATEGORY': True,
@@ -66,6 +65,7 @@ DEFAULT_CONFIG = {
     'PAGE_LANG_SAVE_AS': os.path.join('pages', '{slug}-{lang}.html'),
     'STATIC_URL': '{path}',
     'STATIC_SAVE_AS': '{path}',
+    'PDF_GENERATOR': False,
     'PDF_STYLE_PATH': '',
     'PDF_STYLE': 'twelvepoint',
     'CATEGORY_URL': 'category/{slug}.html',

From 5ffbf907decd2bea80b9b41803b2ac240267da62 Mon Sep 17 00:00:00 2001
From: Nathan Yergler <nathan@yergler.net>
Date: Sat, 3 Aug 2013 13:49:43 -0700
Subject: [PATCH 1399/2864] Create new formatting context dict instead of using
 self.__dict__

Using self.__dict__ is fine, but when its mutated it changes the
object's state. Creating a new dict avoids needing to think about
that, and doesn't introduce Python 3 issues (ie, where self.number is
accidentally set to '').
---
 pelican/paginator.py | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/pelican/paginator.py b/pelican/paginator.py
index 39ea0e3a..df8606ec 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -125,23 +125,35 @@ class Page(object):
             if p.min_page <= self.number:
                 rule = p
 
-        value = getattr(rule, key)
+        if not rule:
+            return ''
 
-        if not isinstance(value, six.string_types):
-            logger.warning('%s is set to %s' % (setting, value))
-            return value
-        else:
-            context = self.__dict__
-            context['base_name'] = os.path.dirname(self.name)
-            context['number_sep'] = '/'
-            if self.number == 1:
-                # no page numbers on the first page
-                context['number'] = ''
-                context['number_sep'] = ''
-            ret = six.u(value).format(**context)
-            if ret[0] == '/':
-                ret = ret[1:]
-            return ret
+        prop_value = getattr(rule, key)
+
+        if not isinstance(prop_value, six.string_types):
+            logger.warning('%s is set to %s' % (key, prop_value))
+            return prop_value
+
+        # URL or SAVE_AS is a string, format it with a controlled context
+        context = {
+            'name': self.name,
+            'object_list': self.object_list,
+            'number': self.number,
+            'paginator': self.paginator,
+            'settings': self.settings,
+            'base_name': os.path.dirname(self.name),
+            'number_sep': '/',
+        }
+
+        if self.number == 1:
+            # no page numbers on the first page
+            context['number'] = ''
+            context['number_sep'] = ''
+
+        ret = prop_value.format(**context)
+        if ret[0] == '/':
+            ret = ret[1:]
+        return ret
 
     url = property(functools.partial(_from_settings, key='URL'))
     save_as = property(functools.partial(_from_settings, key='SAVE_AS'))

From 50ff7ce89f7f68c9fe8e4de75f4a06334695794d Mon Sep 17 00:00:00 2001
From: Nathan Yergler <nathan@yergler.net>
Date: Sat, 3 Aug 2013 14:04:58 -0700
Subject: [PATCH 1400/2864] Fall back to the default PAGINATION PATTERNS when
 none specified.

---
 pelican/settings.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 59f1354f..b8e634ca 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -242,7 +242,10 @@ def configure_settings(settings):
     # fix up pagination rules
     from pelican.paginator import PaginationRule
     pagination_rules = [
-        PaginationRule(*r) for r in settings.get('PAGINATION_PATTERNS', [])
+        PaginationRule(*r) for r in settings.get(
+            'PAGINATION_PATTERNS',
+            DEFAULT_CONFIG['PAGINATION_PATTERNS'],
+        )
     ]
     settings['PAGINATION_PATTERNS'] = sorted(
         pagination_rules,

From d61ef0c66ce6f6db4568f34662f7fd00f8dae6d2 Mon Sep 17 00:00:00 2001
From: Nathan Yergler <nathan@yergler.net>
Date: Sat, 3 Aug 2013 14:06:16 -0700
Subject: [PATCH 1401/2864] Adding basic documentation for PAGINATION_PATTERNS.

---
 docs/settings.rst | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index eb0d028f..548e9cec 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -477,8 +477,32 @@ Setting name (default value)                        What does it do?
 `DEFAULT_PAGINATION` (``False``)                    The maximum number of articles to include on a
                                                     page, not including orphans. False to disable
                                                     pagination.
+`PAGINATION_PATTERNS`                               A set of patterns that are used to determine advanced
+                                                    pagination output.
 ================================================    =====================================================
 
+Using Pagination Patterns
+-------------------------
+
+The ``PAGINATION_PATTERNS`` setting can be used to configure where
+subsequent pages are created. The setting is a sequence of three
+element tuples, where each tuple consists of::
+
+  (minimum page, URL setting, SAVE_AS setting,)
+
+For example, if you wanted the first page to just be ``/``, and the
+second (and subsequent) pages to be ``/page/2/``, you would set
+``PAGINATION_PATTERNS`` as follows::
+
+  PAGINATION_PATTERNS = (
+      (1, '{base_name}/', '{base_name}/index.html'),
+      (2, '{base_name}/page/{number}/', '{base_name}/page/{number}/index.html'),
+  )
+
+This would cause the first page to be written to
+``{base_name}/index.html``, and subsequent ones would be written into
+``page/{number}`` directories.
+
 Tag cloud
 =========
 

From 76fa4576547cb01d4bfecbd7d40cd70dca7b44d2 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 3 Aug 2013 16:17:26 -0700
Subject: [PATCH 1402/2864] Normalize whitespace via lstrip Jinja parameter

This adds the lstrip_blocks Jinja parameter and removes unnecessary
whitespace from a few notmyidea templates.

Note: The lstrip_blocks parameter requires Jinja 2.7+, which has been
noted in Pelican's setup.py.

Credit for this commit goes entirely to Russ Webber, who has earned my
eternal thanks for discovering and applying this useful Jinja parameter.

Refs #969
---
 pelican/generators.py                         |   1 +
 .../basic/a-markdown-powered-article.html     |  36 ++---
 pelican/tests/output/basic/archives.html      |  28 ++--
 pelican/tests/output/basic/article-1.html     |  36 ++---
 pelican/tests/output/basic/article-2.html     |  36 ++---
 pelican/tests/output/basic/article-3.html     |  36 ++---
 .../output/basic/author/alexis-metaireau.html |  62 ++++---
 pelican/tests/output/basic/categories.html    |  28 ++--
 pelican/tests/output/basic/category/bar.html  |  46 +++---
 pelican/tests/output/basic/category/cat1.html |  82 +++++-----
 pelican/tests/output/basic/category/misc.html |  76 ++++-----
 pelican/tests/output/basic/category/yeah.html |  46 +++---
 .../basic/filename_metadata-example.html      |  36 ++---
 pelican/tests/output/basic/index.html         | 152 ++++++++----------
 pelican/tests/output/basic/oh-yeah.html       |  38 ++---
 .../tests/output/basic/override/index.html    |  33 ++--
 .../pages/this-is-a-test-hidden-page.html     |  33 ++--
 .../basic/pages/this-is-a-test-page.html      |  33 ++--
 .../tests/output/basic/second-article-fr.html |  42 ++---
 .../tests/output/basic/second-article.html    |  42 ++---
 pelican/tests/output/basic/tag/bar.html       |  80 +++++----
 pelican/tests/output/basic/tag/baz.html       |  50 +++---
 pelican/tests/output/basic/tag/foo.html       |  66 ++++----
 pelican/tests/output/basic/tag/foobar.html    |  46 +++---
 pelican/tests/output/basic/tag/oh.html        |  46 +++---
 pelican/tests/output/basic/tag/yeah.html      |  46 +++---
 .../output/basic/this-is-a-super-article.html |  38 ++---
 pelican/tests/output/basic/unbelievable.html  |  36 ++---
 .../custom/a-markdown-powered-article.html    |  66 ++++----
 pelican/tests/output/custom/archives.html     |  54 +++----
 pelican/tests/output/custom/article-1.html    |  66 ++++----
 pelican/tests/output/custom/article-2.html    |  66 ++++----
 pelican/tests/output/custom/article-3.html    |  66 ++++----
 .../custom/author/alexis-metaireau.html       | 124 +++++++-------
 .../custom/author/alexis-metaireau2.html      | 139 ++++++++--------
 .../custom/author/alexis-metaireau3.html      |  83 +++++-----
 pelican/tests/output/custom/categories.html   |  54 +++----
 pelican/tests/output/custom/category/bar.html |  84 +++++-----
 .../tests/output/custom/category/cat1.html    | 122 +++++++-------
 .../tests/output/custom/category/misc.html    | 114 +++++++------
 .../tests/output/custom/category/yeah.html    |  78 +++++----
 .../output/custom/drafts/a-draft-article.html |  64 ++++----
 .../custom/filename_metadata-example.html     |  66 ++++----
 pelican/tests/output/custom/index.html        | 130 +++++++--------
 pelican/tests/output/custom/index2.html       | 133 +++++++--------
 pelican/tests/output/custom/index3.html       |  83 +++++-----
 .../tests/output/custom/jinja2_template.html  |  54 +++----
 pelican/tests/output/custom/oh-yeah-fr.html   |  72 ++++-----
 pelican/tests/output/custom/oh-yeah.html      |  72 ++++-----
 .../tests/output/custom/override/index.html   |  59 ++++---
 .../pages/this-is-a-test-hidden-page.html     |  59 ++++---
 .../custom/pages/this-is-a-test-page.html     |  59 ++++---
 .../output/custom/second-article-fr.html      |  72 ++++-----
 .../tests/output/custom/second-article.html   |  72 ++++-----
 pelican/tests/output/custom/tag/bar.html      | 120 +++++++-------
 pelican/tests/output/custom/tag/baz.html      |  84 +++++-----
 pelican/tests/output/custom/tag/foo.html      | 100 ++++++------
 pelican/tests/output/custom/tag/foobar.html   |  78 +++++----
 pelican/tests/output/custom/tag/oh.html       |  84 +++++-----
 pelican/tests/output/custom/tag/yeah.html     |  84 +++++-----
 .../custom/this-is-a-super-article.html       |  66 ++++----
 pelican/tests/output/custom/unbelievable.html |  66 ++++----
 pelican/themes/notmyidea/templates/index.html |  16 +-
 pelican/themes/notmyidea/templates/page.html  |   4 +-
 .../notmyidea/templates/translations.html     |   2 +-
 setup.py                                      |   2 +-
 66 files changed, 2004 insertions(+), 2143 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 166ff616..13909743 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -56,6 +56,7 @@ class Generator(object):
                                          "themes", "simple", "templates"))
         self.env = Environment(
             trim_blocks=True,
+            lstrip_blocks=True,
             loader=ChoiceLoader([
                 FileSystemLoader(self._templates_path),
                 simple_loader,  # implicit inheritance
diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 29c6d0d6..6f854ae4 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,46 +15,46 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/a-markdown-powered-article.html" rel="bookmark"
            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
 <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
 <a href="/unbelievable.html">a file-relative link to unbelievable</a></p>
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 9edb3c1b..7a10cc9d 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,15 +15,15 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
 <h1>Archives for A Pelican Blog</h1>
 
 <dl>
@@ -48,14 +48,14 @@
 </dl>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index eee7adfe..3d55751d 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Article 1</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,45 +15,45 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/article-1.html" rel="bookmark"
            title="Permalink to Article 1">Article 1</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 1</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 5449a8be..4ae3e2f3 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Article 2</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,45 +15,45 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/article-2.html" rel="bookmark"
            title="Permalink to Article 2">Article 2</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 2</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 55449726..9b978ec0 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Article 3</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,45 +15,45 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/article-3.html" rel="bookmark"
            title="Permalink to Article 3">Article 3</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 3</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 1c67b6fa..04a89930 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - Alexis Métaireau</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,27 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -46,48 +44,46 @@ YEAH !</p>
 <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="/this-is-a-super-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 7a85b52a..f1541892 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,29 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <ul>
+<ul>
     <li><a href="/category/bar.html">bar</a></li>
     <li><a href="/category/cat1.html">cat1</a></li>
     <li><a href="/category/misc.html">misc</a></li>
     <li><a href="/category/yeah.html">yeah</a></li>
 </ul>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 78894c94..f272dd2b 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - bar</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,27 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li class="active"><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -46,18 +44,18 @@ YEAH !</p>
 <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 43226146..4e2f0f5a 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - cat1</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,112 +15,104 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
 <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
 <a href="/unbelievable.html">a file-relative link to unbelievable</a></p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="/article-1.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="/article-2.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="/article-3.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 4aebcdf1..fce85481 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - misc</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,93 +15,87 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
                 </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href="/second-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="/unbelievable.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index b6f59771..b7c383fa 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - yeah</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,27 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -52,18 +50,18 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 4ceef81f..a9f548a5 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,45 +15,45 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/filename_metadata-example.html" rel="bookmark"
            title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Some cool stuff!</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 49c1883c..b10b479a 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,192 +15,176 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
                 </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href="/second-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/a-markdown-powered-article.html" rel="bookmark"
                            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
 <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
 <a href="/unbelievable.html">a file-relative link to unbelievable</a></p>
                 <a class="readmore" href="/a-markdown-powered-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="/article-1.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="/article-2.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="/article-3.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="/this-is-a-super-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -210,43 +194,41 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="/oh-yeah.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="/unbelievable.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 498e9cac..cb29ea80 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,32 +15,32 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li class="active"><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/oh-yeah.html" rel="bookmark"
            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -50,18 +50,18 @@ YEAH !</p>
 </div>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 2cc639d2..ff6775cf 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Override url/save_as</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,31 +15,30 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li class="active"><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li class="active"><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
+<section id="content" class="body">
     <h1 class="entry-title">Override url/save_as</h1>
-        
-        <p>Test page which overrides save_as and url so that this page will be generated
+    
+    <p>Test page which overrides save_as and url so that this page will be generated
 at a custom location.</p>
 
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index cd582b96..e4a18249 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>This is a test hidden page</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,31 +15,30 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
+<section id="content" class="body">
     <h1 class="entry-title">This is a test hidden page</h1>
-        
-        <p>This is great for things like error(404) pages
+    
+    <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index 8ba85e1d..d0e11cfc 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>This is a test page</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,31 +15,30 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li class="active"><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li class="active"><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
+<section id="content" class="body">
     <h1 class="entry-title">This is a test page</h1>
-        
-        <p>Just an image.</p>
+    
+    <p>Just an image.</p>
 <img alt="alternate text" src="|filename|/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 44965a76..ca4abcfc 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Deuxième article</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,47 +15,47 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/second-article-fr.html" rel="bookmark"
            title="Permalink to Deuxième article">Deuxième article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article.html">en</a>
-    
+<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+        <a href="/second-article.html">en</a>
+
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 780d9b20..7008b847 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Second article</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,47 +15,47 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/second-article.html" rel="bookmark"
            title="Permalink to Second article">Second article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index e23071e8..80d2d212 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - bar</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,81 +15,75 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="/this-is-a-super-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -99,19 +93,19 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="/oh-yeah.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index e429b6d8..6c25194d 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - baz</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,43 +15,41 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 17fac77a..87372eb6 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - foo</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,73 +15,69 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="/this-is-a-super-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index cb8dfec2..4812467f 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - foobar</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,27 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -52,18 +50,18 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index f79e6e0e..47ef8946 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - oh</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,27 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -46,18 +44,18 @@ YEAH !</p>
 <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index dc3c1212..47f8076a 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - yeah</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,27 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -46,18 +44,18 @@ YEAH !</p>
 <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 85ad0ad8..e472a8e2 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>This is a super article !</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,32 +15,32 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li><a href="/category/misc.html">misc</a></li>
-                                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/this-is-a-super-article.html" rel="bookmark"
            title="Permalink to This is a super article !">This is a super article !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -56,18 +56,18 @@
 </div>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 3cc9a557..849b4d78 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,47 +15,47 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="/category/bar.html">bar</a></li>
-                                    <li><a href="/category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/unbelievable.html" rel="bookmark"
            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 6a2f1fc5..c5fca991 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,38 +19,38 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./a-markdown-powered-article.html" rel="bookmark"
            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
 <p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
 <a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -63,33 +63,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index b1704bdb..077c1268 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,15 +19,15 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
 <h1>Archives for Alexis' log</h1>
 
 <dl>
@@ -52,29 +52,29 @@
 </dl>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index c77bd4cf..80f1ceaf 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Article 1</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,37 +19,37 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./article-1.html" rel="bookmark"
            title="Permalink to Article 1">Article 1</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 1</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -62,33 +62,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index f93b8a85..8511afc8 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Article 2</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,37 +19,37 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./article-2.html" rel="bookmark"
            title="Permalink to Article 2">Article 2</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 2</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -62,33 +62,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index c87abf66..305359b9 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Article 3</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,37 +19,37 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./article-3.html" rel="bookmark"
            title="Permalink to Article 3">Article 3</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 3</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -62,33 +62,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index dd699031..e732fdcc 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,143 +19,135 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
 <p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
 <a href="../unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="../article-1.html">read more</a>
-                <p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="../article-2.html">read more</a>
-                <p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="../article-3.html">read more</a>
-                <p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 3
-            <a href="../author/alexis-metaireau2.html">&raquo;</a>
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 3
+        <a href="../author/alexis-metaireau2.html">&raquo;</a>
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index be78ff62..d984d5e7 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,64 +19,59 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                 
-                            <section id="content" class="body">
+                <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../filename_metadata-example.html" rel="bookmark"
                            title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Some cool stuff!</p>
 
                 <a class="readmore" href="../filename_metadata-example.html">read more</a>
-                <p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
-            <a href="../oh-yeah-fr.html">fr</a>
-    
+<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations:
+        <a href="../oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -85,92 +80,88 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
-                <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
-    
+<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
+        <a href="../second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href="../second-article.html">read more</a>
-                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="../this-is-a-super-article.html">read more</a>
-                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-            <a href="../author/alexis-metaireau.html">&laquo;</a>
-        Page 2 / 3
-            <a href="../author/alexis-metaireau3.html">&raquo;</a>
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+        <a href="../author/alexis-metaireau.html">&laquo;</a>
+    Page 2 / 3
+        <a href="../author/alexis-metaireau3.html">&raquo;</a>
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index bc13ee21..bfb02d92 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,74 +19,71 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                 
-                            <section id="content" class="body">
+                <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
-                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-            <a href="../author/alexis-metaireau2.html">&laquo;</a>
-        Page 3 / 3
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+        <a href="../author/alexis-metaireau2.html">&laquo;</a>
+    Page 3 / 3
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index ddbc1832..76f7aaca 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,44 +19,44 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <ul>
+<ul>
     <li><a href="./category/yeah.html">yeah</a></li>
     <li><a href="./category/misc.html">misc</a></li>
     <li><a href="./category/cat1.html">cat1</a></li>
     <li><a href="./category/bar.html">bar</a></li>
 </ul>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 4198d868..71ca6213 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,32 +19,30 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
-            <a href="../oh-yeah-fr.html">fr</a>
-    
+<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations:
+        <a href="../oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -52,36 +50,36 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 50a7a80b..e91ff166 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - cat1</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,142 +19,134 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li class="active"><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li class="active"><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
 <p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
 <a href="../unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="../article-1.html">read more</a>
-                <p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="../article-2.html">read more</a>
-                <p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="../article-3.html">read more</a>
-                <p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 1
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index f2afbaeb..f87abede 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - misc</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,120 +19,114 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
 <p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
-    
+<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
+        <a href="../second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href="../second-article.html">read more</a>
-                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
-                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 1
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index fa3e018f..1a5db423 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,29 +19,27 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li class="active"><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -56,36 +54,36 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
 <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 40854732..0bfbc1d6 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>A draft article</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,64 +19,64 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="../a-draft-article.html" rel="bookmark"
            title="Permalink to A draft article">A draft article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
                 Fri 02 March 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
 listed anywhere else.</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index db0e2b19..a9c0f5c1 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,37 +19,37 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./filename_metadata-example.html" rel="bookmark"
            title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Some cool stuff!</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -62,33 +62,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 68f51f06..92aef088 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,145 +19,137 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
 <p>There are <a href="./filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="./second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
-            <a href="./second-article-fr.html">fr</a>
-    
+<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations:
+        <a href="./second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href="./second-article.html">read more</a>
-                <p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="./a-markdown-powered-article.html" rel="bookmark"
                            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
 <p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
 <a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
-                <p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="./article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="./article-1.html">read more</a>
-                <p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 3
-            <a href="./index2.html">&raquo;</a>
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 3
+        <a href="./index2.html">&raquo;</a>
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index e85dd580..2355c7a1 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,115 +19,106 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                 
-                            <section id="content" class="body">
+                <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="./article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="./article-2.html">read more</a>
-                <p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="./article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="./article-3.html">read more</a>
-                <p>There are <a href="./article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="./this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/yeah.html">yeah</a>. </p>
+<p>In <a href="./category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="./this-is-a-super-article.html">read more</a>
-                <p>There are <a href="./this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="./oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: 
-            <a href="./oh-yeah-fr.html">fr</a>
-    
+<p>In <a href="./category/bar.html">bar</a>. </p>
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations:
+        <a href="./oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -136,39 +127,39 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="./oh-yeah.html">read more</a>
-                <p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-            <a href="./index.html">&laquo;</a>
-        Page 2 / 3
-            <a href="./index3.html">&raquo;</a>
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+        <a href="./index.html">&laquo;</a>
+    Page 2 / 3
+        <a href="./index3.html">&raquo;</a>
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index af973106..8121e987 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,74 +19,71 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                 
-                            <section id="content" class="body">
+                <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="./unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="./unbelievable.html">read more</a>
-                <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-            <a href="./index2.html">&laquo;</a>
-        Page 3 / 3
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+        <a href="./index2.html">&laquo;</a>
+    Page 3 / 3
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index fcd60de6..0f0eee83 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,41 +19,41 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        
+
 Some text
 
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index f18d3f07..2590eb3b 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Trop bien !</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,39 +19,39 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./oh-yeah-fr.html" rel="bookmark"
            title="Permalink to Trop bien !">Trop bien !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
                 Fri 02 March 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
-Translations: 
-            <a href="./oh-yeah.html">en</a>
-    
+<p>In <a href="./category/misc.html">misc</a>. </p>
+Translations:
+        <a href="./oh-yeah.html">en</a>
+
 </footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -64,33 +64,33 @@ Translations:
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index c0e77d00..d1c70eeb 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,35 +19,35 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./oh-yeah.html" rel="bookmark"
            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: 
-            <a href="./oh-yeah-fr.html">fr</a>
-    
+<p>In <a href="./category/bar.html">bar</a>. </p>
+<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations:
+        <a href="./oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -56,7 +56,7 @@ YEAH !</p>
 </div>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -69,33 +69,33 @@ YEAH !</p>
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index ca8490d6..1042dbb0 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Override url/save_as</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,46 +19,45 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li class="active"><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li class="active"><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
+<section id="content" class="body">
     <h1 class="entry-title">Override url/save_as</h1>
-        
-        <p>Test page which overrides save_as and url so that this page will be generated
+    
+    <p>Test page which overrides save_as and url so that this page will be generated
 at a custom location.</p>
 
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 89275001..d9b3851c 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>This is a test hidden page</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,46 +19,45 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
+<section id="content" class="body">
     <h1 class="entry-title">This is a test hidden page</h1>
-        
-        <p>This is great for things like error(404) pages
+    
+    <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index d969d152..d6dedd9a 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>This is a test page</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,46 +19,45 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li class="active"><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li class="active"><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-<section id="content" class="body">    
+<section id="content" class="body">
     <h1 class="entry-title">This is a test page</h1>
-        
-        <p>Just an image.</p>
+    
+    <p>Just an image.</p>
 <img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 16ca3cc9..0ac5c01c 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Deuxième article</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,39 +19,39 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./second-article-fr.html" rel="bookmark"
            title="Permalink to Deuxième article">Deuxième article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
-            <a href="./second-article.html">en</a>
-    
+<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations:
+        <a href="./second-article.html">en</a>
+
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -64,33 +64,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 4740eded..289a6308 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Second article</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,39 +19,39 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./second-article.html" rel="bookmark"
            title="Permalink to Second article">Second article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
-            <a href="./second-article-fr.html">fr</a>
-    
+<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations:
+        <a href="./second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -64,33 +64,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 5f26883b..2f6a1016 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,87 +19,81 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
-    
+<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
+        <a href="../second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="../this-is-a-super-article.html">read more</a>
-                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
-            <a href="../oh-yeah-fr.html">fr</a>
-    
+<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations:
+        <a href="../oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -108,37 +102,37 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
-                <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 1
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 46aa6095..cf4fb3f6 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - baz</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,64 +19,62 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
-    
+<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
+        <a href="../second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 04d37f1b..b6c741bd 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - foo</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,94 +19,90 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
-    
+<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
+        <a href="../second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
 
-                 
-                        <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="../this-is-a-super-article.html">read more</a>
-                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 1
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 961e381a..cdecccd7 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - foobar</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,29 +19,27 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -56,36 +54,36 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
 <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 5452f4d3..d3bde1dc 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - oh</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,32 +19,30 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
-            <a href="../oh-yeah-fr.html">fr</a>
-    
+<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations:
+        <a href="../oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -52,36 +50,36 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index d71c8a37..ba6089f0 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,32 +19,30 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="../category/yeah.html">yeah</a></li>
-                                    <li><a href="../category/misc.html">misc</a></li>
-                                    <li><a href="../category/cat1.html">cat1</a></li>
-                                    <li><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
-            <a href="../oh-yeah-fr.html">fr</a>
-    
+<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations:
+        <a href="../oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -52,36 +50,36 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 8d9df71b..d1faa0ca 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>This is a super article !</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,32 +19,32 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
-                                    <li><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./this-is-a-super-article.html" rel="bookmark"
            title="Permalink to This is a super article !">This is a super article !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/yeah.html">yeah</a>. </p>
+<p>In <a href="./category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -60,7 +60,7 @@
 </div>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -73,33 +73,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index ee743526..efd049f0 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,39 +19,39 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li><a href="./category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li><a href="./category/cat1.html">cat1</a></li>
-                                    <li><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./unbelievable.html" rel="bookmark"
            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -64,33 +64,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 8752a6b6..2d45bb2a 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -1,14 +1,14 @@
 {% extends "base.html" %}
 {% block content_title %}{% endblock %}
-{% block content %}        
+{% block content %}
 {% if articles %}
-    {% for article in articles_page.object_list %}        
+    {% for article in articles_page.object_list %}
 
         {# First item #}
         {% if loop.first and not articles_page.has_previous() %}
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1> 
+                    <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
                     {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
                 </article>
                 {% if loop.length == 1 %}
@@ -22,17 +22,17 @@
                     <ol id="posts-list" class="hfeed">
             {% endif %}
         {# other items #}
-        {% else %} 
+        {% else %}
             {% if loop.first and articles_page.has_previous %}
                 <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
             {% endif %}
-            <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
                            title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
                 {% include 'article_infos.html' %}
                 {{ article.summary }}
@@ -43,7 +43,7 @@
         {% endif %}
         {% if loop.last %}
             </ol><!-- /#posts-list -->
-            {% if loop.last and (articles_page.has_previous() 
+            {% if loop.last and (articles_page.has_previous()
             or not articles_page.has_previous() and loop.length > 1) %}
                 {% include 'pagination.html' %}
             {% endif %}
@@ -51,7 +51,7 @@
         {% endif %}
     {% endfor %}
 {% else %}
-<section id="content" class="body">    
+<section id="content" class="body">
 <h2>Pages</h2>
     {% for page in PAGES %}
         <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
diff --git a/pelican/themes/notmyidea/templates/page.html b/pelican/themes/notmyidea/templates/page.html
index 60409d5c..5ac50b66 100644
--- a/pelican/themes/notmyidea/templates/page.html
+++ b/pelican/themes/notmyidea/templates/page.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{ page.title }}{% endblock %}
-{% block content %}        
-<section id="content" class="body">    
+{% block content %}
+<section id="content" class="body">
     <h1 class="entry-title">{{ page.title }}</h1>
     {% import 'translations.html' as translations with context %}
     {{ translations.translations_for(page) }}
diff --git a/pelican/themes/notmyidea/templates/translations.html b/pelican/themes/notmyidea/templates/translations.html
index ca03a2c9..7894bb07 100644
--- a/pelican/themes/notmyidea/templates/translations.html
+++ b/pelican/themes/notmyidea/templates/translations.html
@@ -1,6 +1,6 @@
 {% macro translations_for(article) %}
 {% if article.translations %}
-Translations: 
+Translations:
     {% for translation in article.translations %}
         <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
     {% endfor %}
diff --git a/setup.py b/setup.py
index 83beb461..69f76b3c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.6', 'pygments', 'docutils',
+requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz', 'blinker', 'unidecode', 'six']
 
 entry_points = {

From 10dc5ef0b7d901d5718a35914ceae353ae87a903 Mon Sep 17 00:00:00 2001
From: Dane Knecht <dane@cloudflare.com>
Date: Mon, 29 Apr 2013 20:57:05 -0700
Subject: [PATCH 1403/2864] sort author and category pages same way as tags

---
 pelican/generators.py                         |   2 +
 .../output/basic/author/alexis-metaireau.html |  78 ++++++------
 .../custom/author/alexis-metaireau.html       | 110 ++++++++---------
 .../custom/author/alexis-metaireau2.html      | 112 +++++++++---------
 4 files changed, 157 insertions(+), 145 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 13909743..dea22e17 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -335,6 +335,7 @@ class ArticlesGenerator(Generator):
         """Generate category pages."""
         category_template = self.get_template('category')
         for cat, articles in self.categories:
+            articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write(cat.save_as, category_template, self.context,
                 category=cat, articles=articles, dates=dates,
@@ -345,6 +346,7 @@ class ArticlesGenerator(Generator):
         """Generate Author pages."""
         author_template = self.get_template('author')
         for aut, articles in self.authors:
+            articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write(aut.save_as, author_template, self.context,
                 author=aut, articles=articles, dates=dates,
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 04a89930..fc253c2c 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -26,37 +26,7 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
-        </abbr>
-
-        <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/bar.html">bar</a>. </p>
-<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
-</footer><!-- /.post-info --><div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
-                </article>
-            </aside><!-- /#featured -->
-                <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/this-is-a-super-article.html" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
-
-                <div class="entry-content">
+                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
@@ -67,10 +37,50 @@ YEAH !</p>
         </address>
 <p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+</footer><!-- /.post-info --><p>Some content here !</p>
+<div class="section" id="this-is-a-simple-title">
+<h2>This is a simple title</h2>
+<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<pre class="literal-block">
+&gt;&gt;&gt; from ipdb import set_trace
+&gt;&gt;&gt; set_trace()
+</pre>
+<p>→ And now try with some utf8 hell: ééé</p>
+</div>
+                </article>
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
 
-                <a class="readmore" href="/this-is-a-super-article.html">read more</a>
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="/oh-yeah.html" rel="bookmark"
+                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Wed 20 October 2010
+        </abbr>
+
+        <address class="vcard author">
+                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="/category/bar.html">bar</a>. </p>
+<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
+</footer><!-- /.post-info -->                <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                <a class="readmore" href="/oh-yeah.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
             </ol><!-- /#posts-list -->
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index e732fdcc..ded2e38d 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -30,7 +30,57 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
+                    <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+<footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Fri 30 November 2012
+        </abbr>
+
+        <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+<p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../second-article.html" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Wed 29 February 2012
+        </abbr>
+
+        <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
+        <a href="../second-article-fr.html">fr</a>
+
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="../second-article.html">read more</a>
+<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../a-markdown-powered-article.html" rel="bookmark"
+                           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                </header>
+
+                <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
@@ -41,14 +91,12 @@
         </address>
 <p>In <a href="../category/cat1.html">cat1</a>. </p>
 
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
+</footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
 <p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
-<a href="../unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
-                <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+<a href="../unbelievable.html">a file-relative link to unbelievable</a></p>
+                <a class="readmore" href="../a-markdown-powered-article.html">read more</a>
+<p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
 
             <li><article class="hentry">
                 <header>
@@ -72,52 +120,6 @@
                 <a class="readmore" href="../article-1.html">read more</a>
 <p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../article-2.html" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
-
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
-        </abbr>
-
-        <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
-
-</footer><!-- /.post-info -->                <p>Article 2</p>
-
-                <a class="readmore" href="../article-2.html">read more</a>
-<p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../article-3.html" rel="bookmark"
-                           title="Permalink to Article 3">Article 3</a></h1>
-                </header>
-
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
-        </abbr>
-
-        <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
-
-</footer><!-- /.post-info -->                <p>Article 3</p>
-
-                <a class="readmore" href="../article-3.html">read more</a>
-<p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
             </ol><!-- /#posts-list -->
 <p class="paginator">
     Page 1 / 3
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index d984d5e7..ceb6877c 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -32,25 +32,72 @@
                     <ol id="posts-list" class="hfeed" start="3">
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../filename_metadata-example.html" rel="bookmark"
-                           title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
+                    <h1><a href="../article-2.html" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
-                Fri 30 November 2012
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
         </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
-</footer><!-- /.post-info -->                <p>Some cool stuff!</p>
+</footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="../filename_metadata-example.html">read more</a>
-<p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../article-2.html">read more</a>
+<p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../article-3.html" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Thu 17 February 2011
+        </abbr>
+
+        <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 3</p>
+
+                <a class="readmore" href="../article-3.html">read more</a>
+<p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Thu 02 December 2010
+        </abbr>
+
+        <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
+                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
+<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
@@ -82,55 +129,6 @@ YEAH !</p>
                 <a class="readmore" href="../oh-yeah.html">read more</a>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
-
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
-        </abbr>
-
-        <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
-        <a href="../second-article-fr.html">fr</a>
-
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
-
-                <a class="readmore" href="../second-article.html">read more</a>
-<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
-
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
-        </abbr>
-
-        <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
-
-                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
-<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
             </ol><!-- /#posts-list -->
 <p class="paginator">
         <a href="../author/alexis-metaireau.html">&laquo;</a>

From a4ce664f176f668eb56402ae978a29c943dc0f22 Mon Sep 17 00:00:00 2001
From: karl <karl+github@la-grange.net>
Date: Sat, 3 Aug 2013 22:31:54 -0400
Subject: [PATCH 1404/2864] fixing the inline code markup

---
 docs/faq.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index bb348d45..2cd363d8 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -90,13 +90,13 @@ For reStructuredText, this metadata should of course be prefixed with a colon::
 
     :Modified: 2012-08-08
 
-This metadata can then be accessed in templates such as `article.html` via::
+This metadata can then be accessed in templates such as ``article.html`` via::
 
     {% if article.modified %}
     Last modified: {{ article.modified }}
     {% endif %}
 
-If you want to include metadata in templates outside the article context (e.g., `base.html`), the `if` statement should instead be:
+If you want to include metadata in templates outside the article context (e.g., ``base.html``), the ``if`` statement should instead be:
 
     {% if article and article.modified %}
 

From 4977de8453fca685ee2a16285074ae9724e08981 Mon Sep 17 00:00:00 2001
From: Russ Webber <russ@rw.id.au>
Date: Sun, 4 Aug 2013 14:00:56 +0800
Subject: [PATCH 1405/2864] fix: clear directory before generation of context

fixes #927
---
 pelican/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index a9aa916c..66463f56 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -168,16 +168,16 @@ class Pelican(object):
             ) for cls in self.get_generator_classes()
         ]
 
-        for p in generators:
-            if hasattr(p, 'generate_context'):
-                p.generate_context()
-
         # erase the directory if it is not the source and if that's
         # explicitely asked
         if (self.delete_outputdir and not
                 os.path.realpath(self.path).startswith(self.output_path)):
             clean_output_dir(self.output_path, self.output_retention)
 
+        for p in generators:
+            if hasattr(p, 'generate_context'):
+                p.generate_context()
+
         writer = self.get_writer()
 
         for p in generators:

From dc58a17e647bb1fb8e8c6cde00f3f42f0ad1363c Mon Sep 17 00:00:00 2001
From: Russ Webber <russ@rw.id.au>
Date: Sun, 4 Aug 2013 17:21:35 +0800
Subject: [PATCH 1406/2864] fix missing 'kind' arg in importer

fixes #983
---
 pelican/tools/pelican_import.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 46582937..46410c13 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -400,8 +400,9 @@ def tumblr2fields(api_key, blogname):
                 content = '<p><a href="%s" rel="external nofollow">%s</a>: %s</p>\n%s' % (post.get('asking_name'), post.get('asking_url'), post.get('question'), post.get('answer'))
 
             content = content.rstrip() + '\n'
-
-            yield (title, content, slug, date, post.get('blog_name'), [type], tags, format)
+            kind = 'article'
+            yield (title, content, slug, date, post.get('blog_name'), [type],
+                   tags, kind, format)
 
         offset += len(posts)
         posts = get_tumblr_posts(api_key, blogname, offset)

From e0a2f1906df513cc48b3fc6e386c22e484b1fabd Mon Sep 17 00:00:00 2001
From: Russ Webber <russ@rw.id.au>
Date: Sun, 4 Aug 2013 18:52:53 +0800
Subject: [PATCH 1407/2864] Remove old mercurial files

---
 .hgignore |  9 ---------
 .hgtags   | 29 -----------------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 .hgignore
 delete mode 100644 .hgtags

diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index a0f6b7c5..00000000
--- a/.hgignore
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax: glob
-output/*
-*.pyc
-MANIFEST
-build
-dist
-docs/_build
-Paste-*
-*.egg-info
diff --git a/.hgtags b/.hgtags
deleted file mode 100644
index 6d4c8d99..00000000
--- a/.hgtags
+++ /dev/null
@@ -1,29 +0,0 @@
-7acafbf7e47b1287525026ad8b4f1efe443d5403 1.2
-7acafbf7e47b1287525026ad8b4f1efe443d5403 1.2
-ae850ab0fd62a98a98da7ce74ac794319c6a5066 1.2
-54a0309f79d6c5b54d8e1e3b5e3f744856b68a73 1.1
-8f5e0eb037768351eb08840e588a4364266a69b3 1.1.1
-bb986ed591734ca469f726753cbc48ebbfce0dcc 1.2.1
-8a3dad99cbfa6bb5d0ef073213d0d86e0b4c5dba 1.2.2
-4a20105a242ab154f6202aa6651979bfbb4cf95e 1.2.3
-803aa0976cca3dd737777c640722988b1f3769fe 1.2.4
-703c4511105fd9c8b85afda951a294c194e7cf3e 1.2.5
-6e46a40aaa850a979f5d09dd95d02791ec7ab0ef 2.0
-bf14d1a5c1fae9475447698f0f9b8d35c551f732 2.1
-da86343ebd543e5865050e47ecb0937755528d13 2.1.1
-760187f048bb23979402f950ecb5d3c5493995b1 2.2
-20aa16fe4daa3b70f6c063f170edc916b49837ed 2.3
-f9c1d94081504f21f5b2ba147a38099e45db1769 2.4
-e65199a0b2706d2fb48f7a3c015e869716e0bec1 2.4.1
-89dbd7b6f114508eae62fc821326f4797dfc8b23 2.4.2
-979b4473af56a191a278c83058bc9c8fa1fde30e 2.4.3
-26a444fbb78becae358afa0a5b47587db8739b21 2.4.4
-3542b65fd1963ae7065b6a3bc912fbb6c150e98c 2.4.5
-87745dfdd51b96bf18eaaf6c402effa902c1b856 2.5.0
-294a2830a393d5a97671dc211dbdb5254a15e604 2.5.1
-294a2830a393d5a97671dc211dbdb5254a15e604 2.5.1
-92b31e41134cb2c1a156ce623338cf634d2ebc3e 2.5.1
-7d728f8e771cbbc802ce81e424e08a8eecbd48dc 2.5.2
-7d728f8e771cbbc802ce81e424e08a8eecbd48dc 2.5.2
-6d368a1739a4ce48d2d04b00db04fa538e2bf90a 2.5.2
-1f9dd44b546425216b1fa35fd88d3d532da8916b 2.5.3

From 0999d4d6915574cb0377048157661e1a5e6d9ced Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Thu, 20 Jun 2013 21:58:51 +0100
Subject: [PATCH 1408/2864] Deliberate overriding of an existing file to tests

Deliberate overriding via `save_as` metadata should be allowed, even after the
overwrite detection feature. This commit is to add tests for deliberate
overriding. As a result, the relevant tests *should fail* after this commit.

Added a page and an article, both to override a tag, with very old dates so
it limits the amount of diff in the generated pages.

Overriding feature introduced by d0e9c52410e70e14008d2ef827ba7ac306243e72
Overwrite detection introduced by ff7410ce2ada85b486a67ae11874d60d135ff939
---
 .../basic/a-markdown-powered-article.html     |  1 +
 pelican/tests/output/basic/archives.html      |  3 ++
 pelican/tests/output/basic/article-1.html     |  1 +
 pelican/tests/output/basic/article-2.html     |  1 +
 pelican/tests/output/basic/article-3.html     |  1 +
 .../output/basic/author/alexis-metaireau.html |  1 +
 pelican/tests/output/basic/categories.html    |  1 +
 pelican/tests/output/basic/category/bar.html  |  1 +
 pelican/tests/output/basic/category/cat1.html |  1 +
 pelican/tests/output/basic/category/misc.html | 21 ++++++++
 pelican/tests/output/basic/category/yeah.html |  1 +
 .../tests/output/basic/feeds/all-en.atom.xml  |  1 +
 pelican/tests/output/basic/feeds/all.atom.xml |  1 +
 .../tests/output/basic/feeds/misc.atom.xml    |  1 +
 .../basic/filename_metadata-example.html      |  1 +
 pelican/tests/output/basic/index.html         | 21 ++++++++
 pelican/tests/output/basic/oh-yeah.html       |  1 +
 .../tests/output/basic/override/index.html    |  1 +
 .../pages/this-is-a-test-hidden-page.html     |  1 +
 .../basic/pages/this-is-a-test-page.html      |  1 +
 .../tests/output/basic/second-article-fr.html |  1 +
 .../tests/output/basic/second-article.html    |  1 +
 pelican/tests/output/basic/tag/bar.html       |  1 +
 pelican/tests/output/basic/tag/baz.html       | 33 +++++++------
 pelican/tests/output/basic/tag/foo.html       |  1 +
 pelican/tests/output/basic/tag/foobar.html    |  1 +
 pelican/tests/output/basic/tag/oh.html        | 31 +++---------
 pelican/tests/output/basic/tag/yeah.html      |  1 +
 .../output/basic/this-is-a-super-article.html |  1 +
 pelican/tests/output/basic/unbelievable.html  |  1 +
 .../custom/a-markdown-powered-article.html    |  1 +
 pelican/tests/output/custom/archives.html     |  3 ++
 pelican/tests/output/custom/article-1.html    |  1 +
 pelican/tests/output/custom/article-2.html    |  1 +
 pelican/tests/output/custom/article-3.html    |  1 +
 .../custom/author/alexis-metaireau.html       |  1 +
 .../custom/author/alexis-metaireau2.html      |  1 +
 .../custom/author/alexis-metaireau3.html      | 24 +++++++++
 pelican/tests/output/custom/categories.html   |  1 +
 pelican/tests/output/custom/category/bar.html |  1 +
 .../tests/output/custom/category/cat1.html    |  1 +
 .../tests/output/custom/category/misc.html    | 24 +++++++++
 .../tests/output/custom/category/yeah.html    |  1 +
 .../output/custom/drafts/a-draft-article.html |  1 +
 .../tests/output/custom/feeds/all-en.atom.xml |  1 +
 .../tests/output/custom/feeds/all.atom.xml    |  1 +
 pelican/tests/output/custom/feeds/all.rss.xml |  3 +-
 .../tests/output/custom/feeds/misc.atom.xml   |  1 +
 .../tests/output/custom/feeds/misc.rss.xml    |  3 +-
 .../custom/filename_metadata-example.html     |  1 +
 pelican/tests/output/custom/index.html        |  1 +
 pelican/tests/output/custom/index2.html       |  1 +
 pelican/tests/output/custom/index3.html       | 24 +++++++++
 .../tests/output/custom/jinja2_template.html  |  1 +
 pelican/tests/output/custom/oh-yeah-fr.html   |  1 +
 pelican/tests/output/custom/oh-yeah.html      |  1 +
 .../tests/output/custom/override/index.html   |  1 +
 .../pages/this-is-a-test-hidden-page.html     |  1 +
 .../custom/pages/this-is-a-test-page.html     |  1 +
 .../output/custom/second-article-fr.html      |  1 +
 .../tests/output/custom/second-article.html   |  1 +
 pelican/tests/output/custom/tag/bar.html      |  1 +
 pelican/tests/output/custom/tag/baz.html      | 49 ++++++++++++-------
 pelican/tests/output/custom/tag/foo.html      |  1 +
 pelican/tests/output/custom/tag/foobar.html   |  1 +
 pelican/tests/output/custom/tag/oh.html       | 36 +++-----------
 pelican/tests/output/custom/tag/yeah.html     |  1 +
 .../custom/this-is-a-super-article.html       |  1 +
 pelican/tests/output/custom/unbelievable.html |  1 +
 samples/content/article_tag_baz.rst           |  8 +++
 samples/content/pages/override_tag_oh.rst     |  8 +++
 71 files changed, 261 insertions(+), 86 deletions(-)
 create mode 100644 samples/content/article_tag_baz.rst
 create mode 100644 samples/content/pages/override_tag_oh.rst

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 6f854ae4..b7a90f02 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 7a10cc9d..0bc33bbc 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
@@ -45,6 +46,8 @@
     <dd><a href="/oh-yeah.html">Oh yeah !</a></dd>
     <dt>Fri 15 October 2010</dt>
     <dd><a href="/unbelievable.html">Unbelievable !</a></dd>
+    <dt>Sun 14 March 2010</dt>
+    <dd><a href="/tag/baz.html">The baz tag</a></dd>
 </dl>
 </section>
         <section id="extras" class="body">
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 3d55751d..114e4774 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 4ae3e2f3..ca0cfc9a 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 9b978ec0..a4553026 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index fc253c2c..15ae0dcb 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index f1541892..1834bcd4 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index f272dd2b..8e4cd688 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li class="active"><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 4e2f0f5a..38b1fe1f 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index fce85481..f1a7b9fd 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
@@ -85,6 +86,26 @@
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="/tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
+        </abbr>
+
+<p>In <a href="/category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="/tag/baz.html">read more</a>
+                </div><!-- /.entry-content -->
+            </article></li>
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         <section id="extras" class="body">
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index b7c383fa..a894dabb 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 54c87905..9b819f84 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -27,4 +27,5 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 3081adc6..63628281 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -28,4 +28,5 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index e71bd151..f2885b1d 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -4,4 +4,5 @@
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index a9f548a5..e53e9c59 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index b10b479a..6a4fb8f3 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
@@ -218,6 +219,26 @@ YEAH !</p>
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="/tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
+        </abbr>
+
+<p>In <a href="/category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="/tag/baz.html">read more</a>
+                </div><!-- /.entry-content -->
+            </article></li>
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         <section id="extras" class="body">
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index cb29ea80..940ebaed 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li class="active"><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index ff6775cf..041b8bf6 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li class="active"><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index e4a18249..0d681602 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index d0e11cfc..c445dbcc 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li class="active"><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index ca4abcfc..9f759fab 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 7008b847..6f83b0af 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 80d2d212..a8de5c74 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 6c25194d..7c0bdf11 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8">
-        <title>A Pelican Blog - baz</title>
+        <title>The baz tag</title>
         <link rel="stylesheet" href="/theme/css/main.css">
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
@@ -15,32 +15,37 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
                     <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
                     <li><a href="/category/yeah.html">yeah</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="/tag/baz.html" rel="bookmark"
+           title="Permalink to The baz tag">The baz tag</a></h1>
+    </header>
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
+    <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
-        <a href="/second-article-fr.html">fr</a>
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-                </article>
-            </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+</footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+    </div><!-- /.entry-content -->
+
+  </article>
+</section>
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 87372eb6..77203dbc 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 4812467f..c19d4569 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index 47ef8946..48f5533f 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8">
-        <title>A Pelican Blog - oh</title>
+        <title>Oh Oh Oh</title>
         <link rel="stylesheet" href="/theme/css/main.css">
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li class="active"><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
@@ -23,30 +24,12 @@
                     <li><a href="/category/yeah.html">yeah</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
+<section id="content" class="body">
+    <h1 class="entry-title">Oh Oh Oh</h1>
+    
+    <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
-        </abbr>
-
-        <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/bar.html">bar</a>. </p>
-<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
-</footer><!-- /.post-info --><div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
-                </article>
-            </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+</section>
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 47f8076a..d77e33f4 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index e472a8e2..30b778be 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 849b4d78..97df4b07 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -15,6 +15,7 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
                     <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="/category/bar.html">bar</a></li>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index c5fca991..867f96bc 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 077c1268..cdf2e07b 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
@@ -49,6 +50,8 @@
     <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
     <dt>Fri 15 October 2010</dt>
     <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
+    <dt>Sun 14 March 2010</dt>
+    <dd><a href="./tag/baz.html">The baz tag</a></dd>
 </dl>
 </section>
         <section id="extras" class="body">
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 80f1ceaf..8511a11d 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 8511afc8..e14ff291 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 305359b9..f76e5b18 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index ded2e38d..c383bd53 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index ceb6877c..9070b4e6 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index bfb02d92..15e8ac9c 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
@@ -54,6 +55,29 @@
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
+        </abbr>
+
+        <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="../tag/baz.html">read more</a>
+<p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
             </ol><!-- /#posts-list -->
 <p class="paginator">
         <a href="../author/alexis-metaireau2.html">&laquo;</a>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 76f7aaca..ab561c91 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 71ca6213..38080aed 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index e91ff166..6cd92044 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index f87abede..e950d863 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
@@ -98,6 +99,29 @@
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
+        </abbr>
+
+        <address class="vcard author">
+                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="../tag/baz.html">read more</a>
+<p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
             </ol><!-- /#posts-list -->
 <p class="paginator">
     Page 1 / 1
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 1a5db423..f54e316f 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li class="active"><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 0bfbc1d6..917cf500 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 49d45cde..49b0de79 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -27,4 +27,5 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 3187c2aa..a9e67acd 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -29,4 +29,5 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 8d07bec7..7d7890a9 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -29,4 +29,5 @@ YEAH !&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 45c996f3..029184b0 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -4,4 +4,5 @@
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 1d295abc..ab2639cf 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -4,4 +4,5 @@
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index a9c0f5c1..83a4c43f 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 92aef088..43c2e6a8 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 2355c7a1..b37de9ae 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 8121e987..67988a51 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
@@ -54,6 +55,29 @@
                 <a class="readmore" href="./unbelievable.html">read more</a>
 <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="./tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
+        </abbr>
+
+        <address class="vcard author">
+                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="./tag/baz.html">read more</a>
+<p>There are <a href="./tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
             </ol><!-- /#posts-list -->
 <p class="paginator">
         <a href="./index2.html">&laquo;</a>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 0f0eee83..082121dd 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 2590eb3b..a2b8b6c3 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index d1c70eeb..49a79edc 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 1042dbb0..c449f087 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li class="active"><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index d9b3851c..4a82c542 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index d6dedd9a..dbab2f13 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li class="active"><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 0ac5c01c..c9b52338 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 289a6308..270653e0 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 2f6a1016..cdef164d 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index cf4fb3f6..e92bdc04 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8">
-        <title>Alexis' log - baz</title>
+        <title>The baz tag</title>
         <link rel="stylesheet" href="../theme/css/main.css">
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
@@ -19,38 +19,53 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
+                    <li class="active"><a href="../category/misc.html">misc</a></li>
                     <li><a href="../category/cat1.html">cat1</a></li>
                     <li><a href="../category/bar.html">bar</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../tag/baz.html" rel="bookmark"
+           title="Permalink to The baz tag">The baz tag</a></h1>
+    </header>
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
+    <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Sun 14 March 2010
         </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
 <p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
-        <a href="../second-article-fr.html">fr</a>
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
-            </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+</footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_identifier = "tag/baz.html";
+        var disqus_url = "../tag/baz.html";
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+    </div>
+
+  </article>
+</section>
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index b6c741bd..3bc93546 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index cdecccd7..aee030f5 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index d3bde1dc..efdd8724 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8">
-        <title>Alexis' log - oh</title>
+        <title>Oh Oh Oh</title>
         <link rel="stylesheet" href="../theme/css/main.css">
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li class="active"><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
@@ -27,35 +28,12 @@
                     <li><a href="../category/bar.html">bar</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
+<section id="content" class="body">
+    <h1 class="entry-title">Oh Oh Oh</h1>
+    
+    <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
-        </abbr>
-
-        <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations:
-        <a href="../oh-yeah-fr.html">fr</a>
-
-</footer><!-- /.post-info --><div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
-<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
-            </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+</section>
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index ba6089f0..ba2da881 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
                     <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="../category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index d1faa0ca..5e2fe0bb 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li class="active"><a href="./category/yeah.html">yeah</a></li>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index efd049f0..fcf4adaf 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -19,6 +19,7 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
                     <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
                     <li><a href="./category/yeah.html">yeah</a></li>
diff --git a/samples/content/article_tag_baz.rst b/samples/content/article_tag_baz.rst
new file mode 100644
index 00000000..9a33a8d3
--- /dev/null
+++ b/samples/content/article_tag_baz.rst
@@ -0,0 +1,8 @@
+The baz tag
+###########
+
+:date: 2010-03-14
+:url: tag/baz.html
+:save_as: tag/baz.html
+
+This article overrides the listening of the articles under the *baz* tag.
diff --git a/samples/content/pages/override_tag_oh.rst b/samples/content/pages/override_tag_oh.rst
new file mode 100644
index 00000000..c3160349
--- /dev/null
+++ b/samples/content/pages/override_tag_oh.rst
@@ -0,0 +1,8 @@
+Oh Oh Oh
+########
+
+:date: 2010-03-14
+:url: tag/oh.html
+:save_as: tag/oh.html
+
+This page overrides the listening of the articles under the *oh* tag.

From a495527e2bd4d0853d18ada90b45cc7d16dc0be4 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sat, 22 Jun 2013 14:49:48 +0100
Subject: [PATCH 1409/2864] Delib. overriding and overwrite detect. Fixes #938

Make deliberate overriding (*) works with overwrites detection.

(*) first introduced by d0e9c52410e70e14008d2ef827ba7ac306243e72

The following are decided to be deliberate override:
 - articles using the `save_as` metadata
 - pages using the `save_as` metadata
 - template pages (always)

Pelican now exits in the following 2 cases:
 - at least 2 not deliberate writes to the same file name (behaviour introduced
   by the overwrite detection feature ff7410ce2ada85b486a67ae11874d60d135ff939)
 - at least 2 deliberate writes to the same file name (new behaviour)

Also added info logging when deliberate overrides are performed.

Switched to StandardError instead of IOError, thanks to @ametaireau and
@russkel.
---
 pelican/generators.py |  9 ++++++---
 pelican/writers.py    | 36 +++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index dea22e17..c294f3e1 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -168,7 +168,8 @@ class TemplatePagesGenerator(Generator):
             try:
                 template = self.env.get_template(source)
                 rurls = self.settings['RELATIVE_URLS']
-                writer.write_file(dest, template, self.context, rurls)
+                writer.write_file(dest, template, self.context, rurls,
+                                  override_output=True)
             finally:
                 del self.env.loader.loaders[0]
 
@@ -262,7 +263,8 @@ class ArticlesGenerator(Generator):
         """Generate the articles."""
         for article in chain(self.translations, self.articles):
             write(article.save_as, self.get_template(article.template),
-                self.context, article=article, category=article.category)
+                self.context, article=article, category=article.category,
+                override_output=hasattr(article, 'override_save_as'))
 
     def generate_period_archives(self, write):
         """Generate per-year, per-month, and per-day archives."""
@@ -533,7 +535,8 @@ class PagesGenerator(Generator):
                             self.hidden_translations, self.hidden_pages):
             writer.write_file(page.save_as, self.get_template(page.template),
                     self.context, page=page,
-                    relative_urls=self.settings['RELATIVE_URLS'])
+                    relative_urls=self.settings['RELATIVE_URLS'],
+                    override_output=hasattr(page, 'override_save_as'))
 
 
 class StaticGenerator(Generator):
diff --git a/pelican/writers.py b/pelican/writers.py
index 25f49aeb..59642cd9 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -24,6 +24,7 @@ class Writer(object):
         self.reminder = dict()
         self.settings = settings or {}
         self._written_files = set()
+        self._overridden_files = set()
 
     def _create_new_feed(self, feed_type, context):
         feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
@@ -49,13 +50,26 @@ class Writer(object):
             pubdate=set_date_tzinfo(item.date,
                 self.settings.get('TIMEZONE', None)))
 
-    def _open_w(self, filename, encoding):
+    def _open_w(self, filename, encoding, override=False):
         """Open a file to write some content to it.
 
-        Exit if we have already written to that file.
+        Exit if we have already written to that file, unless one (and no more
+        than one) of the writes has the override parameter set to True.
         """
-        if filename in self._written_files:
-            raise IOError('File %s is to be overwritten' % filename)
+        if filename in self._overridden_files:
+            if override:
+                raise StandardError('File %s is set to be overridden twice'
+                                    % filename)
+            else:
+                logger.info('skipping %s' % filename)
+                filename = os.devnull
+        elif filename in self._written_files:
+            if override:
+                logger.info('overwriting %s' % filename)
+            else:
+                raise StandardError('File %s is to be overwritten' % filename)
+        if override:
+            self._overridden_files.add(filename)
         self._written_files.add(filename)
         return open(filename, 'w', encoding=encoding)
 
@@ -103,7 +117,7 @@ class Writer(object):
             locale.setlocale(locale.LC_ALL, old_locale)
 
     def write_file(self, name, template, context, relative_urls=False,
-        paginated=None, **kwargs):
+        paginated=None, override_output=False, **kwargs):
         """Render the template and write the file.
 
         :param name: name of the file to output
@@ -112,6 +126,9 @@ class Writer(object):
         :param relative_urls: use relative urls or absolutes ones
         :param paginated: dict of article list to paginate - must have the
             same length (same list in different orders)
+        :param override_output: boolean telling if we can override previous
+            output with the same name (and if next files written with the same
+            name should be skipped to keep that one)
         :param **kwargs: additional variables to pass to the templates
         """
 
@@ -121,7 +138,7 @@ class Writer(object):
             # other stuff, just return for now
             return
 
-        def _write_file(template, localcontext, output_path, name):
+        def _write_file(template, localcontext, output_path, name, override):
             """Render the template write the file."""
             old_locale = locale.setlocale(locale.LC_ALL)
             locale.setlocale(locale.LC_ALL, str('C'))
@@ -134,7 +151,7 @@ class Writer(object):
                 os.makedirs(os.path.dirname(path))
             except Exception:
                 pass
-            with self._open_w(path, 'utf-8') as f:
+            with self._open_w(path, 'utf-8', override=override) as f:
                 f.write(output)
             logger.info('writing {}'.format(path))
 
@@ -180,7 +197,8 @@ class Writer(object):
                              '%s_next_page' % key: next_page})
 
                 _write_file(template, paginated_localcontext, self.output_path,
-                            page.save_as)
+                            page.save_as, override_output)
         else:
             # no pagination
-            _write_file(template, localcontext, self.output_path, name)
+            _write_file(template, localcontext, self.output_path, name,
+                        override_output)

From a268d9e95276c405b79a6310f7da4e0cf390134b Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Tue, 25 Jun 2013 00:02:34 +0200
Subject: [PATCH 1410/2864] Use the `docutils` variable to check if docutils is
 installed, not `core`.

+ remove duplicate import
---
 pelican/readers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index fb2ccfc4..728fbad1 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -5,7 +5,7 @@ import datetime
 import logging
 import os
 import re
-import logging
+
 try:
     import docutils
     import docutils.core
@@ -15,7 +15,7 @@ try:
     # import the directives to have pygments support
     from pelican import rstdirectives  # NOQA
 except ImportError:
-    core = False
+    docutils = False
 try:
     from markdown import Markdown
 except ImportError:

From 577a3d116efeb5f54bd163deb5b740769ee4f2ae Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sat, 15 Jun 2013 23:00:08 +0200
Subject: [PATCH 1411/2864] Replace get_populated_generator with setUpClass

---
 pelican/tests/test_generators.py | 39 ++++++++++++--------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 2b9028c3..ed337ecc 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -38,25 +38,17 @@ class TestGenerator(unittest.TestCase):
 
 class TestArticlesGenerator(unittest.TestCase):
 
-    def setUp(self):
-        super(TestArticlesGenerator, self).setUp()
-        self.generator = None
+    @classmethod
+    def setUpClass(cls):
+        settings = get_settings(filenames={})
+        settings['DEFAULT_CATEGORY'] = 'Default'
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
 
-    def get_populated_generator(self):
-        """
-        We only need to pull all the test articles once, but read from it
-        for each test.
-        """
-        if self.generator is None:
-            settings = get_settings(filenames={})
-            settings['DEFAULT_CATEGORY'] = 'Default'
-            settings['DEFAULT_DATE'] = (1970, 1, 1)
-            self.generator = ArticlesGenerator(
-                context=settings.copy(), settings=settings,
-                path=CONTENT_DIR, theme=settings['THEME'],
-                output_path=None, markup=settings['MARKUP'])
-            self.generator.generate_context()
-        return self.generator
+        cls.generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'],
+            output_path=None, markup=settings['MARKUP'])
+        cls.generator.generate_context()
 
     def distill_articles(self, articles):
         distilled = []
@@ -91,8 +83,7 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_context(self):
 
-        generator = self.get_populated_generator()
-        articles = self.distill_articles(generator.articles)
+        articles = self.distill_articles(self.generator.articles)
         articles_expected = [
             ['Article title', 'published', 'Default', 'article'],
             ['Article with markdown and summary metadata single', 'published',
@@ -120,19 +111,18 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_categories(self):
 
-        generator = self.get_populated_generator()
         # test for name
         # categories are grouped by slug; if two categories have the same slug
         # but different names they will be grouped together, the first one in
         # terms of process order will define the name for that category
-        categories = [cat.name for cat, _ in generator.categories]
+        categories = [cat.name for cat, _ in self.generator.categories]
         categories_alternatives = (
             sorted(['Default', 'TestCategory', 'Yeah', 'test', '指導書']),
             sorted(['Default', 'TestCategory', 'yeah', 'test', '指導書']),
         )
         self.assertIn(sorted(categories), categories_alternatives)
         # test for slug
-        categories = [cat.slug for cat, _ in generator.categories]
+        categories = [cat.slug for cat, _ in self.generator.categories]
         categories_expected = ['default', 'testcategory', 'yeah', 'test',
                                'zhi-dao-shu']
         self.assertEqual(sorted(categories), sorted(categories_expected))
@@ -209,8 +199,7 @@ class TestArticlesGenerator(unittest.TestCase):
         """
         Custom template articles get the field but standard/unset are None
         """
-        generator = self.get_populated_generator()
-        articles = self.distill_articles(generator.articles)
+        articles = self.distill_articles(self.generator.articles)
         custom_template = ['Article with template', 'published', 'Default',
                            'custom']
         standard_template = ['This is a super article !', 'published', 'Yeah',

From 4ffa34544e2ee064aa350fb02a431f60ac0b108a Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 16 Jun 2013 00:14:55 +0200
Subject: [PATCH 1412/2864] More refactoring for test_generators

- list comprehensions for distill_articles/pages
- distill articles only once
- pep8
---
 pelican/tests/test_generators.py | 53 ++++++++++----------------------
 1 file changed, 16 insertions(+), 37 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index ed337ecc..d8a4336d 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import unicode_literals
 
 import os
 from codecs import open
@@ -10,7 +10,6 @@ from tempfile import mkdtemp
 from pelican.generators import (Generator, ArticlesGenerator, PagesGenerator,
                                 TemplatePagesGenerator)
 from pelican.writers import Writer
-from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import unittest, get_settings
 
 CUR_DIR = os.path.dirname(__file__)
@@ -49,18 +48,8 @@ class TestArticlesGenerator(unittest.TestCase):
             path=CONTENT_DIR, theme=settings['THEME'],
             output_path=None, markup=settings['MARKUP'])
         cls.generator.generate_context()
-
-    def distill_articles(self, articles):
-        distilled = []
-        for page in articles:
-            distilled.append([
-                    page.title,
-                    page.status,
-                    page.category.name,
-                    page.template
-                ]
-           )
-        return distilled
+        cls.articles = [[page.title, page.status, page.category.name,
+                         page.template] for page in cls.generator.articles]
 
     def test_generate_feeds(self):
         settings = get_settings()
@@ -83,7 +72,6 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_context(self):
 
-        articles = self.distill_articles(self.generator.articles)
         articles_expected = [
             ['Article title', 'published', 'Default', 'article'],
             ['Article with markdown and summary metadata single', 'published',
@@ -107,7 +95,7 @@ class TestArticlesGenerator(unittest.TestCase):
             ['Article with markdown containing footnotes', 'published',
              'Default', 'article']
         ]
-        self.assertEqual(sorted(articles_expected), sorted(articles))
+        self.assertEqual(sorted(articles_expected), sorted(self.articles))
 
     def test_generate_categories(self):
 
@@ -129,15 +117,15 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_do_not_use_folder_as_category(self):
 
-        settings = DEFAULT_CONFIG.copy()
+        settings = get_settings(filenames={})
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['USE_FOLDER_AS_CATEGORY'] = False
         settings['filenames'] = {}
         generator = ArticlesGenerator(
             context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=DEFAULT_CONFIG['THEME'],
-            output_path=None, markup=DEFAULT_CONFIG['MARKUP'])
+            path=CONTENT_DIR, theme=settings['THEME'],
+            output_path=None, markup=settings['MARKUP'])
         generator.generate_context()
         # test for name
         # categories are grouped by slug; if two categories have the same slug
@@ -164,8 +152,8 @@ class TestArticlesGenerator(unittest.TestCase):
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_with("archives.html",
-            generator.get_template("archives"), settings,
-            blog=True, paginated={}, page_name='archives')
+                                 generator.get_template("archives"), settings,
+                                 blog=True, paginated={}, page_name='archives')
 
     def test_direct_templates_save_as_modified(self):
 
@@ -179,8 +167,9 @@ class TestArticlesGenerator(unittest.TestCase):
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_with("archives/index.html",
-            generator.get_template("archives"), settings,
-            blog=True, paginated={}, page_name='archives/index')
+                                 generator.get_template("archives"), settings,
+                                 blog=True, paginated={},
+                                 page_name='archives/index')
 
     def test_direct_templates_save_as_false(self):
 
@@ -199,13 +188,12 @@ class TestArticlesGenerator(unittest.TestCase):
         """
         Custom template articles get the field but standard/unset are None
         """
-        articles = self.distill_articles(self.generator.articles)
         custom_template = ['Article with template', 'published', 'Default',
                            'custom']
         standard_template = ['This is a super article !', 'published', 'Yeah',
                              'article']
-        self.assertIn(custom_template, articles)
-        self.assertIn(standard_template, articles)
+        self.assertIn(custom_template, self.articles)
+        self.assertIn(standard_template, self.articles)
 
 
 class TestPageGenerator(unittest.TestCase):
@@ -215,15 +203,7 @@ class TestPageGenerator(unittest.TestCase):
     # to match expected
 
     def distill_pages(self, pages):
-        distilled = []
-        for page in pages:
-            distilled.append([
-                    page.title,
-                    page.status,
-                    page.template
-                ]
-           )
-        return distilled
+        return [[page.title, page.status, page.template] for page in pages]
 
     def test_generate_context(self):
         settings = get_settings(filenames={})
@@ -290,8 +270,7 @@ class TestTemplatePagesGenerator(unittest.TestCase):
         writer = Writer(self.temp_output, settings=settings)
         generator.generate_output(writer)
 
-        output_path = os.path.join(
-                self.temp_output, 'generated', 'file.html')
+        output_path = os.path.join(self.temp_output, 'generated', 'file.html')
 
         # output file has been generated
         self.assertTrue(os.path.exists(output_path))

From 41970cb2c65ec5fe51beb9c649ea542c24702f2e Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Tue, 21 May 2013 17:16:55 +0200
Subject: [PATCH 1413/2864] Refactor pelican_open using contextmanager

---
 pelican/utils.py | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index b1524036..054c1f40 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -2,20 +2,21 @@
 from __future__ import unicode_literals, print_function
 import six
 
+import codecs
+import errno
+import fnmatch
+import locale
+import logging
 import os
-import re
 import pytz
+import re
 import shutil
 import traceback
-import logging
-import errno
-import locale
-import fnmatch
-from collections import Hashable
-from functools import partial
 
-from codecs import open, BOM_UTF8
+from collections import Hashable
+from contextlib import contextmanager
 from datetime import datetime
+from functools import partial
 from itertools import groupby
 from jinja2 import Markup
 from operator import attrgetter
@@ -215,20 +216,15 @@ def get_date(string):
     raise ValueError('{0!r} is not a valid date'.format(string))
 
 
-class pelican_open(object):
+@contextmanager
+def pelican_open(filename):
     """Open a file and return its content"""
-    def __init__(self, filename):
-        self.filename = filename
 
-    def __enter__(self):
-        with open(self.filename, encoding='utf-8') as infile:
-            content = infile.read()
-        if content[0] == BOM_UTF8.decode('utf8'):
-            content = content[1:]
-        return content
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        pass
+    with codecs.open(filename, encoding='utf-8') as infile:
+        content = infile.read()
+    if content[0] == codecs.BOM_UTF8.decode('utf8'):
+        content = content[1:]
+    yield content
 
 
 def slugify(value, substitutions=()):

From a75eac6c0f340c472a8a9ffa55511bfa8b90b63f Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sun, 4 Aug 2013 16:03:39 +0100
Subject: [PATCH 1414/2864] Add warnings for img with empty alts. Fixes #647.

Unify Rst and Mkd: if alt is not specified at all, create an empty alt.
Warns the user in case of empty alts.
---
 pelican/readers.py | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index fb2ccfc4..046aeeb6 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -37,7 +37,6 @@ except ImportError:
 from pelican.contents import Page, Category, Tag, Author
 from pelican.utils import get_date, pelican_open
 
-
 logger = logging.getLogger(__name__)
 
 METADATA_PROCESSORS = {
@@ -104,6 +103,12 @@ class PelicanHTMLTranslator(HTMLTranslator):
     def depart_abbreviation(self, node):
         self.body.append('</abbr>')
 
+    def visit_image(self, node):
+        # set an empty alt if alt is not specified
+        # avoids that alt is taken from src
+        node['alt'] = node.get('alt', '')
+        return HTMLTranslator.visit_image(self, node)
+
 
 class RstReader(Reader):
     enabled = bool(docutils)
@@ -391,6 +396,41 @@ def read_file(base_path, path, content_class=Page, fmt=None,
     content, reader_metadata = reader.read(path)
     metadata.update(reader_metadata)
 
+    # create warnings for all images with empty alt (up to a certain number)
+    # as they are really likely to be accessibility flaws
+    if content:
+        # find images with empty alt
+        imgs = re.compile(r"""
+            (?:
+                # src before alt
+                <img
+                [^\>]*
+                src=(['"])(.*)\1
+                [^\>]*
+                alt=(['"])\3
+            )|(?:
+                # alt before src
+                <img
+                [^\>]*
+                alt=(['"])\4
+                [^\>]*
+                src=(['"])(.*)\5
+            )
+            """, re.X)
+        matches = re.findall(imgs, content)
+        # find a correct threshold
+        nb_warnings = 10
+        if len(matches) == nb_warnings + 1:
+            nb_warnings += 1 # avoid bad looking case
+        # print one warning per image with empty alt until threshold
+        for match in matches[:nb_warnings]:
+            logger.warning('Empty alt attribute for image {} in {}'.format(
+                           os.path.basename(match[1] + match[5]), path))
+        # print one warning for the other images with empty alt
+        if len(matches) > nb_warnings:
+            logger.warning('{} other images with empty alt attributes'.format(
+                           len(matches) - nb_warnings))
+
     # eventually filter the content with typogrify if asked so
     if content and settings and settings['TYPOGRIFY']:
         from typogrify.filters import typogrify

From dfc3a7ce2f370f2cd324cda25a7b7007afd30741 Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle.mahan@gmail.com>
Date: Sun, 4 Aug 2013 08:20:06 -0700
Subject: [PATCH 1415/2864] Move PDF generation to a plugin. Fixes #1009

---
 pelican/__init__.py   |  6 ++----
 pelican/generators.py | 46 -------------------------------------------
 2 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 66463f56..9bce4926 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -14,8 +14,8 @@ import collections
 from pelican import signals
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
-                                StaticGenerator, PdfGenerator,
-                                SourceFileGenerator, TemplatePagesGenerator)
+                                StaticGenerator, SourceFileGenerator,
+                                TemplatePagesGenerator)
 from pelican.log import init
 from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, folder_watcher, file_watcher
@@ -199,8 +199,6 @@ class Pelican(object):
 
         if self.settings['TEMPLATE_PAGES']:
             generators.append(TemplatePagesGenerator)
-        if self.settings['PDF_GENERATOR']:
-            generators.append(PdfGenerator)
         if self.settings['OUTPUT_SOURCES']:
             generators.append(SourceFileGenerator)
 
diff --git a/pelican/generators.py b/pelican/generators.py
index c294f3e1..1444c95c 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -581,52 +581,6 @@ class StaticGenerator(Generator):
             logger.info('copying {} to {}'.format(sc.source_path, sc.save_as))
 
 
-class PdfGenerator(Generator):
-    """Generate PDFs on the output dir, for all articles and pages coming from
-    rst"""
-    def __init__(self, *args, **kwargs):
-        super(PdfGenerator, self).__init__(*args, **kwargs)
-        try:
-            from rst2pdf.createpdf import RstToPdf
-            pdf_style_path = os.path.join(self.settings['PDF_STYLE_PATH'])
-            pdf_style = self.settings['PDF_STYLE']
-            self.pdfcreator = RstToPdf(breakside=0,
-                                       stylesheets=[pdf_style],
-                                       style_path=[pdf_style_path])
-        except ImportError:
-            raise Exception("unable to find rst2pdf")
-
-    def _create_pdf(self, obj, output_path):
-        if obj.source_path.endswith('.rst'):
-            filename = obj.slug + ".pdf"
-            output_pdf = os.path.join(output_path, filename)
-            # print('Generating pdf for', obj.source_path, 'in', output_pdf)
-            with open(obj.source_path) as f:
-                self.pdfcreator.createPdf(text=f.read(), output=output_pdf)
-            logger.info(' [ok] writing %s' % output_pdf)
-
-    def generate_context(self):
-        pass
-
-    def generate_output(self, writer=None):
-        # we don't use the writer passed as argument here
-        # since we write our own files
-        logger.info(' Generating PDF files...')
-        pdf_path = os.path.join(self.output_path, 'pdf')
-        if not os.path.exists(pdf_path):
-            try:
-                os.mkdir(pdf_path)
-            except OSError:
-                logger.error("Couldn't create the pdf output folder in " +
-                             pdf_path)
-
-        for article in self.context['articles']:
-            self._create_pdf(article, pdf_path)
-
-        for page in self.context['pages']:
-            self._create_pdf(page, pdf_path)
-
-
 class SourceFileGenerator(Generator):
     def generate_context(self):
         self.output_extension = self.settings['OUTPUT_SOURCES_EXTENSION']

From 05437a15a98b5330fa6728c7eb10cc374b11e53d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Mon, 5 Aug 2013 10:40:06 +0200
Subject: [PATCH 1416/2864] Remove the reference to the PDF generation in the
 docs. Fix #1013

---
 docs/index.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index eceb407f..914c2a7e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -22,7 +22,6 @@ Pelican currently supports:
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
-* PDF generation of the articles/pages (optional)
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
 

From 5a8f5cefdd74c24eba02ab3bbfeb1fb29e2457cb Mon Sep 17 00:00:00 2001
From: Russ Webber <russ@rw.id.au>
Date: Sun, 4 Aug 2013 16:39:07 +0800
Subject: [PATCH 1417/2864] fix py3 support for sourcecode directive

added sourcecode to the functional test so it's tested *somewhere*.
fixes #963
---
 pelican/rstdirectives.py                              |  2 +-
 pelican/tests/output/basic/category/misc.html         |  6 ++++++
 pelican/tests/output/basic/feeds/all-en.atom.xml      |  6 ++++++
 pelican/tests/output/basic/feeds/all.atom.xml         |  6 ++++++
 pelican/tests/output/basic/feeds/misc.atom.xml        |  6 ++++++
 pelican/tests/output/basic/index.html                 |  6 ++++++
 pelican/tests/output/basic/unbelievable.html          |  6 ++++++
 .../tests/output/custom/author/alexis-metaireau3.html |  6 ++++++
 pelican/tests/output/custom/category/misc.html        |  6 ++++++
 pelican/tests/output/custom/feeds/all-en.atom.xml     |  6 ++++++
 pelican/tests/output/custom/feeds/all.atom.xml        |  6 ++++++
 pelican/tests/output/custom/feeds/all.rss.xml         |  6 ++++++
 pelican/tests/output/custom/feeds/misc.atom.xml       |  6 ++++++
 pelican/tests/output/custom/feeds/misc.rss.xml        |  6 ++++++
 pelican/tests/output/custom/index3.html               |  6 ++++++
 pelican/tests/output/custom/unbelievable.html         |  6 ++++++
 samples/content/unbelievable.rst                      | 11 +++++++++++
 17 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index fb4a6c93..1fdd09d6 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -32,7 +32,7 @@ class Pygments(Directive):
             # no lexer found - use the text one instead of an exception
             lexer = TextLexer()
         # take an arbitrary option if more than one is given
-        formatter = self.options and VARIANTS[self.options.keys()[0]] \
+        formatter = self.options and VARIANTS[list(self.options.keys())[0]] \
                     or DEFAULT
         parsed = highlight('\n'.join(self.content), lexer, formatter)
         return [nodes.raw('', parsed, format='html')]
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index f1a7b9fd..f3b9e451 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -82,6 +82,12 @@
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<div class="section" id="testing-sourcecode-directive">
+<h2>Testing sourcecode directive</h2>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table><p>Lovely.</p>
+</div>
 
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 9b819f84..6d0c563f 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -27,5 +27,11 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 63628281..1abf742a 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -28,5 +28,11 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index f2885b1d..b5588ce7 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -4,5 +4,11 @@
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 6a4fb8f3..6989f25a 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -215,6 +215,12 @@ YEAH !</p>
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<div class="section" id="testing-sourcecode-directive">
+<h2>Testing sourcecode directive</h2>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table><p>Lovely.</p>
+</div>
 
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 97df4b07..3f2d2f80 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -43,6 +43,12 @@
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<div class="section" id="testing-sourcecode-directive">
+<h2>Testing sourcecode directive</h2>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table><p>Lovely.</p>
+</div>
 
     </div><!-- /.entry-content -->
 
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 15e8ac9c..e3e07e10 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -51,6 +51,12 @@
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<div class="section" id="testing-sourcecode-directive">
+<h2>Testing sourcecode directive</h2>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table><p>Lovely.</p>
+</div>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index e950d863..63c659da 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -95,6 +95,12 @@
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<div class="section" id="testing-sourcecode-directive">
+<h2>Testing sourcecode directive</h2>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table><p>Lovely.</p>
+</div>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 49b0de79..d4631d7c 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -27,5 +27,11 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index a9e67acd..2a673ada 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -29,5 +29,11 @@ YEAH !&lt;/p&gt;
 </summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 7d7890a9..e8cd9b80 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -29,5 +29,11 @@ YEAH !&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 029184b0..250b1b65 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -4,5 +4,11 @@
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index ab2639cf..195812cc 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -4,5 +4,11 @@
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 67988a51..52657306 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -51,6 +51,12 @@
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<div class="section" id="testing-sourcecode-directive">
+<h2>Testing sourcecode directive</h2>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table><p>Lovely.</p>
+</div>
 
                 <a class="readmore" href="./unbelievable.html">read more</a>
 <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index fcf4adaf..26b60f38 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -50,6 +50,12 @@
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+<div class="section" id="testing-sourcecode-directive">
+<h2>Testing sourcecode directive</h2>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table><p>Lovely.</p>
+</div>
 
     </div><!-- /.entry-content -->
     <div class="comments">
diff --git a/samples/content/unbelievable.rst b/samples/content/unbelievable.rst
index 20cb9dc7..745ff217 100644
--- a/samples/content/unbelievable.rst
+++ b/samples/content/unbelievable.rst
@@ -7,3 +7,14 @@ Or completely awesome. Depends the needs.
 
 `a root-relative link to markdown-article <|filename|/cat1/markdown-article.md>`_
 `a file-relative link to markdown-article <|filename|cat1/markdown-article.md>`_
+
+Testing sourcecode directive
+----------------------------
+
+.. sourcecode:: python
+  :linenos:
+
+  formatter = self.options and VARIANTS[self.options.keys()[0]]
+
+
+Lovely.

From 42f9726ffafac947b91425df58a70cc49aceb100 Mon Sep 17 00:00:00 2001
From: Danilo Bargen <gezuru@gmail.com>
Date: Thu, 25 Jul 2013 23:25:05 +0200
Subject: [PATCH 1418/2864] Support TAGS_* and AUTHORS_* by default.

---
 docs/settings.rst                             |  2 +-
 pelican/settings.py                           |  2 +-
 pelican/tests/output/basic/authors.html       | 51 +++++++++++
 pelican/tests/output/basic/tags.html          | 56 +++++++++++++
 pelican/tests/output/custom/authors.html      | 79 +++++++++++++++++
 pelican/tests/output/custom/tags.html         | 84 +++++++++++++++++++
 .../themes/notmyidea/templates/authors.html   | 15 ++++
 pelican/themes/notmyidea/templates/tags.html  | 15 ++++
 pelican/themes/simple/templates/authors.html  | 10 +++
 pelican/themes/simple/templates/tags.html     | 10 +++
 10 files changed, 322 insertions(+), 2 deletions(-)
 create mode 100644 pelican/tests/output/basic/authors.html
 create mode 100644 pelican/tests/output/custom/authors.html
 create mode 100644 pelican/themes/notmyidea/templates/tags.html
 create mode 100644 pelican/themes/simple/templates/authors.html

diff --git a/docs/settings.rst b/docs/settings.rst
index 8ecac7c9..0d8f924f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -244,7 +244,7 @@ Setting name (default value)                            What does it do?
 `CATEGORY_SAVE_AS` (``'category/{slug}.html'``)         The location to save a category.
 `TAG_URL` (``'tag/{slug}.html'``)                       The URL to use for a tag.
 `TAG_SAVE_AS` (``'tag/{slug}.html'``)                   The location to save the tag page.
-`TAGS_URL` (``'tag/{slug}.html'``)                      The URL to use for the tag list.
+`TAGS_URL` (``'tags.html'``)                            The URL to use for the tag list.
 `TAGS_SAVE_AS` (``'tags.html'``)                        The location to save the tag list.
 `AUTHOR_URL` (``'author/{slug}.html'``)                 The URL to use for an author.
 `AUTHOR_SAVE_AS` (``'author/{slug}.html'``)             The location to save an author.
diff --git a/pelican/settings.py b/pelican/settings.py
index 0f37c98d..d4ce0c5c 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -84,7 +84,7 @@ DEFAULT_CONFIG = {
     'DEFAULT_LANG': 'en',
     'TAG_CLOUD_STEPS': 4,
     'TAG_CLOUD_MAX_ITEMS': 100,
-    'DIRECT_TEMPLATES': ('index', 'tags', 'categories', 'archives'),
+    'DIRECT_TEMPLATES': ('index', 'tags', 'categories', 'authors', 'archives'),
     'EXTRA_TEMPLATES_PATHS': [],
     'PAGINATED_DIRECT_TEMPLATES': ('index', ),
     'PELICAN_CLASS': 'pelican.Pelican',
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
new file mode 100644
index 00000000..766bf566
--- /dev/null
+++ b/pelican/tests/output/basic/authors.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8">
+        <title>A Pelican Blog - Authors</title>
+        <link rel="stylesheet" href="/theme/css/main.css">
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+        <header id="banner" class="body">
+                <h1><a href="/">A Pelican Blog </a></h1>
+                <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+<section id="content" class="body">
+    <h1>Authors on A Pelican Blog</h1>        <li><a href="/author/alexis-metaireau.html">Alexis Métaireau</a> (2)</li>
+</section>
+
+        <section id="extras" class="body">
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index e69de29b..b9fa57f9 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8">
+        <title>A Pelican Blog - Tags</title>
+        <link rel="stylesheet" href="/theme/css/main.css">
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+        <header id="banner" class="body">
+                <h1><a href="/">A Pelican Blog </a></h1>
+                <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+<section id="content" class="body">
+    <h1>Tags for A Pelican Blog</h1>        <li><a href="/tag/bar.html">bar</a> (3)</li>
+        <li><a href="/tag/baz.html">baz</a> (1)</li>
+        <li><a href="/tag/foo.html">foo</a> (2)</li>
+        <li><a href="/tag/foobar.html">foobar</a> (1)</li>
+        <li><a href="/tag/oh.html">oh</a> (1)</li>
+        <li><a href="/tag/yeah.html">yeah</a> (1)</li>
+</section>
+
+        <section id="extras" class="body">
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
new file mode 100644
index 00000000..264c1698
--- /dev/null
+++ b/pelican/tests/output/custom/authors.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8">
+        <title>Alexis' log - Authors</title>
+        <link rel="stylesheet" href="./theme/css/main.css">
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+<section id="content" class="body">
+    <h1>Authors on Alexis' log</h1>        <li><a href="./author/alexis-metaireau.html">Alexis Métaireau</a> (10)</li>
+</section>
+
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index e69de29b..7130b3ae 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8">
+        <title>Alexis' log - Tags</title>
+        <link rel="stylesheet" href="./theme/css/main.css">
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+<section id="content" class="body">
+    <h1>Tags for Alexis' log</h1>        <li><a href="./tag/bar.html">bar</a> (3)</li>
+        <li><a href="./tag/baz.html">baz</a> (1)</li>
+        <li><a href="./tag/foo.html">foo</a> (2)</li>
+        <li><a href="./tag/foobar.html">foobar</a> (1)</li>
+        <li><a href="./tag/oh.html">oh</a> (1)</li>
+        <li><a href="./tag/yeah.html">yeah</a> (1)</li>
+</section>
+
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/themes/notmyidea/templates/authors.html b/pelican/themes/notmyidea/templates/authors.html
index e69de29b..a203422b 100644
--- a/pelican/themes/notmyidea/templates/authors.html
+++ b/pelican/themes/notmyidea/templates/authors.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - Authors{% endblock %}
+
+{% block content %}
+
+<section id="content" class="body">
+    <h1>Authors on {{ SITENAME }}</h1>
+
+    {%- for author, articles in authors|sort %}
+        <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
+    {% endfor %}
+</section>
+
+{% endblock %}
diff --git a/pelican/themes/notmyidea/templates/tags.html b/pelican/themes/notmyidea/templates/tags.html
new file mode 100644
index 00000000..76955f27
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/tags.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - Tags{% endblock %}
+
+{% block content %}
+
+<section id="content" class="body">
+    <h1>Tags for {{ SITENAME }}</h1>
+
+    {%- for tag, articles in tags|sort %}
+        <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
+    {% endfor %}
+</section>
+
+{% endblock %}
diff --git a/pelican/themes/simple/templates/authors.html b/pelican/themes/simple/templates/authors.html
new file mode 100644
index 00000000..fa9b5170
--- /dev/null
+++ b/pelican/themes/simple/templates/authors.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - Authors{% endblock %}
+
+{% block content %}
+    <h1>Authors on {{ SITENAME }}</h1>
+    {%- for author, articles in authors|sort %}
+        <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
+    {% endfor %}
+{% endblock %}
diff --git a/pelican/themes/simple/templates/tags.html b/pelican/themes/simple/templates/tags.html
index e69de29b..b5d1482d 100644
--- a/pelican/themes/simple/templates/tags.html
+++ b/pelican/themes/simple/templates/tags.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - Tags{% endblock %}
+
+{% block content %}
+    <h1>Tags for {{ SITENAME }}</h1>
+    {%- for tag, articles in tags|sort %}
+        <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
+    {% endfor %}
+{% endblock %}

From bbea6d1747c3f95ab4b30aec47691e81bd4ef453 Mon Sep 17 00:00:00 2001
From: Danilo Bargen <gezuru@gmail.com>
Date: Mon, 5 Aug 2013 19:18:43 +0200
Subject: [PATCH 1419/2864] Explicitly set locale when generating test output

---
 docs/contribute.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 80d07644..304d1de8 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -88,9 +88,10 @@ Pelican, and the changes to that output are expected and deemed correct given
 the nature of your changes, then you should update the output used by the
 functional tests. To do so, you can use the following two commands::
 
-    $ pelican -o pelican/tests/output/custom/ -s samples/pelican.conf.py \
+    $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/custom/ \
+        -s samples/pelican.conf.py samples/content/
+    $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/basic/ \
         samples/content/
-    $ pelican -o pelican/tests/output/basic/ samples/content/
 
 Testing on Python 2 and 3
 -------------------------

From 6b68d940797a6889466cc95af4e3c1585d0d8b07 Mon Sep 17 00:00:00 2001
From: Nicholas Kuechler <nkuechler@gmail.com>
Date: Tue, 11 Jun 2013 21:43:23 -0500
Subject: [PATCH 1420/2864] Adds Rackspace Cloud Files support to quickstart
 and fabfile

---
 pelican/tools/pelican_quickstart.py   |  7 +++++++
 pelican/tools/templates/Makefile.in   | 10 +++++++++-
 pelican/tools/templates/fabfile.py.in | 15 ++++++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 3f02355a..ba11d968 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -27,6 +27,9 @@ CONF = {
     'ssh_user': 'root',
     'ssh_target_dir': '/var/www',
     's3_bucket': 'my_s3_bucket',
+    'cloudfiles_username': 'my_rackspace_username',
+    'cloudfiles_api_key': 'my_rackspace_api_key',
+    'cloudfiles_container': 'my_cloudfiles_container',
     'dropbox_dir': '~/Dropbox/Public/',
     'default_pagination': 10,
     'siteurl': '',
@@ -210,6 +213,10 @@ needed by Pelican.
             CONF['dropbox_dir'] = ask('Where is your Dropbox directory?', str_compat, CONF['dropbox_dir'])
         if ask('Do you want to upload your website using S3?', answer=bool, default=False):
             CONF['s3_bucket'] = ask('What is the name of your S3 bucket?', str_compat, CONF['s3_bucket'])
+        if ask('Do you want to upload your website using Rackspace Cloud Files?', answer=bool, default=False):
+            CONF['cloudfiles_username'] = ask('What is your Rackspace Cloud username?', str_compat, CONF['cloudfiles_username'])
+            CONF['cloudfiles_api_key'] = ask('What is your Rackspace Cloud API key?', str_compat, CONF['cloudfiles_api_key'])
+            CONF['cloudfiles_container'] = ask('What is the name of your Cloud Files container?', str_compat, CONF['cloudfiles_container'])
 
     try:
         os.makedirs(os.path.join(CONF['basedir'], 'content'))
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index f68694e3..4ca0af6a 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -18,6 +18,10 @@ SSH_TARGET_DIR=$ssh_target_dir
 
 S3_BUCKET=$s3_bucket
 
+CLOUDFILES_USERNAME=$cloudfiles_username
+CLOUDFILES_API_KEY=$cloudfiles_api_key
+CLOUDFILES_CONTAINER=$cloudfiles_container
+
 DROPBOX_DIR=$dropbox_dir
 
 DEBUG ?= 0
@@ -41,6 +45,7 @@ help:
 	@echo '   dropbox_upload                   upload the web site via Dropbox    '
 	@echo '   ftp_upload                       upload the web site via FTP        '
 	@echo '   s3_upload                        upload the web site via S3         '
+	@echo '   cf_upload                        upload the web site via Cloud Files'
 	@echo '   github                           upload the web site via gh-pages   '
 	@echo '                                                                       '
 	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html'
@@ -92,8 +97,11 @@ ftp_upload: publish
 s3_upload: publish
 	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed
 
+cf_upload: publish
+	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
+
 github: publish
 	ghp-import $$(OUTPUTDIR)
 	git push origin gh-pages
 
-.PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload github
+.PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.in
index e991b763..73c64ac8 100644
--- a/pelican/tools/templates/fabfile.py.in
+++ b/pelican/tools/templates/fabfile.py.in
@@ -4,12 +4,17 @@ import os
 
 # Local path configuration (can be absolute or relative to fabfile)
 env.deploy_path = 'output'
+DEPLOY_PATH = env.deploy_path
 
 # Remote server configuration
 production = '$ssh_user@$ssh_host:$ssh_port'
 dest_path = '$ssh_target_dir'
 
-DEPLOY_PATH = env.deploy_path
+# Rackspace Cloud Files configuration settings
+env.cloudfiles_username = '$cloudfiles_username'
+env.cloudfiles_api_key = '$cloudfiles_api_key'
+env.cloudfiles_container = '$cloudfiles_container'
+
 
 def clean():
     if os.path.isdir(DEPLOY_PATH):
@@ -36,6 +41,14 @@ def reserve():
 def preview():
     local('pelican -s publishconf.py')
 
+def cf_upload():
+    rebuild()
+    local('cd {deploy_path} && '
+          'swift -v -A https://auth.api.rackspacecloud.com/v1.0 '
+          '-U {cloudfiles_username} '
+          '-K {cloudfiles_api_key} '
+          'upload -c {cloudfiles_container} .'.format(**env))
+
 @hosts(production)
 def publish():
     local('pelican -s publishconf.py')

From ece437f8fd69975c9a78aa1bb4c04910d97e7a0e Mon Sep 17 00:00:00 2001
From: SDGSDG <karmadharma@server.fake>
Date: Mon, 5 Aug 2013 19:53:32 -0700
Subject: [PATCH 1421/2864] Added more pygments options for code blocks

---
 pelican/rstdirectives.py                      | 39 ++++++++++----
 pelican/tests/output/basic/category/misc.html |  4 +-
 .../tests/output/basic/feeds/all-en.atom.xml  | 10 ++++
 pelican/tests/output/basic/feeds/all.atom.xml | 10 ++++
 .../tests/output/basic/feeds/misc.atom.xml    | 10 ++++
 pelican/tests/output/basic/index.html         |  4 +-
 pelican/tests/output/basic/unbelievable.html  | 10 ++++
 .../custom/author/alexis-metaireau3.html      |  4 +-
 .../tests/output/custom/category/misc.html    |  4 +-
 .../tests/output/custom/feeds/all-en.atom.xml | 10 ++++
 .../tests/output/custom/feeds/all.atom.xml    | 10 ++++
 pelican/tests/output/custom/feeds/all.rss.xml | 10 ++++
 .../tests/output/custom/feeds/misc.atom.xml   | 10 ++++
 .../tests/output/custom/feeds/misc.rss.xml    | 10 ++++
 pelican/tests/output/custom/index3.html       |  4 +-
 pelican/tests/output/custom/unbelievable.html | 10 ++++
 samples/content/unbelievable.rst              | 53 +++++++++++++++++++
 17 files changed, 196 insertions(+), 16 deletions(-)

diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index 1fdd09d6..ba3a6b89 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -8,20 +8,29 @@ from pygments import highlight
 from pygments.lexers import get_lexer_by_name, TextLexer
 import re
 
-INLINESTYLES = False
-DEFAULT = HtmlFormatter(noclasses=INLINESTYLES)
-VARIANTS = {
-    'linenos': HtmlFormatter(noclasses=INLINESTYLES, linenos=True),
-}
-
 
 class Pygments(Directive):
-    """ Source code syntax hightlighting.
+    """ Source code syntax highlighting.
     """
     required_arguments = 1
     optional_arguments = 0
     final_argument_whitespace = True
-    option_spec = dict([(key, directives.flag) for key in VARIANTS])
+    option_spec = {
+        'anchorlinenos': directives.flag,
+        'classprefix': directives.unchanged,
+        'hl_lines': directives.unchanged,
+        'lineanchors': directives.unchanged,
+        'linenos': directives.unchanged,
+        'linenospecial': directives.nonnegative_int,
+        'linenostart': directives.nonnegative_int,
+        'linenostep': directives.nonnegative_int,
+        'lineseparator': directives.unchanged,
+        'linespans': directives.unchanged,
+        'nobackground': directives.flag,
+        'nowrap': directives.flag,
+        'tagsfile': directives.unchanged,
+        'tagurlformat': directives.unchanged,
+    }
     has_content = True
 
     def run(self):
@@ -31,9 +40,17 @@ class Pygments(Directive):
         except ValueError:
             # no lexer found - use the text one instead of an exception
             lexer = TextLexer()
-        # take an arbitrary option if more than one is given
-        formatter = self.options and VARIANTS[list(self.options.keys())[0]] \
-                    or DEFAULT
+
+        if ('linenos' in self.options and
+                self.options['linenos'] not in ('table', 'inline')):
+            self.options['linenos'] = 'table'
+
+        for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
+            if flag in self.options:
+                self.options[flag] = True
+
+        # noclasses should already default to False, but just in case...
+        formatter = HtmlFormatter(noclasses=False, **self.options)
         parsed = highlight('\n'.join(self.content), lexer, formatter)
         return [nodes.raw('', parsed, format='html')]
 
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index f3b9e451..1c4af16a 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -88,7 +88,9 @@
 </pre></div>
 </td></tr></table><p>Lovely.</p>
 </div>
-
+<div class="section" id="testing-more-sourcecode-directives">
+<h2>Testing more sourcecode directives</h2>
+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError ...</span></span></pre></div></div>
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 6d0c563f..5b8eb591 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -33,5 +33,15 @@ YEAH !&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 1abf742a..d19b0c30 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -34,5 +34,15 @@ YEAH !&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index b5588ce7..34b6b4fb 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -10,5 +10,15 @@
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 6989f25a..5ecaa393 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -221,7 +221,9 @@ YEAH !</p>
 </pre></div>
 </td></tr></table><p>Lovely.</p>
 </div>
-
+<div class="section" id="testing-more-sourcecode-directives">
+<h2>Testing more sourcecode directives</h2>
+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError ...</span></span></pre></div></div>
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 3f2d2f80..1fcb5553 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -48,6 +48,16 @@
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table><p>Lovely.</p>
+</div>
+<div class="section" id="testing-more-sourcecode-directives">
+<h2>Testing more sourcecode directives</h2>
+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<p>Lovely.</p>
+</div>
+<div class="section" id="testing-even-more-sourcecode-directives">
+<h2>Testing even more sourcecode directives</h2>
+<span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<p>Lovely.</p>
 </div>
 
     </div><!-- /.entry-content -->
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index e3e07e10..659c0e37 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -57,7 +57,9 @@
 </pre></div>
 </td></tr></table><p>Lovely.</p>
 </div>
-
+<div class="section" id="testing-more-sourcecode-directives">
+<h2>Testing more sourcecode directives</h2>
+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError ...</span></span></pre></div></div>
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 63c659da..db11dd9e 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -101,7 +101,9 @@
 </pre></div>
 </td></tr></table><p>Lovely.</p>
 </div>
-
+<div class="section" id="testing-more-sourcecode-directives">
+<h2>Testing more sourcecode directives</h2>
+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError ...</span></span></pre></div></div>
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index d4631d7c..ce25290d 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -33,5 +33,15 @@ YEAH !&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 2a673ada..68986d40 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -35,5 +35,15 @@ YEAH !&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index e8cd9b80..7fee491a 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -35,5 +35,15 @@ YEAH !&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 250b1b65..9328e05a 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -10,5 +10,15 @@
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 195812cc..b708c70d 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -10,5 +10,15 @@
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 52657306..821182fd 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -57,7 +57,9 @@
 </pre></div>
 </td></tr></table><p>Lovely.</p>
 </div>
-
+<div class="section" id="testing-more-sourcecode-directives">
+<h2>Testing more sourcecode directives</h2>
+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError ...</span></span></pre></div></div>
                 <a class="readmore" href="./unbelievable.html">read more</a>
 <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 26b60f38..99512327 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -55,6 +55,16 @@
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table><p>Lovely.</p>
+</div>
+<div class="section" id="testing-more-sourcecode-directives">
+<h2>Testing more sourcecode directives</h2>
+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<p>Lovely.</p>
+</div>
+<div class="section" id="testing-even-more-sourcecode-directives">
+<h2>Testing even more sourcecode directives</h2>
+<span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<p>Lovely.</p>
 </div>
 
     </div><!-- /.entry-content -->
diff --git a/samples/content/unbelievable.rst b/samples/content/unbelievable.rst
index 745ff217..b990d20c 100644
--- a/samples/content/unbelievable.rst
+++ b/samples/content/unbelievable.rst
@@ -18,3 +18,56 @@ Testing sourcecode directive
 
 
 Lovely.
+
+Testing more sourcecode directives
+----------------------------------
+
+.. sourcecode:: python
+    :anchorlinenos:
+    :classprefix: testing
+    :hl_lines: 10,11,12
+    :lineanchors: foo
+    :linenos: inline
+    :linenospecial: 2
+    :linenostart: 8
+    :linenostep: 2
+    :lineseparator: <br>
+    :linespans: foo
+    :nobackground:
+  
+    def run(self):
+        self.assert_has_content()
+        try:
+            lexer = get_lexer_by_name(self.arguments[0])
+        except ValueError:
+            # no lexer found - use the text one instead of an exception
+            lexer = TextLexer()
+
+        if ('linenos' in self.options and
+                self.options['linenos'] not in ('table', 'inline')):
+            self.options['linenos'] = 'table'
+
+        for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
+            if flag in self.options:
+                self.options[flag] = True
+
+        # noclasses should already default to False, but just in case...
+        formatter = HtmlFormatter(noclasses=False, **self.options)
+        parsed = highlight('\n'.join(self.content), lexer, formatter)
+        return [nodes.raw('', parsed, format='html')]
+
+
+Lovely.
+
+Testing even more sourcecode directives
+---------------------------------------
+
+.. sourcecode:: python
+    :linenos: table
+    :nowrap:
+    
+  
+    formatter = self.options and VARIANTS[self.options.keys()[0]]
+
+
+Lovely.

From 4bc4b1500c91b63a37891e60a1e262e4f3fada1c Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 4 Aug 2013 17:02:58 +0200
Subject: [PATCH 1422/2864] Refactor readers and remove MARKUP

Add a `Readers` class which contains a dict of file extensions / `Reader`
instances. This dict can be overwritten with a `READERS` settings, for instance
to avoid processing *.html files:

    READERS = {'html': None}

Or to add a custom reader for the `foo` extension:

    READERS = {'foo': FooReader}

This dict is no storing the Reader classes as it was done before with
`EXTENSIONS`. It stores the instances of the Reader classes to avoid instancing
for each file reading.
---
 pelican/__init__.py              |  22 ++--
 pelican/generators.py            |  37 +++---
 pelican/readers.py               | 209 +++++++++++++++++--------------
 pelican/settings.py              |  56 +++++----
 pelican/tests/test_generators.py |  63 +++++-----
 pelican/tests/test_readers.py    |   6 +-
 pelican/tests/test_utils.py      |  11 +-
 7 files changed, 201 insertions(+), 203 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 9bce4926..8ba79e0a 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -17,6 +17,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 StaticGenerator, SourceFileGenerator,
                                 TemplatePagesGenerator)
 from pelican.log import init
+from pelican.readers import Readers
 from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, folder_watcher, file_watcher
 from pelican.writers import Writer
@@ -46,7 +47,6 @@ class Pelican(object):
         self.path = settings['PATH']
         self.theme = settings['THEME']
         self.output_path = settings['OUTPUT_PATH']
-        self.markup = settings['MARKUP']
         self.ignore_files = settings['IGNORE_FILES']
         self.delete_outputdir = settings['DELETE_OUTPUT_DIRECTORY']
         self.output_retention = settings['OUTPUT_RETENTION']
@@ -164,7 +164,6 @@ class Pelican(object):
                 path=self.path,
                 theme=self.theme,
                 output_path=self.output_path,
-                markup=self.markup,
             ) for cls in self.get_generator_classes()
         ]
 
@@ -236,10 +235,6 @@ def parse_arguments():
         help='Where to output the generated files. If not specified, a '
              'directory will be created, named "output" in the current path.')
 
-    parser.add_argument('-m', '--markup', dest='markup',
-        help='The list of markup language to use (rst or md). Please indicate '
-             'them separated by commas.')
-
     parser.add_argument('-s', '--settings', dest='settings',
         help='The settings of the application, this is automatically set to '
         '{0} if a file exists with this name.'.format(DEFAULT_CONFIG_NAME))
@@ -279,8 +274,6 @@ def get_config(args):
     if args.output:
         config['OUTPUT_PATH'] = \
                 os.path.abspath(os.path.expanduser(args.output))
-    if args.markup:
-        config['MARKUP'] = [a.strip().lower() for a in args.markup.split(',')]
     if args.theme:
         abstheme = os.path.abspath(os.path.expanduser(args.theme))
         config['THEME'] = abstheme if os.path.exists(abstheme) else args.theme
@@ -296,8 +289,6 @@ def get_config(args):
         for key in config:
             if key in ('PATH', 'OUTPUT_PATH', 'THEME'):
                 config[key] = config[key].decode(enc)
-            if key == "MARKUP":
-                config[key] = [a.decode(enc) for a in config[key]]
     return config
 
 
@@ -315,16 +306,17 @@ def get_instance(args):
         module = __import__(module)
         cls = getattr(module, cls_name)
 
-    return cls(settings)
+    return cls(settings), settings
 
 
 def main():
     args = parse_arguments()
     init(args.verbosity)
-    pelican = get_instance(args)
+    pelican, settings = get_instance(args)
+    readers = Readers(settings)
 
     watchers = {'content': folder_watcher(pelican.path,
-                                          pelican.markup,
+                                          readers.extensions,
                                           pelican.ignore_files),
                 'theme': folder_watcher(pelican.theme,
                                         [''],
@@ -333,8 +325,8 @@ def main():
 
     try:
         if args.autoreload:
-            print('  --- AutoReload Mode: Monitoring `content`, `theme` and `settings`'
-                  ' for changes. ---')
+            print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
+                  ' `settings` for changes. ---')
 
             while True:
                 try:
diff --git a/pelican/generators.py b/pelican/generators.py
index 1444c95c..72c76b32 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -13,16 +13,13 @@ from functools import partial
 from itertools import chain, groupby
 from operator import attrgetter, itemgetter
 
-from jinja2 import (
-        Environment, FileSystemLoader, PrefixLoader, ChoiceLoader, BaseLoader,
-        TemplateNotFound
-)
+from jinja2 import (Environment, FileSystemLoader, PrefixLoader, ChoiceLoader,
+                    BaseLoader, TemplateNotFound)
 
 from pelican.contents import Article, Page, Static, is_valid_content
-from pelican.readers import read_file
+from pelican.readers import Readers
 from pelican.utils import copy, process_translations, mkdir_p, DateFormatter
 from pelican import signals
-import pelican.utils
 
 
 logger = logging.getLogger(__name__)
@@ -31,23 +28,23 @@ logger = logging.getLogger(__name__)
 class Generator(object):
     """Baseclass generator"""
 
-    def __init__(self, context, settings, path, theme, output_path, markup,
-                 **kwargs):
+    def __init__(self, context, settings, path, theme, output_path, **kwargs):
         self.context = context
         self.settings = settings
         self.path = path
         self.theme = theme
         self.output_path = output_path
-        self.markup = markup
 
         for arg, value in kwargs.items():
             setattr(self, arg, value)
 
+        self.readers = Readers(self.settings)
+
         # templates cache
         self._templates = {}
         self._templates_path = []
         self._templates_path.append(os.path.expanduser(
-                os.path.join(self.theme, 'templates')))
+            os.path.join(self.theme, 'templates')))
         self._templates_path += self.settings['EXTRA_TEMPLATES_PATHS']
 
         theme_path = os.path.dirname(os.path.abspath(__file__))
@@ -85,9 +82,8 @@ class Generator(object):
             try:
                 self._templates[name] = self.env.get_template(name + '.html')
             except TemplateNotFound:
-                raise Exception(
-                        ('[templates] unable to load %s.html from %s'
-                         % (name, self._templates_path)))
+                raise Exception('[templates] unable to load %s.html from %s'
+                                % (name, self._templates_path))
         return self._templates[name]
 
     def _include_path(self, path, extensions=None):
@@ -98,7 +94,7 @@ class Generator(object):
             extensions are allowed)
         """
         if extensions is None:
-            extensions = tuple(self.markup)
+            extensions = tuple(self.readers.extensions)
         basename = os.path.basename(path)
         if extensions is False or basename.endswith(extensions):
             return True
@@ -388,9 +384,9 @@ class ArticlesGenerator(Generator):
                 self.settings['ARTICLE_DIR'],
                 exclude=self.settings['ARTICLE_EXCLUDES']):
             try:
-                article = read_file(
+                article = self.readers.read_file(
                     base_path=self.path, path=f, content_class=Article,
-                    settings=self.settings, context=self.context,
+                    context=self.context,
                     preread_signal=signals.article_generator_preread,
                     preread_sender=self,
                     context_signal=signals.article_generator_context,
@@ -496,9 +492,9 @@ class PagesGenerator(Generator):
                 self.settings['PAGE_DIR'],
                 exclude=self.settings['PAGE_EXCLUDES']):
             try:
-                page = read_file(
+                page = self.readers.read_file(
                     base_path=self.path, path=f, content_class=Page,
-                    settings=self.settings, context=self.context,
+                    context=self.context,
                     preread_signal=signals.page_generator_preread,
                     preread_sender=self,
                     context_signal=signals.page_generator_context,
@@ -557,10 +553,9 @@ class StaticGenerator(Generator):
         for static_path in self.settings['STATIC_PATHS']:
             for f in self.get_files(
                     static_path, extensions=False):
-                static = read_file(
+                static = self.readers.read_file(
                     base_path=self.path, path=f, content_class=Static,
-                    fmt='static',
-                    settings=self.settings, context=self.context,
+                    fmt='static', context=self.context,
                     preread_signal=signals.static_generator_preread,
                     preread_sender=self,
                     context_signal=signals.static_generator_context,
diff --git a/pelican/readers.py b/pelican/readers.py
index 3923245e..9cf78042 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -37,7 +37,6 @@ except ImportError:
 from pelican.contents import Page, Category, Tag, Author
 from pelican.utils import get_date, pelican_open
 
-logger = logging.getLogger(__name__)
 
 METADATA_PROCESSORS = {
     'tags': lambda x, y: [Tag(tag, y) for tag in x.split(',')],
@@ -50,7 +49,7 @@ METADATA_PROCESSORS = {
 logger = logging.getLogger(__name__)
 
 
-class Reader(object):
+class BaseReader(object):
     enabled = True
     file_extensions = ['static']
     extensions = None
@@ -110,7 +109,7 @@ class PelicanHTMLTranslator(HTMLTranslator):
         return HTMLTranslator.visit_image(self, node)
 
 
-class RstReader(Reader):
+class RstReader(BaseReader):
     enabled = bool(docutils)
     file_extensions = ['rst']
 
@@ -166,7 +165,7 @@ class RstReader(Reader):
         return content, metadata
 
 
-class MarkdownReader(Reader):
+class MarkdownReader(BaseReader):
     enabled = bool(Markdown)
     file_extensions = ['md', 'markdown', 'mkd', 'mdown']
 
@@ -174,7 +173,6 @@ class MarkdownReader(Reader):
         super(MarkdownReader, self).__init__(*args, **kwargs)
         self.extensions = self.settings['MD_EXTENSIONS']
         self.extensions.append('meta')
-        self._md = Markdown(extensions=self.extensions)
 
     def _parse_metadata(self, meta):
         """Return the dict containing document metadata"""
@@ -194,6 +192,7 @@ class MarkdownReader(Reader):
     def read(self, source_path):
         """Parse content and metadata of markdown files"""
 
+        self._md = Markdown(extensions=self.extensions)
         with pelican_open(source_path) as text:
             content = self._md.convert(text)
 
@@ -201,7 +200,7 @@ class MarkdownReader(Reader):
         return content, metadata
 
 
-class HTMLReader(Reader):
+class HTMLReader(BaseReader):
     """Parses HTML files as input, looking for meta, title, and body tags"""
     file_extensions = ['htm', 'html']
     enabled = True
@@ -312,7 +311,7 @@ class HTMLReader(Reader):
         return parser.body, metadata
 
 
-class AsciiDocReader(Reader):
+class AsciiDocReader(BaseReader):
     enabled = bool(asciidoc)
     file_extensions = ['asc']
     default_options = ["--no-header-footer", "-a newline=\\n"]
@@ -344,109 +343,125 @@ class AsciiDocReader(Reader):
         return content, metadata
 
 
-EXTENSIONS = {}
+class Readers(object):
 
-for cls in [Reader] + Reader.__subclasses__():
-    for ext in cls.file_extensions:
-        EXTENSIONS[ext] = cls
+    def __init__(self, settings=None):
+        self.settings = settings or {}
+        self.readers = {}
 
+        extensions = {}
+        for cls in [BaseReader] + BaseReader.__subclasses__():
+            for ext in cls.file_extensions:
+                extensions[ext] = cls
 
-def read_file(base_path, path, content_class=Page, fmt=None,
-              settings=None, context=None,
-              preread_signal=None, preread_sender=None,
-              context_signal=None, context_sender=None):
-    """Return a content object parsed with the given format."""
-    path = os.path.abspath(os.path.join(base_path, path))
-    source_path = os.path.relpath(path, base_path)
-    base, ext = os.path.splitext(os.path.basename(path))
-    logger.debug('read file {} -> {}'.format(
+        if self.settings['READERS']:
+            extensions.update(self.settings['READERS'])
+
+        for fmt, reader_class in extensions.items():
+            if not reader_class:
+                continue
+
+            if not reader_class.enabled:
+                logger.warning('Missing dependencies for {}'.format(fmt))
+                continue
+
+            self.readers[fmt] = reader_class(self.settings)
+
+            settings_key = '%s_EXTENSIONS' % fmt.upper()
+
+            if settings_key in self.settings:
+                self.readers[fmt].extensions = self.settings[settings_key]
+
+    @property
+    def extensions(self):
+        return self.readers.keys()
+
+    def read_file(self, base_path, path, content_class=Page, fmt=None,
+                  context=None, preread_signal=None, preread_sender=None,
+                  context_signal=None, context_sender=None):
+        """Return a content object parsed with the given format."""
+
+        path = os.path.abspath(os.path.join(base_path, path))
+        source_path = os.path.relpath(path, base_path)
+        logger.debug('read file {} -> {}'.format(
             source_path, content_class.__name__))
-    if not fmt:
-        fmt = ext[1:]
 
-    if fmt not in EXTENSIONS:
-        raise TypeError('Pelican does not know how to parse {}'.format(path))
+        if not fmt:
+            _, ext = os.path.splitext(os.path.basename(path))
+            fmt = ext[1:]
 
-    if preread_signal:
-        logger.debug('signal {}.send({})'.format(
+        if fmt not in self.readers:
+            raise TypeError(
+                'Pelican does not know how to parse {}'.format(path))
+
+        if preread_signal:
+            logger.debug('signal {}.send({})'.format(
                 preread_signal, preread_sender))
-        preread_signal.send(preread_sender)
+            preread_signal.send(preread_sender)
 
-    if settings is None:
-        settings = {}
+        reader = self.readers[fmt]
 
-    reader_class = EXTENSIONS[fmt]
-    if not reader_class.enabled:
-        raise ValueError('Missing dependencies for {}'.format(fmt))
-
-    reader = reader_class(settings)
-
-    settings_key = '%s_EXTENSIONS' % fmt.upper()
-
-    if settings and settings_key in settings:
-        reader.extensions = settings[settings_key]
-
-    metadata = default_metadata(
-        settings=settings, process=reader.process_metadata)
-    metadata.update(path_metadata(
-            full_path=path, source_path=source_path, settings=settings))
-    metadata.update(parse_path_metadata(
-            source_path=source_path, settings=settings,
+        metadata = default_metadata(
+            settings=self.settings, process=reader.process_metadata)
+        metadata.update(path_metadata(
+            full_path=path, source_path=source_path,
+            settings=self.settings))
+        metadata.update(parse_path_metadata(
+            source_path=source_path, settings=self.settings,
             process=reader.process_metadata))
-    content, reader_metadata = reader.read(path)
-    metadata.update(reader_metadata)
 
-    # create warnings for all images with empty alt (up to a certain number)
-    # as they are really likely to be accessibility flaws
-    if content:
-        # find images with empty alt
-        imgs = re.compile(r"""
-            (?:
-                # src before alt
-                <img
-                [^\>]*
-                src=(['"])(.*)\1
-                [^\>]*
-                alt=(['"])\3
-            )|(?:
-                # alt before src
-                <img
-                [^\>]*
-                alt=(['"])\4
-                [^\>]*
-                src=(['"])(.*)\5
-            )
-            """, re.X)
-        matches = re.findall(imgs, content)
-        # find a correct threshold
-        nb_warnings = 10
-        if len(matches) == nb_warnings + 1:
-            nb_warnings += 1 # avoid bad looking case
-        # print one warning per image with empty alt until threshold
-        for match in matches[:nb_warnings]:
-            logger.warning('Empty alt attribute for image {} in {}'.format(
-                           os.path.basename(match[1] + match[5]), path))
-        # print one warning for the other images with empty alt
-        if len(matches) > nb_warnings:
-            logger.warning('{} other images with empty alt attributes'.format(
-                           len(matches) - nb_warnings))
+        content, reader_metadata = reader.read(path)
+        metadata.update(reader_metadata)
 
-    # eventually filter the content with typogrify if asked so
-    if content and settings and settings['TYPOGRIFY']:
-        from typogrify.filters import typogrify
-        content = typogrify(content)
-        metadata['title'] = typogrify(metadata['title'])
+        # create warnings for all images with empty alt (up to a certain
+        # number) # as they are really likely to be accessibility flaws
+        if content:
+            # find images with empty alt
+            imgs = re.compile(r"""
+                (?:
+                    # src before alt
+                    <img
+                    [^\>]*
+                    src=(['"])(.*)\1
+                    [^\>]*
+                    alt=(['"])\3
+                )|(?:
+                    # alt before src
+                    <img
+                    [^\>]*
+                    alt=(['"])\4
+                    [^\>]*
+                    src=(['"])(.*)\5
+                )
+                """, re.X)
+            matches = re.findall(imgs, content)
+            # find a correct threshold
+            nb_warnings = 10
+            if len(matches) == nb_warnings + 1:
+                nb_warnings += 1  # avoid bad looking case
+            # print one warning per image with empty alt until threshold
+            for match in matches[:nb_warnings]:
+                logger.warning('Empty alt attribute for image {} in {}'.format(
+                               os.path.basename(match[1] + match[5]), path))
+            # print one warning for the other images with empty alt
+            if len(matches) > nb_warnings:
+                logger.warning('{} other images with empty alt attributes'
+                               .format(len(matches) - nb_warnings))
 
-    if context_signal:
-        logger.debug('signal {}.send({}, <metadata>)'.format(
+        # eventually filter the content with typogrify if asked so
+        if content and self.settings['TYPOGRIFY']:
+            from typogrify.filters import typogrify
+            content = typogrify(content)
+            metadata['title'] = typogrify(metadata['title'])
+
+        if context_signal:
+            logger.debug('signal {}.send({}, <metadata>)'.format(
                 context_signal, context_sender))
-        context_signal.send(context_sender, metadata=metadata)
-    return content_class(
-        content=content,
-        metadata=metadata,
-        settings=settings,
-        source_path=path,
-        context=context)
+            context_signal.send(context_sender, metadata=metadata)
+
+        return content_class(content=content, metadata=metadata,
+                             settings=self.settings, source_path=path,
+                             context=context)
 
 
 def default_metadata(settings=None, process=None):
@@ -482,7 +497,7 @@ def parse_path_metadata(source_path, settings=None, process=None):
     ...     'PATH_METADATA':
     ...         '(?P<category>[^/]*)/(?P<date>\d{4}-\d{2}-\d{2})/.*',
     ...     }
-    >>> reader = Reader(settings=settings)
+    >>> reader = BaseReader(settings=settings)
     >>> metadata = parse_path_metadata(
     ...     source_path='my-cat/2013-01-01/my-slug.html',
     ...     settings=settings,
diff --git a/pelican/settings.py b/pelican/settings.py
index 0f37c98d..e71796a2 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -33,7 +33,7 @@ DEFAULT_CONFIG = {
     'PAGE_EXCLUDES': (),
     'THEME': DEFAULT_THEME,
     'OUTPUT_PATH': 'output',
-    'MARKUP': ('rst', 'md'),
+    'READERS': {},
     'STATIC_PATHS': ['images', ],
     'THEME_STATIC_DIR': 'theme',
     'THEME_STATIC_PATHS': ['static', ],
@@ -112,6 +112,7 @@ DEFAULT_CONFIG = {
     'SLUG_SUBSTITUTIONS': (),
     }
 
+
 def read_settings(path=None, override=None):
     if path:
         local_settings = get_settings_from_file(path)
@@ -120,7 +121,7 @@ def read_settings(path=None, override=None):
             if p in local_settings and local_settings[p] is not None \
                     and not isabs(local_settings[p]):
                 absp = os.path.abspath(os.path.normpath(os.path.join(
-                            os.path.dirname(path), local_settings[p])))
+                    os.path.dirname(path), local_settings[p])))
                 if p not in ('THEME', 'PLUGIN_PATH') or os.path.exists(absp):
                     local_settings[p] = absp
     else:
@@ -138,7 +139,7 @@ def get_settings_from_module(module=None, default_settings=DEFAULT_CONFIG):
     context = copy.deepcopy(default_settings)
     if module is not None:
         context.update(
-                (k, v) for k, v in inspect.getmembers(module) if k.isupper())
+            (k, v) for k, v in inspect.getmembers(module) if k.isupper())
     return context
 
 
@@ -221,17 +222,18 @@ def configure_settings(settings):
             settings['FEED_DOMAIN'] = settings['SITEURL']
 
     # Warn if feeds are generated with both SITEURL & FEED_DOMAIN undefined
-    feed_keys = ['FEED_ATOM', 'FEED_RSS',
-                 'FEED_ALL_ATOM', 'FEED_ALL_RSS',
-                 'CATEGORY_FEED_ATOM', 'CATEGORY_FEED_RSS',
-                 'TAG_FEED_ATOM', 'TAG_FEED_RSS',
-                 'TRANSLATION_FEED_ATOM', 'TRANSLATION_FEED_RSS',
-                ]
+    feed_keys = [
+        'FEED_ATOM', 'FEED_RSS',
+        'FEED_ALL_ATOM', 'FEED_ALL_RSS',
+        'CATEGORY_FEED_ATOM', 'CATEGORY_FEED_RSS',
+        'TAG_FEED_ATOM', 'TAG_FEED_RSS',
+        'TRANSLATION_FEED_ATOM', 'TRANSLATION_FEED_RSS',
+    ]
 
     if any(settings.get(k) for k in feed_keys):
         if not settings.get('SITEURL'):
-            logger.warning('Feeds generated without SITEURL set properly may not'
-                        ' be valid')
+            logger.warning('Feeds generated without SITEURL set properly may'
+                           ' not be valid')
 
     if not 'TIMEZONE' in settings:
         logger.warning(
@@ -255,26 +257,26 @@ def configure_settings(settings):
 
     # Save people from accidentally setting a string rather than a list
     path_keys = (
-            'ARTICLE_EXCLUDES',
-            'DEFAULT_METADATA',
-            'DIRECT_TEMPLATES',
-            'EXTRA_TEMPLATES_PATHS',
-            'FILES_TO_COPY',
-            'IGNORE_FILES',
-            'JINJA_EXTENSIONS',
-            'MARKUP',
-            'PAGINATED_DIRECT_TEMPLATES',
-            'PLUGINS',
-            'STATIC_PATHS',
-            'THEME_STATIC_PATHS',)
+        'ARTICLE_EXCLUDES',
+        'DEFAULT_METADATA',
+        'DIRECT_TEMPLATES',
+        'EXTRA_TEMPLATES_PATHS',
+        'FILES_TO_COPY',
+        'IGNORE_FILES',
+        'JINJA_EXTENSIONS',
+        'PAGINATED_DIRECT_TEMPLATES',
+        'PLUGINS',
+        'STATIC_PATHS',
+        'THEME_STATIC_PATHS',
+    )
     for PATH_KEY in filter(lambda k: k in settings, path_keys):
             if isinstance(settings[PATH_KEY], six.string_types):
-                logger.warning("Detected misconfiguration with %s setting (must "
-                        "be a list), falling back to the default"
-                        % PATH_KEY)
+                logger.warning("Detected misconfiguration with %s setting "
+                               "(must be a list), falling back to the default"
+                               % PATH_KEY)
                 settings[PATH_KEY] = DEFAULT_CONFIG[PATH_KEY]
 
-    for old,new,doc in [
+    for old, new, doc in [
             ('LESS_GENERATOR', 'the Webassets plugin', None),
             ('FILES_TO_COPY', 'STATIC_PATHS and EXTRA_PATH_METADATA',
              'https://github.com/getpelican/pelican/blob/master/docs/settings.rst#path-metadata'),
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index d8a4336d..bd4e6021 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -20,8 +20,7 @@ class TestGenerator(unittest.TestCase):
     def setUp(self):
         self.settings = get_settings()
         self.generator = Generator(self.settings.copy(), self.settings,
-                                   CUR_DIR, self.settings['THEME'], None,
-                                   self.settings['MARKUP'])
+                                   CUR_DIR, self.settings['THEME'], None)
 
     def test_include_path(self):
         filename = os.path.join(CUR_DIR, 'content', 'article.rst')
@@ -30,10 +29,6 @@ class TestGenerator(unittest.TestCase):
         self.assertTrue(include_path(filename, extensions=('rst',)))
         self.assertFalse(include_path(filename, extensions=('md',)))
 
-        # markup must be a tuple, test that this works also with a list
-        self.generator.markup = ['rst', 'md']
-        self.assertTrue(include_path(filename))
-
 
 class TestArticlesGenerator(unittest.TestCase):
 
@@ -45,8 +40,7 @@ class TestArticlesGenerator(unittest.TestCase):
 
         cls.generator = ArticlesGenerator(
             context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'],
-            output_path=None, markup=settings['MARKUP'])
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         cls.generator.generate_context()
         cls.articles = [[page.title, page.status, page.category.name,
                          page.template] for page in cls.generator.articles]
@@ -55,8 +49,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings()
         generator = ArticlesGenerator(
             context=settings, settings=settings,
-            path=None, theme=settings['THEME'],
-            output_path=None, markup=settings['MARKUP'])
+            path=None, theme=settings['THEME'], output_path=None)
         writer = MagicMock()
         generator.generate_feeds(writer)
         writer.write_feed.assert_called_with([], settings,
@@ -64,8 +57,7 @@ class TestArticlesGenerator(unittest.TestCase):
 
         generator = ArticlesGenerator(
             context=settings, settings=get_settings(FEED_ALL_ATOM=None),
-            path=None, theme=settings['THEME'],
-            output_path=None, markup=None)
+            path=None, theme=settings['THEME'], output_path=None)
         writer = MagicMock()
         generator.generate_feeds(writer)
         self.assertFalse(writer.write_feed.called)
@@ -74,26 +66,33 @@ class TestArticlesGenerator(unittest.TestCase):
 
         articles_expected = [
             ['Article title', 'published', 'Default', 'article'],
-            ['Article with markdown and summary metadata single', 'published',
-             'Default', 'article'],
             ['Article with markdown and summary metadata multi', 'published',
              'Default', 'article'],
+            ['Article with markdown and summary metadata single', 'published',
+             'Default', 'article'],
+            ['Article with markdown containing footnotes', 'published',
+             'Default', 'article'],
             ['Article with template', 'published', 'Default', 'custom'],
-            ['Test md File', 'published', 'test', 'article'],
             ['Rst with filename metadata', 'published', 'yeah', 'article'],
             ['Test Markdown extensions', 'published', 'Default', 'article'],
+            ['Test markdown File', 'published', 'test', 'article'],
+            ['Test md File', 'published', 'test', 'article'],
+            ['Test mdown File', 'published', 'test', 'article'],
+            ['Test mkd File', 'published', 'test', 'article'],
             ['This is a super article !', 'published', 'Yeah', 'article'],
+            ['This is a super article !', 'published', 'Yeah', 'article'],
+            ['This is a super article !', 'published', 'yeah', 'article'],
+            ['This is a super article !', 'published', 'yeah', 'article'],
+            ['This is a super article !', 'published', 'yeah', 'article'],
+            ['This is a super article !', 'published', 'Default', 'article'],
             ['This is an article with category !', 'published', 'yeah',
-              'article'],
+             'article'],
             ['This is an article without category !', 'published', 'Default',
              'article'],
             ['This is an article without category !', 'published',
              'TestCategory', 'article'],
-            ['This is a super article !', 'published', 'yeah', 'article'],
-            ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定',
-             'published', '指導書', 'article'],
-            ['Article with markdown containing footnotes', 'published',
-             'Default', 'article']
+            ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定', 'published',
+             '指導書', 'article'],
         ]
         self.assertEqual(sorted(articles_expected), sorted(self.articles))
 
@@ -124,8 +123,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings['filenames'] = {}
         generator = ArticlesGenerator(
             context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'],
-            output_path=None, markup=settings['MARKUP'])
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         # test for name
         # categories are grouped by slug; if two categories have the same slug
@@ -147,8 +145,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings(filenames={})
         generator = ArticlesGenerator(
             context=settings, settings=settings,
-            path=None, theme=settings['THEME'],
-            output_path=None, markup=settings['MARKUP'])
+            path=None, theme=settings['THEME'], output_path=None)
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_with("archives.html",
@@ -162,8 +159,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
         generator = ArticlesGenerator(
             context=settings, settings=settings,
-            path=None, theme=settings['THEME'],
-            output_path=None, markup=settings['MARKUP'])
+            path=None, theme=settings['THEME'], output_path=None)
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_with("archives/index.html",
@@ -178,8 +174,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
         generator = ArticlesGenerator(
             context=settings, settings=settings,
-            path=None, theme=settings['THEME'],
-            output_path=None, markup=settings['MARKUP'])
+            path=None, theme=settings['THEME'], output_path=None)
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_count == 0
@@ -212,8 +207,7 @@ class TestPageGenerator(unittest.TestCase):
 
         generator = PagesGenerator(
             context=settings.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'],
-            output_path=None, markup=settings['MARKUP'])
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
         hidden_pages = self.distill_pages(generator.hidden_pages)
@@ -252,13 +246,12 @@ class TestTemplatePagesGenerator(unittest.TestCase):
         settings = get_settings()
         settings['STATIC_PATHS'] = ['static']
         settings['TEMPLATE_PAGES'] = {
-                'template/source.html': 'generated/file.html'
-                }
+            'template/source.html': 'generated/file.html'
+        }
 
         generator = TemplatePagesGenerator(
             context={'foo': 'bar'}, settings=settings,
-            path=self.temp_content, theme='',
-            output_path=self.temp_output, markup=None)
+            path=self.temp_content, theme='', output_path=self.temp_output)
 
         # create a dummy template file
         template_dir = os.path.join(self.temp_content, 'template')
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index c67b8a1f..43cf5ecf 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -19,8 +19,8 @@ class ReaderTest(unittest.TestCase):
 
     def read_file(self, path, **kwargs):
         # Isolate from future API changes to readers.read_file
-        return readers.read_file(
-            base_path=CONTENT_PATH, path=path, settings=get_settings(**kwargs))
+        r = readers.Readers(settings=get_settings(**kwargs))
+        return r.read_file(base_path=CONTENT_PATH, path=path)
 
 
 class RstReaderTest(ReaderTest):
@@ -160,7 +160,7 @@ class MdReaderTest(ReaderTest):
             ' with some footnotes'
             '<sup id="fnref:footnote"><a class="footnote-ref" '
             'href="#fn:footnote" rel="footnote">2</a></sup></p>\n'
-            
+
             '<div class="footnote">\n'
             '<hr />\n<ol>\n<li id="fn:1">\n'
             '<p>Numbered footnote&#160;'
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 0e65003a..3a1cceca 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -353,12 +353,13 @@ class TestDateFormatter(unittest.TestCase):
                          'French locale needed')
     def test_french_locale(self):
         settings = read_settings(
-            override = {'LOCALE': locale.normalize('fr_FR.UTF-8'),
-                        'TEMPLATE_PAGES': {'template/source.html':
-                                           'generated/file.html'}})
+            override={'LOCALE': locale.normalize('fr_FR.UTF-8'),
+                      'TEMPLATE_PAGES': {'template/source.html':
+                                         'generated/file.html'}})
 
-        generator = TemplatePagesGenerator({'date': self.date}, settings,
-                self.temp_content, '', self.temp_output, None)
+        generator = TemplatePagesGenerator(
+            {'date': self.date}, settings,
+            self.temp_content, '', self.temp_output)
         generator.env.filters.update({'strftime': utils.DateFormatter()})
 
         writer = Writer(self.temp_output, settings=settings)

From cfe72c2736755173c774fb8a612ba3a84dd81131 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 4 Aug 2013 21:17:15 +0200
Subject: [PATCH 1423/2864] Disable asciidoc files for tests

---
 pelican/tests/test_generators.py | 3 +++
 pelican/tests/test_utils.py      | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index bd4e6021..f47ce7d3 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -19,6 +19,7 @@ CONTENT_DIR = os.path.join(CUR_DIR, 'content')
 class TestGenerator(unittest.TestCase):
     def setUp(self):
         self.settings = get_settings()
+        self.settings['READERS'] = {'asc': None}
         self.generator = Generator(self.settings.copy(), self.settings,
                                    CUR_DIR, self.settings['THEME'], None)
 
@@ -37,6 +38,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings(filenames={})
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
+        settings['READERS'] = {'asc': None}
 
         cls.generator = ArticlesGenerator(
             context=settings.copy(), settings=settings,
@@ -120,6 +122,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['USE_FOLDER_AS_CATEGORY'] = False
+        settings['READERS'] = {'asc': None}
         settings['filenames'] = {}
         generator = ArticlesGenerator(
             context=settings.copy(), settings=settings,
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 3a1cceca..0642926e 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -386,8 +386,9 @@ class TestDateFormatter(unittest.TestCase):
                         'TEMPLATE_PAGES': {'template/source.html':
                                            'generated/file.html'}})
 
-        generator = TemplatePagesGenerator({'date': self.date}, settings,
-                self.temp_content, '', self.temp_output, None)
+        generator = TemplatePagesGenerator(
+            {'date': self.date}, settings,
+            self.temp_content, '', self.temp_output)
         generator.env.filters.update({'strftime': utils.DateFormatter()})
 
         writer = Writer(self.temp_output, settings=settings)

From 85ea737a98d5e269a0140039f12bffbd43fe0bbb Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Wed, 7 Aug 2013 00:01:12 +0200
Subject: [PATCH 1424/2864] Add a signal to give access to the dict of Reader
 classes.

---
 pelican/readers.py | 13 ++++++++-----
 pelican/signals.py |  4 ++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 9cf78042..e5283de7 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -34,6 +34,7 @@ try:
 except ImportError:
     from HTMLParser import HTMLParser
 
+from pelican import signals
 from pelican.contents import Page, Category, Tag, Author
 from pelican.utils import get_date, pelican_open
 
@@ -348,16 +349,18 @@ class Readers(object):
     def __init__(self, settings=None):
         self.settings = settings or {}
         self.readers = {}
+        self.reader_classes = {}
 
-        extensions = {}
         for cls in [BaseReader] + BaseReader.__subclasses__():
             for ext in cls.file_extensions:
-                extensions[ext] = cls
+                self.reader_classes[ext] = cls
 
         if self.settings['READERS']:
-            extensions.update(self.settings['READERS'])
+            self.reader_classes.update(self.settings['READERS'])
 
-        for fmt, reader_class in extensions.items():
+        signals.readers_init.send(self)
+
+        for fmt, reader_class in self.reader_classes.items():
             if not reader_class:
                 continue
 
@@ -484,7 +487,7 @@ def path_metadata(full_path, source_path, settings=None):
             metadata['date'] = datetime.datetime.fromtimestamp(
                 os.stat(full_path).st_ctime)
         metadata.update(settings.get('EXTRA_PATH_METADATA', {}).get(
-                source_path, {}))
+            source_path, {}))
     return metadata
 
 
diff --git a/pelican/signals.py b/pelican/signals.py
index cb010d37..77802e88 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -8,6 +8,10 @@ initialized = signal('pelican_initialized')
 get_generators = signal('get_generators')
 finalized = signal('pelican_finalized')
 
+# Reader-level signals
+
+readers_init = signal('readers_init')
+
 # Generator-level signals
 
 generator_init = signal('generator_init')

From bab8d0b26a80ab3c9b38311d26fccad938ec2220 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Wed, 7 Aug 2013 00:10:26 +0200
Subject: [PATCH 1425/2864] Move the "find image with an empty alt" block in a
 function.

---
 pelican/readers.py | 79 +++++++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 36 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index e5283de7..3b3bfd12 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -416,40 +416,9 @@ class Readers(object):
         content, reader_metadata = reader.read(path)
         metadata.update(reader_metadata)
 
-        # create warnings for all images with empty alt (up to a certain
-        # number) # as they are really likely to be accessibility flaws
         if content:
             # find images with empty alt
-            imgs = re.compile(r"""
-                (?:
-                    # src before alt
-                    <img
-                    [^\>]*
-                    src=(['"])(.*)\1
-                    [^\>]*
-                    alt=(['"])\3
-                )|(?:
-                    # alt before src
-                    <img
-                    [^\>]*
-                    alt=(['"])\4
-                    [^\>]*
-                    src=(['"])(.*)\5
-                )
-                """, re.X)
-            matches = re.findall(imgs, content)
-            # find a correct threshold
-            nb_warnings = 10
-            if len(matches) == nb_warnings + 1:
-                nb_warnings += 1  # avoid bad looking case
-            # print one warning per image with empty alt until threshold
-            for match in matches[:nb_warnings]:
-                logger.warning('Empty alt attribute for image {} in {}'.format(
-                               os.path.basename(match[1] + match[5]), path))
-            # print one warning for the other images with empty alt
-            if len(matches) > nb_warnings:
-                logger.warning('{} other images with empty alt attributes'
-                               .format(len(matches) - nb_warnings))
+            find_empty_alt(content, path)
 
         # eventually filter the content with typogrify if asked so
         if content and self.settings['TYPOGRIFY']:
@@ -467,6 +436,45 @@ class Readers(object):
                              context=context)
 
 
+def find_empty_alt(content, path):
+    """Find images with empty alt
+
+    Create warnings for all images with empty alt (up to a certain number),
+    as they are really likely to be accessibility flaws.
+
+    """
+    imgs = re.compile(r"""
+        (?:
+            # src before alt
+            <img
+            [^\>]*
+            src=(['"])(.*)\1
+            [^\>]*
+            alt=(['"])\3
+        )|(?:
+            # alt before src
+            <img
+            [^\>]*
+            alt=(['"])\4
+            [^\>]*
+            src=(['"])(.*)\5
+        )
+        """, re.X)
+    matches = re.findall(imgs, content)
+    # find a correct threshold
+    nb_warnings = 10
+    if len(matches) == nb_warnings + 1:
+        nb_warnings += 1  # avoid bad looking case
+    # print one warning per image with empty alt until threshold
+    for match in matches[:nb_warnings]:
+        logger.warning('Empty alt attribute for image {} in {}'.format(
+            os.path.basename(match[1] + match[5]), path))
+    # print one warning for the other images with empty alt
+    if len(matches) > nb_warnings:
+        logger.warning('{} other images with empty alt attributes'
+                       .format(len(matches) - nb_warnings))
+
+
 def default_metadata(settings=None, process=None):
     metadata = {}
     if settings:
@@ -516,13 +524,12 @@ def parse_path_metadata(source_path, settings=None, process=None):
     subdir = os.path.basename(dirname)
     if settings:
         checks = []
-        for key,data in [('FILENAME_METADATA', base),
-                         ('PATH_METADATA', source_path),
-                         ]:
+        for key, data in [('FILENAME_METADATA', base),
+                          ('PATH_METADATA', source_path)]:
             checks.append((settings.get(key, None), data))
         if settings.get('USE_FOLDER_AS_CATEGORY', None):
             checks.insert(0, ('(?P<category>.*)', subdir))
-        for regexp,data in checks:
+        for regexp, data in checks:
             if regexp and data:
                 match = re.match(regexp, data)
                 if match:

From f47f054d0be29d95ecb22e025f1a50932c00fd2b Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 4 Aug 2013 22:03:37 +0200
Subject: [PATCH 1426/2864] Add documentation for readers.

---
 docs/internals.rst |  4 ++--
 docs/plugins.rst   | 15 ++++++++-------
 docs/settings.rst  |  7 ++++---
 pelican/readers.py | 26 ++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/docs/internals.rst b/docs/internals.rst
index 704122ba..f69a9bb8 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -24,7 +24,7 @@ The logic is separated into different classes and concepts:
   then passed to the generators.
 
 * **Readers** are used to read from various formats (AsciiDoc, HTML, Markdown and
-  reStructuredText for now, but the system is extensible). Given a file, they 
+  reStructuredText for now, but the system is extensible). Given a file, they
   return metadata (author, tags, category, etc.) and content (HTML-formatted).
 
 * **Generators** generate the different outputs. For instance, Pelican comes with
@@ -44,7 +44,7 @@ method that returns HTML content and some metadata.
 
 Take a look at the Markdown reader::
 
-    class MarkdownReader(Reader):
+    class MarkdownReader(BaseReader):
         enabled = bool(Markdown)
 
         def read(self, source_path):
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 93307afb..582f40a7 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -71,6 +71,7 @@ finalized                       pelican object                  invoked after al
                                                                 - minifying js/css assets.
                                                                 - notify/ping search engines with an updated sitemap.
 generator_init                  generator                       invoked in the Generator.__init__
+readers_init                    readers                         invoked in the Readers.__init__
 article_generate_context        article_generator, metadata
 article_generate_preread        article_generator               invoked before a article is read in ArticlesGenerator.generate_context;
                                                                 use if code needs to do something before every article is parsed
@@ -144,13 +145,13 @@ write and don't slow down pelican itself when they're not active.
 No more talking, here is the example::
 
     from pelican import signals
-    from pelican.readers import EXTENSIONS, Reader
+    from pelican.readers import BaseReader
 
-    # Create a new reader class, inheriting from the pelican.reader.Reader
-    class NewReader(Reader):
+    # Create a new reader class, inheriting from the pelican.reader.BaseReader
+    class NewReader(BaseReader):
         enabled = True  # Yeah, you probably want that :-)
 
-        # The list of extensions you want this reader to match with.
+        # The list of file extensions you want this reader to match with.
         # In the case multiple readers use the same extensions, the latest will
         # win (so the one you're defining here, most probably).
         file_extensions = ['yeah']
@@ -168,12 +169,12 @@ No more talking, here is the example::
 
             return "Some content", parsed
 
-    def add_reader(arg):
-        EXTENSIONS['yeah'] = NewReader
+    def add_reader(readers):
+        readers.reader_classes['yeah'] = NewReader
 
     # this is how pelican works.
     def register():
-        signals.initialized.connect(add_reader)
+        signals.readers_init.connect(add_reader)
 
 
 Adding a new generator
diff --git a/docs/settings.rst b/docs/settings.rst
index 8ecac7c9..04574127 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -84,9 +84,10 @@ Setting name (default value)                                            What doe
                                                                         here or a single string representing one locale.
                                                                         When providing a list, all the locales will be tried
                                                                         until one works.
-`MARKUP` (``('rst', 'md')``)                                            A list of available markup languages you want
-                                                                        to use. For the moment, the only available values
-                                                                        are `rst`, `md`, `markdown`, `mkd`, `mdown`, `html`, and `htm`.
+`READERS` (``{}``)                                                      A dict of file extensions / Reader classes to overwrite or
+                                                                        add file readers. for instance, to avoid processing .html files:
+                                                                        ``READERS = {'html': None}``. Or to add a custom reader for the
+                                                                        `foo` extension: ``READERS = {'foo': FooReader}``
 `IGNORE_FILES` (``['.#*']``)                                            A list of file globbing patterns to match against the
                                                                         source files to be ignored by the processor. For example,
                                                                         the default ``['.#*']`` will ignore emacs lock files.
diff --git a/pelican/readers.py b/pelican/readers.py
index 3b3bfd12..97a184d0 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -51,6 +51,18 @@ logger = logging.getLogger(__name__)
 
 
 class BaseReader(object):
+    """Base class to read files.
+
+    This class is used to process static files, and it can be inherited for
+    other types of file. A Reader class must have the following attributes:
+
+    - enabled: (boolean) tell if the Reader class is enabled. It
+      generally depends on the import of some dependency.
+    - file_extensions: a list of file extensions that the Reader will process.
+    - extensions: a list of extensions to use in the reader (typical use is
+      Markdown).
+
+    """
     enabled = True
     file_extensions = ['static']
     extensions = None
@@ -111,6 +123,8 @@ class PelicanHTMLTranslator(HTMLTranslator):
 
 
 class RstReader(BaseReader):
+    """Reader for reStructuredText files"""
+
     enabled = bool(docutils)
     file_extensions = ['rst']
 
@@ -167,6 +181,8 @@ class RstReader(BaseReader):
 
 
 class MarkdownReader(BaseReader):
+    """Reader for Markdown files"""
+
     enabled = bool(Markdown)
     file_extensions = ['md', 'markdown', 'mkd', 'mdown']
 
@@ -203,6 +219,7 @@ class MarkdownReader(BaseReader):
 
 class HTMLReader(BaseReader):
     """Parses HTML files as input, looking for meta, title, and body tags"""
+
     file_extensions = ['htm', 'html']
     enabled = True
 
@@ -313,6 +330,8 @@ class HTMLReader(BaseReader):
 
 
 class AsciiDocReader(BaseReader):
+    """Reader for AsciiDoc files"""
+
     enabled = bool(asciidoc)
     file_extensions = ['asc']
     default_options = ["--no-header-footer", "-a newline=\\n"]
@@ -345,7 +364,14 @@ class AsciiDocReader(BaseReader):
 
 
 class Readers(object):
+    """Interface for all readers.
 
+    This class contains a mapping of file extensions / Reader classes, to know
+    which Reader class must be used to read a file (based on its extension).
+    This is customizable both with the 'READERS' setting, and with the
+    'readers_init' signall for plugins.
+
+    """
     def __init__(self, settings=None):
         self.settings = settings or {}
         self.readers = {}

From 24e2ad5b3f0143851f74fd2f23b41b6fb85ed99a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 7 Aug 2013 12:45:26 -0700
Subject: [PATCH 1427/2864] Improve AsciiDoc parts of Getting Started docs

---
 docs/getting_started.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index eb503295..6d9a8c41 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -48,7 +48,7 @@ Markdown library as well::
 
     $ pip install Markdown
 
-If you want to use AsciiDoc you need to install it from `source
+If you want to use AsciiDoc_ you need to install it from `source
 <http://www.methods.co.nz/asciidoc/INSTALL.html>`_ or use your operating
 system's package manager.
 
@@ -323,6 +323,9 @@ pattern::
 
     This is the content of my super blog post.
 
+Conventions for AsciiDoc_ posts, which should have an ``.asc`` extension, can
+be found on the AsciiDoc_ site.
+
 Pelican can also process HTML files ending in ``.html`` and ``.htm``. Pelican
 interprets the HTML in a very straightforward manner, reading metadata from
 ``meta`` tags, the title from the ``title`` tag, and the body out from the
@@ -551,3 +554,4 @@ listed on the index page nor on any category page.
 .. _virtualenv: http://www.virtualenv.org/
 .. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
 .. _Fabric: http://fabfile.org/
+.. _AsciiDoc: http://www.methods.co.nz/asciidoc/

From c875c27e83941ecd2bcd401efe07b35421de704c Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Wed, 7 Aug 2013 22:43:08 +0200
Subject: [PATCH 1428/2864] Don't warn too loud about missing dependencies.

- Show the messages only once for each Reader
- Decrease the logging level
---
 pelican/readers.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 97a184d0..3f01a72c 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -372,15 +372,28 @@ class Readers(object):
     'readers_init' signall for plugins.
 
     """
+
+    # used to warn about missing dependencies only once, at the first
+    # instanciation of a Readers object.
+    warn_missing_deps = True
+
     def __init__(self, settings=None):
         self.settings = settings or {}
         self.readers = {}
         self.reader_classes = {}
 
         for cls in [BaseReader] + BaseReader.__subclasses__():
+            if not cls.enabled:
+                if self.__class__.warn_missing_deps:
+                    logger.debug('Missing dependencies for {}'
+                                 .format(', '.join(cls.file_extensions)))
+                continue
+
             for ext in cls.file_extensions:
                 self.reader_classes[ext] = cls
 
+        self.__class__.warn_missing_deps = False
+
         if self.settings['READERS']:
             self.reader_classes.update(self.settings['READERS'])
 
@@ -390,10 +403,6 @@ class Readers(object):
             if not reader_class:
                 continue
 
-            if not reader_class.enabled:
-                logger.warning('Missing dependencies for {}'.format(fmt))
-                continue
-
             self.readers[fmt] = reader_class(self.settings)
 
             settings_key = '%s_EXTENSIONS' % fmt.upper()

From f2aef81c963c8daaa29ac28dba84243e6198c30f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 8 Aug 2013 12:08:30 -0700
Subject: [PATCH 1429/2864] Work around pytz & pip 1.4+ problem. Fixes #996.

The latest version of pip (1.4) no longer installs pre-release versions
(alpha, beta, etc.) by default. Because pytz uses an unorthodox version
number scheme, pip thinks it's a pre-release and skips it. This
change to setup.py should alleviate the problem until it is otherwise
resolved.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 69f76b3c..f56a7c41 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 
 requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.7', 'pygments', 'docutils',
-            'pytz', 'blinker', 'unidecode', 'six']
+            'pytz >= 0a', 'blinker', 'unidecode', 'six']
 
 entry_points = {
     'console_scripts': [

From a7152716e2e068c69c4ecde7f2cedeb3547a3411 Mon Sep 17 00:00:00 2001
From: Talha Mansoor <talha131@gmail.com>
Date: Sun, 11 Aug 2013 01:43:27 +0500
Subject: [PATCH 1430/2864] Receive the two values returned from get_instance()

`get_instance()` returns two values. Old code, instead of unpacking two
values in two variables, placed the tuple in a single variable
`pelican`.

Later in the same block when `pelican.run()` was called, it resulted in
error.

```
-> Modified: content, theme, settings. re-generating...
CRITICAL: ("'tuple' object has no attribute 'run'",)
CRITICAL: 'tuple' object has no attribute 'run'
Traceback (most recent call last):
  File "/Users/talha/Repos/VirtualEnvs/pelican-dev/bin/pelican", line 8,
  in <module>
    load_entry_point('pelican==3.3', 'console_scripts', 'pelican')()
    File
    "/Users/talha/Repos/VirtualEnvs/pelican-dev/lib/python2.7/site-packages/pelican-3.3-py2.7.egg/pelican/__init__.py",
    line 353, in main pelican.run()
```

Either the returned value should be unpacked properly or
`pelican[0].run` should be called.
---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 8ba79e0a..f2bd2e07 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -338,7 +338,7 @@ def main():
                     modified = {k: next(v) for k, v in watchers.items()}
 
                     if modified['settings']:
-                        pelican = get_instance(args)
+                        pelican, settings  = get_instance(args)
 
                     if any(modified.values()):
                         print('\n-> Modified: {}. re-generating...'.format(

From b0a13a851c5e6d5088023a2eef5f239c42b0a134 Mon Sep 17 00:00:00 2001
From: Talha Mansoor <talha131@gmail.com>
Date: Sun, 11 Aug 2013 02:18:25 +0500
Subject: [PATCH 1431/2864] Fix a typo in the docs

getpelican/pelican@f2d6f77462976f5ea291481cba40e041d42d9e8c changed
`article_generate_context` to `article_generator_context`. This commit
updates the docs to reflect the change.
---
 docs/plugins.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 582f40a7..6e292efd 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -72,8 +72,8 @@ finalized                       pelican object                  invoked after al
                                                                 - notify/ping search engines with an updated sitemap.
 generator_init                  generator                       invoked in the Generator.__init__
 readers_init                    readers                         invoked in the Readers.__init__
-article_generate_context        article_generator, metadata
-article_generate_preread        article_generator               invoked before a article is read in ArticlesGenerator.generate_context;
+article_generator_context        article_generator, metadata
+article_generator_preread        article_generator               invoked before a article is read in ArticlesGenerator.generate_context;
                                                                 use if code needs to do something before every article is parsed
 article_generator_init          article_generator               invoked in the ArticlesGenerator.__init__
 article_generator_finalized     article_generator               invoked at the end of ArticlesGenerator.generate_context

From 472abb6fd9e9e1a5cfaebd70ec64c8469ddba8b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Mon, 12 Aug 2013 14:49:25 +0200
Subject: [PATCH 1432/2864] Activate coveralls.io support

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 918fd3f9..0c6bac89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,11 @@ before_install:
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
     - pip install mock
+    - pip install mock nose nose-cov
     - pip install .
     - pip install Markdown
-script: python -m unittest discover
+script: nosetests -sv --with-coverage --cover-package=pelican pelican
+after_success:
+  # Report coverage results to coveralls.io
+  - pip install coveralls
+  - coveralls

From 3b315fbc53efe48012662dbcb39c82c2c5117ca4 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <sorin.sbarnea@citrix.com>
Date: Mon, 12 Aug 2013 19:23:57 +0100
Subject: [PATCH 1433/2864] Fixing #1038 by allowing nice URLs.

---
 pelican/server.py | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/pelican/server.py b/pelican/server.py
index 24f3ae04..0f7472c5 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -1,5 +1,7 @@
 from __future__ import print_function
+import os
 import sys
+import logging
 try:
     import SimpleHTTPServer as srvmod
 except ImportError:
@@ -11,19 +13,36 @@ except ImportError:
     import socketserver  # NOQA
 
 PORT = len(sys.argv) == 2 and int(sys.argv[1]) or 8000
+SUFFIXES = ['','.html','/index.html']
 
-Handler = srvmod.SimpleHTTPRequestHandler
+class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
+    def do_GET(self):
+        # we are trying to detect the file by having a fallback mechanism
+        r = None
+        for suffix in SUFFIXES:
+            if not hasattr(self,'original_path'):
+                self.original_path = self.path
+            self.path = self.original_path + suffix
+            path = self.translate_path(self.path)
+            if os.path.exists(path):
+                r = srvmod.SimpleHTTPRequestHandler.do_GET(self)
+            if r is not None:
+                break
+            logging.warning("Unable to find %s file." % self.path)
+        return r
+
+Handler = ComplexHTTPRequestHandler
 
 try:
     httpd = socketserver.TCPServer(("", PORT), Handler)
 except OSError as e:
-    print("Could not listen on port", PORT)
+    logging.error("Could not listen on port %s" % PORT)
     sys.exit(getattr(e, 'exitcode', 1))
 
 
-print("serving at port", PORT)
+logging.info("serving at port %s" % PORT)
 try:
     httpd.serve_forever()
 except KeyboardInterrupt as e:
-    print("shutting down server")
-    httpd.socket.close()
+    logging.info("shutting down server")
+    httpd.socket.close()
\ No newline at end of file

From d9816be5deec20528d53adc5fc7455c973b8e63e Mon Sep 17 00:00:00 2001
From: Daniel Goldsmith <dgold@ascraeus.org>
Date: Tue, 13 Aug 2013 10:46:41 +0100
Subject: [PATCH 1434/2864] Tag Cloud made functional

---
 docs/settings.rst | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 55721c11..c709a339 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -522,14 +522,34 @@ Setting name (default value)                        What does it do?
 
 The default theme does not include a tag cloud, but it is pretty easy to add::
 
-    <ul>
+    <ul class="tagcloud">
         {% for tag in tag_cloud %}
             <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li>
         {% endfor %}
     </ul>
 
-You should then also define a CSS style with the appropriate classes (tag-0 to tag-N, where
-N matches `TAG_CLOUD_STEPS` -1).
+You should then also define CSS styles with appropriate classes (tag-0 to tag-N, where
+N matches `TAG_CLOUD_STEPS` -1), tag-0 being the most frequent, and define a ul.tagcloud 
+class with appropriate list-style to create the cloud, for example::
+
+    ul.tagcloud {
+      list-style: none;
+        padding: 0;
+    }
+
+    ul.tagcloud li {
+        display: inline-block;
+    }
+
+    li.tag-0 {
+        font-size: 150%;
+    }
+
+    li.tag-1 {
+        font-size: 120%;
+    }
+
+    ...    
 
 Translations
 ============

From 6191b2919e39d2ed61411b2defb99af2c4dee816 Mon Sep 17 00:00:00 2001
From: Ken Jung <kenmazy@gmail.com>
Date: Fri, 16 Aug 2013 13:31:14 -0700
Subject: [PATCH 1435/2864] StaticGenerator now stores file list in context.

This allows plugins and other generators to easily add files to be
simply copied over.
---
 pelican/generators.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 72c76b32..26fa40ea 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -562,13 +562,14 @@ class StaticGenerator(Generator):
                     context_sender=self)
                 self.staticfiles.append(static)
                 self.add_source_path(static)
+        self._update_context(('staticfiles',))
 
     def generate_output(self, writer):
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
                          self.settings['THEME_STATIC_DIR'], self.output_path,
                          os.curdir)
         # copy all Static files
-        for sc in self.staticfiles:
+        for sc in self.context['staticfiles']:
             source_path = os.path.join(self.path, sc.source_path)
             save_as = os.path.join(self.output_path, sc.save_as)
             mkdir_p(os.path.dirname(save_as))

From 73b37989f74c8f7f5b9c7cd4c625cece4cbef048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sat, 17 Aug 2013 01:02:07 +0200
Subject: [PATCH 1436/2864] update the readers tests

---
 pelican/tests/test_readers.py | 41 +++++++++++++++--------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index cb7db575..1b3a2055 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -14,17 +14,6 @@ CONTENT_PATH = os.path.join(CUR_DIR, 'content')
 def _path(*args):
     return os.path.join(CONTENT_PATH, *args)
 
-class ReaderTests(unittest.TestCase):
-    def test_readfile_unknown_extension(self):
-        f = _path('article_with_metadata.unknownextension')
-        with self.assertRaises(TypeError) as cm:
-            readers.read_file(f)
-        ex = cm.exception
-        self.assertEqual('Pelican does not know how to parse ' + f, ex.message)
-        #, setattr, root.c1.c2, 'text',  "test")
-        #  self.assertTrue(1 == 0)
-        #  except TypeError:
-        #  self.assertTrue(1 == 1)
 
 class ReaderTest(unittest.TestCase):
 
@@ -34,6 +23,15 @@ class ReaderTest(unittest.TestCase):
         return r.read_file(base_path=CONTENT_PATH, path=path)
 
 
+class DefaultReaderTest(ReaderTest):
+
+    def test_readfile_unknown_extension(self):
+        with self.assertRaises(TypeError) as cm:
+            self.read_file(path='article_with_metadata.unknownextension')
+        ex = cm.exception
+        self.assertIn('Pelican does not know how to parse', ex.message)
+
+
 class RstReaderTest(ReaderTest):
 
     def test_article_with_metadata(self):
@@ -98,11 +96,11 @@ class RstReaderTest(ReaderTest):
         # Keys of metadata should be lowercase.
         reader = readers.RstReader(settings=get_settings())
         content, metadata = reader.read(
-                _path('article_with_uppercase_metadata.rst'))
+            _path('article_with_uppercase_metadata.rst'))
 
         self.assertIn('category', metadata, 'Key should be lowercase.')
         self.assertEqual('Yeah', metadata.get('category'),
-                          'Value keeps case.')
+                         'Value keeps case.')
 
     def test_typogrify(self):
         # if nothing is specified in the settings, the content should be
@@ -158,7 +156,6 @@ class MdReaderTest(ReaderTest):
         for key, value in metadata.items():
             self.assertEqual(value, expected[key], key)
 
-
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_footnote(self):
         reader = readers.MarkdownReader(settings=get_settings())
@@ -179,8 +176,8 @@ class MdReaderTest(ReaderTest):
             'title="Jump back to footnote 1 in the text">&#8617;</a></p>\n'
             '</li>\n<li id="fn:footnote">\n'
             '<p>Named footnote&#160;'
-            '<a class="footnote-backref" href="#fnref:footnote" rev="footnote" '
-            'title="Jump back to footnote 2 in the text">&#8617;</a></p>\n'
+            '<a class="footnote-backref" href="#fnref:footnote" rev="footnote"'
+            ' title="Jump back to footnote 2 in the text">&#8617;</a></p>\n'
             '</li>\n</ol>\n</div>')
         expected_metadata = {
             'title': 'Article with markdown containing footnotes',
@@ -194,7 +191,6 @@ class MdReaderTest(ReaderTest):
         for key, value in metadata.items():
             self.assertEqual(value, expected_metadata[key], key)
 
-
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_file_extensions(self):
         reader = readers.MarkdownReader(settings=get_settings())
@@ -203,9 +199,9 @@ class MdReaderTest(ReaderTest):
         content, metadata = reader.read(
             _path('article_with_md_extension.md'))
         expected = (
-                "<h1>Test Markdown File Header</h1>\n"
-                "<h2>Used for pelican test</h2>\n"
-                "<p>The quick brown fox jumped over the lazy dog's back.</p>")
+            "<h1>Test Markdown File Header</h1>\n"
+            "<h2>Used for pelican test</h2>\n"
+            "<p>The quick brown fox jumped over the lazy dog's back.</p>")
         self.assertEqual(content, expected)
         # test to ensure the mkd file extension is being processed by the
         # correct reader
@@ -319,7 +315,7 @@ class AdReaderTest(ReaderTest):
     def test_article_with_asc_options(self):
         # test to ensure the ASCIIDOC_OPTIONS is being used
         reader = readers.AsciiDocReader(
-                dict(ASCIIDOC_OPTIONS=["-a revision=1.0.42"]))
+            dict(ASCIIDOC_OPTIONS=["-a revision=1.0.42"]))
         content, metadata = reader.read(_path('article_with_asc_options.asc'))
         expected = ('<hr>\n<h2><a name="_used_for_pelican_test"></a>Used for'
                     ' pelican test</h2>\n<p>version 1.0.42</p>\n'
@@ -375,7 +371,6 @@ class HTMLReaderTest(ReaderTest):
         for key, value in expected.items():
             self.assertEqual(value, page.metadata[key], key)
 
-
     def test_article_with_null_attributes(self):
         page = self.read_file(path='article_with_null_attributes.html')
 
@@ -389,4 +384,4 @@ class HTMLReaderTest(ReaderTest):
         page = self.read_file(path='article_with_uppercase_metadata.html')
         self.assertIn('category', page.metadata, 'Key should be lowercase.')
         self.assertEqual('Yeah', page.metadata.get('category'),
-                          'Value keeps cases.')
+                         'Value keeps cases.')

From aae56fee3935b771619c3fcf68976aae79bbfde0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sat, 17 Aug 2013 01:12:39 +0200
Subject: [PATCH 1437/2864] exception.message was removed in py 3.X

---
 pelican/tests/test_readers.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 1b3a2055..b6652d03 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -26,10 +26,8 @@ class ReaderTest(unittest.TestCase):
 class DefaultReaderTest(ReaderTest):
 
     def test_readfile_unknown_extension(self):
-        with self.assertRaises(TypeError) as cm:
+        with self.assertRaises(TypeError):
             self.read_file(path='article_with_metadata.unknownextension')
-        ex = cm.exception
-        self.assertIn('Pelican does not know how to parse', ex.message)
 
 
 class RstReaderTest(ReaderTest):

From 2a599b864624f483149739bb2c86e812cb74a2e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sat, 17 Aug 2013 01:23:09 +0200
Subject: [PATCH 1438/2864] Reactivate travis IRC reports.

---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0c6bac89..1df32baa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,15 @@ before_install:
  - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
-    - pip install mock
-    - pip install mock nose nose-cov
+    - pip install mock nose nose-cov Markdown
     - pip install .
-    - pip install Markdown
 script: nosetests -sv --with-coverage --cover-package=pelican pelican
 after_success:
   # Report coverage results to coveralls.io
   - pip install coveralls
   - coveralls
+notifications:
+    irc:
+        channels:
+            - "irc.freenode.org#pelican"
+        on_success: change

From 339955376e1f84fb5209dad9f18bc802f006d0e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sat, 17 Aug 2013 12:48:34 +0200
Subject: [PATCH 1439/2864] Add a content_written signal

---
 docs/plugins.rst   | 1 +
 pelican/signals.py | 3 +++
 pelican/writers.py | 7 +++++++
 3 files changed, 11 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 6e292efd..29d67e24 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -84,6 +84,7 @@ page_generate_context           page_generator, metadata
 page_generator_init             page_generator                  invoked in the PagesGenerator.__init__
 page_generator_finalized        page_generator                  invoked at the end of PagesGenerator.generate_context
 content_object_init             content_object                  invoked at the end of Content.__init__ (see note below)
+content_written                 path, context                   invoked each time a content file is written.
 =============================   ============================   ===========================================================================
 
 The list is currently small, so don't hesitate to add signals and make a pull
diff --git a/pelican/signals.py b/pelican/signals.py
index 77802e88..e92272c9 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -37,3 +37,6 @@ static_generator_preread = signal('static_generator_preread')
 static_generator_context = signal('static_generator_context')
 
 content_object_init = signal('content_object_init')
+
+# Writers signals
+content_written = signal('content_written')
diff --git a/pelican/writers.py b/pelican/writers.py
index 59642cd9..da105929 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -11,8 +11,10 @@ if not six.PY3:
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 from jinja2 import Markup
+
 from pelican.paginator import Paginator
 from pelican.utils import get_relative_path, path_to_url, set_date_tzinfo
+from pelican import signals
 
 logger = logging.getLogger(__name__)
 
@@ -151,10 +153,15 @@ class Writer(object):
                 os.makedirs(os.path.dirname(path))
             except Exception:
                 pass
+
             with self._open_w(path, 'utf-8', override=override) as f:
                 f.write(output)
             logger.info('writing {}'.format(path))
 
+            # Send a signal to say we're writing a file with some specific
+            # local context.
+            signals.content_written.send(path, context=localcontext)
+
         localcontext = context.copy()
         if relative_urls:
             relative_url = path_to_url(get_relative_path(name))

From e2ca6d76086eb3bbde961dfa2e7e1dd3a9a8452d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sat, 17 Aug 2013 17:36:13 +0200
Subject: [PATCH 1440/2864] Add categories and tags to the replacement
 mechanism.

---
 docs/getting_started.rst       |  4 ++++
 pelican/contents.py            |  4 ++++
 pelican/tests/test_contents.py | 24 ++++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 6d9a8c41..bad9bbda 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -459,6 +459,10 @@ following to ``pelicanconf.py``::
 
 And then the ``pdfs`` directory would also be copied to ``output/static/``.
 
+You can also link to categories or tags, using the `|tag|tagname` and
+`|category|foobar` syntax.
+
+
 Importing an existing blog
 --------------------------
 
diff --git a/pelican/contents.py b/pelican/contents.py
index ed213c31..900049a2 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -216,6 +216,10 @@ class Content(object):
                 else:
                     logger.warning("Unable to find {fn}, skipping url"
                                    " replacement".format(fn=value))
+            elif what == 'category':
+                origin = Category(value, self.settings).url
+            elif what == 'tag':
+                origin = Tag(value, self.settings).url
 
             return ''.join((m.group('markup'), m.group('quote'), origin,
                             m.group('quote')))
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index af97db3f..936903c1 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -180,6 +180,30 @@ class TestPage(unittest.TestCase):
         Page(**self.page_kwargs)
         self.assertTrue(content_object_init.has_receivers_for(Page))
 
+    def test_get_content(self):
+        # Test that the content is updated with the relative links to
+        # filenames, tags and categories.
+        settings = get_settings()
+        args = self.page_kwargs.copy()
+        args['settings'] = settings
+
+        # Tag
+        args['content'] = ('A simple test, with a '
+                           '<a href="|tag|tagname">link</a>')
+        page = Page(**args)
+        content = page.get_content('http://notmyidea.org')
+        self.assertEquals(content, ('A simple test, with a '
+                                    '<a href="tag/tagname.html">link</a>'))
+
+        # Category
+        args['content'] = ('A simple test, with a '
+                           '<a href="|category|category">link</a>')
+        page = Page(**args)
+        content = page.get_content('http://notmyidea.org')
+        self.assertEquals(content,
+                          ('A simple test, with a '
+                           '<a href="category/category.html">link</a>'))
+
 
 class TestArticle(TestPage):
     def test_template(self):

From 56371aaf0f9e7b3e756160147486f29838820f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sat, 17 Aug 2013 17:42:54 +0200
Subject: [PATCH 1441/2864] update the changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0804c8b0..61cae1d9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,6 +9,7 @@ Release history
   longer article-specific
 * Deprecate ``FILES_TO_COPY`` in favor of ``STATIC_PATHS`` and
   ``EXTRA_PATH_METADATA``
+* Add support for |tag| and |category| relative links.
 
 3.2.1 and 3.2.2
 ===============

From 895945e3cc1b25a00708227307bdeee5e0ed20f9 Mon Sep 17 00:00:00 2001
From: Kura <kura@deviling.net>
Date: Mon, 19 Aug 2013 11:45:59 +0100
Subject: [PATCH 1442/2864] Removed YouTube directive as it's been moved to a
 Plugin

---
 pelican/rstdirectives.py | 57 ----------------------------------------
 1 file changed, 57 deletions(-)

diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index fb4a6c93..07c40f5e 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -41,63 +41,6 @@ directives.register_directive('code-block', Pygments)
 directives.register_directive('sourcecode', Pygments)
 
 
-class YouTube(Directive):
-    """ Embed YouTube video in posts.
-
-    Courtesy of Brian Hsu: https://gist.github.com/1422773
-
-    VIDEO_ID is required, with / height are optional integer,
-    and align could be left / center / right.
-
-    Usage:
-    .. youtube:: VIDEO_ID
-        :width: 640
-        :height: 480
-        :align: center
-    """
-
-    def align(argument):
-        """Conversion function for the "align" option."""
-        return directives.choice(argument, ('left', 'center', 'right'))
-
-    required_arguments = 1
-    optional_arguments = 2
-    option_spec = {
-        'width': directives.positive_int,
-        'height': directives.positive_int,
-        'align': align
-    }
-
-    final_argument_whitespace = False
-    has_content = False
-
-    def run(self):
-        videoID = self.arguments[0].strip()
-        width = 420
-        height = 315
-        align = 'left'
-
-        if 'width' in self.options:
-            width = self.options['width']
-
-        if 'height' in self.options:
-            height = self.options['height']
-
-        if 'align' in self.options:
-            align = self.options['align']
-
-        url = 'http://www.youtube.com/embed/%s' % videoID
-        div_block = '<div class="youtube" align="%s">' % align
-        embed_block = '<iframe width="%s" height="%s" src="%s" '\
-                      'frameborder="0"></iframe>' % (width, height, url)
-
-        return [
-            nodes.raw('', div_block, format='html'),
-            nodes.raw('', embed_block, format='html'),
-            nodes.raw('', '</div>', format='html')]
-
-directives.register_directive('youtube', YouTube)
-
 _abbr_re = re.compile('\((.*)\)$')
 
 

From d11b33030f4220e16b62bdfe94b80dc1290ead4a Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Wed, 27 Mar 2013 09:15:35 +0100
Subject: [PATCH 1443/2864] Use .dev suffix for development versions

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index f2bd2e07..2e1763ac 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -25,7 +25,7 @@ from pelican.writers import Writer
 __major__ = 3
 __minor__ = 2
 __micro__ = 0
-__version__ = "{0}.{1}.{2}".format(__major__, __minor__, __micro__)
+__version__ = "{0}.{1}.{2}.dev".format(__major__, __minor__, __micro__)
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 

From 469c531ae4fbc9f8093b3f50607755e3d43e3e26 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Wed, 27 Mar 2013 09:16:19 +0100
Subject: [PATCH 1444/2864] Include version in doc and warn if it's a dev
 version.

---
 docs/conf.py   | 16 ++++++++++++----
 docs/index.rst | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 40de84c7..84531182 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -4,18 +4,26 @@ import sys, os
 
 sys.path.append(os.path.abspath(os.pardir))
 
-from pelican import __version__, __major__
+from pelican import __version__, __major__, __minor__
 
 # -- General configuration -----------------------------------------------------
 templates_path = ['_templates']
-extensions = ['sphinx.ext.autodoc',]
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.ifconfig', 'sphinx.ext.extlinks']
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Pelican'
 copyright = '2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
-version = __version__
-release = __major__
+version = '%s.%s' % (__major__, __minor__)
+release = __version__
+last_stable = '3.1.1'
+rst_prolog = '''
+.. |last_stable| replace:: :pelican-doc:`{0}`
+'''.format(last_stable)
+
+extlinks = {
+    'pelican-doc':  ('http://docs.getpelican.com/%s/', '')
+}
 
 # -- Options for HTML output ---------------------------------------------------
 
diff --git a/docs/index.rst b/docs/index.rst
index 914c2a7e..eb8883ce 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,5 +1,14 @@
-Pelican
-=======
+Pelican |release|
+=================
+
+
+.. ifconfig:: release.endswith('.dev')
+
+    .. warning::
+
+        This documentation is for the version of Pelican currently under development.
+        Were you looking for version |last_stable| documentation?
+
 
 Pelican is a static site generator, written in Python_.
 
@@ -12,7 +21,7 @@ Pelican is a static site generator, written in Python_.
 Features
 --------
 
-Pelican currently supports:
+Pelican |version| currently supports:
 
 * Articles (e.g., blog posts) and pages (e.g., "About", "Projects", "Contact")
 * Comments, via an external service (Disqus). (Please note that while

From e6e99ffbb9c671da9a80c61cf7d47c12d77f2ef4 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Wed, 27 Mar 2013 10:11:45 +0100
Subject: [PATCH 1445/2864] Change current release section with a constant
 title

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 61cae1d9..c020d7f4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,7 @@
 Release history
 ###############
 
-3.3 (XXXX-XX-XX)
+Next release
 ================
 
 * Rename signals for better consistency (some plugins may need to be updated)

From 9d583961e700667b7f1e78c4f2e0c88954becf15 Mon Sep 17 00:00:00 2001
From: bmcorser <benmarshallcorser@gmail.com>
Date: Wed, 21 Aug 2013 19:57:55 +0100
Subject: [PATCH 1446/2864] Fix for THEME_STATIC_PATHS by copying sensitively

If more than one path is defined in THEME_STATIC_PATHS, the theme's
static directory in output is deleted and replaced by the following
path's files.

Using `shutil.rmtree` to remove the entire destination tree if overwrite
is `True` assumes that we didn't want anything at all that was there. We
should recurse through the directory and their subdirs instead, leaving
things put there by the previous path where they were.

I lazily copied almost verbatim the solution for recursively copying a
diectory from http://stackoverflow.com/a/1994840.

The reason for this is patch is that without it, my plugin is broken! It
also makes my code a lot less crazy:

https://github.com/bmcorser/pelicanfly/commit/a83f066
---
 pelican/utils.py | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 054c1f40..e028c84c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -275,16 +275,24 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
     destination_ = os.path.abspath(
         os.path.expanduser(os.path.join(destination, destination_path)))
 
+    def recurse(source, destination):
+        for entry in os.listdir(source):
+            entry_path = os.path.join(source, entry)
+            if os.path.isdir(entry_path):
+                entry_dest = os.path.join(destination, entry)
+                if os.path.exists(entry_dest):
+                    if not os.path.isdir(entry_dest):
+                        raise IOError('Failed to copy {0} a directory.'
+                                      .format(entry_dest))
+                    recurse(entry_path, entry_dest)
+                else:
+                    shutil.copytree(entry_path, entry_dest)
+            else:
+                shutil.copy(entry_path, destination)
+
+
     if os.path.isdir(source_):
-        try:
-            shutil.copytree(source_, destination_)
-            logger.info('copying %s to %s' % (source_, destination_))
-        except OSError:
-            if overwrite:
-                shutil.rmtree(destination_)
-                shutil.copytree(source_, destination_)
-                logger.info('replacement of %s with %s' % (source_,
-                    destination_))
+        recurse(source_, destination_)
 
     elif os.path.isfile(source_):
         dest_dir = os.path.dirname(destination_)

From 2826c1a5580508932b4b27b5b0bb38cea4a45240 Mon Sep 17 00:00:00 2001
From: Alex Stephen <alex.stephen@outlook.com>
Date: Wed, 21 Aug 2013 22:58:50 -0400
Subject: [PATCH 1447/2864] Added metadata information. Refs #1028

---
 pelican/themes/simple/templates/article.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 98cc852c..8da555a1 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -1,4 +1,14 @@
 {% extends "base.html" %}
+{% block head %}
+  {% for keyword in article.keywords %}
+    <meta name="keywords" contents="{{keyword}}">
+  {% endfor %}
+
+  {% for description in article.description %}
+    <meta name="description" contents="{{description}}">
+  {% endfor %}
+{% endblock %}
+
 {% block content %}
 <section id="content" class="body">
   <header>

From d22b0892418b60b752551ebc95c4616926bb513f Mon Sep 17 00:00:00 2001
From: bmcorser <benmarshallcorser@gmail.com>
Date: Sat, 24 Aug 2013 13:41:22 +0100
Subject: [PATCH 1448/2864] Adding placeholder files for regression test

---
 samples/theme_standard/a_stylesheet   | 0
 samples/theme_standard/a_template     | 0
 samples/very/exciting/new/files/bap!  | 0
 samples/very/exciting/new/files/boom! | 0
 samples/very/exciting/new/files/wow!  | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 samples/theme_standard/a_stylesheet
 create mode 100644 samples/theme_standard/a_template
 create mode 100644 samples/very/exciting/new/files/bap!
 create mode 100644 samples/very/exciting/new/files/boom!
 create mode 100644 samples/very/exciting/new/files/wow!

diff --git a/samples/theme_standard/a_stylesheet b/samples/theme_standard/a_stylesheet
new file mode 100644
index 00000000..e69de29b
diff --git a/samples/theme_standard/a_template b/samples/theme_standard/a_template
new file mode 100644
index 00000000..e69de29b
diff --git a/samples/very/exciting/new/files/bap! b/samples/very/exciting/new/files/bap!
new file mode 100644
index 00000000..e69de29b
diff --git a/samples/very/exciting/new/files/boom! b/samples/very/exciting/new/files/boom!
new file mode 100644
index 00000000..e69de29b
diff --git a/samples/very/exciting/new/files/wow! b/samples/very/exciting/new/files/wow!
new file mode 100644
index 00000000..e69de29b

From 0f4058a3170724cc1709837c1d8f89d364c08bf5 Mon Sep 17 00:00:00 2001
From: bmcorser <benmarshallcorser@gmail.com>
Date: Sat, 24 Aug 2013 13:42:55 +0100
Subject: [PATCH 1449/2864] Add regressison test for recursively copying files

---
 pelican/tests/test_pelican.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index d6c0d8e9..db2d0e6b 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -92,3 +92,22 @@ class TestPelican(LoggedTestCase):
         mute(True)(pelican.run)()
         dcmp = dircmp(self.temp_path, os.path.join(OUTPUT_PATH, 'custom'))
         self.assertFilesEqual(recursiveDiff(dcmp))
+
+    def test_theme_static_paths_copy(self):
+        # the same thing with a specified set of settings should work
+        settings = read_settings(path=SAMPLE_CONFIG, override={
+            'PATH': INPUT_PATH,
+            'OUTPUT_PATH': self.temp_path,
+            'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH, 'very'),
+                                   os.path.join(SAMPLES_PATH, 'theme_standard')]
+            })
+        pelican = Pelican(settings=settings)
+        mute(True)(pelican.run)()
+        theme_output = os.path.join(self.temp_path, 'theme')
+        extra_path = os.path.join(theme_output, 'exciting', 'new', 'files')
+
+        for file in ['a_stylesheet', 'a_template']:
+            self.assertTrue(os.path.exists(os.path.join(theme_output, file)))
+
+        for file in ['wow!', 'boom!', 'bap!']:
+            self.assertTrue(os.path.exists(os.path.join(extra_path, file)))

From b144c3cfbd6ea0e5bd1bba5d30d6bf3605499794 Mon Sep 17 00:00:00 2001
From: bmcorser <benmarshallcorser@gmail.com>
Date: Sat, 24 Aug 2013 14:38:06 +0100
Subject: [PATCH 1450/2864] Hack out `overwrite` param

---
 pelican/generators.py | 2 +-
 pelican/utils.py      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 26fa40ea..d695c7c8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -544,7 +544,7 @@ class StaticGenerator(Generator):
         """Copy all the paths from source to destination"""
         for path in paths:
             copy(path, source, os.path.join(output_path, destination),
-                 final_path, overwrite=True)
+                 final_path)
 
     def generate_context(self):
         self.staticfiles = []
diff --git a/pelican/utils.py b/pelican/utils.py
index e028c84c..d306de65 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -256,7 +256,7 @@ def slugify(value, substitutions=()):
     return value.decode('ascii')
 
 
-def copy(path, source, destination, destination_path=None, overwrite=False):
+def copy(path, source, destination, destination_path=None):
     """Copy path from origin to destination.
 
     The function is able to copy either files or directories.
@@ -265,8 +265,6 @@ def copy(path, source, destination, destination_path=None, overwrite=False):
     :param source: the source dir
     :param destination: the destination dir
     :param destination_path: the destination path (optional)
-    :param overwrite: whether to overwrite the destination if already exists
-                      or not
     """
     if not destination_path:
         destination_path = path

From c61f6f402a417e807c9cb6f01c9293fced678892 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Wed, 27 Mar 2013 09:30:54 +0100
Subject: [PATCH 1451/2864] Prepare for bumpr

---
 bumpr.rc            | 30 ++++++++++++++++++++++++++++++
 docs/changelog.rst  |  2 +-
 docs/conf.py        |  6 +++---
 pelican/__init__.py |  5 +----
 4 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 bumpr.rc

diff --git a/bumpr.rc b/bumpr.rc
new file mode 100644
index 00000000..cfc90fd7
--- /dev/null
+++ b/bumpr.rc
@@ -0,0 +1,30 @@
+[bumpr]
+file = pelican/__init__.py
+vcs = git
+clean =
+    python setup.py clean
+    rm -rf *egg-info build dist
+tests = tox
+publish = python setup.py sdist register upload
+files = README.rst
+
+[bump]
+unsuffix = true
+message = Bump version {version}
+
+[prepare]
+part = patch
+suffix = dev
+message = Prepare version {version} for next development cycle
+
+[changelog]
+file = docs/changelog.rst
+separator = =
+bump = {version} ({date:%Y-%m-%d})
+prepare = Next release
+
+[readthedoc]
+url = http://docs.getpelican.com/{tag}
+
+[commands]
+bump = sed -i "s/last_stable\s*=.*/last_stable = '{version}'/" docs/conf.py
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c020d7f4..27938d4d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,7 +2,7 @@ Release history
 ###############
 
 Next release
-================
+============
 
 * Rename signals for better consistency (some plugins may need to be updated)
 * Move metadata extraction from generators to readers; metadata extraction no
diff --git a/docs/conf.py b/docs/conf.py
index 84531182..5ac81b9e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -4,7 +4,7 @@ import sys, os
 
 sys.path.append(os.path.abspath(os.pardir))
 
-from pelican import __version__, __major__, __minor__
+from pelican import __version__
 
 # -- General configuration -----------------------------------------------------
 templates_path = ['_templates']
@@ -14,9 +14,9 @@ master_doc = 'index'
 project = 'Pelican'
 copyright = '2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
-version = '%s.%s' % (__major__, __minor__)
 release = __version__
-last_stable = '3.1.1'
+version = '.'.join(release.split('.')[:1])
+last_stable = '3.2.2'
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 2e1763ac..cecab54b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -22,10 +22,7 @@ from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, folder_watcher, file_watcher
 from pelican.writers import Writer
 
-__major__ = 3
-__minor__ = 2
-__micro__ = 0
-__version__ = "{0}.{1}.{2}.dev".format(__major__, __minor__, __micro__)
+__version__ = "3.2.3.dev"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 

From bad8cfb3d9883845c054772b75a5934a96aeb394 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Sat, 24 Aug 2013 20:20:37 +0200
Subject: [PATCH 1452/2864] Added bumpr as a development requirement to perform
 release

---
 dev_requirements.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index fa2634a0..0a4a4589 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -6,3 +6,6 @@ Markdown
 BeautifulSoup4
 lxml
 typogrify
+
+# To perform release
+bumpr

From 8d41d6ba2419e5d380f42f98e530a898c428f516 Mon Sep 17 00:00:00 2001
From: Alex Stephen <alex.stephen@outlook.com>
Date: Sat, 24 Aug 2013 23:36:07 -0400
Subject: [PATCH 1453/2864] Refs #1028. Now iterating over tags

---
 pelican/themes/simple/templates/article.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 8da555a1..2356c2f6 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -7,6 +7,11 @@
   {% for description in article.description %}
     <meta name="description" contents="{{description}}">
   {% endfor %}
+
+  {% for tag in article.tags %}
+    <meta name="tags" contents="{{tag}}"
+  {% endfor %}
+
 {% endblock %}
 
 {% block content %}

From 5a322ecc1e0ce0aa188f31532ea3f8fdbba925ff Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Sun, 25 Aug 2013 14:14:43 +0200
Subject: [PATCH 1454/2864] Pin bumpr version to avoid config breakage with new
 versions

---
 dev_requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index 0a4a4589..c90ac630 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -8,4 +8,4 @@ lxml
 typogrify
 
 # To perform release
-bumpr
+bumpr==0.2.0

From 71cca7a444f8ac81be3dd55ba678eb69f5d1269a Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Mon, 26 Aug 2013 23:22:08 +0200
Subject: [PATCH 1455/2864] Fix the behavior of Markdown extensions.

There was several issues here:
- `self.extensions` was adding 'meta' multiple times (ref #1058)
- `self.extensions` was keeping a reference to `self.settings['MD_EXTENSIONS']`,
  so adding 'meta' to it.
- the `%s_EXTENSIONS` block coming after, it was overriding `self.extensions`
  with `self.settings['EXTENSIONS']` (while it was a reference, it was working,
  but ...). As this is currently used only for Mardown, the simplest solution is
  to remove this, and let each reader manage its `_EXTENSIONS` setting.
---
 pelican/readers.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 3f01a72c..067bbb85 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -188,8 +188,9 @@ class MarkdownReader(BaseReader):
 
     def __init__(self, *args, **kwargs):
         super(MarkdownReader, self).__init__(*args, **kwargs)
-        self.extensions = self.settings['MD_EXTENSIONS']
-        self.extensions.append('meta')
+        self.extensions = list(self.settings['MD_EXTENSIONS'])
+        if 'meta' not in self.extensions:
+            self.extensions.append('meta')
 
     def _parse_metadata(self, meta):
         """Return the dict containing document metadata"""
@@ -405,11 +406,6 @@ class Readers(object):
 
             self.readers[fmt] = reader_class(self.settings)
 
-            settings_key = '%s_EXTENSIONS' % fmt.upper()
-
-            if settings_key in self.settings:
-                self.readers[fmt].extensions = self.settings[settings_key]
-
     @property
     def extensions(self):
         return self.readers.keys()

From 2f34307e129a8ae14b29262b9c63c0ab091f0f7f Mon Sep 17 00:00:00 2001
From: Talha Mansoor <talha131@gmail.com>
Date: Thu, 29 Aug 2013 23:14:47 +0500
Subject: [PATCH 1456/2864] Change the regex so that it parse |filename| and
 {filename} equally

Updates getpelican/pelican#1061
---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 900049a2..94790612 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -187,7 +187,7 @@ class Content(object):
                 (?:href|src)\s*=)
 
             (?P<quote>["\'])      # require value to be quoted
-            (?P<path>\|(?P<what>.*?)\|(?P<value>.*?))  # the url value
+            (?P<path>[|{](?P<what>.*?)[|}](?P<value>.*?))  # the url value
             \2""", re.X)
 
         def replacer(m):

From 8d352d9a7863fde988645b9b401c76ab2f8f512d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 29 Aug 2013 17:35:48 -0700
Subject: [PATCH 1457/2864]  Correct upload targets in Makefile.in

---
 pelican/tools/templates/Makefile.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 4ca0af6a..524bf82e 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -27,7 +27,7 @@ DROPBOX_DIR=$dropbox_dir
 DEBUG ?= 0
 ifeq ($(DEBUG), 1)
 	PELICANOPTS += -D
-endif 
+endif
 
 help:
 	@echo 'Makefile for a pelican Web site                                        '
@@ -40,13 +40,13 @@ help:
 	@echo '   make serve [PORT=8000]           serve site at http://localhost:8000'
 	@echo '   make devserver [PORT=8000]       start/restart develop_server.sh    '
 	@echo '   make stopserver                  stop local server                  '
-	@echo '   ssh_upload                       upload the web site via SSH        '
-	@echo '   rsync_upload                     upload the web site via rsync+ssh  '
-	@echo '   dropbox_upload                   upload the web site via Dropbox    '
-	@echo '   ftp_upload                       upload the web site via FTP        '
-	@echo '   s3_upload                        upload the web site via S3         '
-	@echo '   cf_upload                        upload the web site via Cloud Files'
-	@echo '   github                           upload the web site via gh-pages   '
+	@echo '   make ssh_upload                  upload the web site via SSH        '
+	@echo '   make rsync_upload                upload the web site via rsync+ssh  '
+	@echo '   make dropbox_upload              upload the web site via Dropbox    '
+	@echo '   make ftp_upload                  upload the web site via FTP        '
+	@echo '   make s3_upload                   upload the web site via S3         '
+	@echo '   make cf_upload                   upload the web site via Cloud Files'
+	@echo '   make github                      upload the web site via gh-pages   '
 	@echo '                                                                       '
 	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html'
 	@echo '                                                                       '

From ef16c915d4dfec668788bcff367a860214d01e55 Mon Sep 17 00:00:00 2001
From: bmcorser <benmarshallcorser@gmail.com>
Date: Sat, 31 Aug 2013 21:48:19 +0100
Subject: [PATCH 1458/2864] Clarification of THEME_STATIC_PATHS behaviour

---
 docs/settings.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c709a339..075bea83 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -597,7 +597,10 @@ Setting name (default value)                        What does it do?
                                                     `THEME_STATIC_PATHS`. Default is `theme`.
 `THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
                                                     value is `static`, but if your theme has
-                                                    other static paths, you can put them here.
+                                                    other static paths, you can put them here. If files
+                                                    or directories with the same names are included in
+                                                    the paths defined in this settings, they will be
+                                                    progressively overwritten.
 `CSS_FILE` (``'main.css'``)                         Specify the CSS file you want to load.
 ================================================    =====================================================
 

From 10c62b27dd3ca59972978ee4d57022739769bb2b Mon Sep 17 00:00:00 2001
From: bmcorser <benmarshallcorser@gmail.com>
Date: Sat, 31 Aug 2013 22:00:52 +0100
Subject: [PATCH 1459/2864] More exciting files

---
 samples/kinda/exciting/new/files/zap! | 0
 samples/kinda/exciting/old            | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 samples/kinda/exciting/new/files/zap!
 create mode 100644 samples/kinda/exciting/old

diff --git a/samples/kinda/exciting/new/files/zap! b/samples/kinda/exciting/new/files/zap!
new file mode 100644
index 00000000..e69de29b
diff --git a/samples/kinda/exciting/old b/samples/kinda/exciting/old
new file mode 100644
index 00000000..e69de29b

From 089059aec611b0827b925b987cb0f59bbfe4c485 Mon Sep 17 00:00:00 2001
From: bmcorser <benmarshallcorser@gmail.com>
Date: Sat, 31 Aug 2013 22:11:03 +0100
Subject: [PATCH 1460/2864] Clarify revised functinality

---
 pelican/tests/test_pelican.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index db2d0e6b..e829e1a5 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -99,6 +99,7 @@ class TestPelican(LoggedTestCase):
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
             'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH, 'very'),
+                                   os.path.join(SAMPLES_PATH, 'kinda'),
                                    os.path.join(SAMPLES_PATH, 'theme_standard')]
             })
         pelican = Pelican(settings=settings)
@@ -109,5 +110,5 @@ class TestPelican(LoggedTestCase):
         for file in ['a_stylesheet', 'a_template']:
             self.assertTrue(os.path.exists(os.path.join(theme_output, file)))
 
-        for file in ['wow!', 'boom!', 'bap!']:
+        for file in ['wow!', 'boom!', 'bap!', 'zap!']:
             self.assertTrue(os.path.exists(os.path.join(extra_path, file)))

From b7bc5702154e0e5d7d95ae61dfc22dd9a7ba5c62 Mon Sep 17 00:00:00 2001
From: jeekajoo <jeekajoo@users.noreply.github.com>
Date: Mon, 2 Sep 2013 19:25:46 +0200
Subject: [PATCH 1461/2864] add async and defer attributes to piwik.js

inspired from http://piwik.org/docs/javascript-tracking/#toc-where-can-i-find-the-piwik-tracking-code
---
 pelican/themes/notmyidea/templates/piwik.html | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/piwik.html b/pelican/themes/notmyidea/templates/piwik.html
index ff459af7..f9126264 100644
--- a/pelican/themes/notmyidea/templates/piwik.html
+++ b/pelican/themes/notmyidea/templates/piwik.html
@@ -1,16 +1,19 @@
 {% if PIWIK_URL and PIWIK_SITE_ID %}
-    <script type="text/javascript">
-    {% if PIWIK_SSL_URL %}
-        var pkBaseURL = (("https:" == document.location.protocol) ? "https://{{ PIWIK_SSL_URL }}/" : "http://{{ PIWIK_URL }}/");
-    {% else %}
-        var pkBaseURL = (("https:" == document.location.protocol) ? "https://{{ PIWIK_URL }}/" : "http://{{ PIWIK_URL }}/");
-    {% endif %}
-    document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-    </script><script type="text/javascript">
-    try {
-    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {{ PIWIK_SITE_ID }});
-    piwikTracker.trackPageView();
-    piwikTracker.enableLinkTracking();
-    } catch( err ) {}
-    </script><noscript><p><img src="http://{{ PIWIK_URL }}/piwik.php?idsite={{ PIWIK_SITE_ID }}" style="border:0" alt="" /></p></noscript>
-{% endif %}
\ No newline at end of file
+	<script type="text/javascript">
+	{% if PIWIK_SSL_URL %}
+		var pkBaseURL = "{{ PIWIK_SSL_URL }}";
+	{% else %}
+		var pkBaseURL = "{{ PIWIK_URL }}";
+	{% endif %}
+	var _paq = _paq || [];
+	_paq.push(["trackPageView"]);
+	_paq.push(["enableLinkTracking"]);
+	(function() {
+		var u=(("https:" == document.location.protocol) ? "https" : "http")+"://"+pkBaseURL+"/";
+		_paq.push(["setTrackerUrl", u+"piwik.php"]);
+		_paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
+		var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+		g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+	})();
+	</script>
+{% endif %}

From 6813cd923fed8b6a4f30a6951327049a6420e5f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Sun, 8 Sep 2013 17:07:30 +0200
Subject: [PATCH 1462/2864] Close some HTML tags. Fix #1076

---
 pelican/tests/output/basic/a-markdown-powered-article.html  | 4 ++--
 pelican/tests/output/basic/archives.html                    | 4 ++--
 pelican/tests/output/basic/article-1.html                   | 4 ++--
 pelican/tests/output/basic/article-2.html                   | 4 ++--
 pelican/tests/output/basic/article-3.html                   | 4 ++--
 pelican/tests/output/basic/author/alexis-metaireau.html     | 4 ++--
 pelican/tests/output/basic/authors.html                     | 4 ++--
 pelican/tests/output/basic/categories.html                  | 4 ++--
 pelican/tests/output/basic/category/bar.html                | 4 ++--
 pelican/tests/output/basic/category/cat1.html               | 4 ++--
 pelican/tests/output/basic/category/misc.html               | 4 ++--
 pelican/tests/output/basic/category/yeah.html               | 4 ++--
 pelican/tests/output/basic/filename_metadata-example.html   | 4 ++--
 pelican/tests/output/basic/index.html                       | 4 ++--
 pelican/tests/output/basic/oh-yeah.html                     | 4 ++--
 pelican/tests/output/basic/override/index.html              | 4 ++--
 .../output/basic/pages/this-is-a-test-hidden-page.html      | 4 ++--
 pelican/tests/output/basic/pages/this-is-a-test-page.html   | 4 ++--
 pelican/tests/output/basic/second-article-fr.html           | 4 ++--
 pelican/tests/output/basic/second-article.html              | 4 ++--
 pelican/tests/output/basic/tag/bar.html                     | 4 ++--
 pelican/tests/output/basic/tag/baz.html                     | 4 ++--
 pelican/tests/output/basic/tag/foo.html                     | 4 ++--
 pelican/tests/output/basic/tag/foobar.html                  | 4 ++--
 pelican/tests/output/basic/tag/oh.html                      | 4 ++--
 pelican/tests/output/basic/tag/yeah.html                    | 4 ++--
 pelican/tests/output/basic/tags.html                        | 4 ++--
 pelican/tests/output/basic/this-is-a-super-article.html     | 4 ++--
 pelican/tests/output/basic/unbelievable.html                | 4 ++--
 pelican/tests/output/custom/a-markdown-powered-article.html | 4 ++--
 pelican/tests/output/custom/archives.html                   | 4 ++--
 pelican/tests/output/custom/article-1.html                  | 4 ++--
 pelican/tests/output/custom/article-2.html                  | 4 ++--
 pelican/tests/output/custom/article-3.html                  | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau.html    | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau2.html   | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau3.html   | 4 ++--
 pelican/tests/output/custom/authors.html                    | 4 ++--
 pelican/tests/output/custom/categories.html                 | 4 ++--
 pelican/tests/output/custom/category/bar.html               | 4 ++--
 pelican/tests/output/custom/category/cat1.html              | 4 ++--
 pelican/tests/output/custom/category/misc.html              | 4 ++--
 pelican/tests/output/custom/category/yeah.html              | 4 ++--
 pelican/tests/output/custom/drafts/a-draft-article.html     | 4 ++--
 pelican/tests/output/custom/filename_metadata-example.html  | 4 ++--
 pelican/tests/output/custom/index.html                      | 4 ++--
 pelican/tests/output/custom/index2.html                     | 4 ++--
 pelican/tests/output/custom/index3.html                     | 4 ++--
 pelican/tests/output/custom/jinja2_template.html            | 4 ++--
 pelican/tests/output/custom/oh-yeah-fr.html                 | 4 ++--
 pelican/tests/output/custom/oh-yeah.html                    | 4 ++--
 pelican/tests/output/custom/override/index.html             | 4 ++--
 .../output/custom/pages/this-is-a-test-hidden-page.html     | 4 ++--
 pelican/tests/output/custom/pages/this-is-a-test-page.html  | 4 ++--
 pelican/tests/output/custom/second-article-fr.html          | 4 ++--
 pelican/tests/output/custom/second-article.html             | 4 ++--
 pelican/tests/output/custom/tag/bar.html                    | 4 ++--
 pelican/tests/output/custom/tag/baz.html                    | 4 ++--
 pelican/tests/output/custom/tag/foo.html                    | 4 ++--
 pelican/tests/output/custom/tag/foobar.html                 | 4 ++--
 pelican/tests/output/custom/tag/oh.html                     | 4 ++--
 pelican/tests/output/custom/tag/yeah.html                   | 4 ++--
 pelican/tests/output/custom/tags.html                       | 4 ++--
 pelican/tests/output/custom/this-is-a-super-article.html    | 4 ++--
 pelican/tests/output/custom/unbelievable.html               | 4 ++--
 pelican/themes/notmyidea/templates/base.html                | 4 ++--
 pelican/themes/simple/templates/article.html                | 6 +++---
 67 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index b7a90f02..6bc29eba 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A markdown powered article</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 0bc33bbc..e32c92ba 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 114e4774..0b675410 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Article 1</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index ca0cfc9a..28126c24 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Article 2</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index a4553026..bfb5760a 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Article 3</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 15ae0dcb..b38edc66 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog - Alexis Métaireau</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index 766bf566..4022cbab 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog - Authors</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 1834bcd4..fa2fc012 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 8e4cd688..b0cc9038 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog - bar</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 38b1fe1f..821b6b86 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog - cat1</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 1c4af16a..e0dfd4e4 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog - misc</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index a894dabb..021631fb 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog - yeah</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index e53e9c59..3df68433 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>FILENAME_METADATA example</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 5ecaa393..08c4ad09 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 940ebaed..a5e2fc34 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Oh yeah !</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 041b8bf6..30cd50e0 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Override url/save_as</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 0d681602..6da5d3c1 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>This is a test hidden page</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index c445dbcc..b0932c5d 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>This is a test page</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 9f759fab..050d49b3 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Deuxième article</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 6f83b0af..94646871 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Second article</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index a8de5c74..3de74a03 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog - bar</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 7c0bdf11..953d511f 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>The baz tag</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 77203dbc..ad423ede 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog - foo</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index c19d4569..c72e9402 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog - foobar</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index 48f5533f..ef876b8d 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Oh Oh Oh</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index d77e33f4..6a0ab0ec 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog - yeah</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index b9fa57f9..8172f6ae 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A Pelican Blog - Tags</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 30b778be..d8941ffb 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>This is a super article !</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 1fcb5553..db8d0bdf 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Unbelievable !</title>
-        <link rel="stylesheet" href="/theme/css/main.css">
+        <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 867f96bc..4d1fe16f 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A markdown powered article</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index cdf2e07b..a2ab7430 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 8511a11d..89e12914 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Article 1</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index e14ff291..1113e5e8 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Article 2</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index f76e5b18..c7306605 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Article 3</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index c383bd53..d2350bd5 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - Alexis Métaireau</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 9070b4e6..91ef0696 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - Alexis Métaireau</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 659c0e37..4b598914 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - Alexis Métaireau</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index 264c1698..adb3d992 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - Authors</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index ab561c91..5d839648 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 38080aed..3f1bbc4a 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - bar</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 6cd92044..81718322 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - cat1</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index db11dd9e..f32e04c3 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - misc</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index f54e316f..53666b0b 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - yeah</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 917cf500..b8306208 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>A draft article</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 83a4c43f..fcbda9c2 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>FILENAME_METADATA example</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 43c2e6a8..3fa1d5c3 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index b37de9ae..8769d098 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 821182fd..69f9d20c 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 082121dd..31beac32 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index a2b8b6c3..410c721f 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Trop bien !</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 49a79edc..dab28171 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Oh yeah !</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index c449f087..9c48d76f 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Override url/save_as</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 4a82c542..a061b7ee 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>This is a test hidden page</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index dbab2f13..af50adf8 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>This is a test page</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index c9b52338..cbeef437 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Deuxième article</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 270653e0..57009066 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Second article</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index cdef164d..9560b712 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - bar</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index e92bdc04..c6ebe542 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>The baz tag</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 3bc93546..d5b0d413 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - foo</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index aee030f5..0b4d2471 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - foobar</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index efdd8724..3b30a39c 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Oh Oh Oh</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index ba2da881..a6764575 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - yeah</title>
-        <link rel="stylesheet" href="../theme/css/main.css">
+        <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 7130b3ae..bc9b9d20 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Alexis' log - Tags</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 5e2fe0bb..0a580e25 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>This is a super article !</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 99512327..74bfa83c 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>Unbelievable !</title>
-        <link rel="stylesheet" href="./theme/css/main.css">
+        <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 4a00c93d..b081515f 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="{{ DEFAULT_LANG }}">
 <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" />
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
-        <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}">
+        <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" />
         {% if FEED_ALL_ATOM %}
         <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
         {% endif %}
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 2356c2f6..5025a5e7 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -1,15 +1,15 @@
 {% extends "base.html" %}
 {% block head %}
   {% for keyword in article.keywords %}
-    <meta name="keywords" contents="{{keyword}}">
+    <meta name="keywords" contents="{{keyword}}" />
   {% endfor %}
 
   {% for description in article.description %}
-    <meta name="description" contents="{{description}}">
+    <meta name="description" contents="{{description}}" />
   {% endfor %}
 
   {% for tag in article.tags %}
-    <meta name="tags" contents="{{tag}}"
+    <meta name="tags" contents="{{tag}}" />
   {% endfor %}
 
 {% endblock %}

From bddf0faa9c616350a179864d26f0271c418554b5 Mon Sep 17 00:00:00 2001
From: Talha Mansoor <talha131@gmail.com>
Date: Thu, 29 Aug 2013 23:23:54 +0500
Subject: [PATCH 1463/2864] Update documentation to reflect change in intrasite
 link syntax

Updates getpelican/pelican#1061
---
 docs/getting_started.rst | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index bad9bbda..f9aa8d50 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -400,7 +400,7 @@ and images that may be sitting alongside the current post (instead of having
 to determine where those resources will be placed after site generation).
 
 To link to internal content (files in the ``content`` directory), use the
-following syntax: ``|filename|path/to/file``::
+following syntax: ``{filename}path/to/file``::
 
 
     website/
@@ -421,8 +421,8 @@ In this example, ``article1.rst`` could look like::
 
     See below intra-site link examples in reStructuredText format.
 
-    `a link relative to content root <|filename|/cat/article2.rst>`_
-    `a link relative to current file <|filename|cat/article2.rst>`_
+    `a link relative to content root <{filename}/cat/article2.rst>`_
+    `a link relative to current file <{filename}cat/article2.rst>`_
 
 and ``article2.md``::
 
@@ -431,8 +431,8 @@ and ``article2.md``::
 
     See below intra-site link examples in Markdown format.
 
-    [a link relative to content root](|filename|/article1.md)
-    [a link relative to current file](|filename|../article1.md)
+    [a link relative to content root]({filename}/article1.md)
+    [a link relative to current file]({filename}../article1.md)
 
 Embedding non-article or non-page content is slightly different in that the
 directories need to be specified in ``pelicanconf.py`` file. The ``images``
@@ -447,7 +447,7 @@ manually::
 
 And ``image-test.md`` would include::
 
-    ![Alt Text](|filename|/images/han.jpg)
+    ![Alt Text]({filename}/images/han.jpg)
 
 Any content can be linked in this way. What happens is that the ``images``
 directory gets copied to ``output/static/`` upon publishing. This is
@@ -459,9 +459,16 @@ following to ``pelicanconf.py``::
 
 And then the ``pdfs`` directory would also be copied to ``output/static/``.
 
-You can also link to categories or tags, using the `|tag|tagname` and
-`|category|foobar` syntax.
+You can also link to categories or tags, using the ``{tag}tagname`` and
+``{category}foobar`` syntax.
 
+For backward compatibility, Pelican also supports bars ``||``, besides ``{}``,
+i.e. the ``filename``, ``tag`` and ``category`` identifiers can be enclosed
+in bars ``|`` instead of braces ``{}``, for example, ``|filename|an_article.rst``,
+``|tag|tagname``,  ``|category|foobar``.
+
+Using ``{}`` ensures that the syntax will not collide with markdown extensions or
+reST directives.
 
 Importing an existing blog
 --------------------------

From 48fa70c6a6112eb8722c9d3c7a892547c34312ae Mon Sep 17 00:00:00 2001
From: Talha Mansoor <talha131@gmail.com>
Date: Sun, 1 Sep 2013 00:35:13 +0500
Subject: [PATCH 1464/2864] Add INTRASITE_LINK_REGEX to configuration that user
 can modify

This INTRASITE_LINK_REGEX is a string. It should have the capturing
group name which is `what`.

This change was made after discussions with @ametaireau and
@justinmayer.

1. https://github.com/getpelican/pelican/pull/1067
1. https://github.com/getpelican/pelican/pull/1071

Updates getpelican/pelican#1061
---
 pelican/contents.py | 8 +++++---
 pelican/settings.py | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 94790612..b453f61b 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -182,13 +182,15 @@ class Content(object):
         if not content:
             return content
 
-        hrefs = re.compile(r"""
+        instrasite_link_regex = self.settings['INTRASITE_LINK_REGEX']
+        regex = r"""
             (?P<markup><\s*[^\>]*  # match tag with src and href attr
                 (?:href|src)\s*=)
 
             (?P<quote>["\'])      # require value to be quoted
-            (?P<path>[|{](?P<what>.*?)[|}](?P<value>.*?))  # the url value
-            \2""", re.X)
+            (?P<path>{0}(?P<value>.*?))  # the url value
+            \2""".format(instrasite_link_regex)
+        hrefs = re.compile(regex, re.X)
 
         def replacer(m):
             what = m.group('what')
diff --git a/pelican/settings.py b/pelican/settings.py
index 1f2646f6..1c2db677 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -110,6 +110,7 @@ DEFAULT_CONFIG = {
     'TEMPLATE_PAGES': {},
     'IGNORE_FILES': ['.#*'],
     'SLUG_SUBSTITUTIONS': (),
+    'INTRASITE_LINK_REGEX': '[{|](?P<what>.*?)[|}]',
     }
 
 

From e2236d50d6efb7e5c0ef07098944851e4633c950 Mon Sep 17 00:00:00 2001
From: Talha Mansoor <talha131@gmail.com>
Date: Sun, 1 Sep 2013 01:01:25 +0500
Subject: [PATCH 1465/2864] Update settings documentation to explain
 INTRASITE_LINK_REGEX

I have added reference to "Linking to internal content" section because
without it, it is difficult to explain the usage.

I have also updated changelog.

Closes getpelican/pelican#1061
---
 docs/changelog.rst       | 3 ++-
 docs/getting_started.rst | 2 ++
 docs/settings.rst        | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 27938d4d..bbe0e76c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,7 +9,8 @@ Next release
   longer article-specific
 * Deprecate ``FILES_TO_COPY`` in favor of ``STATIC_PATHS`` and
   ``EXTRA_PATH_METADATA``
-* Add support for |tag| and |category| relative links.
+* Add support for ``{}`` in relative links syntax, besides ``||``
+* Add support for |tag| and |category| relative links
 
 3.2.1 and 3.2.2
 ===============
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index f9aa8d50..d7a36080 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -390,6 +390,8 @@ If you want to exclude any pages from being linked to or listed in the menu
 then add a ``status: hidden`` attribute to its metadata. This is useful for
 things like making error pages that fit the generated theme of your site.
 
+.. _ref-linking-to-internal-content:
+
 Linking to internal content
 ---------------------------
 
diff --git a/docs/settings.rst b/docs/settings.rst
index c709a339..d021bcb0 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -156,6 +156,11 @@ Setting name (default value)                                            What doe
                                                                         <http://www.methods.co.nz/asciidoc/manpage.html>`_
 `WITH_FUTURE_DATES` (``True``)                                          If disabled, content with dates in the future will get a
                                                                         default status of draft.
+`INTRASITE_LINK_REGEX` (``'[{|](?P<what>.*?)[|}]'``)                    Regular expression that is used to parse internal links.  
+                                                                        Default syntax of links to internal files, tags, etc. is 
+                                                                        to enclose the identifier, say ``filename``, in ``{}`` or ``||``.
+                                                                        Identifier between ``{`` and ``}`` goes into the ``what`` capturing group.
+                                                                        For details see :ref:`ref-linking-to-internal-content`.
 =====================================================================   =====================================================================
 
 .. [#] Default is the system locale.

From bc26cde43610ef4ea65ad8803fec3c3f3b3134c2 Mon Sep 17 00:00:00 2001
From: Talha Mansoor <talha131@gmail.com>
Date: Mon, 9 Sep 2013 00:45:45 +0500
Subject: [PATCH 1466/2864] Add details on how to use Pelican for non-blog
 static sites

This question comes up on IRC quite frequently.
---
 docs/faq.rst | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 2cd363d8..c1d4f5a0 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -96,7 +96,7 @@ This metadata can then be accessed in templates such as ``article.html`` via::
     Last modified: {{ article.modified }}
     {% endif %}
 
-If you want to include metadata in templates outside the article context (e.g., ``base.html``), the ``if`` statement should instead be:
+If you want to include metadata in templates outside the article context (e.g., ``base.html``), the ``if`` statement should instead be::
 
     {% if article and article.modified %}
 
@@ -191,3 +191,15 @@ Older themes that referenced the old setting names may not link properly.
 In order to rectify this, please update your theme for compatibility by changing
 the relevant values in your template files. For an example of complete feed
 headers and usage please check out the ``simple`` theme.
+
+Is Pelican only suitable for blogs?
+===================================
+
+No. Pelican can be easily configured to create and maintain any type of static site.
+This may require little customization of your theme and Pelican configuration.
+For example, if you are building a launch site for your product and do not need
+tags on your site. You can hide tags by removing relevant html code from your theme. 
+You can also disable generation of tags pages::
+
+    TAGS_SAVE_AS = ''
+    TAG_SAVE_AS = ''

From 13199792a7e4c6eabb924b3b83e024e2cf3551ec Mon Sep 17 00:00:00 2001
From: Talha Mansoor <talha131@gmail.com>
Date: Mon, 9 Sep 2013 00:52:26 +0500
Subject: [PATCH 1467/2864] Add tip on how to add videos to your blog.

---
 docs/tips.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/tips.rst b/docs/tips.rst
index 430d6488..1864f0dd 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -83,3 +83,12 @@ that you will add ``CNAME`` file to your ``content``, dir and use the
 to the ``output`` dir. For example::
 
     FILES_TO_COPY = (('extra/CNAME', 'CNAME'),)
+
+How to add Youtube or Vimeo Videos
+==================================
+
+The easiest way is to paste embed code of the video from these sites in your 
+markup file.
+
+Alternatively, you can also use Pelican plugins like ``liquid_tags`` or ``pelican_youtube``
+or ``pelican_vimeo`` to embed videos in your blog.

From 3d419bf55dc03ed61327d94f7aa585ddfeee0e3e Mon Sep 17 00:00:00 2001
From: Talha Mansoor <talha131@gmail.com>
Date: Mon, 9 Sep 2013 10:28:47 +0500
Subject: [PATCH 1468/2864] Update changelog.rst

1. Escape `|tag|` and `|category|` with double ticks otherwise reST converts them to links that are invalid.
2. Updated syntax for relative links use braces instead of bars.
---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index bbe0e76c..064c8fd2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,7 +10,7 @@ Next release
 * Deprecate ``FILES_TO_COPY`` in favor of ``STATIC_PATHS`` and
   ``EXTRA_PATH_METADATA``
 * Add support for ``{}`` in relative links syntax, besides ``||``
-* Add support for |tag| and |category| relative links
+* Add support for ``{tag}`` and ``{category}`` relative links
 
 3.2.1 and 3.2.2
 ===============

From e03cf3f51735d5387fee7064cae89aaa1d34a0a6 Mon Sep 17 00:00:00 2001
From: bmcorser <benmarshallcorser@gmail.com>
Date: Sat, 14 Sep 2013 16:18:53 +0100
Subject: [PATCH 1469/2864] Fix `utils.copy` behaviour

Previously, the copy util failed if only a directory containing only
files was specified in THEME_STATIC_PATHS
---
 pelican/tests/test_pelican.py | 15 +++++++++++++++
 pelican/utils.py              |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index e829e1a5..8cccc918 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -112,3 +112,18 @@ class TestPelican(LoggedTestCase):
 
         for file in ['wow!', 'boom!', 'bap!', 'zap!']:
             self.assertTrue(os.path.exists(os.path.join(extra_path, file)))
+
+    def test_theme_static_paths_copy_single_file(self):
+        # the same thing with a specified set of settings should work
+        settings = read_settings(path=SAMPLE_CONFIG, override={
+            'PATH': INPUT_PATH,
+            'OUTPUT_PATH': self.temp_path,
+            'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH, 'theme_standard')]
+            })
+
+        pelican = Pelican(settings=settings)
+        mute(True)(pelican.run)()
+        theme_output = os.path.join(self.temp_path, 'theme')
+
+        for file in ['a_stylesheet', 'a_template']:
+            self.assertTrue(os.path.exists(os.path.join(theme_output, file)))
diff --git a/pelican/utils.py b/pelican/utils.py
index d306de65..f222f63c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -273,6 +273,9 @@ def copy(path, source, destination, destination_path=None):
     destination_ = os.path.abspath(
         os.path.expanduser(os.path.join(destination, destination_path)))
 
+    if not os.path.exists(destination_):
+        os.makedirs(destination_)
+
     def recurse(source, destination):
         for entry in os.listdir(source):
             entry_path = os.path.join(source, entry)

From 3580233b385f05d7eaee258ed9cff451d528ead9 Mon Sep 17 00:00:00 2001
From: SDGSDG <karmadharma@server.fake>
Date: Sun, 15 Sep 2013 22:43:24 -0700
Subject: [PATCH 1470/2864] Support for pygment defaults and relevant
 documentation

---
 docs/getting_started.rst                      | 62 +++++++++++++++++++
 docs/settings.rst                             |  3 +
 pelican/rstdirectives.py                      | 14 ++++-
 pelican/settings.py                           | 12 +++-
 pelican/tests/output/basic/category/misc.html | 10 +--
 .../tests/output/basic/feeds/all-en.atom.xml  | 16 ++++-
 pelican/tests/output/basic/feeds/all.atom.xml | 16 ++++-
 .../tests/output/basic/feeds/misc.atom.xml    | 16 ++++-
 pelican/tests/output/basic/index.html         | 10 +--
 pelican/tests/output/basic/unbelievable.html  | 16 ++++-
 .../custom/author/alexis-metaireau3.html      | 10 +--
 .../tests/output/custom/category/misc.html    | 10 +--
 .../tests/output/custom/feeds/all-en.atom.xml | 14 +++++
 .../tests/output/custom/feeds/all.atom.xml    | 14 +++++
 pelican/tests/output/custom/feeds/all.rss.xml | 14 +++++
 .../tests/output/custom/feeds/misc.atom.xml   | 14 +++++
 .../tests/output/custom/feeds/misc.rss.xml    | 14 +++++
 pelican/tests/output/custom/index3.html       | 10 +--
 pelican/tests/output/custom/unbelievable.html | 14 +++++
 samples/content/unbelievable.rst              | 29 ++++++++-
 samples/pelican.conf.py                       |  3 +
 21 files changed, 288 insertions(+), 33 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index d7a36080..2605c3a1 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -533,6 +533,9 @@ which posts are translations::
 
     That's true, foobar is still alive!
 
+
+.. _internal_pygments_options:
+
 Syntax highlighting
 -------------------
 
@@ -556,6 +559,65 @@ indenting both the identifier and code::
 The specified identifier (e.g. ``python``, ``ruby``) should be one that
 appears on the `list of available lexers <http://pygments.org/docs/lexers/>`_.
 
+When using reStructuredText the following options are available in the
+code-block directive:
+
+=============   ============  =========================================
+Option          Valid values  Description
+=============   ============  =========================================
+anchorlinenos   N/A           If present wrap line numbers in <a> tags.
+classprefix     string        String to prepend to token class names
+hl_lines        numbers       List of lines to be highlighted.
+lineanchors     string        Wrap each line in an anchor using this
+                              string and -linenumber.
+linenos         string        If present or set to "table" output line 
+                              numbers in a table, if set to
+                              "inline" output them inline. "none" means
+                              do not output the line numbers for this 
+                              table.
+linenospecial   number        If set every nth line will be given the 
+                              'special' css class.
+linenostart     number        Line number for the first line.
+linenostep      number        Print every nth line number.
+lineseparator   string        String to print between lines of code,
+                              '\n' by default.
+linespans       string        Wrap each line in a span using this and
+                              -linenumber.
+nobackground    N/A           If set do not output background color for
+                              the wrapping element
+nowrap          N/A           If set do not wrap the tokens at all.
+tagsfile        string        ctags file to use for name definitions.
+tagurlformat    string        format for the ctag links.
+=============   ============  =========================================
+
+Note that, depending on its version, your pygments module might not have
+all of these available. See the `Pygments documentation
+<http://pygments.org/docs/formatters/>`_ for the HTML formatter for more
+details on each of the options.
+
+for example the below code block enables line numbers, starting at 153,
+and prefixes the Pygments CSS classes with *pgcss* to make the names
+more unique and avoid possible CSS conflicts::
+
+    .. code-block:: identifier
+        :classprefix: pgcss
+        :linenos: table
+        :linenostart: 153
+
+       <indented code block goes here>
+
+It is also possible to specify the ``PYGMENTS_RST_OPTIONS`` variable
+in your Pelican configuration file for settings that will be
+automatically applied to every code block.
+
+For example, if you wanted to have line numbers on for every code block
+and a CSS prefix you would set this variable to::
+
+    PYGMENTS_RST_OPTIONS = { 'classprefix': 'pgcss', 'linenos': 'table'}
+
+If specified, settings for individual code blocks will override the
+defaults in the configuration file.
+
 Publishing drafts
 -----------------
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 70341a3f..e8965731 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -161,6 +161,9 @@ Setting name (default value)                                            What doe
                                                                         to enclose the identifier, say ``filename``, in ``{}`` or ``||``.
                                                                         Identifier between ``{`` and ``}`` goes into the ``what`` capturing group.
                                                                         For details see :ref:`ref-linking-to-internal-content`.
+`PYGMENTS_RST_OPTIONS` (``[]``)                                         A list of default Pygments settings for your reStructuredText
+                                                                        code blocks. See :ref:`internal_pygments_options` for a list of
+                                                                        supported options.
 =====================================================================   =====================================================================
 
 .. [#] Default is the system locale.
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index 33ed2f03..1bf6971c 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -7,6 +7,8 @@ from pygments.formatters import HtmlFormatter
 from pygments import highlight
 from pygments.lexers import get_lexer_by_name, TextLexer
 import re
+import six
+import pelican.settings as pys
 
 
 class Pygments(Directive):
@@ -41,9 +43,19 @@ class Pygments(Directive):
             # no lexer found - use the text one instead of an exception
             lexer = TextLexer()
 
+        # Fetch the defaults
+        if pys.PYGMENTS_RST_OPTIONS is not None:
+            for k, v in six.iteritems(pys.PYGMENTS_RST_OPTIONS):
+                # Locally set options overrides the defaults
+                if k not in self.options:
+                    self.options[k] = v
+
         if ('linenos' in self.options and
                 self.options['linenos'] not in ('table', 'inline')):
-            self.options['linenos'] = 'table'
+            if self.options['linenos'] == 'none':
+                self.options.pop('linenos')
+            else:
+                self.options['linenos'] = 'table'
 
         for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
             if flag in self.options:
diff --git a/pelican/settings.py b/pelican/settings.py
index 1c2db677..99828935 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -107,12 +107,15 @@ DEFAULT_CONFIG = {
     'SUMMARY_MAX_LENGTH': 50,
     'PLUGIN_PATH': '',
     'PLUGINS': [],
+    'PYGMENTS_RST_OPTIONS': {},
     'TEMPLATE_PAGES': {},
     'IGNORE_FILES': ['.#*'],
     'SLUG_SUBSTITUTIONS': (),
     'INTRASITE_LINK_REGEX': '[{|](?P<what>.*?)[|}]',
     }
 
+PYGMENTS_RST_OPTIONS = None
+
 
 def read_settings(path=None, override=None):
     if path:
@@ -131,7 +134,14 @@ def read_settings(path=None, override=None):
     if override:
         local_settings.update(override)
 
-    return configure_settings(local_settings)
+    parsed_settings = configure_settings(local_settings)
+    # This is because there doesn't seem to be a way to pass extra
+    # parameters to docutils directive handlers, so we have to have a
+    # variable here that we'll import from within Pygments.run (see
+    # rstdirectives.py) to see what the user defaults were.
+    global PYGMENTS_RST_OPTIONS
+    PYGMENTS_RST_OPTIONS = parsed_settings.get('PYGMENTS_RST_OPTIONS', None)
+    return parsed_settings
 
 
 def get_settings_from_module(module=None, default_settings=DEFAULT_CONFIG):
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index e0dfd4e4..5b8af887 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -86,11 +86,11 @@
 <h2>Testing sourcecode directive</h2>
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
-</td></tr></table><p>Lovely.</p>
-</div>
-<div class="section" id="testing-more-sourcecode-directives">
-<h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError ...</span></span></pre></div></div>
+</td></tr></table></div>
+<div class="section" id="testing-another-case">
+<h2>Testing another case</h2>
+<p>This will now have a line number in 'custom' since it's the default in
+pelican.conf, it ...</p></div>
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 5b8eb591..da537344 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -31,7 +31,14 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
@@ -43,5 +50,12 @@ YEAH !&lt;/p&gt;
 &lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index d19b0c30..d837c895 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -32,7 +32,14 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
@@ -44,5 +51,12 @@ YEAH !&lt;/p&gt;
 &lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index 34b6b4fb..8b988614 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -8,7 +8,14 @@
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
@@ -20,5 +27,12 @@
 &lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 08c4ad09..24b00606 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -219,11 +219,11 @@ YEAH !</p>
 <h2>Testing sourcecode directive</h2>
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
-</td></tr></table><p>Lovely.</p>
-</div>
-<div class="section" id="testing-more-sourcecode-directives">
-<h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError ...</span></span></pre></div></div>
+</td></tr></table></div>
+<div class="section" id="testing-another-case">
+<h2>Testing another case</h2>
+<p>This will now have a line number in 'custom' since it's the default in
+pelican.conf, it ...</p></div>
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index db8d0bdf..aef78474 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -47,7 +47,14 @@
 <h2>Testing sourcecode directive</h2>
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
-</td></tr></table><p>Lovely.</p>
+</td></tr></table></div>
+<div class="section" id="testing-another-case">
+<h2>Testing another case</h2>
+<p>This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.</p>
+<div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+<p>Lovely.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
@@ -58,6 +65,13 @@
 <h2>Testing even more sourcecode directives</h2>
 <span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 <p>Lovely.</p>
+</div>
+<div class="section" id="testing-overriding-config-defaults">
+<h2>Testing overriding config defaults</h2>
+<p>Even if the default is line numbers, we can override it here</p>
+<div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+<p>Lovely.</p>
 </div>
 
     </div><!-- /.entry-content -->
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 4b598914..77c9cdfe 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -55,11 +55,11 @@
 <h2>Testing sourcecode directive</h2>
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
-</td></tr></table><p>Lovely.</p>
-</div>
-<div class="section" id="testing-more-sourcecode-directives">
-<h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError ...</span></span></pre></div></div>
+</td></tr></table></div>
+<div class="section" id="testing-another-case">
+<h2>Testing another case</h2>
+<p>This will now have a line number in 'custom' since it's the default in
+pelican.conf, it ...</p></div>
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index f32e04c3..36479803 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -99,11 +99,11 @@
 <h2>Testing sourcecode directive</h2>
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
-</td></tr></table><p>Lovely.</p>
-</div>
-<div class="section" id="testing-more-sourcecode-directives">
-<h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError ...</span></span></pre></div></div>
+</td></tr></table></div>
+<div class="section" id="testing-another-case">
+<h2>Testing another case</h2>
+<p>This will now have a line number in 'custom' since it's the default in
+pelican.conf, it ...</p></div>
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index ce25290d..69ba08c6 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -31,6 +31,13 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
@@ -43,5 +50,12 @@ YEAH !&lt;/p&gt;
 &lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 68986d40..2eb31731 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -33,6 +33,13 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
@@ -45,5 +52,12 @@ YEAH !&lt;/p&gt;
 &lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 7fee491a..69e30bfd 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -33,6 +33,13 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
@@ -45,5 +52,12 @@ YEAH !&lt;/p&gt;
 &lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 9328e05a..91d6b28f 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -8,6 +8,13 @@
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
@@ -20,5 +27,12 @@
 &lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index b708c70d..3493d2a3 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -8,6 +8,13 @@
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
@@ -20,5 +27,12 @@
 &lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 69f9d20c..b4d9ffc6 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -55,11 +55,11 @@
 <h2>Testing sourcecode directive</h2>
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
-</td></tr></table><p>Lovely.</p>
-</div>
-<div class="section" id="testing-more-sourcecode-directives">
-<h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError ...</span></span></pre></div></div>
+</td></tr></table></div>
+<div class="section" id="testing-another-case">
+<h2>Testing another case</h2>
+<p>This will now have a line number in 'custom' since it's the default in
+pelican.conf, it ...</p></div>
                 <a class="readmore" href="./unbelievable.html">read more</a>
 <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 74bfa83c..03b533bb 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -54,6 +54,13 @@
 <h2>Testing sourcecode directive</h2>
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
+</td></tr></table></div>
+<div class="section" id="testing-another-case">
+<h2>Testing another case</h2>
+<p>This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.</p>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
 </td></tr></table><p>Lovely.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
@@ -65,6 +72,13 @@
 <h2>Testing even more sourcecode directives</h2>
 <span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 <p>Lovely.</p>
+</div>
+<div class="section" id="testing-overriding-config-defaults">
+<h2>Testing overriding config defaults</h2>
+<p>Even if the default is line numbers, we can override it here</p>
+<div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+<p>Lovely.</p>
 </div>
 
     </div><!-- /.entry-content -->
diff --git a/samples/content/unbelievable.rst b/samples/content/unbelievable.rst
index b990d20c..209e3557 100644
--- a/samples/content/unbelievable.rst
+++ b/samples/content/unbelievable.rst
@@ -12,9 +12,20 @@ Testing sourcecode directive
 ----------------------------
 
 .. sourcecode:: python
-  :linenos:
+    :linenos:
 
-  formatter = self.options and VARIANTS[self.options.keys()[0]]
+    formatter = self.options and VARIANTS[self.options.keys()[0]]
+
+
+Testing another case
+--------------------
+
+This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.
+
+.. sourcecode:: python
+
+    formatter = self.options and VARIANTS[self.options.keys()[0]]
 
 
 Lovely.
@@ -71,3 +82,17 @@ Testing even more sourcecode directives
 
 
 Lovely.
+
+Testing overriding config defaults
+----------------------------------
+
+Even if the default is line numbers, we can override it here
+
+.. sourcecode:: python
+    :linenos: none
+    
+  
+    formatter = self.options and VARIANTS[self.options.keys()[0]]
+
+
+Lovely.
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 4d5cd06d..d6a87923 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -48,6 +48,9 @@ STATIC_PATHS = [
 # custom page generated with a jinja2 template
 TEMPLATE_PAGES = {'pages/jinja2_template.html': 'jinja2_template.html'}
 
+# code blocks with line numbers
+PYGMENTS_RST_OPTIONS = {'linenos': 'table'}
+
 # foobar will not be used, because it's not in caps. All configuration keys
 # have to be in caps
 foobar = "barbaz"

From 22da74211d1874edf4e6d3c01f7526d5b633a0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Tue, 17 Sep 2013 17:32:08 +0200
Subject: [PATCH 1471/2864] Fix a broken link

---
 docs/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index c1d4f5a0..f7ee6826 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -49,7 +49,7 @@ themes to style code syntax highlighting via CSS. Specifically, you can
 customize the appearance of your syntax highlighting via the ``.highlight pre``
 class in your theme's CSS file. To see how various styles can be used to render
 Django code, for example, use the style selector drop-down at top-right on the
-`Pygments project demo site <http://pygments.org/demo/15101/>`_.
+`Pygments project demo site <http://pygments.org/demo/>`_.
 
 You can use the following example commands to generate a starting CSS file from
 a Pygments built-in style (in this case, "monokai") and then copy the generated

From 07f87969ea7a66a89f6a54ea575659f839d6d1d7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 23 Sep 2013 19:28:06 +0200
Subject: [PATCH 1472/2864] Update changelog

---
 docs/changelog.rst | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 064c8fd2..ebf84f34 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,13 +4,27 @@ Release history
 Next release
 ============
 
+* Drop Python 3.2 support in favor of Python 3.3
+* Add ``Fabfile`` so Fabric can be used for workflow automation instead of Make
+* ``OUTPUT_RETENTION`` setting can be used to preserve metadata (e.g., VCS
+  data such as ``.hg`` and ``.git``) from being removed from output directory
+* Tumblr import
+* Improve logic and consistency when cleaning output folder
+* Improve documentation versioning and release automation
+* Improve pagination flexibility
 * Rename signals for better consistency (some plugins may need to be updated)
 * Move metadata extraction from generators to readers; metadata extraction no
   longer article-specific
 * Deprecate ``FILES_TO_COPY`` in favor of ``STATIC_PATHS`` and
   ``EXTRA_PATH_METADATA``
+* Summaries in Markdown posts no longer include footnotes
+* Remove unnecessary whitespace in output via ``lstrip_blocks`` Jinja parameter
+* Move PDF generation from core to plugin
+* Replace ``MARKUP`` setting with ``READERS``
+* Add warning if img tag is missing ``alt`` attribute
 * Add support for ``{}`` in relative links syntax, besides ``||``
 * Add support for ``{tag}`` and ``{category}`` relative links
+* Add a ``content_written`` signal
 
 3.2.1 and 3.2.2
 ===============

From f6c9237a0115491b7db3206717e63a4250c6c2b8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 23 Sep 2013 19:30:51 +0200
Subject: [PATCH 1473/2864] Enhance and correct documentation

---
 docs/faq.rst             | 13 +++----
 docs/getting_started.rst | 60 ++++++++++++++++---------------
 docs/index.rst           | 10 ++++--
 docs/plugins.rst         | 16 ++++-----
 docs/settings.rst        | 77 ++++++++++++++++++++--------------------
 docs/themes.rst          | 23 ++++++------
 docs/tips.rst            | 48 +++++++++++++------------
 7 files changed, 129 insertions(+), 118 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index f7ee6826..da37af04 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -23,8 +23,8 @@ How can I help?
 There are several ways to help out. First, you can report any Pelican
 suggestions or problems you might have via IRC or the `issue tracker
 <https://github.com/getpelican/pelican/issues>`_. If submitting an issue
-report, please check the existing issue list first in order to avoid submitting
-a duplicate issue.
+report, please first check the existing issue list (both open and closed) in
+order to avoid submitting a duplicate issue.
 
 If you want to contribute, please fork `the git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make
@@ -96,7 +96,8 @@ This metadata can then be accessed in templates such as ``article.html`` via::
     Last modified: {{ article.modified }}
     {% endif %}
 
-If you want to include metadata in templates outside the article context (e.g., ``base.html``), the ``if`` statement should instead be::
+If you want to include metadata in templates outside the article context (e.g.,
+``base.html``), the ``if`` statement should instead be::
 
     {% if article and article.modified %}
 
@@ -196,10 +197,10 @@ Is Pelican only suitable for blogs?
 ===================================
 
 No. Pelican can be easily configured to create and maintain any type of static site.
-This may require little customization of your theme and Pelican configuration.
+This may require a little customization of your theme and Pelican configuration.
 For example, if you are building a launch site for your product and do not need
-tags on your site. You can hide tags by removing relevant html code from your theme. 
-You can also disable generation of tags pages::
+tags on your site, you could remove the relevant HTML code from your theme. 
+You can also disable generation of tag-related pages via::
 
     TAGS_SAVE_AS = ''
     TAG_SAVE_AS = ''
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 2605c3a1..201b9ad4 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -83,15 +83,20 @@ Viewing the generated files
 ---------------------------
 
 The files generated by Pelican are static files, so you don't actually need
-anything special to view them. You can either use your browser to open the
-files on your disk::
+anything special to view them. You can use your browser to open the generated
+HTML files directly::
 
     firefox output/index.html
 
-Or run a simple web server using Python::
+Because the above method may have trouble locating your CSS and other linked
+assets, running a simple web server using Python will often provide a more
+reliable previewing experience::
 
     cd output && python -m SimpleHTTPServer
 
+Once the ``SimpleHTTPServer`` has been started, you can preview your site at
+http://localhost:8000/
+
 Upgrading
 ---------
 
@@ -452,25 +457,24 @@ And ``image-test.md`` would include::
     ![Alt Text]({filename}/images/han.jpg)
 
 Any content can be linked in this way. What happens is that the ``images``
-directory gets copied to ``output/static/`` upon publishing. This is
-because ``images`` is in the ``settings["STATIC_PATHS"]`` list by default. If
-you want to have another directory, say ``pdfs`` you would need to add the
-following to ``pelicanconf.py``::
+directory gets copied to ``output/`` during site generation because Pelican
+includes ``images`` in the ``STATIC_PATHS`` setting's list by default. If
+you want to have another directory, say ``pdfs``, copied from your content to
+your output during site generation, you would need to add the following to
+your settings file::
 
     STATIC_PATHS = ['images', 'pdfs']
 
-And then the ``pdfs`` directory would also be copied to ``output/static/``.
+After the above line has been added, subsequent site generation should copy the
+``content/pdfs/`` directory to ``output/pdfs/``.
 
 You can also link to categories or tags, using the ``{tag}tagname`` and
 ``{category}foobar`` syntax.
 
-For backward compatibility, Pelican also supports bars ``||``, besides ``{}``,
-i.e. the ``filename``, ``tag`` and ``category`` identifiers can be enclosed
-in bars ``|`` instead of braces ``{}``, for example, ``|filename|an_article.rst``,
-``|tag|tagname``,  ``|category|foobar``.
-
-Using ``{}`` ensures that the syntax will not collide with markdown extensions or
-reST directives.
+For backward compatibility, Pelican also supports bars (``||``) in addition to
+curly braces (``{}``). For example: ``|filename|an_article.rst``,
+``|tag|tagname``, ``|category|foobar``. The syntax was changed from ``||`` to
+``{}`` to avoid collision with Markdown extensions or reST directives.
 
 Importing an existing blog
 --------------------------
@@ -590,12 +594,12 @@ tagsfile        string        ctags file to use for name definitions.
 tagurlformat    string        format for the ctag links.
 =============   ============  =========================================
 
-Note that, depending on its version, your pygments module might not have
-all of these available. See the `Pygments documentation
-<http://pygments.org/docs/formatters/>`_ for the HTML formatter for more
+Note that, depending on the version, your Pygments module might not have
+all of these options available. Refer to the *HtmlFormatter* section of the
+`Pygments documentation <http://pygments.org/docs/formatters/>`_ for more
 details on each of the options.
 
-for example the below code block enables line numbers, starting at 153,
+For example, the following code block enables line numbers, starting at 153,
 and prefixes the Pygments CSS classes with *pgcss* to make the names
 more unique and avoid possible CSS conflicts::
 
@@ -606,25 +610,25 @@ more unique and avoid possible CSS conflicts::
 
        <indented code block goes here>
 
-It is also possible to specify the ``PYGMENTS_RST_OPTIONS`` variable
-in your Pelican configuration file for settings that will be
-automatically applied to every code block.
+It is also possible to specify the ``PYGMENTS_RST_OPTIONS`` variable in your
+Pelican settings file to include options that will be automatically applied to
+every code block.
 
-For example, if you wanted to have line numbers on for every code block
+For example, if you want to have line numbers displayed for every code block
 and a CSS prefix you would set this variable to::
 
-    PYGMENTS_RST_OPTIONS = { 'classprefix': 'pgcss', 'linenos': 'table'}
+    PYGMENTS_RST_OPTIONS = {'classprefix': 'pgcss', 'linenos': 'table'}
 
-If specified, settings for individual code blocks will override the
-defaults in the configuration file.
+If specified, settings for individual code blocks will override the defaults in
+your settings file.
 
 Publishing drafts
 -----------------
 
 If you want to publish an article as a draft (for friends to review before
-publishing, for example), you can add a ``status: draft`` attribute to its
+publishing, for example), you can add a ``Status: draft`` attribute to its
 metadata. That article will then be output to the ``drafts`` folder and not
-listed on the index page nor on any category page.
+listed on the index page nor on any category or tag page.
 
 .. _virtualenv: http://www.virtualenv.org/
 .. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
diff --git a/docs/index.rst b/docs/index.rst
index eb8883ce..35e859d5 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -51,9 +51,13 @@ If you want to see new features in Pelican, don't hesitate to offer suggestions,
 clone the repository, etc. There are many ways to :doc:`contribute<contribute>`.
 That's open source, dude!
 
-Send a message to "authors at getpelican dot com" with any requests/feedback! You
-can also join the team at `#pelican on Freenode`_ (or if you don't have an IRC
-client handy, use the webchat_ for quick feedback.
+Send a message to "authors at getpelican dot com" with any requests/feedback.
+For a more immediate response, you can also join the team via IRC at
+`#pelican on Freenode`_ — if you don't have an IRC client handy, use the
+webchat_ for quick feedback. If you ask a question via IRC and don't get an
+immediate response, don't leave the channel! It may take a few hours because
+of time zone differences, but f you are patient and remain in the channel,
+someone will almost always respond to your inquiry.
 
 Documentation
 -------------
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 29d67e24..6de01d05 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -135,15 +135,15 @@ shared in the documentation somewhere, so here they are!
 How to create a new reader
 --------------------------
 
-One thing you might want is to add the support for your very own input
-format. While it might make sense to add this feature in pelican core, we
-wisely chose to avoid this situation, and have the different readers defined in
-plugins.
+One thing you might want is to add support for your very own input format.
+While it might make sense to add this feature in Pelican core, we
+wisely chose to avoid this situation and instead have the different readers
+defined via plugins.
 
 The rationale behind this choice is mainly that plugins are really easy to
-write and don't slow down pelican itself when they're not active.
+write and don't slow down Pelican itself when they're not active.
 
-No more talking, here is the example::
+No more talking — here is an example::
 
     from pelican import signals
     from pelican.readers import BaseReader
@@ -153,7 +153,7 @@ No more talking, here is the example::
         enabled = True  # Yeah, you probably want that :-)
 
         # The list of file extensions you want this reader to match with.
-        # In the case multiple readers use the same extensions, the latest will
+        # If multiple readers were to use the same extension, the latest will
         # win (so the one you're defining here, most probably).
         file_extensions = ['yeah']
 
@@ -173,7 +173,7 @@ No more talking, here is the example::
     def add_reader(readers):
         readers.reader_classes['yeah'] = NewReader
 
-    # this is how pelican works.
+    # This is how pelican works.
     def register():
         signals.readers_init.connect(add_reader)
 
diff --git a/docs/settings.rst b/docs/settings.rst
index e8965731..b6c18fa9 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -84,10 +84,10 @@ Setting name (default value)                                            What doe
                                                                         here or a single string representing one locale.
                                                                         When providing a list, all the locales will be tried
                                                                         until one works.
-`READERS` (``{}``)                                                      A dict of file extensions / Reader classes to overwrite or
-                                                                        add file readers. for instance, to avoid processing .html files:
-                                                                        ``READERS = {'html': None}``. Or to add a custom reader for the
-                                                                        `foo` extension: ``READERS = {'foo': FooReader}``
+`READERS` (``{}``)                                                      A dictionary of file extensions / Reader classes for Pelican to
+                                                                        process or ignore. For example, to avoid processing .html files,
+                                                                        set: ``READERS = {'html': None}``. To add a custom reader for the
+                                                                        `foo` extension, set: ``READERS = {'foo': FooReader}``
 `IGNORE_FILES` (``['.#*']``)                                            A list of file globbing patterns to match against the
                                                                         source files to be ignored by the processor. For example,
                                                                         the default ``['.#*']`` will ignore emacs lock files.
@@ -106,11 +106,9 @@ Setting name (default value)                                            What doe
 `PAGE_EXCLUDES` (``()``)                                                A list of directories to exclude when looking for pages.
 `ARTICLE_DIR` (``''``)                                                  Directory to look at for articles, relative to `PATH`.
 `ARTICLE_EXCLUDES`: (``('pages',)``)                                    A list of directories to exclude when looking for articles.
-`PDF_GENERATOR` (``False``)                                             Set to ``True`` if you want PDF versions of your documents to be.
-                                                                        generated. You will need to install ``rst2pdf``.
 `OUTPUT_SOURCES` (``False``)                                            Set to True if you want to copy the articles and pages in their
                                                                         original format (e.g. Markdown or reStructuredText) to the
-                                                                        specified OUTPUT_PATH.
+                                                                        specified ``OUTPUT_PATH``.
 `OUTPUT_SOURCES_EXTENSION` (``.text``)                                  Controls the extension that will be used by the SourcesGenerator.
                                                                         Defaults to ``.text``. If not a valid string the default value
                                                                         will be used.
@@ -144,7 +142,7 @@ Setting name (default value)                                            What doe
                                                                         are not needed, set ``DIRECT_TEMPLATES = ('index', 'archives')``
 `PAGINATED_DIRECT_TEMPLATES` (``('index',)``)                           Provides the direct templates that should be paginated.
 `SUMMARY_MAX_LENGTH` (``50``)                                           When creating a short summary of an article, this will
-                                                                        be the default length in words of the text created.
+                                                                        be the default length (measured in words) of the text created.
                                                                         This only applies if your content does not otherwise
                                                                         specify a summary. Setting to ``None`` will cause the summary
                                                                         to be a copy of the original content.
@@ -155,9 +153,9 @@ Setting name (default value)                                            What doe
 `ASCIIDOC_OPTIONS` (``[]``)                                             A list of options to pass to AsciiDoc. See the `manpage
                                                                         <http://www.methods.co.nz/asciidoc/manpage.html>`_
 `WITH_FUTURE_DATES` (``True``)                                          If disabled, content with dates in the future will get a
-                                                                        default status of draft.
+                                                                        default status of ``draft``.
 `INTRASITE_LINK_REGEX` (``'[{|](?P<what>.*?)[|}]'``)                    Regular expression that is used to parse internal links.  
-                                                                        Default syntax of links to internal files, tags, etc. is 
+                                                                        Default syntax of links to internal files, tags, etc., is 
                                                                         to enclose the identifier, say ``filename``, in ``{}`` or ``||``.
                                                                         Identifier between ``{`` and ``}`` goes into the ``what`` capturing group.
                                                                         For details see :ref:`ref-linking-to-internal-content`.
@@ -173,7 +171,7 @@ URL settings
 ------------
 
 The first thing to understand is that there are currently two supported methods
-for URL formation: *relative* and *absolute*. Document-relative URLs are useful
+for URL formation: *relative* and *absolute*. Relative URLs are useful
 when testing locally, and absolute URLs are reliable and most useful when
 publishing. One method of supporting both is to have one Pelican configuration
 file for local development and another for publishing. To see an example of this
@@ -181,16 +179,17 @@ type of setup, use the ``pelican-quickstart`` script as described at the top of
 the :doc:`Getting Started <getting_started>` page, which will produce two separate
 configuration files for local development and publishing, respectively.
 
-You can customize the URLs and locations where files will be saved. The URLs and
-SAVE_AS variables use Python's format strings. These variables allow you to place
-your articles in a location such as ``{slug}/index.html`` and link to them as
-``{slug}`` for clean URLs. These settings give you the flexibility to place your
-articles and pages anywhere you want.
+You can customize the URLs and locations where files will be saved. The
+``*_URL`` and ``*_SAVE_AS`` variables use Python's format strings. These
+variables allow you to place your articles in a location such as
+``{slug}/index.html`` and link to them as ``{slug}`` for clean URLs. These
+settings give you the flexibility to place your articles and pages anywhere you
+want.
 
 .. note::
-    If you specify a datetime directive, it will be substituted using the
+    If you specify a ``datetime`` directive, it will be substituted using the
     input files' date metadata attribute. If the date is not specified for a
-    particular file, Pelican will rely on the file's mtime timestamp.
+    particular file, Pelican will rely on the file's ``mtime`` timestamp.
 
 Check the Python datetime documentation at http://bit.ly/cNcJUC for more
 information.
@@ -213,7 +212,7 @@ and the URL to this would be ``/posts/2011/Aug/07/sample-post/``.
 
 Pelican can optionally create per-year, per-month, and per-day archives of your
 posts. These secondary archives are disabled by default but are automatically
-enabled if you supply format strings for their respective `_SAVE_AS` settings.
+enabled if you supply format strings for their respective ``_SAVE_AS`` settings.
 Period archives fit intuitively with the hierarchical model of web URLs and can
 make it easier for readers to navigate through the posts you've written over time.
 
@@ -222,12 +221,12 @@ Example usage:
 * YEAR_ARCHIVE_SAVE_AS = ``'posts/{date:%Y}/index.html'``
 * MONTH_ARCHIVE_SAVE_AS = ``'posts/{date:%Y}/{date:%b}/index.html'``
 
-With these settings, Pelican will create an archive of all your posts for the year
-at (for instance) 'posts/2011/index.html', and an archive of all your posts for
-the month at 'posts/2011/Aug/index.html'.
+With these settings, Pelican will create an archive of all your posts for the
+year at (for instance) ``posts/2011/index.html`` and an archive of all your
+posts for the month at ``posts/2011/Aug/index.html``.
 
 .. note::
-    Period archives work best when the final path segment is 'index.html'.
+    Period archives work best when the final path segment is ``index.html``.
     This way a reader can remove a portion of your URL and automatically
     arrive at an appropriate archive of posts, without having to specify
     a page name.
@@ -299,10 +298,11 @@ Have a look at `the wikipedia page`_ to get a list of valid timezone values.
 Date format and locale
 ----------------------
 
-If no DATE_FORMATS are set, Pelican will fall back to DEFAULT_DATE_FORMAT. If
-you need to maintain multiple languages with different date formats, you can
-set this dict using the language name (``lang`` metadata in your post content)
-as the key. Regarding available format codes, see `strftime document of python`_ :
+If no ``DATE_FORMATS`` are set, Pelican will fall back to
+``DEFAULT_DATE_FORMAT``. If you need to maintain multiple languages with
+different date formats, you can set the ``DATE_FORMATS`` dictionary using the
+language name (``lang`` metadata in your post content) as the key. Regarding
+available format codes, see `strftime document of python`_ :
 
 .. parsed-literal::
 
@@ -320,8 +320,8 @@ You can set locale to further control date format:
         )
 
 Also, it is possible to set different locale settings for each language. If you
-put (locale, format) tuples in the dict, this will override the LOCALE setting
-above:
+put (locale, format) tuples in the dict, this will override the ``LOCALE``
+setting above:
 
 .. parsed-literal::
     # On Unix/Linux
@@ -473,9 +473,9 @@ Pagination
 ==========
 
 The default behaviour of Pelican is to list all the article titles along
-with a short description on the index page. While it works pretty well
-for small-to-medium blogs, for sites with large quantity of articles it would
-be convenient to have a way to paginate the list.
+with a short description on the index page. While this works well for
+small-to-medium sites, sites with a large quantity of articles will probably
+benefit from paginating this list.
 
 You can use the following settings to configure the pagination.
 
@@ -483,8 +483,8 @@ You can use the following settings to configure the pagination.
 Setting name (default value)                        What does it do?
 ================================================    =====================================================
 `DEFAULT_ORPHANS` (``0``)                           The minimum number of articles allowed on the
-                                                    last page. Use this when you don't want to
-                                                    have a last page with very few articles.
+                                                    last page. Use this when you don't want the last page
+                                                    to only contain a handful of articles.
 `DEFAULT_PAGINATION` (``False``)                    The maximum number of articles to include on a
                                                     page, not including orphans. False to disable
                                                     pagination.
@@ -528,7 +528,7 @@ Setting name (default value)                        What does it do?
 `TAG_CLOUD_MAX_ITEMS` (``100``)                     Maximum number of tags in the cloud.
 ================================================    =====================================================
 
-The default theme does not include a tag cloud, but it is pretty easy to add::
+The default theme does not include a tag cloud, but it is pretty easy to add one::
 
     <ul class="tagcloud">
         {% for tag in tag_cloud %}
@@ -536,9 +536,10 @@ The default theme does not include a tag cloud, but it is pretty easy to add::
         {% endfor %}
     </ul>
 
-You should then also define CSS styles with appropriate classes (tag-0 to tag-N, where
-N matches `TAG_CLOUD_STEPS` -1), tag-0 being the most frequent, and define a ul.tagcloud 
-class with appropriate list-style to create the cloud, for example::
+You should then also define CSS styles with appropriate classes (tag-0 to tag-N,
+where N matches ``TAG_CLOUD_STEPS`` -1), tag-0 being the most frequent, and
+define a ``ul.tagcloud`` class with appropriate list-style to create the cloud.
+For example::
 
     ul.tagcloud {
       list-style: none;
diff --git a/docs/themes.rst b/docs/themes.rst
index ddf509f8..c5aafb46 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -30,12 +30,12 @@ To make your own theme, you must follow the following structure::
         └── tags.html             // must list all the tags. Can be a tag cloud.
 
 * `static` contains all the static assets, which will be copied to the output
-  `theme` folder. I've put the CSS and image folders here, but they are
-  just examples. Put what you need here.
+  `theme` folder. The above filesystem layout includes CSS and image folders,
+  but those are just examples. Put what you need here.
 
 * `templates` contains all the templates that will be used to generate the content.
-  I've just put the mandatory templates here; you can define your own if it helps
-  you keep things organized while creating your theme.
+  The template files listed above are mandatory; you can add your own templates
+  if it helps you keep things organized while creating your theme.
 
 Templates and variables
 =======================
@@ -44,8 +44,8 @@ The idea is to use a simple syntax that you can embed into your HTML pages.
 This document describes which templates should exist in a theme, and which
 variables will be passed to each template at generation time.
 
-All templates will receive the variables defined in your settings file, if they
-are in all-caps. You can access them directly.
+All templates will receive the variables defined in your settings file, as long
+as they are in all-caps. You can access them directly.
 
 Common variables
 ----------------
@@ -58,19 +58,18 @@ Variable        Description
 output_file     The name of the file currently being generated. For
                 instance, when Pelican is rendering the homepage,
                 output_file will be "index.html".
-articles        The list of articles, ordered descending by date
+articles        The list of articles, ordered descending by date.
                 All the elements are `Article` objects, so you can
                 access their attributes (e.g. title, summary, author
                 etc.). Sometimes this is shadowed (for instance in
                 the tags page). You will then find info about it
                 in the `all_articles` variable.
 dates           The same list of articles, but ordered by date,
-                ascending
+                ascending.
 tags            A list of (tag, articles) tuples, containing all
                 the tags.
 categories      A list of (category, articles) tuples, containing
-                all the categories.
-                and the list of respective articles (values)
+                all the categories and corresponding articles (values)
 pages           The list of pages
 =============   ===================================================
 
@@ -91,9 +90,9 @@ __ http://jinja.pocoo.org/docs/templates/#sort
 Date Formatting
 ---------------
 
-Pelican formats the date with according to your settings and locale 
+Pelican formats the date according to your settings and locale 
 (``DATE_FORMATS``/``DEFAULT_DATE_FORMAT``) and provides a 
-``locale_date`` attribute. On the other hand, ``date`` attribute will
+``locale_date`` attribute. On the other hand, the ``date`` attribute will
 be a `datetime`_ object. If you need custom formatting for a date 
 different than your settings, use the Jinja filter ``strftime`` 
 that comes with Pelican. Usage is same as Python `strftime`_ format, 
diff --git a/docs/tips.rst b/docs/tips.rst
index 1864f0dd..7629481f 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -15,16 +15,16 @@ Project Pages and User Pages.
 Project Pages
 -------------
 
-To publish a Pelican site as Project Pages you need to *push* the content of
+To publish a Pelican site as a Project Page you need to *push* the content of
 the ``output`` dir generated by Pelican to a repository's ``gh-pages`` branch
 on GitHub.
 
 The excellent `ghp-import <https://github.com/davisp/ghp-import>`_, which can
 be installed with ``easy_install`` or ``pip``, makes this process really easy.
 
-For example, if the sources of your Pelican site are contained in a GitHub
-repository, and if you want to publish your Pelican site as Project Pages of
-this repository, you can then use the following::
+For example, if the source of your Pelican site is contained in a GitHub
+repository, and if you want to publish that Pelican site in the form of Project
+Pages to this repository, you can then use the following::
 
     $ pelican content -o output -s pelicanconf.py
     $ ghp-import output
@@ -38,28 +38,28 @@ already exist). The ``git push origin gh-pages`` command updates the remote
 .. note::
 
     The ``github`` target of the Makefile created by the ``pelican-quickstart``
-    command publishes the Pelican site as Project Pages as described above.
+    command publishes the Pelican site as Project Pages, as described above.
 
 User Pages
 ----------
 
-To publish a Pelican site as User Pages you need to *push* the content of the
-``output`` dir generated by Pelican to the ``master`` branch of your
-``<username>.github.com`` repository on GitHub.
+To publish a Pelican site in the form of User Pages, you need to *push* the
+content of the ``output`` dir generated by Pelican to the ``master`` branch of
+your ``<username>.github.io`` repository on GitHub.
 
 Again, you can take advantage of ``ghp-import``::
 
     $ pelican content -o output -s pelicanconf.py
     $ ghp-import output
-    $ git push git@github.com:elemoine/elemoine.github.com.git gh-pages:master
+    $ git push git@github.com:elemoine/elemoine.github.io.git gh-pages:master
 
 The ``git push`` command pushes the local ``gh-pages`` branch (freshly updated
-by the ``ghp-import`` command) to the ``elemoine.github.com`` repository's
+by the ``ghp-import`` command) to the ``elemoine.github.io`` repository's
 ``master`` branch on GitHub.
 
 .. note::
 
-    To publish your Pelican site as User Pages feel free to adjust the the
+    To publish your Pelican site as User Pages, feel free to adjust the
     ``github`` target of the Makefile.
 
 Extra Tips
@@ -67,28 +67,30 @@ Extra Tips
 
 Tip #1:
 
-To automatically update your Pelican site on each commit you can create
+To automatically update your Pelican site on each commit, you can create
 a post-commit hook. For example, you can add the following to
 ``.git/hooks/post-commit``::
 
-    pelican pelican content -o output -s pelicanconf.py && ghp-import output && git push origin gh-pages
+    pelican content -o output -s pelicanconf.py && ghp-import output && git push origin gh-pages
 
 Tip #2:
 
 To use a `custom domain
 <https://help.github.com/articles/setting-up-a-custom-domain-with-pages>`_ with
-GitHub Pages you need to have a ``CNAME`` file at the root of your pages. For
-that you will add ``CNAME`` file to your ``content``, dir and use the
-``FILES_TO_COPY`` setting variable to tell Pelican to copy that file
-to the ``output`` dir. For example::
+GitHub Pages, you need to put the domain of your site (e.g.,
+``blog.example.com``) inside a ``CNAME`` file at the root of your site. To do
+this, create the ``content/extras/`` directory and add a ``CNAME`` file to it.
+Then use the ``STATIC_PATHS`` setting to tell Pelican to copy this file to your
+output directory. For example::
 
-    FILES_TO_COPY = (('extra/CNAME', 'CNAME'),)
+    STATIC_PATHS = ['images', 'extra/CNAME']
+    EXTRA_PATH_METADATA = {'extra/CNAME': {'path': 'CNAME'},}
 
-How to add Youtube or Vimeo Videos
+How to add YouTube or Vimeo Videos
 ==================================
 
-The easiest way is to paste embed code of the video from these sites in your 
-markup file.
+The easiest way is to paste the embed code of the video from these sites
+directly into your source content.
 
-Alternatively, you can also use Pelican plugins like ``liquid_tags`` or ``pelican_youtube``
-or ``pelican_vimeo`` to embed videos in your blog.
+Alternatively, you can also use Pelican plugins like ``liquid_tags``,
+``pelican_youtube``, or ``pelican_vimeo`` to embed videos in your content.

From e5c0a54c57eb7d9cd718a382f66977ea8becf24a Mon Sep 17 00:00:00 2001
From: Honza Javorek <jan.javorek@gmail.com>
Date: Tue, 24 Sep 2013 14:19:47 +0200
Subject: [PATCH 1474/2864] Removed obsolete comment.

---
 pelican/contents.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index b453f61b..1858013c 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -197,10 +197,6 @@ class Content(object):
             value = m.group('value')
             origin = m.group('path')
 
-            # we support only filename for now. the plan is to support
-            # categories, tags, etc. in the future, but let's keep things
-            # simple for now.
-
             # XXX Put this in a different location.
             if what == 'filename':
                 if value.startswith('/'):

From 7d43c4fa00fa31c9ef445a5f923255da870bf650 Mon Sep 17 00:00:00 2001
From: Honza Javorek <jan.javorek@gmail.com>
Date: Tue, 24 Sep 2013 15:18:09 +0200
Subject: [PATCH 1475/2864] Support for params and fragments in intrasite
 links. Adresses #1063.

---
 pelican/contents.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 1858013c..83fbad8f 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -5,6 +5,7 @@ import six
 import copy
 import locale
 import logging
+import urlparse
 import functools
 import os
 import re
@@ -194,30 +195,36 @@ class Content(object):
 
         def replacer(m):
             what = m.group('what')
-            value = m.group('value')
+            value = urlparse.urlparse(m.group('value'))
+            path = value.path
             origin = m.group('path')
 
             # XXX Put this in a different location.
             if what == 'filename':
-                if value.startswith('/'):
-                    value = value[1:]
+                if path.startswith('/'):
+                    path = path[1:]
                 else:
                     # relative to the source path of this content
-                    value = self.get_relative_source_path(
-                        os.path.join(self.relative_dir, value)
+                    path = self.get_relative_source_path(
+                        os.path.join(self.relative_dir, path)
                     )
 
-                if value in self._context['filenames']:
+                if path in self._context['filenames']:
                     origin = '/'.join((siteurl,
-                             self._context['filenames'][value].url))
-                    origin = origin.replace('\\', '/')  # Fow windows paths.
+                             self._context['filenames'][path].url))
+                    origin = origin.replace('\\', '/')  # for Windows paths.
                 else:
                     logger.warning("Unable to find {fn}, skipping url"
-                                   " replacement".format(fn=value))
+                                   " replacement".format(fn=path))
             elif what == 'category':
-                origin = Category(value, self.settings).url
+                origin = Category(path, self.settings).url
             elif what == 'tag':
-                origin = Tag(value, self.settings).url
+                origin = Tag(path, self.settings).url
+
+            # keep all other parts, such as query, fragment, etc.
+            parts = list(value)
+            parts[2] = origin
+            origin = urlparse.urlunparse(parts)
 
             return ''.join((m.group('markup'), m.group('quote'), origin,
                             m.group('quote')))

From 5f23aab8072bb28631043e6c0f8585fde6c2dd93 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 24 Sep 2013 21:28:59 +0200
Subject: [PATCH 1476/2864] Change Bumpr test from tox to unittest

There are currently some minor problems when running tox that are not
present when running "python -m unittest discover". Once those problems
have been resolved, we should probably change this setting back to tox.
---
 bumpr.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumpr.rc b/bumpr.rc
index cfc90fd7..fd35b042 100644
--- a/bumpr.rc
+++ b/bumpr.rc
@@ -4,7 +4,7 @@ vcs = git
 clean =
     python setup.py clean
     rm -rf *egg-info build dist
-tests = tox
+tests = python -m unittest discover
 publish = python setup.py sdist register upload
 files = README.rst
 

From 2f57b86560f93037ead2466016cdd5e358cae872 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 24 Sep 2013 21:37:53 +0200
Subject: [PATCH 1477/2864] Modify sed command in bumpr.rc to support BSD

It appears that BSD sed, unlike Linux, has a requirement that you
provide an extension to the -i option. So, while Linux allows:

    sed -i "sed-command"

... to edit in-place, the BSD variant needs to have:

    sed -i "" "sed-command"

i.e., with an empty backup suffix.
---
 bumpr.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumpr.rc b/bumpr.rc
index fd35b042..969fdb24 100644
--- a/bumpr.rc
+++ b/bumpr.rc
@@ -27,4 +27,4 @@ prepare = Next release
 url = http://docs.getpelican.com/{tag}
 
 [commands]
-bump = sed -i "s/last_stable\s*=.*/last_stable = '{version}'/" docs/conf.py
+bump = sed -i "" "s/last_stable\s*=.*/last_stable = '{version}'/" docs/conf.py

From b35ce43b7fc2cb96d6534dd0392bb41d2de1d933 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 24 Sep 2013 21:57:07 +0200
Subject: [PATCH 1478/2864] Bump version 3.3.0

---
 README.rst          | 2 +-
 docs/changelog.rst  | 4 ++--
 pelican/__init__.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 20c3f217..278f3a44 100644
--- a/README.rst
+++ b/README.rst
@@ -61,7 +61,7 @@ client handy, use the webchat_ for quick feedback.
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Markdown: http://daringfireball.net/projects/markdown/
 .. _Jinja2: http://jinja.pocoo.org/
-.. _`Pelican documentation`: http://docs.getpelican.com/latest/
+.. _`Pelican documentation`: http://docs.getpelican.com/3.3.0/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
 .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
 .. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
diff --git a/docs/changelog.rst b/docs/changelog.rst
index ebf84f34..a5f0c1f3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,8 +1,8 @@
 Release history
 ###############
 
-Next release
-============
+3.3.0 (2013-09-24)
+==================
 
 * Drop Python 3.2 support in favor of Python 3.3
 * Add ``Fabfile`` so Fabric can be used for workflow automation instead of Make
diff --git a/pelican/__init__.py b/pelican/__init__.py
index cecab54b..9daeed76 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -22,7 +22,7 @@ from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, folder_watcher, file_watcher
 from pelican.writers import Writer
 
-__version__ = "3.2.3.dev"
+__version__ = "3.3.0"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 

From 2c468f091a587257f3d455f5727fa4c05cbbca87 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 24 Sep 2013 21:57:28 +0200
Subject: [PATCH 1479/2864] Prepare version 3.3.1.dev for next development
 cycle

---
 README.rst          | 2 +-
 docs/changelog.rst  | 5 +++++
 pelican/__init__.py | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 278f3a44..20c3f217 100644
--- a/README.rst
+++ b/README.rst
@@ -61,7 +61,7 @@ client handy, use the webchat_ for quick feedback.
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Markdown: http://daringfireball.net/projects/markdown/
 .. _Jinja2: http://jinja.pocoo.org/
-.. _`Pelican documentation`: http://docs.getpelican.com/3.3.0/
+.. _`Pelican documentation`: http://docs.getpelican.com/latest/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
 .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
 .. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a5f0c1f3..54b0d871 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+Next release
+============
+
+- Nothing yet
+
 3.3.0 (2013-09-24)
 ==================
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 9daeed76..b3ffe21a 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -22,7 +22,7 @@ from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, folder_watcher, file_watcher
 from pelican.writers import Writer
 
-__version__ = "3.3.0"
+__version__ = "3.3.1.dev"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 

From a987b65bd2abe6faa37425c4f061362435125382 Mon Sep 17 00:00:00 2001
From: "M. Utku Altinkaya" <utkualtinkaya@gmail.com>
Date: Wed, 25 Sep 2013 04:43:06 +0300
Subject: [PATCH 1480/2864] Watch static folders in Autoreload mode

---
 pelican/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index b3ffe21a..5cf89927 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -320,6 +320,9 @@ def main():
                                         pelican.ignore_files),
                 'settings': file_watcher(args.settings)}
 
+    for static_path in settings.get("STATIC_PATHS", []):
+        watchers[static_path] = file_watcher(static_path)
+
     try:
         if args.autoreload:
             print('  --- AutoReload Mode: Monitoring `content`, `theme` and'

From 6fb0335269e9d9dbd79c2f4cb020cd9a6b03313a Mon Sep 17 00:00:00 2001
From: Honza Javorek <jan.javorek@gmail.com>
Date: Wed, 25 Sep 2013 11:39:29 +0200
Subject: [PATCH 1481/2864] Attempt to be compilant with Python 3.

---
 pelican/contents.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 83fbad8f..dbc33716 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -5,12 +5,16 @@ import six
 import copy
 import locale
 import logging
-import urlparse
 import functools
 import os
 import re
 import sys
 
+try:
+    from urlparse import urlparse, urlunparse
+except ImportError:
+    from urllib.parse import urlparse, urlunparse
+
 from datetime import datetime
 
 
@@ -195,7 +199,7 @@ class Content(object):
 
         def replacer(m):
             what = m.group('what')
-            value = urlparse.urlparse(m.group('value'))
+            value = urlparse(m.group('value'))
             path = value.path
             origin = m.group('path')
 
@@ -224,7 +228,7 @@ class Content(object):
             # keep all other parts, such as query, fragment, etc.
             parts = list(value)
             parts[2] = origin
-            origin = urlparse.urlunparse(parts)
+            origin = urlunparse(parts)
 
             return ''.join((m.group('markup'), m.group('quote'), origin,
                             m.group('quote')))

From 7415d370e6a9c6f9b96da927685ffe9a6bc6eada Mon Sep 17 00:00:00 2001
From: Honza Javorek <jan.javorek@gmail.com>
Date: Wed, 25 Sep 2013 16:13:28 +0200
Subject: [PATCH 1482/2864] Added tests.

---
 pelican/tests/test_contents.py | 60 ++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 936903c1..2e44253a 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -204,6 +204,66 @@ class TestPage(unittest.TestCase):
                           ('A simple test, with a '
                            '<a href="category/category.html">link</a>'))
 
+    def test_intrasite_link(self):
+        article = type(b'_DummyArticle', (object,), {'url': 'article.html'})
+
+        args = self.page_kwargs.copy()
+        args['settings'] = get_settings()
+        args['source_path'] = 'content'
+        args['context']['filenames'] = {'article.rst': article}
+
+        # Classic intrasite link via filename
+        args['content'] = (
+            'A simple test, with a '
+            '<a href="|filename|article.rst">link</a>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEquals(
+            content,
+            'A simple test, with a '
+            '<a href="http://notmyidea.org/article.html">link</a>'
+        )
+
+        # fragment
+        args['content'] = (
+            'A simple test, with a '
+            '<a href="|filename|article.rst#section-2">link</a>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEquals(
+            content,
+            'A simple test, with a '
+            '<a href="http://notmyidea.org/article.html#section-2">link</a>'
+        )
+
+        # query
+        args['content'] = (
+            'A simple test, with a '
+            '<a href="|filename|article.rst'
+            '?utm_whatever=234&highlight=word">link</a>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEquals(
+            content,
+            'A simple test, with a '
+            '<a href="http://notmyidea.org/article.html'
+            '?utm_whatever=234&highlight=word">link</a>'
+        )
+
+        # combination
+        args['content'] = (
+            'A simple test, with a '
+            '<a href="|filename|article.rst'
+            '?utm_whatever=234&highlight=word#section-2">link</a>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEquals(
+            content,
+            'A simple test, with a '
+            '<a href="http://notmyidea.org/article.html'
+            '?utm_whatever=234&highlight=word#section-2">link</a>'
+        )
+
 
 class TestArticle(TestPage):
     def test_template(self):

From 6ed23fec7dc1c907b9dcc3eb3d08eca61c1bb9b5 Mon Sep 17 00:00:00 2001
From: Honza Javorek <jan.javorek@gmail.com>
Date: Wed, 25 Sep 2013 16:31:23 +0200
Subject: [PATCH 1483/2864] Tuned the tests so they are PY3 compilant.

---
 pelican/tests/test_contents.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 2e44253a..437d0228 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+import six
 from datetime import datetime
 from sys import platform
 
@@ -205,7 +206,10 @@ class TestPage(unittest.TestCase):
                            '<a href="category/category.html">link</a>'))
 
     def test_intrasite_link(self):
-        article = type(b'_DummyArticle', (object,), {'url': 'article.html'})
+        # type does not take unicode in PY2 and bytes in PY3, which in
+        # combination with unicode literals leads to following insane line:
+        cls_name = '_DummyArticle' if six.PY3 else b'_DummyArticle'
+        article = type(cls_name, (object,), {'url': 'article.html'})
 
         args = self.page_kwargs.copy()
         args['settings'] = get_settings()

From a49b744e951a810040baca27ff04fda23f973e26 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Thu, 26 Sep 2013 00:37:35 +0200
Subject: [PATCH 1484/2864] Fix tests with latest versions of smartypants.

smartypants is now py3 compatible but the default settings for double quotes has
been changed (http://pythonhosted.org/smartypants/changes.html).

This commit:
- update the typogrify test (change quotes, and add more test casesi: caps word,
  ellipsis)
- install typogrify on travis
- uses upstream version of smartypants in tox instead of dmdm's fork for py3
---
 .travis.yml                       |  2 ++
 pelican/tests/content/article.rst |  2 +-
 pelican/tests/test_readers.py     | 13 +++++++------
 tox.ini                           |  1 -
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1df32baa..62373e68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,8 @@ before_install:
  - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install typogrify ; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then pip install git+https://github.com/dmdm/typogrify.git@py3k#egg=typogrify; fi
     - pip install mock nose nose-cov Markdown
     - pip install .
 script: nosetests -sv --with-coverage --cover-package=pelican pelican
diff --git a/pelican/tests/content/article.rst b/pelican/tests/content/article.rst
index 7109c29b..793e6869 100644
--- a/pelican/tests/content/article.rst
+++ b/pelican/tests/content/article.rst
@@ -1,6 +1,6 @@
 Article title
 #############
 
-This is some content. With some stuff to "typogrify".
+THIS is some content. With some stuff to "typogrify"...
 
 Now with added support for :abbr:`TLA (three letter acronym)`.
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index b6652d03..841e3d34 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -104,8 +104,8 @@ class RstReaderTest(ReaderTest):
         # if nothing is specified in the settings, the content should be
         # unmodified
         page = self.read_file(path='article.rst')
-        expected = ('<p>This is some content. With some stuff to '
-                    '&quot;typogrify&quot;.</p>\n<p>Now with added '
+        expected = ('<p>THIS is some content. With some stuff to '
+                    '&quot;typogrify&quot;...</p>\n<p>Now with added '
                     'support for <abbr title="three letter acronym">'
                     'TLA</abbr>.</p>\n')
 
@@ -114,10 +114,11 @@ class RstReaderTest(ReaderTest):
         try:
             # otherwise, typogrify should be applied
             page = self.read_file(path='article.rst', TYPOGRIFY=True)
-            expected = ('<p>This is some content. With some stuff to&nbsp;'
-                        '&#8220;typogrify&#8221;.</p>\n<p>Now with added '
-                        'support for <abbr title="three letter acronym">'
-                        '<span class="caps">TLA</span></abbr>.</p>\n')
+            expected = (
+                '<p><span class="caps">THIS</span> is some content. '
+                'With some stuff to&nbsp;&quot;typogrify&quot;&#8230;</p>\n'
+                '<p>Now with added support for <abbr title="three letter '
+                'acronym"><span class="caps">TLA</span></abbr>.</p>\n')
 
             self.assertEqual(page.content, expected)
         except ImportError:
diff --git a/tox.ini b/tox.ini
index 8763c963..440216cf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,6 +22,5 @@ deps =
     mock
     Markdown
     BeautifulSoup4
-    git+https://github.com/dmdm/smartypants.git#egg=smartypants
     git+https://github.com/dmdm/typogrify.git@py3k#egg=typogrify
     lxml

From cb82e486369479432624b293aa1176f11c11f074 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 4 Oct 2013 16:23:19 +0200
Subject: [PATCH 1485/2864] None, not False, in *_SAVE_AS docs. Fixes #1106.

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index b6c18fa9..82752436 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -278,7 +278,7 @@ Setting name (default value)                            What does it do?
 
     If you do not want one or more of the default pages to be created (e.g.,
     you are the only author on your site and thus do not need an Authors page),
-    set the corresponding ``*_SAVE_AS`` setting to ``False`` to prevent the
+    set the corresponding ``*_SAVE_AS`` setting to ``None`` to prevent the
     relevant page from being generated.
 
 Timezone

From 9657071301ffb7029d17a675f9544e7ec458b202 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 6 Oct 2013 15:30:14 +0200
Subject: [PATCH 1486/2864] Python 3.3 got mock

---
 pelican/tests/test_generators.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index f47ce7d3..e821bb86 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -3,7 +3,10 @@ from __future__ import unicode_literals
 
 import os
 from codecs import open
-from mock import MagicMock
+try:
+    from unittest.mock import MagicMock
+except ImportError:
+    from mock import MagicMock
 from shutil import rmtree
 from tempfile import mkdtemp
 

From 67d3ab8883ba072cc10da214db25dceedb0000a1 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshepang@gmail.com>
Date: Sun, 6 Oct 2013 16:15:43 +0200
Subject: [PATCH 1487/2864] assertEquals is deprecated in favor of assertEqual

---
 pelican/tests/test_contents.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 437d0228..9c894ffc 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -193,17 +193,17 @@ class TestPage(unittest.TestCase):
                            '<a href="|tag|tagname">link</a>')
         page = Page(**args)
         content = page.get_content('http://notmyidea.org')
-        self.assertEquals(content, ('A simple test, with a '
-                                    '<a href="tag/tagname.html">link</a>'))
+        self.assertEqual(content, ('A simple test, with a '
+                                   '<a href="tag/tagname.html">link</a>'))
 
         # Category
         args['content'] = ('A simple test, with a '
                            '<a href="|category|category">link</a>')
         page = Page(**args)
         content = page.get_content('http://notmyidea.org')
-        self.assertEquals(content,
-                          ('A simple test, with a '
-                           '<a href="category/category.html">link</a>'))
+        self.assertEqual(content,
+                         ('A simple test, with a '
+                          '<a href="category/category.html">link</a>'))
 
     def test_intrasite_link(self):
         # type does not take unicode in PY2 and bytes in PY3, which in
@@ -222,7 +222,7 @@ class TestPage(unittest.TestCase):
             '<a href="|filename|article.rst">link</a>'
         )
         content = Page(**args).get_content('http://notmyidea.org')
-        self.assertEquals(
+        self.assertEqual(
             content,
             'A simple test, with a '
             '<a href="http://notmyidea.org/article.html">link</a>'
@@ -234,7 +234,7 @@ class TestPage(unittest.TestCase):
             '<a href="|filename|article.rst#section-2">link</a>'
         )
         content = Page(**args).get_content('http://notmyidea.org')
-        self.assertEquals(
+        self.assertEqual(
             content,
             'A simple test, with a '
             '<a href="http://notmyidea.org/article.html#section-2">link</a>'
@@ -247,7 +247,7 @@ class TestPage(unittest.TestCase):
             '?utm_whatever=234&highlight=word">link</a>'
         )
         content = Page(**args).get_content('http://notmyidea.org')
-        self.assertEquals(
+        self.assertEqual(
             content,
             'A simple test, with a '
             '<a href="http://notmyidea.org/article.html'
@@ -261,7 +261,7 @@ class TestPage(unittest.TestCase):
             '?utm_whatever=234&highlight=word#section-2">link</a>'
         )
         content = Page(**args).get_content('http://notmyidea.org')
-        self.assertEquals(
+        self.assertEqual(
             content,
             'A simple test, with a '
             '<a href="http://notmyidea.org/article.html'

From f83d0d3b0c0c0235744175537aaa2f300b3aa20d Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Tue, 8 Oct 2013 09:46:40 +0100
Subject: [PATCH 1488/2864] Handle east asian character column width in the
 importer

Fixes #682
Closes #923
---
 pelican/tests/test_importer.py  | 17 ++++++++++++++++-
 pelican/tools/pelican_import.py |  4 +++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 53809e7e..2e882720 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals, print_function
 import os
 import re
 
-from pelican.tools.pelican_import import wp2fields, fields2pelican, decode_wp_content
+from pelican.tools.pelican_import import wp2fields, fields2pelican, decode_wp_content, build_header
 from pelican.tests.support import (unittest, temporary_folder, mute,
                                    skipIfNoExecutable)
 
@@ -122,3 +122,18 @@ class TestWordpressXmlImporter(unittest.TestCase):
             sample_line = re.search(r'-   This is a code sample', md).group(0)
             code_line = re.search(r'\s+a = \[1, 2, 3\]', md).group(0)
             self.assertTrue(sample_line.rindex('This') < code_line.rindex('a'))
+
+
+class TestBuildHeader(unittest.TestCase):
+    def test_build_header(self):
+        header = build_header('test', None, None, None, None, None)
+        self.assertEqual(header, 'test\n####\n\n')
+
+    def test_build_header_with_east_asian_characters(self):
+        header = build_header('これは広い幅の文字だけで構成されたタイトルです',
+                None, None, None, None, None)
+
+        self.assertEqual(header,
+                'これは広い幅の文字だけで構成されたタイトルです\n' +
+                '##############################################\n\n')
+
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 46410c13..8cc5b083 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -425,8 +425,10 @@ def feed2fields(file):
 
 
 def build_header(title, date, author, categories, tags, slug):
+    from docutils.utils import column_width
+
     """Build a header from a list of fields"""
-    header = '%s\n%s\n' % (title, '#' * len(title))
+    header = '%s\n%s\n' % (title, '#' * column_width(title))
     if date:
         header += ':date: %s\n' % date
     if author:

From e2f50750d2fb85970d021e03dd768571d63fdc86 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 8 Oct 2013 13:20:56 +0200
Subject: [PATCH 1489/2864] Add Tumblr and Posterous to importer description

---
 pelican/tools/pelican_import.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 8cc5b083..69e1f1b4 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -98,7 +98,7 @@ def decode_wp_content(content, br=True):
 
 
 def wp2fields(xml):
-    """Opens a wordpress XML file, and yield pelican fields"""
+    """Opens a wordpress XML file, and yield Pelican fields"""
     try:
         from bs4 import BeautifulSoup
     except ImportError:
@@ -551,8 +551,9 @@ def fields2pelican(fields, out_markup, output_path,
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Transform feed, Wordpress or Dotclear files to reST (rst) "
-                    "or Markdown (md) files. Be sure to have pandoc installed.",
+        description="Transform feed, WordPress, Tumblr, Dotclear, or Posterous "
+                    "files into reST (rst) or Markdown (md) files. Be sure to "
+                    "have pandoc installed.",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument(dest='input', help='The input file to read')

From 00150f3556b99f68ef8290bd65d1e7865d9a278e Mon Sep 17 00:00:00 2001
From: David Branner <brannerchinese@gmail.com>
Date: Wed, 9 Oct 2013 11:53:11 -0400
Subject: [PATCH 1490/2864] xml => lxml for bs4, in pelican-import.wp2fields()

---
 pelican/tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 69e1f1b4..54a2be2f 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -109,7 +109,7 @@ def wp2fields(xml):
 
     with open(xml, encoding='utf-8') as infile:
         xmlfile = infile.read()
-    soup = BeautifulSoup(xmlfile, "xml")
+    soup = BeautifulSoup(xmlfile, "lxml")
     items = soup.rss.channel.findAll('item')
 
     for item in items:

From 6dafe69ac66a9732c4bb5bbcb889bb297e9e4964 Mon Sep 17 00:00:00 2001
From: Torrance <torrance123@gmail.com>
Date: Thu, 10 Oct 2013 14:29:42 +1300
Subject: [PATCH 1491/2864] Ensure headers from base.html are included.

---
 pelican/themes/simple/templates/article.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 5025a5e7..79124725 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block head %}
+  {{ super() }}
   {% for keyword in article.keywords %}
     <meta name="keywords" contents="{{keyword}}" />
   {% endfor %}

From caa833877dc11362090c97552135668240b0b588 Mon Sep 17 00:00:00 2001
From: Adrien Oliva <github@yapbreak.fr>
Date: Fri, 11 Oct 2013 15:52:47 +0200
Subject: [PATCH 1492/2864] Change StandardError to RuntimeError

Since built-in exception "StandardError" does not exist in the latest python version (at least in version 3.3), use RuntimeError instead (which exists from python2.6 to python3.4)
---
 pelican/writers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index da105929..6cf5232d 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -60,7 +60,7 @@ class Writer(object):
         """
         if filename in self._overridden_files:
             if override:
-                raise StandardError('File %s is set to be overridden twice'
+                raise RuntimeError('File %s is set to be overridden twice'
                                     % filename)
             else:
                 logger.info('skipping %s' % filename)
@@ -69,7 +69,7 @@ class Writer(object):
             if override:
                 logger.info('overwriting %s' % filename)
             else:
-                raise StandardError('File %s is to be overwritten' % filename)
+                raise RuntimeError('File %s is to be overwritten' % filename)
         if override:
             self._overridden_files.add(filename)
         self._written_files.add(filename)

From 2b5db0321b021e54f8a966c1aa01a1f8f34d9ddd Mon Sep 17 00:00:00 2001
From: Jed Brown <jedbrown@mcs.anl.gov>
Date: Fri, 11 Oct 2013 22:28:43 -0500
Subject: [PATCH 1493/2864] docs/plugins.rst: fix signal name
 "page_generator_context"

The old "pages_generate_context" dates from before pelican-3.2
standardization, but AFAIK, "page_generate_context" was never correct.
---
 docs/plugins.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 6de01d05..5e311fb6 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -80,7 +80,7 @@ article_generator_finalized     article_generator               invoked at the e
 get_generators                  generators                      invoked in Pelican.get_generator_classes,
                                                                 can return a Generator, or several
                                                                 generator in a tuple or in a list.
-page_generate_context           page_generator, metadata
+page_generator_context          page_generator, metadata
 page_generator_init             page_generator                  invoked in the PagesGenerator.__init__
 page_generator_finalized        page_generator                  invoked at the end of PagesGenerator.generate_context
 content_object_init             content_object                  invoked at the end of Content.__init__ (see note below)

From eb6d4bb0087bcc218795625ee3bfe5a6d230dc75 Mon Sep 17 00:00:00 2001
From: zhouji <calf.zhou@gmail.com>
Date: Tue, 15 Oct 2013 10:37:03 +0800
Subject: [PATCH 1494/2864] Preserve file metadata (esp. timestamps) when copy
 static files to output folder.

---
 pelican/generators.py | 2 +-
 pelican/utils.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index d695c7c8..c55cdc37 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -573,7 +573,7 @@ class StaticGenerator(Generator):
             source_path = os.path.join(self.path, sc.source_path)
             save_as = os.path.join(self.output_path, sc.save_as)
             mkdir_p(os.path.dirname(save_as))
-            shutil.copy(source_path, save_as)
+            shutil.copy2(source_path, save_as)
             logger.info('copying {} to {}'.format(sc.source_path, sc.save_as))
 
 
diff --git a/pelican/utils.py b/pelican/utils.py
index f222f63c..4b25ec7f 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -289,7 +289,7 @@ def copy(path, source, destination, destination_path=None):
                 else:
                     shutil.copytree(entry_path, entry_dest)
             else:
-                shutil.copy(entry_path, destination)
+                shutil.copy2(entry_path, destination)
 
 
     if os.path.isdir(source_):
@@ -299,7 +299,7 @@ def copy(path, source, destination, destination_path=None):
         dest_dir = os.path.dirname(destination_)
         if not os.path.exists(dest_dir):
             os.makedirs(dest_dir)
-        shutil.copy(source_, destination_)
+        shutil.copy2(source_, destination_)
         logger.info('copying %s to %s' % (source_, destination_))
     else:
         logger.warning('skipped copy %s to %s' % (source_, destination_))

From 04dba17b800b7c67e43706a8a164ebf697bba10f Mon Sep 17 00:00:00 2001
From: zhouji <calf.zhou@gmail.com>
Date: Wed, 16 Oct 2013 17:06:56 +0800
Subject: [PATCH 1495/2864] Fix #1117 Make intra-link support all url-value
 HTML attributes.

---
 pelican/contents.py | 58 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index dbc33716..39322e99 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -125,6 +125,52 @@ class Content(object):
         if 'summary' in metadata:
             self._summary = metadata['summary']
 
+        # prepare the list of HTML tag attributes which have a URL value.
+        # refer: http://stackoverflow.com/questions/2725156/complete-list-of-html-tag-attributes-which-have-a-url-value
+        self._url_attributes = {  # each item in this set is a tuple composed by tag_name, attr_name
+            # HTML4 tags
+            ('a', 'href'),
+            ('applet', 'codebase'),
+            ('area', 'href'),
+            ('base', 'href'),
+            ('blockquote', 'cite'),
+            ('body', 'background'),
+            ('del', 'cite'),
+            ('form', 'action'),
+            ('frame', 'longdesc'),
+            ('frame', 'src'),
+            ('head', 'profile'),
+            ('iframe', 'longdesc'),
+            ('iframe', 'src'),
+            ('img', 'longdesc'),
+            ('img', 'src'),
+            ('img', 'usemap'),
+            ('input', 'src'),
+            ('input', 'usemap'),
+            ('ins', 'cite'),
+            ('link', 'href'),
+            ('object', 'classid'),
+            ('object', 'codebase'),
+            ('object', 'data'),
+            ('object', 'usemap'),
+            ('q', 'cite'),
+            ('script', 'src'),
+
+            # HTML5 tags
+            ('audio', 'src'),
+            ('button', 'formaction'),
+            ('command', 'icon'),
+            ('embed', 'src'),
+            ('html', 'manifest'),
+            ('input', 'formaction'),
+            ('source', 'src'),
+            ('video', 'poster'),
+            ('video', 'src'),
+        }
+        """:type: set of (tuple of (string, string)"""
+        attribute_names = set(pair[1] for pair in self._url_attributes)
+        self._url_attr_pattern = '|'.join(attribute_names)
+
         signals.content_object_init.send(self)
 
     def __str__(self):
@@ -189,12 +235,12 @@ class Content(object):
 
         instrasite_link_regex = self.settings['INTRASITE_LINK_REGEX']
         regex = r"""
-            (?P<markup><\s*[^\>]*  # match tag with src and href attr
-                (?:href|src)\s*=)
+            (?P<markup><\s*(?P<tag>[^\s\>]+)[^\>]*  # match tag with all url-value attributes
+                (?P<attr>{1})\s*=)
 
             (?P<quote>["\'])      # require value to be quoted
             (?P<path>{0}(?P<value>.*?))  # the url value
-            \2""".format(instrasite_link_regex)
+            \4""".format(instrasite_link_regex, self._url_attr_pattern)
         hrefs = re.compile(regex, re.X)
 
         def replacer(m):
@@ -203,6 +249,12 @@ class Content(object):
             path = value.path
             origin = m.group('path')
 
+            # verify HTML tag and attribute pair to avoid miss-replacing
+            tag = m.group('tag')
+            attr = m.group('attr')
+            if attr != 'href' and attr != 'src' and (tag, attr) not in self._url_attributes:
+                return m.group(0)
+
             # XXX Put this in a different location.
             if what == 'filename':
                 if path.startswith('/'):

From e538aa2cdeb4eed2df40bcf0a414c0930ab05e25 Mon Sep 17 00:00:00 2001
From: zhouji <calf.zhou@gmail.com>
Date: Thu, 17 Oct 2013 11:33:34 +0800
Subject: [PATCH 1496/2864] Fine-tune url-value HTML attributes list.

---
 pelican/contents.py            | 58 ++--------------------------------
 pelican/tests/test_contents.py | 55 ++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 39322e99..059c54a7 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -125,52 +125,6 @@ class Content(object):
         if 'summary' in metadata:
             self._summary = metadata['summary']
 
-        # prepare the list of HTML tag attributes which have a URL value.
-        # refer: http://stackoverflow.com/questions/2725156/complete-list-of-html-tag-attributes-which-have-a-url-value
-        self._url_attributes = {  # each item in this set is a tuple composed by tag_name, attr_name
-            # HTML4 tags
-            ('a', 'href'),
-            ('applet', 'codebase'),
-            ('area', 'href'),
-            ('base', 'href'),
-            ('blockquote', 'cite'),
-            ('body', 'background'),
-            ('del', 'cite'),
-            ('form', 'action'),
-            ('frame', 'longdesc'),
-            ('frame', 'src'),
-            ('head', 'profile'),
-            ('iframe', 'longdesc'),
-            ('iframe', 'src'),
-            ('img', 'longdesc'),
-            ('img', 'src'),
-            ('img', 'usemap'),
-            ('input', 'src'),
-            ('input', 'usemap'),
-            ('ins', 'cite'),
-            ('link', 'href'),
-            ('object', 'classid'),
-            ('object', 'codebase'),
-            ('object', 'data'),
-            ('object', 'usemap'),
-            ('q', 'cite'),
-            ('script', 'src'),
-
-            # HTML5 tags
-            ('audio', 'src'),
-            ('button', 'formaction'),
-            ('command', 'icon'),
-            ('embed', 'src'),
-            ('html', 'manifest'),
-            ('input', 'formaction'),
-            ('source', 'src'),
-            ('video', 'poster'),
-            ('video', 'src'),
-        }
-        """:type: set of (tuple of (string, string)"""
-        attribute_names = set(pair[1] for pair in self._url_attributes)
-        self._url_attr_pattern = '|'.join(attribute_names)
-
         signals.content_object_init.send(self)
 
     def __str__(self):
@@ -235,12 +189,12 @@ class Content(object):
 
         instrasite_link_regex = self.settings['INTRASITE_LINK_REGEX']
         regex = r"""
-            (?P<markup><\s*(?P<tag>[^\s\>]+)[^\>]*  # match tag with all url-value attributes
-                (?P<attr>{1})\s*=)
+            (?P<markup><\s*[^\>]*  # match tag with all url-value attributes
+                (?:href|src|poster|data|cite|formaction|action)\s*=)
 
             (?P<quote>["\'])      # require value to be quoted
             (?P<path>{0}(?P<value>.*?))  # the url value
-            \4""".format(instrasite_link_regex, self._url_attr_pattern)
+            \2""".format(instrasite_link_regex)
         hrefs = re.compile(regex, re.X)
 
         def replacer(m):
@@ -249,12 +203,6 @@ class Content(object):
             path = value.path
             origin = m.group('path')
 
-            # verify HTML tag and attribute pair to avoid miss-replacing
-            tag = m.group('tag')
-            attr = m.group('attr')
-            if attr != 'href' and attr != 'src' and (tag, attr) not in self._url_attributes:
-                return m.group(0)
-
             # XXX Put this in a different location.
             if what == 'filename':
                 if path.startswith('/'):
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 9c894ffc..92e61355 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -268,6 +268,61 @@ class TestPage(unittest.TestCase):
             '?utm_whatever=234&highlight=word#section-2">link</a>'
         )
 
+    def test_intrasite_link_more(self):
+        # type does not take unicode in PY2 and bytes in PY3, which in
+        # combination with unicode literals leads to following insane line:
+        cls_name = '_DummyAsset' if six.PY3 else b'_DummyAsset'
+
+        args = self.page_kwargs.copy()
+        args['settings'] = get_settings()
+        args['source_path'] = 'content'
+        args['context']['filenames'] = {
+            'images/poster.jpg': type(cls_name, (object,), {'url': 'images/poster.jpg'}),
+            'assets/video.mp4': type(cls_name, (object,), {'url': 'assets/video.mp4'}),
+            'images/graph.svg': type(cls_name, (object,), {'url': 'images/graph.svg'}),
+            'reference.rst': type(cls_name, (object,), {'url': 'reference.html'}),
+        }
+
+        # video.poster
+        args['content'] = (
+            'There is a video with poster '
+            '<video controls poster="{filename}/images/poster.jpg">'
+            '<source src="|filename|/assets/video.mp4" type="video/mp4">'
+            '</video>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(
+            content,
+            'There is a video with poster '
+            '<video controls poster="http://notmyidea.org/images/poster.jpg">'
+            '<source src="http://notmyidea.org/assets/video.mp4" type="video/mp4">'
+            '</video>'
+        )
+
+        # object.data
+        args['content'] = (
+            'There is a svg object '
+            '<object data="{filename}/images/graph.svg" type="image/svg+xml"></object>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(
+            content,
+            'There is a svg object '
+            '<object data="http://notmyidea.org/images/graph.svg" type="image/svg+xml"></object>'
+        )
+
+        # blockquote.cite
+        args['content'] = (
+            'There is a blockquote with cite attribute '
+            '<blockquote cite="{filename}reference.rst">blah blah</blockquote>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(
+            content,
+            'There is a blockquote with cite attribute '
+            '<blockquote cite="http://notmyidea.org/reference.html">blah blah</blockquote>'
+        )
+
 
 class TestArticle(TestPage):
     def test_template(self):

From ae2afa27fc6841a9785f13f14bfd17bebbd1f516 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 19 Oct 2013 17:20:13 +0200
Subject: [PATCH 1497/2864] Clarify FAQ entry re: need to install Markdown

Folks keep running into this error, which probably signals a need to
change this behavior. After all, it wouldn't be hard for us to detect
what's going on and provide a better error message, such as: "It looks
like you're trying to process Markdown, but the Markdown library is not
currently installed. Please install the Python-Markdown library via 'pip
install markdown'."

Until we implement something akin to the above, this should serve as a
slightly-improved FAQ entry in the interim.
---
 docs/faq.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index da37af04..80e14d21 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -65,12 +65,13 @@ How do I create my own theme?
 
 Please refer to :ref:`theming-pelican`.
 
-I want to use Markdown, but I got an error.
-===========================================
+I'm using Markdown and getting ``No valid files found in content`` errors.
+==========================================================================
 
-Markdown is not a hard dependency for Pelican, so you will need to explicitly
-install it. You can do so by typing the following command, prepending ``sudo``
-if permissions require it::
+Markdown is not a hard dependency for Pelican, so if you have content in
+Markdown format, you will need to explicitly install the Markdown library.
+You can do so by typing the following command, prepending ``sudo`` if
+permissions require it::
 
     pip install markdown
 

From 9331e42ee10c0a3537d93b000c0a41508758d401 Mon Sep 17 00:00:00 2001
From: Jon Chen <bsd@voltaire.sh>
Date: Thu, 24 Oct 2013 14:36:03 -0400
Subject: [PATCH 1498/2864] use // instead of explicitly defining http

for twitter as well

update sample output
---
 pelican/tests/output/custom/a-markdown-powered-article.html   | 4 ++--
 pelican/tests/output/custom/archives.html                     | 2 +-
 pelican/tests/output/custom/article-1.html                    | 4 ++--
 pelican/tests/output/custom/article-2.html                    | 4 ++--
 pelican/tests/output/custom/article-3.html                    | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau.html      | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau2.html     | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau3.html     | 2 +-
 pelican/tests/output/custom/authors.html                      | 2 +-
 pelican/tests/output/custom/categories.html                   | 2 +-
 pelican/tests/output/custom/category/bar.html                 | 2 +-
 pelican/tests/output/custom/category/cat1.html                | 2 +-
 pelican/tests/output/custom/category/misc.html                | 2 +-
 pelican/tests/output/custom/category/yeah.html                | 2 +-
 pelican/tests/output/custom/drafts/a-draft-article.html       | 2 +-
 pelican/tests/output/custom/filename_metadata-example.html    | 4 ++--
 pelican/tests/output/custom/index.html                        | 2 +-
 pelican/tests/output/custom/index2.html                       | 2 +-
 pelican/tests/output/custom/index3.html                       | 2 +-
 pelican/tests/output/custom/jinja2_template.html              | 2 +-
 pelican/tests/output/custom/oh-yeah-fr.html                   | 4 ++--
 pelican/tests/output/custom/oh-yeah.html                      | 4 ++--
 pelican/tests/output/custom/override/index.html               | 2 +-
 .../tests/output/custom/pages/this-is-a-test-hidden-page.html | 2 +-
 pelican/tests/output/custom/pages/this-is-a-test-page.html    | 2 +-
 pelican/tests/output/custom/second-article-fr.html            | 4 ++--
 pelican/tests/output/custom/second-article.html               | 4 ++--
 pelican/tests/output/custom/tag/bar.html                      | 2 +-
 pelican/tests/output/custom/tag/baz.html                      | 4 ++--
 pelican/tests/output/custom/tag/foo.html                      | 2 +-
 pelican/tests/output/custom/tag/foobar.html                   | 2 +-
 pelican/tests/output/custom/tag/oh.html                       | 2 +-
 pelican/tests/output/custom/tag/yeah.html                     | 2 +-
 pelican/tests/output/custom/tags.html                         | 2 +-
 pelican/tests/output/custom/this-is-a-super-article.html      | 4 ++--
 pelican/tests/output/custom/unbelievable.html                 | 4 ++--
 pelican/themes/notmyidea/templates/article.html               | 2 +-
 pelican/themes/notmyidea/templates/disqus_script.html         | 2 +-
 pelican/themes/notmyidea/templates/twitter.html               | 4 ++--
 39 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 4d1fe16f..515b0298 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -59,7 +59,7 @@
         var disqus_url = "./a-markdown-powered-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -105,7 +105,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index a2ab7430..13c3d980 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -92,7 +92,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 89e12914..6faed3be 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -58,7 +58,7 @@
         var disqus_url = "./article-1.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -104,7 +104,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 1113e5e8..d1e89db8 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -58,7 +58,7 @@
         var disqus_url = "./article-2.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -104,7 +104,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index c7306605..5c287a13 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -58,7 +58,7 @@
         var disqus_url = "./article-3.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -104,7 +104,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index d2350bd5..19c254a0 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -165,7 +165,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 91ef0696..772d2939 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -175,7 +175,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 77c9cdfe..f3d985c3 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -130,7 +130,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index adb3d992..eb2becfd 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -71,7 +71,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 5d839648..17d9de76 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -72,7 +72,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 3f1bbc4a..30545518 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -95,7 +95,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 81718322..9a737b76 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -162,7 +162,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 36479803..b70afcdf 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -173,7 +173,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 53666b0b..02d07413 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -99,7 +99,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index b8306208..440780a3 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -92,7 +92,7 @@ listed anywhere else.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index fcbda9c2..1252aba8 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -58,7 +58,7 @@
         var disqus_url = "./filename_metadata-example.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -104,7 +104,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 3fa1d5c3..c7174715 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -165,7 +165,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 8769d098..b349b3ca 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -175,7 +175,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index b4d9ffc6..c668dba6 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -130,7 +130,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 31beac32..0eafa913 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -69,7 +69,7 @@ Some text
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 410c721f..4450514a 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -60,7 +60,7 @@ Translations:
         var disqus_url = "./oh-yeah-fr.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -106,7 +106,7 @@ Translations:
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index dab28171..95cf0317 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -65,7 +65,7 @@ YEAH !</p>
         var disqus_url = "./oh-yeah.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -111,7 +111,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 9c48d76f..e84d79fe 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -73,7 +73,7 @@ at a custom location.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index a061b7ee..dced8107 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -73,7 +73,7 @@ Anyone can see this page but it's not linked to anywhere!</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index af50adf8..46ea4fef 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -73,7 +73,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index cbeef437..b4a04ee8 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -60,7 +60,7 @@
         var disqus_url = "./second-article-fr.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 57009066..04f038c8 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -60,7 +60,7 @@
         var disqus_url = "./second-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 9560b712..7a90eff2 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -148,7 +148,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index c6ebe542..f794b351 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -58,7 +58,7 @@
         var disqus_url = "../tag/baz.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -104,7 +104,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index d5b0d413..d99df63b 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -118,7 +118,7 @@ as well as <strong>inline markup</strong>.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 0b4d2471..ded91f12 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -99,7 +99,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 3b30a39c..21c8e352 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -72,7 +72,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index a6764575..523358b5 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -95,7 +95,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index bc9b9d20..2e70c9e8 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -76,7 +76,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 0a580e25..d251b0ec 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -69,7 +69,7 @@
         var disqus_url = "./this-is-a-super-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -115,7 +115,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 03b533bb..0d87bbf6 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -90,7 +90,7 @@ pelican.conf, it will have nothing in default.</p>
         var disqus_url = "./unbelievable.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -136,7 +136,7 @@ pelican.conf, it will have nothing in default.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 516fd3b5..367222b2 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -23,7 +23,7 @@
         var disqus_url = "{{ SITEURL }}/{{ article.url }}";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+        dsq.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
diff --git a/pelican/themes/notmyidea/templates/disqus_script.html b/pelican/themes/notmyidea/templates/disqus_script.html
index c4f442c8..4ee419bb 100644
--- a/pelican/themes/notmyidea/templates/disqus_script.html
+++ b/pelican/themes/notmyidea/templates/disqus_script.html
@@ -4,7 +4,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/themes/notmyidea/templates/twitter.html b/pelican/themes/notmyidea/templates/twitter.html
index c6b159f4..7247a0c6 100644
--- a/pelican/themes/notmyidea/templates/twitter.html
+++ b/pelican/themes/notmyidea/templates/twitter.html
@@ -1,3 +1,3 @@
 {% if TWITTER_USERNAME %}
-<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-{% endif %}
\ No newline at end of file
+<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
+{% endif %}

From 6c808e426fe5287b49fdd6a56067aa90eaaba963 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Mon, 21 Oct 2013 23:38:25 +0200
Subject: [PATCH 1499/2864] Document video support in Markdown and reST.

---
 THANKS        | 1 +
 docs/tips.rst | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/THANKS b/THANKS
index e4eed231..1d867471 100644
--- a/THANKS
+++ b/THANKS
@@ -88,6 +88,7 @@ Joseph Reagle
 Joshua Adelman
 Julian Berman
 Justin Mayer
+Kevin Deldycke
 Kyle Fuller
 Laureline Guerin
 Leonard Huang
diff --git a/docs/tips.rst b/docs/tips.rst
index 7629481f..b140ea3c 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -94,3 +94,8 @@ directly into your source content.
 
 Alternatively, you can also use Pelican plugins like ``liquid_tags``,
 ``pelican_youtube``, or ``pelican_vimeo`` to embed videos in your content.
+
+Moreover, markup languages like reST and Markdown have plugins that let you
+embed videos in the markup. You can use `reST video directive
+<https://gist.github.com/dbrgn/2922648>`_ for reST or `mdx_video plugin
+<https://github.com/italomaia/mdx-video>`_ for Markdown.

From 5e5510cfcf65b873881d9e08adcb54ac1db9c730 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 27 Oct 2013 09:27:30 -0700
Subject: [PATCH 1500/2864] Improve Disqus embed code in notmyidea theme

According to Disqus, the disqus_shortname variable is a required field.
Also added a <noscript> notice for those who have JS disabled.
---
 .../tests/output/custom/a-markdown-powered-article.html   | 6 ++++--
 pelican/tests/output/custom/article-1.html                | 6 ++++--
 pelican/tests/output/custom/article-2.html                | 6 ++++--
 pelican/tests/output/custom/article-3.html                | 6 ++++--
 .../tests/output/custom/filename_metadata-example.html    | 6 ++++--
 pelican/tests/output/custom/oh-yeah-fr.html               | 6 ++++--
 pelican/tests/output/custom/oh-yeah.html                  | 6 ++++--
 pelican/tests/output/custom/second-article-fr.html        | 6 ++++--
 pelican/tests/output/custom/second-article.html           | 6 ++++--
 pelican/tests/output/custom/tag/baz.html                  | 6 ++++--
 pelican/tests/output/custom/this-is-a-super-article.html  | 6 ++++--
 pelican/tests/output/custom/unbelievable.html             | 6 ++++--
 pelican/themes/notmyidea/templates/article.html           | 8 +++++---
 13 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 515b0298..a5c1bb35 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -55,14 +55,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "a-markdown-powered-article.html";
-        var disqus_url = "./a-markdown-powered-article.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'a-markdown-powered-article.html';
+        var disqus_url = './a-markdown-powered-article.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 6faed3be..629ba81d 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -54,14 +54,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "article-1.html";
-        var disqus_url = "./article-1.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'article-1.html';
+        var disqus_url = './article-1.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index d1e89db8..56d6360a 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -54,14 +54,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "article-2.html";
-        var disqus_url = "./article-2.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'article-2.html';
+        var disqus_url = './article-2.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 5c287a13..fac56b98 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -54,14 +54,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "article-3.html";
-        var disqus_url = "./article-3.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'article-3.html';
+        var disqus_url = './article-3.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 1252aba8..9967b4ce 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -54,14 +54,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "filename_metadata-example.html";
-        var disqus_url = "./filename_metadata-example.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'filename_metadata-example.html';
+        var disqus_url = './filename_metadata-example.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 4450514a..bdafb45f 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -56,14 +56,16 @@ Translations:
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "oh-yeah-fr.html";
-        var disqus_url = "./oh-yeah-fr.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'oh-yeah-fr.html';
+        var disqus_url = './oh-yeah-fr.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 95cf0317..8068a224 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -61,14 +61,16 @@ YEAH !</p>
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "oh-yeah.html";
-        var disqus_url = "./oh-yeah.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'oh-yeah.html';
+        var disqus_url = './oh-yeah.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index b4a04ee8..c1400c7c 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -56,14 +56,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "second-article-fr.html";
-        var disqus_url = "./second-article-fr.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'second-article-fr.html';
+        var disqus_url = './second-article-fr.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 04f038c8..e37e90f3 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -56,14 +56,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "second-article.html";
-        var disqus_url = "./second-article.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'second-article.html';
+        var disqus_url = './second-article.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index f794b351..81f419be 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -54,14 +54,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "tag/baz.html";
-        var disqus_url = "../tag/baz.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'tag/baz.html';
+        var disqus_url = '../tag/baz.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index d251b0ec..d3a3c038 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -65,14 +65,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "this-is-a-super-article.html";
-        var disqus_url = "./this-is-a-super-article.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'this-is-a-super-article.html';
+        var disqus_url = './this-is-a-super-article.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 0d87bbf6..8b2d26ce 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -86,14 +86,16 @@ pelican.conf, it will have nothing in default.</p>
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "unbelievable.html";
-        var disqus_url = "./unbelievable.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'unbelievable.html';
+        var disqus_url = './unbelievable.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 367222b2..06110b43 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -6,7 +6,7 @@
     <header>
       <h1 class="entry-title">
         <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-           title="Permalink to {{ article.title|striptags }}">{{ article.title}}</a></h1>
+           title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
       {% include 'twitter.html' %}
     </header>
 
@@ -19,14 +19,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "{{ article.url }}";
-        var disqus_url = "{{ SITEURL }}/{{ article.url }}";
+        var disqus_shortname = '{{ DISQUS_SITENAME }}';
+        var disqus_identifier = '{{ article.url }}';
+        var disqus_url = '{{ SITEURL }}/{{ article.url }}';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
     {% endif %}
 

From fb994b1399bc2ca15e6cb046dbbacefb9fd31aca Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 28 Oct 2013 15:52:09 -0700
Subject: [PATCH 1501/2864] Add content dir to default settings file template

This adds a line to the settings file generated by pelican-quickstart
that ensures the automatically-generated "content" directory is
specified in said settings file. Fixes #1116
---
 pelican/tools/templates/pelicanconf.py.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in
index 5d96051d..00a7ec84 100644
--- a/pelican/tools/templates/pelicanconf.py.in
+++ b/pelican/tools/templates/pelicanconf.py.in
@@ -6,6 +6,8 @@ AUTHOR = $author
 SITENAME = $sitename
 SITEURL = ''
 
+PATH = 'content'
+
 TIMEZONE = 'Europe/Paris'
 
 DEFAULT_LANG = $lang

From efc1d38efd54dc6ed3c6d0d02648c2c966880e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= <gpoo@gnome.org>
Date: Thu, 31 Oct 2013 13:21:56 -0700
Subject: [PATCH 1502/2864] Fix invalid atom feed id:tag

Fixes #1039: The atom feed generated produces an invalid attribute
id:tag when SITEURL has something different that http or it contain
a subdirectory, such as:
  * https://myblog.com/
  * https://mysite.com/blog
  * http://mysite.com/blog
---
 pelican/writers.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 6cf5232d..fec0348b 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -8,6 +8,9 @@ import logging
 
 if not six.PY3:
     from codecs import open
+    from urlparse import urlparse
+else:
+    from urllib.parse import urlparse
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 from jinja2 import Markup
@@ -41,11 +44,13 @@ class Writer(object):
     def _add_item_to_the_feed(self, feed, item):
 
         title = Markup(item.title).striptags()
+        link = '%s/%s' % (self.site_url, item.url)
         feed.add_item(
             title=title,
-            link='%s/%s' % (self.site_url, item.url),
-            unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''),
-                                        item.date.date(), item.url),
+            link=link,
+            unique_id='tag:%s,%s:%s' % (urlparse(link).netloc,
+                                        item.date.date(),
+                                        urlparse(link).path.lstrip('/')),
             description=item.get_content(self.site_url),
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', ''),

From f69c71000a333205a720a7caee9b630888ec874c Mon Sep 17 00:00:00 2001
From: Norton Wang <nortantivirus@gmail.com>
Date: Fri, 1 Nov 2013 16:59:45 -0400
Subject: [PATCH 1503/2864] Fix typo in manual

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index b3ffe21a..68cefc2c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -225,7 +225,7 @@ def parse_arguments():
         default=None)
 
     parser.add_argument('-t', '--theme-path', dest='theme',
-        help='Path where to find the theme templates. If not specified, it'
+        help='Path where to find the theme templates. If not specified, it '
              'will use the default one included with pelican.')
 
     parser.add_argument('-o', '--output', dest='output',

From 7fadbd682a6d0aa1cdef9629950f12ef5d57542d Mon Sep 17 00:00:00 2001
From: idning <idning@gmail.com>
Date: Sun, 3 Nov 2013 18:08:08 +0800
Subject: [PATCH 1504/2864] check IGNORE_FILES on get_files

---
 pelican/generators.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index d695c7c8..98a550a0 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -6,6 +6,7 @@ import math
 import random
 import logging
 import shutil
+import fnmatch
 
 from codecs import open
 from collections import defaultdict
@@ -96,6 +97,12 @@ class Generator(object):
         if extensions is None:
             extensions = tuple(self.readers.extensions)
         basename = os.path.basename(path)
+
+        #check IGNORE_FILES
+        ignores = self.settings['IGNORE_FILES']
+        if any(fnmatch.fnmatch(basename, ignore) for ignore in ignores):
+            return False
+
         if extensions is False or basename.endswith(extensions):
             return True
         return False

From 3b4dad470c6a61378fac2fe8c232228af0bf04a0 Mon Sep 17 00:00:00 2001
From: woshilapin <woshilapin@gmail.com>
Date: Tue, 5 Nov 2013 18:00:07 +0100
Subject: [PATCH 1505/2864] Add 'asciidoc' to the ASCIIDoc possible extensions

---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 067bbb85..54b53d85 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -334,7 +334,7 @@ class AsciiDocReader(BaseReader):
     """Reader for AsciiDoc files"""
 
     enabled = bool(asciidoc)
-    file_extensions = ['asc']
+    file_extensions = ['asc', 'asciidoc']
     default_options = ["--no-header-footer", "-a newline=\\n"]
 
     def read(self, source_path):

From dc0edb2b2b0839efda78a0cf94cafb71a22466a9 Mon Sep 17 00:00:00 2001
From: Martin De Wulf <madewulf@gmail.com>
Date: Thu, 7 Nov 2013 13:41:19 +0100
Subject: [PATCH 1506/2864] Add doc about use of metadata per article in custom
 templates

---
 docs/themes.rst | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/themes.rst b/docs/themes.rst
index c5aafb46..acc73553 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -188,6 +188,32 @@ article         The article object to be displayed
 category        The name of the category for the current article
 =============   ===================================================
 
+All the metadata that your inserted in the header of the article source file
+are available as fields on the article object. The field name is the downcased
+name of the metadata field.
+
+For example, if you inserted the meta `FacebookImage` at the end of your metadata in
+an article, like this:
+
+.. code-block:: markdown
+
+    Title: I love Python more than music
+    Date: 2013-11-06 10:06
+    Tags: personal, python
+    Category: Tech
+    Slug: python-je-l-aime-a-mourir
+    Author: Francis Cabrel
+    FacebookImage: http://franciscabrel.com/images/pythonlove.png
+
+This metadata will be made available as `article.facebookimage` in your `article.html` template.
+You could for example use this to specify an image for the Facebook open graph tags that will
+change for each article, like this
+
+.. code-block:: html+jinja
+
+    <meta property="og:image" content="{{article.facebookimage}}"/>
+
+
 page.html
 ---------
 

From 455c159b48cb64fcdc8f2d1c7bc9b51f5810366a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 7 Nov 2013 11:05:22 -0800
Subject: [PATCH 1507/2864] Various fixes to theme documentation

---
 docs/themes.rst | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index acc73553..8362ec70 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -90,12 +90,12 @@ __ http://jinja.pocoo.org/docs/templates/#sort
 Date Formatting
 ---------------
 
-Pelican formats the date according to your settings and locale 
-(``DATE_FORMATS``/``DEFAULT_DATE_FORMAT``) and provides a 
+Pelican formats the date according to your settings and locale
+(``DATE_FORMATS``/``DEFAULT_DATE_FORMAT``) and provides a
 ``locale_date`` attribute. On the other hand, the ``date`` attribute will
-be a `datetime`_ object. If you need custom formatting for a date 
-different than your settings, use the Jinja filter ``strftime`` 
-that comes with Pelican. Usage is same as Python `strftime`_ format, 
+be a `datetime`_ object. If you need custom formatting for a date
+different than your settings, use the Jinja filter ``strftime``
+that comes with Pelican. Usage is same as Python `strftime`_ format,
 but the filter will do the right thing and format your date according
 to the locale given in your settings::
 
@@ -188,12 +188,12 @@ article         The article object to be displayed
 category        The name of the category for the current article
 =============   ===================================================
 
-All the metadata that your inserted in the header of the article source file
-are available as fields on the article object. The field name is the downcased
-name of the metadata field.
+Any metadata that you put in the header of the article source file
+will be available as fields on the ``article`` object. The field name will be
+the same as the name of the metadata field, except in all-lowercase characters.
 
-For example, if you inserted the meta `FacebookImage` at the end of your metadata in
-an article, like this:
+For example, you could add a field called `FacebookImage` to your article
+metadata, as shown below:
 
 .. code-block:: markdown
 
@@ -205,13 +205,13 @@ an article, like this:
     Author: Francis Cabrel
     FacebookImage: http://franciscabrel.com/images/pythonlove.png
 
-This metadata will be made available as `article.facebookimage` in your `article.html` template.
-You could for example use this to specify an image for the Facebook open graph tags that will
-change for each article, like this
+This new metadata will be made available as `article.facebookimage` in your
+`article.html` template. This would allow you, for example, to specify an
+image for the Facebook open graph tags that will change for each article:
 
 .. code-block:: html+jinja
 
-    <meta property="og:image" content="{{article.facebookimage}}"/>
+    <meta property="og:image" content="{{ article.facebookimage }}"/>
 
 
 page.html
@@ -283,7 +283,8 @@ missing, it will be replaced by the matching template from the ``simple`` theme.
 So if the HTML structure of a template in the ``simple`` theme is right for you,
 you don't have to write a new template from scratch.
 
-You can also extend templates from the ``simple`` themes in your own themes by using the ``{% extends %}`` directive as in the following example:
+You can also extend templates from the ``simple`` themes in your own themes by
+using the ``{% extends %}`` directive as in the following example:
 
 .. code-block:: html+jinja
 
@@ -311,14 +312,17 @@ The first file is the ``templates/base.html`` template:
        <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/style.css" />
     {% endblock %}
 
+1. On the first line, we extend the ``base.html`` template from the ``simple``
+   theme, so we don't have to rewrite the entire file.
+2. On the third line, we open the ``head`` block which has already been defined
+   in the ``simple`` theme.
+3. On the fourth line, the function ``super()`` keeps the content previously
+   inserted in the ``head`` block.
+4. On the fifth line, we append a stylesheet to the page.
+5. On the last line, we close the ``head`` block.
 
-1.    On the first line, we extend the ``base.html`` template from the ``simple`` theme, so we don't have to rewrite the entire file.
-2.    On the third line, we open the ``head`` block which has already been defined in the ``simple`` theme.
-3.    On the fourth line, the function ``super()`` keeps the content previously inserted in the ``head`` block.
-4.    On the fifth line, we append a stylesheet to the page.
-5.    On the last line, we close the ``head`` block.
-
-This file will be extended by all the other templates, so the stylesheet will be linked from all pages.
+This file will be extended by all the other templates, so the stylesheet will
+be linked from all pages.
 
 style.css
 """""""""

From 35375b19fff90746cfd28f4f83c10b7a56f06622 Mon Sep 17 00:00:00 2001
From: Mark Lee <pelican@lazymalevolence.com>
Date: Fri, 8 Nov 2013 14:37:07 -0800
Subject: [PATCH 1508/2864] Log a warning when the HTML reader encounters a
 nonconformant meta tag

Instead of throwing an exception and skipping the HTML file, log a
warning with a message which makes it more obvious as to what happened.
---
 pelican/readers.py                                   |  7 ++++++-
 .../article_with_nonconformant_meta_tags.html        | 12 ++++++++++++
 pelican/tests/test_generators.py                     |  1 +
 pelican/tests/test_readers.py                        | 10 ++++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pelican/tests/content/article_with_nonconformant_meta_tags.html

diff --git a/pelican/readers.py b/pelican/readers.py
index 067bbb85..6c279abc 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -302,7 +302,12 @@ class HTMLReader(BaseReader):
             return result + '>'
 
         def _handle_meta_tag(self, attrs):
-            name = self._attr_value(attrs, 'name').lower()
+            name = self._attr_value(attrs, 'name')
+            if name is None:
+                attr_serialized = ', '.join(['{}="{}"'.format(k, v) for k, v in attrs])
+                logger.warning("Meta tag in file %s does not have a 'name' attribute, skipping. Attributes: %s", self._filename, attr_serialized)
+                return
+            name = name.lower()
             contents = self._attr_value(attrs, 'content', '')
             if not contents:
                 contents = self._attr_value(attrs, 'contents', '')
diff --git a/pelican/tests/content/article_with_nonconformant_meta_tags.html b/pelican/tests/content/article_with_nonconformant_meta_tags.html
new file mode 100644
index 00000000..5ed44bbd
--- /dev/null
+++ b/pelican/tests/content/article_with_nonconformant_meta_tags.html
@@ -0,0 +1,12 @@
+<html>
+    <head>
+        <meta charset="utf-8" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <title>Article with Nonconformant HTML meta tags</title>
+        <meta name="summary" content="Summary and stuff" />
+    </head>
+    <body>
+        Multi-line metadata should be supported
+        as well as <strong>inline markup</strong>.
+    </body>
+</html>
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index e821bb86..150d30f5 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -86,6 +86,7 @@ class TestArticlesGenerator(unittest.TestCase):
             ['Test mkd File', 'published', 'test', 'article'],
             ['This is a super article !', 'published', 'Yeah', 'article'],
             ['This is a super article !', 'published', 'Yeah', 'article'],
+            ['Article with Nonconformant HTML meta tags', 'published', 'Default', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 841e3d34..f60a00c8 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -384,3 +384,13 @@ class HTMLReaderTest(ReaderTest):
         self.assertIn('category', page.metadata, 'Key should be lowercase.')
         self.assertEqual('Yeah', page.metadata.get('category'),
                          'Value keeps cases.')
+
+    def test_article_with_nonconformant_meta_tags(self):
+        page = self.read_file(path='article_with_nonconformant_meta_tags.html')
+        expected = {
+            'summary': 'Summary and stuff',
+            'title': 'Article with Nonconformant HTML meta tags',
+        }
+
+        for key, value in expected.items():
+            self.assertEqual(value, page.metadata[key], key)

From 4b2fcb09a4bfd3f099013bbf64550e57b1e13e55 Mon Sep 17 00:00:00 2001
From: Florian Jacob <fjacob@lavabit.com>
Date: Tue, 5 Nov 2013 19:38:58 +0100
Subject: [PATCH 1509/2864] Added a new ''modified:' metadata tag to be able to
 specify the publication time and date and the last modified time and date
 independently.

This makes it possible to access the last updated date with {{ article.locale_modified }} in templates.
Additionally, an already delivered feed entry can be corrected by changing the modified date and time, as it is used for atom:update
/ rss pubDate field now.
---
 docs/changelog.rst                            |  3 ++-
 docs/getting_started.rst                      |  7 ++++++
 pelican/contents.py                           |  4 ++++
 pelican/readers.py                            |  3 +++
 .../article_with_markdown_and_footnote.md     |  3 ++-
 ...icle_with_markdown_and_nonascii_summary.md |  1 +
 .../content/article_with_md_extension.md      |  1 +
 .../tests/content/article_with_metadata.rst   |  1 +
 .../basic/a-markdown-powered-article.html     |  2 +-
 pelican/tests/output/basic/article-1.html     |  2 +-
 pelican/tests/output/basic/article-2.html     |  2 +-
 pelican/tests/output/basic/article-3.html     |  2 +-
 .../output/basic/author/alexis-metaireau.html |  4 ++--
 pelican/tests/output/basic/category/bar.html  |  2 +-
 pelican/tests/output/basic/category/cat1.html |  8 +++----
 pelican/tests/output/basic/category/misc.html |  8 +++----
 pelican/tests/output/basic/category/yeah.html |  2 +-
 .../basic/filename_metadata-example.html      |  2 +-
 pelican/tests/output/basic/index.html         | 20 ++++++++--------
 pelican/tests/output/basic/oh-yeah.html       |  2 +-
 .../tests/output/basic/second-article-fr.html |  2 +-
 .../tests/output/basic/second-article.html    |  2 +-
 pelican/tests/output/basic/tag/bar.html       |  6 ++---
 pelican/tests/output/basic/tag/baz.html       |  2 +-
 pelican/tests/output/basic/tag/foo.html       |  4 ++--
 pelican/tests/output/basic/tag/foobar.html    |  2 +-
 pelican/tests/output/basic/tag/yeah.html      |  2 +-
 .../output/basic/this-is-a-super-article.html |  2 +-
 pelican/tests/output/basic/unbelievable.html  |  2 +-
 .../custom/a-markdown-powered-article.html    |  6 ++++-
 pelican/tests/output/custom/article-1.html    |  6 ++++-
 pelican/tests/output/custom/article-2.html    |  6 ++++-
 pelican/tests/output/custom/article-3.html    |  6 ++++-
 .../custom/author/alexis-metaireau.html       | 24 +++++++++++++++----
 .../custom/author/alexis-metaireau2.html      | 24 +++++++++++++++----
 .../custom/author/alexis-metaireau3.html      | 12 ++++++++--
 pelican/tests/output/custom/category/bar.html |  6 ++++-
 .../tests/output/custom/category/cat1.html    | 24 +++++++++++++++----
 .../tests/output/custom/category/misc.html    | 24 +++++++++++++++----
 .../tests/output/custom/category/yeah.html    |  6 ++++-
 .../output/custom/drafts/a-draft-article.html |  2 +-
 .../tests/output/custom/feeds/all-en.atom.xml | 20 ++++++++--------
 .../tests/output/custom/feeds/all-fr.atom.xml |  2 +-
 .../tests/output/custom/feeds/all.atom.xml    | 22 ++++++++---------
 pelican/tests/output/custom/feeds/all.rss.xml | 24 +++++++++----------
 .../tests/output/custom/feeds/bar.atom.xml    |  2 +-
 pelican/tests/output/custom/feeds/bar.rss.xml |  4 ++--
 .../tests/output/custom/feeds/cat1.atom.xml   |  8 +++----
 .../tests/output/custom/feeds/cat1.rss.xml    | 10 ++++----
 .../tests/output/custom/feeds/misc.atom.xml   |  8 +++----
 .../tests/output/custom/feeds/misc.rss.xml    | 10 ++++----
 .../tests/output/custom/feeds/yeah.atom.xml   |  2 +-
 .../tests/output/custom/feeds/yeah.rss.xml    |  4 ++--
 .../custom/filename_metadata-example.html     |  6 ++++-
 pelican/tests/output/custom/index.html        | 24 +++++++++++++++----
 pelican/tests/output/custom/index2.html       | 24 +++++++++++++++----
 pelican/tests/output/custom/index3.html       | 12 ++++++++--
 pelican/tests/output/custom/oh-yeah-fr.html   |  2 +-
 pelican/tests/output/custom/oh-yeah.html      |  6 ++++-
 .../output/custom/second-article-fr.html      |  6 ++++-
 .../tests/output/custom/second-article.html   |  6 ++++-
 pelican/tests/output/custom/tag/bar.html      | 18 +++++++++++---
 pelican/tests/output/custom/tag/baz.html      |  6 ++++-
 pelican/tests/output/custom/tag/foo.html      | 12 ++++++++--
 pelican/tests/output/custom/tag/foobar.html   |  6 ++++-
 pelican/tests/output/custom/tag/yeah.html     |  6 ++++-
 .../custom/this-is-a-super-article.html       |  6 ++++-
 pelican/tests/output/custom/unbelievable.html |  6 ++++-
 pelican/tests/test_readers.py                 |  4 ++++
 .../notmyidea/templates/article_infos.html    |  8 ++++++-
 pelican/themes/simple/templates/article.html  |  5 ++++
 pelican/themes/simple/templates/page.html     |  3 +++
 pelican/writers.py                            |  2 +-
 73 files changed, 381 insertions(+), 152 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 54b0d871..976eecc8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,8 @@ Release history
 Next release
 ============
 
-- Nothing yet
+* Added the `:modified:` metadata field to complement `:date:`.
+  Used to specify the last date and time an article was updated independently from the date and time it was published.
 
 3.3.0 (2013-09-24)
 ==================
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 201b9ad4..4860576c 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -301,6 +301,7 @@ this metadata in text files via the following syntax (give your file the
     ##############
 
     :date: 2010-10-03 10:20
+    :modified: 2010-10-04 18:40
     :tags: thats, awesome
     :category: yeah
     :slug: my-super-post
@@ -320,6 +321,7 @@ pattern::
 
     Title: My super title
     Date: 2010-12-03 10:20
+    Modified: 2010-12-05 19:30
     Category: Python
     Tags: pelican, publishing
     Slug: my-super-post
@@ -341,6 +343,7 @@ interprets the HTML in a very straightforward manner, reading metadata from
             <title>My super title</title>
             <meta name="tags" content="thats, awesome" />
             <meta name="date" content="2012-07-09 22:28" />
+            <meta name="modified" content="2012-07-10 20:14" />
             <meta name="category" content="yeah" />
             <meta name="author" content="Alexis Métaireau" />
             <meta name="summary" content="Short version for index and feeds" />
@@ -367,6 +370,10 @@ the W3C's `suggested subset ISO 8601`__.
 
 __ `W3C ISO 8601`_
 
+``modified`` should be last time you updated the article, and defaults to ``date`` if not specified.
+Besides you can show ``modified`` in the templates, feed entries in feed readers will be updated automatically
+when you set ``modified`` to the current date after you modified your article.
+
 If you do not explicitly specify summary metadata for a given post, the
 ``SUMMARY_MAX_LENGTH`` setting can be used to specify how many words from the
 beginning of an article are used as the summary.
diff --git a/pelican/contents.py b/pelican/contents.py
index 059c54a7..96794026 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -113,6 +113,10 @@ class Content(object):
 
         if hasattr(self, 'date'):
             self.locale_date = strftime(self.date, self.date_format)
+            if not hasattr(self, 'modified'):
+                self.modified = self.date
+        if hasattr(self, 'modified'):
+            self.locale_modified = strftime(self.modified, self.date_format)
 
         # manage status
         if not hasattr(self, 'status'):
diff --git a/pelican/readers.py b/pelican/readers.py
index 6c279abc..c286e801 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -42,6 +42,7 @@ from pelican.utils import get_date, pelican_open
 METADATA_PROCESSORS = {
     'tags': lambda x, y: [Tag(tag, y) for tag in x.split(',')],
     'date': lambda x, y: get_date(x),
+    'modified': lambda x, y: get_date(x),
     'status': lambda x, y: x.strip(),
     'category': Category,
     'author': Author,
@@ -521,6 +522,7 @@ def default_metadata(settings=None, process=None):
             metadata['category'] = value
         if 'DEFAULT_DATE' in settings and settings['DEFAULT_DATE'] != 'fs':
             metadata['date'] = datetime.datetime(*settings['DEFAULT_DATE'])
+            metadata['modified'] = metadata['date']
     return metadata
 
 
@@ -530,6 +532,7 @@ def path_metadata(full_path, source_path, settings=None):
         if settings.get('DEFAULT_DATE', None) == 'fs':
             metadata['date'] = datetime.datetime.fromtimestamp(
                 os.stat(full_path).st_ctime)
+            metadata['modified'] = metadata['date']
         metadata.update(settings.get('EXTRA_PATH_METADATA', {}).get(
             source_path, {}))
     return metadata
diff --git a/pelican/tests/content/article_with_markdown_and_footnote.md b/pelican/tests/content/article_with_markdown_and_footnote.md
index dc257d62..332ccea6 100644
--- a/pelican/tests/content/article_with_markdown_and_footnote.md
+++ b/pelican/tests/content/article_with_markdown_and_footnote.md
@@ -1,8 +1,9 @@
 Title: Article with markdown containing footnotes
 Date: 2012-10-31
+Modified: 2012-11-01
 Summary: Summary with **inline** markup *should* be supported.
 
 This is some content[^1] with some footnotes[^footnote]
 
 [^1]: Numbered footnote
-[^footnote]: Named footnote
\ No newline at end of file
+[^footnote]: Named footnote
diff --git a/pelican/tests/content/article_with_markdown_and_nonascii_summary.md b/pelican/tests/content/article_with_markdown_and_nonascii_summary.md
index e26cc009..d76ed4a1 100644
--- a/pelican/tests/content/article_with_markdown_and_nonascii_summary.md
+++ b/pelican/tests/content/article_with_markdown_and_nonascii_summary.md
@@ -1,6 +1,7 @@
 Title: マックOS X 10.8でパイソンとVirtualenvをインストールと設定
 Slug: python-virtualenv-on-mac-osx-mountain-lion-10.8
 Date: 2012-12-20
+Modified: 2012-12-22
 Tags: パイソン, マック
 Category: 指導書
 Summary: パイソンとVirtualenvをまっくでインストールする方法について明確に説明します。
diff --git a/pelican/tests/content/article_with_md_extension.md b/pelican/tests/content/article_with_md_extension.md
index 1f111796..89b6980c 100644
--- a/pelican/tests/content/article_with_md_extension.md
+++ b/pelican/tests/content/article_with_md_extension.md
@@ -2,6 +2,7 @@ Title: Test md File
 Category: test
 Tags: foo, bar, foobar
 Date: 2010-12-02 10:14
+Modified: 2010-12-02 10:20
 Summary: I have a lot to test
 
 Test Markdown File Header
diff --git a/pelican/tests/content/article_with_metadata.rst b/pelican/tests/content/article_with_metadata.rst
index d4bac1c0..c5768cfb 100644
--- a/pelican/tests/content/article_with_metadata.rst
+++ b/pelican/tests/content/article_with_metadata.rst
@@ -4,6 +4,7 @@ This is a super article !
 
 :tags: foo, bar, foobar
 :date: 2010-12-02 10:14
+:modified: 2010-12-02 10:20
 :category: yeah
 :author: Alexis Métaireau
 :summary:
diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 6bc29eba..40c96766 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -35,7 +35,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Wed 20 April 2011
+                Published: Wed 20 April 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 0b675410..15a1496d 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -35,7 +35,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 28126c24..c4b09e35 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -35,7 +35,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index bfb5760a..1c07e5e2 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -35,7 +35,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index b38edc66..2d4ba1cc 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -30,7 +30,7 @@
                     <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
         </abbr>
 
         <address class="vcard author">
@@ -66,7 +66,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index b0cc9038..54b1db3e 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -30,7 +30,7 @@
                     <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 821b6b86..b1e34e3e 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -30,7 +30,7 @@
                     <h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Wed 20 April 2011
+                Published: Wed 20 April 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
@@ -53,7 +53,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
@@ -73,7 +73,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
@@ -93,7 +93,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 5b8af887..d53b1f31 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -30,7 +30,7 @@
                     <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Fri 30 November 2012
+                Published: Fri 30 November 2012
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
@@ -52,7 +52,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
@@ -74,7 +74,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
+                Published: Fri 15 October 2010
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
@@ -104,7 +104,7 @@ pelican.conf, it ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Sun 14 March 2010
+                Published: Sun 14 March 2010
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 021631fb..f8b2d534 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -30,7 +30,7 @@
                     <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 3df68433..80e39129 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -35,7 +35,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Fri 30 November 2012
+                Published: Fri 30 November 2012
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 24b00606..b0bda7c5 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -30,7 +30,7 @@
                     <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Fri 30 November 2012
+                Published: Fri 30 November 2012
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
@@ -52,7 +52,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
@@ -74,7 +74,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Wed 20 April 2011
+                Published: Wed 20 April 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
@@ -95,7 +95,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
@@ -115,7 +115,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
@@ -135,7 +135,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
         </abbr>
 
 <p>In <a href="/category/cat1.html">cat1</a>. </p>
@@ -155,7 +155,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
         </abbr>
 
         <address class="vcard author">
@@ -179,7 +179,7 @@ as well as <strong>inline markup</strong>.</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
         </abbr>
 
         <address class="vcard author">
@@ -207,7 +207,7 @@ YEAH !</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
+                Published: Fri 15 October 2010
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
@@ -237,7 +237,7 @@ pelican.conf, it ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Sun 14 March 2010
+                Published: Sun 14 March 2010
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index a5e2fc34..3265402d 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -35,7 +35,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 050d49b3..01ed70f2 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -35,7 +35,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 94646871..ddb379d6 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -35,7 +35,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 3de74a03..96d0833b 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -30,7 +30,7 @@
                     <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
@@ -54,7 +54,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
         </abbr>
 
         <address class="vcard author">
@@ -78,7 +78,7 @@ as well as <strong>inline markup</strong>.</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 953d511f..a6cc9e9b 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -35,7 +35,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Sun 14 March 2010
+                Published: Sun 14 March 2010
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index ad423ede..828b215f 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -30,7 +30,7 @@
                     <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
@@ -54,7 +54,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index c72e9402..75fb0c53 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -30,7 +30,7 @@
                     <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 6a0ab0ec..c064d8a0 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -30,7 +30,7 @@
                     <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index d8941ffb..9ae56a06 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -35,7 +35,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index aef78474..f9f38a79 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -35,7 +35,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
+                Published: Fri 15 October 2010
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>. </p>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index a5c1bb35..f642df3b 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -39,7 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Wed 20 April 2011
+                Published: Wed 20 April 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 629ba81d..ba0df8f4 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -39,7 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 56d6360a..8d09a783 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -39,7 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index fac56b98..8b70e2f9 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -39,7 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index 19c254a0..b0edc0aa 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -34,7 +34,11 @@
                     <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Fri 30 November 2012
+                Published: Fri 30 November 2012
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -59,7 +63,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -84,7 +92,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Wed 20 April 2011
+                Published: Wed 20 April 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -108,7 +120,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 772d2939..9ad70eae 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -40,7 +40,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -63,7 +67,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -86,7 +94,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -110,7 +122,11 @@ as well as <strong>inline markup</strong>.</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index f3d985c3..ef581c31 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -40,7 +40,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
+                Published: Fri 15 October 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -73,7 +77,11 @@ pelican.conf, it ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Sun 14 March 2010
+                Published: Sun 14 March 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 30545518..8b3a0308 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -34,7 +34,11 @@
                     <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 9a737b76..04a7fa6a 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -34,7 +34,11 @@
                     <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Wed 20 April 2011
+                Published: Wed 20 April 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -60,7 +64,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -83,7 +91,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -106,7 +118,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index b70afcdf..a1eff995 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -34,7 +34,11 @@
                     <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Fri 30 November 2012
+                Published: Fri 30 November 2012
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -59,7 +63,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -84,7 +92,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
+                Published: Fri 15 October 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -117,7 +129,11 @@ pelican.conf, it ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Sun 14 March 2010
+                Published: Sun 14 March 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 02d07413..eb3f184b 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -34,7 +34,11 @@
                     <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 440780a3..9050c04e 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
-                Fri 02 March 2012
+                Published: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 69ba08c6..e9b7d3d3 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index 5d58742c..f0e77d02 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 2eb31731..4f50852f 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 69e30bfd..44a5e8df 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index 99b7cc45..4e141f0d 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index 94bd93f2..c884c7ff 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index 5454ce4d..a45918dc 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index 62b93fd1..f1b1b87c 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 91d6b28f..5746c95e 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 3493d2a3..10b57521 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index 1a152174..db39042a 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-12-02T10:14:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index 85f93686..398d9de9 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Thu, 02 Dec 2010 10:14:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 9967b4ce..66c8d99e 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -39,7 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Fri 30 November 2012
+                Published: Fri 30 November 2012
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index c7174715..c4d16260 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -34,7 +34,11 @@
                     <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Fri 30 November 2012
+                Published: Fri 30 November 2012
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -59,7 +63,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -84,7 +92,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Wed 20 April 2011
+                Published: Wed 20 April 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -108,7 +120,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index b349b3ca..8fa98107 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -40,7 +40,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -63,7 +67,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Thu 17 February 2011
+                Published: Thu 17 February 2011
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -86,7 +94,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -110,7 +122,11 @@ as well as <strong>inline markup</strong>.</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index c668dba6..25ea997f 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -40,7 +40,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
+                Published: Fri 15 October 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -73,7 +77,11 @@ pelican.conf, it ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Sun 14 March 2010
+                Published: Sun 14 March 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index bdafb45f..39f68495 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
-                Fri 02 March 2012
+                Published: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 8068a224..9a0cb098 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -39,7 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index c1400c7c..a4df3e77 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -39,7 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index e37e90f3..e1d875fa 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -39,7 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 7a90eff2..8d0d7efb 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -34,7 +34,11 @@
                     <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -61,7 +65,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -85,7 +93,11 @@ as well as <strong>inline markup</strong>.</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 81f419be..c1d198f7 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -39,7 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Sun 14 March 2010
+                Published: Sun 14 March 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index d99df63b..b4898a07 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -34,7 +34,11 @@
                     <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Wed 29 February 2012
+                Published: Wed 29 February 2012
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
@@ -61,7 +65,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index ded91f12..041e58a7 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -34,7 +34,11 @@
                     <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 523358b5..442ac5e1 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -34,7 +34,11 @@
                     <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Wed 20 October 2010
+                Published: Wed 20 October 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index d3a3c038..c9da763a 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -39,7 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Thu 02 December 2010
+                Published: Thu 02 December 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 8b2d26ce..9ebbab52 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -39,7 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Fri 15 October 2010
+                Published: Fri 15 October 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2012-03-02T14:01:01">
+                Updated: Fri 02 March 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index f60a00c8..e827ed3b 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -42,6 +42,7 @@ class RstReaderTest(ReaderTest):
                        ' supported\nas well as <strong>inline'
                        ' markup</strong>.</p>\n',
             'date': datetime.datetime(2010, 12, 2, 10, 14),
+            'modified': datetime.datetime(2010, 12, 2, 10, 20),
             'tags': ['foo', 'bar', 'foobar'],
             'custom_field': 'http://notmyidea.org',
         }
@@ -137,6 +138,7 @@ class MdReaderTest(ReaderTest):
             'title': 'Test md File',
             'summary': '<p>I have a lot to test</p>',
             'date': datetime.datetime(2010, 12, 2, 10, 14),
+            'modified': datetime.datetime(2010, 12, 2, 10, 20),
             'tags': ['foo', 'bar', 'foobar'],
         }
         for key, value in metadata.items():
@@ -149,6 +151,7 @@ class MdReaderTest(ReaderTest):
             'summary': '<p>パイソンとVirtualenvをまっくでインストールする方法について明確に説明します。</p>',
             'category': '指導書',
             'date': datetime.datetime(2012, 12, 20),
+            'modified': datetime.datetime(2012, 12, 22),
             'tags': ['パイソン', 'マック'],
             'slug': 'python-virtualenv-on-mac-osx-mountain-lion-10.8',
         }
@@ -184,6 +187,7 @@ class MdReaderTest(ReaderTest):
                 '<p>Summary with <strong>inline</strong> markup '
                 '<em>should</em> be supported.</p>'),
             'date': datetime.datetime(2012, 10, 31),
+            'modified': datetime.datetime(2012, 11, 1),
             'slug': 'article-with-markdown-containing-footnotes',
         }
         self.assertEqual(content, expected_content)
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index 4b86716d..8ba07157 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -1,7 +1,13 @@
 <footer class="post-info">
         <abbr class="published" title="{{ article.date.isoformat() }}">
-                {{ article.locale_date }}
+                Published: {{ article.locale_date }}
         </abbr>
+        {% if article.modified != article.date %}
+		<br />
+        <abbr class="modified" title="{{ article.modified.isoformat() }}">
+                Updated: {{ article.locale_modified }}
+        </abbr>
+        {% endif %}
 
         {% if article.author %}
         <address class="vcard author">
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 79124725..6b22150f 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -28,6 +28,11 @@
     <abbr class="published" title="{{ article.date.isoformat() }}">
       {{ article.locale_date }}
     </abbr>
+	{% if article.modified != article.date %}
+    <abbr class="modified" title="{{ article.modified.isoformat() }}">
+      {{ article.locale_modified }}
+    </abbr>
+	{% endif %}
     {% if article.author %}
     <address class="vcard author">
       By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
index 3a0dc4a9..02764f2d 100644
--- a/pelican/themes/simple/templates/page.html
+++ b/pelican/themes/simple/templates/page.html
@@ -6,4 +6,7 @@
     {{ translations.translations_for(page) }}
 
     {{ page.content }}
+	<p>
+	Last updated: {{ page.locale_modified }}
+	</p>
 {% endblock %}
diff --git a/pelican/writers.py b/pelican/writers.py
index 6cf5232d..de2de592 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -49,7 +49,7 @@ class Writer(object):
             description=item.get_content(self.site_url),
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', ''),
-            pubdate=set_date_tzinfo(item.date,
+            pubdate=set_date_tzinfo(item.modified,
                 self.settings.get('TIMEZONE', None)))
 
     def _open_w(self, filename, encoding, override=False):

From da6624572949e800c0b74cdfe41d0dc7d5559f5b Mon Sep 17 00:00:00 2001
From: John Cramb <john@geekdownunder.net>
Date: Wed, 13 Nov 2013 14:15:08 +1100
Subject: [PATCH 1510/2864] Update settings.rst

Added missing CATEGORIES_URL and CATEGORIES_SAVE_AS settings to the table.
---
 docs/settings.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 82752436..c9482303 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -248,6 +248,8 @@ Setting name (default value)                            What does it do?
                                                         use the default language.
 `PAGE_LANG_SAVE_AS` (``'pages/{slug}-{lang}.html'``)    The location we will save the page which doesn't
                                                         use the default language.
+`CATEGORIES_URL` (``'categories/'``)                    The URL to use for the category list.
+`CATEGORIES_SAVE_AS` (``'categories/index.html'``)      The location to save the category list.
 `CATEGORY_URL` (``'category/{slug}.html'``)             The URL to use for a category.
 `CATEGORY_SAVE_AS` (``'category/{slug}.html'``)         The location to save a category.
 `TAG_URL` (``'tag/{slug}.html'``)                       The URL to use for a tag.

From 3b0823f5e6cbe428b3eb7171d07c114398343641 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 13 Nov 2013 13:44:28 -0800
Subject: [PATCH 1511/2864] Build Pelican wheels in universal format

Including a binary wheel when uploading Pelican to PyPI will speed up
installation for the Pelican community. This change ensures that the
Pelican wheel is compatible with all supported Python versions. For more
information, see: https://pypi.python.org/pypi/wheel
---
 setup.cfg | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 setup.cfg

diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..5e409001
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[wheel]
+universal = 1

From 0c69f4ad847c5f4b1dc06bd03d070b819a641d1f Mon Sep 17 00:00:00 2001
From: David Marble <davidmarble@gmail.com>
Date: Thu, 14 Nov 2013 12:29:01 -0800
Subject: [PATCH 1512/2864] Support ordering pages and articles when iterating
 in templates. Order can be set to a metadata attribute or a sorting function.
 Default to order by slug for articles and order by filename for pages.

---
 docs/settings.rst     | 12 ++++++++++++
 pelican/generators.py |  6 ++++--
 pelican/settings.py   |  2 ++
 pelican/utils.py      | 26 +++++++++++++++++++++++++-
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 82752436..3f11437c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -236,6 +236,11 @@ Setting name (default value)                            What does it do?
 ====================================================    =====================================================
 `ARTICLE_URL` (``'{slug}.html'``)                       The URL to refer to an ARTICLE.
 `ARTICLE_SAVE_AS` (``'{slug}.html'``)                   The place where we will save an article.
+`ARTICLE_ORDER_BY` (``'slug'``)                         The metadata attribute used to sort articles. By default
+                                                        the articles_page.object_list template variable is 
+                                                        ordered by slug. If you modify this, make sure all 
+                                                        articles contain the attribute you specify. You can
+                                                        also specify a sorting function.
 `ARTICLE_LANG_URL` (``'{slug}-{lang}.html'``)           The URL to refer to an ARTICLE which doesn't use the
                                                         default language.
 `ARTICLE_LANG_SAVE_AS` (``'{slug}-{lang}.html'``)       The place where we will save an article which
@@ -244,6 +249,13 @@ Setting name (default value)                            What does it do?
 `PAGE_SAVE_AS` (``'pages/{slug}.html'``)                The location we will save the page. This value has to be
                                                         the same as PAGE_URL or you need to use a rewrite in
                                                         your server config.
+`PAGE_ORDER_BY` (``'filename'``)                        The metadata attribute used to sort pages. By default
+                                                        the PAGES template variable is ordered by filename
+                                                        (path not included). Note that the option 'filename' 
+                                                        is a special option supported in the source code. If 
+                                                        you modify this settings, make sure all pages contain 
+                                                        the attribute you specify. You can also specify a 
+                                                        sorting function.
 `PAGE_LANG_URL` (``'pages/{slug}-{lang}.html'``)        The URL we will use to link to a page which doesn't
                                                         use the default language.
 `PAGE_LANG_SAVE_AS` (``'pages/{slug}-{lang}.html'``)    The location we will save the page which doesn't
diff --git a/pelican/generators.py b/pelican/generators.py
index c55cdc37..2cdd4f89 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -409,7 +409,8 @@ class ArticlesGenerator(Generator):
                                (repr(article.status),
                                 repr(f)))
 
-        self.articles, self.translations = process_translations(all_articles)
+        self.articles, self.translations = process_translations(all_articles,
+                order_by=self.settings['ARTICLE_ORDER_BY'])
 
         for article in self.articles:
             # only main articles are listed in categories and tags
@@ -517,7 +518,8 @@ class PagesGenerator(Generator):
                                (repr(page.status),
                                 repr(f)))
 
-        self.pages, self.translations = process_translations(all_pages)
+        self.pages, self.translations = process_translations(all_pages,
+                order_by=self.settings['PAGE_ORDER_BY'])
         self.hidden_pages, self.hidden_translations = (
                 process_translations(hidden_pages))
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 99828935..fbef91fc 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -57,10 +57,12 @@ DEFAULT_CONFIG = {
     'OUTPUT_RETENTION': (),
     'ARTICLE_URL': '{slug}.html',
     'ARTICLE_SAVE_AS': '{slug}.html',
+    'ARTICLE_ORDER_BY': 'slug',
     'ARTICLE_LANG_URL': '{slug}-{lang}.html',
     'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html',
     'PAGE_URL': 'pages/{slug}.html',
     'PAGE_SAVE_AS': os.path.join('pages', '{slug}.html'),
+    'PAGE_ORDER_BY': 'filename',
     'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
     'PAGE_LANG_SAVE_AS': os.path.join('pages', '{slug}-{lang}.html'),
     'STATIC_URL': '{path}',
diff --git a/pelican/utils.py b/pelican/utils.py
index 4b25ec7f..e1a16fdb 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -430,7 +430,7 @@ def truncate_html_words(s, num, end_text='...'):
     return out
 
 
-def process_translations(content_list):
+def process_translations(content_list, order_by=None):
     """ Finds translation and returns them.
 
     Returns a tuple with two lists (index, translations).  Index list includes
@@ -440,6 +440,14 @@ def process_translations(content_list):
     the same slug have that metadata.
 
     For each content_list item, sets the 'translations' attribute.
+
+    order_by can be a string of an attribute or sorting function. If order_by
+    is defined, content will be ordered by that attribute or sorting function.
+    By default, content is ordered by slug.
+
+    Different content types can have default order_by attributes defined
+    in settings, e.g. PAGES_ORDER_BY='sort-order', in which case `sort-order`
+    should be a defined metadata attribute in each page.
     """
     content_list.sort(key=attrgetter('slug'))
     grouped_by_slugs = groupby(content_list, attrgetter('slug'))
@@ -485,6 +493,22 @@ def process_translations(content_list):
         translations.extend([x for x in items if x not in default_lang_items])
         for a in items:
             a.translations = [x for x in items if x != a]
+
+    if order_by:
+        if hasattr(order_by, '__call__'):
+            try:
+                index.sort(key=order_by)
+            except:
+                if hasattr(order_by, 'func_name'):
+                    logger.error("Error sorting with function %s" % order_by.func_name)
+                else:
+                    logger.error("Error sorting with function %r" % order_by)
+        elif order_by == 'filename':
+            index.sort(key=lambda x:os.path.basename(
+                    x.source_path or ''))
+        elif order_by != 'slug':
+            index.sort(key=attrgetter(order_by))
+
     return index, translations
 
 

From 69ff7dd634970c7aabab2d0f74fd34ff2108899a Mon Sep 17 00:00:00 2001
From: Mark Lee <pelican@lazymalevolence.com>
Date: Thu, 14 Nov 2013 12:37:22 -0800
Subject: [PATCH 1513/2864] Add test for PAGE_ORDER_BY

---
 .../TestPages/page_used_for_sorting_test.rst  |  6 +++
 pelican/tests/test_generators.py              | 48 +++++++++++++++++--
 2 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 pelican/tests/TestPages/page_used_for_sorting_test.rst

diff --git a/pelican/tests/TestPages/page_used_for_sorting_test.rst b/pelican/tests/TestPages/page_used_for_sorting_test.rst
new file mode 100644
index 00000000..40cdc7ea
--- /dev/null
+++ b/pelican/tests/TestPages/page_used_for_sorting_test.rst
@@ -0,0 +1,6 @@
+A Page (Test) for sorting
+#########################
+
+:slug: zzzz
+
+When using title, should be first. When using slug, should be last.
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 150d30f5..f8a5fc3f 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -7,6 +7,7 @@ try:
     from unittest.mock import MagicMock
 except ImportError:
     from mock import MagicMock
+from operator import itemgetter
 from shutil import rmtree
 from tempfile import mkdtemp
 
@@ -47,8 +48,12 @@ class TestArticlesGenerator(unittest.TestCase):
             context=settings.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         cls.generator.generate_context()
-        cls.articles = [[page.title, page.status, page.category.name,
-                         page.template] for page in cls.generator.articles]
+        cls.articles = cls.distill_articles(cls.generator.articles)
+
+    @staticmethod
+    def distill_articles(articles):
+        return [[article.title, article.status, article.category.name,
+                 article.template] for article in articles]
 
     def test_generate_feeds(self):
         settings = get_settings()
@@ -223,7 +228,8 @@ class TestPageGenerator(unittest.TestCase):
             ['This is a test page', 'published', 'page'],
             ['This is a markdown test page', 'published', 'page'],
             ['This is a test page with a preset template', 'published',
-             'custom']
+             'custom'],
+            ['A Page (Test) for sorting', 'published', 'page'],
         ]
         hidden_pages_expected = [
             ['This is a test hidden page', 'hidden', 'page'],
@@ -235,6 +241,42 @@ class TestPageGenerator(unittest.TestCase):
         self.assertEqual(sorted(pages_expected), sorted(pages))
         self.assertEqual(sorted(hidden_pages_expected), sorted(hidden_pages))
 
+    def test_generate_sorted(self):
+        settings = get_settings(filenames={})
+        settings['PAGE_DIR'] = 'TestPages'  # relative to CUR_DIR
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
+
+        # default sort (filename)
+        pages_expected_sorted_by_filename = [
+            ['This is a test page', 'published', 'page'],
+            ['This is a markdown test page', 'published', 'page'],
+            ['A Page (Test) for sorting', 'published', 'page'],
+            ['This is a test page with a preset template', 'published',
+             'custom'],
+        ]
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        pages = self.distill_pages(generator.pages)
+        self.assertEqual(pages_expected_sorted_by_filename, pages)
+
+        # sort by title
+        pages_expected_sorted_by_title = [
+            ['A Page (Test) for sorting', 'published', 'page'],
+            ['This is a markdown test page', 'published', 'page'],
+            ['This is a test page', 'published', 'page'],
+            ['This is a test page with a preset template', 'published',
+             'custom'],
+        ]
+        settings['PAGE_ORDER_BY'] = 'title'
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        pages = self.distill_pages(generator.pages)
+        self.assertEqual(pages_expected_sorted_by_title, pages)
+
 
 class TestTemplatePagesGenerator(unittest.TestCase):
 

From bd9d1b95394067ae65d131bb8f032befb619b2e0 Mon Sep 17 00:00:00 2001
From: Florian Jacob <fjacob@lavabit.com>
Date: Sun, 17 Nov 2013 23:40:11 +0100
Subject: [PATCH 1514/2864] The modified attribute no longer has a default
 value. This allows for templates using {% if article.modified %} instead of
 {% if article.modified != article.published %} .

---
 pelican/contents.py                           |  2 --
 pelican/readers.py                            |  2 --
 .../output/basic/author/alexis-metaireau.html |  4 ++++
 pelican/tests/output/basic/category/yeah.html |  4 ++++
 .../tests/output/basic/feeds/all-en.atom.xml  |  4 ++--
 pelican/tests/output/basic/feeds/all.atom.xml |  4 ++--
 .../tests/output/basic/feeds/yeah.atom.xml    |  2 +-
 pelican/tests/output/basic/index.html         |  4 ++++
 pelican/tests/output/basic/tag/bar.html       |  4 ++++
 pelican/tests/output/basic/tag/foo.html       |  4 ++++
 pelican/tests/output/basic/tag/foobar.html    |  4 ++++
 .../output/basic/this-is-a-super-article.html |  4 ++++
 .../custom/a-markdown-powered-article.html    |  4 ----
 pelican/tests/output/custom/article-1.html    |  4 ----
 pelican/tests/output/custom/article-2.html    |  4 ----
 pelican/tests/output/custom/article-3.html    |  4 ----
 .../custom/author/alexis-metaireau.html       | 16 -------------
 .../custom/author/alexis-metaireau2.html      | 16 ++-----------
 .../custom/author/alexis-metaireau3.html      |  8 -------
 pelican/tests/output/custom/category/bar.html |  4 ----
 .../tests/output/custom/category/cat1.html    | 16 -------------
 .../tests/output/custom/category/misc.html    | 16 -------------
 .../tests/output/custom/category/yeah.html    |  4 ++--
 .../tests/output/custom/feeds/all-en.atom.xml | 20 ++++++++--------
 .../tests/output/custom/feeds/all-fr.atom.xml |  2 +-
 .../tests/output/custom/feeds/all.atom.xml    | 22 ++++++++---------
 pelican/tests/output/custom/feeds/all.rss.xml | 24 +++++++++----------
 .../tests/output/custom/feeds/bar.atom.xml    |  2 +-
 pelican/tests/output/custom/feeds/bar.rss.xml |  4 ++--
 .../tests/output/custom/feeds/cat1.atom.xml   |  8 +++----
 .../tests/output/custom/feeds/cat1.rss.xml    | 10 ++++----
 .../tests/output/custom/feeds/misc.atom.xml   |  8 +++----
 .../tests/output/custom/feeds/misc.rss.xml    | 10 ++++----
 .../tests/output/custom/feeds/yeah.atom.xml   |  2 +-
 .../tests/output/custom/feeds/yeah.rss.xml    |  4 ++--
 .../custom/filename_metadata-example.html     |  4 ----
 pelican/tests/output/custom/index.html        | 16 -------------
 pelican/tests/output/custom/index2.html       | 16 ++-----------
 pelican/tests/output/custom/index3.html       |  8 -------
 pelican/tests/output/custom/oh-yeah.html      |  4 ----
 .../output/custom/second-article-fr.html      |  4 ----
 .../tests/output/custom/second-article.html   |  4 ----
 pelican/tests/output/custom/tag/bar.html      | 12 ++--------
 pelican/tests/output/custom/tag/baz.html      |  4 ----
 pelican/tests/output/custom/tag/foo.html      |  8 ++-----
 pelican/tests/output/custom/tag/foobar.html   |  4 ++--
 pelican/tests/output/custom/tag/yeah.html     |  4 ----
 .../custom/this-is-a-super-article.html       |  4 ++--
 pelican/tests/output/custom/unbelievable.html |  4 ----
 .../notmyidea/templates/article_infos.html    |  2 +-
 pelican/themes/simple/templates/article.html  |  2 +-
 pelican/themes/simple/templates/page.html     |  9 ++++---
 pelican/writers.py                            |  2 +-
 samples/content/super_article.rst             |  1 +
 54 files changed, 115 insertions(+), 251 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 96794026..6fb55782 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -113,8 +113,6 @@ class Content(object):
 
         if hasattr(self, 'date'):
             self.locale_date = strftime(self.date, self.date_format)
-            if not hasattr(self, 'modified'):
-                self.modified = self.date
         if hasattr(self, 'modified'):
             self.locale_modified = strftime(self.modified, self.date_format)
 
diff --git a/pelican/readers.py b/pelican/readers.py
index c286e801..b331d263 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -522,7 +522,6 @@ def default_metadata(settings=None, process=None):
             metadata['category'] = value
         if 'DEFAULT_DATE' in settings and settings['DEFAULT_DATE'] != 'fs':
             metadata['date'] = datetime.datetime(*settings['DEFAULT_DATE'])
-            metadata['modified'] = metadata['date']
     return metadata
 
 
@@ -532,7 +531,6 @@ def path_metadata(full_path, source_path, settings=None):
         if settings.get('DEFAULT_DATE', None) == 'fs':
             metadata['date'] = datetime.datetime.fromtimestamp(
                 os.stat(full_path).st_ctime)
-            metadata['modified'] = metadata['date']
         metadata.update(settings.get('EXTRA_PATH_METADATA', {}).get(
             source_path, {}))
     return metadata
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 2d4ba1cc..d1dc6da6 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -32,6 +32,10 @@
         <abbr class="published" title="2010-12-02T10:14:00">
                 Published: Thu 02 December 2010
         </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
+        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index f8b2d534..51fada93 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -32,6 +32,10 @@
         <abbr class="published" title="2010-12-02T10:14:00">
                 Published: Thu 02 December 2010
         </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
+        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index da537344..128e1b3b 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index d837c895..3cf2d197 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
@@ -7,7 +7,7 @@
 &lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 78d1a2d0..2c42ec39 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2010-12-02T10:14:00Z</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2010-12-02T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index b0bda7c5..ffc476f4 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -157,6 +157,10 @@
         <abbr class="published" title="2010-12-02T10:14:00">
                 Published: Thu 02 December 2010
         </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
+        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 96d0833b..d983f3dc 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -56,6 +56,10 @@
         <abbr class="published" title="2010-12-02T10:14:00">
                 Published: Thu 02 December 2010
         </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
+        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 828b215f..4bebd99d 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -56,6 +56,10 @@
         <abbr class="published" title="2010-12-02T10:14:00">
                 Published: Thu 02 December 2010
         </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
+        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 75fb0c53..66aa05e8 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -32,6 +32,10 @@
         <abbr class="published" title="2010-12-02T10:14:00">
                 Published: Thu 02 December 2010
         </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
+        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 9ae56a06..deeb27a1 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -37,6 +37,10 @@
         <abbr class="published" title="2010-12-02T10:14:00">
                 Published: Thu 02 December 2010
         </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
+        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index f642df3b..5b2aca1c 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -41,10 +41,6 @@
         <abbr class="published" title="2011-04-20T00:00:00">
                 Published: Wed 20 April 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index ba0df8f4..4319026f 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -41,10 +41,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 8d09a783..9b00fde2 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -41,10 +41,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 8b70e2f9..4bbd0819 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -41,10 +41,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index b0edc0aa..cb975d3a 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -36,10 +36,6 @@
         <abbr class="published" title="2012-11-30T00:00:00">
                 Published: Fri 30 November 2012
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -65,10 +61,6 @@
         <abbr class="published" title="2012-02-29T00:00:00">
                 Published: Wed 29 February 2012
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -94,10 +86,6 @@
         <abbr class="published" title="2011-04-20T00:00:00">
                 Published: Wed 20 April 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -122,10 +110,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 9ad70eae..8d67a25c 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -42,10 +42,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -69,10 +65,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -97,8 +89,8 @@
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
         </abbr>
 
         <address class="vcard author">
@@ -124,10 +116,6 @@ as well as <strong>inline markup</strong>.</p>
         <abbr class="published" title="2010-10-20T10:14:00">
                 Published: Wed 20 October 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index ef581c31..8df03fc6 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -42,10 +42,6 @@
         <abbr class="published" title="2010-10-15T20:30:00">
                 Published: Fri 15 October 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -79,10 +75,6 @@ pelican.conf, it ...</p></div>
         <abbr class="published" title="2010-03-14T00:00:00">
                 Published: Sun 14 March 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 8b3a0308..113b8841 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -36,10 +36,6 @@
         <abbr class="published" title="2010-10-20T10:14:00">
                 Published: Wed 20 October 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 04a7fa6a..c6bcafca 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -36,10 +36,6 @@
         <abbr class="published" title="2011-04-20T00:00:00">
                 Published: Wed 20 April 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -66,10 +62,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -93,10 +85,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -120,10 +108,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index a1eff995..ccb7d949 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -36,10 +36,6 @@
         <abbr class="published" title="2012-11-30T00:00:00">
                 Published: Fri 30 November 2012
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -65,10 +61,6 @@
         <abbr class="published" title="2012-02-29T00:00:00">
                 Published: Wed 29 February 2012
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -94,10 +86,6 @@
         <abbr class="published" title="2010-10-15T20:30:00">
                 Published: Fri 15 October 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -131,10 +119,6 @@ pelican.conf, it ...</p></div>
         <abbr class="published" title="2010-03-14T00:00:00">
                 Published: Sun 14 March 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index eb3f184b..c8e066c8 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -37,8 +37,8 @@
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index e9b7d3d3..3574ab42 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index f0e77d02..5d58742c 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 4f50852f..391ab85f 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 44a5e8df..a78d2dec 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index 4e141f0d..99b7cc45 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index c884c7ff..94bd93f2 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index a45918dc..5454ce4d 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index f1b1b87c..62b93fd1 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 5746c95e..91d6b28f 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 10b57521..3493d2a3 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index db39042a..bd1da591 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index 398d9de9..f054d3a6 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 02 Mar 2012 14:01:01 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 66c8d99e..5d22e0eb 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -41,10 +41,6 @@
         <abbr class="published" title="2012-11-30T00:00:00">
                 Published: Fri 30 November 2012
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index c4d16260..c46e8739 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -36,10 +36,6 @@
         <abbr class="published" title="2012-11-30T00:00:00">
                 Published: Fri 30 November 2012
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -65,10 +61,6 @@
         <abbr class="published" title="2012-02-29T00:00:00">
                 Published: Wed 29 February 2012
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -94,10 +86,6 @@
         <abbr class="published" title="2011-04-20T00:00:00">
                 Published: Wed 20 April 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -122,10 +110,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 8fa98107..3cc5623f 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -42,10 +42,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -69,10 +65,6 @@
         <abbr class="published" title="2011-02-17T00:00:00">
                 Published: Thu 17 February 2011
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -97,8 +89,8 @@
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
         </abbr>
 
         <address class="vcard author">
@@ -124,10 +116,6 @@ as well as <strong>inline markup</strong>.</p>
         <abbr class="published" title="2010-10-20T10:14:00">
                 Published: Wed 20 October 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 25ea997f..e08af17e 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -42,10 +42,6 @@
         <abbr class="published" title="2010-10-15T20:30:00">
                 Published: Fri 15 October 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -79,10 +75,6 @@ pelican.conf, it ...</p></div>
         <abbr class="published" title="2010-03-14T00:00:00">
                 Published: Sun 14 March 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 9a0cb098..5ad40219 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -41,10 +41,6 @@
         <abbr class="published" title="2010-10-20T10:14:00">
                 Published: Wed 20 October 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index a4df3e77..a70748b0 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -41,10 +41,6 @@
         <abbr class="published" title="2012-02-29T00:00:00">
                 Published: Wed 29 February 2012
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index e1d875fa..b3ae9584 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -41,10 +41,6 @@
         <abbr class="published" title="2012-02-29T00:00:00">
                 Published: Wed 29 February 2012
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 8d0d7efb..1b7b21c5 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -36,10 +36,6 @@
         <abbr class="published" title="2012-02-29T00:00:00">
                 Published: Wed 29 February 2012
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -68,8 +64,8 @@
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
         </abbr>
 
         <address class="vcard author">
@@ -95,10 +91,6 @@ as well as <strong>inline markup</strong>.</p>
         <abbr class="published" title="2010-10-20T10:14:00">
                 Published: Wed 20 October 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index c1d198f7..8609a6f7 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -41,10 +41,6 @@
         <abbr class="published" title="2010-03-14T00:00:00">
                 Published: Sun 14 March 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index b4898a07..e5c58b36 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -36,10 +36,6 @@
         <abbr class="published" title="2012-02-29T00:00:00">
                 Published: Wed 29 February 2012
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
@@ -68,8 +64,8 @@
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 041e58a7..c62d3418 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -37,8 +37,8 @@
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 442ac5e1..288f4ec7 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -36,10 +36,6 @@
         <abbr class="published" title="2010-10-20T10:14:00">
                 Published: Wed 20 October 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index c9da763a..757627c4 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -42,8 +42,8 @@
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: Sun 17 November 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 9ebbab52..71416a97 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -41,10 +41,6 @@
         <abbr class="published" title="2010-10-15T20:30:00">
                 Published: Fri 15 October 2010
         </abbr>
-		<br />
-        <abbr class="modified" title="2012-03-02T14:01:01">
-                Updated: Fri 02 March 2012
-        </abbr>
 
         <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index 8ba07157..54c88004 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -2,7 +2,7 @@
         <abbr class="published" title="{{ article.date.isoformat() }}">
                 Published: {{ article.locale_date }}
         </abbr>
-        {% if article.modified != article.date %}
+        {% if article.modified %}
 		<br />
         <abbr class="modified" title="{{ article.modified.isoformat() }}">
                 Updated: {{ article.locale_modified }}
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 6b22150f..b5368d9f 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -28,7 +28,7 @@
     <abbr class="published" title="{{ article.date.isoformat() }}">
       {{ article.locale_date }}
     </abbr>
-	{% if article.modified != article.date %}
+	{% if article.modified %}
     <abbr class="modified" title="{{ article.modified.isoformat() }}">
       {{ article.locale_modified }}
     </abbr>
diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
index 02764f2d..5ceb7796 100644
--- a/pelican/themes/simple/templates/page.html
+++ b/pelican/themes/simple/templates/page.html
@@ -6,7 +6,10 @@
     {{ translations.translations_for(page) }}
 
     {{ page.content }}
-	<p>
-	Last updated: {{ page.locale_modified }}
-	</p>
+
+	{% if page.modified %}
+		<p>
+		Last updated: {{ page.locale_modified }}
+		</p>
+	{% endif %}
 {% endblock %}
diff --git a/pelican/writers.py b/pelican/writers.py
index 43e6c5fe..30b0ed16 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -54,7 +54,7 @@ class Writer(object):
             description=item.get_content(self.site_url),
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', ''),
-            pubdate=set_date_tzinfo(item.modified,
+            pubdate=set_date_tzinfo(item.modified if hasattr(item, 'modified') else item.date,
                 self.settings.get('TIMEZONE', None)))
 
     def _open_w(self, filename, encoding, override=False):
diff --git a/samples/content/super_article.rst b/samples/content/super_article.rst
index 76e57683..a96176a1 100644
--- a/samples/content/super_article.rst
+++ b/samples/content/super_article.rst
@@ -3,6 +3,7 @@ This is a super article !
 
 :tags: foo, bar, foobar
 :date: 2010-12-02 10:14
+:modified: 2013-11-17 23:29
 :category: yeah
 :author: Alexis Métaireau
 :summary:

From 97766ba1f4856a5e511bc86d9644ef0e094e8807 Mon Sep 17 00:00:00 2001
From: Salil Panikkaveettil <salilpa007@gmail.com>
Date: Tue, 19 Nov 2013 16:49:37 +0530
Subject: [PATCH 1515/2864] For creating a CNAME, directory name should be
 extra

The name of the directory do not match subsequent commands. hence renaming extras to extra. A one character change
---
 docs/tips.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tips.rst b/docs/tips.rst
index b140ea3c..eb400124 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -79,7 +79,7 @@ To use a `custom domain
 <https://help.github.com/articles/setting-up-a-custom-domain-with-pages>`_ with
 GitHub Pages, you need to put the domain of your site (e.g.,
 ``blog.example.com``) inside a ``CNAME`` file at the root of your site. To do
-this, create the ``content/extras/`` directory and add a ``CNAME`` file to it.
+this, create the ``content/extra/`` directory and add a ``CNAME`` file to it.
 Then use the ``STATIC_PATHS`` setting to tell Pelican to copy this file to your
 output directory. For example::
 

From 1592a45db8539fc877fd8fc26f65169542a5325d Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Tue, 19 Nov 2013 17:41:33 +0000
Subject: [PATCH 1516/2864] Add 'adoc' as a file extension for asciidoc

This is to match the behaviour that GitHub have
---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 90a61d73..edb3db67 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -340,7 +340,7 @@ class AsciiDocReader(BaseReader):
     """Reader for AsciiDoc files"""
 
     enabled = bool(asciidoc)
-    file_extensions = ['asc', 'asciidoc']
+    file_extensions = ['asc', 'adoc', 'asciidoc']
     default_options = ["--no-header-footer", "-a newline=\\n"]
 
     def read(self, source_path):

From add9a0790d41a6820843e10b14ced553494ec739 Mon Sep 17 00:00:00 2001
From: Mitchell Tannenbaum <mitchtbaum@lavabit.com>
Date: Fri, 22 Nov 2013 19:31:09 -0500
Subject: [PATCH 1517/2864] Added ARCHIVES_URL to settings.rst

---
 docs/settings.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index c9482303..61ee7cc3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -264,6 +264,7 @@ Setting name (default value)                            What does it do?
                                                         templates. Where <DIRECT_TEMPLATE_NAME> is the
                                                         upper case template name.
 `ARCHIVES_SAVE_AS` (``'archives.html'``)                The location to save the article archives page.
+`ARCHIVES_URL` (``'archives.html'``)                    The URL to use for the article archives page.
 `YEAR_ARCHIVE_SAVE_AS` (False)                          The location to save per-year archives of your
                                                         posts.
 `MONTH_ARCHIVE_SAVE_AS` (False)                         The location to save per-month archives of your

From 83e4d35b44a422ee8d4b077f505970d03e555f45 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Tue, 26 Nov 2013 10:04:15 +0100
Subject: [PATCH 1518/2864] Produce inline links instead of references.

---
 docs/changelog.rst              | 1 +
 pelican/tools/pelican_import.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 976eecc8..5c8db17f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Next release
 
 * Added the `:modified:` metadata field to complement `:date:`.
   Used to specify the last date and time an article was updated independently from the date and time it was published.
+* Produce inline links instead of reference-style links when importing content.
 
 3.3.0 (2013-09-24)
 ==================
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 69e1f1b4..a5711b31 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -519,7 +519,7 @@ def fields2pelican(fields, out_markup, output_path,
 
 
             parse_raw = '--parse-raw' if not strip_raw else ''
-            cmd = ('pandoc --normalize --reference-links {0} --from=html'
+            cmd = ('pandoc --normalize {0} --from=html'
                    ' --to={1} -o "{2}" "{3}"').format(
                     parse_raw, out_markup, out_filename, html_filename)
 

From 082ce1dd1909c25bb7bc44229da6fdade803a10e Mon Sep 17 00:00:00 2001
From: Tommy George <github.com@tommygeorge.com>
Date: Tue, 3 Dec 2013 09:48:10 -0600
Subject: [PATCH 1519/2864] Update pelicanconf.py.in

pep8 issues
---
 pelican/tools/templates/pelicanconf.py.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in
index 00a7ec84..1a02a9de 100644
--- a/pelican/tools/templates/pelicanconf.py.in
+++ b/pelican/tools/templates/pelicanconf.py.in
@@ -18,10 +18,10 @@ CATEGORY_FEED_ATOM = None
 TRANSLATION_FEED_ATOM = None
 
 # Blogroll
-LINKS =  (('Pelican', 'http://getpelican.com/'),
-          ('Python.org', 'http://python.org/'),
-          ('Jinja2', 'http://jinja.pocoo.org/'),
-          ('You can modify those links in your config file', '#'),)
+LINKS = (('Pelican', 'http://getpelican.com/'),
+         ('Python.org', 'http://python.org/'),
+         ('Jinja2', 'http://jinja.pocoo.org/'),
+         ('You can modify those links in your config file', '#'),)
 
 # Social widget
 SOCIAL = (('You can add links in your config file', '#'),

From 4e6a600b97cb8bda0db8444dbf06b73db69befd8 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Wed, 4 Dec 2013 08:07:26 +0000
Subject: [PATCH 1520/2864] Link to PEP8 in CONTRIBUTING guide

It won't be obvious to a non-pythonist what this is.
---
 CONTRIBUTING.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index b28b22a3..fc8c71a4 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -10,7 +10,8 @@ Contribution submission guidelines
   For example, if you're hacking on a new feature and find a bugfix that
   doesn't *require* your new feature, **make a new distinct branch and pull
   request** for the bugfix.
-* Adhere to PEP8 coding standards whenever possible.
+* Adhere to [PEP8 coding standards](http://www.python.org/dev/peps/pep-0008/)
+  whenever possible.
 * Check for unnecessary whitespace via ``git diff --check`` before committing.
 * **Add docs and tests for your changes**.
 * `Run all the tests`_ **on both Python 2.7 and 3.3** to ensure nothing was

From 44ef4d3eaa8cf49f234a5907137249009ecf33b8 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Wed, 4 Dec 2013 08:10:26 +0000
Subject: [PATCH 1521/2864] Contributing document is reStructuredText not
 Markdown. Fix formatting

---
 CONTRIBUTING.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index fc8c71a4..9422176a 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -10,8 +10,7 @@ Contribution submission guidelines
   For example, if you're hacking on a new feature and find a bugfix that
   doesn't *require* your new feature, **make a new distinct branch and pull
   request** for the bugfix.
-* Adhere to [PEP8 coding standards](http://www.python.org/dev/peps/pep-0008/)
-  whenever possible.
+* Adhere to `PEP8 coding standards`_ whenever possible.
 * Check for unnecessary whitespace via ``git diff --check`` before committing.
 * **Add docs and tests for your changes**.
 * `Run all the tests`_ **on both Python 2.7 and 3.3** to ensure nothing was
@@ -39,3 +38,5 @@ need assistance or have any questions about these guidelines.
 .. _`Create a new git branch`: https://github.com/getpelican/pelican/wiki/Git-Tips#making-your-changes
 .. _`Run all the tests`: http://docs.getpelican.com/en/latest/contribute.html#running-the-test-suite
 .. _`Git Tips`: https://github.com/getpelican/pelican/wiki/Git-Tips
+.. _`PEP8 coding standards`: http://www.python.org/dev/peps/pep-0008/
+

From 301268f67f1a6751a3c9ac51d099fae10b808f8b Mon Sep 17 00:00:00 2001
From: Rob Iwancz <robulouski@gmail.com>
Date: Wed, 4 Dec 2013 22:26:39 +1100
Subject: [PATCH 1522/2864] Fixes issue in devserver introduced in v3.3

Fixes an intermittent devserver problem with directory urls
containing index.html (i.e. clean urls).  It tries to send the
index.html file twice, resulting in a scrambled web page complete
with HTTP headers in the output, and sometimes Broken Pipe errors.
---
 pelican/server.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pelican/server.py b/pelican/server.py
index 0f7472c5..5294e7dc 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -13,23 +13,26 @@ except ImportError:
     import socketserver  # NOQA
 
 PORT = len(sys.argv) == 2 and int(sys.argv[1]) or 8000
-SUFFIXES = ['','.html','/index.html']
+SUFFIXES = ['', '.html', '/index.html']
+
 
 class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
     def do_GET(self):
         # we are trying to detect the file by having a fallback mechanism
-        r = None
+        found = False
         for suffix in SUFFIXES:
             if not hasattr(self,'original_path'):
                 self.original_path = self.path
             self.path = self.original_path + suffix
             path = self.translate_path(self.path)
             if os.path.exists(path):
-                r = srvmod.SimpleHTTPRequestHandler.do_GET(self)
-            if r is not None:
+                srvmod.SimpleHTTPRequestHandler.do_GET(self)
+                logging.info("Found: %s" % self.path)
+                found = True
                 break
-            logging.warning("Unable to find %s file." % self.path)
-        return r
+            logging.info("Tried to find file %s, but it doesn't exist. " % self.path)
+        if not found:
+            logging.warning("Unable to find file %s or variations." % self.path)
 
 Handler = ComplexHTTPRequestHandler
 
@@ -45,4 +48,4 @@ try:
     httpd.serve_forever()
 except KeyboardInterrupt as e:
     logging.info("shutting down server")
-    httpd.socket.close()
\ No newline at end of file
+    httpd.socket.close()

From eeae09be5e6327d8e5dec0269dbd908648d1c79e Mon Sep 17 00:00:00 2001
From: Joe Shaw <joe@joeshaw.org>
Date: Wed, 4 Dec 2013 09:45:33 -0500
Subject: [PATCH 1523/2864] wordpress importer: fallback onto wp:post_id if
 wp:post_name is empty

---
 pelican/tools/pelican_import.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index a5711b31..e3599f0e 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -126,6 +126,9 @@ def wp2fields(xml):
             content = item.find('encoded').string
             filename = item.find('post_name').string
 
+            if filename is None:
+                filename = item.find('post_id').string
+
             raw_date = item.find('post_date').string
             date_object = time.strptime(raw_date, "%Y-%m-%d %H:%M:%S")
             date = time.strftime("%Y-%m-%d %H:%M", date_object)

From c9b84abe46fae6c921c36ea1bffd86fadbafd478 Mon Sep 17 00:00:00 2001
From: Jamie Culpon <jculpon@gmail.com>
Date: Wed, 4 Dec 2013 09:32:52 -0800
Subject: [PATCH 1524/2864] Make marking articles as drafts case-insensitive

Previously if you tried to mark an article as a draft by using a different
casing (for example, draft) you would get a warning when building:
`Unknown status Draft for file foo.md, skipping it.` This uses a
case-insensitive comparison when looking at article status instead. I
believe this behavior is a little easier for new Pelican users.
---
 pelican/generators.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 00801697..2fbb0e1c 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -407,9 +407,9 @@ class ArticlesGenerator(Generator):
 
             self.add_source_path(article)
 
-            if article.status == "published":
+            if article.status.lower() == "published":
                 all_articles.append(article)
-            elif article.status == "draft":
+            elif article.status.lower() == "draft":
                 self.drafts.append(article)
             else:
                 logger.warning("Unknown status %s for file %s, skipping it." %

From c495502c8fd3e20168f3c990317010b2ead7c1af Mon Sep 17 00:00:00 2001
From: Jamie Culpon <jculpon@gmail.com>
Date: Fri, 6 Dec 2013 17:39:51 -0800
Subject: [PATCH 1525/2864] Support publishing to personal pages sites in
 quickstart

Previously pelican-quickstart would assume that the site it created for GitHub
Pages should be published to the gh-pages branch. This is correct for project
pages, but not correct for personal pages. Personal pages, which live in a
user's special username.github.io repository, are instead deployed to the
master branch. This means that if you did pelican-quickstart and tried to
publish your new personal site with make github you'd see nothing (or whatever
old pages site you had floating around in master).

ghp-import already supports publishing to different branches, so publishing
to the correct branch is just a matter of correct configuration and updating
the Makefile to pass the branch along to ghp-import. pelican-quickstart now
asks if the user wants to publish to GitHub Pages, and if so, asks if this
is a personal page and chooses the correct branch appropriately. I preferred
this approach to prompting for an arbitrary branch because I felt that
choosing the branch would feel more intimidating to someone using
pelican-quickstart for the first time.

This essentially ports changes I made to my personal pages site at
jculpon@82cae477a9e8712b90654f6432464369ebcc7ae5
---
 pelican/tools/pelican_quickstart.py | 11 +++++++++++
 pelican/tools/templates/Makefile.in |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index ba11d968..bb5ad1d1 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -15,6 +15,11 @@ from pelican import __version__
 _TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                               "templates")
 
+_GITHUB_PAGES_BRANCHES = {
+    'personal': 'master',
+    'project': 'gh-pages'
+}
+
 CONF = {
     'pelican': 'pelican',
     'pelicanopts': '',
@@ -31,6 +36,7 @@ CONF = {
     'cloudfiles_api_key': 'my_rackspace_api_key',
     'cloudfiles_container': 'my_cloudfiles_container',
     'dropbox_dir': '~/Dropbox/Public/',
+    'github_pages_branch': _GITHUB_PAGES_BRANCHES['project'],
     'default_pagination': 10,
     'siteurl': '',
     'lang': 'en'
@@ -217,6 +223,11 @@ needed by Pelican.
             CONF['cloudfiles_username'] = ask('What is your Rackspace Cloud username?', str_compat, CONF['cloudfiles_username'])
             CONF['cloudfiles_api_key'] = ask('What is your Rackspace Cloud API key?', str_compat, CONF['cloudfiles_api_key'])
             CONF['cloudfiles_container'] = ask('What is the name of your Cloud Files container?', str_compat, CONF['cloudfiles_container'])
+        if ask('Do you want to upload your website using GitHub Pages?', answer=bool, default=False):
+            if ask('Is this your personal page (username.github.io)?', answer=bool, default=False):
+                CONF['github_pages_branch'] = _GITHUB_PAGES_BRANCHES['personal']
+            else:
+                CONF['github_pages_branch'] = _GITHUB_PAGES_BRANCHES['project']
 
     try:
         os.makedirs(os.path.join(CONF['basedir'], 'content'))
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 524bf82e..38b8b82a 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -24,6 +24,8 @@ CLOUDFILES_CONTAINER=$cloudfiles_container
 
 DROPBOX_DIR=$dropbox_dir
 
+GITHUB_PAGES_BRANCH=$github_pages_branch
+
 DEBUG ?= 0
 ifeq ($(DEBUG), 1)
 	PELICANOPTS += -D
@@ -101,7 +103,7 @@ cf_upload: publish
 	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
 
 github: publish
-	ghp-import $$(OUTPUTDIR)
-	git push origin gh-pages
+	ghp-import -b $(GITHUB_PAGES_BRANCH) $$(OUTPUTDIR)
+	git push origin $(GITHUB_PAGES_BRANCH)
 
 .PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github

From 7da0506f2d8668a2c8013597482213f4d3422a07 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sat, 7 Dec 2013 17:35:54 +0100
Subject: [PATCH 1526/2864] Fix `utils.copy` for copying files, add unit tests

`copy('', 'a/b.ext0', 'c/d.ext1')` is copying `a/b.ext0` into `c/d.ext1/b.ext0`
(creating folder `c/d.ext1` in the process) instead of `c/d.ext1`.
Bug introduced by e03cf3f51735d5387fee7064cae89aaa1d34a0a6.
---
 pelican/tests/test_utils.py | 93 +++++++++++++++++++++++++++++++++++++
 pelican/utils.py            |  2 +-
 2 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 0642926e..d35bbb98 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -323,6 +323,99 @@ class TestUtils(LoggedTestCase):
         locale.setlocale(locale.LC_TIME, old_locale)
 
 
+class TestCopy(unittest.TestCase):
+    '''Tests the copy utility'''
+
+    def setUp(self):
+        self.root_dir = mkdtemp(prefix='pelicantests.')
+
+    def tearDown(self):
+        shutil.rmtree(self.root_dir)
+
+    def _create_file(self, *path):
+        with open(os.path.join(self.root_dir, *path), 'w') as f:
+            f.write('42\n')
+
+    def _create_dir(self, *path):
+        os.makedirs(os.path.join(self.root_dir, *path))
+
+    def _exist_file(self, *path):
+        path = os.path.join(self.root_dir, *path)
+        self.assertTrue(os.path.isfile(path), 'File does not exist: %s' % path)
+
+    def _exist_dir(self, *path):
+        path = os.path.join(self.root_dir, *path)
+        self.assertTrue(os.path.exists(path),
+                        'Directory does not exist: %s' % path)
+
+    def test_copy_file_same_path(self):
+        self._create_file('a.txt')
+        utils.copy('',
+                   os.path.join(self.root_dir, 'a.txt'),
+                   os.path.join(self.root_dir, 'b.txt')
+                   )
+        self._exist_file('b.txt')
+
+    def test_copy_file_different_path(self):
+        self._create_dir('a')
+        self._create_dir('b')
+        self._create_file('a', 'a.txt')
+        utils.copy('',
+                   os.path.join(self.root_dir, 'a', 'a.txt'),
+                   os.path.join(self.root_dir, 'b', 'b.txt')
+                   )
+        self._exist_dir('b')
+        self._exist_file('b', 'b.txt')
+
+    def test_copy_file_create_dirs(self):
+        self._create_file('a.txt')
+        utils.copy('',
+                   os.path.join(self.root_dir, 'a.txt'),
+                   os.path.join(self.root_dir, 'b0', 'b1', 'b2', 'b3', 'b.txt')
+                   )
+        self._exist_dir('b0')
+        self._exist_dir('b0', 'b1')
+        self._exist_dir('b0', 'b1', 'b2')
+        self._exist_dir('b0', 'b1', 'b2', 'b3')
+        self._exist_file('b0', 'b1', 'b2', 'b3', 'b.txt')
+
+    def test_copy_dir_same_path(self):
+        self._create_dir('a')
+        self._create_file('a', 'a.txt')
+        utils.copy('',
+                   os.path.join(self.root_dir, 'a'),
+                   os.path.join(self.root_dir, 'b')
+                   )
+        self._exist_dir('b')
+        self._exist_file('b', 'a.txt')
+
+    def test_copy_dir_different_path(self):
+        self._create_dir('a0')
+        self._create_dir('a0', 'a1')
+        self._create_file('a0', 'a1', 'a.txt')
+        self._create_dir('b0')
+        utils.copy('',
+                   os.path.join(self.root_dir, 'a0', 'a1'),
+                   os.path.join(self.root_dir, 'b0', 'b1')
+                   )
+        self._exist_dir('b0', 'b1')
+        self._exist_file('b0', 'b1', 'a.txt')
+
+    def test_copy_dir_create_dirs(self):
+        self._create_dir('a')
+        self._create_file('a', 'a.txt')
+        utils.copy('',
+                   os.path.join(self.root_dir, 'a'),
+                   os.path.join(self.root_dir, 'b0', 'b1', 'b2', 'b3', 'b')
+                   )
+        self._exist_dir('b0')
+        self._exist_dir('b0', 'b1')
+        self._exist_dir('b0', 'b1', 'b2')
+        self._exist_dir('b0', 'b1', 'b2', 'b3')
+        self._exist_dir('b0', 'b1', 'b2', 'b3', 'b')
+        self._exist_file('b0', 'b1', 'b2', 'b3', 'b', 'a.txt')
+
+
 class TestDateFormatter(unittest.TestCase):
     '''Tests that the output of DateFormatter jinja filter is same as
     utils.strftime'''
diff --git a/pelican/utils.py b/pelican/utils.py
index 4b25ec7f..7de1457d 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -273,7 +273,7 @@ def copy(path, source, destination, destination_path=None):
     destination_ = os.path.abspath(
         os.path.expanduser(os.path.join(destination, destination_path)))
 
-    if not os.path.exists(destination_):
+    if not os.path.exists(destination_) and not os.path.isfile(source_):
         os.makedirs(destination_)
 
     def recurse(source, destination):

From fd7fc2e2028c177132266a787f9b41b2de68b86e Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sat, 7 Dec 2013 21:11:15 +0100
Subject: [PATCH 1527/2864] Simplify usage of `utils.copy`

Remove confusing parameters, clarify usage in __doc__
---
 pelican/generators.py       | 10 +++++++---
 pelican/tests/test_utils.py | 36 ++++++++++++------------------------
 pelican/utils.py            | 19 ++++++++-----------
 3 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 2fbb0e1c..89d974c6 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -550,8 +550,12 @@ class StaticGenerator(Generator):
             final_path=None):
         """Copy all the paths from source to destination"""
         for path in paths:
-            copy(path, source, os.path.join(output_path, destination),
-                 final_path)
+            if final_path:
+                copy(os.path.join(source, path),
+                     os.path.join(output_path, destination, final_path))
+            else:
+                copy(os.path.join(source, path),
+                     os.path.join(output_path, destination, path))
 
     def generate_context(self):
         self.staticfiles = []
@@ -592,7 +596,7 @@ class SourceFileGenerator(Generator):
         output_path, _ = os.path.splitext(obj.save_as)
         dest = os.path.join(self.output_path,
                             output_path + self.output_extension)
-        copy('', obj.source_path, dest)
+        copy(obj.source_path, dest)
 
     def generate_output(self, writer=None):
         logger.info(' Generating source files...')
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index d35bbb98..9b0659e7 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -350,29 +350,23 @@ class TestCopy(unittest.TestCase):
 
     def test_copy_file_same_path(self):
         self._create_file('a.txt')
-        utils.copy('',
-                   os.path.join(self.root_dir, 'a.txt'),
-                   os.path.join(self.root_dir, 'b.txt')
-                   )
+        utils.copy(os.path.join(self.root_dir, 'a.txt'),
+                   os.path.join(self.root_dir, 'b.txt'))
         self._exist_file('b.txt')
 
     def test_copy_file_different_path(self):
         self._create_dir('a')
         self._create_dir('b')
         self._create_file('a', 'a.txt')
-        utils.copy('',
-                   os.path.join(self.root_dir, 'a', 'a.txt'),
-                   os.path.join(self.root_dir, 'b', 'b.txt')
-                   )
+        utils.copy(os.path.join(self.root_dir, 'a', 'a.txt'),
+                   os.path.join(self.root_dir, 'b', 'b.txt'))
         self._exist_dir('b')
         self._exist_file('b', 'b.txt')
 
     def test_copy_file_create_dirs(self):
         self._create_file('a.txt')
-        utils.copy('',
-                   os.path.join(self.root_dir, 'a.txt'),
-                   os.path.join(self.root_dir, 'b0', 'b1', 'b2', 'b3', 'b.txt')
-                   )
+        utils.copy(os.path.join(self.root_dir, 'a.txt'),
+                   os.path.join(self.root_dir, 'b0', 'b1', 'b2', 'b3', 'b.txt'))
         self._exist_dir('b0')
         self._exist_dir('b0', 'b1')
         self._exist_dir('b0', 'b1', 'b2')
@@ -382,10 +376,8 @@ class TestCopy(unittest.TestCase):
     def test_copy_dir_same_path(self):
         self._create_dir('a')
         self._create_file('a', 'a.txt')
-        utils.copy('',
-                   os.path.join(self.root_dir, 'a'),
-                   os.path.join(self.root_dir, 'b')
-                   )
+        utils.copy(os.path.join(self.root_dir, 'a'),
+                   os.path.join(self.root_dir, 'b'))
         self._exist_dir('b')
         self._exist_file('b', 'a.txt')
 
@@ -394,20 +386,16 @@ class TestCopy(unittest.TestCase):
         self._create_dir('a0', 'a1')
         self._create_file('a0', 'a1', 'a.txt')
         self._create_dir('b0')
-        utils.copy('',
-                   os.path.join(self.root_dir, 'a0', 'a1'),
-                   os.path.join(self.root_dir, 'b0', 'b1')
-                   )
+        utils.copy(os.path.join(self.root_dir, 'a0', 'a1'),
+                   os.path.join(self.root_dir, 'b0', 'b1'))
         self._exist_dir('b0', 'b1')
         self._exist_file('b0', 'b1', 'a.txt')
 
     def test_copy_dir_create_dirs(self):
         self._create_dir('a')
         self._create_file('a', 'a.txt')
-        utils.copy('',
-                   os.path.join(self.root_dir, 'a'),
-                   os.path.join(self.root_dir, 'b0', 'b1', 'b2', 'b3', 'b')
-                   )
+        utils.copy(os.path.join(self.root_dir, 'a'),
+                   os.path.join(self.root_dir, 'b0', 'b1', 'b2', 'b3', 'b'))
         self._exist_dir('b0')
         self._exist_dir('b0', 'b1')
         self._exist_dir('b0', 'b1', 'b2')
diff --git a/pelican/utils.py b/pelican/utils.py
index 7de1457d..822e50e9 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -256,22 +256,19 @@ def slugify(value, substitutions=()):
     return value.decode('ascii')
 
 
-def copy(path, source, destination, destination_path=None):
-    """Copy path from origin to destination.
+def copy(source, destination):
+    """Recursively copy source into destination.
+
+    If source is a file, destination has to be a file as well.
 
     The function is able to copy either files or directories.
 
-    :param path: the path to be copied from the source to the destination
-    :param source: the source dir
-    :param destination: the destination dir
-    :param destination_path: the destination path (optional)
+    :param source: the source file or directory
+    :param destination: the destination file or directory
     """
-    if not destination_path:
-        destination_path = path
 
-    source_ = os.path.abspath(os.path.expanduser(os.path.join(source, path)))
-    destination_ = os.path.abspath(
-        os.path.expanduser(os.path.join(destination, destination_path)))
+    source_ = os.path.abspath(os.path.expanduser(source))
+    destination_ = os.path.abspath(os.path.expanduser(destination))
 
     if not os.path.exists(destination_) and not os.path.isfile(source_):
         os.makedirs(destination_)

From da690dfc37ee516195b71f849f054354317e07f1 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Mon, 9 Dec 2013 18:09:34 +0000
Subject: [PATCH 1528/2864] Python-Markdown quote's URL's, we need to unquote
 to use on filesystem

Fixes #1143
Closes #1095
Closes #1149
---
 pelican/contents.py            |  7 +++++++
 pelican/tests/test_contents.py | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/pelican/contents.py b/pelican/contents.py
index 6fb55782..51ef8a22 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
 import six
+from six.moves.urllib.parse import unquote
 
 import copy
 import locale
@@ -215,6 +216,12 @@ class Content(object):
                         os.path.join(self.relative_dir, path)
                     )
 
+                if path not in self._context['filenames']:
+                    unquoted_path = path.replace('%20', ' ')
+
+                    if unquoted_path in self._context['filenames']:
+                        path = unquoted_path
+
                 if path in self._context['filenames']:
                     origin = '/'.join((siteurl,
                              self._context['filenames'][path].url))
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 92e61355..5a9ff581 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -323,6 +323,29 @@ class TestPage(unittest.TestCase):
             '<blockquote cite="http://notmyidea.org/reference.html">blah blah</blockquote>'
         )
 
+    def test_intrasite_link_markdown_spaces(self):
+        # Markdown introduces %20 instead of spaces, this tests that
+        # we support markdown doing this.
+        cls_name = '_DummyArticle' if six.PY3 else b'_DummyArticle'
+        article = type(cls_name, (object,), {'url': 'article-spaces.html'})
+
+        args = self.page_kwargs.copy()
+        args['settings'] = get_settings()
+        args['source_path'] = 'content'
+        args['context']['filenames'] = {'article spaces.rst': article}
+
+        # An intrasite link via filename with %20 as a space
+        args['content'] = (
+            'A simple test, with a '
+            '<a href="|filename|article%20spaces.rst">link</a>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(
+            content,
+            'A simple test, with a '
+            '<a href="http://notmyidea.org/article-spaces.html">link</a>'
+        )
+
 
 class TestArticle(TestPage):
     def test_template(self):

From 3715749cc60cd71ac8f84c1d1201c5762a83fc3d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 11 Dec 2013 21:09:02 -0800
Subject: [PATCH 1529/2864] Minor wording changes in develop_server.sh

---
 pelican/tools/templates/develop_server.sh.in | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index 16b61518..195d9d6e 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -19,10 +19,10 @@ PELICAN_PID=$$BASEDIR/pelican.pid
 
 function usage(){
   echo "usage: $$0 (stop) (start) (restart) [port]"
-  echo "This starts pelican in debug and reload mode and then launches"
-  echo "A pelican.server to help site development. It doesn't read"
-  echo "your pelican options so you edit any paths in your Makefile"
-  echo "you will need to edit it as well"
+  echo "This starts Pelican in debug and reload mode and then launches"
+  echo "an HTTP server to help site development. It doesn't read"
+  echo "your Pelican settings, so if you edit any paths in your Makefile"
+  echo "you will need to edit your settings as well."
   exit 3
 }
 
@@ -34,14 +34,14 @@ function shut_down(){
   PID=$$(cat $$SRV_PID)
   if [[ $$? -eq 0 ]]; then
     if alive $PID; then
-      echo "Killing pelican.server"
+      echo "Stopping HTTP server"
       kill $$PID
     else
       echo "Stale PID, deleting"
     fi
     rm $$SRV_PID
   else
-    echo "pelican.server PIDFile not found"
+    echo "HTTP server PIDFile not found"
   fi
 
   PID=$$(cat $$PELICAN_PID)
@@ -60,7 +60,7 @@ function shut_down(){
 
 function start_up(){
   local port=$$1
-  echo "Starting up Pelican and pelican.server"
+  echo "Starting up Pelican and HTTP server"
   shift
   $$PELICAN --debug --autoreload -r $$INPUTDIR -o $$OUTPUTDIR -s $$CONFFILE $$PELICANOPTS &
   pelican_pid=$$!
@@ -72,13 +72,13 @@ function start_up(){
   cd $$BASEDIR
   sleep 1
   if ! alive $$pelican_pid ; then
-    echo "Pelican didn't start. Is the pelican package installed?"
+    echo "Pelican didn't start. Is the Pelican package installed?"
     return 1
   elif ! alive $$srv_pid ; then
-    echo "pelican.server didn't start. Is there something else which uses port 8000?"
+    echo "The HTTP server didn't start. Is there another service using port 8000?"
     return 1
   fi
-  echo 'Pelican and pelican.server processes now running in background.'
+  echo 'Pelican and HTTP server processes now running in background.'
 }
 
 ###
@@ -95,7 +95,7 @@ elif [[ $$1 == "restart" ]]; then
   start_up $$port
 elif [[ $$1 == "start" ]]; then
   if ! start_up $$port; then
-    shut_down 
+    shut_down
   fi
 else
   usage

From 1976eac1bf5ccba6d7b3da0d4a97d249acb0b73b Mon Sep 17 00:00:00 2001
From: Michael Hrivnak <mhrivnak@hrivnak.org>
Date: Sun, 15 Dec 2013 21:13:03 -0500
Subject: [PATCH 1530/2864] Fixing a typo in documentation

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index 35e859d5..43193e9e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -56,7 +56,7 @@ For a more immediate response, you can also join the team via IRC at
 `#pelican on Freenode`_ — if you don't have an IRC client handy, use the
 webchat_ for quick feedback. If you ask a question via IRC and don't get an
 immediate response, don't leave the channel! It may take a few hours because
-of time zone differences, but f you are patient and remain in the channel,
+of time zone differences, but if you are patient and remain in the channel,
 someone will almost always respond to your inquiry.
 
 Documentation

From 71103ef2c1131c442e350eff12b62db872285798 Mon Sep 17 00:00:00 2001
From: wvi <vilibald.wanca@gmail.com>
Date: Mon, 23 Dec 2013 21:32:10 +0100
Subject: [PATCH 1531/2864] Fix #1182#

---
 pelican/tools/pelican_quickstart.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index bb5ad1d1..b7ebd081 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -186,7 +186,8 @@ needed by Pelican.
         print('Using project associated with current virtual environment.'
               'Will save to:\n%s\n' % CONF['basedir'])
     else:
-        CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new web site?', answer=str_compat, default=args.path))
+        CONF['basedir'] = os.path.abspath(os.path.expanduser(
+            ask('Where do you want to create your new web site?', answer=str_compat, default=args.path)))
 
     CONF['sitename'] = ask('What will be the title of this web site?', answer=str_compat, default=args.title)
     CONF['author'] = ask('Who will be the author of this web site?', answer=str_compat, default=args.author)

From 786a209d2b1156095048087cb727a41df7562f14 Mon Sep 17 00:00:00 2001
From: Tom Yubing Dong <tom.tung.dyb@gmail.com>
Date: Thu, 26 Dec 2013 22:30:54 +0800
Subject: [PATCH 1532/2864] `ctrl+c` now correctly terminates `fab serve`

Previously `ctrl+c` a `fab serve` wouldn't necessarily terminate the web server. Even if it does, re-using the command `fab serve` might result in the following error:

```
socket.error: [Errno 48] Address already in use
```

This fix manually creates a `TCPServer` with `allow_reuse_address` set to `True`, which solves this issue.

Tested on OS X 10.9.1.
---
 pelican/tools/templates/fabfile.py.in | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.in
index 73c64ac8..fb56ae85 100644
--- a/pelican/tools/templates/fabfile.py.in
+++ b/pelican/tools/templates/fabfile.py.in
@@ -1,6 +1,9 @@
 from fabric.api import *
 import fabric.contrib.project as project
 import os
+import sys
+import SimpleHTTPServer
+import SocketServer
 
 # Local path configuration (can be absolute or relative to fabfile)
 env.deploy_path = 'output'
@@ -32,7 +35,16 @@ def regenerate():
     local('pelican -r -s pelicanconf.py')
 
 def serve():
-    local('cd {deploy_path} && python -m SimpleHTTPServer'.format(**env))
+    os.chdir(env.deploy_path)
+    
+    PORT = 8000
+    class AddressReuseTCPServer(SocketServer.TCPServer):
+        allow_reuse_address = True
+    
+    server = AddressReuseTCPServer(('', PORT), SimpleHTTPServer.SimpleHTTPRequestHandler)
+    
+    sys.stderr.write('Serving on port {0} ...\n'.format(PORT))
+    server.serve_forever()
 
 def reserve():
     build()

From d935af3229e9050315b152a2ad35404f20aae3b5 Mon Sep 17 00:00:00 2001
From: Tom Yubing Dong <tom.tung.dyb@gmail.com>
Date: Fri, 27 Dec 2013 15:36:34 +0800
Subject: [PATCH 1533/2864] Update settings.rst to match tag cloud code

According to the implementation, the value of `tag.1` should be between 1 and `TAG_CLOUD_STEPS`, inclusive.

See:
https://github.com/getpelican/pelican/blob/master/pelican/generators.py#L457
---
 docs/settings.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 61ee7cc3..30353644 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -539,8 +539,8 @@ The default theme does not include a tag cloud, but it is pretty easy to add one
         {% endfor %}
     </ul>
 
-You should then also define CSS styles with appropriate classes (tag-0 to tag-N,
-where N matches ``TAG_CLOUD_STEPS`` -1), tag-0 being the most frequent, and
+You should then also define CSS styles with appropriate classes (tag-1 to tag-N,
+where N matches ``TAG_CLOUD_STEPS``), tag-1 being the most frequent, and
 define a ``ul.tagcloud`` class with appropriate list-style to create the cloud.
 For example::
 
@@ -553,11 +553,11 @@ For example::
         display: inline-block;
     }
 
-    li.tag-0 {
+    li.tag-1 {
         font-size: 150%;
     }
 
-    li.tag-1 {
+    li.tag-2 {
         font-size: 120%;
     }
 

From f750f38d60f8cb25c94685b3b01b31a2cde9cb32 Mon Sep 17 00:00:00 2001
From: Stefan hr Berder <hr@bonz.org>
Date: Thu, 2 Jan 2014 18:43:45 +0100
Subject: [PATCH 1534/2864] add a signal on article writing

---
 docs/plugins.rst      | 49 ++++++++++++++++++++++---------------------
 pelican/generators.py |  1 +
 pelican/signals.py    |  1 +
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 5e311fb6..5a4bca22 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -62,30 +62,31 @@ List of signals
 
 Here is the list of currently implemented signals:
 
-=============================   ============================   ===========================================================================
-Signal                          Arguments                       Description
-=============================   ============================   ===========================================================================
-initialized                     pelican object
-finalized                       pelican object                  invoked after all the generators are executed and just before pelican exits
-                                                                usefull for custom post processing actions, such as:
-                                                                - minifying js/css assets.
-                                                                - notify/ping search engines with an updated sitemap.
-generator_init                  generator                       invoked in the Generator.__init__
-readers_init                    readers                         invoked in the Readers.__init__
-article_generator_context        article_generator, metadata
-article_generator_preread        article_generator               invoked before a article is read in ArticlesGenerator.generate_context;
-                                                                use if code needs to do something before every article is parsed
-article_generator_init          article_generator               invoked in the ArticlesGenerator.__init__
-article_generator_finalized     article_generator               invoked at the end of ArticlesGenerator.generate_context
-get_generators                  generators                      invoked in Pelican.get_generator_classes,
-                                                                can return a Generator, or several
-                                                                generator in a tuple or in a list.
-page_generator_context          page_generator, metadata
-page_generator_init             page_generator                  invoked in the PagesGenerator.__init__
-page_generator_finalized        page_generator                  invoked at the end of PagesGenerator.generate_context
-content_object_init             content_object                  invoked at the end of Content.__init__ (see note below)
-content_written                 path, context                   invoked each time a content file is written.
-=============================   ============================   ===========================================================================
+=================================   ============================   ===========================================================================
+Signal                              Arguments                       Description
+=================================   ============================   ===========================================================================
+initialized                         pelican object
+finalized                           pelican object                 invoked after all the generators are executed and just before pelican exits
+                                                                   usefull for custom post processing actions, such as:
+                                                                   - minifying js/css assets.
+                                                                   - notify/ping search engines with an updated sitemap.
+generator_init                      generator                      invoked in the Generator.__init__
+readers_init                        readers                        invoked in the Readers.__init__
+article_generator_context           article_generator, metadata
+article_generator_preread           article_generator              invoked before a article is read in ArticlesGenerator.generate_context;
+                                                                   use if code needs to do something before every article is parsed
+article_generator_init              article_generator              invoked in the ArticlesGenerator.__init__
+article_generator_finalized         article_generator              invoked at the end of ArticlesGenerator.generate_context
+article_generator_write_article     article_generator, content     invoked before writing each article, the article is passed as content
+get_generators                      generators                     invoked in Pelican.get_generator_classes,
+                                                                   can return a Generator, or several
+                                                                   generator in a tuple or in a list.
+page_generator_context              page_generator, metadata
+page_generator_init                 page_generator                 invoked in the PagesGenerator.__init__
+page_generator_finalized            page_generator                 invoked at the end of PagesGenerator.generate_context
+content_object_init                 content_object                 invoked at the end of Content.__init__ (see note below)
+content_written                     path, context                  invoked each time a content file is written.
+=================================   ============================   ===========================================================================
 
 The list is currently small, so don't hesitate to add signals and make a pull
 request if you need them!
diff --git a/pelican/generators.py b/pelican/generators.py
index 2fbb0e1c..01731efd 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -265,6 +265,7 @@ class ArticlesGenerator(Generator):
     def generate_articles(self, write):
         """Generate the articles."""
         for article in chain(self.translations, self.articles):
+            signals.article_generator_write_article.send(self, content=article)
             write(article.save_as, self.get_template(article.template),
                 self.context, article=article, category=article.category,
                 override_output=hasattr(article, 'override_save_as'))
diff --git a/pelican/signals.py b/pelican/signals.py
index e92272c9..8fc1d7eb 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -18,6 +18,7 @@ generator_init = signal('generator_init')
 
 article_generator_init = signal('article_generator_init')
 article_generator_finalized = signal('article_generator_finalized')
+article_generator_write_article = signal('article_generator_write_article')
 
 page_generator_init = signal('page_generator_init')
 page_generator_finalized = signal('page_generator_finalized')

From 505852c04c7bd61b44dadc3510ea9fc9d230ce57 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 3 Jan 2014 08:51:52 -0800
Subject: [PATCH 1535/2864] Use the actively maintained typogrify-web package

The Typogrify library is no longer actively maintained by the
original author. These changes switch Pelican over to a new fork that
will receive more consistent updates going forward.
---
 dev_requirements.txt     | 2 +-
 docs/changelog.rst       | 2 ++
 docs/getting_started.rst | 4 ++--
 docs/settings.rst        | 4 ++--
 tox.ini                  | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index c90ac630..b013a00d 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -5,7 +5,7 @@ mock
 Markdown
 BeautifulSoup4
 lxml
-typogrify
+typogrify-web
 
 # To perform release
 bumpr==0.2.0
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5c8db17f..1e064e5f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,8 @@ Release history
 Next release
 ============
 
+* Replace the neglected ``typogrify`` package with the actively-maintained
+  ``typogrify-web`` package.
 * Added the `:modified:` metadata field to complement `:date:`.
   Used to specify the last date and time an article was updated independently from the date and time it was published.
 * Produce inline links instead of reference-style links when importing content.
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 4860576c..593b2e35 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -136,8 +136,8 @@ manually via ``pip``:
 
 * `markdown <http://pypi.python.org/pypi/Markdown>`_, for supporting Markdown as
   an input format
-* `typogrify <http://pypi.python.org/pypi/typogrify>`_, for typographical
-  enhancements
+* `typogrify-web <http://pypi.python.org/pypi/typogrify-web>`_, for
+  typographical enhancements
 
 Kickstart your site
 ===================
diff --git a/docs/settings.rst b/docs/settings.rst
index 61ee7cc3..e33d8e09 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -133,8 +133,8 @@ Setting name (default value)                                            What doe
                                                                         section below for more info.
 `TYPOGRIFY` (``False``)                                                 If set to True, several typographical improvements will be
                                                                         incorporated into the generated HTML via the `Typogrify
-                                                                        <http://static.mintchaos.com/projects/typogrify/>`_
-                                                                        library, which can be installed via: ``pip install typogrify``
+                                                                        <https://pypi.python.org/pypi/typogrify-web>`_ library,
+                                                                        which can be installed via: ``pip install typogrify-web``
 `DIRECT_TEMPLATES` (``('index', 'tags', 'categories', 'archives')``)    List of templates that are used directly to render
                                                                         content. Typically direct templates are used to generate
                                                                         index pages for collections of content (e.g., tags and
diff --git a/tox.ini b/tox.ini
index 440216cf..70f9fe92 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ deps =
     mock
     Markdown
     BeautifulSoup4
-    typogrify
+    typogrify-web
     lxml
 
 [testenv:py33]
@@ -22,5 +22,5 @@ deps =
     mock
     Markdown
     BeautifulSoup4
-    git+https://github.com/dmdm/typogrify.git@py3k#egg=typogrify
+    typogrify-web
     lxml

From 127f60c3e9365110b58e06261fde65a40976272d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 3 Jan 2014 14:27:19 -0800
Subject: [PATCH 1536/2864] Update Travis config with new Typogrify package

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62373e68..2f310328 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,7 @@ before_install:
  - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install typogrify ; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then pip install git+https://github.com/dmdm/typogrify.git@py3k#egg=typogrify; fi
-    - pip install mock nose nose-cov Markdown
+    - pip install mock nose nose-cov Markdown typogrify-web
     - pip install .
 script: nosetests -sv --with-coverage --cover-package=pelican pelican
 after_success:

From fb1cfc35bf5e9c899946b2d21741468879785a90 Mon Sep 17 00:00:00 2001
From: Iuri de Silvio <iurisilvio@gmail.com>
Date: Sun, 5 Jan 2014 18:15:45 -0200
Subject: [PATCH 1537/2864] Change CATEGORIES_URL and CATEGORIES_SAVE_AS docs
 to make it consistent with TAGS_URL and TAGS_SAVE_AS.

Add default values to CATEGORIES_URL and CATEGORIES_SAVE_AS.
---
 docs/settings.rst   | 4 ++--
 pelican/settings.py | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e33d8e09..30507efd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -248,8 +248,8 @@ Setting name (default value)                            What does it do?
                                                         use the default language.
 `PAGE_LANG_SAVE_AS` (``'pages/{slug}-{lang}.html'``)    The location we will save the page which doesn't
                                                         use the default language.
-`CATEGORIES_URL` (``'categories/'``)                    The URL to use for the category list.
-`CATEGORIES_SAVE_AS` (``'categories/index.html'``)      The location to save the category list.
+`CATEGORIES_URL` (``'categories.html'``)                The URL to use for the category list.
+`CATEGORIES_SAVE_AS` (``'categories.html'``)            The location to save the category list.
 `CATEGORY_URL` (``'category/{slug}.html'``)             The URL to use for a category.
 `CATEGORY_SAVE_AS` (``'category/{slug}.html'``)         The location to save a category.
 `TAG_URL` (``'tag/{slug}.html'``)                       The URL to use for a tag.
diff --git a/pelican/settings.py b/pelican/settings.py
index 99828935..8cbc4694 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -68,6 +68,8 @@ DEFAULT_CONFIG = {
     'PDF_GENERATOR': False,
     'PDF_STYLE_PATH': '',
     'PDF_STYLE': 'twelvepoint',
+    'CATEGORIES_URL': 'categories.html',
+    'CATEGORIES_SAVE_AS': 'categories.html',
     'CATEGORY_URL': 'category/{slug}.html',
     'CATEGORY_SAVE_AS': os.path.join('category', '{slug}.html'),
     'TAG_URL': 'tag/{slug}.html',

From c90a62ea133989800ad6040caaf9ceee27e1b7a7 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Thu, 26 Dec 2013 00:02:06 +0100
Subject: [PATCH 1538/2864] pep8 fixes

---
 pelican/generators.py | 83 ++++++++++++++++++++++---------------------
 pelican/writers.py    | 19 +++++-----
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 01731efd..b7612fa2 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -255,20 +255,22 @@ class ArticlesGenerator(Generator):
             for lang, items in translations_feeds.items():
                 items.sort(key=attrgetter('date'), reverse=True)
                 if self.settings.get('TRANSLATION_FEED_ATOM'):
-                    writer.write_feed(items, self.context,
-                            self.settings['TRANSLATION_FEED_ATOM'] % lang)
+                    writer.write_feed(
+                        items, self.context,
+                        self.settings['TRANSLATION_FEED_ATOM'] % lang)
                 if self.settings.get('TRANSLATION_FEED_RSS'):
-                    writer.write_feed(items, self.context,
-                            self.settings['TRANSLATION_FEED_RSS'] % lang,
-                            feed_type='rss')
+                    writer.write_feed(
+                        items, self.context,
+                        self.settings['TRANSLATION_FEED_RSS'] % lang,
+                        feed_type='rss')
 
     def generate_articles(self, write):
         """Generate the articles."""
         for article in chain(self.translations, self.articles):
             signals.article_generator_write_article.send(self, content=article)
             write(article.save_as, self.get_template(article.template),
-                self.context, article=article, category=article.category,
-                override_output=hasattr(article, 'override_save_as'))
+                  self.context, article=article, category=article.category,
+                  override_output=hasattr(article, 'override_save_as'))
 
     def generate_period_archives(self, write):
         """Generate per-year, per-month, and per-day archives."""
@@ -293,16 +295,16 @@ class ArticlesGenerator(Generator):
                       dates=archive, blog=True)
 
         period_save_as = {
-                'year' : self.settings['YEAR_ARCHIVE_SAVE_AS'],
-                'month': self.settings['MONTH_ARCHIVE_SAVE_AS'],
-                'day'  : self.settings['DAY_ARCHIVE_SAVE_AS'],
-                }
+            'year': self.settings['YEAR_ARCHIVE_SAVE_AS'],
+            'month': self.settings['MONTH_ARCHIVE_SAVE_AS'],
+            'day': self.settings['DAY_ARCHIVE_SAVE_AS'],
+        }
 
         period_date_key = {
-                'year' : attrgetter('date.year'),
-                'month': attrgetter('date.year', 'date.month'),
-                'day'  : attrgetter('date.year', 'date.month', 'date.day')
-                }
+            'year': attrgetter('date.year'),
+            'month': attrgetter('date.year', 'date.month'),
+            'day': attrgetter('date.year', 'date.month', 'date.day')
+        }
 
         for period in 'year', 'month', 'day':
             save_as = period_save_as[period]
@@ -318,13 +320,13 @@ class ArticlesGenerator(Generator):
             if template in PAGINATED_TEMPLATES:
                 paginated = {'articles': self.articles, 'dates': self.dates}
             save_as = self.settings.get("%s_SAVE_AS" % template.upper(),
-                                                        '%s.html' % template)
+                                        '%s.html' % template)
             if not save_as:
                 continue
 
             write(save_as, self.get_template(template),
-                self.context, blog=True, paginated=paginated,
-                page_name=os.path.splitext(save_as)[0])
+                  self.context, blog=True, paginated=paginated,
+                  page_name=os.path.splitext(save_as)[0])
 
     def generate_tags(self, write):
         """Generate Tags pages."""
@@ -333,9 +335,9 @@ class ArticlesGenerator(Generator):
             articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write(tag.save_as, tag_template, self.context, tag=tag,
-                articles=articles, dates=dates,
-                paginated={'articles': articles, 'dates': dates},
-                page_name=tag.page_name, all_articles=self.articles)
+                  articles=articles, dates=dates,
+                  paginated={'articles': articles, 'dates': dates},
+                  page_name=tag.page_name, all_articles=self.articles)
 
     def generate_categories(self, write):
         """Generate category pages."""
@@ -344,9 +346,9 @@ class ArticlesGenerator(Generator):
             articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write(cat.save_as, category_template, self.context,
-                category=cat, articles=articles, dates=dates,
-                paginated={'articles': articles, 'dates': dates},
-                page_name=cat.page_name, all_articles=self.articles)
+                  category=cat, articles=articles, dates=dates,
+                  paginated={'articles': articles, 'dates': dates},
+                  page_name=cat.page_name, all_articles=self.articles)
 
     def generate_authors(self, write):
         """Generate Author pages."""
@@ -355,17 +357,17 @@ class ArticlesGenerator(Generator):
             articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write(aut.save_as, author_template, self.context,
-                author=aut, articles=articles, dates=dates,
-                paginated={'articles': articles, 'dates': dates},
-                page_name=aut.page_name, all_articles=self.articles)
+                  author=aut, articles=articles, dates=dates,
+                  paginated={'articles': articles, 'dates': dates},
+                  page_name=aut.page_name, all_articles=self.articles)
 
     def generate_drafts(self, write):
         """Generate drafts pages."""
         for article in self.drafts:
             write(os.path.join('drafts', '%s.html' % article.slug),
-                self.get_template(article.template), self.context,
-                article=article, category=article.category,
-                all_articles=self.articles)
+                  self.get_template(article.template), self.context,
+                  article=article, category=article.category,
+                  all_articles=self.articles)
 
     def generate_pages(self, writer):
         """Generate the pages on the disk"""
@@ -430,12 +432,11 @@ class ArticlesGenerator(Generator):
             if hasattr(article, 'author') and article.author.name != '':
                 self.authors[article.author].append(article)
 
-
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
         self.dates = list(self.articles)
         self.dates.sort(key=attrgetter('date'),
-                reverse=self.context['NEWEST_FIRST_ARCHIVES'])
+                        reverse=self.context['NEWEST_FIRST_ARCHIVES'])
 
         # create tag cloud
         tag_cloud = defaultdict(int)
@@ -468,7 +469,7 @@ class ArticlesGenerator(Generator):
         # order the categories per name
         self.categories = list(self.categories.items())
         self.categories.sort(
-                reverse=self.settings['REVERSE_CATEGORY_ORDER'])
+            reverse=self.settings['REVERSE_CATEGORY_ORDER'])
 
         self.authors = list(self.authors.items())
         self.authors.sort()
@@ -527,7 +528,7 @@ class PagesGenerator(Generator):
 
         self.pages, self.translations = process_translations(all_pages)
         self.hidden_pages, self.hidden_translations = (
-                process_translations(hidden_pages))
+            process_translations(hidden_pages))
 
         self._update_context(('pages', ))
         self.context['PAGES'] = self.pages
@@ -536,11 +537,12 @@ class PagesGenerator(Generator):
 
     def generate_output(self, writer):
         for page in chain(self.translations, self.pages,
-                            self.hidden_translations, self.hidden_pages):
-            writer.write_file(page.save_as, self.get_template(page.template),
-                    self.context, page=page,
-                    relative_urls=self.settings['RELATIVE_URLS'],
-                    override_output=hasattr(page, 'override_save_as'))
+                          self.hidden_translations, self.hidden_pages):
+            writer.write_file(
+                page.save_as, self.get_template(page.template),
+                self.context, page=page,
+                relative_urls=self.settings['RELATIVE_URLS'],
+                override_output=hasattr(page, 'override_save_as'))
 
 
 class StaticGenerator(Generator):
@@ -548,7 +550,7 @@ class StaticGenerator(Generator):
     to output"""
 
     def _copy_paths(self, paths, source, destination, output_path,
-            final_path=None):
+                    final_path=None):
         """Copy all the paths from source to destination"""
         for path in paths:
             copy(path, source, os.path.join(output_path, destination),
@@ -586,6 +588,7 @@ class StaticGenerator(Generator):
 
 
 class SourceFileGenerator(Generator):
+
     def generate_context(self):
         self.output_extension = self.settings['OUTPUT_SOURCES_EXTENSION']
 
diff --git a/pelican/writers.py b/pelican/writers.py
index 30b0ed16..29db6e8e 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -54,7 +54,8 @@ class Writer(object):
             description=item.get_content(self.site_url),
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', ''),
-            pubdate=set_date_tzinfo(item.modified if hasattr(item, 'modified') else item.date,
+            pubdate=set_date_tzinfo(
+                item.modified if hasattr(item, 'modified') else item.date,
                 self.settings.get('TIMEZONE', None)))
 
     def _open_w(self, filename, encoding, override=False):
@@ -66,7 +67,7 @@ class Writer(object):
         if filename in self._overridden_files:
             if override:
                 raise RuntimeError('File %s is set to be overridden twice'
-                                    % filename)
+                                   % filename)
             else:
                 logger.info('skipping %s' % filename)
                 filename = os.devnull
@@ -124,7 +125,7 @@ class Writer(object):
             locale.setlocale(locale.LC_ALL, old_locale)
 
     def write_file(self, name, template, context, relative_urls=False,
-        paginated=None, override_output=False, **kwargs):
+                   paginated=None, override_output=False, **kwargs):
         """Render the template and write the file.
 
         :param name: name of the file to output
@@ -198,15 +199,15 @@ class Writer(object):
                 for key in paginators.keys():
                     paginator = paginators[key]
                     previous_page = paginator.page(page_num) \
-                            if page_num > 0 else None
+                        if page_num > 0 else None
                     page = paginator.page(page_num + 1)
                     next_page = paginator.page(page_num + 2) \
-                            if page_num + 1 < paginator.num_pages else None
+                        if page_num + 1 < paginator.num_pages else None
                     paginated_localcontext.update(
-                            {'%s_paginator' % key: paginator,
-                             '%s_page' % key: page,
-                             '%s_previous_page' % key: previous_page,
-                             '%s_next_page' % key: next_page})
+                        {'%s_paginator' % key: paginator,
+                         '%s_page' % key: page,
+                         '%s_previous_page' % key: previous_page,
+                         '%s_next_page' % key: next_page})
 
                 _write_file(template, paginated_localcontext, self.output_path,
                             page.save_as, override_output)

From 18e6ec9f02b8aa920b938305b281e7635f3d47ef Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Thu, 26 Dec 2013 00:39:31 +0100
Subject: [PATCH 1539/2864] Simplify a bit pagination code.

---
 pelican/writers.py | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 29db6e8e..580a3990 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -177,21 +177,13 @@ class Writer(object):
         localcontext['output_file'] = name
         localcontext.update(kwargs)
 
-        # check paginated
-        paginated = paginated or {}
+        # pagination
         if paginated:
             name_root = os.path.splitext(name)[0]
 
             # pagination needed, init paginators
-            paginators = {}
-            for key in paginated.keys():
-                object_list = paginated[key]
-
-                paginators[key] = Paginator(
-                    name_root,
-                    object_list,
-                    self.settings,
-                )
+            paginators = {key: Paginator(name_root, val, self.settings)
+                          for key, val in paginated.items()}
 
             # generated pages, and write
             for page_num in range(list(paginators.values())[0].num_pages):

From fb4b894b77bbfbd7fb0dcfe81a5507a007538b0e Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 5 Jan 2014 23:12:55 +0100
Subject: [PATCH 1540/2864] More pep8 fixes and refactor the check for old
 settings.

---
 pelican/__init__.py | 127 +++++++++++++++++++++-----------------------
 1 file changed, 60 insertions(+), 67 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 68cefc2c..118a9ad9 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -31,6 +31,7 @@ logger = logging.getLogger(__name__)
 
 
 class Pelican(object):
+
     def __init__(self, settings):
         """
         Pelican initialisation, performs some checks on the environment before
@@ -67,9 +68,11 @@ class Pelican(object):
             if isinstance(plugin, six.string_types):
                 logger.debug("Loading plugin `{0}`".format(plugin))
                 try:
-                    plugin = __import__(plugin, globals(), locals(), str('module'))
+                    plugin = __import__(plugin, globals(), locals(),
+                                        str('module'))
                 except ImportError as e:
-                    logger.error("Can't find plugin `{0}`: {1}".format(plugin, e))
+                    logger.error(
+                        "Can't find plugin `{0}`: {1}".format(plugin, e))
                     continue
 
             logger.debug("Registering plugin `{0}`".format(plugin.__name__))
@@ -82,8 +85,8 @@ class Pelican(object):
 
         if self.settings.get('CLEAN_URLS', False):
             logger.warning('Found deprecated `CLEAN_URLS` in settings.'
-                        ' Modifying the following settings for the'
-                        ' same behaviour.')
+                           ' Modifying the following settings for the'
+                           ' same behaviour.')
 
             self.settings['ARTICLE_URL'] = '{slug}/'
             self.settings['ARTICLE_LANG_URL'] = '{slug}-{lang}/'
@@ -96,8 +99,8 @@ class Pelican(object):
 
         if self.settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
             logger.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
-                        ' settings.  Modifying the following settings for'
-                        ' the same behaviour.')
+                           ' settings.  Modifying the following settings for'
+                           ' the same behaviour.')
 
             structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
 
@@ -118,34 +121,18 @@ class Pelican(object):
                                                       self.settings[setting])
                 logger.warning("%s = '%s'" % (setting, self.settings[setting]))
 
-        if self.settings.get('FEED', False):
-            logger.warning('Found deprecated `FEED` in settings. Modify FEED'
-            ' to FEED_ATOM in your settings and theme for the same behavior.'
-            ' Temporarily setting FEED_ATOM for backwards compatibility.')
-            self.settings['FEED_ATOM'] = self.settings['FEED']
-
-        if self.settings.get('TAG_FEED', False):
-            logger.warning('Found deprecated `TAG_FEED` in settings. Modify '
-            ' TAG_FEED to TAG_FEED_ATOM in your settings and theme for the '
-            'same behavior. Temporarily setting TAG_FEED_ATOM for backwards '
-            'compatibility.')
-            self.settings['TAG_FEED_ATOM'] = self.settings['TAG_FEED']
-
-        if self.settings.get('CATEGORY_FEED', False):
-            logger.warning('Found deprecated `CATEGORY_FEED` in settings. '
-            'Modify CATEGORY_FEED to CATEGORY_FEED_ATOM in your settings and '
-            'theme for the same behavior. Temporarily setting '
-            'CATEGORY_FEED_ATOM for backwards compatibility.')
-            self.settings['CATEGORY_FEED_ATOM'] =\
-                    self.settings['CATEGORY_FEED']
-
-        if self.settings.get('TRANSLATION_FEED', False):
-            logger.warning('Found deprecated `TRANSLATION_FEED` in settings. '
-            'Modify TRANSLATION_FEED to TRANSLATION_FEED_ATOM in your '
-            'settings and theme for the same behavior. Temporarily setting '
-            'TRANSLATION_FEED_ATOM for backwards compatibility.')
-            self.settings['TRANSLATION_FEED_ATOM'] =\
-                    self.settings['TRANSLATION_FEED']
+        for new, old in [('FEED', 'FEED_ATOM'), ('TAG_FEED', 'TAG_FEED_ATOM'),
+                         ('CATEGORY_FEED', 'CATEGORY_FEED_ATOM'),
+                         ('TRANSLATION_FEED', 'TRANSLATION_FEED_ATOM')]:
+            if self.settings.get(new, False):
+                logger.warning(
+                    'Found deprecated `%(new)s` in settings. Modify %(new)s '
+                    'to %(old)s in your settings and theme for the same '
+                    'behavior. Temporarily setting %(old)s for backwards '
+                    'compatibility.',
+                    {'new': new, 'old': old}
+                )
+                self.settings[old] = self.settings[new]
 
     def run(self):
         """Run the generators and return"""
@@ -182,8 +169,10 @@ class Pelican(object):
 
         signals.finalized.send(self)
 
-        articles_generator = next(g for g in generators if isinstance(g, ArticlesGenerator))
-        pages_generator = next(g for g in generators if isinstance(g, PagesGenerator))
+        articles_generator = next(g for g in generators
+                                  if isinstance(g, ArticlesGenerator))
+        pages_generator = next(g for g in generators
+                               if isinstance(g, PagesGenerator))
 
         print('Done: Processed {} articles and {} pages in {:.2f} seconds.'.format(
             len(articles_generator.articles) + len(articles_generator.translations),
@@ -216,51 +205,54 @@ class Pelican(object):
 
 
 def parse_arguments():
-    parser = argparse.ArgumentParser(description="""A tool to generate a
-    static blog, with restructured text input files.""",
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    parser = argparse.ArgumentParser(
+        description="""A tool to generate a static blog,
+        with restructured text input files.""",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter
+    )
 
     parser.add_argument(dest='path', nargs='?',
-        help='Path where to find the content files.',
-        default=None)
+                        help='Path where to find the content files.',
+                        default=None)
 
     parser.add_argument('-t', '--theme-path', dest='theme',
-        help='Path where to find the theme templates. If not specified, it '
-             'will use the default one included with pelican.')
+                        help='Path where to find the theme templates. If not '
+                        'specified, it will use the default one included with '
+                        'pelican.')
 
     parser.add_argument('-o', '--output', dest='output',
-        help='Where to output the generated files. If not specified, a '
-             'directory will be created, named "output" in the current path.')
+                        help='Where to output the generated files. If not '
+                        'specified, a directory will be created, named '
+                        '"output" in the current path.')
 
     parser.add_argument('-s', '--settings', dest='settings',
-        help='The settings of the application, this is automatically set to '
-        '{0} if a file exists with this name.'.format(DEFAULT_CONFIG_NAME))
+                        help='The settings of the application, this is '
+                        'automatically set to {0} if a file exists with this '
+                        'name.'.format(DEFAULT_CONFIG_NAME))
 
     parser.add_argument('-d', '--delete-output-directory',
-        dest='delete_outputdir',
-        action='store_true',
-        default=None,
-        help='Delete the output directory.')
+                        dest='delete_outputdir', action='store_true',
+                        default=None, help='Delete the output directory.')
 
     parser.add_argument('-v', '--verbose', action='store_const',
-        const=logging.INFO, dest='verbosity',
-        help='Show all messages.')
+                        const=logging.INFO, dest='verbosity',
+                        help='Show all messages.')
 
     parser.add_argument('-q', '--quiet', action='store_const',
-        const=logging.CRITICAL, dest='verbosity',
-        help='Show only critical errors.')
+                        const=logging.CRITICAL, dest='verbosity',
+                        help='Show only critical errors.')
 
     parser.add_argument('-D', '--debug', action='store_const',
-        const=logging.DEBUG, dest='verbosity',
-        help='Show all message, including debug messages.')
+                        const=logging.DEBUG, dest='verbosity',
+                        help='Show all message, including debug messages.')
 
     parser.add_argument('--version', action='version', version=__version__,
-        help='Print the pelican version and exit.')
+                        help='Print the pelican version and exit.')
 
     parser.add_argument('-r', '--autoreload', dest='autoreload',
-        action='store_true',
-        help="Relaunch pelican each time a modification occurs"
-                             " on the content files.")
+                        action='store_true',
+                        help='Relaunch pelican each time a modification occurs'
+                        ' on the content files.')
     return parser.parse_args()
 
 
@@ -270,7 +262,7 @@ def get_config(args):
         config['PATH'] = os.path.abspath(os.path.expanduser(args.path))
     if args.output:
         config['OUTPUT_PATH'] = \
-                os.path.abspath(os.path.expanduser(args.output))
+            os.path.abspath(os.path.expanduser(args.output))
     if args.theme:
         abstheme = os.path.abspath(os.path.expanduser(args.theme))
         config['THEME'] = abstheme if os.path.exists(abstheme) else args.theme
@@ -335,17 +327,18 @@ def main():
                     modified = {k: next(v) for k, v in watchers.items()}
 
                     if modified['settings']:
-                        pelican, settings  = get_instance(args)
+                        pelican, settings = get_instance(args)
 
                     if any(modified.values()):
                         print('\n-> Modified: {}. re-generating...'.format(
-                                ', '.join(k for k, v in modified.items() if v)))
+                            ', '.join(k for k, v in modified.items() if v)))
 
                         if modified['content'] is None:
                             logger.warning('No valid files found in content.')
 
                         if modified['theme'] is None:
-                            logger.warning('Empty theme folder. Using `basic` theme.')
+                            logger.warning('Empty theme folder. Using `basic` '
+                                           'theme.')
 
                         pelican.run()
 
@@ -358,7 +351,7 @@ def main():
                         logger.critical(e.args)
                         raise
                     logger.warning(
-                            'Caught exception "{0}". Reloading.'.format(e))
+                        'Caught exception "{0}". Reloading.'.format(e))
 
                 finally:
                     time.sleep(.5)  # sleep to avoid cpu load
@@ -381,7 +374,7 @@ def main():
 
         logger.critical(msg)
 
-        if (args.verbosity == logging.DEBUG):
+        if args.verbosity == logging.DEBUG:
             raise
         else:
             sys.exit(getattr(e, 'exitcode', 1))

From 6264cf891619c0378476d2312afe07e83b1019d0 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 5 Jan 2014 23:32:02 +0100
Subject: [PATCH 1541/2864] Clarify docs about the DIRECT_TEMPLATES _SAVE_AS
 and _URL settings.

---
 docs/settings.rst   | 312 ++++++++++++++++++++++----------------------
 pelican/settings.py |   2 -
 2 files changed, 158 insertions(+), 156 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 30507efd..2b4faed5 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -27,142 +27,142 @@ Here is a list of settings for Pelican:
 Basic settings
 ==============
 
-=====================================================================   =====================================================================
-Setting name (default value)                                            What does it do?
-=====================================================================   =====================================================================
-`AUTHOR`                                                                Default author (put your name)
-`DATE_FORMATS` (``{}``)                                                 If you manage multiple languages, you can set the date formatting
-                                                                        here. See the "Date format and locales" section below for details.
-`USE_FOLDER_AS_CATEGORY` (``True``)                                     When you don't specify a category in your post metadata, set this
-                                                                        setting to ``True``, and organize your articles in subfolders, the
-                                                                        subfolder will become the category of your post. If set to ``False``,
-                                                                        ``DEFAULT_CATEGORY`` will be used as a fallback.
-`DEFAULT_CATEGORY` (``'misc'``)                                         The default category to fall back on.
-`DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)                               The default date format you want to use.
-`DISPLAY_PAGES_ON_MENU` (``True``)                                      Whether to display pages on the menu of the
-                                                                        template. Templates may or may not honor this
-                                                                        setting.
-`DISPLAY_CATEGORIES_ON_MENU` (``True``)                                 Whether to display categories on the menu of the
-                                                                        template. Templates may or not honor this
-                                                                        setting.
-`DEFAULT_DATE` (``None``)                                               The default date you want to use.
-                                                                        If ``fs``, Pelican will use the file system
-                                                                        timestamp information (mtime) if it can't get
-                                                                        date information from the metadata.
-                                                                        If set to a tuple object, the default datetime object will instead
-                                                                        be generated by passing the tuple to the
-                                                                        ``datetime.datetime`` constructor.
-`DEFAULT_METADATA` (``()``)                                             The default metadata you want to use for all articles
-                                                                        and pages.
-`FILENAME_METADATA` (``'(?P<date>\d{4}-\d{2}-\d{2}).*'``)               The regexp that will be used to extract any metadata
-                                                                        from the filename. All named groups that are matched
-                                                                        will be set in the metadata object.
-                                                                        The default value will only extract the date from
-                                                                        the filename.
-                                                                        For example, if you would like to extract both the
-                                                                        date and the slug, you could set something like:
-                                                                        ``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
-                                                                        See :ref:`path_metadata`.
-`PATH_METADATA` (``''``)                                                Like ``FILENAME_METADATA``, but parsed from a page's
-                                                                        full path relative to the content source directory.
-                                                                        See :ref:`path_metadata`.
-`EXTRA_PATH_METADATA` (``{}``)                                          Extra metadata dictionaries keyed by relative path.
-                                                                        See :ref:`path_metadata`.
-`DELETE_OUTPUT_DIRECTORY` (``False``)                                   Delete the output directory, and **all** of its contents, before
-                                                                        generating new files. This can be useful in preventing older,
-                                                                        unnecessary files from persisting in your output. However, **this is
-                                                                        a destructive setting and should be handled with extreme care.**
-`OUTPUT_RETENTION` (``()``)                                             A tuple of filenames that should be retained and not deleted from the
-                                                                        output directory. One use case would be the preservation of version
-                                                                        control data. For example: ``(".hg", ".git", ".bzr")``
-`JINJA_EXTENSIONS` (``[]``)                                             A list of any Jinja2 extensions you want to use.
-`JINJA_FILTERS` (``{}``)                                                A list of custom Jinja2 filters you want to use.
-                                                                        The dictionary should map the filtername to the filter function.
-                                                                        For example: ``{'urlencode': urlencode_filter}``
-                                                                        See `Jinja custom filters documentation`_.
-`LOCALE` (''[#]_)                                                       Change the locale. A list of locales can be provided
-                                                                        here or a single string representing one locale.
-                                                                        When providing a list, all the locales will be tried
-                                                                        until one works.
-`READERS` (``{}``)                                                      A dictionary of file extensions / Reader classes for Pelican to
-                                                                        process or ignore. For example, to avoid processing .html files,
-                                                                        set: ``READERS = {'html': None}``. To add a custom reader for the
-                                                                        `foo` extension, set: ``READERS = {'foo': FooReader}``
-`IGNORE_FILES` (``['.#*']``)                                            A list of file globbing patterns to match against the
-                                                                        source files to be ignored by the processor. For example,
-                                                                        the default ``['.#*']`` will ignore emacs lock files.
-`MD_EXTENSIONS` (``['codehilite(css_class=highlight)','extra']``)       A list of the extensions that the Markdown processor
-                                                                        will use. Refer to the Python Markdown documentation's
-                                                                        `Extensions section <http://pythonhosted.org/Markdown/extensions/>`_
-                                                                        for a complete list of supported extensions. (Note that
-                                                                        defining this in your settings file will override and
-                                                                        replace the default values. If your goal is to *add*
-                                                                        to the default values for this setting, you'll need to
-                                                                        include them explicitly and enumerate the full list of
-                                                                        desired Markdown extensions.)
-`OUTPUT_PATH` (``'output/'``)                                           Where to output the generated files.
-`PATH` (``None``)                                                       Path to content directory to be processed by Pelican.
-`PAGE_DIR` (``'pages'``)                                                Directory to look at for pages, relative to `PATH`.
-`PAGE_EXCLUDES` (``()``)                                                A list of directories to exclude when looking for pages.
-`ARTICLE_DIR` (``''``)                                                  Directory to look at for articles, relative to `PATH`.
-`ARTICLE_EXCLUDES`: (``('pages',)``)                                    A list of directories to exclude when looking for articles.
-`OUTPUT_SOURCES` (``False``)                                            Set to True if you want to copy the articles and pages in their
-                                                                        original format (e.g. Markdown or reStructuredText) to the
-                                                                        specified ``OUTPUT_PATH``.
-`OUTPUT_SOURCES_EXTENSION` (``.text``)                                  Controls the extension that will be used by the SourcesGenerator.
-                                                                        Defaults to ``.text``. If not a valid string the default value
-                                                                        will be used.
-`RELATIVE_URLS` (``False``)                                             Defines whether Pelican should use document-relative URLs or
-                                                                        not. Only set this to ``True`` when developing/testing and only
-                                                                        if you fully understand the effect it can have on links/feeds.
-`PLUGINS` (``[]``)                                                      The list of plugins to load. See :ref:`plugins`.
-`SITENAME` (``'A Pelican Blog'``)                                       Your site name
-`SITEURL`                                                               Base URL of your website. Not defined by default,
-                                                                        so it is best to specify your SITEURL; if you do not, feeds
-                                                                        will not be generated with properly-formed URLs. You should
-                                                                        include ``http://`` and your domain, with no trailing
-                                                                        slash at the end. Example: ``SITEURL = 'http://mydomain.com'``
-`TEMPLATE_PAGES` (``None``)                                             A mapping containing template pages that will be rendered with
-                                                                        the blog entries. See :ref:`template_pages`.
-`STATIC_PATHS` (``['images']``)                                         The static paths you want to have accessible
-                                                                        on the output path "static". By default,
-                                                                        Pelican will copy the "images" folder to the
-                                                                        output folder.
-`TIMEZONE`                                                              The timezone used in the date information, to
-                                                                        generate Atom and RSS feeds. See the *Timezone*
-                                                                        section below for more info.
-`TYPOGRIFY` (``False``)                                                 If set to True, several typographical improvements will be
-                                                                        incorporated into the generated HTML via the `Typogrify
-                                                                        <https://pypi.python.org/pypi/typogrify-web>`_ library,
-                                                                        which can be installed via: ``pip install typogrify-web``
-`DIRECT_TEMPLATES` (``('index', 'tags', 'categories', 'archives')``)    List of templates that are used directly to render
-                                                                        content. Typically direct templates are used to generate
-                                                                        index pages for collections of content (e.g., tags and
-                                                                        category index pages). If the tag and category collections
-                                                                        are not needed, set ``DIRECT_TEMPLATES = ('index', 'archives')``
-`PAGINATED_DIRECT_TEMPLATES` (``('index',)``)                           Provides the direct templates that should be paginated.
-`SUMMARY_MAX_LENGTH` (``50``)                                           When creating a short summary of an article, this will
-                                                                        be the default length (measured in words) of the text created.
-                                                                        This only applies if your content does not otherwise
-                                                                        specify a summary. Setting to ``None`` will cause the summary
-                                                                        to be a copy of the original content.
-`EXTRA_TEMPLATES_PATHS` (``[]``)                                        A list of paths you want Jinja2 to search for templates.
-                                                                        Can be used to separate templates from the theme.
-                                                                        Example: projects, resume, profile ...
-                                                                        These templates need to use ``DIRECT_TEMPLATES`` setting.
-`ASCIIDOC_OPTIONS` (``[]``)                                             A list of options to pass to AsciiDoc. See the `manpage
-                                                                        <http://www.methods.co.nz/asciidoc/manpage.html>`_
-`WITH_FUTURE_DATES` (``True``)                                          If disabled, content with dates in the future will get a
-                                                                        default status of ``draft``.
-`INTRASITE_LINK_REGEX` (``'[{|](?P<what>.*?)[|}]'``)                    Regular expression that is used to parse internal links.  
-                                                                        Default syntax of links to internal files, tags, etc., is 
-                                                                        to enclose the identifier, say ``filename``, in ``{}`` or ``||``.
-                                                                        Identifier between ``{`` and ``}`` goes into the ``what`` capturing group.
-                                                                        For details see :ref:`ref-linking-to-internal-content`.
-`PYGMENTS_RST_OPTIONS` (``[]``)                                         A list of default Pygments settings for your reStructuredText
-                                                                        code blocks. See :ref:`internal_pygments_options` for a list of
-                                                                        supported options.
-=====================================================================   =====================================================================
+===============================================================================  =====================================================================
+Setting name (default value)                                                     What does it do?
+===============================================================================  =====================================================================
+`AUTHOR`                                                                         Default author (put your name)
+`DATE_FORMATS` (``{}``)                                                          If you manage multiple languages, you can set the date formatting
+                                                                                 here. See the "Date format and locales" section below for details.
+`USE_FOLDER_AS_CATEGORY` (``True``)                                              When you don't specify a category in your post metadata, set this
+                                                                                 setting to ``True``, and organize your articles in subfolders, the
+                                                                                 subfolder will become the category of your post. If set to ``False``,
+                                                                                 ``DEFAULT_CATEGORY`` will be used as a fallback.
+`DEFAULT_CATEGORY` (``'misc'``)                                                  The default category to fall back on.
+`DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)                                        The default date format you want to use.
+`DISPLAY_PAGES_ON_MENU` (``True``)                                               Whether to display pages on the menu of the
+                                                                                 template. Templates may or may not honor this
+                                                                                 setting.
+`DISPLAY_CATEGORIES_ON_MENU` (``True``)                                          Whether to display categories on the menu of the
+                                                                                 template. Templates may or not honor this
+                                                                                 setting.
+`DEFAULT_DATE` (``None``)                                                        The default date you want to use.
+                                                                                 If ``fs``, Pelican will use the file system
+                                                                                 timestamp information (mtime) if it can't get
+                                                                                 date information from the metadata.
+                                                                                 If set to a tuple object, the default datetime object will instead
+                                                                                 be generated by passing the tuple to the
+                                                                                 ``datetime.datetime`` constructor.
+`DEFAULT_METADATA` (``()``)                                                      The default metadata you want to use for all articles
+                                                                                 and pages.
+`FILENAME_METADATA` (``'(?P<date>\d{4}-\d{2}-\d{2}).*'``)                        The regexp that will be used to extract any metadata
+                                                                                 from the filename. All named groups that are matched
+                                                                                 will be set in the metadata object.
+                                                                                 The default value will only extract the date from
+                                                                                 the filename.
+                                                                                 For example, if you would like to extract both the
+                                                                                 date and the slug, you could set something like:
+                                                                                 ``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
+                                                                                 See :ref:`path_metadata`.
+`PATH_METADATA` (``''``)                                                         Like ``FILENAME_METADATA``, but parsed from a page's
+                                                                                 full path relative to the content source directory.
+                                                                                 See :ref:`path_metadata`.
+`EXTRA_PATH_METADATA` (``{}``)                                                   Extra metadata dictionaries keyed by relative path.
+                                                                                 See :ref:`path_metadata`.
+`DELETE_OUTPUT_DIRECTORY` (``False``)                                            Delete the output directory, and **all** of its contents, before
+                                                                                 generating new files. This can be useful in preventing older,
+                                                                                 unnecessary files from persisting in your output. However, **this is
+                                                                                 a destructive setting and should be handled with extreme care.**
+`OUTPUT_RETENTION` (``()``)                                                      A tuple of filenames that should be retained and not deleted from the
+                                                                                 output directory. One use case would be the preservation of version
+                                                                                 control data. For example: ``(".hg", ".git", ".bzr")``
+`JINJA_EXTENSIONS` (``[]``)                                                      A list of any Jinja2 extensions you want to use.
+`JINJA_FILTERS` (``{}``)                                                         A list of custom Jinja2 filters you want to use.
+                                                                                 The dictionary should map the filtername to the filter function.
+                                                                                 For example: ``{'urlencode': urlencode_filter}``
+                                                                                 See `Jinja custom filters documentation`_.
+`LOCALE` (''[#]_)                                                                Change the locale. A list of locales can be provided
+                                                                                 here or a single string representing one locale.
+                                                                                 When providing a list, all the locales will be tried
+                                                                                 until one works.
+`READERS` (``{}``)                                                               A dictionary of file extensions / Reader classes for Pelican to
+                                                                                 process or ignore. For example, to avoid processing .html files,
+                                                                                 set: ``READERS = {'html': None}``. To add a custom reader for the
+                                                                                 `foo` extension, set: ``READERS = {'foo': FooReader}``
+`IGNORE_FILES` (``['.#*']``)                                                     A list of file globbing patterns to match against the
+                                                                                 source files to be ignored by the processor. For example,
+                                                                                 the default ``['.#*']`` will ignore emacs lock files.
+`MD_EXTENSIONS` (``['codehilite(css_class=highlight)','extra']``)                A list of the extensions that the Markdown processor
+                                                                                 will use. Refer to the Python Markdown documentation's
+                                                                                 `Extensions section <http://pythonhosted.org/Markdown/extensions/>`_
+                                                                                 for a complete list of supported extensions. (Note that
+                                                                                 defining this in your settings file will override and
+                                                                                 replace the default values. If your goal is to *add*
+                                                                                 to the default values for this setting, you'll need to
+                                                                                 include them explicitly and enumerate the full list of
+                                                                                 desired Markdown extensions.)
+`OUTPUT_PATH` (``'output/'``)                                                    Where to output the generated files.
+`PATH` (``None``)                                                                Path to content directory to be processed by Pelican.
+`PAGE_DIR` (``'pages'``)                                                         Directory to look at for pages, relative to `PATH`.
+`PAGE_EXCLUDES` (``()``)                                                         A list of directories to exclude when looking for pages.
+`ARTICLE_DIR` (``''``)                                                           Directory to look at for articles, relative to `PATH`.
+`ARTICLE_EXCLUDES`: (``('pages',)``)                                             A list of directories to exclude when looking for articles.
+`OUTPUT_SOURCES` (``False``)                                                     Set to True if you want to copy the articles and pages in their
+                                                                                 original format (e.g. Markdown or reStructuredText) to the
+                                                                                 specified ``OUTPUT_PATH``.
+`OUTPUT_SOURCES_EXTENSION` (``.text``)                                           Controls the extension that will be used by the SourcesGenerator.
+                                                                                 Defaults to ``.text``. If not a valid string the default value
+                                                                                 will be used.
+`RELATIVE_URLS` (``False``)                                                      Defines whether Pelican should use document-relative URLs or
+                                                                                 not. Only set this to ``True`` when developing/testing and only
+                                                                                 if you fully understand the effect it can have on links/feeds.
+`PLUGINS` (``[]``)                                                               The list of plugins to load. See :ref:`plugins`.
+`SITENAME` (``'A Pelican Blog'``)                                                Your site name
+`SITEURL`                                                                        Base URL of your website. Not defined by default,
+                                                                                 so it is best to specify your SITEURL; if you do not, feeds
+                                                                                 will not be generated with properly-formed URLs. You should
+                                                                                 include ``http://`` and your domain, with no trailing
+                                                                                 slash at the end. Example: ``SITEURL = 'http://mydomain.com'``
+`TEMPLATE_PAGES` (``None``)                                                      A mapping containing template pages that will be rendered with
+                                                                                 the blog entries. See :ref:`template_pages`.
+`STATIC_PATHS` (``['images']``)                                                  The static paths you want to have accessible
+                                                                                 on the output path "static". By default,
+                                                                                 Pelican will copy the "images" folder to the
+                                                                                 output folder.
+`TIMEZONE`                                                                       The timezone used in the date information, to
+                                                                                 generate Atom and RSS feeds. See the *Timezone*
+                                                                                 section below for more info.
+`TYPOGRIFY` (``False``)                                                          If set to True, several typographical improvements will be
+                                                                                 incorporated into the generated HTML via the `Typogrify
+                                                                                 <https://pypi.python.org/pypi/typogrify-web>`_ library,
+                                                                                 which can be installed via: ``pip install typogrify-web``
+`DIRECT_TEMPLATES` (``('index', 'tags', 'categories', 'authors', 'archives')``)  List of templates that are used directly to render
+                                                                                 content. Typically direct templates are used to generate
+                                                                                 index pages for collections of content (e.g., tags and
+                                                                                 category index pages). If the tag and category collections
+                                                                                 are not needed, set ``DIRECT_TEMPLATES = ('index', 'archives')``
+`PAGINATED_DIRECT_TEMPLATES` (``('index',)``)                                    Provides the direct templates that should be paginated.
+`SUMMARY_MAX_LENGTH` (``50``)                                                    When creating a short summary of an article, this will
+                                                                                 be the default length (measured in words) of the text created.
+                                                                                 This only applies if your content does not otherwise
+                                                                                 specify a summary. Setting to ``None`` will cause the summary
+                                                                                 to be a copy of the original content.
+`EXTRA_TEMPLATES_PATHS` (``[]``)                                                 A list of paths you want Jinja2 to search for templates.
+                                                                                 Can be used to separate templates from the theme.
+                                                                                 Example: projects, resume, profile ...
+                                                                                 These templates need to use ``DIRECT_TEMPLATES`` setting.
+`ASCIIDOC_OPTIONS` (``[]``)                                                      A list of options to pass to AsciiDoc. See the `manpage
+                                                                                 <http://www.methods.co.nz/asciidoc/manpage.html>`_
+`WITH_FUTURE_DATES` (``True``)                                                   If disabled, content with dates in the future will get a
+                                                                                 default status of ``draft``.
+`INTRASITE_LINK_REGEX` (``'[{|](?P<what>.*?)[|}]'``)                             Regular expression that is used to parse internal links.
+                                                                                 Default syntax of links to internal files, tags, etc., is
+                                                                                 to enclose the identifier, say ``filename``, in ``{}`` or ``||``.
+                                                                                 Identifier between ``{`` and ``}`` goes into the ``what`` capturing group.
+                                                                                 For details see :ref:`ref-linking-to-internal-content`.
+`PYGMENTS_RST_OPTIONS` (``[]``)                                                  A list of default Pygments settings for your reStructuredText
+                                                                                 code blocks. See :ref:`internal_pygments_options` for a list of
+                                                                                 supported options.
+===============================================================================  =====================================================================
 
 .. [#] Default is the system locale.
 
@@ -248,29 +248,15 @@ Setting name (default value)                            What does it do?
                                                         use the default language.
 `PAGE_LANG_SAVE_AS` (``'pages/{slug}-{lang}.html'``)    The location we will save the page which doesn't
                                                         use the default language.
-`CATEGORIES_URL` (``'categories.html'``)                The URL to use for the category list.
-`CATEGORIES_SAVE_AS` (``'categories.html'``)            The location to save the category list.
 `CATEGORY_URL` (``'category/{slug}.html'``)             The URL to use for a category.
 `CATEGORY_SAVE_AS` (``'category/{slug}.html'``)         The location to save a category.
 `TAG_URL` (``'tag/{slug}.html'``)                       The URL to use for a tag.
 `TAG_SAVE_AS` (``'tag/{slug}.html'``)                   The location to save the tag page.
-`TAGS_URL` (``'tags.html'``)                            The URL to use for the tag list.
-`TAGS_SAVE_AS` (``'tags.html'``)                        The location to save the tag list.
 `AUTHOR_URL` (``'author/{slug}.html'``)                 The URL to use for an author.
 `AUTHOR_SAVE_AS` (``'author/{slug}.html'``)             The location to save an author.
-`AUTHORS_URL` (``'authors.html'``)                      The URL to use for the author list.
-`AUTHORS_SAVE_AS` (``'authors.html'``)                  The location to save the author list.
-`<DIRECT_TEMPLATE_NAME>_SAVE_AS`                        The location to save content generated from direct
-                                                        templates. Where <DIRECT_TEMPLATE_NAME> is the
-                                                        upper case template name.
-`ARCHIVES_SAVE_AS` (``'archives.html'``)                The location to save the article archives page.
-`ARCHIVES_URL` (``'archives.html'``)                    The URL to use for the article archives page.
-`YEAR_ARCHIVE_SAVE_AS` (False)                          The location to save per-year archives of your
-                                                        posts.
-`MONTH_ARCHIVE_SAVE_AS` (False)                         The location to save per-month archives of your
-                                                        posts.
-`DAY_ARCHIVE_SAVE_AS` (False)                           The location to save per-day archives of your
-                                                        posts.
+`YEAR_ARCHIVE_SAVE_AS` (False)                          The location to save per-year archives of your posts.
+`MONTH_ARCHIVE_SAVE_AS` (False)                         The location to save per-month archives of your posts.
+`DAY_ARCHIVE_SAVE_AS` (False)                           The location to save per-day archives of your posts.
 `SLUG_SUBSTITUTIONS`  (``()``)                          Substitutions to make prior to stripping out
                                                         non-alphanumerics when generating slugs. Specified
                                                         as a list of 2-tuples of ``(from, to)`` which are
@@ -284,6 +270,24 @@ Setting name (default value)                            What does it do?
     set the corresponding ``*_SAVE_AS`` setting to ``None`` to prevent the
     relevant page from being generated.
 
+`DIRECT_TEMPLATES`
+~~~~~~~~~~~~~~~~~~
+
+These templates (``('index', 'tags', 'categories', 'archives')`` by default)
+works a bit differently than above. Only the ``_SAVE_AS`` setting is available:
+
+=============================================  ===============================================
+Setting name (default value)                   What does it do?
+=============================================  ===============================================
+`ARCHIVES_SAVE_AS` (``'archives.html'``)       The location to save the article archives page.
+`AUTHORS_SAVE_AS` (``'authors.html'``)         The location to save the author list.
+`CATEGORIES_SAVE_AS` (``'categories.html'``)   The location to save the category list.
+`TAGS_SAVE_AS` (``'tags.html'``)               The location to save the tag list.
+=============================================  ===============================================
+
+The corresponding urls are hard-coded in the themes: ``'archives.html'``,
+``'authors.html'``, ``'categories.html'``, ``'tags.html'``.
+
 Timezone
 --------
 
@@ -561,7 +565,7 @@ For example::
         font-size: 120%;
     }
 
-    ...    
+    ...
 
 Translations
 ============
diff --git a/pelican/settings.py b/pelican/settings.py
index 8cbc4694..99828935 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -68,8 +68,6 @@ DEFAULT_CONFIG = {
     'PDF_GENERATOR': False,
     'PDF_STYLE_PATH': '',
     'PDF_STYLE': 'twelvepoint',
-    'CATEGORIES_URL': 'categories.html',
-    'CATEGORIES_SAVE_AS': 'categories.html',
     'CATEGORY_URL': 'category/{slug}.html',
     'CATEGORY_SAVE_AS': os.path.join('category', '{slug}.html'),
     'TAG_URL': 'tag/{slug}.html',

From dbcbc2c1198587ee4b8774e06b64cc48cfcc5ea2 Mon Sep 17 00:00:00 2001
From: Mathieu Leplatre <leplatrem@gmail.com>
Date: Thu, 9 Jan 2014 15:19:31 +0100
Subject: [PATCH 1542/2864] Fail and exit on restructuredtext syntax error

---
 pelican/readers.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index d070a19c..198b5a5f 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -155,7 +155,8 @@ class RstReader(BaseReader):
     def _get_publisher(self, source_path):
         extra_params = {'initial_header_level': '2',
                         'syntax_highlight': 'short',
-                        'input_encoding': 'utf-8'}
+                        'input_encoding': 'utf-8',
+                        'exit_status_level': 2}
         user_params = self.settings.get('DOCUTILS_SETTINGS')
         if user_params:
             extra_params.update(user_params)
@@ -166,7 +167,7 @@ class RstReader(BaseReader):
         pub.writer.translator_class = PelicanHTMLTranslator
         pub.process_programmatic_settings(None, extra_params, None)
         pub.set_source(source_path=source_path)
-        pub.publish()
+        pub.publish(enable_exit_status=True)
         return pub
 
     def read(self, source_path):

From d8e50d56dae2281341fbcd99337e6c0f1424808f Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Fri, 10 Jan 2014 07:33:41 +0000
Subject: [PATCH 1543/2864] travis: Use dev_requirements.txt for dependencies

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2f310328..93a7ab54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,9 @@ before_install:
  - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
-    - pip install mock nose nose-cov Markdown typogrify-web
     - pip install .
+    - pip install -r dev_requirements.txt
+    - pip install nose-cov
 script: nosetests -sv --with-coverage --cover-package=pelican pelican
 after_success:
   # Report coverage results to coveralls.io

From 8dfa7c23f3076633a51821bd6c2428bfba571f3a Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Fri, 10 Jan 2014 07:34:13 +0000
Subject: [PATCH 1544/2864] Use dev_requirements.txt for tox dependencies

---
 tox.ini | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/tox.ini b/tox.ini
index 70f9fe92..a72aea21 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,19 +8,4 @@ envlist = py27,py33
 commands =
     python -m unittest discover
 deps =
-
-[testenv:py27]
-deps =
-    mock
-    Markdown
-    BeautifulSoup4
-    typogrify-web
-    lxml
-
-[testenv:py33]
-deps =
-    mock
-    Markdown
-    BeautifulSoup4
-    typogrify-web
-    lxml
+    -rdev_requirements.txt

From dc552bb869fdf24d4044caeebc985d66c9d58c11 Mon Sep 17 00:00:00 2001
From: Alistair Magee <alistair.magee@gmail.com>
Date: Fri, 10 Jan 2014 16:33:02 +0000
Subject: [PATCH 1545/2864] fix test-suite import error

---
 pelican/tests/test_contents.py | 4 ++--
 pelican/tests/test_utils.py    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 5a9ff581..448f73eb 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import
 
 import six
 from datetime import datetime
 from sys import platform
 
-from .support import unittest, get_settings
+from pelican.tests.support import unittest, get_settings
 
 from pelican.contents import Page, Article, URLWrapper
 from pelican.settings import DEFAULT_CONFIG
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 0642926e..a8de7216 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import unicode_literals, print_function, absolute_import
 import logging
 import shutil
 import os
@@ -15,7 +15,7 @@ from pelican.generators import TemplatePagesGenerator
 from pelican.writers import Writer
 from pelican.settings import read_settings
 from pelican import utils
-from .support import get_article, LoggedTestCase, locale_available, unittest
+from pelican.tests.support import get_article, LoggedTestCase, locale_available, unittest
 
 
 class TestUtils(LoggedTestCase):

From 5eb9fa6d1656a872bc2bceb5aa800aae0af74bbb Mon Sep 17 00:00:00 2001
From: Hilmar Lapp <hlapp@drycafe.net>
Date: Mon, 13 Jan 2014 12:37:15 -0500
Subject: [PATCH 1546/2864] Append slash to href of link to site home

This is necessary to make the link to the site home work locally, because then SITEURL may be set to an empty string (in fact the Pelican default configuration sets it to an empty string in pelicanconf.py).
---
 pelican/themes/simple/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 7973d774..bde7983b 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -33,7 +33,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="{{ SITEURL }}">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
+                <h1><a href="{{ SITEURL }}/">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
         {% for title, link in MENUITEMS %}

From cda21c5481d812e24df9d3cc734bbd9f7e35b503 Mon Sep 17 00:00:00 2001
From: "M. Utku Altinkaya" <utkualtinkaya@gmail.com>
Date: Wed, 22 Jan 2014 01:55:46 +0200
Subject: [PATCH 1547/2864] Update __init__.py

Watch static folders using utils.folder_watcher
---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 5cf89927..0d4d1605 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -321,7 +321,7 @@ def main():
                 'settings': file_watcher(args.settings)}
 
     for static_path in settings.get("STATIC_PATHS", []):
-        watchers[static_path] = file_watcher(static_path)
+        watchers[static_path] = folder_watcher(static_path, [''], pelican.ignore_files)
 
     try:
         if args.autoreload:

From 752e862b806e8072f1d7e4228d1ee27e8449b9b8 Mon Sep 17 00:00:00 2001
From: Alistair Magee <alistair.magee@gmail.com>
Date: Fri, 24 Jan 2014 06:31:26 +0000
Subject: [PATCH 1548/2864] Needed a signal for my subcategory plugin

---
 pelican/generators.py | 1 +
 pelican/signals.py    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index b7612fa2..09541191 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -482,6 +482,7 @@ class ArticlesGenerator(Generator):
     def generate_output(self, writer):
         self.generate_feeds(writer)
         self.generate_pages(writer)
+        signals.article_writer_finalized.send(self, writer=writer)
 
 
 class PagesGenerator(Generator):
diff --git a/pelican/signals.py b/pelican/signals.py
index 8fc1d7eb..812dfbac 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -19,6 +19,7 @@ generator_init = signal('generator_init')
 article_generator_init = signal('article_generator_init')
 article_generator_finalized = signal('article_generator_finalized')
 article_generator_write_article = signal('article_generator_write_article')
+article_writer_finalized = signal('article_writer_finalized')
 
 page_generator_init = signal('page_generator_init')
 page_generator_finalized = signal('page_generator_finalized')

From 45bc018672b91da00ce2af73b026c882e9dddde7 Mon Sep 17 00:00:00 2001
From: Alistair Magee <alistair.magee@gmail.com>
Date: Sat, 25 Jan 2014 20:44:15 +0000
Subject: [PATCH 1549/2864] add the new signal to the docs

---
 docs/plugins.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 5a4bca22..b38e036f 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -78,6 +78,8 @@ article_generator_preread           article_generator              invoked befor
 article_generator_init              article_generator              invoked in the ArticlesGenerator.__init__
 article_generator_finalized         article_generator              invoked at the end of ArticlesGenerator.generate_context
 article_generator_write_article     article_generator, content     invoked before writing each article, the article is passed as content
+article_writer_finalized            article_generator, writer      invoked after all articles and related pages have been written, but before
+                                                                   the article generator is closed.
 get_generators                      generators                     invoked in Pelican.get_generator_classes,
                                                                    can return a Generator, or several
                                                                    generator in a tuple or in a list.

From ea3e160db12be85e9c56dab204227ca22b65f71d Mon Sep 17 00:00:00 2001
From: Alistair Magee <alistair.magee@gmail.com>
Date: Fri, 10 Jan 2014 16:09:29 +0000
Subject: [PATCH 1550/2864] Extra functionality for pelican-import for
 wordpress imports

---
 pelican/tests/content/wordpressexport.xml | 269 ++++++++++++++++++++-
 pelican/tests/test_importer.py            | 156 ++++++++++++-
 pelican/tools/pelican_import.py           | 270 +++++++++++++++++-----
 3 files changed, 640 insertions(+), 55 deletions(-)

diff --git a/pelican/tests/content/wordpressexport.xml b/pelican/tests/content/wordpressexport.xml
index 56d9a458..686b0fa7 100644
--- a/pelican/tests/content/wordpressexport.xml
+++ b/pelican/tests/content/wordpressexport.xml
@@ -681,6 +681,273 @@ proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></con
             <wp:meta_key>_edit_last</wp:meta_key>
             <wp:meta_value><![CDATA[3]]></wp:meta_value>
         </wp:postmeta>
+    </item>   
+    <item>
+        <title>A custom post in category 4</title>
+        <link>http://thisisa.test/?p=175</link>
+        <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=175</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+<ul>
+    <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+    <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+</ul>
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>175</wp:post_id>
+        <wp:post_date>2012-02-16 15:52:55</wp:post_date>
+        <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>custpost1cat4</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>custom1</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-4"><![CDATA[Category 4]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
     </item>
-</channel>
+    <item>
+        <title>A custom post in category 5</title>
+        <link>http://thisisa.test/?p=176</link>
+        <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=176</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+<ul>
+    <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+    <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+</ul>
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>176</wp:post_id>
+        <wp:post_date>2012-02-16 15:52:55</wp:post_date>
+        <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>custpost1cat5</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>custom1</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-5"><![CDATA[Category 5]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+        </item>   
+        <item>
+        <title>A 2nd custom post type also in category 5</title>
+        <link>http://thisisa.test/?p=177</link>
+        <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=177</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+<ul>
+    <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+    <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</li>
+</ul>
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>177</wp:post_id>
+        <wp:post_date>2012-02-16 15:52:55</wp:post_date>
+        <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>custpost2cat5</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>custom2</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-5"><![CDATA[Category 5]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+    <item>
+        <title>Attachment with a parent</title>
+        <link>http://thisisa.test/?attachment_id=24</link>
+        <pubDate>Sat, 04 Feb 2012 03:17:33 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisurlisinvalid.notarealdomain/not_an_image.jpg</guid>
+        <description></description>
+        <content:encoded><![CDATA[]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>25</wp:post_id>
+        <wp:post_date>2012-02-04 03:17:33</wp:post_date>
+        <wp:post_date_gmt>2012-02-04 03:17:33</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>attachment-with-a-parent</wp:post_name>
+        <wp:status>inherit</wp:status>
+        <wp:post_parent>8</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>attachment</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <wp:attachment_url>http://thisurlisinvalid.notarealdomain/not_an_image.jpg</wp:attachment_url>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attachment_metadata</wp:meta_key>
+            <wp:meta_value><![CDATA[a:5:{s:5:"width";s:3:"150";s:6:"height";s:3:"186";s:14:"hwstring_small";s:22:"height='96' width='77'";s:4:"file";s:20:"2012/02/pelican.png";s:10:"image_meta";a:10:{s:8:"aperture";s:1:"0";s:6:"credit";s:0:"";s:6:"camera";s:0:"";s:7:"caption";s:0:"";s:17:"created_timestamp";s:1:"0";s:9:"copyright";s:0:"";s:12:"focal_length";s:1:"0";s:3:"iso";s:1:"0";s:13:"shutter_speed";s:1:"0";s:5:"title";s:0:"";}}]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attached_file</wp:meta_key>
+            <wp:meta_value><![CDATA[2012/02/stuff.png]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attachment_image_alt</wp:meta_key>
+            <wp:meta_value><![CDATA[Stuff]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+    <item>
+        <title>2nd Attachment to same parent</title>
+        <link>http://thisisa.test/?attachment_id=25</link>
+        <pubDate>Sat, 04 Feb 2012 03:17:33 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://en.wikipedia.org/wiki/File:Pelikan_Walvis_Bay.jpg</guid>
+        <description></description>
+        <content:encoded><![CDATA[]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>25</wp:post_id>
+        <wp:post_date>2012-02-04 03:17:33</wp:post_date>
+        <wp:post_date_gmt>2012-02-04 03:17:33</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>2nd[attachment-to-same-parent</wp:post_name>
+        <wp:status>inherit</wp:status>
+        <wp:post_parent>8</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>attachment</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <wp:attachment_url>http://en.wikipedia.org/wiki/File:Pelikan_Walvis_Bay.jpg</wp:attachment_url>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attachment_metadata</wp:meta_key>
+            <wp:meta_value><![CDATA[a:5:{s:5:"width";s:3:"150";s:6:"height";s:3:"186";s:14:"hwstring_small";s:22:"height='96' width='77'";s:4:"file";s:20:"2012/02/pelican.png";s:10:"image_meta";a:10:{s:8:"aperture";s:1:"0";s:6:"credit";s:0:"";s:6:"camera";s:0:"";s:7:"caption";s:0:"";s:17:"created_timestamp";s:1:"0";s:9:"copyright";s:0:"";s:12:"focal_length";s:1:"0";s:3:"iso";s:1:"0";s:13:"shutter_speed";s:1:"0";s:5:"title";s:0:"";}}]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attached_file</wp:meta_key>
+            <wp:meta_value><![CDATA[2012/02/stuff.png]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attachment_image_alt</wp:meta_key>
+            <wp:meta_value><![CDATA[Stuff]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+    <item>
+        <title>Attachment with a different parent</title>
+        <link>http://thisisa.test/?attachment_id=26</link>
+        <pubDate>Sat, 04 Feb 2012 03:17:33 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisurlisinvalid.notarealdomain</guid>
+        <description></description>
+        <content:encoded><![CDATA[]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>25</wp:post_id>
+        <wp:post_date>2012-02-04 03:17:33</wp:post_date>
+        <wp:post_date_gmt>2012-02-04 03:17:33</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>attachment-with-a-different-parent</wp:post_name>
+        <wp:status>inherit</wp:status>
+        <wp:post_parent>25</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>attachment</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <wp:attachment_url>http://thisurlisinvalid.notarealdomain</wp:attachment_url>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attachment_metadata</wp:meta_key>
+            <wp:meta_value><![CDATA[a:5:{s:5:"width";s:3:"150";s:6:"height";s:3:"186";s:14:"hwstring_small";s:22:"height='96' width='77'";s:4:"file";s:20:"2012/02/pelican.png";s:10:"image_meta";a:10:{s:8:"aperture";s:1:"0";s:6:"credit";s:0:"";s:6:"camera";s:0:"";s:7:"caption";s:0:"";s:17:"created_timestamp";s:1:"0";s:9:"copyright";s:0:"";s:12:"focal_length";s:1:"0";s:3:"iso";s:1:"0";s:13:"shutter_speed";s:1:"0";s:5:"title";s:0:"";}}]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attached_file</wp:meta_key>
+            <wp:meta_value><![CDATA[2012/02/stuff.png]]></wp:meta_value>
+        </wp:postmeta>
+        <wp:postmeta>
+            <wp:meta_key>_wp_attachment_image_alt</wp:meta_key>
+            <wp:meta_value><![CDATA[Stuff]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
+ </channel>
 </rss>
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 2e882720..9d6f911d 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -4,10 +4,12 @@ from __future__ import unicode_literals, print_function
 import os
 import re
 
-from pelican.tools.pelican_import import wp2fields, fields2pelican, decode_wp_content, build_header
+from pelican.tools.pelican_import import wp2fields, fields2pelican, decode_wp_content, build_header, build_markdown_header, get_attachments, download_attachments
 from pelican.tests.support import (unittest, temporary_folder, mute,
                                    skipIfNoExecutable)
 
+from pelican.utils import slugify
+
 CUR_DIR = os.path.dirname(__file__)
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
 WORDPRESS_ENCODED_CONTENT_SAMPLE = os.path.join(CUR_DIR,
@@ -29,6 +31,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
     def setUp(self):
         self.posts = list(wp2fields(WORDPRESS_XML_SAMPLE))
+        self.custposts = list(wp2fields(WORDPRESS_XML_SAMPLE, True))
 
     def test_ignore_empty_posts(self):
         self.assertTrue(self.posts)
@@ -54,6 +57,112 @@ class TestWordpressXmlImporter(unittest.TestCase):
             fname = list(silent_f2p(test_post, 'markdown', temp, dirpage=True))[0]
             self.assertTrue(fname.endswith('pages%sempty.md' % os.path.sep))
 
+    def test_dircat(self):
+        silent_f2p = mute(True)(fields2pelican)
+        test_posts = []
+        for post in self.posts:
+            # check post kind
+            if len(post[5]) > 0: # Has a category
+                test_posts.append(post)
+        with temporary_folder() as temp:
+            fnames = list(silent_f2p(test_posts, 'markdown', temp, dircat=True))
+        index = 0
+        for post in test_posts:
+            name = post[2]
+            category = slugify(post[5][0])
+            name += '.md'
+            filename = os.path.join(category, name)
+            out_name = fnames[index]
+            self.assertTrue(out_name.endswith(filename))
+            index += 1
+    
+    def test_unless_custom_post_all_items_should_be_pages_or_posts(self):
+        self.assertTrue(self.posts)
+        pages_data = []
+        for title, content, fname, date, author, categ, tags, kind, format in self.posts:
+            if kind == 'page' or kind == 'article':
+                pass
+            else:
+                pages_data.append((title, fname))
+        self.assertEqual(0, len(pages_data))
+    
+    def test_recognise_custom_post_type(self):
+        self.assertTrue(self.custposts)
+        cust_data = []
+        for title, content, fname, date, author, categ, tags, kind, format in self.custposts:
+            if kind == 'article' or kind == 'page':
+                pass
+            else:
+                cust_data.append((title, kind))
+        self.assertEqual(3, len(cust_data))
+        self.assertEqual(('A custom post in category 4', 'custom1'), cust_data[0])
+        self.assertEqual(('A custom post in category 5', 'custom1'), cust_data[1])
+        self.assertEqual(('A 2nd custom post type also in category 5', 'custom2'), cust_data[2])
+     
+    def test_custom_posts_put_in_own_dir(self):
+        silent_f2p = mute(True)(fields2pelican)
+        test_posts = []
+        for post in self.custposts:
+            # check post kind
+            if post[7] == 'article' or post[7] == 'page':
+                pass
+            else:
+                test_posts.append(post)
+        with temporary_folder() as temp:
+            fnames = list(silent_f2p(test_posts, 'markdown', temp, wp_custpost = True))
+        index = 0
+        for post in test_posts:
+            name = post[2]
+            kind = post[7]
+            name += '.md'
+            filename = os.path.join(kind, name)
+            out_name = fnames[index]
+            self.assertTrue(out_name.endswith(filename))
+            index += 1
+
+    def test_custom_posts_put_in_own_dir_and_catagory_sub_dir(self):
+        silent_f2p = mute(True)(fields2pelican)
+        test_posts = []
+        for post in self.custposts:
+            # check post kind
+            if post[7] == 'article' or post[7] == 'page':
+                pass
+            else:
+                test_posts.append(post)
+        with temporary_folder() as temp:
+            fnames = list(silent_f2p(test_posts, 'markdown', temp, 
+                wp_custpost=True, dircat=True))
+        index = 0
+        for post in test_posts:
+            name = post[2]
+            kind = post[7]
+            category = slugify(post[5][0])
+            name += '.md'
+            filename = os.path.join(kind, category, name)
+            out_name = fnames[index]
+            self.assertTrue(out_name.endswith(filename))
+            index += 1
+
+    def test_wp_custpost_true_dirpage_false(self):
+        #pages should only be put in their own directory when dirpage = True
+        silent_f2p = mute(True)(fields2pelican)
+        test_posts = []
+        for post in self.custposts:
+            # check post kind
+            if post[7] == 'page':
+                test_posts.append(post)
+        with temporary_folder() as temp:
+            fnames = list(silent_f2p(test_posts, 'markdown', temp, 
+                wp_custpost=True, dirpage=False))
+        index = 0
+        for post in test_posts:
+            name = post[2]
+            name += '.md'
+            filename = os.path.join('pages', name)
+            out_name = fnames[index]
+            self.assertFalse(out_name.endswith(filename))
+        
+ 
     def test_can_toggle_raw_html_code_parsing(self):
         def r(f):
             with open(f) as infile:
@@ -137,3 +246,48 @@ class TestBuildHeader(unittest.TestCase):
                 'これは広い幅の文字だけで構成されたタイトルです\n' +
                 '##############################################\n\n')
 
+    def test_galleries_added_to_header(self):
+        header = build_header('test', None, None, None, None, 
+                None, ['output/test1', 'output/test2'])
+        self.assertEqual(header, 'test\n####\n' + ':attachments: output/test1, ' 
+                + 'output/test2\n\n')
+
+    def test_galleries_added_to_markdown_header(self):
+        header = build_markdown_header('test', None, None, None, None, None,
+            ['output/test1', 'output/test2'])
+        self.assertEqual(header, 'Title: test\n' + 'Attachments: output/test1, '
+                + 'output/test2\n\n')
+
+@unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')       
+class TestWordpressXMLAttachements(unittest.TestCase):        
+    def setUp(self):
+        self.attachments = get_attachments(WORDPRESS_XML_SAMPLE)
+    
+    def test_recognise_attachments(self):
+        self.assertTrue(self.attachments)
+        self.assertTrue(len(self.attachments.keys()) == 3)
+
+    def test_attachments_associated_with_correct_post(self):
+        self.assertTrue(self.attachments)
+        for post in self.attachments.keys():
+            if post is None:
+                self.assertTrue(self.attachments[post][0] == 'https://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/Pelican_lakes_entrance02.jpg/240px-Pelican_lakes_entrance02.jpg')
+            elif post == 'with-excerpt':
+                self.assertTrue(self.attachments[post][0] == 'http://thisurlisinvalid.notarealdomain/not_an_image.jpg')
+                self.assertTrue(self.attachments[post][1] == 'http://en.wikipedia.org/wiki/File:Pelikan_Walvis_Bay.jpg')
+            elif post == 'with-tags':
+                self.assertTrue(self.attachments[post][0] == 'http://thisurlisinvalid.notarealdomain')
+            else:
+                self.fail('all attachments should match to a filename or None, {}'.format(post))
+
+    def test_download_attachments(self):
+        real_file = os.path.join(CUR_DIR, 'content/article.rst')
+        good_url = 'file://' + real_file
+        bad_url = 'http://www.notarealsite.notarealdomain/not_a_file.txt'
+        silent_da = mute()(download_attachments)
+        with temporary_folder() as temp:
+            #locations = download_attachments(temp, [good_url, bad_url])
+            locations = list(silent_da(temp, [good_url, bad_url]))
+            self.assertTrue(len(locations) == 1)
+            directory = locations[0]
+            self.assertTrue(directory.endswith('content/article.rst'))
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index e3599f0e..b04906c0 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -6,9 +6,15 @@ import argparse
 try:
     # py3k import
     from html.parser import HTMLParser
+    from urllib.request import urlretrieve
+    from urllib.parse import urlparse
+    from urllib.error import URLError
 except ImportError:
     # py2 import
     from HTMLParser import HTMLParser  # NOQA
+    from urllib import urlretrieve
+    from urlparse import urlparse
+    from urllib2 import URLError
 import os
 import re
 import subprocess
@@ -96,22 +102,30 @@ def decode_wp_content(content, br=True):
 
     return content
 
-
-def wp2fields(xml):
-    """Opens a wordpress XML file, and yield Pelican fields"""
+def get_items(xml):
+    """Opens a wordpress xml file and returns a list of items"""
     try:
         from bs4 import BeautifulSoup
     except ImportError:
         error = ('Missing dependency '
                  '"BeautifulSoup4" and "lxml" required to import Wordpress XML files.')
         sys.exit(error)
-
-
     with open(xml, encoding='utf-8') as infile:
         xmlfile = infile.read()
     soup = BeautifulSoup(xmlfile, "xml")
     items = soup.rss.channel.findAll('item')
+    return items
 
+def get_filename(filename, post_id):
+    if filename is not None:
+        return filename
+    else:
+        return post_id
+
+def wp2fields(xml, wp_custpost=False):
+    """Opens a wordpress XML file, and yield Pelican fields"""
+    
+    items = get_items(xml)
     for item in items:
 
         if item.find('status').string == "publish":
@@ -123,26 +137,36 @@ def wp2fields(xml):
                 title = 'No title [%s]' % item.find('post_name').string
                 logger.warn('Post "%s" is lacking a proper title' % title)
 
-            content = item.find('encoded').string
             filename = item.find('post_name').string
-
-            if filename is None:
-                filename = item.find('post_id').string
-
+            post_id = item.find('post_id').string
+            filename = get_filename(filename, post_id)
+            
+            content = item.find('encoded').string
             raw_date = item.find('post_date').string
             date_object = time.strptime(raw_date, "%Y-%m-%d %H:%M:%S")
             date = time.strftime("%Y-%m-%d %H:%M", date_object)
             author = item.find('creator').string
- 
+
             categories = [cat.string for cat in item.findAll('category', {'domain' : 'category'})]
             # caturl = [cat['nicename'] for cat in item.find(domain='category')]
 
             tags = [tag.string for tag in item.findAll('category', {'domain' : 'post_tag'})]
 
             kind = 'article'
-            if item.find('post_type').string == 'page':
+            post_type = item.find('post_type').string
+            if post_type == 'page':
                 kind = 'page'
-
+            elif wp_custpost:
+                if post_type == 'post':
+                    pass
+                # Old behaviour was to name everything not a page as an article.
+                # Theoretically all attachments have status == inherit so
+                # no attachments should be here. But this statement is to 
+                # maintain existing behaviour in case that doesn't hold true.
+                elif post_type == 'attachment':
+                    pass
+                else:
+                    kind = post_type
             yield (title, content, filename, date, author, categories, tags,
                    kind, "wp-html")
 
@@ -410,7 +434,6 @@ def tumblr2fields(api_key, blogname):
         offset += len(posts)
         posts = get_tumblr_posts(api_key, blogname, offset)
 
-
 def feed2fields(file):
     """Read a feed and yield pelican fields"""
     import feedparser
@@ -426,8 +449,7 @@ def feed2fields(file):
         yield (entry.title, entry.description, slug, date, author, [], tags,
                kind, "html")
 
-
-def build_header(title, date, author, categories, tags, slug):
+def build_header(title, date, author, categories, tags, slug, attachments=None):
     from docutils.utils import column_width
 
     """Build a header from a list of fields"""
@@ -442,10 +464,13 @@ def build_header(title, date, author, categories, tags, slug):
         header += ':tags: %s\n' % ', '.join(tags)
     if slug:
         header += ':slug: %s\n' % slug
+    if attachments:
+        header += ':attachments: %s\n' % ', '.join(attachments)
     header += '\n'
     return header
 
-def build_markdown_header(title, date, author, categories, tags, slug):
+def build_markdown_header(title, date, author, categories, tags, slug, 
+        attachments=None):
     """Build a header from a list of fields"""
     header = 'Title: %s\n' % title
     if date:
@@ -458,51 +483,162 @@ def build_markdown_header(title, date, author, categories, tags, slug):
         header += 'Tags: %s\n' % ', '.join(tags)
     if slug:
         header += 'Slug: %s\n' % slug
+    if attachments:
+        header += 'Attachments: %s\n' % ', '.join(attachments)
     header += '\n'
     return header
 
+def get_ext(out_markup, in_markup='html'):
+    if in_markup == 'markdown' or out_markup == 'markdown':
+        ext = '.md'
+    else:
+        ext = '.rst'
+    return ext
+    
+def get_out_filename(output_path, filename, ext, kind, 
+        dirpage, dircat, categories, wp_custpost):
+    filename = os.path.basename(filename)
+
+    # Enforce filename restrictions for various filesystems at once; see
+    # http://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
+    # we do not need to filter words because an extension will be appended
+    filename = re.sub(r'[<>:"/\\|?*^% ]', '-', filename) # invalid chars
+    filename = filename.lstrip('.') # should not start with a dot
+    if not filename:
+        filename = '_'
+    filename = filename[:249] # allow for 5 extra characters
+
+    out_filename = os.path.join(output_path, filename+ext)
+    # option to put page posts in pages/ subdirectory
+    if dirpage and kind == 'page':
+        pages_dir = os.path.join(output_path, 'pages')
+        if not os.path.isdir(pages_dir):
+            os.mkdir(pages_dir)
+        out_filename = os.path.join(pages_dir, filename+ext)
+    elif not dirpage and kind == 'page':
+        pass 
+    # option to put wp custom post types in directories with post type
+    # names. Custom post types can also have categories so option to
+    # create subdirectories with category names
+    elif kind != 'article':
+        if wp_custpost:
+            typename = slugify(kind)
+        else:
+            typename = ''
+            kind = 'article'
+        if dircat and (len(categories) > 0):
+            catname = slugify(categories[0])
+        else:
+            catname = ''
+        out_filename = os.path.join(output_path, typename, 
+            catname, filename+ext)
+        if not os.path.isdir(os.path.join(output_path, typename, catname)):
+            os.makedirs(os.path.join(output_path, typename, catname))
+    # option to put files in directories with categories names
+    elif dircat and (len(categories) > 0):
+        catname = slugify(categories[0])
+        out_filename = os.path.join(output_path, catname, filename+ext)
+        if not os.path.isdir(os.path.join(output_path, catname)):
+            os.mkdir(os.path.join(output_path, catname))
+
+    return out_filename
+
+def get_attachments(xml):
+    """returns a dictionary of posts that have attachments with a list 
+    of the attachment_urls
+    """
+    items = get_items(xml)
+    names = {}
+    attachments = []
+    
+    for item in items:
+        kind = item.find('post_type').string
+        filename = item.find('post_name').string
+        post_id = item.find('post_id').string
+        
+        if kind == 'attachment':
+            attachments.append((item.find('post_parent').string, 
+                item.find('attachment_url').string))
+        else:
+            filename = get_filename(filename, post_id)
+            names[post_id] = filename
+    attachedposts = {}
+    for parent, url in attachments:
+        try:
+            parent_name = names[parent]
+        except KeyError:
+            #attachment's parent is not a valid post
+            parent_name = None
+        
+        try:
+            attachedposts[parent_name].append(url)
+        except KeyError:
+            attachedposts[parent_name] = []
+            attachedposts[parent_name].append(url)
+    return attachedposts
+
+def download_attachments(output_path, urls):
+    """Downloads wordpress attachments and returns a list of paths to 
+    attachments that can be associated with a post (relative path to output 
+    directory). Files that fail to download, will not be added to posts"""
+    locations = []
+    for url in urls:
+        path = urlparse(url).path
+        #teardown path and rebuild to negate any errors with 
+        #os.path.join and leading /'s
+        path = path.split('/')
+        filename = path.pop(-1)
+        localpath = ''
+        for item in path:
+            localpath = os.path.join(localpath, item)
+        full_path = os.path.join(output_path, localpath)
+        if not os.path.exists(full_path):
+            os.makedirs(full_path)
+        print('downloading {}'.format(filename))
+        try:
+            urlretrieve(url, os.path.join(full_path, filename))
+            locations.append(os.path.join(localpath, filename))
+        except URLError as e:
+            error = ("No file could be downloaded from {}; Error {}"
+                    .format(url, e))
+            logger.warn(error)
+        except IOError as e: #Python 2.7 throws an IOError rather Than URLError
+            error = ("No file could be downloaded from {}; Error {}"
+                    .format(url, e))
+            logger.warn(error)
+    return locations
+
+
 def fields2pelican(fields, out_markup, output_path,
         dircat=False, strip_raw=False, disable_slugs=False,
-        dirpage=False, filename_template=None, filter_author=None):
+        dirpage=False, filename_template=None, filter_author=None,
+        wp_custpost=False, wp_attach=False, attachments=None):
     for (title, content, filename, date, author, categories, tags,
             kind, in_markup) in fields:
         if filter_author and filter_author != author:
             continue
         slug = not disable_slugs and filename or None
-        if (in_markup == "markdown") or (out_markup == "markdown") :
-            ext = '.md'
-            header = build_markdown_header(title, date, author, categories, tags, slug)
+
+        if wp_attach and attachments:
+            try:
+                urls = attachments[filename]
+                attached_files = download_attachments(output_path, urls)
+            except KeyError:
+                attached_files = None
+        else: 
+            attached_files = None
+
+        ext = get_ext(out_markup, in_markup)
+        if ext == '.md':
+            header = build_markdown_header(title, date, author, categories, 
+                    tags, slug, attached_files)
         else:
             out_markup = "rst"
-            ext = '.rst'
-            header = build_header(title, date, author, categories, tags, slug)
-
-        filename = os.path.basename(filename)
-
-        # Enforce filename restrictions for various filesystems at once; see
-        # http://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
-        # we do not need to filter words because an extension will be appended
-        filename = re.sub(r'[<>:"/\\|?*^% ]', '-', filename) # invalid chars
-        filename = filename.lstrip('.') # should not start with a dot
-        if not filename:
-            filename = '_'
-        filename = filename[:249] # allow for 5 extra characters
-
-        # option to put page posts in pages/ subdirectory
-        if dirpage and kind == 'page':
-            pages_dir = os.path.join(output_path, 'pages')
-            if not os.path.isdir(pages_dir):
-                os.mkdir(pages_dir)
-            out_filename = os.path.join(pages_dir, filename+ext)
-        # option to put files in directories with categories names
-        elif dircat and (len(categories) > 0):
-            catname = slugify(categories[0])
-            out_filename = os.path.join(output_path, catname, filename+ext)
-            if not os.path.isdir(os.path.join(output_path, catname)):
-                os.mkdir(os.path.join(output_path, catname))
-        else:
-            out_filename = os.path.join(output_path, filename+ext)
+            header = build_header(title, date, author, categories, 
+                    tags, slug, attached_files)
 
+        out_filename = get_out_filename(output_path, filename, ext,
+                kind, dirpage, dircat, categories, wp_custpost)
         print(out_filename)
 
         if in_markup in ("html", "wp-html"):
@@ -550,8 +686,11 @@ def fields2pelican(fields, out_markup, output_path,
 
         with open(out_filename, 'w', encoding='utf-8') as fs:
             fs.write(header + content)
-
-
+    if wp_attach and attachments and None in attachments:
+        print("downloading attachments that don't have a parent post")
+        urls = attachments[None]
+        orphan_galleries = download_attachments(output_path, urls)
+            
 def main():
     parser = argparse.ArgumentParser(
         description="Transform feed, WordPress, Tumblr, Dotclear, or Posterous "
@@ -584,6 +723,19 @@ def main():
     parser.add_argument('--strip-raw', action='store_true', dest='strip_raw',
         help="Strip raw HTML code that can't be converted to "
              "markup such as flash embeds or iframes (wordpress import only)")
+    parser.add_argument('--wp-custpost', action='store_true', 
+        dest='wp_custpost',
+        help='Put wordpress custom post types in directories. If used with '
+             '--dir-cat option directories will be created as '
+             '/post_type/category/ (wordpress import only)')
+    parser.add_argument('--wp-attach', action='store_true', dest='wp_attach',
+        help='(wordpress import only) Download files uploaded to wordpress as '
+             'attachments. Files will be added to posts as a list in the post '
+             'header. All files will be downloaded, even if '
+             "they aren't associated with a post. Files with be downloaded "
+             'with their original path inside the output directory. '
+             'e.g. output/wp-uploads/date/postname/file.jpg '
+             '-- Requires an internet connection --')
     parser.add_argument('--disable-slugs', action='store_true',
         dest='disable_slugs',
         help='Disable storing slugs from imported posts within output. '
@@ -620,8 +772,12 @@ def main():
             error = "Unable to create the output folder: " + args.output
             exit(error)
 
+    if args.wp_attach and input_type != 'wordpress':
+        error = "You must be importing a wordpress xml to use the --wp-attach option"
+        exit(error)
+          
     if input_type == 'wordpress':
-        fields = wp2fields(args.input)
+        fields = wp2fields(args.input, args.wp_custpost or False)
     elif input_type == 'dotclear':
         fields = dc2fields(args.input)
     elif input_type == 'posterous':
@@ -631,6 +787,11 @@ def main():
     elif input_type == 'feed':
         fields = feed2fields(args.input)
 
+    if args.wp_attach:
+        attachments = get_attachments(args.input)
+    else:
+        attachments = None
+
     init() # init logging
 
     fields2pelican(fields, args.markup, args.output,
@@ -638,4 +799,7 @@ def main():
                    dirpage=args.dirpage or False,
                    strip_raw=args.strip_raw or False,
                    disable_slugs=args.disable_slugs or False,
-                   filter_author=args.author)
+                   filter_author=args.author,
+                   wp_custpost = args.wp_custpost or False,
+                   wp_attach = args.wp_attach or False,
+                   attachments = attachments or None)

From f6e27617f80aabee8fef4e90340ce84c776583b0 Mon Sep 17 00:00:00 2001
From: fenekku <fenekku@fenekku.com>
Date: Sun, 26 Jan 2014 10:12:01 -0500
Subject: [PATCH 1551/2864] Add period to period_archives context. Refs #1044.

* Adds period tuple of (year, month, day) matching the time
  period of the current archive. Note that this is done
  to the archive context if period_archives.html doesn't exist.
* Adds tests to verify this.
* Adds documentation in themes.rst about period in period_archives.html.
---
 docs/themes.rst                               | 23 +++++++
 pelican/generators.py                         | 39 ++++++++----
 pelican/tests/test_generators.py              | 60 +++++++++++++++++++
 .../notmyidea/templates/period_archives.html  | 13 ++++
 .../simple/templates/period_archives.html     | 11 ++++
 5 files changed, 133 insertions(+), 13 deletions(-)
 create mode 100644 pelican/themes/notmyidea/templates/period_archives.html
 create mode 100644 pelican/themes/simple/templates/period_archives.html

diff --git a/docs/themes.rst b/docs/themes.rst
index 8362ec70..b029e816 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -253,6 +253,29 @@ page_name               TAG_URL where everything after `{slug}` is removed
                         -- useful for pagination links
 ===================     ===================================================
 
+period_archives.html
+--------------------
+
+This template will be processed for each year of your posts if a path
+for YEAR_ARCHIVE_SAVE_AS is defined, each month if MONTH_ARCHIVE_SAVE_AS
+is defined and each day if DAY_ARCHIVE_SAVE_AS is defined.
+
+===================     ===================================================
+Variable                Description
+===================     ===================================================
+period                  A tuple of the form (`year`, `month`, `day`) that
+                        indicates the current time period. `year` and `day`
+                        are numbers while `month` is a string. This tuple
+                        only contains `year` if the time period is a
+                        given year. It contains both `year` and `month`
+                        if the time period is over years and months and
+                        so on.
+
+===================     ===================================================
+
+You can see an example of how to use `period` in the ``simple`` theme's
+period_archives.html
+
 Feeds
 =====
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 09541191..fe81baa9 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -7,6 +7,7 @@ import random
 import logging
 import shutil
 import fnmatch
+import calendar
 
 from codecs import open
 from collections import defaultdict
@@ -279,6 +280,18 @@ class ArticlesGenerator(Generator):
         except Exception:
             template = self.get_template('archives')
 
+        period_save_as = {
+            'year': self.settings['YEAR_ARCHIVE_SAVE_AS'],
+            'month': self.settings['MONTH_ARCHIVE_SAVE_AS'],
+            'day': self.settings['DAY_ARCHIVE_SAVE_AS'],
+        }
+
+        period_date_key = {
+            'year': attrgetter('date.year'),
+            'month': attrgetter('date.year', 'date.month'),
+            'day': attrgetter('date.year', 'date.month', 'date.day')
+        }
+
         def _generate_period_archives(dates, key, save_as_fmt):
             """Generate period archives from `dates`, grouped by
             `key` and written to `save_as`.
@@ -291,21 +304,21 @@ class ArticlesGenerator(Generator):
                 # period archive dates
                 date = archive[0].date
                 save_as = save_as_fmt.format(date=date)
-                write(save_as, template, self.context,
+                context = self.context.copy()
+
+                if key == period_date_key['year']:
+                    context["period"] = (_period,)
+                elif key == period_date_key['month']:
+                    context["period"] = (_period[0],
+                                         calendar.month_name[_period[1]])
+                else:
+                    context["period"] = (_period[0],
+                                         calendar.month_name[_period[1]],
+                                         _period[2])
+
+                write(save_as, template, context,
                       dates=archive, blog=True)
 
-        period_save_as = {
-            'year': self.settings['YEAR_ARCHIVE_SAVE_AS'],
-            'month': self.settings['MONTH_ARCHIVE_SAVE_AS'],
-            'day': self.settings['DAY_ARCHIVE_SAVE_AS'],
-        }
-
-        period_date_key = {
-            'year': attrgetter('date.year'),
-            'month': attrgetter('date.year', 'date.month'),
-            'day': attrgetter('date.year', 'date.month', 'date.day')
-        }
-
         for period in 'year', 'month', 'day':
             save_as = period_save_as[period]
             if save_as:
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 150d30f5..eddaa504 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -197,6 +197,66 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertIn(custom_template, self.articles)
         self.assertIn(standard_template, self.articles)
 
+    def test_period_in_timeperiod_archive(self):
+        """
+        Test that the context of a generated period_archive is passed
+        'period' : a tuple of year, month, day according to the time period
+        """
+        settings = get_settings(filenames={})
+
+        settings['YEAR_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/index.html'
+        generator = ArticlesGenerator(
+            context=settings, settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        write = MagicMock()
+        generator.generate_period_archives(write)
+        dates = [d for d in generator.dates if d.date.year == 1970]
+        self.assertEqual(len(dates), 1)
+        #among other things it must have at least been called with this
+        settings["period"] = (1970,)
+        write.assert_called_with("posts/1970/index.html",
+                                 generator.get_template("period_archives"),
+                                 settings,
+                                 blog=True, dates=dates)
+
+        del settings["period"]
+        settings['MONTH_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/{date:%b}/index.html'
+        generator = ArticlesGenerator(
+            context=settings, settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        write = MagicMock()
+        generator.generate_period_archives(write)
+        dates = [d for d in generator.dates if d.date.year == 1970
+                                            and d.date.month == 1]
+        self.assertEqual(len(dates), 1)
+        settings["period"] = (1970, "January")
+        #among other things it must have at least been called with this
+        write.assert_called_with("posts/1970/Jan/index.html",
+                                 generator.get_template("period_archives"),
+                                 settings,
+                                 blog=True, dates=dates)
+
+        del settings["period"]
+        settings['DAY_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/{date:%b}/{date:%d}/index.html'
+        generator = ArticlesGenerator(
+            context=settings, settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        write = MagicMock()
+        generator.generate_period_archives(write)
+        dates = [d for d in generator.dates if d.date.year == 1970
+                                            and d.date.month == 1
+                                            and d.date.day == 1]
+        self.assertEqual(len(dates), 1)
+        settings["period"] = (1970, "January", 1)
+        #among other things it must have at least been called with this
+        write.assert_called_with("posts/1970/Jan/01/index.html",
+                                 generator.get_template("period_archives"),
+                                 settings,
+                                 blog=True, dates=dates)
+
 
 class TestPageGenerator(unittest.TestCase):
     # Note: Every time you want to test for a new field; Make sure the test
diff --git a/pelican/themes/notmyidea/templates/period_archives.html b/pelican/themes/notmyidea/templates/period_archives.html
new file mode 100644
index 00000000..252e002f
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/period_archives.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block content %}
+<section id="content" class="body">
+<h1>Archives for {{ period | reverse | join(' ') }}</h1>
+
+<dl>
+{% for article in dates %}
+    <dt>{{ article.locale_date }}</dt>
+    <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+{% endfor %}
+</dl>
+</section>
+{% endblock %}
diff --git a/pelican/themes/simple/templates/period_archives.html b/pelican/themes/simple/templates/period_archives.html
new file mode 100644
index 00000000..d930dbbb
--- /dev/null
+++ b/pelican/themes/simple/templates/period_archives.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+{% block content %}
+<h1>Archives for {{ period | reverse | join(' ') }}</h1>
+
+<dl>
+{% for article in dates %}
+    <dt>{{ article.locale_date }}</dt>
+    <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+{% endfor %}
+</dl>
+{% endblock %}

From 22762f2c1630d40b95e97d2a2afd2b1c7d2dfe64 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Fri, 7 Feb 2014 08:34:27 +0100
Subject: [PATCH 1552/2864] add signal article_generator_pretaxonomy

invoked before categories and tags lists are created
useful when e.g. modifying the list of articles to be generated
so that removed articles are not leaked in categories or tags
---
 docs/plugins.rst      | 3 +++
 pelican/generators.py | 2 ++
 pelican/signals.py    | 1 +
 3 files changed, 6 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index b38e036f..c03b1251 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -76,6 +76,9 @@ article_generator_context           article_generator, metadata
 article_generator_preread           article_generator              invoked before a article is read in ArticlesGenerator.generate_context;
                                                                    use if code needs to do something before every article is parsed
 article_generator_init              article_generator              invoked in the ArticlesGenerator.__init__
+article_generator_pretaxonomy       article_generator              invoked before categories and tags lists are created
+                                                                   useful when e.g. modifying the list of articles to be generated
+                                                                   so that removed articles are not leaked in categories or tags
 article_generator_finalized         article_generator              invoked at the end of ArticlesGenerator.generate_context
 article_generator_write_article     article_generator, content     invoked before writing each article, the article is passed as content
 article_writer_finalized            article_generator, writer      invoked after all articles and related pages have been written, but before
diff --git a/pelican/generators.py b/pelican/generators.py
index 5a560b05..758747e0 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -421,6 +421,8 @@ class ArticlesGenerator(Generator):
 
         self.articles, self.translations = process_translations(all_articles)
 
+        signals.article_generator_pretaxonomy.send(self)        
+
         for article in self.articles:
             # only main articles are listed in categories and tags
             # not translations
diff --git a/pelican/signals.py b/pelican/signals.py
index 812dfbac..9eb907dc 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -17,6 +17,7 @@ readers_init = signal('readers_init')
 generator_init = signal('generator_init')
 
 article_generator_init = signal('article_generator_init')
+article_generator_pretaxonomy = signal('article_generator_pretaxonomy')
 article_generator_finalized = signal('article_generator_finalized')
 article_generator_write_article = signal('article_generator_write_article')
 article_writer_finalized = signal('article_writer_finalized')

From 45e1aa112fa9ffb12bf6eaa487b41997d5a68ebc Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 7 Feb 2014 17:05:15 -0800
Subject: [PATCH 1553/2864] Clarify docs re: settings file

---
 docs/settings.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9371b8ed..d4d5d073 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -4,11 +4,14 @@ Settings
 Pelican is configurable thanks to a configuration file you can pass to
 the command line::
 
-    $ pelican -s path/to/your/settingsfile.py path
+    $ pelican content -s path/to/your/settingsfile.py
 
-Settings are configured in the form of a Python module (a file). You can see an
-example by looking at `/samples/pelican.conf.py
+(If you used the `pelican-quickstart` command, your primary settings file will be named `pelicanconf.py` by default.)
+
+Settings are configured in the form of a Python module (a file). There is an
+`example settings file
 <https://github.com/getpelican/pelican/raw/master/samples/pelican.conf.py>`_
+available for reference.
 
 All the setting identifiers must be set in all-caps, otherwise they will not be
 processed. Setting values that are numbers (5, 20, etc.), booleans (True,

From a9d1fdae3d84c0fe80ea5cda513bc335069b1c17 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 8 Feb 2014 14:32:58 -0800
Subject: [PATCH 1554/2864] PY and PELICAN env variable overrides for Make

This allows the user to set PY and/or PELICAN environment variable
overrides, which will be respected by the Makefile and devserver.sh.
If, for example, the default Python on your system were Python 3 and
you wanted to run Make with Python 2, using bash you could run
`PY=python2 make`. Refs #915.
---
 docs/getting_started.rst                     | 6 ++++++
 pelican/tools/pelican_quickstart.py          | 8 ++++----
 pelican/tools/templates/Makefile.in          | 2 +-
 pelican/tools/templates/develop_server.sh.in | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 593b2e35..f302d8d7 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -271,6 +271,12 @@ use rsync over ssh::
 
 That's it! Your site should now be live.
 
+(The default ``Makefile`` and ``devserver.sh`` scripts use the ``python`` and
+``pelican`` executables to complete its tasks. If you want to use different
+executables, such as ``python3``, you can set the ``PY`` and ``PELICAN``
+environment variables, respectively, to override the default executable names.)
+
+
 Writing content using Pelican
 =============================
 
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index b7ebd081..b24a508c 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -274,9 +274,9 @@ needed by Pelican.
         try:
             with codecs.open(os.path.join(CONF['basedir'], 'Makefile'), 'w', 'utf-8') as fd:
                 mkfile_template_name = 'Makefile'
-                py_v = 'PY=python'
+                py_v = 'PY?=python'
                 if six.PY3:
-                    py_v = 'PY=python3'
+                    py_v = 'PY?=python3'
                 template = string.Template(py_v)
                 fd.write(template.safe_substitute(CONF))
                 fd.write('\n')
@@ -296,9 +296,9 @@ needed by Pelican.
         try:
             with codecs.open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w', 'utf-8') as fd:
                 lines = list(get_template('develop_server.sh'))
-                py_v = 'PY=python\n'
+                py_v = 'PY=${PY:-python}\n'
                 if six.PY3:
-                    py_v = 'PY=python3\n'
+                    py_v = 'PY=${PY:-python3}\n'
                 lines = lines[:4] + [py_v] + lines[4:]
                 for line in lines:
                     template = string.Template(line)
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 38b8b82a..fe7a60a4 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -1,4 +1,4 @@
-PELICAN=$pelican
+PELICAN?=$pelican
 PELICANOPTS=$pelicanopts
 
 BASEDIR=$$(CURDIR)
diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index 195d9d6e..4259af5b 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -2,7 +2,7 @@
 ##
 # This section should match your Makefile
 ##
-PELICAN=$pelican
+PELICAN=$${PELICAN:-$pelican}
 PELICANOPTS=$pelicanopts
 
 BASEDIR=$$(pwd)

From 6b0a99932fc6d1be9f22e0fd4fa3321f4344ad0f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 9 Feb 2014 08:45:06 -0800
Subject: [PATCH 1555/2864] Revert test-failing change from #1114

---
 pelican/tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 940849d8..b04906c0 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -112,7 +112,7 @@ def get_items(xml):
         sys.exit(error)
     with open(xml, encoding='utf-8') as infile:
         xmlfile = infile.read()
-    soup = BeautifulSoup(xmlfile, "lxml")
+    soup = BeautifulSoup(xmlfile, "xml")
     items = soup.rss.channel.findAll('item')
     return items
 

From 70a690650de728c7640aedaa6048706cf1ea612d Mon Sep 17 00:00:00 2001
From: Colin Dunklau <colin.dunklau@gmail.com>
Date: Fri, 19 Apr 2013 22:15:00 -0500
Subject: [PATCH 1556/2864] Updated github mark for notmyidea

The smallest mark GitHub provides in the bundle is 32x32. Since they
explicitly say don't resize the mark, I asked them to provide a 16x16
so we could use it. I received the 16x16 in this commit from GitHub
support.

However, they suggested we use the 32x32 and use CSS rules to adjust
the size:

"...we use the 32px for both and employ css background and background-
size rules to handle retina displays. I recommend that technique,
since retina users will see a mess of pixels for icons that small."

This sounds like reasonable advice. Should we consider migrating the
notmyidea social icons to 32x32, with appropriate CSS to adjust the
sizes?
---
 .../notmyidea/static/images/icons/github.png   | Bin 346 -> 1510 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pelican/themes/notmyidea/static/images/icons/github.png b/pelican/themes/notmyidea/static/images/icons/github.png
index 6c52b486c5e392261c24d53fe2609e54d4f07c5d..ea7ac8eeff880bb7743fdafdc8165e693becae09 100644
GIT binary patch
literal 1510
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87
z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$
zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&`K2Yc
zN<f!FypUS}H#V;r8ce_d)2~P@&^OdG0C@?f(AO8g(%f9Q>f(~1RD^r68eAMwS&*t9
zlv<o$T9gcoxHM&uRRvbgMX8A;`9&f5`8lvq49LhY$uG{xFHmp}HdD~>O-#<r0|{t?
zb@=*PdFB<DB<3Zjdb-#u0nO0M%uKOzc5*Xvb#k+GG&D0cG;}p`GB+}EaWS+sax`>y
zH8OIA>2=9ZF3nBND}m`vLFjeFsTY(OatnYqyQCInmZhe+73JqDfIV%MiQ6saIL(9V
zO~LIJ3!HlOfsWA!MJ-ZP!-Rn82gHOYTp$OY^i%VI>AeV;u(#Yd@MB<Litu!C45_%)
z6MQ!Nii61fGd`1i)o#9B$GU!=i{Qrv7xMl(ec8~_zSrYmvr@>%_X10f+AmzBus34G
zi-ih{zAcc`z0yCqN?>JJ;>z83fm%0p?vFIP9pL@(;O&{U^83Hv%a1eJ<XjTF{Z!u1
zu5&-H>YP?fFk1L})-v0#OZMp3?qvI|5qEoE#*xyy#;TY1^ghsRb^SMWzUL$xh6^$J
zuTBaw2ze}x*_k%g>$8J-muOj6S8M&!yDwwdPN)UDT`%<Kyj?eES>~K&e^tF^IwXX$
zIxA~5E9pnO`E&<WiOrScseU-AZKms1qi-^d>I>z~ZrAq(_V(T0W-G~ZaDCnW`<r#L
z?O(M7RprYbpX>HXIW*$eKa=$h1}fLuWsN2YYWExxyD<Ipw#62|X50_F8?;<XSo!{f
zIiFvjT6e2=atfmgYYM+(`1yhw=}(1Im|j-An-a9oYjer^nx=Dg?uCEiL|b}-|41A)
zRrs%7$rsFUzj(F4qIJ3JkF5(b^6p#sy1m{1ZtA+nG6zzN7>?iIw1{hJ@4Y+ep!lP^
zmTsBJ8Nb$8I>`uat7x{Lzd(A%TFK)dl|G2?y8F&+&XFwV?1;CL=f0}lShxCB7jr>j
zd*jb(nKLxbrEO5zT(E7U^z?##pKI%N5AQBI#w$|UvE4eT;#{f74ois}20VMM!fGci
zec2+<BA)nZQr#z0p2HOfbgrM=7xmWE!JmKfUj?4obJw2he$*kh>dfv#9~av5+_i`=
zIkfH74W+|BS!H7-YNdPK7JCS7)cq~9V^{0XcUAMY&njowlz#BE*sfjeu^CV0@5D2*
ZF`VUQTbsLP)>Kf*>*?y}vd$@?2>?HFLGb_p

delta 319
zcmV-F0l@y|3)%vZB!3BTNLh0L01FZT01FZU(%pXi0003DNkl<ZILnpOu}TAB5Cq__
z4G30NLMlP960C%@K7ef?AfyrmTU%ek)+!(ffwZ;<f*=I0O%?C~gj50HY$oy(E~oym
z-0|<s+|KSEyH6iyiN1fFA?9fCnP_r1>>~E?j1_KiT;z^&w|@$z*CsGUh074yEL{XM
zZ7cf&`*=*r72Z+j+2B5y<+hzU#(AFv+!m8y#^HcNtmEqdUmXGsPJ&&BYk)<>PJbac
z!3$@wEwC5mE`k2GKxqL+9X1|{k^fkbPG1EuO5&~{J{6@4w%#7&G9!Ay3~z<NYk_SY
zqmZh6{XEOE5jd!eiB-Y2uJSCqf0LEn2rO`&+;rC}E1FohG_X$Y&*x9S^Eb}LZO`sG
Rr%M0;002ovPDHLkV1fahjk5p%


From 4f0431f9e98918d6179b02a737f2bf47bc661a2c Mon Sep 17 00:00:00 2001
From: Colin Dunklau <colin.dunklau@gmail.com>
Date: Fri, 19 Apr 2013 22:43:46 -0500
Subject: [PATCH 1557/2864] Updated tests

---
 .../output/basic/theme/images/icons/github.png | Bin 346 -> 1510 bytes
 .../custom/theme/images/icons/github.png       | Bin 346 -> 1510 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/pelican/tests/output/basic/theme/images/icons/github.png b/pelican/tests/output/basic/theme/images/icons/github.png
index 6c52b486c5e392261c24d53fe2609e54d4f07c5d..ea7ac8eeff880bb7743fdafdc8165e693becae09 100644
GIT binary patch
literal 1510
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87
z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$
zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&`K2Yc
zN<f!FypUS}H#V;r8ce_d)2~P@&^OdG0C@?f(AO8g(%f9Q>f(~1RD^r68eAMwS&*t9
zlv<o$T9gcoxHM&uRRvbgMX8A;`9&f5`8lvq49LhY$uG{xFHmp}HdD~>O-#<r0|{t?
zb@=*PdFB<DB<3Zjdb-#u0nO0M%uKOzc5*Xvb#k+GG&D0cG;}p`GB+}EaWS+sax`>y
zH8OIA>2=9ZF3nBND}m`vLFjeFsTY(OatnYqyQCInmZhe+73JqDfIV%MiQ6saIL(9V
zO~LIJ3!HlOfsWA!MJ-ZP!-Rn82gHOYTp$OY^i%VI>AeV;u(#Yd@MB<Litu!C45_%)
z6MQ!Nii61fGd`1i)o#9B$GU!=i{Qrv7xMl(ec8~_zSrYmvr@>%_X10f+AmzBus34G
zi-ih{zAcc`z0yCqN?>JJ;>z83fm%0p?vFIP9pL@(;O&{U^83Hv%a1eJ<XjTF{Z!u1
zu5&-H>YP?fFk1L})-v0#OZMp3?qvI|5qEoE#*xyy#;TY1^ghsRb^SMWzUL$xh6^$J
zuTBaw2ze}x*_k%g>$8J-muOj6S8M&!yDwwdPN)UDT`%<Kyj?eES>~K&e^tF^IwXX$
zIxA~5E9pnO`E&<WiOrScseU-AZKms1qi-^d>I>z~ZrAq(_V(T0W-G~ZaDCnW`<r#L
z?O(M7RprYbpX>HXIW*$eKa=$h1}fLuWsN2YYWExxyD<Ipw#62|X50_F8?;<XSo!{f
zIiFvjT6e2=atfmgYYM+(`1yhw=}(1Im|j-An-a9oYjer^nx=Dg?uCEiL|b}-|41A)
zRrs%7$rsFUzj(F4qIJ3JkF5(b^6p#sy1m{1ZtA+nG6zzN7>?iIw1{hJ@4Y+ep!lP^
zmTsBJ8Nb$8I>`uat7x{Lzd(A%TFK)dl|G2?y8F&+&XFwV?1;CL=f0}lShxCB7jr>j
zd*jb(nKLxbrEO5zT(E7U^z?##pKI%N5AQBI#w$|UvE4eT;#{f74ois}20VMM!fGci
zec2+<BA)nZQr#z0p2HOfbgrM=7xmWE!JmKfUj?4obJw2he$*kh>dfv#9~av5+_i`=
zIkfH74W+|BS!H7-YNdPK7JCS7)cq~9V^{0XcUAMY&njowlz#BE*sfjeu^CV0@5D2*
ZF`VUQTbsLP)>Kf*>*?y}vd$@?2>?HFLGb_p

delta 319
zcmV-F0l@y|3)%vZB!3BTNLh0L01FZT01FZU(%pXi0003DNkl<ZILnpOu}TAB5Cq__
z4G30NLMlP960C%@K7ef?AfyrmTU%ek)+!(ffwZ;<f*=I0O%?C~gj50HY$oy(E~oym
z-0|<s+|KSEyH6iyiN1fFA?9fCnP_r1>>~E?j1_KiT;z^&w|@$z*CsGUh074yEL{XM
zZ7cf&`*=*r72Z+j+2B5y<+hzU#(AFv+!m8y#^HcNtmEqdUmXGsPJ&&BYk)<>PJbac
z!3$@wEwC5mE`k2GKxqL+9X1|{k^fkbPG1EuO5&~{J{6@4w%#7&G9!Ay3~z<NYk_SY
zqmZh6{XEOE5jd!eiB-Y2uJSCqf0LEn2rO`&+;rC}E1FohG_X$Y&*x9S^Eb}LZO`sG
Rr%M0;002ovPDHLkV1fahjk5p%

diff --git a/pelican/tests/output/custom/theme/images/icons/github.png b/pelican/tests/output/custom/theme/images/icons/github.png
index 6c52b486c5e392261c24d53fe2609e54d4f07c5d..ea7ac8eeff880bb7743fdafdc8165e693becae09 100644
GIT binary patch
literal 1510
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87
z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$
zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&`K2Yc
zN<f!FypUS}H#V;r8ce_d)2~P@&^OdG0C@?f(AO8g(%f9Q>f(~1RD^r68eAMwS&*t9
zlv<o$T9gcoxHM&uRRvbgMX8A;`9&f5`8lvq49LhY$uG{xFHmp}HdD~>O-#<r0|{t?
zb@=*PdFB<DB<3Zjdb-#u0nO0M%uKOzc5*Xvb#k+GG&D0cG;}p`GB+}EaWS+sax`>y
zH8OIA>2=9ZF3nBND}m`vLFjeFsTY(OatnYqyQCInmZhe+73JqDfIV%MiQ6saIL(9V
zO~LIJ3!HlOfsWA!MJ-ZP!-Rn82gHOYTp$OY^i%VI>AeV;u(#Yd@MB<Litu!C45_%)
z6MQ!Nii61fGd`1i)o#9B$GU!=i{Qrv7xMl(ec8~_zSrYmvr@>%_X10f+AmzBus34G
zi-ih{zAcc`z0yCqN?>JJ;>z83fm%0p?vFIP9pL@(;O&{U^83Hv%a1eJ<XjTF{Z!u1
zu5&-H>YP?fFk1L})-v0#OZMp3?qvI|5qEoE#*xyy#;TY1^ghsRb^SMWzUL$xh6^$J
zuTBaw2ze}x*_k%g>$8J-muOj6S8M&!yDwwdPN)UDT`%<Kyj?eES>~K&e^tF^IwXX$
zIxA~5E9pnO`E&<WiOrScseU-AZKms1qi-^d>I>z~ZrAq(_V(T0W-G~ZaDCnW`<r#L
z?O(M7RprYbpX>HXIW*$eKa=$h1}fLuWsN2YYWExxyD<Ipw#62|X50_F8?;<XSo!{f
zIiFvjT6e2=atfmgYYM+(`1yhw=}(1Im|j-An-a9oYjer^nx=Dg?uCEiL|b}-|41A)
zRrs%7$rsFUzj(F4qIJ3JkF5(b^6p#sy1m{1ZtA+nG6zzN7>?iIw1{hJ@4Y+ep!lP^
zmTsBJ8Nb$8I>`uat7x{Lzd(A%TFK)dl|G2?y8F&+&XFwV?1;CL=f0}lShxCB7jr>j
zd*jb(nKLxbrEO5zT(E7U^z?##pKI%N5AQBI#w$|UvE4eT;#{f74ois}20VMM!fGci
zec2+<BA)nZQr#z0p2HOfbgrM=7xmWE!JmKfUj?4obJw2he$*kh>dfv#9~av5+_i`=
zIkfH74W+|BS!H7-YNdPK7JCS7)cq~9V^{0XcUAMY&njowlz#BE*sfjeu^CV0@5D2*
ZF`VUQTbsLP)>Kf*>*?y}vd$@?2>?HFLGb_p

delta 319
zcmV-F0l@y|3)%vZB!3BTNLh0L01FZT01FZU(%pXi0003DNkl<ZILnpOu}TAB5Cq__
z4G30NLMlP960C%@K7ef?AfyrmTU%ek)+!(ffwZ;<f*=I0O%?C~gj50HY$oy(E~oym
z-0|<s+|KSEyH6iyiN1fFA?9fCnP_r1>>~E?j1_KiT;z^&w|@$z*CsGUh074yEL{XM
zZ7cf&`*=*r72Z+j+2B5y<+hzU#(AFv+!m8y#^HcNtmEqdUmXGsPJ&&BYk)<>PJbac
z!3$@wEwC5mE`k2GKxqL+9X1|{k^fkbPG1EuO5&~{J{6@4w%#7&G9!Ay3~z<NYk_SY
zqmZh6{XEOE5jd!eiB-Y2uJSCqf0LEn2rO`&+;rC}E1FohG_X$Y&*x9S^Eb}LZO`sG
Rr%M0;002ovPDHLkV1fahjk5p%


From df21315a24fc75f13c120e61b29c8d840c7ae65c Mon Sep 17 00:00:00 2001
From: Colin Dunklau <cdunklau@haivision.com>
Date: Sun, 9 Feb 2014 21:17:39 +0100
Subject: [PATCH 1558/2864] 32px Github logo and CSS shinker

---
 pelican/tests/output/basic/theme/css/main.css |   5 ++++-
 .../basic/theme/images/icons/github.png       | Bin 1510 -> 1714 bytes
 .../tests/output/custom/theme/css/main.css    |   5 ++++-
 .../custom/theme/images/icons/github.png      | Bin 1510 -> 1714 bytes
 pelican/themes/notmyidea/static/css/main.css  |   5 ++++-
 .../notmyidea/static/images/icons/github.png  | Bin 1510 -> 1714 bytes
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index fa0bcf1c..01ee17d8 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -314,7 +314,10 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
 		.social a[href*='github.com'],
-		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
+		.social a[href*='git.io'] {
+			background-image: url('../images/icons/github.png');
+			background-size: 50%;
+		}
 		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
 		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
diff --git a/pelican/tests/output/basic/theme/images/icons/github.png b/pelican/tests/output/basic/theme/images/icons/github.png
index ea7ac8eeff880bb7743fdafdc8165e693becae09..8b25551a97921681334176ee143b41510a117d86 100644
GIT binary patch
delta 1038
zcmaFHy@^+`Gr-TCmrII^fq{Y7)59eQNGpIa2OE$quB!U7QBj>q!PV5z+``ew(bCe<
zz|hdu$kNf!)XCY<z{Jea!qULRWpW0S3`~&|PDM+Y3^bu8S>RHnq)=QEl$vIhGP#gR
z7-pm;F4dC_n4Ripx3KMGU|?49ba4!+xOHTDZbomS#PRc$KE}5VZaQlBbp$D=*?m0d
z>2Yi2S@us8D}OGyqVbV&rEhPmh-Unh{AZ?1d0LkmX#X}iGHqjyT7GqA+_N9CrE_hn
z?|lC_=W*n_U*&U)_y1Y{zt;Bq>C$#*yVFk&olx<S(P934fM>$;v-PzLWNjF?AAI_5
zUitgKAKGdy;u>!9o^qV#zt{c%YXOJiSxL?VA1lrzZn)SV;O*I9oS^Px_giei=5^N%
z*aM$@4w<pY@YDmFww-*-TAH+36Kdn~-ZlSg{8yIEQV`d)ll54u+p-!)L#2yf+*u0r
zwDM2+UvCI25Ep5D!!sxL^8MEOtkz`Ki5A`}Y)cOn@>(!0lADxuB`iTXLHI>k?ryOH
z_lt{472hh?DqC&4byzYqe!o5A=J=M%j2W(+D*d+B$yybDfBnxtpM3HRTmD_`dB0j`
zs4<so{*_bx{#DLfqFpyg)hth4^vjognRQBbr)5P>W$AA&nI(PT(B{G^o%!zl_2H9G
znLo&4U}|~1Rn@3aP+&999rp<PKdZ~1-pJ4F>ugAJK0IMwi{sR)r(dQe9pCVENy)8q
z?|2p~#LR75wu0k?p-GK&WAKOF3-yj~jBQg^P)J%O!nn8XSIssL6^-+!rsik75@pPt
zR=ApJ&febDXE(}B4q6p3PxQc>*2SkT-BDqxm(uB-^!+NE!SAT2MpN4ixSrlFY1}x?
z@A<*9Z9(C)jHi3Qwus1nX{6xk|H;gz^X97{o$o&!H(c4;s@Ev(aA{Q<3$LV8EZ4Ks
zbNR0|T+}p~*OVL`bim|{v4NZL$=C-i_r7-9GV5p6P5;2bksW=<y+K8CCbN6{V)an=
zWyhu}d(@lhbiTAY>>BjEbe&94`18-)S67@*l$@BN*SqdN`->~<xIK*K>`hSJF~4cY
z)%MSB<<p+{da0W4U{A}s%I6~Eo&3=EK#kAEr>YT;;w~gIpDejMYx5Q_mRLsHS*zq*
z6AYLc^$!#s+xO|S!ORZJbjyQW3O}bTW2j8eF?cHO*QJu=X1e0a%=D-yjk_Xu<ecoC
ze|+VhhV2?EMy?ZTw|+T$tvY_r+-rO9P5)Fl%R|NK|K>kJ2@KCHco>}6Gg*LHoWax8
K&t;ucLK6VJzqx4u

delta 832
zcmdnQ`;1$$Gr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93qoO*Kg0qvGk*kxNrK6#l
zsiC2(k(0TRk&BC=rIDkdv#XJj>*Ne38JHqRoQjq(8E8UHGRLJzNujtTC^gM0WpW{t
zFw95`T&gD<Fgw+6xo_adz`zvY>EaktajPfzZ1xogk@;tQCi$w}e7lZy{X7@Jj|(p3
z{dM}Xp`(4T$H8W$kdN;LmK?QTxJY4d#EKUS6&8J4Ag6n!e{z+;%CN+hyYB+EZtC10
zX?8on`{TjeGi&Adf4`R>XR^t;BzF6$yq{g?eqPl%t(IW4@b#=^w)J0^?9s2?$@W_#
z?)JWnBc*qZRWI-9eW2Ou`fuud&q+267h?2ZofKpc@>m+PGi|EZX9x2x(Xy_t*7~J)
zU&gSVPz!duUg*zxyKc_1%sI>cs(Q_INC;(hR@P`%(vNoY=?<zAn=8jt{cuv-OxLYO
z-((oo7s{L6uI~%%?Yq6rR+6Ru;QG4#_c!Zg+rMfFs>+u=KG*G&a%jY_e<tf23{<YQ
z%Nk7*)b2SXc47MGZHp~_&A1<UH)y$(u=4!{b3VU5weD8$<P=5~))aon@bd*V(w_>a
zFukmJHzjDF*XEM-HBIO0+zbE2iMI3v|B*Oqs_<XEk}sIye(`F7MeB0cA6pk><Xzvl
z@O68;|J~Gek7W*|7BL*Z!D$iK)ZTk{(n0Y@cP-sAlQVv;v2>CV+E&qQKYxMrjJ1--
zKPr6?-*xw$*PJ6+&e;)fCC`0TyRmNdt1jk(!uH0W(=umhoJ-rFvbkW}M(ODV`##s!
z>mJ@+bc|P|vSYh-P{p}YksX#2Hw<|8T7}h4s#yB6MV>`G@zbQbPo_MFD-P&fKe;dJ
zt*L`Q|Kz_4JhSJnJ=guHLu}QV-G@FdwCA~N5npm>+p8N&hkvrl#!A#m_qr|i5Zb8w
zTV}_u)}QaH=53!<&af%{;Ayd4yV_$jp32{eXJlhI%gwencg?J+z)Zp5>FVdQ&MBb@
E0Q-+*u>b%7

diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index fa0bcf1c..01ee17d8 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -314,7 +314,10 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
 		.social a[href*='github.com'],
-		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
+		.social a[href*='git.io'] {
+			background-image: url('../images/icons/github.png');
+			background-size: 50%;
+		}
 		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
 		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
diff --git a/pelican/tests/output/custom/theme/images/icons/github.png b/pelican/tests/output/custom/theme/images/icons/github.png
index ea7ac8eeff880bb7743fdafdc8165e693becae09..8b25551a97921681334176ee143b41510a117d86 100644
GIT binary patch
delta 1038
zcmaFHy@^+`Gr-TCmrII^fq{Y7)59eQNGpIa2OE$quB!U7QBj>q!PV5z+``ew(bCe<
zz|hdu$kNf!)XCY<z{Jea!qULRWpW0S3`~&|PDM+Y3^bu8S>RHnq)=QEl$vIhGP#gR
z7-pm;F4dC_n4Ripx3KMGU|?49ba4!+xOHTDZbomS#PRc$KE}5VZaQlBbp$D=*?m0d
z>2Yi2S@us8D}OGyqVbV&rEhPmh-Unh{AZ?1d0LkmX#X}iGHqjyT7GqA+_N9CrE_hn
z?|lC_=W*n_U*&U)_y1Y{zt;Bq>C$#*yVFk&olx<S(P934fM>$;v-PzLWNjF?AAI_5
zUitgKAKGdy;u>!9o^qV#zt{c%YXOJiSxL?VA1lrzZn)SV;O*I9oS^Px_giei=5^N%
z*aM$@4w<pY@YDmFww-*-TAH+36Kdn~-ZlSg{8yIEQV`d)ll54u+p-!)L#2yf+*u0r
zwDM2+UvCI25Ep5D!!sxL^8MEOtkz`Ki5A`}Y)cOn@>(!0lADxuB`iTXLHI>k?ryOH
z_lt{472hh?DqC&4byzYqe!o5A=J=M%j2W(+D*d+B$yybDfBnxtpM3HRTmD_`dB0j`
zs4<so{*_bx{#DLfqFpyg)hth4^vjognRQBbr)5P>W$AA&nI(PT(B{G^o%!zl_2H9G
znLo&4U}|~1Rn@3aP+&999rp<PKdZ~1-pJ4F>ugAJK0IMwi{sR)r(dQe9pCVENy)8q
z?|2p~#LR75wu0k?p-GK&WAKOF3-yj~jBQg^P)J%O!nn8XSIssL6^-+!rsik75@pPt
zR=ApJ&febDXE(}B4q6p3PxQc>*2SkT-BDqxm(uB-^!+NE!SAT2MpN4ixSrlFY1}x?
z@A<*9Z9(C)jHi3Qwus1nX{6xk|H;gz^X97{o$o&!H(c4;s@Ev(aA{Q<3$LV8EZ4Ks
zbNR0|T+}p~*OVL`bim|{v4NZL$=C-i_r7-9GV5p6P5;2bksW=<y+K8CCbN6{V)an=
zWyhu}d(@lhbiTAY>>BjEbe&94`18-)S67@*l$@BN*SqdN`->~<xIK*K>`hSJF~4cY
z)%MSB<<p+{da0W4U{A}s%I6~Eo&3=EK#kAEr>YT;;w~gIpDejMYx5Q_mRLsHS*zq*
z6AYLc^$!#s+xO|S!ORZJbjyQW3O}bTW2j8eF?cHO*QJu=X1e0a%=D-yjk_Xu<ecoC
ze|+VhhV2?EMy?ZTw|+T$tvY_r+-rO9P5)Fl%R|NK|K>kJ2@KCHco>}6Gg*LHoWax8
K&t;ucLK6VJzqx4u

delta 832
zcmdnQ`;1$$Gr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93qoO*Kg0qvGk*kxNrK6#l
zsiC2(k(0TRk&BC=rIDkdv#XJj>*Ne38JHqRoQjq(8E8UHGRLJzNujtTC^gM0WpW{t
zFw95`T&gD<Fgw+6xo_adz`zvY>EaktajPfzZ1xogk@;tQCi$w}e7lZy{X7@Jj|(p3
z{dM}Xp`(4T$H8W$kdN;LmK?QTxJY4d#EKUS6&8J4Ag6n!e{z+;%CN+hyYB+EZtC10
zX?8on`{TjeGi&Adf4`R>XR^t;BzF6$yq{g?eqPl%t(IW4@b#=^w)J0^?9s2?$@W_#
z?)JWnBc*qZRWI-9eW2Ou`fuud&q+267h?2ZofKpc@>m+PGi|EZX9x2x(Xy_t*7~J)
zU&gSVPz!duUg*zxyKc_1%sI>cs(Q_INC;(hR@P`%(vNoY=?<zAn=8jt{cuv-OxLYO
z-((oo7s{L6uI~%%?Yq6rR+6Ru;QG4#_c!Zg+rMfFs>+u=KG*G&a%jY_e<tf23{<YQ
z%Nk7*)b2SXc47MGZHp~_&A1<UH)y$(u=4!{b3VU5weD8$<P=5~))aon@bd*V(w_>a
zFukmJHzjDF*XEM-HBIO0+zbE2iMI3v|B*Oqs_<XEk}sIye(`F7MeB0cA6pk><Xzvl
z@O68;|J~Gek7W*|7BL*Z!D$iK)ZTk{(n0Y@cP-sAlQVv;v2>CV+E&qQKYxMrjJ1--
zKPr6?-*xw$*PJ6+&e;)fCC`0TyRmNdt1jk(!uH0W(=umhoJ-rFvbkW}M(ODV`##s!
z>mJ@+bc|P|vSYh-P{p}YksX#2Hw<|8T7}h4s#yB6MV>`G@zbQbPo_MFD-P&fKe;dJ
zt*L`Q|Kz_4JhSJnJ=guHLu}QV-G@FdwCA~N5npm>+p8N&hkvrl#!A#m_qr|i5Zb8w
zTV}_u)}QaH=53!<&af%{;Ayd4yV_$jp32{eXJlhI%gwencg?J+z)Zp5>FVdQ&MBb@
E0Q-+*u>b%7

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index fa0bcf1c..01ee17d8 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -314,7 +314,10 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
 		.social a[href*='github.com'],
-		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
+		.social a[href*='git.io'] {
+			background-image: url('../images/icons/github.png');
+			background-size: 50%;
+		}
 		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
 		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
diff --git a/pelican/themes/notmyidea/static/images/icons/github.png b/pelican/themes/notmyidea/static/images/icons/github.png
index ea7ac8eeff880bb7743fdafdc8165e693becae09..8b25551a97921681334176ee143b41510a117d86 100644
GIT binary patch
delta 1038
zcmaFHy@^+`Gr-TCmrII^fq{Y7)59eQNGpIa2OE$quB!U7QBj>q!PV5z+``ew(bCe<
zz|hdu$kNf!)XCY<z{Jea!qULRWpW0S3`~&|PDM+Y3^bu8S>RHnq)=QEl$vIhGP#gR
z7-pm;F4dC_n4Ripx3KMGU|?49ba4!+xOHTDZbomS#PRc$KE}5VZaQlBbp$D=*?m0d
z>2Yi2S@us8D}OGyqVbV&rEhPmh-Unh{AZ?1d0LkmX#X}iGHqjyT7GqA+_N9CrE_hn
z?|lC_=W*n_U*&U)_y1Y{zt;Bq>C$#*yVFk&olx<S(P934fM>$;v-PzLWNjF?AAI_5
zUitgKAKGdy;u>!9o^qV#zt{c%YXOJiSxL?VA1lrzZn)SV;O*I9oS^Px_giei=5^N%
z*aM$@4w<pY@YDmFww-*-TAH+36Kdn~-ZlSg{8yIEQV`d)ll54u+p-!)L#2yf+*u0r
zwDM2+UvCI25Ep5D!!sxL^8MEOtkz`Ki5A`}Y)cOn@>(!0lADxuB`iTXLHI>k?ryOH
z_lt{472hh?DqC&4byzYqe!o5A=J=M%j2W(+D*d+B$yybDfBnxtpM3HRTmD_`dB0j`
zs4<so{*_bx{#DLfqFpyg)hth4^vjognRQBbr)5P>W$AA&nI(PT(B{G^o%!zl_2H9G
znLo&4U}|~1Rn@3aP+&999rp<PKdZ~1-pJ4F>ugAJK0IMwi{sR)r(dQe9pCVENy)8q
z?|2p~#LR75wu0k?p-GK&WAKOF3-yj~jBQg^P)J%O!nn8XSIssL6^-+!rsik75@pPt
zR=ApJ&febDXE(}B4q6p3PxQc>*2SkT-BDqxm(uB-^!+NE!SAT2MpN4ixSrlFY1}x?
z@A<*9Z9(C)jHi3Qwus1nX{6xk|H;gz^X97{o$o&!H(c4;s@Ev(aA{Q<3$LV8EZ4Ks
zbNR0|T+}p~*OVL`bim|{v4NZL$=C-i_r7-9GV5p6P5;2bksW=<y+K8CCbN6{V)an=
zWyhu}d(@lhbiTAY>>BjEbe&94`18-)S67@*l$@BN*SqdN`->~<xIK*K>`hSJF~4cY
z)%MSB<<p+{da0W4U{A}s%I6~Eo&3=EK#kAEr>YT;;w~gIpDejMYx5Q_mRLsHS*zq*
z6AYLc^$!#s+xO|S!ORZJbjyQW3O}bTW2j8eF?cHO*QJu=X1e0a%=D-yjk_Xu<ecoC
ze|+VhhV2?EMy?ZTw|+T$tvY_r+-rO9P5)Fl%R|NK|K>kJ2@KCHco>}6Gg*LHoWax8
K&t;ucLK6VJzqx4u

delta 832
zcmdnQ`;1$$Gr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93qoO*Kg0qvGk*kxNrK6#l
zsiC2(k(0TRk&BC=rIDkdv#XJj>*Ne38JHqRoQjq(8E8UHGRLJzNujtTC^gM0WpW{t
zFw95`T&gD<Fgw+6xo_adz`zvY>EaktajPfzZ1xogk@;tQCi$w}e7lZy{X7@Jj|(p3
z{dM}Xp`(4T$H8W$kdN;LmK?QTxJY4d#EKUS6&8J4Ag6n!e{z+;%CN+hyYB+EZtC10
zX?8on`{TjeGi&Adf4`R>XR^t;BzF6$yq{g?eqPl%t(IW4@b#=^w)J0^?9s2?$@W_#
z?)JWnBc*qZRWI-9eW2Ou`fuud&q+267h?2ZofKpc@>m+PGi|EZX9x2x(Xy_t*7~J)
zU&gSVPz!duUg*zxyKc_1%sI>cs(Q_INC;(hR@P`%(vNoY=?<zAn=8jt{cuv-OxLYO
z-((oo7s{L6uI~%%?Yq6rR+6Ru;QG4#_c!Zg+rMfFs>+u=KG*G&a%jY_e<tf23{<YQ
z%Nk7*)b2SXc47MGZHp~_&A1<UH)y$(u=4!{b3VU5weD8$<P=5~))aon@bd*V(w_>a
zFukmJHzjDF*XEM-HBIO0+zbE2iMI3v|B*Oqs_<XEk}sIye(`F7MeB0cA6pk><Xzvl
z@O68;|J~Gek7W*|7BL*Z!D$iK)ZTk{(n0Y@cP-sAlQVv;v2>CV+E&qQKYxMrjJ1--
zKPr6?-*xw$*PJ6+&e;)fCC`0TyRmNdt1jk(!uH0W(=umhoJ-rFvbkW}M(ODV`##s!
z>mJ@+bc|P|vSYh-P{p}YksX#2Hw<|8T7}h4s#yB6MV>`G@zbQbPo_MFD-P&fKe;dJ
zt*L`Q|Kz_4JhSJnJ=guHLu}QV-G@FdwCA~N5npm>+p8N&hkvrl#!A#m_qr|i5Zb8w
zTV}_u)}QaH=53!<&af%{;Ayd4yV_$jp32{eXJlhI%gwencg?J+z)Zp5>FVdQ&MBb@
E0Q-+*u>b%7


From 81e44ed2de330a486db17b1e6d5191871be329ae Mon Sep 17 00:00:00 2001
From: Colin Dunklau <cdunklau@haivision.com>
Date: Sun, 9 Feb 2014 21:20:02 +0100
Subject: [PATCH 1559/2864] Use absolute size for github mark

---
 pelican/tests/output/basic/theme/css/main.css  | 2 +-
 pelican/tests/output/custom/theme/css/main.css | 2 +-
 pelican/themes/notmyidea/static/css/main.css   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 01ee17d8..2efb518d 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -316,7 +316,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='github.com'],
 		.social a[href*='git.io'] {
 			background-image: url('../images/icons/github.png');
-			background-size: 50%;
+			background-size: 16px 16px;
 		}
 		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 01ee17d8..2efb518d 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -316,7 +316,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='github.com'],
 		.social a[href*='git.io'] {
 			background-image: url('../images/icons/github.png');
-			background-size: 50%;
+			background-size: 16px 16px;
 		}
 		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 01ee17d8..2efb518d 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -316,7 +316,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='github.com'],
 		.social a[href*='git.io'] {
 			background-image: url('../images/icons/github.png');
-			background-size: 50%;
+			background-size: 16px 16px;
 		}
 		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
 		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}

From 00e1b68e74ae73b38801d01338e0e33be1003f09 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 12 Feb 2014 10:54:56 -0800
Subject: [PATCH 1560/2864] Revert to newly-revived Typogrify project

Since the Typogrify project will be actively maintained going forward,
there is no need for the fork.
---
 dev_requirements.txt     | 2 +-
 docs/changelog.rst       | 2 --
 docs/getting_started.rst | 2 +-
 docs/settings.rst        | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index b013a00d..c90ac630 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -5,7 +5,7 @@ mock
 Markdown
 BeautifulSoup4
 lxml
-typogrify-web
+typogrify
 
 # To perform release
 bumpr==0.2.0
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1e064e5f..5c8db17f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,8 +4,6 @@ Release history
 Next release
 ============
 
-* Replace the neglected ``typogrify`` package with the actively-maintained
-  ``typogrify-web`` package.
 * Added the `:modified:` metadata field to complement `:date:`.
   Used to specify the last date and time an article was updated independently from the date and time it was published.
 * Produce inline links instead of reference-style links when importing content.
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index f302d8d7..53b466a0 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -136,7 +136,7 @@ manually via ``pip``:
 
 * `markdown <http://pypi.python.org/pypi/Markdown>`_, for supporting Markdown as
   an input format
-* `typogrify-web <http://pypi.python.org/pypi/typogrify-web>`_, for
+* `typogrify <http://pypi.python.org/pypi/typogrify>`_, for
   typographical enhancements
 
 Kickstart your site
diff --git a/docs/settings.rst b/docs/settings.rst
index d4d5d073..ca92a19e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -136,8 +136,8 @@ Setting name (default value)
                                                                                  section below for more info.
 `TYPOGRIFY` (``False``)                                                          If set to True, several typographical improvements will be
                                                                                  incorporated into the generated HTML via the `Typogrify
-                                                                                 <https://pypi.python.org/pypi/typogrify-web>`_ library,
-                                                                                 which can be installed via: ``pip install typogrify-web``
+                                                                                 <https://pypi.python.org/pypi/typogrify>`_ library,
+                                                                                 which can be installed via: ``pip install typogrify``
 `DIRECT_TEMPLATES` (``('index', 'tags', 'categories', 'authors', 'archives')``)  List of templates that are used directly to render
                                                                                  content. Typically direct templates are used to generate
                                                                                  index pages for collections of content (e.g., tags and

From e55e5501984f1ee276f6fe54366062f99b729678 Mon Sep 17 00:00:00 2001
From: Utku Demir <utdemir@gmail.com>
Date: Thu, 13 Feb 2014 12:21:29 +0200
Subject: [PATCH 1561/2864] Fix issue #1258

Correctly handle DEFAULT_DATE = None .
---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index d070a19c..7cb59f5a 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -520,7 +520,7 @@ def default_metadata(settings=None, process=None):
             if process:
                 value = process('category', value)
             metadata['category'] = value
-        if 'DEFAULT_DATE' in settings and settings['DEFAULT_DATE'] != 'fs':
+        if settings.get('DEFAULT_DATE', None) and settings['DEFAULT_DATE'] != 'fs':
             metadata['date'] = datetime.datetime(*settings['DEFAULT_DATE'])
     return metadata
 

From 2c25e488c4bc1bd72c592354967497b93ce57e49 Mon Sep 17 00:00:00 2001
From: Anatoly Bubenkov <bubenkoff@gmail.com>
Date: Fri, 5 Jul 2013 01:08:45 +0200
Subject: [PATCH 1562/2864] multiple authors implemented

---
 docs/changelog.rst                            |  1 +
 docs/getting_started.rst                      | 15 ++++---
 pelican/contents.py                           | 10 ++++-
 pelican/generators.py                         |  8 ++--
 pelican/readers.py                            |  4 ++
 .../content/article_with_multiple_authors.rst |  6 +++
 pelican/tests/test_contents.py                | 11 +++++
 pelican/tests/test_generators.py              | 11 +++++
 pelican/tests/test_importer.py                | 28 ++++++------
 pelican/tests/test_pelican.py                 | 15 ++++---
 pelican/tests/test_readers.py                 |  9 ++++
 .../notmyidea/templates/article_infos.html    |  6 ++-
 .../themes/notmyidea/templates/authors.html   |  1 -
 pelican/themes/simple/templates/article.html  |  6 ++-
 pelican/themes/simple/templates/index.html    |  6 ++-
 pelican/tools/pelican_import.py               | 44 +++++++++----------
 16 files changed, 122 insertions(+), 59 deletions(-)
 create mode 100644 pelican/tests/content/article_with_multiple_authors.rst

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5c8db17f..68348da5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Next release
 * Added the `:modified:` metadata field to complement `:date:`.
   Used to specify the last date and time an article was updated independently from the date and time it was published.
 * Produce inline links instead of reference-style links when importing content.
+* Multiple authors support added via new `:authors:` metadata field.
 
 3.3.0 (2013-09-24)
 ==================
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 53b466a0..6655d8d6 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -311,7 +311,7 @@ this metadata in text files via the following syntax (give your file the
     :tags: thats, awesome
     :category: yeah
     :slug: my-super-post
-    :author: Alexis Metaireau
+    :authors: Alexis Metaireau, Conan Doyle
     :summary: Short version for index and feeds
 
 Pelican implements an extension to reStructuredText to enable support for the
@@ -331,7 +331,7 @@ pattern::
     Category: Python
     Tags: pelican, publishing
     Slug: my-super-post
-    Author: Alexis Metaireau
+    Authors: Alexis Metaireau, Conan Doyle
     Summary: Short version for index and feeds
 
     This is the content of my super blog post.
@@ -351,7 +351,7 @@ interprets the HTML in a very straightforward manner, reading metadata from
             <meta name="date" content="2012-07-09 22:28" />
             <meta name="modified" content="2012-07-10 20:14" />
             <meta name="category" content="yeah" />
-            <meta name="author" content="Alexis Métaireau" />
+            <meta name="authors" content="Alexis Métaireau, Conan Doyle" />
             <meta name="summary" content="Short version for index and feeds" />
         </head>
         <body>
@@ -380,6 +380,9 @@ __ `W3C ISO 8601`_
 Besides you can show ``modified`` in the templates, feed entries in feed readers will be updated automatically
 when you set ``modified`` to the current date after you modified your article.
 
+``authors`` is a comma-separated list of article authors. If there's only one author you
+can use ``author`` field.
+
 If you do not explicitly specify summary metadata for a given post, the
 ``SUMMARY_MAX_LENGTH`` setting can be used to specify how many words from the
 beginning of an article are used as the summary.
@@ -587,12 +590,12 @@ classprefix     string        String to prepend to token class names
 hl_lines        numbers       List of lines to be highlighted.
 lineanchors     string        Wrap each line in an anchor using this
                               string and -linenumber.
-linenos         string        If present or set to "table" output line 
+linenos         string        If present or set to "table" output line
                               numbers in a table, if set to
                               "inline" output them inline. "none" means
-                              do not output the line numbers for this 
+                              do not output the line numbers for this
                               table.
-linenospecial   number        If set every nth line will be given the 
+linenospecial   number        If set every nth line will be given the
                               'special' css class.
 linenostart     number        Line number for the first line.
 linenostep      number        Print every nth line number.
diff --git a/pelican/contents.py b/pelican/contents.py
index 51ef8a22..69b7fa69 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -74,11 +74,17 @@ class Content(object):
         #default template if it's not defined in page
         self.template = self._get_template()
 
-        # default author to the one in settings if not defined
+        # First, read the authors from "authors", if not, fallback to "author"
+        # and if not use the settings defined one, if any.
         if not hasattr(self, 'author'):
-            if 'AUTHOR' in settings:
+            if hasattr(self, 'authors'):
+                self.author = self.authors[0]
+            elif 'AUTHOR' in settings:
                 self.author = Author(settings['AUTHOR'], settings)
 
+        if not hasattr(self, 'authors') and hasattr(self, 'author'):
+            self.authors = [self.author]
+
         # XXX Split all the following code into pieces, there is too much here.
 
         # manage languages
diff --git a/pelican/generators.py b/pelican/generators.py
index 8c5f446b..d1034eb0 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -434,7 +434,7 @@ class ArticlesGenerator(Generator):
 
         self.articles, self.translations = process_translations(all_articles)
 
-        signals.article_generator_pretaxonomy.send(self)        
+        signals.article_generator_pretaxonomy.send(self)
 
         for article in self.articles:
             # only main articles are listed in categories and tags
@@ -444,9 +444,9 @@ class ArticlesGenerator(Generator):
                 for tag in article.tags:
                     self.tags[tag].append(article)
             # ignore blank authors as well as undefined
-            if hasattr(article, 'author') and article.author.name != '':
-                self.authors[article.author].append(article)
-
+            for author in getattr(article, 'authors', []):
+                if author.name != '':
+                    self.authors[author].append(article)
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
         self.dates = list(self.articles)
diff --git a/pelican/readers.py b/pelican/readers.py
index 7cb59f5a..1e00aefa 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -46,6 +46,7 @@ METADATA_PROCESSORS = {
     'status': lambda x, y: x.strip(),
     'category': Category,
     'author': Author,
+    'authors': lambda x, y: [Author(author, y) for author in x],
 }
 
 logger = logging.getLogger(__name__)
@@ -144,6 +145,9 @@ class RstReader(BaseReader):
                         value = render_node_to_html(document, body_elem)
                     else:
                         value = body_elem.astext()
+                elif element.tagname == 'authors':  # author list
+                    name = element.tagname
+                    value = [element.astext() for element in element.children]
                 else:  # standard fields (e.g. address)
                     name = element.tagname
                     value = element.astext()
diff --git a/pelican/tests/content/article_with_multiple_authors.rst b/pelican/tests/content/article_with_multiple_authors.rst
new file mode 100644
index 00000000..04af017c
--- /dev/null
+++ b/pelican/tests/content/article_with_multiple_authors.rst
@@ -0,0 +1,6 @@
+This is an article with multiple authors!
+#########################################
+
+:date: 2014-02-09 02:20
+:modified: 2014-02-09 02:20
+:authors: First Author, Second Author
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 448f73eb..f831f061 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -346,6 +346,17 @@ class TestPage(unittest.TestCase):
             '<a href="http://notmyidea.org/article-spaces.html">link</a>'
         )
 
+    def test_multiple_authors(self):
+        """Test article with multiple authors."""
+        args = self.page_kwargs.copy()
+        content = Page(**args)
+        assert content.authors == [content.author]
+        args['metadata'].pop('author')
+        args['metadata']['authors'] = ['First Author', 'Second Author']
+        content = Page(**args)
+        assert content.authors
+        assert content.author == content.authors[0]
+
 
 class TestArticle(TestPage):
     def test_template(self):
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index eddaa504..6f13aeb6 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -93,6 +93,7 @@ class TestArticlesGenerator(unittest.TestCase):
             ['This is a super article !', 'published', 'Default', 'article'],
             ['This is an article with category !', 'published', 'yeah',
              'article'],
+            ['This is an article with multiple authors!', 'published', 'Default', 'article'],
             ['This is an article without category !', 'published', 'Default',
              'article'],
             ['This is an article without category !', 'published',
@@ -257,6 +258,16 @@ class TestArticlesGenerator(unittest.TestCase):
                                  settings,
                                  blog=True, dates=dates)
 
+    def test_generate_authors(self):
+        """Check authors generation."""
+        authors = [author.name for author, _ in self.generator.authors]
+        authors_expected = sorted(['Alexis Métaireau', 'First Author', 'Second Author'])
+        self.assertEqual(sorted(authors), authors_expected)
+        # test for slug
+        authors = [author.slug for author, _ in self.generator.authors]
+        authors_expected = ['alexis-metaireau', 'first-author', 'second-author']
+        self.assertEqual(sorted(authors), sorted(authors_expected))
+
 
 class TestPageGenerator(unittest.TestCase):
     # Note: Every time you want to test for a new field; Make sure the test
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 9d6f911d..8412c75b 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -10,7 +10,7 @@ from pelican.tests.support import (unittest, temporary_folder, mute,
 
 from pelican.utils import slugify
 
-CUR_DIR = os.path.dirname(__file__)
+CUR_DIR = os.path.abspath(os.path.dirname(__file__))
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
 WORDPRESS_ENCODED_CONTENT_SAMPLE = os.path.join(CUR_DIR,
                                                 'content',
@@ -75,7 +75,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
             out_name = fnames[index]
             self.assertTrue(out_name.endswith(filename))
             index += 1
-    
+
     def test_unless_custom_post_all_items_should_be_pages_or_posts(self):
         self.assertTrue(self.posts)
         pages_data = []
@@ -85,7 +85,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
             else:
                 pages_data.append((title, fname))
         self.assertEqual(0, len(pages_data))
-    
+
     def test_recognise_custom_post_type(self):
         self.assertTrue(self.custposts)
         cust_data = []
@@ -98,7 +98,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
         self.assertEqual(('A custom post in category 4', 'custom1'), cust_data[0])
         self.assertEqual(('A custom post in category 5', 'custom1'), cust_data[1])
         self.assertEqual(('A 2nd custom post type also in category 5', 'custom2'), cust_data[2])
-     
+
     def test_custom_posts_put_in_own_dir(self):
         silent_f2p = mute(True)(fields2pelican)
         test_posts = []
@@ -130,7 +130,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
             else:
                 test_posts.append(post)
         with temporary_folder() as temp:
-            fnames = list(silent_f2p(test_posts, 'markdown', temp, 
+            fnames = list(silent_f2p(test_posts, 'markdown', temp,
                 wp_custpost=True, dircat=True))
         index = 0
         for post in test_posts:
@@ -152,7 +152,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
             if post[7] == 'page':
                 test_posts.append(post)
         with temporary_folder() as temp:
-            fnames = list(silent_f2p(test_posts, 'markdown', temp, 
+            fnames = list(silent_f2p(test_posts, 'markdown', temp,
                 wp_custpost=True, dirpage=False))
         index = 0
         for post in test_posts:
@@ -161,8 +161,8 @@ class TestWordpressXmlImporter(unittest.TestCase):
             filename = os.path.join('pages', name)
             out_name = fnames[index]
             self.assertFalse(out_name.endswith(filename))
-        
- 
+
+
     def test_can_toggle_raw_html_code_parsing(self):
         def r(f):
             with open(f) as infile:
@@ -247,9 +247,9 @@ class TestBuildHeader(unittest.TestCase):
                 '##############################################\n\n')
 
     def test_galleries_added_to_header(self):
-        header = build_header('test', None, None, None, None, 
+        header = build_header('test', None, None, None, None,
                 None, ['output/test1', 'output/test2'])
-        self.assertEqual(header, 'test\n####\n' + ':attachments: output/test1, ' 
+        self.assertEqual(header, 'test\n####\n' + ':attachments: output/test1, '
                 + 'output/test2\n\n')
 
     def test_galleries_added_to_markdown_header(self):
@@ -258,11 +258,11 @@ class TestBuildHeader(unittest.TestCase):
         self.assertEqual(header, 'Title: test\n' + 'Attachments: output/test1, '
                 + 'output/test2\n\n')
 
-@unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')       
-class TestWordpressXMLAttachements(unittest.TestCase):        
+@unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
+class TestWordpressXMLAttachements(unittest.TestCase):
     def setUp(self):
         self.attachments = get_attachments(WORDPRESS_XML_SAMPLE)
-    
+
     def test_recognise_attachments(self):
         self.assertTrue(self.attachments)
         self.assertTrue(len(self.attachments.keys()) == 3)
@@ -283,7 +283,7 @@ class TestWordpressXMLAttachements(unittest.TestCase):
     def test_download_attachments(self):
         real_file = os.path.join(CUR_DIR, 'content/article.rst')
         good_url = 'file://' + real_file
-        bad_url = 'http://www.notarealsite.notarealdomain/not_a_file.txt'
+        bad_url = 'http://localhost:1/not_a_file.txt'
         silent_da = mute()(download_attachments)
         with temporary_folder() as temp:
             #locations = download_attachments(temp, [good_url, bad_url])
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 8cccc918..21a77e6b 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -2,11 +2,11 @@
 from __future__ import unicode_literals, print_function
 
 import os
-from filecmp import dircmp
 from tempfile import mkdtemp
 from shutil import rmtree
 import locale
 import logging
+import subprocess
 
 from pelican import Pelican
 from pelican.settings import read_settings
@@ -64,6 +64,13 @@ class TestPelican(LoggedTestCase):
         self.assertEqual(diff['right_only'], [], msg=msg)
         self.assertEqual(diff['diff_files'], [], msg=msg)
 
+    def assertDirsEqual(self, left_path, right_path):
+        out, err = subprocess.Popen(
+            ['git', 'diff', '--no-ext-diff', '--exit-code', '-w', left_path, right_path], env={'PAGER': ''},
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+        assert not out, out
+        assert not err, err
+
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
         # ones and generate correct output without raising any exception
@@ -74,8 +81,7 @@ class TestPelican(LoggedTestCase):
             })
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
-        dcmp = dircmp(self.temp_path, os.path.join(OUTPUT_PATH, 'basic'))
-        self.assertFilesEqual(recursiveDiff(dcmp))
+        self.assertDirsEqual(self.temp_path, os.path.join(OUTPUT_PATH, 'basic'))
         self.assertLogCountEqual(
             count=4,
             msg="Unable to find.*skipping url replacement",
@@ -90,8 +96,7 @@ class TestPelican(LoggedTestCase):
             })
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
-        dcmp = dircmp(self.temp_path, os.path.join(OUTPUT_PATH, 'custom'))
-        self.assertFilesEqual(recursiveDiff(dcmp))
+        self.assertDirsEqual(self.temp_path, os.path.join(OUTPUT_PATH, 'custom'))
 
     def test_theme_static_paths_copy(self):
         # the same thing with a specified set of settings should work
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index e827ed3b..acb268fb 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -360,6 +360,15 @@ class HTMLReaderTest(ReaderTest):
         for key, value in expected.items():
             self.assertEqual(value, page.metadata[key], key)
 
+    def test_article_with_multiple_authors(self):
+        page = self.read_file(path='article_with_multiple_authors.rst')
+        expected = {
+            'authors': ['First Author', 'Second Author']
+        }
+
+        for key, value in expected.items():
+            self.assertEqual(value, page.metadata[key], key)
+
     def test_article_with_metadata_and_contents_attrib(self):
         page = self.read_file(path='article_with_metadata_and_contents.html')
         expected = {
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index 54c88004..718967e0 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -9,9 +9,11 @@
         </abbr>
         {% endif %}
 
-        {% if article.author %}
+        {% if article.authors %}
         <address class="vcard author">
-                By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
+                By {% for author in article.authors %}
+                        <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
+                {% endfor %}
         </address>
         {% endif %}
 <p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
diff --git a/pelican/themes/notmyidea/templates/authors.html b/pelican/themes/notmyidea/templates/authors.html
index a203422b..b145902e 100644
--- a/pelican/themes/notmyidea/templates/authors.html
+++ b/pelican/themes/notmyidea/templates/authors.html
@@ -6,7 +6,6 @@
 
 <section id="content" class="body">
     <h1>Authors on {{ SITENAME }}</h1>
-
     {%- for author, articles in authors|sort %}
         <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
     {% endfor %}
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index b5368d9f..e81261c5 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -33,9 +33,11 @@
       {{ article.locale_modified }}
     </abbr>
 	{% endif %}
-    {% if article.author %}
+    {% if article.authors %}
     <address class="vcard author">
-      By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
+      By {% for author in article.authors %}
+          <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
+        {% endfor %}
     </address>
     {% endif %}
   </footer><!-- /.post-info -->
diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index 5bb94dfc..20104db9 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -11,7 +11,11 @@
                 <header> <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2> </header>
                 <footer class="post-info">
                     <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr>
-                    {% if article.author %}<address class="vcard author">By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></address>{% endif %}
+                    <address class="vcard author">By
+                    {% for author in article.authors %}
+                        <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
+                    {% endfor %}
+                    </address>
                 </footer><!-- /.post-info -->
                 <div class="entry-content"> {{ article.summary }} </div><!-- /.entry-content -->
         </article></li>
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index b04906c0..d6b57c47 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -124,7 +124,7 @@ def get_filename(filename, post_id):
 
 def wp2fields(xml, wp_custpost=False):
     """Opens a wordpress XML file, and yield Pelican fields"""
-    
+
     items = get_items(xml)
     for item in items:
 
@@ -140,7 +140,7 @@ def wp2fields(xml, wp_custpost=False):
             filename = item.find('post_name').string
             post_id = item.find('post_id').string
             filename = get_filename(filename, post_id)
-            
+
             content = item.find('encoded').string
             raw_date = item.find('post_date').string
             date_object = time.strptime(raw_date, "%Y-%m-%d %H:%M:%S")
@@ -161,7 +161,7 @@ def wp2fields(xml, wp_custpost=False):
                     pass
                 # Old behaviour was to name everything not a page as an article.
                 # Theoretically all attachments have status == inherit so
-                # no attachments should be here. But this statement is to 
+                # no attachments should be here. But this statement is to
                 # maintain existing behaviour in case that doesn't hold true.
                 elif post_type == 'attachment':
                     pass
@@ -469,7 +469,7 @@ def build_header(title, date, author, categories, tags, slug, attachments=None):
     header += '\n'
     return header
 
-def build_markdown_header(title, date, author, categories, tags, slug, 
+def build_markdown_header(title, date, author, categories, tags, slug,
         attachments=None):
     """Build a header from a list of fields"""
     header = 'Title: %s\n' % title
@@ -494,8 +494,8 @@ def get_ext(out_markup, in_markup='html'):
     else:
         ext = '.rst'
     return ext
-    
-def get_out_filename(output_path, filename, ext, kind, 
+
+def get_out_filename(output_path, filename, ext, kind,
         dirpage, dircat, categories, wp_custpost):
     filename = os.path.basename(filename)
 
@@ -516,7 +516,7 @@ def get_out_filename(output_path, filename, ext, kind,
             os.mkdir(pages_dir)
         out_filename = os.path.join(pages_dir, filename+ext)
     elif not dirpage and kind == 'page':
-        pass 
+        pass
     # option to put wp custom post types in directories with post type
     # names. Custom post types can also have categories so option to
     # create subdirectories with category names
@@ -530,7 +530,7 @@ def get_out_filename(output_path, filename, ext, kind,
             catname = slugify(categories[0])
         else:
             catname = ''
-        out_filename = os.path.join(output_path, typename, 
+        out_filename = os.path.join(output_path, typename,
             catname, filename+ext)
         if not os.path.isdir(os.path.join(output_path, typename, catname)):
             os.makedirs(os.path.join(output_path, typename, catname))
@@ -544,20 +544,20 @@ def get_out_filename(output_path, filename, ext, kind,
     return out_filename
 
 def get_attachments(xml):
-    """returns a dictionary of posts that have attachments with a list 
+    """returns a dictionary of posts that have attachments with a list
     of the attachment_urls
     """
     items = get_items(xml)
     names = {}
     attachments = []
-    
+
     for item in items:
         kind = item.find('post_type').string
         filename = item.find('post_name').string
         post_id = item.find('post_id').string
-        
+
         if kind == 'attachment':
-            attachments.append((item.find('post_parent').string, 
+            attachments.append((item.find('post_parent').string,
                 item.find('attachment_url').string))
         else:
             filename = get_filename(filename, post_id)
@@ -569,7 +569,7 @@ def get_attachments(xml):
         except KeyError:
             #attachment's parent is not a valid post
             parent_name = None
-        
+
         try:
             attachedposts[parent_name].append(url)
         except KeyError:
@@ -578,13 +578,13 @@ def get_attachments(xml):
     return attachedposts
 
 def download_attachments(output_path, urls):
-    """Downloads wordpress attachments and returns a list of paths to 
-    attachments that can be associated with a post (relative path to output 
+    """Downloads wordpress attachments and returns a list of paths to
+    attachments that can be associated with a post (relative path to output
     directory). Files that fail to download, will not be added to posts"""
     locations = []
     for url in urls:
         path = urlparse(url).path
-        #teardown path and rebuild to negate any errors with 
+        #teardown path and rebuild to negate any errors with
         #os.path.join and leading /'s
         path = path.split('/')
         filename = path.pop(-1)
@@ -625,16 +625,16 @@ def fields2pelican(fields, out_markup, output_path,
                 attached_files = download_attachments(output_path, urls)
             except KeyError:
                 attached_files = None
-        else: 
+        else:
             attached_files = None
 
         ext = get_ext(out_markup, in_markup)
         if ext == '.md':
-            header = build_markdown_header(title, date, author, categories, 
+            header = build_markdown_header(title, date, author, categories,
                     tags, slug, attached_files)
         else:
             out_markup = "rst"
-            header = build_header(title, date, author, categories, 
+            header = build_header(title, date, author, categories,
                     tags, slug, attached_files)
 
         out_filename = get_out_filename(output_path, filename, ext,
@@ -690,7 +690,7 @@ def fields2pelican(fields, out_markup, output_path,
         print("downloading attachments that don't have a parent post")
         urls = attachments[None]
         orphan_galleries = download_attachments(output_path, urls)
-            
+
 def main():
     parser = argparse.ArgumentParser(
         description="Transform feed, WordPress, Tumblr, Dotclear, or Posterous "
@@ -723,7 +723,7 @@ def main():
     parser.add_argument('--strip-raw', action='store_true', dest='strip_raw',
         help="Strip raw HTML code that can't be converted to "
              "markup such as flash embeds or iframes (wordpress import only)")
-    parser.add_argument('--wp-custpost', action='store_true', 
+    parser.add_argument('--wp-custpost', action='store_true',
         dest='wp_custpost',
         help='Put wordpress custom post types in directories. If used with '
              '--dir-cat option directories will be created as '
@@ -775,7 +775,7 @@ def main():
     if args.wp_attach and input_type != 'wordpress':
         error = "You must be importing a wordpress xml to use the --wp-attach option"
         exit(error)
-          
+
     if input_type == 'wordpress':
         fields = wp2fields(args.input, args.wp_custpost or False)
     elif input_type == 'dotclear':

From 1b6f081619fe8ddcb7b3c45bd2fcd87c72d6ac6a Mon Sep 17 00:00:00 2001
From: Rob Kennedy <kennedyri@gmail.com>
Date: Thu, 13 Feb 2014 15:46:33 -0800
Subject: [PATCH 1563/2864] Allow socket address reuse; fixed #1264

The socket may remain in the TIME_WAIT state for some time after the
server shuts down, which prevents another instance of the server from
listening on the same port. This change allows the server to reuse the
address even when it's still waiting.
---
 pelican/server.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/server.py b/pelican/server.py
index 5294e7dc..bb31b234 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -36,6 +36,7 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
 
 Handler = ComplexHTTPRequestHandler
 
+socketserver.TCPServer.allow_reuse_address = True
 try:
     httpd = socketserver.TCPServer(("", PORT), Handler)
 except OSError as e:

From c00d808bf8b14beb9f476b3c568eab6a8c1a083e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 14 Feb 2014 14:37:54 -0800
Subject: [PATCH 1564/2864] Add squashing to CONTRIBUTING docs. Fix URLs.

---
 CONTRIBUTING.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 9422176a..6063613b 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -22,12 +22,14 @@ Contribution submission guidelines
   #585`` syntax (so the relevant issue is automatically closed upon PR merge).
 * After the first line of the commit message, add a blank line and then a more
   detailed explanation (when relevant).
+* `Squash your commits`_ to eliminate merge commits and ensure a clean and
+  readable commit history.
 * If you have previously filed a GitHub issue and want to contribute code that
   addresses that issue, **please use** ``hub pull-request`` instead of using
   GitHub's web UI to submit the pull request. This isn't an absolute
   requirement, but makes the maintainers' lives much easier! Specifically:
-  `install hub <https://github.com/defunkt/hub/#installation>`_ and then run
-  `hub pull-request <https://github.com/defunkt/hub/#git-pull-request>`_ to
+  `install hub <https://github.com/github/hub/#installation>`_ and then run
+  `hub pull-request <https://github.com/github/hub/#git-pull-request>`_ to
   turn your GitHub issue into a pull request containing your code.
 
 Check out our `Git Tips`_ page or ask on the `#pelican IRC channel`_ if you
@@ -36,6 +38,7 @@ need assistance or have any questions about these guidelines.
 .. _`plugin`: http://docs.getpelican.com/en/latest/plugins.html
 .. _`#pelican IRC channel`: http://webchat.freenode.net/?channels=pelican&uio=d4
 .. _`Create a new git branch`: https://github.com/getpelican/pelican/wiki/Git-Tips#making-your-changes
+.. _`Squash your commits`: https://github.com/getpelican/pelican/wiki/Git-Tips#squashing-commits
 .. _`Run all the tests`: http://docs.getpelican.com/en/latest/contribute.html#running-the-test-suite
 .. _`Git Tips`: https://github.com/getpelican/pelican/wiki/Git-Tips
 .. _`PEP8 coding standards`: http://www.python.org/dev/peps/pep-0008/

From 459a13bf79fad103f2305debf849ed25d1e37d34 Mon Sep 17 00:00:00 2001
From: Mario Lang <mlang@delysid.org>
Date: Wed, 12 Feb 2014 11:47:22 +0100
Subject: [PATCH 1565/2864] HTML error in notmyidea: <li> not allowed in
 <section>.

<li> tags need to be inside of <ul> or <ol>.
Thanks to the w3c_validate plugin for finding this.
---
 pelican/tests/output/basic/authors.html         | 7 +++++--
 pelican/tests/output/basic/tags.html            | 7 +++++--
 pelican/tests/output/custom/authors.html        | 7 +++++--
 pelican/tests/output/custom/tags.html           | 7 +++++--
 pelican/themes/notmyidea/templates/authors.html | 4 +++-
 pelican/themes/notmyidea/templates/tags.html    | 5 +++--
 6 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index 4022cbab..20df01d2 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -26,7 +26,10 @@
         </header><!-- /#banner -->
 
 <section id="content" class="body">
-    <h1>Authors on A Pelican Blog</h1>        <li><a href="/author/alexis-metaireau.html">Alexis Métaireau</a> (2)</li>
+    <h1>Authors on A Pelican Blog</h1>
+    <ul>
+        <li><a href="/author/alexis-metaireau.html">Alexis Métaireau</a> (2)</li>
+    </ul>
 </section>
 
         <section id="extras" class="body">
@@ -48,4 +51,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index 8172f6ae..0eda47d7 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -26,12 +26,15 @@
         </header><!-- /#banner -->
 
 <section id="content" class="body">
-    <h1>Tags for A Pelican Blog</h1>        <li><a href="/tag/bar.html">bar</a> (3)</li>
+    <h1>Tags for A Pelican Blog</h1>
+    <ul>
+        <li><a href="/tag/bar.html">bar</a> (3)</li>
         <li><a href="/tag/baz.html">baz</a> (1)</li>
         <li><a href="/tag/foo.html">foo</a> (2)</li>
         <li><a href="/tag/foobar.html">foobar</a> (1)</li>
         <li><a href="/tag/oh.html">oh</a> (1)</li>
         <li><a href="/tag/yeah.html">yeah</a> (1)</li>
+    </ul>
 </section>
 
         <section id="extras" class="body">
@@ -53,4 +56,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index eb2becfd..d9aaef34 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -30,7 +30,10 @@
         </header><!-- /#banner -->
 
 <section id="content" class="body">
-    <h1>Authors on Alexis' log</h1>        <li><a href="./author/alexis-metaireau.html">Alexis Métaireau</a> (10)</li>
+    <h1>Authors on Alexis' log</h1>
+    <ul>
+        <li><a href="./author/alexis-metaireau.html">Alexis Métaireau</a> (10)</li>
+    </ul>
 </section>
 
         <section id="extras" class="body">
@@ -76,4 +79,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 2e70c9e8..ba8d53a4 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -30,12 +30,15 @@
         </header><!-- /#banner -->
 
 <section id="content" class="body">
-    <h1>Tags for Alexis' log</h1>        <li><a href="./tag/bar.html">bar</a> (3)</li>
+    <h1>Tags for Alexis' log</h1>
+    <ul>
+        <li><a href="./tag/bar.html">bar</a> (3)</li>
         <li><a href="./tag/baz.html">baz</a> (1)</li>
         <li><a href="./tag/foo.html">foo</a> (2)</li>
         <li><a href="./tag/foobar.html">foobar</a> (1)</li>
         <li><a href="./tag/oh.html">oh</a> (1)</li>
         <li><a href="./tag/yeah.html">yeah</a> (1)</li>
+    </ul>
 </section>
 
         <section id="extras" class="body">
@@ -81,4 +84,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/themes/notmyidea/templates/authors.html b/pelican/themes/notmyidea/templates/authors.html
index b145902e..e61a332f 100644
--- a/pelican/themes/notmyidea/templates/authors.html
+++ b/pelican/themes/notmyidea/templates/authors.html
@@ -6,9 +6,11 @@
 
 <section id="content" class="body">
     <h1>Authors on {{ SITENAME }}</h1>
-    {%- for author, articles in authors|sort %}
+    <ul>
+    {% for author, articles in authors|sort %}
         <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
     {% endfor %}
+    </ul>
 </section>
 
 {% endblock %}
diff --git a/pelican/themes/notmyidea/templates/tags.html b/pelican/themes/notmyidea/templates/tags.html
index 76955f27..fb099557 100644
--- a/pelican/themes/notmyidea/templates/tags.html
+++ b/pelican/themes/notmyidea/templates/tags.html
@@ -6,10 +6,11 @@
 
 <section id="content" class="body">
     <h1>Tags for {{ SITENAME }}</h1>
-
-    {%- for tag, articles in tags|sort %}
+    <ul>
+    {% for tag, articles in tags|sort %}
         <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
     {% endfor %}
+    </ul>
 </section>
 
 {% endblock %}

From cff9d0aa5832e2d4c296a8c9b34ac5f88c9b0d3d Mon Sep 17 00:00:00 2001
From: Mario Lang <mlang@delysid.org>
Date: Wed, 12 Feb 2014 12:42:27 +0100
Subject: [PATCH 1566/2864] Fix stray </ol> and </section> if only one article
 is displayed.

We already check if loop.length > 1 before outputting <section> and <ol>
tags, but we neglected to do the same check when outputting the corresponding
end tags.

Also, since I had to read the code when I touched it, simplified a conditional:
if (a) if (a and (b or not b and c))
can be simplified to
if (a) if (b or c)

Note the "b or not b", it was just too ugly to not fix.
---
 pelican/tests/output/basic/category/bar.html   |  4 +---
 pelican/tests/output/basic/category/yeah.html  |  4 +---
 pelican/tests/output/basic/tag/foobar.html     |  4 +---
 pelican/tests/output/basic/tag/yeah.html       |  4 +---
 pelican/tests/output/custom/category/bar.html  |  4 +---
 pelican/tests/output/custom/category/yeah.html |  4 +---
 pelican/tests/output/custom/tag/foobar.html    |  4 +---
 pelican/tests/output/custom/tag/yeah.html      |  4 +---
 pelican/themes/notmyidea/templates/index.html  | 11 +++++++----
 9 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 54b1db3e..763cfe77 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -46,8 +46,6 @@ YEAH !</p>
 </div>
                 </article>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -67,4 +65,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 51fada93..225eae6e 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -56,8 +56,6 @@
 </div>
                 </article>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -77,4 +75,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 66aa05e8..f3035f8e 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -56,8 +56,6 @@
 </div>
                 </article>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -77,4 +75,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index c064d8a0..cd9d01b2 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -46,8 +46,6 @@ YEAH !</p>
 </div>
                 </article>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -67,4 +65,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 113b8841..80c46de5 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -55,8 +55,6 @@ YEAH !</p>
     Page 1 / 1
 </p>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
@@ -100,4 +98,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index c8e066c8..11fd181d 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -63,8 +63,6 @@
     Page 1 / 1
 </p>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
@@ -108,4 +106,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index c62d3418..c224992e 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -63,8 +63,6 @@
     Page 1 / 1
 </p>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
@@ -108,4 +106,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 288f4ec7..49c78359 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -55,8 +55,6 @@ YEAH !</p>
     Page 1 / 1
 </p>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
@@ -100,4 +98,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 2d45bb2a..c8982476 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -42,12 +42,15 @@
             </article></li>
         {% endif %}
         {% if loop.last %}
-            </ol><!-- /#posts-list -->
-            {% if loop.last and (articles_page.has_previous()
-            or not articles_page.has_previous() and loop.length > 1) %}
+            {% if loop.length > 1 %}
+                </ol><!-- /#posts-list -->
+            {% endif %}
+            {% if articles_page.has_previous() or loop.length > 1 %}
                 {% include 'pagination.html' %}
             {% endif %}
-            </section><!-- /#content -->
+            {% if loop.length > 1 %}
+                </section><!-- /#content -->
+            {% endif %}
         {% endif %}
     {% endfor %}
 {% else %}

From e500e64ebd888d61c555e0eefba8b3ae529b5e63 Mon Sep 17 00:00:00 2001
From: Mario Lang <mlang@delysid.org>
Date: Sun, 9 Feb 2014 15:17:23 +0100
Subject: [PATCH 1567/2864] Some browsers like Lynx render adjacent links
 without implicit spaces.

Put an extra space at the end of each link to a tag so that Lynx doesnt render
the tags as a single word.
---
 pelican/themes/notmyidea/templates/taglist.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/taglist.html b/pelican/themes/notmyidea/templates/taglist.html
index c792fd7d..b8f4ba95 100644
--- a/pelican/themes/notmyidea/templates/taglist.html
+++ b/pelican/themes/notmyidea/templates/taglist.html
@@ -1,2 +1,2 @@
-{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %}
+{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% endfor %}</p>{% endif %}
 {% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a></p>{% endif %}

From a7ca52dee05819be269b95556da01f965d107a50 Mon Sep 17 00:00:00 2001
From: Mario Lang <mlang@delysid.org>
Date: Tue, 18 Feb 2014 15:01:31 +0100
Subject: [PATCH 1568/2864] Run tag name through escape filter to avoid invalid
 HTML

If a tag contains characters like <> or &, we currently generate invalid HTML.
This is easily fixed by sending the tag through the jinja escape filter.

(This bug is not theoretical, I hit it when using C++ template names for tags,
 like "boost::variant<>".)
---
 pelican/themes/notmyidea/templates/taglist.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/taglist.html b/pelican/themes/notmyidea/templates/taglist.html
index b8f4ba95..1e0b95a7 100644
--- a/pelican/themes/notmyidea/templates/taglist.html
+++ b/pelican/themes/notmyidea/templates/taglist.html
@@ -1,2 +1,2 @@
-{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% endfor %}</p>{% endif %}
+{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag | escape }}</a> {% endfor %}</p>{% endif %}
 {% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a></p>{% endif %}

From 05d357e98e9c948eaddfcfe3db9895b7ab5e9bf0 Mon Sep 17 00:00:00 2001
From: Ben Bridts <ben.bidts@gmail.com>
Date: Tue, 18 Feb 2014 17:56:57 +0100
Subject: [PATCH 1569/2864] Split multiple authors on ','

---
 pelican/readers.py                                       | 2 +-
 pelican/tests/content/article_with_multiple_authors.html | 6 ++++++
 pelican/tests/test_readers.py                            | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 pelican/tests/content/article_with_multiple_authors.html

diff --git a/pelican/readers.py b/pelican/readers.py
index 1e00aefa..fb800b2b 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -46,7 +46,7 @@ METADATA_PROCESSORS = {
     'status': lambda x, y: x.strip(),
     'category': Category,
     'author': Author,
-    'authors': lambda x, y: [Author(author, y) for author in x],
+    'authors': lambda x, y: [Author(author.strip(), y) for author in x.split(',')],
 }
 
 logger = logging.getLogger(__name__)
diff --git a/pelican/tests/content/article_with_multiple_authors.html b/pelican/tests/content/article_with_multiple_authors.html
new file mode 100644
index 00000000..a74442c9
--- /dev/null
+++ b/pelican/tests/content/article_with_multiple_authors.html
@@ -0,0 +1,6 @@
+<html>
+    <head>
+        <title>This is an article with multiple authors!</title>
+        <meta name="authors" content="First Author, Second Author" />
+    </head>
+</html>
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index acb268fb..6274bdc5 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -361,7 +361,7 @@ class HTMLReaderTest(ReaderTest):
             self.assertEqual(value, page.metadata[key], key)
 
     def test_article_with_multiple_authors(self):
-        page = self.read_file(path='article_with_multiple_authors.rst')
+        page = self.read_file(path='article_with_multiple_authors.html')
         expected = {
             'authors': ['First Author', 'Second Author']
         }

From 7f2bc2a23b6e8c8f0865cb293942a560a06d74e0 Mon Sep 17 00:00:00 2001
From: Stefan hr Berder <hr@bonz.org>
Date: Sun, 16 Feb 2014 12:51:52 +0100
Subject: [PATCH 1570/2864] change date metadata parsing to dateutil.parser

---
 docs/getting_started.rst    |  2 ++
 pelican/tests/test_utils.py | 32 +++++++++++++++++++++++++++---
 pelican/utils.py            | 39 +++++--------------------------------
 setup.py                    |  2 +-
 4 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index 6655d8d6..8ee37162 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -130,6 +130,8 @@ automatically installed without any action on your part:
   utilities
 * `MarkupSafe <http://pypi.python.org/pypi/MarkupSafe>`_, for a markup safe
   string implementation
+* `python-dateutil <https://pypi.python.org/pypi/python-dateutil>`_, to read
+  the date metadata
 
 If you want the following optional packages, you will need to install them
 manually via ``pip``:
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index f6f96a1c..9047593f 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -41,6 +41,12 @@ class TestUtils(LoggedTestCase):
         date = datetime.datetime(year=2012, month=11, day=22)
         date_hour = datetime.datetime(
             year=2012, month=11, day=22, hour=22, minute=11)
+        date_hour_z = datetime.datetime(
+            year=2012, month=11, day=22, hour=22, minute=11,
+            tzinfo=pytz.timezone('UTC'))
+        date_hour_est = datetime.datetime(
+            year=2012, month=11, day=22, hour=22, minute=11,
+            tzinfo=pytz.timezone('EST'))
         date_hour_sec = datetime.datetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10)
         date_hour_sec_z = datetime.datetime(
@@ -61,22 +67,42 @@ class TestUtils(LoggedTestCase):
             '22/11/2012': date,
             '22.11.2012': date,
             '22.11.2012 22:11': date_hour,
+            '2012-11-22T22:11Z': date_hour_z,
+            '2012-11-22T22:11-0500': date_hour_est,
             '2012-11-22 22:11:10': date_hour_sec,
             '2012-11-22T22:11:10Z': date_hour_sec_z,
             '2012-11-22T22:11:10-0500': date_hour_sec_est,
             '2012-11-22T22:11:10.123Z': date_hour_sec_frac_z,
             }
 
+        # examples from http://www.w3.org/TR/NOTE-datetime
+        iso_8601_date = datetime.datetime(year=1997, month=7, day=16)
+        iso_8601_date_hour_tz = datetime.datetime(
+            year=1997, month=7, day=16, hour=19, minute=20,
+            tzinfo=pytz.timezone('CET'))
+        iso_8601_date_hour_sec_tz = datetime.datetime(
+            year=1997, month=7, day=16, hour=19, minute=20, second=30,
+            tzinfo=pytz.timezone('CET'))
+        iso_8601_date_hour_sec_ms_tz = datetime.datetime(
+            year=1997, month=7, day=16, hour=19, minute=20, second=30,
+            microsecond=450000, tzinfo=pytz.timezone('CET'))
+        iso_8601 = {
+            '1997-07-16': iso_8601_date,
+            '1997-07-16T19:20+01:00': iso_8601_date_hour_tz,
+            '1997-07-16T19:20:30+01:00': iso_8601_date_hour_sec_tz,
+            '1997-07-16T19:20:30.45+01:00': iso_8601_date_hour_sec_ms_tz,
+        }
+
         # invalid ones
         invalid_dates = ['2010-110-12', 'yay']
 
-        if version_info < (3, 2):
-            dates.pop('2012-11-22T22:11:10-0500')
-            invalid_dates.append('2012-11-22T22:11:10-0500')
 
         for value, expected in dates.items():
             self.assertEqual(utils.get_date(value), expected, value)
 
+        for value, expected in iso_8601.items():
+            self.assertEqual(utils.get_date(value), expected, value)
+
         for item in invalid_dates:
             self.assertRaises(ValueError, utils.get_date, item)
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 822e50e9..c5aacaa3 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -15,7 +15,7 @@ import traceback
 
 from collections import Hashable
 from contextlib import contextmanager
-from datetime import datetime
+import dateutil.parser
 from functools import partial
 from itertools import groupby
 from jinja2 import Markup
@@ -181,39 +181,10 @@ def get_date(string):
     If no format matches the given date, raise a ValueError.
     """
     string = re.sub(' +', ' ', string)
-    formats = [
-        # ISO 8601
-        '%Y',
-        '%Y-%m',
-        '%Y-%m-%d',
-        '%Y-%m-%dT%H:%M%z',
-        '%Y-%m-%dT%H:%MZ',
-        '%Y-%m-%dT%H:%M',
-        '%Y-%m-%dT%H:%M:%S%z',
-        '%Y-%m-%dT%H:%M:%SZ',
-        '%Y-%m-%dT%H:%M:%S',
-        '%Y-%m-%dT%H:%M:%S.%f%z',
-        '%Y-%m-%dT%H:%M:%S.%fZ',
-        '%Y-%m-%dT%H:%M:%S.%f',
-        # end ISO 8601 forms
-        '%Y-%m-%d %H:%M',
-        '%Y-%m-%d %H:%M:%S',
-        '%Y/%m/%d %H:%M',
-        '%Y/%m/%d',
-        '%d-%m-%Y',
-        '%d.%m.%Y %H:%M',
-        '%d.%m.%Y',
-        '%d/%m/%Y',
-        ]
-    for date_format in formats:
-        try:
-            date = datetime.strptime(string, date_format)
-        except ValueError:
-            continue
-        if date_format.endswith('Z'):
-            date = date.replace(tzinfo=pytz.timezone('UTC'))
-        return date
-    raise ValueError('{0!r} is not a valid date'.format(string))
+    try:
+        return dateutil.parser.parse(string)
+    except (TypeError, ValueError):
+        raise ValueError('{0!r} is not a valid date'.format(string))
 
 
 @contextmanager
diff --git a/setup.py b/setup.py
index f56a7c41..e989d549 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 
 requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.7', 'pygments', 'docutils',
-            'pytz >= 0a', 'blinker', 'unidecode', 'six']
+            'pytz >= 0a', 'blinker', 'unidecode', 'six', 'python-dateutil']
 
 entry_points = {
     'console_scripts': [

From 652eb3686f15a24f8e8830f2d4345ab8c50cf761 Mon Sep 17 00:00:00 2001
From: Stefan hr Berder <hr@bonz.org>
Date: Thu, 26 Dec 2013 19:30:55 +0100
Subject: [PATCH 1571/2864] add lang support for drafts (#826 & #1107)

Fix #826
Fix #1107
---
 docs/settings.rst                             | 10 +++++--
 pelican/__init__.py                           | 12 ++++++---
 pelican/contents.py                           |  5 ++++
 pelican/generators.py                         | 27 +++++++++++++------
 pelican/settings.py                           |  4 +++
 .../output/custom/drafts/a-draft-article.html |  4 +--
 6 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index ca92a19e..a8e96d71 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -237,12 +237,18 @@ posts for the month at ``posts/2011/Aug/index.html``.
 ====================================================    =====================================================
 Setting name (default value)                            What does it do?
 ====================================================    =====================================================
-`ARTICLE_URL` (``'{slug}.html'``)                       The URL to refer to an ARTICLE.
+`ARTICLE_URL` (``'{slug}.html'``)                       The URL to refer to an article.
 `ARTICLE_SAVE_AS` (``'{slug}.html'``)                   The place where we will save an article.
-`ARTICLE_LANG_URL` (``'{slug}-{lang}.html'``)           The URL to refer to an ARTICLE which doesn't use the
+`ARTICLE_LANG_URL` (``'{slug}-{lang}.html'``)           The URL to refer to an article which doesn't use the
                                                         default language.
 `ARTICLE_LANG_SAVE_AS` (``'{slug}-{lang}.html'``)       The place where we will save an article which
                                                         doesn't use the default language.
+`DRAFT_URL` (``'drafts/{slug}.html'``)                  The URL to refer to an article draft.
+`DRAFT_SAVE_AS` (``'drafts/{slug}.html'``)              The place where we will save an article draft.
+`DRAFT_LANG_URL` (``'drafts/{slug}-{lang}.html'``)      The URL to refer to an article draft which doesn't
+                                                        use the default language.
+`DRAFT_LANG_SAVE_AS` (``'drafts/{slug}-{lang}.html'``)  The place where we will save an article draft which 
+                                                        doesn't use the default language.
 `PAGE_URL` (``'pages/{slug}.html'``)                    The URL we will use to link to a page.
 `PAGE_SAVE_AS` (``'pages/{slug}.html'``)                The location we will save the page. This value has to be
                                                         the same as PAGE_URL or you need to use a rewrite in
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 47260551..08dd484e 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -114,9 +114,10 @@ class Pelican(object):
             structure = re.sub('^/', '', structure)
 
             for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
-                            'PAGE_LANG_URL', 'ARTICLE_SAVE_AS',
-                            'ARTICLE_LANG_SAVE_AS', 'PAGE_SAVE_AS',
-                            'PAGE_LANG_SAVE_AS'):
+                            'PAGE_LANG_URL', 'DRAFT_URL', 'DRAFT_LANG_URL',
+                            'ARTICLE_SAVE_AS', 'ARTICLE_LANG_SAVE_AS',
+                            'DRAFT_SAVE_AS', 'DRAFT_LANG_SAVE_AS',
+                            'PAGE_SAVE_AS', 'PAGE_LANG_SAVE_AS'):
                 self.settings[setting] = os.path.join(structure,
                                                       self.settings[setting])
                 logger.warning("%s = '%s'" % (setting, self.settings[setting]))
@@ -174,8 +175,11 @@ class Pelican(object):
         pages_generator = next(g for g in generators
                                if isinstance(g, PagesGenerator))
 
-        print('Done: Processed {} articles and {} pages in {:.2f} seconds.'.format(
+        print('Done: Processed {} article(s), {} draft(s) and {} page(s) in ' \
+              '{:.2f} seconds.'.format(
             len(articles_generator.articles) + len(articles_generator.translations),
+            len(articles_generator.drafts) + \
+            len(articles_generator.drafts_translations),
             len(pages_generator.pages) + len(pages_generator.translations),
             time.time() - start_time))
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 69b7fa69..2ba81c1d 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -328,6 +328,11 @@ class Article(Page):
     default_template = 'article'
 
 
+class Draft(Page):
+    mandatory_properties = ('title', 'category')
+    default_template = 'article'
+
+
 class Quote(Page):
     base_properties = ('author', 'date')
 
diff --git a/pelican/generators.py b/pelican/generators.py
index d1034eb0..bfdac1a5 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -18,7 +18,7 @@ from operator import attrgetter, itemgetter
 from jinja2 import (Environment, FileSystemLoader, PrefixLoader, ChoiceLoader,
                     BaseLoader, TemplateNotFound)
 
-from pelican.contents import Article, Page, Static, is_valid_content
+from pelican.contents import Article, Draft, Page, Static, is_valid_content
 from pelican.readers import Readers
 from pelican.utils import copy, process_translations, mkdir_p, DateFormatter
 from pelican import signals
@@ -190,7 +190,8 @@ class ArticlesGenerator(Generator):
         self.categories = defaultdict(list)
         self.related_posts = []
         self.authors = defaultdict(list)
-        self.drafts = []
+        self.drafts = [] # only drafts in default language
+        self.drafts_translations = []
         super(ArticlesGenerator, self).__init__(*args, **kwargs)
         signals.article_generator_init.send(self)
 
@@ -376,11 +377,11 @@ class ArticlesGenerator(Generator):
 
     def generate_drafts(self, write):
         """Generate drafts pages."""
-        for article in self.drafts:
-            write(os.path.join('drafts', '%s.html' % article.slug),
-                  self.get_template(article.template), self.context,
-                  article=article, category=article.category,
-                  all_articles=self.articles)
+        for draft in chain(self.drafts_translations, self.drafts):
+            write(draft.save_as, self.get_template(draft.template),
+                self.context, article=draft, category=draft.category,
+                override_output=hasattr(draft, 'override_save_as'),
+                all_articles=self.articles)
 
     def generate_pages(self, writer):
         """Generate the pages on the disk"""
@@ -403,6 +404,7 @@ class ArticlesGenerator(Generator):
         """Add the articles into the shared context"""
 
         all_articles = []
+        all_drafts = []
         for f in self.get_files(
                 self.settings['ARTICLE_DIR'],
                 exclude=self.settings['ARTICLE_EXCLUDES']):
@@ -426,13 +428,22 @@ class ArticlesGenerator(Generator):
             if article.status.lower() == "published":
                 all_articles.append(article)
             elif article.status.lower() == "draft":
-                self.drafts.append(article)
+                draft = self.readers.read_file(
+                    base_path=self.path, path=f, content_class=Draft,
+                    context=self.context,
+                    preread_signal=signals.article_generator_preread,
+                    preread_sender=self,
+                    context_signal=signals.article_generator_context,
+                    context_sender=self)
+                all_drafts.append(draft)
             else:
                 logger.warning("Unknown status %s for file %s, skipping it." %
                                (repr(article.status),
                                 repr(f)))
 
         self.articles, self.translations = process_translations(all_articles)
+        self.drafts, self.drafts_translations = \
+            process_translations(all_drafts)
 
         signals.article_generator_pretaxonomy.send(self)
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 99828935..225a1e9d 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -59,6 +59,10 @@ DEFAULT_CONFIG = {
     'ARTICLE_SAVE_AS': '{slug}.html',
     'ARTICLE_LANG_URL': '{slug}-{lang}.html',
     'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html',
+    'DRAFT_URL': 'drafts/{slug}.html',
+    'DRAFT_SAVE_AS': os.path.join('drafts', '{slug}.html'),
+    'DRAFT_LANG_URL': 'drafts/{slug}-{lang}.html',
+    'DRAFT_LANG_SAVE_AS': os.path.join('drafts', '{slug}-{lang}.html'),
     'PAGE_URL': 'pages/{slug}.html',
     'PAGE_SAVE_AS': os.path.join('pages', '{slug}.html'),
     'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 9050c04e..57eea18c 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -32,7 +32,7 @@
   <article>
     <header>
       <h1 class="entry-title">
-        <a href="../a-draft-article.html" rel="bookmark"
+        <a href="../drafts/a-draft-article.html" rel="bookmark"
            title="Permalink to A draft article">A draft article</a></h1>
     </header>
 
@@ -97,4 +97,4 @@ listed anywhere else.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>

From 011cd50e2e768a80234781584bde0cddc971ca55 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 1 Mar 2014 18:25:07 +0100
Subject: [PATCH 1572/2864] Minor improvements to Settings docs

---
 docs/settings.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index a8e96d71..b75ce53d 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -6,7 +6,8 @@ the command line::
 
     $ pelican content -s path/to/your/settingsfile.py
 
-(If you used the `pelican-quickstart` command, your primary settings file will be named `pelicanconf.py` by default.)
+(If you used the `pelican-quickstart` command, your primary settings file will
+be named `pelicanconf.py` by default.)
 
 Settings are configured in the form of a Python module (a file). There is an
 `example settings file
@@ -193,9 +194,10 @@ want.
     If you specify a ``datetime`` directive, it will be substituted using the
     input files' date metadata attribute. If the date is not specified for a
     particular file, Pelican will rely on the file's ``mtime`` timestamp.
+    Check the `Python datetime documentation`_ for more information.
 
-Check the Python datetime documentation at http://bit.ly/cNcJUC for more
-information.
+.. _Python datetime documentation:
+    http://docs.python.org/2/library/datetime.html#strftime-and-strptime-behavior
 
 Also, you can use other file metadata attributes as well:
 

From 56b0061393d682f2487901b27bcafd5f0fbbd4a7 Mon Sep 17 00:00:00 2001
From: th3aftermath <leviburner@gmail.com>
Date: Fri, 31 Jan 2014 19:42:20 -0500
Subject: [PATCH 1573/2864] Add the setting SLUGIFY_ATTRIBUTE

---
 docs/settings.rst              |  4 ++++
 pelican/contents.py            | 12 +++++++++---
 pelican/settings.py            |  1 +
 pelican/tests/test_contents.py | 11 +++++++++--
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index b75ce53d..3873a479 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -166,6 +166,10 @@ Setting name (default value)
 `PYGMENTS_RST_OPTIONS` (``[]``)                                                  A list of default Pygments settings for your reStructuredText
                                                                                  code blocks. See :ref:`internal_pygments_options` for a list of
                                                                                  supported options.
+
+`SLUGIFY_SOURCE` (``'input'``)                                                Specifies where you want the slug to be automatically generated 
+                                                                                 from. Can be set to 'title' to use the Title: metadata tag or 
+                                                                                 'basename' to use the articles basename to make a slug. 
 ===============================================================================  =====================================================================
 
 .. [#] Default is the system locale.
diff --git a/pelican/contents.py b/pelican/contents.py
index 2ba81c1d..66602666 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -96,9 +96,15 @@ class Content(object):
 
             self.in_default_lang = (self.lang == default_lang)
 
-        # create the slug if not existing, from the title
-        if not hasattr(self, 'slug') and hasattr(self, 'title'):
-            self.slug = slugify(self.title,
+        # create the slug if not existing, generate slug according to 
+        # setting of SLUG_ATTRIBUTE
+        if not hasattr(self, 'slug'):
+            if settings['SLUGIFY_SOURCE'] == 'title' and hasattr(self, 'title'):
+                self.slug = slugify(self.title,
+                                settings.get('SLUG_SUBSTITUTIONS', ()))
+            elif settings['SLUGIFY_SOURCE'] == 'basename' and source_path != None:
+                basename = os.path.basename(os.path.splitext(source_path)[0])
+                self.slug = slugify(basename,
                                 settings.get('SLUG_SUBSTITUTIONS', ()))
 
         self.source_path = source_path
diff --git a/pelican/settings.py b/pelican/settings.py
index 225a1e9d..7ab43a82 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -116,6 +116,7 @@ DEFAULT_CONFIG = {
     'IGNORE_FILES': ['.#*'],
     'SLUG_SUBSTITUTIONS': (),
     'INTRASITE_LINK_REGEX': '[{|](?P<what>.*?)[|}]',
+    'SLUGIFY_SOURCE': 'title'
     }
 
 PYGMENTS_RST_OPTIONS = None
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index f831f061..4c6f8ed1 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -32,6 +32,7 @@ class TestPage(unittest.TestCase):
                 'title': 'foo bar',
                 'author': 'Blogger',
             },
+            'source_path': '/path/to/file/foo.ext'
         }
 
     def test_use_args(self):
@@ -77,9 +78,15 @@ class TestPage(unittest.TestCase):
         self.assertEqual(page.summary, '')
 
     def test_slug(self):
-        # If a title is given, it should be used to generate the slug.
-        page = Page(**self.page_kwargs)
+        page_kwargs = self._copy_page_kwargs()
+        settings = get_settings()
+        page_kwargs['settings'] = settings
+        settings['SLUGIFY_SOURCE'] = "title"
+        page = Page(**page_kwargs)
         self.assertEqual(page.slug, 'foo-bar')
+        settings['SLUGIFY_SOURCE'] = "basename"
+        page = Page(**page_kwargs)
+        self.assertEqual(page.slug, 'foo')
 
     def test_defaultlang(self):
         # If no lang is given, default to the default one.

From 990ddb5a5e020cd68117e6c17b310e51f69c804e Mon Sep 17 00:00:00 2001
From: th3aftermath <leviburner@gmail.com>
Date: Sat, 8 Mar 2014 12:56:30 -0500
Subject: [PATCH 1574/2864] Fix Issue #1165 allows extensions to be set by
 certain settings

PAGINATION_PATTERNS was hard coded so that all files had a ".html" extension. This fixes that and add a test to
ensure that the pagination code is not changing the filename incorrectly.
---
 pelican/paginator.py            |  3 +-
 pelican/settings.py             |  2 +-
 pelican/tests/test_paginator.py | 50 +++++++++++++++++++++++++++++++++
 pelican/writers.py              |  3 +-
 4 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 pelican/tests/test_paginator.py

diff --git a/pelican/paginator.py b/pelican/paginator.py
index df8606ec..757c9120 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -69,7 +69,7 @@ class Paginator(object):
 
 class Page(object):
     def __init__(self, name, object_list, number, paginator, settings):
-        self.name = name
+        self.name, self.extension = os.path.splitext(name)
         self.object_list = object_list
         self.number = number
         self.paginator = paginator
@@ -143,6 +143,7 @@ class Page(object):
             'settings': self.settings,
             'base_name': os.path.dirname(self.name),
             'number_sep': '/',
+            'extension':  self.extension,
         }
 
         if self.number == 1:
diff --git a/pelican/settings.py b/pelican/settings.py
index 7ab43a82..796678e0 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -79,7 +79,7 @@ DEFAULT_CONFIG = {
     'AUTHOR_URL': 'author/{slug}.html',
     'AUTHOR_SAVE_AS': os.path.join('author', '{slug}.html'),
     'PAGINATION_PATTERNS': [
-        (0, '{name}{number}.html', '{name}{number}.html'),
+        (0, '{name}{number}{extension}', '{name}{number}{extension}'),
     ],
     'YEAR_ARCHIVE_SAVE_AS': False,
     'MONTH_ARCHIVE_SAVE_AS': False,
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
new file mode 100644
index 00000000..f454d47d
--- /dev/null
+++ b/pelican/tests/test_paginator.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, absolute_import
+import six
+
+from pelican.tests.support import unittest, get_settings
+
+from pelican.paginator import Paginator
+from pelican.contents import Article
+from pelican.settings import DEFAULT_CONFIG
+from jinja2.utils import generate_lorem_ipsum
+
+# generate one paragraph, enclosed with <p>
+TEST_CONTENT = str(generate_lorem_ipsum(n=1))
+TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
+
+class TestPage(unittest.TestCase):
+    def setUp(self):
+        super(TestPage, self).setUp()
+        self.page_kwargs = {
+            'content': TEST_CONTENT,
+            'context': {
+                'localsiteurl': '',
+            },
+            'metadata': {
+                'summary': TEST_SUMMARY,
+                'title': 'foo bar',
+                'author': 'Blogger',
+            },
+            'source_path': '/path/to/file/foo.ext'
+        }
+
+    def test_save_as_preservation(self):
+        settings = get_settings()
+        # fix up pagination rules
+        from pelican.paginator import PaginationRule
+        pagination_rules = [
+            PaginationRule(*r) for r in settings.get(
+                'PAGINATION_PATTERNS',
+                DEFAULT_CONFIG['PAGINATION_PATTERNS'],
+            )
+        ]
+        settings['PAGINATION_PATTERNS'] = sorted(
+            pagination_rules,
+            key=lambda r: r[0],
+        )
+
+        object_list = [Article(**self.page_kwargs), Article(**self.page_kwargs)]
+        paginator = Paginator('foobar.foo', object_list, settings)
+        page = paginator.page(1)
+        self.assertEqual(page.save_as, 'foobar.foo')
\ No newline at end of file
diff --git a/pelican/writers.py b/pelican/writers.py
index 580a3990..63d74126 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -179,10 +179,9 @@ class Writer(object):
 
         # pagination
         if paginated:
-            name_root = os.path.splitext(name)[0]
 
             # pagination needed, init paginators
-            paginators = {key: Paginator(name_root, val, self.settings)
+            paginators = {key: Paginator(name, val, self.settings)
                           for key, val in paginated.items()}
 
             # generated pages, and write

From 91d576eb45d416d8cbaeee2bc72765c573c824e6 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jean@lauliac.com>
Date: Mon, 24 Mar 2014 14:50:49 -0400
Subject: [PATCH 1575/2864] Apply typogrify on article summary as well

---
 pelican/readers.py                            |  9 ++++---
 .../tests/content/article_with_metadata.rst   |  2 +-
 pelican/tests/test_readers.py                 | 27 ++++++++++++++++++-
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 1e00aefa..20f391eb 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -462,10 +462,13 @@ class Readers(object):
             find_empty_alt(content, path)
 
         # eventually filter the content with typogrify if asked so
-        if content and self.settings['TYPOGRIFY']:
+        if self.settings['TYPOGRIFY']:
             from typogrify.filters import typogrify
-            content = typogrify(content)
-            metadata['title'] = typogrify(metadata['title'])
+            if content:
+                content = typogrify(content)
+                metadata['title'] = typogrify(metadata['title'])
+            if 'summary' in metadata:
+                metadata['summary'] = typogrify(metadata['summary'])
 
         if context_signal:
             logger.debug('signal {}.send({}, <metadata>)'.format(
diff --git a/pelican/tests/content/article_with_metadata.rst b/pelican/tests/content/article_with_metadata.rst
index c5768cfb..9b65a4b0 100644
--- a/pelican/tests/content/article_with_metadata.rst
+++ b/pelican/tests/content/article_with_metadata.rst
@@ -9,5 +9,5 @@ This is a super article !
 :author: Alexis Métaireau
 :summary:
     Multi-line metadata should be supported
-    as well as **inline markup**.
+    as well as **inline markup** and stuff to "typogrify"...
 :custom_field: http://notmyidea.org
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index acb268fb..d605d785 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -40,7 +40,8 @@ class RstReaderTest(ReaderTest):
             'title': 'This is a super article !',
             'summary': '<p class="first last">Multi-line metadata should be'
                        ' supported\nas well as <strong>inline'
-                       ' markup</strong>.</p>\n',
+                       ' markup</strong> and stuff to &quot;typogrify'
+                       '&quot;...</p>\n',
             'date': datetime.datetime(2010, 12, 2, 10, 14),
             'modified': datetime.datetime(2010, 12, 2, 10, 20),
             'tags': ['foo', 'bar', 'foobar'],
@@ -125,6 +126,30 @@ class RstReaderTest(ReaderTest):
         except ImportError:
             return unittest.skip('need the typogrify distribution')
 
+    def test_typogrify_summary(self):
+        # if nothing is specified in the settings, the summary should be
+        # unmodified
+        page = self.read_file(path='article_with_metadata.rst')
+        expected = ('<p class="first last">Multi-line metadata should be'
+                    ' supported\nas well as <strong>inline'
+                    ' markup</strong> and stuff to &quot;typogrify'
+                    '&quot;...</p>\n')
+
+        self.assertEqual(page.metadata['summary'], expected)
+
+        try:
+            # otherwise, typogrify should be applied
+            page = self.read_file(path='article_with_metadata.rst',
+                                  TYPOGRIFY=True)
+            expected = ('<p class="first last">Multi-line metadata should be'
+                        ' supported\nas well as <strong>inline'
+                        ' markup</strong> and stuff to&nbsp;&quot;typogrify'
+                        '&quot;&#8230;</p>\n')
+
+            self.assertEqual(page.metadata['summary'], expected)
+        except ImportError:
+            return unittest.skip('need the typogrify distribution')
+
 
 class MdReaderTest(ReaderTest):
 

From 01ad449f29b8f9cdd17ce204312384a5f15b6c44 Mon Sep 17 00:00:00 2001
From: th3aftermath <leviburner@gmail.com>
Date: Sun, 30 Mar 2014 14:35:22 -0400
Subject: [PATCH 1576/2864] Fix indentation error in the settings doc This was
 accidentally caused by me in #1248 As a result the Basic Settings table was
 not being updated.

---
 docs/settings.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 3873a479..b579ae95 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -167,9 +167,9 @@ Setting name (default value)
                                                                                  code blocks. See :ref:`internal_pygments_options` for a list of
                                                                                  supported options.
 
-`SLUGIFY_SOURCE` (``'input'``)                                                Specifies where you want the slug to be automatically generated 
-                                                                                 from. Can be set to 'title' to use the Title: metadata tag or 
-                                                                                 'basename' to use the articles basename to make a slug. 
+`SLUGIFY_SOURCE` (``'input'``)                                                   Specifies where you want the slug to be automatically generated 
+                                                                                 from. Can be set to 'title' to use the 'Title:' metadata tag or 
+                                                                                 'basename' to use the articles basename when creating the slug. 
 ===============================================================================  =====================================================================
 
 .. [#] Default is the system locale.

From 382c09c187293310dca226cc0b873564a5993c7b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 30 Mar 2014 11:59:32 -0700
Subject: [PATCH 1577/2864] Fix docs last_stable version and copyright date

---
 docs/conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 5ac81b9e..6db0f3d1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,11 +12,11 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.ifconfig', 'sphinx.ext.extlinks'
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Pelican'
-copyright = '2010, Alexis Metaireau and contributors'
+copyright = '2014, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
-last_stable = '3.2.2'
+last_stable = '3.3.0'
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)

From 3f304a2e9277a5c512ac722279cc278bb866ea5c Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Mon, 31 Mar 2014 19:38:49 +0200
Subject: [PATCH 1578/2864] change the inhibition value of *_SAVE_AS to ''

Previously, the documentation claimed the value of None for this purpose
even though False was used for certain defaults. The values False and
None cause warnings to be emitted from URLWrapper._from_settings though,
so the new way of inhibiting page generation is to set a *_SAVE_AS value
to the empty string.
---
 docs/settings.rst   | 8 ++++----
 pelican/settings.py | 6 +++---
 pelican/writers.py  | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index b579ae95..0c16db3c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -269,9 +269,9 @@ Setting name (default value)                            What does it do?
 `TAG_SAVE_AS` (``'tag/{slug}.html'``)                   The location to save the tag page.
 `AUTHOR_URL` (``'author/{slug}.html'``)                 The URL to use for an author.
 `AUTHOR_SAVE_AS` (``'author/{slug}.html'``)             The location to save an author.
-`YEAR_ARCHIVE_SAVE_AS` (False)                          The location to save per-year archives of your posts.
-`MONTH_ARCHIVE_SAVE_AS` (False)                         The location to save per-month archives of your posts.
-`DAY_ARCHIVE_SAVE_AS` (False)                           The location to save per-day archives of your posts.
+`YEAR_ARCHIVE_SAVE_AS` (``''``)                         The location to save per-year archives of your posts.
+`MONTH_ARCHIVE_SAVE_AS` (``''``)                        The location to save per-month archives of your posts.
+`DAY_ARCHIVE_SAVE_AS` (``''``)                          The location to save per-day archives of your posts.
 `SLUG_SUBSTITUTIONS`  (``()``)                          Substitutions to make prior to stripping out
                                                         non-alphanumerics when generating slugs. Specified
                                                         as a list of 2-tuples of ``(from, to)`` which are
@@ -282,7 +282,7 @@ Setting name (default value)                            What does it do?
 
     If you do not want one or more of the default pages to be created (e.g.,
     you are the only author on your site and thus do not need an Authors page),
-    set the corresponding ``*_SAVE_AS`` setting to ``None`` to prevent the
+    set the corresponding ``*_SAVE_AS`` setting to ``''`` to prevent the
     relevant page from being generated.
 
 `DIRECT_TEMPLATES`
diff --git a/pelican/settings.py b/pelican/settings.py
index 796678e0..ffd0bc8f 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -81,9 +81,9 @@ DEFAULT_CONFIG = {
     'PAGINATION_PATTERNS': [
         (0, '{name}{number}{extension}', '{name}{number}{extension}'),
     ],
-    'YEAR_ARCHIVE_SAVE_AS': False,
-    'MONTH_ARCHIVE_SAVE_AS': False,
-    'DAY_ARCHIVE_SAVE_AS': False,
+    'YEAR_ARCHIVE_SAVE_AS': '',
+    'MONTH_ARCHIVE_SAVE_AS': '',
+    'DAY_ARCHIVE_SAVE_AS': '',
     'RELATIVE_URLS': False,
     'DEFAULT_LANG': 'en',
     'TAG_CLOUD_STEPS': 4,
diff --git a/pelican/writers.py b/pelican/writers.py
index 63d74126..19e36e39 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -140,7 +140,7 @@ class Writer(object):
         :param **kwargs: additional variables to pass to the templates
         """
 
-        if name is False:
+        if name is False or name == "":
             return
         elif not name:
             # other stuff, just return for now

From d9b0091357565391854e6a00563a551b8b7bfe13 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Tue, 1 Apr 2014 20:44:09 +0200
Subject: [PATCH 1579/2864] Limit and filter logs

Drop duplicates logs.
Allow for logs to be grouped, enforcing a maximum number of logs per group.
Add the LOG_FILTER setting to ask from the configuration file to ignore some
logs (of level up to warning).
---
 docs/contribute.rst           | 38 ++++++++++++++++++++
 docs/settings.rst             | 20 +++++++++++
 pelican/__init__.py           |  5 ++-
 pelican/contents.py           |  6 ++--
 pelican/log.py                | 65 ++++++++++++++++++++++++++++++++---
 pelican/readers.py            | 34 ++++++------------
 pelican/settings.py           |  9 ++++-
 pelican/tests/test_pelican.py |  2 +-
 8 files changed, 146 insertions(+), 33 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 304d1de8..28df1fcd 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -143,3 +143,41 @@ and Python 3 at the same time:
   changed it where I felt necessary.
 
 - Changed xrange() back to range(), so it is valid in both Python versions.
+
+
+Logging tips
+============
+
+Try to use logging with appropriate levels.
+
+For logging messages that are not repeated, use the usual Python way:
+
+    # at top of file
+    import logging
+    logger = logging.getLogger(__name__)
+
+    # when needed
+    logger.warning('A warning that could occur only once")
+
+However, if you want to log messages that may occur several times, instead of
+a string, gives a tuple to the logging method, with two arguments:
+
+ 1. The message to log for this very execution
+ 2. A generic message that will appear if the previous one would occur to many
+    times.
+
+For example, if you want to log missing resources, use the following code:
+
+    for ressource in ressources:
+        if ressource.is_missing:
+            logger.warning((
+                'The resource {r} is missing'.format(r=ressource.name),
+                'Other resources were missing'))
+
+The logs will be displayed as follows:
+
+    WARNING: The resource prettiest_cat.jpg is missing
+    WARNING: The resource best_cat_ever.jpg is missing
+    WARNING: The resource cutest_cat.jpg is missing
+    WARNING: The resource lolcat.jpg is missing
+    WARNING: Other resources were missing
diff --git a/docs/settings.rst b/docs/settings.rst
index 0c16db3c..f7cfa69d 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -88,6 +88,9 @@ Setting name (default value)
                                                                                  here or a single string representing one locale.
                                                                                  When providing a list, all the locales will be tried
                                                                                  until one works.
+`LOG_FILTER` (``[]``)                                                            A list of tuples containing the logging level (up to warning)
+                                                                                 and the message to be ignored.
+                                                                                 For example: ``[(logging.WARN, 'TAG_SAVE_AS is set to False')]``
 `READERS` (``{}``)                                                               A dictionary of file extensions / Reader classes for Pelican to
                                                                                  process or ignore. For example, to avoid processing .html files,
                                                                                  set: ``READERS = {'html': None}``. To add a custom reader for the
@@ -694,6 +697,23 @@ adding the following to your configuration::
 
     CSS_FILE = "wide.css"
 
+
+Logging
+=======
+
+Sometimes, useless lines of log appears while the generation occurs. Finding
+**the** meaningful error message in the middle of tons of annoying log outputs
+can be quite tricky. To be able to filter out all useless log messages, Pelican
+comes with the ``LOG_FILTER`` setting.
+
+``LOG_FILTER`` should be a list of tuples ``(level, msg)``, each of them being
+composed of the logging level (up to warning) and the message to be ignored.
+Simply populate the list with the logs you want to hide and they will be
+filtered out.
+
+For example: ``[(logging.WARN, 'TAG_SAVE_AS is set to False')]``
+
+
 Example settings
 ================
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 08dd484e..494e7e43 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -11,12 +11,15 @@ import argparse
 import locale
 import collections
 
+# pelican.log has to be the first pelican module to be loaded
+# because logging.setLoggerClass has to be called before logging.getLogger
+from pelican.log import init
+
 from pelican import signals
 
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 StaticGenerator, SourceFileGenerator,
                                 TemplatePagesGenerator)
-from pelican.log import init
 from pelican.readers import Readers
 from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, folder_watcher, file_watcher
diff --git a/pelican/contents.py b/pelican/contents.py
index 66602666..3096a064 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -239,8 +239,10 @@ class Content(object):
                              self._context['filenames'][path].url))
                     origin = origin.replace('\\', '/')  # for Windows paths.
                 else:
-                    logger.warning("Unable to find {fn}, skipping url"
-                                   " replacement".format(fn=path))
+                    logger.warning(("Unable to find {fn}, skipping url"
+                                    " replacement".format(fn=value),
+                                    "Other ressources were not found"
+                                    " and their urls not replaced"))
             elif what == 'category':
                 origin = Category(path, self.settings).url
             elif what == 'tag':
diff --git a/pelican/log.py b/pelican/log.py
index bde8037e..d3aae012 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -9,7 +9,7 @@ import os
 import sys
 import logging
 
-from logging import Formatter, getLogger, StreamHandler, DEBUG
+from collections import defaultdict
 
 
 RESET_TERM = '\033[0;m'
@@ -30,7 +30,7 @@ def ansi(color, text):
     return '\033[1;{0}m{1}{2}'.format(code, text, RESET_TERM)
 
 
-class ANSIFormatter(Formatter):
+class ANSIFormatter(logging.Formatter):
     """Convert a `logging.LogRecord' object into colored text, using ANSI
        escape sequences.
 
@@ -51,7 +51,7 @@ class ANSIFormatter(Formatter):
             return ansi('white', record.levelname) + ': ' + msg
 
 
-class TextFormatter(Formatter):
+class TextFormatter(logging.Formatter):
     """
     Convert a `logging.LogRecord' object into text.
     """
@@ -63,7 +63,62 @@ class TextFormatter(Formatter):
             return record.levelname + ': ' + record.getMessage()
 
 
-def init(level=None, logger=getLogger(), handler=StreamHandler()):
+class LimitFilter(logging.Filter):
+    """
+    Remove duplicates records, and limit the number of records in the same
+    group.
+
+    Groups are specified by the message to use when the number of records in
+    the same group hit the limit.
+    E.g.: log.warning(('43 is not the answer', 'More erroneous answers'))
+    """
+
+    ignore = set()
+    threshold = 5
+    group_count = defaultdict(int)
+
+    def filter(self, record):
+        # don't limit levels over warnings
+        if record.levelno > logging.WARN:
+            return record
+        # extract group
+        group = None
+        if len(record.msg) == 2:
+            record.msg, group = record.msg
+        # ignore record if it was already raised
+        # use .getMessage() and not .msg for string formatting
+        ignore_key = (record.levelno, record.getMessage())
+        to_ignore = ignore_key in LimitFilter.ignore
+        LimitFilter.ignore.add(ignore_key)
+        if to_ignore:
+            return False
+        # check if we went over threshold
+        if group:
+            key = (record.levelno, group)
+            LimitFilter.group_count[key] += 1
+            if LimitFilter.group_count[key] == LimitFilter.threshold:
+                record.msg = group
+            if LimitFilter.group_count[key] > LimitFilter.threshold:
+                return False
+        return record
+
+
+class LimitLogger(logging.Logger):
+    """
+    A logger which add LimitFilter automatically
+    """
+
+    limit_filter = LimitFilter()
+
+    def __init__(self, *args, **kwargs):
+        super(LimitLogger, self).__init__(*args, **kwargs)
+        self.addFilter(LimitLogger.limit_filter)
+
+logging.setLoggerClass(LimitLogger)
+
+
+def init(level=None, handler=logging.StreamHandler()):
+
     logger = logging.getLogger()
 
     if (os.isatty(sys.stdout.fileno())
@@ -79,7 +134,7 @@ def init(level=None, logger=getLogger(), handler=StreamHandler()):
 
 
 if __name__ == '__main__':
-    init(level=DEBUG)
+    init(level=logging.DEBUG)
 
     root_logger = logging.getLogger()
     root_logger.debug('debug')
diff --git a/pelican/readers.py b/pelican/readers.py
index 26329af6..35c38220 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -318,7 +318,11 @@ class HTMLReader(BaseReader):
             if not contents:
                 contents = self._attr_value(attrs, 'contents', '')
                 if contents:
-                    logger.warning("Meta tag attribute 'contents' used in file %s, should be changed to 'content'", self._filename)
+                    logger.warning((
+                        "Meta tag attribute 'contents' used in file {}, should"
+                        " be changed to 'content'".format(self._filename),
+                        "Other files have meta tag attribute 'contents' that"
+                        " should be changed to 'content'"))
 
             if name == 'keywords':
                 name = 'tags'
@@ -385,10 +389,6 @@ class Readers(object):
 
     """
 
-    # used to warn about missing dependencies only once, at the first
-    # instanciation of a Readers object.
-    warn_missing_deps = True
-
     def __init__(self, settings=None):
         self.settings = settings or {}
         self.readers = {}
@@ -396,16 +396,13 @@ class Readers(object):
 
         for cls in [BaseReader] + BaseReader.__subclasses__():
             if not cls.enabled:
-                if self.__class__.warn_missing_deps:
-                    logger.debug('Missing dependencies for {}'
-                                 .format(', '.join(cls.file_extensions)))
+                logger.debug('Missing dependencies for {}'
+                             .format(', '.join(cls.file_extensions)))
                 continue
 
             for ext in cls.file_extensions:
                 self.reader_classes[ext] = cls
 
-        self.__class__.warn_missing_deps = False
-
         if self.settings['READERS']:
             self.reader_classes.update(self.settings['READERS'])
 
@@ -505,19 +502,10 @@ def find_empty_alt(content, path):
             src=(['"])(.*)\5
         )
         """, re.X)
-    matches = re.findall(imgs, content)
-    # find a correct threshold
-    nb_warnings = 10
-    if len(matches) == nb_warnings + 1:
-        nb_warnings += 1  # avoid bad looking case
-    # print one warning per image with empty alt until threshold
-    for match in matches[:nb_warnings]:
-        logger.warning('Empty alt attribute for image {} in {}'.format(
-            os.path.basename(match[1] + match[5]), path))
-    # print one warning for the other images with empty alt
-    if len(matches) > nb_warnings:
-        logger.warning('{} other images with empty alt attributes'
-                       .format(len(matches) - nb_warnings))
+    for match in re.findall(imgs, content):
+        logger.warning(('Empty alt attribute for image {} in {}'.format(
+            os.path.basename(match[1] + match[5]), path),
+            'Other images have empty alt attributes'))
 
 
 def default_metadata(settings=None, process=None):
diff --git a/pelican/settings.py b/pelican/settings.py
index ffd0bc8f..f70f74a8 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -19,6 +19,8 @@ except ImportError:
 
 from os.path import isabs
 
+from pelican.log import LimitFilter
+
 
 logger = logging.getLogger(__name__)
 
@@ -98,6 +100,7 @@ DEFAULT_CONFIG = {
     'MD_EXTENSIONS': ['codehilite(css_class=highlight)', 'extra'],
     'JINJA_EXTENSIONS': [],
     'JINJA_FILTERS': {},
+    'LOG_FILTER': [],
     'LOCALE': [''],  # defaults to user locale
     'DEFAULT_PAGINATION': False,
     'DEFAULT_ORPHANS': 0,
@@ -170,12 +173,16 @@ def get_settings_from_file(path, default_settings=DEFAULT_CONFIG):
 def configure_settings(settings):
     """Provide optimizations, error checking and warnings for the given
     settings.
-
+    Set up the logs to be ignored as well.
     """
     if not 'PATH' in settings or not os.path.isdir(settings['PATH']):
         raise Exception('You need to specify a path containing the content'
                         ' (see pelican --help for more information)')
 
+    # set up logs to be ignored
+    LimitFilter.ignore.update(set(settings.get('LOG_FILTER',
+                                               DEFAULT_CONFIG['LOG_FILTER'])))
+
     # lookup the theme in "pelican/themes" if the given one doesn't exist
     if not os.path.isdir(settings['THEME']):
         theme_path = os.path.join(
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 21a77e6b..2d4bbdfc 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -83,7 +83,7 @@ class TestPelican(LoggedTestCase):
         mute(True)(pelican.run)()
         self.assertDirsEqual(self.temp_path, os.path.join(OUTPUT_PATH, 'basic'))
         self.assertLogCountEqual(
-            count=4,
+            count=3,
             msg="Unable to find.*skipping url replacement",
             level=logging.WARNING)
 

From 80842cbc0e2bbaed991c23de318752ca866a32a9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 2 Apr 2014 12:38:49 -0700
Subject: [PATCH 1580/2864] Fix deprecated logger warning for Python 3

logger.warn() has been deprecated in Python 3 in favor of logger.warning()
---
 pelican/tools/pelican_import.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index d6b57c47..30d6346c 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -135,7 +135,7 @@ def wp2fields(xml, wp_custpost=False):
                 title = HTMLParser().unescape(item.title.contents[0])
             except IndexError:
                 title = 'No title [%s]' % item.find('post_name').string
-                logger.warn('Post "%s" is lacking a proper title' % title)
+                logger.warning('Post "%s" is lacking a proper title' % title)
 
             filename = item.find('post_name').string
             post_id = item.find('post_id').string
@@ -601,11 +601,11 @@ def download_attachments(output_path, urls):
         except URLError as e:
             error = ("No file could be downloaded from {}; Error {}"
                     .format(url, e))
-            logger.warn(error)
+            logger.warning(error)
         except IOError as e: #Python 2.7 throws an IOError rather Than URLError
             error = ("No file could be downloaded from {}; Error {}"
                     .format(url, e))
-            logger.warn(error)
+            logger.warning(error)
     return locations
 
 

From c6ff88d0fce7f7ab5e05f2c414a365aa9faa6454 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 7 Apr 2014 14:29:21 -0700
Subject: [PATCH 1581/2864] Minor correction to settings documentation

---
 docs/settings.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 0c16db3c..53a25f8c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -36,7 +36,7 @@ Setting name (default value)
 ===============================================================================  =====================================================================
 `AUTHOR`                                                                         Default author (put your name)
 `DATE_FORMATS` (``{}``)                                                          If you manage multiple languages, you can set the date formatting
-                                                                                 here. See the "Date format and locales" section below for details.
+                                                                                 here. See the "Date format and locale" section below for details.
 `USE_FOLDER_AS_CATEGORY` (``True``)                                              When you don't specify a category in your post metadata, set this
                                                                                  setting to ``True``, and organize your articles in subfolders, the
                                                                                  subfolder will become the category of your post. If set to ``False``,
@@ -167,9 +167,9 @@ Setting name (default value)
                                                                                  code blocks. See :ref:`internal_pygments_options` for a list of
                                                                                  supported options.
 
-`SLUGIFY_SOURCE` (``'input'``)                                                   Specifies where you want the slug to be automatically generated 
-                                                                                 from. Can be set to 'title' to use the 'Title:' metadata tag or 
-                                                                                 'basename' to use the articles basename when creating the slug. 
+`SLUGIFY_SOURCE` (``'input'``)                                                   Specifies where you want the slug to be automatically generated
+                                                                                 from. Can be set to 'title' to use the 'Title:' metadata tag or
+                                                                                 'basename' to use the articles basename when creating the slug.
 ===============================================================================  =====================================================================
 
 .. [#] Default is the system locale.

From 03976b650d0e96251a63a9510d23fff7d9aec2d1 Mon Sep 17 00:00:00 2001
From: Antoine Brenner <antoine@gymglish.com>
Date: Mon, 14 Apr 2014 20:43:19 +0200
Subject: [PATCH 1582/2864] Fix unittest issue related to python2/python3
 differences

The test_datetime test passed on python3 but not python2 because
datetime.strftime is a byte string in python2, and a unicode string in python3

This patch allows the test to pass in both python2 and python3 (3.3+ only)
---
 pelican/tests/test_contents.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 4c6f8ed1..27d2a897 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -129,9 +129,15 @@ class TestPage(unittest.TestCase):
         page_kwargs['metadata']['date'] = dt
         page = Page(**page_kwargs)
 
-        self.assertEqual(page.locale_date,
-            dt.strftime(DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']))
+        # page.locale_date is a unicode string in both python2 and python3
+        dt_date = dt.strftime(DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']) 
+        # dt_date is a byte string in python2, and a unicode string in python3
+        # Let's make sure it is a unicode string (relies on python 3.3 supporting the u prefix)
+        if type(dt_date) != type(u''):
+            # python2:
+            dt_date = unicode(dt_date, 'utf8')
 
+        self.assertEqual(page.locale_date, dt_date )
         page_kwargs['settings'] = get_settings()
 
         # I doubt this can work on all platforms ...

From 7e06912bcad1eeb71d8f154dff21555a5ed865ca Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 14 Apr 2014 16:18:07 -0400
Subject: [PATCH 1583/2864] Minor text changes to log message limitation

---
 docs/contribute.rst | 16 ++++++++--------
 docs/settings.rst   | 14 +++++++-------
 pelican/contents.py |  2 +-
 pelican/log.py      |  4 ++--
 pelican/settings.py |  6 +++---
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 28df1fcd..57349156 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -157,24 +157,24 @@ For logging messages that are not repeated, use the usual Python way:
     logger = logging.getLogger(__name__)
 
     # when needed
-    logger.warning('A warning that could occur only once")
+    logger.warning("A warning that would usually occur only once")
 
 However, if you want to log messages that may occur several times, instead of
-a string, gives a tuple to the logging method, with two arguments:
+a string, give a tuple to the logging method, with two arguments:
 
- 1. The message to log for this very execution
- 2. A generic message that will appear if the previous one would occur to many
+ 1. The message to log for the initial execution
+ 2. A generic message that will appear if the previous one would occur too many
     times.
 
 For example, if you want to log missing resources, use the following code:
 
-    for ressource in ressources:
-        if ressource.is_missing:
+    for resource in resources:
+        if resource.is_missing:
             logger.warning((
-                'The resource {r} is missing'.format(r=ressource.name),
+                'The resource {r} is missing'.format(r=resource.name),
                 'Other resources were missing'))
 
-The logs will be displayed as follows:
+The log messages will be displayed as follows:
 
     WARNING: The resource prettiest_cat.jpg is missing
     WARNING: The resource best_cat_ever.jpg is missing
diff --git a/docs/settings.rst b/docs/settings.rst
index c35bf08d..36cc3f9a 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -88,7 +88,7 @@ Setting name (default value)
                                                                                  here or a single string representing one locale.
                                                                                  When providing a list, all the locales will be tried
                                                                                  until one works.
-`LOG_FILTER` (``[]``)                                                            A list of tuples containing the logging level (up to warning)
+`LOG_FILTER` (``[]``)                                                            A list of tuples containing the logging level (up to ``warning``)
                                                                                  and the message to be ignored.
                                                                                  For example: ``[(logging.WARN, 'TAG_SAVE_AS is set to False')]``
 `READERS` (``{}``)                                                               A dictionary of file extensions / Reader classes for Pelican to
@@ -701,15 +701,15 @@ adding the following to your configuration::
 Logging
 =======
 
-Sometimes, useless lines of log appears while the generation occurs. Finding
-**the** meaningful error message in the middle of tons of annoying log outputs
-can be quite tricky. To be able to filter out all useless log messages, Pelican
+Sometimes, a long list of warnings may appear during site generation. Finding
+the **meaningful** error message in the middle of tons of annoying log output
+can be quite tricky. In order to filter out redundant log messages, Pelican
 comes with the ``LOG_FILTER`` setting.
 
 ``LOG_FILTER`` should be a list of tuples ``(level, msg)``, each of them being
-composed of the logging level (up to warning) and the message to be ignored.
-Simply populate the list with the logs you want to hide and they will be
-filtered out.
+composed of the logging level (up to ``warning``) and the message to be ignored.
+Simply populate the list with the log messages you want to hide, and they will
+be filtered out.
 
 For example: ``[(logging.WARN, 'TAG_SAVE_AS is set to False')]``
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 3096a064..615a7fd8 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -241,7 +241,7 @@ class Content(object):
                 else:
                     logger.warning(("Unable to find {fn}, skipping url"
                                     " replacement".format(fn=value),
-                                    "Other ressources were not found"
+                                    "Other resources were not found"
                                     " and their urls not replaced"))
             elif what == 'category':
                 origin = Category(path, self.settings).url
diff --git a/pelican/log.py b/pelican/log.py
index d3aae012..fdf41cb0 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -78,7 +78,7 @@ class LimitFilter(logging.Filter):
     group_count = defaultdict(int)
 
     def filter(self, record):
-        # don't limit levels over warnings
+        # don't limit log messages for anything above "warning"
         if record.levelno > logging.WARN:
             return record
         # extract group
@@ -105,7 +105,7 @@ class LimitFilter(logging.Filter):
 
 class LimitLogger(logging.Logger):
     """
-    A logger which add LimitFilter automatically
+    A logger which adds LimitFilter automatically
     """
 
     limit_filter = LimitFilter()
diff --git a/pelican/settings.py b/pelican/settings.py
index f70f74a8..7277c121 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -171,15 +171,15 @@ def get_settings_from_file(path, default_settings=DEFAULT_CONFIG):
 
 
 def configure_settings(settings):
-    """Provide optimizations, error checking and warnings for the given
+    """Provide optimizations, error checking, and warnings for the given
     settings.
-    Set up the logs to be ignored as well.
+    Also, specify the log messages to be ignored.
     """
     if not 'PATH' in settings or not os.path.isdir(settings['PATH']):
         raise Exception('You need to specify a path containing the content'
                         ' (see pelican --help for more information)')
 
-    # set up logs to be ignored
+    # specify the log messages to be ignored
     LimitFilter.ignore.update(set(settings.get('LOG_FILTER',
                                                DEFAULT_CONFIG['LOG_FILTER'])))
 

From aabb7f9345853c7afb73e781ac1cc65f6a2094dd Mon Sep 17 00:00:00 2001
From: Antoine Brenner <antoine@gymglish.com>
Date: Mon, 14 Apr 2014 22:28:25 +0200
Subject: [PATCH 1584/2864] Fix error in download_attachments() triggered by
 python2 unit test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The download_attachments error is triggered in the unit tests by a japanese
error message (接続を拒否されました) (connexion denied), that
python is not able to serialize the into a byte string.

This error weirdly does not appear every time the unit tests are run.
It might be related to the order in which the tests are run.

This error was found and fixed during the PyconUS 2014 pelican
sprint. It was discovered on a Linux Fedora20 computer running
Python2.7 in virtualenv
---
 pelican/tools/pelican_import.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 30d6346c..27e47754 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -603,8 +603,18 @@ def download_attachments(output_path, urls):
                     .format(url, e))
             logger.warning(error)
         except IOError as e: #Python 2.7 throws an IOError rather Than URLError
-            error = ("No file could be downloaded from {}; Error {}"
-                    .format(url, e))
+            # For japanese, the error might look kind of like this:
+            # e = IOError( 'socket error', socket.error(111, u'\u63a5\u7d9a\u3092\u62d2\u5426\u3055\u308c\u307e\u3057\u305f') )
+            # and not be suitable to use in "{}".format(e) , raising UnicodeDecodeError
+            # (This is at least the case on my Fedora running Python 2.7.5 
+            # (default, Feb 19 2014, 13:47:28) [GCC 4.8.2 20131212 (Red Hat 4.8.2-7)] on linux2
+            try:
+                error = ("No file could be downloaded from {}; Error {}"
+                        .format(url, e))
+            except UnicodeDecodeError:
+                # For lack of a better log message because we could not decode e, let's use repr(e)
+                error = ("No file could be downloaded from {}; Error {}"
+                        .format(url, repr(e)))
             logger.warning(error)
     return locations
 

From fd779267000ac539ee0a9ba5856d103fbbc7cd7c Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Sat, 15 Feb 2014 21:20:51 +0100
Subject: [PATCH 1585/2864] Cache content to speed up reading. Fixes #224.

Cache read content so that it doesn't have to be read next time if its
source has not been modified.
---
 docs/faq.rst                     |  19 ++++++
 docs/settings.rst                |  64 ++++++++++++++++-
 pelican/__init__.py              |  19 ++++++
 pelican/contents.py              |   7 ++
 pelican/generators.py            |  72 ++++++++++++--------
 pelican/settings.py              |   7 +-
 pelican/tests/test_generators.py |  59 ++++++++++++++++
 pelican/tests/test_pelican.py    |   6 ++
 pelican/utils.py                 | 113 +++++++++++++++++++++++++++++++
 9 files changed, 334 insertions(+), 32 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 80e14d21..bb9377e6 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -205,3 +205,22 @@ You can also disable generation of tag-related pages via::
 
     TAGS_SAVE_AS = ''
     TAG_SAVE_AS = ''
+
+Why does Pelican always write all HTML files even with content caching enabled?
+===============================================================================
+
+In order to reliably determine whether the HTML output is different
+before writing it, a large part of the generation environment
+including the template contexts, imported plugins, etc. would have to
+be saved and compared, at least in the form of a hash (which would
+require special handling of unhashable types), because of all the
+possible combinations of plugins, pagination, etc. which may change in
+many different ways. This would require a lot more processing time
+and memory and storage space. Simply writing the files each time is a
+lot faster and a lot more reliable.
+
+However, this means that the modification time of the files changes
+every time, so a ``rsync`` based upload will transfer them even if
+their content hasn't changed. A simple solution is to make ``rsync``
+use the ``--checksum`` option, which will make it compare the file
+checksums in a much faster way than Pelican would.
diff --git a/docs/settings.rst b/docs/settings.rst
index 36cc3f9a..d8690230 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -173,6 +173,12 @@ Setting name (default value)
 `SLUGIFY_SOURCE` (``'input'``)                                                   Specifies where you want the slug to be automatically generated
                                                                                  from. Can be set to 'title' to use the 'Title:' metadata tag or
                                                                                  'basename' to use the articles basename when creating the slug.
+`CACHE_CONTENT` (``True``)                                                       If ``True``, save read content in a cache file. 
+                                                                                 See :ref:`reading_only_modified_content` for details about caching.
+`CACHE_DIRECTORY` (``cache``)                                                    Directory in which to store cache files.
+`CHECK_MODIFIED_METHOD` (``mtime``)                                              Controls how files are checked for modifications.
+`LOAD_CONTENT_CACHE` (``True``)                                                  If ``True``, load unmodified content from cache.
+`GZIP_CACHE` (``True``)                                                          If ``True``, use gzip to (de)compress the cache files.
 ===============================================================================  =====================================================================
 
 .. [#] Default is the system locale.
@@ -602,7 +608,7 @@ Setting name (default value)                             What does it do?
 .. [3] %s is the language
 
 Ordering content
-=================
+================
 
 ================================================    =====================================================
 Setting name (default value)                        What does it do?
@@ -697,7 +703,6 @@ adding the following to your configuration::
 
     CSS_FILE = "wide.css"
 
-
 Logging
 =======
 
@@ -713,6 +718,61 @@ be filtered out.
 
 For example: ``[(logging.WARN, 'TAG_SAVE_AS is set to False')]``
 
+.. _reading_only_modified_content:
+
+Reading only modified content
+=============================
+
+To speed up the build process, pelican can optionally read only articles
+and pages with modified content.
+
+When Pelican is about to read some content source file:
+
+1. The hash or modification time information for the file from a
+   previous build are loaded from a cache file if `LOAD_CONTENT_CACHE`
+   is ``True``. These files are stored in the `CACHE_DIRECTORY`
+   directory.  If the file has no record in the cache file, it is read
+   as usual.
+2. The file is checked according to `CHECK_MODIFIED_METHOD`:
+
+    - If set to ``'mtime'``, the modification time of the file is
+      checked.
+    - If set to a name of a function provided by the ``hashlib``
+      module, e.g. ``'md5'``, the file hash is checked.
+    - If set to anything else or the necessary information about the
+      file cannot be found in the cache file, the content is read as
+      usual.
+
+3. If the file is considered unchanged, the content object saved in a
+   previous build corresponding to the file is loaded from the cache
+   and the file is not read.
+4. If the file is considered changed, the file is read and the new
+   modification information and the content object are saved to the
+   cache if `CACHE_CONTENT` is ``True``.
+
+Modification time based checking is faster than comparing file hashes,
+but is not as reliable, because mtime information can be lost when
+e.g. copying the content sources using the ``cp`` or ``rsync``
+commands without the mtime preservation mode (invoked e.g. by
+``--archive``).
+
+The cache files are Python pickles, so they may not be readable by
+different versions of Python as the pickle format often changes. If
+such an error is encountered, the cache files have to be rebuilt
+using the pelican command-line option ``--full-rebuild``.
+The cache files also have to be rebuilt when changing the
+`GZIP_CACHE` setting for cache file reading to work.
+
+The ``--full-rebuild`` command-line option is also useful when the
+whole site needs to be regenerated due to e.g. modifications to the
+settings file or theme files. When pelican runs in autorealod mode,
+modification of the settings file or theme will trigger a full rebuild
+automatically.
+
+Note that even when using cached content, all output is always
+written, so the modification times of the ``*.html`` files always
+change.  Therefore, ``rsync`` based upload may benefit from the
+``--checksum`` option.
 
 Example settings
 ================
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 494e7e43..b6bfe326 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -260,6 +260,10 @@ def parse_arguments():
                         action='store_true',
                         help='Relaunch pelican each time a modification occurs'
                         ' on the content files.')
+
+    parser.add_argument('-f', '--full-rebuild', action='store_true',
+                        dest='full_rebuild', help='Rebuild everything by not loading from cache')
+
     return parser.parse_args()
 
 
@@ -275,6 +279,8 @@ def get_config(args):
         config['THEME'] = abstheme if os.path.exists(abstheme) else args.theme
     if args.delete_outputdir is not None:
         config['DELETE_OUTPUT_DIRECTORY'] = args.delete_outputdir
+    if args.full_rebuild:
+        config['LOAD_CONTENT_CACHE'] = False
 
     # argparse returns bytes in Py2. There is no definite answer as to which
     # encoding argparse (or sys.argv) uses.
@@ -327,6 +333,7 @@ def main():
             print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
                   ' `settings` for changes. ---')
 
+            first_run = True              # load cache on first run
             while True:
                 try:
                     # Check source dir for changed files ending with the given
@@ -335,9 +342,14 @@ def main():
                     # have changed, no matter what extension the filenames
                     # have.
                     modified = {k: next(v) for k, v in watchers.items()}
+                    original_load_cache = settings['LOAD_CONTENT_CACHE']
 
                     if modified['settings']:
                         pelican, settings = get_instance(args)
+                        if not first_run:
+                            original_load_cache = settings['LOAD_CONTENT_CACHE']
+                            # invalidate cache
+                            pelican.settings['LOAD_CONTENT_CACHE'] = False
 
                     if any(modified.values()):
                         print('\n-> Modified: {}. re-generating...'.format(
@@ -349,8 +361,15 @@ def main():
                         if modified['theme'] is None:
                             logger.warning('Empty theme folder. Using `basic` '
                                            'theme.')
+                        elif modified['theme']:
+                            # theme modified, needs full rebuild -> no cache
+                            if not first_run:   # but not on first run
+                                pelican.settings['LOAD_CONTENT_CACHE'] = False
 
                         pelican.run()
+                        first_run = False
+                        # restore original caching policy
+                        pelican.settings['LOAD_CONTENT_CACHE'] = original_load_cache
 
                 except KeyboardInterrupt:
                     logger.warning("Keyboard interrupt, quitting.")
diff --git a/pelican/contents.py b/pelican/contents.py
index 615a7fd8..c02047b8 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -325,6 +325,13 @@ class Content(object):
             os.path.abspath(self.settings['PATH']))
         )
 
+    def __eq__(self, other):
+        """Compare with metadata and content of other Content object"""
+        return other and self.metadata == other.metadata and self.content == other.content
+
+    # keep basic hashing functionality for caching to work
+    __hash__ = object.__hash__
+
 
 class Page(Content):
     mandatory_properties = ('title',)
diff --git a/pelican/generators.py b/pelican/generators.py
index bfdac1a5..7c2dbbf2 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -20,14 +20,15 @@ from jinja2 import (Environment, FileSystemLoader, PrefixLoader, ChoiceLoader,
 
 from pelican.contents import Article, Draft, Page, Static, is_valid_content
 from pelican.readers import Readers
-from pelican.utils import copy, process_translations, mkdir_p, DateFormatter
+from pelican.utils import (copy, process_translations, mkdir_p, DateFormatter,
+                           FileStampDataCacher)
 from pelican import signals
 
 
 logger = logging.getLogger(__name__)
 
 
-class Generator(object):
+class Generator(FileStampDataCacher):
     """Baseclass generator"""
 
     def __init__(self, context, settings, path, theme, output_path, **kwargs):
@@ -73,6 +74,10 @@ class Generator(object):
         custom_filters = self.settings['JINJA_FILTERS']
         self.env.filters.update(custom_filters)
 
+        # set up caching
+        super(Generator, self).__init__(settings, 'CACHE_CONTENT',
+                                        'LOAD_CONTENT_CACHE')
+
         signals.generator_init.send(self)
 
     def get_template(self, name):
@@ -408,20 +413,24 @@ class ArticlesGenerator(Generator):
         for f in self.get_files(
                 self.settings['ARTICLE_DIR'],
                 exclude=self.settings['ARTICLE_EXCLUDES']):
-            try:
-                article = self.readers.read_file(
-                    base_path=self.path, path=f, content_class=Article,
-                    context=self.context,
-                    preread_signal=signals.article_generator_preread,
-                    preread_sender=self,
-                    context_signal=signals.article_generator_context,
-                    context_sender=self)
-            except Exception as e:
-                logger.warning('Could not process {}\n{}'.format(f, e))
-                continue
+            article = self.get_cached_data(f, None)
+            if article is None:
+                try:
+                    article = self.readers.read_file(
+                        base_path=self.path, path=f, content_class=Article,
+                        context=self.context,
+                        preread_signal=signals.article_generator_preread,
+                        preread_sender=self,
+                        context_signal=signals.article_generator_context,
+                        context_sender=self)
+                except Exception as e:
+                    logger.warning('Could not process {}\n{}'.format(f, e))
+                    continue
 
-            if not is_valid_content(article, f):
-                continue
+                if not is_valid_content(article, f):
+                    continue
+
+                self.cache_data(f, article)
 
             self.add_source_path(article)
 
@@ -502,7 +511,7 @@ class ArticlesGenerator(Generator):
 
         self._update_context(('articles', 'dates', 'tags', 'categories',
                               'tag_cloud', 'authors', 'related_posts'))
-
+        self.save_cache()
         signals.article_generator_finalized.send(self)
 
     def generate_output(self, writer):
@@ -527,20 +536,24 @@ class PagesGenerator(Generator):
         for f in self.get_files(
                 self.settings['PAGE_DIR'],
                 exclude=self.settings['PAGE_EXCLUDES']):
-            try:
-                page = self.readers.read_file(
-                    base_path=self.path, path=f, content_class=Page,
-                    context=self.context,
-                    preread_signal=signals.page_generator_preread,
-                    preread_sender=self,
-                    context_signal=signals.page_generator_context,
-                    context_sender=self)
-            except Exception as e:
-                logger.warning('Could not process {}\n{}'.format(f, e))
-                continue
+            page = self.get_cached_data(f, None)
+            if page is None:
+                try:
+                    page = self.readers.read_file(
+                        base_path=self.path, path=f, content_class=Page,
+                        context=self.context,
+                        preread_signal=signals.page_generator_preread,
+                        preread_sender=self,
+                        context_signal=signals.page_generator_context,
+                        context_sender=self)
+                except Exception as e:
+                    logger.warning('Could not process {}\n{}'.format(f, e))
+                    continue
 
-            if not is_valid_content(page, f):
-                continue
+                if not is_valid_content(page, f):
+                    continue
+
+                self.cache_data(f, page)
 
             self.add_source_path(page)
 
@@ -560,6 +573,7 @@ class PagesGenerator(Generator):
         self._update_context(('pages', ))
         self.context['PAGES'] = self.pages
 
+        self.save_cache()
         signals.page_generator_finalized.send(self)
 
     def generate_output(self, writer):
diff --git a/pelican/settings.py b/pelican/settings.py
index 7277c121..baf2a497 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -119,7 +119,12 @@ DEFAULT_CONFIG = {
     'IGNORE_FILES': ['.#*'],
     'SLUG_SUBSTITUTIONS': (),
     'INTRASITE_LINK_REGEX': '[{|](?P<what>.*?)[|}]',
-    'SLUGIFY_SOURCE': 'title'
+    'SLUGIFY_SOURCE': 'title',
+    'CACHE_CONTENT': True,
+    'CACHE_DIRECTORY': 'cache',
+    'GZIP_CACHE': True,
+    'CHECK_MODIFIED_METHOD': 'mtime',
+    'LOAD_CONTENT_CACHE': True,
     }
 
 PYGMENTS_RST_OPTIONS = None
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 6f13aeb6..a500f87a 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -42,6 +42,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['READERS'] = {'asc': None}
+        settings['CACHE_CONTENT'] = False   # cache not needed for this logic tests
 
         cls.generator = ArticlesGenerator(
             context=settings.copy(), settings=settings,
@@ -50,8 +51,15 @@ class TestArticlesGenerator(unittest.TestCase):
         cls.articles = [[page.title, page.status, page.category.name,
                          page.template] for page in cls.generator.articles]
 
+    def setUp(self):
+        self.temp_cache = mkdtemp(prefix='pelican_cache.')
+
+    def tearDown(self):
+        rmtree(self.temp_cache)
+
     def test_generate_feeds(self):
         settings = get_settings()
+        settings['CACHE_DIRECTORY'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=None, theme=settings['THEME'], output_path=None)
@@ -127,6 +135,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['USE_FOLDER_AS_CATEGORY'] = False
+        settings['CACHE_DIRECTORY'] = self.temp_cache
         settings['READERS'] = {'asc': None}
         settings['filenames'] = {}
         generator = ArticlesGenerator(
@@ -151,6 +160,7 @@ class TestArticlesGenerator(unittest.TestCase):
     def test_direct_templates_save_as_default(self):
 
         settings = get_settings(filenames={})
+        settings['CACHE_DIRECTORY'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=None, theme=settings['THEME'], output_path=None)
@@ -165,6 +175,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings()
         settings['DIRECT_TEMPLATES'] = ['archives']
         settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
+        settings['CACHE_DIRECTORY'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=None, theme=settings['THEME'], output_path=None)
@@ -180,6 +191,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings()
         settings['DIRECT_TEMPLATES'] = ['archives']
         settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
+        settings['CACHE_DIRECTORY'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=None, theme=settings['THEME'], output_path=None)
@@ -206,6 +218,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings(filenames={})
 
         settings['YEAR_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/index.html'
+        settings['CACHE_DIRECTORY'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
@@ -268,6 +281,25 @@ class TestArticlesGenerator(unittest.TestCase):
         authors_expected = ['alexis-metaireau', 'first-author', 'second-author']
         self.assertEqual(sorted(authors), sorted(authors_expected))
 
+    def test_content_caching(self):
+        """Test that the articles are read only once when caching"""
+        settings = get_settings(filenames={})
+        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['READERS'] = {'asc': None}
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        self.assertTrue(hasattr(generator, '_cache'))
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        generator.readers.read_file.assert_called_count == 0
+
 
 class TestPageGenerator(unittest.TestCase):
     # Note: Every time you want to test for a new field; Make sure the test
@@ -275,12 +307,19 @@ class TestPageGenerator(unittest.TestCase):
     # distill_pages Then update the assertEqual in test_generate_context
     # to match expected
 
+    def setUp(self):
+        self.temp_cache = mkdtemp(prefix='pelican_cache.')
+
+    def tearDown(self):
+        rmtree(self.temp_cache)
+
     def distill_pages(self, pages):
         return [[page.title, page.status, page.template] for page in pages]
 
     def test_generate_context(self):
         settings = get_settings(filenames={})
         settings['PAGE_DIR'] = 'TestPages'  # relative to CUR_DIR
+        settings['CACHE_DIRECTORY'] = self.temp_cache
         settings['DEFAULT_DATE'] = (1970, 1, 1)
 
         generator = PagesGenerator(
@@ -306,6 +345,26 @@ class TestPageGenerator(unittest.TestCase):
         self.assertEqual(sorted(pages_expected), sorted(pages))
         self.assertEqual(sorted(hidden_pages_expected), sorted(hidden_pages))
 
+    def test_content_caching(self):
+        """Test that the pages are read only once when caching"""
+        settings = get_settings(filenames={})
+        settings['CACHE_DIRECTORY'] = 'cache_dir'   #TODO
+        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['READERS'] = {'asc': None}
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        self.assertTrue(hasattr(generator, '_cache'))
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        generator.readers.read_file.assert_called_count == 0
+
 
 class TestTemplatePagesGenerator(unittest.TestCase):
 
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 2d4bbdfc..15876095 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -43,12 +43,14 @@ class TestPelican(LoggedTestCase):
     def setUp(self):
         super(TestPelican, self).setUp()
         self.temp_path = mkdtemp(prefix='pelicantests.')
+        self.temp_cache = mkdtemp(prefix='pelican_cache.')
         self.old_locale = locale.setlocale(locale.LC_ALL)
         self.maxDiff = None
         locale.setlocale(locale.LC_ALL, str('C'))
 
     def tearDown(self):
         rmtree(self.temp_path)
+        rmtree(self.temp_cache)
         locale.setlocale(locale.LC_ALL, self.old_locale)
         super(TestPelican, self).tearDown()
 
@@ -77,6 +79,7 @@ class TestPelican(LoggedTestCase):
         settings = read_settings(path=None, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
+            'CACHE_DIRECTORY': self.temp_cache,
             'LOCALE': locale.normalize('en_US'),
             })
         pelican = Pelican(settings=settings)
@@ -92,6 +95,7 @@ class TestPelican(LoggedTestCase):
         settings = read_settings(path=SAMPLE_CONFIG, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
+            'CACHE_DIRECTORY': self.temp_cache,
             'LOCALE': locale.normalize('en_US'),
             })
         pelican = Pelican(settings=settings)
@@ -103,6 +107,7 @@ class TestPelican(LoggedTestCase):
         settings = read_settings(path=SAMPLE_CONFIG, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
+            'CACHE_DIRECTORY': self.temp_cache,
             'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH, 'very'),
                                    os.path.join(SAMPLES_PATH, 'kinda'),
                                    os.path.join(SAMPLES_PATH, 'theme_standard')]
@@ -123,6 +128,7 @@ class TestPelican(LoggedTestCase):
         settings = read_settings(path=SAMPLE_CONFIG, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
+            'CACHE_DIRECTORY': self.temp_cache,
             'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH, 'theme_standard')]
             })
 
diff --git a/pelican/utils.py b/pelican/utils.py
index c5aacaa3..8c416921 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -12,6 +12,8 @@ import pytz
 import re
 import shutil
 import traceback
+import pickle
+import hashlib
 
 from collections import Hashable
 from contextlib import contextmanager
@@ -545,3 +547,114 @@ def split_all(path):
             break
         path = head
     return components
+
+
+class FileDataCacher(object):
+    '''Class that can cache data contained in files'''
+
+    def __init__(self, settings, cache_policy_key, load_policy_key):
+        '''Load the specified cache within CACHE_DIRECTORY
+
+        only if load_policy_key in setttings is True,
+        May use gzip if GZIP_CACHE.
+        Sets caching policy according to *cache_policy_key*
+        in *settings*
+        '''
+        self.settings = settings
+        name = self.__class__.__name__
+        self._cache_path = os.path.join(self.settings['CACHE_DIRECTORY'], name)
+        self._cache_data_policy = self.settings[cache_policy_key]
+        if not self.settings[load_policy_key]:
+            self._cache = {}
+            return
+        if self.settings['GZIP_CACHE']:
+            import gzip
+            self._cache_open = gzip.open
+        else:
+            self._cache_open = open
+        try:
+            with self._cache_open(self._cache_path, 'rb') as f:
+                self._cache = pickle.load(f)
+        except Exception as e:
+            self._cache = {}
+
+    def cache_data(self, filename, data):
+        '''Cache data for given file'''
+        if not self._cache_data_policy:
+            return
+        self._cache[filename] = data
+
+    def get_cached_data(self, filename, default={}):
+        '''Get cached data for the given file
+
+        if no data is cached, return the default object
+        '''
+        return self._cache.get(filename, default)
+
+    def save_cache(self):
+        '''Save the updated cache'''
+        if not self._cache_data_policy:
+            return
+        try:
+            mkdir_p(self.settings['CACHE_DIRECTORY'])
+            with self._cache_open(self._cache_path, 'wb') as f:
+                pickle.dump(self._cache, f)
+        except Exception as e:
+            logger.warning('Could not save cache {}\n{}'.format(
+                self._cache_path, e))
+
+
+class FileStampDataCacher(FileDataCacher):
+    '''Subclass that also caches the stamp of the file'''
+
+    def __init__(self, settings, cache_policy_key, load_policy_key):
+        '''This sublcass additionaly sets filestamp function'''
+        super(FileStampDataCacher, self).__init__(settings, cache_policy_key,
+                                                  load_policy_key)
+
+        method = self.settings['CHECK_MODIFIED_METHOD']
+        if method == 'mtime':
+            self._filestamp_func = os.path.getmtime
+        else:
+            try:
+                hash_func = getattr(hashlib, method)
+                def filestamp_func(buf):
+                    return hash_func(buf).digest()
+                self._filestamp_func = filestamp_func
+            except ImportError:
+                self._filestamp_func = None
+
+    def cache_data(self, filename, data):
+        '''Cache stamp and data for the given file'''
+        stamp = self._get_file_stamp(filename)
+        super(FileStampDataCacher, self).cache_data(filename, (stamp, data))
+
+    def _get_file_stamp(self, filename):
+        '''Check if the given file has been modified
+        since the previous build.
+
+        depending on CHECK_MODIFIED_METHOD
+        a float may be returned for 'mtime',
+        a hash for a function name in the hashlib module
+        or an empty bytes string otherwise
+        '''
+        filename = os.path.join(self.path, filename)
+        try:
+            with open(filename, 'rb') as f:
+                return self._filestamp_func(f.read())
+        except Exception:
+            return b''
+
+    def get_cached_data(self, filename, default=None):
+        '''Get the cached data for the given filename
+        if the file has not been modified.
+
+        If no record exists or file has been modified, return default.
+        Modification is checked by compaing the cached
+        and current file stamp.
+        '''
+        stamp, data = super(FileStampDataCacher, self).get_cached_data(
+            filename, (None, default))
+        if stamp != self._get_file_stamp(filename):
+            return default
+        return data

From 5b4381c19cb372866f5e2343d108c3193206195d Mon Sep 17 00:00:00 2001
From: Federico Ceratto <federico.ceratto@gmail.com>
Date: Sun, 9 Mar 2014 22:04:43 +0000
Subject: [PATCH 1586/2864] Add s3cmd MIME type detection

---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index fe7a60a4..c542e588 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -97,7 +97,7 @@ ftp_upload: publish
 	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
 
 s3_upload: publish
-	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed
+        s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type
 
 cf_upload: publish
 	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .

From 4cae9ea88f552ec3166629ec1e9f004567245a06 Mon Sep 17 00:00:00 2001
From: Lonewolf <nikhilkalige@gmail.com>
Date: Mon, 31 Mar 2014 14:28:46 +0530
Subject: [PATCH 1587/2864] Added new sphinxtheme as requirement for docs
 Modified docs conf to support the theme update

---
 dev_requirements.txt |  3 +++
 docs/conf.py         | 34 +++++++++++++++++++++++++---------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index c90ac630..01fe2507 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -9,3 +9,6 @@ typogrify
 
 # To perform release
 bumpr==0.2.0
+
+# For docs theme
+sphinx_rtd_theme
diff --git a/docs/conf.py b/docs/conf.py
index 6db0f3d1..99acd1b6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -2,6 +2,8 @@
 from __future__ import unicode_literals
 import sys, os
 
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
 sys.path.append(os.path.abspath(os.pardir))
 
 from pelican import __version__
@@ -21,29 +23,43 @@ rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
 
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
 extlinks = {
     'pelican-doc':  ('http://docs.getpelican.com/%s/', '')
 }
 
 # -- Options for HTML output ---------------------------------------------------
 
-html_theme_path = ['_themes']
-html_theme = 'pelican'
-
-html_theme_options = {
-    'nosidebar': True,
-    'index_logo': 'pelican.png',
-    'github_fork': 'getpelican/pelican',
-}
+html_theme = 'default'
+if not on_rtd:
+    try:
+        import sphinx_rtd_theme
+        html_theme = 'sphinx_rtd_theme'
+        html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+    except ImportError:
+        pass
 
 html_static_path = ['_static']
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Pelicandoc'
 
+html_use_smartypants = True
+
+# If false, no module index is generated.
+html_use_modindex = False
+
+# If false, no index is generated.
+html_use_index = False
+
+# If true, links to the reST sources are added to the pages.
+html_show_sourcelink = False
+
 # -- Options for LaTeX output --------------------------------------------------
 latex_documents = [
-  ('index', 'Pelican.tex', 'Pelican Documentation',
+    ('index', 'Pelican.tex', 'Pelican Documentation',
    'Alexis Métaireau', 'manual'),
 ]
 

From e97e9b5ae5fa5494f136521afb3594cf3e65fc83 Mon Sep 17 00:00:00 2001
From: Antoine Brenner <antoine@gymglish.com>
Date: Tue, 15 Apr 2014 00:04:40 +0200
Subject: [PATCH 1588/2864] Fix unittest issue related to python2/python3
 differences

Under python 2, with non-ascii locales, u"{:%b}".format(date) can raise UnicodeDecodeError
because u"{:%b}".format(date) will call date.__format__(u"%b"), which will return a byte string
and not a unicode string.
eg:
locale.setlocale(locale.LC_ALL, 'ja_JP.utf8')
date.__format__(u"%b") == '12\xe6\x9c\x88' # True

This commit catches UnicodeDecodeError and calls date.__format__() with byte strings instead
of characters, since it to work with character strings
---
 pelican/generators.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 7c2dbbf2..1b584d3f 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -309,7 +309,20 @@ class ArticlesGenerator(Generator):
                 # format string syntax can be used for specifying the
                 # period archive dates
                 date = archive[0].date
-                save_as = save_as_fmt.format(date=date)
+                # Under python 2, with non-ascii locales, u"{:%b}".format(date) might raise UnicodeDecodeError
+                # because u"{:%b}".format(date) will call date.__format__(u"%b"), which will return a byte string
+                # and not a unicode string.
+                # eg:
+                # locale.setlocale(locale.LC_ALL, 'ja_JP.utf8')
+                # date.__format__(u"%b") == '12\xe6\x9c\x88' # True
+                try:
+                    save_as = save_as_fmt.format(date=date)
+                except UnicodeDecodeError:
+                    # Python2 only:
+                    # Let date.__format__() work with byte strings instead of characters since it fails to work with characters
+                    bytes_save_as_fmt = save_as_fmt.encode('utf8')
+                    bytes_save_as     = bytes_save_as_fmt.format(date=date)
+                    save_as           = unicode(bytes_save_as,'utf8')
                 context = self.context.copy()
 
                 if key == period_date_key['year']:

From 7277c95fb588463d035decefcf86f59d41a4e7c0 Mon Sep 17 00:00:00 2001
From: Antoine Brenner <antoine@gymglish.com>
Date: Tue, 15 Apr 2014 16:36:29 +0200
Subject: [PATCH 1589/2864] Make sure locale is what we want before/after the
 tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The locale is a global state, and it was not properly reset to
whatever it was before the unitttest possibly changed it.
This is now fixed.

Not restoring the locale led to weird issues: depending on
the order chosen by "python -m unittest discover" to run
the unit tests, some tests would apparently randomly fail
due to the locale not being what was expected.

For example, test_period_in_timeperiod_archive would
call mock('posts/1970/ 1月/index.html',...) instead of
expected mock('posts/1970/Jan/index.html',...) and fail.
---
 pelican/tests/test_contents.py   |  6 ++++++
 pelican/tests/test_generators.py | 11 +++++++++++
 pelican/tests/test_importer.py   | 11 +++++++++++
 pelican/tests/test_paginator.py  |  8 +++++++-
 pelican/tests/test_pelican.py    |  2 +-
 pelican/tests/test_settings.py   |  5 +++++
 pelican/tests/test_utils.py      |  3 +++
 7 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 27d2a897..3c0f8d75 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals, absolute_import
 import six
 from datetime import datetime
 from sys import platform
+import locale
 
 from pelican.tests.support import unittest, get_settings
 
@@ -22,6 +23,8 @@ class TestPage(unittest.TestCase):
 
     def setUp(self):
         super(TestPage, self).setUp()
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, str('C'))
         self.page_kwargs = {
             'content': TEST_CONTENT,
             'context': {
@@ -35,6 +38,9 @@ class TestPage(unittest.TestCase):
             'source_path': '/path/to/file/foo.ext'
         }
 
+    def tearDown(self):
+        locale.setlocale(locale.LC_ALL, self.old_locale)
+
     def test_use_args(self):
         # Creating a page with arguments passed to the constructor should use
         # them to initialise object's attributes.
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index a500f87a..ff487c3e 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -14,6 +14,7 @@ from pelican.generators import (Generator, ArticlesGenerator, PagesGenerator,
                                 TemplatePagesGenerator)
 from pelican.writers import Writer
 from pelican.tests.support import unittest, get_settings
+import locale
 
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_DIR = os.path.join(CUR_DIR, 'content')
@@ -21,11 +22,17 @@ CONTENT_DIR = os.path.join(CUR_DIR, 'content')
 
 class TestGenerator(unittest.TestCase):
     def setUp(self):
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, str('C'))
         self.settings = get_settings()
         self.settings['READERS'] = {'asc': None}
         self.generator = Generator(self.settings.copy(), self.settings,
                                    CUR_DIR, self.settings['THEME'], None)
 
+    def tearDown(self):
+        locale.setlocale(locale.LC_ALL, self.old_locale)
+
+
     def test_include_path(self):
         filename = os.path.join(CUR_DIR, 'content', 'article.rst')
         include_path = self.generator._include_path
@@ -373,10 +380,14 @@ class TestTemplatePagesGenerator(unittest.TestCase):
     def setUp(self):
         self.temp_content = mkdtemp(prefix='pelicantests.')
         self.temp_output = mkdtemp(prefix='pelicantests.')
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, str('C'))
+
 
     def tearDown(self):
         rmtree(self.temp_content)
         rmtree(self.temp_output)
+        locale.setlocale(locale.LC_ALL, self.old_locale)
 
     def test_generate_output(self):
 
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 8412c75b..65193bf5 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals, print_function
 import os
 import re
 
+import locale
 from pelican.tools.pelican_import import wp2fields, fields2pelican, decode_wp_content, build_header, build_markdown_header, get_attachments, download_attachments
 from pelican.tests.support import (unittest, temporary_folder, mute,
                                    skipIfNoExecutable)
@@ -30,9 +31,14 @@ except ImportError:
 class TestWordpressXmlImporter(unittest.TestCase):
 
     def setUp(self):
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, str('C'))
         self.posts = list(wp2fields(WORDPRESS_XML_SAMPLE))
         self.custposts = list(wp2fields(WORDPRESS_XML_SAMPLE, True))
 
+    def tearDown(self):
+        locale.setlocale(locale.LC_ALL, self.old_locale)
+
     def test_ignore_empty_posts(self):
         self.assertTrue(self.posts)
         for title, content, fname, date, author, categ, tags, kind, format in self.posts:
@@ -261,8 +267,13 @@ class TestBuildHeader(unittest.TestCase):
 @unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
 class TestWordpressXMLAttachements(unittest.TestCase):
     def setUp(self):
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, str('C'))
         self.attachments = get_attachments(WORDPRESS_XML_SAMPLE)
 
+    def tearDown(self):
+        locale.setlocale(locale.LC_ALL, self.old_locale)
+
     def test_recognise_attachments(self):
         self.assertTrue(self.attachments)
         self.assertTrue(len(self.attachments.keys()) == 3)
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index f454d47d..108dc791 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, absolute_import
 import six
+import locale
 
 from pelican.tests.support import unittest, get_settings
 
@@ -16,6 +17,8 @@ TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
 class TestPage(unittest.TestCase):
     def setUp(self):
         super(TestPage, self).setUp()
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, str('C'))
         self.page_kwargs = {
             'content': TEST_CONTENT,
             'context': {
@@ -29,6 +32,9 @@ class TestPage(unittest.TestCase):
             'source_path': '/path/to/file/foo.ext'
         }
 
+    def tearDown(self):
+        locale.setlocale(locale.LC_ALL, self.old_locale)
+
     def test_save_as_preservation(self):
         settings = get_settings()
         # fix up pagination rules
@@ -47,4 +53,4 @@ class TestPage(unittest.TestCase):
         object_list = [Article(**self.page_kwargs), Article(**self.page_kwargs)]
         paginator = Paginator('foobar.foo', object_list, settings)
         page = paginator.page(1)
-        self.assertEqual(page.save_as, 'foobar.foo')
\ No newline at end of file
+        self.assertEqual(page.save_as, 'foobar.foo')
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 15876095..974986cd 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -44,8 +44,8 @@ class TestPelican(LoggedTestCase):
         super(TestPelican, self).setUp()
         self.temp_path = mkdtemp(prefix='pelicantests.')
         self.temp_cache = mkdtemp(prefix='pelican_cache.')
-        self.old_locale = locale.setlocale(locale.LC_ALL)
         self.maxDiff = None
+        self.old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, str('C'))
 
     def tearDown(self):
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 7907a551..930e0fea 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -16,10 +16,15 @@ class TestSettingsConfiguration(unittest.TestCase):
     optimizations.
     """
     def setUp(self):
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, str('C'))
         self.PATH = abspath(dirname(__file__))
         default_conf = join(self.PATH, 'default_conf.py')
         self.settings = read_settings(default_conf)
 
+    def tearDown(self):
+        locale.setlocale(locale.LC_ALL, self.old_locale)
+
     def test_overwrite_existing_settings(self):
         self.assertEqual(self.settings.get('SITENAME'), "Alexis' log")
         self.assertEqual(self.settings.get('SITEURL'),
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 9047593f..02398336 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -354,9 +354,12 @@ class TestCopy(unittest.TestCase):
 
     def setUp(self):
         self.root_dir = mkdtemp(prefix='pelicantests.')
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, str('C'))
 
     def tearDown(self):
         shutil.rmtree(self.root_dir)
+        locale.setlocale(locale.LC_ALL, self.old_locale)
 
     def _create_file(self, *path):
         with open(os.path.join(self.root_dir, *path), 'w') as f:

From dd70f1b24ece9bba33fb115336a6e159c867f5b2 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 15 Apr 2014 11:13:10 -0400
Subject: [PATCH 1590/2864] Fix settings table in docs

---
 docs/settings.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d8690230..9599ee10 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -249,9 +249,9 @@ posts for the month at ``posts/2011/Aug/index.html``.
     arrive at an appropriate archive of posts, without having to specify
     a page name.
 
-====================================================    =====================================================
+======================================================  =====================================================
 Setting name (default value)                            What does it do?
-====================================================    =====================================================
+======================================================  =====================================================
 `ARTICLE_URL` (``'{slug}.html'``)                       The URL to refer to an article.
 `ARTICLE_SAVE_AS` (``'{slug}.html'``)                   The place where we will save an article.
 `ARTICLE_LANG_URL` (``'{slug}-{lang}.html'``)           The URL to refer to an article which doesn't use the
@@ -262,7 +262,7 @@ Setting name (default value)                            What does it do?
 `DRAFT_SAVE_AS` (``'drafts/{slug}.html'``)              The place where we will save an article draft.
 `DRAFT_LANG_URL` (``'drafts/{slug}-{lang}.html'``)      The URL to refer to an article draft which doesn't
                                                         use the default language.
-`DRAFT_LANG_SAVE_AS` (``'drafts/{slug}-{lang}.html'``)  The place where we will save an article draft which 
+`DRAFT_LANG_SAVE_AS` (``'drafts/{slug}-{lang}.html'``)  The place where we will save an article draft which
                                                         doesn't use the default language.
 `PAGE_URL` (``'pages/{slug}.html'``)                    The URL we will use to link to a page.
 `PAGE_SAVE_AS` (``'pages/{slug}.html'``)                The location we will save the page. This value has to be
@@ -285,7 +285,7 @@ Setting name (default value)                            What does it do?
                                                         non-alphanumerics when generating slugs. Specified
                                                         as a list of 2-tuples of ``(from, to)`` which are
                                                         applied in order.
-====================================================    =====================================================
+======================================================  =====================================================
 
 .. note::
 

From fd7cb9e2132e0b66adeff40c5d780a842f84fb6c Mon Sep 17 00:00:00 2001
From: Antoine Brenner <antoine@gymglish.com>
Date: Tue, 15 Apr 2014 22:01:20 +0200
Subject: [PATCH 1591/2864] Test to reproduce an issue that occurs with
 python3.3 under macos10 only

This test passes fine under linux
---
 pelican/tests/test_utils.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 02398336..3c12a15b 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -458,6 +458,25 @@ class TestDateFormatter(unittest.TestCase):
         locale.setlocale(locale.LC_ALL, '')
 
 
+    @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
+                         locale_available('French'),
+                         'French locale needed')
+    def test_french_strftime(self):
+        # This test tries to reproduce an issue that occured with python3.3 under macos10 only
+        locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8'))
+        date = datetime.datetime(2014,8,14)
+        # we compare the lower() dates since macos10 returns "Jeudi" for %A whereas linux reports "jeudi"
+        self.assertEqual( u'jeudi, 14 août 2014', utils.strftime(date, date_format="%A, %d %B %Y").lower() )
+        df = utils.DateFormatter()
+        self.assertEqual( u'jeudi, 14 août 2014', df(date, date_format="%A, %d %B %Y").lower() )
+        # Let us now set the global locale to C:
+        locale.setlocale(locale.LC_ALL, str('C'))
+        # DateFormatter should still work as expected since it is the whole point of DateFormatter
+        # (This is where pre-2014/4/15 code fails on macos10)
+        df_date = df(date, date_format="%A, %d %B %Y").lower()
+        self.assertEqual( u'jeudi, 14 août 2014', df_date )
+
+
     @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
                          locale_available('French'),
                          'French locale needed')

From 6703950abec63a25d412bd96d6aa419c6f449c97 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Thu, 17 Apr 2014 16:28:22 +0200
Subject: [PATCH 1592/2864] enable writing of only selected output paths

- add WRITE_SELECTED setting
- add --write-selected commandline option
---
 docs/faq.rst                  |  5 +++++
 docs/settings.rst             | 19 +++++++++++++++++++
 pelican/__init__.py           |  6 ++++++
 pelican/settings.py           |  7 +++++++
 pelican/tests/test_pelican.py | 23 +++++++++++++++++++++++
 pelican/utils.py              | 14 ++++++++++++++
 pelican/writers.py            |  9 +++++++--
 7 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index bb9377e6..bf468c51 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -224,3 +224,8 @@ every time, so a ``rsync`` based upload will transfer them even if
 their content hasn't changed. A simple solution is to make ``rsync``
 use the ``--checksum`` option, which will make it compare the file
 checksums in a much faster way than Pelican would.
+
+When only several specific output files are of interest (e.g. when
+working on some specific page or the theme templates), the
+`WRITE_SELECTED` option may help, see
+:ref:`writing_only_selected_content`.
diff --git a/docs/settings.rst b/docs/settings.rst
index 9599ee10..8d8f9a16 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -179,6 +179,10 @@ Setting name (default value)
 `CHECK_MODIFIED_METHOD` (``mtime``)                                              Controls how files are checked for modifications.
 `LOAD_CONTENT_CACHE` (``True``)                                                  If ``True``, load unmodified content from cache.
 `GZIP_CACHE` (``True``)                                                          If ``True``, use gzip to (de)compress the cache files.
+`WRITE_SELECTED` (``[]``)                                                        If this list is not empty, **only** output files with their paths
+                                                                                 in this list are written. Paths should be either relative to the current
+										 working directory of Pelican or absolute. For possible use cases see
+										 :ref:`writing_only_selected_content`.
 ===============================================================================  =====================================================================
 
 .. [#] Default is the system locale.
@@ -774,6 +778,21 @@ written, so the modification times of the ``*.html`` files always
 change.  Therefore, ``rsync`` based upload may benefit from the
 ``--checksum`` option.
 
+.. _writing_only_selected_content:
+
+Writing only selected content
+=============================
+
+When one article or page or the theme is being worked on it is often
+desirable to display selected output files as soon as possible. In
+such cases generating and writing all output is often unnecessary.
+These selected output files can be given as output paths in the
+`WRITE_SELECTED` list and **only** those files will be written. This
+list can be also specified on the command-line using the
+``--write-selected`` option which accepts a comma separated list
+of output file paths. By default the list is empty so all output is
+written.
+
 Example settings
 ================
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index b6bfe326..1ed98fc3 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -264,6 +264,10 @@ def parse_arguments():
     parser.add_argument('-f', '--full-rebuild', action='store_true',
                         dest='full_rebuild', help='Rebuild everything by not loading from cache')
 
+    parser.add_argument('-w', '--write-selected', type=str,
+                        dest='selected_paths', default=None,
+                        help='Comma separated list of selected paths to write')
+
     return parser.parse_args()
 
 
@@ -281,6 +285,8 @@ def get_config(args):
         config['DELETE_OUTPUT_DIRECTORY'] = args.delete_outputdir
     if args.full_rebuild:
         config['LOAD_CONTENT_CACHE'] = False
+    if args.selected_paths:
+        config['WRITE_SELECTED'] = args.selected_paths.split(',')
 
     # argparse returns bytes in Py2. There is no definite answer as to which
     # encoding argparse (or sys.argv) uses.
diff --git a/pelican/settings.py b/pelican/settings.py
index baf2a497..7615c25c 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -125,6 +125,7 @@ DEFAULT_CONFIG = {
     'GZIP_CACHE': True,
     'CHECK_MODIFIED_METHOD': 'mtime',
     'LOAD_CONTENT_CACHE': True,
+    'WRITE_SELECTED': [],
     }
 
 PYGMENTS_RST_OPTIONS = None
@@ -200,6 +201,12 @@ def configure_settings(settings):
             raise Exception("Could not find the theme %s"
                             % settings['THEME'])
 
+    # make paths selected for writing absolute if necessary
+    settings['WRITE_SELECTED'] = [
+        os.path.abspath(path) for path in
+        settings.get('WRITE_SELECTED', DEFAULT_CONFIG['WRITE_SELECTED'])
+        ]
+
     # standardize strings to lowercase strings
     for key in [
             'DEFAULT_LANG',
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 974986cd..294cf399 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -138,3 +138,26 @@ class TestPelican(LoggedTestCase):
 
         for file in ['a_stylesheet', 'a_template']:
             self.assertTrue(os.path.exists(os.path.join(theme_output, file)))
+
+    def test_write_only_selected(self):
+        """Test that only the selected files are written"""
+        settings = read_settings(path=None, override={
+            'PATH': INPUT_PATH,
+            'OUTPUT_PATH': self.temp_path,
+            'CACHE_DIRECTORY': self.temp_cache,
+            'WRITE_SELECTED': [
+                os.path.join(self.temp_path, 'oh-yeah.html'),
+                os.path.join(self.temp_path, 'categories.html'),
+                ],
+            'LOCALE': locale.normalize('en_US'),
+            })
+        pelican = Pelican(settings=settings)
+        logger = logging.getLogger()
+        orig_level = logger.getEffectiveLevel()
+        logger.setLevel(logging.INFO)
+        mute(True)(pelican.run)()
+        logger.setLevel(orig_level)
+        self.assertLogCountEqual(
+            count=2,
+            msg="writing .*",
+            level=logging.INFO)
diff --git a/pelican/utils.py b/pelican/utils.py
index 8c416921..cd942fd5 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -658,3 +658,17 @@ class FileStampDataCacher(FileDataCacher):
         if stamp != self._get_file_stamp(filename):
             return default
         return data
+
+
+def is_selected_for_writing(settings, path):
+    '''Check whether path is selected for writing
+    according to the WRITE_SELECTED list
+
+    If WRITE_SELECTED is an empty list (default),
+    any path is selected for writing.
+    '''
+    if settings['WRITE_SELECTED']:
+        return path in settings['WRITE_SELECTED']
+    else:
+        return True
+        
diff --git a/pelican/writers.py b/pelican/writers.py
index 19e36e39..a92feee4 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -16,7 +16,8 @@ from feedgenerator import Atom1Feed, Rss201rev2Feed
 from jinja2 import Markup
 
 from pelican.paginator import Paginator
-from pelican.utils import get_relative_path, path_to_url, set_date_tzinfo
+from pelican.utils import (get_relative_path, path_to_url, set_date_tzinfo,
+                           is_selected_for_writing)
 from pelican import signals
 
 logger = logging.getLogger(__name__)
@@ -92,6 +93,8 @@ class Writer(object):
         :param path: the path to output.
         :param feed_type: the feed type to use (atom or rss)
         """
+        if not is_selected_for_writing(self.settings, path):
+            return
         old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, str('C'))
         try:
@@ -140,7 +143,9 @@ class Writer(object):
         :param **kwargs: additional variables to pass to the templates
         """
 
-        if name is False or name == "":
+        if name is False or name == "" or\
+           not is_selected_for_writing(self.settings,\
+               os.path.join(self.output_path, name)):
             return
         elif not name:
             # other stuff, just return for now

From 6972261261a4eed164728943a037e1382d772f21 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Thu, 17 Apr 2014 22:57:26 +0200
Subject: [PATCH 1593/2864] Add python 3.4 to tox config.

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index a72aea21..5dd36c36 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 # depends on some external libraries that aren't released yet.
 
 [tox]
-envlist = py27,py33
+envlist = py27,py33,py34
 
 [testenv]
 commands =

From 676981c62110779e3d6adb04d08492f9f32f7af3 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Fri, 18 Apr 2014 06:57:59 +0200
Subject: [PATCH 1594/2864] set _cache_open func even if not loading cache,
 fixes autoreload

The _cache_open attribute of the FileDataCacher class was not set when
settings[load_policy_key] was not True, so saving later failed.
As a precaution, replaced the `if ...: return` style with a plain
if structure to prevent such readability issues and added tests.
---
 pelican/tests/test_generators.py | 48 ++++++++++++++++++++++++++++++++
 pelican/utils.py                 | 36 +++++++++++-------------
 2 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index ff487c3e..f951f0cb 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -307,6 +307,30 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_context()
         generator.readers.read_file.assert_called_count == 0
 
+    def test_full_rebuild(self):
+        """Test that all the articles are read again when not loading cache
+
+        used in --full-rebuild or autoreload mode"""
+        settings = get_settings(filenames={})
+        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['READERS'] = {'asc': None}
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        self.assertTrue(hasattr(generator, '_cache_open'))
+        orig_call_count = generator.readers.read_file.call_count
+
+        settings['LOAD_CONTENT_CACHE'] = False
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        generator.readers.read_file.assert_called_count == orig_call_count
+
 
 class TestPageGenerator(unittest.TestCase):
     # Note: Every time you want to test for a new field; Make sure the test
@@ -372,6 +396,30 @@ class TestPageGenerator(unittest.TestCase):
         generator.generate_context()
         generator.readers.read_file.assert_called_count == 0
 
+    def test_full_rebuild(self):
+        """Test that all the pages are read again when not loading cache
+
+        used in --full-rebuild or autoreload mode"""
+        settings = get_settings(filenames={})
+        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['READERS'] = {'asc': None}
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        self.assertTrue(hasattr(generator, '_cache_open'))
+        orig_call_count = generator.readers.read_file.call_count
+
+        settings['LOAD_CONTENT_CACHE'] = False
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        generator.readers.read_file.assert_called_count == orig_call_count
+
 
 class TestTemplatePagesGenerator(unittest.TestCase):
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 8c416921..e76c559f 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -564,25 +564,24 @@ class FileDataCacher(object):
         name = self.__class__.__name__
         self._cache_path = os.path.join(self.settings['CACHE_DIRECTORY'], name)
         self._cache_data_policy = self.settings[cache_policy_key]
-        if not self.settings[load_policy_key]:
-            self._cache = {}
-            return
         if self.settings['GZIP_CACHE']:
             import gzip
             self._cache_open = gzip.open
         else:
             self._cache_open = open
-        try:
-            with self._cache_open(self._cache_path, 'rb') as f:
-                self._cache = pickle.load(f)
-        except Exception as e:
+        if self.settings[load_policy_key]:
+            try:
+                with self._cache_open(self._cache_path, 'rb') as f:
+                    self._cache = pickle.load(f)
+            except Exception as e:
+                self._cache = {}
+        else:
             self._cache = {}
 
     def cache_data(self, filename, data):
         '''Cache data for given file'''
-        if not self._cache_data_policy:
-            return
-        self._cache[filename] = data
+        if self._cache_data_policy:
+            self._cache[filename] = data
 
     def get_cached_data(self, filename, default={}):
         '''Get cached data for the given file
@@ -593,15 +592,14 @@ class FileDataCacher(object):
 
     def save_cache(self):
         '''Save the updated cache'''
-        if not self._cache_data_policy:
-            return
-        try:
-            mkdir_p(self.settings['CACHE_DIRECTORY'])
-            with self._cache_open(self._cache_path, 'wb') as f:
-                pickle.dump(self._cache, f)
-        except Exception as e:
-            logger.warning('Could not save cache {}\n{}'.format(
-                self._cache_path, e))
+        if self._cache_data_policy:
+            try:
+                mkdir_p(self.settings['CACHE_DIRECTORY'])
+                with self._cache_open(self._cache_path, 'wb') as f:
+                    pickle.dump(self._cache, f)
+            except Exception as e:
+                logger.warning('Could not save cache {}\n{}'.format(
+                    self._cache_path, e))
 
 
 class FileStampDataCacher(FileDataCacher):

From 22484983e911daec0234e924574e5b2f52683f70 Mon Sep 17 00:00:00 2001
From: James Lee <james@vcnc.co.kr>
Date: Sat, 19 Apr 2014 03:37:47 +0900
Subject: [PATCH 1595/2864] Handle list metadata as list of string in
 MarkdownReader

---
 pelican/readers.py                                        | 6 ++++++
 .../tests/content/article_with_markdown_and_footnote.md   | 6 ++++++
 pelican/tests/test_readers.py                             | 8 ++++++++
 3 files changed, 20 insertions(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index 35c38220..3f8a551e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -204,12 +204,18 @@ class MarkdownReader(BaseReader):
         for name, value in meta.items():
             name = name.lower()
             if name == "summary":
+                # handle summary metadata as markdown
+                # summary metadata is special case and join all list values
                 summary_values = "\n".join(value)
                 # reset the markdown instance to clear any state
                 self._md.reset()
                 summary = self._md.convert(summary_values)
                 output[name] = self.process_metadata(name, summary)
+            elif len(value) > 1:
+                # handle list metadata as list of string
+                output[name] = self.process_metadata(name, value)
             else:
+                # otherwise, handle metadata as single string
                 output[name] = self.process_metadata(name, value[0])
         return output
 
diff --git a/pelican/tests/content/article_with_markdown_and_footnote.md b/pelican/tests/content/article_with_markdown_and_footnote.md
index 332ccea6..6fea2d6e 100644
--- a/pelican/tests/content/article_with_markdown_and_footnote.md
+++ b/pelican/tests/content/article_with_markdown_and_footnote.md
@@ -2,6 +2,12 @@ Title: Article with markdown containing footnotes
 Date: 2012-10-31
 Modified: 2012-11-01
 Summary: Summary with **inline** markup *should* be supported.
+Multiline: Line Metadata should be handle properly.
+    See syntax of Meta-Data extension of Python Markdown package:
+    If a line is indented by 4 or more spaces,
+    that line is assumed to be an additional line of the value
+    for the previous keyword.
+    A keyword may have as many lines as desired.
 
 This is some content[^1] with some footnotes[^footnote]
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index d4201a5e..fd30e9b9 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -214,6 +214,14 @@ class MdReaderTest(ReaderTest):
             'date': datetime.datetime(2012, 10, 31),
             'modified': datetime.datetime(2012, 11, 1),
             'slug': 'article-with-markdown-containing-footnotes',
+            'multiline': [
+                'Line Metadata should be handle properly.',
+                'See syntax of Meta-Data extension of Python Markdown package:',
+                'If a line is indented by 4 or more spaces,',
+                'that line is assumed to be an additional line of the value',
+                'for the previous keyword.',
+                'A keyword may have as many lines as desired.',
+            ]
         }
         self.assertEqual(content, expected_content)
         for key, value in metadata.items():

From c386e29d0c21e17895eef545e1ba0936ccc9c30a Mon Sep 17 00:00:00 2001
From: Lonewolf <nikhilkalige@gmail.com>
Date: Sun, 2 Mar 2014 19:21:22 +0530
Subject: [PATCH 1596/2864] Ability to specify PLUGIN_PATH as list PLUGIN_PATH
 added to settings table

---
 docs/plugins.rst    |  2 +-
 pelican/__init__.py |  3 ++-
 pelican/settings.py | 14 +++++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index c03b1251..9dddce70 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -24,7 +24,7 @@ If your plugins are not in an importable path, you can specify a ``PLUGIN_PATH``
 in the settings. ``PLUGIN_PATH`` can be an absolute path or a path relative to
 the settings file::
 
-    PLUGIN_PATH = "plugins"
+    PLUGIN_PATH = ["list", "of", plugins path"]
     PLUGINS = ["list", "of", "plugins"]
 
 Where to find plugins
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 1ed98fc3..077859bb 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -65,7 +65,8 @@ class Pelican(object):
         self.plugins = []
         logger.debug('Temporarily adding PLUGIN_PATH to system path')
         _sys_path = sys.path[:]
-        sys.path.insert(0, self.settings['PLUGIN_PATH'])
+        for pluginpath in self.settings['PLUGIN_PATH']:
+            sys.path.insert(0, pluginpath)
         for plugin in self.settings['PLUGINS']:
             # if it's a string, then import it
             if isinstance(plugin, six.string_types):
diff --git a/pelican/settings.py b/pelican/settings.py
index 7615c25c..7caffa61 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -112,7 +112,7 @@ DEFAULT_CONFIG = {
     'ARTICLE_PERMALINK_STRUCTURE': '',
     'TYPOGRIFY': False,
     'SUMMARY_MAX_LENGTH': 50,
-    'PLUGIN_PATH': '',
+    'PLUGIN_PATH': [],
     'PLUGINS': [],
     'PYGMENTS_RST_OPTIONS': {},
     'TEMPLATE_PAGES': {},
@@ -135,13 +135,21 @@ def read_settings(path=None, override=None):
     if path:
         local_settings = get_settings_from_file(path)
         # Make the paths relative to the settings file
-        for p in ['PATH', 'OUTPUT_PATH', 'THEME', 'PLUGIN_PATH']:
+        for p in ['PATH', 'OUTPUT_PATH', 'THEME']:
             if p in local_settings and local_settings[p] is not None \
                     and not isabs(local_settings[p]):
                 absp = os.path.abspath(os.path.normpath(os.path.join(
                     os.path.dirname(path), local_settings[p])))
-                if p not in ('THEME', 'PLUGIN_PATH') or os.path.exists(absp):
+                if p not in ('THEME') or os.path.exists(absp):
                     local_settings[p] = absp
+
+        if isinstance(local_settings['PLUGIN_PATH'], six.string_types):
+            logger.warning("Detected misconfiguration with %s setting ""(must be a list)" % 'PLUGIN_PATH')
+            local_settings['PLUGIN_PATH'] = [local_settings['PLUGIN_PATH']]
+        else:
+            if 'PLUGIN_PATH' in local_settings and local_settings['PLUGIN_PATH'] is not None:
+                local_settings['PLUGIN_PATH'] = [os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(path), pluginpath)))
+                                    if not isabs(pluginpath) else pluginpath for pluginpath in local_settings['PLUGIN_PATH']]
     else:
         local_settings = copy.deepcopy(DEFAULT_CONFIG)
 

From f0802e8114b6edf6f239ecfb9ab3cd4db8cc9dfc Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 18 Apr 2014 13:21:06 -0700
Subject: [PATCH 1597/2864] Text tweaks for "PLUGIN_PATH as list" feature

---
 docs/plugins.rst    | 10 +++++-----
 pelican/settings.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 9dddce70..16d697fa 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -20,12 +20,12 @@ Alternatively, another method is to import them and add them to the list::
     from package import myplugin
     PLUGINS = [myplugin,]
 
-If your plugins are not in an importable path, you can specify a ``PLUGIN_PATH``
-in the settings. ``PLUGIN_PATH`` can be an absolute path or a path relative to
-the settings file::
+If your plugins are not in an importable path, you can specify a list of paths
+via the ``PLUGIN_PATH`` setting. As shown in the following example, paths in
+the ``PLUGIN_PATH`` list can be absolute or relative to the settings file::
 
-    PLUGIN_PATH = ["list", "of", plugins path"]
-    PLUGINS = ["list", "of", "plugins"]
+    PLUGIN_PATH = ["plugins", "/srv/pelican/plugins"]
+    PLUGINS = ["assets", "liquid_tags", "sitemap"]
 
 Where to find plugins
 =====================
diff --git a/pelican/settings.py b/pelican/settings.py
index 7caffa61..ee337386 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -144,7 +144,7 @@ def read_settings(path=None, override=None):
                     local_settings[p] = absp
 
         if isinstance(local_settings['PLUGIN_PATH'], six.string_types):
-            logger.warning("Detected misconfiguration with %s setting ""(must be a list)" % 'PLUGIN_PATH')
+            logger.warning("Defining %s setting as string has been deprecated (should be a list)" % 'PLUGIN_PATH')
             local_settings['PLUGIN_PATH'] = [local_settings['PLUGIN_PATH']]
         else:
             if 'PLUGIN_PATH' in local_settings and local_settings['PLUGIN_PATH'] is not None:

From 260953da02bea53a68545060d354b3ed079fc988 Mon Sep 17 00:00:00 2001
From: Tastalian <tastalian@scaron.info>
Date: Mon, 10 Mar 2014 04:16:38 +0100
Subject: [PATCH 1598/2864] Make docutils requirement explicit. Fixes #1243.

Previously, the error returned by Python when docutils is not installed
was not explicit, instead saying that HTMLTranslator is not defined
(needed by FeedGenerator and such), forcing the user to go into
readers.py to figure out that this happens because "import docutils"
failed.

This pull request makes the docutils dependency explicit, so that there
is an ImportError if doctutils is not found.
---
 pelican/readers.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 35c38220..43749dce 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -6,16 +6,13 @@ import logging
 import os
 import re
 
-try:
-    import docutils
-    import docutils.core
-    import docutils.io
-    from docutils.writers.html4css1 import HTMLTranslator
+import docutils
+import docutils.core
+import docutils.io
+from docutils.writers.html4css1 import HTMLTranslator
 
-    # import the directives to have pygments support
-    from pelican import rstdirectives  # NOQA
-except ImportError:
-    docutils = False
+# import the directives to have pygments support
+from pelican import rstdirectives  # NOQA
 try:
     from markdown import Markdown
 except ImportError:

From e6be02264afc838276923933c676ef69676c320f Mon Sep 17 00:00:00 2001
From: Shauna <shaunagm@gmail.com>
Date: Sat, 5 Apr 2014 15:27:03 -0400
Subject: [PATCH 1599/2864] Add feeds for each author

---
 docs/settings.rst                             |  2 +
 pelican/generators.py                         | 12 ++++
 pelican/settings.py                           |  3 +
 .../basic/feeds/alexis-metaireau.atom.xml     | 20 ++++++
 .../basic/feeds/alexis-metaireau.rss.xml      | 20 ++++++
 .../custom/feeds/alexis-metaireau.atom.xml    | 61 +++++++++++++++++++
 .../custom/feeds/alexis-metaireau.rss.xml     | 61 +++++++++++++++++++
 7 files changed, 179 insertions(+)
 create mode 100644 pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
 create mode 100644 pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
 create mode 100644 pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
 create mode 100644 pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml

diff --git a/docs/settings.rst b/docs/settings.rst
index 8d8f9a16..0de811ec 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -474,6 +474,8 @@ Setting name (default value)                        What does it do?
                                                     language.
 `CATEGORY_FEED_ATOM` ('feeds/%s.atom.xml'[2]_)      Where to put the category Atom feeds.
 `CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the category RSS feeds.
+`AUTHOR_FEED_ATOM` ('feeds/%s.atom.xml'[2]_)        Where to put the author Atom feeds.
+`AUTHOR_FEED_RSS` ('feeds/%s.rss.xml'[2]_)          Where to put the author RSS feeds.
 `TAG_FEED_ATOM` (``None``, i.e. no tag feed)        Relative URL to output the tag Atom feed. It should
                                                     be defined using a "%s" match in the tag name.
 `TAG_FEED_RSS` (``None``, ie no RSS tag feed)       Relative URL to output the tag RSS feed
diff --git a/pelican/generators.py b/pelican/generators.py
index 1b584d3f..a2d7320a 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -239,6 +239,18 @@ class ArticlesGenerator(Generator):
                                   self.settings['CATEGORY_FEED_RSS']
                                   % cat.slug, feed_type='rss')
 
+        for auth, arts in self.authors:
+            arts.sort(key=attrgetter('date'), reverse=True)
+            if self.settings.get('AUTHOR_FEED_ATOM'):
+                writer.write_feed(arts, self.context,
+                                  self.settings['AUTHOR_FEED_ATOM']
+                                  % auth.slug)
+
+            if self.settings.get('AUTHOR_FEED_RSS'):
+                writer.write_feed(arts, self.context,
+                                  self.settings['AUTHOR_FEED_RSS']
+                                  % auth.slug, feed_type='rss')
+
         if (self.settings.get('TAG_FEED_ATOM')
                 or self.settings.get('TAG_FEED_RSS')):
             for tag, arts in self.tags.items():
diff --git a/pelican/settings.py b/pelican/settings.py
index ee337386..1d0ada0c 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -41,6 +41,8 @@ DEFAULT_CONFIG = {
     'THEME_STATIC_PATHS': ['static', ],
     'FEED_ALL_ATOM': os.path.join('feeds', 'all.atom.xml'),
     'CATEGORY_FEED_ATOM': os.path.join('feeds', '%s.atom.xml'),
+    'AUTHOR_FEED_ATOM': os.path.join('feeds', '%s.atom.xml'),
+    'AUTHOR_FEED_RSS': os.path.join('feeds', '%s.rss.xml'),
     'TRANSLATION_FEED_ATOM': os.path.join('feeds', 'all-%s.atom.xml'),
     'FEED_MAX_ITEMS': '',
     'SITEURL': '',
@@ -269,6 +271,7 @@ def configure_settings(settings):
         'FEED_ATOM', 'FEED_RSS',
         'FEED_ALL_ATOM', 'FEED_ALL_RSS',
         'CATEGORY_FEED_ATOM', 'CATEGORY_FEED_RSS',
+        'AUTHOR_FEED_ATOM', 'AUTHOR_FEED_RSS',
         'TAG_FEED_ATOM', 'TAG_FEED_RSS',
         'TRANSLATION_FEED_ATOM', 'TRANSLATION_FEED_RSS',
     ]
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
new file mode 100644
index 00000000..d87023b5
--- /dev/null
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
new file mode 100644
index 00000000..09409217
--- /dev/null
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>A Pelican Blog</title><link>/</link><description></description><atom:link href="/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 -0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 -0000</pubDate><guid>tag:,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 -0000</pubDate><guid>tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
new file mode 100644
index 00000000..cb746377
--- /dev/null
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
new file mode 100644
index 00000000..2c4b1160
--- /dev/null
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file

From c1324b0206a70b8179689d2305c8de678d5e7b1d Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Sun, 20 Apr 2014 14:34:52 +0200
Subject: [PATCH 1600/2864] split content caching into two layers

This is a reworked and improved version of content caching.
Notable changes:
- by default only raw content and metadata returned by readers are
  cached which should prevent conficts with plugins, the speed benefit
  of content objects caching is not very big with a simple setup
- renamed --full-rebuild to --ignore-cache
- added more elaborate logging to caching code
---
 README.rst                       |  1 +
 docs/index.rst                   |  1 +
 docs/settings.rst                | 41 +++++++++++++------
 pelican/__init__.py              | 24 +++++------
 pelican/generators.py            | 46 ++++++++++++++++-----
 pelican/readers.py               | 20 +++++++--
 pelican/settings.py              | 10 +++++
 pelican/tests/test_generators.py | 67 ++++++++++++++++++++++++++-----
 pelican/utils.py                 | 69 ++++++++++++++++++--------------
 9 files changed, 199 insertions(+), 80 deletions(-)

diff --git a/README.rst b/README.rst
index 20c3f217..bf506c5f 100644
--- a/README.rst
+++ b/README.rst
@@ -29,6 +29,7 @@ Pelican currently supports:
 * Code syntax highlighting
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
+* Fast rebuild times thanks to content caching and selective output writing.
 
 Have a look at the `Pelican documentation`_ for more information.
 
diff --git a/docs/index.rst b/docs/index.rst
index 43193e9e..c2deb6de 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -33,6 +33,7 @@ Pelican |version| currently supports:
 * Code syntax highlighting
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
+* Fast rebuild times thanks to content caching and selective output writing.
 
 Why the name "Pelican"?
 -----------------------
diff --git a/docs/settings.rst b/docs/settings.rst
index 0de811ec..1b4bae94 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -161,6 +161,7 @@ Setting name (default value)
                                                                                  <http://www.methods.co.nz/asciidoc/manpage.html>`_
 `WITH_FUTURE_DATES` (``True``)                                                   If disabled, content with dates in the future will get a
                                                                                  default status of ``draft``.
+										 see :ref:`reading_only_modified_content` for details.
 `INTRASITE_LINK_REGEX` (``'[{|](?P<what>.*?)[|}]'``)                             Regular expression that is used to parse internal links.
                                                                                  Default syntax of links to internal files, tags, etc., is
                                                                                  to enclose the identifier, say ``filename``, in ``{}`` or ``||``.
@@ -173,12 +174,16 @@ Setting name (default value)
 `SLUGIFY_SOURCE` (``'input'``)                                                   Specifies where you want the slug to be automatically generated
                                                                                  from. Can be set to 'title' to use the 'Title:' metadata tag or
                                                                                  'basename' to use the articles basename when creating the slug.
-`CACHE_CONTENT` (``True``)                                                       If ``True``, save read content in a cache file. 
+`CACHE_CONTENT` (``True``)                                                       If ``True``, save content in a cache file.
                                                                                  See :ref:`reading_only_modified_content` for details about caching.
+`CONTENT_CACHING_LAYER` (``'reader'``)                                           If set to ``'reader'``, save only the raw content and metadata returned
+                                                                                 by readers, if set to ``'generator'``, save processed content objects.
 `CACHE_DIRECTORY` (``cache``)                                                    Directory in which to store cache files.
+`GZIP_CACHE` (``True``)                                                          If ``True``, use gzip to (de)compress the cache files.
 `CHECK_MODIFIED_METHOD` (``mtime``)                                              Controls how files are checked for modifications.
 `LOAD_CONTENT_CACHE` (``True``)                                                  If ``True``, load unmodified content from cache.
-`GZIP_CACHE` (``True``)                                                          If ``True``, use gzip to (de)compress the cache files.
+`AUTORELOAD_IGNORE_CACHE` (``False``)                                            If ``True``, do not load content cache in autoreload mode
+                                                                                 when the settings file changes.
 `WRITE_SELECTED` (``[]``)                                                        If this list is not empty, **only** output files with their paths
                                                                                  in this list are written. Paths should be either relative to the current
 										 working directory of Pelican or absolute. For possible use cases see
@@ -749,13 +754,21 @@ When Pelican is about to read some content source file:
       file cannot be found in the cache file, the content is read as
       usual.
 
-3. If the file is considered unchanged, the content object saved in a
+3. If the file is considered unchanged, the content data saved in a
    previous build corresponding to the file is loaded from the cache
    and the file is not read.
 4. If the file is considered changed, the file is read and the new
-   modification information and the content object are saved to the
+   modification information and the content data are saved to the
    cache if `CACHE_CONTENT` is ``True``.
 
+Depending on `CONTENT_CACHING_LAYER` either the raw content and
+metadata returned by a reader are cached if set to ``'reader'``, or
+the processed content object is cached if set to ``'generator'``.
+Caching the processed content object may conflict with plugins (as
+some reading related signals may be skipped) or e.g. the
+`WITH_FUTURE_DATES` functionality (as the ``draft`` status of the
+cached content objects would not change automatically over time).
+
 Modification time based checking is faster than comparing file hashes,
 but is not as reliable, because mtime information can be lost when
 e.g. copying the content sources using the ``cp`` or ``rsync``
@@ -764,16 +777,18 @@ commands without the mtime preservation mode (invoked e.g. by
 
 The cache files are Python pickles, so they may not be readable by
 different versions of Python as the pickle format often changes. If
-such an error is encountered, the cache files have to be rebuilt
-using the pelican command-line option ``--full-rebuild``.
-The cache files also have to be rebuilt when changing the
-`GZIP_CACHE` setting for cache file reading to work.
+such an error is encountered, the cache files have to be rebuilt by
+running pelican after removing them or by using the pelican
+command-line option ``--ignore-cache``.  The cache files also have to
+be rebuilt when changing the `GZIP_CACHE` setting for cache file
+reading to work.
 
-The ``--full-rebuild`` command-line option is also useful when the
-whole site needs to be regenerated due to e.g. modifications to the
-settings file or theme files. When pelican runs in autorealod mode,
-modification of the settings file or theme will trigger a full rebuild
-automatically.
+The ``--ignore-cache`` command-line option is also useful when the
+whole cache needs to be regenerated due to e.g. modifications to the
+settings file which should change the cached content or just for
+debugging purposes. When pelican runs in autoreload mode, modification
+of the settings file will make it ignore the cache automatically if
+`AUTORELOAD_IGNORE_CACHE` is ``True``.
 
 Note that even when using cached content, all output is always
 written, so the modification times of the ``*.html`` files always
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 077859bb..8cae468c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -262,8 +262,9 @@ def parse_arguments():
                         help='Relaunch pelican each time a modification occurs'
                         ' on the content files.')
 
-    parser.add_argument('-f', '--full-rebuild', action='store_true',
-                        dest='full_rebuild', help='Rebuild everything by not loading from cache')
+    parser.add_argument('-c', '--ignore-cache', action='store_true',
+                        dest='ignore_cache', help='Ignore content cache '
+                        'from previous runs by not loading cache files.')
 
     parser.add_argument('-w', '--write-selected', type=str,
                         dest='selected_paths', default=None,
@@ -284,7 +285,7 @@ def get_config(args):
         config['THEME'] = abstheme if os.path.exists(abstheme) else args.theme
     if args.delete_outputdir is not None:
         config['DELETE_OUTPUT_DIRECTORY'] = args.delete_outputdir
-    if args.full_rebuild:
+    if args.ignore_cache:
         config['LOAD_CONTENT_CACHE'] = False
     if args.selected_paths:
         config['WRITE_SELECTED'] = args.selected_paths.split(',')
@@ -340,7 +341,10 @@ def main():
             print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
                   ' `settings` for changes. ---')
 
-            first_run = True              # load cache on first run
+            def _ignore_cache(pelican_obj):
+                if pelican_obj.settings['AUTORELOAD_IGNORE_CACHE']:
+                    pelican_obj.settings['LOAD_CONTENT_CACHE'] = False
+
             while True:
                 try:
                     # Check source dir for changed files ending with the given
@@ -353,10 +357,9 @@ def main():
 
                     if modified['settings']:
                         pelican, settings = get_instance(args)
-                        if not first_run:
-                            original_load_cache = settings['LOAD_CONTENT_CACHE']
-                            # invalidate cache
-                            pelican.settings['LOAD_CONTENT_CACHE'] = False
+                        original_load_cache = settings['LOAD_CONTENT_CACHE']
+                        print(pelican.settings['AUTORELOAD_IGNORE_CACHE'])
+                        _ignore_cache(pelican)
 
                     if any(modified.values()):
                         print('\n-> Modified: {}. re-generating...'.format(
@@ -368,13 +371,8 @@ def main():
                         if modified['theme'] is None:
                             logger.warning('Empty theme folder. Using `basic` '
                                            'theme.')
-                        elif modified['theme']:
-                            # theme modified, needs full rebuild -> no cache
-                            if not first_run:   # but not on first run
-                                pelican.settings['LOAD_CONTENT_CACHE'] = False
 
                         pelican.run()
-                        first_run = False
                         # restore original caching policy
                         pelican.settings['LOAD_CONTENT_CACHE'] = original_load_cache
 
diff --git a/pelican/generators.py b/pelican/generators.py
index a2d7320a..3cc84fa8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -28,10 +28,11 @@ from pelican import signals
 logger = logging.getLogger(__name__)
 
 
-class Generator(FileStampDataCacher):
+class Generator(object):
     """Baseclass generator"""
 
-    def __init__(self, context, settings, path, theme, output_path, **kwargs):
+    def __init__(self, context, settings, path, theme, output_path,
+                 readers_cache_name='', **kwargs):
         self.context = context
         self.settings = settings
         self.path = path
@@ -41,7 +42,7 @@ class Generator(FileStampDataCacher):
         for arg, value in kwargs.items():
             setattr(self, arg, value)
 
-        self.readers = Readers(self.settings)
+        self.readers = Readers(self.settings, readers_cache_name)
 
         # templates cache
         self._templates = {}
@@ -74,10 +75,6 @@ class Generator(FileStampDataCacher):
         custom_filters = self.settings['JINJA_FILTERS']
         self.env.filters.update(custom_filters)
 
-        # set up caching
-        super(Generator, self).__init__(settings, 'CACHE_CONTENT',
-                                        'LOAD_CONTENT_CACHE')
-
         signals.generator_init.send(self)
 
     def get_template(self, name):
@@ -153,6 +150,35 @@ class Generator(FileStampDataCacher):
             self.context[item] = value
 
 
+class CachingGenerator(Generator, FileStampDataCacher):
+    '''Subclass of Generator and FileStampDataCacher classes
+
+    enables content caching, either at the generator or reader level
+    '''
+
+    def __init__(self, *args, **kwargs):
+        '''Initialize the generator, then set up caching
+
+        note the multiple inheritance structure
+        '''
+        cls_name = self.__class__.__name__
+        Generator.__init__(self, *args,
+                           readers_cache_name=(cls_name + '-Readers'),
+                           **kwargs)
+
+        cache_this_level = self.settings['CONTENT_CACHING_LAYER'] == 'generator'
+        caching_policy = cache_this_level and self.settings['CACHE_CONTENT']
+        load_policy = cache_this_level and self.settings['LOAD_CONTENT_CACHE']
+        FileStampDataCacher.__init__(self, self.settings, cls_name,
+                                     caching_policy, load_policy
+                                     )
+
+    def _get_file_stamp(self, filename):
+        '''Get filestamp for path relative to generator.path'''
+        filename = os.path.join(self.path, filename)
+        return super(Generator, self)._get_file_stamp(filename)
+
+
 class _FileLoader(BaseLoader):
 
     def __init__(self, path, basedir):
@@ -183,7 +209,7 @@ class TemplatePagesGenerator(Generator):
                 del self.env.loader.loaders[0]
 
 
-class ArticlesGenerator(Generator):
+class ArticlesGenerator(CachingGenerator):
     """Generate blog articles"""
 
     def __init__(self, *args, **kwargs):
@@ -537,6 +563,7 @@ class ArticlesGenerator(Generator):
         self._update_context(('articles', 'dates', 'tags', 'categories',
                               'tag_cloud', 'authors', 'related_posts'))
         self.save_cache()
+        self.readers.save_cache()
         signals.article_generator_finalized.send(self)
 
     def generate_output(self, writer):
@@ -545,7 +572,7 @@ class ArticlesGenerator(Generator):
         signals.article_writer_finalized.send(self, writer=writer)
 
 
-class PagesGenerator(Generator):
+class PagesGenerator(CachingGenerator):
     """Generate pages"""
 
     def __init__(self, *args, **kwargs):
@@ -599,6 +626,7 @@ class PagesGenerator(Generator):
         self.context['PAGES'] = self.pages
 
         self.save_cache()
+        self.readers.save_cache()
         signals.page_generator_finalized.send(self)
 
     def generate_output(self, writer):
diff --git a/pelican/readers.py b/pelican/readers.py
index fa9d92ae..c63b8981 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -33,7 +33,7 @@ except ImportError:
 
 from pelican import signals
 from pelican.contents import Page, Category, Tag, Author
-from pelican.utils import get_date, pelican_open
+from pelican.utils import get_date, pelican_open, FileStampDataCacher
 
 
 METADATA_PROCESSORS = {
@@ -382,7 +382,7 @@ class AsciiDocReader(BaseReader):
         return content, metadata
 
 
-class Readers(object):
+class Readers(FileStampDataCacher):
     """Interface for all readers.
 
     This class contains a mapping of file extensions / Reader classes, to know
@@ -392,7 +392,7 @@ class Readers(object):
 
     """
 
-    def __init__(self, settings=None):
+    def __init__(self, settings=None, cache_name=''):
         self.settings = settings or {}
         self.readers = {}
         self.reader_classes = {}
@@ -417,6 +417,15 @@ class Readers(object):
 
             self.readers[fmt] = reader_class(self.settings)
 
+        # set up caching
+        cache_this_level = (cache_name != '' and
+                            self.settings['CONTENT_CACHING_LAYER'] == 'reader')
+        caching_policy = cache_this_level and self.settings['CACHE_CONTENT']
+        load_policy = cache_this_level and self.settings['LOAD_CONTENT_CACHE']
+        super(Readers, self).__init__(settings, cache_name,
+                                      caching_policy, load_policy,
+                                      )
+
     @property
     def extensions(self):
         return self.readers.keys()
@@ -455,7 +464,10 @@ class Readers(object):
             source_path=source_path, settings=self.settings,
             process=reader.process_metadata))
 
-        content, reader_metadata = reader.read(path)
+        content, reader_metadata = self.get_cached_data(path, (None, None))
+        if content is None:
+            content, reader_metadata = reader.read(path)
+            self.cache_data(path, (content, reader_metadata))
         metadata.update(reader_metadata)
 
         if content:
diff --git a/pelican/settings.py b/pelican/settings.py
index 1d0ada0c..abf16b32 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -123,10 +123,12 @@ DEFAULT_CONFIG = {
     'INTRASITE_LINK_REGEX': '[{|](?P<what>.*?)[|}]',
     'SLUGIFY_SOURCE': 'title',
     'CACHE_CONTENT': True,
+    'CONTENT_CACHING_LAYER': 'reader',
     'CACHE_DIRECTORY': 'cache',
     'GZIP_CACHE': True,
     'CHECK_MODIFIED_METHOD': 'mtime',
     'LOAD_CONTENT_CACHE': True,
+    'AUTORELOAD_IGNORE_CACHE': False,
     'WRITE_SELECTED': [],
     }
 
@@ -266,6 +268,14 @@ def configure_settings(settings):
         if not 'FEED_DOMAIN' in settings:
             settings['FEED_DOMAIN'] = settings['SITEURL']
 
+    # check content caching layer and warn of incompatibilities
+    if (settings.get('CACHE_CONTENT', False) and
+        settings.get('CONTENT_CACHING_LAYER', '') == 'generator' and
+        settings.get('WITH_FUTURE_DATES', DEFAULT_CONFIG['WITH_FUTURE_DATES'])):
+        logger.warning('WITH_FUTURE_DATES conflicts with '
+                        "CONTENT_CACHING_LAYER set to 'generator', "
+                        "use 'reader' layer instead")
+
     # Warn if feeds are generated with both SITEURL & FEED_DOMAIN undefined
     feed_keys = [
         'FEED_ATOM', 'FEED_RSS',
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index f951f0cb..9463047e 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -288,10 +288,11 @@ class TestArticlesGenerator(unittest.TestCase):
         authors_expected = ['alexis-metaireau', 'first-author', 'second-author']
         self.assertEqual(sorted(authors), sorted(authors_expected))
 
-    def test_content_caching(self):
-        """Test that the articles are read only once when caching"""
+    def test_article_object_caching(self):
+        """Test Article objects caching at the generator level"""
         settings = get_settings(filenames={})
         settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CONTENT_CACHING_LAYER'] = 'generator'
         settings['READERS'] = {'asc': None}
 
         generator = ArticlesGenerator(
@@ -307,10 +308,32 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_context()
         generator.readers.read_file.assert_called_count == 0
 
-    def test_full_rebuild(self):
+    def test_reader_content_caching(self):
+        """Test raw content caching at the reader level"""
+        settings = get_settings(filenames={})
+        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['READERS'] = {'asc': None}
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        self.assertTrue(hasattr(generator.readers, '_cache'))
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        readers = generator.readers.readers
+        for reader in readers.values():
+            reader.read = MagicMock()
+        generator.generate_context()
+        for reader in readers.values():
+            reader.read.assert_called_count == 0
+
+    def test_ignore_cache(self):
         """Test that all the articles are read again when not loading cache
 
-        used in --full-rebuild or autoreload mode"""
+        used in --ignore-cache or autoreload mode"""
         settings = get_settings(filenames={})
         settings['CACHE_DIRECTORY'] = self.temp_cache
         settings['READERS'] = {'asc': None}
@@ -376,30 +399,52 @@ class TestPageGenerator(unittest.TestCase):
         self.assertEqual(sorted(pages_expected), sorted(pages))
         self.assertEqual(sorted(hidden_pages_expected), sorted(hidden_pages))
 
-    def test_content_caching(self):
-        """Test that the pages are read only once when caching"""
+    def test_page_object_caching(self):
+        """Test Page objects caching at the generator level"""
         settings = get_settings(filenames={})
-        settings['CACHE_DIRECTORY'] = 'cache_dir'   #TODO
         settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CONTENT_CACHING_LAYER'] = 'generator'
         settings['READERS'] = {'asc': None}
 
         generator = PagesGenerator(
             context=settings.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         self.assertTrue(hasattr(generator, '_cache'))
 
         generator = PagesGenerator(
             context=settings.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.readers.read_file = MagicMock()
         generator.generate_context()
         generator.readers.read_file.assert_called_count == 0
 
-    def test_full_rebuild(self):
+    def test_reader_content_caching(self):
+        """Test raw content caching at the reader level"""
+        settings = get_settings(filenames={})
+        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['READERS'] = {'asc': None}
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        self.assertTrue(hasattr(generator.readers, '_cache'))
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        readers = generator.readers.readers
+        for reader in readers.values():
+            reader.read = MagicMock()
+        generator.generate_context()
+        for reader in readers.values():
+            reader.read.assert_called_count == 0
+
+    def test_ignore_cache(self):
         """Test that all the pages are read again when not loading cache
 
-        used in --full-rebuild or autoreload mode"""
+        used in --ignore_cache or autoreload mode"""
         settings = get_settings(filenames={})
         settings['CACHE_DIRECTORY'] = self.temp_cache
         settings['READERS'] = {'asc': None}
diff --git a/pelican/utils.py b/pelican/utils.py
index cda3108e..7b58a231 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -552,28 +552,30 @@ def split_all(path):
 class FileDataCacher(object):
     '''Class that can cache data contained in files'''
 
-    def __init__(self, settings, cache_policy_key, load_policy_key):
-        '''Load the specified cache within CACHE_DIRECTORY
+    def __init__(self, settings, cache_name, caching_policy, load_policy):
+        '''Load the specified cache within CACHE_DIRECTORY in settings
 
-        only if load_policy_key in setttings is True,
-        May use gzip if GZIP_CACHE.
-        Sets caching policy according to *cache_policy_key*
-        in *settings*
+        only if *load_policy* is True,
+        May use gzip if GZIP_CACHE ins settings is True.
+        Sets caching policy according to *caching_policy*.
         '''
         self.settings = settings
-        name = self.__class__.__name__
-        self._cache_path = os.path.join(self.settings['CACHE_DIRECTORY'], name)
-        self._cache_data_policy = self.settings[cache_policy_key]
+        self._cache_path = os.path.join(self.settings['CACHE_DIRECTORY'],
+                                        cache_name)
+        self._cache_data_policy = caching_policy
         if self.settings['GZIP_CACHE']:
             import gzip
             self._cache_open = gzip.open
         else:
             self._cache_open = open
-        if self.settings[load_policy_key]:
+        if load_policy:
             try:
-                with self._cache_open(self._cache_path, 'rb') as f:
-                    self._cache = pickle.load(f)
-            except Exception as e:
+                with self._cache_open(self._cache_path, 'rb') as fhandle:
+                    self._cache = pickle.load(fhandle)
+            except (IOError, OSError, pickle.UnpicklingError) as err:
+                logger.warning(('Cannot load cache {}, '
+                    'proceeding with empty cache.\n{}').format(
+                        self._cache_path, err))
                 self._cache = {}
         else:
             self._cache = {}
@@ -583,7 +585,7 @@ class FileDataCacher(object):
         if self._cache_data_policy:
             self._cache[filename] = data
 
-    def get_cached_data(self, filename, default={}):
+    def get_cached_data(self, filename, default=None):
         '''Get cached data for the given file
 
         if no data is cached, return the default object
@@ -595,20 +597,23 @@ class FileDataCacher(object):
         if self._cache_data_policy:
             try:
                 mkdir_p(self.settings['CACHE_DIRECTORY'])
-                with self._cache_open(self._cache_path, 'wb') as f:
-                    pickle.dump(self._cache, f)
-            except Exception as e:
+                with self._cache_open(self._cache_path, 'wb') as fhandle:
+                    pickle.dump(self._cache, fhandle)
+            except (IOError, OSError, pickle.PicklingError) as err:
                 logger.warning('Could not save cache {}\n{}'.format(
-                    self._cache_path, e))
+                    self._cache_path, err))
 
 
 class FileStampDataCacher(FileDataCacher):
     '''Subclass that also caches the stamp of the file'''
 
-    def __init__(self, settings, cache_policy_key, load_policy_key):
-        '''This sublcass additionaly sets filestamp function'''
-        super(FileStampDataCacher, self).__init__(settings, cache_policy_key,
-                                                  load_policy_key)
+    def __init__(self, settings, cache_name, caching_policy, load_policy):
+        '''This sublcass additionaly sets filestamp function
+        and base path for filestamping operations
+        '''
+        super(FileStampDataCacher, self).__init__(settings, cache_name,
+                                                  caching_policy,
+                                                  load_policy)
 
         method = self.settings['CHECK_MODIFIED_METHOD']
         if method == 'mtime':
@@ -616,10 +621,14 @@ class FileStampDataCacher(FileDataCacher):
         else:
             try:
                 hash_func = getattr(hashlib, method)
-                def filestamp_func(buf):
-                    return hash_func(buf).digest()
+                def filestamp_func(filename):
+                    '''return hash of file contents'''
+                    with open(filename, 'rb') as fhandle:
+                        return hash_func(fhandle.read()).digest()
                 self._filestamp_func = filestamp_func
-            except ImportError:
+            except AttributeError as err:
+                logger.warning('Could not get hashing function\n{}'.format(
+                    err))
                 self._filestamp_func = None
 
     def cache_data(self, filename, data):
@@ -636,11 +645,11 @@ class FileStampDataCacher(FileDataCacher):
         a hash for a function name in the hashlib module
         or an empty bytes string otherwise
         '''
-        filename = os.path.join(self.path, filename)
         try:
-            with open(filename, 'rb') as f:
-                return self._filestamp_func(f.read())
-        except Exception:
+            return self._filestamp_func(filename)
+        except (IOError, OSError, TypeError) as err:
+            logger.warning('Cannot get modification stamp for {}\n{}'.format(
+                filename, err))
             return b''
 
     def get_cached_data(self, filename, default=None):
@@ -648,7 +657,7 @@ class FileStampDataCacher(FileDataCacher):
         if the file has not been modified.
 
         If no record exists or file has been modified, return default.
-        Modification is checked by compaing the cached
+        Modification is checked by comparing the cached
         and current file stamp.
         '''
         stamp, data = super(FileStampDataCacher, self).get_cached_data(

From 30e2cac7539630ba7ad69c548f3551e5a2390721 Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard-scheirle@gmx.de>
Date: Thu, 24 Apr 2014 15:30:34 +0200
Subject: [PATCH 1601/2864] send the static_generator_{init, finalized}
 signals.

Note: The two signals were already present but were never sent.
---
 docs/plugins.rst      | 8 ++++++++
 pelican/generators.py | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index c03b1251..4e0bdb26 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -87,8 +87,16 @@ get_generators                      generators                     invoked in Pe
                                                                    can return a Generator, or several
                                                                    generator in a tuple or in a list.
 page_generator_context              page_generator, metadata
+page_generator_preread              page_generator                 invoked before a page is read in PageGenerator.generate_context;
+                                                                   use if code needs to do something before every page is parsed.
 page_generator_init                 page_generator                 invoked in the PagesGenerator.__init__
 page_generator_finalized            page_generator                 invoked at the end of PagesGenerator.generate_context
+static_generator_context            static_generator, metadata
+static_generator_preread            static_generator               invoked before a static file is read in StaticGenerator.generate_context;
+                                                                   use if code needs to do something before every static file is added to the
+                                                                   staticfiles list.
+static_generator_init               static_generator               invoked in the StaticGenerator.__init__
+static_generator_finalized          static_generator               invoked at the end of StaticGenerator.generate_context
 content_object_init                 content_object                 invoked at the end of Content.__init__ (see note below)
 content_written                     path, context                  invoked each time a content file is written.
 =================================   ============================   ===========================================================================
diff --git a/pelican/generators.py b/pelican/generators.py
index bfdac1a5..01f7db8f 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -576,6 +576,10 @@ class StaticGenerator(Generator):
     """copy static paths (what you want to copy, like images, medias etc.
     to output"""
 
+    def __init__(self, *args, **kwargs):
+        super(StaticGenerator, self).__init__(*args, **kwargs)
+        signals.static_generator_init.send(self)
+
     def _copy_paths(self, paths, source, destination, output_path,
                     final_path=None):
         """Copy all the paths from source to destination"""
@@ -604,6 +608,7 @@ class StaticGenerator(Generator):
                 self.staticfiles.append(static)
                 self.add_source_path(static)
         self._update_context(('staticfiles',))
+        signals.static_generator_finalized.send(self)
 
     def generate_output(self, writer):
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,

From ad6dc3f8ba6c63820869cdf7fa34110ad0fe0e5d Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Fri, 25 Apr 2014 19:44:26 +0200
Subject: [PATCH 1602/2864] use correct CachingGenerator class in super() call

This was a leftover from code moving in c1324b0.
Detected by pylint.
---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 3cc84fa8..45447183 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -176,7 +176,7 @@ class CachingGenerator(Generator, FileStampDataCacher):
     def _get_file_stamp(self, filename):
         '''Get filestamp for path relative to generator.path'''
         filename = os.path.join(self.path, filename)
-        return super(Generator, self)._get_file_stamp(filename)
+        return super(CachingGenerator, self)._get_file_stamp(filename)
 
 
 class _FileLoader(BaseLoader):

From 5a3daae72f78334e9994d527fc09452de75b3474 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Sun, 27 Apr 2014 14:25:08 +0200
Subject: [PATCH 1603/2864] add get_writer signal and unify with get_generators

Fix outdated docs of get_generators to unify.
---
 docs/plugins.rst    | 10 ++++++----
 pelican/__init__.py | 15 ++++++++++++++-
 pelican/signals.py  |  1 +
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 7fe497e6..717019a8 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -83,9 +83,11 @@ article_generator_finalized         article_generator              invoked at th
 article_generator_write_article     article_generator, content     invoked before writing each article, the article is passed as content
 article_writer_finalized            article_generator, writer      invoked after all articles and related pages have been written, but before
                                                                    the article generator is closed.
-get_generators                      generators                     invoked in Pelican.get_generator_classes,
+get_generators                      pelican object                 invoked in Pelican.get_generator_classes,
                                                                    can return a Generator, or several
-                                                                   generator in a tuple or in a list.
+                                                                   generators in a tuple or in a list.
+get_writer                          pelican object                 invoked in Pelican.get_writer,
+                                                                   can return a custom Writer.
 page_generator_context              page_generator, metadata
 page_generator_preread              page_generator                 invoked before a page is read in PageGenerator.generate_context;
                                                                    use if code needs to do something before every page is parsed.
@@ -200,8 +202,8 @@ Adding a new generator is also really easy. You might want to have a look at
 
 ::
 
-    def get_generators(generators):
+    def get_generators(pelican_object):
         # define a new generator here if you need to
-        return generators
+        return MyGenerator
 
     signals.get_generators.connect(get_generators)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 8cae468c..5208c317 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -209,7 +209,20 @@ class Pelican(object):
         return generators
 
     def get_writer(self):
-        return Writer(self.output_path, settings=self.settings)
+        writers = [ w for w in signals.get_writer.send(self)
+                    if isinstance(w, type) ]
+        writers_found = len(writers)
+        if writers_found == 0:
+            return Writer(self.output_path, settings=self.settings)
+        else:
+            _, writer = writers[0]
+            if writers_found == 1:
+                logger.debug('Found writer: {}'.format(writer))
+            else:
+                logger.warning(
+                    '{} writers found, using only first one: {}'.format(
+                    writers_found, writer))
+            return writer(self.output_path, settings=self.settings)
 
 
 def parse_arguments():
diff --git a/pelican/signals.py b/pelican/signals.py
index 9eb907dc..e06b89ac 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -6,6 +6,7 @@ from blinker import signal
 
 initialized = signal('pelican_initialized')
 get_generators = signal('get_generators')
+get_writer = signal('get_writer')
 finalized = signal('pelican_finalized')
 
 # Reader-level signals

From 00a5a0f0dfed1e9f65101e81a72ca37c12b6faa8 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Mon, 28 Apr 2014 20:37:49 +0200
Subject: [PATCH 1604/2864] Fix #1311 wide tables in RTD theme, remove old
 theme files

This works by adding a CSS overrides file to the Sphinx app stylesheets.
---
 docs/_static/pelican.gif                  | Bin 16941 -> 0 bytes
 docs/_static/pelican.png                  | Bin 6441 -> 0 bytes
 docs/_static/theme_overrides.css          |  12 +
 docs/_themes/.gitignore                   |   3 -
 docs/_themes/pelican/layout.html          |  22 --
 docs/_themes/pelican/static/pelican.css_t | 254 ----------------------
 docs/_themes/pelican/theme.conf           |  10 -
 docs/conf.py                              |   6 +
 8 files changed, 18 insertions(+), 289 deletions(-)
 delete mode 100644 docs/_static/pelican.gif
 delete mode 100644 docs/_static/pelican.png
 create mode 100644 docs/_static/theme_overrides.css
 delete mode 100644 docs/_themes/.gitignore
 delete mode 100644 docs/_themes/pelican/layout.html
 delete mode 100644 docs/_themes/pelican/static/pelican.css_t
 delete mode 100644 docs/_themes/pelican/theme.conf

diff --git a/docs/_static/pelican.gif b/docs/_static/pelican.gif
deleted file mode 100644
index d9208590b7cce4c7f9284dfc4686b940eb1912bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16941
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%0DPy!XW
zK`zk!N_@kizdbUkd`j%YEx<xKaJ}DWB+(zf;x9hqH@@RPKIBKf<WD~3SH9(6KIUh>
a=5G={=Xbv6e?I7kzUYrW>Hkqc0028+la#Cg

diff --git a/docs/_static/pelican.png b/docs/_static/pelican.png
deleted file mode 100644
index c2d61c88997a3b853a1afec2aa2e2ce84102fbf8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6441
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

diff --git a/docs/_static/theme_overrides.css b/docs/_static/theme_overrides.css
new file mode 100644
index 00000000..d4b31645
--- /dev/null
+++ b/docs/_static/theme_overrides.css
@@ -0,0 +1,12 @@
+
+/* override table width restrictions */
+.wy-table-responsive table td, .wy-table-responsive table th {
+    white-space: normal;
+}
+
+.wy-table-responsive {
+    margin-bottom: 24px;
+    max-width: 100%;
+    overflow: visible;
+}
+        
diff --git a/docs/_themes/.gitignore b/docs/_themes/.gitignore
deleted file mode 100644
index 66b6e4c2..00000000
--- a/docs/_themes/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.pyc
-*.pyo
-.DS_Store
diff --git a/docs/_themes/pelican/layout.html b/docs/_themes/pelican/layout.html
deleted file mode 100644
index aa1716aa..00000000
--- a/docs/_themes/pelican/layout.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "basic/layout.html" %}
-{% block header %}
-  {{ super() }}
-  {% if pagename == 'index' %}
-  <div class=indexwrapper>
-  {% endif %}
-{% endblock %}
-{% block footer %}
-  {% if pagename == 'index' %}
-  </div>
-  {% endif %}
-{% endblock %}
-{# do not display relbars #}
-{% block relbar1 %}{% endblock %}
-{% block relbar2 %}
-  {% if theme_github_fork %}
-    <a href="http://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
-    src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
-  {% endif %}
-{% endblock %}
-{% block sidebar1 %}{% endblock %}
-{% block sidebar2 %}{% endblock %}
diff --git a/docs/_themes/pelican/static/pelican.css_t b/docs/_themes/pelican/static/pelican.css_t
deleted file mode 100644
index 3cb2a3c1..00000000
--- a/docs/_themes/pelican/static/pelican.css_t
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * pelican.css_t
- * ~~~~~~~~~~~~
- *
- * Sphinx stylesheet -- pelican theme, based on the nature theme
- *
- * :copyright: Copyright 2011 by Alexis Metaireau.
- */
- 
-@import url("basic.css");
- 
-/* -- page layout ----------------------------------------------------------- */
- 
-body {
-    font-family: Arial, sans-serif;
-    font-size: 100%;
-    background-color: white;
-    color: #555;
-    margin: 0;
-    padding: 0;
-}
-
-div.documentwrapper {
-    width: 70%;
-    margin: auto;
-}
-
-div.bodywrapper {
-    margin: 0 0 0 230px;
-}
-
-hr {
-    border: 1px solid #B1B4B6;
-}
- 
-div.document {
-}
- 
-div.body {
-    background-color: #ffffff;
-    color: #3E4349;
-    padding: 0 30px 30px 30px;
-    font-size: 0.9em;
-}
- 
-div.footer {
-    color: #555;
-    width: 100%;
-    padding: 13px 0;
-    text-align: center;
-    font-size: 75%;
-}
- 
-div.footer a {
-    color: #444;
-    text-decoration: underline;
-}
- 
-div.related {
-    background-color: #6BA81E;
-    line-height: 32px;
-    color: #fff;
-    text-shadow: 0px 1px 0 #444;
-    font-size: 0.9em;
-}
- 
-div.related a {
-    color: #E2F3CC;
-}
- 
-div.sphinxsidebar {
-    font-size: 0.75em;
-    line-height: 1.5em;
-}
-
-div.sphinxsidebarwrapper{
-    padding: 20px 0;
-}
- 
-div.sphinxsidebar h3,
-div.sphinxsidebar h4 {
-    font-family: Arial, sans-serif;
-    color: #222;
-    font-size: 1.2em;
-    font-weight: normal;
-    margin: 0;
-    padding: 5px 10px;
-    background-color: #ddd;
-    text-shadow: 1px 1px 0 white
-}
-
-div.sphinxsidebar h4{
-    font-size: 1.1em;
-}
- 
-div.sphinxsidebar h3 a {
-    color: #444;
-}
- 
- 
-div.sphinxsidebar p {
-    color: #888;
-    padding: 5px 20px;
-}
- 
-div.sphinxsidebar p.topless {
-}
- 
-div.sphinxsidebar ul {
-    margin: 10px 20px;
-    padding: 0;
-    color: #000;
-}
- 
-div.sphinxsidebar a {
-    color: #444;
-}
- 
-div.sphinxsidebar input {
-    border: 1px solid #ccc;
-    font-family: sans-serif;
-    font-size: 1em;
-}
-
-div.sphinxsidebar input[type=text]{
-    margin-left: 20px;
-}
- 
-/* -- body styles ----------------------------------------------------------- */
- 
-a {
-    color: #005B81;
-    text-decoration: none;
-}
- 
-a:hover {
-    color: #E32E00;
-    text-decoration: underline;
-}
- 
-div.body h1,
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6 {
-    font-family: Arial, sans-serif;
-    font-weight: normal;
-    color: #212224;
-    margin: 30px 0px 10px 0px;
-    padding: 5px 0 5px 10px;
-    text-shadow: 0px 1px 0 white
-}
- 
-{% if theme_index_logo %}
-div.indexwrapper h1 {
-    text-indent: -999999px;
-    background: url({{ theme_index_logo }}) no-repeat center center;
-    height: {{ theme_index_logo_height }};
-}
-{% endif %}
-div.body h1 { 
-    border-top: 20px solid white; 
-    margin-top: 0; 
-    font-size: 250%; 
-    text-align: center;
-}
-
-div.body h2 { font-size: 150%; background-color: #C8D5E3; }
-div.body h3 { font-size: 120%; background-color: #D8DEE3; }
-div.body h4 { font-size: 110%; background-color: #D8DEE3; }
-div.body h5 { font-size: 100%; background-color: #D8DEE3; }
-div.body h6 { font-size: 100%; background-color: #D8DEE3; }
- 
-a.headerlink {
-    color: #c60f0f;
-    font-size: 0.8em;
-    padding: 0 4px 0 4px;
-    text-decoration: none;
-}
- 
-a.headerlink:hover {
-    background-color: #c60f0f;
-    color: white;
-}
- 
-div.body p, div.body dd, div.body li {
-    line-height: 1.5em;
-}
- 
-div.admonition p.admonition-title + p {
-    display: inline;
-}
-
-div.highlight{
-    background-color: #111;
-}
-
-div.note {
-    background-color: #eee;
-    border: 1px solid #ccc;
-}
- 
-div.seealso {
-    background-color: #ffc;
-    border: 1px solid #ff6;
-}
- 
-div.topic {
-    background-color: #eee;
-}
- 
-div.warning {
-    background-color: #ffe4e4;
-    border: 1px solid #f66;
-}
- 
-p.admonition-title {
-    display: inline;
-}
- 
-p.admonition-title:after {
-    content: ":";
-}
- 
-pre {
-    padding: 10px;
-    background-color: #111;
-    color: #fff;
-    line-height: 1.2em;
-    border: 1px solid #C6C9CB;
-    font-size: 1.1em;
-    margin: 1.5em 0 1.5em 0;
-    -webkit-box-shadow: 1px 1px 1px #d8d8d8;
-    -moz-box-shadow: 1px 1px 1px #d8d8d8;
-}
- 
-tt {
-    background-color: #ecf0f3;
-    color: #222;
-    /* padding: 1px 2px; */
-    font-size: 1.1em;
-    font-family: monospace;
-}
-
-.viewcode-back {
-    font-family: Arial, sans-serif;
-}
-
-div.viewcode-block:target {
-    background-color: #f4debf;
-    border-top: 1px solid #ac9;
-    border-bottom: 1px solid #ac9;
-}
diff --git a/docs/_themes/pelican/theme.conf b/docs/_themes/pelican/theme.conf
deleted file mode 100644
index ffbb7945..00000000
--- a/docs/_themes/pelican/theme.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = pelican.css
-nosidebar = true
-pygments_style = fruity
-
-[options]
-index_logo_height = 120px
-index_logo =
-github_fork =
diff --git a/docs/conf.py b/docs/conf.py
index 99acd1b6..d4efcb38 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -57,6 +57,12 @@ html_use_index = False
 # If true, links to the reST sources are added to the pages.
 html_show_sourcelink = False
 
+
+def setup(app):
+    # overrides for wide tables in RTD theme
+    app.add_stylesheet('theme_overrides.css')   # path relative to _static
+
+
 # -- Options for LaTeX output --------------------------------------------------
 latex_documents = [
     ('index', 'Pelican.tex', 'Pelican Documentation',

From 46c865f295d9bbb1230e763ad5ed69777a477b43 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Mon, 28 Apr 2014 21:39:20 +0200
Subject: [PATCH 1605/2864] Really fix #1311 by declaring CSS overrides as
 !important

this is needed because on RTD the common hosted theme stylesheets get added
after the overrides.
---
 docs/_static/theme_overrides.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/_static/theme_overrides.css b/docs/_static/theme_overrides.css
index d4b31645..83afc78e 100644
--- a/docs/_static/theme_overrides.css
+++ b/docs/_static/theme_overrides.css
@@ -1,12 +1,12 @@
 
 /* override table width restrictions */
 .wy-table-responsive table td, .wy-table-responsive table th {
-    white-space: normal;
+    /* !important prevents the common CSS stylesheets from
+       overriding this as on RTD they are loaded after this stylesheet */
+    white-space: normal !important;
 }
 
 .wy-table-responsive {
-    margin-bottom: 24px;
-    max-width: 100%;
-    overflow: visible;
+    overflow: visible !important;
 }
         

From b0e388747c5f5667dc38030f6b20fada49627e61 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Mon, 28 Apr 2014 21:47:18 +0200
Subject: [PATCH 1606/2864] Fix #1277 use rsync -c option as all output is
 rewritten

Because Pelican always rewrites all output, the mtimes always change, so
rsync would always transfer all the files which defeats the purpose of
rsync. The '-c' option (--checksum) compares the checksums rather than
mtimes.
---
 pelican/tools/templates/Makefile.in   | 2 +-
 pelican/tools/templates/fabfile.py.in | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index c542e588..6bfa7b0c 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -88,7 +88,7 @@ ssh_upload: publish
 	scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 rsync_upload: publish
-	rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
+	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
 
 dropbox_upload: publish
 	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.in
index fb56ae85..fbd03e2c 100644
--- a/pelican/tools/templates/fabfile.py.in
+++ b/pelican/tools/templates/fabfile.py.in
@@ -68,5 +68,6 @@ def publish():
         remote_dir=dest_path,
         exclude=".DS_Store",
         local_dir=DEPLOY_PATH.rstrip('/') + '/',
-        delete=True
+        delete=True,
+        extra_opts='-c',
     )

From 3d53b4ca17d298e7147403d176c566eec9d30d79 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 30 Apr 2014 06:44:55 -0700
Subject: [PATCH 1607/2864] Add Python 3.4 to Travic CI configuration

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 93a7ab54..41ad82b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 python:
     - "2.7"
     - "3.3"
+    - "3.4"
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq --no-install-recommends asciidoc

From 81cd781c455f9e1e3e09dfc4ccfdac5f96e60742 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 30 Apr 2014 12:35:13 -0700
Subject: [PATCH 1608/2864] Show setting defaults as actual code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For some reason, setting names on the Settings page have long been
wrapped in single back-ticks (usually meant for linking in reST) instead
of double back-ticks (meant for denoting code). This seems to be
widespread throughout the docs, and it's not clear if this is
intentional or simply a reST formatting error that got propagated by
others in order to stay consistent. This commit applies double
back-ticks in any case where something resembling code is shown, with
the idea that single back-ticks should only be used when linking.

More importantly, the settings denoted their default values in
parentheses, which hapless users often included when copying and pasting
these values into their config files. As one can imagine, confusion —
not hilarity — ensued. Setting defaults are now shown as they would
actually appear in one's settings file, with an equal sign and without
parentheses.

During this spelunking expedition, many other minor improvements were
concurrently conducted.
---
 docs/settings.rst | 422 +++++++++++++++++++++++-----------------------
 1 file changed, 210 insertions(+), 212 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 1b4bae94..c9eddfba 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -6,8 +6,8 @@ the command line::
 
     $ pelican content -s path/to/your/settingsfile.py
 
-(If you used the `pelican-quickstart` command, your primary settings file will
-be named `pelicanconf.py` by default.)
+(If you used the ``pelican-quickstart`` command, your primary settings file will
+be named ``pelicanconf.py`` by default.)
 
 Settings are configured in the form of a Python module (a file). There is an
 `example settings file
@@ -32,33 +32,33 @@ Basic settings
 ==============
 
 ===============================================================================  =====================================================================
-Setting name (default value)                                                     What does it do?
+Setting name (followed by default value, if any)                                 What does it do?
 ===============================================================================  =====================================================================
-`AUTHOR`                                                                         Default author (put your name)
-`DATE_FORMATS` (``{}``)                                                          If you manage multiple languages, you can set the date formatting
+``AUTHOR``                                                                       Default author (put your name)
+``DATE_FORMATS = {}``                                                            If you manage multiple languages, you can set the date formatting
                                                                                  here. See the "Date format and locale" section below for details.
-`USE_FOLDER_AS_CATEGORY` (``True``)                                              When you don't specify a category in your post metadata, set this
+``USE_FOLDER_AS_CATEGORY = True``                                                When you don't specify a category in your post metadata, set this
                                                                                  setting to ``True``, and organize your articles in subfolders, the
                                                                                  subfolder will become the category of your post. If set to ``False``,
                                                                                  ``DEFAULT_CATEGORY`` will be used as a fallback.
-`DEFAULT_CATEGORY` (``'misc'``)                                                  The default category to fall back on.
-`DEFAULT_DATE_FORMAT` (``'%a %d %B %Y'``)                                        The default date format you want to use.
-`DISPLAY_PAGES_ON_MENU` (``True``)                                               Whether to display pages on the menu of the
+``DEFAULT_CATEGORY = 'misc'``                                                    The default category to fall back on.
+``DEFAULT_DATE_FORMAT = '%a %d %B %Y'``                                          The default date format you want to use.
+``DISPLAY_PAGES_ON_MENU = True``                                                 Whether to display pages on the menu of the
                                                                                  template. Templates may or may not honor this
                                                                                  setting.
-`DISPLAY_CATEGORIES_ON_MENU` (``True``)                                          Whether to display categories on the menu of the
+``DISPLAY_CATEGORIES_ON_MENU = True``                                            Whether to display categories on the menu of the
                                                                                  template. Templates may or not honor this
                                                                                  setting.
-`DEFAULT_DATE` (``None``)                                                        The default date you want to use.
+``DEFAULT_DATE = None``                                                          The default date you want to use.
                                                                                  If ``fs``, Pelican will use the file system
                                                                                  timestamp information (mtime) if it can't get
                                                                                  date information from the metadata.
                                                                                  If set to a tuple object, the default datetime object will instead
                                                                                  be generated by passing the tuple to the
                                                                                  ``datetime.datetime`` constructor.
-`DEFAULT_METADATA` (``()``)                                                      The default metadata you want to use for all articles
+``DEFAULT_METADATA = ()``                                                        The default metadata you want to use for all articles
                                                                                  and pages.
-`FILENAME_METADATA` (``'(?P<date>\d{4}-\d{2}-\d{2}).*'``)                        The regexp that will be used to extract any metadata
+``FILENAME_METADATA =`` ``'(?P<date>\d{4}-\d{2}-\d{2}).*'``                      The regexp that will be used to extract any metadata
                                                                                  from the filename. All named groups that are matched
                                                                                  will be set in the metadata object.
                                                                                  The default value will only extract the date from
@@ -67,38 +67,38 @@ Setting name (default value)
                                                                                  date and the slug, you could set something like:
                                                                                  ``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
                                                                                  See :ref:`path_metadata`.
-`PATH_METADATA` (``''``)                                                         Like ``FILENAME_METADATA``, but parsed from a page's
+``PATH_METADATA = ''``                                                           Like ``FILENAME_METADATA``, but parsed from a page's
                                                                                  full path relative to the content source directory.
                                                                                  See :ref:`path_metadata`.
-`EXTRA_PATH_METADATA` (``{}``)                                                   Extra metadata dictionaries keyed by relative path.
+``EXTRA_PATH_METADATA = {}``                                                     Extra metadata dictionaries keyed by relative path.
                                                                                  See :ref:`path_metadata`.
-`DELETE_OUTPUT_DIRECTORY` (``False``)                                            Delete the output directory, and **all** of its contents, before
+``DELETE_OUTPUT_DIRECTORY = False``                                              Delete the output directory, and **all** of its contents, before
                                                                                  generating new files. This can be useful in preventing older,
                                                                                  unnecessary files from persisting in your output. However, **this is
                                                                                  a destructive setting and should be handled with extreme care.**
-`OUTPUT_RETENTION` (``()``)                                                      A tuple of filenames that should be retained and not deleted from the
+``OUTPUT_RETENTION = ()``                                                        A tuple of filenames that should be retained and not deleted from the
                                                                                  output directory. One use case would be the preservation of version
                                                                                  control data. For example: ``(".hg", ".git", ".bzr")``
-`JINJA_EXTENSIONS` (``[]``)                                                      A list of any Jinja2 extensions you want to use.
-`JINJA_FILTERS` (``{}``)                                                         A list of custom Jinja2 filters you want to use.
+``JINJA_EXTENSIONS = []``                                                        A list of any Jinja2 extensions you want to use.
+``JINJA_FILTERS = {}``                                                           A list of custom Jinja2 filters you want to use.
                                                                                  The dictionary should map the filtername to the filter function.
                                                                                  For example: ``{'urlencode': urlencode_filter}``
                                                                                  See `Jinja custom filters documentation`_.
-`LOCALE` (''[#]_)                                                                Change the locale. A list of locales can be provided
+``LOCALE`` [#]_                                                                  Change the locale. A list of locales can be provided
                                                                                  here or a single string representing one locale.
                                                                                  When providing a list, all the locales will be tried
                                                                                  until one works.
-`LOG_FILTER` (``[]``)                                                            A list of tuples containing the logging level (up to ``warning``)
+``LOG_FILTER = []``                                                              A list of tuples containing the logging level (up to ``warning``)
                                                                                  and the message to be ignored.
                                                                                  For example: ``[(logging.WARN, 'TAG_SAVE_AS is set to False')]``
-`READERS` (``{}``)                                                               A dictionary of file extensions / Reader classes for Pelican to
+``READERS = {}``                                                                 A dictionary of file extensions / Reader classes for Pelican to
                                                                                  process or ignore. For example, to avoid processing .html files,
                                                                                  set: ``READERS = {'html': None}``. To add a custom reader for the
                                                                                  `foo` extension, set: ``READERS = {'foo': FooReader}``
-`IGNORE_FILES` (``['.#*']``)                                                     A list of file globbing patterns to match against the
+``IGNORE_FILES = ['.#*']``                                                       A list of file globbing patterns to match against the
                                                                                  source files to be ignored by the processor. For example,
                                                                                  the default ``['.#*']`` will ignore emacs lock files.
-`MD_EXTENSIONS` (``['codehilite(css_class=highlight)','extra']``)                A list of the extensions that the Markdown processor
+``MD_EXTENSIONS =`` ``['codehilite(css_class=highlight)','extra']``              A list of the extensions that the Markdown processor
                                                                                  will use. Refer to the Python Markdown documentation's
                                                                                  `Extensions section <http://pythonhosted.org/Markdown/extensions/>`_
                                                                                  for a complete list of supported extensions. (Note that
@@ -107,87 +107,87 @@ Setting name (default value)
                                                                                  to the default values for this setting, you'll need to
                                                                                  include them explicitly and enumerate the full list of
                                                                                  desired Markdown extensions.)
-`OUTPUT_PATH` (``'output/'``)                                                    Where to output the generated files.
-`PATH` (``None``)                                                                Path to content directory to be processed by Pelican.
-`PAGE_DIR` (``'pages'``)                                                         Directory to look at for pages, relative to `PATH`.
-`PAGE_EXCLUDES` (``()``)                                                         A list of directories to exclude when looking for pages.
-`ARTICLE_DIR` (``''``)                                                           Directory to look at for articles, relative to `PATH`.
-`ARTICLE_EXCLUDES`: (``('pages',)``)                                             A list of directories to exclude when looking for articles.
-`OUTPUT_SOURCES` (``False``)                                                     Set to True if you want to copy the articles and pages in their
+``OUTPUT_PATH = 'output/'``                                                      Where to output the generated files.
+``PATH = None``                                                                  Path to content directory to be processed by Pelican.
+``PAGE_DIR = 'pages'``                                                           Directory to look at for pages, relative to `PATH`.
+``PAGE_EXCLUDES = ()``                                                           A list of directories to exclude when looking for pages.
+``ARTICLE_DIR = ''``                                                             Directory to look at for articles, relative to `PATH`.
+``ARTICLE_EXCLUDES` = ('pages',)``                                               A list of directories to exclude when looking for articles.
+``OUTPUT_SOURCES = False``                                                       Set to True if you want to copy the articles and pages in their
                                                                                  original format (e.g. Markdown or reStructuredText) to the
                                                                                  specified ``OUTPUT_PATH``.
-`OUTPUT_SOURCES_EXTENSION` (``.text``)                                           Controls the extension that will be used by the SourcesGenerator.
+``OUTPUT_SOURCES_EXTENSION = '.text'``                                           Controls the extension that will be used by the SourcesGenerator.
                                                                                  Defaults to ``.text``. If not a valid string the default value
                                                                                  will be used.
-`RELATIVE_URLS` (``False``)                                                      Defines whether Pelican should use document-relative URLs or
+``RELATIVE_URLS = False``                                                        Defines whether Pelican should use document-relative URLs or
                                                                                  not. Only set this to ``True`` when developing/testing and only
                                                                                  if you fully understand the effect it can have on links/feeds.
-`PLUGINS` (``[]``)                                                               The list of plugins to load. See :ref:`plugins`.
-`SITENAME` (``'A Pelican Blog'``)                                                Your site name
-`SITEURL`                                                                        Base URL of your website. Not defined by default,
+``PLUGINS = []``                                                                 The list of plugins to load. See :ref:`plugins`.
+``SITENAME = 'A Pelican Blog'``                                                  Your site name
+``SITEURL``                                                                      Base URL of your website. Not defined by default,
                                                                                  so it is best to specify your SITEURL; if you do not, feeds
                                                                                  will not be generated with properly-formed URLs. You should
                                                                                  include ``http://`` and your domain, with no trailing
                                                                                  slash at the end. Example: ``SITEURL = 'http://mydomain.com'``
-`TEMPLATE_PAGES` (``None``)                                                      A mapping containing template pages that will be rendered with
+``TEMPLATE_PAGES = None``                                                        A mapping containing template pages that will be rendered with
                                                                                  the blog entries. See :ref:`template_pages`.
-`STATIC_PATHS` (``['images']``)                                                  The static paths you want to have accessible
+``STATIC_PATHS = ['images']``                                                    The static paths you want to have accessible
                                                                                  on the output path "static". By default,
                                                                                  Pelican will copy the "images" folder to the
                                                                                  output folder.
-`TIMEZONE`                                                                       The timezone used in the date information, to
+``TIMEZONE``                                                                     The timezone used in the date information, to
                                                                                  generate Atom and RSS feeds. See the *Timezone*
                                                                                  section below for more info.
-`TYPOGRIFY` (``False``)                                                          If set to True, several typographical improvements will be
+``TYPOGRIFY = False``                                                            If set to True, several typographical improvements will be
                                                                                  incorporated into the generated HTML via the `Typogrify
                                                                                  <https://pypi.python.org/pypi/typogrify>`_ library,
                                                                                  which can be installed via: ``pip install typogrify``
-`DIRECT_TEMPLATES` (``('index', 'tags', 'categories', 'authors', 'archives')``)  List of templates that are used directly to render
+``DIRECT_TEMPLATES =`` ``('index', 'categories', 'authors', 'archives')``        List of templates that are used directly to render
                                                                                  content. Typically direct templates are used to generate
                                                                                  index pages for collections of content (e.g., tags and
                                                                                  category index pages). If the tag and category collections
                                                                                  are not needed, set ``DIRECT_TEMPLATES = ('index', 'archives')``
-`PAGINATED_DIRECT_TEMPLATES` (``('index',)``)                                    Provides the direct templates that should be paginated.
-`SUMMARY_MAX_LENGTH` (``50``)                                                    When creating a short summary of an article, this will
+``PAGINATED_DIRECT_TEMPLATES = ('index',)``                                      Provides the direct templates that should be paginated.
+``SUMMARY_MAX_LENGTH = 50``                                                      When creating a short summary of an article, this will
                                                                                  be the default length (measured in words) of the text created.
                                                                                  This only applies if your content does not otherwise
                                                                                  specify a summary. Setting to ``None`` will cause the summary
                                                                                  to be a copy of the original content.
-`EXTRA_TEMPLATES_PATHS` (``[]``)                                                 A list of paths you want Jinja2 to search for templates.
+``EXTRA_TEMPLATES_PATHS = []``                                                   A list of paths you want Jinja2 to search for templates.
                                                                                  Can be used to separate templates from the theme.
                                                                                  Example: projects, resume, profile ...
                                                                                  These templates need to use ``DIRECT_TEMPLATES`` setting.
-`ASCIIDOC_OPTIONS` (``[]``)                                                      A list of options to pass to AsciiDoc. See the `manpage
-                                                                                 <http://www.methods.co.nz/asciidoc/manpage.html>`_
-`WITH_FUTURE_DATES` (``True``)                                                   If disabled, content with dates in the future will get a
-                                                                                 default status of ``draft``.
-										 see :ref:`reading_only_modified_content` for details.
-`INTRASITE_LINK_REGEX` (``'[{|](?P<what>.*?)[|}]'``)                             Regular expression that is used to parse internal links.
-                                                                                 Default syntax of links to internal files, tags, etc., is
-                                                                                 to enclose the identifier, say ``filename``, in ``{}`` or ``||``.
-                                                                                 Identifier between ``{`` and ``}`` goes into the ``what`` capturing group.
+``ASCIIDOC_OPTIONS = []``                                                        A list of options to pass to AsciiDoc. See the `manpage
+                                                                                 <http://www.methods.co.nz/asciidoc/manpage.html>`_.
+``WITH_FUTURE_DATES = True``                                                     If disabled, content with dates in the future will get a default
+                                                                                 status of ``draft``. See :ref:`reading_only_modified_content`
+                                                                                 for caveats.
+``INTRASITE_LINK_REGEX = '[{|](?P<what>.*?)[|}]'``                               Regular expression that is used to parse internal links. Default
+                                                                                 syntax when linking to internal files, tags, etc., is to enclose
+                                                                                 the identifier, say ``filename``, in ``{}`` or ``||``. Identifier
+                                                                                 between ``{`` and ``}`` goes into the ``what`` capturing group.
                                                                                  For details see :ref:`ref-linking-to-internal-content`.
-`PYGMENTS_RST_OPTIONS` (``[]``)                                                  A list of default Pygments settings for your reStructuredText
+``PYGMENTS_RST_OPTIONS = []``                                                    A list of default Pygments settings for your reStructuredText
                                                                                  code blocks. See :ref:`internal_pygments_options` for a list of
                                                                                  supported options.
-
-`SLUGIFY_SOURCE` (``'input'``)                                                   Specifies where you want the slug to be automatically generated
-                                                                                 from. Can be set to 'title' to use the 'Title:' metadata tag or
-                                                                                 'basename' to use the articles basename when creating the slug.
-`CACHE_CONTENT` (``True``)                                                       If ``True``, save content in a cache file.
+``SLUGIFY_SOURCE = 'input'``                                                     Specifies where you want the slug to be automatically generated
+                                                                                 from. Can be set to ``title`` to use the 'Title:' metadata tag or
+                                                                                 ``basename`` to use the article's basename when creating the slug.
+``CACHE_CONTENT = True``                                                         If ``True``, save content in a cache file.
                                                                                  See :ref:`reading_only_modified_content` for details about caching.
-`CONTENT_CACHING_LAYER` (``'reader'``)                                           If set to ``'reader'``, save only the raw content and metadata returned
-                                                                                 by readers, if set to ``'generator'``, save processed content objects.
-`CACHE_DIRECTORY` (``cache``)                                                    Directory in which to store cache files.
-`GZIP_CACHE` (``True``)                                                          If ``True``, use gzip to (de)compress the cache files.
-`CHECK_MODIFIED_METHOD` (``mtime``)                                              Controls how files are checked for modifications.
-`LOAD_CONTENT_CACHE` (``True``)                                                  If ``True``, load unmodified content from cache.
-`AUTORELOAD_IGNORE_CACHE` (``False``)                                            If ``True``, do not load content cache in autoreload mode
+``CONTENT_CACHING_LAYER = 'reader'``                                             If set to ``'reader'``, save only the raw content and metadata
+                                                                                 returned by readers. If set to ``'generator'``, save processed
+                                                                                 content objects.
+``CACHE_DIRECTORY = 'cache'``                                                    Directory in which to store cache files.
+``GZIP_CACHE = True``                                                            If ``True``, use gzip to (de)compress the cache files.
+``CHECK_MODIFIED_METHOD = 'mtime'``                                              Controls how files are checked for modifications.
+``LOAD_CONTENT_CACHE = True``                                                    If ``True``, load unmodified content from cache.
+``AUTORELOAD_IGNORE_CACHE = False``                                              If ``True``, do not load content cache in autoreload mode
                                                                                  when the settings file changes.
-`WRITE_SELECTED` (``[]``)                                                        If this list is not empty, **only** output files with their paths
-                                                                                 in this list are written. Paths should be either relative to the current
-										 working directory of Pelican or absolute. For possible use cases see
-										 :ref:`writing_only_selected_content`.
+``WRITE_SELECTED = []``                                                          If this list is not empty, **only** output files with their paths
+                                                                                 in this list are written. Paths should be either absolute or relative
+                                                                                 to the current Pelican working directory. For possible use cases see
+                                                                                 :ref:`writing_only_selected_content`.
 ===============================================================================  =====================================================================
 
 .. [#] Default is the system locale.
@@ -231,8 +231,8 @@ Also, you can use other file metadata attributes as well:
 
 Example usage:
 
-* ARTICLE_URL = ``'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'``
-* ARTICLE_SAVE_AS = ``'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'``
+* ``ARTICLE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'``
+* ``ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'``
 
 This would save your articles in something like ``/posts/2011/Aug/07/sample-post/index.html``,
 and the URL to this would be ``/posts/2011/Aug/07/sample-post/``.
@@ -245,8 +245,8 @@ make it easier for readers to navigate through the posts you've written over tim
 
 Example usage:
 
-* YEAR_ARCHIVE_SAVE_AS = ``'posts/{date:%Y}/index.html'``
-* MONTH_ARCHIVE_SAVE_AS = ``'posts/{date:%Y}/{date:%b}/index.html'``
+* ``YEAR_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/index.html'``
+* ``MONTH_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/index.html'``
 
 With these settings, Pelican will create an archive of all your posts for the
 year at (for instance) ``posts/2011/index.html`` and an archive of all your
@@ -258,43 +258,43 @@ posts for the month at ``posts/2011/Aug/index.html``.
     arrive at an appropriate archive of posts, without having to specify
     a page name.
 
-======================================================  =====================================================
-Setting name (default value)                            What does it do?
-======================================================  =====================================================
-`ARTICLE_URL` (``'{slug}.html'``)                       The URL to refer to an article.
-`ARTICLE_SAVE_AS` (``'{slug}.html'``)                   The place where we will save an article.
-`ARTICLE_LANG_URL` (``'{slug}-{lang}.html'``)           The URL to refer to an article which doesn't use the
+======================================================  ========================================================
+Setting name (followed by default value, if any)        What does it do?
+======================================================  ========================================================
+``ARTICLE_URL = '{slug}.html'``                         The URL to refer to an article.
+``ARTICLE_SAVE_AS = '{slug}.html'``                     The place where we will save an article.
+``ARTICLE_LANG_URL = '{slug}-{lang}.html'``             The URL to refer to an article which doesn't use the
                                                         default language.
-`ARTICLE_LANG_SAVE_AS` (``'{slug}-{lang}.html'``)       The place where we will save an article which
+``ARTICLE_LANG_SAVE_AS = '{slug}-{lang}.html'``         The place where we will save an article which
                                                         doesn't use the default language.
-`DRAFT_URL` (``'drafts/{slug}.html'``)                  The URL to refer to an article draft.
-`DRAFT_SAVE_AS` (``'drafts/{slug}.html'``)              The place where we will save an article draft.
-`DRAFT_LANG_URL` (``'drafts/{slug}-{lang}.html'``)      The URL to refer to an article draft which doesn't
+``DRAFT_URL = 'drafts/{slug}.html'``                    The URL to refer to an article draft.
+``DRAFT_SAVE_AS = 'drafts/{slug}.html'``                The place where we will save an article draft.
+``DRAFT_LANG_URL = 'drafts/{slug}-{lang}.html'``        The URL to refer to an article draft which doesn't
                                                         use the default language.
-`DRAFT_LANG_SAVE_AS` (``'drafts/{slug}-{lang}.html'``)  The place where we will save an article draft which
+``DRAFT_LANG_SAVE_AS = 'drafts/{slug}-{lang}.html'``    The place where we will save an article draft which
                                                         doesn't use the default language.
-`PAGE_URL` (``'pages/{slug}.html'``)                    The URL we will use to link to a page.
-`PAGE_SAVE_AS` (``'pages/{slug}.html'``)                The location we will save the page. This value has to be
+``PAGE_URL = 'pages/{slug}.html'``                      The URL we will use to link to a page.
+``PAGE_SAVE_AS = 'pages/{slug}.html'``                  The location we will save the page. This value has to be
                                                         the same as PAGE_URL or you need to use a rewrite in
                                                         your server config.
-`PAGE_LANG_URL` (``'pages/{slug}-{lang}.html'``)        The URL we will use to link to a page which doesn't
+``PAGE_LANG_URL = 'pages/{slug}-{lang}.html'``          The URL we will use to link to a page which doesn't
                                                         use the default language.
-`PAGE_LANG_SAVE_AS` (``'pages/{slug}-{lang}.html'``)    The location we will save the page which doesn't
+``PAGE_LANG_SAVE_AS = 'pages/{slug}-{lang}.html'``      The location we will save the page which doesn't
                                                         use the default language.
-`CATEGORY_URL` (``'category/{slug}.html'``)             The URL to use for a category.
-`CATEGORY_SAVE_AS` (``'category/{slug}.html'``)         The location to save a category.
-`TAG_URL` (``'tag/{slug}.html'``)                       The URL to use for a tag.
-`TAG_SAVE_AS` (``'tag/{slug}.html'``)                   The location to save the tag page.
-`AUTHOR_URL` (``'author/{slug}.html'``)                 The URL to use for an author.
-`AUTHOR_SAVE_AS` (``'author/{slug}.html'``)             The location to save an author.
-`YEAR_ARCHIVE_SAVE_AS` (``''``)                         The location to save per-year archives of your posts.
-`MONTH_ARCHIVE_SAVE_AS` (``''``)                        The location to save per-month archives of your posts.
-`DAY_ARCHIVE_SAVE_AS` (``''``)                          The location to save per-day archives of your posts.
-`SLUG_SUBSTITUTIONS`  (``()``)                          Substitutions to make prior to stripping out
+``CATEGORY_URL = 'category/{slug}.html'``               The URL to use for a category.
+``CATEGORY_SAVE_AS = 'category/{slug}.html'``           The location to save a category.
+``TAG_URL = 'tag/{slug}.html'``                         The URL to use for a tag.
+``TAG_SAVE_AS = 'tag/{slug}.html'``                     The location to save the tag page.
+``AUTHOR_URL = 'author/{slug}.html'``                   The URL to use for an author.
+``AUTHOR_SAVE_AS = 'author/{slug}.html'``               The location to save an author.
+``YEAR_ARCHIVE_SAVE_AS = ''``                           The location to save per-year archives of your posts.
+``MONTH_ARCHIVE_SAVE_AS = ''``                          The location to save per-month archives of your posts.
+``DAY_ARCHIVE_SAVE_AS = ''``                            The location to save per-day archives of your posts.
+``SLUG_SUBSTITUTIONS` = ()``                            Substitutions to make prior to stripping out
                                                         non-alphanumerics when generating slugs. Specified
                                                         as a list of 2-tuples of ``(from, to)`` which are
                                                         applied in order.
-======================================================  =====================================================
+======================================================  ========================================================
 
 .. note::
 
@@ -303,23 +303,21 @@ Setting name (default value)                            What does it do?
     set the corresponding ``*_SAVE_AS`` setting to ``''`` to prevent the
     relevant page from being generated.
 
-`DIRECT_TEMPLATES`
-~~~~~~~~~~~~~~~~~~
-
-These templates (``('index', 'tags', 'categories', 'archives')`` by default)
-works a bit differently than above. Only the ``_SAVE_AS`` setting is available:
+``DIRECT_TEMPLATES``, which are ``('index', 'tags', 'categories', 'archives')``
+by default, work a bit differently than noted above. Only the ``_SAVE_AS``
+settings are available:
 
 =============================================  ===============================================
-Setting name (default value)                   What does it do?
+Setting name (followed by default value)       What does it do?
 =============================================  ===============================================
-`ARCHIVES_SAVE_AS` (``'archives.html'``)       The location to save the article archives page.
-`AUTHORS_SAVE_AS` (``'authors.html'``)         The location to save the author list.
-`CATEGORIES_SAVE_AS` (``'categories.html'``)   The location to save the category list.
-`TAGS_SAVE_AS` (``'tags.html'``)               The location to save the tag list.
+``ARCHIVES_SAVE_AS = 'archives.html'``         The location to save the article archives page.
+``AUTHORS_SAVE_AS = 'authors.html'``           The location to save the author list.
+``CATEGORIES_SAVE_AS = 'categories.html'``     The location to save the category list.
+``TAGS_SAVE_AS = 'tags.html'``                 The location to save the tag list.
 =============================================  ===============================================
 
-The corresponding urls are hard-coded in the themes: ``'archives.html'``,
-``'authors.html'``, ``'categories.html'``, ``'tags.html'``.
+URLs for direct template pages are theme-dependent. Some themes hard-code them:
+``'archives.html'``, ``'authors.html'``, ``'categories.html'``, ``'tags.html'``.
 
 Timezone
 --------
@@ -460,33 +458,33 @@ Pelican generates category feeds as well as feeds for all your articles. It does
 not generate feeds for tags by default, but it is possible to do so using
 the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 
-================================================    =====================================================
-Setting name (default value)                        What does it do?
-================================================    =====================================================
-`FEED_DOMAIN` (``None``, i.e. base URL is "/")      The domain prepended to feed URLs. Since feed URLs
+=================================================   =====================================================
+Setting name (followed by default value, if any)    What does it do?
+=================================================   =====================================================
+``FEED_DOMAIN = None``, i.e. base URL is "/"        The domain prepended to feed URLs. Since feed URLs
                                                     should always be absolute, it is highly recommended
                                                     to define this (e.g., "http://feeds.example.com"). If
                                                     you have already explicitly defined SITEURL (see
                                                     above) and want to use the same domain for your
                                                     feeds, you can just set:  ``FEED_DOMAIN = SITEURL``.
-`FEED_ATOM` (``None``, i.e. no Atom feed)           Relative URL to output the Atom feed.
-`FEED_RSS` (``None``, i.e. no RSS)                  Relative URL to output the RSS feed.
-`FEED_ALL_ATOM` (``'feeds/all.atom.xml'``)          Relative URL to output the all posts Atom feed:
+``FEED_ATOM = None``, i.e. no Atom feed             Relative URL to output the Atom feed.
+``FEED_RSS = None``, i.e. no RSS                    Relative URL to output the RSS feed.
+``FEED_ALL_ATOM = 'feeds/all.atom.xml'``            Relative URL to output the all-posts Atom feed:
                                                     this feed will contain all posts regardless of their
                                                     language.
-`FEED_ALL_RSS` (``None``, i.e. no all RSS)          Relative URL to output the all posts RSS feed:
+``FEED_ALL_RSS = None``, i.e. no all-posts RSS      Relative URL to output the all-posts RSS feed:
                                                     this feed will contain all posts regardless of their
                                                     language.
-`CATEGORY_FEED_ATOM` ('feeds/%s.atom.xml'[2]_)      Where to put the category Atom feeds.
-`CATEGORY_FEED_RSS` (``None``, i.e. no RSS)         Where to put the category RSS feeds.
-`AUTHOR_FEED_ATOM` ('feeds/%s.atom.xml'[2]_)        Where to put the author Atom feeds.
-`AUTHOR_FEED_RSS` ('feeds/%s.rss.xml'[2]_)          Where to put the author RSS feeds.
-`TAG_FEED_ATOM` (``None``, i.e. no tag feed)        Relative URL to output the tag Atom feed. It should
+``CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'`` [2]_   Where to put the category Atom feeds.
+``CATEGORY_FEED_RSS = None``, i.e. no RSS           Where to put the category RSS feeds.
+``AUTHOR_FEED_ATOM = 'feeds/%s.atom.xml'`` [2]_     Where to put the author Atom feeds.
+``AUTHOR_FEED_RSS = 'feeds/%s.rss.xml'`` [2]_       Where to put the author RSS feeds.
+``TAG_FEED_ATOM = None``, i.e. no tag feed          Relative URL to output the tag Atom feed. It should
                                                     be defined using a "%s" match in the tag name.
-`TAG_FEED_RSS` (``None``, ie no RSS tag feed)       Relative URL to output the tag RSS feed
-`FEED_MAX_ITEMS`                                    Maximum number of items allowed in a feed. Feed item
+``TAG_FEED_RSS = None``, i.e. no RSS tag feed       Relative URL to output the tag RSS feed
+``FEED_MAX_ITEMS``                                  Maximum number of items allowed in a feed. Feed item
                                                     quantity is unrestricted by default.
-================================================    =====================================================
+=================================================   =====================================================
 
 If you don't want to generate some or any of these feeds, set the above variables to ``None``.
 
@@ -499,17 +497,17 @@ If you want to use FeedBurner for your feed, you will likely need to decide
 upon a unique identifier. For example, if your site were called "Thyme" and
 hosted on the www.example.com domain, you might use "thymefeeds" as your
 unique identifier, which we'll use throughout this section for illustrative
-purposes. In your Pelican settings, set the `FEED_ATOM` attribute to
-"thymefeeds/main.xml" to create an Atom feed with an original address of
-`http://www.example.com/thymefeeds/main.xml`. Set the `FEED_DOMAIN` attribute
-to `http://feeds.feedburner.com`, or `http://feeds.example.com` if you are
-using a CNAME on your own domain (i.e., FeedBurner's "MyBrand" feature).
+purposes. In your Pelican settings, set the ``FEED_ATOM`` attribute to
+``thymefeeds/main.xml`` to create an Atom feed with an original address of
+``http://www.example.com/thymefeeds/main.xml``. Set the ``FEED_DOMAIN``
+attribute to ``http://feeds.feedburner.com``, or ``http://feeds.example.com`` if
+you are using a CNAME on your own domain (i.e., FeedBurner's "MyBrand" feature).
 
 There are two fields to configure in the `FeedBurner
 <http://feedburner.google.com>`_ interface: "Original Feed" and "Feed
 Address". In this example, the "Original Feed" would be
-`http://www.example.com/thymefeeds/main.xml` and the "Feed Address" suffix
-would be `thymefeeds/main.xml`.
+``http://www.example.com/thymefeeds/main.xml`` and the "Feed Address" suffix
+would be ``thymefeeds/main.xml``.
 
 Pagination
 ==========
@@ -522,15 +520,15 @@ benefit from paginating this list.
 You can use the following settings to configure the pagination.
 
 ================================================    =====================================================
-Setting name (default value)                        What does it do?
+Setting name (followed by default value, if any)    What does it do?
 ================================================    =====================================================
-`DEFAULT_ORPHANS` (``0``)                           The minimum number of articles allowed on the
+``DEFAULT_ORPHANS = 0``                             The minimum number of articles allowed on the
                                                     last page. Use this when you don't want the last page
                                                     to only contain a handful of articles.
-`DEFAULT_PAGINATION` (``False``)                    The maximum number of articles to include on a
+``DEFAULT_PAGINATION = False``                      The maximum number of articles to include on a
                                                     page, not including orphans. False to disable
                                                     pagination.
-`PAGINATION_PATTERNS`                               A set of patterns that are used to determine advanced
+``PAGINATION_PATTERNS``                             A set of patterns that are used to determine advanced
                                                     pagination output.
 ================================================    =====================================================
 
@@ -563,11 +561,11 @@ If you want to generate a tag cloud with all your tags, you can do so using the
 following settings.
 
 ================================================    =====================================================
-Setting name (default value)                        What does it do?
+Setting name (followed by default value)            What does it do?
 ================================================    =====================================================
-`TAG_CLOUD_STEPS` (``4``)                           Count of different font sizes in the tag
+``TAG_CLOUD_STEPS = 4``                             Count of different font sizes in the tag
                                                     cloud.
-`TAG_CLOUD_MAX_ITEMS` (``100``)                     Maximum number of tags in the cloud.
+``TAG_CLOUD_MAX_ITEMS = 100``                       Maximum number of tags in the cloud.
 ================================================    =====================================================
 
 The default theme does not include a tag cloud, but it is pretty easy to add one::
@@ -608,13 +606,13 @@ Translations
 Pelican offers a way to translate articles. See the :doc:`Getting Started <getting_started>` section for
 more information.
 
-=====================================================    =====================================================
-Setting name (default value)                             What does it do?
-=====================================================    =====================================================
-`DEFAULT_LANG` (``'en'``)                                The default language to use.
-`TRANSLATION_FEED_ATOM` ('feeds/all-%s.atom.xml'[3]_)    Where to put the Atom feed for translations.
-`TRANSLATION_FEED_RSS` (``None``, i.e. no RSS)           Where to put the RSS feed for translations.
-=====================================================    =====================================================
+========================================================    =====================================================
+Setting name (followed by default value, if any)            What does it do?
+========================================================    =====================================================
+``DEFAULT_LANG = 'en'``                                     The default language to use.
+``TRANSLATION_FEED_ATOM = 'feeds/all-%s.atom.xml'`` [3]_    Where to put the Atom feed for translations.
+``TRANSLATION_FEED_RSS = None``, i.e. no RSS                Where to put the RSS feed for translations.
+========================================================    =====================================================
 
 .. [3] %s is the language
 
@@ -622,11 +620,11 @@ Ordering content
 ================
 
 ================================================    =====================================================
-Setting name (default value)                        What does it do?
+Setting name (followed by default value)            What does it do?
 ================================================    =====================================================
-`NEWEST_FIRST_ARCHIVES` (``True``)                  Order archives by newest first by date. (False:
+``NEWEST_FIRST_ARCHIVES = True``                    Order archives by newest first by date. (False:
                                                     orders by date with older articles first.)
-`REVERSE_CATEGORY_ORDER` (``False``)                Reverse the category order. (True: lists by reverse
+``REVERSE_CATEGORY_ORDER = False``                  Reverse the category order. (True: lists by reverse
                                                     alphabetical order; default lists alphabetically.)
 ================================================    =====================================================
 
@@ -637,32 +635,32 @@ Creating Pelican themes is addressed in a dedicated section (see :ref:`theming-p
 However, here are the settings that are related to themes.
 
 ================================================    =====================================================
-Setting name (default value)                        What does it do?
+Setting name (followed by default value, if any)    What does it do?
 ================================================    =====================================================
-`THEME`                                             Theme to use to produce the output. Can be a relative
+``THEME``                                           Theme to use to produce the output. Can be a relative
                                                     or absolute path to a theme folder, or the name of a
                                                     default theme or a theme installed via
                                                     ``pelican-themes`` (see below).
-`THEME_STATIC_DIR` (``'theme'``)                    Destination directory in the output path where
+``THEME_STATIC_DIR = 'theme'``                      Destination directory in the output path where
                                                     Pelican will place the files collected from
                                                     `THEME_STATIC_PATHS`. Default is `theme`.
-`THEME_STATIC_PATHS` (``['static']``)               Static theme paths you want to copy. Default
+``THEME_STATIC_PATHS = ['static']``                 Static theme paths you want to copy. Default
                                                     value is `static`, but if your theme has
                                                     other static paths, you can put them here. If files
                                                     or directories with the same names are included in
                                                     the paths defined in this settings, they will be
                                                     progressively overwritten.
-`CSS_FILE` (``'main.css'``)                         Specify the CSS file you want to load.
+``CSS_FILE = 'main.css'``                           Specify the CSS file you want to load.
 ================================================    =====================================================
 
 
-By default, two themes are available. You can specify them using the `THEME` setting or by passing the
-``-t`` option to the ``pelican`` command:
+By default, two themes are available. You can specify them using the ``THEME``
+setting or by passing the ``-t`` option to the ``pelican`` command:
 
 * notmyidea
 * simple (a synonym for "plain text" :)
 
-There are a number of other themes available at http://github.com/getpelican/pelican-themes.
+There are a number of other themes available at https://github.com/getpelican/pelican-themes.
 Pelican comes with :doc:`pelican-themes`, a small script for managing themes.
 
 You can define your own theme, either by starting from scratch or by duplicating
@@ -677,34 +675,34 @@ Following are example ways to specify your preferred theme::
     # Specify a customized theme, via path relative to the settings file
     THEME = "themes/mycustomtheme"
     # Specify a customized theme, via absolute path
-    THEME = "~/projects/mysite/themes/mycustomtheme"
+    THEME = "/home/myuser/projects/mysite/themes/mycustomtheme"
 
 The built-in ``notmyidea`` theme can make good use of the following settings. Feel
 free to use them in your themes as well.
 
 =======================   =======================================================
-Setting name              What does it do ?
+Setting name              What does it do?
 =======================   =======================================================
-`SITESUBTITLE`            A subtitle to appear in the header.
-`DISQUS_SITENAME`         Pelican can handle Disqus comments. Specify the
+``SITESUBTITLE``          A subtitle to appear in the header.
+``DISQUS_SITENAME``       Pelican can handle Disqus comments. Specify the
                           Disqus sitename identifier here.
-`GITHUB_URL`              Your GitHub URL (if you have one). It will then
+``GITHUB_URL``            Your GitHub URL (if you have one). It will then
                           use this information to create a GitHub ribbon.
-`GOOGLE_ANALYTICS`        'UA-XXXX-YYYY' to activate Google Analytics.
-`GOSQUARED_SITENAME`      'XXX-YYYYYY-X' to activate GoSquared.
-`MENUITEMS`               A list of tuples (Title, URL) for additional menu
+``GOOGLE_ANALYTICS``      Set to 'UA-XXXX-YYYY' to activate Google Analytics.
+``GOSQUARED_SITENAME``    Set to 'XXX-YYYYYY-X' to activate GoSquared.
+``MENUITEMS``             A list of tuples (Title, URL) for additional menu
                           items to appear at the beginning of the main menu.
-`PIWIK_URL`               URL to your Piwik server - without 'http://' at the
+``PIWIK_URL``             URL to your Piwik server - without 'http://' at the
                           beginning.
-`PIWIK_SSL_URL`           If the SSL-URL differs from the normal Piwik-URL
+``PIWIK_SSL_URL``         If the SSL-URL differs from the normal Piwik-URL
                           you have to include this setting too. (optional)
-`PIWIK_SITE_ID`           ID for the monitored website. You can find the ID
-                          in the Piwik admin interface > settings > websites.
-`LINKS`                   A list of tuples (Title, URL) for links to appear on
+``PIWIK_SITE_ID``         ID for the monitored website. You can find the ID
+                          in the Piwik admin interface > Settings > Websites.
+``LINKS``                 A list of tuples (Title, URL) for links to appear on
                           the header.
-`SOCIAL`                  A list of tuples (Title, URL) to appear in the
+``SOCIAL``                A list of tuples (Title, URL) to appear in the
                           "social" section.
-`TWITTER_USERNAME`        Allows for adding a button to articles to encourage
+``TWITTER_USERNAME``      Allows for adding a button to articles to encourage
                           others to tweet about them. Add your Twitter username
                           if you want this button to appear.
 =======================   =======================================================
@@ -734,17 +732,17 @@ For example: ``[(logging.WARN, 'TAG_SAVE_AS is set to False')]``
 Reading only modified content
 =============================
 
-To speed up the build process, pelican can optionally read only articles
+To speed up the build process, Pelican can optionally read only articles
 and pages with modified content.
 
 When Pelican is about to read some content source file:
 
 1. The hash or modification time information for the file from a
-   previous build are loaded from a cache file if `LOAD_CONTENT_CACHE`
-   is ``True``. These files are stored in the `CACHE_DIRECTORY`
+   previous build are loaded from a cache file if ``LOAD_CONTENT_CACHE``
+   is ``True``. These files are stored in the ``CACHE_DIRECTORY``
    directory.  If the file has no record in the cache file, it is read
    as usual.
-2. The file is checked according to `CHECK_MODIFIED_METHOD`:
+2. The file is checked according to ``CHECK_MODIFIED_METHOD``:
 
     - If set to ``'mtime'``, the modification time of the file is
       checked.
@@ -755,60 +753,60 @@ When Pelican is about to read some content source file:
       usual.
 
 3. If the file is considered unchanged, the content data saved in a
-   previous build corresponding to the file is loaded from the cache
+   previous build corresponding to the file is loaded from the cache,
    and the file is not read.
 4. If the file is considered changed, the file is read and the new
    modification information and the content data are saved to the
-   cache if `CACHE_CONTENT` is ``True``.
+   cache if ``CACHE_CONTENT`` is ``True``.
 
-Depending on `CONTENT_CACHING_LAYER` either the raw content and
-metadata returned by a reader are cached if set to ``'reader'``, or
-the processed content object is cached if set to ``'generator'``.
-Caching the processed content object may conflict with plugins (as
-some reading related signals may be skipped) or e.g. the
-`WITH_FUTURE_DATES` functionality (as the ``draft`` status of the
+If ``CONTENT_CACHING_LAYER`` is set to ``'reader'`` (the default),
+the raw content and metadata returned by a reader are cached. If this
+setting is instead set to ``'generator'``, the processed content
+object is cached. Caching the processed content object may conflict
+with plugins (as some reading related signals may be skipped) and the
+``WITH_FUTURE_DATES`` functionality (as the ``draft`` status of the
 cached content objects would not change automatically over time).
 
-Modification time based checking is faster than comparing file hashes,
-but is not as reliable, because mtime information can be lost when
-e.g. copying the content sources using the ``cp`` or ``rsync``
-commands without the mtime preservation mode (invoked e.g. by
-``--archive``).
+Checking modification times is faster than comparing file hashes,
+but it is not as reliable because ``mtime`` information can be lost,
+e.g., when copying content source files using the ``cp`` or ``rsync``
+commands without the ``mtime`` preservation mode (which for ``rsync``
+can be invoked by passing the ``--archive`` flag).
 
 The cache files are Python pickles, so they may not be readable by
 different versions of Python as the pickle format often changes. If
 such an error is encountered, the cache files have to be rebuilt by
-running pelican after removing them or by using the pelican
-command-line option ``--ignore-cache``.  The cache files also have to
-be rebuilt when changing the `GZIP_CACHE` setting for cache file
-reading to work.
+removing them and re-running Pelican, or by using the Pelican
+command-line option ``--ignore-cache``. The cache files also have to
+be rebuilt when changing the ``GZIP_CACHE`` setting for cache file
+reading to work properly.
 
 The ``--ignore-cache`` command-line option is also useful when the
-whole cache needs to be regenerated due to e.g. modifications to the
-settings file which should change the cached content or just for
-debugging purposes. When pelican runs in autoreload mode, modification
+whole cache needs to be regenerated, such as when making modifications
+to the settings file that will affect the cached content, or just for
+debugging purposes. When Pelican runs in autoreload mode, modification
 of the settings file will make it ignore the cache automatically if
-`AUTORELOAD_IGNORE_CACHE` is ``True``.
+``AUTORELOAD_IGNORE_CACHE`` is ``True``.
 
 Note that even when using cached content, all output is always
-written, so the modification times of the ``*.html`` files always
-change.  Therefore, ``rsync`` based upload may benefit from the
-``--checksum`` option.
+written, so the modification times of the generated ``*.html`` files
+will always change. Therefore, ``rsync``-based uploading may benefit
+from the ``--checksum`` option.
 
 .. _writing_only_selected_content:
 
 Writing only selected content
 =============================
 
-When one article or page or the theme is being worked on it is often
-desirable to display selected output files as soon as possible. In
-such cases generating and writing all output is often unnecessary.
-These selected output files can be given as output paths in the
-`WRITE_SELECTED` list and **only** those files will be written. This
-list can be also specified on the command-line using the
-``--write-selected`` option which accepts a comma separated list
-of output file paths. By default the list is empty so all output is
-written.
+When only working on a single article or page, or making tweaks to
+your theme, it is often desirable to generate and review your work
+as quickly as possible. In such cases, generating and writing the
+entire site output is often unnecessary. By specifying only the
+desired files as output paths in the ``WRITE_SELECTED`` list,
+**only** those files will be written. This list can be also specified
+on the command line using the ``--write-selected`` option, which
+accepts a comma-separated list of output file paths. By default this
+list is empty, so all output is written.
 
 Example settings
 ================

From fd231b6ce2692fc186080a472876687018eff772 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 30 Apr 2014 13:35:10 -0700
Subject: [PATCH 1609/2864] Remove errant leading spaces from fabfile.py.in

---
 pelican/tools/templates/fabfile.py.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.in
index fbd03e2c..e693bb48 100644
--- a/pelican/tools/templates/fabfile.py.in
+++ b/pelican/tools/templates/fabfile.py.in
@@ -36,13 +36,13 @@ def regenerate():
 
 def serve():
     os.chdir(env.deploy_path)
-    
+
     PORT = 8000
     class AddressReuseTCPServer(SocketServer.TCPServer):
         allow_reuse_address = True
-    
+
     server = AddressReuseTCPServer(('', PORT), SimpleHTTPServer.SimpleHTTPRequestHandler)
-    
+
     sys.stderr.write('Serving on port {0} ...\n'.format(PORT))
     server.serve_forever()
 

From f00fc944fb310f1a6531b0a68ed9bda23c40fb2c Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Thu, 1 May 2014 10:39:07 +0200
Subject: [PATCH 1610/2864] Fix get_writer signal received result unpacking

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 5208c317..74f55c46 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -209,13 +209,13 @@ class Pelican(object):
         return generators
 
     def get_writer(self):
-        writers = [ w for w in signals.get_writer.send(self)
+        writers = [ w for (_, w) in signals.get_writer.send(self)
                     if isinstance(w, type) ]
         writers_found = len(writers)
         if writers_found == 0:
             return Writer(self.output_path, settings=self.settings)
         else:
-            _, writer = writers[0]
+            writer = writers[0]
             if writers_found == 1:
                 logger.debug('Found writer: {}'.format(writer))
             else:

From f2549650e6b2154d3484a72ee19732a75e3d4fe8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 2 May 2014 07:34:27 -0700
Subject: [PATCH 1611/2864] Remove errant backtick

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c9eddfba..d5802d1d 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -112,7 +112,7 @@ Setting name (followed by default value, if any)
 ``PAGE_DIR = 'pages'``                                                           Directory to look at for pages, relative to `PATH`.
 ``PAGE_EXCLUDES = ()``                                                           A list of directories to exclude when looking for pages.
 ``ARTICLE_DIR = ''``                                                             Directory to look at for articles, relative to `PATH`.
-``ARTICLE_EXCLUDES` = ('pages',)``                                               A list of directories to exclude when looking for articles.
+``ARTICLE_EXCLUDES = ('pages',)``                                                A list of directories to exclude when looking for articles.
 ``OUTPUT_SOURCES = False``                                                       Set to True if you want to copy the articles and pages in their
                                                                                  original format (e.g. Markdown or reStructuredText) to the
                                                                                  specified ``OUTPUT_PATH``.

From 5bad061c19947fde41a98bccb56a9a00ef46a40a Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Sun, 27 Apr 2014 08:53:56 +0200
Subject: [PATCH 1612/2864] rename CACHE_DIR -> CACHE_PATH to unify with rest
 of Pelican

CACHE_PATH can now be relative to settings file like OUTPUT_PATH.
Also add --cache-path commandline option.
Change cache loading warning to a less scary and more helpful message.
---
 docs/settings.rst                |  4 ++--
 pelican/__init__.py              |  8 +++++++-
 pelican/settings.py              |  4 ++--
 pelican/tests/test_generators.py | 26 +++++++++++++-------------
 pelican/tests/test_pelican.py    | 10 +++++-----
 pelican/utils.py                 | 18 ++++++++++++------
 6 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d5802d1d..2782977c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -178,7 +178,7 @@ Setting name (followed by default value, if any)
 ``CONTENT_CACHING_LAYER = 'reader'``                                             If set to ``'reader'``, save only the raw content and metadata
                                                                                  returned by readers. If set to ``'generator'``, save processed
                                                                                  content objects.
-``CACHE_DIRECTORY = 'cache'``                                                    Directory in which to store cache files.
+``CACHE_PATH = 'cache'``                                                         Directory in which to store cache files.
 ``GZIP_CACHE = True``                                                            If ``True``, use gzip to (de)compress the cache files.
 ``CHECK_MODIFIED_METHOD = 'mtime'``                                              Controls how files are checked for modifications.
 ``LOAD_CONTENT_CACHE = True``                                                    If ``True``, load unmodified content from cache.
@@ -739,7 +739,7 @@ When Pelican is about to read some content source file:
 
 1. The hash or modification time information for the file from a
    previous build are loaded from a cache file if ``LOAD_CONTENT_CACHE``
-   is ``True``. These files are stored in the ``CACHE_DIRECTORY``
+   is ``True``. These files are stored in the ``CACHE_PATH``
    directory.  If the file has no record in the cache file, it is read
    as usual.
 2. The file is checked according to ``CHECK_MODIFIED_METHOD``:
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 74f55c46..d6417391 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -275,7 +275,11 @@ def parse_arguments():
                         help='Relaunch pelican each time a modification occurs'
                         ' on the content files.')
 
-    parser.add_argument('-c', '--ignore-cache', action='store_true',
+    parser.add_argument('--cache-path', dest='cache_path',
+                        help=('Directory in which to store cache files. '
+                              'If not specified, defaults to "cache".'))
+
+    parser.add_argument('--ignore-cache', action='store_true',
                         dest='ignore_cache', help='Ignore content cache '
                         'from previous runs by not loading cache files.')
 
@@ -300,6 +304,8 @@ def get_config(args):
         config['DELETE_OUTPUT_DIRECTORY'] = args.delete_outputdir
     if args.ignore_cache:
         config['LOAD_CONTENT_CACHE'] = False
+    if args.cache_path:
+        config['CACHE_PATH'] = args.cache_path
     if args.selected_paths:
         config['WRITE_SELECTED'] = args.selected_paths.split(',')
 
diff --git a/pelican/settings.py b/pelican/settings.py
index abf16b32..f759ff9e 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -124,7 +124,7 @@ DEFAULT_CONFIG = {
     'SLUGIFY_SOURCE': 'title',
     'CACHE_CONTENT': True,
     'CONTENT_CACHING_LAYER': 'reader',
-    'CACHE_DIRECTORY': 'cache',
+    'CACHE_PATH': 'cache',
     'GZIP_CACHE': True,
     'CHECK_MODIFIED_METHOD': 'mtime',
     'LOAD_CONTENT_CACHE': True,
@@ -139,7 +139,7 @@ def read_settings(path=None, override=None):
     if path:
         local_settings = get_settings_from_file(path)
         # Make the paths relative to the settings file
-        for p in ['PATH', 'OUTPUT_PATH', 'THEME']:
+        for p in ['PATH', 'OUTPUT_PATH', 'THEME', 'CACHE_PATH']:
             if p in local_settings and local_settings[p] is not None \
                     and not isabs(local_settings[p]):
                 absp = os.path.abspath(os.path.normpath(os.path.join(
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 9463047e..7b79e8f3 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -66,7 +66,7 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_feeds(self):
         settings = get_settings()
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=None, theme=settings['THEME'], output_path=None)
@@ -142,7 +142,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['USE_FOLDER_AS_CATEGORY'] = False
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         settings['READERS'] = {'asc': None}
         settings['filenames'] = {}
         generator = ArticlesGenerator(
@@ -167,7 +167,7 @@ class TestArticlesGenerator(unittest.TestCase):
     def test_direct_templates_save_as_default(self):
 
         settings = get_settings(filenames={})
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=None, theme=settings['THEME'], output_path=None)
@@ -182,7 +182,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings()
         settings['DIRECT_TEMPLATES'] = ['archives']
         settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=None, theme=settings['THEME'], output_path=None)
@@ -198,7 +198,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings()
         settings['DIRECT_TEMPLATES'] = ['archives']
         settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=None, theme=settings['THEME'], output_path=None)
@@ -225,7 +225,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings(filenames={})
 
         settings['YEAR_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/index.html'
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
@@ -291,7 +291,7 @@ class TestArticlesGenerator(unittest.TestCase):
     def test_article_object_caching(self):
         """Test Article objects caching at the generator level"""
         settings = get_settings(filenames={})
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         settings['CONTENT_CACHING_LAYER'] = 'generator'
         settings['READERS'] = {'asc': None}
 
@@ -311,7 +311,7 @@ class TestArticlesGenerator(unittest.TestCase):
     def test_reader_content_caching(self):
         """Test raw content caching at the reader level"""
         settings = get_settings(filenames={})
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         settings['READERS'] = {'asc': None}
 
         generator = ArticlesGenerator(
@@ -335,7 +335,7 @@ class TestArticlesGenerator(unittest.TestCase):
 
         used in --ignore-cache or autoreload mode"""
         settings = get_settings(filenames={})
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         settings['READERS'] = {'asc': None}
 
         generator = ArticlesGenerator(
@@ -373,7 +373,7 @@ class TestPageGenerator(unittest.TestCase):
     def test_generate_context(self):
         settings = get_settings(filenames={})
         settings['PAGE_DIR'] = 'TestPages'  # relative to CUR_DIR
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         settings['DEFAULT_DATE'] = (1970, 1, 1)
 
         generator = PagesGenerator(
@@ -402,7 +402,7 @@ class TestPageGenerator(unittest.TestCase):
     def test_page_object_caching(self):
         """Test Page objects caching at the generator level"""
         settings = get_settings(filenames={})
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         settings['CONTENT_CACHING_LAYER'] = 'generator'
         settings['READERS'] = {'asc': None}
 
@@ -422,7 +422,7 @@ class TestPageGenerator(unittest.TestCase):
     def test_reader_content_caching(self):
         """Test raw content caching at the reader level"""
         settings = get_settings(filenames={})
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         settings['READERS'] = {'asc': None}
 
         generator = PagesGenerator(
@@ -446,7 +446,7 @@ class TestPageGenerator(unittest.TestCase):
 
         used in --ignore_cache or autoreload mode"""
         settings = get_settings(filenames={})
-        settings['CACHE_DIRECTORY'] = self.temp_cache
+        settings['CACHE_PATH'] = self.temp_cache
         settings['READERS'] = {'asc': None}
 
         generator = PagesGenerator(
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 294cf399..411fb7da 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -79,7 +79,7 @@ class TestPelican(LoggedTestCase):
         settings = read_settings(path=None, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
-            'CACHE_DIRECTORY': self.temp_cache,
+            'CACHE_PATH': self.temp_cache,
             'LOCALE': locale.normalize('en_US'),
             })
         pelican = Pelican(settings=settings)
@@ -95,7 +95,7 @@ class TestPelican(LoggedTestCase):
         settings = read_settings(path=SAMPLE_CONFIG, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
-            'CACHE_DIRECTORY': self.temp_cache,
+            'CACHE_PATH': self.temp_cache,
             'LOCALE': locale.normalize('en_US'),
             })
         pelican = Pelican(settings=settings)
@@ -107,7 +107,7 @@ class TestPelican(LoggedTestCase):
         settings = read_settings(path=SAMPLE_CONFIG, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
-            'CACHE_DIRECTORY': self.temp_cache,
+            'CACHE_PATH': self.temp_cache,
             'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH, 'very'),
                                    os.path.join(SAMPLES_PATH, 'kinda'),
                                    os.path.join(SAMPLES_PATH, 'theme_standard')]
@@ -128,7 +128,7 @@ class TestPelican(LoggedTestCase):
         settings = read_settings(path=SAMPLE_CONFIG, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
-            'CACHE_DIRECTORY': self.temp_cache,
+            'CACHE_PATH': self.temp_cache,
             'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH, 'theme_standard')]
             })
 
@@ -144,7 +144,7 @@ class TestPelican(LoggedTestCase):
         settings = read_settings(path=None, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
-            'CACHE_DIRECTORY': self.temp_cache,
+            'CACHE_PATH': self.temp_cache,
             'WRITE_SELECTED': [
                 os.path.join(self.temp_path, 'oh-yeah.html'),
                 os.path.join(self.temp_path, 'categories.html'),
diff --git a/pelican/utils.py b/pelican/utils.py
index 7b58a231..2af34ecf 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -553,14 +553,14 @@ class FileDataCacher(object):
     '''Class that can cache data contained in files'''
 
     def __init__(self, settings, cache_name, caching_policy, load_policy):
-        '''Load the specified cache within CACHE_DIRECTORY in settings
+        '''Load the specified cache within CACHE_PATH in settings
 
         only if *load_policy* is True,
         May use gzip if GZIP_CACHE ins settings is True.
         Sets caching policy according to *caching_policy*.
         '''
         self.settings = settings
-        self._cache_path = os.path.join(self.settings['CACHE_DIRECTORY'],
+        self._cache_path = os.path.join(self.settings['CACHE_PATH'],
                                         cache_name)
         self._cache_data_policy = caching_policy
         if self.settings['GZIP_CACHE']:
@@ -572,9 +572,15 @@ class FileDataCacher(object):
             try:
                 with self._cache_open(self._cache_path, 'rb') as fhandle:
                     self._cache = pickle.load(fhandle)
-            except (IOError, OSError, pickle.UnpicklingError) as err:
-                logger.warning(('Cannot load cache {}, '
-                    'proceeding with empty cache.\n{}').format(
+            except (IOError, OSError) as err:
+                logger.debug(('Cannot load cache {} (this is normal on first '
+                    'run). Proceeding with empty cache.\n{}').format(
+                        self._cache_path, err))
+                self._cache = {}
+            except pickle.UnpicklingError as err:
+                logger.warning(('Cannot unpickle cache {}, cache may be using '
+                    'an incompatible protocol (see pelican caching docs). '
+                    'Proceeding with empty cache.\n{}').format(
                         self._cache_path, err))
                 self._cache = {}
         else:
@@ -596,7 +602,7 @@ class FileDataCacher(object):
         '''Save the updated cache'''
         if self._cache_data_policy:
             try:
-                mkdir_p(self.settings['CACHE_DIRECTORY'])
+                mkdir_p(self.settings['CACHE_PATH'])
                 with self._cache_open(self._cache_path, 'wb') as fhandle:
                     pickle.dump(self._cache, fhandle)
             except (IOError, OSError, pickle.PicklingError) as err:

From cd40105c40285d0faec7c63200df86bf4d609cc7 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Mon, 28 Apr 2014 20:43:19 +0200
Subject: [PATCH 1613/2864] Fix #1335 remove old and unmaintained French docs

Unfortunately nobody keeps them up to date, they would just spread
confusion.
---
 docs/fr/astuces.rst            |  20 ----
 docs/fr/bases.rst              |  58 -----------
 docs/fr/configuration.rst      | 165 -------------------------------
 docs/fr/conventions.rst        |  18 ----
 docs/fr/faq.rst                |  40 --------
 docs/fr/index.rst              |  57 -----------
 docs/fr/installation.rst       |  67 -------------
 docs/fr/parametres_article.rst | 106 --------------------
 docs/fr/pelican-themes.rst     | 172 ---------------------------------
 docs/fr/themes.rst             | 171 --------------------------------
 docs/index.rst                 |   2 -
 11 files changed, 876 deletions(-)
 delete mode 100644 docs/fr/astuces.rst
 delete mode 100644 docs/fr/bases.rst
 delete mode 100644 docs/fr/configuration.rst
 delete mode 100644 docs/fr/conventions.rst
 delete mode 100644 docs/fr/faq.rst
 delete mode 100644 docs/fr/index.rst
 delete mode 100644 docs/fr/installation.rst
 delete mode 100644 docs/fr/parametres_article.rst
 delete mode 100644 docs/fr/pelican-themes.rst
 delete mode 100644 docs/fr/themes.rst

diff --git a/docs/fr/astuces.rst b/docs/fr/astuces.rst
deleted file mode 100644
index 3f9a3987..00000000
--- a/docs/fr/astuces.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-Trucs et astuces pour Pelican
-#############################
-
-Personnaliser l'url d'un article pour Pelican
-=============================================
-
-Par défaut, quand vous créez un article ayant pour titre *Mon article pour Pelican*,
-l'url par défaut devient *mon-article-pour-pelican.html*. Cependant, il est possible 
-de modifier cela en utilisant la technique utilisée pour les traductions d'article,
-c'est à dire le paramètre *:slug:* ::
-
-	Mon article pour Pelican
-	########################
-
-	:date: 2011-01-31 11:05
-	:slug: super-article-pour-pelican
-
-	bla, bla, bla …
-
-En prenant cet exemple ci dessus, votre url deviendra *super-article-pour-pelican.html*
diff --git a/docs/fr/bases.rst b/docs/fr/bases.rst
deleted file mode 100644
index 7a6fd118..00000000
--- a/docs/fr/bases.rst
+++ /dev/null
@@ -1,58 +0,0 @@
-Les bases de Pelican
-####################
-
-Créer son premier article
-=========================
-
-Pour créer notre premier article, nous allons éditer un fichier, par exemple premier_article.rst ::
-
-	Premier article pour Pelican
-	############################
-	:author: Guillaume
-	:date: 2011-01-08 10:20
-	:category: GNU-Linux
-	:tags: tutoriel, git
-	Ceci est un tutoriel pour configurer git.
-	Bla, bla, bla ....
-
-Maintenant que ce fichier est créé, on va lancer la création du blog ::
-
-	pelican .
-
-Vous aller obtenir une sortie comme celle ci — $PATH représente le dossier où vous
-avez créé votre article ::
-
-	[ok] writing $PATH/output/feeds/all.atom.xml
-	[ok] writing $PATH/output/feeds/GNU/Linux.atom.xml
-	[ok] writing $PATH/output/feeds/all-en.atom.xml
-	[ok] writing $PATH/output/premier-article-pour-pelican.html
-	[ok] writing $PATH/output/index.html
-	[ok] writing $PATH/output/tags.html
-	[ok] writing $PATH/output/categories.html
-	[ok] writing $PATH/output/archives.html
-	[ok] writing $PATH/output/tag/tutoriel.html
-	[ok] writing $PATH/output/tag/git.html
-	[ok] writing $PATH/output/category/GNU-Linux.html
-
-
-Première analyse
-================
-
-Nous allons décortiquer un peu tout ça ensemble.
-
-* Un dossier output/ a été créé pour y mettre le fichiers xml et html du blog.
-* Dans le dossier feeds/, nous retrouvons les différents flux de syndication.
-* Le fichier de l’article et la page principale du blog a été généré.
-* Le répertoire tag/ propose une page par tag.
-* La page correspondant à la catégorie est générée dans le répertoire category/
-
-Si vous ouvrez le fichier index.html — ou un autre — avec votre navigateur, vous
-remarquerez que :
-
-* Le thème utilisé par défaut est notmyidea
-* Le nom du blog est A Pelican Blog.
-  
-Bien évidemment, il y a des paramètres de base que l’on peut modifier pour mettre
-un peu tout ça à sa sauce. C’est ce que nous allons voir au travers du fichier de configuration.
-
-
diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
deleted file mode 100644
index 5388dae3..00000000
--- a/docs/fr/configuration.rst
+++ /dev/null
@@ -1,165 +0,0 @@
-Fichier de configuration
-************************
-
-On va créer un fichier de configuration que l’on va appeler **settings.py**. On peut
-utiliser Pelican sans faire ce fichier, mais il faudrait à chaque fois passer les paramètres
-en ligne de commande. Et comme il va nous servir à faire d’autres choses bien utile,
-autant l’appréhender de suite. Cependant, nous n’allons voir que la base pour l’instant.
-
-Paramètres de base
-==================
-
-AUTHOR :
-	Désigne l’auteur par défaut ;
-
-DEFAULT_CATEGORY :
-        La catégorie par défaut des articles. Si ce paramètre n’est
-	pas documenté, il prendra la valeur misc — pour miscellaneous (divers en français) ;
-
-SITENAME :
-	Le nom de votre site ;
-
-OUTPUT_PATH : 
-	Le répertoire de sortie du blog.
-
-Quand je dis qu’on va faire simple, on fait simple !
-Passons donc à ce quoi doit ressembler le fichier de configuration ::
-
-	# -*- coding: utf-8 -*-
-	AUTHOR = "Guillaume"
-	DEFAULT_CATEGORY = "GNU-Linux"
-	SITENAME = "Free Culture"
-
-
-Si vous avez un serveur comme Apache de configuré pour votre machine, vous
-pouvez paramétrer le répertoire de sortie vers **/var/www/blog** par exemple ::
-
-	OUTPUT_PATH = "/var/www/blog"
-
-Une remarque importante. Si vous avez besoin de passer un caractère accentué, il
-faut le préciser que la chaine est en unicode en faisant par exemple
-*AUTHOR = u"Guillaume LAMÉ"*
-
-Pour bien vérifier que les paramètres sont bien pris en compte, nous allons enlever les lignes *:author: Guillaume* et *:category: GNU-Linux* de notre fichier
-**premier_article.rst** et regénérer le blog.
-
-Rafraichissez votre page, ce devrait être bon.
-
-Nous allons maintenant passer en revue les différents paramètres de Pelican. Je les
-ai regroupé par thème. Cependant, c’est surtout un listing avant de rentrer dans les
-détails au prochain chapitre.
-
-Flux de syndication
-===================
-
-CATEGORY_FEED_ATOM :
-	Chemin d’écriture des flux Atom liés aux catégories ;
-
-CATEGORY_FEED_RSS : 
-	Idem pour les flux rss (Optionnel);
-
-FEED_ATOM :
-	Chemin du flux Atom global;
-
-FEED_RSS :
-	Chemin du flux Rss global (Optionnel);
-
-FEED_ALL_ATOM :
-	Chemin du flux Atom global qui inclut la totalité des posts, indépendamment de la langue;
-
-FEED_ALL_RSS :
-	Chemin du flux Rss global  qui inclut la totalité des posts, indépendamment de la langue (Optionnel);
-
-TAG_FEED_ATOM :
-	Chemin des flux Atom pour les tags (Optionnel);
-
-TAG_FEED_RSS :
-	Chemin des flux Rss pour les tags (Optionnel).
-
-
-Traductions
-===========
-
-DEFAULT_LANG :
-	Le langage par défaut à utiliser. «*en*» par défaut ;
-
-TRANSLATION_FEED_ATOM :
-	Chemin du flux Atom pour les traductions.
-
-TRANSLATION_FEED_RSS :
-	Chemin du flux RSS pour les traductions.
-
-
-Thèmes
-======
-
-CSS_FILE :
-	Fichier css à utiliser si celui-ci est différent du fichier par défaut (*main.css*) ;
-
-DISPLAY_PAGES_ON_MENU :
-	Affiche ou non les pages statiques sur le menu du thème ; 
-
-DISQUS_SITENAME :
-	Indiquer le nom du site spécifié sur Disqus ;
-
-GITHUB_URL :
-	Indiquez votre url Github ;
-
-GOOGLE_ANALYTICS :
-	'UA-XXXX-YYYY' pour activer Google analytics ;
-	
-GOSQUARED_SITENAME :
-	'XXX-YYYYYY-X' pour activer GoSquared ;
-
-JINJA_EXTENSIONS :
-	Liste d'extension Jinja2 que vous souhaitez utiliser ;
-
-LINKS :
-	Une liste de tuples (Titre, url) pour afficher la liste de lien ;
-
-PDF_PROCESSOR :
-	Génère ou non les articles et pages au format pdf ;
-
-NEWEST_FIRST_ARCHIVES :
-	Met les articles plus récent en tête de l'archive ;
-
-SOCIAL :
-	Une liste de tuples (Titre, url) pour afficher la liste de lien dans la section "Social" ;
-
-STATIC_THEME_PATHS :
-	Répertoire du thème que vous souhaitez importer dans l'arborescence finale ;
- 
-THEME :
-	Thème à utiliser:
-
-TWITTER_USERNAME :
-	Permet d'afficher un bouton permettant le tweet des articles. 
-
-Pelican est fournit avec :doc:`pelican-themes`, un script permettant de gérer les thèmes
-
-
-
-Paramètres divers
-=================
-
-DEFAULT_DATE:
-    Date par défaut à utiliser si l'information de date n'est pas spécifiée
-    dans les metadonnées de l'article.
-    Si 'fs', Pelican se basera sur le *mtime* du fichier.
-    Si c'est un tuple, il sera passé au constructeur datetime.datetime pour
-    générer l'objet datetime utilisé par défaut.
-
-KEEP_OUTPUT DIRECTORY :
-	Ne génère que les fichiers modifiés et n'efface pas le repertoire de sortie ;
-
-MARKUP :
-	Langage de balisage à utiliser ;
-
-PATH :
-	Répertoire à suivre pour les fichiers inclus ;
-
-SITEURL :
-	URL de base de votre site ;
-
-STATIC_PATHS :
-	Les chemins statiques que vous voulez avoir accès sur le chemin de sortie "statique" ;
diff --git a/docs/fr/conventions.rst b/docs/fr/conventions.rst
deleted file mode 100644
index bf88c07e..00000000
--- a/docs/fr/conventions.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-Conventions
-###########
-
-Environnement de test
-=====================
-
-Les exemples sont basées sur une distribution Debian. Pour les autres distributions,
-il y aura des ajustements à faire, notamment pour l’installation de Pelican. Les
-noms des paquets peuvent changer.
-
-Conventions typographiques
-==========================
-
-Un petit rappel concernant les codes sources.
-
- *  $ correspond à une ligne à exécuter en tant qu’utilisateur courant du systême ;
- * # correspond à une ligne à exécuter en tant que root ;
- * **settings.py** : Les noms des répertoires et fichiers sont en gras.
diff --git a/docs/fr/faq.rst b/docs/fr/faq.rst
deleted file mode 100644
index d945f447..00000000
--- a/docs/fr/faq.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-Foire aux questions (FAQ)
-#########################
-
-Voici un résumé des questions fréquemment posées pour pelican.
-
-Est-il obligatoire d'avoir un fichier de configuration ?
-========================================================
-
-Non. Les fichiers de configuration sont juste un moyen facile de configurer
-pelican. Pour les opérations de base, il est possible de spécifier des
-options
-en invoquant pelican avec la ligne de commande (voir pelican --help pour
-plus
-d'informations à ce sujet)
-
-Je crée mon propre thème, comment utiliser pygments?
-====================================================
-
-Pygment ajoute quelques classes au contenu généré, de sorte qua colorisation
-de votre thème se fait grâce à un fichier css. Vous pouvez jeter un oeil à
-celui proposé par`sur le site du projet <http://pygments.org/demo/15101/>`_
-
-Comment puis-je créer mon propre thèm
-=====================================
-
-Vueillez vous référer à :ref:`theming-pelican-fr`.
-
-Comment puis-je aider?
-======================
-
-Vous avez plusieurs options pour aider. Tout d'abord, vous pouvez utiliser
-le
-pélican, et signaler toute idée ou problème que vous avez sur le bugtracker
-.
-
-Si vous voulez contribuer, jeter un oeil au dépôt git , ajoutez vos
-modifications et faites une demande, je les regarderai dès que possible
-
-Vous pouvez aussi contribuer en créant des thèmes, et/ou compléter la
-documentation.
diff --git a/docs/fr/index.rst b/docs/fr/index.rst
deleted file mode 100644
index 2deb5050..00000000
--- a/docs/fr/index.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-Pelican
-#######
-
-Pelican est un generateur de blog simple codé en python
-
-* Écrivez vos articles directement dans votre éditeur favori (vim !) et
-  directement en syntaxe reStructuredText ou Markdown ;
-* Un outil simple en ligne de conmmande pour (re)générer le blog ;
-* Sortie complètement statique, facile pour l'héberger n'importe où ;
-
-Fonctionnalités
-===============
-
-Pelican supporte actuellement :
-
-* des articles de blog ;
-* des pages statiques ;
-* les commentaires via un service externe (`disqus <http://disqus.com>`_)
-  Notez qu'étant bien un service externe assez pratique, vous ne gérez pas
-  vous même les commentaires. Ce qui pourrait occasionner une perte de vos données;
-* support de template (les templates sont crées avec `jinja2 <http://jinjna.pocoo.org>`_) ;
-* génération optionnelle de vos pages et articles en pdf.
-
-Pourquoi le nom "Pelican" ?
-============================
-
-Vous n'avez pas remarqué ? "Pelican" est un anagramme pour "Calepin"  ;)
-
-Code source
-===========
-
-Vous pouvez accéder au code source via git à l'adresse 
-http://github.com/getpelican/pelican/
-
-Feedback !
-==========
-
-Si vous voulez de nouvelles fonctionnalitées pour Pelican, n'hésitez pas à nous le dire,
-à cloner le dépôt, etc … C'est open source !!!
-
-Contactez Alexis à "alexis at notmyidea dot org" pour quelques requêtes ou retour d'expérience que ce soi !
-
-Documentation
-=============
-
-.. toctree::
-   :maxdepth: 2
-   
-   conventions
-   installation
-   bases
-   configuration
-   themes
-   parametres_article
-   astuces
-   faq
-   pelican-themes
diff --git a/docs/fr/installation.rst b/docs/fr/installation.rst
deleted file mode 100644
index da327725..00000000
--- a/docs/fr/installation.rst
+++ /dev/null
@@ -1,67 +0,0 @@
-Installation et mise à jour de Pelican
-######################################
-
-Installation
-============
-
-Il y a deux façons d’installer Pelican sur son système. La première est via l’utilitaire
-pip, l’autre façon est de télécharger Pelican via Github. Ici nous allons voir les deux
-façons de procéder.
-
-Via pip
--------
-
-Pour installer Pelican via pip, vous aurez besoin du paquet python-pip. puis installez Pelican ::
-
-	# apt-get install python-pip
-	# pip install pelican
-
-
-Via Github
-----------
-
-Pour installer Pelican en reprenant le code via Github, nous aurons besoin du paquet 
-git-core pour récupérez les sources de Pelican. Puis nous procédons à l’installation ::
-
-	# apt-get install git-core
-	$ git clone https://github.com/getpelican/pelican.git
-	$ cd pelican
-	# python setup.py install
-
-Mises à jour
-============
-
-Via pip
--------
-
-Rien de bien compliqué pour mettre à jour via pip ::
-
-	$ cd votreRepertoireSource
-	$ pip install --upgrade pelican
-
-
-Via Github
-----------
-
-C'est un peu plus long avec Github par contre ::
-
-	$ cd votreRepertoireSource
-	$ git pull origin master
-	$ cd pelican
-	# python setup.py install
-
-Vous aurez un message d’erreur si le module setuptools de python n’est pas installé. 
-La manipulation est la suivante ::
-
-	# apt-get install python-setuptools
-
-Alors, quelle méthode choisir ?
-===============================
-
-Vous avez le choix entre deux méthodes, mais aussi entre deux concepts. La méthode 
-de Github est la version de développement, où les modifications arrivent assez
-fréquemment sans être testées à fond. La version de pip est une version arrêtée avec un
-numéro de version dans laquelle vous aurez moins de bug. N’oubliez cependant pas
-que le projet est très jeune et manque donc de maturité. Si vous aimez avoir les toutes
-dernières versions utilisez Github, sinon penchez vous sur pip.
-
diff --git a/docs/fr/parametres_article.rst b/docs/fr/parametres_article.rst
deleted file mode 100644
index a3d25b55..00000000
--- a/docs/fr/parametres_article.rst
+++ /dev/null
@@ -1,106 +0,0 @@
-Les paramètres des articles dans Pelican
-########################################
-
-Les catégories
-==============
-
-Nous avons vu que pour affecter un article à une catégorie, nous avions le paramètre *:category:*.
-Il y a cependant plus simple, affecter un répertoire à une catégorie. 
-  
-Dans le répertoire ou vous avez vos articles, créez le repertoire **GNU-Linux** et déplacez y le fichier
-**premier_article.rst**. Bien évidemment nous ne verront pas la différence, car jusqu'ici *GNU-Linux*
-est notre catégorie par défaut.
-  
-Nous allons faire un autre exemple d'article avec la catégorie Pelican. Créez le répertoire **Pelican**
-et collez cette exemple d'article ::
-
-	Préparation de la documentation
-	###############################
-
-	:date: 2011-01-27 15:28
-	:tags: documentation
-	
-	Il y a quand même pas mal de boulot pour faire une documentation !
-
-Et lancez la compilation du blog. Vous voyez que la catégorie est affectée automatiquement. 
-
-Les tags
-========
-
-Pour les tags, il n'y a rien de compliqué. il suffit de mettre le(s) tags séparés si besoin d'une virgule. ::
-
-	Préparation de la documentation
-	###############################
-
-	:date: 2011-01-27 15:28
-	:tags: documentation, pelican
-
-Par contre, par soucis de clarté au niveau des url je vous conseille de mettre les expression de plusieurs 
-mots séparées par des tirets ::
-
-	:tags: mise-a-jour
-
-et non ::
-
-	:tags: mise a jour
-
-
-Les auteurs
-===========
-
-Par défaut, vous pouvez indiqué votre nom en tant qu'auteur dans le fichier de configuration.
-S'il y a plusieurs auteurs pour le site, vous pouvez le définir manuellement dans
-l'article avec la méta-donnée ::
-
-	:author: Guillaume
-
-La date
-=======
-
-La date se met au format anglophone : **YYYY-MM-DD hh:mm** ::
-
-	:date: 2011-01-31 14:12
-
-
-Les traductions
-===============
-
-Pelican permet de générer un blog multilingue assez facilement. Pour cela nous devons :
-
-* Définir la langue de base du blog ;
-* Donner une référence à l'article initial ;
-* Définir la langue du fichier traduit et y reporter la référence.
-
-Pour définir la langue de base nous allons modifier le fichier **settings.py** et y rajouter la ligne suivante ::
-
-	DEFAULT_LANG = "fr"
-
-Puis ajouter la référence dans notre article d'origine qui deviendra ::
-
-	Préparation de la documentation
-        ###############################
-
-        :date: 2011-01-27 15:28
-        :tags: documentation
-	:slug: preparation-de-la-documentation
-
-        Il y a quand même pas mal de boulot pour faire une documentation !
-
-Nous n'avons plus qu'à créer l'article en anglais ::
-
-	Start of documentation
-	######################
-
-	:slug: preparation-de-la-documention
-	:lang: en
-
-	There are still a lot of work to documentation !
-
-**Il est important de comprendre que la valeur de :slug: deviendra votre url. Ne mettez donc pas un diminutif pour 
-identifier l'article**
-
-Rien de plus à savoir pour traduire efficacement des articles.	
-
-
-Maintenant que vous avez toutes les clés en main pour créer un article, nous allons passer à la personnalisation 
-du fichier de configuration.
diff --git a/docs/fr/pelican-themes.rst b/docs/fr/pelican-themes.rst
deleted file mode 100644
index 810fa785..00000000
--- a/docs/fr/pelican-themes.rst
+++ /dev/null
@@ -1,172 +0,0 @@
-pelican-themes
-##############
-
-
-
-Description
-===========
-
-``pelican-themes`` est un outil en lignes de commandes pour gérer les thèmes de Pelican.
-
-
-Utilisation:
-""""""""""""
-
-| pelican-themes [-h] [-l] [-i *chemin d'un thème* [*chemin d'un thème* ...]]
-|                      [-r *nom d'un thème* [*nom d'un thème* ...]]
-|                      [-s *chemin d'un thème* [*chemin d'un thème* ...]] [-v] [--version]
-
-Arguments:
-""""""""""
-
-
--h, --help                      Afficher l'aide et quitter 
-
--l, --list                      Montrer les thèmes installés
-
--i chemin, --install chemin     Chemin(s) d'accès d'un ou plusieurs thème à installer
-
--r nom, --remove nom            Noms d'un ou plusieurs thèmes à installer
-
--s chemin, --symlink chemin     Fonctionne de la même façon que l'option ``--install``, mais crée un lien symbolique au lieu d'effectuer une copie du thème vers le répertoire des thèmes.
-                                Utile pour le développement de thèmes.
-
--v, --verbose                   Sortie détaillée 
-
---version                       Affiche la version du script et quitte
-
-
-
-Exemples
-========
-
-
-Lister les thèmes installés
-"""""""""""""""""""""""""""
-
-``pelican-themes`` peut afficher les thèmes disponibles.
-
-Pour cela, vous pouvez utiliser l'option ``-l`` ou ``--list``, comme ceci:
-
-.. code-block:: console
-
-    $ pelican-themes -l
-    notmyidea
-    two-column@
-    simple
-    $ pelican-themes --list
-    notmyidea
-    two-column@
-    simple
-
-Dans cet exemple, nous voyons qu'il y a trois thèmes d'installés: ``notmyidea``, ``simple`` and ``two-column``.
-
-``two-column`` est suivi d'un ``@`` par ce que c'est un lien symbolique (voir `Créer des liens symboliques`_).
-
-Notez que vous pouvez combiner l'option ``--list`` avec l'option ``--verbose``, pour afficher plus de détails:
-
-.. code-block:: console
-    
-    $ pelican-themes -v -l
-    /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/notmyidea
-    /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/two-column (symbolic link to `/home/skami/Dev/Python/pelican-themes/two-column')
-    /usr/local/lib/python2.6/dist-packages/pelican-2.6.0-py2.6.egg/pelican/themes/simple
-
-
-Installer des thèmes
-""""""""""""""""""""
-
-Vous pouvez installer un ou plusieurs thèmes en utilisant l'option ``-i`` ou ``--install``.
-
-Cette option prends en argument le(s) chemin(s) d'accès du ou des thème(s) que vous voulez installer, et peut se combiner avec l'option ``--verbose``:
-
-.. code-block:: console
-
-    # pelican-themes --install ~/Dev/Python/pelican-themes/notmyidea-cms --verbose
-
-.. code-block:: console
-
-    # pelican-themes --install ~/Dev/Python/pelican-themes/notmyidea-cms\
-                               ~/Dev/Python/pelican-themes/martyalchin \
-                               --verbose
-
-.. code-block:: console
-
-    # pelican-themes -vi ~/Dev/Python/pelican-themes/two-column
-
-
-Supprimer des thèmes
-""""""""""""""""""""
-
-``pelican-themes`` peut aussi supprimer des thèmes précédemment installés grâce à l'option ``-r`` ou ``--remove``.
-
-Cette option prends en argument le ou les nom(s) des thèmes que vous voulez installer, et peux se combiner avec l'option ``--verbose``:
-
-.. code-block:: console
-
-    # pelican-themes --remove two-column
-
-.. code-block:: console
-
-    # pelican-themes -r martyachin notmyidea-cmd -v
-
-
-
-
-
-Créer des liens symboliques
-"""""""""""""""""""""""""""
-
-
-L'option ``-s`` ou ``--symlink`` de ``pelican-themes`` permet de lier symboliquement un thème.
-
-Cette option s'utilise exactement comme l'option ``--install``:
-
-.. code-block:: console
-    
-    # pelican-themes --symlink ~/Dev/Python/pelican-themes/two-column
-
-Dans l'exemple ci dessus, un lien symbolique pointant vers le thème ``two-column`` a été installé dans le répertoire des thèmes de Pelican, toute modification sur le thème ``two-column`` prendra donc effet immédiatement.
-
-Cela peut être pratique pour le développement de thèmes
-
-.. code-block:: console
-
-    $ sudo pelican-themes -s ~/Dev/Python/pelican-themes/two-column
-    $ pelican ~/Blog/content -o /tmp/out -t two-column
-    $ firefox /tmp/out/index.html
-    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/static/css/main.css 
-    $ pelican ~/Blog/content -o /tmp/out -t two-column
-    $ cp /tmp/bg.png ~/Dev/Pelican/pelican-themes/two-coumn/static/img/bg.png
-    $ pelican ~/Blog/content -o /tmp/out -t two-column
-    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/templates/index.html 
-    $ pelican ~/Blog/content -o /tmp/out -t two-column
-
-
-Notez que cette fonctionnalité nécessite d'avoir un système d'exploitation et un système de fichiers supportant les liens symboliques, elle n'est donc pas disponible sous Micro$oft®©™ Fenêtre®©™. 
-
-Faire plusieurs choses à la fois
-""""""""""""""""""""""""""""""""
-
-
-Les options ``--install``, ``--remove`` et ``--symlink`` peuvent être employées en même temps, ce qui permets de réaliser plusieurs opérations en même temps:
-
-.. code-block:: console
-
-    # pelican-themes --remove notmyidea-cms two-column \
-                     --install ~/Dev/Python/pelican-themes/notmyidea-cms-fr \
-                     --symlink ~/Dev/Python/pelican-themes/two-column \
-                     --verbose
-
-Dans cette exemple, le thème ``notmyidea-cms`` sera remplacé par le thème ``notmyidea-cms-fr`` et le thème ``two-column`` sera lié symboliquement...
-
-
-
-À voir également
-================
-
--   http://docs.notmyidea.org/alexis/pelican/
--   ``/usr/share/doc/pelican/`` si vous avez installé Pelican par le `dépôt APT <http://skami18.github.com/pelican-packages/>`_
-
-
-
diff --git a/docs/fr/themes.rst b/docs/fr/themes.rst
deleted file mode 100644
index 20d9d41f..00000000
--- a/docs/fr/themes.rst
+++ /dev/null
@@ -1,171 +0,0 @@
-.. _theming-pelican:
-
-Cette page est une traduction de la documentation originale, en anglais et
-disponible `ici <../themes.html>`_.
-
-Comment créer des thèmes pour Pelican
-#####################################
-
-Pelican utlise le très bon moteur de template `jinja2 <http://jinja.pocoo.org>`_
-pour produire de l'HTML. La syntaxe de jinja2 est vraiment très simple. Si vous
-voulez créer votre propre thème, soyez libre de prendre inspiration sur le theme
-"simple" qui est disponible `ici
-<https://github.com/getpelican/pelican/tree/master/pelican/themes/simple/templates>`_
-
-Structure
-=========
-
-Pour réaliser votre propre thème vous devez respecter la structure suivante ::
-
-    ├── static
-    │   ├── css
-    │   └── images
-    └── templates
-        ├── archives.html    // pour afficher les archives
-        ├── article.html     // généré pour chaque article
-        ├── categories.html  // doit lister toutes les catégories
-        ├── category.html    // généré pour chaque catégorie
-        ├── index.html       // la page d'index, affiche tous les articles
-        ├── page.html        // généré pour chaque page
-        ├── tag.html         // généré pour chaque tag
-        └── tags.html        // doit lister tous les tags. Peut être un nuage de tag.
-
-
-* `static` contient tout le contenu statique. Il sera copié dans le dossier
-  `theme/static`. J'ai mis un dossier css et un image, mais ce sont juste des
-  exemples. Mettez ce dont vous avez besoin ici.
-
-* `templates` contient tous les templates qui vont être utiliser pour générer les
-  pages. J'ai juste mis les templates obligatoires ici, vous pouvez définir les
-  vôtres si cela vous aide à vous organiser pendant que vous réaliser le thème.
-  Vous pouvez par exemple utiliser les directives {% include %} et {% extends %}
-  de jinja2.
- 
-Templates et variables
-======================
-
-Cela utilise une syntaxe simple, que vous pouvez insérer dans vos pages HTML.
-Ce document décrit les templates qui doivent exister dans un thème, et quelles
-variables seront passées à chaque template, au moment de le générer.
-
-Tous les templates recevront les variables définies dans votre fichier de
-configuration, si elles sont en capitales. Vous pouvez y accéder directement.
-
-Variables communes
-------------------
-
-Toutes ces variables seront passées à chaque template.
-
-=============   ===================================================
-Variable        Description
-=============   ===================================================
-articles        C'est la liste des articles, ordonnée décroissante
-                par date. Tous les éléments de la liste sont des
-                objets `Article`, vous pouvez donc accéder à leurs
-                propriétés (exemple : title, summary, author, etc).
-dates           La même liste d'articles, ordonnée croissante par
-                date.
-tags            Un dictionnaire contenant tous les tags (clés), et
-                la liste des articles correspondants à chacun
-                d'entre eux (valeur).
-categories      Un dictionnaire contenant toutes les catégories
-                (clés), et la liste des articles correspondants à
-                chacune d'entre elles (valeur).
-pages           La liste des pages.
-=============   ===================================================
-
-index.html
-----------
-
-La page d'accueil de votre blog, sera générée dans output/index.html.
-
-Si la pagination est activée, les pages suivantes seront à l'adresse
-output/index`n`.html.
-
-===================     ===================================================
-Variable                Description
-===================     ===================================================
-articles_paginator      Un objet paginator de la liste d'articles.
-articles_page           La page actuelle d'articles.
-dates_paginator         Un objet paginator de la liste d'articles, ordonné
-                        par date croissante.
-dates_pages             La page actuelle d'articles, ordonnée par date
-                        croissante.
-page_name               'index'.
-===================     ===================================================
-
-category.html
--------------
-
-Ce template sera généré pour chaque catégorie existante, et se retrouvera
-finalement à output/category/`nom de la catégorie`.html.
-
-Si la pagination est activée, les pages suivantes seront disponibles à
-l'adresse output/category/`nom de la catégorie``n`.html.
-
-===================     ===================================================
-Variable                Description
-===================     ===================================================
-category                La catégorie qui est en train d'être générée.
-articles                Les articles dans cette catégorie.
-dates                   Les articles dans cette catégorie, ordonnés par
-                        date croissante.
-articles_paginator      Un objet paginator de la liste d'articles.
-articles_page           La page actuelle d'articles.
-dates_paginator         Un objet paginator de la liste d'articles, ordonné
-                        par date croissante.
-dates_pages             La page actuelle d'articles, ordonnée par date
-                        croissante.
-page_name               'category/`nom de la catégorie`'.
-===================     ===================================================
-
-article.html
--------------
-
-Ce template sera généré pour chaque article. Les fichiers .html seront
-disponibles à output/`nom de l'article`.html.
-
-=============   ===================================================
-Variable        Description
-=============   ===================================================
-article         L'objet article à afficher.
-category        Le nom de la catégorie de l'article actuel.
-=============   ===================================================
-
-page.html
----------
-
-Pour chaque page ce template sera généré à l'adresse
-output/`nom de la page`.html
-
-=============   ===================================================
-Variable        Description
-=============   ===================================================
-page            L'objet page à afficher. Vous pouvez accéder à son
-                titre (title), slug, et son contenu (content).
-=============   ===================================================
-
-tag.html
---------
-
-Ce template sera généré pour chaque tag. Cela créera des fichiers .html à
-l'adresse output/tag/`nom du tag`.html.
-
-Si la pagination est activée, les pages suivantes seront disponibles à
-l'adresse output/tag/`nom du tag``n`.html
-
-===================     ===================================================
-Variable                Description
-===================     ===================================================
-tag                     Nom du tag à afficher.
-articles                Une liste des articles contenant ce tag.
-dates                   Une liste des articles contenant ce tag, ordonnée
-                        par date croissante.
-articles_paginator      Un objet paginator de la liste d'articles.
-articles_page           La page actuelle d'articles.
-dates_paginator         Un objet paginator de la liste d'articles, ordonné
-                        par date croissante.
-dates_pages             La page actuelle d'articles, ordonnée par date
-                        croissante.
-page_name               'tag/`nom du tag`'.
-===================     ===================================================
diff --git a/docs/index.rst b/docs/index.rst
index c2deb6de..aa30b1f0 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -63,8 +63,6 @@ someone will almost always respond to your inquiry.
 Documentation
 -------------
 
-A French version of the documentation is available at :doc:`fr/index`.
-
 .. toctree::
    :maxdepth: 2
 

From 9a753f4fa97c6b086ba8129043b00d1fba55290e Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Fri, 9 May 2014 18:14:24 +0200
Subject: [PATCH 1614/2864] Fix intrasite links substitions in content

The Content.__eq__ method would indirectly call _update_content too
soon, resulting in failed intrasite links substitution
This effectively reverts fd779267000ac539ee0a9ba5856d103fbbc7cd7c
for pelican/contents.py, it was unnecessary anyways.
Thanks to Strom for finding this.
---
 pelican/contents.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index c02047b8..615a7fd8 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -325,13 +325,6 @@ class Content(object):
             os.path.abspath(self.settings['PATH']))
         )
 
-    def __eq__(self, other):
-        """Compare with metadata and content of other Content object"""
-        return other and self.metadata == other.metadata and self.content == other.content
-
-    # keep basic hashing functionality for caching to work
-    __hash__ = object.__hash__
-
 
 class Page(Content):
     mandatory_properties = ('title',)

From 7cbf750329b6b6d42cfcca12449d6e6419fbf2fa Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Sat, 10 May 2014 17:38:58 +0200
Subject: [PATCH 1615/2864] Fix typo in command-line option description.

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index d6417391..e9fef163 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -265,7 +265,7 @@ def parse_arguments():
 
     parser.add_argument('-D', '--debug', action='store_const',
                         const=logging.DEBUG, dest='verbosity',
-                        help='Show all message, including debug messages.')
+                        help='Show all messages, including debug messages.')
 
     parser.add_argument('--version', action='version', version=__version__,
                         help='Print the pelican version and exit.')

From 7313d327fb21fbdaa4c39819db6297f4cd635b2c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 11 May 2014 18:14:58 -0700
Subject: [PATCH 1616/2864] Prepare for splitting up Getting Started docs

---
 docs/{getting_started.rst => content.rst} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/{getting_started.rst => content.rst} (100%)

diff --git a/docs/getting_started.rst b/docs/content.rst
similarity index 100%
rename from docs/getting_started.rst
rename to docs/content.rst

From 86e11c619d0208d9bc8418821c2e2a31e6f991ea Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 12 May 2014 07:48:37 -0700
Subject: [PATCH 1617/2864] Split Getting Started docs into separate sections

The "Getting Started" docs became overly long and unwieldy over time.
This splits it into separate sections, including:

* Quickstart
* Installation
* Writing content
* Publish your site
---
 docs/content.rst        | 307 ++--------------------------------------
 docs/faq.rst            |  12 +-
 docs/importer.rst       |   6 +-
 docs/index.rst          |  22 +--
 docs/install.rst        | 122 ++++++++++++++++
 docs/pelican-themes.rst |   9 --
 docs/publish.rst        | 174 +++++++++++++++++++++++
 docs/quickstart.rst     |  73 ++++++++++
 docs/settings.rst       |  10 +-
 docs/themes.rst         |  18 ++-
 10 files changed, 420 insertions(+), 333 deletions(-)
 create mode 100644 docs/install.rst
 create mode 100644 docs/publish.rst
 create mode 100644 docs/quickstart.rst

diff --git a/docs/content.rst b/docs/content.rst
index 8ee37162..24fc6e9b 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -1,289 +1,8 @@
-Getting started
+Writing content
 ###############
 
-Installing Pelican
-==================
-
-Pelican currently runs best on Python 2.7.x; earlier versions of Python are
-not supported. There is provisional support for Python 3.3, although there may
-be rough edges, particularly with regards to optional 3rd-party components.
-
-You can install Pelican via several different methods. The simplest is via
-`pip <http://www.pip-installer.org/>`_::
-
-    $ pip install pelican
-
-If you don't have ``pip`` installed, an alternative method is
-``easy_install``::
-
-    $ easy_install pelican
-
-(Keep in mind that operating systems will often require you to prefix the above
-commands with ``sudo`` in order to install Pelican system-wide.)
-
-While the above is the simplest method, the recommended approach is to create
-a virtual environment for Pelican via virtualenv_ before installing Pelican.
-Assuming you have virtualenv_ installed, you can then open a new terminal
-session and create a new virtual environment for Pelican::
-
-    $ virtualenv ~/virtualenvs/pelican
-    $ cd ~/virtualenvs/pelican
-    $ . bin/activate
-
-Once the virtual environment has been created and activated, Pelican can be
-be installed via ``pip install pelican`` as noted above. Alternatively, if
-you have the project source, you can install Pelican using the distutils
-method::
-
-    $ cd path-to-Pelican-source
-    $ python setup.py install
-
-If you have Git installed and prefer to install the latest bleeding-edge
-version of Pelican rather than a stable release, use the following command::
-
-    $ pip install -e git+https://github.com/getpelican/pelican.git#egg=pelican
-
-If you plan on using Markdown as a markup format, you'll need to install the
-Markdown library as well::
-
-    $ pip install Markdown
-
-If you want to use AsciiDoc_ you need to install it from `source
-<http://www.methods.co.nz/asciidoc/INSTALL.html>`_ or use your operating
-system's package manager.
-
-Basic usage
------------
-
-Once Pelican is installed, you can use it to convert your Markdown or reST
-content into HTML via the ``pelican`` command, specifying the path to your
-content and (optionally) the path to your settings file::
-
-$ pelican /path/to/your/content/ [-s path/to/your/settings.py]
-
-The above command will generate your site and save it in the ``output/``
-folder, using the default theme to produce a simple site. The default theme
-consists of very simple HTML without styling and is provided so folks may use
-it as a basis for creating their own themes.
-
-You can also tell Pelican to watch for your modifications, instead of
-manually re-running it every time you want to see your changes. To enable this,
-run the ``pelican`` command with the ``-r`` or ``--autoreload`` option.
-
-Pelican has other command-line switches available. Have a look at the help to
-see all the options you can use::
-
-    $ pelican --help
-
-Continue reading below for more detail, and check out the Pelican wiki's
-`Tutorials <https://github.com/getpelican/pelican/wiki/Tutorials>`_ page for
-links to community-published tutorials.
-
-Viewing the generated files
----------------------------
-
-The files generated by Pelican are static files, so you don't actually need
-anything special to view them. You can use your browser to open the generated
-HTML files directly::
-
-    firefox output/index.html
-
-Because the above method may have trouble locating your CSS and other linked
-assets, running a simple web server using Python will often provide a more
-reliable previewing experience::
-
-    cd output && python -m SimpleHTTPServer
-
-Once the ``SimpleHTTPServer`` has been started, you can preview your site at
-http://localhost:8000/
-
-Upgrading
----------
-
-If you installed a stable Pelican release via ``pip`` or ``easy_install`` and
-wish to upgrade to the latest stable release, you can do so by adding
-``--upgrade`` to the relevant command. For pip, that would be::
-
-    $ pip install --upgrade pelican
-
-If you installed Pelican via distutils or the bleeding-edge method, simply
-perform the same step to install the most recent version.
-
-Dependencies
-------------
-
-When Pelican is installed, the following dependent Python packages should be
-automatically installed without any action on your part:
-
-* `feedgenerator <http://pypi.python.org/pypi/feedgenerator>`_, to generate the
-  Atom feeds
-* `jinja2 <http://pypi.python.org/pypi/Jinja2>`_, for templating support
-* `pygments <http://pypi.python.org/pypi/Pygments>`_, for syntax highlighting
-* `docutils <http://pypi.python.org/pypi/docutils>`_, for supporting
-  reStructuredText as an input format
-* `pytz <http://pypi.python.org/pypi/pytz>`_, for timezone definitions
-* `blinker <http://pypi.python.org/pypi/blinker>`_, an object-to-object and
-  broadcast signaling system
-* `unidecode <http://pypi.python.org/pypi/Unidecode>`_, for ASCII
-  transliterations of Unicode text
-* `six <http://pypi.python.org/pypi/six>`_,  for Python 2 and 3 compatibility
-  utilities
-* `MarkupSafe <http://pypi.python.org/pypi/MarkupSafe>`_, for a markup safe
-  string implementation
-* `python-dateutil <https://pypi.python.org/pypi/python-dateutil>`_, to read
-  the date metadata
-
-If you want the following optional packages, you will need to install them
-manually via ``pip``:
-
-* `markdown <http://pypi.python.org/pypi/Markdown>`_, for supporting Markdown as
-  an input format
-* `typogrify <http://pypi.python.org/pypi/typogrify>`_, for
-  typographical enhancements
-
-Kickstart your site
-===================
-
-Once Pelican has been installed, you can create a skeleton project via the
-``pelican-quickstart`` command, which begins by asking some questions about
-your site::
-
-    $ pelican-quickstart
-
-Once you finish answering all the questions, your project will consist of the
-following hierarchy (except for "pages", which you can optionally add yourself
-if you plan to create non-chronological content)::
-
-    yourproject/
-    ├── content
-    │   └── (pages)
-    ├── output
-    ├── develop_server.sh
-    ├── fabfile.py
-    ├── Makefile
-    ├── pelicanconf.py       # Main settings file
-    └── publishconf.py       # Settings to use when ready to publish
-
-The next step is to begin to adding content to the *content* folder that has
-been created for you. (See the **Writing content using Pelican** section below
-for more information about how to format your content.)
-
-Once you have written some content to generate, you can use the ``pelican``
-command to generate your site, which will be placed in the output folder.
-
-Automation tools
-================
-
-While the ``pelican`` command is the canonical way to generate your site,
-automation tools can be used to streamline the generation and publication
-flow. One of the questions asked during the ``pelican-quickstart`` process
-described above pertains to whether you want to automate site generation and
-publication. If you answered "yes" to that question, a ``fabfile.py`` and
-``Makefile`` will be generated in the root of your project. These files,
-pre-populated with certain information gleaned from other answers provided
-during the ``pelican-quickstart`` process, are meant as a starting point and
-should be customized to fit your particular needs and usage patterns. If you
-find one or both of these automation tools to be of limited utility, these
-files can deleted at any time and will not affect usage of the canonical
-``pelican`` command.
-
-Following are automation tools that "wrap" the ``pelican`` command and can
-simplify the process of generating, previewing, and uploading your site.
-
-Fabric
-------
-
-The advantage of Fabric_ is that it is written in Python and thus can be used
-in a wide range of environments. The downside is that it must be installed
-separately. Use the following command to install Fabric, prefixing with
-``sudo`` if your environment requires it::
-
-    $ pip install Fabric
-
-Take a moment to open the ``fabfile.py`` file that was generated in your
-project root. You will see a number of commands, any one of which can be
-renamed, removed, and/or customized to your liking. Using the out-of-the-box
-configuration, you can generate your site via::
-
-    $ fab build
-
-If you'd prefer to have Pelican automatically regenerate your site every time a
-change is detected (which is handy when testing locally), use the following
-command instead::
-
-    $ fab regenerate
-
-To serve the generated site so it can be previewed in your browser at
-http://localhost:8000/::
-
-    $ fab serve
-
-If during the ``pelican-quickstart`` process you answered "yes" when asked
-whether you want to upload your site via SSH, you can use the following command
-to publish your site via rsync over SSH::
-
-    $ fab publish
-
-These are just a few of the commands available by default, so feel free to
-explore ``fabfile.py`` and see what other commands are available. More
-importantly, don't hesitate to customize ``fabfile.py`` to suit your specific
-needs and preferences.
-
-Make
-----
-
-A ``Makefile`` is also automatically created for you when you say "yes" to
-the relevant question during the ``pelican-quickstart`` process. The advantage
-of this method is that the ``make`` command is built into most POSIX systems
-and thus doesn't require installing anything else in order to use it. The
-downside is that non-POSIX systems (e.g., Windows) do not include ``make``,
-and installing it on those systems can be a non-trivial task.
-
-If you want to use ``make`` to generate your site, run::
-
-    $ make html
-
-If you'd prefer to have Pelican automatically regenerate your site every time a
-change is detected (which is handy when testing locally), use the following
-command instead::
-
-    $ make regenerate
-
-To serve the generated site so it can be previewed in your browser at
-http://localhost:8000/::
-
-    $ make serve
-
-Normally you would need to run ``make regenerate`` and ``make serve`` in two
-separate terminal sessions, but you can run both at once via::
-
-    $ make devserver
-
-The above command will simultaneously run Pelican in regeneration mode as well
-as serve the output at http://localhost:8000. Once you are done testing your
-changes, you should stop the development server via::
-
-    $ ./develop_server.sh stop
-
-When you're ready to publish your site, you can upload it via the method(s) you
-chose during the ``pelican-quickstart`` questionnaire. For this example, we'll
-use rsync over ssh::
-
-    $ make rsync_upload
-
-That's it! Your site should now be live.
-
-(The default ``Makefile`` and ``devserver.sh`` scripts use the ``python`` and
-``pelican`` executables to complete its tasks. If you want to use different
-executables, such as ``python3``, you can set the ``PY`` and ``PELICAN``
-environment variables, respectively, to override the default executable names.)
-
-
-Writing content using Pelican
-=============================
-
 Articles and pages
-------------------
+==================
 
 Pelican considers "articles" to be chronological content, such as posts on a
 blog, and thus associated with a date.
@@ -295,7 +14,7 @@ pages).
 .. _internal_metadata:
 
 File metadata
--------------
+=============
 
 Pelican tries to be smart enough to get the information it needs from the
 file system (for instance, about the category of your articles), but some
@@ -400,7 +119,7 @@ Please note that the metadata available inside your files takes precedence over
 the metadata extracted from the filename.
 
 Pages
------
+=====
 
 If you create a folder named ``pages`` inside the content folder, all the
 files in it will be used to generate static pages, such as **About** or
@@ -416,7 +135,7 @@ things like making error pages that fit the generated theme of your site.
 .. _ref-linking-to-internal-content:
 
 Linking to internal content
----------------------------
+===========================
 
 From Pelican 3.1 onwards, it is now possible to specify intra-site links to
 files in the *source content* hierarchy instead of files in the *generated*
@@ -494,14 +213,14 @@ curly braces (``{}``). For example: ``|filename|an_article.rst``,
 ``|tag|tagname``, ``|category|foobar``. The syntax was changed from ``||`` to
 ``{}`` to avoid collision with Markdown extensions or reST directives.
 
-Importing an existing blog
---------------------------
+Importing an existing site
+==========================
 
-It is possible to import your blog from Dotclear, WordPress, and RSS feeds using
-a simple script. See :ref:`import`.
+It is possible to import your site from WordPress, Tumblr, Dotclear, and RSS
+feeds using a simple script. See :ref:`import`.
 
 Translations
-------------
+============
 
 It is possible to translate articles. To do so, you need to add a ``lang`` meta
 attribute to your articles/pages and set a ``DEFAULT_LANG`` setting (which is
@@ -559,7 +278,7 @@ which posts are translations::
 .. _internal_pygments_options:
 
 Syntax highlighting
--------------------
+===================
 
 Pelican is able to provide colorized syntax highlighting for your code blocks.
 To do so, you have to use the following conventions inside your content files.
@@ -641,14 +360,12 @@ If specified, settings for individual code blocks will override the defaults in
 your settings file.
 
 Publishing drafts
------------------
+=================
 
 If you want to publish an article as a draft (for friends to review before
 publishing, for example), you can add a ``Status: draft`` attribute to its
 metadata. That article will then be output to the ``drafts`` folder and not
 listed on the index page nor on any category or tag page.
 
-.. _virtualenv: http://www.virtualenv.org/
 .. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
-.. _Fabric: http://fabfile.org/
 .. _AsciiDoc: http://www.methods.co.nz/asciidoc/
diff --git a/docs/faq.rst b/docs/faq.rst
index bf468c51..3a5cfec5 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -65,9 +65,11 @@ How do I create my own theme?
 
 Please refer to :ref:`theming-pelican`.
 
-I'm using Markdown and getting ``No valid files found in content`` errors.
+I want to use Markdown, but I got an error.
 ==========================================================================
 
+If you try to generate Markdown content without first installing the Markdown
+library, may see a message that says ``No valid files found in content``.
 Markdown is not a hard dependency for Pelican, so if you have content in
 Markdown format, you will need to explicitly install the Markdown library.
 You can do so by typing the following command, prepending ``sudo`` if
@@ -75,10 +77,6 @@ permissions require it::
 
     pip install markdown
 
-If you don't have ``pip`` installed, consider installing it via::
-
-    easy_install pip
-
 Can I use arbitrary metadata in my templates?
 ==============================================
 
@@ -157,8 +155,8 @@ disable all feed generation, you only need to specify the following settings::
     CATEGORY_FEED_ATOM = None
     TRANSLATION_FEED_ATOM = None
 
-Please note that ``None`` and ``''`` are not the same thing. The word ``None``
-should not be surrounded by quotes.
+The word ``None`` should not be surrounded by quotes. Please note that ``None``
+and ``''`` are not the same thing. 
 
 I'm getting a warning about feeds generated without SITEURL being set properly
 ==============================================================================
diff --git a/docs/importer.rst b/docs/importer.rst
index b1d1b926..309ca144 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -1,9 +1,7 @@
 .. _import:
 
-=================================
- Import from other blog software
-=================================
-
+Importing an existing site
+##########################
 
 Description
 ===========
diff --git a/docs/index.rst b/docs/index.rst
index aa30b1f0..36a3282b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -10,30 +10,32 @@ Pelican |release|
         Were you looking for version |last_stable| documentation?
 
 
-Pelican is a static site generator, written in Python_.
+Pelican is a static site generator, written in Python_. Highlights include:
 
-* Write your content directly with your editor of choice (vim!)
+* Write your content directly with your editor of choice
   in reStructuredText_, Markdown_, or AsciiDoc_ formats
 * Includes a simple CLI tool to (re)generate your site
 * Easy to interface with distributed version control systems and web hooks
 * Completely static output is easy to host anywhere
 
+Ready to get started? Check out the :doc:`Quickstart<quickstart>` guide.
+
 Features
 --------
 
 Pelican |version| currently supports:
 
 * Articles (e.g., blog posts) and pages (e.g., "About", "Projects", "Contact")
-* Comments, via an external service (Disqus). (Please note that while
-  useful, Disqus is an external service, and thus the comment data will be
-  somewhat outside of your control and potentially subject to data loss.)
+* Comments, via an external service (Disqus). If you prefer to have more
+  control over your comment data, self-hosted comments are another option.
+  Check out the `Pelican Plugins`_ repository for more details.
 * Theming support (themes are created using Jinja2_ templates)
 * Publication of articles in multiple languages
 * Atom/RSS feeds
 * Code syntax highlighting
 * Import from WordPress, Dotclear, or RSS feeds
 * Integration with external tools: Twitter, Google Analytics, etc. (optional)
-* Fast rebuild times thanks to content caching and selective output writing.
+* Fast rebuild times thanks to content caching and selective output writing
 
 Why the name "Pelican"?
 -----------------------
@@ -66,16 +68,19 @@ Documentation
 .. toctree::
    :maxdepth: 2
 
-   getting_started
+   quickstart
+   install
+   content
+   publish
    settings
    themes
    plugins
-   internals
    pelican-themes
    importer
    faq
    tips
    contribute
+   internals
    report
    changelog
 
@@ -88,5 +93,6 @@ Documentation
 .. _Jinja2: http://jinja.pocoo.org/
 .. _`Pelican documentation`: http://docs.getpelican.com/latest/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
+.. _`Pelican plugins`: https://github.com/getpelican/pelican-plugins
 .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
 .. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
diff --git a/docs/install.rst b/docs/install.rst
new file mode 100644
index 00000000..34cd33ea
--- /dev/null
+++ b/docs/install.rst
@@ -0,0 +1,122 @@
+Installing Pelican
+##################
+
+Pelican currently runs best on Python 2.7.x; earlier versions of Python are
+not supported. There is provisional support for Python 3.3+, although there may
+be rough edges, particularly with regards to optional 3rd-party components.
+
+You can install Pelican via several different methods. The simplest is via
+`pip <http://www.pip-installer.org/>`_::
+
+    pip install pelican
+
+(Keep in mind that operating systems will often require you to prefix the above
+command with ``sudo`` in order to install Pelican system-wide.)
+
+While the above is the simplest method, the recommended approach is to create
+a virtual environment for Pelican via virtualenv_ before installing Pelican.
+Assuming you have virtualenv_ installed, you can then open a new terminal
+session and create a new virtual environment for Pelican::
+
+    virtualenv ~/virtualenvs/pelican
+    cd ~/virtualenvs/pelican
+    source bin/activate
+
+Once the virtual environment has been created and activated, Pelican can be
+be installed via ``pip install pelican`` as noted above. Alternatively, if
+you have the project source, you can install Pelican using the distutils
+method::
+
+    cd path-to-Pelican-source
+    python setup.py install
+
+If you have Git installed and prefer to install the latest bleeding-edge
+version of Pelican rather than a stable release, use the following command::
+
+    pip install -e "git+https://github.com/getpelican/pelican.git#egg=pelican"
+
+Once Pelican is installed, you can run ``pelican --help`` to see basic usage
+options. For more detail, refer to the :doc:`Publish<publish>` section.
+
+Optional packages
+-----------------
+
+If you plan on using `Markdown <http://pypi.python.org/pypi/Markdown>`_ as a
+markup format, you'll need to install the Markdown library::
+
+    pip install Markdown
+
+Typographical enhancements can be enabled in your settings file, but first the
+requisite `Typogrify <http://pypi.python.org/pypi/typogrify>`_ library must be
+installed::
+
+    pip install typogrify
+
+If you want to use AsciiDoc_ you need to install it from `source
+<http://www.methods.co.nz/asciidoc/INSTALL.html>`_ or use your operating
+system's package manager.
+
+Dependencies
+------------
+
+When Pelican is installed, the following dependent Python packages should be
+automatically installed without any action on your part:
+
+* `feedgenerator <http://pypi.python.org/pypi/feedgenerator>`_, to generate the
+  Atom feeds
+* `jinja2 <http://pypi.python.org/pypi/Jinja2>`_, for templating support
+* `pygments <http://pypi.python.org/pypi/Pygments>`_, for syntax highlighting
+* `docutils <http://pypi.python.org/pypi/docutils>`_, for supporting
+  reStructuredText as an input format
+* `pytz <http://pypi.python.org/pypi/pytz>`_, for timezone definitions
+* `blinker <http://pypi.python.org/pypi/blinker>`_, an object-to-object and
+  broadcast signaling system
+* `unidecode <http://pypi.python.org/pypi/Unidecode>`_, for ASCII
+  transliterations of Unicode text
+* `six <http://pypi.python.org/pypi/six>`_,  for Python 2 and 3 compatibility
+  utilities
+* `MarkupSafe <http://pypi.python.org/pypi/MarkupSafe>`_, for a markup safe
+  string implementation
+* `python-dateutil <https://pypi.python.org/pypi/python-dateutil>`_, to read
+  the date metadata
+
+Upgrading
+---------
+
+If you installed a stable Pelican release via ``pip`` or ``easy_install`` and
+wish to upgrade to the latest stable release, you can do so by adding
+``--upgrade`` to the relevant command. For pip, that would be::
+
+    pip install --upgrade pelican
+
+If you installed Pelican via distutils or the bleeding-edge method, simply
+perform the same step to install the most recent version.
+
+Kickstart your site
+===================
+
+Once Pelican has been installed, you can create a skeleton project via the
+``pelican-quickstart`` command, which begins by asking some questions about
+your site::
+
+    pelican-quickstart
+
+Once you finish answering all the questions, your project will consist of the
+following hierarchy (except for *pages* — shown in parentheses below — which you
+can optionally add yourself if you plan to create non-chronological content)::
+
+    yourproject/
+    ├── content
+    │   └── (pages)
+    ├── output
+    ├── develop_server.sh
+    ├── fabfile.py
+    ├── Makefile
+    ├── pelicanconf.py       # Main settings file
+    └── publishconf.py       # Settings to use when ready to publish
+
+The next step is to begin to adding content to the *content* folder that has
+been created for you.
+
+.. _virtualenv: http://www.virtualenv.org/
+.. _AsciiDoc: http://www.methods.co.nz/asciidoc/
diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index 23be8355..7090c648 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -153,12 +153,3 @@ The ``--install``, ``--remove`` and ``--symlink`` option are not mutually exclus
                      --verbose
 
 In this example, the theme ``notmyidea-cms`` is replaced by the theme ``notmyidea-cms-fr``
-
-
-
-
-See also
-========
-
--   http://docs.notmyidea.org/alexis/pelican/
--   ``/usr/share/doc/pelican/`` if you have installed Pelican using the `APT repository <http://skami18.github.com/pelican-packages/>`_
diff --git a/docs/publish.rst b/docs/publish.rst
new file mode 100644
index 00000000..266009e4
--- /dev/null
+++ b/docs/publish.rst
@@ -0,0 +1,174 @@
+Publish your site
+#################
+
+Site generation
+===============
+
+Once Pelican is installed and you have some content (e.g., in Markdown or reST
+format), you can convert your content into HTML via the ``pelican`` command,
+specifying the path to your content and (optionally) the path to your
+:doc:`settings<settings>` file::
+
+    pelican /path/to/your/content/ [-s path/to/your/settings.py]
+
+The above command will generate your site and save it in the ``output/``
+folder, using the default theme to produce a simple site. The default theme
+consists of very simple HTML without styling and is provided so folks may use
+it as a basis for creating their own themes.
+
+You can also tell Pelican to watch for your modifications, instead of
+manually re-running it every time you want to see your changes. To enable this,
+run the ``pelican`` command with the ``-r`` or ``--autoreload`` option.
+
+Pelican has other command-line switches available. Have a look at the help to
+see all the options you can use::
+
+    pelican --help
+
+Viewing the generated files
+---------------------------
+
+The files generated by Pelican are static files, so you don't actually need
+anything special to view them. You can use your browser to open the generated
+HTML files directly::
+
+    firefox output/index.html
+
+Because the above method may have trouble locating your CSS and other linked
+assets, running a simple web server using Python will often provide a more
+reliable previewing experience::
+
+    cd output
+    python -m SimpleHTTPServer
+
+Once the ``SimpleHTTPServer`` has been started, you can preview your site at
+http://localhost:8000/
+
+Deployment
+==========
+
+After you have generated your site, previewed it in your local development
+environment, and are ready to deploy it to production, you might first
+re-generate your site with any production-specific settings (e.g., analytics
+feeds, etc.) that you may have defined::
+
+    pelican content -s publishconf.py
+
+The steps for deploying your site will depend on where it will be hosted.
+If you have SSH access to a server running Nginx or Apache, you might use the
+``rsync`` tool to transmit your site files::
+
+    rsync --avc --delete output/ host.example.com:/var/www/your-site/
+
+There are many other deployment options, some of which can be configured when
+first setting up your site via the ``pelican-quickstart`` command. See the
+:doc:`Tips<tips>` page for detail on publishing via GitHub Pages.
+
+Automation
+==========
+
+While the ``pelican`` command is the canonical way to generate your site,
+automation tools can be used to streamline the generation and publication
+flow. One of the questions asked during the ``pelican-quickstart`` process
+pertains to whether you want to automate site generation and publication.
+If you answered "yes" to that question, a ``fabfile.py`` and
+``Makefile`` will be generated in the root of your project. These files,
+pre-populated with certain information gleaned from other answers provided
+during the ``pelican-quickstart`` process, are meant as a starting point and
+should be customized to fit your particular needs and usage patterns. If you
+find one or both of these automation tools to be of limited utility, these
+files can deleted at any time and will not affect usage of the canonical
+``pelican`` command.
+
+Following are automation tools that "wrap" the ``pelican`` command and can
+simplify the process of generating, previewing, and uploading your site.
+
+Fabric
+------
+
+The advantage of Fabric_ is that it is written in Python and thus can be used
+in a wide range of environments. The downside is that it must be installed
+separately. Use the following command to install Fabric, prefixing with
+``sudo`` if your environment requires it::
+
+    pip install Fabric
+
+Take a moment to open the ``fabfile.py`` file that was generated in your
+project root. You will see a number of commands, any one of which can be
+renamed, removed, and/or customized to your liking. Using the out-of-the-box
+configuration, you can generate your site via::
+
+    fab build
+
+If you'd prefer to have Pelican automatically regenerate your site every time a
+change is detected (which is handy when testing locally), use the following
+command instead::
+
+    fab regenerate
+
+To serve the generated site so it can be previewed in your browser at
+http://localhost:8000/::
+
+    fab serve
+
+If during the ``pelican-quickstart`` process you answered "yes" when asked
+whether you want to upload your site via SSH, you can use the following command
+to publish your site via rsync over SSH::
+
+    fab publish
+
+These are just a few of the commands available by default, so feel free to
+explore ``fabfile.py`` and see what other commands are available. More
+importantly, don't hesitate to customize ``fabfile.py`` to suit your specific
+needs and preferences.
+
+Make
+----
+
+A ``Makefile`` is also automatically created for you when you say "yes" to
+the relevant question during the ``pelican-quickstart`` process. The advantage
+of this method is that the ``make`` command is built into most POSIX systems
+and thus doesn't require installing anything else in order to use it. The
+downside is that non-POSIX systems (e.g., Windows) do not include ``make``,
+and installing it on those systems can be a non-trivial task.
+
+If you want to use ``make`` to generate your site, run::
+
+    make html
+
+If you'd prefer to have Pelican automatically regenerate your site every time a
+change is detected (which is handy when testing locally), use the following
+command instead::
+
+    make regenerate
+
+To serve the generated site so it can be previewed in your browser at
+http://localhost:8000/::
+
+    make serve
+
+Normally you would need to run ``make regenerate`` and ``make serve`` in two
+separate terminal sessions, but you can run both at once via::
+
+    make devserver
+
+The above command will simultaneously run Pelican in regeneration mode as well
+as serve the output at http://localhost:8000. Once you are done testing your
+changes, you should stop the development server via::
+
+    ./develop_server.sh stop
+
+When you're ready to publish your site, you can upload it via the method(s) you
+chose during the ``pelican-quickstart`` questionnaire. For this example, we'll
+use rsync over ssh::
+
+    make rsync_upload
+
+That's it! Your site should now be live.
+
+(The default ``Makefile`` and ``devserver.sh`` scripts use the ``python`` and
+``pelican`` executables to complete its tasks. If you want to use different
+executables, such as ``python3``, you can set the ``PY`` and ``PELICAN``
+environment variables, respectively, to override the default executable names.)
+
+.. _Fabric: http://fabfile.org/
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
new file mode 100644
index 00000000..44f99dd2
--- /dev/null
+++ b/docs/quickstart.rst
@@ -0,0 +1,73 @@
+Quickstart
+##########
+
+Reading through all the documentation is highly recommended, but for the truly
+impatient, following are some quick steps to get started.
+
+Installation
+------------
+
+Install Pelican on Python 2.7.x or Python 3.3+ by running the following command
+in your preferred terminal, prefixing with ``sudo`` if permissions warrant::
+
+    pip install pelican markdown
+
+Create a project
+----------------
+
+First, choose a name for your project, create an appropriately-named directory
+for your it, and switch to that directory::
+
+    mkdir -p ~/projects/yoursite
+    cd ~/projects/yoursite
+
+Create a skeleton project via the ``pelican-quickstart`` command, which begins
+by asking some questions about your site::
+
+    pelican-quickstart
+
+For questions that have default values denoted in brackets, feel free to use
+the Return key to accept those default values. When asked for your URL prefix,
+enter your domain name as indicated (e.g., ``http://example.com``).
+
+Create an article
+-----------------
+
+You cannot run Pelican until you have created some content. Use your preferred
+text editor to create your first article with the following content::
+
+    Title: My First Review
+    Date: 2010-12-03 10:20
+    Category: Review
+
+    Following is a review of my favorite mechanical keyboard.
+
+Given that this example article is in Markdown format, save it as
+``~/projects/yoursite/content/keyboard-review.md``.
+
+Generate your site
+------------------
+
+From your project directory, run the ``pelican`` command to generate your site::
+
+    pelican content
+
+Your site has now been generated inside the ``output`` directory. (You may see a
+warning related to feeds, but that is normal when developing locally and can be
+ignored for now.)
+
+Preview your site
+-----------------
+
+Open a new terminal session and run the following commands to switch to your
+``output`` directory and launch Python's built-in web server::
+
+    cd ~/projects/yoursite/output
+    python -m SimpleHTTPServer
+
+Preview your site by navigating to http://localhost:8000/ in your browser.
+
+Continue reading the other documentation sections for more detail, and check out
+the Pelican wiki's Tutorials_ page for links to community-published tutorials.
+
+.. _Tutorials: https://github.com/getpelican/pelican/wiki/Tutorials
diff --git a/docs/settings.rst b/docs/settings.rst
index 2782977c..7a69784e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1,10 +1,10 @@
 Settings
 ########
 
-Pelican is configurable thanks to a configuration file you can pass to
+Pelican is configurable thanks to a settings file you can pass to
 the command line::
 
-    $ pelican content -s path/to/your/settingsfile.py
+    pelican content -s path/to/your/settingsfile.py
 
 (If you used the ``pelican-quickstart`` command, your primary settings file will
 be named ``pelicanconf.py`` by default.)
@@ -201,8 +201,8 @@ for URL formation: *relative* and *absolute*. Relative URLs are useful
 when testing locally, and absolute URLs are reliable and most useful when
 publishing. One method of supporting both is to have one Pelican configuration
 file for local development and another for publishing. To see an example of this
-type of setup, use the ``pelican-quickstart`` script as described at the top of
-the :doc:`Getting Started <getting_started>` page, which will produce two separate
+type of setup, use the ``pelican-quickstart`` script as described in the
+:doc:`Installation <install>` section, which will produce two separate
 configuration files for local development and publishing, respectively.
 
 You can customize the URLs and locations where files will be saved. The
@@ -603,7 +603,7 @@ For example::
 Translations
 ============
 
-Pelican offers a way to translate articles. See the :doc:`Getting Started <getting_started>` section for
+Pelican offers a way to translate articles. See the :doc:`Content <content>` section for
 more information.
 
 ========================================================    =====================================================
diff --git a/docs/themes.rst b/docs/themes.rst
index b029e816..7fcba671 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -1,13 +1,21 @@
 .. _theming-pelican:
 
-How to create themes for Pelican
-################################
+Creating themes
+###############
 
-Pelican uses the great `Jinja2 <http://jinja.pocoo.org/>`_ templating engine to
-generate its HTML output. Jinja2 syntax is really simple. If you want to
-create your own theme, feel free to take inspiration from the `"simple" theme
+To generate its HTML output, Pelican uses the `Jinja <http://jinja.pocoo.org/>`_
+templating engine due to its flexibility and straightforward syntax. If you want
+to create your own theme, feel free to take inspiration from the `"simple" theme
 <https://github.com/getpelican/pelican/tree/master/pelican/themes/simple/templates>`_.
 
+To generate your site using a theme you have created (or downloaded manually and
+then modified), you can specify that theme via the ``-t`` flag::
+
+    pelican content -s pelicanconf.py -t /projects/your-site/themes/your-theme
+
+If you'd rather not specify the theme on every invocation, you can define
+``THEME`` in your settings to point to the location of your preferred theme.
+
 Structure
 =========
 

From 9d2a129832174c8a65c615148cfbc0a650ecb85c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 13 May 2014 07:18:33 -0700
Subject: [PATCH 1618/2864] If PATH is undefined, Pelican uses PWD as content

---
 docs/settings.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 7a69784e..4701e92d 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -94,7 +94,7 @@ Setting name (followed by default value, if any)
 ``READERS = {}``                                                                 A dictionary of file extensions / Reader classes for Pelican to
                                                                                  process or ignore. For example, to avoid processing .html files,
                                                                                  set: ``READERS = {'html': None}``. To add a custom reader for the
-                                                                                 `foo` extension, set: ``READERS = {'foo': FooReader}``
+                                                                                 ``foo`` extension, set: ``READERS = {'foo': FooReader}``
 ``IGNORE_FILES = ['.#*']``                                                       A list of file globbing patterns to match against the
                                                                                  source files to be ignored by the processor. For example,
                                                                                  the default ``['.#*']`` will ignore emacs lock files.
@@ -108,10 +108,12 @@ Setting name (followed by default value, if any)
                                                                                  include them explicitly and enumerate the full list of
                                                                                  desired Markdown extensions.)
 ``OUTPUT_PATH = 'output/'``                                                      Where to output the generated files.
-``PATH = None``                                                                  Path to content directory to be processed by Pelican.
-``PAGE_DIR = 'pages'``                                                           Directory to look at for pages, relative to `PATH`.
+``PATH``                                                                         Path to content directory to be processed by Pelican. If undefined,
+                                                                                 and content path is not specified via an argument to the ``pelican``
+                                                                                 command, Pelican will use the current working directory.
+``PAGE_DIR = 'pages'``                                                           Directory to look at for pages, relative to ``PATH``.
 ``PAGE_EXCLUDES = ()``                                                           A list of directories to exclude when looking for pages.
-``ARTICLE_DIR = ''``                                                             Directory to look at for articles, relative to `PATH`.
+``ARTICLE_DIR = ''``                                                             Directory to look at for articles, relative to ``PATH``.
 ``ARTICLE_EXCLUDES = ('pages',)``                                                A list of directories to exclude when looking for articles.
 ``OUTPUT_SOURCES = False``                                                       Set to True if you want to copy the articles and pages in their
                                                                                  original format (e.g. Markdown or reStructuredText) to the

From bf6a4ad74741a954fecefa4536637190ef23fb5e Mon Sep 17 00:00:00 2001
From: Vincent Jousse <vincent@jousse.org>
Date: Wed, 14 May 2014 11:11:58 +0200
Subject: [PATCH 1619/2864] Add missing methods

---
 pelican/tests/test_generators.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 659383ac..07871cef 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -58,6 +58,12 @@ class TestArticlesGenerator(unittest.TestCase):
         cls.generator.generate_context()
         cls.articles = cls.distill_articles(cls.generator.articles)
 
+    def setUp(self):
+        self.temp_cache = mkdtemp(prefix='pelican_cache.')
+
+    def tearDown(self):
+        rmtree(self.temp_cache)
+
     @staticmethod
     def distill_articles(articles):
         return [[article.title, article.status, article.category.name,

From d635a347d1a5bb7336edb712356237b141efb4d1 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Mon, 21 Apr 2014 11:36:17 +0200
Subject: [PATCH 1620/2864] move {ARTICLE,PAGE}_DIR -> {ARTICLE,PAGE}_PATHS

Instead of one path a list can be given. This is due to popular request.
Should help people not wanting to use Pelican for blogging.
Maintain backward compatibility though.
Thanks to @ingwinlu for pointing out the change in StaticGenerator.
---
 docs/settings.rst                |  4 +--
 pelican/generators.py            | 60 +++++++++++++++-----------------
 pelican/settings.py              | 26 ++++++++++----
 pelican/tests/test_generators.py |  2 +-
 4 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 4701e92d..33117a7f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -111,9 +111,9 @@ Setting name (followed by default value, if any)
 ``PATH``                                                                         Path to content directory to be processed by Pelican. If undefined,
                                                                                  and content path is not specified via an argument to the ``pelican``
                                                                                  command, Pelican will use the current working directory.
-``PAGE_DIR = 'pages'``                                                           Directory to look at for pages, relative to ``PATH``.
+``PAGE_PATHS = ['pages']``                                                       A list of directories to look at for pages, relative to ``PATH``.
 ``PAGE_EXCLUDES = ()``                                                           A list of directories to exclude when looking for pages.
-``ARTICLE_DIR = ''``                                                             Directory to look at for articles, relative to ``PATH``.
+``ARTICLE_PATHS = ['']``                                                         A list of directories to look at for articles, relative to ``PATH``.
 ``ARTICLE_EXCLUDES = ('pages',)``                                                A list of directories to exclude when looking for articles.
 ``OUTPUT_SOURCES = False``                                                       Set to True if you want to copy the articles and pages in their
                                                                                  original format (e.g. Markdown or reStructuredText) to the
diff --git a/pelican/generators.py b/pelican/generators.py
index 7c6ba66b..deb237a2 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -110,29 +110,30 @@ class Generator(object):
             return True
         return False
 
-    def get_files(self, path, exclude=[], extensions=None):
+    def get_files(self, paths, exclude=[], extensions=None):
         """Return a list of files to use, based on rules
 
-        :param path: the path to search (relative to self.path)
+        :param paths: the list pf paths to search (relative to self.path)
         :param exclude: the list of path to exclude
         :param extensions: the list of allowed extensions (if False, all
             extensions are allowed)
         """
         files = []
-        root = os.path.join(self.path, path)
+        for path in paths:
+            root = os.path.join(self.path, path)
 
-        if os.path.isdir(root):
-            for dirpath, dirs, temp_files in os.walk(root, followlinks=True):
-                for e in exclude:
-                    if e in dirs:
-                        dirs.remove(e)
-                reldir = os.path.relpath(dirpath, self.path)
-                for f in temp_files:
-                    fp = os.path.join(reldir, f)
-                    if self._include_path(fp, extensions):
-                        files.append(fp)
-        elif os.path.exists(root) and self._include_path(path, extensions):
-            files.append(path)  # can't walk non-directories
+            if os.path.isdir(root):
+                for dirpath, dirs, temp_files in os.walk(root, followlinks=True):
+                    for e in exclude:
+                        if e in dirs:
+                            dirs.remove(e)
+                    reldir = os.path.relpath(dirpath, self.path)
+                    for f in temp_files:
+                        fp = os.path.join(reldir, f)
+                        if self._include_path(fp, extensions):
+                            files.append(fp)
+            elif os.path.exists(root) and self._include_path(path, extensions):
+                files.append(path)  # can't walk non-directories
         return files
 
     def add_source_path(self, content):
@@ -462,7 +463,7 @@ class ArticlesGenerator(CachingGenerator):
         all_articles = []
         all_drafts = []
         for f in self.get_files(
-                self.settings['ARTICLE_DIR'],
+                self.settings['ARTICLE_PATHS'],
                 exclude=self.settings['ARTICLE_EXCLUDES']):
             article = self.get_cached_data(f, None)
             if article is None:
@@ -586,7 +587,7 @@ class PagesGenerator(CachingGenerator):
         all_pages = []
         hidden_pages = []
         for f in self.get_files(
-                self.settings['PAGE_DIR'],
+                self.settings['PAGE_PATHS'],
                 exclude=self.settings['PAGE_EXCLUDES']):
             page = self.get_cached_data(f, None)
             if page is None:
@@ -660,20 +661,17 @@ class StaticGenerator(Generator):
 
     def generate_context(self):
         self.staticfiles = []
-
-        # walk static paths
-        for static_path in self.settings['STATIC_PATHS']:
-            for f in self.get_files(
-                    static_path, extensions=False):
-                static = self.readers.read_file(
-                    base_path=self.path, path=f, content_class=Static,
-                    fmt='static', context=self.context,
-                    preread_signal=signals.static_generator_preread,
-                    preread_sender=self,
-                    context_signal=signals.static_generator_context,
-                    context_sender=self)
-                self.staticfiles.append(static)
-                self.add_source_path(static)
+        for f in self.get_files(self.settings['STATIC_PATHS'],
+                                extensions=False):
+            static = self.readers.read_file(
+                base_path=self.path, path=f, content_class=Static,
+                fmt='static', context=self.context,
+                preread_signal=signals.static_generator_preread,
+                preread_sender=self,
+                context_signal=signals.static_generator_context,
+                context_sender=self)
+            self.staticfiles.append(static)
+            self.add_source_path(static)
         self._update_context(('staticfiles',))
         signals.static_generator_finalized.send(self)
 
diff --git a/pelican/settings.py b/pelican/settings.py
index f759ff9e..219ebbd0 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -29,9 +29,9 @@ DEFAULT_THEME = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                              'themes', 'notmyidea')
 DEFAULT_CONFIG = {
     'PATH': os.curdir,
-    'ARTICLE_DIR': '',
+    'ARTICLE_PATHS': [''],
     'ARTICLE_EXCLUDES': ('pages',),
-    'PAGE_DIR': 'pages',
+    'PAGE_PATHS': ['pages'],
     'PAGE_EXCLUDES': (),
     'THEME': DEFAULT_THEME,
     'OUTPUT_PATH': 'output',
@@ -311,6 +311,16 @@ def configure_settings(settings):
         key=lambda r: r[0],
     )
 
+    # move {ARTICLE,PAGE}_DIR -> {ARTICLE,PAGE}_PATHS
+    for key in ['ARTICLE', 'PAGE']:
+        old_key = key + '_DIR'
+        new_key = key + '_PATHS'
+        if old_key in settings:
+            logger.warning('Deprecated setting {}, moving it to {} list'.format(
+                old_key, new_key))
+            settings[new_key] = [settings[old_key]]   # also make a list
+            del settings[old_key]
+
     # Save people from accidentally setting a string rather than a list
     path_keys = (
         'ARTICLE_EXCLUDES',
@@ -324,13 +334,15 @@ def configure_settings(settings):
         'PLUGINS',
         'STATIC_PATHS',
         'THEME_STATIC_PATHS',
+        'ARTICLE_PATHS',
+        'PAGE_PATHS',
     )
     for PATH_KEY in filter(lambda k: k in settings, path_keys):
-            if isinstance(settings[PATH_KEY], six.string_types):
-                logger.warning("Detected misconfiguration with %s setting "
-                               "(must be a list), falling back to the default"
-                               % PATH_KEY)
-                settings[PATH_KEY] = DEFAULT_CONFIG[PATH_KEY]
+        if isinstance(settings[PATH_KEY], six.string_types):
+            logger.warning("Detected misconfiguration with %s setting "
+                           "(must be a list), falling back to the default"
+                           % PATH_KEY)
+            settings[PATH_KEY] = DEFAULT_CONFIG[PATH_KEY]
 
     for old, new, doc in [
             ('LESS_GENERATOR', 'the Webassets plugin', None),
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 7b79e8f3..668a0093 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -372,8 +372,8 @@ class TestPageGenerator(unittest.TestCase):
 
     def test_generate_context(self):
         settings = get_settings(filenames={})
-        settings['PAGE_DIR'] = 'TestPages'  # relative to CUR_DIR
         settings['CACHE_PATH'] = self.temp_cache
+        settings['PAGE_PATHS'] = ['TestPages']  # relative to CUR_DIR
         settings['DEFAULT_DATE'] = (1970, 1, 1)
 
         generator = PagesGenerator(

From 21882fd4a00ffdcee7029d7d5ee5ed355ef34a94 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Wed, 14 May 2014 14:06:58 +0200
Subject: [PATCH 1621/2864] Fix #1344 move PLUGIN_PATH -> PLUGIN_PATHS

Pelican uses *_PATHS names for settings that represent a list of paths.
---
 docs/plugins.rst    |  6 +++---
 docs/settings.rst   |  1 +
 pelican/__init__.py |  4 ++--
 pelican/settings.py | 20 ++++++++++++--------
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 717019a8..a13d9dce 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -21,10 +21,10 @@ Alternatively, another method is to import them and add them to the list::
     PLUGINS = [myplugin,]
 
 If your plugins are not in an importable path, you can specify a list of paths
-via the ``PLUGIN_PATH`` setting. As shown in the following example, paths in
-the ``PLUGIN_PATH`` list can be absolute or relative to the settings file::
+via the ``PLUGIN_PATHS`` setting. As shown in the following example, paths in
+the ``PLUGIN_PATHS`` list can be absolute or relative to the settings file::
 
-    PLUGIN_PATH = ["plugins", "/srv/pelican/plugins"]
+    PLUGIN_PATHS = ["plugins", "/srv/pelican/plugins"]
     PLUGINS = ["assets", "liquid_tags", "sitemap"]
 
 Where to find plugins
diff --git a/docs/settings.rst b/docs/settings.rst
index 33117a7f..34245ff4 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -125,6 +125,7 @@ Setting name (followed by default value, if any)
                                                                                  not. Only set this to ``True`` when developing/testing and only
                                                                                  if you fully understand the effect it can have on links/feeds.
 ``PLUGINS = []``                                                                 The list of plugins to load. See :ref:`plugins`.
+``PLUGIN_PATHS = []``                                                            A list of directories where to look for plugins. See :ref:`plugins`.
 ``SITENAME = 'A Pelican Blog'``                                                  Your site name
 ``SITEURL``                                                                      Base URL of your website. Not defined by default,
                                                                                  so it is best to specify your SITEURL; if you do not, feeds
diff --git a/pelican/__init__.py b/pelican/__init__.py
index e9fef163..082e5a58 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -63,9 +63,9 @@ class Pelican(object):
 
     def init_plugins(self):
         self.plugins = []
-        logger.debug('Temporarily adding PLUGIN_PATH to system path')
+        logger.debug('Temporarily adding PLUGIN_PATHS to system path')
         _sys_path = sys.path[:]
-        for pluginpath in self.settings['PLUGIN_PATH']:
+        for pluginpath in self.settings['PLUGIN_PATHS']:
             sys.path.insert(0, pluginpath)
         for plugin in self.settings['PLUGINS']:
             # if it's a string, then import it
diff --git a/pelican/settings.py b/pelican/settings.py
index 219ebbd0..c93050ad 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -114,7 +114,7 @@ DEFAULT_CONFIG = {
     'ARTICLE_PERMALINK_STRUCTURE': '',
     'TYPOGRIFY': False,
     'SUMMARY_MAX_LENGTH': 50,
-    'PLUGIN_PATH': [],
+    'PLUGIN_PATHS': [],
     'PLUGINS': [],
     'PYGMENTS_RST_OPTIONS': {},
     'TEMPLATE_PAGES': {},
@@ -147,13 +147,17 @@ def read_settings(path=None, override=None):
                 if p not in ('THEME') or os.path.exists(absp):
                     local_settings[p] = absp
 
-        if isinstance(local_settings['PLUGIN_PATH'], six.string_types):
-            logger.warning("Defining %s setting as string has been deprecated (should be a list)" % 'PLUGIN_PATH')
-            local_settings['PLUGIN_PATH'] = [local_settings['PLUGIN_PATH']]
-        else:
-            if 'PLUGIN_PATH' in local_settings and local_settings['PLUGIN_PATH'] is not None:
-                local_settings['PLUGIN_PATH'] = [os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(path), pluginpath)))
-                                    if not isabs(pluginpath) else pluginpath for pluginpath in local_settings['PLUGIN_PATH']]
+        if 'PLUGIN_PATH' in local_settings:
+            logger.warning('PLUGIN_PATH setting has been replaced by '
+                           'PLUGIN_PATHS, moving it to the new setting name.')
+            local_settings['PLUGIN_PATHS'] = local_settings['PLUGIN_PATH']
+            del local_settings['PLUGIN_PATH']
+        if isinstance(local_settings['PLUGIN_PATHS'], six.string_types):
+            logger.warning("Defining %s setting as string has been deprecated (should be a list)" % 'PLUGIN_PATHS')
+            local_settings['PLUGIN_PATHS'] = [local_settings['PLUGIN_PATHS']]
+        elif local_settings['PLUGIN_PATHS'] is not None:
+                local_settings['PLUGIN_PATHS'] = [os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(path), pluginpath)))
+                                    if not isabs(pluginpath) else pluginpath for pluginpath in local_settings['PLUGIN_PATHS']]
     else:
         local_settings = copy.deepcopy(DEFAULT_CONFIG)
 

From 6aa0e4346de498ada234f772163579e677cfd10b Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Wed, 14 May 2014 14:30:21 +0200
Subject: [PATCH 1622/2864] Add {PAGE,ARTICLE}_PATHS to {ARTICLE,PAGE}_EXCLUDES
 automatically

This makes it easier for someone to change PAGE_PATHS without the
need to change ARTICLE_EXCLUDES accordingly.
---
 docs/settings.rst              |  6 ++++--
 pelican/settings.py            | 16 ++++++++++++++--
 pelican/tests/test_settings.py |  5 ++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 34245ff4..fd5f488b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -112,9 +112,11 @@ Setting name (followed by default value, if any)
                                                                                  and content path is not specified via an argument to the ``pelican``
                                                                                  command, Pelican will use the current working directory.
 ``PAGE_PATHS = ['pages']``                                                       A list of directories to look at for pages, relative to ``PATH``.
-``PAGE_EXCLUDES = ()``                                                           A list of directories to exclude when looking for pages.
+``PAGE_EXCLUDES = []``                                                           A list of directories to exclude when looking for pages in addition
+                                                                                 to ``ARTICLE_PATHS``.
 ``ARTICLE_PATHS = ['']``                                                         A list of directories to look at for articles, relative to ``PATH``.
-``ARTICLE_EXCLUDES = ('pages',)``                                                A list of directories to exclude when looking for articles.
+``ARTICLE_EXCLUDES = []``                                                        A list of directories to exclude when looking for articles in addition
+                                                                                 to ``PAGE_PATHS``.
 ``OUTPUT_SOURCES = False``                                                       Set to True if you want to copy the articles and pages in their
                                                                                  original format (e.g. Markdown or reStructuredText) to the
                                                                                  specified ``OUTPUT_PATH``.
diff --git a/pelican/settings.py b/pelican/settings.py
index c93050ad..69ade05f 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -30,9 +30,9 @@ DEFAULT_THEME = os.path.join(os.path.dirname(os.path.abspath(__file__)),
 DEFAULT_CONFIG = {
     'PATH': os.curdir,
     'ARTICLE_PATHS': [''],
-    'ARTICLE_EXCLUDES': ('pages',),
+    'ARTICLE_EXCLUDES': [],
     'PAGE_PATHS': ['pages'],
-    'PAGE_EXCLUDES': (),
+    'PAGE_EXCLUDES': [],
     'THEME': DEFAULT_THEME,
     'OUTPUT_PATH': 'output',
     'READERS': {},
@@ -348,6 +348,18 @@ def configure_settings(settings):
                            % PATH_KEY)
             settings[PATH_KEY] = DEFAULT_CONFIG[PATH_KEY]
 
+    # Add {PAGE,ARTICLE}_PATHS to {ARTICLE,PAGE}_EXCLUDES
+    mutually_exclusive = ('ARTICLE', 'PAGE')
+    for type_1, type_2 in [mutually_exclusive, mutually_exclusive[::-1]]:
+        try:
+            includes = settings[type_1 + '_PATHS']
+            excludes = settings[type_2 + '_EXCLUDES']
+            for path in includes:
+                if path not in excludes:
+                    excludes.append(path)
+        except KeyError:
+            continue            # setting not specified, nothing to do
+
     for old, new, doc in [
             ('LESS_GENERATOR', 'the Webassets plugin', None),
             ('FILES_TO_COPY', 'STATIC_PATHS and EXTRA_PATH_METADATA',
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 930e0fea..260eff05 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -43,7 +43,10 @@ class TestSettingsConfiguration(unittest.TestCase):
         # Providing no file should return the default values.
         settings = read_settings(None)
         expected = copy.deepcopy(DEFAULT_CONFIG)
-        expected['FEED_DOMAIN'] = ''  # Added by configure settings
+        # Added by configure settings
+        expected['FEED_DOMAIN'] = ''
+        expected['ARTICLE_EXCLUDES'] = ['pages']
+        expected['PAGE_EXCLUDES'] = ['']
         self.maxDiff = None
         self.assertDictEqual(settings, expected)
 

From 144cddaf39ad6577cfa4a11ef003f6fa44c81d58 Mon Sep 17 00:00:00 2001
From: Mark Lee <pelican@lazymalevolence.com>
Date: Tue, 20 May 2014 13:53:02 -0700
Subject: [PATCH 1623/2864] Address code review comments from PR
 getpelican/pelican#1348

The text about the sort-by-key function comes from:
https://docs.python.org/2/library/stdtypes.html#sequence-types-str-unicode-list-tuple-bytearray-buffer-xrange

Minor style cleanup as well.
---
 docs/settings.rst | 36 +++++++++++++++++++++---------------
 pelican/utils.py  | 14 +++++---------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 55740296..0c804f1c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -260,16 +260,19 @@ posts for the month at ``posts/2011/Aug/index.html``.
     arrive at an appropriate archive of posts, without having to specify
     a page name.
 
-======================================================  ========================================================
+======================================================  ==============================================================
 Setting name (followed by default value, if any)        What does it do?
-======================================================  ========================================================
+======================================================  ==============================================================
 ``ARTICLE_URL = '{slug}.html'``                         The URL to refer to an article.
 ``ARTICLE_SAVE_AS = '{slug}.html'``                     The place where we will save an article.
-``ARTICLE_ORDER_BY = 'slug'``                           The metadata attribute used to sort articles. By default
-                                                        the articles_page.object_list template variable is 
-                                                        ordered by slug. If you modify this, make sure all 
-                                                        articles contain the attribute you specify. You can
-                                                        also specify a sorting function.
+``ARTICLE_ORDER_BY = 'slug'``                           The metadata attribute used to sort articles. By default,
+                                                        the ``articles_page.object_list`` template variable is
+                                                        ordered by slug. If you modify this, make sure all
+                                                        articles contain the attribute you specify. You can also
+                                                        specify a "sorting" function of one argument that is used
+                                                        to extract a comparison key from each article. For example,
+                                                        sorting by title without using the built-in functionality
+                                                        would use the function ``operator.attrgetter('title')``.
 ``ARTICLE_LANG_URL = '{slug}-{lang}.html'``             The URL to refer to an article which doesn't use the
                                                         default language.
 ``ARTICLE_LANG_SAVE_AS = '{slug}-{lang}.html'``         The place where we will save an article which
@@ -285,13 +288,16 @@ Setting name (followed by default value, if any)        What does it do?
                                                         the same as PAGE_URL or you need to use a rewrite in
                                                         your server config.
 
-``PAGE_ORDER_BY = 'filename'``                          The metadata attribute used to sort pages. By default
-                                                        the PAGES template variable is ordered by filename
-                                                        (path not included). Note that the option 'filename' 
-                                                        is a special option supported in the source code. If 
-                                                        you modify this settings, make sure all pages contain 
-                                                        the attribute you specify. You can also specify a 
-                                                        sorting function.
+``PAGE_ORDER_BY = 'basename'``                          The metadata attribute used to sort pages. By default
+                                                        the ``PAGES`` template variable is ordered by basename
+                                                        (i.e., path not included). Note that the option ``'basename'``
+                                                        is a special option supported in the source code. If
+                                                        you modify this setting, make sure all pages contain
+                                                        the attribute you specify. You can also specify a "sorting"
+                                                        function of one argument that is used to extract a comparison
+                                                        key from each page. For example, the basename function looks
+                                                        similar to
+                                                        ``lambda x: os.path.basename(getattr(x, 'source_path', ''))``.
 ``PAGE_LANG_URL = 'pages/{slug}-{lang}.html'``          The URL we will use to link to a page which doesn't
                                                         use the default language.
 ``PAGE_LANG_SAVE_AS = 'pages/{slug}-{lang}.html'``      The location we will save the page which doesn't
@@ -309,7 +315,7 @@ Setting name (followed by default value, if any)        What does it do?
                                                         non-alphanumerics when generating slugs. Specified
                                                         as a list of 2-tuples of ``(from, to)`` which are
                                                         applied in order.
-======================================================  ========================================================
+======================================================  ==============================================================
 
 .. note::
 
diff --git a/pelican/utils.py b/pelican/utils.py
index ecdf5e0d..076c41ea 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -465,17 +465,13 @@ def process_translations(content_list, order_by=None):
             a.translations = [x for x in items if x != a]
 
     if order_by:
-        if hasattr(order_by, '__call__'):
+        if callable(order_by):
             try:
                 index.sort(key=order_by)
-            except:
-                if hasattr(order_by, 'func_name'):
-                    logger.error("Error sorting with function %s" % order_by.func_name)
-                else:
-                    logger.error("Error sorting with function %r" % order_by)
-        elif order_by == 'filename':
-            index.sort(key=lambda x:os.path.basename(
-                    x.source_path or ''))
+            except Exception:
+                logger.error('Error sorting with function {}'.format(order_by))
+        elif order_by == 'basename':
+            index.sort(key=lambda x: os.path.basename(x.source_path or ''))
         elif order_by != 'slug':
             index.sort(key=attrgetter(order_by))
 

From b8db970455100b3b9393fcb20cc1b7fd9c3730f4 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Sun, 25 May 2014 09:12:35 +0200
Subject: [PATCH 1624/2864] Fix RstReader authors metadata processing

The reader would return a list of authors already, but
METADATA_PROCESSORS['authors'] expects a string.
Added a test case for this (only the HTMLReader had it).
---
 pelican/readers.py               | 1 +
 pelican/tests/test_generators.py | 1 +
 pelican/tests/test_readers.py    | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index c63b8981..60df8551 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -145,6 +145,7 @@ class RstReader(BaseReader):
                 elif element.tagname == 'authors':  # author list
                     name = element.tagname
                     value = [element.astext() for element in element.children]
+                    value = ','.join(value) # METADATA_PROCESSORS expects a string
                 else:  # standard fields (e.g. address)
                     name = element.tagname
                     value = element.astext()
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 7b79e8f3..156f7b50 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -109,6 +109,7 @@ class TestArticlesGenerator(unittest.TestCase):
             ['This is an article with category !', 'published', 'yeah',
              'article'],
             ['This is an article with multiple authors!', 'published', 'Default', 'article'],
+            ['This is an article with multiple authors!', 'published', 'Default', 'article'],
             ['This is an article without category !', 'published', 'Default',
              'article'],
             ['This is an article without category !', 'published',
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index fd30e9b9..3533cd31 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -150,6 +150,15 @@ class RstReaderTest(ReaderTest):
         except ImportError:
             return unittest.skip('need the typogrify distribution')
 
+    def test_article_with_multiple_authors(self):
+        page = self.read_file(path='article_with_multiple_authors.rst')
+        expected = {
+            'authors': ['First Author', 'Second Author']
+        }
+
+        for key, value in expected.items():
+            self.assertEqual(value, page.metadata[key], key)
+
 
 class MdReaderTest(ReaderTest):
 

From 43701cae7c0c7fc4617374eab13695da8372e104 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 27 May 2014 12:15:50 -0400
Subject: [PATCH 1625/2864] Docs update for *_{previous|next}_page variables

---
 docs/themes.rst | 56 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 7fcba671..4be9a8e5 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -119,17 +119,25 @@ This is the home page of your blog, generated at output/index.html.
 
 If pagination is active, subsequent pages will reside in output/index`n`.html.
 
-===================     ===================================================
+======================  ===================================================
 Variable                Description
-===================     ===================================================
+======================  ===================================================
 articles_paginator      A paginator object for the list of articles
 articles_page           The current page of articles
+articles_previous_page  The previous page of articles (``None`` if page does
+                        not exist)
+articles_next_page      The next page of articles (``None`` if page does
+                        not exist)
 dates_paginator         A paginator object for the article list, ordered by
                         date, ascending.
 dates_page              The current page of articles, ordered by date,
                         ascending.
+dates_previous_page     The previous page of articles, ordered by date,
+                        ascending (``None`` if page does not exist)
+dates_next_page         The next page of articles, ordered by date,
+                        ascending (``None`` if page does not exist)
 page_name               'index' -- useful for pagination links
-===================     ===================================================
+======================  ===================================================
 
 author.html
 -------------
@@ -140,22 +148,30 @@ output generated at output/author/`author_name`.html.
 If pagination is active, subsequent pages will reside as defined by setting
 AUTHOR_SAVE_AS (`Default:` output/author/`author_name'n'`.html).
 
-===================     ===================================================
+======================  ===================================================
 Variable                Description
-===================     ===================================================
+======================  ===================================================
 author                  The name of the author being processed
 articles                Articles by this author
 dates                   Articles by this author, but ordered by date,
                         ascending
 articles_paginator      A paginator object for the list of articles
 articles_page           The current page of articles
+articles_previous_page  The previous page of articles (``None`` if page does
+                        not exist)
+articles_next_page      The next page of articles (``None`` if page does
+                        not exist)
 dates_paginator         A paginator object for the article list, ordered by
                         date, ascending.
 dates_page              The current page of articles, ordered by date,
                         ascending.
+dates_previous_page     The previous page of articles, ordered by date,
+                        ascending (``None`` if page does not exist)
+dates_next_page         The next page of articles, ordered by date,
+                        ascending (``None`` if page does not exist)
 page_name               AUTHOR_URL where everything after `{slug}` is
                         removed -- useful for pagination links
-===================     ===================================================
+======================  ===================================================
 
 category.html
 -------------
@@ -166,22 +182,30 @@ output generated at output/category/`category_name`.html.
 If pagination is active, subsequent pages will reside as defined by setting
 CATEGORY_SAVE_AS (`Default:` output/category/`category_name'n'`.html).
 
-===================     ===================================================
+======================  ===================================================
 Variable                Description
-===================     ===================================================
+======================  ===================================================
 category                The name of the category being processed
 articles                Articles for this category
 dates                   Articles for this category, but ordered by date,
                         ascending
 articles_paginator      A paginator object for the list of articles
 articles_page           The current page of articles
+articles_previous_page  The previous page of articles (``None`` if page does
+                        not exist)
+articles_next_page      The next page of articles (``None`` if page does
+                        not exist)
 dates_paginator         A paginator object for the list of articles,
                         ordered by date, ascending
 dates_page              The current page of articles, ordered by date,
                         ascending
+dates_previous_page     The previous page of articles, ordered by date,
+                        ascending (``None`` if page does not exist)
+dates_next_page         The next page of articles, ordered by date,
+                        ascending (``None`` if page does not exist)
 page_name               CATEGORY_URL where everything after `{slug}` is
                         removed -- useful for pagination links
-===================     ===================================================
+======================  ===================================================
 
 article.html
 -------------
@@ -244,22 +268,30 @@ saved as output/tag/`tag_name`.html.
 If pagination is active, subsequent pages will reside as defined in setting
 TAG_SAVE_AS (`Default:` output/tag/`tag_name'n'`.html).
 
-===================     ===================================================
+======================  ===================================================
 Variable                Description
-===================     ===================================================
+======================  ===================================================
 tag                     The name of the tag being processed
 articles                Articles related to this tag
 dates                   Articles related to this tag, but ordered by date,
                         ascending
 articles_paginator      A paginator object for the list of articles
 articles_page           The current page of articles
+articles_previous_page  The previous page of articles (``None`` if page does
+                        not exist)
+articles_next_page      The next page of articles (``None`` if page does
+                        not exist)
 dates_paginator         A paginator object for the list of articles,
                         ordered by date, ascending
 dates_page              The current page of articles, ordered by date,
                         ascending
+dates_previous_page     The previous page of articles, ordered by date,
+                        ascending (``None`` if page does not exist)
+dates_next_page         The next page of articles, ordered by date,
+                        ascending (``None`` if page does not exist)
 page_name               TAG_URL where everything after `{slug}` is removed
                         -- useful for pagination links
-===================     ===================================================
+======================  ===================================================
 
 period_archives.html
 --------------------

From b572cbeef15ac2e4fe6107110f52fbdc212cd52a Mon Sep 17 00:00:00 2001
From: Mark Lee <pelican@lazymalevolence.com>
Date: Tue, 27 May 2014 11:42:37 -0700
Subject: [PATCH 1626/2864] Addressed comments from @avaris in PR
 getpelican/pelican#1348

---
 pelican/settings.py | 2 +-
 pelican/utils.py    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index f49d3bd4..6845b830 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -70,7 +70,7 @@ DEFAULT_CONFIG = {
     'DRAFT_LANG_SAVE_AS': os.path.join('drafts', '{slug}-{lang}.html'),
     'PAGE_URL': 'pages/{slug}.html',
     'PAGE_SAVE_AS': os.path.join('pages', '{slug}.html'),
-    'PAGE_ORDER_BY': 'filename',
+    'PAGE_ORDER_BY': 'basename',
     'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
     'PAGE_LANG_SAVE_AS': os.path.join('pages', '{slug}-{lang}.html'),
     'STATIC_URL': '{path}',
diff --git a/pelican/utils.py b/pelican/utils.py
index 076c41ea..c2d6ca22 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -473,7 +473,12 @@ def process_translations(content_list, order_by=None):
         elif order_by == 'basename':
             index.sort(key=lambda x: os.path.basename(x.source_path or ''))
         elif order_by != 'slug':
-            index.sort(key=attrgetter(order_by))
+            try:
+                index.sort(key=attrgetter(order_by))
+            except AttributeError:
+                error_msg = ('There is no "{}" attribute in the item metadata.'
+                             'Defaulting to slug order.')
+                logger.warning(error_msg.format(order_by))
 
     return index, translations
 

From ef967056778a6610fe7b61c349acec0990073dd7 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Sun, 8 Jun 2014 11:32:10 +0200
Subject: [PATCH 1627/2864] catch arbitrary exceptions during cache unpickling

It is hard to forsee what could be raised.
---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 2af34ecf..84b3a41e 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -577,7 +577,7 @@ class FileDataCacher(object):
                     'run). Proceeding with empty cache.\n{}').format(
                         self._cache_path, err))
                 self._cache = {}
-            except pickle.UnpicklingError as err:
+            except Exception as err:
                 logger.warning(('Cannot unpickle cache {}, cache may be using '
                     'an incompatible protocol (see pelican caching docs). '
                     'Proceeding with empty cache.\n{}').format(

From def654434c49a9a17c31ba4b6d970a517e5af320 Mon Sep 17 00:00:00 2001
From: OGINO Masanori <masanori.ogino@gmail.com>
Date: Tue, 10 Jun 2014 08:28:10 +0900
Subject: [PATCH 1628/2864] Require six version 1.4.0 or later.

six.moves.urllib.parse is available since version 1.4.0.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e989d549..a2bcaeaa 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,8 @@
 from setuptools import setup
 
 requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.7', 'pygments', 'docutils',
-            'pytz >= 0a', 'blinker', 'unidecode', 'six', 'python-dateutil']
+            'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',
+            'python-dateutil']
 
 entry_points = {
     'console_scripts': [

From ca3aa1e75fac0b54feb7170e6a5f1c03c1097145 Mon Sep 17 00:00:00 2001
From: OGINO Masanori <masanori.ogino@gmail.com>
Date: Tue, 10 Jun 2014 17:30:17 +0900
Subject: [PATCH 1629/2864] Use six.moves.urllib.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
---
 pelican/contents.py             | 8 +-------
 pelican/tools/pelican_import.py | 9 +++------
 pelican/writers.py              | 4 +---
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 615a7fd8..220db611 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
 import six
-from six.moves.urllib.parse import unquote
+from six.moves.urllib.parse import (unquote, urlparse, urlunparse)
 
 import copy
 import locale
@@ -11,14 +11,8 @@ import os
 import re
 import sys
 
-try:
-    from urlparse import urlparse, urlunparse
-except ImportError:
-    from urllib.parse import urlparse, urlunparse
-
 from datetime import datetime
 
-
 from pelican import signals
 from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import (slugify, truncate_html_words, memoized, strftime,
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 27e47754..7c8662c9 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -6,15 +6,9 @@ import argparse
 try:
     # py3k import
     from html.parser import HTMLParser
-    from urllib.request import urlretrieve
-    from urllib.parse import urlparse
-    from urllib.error import URLError
 except ImportError:
     # py2 import
     from HTMLParser import HTMLParser  # NOQA
-    from urllib import urlretrieve
-    from urlparse import urlparse
-    from urllib2 import URLError
 import os
 import re
 import subprocess
@@ -23,6 +17,9 @@ import time
 import logging
 
 from codecs import open
+from six.moves.urllib.error import URLError
+from six.moves.urllib.parse import urlparse
+from six.moves.urllib.request import urlretrieve
 
 from pelican.utils import slugify
 from pelican.log import init
diff --git a/pelican/writers.py b/pelican/writers.py
index a92feee4..3e01ee6c 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -8,12 +8,10 @@ import logging
 
 if not six.PY3:
     from codecs import open
-    from urlparse import urlparse
-else:
-    from urllib.parse import urlparse
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed
 from jinja2 import Markup
+from six.moves.urllib.parse import urlparse
 
 from pelican.paginator import Paginator
 from pelican.utils import (get_relative_path, path_to_url, set_date_tzinfo,

From bf9316bb7e4a7aa2a6e335c681d4255d1deed23e Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 10 Jun 2014 18:05:29 -0400
Subject: [PATCH 1630/2864] Remove AsciiDocReader from core. Fixes #1355

---
 .travis.yml                                   |  2 -
 docs/content.rst                              |  5 ++-
 docs/index.rst                                |  3 +-
 docs/install.rst                              |  5 ---
 docs/internals.rst                            |  4 +-
 docs/settings.rst                             |  2 -
 pelican/readers.py                            | 39 -------------------
 pelican/settings.py                           |  1 -
 .../content/article_with_asc_extension.asc    | 12 ------
 .../content/article_with_asc_options.asc      |  9 -----
 pelican/tests/test_readers.py                 | 36 -----------------
 11 files changed, 6 insertions(+), 112 deletions(-)
 delete mode 100644 pelican/tests/content/article_with_asc_extension.asc
 delete mode 100644 pelican/tests/content/article_with_asc_options.asc

diff --git a/.travis.yml b/.travis.yml
index 41ad82b2..54dcf0ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,8 @@ python:
     - "3.4"
 before_install:
  - sudo apt-get update -qq
- - sudo apt-get install -qq --no-install-recommends asciidoc
  - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ln -s /usr/share/asciidoc/asciidocapi.py ~/virtualenv/python2.7/lib/python2.7/site-packages/; fi
     - pip install .
     - pip install -r dev_requirements.txt
     - pip install nose-cov
diff --git a/docs/content.rst b/docs/content.rst
index 24fc6e9b..ad81bed1 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -57,8 +57,8 @@ pattern::
 
     This is the content of my super blog post.
 
-Conventions for AsciiDoc_ posts, which should have an ``.asc`` extension, can
-be found on the AsciiDoc_ site.
+Readers for additional formats (such as AsciiDoc_) are available via plugins.
+Refer to `pelican-plugins`_ repository for those.
 
 Pelican can also process HTML files ending in ``.html`` and ``.htm``. Pelican
 interprets the HTML in a very straightforward manner, reading metadata from
@@ -369,3 +369,4 @@ listed on the index page nor on any category or tag page.
 
 .. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: http://www.methods.co.nz/asciidoc/
+.. _pelican-plugins: http://github.com/getpelican/pelican-plugins
diff --git a/docs/index.rst b/docs/index.rst
index 36a3282b..2beb8b20 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,7 +13,7 @@ Pelican |release|
 Pelican is a static site generator, written in Python_. Highlights include:
 
 * Write your content directly with your editor of choice
-  in reStructuredText_, Markdown_, or AsciiDoc_ formats
+  in reStructuredText_ or Markdown_ formats
 * Includes a simple CLI tool to (re)generate your site
 * Easy to interface with distributed version control systems and web hooks
 * Completely static output is easy to host anywhere
@@ -89,7 +89,6 @@ Documentation
 .. _Python: http://www.python.org/
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Markdown: http://daringfireball.net/projects/markdown/
-.. _AsciiDoc: http://www.methods.co.nz/asciidoc/index.html
 .. _Jinja2: http://jinja.pocoo.org/
 .. _`Pelican documentation`: http://docs.getpelican.com/latest/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
diff --git a/docs/install.rst b/docs/install.rst
index 34cd33ea..418c8ca6 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -52,10 +52,6 @@ installed::
 
     pip install typogrify
 
-If you want to use AsciiDoc_ you need to install it from `source
-<http://www.methods.co.nz/asciidoc/INSTALL.html>`_ or use your operating
-system's package manager.
-
 Dependencies
 ------------
 
@@ -119,4 +115,3 @@ The next step is to begin to adding content to the *content* folder that has
 been created for you.
 
 .. _virtualenv: http://www.virtualenv.org/
-.. _AsciiDoc: http://www.methods.co.nz/asciidoc/
diff --git a/docs/internals.rst b/docs/internals.rst
index f69a9bb8..303a327f 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -13,7 +13,7 @@ Overall structure
 =================
 
 What Pelican does is take a list of files and process them into some sort of
-output. Usually, the input files are reStructuredText, Markdown and AsciiDoc
+output. Usually, the input files are reStructuredText and Markdown
 files, and the output is a blog, but both input and output can be anything you
 want.
 
@@ -23,7 +23,7 @@ The logic is separated into different classes and concepts:
   on. Since those operations are commonly used, the object is created once and
   then passed to the generators.
 
-* **Readers** are used to read from various formats (AsciiDoc, HTML, Markdown and
+* **Readers** are used to read from various formats (HTML, Markdown and
   reStructuredText for now, but the system is extensible). Given a file, they
   return metadata (author, tags, category, etc.) and content (HTML-formatted).
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 4701e92d..5d9c574f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -159,8 +159,6 @@ Setting name (followed by default value, if any)
                                                                                  Can be used to separate templates from the theme.
                                                                                  Example: projects, resume, profile ...
                                                                                  These templates need to use ``DIRECT_TEMPLATES`` setting.
-``ASCIIDOC_OPTIONS = []``                                                        A list of options to pass to AsciiDoc. See the `manpage
-                                                                                 <http://www.methods.co.nz/asciidoc/manpage.html>`_.
 ``WITH_FUTURE_DATES = True``                                                     If disabled, content with dates in the future will get a default
                                                                                  status of ``draft``. See :ref:`reading_only_modified_content`
                                                                                  for caveats.
diff --git a/pelican/readers.py b/pelican/readers.py
index 60df8551..431e6937 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -17,11 +17,6 @@ try:
     from markdown import Markdown
 except ImportError:
     Markdown = False  # NOQA
-try:
-    from asciidocapi import AsciiDocAPI
-    asciidoc = True
-except ImportError:
-    asciidoc = False
 try:
     from html import escape
 except ImportError:
@@ -349,40 +344,6 @@ class HTMLReader(BaseReader):
         return parser.body, metadata
 
 
-class AsciiDocReader(BaseReader):
-    """Reader for AsciiDoc files"""
-
-    enabled = bool(asciidoc)
-    file_extensions = ['asc', 'adoc', 'asciidoc']
-    default_options = ["--no-header-footer", "-a newline=\\n"]
-
-    def read(self, source_path):
-        """Parse content and metadata of asciidoc files"""
-        from cStringIO import StringIO
-        with pelican_open(source_path) as source:
-            text = StringIO(source)
-        content = StringIO()
-        ad = AsciiDocAPI()
-
-        options = self.settings['ASCIIDOC_OPTIONS']
-        if isinstance(options, (str, unicode)):
-            options = [m.strip() for m in options.split(',')]
-        options = self.default_options + options
-        for o in options:
-            ad.options(*o.split())
-
-        ad.execute(text, content, backend="html4")
-        content = content.getvalue()
-
-        metadata = {}
-        for name, value in ad.asciidoc.document.attributes.items():
-            name = name.lower()
-            metadata[name] = self.process_metadata(name, value)
-        if 'doctitle' in metadata:
-            metadata['title'] = metadata['doctitle']
-        return content, metadata
-
-
 class Readers(FileStampDataCacher):
     """Interface for all readers.
 
diff --git a/pelican/settings.py b/pelican/settings.py
index f759ff9e..a94e4bf2 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -98,7 +98,6 @@ DEFAULT_CONFIG = {
     'PELICAN_CLASS': 'pelican.Pelican',
     'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
     'DATE_FORMATS': {},
-    'ASCIIDOC_OPTIONS': [],
     'MD_EXTENSIONS': ['codehilite(css_class=highlight)', 'extra'],
     'JINJA_EXTENSIONS': [],
     'JINJA_FILTERS': {},
diff --git a/pelican/tests/content/article_with_asc_extension.asc b/pelican/tests/content/article_with_asc_extension.asc
deleted file mode 100644
index 9ce2166c..00000000
--- a/pelican/tests/content/article_with_asc_extension.asc
+++ /dev/null
@@ -1,12 +0,0 @@
-Test AsciiDoc File Header
-=========================
-:Author: Author O. Article
-:Email: <author@nowhere.com>
-:Date: 2011-09-15 09:05
-:Category: Blog
-:Tags: Linux, Python, Pelican
-
-Used for pelican test
----------------------
-
-The quick brown fox jumped over the lazy dog's back.
diff --git a/pelican/tests/content/article_with_asc_options.asc b/pelican/tests/content/article_with_asc_options.asc
deleted file mode 100644
index bafb3a4a..00000000
--- a/pelican/tests/content/article_with_asc_options.asc
+++ /dev/null
@@ -1,9 +0,0 @@
-Test AsciiDoc File Header
-=========================
-
-Used for pelican test
----------------------
-
-version {revision}
-
-The quick brown fox jumped over the lazy dog's back.
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 3533cd31..6228989b 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -333,42 +333,6 @@ class MdReaderTest(ReaderTest):
             self.assertEqual(value, page.metadata[key], key)
 
 
-class AdReaderTest(ReaderTest):
-
-    @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
-    def test_article_with_asc_extension(self):
-        # Ensure the asc extension is being processed by the correct reader
-        page = self.read_file(
-            path='article_with_asc_extension.asc')
-        expected = ('<hr>\n<h2><a name="_used_for_pelican_test">'
-                    '</a>Used for pelican test</h2>\n'
-                    '<p>The quick brown fox jumped over'
-                    ' the lazy dog&#8217;s back.</p>\n')
-        self.assertEqual(page.content, expected)
-        expected = {
-            'category': 'Blog',
-            'author': 'Author O. Article',
-            'title': 'Test AsciiDoc File Header',
-            'date': datetime.datetime(2011, 9, 15, 9, 5),
-            'tags': ['Linux', 'Python', 'Pelican'],
-        }
-
-        for key, value in expected.items():
-            self.assertEqual(value, page.metadata[key], key)
-
-    @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")
-    def test_article_with_asc_options(self):
-        # test to ensure the ASCIIDOC_OPTIONS is being used
-        reader = readers.AsciiDocReader(
-            dict(ASCIIDOC_OPTIONS=["-a revision=1.0.42"]))
-        content, metadata = reader.read(_path('article_with_asc_options.asc'))
-        expected = ('<hr>\n<h2><a name="_used_for_pelican_test"></a>Used for'
-                    ' pelican test</h2>\n<p>version 1.0.42</p>\n'
-                    '<p>The quick brown fox jumped over the lazy'
-                    ' dog&#8217;s back.</p>\n')
-        self.assertEqual(content, expected)
-
-
 class HTMLReaderTest(ReaderTest):
     def test_article_with_comments(self):
         page = self.read_file(path='article_with_comments.html')

From 24106081b5bbb110eed16d2714f65aa1ea2a9fc2 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Tue, 24 Jun 2014 22:29:36 +0100
Subject: [PATCH 1631/2864] [coveralls] Exclude tests from coverage

---
 .coveragerc | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 00000000..2cb24879
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,3 @@
+[report]
+omit = pelican/tests/*
+

From 3f6b130d6ed427f19e444057958661ee00875ca0 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Sun, 27 Apr 2014 10:25:57 +0200
Subject: [PATCH 1632/2864] Fix #1198, enable custom locale in template
 rendering, fixes links

reverts getpelican/pelican@ddcccfeaa952d2e1e24ceac94e5d66c73b57c01b

If one used a locale that made use of unicode characters (like fr_FR.UTF-8)
the files on disk would be in correct locale while links would be to C.

Uses a SafeDatetime class that works with unicode format strigns
by using custom strftime to prevent ascii decoding errors with Python2.

Also added unicode decoding for the calendar module to fix period
archives.
---
 docs/contribute.rst                           |   2 +
 pelican/contents.py                           |   7 +-
 pelican/generators.py                         |  32 +-
 pelican/readers.py                            |   9 +-
 .../tests/output/custom_locale/archives.html  | 100 ++++
 .../author/alexis-metaireau.html              | 173 +++++++
 .../author/alexis-metaireau2.html             | 187 ++++++++
 .../author/alexis-metaireau3.html             | 138 ++++++
 .../tests/output/custom_locale/authors.html   |  82 ++++
 .../output/custom_locale/categories.html      |  80 ++++
 .../output/custom_locale/category/bar.html    | 101 ++++
 .../output/custom_locale/category/cat1.html   | 170 +++++++
 .../output/custom_locale/category/misc.html   | 181 +++++++
 .../output/custom_locale/category/yeah.html   | 109 +++++
 .../custom_locale/drafts/a-draft-article.html | 100 ++++
 .../feeds/alexis-metaireau.atom.xml           |  61 +++
 .../feeds/alexis-metaireau.rss.xml            |  61 +++
 .../custom_locale/feeds/all-en.atom.xml       |  61 +++
 .../custom_locale/feeds/all-fr.atom.xml       |   4 +
 .../output/custom_locale/feeds/all.atom.xml   |  63 +++
 .../output/custom_locale/feeds/all.rss.xml    |  63 +++
 .../output/custom_locale/feeds/bar.atom.xml   |   8 +
 .../output/custom_locale/feeds/bar.rss.xml    |   8 +
 .../output/custom_locale/feeds/cat1.atom.xml  |   7 +
 .../output/custom_locale/feeds/cat1.rss.xml   |   7 +
 .../output/custom_locale/feeds/misc.atom.xml  |  38 ++
 .../output/custom_locale/feeds/misc.rss.xml   |  38 ++
 .../output/custom_locale/feeds/yeah.atom.xml  |  14 +
 .../output/custom_locale/feeds/yeah.rss.xml   |  14 +
 pelican/tests/output/custom_locale/index.html | 173 +++++++
 .../tests/output/custom_locale/index2.html    | 187 ++++++++
 .../tests/output/custom_locale/index3.html    | 138 ++++++
 .../output/custom_locale/jinja2_template.html |  77 +++
 .../output/custom_locale/oh-yeah-fr.html      | 116 +++++
 .../output/custom_locale/override/index.html  |  81 ++++
 .../pages/this-is-a-test-hidden-page.html     |  81 ++++
 .../pages/this-is-a-test-page.html            |  81 ++++
 .../output/custom_locale/pictures/Fat_Cat.jpg | Bin 0 -> 62675 bytes
 .../output/custom_locale/pictures/Sushi.jpg   | Bin 0 -> 28992 bytes
 .../custom_locale/pictures/Sushi_Macro.jpg    | Bin 0 -> 38594 bytes
 .../02/this-is-a-super-article/index.html     | 129 +++++
 .../2010/octobre/15/unbelievable/index.html   | 146 ++++++
 .../posts/2010/octobre/20/oh-yeah/index.html  | 121 +++++
 .../20/a-markdown-powered-article/index.html  | 115 +++++
 .../2011/février/17/article-1/index.html      | 114 +++++
 .../2011/février/17/article-2/index.html      | 114 +++++
 .../2011/février/17/article-3/index.html      | 114 +++++
 .../2012/février/29/second-article/index.html | 116 +++++
 .../30/filename_metadata-example/index.html   | 114 +++++
 pelican/tests/output/custom_locale/robots.txt |   2 +
 .../custom_locale/second-article-fr.html      | 116 +++++
 .../tests/output/custom_locale/tag/bar.html   | 160 +++++++
 .../tests/output/custom_locale/tag/baz.html   | 114 +++++
 .../tests/output/custom_locale/tag/foo.html   | 130 +++++
 .../output/custom_locale/tag/foobar.html      | 109 +++++
 .../tests/output/custom_locale/tag/oh.html    |  80 ++++
 .../tests/output/custom_locale/tag/yeah.html  | 101 ++++
 pelican/tests/output/custom_locale/tags.html  |  87 ++++
 .../output/custom_locale/theme/css/main.css   | 451 ++++++++++++++++++
 .../custom_locale/theme/css/pygment.css       | 205 ++++++++
 .../output/custom_locale/theme/css/reset.css  |  52 ++
 .../custom_locale/theme/css/typogrify.css     |   3 +
 .../output/custom_locale/theme/css/wide.css   |  48 ++
 .../theme/images/icons/aboutme.png            | Bin 0 -> 751 bytes
 .../theme/images/icons/bitbucket.png          | Bin 0 -> 3714 bytes
 .../theme/images/icons/delicious.png          | Bin 0 -> 958 bytes
 .../theme/images/icons/facebook.png           | Bin 0 -> 202 bytes
 .../theme/images/icons/github.png             | Bin 0 -> 1714 bytes
 .../theme/images/icons/gitorious.png          | Bin 0 -> 227 bytes
 .../theme/images/icons/gittip.png             | Bin 0 -> 487 bytes
 .../theme/images/icons/google-groups.png      | Bin 0 -> 803 bytes
 .../theme/images/icons/google-plus.png        | Bin 0 -> 527 bytes
 .../theme/images/icons/hackernews.png         | Bin 0 -> 3273 bytes
 .../theme/images/icons/lastfm.png             | Bin 0 -> 975 bytes
 .../theme/images/icons/linkedin.png           | Bin 0 -> 896 bytes
 .../theme/images/icons/reddit.png             | Bin 0 -> 693 bytes
 .../custom_locale/theme/images/icons/rss.png  | Bin 0 -> 879 bytes
 .../theme/images/icons/slideshare.png         | Bin 0 -> 535 bytes
 .../theme/images/icons/speakerdeck.png        | Bin 0 -> 1049 bytes
 .../theme/images/icons/stackoverflow.png      | Bin 0 -> 916 bytes
 .../theme/images/icons/twitter.png            | Bin 0 -> 830 bytes
 .../theme/images/icons/vimeo.png              | Bin 0 -> 544 bytes
 .../theme/images/icons/youtube.png            | Bin 0 -> 458 bytes
 pelican/tests/test_contents.py                |   5 +-
 pelican/tests/test_pelican.py                 |  25 +-
 pelican/tests/test_readers.py                 |  30 +-
 pelican/tests/test_utils.py                   |  35 +-
 pelican/tools/pelican_import.py               |   6 +-
 pelican/utils.py                              |  21 +-
 pelican/writers.py                            |   7 +-
 samples/pelican_FR.conf.py                    |  59 +++
 91 files changed, 5704 insertions(+), 77 deletions(-)
 create mode 100644 pelican/tests/output/custom_locale/archives.html
 create mode 100644 pelican/tests/output/custom_locale/author/alexis-metaireau.html
 create mode 100644 pelican/tests/output/custom_locale/author/alexis-metaireau2.html
 create mode 100644 pelican/tests/output/custom_locale/author/alexis-metaireau3.html
 create mode 100644 pelican/tests/output/custom_locale/authors.html
 create mode 100644 pelican/tests/output/custom_locale/categories.html
 create mode 100644 pelican/tests/output/custom_locale/category/bar.html
 create mode 100644 pelican/tests/output/custom_locale/category/cat1.html
 create mode 100644 pelican/tests/output/custom_locale/category/misc.html
 create mode 100644 pelican/tests/output/custom_locale/category/yeah.html
 create mode 100644 pelican/tests/output/custom_locale/drafts/a-draft-article.html
 create mode 100644 pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/all-en.atom.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/all.atom.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/all.rss.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/bar.atom.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/bar.rss.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/cat1.atom.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/cat1.rss.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/misc.atom.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/misc.rss.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/yeah.atom.xml
 create mode 100644 pelican/tests/output/custom_locale/feeds/yeah.rss.xml
 create mode 100644 pelican/tests/output/custom_locale/index.html
 create mode 100644 pelican/tests/output/custom_locale/index2.html
 create mode 100644 pelican/tests/output/custom_locale/index3.html
 create mode 100644 pelican/tests/output/custom_locale/jinja2_template.html
 create mode 100644 pelican/tests/output/custom_locale/oh-yeah-fr.html
 create mode 100644 pelican/tests/output/custom_locale/override/index.html
 create mode 100644 pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
 create mode 100644 pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
 create mode 100644 pelican/tests/output/custom_locale/pictures/Fat_Cat.jpg
 create mode 100644 pelican/tests/output/custom_locale/pictures/Sushi.jpg
 create mode 100644 pelican/tests/output/custom_locale/pictures/Sushi_Macro.jpg
 create mode 100644 pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
 create mode 100644 pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
 create mode 100644 pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
 create mode 100644 pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
 create mode 100644 pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
 create mode 100644 pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
 create mode 100644 pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
 create mode 100644 pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
 create mode 100644 pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
 create mode 100644 pelican/tests/output/custom_locale/robots.txt
 create mode 100644 pelican/tests/output/custom_locale/second-article-fr.html
 create mode 100644 pelican/tests/output/custom_locale/tag/bar.html
 create mode 100644 pelican/tests/output/custom_locale/tag/baz.html
 create mode 100644 pelican/tests/output/custom_locale/tag/foo.html
 create mode 100644 pelican/tests/output/custom_locale/tag/foobar.html
 create mode 100644 pelican/tests/output/custom_locale/tag/oh.html
 create mode 100644 pelican/tests/output/custom_locale/tag/yeah.html
 create mode 100644 pelican/tests/output/custom_locale/tags.html
 create mode 100644 pelican/tests/output/custom_locale/theme/css/main.css
 create mode 100644 pelican/tests/output/custom_locale/theme/css/pygment.css
 create mode 100644 pelican/tests/output/custom_locale/theme/css/reset.css
 create mode 100644 pelican/tests/output/custom_locale/theme/css/typogrify.css
 create mode 100644 pelican/tests/output/custom_locale/theme/css/wide.css
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/aboutme.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/bitbucket.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/delicious.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/facebook.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/github.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/gitorious.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/gittip.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/google-groups.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/google-plus.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/hackernews.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/lastfm.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/linkedin.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/reddit.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/rss.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/slideshare.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/speakerdeck.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/stackoverflow.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/twitter.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/vimeo.png
 create mode 100644 pelican/tests/output/custom_locale/theme/images/icons/youtube.png
 create mode 100644 samples/pelican_FR.conf.py

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 57349156..044ef924 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -90,6 +90,8 @@ functional tests. To do so, you can use the following two commands::
 
     $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/custom/ \
         -s samples/pelican.conf.py samples/content/
+    $ LC_ALL=fr_FR.utf8 pelican -o pelican/tests/output/custom_locale/ \
+        -s samples/pelican_FR.conf.py samples/content/
     $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/basic/ \
         samples/content/
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 220db611..297a537b 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -11,13 +11,12 @@ import os
 import re
 import sys
 
-from datetime import datetime
 
 from pelican import signals
 from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import (slugify, truncate_html_words, memoized, strftime,
                            python_2_unicode_compatible, deprecated_attribute,
-                           path_to_url)
+                           path_to_url, SafeDatetime)
 
 # Import these so that they're avalaible when you import from pelican.contents.
 from pelican.urlwrappers import (URLWrapper, Author, Category, Tag)  # NOQA
@@ -127,7 +126,7 @@ class Content(object):
         if not hasattr(self, 'status'):
             self.status = settings['DEFAULT_STATUS']
             if not settings['WITH_FUTURE_DATES']:
-                if hasattr(self, 'date') and self.date > datetime.now():
+                if hasattr(self, 'date') and self.date > SafeDatetime.now():
                     self.status = 'draft'
 
         # store the summary metadata if it is set
@@ -161,7 +160,7 @@ class Content(object):
             'path': path_to_url(path),
             'slug': getattr(self, 'slug', ''),
             'lang': getattr(self, 'lang', 'en'),
-            'date': getattr(self, 'date', datetime.now()),
+            'date': getattr(self, 'date', SafeDatetime.now()),
             'author': slugify(
                 getattr(self, 'author', ''),
                 slug_substitutions
diff --git a/pelican/generators.py b/pelican/generators.py
index deb237a2..865cc6f8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals, print_function
 
 import os
+import six
 import math
 import random
 import logging
@@ -348,31 +349,22 @@ class ArticlesGenerator(CachingGenerator):
                 # format string syntax can be used for specifying the
                 # period archive dates
                 date = archive[0].date
-                # Under python 2, with non-ascii locales, u"{:%b}".format(date) might raise UnicodeDecodeError
-                # because u"{:%b}".format(date) will call date.__format__(u"%b"), which will return a byte string
-                # and not a unicode string.
-                # eg:
-                # locale.setlocale(locale.LC_ALL, 'ja_JP.utf8')
-                # date.__format__(u"%b") == '12\xe6\x9c\x88' # True
-                try:
-                    save_as = save_as_fmt.format(date=date)
-                except UnicodeDecodeError:
-                    # Python2 only:
-                    # Let date.__format__() work with byte strings instead of characters since it fails to work with characters
-                    bytes_save_as_fmt = save_as_fmt.encode('utf8')
-                    bytes_save_as     = bytes_save_as_fmt.format(date=date)
-                    save_as           = unicode(bytes_save_as,'utf8')
+                save_as = save_as_fmt.format(date=date)
                 context = self.context.copy()
 
                 if key == period_date_key['year']:
                     context["period"] = (_period,)
-                elif key == period_date_key['month']:
-                    context["period"] = (_period[0],
-                                         calendar.month_name[_period[1]])
                 else:
-                    context["period"] = (_period[0],
-                                         calendar.month_name[_period[1]],
-                                         _period[2])
+                    month_name = calendar.month_name[_period[1]]
+                    if not six.PY3:
+                        month_name = month_name.decode('utf-8')
+                    if key == period_date_key['month']:
+                        context["period"] = (_period[0],
+                                             month_name)
+                    else:
+                        context["period"] = (_period[0],
+                                             month_name,
+                                             _period[2])
 
                 write(save_as, template, context,
                       dates=archive, blog=True)
diff --git a/pelican/readers.py b/pelican/readers.py
index 431e6937..e977b349 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
 
-import datetime
 import logging
 import os
 import re
@@ -28,7 +27,7 @@ except ImportError:
 
 from pelican import signals
 from pelican.contents import Page, Category, Tag, Author
-from pelican.utils import get_date, pelican_open, FileStampDataCacher
+from pelican.utils import get_date, pelican_open, FileStampDataCacher, SafeDatetime
 
 
 METADATA_PROCESSORS = {
@@ -494,7 +493,7 @@ def default_metadata(settings=None, process=None):
                 value = process('category', value)
             metadata['category'] = value
         if settings.get('DEFAULT_DATE', None) and settings['DEFAULT_DATE'] != 'fs':
-            metadata['date'] = datetime.datetime(*settings['DEFAULT_DATE'])
+            metadata['date'] = SafeDatetime(*settings['DEFAULT_DATE'])
     return metadata
 
 
@@ -502,7 +501,7 @@ def path_metadata(full_path, source_path, settings=None):
     metadata = {}
     if settings:
         if settings.get('DEFAULT_DATE', None) == 'fs':
-            metadata['date'] = datetime.datetime.fromtimestamp(
+            metadata['date'] = SafeDatetime.fromtimestamp(
                 os.stat(full_path).st_ctime)
         metadata.update(settings.get('EXTRA_PATH_METADATA', {}).get(
             source_path, {}))
@@ -525,7 +524,7 @@ def parse_path_metadata(source_path, settings=None, process=None):
     ...     process=reader.process_metadata)
     >>> pprint.pprint(metadata)  # doctest: +ELLIPSIS
     {'category': <pelican.urlwrappers.Category object at ...>,
-     'date': datetime.datetime(2013, 1, 1, 0, 0),
+     'date': SafeDatetime(2013, 1, 1, 0, 0),
      'slug': 'my-slug'}
     """
     metadata = {}
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
new file mode 100644
index 00000000..a7b96336
--- /dev/null
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log</title>
+        <link rel="stylesheet" href="./theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+<h1>Archives for Alexis' log</h1>
+
+<dl>
+    <dt>ven. 30 novembre 2012</dt>
+    <dd><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></dd>
+    <dt>mer. 29 février 2012</dt>
+    <dd><a href="./posts/2012/février/29/second-article/">Second article</a></dd>
+    <dt>mer. 20 avril 2011</dt>
+    <dd><a href="./posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></dd>
+    <dt>jeu. 17 février 2011</dt>
+    <dd><a href="./posts/2011/février/17/article-1/">Article 1</a></dd>
+    <dt>jeu. 17 février 2011</dt>
+    <dd><a href="./posts/2011/février/17/article-2/">Article 2</a></dd>
+    <dt>jeu. 17 février 2011</dt>
+    <dd><a href="./posts/2011/février/17/article-3/">Article 3</a></dd>
+    <dt>jeu. 02 décembre 2010</dt>
+    <dd><a href="./posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></dd>
+    <dt>mer. 20 octobre 2010</dt>
+    <dd><a href="./posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></dd>
+    <dt>ven. 15 octobre 2010</dt>
+    <dd><a href="./posts/2010/octobre/15/unbelievable/">Unbelievable !</a></dd>
+    <dt>dim. 14 mars 2010</dt>
+    <dd><a href="./tag/baz.html">The baz tag</a></dd>
+</dl>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
new file mode 100644
index 00000000..b54446c8
--- /dev/null
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - Alexis Métaireau</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+<footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Published: ven. 30 novembre 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+<p>There are <a href="../posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2012/février/29/second-article/" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Published: mer. 29 février 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+        <a href="../second-article-fr.html">fr</a>
+
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="../posts/2012/février/29/second-article/">read more</a>
+<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
+                           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Published: mer. 20 avril 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
+<p><a href="../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
+<a href="../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
+                <a class="readmore" href="../posts/2011/avril/20/a-markdown-powered-article/">read more</a>
+<p>There are <a href="../posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2011/février/17/article-1/" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 1</p>
+
+                <a class="readmore" href="../posts/2011/février/17/article-1/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 3
+        <a href="../author/alexis-metaireau2.html">&raquo;</a>
+</p>
+                </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
new file mode 100644
index 00000000..07020512
--- /dev/null
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -0,0 +1,187 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - Alexis Métaireau</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+                <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="3">
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2011/février/17/article-2/" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 2</p>
+
+                <a class="readmore" href="../posts/2011/février/17/article-2/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2011/février/17/article-3/" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 3</p>
+
+                <a class="readmore" href="../posts/2011/février/17/article-3/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Published: jeu. 02 décembre 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: dim. 17 novembre 2013
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
+                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
+                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Published: mer. 20 octobre 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+        <a href="../oh-yeah-fr.html">fr</a>
+
+</footer><!-- /.post-info -->                <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                <a class="readmore" href="../posts/2010/octobre/20/oh-yeah/">read more</a>
+<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                </ol><!-- /#posts-list -->
+<p class="paginator">
+        <a href="../author/alexis-metaireau.html">&laquo;</a>
+    Page 2 / 3
+        <a href="../author/alexis-metaireau3.html">&raquo;</a>
+</p>
+                </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
new file mode 100644
index 00000000..9578e3d6
--- /dev/null
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - Alexis Métaireau</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+                <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="3">
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2010/octobre/15/unbelievable/" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Published: ven. 15 octobre 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+<a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+<div class="section" id="testing-sourcecode-directive">
+<h2>Testing sourcecode directive</h2>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table></div>
+<div class="section" id="testing-another-case">
+<h2>Testing another case</h2>
+<p>This will now have a line number in 'custom' since it's the default in
+pelican.conf, it ...</p></div>
+                <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
+<p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Published: dim. 14 mars 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="../tag/baz.html">read more</a>
+<p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                </ol><!-- /#posts-list -->
+<p class="paginator">
+        <a href="../author/alexis-metaireau2.html">&laquo;</a>
+    Page 3 / 3
+</p>
+                </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
new file mode 100644
index 00000000..2558c4d8
--- /dev/null
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - Authors</title>
+        <link rel="stylesheet" href="./theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+<section id="content" class="body">
+    <h1>Authors on Alexis' log</h1>
+    <ul>
+        <li><a href="./author/alexis-metaireau.html">Alexis Métaireau</a> (10)</li>
+    </ul>
+</section>
+
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
new file mode 100644
index 00000000..17d9de76
--- /dev/null
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log</title>
+        <link rel="stylesheet" href="./theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<ul>
+    <li><a href="./category/yeah.html">yeah</a></li>
+    <li><a href="./category/misc.html">misc</a></li>
+    <li><a href="./category/cat1.html">cat1</a></li>
+    <li><a href="./category/bar.html">bar</a></li>
+</ul>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
new file mode 100644
index 00000000..d9fc6acb
--- /dev/null
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - bar</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
+<footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Published: mer. 20 octobre 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+        <a href="../oh-yeah-fr.html">fr</a>
+
+</footer><!-- /.post-info --><div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
new file mode 100644
index 00000000..1b09acfe
--- /dev/null
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - cat1</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li class="active"><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="../posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></h1>
+<footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Published: mer. 20 avril 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
+<p><a href="../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
+<a href="../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p><p>There are <a href="../posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </article>
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2011/février/17/article-1/" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 1</p>
+
+                <a class="readmore" href="../posts/2011/février/17/article-1/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2011/février/17/article-2/" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 2</p>
+
+                <a class="readmore" href="../posts/2011/février/17/article-2/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2011/février/17/article-3/" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 3</p>
+
+                <a class="readmore" href="../posts/2011/février/17/article-3/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+                </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
new file mode 100644
index 00000000..bcaec248
--- /dev/null
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - misc</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+<footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Published: ven. 30 novembre 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+<p>There are <a href="../posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2012/février/29/second-article/" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Published: mer. 29 février 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+        <a href="../second-article-fr.html">fr</a>
+
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="../posts/2012/février/29/second-article/">read more</a>
+<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2010/octobre/15/unbelievable/" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Published: ven. 15 octobre 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+<a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+<div class="section" id="testing-sourcecode-directive">
+<h2>Testing sourcecode directive</h2>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table></div>
+<div class="section" id="testing-another-case">
+<h2>Testing another case</h2>
+<p>This will now have a line number in 'custom' since it's the default in
+pelican.conf, it ...</p></div>
+                <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
+<p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Published: dim. 14 mars 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="../tag/baz.html">read more</a>
+<p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+                </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
new file mode 100644
index 00000000..7f881612
--- /dev/null
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - yeah</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li class="active"><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
+<footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Published: jeu. 02 décembre 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: dim. 17 novembre 2013
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+</footer><!-- /.post-info --><p>Some content here !</p>
+<div class="section" id="this-is-a-simple-title">
+<h2>This is a simple title</h2>
+<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<pre class="literal-block">
+&gt;&gt;&gt; from ipdb import set_trace
+&gt;&gt;&gt; set_trace()
+</pre>
+<p>→ And now try with some utf8 hell: ééé</p>
+</div>
+<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
new file mode 100644
index 00000000..82fb057b
--- /dev/null
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>A draft article</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../drafts/a-draft-article.html" rel="bookmark"
+           title="Permalink to A draft article">A draft article</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2012-03-02T14:01:01">
+                Published: ven. 02 mars 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
+listed anywhere else.</p>
+
+    </div><!-- /.entry-content -->
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
new file mode 100644
index 00000000..202b9f71
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
new file mode 100644
index 00000000..dfb83630
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
new file mode 100644
index 00000000..3bb10e38
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
new file mode 100644
index 00000000..5d58742c
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
new file mode 100644
index 00000000..f709f2b1
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
new file mode 100644
index 00000000..39fbc240
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
new file mode 100644
index 00000000..13a5cde2
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
new file mode 100644
index 00000000..4426eb6a
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
new file mode 100644
index 00000000..54d382c4
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
new file mode 100644
index 00000000..4f3b12f5
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
new file mode 100644
index 00000000..18800485
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
new file mode 100644
index 00000000..0be49f79
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.&lt;/p&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
+&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+&lt;div class="section" id="testing-overriding-config-defaults"&gt;
+&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
+&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
new file mode 100644
index 00000000..5f7d8c4f
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
new file mode 100644
index 00000000..50c5803c
--- /dev/null
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;div class="section" id="this-is-a-simple-title"&gt;
+&lt;h2&gt;This is a simple title&lt;/h2&gt;
+&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;pre class="literal-block"&gt;
+&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
+&amp;gt;&amp;gt;&amp;gt; set_trace()
+&lt;/pre&gt;
+&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
+&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
new file mode 100644
index 00000000..fd9a82b4
--- /dev/null
+++ b/pelican/tests/output/custom_locale/index.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log</title>
+        <link rel="stylesheet" href="./theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+<footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Published: ven. 30 novembre 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info --><p>Some cool stuff!</p>
+<p>There are <a href="./posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="./posts/2012/février/29/second-article/" rel="bookmark"
+                           title="Permalink to Second article">Second article</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Published: mer. 29 février 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
+        <a href="./second-article-fr.html">fr</a>
+
+</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+
+                <a class="readmore" href="./posts/2012/février/29/second-article/">read more</a>
+<p>There are <a href="./posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="./posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
+                           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Published: mer. 20 avril 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
+<p><a href="./posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
+<a href="./posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
+                <a class="readmore" href="./posts/2011/avril/20/a-markdown-powered-article/">read more</a>
+<p>There are <a href="./posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="./posts/2011/février/17/article-1/" rel="bookmark"
+                           title="Permalink to Article 1">Article 1</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 1</p>
+
+                <a class="readmore" href="./posts/2011/février/17/article-1/">read more</a>
+<p>There are <a href="./posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 3
+        <a href="./index2.html">&raquo;</a>
+</p>
+                </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
new file mode 100644
index 00000000..f02ba27c
--- /dev/null
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -0,0 +1,187 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log</title>
+        <link rel="stylesheet" href="./theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+                <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="3">
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="./posts/2011/février/17/article-2/" rel="bookmark"
+                           title="Permalink to Article 2">Article 2</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 2</p>
+
+                <a class="readmore" href="./posts/2011/février/17/article-2/">read more</a>
+<p>There are <a href="./posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="./posts/2011/février/17/article-3/" rel="bookmark"
+                           title="Permalink to Article 3">Article 3</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Article 3</p>
+
+                <a class="readmore" href="./posts/2011/février/17/article-3/">read more</a>
+<p>There are <a href="./posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="./posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Published: jeu. 02 décembre 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: dim. 17 novembre 2013
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/foobar.html">foobar</a> </p>
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
+                <a class="readmore" href="./posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="./posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="./posts/2010/octobre/20/oh-yeah/" rel="bookmark"
+                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Published: mer. 20 octobre 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/bar.html">bar</a>. </p>
+<p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
+        <a href="./oh-yeah-fr.html">fr</a>
+
+</footer><!-- /.post-info -->                <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                <a class="readmore" href="./posts/2010/octobre/20/oh-yeah/">read more</a>
+<p>There are <a href="./posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                </ol><!-- /#posts-list -->
+<p class="paginator">
+        <a href="./index.html">&laquo;</a>
+    Page 2 / 3
+        <a href="./index3.html">&raquo;</a>
+</p>
+                </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
new file mode 100644
index 00000000..9c7416b6
--- /dev/null
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log</title>
+        <link rel="stylesheet" href="./theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+                <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="3">
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="./posts/2010/octobre/15/unbelievable/" rel="bookmark"
+                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Published: ven. 15 octobre 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+<a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+<div class="section" id="testing-sourcecode-directive">
+<h2>Testing sourcecode directive</h2>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table></div>
+<div class="section" id="testing-another-case">
+<h2>Testing another case</h2>
+<p>This will now have a line number in 'custom' since it's the default in
+pelican.conf, it ...</p></div>
+                <a class="readmore" href="./posts/2010/octobre/15/unbelievable/">read more</a>
+<p>There are <a href="./posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="./tag/baz.html" rel="bookmark"
+                           title="Permalink to The baz tag">The baz tag</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Published: dim. 14 mars 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+                <a class="readmore" href="./tag/baz.html">read more</a>
+<p>There are <a href="./tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                </ol><!-- /#posts-list -->
+<p class="paginator">
+        <a href="./index2.html">&laquo;</a>
+    Page 3 / 3
+</p>
+                </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
new file mode 100644
index 00000000..0eafa913
--- /dev/null
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log</title>
+        <link rel="stylesheet" href="./theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+Some text
+
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
new file mode 100644
index 00000000..cdda855d
--- /dev/null
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Trop bien !</title>
+        <link rel="stylesheet" href="./theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="./oh-yeah-fr.html" rel="bookmark"
+           title="Permalink to Trop bien !">Trop bien !</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2012-03-02T14:01:01">
+                Published: ven. 02 mars 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/misc.html">misc</a>. </p>
+Translations:
+        <a href="./posts/2010/octobre/20/oh-yeah/">en</a>
+
+</footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'oh-yeah-fr.html';
+        var disqus_url = './oh-yeah-fr.html';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
new file mode 100644
index 00000000..e84d79fe
--- /dev/null
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Override url/save_as</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li class="active"><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+    <h1 class="entry-title">Override url/save_as</h1>
+    
+    <p>Test page which overrides save_as and url so that this page will be generated
+at a custom location.</p>
+
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
new file mode 100644
index 00000000..dced8107
--- /dev/null
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>This is a test hidden page</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+    <h1 class="entry-title">This is a test hidden page</h1>
+    
+    <p>This is great for things like error(404) pages
+Anyone can see this page but it's not linked to anywhere!</p>
+
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
new file mode 100644
index 00000000..46ea4fef
--- /dev/null
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>This is a test page</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li class="active"><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+    <h1 class="entry-title">This is a test page</h1>
+    
+    <p>Just an image.</p>
+<img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/pictures/Fat_Cat.jpg b/pelican/tests/output/custom_locale/pictures/Fat_Cat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d8a96d356be94e782aaf36ba4e47168435b56338
GIT binary patch
literal 62675
zcmbTdbwE_j`|y31rMnv>mJVU*QgZ29I;BfMLK-9#1f+Ipq`L)_RwS2_?odDwq@^UR
zclGxBeDB};zJEN=GrPll&Tvg!bFP^^d(G^x#b4_HsRm3P27o{yKn?u@er+)6ssy?^
z0f4$XFMtaG03kpE!T|8ll#h<2XeLIdmFP$g0s|m)`a9Btu>PbiXlD4!U1;Y1D}#Y%
zVRTtSbc#YpD4HqJ=`=c0VEj|hZ<(wp3;+wAZlj~?Q_Meg;-VWU>&F2Y(Rl~xIFAVc
zFe43hn7WoWnp`~{^;`p441~pngnp~=r_6s+RdsDW7O0@Ops)}C6%rPf7DB(pScFBS
zMTDiHQUD7&0Dzv4tLH;?Z9oVrCIkQ&=+_^;e*Xa=Ku**@x^<yDnD>`aXl9H3Z@;<z
zvi$ENDL4SSi|E>*Lg18t^c+XaWB%ojXa*tvkpZD~$3Xm3|JUF7Nc=x-|3ote@}GQc
zFaUu6<`bhC^Dk4Q8SAeMGn#Rb|Mchg_~HKL-`&Cc%j#&x|0~almJdbZ0KsS-1<?!?
z{_V4{kPxWwzxNfR@Sl5-f|djSWqvec{pB{aqQu4j^s^GpB!9U9&7{Tu)bqP~n!k)z
z3jj)R{^<BSAM}@h4>hRtANk)R82@7MzZm;pjQ=kt{1^W&kB^SZ=*E8c+X2n!doT3o
z-b=9vi%N@$NsIomhyPFBZ=3vGRtH`7ce($R=lFY#&ia!N`&%z5TF>8d|FOs4_DzqD
z{~1jYAyTw8-9qPR{8o_^<IkLOLo<l<zoUckm(dac_+L!=FBvk@e=NfXU6$ovGOYh%
zw!i$lDRwmf9_>k-RV<-@$q4_8q5qNx$o@O}pnowy{@;Ake=$Ju-+a)&7~@}zOZm?@
z7@(~R?_Z2h`A^y3mI^5Rx1QgZVp33L5m6CI5vYhTx|q0-h_Zx`n2;e{LIf%yfxa`k
zaBT%Gmfxa(M&6nZJ(g(xPx^cAV*HtZa4AVN{pU`g7YB5}1;Bq-By9B6|KAEGi|*8a
zRxo8W|9b@kVf-^2w9xq&fB75D|6IX-xALFW=RfJMf3LK^yNmAduN6QEz{SSK!N$VH
z!NI}9!^J10BqAgrAfzLwAfaTUzs1Z%&&bFE5#(ZF<7a1N<d)#!7ZMf~6}`nJB_|1$
z6%-ML{;mXshlfW<KuAkOL<?nQWQG18hhN<Q87`0t^n*cc00tQdOa}VZ|J!CkSm@7%
z-yaQs1A4K-#KOkG#lt5+3pArG8w3VpV1lu*FwxTh6!v>D!z9BZXBAe!rqH*=Ve_Vh
zMk0!E*%cdmsNhpyAR=}?QF!>&G_-W|9GqO-JiMY};u4Zl(n`uIFjX~m4Ff|XV-r&|
zb9)CzCubK|H{XYT{sDnO!H=Ir$2^UVi$|uWrDtSjW#<%^l$MoOR900ty?oW&(%RPE
z(c9NQfEpYc9+{q*ots}+Tw31vxViOdd*}1+-pT3N`Nh}EtLvNJdV$a;@SpIHV*f9_
z$k2LWU}AzXaenIs!U#Y|Fc~Hmt1vdXf<BI|Hw7Cs5|>gDQPkLj$1Vc@LS^SOg-;C;
z-QYO+t=b>W{`VA%`oGfbe<}7~y_Nw&Fxu|Pz+}K(V2fEi<4{Yt)l;I#;8pSiB@_NF
z@s8ey{e?w$b}IIGk?H|Hhm52e{a*4`g^xI2EV(Se0zY-6!N?wC>i8xbm_jZ^rG=o6
z+&%Yqb;(Y>9$D_(n$9VOdX<vFi2)9^L47To*AJOozhxoEqVE=#7pME+eV=f%^yGWf
z`SVqbphB|$_gf!(cC|>Uy}mW6vg|ZVJx!0%qceSo($=Jm(xUCb50v_tLN<!eO#8j>
z=x~phBXQo4Txflrx&3(Nti}bKgbwm$R;^!Z9k@GwHxD3J+2$S|`gy1zDV$UoPIlg1
z@vd9&oZ0?j^P+Mq`e>v<1|#8cJ7w5Q+4FOc=~?Px_)Q~RiLZuf045VTUuYb-L7GW8
z*4@2MaxXZawmVTB_yyoTr~~d|HN1<=l-!(;u~a|JC(%h~W#d?ns3<c`q0Xk<s+0rm
zUQL4Yp==PQ#pC&;h{#J_mhH6MsG{c)c;FmGDoR1gZ*Mj1*er+JyKK5QQ)l6o42u-w
zs^)2=@fJxk^e|RU?;fTwZj92DkJ_Ifxt~PNrvdkfhNQ;B++3+LpuQ;oA3U*|r<=K#
zw{|{6u(Vz4j$X!=t34gZ3@7cuC`+GBKUl(2C~puR&gkympN=Gby;m3W9`V_w0$Sz%
zy<N^nB!|0=*t7`up35Pe3ck*R6}dZIcqRl~w=;#nafj?v+V143=u!7RWr)0fgT*Fn
zXF<DDRDL@P<LG@W4&)cW``lAu)hmQvUdGjlP@SuART|##zAZvdN6uAJp}lldjxXf|
zC((9>c4d)w%&TJC{?c$Vz4xmO^^jg!lL@AA*w5yQ-F1Rzm58TbVutTVY`^Z<?_cgJ
z)y)q4oH%DMqvCY#*?uYJ#x(3BhkyBz>Xi&~WNLdSj`r|Y1|QQ;R=2v|KF`;`fQJS9
zmQ|Q%Ia-g>Eh{bG?H~SRz1ROl?$zxpMErE~RWbqeS*Q53A8jlCcZvBXk|-TgaDt=D
za4JN73OnVB`}(QrBhEbP$yU3>B?xh*TMZCBdm>5AXBV%xC5+)lksE32kF7k@HxHF`
z5VmhHj#$4dZ~Ox8To5zG!;gYP5(Kx|XMK0)5s@KYRi`@zWlk<XIcEIo1<KwPI-oYO
zLc(*6)4LUD^%x}S@TJC-R9KR@jDSXn10so6)oL@UT9>n0QEMQUCE_lb@spwMBp42u
z$(1mn(ez98J6$@)^>Bnz%i=Q$9qh1Oom<7Zl@sg*WvX6wUX|BC<jg`dpnT>Ld#d0W
zU|-O0V3uv_3~8lhB6%aOUELI<k6{uu_(qkzR-cc@W(#}ecvt@EU<?#bdZ%iWayT0{
zIhYy&DjX^sl^Px=8STEAZIzL2=7k#Wh=TMJ+~l3F8^<W8Ss+^pJ9+(1@is2Xpb5TK
z+K<I~_r?KGgvd{AQ{4E#P>MA%8Xi8!7&*K#VG=8pkm(L{+QQPCfW*?By1N`E><Rw6
zmV?j4SRZ(1><Thn1Hl2Jp!CgK6ogDNx~XV8s!O}oc|hd#Q|HJm;%0Wid8}OqmsjQ{
zCzd#@#<Yfwf$0^*CV4t)rTtg~<o@CXTk2?7trtwrH5QfvPD)!7smY%+9Ud-q#e4Q(
z^P(KQ_1v3rR%-isPO#u+JkW@{>Jw~K<qs7>L?&&PnIxv0c!oHOj>bI;&ClBlPRK_c
z-RE1Zc$Hp~9)xL9`1uz=YMZ~VQUznT?ao%c6?<rHU2C}ISH(tn%Dn@*C@Q_goCu0{
z*)c-m-GNC7zWJFhqxnR}Fk=FT_62?G+|k2qcA@b#p7CCviZ3s;Cco=Gs98GpC({t#
z<|D<~I5ca!5D;-Pc|PJQBZS&qnQpIB?I%}~I^8g1OMIF&SQ5rNb{t!a^*SSC29Jvi
zWQfG+3O1&$Jn6Hs$Mjg)|A16sa;Hd)-CLRJmK>zr<1V;-UQk7ltP{5XeDd|Z3MEWx
zsAv2`Bly^*>5u!R>Mi3wSC;v@8rr5N?Szl~=hZ1AR7VTUeWm&3sW@S@kW_eWzLP`m
z0g96Of)OQ_9DUuSI-NqKrWH%8Lepg;YRI5#zfkZ-1+aGYPq2*z7nrMMZ>4e&&nyJU
z8fLAXCL~<$uSk`WdHez#$Z{VWV%8dU)L?<7xTv<IkIKb}j6ZHLW(^)~q9>_I$yLm`
zQjwLEM*@uvlaMam3$DOPWksZ0u~z(h?+GeLMkrz8;zf1sVmJ6!qBb5&;?jVN{6z{5
z=J~N!NGW;hY_MT~Jl~PE;hfU&z82OaQ$+WeT!XD8aa!X_Hfah8liV)g82dP%m>YvP
zAL}Q(KJWQu#W8N+b_D;BAz?U8aQTiv4gs}P1sk=EOpXPKw|#8mJtY$|IM!-#K9+=w
zz$eyjaH^g*=dO5#!hk@ZZIcwzF8C|es+Pd{J!}i*shWFM-!}ukaMgKdXg+Hj<w1q<
zb)5(n@XVYaY7K5%1lh@g@+v6%e3Q+#qP$Lyj4x_hgVX0`Ip{8LpH{tke`ooAnYvp4
z(-?z<M>u7k=7Dha?f7NfC&)YMT3fk4R&R)j-2`9QH8=Kr*~puysxMHP_fs#V9_7ki
z>pdmcNZ!}q`*17l&Pkn9Z&s|*-XLSaNR4Zz_mX9l5Y3gYmO)C!_TjtW2#27fGFNqw
zp*Zjz%kQ&>(yg33PL^SNebbv^iV7iK@`-9>fOM{3T}`IJr!S`V05cz_i+nfrmi-<P
z<+c-7;(IwzaVf#D_a_YrZhqLt3Zqe)KZG1l4sTyC>)n(M0K@w($Mad^U|4b&>Gs6u
z!<{t2Cx#fcXP_V9WkGXkkHVIFr(-97?080)6o$$ph3!33Q>M4_eZ2UhBH21Rk|-gf
z36*k9-sXdL%v%z|*EF{oY|<qs>Lh|>Z)>#HSy(RLqxDQBe=*wmtvjF^e^E?L%e{1G
zKHZ~K_$fF(gf-NtM#c9z9G5?E&|XWWQ$SknptQ|_BM|sHX3*KX>{XMHyHI0s1=qb&
zLb7@Dk#VktYi#*3anwC07o_#h8G*kPP4G+-*mOK_gFXSm?mx1y6jwVmg1qFk1Vz`t
z+Xcl%>=GDLuMJL3w!wh6adgegmVt4hlKADB?|dQQo)|Dd_Q(^9C`wggdqd5-ZEKdD
zY5$&iQ|olg5@b}MTPi!X5Iq}=72q)WkCn*xCB-Ae;q+hEz_flZ2%cMHeIJ?|Aq^L{
zrl51UeyZ{H#S>`u!$U=JDNrBb4;~?DzI)g%O_rJ+5{&CaYY%VYUzE5uTv;4ml8$>;
z*saiIMxO)tQ?vD+uU0bhvCe2Fe*xz2W|~d!Zhkz^+BV^DIB5>M^Xip=M^*28Yt?Xy
zRjXUPL7LQphK)EER0CE)-m6VK#1ZR~pYPAgnmJOp6u8BeL=LKK1ds%OIu9o-c!l>O
z=1S?4ViMk=!IzjF?XsG(#Ow!|Wc7*{pQY!PL`2&Y5jx&8@!9M8^w;>BE%L*=19-SX
zl-*D;lE`6%@4AVYV1RCiS3&M)OuR(_zvioQ{{*Lapq*?{NS*KSL+M(I7hd-;PFtA~
zRtI4K#IG_B_L1_=#^elm;wSqDoQ|dzg~V8^2->aOaE+cXd2O91MAf97Mz4Fle|&KJ
z1tbYR{SNUdt)xZ8m*g)_TvW-DiQawCo`ULf@X7_Pas2}3ECkq`XP*y#d;7|x8_vG$
z{dm6J<&eYg1H~t~{ic)e2yLP#QxO2B#6tYLFTs6+6}W8=$uhpxjfdlVFEVd?<QMR_
z;?ZIv16RiHPd@ww5SlGoT1@z8zAF)6mc;I02$2(9HvYy@jPb^CKe^(Kb$g6Be~<7j
z+Tn=@=Ghv3`dpfyGK45Y?Aq&`RXb<vPbejI4F=pw847q!DK5QDR903#IbbzNviRLe
zr-83F`!x<rL}tM-XA<(&^yiyCeF^P7IQ*~|XjM`c%(p7~IYx3Nb(Cznctuu&&P-<$
zCFlB{)ouLIXm`s#JqAgen8{$~>D2?ZnB`$(@#nmZetOa$I~gpl=?^`&<cWiN>cc-i
zh&~p3#&>^(``ruAQc-yyg(KdK(wDvO^I^_*W^u!urBU+jm=0vd^vi0FfewlD@?QEe
zxD~rMD(`=Mj>5H8$|WzZMHYKXsnAWhUA}l~4$0wsVjddQ$`#HOBYA6QzA=>V%N_$)
z{MR4K$Ou|48}IS(^k6LwawsW)W3L7jA{9#=0&1<y`DpEg2QXpIpT!A(xXt}6`>Lo9
z3VME}YP%PP<$K7#cK^1B*QONH-5*BK^mvU=_YOvtja+7_SBB-@;%9Z6vzW<{q%u_p
zky#PX3`5R-@NzFvK1B?9M}rrZ8{H=pL`P>yOIYkvucnpQc{_PAO1}@v7NE*Ivccr0
zWce^5ocSUrzUH4c7146&2Y9JM{27`I#qP!*+%?SVd$Fd>KE%E%)MWO-sIlfW@6#>&
zyBe6!c+(b@&UY#=%TeqFfeL4Sj5}WnivaZ}L^Iy&o6}hn(kDNY`JscAKYjs1hlr=1
z*mvuE>6wck=2?F@M#e9C$yDuI4_5Y2{mlOwpi#zQ`EX~J%v!hp%I=#=N+)W<U58pv
z@+;2dd}DyI2=Zn7hpPfjX4WaTOkJZOFdiv*6m0$o?~7j3<HO5F$>+`^NhOcX?vZ$w
zXDYbtj6%qNe$H=O|M<p-P!@<xF^Rw5Ad=Ct+=v8J*i)0bF8KHrl9;}JWv8vUI}EAR
znZ(n>?H1+N<i3{*5DR%9o63!mB2;PlAXWevu&WhLKxrY6IFQW~D#Gy2Hlvk-%$X|m
zFjce>m-&8LKWm9#HSH5V{Q|5Lx0kgAr9{&%mvCe@bF?Xl&pt@^QLrD=^d{G3{`}kp
zb0>NGF1`|-drvd%8mMV$TsSwWc{ag)*Rr`{I0W0mU%jWkMACejfo|w*BG%kL8q;3C
zJ=t-4qj_?@MTY((|94m7f?JvQDZO8K(NtY<z43ob%74#ToecLE080*Ju9$vp{E?k*
zG@u4@j&+q7+M{P#oNy|>pj{f6X*6fgTYi_nUUpg%XZf|yz#(#%-jBcV%zC3NtLRk>
zH-cR+B5C90hjO@!w~2sR-<Fm?@)y93m33BN?b68&jBndX4S#kW-x*`gqR92Memb2q
zsfM3@E7t)rv0?gBQAVYgZzyQ5gfYH!1alEW^`L_Whq?S!1RJzOQfbv!|C;+O=(%Rb
zw~FZ$x{(k1;b~Nm2wlq`JktmWgI)_>H?YIC7N09`wNx*}&LlVJ=5YJz=_ko#FLrRV
z5H$y@kQq$IUb472DIihp+5(a<PpQX8j%vgc&waWU1=^ZJPN|I)CCQOUeI0`%=|-cx
z<i%tGDelAqpSu&3C|RXA5|(=3D3QnT*Y~|CRJpNC!%%dXA+t5~sL}^g;G~clx~{Ja
zbiV+%2)0+vtu3vmc9C{^>dQ6B(;Z=KJ7GC7dj+iD`3j8Fk}m?mZ={qF8jjH;4LkWy
ze#p$hj44dS{3tQ}dQ&X;12>cR4KbrQS)YeSH`VMG?C3FkdtTv67oYDX(tU$Zr8M~Z
zEb`38UNpa!ywN^25~8L0P1gRTye4*=r8016omlO%TzTt7W{VNTKI!oc0<OlPx*YpX
ze5;*`omrkG0(a!(waqM9_pac)<H{<tt0z+$HZ3oS{M|aTRhCr(AGM+5^FoId3!2$Y
zLh&lwS4mgrztCUyJDf)pgSL#B(~39s6RMm{U&cu8B>w`8JU$><y^{tDH0BxTMtxH<
zguO%f2a-N&M5tmul2Zu^NC=f}$w|%w*yyf}4(e7-s*b)%845pMD7fc7$K*7=V%Q+8
z;ol|`IjFR9S_Pl=a0&G3Z`8qjT(m|1^)1P&YFME~lc0D+!eBn|gAaA#@_`8cFw|3(
zx1U+W>M}|UN7}c)E+P2qWp#dU+%j9F4;#tp1>{_^oQzWwLrQAv+t<n><Xs_$V@ptb
zM|{I)?QZnPj-hnI7e2Nj&wL}UJ!r6zpDSxXLX~WUck1H_jb#;euK{TLAUkKZRc}Ic
z)<#IenLHUo3+6+QzM~&*%{8H8J*$HefasNMsXZ(6O587C|DrTQ>C&jx8HsasHU>aV
ziNCk^$U(gaC<l`Tb#q4Z`yHmVRQeZ<%w8fcE#^zi@c0!I_tbg@GzRo>ajN=43|U{l
zsojF^FcRxdM`j3YVS$}nrEX>}3n4YhwmFeo<VwwYSd4Ryaqp^f6MXXn2LLzrQ*dZM
zMYpWCPFow9Y6QrC3ka-4>Yvf*zhYVf0JrBl$f0-GG=-cIg46``ai9+e48Zwznk*43
z!}V_D%J(0x&sadF!zn^SA-{lJLmQmzT#^)KU4P1mc2DJ?d&01A#+i3Tkn7x=&1U%o
z99B~Ai8?5yNa7fur@>{*c_HEZa1%|8_@}=4Zuyy2<;7MI28f>SXhQ3b?!vioC&GGl
zTV*|AQ*N&dQKD_{y*;9&g^dA5T;({Im&DxE{hWI5DkAW*Hk?blbcgn4KELE4)=S>d
zccV#Co9*@f%cdAqs}lKL6|HAgnEgYIDSG)*o5^MH^z>wbIvDRDfB0+nrd*#8Bfh-Y
zPj>DJK4EU3ZR%JJF?TXN*P`VW**j(G<u}1e-@|yZgCvq(4GZ`Uq}x3Z^dmyN@B9U5
z?7f!R7=4dV5Yi68=8HY0%EZD$@s+eUH_uimBUi@!Sc@THYr#`*{Q@_dH{KCsVmjxi
z*Zr6d@~FzjriO6@B))czEV#F0GHp`}CRZO+K*U!)QID`wOwwfx&rjPeaKE1p^3Bh>
zTjrq8gGlF$qez#+k@cO7uRlNyzwVZ(ael$ICVEwtxGtFZcJk(12wc{EB;e4I&`Wr@
z5PzRBk%Cm6sher9%_15ur5DyQUn3QdF+hXf`eU3^Z~9WcvrM~1>KYrR8I*nLsIyKS
zj?X(B;~PbPx0{|DW31xXhEtyQe9J%_qf&-is;4;K#yCUloAJBQQsTSx4W+U2%$ui_
z`to>^?@DANBykY)CD~Ml>9nIM-n%N4F=ic!MwSsiG)dY3<|0kPK<7zuJP=)uSW@@&
zO_Dq|PAPb)<~wX#@JO2yPOJOwxh{)66(+B^`k-l?sJ<3<1oe?9BM%)a?4{-Wo9Z>y
zk2196pZZl6_y%P^#`76w@(_Nmt;kT~6HU<h(0*go461h|1Tlp7#`CeoynpdsGxVT9
z%=hW=#E$+7?5%B%PCy1`i;gy>-V+7PBqv;pPpgu3e4ZXXlH(+DpNmsyKWn9EzTRO>
zuCs_-svC0R!X(yhrZfOv+cOnob`z?}h8W3|v#q>PzBL}t6KUm~PRZL2=&MlnhyPmo
z<L1WzfquXL1~3-*cfdxwn6YrM(Y}9l#Kj}P!^Oo%?*!lz;o}n!q5}>dF$obN@o)a)
z=0}(QT?+js#Kpn=E%ARA{<!%;{GgQo;pS&X?_~V(^Z&=m4`5+qVt~;d0s;7FcRB2j
zmmlp8M+YoSv|k+OkGGtRoE5;P5XNCs(8r~O+Om5`BJijbi>M*+#xEj0QyX?PO0-eP
z;uCy2Q3D@ebUln{@AMzP`~PYOy#xHub^`jpf@q)np8!HPf%8WMgmz}Lk_%%h=-aYk
zQ9!-15k)wZ?2%I&Uw-`$XZM_S@GCiisPgBT4x$I_a<>H^wubUdwAuv@-k}U^R2W-u
zsWst^E8Zq}6rrN5l?Y!EMj7dpt&+;GGCDly8<h1;SLIrU)Wk%UZ;kZ8@%{Lx$-MxE
zpWmrkP7@`BR$c1P%x#l434_c^6P2g-tY!;Zya)5s(rm67KGrR>1V$?3E8IcEoFY&r
zSGTua++H))wrX=J>R43gFc-$EZO}e70XFX#lqMX>Jm}SxF|+kF@;xJMRz#Gugbp5e
zuSIvcFh1Xm)}|b1FMngeACJF7!D*z1`ti&GP{&NR=8F9m=lTlu3!qw#kw~F8AJTZG
zla0h)k%V0U>rIC*w}{&6s~32cK=EvBk@I?Dbj0fR6*xdbOX_|r&0))4h=2nKB0ALg
zaL!o1S9DZdY4c75Im!N8>RJ!*GFy30zJ;F^3o@?=hEu+gRNM|Y?AdkQgn0V~H~gRu
z$`=`(L(FR%nNW2&DNeB?p33VqA5pl6*R%+y=#sziD-*0CeC55$<B&*|A=&*o2Dbz&
zVrV4qW$xpy>-EQ|xs16OyH8a<Qx_C?5}9pE8JIRm&}EO@lS-G2VAB%$W|W6Ezb_Go
zI@oKlVF<W9{wDB^WQJwf?(=H#=b<l;Nz102>h)tJJYHA8B$x(2y<Sm~<<YUfZaP+B
zcXd>tFI<dL%!?slbZ$88niM!cG=ZNQ!r=<DO2pZ>I0Ji_J>-cZrKbJ3=NcJJ`0@08
z^OGbhBa2J-l(z~~nuegTyv0h?B4!j!^%2<*B4dW&HWGeiTT%s4{auYn!B_HOXBE5;
z*B?iwJgWaLKVzYaVQ7e*RGwPyXAm`1mB+HlK<L6>=uV~9E%_14M9^SCMq8g^RCfC9
z$P>jARazW<ch3s%3!pRaay=U3ds(?)nW$nud&vvJj;XT*ZiqWh{b3^esu$0BZ(KT+
zu9X-ss<Bk7CpLwK5^1xAQQ{?WdXwOcX)}=H_RUC45$614bT%-3XJ1xJLN8(?!bu@A
zFDd`K;!A6RS2Wpt8!@IXypBdrMvkUQdw6g#_BhheA;>px0$Y#@!64x1A!9HnAfI@{
zfMrG%Rr8>eS}96MLTN8Bv6QkF?EiM27tbCUli!FCgBd+5en~Dr)I(?YFllA83m5-6
zk(Jm`dVRWsKY3g*5!(StxMG`><Jz6hB!<s?JneDham>7rvOT<C*HWg@jzSX!i=uLq
zg{FOU7W0UTc`FHh`$VA)hIjnkTuH_CUR2$yVc2qBXvN*19G+n<3zHKQrMl3j+r^4<
zu>wd(aIK4XI5bHFMRRw-cU}{{4h*A_ntR>waK2vDS*cE`BY(sP>_EDv^S;w2pV8yX
z!2K8+5dq8DBNwjuGKUn(`D#2#r=LY_2XcY8^g}iI_4TH^o4S|F5^s%ER?sUZt6q!`
z-Wl{HyBql=huOBS>5PbqDNI1?K4_r^P{qetXe8K%D=;L+${eXOuho30$*QIfgrqwo
z9G;d-M{$n`7VvJh1aSGTu{hh!=#R|i4&RUG9a1zN`oY7YHs|=Hfgv@8mXJpZ)hES}
zPqS52@rhnj+Q_i>qE2F@`~1MnjS2!%SlGtQ>}HC@^asajv$-ar4{?0DqLv;bD<y|*
zJjw>!Fk*S+VpO!?a<xdty`#zO($>a#CnqMRB2<=KMW>>ko#{_^^RRx+nTz?8z=VF#
zbJ9tp6)qwMn8T^6%<U{HJ+JNui{ZxoTQ+%NVge)ilGK4ERsM3?4ev&lhV1;nM?%7g
z<fd>3vIFBlDfd<K;2T@ZhVuc9;VD<9MT~^fj5~hx>PNWjaTK$LK9{!*A*b5>X+sFL
zCI@cl{jl++CE+OF_LUeZe)xhVXKjtQm9+Gnf@lsX(lD1)PN!5-YMkU#?=L`j20#D4
zhA@_x5gW{nv%K0$xb}Wit+Snv1&gO_pVVPrg<86M;;;l(r;p~?Y*Icio>g~@9ksF|
zmBL)!84ulo4>k!!J4q&6%tWz9POx#yh?6OY3z>3oQvv`=OX;V`zd9oR*bWcAo!fbO
zSXEe}rb%zcW%I6fq~mFJXg{=ENQTfJ@Y?jK)_kwg=kr<2YAGk$p)9lVN&1pf3O1Ag
z2>Hx(l4|+9(;iYIPk)z+M=+qOiu3t)e%g5nz7k(hlG!)F$2V78p+|<8R)BHMt##Nu
zEtwMDi%@5Gh0HfquGx0^C>($;8E>0;%tz{+lg<1BGKz#_Ka^uIEiKllSpr>7m`4)h
ziyx2q)c7f%`PG!}^GAZ9Z?(Uu`_PiAAE-^s2#<d^+vViY+YNoK7n(*n#$8ZIh)BzX
z<)x^;*CD{Mj}mUbm;fCU5oynJTZ<#jJM7dVHDlArDYLrgwtc)GrzSjlWOYAd??SW*
zu0e0ZdzUV%Qn7m3pJ{0L%$*qbV(b_2<)Q4rD16k&CyJ^J6Rt_EF+gq`Fsncg6z&}F
zu01xI#7{-K3V5ylG}Y11w%DeYlX5bM8De&C^t@UGHI8GOz$ch`D?=k(_UNj3pLkSj
zJ!k<LaYRZ7$R&N)Iq>t-pOIY<B2~dn8#Givn6Mx%k*0}!2|urn@!hzcYmzpZl-*k)
z2^aU^x3ie!z6lBme-;Zlk-TwuYvbwBX*6T%y1b&Ti-|e1_tFXG2k+9uapZrv<+;Sv
z^6_G1k?Ik=K4ql2J+bP8+${IP%rpoL$)#xI_3mFbz|1JEYg5sxBei~_NtZHH9U*@J
z1xI<|oMS9b&>Wtiv`|U)7Kt)5^wH$I`%$CmcB&W9>$p2_TELN%)B-*6NlqHlj`?hr
z(cM|#Qa359IFgjkkbKBu4nrssmk-ails2&EQJl=C<c)4_ecxx66L;;qe7;sPnv6&l
z-gx;_J`w&Wk&)Z>dv7{-SUd)s{f%2y^%}KtISu2*Ba`6b918+1%L`I>)!8RoiR`90
zRgp`6d;M%~8d=@)Y((TO057puM~jr)V3%-rNV=Tg`%M8+wqTl+5g*yTzOm9HQ*lra
zPUw#|)^{nWMmYg7(+cuPj0-A#p2e+=6(8*N7`maMZ(k@7C2f;h?Ck?=Xy>!!Ry_Qt
z<AEYlh=$!p2=*bDdf!H4_?dzAt45q)hsw$6^U_ehT?nbfTw-!Kbm!vZxI@*pI$Uil
zoya2Ihcp*8#jW3X6H=g`YqR+nx>Sh#PTGxV0Cm$@lKSgk5c(exD{f-$U|=oPwc^?#
zX+P!gfSl%1bm&6gPIsVa4ojmXXqjuDHF?MtY(p}nY`iIMBZW0=Ca)GVRx?)G?>xz0
zg`8>EXKachRYeR@lo@HjmzUVQB(`OyL~kxH2T59XD_x(-$&$@vGa3#PRBBTm^lyR}
z+P(qetKP)0;2@qoyV95-o*ly!T{;J~I3s_!JS__k9YfH|w>Gi;M;dR$ii=&y<EqP$
zj12^pBMNrHEk0r%ZHIX$J+5puAy3CfSl!f{#UUJusp&w9P<Nt*J0635vSU+toZvpc
zA)hulIS=QdSz6@9R|Xp%6do!}vT17SJ#R(A^j!Q1#XJ<Y0d})eB3v5c+FQE`yK=ye
zyEjDLl2~I6oiO0{)trTp^d*{-me_8yhifH$4|?bSG$(gg^rTK1t_X1%<+p;GlD+)}
zoXda~H@TjDrCSb`VtrAT?UXLU7{|>=2gwBMR<hV8!R~ywZZo73G2BNYd}5_Lj2!jU
z-9fo%m&9V;IE@TOAdfpWkFljSeRUv*LsD^IO7U!ajPJG+t9K*5!qA!|bEmgSY?``>
z65)N^obvRvEWa3_ksu-@=q*L4yXs2h@qO801<#@kzarBFJtcjzz1QT9CTd{1q3Oj5
zFCU2w<kuRx7M{|eMdMm;7K7<bb#1K@xyAc(Jr|h4UaJL)Ctn3E+;V=n@o3X%>BLt-
z^K0<V^ZTogKqzrS?C*?~`7L}Nl2p9bFZGz4q;w@c<lSK_Hb1Oa35!|`hdhN;(T{LE
zVi_unwQ;P+$UBui;MJeXO55}cjWYr&{O29}@h^KVv>NV+k(H7~R<*81He52&a6KgE
zd_6W!y|3TT&EdTm*}eZXRxG`yoTZ^^W%VTKc=f$+voGjn-{_@D$Kz53e!|3pQ9AbH
zmE*o-!SA=P5+`Ph@28!Zx>!2Y+E;Ofx>x&z|FFajYznc#_QjEdFC|s)T`YW#K3!}0
zcpMoz<8uNY9KV-8pa7qpZ}G3L+@;n_C}px92?@a5nMue-pC0HQ6kOzMUgcyQG+?Hi
zSDHz1B*_&ls>Gq~86Ipr%)K^WQX2i5W3TF5(Nd;|KO0+Qr*=tLq0`6mI5lbg+exUm
zBGH{iBSL>^DURKtW~$z5%UAXFj+odt3J1ixGl{A;-UB8CJ}Z3b#S8p$*75Rf^uyqC
z{1zor0st51RsqN(HC(Wr-gR@&U^?A#zqrVVCE;-%hndD<<G2LV)on8YtB-@E$b_7D
z*_=6b+5v3XflPW2YXk1B75uM?+8ASJbQ&GDCiD{4>8;W*(FEraz*t&G9&(&`)#*|h
z!!Tg!ByPHyAS6A`NQzPA^TDS3uH&>=$QB7T?~Qo|qMF{+DW%;YPCo*ODoivRU&8bs
zmlz~>zV38nGse$IRM+QA;DL8WrsfLGDqz~StU!{eek2g&xVi>Kd-!t5DH{o?xe~Mw
zN!?LwC-}kZoqW$4Z;=zJ=|G~-A;w{wx8=x+p{$sg#)F9=-ospzzxgcS8RG(j75lhz
zk{WxWnr{U!Es;5~JgR;@!aKoZU`2&V?qTDCVzAyi3hz;_V=gvOPvFL1t+Uv3enI&;
z!#I;?uli%F!Hg3B?9>x&LHp_$ZS=+v6|;VnOhyl2zv?lpy<2skJ&4<FdsLfo94@t*
z-nR>2jPxYIbUm6RI0eEbjCmmlwjkW`tcQ4bm>BZoc&pd|Q^fGcDo0XX16>2-yr4Xe
zCm2twb;}c#S^FL|jHk<8cx8T(Ucx_iu8wEt=jGk?#BHV$CeO*XpdW9NH!<Y)!oH>(
ze01CFh<cQ$35H~x9Hw>*4$`<E8a+(c`}WbNhmEUWe5QQjTlP(<xt)`EltjaX%enNF
zIQ>z*j2<hiq!@Fjs7A|d7ar%Re6>%iNc_ijM)Dk@WTlq}0USCK?9fBRLm`U;O2aWN
zS7vr2K!CEHcgMu$n?1ze1`j7LV<fwFT1C}JtSLx&;Bo&Ou?S~;Lu%>9(v6nE<6f~_
zaRJi2)ghs?UtpgJ48{yM#95f6APy8A87Lu<hC#yO$(cEQ6(jN)!_wYj4nf)mxNK1a
zfZE~p(tUKjVPPyLy>t(1sHp%|l@-Y`YifQuP^By=yb9Xl5`-xnrs(M4<!dML$<XD~
z<zWmZ^O7FvEHm7xFl9g=kNoNXqPfXnHB&34AjcPoB|jM?<F%w_Nx&ZTPH?;2Tn-TL
zH@AMGzp{h1k!rxl8_kc6$6@K&otoIPcqEA6&PW|JfH}FvSF4n!JWcPmFC&Xpy_^QE
zVcOi%>3cv#geOO@Z$vQE+&J4Cyl2&i&CU+_Br#a>co*p;tzIo1Cv7lFKt{R##KgCX
z*nfyVW^fPHk3qcGvJ69TnC0Z-V`rEf$J3>+3qQ<i5;E=vSrS=@3lWE5I4s(!YCKau
z(H~~gN<VOOj8_>|r*m>=VfW3GBuK}3yJ*;wz1<04t*jTK<vEx0xT~Io-(o*kxlarC
zVX(svlYH}Fn;<McMVo_O%P~!r(YN6{QB3i)Yad}tQN!9w{PhP{NV}mKHC=V#=TZ+=
zl|`Z35x_93sr}e0@unxZE2>MKS{h=(po?Xp@oLD`f%Wk$%Tm%^;ToLd$8ECgfqm};
zaKxuAs;vFWS<N7pxJfG%D_pi+#6l8W&n)Xk7Nj1`;aSen$US_ak6&7TH(R*T$oL){
zR+M`k*2?~rS-oNTI_FWk%A55l4Tb8Qc8!`l-PAHsVnqDn>{4eoQHe8?yVgs|?LJ5I
z46}F!<+&)7t*E_<*0}myjUI2e;GSyxH)iMy9^bKBA_j)Tlz!e**k+V&328hjgi1Q{
z-G^OJ(6{K<S0SF&FGn>6xK5W_tFF!IgQdVQ3tr3WN^MlFC$^5{+4Ji?4es3xUJ6hD
z48_xd84_}6G>-MV7cY0zfzOuy6J+XgP_a6U>yh)BGY(V4-bkN8Hd~}OJCA-L)zEkf
z?c>}_l%(snpz71CbZh*jBJ)JAKHe0Elpy^4eE)^3_z>5{g0@HSmZ|A^iz1hesGxl+
zjttY&(?|4AQQk<Z?uBSNNJK!NO3cFP*Oz{3dsJf#vondd!EiuR{`yQD56qm!1)eRB
z(@K5xQtsx$!a&zZ+OYeHtv@?vgxV^ilSH@0$J;;YW14^L6N+<}yo#2GrVc1yZo$4r
zc?CN5mKUMk7sZX$?#D*@x>G@paSZ&ytPjZ>D<`IF_jFrce*JhU^x8j1$<XiIF4<hU
zx@pgG?+(ctrbl8QVQODU1NC*eesEPr5_1`su@SOKtr4#x+AP+Ipn=0=L8e~FhXn8Y
z!kEwdN1kc@lQS@1@_vgiuOi6QQ6dcth?k5G{^D%S?|D4MTZ2kID<i608<;HM)zl1m
zs24(OdbA8*-j2^bqf{_9<yAf($T00qs*M#%EzPZD`l2v|T3R2TY2XN!{WK~zowICd
zJlA2UqeL04p4cE}D}gQa<k~QWfau3!ReN+DO-|s4dg-d_vi|XSF@BBG8h2k#Uqot`
zDWP*Lbv6Bmdu7e4`uea``0Pam(nN@d|FJDIEY}}sA#UvQ&8aya)eNm{wQyn0QF|=g
zD>-}};4{MRbn|*`*U}T9TZcO=k{{}tjfvlX!hd4UNs;||D?NPI8C+QMLz0f+@>T(%
z(NDJ#zc?+YLf&*}Q?+PxZ%Ri9HW$FS5&qylb;lihG8XKdK(*|T_~o2-8W@EhQBMdT
zUCA2MIkpZ{QAWD4r;@XEzo2aMqP$jHVTpnYEdq&6bB*^bSS|UXvon>D%2-m|QTj?z
zH|eM62&BUK&`Rj@nqr1m>5=TVhBb`QcZpTfp!G{bD2Sq$f6v`C8IF6_O<ktt^c7Dn
zW|}UTISndUB0!cH_?z|>ZOm}v=XotjL6}V?Gio`8!+45FzSaUC(U##A_n%79wskJg
zwVk8U&(CR9c6D^<Ewi>0avj=+)yGjXM|EqHgb$03FnCW?@KGP77~56!x*NeJ^?-ED
z666x%&3R^sIHP)PFag&>WKl~J)5GTKGP&A%6xC?ypRS0lmAkb=T2&cY@kiy9e&|+S
zzuf&agdf1g)VL^WbQqa_Mno>=9Rt`KXQ*w>gEji?cOmvV77KtY`l~DbfhXlG^{}nY
zoNyX6kqb(i9h-1ey8bxV<J!(c+fSKndS<TkS(M>9)bfe{D7AFlSpgIyU|ghYFpBz_
zRArkbPpO<?d@WVQ9jAo6FX9JEj1;YpmfId2C^%gQ=UUpk3F|>(xb+htca7x<oOOLn
zqx*Pn>HO&a_``2kkcOS@vBHc=l{^RLdYHSyIc5w|!#H|R#d1t1?p=DdtAlx*EfRO1
zFm|d}gVZlLN=LWCeUqvBRkMejX7A)H<oUaMu^kB&<5fsJ84-s~=FOFetxkOFxY^fl
z)GlWDg|e&d5<ldtP3Wl2rBw2^anLeGwpJeYk2Xt>8ona0;xkX)7S4FGkwxBi<aZQs
z6LvE2z;w!zul$K&4U8P(yFIE(A>>6YZF4QszFIY5+k5EPQ|GT4dZEWQ2CjtzM}9Do
z7ziV^%<d}1%w128#lmlT)@Ge_d$hw$Qt83&qKp|gU!bKs?R1h>$+t}Kc{?CvMr<5i
zMlrZ$)4P$(4S>g}E5pyQA4k)}+Wy-dlrC=bWdla$uiFue0SP<4pG9(+R6W`X-eu6a
zI$nD-ip*68msA4dpKy(bWo&)0MVfXeuv|#o;~Z=6GjW|MYc$MG#imJ`%ImkGWW<r}
z?BRk?Nve0$(jgV2mR#j-f$UE43R)t3o$IWV?Wa|e;I7TLp0~}Zlll~qWe%ye-MdZ?
z<+~};N5R_+kIYc(`GT(}&37mJ_%+o|=-A4i4ZRdE+>@6A>+f;CaCdGAeBSU-aAM>6
zY@epIfyg|@D4SYG=2*-~+O$lK&90r_SK8H8*|_iZRd=j+<>Yu0h7?lv^n|+i^}5L(
z=b7GXxF}G#$JwDA^f7h<Jo573{H$^?jV!`2@q0oT?qPqD=j(7mWHvs1aNAa@K1rTN
z)%oMSkV}+29Ck(1azn(vTc>V5J@cyBK%3Ie#KC{}^Wp{jC>76cLUQ8}POOkcSxr9v
zCsXHg!7<L*4#bec=|Na?P$WvW(;nxsQTpW4O#pHHq_!@L;xvrZ=7)R(7t^W#BBEjZ
zWO|Hg{_BjMy6CID5xh7I@+Ynib4UPlkGa}^)xnD~F9zYi@qkLSX;|Hmr(WY3tqtbX
zyGW8$xgqJ~_Ei!)d$}+xx!_S*@45K==d$KQ2*YbL6CeW<16#L5P-m&#y?uJ>-Fbls
zVXDD9X5)(Y)nw{e4IwESM<T2K@b=r@h<zUUC>F$Em3<cJH2I_4$B`GrODjw#-7U(g
zQy3?{7TORh#JfawLZvFUPFar%kOII+*0sLFgfjGgl)&-u0{x4yie0|aR9G8Afi(s+
zN(J&^uup->cwyA-aUa)_#cYon)}^tIxWUD>4wi7_#=WrBkNk7;8S<z*=&M3wc<80<
zO>c^ts9tStJx*;AN9lsp(uU_k7nm|Q6Q;Bop@W~&Fs3Sdx+Ou60h00+#xK0Xu$b!n
z4OtE^4jw-3vJ7#67l6t*#zKx%LwDj@%&*hgD|S(bkPhP_+mX>IHK#?JO}!OqHP6lF
zfEp_SBPM0~n)|zZT;_h!=cuV6DAlOLCRo=!*L7TutOK9JI_OdSq05wkMx#!AoUE4a
zY&~82>n;a~;1%XqmK_(rbGR?#E1^+cU1_*xxiLqM=|#~rfHOis=s<0ZV}tuq+jj;v
z!!<!w5hY)fiwD<AndVE##UREzE)DTk&bXp4*mgh`!^);abqT^a77={Bxel%j8&A`2
z4trlbC)Abl|G^<(K)36dSvtVxiCAC*_KZ$_#%e%nQfCxh{x7mz*RL~bqB10FN(dlE
z{ME(@jqr%B0_Y|ETo^25CvJY<C2E4T-d6MrpBl%gOPB_({);YPu9O_Ax|r3V&NMQm
zThyPf%LpCi@`~LeTFmvwOwp0;4!cUDDH-9#XSVI=gHI_irYLK1P+)UO^3tv!i80<8
zZ0WXt7O*nl$YjGATxp$^T~swUySwQGJMi+3qG>yqH4riAyRV#4A1EeWBBNPmFYU#c
z8i9>?oB|aR5_)ZSm!?bnwe%KU_3n}El1Ei-g)M7T4i87lXlax<mUjxwcSQ{)fi1b3
zADyAXyp*-?sd-zYIEbsNB5ql&T+vUtE_1R^jX$CV#E`&)`c5uZFnma4c-FfQ{V25P
zXVYg}127GvgaR(zy^HQZ!fD`Nc`AeKmMnSwD40~t^xCCvQWzV-08^*`rn#)*)%?l5
zeiplSU&obC$?2>W&x?x!x=)Yye_Sn)kb69Uxd!R$Am-{FuHrut8wcMH+stvT%)#4u
za5h$M**`eZ1;t&X<2vsBbi5hR`&_KWj904qJ+Ek#OHqYB+e?RN24{6J9mHlUa^;cq
zT6@mfJ0s4JbX3>+^&q_1IB(&Wztl&%YG*!{{-;0&z5;lmaZ~XNTg#HgY1!v}qm@nP
zzMnQxx$rZh{BoXW1Ny3UpqUI_AwvwnHUS(Z<AE~WnqUsH&(&v^SrZtBn_1hWyI93!
zV8u$UI<~MxF?g<elkHhk^1rCUeecf^ep~CoVLn8`%hg7`XrCv+9^Sb23t+@quQ+%%
zl5-vao%=`?bLOwHY*yJ7%+v7hUDX+VdRjdmM+Ch(6KW9C(;5FpGg`Sx!2WgP@Kxh5
zMMDK|Kdf8{(eV8YDSkXiXuI=#mLk6LHjU|)Bmqlxm;>?3PN;WEkmlx#0YSwV@x__B
zf}URrpoVX)C1}C?3{o-yM_wXtsosKa>|Y3cm|DCUcPo`GzYwcZF*0(0*Dxl1Kau0k
zJ)M3mmMGjFgSJ)dSCp@<-sV_27GKA*JK{og>ixOY4#Y?mXu&O4;6#!w-A$r<M#|_X
zmU`N~tn!X{Zp7wuo$lA}-szY&=m!hbRN#XX?-6FvK=CuV>8Pd-*AE3+%JK0g!h6Op
zjh`^96Ar{LWEg!<DoD26o+9w%=(h8WOW{fy=bzS%+;vJy6<E>%H@G~#&K12pN=U2I
z$bEa6u&1i1QowMi%~A3faQOIbJyQ2DuWj%H(HVnS)=UXqj_96RjC`Zi+_ne%TidsO
zi^nSo(Q^Do(~6ic^txH&RSZ1~vzu)as=&fkwry(*0;u5oP2W_gI9!~fL@*Jx{p1v$
z$pyo#y_@Q&E&q{C`Uo~RmfG41a21uD73EVSF@xLsWq4QaLIkAoU0tQeJxT7(&#UUR
zpl=L#2lOHAgj?eFa?Oq)6e0?ywrDpVD;2hTglra3w``cA&^mgf&6+JI?y(BWy(RR`
z>%=V@`6z;PnXP@L#*VxPT%+ulHZ$v(aGZZY+2|gjCbJ{evy8``*d-RkQe7QsE<ZVw
zbzXu2#XazsI&Rrv8sfW<Mfl2!ioUF!nSX1XgcD1<YY#rL(6~OAvcp|GfGx7e@R)z{
zZXRGFS7983W(4^ORV3=v4q+5P_Y4vr-<SLfdf{*byW4)IR#VTJX{nMI^U4<z`RWNn
zYQ(Y{ybp)&a=qa8>QuX*n};Fgq?}f?xk))kah?Kv+HKU?9b9?2c$maxEya1~epPY1
zY$G+6);S_0u(@(>29qdB0_D|x$*7y?T4hdIUKk&fyWtcZsFe!T8=Me>?eD4`;jOrz
zSQ?MsG7cG`(zmi+GB9B+uM9SMhFR%E*k-fe0__(9ZiL5iKYkKu$)7Q?5Y)iWN%STw
zV3RJfInJf-;quO9OyaF=*1EqD^eH}HT1#z0^jSTXk$x23Fe*3TFs1K<c{W?I8pIsW
z-m6EiVOJaf09ZWGf2-KJB|cxFRTg)?;832o73W&z9Q)8I)7VeEu&8hIT}5c3Bu?ld
z(tk|Jr?xOp>!ftIY=`huN2w?1fg*O<px3<z){qY#X%CMe@uj8p1bFPyMs!~=Qg-xa
zK{hKGzWYfy@C5{aqb!lWPdj8rL^)yV-ROA=Z4itKR^Zzu;|-xS@A@DxYxEG#Z#YTi
z*{Ul~H0L1@nQ*OUu(lYSdm>Ydu;#glPs=El(&A%7zEtd%q8*mbB)IS=UfFy^eQhV`
zXs>A$UJ=t2B>jv{v73VrL(5_B<|Wb(lv}gzkwkRb%x8T>eO=d7Jgjj#s+UX)rE>Jh
zI#3@MzmxSbphdM<ZmH<yJCc!(9Cc%rZdDEg89<&VU6RYoOC&Ke*|m(y&u4aa#1+zp
z>zvIYWu@?pR9(_Oy_@bp=bO7oc2LPR;R9a9i!;66lQL13${<Jlc>E)%#96?iyN~d>
z=r3S|@Z#0Yu47FQhoghb`KMt+mRq&1DBpx{Nt-tu<n0B|c@89K>4V+-^iahbr34hp
z*>qNK_sB&mGf)pVX&H&StSgF5D@qcNZr!HKF8u{mHdeBv5nMob-O<0n7iQRE#y0t|
z&Nz(K)U{UU22|gsHO+`1p6a~Yep-1X+&+lIbC~Lrz6ZnY#VgR3=>tjoMQwEogXPi3
zQbqFDlh|A%i&rz<c;5LM`q@>MK@Df65)y6oM6eeVsPqDU0qSd9(R=lFVy}CQ6kruE
zL~7IV4;CG{$(kFPnp9uZqtCWZ2#(1u&+h7(H@lX*1)F6FC7=q!0;MKP^re97*$0)I
z%fU-kL6!JfADuXP=x)0C-3z7c`gAmQhtBC$Td_cOSjV#2x})hB+;=k+^c<n^v?p;0
zg&|{i<RF7Xf@7L@a0~k9Q>?lK-0{tZYK<CdLB;x+XW{yiTnxM80hlM^>Du-0%Xf_w
zWG~VaSS!J$uJ+vh5$Z!{SeQ08&JT33dW4HwX3ETvIo8=2RSRT|Lr280GTNS>g=!NN
z8QqiEo#`JgweMQf4m26ChC;J>c=aesBLJHb;%m8uNn-W^BY|n@nAlovMpwp}EHx3g
zS-l!J5R7;eGXi%-)-3;0GjKaFvyKwkU5=}%EOhH;(RFs&R9tw~IVxSkO~x@pt&Fta
zv0SOxYr2n}QwdhVvK|8`9;Exa%-I39USeAUPfpJ2*D+|~YeT-E(iSVgp^_{IK5C03
z2G`d{_n<3xG+ZmIcOn%p7-O@981k^t=T2e<C23c^#B-{P4gtjmL)}7M0cfPG+cTuq
z&;v_=_zJT?;khB>u$cR)n5Cu;FJ-BmI=CUc@-wX-l=eZ2&il6M<;ki$&uI32t>`t(
zmxri>eMs4cD0TW1g4AdiZ??X!=NSrkl$Vo^-qUi>r;F7tXD{6%tVEw77+xiod!!ok
zLygCiVoYDWyiYsZ+$yAn0rKJ@EpQ;Dwz*G5+pw}*nP_0BUySRgM%r7X-kUPWnn^pe
z(l*59a?=!ozu4YVzH?7ZP8*Tmk|{u#EMWjS=#vIx$fJlA*4FGOGvoNmYRNQZwF#^E
zJ*!9LJwKcICPEyXy>P*;7y_bHsncq_)`{Db<mro$7<t)64)2zLMGTSalZz<c=ZqBd
zYYOr8uGW%lF!BNZAS;0#$j(exN$J-MSQoZJTUmT@js!A&J^fzwQDVd(2Ta%Qt=_D^
zbc{x>-Q19o0$~}ibv<VWEE1DprZ}={c1H@5443)wa=nEmU&{3;fcqU@Mm!8S!0qN&
zvdMMVtzQY?zcklOMC_{DGTb>;r|5U!9<6%LYT%9pNuCAUc#$vNRt|cwucAQzeQ&;d
z50c3qNJA)E{gNoi5rV`Pzx=2ikW-VVtkpPEifHhbPWh4$Wu!@H+XBJHk@<R&%7nbN
zgYB741@B90-4NPCG;rw@5`TzY99}(=EI<5z0IWb$zgI_Ro}7dfwM+|$sg^Z;8Ob0O
z8C<E)Vf5{`cvkPAud)^D*;RDBNlOh`HB_?o*(D&DyxXZGBRR<c<L#XBYWvTW)>=^`
zTz+04nq_~V9TaVPKn00VHp%P&Bp$%=jy@y4DS3OqPE}j2OG2+xgwsypmb?r$lNcbA
zfV-2705h;Wb2H+{<13gxBKfL$<u5~TE%;PvGcp0_PWUIcr=a6TA0Amd=%X%m9WKs?
z_@(?wJT>t0d8%ozP}Nn#3qutxy%@0!`k7hKnB0G->Bdg`<Be(Y7x={8D&UrvmAPVu
zju9rPr?|)}dP4*Pu>co1JC-aC+ik{<(nz%~OtQ|;*aSdEeX>Z$?07S0x8abIflF@f
zjE{5u{rKoZ!^a->WtM5bWB&k%UlM%v;@wd<o?y96PQ;X^j%JPp&N3D?zyr6Z35x9X
zNYgW;t7jUrf4>sioiO95hD9e%Mm2tC`)$N3LDZ4MqTqf*^!&KGDRhxTCd({cGR+rS
zP(aBi%6~2)OJAZ*CG?aV55L%dZY2t0)auEdAZ~RG54J$x{{Z8~H4&CV>bVLqSdd5G
zW5Xm1B1a)<R605aTmZ+v7UhZQDgY?G6M=<Z$G&)+(DjkQY~yAqF`sOYPuq{Fq&{6F
z1P3Qp4u5gmf*UQes*MNm%Wgw1F~9cWh^LO;1|=AL<R0pO@5TB`W}RF{K$0_^On#A`
z#0~!d?Z>Z4O*APkwOK<j4B#l+e4Kji`;Wf?%7#(0Gz(AGl~zRQsMHsIC-nVzgDrB)
zBb<YchIcsQ>$fvUSzK4A3`goZJgcaU$K{^i@Nhb^;*S1R!vnSsFnBTVVdJ7ql<|oK
z(M-Be)CZ>wT)T3sv{j_^6|+-UAt4$EXrx`c?T^0+i&*I>lOcg^{`^ignpjGWrGeb~
zet+}dgDBWhxE~Hb#M7ES9)3>W%=9bF7IgvRon#T$Q-T25_YS#VrGf4FgS_4c{A%(C
z#3wJ({{Sw%!Y(+_^p%81Q-Ov9LGq9ajlsv&w;Y7Btu^k4r&${r2<f}X+DO44)%uL&
zZNMMqm7J$}5>rnsEl$8Ju`vv%85{oq%;52dCyNZ4>6gPaqR-Gp{<bQ@*9l>Tx@hu1
z7&L)F38@bG0QI)U0KwnO#2cc=&Q{9086F3D-bjy1L712w1m%v**g8%(D~$Sa$&Ua(
ziO)NDNAghKE)_h%V^uM<b4XrT^RdGdxyA+$amM(3JAV<rQ22|z(ps%ke=NUOGZ-SM
zWyzJ@n1EY$Cm?AZx5i1x!;{0D6}_6F<i=0oneO$=baT{0JmQ*0hNU4_SqD|mZ#yZ<
zf^rX`4}<P0{!0~xdZv=5XyZz5q>>Z?l@t}$yMIZ@)E5{d%yjWps^<;TrfS+*0~o3!
z>f{x{)s|NKd3V^1w!~}?oX5=Y&qnf7)9S6Z)9H!Ix`O(fDC!QS1cQQd4{kC^J2Xe3
zHqCvxQrFEq!IpZcBA+tD(^(WVX>5_C>f9XqetZy@nhnD1Zl;#5syCJbT1f^WrqPn1
zs2%nolYj!R1Nonw`jyA44Aao%CCU6PO}dlnG=Y)d86;q1e>q0Zd4lCM4z)C^B_GX4
zG;o%Qw9EK~lwfIGVOP2K7#R&Qwd`THo1FDRlDe&`;AfI}rX4m}5XeAMy0NH+LdS5&
z7$D~-t12m}=a8bu8Tr*ml44#I0ES@TfJ0+Pe6im<@D8TaCo4%oRq`g1wy-IBV2v!1
zBCwNIpx96}<Q5~j^aKhmT>2{RQJRR_T4^7t663DRl640?{EE2K?B1E(si8IKA#$do
zoJ~rU;%yUj>Y!<JrAXAc)r@K1xdR%wrs+Xdex<2+>&n%`C@{@Vg$&D*K@11k`w!^G
zJ?ZA}5lmMqikfR(boByQ{$gZC#FU}i8bXjuWa<ZSxY&Spg?GEjRas98t!(KWs*yYl
zQJqd$MA_|}1DxzNWNnfh^+e<B@|NE`vb_{CJw$COUaXiA*T%ZFZMag-qz|@oJ<naB
zn%@zuH4jYHERa+#2-6|Xl6#hrK2+`72Yv%{O|mbVhFDr&ja)!^fDxj*1v-wcI`uIM
zHpy1crhMkx>PtfnwmNrqt959Aa~VJ|QbCM*dAsg(`*9Zi5wDR3^U62G=7{Pdoh7W5
zauP~GiiXs{#!GFTN<cW=u6+h(L*eCJ+Gs9wxsmB<*T^ny6H|?3gb}J>usQQ;I0wJG
z9jlwE?~=VWWKl;?O_?3yMtInXnTZ;XM&$>5fS~$r0^@tG=3a6%am`Ur6&|IU2+^X4
z(Tk0;%2W?ifH*f@k*nyjcClONq7VjANVNp(igeWNwxB>PGNc{*ok#VJLe=zABGrnw
zT5!)2Knkr?M_RJ682~O2jrKXlHpsqr<=V=N!0W{W%QQk}k{_l|C;`X>5x;zpPri6^
zrRMsoPY&rS-X$|S$0Y6721R9150w2_7#SGfAD<D^bS}^@l{t`8^IRw8#VmA>h*CJQ
z<s^_X{=IvWHzfAkc%037v)$(x3Urz}=z4+7szIj!3=pJwhLr;u-_vaHyUx7L4>eZX
zBc~I>2@e}e-f-Cknlp^9ci6EWowJiwH|s5*m^$G)f|m-a>QI-?HpbnC<FM360{29(
zWV>aKD#{8LoKCe!Olca))cS^@mLmXZQcgQ+J@{v(<z~OqJZ&8ev}#uosbM6c&YYG6
zfu!mFleTk@RSP#c#Zk?0M<hfdv6RlFCtE9x1&#;`pbo@s>Aw$0nU;c{R-Ix*!Ik2U
zEe_dc!N+z7bNTx3o+J1bnC2c<rR8pQMTw%F=_P$jBzpp+5J3cjGvBz|-+(teaOTR&
znd&mBPfi6o0iY=ZW<To44e9EAxMSu~B^_LHnu(&XSsqkr6?G#9O;5I?j5?0{gP!|w
z^xVr)Q8UGHt4c|dSmqI?rELrwQ3D5d2Uocy`<@y!30;J(ls4LXLbBG>mxWe1BQeGo
z0Ydq=^Jm<V+pyb$P03KyS()LWrIG1;f=FQwkq~#tRyg<8PT#K;U6jK;r6qTX13WT^
zr$&L(VBTz!xdS===R6U&TB&T%Q`7$dmx56~5u|n_U;!EehHPYcvODpi{E<s!3zZ!$
zWxlGWxgMFIsAE4)O+h1e{{XC{;I;_U=ErUo66zzCNFb42o~2#ermG!DQ@*9o*Z%;>
zcLQ)X%a@22N#~)jte(APhA<+UofScW*o`>J$Z#2Qr#T1p;WC2BH1??DhH9Ex2ai+$
zx0PIDECS;o;|#s~VB{6yZ`l`PrGuJnk=J~@(p6K-0|`2^)#<_14l+o|CmAOrZo|^u
zbh6!U6v8O}Xp)U0wjCr~WlH%@N!5(%9q=>UK(f(BBn?wl4AT*)m_m-ey(JWaNZ))B
zkWYN)gB2>4>J@rdD>O6d2kU}$8(`(OBmxFY072jZ6$%-t=^N$bmfuig074o_$tvWh
zkZyKhaHN1&AZ@@o660{W)za2nX)5D#XQEL`%hB>LmjD9Wo$^1YzqHzl`REttD=Eo^
zRKX;MlM6{ER|na4-(K63u<mZ#t5O^FaWYD&8D$F<9IVQFe@;jnmD?ToD2#~}x=vk!
zAk@)9iyoe=kcnV@ysXRtVYuvZk~ScYFh9oc#Wg>}?}w{bC0!*|`bk1i&<VPb%dlYk
zC?$Qy*uVsxv5-C`ekgfc;k%Q*ezr*JY7T#w&_w-7Y9~YWA<vTs0G7@M2K|pDd}r}G
z`SAzhU2W>~Il{SEpbSJ5apazyVEPZ-@u$Y|+}|m5XU~?k9?CpZ@w1tHYUX+GoXK^b
zzOr^DRIw3Lss5PLvW<sf>FdH}R1DHFIDGs1aBAOa6=(wFM}fKWpZ$O1-_Vs8EYnF;
zu>%-g%NKlwBXf<vKKbq6+pEb(NXh+xEjAXKWqApS3hE5Q%HNUwcrQ^R(nbJHDuH)w
z`uh5NaW;yMmRppt!5Db{nDRq;w(N1=KDh1ZII8hk{J2FSjgFuR(g^{uJ08dO;5k_t
z>@_i5D8y*wOot?@=QtnV{@g<<Ae4x-BxDh!xEjuV@x_`7i7A^@Y^crkc`{Gwws^eJ
zwAfgNmVYr^9R6F53XKZca+Dz;lhal>WeOZ%k9^~b<Z{vU<B*mc>0$x<{@CImt7RQ9
z!95C$56gZa{PUWYEFyjLu{j@oj}1bk!f9O;$k3RHlni7Olll7o-?tIgLoCZ4rc`0M
z3!Ojs;uT%-io}T_IL~vC58J*!^~KogbjKu;=rO~yF$Agf3O59I{{Vg?(CRi5TEj(O
z=13Px1rp~3kasx)zQg`!fY*DtNihpcB1i<}gPr%z#GQf8H{v1YLMDErjS()DT{{t<
zZ2o_41J>M)MB2B?pQw9&TvVc2$sXLa8iLWbLvA<E5mKdxcJJ%Obv0sU1gKUW_Ttl#
zoxffzMRI%4LV{fZ%M7U-?VNEk&`gy&4wA3sT|;I+efwj95D?4;F`oPI!DWY2MI>xc
zIRTzV%3~lMfEx^q@9H>`bcT;(FC$ot_NvyI+hjS;O9k6=zT*TRzBr<OSB~Rw5Mg47
zAuLJG3WKGI_TP%=E`P`bFu^Ki-IiBZ46^=*+a&r9Ckbh*=Z%38$54FP^8~>;!3SaX
z0E3UqjF%-VFKJMfccFWAPs_&LM00>Y(r_|AelK#zGuHBT-j=44qDo4tDVAs^jfiAr
zAc6?{jwSPT;xFgU%&yNFI=u-w`}aHwyw}5DR}eZQBW;1w0rekl$J325m93RDb!Xs5
z_?TEcOXZqd7cfe;Yt<zxnIx!@UMluLLlq=s5*f%-oNC)(bF-Iu;pWw-n%g~OhF~UX
zp~JEQewFhLN<*<H85lkLal-2bbeywnX~MQ4QrQeb>h>RhzuWD`MDQQuyPf<JyU{&8
z&Z6UNiA-|a>LzZBp*dvlxBmF&Ps8Nj?V6#Ttw`+0HQVWK{J6B!#A>3#r6i(HG;UCA
zeGbv&4Cl*(p5<cC%QO~?{2w_>RY)Zb37r*;Zz{1XoRh0?GmIPzVDXB)2l(#f--wD>
zsi~IRLvofKU(0G@VI#<ZGbwFb_Bh7<{rJlea}50HZJt_tb$vvLRMX8(mk|bEFn7RH
zi~t)M0~_tW3FDMgv}%S#`e7>{h$ozD-U*<jMJ}-kri)ww18u1lmmmS$5s!Wf(@@jF
z1YLOoL~4;IjHy6Q6@v8;5(o@Fp^V@h9rz7rue9<<EiEO&E0o<BT6b5BNz>|;0l-n5
zU}SDJ6ZRZP<*sF`u+rB<6wpgFvPmsG^T8x#LW7|0>`RX1{{U77$~Z)r{{TUbU#^dp
zE>*B~E%mgkB##MF!N`9(Q=EgG1E>?To+4LYsBSe&SwJG7oIHyZQ>cocB}P_K8FC2#
zXSOhK4#8Qbs<`t^Rdsaq)zVcIidIvmB6sPJC?PUK9Ax8sW7UGQl`HQyFO#003TWMW
zi7h2jNvO!jc;y<I4ts`C<p&2N3pH$!bXU(@!AoYpTd6AkRYazmV;a;2=sPK5SYu_*
z0l)yC%RC9b-O?^-N$z!17%7RVGsv1`re@Aeiyn6yww&X(<aZ0qwy0vLN58Mn&qoBb
z;;D;6H6(#`j-nhfa&%yw@vCf|wTI#>#x7#!&S<RVD@|oW(L*~^*G!WMI)pY%WtV0k
z_dfpse$5qONwZ@4Z~138LwKyTT%ewwo@_z#%#MtA%R2o-x{$klM;*AE2QktuT{Fup
zF;vnFEnc#RNelwAVS|tk03-}C8Q5n?ygu<N=kWF7)xG7cntMf5vD4MY&z~b49^mdX
zk)Ff@#_&T^Y2?FNls!+Lsz3yiQUIwN-~dm5q>@)3)H{q}GDqM)#nT$9>M1XGmAO<>
z&h2TYGa6W80x6XM@`1hvPi*!CenC7;hLx<$^s=CeHq2~7olA(>7^>_tT#rNP`Hkhv
z;N|&M*Ho|~xo)`7vJ$u;xAgr(Zs23rek+>eOIaI1NVCdi$4U~aQV^p!Boe*CkG?%P
z3N`$Me?S`RMM}|AR+=@B5h|I%8guA?XDW8sV>lS!8RDuAZHkU|s;NqPx|*3x=mGP@
z<&ORKJD%roPIlXio+4V!Wwwr#&Z@NXNeO~Rkt9Y@fhL@Qt&#?;6O8UN!j;FAuC$Rs
zER@n1Rufn%6}oDO8HaLm7&r8v-_wHCY@Lq&A-GBhy4<CXar2T0)qe%j3^o;xladON
zh8Y`o$i>KQ7klJ1wRX8^A&aUC(@q)W1b`J+f2D&cBOBv=@tbvj=Vgs5!K;=S%z~e+
zqBY0_Gb0n&f(Q$phkP7+${fIXf0r)AFsE*y1*0XISdBT{=jsdCY)JPUJuc9e-iaLF
zY`Y6o74^Lc!SYBHgVSt|`<#*p*kpjchYPhn6k988)io7YLz-CLaZ+ays2wHH269LQ
z;G6<?;^ofoKQL7rT(iR*grs##RE)?3fa+B4Ll8W}vB(~rRmz;O^DOkW2BBz`+1VnL
zbzo5VVw#2wV{@l+1_s$24Ki&EcKcFUE62z{OGHMHvy@l=07~ac!9Bqk+g8JaNp^zY
z4?*IRy0wrAv@l^CZ=FF%XC#m_fscOt8-`kF?avp?&kt5KQo3-ls89|wjD;Wr_at}k
zYML~z5w%*qRFM|k0hkD44w4w*h#>k6xA)^yrJ}UO+t)GHM|E3Wbu}#}mI0Rw9F+_*
zbrNz_fjUop$9^SPbk*4Epp8_?LoZOgG{FlgVhWs`s}&u}kaYLh@o$^Cd9GEBM_q7=
zX|%V=il~$ZL|(y*wp+}@Di3Y5j2QNVM?un>IpCzx2!$orp-W^o2`6nuLV>a0ZukiI
z(8!-<x645@l!_^$sgJ1HaZY2wAc3Ci-^xx2&k`Z5j=reIV1}cnO2Hz=VsH)sV!Mp&
zew^pOrx7i)iiu&NKxyhgQ7MHm90E=NIS0R>)CoHgoZpceik@kyYUw6w*%48qMFw+{
zLX42C`!NAY*mgNQ3QU&luAccdx+=Kw6WiJ{+VaeyLWWjn?9GP8Fg~M><BfUvit)}5
z3oegvvz<$*qy^$C7DZCN`NHb=^!5Ppn(uLRd0fD4(7_@rq=g^I6<7jT=W*ohG4&IX
zjx-PA>&1(2IrDk8+F*t#ZLZMGGCBNt6yWJOBS=2EIsW`vj~?tvOVNrvWai5M01<0z
z?>B1d%If)ivdue}cV5eaaj*vi(0;sOD(PccnvRv3)muxj-zPqY{&wRh_^Ew{-^nXY
zA4#gJP6ju18QkOV#xb^8B}yWE-f~W`xi60R+-D!39Zwx<*^f1Hq)1zpO};LgD*7t|
znJfBZk7b_}<~d_#dGMw1Fr(NHbN>KtD=@Vin50sLhI?vnvD?2E>ES@eQWR=BbrIO-
z^!xFlB+7X*T<!e67|QA(06+s9dk;+Rf9Bj@xHzq)>qcV(Ahw_tfjbX!dwTI}rfT6}
z&bR;t^dx@2kl!3!w=6Xjvd1b3iVrbj2~6Mv*zMc4{0V%5F7yw2oJ$)B&U=;{AN+CT
zll0ta3a8g6Kc?QiT)R<8Ze@v8q-MZfD#KQNFn9Iz_u_RYDoobVI&{Q?cSrI9Gu$_A
zzcK5<<ftkjO6$8u#m<=IZLxr@k9~*z_!{!{*t(E(@3|U>9&-gml(mH)KZpZv3g`4Z
z4T`A7r&h(iefVU^6H4gmrB5-z-?pv&4n6oM%r!|zWpyf=<pW4(4#+mnHp-ljw%^@V
zDz#J%1ja${s~9{;sGsI7;UtnYC@`Tw!+*{5!oI?tA`_NkP6@|+Z;mKZ9sI<B?mal8
zS&6|JQawS&KVChOc9HT~n2%ODJP}Hy{5Cisf!K}n$EZW(6OJwVaej_GFe73J!OjP-
z5$K4yZ;15)AQdM7f(Zv6+&WQGG&Bt|#x+wilG>6?0!bTVC-dL99=r#oiYTFlnoJpA
z52d>gxFfdT+xC#Rh~P26B9Yk2HJxPTNBVR2AKdXwo%CNA*JB-qrk*RPsccCR1i6oG
zJAgqWaez+v+wYul<=**GYqnHR9L|gwt17X;Ck^Y|Z;k!9hgP)na~))K^N57Xq%=n!
zU=LzG{{Zj%C)M7iN_nXn^@V)uKDgV8qaI9YIwRLqH_RV7Z&2R+SxGWfwo0l00E3H6
z<c<FTJ}Qb}j&=k#$2@9AcK2f}yw0y~jY}3)`oV0M-#NxVJ_OTLndWBBoDIDOcpMdr
zHa7rd<Ir&^zfO}1pkRQ<)SMsua1?8yoUCr-ZfmHaxWzp*^HWsQ5iD~;<s^-Ua6un_
zHlxDd;xEm7gJFV-<3&YuriN9OWO$V%jnmX^jGd3B<2}hdYafP|m>L9?)GG&8c^eu)
z_V)YZ-@gZWmgxn(5oFiW(pL;~oOkcvJY~(sZ;Mu47|AY4olp2d_^h$`%_3CS-^`Vc
z2{5ym<W^ExBgPM$4FdoH^)?u1jO%EvwOwyDEGg;@Lb^F>m~_b@1<JNdDxa%5S4bHc
z9B_+~{7|jsE@p<~XsViudUw=}ryGN|M`8%{<ELK+e;(0z&aqjqwNDQ)EGMh;5~@Q}
zvVi57;DV#n6O+GgF=z1Pw-WqbN2wbhd4`tZX^Km9QkdhPO0jJ+G=$?rDaI9a_TPK~
zw+6gCx!h=|7}dZQAsegDKDii})Rk>VW0g_{GD%WBI0^jm?Y91$cRC2EV?ZOSilI@d
z1egJs>A=}?agCS1wlBJTZ}@x3ms;vOk2ApZ(JYaa>2+Hn$Wy8?GFf+U$6{0ha&e7g
zl%CP0%_1koUpm)v<)W?yhFWXI+F?&aG%6k$BXq}=ju~_*%J;@d^5-WKa*rz8IXjkW
zB$X01r;%V*a84M2NpH-P#2dGcwVpe8u?5OV>m;;LAo&_*I0_hzRRvDVtZBlH@BurX
z8hk;W5g92eB8m;FT!$i7IzTEE?d$3|zXmQ@e>bAp&xRkzwrgj^<qO;HFDO{TfEqSW
zq>S;to&;0Za~CFZweIIx9c?W1Fn^YHGHlVPT}_+-PLY5!?s(_V#8)!4=8Q3Plc^>n
z47hSTen5A?-y87Z;pg#7t?)w64=T-Uo_OdXf|@DgbYK8QA+)mRAfMC>ab`~%Pw|1C
zd6uOkqSk9QqSJ1wf0d?k$0%v(MCP1=91uYonMe*ooZxx^vXnf*N;#%l&+_%L!t3-%
zQEISP4U?TYJDh{C?ca=h;UC6-EqLK}X65?W7LyG*M@1DBs~?}Jzya8nz-;Qt?lO39
z<^@_#Xt>K9QY|$hGDm`R^;}~bcNrKYgWDgc7~CDymd8^~X^qx8Do%E^(^FiXwe`x!
zRn>VVMl9hADx8sk<8!u-=R8Kg-yJz_nc@y-5dl1MutW_cKxphhP(cR+E8iREft;6L
zNgpazZ#;EN8BymY>oJma9_5Fd*I-BHM$-v7!<nSivcpTMj8P*Fq{qzdsg5+FsnR_G
zB;$ouUyxg^p@N>oDx;{M<|h?&5!1(0RSayQ^%m6GBpnzS0g1p-?oR@Rg1YNZR|2Eq
zCo@QrmXQp{W^58hPBzKT4nHC_cFOC08q!iVwhDRPG|V)wGlo#8sw6nh!2K#W1mm&e
z*srwDaIU15pi52`H-Sj%HAuiDqaguUvD3Pofs%H|5m&YcV!XVv_B4elDQBsY84=`Y
zkzeU;OyrTLa<BUz&{Zw!y3>8ATY6PIbftun7Q-X93#mCfZUYVdGr=Bhzt!KX>aEo=
z)1|b_)rOd=38V6b&`v^;jln<n;xk*TUK(joy3$kzb%`dD7}z6VYRL+5pL2jteYlM)
zv`5t$0*3ia^qoomZl)THj+;QwBLV4=x!i-3gTHPlo{_0Zsi%cBh=jv35ZX0v2mwNX
zJ7c~vpKDdz!CKa)SY8<>5vf57u~^qQA;N+{>~W-xhW^1SIhJcHby?}^>L$^qjV1^N
zp`ChFPW#{!r0#ayjx|-4{{TUbZstiUY2>1-r&(5P%M6BcBxYSBW+T(k?sxX$O}@b;
z{+Od0+F2L`R-QG8u=bT3A-B%Q9gaT9<C*KZg;E!`$wdVEm`w{R%+d^&a7S=**%%uf
zdT@J_tg_Qp($!rhZ8EDx6x6O(Hu{y5y8;*!x4GNb0kzOlV`Z`lD=6cNrYfg{LYxT+
zNQuJ+Eru$?VW;|Vee=K@&&*U*F{V|x!!+We2ZW=Dh};GWqa@_ykah%TzZ2#07Lv9(
z;EI;zPnv#`v&SPxHj+V7qq)KFl23e&#^tuQ>h`93sOx1-L1a1*N@HL&0v9Ba-z9Q)
z@4pI~y9-7E_`>mim%<+j`HHP%s-?J8uSSg~0f-DV;a>oiQ;cfVHaPUhH7wlCJeJud
zo+hY~n8?z*GcuA+<dfW!#>oEw6mK7CIm5<SxoQRx(b>?oV2(y~dWHdZQ}lt4a!yCL
z8ntt-j*{MEjZB5I4uX86+w%N}9Sk_?Js2`d-JmUP&1&yb%`Akfwo0AJ`*+{>99ya8
zS*kw@BHESps)W{14&S!_0KXQRRfU!m2+T=#J&u1+2tWDah^a+ANs#JAI{}UV08fA1
zcH?wns*2m#!^>54^_hB#e!PU?iENI?+rOuCk@wFM>a0>c%u;y7eb=PAPuqXbZ%zYQ
z?l92R7{au1Faulm)$fhReEvg%^H$3=D<a7eDm3bkO5|fF2N~`8@Exb2T15*<4Z3Af
zHbB^wP09O?{8wT}OSF;1HBQ87LOjIw#^COKvFqQ6@?7Pfq)9Z2x`qkB+;;9y79?nb
z60ZF<ZNkPIQTNI3!&bH}(;BZYQ%_}Tx2LBI8<@fZci&dvf^&>)co|E3ddrfLB{XqV
zrVK_98a5{w0D-sffJVoPZ`|8J@kr4KwYmfbM%4Jnu0MX>z4p%vG<@X+ktB*rb2B(7
zWY$jE^cmatBZN`WXCjXit&&jP!xfCH<m!#JBm0#<>HB(cu+wD#$<GJ5gPEhfTVYpz
zu7%QF!u3HJ$EHBXplomZ0fq@CT|f;3xnqU>{rIvy2;RvS2u)4W70PL5^J>PD2IL+j
z^9>lMsAo6@_h5r;?fQP+{=7uDO0ZPuFCOR0=dvGs_x-ppd8-#XS7^ekpcw@2qa=4f
znC-xCVM{{k8|--W`9RzC<Kh}OIoXG|amU%oIpKvpTrnqtc4Huq$<rhplq;U5J^tAL
z0DcC>y3Phk?ZXA0nkqUmE{P<W&HxMaW7PZS^v4S!qP7@H7;0mcT2Po$(X4BhRwLj3
zcH-Q2BM(Ai?4XTNuD?4EK&Nq$>zw}peTZ43>(xeGNnka|?G6lTev%tIl5^i4o%pq1
z%v$KA0&PYts0DxkWOnx-mt&u|6z`;8uV8PO6wu1cqAg<z060Id>%!ekjLyX8B;@dJ
z=_-{~&LadipY?ugosa9lT9y(>ae@bKEs871%X^j2w;qg!+<v@#k&<zYWbjGtnki#o
z3yBT@#y{t5aLtvd*-f^CsTpE$s(a%*a8ku(db^D@Wl4@uWEdI1&Nthz$NTU`)oDsg
zGfd6X)}X2e*@E`S^~pRjLroo`-5Y_^I?Dyd0)g%A-;DV)S4Hv1@<<XbqB&M1jK)X}
zl*XUw8w~n;@QKe?=`J@R8+m$LV0H(CmriIkay*7iZNK$oe{7x-WSrJcS;;uupKcch
zHlHa6EcHm0O_(B&Nde?I{J7rFfUky{&lUN3u2Is}Ep0MJwDU&AUNQ;&#t0i@8|S{-
zNywIoIhUEJ>7tK1<O{eh>-OKd^xuxf_)*PP{{Vqsf*3C~amFt9N^;Ofgf~^605bdS
zgSN*x+c@K0FJ%_}8iny`%v{IeXEjvVs(GHGuA(-?(WI@Rm(f^#!QVL_u6WjqrEN`N
zFcxT{G7V}zruP~2+k$-O&X*p0@fP89td?rpirE@M#f$enhYR<9V5z3AWnj^<!(hf#
zjCMV^&5^e1D6%U1HaEdfA8jV&)fEyYHC&Q9O$@9;GHg*)j@#sCuo%x7D(mCFC|u@|
z<T1-U==xO=yrs8Oleui{LHFZJxnA&T?od@a2@V*u5rK^0ANjuAGFQzl=9$@=MVeG$
z8y_k*=O7>Njxoy;Oz20+m24;C_c%cJxKcS9N_29{$2lXu06%>3if?yOdb(B4zzUj~
z3yt=UGxYwr$Laa(YnsJHeKS<c(`BS!vF+uNm}&#^7$<(<e(M$pQlct}=axo!pSi|l
z^<sU$_s0A%OJ)q&9GGXq&k`=)3iI{4`EH(~3FszSe+7cGs5_`65HdFGd-2f!00I6!
zY#$MqKbC7!+Am^Uh~|_ul_kj6A&_ZZSp#snJComTb#o+%WVXho5zLtBVEseT`}%)z
z!5<CMTRnVN30c;3I;m;mVys)ynTGiL4(HfxYw~cyYTsbPl1b?4*E#s5ZnIiirukh-
zYgrVq!4Ux&)vyC|+$cTH!#i-1%^$={&&n2cqU3u;eSJdehv%wDhBgNS035pv013~p
zZ(cRqk$fz^_@`DXuC;Q_I}K69<dsZ%0rt;+{A8YA_;nV#IO?mFk~noZ!v+KoP5sAz
zPTX@I1h&qEC3<15QuylTb-GFX!plIk^{!VDtD_^fGRjnpH*N4i$;jhtE%)cV^7TE+
zi6*Ifszs@Yyo2y1F#y4^e7OYR5Dw%6jORse{I@l4h}6{d&d%$N5hir%Ct!aeslMN@
z8@I}QuXU%Ru8!{&8q-c=q%b^~U4tH}JFYXgw`_LfJ5jYolT^y?Rwb8}r!&(DYpEm@
zx*V1e#Qtd54B#$972mX&^v3`$jP%k+9C9SBp<|8Jbl{xi;P3YRxMrW3?om&1YRMop
zl9PmzP~ffz3bFqHr)A$@JCAM@C9S5A^<pUWb2n4wm6^(_hVm&L^$$#Ew{9z>mWi_|
zRnybf#S6&{l@w@%gGx78#=w)P<q7+H9nN^Qb4Vq$P$D<XLDmTzQUfY0cFHz3&iM=!
zonsmGAwBA$sV%Uj3^P*BNb6IfkU&*2tdc^Joxx%cd>jq_N@{!c;<AROpXII)qV*$<
z6q&QBj-|;Z!5`F4P7d5@_8<n93yr?2G+vCB{RicqLd+6Pm>>hN^aOf-StQe$*O#sH
z%8)}%3=Xl(DVIU0>Ypsiais5&+dF&j#EM%rV_BHTI9f9rnCl{h1&I?@M5sY+!8ss|
zAJ05qwJl9j>#vTKOB5{i5Uxya-eMU&P%%-nWQ~qU7~x$ZgO=Lk{DPRyBbGP(Xjf1N
zZscQP+JDjj%O5bv;~#jh;-~)rP5DOc%rwrj+NddI6V#aTt)gH;sRV+=ke<Wb?nLC~
z%6hBKRV>XN9jrx|v_M0sV!M;9WpXk`M{|r|afiQ&KQ$gz@I9y~+K{dKsS<hCv82|F
z0S5(gbt+?Hu-n&X$G1$YE2U>HZrsOJ&z$LWyVXNH^*0)cD&9#3S(%vo?Tz@ie50D0
z*u6ve$aED2PMq)g=WZKo5{e6}!lAWC*q-d&iT?m@{{H}{0(p)&(w0LMP?lxR94SAz
z_4|KrI=udjHM$jTk@U)l=;f5S#)$P5eE$I7_x!l>R%WR&IC$bs^nGG8{f2)oD~jt=
zNF5DBMukW!z0ceG@H6I`S;;%Qf2fn6w->_uV3JFqoK-PA!9+?yBg)T~$F@d4+lC8u
z)2@jDrcQwVg-<B`vQPHmT7sX<-_`!04gmWfehpY_zm`=D#?h`u?oQu*vA1o;{{X)a
zC!r{jcDFn+nc`U)2E$TmWgeS%AMN+yZEGfmS5%RK&gL?52e*DQEqt`MD`=;YqZ2tD
zH86#2W45492H#c*^xKSKey29d##Y9&zCqg`_u(NgkhEF3)yU&A4Mgvgu>FSu%%Mm)
zQhzQaOifBOfTl-(I0yFP!a>wKvY_{4!-!Osg;;ik59*D4-|xj!)XOdev&$+ChPEUx
z>BY#YUY)^>lrh{EOzIw(2h;C?!xgsH^?a{YB#}IC3j?Kq8Qc#jJ-7Aya2ui|D#w~y
zv}PF!!G<=~zYKRN5~Z4{G{~|IGUymm$9w=g58L~2CiiDH`6DbbsBRf_?l_!*A+|>%
z93ccaAZO5R=E)h)eie@!S^`zz&e#9|ae=lt`W4o2dv@ZmzcD`Q+6L{UZU+)0iDHjW
z)LR6caP}(fvS4iE=_+u2xH(5w^fE&V&Ns%U&OisaIp4n&#|WUO6*37xW&8zVRJL=t
zKHqSE^T68b!W$wXADH?PpSKCv%R>y+XP26FNVKyZKof$C>9^b*?Z66~)Qut6fX6u_
zZv02BxSFRp$Om#x<enoOllk!!J(17gnDsqHCPHLlbCPm+wNDRTVxuH`<BAdoU~mQp
zd=Z`|EL{p!CnTMQ{kS~=Z1#?euT+SiRz~B~@56H0#7L3Jth6IpIX(NI?hh7u2GF1x
zWf&?5Ae}AweqD}ux6Bu_S#dOUc+%L9NZ<4a{`^rnH!d+Rib-29#dC`5f2M*JDFUXA
zm)GBmoZ)#fPLUzjQG13SoKCgc>G^KZ)lRsSCNh2T!WH)WCCa&+?~-ymgTiBql&y4w
zIdMhW>XP)qVq#SJq~Cn{oO^HmxP+AF0PJ*}wl^Sq<J58Hk`Y*fMm1v}?Z>oL2AWlM
zK4tsyu_`k+W`FoM@X{`3=X+gQrZX~BrkINWBtEJSu^oZN{j<j7e-)l!d$p3)YNMFb
zQ`sqyB8Mu4ir}dO8({a}9-wE9R`@XHWTEEz1cUsubr7&g0%yz*W9274hkWTEj@)lY
z#^=I)$Hcz}=jO^1(zFnXWknf$s5m17xX*7~Z^d@mY!b7bHjfDI^K$XIQP%vYQ60gP
zAQb={f-*6_GuY#Rv{v3>xZXMwQ6*fF<d>9%ECxv-j>By5*q8fd@{*gEZ?!E*D441R
zJs}~^$2$SvaC6)8;MJ#<q~sbYYpH6Ut~z<j$0W(TDWsKBcgQMK`!-MCie)#oBFN)T
zoJ9J5N~^Ubk1P*MP~@z1@{JO)7|xacv$hBujOT)W9C8I^^65PFXhk&)FDZF^(Y6;V
z8Gze3?Y4BDHs6qF=y{vLJB8p{t@ldWu}wh2YGtTecse1A0Kn|iG`?|y-7&wEV%0~(
zP2_kxaOH=nh(9sX&-|vgRwyG>k~1Vv+~cREl<s$MK+*~2!}SP$>%%2a{{We#`1X{S
zMx}FCAY5<Uk1f)i#RZbnO3u{|r9NUt3Jw6+oCwC-c}EM+;e>X|cxHwsc$%FZ+Eb(<
zE0V`yk8nQVZga-^_<QhgeDU{|DS2+oO3TaE=0&V@1&pwxg2)subv}dxEsgsQ{9!MN
zKZl#dJ}N=UlDM_eJjP1upo^qapj|37V+u)S13T#%JasY6xbx{5X9avsN^V$|=p>P3
z6B%5Xq(i1Lr`K`Y89ttzI(Ti%iA#H?iK>)HBmw4pCYHxwTVODMJ&)Umd!Hj)d0y$v
zF~JdfD`f3W5e^k}t_Ulr@7T6Acg9En4ioDtVyw6cDRj`LKL<ExjAwsL0yp|}_CJ0m
zNm?WoGjM(y?owM~nv&y56cVUeVyh}zH(l|ZciSU75uW?->Ef3&K}SI}(8>&w5>X4~
zS+ksvOaqgjZv1Nh0EV6{wMQeyW<NPoODTdgJcB|o+!4Oy`i(!X+&OZ$CEUDn=jbh~
zS5plQEGAmW;oqbkiPAtmxF44s%<fJ+TRM1LBmV$Whwq0jP+OleR$i`)4D!?&W1~m%
zwL^_PM^TW#42|)yA8t0{lCWF38lj?&uAZ7G)zK<hUI#`2N_l|=^(Z47`TGIgZrN+H
zas_35zRN8Xl>EOWk&8`iQd7<uNCr-*X4}cTX*l)v;I-c6Y343ow^g8);nIy)qft^*
z<y6GJKqDnXWdJf@=RZ#P<11+j+mp5<P+O|$>8fX?T1SzVL|Es?PBj=hl@1h=Nx(km
zZVFwmR1>4q);zS830hB0Q(K6n0Y_5<9)&VTVg~zQRVDhhE^@^~9X!c`u_TcWqmbj&
z5)RvejGXRxomq30Id<45V9e4??M}pN1-g1z<%j<O<H-sJ2^l9N6}r6!wXy!Qsb?10
zk>q+hX-i7FnMr-I-y~_yaoA@d?oS8#N;yT&q8S>RD|B&UmBXs}hN8n!&gTRk=Wg2r
z!W+=KS?Ogn)YDA~X;{rCS!Ua93{D7Bjey%xB=*T`H;PvZgqm2Oj0fr{Amz>m066Y4
zaqM+tjY$j8%T;rwih^iqDq1;!Q?ICHkEppt)CdCvU>|=`o;{+p8<YoKK)1;3I<nGB
z)H1T;Z7cu;k4<3hw|)a#Dk@;4siK~eXp71!C6VL~z16ffNC8RJ^#VTG2Z9uraV6Gq
zI=@+0@IG9H={Dy`J(n83p}F#s0UQRkL9!<`a+B3p7-^`Uu8cz*g`r{$j-(8(owW=O
z=Ky+)@uB|!#fzGSs>fottTWrET9#*mWid}O1tZOnGCj%dkTo`S9rC{3f6P(F(90rH
zvNUWdi&MlyVBw2^05}=nw)^qUPva5HYj^Qymn|_nGEz{qps`lkN7db3{f<W4=e}}u
z_=&lzGWiaoYMeaXFGb|kWGr+9BX>CNf41M31ZeJ1$!`(sb0#wFrAX9Aq4xbfI9RET
zV1T$_0Llbiim$o*o&Nx1!^gvKhKu6AKG4ulH$sLY(^NjNxKWIgpHAF$WsNmPIJaW$
zWh!(D6-PPB#8=Ie_un740e)Iax{^XL8UB?#Wp9Z;2`RiQ=C_X7a7&F8gD4fS=sk~r
z-?tdTI<Bn15rV_9YytMq10B^3I$=9)9JG-pr;ASK0Q!350mQnRig{g1${R>Kl?$MD
z+a3FCe?7fO*(-v>(o%JSlG!64Vejk2Q!bO15s(f*8}VX~u?e$Xk|<UsiaeugEEJaq
z+r9^H&pZjg*3WvAJsBOl>QybDa(3_c;#Ab~e6FR!BkpoeKi_~=$`OV!oM&wC+7yiO
zupk@~Jpmk56*Pr<nlgawN!yFo+7_&vO2;gX-wHSH{{S}NmBW)NXjVC%7mgW5r4O-C
zJLlIQo;Vli99<CY^`@S`TPjT8=Nds#?oL7f0B$lrA=_uZTB|h0hnPkfDh1J&*pY%;
z*KNJHTjZ`wn(tcb%wmQ(`mKO40PT_PPBEPK2e%p5kU1Wsm$?G2snJ#1KBr8=8_dT5
z9@#hmW78PNY*&@kY_k+?n5V?vU6J0RrX4df%G$!7*f<~qzkK`m#|xLx^wyZ65Jv(b
zA%=i8H+}y90G{I~AAF|`1I0+ebo|z$G67PDu*Uf$Zap^P3!H7zxn8rORl=aq6Cb|h
zdgt%kjJUI=_?l;hrD88dCIJ;5N!;K8upjgG;{5e2C1oYFsL%qO;Cp&!ZV5qWM2<;Y
zB&a^PR3D$I`*99fx>UwMyS5kmcH>={_%uMOtB|&We5<fuLGQ)2fwYElRXxvt&~bKp
zGa3eQf^mWCzZYw$nmE@|k)#3oo*6MIkg=o<v7Pth$m23L0+MsE9=u&N{zXx{Klb3S
zFItqIq>bfP!(b9uJ7?|0Zh)hDBhuOCjg+#K0OaLQr>7E)8hp%A=~7vDCAR+A;%xJx
z(yJ_TI8aVPoHh@x`v5(?_=5t=ATNThcML`X{m%=wTS;jLYB_{a(92H)d4k~Mwtw@)
zTMZLXGz6l&(j1-gGJXF5@xaBAW2#6Hs8l-SZu*GgM4ZIv9$3a?e=6<ReYj2^11T=q
zH=lW!wHi_*DGC8Pb^v;Cts59&)+8XGLP+h!%Zmj8nVMN98k_CE{QdZ%H`5A^qan_A
z&cla<6k|xHQsnJ~ZSPxM9%G}boqb&?gy8;p1pfg0xFtnFTReyw+bby`5%SX^1M(SM
z`)51``C3^#)eT<kf7Xc~_hvc$xFbOYra6;S<y2?!A`)ZtR$TF5sLdV=Ug^1Z@lNur
zrQmSLj*CA}01WvwxEa7BK-<*z<F?-hyxB$K$AGj8R<YGVUrGe==T-wQ8)5;+eU9TB
z@xv}q=8AiDk-AqJXiQM$I<eGc^RXILh#UK!I>G!SJYkcZ{3|qqN0y?;AcCVR#5yq4
zxXO;e`u_mG6s>Hrm_Op9_-9MXekE5;9h#!+WVp;s6*0%Jp&Jr$AsvQJ+h^a5KEDdL
zOE)sfZhKEN!m&n?R8&JwwRDwm3<#S>Lk%N4p5&+?XFPW5CW@lgNl505jY?GSkNNq2
zM}=Nk<$Epfn`&pOw#88B!~)TchA_a6$2skfP7{J|%U)e{a^IGG66WuRY3pgHxh0k<
zqBGg<vchGfu7!r949Z4^UhFr>C9r$sZ-AaY-u@;2AnkVMr+V3WVxDz#6+n^-sU=>L
zq)4cWs!m%h3ERHMJ)h^#3HejSe+(-*ZtrTQmeElj9yJ<B^~fV|eR$PB0R9fVKKNVa
zE0s?w+vy{kqM@W|f9g%Sz)((b0MD<#6wkzhlgX=k>u9?kSxqFDM$C8#$eg$Eq43QN
zw^pL1ir+%j7aFpFb!8y4u=PG-+DCoIzZ{_WmA%$@&&~Y9&D2JU!uN(TTFrc&HX|pd
z2pf^+X3_@xdvUdY#RK9C{44PLB~<d&8*L29Q&C8=W9CNTV>s>$V{SB?;pfJh-eR>~
zFC4{WxYB=$Daoh2Ei+Wd3Wsnb8UslbdNg2T83dl=g!8gX9vjB4zu)LMG1RJEm|w*2
z46Xc$;f!|54q%|WUZ-`Ip^E8}w8{NqGv+7=I6Hxk+Y&G|wDa3&mJsMz$aEb<YzFvW
z&wl>^ZTQ_@c;)_I=Bq`<8p)|D>n_d&mnWn&&|2bB3(BnOrKTWZRRP_GP66XlymXE(
zK<A0x-0;_18Gu1LVb|MH0|(cC%Zhv~^2;B|Q~UM|&`a_bsp>1O^h}h~Os@m=SR)nN
z7zAU~1Nwh{I!o}g;oZN(?+fi0S{dM&O8}l>1AmyQ)T1uMkTl?x+%d^*yEh!wwch%*
z3p@18l>p-du+MD$kNn?`oOlsqt$zafO1k7~Xg*5PDT<IHj&k`SNzhK{6qd>KBh!ZR
zml_ilw?pqC)>>~@f@^5vo;jpys+bfkdY3FoW+yCs`z`>$^*kEpo>6X5wYo=9Nanb_
zGRqA(jZlm>7jiolJNglT1_=+yDHktXD3VG>X`}{3k@A7tSCp|mkT4pw`W$+2Lho{u
z`PP|bXQq}31u`^>Q+$kpvgD9|J-*y>+W9ubTCv*g^|7d1q%U-yt4tIdMphu80vPN`
zY_>@l0DJJmP0O^@HI*w@)wk2S#}=BCv{O2V>;VBrf&neIuS1XoCxw6FJAtQ-=A^1x
zX(S7+mPut*B;z0xfI-Ku3C|SSXfFK6Nnb?wiD)S)V^m6t?aW{eC@|P!cLxA_WN;hw
z9*3XgaNI2|Kw_<s%9&{Cq3Ikhb(tGb#=v>Kau3^uo1KB}R;rqtWVI59qiA8Jt^_J(
zRbX{v7-nCq2L~KC*=nVVtX?VNddLX~Ac}Hf0kRoG07zgr(r{1r;ss|d7Nu*XRSQ`;
zic=zW4rJVBDOV>~f2e6?EIyz{FO%JcAdf6vsqbQFsf9%5*yc0|j=XABG62vEFeL0S
zNX|Fly`JQ=RZla-&`P<Dr4h!&>Bf>I3Otx{#FLSXcfsHtnyQXUBTGxwSj!OV=(5O*
zu+h0V1F%OMjBkU)?p3R*uB;$b%Ucv{kC~c0N1$pNPz<nO-N6G%BW!SL`xWb=*EvB=
zTWz48(Ln5w$<&&%H31Y7t)zj4Ios+u0H1TmGCztevfch9-dRzjX)VyPQU<L!`)oJ#
z8v%jGQ!dpsu*1`*t`_Mb(yK~p5EA?EpED~Q4*5O%ZJt<v5DVO2{w#05IZ)L?DB?*n
zsv0xV&NdrveZ3FcjeZ`bqc4*5jdqsBB$PADr30dF3jHI#2kDRB@5SCyz1MPWHDRNj
z;4;Eta~RH{u|L224h`J-#*XhtGCM3OQpv2wxGGmj0~_FDKey$@ntRo{^G!n(5C@u~
zWQ~<a(%UFMeCj-O?fe-Bi{Ht3ui!-l;X>Xm%b?AumTY<*_`$W2%}X&!Rgs5$`th(I
z5gr0vz8QIp!6MB3yL*f^B~)HmgyJ;nCUQnppV#*T0o>-Ern#e?%QEf4V{elmCmKy2
zQx+<8ojDur#Og-D0}MeLPp{|1C8w4o5*Q>g?n7xfBi}gUMHNcxV$9h807~us{{Z#I
zlvEI&iWg!S$mKxQ<q9J|eei#A!u`%Af^wkeeeyv(7*|PE+zqw?S-7!1t>!@DnW9$Q
zJ7B5*0QQ0V9swB_mTpGfagKEeG#&LOy+hjvZ|%lcyrm!b4l4DN@Fsk;xKhRYejdbX
z2iF5Q>^Q}7(avj79=izp5H+0rho|Mkw;}U#)P}a!I#p82!zd}&5RvPvVo&LeV<!WO
z=Ns72_+v+dl*?0em#GTRNbam53>oBLx$_@Z10<90owifGem(e0N6J46@K;;u1Xl~9
zE7S-2fFnJRt};%2PZ(qPc>FL;;y;TE9I!XY(KxP@w3>{ok`NF!!!}NP9Rt3c@zWn0
z{v0X!v%>d^MFXc1zzg)?Y=2HF&nLm8U5O;soP@UWu&Ie-2(0Kbb?yMc$;LkXCi6ET
z%TaghvPX%DPdO2SJ<dDr`f;`#!|>-{%EoG=3t%xWF@Sd<5<l<8FXsMJfKob51Eh&2
zk)&ikH{Til+<DdHIL!1f$Bg4hz_py69Q5x9r)N|oYG=};INT5W{m14)R&uOWHR!5Q
zkPwjopycNnKWzT|Wy_VN#mQEl6ffK;0AQVf$EUCD!sW`sl(iBu2@6xm28BS|W6kU6
z5B$da@p%oL{N6VnjA?P@5gcYvCIk}aQtHk!GEUeelkbuT18<aVQ4K6il50iMb@@SW
zVV?e(<1E$N{z`&bbQ0A1RveNyI*2=Wz}Ne)Z&cUh>8@9?EV%@_stv$RworYPf4KMK
zqmL!+ocY3?3DI)zTJ7@6$_@b}ZZdE*=k?;de6mMau+z)r4T7q7`*!c&Z@&*IX%^}w
za*rH+LK{PBB)62V+hmd39kIX;T;(Z#W@hOp`E@Na>KF{?0YUZK{f`zY{FS)V23@ti
zILxsgmOl@;9>n8gvG2G2xG`<9HAR%MY%m))uAlwnaZQ(y=DlBa8hI5Ri8_>k+xFaK
zkK6wIW=>b|9^-$u!jV$BYOG)?l25Sh>)VQR<>OIZmtn-^Y}ZSjz3BXaZ2OasP6_hw
zAynL`jeSBi7WkEeNc$<%jYB`L`*F6m&*6*Bob7d?dWNUA+M7$%%I7Ys0oV`QbNAsZ
z<6@teycXnIPY>*qL0eHvDUw=*kTY+PRQnx<e?QBOSnaE3X{v11yOly#U8QL9@dm_e
z+avz~d|P*s7&~fAuG)6b{<yp<Vx){JqO*bKBzo~>-fNWF%9ixbHXJpTmOXaw#OrLa
z$6Xsp?5Z$6jNpF!L2RoKe_kamGxS7-8PN7`{2n7BG6yW_l!ZxZOj1O2D$@tk`@Rlw
z`s34%p??AXV5F_)4r8|<aa!?5DV6C&EW>bdmL!bt>x}n2a$l6DFx*f|*aT%V2+~g-
z9R2|}IW3<N*D$h48qY))K%)^zLyR^(NGBP_Fx*uwDlBhSb|$I`EcB15QhHqeDgXmU
zf7GOQ;~F<KMakUu%9RFMD~=u~&ZJU1u6+;w^TunsK$9YsDpqyrusx5r8sqT|$nwxt
zNpq%&q!AOYBsxhS>K=iI2^P@nW^r5l-h4m2EvjTn)}?=!IN4+>bnWPP*6RiKjchLB
zvsF?n8P(ipP&gy^2aG$<e-i#6_+f98{5KfALn7fJcIi0#2Ha=!AFl<z4S9o>IgZ0M
z!<#L+<|$-%sG_YTLlG`<i1UU3Y#V;Z-+}wF$^2Q@@TU(R5_wmBQI<Jd;l|1Ff#I#%
zmjKT|Fu$ANcC*(bM@sp_0=Ww!{!NqYamK0qUHlbYz8m>03lB2gB&VdL9XeVHqY{7#
zEWj2W{Xqnb0uOxe1>eW}H!j(e5>ivs!ycHCG{+Ju`T?*24`YGG5a&yTpAl3OLs^gI
zv9qGd5(y=f^Hw8BAok+vMm$n|oVS&^xq4?K`OCyg%gjpySJhV3q6KxSsC8)coE7{>
z7%Pp2+aJq}eMqZ!=QKsATDob&ywQP`hXXrm&usl%Zg<4D!3E0Sc&M7jwCNFGdd(L|
z#5dcx1MlB{FfSzhA>A(g-O{bCoR(s;%LvLg_{jG;$Rn}NcH<k8if&AI7T$$FhyMVF
ztB;8uCeo@>Rn=K3CKJmYI4vVar_5Afk_Y5?>Af|MPG6;p*-Q)&OG<`<nVU&yhQm@e
z;O=)^f^`Fo@CV`dk!>Cua>Y8+S(r#OOEp-jRx_*pQMv=2BT3v00zf^u&bH|3uQb!#
zViv0DpvthQgh@PX6h587(~J$*ZpSAF9NgKSMrejKk&S8TirOl!G7zh8>BhJN@fJs5
z+0WEK!5VSg`)7+*4qa=7-Z^Dl(rro%V<#kGNc2`Dfs#kR7rF84`O5uN-^&)3Xy!6p
zDQT3ISqT7;RAhmGHyI~8@MptXN*Y^jatN_YUX3u2D+Y0-ZpsGA%b)5Q+kNxKX>HMO
zNQ+fXcjc>-8enPZ>6o}ylt{~vM%e=`ftDa-jQS2Bb3K)>oV{6kigcYSsRLr1NNJ}g
zLJKxd29toTjO36u;hUc9bvGNmBHP+Jgs-AShNg7H$&sF^aNcCn7`L-2#}WKOzNMy?
zkD${;$`YM=Xij2`xzhO>QJA)IpSC!O*($bG$(7~`wh&a9VxBh=b!du7GAo>9CzY3F
z8iq5k_2JLv<E6D#X_}mwSjQu2BU#26l14Ti@(*K@2MJPJQ<tg*WnD@_snk-sm<ZgG
zcRGd+P=E;BG2r(u{Ef9swGz}qVlzzx!hT`h_AHww0bs!C)Je~-IMAQANiRg2dX|Qs
zN|;ivz9-O2BvD2dQm0vsqXdi{TQJDm+~Up3&eao1Eeq8_G$W}|1JkYxfB@7BXDT%h
zr#^AM2?o@6dwF>0F*UX-xSnMdNbAu>Z!0^HKt5K;$O9jKJgm7ry1EMLTG|+hk20i1
zWJXOpHpeOla&mBeJvdgkY?tXDRPxnSl-01$B@N=5rM_tq*y0q@rw2;sN}ci8amRm+
z-f~O-0L1q?R8zjBj^NbjNZ71lR2+U`xa=1*bCgyu4=)#6!_7vtP{~mgrbJ-nV`Ak_
zcU-EBGWvjXjB&z#bLKfYtDCM@Dc$6H`pIe}X70t@vCr?vOZ4>i%syPUksdf@s3Zmf
z2|do|wtu!bcJNn`EAHMV*lD0Bk0oV02RJH#O1@*iVg2#K3)Q>N7zAv_On;>R0Kh+P
zHc$9sczXUOd_bV6hOVlP&q`|LNI+&MQmTv-{-*x`(d>8RbsIC|S0r>7$NvBeXgT|m
zr?qnp9k#YK>B&5cNYJqg2=cbQ*prOu7{)gs6UmPlId0X;UL)Knt(QqFX(5=1WrcMW
zT>UI^Hyyor?1zmL)!BSEDP*Nqw@~#3L@uPZWKb3&NG%_fF+WayG=skw{6)FNSI_q<
zl%*7k)3Goz=RwbH$>TSS?X+2!Kq({4oj}g&$7U;n$NTYIagv@@k=wSz0Dr!CkYIb9
z;gmwnkLiyAN8|_h;FTvW)x9#w(2<n=BUl|%>;UhNw)^^Vw4{x1kU^vs3{S2#5&r-`
zUJ1cX4NQh+s%W$2)<a+)Z0ru+gB)L{<eR9alB82~U>mVwFfsZ2cHe`%t;!KxYody2
z>Q-@%qsA~JkJz!@LC^I2jASt4G80pk4>4KNo1-)_#ju`n(=XewAe?sW4#Z=A^E@%|
zN~ZJ8uV<#DsB8jtvH-&aPza~99@%X7AFkK@9egXn;w*4IWI}sFICCbJ^J&I6VVypJ
zcFs@r9Bj3t;oFkDA@LpS>7r_ihSFUQ>k;lwea?T|+lu8Rkz`=ovmt*E&xcriAMoOm
zS*iM0I>@7%pqAD~l>jDiHUn?d(~X4YONhB!<bbYIPL~7I{%4F?%f2f?K_5j5^p4A;
zup488{{Z7<uBTU5D=Um-cF5v~D@D8=*p=evhjh0p3A99m1KS^$8cXB7jtWb|L^^8S
zvIztq+wGszjppZ$Wq9n>1gU9cQmUhUM;vM2i9CgQ=5Aq`Dd;4cMr~tA**{;``*Fzg
z@p5TJZ0dMfc;6;#RJ4!$#z%Anm2Wc=bdoW@>74#wZXnfiye}J6O@SoRb)!sa{4w8F
zI}L~Y@3uUJ@Fjicrh;1Z7Wy?miyA4`$JA%nu>H>uKmPzu+i<kJHIvH#EM8{^%oJ=8
zA5UM?^Ww}NJe644{D?k|c-pN~-K{nC3l55THE1#dPI9^k^v*DG+XV0-WoyqhML}+m
z)(TkUeM}Gfh8q~)IYb}-0Iq$w=r4$01hi3dYf!-&MzHEANYXHO0D<`r%N$_JKZN)>
zZua#mjHytkAdEDpIXmNFk?c=l`R{ttM>@GXX0>xA1y$ZyZT9G%X{9cK6$$7l*y$kd
zclPh=w+;N8;0(0(zKk&@fKSZNAT88x#1BvSJ@Lle{5pIwTW&2VOG#>+oplW!mDBm2
z!yjYcjfb}U9a`3ue6mE+D&ZMZ0Jp1toE0XPfa0#%qMic$FIDreHbqMX5=CvJa2{g6
z^*#RpFTcMV$Kmh8<)g#<YRF=Yl|V}}?~XF3hTZ|&xeneUf|)=~*_3YQ?f(Ehc)`EK
zyT;C8_<Zn+c`Q^h!B<+nIO{51L{S#b%D>e31n;oNuWkk`cPp1+%a>eZ(StvTU&mFO
z!YeITEb{Ggw=qhmJuEuX`-eTUeZKkp`ESj<)l<!vs*2i)8b_#hcGNrM=l=X(=bm7!
z=00JmtFLC3s-{MgM{$OBB%MdsCp-s88f9%GI(I*p8~R2GJ7uxEZ=8DLei-?B7~T;G
z0h&etW9!a+59{f|**N=gI?G-1l}VO8Fxg>@{{Y{GmcbU2*i)RjVeJXk3Ie-hPCUz;
z_x3w~f8Xv`mKm_J1OYO3?%!<p;%78op1O$`qJR`B)0G(ZA8%e4=%$i|)zsrHl^Ma|
zQf?!?GGuUyd%E|+uoyY>andi~Kgu^6{{SDZHyGm01+oJK&fcs_l^>s%^!<3}$A`R^
zU*b=Q7V9+%2`g)4(-8D#!6Wy_emigc9=;K3z8*X_lKWng{LeDRleA@Y^iT|dLH6(Z
zo)${OX87IiC|(GF(}?wF+qO7P=8j%l#Gt>PIS2%2xb++`eA3-2V|a+ep*i%%I2&-0
zA*u*`sM#ZZ^T0@!VLuao7b&ilA2VQ|<my}Njh9qU`g(fy;}_gM5jonv=CDCkZl*}^
zMCp<K+wa?r(6n3QirDf#9R^4`eLZ*?%oP-rcF7EGv67etchrCJ!n`qWm$Jo{Nm6Eq
z__^SxICytutgWu8rMSyY8EB)HM`+lN+Y$yp=f4>4e;awa)oy^%^5rcX>Cq)TGLjXB
z0RXRY-v=GB+p*Yx9l5S9bLM5BTDsJrqHd(M6xv(PqjA0l7b7{??lL$bQDCRA^4WWR
zV66!h(Z-47VU$%7hTMV<=L8dhkao^2xwyVDG{QEnMz_}TuP}3L(L>A^a{||BG1J71
z8%fUEwi|wX<2|@}u=q)B@ao$_=cNo%Nbpn{l0X_pL}g6jlsViC9Gss*I6ro?i&d~l
zI??B}Qv$LhFRl-!0U%`KeCNLsERe@jK@DxvhTzuv(&-dw8+8_NPzPmU=00qV&UeN(
z<DWdPPiBP*6DH&{Y`vvzCAx@G&hH&lLk@?*-B{yhQIaxo^<z0aKl1%uKgrfkq_j2h
z1;WR!T|F~`sD7nZb=yBqGC|vc^>ho#b$2RCTB@3X8Tp8z3>l*i{&3mU2>|B-vAOo)
ze(Luc%dGHI!z~r6iCUPqP)3;>wn-s<#yk0YdT~mU?TuDESSn!U8zaP6qt3XfQ~2r&
zVdMY>7$u`+)Jec$wsLq<pPA<7-fcA2r;TVSW$HE`Tgq5z%VRkDK;Hu&agHz0GEh>A
ziWH@+V8Om&hEj4drC1DSJMFe{#f83HZYt>2aZ$xlHkOs+V1`lw!($n4*#p>b+k)1C
zWA%Nx>^9m;Wl+`B?y*5RK93stgD5y(BanN7N&J(1P_<A+Gs^*Hf|?YCnkH!DE=E<3
zqpKxUk?H0fT%+cjr4=y#XA9LyS35;rs!{?vJ_%CF$FL_j{;V9}<#U;4rLJu-RvPHi
zU}L6aC*}q+t>y;>akfb8JvQQ9X$5_b@!F;l1QhFCMNq2^Omj{eSfc>>3lc_r*aYn0
zV?D<gO@^_xK~qUAtt5sd$t6nQl@2y+9N--7>T|@4gHzjtR{G&_MrAWB(nKXqLmpNj
zjIaZ62VgcMZYJ1is;8}~k>xT#sLc$}MpsBUQ;-;el1Rb;e57X^@q6r@p?2)_^_J*p
zq?VF+U5SpB*`z_Ie1&w>2*$*=*!=jvPtH|_np-_|G1I|w1y-Vw!IluJ%7pjGCmWAr
z#GBnsp2g61jcTfvIS|84p@d|Tc6B)0832rLj@ih&*|t{LeqyGI<s@p#KB)C-IoQ9K
zJLfrG;QnOASgrh+<KsTdLCgOD3OwCcG*9>xvcUvqq|D{clu`zbInI&Xcl?0l2l!5^
zND&$tHIiSqzQg^8@5fF*iXSypa+kxk9M;M@lS?ha7LsY9Itl_?O16Bvs2Wao_1k`M
z$>Owh^Dq%&CYK}tHKKq<$JFopgU3_FO-9kq&eM<rmyzq<cPfR9KVAlL-*5Nhc|U}g
zhj%VsqvuQ9ao6jp5KuyBfa^#DYjsjilag1<f=-=?!Q)D8z9m#z+2l=ek`%*(vVou6
z{r>=7I!pXMIiib}{u+Op$5Br_)xt?+wa!)Ik@aZR(>sz^PFQW_0OLGenahYVE!s9B
ztCg$evCPX%(6E6(sA#mwI5{k!<ZQ!oFmsSjae>HhiVHM+z3~IgG|<B&ZYoTnBEV6o
z1BC#4`*GL51w2xsZcHCJ4OH<}2^Gy5m#P`Fp;c6b#zDq%PX2(7IZyGwX`hz<BYB`s
zr5Wl&CaBagT_Z`s&N4kS>%|@`YFi&N>WqKNx1nab$0bz(bjT%Taunn98SlBq{r><=
z*~q+^2aC4~dTSk~pjOpkM5aWB1tjj>i;xel`Te-pn-x@Z+zteiF*s1558QU+asC2%
z4yM1Js5Q=LA=DX)?&m-JfEYOZj{g9s8}w3@=!tyzE#~fByv+!=S5?CbD2%)$nVjR#
zr}|TT4fBs*PBLGDpTnz}@70i1S3vaitTII4D#l6Og71<tPWb@0W0RhXQ_F1RzFdw^
zmPy<yx#}FVZMJ{suM3iR!kpy<)b`o!)QJ#1NdpI%ozBVMxA#A8D4t3zhCB2N<&Hw4
z<gQ5^y=IO`rKE%W^;#}^V*@Tvsqc;U*l?qA<O+&u-nx3qit37!*NIXSsHVeHXR>eK
z*Gb!B#&Q1u8QPD6RTi#ax3vXz!kme&H!woP>_Za3YGUKjakicI94bi^loUn@W?4;2
zKA9ey5LGDyO9Dos2b&of10)@Q9Q^)8KgF9dWBEomrlFdOhFZ}oEHE~f86=})BxBcO
z+<pDHHD~9iw}pyW<aJjH?yHj#$@;(2e?AKHRishdU|B0FUZxo$hEj;dHEWOnq-5Y|
zRo~ohbHz5R1&}t1<}|AEB#$*wT`pQZUS@16tCc;-{PK9Ac~n}lj+~)eZ{}Jc@`Pfe
zxgMv3)?Pxjb)I2Q8I%%xZa3WVk8PZ#RcWZIa^Eh{sgWX#6j>K+I9EA6y*p(0;O`}P
zn+<j9dUlj6Q%9yvLr%9)rLp-I9BPJS%4dzPjFE1qr=*O8jdG(n17X7FG}1kKmT*!R
zU_Q;h{{Z;lXD@iMMOk-hc9Jr|^x!sdMs`1b`*CB${{RzUyI3HCC7PZDWRd4Z`ats%
zJ;28Q0I#<W^2V;jSmk7XcBiL!t62Hcp9_p_BX76%;8Z>pSZ?&R($*|}X#EG2BYKW1
ztFc$##1chYMORBS1)z9jF{I9;>fK3iE>Gr9A4$vgyuTks<)<{|iV3EbRG|z*5~Sxj
z+aH$+{{S%?>~)RM@yh(AVWpr%rivm61d+1s*kgvfb*3t6aKlQjzyLQRj1fW2*BdHC
z^yrlWMj{%Bm@G0J?z)@lVc4m|WF5FKL*r$|Dk7%1Qcp`Hz&D@QC%$(W?ZH{&E|{{z
zBVa9*2CR`4I*mh4{$PImb5H*O<{9SsEjE5p<!~cEF(j38yY09dRYCs%_3_g#M5$`Z
zSP3W1gPt`<_|JS1+`c5dGN-y&;xb+=1*Axq>XtG*z-QNBc+-cwGf&{)b;{fFGZ^Pi
zpHp=qaz9MtitM&!u2v}8%4|Ud4EqDaFErRId2(v1D~ttXfyrpyLntF-o!18-`e*IH
z+e{I3iwKNuAi#CNAbs~gwmp0Cs$CQ=z<2rqMPBG)k|KYljtU=RxBfVQq^{d=+h1dv
z_fFBsf6c+!v$TV3Z~p*)UKOIGc`6n#rJS4v135ed?2<(ICF;=#+by409f#QGi}uc4
zsWlA0F7h(CP&AeWv#{eT_$~13aq&*7!$nO5y6+bndSf<8RTD|15<P}C_v57B2_M47
zlax8;8vbd5DbmkT9El4kD^a0wtMkqe6}hzZI*+zt58-M2JFeXE%>1*@_bGl_lHFZ7
zsg6kS;KsQf`{njOuiK8lay68{EX8Xi!bDmC>_X#V_WuCi0Q@fGx-L+$bXJ-=Y6)d7
z6+ppX{G4y^jvgatn6xxVC1-5L?Y51(@g1-p(^{T}r=}bMOukXuBO7rK<|C`EQ7|v1
zNX9soa`}&%V^JK)$~0kcOA+~cV}Liyy(JAhNjtJ40$3cWQSbS2ItYIIe@k7uNbt(a
zpsOj=KERK^8tdbCi?d%YpULSbmX4hy#ca@zGAY|g^*fQAVDIUjhjZ_bRs8XEp4G}V
zU0QZsFH*mY)YyWloOZ@@ziu%%F;Z39I#b4_S}4@jNYeSl$8jpL&#poC^6Y!@kI3>A
zR~6Z(4j*jDJhf%DQQCe&lvPU&8#**_RE=eeYr`o8Tx652eHi&y)NP_TnbL-uv|JfR
zy$~Wf)*Ka93cKKT+kIIhwhD4RTvc$#TS;7VBq5~vXVFy|!e>hzpKme73C1umIKO9W
z70z15x75<fT@+<wR(D>gVp-Esz!@V2RC<2giT+zQ#ZngUx0|iN#I?;uTZv3a9w8D;
zq^R>c?~f{tkLTZsm)>%Zmn}B+veVO|Y_CI4G-f(-qz^F}RwbOa83y`uzi52fVXSiV
zR#be81z;lFGo7|Wocmy%&N#PVwncNGh)F#;mL?4YJY|_d@)puCN0;r9fJXi6PTeuu
zNm>oiO>O3R=8m;X++I|rNofg3ly8{TH6N**{Vjv1eSzX-Z!A{WG*rnw8_*Ur&6O(=
zKmi&+0J9b>OOvqKNjW@Sr?*k^b?qaiYFa%=s~oKnkW4iYnHgqgIX+MTBmi(2@nW{e
z70&lnTdG@>@=(W1)<^#UF7ps{3=&6BfXj?vjOT70MW?ZD#M_lMvaX?_qoJm*0w0-?
zo_1)XL_#vkM(!A{319&uZTPikpr_@yp}belE^(zus)-{}8GMpehI4`dCm6<1j9`Pr
zs$OM!{#pM3FI5FKOE+Fer;t1OK?qmLkUNu%jFsOR&5mG}E7akss-X-cGbKFHg+(JJ
zj#n7lApZbtV}RIbBRHqKtwk}a6ttDB^>md$Gq^`gGRfryMotJh(f}HW93@T>xtdBt
zPdkcdkx5vJq@)haeLll{?d`$ml9uICX;#}SA&mrJ)R`etNiL&TnMO!EdIEiTpK%gc
z=&InFjL2?4bwqP$C{;j>i{z$roDwsF+m0GA*J8N^X{+X?5hS9bHkFXVAgjkn4=W~c
z2*CpcgN$JNleXH5nu>LnX=)*+hw&X?lsHlSEc%-ocRxt}qxuNunq;TDR?igQBRw3=
z6f(*dHIusolEiJW(0%isJ-b73v~tw4)OA%RQ}m4V7-fqtt%5Khj025tfOEyaWGTE_
zmj3{6o@n5rHLV)dNjQ%R!3oL62_Whl=ik$d7eySuSrpZ@Vi>B*#HkzN6NLs$Ao7)6
zg91rAX9NSq9I4Ls>g&Wbf;IW5^uJO#2xOB00x+a*$4FhVfwOOdmkPAK&i3LG=JhKg
zG6G{MDr(Z$V$6p-Fj7L1+rC{=6{Ar90E`v${7>-vZ-#<&sFr&4ma!p2<V6jqIT_m-
z+@GlN%PQ0<DF@Sz(RhX6CC9|OeFZIjqM%w-7IN{CG>XGyb^xZuc0O(MgM+^zJZa@A
zIUmHk<*Gs)(ALWkag0a<95&l-FnH;BbJr7}<U*xlwzDRk{*~i<{{V%zi_6XYiFf2H
zoZd@oEo}=z#cN{)j(T2Y4i%V|Qb8fStTB!>HDfGJ_~RmcF!;e!;6IIa9%6!7BNR0%
zX6eXKn90L#0rcOo?Z&LJ<ra#uN~N={Hs1&DoWB^iQQXqyOIy^ESm~fDkv4R$oaDD{
z^QQ%N^v^oKi2}<>@daBme8_6rNLh^AF=ZMUWBPHY7&-07S2<&ysk}kuJ3ZpfJ;v>C
zoOPAjrwJkurHN%k2z;tHUijZVwBz`^_#Iu(HoF%#!$~Pyd76%AWK$>y4w~2;KlOQm
zIRs=3jN$R!O(to~ogDk*>s?Jmi!5_2U^mixx8?8c#^ZbrcxBIiE_0L-+ACff3wsSo
z5$PtCAU2Y_mcb`KZv10UgO7(e{6)CD71Z*4#Ivf?khxvE;C3Z@k?rk``!Dcc@NLV!
z3i4zVQN$yyk`S*hHz#bL*KGUovU_w@56AK`hca?+GRx4h+M2GnqY{eK(PGrVoMWgC
zI~-t){`^03e<J??EV9>9yT?Iu=&MLlBE=bpl*<_3B;)O{JbBF5+CE<AyX>)-iDIk`
zEYeC~b&~@|i30#fm&}Ze4i|7w1^G&vsX?itucelrra;kkqZxpmI4TKX&G%Mgl{m+*
zBgn}4QNJ8rSpv^pakbFNYp<-PsufwA5yd1?ov>R>pb`T2$LZ<B+s84`UF3{I7t7W=
zDh6D$3><9z)l`A?5->s3a8CuK<(qX+BiBF7t4UQ@qDNM3LC2J-L!_&KeL*-Qeg?~7
zu~*t9wZ%?lnmWafZ^g@01#L~7fwJJQe=tySxEx}9nW0duysdqq=K7SD+iR$#R(VoZ
zsOhak4bIsku_vgcf#^3pPv!VU-<uke?L!3Aj3mkFvqqsX%hPf{5P-ND7$Bb9H(0rH
z%}dQy@X%9J#}tUl0>zeeWM+25ZG+fpBO88#VB~sg6`Vk_yi%4*cuP5wl!Y2%3|~4}
zAFCT-ah>rv)3zQ<p!FTDIIPxfGQBF)>wyZWjE4*5&Pel*DD}^6vAWgs!<yTTw7e08
zn64r*!pif<g~w10gXEsr$x=OwF~@Wq$}KGvbqC~6Rh8fgEREA*2FC>V3=eGXNF#<c
z=RUpi8p;{yAhx2(8>tdGdXU3jk*!s6rFI89lh^`c>C*>H!IqmnzR_@kN*HV4rmIe}
z3Y9MC%HCy7iSM!0SdVkxhg)5Jwr919OAMDJorsCrNgJfbFat=saHJhT9RA!ebB+0F
z`F^gl8fAn<0~L}AbSjc5EaepJ9!1Ve5!fAA-~=40Rm|5#t6F*()<T9jX=%VRqbq7s
zS4m=;2yM382YrK+T0>HOgsCL1YS?-S1-M(P5<u@uCqq#hS7t;nwvcpz+dar6w>v6H
zJ5pAdgtY3+Y7&e|0;`cB45$4;SGSuA2?XG9yUQzIHFZ@)b(6<!5e5*-dV(S(U!?7T
zN%{|S*!pm>&0O(a4cRHHuGb1^rY2O1CTQejG91aEjYC$TcVpaOkU-)}df6ilj_}wi
zrts3P-A@$^^0%EKNfnfXs0Kp#+#C^)F!K#Zxy5xnv2gi_Wa~(DF1Cd#2B31M&A9^#
zRj@rhj}5$wL-UbTLrv6%F27Zf#^F~wv81y0&f90q$G-xu(p1t}<EW-;I4Gf!WSV-4
z)|y%53{=GujA`zte1n6&*y7Aym>;xk&xN#Xwkmm!<RX$iPY(AxZ8h$UB|-;{lmevp
z{{Ytt9uwTfWr`eN<}gluGw;Kyk<u+5O18~|x}H0@mX1vO*{FXPKf+_fe~6l@yOh??
z<@Z_e&r?X+3lY9Z#y9uJ9ANmT_%7yOhR+r+_Ntp*ZB44*G3i#cM?|q5(CPzo*b(l1
zc>O5U%&rJIBk$PpiGCzGTb3@opIk4rw35<I5$e2=jh8t&J@)VVaeQUEDw01xT%X~i
z^CvG-)zYfVR<3ED7E<XTCj)-j4d{Kx8x`=Q{3jCblh^aTL>Ag`O2Z1s45uBKA48Hx
zKEvN*9wqa~C-@c4SL!<q6wgBU0ASF-p+Yjp*>Kp>du)BU4&NG;3t45BJA`i>wH;Fu
zvHEaIpUY$E@4&SevH03I)4)FfIV-{2Z8a^vmXX?@q)kkU2?ZM}-<TxekA5~UmpPKc
z)b$ayOj-KmXJM!)+kdum`*Fw4Zur`}-J)n<x+F<R$<@;*{YUb)-~2;#&)+|v1Mfc-
ze8Y0GU%D50p1S4)D)CHJR64lA`)<UO_g>iH*Ay#*Z)aqG`jcm#rW$prfIu}yr&#m^
z=ldQREd0e34vkA!0!fpQ>@knejx2It#BVe_6!R@y^E^)zM-NoyCDPd#?s7{HeUIst
z?B5u?&qaHO@#|)gbmdre2M+iop}_Mg&vEVPo)?@$`)uh~jQ&5+cxPmL)!an%unguo
zMx*Jl^*?Sk@16W@ukq5f(^A6r>m;h+Fem0~qZ)P@$4^NoIo}MY94Og2dzyS?zS`vG
zNTEtqUc3~#{{X4CMk+|iIbTlwv)_h(V6i1N-rI1drD|EIS*WX{3DJgF*fCXAIVFH$
z=E%l7dtmZBw4WG%siPJTY;UvpTSZ{7TdLxzi<hXLjMUUj6p({Yn<S0Ar??=n&fdHO
z=ZjSYJfUi}&n0~%v(C&WtBeTI0AODSa!4zZKkN?;bytY)Hc1w(IywYZ5yvX&=%^(@
zU9h7nz+{}0k8&&KNNv_jH8tLzvZ@-dC0yXhS*KPdbC5<Csf|H*8C|y=aiu4AZi@6`
zrKza5%S&3VMzpm0A%?Pn8AOsG!)o7W8TJ|Pljv50s(xU$P+Jh0YA1$vj4%kYX&Sa8
zEtWd~z+{n(=ZHN20L*k%7AfvB(NVlk?v(X)YF0FVOylZRCv4?_KUWud3zaTL<hMwj
z1PvM*XF{$d4Im2INWdS|z#IXizBrb{NFhYk9Mj?TeQixM_3h|}mYz7)K`|sQo}kVG
zj1#tfeGdw^Y1)qYT~RzQN@>X{96GeNpbk|308kr^!Q1b~P`X;^t*La1y7ydZ3N15A
ztXHQdFkMx4W2m>6*f#qN;f`juHQxUKK>`;7*vAZ{f0=wSWIlv1smAAS1M2;S66346
zQ*(oJ9m+{=G;@9w5t+d>vW-0=$a_bHI01c0Eu3*4vz*?#`wKVAB^5-S8o>IFuQ(+A
z@_eM7uus1RZPe6U$5!oJX|44R-6*D!vcgOdGaBLLW46Qv$@+&1^>-u7ywM~!u~$_a
zxkacEbcj8$RksKK00VsRTR;kPABI;bo~F7=s3D{+t*fA)sHGK-K~w!Cd36K!#|)kv
z)Y8<~(+TMo;}p>tswAb%ax$<XfEmG3GweoBe*6HW=E<)7wN9d<lA#u)VPj%OodXK$
zzyiyL&NdnK!NHq_(P`>xscp7d8cMh$>zaClBC|-jIXXbx61d3he&d3Y?I1gPVvjJx
zOUgGI3G7wUNers4C6cKp>Bx5@%6A1w8}GRuoHFul=lRXPp=E)lsjV$2N%bPl7*G)r
zRO1@5NgvXu+;FeY9I0ltRjhQ&B(+d5l1YQI#$*`CPzIBy7&#k)cNpO1g3(=nnvLgy
zspE<{O(Ba(Gf1pKR|j>*+j@WbxOCn0BTKs{U9OZ7(o)FL2e?(#3w=mhawRPw@*lpz
zm$P;sPZUEX?$F;Vlf>3qtfYr6Iy(T^L6S6ijz|PB!6SY6FLUO|X|B;-jj}qWNY!D|
z?0R`8V19?j<ZP$%$>L`=S*W_xT+*Vtj2PNUS`?3_%<bKjkVl(r?l;>9hDdhBeqyrK
zSMt?0(%or|>zQ#<kvpQX7|B+_)|nsZKF94dk#3*N=Py%9SsmDh5~IhKlm;VlAJ?$@
zys`|8smUvPoo-Z>5hEaaML{OGCSe-|J4_iznTAGix!eP=;?FVF*4JEB8b^1eWN6J+
zLqrOXI8eR&ZZwmDxWF70ugDkajI>s_ueQ`x{Jc?B2^b-SBTcJUl}BSD?Ax|>8bCPX
zpMS-x;T`EMkK!E-GC6083YjAYElcMb-ZmN5PMqP7(tQX#Zxw>|EL_@wjL>zXC8k)z
zR7m*Lp~(dKhy$@Z4bOfo^KG(k5UlmwxqVpYx7R?1YH18|W+xdy4pafBJ00)|&llm$
z)U6cd!^$TIO*jk_2T{-1jkvO|OX|k``}gBz{xE(9F5VFH6!$w76<tM`;!_@tPe^-U
z;~<S%fZsk-#<jd{6vXK&N1^oNwF#*!M=num(>LGvLHt0`)LrX2D(!c!ps92cTG&i9
zfEX7=R@k=N0)H=FIsweKX=r7RJL;|4D2yYkFsBJJfEHgWl60LwjQR}yxZ#(B{NHl$
z=frD0_R}P=TrJgc%?XW)GZ4cn2;674>&JJjx8uzo9WCMrs;Q}NRFT&Ud5j`MGa~BP
zWrjStz~3N}GmbImj~S^OF+Nb)kv<>(54jJMs?FlvVx@+rsf?h3fScrn9f175?s(6U
zTB+iu5l0tHh1?CeRPc`J6@M$yRK>hf!mNP*08T*8amGQRcv^v^c=Z`JB#%$G_v2gI
zGn&iJ{Ea=o#XHQ<#P3g7W0B(NhE`oTY?pM8xz75V0k+%@DWS7H+Rze?du2sUSj0<8
z<%<FUZ7ea=@3_(e`9@B7YVr06>G{H#nI17$7fl%X(6~EljIxK>o4;-U03x?$<#vv(
zr>=r&DiDRHk{Fak<5!bN$tc)WQZ*2B<<p#T!}6n3XzAg16a=z0-n!={s&i3Q6G|YO
zK;j~dQ>hwi)4ML90a39y^x`)#UfP_x%^bBAG($6^oHXs|Lu8Fipn^y{u=L>XE^`%a
zJq6-9ATmc!RArUwBQdKc4jA`r>mdD)e1Z=i+Y*-*rlyu!RJ)NSD++S#LpTMQ1_qK{
zur~EM8)G`_Mb-nd+ZyG1Rt)u2jj9}$EMS>XIz|{^>1Dtmg&8{mgTd}uy9&-zvqv2>
z8uyjyP{$fCRxY8+HlyWXpd91VAJvX8QCgz6-fFH;B#@B=F`_DHSCpeD$sg$mNge#d
zBfdrQMa|cm>Zg`jr=_bj?Hpu>l1UNE61(9earJ5$1Y>+~J%`ZGB`mzPb!v#|qQvfA
zYPzZN)Y)YSg$6b{M}GMA8}Vj(OI%#Mw(01kk?t&wS2aFkg(MkdY_Tj@hCA#qpkxj&
z)bspwt5s1oT}Se&i408UA_YFfR`@y)?Sg!`^*V4Z^G7ZoVT{vUUUkGPnPQEIkq^-z
za0b1JTmlYG#~93{EwLW^%rMw_s!D2Gg)3dFDu2#RRVU0M1AvjJ04pfLEI`W~fL9xk
zpypUPU_i7hODz)8ykXQ46c9U?BU<3-Cw$<HuKxf@;&lgy9KB7-bka|6nkOf!UMO@)
zZ~(A6l#Hr{a0?K2KD~?%TDVr+>sBjuMKe*`2wFa@dR9QlRH(*IlcZn~*n&toCb=ql
zEKM{z&s|Z<l(ExMvP~lN-k;{Ck4vx`$N*s()RBRb4sr)$!oAAqoV#?2<6j3#qVlXK
zimGDu6H5~nb(2<9E+hab0|&W0JlW+IE?=oi*YhCiNeuIeBq5lc823=;NXglNAn*^w
z9!qQGx|-iK%_~vHMKt22da}sa)f1>VTw?$Y)T)e}k_@i2NWIe$Eo(K$ovW&+sHqnH
zGe}{L5+qqLTr)TrP`$K)l6`owpi$fF5`pQ0)>WA5sg=SyN?2~naiz;2=>Xsn>T^YJ
zgq1OJ*@B|FXy>V3prXiCWdQ3<M^3M+P}7nMkU=DIJDTN@ZZ_F!WL~<%6;w$kBT9r^
z0z(jRbq5+xu6vWiVtd#oz73P`x|!&$D7YGmjYAup@ZkgbPBM&k$G-|*7Tlt^*dwWl
zanu0l?T@z&s!NSZGD!V@UOfgSqme$yw<2PT3J790J@@>$(x2j~;swK$d=$CEZLT!e
zM+(t251{RmLn-bE7$fiZ<8!XENRcsC(m>x*@uEK+_R6moIohX};z%T&X&GZzDmt$r
z3#97x-y_!`_T2GrE-KiGTceDABUfCm_nNsx?D;IMh9M(QNb~9d$^Cdtp7B`}khrLD
z@vZ>}7z4K%$Ks>GTbF|T`%z)6r;v$Ptqh<QNmY+<a56UZ*kkoLV*Shi03bujx~hS&
zz&rl{x2F!Bs}ZKOM3b2-gv?CrLx2ezW4HGlT|DJ;rfo6Q$~3m;ImsUX0B#|eVp&w@
zDo2=l`e%v!w$v2$F`A;~NZpsZ9sNCj{yY~{4`cU(Hco8kn}iY2%UF!3NSO)pd9n%n
z<eVSB-;S7k9{eRWu8NnLZ?e<XR-{<-uuUZCMRf;Ol3M_5GC}W*ajZWA*Bd=u@o8!5
zW2mW)5j#N=WU{H;`d|*nC)>6-=>4;wDfy1YK@!@ar;+6p^F;n=G%Ab~A%+e$YzE$8
zoOk8<S*6l9;l_jZ4o<6iB%ysU(bs^lEF(m#Bd`pu{doGjdl7-(i&q;@@_ulmis36P
zRTT#&S!J3j2b2{~rb2~fZ0Td2eYfI8vfp{Hse45%^p!C|5o)fY0RRN4R@9)dU>7+f
zZ|Xk4?T<Zd71q9Bf{RtOAD63Eb&VX!f<ei~b}Gs>40`NGGnMviO1fhleE$GNbXvx&
zk~yg0suZd6%HldU!NTVUsf{^3@Ie_mxLxNPjCFS!$Bv-Ay4?X<DAn2eZ6}zF5x5GC
zlEWF(j^m0i_v!1o8?8%MG=?p5J9LJb+%kujMi@;aPA~%;o%o_2TdSkxdTQp=9aYvw
zo>~50GZNFXrU+n0HL|kjPTTFU;a1rykQS=LM|h^1Nvfa}Qo&FwBS=}+0?2n}-_Fbl
z#{U3F`|x{{Z4t-HRMn9^Ofabt!I@YqHlRvluo+@X=NNCX99p*W92SU@qT*nRn!1=o
z%TW}XAE<#3NrHFQ8NEo#Y<r3J%1`7IC9>TpYBh^QRM;vZjl`NtvB6&F1a0QY-xx}^
zHJ2)=D`Ap)3%$V%vC7l+W11%*oDEGJorjcUf*TwDX*}~S`onLY-&=B`uSJo>b5r?p
z*eb1!fFo~Bv5fHFM`|m~bkRo`k|&8=$sp3RfZ=dJWhzf?w$<t}z}ufItbEx|SqwE&
zK_s!n)QJ%j(vLZiKAaNa$;)7WN!W1`CHoP13J9q!jZq{5j<%m$M$R;e+X&xLQW*Bq
zOAHns{1L6NzbRaPei@>wl5}>6k%ok>e9RP;$tuJUFjpU!5Aj~D^>EctP^qh(rCzhi
zNgYAzxnfr!6$~%{1n;@d++s6vuCBV*Lro22a;(6|7M&^qcLbFmNhBP1&V3Ft>M0;w
zb`ItmiK%b3)6|OLTReiMF&rQ)*$3$f<;Dpl4}Kdt4%sCw<`3o-l~gj#{{Tcs12e{T
zX$`T)H5_e{26o(KtCD$A4p!wEDrLD(GsxlL46PuBMbt~iJ19BMKpERT_{UYZtEVk<
zsb87-nqbQ^yE8XXHUl;e$XD_?!0nD1Xh*R0T!S4Ch*2qmuCaWJT?{+IFm!5G_d6E*
zgWUJON|pC}@PG&<h5+=fBz0~cqs@fM_GKyw3J%8^&NyV`u3U!g&23X8j8b?7X_h$w
zjwWv-tAclIIQ;S3Va6}B(brk7k91n>QqaFtdGO~MDjfO|r0_b~D$A7hcS=jeLc<BI
zc&a?jO-|Yz<lwT6_xH|m!}W`tt$e>hExO}FJq^aB0VM)J%AbhZ2~{8*?~Hfc=OcjD
zSS+=d=chKxh$=1c%p}Y@M1_Wl7D5z~m|}89a(_+@+WBsV)pethmY&eI;T%e#nIM8N
z#epS&4BOxq#>Dr?99>WQCH$AIG&DBTb(YN0$kh`TH19KkJw$ALfDxfXVEOk0Yzz(P
z=8OHx*K$8EF^VvTUzdDH=*)6KRRLIM7%DJ(?SsQ6x=M-``7Wh2!09es#Aa3)Bn)@%
z1~wmj@E*;|$T^xx;J8#Nq9^dB*D|P6sJXyUNIk<3^?HrM1=zi8xl+MTMQy8%qp1^@
z5=X4X1DQOl=gTHHW4T=WV>|#(TfEfXs-`U?iKLaWN``eL9O+De2b5>u9-K7u-Lv`S
zB`x%cD5Q>3(U$5v&D`N+ED(AOX&`Oei<GuYr7V&)(phL~@?=_gq=Y*a$Cw>KlLRQp
z&JVY4B3lirE2;46hV9BQ+ozEjTv#JVRZK#e7rbGz2>`JG;~5=~8iVn-{30#<^>sJj
z4JDwrT<Ql>OFXp;{&P7x;u*@5+ey!HzrN^Q>t}+Vo)@*rcc_jgSj3fSNg^vYtQ_hr
z2n<Sr-9`_72;F&7df29d2o|yF97_}u$<>LFoD@vO<lJnzIr8~-&lbZogS5(LiA%GP
zpAX-|@1Ad-JXx&QzF)1Nq^7A!Yo?WS#)uqe1nf`#4;@+M>n+OLVKBi%6o37Ss(KH@
zh&vTP#TW%<P<w6M?l;VfA{ege^93norH%B*BjrMp4@{hD81%xp`m?de47H0-cch8M
zEcWpLF+7qEj8RAam2r^jbM%(M(!IzSvnF>rengHX7}7E~!bNmde4klI8_LnzYMuzh
zqf5r1<SQ?s0OR!II$Nj&k)dOi)3$g0c-B7!Ij*CXd{L~TmSvWT@f2u|(k^=75*tRM
zz!U@2;Ezm>Hb<APl6=2LWg&6pJ+OVa=;EI!BQ8ijR%0)TZw{m8dt6LKe4?G0nCToW
zvI3_nH4qNj7$gJOoN<b-e4;sN(mPdcT2-`3BEXbT<V11`vMYv@xh1ep;~Cs>vV7$*
zmC;asAUQ*f;EWJIw-`Uf+Da%njKOE9j<!i86_QfSI^QRf1d-(L7{~>1%jy7b++y=F
zTI7qoS+$@97HW!XlvVZfqTOx~$w3@Qo@h&kNgI3}*#_Tp_Z%FgtAg8kk_urA$YV6i
z5FjWzb;cz1!xbQ?7{;s<jut#e<x0L~w*0*bmO6?B5=B>5R18KzT*`MOeK=(&BN-UU
zXR5nf`Ff3O>Izm>0UV+@U0EiO0z#`0KpMKZ>^tOf&RWs4y`J+8z>BS0tst46K_f>r
z>d2!|0Zv90wE_s=ZvKabd!>epldm-|Q7ZJBa?xuVa~1&_fc}t49-|CFBe9uX&Q%wC
zz0!_Z%`}x!7$A_Uvc^Lx5=KTzMv*l(2?I)>Lz%SP%9WDG4P#L~QXpt)wVfakpu9|s
zNg49_atJ3NZa5T}Ric@B>W7&uvpfq?aE77-9Yn05^v9`!GOKMPg4w_a0FVoB#EVU3
zd~wASit6gZuNX+sE2#`RnvawXnH;bl!@1gyZ-Uo+wynZ~(IjezT+2yHbunS2h9gM>
z>H3t7w#NAZ${gucXT4Lk-kPCaqgq?#sF{&!6-vpa@Ceia2TL5f;P>wnT?VhBUo%@S
zRn>B9nw~1?*hHeLbdT`H*}{UsMx1xS&)bUmR?Bqd{$rtPdU&N-FpT6h@hAsY%si@c
zqq_~WfO2r(UbGcA2`iem8$1+BUYemQ6=O(<EsPW887wpE2it(Q{{Wq)xKu|R^3+k*
z!r549iYzGGfH&8GTk0o$UAR{gDQH{q6Pl>xsaWNfCaI??+8}KJkh)q-Z;&t-+i-uU
zJTr3lh)>M6xmTw>Raj#`N}e@SD}5);A<U11skRsZ;2e$>?)K-F?J%|5+8P>ZI#Sii
zmFsrGE3)c29e`Y99ga8!YPHr$Q%liWM3Uhv2>@BzBPOt_(l7v@>)l8=2N>ZM*=DO_
zZ6#H7w|J$sQqN4yI9i%oiG#_E79b1^lcNU%u|JmzoY&0IPaS+#>$TEZp=oKNiliAL
zmkpUCMHn40-~e|AIp49#5Zi8sjvIW2dYhTIx<v23nF<x^2RS8m9f@L3nC-?guvR6;
ztxY9VcKBwH2pQsOW0jX6raYxrBO!-ydt-hsi)*1fHdEp2nJIaTlBni~3bIBrgM1#u
zeur<<jEd1N1{>4#93=Qf$YR0BR>Tq(sg4!uc|wA5?dX4A9@;<hUPa3QGn3zr{w4UU
zIT;#l(7Vl5B9`9z-%5}{ImZ70ZZxNyIp&VZ<2_w<NtPK4l}fNk5kv+Y>e4{lu{#a+
z!8~nejTg4Ia@B0E#2902DLZ5jzovNA&;FXhauoF!`=b8<DygU)O150Y>|FjDusCd;
zjy?FR%E`twJ_y^hRzHcy!)@aGMMut5RFhTGh)?<9EOWBMlaSh2fCj^CfCvQp^T(d0
zqKcMC;Qs(OQriY2JuGZU8+ZQzow)90<CdYQ6;yReD)Q}W$*L*kN|c;om1NKXEOJ58
zR2&oAIOCLG8ea)<_(kHabk^FcdAWA$Bg;zADT+00`J)PRfC=nQ!yGS(nLolo&x!v4
zBx-c#LR&qF{rIE;fQ%ga@ZEdm1*f^PLN)bIke{gS?VYlJZN2ywl-ZE7#F~`(f%9PJ
z7(d^C&yC!SoJ_6o8P0W_iSZ@NH#k~&sYOtNsz}f|jww8jaBvO*&Iuj6@z_efLzS+J
z9fDbEqo7r064Dr>V9YR9P%znIzf!84Y<#&qi}+=^(^`41o!U5;RDf=P5xD&i9hLA4
z#JguS_)8643>DQC_SlkCQ|3`A3Za)t^KJpj8S<U>9CCct<tjQJI;CaP%{PutzdFfH
z9W0vKeyY?Xwn~C^Xe1nIYyv#FJB;xL!*)((t&dz3%Fw%r(UC-J)B{Ow`N0J225?4C
z)5Yld7w4$rnx$5Zu9+jN8eIwL=R?Fwuo{${r@6@BM>Z|Lm#!4TXy|IAhA88wnwgli
zDI**!5uvnd0D-e8ZH~i^d!F`dQPzX}fYrRYdzzY>=W!x7=%9+BBaIZ0tEE`uASlMi
zayIhuKbky7wq91Ip5l^GO93&?3UtaZn2?GH^JMHvB>w>M198@R8je`xsVge$X_A)V
zQUvhF5C(3e47)kb1`cta%12;$R5pq1R4Ucb$1Pn5oIyH6jZTiM=LB{uup=iV>_Fij
zl_8XE+Z(O5bn@K{H82B3K}e_)vPoKEp-1BkB%PPoc5Lm8ac+7VdmlI=r(UL;<vPnM
zMqUV#MpGEb*bgbjK|B4pTcf_#o@17-x|qXRQ66b&nj8tqz}Sp}2@8|y?T#gL4P{NE
znW~<)wA8ypl<CX_aXJo~2Vd&O2@2kv8?aZRcRuqa6;M`rB|~eZFwW^XZA>!5DYvde
z5It}`I2+6UDA82Ye2q;-Wj*GiSm;TnjplhEWjNFT!kybY`w}?Ew?1-;*>meuR#Qz`
zq=3yT=&NNKw6P1N4hDA{U~TKg_^YdJH~Jfl2vV{Jid0zFTI)JllpJrk!NAE2-+lvk
zv>Kx<T5dM09Yog351U1=b%kY~JV8iCuvL3DpvmSWdf*+$9!<)S!E2kX1q~h2hLUua
zQo-bun4JV{G8uACGrmF3=8;3qXPGIgo?3c(NogfYh#BJuHgl;v_ZSCpoPa%Z!Sj5Y
z@nxRkY6)eGEU{7|si<ZlVU2X1ZpD|l++(rfqAhPhu5RV~obb~v1x+igDrr@!01S0V
zK^jyYI!lEuxZA%Ny77Ianx2Z0=n`4!l_H)o3*tZlQW?fW1AsMm85qwFl>Gkux5`pc
z)<EkeIz+RoIZ)8()Ifjqs4lq~83Y`F4;bf`Zpm`y`gWzez_3kFvX$udW56TI_#_o1
zWanTwE$9P<zmThFgH1uxsvxwK-z_^z%7g~W<85iWp4r;~5O@W2w<j(`S5YL1BQWZu
z3;__S1hIVgZpYKVZXCo54MonP&v%9nn+Fu}&ly=$W&_N{)yJ-KF@u5Fsb4LN1$3`h
zSuVQuGA$RBfg1s&D+B~KpnK#UhCtl9TA_PkZeX=k-MR7VZKtM{6zyLfN-<~^Pylrh
z3X|s8_BlA<ZzS^}9LspBxD=@i3qvC`*^Xva%4~9)#-YFG=noM2hC9bD!8xd74Ls49
zgmA_LQinRSj63JHF`qYKo&{QIW{R~b+Kxf<GDj=2BTLeK*-i%Af<Yd`*BmO-9{vX>
zx>jE*Yi3q{oYKb}6won_X31tys;6Q+qZ!zcH_pbnX5DbG2`&>rD5>@Cr9^F|$tFR#
z)q{+j9Fv@Zz$kfoD@V%K&3sxnhCZ%(0kx72oF7AiPnk}fuKD^)(^_g8nkm{js_qpe
z&x(*%RgF$HKXMe4jhKywI}9`I7f7ES)h^J@Sxs^eLk~_F(9!fxwnBGh(sps%&$nhI
za9S&B({va4ofRCi5gMXM<pB((fy<n+W1IkcdLArWIRw)3^L)$Hm#a-|kr4Fs><Q9J
zq01E{;~B~K2ZM&qP0RE@KNK+2RMOGNBQszTAxwgH%VT4KkEjjsaW25p1xI3`<;!IA
z^`eS-q+;`Qk{N`aP*>;#5rPg&9s7?;=^{4D6%}_XvkcO_B10^b88ritst(u+xbp9-
z(;QK8w#Uoz+G{E*?e?0O*X7a)+%zs10!>Yvd*yNZkPi{AHCJjjlcmsl$SK-1oF63d
z7XUushG11e7zJ=Wb_|*YGDC9373Ti{3=q}SnZ8^x2&|!1Hev%s=r___XCrPWSnV}e
z+QUmd!lcpwRXQaiYL(bNkTS}kfHJwxv5w&Iw?WU8oV{X-dy3oOsjDUlgi=W<R#T@-
zGOpyXU9dpywsXNs+l<#KCxUoupQ%ESNgxO1+yWa~xn)qfW4=zzcR9}r>2$-siZ0Vs
zP_-p(GuJglQvBl6EXe5}OfH?iqp1cCPQ>lojP+vi{?E<JO&zvr-npb-nWHJDN>vyP
zSRX)0+-JDs3{_c|nXKtvv2`N>VTei^nlMPtgQZIr>;MA<soW93J9jQeXsV~U+i0ud
zl999%PVGvu@3{O%X3I0Sbq&q|QQwVtbGT`h%NmimR|>j%T4?IsqX`Uv$nM%vM{UpR
z#uKjPi*3KfOU=d!5vrxb)Q+}P#etU7tZV=|&KI#KAZHu%H;>nzWaVluUFJFGiC$)o
zvY9DNQ&cWjrlqn;Cm@_I`+M;k+ft|>`D7|4j$srM$J8}(OQ?k*9OQr(LDCU`BPSkG
z-baxcE-@1p2OY8VnJQ{5*7+i+s<}L22DxceQ^b<7I-HF~wfTV2tGAnc?w0je>%Fz4
zt)6+JiOQ@pI!f{7l$i{G9Asl7`my%f&nL@YZN5}>Wa>{-7>(gvBvB1n1I$XVn*a<F
z4snj;tMcU}T-yypOD#IQXRZgCCRSh>bmVDatey0qryGo%6|+b~m$|lzu_mXcsi?Nr
zP_nCusZvBlVETfv(CdtSKpbRk^zkm2m2AA*YpATJcdVtjEVR`s225KGyxwrYmG{-B
zImqF0FIL+xFuYP!YN=^i>KMi`BIJ$2kaPlbu>)n_ZW!&9bR8(^<F0|$tN`?;RmDcB
zSO;xqC3a#kG6usNo&s0@0Ae%Ocv4cdRTOn_%^``P>uYJ}T<L*y23U}jzjJ|{YzGi4
zd1kYi?^R86ngJ;;*3oKeDuB}Bj-132R{C9-66L_oRBFzFu*Nu(%f1~)NpJ;isY@Lb
z%N#N|FhdNv#ugUIAY)M_i8vS==Yi65veRE#X+BnxP$XJeTH^lzEDN0@Sr`o=3Z<Ah
z!+MPHc&3BDK@MBwt5S0eMxv_ebFYFD(Y;MF^r_hBD$ctC+KQ06ysUcw!-<!>rDrWv
z#Zdy>DJf^Fb)ILDMMSR6jE5Oz#++e&SQD_%5qT!@EObp1Q>`scwy8x$Jb)xo2~>d3
zrCU-K1gTa%+kbGkxvtjgAk~sck<B|g(@NyvD{cuH(s3YM>@vr`bHenjYPUmeFELV0
zMAJOUGE(^-M^GbxXc&phvmBB&HUKPC5_|CrmtvclW(f?`zbiz9JGf<?qd~6-K`OWf
zjzAz1d*gsMu4s<`0B1@`L(U?ILbAvdNH#&GBT<9&=X`hFvZ{Dw<;ujd*`5`FBCDj1
zX(F01!d29m%d6n1Bn%BW8}PbpEizmcQ>`n})6X2OEZ-|dB#x|*yD0#ijGrJRoDF~{
z(;&P_x7qo6;~H4)%<@)K{NvW7jT~hW!Yamt%jUzAoRhbILR4ItO?b4@JhwE0dwoQe
zfa^tA*_0y4=TX1`S07G&*M0<bE!^KgBcrIfQ`XZ-3Q0{xDUJscZGo&|qhh0Bh8V`+
zWZ4AU71bM2$rMjh%Cxl-E|zGQu-Ke?@J3_u)Qy(XPjl_Xc3XUwizE?}suD0*6OT?I
z-YX-gfR|;*sLtn)K(vlS+b~bXM=(cA%f=^p;)<eBn(4|3MmN~Gz&X>t4n2<;s@F$R
z$rh^FsOd~}^)(+Q)~(E@AWF$29q`0t5rPN40X$@nh{%P){{U&K2&G_I-U7&2BjFcT
z2E^g;GwOXw;TB$fsk7NBsi|d-lJgAGNF%E#p@Ht9HL2N7=WRRWV4gW%UQf;a8?Z<5
z(KfE1`J&NH9VAt^hy+!znHk~pd6pxkbp>o8?)hyb?dh*y8eRoU<F|*GC~4x3nx@=i
zXy!@vB=3d+%MqO}K^gx5<PWIhV=DRbXiZg?R2FNsUWb58{{V#=fshwSVtlMXBz7mb
zJXLo}er@EasUksDSrn1SR_P#>Spz#LXJDkJWXL$~PQ#4xl|E5rl8vpLTB77s=Q~Yw
z4+R|@_ORiMV4=z#^&I=>2aFxfH8Id%s-lP}2uh73Vd=LW5%}czRQ~|!J-*?8vs)vU
zma;<)!k(ToL>R!<bl?SI0m#_z+hNB$yhH?Z9ZHCWI9B?7S00>pu+N|5j($jSK^{ZA
zO%>KN^I8^03+3DO{{Y_|Vg4Ij^KP%?HKn*T&0R*N;j4~*oY=;|00?8)?~DPS{Bi#P
zmui-h<c`P~DcGM*ItTC-&k|GBQ^y5L#V83-g-(-&Ad|P-(+9U1Jk_+z{AX#VbSCL^
zspaTaxgKc+J3|F})TW^EnH&;XSm5Q?Bn{PoAYgEn&yqO3)x`@ek}+hOT6m5$2Ec73
zmRt-C{ej?J(&Js?jeQ+WOT17j$|aa7RCg<@SyJ1by|>#ZJQ1Fp@_pjnRUE%Emq4`<
znbi5IWKhh6f;D#;_ZdCM9LY84*oGK+(po-4r?yQ-R-J$bSx%MG4*D5e0g#p49_)4*
z;;3$P6t8Ws`ILH=m6oOzlki`rqo*Kp4wIaEewpC6Aae<=D{}t;F>GpB77FMgK|IQ;
ztg9%-lFNWI?lHN~3cfR1r}@fxBdBVdr9<>;^@UfRz`%SAE|HG?_WSUv9@`3b=>|D=
zsqa_oa@01eYB>YO<w7ksJ18WOrIl0=GrmqY;^#1OeOx!SRHUA!UZfouODvk3%$ig%
z!x8mrIKX3`_~I9bH1yT=0+ObJ2^UvNXsQV#Lk%Sc<Y&3{$OMqwI2*D<6s;7?PaP#A
zEH5=MLn;Idr>Fr0f}~_&fd_06z>2kGli7}}+^Kkno+;r-nJx8a{KN%;hNd7l$i|X3
zBpi~v5Pdk0&ODPf@0}{{)y~wk6*n0sMvYaZICd=SA7Qb`KW_YGt53<nW-(73Fu_q5
zQJNagxRx;q8p*&QH`BIGN2oh4T={a3n%agqYf&lDWfMTKxD2kj)L0PRml!$vw#H8r
zkHI;7m~QD{wDR?RTou($(?rQN9l;_Bs7Wl1hGV(%g1Hzu-1g#cH+Y8~1-ct_tZAB=
zg>_uC%0ka85~#tBbf`GTv1TK`2d%ufN6he0-TD#77P8j5s+40r6y=UI=K-K?K33fN
zj^`om_UnBaskh4&u+h;-l@ixRLm>*qQ9(E?zG8H2H#zm;lGec5vS%rB{YNxi;GS8A
zYojcY%Nx2oyA@ZFh&c<Kk8^><T0Tdutf=|7tDu&Uz$B8s2%8;M7-bzbk+Ly@#DW3e
zejV)9kk)k6&W{X0$xAIfMi-|Vh*6D1FeK*$fHxz*3iUQw9yzL|r?y%srJ3hy$|jK|
zi0a1PLU0J!kbCgbR)tKe3l*Q1=&mN~Qq^%(sfs`;BvnG{*guJ+wpSR>uAbaqz4J|*
zmFb$E-2pcmh*=?)MnYm;OP16#wgQl&*H5851G(2rY@TX6l@(>i2qa}JwTNYKs&OIQ
zYHa5Kh0gu6#4cmy160)OX}K*$1i`9Esi#<Eh=lTneB(IC{XYCObhLqK_C5T)HHgbw
z3@uj*IFP(_`pjthhDg+^*~1Km#{U3F$pB>(R?FS(l9}3uLWHX_oyY)fusA)6<o4S+
z1B=|O!<SvAj7MC8K$1^N$EM^k`lAX#apngDd=A*)j6Abxpbc3CJyk<=Lnfk0W!0#<
z=X`=kY@8FHL&MW0ixoCYrDenBZs)5V9b>Agc6FE%Kw>eKQWNitZ`^Rt$yddqg(~VQ
zt`+rFRPs**uL`=-NFB<kA#y;}cg}p+{DV+mVYzdhG}ZG@3o<lPLkxQ5nOXNxsxu~W
zoB(?c+nzn3zMfTz;Z01-)2EH1qGx3q9go%*zhUY}o8N`KSZH>v=4kFUv4{;FJzz(v
zk*17!BTzi-K?Hyquo#n;{J6OXG09hKq^jyxNeqBY%4c0=z$aspKp$3i#@iAx!e1mr
zw@Bql7EXsjQQkbRsataAe3ry}0pIfjhHDLE)m4(Lv~_CKvP2+R9O$TBEub!t#k`2j
z*gI?n;PDy(Y8#DgHIXDTJ4;1AwrM9=qSf_>PzKrGVS|lcr;D^T7b+NPV4{-VYbqsF
zSYk7lVsn>}g3QDPJ7Gcp09M>dy;-EYDWQZ*JzU7EQCA8TaI70K3~sud4`OgV&S1w+
z2QSfGD3z%YQvMr!s!32gGLba6-0D%V>`-m7;xrV=)?QMik)%a}ig?Q;`_smW)Wc=Y
zJfT<0JjYWuFmMPy%Wt&9L2#&wY3`LZWoh>cg`N9_bR!LbGDfU_t6(@CPg^rz5}u-(
zf*59}20EvvWGyFCPT3=E48u4WIPHuR6!jD|_3$-znrfO=#8knGYTs5CJ+M8`sX51|
z3C5M6t&(bJAe!NAp1mb`X<c59QtcdS%m!m^I<cGp4*mD+Ns%?a;bi4Ylz%r+D{9&)
zdeNemr;UlzrGRF}t$6joVllAd{P)^Q*^(wn@bwXmQ7bn=mA?;gSPjVXjrZGfIEl`8
zIC)ZwOkre_M;Z{zqX`)-xEqXyn;LVR1MPzM><CKcjzp!e=5=^XNkv>RUKw;5oCAf4
z^py%<LCFJ7{!@+!n%Mb1!wtc$kj+DMLvH*!kS3NOK?Y62NH7%SC_k5=m^r4C#9GQq
zNR-pfODK*>(K8&+x=JM5VnIS12Lzptal=<QTj{^SZ3OUvZ>ybjv`!+B7|NY!jG%x+
zV1ezq++kZ8FH9d#Lp=q?L2p@WZL_>_)zZP!o)j8TVeml!CQf^Tr1#5kde_YGS5r%F
zs!O?mypc4O3Dprk21#N|9kh}OIzdti1CJoG#XUVWBGRl>mr7}!ZWKr(0zkQ7$PO~#
zDcpTgjm`%HId_oZtfZt@p6y=I&6i5a9-vPd?xn`S=T^i303O)jJ0gD|>Y95+JaQ$*
zjk-|PD5sGZBA60DV<(*BC(V{WO7FpoPlS{=TDXlx(8u&NPZTU9Es#_OCqep?B!8%O
z;7#V!4IR;-f}RQqi2zcgfQ$wKlNs`sz&P))$p^a^EG1QCno3Gh6(p4Lhz5xZv0ncG
ziI8xk8BlUI_RkWP>@Dj<J+-MV-#tPlnHkmMMIodQseHKC^`HtsDl~$?4g$9za?;--
zsAEw*Y_1}wsGm%wol!tKbo9d_g&U2sF^%(b=}}ib4DnS<Ni4BO5_F+yT^d%-30U$0
zKA8Y*>%=-s1w{wRRwT8l5K5SpQshNESY0exRf4k@I}O0Yc49Kk*b)dd2&p1Kv((c|
zB5C=AR1ij0K~TDNIKqRwV*~<mfxsSUz0%iFBvo)!$xAHCM5PtI35@y>7zqLluFC9l
zmBH(sk{Zi>C0Y5Y;3&yF6&aYaHk`QAzM+savCppDVUHfXM~jvsntHhI)NsT^l?rN7
zRz@JMLz1PN0k!}gjtJiakE3se;$-r2#||ZOlcbkzho!m0%C`HBe0>o-SV$DRX;Y{I
z@;_q5Lup<A0Jj6|zAMjYouRkE)SmK;eqoSxl;rCG<52Vj?XexR#sdEU@mm!g@{Vdq
zUYeRZff}TenvbUhmm3l=+W<eMyXwfw{vPwx{x(^_wOs41an--e)Kx&5YI?aD)i5~#
zmOyvTmK%-03L3M~{;~ce`k(2zmR~aqj9<TB>_1w0!ekWGHrX#1SEEgl;t8p{X<!Lb
z2KXniCvCIFQScLy=9cYbO3Qc1)Wb0n!pyRM6m8Xvw%H7<a1L>dj9>%CCgm<cw_7|-
zSYf(eDq7n+3FQvKq%l5POp(};jciHsu?K!LpN0M_!$Zt*T&^8hDe4+pNQ0|LB3*u0
z)sJAIv5}GveeUts<hdS4I;EpzMC&;S*w11;_yx?C$f^|OKm_0c>BYWR<~T1<tz>I2
zL}x>lAW8QhZa(H4(lxSbkikl1s-3frI}IF`wqd^-sv))WptlOBDgIvECXHFhb0a$p
zD)s>5cHHlQjq`{6LFI}OZ?{P~j<!il$vekRBQV1%ki#42V%}{>KWuQ*;)VHqMCMtq
z5>zu%(^X4G(8lEik&Pfea6!hCfIIblakrKW1Q(kZ%u5w4=8`s{ih6;dLlGsIhYB=-
zjOuKhmIDK0#Lm>F=;>ozVywq>6GT>;nrTrkQ7Xq1j7ZC+#vL_#jN}3bW1jh!OU-u)
zx#pUlB`qA({U4f=RE{|t&Q${Td|(`m?~qpjWu}wE>rMKdN=H&{?=sA_6To4XWL5JR
z^MX@TFb#kSBN@gxQs+q~<w{#!baTdDN##U(SLyWHEHVJc8QhRxVW|kg&lO)0>yU%b
zc8ZF>4zBcz65K7-@icJMR#cQVa*%YoDN;xPgX!OGj~r#@`Za>_dwS9-tEsA*E{lCk
z+KzVg1AaSEHMQ@Tnka)PubuQp@nN*711cTCz#};TD9`lm$1Q(~4<k`>Kg9iV(ZLld
zucU^mc%v8#DH>a2xF=3dK-`_U>v%KUiHpjPtk<X~(;&kPe`Chn{08$(oV(0c=4z9n
zm?|>oTzaqw1b%#KzajE<S3BNgwNO&MU3FiUB~0s5H#lEif!mFz@c#heW5j=kx_W+L
ztfE@`405W}O-CVrmQ&rBY|D=QxYOjq<4dzX3Deoo$ZU5Rc@~!APZ{|MC;2(!GOi;5
zTV5E9Fv6w)8-_iwc=FLbRnDd_n5$Q4q0T`P2-Qg`r_JXi1sDuIt-JB{qVILMa{an1
zbt21eil9qRQo#f$su5T=oU)LusEiU<amB0kzxgHN6HO%|w1P6y&lm=q4cNvrl;2=R
z;1A1=B=mHk>}TaG)pbpDQ^V4YkscCy8j5*WT!b>Vk-pm;W3kv5nE6~kH#HSyOi<K_
z!z8MO^s=~M%A}nE$ZQhWQV85^26G=WQCu!GcAHHbICL7S`Xps_DGJJW))X+<k&NRR
z-|H1+1^(`g^-xmR%K%4?Haa8-aIG#5p_V@Q8ON@8uWzxbBuKeaQrm5hEj24kOCvOO
zZ%;Q)poD!$>JAHO)q#yH0X@#ZpM@2Y+<ty3rLGgw%F|68idd3xROlxM@b}JhkT&%*
ztcz7F($TbRu*zDI;)_U)c3n*nP;fT^)cMAB5J24@mHCpvNqo6QSrqc!QbA8sIH_pE
z;uyk)$8&?Z8)rV7aPg`GO^?%8Q&dY?Z<Y&$UoaMPQ6$nVO_PAE&zvdJPK6|$17W~g
zZfBZ%oV2#;O1q|_3dKtrQqrBWNpCx|4I>)Qs2gyR<7M0DX=$z0bXNMWm(e9a6vdt7
zJA{ufzQk-v0~?LW;{O1K+{IG`Kgv-m%P~^w<{+;NU<AU9U~juC>;}WWQOP$!<69te
z_d9=#IfmgJQZ25X=UC(t$-GiVH0gE=f&duXH~;`R56KS=?&g&78d#w<5y(!E(N3Uw
zmny)LN7I}P`tEp};#FNG7c<m^r<R8AQ#kw>kwg->^K}C09%H8<_wVb%{8rlf`X-ox
z6-5*;JIUur*)$vg2{<I|GIuA1rrySFR)c)i%ypc%e5YCpT4`zS2=gR{S3;TdX>fCf
z8(?Q2rx4FNP0VRUK|>rAZ#g1L_>(TI;|kh|0Y_owIP6AGc(+?^We+V;R!2Pav&<f2
zPf;O9mr`jA6arU$dE5h$_u)#e<5h845-OKznn1Ed@oPpQyZaNk{dlpu=&$U0kCG|u
zv~<zUI3lh;!;n8s>L=7xuAF6o8bFZjSmQf^$K1hqkCo$EQyWdzQjxSoflPt3mpC4C
z-vhBY&fBM7rMS<0L0u%*3WP)wlc_=O+5pZ#2P1CS+ll<pFR}}JS5ulf(j35`0w(k1
z6M_nj^<lGt`S4>%SF!V!ri9%mOT>#wJvod|S|oY3M#Sg<=WR`#Xe-&hjwZTS*byXq
zn%roaibv6@SX!Jp7?E`bIT%y39gg`J;$0PzPK5ORDO#RF7Ft$tLJa3pHbw?9vlR3n
z{J4#Gyv12m_MelkFw0C{PbiTH><%%lSZ{!GH`})lTkMzYSms_=n(fR<5?jq=uN*>n
z>(lV0cG66PW2yU{I2k8x@xg_wi<!(+^;At#v@pDpOCEZGRDi$&RFDqf92{&8`QTN)
zx~|I=MH5_BGL0g_m@He$-mKe}1a1b|8+wxbr_A*i4rz`Hf=L9k$Bv&!XD+%~oB^GH
z$s=LD+zBN^CuDC8=qu<srdVysB{_+HWg?120$7-kBvRf|xfnSlf_-v$G%rx{wFRa&
zr#~@98cCv9cV%z@c4Zh}C^;GKbFtu*xB43+$xTf}i1yd%NeGllJSyxLDS$vD1%|Vn
zV_~ZVKR4W}t~C+FwXnqqC8^`6J!s}Zl~*|#EsbMgwnw)HF|NSnWIyrz@!RB@p<WFE
zN=+0bGbjf@0|#C)+c?js7VA7x5L%wrw3g+Hpv9tD2TgOV09dI2oypvH-0$5+dxDwT
zXc~E`C5fW|zM|2VAwwV}Z>a6Q`5Z@T3L1-~Vmdaahf#zGsZ@0eJ`Py1a0%N>V0#Yy
zB)(A5`!fCh=Pxc@DI%h$o*HWEb@`5)FqTbWbO7LOg3Jb;_Xkl20_;?Wmid|sRZIeF
zZEZA;D`t#NI)ipX{!((xNH`j>M_@RQ{w})m?XD8(np#wio!~D&P2I*HO6-Jb`awAe
zag1k!={y0cYF56w<0NUkL#ENyFhT&2NY$rS2`8}b4saTqV%;h&+PTJ)m#ErG_M?v9
zPZ~x(T$PVouvAjJuyWgEWZ-N#$JYzJS21%NYMd60`bz*~pDAT6mcba)uqtzsay0Ja
z;tlTIX=p0x`qhy^BgJl|LDbMj7d<d=O5_o-&Y`!}sWRD96p%|i(N@$7meeX^ZmSa7
zv8{+Fu{&&c^~m8ReKF#Y>ET*X*{P+jrYjWBPx9+hk`S<rf&owf?h_5Z>x^%Zxy>A{
zb*-sd>5o$3G_j+hm>5Dfz{J}r0Oea7snQSClXsJB^4X%TuY!0UHh`jZh$B&AOSV8P
zfp9dO44nENC(=+|tuxcrsv=U>b!3rJV;p*rl`K$i)EODroHqxB)spw3-#XIV`A*+0
zMY@(s#8_S`aMQ2MC}(t4+<;pe%I(<p$j<;QoZnl_OB5BgK6$jO&^s*Z;Q4|O<L`_E
zzi&aqS2>Cr8+8@cWUQ!q(w$ePjKp#^1Lto!P(TWIBm=m{cvKgvrMksQMwF1-<9OJ}
ziPReNgCiEn#*hX(5X6zTc#YExdZEhI;uTeGLc>>Qrl+T(Rw)>!XN{k>P;RlP3fhiH
z@3QVqT#3&Y8p|!S<YB2ut#c(HrjeOTM8GP@#Xux3HW@vKZv0J*Q1bQRZL-M|y+RqK
zstb{ojluwmqv>KsrX+w!#^({Jxz;+#MJG<Fsj1_Rs*0pWzH_Lqria&1I)|CC8*q2x
zD73+9gZ2xQjY`-^7%F_S$r#hp3ivUp#@PzM<5Bj<eiCKBwU)Y8m6xkm2#lgIr)a=(
zL~W!ulzl@vBRKRtS@AyYdY<V`dZ((1=&DIsLWMEmb|~uDDo>TQ5wRyegv^t}dYX!8
z;gMu}tt&`fgshQh0knnIqw3M99D0B9+H&58imkKS-f*eqOH2-Fq@|kWE+IWdc-_+=
zMo7qIa&Q3(z_;H#X;;P1iPb#i;x*E9Q8cC*3Iviu#Z+T#cLP>^N$r!Ile*Php<5jd
zd99i{>X;&QN+B+nlS*p?P*dN_h6gzqAAM5z%J2rN$;{H-Y3SmPioY#TH+gC0$;p(E
z23TVUx7c<qx<0G_015o>69?+`nv|s$qW<*t_R+7C8HG1iNf2rq4CgrX{X1mi>BqMj
zGvRl{x%nf+dvmQwSV_!G=o&PX5Xi?T0GCxHjA;P-XN+C^hN)+XQC~-*k>_8hAD8L-
z?Z$EVX!w7tyI*N<715<Nx}l9UGCL-k*&Glf!6fgN8of5|NWoWU+keeJQSq^UjpQ#i
zr^+ox{kqkBzx|ts$kovD<#q18)-<TAi78`(GESr=jE7kV3_!<W+??>u%RJ#XGgHZJ
zt!kRcXlb6V2qAF<F{=F`&cFo+BT&XvcE<Sk!+We8-Bm>$WDh|>OHR?rDzk|yWKt6>
z8(>H}h#mCz!QU@(WFISFF;l>129y>_BVU(_O#Tp6Cn2<hAY7fnIN~Q~<P6PN{{YKA
zKQvUdmb&U!H9!F^O)=_Ig~l`G&ga|v@#i^sko?DTrnk|w5mCt?igaehLk#0cUrg_k
zci4@)@P~4&pOo%hLsJ|w+Nhc~m;SrUC-lawcTGCC8@2{M#ARPK+GU1mZZk<mQ!EPA
zvZEO)Ccy|HLc5IVT<@028*zK`r^kyj{>*ODDd)~xqoOsnkkZ`E6)YpE)T>Bgqb<}R
zfu*$Ms2h?#=R5`EesO9$Z9N2PlgCH}LsP8!r;z8UqXQb0p2V_bfIv6{gVw4Vsq7I{
zNm#K)&GO+&CW@$ta){BKDZxR4K>#^Ah5+IpE!A0Ub@kMymY#cxGgMDg^61M$sDwz+
zfDW&$Y(YDpKsd(LKg78`Q$6N>b-dGj-AyD_L#|g+(#q`=dlMO!O*)AKBOQYSupQ8O
zf}*K8st1~xs_sS@=Zr!YOkgko1}94ar#K*t=OFOse(^H4Sm%bCmD+|t5mG}^40`go
z^GZ;GsBMA$_y^0Jp*+0XMMH6t0}a|BQxfVW4y9bLq00Ry*lr2nI|`t9<x1D)Ya7?o
zprfkQP|#Au3kK<{9633_E&+4j1mkV>SNN{{F;Vz~$#;Hi5lpv!Sn2uNEK5~P?%IdD
z=_Fx}<SEZ{#^+n@i)gw<Yr0e3B&mTlK~iD#!SqJXHF}RjorvHS&e2WGwYPP;8X0Zs
zi4-x!`jv9{0AvlY%eFoE-Ql{Olw`-vQOSRRpM!eu7<_B6%_R3LZKj&ODJQL`V++Qi
zvO>PtBn)JG@!a1Ld>*sgd?$K3NFrKqmNCh&Ehy8Blk55Mfh|0NWVdsSF><vUEe$P0
zM^PLRg%QcN=iG0f-;Dd?e={#7_+280>asu(E_Y_w0s521{{Y<OFX$Qn08dzPLUNbo
zFJB)Y>S|?@`2|JVscGQo3WAN68Z>nBtol<pKBr0SJ$N%6iZgVjtE`ebhm9Q7Qnfdo
zmG%IyWnIY!C(}EeaMNpwv|195OKr6(Vj<?Iq;)klg;7p|!Nvw0WDqmu@4%61p3x$@
z%RN0}tg$^GO-R^`0LpyjbAyqD)1CO^&0fnQ*RX}Qs!Kh6deK90t#~ESXQmp~k|h}=
z>_FTPG3})Kk%^aDs*Y~9{LL?0@RMB65|a{vk{kh+UoOOgK^?ug_rtzjeo?T^TNKqa
zpD;R8NUY7)W0ugE8x6NUrA|8@CD8LF!<VRQQmqy_Vq(h%pT+5csfp4u$VM=6jm}92
zWVAJV1K2AP!z|LlHGK85=~GP0rY2uOxXEne8;v`WzZLUUikji##k%VsNhxlTH_b)V
z1*Pc}IdAGxH5F%G`qzAp1X9%}G4)p26MWRcCHc8Zl%<W1F`x{znaCeXj2`{CJIZ{&
z6%R7YOFcBrSydNKCY5oen2jhORu@qIl~o(}^x$#y2QO@<`D?dcVo3~Wl;J|1H1CO1
z8>@SdDFB0?Fz>~?6^>q4zf{y)sB2@2D5M5(x*=pMoe{~9-d#ZB9sdA9!5ghBQcoQ$
zl*HCu9ciJaajF$8z%V+q+@AT^df@Q2Y38e`y-5{3Q4tT}Q=;X_RboPi*-LBH=yThM
z)`4JO61kp_m@6pFGBedHFsWh~>KR=iW3ueTli2(1h7L#Ny2<afwG+<^S=uuxW`K#6
zai;}`apiv9if7l4Ez(0Z!Ru~cE~`3-j0UVzbX`sYx`4oUY>wn^4+h_yBciINN;_;*
z+u5V0o*1D5YHdWIke15yw?1HVgOUN;hl=~6N#3Y|&AuJNmkE}w>g#@THjW)=9IIgN
zOL_(>cE$lc`;ivU39a{1OV&#;f>~i-mUSHy8wK>i$vFTMzTLQSymL9H<@jKfEb$1{
zDV)*%GHeE*89*vAp1}P(<LXePxkGcMuR@VSQ9)dW6_#TmVoUW-Fmebnk+ujxJ#r0L
zx2=Hdt?6i_nw8~W<}?YGkV;%QIM`<dFg}~(hDvp&JefsG>L!*ks;ML$R*~6!u5-9;
zhFBHv+t-DDX5}iok2Td@p{Xt@;u98<U_^yL%7w;BI$LaiN%rDY{M&cC(92$I??SZ@
zDw&}S08@aj8~R2z196SE&k1z)Gp0FBC0f<I%S|<9JT5?uCS;ln91@t{IR~-zIqY~B
zbe6ITscNWeYs8A`&m^mnBMn3;IKwdqzjKp;?FW;&#=5%jZL_p<Q$)Ey>5_nkI39px
z1KZP#sdAu(Yg#*^xSAsFtThH9wD&vqCw%Ah&UEp8p&Mw&mfF+ImpZy;`C4qCodrZe
zgqZA9cMJ|Y4fDR^h#cune6O#d>Q0MEG=@K$iXxJh+z{BoR$;3-Y-a;IXNId+FTru=
z3W^ELlEVarVlH(wc*w{nu{k;S;1$l*OIOeJ7P^XbsH8^epmtzm0PTXLd;0D6;W%0)
z><L5?&1|npN)t&3PBN7GiULls&44}5aC>Y{1}5AuHalI8-xNTlRVyn~&rL7kwxO3(
z-HF&7;EeX{a>LKQ9Z-%}dbN_KIrS`=LaLy$GyNfSj1jiqo=MLMo*vM}&Fw=COlcf#
zSsH-~h0?4t$UFH?2H&>=Ujs#^gS@|Nin5ngzGYZuMveZUU{ZCLQH}IxRy(L8Zp6#*
z{{WY+o*vXK@`nEaK^%!UP6jmQLN$_&fbW3gQ5XPYKTzL~BjwonVeb@F(^QykvQs=-
z*c`Jvt1$opk`xVq*l=p)ahB!IS1WwQT9JWK9+Bl|d5*Aqh8ji>@17!6v_|ZO%bcp$
zD>$Z(50s#cq#|ni#%5_5ex+RiV<%uc<nNquWOD_hlPK!x46|HnEpO9U=vSylqk_+=
z^o$d}`)L@}zZ30Ht!=W;Q7{tKR8VR&vW}{lr4dF$0k#yA`R~H5p4zrMHB-||IuwP_
zg832!k5`-hSs-UU@HkiWGW!=UwO1SM=*d$gv~dj*nu?5tX6!t}9mpO1PW&CTOD#pR
zqOy_+uC%W?j#(&C9-c5W>WV<_4xn%V?ZJL>kVivnoslFmL?(123eG2d6O112#P7N9
zz>g5E)RsHKMN3Id3^I<ejZ+H|!nc>(c^mJ)zWfTl#=k+1Qj)H|SZWO~&MkCuA(kzQ
zI4DY<<QC7=G1%@i#qMIi%WvhYD27W@TrKrYDoB`qykwsF8gdY}PBXa&W5I4o<(dnh
zB*WIFNBM}SjrU*=nJ~m>1%{)7K|Q#$7bZ}0<hNRCG?pd9Xl|<(i0KWLIoN~!yXT0|
zyuLu!TFJS(mRc98FvU>X;BKCyPa~>^BX$}>h1_q18-Py?9IrJz_9*R<iDHPna+ue6
zr%;+iMTW|!7$+mkkT>6f-Ue7{xq|sKRf%PINRwYxgGkPBOAvQEoPKAIE%&)>T*-2=
zbm6PF+a{8D7G(1&PbM<Dath-ozS|MPuIYun1T4IpQ);D(mO3`1dO}$~WjbJJEBIk{
z(z~|!IUt-J#}e0?swtSHQJQ+VTn?p1VPmKjU<!~!c{>I42V>bjgT#xan$u}oIaZpQ
zSEj`>g3!ht&=9J`;CYTXv2m}KNG7f>dXh-;l>Y$js{|xqdSgiK?ZCa*)v96cbLII!
zsi-i<)DZ%U5g{F0e<_X0B>@=8IX=T+TRBGCQ*!02bzFBCqNt%?{{XtEr%5BHj~VF=
zGOMUKT&d60J8VkD1rsMK+iq!7Q5>~$IGPnIAbmK&DU4@xzkVGpcIfM@RrHQrMMW=7
zFn45SB&%n*)#mre8}K98&C;T|`I+jd>Sk10p=(Eu-0tfV%I-%=e=~s1zmx%vG50re
zq;?BsBsV0AdWyP-lHijn)H8<x+y4N~xFnST=>T@&o0V#s*U3+FP$iz<TC~xtlcAM{
z31Bcu!x7)M$0LC?cS$KAtFF@&veP2R63T(m6ue^?J@z=?&<-t(y@nETmB&;m(RgLZ
z_DU75UR<S?rQ59((?rt8BBnGZg4%U%LC;_|-)=7Q?G;}-b19{#sE(LJ(`Sw?$Xoy%
zmOe!r_QHZY93BZ)*(vT+v{IEZ8kz|tm18(oWpKH{&NH3y{@Zar*>rAB@j@y(Xldkt
zM8SlqlPC%{Vlj|Qu|Ir!4i&x8t0$YAJ$~eztE+9-^bD)JQF8wPT5B|`1yxMuTA%@W
zNiCc#hb2&9TS(Fd50`!pQFxtqp}X7Zs>CZvMbT)gJh4D>iH2tx?Wp$$Z2AMls!m9w
z=1&o7BAup=8mc&I8aRroqcW4_+aL`i8~SjE&6N{aqUzI3=!dILVPLNjNMWdvMhHFn
zN)OvO!NCuX4sua3N@*)H-z;0d#}>AvmZF}PuGuq0u!#Ud>Qf$N_rrOJ!*<UBIi)1!
zYS<#IY8%zQmJ(xzIl6J8fHKT>1I>+D7$+N(fMat7st*gIsiw1{Q~ZTJY)dYM63DAn
z4LJ<J4C+_ZPjJdK=>>u3PscyR*En6dmhH;s<?{AQY4jR+7e`nwogvP0$_j!P=?8E#
zzZ-M@oh*5HH{Q(A@)LuVbaeNZucMs&Kcb|zRnx6hT_;8V0H(b{vH>13^%6?t>~co}
zIa2jSaJkP%By_<ls-%(G6=JEHME?M(k?6uuRZ~0Y$OE?;h44G#-!OQI@aYV<I`@`a
zP3E51judL17fD<33C^}%AOd&B$2?}Q2ziF9o<*vrzD-YXba_An0JC~$C-1pDV9$?(
zF2^+0nZ#6GIXu=|XRW8Lr>q%%o3fdd5(e0Cqzvb_-hdo%i&xCQBX?*8J4H~cl<m}R
zq>?ZMXL0MOpDr>+crQfXH{u&Wbu3|Op&?y{pr~}@XB%nT({t~_<&v^$j&-)wnWR~%
zrDcqRkQH1g7&#chKd%0q2}fx#r|?|8)pKV&a}kDuMtLHM*`jSS1x4QtBk!lmHg4qh
z;5Uh!pZ*i)I*RzxN2ZEN;F=0{IcjxfWvFyrw#dVF-0!~)z9v&sO+i~*B`h*XqBmt?
z+GW-WI=9K(4fCIJcw*%@i<&$zg5f<h5!KzOLQf<?gK0!;C?u1N3~o-u`<@#doL+@;
z>5}{sw{ov4*rvKu-Jp_|@V_ww>KNU8*eBEx#yh!qlzc|<5BxiCmf>=@P&-RKYn7BL
zD;>(H8C>9L0G~mVjuEOkBHelMG~3~c?UWOiEl)=yEMv$^X$)IVts^+bamGvVKaefl
zv&<FEOpYd^*0IZwujQIWQc8ii2tVdAs#&RVirBfbOC<T^cK-nITjn}?RJe<bb3r6%
z>M9^s2dfxe3m{+)0RZEC@9Dr>)rL-BuBfi0td=@qIatw9g_A4hImie}IUo)E-uU82
zIMBms=1ZH<#wb7{r$hv*7jmrRjP4k*%Jx3p@~3O&iq2oWB?U98(pMwA(Ull{r*F&K
z+XEQK8FD@$hV(X4*{=1~B8b$&w2c%n%J9w)OD7^QasW98C(|e2f;OvlxhPFlDm}uY
zvXzmb>c*l_bP@>%bq5(Bk4*O9Pc2h?-y`21N0pr?kRjA?oj7%Z2VhA!Bn*+muZA}n
zd4|Zg$qGdszKWh`<wR2>mW;^3wF0Ccr|Abzu6N;SHKKB8#vIY%-#1nAm0d*{x6>_t
zh|DpNtxk#pD=|8imk0ql7{*RPJW1qB&DWe@bmnVJ33YmnH8Mw*X?i|TNd&K;BLMv)
z1mh<mc+qocIWDeY6grxZ=9Fl{#~_^|%7NR;$0M;l_`<xo%yqOC)YGK$bs?N-^AX+g
z>5dNTVeD?W^Q9f)?+Zm=B|US@8lG2p^r-|E*1(aa8CdGnaz9|>Nli69-mT(>HioFp
zQA;#o7_vS?jbO0GoypvSzS%rt?-MLEMun~s(!m6;3@%bN#AHbdyQv<;mi6^K7Uhm+
zsO1h}7P?UzP*k92f=sd!Ksm;7pTB+hF7^vrV=psX#aJ@bQquzw5!Oad9$-G4vSC?p
zt+2rvBPY<GD_m%~j%Z<~qMWlt&m^h|lS+*uF^m9wxf#jz#`_Jt+M}wrPb)OPg3}aD
zWTNPm6-Ezm1ChRe-zWKP1@@MrrgHkNl*i>&T<L^KOsqi3Cj+n<*loDtaaIkn7sbdz
za|LaD5!NDAbXrNlQKgJo3#2cX%G+nL)IInk${4QYIStOC)?0iHEDW_Ca~J`&9CkWL
z$QzF@bDk709NTi{%f)D{tevBzxj>P`t)&2B+1uRXzufUIlI<loCkWAF^7NNe4MeGt
zNmHDR9Amd`9j9~}B3$`_Ie(fdZc@>?iv`(TieZjGeX)>64h{htxNzm(ZK1uvQi)kk
zVnzZT3zucUQZzPq0|Nsi1n=#Lyh^&XR_ZvTiU^>Xh?+3DQmj~!zH_-f__J)SmeWNH
e6s_{nM>|BT5C{M{2e-KI=yG_A9_Ux}fB)G)VA)at

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/pictures/Sushi.jpg b/pelican/tests/output/custom_locale/pictures/Sushi.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e49e5f0ab53461187c2cf61ebc1f3befdc937aed
GIT binary patch
literal 28992
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
GKmXZ^k)SRB

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/pictures/Sushi_Macro.jpg b/pelican/tests/output/custom_locale/pictures/Sushi_Macro.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..21f935a1bf82808aa2ded423caba3cc9f2911973
GIT binary patch
literal 38594
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
V9RVclK)_SR8Zrq#de{_0|JgZd7T*8>

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
new file mode 100644
index 00000000..ec1007f3
--- /dev/null
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>This is a super article !</title>
+        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../../../../../override/">Override url/save_as</a></li>
+                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li class="active"><a href="../../../../../category/yeah.html">yeah</a></li>
+                    <li><a href="../../../../../category/misc.html">misc</a></li>
+                    <li><a href="../../../../../category/cat1.html">cat1</a></li>
+                    <li><a href="../../../../../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../../../../../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+           title="Permalink to This is a super article !">This is a super article !</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Published: jeu. 02 décembre 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: dim. 17 novembre 2013
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../../../../../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../../../../../tag/foo.html">foo</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/foobar.html">foobar</a> </p>
+</footer><!-- /.post-info -->      <p>Some content here !</p>
+<div class="section" id="this-is-a-simple-title">
+<h2>This is a simple title</h2>
+<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+<img alt="alternate text" src="../../../../../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../../../../../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<pre class="literal-block">
+&gt;&gt;&gt; from ipdb import set_trace
+&gt;&gt;&gt; set_trace()
+</pre>
+<p>→ And now try with some utf8 hell: ééé</p>
+</div>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'posts/2010/décembre/02/this-is-a-super-article/';
+        var disqus_url = '../../../../../posts/2010/décembre/02/this-is-a-super-article/';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
new file mode 100644
index 00000000..cb8ccef5
--- /dev/null
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -0,0 +1,146 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Unbelievable !</title>
+        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../../../../../override/">Override url/save_as</a></li>
+                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../../../../../category/misc.html">misc</a></li>
+                    <li><a href="../../../../../category/cat1.html">cat1</a></li>
+                    <li><a href="../../../../../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../../../../../posts/2010/octobre/15/unbelievable/" rel="bookmark"
+           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-10-15T20:30:00">
+                Published: ven. 15 octobre 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../../../../../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
+<p><a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+<a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+<div class="section" id="testing-sourcecode-directive">
+<h2>Testing sourcecode directive</h2>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table></div>
+<div class="section" id="testing-another-case">
+<h2>Testing another case</h2>
+<p>This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will have nothing in default.</p>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+</td></tr></table><p>Lovely.</p>
+</div>
+<div class="section" id="testing-more-sourcecode-directives">
+<h2>Testing more sourcecode directives</h2>
+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<p>Lovely.</p>
+</div>
+<div class="section" id="testing-even-more-sourcecode-directives">
+<h2>Testing even more sourcecode directives</h2>
+<span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<p>Lovely.</p>
+</div>
+<div class="section" id="testing-overriding-config-defaults">
+<h2>Testing overriding config defaults</h2>
+<p>Even if the default is line numbers, we can override it here</p>
+<div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div>
+<p>Lovely.</p>
+</div>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'posts/2010/octobre/15/unbelievable/';
+        var disqus_url = '../../../../../posts/2010/octobre/15/unbelievable/';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
new file mode 100644
index 00000000..c42bce5d
--- /dev/null
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Oh yeah !</title>
+        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../../../../../override/">Override url/save_as</a></li>
+                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                    <li><a href="../../../../../category/misc.html">misc</a></li>
+                    <li><a href="../../../../../category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="../../../../../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../../../../../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
+           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Published: mer. 20 octobre 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../../../../../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../../../../../tag/oh.html">oh</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/yeah.html">yeah</a> </p>Translations:
+        <a href="../../../../../oh-yeah-fr.html">fr</a>
+
+</footer><!-- /.post-info -->      <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../../../../../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'posts/2010/octobre/20/oh-yeah/';
+        var disqus_url = '../../../../../posts/2010/octobre/20/oh-yeah/';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
new file mode 100644
index 00000000..49cc6078
--- /dev/null
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>A markdown powered article</title>
+        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../../../../../override/">Override url/save_as</a></li>
+                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                    <li><a href="../../../../../category/misc.html">misc</a></li>
+                    <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
+                    <li><a href="../../../../../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../../../../../posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
+           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-04-20T00:00:00">
+                Published: mer. 20 avril 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../../../../../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
+<p><a href="../../../../../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
+<a href="../../../../../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'posts/2011/avril/20/a-markdown-powered-article/';
+        var disqus_url = '../../../../../posts/2011/avril/20/a-markdown-powered-article/';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
new file mode 100644
index 00000000..8029e585
--- /dev/null
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Article 1</title>
+        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../../../../../override/">Override url/save_as</a></li>
+                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                    <li><a href="../../../../../category/misc.html">misc</a></li>
+                    <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
+                    <li><a href="../../../../../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../../../../../posts/2011/février/17/article-1/" rel="bookmark"
+           title="Permalink to Article 1">Article 1</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../../../../../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->      <p>Article 1</p>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'posts/2011/février/17/article-1/';
+        var disqus_url = '../../../../../posts/2011/février/17/article-1/';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
new file mode 100644
index 00000000..ca6aaaf3
--- /dev/null
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Article 2</title>
+        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../../../../../override/">Override url/save_as</a></li>
+                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                    <li><a href="../../../../../category/misc.html">misc</a></li>
+                    <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
+                    <li><a href="../../../../../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../../../../../posts/2011/février/17/article-2/" rel="bookmark"
+           title="Permalink to Article 2">Article 2</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../../../../../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->      <p>Article 2</p>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'posts/2011/février/17/article-2/';
+        var disqus_url = '../../../../../posts/2011/février/17/article-2/';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
new file mode 100644
index 00000000..4f255f4f
--- /dev/null
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Article 3</title>
+        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../../../../../override/">Override url/save_as</a></li>
+                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                    <li><a href="../../../../../category/misc.html">misc</a></li>
+                    <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
+                    <li><a href="../../../../../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../../../../../posts/2011/février/17/article-3/" rel="bookmark"
+           title="Permalink to Article 3">Article 3</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2011-02-17T00:00:00">
+                Published: jeu. 17 février 2011
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../../../../../category/cat1.html">cat1</a>. </p>
+
+</footer><!-- /.post-info -->      <p>Article 3</p>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'posts/2011/février/17/article-3/';
+        var disqus_url = '../../../../../posts/2011/février/17/article-3/';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
new file mode 100644
index 00000000..46b07717
--- /dev/null
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Second article</title>
+        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../../../../../override/">Override url/save_as</a></li>
+                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../../../../../category/misc.html">misc</a></li>
+                    <li><a href="../../../../../category/cat1.html">cat1</a></li>
+                    <li><a href="../../../../../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../../../../../posts/2012/février/29/second-article/" rel="bookmark"
+           title="Permalink to Second article">Second article</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Published: mer. 29 février 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../../../../../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../../../../../tag/foo.html">foo</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/baz.html">baz</a> </p>Translations:
+        <a href="../../../../../second-article-fr.html">fr</a>
+
+</footer><!-- /.post-info -->      <p>This is some article, in english</p>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'posts/2012/février/29/second-article/';
+        var disqus_url = '../../../../../posts/2012/février/29/second-article/';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
new file mode 100644
index 00000000..0d021cde
--- /dev/null
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>FILENAME_METADATA example</title>
+        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../../../../../override/">Override url/save_as</a></li>
+                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../../../../../category/misc.html">misc</a></li>
+                    <li><a href="../../../../../category/cat1.html">cat1</a></li>
+                    <li><a href="../../../../../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../../../../../posts/2012/novembre/30/filename_metadata-example/" rel="bookmark"
+           title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2012-11-30T00:00:00">
+                Published: ven. 30 novembre 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../../../../../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->      <p>Some cool stuff!</p>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'posts/2012/novembre/30/filename_metadata-example/';
+        var disqus_url = '../../../../../posts/2012/novembre/30/filename_metadata-example/';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/robots.txt b/pelican/tests/output/custom_locale/robots.txt
new file mode 100644
index 00000000..19a6e299
--- /dev/null
+++ b/pelican/tests/output/custom_locale/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /pictures
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
new file mode 100644
index 00000000..2798c94b
--- /dev/null
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Deuxième article</title>
+        <link rel="stylesheet" href="./theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="./second-article-fr.html" rel="bookmark"
+           title="Permalink to Deuxième article">Deuxième article</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Published: mer. 29 février 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
+        <a href="./posts/2012/février/29/second-article/">en</a>
+
+</footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'second-article-fr.html';
+        var disqus_url = './second-article-fr.html';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
new file mode 100644
index 00000000..8a65a834
--- /dev/null
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - bar</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
+<footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Published: mer. 29 février 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+        <a href="../second-article-fr.html">fr</a>
+
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Published: jeu. 02 décembre 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: dim. 17 novembre 2013
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
+                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
+                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Published: mer. 20 octobre 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+        <a href="../oh-yeah-fr.html">fr</a>
+
+</footer><!-- /.post-info -->                <div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+
+                <a class="readmore" href="../posts/2010/octobre/20/oh-yeah/">read more</a>
+<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+                </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
new file mode 100644
index 00000000..52467abb
--- /dev/null
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>The baz tag</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../tag/baz.html" rel="bookmark"
+           title="Permalink to The baz tag">The baz tag</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-03-14T00:00:00">
+                Published: dim. 14 mars 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+
+</footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+
+    </div><!-- /.entry-content -->
+    <div class="comments">
+      <h2>Comments !</h2>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript">
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'tag/baz.html';
+        var disqus_url = '../tag/baz.html';
+        (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+      </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
+    </div>
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
new file mode 100644
index 00000000..87cb4ec5
--- /dev/null
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - foo</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
+<footer class="post-info">
+        <abbr class="published" title="2012-02-29T00:00:00">
+                Published: mer. 29 février 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+        <a href="../second-article-fr.html">fr</a>
+
+</footer><!-- /.post-info --><p>This is some article, in english</p>
+<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                    <ol id="posts-list" class="hfeed">
+
+            <li><article class="hentry">
+                <header>
+                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                           title="Permalink to This is a super article !">This is a super article !</a></h1>
+                </header>
+
+                <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Published: jeu. 02 décembre 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: dim. 17 novembre 2013
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+as well as <strong>inline markup</strong>.</p>
+
+                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+            </article></li>
+                </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+                </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
new file mode 100644
index 00000000..0e5414b0
--- /dev/null
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - foobar</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
+<footer class="post-info">
+        <abbr class="published" title="2010-12-02T10:14:00">
+                Published: jeu. 02 décembre 2010
+        </abbr>
+		<br />
+        <abbr class="modified" title="2013-11-17T23:29:00">
+                Updated: dim. 17 novembre 2013
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+</footer><!-- /.post-info --><p>Some content here !</p>
+<div class="section" id="this-is-a-simple-title">
+<h2>This is a simple title</h2>
+<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<pre class="literal-block">
+&gt;&gt;&gt; from ipdb import set_trace
+&gt;&gt;&gt; set_trace()
+</pre>
+<p>→ And now try with some utf8 hell: ééé</p>
+</div>
+<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
new file mode 100644
index 00000000..21c8e352
--- /dev/null
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Oh Oh Oh</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li class="active"><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+    <h1 class="entry-title">Oh Oh Oh</h1>
+    
+    <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
+
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
new file mode 100644
index 00000000..a8fe6f51
--- /dev/null
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - yeah</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
+<footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00">
+                Published: mer. 20 octobre 2010
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+        <a href="../oh-yeah-fr.html">fr</a>
+
+</footer><!-- /.post-info --><div class="section" id="why-not">
+<h2>Why not ?</h2>
+<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !</p>
+<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+</div>
+<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
new file mode 100644
index 00000000..0da0d291
--- /dev/null
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>Alexis' log - Tags</title>
+        <link rel="stylesheet" href="./theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
+        <!--[if IE]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="./">Alexis' log </a></h1>
+                <nav><ul>
+                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="./category/yeah.html">yeah</a></li>
+                    <li><a href="./category/misc.html">misc</a></li>
+                    <li><a href="./category/cat1.html">cat1</a></li>
+                    <li><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+
+<section id="content" class="body">
+    <h1>Tags for Alexis' log</h1>
+    <ul>
+        <li><a href="./tag/bar.html">bar</a> (3)</li>
+        <li><a href="./tag/baz.html">baz</a> (1)</li>
+        <li><a href="./tag/foo.html">foo</a> (2)</li>
+        <li><a href="./tag/foobar.html">foobar</a> (1)</li>
+        <li><a href="./tag/oh.html">oh</a> (1)</li>
+        <li><a href="./tag/yeah.html">yeah</a> (1)</li>
+    </ul>
+</section>
+
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>blogroll</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
new file mode 100644
index 00000000..2efb518d
--- /dev/null
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -0,0 +1,451 @@
+/*
+	Name: Smashing HTML5
+	Date: July 2009
+	Description: Sample layout for HTML5 and CSS3 goodness.
+	Version: 1.0
+	License: MIT <http://opensource.org/licenses/MIT>
+	Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+	Original author: Enrique Ramírez <http://enrique-ramirez.com/>
+*/
+
+/* Imports */
+@import url("reset.css");
+@import url("pygment.css");
+@import url("typogrify.css");
+@import url(//fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+
+/***** Global *****/
+/* Body */
+body {
+    background: #F5F4EF;
+    color: #000305;
+    font-size: 87.5%; /* Base font size: 14px */
+    font-family: 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+    line-height: 1.429;
+    margin: 0;
+    padding: 0;
+    text-align: left;
+}
+
+/* Headings */
+h1 {font-size: 2em }
+h2 {font-size: 1.571em}	/* 22px */
+h3 {font-size: 1.429em}	/* 20px */
+h4 {font-size: 1.286em}	/* 18px */
+h5 {font-size: 1.143em}	/* 16px */
+h6 {font-size: 1em}		/* 14px */
+
+h1, h2, h3, h4, h5, h6 {
+	font-weight: 400;
+	line-height: 1.1;
+	margin-bottom: .8em;
+    font-family: 'Yanone Kaffeesatz', arial, serif;
+}
+
+h3, h4, h5, h6 { margin-top: .8em; }
+	
+hr { border: 2px solid #EEEEEE; }
+
+/* Anchors */
+a {outline: 0;}
+a img {border: 0px; text-decoration: none;}
+a:link, a:visited {
+	color: #C74350;
+	padding: 0 1px;
+	text-decoration: underline;
+}
+a:hover, a:active {
+	background-color: #C74350;
+	color: #fff;
+	text-decoration: none;
+	text-shadow: 1px 1px 1px #333;
+}
+
+h1 a:hover {
+    background-color: inherit
+}
+	
+/* Paragraphs */
+div.line-block,
+p { margin-top: 1em;
+    margin-bottom: 1em;}
+
+strong, b {font-weight: bold;}
+em, i {font-style: italic;}
+
+/* Lists */
+ul {
+	list-style: outside disc;
+	margin: 0em 0 0 1.5em;
+}
+
+ol {
+	list-style: outside decimal;
+	margin: 0em 0 0 1.5em;
+}
+
+li { margin-top: 0.5em;}
+
+.post-info {
+    float:right;
+    margin:10px;
+    padding:5px;
+}
+
+.post-info p{
+    margin-top: 1px;
+    margin-bottom: 1px;
+}
+
+.readmore { float: right }
+
+dl {margin: 0 0 1.5em 0;}
+dt {font-weight: bold;}
+dd {margin-left: 1.5em;}
+
+pre{background-color:  rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
+
+/* Quotes */
+blockquote {
+    margin: 20px;
+    font-style: italic;
+}
+cite {}
+
+q {}
+
+div.note {
+   float: right;
+   margin: 5px;
+   font-size: 85%;
+   max-width: 300px;
+}
+
+/* Tables */
+table {margin: .5em auto 1.5em auto; width: 98%;}
+	
+	/* Thead */
+	thead th {padding: .5em .4em; text-align: left;}
+	thead td {}
+
+	/* Tbody */
+	tbody td {padding: .5em .4em;}
+	tbody th {}
+	
+	tbody .alt td {}
+	tbody .alt th {}
+	
+	/* Tfoot */
+	tfoot th {}
+	tfoot td {}
+	
+/* HTML5 tags */
+header, section, footer,
+aside, nav, article, figure {
+	display: block;
+}
+
+/***** Layout *****/
+.body {clear: both; margin: 0 auto; width: 800px;}
+img.right, figure.right {float: right; margin: 0 0 2em 2em;}
+img.left, figure.left {float: left; margin: 0 2em 2em 0;}
+
+/*
+	Header
+*****************/
+#banner {
+	margin: 0 auto;
+	padding: 2.5em 0 0 0;
+}
+
+	/* Banner */
+	#banner h1 {font-size: 3.571em; line-height: 0;}
+	#banner h1 a:link, #banner h1 a:visited {
+		color: #000305;
+		display: block;
+		font-weight: bold;
+		margin: 0 0 .6em .2em;
+		text-decoration: none;
+	}
+	#banner h1 a:hover, #banner h1 a:active {
+		background: none;
+		color: #C74350;
+		text-shadow: none;
+	}
+	
+	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
+	
+	/* Main Nav */
+	#banner nav {
+		background: #000305;
+		font-size: 1.143em;
+		height: 40px;
+		line-height: 30px;
+		margin: 0 auto 2em auto;
+		padding: 0;
+		text-align: center;
+		width: 800px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	
+	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
+	#banner nav li {float: left; display: inline; margin: 0;}
+	
+	#banner nav a:link, #banner nav a:visited {
+		color: #fff;
+		display: inline-block;
+		height: 30px;
+		padding: 5px 1.5em;
+		text-decoration: none;
+	}
+	#banner nav a:hover, #banner nav a:active,
+	#banner nav .active a:link, #banner nav .active a:visited {
+		background: #C74451;
+		color: #fff;
+		text-shadow: none !important;
+	}
+	
+	#banner nav li:first-child a {
+		border-top-left-radius: 5px;
+		-moz-border-radius-topleft: 5px;
+		-webkit-border-top-left-radius: 5px;
+		
+		border-bottom-left-radius: 5px;
+		-moz-border-radius-bottomleft: 5px;
+		-webkit-border-bottom-left-radius: 5px;
+	}
+
+/*
+	Featured
+*****************/
+#featured {
+	background: #fff;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+#featured figure {
+	border: 2px solid #eee;
+	float: right;
+	margin: 0.786em 2em 0 5em;
+	width: 248px;
+}
+#featured figure img {display: block; float: right;}
+
+#featured h2 {color: #C74451; font-size: 1.714em; margin-bottom: 0.333em;}
+#featured h3 {font-size: 1.429em; margin-bottom: .5em;}
+
+#featured h3 a:link, #featured h3 a:visited {color: #000305; text-decoration: none;}
+#featured h3 a:hover, #featured h3 a:active {color: #fff;}
+
+/*
+	Body
+*****************/
+#content {
+	background: #fff;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px 20px;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+/*
+	Extras
+*****************/
+#extras {margin: 0 auto 3em auto; overflow: hidden;}
+
+#extras ul {list-style: none; margin: 0;}
+#extras li {border-bottom: 1px solid #fff;}
+#extras h2 {
+	color: #C74350;
+	font-size: 1.429em;
+	margin-bottom: .25em;
+	padding: 0 3px;
+}
+
+#extras a:link, #extras a:visited {
+	color: #444;
+	display: block;
+	border-bottom: 1px solid #F4E3E3;
+	text-decoration: none;
+	padding: .3em .25em;
+}
+
+#extras a:hover, #extras a:active {color: #fff;}
+
+	/* Blogroll */
+	#extras .blogroll {
+		float: left;
+		width: 615px;
+	}
+	
+	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
+	
+	/* Social */
+	#extras .social {
+		float: right;
+		width: 175px;
+	}
+	
+	#extras div[class='social'] a {
+		background-repeat: no-repeat;
+		background-position: 3px 6px;
+		padding-left: 25px;
+	}
+	
+		/* Icons */
+		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
+		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
+		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
+		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
+		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
+		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
+		.social a[href*='github.com'],
+		.social a[href*='git.io'] {
+			background-image: url('../images/icons/github.png');
+			background-size: 16px 16px;
+		}
+		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
+		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
+		.social a[href*='news.ycombinator.com'],
+		.social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
+		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
+		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
+		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
+		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
+		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
+		.social a[href*='stackoverflow.com'] {background-image: url('../images/icons/stackoverflow.png');}
+		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
+		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
+		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
+
+/*
+	About
+*****************/
+#about {
+	background: #fff;
+	font-style: normal;
+	margin-bottom: 2em;
+	overflow: hidden;
+	padding: 20px;
+	text-align: left;
+	width: 760px;
+	
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+#about .primary {float: left; width: 165px;}
+#about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
+#about .photo {float: left; margin: 5px 20px;}
+
+#about .url:link, #about .url:visited {text-decoration: none;}
+
+#about .bio {float: right; width: 500px;}
+
+/*
+	Footer
+*****************/
+#contentinfo {padding-bottom: 2em; text-align: right;}
+
+/***** Sections *****/
+/* Blog */
+.hentry {
+	display: block;
+	clear: both;
+	border-bottom: 1px solid #eee;
+	padding: 1.5em 0;
+}
+li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
+#content > .hentry {padding: 1em 0;}
+.hentry img{display : none ;}
+.entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;}
+.entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
+.entry-title a:visited {background-color: #fff;}
+
+.hentry .post-info * {font-style: normal;}
+
+	/* Content */
+	.hentry footer {margin-bottom: 2em;}
+	.hentry footer address {display: inline;}
+	#posts-list footer address {display: block;}
+
+	/* Blog Index */
+	#posts-list {list-style: none; margin: 0;}
+	#posts-list .hentry {padding-left: 10px; position: relative;}
+	
+	#posts-list footer {
+		left: 10px;
+		position: relative;
+        float: left;
+		top: 0.5em;
+		width: 190px;
+	}
+	
+	/* About the Author */
+	#about-author {
+		background: #f9f9f9;
+		clear: both;
+		font-style: normal;
+		margin: 2em 0;
+		padding: 10px 20px 15px 20px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	
+	#about-author strong {
+		color: #C64350;
+		clear: both;
+		display: block;
+		font-size: 1.429em;
+	}
+	
+	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
+	
+	/* Comments */
+	#comments-list {list-style: none; margin: 0 1em;}
+	#comments-list blockquote {
+		background: #f8f8f8;
+		clear: both;
+		font-style: normal;
+		margin: 0;
+		padding: 15px 20px;
+		
+		border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
+	}
+	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
+	
+	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
+	
+	/* Add a Comment */
+	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
+	#add-comment input[type='text'],
+	#add-comment input[type='email'],
+	#add-comment input[type='url'] {float: left; width: 200px;}
+	
+	#add-comment textarea {float: left; height: 150px; width: 495px;}
+	
+	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
+	
+	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
+	#add-comment * {margin-bottom: .5em;}
diff --git a/pelican/tests/output/custom_locale/theme/css/pygment.css b/pelican/tests/output/custom_locale/theme/css/pygment.css
new file mode 100644
index 00000000..fdd056f6
--- /dev/null
+++ b/pelican/tests/output/custom_locale/theme/css/pygment.css
@@ -0,0 +1,205 @@
+.hll {
+background-color:#eee;
+}
+.c {
+color:#408090;
+font-style:italic;
+}
+.err {
+border:1px solid #FF0000;
+}
+.k {
+color:#007020;
+font-weight:bold;
+}
+.o {
+color:#666666;
+}
+.cm {
+color:#408090;
+font-style:italic;
+}
+.cp {
+color:#007020;
+}
+.c1 {
+color:#408090;
+font-style:italic;
+}
+.cs {
+background-color:#FFF0F0;
+color:#408090;
+}
+.gd {
+color:#A00000;
+}
+.ge {
+font-style:italic;
+}
+.gr {
+color:#FF0000;
+}
+.gh {
+color:#000080;
+font-weight:bold;
+}
+.gi {
+color:#00A000;
+}
+.go {
+color:#303030;
+}
+.gp {
+color:#C65D09;
+font-weight:bold;
+}
+.gs {
+font-weight:bold;
+}
+.gu {
+color:#800080;
+font-weight:bold;
+}
+.gt {
+color:#0040D0;
+}
+.kc {
+color:#007020;
+font-weight:bold;
+}
+.kd {
+color:#007020;
+font-weight:bold;
+}
+.kn {
+color:#007020;
+font-weight:bold;
+}
+.kp {
+color:#007020;
+}
+.kr {
+color:#007020;
+font-weight:bold;
+}
+.kt {
+color:#902000;
+}
+.m {
+color:#208050;
+}
+.s {
+color:#4070A0;
+}
+.na {
+color:#4070A0;
+}
+.nb {
+color:#007020;
+}
+.nc {
+color:#0E84B5;
+font-weight:bold;
+}
+.no {
+color:#60ADD5;
+}
+.nd {
+color:#555555;
+font-weight:bold;
+}
+.ni {
+color:#D55537;
+font-weight:bold;
+}
+.ne {
+color:#007020;
+}
+.nf {
+color:#06287E;
+}
+.nl {
+color:#002070;
+font-weight:bold;
+}
+.nn {
+color:#0E84B5;
+font-weight:bold;
+}
+.nt {
+color:#062873;
+font-weight:bold;
+}
+.nv {
+color:#BB60D5;
+}
+.ow {
+color:#007020;
+font-weight:bold;
+}
+.w {
+color:#BBBBBB;
+}
+.mf {
+color:#208050;
+}
+.mh {
+color:#208050;
+}
+.mi {
+color:#208050;
+}
+.mo {
+color:#208050;
+}
+.sb {
+color:#4070A0;
+}
+.sc {
+color:#4070A0;
+}
+.sd {
+color:#4070A0;
+font-style:italic;
+}
+.s2 {
+color:#4070A0;
+}
+.se {
+color:#4070A0;
+font-weight:bold;
+}
+.sh {
+color:#4070A0;
+}
+.si {
+color:#70A0D0;
+font-style:italic;
+}
+.sx {
+color:#C65D09;
+}
+.sr {
+color:#235388;
+}
+.s1 {
+color:#4070A0;
+}
+.ss {
+color:#517918;
+}
+.bp {
+color:#007020;
+}
+.vc {
+color:#BB60D5;
+}
+.vg {
+color:#BB60D5;
+}
+.vi {
+color:#BB60D5;
+}
+.il {
+color:#208050;
+}
diff --git a/pelican/tests/output/custom_locale/theme/css/reset.css b/pelican/tests/output/custom_locale/theme/css/reset.css
new file mode 100644
index 00000000..1e217566
--- /dev/null
+++ b/pelican/tests/output/custom_locale/theme/css/reset.css
@@ -0,0 +1,52 @@
+/*
+	Name: Reset Stylesheet
+	Description: Resets browser's default CSS
+	Author: Eric Meyer
+	Author URI: http://meyerweb.com/eric/tools/css/reset/
+*/
+
+/* v1.0 | 20080212 */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	background: transparent;
+	border: 0;
+	font-size: 100%;
+	margin: 0;
+	outline: 0;
+	padding: 0;
+	vertical-align: baseline;
+}
+
+body {line-height: 1;}
+
+ol, ul {list-style: none;}
+
+blockquote, q {quotes: none;}
+
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {text-decoration: none;}
+del {text-decoration: line-through;}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/theme/css/typogrify.css b/pelican/tests/output/custom_locale/theme/css/typogrify.css
new file mode 100644
index 00000000..c9b34dc8
--- /dev/null
+++ b/pelican/tests/output/custom_locale/theme/css/typogrify.css
@@ -0,0 +1,3 @@
+.caps {font-size:.92em;}
+.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}    
+.dquo {margin-left:-.38em;}
diff --git a/pelican/tests/output/custom_locale/theme/css/wide.css b/pelican/tests/output/custom_locale/theme/css/wide.css
new file mode 100644
index 00000000..88fd59ce
--- /dev/null
+++ b/pelican/tests/output/custom_locale/theme/css/wide.css
@@ -0,0 +1,48 @@
+@import url("main.css");
+
+body {
+    font:1.3em/1.3 "Hoefler Text","Georgia",Georgia,serif,sans-serif;
+}
+
+.post-info{
+    display: none;
+}
+
+#banner nav {
+    display: none;
+    -moz-border-radius: 0px;
+    margin-bottom: 20px;
+    overflow: hidden;
+    font-size: 1em;
+    background: #F5F4EF;
+}
+
+#banner nav ul{
+    padding-right: 50px;
+}
+
+#banner nav li{
+    float: right;
+    color: #000;
+}
+
+#banner nav li a {
+    color: #000;
+}
+
+#banner h1 {
+    margin-bottom: -18px;
+}
+
+#featured, #extras {
+    padding: 50px;
+}
+
+#featured {
+    padding-top: 20px;
+}
+
+#extras {
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
diff --git a/pelican/tests/output/custom_locale/theme/images/icons/aboutme.png b/pelican/tests/output/custom_locale/theme/images/icons/aboutme.png
new file mode 100644
index 0000000000000000000000000000000000000000..9609df3bd9d766cd4b827fb0a8339b700c1abf24
GIT binary patch
literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Ta>O
z6XFU~z-^brZ51PwI9(_Kh^7g}PZf%vA`~}SFm|F~be~{E7r$Q>mqnyt>;%CWAnF&0
z>J^CU7KrHN4{PNQZsheU=5fy8Gz;Yisssv#ckqX`@rAbXg*5X8HSz`4@%dHr`jqpy
z=5RZtaF_)12GsKU*YNsP@%UEo0L8sad4MK(6mq-eal2-7IizygC9)g&bNiP6KWohG
zS-|Cz#pRUFX_v@p6U%1c!{t%H>ygjnp2z8w&f}cUVI9k18Od!O&8Fwc>5|Q96~*D0
z#%UhPVH?k3;LWPz#^I34reVi!8_%X{#by@DrewmR<-%&@&nzOxqVB+|@6E{0!>ne@
zqU+A2Y{jhQ!lY=<q~X9QZ^Ec*%OGo*Ey1r33?s&pAirP+hi5m^fE>;OkH}&m?E%Ja
zC$sH<jJ=*Njv*44Lr+}~IuyX*dNEnZE1;`^i>aw(BO9N_QK10Mpk${dC;$Iv-Sgs1
z>}GlM0tE(@$Z4WS9~SJov+DT=kEZa@(E0WcEcx0FsV`5Db6NC!V}woNM4#AY#y4|V
zcGfJc2;H@B=ic4*7ff{9i&|5ruCcY7__a#1S1tN{P32SRuV!D_tlt0mk+S{xzkezF
zn-7Y&EBC3-DcWUz;LL;X@g_ZzKBs5>H{b4a!=6dHduc-B)u;`Jo`r8<+{W~Vq2`0N
zaE8$A3qX&kmbgZgq$HN4S|t~y0x1R~14Cn717lr7(-1=oD?>9YBLiInb1MS_`T5Fb
hC>nC}Q!>*kF*O*PK{PbaT?tCT44$rjF6*2UngApI;B){0

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/bitbucket.png b/pelican/tests/output/custom_locale/theme/images/icons/bitbucket.png
new file mode 100644
index 0000000000000000000000000000000000000000..d05ba1610eab6ec3f9a4dcae689d4d88bda5433f
GIT binary patch
literal 3714
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
YMmB*MwFfr>em`u4_ARY)4g0YF1Gb&y!T<mO

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/delicious.png b/pelican/tests/output/custom_locale/theme/images/icons/delicious.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dccdd848ec99fba9950e8195d4e73867ada2738
GIT binary patch
literal 958
zcmV;v13~<WP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH0~bj|
zK~y*q1;M><8+9DO;m`f<=Zk&uOYFLC>!dcMNlRiXOAJIPLZ}-N2r=?6l!XNe7Ld9z
z6a-9cEObDHN_0a4!Gc7jsFEAnrb(blQ`d>p#Bb+&^WA-U9s{6QELO(jaU+wlmuj`y
zOSM|Pw6u7>?C5v1c7C;edel2@_h-|CVA`%`PmXKp)XB`5jeDpcel^zC-n+HDy!3vp
ze$j3;8sxHR%H=c6&oA=Vefai!sFa}BgS}_Mz552<V~<yxJwE>E)|xJtFMV+H<`)V8
z0000&I&H=CwkC7|1+Ht5N=8hoX|`Vs_~ouY)RRea08$5l2_gU{hT&pq6F<t)AA>W7
z_P)m??qXUg(&k9=<<+O!vJ60ggg6!eOcNj>n-Mylh$t3LyAecfGI@`Qt8oVzqjIjW
zs7s|O7Zgbn0tSWw5CbKQWRLbk7iAT&b4RGW3$c(&DZC)X=0EBkozJI+07|6+0002!
z96pEP9Emb;Mn1?1gf?J9LHxOMyT9w><KqXd*7{1n@3X!Alt&LYah#ByN58T8-!(EX
zeM4hmK&f2Co-UG2Tb#|!&^frRrmfotymF=S<Jrox6be@bDgs%7lmJpazbZR>A|jE9
z1R@fPNF*X6Uw!$hG@H#gbvAe5wL~g-eup^rQ51ogp);b<%&}090TY-2A(DWhOb(AU
zt=5*KY8U5!ilTtw@DL<MjD$#hz{7D2zyu(QAc`On00;xWyR!1ezDj58tuP!C_%3l0
zArcVy5n!|Pc#H1Q697N}Fq8rWf&TjXpQox`pPLQ>53MyKF(LtA0!3c*Cpe=q09vQf
z+Cmu?U@++SOV_V|XzTs`Ct)sEAP7&e6nI{jI35E>5T)?~0l@biEX!gz^cXoVei)W7
zR4cQ(UcdZcW8)ct>tJdR43DWPg=J>YsWP8^{+%q$SDl^R1C=DY=lj9GdwUzhVljPq
z<Hjd#ZQJ&4^Xk&qYj3}mtp9y?<FLDRyz=_B{$Q96eLtAe$~}E~zS_&?X3RTx{us1c
gKZgJSS1vdBA2JPvwdAdsW&i*H07*qoM6N<$g6#jH1ONa4

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/facebook.png b/pelican/tests/output/custom_locale/theme/images/icons/facebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..74e7ad52f362b56d584df459bc5141395c32b7ed
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU{r~^Jb>s{nN~l=<`rQ{G
z*EMNgZp)TeGt$L@YM4rb{DK+IJaKeh4CFB;dAqwXbg;^L06Clm9+AaB8pQTsa66f8
z2V~fKx;Tb#Tu)ADV02S85J*U9G7veylX_i&!&z12Q~+;~Q|gK~r==k=&T|S@G#cDE
lb^5gT;nTtbJUf;eFfcqx6@I<wZW_oS22WQ%mvv4FO#ou|K`{UT

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/github.png b/pelican/tests/output/custom_locale/theme/images/icons/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b25551a97921681334176ee143b41510a117d86
GIT binary patch
literal 1714
zcmaJ?X;2eq7*4oFu!ne{XxAht2qc?8LXr|_LPCfTpaBK7K$c{I0Ld=NLIOeuC;@2)
zZ$K%a)k+m-s0>xHmKxL%0V&0TRzzznhgyqrIC$F)0{WwLXLrBvd*^wc_uSc%h%m9E
z{W5z3f#4_!7RvAyFh6!S_*<8qJ%KOIm?#E|L=rJQq=gB5C6WLG5;c?r%V0>EmEH#X
z5eSwPRa6WXBMs#$5H%GtW2go-in9p>zW@UYDN<n!NPv@68XoE4nX@E7rR0&KnNm=S
z2Exgz;A|}%nH?6T$WB#ol%xQEz|X+N1=KJG0S0xNM#nYqNK?98d~Y_>NWc^XOXZQ?
z1QjEV00I#$3^1wQUJ8&-2UsjB-G|9y(LDhMNN3PM{APL4eYi{(m*ERcUnJa{R+-3^
z34^A6;U^v`8N*O6ji%S@sd{fJqD`XFIUJ5zgTe5^5nj414F(y!G&=H(f)Lgzv?>%+
zAsWD}2qhpH7>|TU`X&W6IxDNuO_vET7|j5oG&&VDr!)hUO8+0KR?nh!m<)a!?|%yG
zqOwq!CWCcIhE{<$E|F|@g>nP6FoYr6C<IBHsbWMjf+4zO1O);kS%8}qQm8a$gZmUi
zD&<NvIt<b%V2O}N!ZoNWm69uB(tX){2A{*><8>D?ID9%&5J(4oSbR1I^byW*g@__U
z4QsF&uJSEcFeleM3~ChjEQGbHOjsGDMbyAl(p=Ttv9RaVo8~I#js@@Y9C^_2U})yn
zzSHU%6FxuY?d;&<huP7GHTb-1@xlJO(B`!HdyxqFQHH(?73$<tXlZL#R;c$4@H*dP
z+g2Gl(SNi>65MyR({^lU*3$z$ZllDb(o&<7d;A_`h<Vt-co_6}4qhm4NL!6;QN;~C
ziOs0?+tNQdT6JgR$TNMl?(B>2U+3~BJ2Hv`{W}KEU801#cv_B|9Cm!ynR{S`AMsSn
z;7E=B;mb!wx$L;S>yGXG^6=&WlQn9$s?&L%Y1D8TI^MlKB1DqsEng$>f4=xYWBoPI
z_S1p!sJ#d2?YI4kPA{k}Eby?F=f-J9zIc`YDl^pzjVm~9ebE?Hn?t0Nx+la|D0MB;
z9)2xv1G>a1|A9kQ>~DV<Q;Z7ho$L^b&Ea$Dj%<sAD|e;zY><=X3-4yC&n!m8-3K#P
z{X@<rb5Hi2cU~WVHh|a|UznA=S2T~Zo%gX~ts(4Xc-Qdmw#zoiO^=#q#=Wa8_3kfM
zx=ub`8M3t4OXkYbtXVWMfw<I@{5w`SwWrV;vC8G9bB*bHN)Yk(=-utUw^Ilfg?CQ4
zGSWYIztN#z924;3n11kgM76CXFCp;!j+#P#S@z&Wc|z;)$KPUozl=B>0zRuQsy$+N
ziSCoLJU{Z$nQy4A4Y5UJ07$5FA~qL2%Q+cLaqDU?Lz3?=BC5;Nk6BbTmmceEaM>-Z
zi>O&-dSE=%ex;vcvCOk{*JQ5^_<YkKqpS$DAH0F(H<X7Bw`87_MOS)Pg#68pNxjDa
zB;jK$zmn_sWuB8y_{V!r7^(ToKe<wuXyxcEh_xT;sDAHiUbnkXO@U&w%;a;~8w^_5
z7JIw!*5j{umb8@5D<0X|rEcyQ=TV&ZS&EAftyyndd$Eih%<?R`$2~8S4QJH5$fAeG
z=l34zf}D3MsipO=ZSVHf&ktr)HOpO__7^nu7LNz%%Lk<ETz#8t6H|H@2wg%He@aa`
zq1}V7F@MGV3R$*cH!B-|SZ5VW<W<&vWR!!JM4Cx^@#nE|aNkx=5~sx;c)F*Skd>4M
z4lW7%l9IqY(z7pV(?I@@8=KPFO82)O{VDI18-*d-k$YmI^XiuPs_LuFw<^ZcD}yP5
c*NrbeloN*74g`U%%F6r~k%+>C^#XapzmV0H-2eap

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/gitorious.png b/pelican/tests/output/custom_locale/theme/images/icons/gitorious.png
new file mode 100644
index 0000000000000000000000000000000000000000..3eeb3ecec36a73ff505e04ecdecbcc4792ef6786
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`D?^o)dRwqYcev@q#DMvQ
z*(*AHH`kW0om8=NO8&uVRmbKn*uQ@5(H+Zf?%R0x*ww37FTJ_{>eZ{eAD{pK|9`68
zWgnn9NuDl_ArhBs&l(CfDDW^GWLD*36#n?Xe(OZZj60uZDW6tS-s!tZ;qA;Vf>oNe
zoO+M!7w(Q%nqK|iN%H(B6U8~-<?MdfvU!As@>_(gR#lieQ**`4zb(6ROF5mHl4iMd
b=se=)bK`s~y3?}<Xd8p4tDnm{r-UW|%u-w+

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/gittip.png b/pelican/tests/output/custom_locale/theme/images/icons/gittip.png
new file mode 100644
index 0000000000000000000000000000000000000000..af949625ac83d2441215c81650e897c97d9e5d95
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq(
z0|^AkZL;YA00C!7L_t(I%VS`Gf&_0HFrDaQqmtllJp)MJ0^(m#d<!b3f~*z}fD$l6
z7694*f%qSkM#f+<kQ!t?$TnY0z|@3+p=vIoxCCS>OmnQe`Ts~~BcM&z2u(nCq_gq=
z7&lY6AuyMK{funGm2)TmfBF3B|J(^}V8h})E&un_7XJV6?(P5kw{QH<2ysPrkqQGe
zaQ=a8*|2Qhe-QZh?;n_+)zkF9r6dC`2Exbo?ff4HG!&|51_Ly-!Oq;YV!?kH04e_c
z`xn?|n1LYr#DU#F11w-JxWxdCCa^$xYWRObptr6V*$cl=42W?z`+xTMA)r;58bP){
zesK4Hl#4Nj0k@C?G1=e#|F54v;Lb)4le}mj^k}^W4@6{%>dY9FfCGV^+9H&wMGiz2
zjKtz?1=auqi>CG<2OMfNq9-I62F3rB_Uiwu=1l{q2lUhkPe>?9*&EFzURJO;$Dfob
d%1o4IX8>>N|HqM7x0V0^002ovPDHLkV1m@;(I5Z-

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/google-groups.png b/pelican/tests/output/custom_locale/theme/images/icons/google-groups.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de15e68f4d1e4176b46fe6346d42f53e3296b21
GIT binary patch
literal 803
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Mpyt
z6XFU~@c;jRouXIDNvA)3c>3}ElMnA6zkmDa-J1t*U*CKC>h7DDcV4}?_43)x7td}y
ze|qiNlPk|2Uv}&N<J$Y%sr#2h=TEz~AGR&ut(v}BG=4R&|6*GE*|_?XVb#Z{k1o0N
z{C4X6<<RldrscbN-4~OZ&rcp+bngD`2-Ma7)3)`8B~VxWSF^e=_U%9IT7P{1{@twZ
zvq{Y-qw0@_6(1fyxM0`*WAV}d3y=Ias`_Y9@!`?^^R}(u7ajS(=*U0I#%~r4Ul$zy
zx8Tsfhxg7~H-GEg@^|Lm-_v*hYTfwf!QFGOU)-{61S<HiU;h67owJ6O9}LRh-@AS0
z#nT%`)t~gr-rc!%+PLPEUg_K0H%={FIAg(r>GS4Ioi}&t+__Wd%$cHF^5*9C6Zh|&
zS-fcGqD3=xieDc*uvxqCB`~<QtYuvY3^<mOAU|M?e6KxrOC}M>XH4>TcVYa`q<as@
zdFbil7$R}m^h9MeW1vLa$MA2un|cb*v=~lWYdp0;VruOvk*OP}Xngs*-%0<~zvnyW
z$u}I$+H5^XZ~O7;H=pOvU|7?bpmE0ahejvoBh4mV34ayK&i-X7jy}pa&O6Qgyk^R2
z@qY&<a*FG#cy$(4mc}|2+$(r$<e#}JXyqoUrqy~Ydv9AWx?}Eo&8cAfPrvC&d+m~?
z4jo>+>QZfU<G+>%sx2Z(n*wUnoNHS?EYjGdv*%IzuiFv_(<LfgxBZ^1*%Uwf?DO~X
z-Tr@0i!vR!{=LfFATlq3|D~>s)h|m2&VR<uFU3DER#7b}zVrv^S=AEPh?11Vl2ohY
zqEsNoU}RuutZQJXYiJx|U}R-zXa!^&SXdbt9ArN;6-7gCeoAIqCAtO!D`PW=29XVF
QRX`04p00i_>zopr01MEB^#A|>

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/google-plus.png b/pelican/tests/output/custom_locale/theme/images/icons/google-plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c6b74324031611f20c0a3810131aa74fd0a5a9f
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0005jNkl<ZD9>ZK
z>upIAVz}dFal_O6CT?`r$q<OnIT-@kK$Q%)JnZh&Px^TL<hOT!|HHwDE3YcOueqB6
z(P;+*puibNLm>OAn;FBaOK-k!D!Jidayc;Y>7GYGxnGBxue+IChM|)V`ar=`j`~3M
zC07%M|NqZF^fS8TVssIRJYwIy1j>GXU1E8{UJs6dLU1-v!-3nb2Irih=+?6PK<TfG
zB2Rf*{>KJ@8lF5#&^v9fcghZg&b90USur#Ch_yBx0YzYJ9ftpZ|9@Mbb;3sH7#Llc
zapC{3OLv2zTp&7Rr3KUgB!TRsHrfndzX7?Q-YzOS8|-?va>A!K_nuYT9<<VgqkWbd
zKoxr}G!9s50ujTB;JBOfmb}=t_wzfT`1cp}c6-g#_aLENrfLub;W8XHSKncxy2B*+
z$(#TG{(pE>U;^giL<|Q^RJR%`Z!y$8yYa>Upa1{=xci{g2`qvgF`RFk`e^@wXB(G2
zShMW$$p`;HLHGV;SLhaf#f_+F1DIs^y0_<$oBBFk`Sl>Ab*Ovm_g^4AcawG2Lj|D-
zqK4swiTo;US!A@iaP1FZz%33(6Ney%eY$dMwPn_zpvZ?`|G(*ST!StSLI9gPlb*yp
RBR2p5002ovPDHLkV1g3B{|5j7

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/hackernews.png b/pelican/tests/output/custom_locale/theme/images/icons/hackernews.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc7a82d4d68068d5fb032885b93e670c385ae1b4
GIT binary patch
literal 3273
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/lastfm.png b/pelican/tests/output/custom_locale/theme/images/icons/lastfm.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a6c6262b644dadbcf6cce5dfe4fed9740a9ec1f
GIT binary patch
literal 975
zcmV;=12FuFP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH11L#E
zK~y*q1;I~j6jdC+@$Y-{cJ_af?v|Cd&=58%RRW19jgdqNQ4(W7BPZ0vgC6ith#oz2
z<l@C}F@fj}i1E*<ghZnl0WB>wmQaM~wsz^Z-QCXa%<Rm2KR+L}`t{{KnbyYpezo$l
zE*DGMcusj{#-vn8(<kxNDvA~&G1jh;@j`O`I%(P@Yc3nV)jl`m`-eypSla-t0eJ#H
z1D*lcfpg#-C<RFh4oDN6a(7HFNgrpd27VTt1Lq(~5of_Ulu`g70)P|>DC5DyB?4oI
zHSqw7c|gHN7dAskEJO*20zV5*!N7txD5W7|ke~<M{<u+(l>#<<kjukl9qJQM$f1^+
zaC07l5Qa)HwI6E3FtY%SWh9Dl?M|#!F1wBuc<CS<+y^4CvIg}DIC=<L>+t+u*fj>r
ztH?8TXslr8?-TWV6(gOX%;6VdsD%CI2XwQA8l*5f0`DG!`c7!JVEYK^^e^<T{6;aK
zCE4telzpuuY|O54(%A))pKqWt2HRdIz4#;U<{WZ(iryFJaSs}pQzyy2bDX&Gh-jsS
z6Jp)^{nkJLy<<Bvh)I6^ljQc_1UK%|J9`0DERd8+Ebn=R?uBp3zHtQe!CQn2576ae
zS-bm<Lj2W5^zarkCyugt<vJVJW=Z!=60Uc#?JlL$?~%j-!P)Zwu=gnfJAme+BP<>`
zcD=D}N`gz%A|jG3Hzk<+OHvW}@9ocI<-{i<BH}gz5fQObEdRWDO6IeZ^6#rBm%NX6
zKK+r`jcWbxuaexkhc1^;oi5!o=Ln~-(O+0Z=kw^X5qjTUW%cwKf<JDds}%~n#~0Pz
zXJ4NwN3vgg8oSyd-t1zN7_X2=)vDOkq1M`HlfiZaWJ{hwwTx#S)z@D5$>fWL)N6Op
zl_6x*$4|GSoI{~dSr4lfE@RM%BU`HwdyYXEVvL7at4)4lw9&i$@PL;@=v)?SEfh1D
zasgHF@wCQe1o1p1(b(1+x;KE@R@B7!CDScsKTn?9J!|Sao$80mhEYbMc$-A=FpjF~
xhgEG<4rh((w99I&de5(oe5r7A)lWa1`5&mym2=&ymqP#m002ovPDHLkV1nRSx}g97

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/linkedin.png b/pelican/tests/output/custom_locale/theme/images/icons/linkedin.png
new file mode 100644
index 0000000000000000000000000000000000000000..d29c1201bcb0c278d49f573f9ef95ebfe932fb5b
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0006vP)t-s00000
zXtV%nvH)we0Bp1bYqSDvv;b|j1Z}kdZ?*t$w+L;u2yM0nZnXw(wF7Uq1aGzoZnXt(
zwgYgr0CBblZ?*t&w*+vu0CKhfa<>O?w*+yx0CTqhbhrm|xBzvz1a!FqcDf06xd(T;
z33s;)cDV|7y9#-^3VFK@c)AREx(#`{5P7-@d%OyJybgN24|=>3db|^QyApf54}859
zd%O~SycB-F6oS7Mg1{Mpz#M|W8-~Ilg~A_(!XJpjA&SHzio+v{!z7EtC5yx+i^M05
z#Vn4-Esn-Ak;gHT$1;-0GLy(NlgLGp$T^kDI+e;fmdQGn$vT$GJeSHnm&-hv%0ZaR
zL72=xnae?$%tn~XLYmA%o6JO<%t)NhPo2(7pw3U9&{Ck$Q=!sTqR>>M(N?3<R;1Ec
zq|{ud(_^L5S*X%pr_^4j)nBL8UZ~VwsMTPo)nTdCW~tL=s@7_()orfWYp>RCuhwv{
z*>JGebFkNQvDtL7*>thma<bTUvD$O8+jX+qc(d4iwcLBR+I+X#f4AL&x!Z!d-h;W_
zgSp;-y4{1i-h{i~gT38^z21nt--o^3ioM^Az~PI*-<8MWmdE0k$K#;M<e|&tqRZu<
z%;clZ=BLf(r_Sf6&*!Vo=c~`>snF-F(C4es=&jS~wAARd)#<j?>bKVFwb$yn*z3L7
z?7rLWzuWJ^-|oob@6YA&(B<*a=JM9)^VjM0*y{D#>-FC4_2%;U|Ns9Oj;1#N0004W
zQchC<K<3zH0002@Nkl<Z7}Ev8!Ae3w6b9h`oSCa$HEflT6=_799wq2;+PCNddXA_?
z@6aNsK!REYQsyGHn|Q~2XXec5`v{lhi5Q#!@aBpx22P9xz|ls^CwAcvhSOI|&`c5<
z1^+Eiy2ox&c~d!G&P%&;lhIePRh5$ewz-aGPd<LeUi=!pd|n1vujhx;+q2!-2=aa-
z8HaMG)35vOBO-e`C?l`k26c+i>pR786}b)xDJsVI4<4<s<`flDDQd$Bp%hL*p<Y3%
zgj5M@?4WBJ=&CX3NRy@U^7-hVXHQ&=zuzdMc5f3nkKQy<Nz3gM@@+}Xh*@BmW&IEI
W8i?#El2Z);0000<MNUMnLSTaIozvC;

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/reddit.png b/pelican/tests/output/custom_locale/theme/images/icons/reddit.png
new file mode 100644
index 0000000000000000000000000000000000000000..71ae1215ac8ea274f089cc4aa55eaf8a546dea67
GIT binary patch
literal 693
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l=u_i
z6XJU9!~dgqznysSYyY)(LD8wHg|!_s7AIvDr=+IWbj|FUyDmPfbnU^D@i|oqvC+T2
zfAR7QKKbzX`4|5(OPiMMJXcWD5f&BKH-E#%6Zd-;ZmH~=t*LKT-acd2`lE+#eLng4
z-?H5&V^gy8DqHgFdQ!4-yLx+<E?&50^QQUp=2kZ}L?@=@6qMb&bIZ=gs<XZA^S3Ym
z{{1VjZYV6sU$<`Ezhz7Q3Gn|rd~m|z9q#V#|2A#-XJqj2+?l+BqPsu-1;?bGKXY=$
z%2k&xUHb6h!`<)y)*Qa>=H<6<_s-L&Pd7F;*45Q*JaIQPE<GzdXZ_mMmoJ{bdHw3*
z9p@@KW~3K4B<EJluQvk)5NCl$WHFHT0Ash4*>*t27Ec$)5Q)pF{a1yW0vK4|Z{2Op
zxVv9ALPN>y#sB}^FBbIe>i@l=m`}0(f_~hg1e2M%VYC10t~mU%sCtiG><?xWiA5$d
zov)O{{8fTq@|?Ak;yL~FQ)|-7n3c~grYSB7%QuOxxR7P`%GBxBT)nEljBJ19cFi?Y
zJS=E1@52N2<OGu|i-K!rWL>;j!>H3bbpwl7vG1Cry)A3^Ox`}h>{0RYe+4#k^`Bq<
zxS_r_@XG7AtF(UYlz;cYLxy?X@e@GjGpLrhMwFx^mZVxG7o`Fz1|tJQV_gGdT|?6l
zLklYdGb;lFT?2C<ImhI8H;RVb{FKbJN^}jTRwkwp4HtB7W`eBnboFyt=akR{0GX0A
AmjD0&

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/rss.png b/pelican/tests/output/custom_locale/theme/images/icons/rss.png
new file mode 100644
index 0000000000000000000000000000000000000000..7862c65afeb66ba9cc7e9576a3a62b850b2e184d
GIT binary patch
literal 879
zcmV-#1CacQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH0?0{3
zK~y*q1;I;*Rb>DG;O{@@%$+f3oY85tfwDo(q6wk`g<SMNBHL8pB9Oo~5+u|jBHD$-
zENba8Fx=I`prFto0)-ydriUq(IF07a*xYgM<J^1hJ?H#=UjT?-A9=|5*z-0`OlU7}
zH*C#G>iZ?x7RltmpuHqGE2Ov7S;O>W=fV^3Ed_|@k1wcyde_(#VU$5hJ){~SMM3vE
z`3mV6d6!6h_{5>K{^g_nAzb{##4h4Atz`x+@?|<V>HbY`2^q;2h6QShC{*2hvJjfj
zNk-Xd(Y{3MG9@ZB0^>WVP_!vG5J*O7R18<<GTj>ow5~Ea&x6M(ayp9?tF$h&c7>5K
z>WU;q03evmbXTSntIWQ`uA?F#fQoNl=Fcyg9w7z*62w8B*nHn@<2%JaJ`lfonhURq
zw=ar_Ql9;S2M)3^Bp^gWR2P)>#BvgiT$A6V8ZiBc(EeWde4lt`PTaT(96Za+Zi+q;
zA*lPr#_VFEx7t*!3sdtvev(6%g(JTUw-+U69u><wB#Gg@FDchiMFe$CB9uv}i(t!M
z)_xE!92WmNC2pSQ=&G{Y6MlRX40pVssE}6TAnFwKI{(cku`$y%=nztdx$yHF!l!o&
zqca9io>2XEnzC(V_9^w`BzdLGqpGA|C0Rn+wz0^j?cy_E@k(x(WUQW7?tE3Zi_R5k
zBQ;EB<m<#bN>j2p9AqRn)QGiEcNEFEUOzK+@qNX}oQZ9LjYXYiQ|zvZ2|*AlVi;?O
z>etgdlS{`I>%1>i)A}(L@>OH~L>+3$+*Z|kU%u8eI?)iaRKKkJyErh|edyx=<#)&5
zPOhE&aPSXGvdN%`K^<$I9%YX#r5d4(<b68Rd#-Ieu&_S><mcYn6Utk!*UjrMhO)EN
z?KBldHCq(%uDY?cjOnJ8Zl`%Cnc5q&*?phQA6_^G{{t(DV2lcQ!aM)~002ovPDHLk
FV1f)<i^Tu{

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/slideshare.png b/pelican/tests/output/custom_locale/theme/images/icons/slideshare.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecc97410138bb3c457a898b1e868b22ae9db9989
GIT binary patch
literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfjR2nz*S~-N{{H>@*RNkce*F0U
z{rk6X-@bnR`sK@)&!0bk{P^+1hY#=Hzkm1c-M6<d-oAbN>eZ{4FJC@?{`}dqXP+Kk
zfBg9I&8M#)J$iKg$*Tts9^Acq_w>EzpARqEaQ@!6eO+r#-}<z-?bG(EnMZEFU)j{U
z{o<QxDb?$a=dU@vZ2pulJ+g1Ryl2jw`L4q*WzoUcEgso(w|r`m{@5h-y21KGt>n8>
zu{U`lyUMLC`*)c4@4l3;wx-<Gq<7b=G@+FRjyfG%U&QjqSJgBY#cDUL(P>(%(zHRk
zY87AMB8Ie?|NsBbO`N?A=tqx|AirQBmq@T5pE`yXT^3ECnaey~977}|Sr4A{I}{+o
zaN%=YK67fKl);XLhVMN72>h>4j>!~t_j$}=vE_wj;Wj1)-!<nL8zwL@?458yC$D?*
z>S-z}KHD!>)!zx?ko4cYZua^>?$dWqKR+B>HaC57^UvfAaqpaV<uBr;H{$nQpPKaL
zwtfD!!1j*q@1|^-d1s2K;_0XI!p8)-c>es*Q+RSF`|DQgH%v`O+{1V2ALnUm<nUs4
dVP-J--|@jj(URrLY@mx7JYD@<);T3K0RY7iJHY?|

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/speakerdeck.png b/pelican/tests/output/custom_locale/theme/images/icons/speakerdeck.png
new file mode 100644
index 0000000000000000000000000000000000000000..087d0931caa301f8a1bba1497e1b91b7a7f105a4
GIT binary patch
literal 1049
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)ORJo
zC&X36Qpczy)Vv|qtS-i^KE}L0*0?lOuQ1qcbDjH^di}y+y|QqP!eEVpVC8Ior7S<$
zRBzc7Z^?L1sRU2)Xm_y)H_-@J;Sd+WKxYAeM*&|)eqRTEZwEe4dwvgleoqH}M{A*k
zFrmaSekW@-6-5Cz2O#2iwYT3?W4EE&Zez8>rW*T=)%F`}tXEZ-FE2F%qGdo-V!pi0
zdUd7Ql2Vg}#l{PZj29FdFDNouRBSZ2NPl*|!JGnvIfaIE3w5UE>P*Se>d(~b&Cu#i
z*94*-AWGAokfk#vSF=A$y(3K`#!V!^PRQRzI?P!<(p@UlS<uf$GR94#GhMYKUAZwy
z$k#^P+a{nQciFD31rs_7C$z8FvpuLXPs-O`$j3&xAyKt6L#ZiMp*lgp%UUVGb?S;G
zpFV$Xnm4^^?zEY!mT8CkC{)MG)h5Z5#_)Ss@z@!QIGVep#5$zJxTeI3I$H498u7bZ
z$<-uDmBmXI#fZfD3PpGbMtJatx(bB4352=xhq;Nw`$-kYisi?M=0%GY#E1eJ`O#u|
z(Lxy!Lg^8L>EVLu5dvx9f@$GG8Ik-+VSI_9d<h}E2_XW>VSI6+ys<zO!V??J6BGQb
z?f5oe#A}oU`2|<sc=Gu1;~O{r{ks9AF~RkJ|E^a9l}zT~&jsq?Ebxdd2GSm2>~=ES
z4wz7QJY5_^BrYc>B%~yzC8jbmrirPUv9Xo$@%rlK%F4#-%F4>-`suOd+14`GGBZ2Z
zIx90L*9zyc$psr58y9nXdwUma8*2y0vDsxyM@uVg*vhOFU0uh<$nLJ5E*>6kZeE_w
z@6YbYrl_AUA8-G^q2YkS{Raa2iEI-uZ1~V|V#SLYH+KAJIie!ScJaxSD_g$woLSTJ
zX3mv6DTZtx_xx!(wCK^KNtZT#>iXkV$kw^))vQ~)ezhH2w(HijX<D9aE3a+acJ14>
zzH8ggT|2ifER${KyLs>Ky?eLs-#^Y;;oZMeB%i4H&a+A767ZjEQ~Byi<|iJmuFL6X
zSeha?J1&`I)ZEpyYSye-Rssx~p{$||UzYnt><E|>3Jf6C64!{5l*E!$tK_0oAjM#0
zU}&ssV61Cs8e(W+WoT$+XryakZe?KbBv`K%MMG|WN@iLmrUnB`h=%CJhhl*m7(8A5
KT-G@yGywnx3UT@X

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/stackoverflow.png b/pelican/tests/output/custom_locale/theme/images/icons/stackoverflow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5b65e9990dbf423ff652b297f1d0172c8c1cf27
GIT binary patch
literal 916
zcmeAS@N?(olHy`uVBq!ia0vp^0w65F1|<EHm6d=LTavfC%YQK7jQD;BD8gCb5m^kR
zJ;2!QWVRgx1Jfl>7sn8f<3~fRJ+vJ~_8MEyP6_>_pwTJhc%)&)Mu9Ed(YG|jmTlZ9
z@KIP<Fo$WHQdEb+NB2cr!?F@*x~WcWQrH*};BxJ~kV?wIl+D(kyA=I9o*Z3%X!qH~
z=V#_rf4h??P_t1awPMF!*<^+u&DgkSs}Cw1KkVFh_ikRf$t<5|MN3OQg!AsWJA3x?
z=Tn$ws2y7<5P$dXQ;pLyi!T;g#hZP|OUZtH_rwJOhGd52%jd|-giM(@aoe_;GlQOA
zOqX8y>eZ^FK^-?9GB|W>{Q7m)EC+@8;a3mYxk}1?tCE&x6kxKjd-nU)D+_Cb1MZtP
zf6ioHdF7Ur;v^T%WC`(qYnHY?KFysk()nSxK=;)vJ-w30K5t&s)3<F~St;X;WePH~
zh5HuVx_r3z$m3M^1(`o<Qd9NRIV7ar;^!+Q<jnf~nM3hNgez-*P1&@5g_$8&dwHGG
z(p@h;-no1CE+>ykMV9;LODnQ81ohPJtCw>uw6%3rniLY9y-{G%>&K7poH)Ybf9hcZ
zPx7%K&0{68BG<3+JpQ<G*RL-j0wu8me0+1xEnRv$+RIz&#%=EQ)W}Ib!VUsVj9!{Y
ze>`j393DPNr7J)G`t`kgi;Fv5%&IGQ?s!oY8v6HF>egkKm6gM^6?fU09+hB7{`$2g
z!Dr>|-0l5+On2^2_f4p`m-+THD#}N=VM2Fz(!8K!0$xisQhfv_dG-h{GMTvHCdbLN
z^XFvvX21P9HE8+fMNXk>uPs~lGBfn<J-us+OL<a^7|MSC-FugBg5US=#%v9R?(FH-
z)~t+*4E^j3iianp9%B%glp1T!)6M$eq2lDioeUzbmtVd5v0I?O{>^9g#*-%#3?x$4
ze30#20|W~;m8*zxxBvb3Dl3rX#Piv+IUi<hWO%Xb`s}kzH*&bS)zxQRyYS&dz#9Kk
zrW$5pG0&gR`nLV^o<NNwrFNh0*KzKTP8I&~Mx*YI!_F7=tN#7wsAGO;?Rm1by(<Km
z%vDQVBT7;dOH!?pi&B9UgOP!uv95u+u7Pogk&%_Lft7(JkZWaN@XXL<8H$G7{FKbJ
jN`wZ(5JM9yQ!^`56Nm<eE8p$|H86O(`njxgN@xNA9t@M#

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/twitter.png b/pelican/tests/output/custom_locale/theme/images/icons/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0ef3cc1b36ab79ac7931c2269b70f3662950a97
GIT binary patch
literal 830
zcmV-E1Ht@>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4ZXi@?ZDjy5FfTVRFgbe517iRH0+&fd
zK~y*q1;I;eT~!#z;orN~+WXwn#6*y$w(*h*ilq*eI<ylz7WC6N)6d|fvkpZB9V!J8
z2ZbWoL7^5epbbqgY2vx>v-e)>{rfz2>o|YjIakM#%UhMb+@bNp@nA+}SPdDo7O9oA
zGH1DQ=3VCA#gT5=SO4a&tyI0gXB<SK6xqg@0Z$}qgCQV6ClOuXu)#Q5+OJ_#^k7_r
zheE)Z$k+l7fkSs17jwZP7dAz7g1U~xI`DL(ozOXz2hl6>T8cdC;FG`L+ZpV~z_2(k
zy27+~*2T$!9(dBjs?l*Gs@^i^ycrPqX$n7{!nGav4CBKp&|ow~j<PdVAOX36;W=f=
zcg#5-A_DHOV0!@nWta;7X#<a2c(aE0Mv>oLoVsusArMnnq)x&OT0jOD0^FU!r)xMV
z@T`Lg@WUazJu+?=Xo^@Bc7w?~m$5A3q=>T&2}l_pF5!6#!NjS=iGu;#28{!#P2-AU
z0h%HbP#g*{cet?yAML`kY`i-ZA56r3H`W4*h|+12)Ju^?5tk}wyNb*^F%HHT7vW$4
z0AT#-;$9CI5)714(INy>lS^h8jI9{BG64bGL3}rZ+e`R<Djv3Q5R6?Dv%b(~$6Ps8
ziFv^wCRP|%$FOIRC2pR;#*Ccd)ggTS2D}rEpF2RJcTz|(EJ7S`+=>_3xqi;MG7(3u
z(Kz(IvnufS+IiH%<p?`C)9l1x!?Y@@CP3%#xPkq1#+R4G#}g-E?2iIPa5yyHs$ouH
z-K=@KsTg7VDI4PjuosQ9-uZ1|ygo8+yd+8~43bd+1^8v=JZK7MrDoZQ`Npr=H_sQ>
z|H$#?(3yDKFI$%htO#ZKU{k0-ZZa!IYoMLFnl`;oUNO7#KQyI_l_SgjkN^Mx07*qo
IM6N<$g7S@P4*&oF

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/vimeo.png b/pelican/tests/output/custom_locale/theme/images/icons/vimeo.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba472022f0fcf7ecdd8f4847a8a3bde90789bc7
GIT binary patch
literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/youtube.png b/pelican/tests/output/custom_locale/theme/images/icons/youtube.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e
GIT binary patch
literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT

literal 0
HcmV?d00001

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 3c0f8d75..e64b3804 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -2,7 +2,6 @@
 from __future__ import unicode_literals, absolute_import
 
 import six
-from datetime import datetime
 from sys import platform
 import locale
 
@@ -10,7 +9,7 @@ from pelican.tests.support import unittest, get_settings
 
 from pelican.contents import Page, Article, URLWrapper
 from pelican.settings import DEFAULT_CONFIG
-from pelican.utils import truncate_html_words
+from pelican.utils import truncate_html_words, SafeDatetime
 from pelican.signals import content_object_init
 from jinja2.utils import generate_lorem_ipsum
 
@@ -127,7 +126,7 @@ class TestPage(unittest.TestCase):
 
     def test_datetime(self):
         # If DATETIME is set to a tuple, it should be used to override LOCALE
-        dt = datetime(2015, 9, 13)
+        dt = SafeDatetime(2015, 9, 13)
 
         page_kwargs = self._copy_page_kwargs()
 
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 411fb7da..cfae594a 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals, print_function
 
 import os
+import sys
 from tempfile import mkdtemp
 from shutil import rmtree
 import locale
@@ -10,7 +11,7 @@ import subprocess
 
 from pelican import Pelican
 from pelican.settings import read_settings
-from pelican.tests.support import LoggedTestCase, mute
+from pelican.tests.support import LoggedTestCase, mute, locale_available, unittest
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
 SAMPLES_PATH = os.path.abspath(os.path.join(
@@ -19,6 +20,7 @@ OUTPUT_PATH = os.path.abspath(os.path.join(CURRENT_DIR, 'output'))
 
 INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
 SAMPLE_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf.py")
+SAMPLE_FR_CONFIG = os.path.join(SAMPLES_PATH, "pelican_FR.conf.py")
 
 
 def recursiveDiff(dcmp):
@@ -102,6 +104,27 @@ class TestPelican(LoggedTestCase):
         mute(True)(pelican.run)()
         self.assertDirsEqual(self.temp_path, os.path.join(OUTPUT_PATH, 'custom'))
 
+    @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
+                         locale_available('French'), 'French locale needed')
+    def test_custom_locale_generation_works(self):
+        '''Test that generation with fr_FR.UTF-8 locale works'''
+        old_locale = locale.setlocale(locale.LC_TIME)
+
+        if sys.platform == 'win32':
+            our_locale = str('French')
+        else:
+            our_locale = str('fr_FR.UTF-8')
+
+        settings = read_settings(path=SAMPLE_FR_CONFIG, override={
+            'PATH': INPUT_PATH,
+            'OUTPUT_PATH': self.temp_path,
+            'CACHE_PATH': self.temp_cache,
+            'LOCALE': our_locale,
+            })
+        pelican = Pelican(settings=settings)
+        mute(True)(pelican.run)()
+        self.assertDirsEqual(self.temp_path, os.path.join(OUTPUT_PATH, 'custom_locale'))
+
     def test_theme_static_paths_copy(self):
         # the same thing with a specified set of settings should work
         settings = read_settings(path=SAMPLE_CONFIG, override={
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 6228989b..d853587f 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
 
-import datetime
 import os
 
 from pelican import readers
+from pelican.utils import SafeDatetime
 from pelican.tests.support import unittest, get_settings
 
 CUR_DIR = os.path.dirname(__file__)
@@ -42,8 +42,8 @@ class RstReaderTest(ReaderTest):
                        ' supported\nas well as <strong>inline'
                        ' markup</strong> and stuff to &quot;typogrify'
                        '&quot;...</p>\n',
-            'date': datetime.datetime(2010, 12, 2, 10, 14),
-            'modified': datetime.datetime(2010, 12, 2, 10, 20),
+            'date': SafeDatetime(2010, 12, 2, 10, 14),
+            'modified': SafeDatetime(2010, 12, 2, 10, 20),
             'tags': ['foo', 'bar', 'foobar'],
             'custom_field': 'http://notmyidea.org',
         }
@@ -70,7 +70,7 @@ class RstReaderTest(ReaderTest):
             'category': 'yeah',
             'author': 'Alexis Métaireau',
             'title': 'Rst with filename metadata',
-            'date': datetime.datetime(2012, 11, 29),
+            'date': SafeDatetime(2012, 11, 29),
         }
         for key, value in page.metadata.items():
             self.assertEqual(value, expected[key], key)
@@ -85,7 +85,7 @@ class RstReaderTest(ReaderTest):
             'category': 'yeah',
             'author': 'Alexis Métaireau',
             'title': 'Rst with filename metadata',
-            'date': datetime.datetime(2012, 11, 29),
+            'date': SafeDatetime(2012, 11, 29),
             'slug': 'article_with_filename_metadata',
             'mymeta': 'foo',
         }
@@ -171,8 +171,8 @@ class MdReaderTest(ReaderTest):
             'category': 'test',
             'title': 'Test md File',
             'summary': '<p>I have a lot to test</p>',
-            'date': datetime.datetime(2010, 12, 2, 10, 14),
-            'modified': datetime.datetime(2010, 12, 2, 10, 20),
+            'date': SafeDatetime(2010, 12, 2, 10, 14),
+            'modified': SafeDatetime(2010, 12, 2, 10, 20),
             'tags': ['foo', 'bar', 'foobar'],
         }
         for key, value in metadata.items():
@@ -184,8 +184,8 @@ class MdReaderTest(ReaderTest):
             'title': 'マックOS X 10.8でパイソンとVirtualenvをインストールと設定',
             'summary': '<p>パイソンとVirtualenvをまっくでインストールする方法について明確に説明します。</p>',
             'category': '指導書',
-            'date': datetime.datetime(2012, 12, 20),
-            'modified': datetime.datetime(2012, 12, 22),
+            'date': SafeDatetime(2012, 12, 20),
+            'modified': SafeDatetime(2012, 12, 22),
             'tags': ['パイソン', 'マック'],
             'slug': 'python-virtualenv-on-mac-osx-mountain-lion-10.8',
         }
@@ -220,8 +220,8 @@ class MdReaderTest(ReaderTest):
             'summary': (
                 '<p>Summary with <strong>inline</strong> markup '
                 '<em>should</em> be supported.</p>'),
-            'date': datetime.datetime(2012, 10, 31),
-            'modified': datetime.datetime(2012, 11, 1),
+            'date': SafeDatetime(2012, 10, 31),
+            'modified': SafeDatetime(2012, 11, 1),
             'slug': 'article-with-markdown-containing-footnotes',
             'multiline': [
                 'Line Metadata should be handle properly.',
@@ -311,7 +311,7 @@ class MdReaderTest(ReaderTest):
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
-            'date': datetime.datetime(2012, 11, 30),
+            'date': SafeDatetime(2012, 11, 30),
         }
         for key, value in expected.items():
             self.assertEqual(value, page.metadata[key], key)
@@ -325,7 +325,7 @@ class MdReaderTest(ReaderTest):
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
-            'date': datetime.datetime(2012, 11, 30),
+            'date': SafeDatetime(2012, 11, 30),
             'slug': 'md_w_filename_meta',
             'mymeta': 'foo',
         }
@@ -358,7 +358,7 @@ class HTMLReaderTest(ReaderTest):
             'author': 'Alexis Métaireau',
             'title': 'This is a super article !',
             'summary': 'Summary and stuff',
-            'date': datetime.datetime(2010, 12, 2, 10, 14),
+            'date': SafeDatetime(2010, 12, 2, 10, 14),
             'tags': ['foo', 'bar', 'foobar'],
             'custom_field': 'http://notmyidea.org',
         }
@@ -382,7 +382,7 @@ class HTMLReaderTest(ReaderTest):
             'author': 'Alexis Métaireau',
             'title': 'This is a super article !',
             'summary': 'Summary and stuff',
-            'date': datetime.datetime(2010, 12, 2, 10, 14),
+            'date': SafeDatetime(2010, 12, 2, 10, 14),
             'tags': ['foo', 'bar', 'foobar'],
             'custom_field': 'http://notmyidea.org',
         }
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 3c12a15b..df1918b5 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals, print_function, absolute_import
 import logging
 import shutil
 import os
-import datetime
 import time
 import locale
 from sys import platform, version_info
@@ -38,24 +37,24 @@ class TestUtils(LoggedTestCase):
 
     def test_get_date(self):
         # valid ones
-        date = datetime.datetime(year=2012, month=11, day=22)
-        date_hour = datetime.datetime(
+        date = utils.SafeDatetime(year=2012, month=11, day=22)
+        date_hour = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11)
-        date_hour_z = datetime.datetime(
+        date_hour_z = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11,
             tzinfo=pytz.timezone('UTC'))
-        date_hour_est = datetime.datetime(
+        date_hour_est = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11,
             tzinfo=pytz.timezone('EST'))
-        date_hour_sec = datetime.datetime(
+        date_hour_sec = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10)
-        date_hour_sec_z = datetime.datetime(
+        date_hour_sec_z = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10,
             tzinfo=pytz.timezone('UTC'))
-        date_hour_sec_est = datetime.datetime(
+        date_hour_sec_est = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10,
             tzinfo=pytz.timezone('EST'))
-        date_hour_sec_frac_z = datetime.datetime(
+        date_hour_sec_frac_z = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10,
             microsecond=123000, tzinfo=pytz.timezone('UTC'))
         dates = {
@@ -76,14 +75,14 @@ class TestUtils(LoggedTestCase):
             }
 
         # examples from http://www.w3.org/TR/NOTE-datetime
-        iso_8601_date = datetime.datetime(year=1997, month=7, day=16)
-        iso_8601_date_hour_tz = datetime.datetime(
+        iso_8601_date = utils.SafeDatetime(year=1997, month=7, day=16)
+        iso_8601_date_hour_tz = utils.SafeDatetime(
             year=1997, month=7, day=16, hour=19, minute=20,
             tzinfo=pytz.timezone('CET'))
-        iso_8601_date_hour_sec_tz = datetime.datetime(
+        iso_8601_date_hour_sec_tz = utils.SafeDatetime(
             year=1997, month=7, day=16, hour=19, minute=20, second=30,
             tzinfo=pytz.timezone('CET'))
-        iso_8601_date_hour_sec_ms_tz = datetime.datetime(
+        iso_8601_date_hour_sec_ms_tz = utils.SafeDatetime(
             year=1997, month=7, day=16, hour=19, minute=20, second=30,
             microsecond=450000, tzinfo=pytz.timezone('CET'))
         iso_8601 = {
@@ -258,7 +257,7 @@ class TestUtils(LoggedTestCase):
         self.assertFalse(os.path.exists(test_directory))
 
     def test_strftime(self):
-        d = datetime.date(2012, 8, 29)
+        d = utils.SafeDatetime(2012, 8, 29)
 
         # simple formatting
         self.assertEqual(utils.strftime(d, '%d/%m/%y'), '29/08/12')
@@ -296,7 +295,7 @@ class TestUtils(LoggedTestCase):
         else:
             locale.setlocale(locale.LC_TIME, str('tr_TR.UTF-8'))
 
-        d = datetime.date(2012, 8, 29)
+        d = utils.SafeDatetime(2012, 8, 29)
 
         # simple
         self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 Ağustos 2012')
@@ -329,7 +328,7 @@ class TestUtils(LoggedTestCase):
         else:
             locale.setlocale(locale.LC_TIME, str('fr_FR.UTF-8'))
 
-        d = datetime.date(2012, 8, 29)
+        d = utils.SafeDatetime(2012, 8, 29)
 
         # simple
         self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 août 2012')
@@ -448,7 +447,7 @@ class TestDateFormatter(unittest.TestCase):
         os.makedirs(template_dir)
         with open(template_path, 'w') as template_file:
             template_file.write('date = {{ date|strftime("%A, %d %B %Y") }}')
-        self.date = datetime.date(2012, 8, 29)
+        self.date = utils.SafeDatetime(2012, 8, 29)
 
 
     def tearDown(self):
@@ -464,7 +463,7 @@ class TestDateFormatter(unittest.TestCase):
     def test_french_strftime(self):
         # This test tries to reproduce an issue that occured with python3.3 under macos10 only
         locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8'))
-        date = datetime.datetime(2014,8,14)
+        date = utils.SafeDatetime(2014,8,14)
         # we compare the lower() dates since macos10 returns "Jeudi" for %A whereas linux reports "jeudi"
         self.assertEqual( u'jeudi, 14 août 2014', utils.strftime(date, date_format="%A, %d %B %Y").lower() )
         df = utils.DateFormatter()
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 7c8662c9..b6078201 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -21,7 +21,7 @@ from six.moves.urllib.error import URLError
 from six.moves.urllib.parse import urlparse
 from six.moves.urllib.request import urlretrieve
 
-from pelican.utils import slugify
+from pelican.utils import slugify, SafeDatetime
 from pelican.log import init
 
 logger = logging.getLogger(__name__)
@@ -303,7 +303,7 @@ def dc2fields(file):
 def posterous2fields(api_token, email, password):
     """Imports posterous posts"""
     import base64
-    from datetime import datetime, timedelta
+    from datetime import timedelta
     try:
         # py3k import
         import json
@@ -340,7 +340,7 @@ def posterous2fields(api_token, email, password):
                 slug = slugify(post.get('title'))
             tags = [tag.get('name') for tag in post.get('tags')]
             raw_date = post.get('display_date')
-            date_object = datetime.strptime(raw_date[:-6], "%Y/%m/%d %H:%M:%S")
+            date_object = SafeDatetime.strptime(raw_date[:-6], "%Y/%m/%d %H:%M:%S")
             offset = int(raw_date[-5:])
             delta = timedelta(hours = offset / 100)
             date_object -= delta
diff --git a/pelican/utils.py b/pelican/utils.py
index 84b3a41e..586d85ff 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -14,6 +14,7 @@ import shutil
 import traceback
 import pickle
 import hashlib
+import datetime
 
 from collections import Hashable
 from contextlib import contextmanager
@@ -56,7 +57,10 @@ def strftime(date, date_format):
     for candidate in candidates:
         # test for valid C89 directives only
         if candidate[1] in 'aAbBcdfHIjmMpSUwWxXyYzZ%':
-            formatted = date.strftime(candidate)
+            if isinstance(date, SafeDatetime):
+                formatted = date.strftime(candidate, safe=False)
+            else:
+                formatted = date.strftime(candidate)
             # convert Py2 result to unicode
             if not six.PY3 and enc is not None:
                 formatted = formatted.decode(enc)
@@ -68,6 +72,17 @@ def strftime(date, date_format):
     return template % tuple(formatted_candidates)
 
 
+class SafeDatetime(datetime.datetime):
+    '''Subclass of datetime that works with utf-8 format strings on PY2'''
+
+    def strftime(self, fmt, safe=True):
+        '''Uses our custom strftime if supposed to be *safe*'''
+        if safe:
+            return strftime(self, fmt)
+        else:
+            return super(SafeDatetime, self).strftime(fmt)
+
+
 class DateFormatter(object):
     '''A date formatter object used as a jinja filter
 
@@ -183,8 +198,10 @@ def get_date(string):
     If no format matches the given date, raise a ValueError.
     """
     string = re.sub(' +', ' ', string)
+    default = SafeDatetime.now().replace(hour=0, minute=0,
+                                        second=0, microsecond=0)
     try:
-        return dateutil.parser.parse(string)
+        return dateutil.parser.parse(string, default=default)
     except (TypeError, ValueError):
         raise ValueError('{0!r} is not a valid date'.format(string))
 
diff --git a/pelican/writers.py b/pelican/writers.py
index 3e01ee6c..61acdadd 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -151,12 +151,7 @@ class Writer(object):
 
         def _write_file(template, localcontext, output_path, name, override):
             """Render the template write the file."""
-            old_locale = locale.setlocale(locale.LC_ALL)
-            locale.setlocale(locale.LC_ALL, str('C'))
-            try:
-                output = template.render(localcontext)
-            finally:
-                locale.setlocale(locale.LC_ALL, old_locale)
+            output = template.render(localcontext)
             path = os.path.join(output_path, name)
             try:
                 os.makedirs(os.path.dirname(path))
diff --git a/samples/pelican_FR.conf.py b/samples/pelican_FR.conf.py
new file mode 100644
index 00000000..1f6aaaa1
--- /dev/null
+++ b/samples/pelican_FR.conf.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+AUTHOR = 'Alexis Métaireau'
+SITENAME = "Alexis' log"
+SITEURL = 'http://blog.notmyidea.org'
+TIMEZONE = "Europe/Paris"
+
+# can be useful in development, but set to False when you're ready to publish
+RELATIVE_URLS = True
+
+GITHUB_URL = 'http://github.com/ametaireau/'
+DISQUS_SITENAME = "blog-notmyidea"
+PDF_GENERATOR = False
+REVERSE_CATEGORY_ORDER = True
+LOCALE = "fr_FR.UTF-8"
+DEFAULT_PAGINATION = 4
+DEFAULT_DATE = (2012, 3, 2, 14, 1, 1)
+
+ARTICLE_URL = 'posts/{date:%Y}/{date:%B}/{date:%d}/{slug}/'
+ARTICLE_SAVE_AS = ARTICLE_URL + 'index.html'
+
+FEED_ALL_RSS = 'feeds/all.rss.xml'
+CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'
+
+LINKS = (('Biologeek', 'http://biologeek.org'),
+         ('Filyb', "http://filyb.info/"),
+         ('Libert-fr', "http://www.libert-fr.com"),
+         ('N1k0', "http://prendreuncafe.com/blog/"),
+         ('Tarek Ziadé', "http://ziade.org/blog"),
+         ('Zubin Mithra', "http://zubin71.wordpress.com/"),)
+
+SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
+          ('lastfm', 'http://lastfm.com/user/akounet'),
+          ('github', 'http://github.com/ametaireau'),)
+
+# global metadata to all the contents
+DEFAULT_METADATA = (('yeah', 'it is'),)
+
+# path-specific metadata
+EXTRA_PATH_METADATA = {
+    'extra/robots.txt': {'path': 'robots.txt'},
+    }
+
+# static paths will be copied without parsing their contents
+STATIC_PATHS = [
+    'pictures',
+    'extra/robots.txt',
+    ]
+
+# custom page generated with a jinja2 template
+TEMPLATE_PAGES = {'pages/jinja2_template.html': 'jinja2_template.html'}
+
+# code blocks with line numbers
+PYGMENTS_RST_OPTIONS = {'linenos': 'table'}
+
+# foobar will not be used, because it's not in caps. All configuration keys
+# have to be in caps
+foobar = "barbaz"

From 009543b7e476d3bcaca3dd8576a47631c06de1e7 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Thu, 26 Jun 2014 00:51:45 -0400
Subject: [PATCH 1633/2864] Fix test errors on OSX

On OSX, if LC_TIME and LC_CTYPE differs the output of strftime is not properly decoded
in Python 3. This makes sure that the 'utils.DateFormatter' and the related Jinja filter
'strftime' set the same value for LC_TIME and LC_CTYPE while formatting.

Also, '%a' is removed from DEFAULT_DATE_FORMAT in 'custom_locale' tests. OSX and *nix have
different conversions for '%a' ('Jeu' vs 'jeu.') and there is not a feasible way to handle
the difference for tests.
---
 docs/contribute.rst                           |  2 +-
 .../tests/output/custom_locale/archives.html  | 20 +++++++++----------
 .../author/alexis-metaireau.html              |  8 ++++----
 .../author/alexis-metaireau2.html             | 10 +++++-----
 .../author/alexis-metaireau3.html             |  4 ++--
 .../output/custom_locale/category/bar.html    |  2 +-
 .../output/custom_locale/category/cat1.html   |  8 ++++----
 .../output/custom_locale/category/misc.html   |  8 ++++----
 .../output/custom_locale/category/yeah.html   |  4 ++--
 .../custom_locale/drafts/a-draft-article.html |  2 +-
 pelican/tests/output/custom_locale/index.html |  8 ++++----
 .../tests/output/custom_locale/index2.html    | 10 +++++-----
 .../tests/output/custom_locale/index3.html    |  4 ++--
 .../output/custom_locale/oh-yeah-fr.html      |  2 +-
 .../02/this-is-a-super-article/index.html     |  4 ++--
 .../2010/octobre/15/unbelievable/index.html   |  2 +-
 .../posts/2010/octobre/20/oh-yeah/index.html  |  2 +-
 .../20/a-markdown-powered-article/index.html  |  2 +-
 .../2011/février/17/article-1/index.html      |  2 +-
 .../2011/février/17/article-2/index.html      |  2 +-
 .../2011/février/17/article-3/index.html      |  2 +-
 .../2012/février/29/second-article/index.html |  2 +-
 .../30/filename_metadata-example/index.html   |  2 +-
 .../custom_locale/second-article-fr.html      |  2 +-
 .../tests/output/custom_locale/tag/bar.html   |  8 ++++----
 .../tests/output/custom_locale/tag/baz.html   |  2 +-
 .../tests/output/custom_locale/tag/foo.html   |  6 +++---
 .../output/custom_locale/tag/foobar.html      |  4 ++--
 .../tests/output/custom_locale/tag/yeah.html  |  2 +-
 pelican/tests/test_pelican.py                 |  2 +-
 pelican/utils.py                              | 10 ++++++++--
 ...{pelican_FR.conf.py => pelican.conf_FR.py} |  1 +
 32 files changed, 78 insertions(+), 71 deletions(-)
 rename samples/{pelican_FR.conf.py => pelican.conf_FR.py} (98%)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 044ef924..19604da0 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -91,7 +91,7 @@ functional tests. To do so, you can use the following two commands::
     $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/custom/ \
         -s samples/pelican.conf.py samples/content/
     $ LC_ALL=fr_FR.utf8 pelican -o pelican/tests/output/custom_locale/ \
-        -s samples/pelican_FR.conf.py samples/content/
+        -s samples/pelican.conf_FR.py samples/content/
     $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/basic/ \
         samples/content/
 
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index a7b96336..1336b487 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -32,25 +32,25 @@
 <h1>Archives for Alexis' log</h1>
 
 <dl>
-    <dt>ven. 30 novembre 2012</dt>
+    <dt>30 novembre 2012</dt>
     <dd><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></dd>
-    <dt>mer. 29 février 2012</dt>
+    <dt>29 février 2012</dt>
     <dd><a href="./posts/2012/février/29/second-article/">Second article</a></dd>
-    <dt>mer. 20 avril 2011</dt>
+    <dt>20 avril 2011</dt>
     <dd><a href="./posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></dd>
-    <dt>jeu. 17 février 2011</dt>
+    <dt>17 février 2011</dt>
     <dd><a href="./posts/2011/février/17/article-1/">Article 1</a></dd>
-    <dt>jeu. 17 février 2011</dt>
+    <dt>17 février 2011</dt>
     <dd><a href="./posts/2011/février/17/article-2/">Article 2</a></dd>
-    <dt>jeu. 17 février 2011</dt>
+    <dt>17 février 2011</dt>
     <dd><a href="./posts/2011/février/17/article-3/">Article 3</a></dd>
-    <dt>jeu. 02 décembre 2010</dt>
+    <dt>02 décembre 2010</dt>
     <dd><a href="./posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></dd>
-    <dt>mer. 20 octobre 2010</dt>
+    <dt>20 octobre 2010</dt>
     <dd><a href="./posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></dd>
-    <dt>ven. 15 octobre 2010</dt>
+    <dt>15 octobre 2010</dt>
     <dd><a href="./posts/2010/octobre/15/unbelievable/">Unbelievable !</a></dd>
-    <dt>dim. 14 mars 2010</dt>
+    <dt>14 mars 2010</dt>
     <dd><a href="./tag/baz.html">The baz tag</a></dd>
 </dl>
 </section>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index b54446c8..7c2fa448 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Published: ven. 30 novembre 2012
+                Published: 30 novembre 2012
         </abbr>
 
         <address class="vcard author">
@@ -59,7 +59,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -84,7 +84,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Published: mer. 20 avril 2011
+                Published: 20 avril 2011
         </abbr>
 
         <address class="vcard author">
@@ -108,7 +108,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 07020512..9ba313da 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -40,7 +40,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -63,7 +63,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -86,11 +86,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -114,7 +114,7 @@ as well as <strong>inline markup</strong>.</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 9578e3d6..5104b7b0 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -40,7 +40,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Published: ven. 15 octobre 2010
+                Published: 15 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -73,7 +73,7 @@ pelican.conf, it ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Published: dim. 14 mars 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index d9fc6acb..c693d3f5 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 1b09acfe..c332f817 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Published: mer. 20 avril 2011
+                Published: 20 avril 2011
         </abbr>
 
         <address class="vcard author">
@@ -60,7 +60,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -83,7 +83,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -106,7 +106,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index bcaec248..02562525 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Published: ven. 30 novembre 2012
+                Published: 30 novembre 2012
         </abbr>
 
         <address class="vcard author">
@@ -59,7 +59,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -84,7 +84,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Published: ven. 15 octobre 2010
+                Published: 15 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -117,7 +117,7 @@ pelican.conf, it ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Published: dim. 14 mars 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 7f881612..6427095b 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -34,11 +34,11 @@
                     <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 82fb057b..16ff22cd 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
-                Published: ven. 02 mars 2012
+                Published: 02 mars 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index fd9a82b4..5898c5b5 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Published: ven. 30 novembre 2012
+                Published: 30 novembre 2012
         </abbr>
 
         <address class="vcard author">
@@ -59,7 +59,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -84,7 +84,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Published: mer. 20 avril 2011
+                Published: 20 avril 2011
         </abbr>
 
         <address class="vcard author">
@@ -108,7 +108,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index f02ba27c..f1ed6b46 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -40,7 +40,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -63,7 +63,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -86,11 +86,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -114,7 +114,7 @@ as well as <strong>inline markup</strong>.</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 9c7416b6..7f7a905f 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -40,7 +40,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Published: ven. 15 octobre 2010
+                Published: 15 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -73,7 +73,7 @@ pelican.conf, it ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Published: dim. 14 mars 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index cdda855d..72c8b62d 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
-                Published: ven. 02 mars 2012
+                Published: 02 mars 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index ec1007f3..0dd0e3da 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -39,11 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index cb8ccef5..6cdb4bb1 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Published: ven. 15 octobre 2010
+                Published: 15 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index c42bce5d..233df239 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 49cc6078..aa4d254f 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Published: mer. 20 avril 2011
+                Published: 20 avril 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index 8029e585..e9c86a97 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index ca6aaaf3..8724d7c2 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index 4f255f4f..c14b537d 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 46b07717..598bf797 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 0d021cde..66339175 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Published: ven. 30 novembre 2012
+                Published: 30 novembre 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 2798c94b..eb2225d9 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index 8a65a834..a8e3bd7a 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -61,11 +61,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -89,7 +89,7 @@ as well as <strong>inline markup</strong>.</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 52467abb..77e09faf 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Published: dim. 14 mars 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 87cb4ec5..3c238811 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -61,11 +61,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 0e5414b0..e30c4906 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -34,11 +34,11 @@
                     <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index a8fe6f51..6754ecf6 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index cfae594a..bad73569 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -20,7 +20,7 @@ OUTPUT_PATH = os.path.abspath(os.path.join(CURRENT_DIR, 'output'))
 
 INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
 SAMPLE_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf.py")
-SAMPLE_FR_CONFIG = os.path.join(SAMPLES_PATH, "pelican_FR.conf.py")
+SAMPLE_FR_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf_FR.py")
 
 
 def recursiveDiff(dcmp):
diff --git a/pelican/utils.py b/pelican/utils.py
index 586d85ff..5e4822ba 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -94,12 +94,18 @@ class DateFormatter(object):
         self.locale = locale.setlocale(locale.LC_TIME)
 
     def __call__(self, date, date_format):
-        old_locale = locale.setlocale(locale.LC_TIME)
+        old_lc_time = locale.setlocale(locale.LC_TIME)
+        old_lc_ctype = locale.setlocale(locale.LC_CTYPE)
+
         locale.setlocale(locale.LC_TIME, self.locale)
+        # on OSX, encoding from LC_CTYPE determines the unicode output in PY3
+        # make sure it's same as LC_TIME
+        locale.setlocale(locale.LC_CTYPE, self.locale)
 
         formatted = strftime(date, date_format)
 
-        locale.setlocale(locale.LC_TIME, old_locale)
+        locale.setlocale(locale.LC_TIME, old_lc_time)
+        locale.setlocale(locale.LC_CTYPE, old_lc_ctype)
         return formatted
 
 
diff --git a/samples/pelican_FR.conf.py b/samples/pelican.conf_FR.py
similarity index 98%
rename from samples/pelican_FR.conf.py
rename to samples/pelican.conf_FR.py
index 1f6aaaa1..0c4ec60d 100644
--- a/samples/pelican_FR.conf.py
+++ b/samples/pelican.conf_FR.py
@@ -16,6 +16,7 @@ REVERSE_CATEGORY_ORDER = True
 LOCALE = "fr_FR.UTF-8"
 DEFAULT_PAGINATION = 4
 DEFAULT_DATE = (2012, 3, 2, 14, 1, 1)
+DEFAULT_DATE_FORMAT = '%d %B %Y'
 
 ARTICLE_URL = 'posts/{date:%Y}/{date:%B}/{date:%d}/{slug}/'
 ARTICLE_SAVE_AS = ARTICLE_URL + 'index.html'

From ce8574aff4e527b533557feedbb6256937359ede Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 11 Jun 2014 15:58:06 -0400
Subject: [PATCH 1634/2864] Fix HTMLParser related deprecation warnings in
 Py3.4

---
 pelican/readers.py              | 12 ++++++------
 pelican/tools/pelican_import.py |  9 ++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 431e6937..954ea412 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -21,10 +21,7 @@ try:
     from html import escape
 except ImportError:
     from cgi import escape
-try:
-    from html.parser import HTMLParser
-except ImportError:
-    from HTMLParser import HTMLParser
+from six.moves.html_parser import HTMLParser
 
 from pelican import signals
 from pelican.contents import Page, Category, Tag, Author
@@ -43,7 +40,6 @@ METADATA_PROCESSORS = {
 
 logger = logging.getLogger(__name__)
 
-
 class BaseReader(object):
     """Base class to read files.
 
@@ -231,7 +227,11 @@ class HTMLReader(BaseReader):
 
     class _HTMLParser(HTMLParser):
         def __init__(self, settings, filename):
-            HTMLParser.__init__(self)
+            try:
+                # Python 3.4+
+                HTMLParser.__init__(self, convert_charrefs=False)
+            except TypeError:
+                HTMLParser.__init__(self)
             self.body = ''
             self.metadata = {}
             self.settings = settings
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 7c8662c9..a50aa216 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -4,11 +4,10 @@
 from __future__ import unicode_literals, print_function
 import argparse
 try:
-    # py3k import
-    from html.parser import HTMLParser
+    from html import unescape  # py3.4+
 except ImportError:
-    # py2 import
-    from HTMLParser import HTMLParser  # NOQA
+    from six.moves.html_parser import HTMLParser
+    unescape = HTMLParser().unescape
 import os
 import re
 import subprocess
@@ -129,7 +128,7 @@ def wp2fields(xml, wp_custpost=False):
 
             try:
                 # Use HTMLParser due to issues with BeautifulSoup 3
-                title = HTMLParser().unescape(item.title.contents[0])
+                title = unescape(item.title.contents[0])
             except IndexError:
                 title = 'No title [%s]' % item.find('post_name').string
                 logger.warning('Post "%s" is lacking a proper title' % title)

From fc505091c280f2b8d5645c18352dd14c93e13f11 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 11 Jun 2014 16:11:48 -0400
Subject: [PATCH 1635/2864] Patch docutils.io.FileInput to not use "U" mode in
 py3

"U" mode is redundant in py3 since "newline" argument replaces it and by default
universal newlines is enabled. As of py3.4, "U" mode triggers a deprecation warning.
---
 pelican/readers.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 954ea412..101ed8b5 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -10,6 +10,7 @@ import docutils
 import docutils.core
 import docutils.io
 from docutils.writers.html4css1 import HTMLTranslator
+import six
 
 # import the directives to have pygments support
 from pelican import rstdirectives  # NOQA
@@ -118,6 +119,19 @@ class RstReader(BaseReader):
     enabled = bool(docutils)
     file_extensions = ['rst']
 
+    class FileInput(docutils.io.FileInput):
+        """Patch docutils.io.FileInput to remove "U" mode in py3.
+
+        Universal newlines is enabled by default and "U" mode is deprecated
+        in py3.
+
+        """
+
+        def __init__(self, *args, **kwargs):
+            if six.PY3:
+                kwargs['mode'] = kwargs.get('mode', 'r').replace('U', '')
+            docutils.io.FileInput.__init__(self, *args, **kwargs)
+
     def __init__(self, *args, **kwargs):
         super(RstReader, self).__init__(*args, **kwargs)
 
@@ -149,12 +163,14 @@ class RstReader(BaseReader):
         extra_params = {'initial_header_level': '2',
                         'syntax_highlight': 'short',
                         'input_encoding': 'utf-8',
-                        'exit_status_level': 2}
+                        'exit_status_level': 2,
+                        'embed_stylesheet': False}
         user_params = self.settings.get('DOCUTILS_SETTINGS')
         if user_params:
             extra_params.update(user_params)
 
         pub = docutils.core.Publisher(
+            source_class=self.FileInput,
             destination_class=docutils.io.StringOutput)
         pub.set_components('standalone', 'restructuredtext', 'html')
         pub.writer.translator_class = PelicanHTMLTranslator

From 40c9406ca4302b5c60fd8d205aae418b450a0844 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Sun, 25 May 2014 10:06:31 +0200
Subject: [PATCH 1636/2864] Fix test_direct_templates_save_as_false test case

A non-existent asserts_called_count attr was used which would always
succeed, silently hiding the error.
---
 pelican/tests/test_generators.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index dfa9a36b..9305fa6e 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -198,14 +198,14 @@ class TestArticlesGenerator(unittest.TestCase):
 
         settings = get_settings()
         settings['DIRECT_TEMPLATES'] = ['archives']
-        settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
+        settings['ARCHIVES_SAVE_AS'] = False
         settings['CACHE_PATH'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=None, theme=settings['THEME'], output_path=None)
         write = MagicMock()
         generator.generate_direct_templates(write)
-        write.assert_called_count == 0
+        self.assertEqual(write.call_count, 0)
 
     def test_per_article_template(self):
         """

From 7fabd712a1b91eeb9a71f3f4b10d4c979acfe799 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Fri, 27 Jun 2014 20:18:17 +0200
Subject: [PATCH 1637/2864] Generator.get_files backwards compatibility for 1
 path

This should prevent outdated plugins with generators from failing.
Also fixes #1382.
---
 pelican/generators.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index 865cc6f8..7cbce8de 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -119,6 +119,8 @@ class Generator(object):
         :param extensions: the list of allowed extensions (if False, all
             extensions are allowed)
         """
+        if isinstance(paths, six.string_types):
+            paths = [paths] # backward compatibility for older generators
         files = []
         for path in paths:
             root = os.path.join(self.path, path)

From 95e170a15fcb47cdefb3e8e3d72239ce6dc538a7 Mon Sep 17 00:00:00 2001
From: Giulia Vergottini <hello@railslide.io>
Date: Wed, 11 Jun 2014 22:56:32 +0200
Subject: [PATCH 1638/2864] prettify github make commit message

---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 6bfa7b0c..6c1e321e 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -103,7 +103,7 @@ cf_upload: publish
 	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
 
 github: publish
-	ghp-import -b $(GITHUB_PAGES_BRANCH) $$(OUTPUTDIR)
+	ghp-import -m "generate blog content" -b $(GITHUB_PAGES_BRANCH) $$(OUTPUTDIR)
 	git push origin $(GITHUB_PAGES_BRANCH)
 
 .PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github

From 5eaf2aa2bfe2fcc92e7e56b48b5e1cfa868d4be4 Mon Sep 17 00:00:00 2001
From: Giulia Vergottini <hello@railslide.io>
Date: Sun, 29 Jun 2014 17:00:33 +0200
Subject: [PATCH 1639/2864] update make github commit message

---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 6c1e321e..a8ffd6ca 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -103,7 +103,7 @@ cf_upload: publish
 	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
 
 github: publish
-	ghp-import -m "generate blog content" -b $(GITHUB_PAGES_BRANCH) $$(OUTPUTDIR)
+	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $$(OUTPUTDIR)
 	git push origin $(GITHUB_PAGES_BRANCH)
 
 .PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github

From 43523dac4df78604b51339ecbaccfa82313d3281 Mon Sep 17 00:00:00 2001
From: Eli Bendersky <eliben@gmail.com>
Date: Mon, 30 Jun 2014 06:40:19 -0700
Subject: [PATCH 1640/2864] Fix "server didn't start" error message in
 develop_server.sh

It has port 8000 hardcoded into it, which is confusing when the server runs on
another port.
---
 pelican/tools/templates/develop_server.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index 4259af5b..732069c2 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -75,7 +75,7 @@ function start_up(){
     echo "Pelican didn't start. Is the Pelican package installed?"
     return 1
   elif ! alive $$srv_pid ; then
-    echo "The HTTP server didn't start. Is there another service using port 8000?"
+    echo "The HTTP server didn't start. Is there another service using port" $$port "?"
     return 1
   fi
   echo 'Pelican and HTTP server processes now running in background.'

From 2e1b16826b1b933c9f819bca9cbfd5d754bb3c1e Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Mon, 26 May 2014 12:32:05 +0200
Subject: [PATCH 1641/2864] Enhance feedback and contributing guidelines

Many folks ask for help (via IRC or filing GitHub issues) without
sufficient detail and/or without first determining if the answers to
their questions might be better sourced elsewhere. These
documentation changes encourage users to follow certain guidelines
when reaching out for help.
---
 CONTRIBUTING.rst    | 111 +++++++++++++++++++++++++++++++++++++++-----
 README.rst          |  17 ++-----
 docs/contribute.rst |  18 ++-----
 docs/faq.rst        |  11 +----
 docs/index.rst      |  18 ++-----
 5 files changed, 111 insertions(+), 64 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 6063613b..6b1f3b05 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,20 +1,91 @@
-Contribution submission guidelines
-==================================
+Filing issues
+-------------
+
+* Before you file an issue, try `asking for help`_ first.
+* If determined to file an issue, first check for `existing issues`_, including closed issues.
+
+.. _`asking for help`: `How to get help`_
+.. _`existing issues`: https://github.com/getpelican/pelican/issues
+
+How to get help
+---------------
+
+Before you ask for help, please make sure you do the following:
+
+1. Read the documentation_ thoroughly. If in a hurry, at least use the search
+   field that is provided at top-right on the documentation_ pages. Make sure
+   you read the docs for the Pelican version you are using.
+2. Use a search engine (e.g., DuckDuckGo, Google) to search for a solution to
+   your problem. Someone may have already found a solution, perhaps in the
+   form of a plugin_ or a specific combination of settings.
+
+3. Try reproducing the issue in a clean environment, ensuring you are using:
+
+* latest Pelican release (or an up-to-date git clone of Pelican master)
+* latest releases of libraries used by Pelican
+* no plugins or only those related to the issue
+
+If despite the above efforts you still cannot resolve your problem, be sure to
+include in your inquiry the following, preferably in the form of links to
+content uploaded to a `paste service`_, GitHub repository, or other
+publicly-accessible location:
+
+* Describe what version of Pelican you are running (output of ``pelican --version``
+  or the HEAD commit hash if you cloned the repo) and how exactly you installed
+  it (the full command you used, e.g. ``pip install pelican``).
+* If you are looking for a way to get some end result, prepare a detailed
+  description of what the end result should look like (preferably in the form of
+  an image or a mock-up page) and explain in detail what you have done so far to achieve it.
+* If you are trying to solve some issue, prepare a detailed description of how
+  to reproduce the problem. If the issue cannot be easily reproduced, it cannot
+  be debugged by developers or volunteers. Describe only the **minimum steps**
+  necessary to reproduce it (no extra plugins, etc.).
+* Upload your settings file or any other custom code that would enable people to
+  reproduce the problem or to see what you have already tried to achieve the
+  desired end result.
+* Upload detailed and **complete** output logs and backtraces (remember to add
+  the ``--debug`` flag: ``pelican --debug content [...]``)
+
+.. _documentation: http://docs.getpelican.com/
+.. _`paste service`: https://dpaste.de/
+
+Once the above preparation is ready, you can contact people willing to help via
+(preferably) the ``#pelican`` IRC channel or send a message to ``authors at getpelican dot com``.
+Remember to include all the information you prepared.
+
+The #pelican IRC channel
+........................
+
+* Because of differing time zones, you may not get an immediate response to your
+  question, but please be patient and stay logged into IRC — someone will almost
+  always respond if you wait long enough (it may take a few hours).
+* If you don't have an IRC client handy, use the webchat_ for quick feedback.
+* You can direct your IRC client to the channel using this `IRC link`_ or you
+  can manually join the ``#pelican`` IRC channel on the `freenode IRC network`_.
+
+.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
+.. _`IRC link`: irc://irc.freenode.org/pelican
+.. _`freenode IRC network`: http://www.freenode.org/
+
+
+Contributing code
+-----------------
+
+Before you submit a contribution, please ask whether it is desired so that you
+don't spend a lot of time working on something that would be rejected for a
+known reason. Consider also whether your new feature might be better suited as
+a plugin_ — you can `ask for help`_  to make that determination.
+
+Using Git and GitHub
+....................
 
-* Consider whether your new feature might be better suited as a plugin_. Folks
-  are usually available in the `#pelican IRC channel`_ if help is needed to
-  make that determination.
 * `Create a new git branch`_ specific to your change (as opposed to making
   your commits in the master branch).
-* **Don't put multiple fixes/features in the same branch / pull request.**
+* **Don't put multiple unrelated fixes/features in the same branch / pull request.**
   For example, if you're hacking on a new feature and find a bugfix that
   doesn't *require* your new feature, **make a new distinct branch and pull
   request** for the bugfix.
-* Adhere to `PEP8 coding standards`_ whenever possible.
 * Check for unnecessary whitespace via ``git diff --check`` before committing.
-* **Add docs and tests for your changes**.
-* `Run all the tests`_ **on both Python 2.7 and 3.3** to ensure nothing was
-  accidentally broken.
 * First line of your commit message should start with present-tense verb, be 50
   characters or less, and include the relevant issue number(s) if applicable.
   *Example:* ``Ensure proper PLUGIN_PATH behavior. Refs #428.`` If the commit
@@ -32,7 +103,22 @@ Contribution submission guidelines
   `hub pull-request <https://github.com/github/hub/#git-pull-request>`_ to
   turn your GitHub issue into a pull request containing your code.
 
-Check out our `Git Tips`_ page or ask on the `#pelican IRC channel`_ if you
+Contribution quality standards
+..............................
+
+* Adhere to `PEP8 coding standards`_ whenever possible. This can be eased via
+  the `pep8 <http://pypi.python.org/pypi/pep8>`_ or `flake8
+  <http://pypi.python.org/pypi/flake8/>`_ tools, the latter of which in
+  particular will give you some useful hints about ways in which the
+  code/formatting can be improved.
+* Make sure your code is compatible with Python 2.7, 3.3, and 3.4 — see our
+  `compatibility cheatsheet`_ for more details.
+* Add docs and tests for your changes. Undocumented and untested features will
+  not be accepted.
+* `Run all the tests`_ **on all versions of Python supported by Pelican** to
+  ensure nothing was accidentally broken.
+
+Check out our `Git Tips`_ page or `ask for help`_ if you
 need assistance or have any questions about these guidelines.
 
 .. _`plugin`: http://docs.getpelican.com/en/latest/plugins.html
@@ -42,4 +128,5 @@ need assistance or have any questions about these guidelines.
 .. _`Run all the tests`: http://docs.getpelican.com/en/latest/contribute.html#running-the-test-suite
 .. _`Git Tips`: https://github.com/getpelican/pelican/wiki/Git-Tips
 .. _`PEP8 coding standards`: http://www.python.org/dev/peps/pep-0008/
-
+.. _`ask for help`: `How to get help`_
+.. _`compatibility cheatsheet`: http://docs.getpelican.com/en/latest/contribute.html#python-3-development-tips
diff --git a/README.rst b/README.rst
index bf506c5f..f6b5e4e2 100644
--- a/README.rst
+++ b/README.rst
@@ -45,16 +45,10 @@ You can access the source code at: https://github.com/getpelican/pelican
 
 If you feel hackish, have a look at the explanation of `Pelican's internals`_.
 
-Feedback / Contact us
----------------------
+How to get help, contribute, or provide feedback
+------------------------------------------------
 
-If you want to see new features in Pelican, don't hesitate to offer
-suggestions, clone the repository, etc. There are many ways to contribute_.
-That's open source, dude!
-
-Send a message to "authors at getpelican dot com" with any requests/feedback! You
-can also join the team at `#pelican on Freenode`_ (or if you don't have an IRC
-client handy, use the webchat_ for quick feedback.
+See our `contribution submission and feedback guidelines <CONTRIBUTING.rst>`_.
 
 .. Links
 
@@ -62,8 +56,5 @@ client handy, use the webchat_ for quick feedback.
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Markdown: http://daringfireball.net/projects/markdown/
 .. _Jinja2: http://jinja.pocoo.org/
-.. _`Pelican documentation`: http://docs.getpelican.com/latest/
+.. _`Pelican documentation`: http://docs.getpelican.com/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
-.. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
-.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
-.. _contribute: http://docs.getpelican.com/en/latest/contribute.html
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 19604da0..72837593 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -1,13 +1,13 @@
-How to contribute
-#################
+Contributing and Feedback Guidelines
+####################################
 
 There are many ways to contribute to Pelican. You can improve the
 documentation, add missing features, and fix bugs (or just report them). You
 can also help out by reviewing and commenting on
 `existing issues <https://github.com/getpelican/pelican/issues>`_.
 
-Don't hesitate to fork Pelican and submit a pull request on GitHub. When doing
-so, please adhere to the following guidelines.
+Don't hesitate to fork Pelican and submit an issue or pull request on GitHub.
+When doing so, please adhere to the following guidelines.
 
 .. include:: ../CONTRIBUTING.rst
 
@@ -47,16 +47,6 @@ Or using ``pip``::
 
     $ pip install -e .
 
-Coding standards
-================
-
-Try to respect what is described in the `PEP8 specification
-<http://www.python.org/dev/peps/pep-0008/>`_ when making contributions. This
-can be eased via the `pep8 <http://pypi.python.org/pypi/pep8>`_ or `flake8
-<http://pypi.python.org/pypi/flake8/>`_ tools, the latter of which in
-particular will give you some useful hints about ways in which the
-code/formatting can be improved.
-
 Building the docs
 =================
 
diff --git a/docs/faq.rst b/docs/faq.rst
index 3a5cfec5..5a48a107 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -6,16 +6,7 @@ Here are some frequently asked questions about Pelican.
 What's the best way to communicate a problem, question, or suggestion?
 ======================================================================
 
-If you have a problem, question, or suggestion, please start by striking up a
-conversation on `#pelican on Freenode <irc://irc.freenode.net/pelican>`_.
-Those who don't have an IRC client handy can jump in immediately via
-`IRC webchat <http://webchat.freenode.net/?channels=pelican&uio=d4>`_. Because
-of differing time zones, you may not get an immediate response to your
-question, but please be patient and stay logged into IRC — someone will almost
-always respond if you wait long enough (it may take a few hours).
-
-If you're unable to resolve your issue or if you have a feature request, please
-refer to the `issue tracker <https://github.com/getpelican/pelican/issues>`_.
+Please read our :doc:`feedback guidelines <contribute>`.
 
 How can I help?
 ================
diff --git a/docs/index.rst b/docs/index.rst
index 2beb8b20..ccfb9982 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -47,20 +47,10 @@ Source code
 
 You can access the source code at: https://github.com/getpelican/pelican
 
-Feedback / Contact us
----------------------
+How to get help, contribute, or provide feedback
+------------------------------------------------
 
-If you want to see new features in Pelican, don't hesitate to offer suggestions,
-clone the repository, etc. There are many ways to :doc:`contribute<contribute>`.
-That's open source, dude!
-
-Send a message to "authors at getpelican dot com" with any requests/feedback.
-For a more immediate response, you can also join the team via IRC at
-`#pelican on Freenode`_ — if you don't have an IRC client handy, use the
-webchat_ for quick feedback. If you ask a question via IRC and don't get an
-immediate response, don't leave the channel! It may take a few hours because
-of time zone differences, but if you are patient and remain in the channel,
-someone will almost always respond to your inquiry.
+See our :doc:`feedback and contribution submission guidelines <contribute>`.
 
 Documentation
 -------------
@@ -93,5 +83,3 @@ Documentation
 .. _`Pelican documentation`: http://docs.getpelican.com/latest/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
 .. _`Pelican plugins`: https://github.com/getpelican/pelican-plugins
-.. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
-.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4

From b2ccc62582152eda8efeccee9f0e1d2bb78dba5a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 30 Jun 2014 18:42:27 -0700
Subject: [PATCH 1642/2864] Add troubleshooting info to CONTRIBUTING docs

---
 CONTRIBUTING.rst    | 20 ++++++++++++++++----
 docs/contribute.rst |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 6b1f3b05..67357e48 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -2,7 +2,8 @@ Filing issues
 -------------
 
 * Before you file an issue, try `asking for help`_ first.
-* If determined to file an issue, first check for `existing issues`_, including closed issues.
+* If determined to file an issue, first check for `existing issues`_, including
+  closed issues.
 
 .. _`asking for help`: `How to get help`_
 .. _`existing issues`: https://github.com/getpelican/pelican/issues
@@ -25,9 +26,19 @@ Before you ask for help, please make sure you do the following:
 * latest releases of libraries used by Pelican
 * no plugins or only those related to the issue
 
+**NOTE:** The most common sources of problems are anomalies in (1) themes,
+(2) settings files, and (3) ``make``/``fab`` automation wrappers. If you can't
+reproduce your problem when using the following steps to generate your site,
+then the problem is almost certainly with your chosen theme and/or settings
+file (and not Pelican itself)::
+
+    cd ~/projects/your-site
+    git clone https://github.com/getpelican/pelican ~/projects/pelican
+    pelican content -s ~/projects/pelican/samples/pelican.conf.py -t ~/projects/pelican/pelican/themes/notmyidea
+
 If despite the above efforts you still cannot resolve your problem, be sure to
-include in your inquiry the following, preferably in the form of links to
-content uploaded to a `paste service`_, GitHub repository, or other
+include in your inquiry the following information, preferably in the form of
+links to content uploaded to a `paste service`_, GitHub repository, or other
 publicly-accessible location:
 
 * Describe what version of Pelican you are running (output of ``pelican --version``
@@ -35,7 +46,8 @@ publicly-accessible location:
   it (the full command you used, e.g. ``pip install pelican``).
 * If you are looking for a way to get some end result, prepare a detailed
   description of what the end result should look like (preferably in the form of
-  an image or a mock-up page) and explain in detail what you have done so far to achieve it.
+  an image or a mock-up page) and explain in detail what you have done so far to
+  achieve it.
 * If you are trying to solve some issue, prepare a detailed description of how
   to reproduce the problem. If the issue cannot be easily reproduced, it cannot
   be debugged by developers or volunteers. Describe only the **minimum steps**
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 72837593..a3f56e9f 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -1,4 +1,4 @@
-Contributing and Feedback Guidelines
+Contributing and feedback guidelines
 ####################################
 
 There are many ways to contribute to Pelican. You can improve the

From 669bdc92e1a041fa176d59e766ab4c67619dc8c5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 30 Jun 2014 18:48:46 -0700
Subject: [PATCH 1643/2864] Change IRC webchat provider to Kiwi IRC

---
 CONTRIBUTING.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 67357e48..85d30c97 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -75,7 +75,7 @@ The #pelican IRC channel
 * You can direct your IRC client to the channel using this `IRC link`_ or you
   can manually join the ``#pelican`` IRC channel on the `freenode IRC network`_.
 
-.. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
+.. _webchat: https://kiwiirc.com/client/irc.freenode.net/?#pelican
 .. _`IRC link`: irc://irc.freenode.org/pelican
 .. _`freenode IRC network`: http://www.freenode.org/
 

From 975140d352b5dd80d2f0a25048afc097b33af96c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 30 Jun 2014 18:58:14 -0700
Subject: [PATCH 1644/2864] Promote URL settings docs to top-level heading

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 86424ec5..5db687dd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -197,7 +197,7 @@ Setting name (followed by default value, if any)
 
 
 URL settings
-------------
+============
 
 The first thing to understand is that there are currently two supported methods
 for URL formation: *relative* and *absolute*. Relative URLs are useful

From 9af21690270cd1959ab38f33e96f7b2a14ee46d1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 1 Jul 2014 11:55:18 -0700
Subject: [PATCH 1645/2864] Update changelog in preparation for release

---
 docs/changelog.rst | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 68348da5..4e3b6834 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,10 +4,24 @@ Release history
 Next release
 ============
 
-* Added the `:modified:` metadata field to complement `:date:`.
-  Used to specify the last date and time an article was updated independently from the date and time it was published.
-* Produce inline links instead of reference-style links when importing content.
-* Multiple authors support added via new `:authors:` metadata field.
+* Speed up content generation via new caching mechanism
+* Switch Pelican docs to prettier RtD theme
+* Add support for multiple content and plugin paths
+* Add ``:modified:`` metadata field to complement ``:date:``.
+  Used to specify the last date and time an article was updated independently
+  from the date and time it was published.
+* Add support for multiple authors via new ``:authors:`` metadata field
+* Watch for changes in static directories when in auto-regeneration mode
+* Add filters to limit log output when desired
+* Add language support to drafts
+* Add ``SLUGIFY_SOURCE`` setting to control how post slugs are generated
+* Fix many issues relating to locale and encoding
+* Apply Typogrify filter to post summary
+* Preserve file metadata (e.g. time stamps) when copying static files to output
+* Move AsciiDoc support from Pelican core into separate plugin
+* Produce inline links instead of reference-style links when importing content
+* Improve handling of ``IGNORE_FILES`` setting behavior
+* Properly escape symbol characters in tag names (e.g., ``C++``)
 
 3.3.0 (2013-09-24)
 ==================

From c7052a6404cd485b2240c1f0f97b26a32df03200 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 1 Jul 2014 12:16:45 -0700
Subject: [PATCH 1646/2864] Build binary wheels when publishing to PyPI

---
 bumpr.rc             | 2 +-
 dev_requirements.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bumpr.rc b/bumpr.rc
index 969fdb24..97dbad22 100644
--- a/bumpr.rc
+++ b/bumpr.rc
@@ -5,7 +5,7 @@ clean =
     python setup.py clean
     rm -rf *egg-info build dist
 tests = python -m unittest discover
-publish = python setup.py sdist register upload
+publish = python setup.py sdist bdist_wheel register upload
 files = README.rst
 
 [bump]
diff --git a/dev_requirements.txt b/dev_requirements.txt
index 01fe2507..a7c10719 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -9,6 +9,7 @@ typogrify
 
 # To perform release
 bumpr==0.2.0
+wheel
 
 # For docs theme
 sphinx_rtd_theme

From bea40aab8c1e7630d83000f983122c01093c5cd1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 1 Jul 2014 12:24:37 -0700
Subject: [PATCH 1647/2864] Additions to changelog

---
 docs/changelog.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4e3b6834..0b08c428 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,7 +5,8 @@ Next release
 ============
 
 * Speed up content generation via new caching mechanism
-* Switch Pelican docs to prettier RtD theme
+* Add selective post generation (instead of always building entire site)
+* Many documentation improvements, including switching to prettier RtD theme
 * Add support for multiple content and plugin paths
 * Add ``:modified:`` metadata field to complement ``:date:``.
   Used to specify the last date and time an article was updated independently
@@ -22,6 +23,8 @@ Next release
 * Produce inline links instead of reference-style links when importing content
 * Improve handling of ``IGNORE_FILES`` setting behavior
 * Properly escape symbol characters in tag names (e.g., ``C++``)
+* Minor tweaks for Python 3.4 compatibility
+* Add several new signals
 
 3.3.0 (2013-09-24)
 ==================

From 09c07e2950fe3b52e3520a441578622eb135adbc Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 1 Jul 2014 13:08:55 -0700
Subject: [PATCH 1648/2864] Fix SLUGIFY_SOURCE docs

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 5db687dd..d887dcc6 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -173,9 +173,9 @@ Setting name (followed by default value, if any)
 ``PYGMENTS_RST_OPTIONS = []``                                                    A list of default Pygments settings for your reStructuredText
                                                                                  code blocks. See :ref:`internal_pygments_options` for a list of
                                                                                  supported options.
-``SLUGIFY_SOURCE = 'input'``                                                     Specifies where you want the slug to be automatically generated
+``SLUGIFY_SOURCE = 'title'``                                                     Specifies where you want the slug to be automatically generated
                                                                                  from. Can be set to ``title`` to use the 'Title:' metadata tag or
-                                                                                 ``basename`` to use the article's basename when creating the slug.
+                                                                                 ``basename`` to use the article's file name when creating the slug.
 ``CACHE_CONTENT = True``                                                         If ``True``, save content in a cache file.
                                                                                  See :ref:`reading_only_modified_content` for details about caching.
 ``CONTENT_CACHING_LAYER = 'reader'``                                             If set to ``'reader'``, save only the raw content and metadata

From 7e516cb7b0b9840bcf21915da1652f400c963803 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 1 Jul 2014 13:33:24 -0700
Subject: [PATCH 1649/2864] setup.py version should inherit from __init.py__

---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a2bcaeaa..7f95829f 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 from setuptools import setup
+from pelican import __version__
 
 requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',
@@ -21,7 +22,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.3",
+    version=__version__,
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',
@@ -41,6 +42,7 @@ setup(
          'Programming Language :: Python :: 2.7',
          'Programming Language :: Python :: 3',
          'Programming Language :: Python :: 3.3',
+         'Programming Language :: Python :: 3.4',
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Software Development :: Libraries :: Python Modules',
     ],

From a47c0e26c0260ea0a1322cf79dc838d35ddec400 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 1 Jul 2014 13:34:47 -0700
Subject: [PATCH 1650/2864] Bump version 3.4.0

---
 docs/changelog.rst  | 4 ++--
 pelican/__init__.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0b08c428..d8c33cb5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,8 +1,8 @@
 Release history
 ###############
 
-Next release
-============
+3.4.0 (2014-07-01)
+==================
 
 * Speed up content generation via new caching mechanism
 * Add selective post generation (instead of always building entire site)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 082e5a58..f3b18039 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -25,7 +25,7 @@ from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, folder_watcher, file_watcher
 from pelican.writers import Writer
 
-__version__ = "3.3.1.dev"
+__version__ = "3.4.0"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 

From d41331bd69e3f663f4da341599e102ceaf197d77 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 1 Jul 2014 13:48:16 -0700
Subject: [PATCH 1651/2864] Work around setup.py encoding issue in last commit

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 7f95829f..f665a020 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version=__version__,
+    version=str(__version__),
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',

From 9b5261512d10a955ca431fd54321cbc9915877bd Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 1 Jul 2014 14:33:04 -0700
Subject: [PATCH 1652/2864] Revert setup.py changes. Ensure universal wheels.

Attempts at fancy version number handling in setup.py caused more
problems than they were worth, including Travis CI build failures.

The setup.cfg key for universal binary wheel generation apparently
changed at some point, so that was updated as well.
---
 setup.cfg | 2 +-
 setup.py  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 5e409001..2a9acf13 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
-[wheel]
+[bdist_wheel]
 universal = 1
diff --git a/setup.py b/setup.py
index f665a020..c1af72bb 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 from setuptools import setup
-from pelican import __version__
 
 requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',
@@ -22,7 +21,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version=str(__version__),
+    version="3.4.0",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',

From e7eb3b8ec39fea6c62350215fb55fadf167041a5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 1 Jul 2014 16:03:02 -0700
Subject: [PATCH 1653/2864] Increment development version to 3.5.dev

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index f3b18039..43521ff1 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -25,7 +25,7 @@ from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, folder_watcher, file_watcher
 from pelican.writers import Writer
 
-__version__ = "3.4.0"
+__version__ = "3.5.dev"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 

From 2c50ccb764bb67fcaaed641289e9e4c3649f0f91 Mon Sep 17 00:00:00 2001
From: OGINO Masanori <masanori.ogino@gmail.com>
Date: Tue, 10 Jun 2014 09:47:14 +0900
Subject: [PATCH 1654/2864] Add timezone to datetime objects. Refs #962.

Based on https://github.com/getpelican/pelican/pull/977, but it adds
timezone information before formatting.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
---
 pelican/contents.py                           |  9 ++++++-
 .../basic/a-markdown-powered-article.html     |  4 ++--
 pelican/tests/output/basic/archives.html      |  2 +-
 pelican/tests/output/basic/article-1.html     |  4 ++--
 pelican/tests/output/basic/article-2.html     |  4 ++--
 pelican/tests/output/basic/article-3.html     |  4 ++--
 .../output/basic/author/alexis-metaireau.html |  8 +++----
 pelican/tests/output/basic/categories.html    |  2 +-
 pelican/tests/output/basic/category/bar.html  |  2 +-
 pelican/tests/output/basic/category/cat1.html | 10 ++++----
 pelican/tests/output/basic/category/misc.html | 10 ++++----
 pelican/tests/output/basic/category/yeah.html |  4 ++--
 .../basic/feeds/alexis-metaireau.atom.xml     |  6 ++---
 .../basic/feeds/alexis-metaireau.rss.xml      |  6 ++---
 .../tests/output/basic/feeds/all-en.atom.xml  | 22 ++++++++---------
 .../tests/output/basic/feeds/all-fr.atom.xml  |  4 ++--
 pelican/tests/output/basic/feeds/all.atom.xml | 24 +++++++++----------
 pelican/tests/output/basic/feeds/bar.atom.xml |  4 ++--
 .../tests/output/basic/feeds/cat1.atom.xml    | 10 ++++----
 .../tests/output/basic/feeds/misc.atom.xml    | 10 ++++----
 .../tests/output/basic/feeds/yeah.atom.xml    |  4 ++--
 .../basic/filename_metadata-example.html      |  4 ++--
 pelican/tests/output/basic/index.html         | 24 +++++++++----------
 pelican/tests/output/basic/oh-yeah.html       |  4 ++--
 .../tests/output/basic/override/index.html    |  2 +-
 .../pages/this-is-a-test-hidden-page.html     |  2 +-
 .../basic/pages/this-is-a-test-page.html      |  2 +-
 .../tests/output/basic/second-article-fr.html |  4 ++--
 .../tests/output/basic/second-article.html    |  4 ++--
 pelican/tests/output/basic/tag/bar.html       | 10 ++++----
 pelican/tests/output/basic/tag/baz.html       |  4 ++--
 pelican/tests/output/basic/tag/foo.html       |  8 +++----
 pelican/tests/output/basic/tag/foobar.html    |  4 ++--
 pelican/tests/output/basic/tag/yeah.html      |  2 +-
 .../output/basic/this-is-a-super-article.html |  6 ++---
 pelican/tests/output/basic/unbelievable.html  |  4 ++--
 .../custom/a-markdown-powered-article.html    |  4 ++--
 pelican/tests/output/custom/article-1.html    |  4 ++--
 pelican/tests/output/custom/article-2.html    |  4 ++--
 pelican/tests/output/custom/article-3.html    |  4 ++--
 .../custom/author/alexis-metaireau.html       | 10 ++++----
 .../custom/author/alexis-metaireau2.html      | 12 +++++-----
 .../custom/author/alexis-metaireau3.html      |  4 ++--
 pelican/tests/output/custom/category/bar.html |  2 +-
 .../tests/output/custom/category/cat1.html    |  8 +++----
 .../tests/output/custom/category/misc.html    |  8 +++----
 .../tests/output/custom/category/yeah.html    |  4 ++--
 .../output/custom/drafts/a-draft-article.html |  2 +-
 .../custom/filename_metadata-example.html     |  2 +-
 pelican/tests/output/custom/index.html        |  8 +++----
 pelican/tests/output/custom/index2.html       | 12 +++++-----
 pelican/tests/output/custom/index3.html       |  4 ++--
 pelican/tests/output/custom/oh-yeah-fr.html   |  2 +-
 pelican/tests/output/custom/oh-yeah.html      |  2 +-
 .../output/custom/second-article-fr.html      |  2 +-
 .../tests/output/custom/second-article.html   |  2 +-
 pelican/tests/output/custom/tag/bar.html      | 10 ++++----
 pelican/tests/output/custom/tag/baz.html      |  2 +-
 pelican/tests/output/custom/tag/foo.html      |  8 +++----
 pelican/tests/output/custom/tag/foobar.html   |  4 ++--
 pelican/tests/output/custom/tag/yeah.html     |  2 +-
 .../custom/this-is-a-super-article.html       |  6 ++---
 pelican/tests/output/custom/unbelievable.html |  2 +-
 .../author/alexis-metaireau.html              |  8 +++----
 .../author/alexis-metaireau2.html             | 12 +++++-----
 .../author/alexis-metaireau3.html             |  4 ++--
 .../output/custom_locale/category/bar.html    |  2 +-
 .../output/custom_locale/category/cat1.html   |  8 +++----
 .../output/custom_locale/category/misc.html   |  8 +++----
 .../output/custom_locale/category/yeah.html   |  6 ++---
 .../custom_locale/drafts/a-draft-article.html |  2 +-
 pelican/tests/output/custom_locale/index.html |  8 +++----
 .../tests/output/custom_locale/index2.html    | 12 +++++-----
 .../tests/output/custom_locale/index3.html    |  4 ++--
 .../output/custom_locale/oh-yeah-fr.html      |  2 +-
 .../02/this-is-a-super-article/index.html     |  6 ++---
 .../2010/octobre/15/unbelievable/index.html   |  2 +-
 .../posts/2010/octobre/20/oh-yeah/index.html  |  2 +-
 .../20/a-markdown-powered-article/index.html  |  2 +-
 .../2011/février/17/article-1/index.html      |  2 +-
 .../2011/février/17/article-2/index.html      |  2 +-
 .../2011/février/17/article-3/index.html      |  2 +-
 .../2012/février/29/second-article/index.html |  2 +-
 .../30/filename_metadata-example/index.html   |  2 +-
 .../custom_locale/second-article-fr.html      |  2 +-
 .../tests/output/custom_locale/tag/bar.html   | 10 ++++----
 .../tests/output/custom_locale/tag/baz.html   |  2 +-
 .../tests/output/custom_locale/tag/foo.html   |  8 +++----
 .../output/custom_locale/tag/foobar.html      |  6 ++---
 .../tests/output/custom_locale/tag/yeah.html  |  2 +-
 pelican/tests/test_utils.py                   |  3 +++
 pelican/utils.py                              |  4 +++-
 92 files changed, 259 insertions(+), 247 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 297a537b..7a9a8bc0 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -16,7 +16,7 @@ from pelican import signals
 from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import (slugify, truncate_html_words, memoized, strftime,
                            python_2_unicode_compatible, deprecated_attribute,
-                           path_to_url, SafeDatetime)
+                           path_to_url, set_date_tzinfo, SafeDatetime)
 
 # Import these so that they're avalaible when you import from pelican.contents.
 from pelican.urlwrappers import (URLWrapper, Author, Category, Tag)  # NOQA
@@ -117,9 +117,16 @@ class Content(object):
             locale.setlocale(locale.LC_ALL, locale_string)
             self.date_format = self.date_format[1]
 
+        # manage timezone
+        default_timezone = settings.get('TIMEZONE', 'UTC')
+        timezone = getattr(self, 'timezone', default_timezone)
+
         if hasattr(self, 'date'):
+            self.date = set_date_tzinfo(self.date, timezone)
             self.locale_date = strftime(self.date, self.date_format)
+
         if hasattr(self, 'modified'):
+            self.modified = set_date_tzinfo(self.modified, timezone)
             self.locale_modified = strftime(self.modified, self.date_format)
 
         # manage status
diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 40c96766..5fcc42a9 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+00:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -66,4 +66,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index e32c92ba..f8f1a67f 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -69,4 +69,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 15a1496d..4ea7f4e3 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index c4b09e35..45130e55 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 1c07e5e2..8603430f 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index d1dc6da6..11d54185 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -29,11 +29,11 @@
                 <article>
                     <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -69,7 +69,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -109,4 +109,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index fa2fc012..55e955c8 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -49,4 +49,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 763cfe77..18e434cb 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index b1e34e3e..f99eb497 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+00:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -52,7 +52,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -72,7 +72,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -92,7 +92,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -124,4 +124,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index d53b1f31..fc724edb 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+00:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -51,7 +51,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -73,7 +73,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+00:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -103,7 +103,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+00:00">
                 Published: Sun 14 March 2010
         </abbr>
 
@@ -135,4 +135,4 @@ pelican.conf, it ...</p></div>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 225eae6e..7fe75a86 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -29,11 +29,11 @@
                 <article>
                     <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index d87023b5..f9a2e6e1 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,10 +11,10 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index 09409217..511ffa0e 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>A Pelican Blog</title><link>/</link><description></description><atom:link href="/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 -0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>A Pelican Blog</title><link>/</link><description></description><atom:link href="/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,10 +11,10 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 -0000</pubDate><guid>tag:,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0000</pubDate><guid>tag:,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 -0000</pubDate><guid>tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid>tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 128e1b3b..3ce41d77 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index 98b9a681..54056df6 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00Z</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 3cf2d197..3a9478a4 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -19,13 +19,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -58,5 +58,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index 2c988122..d1c678ae 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00Z</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index 2fa534aa..a3c35956 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00Z</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00Z</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00Z</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index 8b988614..a9b5977b 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00Z</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00Z</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00Z</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00Z</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00Z</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 2c42ec39..0df396a2 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00Z</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00Z</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 80e39129..638c65dd 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+00:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index ffc476f4..f3814b00 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+00:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -51,7 +51,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -73,7 +73,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+00:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -94,7 +94,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -114,7 +114,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -134,7 +134,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+00:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -154,11 +154,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -182,7 +182,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -210,7 +210,7 @@ YEAH !</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+00:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -240,7 +240,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+00:00">
                 Published: Sun 14 March 2010
         </abbr>
 
@@ -272,4 +272,4 @@ pelican.conf, it ...</p></div>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 3265402d..76be69fe 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -73,4 +73,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 30cd50e0..ed9fa92a 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -50,4 +50,4 @@ at a custom location.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 6da5d3c1..ac31987a 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -50,4 +50,4 @@ Anyone can see this page but it's not linked to anywhere!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index b0932c5d..43e5f72e 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -50,4 +50,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 01ed70f2..551027da 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -67,4 +67,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index ddb379d6..ed350752 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -67,4 +67,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index d983f3dc..5331767b 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -53,11 +53,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -81,7 +81,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -121,4 +121,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index a6cc9e9b..dc26d8e1 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+00:00">
                 Published: Sun 14 March 2010
         </abbr>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 4bebd99d..aed3ad17 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+00:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -53,11 +53,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -93,4 +93,4 @@ as well as <strong>inline markup</strong>.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index f3035f8e..540cde25 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -29,11 +29,11 @@
                 <article>
                     <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index cd9d01b2..b8da2bc6 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -29,7 +29,7 @@
                 <article>
                     <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
                 Published: Wed 20 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index deeb27a1..cf957ebf 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -34,11 +34,11 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+00:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -83,4 +83,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index f9f38a79..b9b52031 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -34,7 +34,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+00:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -97,4 +97,4 @@ pelican.conf, it will have nothing in default.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 5b2aca1c..577d61b8 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -112,4 +112,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 4319026f..dea09247 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -111,4 +111,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 9b00fde2..8d8ad1b3 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -111,4 +111,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 4bbd0819..7539e0f9 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -111,4 +111,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index cb975d3a..cb6d93a9 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -107,7 +107,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -170,4 +170,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 8d67a25c..abf5bdbb 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -62,7 +62,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -85,11 +85,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -113,7 +113,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 8df03fc6..30aa3eff 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -72,7 +72,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: Sun 14 March 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 80c46de5..9ab46a2e 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index c6bcafca..76075edf 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -59,7 +59,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -82,7 +82,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -105,7 +105,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index ccb7d949..3a470b7e 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -116,7 +116,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: Sun 14 March 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 11fd181d..a632664f 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -33,11 +33,11 @@
                 <article>
                     <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 57eea18c..15a3f1db 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
+        <abbr class="published" title="2012-03-02T14:01:01+01:00">
                 Published: Fri 02 March 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 5d22e0eb..047f12af 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: Fri 30 November 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index c46e8739..c375b208 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: Fri 30 November 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: Wed 20 April 2011
         </abbr>
 
@@ -107,7 +107,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 3cc5623f..1f2479d6 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -62,7 +62,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: Thu 17 February 2011
         </abbr>
 
@@ -85,11 +85,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -113,7 +113,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index e08af17e..e7e4f34a 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: Fri 15 October 2010
         </abbr>
 
@@ -72,7 +72,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: Sun 14 March 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 39f68495..fa02ac2b 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
+        <abbr class="published" title="2012-03-02T14:01:01+01:00">
                 Published: Fri 02 March 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 5ad40219..6d108cf2 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index a70748b0..6c537609 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index b3ae9584..30179205 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 1b7b21c5..28cbbe75 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -60,11 +60,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -88,7 +88,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
@@ -157,4 +157,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 8609a6f7..06f3c301 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: Sun 14 March 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index e5c58b36..ba3c843e 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: Wed 29 February 2012
         </abbr>
 
@@ -60,11 +60,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -127,4 +127,4 @@ as well as <strong>inline markup</strong>.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index c224992e..dc51889a 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -33,11 +33,11 @@
                 <article>
                     <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 49c78359..3b09c6c5 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: Wed 20 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 757627c4..34ab434e 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -38,11 +38,11 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: Thu 02 December 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: Sun 17 November 2013
         </abbr>
 
@@ -126,4 +126,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 71416a97..395cd1b6 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: Fri 15 October 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 7c2fa448..1882015e 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: 30 novembre 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: 20 avril 2011
         </abbr>
 
@@ -107,7 +107,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 9ba313da..d1b50107 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -62,7 +62,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -85,11 +85,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -113,7 +113,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 5104b7b0..333ef320 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: 15 octobre 2010
         </abbr>
 
@@ -72,7 +72,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: 14 mars 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index c693d3f5..fc11f06e 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index c332f817..e1556d9e 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: 20 avril 2011
         </abbr>
 
@@ -59,7 +59,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -82,7 +82,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -105,7 +105,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 02562525..3ff2f8e4 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: 30 novembre 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: 15 octobre 2010
         </abbr>
 
@@ -116,7 +116,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: 14 mars 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 6427095b..7ee2bbe9 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -33,11 +33,11 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -106,4 +106,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 16ff22cd..a33e6797 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
+        <abbr class="published" title="2012-03-02T14:01:01+01:00">
                 Published: 02 mars 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 5898c5b5..d64bea7d 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: 30 novembre 2012
         </abbr>
 
@@ -58,7 +58,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
@@ -83,7 +83,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: 20 avril 2011
         </abbr>
 
@@ -107,7 +107,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index f1ed6b46..3b3d2d52 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -62,7 +62,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
@@ -85,11 +85,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -113,7 +113,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 7f7a905f..96d70261 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -39,7 +39,7 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: 15 octobre 2010
         </abbr>
 
@@ -72,7 +72,7 @@ pelican.conf, it ...</p></div>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: 14 mars 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 72c8b62d..77d9e2c5 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01">
+        <abbr class="published" title="2012-03-02T14:01:01+01:00">
                 Published: 02 mars 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index 0dd0e3da..b2ffdf9c 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -38,11 +38,11 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -126,4 +126,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 6cdb4bb1..d7449ebf 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00">
+        <abbr class="published" title="2010-10-15T20:30:00+02:00">
                 Published: 15 octobre 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index 233df239..12c67404 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index aa4d254f..81bb6fa6 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00">
+        <abbr class="published" title="2011-04-20T00:00:00+02:00">
                 Published: 20 avril 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index e9c86a97..8aa9de4a 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index 8724d7c2..1d78ade5 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index c14b537d..372090cc 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00">
+        <abbr class="published" title="2011-02-17T00:00:00+01:00">
                 Published: 17 février 2011
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 598bf797..812fdfd0 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 66339175..de426279 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00">
+        <abbr class="published" title="2012-11-30T00:00:00+01:00">
                 Published: 30 novembre 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index eb2225d9..07a2a09c 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index a8e3bd7a..911f53af 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
@@ -60,11 +60,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -88,7 +88,7 @@ as well as <strong>inline markup</strong>.</p>
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
@@ -157,4 +157,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 77e09faf..1cea44d1 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00">
+        <abbr class="published" title="2010-03-14T00:00:00+01:00">
                 Published: 14 mars 2010
         </abbr>
 
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 3c238811..01bb8b17 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00">
+        <abbr class="published" title="2012-02-29T00:00:00+01:00">
                 Published: 29 février 2012
         </abbr>
 
@@ -60,11 +60,11 @@
 
                 <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -127,4 +127,4 @@ as well as <strong>inline markup</strong>.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index e30c4906..85b2b0ed 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -33,11 +33,11 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00">
+        <abbr class="published" title="2010-12-02T10:14:00+01:00">
                 Published: 02 décembre 2010
         </abbr>
 		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00">
+        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
                 Updated: 17 novembre 2013
         </abbr>
 
@@ -106,4 +106,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 6754ecf6..45789e86 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -33,7 +33,7 @@
                 <article>
                     <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00">
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
                 Published: 20 octobre 2010
         </abbr>
 
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index df1918b5..d77b367b 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -263,6 +263,9 @@ class TestUtils(LoggedTestCase):
         self.assertEqual(utils.strftime(d, '%d/%m/%y'), '29/08/12')
         self.assertEqual(utils.strftime(d, '%d/%m/%Y'), '29/08/2012')
 
+        # RFC 3339
+        self.assertEqual(utils.strftime(d, '%Y-%m-%dT%H:%M:%SZ'),'2012-08-29T00:00:00Z')
+
         # % escaped
         self.assertEqual(utils.strftime(d, '%d%%%m%%%y'), '29%08%12')
         self.assertEqual(utils.strftime(d, '%d %% %m %% %y'), '29 % 08 % 12')
diff --git a/pelican/utils.py b/pelican/utils.py
index 5e4822ba..31ab5489 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -538,7 +538,9 @@ def set_date_tzinfo(d, tz_name=None):
     """Set the timezone for dates that don't have tzinfo"""
     if tz_name and not d.tzinfo:
         tz = pytz.timezone(tz_name)
-        return tz.localize(d)
+        d = tz.localize(d)
+        return SafeDatetime(d.year, d.month, d.day, d.hour, d.minute, d.second,
+                            d.microsecond, d.tzinfo)
     return d
 
 

From d35348830afc3d33618f91dfcd6175af2f82fad4 Mon Sep 17 00:00:00 2001
From: Artemy Tregubenko <me@arty.name>
Date: Sun, 6 Jul 2014 23:20:19 +0200
Subject: [PATCH 1655/2864] removed extra backtick in settings documentation

``SLUG_SUBSTITUTIONS` = ()`` becomes ``SLUG_SUBSTITUTIONS = ()``
---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d887dcc6..df2fa722 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -293,7 +293,7 @@ Setting name (followed by default value, if any)        What does it do?
 ``YEAR_ARCHIVE_SAVE_AS = ''``                           The location to save per-year archives of your posts.
 ``MONTH_ARCHIVE_SAVE_AS = ''``                          The location to save per-month archives of your posts.
 ``DAY_ARCHIVE_SAVE_AS = ''``                            The location to save per-day archives of your posts.
-``SLUG_SUBSTITUTIONS` = ()``                            Substitutions to make prior to stripping out
+``SLUG_SUBSTITUTIONS = ()``                             Substitutions to make prior to stripping out
                                                         non-alphanumerics when generating slugs. Specified
                                                         as a list of 2-tuples of ``(from, to)`` which are
                                                         applied in order.

From af0899ae2a3b84cf240a96591ebe0e5d360416ca Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Mon, 16 Jun 2014 16:02:11 +0200
Subject: [PATCH 1656/2864] Fixes wrongly generated relative urls for
 pagination.

When `RELATIVE_URLS` is `True` and the `PAGINATION_PATTERNS` adds folder to the path, the relative urls to these pages does not respect these additional folders.

Example:
	Settings:
			RELATIVE_URLS = True
			PAGINATION_PATTERNS = (
					(1, '{base_name}/', '{base_name}/index.html'),
					(2, '{base_name}/page/{number}/', '{base_name}/page/{number}/index.html'),)

	Theme:
			<link href="{{ SITEURL }}/theme/css/style.css" rel="stylesheet">

If you are on page 2 then "{{ SITEURL }}/theme/css/style.css" expands to "./theme/css/style.css" instead of "./../../theme/css/style.css".

Fix:
Simply compute the relative url from the paginated url instead of the not paginated one.
---
 pelican/writers.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 61acdadd..ad6e652b 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -151,6 +151,9 @@ class Writer(object):
 
         def _write_file(template, localcontext, output_path, name, override):
             """Render the template write the file."""
+            # set localsiteurl for context so that Contents can adjust links
+            if localcontext['localsiteurl']:
+                context['localsiteurl'] = localcontext['localsiteurl']
             output = template.render(localcontext)
             path = os.path.join(output_path, name)
             try:
@@ -166,14 +169,16 @@ class Writer(object):
             # local context.
             signals.content_written.send(path, context=localcontext)
 
-        localcontext = context.copy()
-        if relative_urls:
-            relative_url = path_to_url(get_relative_path(name))
-            context['localsiteurl'] = relative_url
-            localcontext['SITEURL'] = relative_url
-
-        localcontext['output_file'] = name
-        localcontext.update(kwargs)
+        def _get_localcontext(context, name, kwargs, relative_urls):
+            localcontext = context.copy()
+            localcontext['localsiteurl'] = localcontext.get('localsiteurl', None)
+            if relative_urls:
+                relative_url = path_to_url(get_relative_path(name))
+                localcontext['SITEURL'] = relative_url
+                localcontext['localsiteurl'] = relative_url
+            localcontext['output_file'] = name
+            localcontext.update(kwargs)
+            return localcontext
 
         # pagination
         if paginated:
@@ -184,7 +189,7 @@ class Writer(object):
 
             # generated pages, and write
             for page_num in range(list(paginators.values())[0].num_pages):
-                paginated_localcontext = localcontext.copy()
+                paginated_kwargs = kwargs.copy()
                 for key in paginators.keys():
                     paginator = paginators[key]
                     previous_page = paginator.page(page_num) \
@@ -192,15 +197,17 @@ class Writer(object):
                     page = paginator.page(page_num + 1)
                     next_page = paginator.page(page_num + 2) \
                         if page_num + 1 < paginator.num_pages else None
-                    paginated_localcontext.update(
+                    paginated_kwargs.update(
                         {'%s_paginator' % key: paginator,
                          '%s_page' % key: page,
                          '%s_previous_page' % key: previous_page,
                          '%s_next_page' % key: next_page})
 
-                _write_file(template, paginated_localcontext, self.output_path,
+                localcontext = _get_localcontext(context, page.save_as, paginated_kwargs, relative_urls)
+                _write_file(template, localcontext, self.output_path,
                             page.save_as, override_output)
         else:
             # no pagination
+            localcontext = _get_localcontext(context, name, kwargs, relative_urls)
             _write_file(template, localcontext, self.output_path, name,
                         override_output)

From 00434d4bb63b17e71bd147527a93bccb7471c500 Mon Sep 17 00:00:00 2001
From: Daan Debie <debie.daan@gmail.com>
Date: Mon, 21 Apr 2014 17:29:01 +0200
Subject: [PATCH 1657/2864] Reader name now accessible for articles and pages

---
 pelican/readers.py            | 2 ++
 pelican/tests/test_readers.py | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index 274f077e..5545c607 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -440,6 +440,8 @@ class Readers(FileStampDataCacher):
         metadata.update(parse_path_metadata(
             source_path=source_path, settings=self.settings,
             process=reader.process_metadata))
+        reader_name = reader.__class__.__name__
+        metadata['reader'] = reader_name.replace('Reader', '').lower()
 
         content, reader_metadata = self.get_cached_data(path, (None, None))
         if content is None:
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index d853587f..2ec72a94 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -59,6 +59,7 @@ class RstReaderTest(ReaderTest):
             'category': 'yeah',
             'author': 'Alexis Métaireau',
             'title': 'Rst with filename metadata',
+            'reader': 'rst',
         }
         for key, value in page.metadata.items():
             self.assertEqual(value, expected[key], key)
@@ -71,6 +72,7 @@ class RstReaderTest(ReaderTest):
             'author': 'Alexis Métaireau',
             'title': 'Rst with filename metadata',
             'date': SafeDatetime(2012, 11, 29),
+            'reader': 'rst',
         }
         for key, value in page.metadata.items():
             self.assertEqual(value, expected[key], key)
@@ -88,6 +90,7 @@ class RstReaderTest(ReaderTest):
             'date': SafeDatetime(2012, 11, 29),
             'slug': 'article_with_filename_metadata',
             'mymeta': 'foo',
+            'reader': 'rst',
         }
         for key, value in page.metadata.items():
             self.assertEqual(value, expected[key], key)

From 7c3cc8fc0d26ab8d6f3aa177c03108e0737bb4e0 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 15 Jul 2014 18:15:03 -0400
Subject: [PATCH 1658/2864] Fixes #1395: extends pelican.utils.strftime with
 `-` prefix to strip leading zeros

Adds the ability to use `-` prefix with C89 format codes to strip any
leading zeros.
---
 docs/settings.rst           | 10 +++++++---
 pelican/tests/test_utils.py |  7 +++++++
 pelican/utils.py            | 21 +++++++++++++++++++--
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index df2fa722..71d23ab2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -342,8 +342,12 @@ Date format and locale
 If no ``DATE_FORMATS`` are set, Pelican will fall back to
 ``DEFAULT_DATE_FORMAT``. If you need to maintain multiple languages with
 different date formats, you can set the ``DATE_FORMATS`` dictionary using the
-language name (``lang`` metadata in your post content) as the key. Regarding
-available format codes, see `strftime document of python`_ :
+language name (``lang`` metadata in your post content) as the key. 
+
+In addition to the standard C89 strftime format codes that are listed in
+`Python strftime documentation`_, you can use ``-`` character between ``%`` and
+the format character to remove any leading zeros. For example, ``%d/%m/%Y`` will
+output ``01/01/2014`` whereas ``%-d/%-m/%Y`` will result in ``1/1/2014``.
 
 .. parsed-literal::
 
@@ -382,7 +386,7 @@ can get a list of available locales via the ``locale -a`` command; see manpage
 `locale(1)`_ for more information.
 
 
-.. _strftime document of python: http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+.. _Python strftime documentation: http://docs.python.org/library/datetime.html#strftime-strptime-behavior
 
 .. _locales on Windows: http://msdn.microsoft.com/en-us/library/cdax410z%28VS.71%29.aspx
 
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index df1918b5..7e770e65 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -280,6 +280,13 @@ class TestUtils(LoggedTestCase):
         self.assertEqual(utils.strftime(d, '%d/%m/%Y Øl trinken beim Besäufnis'),
                          '29/08/2012 Øl trinken beim Besäufnis')
 
+        # alternative formatting options
+        self.assertEqual(utils.strftime(d, '%-d/%-m/%y'), '29/8/12')
+        self.assertEqual(utils.strftime(d, '%-H:%-M:%-S'), '0:0:0')
+
+        d = utils.SafeDatetime(2012, 8, 9)
+        self.assertEqual(utils.strftime(d, '%-d/%-m/%y'), '9/8/12')
+
 
     # test the output of utils.strftime in a different locale
     # Turkish locale
diff --git a/pelican/utils.py b/pelican/utils.py
index 5e4822ba..96a0ab93 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -42,8 +42,11 @@ def strftime(date, date_format):
     replacing formatted output back.
     '''
 
+    c89_directives = 'aAbBcdfHIjmMpSUwWxXyYzZ%'
+    strip_zeros = lambda x: x.lstrip('0') or '0'
+
     # grab candidate format options
-    format_options = '%.'
+    format_options = '%[-]?.'
     candidates = re.findall(format_options, date_format)
 
     # replace candidates with placeholders for later % formatting
@@ -56,14 +59,28 @@ def strftime(date, date_format):
     formatted_candidates = []
     for candidate in candidates:
         # test for valid C89 directives only
-        if candidate[1] in 'aAbBcdfHIjmMpSUwWxXyYzZ%':
+        if candidate[-1] in c89_directives:
+            # check for '-' prefix
+            if len(candidate) == 3:
+                # '-' prefix
+                candidate = '%{}'.format(candidate[-1])
+                conversion = strip_zeros
+            else:
+                conversion = None
+
+            # format date
             if isinstance(date, SafeDatetime):
                 formatted = date.strftime(candidate, safe=False)
             else:
                 formatted = date.strftime(candidate)
+
             # convert Py2 result to unicode
             if not six.PY3 and enc is not None:
                 formatted = formatted.decode(enc)
+
+            # strip zeros if '-' prefix is used
+            if conversion:
+                formatted = conversion(formatted)
         else:
             formatted = candidate
         formatted_candidates.append(formatted)

From ed3209888abd27cf03a1aa6fb2513ee4dcbb6f32 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 22 Jul 2014 11:48:15 -0400
Subject: [PATCH 1659/2864] Refactor logging handling

Old system was using manual string formatting for log messages.
This caused issues with common operations like exception logging
because often they need to be handled differently for Py2/Py3
compatibility. In order to unify the effort:

 - All logging is changed to `logging.level(msg, arg1, arg2)` style.
 - A `SafeLogger` is implemented to auto-decode exceptions properly
in the args (ref #1403).
 - Custom formatters were overriding useful logging functionality
like traceback outputing (ref #1402). They are refactored to be
more transparent. Traceback information is provided in `--debug`
mode for `read_file` errors in generators.
 - Formatters will now auto-format multiline log messages in order
to make them look related. Similarly, traceback will be formatted in
the same fashion.
 - `pelican.log.LimitFilter` was (ab)using logging message which
would result in awkward syntax for argumented logging style. This
functionality is moved to `extra` keyword argument.
 - Levels for errors that would result skipping a file (`read_file`)
changed from `warning` to `error` in order to make them stand out
among other logs.
 - Small consistency changes to log messages (i.e. changing all
to start with an uppercase letter) and quality-of-life improvements
(some log messages were dumping raw object information).
---
 docs/contribute.rst             |  55 ++++++++---
 pelican/__init__.py             |  29 +++---
 pelican/contents.py             |  12 +--
 pelican/generators.py           |  29 +++---
 pelican/log.py                  | 164 +++++++++++++++++++++-----------
 pelican/paginator.py            |   2 +-
 pelican/readers.py              |  41 ++++----
 pelican/server.py               |  10 +-
 pelican/settings.py             |  20 ++--
 pelican/tests/test_pelican.py   |   2 +-
 pelican/tools/pelican_import.py |  27 ++----
 pelican/urlwrappers.py          |   2 +-
 pelican/utils.py                |  65 +++++++------
 pelican/writers.py              |   8 +-
 14 files changed, 271 insertions(+), 195 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index a3f56e9f..7c117d26 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -142,34 +142,65 @@ Logging tips
 
 Try to use logging with appropriate levels.
 
-For logging messages that are not repeated, use the usual Python way:
+For logging messages that are not repeated, use the usual Python way::
 
     # at top of file
     import logging
     logger = logging.getLogger(__name__)
 
     # when needed
-    logger.warning("A warning that would usually occur only once")
+    logger.warning("A warning with %s formatting", arg_to_be_formatted)
 
-However, if you want to log messages that may occur several times, instead of
-a string, give a tuple to the logging method, with two arguments:
+Do not format log messages yourself. Use ``%s`` formatting in messages and pass
+arguments to logger. This is important, because Pelican logger will preprocess
+some arguments (like Exceptions) for Py2/Py3 compatibility.
 
- 1. The message to log for the initial execution
- 2. A generic message that will appear if the previous one would occur too many
-    times.
+Limiting extraneous log messages
+--------------------------------
 
-For example, if you want to log missing resources, use the following code:
+If the log message can occur several times, you may want to limit the log to
+prevent flooding. In order to do that, use the ``extra`` keyword argument for
+the logging message in the following format::
+
+    logger.warning("A warning with %s formatting", arg_to_be_formatted,
+        extra={'limit_msg': 'A generic message for too many warnings'})
+
+Optionally, you can also set ``'limit_args'`` as a tuple of arguments in
+``extra`` dict if your generic message needs formatting.
+
+Limit is set to ``5``, i.e, first four logs with the same ``'limit_msg'`` are
+outputted normally but the fifth one will be logged using
+``'limit_msg'`` (and ``'limit_args'`` if present). After the fifth,
+corresponding log messages will be ignored.
+
+For example, if you want to log missing resources, use the following code::
 
     for resource in resources:
         if resource.is_missing:
-            logger.warning((
-                'The resource {r} is missing'.format(r=resource.name),
-                'Other resources were missing'))
+            logger.warning(
+                'The resource %s is missing', resource.name,
+                extra={'limit_msg': 'Other resources were missing'})
 
-The log messages will be displayed as follows:
+The log messages will be displayed as follows::
 
     WARNING: The resource prettiest_cat.jpg is missing
     WARNING: The resource best_cat_ever.jpg is missing
     WARNING: The resource cutest_cat.jpg is missing
     WARNING: The resource lolcat.jpg is missing
     WARNING: Other resources were missing
+
+
+Outputting traceback in the logs
+--------------------------------
+
+If you're logging inside an ``except`` block, you may want to provide the
+traceback information as well. You can do that by setting ``exc_info`` keyword
+argument to ``True`` during logging. However, doing so by default can be
+undesired because tracebacks are long and can be confusing to regular users.
+Try to limit them to ``--debug`` mode like the following::
+
+    try:
+        some_action()
+    except Exception as e:
+        logger.error('Exception occured: %s', e,
+            exc_info=settings.get('DEBUG', False))
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 43521ff1..5ac9aa4e 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -70,16 +70,16 @@ class Pelican(object):
         for plugin in self.settings['PLUGINS']:
             # if it's a string, then import it
             if isinstance(plugin, six.string_types):
-                logger.debug("Loading plugin `{0}`".format(plugin))
+                logger.debug("Loading plugin `%s`", plugin)
                 try:
                     plugin = __import__(plugin, globals(), locals(),
                                         str('module'))
                 except ImportError as e:
                     logger.error(
-                        "Can't find plugin `{0}`: {1}".format(plugin, e))
+                        "Cannot load plugin `%s`\n%s", plugin, e)
                     continue
 
-            logger.debug("Registering plugin `{0}`".format(plugin.__name__))
+            logger.debug("Registering plugin `%s`", plugin.__name__)
             plugin.register()
             self.plugins.append(plugin)
         logger.debug('Restoring system path')
@@ -99,7 +99,7 @@ class Pelican(object):
 
             for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
                             'PAGE_LANG_URL'):
-                logger.warning("%s = '%s'" % (setting, self.settings[setting]))
+                logger.warning("%s = '%s'", setting, self.settings[setting])
 
         if self.settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
             logger.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
@@ -124,7 +124,7 @@ class Pelican(object):
                             'PAGE_SAVE_AS', 'PAGE_LANG_SAVE_AS'):
                 self.settings[setting] = os.path.join(structure,
                                                       self.settings[setting])
-                logger.warning("%s = '%s'" % (setting, self.settings[setting]))
+                logger.warning("%s = '%s'", setting, self.settings[setting])
 
         for new, old in [('FEED', 'FEED_ATOM'), ('TAG_FEED', 'TAG_FEED_ATOM'),
                          ('CATEGORY_FEED', 'CATEGORY_FEED_ATOM'),
@@ -203,7 +203,7 @@ class Pelican(object):
 
             for v in value:
                 if isinstance(v, type):
-                    logger.debug('Found generator: {0}'.format(v))
+                    logger.debug('Found generator: %s', v)
                     generators.append(v)
 
         return generators
@@ -217,11 +217,11 @@ class Pelican(object):
         else:
             writer = writers[0]
             if writers_found == 1:
-                logger.debug('Found writer: {}'.format(writer))
+                logger.debug('Found writer: %s', writer)
             else:
                 logger.warning(
-                    '{} writers found, using only first one: {}'.format(
-                    writers_found, writer))
+                    '%s writers found, using only first one: %s', 
+                    writers_found, writer)
             return writer(self.output_path, settings=self.settings)
 
 
@@ -308,6 +308,7 @@ def get_config(args):
         config['CACHE_PATH'] = args.cache_path
     if args.selected_paths:
         config['WRITE_SELECTED'] = args.selected_paths.split(',')
+    config['DEBUG'] = args.verbosity == logging.DEBUG
 
     # argparse returns bytes in Py2. There is no definite answer as to which
     # encoding argparse (or sys.argv) uses.
@@ -404,7 +405,7 @@ def main():
                         logger.critical(e.args)
                         raise
                     logger.warning(
-                        'Caught exception "{0}". Reloading.'.format(e))
+                        'Caught exception "%s". Reloading.', e)
 
                 finally:
                     time.sleep(.5)  # sleep to avoid cpu load
@@ -419,13 +420,7 @@ def main():
             pelican.run()
 
     except Exception as e:
-        # localized systems have errors in native language if locale is set
-        # so convert the message to unicode with the correct encoding
-        msg = str(e)
-        if not six.PY3:
-            msg = msg.decode(locale.getpreferredencoding())
-
-        logger.critical(msg)
+        logger.critical('%s', e)
 
         if args.verbosity == logging.DEBUG:
             raise
diff --git a/pelican/contents.py b/pelican/contents.py
index 297a537b..feaccfbf 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -232,10 +232,11 @@ class Content(object):
                              self._context['filenames'][path].url))
                     origin = origin.replace('\\', '/')  # for Windows paths.
                 else:
-                    logger.warning(("Unable to find {fn}, skipping url"
-                                    " replacement".format(fn=value),
-                                    "Other resources were not found"
-                                    " and their urls not replaced"))
+                    logger.warning(
+                        "Unable to find `%s`, skipping url replacement.",
+                        value.geturl(), extra = {
+                            'limit_msg': ("Other resources were not found "
+                                          "and their urls not replaced")})
             elif what == 'category':
                 origin = Category(path, self.settings).url
             elif what == 'tag':
@@ -358,6 +359,5 @@ def is_valid_content(content, f):
         content.check_properties()
         return True
     except NameError as e:
-        logger.error("Skipping %s: could not find information about "
-                     "'%s'" % (f, e))
+        logger.error("Skipping %s: could not find information about '%s'", f, e)
         return False
diff --git a/pelican/generators.py b/pelican/generators.py
index 7cbce8de..b877d43a 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -22,13 +22,14 @@ from jinja2 import (Environment, FileSystemLoader, PrefixLoader, ChoiceLoader,
 from pelican.contents import Article, Draft, Page, Static, is_valid_content
 from pelican.readers import Readers
 from pelican.utils import (copy, process_translations, mkdir_p, DateFormatter,
-                           FileStampDataCacher)
+                           FileStampDataCacher, python_2_unicode_compatible)
 from pelican import signals
 
 
 logger = logging.getLogger(__name__)
 
 
+@python_2_unicode_compatible
 class Generator(object):
     """Baseclass generator"""
 
@@ -67,7 +68,7 @@ class Generator(object):
             extensions=self.settings['JINJA_EXTENSIONS'],
         )
 
-        logger.debug('template list: {0}'.format(self.env.list_templates()))
+        logger.debug('Template list: %s', self.env.list_templates())
 
         # provide utils.strftime as a jinja filter
         self.env.filters.update({'strftime': DateFormatter()})
@@ -153,6 +154,10 @@ class Generator(object):
                 value = list(value.items())  # py3k safeguard for iterators
             self.context[item] = value
 
+    def __str__(self):
+        # return the name of the class for logging purposes
+        return self.__class__.__name__
+
 
 class CachingGenerator(Generator, FileStampDataCacher):
     '''Subclass of Generator and FileStampDataCacher classes
@@ -470,7 +475,8 @@ class ArticlesGenerator(CachingGenerator):
                         context_signal=signals.article_generator_context,
                         context_sender=self)
                 except Exception as e:
-                    logger.warning('Could not process {}\n{}'.format(f, e))
+                    logger.error('Could not process %s\n%s', f, e,
+                        exc_info=self.settings.get('DEBUG', False))
                     continue
 
                 if not is_valid_content(article, f):
@@ -492,9 +498,8 @@ class ArticlesGenerator(CachingGenerator):
                     context_sender=self)
                 all_drafts.append(draft)
             else:
-                logger.warning("Unknown status %s for file %s, skipping it." %
-                               (repr(article.status),
-                                repr(f)))
+                logger.error("Unknown status '%s' for file %s, skipping it.",
+                               article.status, f)
 
         self.articles, self.translations = process_translations(all_articles)
         self.drafts, self.drafts_translations = \
@@ -594,7 +599,8 @@ class PagesGenerator(CachingGenerator):
                         context_signal=signals.page_generator_context,
                         context_sender=self)
                 except Exception as e:
-                    logger.warning('Could not process {}\n{}'.format(f, e))
+                    logger.error('Could not process %s\n%s', f, e,
+                        exc_info=self.settings.get('DEBUG', False))
                     continue
 
                 if not is_valid_content(page, f):
@@ -609,9 +615,8 @@ class PagesGenerator(CachingGenerator):
             elif page.status == "hidden":
                 hidden_pages.append(page)
             else:
-                logger.warning("Unknown status %s for file %s, skipping it." %
-                               (repr(page.status),
-                                repr(f)))
+                logger.error("Unknown status '%s' for file %s, skipping it.",
+                               page.status, f)
 
         self.pages, self.translations = process_translations(all_pages)
         self.hidden_pages, self.hidden_translations = (
@@ -679,7 +684,7 @@ class StaticGenerator(Generator):
             save_as = os.path.join(self.output_path, sc.save_as)
             mkdir_p(os.path.dirname(save_as))
             shutil.copy2(source_path, save_as)
-            logger.info('copying {} to {}'.format(sc.source_path, sc.save_as))
+            logger.info('Copying %s to %s', sc.source_path, sc.save_as)
 
 
 class SourceFileGenerator(Generator):
@@ -694,7 +699,7 @@ class SourceFileGenerator(Generator):
         copy(obj.source_path, dest)
 
     def generate_output(self, writer=None):
-        logger.info(' Generating source files...')
+        logger.info('Generating source files...')
         for obj in chain(self.context['articles'], self.context['pages']):
             self._create_source(obj)
             for obj_trans in obj.translations:
diff --git a/pelican/log.py b/pelican/log.py
index fdf41cb0..089bc0ac 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -8,59 +8,76 @@ __all__ = [
 import os
 import sys
 import logging
+import locale
 
-from collections import defaultdict
+from collections import defaultdict, Mapping
 
+import six
 
-RESET_TERM = '\033[0;m'
+class BaseFormatter(logging.Formatter):
+    def __init__(self, fmt=None, datefmt=None):
+        FORMAT = '%(customlevelname)s %(message)s'
+        super(BaseFormatter, self).__init__(fmt=FORMAT, datefmt=datefmt)
 
-COLOR_CODES = {
-    'red': 31,
-    'yellow': 33,
-    'cyan': 36,
-    'white': 37,
-    'bgred': 41,
-    'bggrey': 100,
-}
-
-
-def ansi(color, text):
-    """Wrap text in an ansi escape sequence"""
-    code = COLOR_CODES[color]
-    return '\033[1;{0}m{1}{2}'.format(code, text, RESET_TERM)
-
-
-class ANSIFormatter(logging.Formatter):
-    """Convert a `logging.LogRecord' object into colored text, using ANSI
-       escape sequences.
-
-    """
     def format(self, record):
-        msg = record.getMessage()
-        if record.levelname == 'INFO':
-            return ansi('cyan', '-> ') + msg
-        elif record.levelname == 'WARNING':
-            return ansi('yellow', record.levelname) + ': ' + msg
-        elif record.levelname == 'ERROR':
-            return ansi('red', record.levelname) + ': ' + msg
-        elif record.levelname == 'CRITICAL':
-            return ansi('bgred', record.levelname) + ': ' + msg
-        elif record.levelname == 'DEBUG':
-            return ansi('bggrey', record.levelname) + ': ' + msg
+        record.__dict__['customlevelname'] = self._get_levelname(record.levelname)
+        # format multiline messages 'nicely' to make it clear they are together
+        record.msg = record.msg.replace('\n', '\n  | ')
+        return super(BaseFormatter, self).format(record)
+
+    def formatException(self, ei):
+        ''' prefix traceback info for better representation '''
+        # .formatException returns a bytestring in py2 and unicode in py3
+        # since .format will handle unicode conversion,
+        # str() calls are used to normalize formatting string
+        s = super(BaseFormatter, self).formatException(ei)
+        # fancy format traceback
+        s = str('\n').join(str('  | ') + line for line in s.splitlines())
+        # seperate the traceback from the preceding lines
+        s = str('  |___\n{}').format(s)
+        return s
+
+    def _get_levelname(self, name):
+        ''' NOOP: overridden by subclasses '''
+        return name
+
+
+class ANSIFormatter(BaseFormatter):
+    ANSI_CODES = {
+        'red': '\033[1;31m',
+        'yellow': '\033[1;33m',
+        'cyan': '\033[1;36m',
+        'white': '\033[1;37m',
+        'bgred': '\033[1;41m',
+        'bggrey': '\033[1;100m',
+        'reset': '\033[0;m'}
+
+    LEVEL_COLORS = {
+        'INFO': 'cyan',
+        'WARNING': 'yellow',
+        'ERROR': 'red',
+        'CRITICAL': 'bgred',
+        'DEBUG': 'bggrey'}
+
+    def _get_levelname(self, name):
+        color = self.ANSI_CODES[self.LEVEL_COLORS.get(name, 'white')]
+        if name == 'INFO':
+            fmt = '{0}->{2}'
         else:
-            return ansi('white', record.levelname) + ': ' + msg
+            fmt = '{0}{1}{2}:'
+        return fmt.format(color, name, self.ANSI_CODES['reset'])
 
 
-class TextFormatter(logging.Formatter):
+class TextFormatter(BaseFormatter):
     """
     Convert a `logging.LogRecord' object into text.
     """
 
-    def format(self, record):
-        if not record.levelname or record.levelname == 'INFO':
-            return record.getMessage()
+    def _get_levelname(self, name):
+        if name == 'INFO':
+            return '->'
         else:
-            return record.levelname + ': ' + record.getMessage()
+            return name + ':'
 
 
 class LimitFilter(logging.Filter):
@@ -73,37 +90,74 @@ class LimitFilter(logging.Filter):
     E.g.: log.warning(('43 is not the answer', 'More erroneous answers'))
     """
 
-    ignore = set()
-    threshold = 5
-    group_count = defaultdict(int)
+    _ignore = set()
+    _threshold = 5
+    _group_count = defaultdict(int)
 
     def filter(self, record):
         # don't limit log messages for anything above "warning"
         if record.levelno > logging.WARN:
-            return record
+            return True
+
         # extract group
-        group = None
-        if len(record.msg) == 2:
-            record.msg, group = record.msg
+        group = record.__dict__.get('limit_msg', None)
+        group_args = record.__dict__.get('limit_args', ())
+
         # ignore record if it was already raised
         # use .getMessage() and not .msg for string formatting
         ignore_key = (record.levelno, record.getMessage())
-        to_ignore = ignore_key in LimitFilter.ignore
-        LimitFilter.ignore.add(ignore_key)
-        if to_ignore:
+        if ignore_key in self._ignore:
             return False
+        else:
+            self._ignore.add(ignore_key)
+
         # check if we went over threshold
         if group:
             key = (record.levelno, group)
-            LimitFilter.group_count[key] += 1
-            if LimitFilter.group_count[key] == LimitFilter.threshold:
+            self._group_count[key] += 1
+            if self._group_count[key] == self._threshold:
                 record.msg = group
-            if LimitFilter.group_count[key] > LimitFilter.threshold:
+                record.args = group_args
+            elif self._group_count[key] > self._threshold:
                 return False
-        return record
+        return True
 
 
-class LimitLogger(logging.Logger):
+class SafeLogger(logging.Logger):
+    """
+    Base Logger which properly encodes Exceptions in Py2
+    """
+    _exc_encoding = locale.getpreferredencoding()
+
+    def _log(self, level, msg, args, exc_info=None, extra=None):
+        # if the only argument is a Mapping, Logger uses that for formatting
+        # format values for that case
+        if args and len(args)==1 and isinstance(args[0], Mapping):
+            args = ({k: self._decode_arg(v) for k, v in args[0].items()},)
+        # otherwise, format each arg
+        else:
+            args = tuple(self._decode_arg(arg) for arg in args)
+        super(SafeLogger, self)._log(level, msg, args,
+            exc_info=exc_info, extra=extra)
+
+    def _decode_arg(self, arg):
+        '''
+        properly decode an arg for Py2 if it's Exception
+
+
+        localized systems have errors in native language if locale is set
+        so convert the message to unicode with the correct encoding
+        '''
+        if isinstance(arg, Exception):
+            text = str(arg)
+            if six.PY2:
+                text = text.decode(self._exc_encoding)
+            return text
+        else:
+            return arg
+
+
+class LimitLogger(SafeLogger):
     """
     A logger which adds LimitFilter automatically
     """
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 757c9120..3f5cce47 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -131,7 +131,7 @@ class Page(object):
         prop_value = getattr(rule, key)
 
         if not isinstance(prop_value, six.string_types):
-            logger.warning('%s is set to %s' % (key, prop_value))
+            logger.warning('%s is set to %s', key, prop_value)
             return prop_value
 
         # URL or SAVE_AS is a string, format it with a controlled context
diff --git a/pelican/readers.py b/pelican/readers.py
index 5545c607..ff87ecc5 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -325,18 +325,22 @@ class HTMLReader(BaseReader):
             name = self._attr_value(attrs, 'name')
             if name is None:
                 attr_serialized = ', '.join(['{}="{}"'.format(k, v) for k, v in attrs])
-                logger.warning("Meta tag in file %s does not have a 'name' attribute, skipping. Attributes: %s", self._filename, attr_serialized)
+                logger.warning("Meta tag in file %s does not have a 'name' "
+                               "attribute, skipping. Attributes: %s", 
+                               self._filename, attr_serialized)
                 return
             name = name.lower()
             contents = self._attr_value(attrs, 'content', '')
             if not contents:
                 contents = self._attr_value(attrs, 'contents', '')
                 if contents:
-                    logger.warning((
-                        "Meta tag attribute 'contents' used in file {}, should"
-                        " be changed to 'content'".format(self._filename),
-                        "Other files have meta tag attribute 'contents' that"
-                        " should be changed to 'content'"))
+                    logger.warning(
+                        "Meta tag attribute 'contents' used in file %s, should"
+                        " be changed to 'content'",
+                        self._filename,
+                        extra={'limit_msg': ("Other files have meta tag "
+                                             "attribute 'contents' that should "
+                                             "be changed to 'content'")})
 
             if name == 'keywords':
                 name = 'tags'
@@ -376,8 +380,8 @@ class Readers(FileStampDataCacher):
 
         for cls in [BaseReader] + BaseReader.__subclasses__():
             if not cls.enabled:
-                logger.debug('Missing dependencies for {}'
-                             .format(', '.join(cls.file_extensions)))
+                logger.debug('Missing dependencies for %s',
+                             ', '.join(cls.file_extensions))
                 continue
 
             for ext in cls.file_extensions:
@@ -414,8 +418,8 @@ class Readers(FileStampDataCacher):
 
         path = os.path.abspath(os.path.join(base_path, path))
         source_path = os.path.relpath(path, base_path)
-        logger.debug('read file {} -> {}'.format(
-            source_path, content_class.__name__))
+        logger.debug('Read file %s -> %s',
+            source_path, content_class.__name__)
 
         if not fmt:
             _, ext = os.path.splitext(os.path.basename(path))
@@ -423,11 +427,11 @@ class Readers(FileStampDataCacher):
 
         if fmt not in self.readers:
             raise TypeError(
-                'Pelican does not know how to parse {}'.format(path))
+                'Pelican does not know how to parse %s', path)
 
         if preread_signal:
-            logger.debug('signal {}.send({})'.format(
-                preread_signal, preread_sender))
+            logger.debug('Signal %s.send(%s)',
+                preread_signal.name, preread_sender)
             preread_signal.send(preread_sender)
 
         reader = self.readers[fmt]
@@ -463,8 +467,8 @@ class Readers(FileStampDataCacher):
                 metadata['summary'] = typogrify(metadata['summary'])
 
         if context_signal:
-            logger.debug('signal {}.send({}, <metadata>)'.format(
-                context_signal, context_sender))
+            logger.debug('Signal %s.send(%s, <metadata>)',
+                context_signal.name, context_sender)
             context_signal.send(context_sender, metadata=metadata)
 
         return content_class(content=content, metadata=metadata,
@@ -497,9 +501,10 @@ def find_empty_alt(content, path):
         )
         """, re.X)
     for match in re.findall(imgs, content):
-        logger.warning(('Empty alt attribute for image {} in {}'.format(
-            os.path.basename(match[1] + match[5]), path),
-            'Other images have empty alt attributes'))
+        logger.warning(
+            'Empty alt attribute for image %s in %s',
+            os.path.basename(match[1] + match[5]), path,
+            extra={'limit_msg': 'Other images have empty alt attributes'})
 
 
 def default_metadata(settings=None, process=None):
diff --git a/pelican/server.py b/pelican/server.py
index bb31b234..d4518acd 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -30,9 +30,9 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
                 logging.info("Found: %s" % self.path)
                 found = True
                 break
-            logging.info("Tried to find file %s, but it doesn't exist. " % self.path)
+            logging.info("Tried to find file %s, but it doesn't exist. ", self.path)
         if not found:
-            logging.warning("Unable to find file %s or variations." % self.path)
+            logging.warning("Unable to find file %s or variations.", self.path)
 
 Handler = ComplexHTTPRequestHandler
 
@@ -40,13 +40,13 @@ socketserver.TCPServer.allow_reuse_address = True
 try:
     httpd = socketserver.TCPServer(("", PORT), Handler)
 except OSError as e:
-    logging.error("Could not listen on port %s" % PORT)
+    logging.error("Could not listen on port %s", PORT)
     sys.exit(getattr(e, 'exitcode', 1))
 
 
-logging.info("serving at port %s" % PORT)
+logging.info("Serving at port %s", PORT)
 try:
     httpd.serve_forever()
 except KeyboardInterrupt as e:
-    logging.info("shutting down server")
+    logging.info("Shutting down server")
     httpd.socket.close()
diff --git a/pelican/settings.py b/pelican/settings.py
index c04cc5d0..c8fcbc94 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -152,7 +152,8 @@ def read_settings(path=None, override=None):
             local_settings['PLUGIN_PATHS'] = local_settings['PLUGIN_PATH']
             del local_settings['PLUGIN_PATH']
         if isinstance(local_settings['PLUGIN_PATHS'], six.string_types):
-            logger.warning("Defining %s setting as string has been deprecated (should be a list)" % 'PLUGIN_PATHS')
+            logger.warning("Defining PLUGIN_PATHS setting as string "
+                           "has been deprecated (should be a list)")
             local_settings['PLUGIN_PATHS'] = [local_settings['PLUGIN_PATHS']]
         elif local_settings['PLUGIN_PATHS'] is not None:
                 local_settings['PLUGIN_PATHS'] = [os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(path), pluginpath)))
@@ -201,7 +202,7 @@ def configure_settings(settings):
                         ' (see pelican --help for more information)')
 
     # specify the log messages to be ignored
-    LimitFilter.ignore.update(set(settings.get('LOG_FILTER',
+    LimitFilter._ignore.update(set(settings.get('LOG_FILTER',
                                                DEFAULT_CONFIG['LOG_FILTER'])))
 
     # lookup the theme in "pelican/themes" if the given one doesn't exist
@@ -243,10 +244,9 @@ def configure_settings(settings):
             ]:
         if key in settings and not isinstance(settings[key], types):
             value = settings.pop(key)
-            logger.warn(
-                'Detected misconfigured {} ({}), '
-                'falling back to the default ({})'.format(
-                    key, value, DEFAULT_CONFIG[key]))
+            logger.warn('Detected misconfigured %s (%s), '
+                        'falling back to the default (%s)',
+                    key, value, DEFAULT_CONFIG[key])
 
     # try to set the different locales, fallback on the default.
     locales = settings.get('LOCALE', DEFAULT_CONFIG['LOCALE'])
@@ -319,8 +319,8 @@ def configure_settings(settings):
         old_key = key + '_DIR'
         new_key = key + '_PATHS'
         if old_key in settings:
-            logger.warning('Deprecated setting {}, moving it to {} list'.format(
-                old_key, new_key))
+            logger.warning('Deprecated setting %s, moving it to %s list',
+                old_key, new_key)
             settings[new_key] = [settings[old_key]]   # also make a list
             del settings[old_key]
 
@@ -343,8 +343,8 @@ def configure_settings(settings):
     for PATH_KEY in filter(lambda k: k in settings, path_keys):
         if isinstance(settings[PATH_KEY], six.string_types):
             logger.warning("Detected misconfiguration with %s setting "
-                           "(must be a list), falling back to the default"
-                           % PATH_KEY)
+                           "(must be a list), falling back to the default",
+                           PATH_KEY)
             settings[PATH_KEY] = DEFAULT_CONFIG[PATH_KEY]
 
     # Add {PAGE,ARTICLE}_PATHS to {ARTICLE,PAGE}_EXCLUDES
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index bad73569..c851ef81 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -182,5 +182,5 @@ class TestPelican(LoggedTestCase):
         logger.setLevel(orig_level)
         self.assertLogCountEqual(
             count=2,
-            msg="writing .*",
+            msg="Writing .*",
             level=logging.INFO)
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 064f3147..d0531c42 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -20,8 +20,10 @@ from six.moves.urllib.error import URLError
 from six.moves.urllib.parse import urlparse
 from six.moves.urllib.request import urlretrieve
 
-from pelican.utils import slugify, SafeDatetime
+# pelican.log has to be the first pelican module to be loaded
+# because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import init
+from pelican.utils import slugify, SafeDatetime
 
 logger = logging.getLogger(__name__)
 
@@ -131,7 +133,7 @@ def wp2fields(xml, wp_custpost=False):
                 title = unescape(item.title.contents[0])
             except IndexError:
                 title = 'No title [%s]' % item.find('post_name').string
-                logger.warning('Post "%s" is lacking a proper title' % title)
+                logger.warning('Post "%s" is lacking a proper title', title)
 
             filename = item.find('post_name').string
             post_id = item.find('post_id').string
@@ -594,24 +596,9 @@ def download_attachments(output_path, urls):
         try:
             urlretrieve(url, os.path.join(full_path, filename))
             locations.append(os.path.join(localpath, filename))
-        except URLError as e:
-            error = ("No file could be downloaded from {}; Error {}"
-                    .format(url, e))
-            logger.warning(error)
-        except IOError as e: #Python 2.7 throws an IOError rather Than URLError
-            # For japanese, the error might look kind of like this:
-            # e = IOError( 'socket error', socket.error(111, u'\u63a5\u7d9a\u3092\u62d2\u5426\u3055\u308c\u307e\u3057\u305f') )
-            # and not be suitable to use in "{}".format(e) , raising UnicodeDecodeError
-            # (This is at least the case on my Fedora running Python 2.7.5 
-            # (default, Feb 19 2014, 13:47:28) [GCC 4.8.2 20131212 (Red Hat 4.8.2-7)] on linux2
-            try:
-                error = ("No file could be downloaded from {}; Error {}"
-                        .format(url, e))
-            except UnicodeDecodeError:
-                # For lack of a better log message because we could not decode e, let's use repr(e)
-                error = ("No file could be downloaded from {}; Error {}"
-                        .format(url, repr(e)))
-            logger.warning(error)
+        except (URLError, IOError) as e:
+            #Python 2.7 throws an IOError rather Than URLError
+            logger.warning("No file could be downloaded from %s\n%s", url, e)
     return locations
 
 
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index acb8e07d..f92d1963 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -70,7 +70,7 @@ class URLWrapper(object):
         setting = "%s_%s" % (self.__class__.__name__.upper(), key)
         value = self.settings[setting]
         if not isinstance(value, six.string_types):
-            logger.warning('%s is set to %s' % (setting, value))
+            logger.warning('%s is set to %s', (setting, value))
             return value
         else:
             if get_page_name:
diff --git a/pelican/utils.py b/pelican/utils.py
index 5e4822ba..cd4e181a 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -293,46 +293,46 @@ def copy(source, destination):
         if not os.path.exists(dest_dir):
             os.makedirs(dest_dir)
         shutil.copy2(source_, destination_)
-        logger.info('copying %s to %s' % (source_, destination_))
+        logger.info('Copying %s to %s', source_, destination_)
     else:
-        logger.warning('skipped copy %s to %s' % (source_, destination_))
+        logger.warning('Skipped copy %s to %s', source_, destination_)
 
 
 def clean_output_dir(path, retention):
     """Remove all files from output directory except those in retention list"""
 
     if not os.path.exists(path):
-        logger.debug("Directory already removed: %s" % path)
+        logger.debug("Directory already removed: %s", path)
         return
 
     if not os.path.isdir(path):
         try:
             os.remove(path)
         except Exception as e:
-            logger.error("Unable to delete file %s; %s" % (path, str(e)))
+            logger.error("Unable to delete file %s; %s", path, e)
         return
 
     # remove existing content from output folder unless in retention list
     for filename in os.listdir(path):
         file = os.path.join(path, filename)
         if any(filename == retain for retain in retention):
-            logger.debug("Skipping deletion; %s is on retention list: %s" \
-                         % (filename, file))
+            logger.debug("Skipping deletion; %s is on retention list: %s",
+                         filename, file)
         elif os.path.isdir(file):
             try:
                 shutil.rmtree(file)
-                logger.debug("Deleted directory %s" % file)
+                logger.debug("Deleted directory %s", file)
             except Exception as e:
-                logger.error("Unable to delete directory %s; %s" % (
-                        file, str(e)))
+                logger.error("Unable to delete directory %s; %s", 
+                        file, e)
         elif os.path.isfile(file) or os.path.islink(file):
             try:
                 os.remove(file)
-                logger.debug("Deleted file/link %s" % file)
+                logger.debug("Deleted file/link %s", file)
             except Exception as e:
-                logger.error("Unable to delete file %s; %s" % (file, str(e)))
+                logger.error("Unable to delete file %s; %s", file, e)
         else:
-            logger.error("Unable to delete %s, file type unknown" % file)
+            logger.error("Unable to delete %s, file type unknown", file)
 
 
 def get_relative_path(path):
@@ -455,10 +455,10 @@ def process_translations(content_list):
             lang_items = list(lang_items)
             len_ = len(lang_items)
             if len_ > 1:
-                logger.warning('There are %s variants of "%s" with lang %s' \
-                        % (len_, slug, lang))
+                logger.warning('There are %s variants of "%s" with lang %s',
+                    len_, slug, lang)
                 for x in lang_items:
-                    logger.warning('    %s' % x.source_path)
+                    logger.warning('\t%s', x.source_path)
 
         # find items with default language
         default_lang_items = list(filter(attrgetter('in_default_lang'),
@@ -469,11 +469,11 @@ def process_translations(content_list):
             default_lang_items = items[:1]
 
         if not slug:
-            logger.warning((
-                    'empty slug for {!r}. '
+            logger.warning(
+                    'empty slug for %s. '
                     'You can fix this by adding a title or a slug to your '
-                    'content'
-                    ).format(default_lang_items[0].source_path))
+                    'content',
+                    default_lang_items[0].source_path)
         index.extend(default_lang_items)
         translations.extend([x for x in items if x not in default_lang_items])
         for a in items:
@@ -499,7 +499,7 @@ def folder_watcher(path, extensions, ignores=[]):
                     try:
                         yield os.stat(os.path.join(root, f)).st_mtime
                     except OSError as e:
-                        logger.warning('Caught Exception: {}'.format(e))
+                        logger.warning('Caught Exception: %s', e)
 
     LAST_MTIME = 0
     while True:
@@ -522,7 +522,7 @@ def file_watcher(path):
             try:
                 mtime = os.stat(path).st_mtime
             except OSError as e:
-                logger.warning('Caught Exception: {}'.format(e))
+                logger.warning('Caught Exception: %s', e)
                 continue
 
             if mtime > LAST_MTIME:
@@ -596,15 +596,15 @@ class FileDataCacher(object):
                 with self._cache_open(self._cache_path, 'rb') as fhandle:
                     self._cache = pickle.load(fhandle)
             except (IOError, OSError) as err:
-                logger.debug(('Cannot load cache {} (this is normal on first '
-                    'run). Proceeding with empty cache.\n{}').format(
-                        self._cache_path, err))
+                logger.debug('Cannot load cache %s (this is normal on first '
+                    'run). Proceeding with empty cache.\n%s',
+                        self._cache_path, err)
                 self._cache = {}
             except Exception as err:
-                logger.warning(('Cannot unpickle cache {}, cache may be using '
+                logger.warning(('Cannot unpickle cache %s, cache may be using '
                     'an incompatible protocol (see pelican caching docs). '
-                    'Proceeding with empty cache.\n{}').format(
-                        self._cache_path, err))
+                    'Proceeding with empty cache.\n%s'),
+                        self._cache_path, err)
                 self._cache = {}
         else:
             self._cache = {}
@@ -629,8 +629,8 @@ class FileDataCacher(object):
                 with self._cache_open(self._cache_path, 'wb') as fhandle:
                     pickle.dump(self._cache, fhandle)
             except (IOError, OSError, pickle.PicklingError) as err:
-                logger.warning('Could not save cache {}\n{}'.format(
-                    self._cache_path, err))
+                logger.warning('Could not save cache %s\n ... %s',
+                    self._cache_path, err)
 
 
 class FileStampDataCacher(FileDataCacher):
@@ -656,8 +656,7 @@ class FileStampDataCacher(FileDataCacher):
                         return hash_func(fhandle.read()).digest()
                 self._filestamp_func = filestamp_func
             except AttributeError as err:
-                logger.warning('Could not get hashing function\n{}'.format(
-                    err))
+                logger.warning('Could not get hashing function\n\t%s', err)
                 self._filestamp_func = None
 
     def cache_data(self, filename, data):
@@ -677,8 +676,8 @@ class FileStampDataCacher(FileDataCacher):
         try:
             return self._filestamp_func(filename)
         except (IOError, OSError, TypeError) as err:
-            logger.warning('Cannot get modification stamp for {}\n{}'.format(
-                filename, err))
+            logger.warning('Cannot get modification stamp for %s\n\t%s',
+                filename, err)
             return b''
 
     def get_cached_data(self, filename, default=None):
diff --git a/pelican/writers.py b/pelican/writers.py
index 61acdadd..65cd95d7 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -68,11 +68,11 @@ class Writer(object):
                 raise RuntimeError('File %s is set to be overridden twice'
                                    % filename)
             else:
-                logger.info('skipping %s' % filename)
+                logger.info('Skipping %s', filename)
                 filename = os.devnull
         elif filename in self._written_files:
             if override:
-                logger.info('overwriting %s' % filename)
+                logger.info('Overwriting %s', filename)
             else:
                 raise RuntimeError('File %s is to be overwritten' % filename)
         if override:
@@ -120,7 +120,7 @@ class Writer(object):
                 encoding = 'utf-8' if six.PY3 else None
                 with self._open_w(complete_path, encoding) as fp:
                     feed.write(fp, 'utf-8')
-                    logger.info('writing %s' % complete_path)
+                    logger.info('Writing %s', complete_path)
             return feed
         finally:
             locale.setlocale(locale.LC_ALL, old_locale)
@@ -160,7 +160,7 @@ class Writer(object):
 
             with self._open_w(path, 'utf-8', override=override) as f:
                 f.write(output)
-            logger.info('writing {}'.format(path))
+            logger.info('Writing %s', path)
 
             # Send a signal to say we're writing a file with some specific
             # local context.

From df0731f2e8640cc6db06b02a31ee30f1ecc86ff8 Mon Sep 17 00:00:00 2001
From: RR2DO2 <RR2DO2@users.noreply.github.com>
Date: Fri, 25 Jul 2014 19:24:40 +0100
Subject: [PATCH 1660/2864] Debug print removal

The print either is a debug print that needs removing, or needs an additional description. The first is more likely.
---
 pelican/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 43521ff1..d1f4a072 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -377,7 +377,6 @@ def main():
                     if modified['settings']:
                         pelican, settings = get_instance(args)
                         original_load_cache = settings['LOAD_CONTENT_CACHE']
-                        print(pelican.settings['AUTORELOAD_IGNORE_CACHE'])
                         _ignore_cache(pelican)
 
                     if any(modified.values()):

From c995fa87a7a9440a57bde34ca6dccae797cd15f1 Mon Sep 17 00:00:00 2001
From: Carol Willing <carolcode@willingconsulting.com>
Date: Sun, 27 Jul 2014 07:33:05 -0700
Subject: [PATCH 1661/2864] Corrected typo to improve readability

---
 docs/quickstart.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 44f99dd2..fb90b002 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -16,7 +16,7 @@ Create a project
 ----------------
 
 First, choose a name for your project, create an appropriately-named directory
-for your it, and switch to that directory::
+for your site, and switch to that directory::
 
     mkdir -p ~/projects/yoursite
     cd ~/projects/yoursite

From a0ecab901f4a5ef43d3ffc9026b921cb334fa899 Mon Sep 17 00:00:00 2001
From: Barry Steyn <barry.steyn@gmail.com>
Date: Sat, 19 Jul 2014 15:07:44 -0700
Subject: [PATCH 1662/2864] Allows Typogrify to ignore user specified tags.
 Refs #1407

Typogrify interferes with certain sections of the output that it should not touch (see #1407 for more details).
This feature adds a setting called TYPOGRIFY_IGNORE_LIST which is a list of tag for Typogrify to ignore.

The following was updated:

 1. readers.py - if TYPOGRIFY_IGNORE_TAGS is present, then use it
 2. settings.ps - default TYPOGRIFY_IGNORE_TAGS to []
 3. contents/article_with_code_block.rst - an article with a code block for typogrify to ignore
 4. updated tests
 5. updated documentation
---
 docs/settings.rst                             |  3 ++
 pelican/readers.py                            | 15 ++++--
 pelican/settings.py                           |  1 +
 .../tests/content/article_with_code_block.rst | 15 ++++++
 pelican/tests/test_generators.py              |  2 +
 pelican/tests/test_readers.py                 | 46 +++++++++++++++++++
 6 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 pelican/tests/content/article_with_code_block.rst

diff --git a/docs/settings.rst b/docs/settings.rst
index df2fa722..3d89ddca 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -147,6 +147,9 @@ Setting name (followed by default value, if any)
                                                                                  incorporated into the generated HTML via the `Typogrify
                                                                                  <https://pypi.python.org/pypi/typogrify>`_ library,
                                                                                  which can be installed via: ``pip install typogrify``
+``TYPOGRIFY_IGNORE_TAGS = []``                                                   A list of tags for Typogrify to ignore. By default
+                                                                                 Typogrify will ignore ``pre`` and ``code`` tags. This
+                                                                                 requires that Typogrify version 2.0.4 or later is installed
 ``DIRECT_TEMPLATES =`` ``('index', 'categories', 'authors', 'archives')``        List of templates that are used directly to render
                                                                                  content. Typically direct templates are used to generate
                                                                                  index pages for collections of content (e.g., tags and
diff --git a/pelican/readers.py b/pelican/readers.py
index 5545c607..7e79c13e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -456,11 +456,20 @@ class Readers(FileStampDataCacher):
         # eventually filter the content with typogrify if asked so
         if self.settings['TYPOGRIFY']:
             from typogrify.filters import typogrify
+
+            def typogrify_wrapper(text):
+                """Ensures ignore_tags feature is backward compatible"""
+                try:
+                    return typogrify(text, self.settings['TYPOGRIFY_IGNORE_TAGS'])
+                except TypeError:
+                    return typogrify(text)
+
             if content:
-                content = typogrify(content)
-                metadata['title'] = typogrify(metadata['title'])
+                content = typogrify_wrapper(content)
+                metadata['title'] = typogrify_wrapper(metadata['title'])
+
             if 'summary' in metadata:
-                metadata['summary'] = typogrify(metadata['summary'])
+                metadata['summary'] = typogrify_wrapper(metadata['summary'])
 
         if context_signal:
             logger.debug('signal {}.send({}, <metadata>)'.format(
diff --git a/pelican/settings.py b/pelican/settings.py
index c04cc5d0..bd9c78ec 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -112,6 +112,7 @@ DEFAULT_CONFIG = {
     'DEFAULT_STATUS': 'published',
     'ARTICLE_PERMALINK_STRUCTURE': '',
     'TYPOGRIFY': False,
+    'TYPOGRIFY_IGNORE_TAGS': [],
     'SUMMARY_MAX_LENGTH': 50,
     'PLUGIN_PATHS': [],
     'PLUGINS': [],
diff --git a/pelican/tests/content/article_with_code_block.rst b/pelican/tests/content/article_with_code_block.rst
new file mode 100644
index 00000000..586878cf
--- /dev/null
+++ b/pelican/tests/content/article_with_code_block.rst
@@ -0,0 +1,15 @@
+An Article With Code Block To Test Typogrify Ignore
+###################################################
+
+An article with some code
+
+.. code-block:: python
+
+   x & y
+
+A block quote:
+
+   x & y
+
+Normal:
+x & y
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 9305fa6e..0fc34eaf 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -114,6 +114,8 @@ class TestArticlesGenerator(unittest.TestCase):
              'article'],
             ['This is an article without category !', 'published',
              'TestCategory', 'article'],
+            ['An Article With Code Block To Test Typogrify Ignore',
+              'published', 'Default', 'article'],
             ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定', 'published',
              '指導書', 'article'],
         ]
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 2ec72a94..ffff3478 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -153,6 +153,52 @@ class RstReaderTest(ReaderTest):
         except ImportError:
             return unittest.skip('need the typogrify distribution')
 
+    def test_typogrify_ignore_tags(self):
+        try:
+            # typogrify should be able to ignore user specified tags,
+            # but tries to be clever with widont extension
+            page = self.read_file(path='article.rst', TYPOGRIFY=True,
+                                  TYPOGRIFY_IGNORE_TAGS = ['p'])
+            expected = ('<p>THIS is some content. With some stuff to&nbsp;'
+                        '&quot;typogrify&quot;...</p>\n<p>Now with added '
+                        'support for <abbr title="three letter acronym">'
+                        'TLA</abbr>.</p>\n')
+
+            self.assertEqual(page.content, expected)
+
+            # typogrify should ignore code blocks by default because
+            # code blocks are composed inside the pre tag
+            page = self.read_file(path='article_with_code_block.rst',
+                                 TYPOGRIFY=True)
+
+            expected = ('<p>An article with some&nbsp;code</p>\n'
+                        '<div class="highlight"><pre><span class="n">x</span>'
+                        ' <span class="o">&amp;</span>'
+                        ' <span class="n">y</span>\n</pre></div>\n'
+                        '<p>A block&nbsp;quote:</p>\n<blockquote>\nx '
+                        '<span class="amp">&amp;</span> y</blockquote>\n'
+                        '<p>Normal:\nx <span class="amp">&amp;</span>&nbsp;y</p>\n')
+
+            self.assertEqual(page.content, expected)
+
+            # instruct typogrify to also ignore blockquotes
+            page = self.read_file(path='article_with_code_block.rst',
+                                 TYPOGRIFY=True, TYPOGRIFY_IGNORE_TAGS = ['blockquote'])
+
+            expected = ('<p>An article with some&nbsp;code</p>\n'
+                        '<div class="highlight"><pre><span class="n">x</span>'
+                        ' <span class="o">&amp;</span>'
+                        ' <span class="n">y</span>\n</pre></div>\n'
+                        '<p>A block&nbsp;quote:</p>\n<blockquote>\nx '
+                        '&amp; y</blockquote>\n'
+                        '<p>Normal:\nx <span class="amp">&amp;</span>&nbsp;y</p>\n')
+
+            self.assertEqual(page.content, expected)
+        except ImportError:
+            return unittest.skip('need the typogrify distribution')
+        except TypeError:
+            return unittest.skip('need typogrify version 2.0.4 or later')
+
     def test_article_with_multiple_authors(self):
         page = self.read_file(path='article_with_multiple_authors.rst')
         expected = {

From b3b65d77e0893f52d81b436693d4dd03999067cc Mon Sep 17 00:00:00 2001
From: Barry Steyn <barry.steyn@gmail.com>
Date: Thu, 31 Jul 2014 18:04:35 -0700
Subject: [PATCH 1663/2864] Documents DOCUTILS_SETTINGS and initializes it.
 Fixes #1425

---
 docs/settings.rst   | 5 +++++
 pelican/settings.py | 1 +
 2 files changed, 6 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index df2fa722..3f4f2147 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -58,6 +58,10 @@ Setting name (followed by default value, if any)
                                                                                  ``datetime.datetime`` constructor.
 ``DEFAULT_METADATA = ()``                                                        The default metadata you want to use for all articles
                                                                                  and pages.
+``DOCUTILS_SETTINGS = {}``                                                       Extra configuration settings for the docutils publisher
+                                                                                 (applicable only to reStructuredText). See `Docutils 
+                                                                                 Configuration`_ settings for more details.
+                                            
 ``FILENAME_METADATA =`` ``'(?P<date>\d{4}-\d{2}-\d{2}).*'``                      The regexp that will be used to extract any metadata
                                                                                  from the filename. All named groups that are matched
                                                                                  will be set in the metadata object.
@@ -819,3 +823,4 @@ Example settings
 
 
 .. _Jinja custom filters documentation: http://jinja.pocoo.org/docs/api/#custom-filters
+.. _Docutils Configuration: http://docutils.sourceforge.net/docs/user/config.html
diff --git a/pelican/settings.py b/pelican/settings.py
index c04cc5d0..a283b2be 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -49,6 +49,7 @@ DEFAULT_CONFIG = {
     'SITENAME': 'A Pelican Blog',
     'DISPLAY_PAGES_ON_MENU': True,
     'DISPLAY_CATEGORIES_ON_MENU': True,
+    'DOCUTILS_SETTINGS': {},
     'OUTPUT_SOURCES': False,
     'OUTPUT_SOURCES_EXTENSION': '.text',
     'USE_FOLDER_AS_CATEGORY': True,

From b80f2357b9c30843f0cf462bd4a47b75f52f8b8b Mon Sep 17 00:00:00 2001
From: Mike Lissner <mlissner@michaeljaylissner.com>
Date: Sat, 16 Aug 2014 20:20:08 -0700
Subject: [PATCH 1664/2864] Updates docs for Python 3

In Python 3, the simpleHTTPServer has moved into the http module, so the command `python -m simpleHTTPServer no longer works. This minor change adds instructions for those of us using Python 3.
---
 docs/publish.rst | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/publish.rst b/docs/publish.rst
index 266009e4..fea053bf 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -36,12 +36,19 @@ HTML files directly::
 
 Because the above method may have trouble locating your CSS and other linked
 assets, running a simple web server using Python will often provide a more
-reliable previewing experience::
+reliable previewing experience. 
+
+For Python 2, run::
 
     cd output
     python -m SimpleHTTPServer
 
-Once the ``SimpleHTTPServer`` has been started, you can preview your site at
+For Python 3, run::
+
+    cd output
+    python -m http.server
+
+Once the basic server has been started, you can preview your site at
 http://localhost:8000/
 
 Deployment

From 04978e9b752fcb2d6937e687071ea80f11ab5eaf Mon Sep 17 00:00:00 2001
From: Mike Lissner <mlissner@michaeljaylissner.com>
Date: Sat, 16 Aug 2014 21:07:30 -0700
Subject: [PATCH 1665/2864] Adds reference to SLUGIFY_SOURCE

When working on my site, I wanted SLUGIFY_SOURCE, but I came across PATH_METADATA first and enabled that for a while. Better to include the cross-reference where people can find it.
---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index df2fa722..088506b0 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -66,7 +66,7 @@ Setting name (followed by default value, if any)
                                                                                  For example, if you would like to extract both the
                                                                                  date and the slug, you could set something like:
                                                                                  ``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
-                                                                                 See :ref:`path_metadata`.
+                                                                                 See :ref:`path_metadata` and ``SLUGIFY_SOURCE``.
 ``PATH_METADATA = ''``                                                           Like ``FILENAME_METADATA``, but parsed from a page's
                                                                                  full path relative to the content source directory.
                                                                                  See :ref:`path_metadata`.

From 6ac06b28b1c3a9be1c947c6ae84b923ebea2ba86 Mon Sep 17 00:00:00 2001
From: Quentin Pradet <quentin.pradet@gmail.com>
Date: Wed, 20 Aug 2014 17:07:01 +0200
Subject: [PATCH 1666/2864] Unify bottom margins of lists and paragraphs

---
 pelican/tests/output/basic/theme/css/main.css         | 3 ++-
 pelican/tests/output/custom/theme/css/main.css        | 3 ++-
 pelican/tests/output/custom_locale/theme/css/main.css | 3 ++-
 pelican/themes/notmyidea/static/css/main.css          | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 2efb518d..9d7221a2 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -84,7 +84,8 @@ ol {
 	margin: 0em 0 0 1.5em;
 }
 
-li { margin-top: 0.5em;}
+li { margin-top: 0.5em;
+     margin-bottom: 1em; }
 
 .post-info {
     float:right;
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 2efb518d..9d7221a2 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -84,7 +84,8 @@ ol {
 	margin: 0em 0 0 1.5em;
 }
 
-li { margin-top: 0.5em;}
+li { margin-top: 0.5em;
+     margin-bottom: 1em; }
 
 .post-info {
     float:right;
diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
index 2efb518d..9d7221a2 100644
--- a/pelican/tests/output/custom_locale/theme/css/main.css
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -84,7 +84,8 @@ ol {
 	margin: 0em 0 0 1.5em;
 }
 
-li { margin-top: 0.5em;}
+li { margin-top: 0.5em;
+     margin-bottom: 1em; }
 
 .post-info {
     float:right;
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 2efb518d..9d7221a2 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -84,7 +84,8 @@ ol {
 	margin: 0em 0 0 1.5em;
 }
 
-li { margin-top: 0.5em;}
+li { margin-top: 0.5em;
+     margin-bottom: 1em; }
 
 .post-info {
     float:right;

From a2bb80b8bdc54b6bcddb7be888d343487e96074d Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 22 Aug 2014 17:53:36 -0400
Subject: [PATCH 1667/2864] Fixes #1420: Handle multiple definitions of
 standard metadata for Markdown

---
 pelican/readers.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index 05ebf956..85147e3e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -201,6 +201,7 @@ class MarkdownReader(BaseReader):
         self.extensions = list(self.settings['MD_EXTENSIONS'])
         if 'meta' not in self.extensions:
             self.extensions.append('meta')
+        self._source_path = None
 
     def _parse_metadata(self, meta):
         """Return the dict containing document metadata"""
@@ -215,6 +216,11 @@ class MarkdownReader(BaseReader):
                 self._md.reset()
                 summary = self._md.convert(summary_values)
                 output[name] = self.process_metadata(name, summary)
+            elif name in METADATA_PROCESSORS:
+                if len(value) > 1:
+                    logger.warning('Duplicate definition of `%s` '
+                        'for %s. Using first one.', name, self._source_path)
+                output[name] = self.process_metadata(name, value[0])
             elif len(value) > 1:
                 # handle list metadata as list of string
                 output[name] = self.process_metadata(name, value)
@@ -226,6 +232,7 @@ class MarkdownReader(BaseReader):
     def read(self, source_path):
         """Parse content and metadata of markdown files"""
 
+        self._source_path = source_path
         self._md = Markdown(extensions=self.extensions)
         with pelican_open(source_path) as text:
             content = self._md.convert(text)

From 00939848619f73ff88de3f099a6242276e67e8e6 Mon Sep 17 00:00:00 2001
From: Artemy Tregubenko <me@arty.name>
Date: Sun, 20 Jul 2014 10:54:46 +0200
Subject: [PATCH 1668/2864] Add feed_written signal

---
 docs/plugins.rst   | 1 +
 pelican/signals.py | 1 +
 pelican/writers.py | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index a13d9dce..01e67810 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -101,6 +101,7 @@ static_generator_init               static_generator               invoked in th
 static_generator_finalized          static_generator               invoked at the end of StaticGenerator.generate_context
 content_object_init                 content_object                 invoked at the end of Content.__init__ (see note below)
 content_written                     path, context                  invoked each time a content file is written.
+feed_written                        path, context, feed            invoked each time a feed file is written.
 =================================   ============================   ===========================================================================
 
 The list is currently small, so don't hesitate to add signals and make a pull
diff --git a/pelican/signals.py b/pelican/signals.py
index e06b89ac..f858c249 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -44,3 +44,4 @@ content_object_init = signal('content_object_init')
 
 # Writers signals
 content_written = signal('content_written')
+feed_written = signal('feed_written')
diff --git a/pelican/writers.py b/pelican/writers.py
index 65cd95d7..17f7d483 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -121,6 +121,8 @@ class Writer(object):
                 with self._open_w(complete_path, encoding) as fp:
                     feed.write(fp, 'utf-8')
                     logger.info('Writing %s', complete_path)
+
+                signals.feed_written.send(complete_path, context=context, feed=feed)
             return feed
         finally:
             locale.setlocale(locale.LC_ALL, old_locale)

From 304b16a9bea976917b05a0380b9efbbb0db7d8fb Mon Sep 17 00:00:00 2001
From: Artemy Tregubenko <me@arty.name>
Date: Sun, 31 Aug 2014 09:55:45 +0200
Subject: [PATCH 1669/2864] Fixes #1405: No error message for invalid syntax in
 period_archives.html

---
 pelican/generators.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index b877d43a..eb822e68 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -29,6 +29,9 @@ from pelican import signals
 logger = logging.getLogger(__name__)
 
 
+class PelicanTemplateNotFound(Exception):
+    pass
+
 @python_2_unicode_compatible
 class Generator(object):
     """Baseclass generator"""
@@ -88,7 +91,7 @@ class Generator(object):
             try:
                 self._templates[name] = self.env.get_template(name + '.html')
             except TemplateNotFound:
-                raise Exception('[templates] unable to load %s.html from %s'
+                raise PelicanTemplateNotFound('[templates] unable to load %s.html from %s'
                                 % (name, self._templates_path))
         return self._templates[name]
 
@@ -330,7 +333,7 @@ class ArticlesGenerator(CachingGenerator):
         """Generate per-year, per-month, and per-day archives."""
         try:
             template = self.get_template('period_archives')
-        except Exception:
+        except PelicanTemplateNotFound:
             template = self.get_template('archives')
 
         period_save_as = {

From 8cf89bd623c0e70cdc238625d97d2f692289dd22 Mon Sep 17 00:00:00 2001
From: Sven Kreiss <sk@svenkreiss.com>
Date: Fri, 5 Sep 2014 22:34:29 -0400
Subject: [PATCH 1670/2864] add <ul> to make valid html

---
 pelican/themes/simple/templates/authors.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/themes/simple/templates/authors.html b/pelican/themes/simple/templates/authors.html
index fa9b5170..4914904f 100644
--- a/pelican/themes/simple/templates/authors.html
+++ b/pelican/themes/simple/templates/authors.html
@@ -4,7 +4,10 @@
 
 {% block content %}
     <h1>Authors on {{ SITENAME }}</h1>
+
+    <ul>
     {%- for author, articles in authors|sort %}
         <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
     {% endfor %}
+    </ul>
 {% endblock %}

From 5ea3a36a3f9092eb5dcb5b6f27983dd44c7f58ab Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Sat, 12 Jul 2014 10:14:46 +0200
Subject: [PATCH 1671/2864] Enables custom locale while feed generation.

Fixes wrong language of month names in feed links.

Related to #1198
---
 pelican/writers.py | 51 ++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 17f7d483..d075af93 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -93,39 +93,36 @@ class Writer(object):
         """
         if not is_selected_for_writing(self.settings, path):
             return
-        old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
-        try:
-            self.site_url = context.get(
-                'SITEURL', path_to_url(get_relative_path(path)))
 
-            self.feed_domain = context.get('FEED_DOMAIN')
-            self.feed_url = '{}/{}'.format(self.feed_domain, path)
+        self.site_url = context.get(
+            'SITEURL', path_to_url(get_relative_path(path)))
 
-            feed = self._create_new_feed(feed_type, context)
+        self.feed_domain = context.get('FEED_DOMAIN')
+        self.feed_url = '{}/{}'.format(self.feed_domain, path)
 
-            max_items = len(elements)
-            if self.settings['FEED_MAX_ITEMS']:
-                max_items = min(self.settings['FEED_MAX_ITEMS'], max_items)
-            for i in range(max_items):
-                self._add_item_to_the_feed(feed, elements[i])
+        feed = self._create_new_feed(feed_type, context)
 
-            if path:
-                complete_path = os.path.join(self.output_path, path)
-                try:
-                    os.makedirs(os.path.dirname(complete_path))
-                except Exception:
-                    pass
+        max_items = len(elements)
+        if self.settings['FEED_MAX_ITEMS']:
+            max_items = min(self.settings['FEED_MAX_ITEMS'], max_items)
+        for i in range(max_items):
+            self._add_item_to_the_feed(feed, elements[i])
 
-                encoding = 'utf-8' if six.PY3 else None
-                with self._open_w(complete_path, encoding) as fp:
-                    feed.write(fp, 'utf-8')
-                    logger.info('Writing %s', complete_path)
+        if path:
+            complete_path = os.path.join(self.output_path, path)
+            try:
+                os.makedirs(os.path.dirname(complete_path))
+            except Exception:
+                pass
+
+            encoding = 'utf-8' if six.PY3 else None
+            with self._open_w(complete_path, encoding) as fp:
+                feed.write(fp, 'utf-8')
+                logger.info('Writing %s', complete_path)
+
+            signals.feed_written.send(complete_path, context=context, feed=feed)
+        return feed
 
-                signals.feed_written.send(complete_path, context=context, feed=feed)
-            return feed
-        finally:
-            locale.setlocale(locale.LC_ALL, old_locale)
 
     def write_file(self, name, template, context, relative_urls=False,
                    paginated=None, override_output=False, **kwargs):

From 69d8015ba7858be291a7e58239752724f687ae25 Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Sat, 6 Sep 2014 10:50:14 +0200
Subject: [PATCH 1672/2864] Updates the custom_locale test feed files to match
 the correct month names

---
 .../feeds/alexis-metaireau.atom.xml           | 24 +++++++--------
 .../feeds/alexis-metaireau.rss.xml            | 26 ++++++++--------
 .../custom_locale/feeds/all-en.atom.xml       | 24 +++++++--------
 .../output/custom_locale/feeds/all.atom.xml   | 24 +++++++--------
 .../output/custom_locale/feeds/all.rss.xml    | 30 +++++++++----------
 .../output/custom_locale/feeds/bar.atom.xml   |  2 +-
 .../output/custom_locale/feeds/bar.rss.xml    |  4 +--
 .../output/custom_locale/feeds/cat1.atom.xml  | 10 +++----
 .../output/custom_locale/feeds/cat1.rss.xml   | 12 ++++----
 .../output/custom_locale/feeds/misc.atom.xml  | 10 +++----
 .../output/custom_locale/feeds/misc.rss.xml   | 12 ++++----
 .../output/custom_locale/feeds/yeah.atom.xml  |  2 +-
 .../output/custom_locale/feeds/yeah.rss.xml   |  4 +--
 13 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 202b9f71..8fb3ef64 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,15 +18,15 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index dfb83630..99255ee5 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,15 +18,15 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 3bb10e38..6b2f09ba 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,15 +18,15 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index f709f2b1..5ef59e04 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,15 +20,15 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index 39fbc240..071e2f1a 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,15 +20,15 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index 13a5cde2..02fae916 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
index 4426eb6a..96074958 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index 54d382c4..96f70900 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
index 4f3b12f5..b78f51cc 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index 18800485..c91d4d7e 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index 0be49f79..82b58983 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index 5f7d8c4f..a8dbb270 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index 50c5803c..379d1b93 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file

From f5775bcba0c94ed83531df62e29c0efbb5fdeeef Mon Sep 17 00:00:00 2001
From: "Carlos E. Garcia" <carlos@cgarcia.org>
Date: Mon, 15 Sep 2014 20:29:00 -0400
Subject: [PATCH 1673/2864] minor spelling fixes

---
 THANKS                      | 2 +-
 docs/contribute.rst         | 2 +-
 docs/plugins.rst            | 2 +-
 pelican/__init__.py         | 2 +-
 pelican/contents.py         | 2 +-
 pelican/log.py              | 2 +-
 pelican/tests/support.py    | 2 +-
 pelican/tests/test_utils.py | 2 +-
 pelican/utils.py            | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/THANKS b/THANKS
index 1d867471..15503473 100644
--- a/THANKS
+++ b/THANKS
@@ -4,7 +4,7 @@ contributed or implemented key features over time. We do our best to keep this
 list up-to-date, but you can also have a look at the nice contributor graphs
 produced by GitHub: https://github.com/getpelican/pelican/graphs/contributors
 
-If you want to contibute, check the documentation section about how to do so:
+If you want to contribute, check the documentation section about how to do so:
 <http://docs.getpelican.com/en/latest/contribute.html>
 
 Aaron Kavlie
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 7c117d26..2962ddb1 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -202,5 +202,5 @@ Try to limit them to ``--debug`` mode like the following::
     try:
         some_action()
     except Exception as e:
-        logger.error('Exception occured: %s', e,
+        logger.error('Exception occurred: %s', e,
             exc_info=settings.get('DEBUG', False))
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 01e67810..27299e83 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -67,7 +67,7 @@ Signal                              Arguments                       Description
 =================================   ============================   ===========================================================================
 initialized                         pelican object
 finalized                           pelican object                 invoked after all the generators are executed and just before pelican exits
-                                                                   usefull for custom post processing actions, such as:
+                                                                   useful for custom post processing actions, such as:
                                                                    - minifying js/css assets.
                                                                    - notify/ping search engines with an updated sitemap.
 generator_init                      generator                      invoked in the Generator.__init__
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 3080be37..86fb0fbe 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -157,7 +157,7 @@ class Pelican(object):
         ]
 
         # erase the directory if it is not the source and if that's
-        # explicitely asked
+        # explicitly asked
         if (self.delete_outputdir and not
                 os.path.realpath(self.path).startswith(self.output_path)):
             clean_output_dir(self.output_path, self.output_retention)
diff --git a/pelican/contents.py b/pelican/contents.py
index 2e17b56f..4b7117dd 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -193,7 +193,7 @@ class Content(object):
         """Update the content attribute.
 
         Change all the relative paths of the content to relative paths
-        suitable for the ouput content.
+        suitable for the output content.
 
         :param content: content resource that will be passed to the templates.
         :param siteurl: siteurl which is locally generated by the writer in
diff --git a/pelican/log.py b/pelican/log.py
index 089bc0ac..cd750927 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -33,7 +33,7 @@ class BaseFormatter(logging.Formatter):
         s = super(BaseFormatter, self).formatException(ei)
         # fancy format traceback
         s = str('\n').join(str('  | ') + line for line in s.splitlines())
-        # seperate the traceback from the preceding lines
+        # separate the traceback from the preceding lines
         s = str('  |___\n{}').format(s)
         return s
 
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index a4fd2c35..151fa3b6 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -74,7 +74,7 @@ def mute(returns_output=False):
     If "returns_output" is True, the function will return a generator
     yielding the printed lines instead of the return values.
 
-    The decorator litterally hijack sys.stdout during each function
+    The decorator literally hijack sys.stdout during each function
     execution, so be careful with what you apply it to.
 
     >>> def numbers():
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 18740f21..7c9e6e5a 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -471,7 +471,7 @@ class TestDateFormatter(unittest.TestCase):
                          locale_available('French'),
                          'French locale needed')
     def test_french_strftime(self):
-        # This test tries to reproduce an issue that occured with python3.3 under macos10 only
+        # This test tries to reproduce an issue that occurred with python3.3 under macos10 only
         locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8'))
         date = utils.SafeDatetime(2014,8,14)
         # we compare the lower() dates since macos10 returns "Jeudi" for %A whereas linux reports "jeudi"
diff --git a/pelican/utils.py b/pelican/utils.py
index d458cdd9..4efd18f4 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -656,7 +656,7 @@ class FileStampDataCacher(FileDataCacher):
     '''Subclass that also caches the stamp of the file'''
 
     def __init__(self, settings, cache_name, caching_policy, load_policy):
-        '''This sublcass additionaly sets filestamp function
+        '''This sublcass additionally sets filestamp function
         and base path for filestamping operations
         '''
         super(FileStampDataCacher, self).__init__(settings, cache_name,

From dec6023fe65a827275d4158f21311a414452ada3 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Thu, 18 Sep 2014 20:09:12 -0400
Subject: [PATCH 1674/2864] Fix for broken test in #1348

---
 pelican/tests/test_generators.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index f7e20bb7..470d3236 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -476,7 +476,8 @@ class TestPageGenerator(unittest.TestCase):
 
     def test_generate_sorted(self):
         settings = get_settings(filenames={})
-        settings['PAGE_DIR'] = 'TestPages'  # relative to CUR_DIR
+        settings['PAGE_PATHS'] = ['TestPages']  # relative to CUR_DIR
+        settings['CACHE_PATH'] = self.temp_cache
         settings['DEFAULT_DATE'] = (1970, 1, 1)
 
         # default sort (filename)

From c92e00f17b808e524543864653e198394c4a3395 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@inuits.eu>
Date: Thu, 18 Sep 2014 22:31:47 +0200
Subject: [PATCH 1675/2864] Add a new signal: page_writer_finalized

---
 docs/plugins.rst      | 2 ++
 pelican/generators.py | 1 +
 pelican/signals.py    | 1 +
 3 files changed, 4 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 01e67810..57f90ba0 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -93,6 +93,8 @@ page_generator_preread              page_generator                 invoked befor
                                                                    use if code needs to do something before every page is parsed.
 page_generator_init                 page_generator                 invoked in the PagesGenerator.__init__
 page_generator_finalized            page_generator                 invoked at the end of PagesGenerator.generate_context
+page_writer_finalized               page_generator, writer         invoked after all pages have been written, but before the page generator
+                                                                   is closed.
 static_generator_context            static_generator, metadata
 static_generator_preread            static_generator               invoked before a static file is read in StaticGenerator.generate_context;
                                                                    use if code needs to do something before every static file is added to the
diff --git a/pelican/generators.py b/pelican/generators.py
index b877d43a..c2383bc6 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -637,6 +637,7 @@ class PagesGenerator(CachingGenerator):
                 self.context, page=page,
                 relative_urls=self.settings['RELATIVE_URLS'],
                 override_output=hasattr(page, 'override_save_as'))
+        signals.page_writer_finalized.send(self, writer=writer)
 
 
 class StaticGenerator(Generator):
diff --git a/pelican/signals.py b/pelican/signals.py
index f858c249..bd8c7954 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -25,6 +25,7 @@ article_writer_finalized = signal('article_writer_finalized')
 
 page_generator_init = signal('page_generator_init')
 page_generator_finalized = signal('page_generator_finalized')
+page_writer_finalized = signal('page_writer_finalized')
 
 static_generator_init = signal('static_generator_init')
 static_generator_finalized = signal('static_generator_finalized')

From 683d10a4807974a8374433668042971e577694a6 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Fri, 13 Jun 2014 16:13:37 -0400
Subject: [PATCH 1676/2864] README: Added Coveralls badge, refactor Travis
 badge

---
 README.rst | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index f6b5e4e2..58896f1d 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,5 @@
-Pelican
-=======
-
-.. image:: https://secure.travis-ci.org/getpelican/pelican.png?branch=master
-   :target: http://travis-ci.org/getpelican/pelican
-   :alt: Travis-ci: continuous integration status.
+Pelican |build-status| |coverage-status|
+========================================
 
 Pelican is a static site generator, written in Python_.
 
@@ -58,3 +54,11 @@ See our `contribution submission and feedback guidelines <CONTRIBUTING.rst>`_.
 .. _Jinja2: http://jinja.pocoo.org/
 .. _`Pelican documentation`: http://docs.getpelican.com/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
+
+.. |build-status| image:: https://travis-ci.org/getpelican/pelican.svg?branch=master
+   :target: https://travis-ci.org/getpelican/pelican
+   :alt: Travis CI: continuous integration status
+.. |coverage-status| image:: https://img.shields.io/coveralls/getpelican/pelican.svg
+   :target: https://coveralls.io/r/getpelican/pelican
+   :alt: Coveralls: code coverage status
+

From e4a2bb5b52a9cf19aaa2b9d7b6563a66822f9dd9 Mon Sep 17 00:00:00 2001
From: winlu <ingwinlu@users.noreply.github.com>
Date: Mon, 22 Sep 2014 16:36:34 +0200
Subject: [PATCH 1677/2864] Update faq.rst

since author feeds are enabled per default http://docs.getpelican.com/en/latest/settings.html#id9 as well, these need to be added here as well.
---
 docs/faq.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index 5a48a107..1376511a 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -145,6 +145,8 @@ disable all feed generation, you only need to specify the following settings::
     FEED_ALL_ATOM = None
     CATEGORY_FEED_ATOM = None
     TRANSLATION_FEED_ATOM = None
+    AUTHOR_FEED_ATOM = None
+    AUTHOR_FEED_RSS = None
 
 The word ``None`` should not be surrounded by quotes. Please note that ``None``
 and ``''`` are not the same thing. 

From 431029664835b8a63dd29a08a8c871472255bf71 Mon Sep 17 00:00:00 2001
From: Robert Utter <utter.robert@gmail.com>
Date: Wed, 24 Sep 2014 16:19:24 -0700
Subject: [PATCH 1678/2864] Update notmyidea's embedded Twitter icon

Twitter's logo has been a bird since 2010. The old T-icon is outdated.
---
 .../notmyidea/static/images/icons/twitter.png  | Bin 830 -> 1509 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pelican/themes/notmyidea/static/images/icons/twitter.png b/pelican/themes/notmyidea/static/images/icons/twitter.png
index d0ef3cc1b36ab79ac7931c2269b70f3662950a97..057ab004b5d826e151a4f9cc6a66d88caffa8911 100644
GIT binary patch
literal 1509
zcmbVMT}%{L6dqg_sA8nmMy!cU7j3A8ow>X0-^j}T%x<BwNC7Kp)$TBJVJEmd<Ln>{
ziioWWjRg{0+q5?FKw6$ECbfwv%~C-uL8X=08cY)ugvM&sqT&xSy$h`N!T8Y0%-nm=
zobNl|IrrRYEXaRz;rv(TV;HtDH-|1nV^ZWvh(qs`357w!GTBuk7YSu@6(d2+&IzRu
z&-F9qun;m_^|n5kg<&cmUtA)Wc=9M#@N1cfk2d5N5gNm?vO^-nRzMjqh2?y}s=4_?
zScCJNRkP9HAw8lK`uLn02^Q7l7qc}LtcBBLuf?-M6e93LnZZN;t$`pFvT9~{DKw9m
z2@O8uB3D>7v!Y5o1-Mg?Aa2m=GguM;+-TH-OoPz~(s3OLbOecRV+P2i3`R<4!sjjx
ziY9SoR3Yu2i-lHJjZc<EiXf`0s<c&ltss>Xz+$mPICQ!U<dG4q4#-R>BM?lDGSD!{
zO1voZLI962GNnSLY}Fv8vnlvRkLL+-AUIbjR5BvOhy>7*gx?>@YsNb$7s979p6MMd
zt`;Ft2!leU#G?HuOO1k2?VcYf;)v8x>m?p-3bU0K*h)VP$hovtgT81vo}=6*lN$h2
zCTY@<Ml(R^XF45DquEZ=CWkB266JUn)@3#Vy~}O4yLEN|T);xQEN)uwa5)SPgWgU@
zvAKbu%mi2%jmx9Bb6CrBv6NGSj4VjSg0MB(0R=um7J@!O#GOS3Ex<ht%LgKs$Og^k
zOGAm@4mr0Z`0<$vQ~Wa&ka{!fpQo9dodBgyJAq4QrVVDKeiqC9pQ;f^3=wIM|Flcg
zgnBSCebW4B@#Ofx06H@gIvkrP`0W@rZ*eYdFAfcrPAN*ZYSr$>dPkQu+!Ygd+Id8M
z@6zpEU0-7><J+#)U&I<xux+UYH&pG1=cPJFUQ@Zt4yhGodYjD@+qNvNYB=0}c&#el
zr0TwTB=Nw}6}3~!qtiQEzf)x|TEF~Y=jR=xb?VKvttS`Q7RIHWW1(kWA4pgSNO3|>
zCNzMljmF{fmV(vZcR=xUfA7mZZNyK?67FFgbXMcFD||oiY#Fr0HN2J6x7+WIJCmM>
zt2V@*_`dEO5V$2@id`PMpS(NtP54!>I%NwWJ8NR)znkOJul$o<M{}@a?^(rb-{8If
z2lIB)<wv`&O^+mX=<V2_dF1rtqRWe#TE<z}sXCw7)O+yPedEWMz~8;?rEtGD-F8Q5
z9u!k7X7kjQ(WN`@e%ko)?YjfYY9%@OV#2A~rt8Y4Q|}*5Il1`!srZ4wrV|rgcLt7R
zXMLFYhNQpY)4jOnh340jj)9)xjFyikEe}_X4vmK&PKKu^x~@((zI&$9rYJUmrQM28
zuB_`>2}{;?h=1vBHI`oJ?AxP1yXC;+srnr`yt@5ZOwPD!<h|hwDXq<+2L*#vYWLFG
zn6cwOQr8#Mf3fI;bmyV+*fICs5uvUk@5H12(Xr3Ms|Ui$#<KFV`<kBK`-NZae~{m#
zyR>W_^V@RU@%6tLx)XO-t3TmGt;uakqXR^1oBArN#$w{Idt7(_nwNIiB0t_-S3do%
H!@K8S?9(ld

delta 807
zcmV+?1K9lK3%&-BB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01FZT01FZU(%pXi0000S
zbVXQnQ*UN;cVTj606}DLVr3vkX>w(EZ*psMAVX6$2C~zj0000LbVXQnLvm$dbZKvH
zAXI5>WdJfTFE=kRIeN<jV*mgGmq|oHR5%d@!AomhRT#(N-+#N-+WXwn#6*y$w(*h*
zilq*eI<ylz7WC6N)6d|fvkpZB9V!J82ZbWoL7^5epbbqgY2vx>v-e)>{rfz2>o|Yj
zIakM#%UhMb+@bNp@nA+}SPdDo7O9oAGH1DQ=3VCA#gT5=SO4a&tyI0gXB<SK6xqg@
z0Z$}qgCQV6Cw~!L;IP3sTH3E+Q}ke5gNH)En8?@y4uL~=8W(fHA{RDAbb`8$#5(YF
zqn*$>l?Tx)@mh*J>fn>V;M*DO$H1^SFS^3Cch<$pf*yF%!>ZA7BC6gp=e!vZ_-P71
zp2D>q_zdI2D$rmwM2@mERUiSmfZ;i1$#={-A0h(ouYX{B0RLr}3jS#Wk6U=NhWAF1
z-(8%#a2X*GQ&*%;!VOwL1{VU{ox!JTI4SU~g9-4%A-p{@ZWm~ZSQU1I$vc;^EaIey
zvkVDH86Ga-c?-eBsl<tc0ow+R1E@{oiedqpA`(y>3NUxLu>~LP!n16=I}{&G#C<o`
z0*Z*zX@8Q`OOZtpmnvtwip)DP4#pQ3;a~s&VEpOgUJn-%43tsPA_P;DOJ*31tr)m6
z0Rh`Vd^dyJOZa{&9=320j9nA6zR+gJTsc*VdBGqiRv1^uuxF4ZZl1u#jGW=sA$<J?
zyc3O|J3yj$Qb;i@LL6}1iWk|re$Kfv5l5}jIDhoLvnufS+IiH%<p?`C)9l1x!?Y@@
zCP3%#xPkq1#+R4G#}g-E?2iIPa5yyHs$ouH-K=@KsTg7VDI4PjuosQ9-uZ1|ygo8+
zyd+8~43bd+1^8v=JZK7MrDoZQ`Npr=H_sQ>|H$#?(3yDKFI$%htO#ZKU{k0-ZZa!I
lYapPVx|%k<PF^v)^FK7Di<KkG{g40v002ovPDHLkV1hSMYZL$g


From 055fdfa9c665ef415015ed80b40e636f4435b352 Mon Sep 17 00:00:00 2001
From: Robert Utter <utter.robert@gmail.com>
Date: Wed, 24 Sep 2014 17:01:05 -0700
Subject: [PATCH 1679/2864] Update tests to match new Twitter icon

---
 .../basic/theme/images/icons/twitter.png       | Bin 830 -> 1509 bytes
 .../custom/theme/images/icons/twitter.png      | Bin 830 -> 1509 bytes
 .../theme/images/icons/twitter.png             | Bin 830 -> 1509 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/pelican/tests/output/basic/theme/images/icons/twitter.png b/pelican/tests/output/basic/theme/images/icons/twitter.png
index d0ef3cc1b36ab79ac7931c2269b70f3662950a97..057ab004b5d826e151a4f9cc6a66d88caffa8911 100644
GIT binary patch
literal 1509
zcmbVMT}%{L6dqg_sA8nmMy!cU7j3A8ow>X0-^j}T%x<BwNC7Kp)$TBJVJEmd<Ln>{
ziioWWjRg{0+q5?FKw6$ECbfwv%~C-uL8X=08cY)ugvM&sqT&xSy$h`N!T8Y0%-nm=
zobNl|IrrRYEXaRz;rv(TV;HtDH-|1nV^ZWvh(qs`357w!GTBuk7YSu@6(d2+&IzRu
z&-F9qun;m_^|n5kg<&cmUtA)Wc=9M#@N1cfk2d5N5gNm?vO^-nRzMjqh2?y}s=4_?
zScCJNRkP9HAw8lK`uLn02^Q7l7qc}LtcBBLuf?-M6e93LnZZN;t$`pFvT9~{DKw9m
z2@O8uB3D>7v!Y5o1-Mg?Aa2m=GguM;+-TH-OoPz~(s3OLbOecRV+P2i3`R<4!sjjx
ziY9SoR3Yu2i-lHJjZc<EiXf`0s<c&ltss>Xz+$mPICQ!U<dG4q4#-R>BM?lDGSD!{
zO1voZLI962GNnSLY}Fv8vnlvRkLL+-AUIbjR5BvOhy>7*gx?>@YsNb$7s979p6MMd
zt`;Ft2!leU#G?HuOO1k2?VcYf;)v8x>m?p-3bU0K*h)VP$hovtgT81vo}=6*lN$h2
zCTY@<Ml(R^XF45DquEZ=CWkB266JUn)@3#Vy~}O4yLEN|T);xQEN)uwa5)SPgWgU@
zvAKbu%mi2%jmx9Bb6CrBv6NGSj4VjSg0MB(0R=um7J@!O#GOS3Ex<ht%LgKs$Og^k
zOGAm@4mr0Z`0<$vQ~Wa&ka{!fpQo9dodBgyJAq4QrVVDKeiqC9pQ;f^3=wIM|Flcg
zgnBSCebW4B@#Ofx06H@gIvkrP`0W@rZ*eYdFAfcrPAN*ZYSr$>dPkQu+!Ygd+Id8M
z@6zpEU0-7><J+#)U&I<xux+UYH&pG1=cPJFUQ@Zt4yhGodYjD@+qNvNYB=0}c&#el
zr0TwTB=Nw}6}3~!qtiQEzf)x|TEF~Y=jR=xb?VKvttS`Q7RIHWW1(kWA4pgSNO3|>
zCNzMljmF{fmV(vZcR=xUfA7mZZNyK?67FFgbXMcFD||oiY#Fr0HN2J6x7+WIJCmM>
zt2V@*_`dEO5V$2@id`PMpS(NtP54!>I%NwWJ8NR)znkOJul$o<M{}@a?^(rb-{8If
z2lIB)<wv`&O^+mX=<V2_dF1rtqRWe#TE<z}sXCw7)O+yPedEWMz~8;?rEtGD-F8Q5
z9u!k7X7kjQ(WN`@e%ko)?YjfYY9%@OV#2A~rt8Y4Q|}*5Il1`!srZ4wrV|rgcLt7R
zXMLFYhNQpY)4jOnh340jj)9)xjFyikEe}_X4vmK&PKKu^x~@((zI&$9rYJUmrQM28
zuB_`>2}{;?h=1vBHI`oJ?AxP1yXC;+srnr`yt@5ZOwPD!<h|hwDXq<+2L*#vYWLFG
zn6cwOQr8#Mf3fI;bmyV+*fICs5uvUk@5H12(Xr3Ms|Ui$#<KFV`<kBK`-NZae~{m#
zyR>W_^V@RU@%6tLx)XO-t3TmGt;uakqXR^1oBArN#$w{Idt7(_nwNIiB0t_-S3do%
H!@K8S?9(ld

delta 807
zcmV+?1K9lK3%&-BB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01FZT01FZU(%pXi0000S
zbVXQnQ*UN;cVTj606}DLVr3vkX>w(EZ*psMAVX6$2C~zj0000LbVXQnLvm$dbZKvH
zAXI5>WdJfTFE=kRIeN<jV*mgGmq|oHR5%d@!AomhRT#(N-+#N-+WXwn#6*y$w(*h*
zilq*eI<ylz7WC6N)6d|fvkpZB9V!J82ZbWoL7^5epbbqgY2vx>v-e)>{rfz2>o|Yj
zIakM#%UhMb+@bNp@nA+}SPdDo7O9oAGH1DQ=3VCA#gT5=SO4a&tyI0gXB<SK6xqg@
z0Z$}qgCQV6Cw~!L;IP3sTH3E+Q}ke5gNH)En8?@y4uL~=8W(fHA{RDAbb`8$#5(YF
zqn*$>l?Tx)@mh*J>fn>V;M*DO$H1^SFS^3Cch<$pf*yF%!>ZA7BC6gp=e!vZ_-P71
zp2D>q_zdI2D$rmwM2@mERUiSmfZ;i1$#={-A0h(ouYX{B0RLr}3jS#Wk6U=NhWAF1
z-(8%#a2X*GQ&*%;!VOwL1{VU{ox!JTI4SU~g9-4%A-p{@ZWm~ZSQU1I$vc;^EaIey
zvkVDH86Ga-c?-eBsl<tc0ow+R1E@{oiedqpA`(y>3NUxLu>~LP!n16=I}{&G#C<o`
z0*Z*zX@8Q`OOZtpmnvtwip)DP4#pQ3;a~s&VEpOgUJn-%43tsPA_P;DOJ*31tr)m6
z0Rh`Vd^dyJOZa{&9=320j9nA6zR+gJTsc*VdBGqiRv1^uuxF4ZZl1u#jGW=sA$<J?
zyc3O|J3yj$Qb;i@LL6}1iWk|re$Kfv5l5}jIDhoLvnufS+IiH%<p?`C)9l1x!?Y@@
zCP3%#xPkq1#+R4G#}g-E?2iIPa5yyHs$ouH-K=@KsTg7VDI4PjuosQ9-uZ1|ygo8+
zyd+8~43bd+1^8v=JZK7MrDoZQ`Npr=H_sQ>|H$#?(3yDKFI$%htO#ZKU{k0-ZZa!I
lYapPVx|%k<PF^v)^FK7Di<KkG{g40v002ovPDHLkV1hSMYZL$g

diff --git a/pelican/tests/output/custom/theme/images/icons/twitter.png b/pelican/tests/output/custom/theme/images/icons/twitter.png
index d0ef3cc1b36ab79ac7931c2269b70f3662950a97..057ab004b5d826e151a4f9cc6a66d88caffa8911 100644
GIT binary patch
literal 1509
zcmbVMT}%{L6dqg_sA8nmMy!cU7j3A8ow>X0-^j}T%x<BwNC7Kp)$TBJVJEmd<Ln>{
ziioWWjRg{0+q5?FKw6$ECbfwv%~C-uL8X=08cY)ugvM&sqT&xSy$h`N!T8Y0%-nm=
zobNl|IrrRYEXaRz;rv(TV;HtDH-|1nV^ZWvh(qs`357w!GTBuk7YSu@6(d2+&IzRu
z&-F9qun;m_^|n5kg<&cmUtA)Wc=9M#@N1cfk2d5N5gNm?vO^-nRzMjqh2?y}s=4_?
zScCJNRkP9HAw8lK`uLn02^Q7l7qc}LtcBBLuf?-M6e93LnZZN;t$`pFvT9~{DKw9m
z2@O8uB3D>7v!Y5o1-Mg?Aa2m=GguM;+-TH-OoPz~(s3OLbOecRV+P2i3`R<4!sjjx
ziY9SoR3Yu2i-lHJjZc<EiXf`0s<c&ltss>Xz+$mPICQ!U<dG4q4#-R>BM?lDGSD!{
zO1voZLI962GNnSLY}Fv8vnlvRkLL+-AUIbjR5BvOhy>7*gx?>@YsNb$7s979p6MMd
zt`;Ft2!leU#G?HuOO1k2?VcYf;)v8x>m?p-3bU0K*h)VP$hovtgT81vo}=6*lN$h2
zCTY@<Ml(R^XF45DquEZ=CWkB266JUn)@3#Vy~}O4yLEN|T);xQEN)uwa5)SPgWgU@
zvAKbu%mi2%jmx9Bb6CrBv6NGSj4VjSg0MB(0R=um7J@!O#GOS3Ex<ht%LgKs$Og^k
zOGAm@4mr0Z`0<$vQ~Wa&ka{!fpQo9dodBgyJAq4QrVVDKeiqC9pQ;f^3=wIM|Flcg
zgnBSCebW4B@#Ofx06H@gIvkrP`0W@rZ*eYdFAfcrPAN*ZYSr$>dPkQu+!Ygd+Id8M
z@6zpEU0-7><J+#)U&I<xux+UYH&pG1=cPJFUQ@Zt4yhGodYjD@+qNvNYB=0}c&#el
zr0TwTB=Nw}6}3~!qtiQEzf)x|TEF~Y=jR=xb?VKvttS`Q7RIHWW1(kWA4pgSNO3|>
zCNzMljmF{fmV(vZcR=xUfA7mZZNyK?67FFgbXMcFD||oiY#Fr0HN2J6x7+WIJCmM>
zt2V@*_`dEO5V$2@id`PMpS(NtP54!>I%NwWJ8NR)znkOJul$o<M{}@a?^(rb-{8If
z2lIB)<wv`&O^+mX=<V2_dF1rtqRWe#TE<z}sXCw7)O+yPedEWMz~8;?rEtGD-F8Q5
z9u!k7X7kjQ(WN`@e%ko)?YjfYY9%@OV#2A~rt8Y4Q|}*5Il1`!srZ4wrV|rgcLt7R
zXMLFYhNQpY)4jOnh340jj)9)xjFyikEe}_X4vmK&PKKu^x~@((zI&$9rYJUmrQM28
zuB_`>2}{;?h=1vBHI`oJ?AxP1yXC;+srnr`yt@5ZOwPD!<h|hwDXq<+2L*#vYWLFG
zn6cwOQr8#Mf3fI;bmyV+*fICs5uvUk@5H12(Xr3Ms|Ui$#<KFV`<kBK`-NZae~{m#
zyR>W_^V@RU@%6tLx)XO-t3TmGt;uakqXR^1oBArN#$w{Idt7(_nwNIiB0t_-S3do%
H!@K8S?9(ld

delta 807
zcmV+?1K9lK3%&-BB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01FZT01FZU(%pXi0000S
zbVXQnQ*UN;cVTj606}DLVr3vkX>w(EZ*psMAVX6$2C~zj0000LbVXQnLvm$dbZKvH
zAXI5>WdJfTFE=kRIeN<jV*mgGmq|oHR5%d@!AomhRT#(N-+#N-+WXwn#6*y$w(*h*
zilq*eI<ylz7WC6N)6d|fvkpZB9V!J82ZbWoL7^5epbbqgY2vx>v-e)>{rfz2>o|Yj
zIakM#%UhMb+@bNp@nA+}SPdDo7O9oAGH1DQ=3VCA#gT5=SO4a&tyI0gXB<SK6xqg@
z0Z$}qgCQV6Cw~!L;IP3sTH3E+Q}ke5gNH)En8?@y4uL~=8W(fHA{RDAbb`8$#5(YF
zqn*$>l?Tx)@mh*J>fn>V;M*DO$H1^SFS^3Cch<$pf*yF%!>ZA7BC6gp=e!vZ_-P71
zp2D>q_zdI2D$rmwM2@mERUiSmfZ;i1$#={-A0h(ouYX{B0RLr}3jS#Wk6U=NhWAF1
z-(8%#a2X*GQ&*%;!VOwL1{VU{ox!JTI4SU~g9-4%A-p{@ZWm~ZSQU1I$vc;^EaIey
zvkVDH86Ga-c?-eBsl<tc0ow+R1E@{oiedqpA`(y>3NUxLu>~LP!n16=I}{&G#C<o`
z0*Z*zX@8Q`OOZtpmnvtwip)DP4#pQ3;a~s&VEpOgUJn-%43tsPA_P;DOJ*31tr)m6
z0Rh`Vd^dyJOZa{&9=320j9nA6zR+gJTsc*VdBGqiRv1^uuxF4ZZl1u#jGW=sA$<J?
zyc3O|J3yj$Qb;i@LL6}1iWk|re$Kfv5l5}jIDhoLvnufS+IiH%<p?`C)9l1x!?Y@@
zCP3%#xPkq1#+R4G#}g-E?2iIPa5yyHs$ouH-K=@KsTg7VDI4PjuosQ9-uZ1|ygo8+
zyd+8~43bd+1^8v=JZK7MrDoZQ`Npr=H_sQ>|H$#?(3yDKFI$%htO#ZKU{k0-ZZa!I
lYapPVx|%k<PF^v)^FK7Di<KkG{g40v002ovPDHLkV1hSMYZL$g

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/twitter.png b/pelican/tests/output/custom_locale/theme/images/icons/twitter.png
index d0ef3cc1b36ab79ac7931c2269b70f3662950a97..057ab004b5d826e151a4f9cc6a66d88caffa8911 100644
GIT binary patch
literal 1509
zcmbVMT}%{L6dqg_sA8nmMy!cU7j3A8ow>X0-^j}T%x<BwNC7Kp)$TBJVJEmd<Ln>{
ziioWWjRg{0+q5?FKw6$ECbfwv%~C-uL8X=08cY)ugvM&sqT&xSy$h`N!T8Y0%-nm=
zobNl|IrrRYEXaRz;rv(TV;HtDH-|1nV^ZWvh(qs`357w!GTBuk7YSu@6(d2+&IzRu
z&-F9qun;m_^|n5kg<&cmUtA)Wc=9M#@N1cfk2d5N5gNm?vO^-nRzMjqh2?y}s=4_?
zScCJNRkP9HAw8lK`uLn02^Q7l7qc}LtcBBLuf?-M6e93LnZZN;t$`pFvT9~{DKw9m
z2@O8uB3D>7v!Y5o1-Mg?Aa2m=GguM;+-TH-OoPz~(s3OLbOecRV+P2i3`R<4!sjjx
ziY9SoR3Yu2i-lHJjZc<EiXf`0s<c&ltss>Xz+$mPICQ!U<dG4q4#-R>BM?lDGSD!{
zO1voZLI962GNnSLY}Fv8vnlvRkLL+-AUIbjR5BvOhy>7*gx?>@YsNb$7s979p6MMd
zt`;Ft2!leU#G?HuOO1k2?VcYf;)v8x>m?p-3bU0K*h)VP$hovtgT81vo}=6*lN$h2
zCTY@<Ml(R^XF45DquEZ=CWkB266JUn)@3#Vy~}O4yLEN|T);xQEN)uwa5)SPgWgU@
zvAKbu%mi2%jmx9Bb6CrBv6NGSj4VjSg0MB(0R=um7J@!O#GOS3Ex<ht%LgKs$Og^k
zOGAm@4mr0Z`0<$vQ~Wa&ka{!fpQo9dodBgyJAq4QrVVDKeiqC9pQ;f^3=wIM|Flcg
zgnBSCebW4B@#Ofx06H@gIvkrP`0W@rZ*eYdFAfcrPAN*ZYSr$>dPkQu+!Ygd+Id8M
z@6zpEU0-7><J+#)U&I<xux+UYH&pG1=cPJFUQ@Zt4yhGodYjD@+qNvNYB=0}c&#el
zr0TwTB=Nw}6}3~!qtiQEzf)x|TEF~Y=jR=xb?VKvttS`Q7RIHWW1(kWA4pgSNO3|>
zCNzMljmF{fmV(vZcR=xUfA7mZZNyK?67FFgbXMcFD||oiY#Fr0HN2J6x7+WIJCmM>
zt2V@*_`dEO5V$2@id`PMpS(NtP54!>I%NwWJ8NR)znkOJul$o<M{}@a?^(rb-{8If
z2lIB)<wv`&O^+mX=<V2_dF1rtqRWe#TE<z}sXCw7)O+yPedEWMz~8;?rEtGD-F8Q5
z9u!k7X7kjQ(WN`@e%ko)?YjfYY9%@OV#2A~rt8Y4Q|}*5Il1`!srZ4wrV|rgcLt7R
zXMLFYhNQpY)4jOnh340jj)9)xjFyikEe}_X4vmK&PKKu^x~@((zI&$9rYJUmrQM28
zuB_`>2}{;?h=1vBHI`oJ?AxP1yXC;+srnr`yt@5ZOwPD!<h|hwDXq<+2L*#vYWLFG
zn6cwOQr8#Mf3fI;bmyV+*fICs5uvUk@5H12(Xr3Ms|Ui$#<KFV`<kBK`-NZae~{m#
zyR>W_^V@RU@%6tLx)XO-t3TmGt;uakqXR^1oBArN#$w{Idt7(_nwNIiB0t_-S3do%
H!@K8S?9(ld

delta 807
zcmV+?1K9lK3%&-BB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01FZT01FZU(%pXi0000S
zbVXQnQ*UN;cVTj606}DLVr3vkX>w(EZ*psMAVX6$2C~zj0000LbVXQnLvm$dbZKvH
zAXI5>WdJfTFE=kRIeN<jV*mgGmq|oHR5%d@!AomhRT#(N-+#N-+WXwn#6*y$w(*h*
zilq*eI<ylz7WC6N)6d|fvkpZB9V!J82ZbWoL7^5epbbqgY2vx>v-e)>{rfz2>o|Yj
zIakM#%UhMb+@bNp@nA+}SPdDo7O9oAGH1DQ=3VCA#gT5=SO4a&tyI0gXB<SK6xqg@
z0Z$}qgCQV6Cw~!L;IP3sTH3E+Q}ke5gNH)En8?@y4uL~=8W(fHA{RDAbb`8$#5(YF
zqn*$>l?Tx)@mh*J>fn>V;M*DO$H1^SFS^3Cch<$pf*yF%!>ZA7BC6gp=e!vZ_-P71
zp2D>q_zdI2D$rmwM2@mERUiSmfZ;i1$#={-A0h(ouYX{B0RLr}3jS#Wk6U=NhWAF1
z-(8%#a2X*GQ&*%;!VOwL1{VU{ox!JTI4SU~g9-4%A-p{@ZWm~ZSQU1I$vc;^EaIey
zvkVDH86Ga-c?-eBsl<tc0ow+R1E@{oiedqpA`(y>3NUxLu>~LP!n16=I}{&G#C<o`
z0*Z*zX@8Q`OOZtpmnvtwip)DP4#pQ3;a~s&VEpOgUJn-%43tsPA_P;DOJ*31tr)m6
z0Rh`Vd^dyJOZa{&9=320j9nA6zR+gJTsc*VdBGqiRv1^uuxF4ZZl1u#jGW=sA$<J?
zyc3O|J3yj$Qb;i@LL6}1iWk|re$Kfv5l5}jIDhoLvnufS+IiH%<p?`C)9l1x!?Y@@
zCP3%#xPkq1#+R4G#}g-E?2iIPa5yyHs$ouH-K=@KsTg7VDI4PjuosQ9-uZ1|ygo8+
zyd+8~43bd+1^8v=JZK7MrDoZQ`Npr=H_sQ>|H$#?(3yDKFI$%htO#ZKU{k0-ZZa!I
lYapPVx|%k<PF^v)^FK7Di<KkG{g40v002ovPDHLkV1hSMYZL$g


From 5e2e88ca92efcfd2196f3392e5a6116d70d8670f Mon Sep 17 00:00:00 2001
From: Stefan 'hr' Berder <hr@bonz.org>
Date: Sun, 28 Sep 2014 00:33:05 +0800
Subject: [PATCH 1680/2864] add objects details to theme docs

---
 docs/themes.rst | 102 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)

diff --git a/docs/themes.rst b/docs/themes.rst
index 4be9a8e5..16453881 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -316,6 +316,108 @@ period                  A tuple of the form (`year`, `month`, `day`) that
 You can see an example of how to use `period` in the ``simple`` theme's
 period_archives.html
 
+Objects
+=======
+
+Detail objects attributes that are available and useful in templates. Not all
+attributes are listed here, this is a selection of attributes considered useful
+in a template.
+
+.. _object-article:
+
+Article
+-------
+
+The string representation of an Article is the `source_path` attribute.
+
+===================     ===================================================
+Attribute               Description
+===================     ===================================================
+author                  The :ref:`Author <object-author_cat_tag>` of
+                        this article.
+authors                 A list of :ref:`Authors <object-author_cat_tag>`
+                        of this article.
+category                The :ref:`Category <object-author_cat_tag>`
+                        of this article.
+content                 The rendered content of the article.
+date                    Datetime object representing the article date.
+date_format             Either default date format or locale date format.
+default_template        Default template name.
+in_default_lang         Boolean representing if the article is written
+                        in the default language.
+lang                    Language of the article.
+locale_date             Date formated by the `date_format`.
+metadata                Article header metadata `dict`.
+save_as                 Location to save the article page.
+slug                    Page slug.
+source_path             Full system path of the article source file.
+status                  The article status, can be any of 'published' or
+                        'draft'.
+summary                 Rendered summary content.
+tags                    List of :ref:`Tag <object-author_cat_tab>`
+                        objects.
+template                Template name to use for rendering.
+title                   Title of the article.
+translations            List of translations
+                        :ref:`Article <object-article>` objects.
+url                     URL to the article page.
+===================     ===================================================
+
+.. _object-author_cat_tag:
+
+Author / Category / Tag
+-----------------------
+
+The string representation of those objects is the `name` attribute.
+
+===================     ===================================================
+Attribute               Description
+===================     ===================================================
+name                    Name of this object [1]_.
+page_name               Author page name.
+save_as                 Location to save the author page.
+slug                    Page slug.
+url                     URL to the author page.
+===================     ===================================================
+
+.. [1] for Author object, coming from `:authors:` or `AUTHOR`.
+
+.. _object-page:
+
+Page
+----
+
+The string representation of a Page is the `source_path` attribute.
+
+===================     ===================================================
+Attribute               Description
+===================     ===================================================
+author                  The :ref:`Author <object-author_cat_tag>` of
+                        this page.
+content                 The rendered content of the page.
+date                    Datetime object representing the page date.
+date_format             Either default date format or locale date format.
+default_template        Default template name.
+in_default_lang         Boolean representing if the article is written
+                        in the default language.
+lang                    Language of the article.
+locale_date             Date formated by the `date_format`.
+metadata                Page header metadata `dict`.
+save_as                 Location to save the page.
+slug                    Page slug.
+source_path             Full system path of the page source file.
+status                  The page status, can be any of 'published' or
+                        'draft'.
+summary                 Rendered summary content.
+tags                    List of :ref:`Tag <object-author_cat_tab>`
+                        objects.
+template                Template name to use for rendering.
+title                   Title of the page.
+translations            List of translations
+                        :ref:`Article <object-article>` objects.
+url                     URL to the page.
+===================     ===================================================
+
 Feeds
 =====
 

From 9b4b123a0ea56af6c74e4d2596a9f9db5dcbb869 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Mon, 29 Sep 2014 23:38:39 +0200
Subject: [PATCH 1681/2864] add missing author feeds to pelicanconf template

---
 pelican/tools/templates/pelicanconf.py.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in
index 1a02a9de..e9570c4a 100644
--- a/pelican/tools/templates/pelicanconf.py.in
+++ b/pelican/tools/templates/pelicanconf.py.in
@@ -16,6 +16,8 @@ DEFAULT_LANG = $lang
 FEED_ALL_ATOM = None
 CATEGORY_FEED_ATOM = None
 TRANSLATION_FEED_ATOM = None
+AUTHOR_FEED_ATOM = None
+AUTHOR_FEED_RSS = None
 
 # Blogroll
 LINKS = (('Pelican', 'http://getpelican.com/'),

From 693ad3296cc86915002bb86edc8dc08b714ed46e Mon Sep 17 00:00:00 2001
From: tylerhartley <tyleha@gmail.com>
Date: Fri, 19 Sep 2014 18:45:43 -0700
Subject: [PATCH 1682/2864] EXTRA_PATH_METADATA path separator is OS-specific

Updating docs for EXTRA_PATH_METADATA to clarify that OS-specific path
separators must be used as keys, unlike some other Pelican variables.
Refs # 1133.
---
 docs/settings.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index bd29a409..7a3f08e6 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -74,7 +74,9 @@ Setting name (followed by default value, if any)
 ``PATH_METADATA = ''``                                                           Like ``FILENAME_METADATA``, but parsed from a page's
                                                                                  full path relative to the content source directory.
                                                                                  See :ref:`path_metadata`.
-``EXTRA_PATH_METADATA = {}``                                                     Extra metadata dictionaries keyed by relative path.
+``EXTRA_PATH_METADATA = {}``                                                     Extra metadata dictionaries keyed by relative path. Relative paths
+                                                                                 require correct OS-specific directory separators (i.e. / in UNIX and
+                                                                                 \\ in Windows) unlike some other Pelican file settings.
                                                                                  See :ref:`path_metadata`.
 ``DELETE_OUTPUT_DIRECTORY = False``                                              Delete the output directory, and **all** of its contents, before
                                                                                  generating new files. This can be useful in preventing older,

From 96eaf9cea0af099025a4ff6812752fe3b2909085 Mon Sep 17 00:00:00 2001
From: Forest <web11.forest@tibit.com>
Date: Wed, 1 Oct 2014 02:02:29 -0700
Subject: [PATCH 1683/2864] Spelling correction in docs: usefull -> useful.

---
 docs/plugins.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 01e67810..27299e83 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -67,7 +67,7 @@ Signal                              Arguments                       Description
 =================================   ============================   ===========================================================================
 initialized                         pelican object
 finalized                           pelican object                 invoked after all the generators are executed and just before pelican exits
-                                                                   usefull for custom post processing actions, such as:
+                                                                   useful for custom post processing actions, such as:
                                                                    - minifying js/css assets.
                                                                    - notify/ping search engines with an updated sitemap.
 generator_init                      generator                      invoked in the Generator.__init__

From 17fd1764615631e4d38ef27033b2d1e31e9d62e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Wirtel?= <stephane@wirtel.be>
Date: Sun, 12 Oct 2014 12:37:04 +0100
Subject: [PATCH 1684/2864] fix the parameters for a logging.warning call

---
 pelican/urlwrappers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index f92d1963..06cfa2ab 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -70,7 +70,7 @@ class URLWrapper(object):
         setting = "%s_%s" % (self.__class__.__name__.upper(), key)
         value = self.settings[setting]
         if not isinstance(value, six.string_types):
-            logger.warning('%s is set to %s', (setting, value))
+            logger.warning('%s is set to %s', setting, value)
             return value
         else:
             if get_page_name:

From 99e734cb71f26d2a3cafa71a6f6373fbb0c8fda5 Mon Sep 17 00:00:00 2001
From: Jeff Dairiki <dairiki@dairiki.org>
Date: Thu, 16 Oct 2014 06:56:43 -0700
Subject: [PATCH 1685/2864] Add tests for abbr_role. Refs #949

---
 pelican/tests/test_rstdirectives.py | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pelican/tests/test_rstdirectives.py

diff --git a/pelican/tests/test_rstdirectives.py b/pelican/tests/test_rstdirectives.py
new file mode 100644
index 00000000..ae863b30
--- /dev/null
+++ b/pelican/tests/test_rstdirectives.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+
+from mock import Mock
+from pelican.tests.support import unittest
+
+class Test_abbr_role(unittest.TestCase):
+    def call_it(self, text):
+        from pelican.rstdirectives import abbr_role
+        rawtext = text
+        lineno = 42
+        inliner = Mock(name='inliner')
+        nodes, system_messages = abbr_role(
+            'abbr', rawtext, text, lineno, inliner)
+        self.assertEqual(system_messages, [])
+        self.assertEqual(len(nodes), 1)
+        return nodes[0]
+
+    def test(self):
+        node = self.call_it("Abbr (Abbreviation)")
+        self.assertEqual(node.astext(), "Abbr")
+        self.assertEqual(node['explanation'], "Abbreviation")
+
+    def test_newlines_in_explanation(self):
+        node = self.call_it("CUL (See you\nlater)")
+        self.assertEqual(node.astext(), "CUL")
+        self.assertEqual(node['explanation'], "See you\nlater")
+
+    def test_newlines_in_abbr(self):
+        node = self.call_it("US of\nA \n (USA)")
+        self.assertEqual(node.astext(), "US of\nA")
+        self.assertEqual(node['explanation'], "USA")

From 10c0002af1ac347d378cba6393120c4fec41c19c Mon Sep 17 00:00:00 2001
From: Jeff Dairiki <dairiki@dairiki.org>
Date: Thu, 16 Oct 2014 06:59:32 -0700
Subject: [PATCH 1686/2864] Fix bug with custom reST :abbr: role. Fixes #949

This fixes things so that newlines are allowed within the explanation of
an :abbr: role in reST mark-up.
---
 pelican/rstdirectives.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index 1bf6971c..1c25cc42 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -70,7 +70,7 @@ directives.register_directive('code-block', Pygments)
 directives.register_directive('sourcecode', Pygments)
 
 
-_abbr_re = re.compile('\((.*)\)$')
+_abbr_re = re.compile('\((.*)\)$', re.DOTALL)
 
 
 class abbreviation(nodes.Inline, nodes.TextElement):

From 5b389d6f36bcab96bad7b4cd5fdf5378710a802c Mon Sep 17 00:00:00 2001
From: Olivier Verdier <olivier.verdier@gmail.com>
Date: Mon, 20 Oct 2014 15:22:11 +0200
Subject: [PATCH 1687/2864] fix missing tab in Makefile template

---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index a8ffd6ca..8534595e 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -97,7 +97,7 @@ ftp_upload: publish
 	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
 
 s3_upload: publish
-        s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type
+	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type
 
 cf_upload: publish
 	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .

From 48f4f0850d7fbbe2b03f1fbd309768b7ae940822 Mon Sep 17 00:00:00 2001
From: Forest <web11.forest@tibit.com>
Date: Sat, 18 Oct 2014 13:11:59 -0700
Subject: [PATCH 1688/2864] Make StaticGenerator skip content sources. Refs
 #1019.

This change partially addresses issue #1019, by teaching Pelican to distinguish
between static files and content source files. A user can now safely add the
same directory to both STATIC_PATHS and PAGE_PATHS (or ARTICLE_PATHS). Pelican
will then process the content source files in that directory normally, and
treat the remaining files as static, without copying the raw content source
files to the output directory. (The OUTPUT_SOURCES setting still works.)

In other words, images and markdown/reST files can now safely live together.

To keep those files together in the generated site, STATIC_SAVE_AS and
PAGE_SAVE_AS (or ARTICLE_SAVE_AS) should point to the same output directory.

There are two new configuration settings:

STATIC_EXCLUDES=[]  # This works just like PAGE_EXCLUDES and ARTICLE_EXCLUDES.
STATIC_EXCLUDE_SOURCES=True  # Set this to False to get the old behavior.

Two small but noteworthy internal changes:

StaticGenerator now runs after all the other generators. This allows it to see
which files are meant to be processed by other generators, and avoid them.

Generators now include files that they fail to process (e.g. those with missing
mandatory metadata) along with all the other paths in context['filenames'].
This allows such files to be excluded from StaticGenerator's file list, so they
won't end up accidentally published. Since these files have no Content object,
their value in context['filenames'] is None. The code that uses that dict has
been updated accordingly.
---
 docs/settings.rst                             | 13 ++--
 pelican/__init__.py                           | 10 ++-
 pelican/contents.py                           |  2 +-
 pelican/generators.py                         | 29 ++++++++
 pelican/settings.py                           |  5 +-
 pelican/tests/mixed_content/fake_image.jpg    |  0
 pelican/tests/mixed_content/short_page.md     |  3 +
 .../subdir/subdir_fake_image.jpg              |  0
 pelican/tests/test_generators.py              | 68 ++++++++++++++++++-
 pelican/tests/test_pelican.py                 | 11 +++
 10 files changed, 131 insertions(+), 10 deletions(-)
 create mode 100644 pelican/tests/mixed_content/fake_image.jpg
 create mode 100644 pelican/tests/mixed_content/short_page.md
 create mode 100644 pelican/tests/mixed_content/subdir/subdir_fake_image.jpg

diff --git a/docs/settings.rst b/docs/settings.rst
index 7a3f08e6..d785cf9b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -142,10 +142,15 @@ Setting name (followed by default value, if any)
                                                                                  slash at the end. Example: ``SITEURL = 'http://mydomain.com'``
 ``TEMPLATE_PAGES = None``                                                        A mapping containing template pages that will be rendered with
                                                                                  the blog entries. See :ref:`template_pages`.
-``STATIC_PATHS = ['images']``                                                    The static paths you want to have accessible
-                                                                                 on the output path "static". By default,
-                                                                                 Pelican will copy the "images" folder to the
-                                                                                 output folder.
+``STATIC_PATHS = ['images']``                                                    A list of directories (relative to ``PATH``) in which to look for
+                                                                                 static files. Such files will be copied to the output directory
+                                                                                 without modification. Articles, pages, and other content source
+                                                                                 files will normally be skipped, so it is safe for a directory to
+                                                                                 appear both here and in ``PAGE_PATHS`` or ``ARTICLE_PATHS``.
+                                                                                 Pelican's default settings include the "images" directory here.
+``STATIC_EXCLUDES = []``                                                         A list of directories to exclude when looking for static files.
+``STATIC_EXCLUDE_SOURCES = True``                                                If set to False, content source files will not be skipped when
+                                                                                 copying files found in ``STATIC_PATHS``.
 ``TIMEZONE``                                                                     The timezone used in the date information, to
                                                                                  generate Atom and RSS feeds. See the *Timezone*
                                                                                  section below for more info.
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 3080be37..455201be 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -144,8 +144,10 @@ class Pelican(object):
         start_time = time.time()
 
         context = self.settings.copy()
-        context['filenames'] = {}  # share the dict between all the generators
-        context['localsiteurl'] = self.settings['SITEURL']  # share
+        # Share these among all the generators and content objects:
+        context['filenames'] = {}  # maps source path to Content object or None
+        context['localsiteurl'] = self.settings['SITEURL'] 
+
         generators = [
             cls(
                 context=context,
@@ -188,7 +190,7 @@ class Pelican(object):
             time.time() - start_time))
 
     def get_generator_classes(self):
-        generators = [StaticGenerator, ArticlesGenerator, PagesGenerator]
+        generators = [ArticlesGenerator, PagesGenerator]
 
         if self.settings['TEMPLATE_PAGES']:
             generators.append(TemplatePagesGenerator)
@@ -206,6 +208,8 @@ class Pelican(object):
                     logger.debug('Found generator: %s', v)
                     generators.append(v)
 
+        # StaticGenerator runs last so it can see which files the others handle
+        generators.append(StaticGenerator)
         return generators
 
     def get_writer(self):
diff --git a/pelican/contents.py b/pelican/contents.py
index 2e17b56f..433d1ac7 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -234,7 +234,7 @@ class Content(object):
                     if unquoted_path in self._context['filenames']:
                         path = unquoted_path
 
-                if path in self._context['filenames']:
+                if self._context['filenames'].get(path):
                     origin = '/'.join((siteurl,
                              self._context['filenames'][path].url))
                     origin = origin.replace('\\', '/')  # for Windows paths.
diff --git a/pelican/generators.py b/pelican/generators.py
index 07945f13..4d5cb6cb 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -141,9 +141,27 @@ class Generator(object):
         return files
 
     def add_source_path(self, content):
+        """Record a source file path that a Generator found and processed.
+        Store a reference to its Content object, for url lookups later.
+        """
         location = content.get_relative_source_path()
         self.context['filenames'][location] = content
 
+    def _add_failed_source_path(self, path):
+        """Record a source file path that a Generator failed to process.
+        (For example, one that was missing mandatory metadata.)
+        The path argument is expected to be relative to self.path.
+        """
+        self.context['filenames'][os.path.normpath(path)] = None
+
+    def _is_potential_source_path(self, path):
+        """Return True if path was supposed to be used as a source file.
+        (This includes all source files that have been found by generators
+        before this method is called, even if they failed to process.)
+        The path argument is expected to be relative to self.path.
+        """
+        return os.path.normpath(path) in self.context['filenames']
+
     def _update_context(self, items):
         """Update the context with the given items from the currrent
         processor.
@@ -477,9 +495,11 @@ class ArticlesGenerator(CachingGenerator):
                 except Exception as e:
                     logger.error('Could not process %s\n%s', f, e,
                         exc_info=self.settings.get('DEBUG', False))
+                    self._add_failed_source_path(f)
                     continue
 
                 if not is_valid_content(article, f):
+                    self._add_failed_source_path(f)
                     continue
 
                 self.cache_data(f, article)
@@ -602,9 +622,11 @@ class PagesGenerator(CachingGenerator):
                 except Exception as e:
                     logger.error('Could not process %s\n%s', f, e,
                         exc_info=self.settings.get('DEBUG', False))
+                    self._add_failed_source_path(f)
                     continue
 
                 if not is_valid_content(page, f):
+                    self._add_failed_source_path(f)
                     continue
 
                 self.cache_data(f, page)
@@ -663,7 +685,14 @@ class StaticGenerator(Generator):
     def generate_context(self):
         self.staticfiles = []
         for f in self.get_files(self.settings['STATIC_PATHS'],
+                                exclude=self.settings['STATIC_EXCLUDES'],
                                 extensions=False):
+
+            # skip content source files unless the user explicitly wants them
+            if self.settings['STATIC_EXCLUDE_SOURCES']:
+                if self._is_potential_source_path(f):
+                    continue
+
             static = self.readers.read_file(
                 base_path=self.path, path=f, content_class=Static,
                 fmt='static', context=self.context,
diff --git a/pelican/settings.py b/pelican/settings.py
index 631c6d24..794733d7 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -36,7 +36,9 @@ DEFAULT_CONFIG = {
     'THEME': DEFAULT_THEME,
     'OUTPUT_PATH': 'output',
     'READERS': {},
-    'STATIC_PATHS': ['images', ],
+    'STATIC_PATHS': ['images'],
+    'STATIC_EXCLUDES': [],
+    'STATIC_EXCLUDE_SOURCES': True,
     'THEME_STATIC_DIR': 'theme',
     'THEME_STATIC_PATHS': ['static', ],
     'FEED_ALL_ATOM': os.path.join('feeds', 'all.atom.xml'),
@@ -339,6 +341,7 @@ def configure_settings(settings):
         'JINJA_EXTENSIONS',
         'PAGINATED_DIRECT_TEMPLATES',
         'PLUGINS',
+        'STATIC_EXCLUDES',
         'STATIC_PATHS',
         'THEME_STATIC_PATHS',
         'ARTICLE_PATHS',
diff --git a/pelican/tests/mixed_content/fake_image.jpg b/pelican/tests/mixed_content/fake_image.jpg
new file mode 100644
index 00000000..e69de29b
diff --git a/pelican/tests/mixed_content/short_page.md b/pelican/tests/mixed_content/short_page.md
new file mode 100644
index 00000000..46ca45ac
--- /dev/null
+++ b/pelican/tests/mixed_content/short_page.md
@@ -0,0 +1,3 @@
+Title: Short Page
+
+This is a page with little text.
diff --git a/pelican/tests/mixed_content/subdir/subdir_fake_image.jpg b/pelican/tests/mixed_content/subdir/subdir_fake_image.jpg
new file mode 100644
index 00000000..e69de29b
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 470d3236..2f53ac95 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -12,7 +12,7 @@ from shutil import rmtree
 from tempfile import mkdtemp
 
 from pelican.generators import (Generator, ArticlesGenerator, PagesGenerator,
-                                TemplatePagesGenerator)
+                                StaticGenerator, TemplatePagesGenerator)
 from pelican.writers import Writer
 from pelican.tests.support import unittest, get_settings
 import locale
@@ -558,3 +558,69 @@ class TestTemplatePagesGenerator(unittest.TestCase):
         # output content is correct
         with open(output_path, 'r') as output_file:
             self.assertEqual(output_file.read(), 'foo: bar')
+
+
+class TestStaticGenerator(unittest.TestCase):
+
+    def setUp(self):
+        self.content_path = os.path.join(CUR_DIR, 'mixed_content')
+
+    def test_static_excludes(self):
+        """Test that StaticGenerator respects STATIC_EXCLUDES.
+        """
+        settings = get_settings(STATIC_EXCLUDES=['subdir'],
+            PATH=self.content_path, STATIC_PATHS=[''])
+        context = settings.copy()
+        context['filenames'] = {}
+
+        StaticGenerator(context=context, settings=settings,
+            path=settings['PATH'], output_path=None,
+            theme=settings['THEME']).generate_context()
+
+        staticnames = [os.path.basename(c.source_path)
+            for c in context['staticfiles']]
+
+        self.assertNotIn('subdir_fake_image.jpg', staticnames,
+            "StaticGenerator processed a file in a STATIC_EXCLUDES directory")
+        self.assertIn('fake_image.jpg', staticnames,
+            "StaticGenerator skipped a file that it should have included")
+
+    def test_static_exclude_sources(self):
+        """Test that StaticGenerator respects STATIC_EXCLUDE_SOURCES.
+        """
+        # Test STATIC_EXCLUDE_SOURCES=True
+
+        settings = get_settings(STATIC_EXCLUDE_SOURCES=True,
+            PATH=self.content_path, PAGE_PATHS=[''], STATIC_PATHS=[''],
+            CACHE_CONTENT=False)
+        context = settings.copy()
+        context['filenames'] = {}
+
+        for generator_class in (PagesGenerator, StaticGenerator):
+            generator_class(context=context, settings=settings,
+                path=settings['PATH'], output_path=None,
+                theme=settings['THEME']).generate_context()
+
+        staticnames = [os.path.basename(c.source_path)
+            for c in context['staticfiles']]
+
+        self.assertFalse(any(name.endswith(".md") for name in staticnames),
+            "STATIC_EXCLUDE_SOURCES=True failed to exclude a markdown file")
+
+        # Test STATIC_EXCLUDE_SOURCES=False
+
+        settings.update(STATIC_EXCLUDE_SOURCES=False)
+        context = settings.copy()
+        context['filenames'] = {}
+
+        for generator_class in (PagesGenerator, StaticGenerator):
+            generator_class(context=context, settings=settings,
+                path=settings['PATH'], output_path=None,
+                theme=settings['THEME']).generate_context()
+
+        staticnames = [os.path.basename(c.source_path)
+            for c in context['staticfiles']]
+
+        self.assertTrue(any(name.endswith(".md") for name in staticnames),
+            "STATIC_EXCLUDE_SOURCES=False failed to include a markdown file")
+
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index c851ef81..83988d62 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -10,6 +10,7 @@ import logging
 import subprocess
 
 from pelican import Pelican
+from pelican.generators import StaticGenerator
 from pelican.settings import read_settings
 from pelican.tests.support import LoggedTestCase, mute, locale_available, unittest
 
@@ -75,6 +76,16 @@ class TestPelican(LoggedTestCase):
         assert not out, out
         assert not err, err
 
+    def test_order_of_generators(self):
+        # StaticGenerator must run last, so it can find files that were
+        # skipped by the other generators.
+
+        pelican = Pelican(settings=read_settings(path=None))
+        generator_classes = pelican.get_generator_classes()
+
+        self.assertTrue(generator_classes[-1] is StaticGenerator,
+            "StaticGenerator must be the last generator, but it isn't!")
+
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
         # ones and generate correct output without raising any exception

From 0fe290c321fefabcbd8b2957683063d825e3997d Mon Sep 17 00:00:00 2001
From: Forest <web11.forest@tibit.com>
Date: Sun, 12 Oct 2014 20:34:53 -0700
Subject: [PATCH 1689/2864] Make PAGE_EXCLUDES work with subdirs. Fixes #1500.

The old code was naively comparing the strings in PAGE_EXCLUDES to the
subdirectory names produced by os.walk(). (Same with ARTICLE_EXCLUDES.)
This had two surprising effects:

Setting PAGE_EXCLUDES=['foo'] would exclude all directories named foo,
regardless of whether they were in the top-level content directory or
nested deep within a directory whose contents should not be excluded.

Setting PAGE_EXCLUDES=['subdir/foo'] would never exclude any directories.

In other words, there is no way to exclude a subdirectory without risking
the accidental exclusion of other directories with the same name elsewhere
in the file system.

This change fixes the problem, so 'subdir/foo' and 'foo' will be distinct
and both work as expected. If anyone out there is depending on the old
behavior, they will have to update their settings. I don't expect it to
affect most users yet, since Pelican doesn't yet make nested directory
structures very useful. When it does, this fix will become important to
more people.
---
 pelican/generators.py                         | 12 +++++--
 .../tests/nested_content/maindir/maindir.md   |  3 ++
 .../nested_content/maindir/subdir/subdir.md   |  3 ++
 pelican/tests/test_generators.py              | 32 +++++++++++++++++++
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 pelican/tests/nested_content/maindir/maindir.md
 create mode 100644 pelican/tests/nested_content/maindir/subdir/subdir.md

diff --git a/pelican/generators.py b/pelican/generators.py
index 4d5cb6cb..5122fa6d 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -122,13 +122,21 @@ class Generator(object):
         """
         if isinstance(paths, six.string_types):
             paths = [paths] # backward compatibility for older generators
+
+        # group the exclude dir names by parent path, for use with os.walk()
+        exclusions_by_dirpath = {}
+        for e in exclude:
+            parent_path, subdir = os.path.split(os.path.join(self.path, e))
+            exclusions_by_dirpath.setdefault(parent_path, set()).add(subdir)
+
         files = []
         for path in paths:
-            root = os.path.join(self.path, path)
+            # careful: os.path.join() will add a slash when path == ''.
+            root = os.path.join(self.path, path) if path else self.path
 
             if os.path.isdir(root):
                 for dirpath, dirs, temp_files in os.walk(root, followlinks=True):
-                    for e in exclude:
+                    for e in exclusions_by_dirpath.get(dirpath, ()):
                         if e in dirs:
                             dirs.remove(e)
                     reldir = os.path.relpath(dirpath, self.path)
diff --git a/pelican/tests/nested_content/maindir/maindir.md b/pelican/tests/nested_content/maindir/maindir.md
new file mode 100644
index 00000000..443e1827
--- /dev/null
+++ b/pelican/tests/nested_content/maindir/maindir.md
@@ -0,0 +1,3 @@
+Title: Main Dir Page
+
+This page lives in maindir.
diff --git a/pelican/tests/nested_content/maindir/subdir/subdir.md b/pelican/tests/nested_content/maindir/subdir/subdir.md
new file mode 100644
index 00000000..32e73617
--- /dev/null
+++ b/pelican/tests/nested_content/maindir/subdir/subdir.md
@@ -0,0 +1,3 @@
+Title: Subdir Page
+
+This page lives in maindir/subdir.
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 2f53ac95..4be1b35e 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -41,6 +41,38 @@ class TestGenerator(unittest.TestCase):
         self.assertTrue(include_path(filename, extensions=('rst',)))
         self.assertFalse(include_path(filename, extensions=('md',)))
 
+    def test_get_files_exclude(self):
+        """Test that Generator.get_files() properly excludes directories.
+        """
+        # We use our own Generator so we can give it our own content path
+        generator = Generator(context=self.settings.copy(),
+            settings=self.settings,
+            path=os.path.join(CUR_DIR, 'nested_content'),
+            theme=self.settings['THEME'], output_path=None)
+
+        filepaths = generator.get_files(paths=['maindir'])
+        found_files = {os.path.basename(f) for f in filepaths}
+        expected_files = {'maindir.md', 'subdir.md'}
+        self.assertFalse(expected_files - found_files,
+            "get_files() failed to find one or more files")
+
+        filepaths = generator.get_files(paths=[''], exclude=['maindir'])
+        found_files = {os.path.basename(f) for f in filepaths}
+        self.assertNotIn('maindir.md', found_files,
+            "get_files() failed to exclude a top-level directory")
+        self.assertNotIn('subdir.md', found_files,
+            "get_files() failed to exclude a subdir of an excluded directory")
+
+        filepaths = generator.get_files(paths=[''],
+            exclude=[os.path.join('maindir', 'subdir')])
+        found_files = {os.path.basename(f) for f in filepaths}
+        self.assertNotIn('subdir.md', found_files,
+            "get_files() failed to exclude a subdirectory")
+
+        filepaths = generator.get_files(paths=[''], exclude=['subdir'])
+        found_files = {os.path.basename(f) for f in filepaths}
+        self.assertIn('subdir.md', found_files,
+            "get_files() excluded a subdirectory by name, ignoring its path")
 
 class TestArticlesGenerator(unittest.TestCase):
 

From 72f3b4a116261dd0dd32ce33062a72542b1801de Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Sun, 25 May 2014 13:41:30 +0200
Subject: [PATCH 1690/2864] rework summary attribute

*   write summary property in modern style
*   introduce get_summary which is memoizable, based on localsiteurl
*   introduce get_siteurl
---
 pelican/contents.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 433d1ac7..3194a851 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -261,16 +261,18 @@ class Content(object):
 
     @memoized
     def get_content(self, siteurl):
-
         if hasattr(self, '_get_content'):
             content = self._get_content()
         else:
             content = self._content
         return self._update_content(content, siteurl)
 
+    def get_siteurl(self):
+        return self._context.get('localsiteurl', '')
+
     @property
     def content(self):
-        return self.get_content(self._context.get('localsiteurl', ''))
+        return self.get_content(self.get_siteurl())
 
     def _get_summary(self):
         """Returns the summary of an article.
@@ -279,7 +281,8 @@ class Content(object):
         content.
         """
         if hasattr(self, '_summary'):
-            return self._summary
+            return self._update_content(self._summary,
+                                        self.get_siteurl())
 
         if self.settings['SUMMARY_MAX_LENGTH'] is None:
             return self.content
@@ -287,12 +290,20 @@ class Content(object):
         return truncate_html_words(self.content,
                                    self.settings['SUMMARY_MAX_LENGTH'])
 
-    def _set_summary(self, summary):
+    @memoized
+    def get_summary(self, siteurl):
+        """uses siteurl to be memoizable"""
+        return self._get_summary()
+
+    @property
+    def summary(self):
+        return self.get_summary(self.get_siteurl())
+
+    @summary.setter
+    def summary(self, value):
         """Dummy function"""
         pass
 
-    summary = property(_get_summary, _set_summary, "Summary of the article."
-                       "Based on the content. Can't be set")
     url = property(functools.partial(get_url_setting, key='url'))
     save_as = property(functools.partial(get_url_setting, key='save_as'))
 

From 636f83ab6774eb33267df696e248303d54c152f6 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Sun, 2 Nov 2014 22:24:29 +0100
Subject: [PATCH 1691/2864] add paragraph mentioning markdown extensions to
 docs

---
 docs/content.rst | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index ad81bed1..9764e8cd 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -43,8 +43,13 @@ Pelican implements an extension to reStructuredText to enable support for the
 You can also use Markdown syntax (with a file ending in ``.md``,
 ``.markdown``, ``.mkd``, or ``.mdown``). Markdown generation requires that you
 first explicitly install the ``Markdown`` package, which can be done via ``pip
-install Markdown``. Metadata syntax for Markdown posts should follow this
-pattern::
+install Markdown``.
+
+Pelican also supports `Markdown Extensions`_, which might have to be installed
+separately if they are not included in the default ``Markdown`` package and can
+be configured and loaded via the ``MD_EXTENSIONS`` setting.
+
+Metadata syntax for Markdown posts should follow this pattern::
 
     Title: My super title
     Date: 2010-12-03 10:20
@@ -370,3 +375,4 @@ listed on the index page nor on any category or tag page.
 .. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: http://www.methods.co.nz/asciidoc/
 .. _pelican-plugins: http://github.com/getpelican/pelican-plugins
+.. _Markdown Extensions: http://pythonhosted.org/Markdown/extensions/

From 45417832e105fd8c2c4dba90648b6518bdea24ae Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 2 Nov 2014 13:49:31 -0800
Subject: [PATCH 1692/2864] Document Markdown inclusion in Quickstart install

---
 docs/quickstart.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index fb90b002..4fe75d98 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -7,8 +7,9 @@ impatient, following are some quick steps to get started.
 Installation
 ------------
 
-Install Pelican on Python 2.7.x or Python 3.3+ by running the following command
-in your preferred terminal, prefixing with ``sudo`` if permissions warrant::
+Install Pelican (and optionally Markdown if you intend to use it) on Python
+2.7.x or Python 3.3+ by running the following command in your preferred
+terminal, prefixing with ``sudo`` if permissions warrant::
 
     pip install pelican markdown
 

From e65d33b89c1f4ed1c55ab2f832b91354960e6e16 Mon Sep 17 00:00:00 2001
From: Tom Most <twm@freecog.net>
Date: Sun, 29 Jun 2014 20:05:12 -0700
Subject: [PATCH 1693/2864] Warn that signal receivers are weakly-referenced

For the signal get_generators in particular, it may seem natural to use
a lambda or inner function as the signal receiver, but this does not
work as the receiver is collected before it can be called.
---
 docs/plugins.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 27299e83..78f6ccd0 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -57,6 +57,12 @@ which you map the signals to your plugin logic. Let's take a simple example::
     def register():
         signals.initialized.connect(test)
 
+.. note::
+
+    Signal receivers are weakly-referenced and thus must not be defined within
+    your ``register`` callable or they will be garbage-collected before the
+    signal is emitted.
+
 List of signals
 ===============
 

From da41f7681bd64f4e114c35667919a1bfa679c654 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Sun, 2 Nov 2014 14:15:32 -0800
Subject: [PATCH 1694/2864] Merge piwik.html into analytics.html

Addresses #1512.
---
 .../themes/notmyidea/templates/analytics.html | 19 +++++++++++++++++++
 pelican/themes/notmyidea/templates/base.html  |  1 -
 pelican/themes/notmyidea/templates/piwik.html | 19 -------------------
 3 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 pelican/themes/notmyidea/templates/piwik.html

diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
index c3499c81..e27adf82 100644
--- a/pelican/themes/notmyidea/templates/analytics.html
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -25,3 +25,22 @@
     })();
     </script>
 {% endif %}
+{% if PIWIK_URL and PIWIK_SITE_ID %}
+    <script type="text/javascript">
+    {% if PIWIK_SSL_URL %}
+        var pkBaseURL = "{{ PIWIK_SSL_URL }}";
+    {% else %}
+        var pkBaseURL = "{{ PIWIK_URL }}";
+    {% endif %}
+    var _paq = _paq || [];
+    _paq.push(["trackPageView"]);
+    _paq.push(["enableLinkTracking"]);
+    (function() {
+        var u=(("https:" == document.location.protocol) ? "https" : "http")+"://"+pkBaseURL+"/";
+        _paq.push(["setTrackerUrl", u+"piwik.php"]);
+        _paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
+        var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+        g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+    })();
+    </script>
+{% endif %}
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index b081515f..d6b4cb35 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -77,7 +77,6 @@
         </footer><!-- /#contentinfo -->
 
 {% include 'analytics.html' %}
-{% include 'piwik.html' %}
 {% include 'disqus_script.html' %}
 </body>
 </html>
diff --git a/pelican/themes/notmyidea/templates/piwik.html b/pelican/themes/notmyidea/templates/piwik.html
deleted file mode 100644
index f9126264..00000000
--- a/pelican/themes/notmyidea/templates/piwik.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% if PIWIK_URL and PIWIK_SITE_ID %}
-	<script type="text/javascript">
-	{% if PIWIK_SSL_URL %}
-		var pkBaseURL = "{{ PIWIK_SSL_URL }}";
-	{% else %}
-		var pkBaseURL = "{{ PIWIK_URL }}";
-	{% endif %}
-	var _paq = _paq || [];
-	_paq.push(["trackPageView"]);
-	_paq.push(["enableLinkTracking"]);
-	(function() {
-		var u=(("https:" == document.location.protocol) ? "https" : "http")+"://"+pkBaseURL+"/";
-		_paq.push(["setTrackerUrl", u+"piwik.php"]);
-		_paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
-		var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-		g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-	})();
-	</script>
-{% endif %}

From 85f9608ccb74011969d190bc085afecc71a69f3f Mon Sep 17 00:00:00 2001
From: "gw0 [http://gw.tnode.com/]" <gw.2014@tnode.com>
Date: Sun, 18 May 2014 20:52:26 +0200
Subject: [PATCH 1695/2864] Minor documentation improvements

---
 docs/settings.rst | 89 +++++++++++++++++++++++++++++------------------
 docs/themes.rst   | 64 ++++++++++++++++++++--------------
 2 files changed, 94 insertions(+), 59 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d785cf9b..e64da8ec 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -4,7 +4,7 @@ Settings
 Pelican is configurable thanks to a settings file you can pass to
 the command line::
 
-    pelican content -s path/to/your/settingsfile.py
+    pelican content -s path/to/your/pelicanconf.py
 
 (If you used the ``pelican-quickstart`` command, your primary settings file will
 be named ``pelicanconf.py`` by default.)
@@ -28,6 +28,7 @@ templates, which allows you to use your settings to add site-wide content.
 
 Here is a list of settings for Pelican:
 
+
 Basic settings
 ==============
 
@@ -225,9 +226,9 @@ configuration files for local development and publishing, respectively.
 You can customize the URLs and locations where files will be saved. The
 ``*_URL`` and ``*_SAVE_AS`` variables use Python's format strings. These
 variables allow you to place your articles in a location such as
-``{slug}/index.html`` and link to them as ``{slug}`` for clean URLs. These
-settings give you the flexibility to place your articles and pages anywhere you
-want.
+``{slug}/index.html`` and link to them as ``{slug}`` for clean URLs (see
+example below). These settings give you the flexibility to place your articles
+and pages anywhere you want.
 
 .. note::
     If you specify a ``datetime`` directive, it will be substituted using the
@@ -250,30 +251,12 @@ Example usage:
 
 * ``ARTICLE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'``
 * ``ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'``
+* ``PAGE_URL = 'pages/{slug}/'``
+* ``PAGE_SAVE_AS = 'pages/{slug}/index.html'``
 
-This would save your articles in something like ``/posts/2011/Aug/07/sample-post/index.html``,
-and the URL to this would be ``/posts/2011/Aug/07/sample-post/``.
-
-Pelican can optionally create per-year, per-month, and per-day archives of your
-posts. These secondary archives are disabled by default but are automatically
-enabled if you supply format strings for their respective ``_SAVE_AS`` settings.
-Period archives fit intuitively with the hierarchical model of web URLs and can
-make it easier for readers to navigate through the posts you've written over time.
-
-Example usage:
-
-* ``YEAR_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/index.html'``
-* ``MONTH_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/index.html'``
-
-With these settings, Pelican will create an archive of all your posts for the
-year at (for instance) ``posts/2011/index.html`` and an archive of all your
-posts for the month at ``posts/2011/Aug/index.html``.
-
-.. note::
-    Period archives work best when the final path segment is ``index.html``.
-    This way a reader can remove a portion of your URL and automatically
-    arrive at an appropriate archive of posts, without having to specify
-    a page name.
+This would save your articles into something like ``/posts/2011/Aug/07/sample-post/index.html``,
+save your pages into ``/pages/about/index.html``, and render them available at
+URLs of ``/posts/2011/Aug/07/sample-post/`` and ``/pages/about/``, respectively.
 
 ======================================================  ==============================================================
 Setting name (followed by default value, if any)        What does it do?
@@ -339,22 +322,48 @@ Setting name (followed by default value, if any)        What does it do?
     set the corresponding ``*_SAVE_AS`` setting to ``''`` to prevent the
     relevant page from being generated.
 
+Pelican can optionally create per-year, per-month, and per-day archives of your
+posts. These secondary archives are disabled by default but are automatically
+enabled if you supply format strings for their respective ``_SAVE_AS`` settings.
+Period archives fit intuitively with the hierarchical model of web URLs and can
+make it easier for readers to navigate through the posts you've written over time.
+
+Example usage:
+
+* ``YEAR_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/index.html'``
+* ``MONTH_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/index.html'``
+
+With these settings, Pelican will create an archive of all your posts for the
+year at (for instance) ``posts/2011/index.html`` and an archive of all your
+posts for the month at ``posts/2011/Aug/index.html``.
+
+.. note::
+    Period archives work best when the final path segment is ``index.html``.
+    This way a reader can remove a portion of your URL and automatically
+    arrive at an appropriate archive of posts, without having to specify
+    a page name.
+
 ``DIRECT_TEMPLATES``, which are ``('index', 'tags', 'categories', 'archives')``
 by default, work a bit differently than noted above. Only the ``_SAVE_AS``
 settings are available:
 
-=============================================  ===============================================
+=============================================  ======================================================
 Setting name (followed by default value)       What does it do?
-=============================================  ===============================================
+=============================================  ======================================================
 ``ARCHIVES_SAVE_AS = 'archives.html'``         The location to save the article archives page.
+``YEAR_ARCHIVE_SAVE_AS = ''``                  The location to save per-year archives of your posts.
+``MONTH_ARCHIVE_SAVE_AS = ''``                 The location to save per-month archives of your posts.
+``DAY_ARCHIVE_SAVE_AS = ''``                   The location to save per-day archives of your posts.
 ``AUTHORS_SAVE_AS = 'authors.html'``           The location to save the author list.
 ``CATEGORIES_SAVE_AS = 'categories.html'``     The location to save the category list.
 ``TAGS_SAVE_AS = 'tags.html'``                 The location to save the tag list.
-=============================================  ===============================================
+=============================================  ======================================================
 
-URLs for direct template pages are theme-dependent. Some themes hard-code them:
+URLs for direct template pages are theme-dependent. Some themes use
+corresponding ``*_URL`` setting as string, while others hard-code them:
 ``'archives.html'``, ``'authors.html'``, ``'categories.html'``, ``'tags.html'``.
 
+
 Timezone
 --------
 
@@ -428,6 +437,7 @@ can get a list of available locales via the ``locale -a`` command; see manpage
 
 .. _template_pages:
 
+
 Template pages
 ==============
 
@@ -445,6 +455,7 @@ your resume, and a contact page — you could have::
 
 .. _path_metadata:
 
+
 Path metadata
 =============
 
@@ -478,16 +489,17 @@ particular file:
     # STATIC_SAVE_AS = '{path}'
     # STATIC_URL = '{path}'
     STATIC_PATHS = [
-        'extra/robots.txt',
+        'static/robots.txt',
         ]
     EXTRA_PATH_METADATA = {
-        'extra/robots.txt': {'path': 'robots.txt'},
+        'static/robots.txt': {'path': 'robots.txt'},
         }
 
 __ internal_metadata__
 .. _group name notation:
    http://docs.python.org/3/library/re.html#regular-expression-syntax
 
+
 Feed settings
 =============
 
@@ -530,6 +542,7 @@ If you don't want to generate some or any of these feeds, set the above variable
 
 .. [2] %s is the name of the category.
 
+
 FeedBurner
 ----------
 
@@ -549,6 +562,7 @@ Address". In this example, the "Original Feed" would be
 ``http://www.example.com/thymefeeds/main.xml`` and the "Feed Address" suffix
 would be ``thymefeeds/main.xml``.
 
+
 Pagination
 ==========
 
@@ -572,6 +586,7 @@ Setting name (followed by default value, if any)    What does it do?
                                                     pagination output.
 ================================================    =====================================================
 
+
 Using Pagination Patterns
 -------------------------
 
@@ -594,6 +609,7 @@ This would cause the first page to be written to
 ``{base_name}/index.html``, and subsequent ones would be written into
 ``page/{number}`` directories.
 
+
 Tag cloud
 =========
 
@@ -640,6 +656,7 @@ For example::
 
     ...
 
+
 Translations
 ============
 
@@ -656,6 +673,7 @@ Setting name (followed by default value, if any)            What does it do?
 
 .. [3] %s is the language
 
+
 Ordering content
 ================
 
@@ -668,6 +686,7 @@ Setting name (followed by default value)            What does it do?
                                                     alphabetical order; default lists alphabetically.)
 ================================================    =====================================================
 
+
 Themes
 ======
 
@@ -752,6 +771,7 @@ adding the following to your configuration::
 
     CSS_FILE = "wide.css"
 
+
 Logging
 =======
 
@@ -769,6 +789,7 @@ For example: ``[(logging.WARN, 'TAG_SAVE_AS is set to False')]``
 
 .. _reading_only_modified_content:
 
+
 Reading only modified content
 =============================
 
@@ -835,6 +856,7 @@ from the ``--checksum`` option.
 
 .. _writing_only_selected_content:
 
+
 Writing only selected content
 =============================
 
@@ -848,6 +870,7 @@ on the command line using the ``--write-selected`` option, which
 accepts a comma-separated list of output file paths. By default this
 list is empty, so all output is written.
 
+
 Example settings
 ================
 
diff --git a/docs/themes.rst b/docs/themes.rst
index 4be9a8e5..c9fc2b37 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -16,6 +16,7 @@ then modified), you can specify that theme via the ``-t`` flag::
 If you'd rather not specify the theme on every invocation, you can define
 ``THEME`` in your settings to point to the location of your preferred theme.
 
+
 Structure
 =========
 
@@ -32,7 +33,7 @@ To make your own theme, you must follow the following structure::
         ├── authors.html          // must list all the authors
         ├── categories.html       // must list all the categories
         ├── category.html         // processed for each category
-        ├── index.html            // the index. List all the articles
+        ├── index.html            // the index (list all the articles)
         ├── page.html             // processed for each page
         ├── tag.html              // processed for each tag
         └── tags.html             // must list all the tags. Can be a tag cloud.
@@ -45,6 +46,7 @@ To make your own theme, you must follow the following structure::
   The template files listed above are mandatory; you can add your own templates
   if it helps you keep things organized while creating your theme.
 
+
 Templates and variables
 =======================
 
@@ -55,6 +57,7 @@ variables will be passed to each template at generation time.
 All templates will receive the variables defined in your settings file, as long
 as they are in all-caps. You can access them directly.
 
+
 Common variables
 ----------------
 
@@ -64,7 +67,7 @@ All of these settings will be available to all templates.
 Variable        Description
 =============   ===================================================
 output_file     The name of the file currently being generated. For
-                instance, when Pelican is rendering the homepage,
+                instance, when Pelican is rendering the home page,
                 output_file will be "index.html".
 articles        The list of articles, ordered descending by date.
                 All the elements are `Article` objects, so you can
@@ -81,6 +84,7 @@ categories      A list of (category, articles) tuples, containing
 pages           The list of pages
 =============   ===================================================
 
+
 Sorting
 -------
 
@@ -112,12 +116,13 @@ to the locale given in your settings::
 .. _datetime: http://docs.python.org/2/library/datetime.html#datetime-objects
 .. _strftime: http://docs.python.org/2/library/datetime.html#strftime-strptime-behavior
 
+
 index.html
 ----------
 
-This is the home page of your blog, generated at output/index.html.
+This is the home page or index of your blog, generated at ``index.html``.
 
-If pagination is active, subsequent pages will reside in output/index`n`.html.
+If pagination is active, subsequent pages will reside in ``index{number}.html``.
 
 ======================  ===================================================
 Variable                Description
@@ -139,14 +144,14 @@ dates_next_page         The next page of articles, ordered by date,
 page_name               'index' -- useful for pagination links
 ======================  ===================================================
 
+
 author.html
 -------------
 
 This template will be processed for each of the existing authors, with
-output generated at output/author/`author_name`.html.
-
-If pagination is active, subsequent pages will reside as defined by setting
-AUTHOR_SAVE_AS (`Default:` output/author/`author_name'n'`.html).
+output generated according to the ``AUTHOR_SAVE_AS`` setting (`Default:`
+``author/{author_name}.html``). If pagination is active, subsequent pages will by
+default reside at ``author/{author_name}{number}.html``.
 
 ======================  ===================================================
 Variable                Description
@@ -173,14 +178,14 @@ page_name               AUTHOR_URL where everything after `{slug}` is
                         removed -- useful for pagination links
 ======================  ===================================================
 
+
 category.html
 -------------
 
 This template will be processed for each of the existing categories, with
-output generated at output/category/`category_name`.html.
-
-If pagination is active, subsequent pages will reside as defined by setting
-CATEGORY_SAVE_AS (`Default:` output/category/`category_name'n'`.html).
+output generated according to the ``CATEGORY_SAVE_AS`` setting (`Default:`
+``category/{category_name}.html``). If pagination is active, subsequent pages will by
+default reside at ``category/{category_name}{number}.html``.
 
 ======================  ===================================================
 Variable                Description
@@ -207,11 +212,14 @@ page_name               CATEGORY_URL where everything after `{slug}` is
                         removed -- useful for pagination links
 ======================  ===================================================
 
+
 article.html
 -------------
 
-This template will be processed for each article, with .html files saved
-as output/`article_name`.html. Here are the specific variables it gets.
+This template will be processed for each article, with
+output generated according to the ``ARTICLE_SAVE_AS`` setting (`Default:`
+``{article_name}.html``). The following variables are available when
+rendering.
 
 =============   ===================================================
 Variable        Description
@@ -249,8 +257,10 @@ image for the Facebook open graph tags that will change for each article:
 page.html
 ---------
 
-This template will be processed for each page, with corresponding .html files
-saved as output/`page_name`.html.
+This template will be processed for each page, with
+output generated according to the ``PAGE_SAVE_AS`` setting (`Default:`
+``pages/{page_name}.html``). The following variables are available when
+rendering.
 
 =============   ===================================================
 Variable        Description
@@ -259,14 +269,14 @@ page            The page object to be displayed. You can access its
                 title, slug, and content.
 =============   ===================================================
 
+
 tag.html
 --------
 
-This template will be processed for each tag, with corresponding .html files
-saved as output/tag/`tag_name`.html.
-
-If pagination is active, subsequent pages will reside as defined in setting
-TAG_SAVE_AS (`Default:` output/tag/`tag_name'n'`.html).
+This template will be processed for each tag, with
+output generated according to the ``TAG_SAVE_AS`` setting (`Default:`
+``tag/{tag_name}.html``). If pagination is active, subsequent pages will by
+default reside at ``tag/{tag_name}{number}.html``.
 
 ======================  ===================================================
 Variable                Description
@@ -293,12 +303,13 @@ page_name               TAG_URL where everything after `{slug}` is removed
                         -- useful for pagination links
 ======================  ===================================================
 
+
 period_archives.html
 --------------------
 
 This template will be processed for each year of your posts if a path
-for YEAR_ARCHIVE_SAVE_AS is defined, each month if MONTH_ARCHIVE_SAVE_AS
-is defined and each day if DAY_ARCHIVE_SAVE_AS is defined.
+for ``YEAR_ARCHIVE_SAVE_AS`` is defined, each month if ``MONTH_ARCHIVE_SAVE_AS``
+is defined, and each day if ``DAY_ARCHIVE_SAVE_AS`` is defined.
 
 ===================     ===================================================
 Variable                Description
@@ -313,8 +324,9 @@ period                  A tuple of the form (`year`, `month`, `day`) that
 
 ===================     ===================================================
 
-You can see an example of how to use `period` in the ``simple`` theme's
-period_archives.html
+You can see an example of how to use `period` in the `"simple" theme
+<https://github.com/getpelican/pelican/blob/master/pelican/themes/simple/templates/period_archives.html>`_.
+
 
 Feeds
 =====
@@ -346,7 +358,7 @@ missing, it will be replaced by the matching template from the ``simple`` theme.
 So if the HTML structure of a template in the ``simple`` theme is right for you,
 you don't have to write a new template from scratch.
 
-You can also extend templates from the ``simple`` themes in your own themes by
+You can also extend templates from the ``simple`` theme in your own themes by
 using the ``{% extends %}`` directive as in the following example:
 
 .. code-block:: html+jinja

From 08044f243684a1219b4702950a48a0ac68f9090e Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Mon, 3 Nov 2014 15:39:56 +0100
Subject: [PATCH 1696/2864] Mention the INDEX_SAVE_AS setting in FAQ and direct
 templates

This setting can be particularly useful when making a static homepage.
---
 docs/faq.rst      | 4 ++++
 docs/settings.rst | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 1376511a..630dd3c1 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -135,6 +135,10 @@ your home page. The following Markdown example could be stored in
 
     Thank you for visiting. Welcome!
 
+If the original blog index is still wanted, it can then be saved in a
+different location by setting ``INDEX_SAVE_AS = 'blog_index.html`` for
+the ``''index'`` direct template.
+
 What if I want to disable feed generation?
 ==========================================
 
diff --git a/docs/settings.rst b/docs/settings.rst
index e64da8ec..d853e3d0 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -345,7 +345,7 @@ posts for the month at ``posts/2011/Aug/index.html``.
 
 ``DIRECT_TEMPLATES``, which are ``('index', 'tags', 'categories', 'archives')``
 by default, work a bit differently than noted above. Only the ``_SAVE_AS``
-settings are available:
+settings are available, but it is available for any direct template.
 
 =============================================  ======================================================
 Setting name (followed by default value)       What does it do?
@@ -357,6 +357,7 @@ Setting name (followed by default value)       What does it do?
 ``AUTHORS_SAVE_AS = 'authors.html'``           The location to save the author list.
 ``CATEGORIES_SAVE_AS = 'categories.html'``     The location to save the category list.
 ``TAGS_SAVE_AS = 'tags.html'``                 The location to save the tag list.
+``INDEX_SAVE_AS = 'index.html'``               The location to save the list of all articles.
 =============================================  ======================================================
 
 URLs for direct template pages are theme-dependent. Some themes use

From f87e4faa22ffb0190ded256b7b2200dc075413a3 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Mon, 3 Nov 2014 15:30:45 +0100
Subject: [PATCH 1697/2864] add notices about caching interfering with changes
 to settings and plugins

---
 docs/content.rst  | 7 +++++++
 docs/faq.rst      | 8 ++++++++
 docs/plugins.rst  | 8 ++++++++
 docs/settings.rst | 7 +++++++
 4 files changed, 30 insertions(+)

diff --git a/docs/content.rst b/docs/content.rst
index 9764e8cd..5a1f3ad0 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -100,6 +100,13 @@ not be a good category name, you can set the setting ``USE_FOLDER_AS_CATEGORY``
 to ``False``.  When parsing dates given in the page metadata, Pelican supports
 the W3C's `suggested subset ISO 8601`__.
 
+.. note::
+
+   When experimenting with different settings (especially the metadata
+   ones) caching may interfere and the changes may not be visible. In
+   such cases disable caching with ``LOAD_CONTENT_CACHE = False`` or
+   use the ``--ignore-cache`` command-line switch.
+
 __ `W3C ISO 8601`_
 
 ``modified`` should be last time you updated the article, and defaults to ``date`` if not specified.
diff --git a/docs/faq.rst b/docs/faq.rst
index 630dd3c1..2a931192 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -32,6 +32,14 @@ Configuration files are optional and are just an easy way to configure Pelican.
 For basic operations, it's possible to specify options while invoking Pelican
 via the command line. See ``pelican --help`` for more information.
 
+Changes to the setting file take no effect
+==========================================
+
+When experimenting with different settings (especially the metadata
+ones) caching may interfere and the changes may not be visible. In
+such cases disable caching with ``LOAD_CONTENT_CACHE = False`` or
+use the ``--ignore-cache`` command-line switch.
+
 I'm creating my own theme. How do I use Pygments for syntax highlighting?
 =========================================================================
 
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 78f6ccd0..15fcf109 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -20,6 +20,14 @@ Alternatively, another method is to import them and add them to the list::
     from package import myplugin
     PLUGINS = [myplugin,]
 
+.. note::
+
+   When experimenting with different plugins (especially the ones that
+   deal with metadata and content) caching may interfere and the
+   changes may not be visible. In such cases disable caching with
+   ``LOAD_CONTENT_CACHE = False`` or use the ``--ignore-cache``
+   command-line switch.
+
 If your plugins are not in an importable path, you can specify a list of paths
 via the ``PLUGIN_PATHS`` setting. As shown in the following example, paths in
 the ``PLUGIN_PATHS`` list can be absolute or relative to the settings file::
diff --git a/docs/settings.rst b/docs/settings.rst
index d853e3d0..892ab082 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -9,6 +9,13 @@ the command line::
 (If you used the ``pelican-quickstart`` command, your primary settings file will
 be named ``pelicanconf.py`` by default.)
 
+.. note::
+
+   When experimenting with different settings (especially the metadata
+   ones) caching may interfere and the changes may not be visible. In
+   such cases disable caching with ``LOAD_CONTENT_CACHE = False`` or
+   use the ``--ignore-cache`` command-line switch.
+
 Settings are configured in the form of a Python module (a file). There is an
 `example settings file
 <https://github.com/getpelican/pelican/raw/master/samples/pelican.conf.py>`_

From d356b446313e44186ed8fb4f833c6dc8415d371d Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Tue, 4 Nov 2014 16:47:52 +0100
Subject: [PATCH 1698/2864] advertise the i18n_subsites plugin as an addition
 to simple translations

---
 docs/content.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/content.rst b/docs/content.rst
index 5a1f3ad0..d28212e4 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -240,6 +240,13 @@ English [en] by default). With those settings in place, only articles with the
 default language will be listed, and each article will be accompanied by a list
 of available translations for that article.
 
+.. note::
+
+   This core Pelican functionality does not create sub-sites
+   (e.g. ``example.com/de``) with translated templates for each
+   language. For such advanced functionality the `i18n_subsites
+   plugin`_ can be used.
+
 Pelican uses the article's URL "slug" to determine if two or more articles are
 translations of one another. The slug can be set manually in the file's
 metadata; if not set explicitly, Pelican will auto-generate the slug from the
@@ -383,3 +390,4 @@ listed on the index page nor on any category or tag page.
 .. _AsciiDoc: http://www.methods.co.nz/asciidoc/
 .. _pelican-plugins: http://github.com/getpelican/pelican-plugins
 .. _Markdown Extensions: http://pythonhosted.org/Markdown/extensions/
+.. _i18n_subsites plugin: http://github.com/getpelican/pelican-plugins/tree/master/i18n_subsites

From 369b8b84745e60affd48257c9c9ccb914c07eb22 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Tue, 4 Nov 2014 17:00:01 +0100
Subject: [PATCH 1699/2864] note that {ARTICLE,PAGE}_PATHS may include files,
 add faq about using that

---
 docs/faq.rst      | 9 +++++++++
 docs/settings.rst | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 2a931192..c749c262 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -232,3 +232,12 @@ When only several specific output files are of interest (e.g. when
 working on some specific page or the theme templates), the
 `WRITE_SELECTED` option may help, see
 :ref:`writing_only_selected_content`.
+
+How to process only a subset of all articles?
+=============================================
+
+It is often useful to process only e.g. 10 articles for debugging
+purposes. This can be achieved by explicitly specifying only the
+filenames of those articles in ``ARTICLE_PATHS``. A list of such
+filenames could be found using a command similar to ``cd content;
+find -name '*.md' | head -n 10``.
diff --git a/docs/settings.rst b/docs/settings.rst
index 892ab082..02f4359f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -125,10 +125,12 @@ Setting name (followed by default value, if any)
 ``PATH``                                                                         Path to content directory to be processed by Pelican. If undefined,
                                                                                  and content path is not specified via an argument to the ``pelican``
                                                                                  command, Pelican will use the current working directory.
-``PAGE_PATHS = ['pages']``                                                       A list of directories to look at for pages, relative to ``PATH``.
+``PAGE_PATHS = ['pages']``                                                       A list of directories and files to look at for pages,
+                                                                                 relative to ``PATH``.
 ``PAGE_EXCLUDES = []``                                                           A list of directories to exclude when looking for pages in addition
                                                                                  to ``ARTICLE_PATHS``.
-``ARTICLE_PATHS = ['']``                                                         A list of directories to look at for articles, relative to ``PATH``.
+``ARTICLE_PATHS = ['']``                                                         A list of directories and files to look at for articles,
+                                                                                 relative to ``PATH``.
 ``ARTICLE_EXCLUDES = []``                                                        A list of directories to exclude when looking for articles in addition
                                                                                  to ``PAGE_PATHS``.
 ``OUTPUT_SOURCES = False``                                                       Set to True if you want to copy the articles and pages in their

From d503ea436c1733c2fc596e5003bac2cb74d576c9 Mon Sep 17 00:00:00 2001
From: Forest <web11.forest@tibit.com>
Date: Fri, 31 Oct 2014 17:21:15 -0700
Subject: [PATCH 1700/2864] Let documents {attach} static files. Fixes #1019.

Until now, making static files end up in the same output directory as an
article that links to them has been difficult, especially when the article's
output path is generated based on metadata. This changeset introduces the
{attach} link syntax, which works like the {filename} syntax, but also
overrides the static file's output path with the directory of the
linking document.

It also clarifies and expands the documentation on linking to internal content.
---
 docs/content.rst               | 176 +++++++++++++++++++++++++++------
 pelican/__init__.py            |   4 +-
 pelican/contents.py            |  78 ++++++++++++++-
 pelican/tests/test_contents.py | 147 ++++++++++++++++++++++++++-
 pelican/tests/test_pelican.py  |   8 +-
 5 files changed, 372 insertions(+), 41 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 5a1f3ad0..570a32d1 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -151,24 +151,25 @@ Linking to internal content
 
 From Pelican 3.1 onwards, it is now possible to specify intra-site links to
 files in the *source content* hierarchy instead of files in the *generated*
-hierarchy. This makes it easier to link from the current post to other posts
-and images that may be sitting alongside the current post (instead of having
-to determine where those resources will be placed after site generation).
+hierarchy. This makes it easier to link from the current post to other content
+that may be sitting alongside that post (instead of having to determine where
+the other content will be placed after site generation).
 
 To link to internal content (files in the ``content`` directory), use the
-following syntax: ``{filename}path/to/file``::
+following syntax for the link target: ``{filename}path/to/file``
 
+For example, a Pelican project might be structured like this::
 
     website/
     ├── content
-    │   ├── article1.rst
-    │   ├── cat/
-    │   │   └── article2.md
+    │   ├── category/
+    │   │   └── article1.rst
+    │   ├── article2.md
     │   └── pages
     │       └── about.md
     └── pelican.conf.py
 
-In this example, ``article1.rst`` could look like::
+In this example, ``article1.rst`` could look like this::
 
     The first article
     #################
@@ -177,8 +178,8 @@ In this example, ``article1.rst`` could look like::
 
     See below intra-site link examples in reStructuredText format.
 
-    `a link relative to content root <{filename}/cat/article2.rst>`_
-    `a link relative to current file <{filename}cat/article2.rst>`_
+    `a link relative to the current file <{filename}../article2.md>`_
+    `a link relative to the content root <{filename}/article2.md>`_
 
 and ``article2.md``::
 
@@ -187,43 +188,154 @@ and ``article2.md``::
 
     See below intra-site link examples in Markdown format.
 
-    [a link relative to content root]({filename}/article1.md)
-    [a link relative to current file]({filename}../article1.md)
+    [a link relative to the current file]({filename}category/article1.rst)
+    [a link relative to the content root]({filename}/category/article1.rst)
 
-Embedding non-article or non-page content is slightly different in that the
-directories need to be specified in ``pelicanconf.py`` file. The ``images``
-directory is configured for this by default but others will need to be added
-manually::
+Linking to static files
+-----------------------
+
+Linking to non-article or non-page content uses the same ``{filename}`` syntax
+as described above. It is important to remember that those files will not be
+copied to the output directory unless the source directories containing them
+are included in the ``STATIC_PATHS`` setting of the project's ``pelicanconf.py``
+file. Pelican's default configuration includes the ``images`` directory for
+this, but others must be added manually. Forgetting to do so will result in
+broken links.
+
+For example, a project's content directory might be structured like this::
 
     content
     ├── images
     │   └── han.jpg
-    └── misc
-        └── image-test.md
+    ├── pdfs
+    │   └── menu.pdf
+    └── pages
+        └── test.md
 
-And ``image-test.md`` would include::
+``test.md`` would include::
 
     ![Alt Text]({filename}/images/han.jpg)
+    [Our Menu]({filename}/pdfs/menu.pdf)
 
-Any content can be linked in this way. What happens is that the ``images``
-directory gets copied to ``output/`` during site generation because Pelican
-includes ``images`` in the ``STATIC_PATHS`` setting's list by default. If
-you want to have another directory, say ``pdfs``, copied from your content to
-your output during site generation, you would need to add the following to
-your settings file::
+``pelicanconf.py`` would include::
 
     STATIC_PATHS = ['images', 'pdfs']
 
-After the above line has been added, subsequent site generation should copy the
-``content/pdfs/`` directory to ``output/pdfs/``.
+Site generation would then copy ``han.jpg`` to ``output/images/han.jpg``,
+``menu.pdf`` to ``output/pdfs/menu.pdf``, and write the appropriate links
+in ``test.md``.
 
-You can also link to categories or tags, using the ``{tag}tagname`` and
+Mixed content in the same directory
+-----------------------------------
+
+Starting with Pelican 3.5, static files can safely share a source directory with
+page source files, without exposing the page sources in the generated site.
+Any such directory must be added to both ``STATIC_PATHS`` and ``PAGE_PATHS``
+(or ``STATIC_PATHS`` and ``ARTICLE_PATHS``). Pelican will identify and process
+the page source files normally, and copy the remaining files as if they lived
+in a separate directory reserved for static files.
+
+Note: Placing static and content source files together in the same source
+directory does not guarantee that they will end up in the same place in the
+generated site. The easiest way to do this is by using the ``{attach}`` link
+syntax (described below). Alternatively, the ``STATIC_SAVE_AS``,
+``PAGE_SAVE_AS``, and ``ARTICLE_SAVE_AS`` settings (and the corresponding
+``*_URL`` settings) can be configured to place files of different types
+together, just as they could in earlier versions of Pelican.
+
+Attaching static files
+----------------------
+
+Starting with Pelican 3.5, static files can be "attached" to a page or article
+using this syntax for the link target: ``{attach}path/to/file`` This works
+like the ``{filename}`` syntax, but also relocates the static file into the
+linking document's output directory. If the static file originates from a
+subdirectory beneath the linking document's source, that relationship will be
+preserved on output. Otherwise, it will become a sibling of the linking
+document.
+
+This only works for linking to static files, and only when they originate from
+a directory included in the ``STATIC_PATHS`` setting.
+
+For example, a project's content directory might be structured like this::
+
+    content
+    ├── blog
+    │   ├── icons
+    │   │   └── icon.png
+    │   ├── photo.jpg
+    │   └── testpost.md
+    └── downloads
+        └── archive.zip
+
+``pelicanconf.py`` would include::
+
+    PATH = 'content'
+    STATIC_PATHS = ['blog', 'downloads']
+    ARTICLE_PATHS = ['blog']
+    ARTICLE_SAVE_AS = '{date:%Y}/{slug}.html'
+    ARTICLE_URL = '{date:%Y}/{slug}.html'
+
+``testpost.md`` would include::
+
+    Title: Test Post
+    Category: test
+    Date: 2014-10-31
+
+    ![Icon]({attach}icons/icon.png)
+    ![Photo]({attach}photo.jpg)
+    [Downloadable File]({attach}/downloads/archive.zip)
+
+Site generation would then produce an output directory structured like this::
+
+    output
+    └── 2014
+        ├── archive.zip
+        ├── icons
+        │   └── icon.png
+        ├── photo.jpg
+        └── test-post.html
+
+Notice that all the files linked using ``{attach}`` ended up in or beneath
+the article's output directory.
+
+If a static file is linked multiple times, the relocating feature of
+``{attach}`` will only work in the first of those links to be processed.
+After the first link, Pelican will treat ``{attach}`` like ``{filename}``.
+This avoids breaking the already-processed links.
+
+**Be careful when linking to a file from multiple documents:**
+Since the first link to a file finalizes its location and Pelican does
+not define the order in which documents are processed, using ``{attach}`` on a
+file linked by multiple documents can cause its location to change from one
+site build to the next. (Whether this happens in practice will depend on the
+operating system, file system, version of Pelican, and documents being added,
+modified, or removed from the project.) Any external sites linking to the
+file's old location might then find their links broken. **It is therefore
+advisable to use {attach} only if you use it in all links to a file, and only
+if the linking documents share a single directory.** Under these conditions,
+the file's output location will not change in future builds. In cases where
+these precautions are not possible, consider using ``{filename}`` links instead
+of ``{attach}``, and letting the file's location be determined by the project's
+``STATIC_SAVE_AS`` and ``STATIC_URL`` settings. (Per-file ``save_as`` and
+``url`` overrides can still be set in ``EXTRA_PATH_METADATA``.)
+
+Linking to tags and categories
+------------------------------
+
+You can link to tags and categories using the ``{tag}tagname`` and
 ``{category}foobar`` syntax.
 
-For backward compatibility, Pelican also supports bars (``||``) in addition to
-curly braces (``{}``). For example: ``|filename|an_article.rst``,
-``|tag|tagname``, ``|category|foobar``. The syntax was changed from ``||`` to
-``{}`` to avoid collision with Markdown extensions or reST directives.
+Deprecated internal link syntax
+-------------------------------
+
+To remain compatible with earlier versions, Pelican still supports vertical bars
+(``||``) in addition to curly braces (``{}``) for internal links. For example:
+``|filename|an_article.rst``, ``|tag|tagname``, ``|category|foobar``.
+The syntax was changed from ``||`` to ``{}`` to avoid collision with Markdown
+extensions or reST directives. Support for the old syntax may eventually be
+removed.
+
 
 Importing an existing site
 ==========================
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 076375ba..d0056ded 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -208,7 +208,9 @@ class Pelican(object):
                     logger.debug('Found generator: %s', v)
                     generators.append(v)
 
-        # StaticGenerator runs last so it can see which files the others handle
+        # StaticGenerator must run last, so it can identify files that
+        # were skipped by the other generators, and so static files can
+        # have their output paths overridden by the {attach} link syntax.
         generators.append(StaticGenerator)
         return generators
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 01f51651..beff2106 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -219,7 +219,7 @@ class Content(object):
             origin = m.group('path')
 
             # XXX Put this in a different location.
-            if what == 'filename':
+            if what in {'filename', 'attach'}:
                 if path.startswith('/'):
                     path = path[1:]
                 else:
@@ -234,9 +234,16 @@ class Content(object):
                     if unquoted_path in self._context['filenames']:
                         path = unquoted_path
 
-                if self._context['filenames'].get(path):
-                    origin = '/'.join((siteurl,
-                             self._context['filenames'][path].url))
+                linked_content = self._context['filenames'].get(path)
+                if linked_content:
+                    if what == 'attach':
+                        if isinstance(linked_content, Static):
+                            linked_content.attach_to(self)
+                        else:
+                            logger.warning("%s used {attach} link syntax on a "
+                                "non-static file. Use {filename} instead.",
+                                self.get_relative_source_path())
+                    origin = '/'.join((siteurl, linked_content.url))
                     origin = origin.replace('\\', '/')  # for Windows paths.
                 else:
                     logger.warning(
@@ -359,6 +366,10 @@ class Quote(Page):
 
 @python_2_unicode_compatible
 class Static(Page):
+    def __init__(self, *args, **kwargs):
+        super(Static, self).__init__(*args, **kwargs)
+        self._output_location_referenced = False
+
     @deprecated_attribute(old='filepath', new='source_path', since=(3, 2, 0))
     def filepath():
         return None
@@ -371,6 +382,65 @@ class Static(Page):
     def dst():
         return None
 
+    @property
+    def url(self):
+        # Note when url has been referenced, so we can avoid overriding it.
+        self._output_location_referenced = True
+        return super(Static, self).url
+
+    @property
+    def save_as(self):
+        # Note when save_as has been referenced, so we can avoid overriding it.
+        self._output_location_referenced = True
+        return super(Static, self).save_as
+
+    def attach_to(self, content):
+        """Override our output directory with that of the given content object.
+        """
+        # Determine our file's new output path relative to the linking document.
+        # If it currently lives beneath the linking document's source directory,
+        # preserve that relationship on output. Otherwise, make it a sibling.
+        linking_source_dir = os.path.dirname(content.source_path)
+        tail_path = os.path.relpath(self.source_path, linking_source_dir)
+        if tail_path.startswith(os.pardir + os.sep):
+            tail_path = os.path.basename(tail_path)
+        new_save_as = os.path.join(
+            os.path.dirname(content.save_as), tail_path)
+
+        # We do not build our new url by joining tail_path with the linking
+        # document's url, because we cannot know just by looking at the latter
+        # whether it points to the document itself or to its parent directory.
+        # (An url like 'some/content' might mean a directory named 'some'
+        # with a file named 'content', or it might mean a directory named
+        # 'some/content' with a file named 'index.html'.) Rather than trying
+        # to figure it out by comparing the linking document's url and save_as
+        # path, we simply build our new url from our new save_as path.
+        new_url = path_to_url(new_save_as)
+
+        def _log_reason(reason):
+            logger.warning("The {attach} link in %s cannot relocate %s "
+                "because %s. Falling back to {filename} link behavior instead.",
+                content.get_relative_source_path(),
+                self.get_relative_source_path(), reason,
+                extra={'limit_msg': "More {attach} warnings silenced."})
+
+        # We never override an override, because we don't want to interfere
+        # with user-defined overrides that might be in EXTRA_PATH_METADATA.
+        if hasattr(self, 'override_save_as') or hasattr(self, 'override_url'):
+            if new_save_as != self.save_as or new_url != self.url:
+                _log_reason("its output location was already overridden")
+            return
+
+        # We never change an output path that has already been referenced,
+        # because we don't want to break links that depend on that path.
+        if self._output_location_referenced:
+            if new_save_as != self.save_as or new_url != self.url:
+                _log_reason("another link already referenced its location")
+            return
+
+        self.override_save_as = new_save_as
+        self.override_url = new_url
+
 
 def is_valid_content(content, f):
     try:
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index e64b3804..01ee9ca2 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -4,12 +4,13 @@ from __future__ import unicode_literals, absolute_import
 import six
 from sys import platform
 import locale
+import os.path
 
 from pelican.tests.support import unittest, get_settings
 
-from pelican.contents import Page, Article, URLWrapper
+from pelican.contents import Page, Article, Static, URLWrapper
 from pelican.settings import DEFAULT_CONFIG
-from pelican.utils import truncate_html_words, SafeDatetime
+from pelican.utils import path_to_url, truncate_html_words, SafeDatetime
 from pelican.signals import content_object_init
 from jinja2.utils import generate_lorem_ipsum
 
@@ -401,6 +402,148 @@ class TestArticle(TestPage):
         self.assertEqual(article.save_as, 'obrien/csharp-stuff/fnord/index.html')
 
 
+class TestStatic(unittest.TestCase):
+
+    def setUp(self):
+
+        self.settings = get_settings(
+            STATIC_SAVE_AS='{path}',
+            STATIC_URL='{path}',
+            PAGE_SAVE_AS=os.path.join('outpages', '{slug}.html'),
+            PAGE_URL='outpages/{slug}.html')
+        self.context = self.settings.copy()
+
+        self.static = Static(content=None, metadata={}, settings=self.settings,
+            source_path=os.path.join('dir', 'foo.jpg'), context=self.context)
+
+        self.context['filenames'] = {self.static.source_path: self.static}
+
+    def tearDown(self):
+        pass
+
+    def test_attach_to_same_dir(self):
+        """attach_to() overrides a static file's save_as and url.
+        """
+        page = Page(content="fake page",
+            metadata={'title': 'fakepage'}, settings=self.settings,
+            source_path=os.path.join('dir', 'fakepage.md'))
+        self.static.attach_to(page)
+
+        expected_save_as = os.path.join('outpages', 'foo.jpg')
+        self.assertEqual(self.static.save_as, expected_save_as)
+        self.assertEqual(self.static.url, path_to_url(expected_save_as))
+
+    def test_attach_to_parent_dir(self):
+        """attach_to() preserves dirs inside the linking document dir.
+        """
+        page = Page(content="fake page", metadata={'title': 'fakepage'},
+            settings=self.settings, source_path='fakepage.md')
+        self.static.attach_to(page)
+
+        expected_save_as = os.path.join('outpages', 'dir', 'foo.jpg')
+        self.assertEqual(self.static.save_as, expected_save_as)
+        self.assertEqual(self.static.url, path_to_url(expected_save_as))
+
+    def test_attach_to_other_dir(self):
+        """attach_to() ignores dirs outside the linking document dir.
+        """
+        page = Page(content="fake page",
+            metadata={'title': 'fakepage'}, settings=self.settings,
+            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'))
+        self.static.attach_to(page)
+
+        expected_save_as = os.path.join('outpages', 'foo.jpg')
+        self.assertEqual(self.static.save_as, expected_save_as)
+        self.assertEqual(self.static.url, path_to_url(expected_save_as))
+
+    def test_attach_to_ignores_subsequent_calls(self):
+        """attach_to() does nothing when called a second time.
+        """
+        page = Page(content="fake page",
+            metadata={'title': 'fakepage'}, settings=self.settings,
+            source_path=os.path.join('dir', 'fakepage.md'))
+
+        self.static.attach_to(page)
+
+        otherdir_settings = self.settings.copy()
+        otherdir_settings.update(dict(
+            PAGE_SAVE_AS=os.path.join('otherpages', '{slug}.html'),
+            PAGE_URL='otherpages/{slug}.html'))
+        otherdir_page = Page(content="other page",
+            metadata={'title': 'otherpage'}, settings=otherdir_settings,
+            source_path=os.path.join('dir', 'otherpage.md'))
+
+        self.static.attach_to(otherdir_page)
+
+        otherdir_save_as = os.path.join('otherpages', 'foo.jpg')
+        self.assertNotEqual(self.static.save_as, otherdir_save_as)
+        self.assertNotEqual(self.static.url, path_to_url(otherdir_save_as))
+
+    def test_attach_to_does_nothing_after_save_as_referenced(self):
+        """attach_to() does nothing if the save_as was already referenced.
+        (For example, by a {filename} link an a document processed earlier.)
+        """
+        original_save_as = self.static.save_as
+
+        page = Page(content="fake page",
+            metadata={'title': 'fakepage'}, settings=self.settings,
+            source_path=os.path.join('dir', 'fakepage.md'))
+        self.static.attach_to(page)
+
+        self.assertEqual(self.static.save_as, original_save_as)
+        self.assertEqual(self.static.url, path_to_url(original_save_as))
+
+    def test_attach_to_does_nothing_after_url_referenced(self):
+        """attach_to() does nothing if the url was already referenced.
+        (For example, by a {filename} link an a document processed earlier.)
+        """
+        original_url = self.static.url
+
+        page = Page(content="fake page",
+            metadata={'title': 'fakepage'}, settings=self.settings,
+            source_path=os.path.join('dir', 'fakepage.md'))
+        self.static.attach_to(page)
+
+        self.assertEqual(self.static.save_as, self.static.source_path)
+        self.assertEqual(self.static.url, original_url)
+
+    def test_attach_to_does_not_override_an_override(self):
+        """attach_to() does not override paths that were overridden elsewhere.
+        (For example, by the user with EXTRA_PATH_METADATA)
+        """
+        customstatic = Static(content=None,
+            metadata=dict(save_as='customfoo.jpg', url='customfoo.jpg'),
+            settings=self.settings,
+            source_path=os.path.join('dir', 'foo.jpg'),
+            context=self.settings.copy())
+
+        page = Page(content="fake page",
+            metadata={'title': 'fakepage'}, settings=self.settings,
+            source_path=os.path.join('dir', 'fakepage.md'))
+
+        customstatic.attach_to(page)
+
+        self.assertEqual(customstatic.save_as, 'customfoo.jpg')
+        self.assertEqual(customstatic.url, 'customfoo.jpg')
+
+    def test_attach_link_syntax(self):
+        """{attach} link syntax triggers output path override & url replacement.
+        """
+        html = '<a href="{attach}../foo.jpg">link</a>'
+        page = Page(content=html,
+            metadata={'title': 'fakepage'}, settings=self.settings,
+            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
+            context=self.context)
+        content = page.get_content('')
+
+        self.assertNotEqual(content, html,
+            "{attach} link syntax did not trigger URL replacement.")
+
+        expected_save_as = os.path.join('outpages', 'foo.jpg')
+        self.assertEqual(self.static.save_as, expected_save_as)
+        self.assertEqual(self.static.url, path_to_url(expected_save_as))
+
+
 class TestURLWrapper(unittest.TestCase):
     def test_comparisons(self):
         # URLWrappers are sorted by name
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 83988d62..190d5e06 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
 
+import collections
 import os
 import sys
 from tempfile import mkdtemp
@@ -77,14 +78,17 @@ class TestPelican(LoggedTestCase):
         assert not err, err
 
     def test_order_of_generators(self):
-        # StaticGenerator must run last, so it can find files that were
-        # skipped by the other generators.
+        # StaticGenerator must run last, so it can identify files that
+        # were skipped by the other generators, and so static files can
+        # have their output paths overridden by the {attach} link syntax.
 
         pelican = Pelican(settings=read_settings(path=None))
         generator_classes = pelican.get_generator_classes()
 
         self.assertTrue(generator_classes[-1] is StaticGenerator,
             "StaticGenerator must be the last generator, but it isn't!")
+        self.assertIsInstance(generator_classes, collections.Sequence,
+            "get_generator_classes() must return a Sequence to preserve order")
 
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default

From 306807596346bb42ed72ff9e712f3f6f66751d52 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 4 Nov 2014 19:35:12 -0800
Subject: [PATCH 1701/2864] Update changelog

---
 docs/changelog.rst | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d8c33cb5..52367cec 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,34 @@
 Release history
 ###############
 
+3.5.0 (2014-11-04)
+==================
+
+* Introduce ``ARTICLE_ORDER_BY`` and ``PAGE_ORDER_BY`` settings to control the
+  order of articles and pages.
+* Include time zone information in dates rendered in templates.
+* Expose the reader name in the metadata for articles and pages.
+* Add the ability to store static files along with content in the same
+  directory as articles and pages using ``{attach}`` in the path.
+* Prevent Pelican from raising an exception when there are duplicate pieces of
+  metadata in a Markdown file.
+* Introduce the ``TYPOGRIFY_IGNORE_TAGS`` setting to add HTML tags to be ignored
+  by Typogrify.
+* Add the ability to use ``-`` in date formats to strip leading zeros. For
+  example, ``%-d/%-m/%y`` will now result in the date ``9/8/12``.
+* Ensure feed generation is correctly disabled during quickstart configuration.
+* Fix ``PAGE_EXCLUDES`` and ``ARTICLE_EXCLUDES`` from incorrectly matching
+  sub-directories.
+* Introduce ``STATIC_EXCLUDE`` setting to add static file excludes.
+* Fix an issue when using ``PAGINATION_PATTERNS`` while ``RELATIVE_URLS``
+  is enabled.
+* Fix feed generation causing links to use the wrong language for month
+  names when using other locales.
+* Fix an issue where the authors list in the simple template wasn't correctly
+  formatted.
+* Fix an issue when parsing non-string URLs from settings.
+* Improve consistency of debug and warning messages.
+
 3.4.0 (2014-07-01)
 ==================
 

From febd28a74e8ead5adf7b1148236576723f22ba35 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 4 Nov 2014 19:43:14 -0800
Subject: [PATCH 1702/2864] Increment version to 3.5

---
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index d0056ded..967360c9 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -25,7 +25,7 @@ from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, folder_watcher, file_watcher
 from pelican.writers import Writer
 
-__version__ = "3.5.dev"
+__version__ = "3.5.0"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 
diff --git a/setup.py b/setup.py
index c1af72bb..8e4eff34 100755
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.4.0",
+    version="3.5.0",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',

From 4654a4efe40fb23e709005044410eb65a25ae63a Mon Sep 17 00:00:00 2001
From: Jiangge Zhang <tonyseek@gmail.com>
Date: Mon, 10 Nov 2014 11:40:26 +0800
Subject: [PATCH 1703/2864] fix up the datetime comparison error caused by
 timezone.

"can't compare offset-naive and offset-aware datetimes".
---
 pelican/contents.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index beff2106..c3d1230b 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -11,6 +11,7 @@ import os
 import re
 import sys
 
+import pytz
 
 from pelican import signals
 from pelican.settings import DEFAULT_CONFIG
@@ -132,8 +133,12 @@ class Content(object):
         # manage status
         if not hasattr(self, 'status'):
             self.status = settings['DEFAULT_STATUS']
-            if not settings['WITH_FUTURE_DATES']:
-                if hasattr(self, 'date') and self.date > SafeDatetime.now():
+            if not settings['WITH_FUTURE_DATES'] and hasattr(self, 'date'):
+                if self.date.tzinfo is None:
+                    now = SafeDatetime.now()
+                else:
+                    now = SafeDatetime.utcnow().replace(tzinfo=pytz.utc)
+                if self.date > now:
                     self.status = 'draft'
 
         # store the summary metadata if it is set

From 90edf14beb3a44cd814a7f8aad1202e18890e18d Mon Sep 17 00:00:00 2001
From: Sethathi Morokole <sethathi@gmail.com>
Date: Tue, 11 Nov 2014 15:26:13 +0200
Subject: [PATCH 1704/2864] unit tests for settings.py

---
 pelican/tests/test_settings.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 260eff05..9dff1626 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -112,3 +112,22 @@ class TestSettingsConfiguration(unittest.TestCase):
 
         configure_settings(self.settings)
         self.assertEqual(locale.getlocale(), locale.getdefaultlocale())
+
+    def test_invalid_settings_throw_exception(self):
+        # Test that the path name is valid
+
+        # test that 'PATH' is set
+        settings = {
+        }
+
+        self.assertRaises(Exception, configure_settings, settings)
+
+        # Test that 'PATH' is valid
+        settings['PATH'] = ''
+        self.assertRaises(Exception, configure_settings, settings)
+
+        # Test nonexistent THEME 
+        settings['PATH'] = os.curdir
+        settings['THEME'] = 'foo'
+
+        self.assertRaises(Exception, configure_settings, settings)

From 88d19d47b5c1ed74d4a64c396b2e452a1f884161 Mon Sep 17 00:00:00 2001
From: Kernc <kerncece@gmail.com>
Date: Mon, 17 Nov 2014 06:54:22 +0100
Subject: [PATCH 1705/2864] Replace underscores in dates with spaces before
 parsing

---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 85147e3e..36653306 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -30,7 +30,7 @@ from pelican.utils import get_date, pelican_open, FileStampDataCacher, SafeDatet
 
 METADATA_PROCESSORS = {
     'tags': lambda x, y: [Tag(tag, y) for tag in x.split(',')],
-    'date': lambda x, y: get_date(x),
+    'date': lambda x, y: get_date(x.replace('_', ' ')),
     'modified': lambda x, y: get_date(x),
     'status': lambda x, y: x.strip(),
     'category': Category,

From 33994f002430f390f4f9939563a4b50be7e076e0 Mon Sep 17 00:00:00 2001
From: OGINO Masanori <masanori.ogino@gmail.com>
Date: Tue, 18 Nov 2014 19:46:25 +0900
Subject: [PATCH 1706/2864] Add missing names in a list of the feed variables.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
---
 docs/themes.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/themes.rst b/docs/themes.rst
index c9fc2b37..198f8334 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -341,6 +341,8 @@ Here is a complete list of the feed variables::
     FEED_ALL_RSS
     CATEGORY_FEED_ATOM
     CATEGORY_FEED_RSS
+    AUTHOR_FEED_ATOM
+    AUTHOR_FEED_RSS
     TAG_FEED_ATOM
     TAG_FEED_RSS
     TRANSLATION_FEED_ATOM

From b3b2e845337c0df900235bf573566855562fe055 Mon Sep 17 00:00:00 2001
From: Sebastian Gumprich <sebastian.gumprich@38.de>
Date: Tue, 18 Nov 2014 13:37:27 +0000
Subject: [PATCH 1707/2864] Added documentation for default draft-status of
 articles

---
 docs/content.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/content.rst b/docs/content.rst
index fa65ac5d..4de480ba 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -498,6 +498,13 @@ publishing, for example), you can add a ``Status: draft`` attribute to its
 metadata. That article will then be output to the ``drafts`` folder and not
 listed on the index page nor on any category or tag page.
 
+If your articles should be automatically published as a draft (to not accidentally
+publish an article before it is finished) include the status in the ``DEFAULT_METADATA``::
+
+    DEFAULT_METADATA = {
+	    'status': 'draft',
+	}
+	
 .. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: http://www.methods.co.nz/asciidoc/
 .. _pelican-plugins: http://github.com/getpelican/pelican-plugins

From 5006dc95d2c86044a5519d0e2e5eb09ad0516c72 Mon Sep 17 00:00:00 2001
From: George Angelopoulos <george@usermod.net>
Date: Tue, 25 Nov 2014 17:38:37 +0200
Subject: [PATCH 1708/2864] docs: fix table formating in importer.rst

---
 docs/importer.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 309ca144..aa3fa935 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -47,10 +47,11 @@ Usage
 
 Positional arguments
 --------------------
-
-  input                 The input file to read
-  api_token             [Posterous only] api_token can be obtained from http://posterous.com/api/
-  api_key               [Tumblr only] api_key can be obtained from http://www.tumblr.com/oauth/apps
+  =============         ============================================================================
+  ``input``             The input file to read
+  ``api_token``         (Posterous only) api_token can be obtained from http://posterous.com/api/
+  ``api_key``           (Tumblr only) api_key can be obtained from http://www.tumblr.com/oauth/apps
+  =============         ============================================================================
 
 Optional arguments
 ------------------

From 8cc2f99ec413002d10f154304a002040722ea3cc Mon Sep 17 00:00:00 2001
From: "George V. Reilly" <george@reilly.org>
Date: Fri, 28 Nov 2014 15:41:10 -0800
Subject: [PATCH 1709/2864] Fabfile improvements

- Remove gratuitous Unixisms so that fabfile will work on Windows
- Docstrings for tasks so `fab --list` is more useful.
- Add `gh_pages` task for publishing to GitHub Pages
  using [ghp-import](https://github.com/davisp/ghp-import)
---
 pelican/tools/templates/fabfile.py.in | 36 +++++++++++++++++++++------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.in
index e693bb48..a8ab586b 100644
--- a/pelican/tools/templates/fabfile.py.in
+++ b/pelican/tools/templates/fabfile.py.in
@@ -1,6 +1,7 @@
 from fabric.api import *
 import fabric.contrib.project as project
 import os
+import shutil
 import sys
 import SimpleHTTPServer
 import SocketServer
@@ -18,26 +19,35 @@ env.cloudfiles_username = '$cloudfiles_username'
 env.cloudfiles_api_key = '$cloudfiles_api_key'
 env.cloudfiles_container = '$cloudfiles_container'
 
+# Github Pages configuration
+env.github_pages_branch = "gh-pages"
+
+# Port for `serve`
+PORT = 8000
 
 def clean():
+    """Remove generated files"""
     if os.path.isdir(DEPLOY_PATH):
-        local('rm -rf {deploy_path}'.format(**env))
-        local('mkdir {deploy_path}'.format(**env))
+        shutil.rmtree(DEPLOY_PATH)
+        os.makedirs(DEPLOY_PATH)
 
 def build():
+    """Build local version of site"""
     local('pelican -s pelicanconf.py')
 
 def rebuild():
+    """`clean` then `build`"""
     clean()
     build()
 
 def regenerate():
+    """Automatically regenerate site upon file modification"""
     local('pelican -r -s pelicanconf.py')
 
 def serve():
+    """Serve site at http://localhost:8000/"""
     os.chdir(env.deploy_path)
 
-    PORT = 8000
     class AddressReuseTCPServer(SocketServer.TCPServer):
         allow_reuse_address = True
 
@@ -47,22 +57,26 @@ def serve():
     server.serve_forever()
 
 def reserve():
+    """`build`, then `serve`"""
     build()
     serve()
 
 def preview():
+    """Build production version of site"""
     local('pelican -s publishconf.py')
 
 def cf_upload():
+    """Publish to Rackspace Cloud Files"""
     rebuild()
-    local('cd {deploy_path} && '
-          'swift -v -A https://auth.api.rackspacecloud.com/v1.0 '
-          '-U {cloudfiles_username} '
-          '-K {cloudfiles_api_key} '
-          'upload -c {cloudfiles_container} .'.format(**env))
+    with lcd(DEPLOY_PATH):
+        local('swift -v -A https://auth.api.rackspacecloud.com/v1.0 '
+              '-U {cloudfiles_username} '
+              '-K {cloudfiles_api_key} '
+              'upload -c {cloudfiles_container} .'.format(**env))
 
 @hosts(production)
 def publish():
+    """Publish to production via rsync"""
     local('pelican -s publishconf.py')
     project.rsync_project(
         remote_dir=dest_path,
@@ -71,3 +85,9 @@ def publish():
         delete=True,
         extra_opts='-c',
     )
+
+def gh_pages():
+    """Publish to GitHub Pages"""
+    rebuild()
+    local("ghp-import -b {github_pages_branch} {deploy_path}".format(**env))
+    local("git push origin {github_pages_branch}".format(**env))

From bbbb3247eaa1104750dd3b196deeb3df2ce14266 Mon Sep 17 00:00:00 2001
From: Midhul Varma <midhul.v@gmail.com>
Date: Wed, 24 Dec 2014 01:29:32 +0530
Subject: [PATCH 1710/2864] Add timezone prompt to quickstart. Refs 1337.

---
 pelican/tools/pelican_quickstart.py       | 23 ++++++++++++++++++++++-
 pelican/tools/templates/pelicanconf.py.in |  2 +-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index b24a508c..74633630 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -9,6 +9,7 @@ import string
 import argparse
 import sys
 import codecs
+import pytz
 
 from pelican import __version__
 
@@ -39,9 +40,13 @@ CONF = {
     'github_pages_branch': _GITHUB_PAGES_BRANCHES['project'],
     'default_pagination': 10,
     'siteurl': '',
-    'lang': 'en'
+    'lang': 'en',
+    'timezone': 'Europe/Paris'
 }
 
+#url for list of valid timezones
+_TZ_URL = 'http://en.wikipedia.org/wiki/List_of_tz_database_time_zones'
+
 def _input_compat(prompt):
     if six.PY3:
         r = input(prompt)
@@ -155,6 +160,20 @@ def ask(question, answer=str_compat, default=None, l=None):
         raise NotImplemented('Argument `answer` must be str_compat, bool, or integer')
 
 
+def ask_timezone(question, default, tzurl):
+    """Prompt for time zone and validate input"""
+    lower_tz = map(str.lower, pytz.all_timezones)
+    while True:
+        r = ask(question, str_compat, default)
+        r = r.strip().replace(' ', '_').lower()
+        if r in lower_tz:
+            r = pytz.all_timezones[lower_tz.index(r)]
+            break
+        else:
+            print('Please enter a valid time zone:\n (check [{0}])'.format(tzurl))
+    return r
+
+
 def main():
     parser = argparse.ArgumentParser(
         description="A kickstarter for Pelican",
@@ -203,6 +222,8 @@ needed by Pelican.
     else:
         CONF['default_pagination'] = False
 
+    CONF['timezone'] = ask_timezone('What is your time zone?', CONF['timezone'], _TZ_URL)
+
     automation = ask('Do you want to generate a Fabfile/Makefile to automate generation and publishing?', bool, True)
     develop = ask('Do you want an auto-reload & simpleHTTP script to assist with theme and site development?', bool, True)
 
diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.in
index e9570c4a..05d1a323 100644
--- a/pelican/tools/templates/pelicanconf.py.in
+++ b/pelican/tools/templates/pelicanconf.py.in
@@ -8,7 +8,7 @@ SITEURL = ''
 
 PATH = 'content'
 
-TIMEZONE = 'Europe/Paris'
+TIMEZONE = $timezone
 
 DEFAULT_LANG = $lang
 

From 49668f711a451e6fa2caa67a938d5e4b12172a51 Mon Sep 17 00:00:00 2001
From: Elana Hashman <elana@hashman.ca>
Date: Fri, 2 Jan 2015 00:03:18 -0700
Subject: [PATCH 1711/2864] Generate {tag}-style links on pages correctly.
 Fixes #1513

---
 pelican/contents.py                           |  4 +-
 .../page_with_category_and_tag_links.md       |  7 ++++
 pelican/tests/test_contents.py                | 38 ++++++++++++++++---
 pelican/tests/test_generators.py              | 23 +++++++++++
 4 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 pelican/tests/TestPages/page_with_category_and_tag_links.md

diff --git a/pelican/contents.py b/pelican/contents.py
index c3d1230b..69c01438 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -257,9 +257,9 @@ class Content(object):
                             'limit_msg': ("Other resources were not found "
                                           "and their urls not replaced")})
             elif what == 'category':
-                origin = Category(path, self.settings).url
+                origin = '/'.join((siteurl, Category(path, self.settings).url))
             elif what == 'tag':
-                origin = Tag(path, self.settings).url
+                origin = '/'.join((siteurl, Tag(path, self.settings).url))
 
             # keep all other parts, such as query, fragment, etc.
             parts = list(value)
diff --git a/pelican/tests/TestPages/page_with_category_and_tag_links.md b/pelican/tests/TestPages/page_with_category_and_tag_links.md
new file mode 100644
index 00000000..6806a570
--- /dev/null
+++ b/pelican/tests/TestPages/page_with_category_and_tag_links.md
@@ -0,0 +1,7 @@
+Title: Page with a bunch of links
+
+My links:
+
+[Link 1]({tag}マック)
+
+[Link 2]({category}Yeah)
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 01ee9ca2..de297985 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -212,17 +212,20 @@ class TestPage(unittest.TestCase):
                            '<a href="|tag|tagname">link</a>')
         page = Page(**args)
         content = page.get_content('http://notmyidea.org')
-        self.assertEqual(content, ('A simple test, with a '
-                                   '<a href="tag/tagname.html">link</a>'))
+        self.assertEqual(
+            content,
+            ('A simple test, with a '
+             '<a href="http://notmyidea.org/tag/tagname.html">link</a>'))
 
         # Category
         args['content'] = ('A simple test, with a '
                            '<a href="|category|category">link</a>')
         page = Page(**args)
         content = page.get_content('http://notmyidea.org')
-        self.assertEqual(content,
-                         ('A simple test, with a '
-                          '<a href="category/category.html">link</a>'))
+        self.assertEqual(
+            content,
+            ('A simple test, with a '
+             '<a href="http://notmyidea.org/category/category.html">link</a>'))
 
     def test_intrasite_link(self):
         # type does not take unicode in PY2 and bytes in PY3, which in
@@ -543,6 +546,31 @@ class TestStatic(unittest.TestCase):
         self.assertEqual(self.static.save_as, expected_save_as)
         self.assertEqual(self.static.url, path_to_url(expected_save_as))
 
+    def test_tag_link_syntax(self):
+        "{tag} link syntax triggers url replacement."
+
+        html = '<a href="{tag}foo">link</a>'
+        page = Page(
+            content=html,
+            metadata={'title': 'fakepage'}, settings=self.settings,
+            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
+            context=self.context)
+        content = page.get_content('')
+
+        self.assertNotEqual(content, html)
+
+    def test_category_link_syntax(self):
+        "{category} link syntax triggers url replacement."
+
+        html = '<a href="{category}foo">link</a>'
+        page = Page(content=html,
+            metadata={'title': 'fakepage'}, settings=self.settings,
+            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
+            context=self.context)
+        content = page.get_content('')
+
+        self.assertNotEqual(content, html)
+
 
 class TestURLWrapper(unittest.TestCase):
     def test_comparisons(self):
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 4be1b35e..c3e36bc1 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -428,6 +428,7 @@ class TestPageGenerator(unittest.TestCase):
             ['This is a markdown test page', 'published', 'page'],
             ['This is a test page with a preset template', 'published',
              'custom'],
+            ['Page with a bunch of links', 'published', 'page'],
             ['A Page (Test) for sorting', 'published', 'page'],
         ]
         hidden_pages_expected = [
@@ -517,6 +518,7 @@ class TestPageGenerator(unittest.TestCase):
             ['This is a test page', 'published', 'page'],
             ['This is a markdown test page', 'published', 'page'],
             ['A Page (Test) for sorting', 'published', 'page'],
+            ['Page with a bunch of links', 'published', 'page'],
             ['This is a test page with a preset template', 'published',
              'custom'],
         ]
@@ -530,6 +532,7 @@ class TestPageGenerator(unittest.TestCase):
         # sort by title
         pages_expected_sorted_by_title = [
             ['A Page (Test) for sorting', 'published', 'page'],
+            ['Page with a bunch of links', 'published', 'page'],
             ['This is a markdown test page', 'published', 'page'],
             ['This is a test page', 'published', 'page'],
             ['This is a test page with a preset template', 'published',
@@ -543,6 +546,26 @@ class TestPageGenerator(unittest.TestCase):
         pages = self.distill_pages(generator.pages)
         self.assertEqual(pages_expected_sorted_by_title, pages)
 
+    def test_tag_and_category_links_on_generated_pages(self):
+        """
+        Test to ensure links of the form {tag}tagname and {category}catname
+        are generated correctly on pages
+        """
+        settings = get_settings(filenames={})
+        settings['PAGE_PATHS'] = ['TestPages'] # relative to CUR_DIR
+        settings['CACHE_PATH'] = self.temp_cache
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        pages_by_title = {p.title: p.content for p in generator.pages}
+
+        test_content = pages_by_title['Page with a bunch of links']
+        self.assertIn('<a href="/category/yeah.html">', test_content)
+        self.assertIn('<a href="/tag/matsuku.html">', test_content)
+
 
 class TestTemplatePagesGenerator(unittest.TestCase):
 

From 0360ce1865bfe7fb2046b8a998017e06d2f65508 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Fri, 2 Jan 2015 01:11:51 -0800
Subject: [PATCH 1712/2864] Use Shields.io as source for Travis badge

Using Shields.io as the source for both the Travis and Coveralls badges
keeps styling consistent between the two.
---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 58896f1d..564cc77c 100644
--- a/README.rst
+++ b/README.rst
@@ -55,7 +55,7 @@ See our `contribution submission and feedback guidelines <CONTRIBUTING.rst>`_.
 .. _`Pelican documentation`: http://docs.getpelican.com/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
 
-.. |build-status| image:: https://travis-ci.org/getpelican/pelican.svg?branch=master
+.. |build-status| image:: https://img.shields.io/travis/getpelican/pelican/master.svg
    :target: https://travis-ci.org/getpelican/pelican
    :alt: Travis CI: continuous integration status
 .. |coverage-status| image:: https://img.shields.io/coveralls/getpelican/pelican.svg

From 3763f96011b617f5b33dc375fe81d3344fb8d8c7 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Mon, 5 Jan 2015 11:50:48 +0100
Subject: [PATCH 1713/2864] add comment to 'preview your site' section
 mentioning the http server module for python3 is different then python

---
 docs/quickstart.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 4fe75d98..122d65b5 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -64,7 +64,7 @@ Open a new terminal session and run the following commands to switch to your
 ``output`` directory and launch Python's built-in web server::
 
     cd ~/projects/yoursite/output
-    python -m SimpleHTTPServer
+    python -m SimpleHTTPServer # -m http.server if you use python3
 
 Preview your site by navigating to http://localhost:8000/ in your browser.
 

From 5432dc04a64c9282ef35fd6017047f5215a00dfd Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Mon, 5 Jan 2015 12:07:01 +0100
Subject: [PATCH 1714/2864] fix double definition of simple theme link to
 different targets

---
 docs/themes.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/themes.rst b/docs/themes.rst
index 198f8334..25926893 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -325,6 +325,7 @@ period                  A tuple of the form (`year`, `month`, `day`) that
 ===================     ===================================================
 
 You can see an example of how to use `period` in the `"simple" theme
+period_archives.html template
 <https://github.com/getpelican/pelican/blob/master/pelican/themes/simple/templates/period_archives.html>`_.
 
 

From 30c4d0eaf38f13f442946be29243f881e0c5e1a7 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Mon, 5 Jan 2015 12:22:00 +0100
Subject: [PATCH 1715/2864] fix whitespace

---
 docs/content.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 4de480ba..12bd887f 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -502,9 +502,9 @@ If your articles should be automatically published as a draft (to not accidental
 publish an article before it is finished) include the status in the ``DEFAULT_METADATA``::
 
     DEFAULT_METADATA = {
-	    'status': 'draft',
-	}
-	
+        'status': 'draft',
+    }
+
 .. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: http://www.methods.co.nz/asciidoc/
 .. _pelican-plugins: http://github.com/getpelican/pelican-plugins

From 49481f60a54eed144b2d09d510e203f03fcdc2d4 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Mon, 5 Jan 2015 12:36:35 +0100
Subject: [PATCH 1716/2864] fix headers, this fixes issues with
 docs/contributing.rst throwing errors because of the different content
 structure

---
 CONTRIBUTING.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 85d30c97..862cf7a7 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,5 +1,5 @@
 Filing issues
--------------
+=============
 
 * Before you file an issue, try `asking for help`_ first.
 * If determined to file an issue, first check for `existing issues`_, including
@@ -9,7 +9,7 @@ Filing issues
 .. _`existing issues`: https://github.com/getpelican/pelican/issues
 
 How to get help
----------------
+===============
 
 Before you ask for help, please make sure you do the following:
 
@@ -66,7 +66,7 @@ Once the above preparation is ready, you can contact people willing to help via
 Remember to include all the information you prepared.
 
 The #pelican IRC channel
-........................
+------------------------
 
 * Because of differing time zones, you may not get an immediate response to your
   question, but please be patient and stay logged into IRC — someone will almost
@@ -81,7 +81,7 @@ The #pelican IRC channel
 
 
 Contributing code
------------------
+=================
 
 Before you submit a contribution, please ask whether it is desired so that you
 don't spend a lot of time working on something that would be rejected for a
@@ -89,7 +89,7 @@ known reason. Consider also whether your new feature might be better suited as
 a plugin_ — you can `ask for help`_  to make that determination.
 
 Using Git and GitHub
-....................
+--------------------
 
 * `Create a new git branch`_ specific to your change (as opposed to making
   your commits in the master branch).
@@ -116,7 +116,7 @@ Using Git and GitHub
   turn your GitHub issue into a pull request containing your code.
 
 Contribution quality standards
-..............................
+------------------------------
 
 * Adhere to `PEP8 coding standards`_ whenever possible. This can be eased via
   the `pep8 <http://pypi.python.org/pypi/pep8>`_ or `flake8

From 3d8ceb1c67e577225cf739b31a326d827e06d9b9 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Sat, 10 Jan 2015 15:40:54 -0800
Subject: [PATCH 1717/2864] Adding ability to listen on addresses other than
 localhost.

This is helpful for mobile testing of Pelican sites by allowing
broadcasting on the local network. Using port 80 requires
running as root on most machines.
---
 pelican/server.py                   |  9 ++---
 pelican/tools/templates/Makefile.in | 51 +++++++++++++++++------------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/pelican/server.py b/pelican/server.py
index d4518acd..cfe3d2b0 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -12,7 +12,8 @@ try:
 except ImportError:
     import socketserver  # NOQA
 
-PORT = len(sys.argv) == 2 and int(sys.argv[1]) or 8000
+PORT = len(sys.argv) in (2, 3) and int(sys.argv[1]) or 8000
+SERVER = len(sys.argv) == 3 and sys.argv[2] or ""
 SUFFIXES = ['', '.html', '/index.html']
 
 
@@ -38,13 +39,13 @@ Handler = ComplexHTTPRequestHandler
 
 socketserver.TCPServer.allow_reuse_address = True
 try:
-    httpd = socketserver.TCPServer(("", PORT), Handler)
+    httpd = socketserver.TCPServer((SERVER, PORT), Handler)
 except OSError as e:
-    logging.error("Could not listen on port %s", PORT)
+    logging.error("Could not listen on port %s, server %s", PORT, SERVER)
     sys.exit(getattr(e, 'exitcode', 1))
 
 
-logging.info("Serving at port %s", PORT)
+logging.info("Serving at port %s, server %s", PORT, SERVER)
 try:
     httpd.serve_forever()
 except KeyboardInterrupt as e:
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 8534595e..18722175 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -32,26 +32,27 @@ ifeq ($(DEBUG), 1)
 endif
 
 help:
-	@echo 'Makefile for a pelican Web site                                        '
-	@echo '                                                                       '
-	@echo 'Usage:                                                                 '
-	@echo '   make html                        (re)generate the web site          '
-	@echo '   make clean                       remove the generated files         '
-	@echo '   make regenerate                  regenerate files upon modification '
-	@echo '   make publish                     generate using production settings '
-	@echo '   make serve [PORT=8000]           serve site at http://localhost:8000'
-	@echo '   make devserver [PORT=8000]       start/restart develop_server.sh    '
-	@echo '   make stopserver                  stop local server                  '
-	@echo '   make ssh_upload                  upload the web site via SSH        '
-	@echo '   make rsync_upload                upload the web site via rsync+ssh  '
-	@echo '   make dropbox_upload              upload the web site via Dropbox    '
-	@echo '   make ftp_upload                  upload the web site via FTP        '
-	@echo '   make s3_upload                   upload the web site via S3         '
-	@echo '   make cf_upload                   upload the web site via Cloud Files'
-	@echo '   make github                      upload the web site via gh-pages   '
-	@echo '                                                                       '
-	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html'
-	@echo '                                                                       '
+	@echo 'Makefile for a pelican Web site                                           '
+	@echo '                                                                          '
+	@echo 'Usage:                                                                    '
+	@echo '   make html                           (re)generate the web site          '
+	@echo '   make clean                          remove the generated files         '
+	@echo '   make regenerate                     regenerate files upon modification '
+	@echo '   make publish                        generate using production settings '
+	@echo '   make serve [PORT=8000]              serve site at http://localhost:8000'
+	@echo '   make serve-global [SERVER=0.0.0.0]  serve (as root) to $(SERVER):80    '
+	@echo '   make devserver [PORT=8000]          start/restart develop_server.sh    '
+	@echo '   make stopserver                     stop local server                  '
+	@echo '   make ssh_upload                     upload the web site via SSH        '
+	@echo '   make rsync_upload                   upload the web site via rsync+ssh  '
+	@echo '   make dropbox_upload                 upload the web site via Dropbox    '
+	@echo '   make ftp_upload                     upload the web site via FTP        '
+	@echo '   make s3_upload                      upload the web site via S3         '
+	@echo '   make cf_upload                      upload the web site via Cloud Files'
+	@echo '   make github                         upload the web site via gh-pages   '
+	@echo '                                                                          '
+	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html   '
+	@echo '                                                                          '
 
 html:
 	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
@@ -69,6 +70,14 @@ else
 	cd $$(OUTPUTDIR) && $(PY) -m pelican.server
 endif
 
+serve-global:
+ifdef SERVER
+	cd $$(OUTPUTDIR) && $(PY) -m pelican.server 80 $$(SERVER)
+else
+	cd $$(OUTPUTDIR) && $(PY) -m pelican.server 80 0.0.0.0
+endif
+
+
 devserver:
 ifdef PORT
 	$$(BASEDIR)/develop_server.sh restart $$(PORT)
@@ -106,4 +115,4 @@ github: publish
 	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $$(OUTPUTDIR)
 	git push origin $(GITHUB_PAGES_BRANCH)
 
-.PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
+.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github

From cff5f3e77485c86ad97c2e8cca8d5f1e8c3f9751 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 11 Jan 2015 18:54:15 -0800
Subject: [PATCH 1718/2864] Add custom 404 page to Tips section of docs

---
 docs/tips.rst | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/tips.rst b/docs/tips.rst
index eb400124..fdd57398 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -3,6 +3,32 @@ Tips
 
 Here are some tips about Pelican that you might find useful.
 
+Custom 404 Pages
+================
+
+When a browser requests a resource that the web server cannot find, the web
+server usually displays a generic "File not found" (404) error page that can be
+stark and unsightly. One way to provide an error page that matches the theme
+of your site is to create a custom 404 page, such as this Markdown-formatted
+example::
+
+    Title: Not Found
+    Status: hidden
+    Save_as: 404.html
+
+    The requested item could not be located. Perhaps you might want to check
+    the [Archives](/archives.html)?
+
+The next step is to configure your web server to display this custom page
+instead of its default 404 page. For Nginx, add the following to your
+configuration file's ``location`` block::
+
+    error_page 404 /404.html;
+
+For Apache::
+
+    ErrorDocument 404 /404.html
+
 Publishing to GitHub
 ====================
 

From 38c307eefdd32e77162775b52cca7f577e86177c Mon Sep 17 00:00:00 2001
From: Shrayas <shrayasr@gmail.com>
Date: Sat, 10 Jan 2015 00:31:01 +0530
Subject: [PATCH 1719/2864] Add link to GitHub docs on custom 404 pages

---
 docs/tips.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/tips.rst b/docs/tips.rst
index fdd57398..69e1b9ba 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -88,6 +88,12 @@ by the ``ghp-import`` command) to the ``elemoine.github.io`` repository's
     To publish your Pelican site as User Pages, feel free to adjust the
     ``github`` target of the Makefile.
 
+Custom 404 Pages
+----------------
+
+GitHub Pages will display the custom 404 page described above, as noted in the
+relevant `GitHub docs <https://help.github.com/articles/custom-404-pages/>`_.
+
 Extra Tips
 ----------
 
@@ -125,3 +131,4 @@ Moreover, markup languages like reST and Markdown have plugins that let you
 embed videos in the markup. You can use `reST video directive
 <https://gist.github.com/dbrgn/2922648>`_ for reST or `mdx_video plugin
 <https://github.com/italomaia/mdx-video>`_ for Markdown.
+

From bf7966183a1931e1a906525566b75f93723d1419 Mon Sep 17 00:00:00 2001
From: Shrayas <shrayasr@gmail.com>
Date: Mon, 12 Jan 2015 09:14:09 +0530
Subject: [PATCH 1720/2864] Changing dates in copyright information

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index d4efcb38..4ec0f832 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,7 +14,7 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.ifconfig', 'sphinx.ext.extlinks'
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Pelican'
-copyright = '2014, Alexis Metaireau and contributors'
+copyright = '2015, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])

From 79548c3bf90b5a5ea2de3f6e1ca7c61169eb484c Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Mon, 15 Dec 2014 11:05:02 -0800
Subject: [PATCH 1721/2864] Minor changes to server.py

- Log original path name rather than last path name
- Use for-else construct to avoid use of flag variable
- Make log messages consistent
---
 pelican/server.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pelican/server.py b/pelican/server.py
index cfe3d2b0..0a8dc1b6 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -19,21 +19,25 @@ SUFFIXES = ['', '.html', '/index.html']
 
 class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
     def do_GET(self):
-        # we are trying to detect the file by having a fallback mechanism
-        found = False
+        # Try to detect file by applying various suffixes
         for suffix in SUFFIXES:
-            if not hasattr(self,'original_path'):
+            if not hasattr(self, 'original_path'):
                 self.original_path = self.path
+
             self.path = self.original_path + suffix
             path = self.translate_path(self.path)
+
             if os.path.exists(path):
                 srvmod.SimpleHTTPRequestHandler.do_GET(self)
-                logging.info("Found: %s" % self.path)
-                found = True
+                logging.info("Found `%s`." % self.path)
                 break
-            logging.info("Tried to find file %s, but it doesn't exist. ", self.path)
-        if not found:
-            logging.warning("Unable to find file %s or variations.", self.path)
+
+            logging.info("Tried to find `%s`, but it doesn't exist.",
+                         self.path)
+        else:
+            # Fallback if there were no matches
+            logging.warning("Unable to find `%s` or variations.",
+                            self.original_path)
 
 Handler = ComplexHTTPRequestHandler
 
@@ -41,13 +45,13 @@ socketserver.TCPServer.allow_reuse_address = True
 try:
     httpd = socketserver.TCPServer((SERVER, PORT), Handler)
 except OSError as e:
-    logging.error("Could not listen on port %s, server %s", PORT, SERVER)
+    logging.error("Could not listen on port %s, server %s.", PORT, SERVER)
     sys.exit(getattr(e, 'exitcode', 1))
 
 
-logging.info("Serving at port %s, server %s", PORT, SERVER)
+logging.info("Serving at port %s, server %s.", PORT, SERVER)
 try:
     httpd.serve_forever()
 except KeyboardInterrupt as e:
-    logging.info("Shutting down server")
+    logging.info("Shutting down server.")
     httpd.socket.close()

From a62f9ab23ca5b113bc9546aac52e39de55844e04 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Sat, 17 Jan 2015 16:37:11 +0100
Subject: [PATCH 1722/2864] add argparse argument for relative urls

---
 pelican/__init__.py                 | 6 ++++++
 pelican/tools/templates/Makefile.in | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 967360c9..8d774ffe 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -281,6 +281,11 @@ def parse_arguments():
                         help='Relaunch pelican each time a modification occurs'
                         ' on the content files.')
 
+    parser.add_argument('--relative-urls', dest='relative_paths',
+                        action='store_true',
+                        help='Use relative urls in output, '
+                             'useful for site development')
+
     parser.add_argument('--cache-path', dest='cache_path',
                         help=('Directory in which to store cache files. '
                               'If not specified, defaults to "cache".'))
@@ -314,6 +319,7 @@ def get_config(args):
         config['CACHE_PATH'] = args.cache_path
     if args.selected_paths:
         config['WRITE_SELECTED'] = args.selected_paths.split(',')
+    config['RELATIVE_URLS'] = args.relative_paths
     config['DEBUG'] = args.verbosity == logging.DEBUG
 
     # argparse returns bytes in Py2. There is no definite answer as to which
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 18722175..5e3635c3 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -31,6 +31,11 @@ ifeq ($(DEBUG), 1)
 	PELICANOPTS += -D
 endif
 
+RELATIVE ?= 0
+ifeq ($(RELATIVE), 1)
+	PELICANOPTS += --relative-urls
+endif
+
 help:
 	@echo 'Makefile for a pelican Web site                                           '
 	@echo '                                                                          '
@@ -52,6 +57,7 @@ help:
 	@echo '   make github                         upload the web site via gh-pages   '
 	@echo '                                                                          '
 	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html   '
+	@echo 'Set the RELATIVE variable to 1 to enable relative urls                    '
 	@echo '                                                                          '
 
 html:

From 8aa9a9329edc90933b38de6a4fd4686199bbc090 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Sat, 17 Jan 2015 16:19:37 -0800
Subject: [PATCH 1723/2864] Clarify that 'fs' date setting is a string

---
 docs/content.rst  | 2 +-
 docs/settings.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 12bd887f..b4292e69 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -91,7 +91,7 @@ via the ``keywords`` metadata, as is standard in HTML. The two can be used
 interchangeably.
 
 Note that, aside from the title, none of this article metadata is mandatory:
-if the date is not specified and ``DEFAULT_DATE`` is set to ``fs``, Pelican
+if the date is not specified and ``DEFAULT_DATE`` is set to ``'fs'``, Pelican
 will rely on the file's "mtime" timestamp, and the category can be determined
 by the directory in which the file resides. For example, a file located at
 ``python/foobar/myfoobar.rst`` will have a category of ``foobar``. If you would
diff --git a/docs/settings.rst b/docs/settings.rst
index 02f4359f..a0a41c29 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -58,7 +58,7 @@ Setting name (followed by default value, if any)
                                                                                  template. Templates may or not honor this
                                                                                  setting.
 ``DEFAULT_DATE = None``                                                          The default date you want to use.
-                                                                                 If ``fs``, Pelican will use the file system
+                                                                                 If ``'fs'``, Pelican will use the file system
                                                                                  timestamp information (mtime) if it can't get
                                                                                  date information from the metadata.
                                                                                  If set to a tuple object, the default datetime object will instead

From 88ad46fd4dc0001fe51472a23b26b0e951424ca0 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Sat, 17 Jan 2015 16:20:39 -0800
Subject: [PATCH 1724/2864] Change documented type of various settings

- DEFUALT_METADATA, tuple -> dictionary
- OUTPUT_RETENTION, tuple -> list
- JINJA_FILTERS, list -> dictionary
- DIRECT_TEMPLATES, tuple -> list
---
 docs/settings.rst             | 23 +++++++++++------------
 pelican/settings.py           |  8 ++++----
 pelican/tests/default_conf.py |  2 +-
 samples/pelican.conf.py       |  2 +-
 samples/pelican.conf_FR.py    |  2 +-
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index a0a41c29..d7ba85cd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -64,12 +64,11 @@ Setting name (followed by default value, if any)
                                                                                  If set to a tuple object, the default datetime object will instead
                                                                                  be generated by passing the tuple to the
                                                                                  ``datetime.datetime`` constructor.
-``DEFAULT_METADATA = ()``                                                        The default metadata you want to use for all articles
-                                                                                 and pages.
+``DEFAULT_METADATA = {}``                                                        The default metadata you want to use for all articles and pages.
 ``DOCUTILS_SETTINGS = {}``                                                       Extra configuration settings for the docutils publisher
-                                                                                 (applicable only to reStructuredText). See `Docutils 
+                                                                                 (applicable only to reStructuredText). See `Docutils
                                                                                  Configuration`_ settings for more details.
-                                            
+
 ``FILENAME_METADATA =`` ``'(?P<date>\d{4}-\d{2}-\d{2}).*'``                      The regexp that will be used to extract any metadata
                                                                                  from the filename. All named groups that are matched
                                                                                  will be set in the metadata object.
@@ -90,11 +89,11 @@ Setting name (followed by default value, if any)
                                                                                  generating new files. This can be useful in preventing older,
                                                                                  unnecessary files from persisting in your output. However, **this is
                                                                                  a destructive setting and should be handled with extreme care.**
-``OUTPUT_RETENTION = ()``                                                        A tuple of filenames that should be retained and not deleted from the
+``OUTPUT_RETENTION = []``                                                        A list of filenames that should be retained and not deleted from the
                                                                                  output directory. One use case would be the preservation of version
-                                                                                 control data. For example: ``(".hg", ".git", ".bzr")``
+                                                                                 control data. For example: ``[".hg", ".git", ".bzr"]``
 ``JINJA_EXTENSIONS = []``                                                        A list of any Jinja2 extensions you want to use.
-``JINJA_FILTERS = {}``                                                           A list of custom Jinja2 filters you want to use.
+``JINJA_FILTERS = {}``                                                           A dictionary of custom Jinja2 filters you want to use.
                                                                                  The dictionary should map the filtername to the filter function.
                                                                                  For example: ``{'urlencode': urlencode_filter}``
                                                                                  See `Jinja custom filters documentation`_.
@@ -171,12 +170,12 @@ Setting name (followed by default value, if any)
 ``TYPOGRIFY_IGNORE_TAGS = []``                                                   A list of tags for Typogrify to ignore. By default
                                                                                  Typogrify will ignore ``pre`` and ``code`` tags. This
                                                                                  requires that Typogrify version 2.0.4 or later is installed
-``DIRECT_TEMPLATES =`` ``('index', 'categories', 'authors', 'archives')``        List of templates that are used directly to render
+``DIRECT_TEMPLATES =`` ``['index', 'categories', 'authors', 'archives']``        List of templates that are used directly to render
                                                                                  content. Typically direct templates are used to generate
                                                                                  index pages for collections of content (e.g., tags and
                                                                                  category index pages). If the tag and category collections
-                                                                                 are not needed, set ``DIRECT_TEMPLATES = ('index', 'archives')``
-``PAGINATED_DIRECT_TEMPLATES = ('index',)``                                      Provides the direct templates that should be paginated.
+                                                                                 are not needed, set ``DIRECT_TEMPLATES = ['index', 'archives']``
+``PAGINATED_DIRECT_TEMPLATES = ['index']``                                       Provides the direct templates that should be paginated.
 ``SUMMARY_MAX_LENGTH = 50``                                                      When creating a short summary of an article, this will
                                                                                  be the default length (measured in words) of the text created.
                                                                                  This only applies if your content does not otherwise
@@ -352,7 +351,7 @@ posts for the month at ``posts/2011/Aug/index.html``.
     arrive at an appropriate archive of posts, without having to specify
     a page name.
 
-``DIRECT_TEMPLATES``, which are ``('index', 'tags', 'categories', 'archives')``
+``DIRECT_TEMPLATES``, which are ``['index', 'tags', 'categories', 'archives']``
 by default, work a bit differently than noted above. Only the ``_SAVE_AS``
 settings are available, but it is available for any direct template.
 
@@ -394,7 +393,7 @@ Date format and locale
 If no ``DATE_FORMATS`` are set, Pelican will fall back to
 ``DEFAULT_DATE_FORMAT``. If you need to maintain multiple languages with
 different date formats, you can set the ``DATE_FORMATS`` dictionary using the
-language name (``lang`` metadata in your post content) as the key. 
+language name (``lang`` metadata in your post content) as the key.
 
 In addition to the standard C89 strftime format codes that are listed in
 `Python strftime documentation`_, you can use ``-`` character between ``%`` and
diff --git a/pelican/settings.py b/pelican/settings.py
index 794733d7..a3d791b0 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -61,7 +61,7 @@ DEFAULT_CONFIG = {
     'NEWEST_FIRST_ARCHIVES': True,
     'REVERSE_CATEGORY_ORDER': False,
     'DELETE_OUTPUT_DIRECTORY': False,
-    'OUTPUT_RETENTION': (),
+    'OUTPUT_RETENTION': [],
     'ARTICLE_URL': '{slug}.html',
     'ARTICLE_SAVE_AS': '{slug}.html',
     'ARTICLE_ORDER_BY': 'slug',
@@ -97,9 +97,9 @@ DEFAULT_CONFIG = {
     'DEFAULT_LANG': 'en',
     'TAG_CLOUD_STEPS': 4,
     'TAG_CLOUD_MAX_ITEMS': 100,
-    'DIRECT_TEMPLATES': ('index', 'tags', 'categories', 'authors', 'archives'),
+    'DIRECT_TEMPLATES': ['index', 'tags', 'categories', 'authors', 'archives'],
     'EXTRA_TEMPLATES_PATHS': [],
-    'PAGINATED_DIRECT_TEMPLATES': ('index', ),
+    'PAGINATED_DIRECT_TEMPLATES': ['index'],
     'PELICAN_CLASS': 'pelican.Pelican',
     'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
     'DATE_FORMATS': {},
@@ -110,7 +110,7 @@ DEFAULT_CONFIG = {
     'LOCALE': [''],  # defaults to user locale
     'DEFAULT_PAGINATION': False,
     'DEFAULT_ORPHANS': 0,
-    'DEFAULT_METADATA': (),
+    'DEFAULT_METADATA': {},
     'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*',
     'PATH_METADATA': '',
     'EXTRA_PATH_METADATA': {},
diff --git a/pelican/tests/default_conf.py b/pelican/tests/default_conf.py
index 62594894..b4f532d4 100644
--- a/pelican/tests/default_conf.py
+++ b/pelican/tests/default_conf.py
@@ -26,7 +26,7 @@ SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
           ('github', 'http://github.com/ametaireau'),)
 
 # global metadata to all the contents
-DEFAULT_METADATA = (('yeah', 'it is'),)
+DEFAULT_METADATA = {'yeah': 'it is'}
 
 # path-specific metadata
 EXTRA_PATH_METADATA = {
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index d6a87923..98ae078a 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -32,7 +32,7 @@ SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
           ('github', 'http://github.com/ametaireau'),)
 
 # global metadata to all the contents
-DEFAULT_METADATA = (('yeah', 'it is'),)
+DEFAULT_METADATA = {'yeah': 'it is'}
 
 # path-specific metadata
 EXTRA_PATH_METADATA = {
diff --git a/samples/pelican.conf_FR.py b/samples/pelican.conf_FR.py
index 0c4ec60d..54b348c4 100644
--- a/samples/pelican.conf_FR.py
+++ b/samples/pelican.conf_FR.py
@@ -36,7 +36,7 @@ SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
           ('github', 'http://github.com/ametaireau'),)
 
 # global metadata to all the contents
-DEFAULT_METADATA = (('yeah', 'it is'),)
+DEFAULT_METADATA = {'yeah': 'it is'}
 
 # path-specific metadata
 EXTRA_PATH_METADATA = {

From 737db1d641c6d17cdf2700912c413eb2b6dd4ba6 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 21 Jan 2015 18:06:04 -0500
Subject: [PATCH 1725/2864] Fix static path watchers

There was an issue with static path watchers, where they were watching wrong paths.
They need to be prefixed with the 'content' path. So, they were not working at all.

It was also possible to overwrite default watchers like 'content', 'settings' and
'theme' by mistake if any of them were present in `STATIC_PATHS`. This is fixed
by adding a prefix to static watchers.

And static watchers were "too static", meaning, they stayed the same even if
`STATIC_PATHS` was changed in the settings during autoreload. Now static watchers
reflect those changes (i.e. new paths are added to watch list, and removed ones
are no longer watched).
---
 pelican/__init__.py | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 967360c9..53025e71 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -359,8 +359,13 @@ def main():
                                         pelican.ignore_files),
                 'settings': file_watcher(args.settings)}
 
-    for static_path in settings.get("STATIC_PATHS", []):
-        watchers[static_path] = folder_watcher(static_path, [''], pelican.ignore_files)
+    old_static = settings.get("STATIC_PATHS", [])
+    for static_path in old_static:
+        # use a prefix to avoid possible overriding of standard watchers above
+        watchers['[static]%s' % static_path] = folder_watcher(
+            os.path.join(pelican.path, static_path),
+            [''],
+            pelican.ignore_files)
 
     try:
         if args.autoreload:
@@ -386,6 +391,29 @@ def main():
                         original_load_cache = settings['LOAD_CONTENT_CACHE']
                         _ignore_cache(pelican)
 
+                        # Adjust static watchers if there are any changes
+                        new_static = settings.get("STATIC_PATHS", [])
+
+                        # Added static paths
+                        # Add new watchers and set them as modified
+                        for static_path in set(new_static).difference(old_static):
+                            static_key = '[static]%s' % static_path
+                            watchers[static_key] = folder_watcher(
+                                os.path.join(pelican.path, static_path),
+                                [''],
+                                pelican.ignore_files)
+                            modified[static_key] = next(watchers[static_key])
+
+                        # Removed static paths
+                        # Remove watchers and modified values
+                        for static_path in set(old_static).difference(new_static):
+                            static_key = '[static]%s' % static_path
+                            watchers.pop(static_key)
+                            modified.pop(static_key)
+
+                        # Replace old_static with the new one
+                        old_static = new_static
+
                     if any(modified.values()):
                         print('\n-> Modified: {}. re-generating...'.format(
                             ', '.join(k for k, v in modified.items() if v)))

From 4c25610cd88d3c2936fec22baa7f37ead7660606 Mon Sep 17 00:00:00 2001
From: "George V. Reilly" <george@reilly.org>
Date: Fri, 2 Jan 2015 23:45:44 -0800
Subject: [PATCH 1726/2864] Fix Pelican rendering and unit tests on Windows.

* Fix {filename} links on Windows.
  Otherwise '{filename}/foo/bar.jpg' doesn't work
* Clean up relative Posix path handling in contents.
* Use Posix paths in readers
* Environment for Popen must be strs, not unicodes.
* Ignore Git CRLF warnings.
* Replace CRLFs with LFs in inputs on Windows.
* Fix importer tests
* Fix test_contents
* Fix one last backslash in paginated output
* Skip the remaining failing locale tests on Windows.
* Document the use of forward slashes on Windows.
* Add some Fabric and ghp-import notes
---
 docs/content.rst                |  3 +++
 docs/publish.rst                | 13 +++++++++++++
 docs/tips.rst                   | 16 ++++++++++++++--
 pelican/contents.py             | 20 +++++++++++---------
 pelican/paginator.py            |  2 +-
 pelican/readers.py              |  4 ++--
 pelican/settings.py             | 25 +++++++++++++------------
 pelican/tests/test_contents.py  |  4 ++--
 pelican/tests/test_importer.py  |  9 ++++-----
 pelican/tests/test_pelican.py   | 28 ++++++++++++++--------------
 pelican/tests/test_settings.py  |  3 +++
 pelican/tests/test_utils.py     |  4 +++-
 pelican/tools/pelican_import.py |  3 ++-
 pelican/utils.py                | 22 +++++++++++++++++++---
 14 files changed, 104 insertions(+), 52 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 4de480ba..84bfcbe7 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -157,6 +157,9 @@ the other content will be placed after site generation).
 
 To link to internal content (files in the ``content`` directory), use the
 following syntax for the link target: ``{filename}path/to/file``
+Note: forward slashes, ``/``,
+are the required path separator in the ``{filename}`` directive
+on all operating systems, including Windows.
 
 For example, a Pelican project might be structured like this::
 
diff --git a/docs/publish.rst b/docs/publish.rst
index fea053bf..70d93e59 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -100,6 +100,18 @@ separately. Use the following command to install Fabric, prefixing with
 
     pip install Fabric
 
+.. note:: Installing PyCrypto on Windows
+
+    Fabric depends upon PyCrypto_, which is tricky to install
+    if your system doesn't have a C compiler.
+    For Windows users, before installing Fabric, use
+    ``easy_install http://www.voidspace.org.uk/downloads/pycrypto26/pycrypto-2.6.win32-py2.7.exe``
+    per this `StackOverflow suggestion <http://stackoverflow.com/a/11405769/6364>`_
+    You're more likely to have success
+    with the Win32 versions of Python 2.7 and PyCrypto,
+    than with the Win64—\
+    even if your operating system is a 64-bit version of Windows.
+
 Take a moment to open the ``fabfile.py`` file that was generated in your
 project root. You will see a number of commands, any one of which can be
 renamed, removed, and/or customized to your liking. Using the out-of-the-box
@@ -179,3 +191,4 @@ executables, such as ``python3``, you can set the ``PY`` and ``PELICAN``
 environment variables, respectively, to override the default executable names.)
 
 .. _Fabric: http://fabfile.org/
+.. _PyCrypto: http://pycrypto.org
diff --git a/docs/tips.rst b/docs/tips.rst
index eb400124..9db08900 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -36,9 +36,15 @@ already exist). The ``git push origin gh-pages`` command updates the remote
 ``gh-pages`` branch, effectively publishing the Pelican site.
 
 .. note::
+    The ``github`` target of the Makefile (and the ``gh_pages`` task of the Fabfile)
+    created by the ``pelican-quickstart`` command
+    publishes the Pelican site as Project Pages, as described above.
 
-    The ``github`` target of the Makefile created by the ``pelican-quickstart``
-    command publishes the Pelican site as Project Pages, as described above.
+.. note:: ghp-import on Windows
+
+    Until `ghp-import Pull Request #25 <https://github.com/davisp/ghp-import/pull/25>`_
+    is accepted, you will need to install a custom build of ghp-import:
+    ``pip install https://github.com/chevah/ghp-import/archive/win-support.zip``
 
 User Pages
 ----------
@@ -86,6 +92,12 @@ output directory. For example::
     STATIC_PATHS = ['images', 'extra/CNAME']
     EXTRA_PATH_METADATA = {'extra/CNAME': {'path': 'CNAME'},}
 
+Note: use forward slashes, ``/``, even on Windows.
+
+.. hint::
+    You can also use the ``EXTRA_PATH_METADATA`` mechanism
+    to place a ``favicon.ico`` or ``robots.txt`` at the root of any site.
+
 How to add YouTube or Vimeo Videos
 ==================================
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 69c01438..074c28be 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -17,7 +17,7 @@ from pelican import signals
 from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import (slugify, truncate_html_words, memoized, strftime,
                            python_2_unicode_compatible, deprecated_attribute,
-                           path_to_url, set_date_tzinfo, SafeDatetime)
+                           path_to_url, posixize_path, set_date_tzinfo, SafeDatetime)
 
 # Import these so that they're avalaible when you import from pelican.contents.
 from pelican.urlwrappers import (URLWrapper, Author, Category, Tag)  # NOQA
@@ -337,17 +337,19 @@ class Content(object):
         if source_path is None:
             return None
 
-        return os.path.relpath(
-            os.path.abspath(os.path.join(self.settings['PATH'], source_path)),
-            os.path.abspath(self.settings['PATH'])
-        )
+        return posixize_path(
+            os.path.relpath(
+                os.path.abspath(os.path.join(self.settings['PATH'], source_path)),
+                os.path.abspath(self.settings['PATH'])
+            ))
 
     @property
     def relative_dir(self):
-        return os.path.dirname(os.path.relpath(
-            os.path.abspath(self.source_path),
-            os.path.abspath(self.settings['PATH']))
-        )
+        return posixize_path(
+            os.path.dirname(
+                os.path.relpath(
+                    os.path.abspath(self.source_path),
+                    os.path.abspath(self.settings['PATH']))))
 
 
 class Page(Content):
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 3f5cce47..0189ec91 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -136,7 +136,7 @@ class Page(object):
 
         # URL or SAVE_AS is a string, format it with a controlled context
         context = {
-            'name': self.name,
+            'name': self.name.replace(os.sep, '/'),
             'object_list': self.object_list,
             'number': self.number,
             'paginator': self.paginator,
diff --git a/pelican/readers.py b/pelican/readers.py
index 85147e3e..4de28793 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -25,7 +25,7 @@ from six.moves.html_parser import HTMLParser
 
 from pelican import signals
 from pelican.contents import Page, Category, Tag, Author
-from pelican.utils import get_date, pelican_open, FileStampDataCacher, SafeDatetime
+from pelican.utils import get_date, pelican_open, FileStampDataCacher, SafeDatetime, posixize_path
 
 
 METADATA_PROCESSORS = {
@@ -424,7 +424,7 @@ class Readers(FileStampDataCacher):
         """Return a content object parsed with the given format."""
 
         path = os.path.abspath(os.path.join(base_path, path))
-        source_path = os.path.relpath(path, base_path)
+        source_path = posixize_path(os.path.relpath(path, base_path))
         logger.debug('Read file %s -> %s',
             source_path, content_class.__name__)
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 794733d7..6f9d8d8f 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -18,6 +18,7 @@ except ImportError:
     load_source = imp.load_source
 
 from os.path import isabs
+from pelican.utils import posix_join
 
 from pelican.log import LimitFilter
 
@@ -41,11 +42,11 @@ DEFAULT_CONFIG = {
     'STATIC_EXCLUDE_SOURCES': True,
     'THEME_STATIC_DIR': 'theme',
     'THEME_STATIC_PATHS': ['static', ],
-    'FEED_ALL_ATOM': os.path.join('feeds', 'all.atom.xml'),
-    'CATEGORY_FEED_ATOM': os.path.join('feeds', '%s.atom.xml'),
-    'AUTHOR_FEED_ATOM': os.path.join('feeds', '%s.atom.xml'),
-    'AUTHOR_FEED_RSS': os.path.join('feeds', '%s.rss.xml'),
-    'TRANSLATION_FEED_ATOM': os.path.join('feeds', 'all-%s.atom.xml'),
+    'FEED_ALL_ATOM': posix_join('feeds', 'all.atom.xml'),
+    'CATEGORY_FEED_ATOM': posix_join('feeds', '%s.atom.xml'),
+    'AUTHOR_FEED_ATOM': posix_join('feeds', '%s.atom.xml'),
+    'AUTHOR_FEED_RSS': posix_join('feeds', '%s.rss.xml'),
+    'TRANSLATION_FEED_ATOM': posix_join('feeds', 'all-%s.atom.xml'),
     'FEED_MAX_ITEMS': '',
     'SITEURL': '',
     'SITENAME': 'A Pelican Blog',
@@ -68,25 +69,25 @@ DEFAULT_CONFIG = {
     'ARTICLE_LANG_URL': '{slug}-{lang}.html',
     'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html',
     'DRAFT_URL': 'drafts/{slug}.html',
-    'DRAFT_SAVE_AS': os.path.join('drafts', '{slug}.html'),
+    'DRAFT_SAVE_AS': posix_join('drafts', '{slug}.html'),
     'DRAFT_LANG_URL': 'drafts/{slug}-{lang}.html',
-    'DRAFT_LANG_SAVE_AS': os.path.join('drafts', '{slug}-{lang}.html'),
+    'DRAFT_LANG_SAVE_AS': posix_join('drafts', '{slug}-{lang}.html'),
     'PAGE_URL': 'pages/{slug}.html',
-    'PAGE_SAVE_AS': os.path.join('pages', '{slug}.html'),
+    'PAGE_SAVE_AS': posix_join('pages', '{slug}.html'),
     'PAGE_ORDER_BY': 'basename',
     'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
-    'PAGE_LANG_SAVE_AS': os.path.join('pages', '{slug}-{lang}.html'),
+    'PAGE_LANG_SAVE_AS': posix_join('pages', '{slug}-{lang}.html'),
     'STATIC_URL': '{path}',
     'STATIC_SAVE_AS': '{path}',
     'PDF_GENERATOR': False,
     'PDF_STYLE_PATH': '',
     'PDF_STYLE': 'twelvepoint',
     'CATEGORY_URL': 'category/{slug}.html',
-    'CATEGORY_SAVE_AS': os.path.join('category', '{slug}.html'),
+    'CATEGORY_SAVE_AS': posix_join('category', '{slug}.html'),
     'TAG_URL': 'tag/{slug}.html',
-    'TAG_SAVE_AS': os.path.join('tag', '{slug}.html'),
+    'TAG_SAVE_AS': posix_join('tag', '{slug}.html'),
     'AUTHOR_URL': 'author/{slug}.html',
-    'AUTHOR_SAVE_AS': os.path.join('author', '{slug}.html'),
+    'AUTHOR_SAVE_AS': posix_join('author', '{slug}.html'),
     'PAGINATION_PATTERNS': [
         (0, '{name}{number}{extension}', '{name}{number}{extension}'),
     ],
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index de297985..4b692e29 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -10,7 +10,7 @@ from pelican.tests.support import unittest, get_settings
 
 from pelican.contents import Page, Article, Static, URLWrapper
 from pelican.settings import DEFAULT_CONFIG
-from pelican.utils import path_to_url, truncate_html_words, SafeDatetime
+from pelican.utils import path_to_url, truncate_html_words, SafeDatetime, posix_join
 from pelican.signals import content_object_init
 from jinja2.utils import generate_lorem_ipsum
 
@@ -417,7 +417,7 @@ class TestStatic(unittest.TestCase):
         self.context = self.settings.copy()
 
         self.static = Static(content=None, metadata={}, settings=self.settings,
-            source_path=os.path.join('dir', 'foo.jpg'), context=self.context)
+            source_path=posix_join('dir', 'foo.jpg'), context=self.context)
 
         self.context['filenames'] = {self.static.source_path: self.static}
 
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 65193bf5..8c6e3ae6 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -9,7 +9,7 @@ from pelican.tools.pelican_import import wp2fields, fields2pelican, decode_wp_co
 from pelican.tests.support import (unittest, temporary_folder, mute,
                                    skipIfNoExecutable)
 
-from pelican.utils import slugify
+from pelican.utils import slugify, path_to_file_url
 
 CUR_DIR = os.path.abspath(os.path.dirname(__file__))
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
@@ -293,12 +293,11 @@ class TestWordpressXMLAttachements(unittest.TestCase):
 
     def test_download_attachments(self):
         real_file = os.path.join(CUR_DIR, 'content/article.rst')
-        good_url = 'file://' + real_file
+        good_url = path_to_file_url(real_file)
         bad_url = 'http://localhost:1/not_a_file.txt'
         silent_da = mute()(download_attachments)
         with temporary_folder() as temp:
-            #locations = download_attachments(temp, [good_url, bad_url])
             locations = list(silent_da(temp, [good_url, bad_url]))
-            self.assertTrue(len(locations) == 1)
+            self.assertEqual(1, len(locations))
             directory = locations[0]
-            self.assertTrue(directory.endswith('content/article.rst'))
+            self.assertTrue(directory.endswith(os.path.join('content', 'article.rst')), directory)
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 190d5e06..62322355 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -58,22 +58,22 @@ class TestPelican(LoggedTestCase):
         locale.setlocale(locale.LC_ALL, self.old_locale)
         super(TestPelican, self).tearDown()
 
-    def assertFilesEqual(self, diff):
-        msg = ("some generated files differ from the expected functional "
-               "tests output.\n"
-               "This is probably because the HTML generated files "
-               "changed. If these changes are normal, please refer "
-               "to docs/contribute.rst to update the expected "
-               "output of the functional tests.")
-
-        self.assertEqual(diff['left_only'], [], msg=msg)
-        self.assertEqual(diff['right_only'], [], msg=msg)
-        self.assertEqual(diff['diff_files'], [], msg=msg)
-
     def assertDirsEqual(self, left_path, right_path):
         out, err = subprocess.Popen(
-            ['git', 'diff', '--no-ext-diff', '--exit-code', '-w', left_path, right_path], env={'PAGER': ''},
-            stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+            ['git', 'diff', '--no-ext-diff', '--exit-code', '-w', left_path, right_path],
+            env={b'PAGER': b''}, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        ).communicate()
+        def ignorable_git_crlf_errors(line):
+            # Work around for running tests on Windows
+            for msg in [
+                    "LF will be replaced by CRLF",
+                    "The file will have its original line endings"]:
+                if msg in line:
+                    return True
+            return False
+        if err:
+            err = '\n'.join([l for l in err.decode('utf8').splitlines()
+                             if not ignorable_git_crlf_errors(l)])
         assert not out, out
         assert not err, err
 
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 260eff05..2c5c1541 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals, print_function
 import copy
 import os
 import locale
+from sys import platform
 from os.path import dirname, abspath, join
 
 from pelican.settings import (read_settings, configure_settings,
@@ -107,6 +108,8 @@ class TestSettingsConfiguration(unittest.TestCase):
         # locale is not specified in the settings
 
         #reset locale to python default
+        if platform == 'win32':
+            return unittest.skip("Doesn't work on Windows")
         locale.setlocale(locale.LC_ALL, str('C'))
         self.assertEqual(self.settings['LOCALE'], DEFAULT_CONFIG['LOCALE'])
 
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 7c9e6e5a..18a0f4ca 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -301,7 +301,7 @@ class TestUtils(LoggedTestCase):
         old_locale = locale.setlocale(locale.LC_TIME)
 
         if platform == 'win32':
-            locale.setlocale(locale.LC_TIME, str('Turkish'))
+            return unittest.skip("Doesn't work on Windows")
         else:
             locale.setlocale(locale.LC_TIME, str('tr_TR.UTF-8'))
 
@@ -471,6 +471,8 @@ class TestDateFormatter(unittest.TestCase):
                          locale_available('French'),
                          'French locale needed')
     def test_french_strftime(self):
+        if platform == 'win32':
+            return unittest.skip("Doesn't work on Windows")
         # This test tries to reproduce an issue that occurred with python3.3 under macos10 only
         locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8'))
         date = utils.SafeDatetime(2014,8,14)
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index d0531c42..c7b16e92 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -588,7 +588,8 @@ def download_attachments(output_path, urls):
         filename = path.pop(-1)
         localpath = ''
         for item in path:
-            localpath = os.path.join(localpath, item)
+            if sys.platform != 'win32' or ':' not in item:
+                localpath = os.path.join(localpath, item)
         full_path = os.path.join(output_path, localpath)
         if not os.path.exists(full_path):
             os.makedirs(full_path)
diff --git a/pelican/utils.py b/pelican/utils.py
index f216b027..caac8e61 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -11,6 +11,7 @@ import os
 import pytz
 import re
 import shutil
+import sys
 import traceback
 import pickle
 import hashlib
@@ -23,6 +24,7 @@ from functools import partial
 from itertools import groupby
 from jinja2 import Markup
 from operator import attrgetter
+from posixpath import join as posix_join
 
 logger = logging.getLogger(__name__)
 
@@ -230,13 +232,15 @@ def get_date(string):
 
 
 @contextmanager
-def pelican_open(filename):
+def pelican_open(filename, mode='rb', strip_crs=(sys.platform == 'win32')):
     """Open a file and return its content"""
 
-    with codecs.open(filename, encoding='utf-8') as infile:
+    with codecs.open(filename, mode, encoding='utf-8') as infile:
         content = infile.read()
     if content[0] == codecs.BOM_UTF8.decode('utf8'):
         content = content[1:]
+    if strip_crs:
+        content = content.replace('\r\n', '\n')
     yield content
 
 
@@ -370,6 +374,13 @@ def path_to_url(path):
         return '/'.join(split_all(path))
 
 
+def posixize_path(rel_path):
+    """Use '/' as path separator, so that source references,
+    like '{filename}/foo/bar.jpg' or 'extras/favicon.ico',
+    will work on Windows as well as on Mac and Linux."""
+    return rel_path.replace(os.sep, '/')
+
+
 def truncate_html_words(s, num, end_text='...'):
     """Truncates HTML to a certain number of words.
 
@@ -750,4 +761,9 @@ def is_selected_for_writing(settings, path):
         return path in settings['WRITE_SELECTED']
     else:
         return True
-        
+
+
+def path_to_file_url(path):
+    '''Convert file-system path to file:// URL'''
+    return six.moves.urllib_parse.urljoin(
+        "file://", six.moves.urllib.request.pathname2url(path))

From f7a5d06c6d821e9ab70e5b1bc49f1de7b8899fed Mon Sep 17 00:00:00 2001
From: Louis Tiao <ltiao@users.noreply.github.com>
Date: Tue, 27 Jan 2015 18:42:34 +0800
Subject: [PATCH 1727/2864] Removed `PDF_GENERATOR=False`

It might give the impression that the PDF generation is still part of the core.
---
 samples/pelican.conf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index d6a87923..bb499464 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -11,7 +11,6 @@ RELATIVE_URLS = True
 
 GITHUB_URL = 'http://github.com/ametaireau/'
 DISQUS_SITENAME = "blog-notmyidea"
-PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
 LOCALE = "C"
 DEFAULT_PAGINATION = 4

From ca2a426a837ce55d844f7deae2196846cb00ef0b Mon Sep 17 00:00:00 2001
From: Louis Tiao <ltiao@users.noreply.github.com>
Date: Tue, 27 Jan 2015 18:45:10 +0800
Subject: [PATCH 1728/2864] Removed PDF Generation settings

Since PDF Generation is no longer a core feature, these settings are irrelevant. If the `pdf` plugin from pelican-plugins is used, it disregards the `PDF_GENERATOR` setting anyways.
---
 pelican/settings.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 794733d7..e924eedd 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -78,9 +78,6 @@ DEFAULT_CONFIG = {
     'PAGE_LANG_SAVE_AS': os.path.join('pages', '{slug}-{lang}.html'),
     'STATIC_URL': '{path}',
     'STATIC_SAVE_AS': '{path}',
-    'PDF_GENERATOR': False,
-    'PDF_STYLE_PATH': '',
-    'PDF_STYLE': 'twelvepoint',
     'CATEGORY_URL': 'category/{slug}.html',
     'CATEGORY_SAVE_AS': os.path.join('category', '{slug}.html'),
     'TAG_URL': 'tag/{slug}.html',

From 4e2e00b450fcdea256d1e2ecd6868fa7295de49f Mon Sep 17 00:00:00 2001
From: Annika Backstrom <annika@sixohthree.com>
Date: Sun, 1 Feb 2015 16:42:51 -0500
Subject: [PATCH 1729/2864] Docs: Note how posts are published when 'draft' is
 default

---
 docs/content.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/content.rst b/docs/content.rst
index 12bd887f..1ff8ff9c 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -505,6 +505,9 @@ publish an article before it is finished) include the status in the ``DEFAULT_ME
         'status': 'draft',
     }
 
+To publish a post when the default status is ``draft``, update the post's
+metadata to include ``Status: published``.
+
 .. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: http://www.methods.co.nz/asciidoc/
 .. _pelican-plugins: http://github.com/getpelican/pelican-plugins

From 77231e97c05a65cf2c2c408008b51b822cb679af Mon Sep 17 00:00:00 2001
From: Arul <me@arulraj.net>
Date: Sun, 1 Feb 2015 14:01:35 +0530
Subject: [PATCH 1730/2864] wordpress importer support for draft article

---
 pelican/tests/test_importer.py  |  4 ++--
 pelican/tools/pelican_import.py | 34 +++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 65193bf5..22a7cf7f 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -254,13 +254,13 @@ class TestBuildHeader(unittest.TestCase):
 
     def test_galleries_added_to_header(self):
         header = build_header('test', None, None, None, None,
-                None, ['output/test1', 'output/test2'])
+                None, attachments=['output/test1', 'output/test2'])
         self.assertEqual(header, 'test\n####\n' + ':attachments: output/test1, '
                 + 'output/test2\n\n')
 
     def test_galleries_added_to_markdown_header(self):
         header = build_markdown_header('test', None, None, None, None, None,
-            ['output/test1', 'output/test2'])
+            attachments=['output/test1', 'output/test2'])
         self.assertEqual(header, 'Title: test\n' + 'Attachments: output/test1, '
                 + 'output/test2\n\n')
 
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index d0531c42..5cbef7ae 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -126,7 +126,7 @@ def wp2fields(xml, wp_custpost=False):
     items = get_items(xml)
     for item in items:
 
-        if item.find('status').string == "publish":
+        if item.find('status').string in ["publish", "draft"]:
 
             try:
                 # Use HTMLParser due to issues with BeautifulSoup 3
@@ -149,6 +149,8 @@ def wp2fields(xml, wp_custpost=False):
             # caturl = [cat['nicename'] for cat in item.find(domain='category')]
 
             tags = [tag.string for tag in item.findAll('category', {'domain' : 'post_tag'})]
+            # To publish a post the status should be 'published'
+            status = 'published' if item.find('status').string == "publish" else item.find('status').string
 
             kind = 'article'
             post_type = item.find('post_type').string
@@ -165,7 +167,7 @@ def wp2fields(xml, wp_custpost=False):
                     pass
                 else:
                     kind = post_type
-            yield (title, content, filename, date, author, categories, tags,
+            yield (title, content, filename, date, author, categories, tags, status,
                    kind, "wp-html")
 
 def dc2fields(file):
@@ -296,9 +298,10 @@ def dc2fields(file):
             post_format = "html"
 
         kind = 'article'  # TODO: Recognise pages
+        status = 'published'  # TODO: Find a way for draft posts
 
         yield (post_title, content, slugify(post_title), post_creadt, author,
-               categories, tags, kind, post_format)
+               categories, tags, status, kind, post_format)
 
 
 def posterous2fields(api_token, email, password):
@@ -347,9 +350,10 @@ def posterous2fields(api_token, email, password):
             date_object -= delta
             date = date_object.strftime("%Y-%m-%d %H:%M")
             kind = 'article'  # TODO: Recognise pages
+            status = 'published'  # TODO: Find a way for draft posts
 
             yield (post.get('title'), post.get('body_cleaned'), slug, date,
-                post.get('user').get('display_name'), [], tags, kind, "html")
+                post.get('user').get('display_name'), [], tags, status, kind, "html")
 
 
 def tumblr2fields(api_key, blogname):
@@ -426,8 +430,10 @@ def tumblr2fields(api_key, blogname):
 
             content = content.rstrip() + '\n'
             kind = 'article'
+            status = 'published'  # TODO: Find a way for draft posts
+
             yield (title, content, slug, date, post.get('blog_name'), [type],
-                   tags, kind, format)
+                   tags, status, kind, format)
 
         offset += len(posts)
         posts = get_tumblr_posts(api_key, blogname, offset)
@@ -444,10 +450,10 @@ def feed2fields(file):
 
         slug = slugify(entry.title)
         kind = 'article'
-        yield (entry.title, entry.description, slug, date, author, [], tags,
+        yield (entry.title, entry.description, slug, date, author, [], tags, None,
                kind, "html")
 
-def build_header(title, date, author, categories, tags, slug, attachments=None):
+def build_header(title, date, author, categories, tags, slug, status=None, attachments=None):
     from docutils.utils import column_width
 
     """Build a header from a list of fields"""
@@ -462,13 +468,15 @@ def build_header(title, date, author, categories, tags, slug, attachments=None):
         header += ':tags: %s\n' % ', '.join(tags)
     if slug:
         header += ':slug: %s\n' % slug
+    if status:
+        header += ':status: %s\n' % status
     if attachments:
         header += ':attachments: %s\n' % ', '.join(attachments)
     header += '\n'
     return header
 
-def build_markdown_header(title, date, author, categories, tags, slug,
-        attachments=None):
+def build_markdown_header(title, date, author, categories, tags, slug, status=None,
+    attachments=None):
     """Build a header from a list of fields"""
     header = 'Title: %s\n' % title
     if date:
@@ -481,6 +489,8 @@ def build_markdown_header(title, date, author, categories, tags, slug,
         header += 'Tags: %s\n' % ', '.join(tags)
     if slug:
         header += 'Slug: %s\n' % slug
+    if status:
+        header += 'Status: %s\n' % status
     if attachments:
         header += 'Attachments: %s\n' % ', '.join(attachments)
     header += '\n'
@@ -606,7 +616,7 @@ def fields2pelican(fields, out_markup, output_path,
         dircat=False, strip_raw=False, disable_slugs=False,
         dirpage=False, filename_template=None, filter_author=None,
         wp_custpost=False, wp_attach=False, attachments=None):
-    for (title, content, filename, date, author, categories, tags,
+    for (title, content, filename, date, author, categories, tags, status,
             kind, in_markup) in fields:
         if filter_author and filter_author != author:
             continue
@@ -624,11 +634,11 @@ def fields2pelican(fields, out_markup, output_path,
         ext = get_ext(out_markup, in_markup)
         if ext == '.md':
             header = build_markdown_header(title, date, author, categories,
-                    tags, slug, attached_files)
+                    tags, slug, status, attached_files)
         else:
             out_markup = "rst"
             header = build_header(title, date, author, categories,
-                    tags, slug, attached_files)
+                    tags, slug, status, attached_files)
 
         out_filename = get_out_filename(output_path, filename, ext,
                 kind, dirpage, dircat, categories, wp_custpost)

From f56b699d5b0551c686b1c6aa2df1d59364068306 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 6 Feb 2015 14:30:02 -0800
Subject: [PATCH 1731/2864] Fix quotes in faq

---
 docs/faq.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index c749c262..86f12462 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -144,8 +144,8 @@ your home page. The following Markdown example could be stored in
     Thank you for visiting. Welcome!
 
 If the original blog index is still wanted, it can then be saved in a
-different location by setting ``INDEX_SAVE_AS = 'blog_index.html`` for
-the ``''index'`` direct template.
+different location by setting ``INDEX_SAVE_AS = 'blog_index.html'`` for
+the ``'index'`` direct template.
 
 What if I want to disable feed generation?
 ==========================================

From 265f68a879b7d2b1cc5d611f7998ace07ee4d608 Mon Sep 17 00:00:00 2001
From: Kernc <kerncece@gmail.com>
Date: Tue, 3 Feb 2015 04:06:22 +0100
Subject: [PATCH 1732/2864] Add signal: all_generators_finalized
 (getpelican/pelican-plugins#314)

Some plugins have used `content_object_init` signal and read `summary`
or `content` properties of the content object. This resulted in
internal (`{filename}`) links being unresolved. When used, this signal
should hopefully mitigate that.

See also:
* https://github.com/getpelican/pelican-plugins/issues/314
* https://github.com/getpelican/pelican-plugins/pull/410
---
 docs/plugins.rst    | 12 ++++++++++++
 pelican/__init__.py |  2 ++
 pelican/signals.py  |  1 +
 3 files changed, 15 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 15fcf109..5135e315 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -85,6 +85,7 @@ finalized                           pelican object                 invoked after
                                                                    - minifying js/css assets.
                                                                    - notify/ping search engines with an updated sitemap.
 generator_init                      generator                      invoked in the Generator.__init__
+all_generators_finalized            generators                     invoked after all the generators are executed and before writing output
 readers_init                        readers                        invoked in the Readers.__init__
 article_generator_context           article_generator, metadata
 article_generator_preread           article_generator              invoked before a article is read in ArticlesGenerator.generate_context;
@@ -138,6 +139,15 @@ request if you need them!
        def register():
                signals.content_object_init.connect(test, sender=contents.Article)
 
+.. warning::
+
+   Avoid ``content_object_init`` signal if you intend to read ``summary``
+   or ``content`` properties of the content object. That combination can
+   result in unresolved links when :ref:`ref-linking-to-internal-content`
+   (see `pelican-plugins bug #314`_). Use ``_summary`` and ``_content``
+   properties instead, or, alternatively, run your plugin at a later
+   stage (e.g. ``all_generators_finalized``).
+
 .. note::
 
    After Pelican 3.2, signal names were standardized.  Older plugins
@@ -222,3 +232,5 @@ Adding a new generator is also really easy. You might want to have a look at
         return MyGenerator
 
     signals.get_generators.connect(get_generators)
+
+.. _pelican-plugins bug #314: https://github.com/getpelican/pelican-plugins/issues/314
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 53025e71..3039d35c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -168,6 +168,8 @@ class Pelican(object):
             if hasattr(p, 'generate_context'):
                 p.generate_context()
 
+        signals.all_generators_finalized.send(generators)
+
         writer = self.get_writer()
 
         for p in generators:
diff --git a/pelican/signals.py b/pelican/signals.py
index f858c249..a4d99688 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -6,6 +6,7 @@ from blinker import signal
 
 initialized = signal('pelican_initialized')
 get_generators = signal('get_generators')
+all_generators_finalized = signal('all_generators_finalized')
 get_writer = signal('get_writer')
 finalized = signal('pelican_finalized')
 

From 8218923625160c20416e92e256e52b3560b3929b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 9 Feb 2015 08:22:30 -0800
Subject: [PATCH 1733/2864] Add pandoc package to Travis CI configuration

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 54dcf0ea..a052252b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ python:
     - "2.7"
     - "3.3"
     - "3.4"
+addons:
+  apt_packages:
+    - pandoc
 before_install:
  - sudo apt-get update -qq
  - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8

From 954c85a59343213195e537262d68009d649e8e70 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Mon, 9 Feb 2015 17:11:45 -0800
Subject: [PATCH 1734/2864] Make PagesGenerator status check case-insensitive

Fixes #1620.
---
 pelican/generators.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 5122fa6d..97e453b4 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -641,9 +641,9 @@ class PagesGenerator(CachingGenerator):
 
             self.add_source_path(page)
 
-            if page.status == "published":
+            if page.status.lower() == "published":
                 all_pages.append(page)
-            elif page.status == "hidden":
+            elif page.status.lower() == "hidden":
                 hidden_pages.append(page)
             else:
                 logger.error("Unknown status '%s' for file %s, skipping it.",

From 7fc6aab99a011489b181e526872fb75ea98c2c06 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 10 Feb 2015 20:59:57 -0500
Subject: [PATCH 1735/2864] Fix for tests that were broken in #1607

---
 pelican/tests/test_importer.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 22a7cf7f..04bfbbd4 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -5,6 +5,7 @@ import os
 import re
 
 import locale
+from codecs import open
 from pelican.tools.pelican_import import wp2fields, fields2pelican, decode_wp_content, build_header, build_markdown_header, get_attachments, download_attachments
 from pelican.tests.support import (unittest, temporary_folder, mute,
                                    skipIfNoExecutable)
@@ -41,7 +42,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
     def test_ignore_empty_posts(self):
         self.assertTrue(self.posts)
-        for title, content, fname, date, author, categ, tags, kind, format in self.posts:
+        for title, content, fname, date, author, categ, tags, status, kind, format in self.posts:
             self.assertTrue(title.strip())
 
     def test_recognise_page_kind(self):
@@ -49,7 +50,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
         self.assertTrue(self.posts)
         # Collect (title, filename, kind) of non-empty posts recognised as page
         pages_data = []
-        for title, content, fname, date, author, categ, tags, kind, format in self.posts:
+        for title, content, fname, date, author, categ, tags, status, kind, format in self.posts:
             if kind == 'page':
                 pages_data.append((title, fname))
         self.assertEqual(2, len(pages_data))
@@ -85,7 +86,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
     def test_unless_custom_post_all_items_should_be_pages_or_posts(self):
         self.assertTrue(self.posts)
         pages_data = []
-        for title, content, fname, date, author, categ, tags, kind, format in self.posts:
+        for title, content, fname, date, author, categ, tags, status, kind, format in self.posts:
             if kind == 'page' or kind == 'article':
                 pass
             else:
@@ -95,7 +96,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
     def test_recognise_custom_post_type(self):
         self.assertTrue(self.custposts)
         cust_data = []
-        for title, content, fname, date, author, categ, tags, kind, format in self.custposts:
+        for title, content, fname, date, author, categ, tags, status, kind, format in self.custposts:
             if kind == 'article' or kind == 'page':
                 pass
             else:
@@ -110,7 +111,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
         test_posts = []
         for post in self.custposts:
             # check post kind
-            if post[7] == 'article' or post[7] == 'page':
+            if post[8] == 'article' or post[8] == 'page':
                 pass
             else:
                 test_posts.append(post)
@@ -119,7 +120,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
         index = 0
         for post in test_posts:
             name = post[2]
-            kind = post[7]
+            kind = post[8]
             name += '.md'
             filename = os.path.join(kind, name)
             out_name = fnames[index]
@@ -131,7 +132,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
         test_posts = []
         for post in self.custposts:
             # check post kind
-            if post[7] == 'article' or post[7] == 'page':
+            if post[8] == 'article' or post[8] == 'page':
                 pass
             else:
                 test_posts.append(post)
@@ -141,7 +142,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
         index = 0
         for post in test_posts:
             name = post[2]
-            kind = post[7]
+            kind = post[8]
             category = slugify(post[5][0])
             name += '.md'
             filename = os.path.join(kind, category, name)
@@ -155,7 +156,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
         test_posts = []
         for post in self.custposts:
             # check post kind
-            if post[7] == 'page':
+            if post[8] == 'page':
                 test_posts.append(post)
         with temporary_folder() as temp:
             fnames = list(silent_f2p(test_posts, 'markdown', temp,
@@ -171,7 +172,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
     def test_can_toggle_raw_html_code_parsing(self):
         def r(f):
-            with open(f) as infile:
+            with open(f, encoding='utf-8') as infile:
                 return infile.read()
         silent_f2p = mute(True)(fields2pelican)
 
@@ -213,7 +214,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
     def test_preserve_verbatim_formatting(self):
         def r(f):
-            with open(f) as infile:
+            with open(f, encoding='utf-8') as infile:
                 return infile.read()
         silent_f2p = mute(True)(fields2pelican)
         test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)
@@ -228,7 +229,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
     def test_code_in_list(self):
         def r(f):
-            with open(f) as infile:
+            with open(f, encoding='utf-8') as infile:
                 return infile.read()
         silent_f2p = mute(True)(fields2pelican)
         test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)

From 0949fa62ec5b8d0b9c59037cf93df733b062575e Mon Sep 17 00:00:00 2001
From: John Mastro <john.b.mastro@gmail.com>
Date: Thu, 12 Feb 2015 16:24:59 -0800
Subject: [PATCH 1736/2864] Tell smartypants to also process &quot; entities

This is necessary because Docutils has already replaced double quotes
with &quot; HTML entities by the time the typogrify filter is applied.
---
 pelican/readers.py            | 7 +++++++
 pelican/tests/test_readers.py | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 85147e3e..1fe9a148 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -467,6 +467,13 @@ class Readers(FileStampDataCacher):
         # eventually filter the content with typogrify if asked so
         if self.settings['TYPOGRIFY']:
             from typogrify.filters import typogrify
+            import smartypants
+
+            # Tell `smartypants` to also replace &quot; HTML entities with
+            # smart quotes. This is necessary because Docutils has already
+            # replaced double quotes with said entities by the time we run
+            # this filter.
+            smartypants.Attr.default |= smartypants.Attr.w
 
             def typogrify_wrapper(text):
                 """Ensures ignore_tags feature is backward compatible"""
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index ffff3478..cb657673 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -121,7 +121,7 @@ class RstReaderTest(ReaderTest):
             page = self.read_file(path='article.rst', TYPOGRIFY=True)
             expected = (
                 '<p><span class="caps">THIS</span> is some content. '
-                'With some stuff to&nbsp;&quot;typogrify&quot;&#8230;</p>\n'
+                'With some stuff to&nbsp;&#8220;typogrify&#8221;&#8230;</p>\n'
                 '<p>Now with added support for <abbr title="three letter '
                 'acronym"><span class="caps">TLA</span></abbr>.</p>\n')
 
@@ -146,8 +146,8 @@ class RstReaderTest(ReaderTest):
                                   TYPOGRIFY=True)
             expected = ('<p class="first last">Multi-line metadata should be'
                         ' supported\nas well as <strong>inline'
-                        ' markup</strong> and stuff to&nbsp;&quot;typogrify'
-                        '&quot;&#8230;</p>\n')
+                        ' markup</strong> and stuff to&nbsp;&#8220;typogrify'
+                        '&#8221;&#8230;</p>\n')
 
             self.assertEqual(page.metadata['summary'], expected)
         except ImportError:

From fa269d7c6f14ddd63cb8efecb5f15676b432fdbe Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 17 Feb 2015 20:18:12 -0500
Subject: [PATCH 1737/2864] Fix tests that were skipped in #1581

---
 pelican/tests/test_pelican.py  |  2 +-
 pelican/tests/test_settings.py |  3 +--
 pelican/tests/test_utils.py    | 37 +++++++++++++++++++++-------------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 62322355..29378062 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -61,7 +61,7 @@ class TestPelican(LoggedTestCase):
     def assertDirsEqual(self, left_path, right_path):
         out, err = subprocess.Popen(
             ['git', 'diff', '--no-ext-diff', '--exit-code', '-w', left_path, right_path],
-            env={b'PAGER': b''}, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+            env={str('PAGER'): str('')}, stdout=subprocess.PIPE, stderr=subprocess.PIPE
         ).communicate()
         def ignorable_git_crlf_errors(line):
             # Work around for running tests on Windows
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 2c5c1541..9b961386 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -103,13 +103,12 @@ class TestSettingsConfiguration(unittest.TestCase):
         configure_settings(settings)
         self.assertEqual(settings['FEED_DOMAIN'], 'http://feeds.example.com')
 
+    @unittest.skipIf(platform == 'win32', "Doesn't work on Windows")
     def test_default_encoding(self):
         # test that the default locale is set if
         # locale is not specified in the settings
 
         #reset locale to python default
-        if platform == 'win32':
-            return unittest.skip("Doesn't work on Windows")
         locale.setlocale(locale.LC_ALL, str('C'))
         self.assertEqual(self.settings['LOCALE'], DEFAULT_CONFIG['LOCALE'])
 
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 18a0f4ca..f793da13 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -298,12 +298,12 @@ class TestUtils(LoggedTestCase):
                          'Turkish locale needed')
     def test_strftime_locale_dependent_turkish(self):
         # store current locale
-        old_locale = locale.setlocale(locale.LC_TIME)
+        old_locale = locale.setlocale(locale.LC_ALL)
 
         if platform == 'win32':
-            return unittest.skip("Doesn't work on Windows")
+            locale.setlocale(locale.LC_ALL, str('Turkish'))
         else:
-            locale.setlocale(locale.LC_TIME, str('tr_TR.UTF-8'))
+            locale.setlocale(locale.LC_ALL, str('tr_TR.UTF-8'))
 
         d = utils.SafeDatetime(2012, 8, 29)
 
@@ -321,7 +321,7 @@ class TestUtils(LoggedTestCase):
             '2012 yılında %üretim artışı')
 
         # restore locale back
-        locale.setlocale(locale.LC_TIME, old_locale)
+        locale.setlocale(locale.LC_ALL, old_locale)
 
 
     # test the output of utils.strftime in a different locale
@@ -331,12 +331,12 @@ class TestUtils(LoggedTestCase):
                          'French locale needed')
     def test_strftime_locale_dependent_french(self):
         # store current locale
-        old_locale = locale.setlocale(locale.LC_TIME)
+        old_locale = locale.setlocale(locale.LC_ALL)
 
         if platform == 'win32':
-            locale.setlocale(locale.LC_TIME, str('French'))
+            locale.setlocale(locale.LC_ALL, str('French'))
         else:
-            locale.setlocale(locale.LC_TIME, str('fr_FR.UTF-8'))
+            locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8'))
 
         d = utils.SafeDatetime(2012, 8, 29)
 
@@ -355,7 +355,7 @@ class TestUtils(LoggedTestCase):
             '%écrits en 2012')
 
         # restore locale back
-        locale.setlocale(locale.LC_TIME, old_locale)
+        locale.setlocale(locale.LC_ALL, old_locale)
 
 
 class TestCopy(unittest.TestCase):
@@ -471,10 +471,11 @@ class TestDateFormatter(unittest.TestCase):
                          locale_available('French'),
                          'French locale needed')
     def test_french_strftime(self):
-        if platform == 'win32':
-            return unittest.skip("Doesn't work on Windows")
         # This test tries to reproduce an issue that occurred with python3.3 under macos10 only
-        locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8'))
+        if platform == 'win32':
+            locale.setlocale(locale.LC_ALL, str('French'))
+        else:
+            locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8'))
         date = utils.SafeDatetime(2014,8,14)
         # we compare the lower() dates since macos10 returns "Jeudi" for %A whereas linux reports "jeudi"
         self.assertEqual( u'jeudi, 14 août 2014', utils.strftime(date, date_format="%A, %d %B %Y").lower() )
@@ -492,9 +493,13 @@ class TestDateFormatter(unittest.TestCase):
                          locale_available('French'),
                          'French locale needed')
     def test_french_locale(self):
+        if platform == 'win32':
+            locale_string = 'French'
+        else:
+            locale_string = 'fr_FR.UTF-8'
         settings = read_settings(
-            override={'LOCALE': locale.normalize('fr_FR.UTF-8'),
-                      'TEMPLATE_PAGES': {'template/source.html':
+            override = {'LOCALE': locale_string,
+                        'TEMPLATE_PAGES': {'template/source.html':
                                          'generated/file.html'}})
 
         generator = TemplatePagesGenerator(
@@ -521,8 +526,12 @@ class TestDateFormatter(unittest.TestCase):
                          locale_available('Turkish'),
                          'Turkish locale needed')
     def test_turkish_locale(self):
+        if platform == 'win32':
+            locale_string = 'Turkish'
+        else:
+            locale_string = 'tr_TR.UTF-8'
         settings = read_settings(
-            override = {'LOCALE': locale.normalize('tr_TR.UTF-8'),
+            override = {'LOCALE': locale_string,
                         'TEMPLATE_PAGES': {'template/source.html':
                                            'generated/file.html'}})
 

From 95860c6b1bcf359005b6f7c08749214950f57a4f Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Mon, 3 Nov 2014 20:30:54 -0800
Subject: [PATCH 1738/2864] Remove unused modules/variables from tests

---
 pelican/tests/test_generators.py | 1 -
 pelican/tests/test_paginator.py  | 1 -
 pelican/tests/test_pelican.py    | 2 --
 pelican/tests/test_utils.py      | 2 +-
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index c3e36bc1..cdc98dfd 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -7,7 +7,6 @@ try:
     from unittest.mock import MagicMock
 except ImportError:
     from mock import MagicMock
-from operator import itemgetter
 from shutil import rmtree
 from tempfile import mkdtemp
 
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 108dc791..5494fda8 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, absolute_import
-import six
 import locale
 
 from pelican.tests.support import unittest, get_settings
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 29378062..c6332487 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -123,8 +123,6 @@ class TestPelican(LoggedTestCase):
                          locale_available('French'), 'French locale needed')
     def test_custom_locale_generation_works(self):
         '''Test that generation with fr_FR.UTF-8 locale works'''
-        old_locale = locale.setlocale(locale.LC_TIME)
-
         if sys.platform == 'win32':
             our_locale = str('French')
         else:
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index f793da13..c6550459 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -5,7 +5,7 @@ import shutil
 import os
 import time
 import locale
-from sys import platform, version_info
+from sys import platform
 from tempfile import mkdtemp
 
 import pytz

From 6549f51591ddac1d1ee1ccbed65817d468767448 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Mon, 3 Nov 2014 21:00:09 -0800
Subject: [PATCH 1739/2864] Add tests for Pelican and pelican_import tool

Added tests to ensure that:
- THEME and deprecated *_DIR settings result in the expected configurations
- Post headers are formatted correctly in both Markdown and reStructuredText
- Files specified in IGNORE_FILES setting are properly ignored
- Generator.get_files()'s `paths` argument is backwards-compatible with strings
---
 pelican/tests/test_generators.py | 20 +++++++++++++++
 pelican/tests/test_importer.py   | 36 +++++++++++++++++++++++++++
 pelican/tests/test_settings.py   | 42 ++++++++++++++++++++++++++------
 3 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index cdc98dfd..9f38c002 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -34,12 +34,17 @@ class TestGenerator(unittest.TestCase):
 
 
     def test_include_path(self):
+        self.settings['IGNORE_FILES'] = {'ignored1.rst', 'ignored2.rst'}
+
         filename = os.path.join(CUR_DIR, 'content', 'article.rst')
         include_path = self.generator._include_path
         self.assertTrue(include_path(filename))
         self.assertTrue(include_path(filename, extensions=('rst',)))
         self.assertFalse(include_path(filename, extensions=('md',)))
 
+        ignored_file = os.path.join(CUR_DIR, 'content', 'ignored1.rst')
+        self.assertFalse(include_path(ignored_file))
+
     def test_get_files_exclude(self):
         """Test that Generator.get_files() properly excludes directories.
         """
@@ -55,6 +60,13 @@ class TestGenerator(unittest.TestCase):
         self.assertFalse(expected_files - found_files,
             "get_files() failed to find one or more files")
 
+        # Test string as `paths` argument rather than list
+        filepaths = generator.get_files(paths='maindir')
+        found_files = {os.path.basename(f) for f in filepaths}
+        expected_files = {'maindir.md', 'subdir.md'}
+        self.assertFalse(expected_files - found_files,
+            "get_files() failed to find one or more files")
+
         filepaths = generator.get_files(paths=[''], exclude=['maindir'])
         found_files = {os.path.basename(f) for f in filepaths}
         self.assertNotIn('maindir.md', found_files,
@@ -317,6 +329,14 @@ class TestArticlesGenerator(unittest.TestCase):
                                  settings,
                                  blog=True, dates=dates)
 
+    def test_nonexistent_template(self):
+        """Attempt to load a non-existent template"""
+        settings = get_settings(filenames={})
+        generator = ArticlesGenerator(
+            context=settings, settings=settings,
+            path=None, theme=settings['THEME'], output_path=None)
+        self.assertRaises(Exception, generator.get_template, "not_a_template")
+
     def test_generate_authors(self):
         """Check authors generation."""
         authors = [author.name for author, _ in self.generator.authors]
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index df2ad6cd..c108bc52 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -245,6 +245,41 @@ class TestBuildHeader(unittest.TestCase):
         header = build_header('test', None, None, None, None, None)
         self.assertEqual(header, 'test\n####\n\n')
 
+    def test_build_header_with_fields(self):
+        header_data = [
+            'Test Post',
+            '2014-11-04',
+            'Alexis Métaireau',
+            ['Programming'],
+            ['Pelican', 'Python'],
+            'test-post',
+        ]
+
+        expected_docutils = '\n'.join([
+            'Test Post',
+            '#########',
+            ':date: 2014-11-04',
+            ':author: Alexis Métaireau',
+            ':category: Programming',
+            ':tags: Pelican, Python',
+            ':slug: test-post',
+            '\n',
+        ])
+
+        expected_md = '\n'.join([
+            'Title: Test Post',
+            'Date: 2014-11-04',
+            'Author: Alexis Métaireau',
+            'Category: Programming',
+            'Tags: Pelican, Python',
+            'Slug: test-post',
+            '\n',
+        ])
+
+        self.assertEqual(build_header(*header_data), expected_docutils)
+        self.assertEqual(build_markdown_header(*header_data), expected_md)
+
+
     def test_build_header_with_east_asian_characters(self):
         header = build_header('これは広い幅の文字だけで構成されたタイトルです',
                 None, None, None, None, None)
@@ -265,6 +300,7 @@ class TestBuildHeader(unittest.TestCase):
         self.assertEqual(header, 'Title: test\n' + 'Attachments: output/test1, '
                 + 'output/test2\n\n')
 
+
 @unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
 class TestWordpressXMLAttachements(unittest.TestCase):
     def setUp(self):
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 9b961386..db9fee7b 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -41,7 +41,7 @@ class TestSettingsConfiguration(unittest.TestCase):
         self.assertNotIn('foobar', self.settings)
 
     def test_read_empty_settings(self):
-        # Providing no file should return the default values.
+        # Ensure an empty settings file results in default settings.
         settings = read_settings(None)
         expected = copy.deepcopy(DEFAULT_CONFIG)
         # Added by configure settings
@@ -67,8 +67,8 @@ class TestSettingsConfiguration(unittest.TestCase):
         settings['SITENAME'] = 'Not a Pelican Blog'
         self.assertNotEqual(settings['SITENAME'], DEFAULT_CONFIG['SITENAME'])
 
-    def test_path_settings_safety(self):
-        """Don't let people setting the static path listings to strs"""
+    def test_static_path_settings_safety(self):
+        # Disallow static paths from being strings
         settings = {'STATIC_PATHS': 'foo/bar',
                 'THEME_STATIC_PATHS': 'bar/baz',
                 # These 4 settings are required to run configure_settings
@@ -84,8 +84,7 @@ class TestSettingsConfiguration(unittest.TestCase):
                 DEFAULT_CONFIG['THEME_STATIC_PATHS'])
 
     def test_configure_settings(self):
-        #Manipulations to settings should be applied correctly.
-
+        # Manipulations to settings should be applied correctly.
         settings = {
                 'SITEURL': 'http://blog.notmyidea.org/',
                 'LOCALE': '',
@@ -93,6 +92,7 @@ class TestSettingsConfiguration(unittest.TestCase):
                 'THEME': DEFAULT_THEME,
                 }
         configure_settings(settings)
+
         # SITEURL should not have a trailing slash
         self.assertEqual(settings['SITEURL'], 'http://blog.notmyidea.org')
 
@@ -103,12 +103,38 @@ class TestSettingsConfiguration(unittest.TestCase):
         configure_settings(settings)
         self.assertEqual(settings['FEED_DOMAIN'], 'http://feeds.example.com')
 
+    def test_theme_settings_exceptions(self):
+        settings = self.settings
+
+        # Check that theme lookup in "pelican/themes" functions as expected
+        settings['THEME'] = os.path.split(settings['THEME'])[1]
+        configure_settings(settings)
+        self.assertEqual(settings['THEME'], DEFAULT_THEME)
+
+        # Check that non-existent theme raises exception
+        settings['THEME'] = 'foo'
+        self.assertRaises(Exception, configure_settings, settings)
+
+    def test_deprecated_dir_setting(self):
+        settings = self.settings
+
+        settings['ARTICLE_DIR'] = 'foo'
+        settings['PAGE_DIR'] = 'bar'
+
+        configure_settings(settings)
+
+        self.assertEqual(settings['ARTICLE_PATHS'], ['foo'])
+        self.assertEqual(settings['PAGE_PATHS'], ['bar'])
+
+        with self.assertRaises(KeyError):
+            settings['ARTICLE_DIR']
+            settings['PAGE_DIR']
+
     @unittest.skipIf(platform == 'win32', "Doesn't work on Windows")
     def test_default_encoding(self):
-        # test that the default locale is set if
-        # locale is not specified in the settings
+        # Test that the default locale is set if not specified in settings
 
-        #reset locale to python default
+        # Reset locale to Python's default locale
         locale.setlocale(locale.LC_ALL, str('C'))
         self.assertEqual(self.settings['LOCALE'], DEFAULT_CONFIG['LOCALE'])
 

From d4ba7b729197cfd71ea2fc7137a13481b9bd3839 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 18 Feb 2015 09:41:27 -0800
Subject: [PATCH 1740/2864] Correct Dotclear sample file link in importer docs

Fixes #1570
---
 docs/importer.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index aa3fa935..83f4e112 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -112,4 +112,4 @@ Tests
 To test the module, one can use sample files:
 
 - for WordPress: http://wpcandy.com/made/the-sample-post-collection
-- for Dotclear: http://themes.dotaddict.org/files/public/downloads/lorem-backup.txt
+- for Dotclear: http://media.dotaddict.org/tda/downloads/lorem-backup.txt

From 784d07e9402ebc735c7c7baddaf0dd57cc279505 Mon Sep 17 00:00:00 2001
From: Forest <web11.forest@tibit.com>
Date: Thu, 19 Feb 2015 12:19:49 -0800
Subject: [PATCH 1741/2864] ArticlesGenerator: set blog=True consistently.

Fixes #1631.
---
 pelican/generators.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 97e453b4..f0a6d264 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -350,7 +350,8 @@ class ArticlesGenerator(CachingGenerator):
             signals.article_generator_write_article.send(self, content=article)
             write(article.save_as, self.get_template(article.template),
                   self.context, article=article, category=article.category,
-                  override_output=hasattr(article, 'override_save_as'))
+                  override_output=hasattr(article, 'override_save_as'),
+                  blog=True)
 
     def generate_period_archives(self, write):
         """Generate per-year, per-month, and per-day archives."""
@@ -432,7 +433,7 @@ class ArticlesGenerator(CachingGenerator):
             dates = [article for article in self.dates if article in articles]
             write(tag.save_as, tag_template, self.context, tag=tag,
                   articles=articles, dates=dates,
-                  paginated={'articles': articles, 'dates': dates},
+                  paginated={'articles': articles, 'dates': dates}, blog=True,
                   page_name=tag.page_name, all_articles=self.articles)
 
     def generate_categories(self, write):
@@ -443,7 +444,7 @@ class ArticlesGenerator(CachingGenerator):
             dates = [article for article in self.dates if article in articles]
             write(cat.save_as, category_template, self.context,
                   category=cat, articles=articles, dates=dates,
-                  paginated={'articles': articles, 'dates': dates},
+                  paginated={'articles': articles, 'dates': dates}, blog=True,
                   page_name=cat.page_name, all_articles=self.articles)
 
     def generate_authors(self, write):
@@ -454,7 +455,7 @@ class ArticlesGenerator(CachingGenerator):
             dates = [article for article in self.dates if article in articles]
             write(aut.save_as, author_template, self.context,
                   author=aut, articles=articles, dates=dates,
-                  paginated={'articles': articles, 'dates': dates},
+                  paginated={'articles': articles, 'dates': dates}, blog=True,
                   page_name=aut.page_name, all_articles=self.articles)
 
     def generate_drafts(self, write):
@@ -463,7 +464,7 @@ class ArticlesGenerator(CachingGenerator):
             write(draft.save_as, self.get_template(draft.template),
                 self.context, article=draft, category=draft.category,
                 override_output=hasattr(draft, 'override_save_as'),
-                all_articles=self.articles)
+                blog=True, all_articles=self.articles)
 
     def generate_pages(self, writer):
         """Generate the pages on the disk"""

From bc3a0e8c592e70db432ee987e9b42f069aee6ba8 Mon Sep 17 00:00:00 2001
From: SkyLothar <allothar@gmail.com>
Date: Sun, 22 Feb 2015 16:27:18 +0800
Subject: [PATCH 1742/2864] remove useless if condition in index template

---
 pelican/themes/notmyidea/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index c8982476..3eac8a3a 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -23,7 +23,7 @@
             {% endif %}
         {# other items #}
         {% else %}
-            {% if loop.first and articles_page.has_previous %}
+            {% if loop.first %}
                 <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
             {% endif %}

From 79aaedc68195ed5d82635e3b4d510aaf0a065a8d Mon Sep 17 00:00:00 2001
From: pkirk <paolo.gabrielli@gmail.com>
Date: Mon, 23 Feb 2015 20:13:33 +0100
Subject: [PATCH 1743/2864] rsync -avc, not --avc

---
 docs/publish.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/publish.rst b/docs/publish.rst
index 70d93e59..8c7d4c19 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -65,7 +65,7 @@ The steps for deploying your site will depend on where it will be hosted.
 If you have SSH access to a server running Nginx or Apache, you might use the
 ``rsync`` tool to transmit your site files::
 
-    rsync --avc --delete output/ host.example.com:/var/www/your-site/
+    rsync -avc --delete output/ host.example.com:/var/www/your-site/
 
 There are many other deployment options, some of which can be configured when
 first setting up your site via the ``pelican-quickstart`` command. See the

From d0afaa5fbe8d22f5d7955e0a2e5dd4387c28de4a Mon Sep 17 00:00:00 2001
From: Patrick Fournier <patrick@whiskyechobravo.com>
Date: Tue, 10 Feb 2015 14:49:29 -0500
Subject: [PATCH 1744/2864] Format custom metadata fields listed in the
 FORMATTED_FIELDS setting. Adding FORMATTED_FIELDS to the default settings
 with ['summary'] as the default value.

---
 docs/settings.rst                                      |  1 +
 pelican/readers.py                                     | 10 +++++++---
 pelican/settings.py                                    |  1 +
 ...article_with_markdown_and_summary_metadata_multi.md |  3 +++
 pelican/tests/content/article_with_metadata.rst        |  3 +++
 pelican/tests/default_conf.py                          |  3 +++
 6 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d7ba85cd..9c2f13ae 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -214,6 +214,7 @@ Setting name (followed by default value, if any)
                                                                                  in this list are written. Paths should be either absolute or relative
                                                                                  to the current Pelican working directory. For possible use cases see
                                                                                  :ref:`writing_only_selected_content`.
+``FORMATTED_FIELDS = ['summary']``                                               A list of metadata fields to be parsed and translated to HTML.
 ===============================================================================  =====================================================================
 
 .. [#] Default is the system locale.
diff --git a/pelican/readers.py b/pelican/readers.py
index 365080d6..731fb5da 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -136,13 +136,15 @@ class RstReader(BaseReader):
 
     def _parse_metadata(self, document):
         """Return the dict containing document metadata"""
+        formatted_fields = self.settings['FORMATTED_FIELDS']
+
         output = {}
         for docinfo in document.traverse(docutils.nodes.docinfo):
             for element in docinfo.children:
                 if element.tagname == 'field':  # custom fields (e.g. summary)
                     name_elem, body_elem = element.children
                     name = name_elem.astext()
-                    if name == 'summary':
+                    if name in formatted_fields:
                         value = render_node_to_html(document, body_elem)
                     else:
                         value = body_elem.astext()
@@ -205,10 +207,12 @@ class MarkdownReader(BaseReader):
 
     def _parse_metadata(self, meta):
         """Return the dict containing document metadata"""
+        formatted_fields = self.settings['FORMATTED_FIELDS']
+
         output = {}
         for name, value in meta.items():
             name = name.lower()
-            if name == "summary":
+            if name in formatted_fields:
                 # handle summary metadata as markdown
                 # summary metadata is special case and join all list values
                 summary_values = "\n".join(value)
@@ -333,7 +337,7 @@ class HTMLReader(BaseReader):
             if name is None:
                 attr_serialized = ', '.join(['{}="{}"'.format(k, v) for k, v in attrs])
                 logger.warning("Meta tag in file %s does not have a 'name' "
-                               "attribute, skipping. Attributes: %s", 
+                               "attribute, skipping. Attributes: %s",
                                self._filename, attr_serialized)
                 return
             name = name.lower()
diff --git a/pelican/settings.py b/pelican/settings.py
index e33d6a66..0d69c08e 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -133,6 +133,7 @@ DEFAULT_CONFIG = {
     'LOAD_CONTENT_CACHE': True,
     'AUTORELOAD_IGNORE_CACHE': False,
     'WRITE_SELECTED': [],
+    'FORMATTED_FIELDS': ['summary'],
     }
 
 PYGMENTS_RST_OPTIONS = None
diff --git a/pelican/tests/content/article_with_markdown_and_summary_metadata_multi.md b/pelican/tests/content/article_with_markdown_and_summary_metadata_multi.md
index b6ef666c..c5f62a0a 100644
--- a/pelican/tests/content/article_with_markdown_and_summary_metadata_multi.md
+++ b/pelican/tests/content/article_with_markdown_and_summary_metadata_multi.md
@@ -3,5 +3,8 @@ Date: 2012-10-31
 Summary:
     A multi-line summary should be supported
     as well as **inline markup**.
+custom_formatted_field:
+    Multi-line metadata should also be supported
+    as well as *inline markup* and stuff to "typogrify"...
 
 This is some content.
diff --git a/pelican/tests/content/article_with_metadata.rst b/pelican/tests/content/article_with_metadata.rst
index 9b65a4b0..5f3d77bc 100644
--- a/pelican/tests/content/article_with_metadata.rst
+++ b/pelican/tests/content/article_with_metadata.rst
@@ -11,3 +11,6 @@ This is a super article !
     Multi-line metadata should be supported
     as well as **inline markup** and stuff to "typogrify"...
 :custom_field: http://notmyidea.org
+:custom_formatted_field:
+    Multi-line metadata should also be supported
+    as well as *inline markup* and stuff to "typogrify"...
diff --git a/pelican/tests/default_conf.py b/pelican/tests/default_conf.py
index b4f532d4..f38ef804 100644
--- a/pelican/tests/default_conf.py
+++ b/pelican/tests/default_conf.py
@@ -39,6 +39,9 @@ STATIC_PATHS = [
     'extra/robots.txt',
     ]
 
+FORMATTED_FIELDS = ['summary', 'custom_formatted_field']
+
 # foobar will not be used, because it's not in caps. All configuration keys
 # have to be in caps
 foobar = "barbaz"
+

From d53c166f954f5b3b5352f71164545d40c19c4af2 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 25 Feb 2015 09:42:33 -0800
Subject: [PATCH 1745/2864] Clarify docs for FORMATTED_FIELDS setting

---
 docs/settings.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9c2f13ae..11444d2e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -214,7 +214,8 @@ Setting name (followed by default value, if any)
                                                                                  in this list are written. Paths should be either absolute or relative
                                                                                  to the current Pelican working directory. For possible use cases see
                                                                                  :ref:`writing_only_selected_content`.
-``FORMATTED_FIELDS = ['summary']``                                               A list of metadata fields to be parsed and translated to HTML.
+``FORMATTED_FIELDS = ['summary']``                                               A list of metadata fields containing reST/Markdown content to be
+                                                                                 parsed and translated to HTML.
 ===============================================================================  =====================================================================
 
 .. [#] Default is the system locale.

From 555c5539924ebe1efd64252221389c646dcaa998 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Wed, 25 Feb 2015 21:37:36 -0800
Subject: [PATCH 1746/2864] Remove PDF-related elements from notmyidea

PDF generation was removed from Pelican's core in #1010.
---
 pelican/themes/notmyidea/templates/article_infos.html | 2 +-
 pelican/themes/notmyidea/templates/page.html          | 2 --
 pelican/themes/notmyidea/templates/taglist.html       | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index 718967e0..172ad85d 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -16,7 +16,7 @@
                 {% endfor %}
         </address>
         {% endif %}
-<p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
+<p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>.</p>
 {% include 'taglist.html' %}
 {% import 'translations.html' as translations with context %}
 {{ translations.translations_for(article) }}
diff --git a/pelican/themes/notmyidea/templates/page.html b/pelican/themes/notmyidea/templates/page.html
index 5ac50b66..0d8283fe 100644
--- a/pelican/themes/notmyidea/templates/page.html
+++ b/pelican/themes/notmyidea/templates/page.html
@@ -5,8 +5,6 @@
     <h1 class="entry-title">{{ page.title }}</h1>
     {% import 'translations.html' as translations with context %}
     {{ translations.translations_for(page) }}
-    {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
-    the pdf</a>{% endif %}
     {{ page.content }}
 </section>
 {% endblock %}
diff --git a/pelican/themes/notmyidea/templates/taglist.html b/pelican/themes/notmyidea/templates/taglist.html
index 1e0b95a7..58f35576 100644
--- a/pelican/themes/notmyidea/templates/taglist.html
+++ b/pelican/themes/notmyidea/templates/taglist.html
@@ -1,2 +1 @@
 {% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag | escape }}</a> {% endfor %}</p>{% endif %}
-{% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a></p>{% endif %}

From 87d86d724c6ae01adf1488b2f65dd0ff1e48ca46 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Sat, 28 Feb 2015 15:33:54 -0800
Subject: [PATCH 1747/2864] Change phrasing and formatting of README

Made a few changes to the README to emphasize Pelican's position as a
general-purpose static site generator, and not just a blogging tool.

See #1645 for more details.
---
 README.rst | 59 +++++++++++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/README.rst b/README.rst
index 564cc77c..a5643514 100644
--- a/README.rst
+++ b/README.rst
@@ -3,57 +3,58 @@ Pelican |build-status| |coverage-status|
 
 Pelican is a static site generator, written in Python_.
 
-* Write your weblog entries directly with your editor of choice (vim!)
-  in reStructuredText_ or Markdown_
-* Includes a simple CLI tool to (re)generate the weblog
-* Easy to interface with DVCSes and web hooks
-* Completely static output is easy to host anywhere
+* Write content in reStructuredText_ or Markdown_ using your editor of choice.
+* Includes a simple command line tool to (re)generate site files.
+* Easy to interface with version control systems and web hooks.
+* Completely static output is simple to host anywhere.
+
 
 Features
 --------
 
 Pelican currently supports:
 
-* Blog articles and pages
-* Comments, via an external service (Disqus). (Please note that while
-  useful, Disqus is an external service, and thus the comment data will be
-  somewhat outside of your control and potentially subject to data loss.)
-* Theming support (themes are created using Jinja2_ templates)
-* PDF generation of the articles/pages (optional)
+* Blog articles and static pages
+* Integration with external services (ex. Google Analytics and Disqus)
+* Site themes (created using Jinja2_ templates)
 * Publication of articles in multiple languages
-* Atom/RSS feeds
-* Code syntax highlighting
-* Import from WordPress, Dotclear, or RSS feeds
-* Integration with external tools: Twitter, Google Analytics, etc. (optional)
-* Fast rebuild times thanks to content caching and selective output writing.
+* Generation of Atom and RSS feeds
+* Syntax highlighting via Pygments_
+* Importing existing content from WordPress, Dotclear, and more services
+* Fast rebuild times due to content caching and selective output writing
 
-Have a look at the `Pelican documentation`_ for more information.
+Check out `Pelican's documentation`_ for further information.
 
-Why the name "Pelican"?
------------------------
-
-"Pelican" is an anagram for *calepin*, which means "notebook" in French. ;)
-
-Source code
------------
-
-You can access the source code at: https://github.com/getpelican/pelican
-
-If you feel hackish, have a look at the explanation of `Pelican's internals`_.
 
 How to get help, contribute, or provide feedback
 ------------------------------------------------
 
 See our `contribution submission and feedback guidelines <CONTRIBUTING.rst>`_.
 
+
+Source code
+-----------
+
+Pelican's source code is `hosted on GitHub`_. If you're feeling hackish,
+take a look at `Pelican's internals`_.
+
+
+Why the name "Pelican"?
+-----------------------
+
+"Pelican" is an anagram of *calepin*, which means "notebook" in French.
+
+
 .. Links
 
 .. _Python: http://www.python.org/
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Markdown: http://daringfireball.net/projects/markdown/
 .. _Jinja2: http://jinja.pocoo.org/
-.. _`Pelican documentation`: http://docs.getpelican.com/
+.. _Pygments: http://pygments.org/
+.. _`Pelican's documentation`: http://docs.getpelican.com/
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
+.. _`hosted on GitHub`: https://github.com/getpelican/pelican
 
 .. |build-status| image:: https://img.shields.io/travis/getpelican/pelican/master.svg
    :target: https://travis-ci.org/getpelican/pelican

From e35ca1d6ff4fd9a31b6dd60b2bb345c2fee0828e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 5 Mar 2015 12:04:39 -0800
Subject: [PATCH 1748/2864] Minor improvements to README

---
 README.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index a5643514..0bb3bcc8 100644
--- a/README.rst
+++ b/README.rst
@@ -3,10 +3,10 @@ Pelican |build-status| |coverage-status|
 
 Pelican is a static site generator, written in Python_.
 
-* Write content in reStructuredText_ or Markdown_ using your editor of choice.
-* Includes a simple command line tool to (re)generate site files.
-* Easy to interface with version control systems and web hooks.
-* Completely static output is simple to host anywhere.
+* Write content in reStructuredText_ or Markdown_ using your editor of choice
+* Includes a simple command line tool to (re)generate site files
+* Easy to interface with version control systems and web hooks
+* Completely static output is simple to host anywhere
 
 
 Features
@@ -14,13 +14,13 @@ Features
 
 Pelican currently supports:
 
-* Blog articles and static pages
-* Integration with external services (ex. Google Analytics and Disqus)
+* Chronological content (e.g., articles, blog posts) as well as static pages
+* Integration with external services (e.g., Google Analytics and Disqus)
 * Site themes (created using Jinja2_ templates)
 * Publication of articles in multiple languages
 * Generation of Atom and RSS feeds
 * Syntax highlighting via Pygments_
-* Importing existing content from WordPress, Dotclear, and more services
+* Importing existing content from WordPress, Dotclear, and other services
 * Fast rebuild times due to content caching and selective output writing
 
 Check out `Pelican's documentation`_ for further information.
@@ -35,7 +35,7 @@ See our `contribution submission and feedback guidelines <CONTRIBUTING.rst>`_.
 Source code
 -----------
 
-Pelican's source code is `hosted on GitHub`_. If you're feeling hackish,
+Pelican's source code is `hosted on GitHub`_. If you feel like hacking,
 take a look at `Pelican's internals`_.
 
 

From 3ea45420152a8465db33fd4a67ac88f1c1426df5 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 17 Feb 2015 20:05:00 -0500
Subject: [PATCH 1749/2864] Make sure Content uses URLWrappers

---
 pelican/contents.py              | 14 +++-----------
 pelican/readers.py               |  4 ++++
 pelican/tests/test_contents.py   | 11 ++++++-----
 pelican/tests/test_generators.py | 32 ++++++++++++++++++++++++++++++++
 pelican/tests/test_paginator.py  |  4 ++--
 5 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 074c28be..90121316 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -53,7 +53,7 @@ class Content(object):
         self._context = context
         self.translations = []
 
-        local_metadata = dict(settings['DEFAULT_METADATA'])
+        local_metadata = dict()
         local_metadata.update(metadata)
 
         # set metadata as attributes
@@ -166,21 +166,13 @@ class Content(object):
         """Returns the URL, formatted with the proper values"""
         metadata = copy.copy(self.metadata)
         path = self.metadata.get('path', self.get_relative_source_path())
-        default_category = self.settings['DEFAULT_CATEGORY']
-        slug_substitutions = self.settings.get('SLUG_SUBSTITUTIONS', ())
         metadata.update({
             'path': path_to_url(path),
             'slug': getattr(self, 'slug', ''),
             'lang': getattr(self, 'lang', 'en'),
             'date': getattr(self, 'date', SafeDatetime.now()),
-            'author': slugify(
-                getattr(self, 'author', ''),
-                slug_substitutions
-            ),
-            'category': slugify(
-                getattr(self, 'category', default_category),
-                slug_substitutions
-            )
+            'author': self.author.slug if hasattr(self, 'author') else '',
+            'category': self.category.slug if hasattr(self, 'category') else ''
         })
         return metadata
 
diff --git a/pelican/readers.py b/pelican/readers.py
index 731fb5da..a9b71bed 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -537,6 +537,10 @@ def find_empty_alt(content, path):
 def default_metadata(settings=None, process=None):
     metadata = {}
     if settings:
+        for name, value in dict(settings.get('DEFAULT_METADATA', {})).items():
+            if process:
+                value = process(name, value)
+            metadata[name] = value
         if 'DEFAULT_CATEGORY' in settings:
             value = settings['DEFAULT_CATEGORY']
             if process:
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 4b692e29..004d512e 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -8,7 +8,7 @@ import os.path
 
 from pelican.tests.support import unittest, get_settings
 
-from pelican.contents import Page, Article, Static, URLWrapper
+from pelican.contents import Page, Article, Static, URLWrapper, Author, Category
 from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import path_to_url, truncate_html_words, SafeDatetime, posix_join
 from pelican.signals import content_object_init
@@ -33,7 +33,7 @@ class TestPage(unittest.TestCase):
             'metadata': {
                 'summary': TEST_SUMMARY,
                 'title': 'foo bar',
-                'author': 'Blogger',
+                'author': Author('Blogger', DEFAULT_CONFIG),
             },
             'source_path': '/path/to/file/foo.ext'
         }
@@ -374,7 +374,8 @@ class TestPage(unittest.TestCase):
         content = Page(**args)
         assert content.authors == [content.author]
         args['metadata'].pop('author')
-        args['metadata']['authors'] = ['First Author', 'Second Author']
+        args['metadata']['authors'] = [Author('First Author', DEFAULT_CONFIG),
+                                       Author('Second Author', DEFAULT_CONFIG)]
         content = Page(**args)
         assert content.authors
         assert content.author == content.authors[0]
@@ -396,8 +397,8 @@ class TestArticle(TestPage):
         settings['ARTICLE_URL'] = '{author}/{category}/{slug}/'
         settings['ARTICLE_SAVE_AS'] = '{author}/{category}/{slug}/index.html'
         article_kwargs = self._copy_page_kwargs()
-        article_kwargs['metadata']['author'] = "O'Brien"
-        article_kwargs['metadata']['category'] = 'C# & stuff'
+        article_kwargs['metadata']['author'] = Author("O'Brien", settings)
+        article_kwargs['metadata']['category'] = Category('C# & stuff', settings)
         article_kwargs['metadata']['title'] = 'fnord'
         article_kwargs['settings'] = settings
         article = Article(**article_kwargs)
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 9f38c002..acf767f2 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -413,6 +413,38 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_context()
         generator.readers.read_file.assert_called_count == orig_call_count
 
+    def test_standard_metadata_in_default_metadata(self):
+        settings = get_settings(filenames={})
+        settings['CACHE_CONTENT'] = False
+        settings['DEFAULT_CATEGORY'] = 'Default'
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
+        settings['DEFAULT_METADATA'] = (('author', 'Blogger'),
+                                        # category will be ignored in favor of
+                                        # DEFAULT_CATEGORY
+                                        ('category', 'Random'),
+                                        ('tags', 'general, untagged'))
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+
+        authors = sorted([author.name for author, _ in generator.authors])
+        authors_expected = sorted(['Alexis Métaireau', 'Blogger',
+                                   'First Author', 'Second Author'])
+        self.assertEqual(authors, authors_expected)
+
+        categories = sorted([category.name
+                             for category, _ in generator.categories])
+        categories_expected = [
+            sorted(['Default', 'TestCategory', 'yeah', 'test', '指導書']),
+            sorted(['Default', 'TestCategory', 'Yeah', 'test', '指導書'])]
+        self.assertIn(categories, categories_expected)
+
+        tags = sorted([tag.name for tag in generator.tags])
+        tags_expected = sorted(['bar', 'foo', 'foobar', 'general', 'untagged',
+                                'パイソン', 'マック'])
+        self.assertEqual(tags, tags_expected)
+
 
 class TestPageGenerator(unittest.TestCase):
     # Note: Every time you want to test for a new field; Make sure the test
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 5494fda8..002d9e07 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -5,7 +5,7 @@ import locale
 from pelican.tests.support import unittest, get_settings
 
 from pelican.paginator import Paginator
-from pelican.contents import Article
+from pelican.contents import Article, Author
 from pelican.settings import DEFAULT_CONFIG
 from jinja2.utils import generate_lorem_ipsum
 
@@ -26,7 +26,6 @@ class TestPage(unittest.TestCase):
             'metadata': {
                 'summary': TEST_SUMMARY,
                 'title': 'foo bar',
-                'author': 'Blogger',
             },
             'source_path': '/path/to/file/foo.ext'
         }
@@ -49,6 +48,7 @@ class TestPage(unittest.TestCase):
             key=lambda r: r[0],
         )
 
+        self.page_kwargs['metadata']['author'] = Author('Blogger', settings)
         object_list = [Article(**self.page_kwargs), Article(**self.page_kwargs)]
         paginator = Paginator('foobar.foo', object_list, settings)
         page = paginator.page(1)

From 4e896c427ddef6b9a19088dfc653f7b8c15f5c08 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Fri, 6 Mar 2015 23:51:26 -0800
Subject: [PATCH 1750/2864] Standardize formatting of .travis.yml

Use 2 spaces for indentation.
---
 .travis.yml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a052252b..f5a7f04f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,24 @@
 language: python
 python:
-    - "2.7"
-    - "3.3"
-    - "3.4"
+  - "2.7"
+  - "3.3"
+  - "3.4"
 addons:
   apt_packages:
     - pandoc
 before_install:
- - sudo apt-get update -qq
- - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
+  - sudo apt-get update -qq
+  - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
-    - pip install .
-    - pip install -r dev_requirements.txt
-    - pip install nose-cov
+  - pip install .
+  - pip install -r dev_requirements.txt
+  - pip install nose-cov
 script: nosetests -sv --with-coverage --cover-package=pelican pelican
 after_success:
-  # Report coverage results to coveralls.io
   - pip install coveralls
   - coveralls
 notifications:
-    irc:
-        channels:
-            - "irc.freenode.org#pelican"
-        on_success: change
+  irc:
+    channels:
+      - "irc.freenode.org#pelican"
+    on_success: change

From ffe71d324d4812925b2eeddbc52b66f5ebbf3801 Mon Sep 17 00:00:00 2001
From: robertlagrant <heroku@robertgrant.org>
Date: Fri, 13 Mar 2015 13:42:56 +0200
Subject: [PATCH 1751/2864] Change docs wording on cache regen for #1630

---
 docs/settings.rst | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 11444d2e..9fb97883 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -847,13 +847,11 @@ can be invoked by passing the ``--archive`` flag).
 
 The cache files are Python pickles, so they may not be readable by
 different versions of Python as the pickle format often changes. If
-such an error is encountered, the cache files have to be rebuilt by
-removing them and re-running Pelican, or by using the Pelican
-command-line option ``--ignore-cache``. The cache files also have to
-be rebuilt when changing the ``GZIP_CACHE`` setting for cache file
-reading to work properly.
+such an error is encountered, it is caught and the cache file is 
+rebuilt automatically in the new format. The cache files will also be 
+rebuilt after the ``GZIP_CACHE`` setting has been changed.
 
-The ``--ignore-cache`` command-line option is also useful when the
+The ``--ignore-cache`` command-line option is useful when the
 whole cache needs to be regenerated, such as when making modifications
 to the settings file that will affect the cached content, or just for
 debugging purposes. When Pelican runs in autoreload mode, modification

From 0f7f328206b4b3eb085335aa86c620150143ee6e Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Fri, 13 Mar 2015 23:01:31 -0700
Subject: [PATCH 1752/2864] Remove a couple of unused imports

As reported by Pyflakes.
---
 pelican/contents.py | 2 +-
 pelican/writers.py  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 074c28be..a680c411 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
 import six
-from six.moves.urllib.parse import (unquote, urlparse, urlunparse)
+from six.moves.urllib.parse import urlparse, urlunparse
 
 import copy
 import locale
diff --git a/pelican/writers.py b/pelican/writers.py
index bf32e272..e90a0004 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -3,7 +3,6 @@ from __future__ import with_statement, unicode_literals, print_function
 import six
 
 import os
-import locale
 import logging
 
 if not six.PY3:

From ef737c22393174571fe17a6175eb98465c6ec246 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 14 Mar 2015 13:36:51 -0400
Subject: [PATCH 1753/2864] Use `--relative-urls` only if it is specified

Otherwise, `RELATIVE_URLS` in the config file is ignored and
`RELATIVE_URLS` is set to `False` if `--relative-urls` is not
specified.

Fixes an issue introduced in #1592
---
 pelican/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 3013744d..056c45ef 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -321,7 +321,8 @@ def get_config(args):
         config['CACHE_PATH'] = args.cache_path
     if args.selected_paths:
         config['WRITE_SELECTED'] = args.selected_paths.split(',')
-    config['RELATIVE_URLS'] = args.relative_paths
+    if args.relative_paths:
+        config['RELATIVE_URLS'] = args.relative_paths
     config['DEBUG'] = args.verbosity == logging.DEBUG
 
     # argparse returns bytes in Py2. There is no definite answer as to which

From 875c4a5e05d818c776be3019506921b863b13dc0 Mon Sep 17 00:00:00 2001
From: Anton Antonov <anton.synd.antonov@gmail.com>
Date: Tue, 17 Mar 2015 01:23:29 +0200
Subject: [PATCH 1754/2864] Nitpick Content decorators

A bit more readable this way.
---
 pelican/contents.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 96466a94..005d045c 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -90,7 +90,7 @@ class Content(object):
 
             self.in_default_lang = (self.lang == default_lang)
 
-        # create the slug if not existing, generate slug according to 
+        # create the slug if not existing, generate slug according to
         # setting of SLUG_ATTRIBUTE
         if not hasattr(self, 'slug'):
             if settings['SLUGIFY_SOURCE'] == 'title' and hasattr(self, 'title'):
@@ -308,8 +308,13 @@ class Content(object):
         """Dummy function"""
         pass
 
-    url = property(functools.partial(get_url_setting, key='url'))
-    save_as = property(functools.partial(get_url_setting, key='save_as'))
+    @property
+    def url(self):
+        return self.get_url_setting('url')
+
+    @property
+    def save_as(self):
+        return self.get_url_setting('save_as')
 
     def _get_template(self):
         if hasattr(self, 'template') and self.template is not None:

From db2e5174502787e447d3df32298cf950c6c894ae Mon Sep 17 00:00:00 2001
From: Forest <web11.forest@tibit.com>
Date: Mon, 29 Sep 2014 22:51:13 -0700
Subject: [PATCH 1755/2864] Ignore empty metadata. Fixes #1469. Fixes #1398.

Some metadata values cause problems when empty.  For example, a markdown file
containing a Slug: line with no additional text causing Pelican to produce a
file named ".html" instead of generating a proper file name.  Others, like
those created by a PATH_METADATA regex, must be preserved even if empty,
so things like PAGE_URL="filename{customvalue}.html" will always work.
Essentially, we want to discard empty metadata that we know will be useless
or problematic.  This is better than raising an exception because (a) it
allows users to deliberately keep empty metadata in their source files for
filling in later, and (b) users shouldn't be forced to fix empty metadata
created by blog migration tools (see #1398).

The metadata processors are the ideal place to do this, because they know
the type of data they are handling and whether an empty value is wanted.
Unfortunately, they can't discard items, and neither can process_metadata(),
because their return values are always saved by calling code.  We can't
safely change the calling code, because some of it lives in custom reader
classes out in the field, and we don't want to break those working systems.
Discarding empty values at the time of use isn't good enough, because that
still allows useless empty values in a source file to override configured
defaults.

My solution:
- When processing a list of values, a metadata processor will omit any
  unwanted empty ones from the list it returns.
- When processing an entirely unwanted value, it will return something easily
  identifiable that will pass through the reader code.
- When collecting the processed metadata, read_file() will filter out items
  identified as unwanted.

These metadata are affected by this change:
author, authors, category, slug, status, tags.

I also removed a bit of now-superfluous code from generators.py that was
discarding empty authors at the time of use.
---
 pelican/generators.py |  4 +---
 pelican/readers.py    | 48 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index f0a6d264..75bd6b2a 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -544,10 +544,8 @@ class ArticlesGenerator(CachingGenerator):
             if hasattr(article, 'tags'):
                 for tag in article.tags:
                     self.tags[tag].append(article)
-            # ignore blank authors as well as undefined
             for author in getattr(article, 'authors', []):
-                if author.name != '':
-                    self.authors[author].append(article)
+                self.authors[author].append(article)
         # sort the articles by date
         self.articles.sort(key=attrgetter('date'), reverse=True)
         self.dates = list(self.articles)
diff --git a/pelican/readers.py b/pelican/readers.py
index a9b71bed..3656cd96 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -28,16 +28,44 @@ from pelican.contents import Page, Category, Tag, Author
 from pelican.utils import get_date, pelican_open, FileStampDataCacher, SafeDatetime, posixize_path
 
 
+def strip_split(text, sep=','):
+    """Return a list of stripped, non-empty substrings, delimited by sep."""
+    items = [x.strip() for x in text.split(sep)]
+    return [x for x in items if x]
+
+
+# Metadata processors have no way to discard an unwanted value, so we have
+# them return this value instead to signal that it should be discarded later.
+# This means that _filter_discardable_metadata() must be called on processed
+# metadata dicts before use, to remove the items with the special value.
+_DISCARD = object()
+
+
+def _process_if_nonempty(processor, name, settings):
+    """Removes extra whitespace from name and applies a metadata processor.
+    If name is empty or all whitespace, returns _DISCARD instead.
+    """
+    name = name.strip()
+    return processor(name, settings) if name else _DISCARD
+
+
 METADATA_PROCESSORS = {
-    'tags': lambda x, y: [Tag(tag, y) for tag in x.split(',')],
+    'tags': lambda x, y: [Tag(tag, y) for tag in strip_split(x)] or _DISCARD,
     'date': lambda x, y: get_date(x.replace('_', ' ')),
     'modified': lambda x, y: get_date(x),
-    'status': lambda x, y: x.strip(),
-    'category': Category,
-    'author': Author,
-    'authors': lambda x, y: [Author(author.strip(), y) for author in x.split(',')],
+    'status': lambda x, y: x.strip() or _DISCARD,
+    'category': lambda x, y: _process_if_nonempty(Category, x, y),
+    'author': lambda x, y: _process_if_nonempty(Author, x, y),
+    'authors': lambda x, y: [Author(a, y) for a in strip_split(x)] or _DISCARD,
+    'slug': lambda x, y: x.strip() or _DISCARD,
 }
 
+
+def _filter_discardable_metadata(metadata):
+    """Return a copy of a dict, minus any items marked as discardable."""
+    return {name: val for name, val in metadata.items() if val is not _DISCARD}
+
+
 logger = logging.getLogger(__name__)
 
 class BaseReader(object):
@@ -447,14 +475,14 @@ class Readers(FileStampDataCacher):
 
         reader = self.readers[fmt]
 
-        metadata = default_metadata(
-            settings=self.settings, process=reader.process_metadata)
+        metadata = _filter_discardable_metadata(default_metadata(
+            settings=self.settings, process=reader.process_metadata))
         metadata.update(path_metadata(
             full_path=path, source_path=source_path,
             settings=self.settings))
-        metadata.update(parse_path_metadata(
+        metadata.update(_filter_discardable_metadata(parse_path_metadata(
             source_path=source_path, settings=self.settings,
-            process=reader.process_metadata))
+            process=reader.process_metadata)))
         reader_name = reader.__class__.__name__
         metadata['reader'] = reader_name.replace('Reader', '').lower()
 
@@ -462,7 +490,7 @@ class Readers(FileStampDataCacher):
         if content is None:
             content, reader_metadata = reader.read(path)
             self.cache_data(path, (content, reader_metadata))
-        metadata.update(reader_metadata)
+        metadata.update(_filter_discardable_metadata(reader_metadata))
 
         if content:
             # find images with empty alt

From 7ad649e3b79c20d9cbb783148e659824c46fbf8c Mon Sep 17 00:00:00 2001
From: Forest <web11.forest@tibit.com>
Date: Fri, 31 Oct 2014 23:05:19 -0700
Subject: [PATCH 1756/2864] Guess mime type with python-magic if available.
 Fixes #1514.

---
 pelican/server.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pelican/server.py b/pelican/server.py
index 0a8dc1b6..60252e1f 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -12,6 +12,11 @@ try:
 except ImportError:
     import socketserver  # NOQA
 
+try:
+    from magic import from_file as magic_from_file
+except ImportError:
+    magic_from_file = None
+
 PORT = len(sys.argv) in (2, 3) and int(sys.argv[1]) or 8000
 SERVER = len(sys.argv) == 3 and sys.argv[2] or ""
 SUFFIXES = ['', '.html', '/index.html']
@@ -39,6 +44,18 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
             logging.warning("Unable to find `%s` or variations.",
                             self.original_path)
 
+    def guess_type(self, path):
+        """Guess at the mime type for the specified file.
+        """
+        mimetype = srvmod.SimpleHTTPRequestHandler.guess_type(self, path)
+
+        # If the default guess is too generic, try the python-magic library
+        if mimetype == 'application/octet-stream' and magic_from_file:
+            mimetype = magic_from_file(path, mime=True)
+
+        return mimetype
+
+
 Handler = ComplexHTTPRequestHandler
 
 socketserver.TCPServer.allow_reuse_address = True

From 7b4ceb29744b3a00f39925047a0dafef0176214f Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 3 Apr 2015 18:58:52 -0400
Subject: [PATCH 1757/2864] Make `pelican.server` importable and use it in `fab
 serve`

`fab serve` and `make devserver` use different HTTP Handlers and as a
result they behave differently. This makes sure `fab serve` also uses
the Handler defined in `pelican.server` in order to get rid of the
inconsistency.
---
 pelican/server.py                     | 46 ++++++++++++---------------
 pelican/tools/templates/fabfile.py.in |  5 +--
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/pelican/server.py b/pelican/server.py
index 60252e1f..f58ac085 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -2,30 +2,22 @@ from __future__ import print_function
 import os
 import sys
 import logging
-try:
-    import SimpleHTTPServer as srvmod
-except ImportError:
-    import http.server as srvmod  # NOQA
 
-try:
-    import SocketServer as socketserver
-except ImportError:
-    import socketserver  # NOQA
+from six.moves import SimpleHTTPServer as srvmod
+from six.moves import socketserver
 
 try:
     from magic import from_file as magic_from_file
 except ImportError:
     magic_from_file = None
 
-PORT = len(sys.argv) in (2, 3) and int(sys.argv[1]) or 8000
-SERVER = len(sys.argv) == 3 and sys.argv[2] or ""
-SUFFIXES = ['', '.html', '/index.html']
-
 
 class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
+    SUFFIXES = ['', '.html', '/index.html']
+
     def do_GET(self):
         # Try to detect file by applying various suffixes
-        for suffix in SUFFIXES:
+        for suffix in self.SUFFIXES:
             if not hasattr(self, 'original_path'):
                 self.original_path = self.path
 
@@ -56,19 +48,21 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
         return mimetype
 
 
-Handler = ComplexHTTPRequestHandler
+if __name__ == '__main__':
+    PORT = len(sys.argv) in (2, 3) and int(sys.argv[1]) or 8000
+    SERVER = len(sys.argv) == 3 and sys.argv[2] or ""
 
-socketserver.TCPServer.allow_reuse_address = True
-try:
-    httpd = socketserver.TCPServer((SERVER, PORT), Handler)
-except OSError as e:
-    logging.error("Could not listen on port %s, server %s.", PORT, SERVER)
-    sys.exit(getattr(e, 'exitcode', 1))
+    socketserver.TCPServer.allow_reuse_address = True
+    try:
+        httpd = socketserver.TCPServer((SERVER, PORT), ComplexHTTPRequestHandler)
+    except OSError as e:
+        logging.error("Could not listen on port %s, server %s.", PORT, SERVER)
+        sys.exit(getattr(e, 'exitcode', 1))
 
 
-logging.info("Serving at port %s, server %s.", PORT, SERVER)
-try:
-    httpd.serve_forever()
-except KeyboardInterrupt as e:
-    logging.info("Shutting down server.")
-    httpd.socket.close()
+    logging.info("Serving at port %s, server %s.", PORT, SERVER)
+    try:
+        httpd.serve_forever()
+    except KeyboardInterrupt as e:
+        logging.info("Shutting down server.")
+        httpd.socket.close()
diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.in
index a8ab586b..bcc66f6a 100644
--- a/pelican/tools/templates/fabfile.py.in
+++ b/pelican/tools/templates/fabfile.py.in
@@ -3,9 +3,10 @@ import fabric.contrib.project as project
 import os
 import shutil
 import sys
-import SimpleHTTPServer
 import SocketServer
 
+from pelican.server import ComplexHTTPRequestHandler
+
 # Local path configuration (can be absolute or relative to fabfile)
 env.deploy_path = 'output'
 DEPLOY_PATH = env.deploy_path
@@ -51,7 +52,7 @@ def serve():
     class AddressReuseTCPServer(SocketServer.TCPServer):
         allow_reuse_address = True
 
-    server = AddressReuseTCPServer(('', PORT), SimpleHTTPServer.SimpleHTTPRequestHandler)
+    server = AddressReuseTCPServer(('', PORT), ComplexHTTPRequestHandler)
 
     sys.stderr.write('Serving on port {0} ...\n'.format(PORT))
     server.serve_forever()

From 946e95172fa85e7d5967226f3dbc723f099f94c9 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 4 Apr 2015 15:17:59 -0400
Subject: [PATCH 1758/2864] Use pelican.server in Quickstart docs

---
 docs/quickstart.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 122d65b5..c4f5a897 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -61,10 +61,10 @@ Preview your site
 -----------------
 
 Open a new terminal session and run the following commands to switch to your
-``output`` directory and launch Python's built-in web server::
+``output`` directory and launch Pelican's web server::
 
     cd ~/projects/yoursite/output
-    python -m SimpleHTTPServer # -m http.server if you use python3
+    python -m pelican.server
 
 Preview your site by navigating to http://localhost:8000/ in your browser.
 

From 5ca808ed598679dfef4574892c79e1d262632051 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Mon, 6 Apr 2015 09:49:01 +0200
Subject: [PATCH 1759/2864] fix broken internal metadata link

---
 docs/settings.rst | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9fb97883..73837181 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -470,14 +470,14 @@ your resume, and a contact page — you could have::
 Path metadata
 =============
 
-Not all metadata needs to be `embedded in source file itself`__.  For
-example, blog posts are often named following a ``YYYY-MM-DD-SLUG.rst``
-pattern, or nested into ``YYYY/MM/DD-SLUG`` directories.  To extract
-metadata from the filename or path, set ``FILENAME_METADATA`` or
-``PATH_METADATA`` to regular expressions that use Python's `group name
-notation`_ ``(?P<name>…)``.  If you want to attach additional metadata
-but don't want to encode it in the path, you can set
-``EXTRA_PATH_METADATA``:
+Not all metadata needs to be :ref:`embedded in source file itself
+<internal_metadata>`. For example, blog posts are often named
+following a ``YYYY-MM-DD-SLUG.rst`` pattern, or nested into
+``YYYY/MM/DD-SLUG`` directories. To extract metadata from the
+filename or path, set ``FILENAME_METADATA`` or ``PATH_METADATA`` to
+regular expressions that use Python's `group name notation`_ ``(?P<name>…)``.
+If you want to attach additional metadata but don't want to encode
+it in the path, you can set ``EXTRA_PATH_METADATA``:
 
 .. parsed-literal::
 
@@ -506,7 +506,6 @@ particular file:
         'static/robots.txt': {'path': 'robots.txt'},
         }
 
-__ internal_metadata__
 .. _group name notation:
    http://docs.python.org/3/library/re.html#regular-expression-syntax
 

From 2e590d0e866a8679b99978819a75edded3c1bcef Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Mon, 6 Apr 2015 14:59:06 +0200
Subject: [PATCH 1760/2864] maintain test_readers

* move all metadata tests to use a single function call (assertDictHasSubset)
* add tests for assertDictHasSubset
* correct some tests that iterated over metadata instead of expected metadata, resulting in metadata that was expected to be there but was not
* correct resulting broken tests
* add additional tests for EXTRA_PATH_METADATA
* make MdReaderTest fail if Markdown is not available instead of skipping each method individually
---
 pelican/tests/test_readers.py | 181 ++++++++++++++++++++++++++--------
 1 file changed, 140 insertions(+), 41 deletions(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index cb657673..d390fb48 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -22,6 +22,52 @@ class ReaderTest(unittest.TestCase):
         r = readers.Readers(settings=get_settings(**kwargs))
         return r.read_file(base_path=CONTENT_PATH, path=path)
 
+    def assertDictHasSubset(self, dictionary, subset):
+        for key, value in subset.items():
+            if key in dictionary:
+                real_value = dictionary.get(key)
+                self.assertEqual(
+                    value,
+                    real_value,
+                    str('Expected %r to have value %r, but was %r')
+                        % (key, value, real_value))
+            else:
+                self.fail(
+                    str('Expected %r to have value %r, but was not in Dict')
+                        % (key, value))
+
+class TestAssertDictHasSubset(ReaderTest):
+    def setUp(self):
+        self.dictionary = {
+        'key-a' : 'val-a',
+        'key-b' : 'val-b'}
+
+    def tearDown(self):
+        self.dictionary = None
+
+    def test_subset(self):
+        self.assertDictHasSubset(self.dictionary, {'key-a':'val-a'})
+
+    def test_equal(self):
+        self.assertDictHasSubset(self.dictionary, self.dictionary)
+
+    def test_fail_not_set(self):
+        self.assertRaisesRegexp(
+            AssertionError,
+            'Expected.*key-c.*to have value.*val-c.*but was not in Dict',
+            self.assertDictHasSubset,
+                self.dictionary,
+                {'key-c':'val-c'}
+            )
+
+    def test_fail_wrong_val(self):
+        self.assertRaisesRegexp(
+            AssertionError,
+            'Expected .*key-a.* to have value .*val-b.* but was .*val-a.*',
+            self.assertDictHasSubset,
+                self.dictionary,
+                {'key-a':'val-b'}
+            )
 
 class DefaultReaderTest(ReaderTest):
 
@@ -48,8 +94,7 @@ class RstReaderTest(ReaderTest):
             'custom_field': 'http://notmyidea.org',
         }
 
-        for key, value in expected.items():
-            self.assertEqual(value, page.metadata[key], key)
+        self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_filename_metadata(self):
         page = self.read_file(
@@ -61,8 +106,7 @@ class RstReaderTest(ReaderTest):
             'title': 'Rst with filename metadata',
             'reader': 'rst',
         }
-        for key, value in page.metadata.items():
-            self.assertEqual(value, expected[key], key)
+        self.assertDictHasSubset(page.metadata, expected)
 
         page = self.read_file(
             path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
@@ -74,13 +118,12 @@ class RstReaderTest(ReaderTest):
             'date': SafeDatetime(2012, 11, 29),
             'reader': 'rst',
         }
-        for key, value in page.metadata.items():
-            self.assertEqual(value, expected[key], key)
+        self.assertDictHasSubset(page.metadata, expected)
 
         page = self.read_file(
             path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
             FILENAME_METADATA=(
-                '(?P<date>\d{4}-\d{2}-\d{2})_'
+                '(?P<date>\d{4}-\d{2}-\d{2})'
                 '_(?P<Slug>.*)'
                 '#(?P<MyMeta>.*)-(?P<author>.*)'))
         expected = {
@@ -88,12 +131,11 @@ class RstReaderTest(ReaderTest):
             'author': 'Alexis Métaireau',
             'title': 'Rst with filename metadata',
             'date': SafeDatetime(2012, 11, 29),
-            'slug': 'article_with_filename_metadata',
+            'slug': 'rst_w_filename_meta',
             'mymeta': 'foo',
             'reader': 'rst',
         }
-        for key, value in page.metadata.items():
-            self.assertEqual(value, expected[key], key)
+        self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_metadata_key_lowercase(self):
         # Keys of metadata should be lowercase.
@@ -105,6 +147,81 @@ class RstReaderTest(ReaderTest):
         self.assertEqual('Yeah', metadata.get('category'),
                          'Value keeps case.')
 
+    def test_article_extra_path_metadata(self):
+        input_with_metadata = '2012-11-29_rst_w_filename_meta#foo-bar.rst'
+        page_metadata = self.read_file(
+            path=input_with_metadata,
+            FILENAME_METADATA=(
+                '(?P<date>\d{4}-\d{2}-\d{2})'
+                '_(?P<Slug>.*)'
+                '#(?P<MyMeta>.*)-(?P<author>.*)'
+                ),
+            EXTRA_PATH_METADATA={
+                input_with_metadata: {
+                    'key-1a': 'value-1a',
+                    'key-1b': 'value-1b'
+                    }
+                }
+            )
+        expected_metadata = {
+            'category': 'yeah',
+            'author' : 'Alexis Métaireau',
+            'title': 'Rst with filename metadata',
+            'date': SafeDatetime(2012, 11, 29),
+            'slug': 'rst_w_filename_meta',
+            'mymeta': 'foo',
+            'reader': 'rst',
+            'key-1a': 'value-1a',
+            'key-1b': 'value-1b'
+        }
+        self.assertDictHasSubset(page_metadata.metadata, expected_metadata)
+
+        input_file_path_without_metadata = 'article.rst'
+        page_without_metadata = self.read_file(
+            path=input_file_path_without_metadata,
+            EXTRA_PATH_METADATA={
+                input_file_path_without_metadata: {
+                    'author': 'Charlès Overwrite'}
+                }
+            )
+        expected_without_metadata = {
+            'category' : 'misc',
+            'author'   : 'Charlès Overwrite',
+            'title'    : 'Article title',
+            'reader'   : 'rst',
+        }
+        self.assertDictHasSubset(
+            page_without_metadata.metadata,
+            expected_without_metadata)
+
+    def test_article_extra_path_metadata_dont_overwrite(self):
+        #EXTRA_PATH_METADATA['author'] should get ignored
+        #since we don't overwrite already set values
+        input_file_path = '2012-11-29_rst_w_filename_meta#foo-bar.rst'
+        page = self.read_file(
+            path=input_file_path,
+            FILENAME_METADATA=(
+                '(?P<date>\d{4}-\d{2}-\d{2})'
+                '_(?P<Slug>.*)'
+                '#(?P<MyMeta>.*)-(?P<orginalauthor>.*)'),
+            EXTRA_PATH_METADATA={
+                input_file_path: {
+                    'author': 'Charlès Overwrite',
+                    'key-1b': 'value-1b'}
+                }
+            )
+        expected = {
+            'category': 'yeah',
+            'author' : 'Alexis Métaireau',
+            'title': 'Rst with filename metadata',
+            'date': SafeDatetime(2012, 11, 29),
+            'slug': 'rst_w_filename_meta',
+            'mymeta': 'foo',
+            'reader': 'rst',
+            'key-1b': 'value-1b'
+        }
+        self.assertDictHasSubset(page.metadata, expected)
+
     def test_typogrify(self):
         # if nothing is specified in the settings, the content should be
         # unmodified
@@ -205,13 +322,11 @@ class RstReaderTest(ReaderTest):
             'authors': ['First Author', 'Second Author']
         }
 
-        for key, value in expected.items():
-            self.assertEqual(value, page.metadata[key], key)
-
+        self.assertDictHasSubset(page.metadata, expected)
 
+@unittest.skipUnless(readers.Markdown, "markdown isn't installed")
 class MdReaderTest(ReaderTest):
 
-    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_metadata(self):
         reader = readers.MarkdownReader(settings=get_settings())
         content, metadata = reader.read(
@@ -224,8 +339,7 @@ class MdReaderTest(ReaderTest):
             'modified': SafeDatetime(2010, 12, 2, 10, 20),
             'tags': ['foo', 'bar', 'foobar'],
         }
-        for key, value in metadata.items():
-            self.assertEqual(value, expected[key], key)
+        self.assertDictHasSubset(metadata, expected)
 
         content, metadata = reader.read(
             _path('article_with_markdown_and_nonascii_summary.md'))
@@ -238,10 +352,8 @@ class MdReaderTest(ReaderTest):
             'tags': ['パイソン', 'マック'],
             'slug': 'python-virtualenv-on-mac-osx-mountain-lion-10.8',
         }
-        for key, value in metadata.items():
-            self.assertEqual(value, expected[key], key)
+        self.assertDictHasSubset(metadata, expected)
 
-    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_footnote(self):
         reader = readers.MarkdownReader(settings=get_settings())
         content, metadata = reader.read(
@@ -271,7 +383,6 @@ class MdReaderTest(ReaderTest):
                 '<em>should</em> be supported.</p>'),
             'date': SafeDatetime(2012, 10, 31),
             'modified': SafeDatetime(2012, 11, 1),
-            'slug': 'article-with-markdown-containing-footnotes',
             'multiline': [
                 'Line Metadata should be handle properly.',
                 'See syntax of Meta-Data extension of Python Markdown package:',
@@ -282,10 +393,8 @@ class MdReaderTest(ReaderTest):
             ]
         }
         self.assertEqual(content, expected_content)
-        for key, value in metadata.items():
-            self.assertEqual(value, expected_metadata[key], key)
+        self.assertDictHasSubset(metadata, expected_metadata)
 
-    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_file_extensions(self):
         reader = readers.MarkdownReader(settings=get_settings())
         # test to ensure the md file extension is being processed by the
@@ -322,7 +431,6 @@ class MdReaderTest(ReaderTest):
                     " the mdown extension.</p>")
         self.assertEqual(content, expected)
 
-    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_markdown_markup_extension(self):
         # test to ensure the markdown markup extension is being processed as
         # expected
@@ -342,7 +450,6 @@ class MdReaderTest(ReaderTest):
 
         self.assertEqual(page.content, expected)
 
-    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_filename_metadata(self):
         page = self.read_file(
             path='2012-11-30_md_w_filename_meta#foo-bar.md',
@@ -351,8 +458,7 @@ class MdReaderTest(ReaderTest):
             'category': 'yeah',
             'author': 'Alexis Métaireau',
         }
-        for key, value in expected.items():
-            self.assertEqual(value, page.metadata[key], key)
+        self.assertDictHasSubset(page.metadata, expected)
 
         page = self.read_file(
             path='2012-11-30_md_w_filename_meta#foo-bar.md',
@@ -362,8 +468,7 @@ class MdReaderTest(ReaderTest):
             'author': 'Alexis Métaireau',
             'date': SafeDatetime(2012, 11, 30),
         }
-        for key, value in expected.items():
-            self.assertEqual(value, page.metadata[key], key)
+        self.assertDictHasSubset(page.metadata, expected)
 
         page = self.read_file(
             path='2012-11-30_md_w_filename_meta#foo-bar.md',
@@ -378,8 +483,7 @@ class MdReaderTest(ReaderTest):
             'slug': 'md_w_filename_meta',
             'mymeta': 'foo',
         }
-        for key, value in expected.items():
-            self.assertEqual(value, page.metadata[key], key)
+        self.assertDictHasSubset(page.metadata, expected)
 
 
 class HTMLReaderTest(ReaderTest):
@@ -397,8 +501,7 @@ class HTMLReaderTest(ReaderTest):
             'tags': ['foo', 'bar', 'foobar'],
         }
 
-        for key, value in expected.items():
-            self.assertEqual(value, page.metadata[key], key)
+        self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_metadata(self):
         page = self.read_file(path='article_with_metadata.html')
@@ -412,8 +515,7 @@ class HTMLReaderTest(ReaderTest):
             'custom_field': 'http://notmyidea.org',
         }
 
-        for key, value in expected.items():
-            self.assertEqual(value, page.metadata[key], key)
+        self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_multiple_authors(self):
         page = self.read_file(path='article_with_multiple_authors.html')
@@ -421,8 +523,7 @@ class HTMLReaderTest(ReaderTest):
             'authors': ['First Author', 'Second Author']
         }
 
-        for key, value in expected.items():
-            self.assertEqual(value, page.metadata[key], key)
+        self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_metadata_and_contents_attrib(self):
         page = self.read_file(path='article_with_metadata_and_contents.html')
@@ -435,8 +536,7 @@ class HTMLReaderTest(ReaderTest):
             'tags': ['foo', 'bar', 'foobar'],
             'custom_field': 'http://notmyidea.org',
         }
-        for key, value in expected.items():
-            self.assertEqual(value, page.metadata[key], key)
+        self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_null_attributes(self):
         page = self.read_file(path='article_with_null_attributes.html')
@@ -460,5 +560,4 @@ class HTMLReaderTest(ReaderTest):
             'title': 'Article with Nonconformant HTML meta tags',
         }
 
-        for key, value in expected.items():
-            self.assertEqual(value, page.metadata[key], key)
+        self.assertDictHasSubset(page.metadata, expected)

From 0f7938ccb71e34cd020026095fcb086b99c79856 Mon Sep 17 00:00:00 2001
From: Alberto Scotto <scotto.alberto.86@gmail.com>
Date: Wed, 8 Apr 2015 03:32:48 +0200
Subject: [PATCH 1761/2864] fix the meta tags added in #1028

The attribute 'contents' should be 'content'.
See http://www.w3schools.com/tags/att_meta_content.asp
---
 pelican/themes/simple/templates/article.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index e81261c5..d558183d 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -2,15 +2,15 @@
 {% block head %}
   {{ super() }}
   {% for keyword in article.keywords %}
-    <meta name="keywords" contents="{{keyword}}" />
+    <meta name="keywords" content="{{keyword}}" />
   {% endfor %}
 
   {% for description in article.description %}
-    <meta name="description" contents="{{description}}" />
+    <meta name="description" content="{{description}}" />
   {% endfor %}
 
   {% for tag in article.tags %}
-    <meta name="tags" contents="{{tag}}" />
+    <meta name="tags" content="{{tag}}" />
   {% endfor %}
 
 {% endblock %}

From adc5c4b572195d12cea1df4d0f8daa49ec2e168f Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Fri, 10 Apr 2015 09:02:12 +0200
Subject: [PATCH 1762/2864] fix broken refs

---
 docs/themes.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index fd4ec8f9..7f2693ff 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -367,7 +367,7 @@ source_path             Full system path of the article source file.
 status                  The article status, can be any of 'published' or
                         'draft'.
 summary                 Rendered summary content.
-tags                    List of :ref:`Tag <object-author_cat_tab>`
+tags                    List of :ref:`Tag <object-author_cat_tag>`
                         objects.
 template                Template name to use for rendering.
 title                   Title of the article.
@@ -422,7 +422,7 @@ source_path             Full system path of the page source file.
 status                  The page status, can be any of 'published' or
                         'draft'.
 summary                 Rendered summary content.
-tags                    List of :ref:`Tag <object-author_cat_tab>`
+tags                    List of :ref:`Tag <object-author_cat_tag>`
                         objects.
 template                Template name to use for rendering.
 title                   Title of the page.

From bf7d113caaa9d9fcc860e6687a63589ea00aea10 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Sat, 11 Apr 2015 22:45:31 +0200
Subject: [PATCH 1763/2864] add skips for tests relying on dev_requirements
 modules

---
 pelican/tests/test_generators.py    | 16 +++++++++++++++-
 pelican/tests/test_importer.py      |  7 +++++++
 pelican/tests/test_rstdirectives.py | 10 ++++++++--
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index acf767f2..4fb70826 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -6,7 +6,10 @@ from codecs import open
 try:
     from unittest.mock import MagicMock
 except ImportError:
-    from mock import MagicMock
+    try:
+        from mock import MagicMock
+    except ImportError:
+        MagicMock = False
 from shutil import rmtree
 from tempfile import mkdtemp
 
@@ -112,6 +115,7 @@ class TestArticlesGenerator(unittest.TestCase):
         return [[article.title, article.status, article.category.name,
                  article.template] for article in articles]
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_generate_feeds(self):
         settings = get_settings()
         settings['CACHE_PATH'] = self.temp_cache
@@ -215,6 +219,7 @@ class TestArticlesGenerator(unittest.TestCase):
         categories_expected = ['default', 'yeah', 'test', 'zhi-dao-shu']
         self.assertEqual(sorted(categories), sorted(categories_expected))
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_direct_templates_save_as_default(self):
 
         settings = get_settings(filenames={})
@@ -228,6 +233,7 @@ class TestArticlesGenerator(unittest.TestCase):
                                  generator.get_template("archives"), settings,
                                  blog=True, paginated={}, page_name='archives')
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_direct_templates_save_as_modified(self):
 
         settings = get_settings()
@@ -244,6 +250,7 @@ class TestArticlesGenerator(unittest.TestCase):
                                  blog=True, paginated={},
                                  page_name='archives/index')
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_direct_templates_save_as_false(self):
 
         settings = get_settings()
@@ -268,6 +275,7 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertIn(custom_template, self.articles)
         self.assertIn(standard_template, self.articles)
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_period_in_timeperiod_archive(self):
         """
         Test that the context of a generated period_archive is passed
@@ -347,6 +355,7 @@ class TestArticlesGenerator(unittest.TestCase):
         authors_expected = ['alexis-metaireau', 'first-author', 'second-author']
         self.assertEqual(sorted(authors), sorted(authors_expected))
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_article_object_caching(self):
         """Test Article objects caching at the generator level"""
         settings = get_settings(filenames={})
@@ -367,6 +376,7 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_context()
         generator.readers.read_file.assert_called_count == 0
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_reader_content_caching(self):
         """Test raw content caching at the reader level"""
         settings = get_settings(filenames={})
@@ -389,6 +399,7 @@ class TestArticlesGenerator(unittest.TestCase):
         for reader in readers.values():
             reader.read.assert_called_count == 0
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_ignore_cache(self):
         """Test that all the articles are read again when not loading cache
 
@@ -492,6 +503,7 @@ class TestPageGenerator(unittest.TestCase):
         self.assertEqual(sorted(pages_expected), sorted(pages))
         self.assertEqual(sorted(hidden_pages_expected), sorted(hidden_pages))
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_page_object_caching(self):
         """Test Page objects caching at the generator level"""
         settings = get_settings(filenames={})
@@ -512,6 +524,7 @@ class TestPageGenerator(unittest.TestCase):
         generator.generate_context()
         generator.readers.read_file.assert_called_count == 0
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_reader_content_caching(self):
         """Test raw content caching at the reader level"""
         settings = get_settings(filenames={})
@@ -534,6 +547,7 @@ class TestPageGenerator(unittest.TestCase):
         for reader in readers.values():
             reader.read.assert_called_count == 0
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_ignore_cache(self):
         """Test that all the pages are read again when not loading cache
 
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index c108bc52..4ace5ccc 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -26,6 +26,12 @@ try:
 except ImportError:
     BeautifulSoup = False  # NOQA
 
+try:
+    import bs4.builder._lxml as LXML
+except ImportError:
+    LXML = False
+
+
 
 @skipIfNoExecutable(['pandoc', '--version'])
 @unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
@@ -302,6 +308,7 @@ class TestBuildHeader(unittest.TestCase):
 
 
 @unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
+@unittest.skipUnless(LXML, 'Needs lxml module')
 class TestWordpressXMLAttachements(unittest.TestCase):
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
diff --git a/pelican/tests/test_rstdirectives.py b/pelican/tests/test_rstdirectives.py
index ae863b30..7c5f8adf 100644
--- a/pelican/tests/test_rstdirectives.py
+++ b/pelican/tests/test_rstdirectives.py
@@ -1,9 +1,15 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, print_function
-
-from mock import Mock
+try:
+    from unittest.mock import Mock
+except ImportError:
+    try:
+        from mock import Mock
+    except ImportError:
+        Mock = False
 from pelican.tests.support import unittest
 
+@unittest.skipUnless(Mock, 'Needs Mock module')
 class Test_abbr_role(unittest.TestCase):
     def call_it(self, text):
         from pelican.rstdirectives import abbr_role

From f864418b9e1af0a980052dc4c7d51519c57e3649 Mon Sep 17 00:00:00 2001
From: "Daniel M. Drucker" <dmd@3e.org>
Date: Mon, 13 Apr 2015 11:12:52 -0400
Subject: [PATCH 1764/2864] make the quickstart work

The quickstart was worded confusingly - it said "from your project directory", which implied doing a `cd ..` down to the `projects` dir, which would cause `pelican content` to fail. In fact, you need to be in the `yoursite` directory, which is the directory that has the `content` directory in it.
---
 docs/quickstart.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index c4f5a897..ef5256c2 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -49,7 +49,7 @@ Given that this example article is in Markdown format, save it as
 Generate your site
 ------------------
 
-From your project directory, run the ``pelican`` command to generate your site::
+From your site directory, run the ``pelican`` command to generate your site::
 
     pelican content
 

From a45a917766089c9e733cf417f942a4b9c651a154 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Sat, 11 Apr 2015 15:02:53 +0200
Subject: [PATCH 1765/2864] test docs via travis

* move build environment into tox
* add new environment installing sphinx and testing for doc errors
* reorganize dependency installs for easier management
---
 .travis.yml          | 16 +++++++---------
 dev_requirements.txt |  3 ---
 tox.ini              | 29 +++++++++++++++++++++++------
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f5a7f04f..cc124ea4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,11 @@
 language: python
 python:
   - "2.7"
-  - "3.3"
-  - "3.4"
+env:
+  - TOX_ENV=docs
+  - TOX_ENV=py27
+  - TOX_ENV=py33
+  - TOX_ENV=py34
 addons:
   apt_packages:
     - pandoc
@@ -10,13 +13,8 @@ before_install:
   - sudo apt-get update -qq
   - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
-  - pip install .
-  - pip install -r dev_requirements.txt
-  - pip install nose-cov
-script: nosetests -sv --with-coverage --cover-package=pelican pelican
-after_success:
-  - pip install coveralls
-  - coveralls
+  - pip install tox
+script: tox -e $TOX_ENV
 notifications:
   irc:
     channels:
diff --git a/dev_requirements.txt b/dev_requirements.txt
index a7c10719..028cbebd 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -10,6 +10,3 @@ typogrify
 # To perform release
 bumpr==0.2.0
 wheel
-
-# For docs theme
-sphinx_rtd_theme
diff --git a/tox.ini b/tox.ini
index 5dd36c36..11b3cae8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,28 @@
-# This tests the unified codebase (py27, py33) of Pelican.
-# depends on some external libraries that aren't released yet.
-
 [tox]
-envlist = py27,py33,py34
+envlist = py27,py33,py34,docs
 
 [testenv]
-commands =
-    python -m unittest discover
+basepython =
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+usedevelop=True
 deps =
     -rdev_requirements.txt
+    nose
+    nose-cov
+    coveralls
+
+commands =
+    {envpython} --version
+    nosetests -sv --with-coverage --cover-package=pelican pelican
+    coveralls
+
+[testenv:docs]
+basepython = python2.7
+deps =
+    sphinx
+    sphinx_rtd_theme
+changedir = docs
+commands =
+    sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html

From 2e84e30ad38175819ef97103f9720693c0218fc7 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 14 Apr 2015 15:19:16 -0400
Subject: [PATCH 1766/2864] Fixes #1695: replace  with list comprehension for
 py3 compatibility

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 74633630..2f1129dc 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -162,7 +162,7 @@ def ask(question, answer=str_compat, default=None, l=None):
 
 def ask_timezone(question, default, tzurl):
     """Prompt for time zone and validate input"""
-    lower_tz = map(str.lower, pytz.all_timezones)
+    lower_tz = [tz.lower() for tz in pytz.all_timezones]
     while True:
         r = ask(question, str_compat, default)
         r = r.strip().replace(' ', '_').lower()

From 90a283bc44da299e0860dcc27516bfefe327fd56 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Thu, 16 Apr 2015 19:05:15 -0400
Subject: [PATCH 1767/2864] Fixes #1686: posixize paths in context['filenames']
 to fix windows issues

---
 pelican/generators.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 75bd6b2a..0ce6439d 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -22,7 +22,8 @@ from jinja2 import (Environment, FileSystemLoader, PrefixLoader, ChoiceLoader,
 from pelican.contents import Article, Draft, Page, Static, is_valid_content
 from pelican.readers import Readers
 from pelican.utils import (copy, process_translations, mkdir_p, DateFormatter,
-                           FileStampDataCacher, python_2_unicode_compatible)
+                           FileStampDataCacher, python_2_unicode_compatible,
+                           posixize_path)
 from pelican import signals
 
 
@@ -160,7 +161,7 @@ class Generator(object):
         (For example, one that was missing mandatory metadata.)
         The path argument is expected to be relative to self.path.
         """
-        self.context['filenames'][os.path.normpath(path)] = None
+        self.context['filenames'][posixize_path(os.path.normpath(path))] = None
 
     def _is_potential_source_path(self, path):
         """Return True if path was supposed to be used as a source file.
@@ -168,7 +169,7 @@ class Generator(object):
         before this method is called, even if they failed to process.)
         The path argument is expected to be relative to self.path.
         """
-        return os.path.normpath(path) in self.context['filenames']
+        return posixize_path(os.path.normpath(path)) in self.context['filenames']
 
     def _update_context(self, items):
         """Update the context with the given items from the currrent

From dceea3aabe36e206d014e2540f86572dcb7c8859 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Thu, 16 Apr 2015 19:16:23 -0400
Subject: [PATCH 1768/2864] Change URLWrapper.slug to a property

Main goal is to delay `slugify` call until `slug` is needed. `slugify`
can be expensive depending on the input string (see #1172). Changing it
to a property gives plugins time to place custom `slug`s before `name`
is unnecessarily slugified.

With this change, default behavior is same except the time slugification
happens. But if you set custom slug, `slugify` won't be used at all.

So, this is a partial solution to #1172. The rest, setting a custom slug,
would best be handled by a plugin.
---
 pelican/urlwrappers.py | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 06cfa2ab..60bc6a3a 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -13,12 +13,10 @@ logger = logging.getLogger(__name__)
 @functools.total_ordering
 class URLWrapper(object):
     def __init__(self, name, settings):
-        # next 2 lines are redundant with the setter of the name property
-        # but are here for clarity
         self.settings = settings
         self._name = name
-        self.slug = slugify(name, self.settings.get('SLUG_SUBSTITUTIONS', ()))
-        self.name = name
+        self._slug = None
+        self._slug_from_name = True
 
     @property
     def name(self):
@@ -27,11 +25,28 @@ class URLWrapper(object):
     @name.setter
     def name(self, name):
         self._name = name
-        self.slug = slugify(name, self.settings.get('SLUG_SUBSTITUTIONS', ()))
+        # if slug wasn't explicitly set, it needs to be regenerated from name
+        # so, changing name should reset slug for slugification
+        if self._slug_from_name:
+            self._slug = None
+
+    @property
+    def slug(self):
+        if self._slug is None:
+            self._slug = slugify(self.name,
+                                 self.settings.get('SLUG_SUBSTITUTIONS', ()))
+        return self._slug
+
+    @slug.setter
+    def slug(self, slug):
+        # if slug is expliticly set, changing name won't alter slug
+        self._slug_from_name = False
+        self._slug = slug
 
     def as_dict(self):
         d = self.__dict__
         d['name'] = self.name
+        d['slug'] = self.slug
         return d
 
     def __hash__(self):

From 9dd4080fe6162849aec0946cc8406b04da764157 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Mon, 20 Apr 2015 12:16:05 +0200
Subject: [PATCH 1769/2864] remove tag_cloud from core

---
 docs/settings.rst     | 47 -------------------------------------------
 pelican/generators.py | 32 ++---------------------------
 pelican/settings.py   |  2 --
 3 files changed, 2 insertions(+), 79 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 73837181..2eec1e50 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -620,53 +620,6 @@ This would cause the first page to be written to
 ``page/{number}`` directories.
 
 
-Tag cloud
-=========
-
-If you want to generate a tag cloud with all your tags, you can do so using the
-following settings.
-
-================================================    =====================================================
-Setting name (followed by default value)            What does it do?
-================================================    =====================================================
-``TAG_CLOUD_STEPS = 4``                             Count of different font sizes in the tag
-                                                    cloud.
-``TAG_CLOUD_MAX_ITEMS = 100``                       Maximum number of tags in the cloud.
-================================================    =====================================================
-
-The default theme does not include a tag cloud, but it is pretty easy to add one::
-
-    <ul class="tagcloud">
-        {% for tag in tag_cloud %}
-            <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li>
-        {% endfor %}
-    </ul>
-
-You should then also define CSS styles with appropriate classes (tag-1 to tag-N,
-where N matches ``TAG_CLOUD_STEPS``), tag-1 being the most frequent, and
-define a ``ul.tagcloud`` class with appropriate list-style to create the cloud.
-For example::
-
-    ul.tagcloud {
-      list-style: none;
-        padding: 0;
-    }
-
-    ul.tagcloud li {
-        display: inline-block;
-    }
-
-    li.tag-1 {
-        font-size: 150%;
-    }
-
-    li.tag-2 {
-        font-size: 120%;
-    }
-
-    ...
-
-
 Translations
 ============
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 75bd6b2a..672850d3 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -3,8 +3,6 @@ from __future__ import unicode_literals, print_function
 
 import os
 import six
-import math
-import random
 import logging
 import shutil
 import fnmatch
@@ -14,7 +12,7 @@ from codecs import open
 from collections import defaultdict
 from functools import partial
 from itertools import chain, groupby
-from operator import attrgetter, itemgetter
+from operator import attrgetter
 
 from jinja2 import (Environment, FileSystemLoader, PrefixLoader, ChoiceLoader,
                     BaseLoader, TemplateNotFound)
@@ -552,32 +550,6 @@ class ArticlesGenerator(CachingGenerator):
         self.dates.sort(key=attrgetter('date'),
                         reverse=self.context['NEWEST_FIRST_ARCHIVES'])
 
-        # create tag cloud
-        tag_cloud = defaultdict(int)
-        for article in self.articles:
-            for tag in getattr(article, 'tags', []):
-                tag_cloud[tag] += 1
-
-        tag_cloud = sorted(tag_cloud.items(), key=itemgetter(1), reverse=True)
-        tag_cloud = tag_cloud[:self.settings.get('TAG_CLOUD_MAX_ITEMS')]
-
-        tags = list(map(itemgetter(1), tag_cloud))
-        if tags:
-            max_count = max(tags)
-        steps = self.settings.get('TAG_CLOUD_STEPS')
-
-        # calculate word sizes
-        self.tag_cloud = [
-            (
-                tag,
-                int(math.floor(steps - (steps - 1) * math.log(count)
-                    / (math.log(max_count)or 1)))
-            )
-            for tag, count in tag_cloud
-        ]
-        # put words in chaos
-        random.shuffle(self.tag_cloud)
-
         # and generate the output :)
 
         # order the categories per name
@@ -589,7 +561,7 @@ class ArticlesGenerator(CachingGenerator):
         self.authors.sort()
 
         self._update_context(('articles', 'dates', 'tags', 'categories',
-                              'tag_cloud', 'authors', 'related_posts'))
+                              'authors', 'related_posts'))
         self.save_cache()
         self.readers.save_cache()
         signals.article_generator_finalized.send(self)
diff --git a/pelican/settings.py b/pelican/settings.py
index 0d69c08e..0c54e89b 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -93,8 +93,6 @@ DEFAULT_CONFIG = {
     'DAY_ARCHIVE_SAVE_AS': '',
     'RELATIVE_URLS': False,
     'DEFAULT_LANG': 'en',
-    'TAG_CLOUD_STEPS': 4,
-    'TAG_CLOUD_MAX_ITEMS': 100,
     'DIRECT_TEMPLATES': ['index', 'tags', 'categories', 'authors', 'archives'],
     'EXTRA_TEMPLATES_PATHS': [],
     'PAGINATED_DIRECT_TEMPLATES': ['index'],

From 3effe464c6a893c61d8a399f77531e14d348afd1 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Mon, 20 Apr 2015 16:36:18 +0200
Subject: [PATCH 1770/2864] add faq entry about tag-cloud outsourcing

---
 docs/faq.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index 86f12462..ff473624 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -241,3 +241,12 @@ purposes. This can be achieved by explicitly specifying only the
 filenames of those articles in ``ARTICLE_PATHS``. A list of such
 filenames could be found using a command similar to ``cd content;
 find -name '*.md' | head -n 10``.
+
+My tag-cloud is missing/broken since I upgraded Pelican
+=======================================================
+
+In an ongoing effort to steamline Pelican, `tag_cloud` generation has been
+moved out of the pelican core and into a separate `plugin
+<https://github.com/getpelican/pelican-plugins/tree/master/tag_cloud>`_.
+See the :ref:`plugins` documentation further information about the
+Pelican plugin system.

From d6ebf772e3fa90910714e06cd9f5529cc2956df0 Mon Sep 17 00:00:00 2001
From: Matthew Scott <matt@11craft.com>
Date: Thu, 23 Apr 2015 13:30:24 -0500
Subject: [PATCH 1771/2864] Allow `--path` even when using a virtualenv project

---
 pelican/tools/pelican_quickstart.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 2f1129dc..58da4649 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -59,6 +59,13 @@ if six.PY3:
 else:
     str_compat = unicode
 
+# Create a 'marked' default path, to determine if someone has supplied
+# a path on the command-line.
+class _DEFAULT_PATH_TYPE(str_compat):
+    is_default_path = True
+
+_DEFAULT_PATH = _DEFAULT_PATH_TYPE(os.curdir)
+
 def decoding_strings(f):
     def wrapper(*args, **kwargs):
         out = f(*args, **kwargs)
@@ -178,7 +185,7 @@ def main():
     parser = argparse.ArgumentParser(
         description="A kickstarter for Pelican",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-    parser.add_argument('-p', '--path', default=os.curdir,
+    parser.add_argument('-p', '--path', default=_DEFAULT_PATH,
             help="The path to generate the blog into")
     parser.add_argument('-t', '--title', metavar="title",
             help='Set the title of the website')
@@ -200,7 +207,8 @@ needed by Pelican.
 
     project = os.path.join(
         os.environ.get('VIRTUAL_ENV', os.curdir), '.project')
-    if os.path.isfile(project):
+    no_path_was_specified = hasattr(args.path, 'is_default_path')
+    if os.path.isfile(project) and no_path_was_specified:
         CONF['basedir'] = open(project, 'r').read().rstrip("\n")
         print('Using project associated with current virtual environment.'
               'Will save to:\n%s\n' % CONF['basedir'])

From df5495303257d0809139f418db0e9b2607917830 Mon Sep 17 00:00:00 2001
From: Ingmar Steen <iksteen@gmail.com>
Date: Wed, 29 Apr 2015 15:08:46 +0200
Subject: [PATCH 1772/2864] Fix intra-site links to drafts.

Overwrite an article's source path registration when it is
'upgraded' to a draft.

Fixes #865
---
 pelican/generators.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/generators.py b/pelican/generators.py
index 75bd6b2a..e95ec3ab 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -525,6 +525,7 @@ class ArticlesGenerator(CachingGenerator):
                     preread_sender=self,
                     context_signal=signals.article_generator_context,
                     context_sender=self)
+                self.add_source_path(draft)
                 all_drafts.append(draft)
             else:
                 logger.error("Unknown status '%s' for file %s, skipping it.",

From 264d75b9e04c4aa517a0bfd14473dfe78ee06d2f Mon Sep 17 00:00:00 2001
From: Forest <web11.forest@tibit.com>
Date: Fri, 8 May 2015 13:39:59 -0700
Subject: [PATCH 1773/2864] Clarify STATIC_EXCLUDE_SOURCES documentatoin.

---
 docs/settings.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 73837181..a18e24bf 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -159,7 +159,12 @@ Setting name (followed by default value, if any)
                                                                                  Pelican's default settings include the "images" directory here.
 ``STATIC_EXCLUDES = []``                                                         A list of directories to exclude when looking for static files.
 ``STATIC_EXCLUDE_SOURCES = True``                                                If set to False, content source files will not be skipped when
-                                                                                 copying files found in ``STATIC_PATHS``.
+                                                                                 copying files found in ``STATIC_PATHS``. This setting is for
+                                                                                 backward compatibility with Pelican releases before version 3.5.
+                                                                                 It has no effect unless ``STATIC_PATHS`` contains a directory that
+                                                                                 is also in ``ARTICLE_PATHS`` or ``PAGE_PATHS``. If you are trying
+                                                                                 to publish your site's source files, consider using the
+                                                                                 ``OUTPUT_SOURCES` setting instead.
 ``TIMEZONE``                                                                     The timezone used in the date information, to
                                                                                  generate Atom and RSS feeds. See the *Timezone*
                                                                                  section below for more info.

From 2f048d365222edd98119dfc9366e202008e5b57f Mon Sep 17 00:00:00 2001
From: Forest <web11.forest@tibit.com>
Date: Sat, 9 May 2015 21:20:07 -0700
Subject: [PATCH 1774/2864] Add backtick missing from my last docs commit.

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index a18e24bf..330ec2a6 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -164,7 +164,7 @@ Setting name (followed by default value, if any)
                                                                                  It has no effect unless ``STATIC_PATHS`` contains a directory that
                                                                                  is also in ``ARTICLE_PATHS`` or ``PAGE_PATHS``. If you are trying
                                                                                  to publish your site's source files, consider using the
-                                                                                 ``OUTPUT_SOURCES` setting instead.
+                                                                                 ``OUTPUT_SOURCES`` setting instead.
 ``TIMEZONE``                                                                     The timezone used in the date information, to
                                                                                  generate Atom and RSS feeds. See the *Timezone*
                                                                                  section below for more info.

From ab2dc71d34f0b3387afafb9251b0f6c0cae3998e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro>
Date: Tue, 12 May 2015 02:55:45 +0300
Subject: [PATCH 1775/2864] Improve internal error reporting. Fixes #1717.

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 056c45ef..12da111a 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -444,7 +444,7 @@ def main():
 
                 except Exception as e:
                     if (args.verbosity == logging.DEBUG):
-                        logger.critical(e.args)
+                        logger.critical('Internal failure: %r', e, exc_info=True)
                         raise
                     logger.warning(
                         'Caught exception "%s". Reloading.', e)

From e10ae8a187876b7954d38d1968c0c8f8b6606e22 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Wed, 13 May 2015 21:08:39 +0200
Subject: [PATCH 1776/2864] make tox 2 compatible

---
 .travis.yml | 2 +-
 tox.ini     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cc124ea4..5d7d4a5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ before_install:
   - sudo apt-get update -qq
   - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
-  - pip install tox
+  - pip install tox==2.0.1
 script: tox -e $TOX_ENV
 notifications:
   irc:
diff --git a/tox.ini b/tox.ini
index 11b3cae8..775241b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
-envlist = py27,py33,py34,docs
+envlist = py{27,33,34},docs
 
 [testenv]
 basepython =
     py27: python2.7
     py33: python3.3
     py34: python3.4
+passenv = *
 usedevelop=True
 deps =
     -rdev_requirements.txt

From f8f89a84761ede361fd97b15d96f0a7cdbef2c31 Mon Sep 17 00:00:00 2001
From: Alex Chan <alex@alexwlchan.net>
Date: Sun, 24 May 2015 12:58:00 +0100
Subject: [PATCH 1777/2864] Fix spelling mistakes in docs

---
 docs/pelican-themes.rst | 6 +++---
 docs/themes.rst         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index 7090c648..e18ebadf 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -130,11 +130,11 @@ This is useful for theme development:
     $ sudo pelican-themes -s ~/Dev/Python/pelican-themes/two-column
     $ pelican ~/Blog/content -o /tmp/out -t two-column
     $ firefox /tmp/out/index.html
-    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/static/css/main.css
+    $ vim ~/Dev/Pelican/pelican-themes/two-column/static/css/main.css
     $ pelican ~/Blog/content -o /tmp/out -t two-column
-    $ cp /tmp/bg.png ~/Dev/Pelican/pelican-themes/two-coumn/static/img/bg.png
+    $ cp /tmp/bg.png ~/Dev/Pelican/pelican-themes/two-column/static/img/bg.png
     $ pelican ~/Blog/content -o /tmp/out -t two-column
-    $ vim ~/Dev/Pelican/pelican-themes/two-coumn/templates/index.html
+    $ vim ~/Dev/Pelican/pelican-themes/two-column/templates/index.html
     $ pelican ~/Blog/content -o /tmp/out -t two-column
 
 
diff --git a/docs/themes.rst b/docs/themes.rst
index 7f2693ff..d64683bb 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -359,7 +359,7 @@ default_template        Default template name.
 in_default_lang         Boolean representing if the article is written
                         in the default language.
 lang                    Language of the article.
-locale_date             Date formated by the `date_format`.
+locale_date             Date formatted by the `date_format`.
 metadata                Article header metadata `dict`.
 save_as                 Location to save the article page.
 slug                    Page slug.
@@ -414,7 +414,7 @@ default_template        Default template name.
 in_default_lang         Boolean representing if the article is written
                         in the default language.
 lang                    Language of the article.
-locale_date             Date formated by the `date_format`.
+locale_date             Date formatted by the `date_format`.
 metadata                Page header metadata `dict`.
 save_as                 Location to save the page.
 slug                    Page slug.

From 641b3ffa71801eb5e4f5b818e925021f2287f699 Mon Sep 17 00:00:00 2001
From: Alex Chan <alex@alexwlchan.net>
Date: Sun, 24 May 2015 13:04:35 +0100
Subject: [PATCH 1778/2864] Fix capitalisation of WordPress

---
 docs/changelog.rst              | 2 +-
 pelican/tools/pelican_import.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 52367cec..4e297562 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -205,7 +205,7 @@ Release history
 2.5 (2010-11-20)
 ==================
 
-* Import from Wordpress
+* Import from WordPress
 * Added some new themes (martyalchin / wide-notmyidea)
 * First bug report!
 * Linkedin support
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index a6424ace..92e8c919 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -101,12 +101,12 @@ def decode_wp_content(content, br=True):
     return content
 
 def get_items(xml):
-    """Opens a wordpress xml file and returns a list of items"""
+    """Opens a WordPress xml file and returns a list of items"""
     try:
         from bs4 import BeautifulSoup
     except ImportError:
         error = ('Missing dependency '
-                 '"BeautifulSoup4" and "lxml" required to import Wordpress XML files.')
+                 '"BeautifulSoup4" and "lxml" required to import WordPress XML files.')
         sys.exit(error)
     with open(xml, encoding='utf-8') as infile:
         xmlfile = infile.read()
@@ -586,7 +586,7 @@ def get_attachments(xml):
     return attachedposts
 
 def download_attachments(output_path, urls):
-    """Downloads wordpress attachments and returns a list of paths to
+    """Downloads WordPress attachments and returns a list of paths to
     attachments that can be associated with a post (relative path to output
     directory). Files that fail to download, will not be added to posts"""
     locations = []

From 77ebd05fce1176f0f4c9cd2e48ffa47fb30d1901 Mon Sep 17 00:00:00 2001
From: Jonathan Sundqvist <sundqvist.jonathan@gmail.com>
Date: Sun, 24 May 2015 16:59:23 +0100
Subject: [PATCH 1779/2864] Actually stopping server

When running `make devserver` and then running `make stopserver` it doesn't stop the server. This patch fixes that.
---
 pelican/tools/templates/Makefile.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 5e3635c3..b97fbe43 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -92,8 +92,7 @@ else
 endif
 
 stopserver:
-	kill -9 `cat pelican.pid`
-	kill -9 `cat srv.pid`
+	$(BASEDIR)/develop_server.sh stop
 	@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
 
 publish:

From 940eb76b7f70b1c9c7f833d5328d44cb19bde406 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 2 Jun 2015 08:35:12 -0700
Subject: [PATCH 1780/2864] Load external resources via HTTPS when available

This replaces all `http://` and `//:` links with `https:`. The protocol-
relative URL scheme is now deemed to be an anti-pattern. There are
security advantages to using HTTPS, and there are no significant
performance concerns.

In short, if the asset we need is available via HTTPS, then that asset
should always be loaded via HTTPS.

Fixes #1736
---
 pelican/tests/output/basic/a-markdown-powered-article.html  | 2 +-
 pelican/tests/output/basic/archives.html                    | 2 +-
 pelican/tests/output/basic/article-1.html                   | 2 +-
 pelican/tests/output/basic/article-2.html                   | 2 +-
 pelican/tests/output/basic/article-3.html                   | 2 +-
 pelican/tests/output/basic/author/alexis-metaireau.html     | 2 +-
 pelican/tests/output/basic/authors.html                     | 2 +-
 pelican/tests/output/basic/categories.html                  | 2 +-
 pelican/tests/output/basic/category/bar.html                | 2 +-
 pelican/tests/output/basic/category/cat1.html               | 2 +-
 pelican/tests/output/basic/category/misc.html               | 2 +-
 pelican/tests/output/basic/category/yeah.html               | 2 +-
 pelican/tests/output/basic/filename_metadata-example.html   | 2 +-
 pelican/tests/output/basic/index.html                       | 2 +-
 pelican/tests/output/basic/oh-yeah.html                     | 2 +-
 pelican/tests/output/basic/override/index.html              | 2 +-
 .../output/basic/pages/this-is-a-test-hidden-page.html      | 2 +-
 pelican/tests/output/basic/pages/this-is-a-test-page.html   | 2 +-
 pelican/tests/output/basic/second-article-fr.html           | 2 +-
 pelican/tests/output/basic/second-article.html              | 2 +-
 pelican/tests/output/basic/tag/bar.html                     | 2 +-
 pelican/tests/output/basic/tag/baz.html                     | 2 +-
 pelican/tests/output/basic/tag/foo.html                     | 2 +-
 pelican/tests/output/basic/tag/foobar.html                  | 2 +-
 pelican/tests/output/basic/tag/oh.html                      | 2 +-
 pelican/tests/output/basic/tag/yeah.html                    | 2 +-
 pelican/tests/output/basic/tags.html                        | 2 +-
 pelican/tests/output/basic/theme/css/main.css               | 2 +-
 pelican/tests/output/basic/this-is-a-super-article.html     | 2 +-
 pelican/tests/output/basic/unbelievable.html                | 2 +-
 pelican/tests/output/custom/a-markdown-powered-article.html | 6 +++---
 pelican/tests/output/custom/archives.html                   | 6 +++---
 pelican/tests/output/custom/article-1.html                  | 6 +++---
 pelican/tests/output/custom/article-2.html                  | 6 +++---
 pelican/tests/output/custom/article-3.html                  | 6 +++---
 pelican/tests/output/custom/author/alexis-metaireau.html    | 6 +++---
 pelican/tests/output/custom/author/alexis-metaireau2.html   | 6 +++---
 pelican/tests/output/custom/author/alexis-metaireau3.html   | 6 +++---
 pelican/tests/output/custom/authors.html                    | 6 +++---
 pelican/tests/output/custom/categories.html                 | 6 +++---
 pelican/tests/output/custom/category/bar.html               | 6 +++---
 pelican/tests/output/custom/category/cat1.html              | 6 +++---
 pelican/tests/output/custom/category/misc.html              | 6 +++---
 pelican/tests/output/custom/category/yeah.html              | 6 +++---
 pelican/tests/output/custom/drafts/a-draft-article.html     | 6 +++---
 pelican/tests/output/custom/filename_metadata-example.html  | 6 +++---
 pelican/tests/output/custom/index.html                      | 6 +++---
 pelican/tests/output/custom/index2.html                     | 6 +++---
 pelican/tests/output/custom/index3.html                     | 6 +++---
 pelican/tests/output/custom/jinja2_template.html            | 6 +++---
 pelican/tests/output/custom/oh-yeah-fr.html                 | 6 +++---
 pelican/tests/output/custom/oh-yeah.html                    | 6 +++---
 pelican/tests/output/custom/override/index.html             | 6 +++---
 .../output/custom/pages/this-is-a-test-hidden-page.html     | 6 +++---
 pelican/tests/output/custom/pages/this-is-a-test-page.html  | 6 +++---
 pelican/tests/output/custom/second-article-fr.html          | 6 +++---
 pelican/tests/output/custom/second-article.html             | 6 +++---
 pelican/tests/output/custom/tag/bar.html                    | 6 +++---
 pelican/tests/output/custom/tag/baz.html                    | 6 +++---
 pelican/tests/output/custom/tag/foo.html                    | 6 +++---
 pelican/tests/output/custom/tag/foobar.html                 | 6 +++---
 pelican/tests/output/custom/tag/oh.html                     | 6 +++---
 pelican/tests/output/custom/tag/yeah.html                   | 6 +++---
 pelican/tests/output/custom/tags.html                       | 6 +++---
 pelican/tests/output/custom/theme/css/main.css              | 2 +-
 pelican/tests/output/custom/this-is-a-super-article.html    | 6 +++---
 pelican/tests/output/custom/unbelievable.html               | 6 +++---
 pelican/tests/output/custom_locale/archives.html            | 6 +++---
 .../tests/output/custom_locale/author/alexis-metaireau.html | 6 +++---
 .../output/custom_locale/author/alexis-metaireau2.html      | 6 +++---
 .../output/custom_locale/author/alexis-metaireau3.html      | 6 +++---
 pelican/tests/output/custom_locale/authors.html             | 6 +++---
 pelican/tests/output/custom_locale/categories.html          | 6 +++---
 pelican/tests/output/custom_locale/category/bar.html        | 6 +++---
 pelican/tests/output/custom_locale/category/cat1.html       | 6 +++---
 pelican/tests/output/custom_locale/category/misc.html       | 6 +++---
 pelican/tests/output/custom_locale/category/yeah.html       | 6 +++---
 .../tests/output/custom_locale/drafts/a-draft-article.html  | 6 +++---
 pelican/tests/output/custom_locale/index.html               | 6 +++---
 pelican/tests/output/custom_locale/index2.html              | 6 +++---
 pelican/tests/output/custom_locale/index3.html              | 6 +++---
 pelican/tests/output/custom_locale/jinja2_template.html     | 6 +++---
 pelican/tests/output/custom_locale/oh-yeah-fr.html          | 6 +++---
 pelican/tests/output/custom_locale/override/index.html      | 6 +++---
 .../custom_locale/pages/this-is-a-test-hidden-page.html     | 6 +++---
 .../output/custom_locale/pages/this-is-a-test-page.html     | 6 +++---
 .../2010/décembre/02/this-is-a-super-article/index.html     | 6 +++---
 .../posts/2010/octobre/15/unbelievable/index.html           | 6 +++---
 .../custom_locale/posts/2010/octobre/20/oh-yeah/index.html  | 6 +++---
 .../2011/avril/20/a-markdown-powered-article/index.html     | 6 +++---
 .../posts/2011/février/17/article-1/index.html              | 6 +++---
 .../posts/2011/février/17/article-2/index.html              | 6 +++---
 .../posts/2011/février/17/article-3/index.html              | 6 +++---
 .../posts/2012/février/29/second-article/index.html         | 6 +++---
 .../2012/novembre/30/filename_metadata-example/index.html   | 6 +++---
 pelican/tests/output/custom_locale/second-article-fr.html   | 6 +++---
 pelican/tests/output/custom_locale/tag/bar.html             | 6 +++---
 pelican/tests/output/custom_locale/tag/baz.html             | 6 +++---
 pelican/tests/output/custom_locale/tag/foo.html             | 6 +++---
 pelican/tests/output/custom_locale/tag/foobar.html          | 6 +++---
 pelican/tests/output/custom_locale/tag/oh.html              | 6 +++---
 pelican/tests/output/custom_locale/tag/yeah.html            | 6 +++---
 pelican/tests/output/custom_locale/tags.html                | 6 +++---
 pelican/tests/output/custom_locale/theme/css/main.css       | 2 +-
 pelican/themes/notmyidea/static/css/main.css                | 2 +-
 pelican/themes/notmyidea/templates/analytics.html           | 2 +-
 pelican/themes/notmyidea/templates/base.html                | 2 +-
 pelican/themes/notmyidea/templates/disqus_script.html       | 2 +-
 pelican/themes/notmyidea/templates/github.html              | 4 ++--
 pelican/themes/notmyidea/templates/twitter.html             | 2 +-
 pelican/themes/simple/templates/gosquared.html              | 2 +-
 111 files changed, 256 insertions(+), 256 deletions(-)

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 5fcc42a9..dd92d691 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index f8f1a67f..27b7c862 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 4ea7f4e3..b09eef79 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 45130e55..e340a4f6 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 8603430f..08bf4fc1 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 11d54185..eeca537a 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index 20df01d2..288543b5 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 55e955c8..9a6682c0 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 18e434cb..d3eb38da 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index f99eb497..f21bc9ab 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index fc724edb..0368793e 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 7fe75a86..09db53bc 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 638c65dd..9f492fc2 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index f3814b00..3066172d 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 76be69fe..caeb8ddb 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index ed9fa92a..d98009a2 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index ac31987a..b98f0008 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index 43e5f72e..282fe965 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 551027da..c13acce6 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index ed350752..e9a5b14c 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 5331767b..c461cac5 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index dc26d8e1..7961b19f 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index aed3ad17..1a97fd4a 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 540cde25..891b6866 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index ef876b8d..61148527 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index b8da2bc6..bd5ff204 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index 0eda47d7..44b45591 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 9d7221a2..03a77e69 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -12,7 +12,7 @@
 @import url("reset.css");
 @import url("pygment.css");
 @import url("typogrify.css");
-@import url(//fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+@import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
 
 /***** Global *****/
 /* Body */
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index cf957ebf..1fe944eb 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index b9b52031..dfb0c54e 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -7,7 +7,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 577d61b8..59ffa4d1 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -107,7 +107,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 13c3d980..e238b73d 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -92,7 +92,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index dea09247..1fbd6719 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 8d8ad1b3..d62ddd14 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 7539e0f9..c862a0c2 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index cb6d93a9..cbeb0555 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -165,7 +165,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index abf5bdbb..6357bfb3 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -179,7 +179,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 30aa3eff..54c768ac 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -130,7 +130,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index d9aaef34..f157de26 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -74,7 +74,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 17d9de76..ddb1377b 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -72,7 +72,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 9ab46a2e..0bc5b02e 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -93,7 +93,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 76075edf..237943d7 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -162,7 +162,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 3a470b7e..5fcde24b 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -173,7 +173,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index a632664f..127eac13 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -101,7 +101,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 15a3f1db..963722f6 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -92,7 +92,7 @@ listed anywhere else.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 047f12af..cf4fc782 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index c375b208..284bd0f4 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -165,7 +165,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 1f2479d6..7e5b7230 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -179,7 +179,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index e7e4f34a..1dab4e7d 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -130,7 +130,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 0eafa913..21f678f9 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -69,7 +69,7 @@ Some text
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index fa02ac2b..d457b1bf 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -108,7 +108,7 @@ Translations:
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 6d108cf2..235a4903 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -113,7 +113,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index e84d79fe..3753ba84 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -73,7 +73,7 @@ at a custom location.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index dced8107..f8c06b1f 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -73,7 +73,7 @@ Anyone can see this page but it's not linked to anywhere!</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 46ea4fef..a4b171c9 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -73,7 +73,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 6c537609..42289377 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -108,7 +108,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 30179205..689b1203 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -108,7 +108,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 28cbbe75..2e0d047c 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -152,7 +152,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 06f3c301..2c9b1d08 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index ba3c843e..7c38c24c 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -122,7 +122,7 @@ as well as <strong>inline markup</strong>.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index dc51889a..42705281 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -101,7 +101,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 21c8e352..855d1f8b 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -72,7 +72,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 3b09c6c5..4d7b506b 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -93,7 +93,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index ba8d53a4..23f70c0f 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -79,7 +79,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 9d7221a2..03a77e69 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -12,7 +12,7 @@
 @import url("reset.css");
 @import url("pygment.css");
 @import url("typogrify.css");
-@import url(//fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+@import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
 
 /***** Global *****/
 /* Body */
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 34ab434e..e370769c 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -121,7 +121,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 395cd1b6..2e51cf07 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -138,7 +138,7 @@ pelican.conf, it will have nothing in default.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index 1336b487..68b46b14 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -92,7 +92,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 1882015e..f8b36655 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -165,7 +165,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index d1b50107..5d9e6c3c 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -179,7 +179,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 333ef320..66575c71 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -130,7 +130,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index 2558c4d8..91ea479d 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -74,7 +74,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 17d9de76..ddb1377b 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -72,7 +72,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index fc11f06e..7c8f947d 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -93,7 +93,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index e1556d9e..25bc6179 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -162,7 +162,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 3ff2f8e4..8062c0d6 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -173,7 +173,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 7ee2bbe9..d36c1608 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -101,7 +101,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index a33e6797..dfd4f00e 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -92,7 +92,7 @@ listed anywhere else.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index d64bea7d..3ad201de 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -165,7 +165,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 3b3d2d52..bbd1efd0 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -179,7 +179,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 96d70261..49f70ba2 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -130,7 +130,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index 0eafa913..21f678f9 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -69,7 +69,7 @@ Some text
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 77d9e2c5..f5cae7cf 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -108,7 +108,7 @@ Translations:
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index e84d79fe..3753ba84 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -73,7 +73,7 @@ at a custom location.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index dced8107..f8c06b1f 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -73,7 +73,7 @@ Anyone can see this page but it's not linked to anywhere!</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index 46ea4fef..a4b171c9 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -73,7 +73,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index b2ffdf9c..def80358 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../../../../../">Alexis' log </a></h1>
@@ -121,7 +121,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index d7449ebf..a6ea8699 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../../../../../">Alexis' log </a></h1>
@@ -138,7 +138,7 @@ pelican.conf, it will have nothing in default.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index 12c67404..59fd6edd 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../../../../../">Alexis' log </a></h1>
@@ -113,7 +113,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 81bb6fa6..e6d585ff 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../../../../../">Alexis' log </a></h1>
@@ -107,7 +107,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index 8aa9de4a..d768e15f 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../../../../../">Alexis' log </a></h1>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index 1d78ade5..b223473a 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../../../../../">Alexis' log </a></h1>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index 372090cc..3bd59fa5 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../../../../../">Alexis' log </a></h1>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 812fdfd0..aff4d61f 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../../../../../">Alexis' log </a></h1>
@@ -108,7 +108,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index de426279..659004bd 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../../../../../">Alexis' log </a></h1>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 07a2a09c..79fb5406 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -108,7 +108,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index 911f53af..8ba1aed2 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -152,7 +152,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 1cea44d1..597199e7 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 01bb8b17..ed67ede0 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -122,7 +122,7 @@ as well as <strong>inline markup</strong>.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 85b2b0ed..a569b526 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -101,7 +101,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index 21c8e352..855d1f8b 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -72,7 +72,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 45789e86..ba767748 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
@@ -93,7 +93,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index 0da0d291..aa182ab6 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -8,13 +8,13 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
 <body id="index" class="home">
 <a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
@@ -79,7 +79,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
index 9d7221a2..03a77e69 100644
--- a/pelican/tests/output/custom_locale/theme/css/main.css
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -12,7 +12,7 @@
 @import url("reset.css");
 @import url("pygment.css");
 @import url("typogrify.css");
-@import url(//fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+@import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
 
 /***** Global *****/
 /* Body */
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 9d7221a2..03a77e69 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -12,7 +12,7 @@
 @import url("reset.css");
 @import url("pygment.css");
 @import url("typogrify.css");
-@import url(//fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+@import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
 
 /***** Global *****/
 /* Body */
diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
index e27adf82..465754e2 100644
--- a/pelican/themes/notmyidea/templates/analytics.html
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -5,7 +5,7 @@
     _gaq.push(['_trackPageview']);
     (function() {
         var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        ga.src = 'https://ssl.google-analytics.com/ga.js';
         var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
     </script>
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index d6b4cb35..45ab4044 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -12,7 +12,7 @@
         {% endif %}
 
         <!--[if IE]>
-            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 </head>
 
diff --git a/pelican/themes/notmyidea/templates/disqus_script.html b/pelican/themes/notmyidea/templates/disqus_script.html
index 4ee419bb..23ec532a 100644
--- a/pelican/themes/notmyidea/templates/disqus_script.html
+++ b/pelican/themes/notmyidea/templates/disqus_script.html
@@ -4,7 +4,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/themes/notmyidea/templates/github.html b/pelican/themes/notmyidea/templates/github.html
index 75592ac6..ccc401fe 100644
--- a/pelican/themes/notmyidea/templates/github.html
+++ b/pelican/themes/notmyidea/templates/github.html
@@ -1,9 +1,9 @@
 {% if GITHUB_URL %}
 <a href="{{ GITHUB_URL }}">
 {% if GITHUB_POSITION != "left" %}
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 {% else %}
-<img style="position: absolute; top: 0; left: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_left_white_ffffff.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; left: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_left_white_ffffff.png" alt="Fork me on GitHub" />
 {% endif %}
 </a>
 {% endif %}
diff --git a/pelican/themes/notmyidea/templates/twitter.html b/pelican/themes/notmyidea/templates/twitter.html
index 7247a0c6..bf78c32d 100644
--- a/pelican/themes/notmyidea/templates/twitter.html
+++ b/pelican/themes/notmyidea/templates/twitter.html
@@ -1,3 +1,3 @@
 {% if TWITTER_USERNAME %}
-<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
+<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="https://platform.twitter.com/widgets.js"></script>
 {% endif %}
diff --git a/pelican/themes/simple/templates/gosquared.html b/pelican/themes/simple/templates/gosquared.html
index f47efcf4..49ccbbef 100644
--- a/pelican/themes/simple/templates/gosquared.html
+++ b/pelican/themes/simple/templates/gosquared.html
@@ -5,7 +5,7 @@
     (function(w){
         function gs(){
             w._gstc_lt=+(new Date); var d=document;
-            var g = d.createElement("script"); g.type = "text/javascript"; g.async = true; g.src = "//d1l6p2sc9645hc.cloudfront.net/tracker.js";
+            var g = d.createElement("script"); g.type = "text/javascript"; g.async = true; g.src = "https://d1l6p2sc9645hc.cloudfront.net/tracker.js";
             var s = d.getElementsByTagName("script")[0]; s.parentNode.insertBefore(g, s);
         }
         w.addEventListener?w.addEventListener("load",gs,false):w.attachEvent("onload",gs);

From 39fd4936b59bdf92734880eee76a7f0a10a05f39 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Wed, 3 Jun 2015 08:58:59 +0200
Subject: [PATCH 1781/2864] improve result output of a pelican run

*  display count of hidden pages
*  pluralize only if necessary
*  add maybe_pluralize to utils
*  add tests for maybe_pluralize
---
 pelican/__init__.py         | 35 ++++++++++++++++++++++++++++-------
 pelican/tests/test_utils.py |  6 ++++++
 pelican/utils.py            | 16 ++++++++++++++++
 3 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 12da111a..de320897 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -22,7 +22,8 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 TemplatePagesGenerator)
 from pelican.readers import Readers
 from pelican.settings import read_settings
-from pelican.utils import clean_output_dir, folder_watcher, file_watcher
+from pelican.utils import (clean_output_dir, folder_watcher,
+                           file_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
 __version__ = "3.5.0"
@@ -183,12 +184,32 @@ class Pelican(object):
         pages_generator = next(g for g in generators
                                if isinstance(g, PagesGenerator))
 
-        print('Done: Processed {} article(s), {} draft(s) and {} page(s) in ' \
-              '{:.2f} seconds.'.format(
-            len(articles_generator.articles) + len(articles_generator.translations),
-            len(articles_generator.drafts) + \
-            len(articles_generator.drafts_translations),
-            len(pages_generator.pages) + len(pages_generator.translations),
+        pluralized_articles = maybe_pluralize(
+            len(articles_generator.articles) +
+                len(articles_generator.translations),
+            'article',
+            'articles')
+        pluralized_drafts = maybe_pluralize(
+            len(articles_generator.drafts) +
+                len(articles_generator.drafts_translations),
+            'draft',
+            'drafts')
+        pluralized_pages = maybe_pluralize(
+            len(pages_generator.pages) +
+                len(pages_generator.translations),
+            'page',
+            'pages')
+        pluralized_hidden_pages = maybe_pluralize(
+            len(pages_generator.hidden_pages) +
+                len(pages_generator.hidden_translations),
+            'hidden page',
+            'hidden pages')
+
+        print('Done: Processed {}, {}, {} and {} in {:.2f} seconds.'.format(
+            pluralized_articles,
+            pluralized_drafts,
+            pluralized_pages,
+            pluralized_hidden_pages,
             time.time() - start_time))
 
     def get_generator_classes(self):
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index c6550459..f5a60584 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -358,6 +358,12 @@ class TestUtils(LoggedTestCase):
         locale.setlocale(locale.LC_ALL, old_locale)
 
 
+    def test_maybe_pluralize(self):
+        self.assertEqual(utils.maybe_pluralize(0, 'Article', 'Articles'), '0 Articles')
+        self.assertEqual(utils.maybe_pluralize(1, 'Article', 'Articles'), '1 Article')
+        self.assertEqual(utils.maybe_pluralize(2, 'Article', 'Articles'), '2 Articles')
+
+
 class TestCopy(unittest.TestCase):
     '''Tests the copy utility'''
 
diff --git a/pelican/utils.py b/pelican/utils.py
index caac8e61..f8f52206 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -767,3 +767,19 @@ def path_to_file_url(path):
     '''Convert file-system path to file:// URL'''
     return six.moves.urllib_parse.urljoin(
         "file://", six.moves.urllib.request.pathname2url(path))
+
+
+def maybe_pluralize(count, singular, plural):
+    '''
+    Returns a formatted string containing count and plural if count is not 1
+    Returns count and singular if count is 1
+
+    maybe_pluralize(0, 'Article', 'Articles') -> '0 Articles'
+    maybe_pluralize(1, 'Article', 'Articles') -> '1 Article'
+    maybe_pluralize(2, 'Article', 'Articles') -> '2 Articles'
+
+    '''
+    selection = plural
+    if count == 1:
+        selection = singular
+    return '{} {}'.format(count, selection)

From 551909893ef663c602a6562b18d96ec3f33a3c81 Mon Sep 17 00:00:00 2001
From: Steven Maude <git@stevenmaude.co.uk>
Date: Thu, 28 May 2015 22:01:05 +0100
Subject: [PATCH 1782/2864] Document how to use a publish configuration

Explain how to import settings from pelicanconf.py into publishconf.py.
---
 docs/publish.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/publish.rst b/docs/publish.rst
index 8c7d4c19..309e8b42 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -61,6 +61,15 @@ feeds, etc.) that you may have defined::
 
     pelican content -s publishconf.py
 
+To base your publish configuration on top of your ``pelicanconf.py``, you
+can import your ``pelicanconf`` settings by including the following line in
+your ``publishconf.py``::
+
+    from pelicanconf import *
+
+If you have generated a ``publishconf.py`` using ``pelican-quickstart``,
+this line is included by default.
+
 The steps for deploying your site will depend on where it will be hosted.
 If you have SSH access to a server running Nginx or Apache, you might use the
 ``rsync`` tool to transmit your site files::

From b6f391d8e93857850faef3e22a0c526945cfb6cf Mon Sep 17 00:00:00 2001
From: Steven Maude <git@stevenmaude.co.uk>
Date: Thu, 28 May 2015 22:41:40 +0100
Subject: [PATCH 1783/2864] Document make publish

Also clarify the distinction between make html and make publish.
---
 docs/publish.rst | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/publish.rst b/docs/publish.rst
index 309e8b42..226662ed 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -160,10 +160,16 @@ and thus doesn't require installing anything else in order to use it. The
 downside is that non-POSIX systems (e.g., Windows) do not include ``make``,
 and installing it on those systems can be a non-trivial task.
 
-If you want to use ``make`` to generate your site, run::
+If you want to use ``make`` to generate your site using the settings in
+``pelicanconf.py``, run::
 
     make html
 
+To generate the site for production, using the settings in ``publishconf.py``,
+run::
+
+    make publish
+
 If you'd prefer to have Pelican automatically regenerate your site every time a
 change is detected (which is handy when testing locally), use the following
 command instead::

From 735a4452dfde6aa9327406f842692a171e72a92f Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 3 Jun 2015 17:01:06 -0400
Subject: [PATCH 1784/2864] Fix exception logging

Adds exception type to the exception logging.
Removes the extra logging for autoreload in debug mode, since `raise`
will make it caught by the global `try/except` below and it'll be
logged there.

This replaces #1723 and also removes extra exception logging caused
in #1718.
---
 pelican/__init__.py | 1 -
 pelican/log.py      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 12da111a..2073564c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -444,7 +444,6 @@ def main():
 
                 except Exception as e:
                     if (args.verbosity == logging.DEBUG):
-                        logger.critical('Internal failure: %r', e, exc_info=True)
                         raise
                     logger.warning(
                         'Caught exception "%s". Reloading.', e)
diff --git a/pelican/log.py b/pelican/log.py
index cd750927..c83c5810 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -149,7 +149,7 @@ class SafeLogger(logging.Logger):
         so convert the message to unicode with the correct encoding
         '''
         if isinstance(arg, Exception):
-            text = str(arg)
+            text = '%s: %s' % (arg.__class__.__name__, arg)
             if six.PY2:
                 text = text.decode(self._exc_encoding)
             return text

From c9183808021e54aa9b949939ff289b07c4443b7e Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Sat, 21 Mar 2015 21:54:06 -0400
Subject: [PATCH 1785/2864] Support semicolon-separated author/tag lists.

Idea borrowed from Docutils.  This allows one to write author lists in
lastname,firstname format.  The code change also means that readers with
fancy metadata that can natively represent lists (e.g. Docutils itself,
or MD-Yaml) don't have to merge 'em back together for process_metadata's
sake.
---
 docs/content.rst                              |  6 ++++
 pelican/readers.py                            | 30 ++++++++++++++-----
 .../article_with_multiple_authors_list.rst    | 10 +++++++
 ...rticle_with_multiple_authors_semicolon.rst |  6 ++++
 pelican/tests/test_generators.py              |  7 +++--
 pelican/tests/test_readers.py                 | 17 +++++++++++
 6 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100644 pelican/tests/content/article_with_multiple_authors_list.rst
 create mode 100644 pelican/tests/content/article_with_multiple_authors_semicolon.rst

diff --git a/docs/content.rst b/docs/content.rst
index 4b19515f..0e3310f1 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -35,6 +35,12 @@ this metadata in text files via the following syntax (give your file the
     :authors: Alexis Metaireau, Conan Doyle
     :summary: Short version for index and feeds
 
+Author and tag lists may be semicolon-separated instead, which allows
+you to write authors and tags containing commas::
+
+    :tags: pelican, publishing tool; pelican, bird
+    :authors: Metaireau, Alexis; Doyle, Conan
+
 Pelican implements an extension to reStructuredText to enable support for the
 ``abbr`` HTML tag. To use it, write something like this in your post::
 
diff --git a/pelican/readers.py b/pelican/readers.py
index 3656cd96..bbc72a73 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -27,11 +27,25 @@ from pelican import signals
 from pelican.contents import Page, Category, Tag, Author
 from pelican.utils import get_date, pelican_open, FileStampDataCacher, SafeDatetime, posixize_path
 
+def ensure_metadata_list(text):
+    """Canonicalize the format of a list of authors or tags.  This works
+       the same way as Docutils' "authors" field: if it's already a list,
+       those boundaries are preserved; otherwise, it must be a string;
+       if the string contains semicolons, it is split on semicolons;
+       otherwise, it is split on commas.  This allows you to write
+       author lists in either "Jane Doe, John Doe" or "Doe, Jane; Doe, John"
+       format.
 
-def strip_split(text, sep=','):
-    """Return a list of stripped, non-empty substrings, delimited by sep."""
-    items = [x.strip() for x in text.split(sep)]
-    return [x for x in items if x]
+       Regardless, all list items undergo .strip() before returning, and
+       empty items are discarded.
+    """
+    if isinstance(text, six.text_type):
+        if ';' in text:
+            text = text.split(';')
+        else:
+            text = text.split(',')
+
+    return [v for v in (w.strip() for w in text) if v]
 
 
 # Metadata processors have no way to discard an unwanted value, so we have
@@ -50,13 +64,16 @@ def _process_if_nonempty(processor, name, settings):
 
 
 METADATA_PROCESSORS = {
-    'tags': lambda x, y: [Tag(tag, y) for tag in strip_split(x)] or _DISCARD,
+    'tags': lambda x, y: ([Tag(tag, y) for tag in ensure_metadata_list(x)]
+                          or _DISCARD),
     'date': lambda x, y: get_date(x.replace('_', ' ')),
     'modified': lambda x, y: get_date(x),
     'status': lambda x, y: x.strip() or _DISCARD,
     'category': lambda x, y: _process_if_nonempty(Category, x, y),
     'author': lambda x, y: _process_if_nonempty(Author, x, y),
-    'authors': lambda x, y: [Author(a, y) for a in strip_split(x)] or _DISCARD,
+    'authors': lambda x, y: ([Author(author, y)
+                              for author in ensure_metadata_list(x)]
+                             or _DISCARD),
     'slug': lambda x, y: x.strip() or _DISCARD,
 }
 
@@ -179,7 +196,6 @@ class RstReader(BaseReader):
                 elif element.tagname == 'authors':  # author list
                     name = element.tagname
                     value = [element.astext() for element in element.children]
-                    value = ','.join(value) # METADATA_PROCESSORS expects a string
                 else:  # standard fields (e.g. address)
                     name = element.tagname
                     value = element.astext()
diff --git a/pelican/tests/content/article_with_multiple_authors_list.rst b/pelican/tests/content/article_with_multiple_authors_list.rst
new file mode 100644
index 00000000..7da5fae2
--- /dev/null
+++ b/pelican/tests/content/article_with_multiple_authors_list.rst
@@ -0,0 +1,10 @@
+This is an article with multiple authors in list format!
+########################################################
+
+:date: 2014-02-09 02:20
+:modified: 2014-02-09 02:20
+:authors: - Author, First
+          - Author, Second
+
+The author names are in last,first form to verify that
+they are not just getting split on commas.
diff --git a/pelican/tests/content/article_with_multiple_authors_semicolon.rst b/pelican/tests/content/article_with_multiple_authors_semicolon.rst
new file mode 100644
index 00000000..fa76ac4e
--- /dev/null
+++ b/pelican/tests/content/article_with_multiple_authors_semicolon.rst
@@ -0,0 +1,6 @@
+This is an article with multiple authors in lastname, firstname format!
+#######################################################################
+
+:date: 2014-02-09 02:20
+:modified: 2014-02-09 02:20
+:authors: Author, First; Author, Second
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 4fb70826..90261b7a 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -162,6 +162,8 @@ class TestArticlesGenerator(unittest.TestCase):
              'article'],
             ['This is an article with multiple authors!', 'published', 'Default', 'article'],
             ['This is an article with multiple authors!', 'published', 'Default', 'article'],
+            ['This is an article with multiple authors in list format!', 'published', 'Default', 'article'],
+            ['This is an article with multiple authors in lastname, firstname format!', 'published', 'Default', 'article'],
             ['This is an article without category !', 'published', 'Default',
              'article'],
             ['This is an article without category !', 'published',
@@ -348,11 +350,11 @@ class TestArticlesGenerator(unittest.TestCase):
     def test_generate_authors(self):
         """Check authors generation."""
         authors = [author.name for author, _ in self.generator.authors]
-        authors_expected = sorted(['Alexis Métaireau', 'First Author', 'Second Author'])
+        authors_expected = sorted(['Alexis Métaireau', 'Author, First', 'Author, Second', 'First Author', 'Second Author'])
         self.assertEqual(sorted(authors), authors_expected)
         # test for slug
         authors = [author.slug for author, _ in self.generator.authors]
-        authors_expected = ['alexis-metaireau', 'first-author', 'second-author']
+        authors_expected = ['alexis-metaireau', 'author-first', 'author-second', 'first-author', 'second-author']
         self.assertEqual(sorted(authors), sorted(authors_expected))
 
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
@@ -441,6 +443,7 @@ class TestArticlesGenerator(unittest.TestCase):
 
         authors = sorted([author.name for author, _ in generator.authors])
         authors_expected = sorted(['Alexis Métaireau', 'Blogger',
+                                   'Author, First', 'Author, Second',
                                    'First Author', 'Second Author'])
         self.assertEqual(authors, authors_expected)
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index d390fb48..18e5111e 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -324,6 +324,23 @@ class RstReaderTest(ReaderTest):
 
         self.assertDictHasSubset(page.metadata, expected)
 
+    def test_article_with_multiple_authors_semicolon(self):
+        page = self.read_file(
+            path='article_with_multiple_authors_semicolon.rst')
+        expected = {
+            'authors': ['Author, First', 'Author, Second']
+        }
+
+        self.assertDictHasSubset(page.metadata, expected)
+
+    def test_article_with_multiple_authors_list(self):
+        page = self.read_file(path='article_with_multiple_authors_list.rst')
+        expected = {
+            'authors': ['Author, First', 'Author, Second']
+        }
+
+        self.assertDictHasSubset(page.metadata, expected)
+
 @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
 class MdReaderTest(ReaderTest):
 

From 0a4837198510db52e3a56c9033f40b53067448f9 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 4 Jun 2015 17:53:52 -0400
Subject: [PATCH 1786/2864] Give utils.copy the ability to ignore files (issue
 1692)

This requires a significant overhaul because we want to be able to have
IGNORE_FILES apply at every level of a recursively copied directory
(e.g. the theme static directory).  Since I was overhauling it anyway
I changed it to use os.walk, which should be more efficient.
---
 pelican/utils.py | 80 ++++++++++++++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 29 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index caac8e61..4ccdcc86 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -273,51 +273,73 @@ def slugify(value, substitutions=()):
     return value.decode('ascii')
 
 
-def copy(source, destination):
+def copy(source, destination, ignores=None):
     """Recursively copy source into destination.
 
     If source is a file, destination has to be a file as well.
-
     The function is able to copy either files or directories.
 
     :param source: the source file or directory
     :param destination: the destination file or directory
+    :param ignores: either None, or a list of glob patterns;
+        files matching those patterns will _not_ be copied.
     """
 
+    def walk_error(err):
+        logger.warning("While copying %s: %s: %s",
+                       source_, err.filename, err.strerror)
+
     source_ = os.path.abspath(os.path.expanduser(source))
     destination_ = os.path.abspath(os.path.expanduser(destination))
 
-    if not os.path.exists(destination_) and not os.path.isfile(source_):
-        os.makedirs(destination_)
+    if ignores is None:
+        ignores = []
 
-    def recurse(source, destination):
-        for entry in os.listdir(source):
-            entry_path = os.path.join(source, entry)
-            if os.path.isdir(entry_path):
-                entry_dest = os.path.join(destination, entry)
-                if os.path.exists(entry_dest):
-                    if not os.path.isdir(entry_dest):
-                        raise IOError('Failed to copy {0} a directory.'
-                                      .format(entry_dest))
-                    recurse(entry_path, entry_dest)
-                else:
-                    shutil.copytree(entry_path, entry_dest)
-            else:
-                shutil.copy2(entry_path, destination)
+    if any(fnmatch.fnmatch(os.path.basename(source), ignore)
+           for ignore in ignores):
+        logger.info('Not copying %s due to ignores', source_)
+        return
 
-
-    if os.path.isdir(source_):
-        recurse(source_, destination_)
-
-    elif os.path.isfile(source_):
-        dest_dir = os.path.dirname(destination_)
-        if not os.path.exists(dest_dir):
-            os.makedirs(dest_dir)
-        shutil.copy2(source_, destination_)
+    if os.path.isfile(source_):
+        dst_dir = os.path.dirname(destination_)
+        if not os.path.exists(dst_dir):
+            logger.info('Creating directory %s', dst_dir)
+            os.makedirs(dst_dir)
         logger.info('Copying %s to %s', source_, destination_)
-    else:
-        logger.warning('Skipped copy %s to %s', source_, destination_)
+        shutil.copy2(source_, destination_)
 
+    elif os.path.isdir(source_):
+        if not os.path.exists(destination_):
+            logger.info('Creating directory %s', destination_)
+            os.makedirs(destination_)
+        if not os.path.isdir(destination_):
+            logger.warning('Cannot copy %s (a directory) to %s (a file)',
+                           source_, destination_)
+            return
+
+        for src_dir, subdirs, others in os.walk(source_):
+            dst_dir = os.path.join(destination_,
+                                    os.path.relpath(src_dir, source_))
+
+            subdirs[:] = (s for s in subdirs if not any(fnmatch.fnmatch(s, i)
+                                                        for i in ignores))
+            others[:] =  (o for o in others  if not any(fnmatch.fnmatch(o, i)
+                                                        for i in ignores))
+
+            if not os.path.isdir(dst_dir):
+                logger.info('Creating directory %s', dst_dir)
+                # Parent directories are known to exist, so 'mkdir' suffices.
+                os.mkdir(dst_dir)
+
+            for o in others:
+                src_path = os.path.join(src_dir, o)
+                dst_path = os.path.join(dst_dir, o)
+                if os.path.isfile(src_path):
+                    logger.info('Copying %s to %s', src_path, dst_path)
+                    shutil.copy2(src_path, dst_path)
+                else:
+                    logger.warning('Skipped copy %s (not a file or directory) to %s',
+                                   src_path, dst_path)
 
 def clean_output_dir(path, retention):
     """Remove all files from output directory except those in retention list"""

From c7b9a339eb2c23b08df5f7b2fb46a1387101e95d Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 4 Jun 2015 17:52:30 -0400
Subject: [PATCH 1787/2864] Apply 'IGNORE_FILES' globs to directories as well
 (issue 1692)

This adjusts the only piece of code that currently looks at IGNORE_FILES.
A subsequent commit will add a new use, with the same semantics.
---
 docs/settings.rst     |  7 ++++---
 pelican/generators.py | 14 +++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 99829258..66a44034 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -108,9 +108,10 @@ Setting name (followed by default value, if any)
                                                                                  process or ignore. For example, to avoid processing .html files,
                                                                                  set: ``READERS = {'html': None}``. To add a custom reader for the
                                                                                  ``foo`` extension, set: ``READERS = {'foo': FooReader}``
-``IGNORE_FILES = ['.#*']``                                                       A list of file globbing patterns to match against the
-                                                                                 source files to be ignored by the processor. For example,
-                                                                                 the default ``['.#*']`` will ignore emacs lock files.
+``IGNORE_FILES = ['.#*']``                                                       A list of glob patterns.  Files and directories matching any
+                                                                                 of these patterns will be ignored by the processor. For example,
+                                                                                 the default ``['.#*']`` will ignore emacs lock files, and
+                                                                                 ``['__pycache__']`` would ignore Python 3's bytecode caches.
 ``MD_EXTENSIONS =`` ``['codehilite(css_class=highlight)','extra']``              A list of the extensions that the Markdown processor
                                                                                  will use. Refer to the Python Markdown documentation's
                                                                                  `Extensions section <http://pythonhosted.org/Markdown/extensions/>`_
diff --git a/pelican/generators.py b/pelican/generators.py
index 99961d6e..82a4b790 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -132,15 +132,23 @@ class Generator(object):
             exclusions_by_dirpath.setdefault(parent_path, set()).add(subdir)
 
         files = []
+        ignores = self.settings['IGNORE_FILES']
         for path in paths:
             # careful: os.path.join() will add a slash when path == ''.
             root = os.path.join(self.path, path) if path else self.path
 
             if os.path.isdir(root):
                 for dirpath, dirs, temp_files in os.walk(root, followlinks=True):
-                    for e in exclusions_by_dirpath.get(dirpath, ()):
-                        if e in dirs:
-                            dirs.remove(e)
+                    drop = []
+                    excl = exclusions_by_dirpath.get(dirpath, ())
+                    for d in dirs:
+                        if (d in excl or
+                            any(fnmatch.fnmatch(d, ignore)
+                                for ignore in ignores)):
+                            drop.append(d)
+                    for d in drop:
+                        dirs.remove(d)
+
                     reldir = os.path.relpath(dirpath, self.path)
                     for f in temp_files:
                         fp = os.path.join(reldir, f)

From 1aac19caaf124cec1114b6a4eb27a56f9d1a5d31 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Thu, 4 Jun 2015 17:55:40 -0400
Subject: [PATCH 1788/2864] Honor 'IGNORE_FILES' in the static generator (issue
 1692)

This means, for instance, that editor backups and similar will no
longer be copied out of a theme static directory into the built
website.
---
 pelican/generators.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 82a4b790..d3c657bf 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -670,10 +670,12 @@ class StaticGenerator(Generator):
         for path in paths:
             if final_path:
                 copy(os.path.join(source, path),
-                     os.path.join(output_path, destination, final_path))
+                     os.path.join(output_path, destination, final_path),
+                     self.settings['IGNORE_FILES'])
             else:
                 copy(os.path.join(source, path),
-                     os.path.join(output_path, destination, path))
+                     os.path.join(output_path, destination, path),
+                     self.settings['IGNORE_FILES'])
 
     def generate_context(self):
         self.staticfiles = []

From d082d94f25b4591b48c2119425513afba401a0d5 Mon Sep 17 00:00:00 2001
From: abrahamvarricatt <abraham.varricatt@googlemail.com>
Date: Fri, 5 Jun 2015 22:22:25 +0530
Subject: [PATCH 1789/2864] Add download+PyPI banners to README

---
 README.rst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 0bb3bcc8..f8b62732 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-Pelican |build-status| |coverage-status|
-========================================
+Pelican |build-status| |coverage-status| |pypi-version| |pypi-downloads|
+========================================================================
 
 Pelican is a static site generator, written in Python_.
 
@@ -62,4 +62,9 @@ Why the name "Pelican"?
 .. |coverage-status| image:: https://img.shields.io/coveralls/getpelican/pelican.svg
    :target: https://coveralls.io/r/getpelican/pelican
    :alt: Coveralls: code coverage status
-
+.. |pypi-version| image:: https://img.shields.io/pypi/v/pelican.svg
+   :target: https://pypi.python.org/pypi/pelican
+   :alt: PyPI: the Python Package Index
+.. |pypi-downloads| image:: https://img.shields.io/pypi/dm/pelican.svg
+   :target: https://pypi.python.org/pypi/pelican
+   :alt: PyPI: the Python Package Index

From b7e6390f04f73f5b9aac40ea258b84e24b87961c Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Fri, 5 Jun 2015 12:11:53 +0200
Subject: [PATCH 1790/2864] fix caching

*  break out cache into cache.py
*  break out cache-tests into test_cache.py
*  fix broken cache tests
   *  replace non existing assert calls with self.assertEqual
   *  fix path for page caching test (was invalid)
   *  cleanup test code
*  restructure generate_context in Article and Path Generator
   * destinguish between valid/invalid files correctly and cache accordingly
*  use cPickle if available for increased performance
---
 pelican/cache.py                 | 140 +++++++++++++++++++++++
 pelican/generators.py            |  68 ++++++------
 pelican/readers.py               |   3 +-
 pelican/tests/test_cache.py      | 183 +++++++++++++++++++++++++++++++
 pelican/tests/test_generators.py | 141 ------------------------
 pelican/utils.py                 | 124 ---------------------
 6 files changed, 362 insertions(+), 297 deletions(-)
 create mode 100644 pelican/cache.py
 create mode 100644 pelican/tests/test_cache.py

diff --git a/pelican/cache.py b/pelican/cache.py
new file mode 100644
index 00000000..d955ae08
--- /dev/null
+++ b/pelican/cache.py
@@ -0,0 +1,140 @@
+from __future__ import unicode_literals
+
+import hashlib
+import logging
+import os
+try:
+    import cPickle as pickle
+except:
+    import pickle
+
+from pelican.utils import mkdir_p
+
+
+logger = logging.getLogger(__name__)
+
+
+class FileDataCacher(object):
+    """Class that can cache data contained in files"""
+
+    def __init__(self, settings, cache_name, caching_policy, load_policy):
+        """Load the specified cache within CACHE_PATH in settings
+
+        only if *load_policy* is True,
+        May use gzip if GZIP_CACHE ins settings is True.
+        Sets caching policy according to *caching_policy*.
+        """
+        self.settings = settings
+        self._cache_path = os.path.join(self.settings['CACHE_PATH'],
+                                        cache_name)
+        self._cache_data_policy = caching_policy
+        if self.settings['GZIP_CACHE']:
+            import gzip
+            self._cache_open = gzip.open
+        else:
+            self._cache_open = open
+        if load_policy:
+            try:
+                with self._cache_open(self._cache_path, 'rb') as fhandle:
+                    self._cache = pickle.load(fhandle)
+            except (IOError, OSError) as err:
+                logger.debug('Cannot load cache %s (this is normal on first '
+                             'run). Proceeding with empty cache.\n%s',
+                             self._cache_path, err)
+                self._cache = {}
+            except pickle.PickleError as err:
+                logger.warning('Cannot unpickle cache %s, cache may be using '
+                               'an incompatible protocol (see pelican '
+                               'caching docs). '
+                               'Proceeding with empty cache.\n%s',
+                               self._cache_path, err)
+                self._cache = {}
+        else:
+            self._cache = {}
+
+    def cache_data(self, filename, data):
+        """Cache data for given file"""
+        if self._cache_data_policy:
+            self._cache[filename] = data
+
+    def get_cached_data(self, filename, default=None):
+        """Get cached data for the given file
+
+        if no data is cached, return the default object
+        """
+        return self._cache.get(filename, default)
+
+    def save_cache(self):
+        """Save the updated cache"""
+        if self._cache_data_policy:
+            try:
+                mkdir_p(self.settings['CACHE_PATH'])
+                with self._cache_open(self._cache_path, 'wb') as fhandle:
+                    pickle.dump(self._cache, fhandle)
+            except (IOError, OSError, pickle.PicklingError) as err:
+                logger.warning('Could not save cache %s\n ... %s',
+                               self._cache_path, err)
+
+
+class FileStampDataCacher(FileDataCacher):
+    """Subclass that also caches the stamp of the file"""
+
+    def __init__(self, settings, cache_name, caching_policy, load_policy):
+        """This sublcass additionally sets filestamp function
+        and base path for filestamping operations
+        """
+        super(FileStampDataCacher, self).__init__(settings, cache_name,
+                                                  caching_policy,
+                                                  load_policy)
+
+        method = self.settings['CHECK_MODIFIED_METHOD']
+        if method == 'mtime':
+            self._filestamp_func = os.path.getmtime
+        else:
+            try:
+                hash_func = getattr(hashlib, method)
+
+                def filestamp_func(filename):
+                    """return hash of file contents"""
+                    with open(filename, 'rb') as fhandle:
+                        return hash_func(fhandle.read()).digest()
+
+                self._filestamp_func = filestamp_func
+            except AttributeError as err:
+                logger.warning('Could not get hashing function\n\t%s', err)
+                self._filestamp_func = None
+
+    def cache_data(self, filename, data):
+        """Cache stamp and data for the given file"""
+        stamp = self._get_file_stamp(filename)
+        super(FileStampDataCacher, self).cache_data(filename, (stamp, data))
+
+    def _get_file_stamp(self, filename):
+        """Check if the given file has been modified
+        since the previous build.
+
+        depending on CHECK_MODIFIED_METHOD
+        a float may be returned for 'mtime',
+        a hash for a function name in the hashlib module
+        or an empty bytes string otherwise
+        """
+        try:
+            return self._filestamp_func(filename)
+        except (IOError, OSError, TypeError) as err:
+            logger.warning('Cannot get modification stamp for %s\n\t%s',
+                           filename, err)
+            return ''
+
+    def get_cached_data(self, filename, default=None):
+        """Get the cached data for the given filename
+        if the file has not been modified.
+
+        If no record exists or file has been modified, return default.
+        Modification is checked by comparing the cached
+        and current file stamp.
+        """
+        stamp, data = super(FileStampDataCacher, self).get_cached_data(
+            filename, (None, default))
+        if stamp != self._get_file_stamp(filename):
+            return default
+        return data
diff --git a/pelican/generators.py b/pelican/generators.py
index 99961d6e..d4ec29c8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -17,11 +17,11 @@ from operator import attrgetter
 from jinja2 import (Environment, FileSystemLoader, PrefixLoader, ChoiceLoader,
                     BaseLoader, TemplateNotFound)
 
+from pelican.cache import FileStampDataCacher
 from pelican.contents import Article, Draft, Page, Static, is_valid_content
 from pelican.readers import Readers
 from pelican.utils import (copy, process_translations, mkdir_p, DateFormatter,
-                           FileStampDataCacher, python_2_unicode_compatible,
-                           posixize_path)
+                           python_2_unicode_compatible, posixize_path)
 from pelican import signals
 
 
@@ -493,10 +493,11 @@ class ArticlesGenerator(CachingGenerator):
         for f in self.get_files(
                 self.settings['ARTICLE_PATHS'],
                 exclude=self.settings['ARTICLE_EXCLUDES']):
-            article = self.get_cached_data(f, None)
-            if article is None:
+            article_or_draft = self.get_cached_data(f, None)
+            if article_or_draft is None:
+            #TODO needs overhaul, maybe nomad for read_file solution, unified behaviour
                 try:
-                    article = self.readers.read_file(
+                    article_or_draft = self.readers.read_file(
                         base_path=self.path, path=f, content_class=Article,
                         context=self.context,
                         preread_signal=signals.article_generator_preread,
@@ -509,29 +510,32 @@ class ArticlesGenerator(CachingGenerator):
                     self._add_failed_source_path(f)
                     continue
 
-                if not is_valid_content(article, f):
+                if not is_valid_content(article_or_draft, f):
                     self._add_failed_source_path(f)
                     continue
 
-                self.cache_data(f, article)
+                if article_or_draft.status.lower() == "published":
+                    all_articles.append(article_or_draft)
+                elif article_or_draft.status.lower() == "draft":
+                    article_or_draft = self.readers.read_file(
+                        base_path=self.path, path=f, content_class=Draft,
+                        context=self.context,
+                        preread_signal=signals.article_generator_preread,
+                        preread_sender=self,
+                        context_signal=signals.article_generator_context,
+                        context_sender=self)
+                    self.add_source_path(article_or_draft)
+                    all_drafts.append(article_or_draft)
+                else:
+                    logger.error("Unknown status '%s' for file %s, skipping it.",
+                                   article_or_draft.status, f)
+                    self._add_failed_source_path(f)
+                    continue
 
-            self.add_source_path(article)
+                self.cache_data(f, article_or_draft)
+
+            self.add_source_path(article_or_draft)
 
-            if article.status.lower() == "published":
-                all_articles.append(article)
-            elif article.status.lower() == "draft":
-                draft = self.readers.read_file(
-                    base_path=self.path, path=f, content_class=Draft,
-                    context=self.context,
-                    preread_signal=signals.article_generator_preread,
-                    preread_sender=self,
-                    context_signal=signals.article_generator_context,
-                    context_sender=self)
-                self.add_source_path(draft)
-                all_drafts.append(draft)
-            else:
-                logger.error("Unknown status '%s' for file %s, skipping it.",
-                               article.status, f)
 
         self.articles, self.translations = process_translations(all_articles,
                 order_by=self.settings['ARTICLE_ORDER_BY'])
@@ -613,18 +617,20 @@ class PagesGenerator(CachingGenerator):
                     self._add_failed_source_path(f)
                     continue
 
+                if page.status.lower() == "published":
+                    all_pages.append(page)
+                elif page.status.lower() == "hidden":
+                    hidden_pages.append(page)
+                else:
+                    logger.error("Unknown status '%s' for file %s, skipping it.",
+                                   page.status, f)
+                    self._add_failed_source_path(f)
+                    continue
+
                 self.cache_data(f, page)
 
             self.add_source_path(page)
 
-            if page.status.lower() == "published":
-                all_pages.append(page)
-            elif page.status.lower() == "hidden":
-                hidden_pages.append(page)
-            else:
-                logger.error("Unknown status '%s' for file %s, skipping it.",
-                               page.status, f)
-
         self.pages, self.translations = process_translations(all_pages,
                 order_by=self.settings['PAGE_ORDER_BY'])
         self.hidden_pages, self.hidden_translations = (
diff --git a/pelican/readers.py b/pelican/readers.py
index 3656cd96..e094a505 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -24,8 +24,9 @@ except ImportError:
 from six.moves.html_parser import HTMLParser
 
 from pelican import signals
+from pelican.cache import FileStampDataCacher
 from pelican.contents import Page, Category, Tag, Author
-from pelican.utils import get_date, pelican_open, FileStampDataCacher, SafeDatetime, posixize_path
+from pelican.utils import get_date, pelican_open, SafeDatetime, posixize_path
 
 
 def strip_split(text, sep=','):
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
new file mode 100644
index 00000000..9b4150cc
--- /dev/null
+++ b/pelican/tests/test_cache.py
@@ -0,0 +1,183 @@
+from __future__ import unicode_literals
+
+import os
+from codecs import open
+try:
+    from unittest.mock import MagicMock
+except ImportError:
+    try:
+        from mock import MagicMock
+    except ImportError:
+        MagicMock = False
+
+from shutil import rmtree
+from tempfile import mkdtemp
+
+from pelican.generators import ArticlesGenerator, PagesGenerator
+from pelican.tests.support import unittest, get_settings
+
+CUR_DIR = os.path.dirname(__file__)
+CONTENT_DIR = os.path.join(CUR_DIR, 'content')
+
+
+class TestCache(unittest.TestCase):
+
+    def setUp(self):
+        self.temp_cache = mkdtemp(prefix='pelican_cache.')
+
+    def tearDown(self):
+        rmtree(self.temp_cache)
+
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
+    def test_article_object_caching(self):
+        """Test Article objects caching at the generator level"""
+        settings = get_settings(filenames={})
+        settings['CACHE_PATH'] = self.temp_cache
+        settings['CONTENT_CACHING_LAYER'] = 'generator'
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
+        settings['READERS'] = {'asc': None}
+
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        self.assertTrue(hasattr(generator, '_cache'))
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        """
+        3 Files don't get cached because they were not valid
+        - article_with_comments.html
+        - article_with_null_attributes.html
+        - 2012-11-30_md_w_filename_meta#foo-bar.md
+        """
+        self.assertEqual(generator.readers.read_file.call_count, 3)
+
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
+    def test_article_reader_content_caching(self):
+        """Test raw article content caching at the reader level"""
+        settings = get_settings(filenames={})
+        settings['CACHE_PATH'] = self.temp_cache
+        settings['READERS'] = {'asc': None}
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        self.assertTrue(hasattr(generator.readers, '_cache'))
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        readers = generator.readers.readers
+        for reader in readers.values():
+            reader.read = MagicMock()
+        generator.generate_context()
+        for reader in readers.values():
+            self.assertEqual(reader.read.call_count, 0)
+
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
+    def test_article_ignore_cache(self):
+        """Test that all the articles are read again when not loading cache
+
+        used in --ignore-cache or autoreload mode"""
+        settings = get_settings(filenames={})
+        settings['CACHE_PATH'] = self.temp_cache
+        settings['READERS'] = {'asc': None}
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        self.assertTrue(hasattr(generator, '_cache_open'))
+        orig_call_count = generator.readers.read_file.call_count
+
+        settings['LOAD_CONTENT_CACHE'] = False
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        self.assertEqual(generator.readers.read_file.call_count, orig_call_count)
+
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
+    def test_page_object_caching(self):
+        """Test Page objects caching at the generator level"""
+        settings = get_settings(filenames={})
+        settings['CACHE_PATH'] = self.temp_cache
+        settings['PAGE_PATHS'] = ['TestPages']
+        settings['CONTENT_CACHING_LAYER'] = 'generator'
+        settings['READERS'] = {'asc': None}
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        self.assertTrue(hasattr(generator, '_cache'))
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        """
+        1 File doesn't get cached because it was not valid
+        - bad_page.rst
+        """
+        self.assertEqual(generator.readers.read_file.call_count, 1)
+
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
+    def test_page_reader_content_caching(self):
+        """Test raw page content caching at the reader level"""
+        settings = get_settings(filenames={})
+        settings['CACHE_PATH'] = self.temp_cache
+        settings['PAGE_PATHS'] = ['TestPages']
+        settings['READERS'] = {'asc': None}
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        self.assertTrue(hasattr(generator.readers, '_cache'))
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        readers = generator.readers.readers
+        for reader in readers.values():
+            reader.read = MagicMock()
+        generator.generate_context()
+        for reader in readers.values():
+            self.assertEqual(reader.read.call_count, 0)
+
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
+    def test_page_ignore_cache(self):
+        """Test that all the pages are read again when not loading cache
+
+        used in --ignore_cache or autoreload mode"""
+        settings = get_settings(filenames={})
+        settings['CACHE_PATH'] = self.temp_cache
+        settings['PAGE_PATHS'] = ['TestPages']
+        settings['READERS'] = {'asc': None}
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        self.assertTrue(hasattr(generator, '_cache_open'))
+        orig_call_count = generator.readers.read_file.call_count
+
+        settings['LOAD_CONTENT_CACHE'] = False
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.readers.read_file = MagicMock()
+        generator.generate_context()
+        self.assertEqual(generator.readers.read_file.call_count, orig_call_count)
+
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 4fb70826..5266c075 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -135,7 +135,6 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertFalse(writer.write_feed.called)
 
     def test_generate_context(self):
-
         articles_expected = [
             ['Article title', 'published', 'Default', 'article'],
             ['Article with markdown and summary metadata multi', 'published',
@@ -174,7 +173,6 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertEqual(sorted(articles_expected), sorted(self.articles))
 
     def test_generate_categories(self):
-
         # test for name
         # categories are grouped by slug; if two categories have the same slug
         # but different names they will be grouped together, the first one in
@@ -192,7 +190,6 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertEqual(sorted(categories), sorted(categories_expected))
 
     def test_do_not_use_folder_as_category(self):
-
         settings = get_settings(filenames={})
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
@@ -355,75 +352,6 @@ class TestArticlesGenerator(unittest.TestCase):
         authors_expected = ['alexis-metaireau', 'first-author', 'second-author']
         self.assertEqual(sorted(authors), sorted(authors_expected))
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
-    def test_article_object_caching(self):
-        """Test Article objects caching at the generator level"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['CONTENT_CACHING_LAYER'] = 'generator'
-        settings['READERS'] = {'asc': None}
-
-        generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        generator.generate_context()
-        self.assertTrue(hasattr(generator, '_cache'))
-
-        generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        generator.readers.read_file = MagicMock()
-        generator.generate_context()
-        generator.readers.read_file.assert_called_count == 0
-
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
-    def test_reader_content_caching(self):
-        """Test raw content caching at the reader level"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['READERS'] = {'asc': None}
-
-        generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        generator.generate_context()
-        self.assertTrue(hasattr(generator.readers, '_cache'))
-
-        generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        readers = generator.readers.readers
-        for reader in readers.values():
-            reader.read = MagicMock()
-        generator.generate_context()
-        for reader in readers.values():
-            reader.read.assert_called_count == 0
-
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
-    def test_ignore_cache(self):
-        """Test that all the articles are read again when not loading cache
-
-        used in --ignore-cache or autoreload mode"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['READERS'] = {'asc': None}
-
-        generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        generator.readers.read_file = MagicMock()
-        generator.generate_context()
-        self.assertTrue(hasattr(generator, '_cache_open'))
-        orig_call_count = generator.readers.read_file.call_count
-
-        settings['LOAD_CONTENT_CACHE'] = False
-        generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        generator.readers.read_file = MagicMock()
-        generator.generate_context()
-        generator.readers.read_file.assert_called_count == orig_call_count
-
     def test_standard_metadata_in_default_metadata(self):
         settings = get_settings(filenames={})
         settings['CACHE_CONTENT'] = False
@@ -503,75 +431,6 @@ class TestPageGenerator(unittest.TestCase):
         self.assertEqual(sorted(pages_expected), sorted(pages))
         self.assertEqual(sorted(hidden_pages_expected), sorted(hidden_pages))
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
-    def test_page_object_caching(self):
-        """Test Page objects caching at the generator level"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['CONTENT_CACHING_LAYER'] = 'generator'
-        settings['READERS'] = {'asc': None}
-
-        generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        generator.generate_context()
-        self.assertTrue(hasattr(generator, '_cache'))
-
-        generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        generator.readers.read_file = MagicMock()
-        generator.generate_context()
-        generator.readers.read_file.assert_called_count == 0
-
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
-    def test_reader_content_caching(self):
-        """Test raw content caching at the reader level"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['READERS'] = {'asc': None}
-
-        generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        generator.generate_context()
-        self.assertTrue(hasattr(generator.readers, '_cache'))
-
-        generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        readers = generator.readers.readers
-        for reader in readers.values():
-            reader.read = MagicMock()
-        generator.generate_context()
-        for reader in readers.values():
-            reader.read.assert_called_count == 0
-
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
-    def test_ignore_cache(self):
-        """Test that all the pages are read again when not loading cache
-
-        used in --ignore_cache or autoreload mode"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['READERS'] = {'asc': None}
-
-        generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        generator.readers.read_file = MagicMock()
-        generator.generate_context()
-        self.assertTrue(hasattr(generator, '_cache_open'))
-        orig_call_count = generator.readers.read_file.call_count
-
-        settings['LOAD_CONTENT_CACHE'] = False
-        generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        generator.readers.read_file = MagicMock()
-        generator.generate_context()
-        generator.readers.read_file.assert_called_count == orig_call_count
-
     def test_generate_sorted(self):
         settings = get_settings(filenames={})
         settings['PAGE_PATHS'] = ['TestPages']  # relative to CUR_DIR
diff --git a/pelican/utils.py b/pelican/utils.py
index caac8e61..bc50308e 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -14,7 +14,6 @@ import shutil
 import sys
 import traceback
 import pickle
-import hashlib
 import datetime
 
 from collections import Hashable
@@ -627,129 +626,6 @@ def split_all(path):
     return components
 
 
-class FileDataCacher(object):
-    '''Class that can cache data contained in files'''
-
-    def __init__(self, settings, cache_name, caching_policy, load_policy):
-        '''Load the specified cache within CACHE_PATH in settings
-
-        only if *load_policy* is True,
-        May use gzip if GZIP_CACHE ins settings is True.
-        Sets caching policy according to *caching_policy*.
-        '''
-        self.settings = settings
-        self._cache_path = os.path.join(self.settings['CACHE_PATH'],
-                                        cache_name)
-        self._cache_data_policy = caching_policy
-        if self.settings['GZIP_CACHE']:
-            import gzip
-            self._cache_open = gzip.open
-        else:
-            self._cache_open = open
-        if load_policy:
-            try:
-                with self._cache_open(self._cache_path, 'rb') as fhandle:
-                    self._cache = pickle.load(fhandle)
-            except (IOError, OSError) as err:
-                logger.debug('Cannot load cache %s (this is normal on first '
-                    'run). Proceeding with empty cache.\n%s',
-                        self._cache_path, err)
-                self._cache = {}
-            except Exception as err:
-                logger.warning(('Cannot unpickle cache %s, cache may be using '
-                    'an incompatible protocol (see pelican caching docs). '
-                    'Proceeding with empty cache.\n%s'),
-                        self._cache_path, err)
-                self._cache = {}
-        else:
-            self._cache = {}
-
-    def cache_data(self, filename, data):
-        '''Cache data for given file'''
-        if self._cache_data_policy:
-            self._cache[filename] = data
-
-    def get_cached_data(self, filename, default=None):
-        '''Get cached data for the given file
-
-        if no data is cached, return the default object
-        '''
-        return self._cache.get(filename, default)
-
-    def save_cache(self):
-        '''Save the updated cache'''
-        if self._cache_data_policy:
-            try:
-                mkdir_p(self.settings['CACHE_PATH'])
-                with self._cache_open(self._cache_path, 'wb') as fhandle:
-                    pickle.dump(self._cache, fhandle)
-            except (IOError, OSError, pickle.PicklingError) as err:
-                logger.warning('Could not save cache %s\n ... %s',
-                    self._cache_path, err)
-
-
-class FileStampDataCacher(FileDataCacher):
-    '''Subclass that also caches the stamp of the file'''
-
-    def __init__(self, settings, cache_name, caching_policy, load_policy):
-        '''This sublcass additionally sets filestamp function
-        and base path for filestamping operations
-        '''
-        super(FileStampDataCacher, self).__init__(settings, cache_name,
-                                                  caching_policy,
-                                                  load_policy)
-
-        method = self.settings['CHECK_MODIFIED_METHOD']
-        if method == 'mtime':
-            self._filestamp_func = os.path.getmtime
-        else:
-            try:
-                hash_func = getattr(hashlib, method)
-                def filestamp_func(filename):
-                    '''return hash of file contents'''
-                    with open(filename, 'rb') as fhandle:
-                        return hash_func(fhandle.read()).digest()
-                self._filestamp_func = filestamp_func
-            except AttributeError as err:
-                logger.warning('Could not get hashing function\n\t%s', err)
-                self._filestamp_func = None
-
-    def cache_data(self, filename, data):
-        '''Cache stamp and data for the given file'''
-        stamp = self._get_file_stamp(filename)
-        super(FileStampDataCacher, self).cache_data(filename, (stamp, data))
-
-    def _get_file_stamp(self, filename):
-        '''Check if the given file has been modified
-        since the previous build.
-
-        depending on CHECK_MODIFIED_METHOD
-        a float may be returned for 'mtime',
-        a hash for a function name in the hashlib module
-        or an empty bytes string otherwise
-        '''
-        try:
-            return self._filestamp_func(filename)
-        except (IOError, OSError, TypeError) as err:
-            logger.warning('Cannot get modification stamp for %s\n\t%s',
-                filename, err)
-            return b''
-
-    def get_cached_data(self, filename, default=None):
-        '''Get the cached data for the given filename
-        if the file has not been modified.
-
-        If no record exists or file has been modified, return default.
-        Modification is checked by comparing the cached
-        and current file stamp.
-        '''
-        stamp, data = super(FileStampDataCacher, self).get_cached_data(
-            filename, (None, default))
-        if stamp != self._get_file_stamp(filename):
-            return default
-        return data
-
-
 def is_selected_for_writing(settings, path):
     '''Check whether path is selected for writing
     according to the WRITE_SELECTED list

From db59c16f42aa6eb382ca683b6938a006e5c3b9f5 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Sat, 6 Jun 2015 20:07:12 +0200
Subject: [PATCH 1791/2864] set default for caching to false

ref #1689

* set default settigns in settings.py to False for
  - LOAD_CONTENT_CACHE
  - CACHE_CONTENT
* remove AUTORELOAD_IGNORE_CACHE and add deprecation warning
* update settings.rst to reflect the new default values
* update test_cache to enable caching options
---
 docs/settings.rst           |  6 ++----
 pelican/__init__.py         | 14 +++++---------
 pelican/settings.py         |  5 ++---
 pelican/tests/test_cache.py | 28 +++++++++++++++-------------
 4 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 99829258..b4e73316 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -204,7 +204,7 @@ Setting name (followed by default value, if any)
 ``SLUGIFY_SOURCE = 'title'``                                                     Specifies where you want the slug to be automatically generated
                                                                                  from. Can be set to ``title`` to use the 'Title:' metadata tag or
                                                                                  ``basename`` to use the article's file name when creating the slug.
-``CACHE_CONTENT = True``                                                         If ``True``, save content in a cache file.
+``CACHE_CONTENT = False``                                                        If ``True``, saves content in caches.
                                                                                  See :ref:`reading_only_modified_content` for details about caching.
 ``CONTENT_CACHING_LAYER = 'reader'``                                             If set to ``'reader'``, save only the raw content and metadata
                                                                                  returned by readers. If set to ``'generator'``, save processed
@@ -212,9 +212,7 @@ Setting name (followed by default value, if any)
 ``CACHE_PATH = 'cache'``                                                         Directory in which to store cache files.
 ``GZIP_CACHE = True``                                                            If ``True``, use gzip to (de)compress the cache files.
 ``CHECK_MODIFIED_METHOD = 'mtime'``                                              Controls how files are checked for modifications.
-``LOAD_CONTENT_CACHE = True``                                                    If ``True``, load unmodified content from cache.
-``AUTORELOAD_IGNORE_CACHE = False``                                              If ``True``, do not load content cache in autoreload mode
-                                                                                 when the settings file changes.
+``LOAD_CONTENT_CACHE = False``                                                   If ``True``, load unmodified content from caches.
 ``WRITE_SELECTED = []``                                                          If this list is not empty, **only** output files with their paths
                                                                                  in this list are written. Paths should be either absolute or relative
                                                                                  to the current Pelican working directory. For possible use cases see
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 12da111a..98e783d7 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -101,6 +101,11 @@ class Pelican(object):
                             'PAGE_LANG_URL'):
                 logger.warning("%s = '%s'", setting, self.settings[setting])
 
+        if self.settings.get('AUTORELOAD_IGNORE_CACHE'):
+            logger.warning('Found deprecated `AUTORELOAD_IGNORE_CACHE` in '
+                           'settings. Use --ignore-cache instead.')
+            self.settings.pop('AUTORELOAD_IGNORE_CACHE')
+
         if self.settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
             logger.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
                            ' settings.  Modifying the following settings for'
@@ -381,10 +386,6 @@ def main():
             print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
                   ' `settings` for changes. ---')
 
-            def _ignore_cache(pelican_obj):
-                if pelican_obj.settings['AUTORELOAD_IGNORE_CACHE']:
-                    pelican_obj.settings['LOAD_CONTENT_CACHE'] = False
-
             while True:
                 try:
                     # Check source dir for changed files ending with the given
@@ -393,12 +394,9 @@ def main():
                     # have changed, no matter what extension the filenames
                     # have.
                     modified = {k: next(v) for k, v in watchers.items()}
-                    original_load_cache = settings['LOAD_CONTENT_CACHE']
 
                     if modified['settings']:
                         pelican, settings = get_instance(args)
-                        original_load_cache = settings['LOAD_CONTENT_CACHE']
-                        _ignore_cache(pelican)
 
                         # Adjust static watchers if there are any changes
                         new_static = settings.get("STATIC_PATHS", [])
@@ -435,8 +433,6 @@ def main():
                                            'theme.')
 
                         pelican.run()
-                        # restore original caching policy
-                        pelican.settings['LOAD_CONTENT_CACHE'] = original_load_cache
 
                 except KeyboardInterrupt:
                     logger.warning("Keyboard interrupt, quitting.")
diff --git a/pelican/settings.py b/pelican/settings.py
index 0c54e89b..82955277 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -123,13 +123,12 @@ DEFAULT_CONFIG = {
     'SLUG_SUBSTITUTIONS': (),
     'INTRASITE_LINK_REGEX': '[{|](?P<what>.*?)[|}]',
     'SLUGIFY_SOURCE': 'title',
-    'CACHE_CONTENT': True,
+    'CACHE_CONTENT': False,
     'CONTENT_CACHING_LAYER': 'reader',
     'CACHE_PATH': 'cache',
     'GZIP_CACHE': True,
     'CHECK_MODIFIED_METHOD': 'mtime',
-    'LOAD_CONTENT_CACHE': True,
-    'AUTORELOAD_IGNORE_CACHE': False,
+    'LOAD_CONTENT_CACHE': False,
     'WRITE_SELECTED': [],
     'FORMATTED_FIELDS': ['summary'],
     }
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index 9b4150cc..8a20c36b 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -28,11 +28,18 @@ class TestCache(unittest.TestCase):
     def tearDown(self):
         rmtree(self.temp_cache)
 
+    def _get_cache_enabled_settings(self):
+        settings = get_settings(filenames={})
+        settings['CACHE_CONTENT'] = True
+        settings['LOAD_CONTENT_CACHE'] = True
+        settings['CACHE_PATH'] = self.temp_cache
+        return settings
+
+
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_article_object_caching(self):
         """Test Article objects caching at the generator level"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
+        settings = self._get_cache_enabled_settings()
         settings['CONTENT_CACHING_LAYER'] = 'generator'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['READERS'] = {'asc': None}
@@ -60,8 +67,7 @@ class TestCache(unittest.TestCase):
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_article_reader_content_caching(self):
         """Test raw article content caching at the reader level"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
+        settings = self._get_cache_enabled_settings()
         settings['READERS'] = {'asc': None}
 
         generator = ArticlesGenerator(
@@ -85,8 +91,7 @@ class TestCache(unittest.TestCase):
         """Test that all the articles are read again when not loading cache
 
         used in --ignore-cache or autoreload mode"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
+        settings = self._get_cache_enabled_settings()
         settings['READERS'] = {'asc': None}
 
         generator = ArticlesGenerator(
@@ -108,10 +113,9 @@ class TestCache(unittest.TestCase):
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_page_object_caching(self):
         """Test Page objects caching at the generator level"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['PAGE_PATHS'] = ['TestPages']
+        settings = self._get_cache_enabled_settings()
         settings['CONTENT_CACHING_LAYER'] = 'generator'
+        settings['PAGE_PATHS'] = ['TestPages']
         settings['READERS'] = {'asc': None}
 
         generator = PagesGenerator(
@@ -134,8 +138,7 @@ class TestCache(unittest.TestCase):
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_page_reader_content_caching(self):
         """Test raw page content caching at the reader level"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
+        settings = self._get_cache_enabled_settings()
         settings['PAGE_PATHS'] = ['TestPages']
         settings['READERS'] = {'asc': None}
 
@@ -160,8 +163,7 @@ class TestCache(unittest.TestCase):
         """Test that all the pages are read again when not loading cache
 
         used in --ignore_cache or autoreload mode"""
-        settings = get_settings(filenames={})
-        settings['CACHE_PATH'] = self.temp_cache
+        settings = self._get_cache_enabled_settings()
         settings['PAGE_PATHS'] = ['TestPages']
         settings['READERS'] = {'asc': None}
 

From e3f5e39e17b6860e26287ab556476707e3abf96e Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Thu, 11 Jun 2015 19:40:34 +0200
Subject: [PATCH 1792/2864] fix outdated content_object_init refs

* remove content_object_init section from docs
* improve content_object_init test

The content_object_init signal used to set its class as sender and pass
the instance as additional arg in 6100773. Commit ed907b4 removed this
behaviour to bring it inline with other signals, on the basis that
you can test for the class of the object anyway.
We also had a test in place, checking this behaviour, but it was poorly
implemented, not actually checking if the function ever got called.

closes #1711
---
 docs/plugins.rst               | 22 +--------------------
 pelican/tests/test_contents.py | 35 ++++++++++++++++++++--------------
 2 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 428ddfa6..6a850100 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -116,31 +116,11 @@ static_generator_preread            static_generator               invoked befor
                                                                    staticfiles list.
 static_generator_init               static_generator               invoked in the StaticGenerator.__init__
 static_generator_finalized          static_generator               invoked at the end of StaticGenerator.generate_context
-content_object_init                 content_object                 invoked at the end of Content.__init__ (see note below)
+content_object_init                 content_object                 invoked at the end of Content.__init__
 content_written                     path, context                  invoked each time a content file is written.
 feed_written                        path, context, feed            invoked each time a feed file is written.
 =================================   ============================   ===========================================================================
 
-The list is currently small, so don't hesitate to add signals and make a pull
-request if you need them!
-
-.. note::
-
-   The signal ``content_object_init`` can send a different type of object as
-   the argument. If you want to register only one type of object then you will
-   need to specify the sender when you are connecting to the signal.
-
-   ::
-
-       from pelican import signals
-       from pelican import contents
-
-       def test(sender, instance):
-               print "%s : %s content initialized !!" % (sender, instance)
-
-       def register():
-               signals.content_object_init.connect(test, sender=contents.Article)
-
 .. warning::
 
    Avoid ``content_object_init`` signal if you intend to read ``summary``
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 004d512e..5879bde2 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -1,18 +1,20 @@
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals, absolute_import
 
-import six
-from sys import platform
 import locale
 import os.path
+import six
 
-from pelican.tests.support import unittest, get_settings
-
-from pelican.contents import Page, Article, Static, URLWrapper, Author, Category
-from pelican.settings import DEFAULT_CONFIG
-from pelican.utils import path_to_url, truncate_html_words, SafeDatetime, posix_join
-from pelican.signals import content_object_init
 from jinja2.utils import generate_lorem_ipsum
+from sys import platform
+
+from pelican.contents import (Page, Article, Static, URLWrapper,
+                              Author, Category)
+from pelican.settings import DEFAULT_CONFIG
+from pelican.signals import content_object_init
+from pelican.tests.support import unittest, get_settings
+from pelican.utils import (path_to_url, truncate_html_words, SafeDatetime,
+                           posix_join)
+
 
 # generate one paragraph, enclosed with <p>
 TEST_CONTENT = str(generate_lorem_ipsum(n=1))
@@ -191,14 +193,19 @@ class TestPage(unittest.TestCase):
         return page_kwargs
 
     def test_signal(self):
-        # If a title is given, it should be used to generate the slug.
-
-        def receiver_test_function(sender, instance):
+        def receiver_test_function(sender):
+            receiver_test_function.has_been_called = True
             pass
+        receiver_test_function.has_been_called = False
 
-        content_object_init.connect(receiver_test_function, sender=Page)
+        content_object_init.connect(receiver_test_function)
+        self.assertIn(
+            receiver_test_function,
+            content_object_init.receivers_for(Page))
+
+        self.assertFalse(receiver_test_function.has_been_called)
         Page(**self.page_kwargs)
-        self.assertTrue(content_object_init.has_receivers_for(Page))
+        self.assertTrue(receiver_test_function.has_been_called)
 
     def test_get_content(self):
         # Test that the content is updated with the relative links to

From da8b469ab845917736186f070b955d08a5d7d488 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 12 Jun 2015 17:15:19 -0400
Subject: [PATCH 1793/2864] Fix #1647: Fix ARTICLE_ORDER_BY and add the ability
 to reverse order

ARTICLE_ORDER_BY wasn't doing anything because the ArticlesGenerator
was sorting articles after ARTICLE_ORDER_BY was applied. This fixes
that by adding the ability to reverse metadata order by adding the
option prefix 'reversed-' to metadata and changing the default value
to 'reversed-date'.

Relevant documentation is also updated and moved into a more appropriate
place ('Ordering Content' instead of 'URL settings').
---
 docs/settings.rst                | 37 +++++++---------
 pelican/generators.py            |  3 +-
 pelican/settings.py              |  2 +-
 pelican/tests/test_generators.py | 76 ++++++++++++++++++++++++++++++++
 pelican/utils.py                 | 32 +++++++++-----
 5 files changed, 115 insertions(+), 35 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e08291f0..202fc45f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -277,14 +277,6 @@ Setting name (followed by default value, if any)        What does it do?
 ======================================================  ==============================================================
 ``ARTICLE_URL = '{slug}.html'``                         The URL to refer to an article.
 ``ARTICLE_SAVE_AS = '{slug}.html'``                     The place where we will save an article.
-``ARTICLE_ORDER_BY = 'slug'``                           The metadata attribute used to sort articles. By default,
-                                                        the ``articles_page.object_list`` template variable is
-                                                        ordered by slug. If you modify this, make sure all
-                                                        articles contain the attribute you specify. You can also
-                                                        specify a "sorting" function of one argument that is used
-                                                        to extract a comparison key from each article. For example,
-                                                        sorting by title without using the built-in functionality
-                                                        would use the function ``operator.attrgetter('title')``.
 ``ARTICLE_LANG_URL = '{slug}-{lang}.html'``             The URL to refer to an article which doesn't use the
                                                         default language.
 ``ARTICLE_LANG_SAVE_AS = '{slug}-{lang}.html'``         The place where we will save an article which
@@ -299,17 +291,6 @@ Setting name (followed by default value, if any)        What does it do?
 ``PAGE_SAVE_AS = 'pages/{slug}.html'``                  The location we will save the page. This value has to be
                                                         the same as PAGE_URL or you need to use a rewrite in
                                                         your server config.
-
-``PAGE_ORDER_BY = 'basename'``                          The metadata attribute used to sort pages. By default
-                                                        the ``PAGES`` template variable is ordered by basename
-                                                        (i.e., path not included). Note that the option ``'basename'``
-                                                        is a special option supported in the source code. If
-                                                        you modify this setting, make sure all pages contain
-                                                        the attribute you specify. You can also specify a "sorting"
-                                                        function of one argument that is used to extract a comparison
-                                                        key from each page. For example, the basename function looks
-                                                        similar to
-                                                        ``lambda x: os.path.basename(getattr(x, 'source_path', ''))``.
 ``PAGE_LANG_URL = 'pages/{slug}-{lang}.html'``          The URL we will use to link to a page which doesn't
                                                         use the default language.
 ``PAGE_LANG_SAVE_AS = 'pages/{slug}-{lang}.html'``      The location we will save the page which doesn't
@@ -644,14 +625,26 @@ Setting name (followed by default value, if any)            What does it do?
 Ordering content
 ================
 
-================================================    =====================================================
+================================================    ==============================================================
 Setting name (followed by default value)            What does it do?
-================================================    =====================================================
+================================================    ==============================================================
 ``NEWEST_FIRST_ARCHIVES = True``                    Order archives by newest first by date. (False:
                                                     orders by date with older articles first.)
 ``REVERSE_CATEGORY_ORDER = False``                  Reverse the category order. (True: lists by reverse
                                                     alphabetical order; default lists alphabetically.)
-================================================    =====================================================
+``ARTICLE_ORDER_BY = 'reversed-date'``              Defines how the articles (``articles_page.object_list`` in
+                                                    the template) are sorted. Valid options are: metadata as a
+                                                    string (use ``reversed-`` prefix the reverse the sort order),
+                                                    special option ``'basename'`` which will use the basename of
+                                                    the file (without path) or a custom function to extract the
+                                                    sorting key from articles. The default value,
+                                                    ``'reversed-date'``, will sort articles by date in reverse
+                                                    order (i.e. newest article comes first).
+``PAGE_ORDER_BY = 'basename'``                      Defines how the pages (``PAGES`` variable in the template)
+                                                    are sorted. Options are same as ``ARTICLE_ORDER_BY``.
+                                                    The default value, ``'basename'`` will sort pages by their
+                                                    basename.
+================================================    ==============================================================
 
 
 Themes
diff --git a/pelican/generators.py b/pelican/generators.py
index 3692ef0b..a29555a5 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -561,8 +561,7 @@ class ArticlesGenerator(CachingGenerator):
                     self.tags[tag].append(article)
             for author in getattr(article, 'authors', []):
                 self.authors[author].append(article)
-        # sort the articles by date
-        self.articles.sort(key=attrgetter('date'), reverse=True)
+
         self.dates = list(self.articles)
         self.dates.sort(key=attrgetter('date'),
                         reverse=self.context['NEWEST_FIRST_ARCHIVES'])
diff --git a/pelican/settings.py b/pelican/settings.py
index 82955277..c1a902cd 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -65,7 +65,7 @@ DEFAULT_CONFIG = {
     'OUTPUT_RETENTION': [],
     'ARTICLE_URL': '{slug}.html',
     'ARTICLE_SAVE_AS': '{slug}.html',
-    'ARTICLE_ORDER_BY': 'slug',
+    'ARTICLE_ORDER_BY': 'reversed-date',
     'ARTICLE_LANG_URL': '{slug}-{lang}.html',
     'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html',
     'DRAFT_URL': 'drafts/{slug}.html',
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 7aac27a2..e93c8c14 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -387,6 +387,65 @@ class TestArticlesGenerator(unittest.TestCase):
                                 'パイソン', 'マック'])
         self.assertEqual(tags, tags_expected)
 
+    def test_article_order_by(self):
+        settings = get_settings(filenames={})
+        settings['DEFAULT_CATEGORY'] = 'Default'
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
+        settings['CACHE_CONTENT'] = False   # cache not needed for this logic tests
+        settings['ARTICLE_ORDER_BY'] = 'title'
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+
+        expected = [
+            'An Article With Code Block To Test Typogrify Ignore',
+            'Article title',
+            'Article with Nonconformant HTML meta tags',
+            'Article with markdown and summary metadata multi',
+            'Article with markdown and summary metadata single',
+            'Article with markdown containing footnotes',
+            'Article with template',
+            'Rst with filename metadata',
+            'Test Markdown extensions',
+            'Test markdown File',
+            'Test md File',
+            'Test mdown File',
+            'Test mkd File',
+            'This is a super article !',
+            'This is a super article !',
+            'This is a super article !',
+            'This is a super article !',
+            'This is a super article !',
+            'This is a super article !',
+            'This is an article with category !',
+            'This is an article with multiple authors in lastname, firstname format!',
+            'This is an article with multiple authors in list format!',
+            'This is an article with multiple authors!',
+            'This is an article with multiple authors!',
+            'This is an article without category !',
+            'This is an article without category !',
+            'マックOS X 10.8でパイソンとVirtualenvをインストールと設定']
+
+        articles = [article.title for article in generator.articles]
+        self.assertEqual(articles, expected)
+
+        # reversed title
+        settings = get_settings(filenames={})
+        settings['DEFAULT_CATEGORY'] = 'Default'
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
+        settings['CACHE_CONTENT'] = False   # cache not needed for this logic tests
+        settings['ARTICLE_ORDER_BY'] = 'reversed-title'
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+
+        articles = [article.title for article in generator.articles]
+        self.assertEqual(articles, list(reversed(expected)))
+
 
 class TestPageGenerator(unittest.TestCase):
     # Note: Every time you want to test for a new field; Make sure the test
@@ -473,6 +532,23 @@ class TestPageGenerator(unittest.TestCase):
         pages = self.distill_pages(generator.pages)
         self.assertEqual(pages_expected_sorted_by_title, pages)
 
+        # sort by title reversed
+        pages_expected_sorted_by_title = [
+            ['This is a test page with a preset template', 'published',
+             'custom'],
+            ['This is a test page', 'published', 'page'],
+            ['This is a markdown test page', 'published', 'page'],
+            ['Page with a bunch of links', 'published', 'page'],
+            ['A Page (Test) for sorting', 'published', 'page'],
+        ]
+        settings['PAGE_ORDER_BY'] = 'reversed-title'
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        pages = self.distill_pages(generator.pages)
+        self.assertEqual(pages_expected_sorted_by_title, pages)
+
     def test_tag_and_category_links_on_generated_pages(self):
         """
         Test to ensure links of the form {tag}tagname and {category}catname
diff --git a/pelican/utils.py b/pelican/utils.py
index f973a6ad..6ad4de24 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -541,16 +541,28 @@ def process_translations(content_list, order_by=None):
             try:
                 index.sort(key=order_by)
             except Exception:
-                logger.error('Error sorting with function {}'.format(order_by))
-        elif order_by == 'basename':
-            index.sort(key=lambda x: os.path.basename(x.source_path or ''))
-        elif order_by != 'slug':
-            try:
-                index.sort(key=attrgetter(order_by))
-            except AttributeError:
-                error_msg = ('There is no "{}" attribute in the item metadata.'
-                             'Defaulting to slug order.')
-                logger.warning(error_msg.format(order_by))
+                logger.error('Error sorting with function %s', order_by)
+        elif isinstance(order_by, six.string_types):
+            if order_by.startswith('reversed-'):
+                order_reversed = True
+                order_by = order_by.replace('reversed-', '', 1)
+            else:
+                order_reversed = False
+
+            if order_by == 'basename':
+                index.sort(key=lambda x: os.path.basename(x.source_path or ''),
+                           reverse=order_reversed)
+            # already sorted by slug, no need to sort again
+            elif not (order_by == 'slug' and not order_reversed):
+                try:
+                    index.sort(key=attrgetter(order_by),
+                               reverse=order_reversed)
+                except AttributeError:
+                    logger.warning('There is no "%s" attribute in the item '
+                        'metadata. Defaulting to slug order.', order_by)
+        else:
+            logger.warning('Invalid *_ORDER_BY setting (%s).'
+                'Valid options are strings and functions.', order_by)
 
     return index, translations
 

From 0c9e4764ea483bac7df4d731ab0c28f90338a12e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 14 Jun 2015 09:57:57 -0700
Subject: [PATCH 1794/2864] Include setup.py when bumping version number

---
 bumpr.rc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bumpr.rc b/bumpr.rc
index 97dbad22..00078ae0 100644
--- a/bumpr.rc
+++ b/bumpr.rc
@@ -6,7 +6,9 @@ clean =
     rm -rf *egg-info build dist
 tests = python -m unittest discover
 publish = python setup.py sdist bdist_wheel register upload
-files = README.rst
+files =
+    README.rst
+    setup.py
 
 [bump]
 unsuffix = true

From 14611978263b7eeb8922da7b56f9eb39abe391da Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 14 Jun 2015 10:12:52 -0700
Subject: [PATCH 1795/2864] Match space with POSIX sed when bumping via bumpr

`\s` will match a space via GNU sed but not the version of sed that
ships with Mac OS X or BSD.
---
 bumpr.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bumpr.rc b/bumpr.rc
index 00078ae0..eebe4dd8 100644
--- a/bumpr.rc
+++ b/bumpr.rc
@@ -29,4 +29,4 @@ prepare = Next release
 url = http://docs.getpelican.com/{tag}
 
 [commands]
-bump = sed -i "" "s/last_stable\s*=.*/last_stable = '{version}'/" docs/conf.py
+bump = sed -i "" "s/last_stable[[:space:]]*=.*/last_stable = '{version}'/" docs/conf.py

From d19854f4dc69972484f7f521bccf88cf7b68bbf5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 15 Jun 2015 07:08:05 -0700
Subject: [PATCH 1796/2864] Remove references to easy_install in documentation

---
 docs/install.rst | 5 ++---
 docs/tips.rst    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/install.rst b/docs/install.rst
index 418c8ca6..067a5cec 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -79,9 +79,8 @@ automatically installed without any action on your part:
 Upgrading
 ---------
 
-If you installed a stable Pelican release via ``pip`` or ``easy_install`` and
-wish to upgrade to the latest stable release, you can do so by adding
-``--upgrade`` to the relevant command. For pip, that would be::
+If you installed a stable Pelican release via ``pip`` and wish to upgrade to
+the latest stable release, you can do so by adding ``--upgrade``::
 
     pip install --upgrade pelican
 
diff --git a/docs/tips.rst b/docs/tips.rst
index 99b5f6a8..15d68769 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -46,7 +46,7 @@ the ``output`` dir generated by Pelican to a repository's ``gh-pages`` branch
 on GitHub.
 
 The excellent `ghp-import <https://github.com/davisp/ghp-import>`_, which can
-be installed with ``easy_install`` or ``pip``, makes this process really easy.
+be installed with ``pip``, makes this process really easy.
 
 For example, if the source of your Pelican site is contained in a GitHub
 repository, and if you want to publish that Pelican site in the form of Project

From c7ec93466da5bc52eb254981c8f260e248e5f249 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 15 Jun 2015 07:53:52 -0700
Subject: [PATCH 1797/2864] Update changelog for imminent 3.6 release

---
 docs/changelog.rst | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4e297562..f4f1d0aa 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,24 @@
 Release history
 ###############
 
+Next release
+============
+
+* Improve caching behavior and disable by default
+* Allow Markdown or reST content in metadata fields other than "summary"
+* Support semicolon-separated author/tag lists
+* Improve flexibility of article sorting
+* Add ``--relative-urls`` argument
+* Support listening on addresses other than localhost
+* Unify HTTP server handlers to ``pelican.server`` throughout
+* Handle intra-site links to draft posts
+* Move ``tag_cloud`` from core to plugin
+* Load all external resources via HTTPS
+* Import drafts from WordPress XML
+* Improve support for Windows users
+* Enhance logging and test suite
+* New signals: ``all_generators_finalized`` and ``page_writer_finalized``
+
 3.5.0 (2014-11-04)
 ==================
 

From 68354eb94e7ec272bd8cef4873b206022d6a0756 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 15 Jun 2015 13:07:49 -0700
Subject: [PATCH 1798/2864] Minor fixes to 3.6 release changelog

---
 docs/changelog.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f4f1d0aa..7bf766a4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,19 +4,21 @@ Release history
 Next release
 ============
 
-* Improve caching behavior and disable by default
-* Allow Markdown or reST content in metadata fields other than "summary"
+* Disable caching by default in order to prevent potential confusion
+* Improve caching behavior, replacing ``pickle`` with ``cpickle``
+* Allow Markdown or reST content in metadata fields other than ``summary``
 * Support semicolon-separated author/tag lists
 * Improve flexibility of article sorting
 * Add ``--relative-urls`` argument
-* Support listening on addresses other than localhost
+* Support devserver listening on addresses other than localhost
 * Unify HTTP server handlers to ``pelican.server`` throughout
 * Handle intra-site links to draft posts
 * Move ``tag_cloud`` from core to plugin
-* Load all external resources via HTTPS
+* Load default theme's external resources via HTTPS
 * Import drafts from WordPress XML
 * Improve support for Windows users
 * Enhance logging and test suite
+* Clean up and refactor codebase
 * New signals: ``all_generators_finalized`` and ``page_writer_finalized``
 
 3.5.0 (2014-11-04)

From fba2826b7041dab9513542331ee17d3641e67505 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 15 Jun 2015 13:45:50 -0700
Subject: [PATCH 1799/2864] Bump version 3.6.0

---
 docs/changelog.rst  | 4 ++--
 docs/conf.py        | 2 +-
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7bf766a4..7d385670 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,8 +1,8 @@
 Release history
 ###############
 
-Next release
-============
+3.6.0 (2015-06-15)
+==================
 
 * Disable caching by default in order to prevent potential confusion
 * Improve caching behavior, replacing ``pickle`` with ``cpickle``
diff --git a/docs/conf.py b/docs/conf.py
index 4ec0f832..43af8da4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,7 @@ copyright = '2015, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
-last_stable = '3.3.0'
+last_stable = '3.6.0'
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 42c89bf0..f80c2ddb 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -26,7 +26,7 @@ from pelican.utils import (clean_output_dir, folder_watcher,
                            file_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.5.0"
+__version__ = "3.6.0"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 
diff --git a/setup.py b/setup.py
index 8e4eff34..37aca23f 100755
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.5.0",
+    version="3.6.0",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',

From 780ccfe137a910b404d651a4973f68c85adf01f2 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 15 Jun 2015 13:46:17 -0700
Subject: [PATCH 1800/2864] Prepare version 3.6.1.dev for next development
 cycle

---
 docs/changelog.rst  | 5 +++++
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7d385670..f08f67ec 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+Next release
+============
+
+- Nothing yet
+
 3.6.0 (2015-06-15)
 ==================
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index f80c2ddb..932974db 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -26,7 +26,7 @@ from pelican.utils import (clean_output_dir, folder_watcher,
                            file_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.6.0"
+__version__ = "3.6.1.dev"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 
diff --git a/setup.py b/setup.py
index 37aca23f..93d7e5f6 100755
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.6.0",
+    version="3.6.1.dev",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',

From f588c565e22030ab2746c23fd0e9a8235d536cff Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Fri, 19 Jun 2015 19:20:48 +0200
Subject: [PATCH 1801/2864] keep docs output

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 775241b8..ff16929e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,4 +26,4 @@ deps =
     sphinx_rtd_theme
 changedir = docs
 commands =
-    sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
+    sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html

From 108b67282ad41416bef48125249ff293efaa8469 Mon Sep 17 00:00:00 2001
From: Jonathan Lange <jml@mumak.net>
Date: Tue, 16 Jun 2015 22:33:39 +0100
Subject: [PATCH 1802/2864] Export hidden pages in context

The `PageGenerator` was building hidden pages, but was not making them
available in the context. This makes it difficult for other plugins to
operate on hidden pages.

This patch updates `PageGenerator` to export the hidden pages it finds
in the context as `hidden_pages`.

It also updates the article generator to export `drafts`.
---
 docs/themes.rst                  | 2 ++
 pelican/generators.py            | 4 ++--
 pelican/tests/test_generators.py | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index d64683bb..6ca753c6 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -77,11 +77,13 @@ articles        The list of articles, ordered descending by date.
                 in the `all_articles` variable.
 dates           The same list of articles, but ordered by date,
                 ascending.
+drafts          The list of draft articles
 tags            A list of (tag, articles) tuples, containing all
                 the tags.
 categories      A list of (category, articles) tuples, containing
                 all the categories and corresponding articles (values)
 pages           The list of pages
+hidden_pages    The list of hidden pages
 =============   ===================================================
 
 
diff --git a/pelican/generators.py b/pelican/generators.py
index a29555a5..0a5298e4 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -577,7 +577,7 @@ class ArticlesGenerator(CachingGenerator):
         self.authors.sort()
 
         self._update_context(('articles', 'dates', 'tags', 'categories',
-                              'authors', 'related_posts'))
+                              'authors', 'related_posts', 'drafts'))
         self.save_cache()
         self.readers.save_cache()
         signals.article_generator_finalized.send(self)
@@ -643,7 +643,7 @@ class PagesGenerator(CachingGenerator):
         self.hidden_pages, self.hidden_translations = (
             process_translations(hidden_pages))
 
-        self._update_context(('pages', ))
+        self._update_context(('pages', 'hidden_pages'))
         self.context['PAGES'] = self.pages
 
         self.save_cache()
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index e93c8c14..c424b60f 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -491,7 +491,13 @@ class TestPageGenerator(unittest.TestCase):
         ]
 
         self.assertEqual(sorted(pages_expected), sorted(pages))
+        self.assertEqual(
+            sorted(pages_expected),
+            sorted(self.distill_pages(generator.context['pages'])))
         self.assertEqual(sorted(hidden_pages_expected), sorted(hidden_pages))
+        self.assertEqual(
+            sorted(hidden_pages_expected),
+            sorted(self.distill_pages(generator.context['hidden_pages'])))
 
     def test_generate_sorted(self):
         settings = get_settings(filenames={})

From 22bc56ddf165a3a696895c3bfe328ca1cc837dd3 Mon Sep 17 00:00:00 2001
From: Elana Hashman <elana@hashman.ca>
Date: Sat, 20 Jun 2015 20:47:37 -0600
Subject: [PATCH 1803/2864] Fixes #1068, #1572: template page navigation bugs

Updates the template logic for when page navigation is included in the
generated HTML in the notmyidea theme, fixing:

* Issue #1068: useless pagination controls should not be displayed when a
  single page is generated (i.e. "Page 1/1"). New logic prevents the
  generation of these superfluous page navigation controls. Tests updated
  accordingly.

* Issue #1572: when multiple pages are generated and the last page contains
  only one item, the closing </ol> and </section> tags are not generated,
  resulting in page breakage. We need to check if
  articles_page.has_other_pages(); if it does, a list has been generated per
  line 19 or 25 and the tags must be closed.
---
 pelican/tests/output/custom/category/bar.html       |  3 ---
 pelican/tests/output/custom/category/cat1.html      |  3 ---
 pelican/tests/output/custom/category/misc.html      |  3 ---
 pelican/tests/output/custom/category/yeah.html      |  3 ---
 pelican/tests/output/custom/tag/bar.html            |  3 ---
 pelican/tests/output/custom/tag/foo.html            |  3 ---
 pelican/tests/output/custom/tag/foobar.html         |  3 ---
 pelican/tests/output/custom/tag/yeah.html           |  3 ---
 .../tests/output/custom_locale/category/bar.html    |  3 ---
 .../tests/output/custom_locale/category/cat1.html   |  3 ---
 .../tests/output/custom_locale/category/misc.html   |  3 ---
 .../tests/output/custom_locale/category/yeah.html   |  3 ---
 pelican/tests/output/custom_locale/tag/bar.html     |  3 ---
 pelican/tests/output/custom_locale/tag/foo.html     |  3 ---
 pelican/tests/output/custom_locale/tag/foobar.html  |  3 ---
 pelican/tests/output/custom_locale/tag/yeah.html    |  3 ---
 pelican/themes/notmyidea/templates/index.html       | 13 ++++---------
 17 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 0bc5b02e..9666d2e2 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -51,9 +51,6 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 237943d7..d9132d10 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -120,9 +120,6 @@
 <p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
             </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 1
-</p>
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 5fcde24b..fa71085d 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -131,9 +131,6 @@ pelican.conf, it ...</p></div>
 <p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
             </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 1
-</p>
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 127eac13..6d94c9ad 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -59,9 +59,6 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
 <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 2e0d047c..f462ffbd 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -110,9 +110,6 @@ YEAH !</p>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
             </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 1
-</p>
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 7c38c24c..9c58956b 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -80,9 +80,6 @@ as well as <strong>inline markup</strong>.</p>
 <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
             </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 1
-</p>
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 42705281..7d17d1fb 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -59,9 +59,6 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
 <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 4d7b506b..e3c765fa 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -51,9 +51,6 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index 7c8f947d..c416b358 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -51,9 +51,6 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 25bc6179..871b2e3f 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -120,9 +120,6 @@
 <p>There are <a href="../posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 1
-</p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 8062c0d6..bb78a8cc 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -131,9 +131,6 @@ pelican.conf, it ...</p></div>
 <p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 1
-</p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index d36c1608..c5e6c7f0 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -59,9 +59,6 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
 <p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index 8ba1aed2..c1f33e64 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -110,9 +110,6 @@ YEAH !</p>
 <p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 1
-</p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index ed67ede0..288f1768 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -80,9 +80,6 @@ as well as <strong>inline markup</strong>.</p>
 <p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 1
-</p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index a569b526..59dcede1 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -59,9 +59,6 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
 <p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index ba767748..4dc36ce5 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -51,9 +51,6 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
-<p class="paginator">
-    Page 1 / 1
-</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 3eac8a3a..6019987b 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -11,9 +11,6 @@
                     <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
                     {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
                 </article>
-                {% if loop.length == 1 %}
-                    {% include 'pagination.html' %}
-                {% endif %}
             </aside><!-- /#featured -->
             {% if loop.length > 1 %}
                 <section id="content" class="body">
@@ -42,13 +39,11 @@
             </article></li>
         {% endif %}
         {% if loop.last %}
-            {% if loop.length > 1 %}
+            {% if loop.length > 1 or articles_page.has_other_pages() %}
                 </ol><!-- /#posts-list -->
-            {% endif %}
-            {% if articles_page.has_previous() or loop.length > 1 %}
-                {% include 'pagination.html' %}
-            {% endif %}
-            {% if loop.length > 1 %}
+                {% if articles_page.has_other_pages() %}
+                    {% include 'pagination.html' %}
+                {% endif %}
                 </section><!-- /#content -->
             {% endif %}
         {% endif %}

From 21544a404cf51b60d407b0fd4eeadfc1d8339a9c Mon Sep 17 00:00:00 2001
From: Elana Hashman <elana@hashman.ca>
Date: Sun, 21 Jun 2015 13:35:41 -0600
Subject: [PATCH 1804/2864] Update simple theme to fix #1068

---
 pelican/themes/simple/templates/index.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index 20104db9..4bd81985 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -21,6 +21,8 @@
         </article></li>
 {% endfor %}
 </ol><!-- /#posts-list -->
-{% include 'pagination.html' %}
+{% if articles_page.has_other_pages() %}
+    {% include 'pagination.html' %}
+{% endif %}
 </section><!-- /#content -->
 {% endblock content %}

From ff88c4bb34779d979b8ce4ba042c07621204ea1a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 26 Jun 2015 09:44:45 -0700
Subject: [PATCH 1805/2864] Document enabling per-block Markdown line numbers

Since users frequently ask how to enable line numbers in
Markdown-formatted code blocks, adding instructions to the docs will
allow us to point users there.

Fixes #1773
---
 docs/content.rst | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 0e3310f1..1e6ba099 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -420,22 +420,29 @@ which posts are translations::
 Syntax highlighting
 ===================
 
-Pelican is able to provide colorized syntax highlighting for your code blocks.
-To do so, you have to use the following conventions inside your content files.
+Pelican can provide colorized syntax highlighting for your code blocks.
+To do so, you must use the following conventions inside your content files.
 
-For reStructuredText, use the code-block directive::
+For reStructuredText, use the ``code-block`` directive to specify the type
+of code to be highlighted (in these examples, we'll use ``python``)::
 
-    .. code-block:: identifier
+    .. code-block:: python
 
-       <indented code block goes here>
+       print("Pelican is a static site generator.")
 
-For Markdown, include the language identifier just above the code block,
-indenting both the identifier and code::
+For Markdown, which utilizes the `CodeHilite extension`_ to provide syntax
+highlighting, include the language identifier just above the code block,
+indenting both the identifier and the code::
 
-    A block of text.
+    There are two ways to specify the identifier:
 
-        :::identifier
-        <code goes here>
+        :::python
+        print("The triple-colon syntax will *not* show line numbers.")
+
+    To display line numbers, use a path-less shebang instead of colons:
+
+        #!python
+        print("The path-less shebang syntax *will* show line numbers.")
 
 The specified identifier (e.g. ``python``, ``ruby``) should be one that
 appears on the `list of available lexers <http://pygments.org/docs/lexers/>`_.
@@ -521,4 +528,5 @@ metadata to include ``Status: published``.
 .. _AsciiDoc: http://www.methods.co.nz/asciidoc/
 .. _pelican-plugins: http://github.com/getpelican/pelican-plugins
 .. _Markdown Extensions: http://pythonhosted.org/Markdown/extensions/
+.. _CodeHilite extension: http://pythonhosted.org/Markdown/extensions/code_hilite.html#syntax
 .. _i18n_subsites plugin: http://github.com/getpelican/pelican-plugins/tree/master/i18n_subsites

From ec5c77b25145f7c20fee24c6b85b478295dbc956 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Thu, 18 Jun 2015 23:33:20 +0200
Subject: [PATCH 1806/2864] remove PAGES; use pages instead

* remove PAGES from context as pages is available
* add section to FAQ to provide guidance
---
 docs/faq.rst                                 | 13 +++++++++++++
 docs/themes.rst                              |  2 ++
 pelican/generators.py                        |  1 -
 pelican/themes/notmyidea/templates/base.html |  2 +-
 pelican/themes/simple/templates/base.html    |  2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index ff473624..08df017d 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -250,3 +250,16 @@ moved out of the pelican core and into a separate `plugin
 <https://github.com/getpelican/pelican-plugins/tree/master/tag_cloud>`_.
 See the :ref:`plugins` documentation further information about the
 Pelican plugin system.
+
+Since I upgraded Pelican my Pages are no longer rendered
+========================================================
+Pages were available to Themes as lowercase ``pages`` and uppercase
+``PAGES``. To bring this inline with the :ref:`templates-variables` section,
+``PAGES`` has been removed. This is quickly resolved by updating your theme
+to iterate over ``pages`` instead of ``PAGES``. Just replace::
+
+    {% for pg in PAGES %}
+
+with something like::
+
+    {% for pg in pages %}
diff --git a/docs/themes.rst b/docs/themes.rst
index 6ca753c6..3978e693 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -47,6 +47,8 @@ To make your own theme, you must follow the following structure::
   if it helps you keep things organized while creating your theme.
 
 
+.. _templates-variables:
+
 Templates and variables
 =======================
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 0a5298e4..da651252 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -644,7 +644,6 @@ class PagesGenerator(CachingGenerator):
             process_translations(hidden_pages))
 
         self._update_context(('pages', 'hidden_pages'))
-        self.context['PAGES'] = self.pages
 
         self.save_cache()
         self.readers.save_cache()
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 45ab4044..188715d4 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -25,7 +25,7 @@
                     <li><a href="{{ link }}">{{ title }}</a></li>
                 {% endfor %}
                 {% if DISPLAY_PAGES_ON_MENU -%}
-                {% for pg in PAGES %}
+                {% for pg in pages %}
                     <li{% if pg == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ pg.url }}">{{ pg.title }}</a></li>
                 {% endfor %}
                 {% endif %}
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index bde7983b..760ca5da 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -40,7 +40,7 @@
             <li><a href="{{ link }}">{{ title }}</a></li>
         {% endfor %}
         {% if DISPLAY_PAGES_ON_MENU %}
-          {% for p in PAGES %}
+          {% for p in pages %}
             <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
           {% endfor %}
         {% else %}

From 5389543a39f3772afdb5701c5bcbb71e44883f05 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Fri, 19 Jun 2015 11:19:21 +0200
Subject: [PATCH 1807/2864] improve URLWrapper comparison

* speed up via reduced slugify calls (only call when needed)
* fix __repr__ to not contain str, should call repr on name
* add test_urlwrappers and move URLWrappers tests there
  * add new equality test
* cleanup header

additionally:
* Content is now decorated with python_2_unicode_compatible
  instead of treating __str__ differently
* better formatting for test_article_metadata_key_lowercase
  to actually output the conflict instead of a non descriptive
  error
---
 pelican/contents.py               |  8 ++---
 pelican/tests/test_contents.py    | 27 ----------------
 pelican/tests/test_readers.py     | 13 ++++----
 pelican/tests/test_urlwrappers.py | 51 +++++++++++++++++++++++++++++++
 pelican/urlwrappers.py            | 29 ++++++++++++------
 5 files changed, 80 insertions(+), 48 deletions(-)
 create mode 100644 pelican/tests/test_urlwrappers.py

diff --git a/pelican/contents.py b/pelican/contents.py
index 005d045c..0e91933b 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -25,6 +25,7 @@ from pelican.urlwrappers import (URLWrapper, Author, Category, Tag)  # NOQA
 logger = logging.getLogger(__name__)
 
 
+@python_2_unicode_compatible
 class Content(object):
     """Represents a content.
 
@@ -148,12 +149,7 @@ class Content(object):
         signals.content_object_init.send(self)
 
     def __str__(self):
-        if self.source_path is None:
-            return repr(self)
-        elif six.PY3:
-            return self.source_path or repr(self)
-        else:
-            return str(self.source_path.encode('utf-8', 'replace'))
+        return self.source_path or repr(self)
 
     def check_properties(self):
         """Test mandatory properties are set."""
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 5879bde2..01d2ed3b 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -578,30 +578,3 @@ class TestStatic(unittest.TestCase):
         content = page.get_content('')
 
         self.assertNotEqual(content, html)
-
-
-class TestURLWrapper(unittest.TestCase):
-    def test_comparisons(self):
-        # URLWrappers are sorted by name
-        wrapper_a = URLWrapper(name='first', settings={})
-        wrapper_b = URLWrapper(name='last', settings={})
-        self.assertFalse(wrapper_a > wrapper_b)
-        self.assertFalse(wrapper_a >= wrapper_b)
-        self.assertFalse(wrapper_a == wrapper_b)
-        self.assertTrue(wrapper_a != wrapper_b)
-        self.assertTrue(wrapper_a <= wrapper_b)
-        self.assertTrue(wrapper_a < wrapper_b)
-        wrapper_b.name = 'first'
-        self.assertFalse(wrapper_a > wrapper_b)
-        self.assertTrue(wrapper_a >= wrapper_b)
-        self.assertTrue(wrapper_a == wrapper_b)
-        self.assertFalse(wrapper_a != wrapper_b)
-        self.assertTrue(wrapper_a <= wrapper_b)
-        self.assertFalse(wrapper_a < wrapper_b)
-        wrapper_a.name = 'last'
-        self.assertTrue(wrapper_a > wrapper_b)
-        self.assertTrue(wrapper_a >= wrapper_b)
-        self.assertFalse(wrapper_a == wrapper_b)
-        self.assertTrue(wrapper_a != wrapper_b)
-        self.assertFalse(wrapper_a <= wrapper_b)
-        self.assertFalse(wrapper_a < wrapper_b)
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 18e5111e..dd7e5fc2 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -29,12 +29,10 @@ class ReaderTest(unittest.TestCase):
                 self.assertEqual(
                     value,
                     real_value,
-                    str('Expected %r to have value %r, but was %r')
-                        % (key, value, real_value))
+                    'Expected %s to have value %s, but was %s' % (key, value, real_value))
             else:
                 self.fail(
-                    str('Expected %r to have value %r, but was not in Dict')
-                        % (key, value))
+                   'Expected %s to have value %s, but was not in Dict' % (key, value))
 
 class TestAssertDictHasSubset(ReaderTest):
     def setUp(self):
@@ -566,9 +564,12 @@ class HTMLReaderTest(ReaderTest):
     def test_article_metadata_key_lowercase(self):
         # Keys of metadata should be lowercase.
         page = self.read_file(path='article_with_uppercase_metadata.html')
+
+        # Key should be lowercase
         self.assertIn('category', page.metadata, 'Key should be lowercase.')
-        self.assertEqual('Yeah', page.metadata.get('category'),
-                         'Value keeps cases.')
+
+        # Value should keep cases
+        self.assertEqual('Yeah', page.metadata.get('category'))
 
     def test_article_with_nonconformant_meta_tags(self):
         page = self.read_file(path='article_with_nonconformant_meta_tags.html')
diff --git a/pelican/tests/test_urlwrappers.py b/pelican/tests/test_urlwrappers.py
new file mode 100644
index 00000000..20a87114
--- /dev/null
+++ b/pelican/tests/test_urlwrappers.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from pelican.urlwrappers import URLWrapper, Tag, Category
+from pelican.tests.support import unittest
+
+class TestURLWrapper(unittest.TestCase):
+    def test_ordering(self):
+        # URLWrappers are sorted by name
+        wrapper_a = URLWrapper(name='first', settings={})
+        wrapper_b = URLWrapper(name='last', settings={})
+        self.assertFalse(wrapper_a > wrapper_b)
+        self.assertFalse(wrapper_a >= wrapper_b)
+        self.assertFalse(wrapper_a == wrapper_b)
+        self.assertTrue(wrapper_a != wrapper_b)
+        self.assertTrue(wrapper_a <= wrapper_b)
+        self.assertTrue(wrapper_a < wrapper_b)
+        wrapper_b.name = 'first'
+        self.assertFalse(wrapper_a > wrapper_b)
+        self.assertTrue(wrapper_a >= wrapper_b)
+        self.assertTrue(wrapper_a == wrapper_b)
+        self.assertFalse(wrapper_a != wrapper_b)
+        self.assertTrue(wrapper_a <= wrapper_b)
+        self.assertFalse(wrapper_a < wrapper_b)
+        wrapper_a.name = 'last'
+        self.assertTrue(wrapper_a > wrapper_b)
+        self.assertTrue(wrapper_a >= wrapper_b)
+        self.assertFalse(wrapper_a == wrapper_b)
+        self.assertTrue(wrapper_a != wrapper_b)
+        self.assertFalse(wrapper_a <= wrapper_b)
+        self.assertFalse(wrapper_a < wrapper_b)
+
+    def test_equality(self):
+        tag = Tag('test', settings={})
+        cat = Category('test', settings={})
+
+        # same name, but different class
+        self.assertNotEqual(tag, cat)
+
+        # should be equal vs text representing the same name
+        self.assertEqual(tag, u'test')
+
+        # should not be equal vs binary
+        self.assertNotEqual(tag, b'test')
+
+        # Tags describing the same should be equal
+        tag_equal = Tag('Test', settings={})
+        self.assertEqual(tag, tag_equal)
+
+        cat_ascii = Category('指導書', settings={})
+        self.assertEqual(cat_ascii, u'zhi-dao-shu')
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 60bc6a3a..65dee23b 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -1,7 +1,9 @@
-import os
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 import functools
 import logging
-
+import os
 import six
 
 from pelican.utils import (slugify, python_2_unicode_compatible)
@@ -52,27 +54,36 @@ class URLWrapper(object):
     def __hash__(self):
         return hash(self.slug)
 
-    def _key(self):
-        return self.slug
-
     def _normalize_key(self, key):
         subs = self.settings.get('SLUG_SUBSTITUTIONS', ())
         return six.text_type(slugify(key, subs))
 
     def __eq__(self, other):
-        return self._key() == self._normalize_key(other)
+        if isinstance(other, self.__class__):
+            return self.slug == other.slug
+        if isinstance(other, six.text_type):
+            return self.slug == self._normalize_key(other)
+        return False
 
     def __ne__(self, other):
-        return self._key() != self._normalize_key(other)
+        if isinstance(other, self.__class__):
+            return self.slug != other.slug
+        if isinstance(other, six.text_type):
+            return self.slug != self._normalize_key(other)
+        return True
 
     def __lt__(self, other):
-        return self._key() < self._normalize_key(other)
+        if isinstance(other, self.__class__):
+            return self.slug < other.slug
+        if isinstance(other, six.text_type):
+            return self.slug < self._normalize_key(other)
+        return False
 
     def __str__(self):
         return self.name
 
     def __repr__(self):
-        return '<{} {}>'.format(type(self).__name__, str(self))
+        return '<{} {}>'.format(type(self).__name__, repr(self._name))
 
     def _from_settings(self, key, get_page_name=False):
         """Returns URL information as defined in settings.

From ba9b4a1d9bab0dba7cc8563e14a0bbb80ae10b43 Mon Sep 17 00:00:00 2001
From: guanidene <guanidene@gmail.com>
Date: Tue, 30 Jun 2015 20:56:21 +0530
Subject: [PATCH 1808/2864] Watch for changes in mtime of symlinked folders and
 files too

---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 6ad4de24..fb8ed9dc 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -576,7 +576,7 @@ def folder_watcher(path, extensions, ignores=[]):
     def file_times(path):
         '''Return `mtime` for each file in path'''
 
-        for root, dirs, files in os.walk(path):
+        for root, dirs, files in os.walk(path, followlinks=True):
             dirs[:] = [x for x in dirs if not x.startswith(os.curdir)]
 
             for f in files:

From aa318a1366b4a1f8ce4eb8e50d52421c8abca031 Mon Sep 17 00:00:00 2001
From: Jotham Apaloo <jothamapaloo@gmail.com>
Date: Fri, 19 Jun 2015 14:50:12 -0400
Subject: [PATCH 1809/2864] Update tips.rst

add 404 page instructions for amazon s3.
---
 docs/tips.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/tips.rst b/docs/tips.rst
index 15d68769..82018400 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -28,6 +28,11 @@ configuration file's ``location`` block::
 For Apache::
 
     ErrorDocument 404 /404.html
+    
+For Amazon S3, first navigate to the ``Static Site Hosting`` menu in the 
+bucket settings on your AWS cosole. From there::
+
+    Error Document: 404.html
 
 Publishing to GitHub
 ====================

From bd5dfa0b3ec9560a1a453907f9f3767b9b89ea01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro>
Date: Fri, 10 Jul 2015 00:48:41 +0300
Subject: [PATCH 1810/2864] Avoid adding the tests in bdists (like wheel
 bdist). Supersedes and closes #1618.

---
 setup.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 93d7e5f6..01d40ae4 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+from os import walk
+from os.path import join, relpath, dirname
+
 from setuptools import setup
 
 requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.7', 'pygments', 'docutils',
@@ -14,11 +17,9 @@ entry_points = {
     ]
 }
 
-
 README = open('README.rst').read()
 CHANGELOG = open('docs/changelog.rst').read()
 
-
 setup(
     name="pelican",
     version="3.6.1.dev",
@@ -29,7 +30,19 @@ setup(
                 "Markdown input files.",
     long_description=README + '\n' + CHANGELOG,
     packages=['pelican', 'pelican.tools'],
-    include_package_data=True,
+    package_data={
+        # we manually collect the package data, as opposed to using include_package_data=True
+        # because we don't want the tests to be included automatically as package data
+        # (MANIFEST.in is too greedy)
+        'pelican': [
+            relpath(join(root, name), 'pelican')
+            for root, _, names in walk(join('pelican', 'themes')) for name in names
+        ],
+        'pelican.tools': [
+            relpath(join(root, name), join('pelican', 'tools'))
+            for root, _, names in walk(join('pelican', 'tools', 'templates')) for name in names
+        ],
+    },
     install_requires=requires,
     entry_points=entry_points,
     classifiers=[

From 379f8666c1ada0f091edb0792a7e84a5e273576b Mon Sep 17 00:00:00 2001
From: Andrea Corbellini <corbellini.andrea@gmail.com>
Date: Thu, 30 Jul 2015 21:04:28 +0200
Subject: [PATCH 1811/2864] Rewrite pelican.utils.truncate_html_words() to use
 an HTML parser instead of regular expressions.

---
 pelican/tests/test_utils.py |  26 +++++++++
 pelican/utils.py            | 107 +++++++++++++++++++-----------------
 2 files changed, 84 insertions(+), 49 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index f5a60584..0f8878af 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -144,6 +144,32 @@ class TestUtils(LoggedTestCase):
         for value, expected in samples:
             self.assertEqual(utils.get_relative_path(value), expected)
 
+    def test_truncate_html_words(self):
+        self.assertEqual(
+            utils.truncate_html_words('short string', 20),
+            'short string')
+
+        self.assertEqual(
+            utils.truncate_html_words('word ' * 100, 20),
+            'word ' * 20 + '...')
+
+        self.assertEqual(
+            utils.truncate_html_words('<p>' + 'word ' * 100 + '</p>', 20),
+            '<p>' + 'word ' * 20 + '...</p>')
+
+        self.assertEqual(
+            utils.truncate_html_words(
+                '<span\nstyle="\n...\n">' + 'word ' * 100 + '</span>', 20),
+            '<span\nstyle="\n...\n">' + 'word ' * 20 + '...</span>')
+
+        self.assertEqual(
+            utils.truncate_html_words('<br>' + 'word ' * 100, 20),
+            '<br>' + 'word ' * 20 + '...')
+
+        self.assertEqual(
+            utils.truncate_html_words('<!-- comment -->' + 'word ' * 100, 20),
+            '<!-- comment -->' + 'word ' * 20 + '...')
+
     def test_process_translations(self):
         # create a bunch of articles
         # 1: no translation metadata
diff --git a/pelican/utils.py b/pelican/utils.py
index fb8ed9dc..43dca212 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -24,6 +24,7 @@ from itertools import groupby
 from jinja2 import Markup
 from operator import attrgetter
 from posixpath import join as posix_join
+from six.moves.html_parser import HTMLParser
 
 logger = logging.getLogger(__name__)
 
@@ -402,6 +403,58 @@ def posixize_path(rel_path):
     return rel_path.replace(os.sep, '/')
 
 
+class _HTMLWordTruncator(HTMLParser):
+
+    _word_regex = re.compile(r'\w[\w-]*', re.U)
+    _singlets = ('br', 'col', 'link', 'base', 'img', 'param', 'area',
+                 'hr', 'input')
+
+    def __init__(self, max_words):
+        # In Python 2, HTMLParser is not a new-style class,
+        # hence super() cannot be used.
+        HTMLParser.__init__(self)
+
+        self.max_words = max_words
+        self.words_found = 0
+        self.open_tags = []
+        self.truncate_at = None
+
+    def handle_starttag(self, tag, attrs):
+        if self.truncate_at is not None:
+            return
+        if tag not in self._singlets:
+            self.open_tags.insert(0, tag)
+
+    def handle_endtag(self, tag):
+        if self.truncate_at is not None:
+            return
+        try:
+            i = self.open_tags.index(tag)
+        except ValueError:
+            pass
+        else:
+            # SGML: An end tag closes, back to the matching start tag,
+            # all unclosed intervening start tags with omitted end tags
+            del self.open_tags[:i + 1]
+
+    def handle_data(self, data):
+        word_end = 0
+
+        while self.words_found < self.max_words:
+            match = self._word_regex.search(data, word_end)
+            if not match:
+                break
+            word_end = match.end(0)
+            self.words_found += 1
+
+            if self.words_found == self.max_words:
+                line_start = 0
+                lineno, line_offset = self.getpos()
+                for i in range(lineno - 1):
+                    line_start = self.rawdata.index('\n', line_start) + 1
+                self.truncate_at = line_start + line_offset + word_end
+
+
 def truncate_html_words(s, num, end_text='...'):
     """Truncates HTML to a certain number of words.
 
@@ -414,59 +467,15 @@ def truncate_html_words(s, num, end_text='...'):
     length = int(num)
     if length <= 0:
         return ''
-    html4_singlets = ('br', 'col', 'link', 'base', 'img', 'param', 'area',
-                      'hr', 'input')
-
-    # Set up regular expressions
-    re_words = re.compile(r'&.*?;|<.*?>|(\w[\w-]*)', re.U)
-    re_tag = re.compile(r'<(/)?([^ ]+?)(?: (/)| .*?)?>')
-    # Count non-HTML words and keep note of open tags
-    pos = 0
-    end_text_pos = 0
-    words = 0
-    open_tags = []
-    while words <= length:
-        m = re_words.search(s, pos)
-        if not m:
-            # Checked through whole string
-            break
-        pos = m.end(0)
-        if m.group(1):
-            # It's an actual non-HTML word
-            words += 1
-            if words == length:
-                end_text_pos = pos
-            continue
-        # Check for tag
-        tag = re_tag.match(m.group(0))
-        if not tag or end_text_pos:
-            # Don't worry about non tags or tags after our truncate point
-            continue
-        closing_tag, tagname, self_closing = tag.groups()
-        tagname = tagname.lower()  # Element names are always case-insensitive
-        if self_closing or tagname in html4_singlets:
-            pass
-        elif closing_tag:
-            # Check for match in open tags list
-            try:
-                i = open_tags.index(tagname)
-            except ValueError:
-                pass
-            else:
-                # SGML: An end tag closes, back to the matching start tag,
-                # all unclosed intervening start tags with omitted end tags
-                open_tags = open_tags[i + 1:]
-        else:
-            # Add it to the start of the open tags list
-            open_tags.insert(0, tagname)
-    if words <= length:
-        # Don't try to close tags if we don't need to truncate
+    truncator = _HTMLWordTruncator(length)
+    truncator.feed(s)
+    if truncator.truncate_at is None:
         return s
-    out = s[:end_text_pos]
+    out = s[:truncator.truncate_at]
     if end_text:
         out += ' ' + end_text
     # Close any tags still open
-    for tag in open_tags:
+    for tag in truncator.open_tags:
         out += '</%s>' % tag
     # Return string
     return out

From 5e36a87916dd2cb431b7c916f53348605a687542 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 1 Aug 2015 13:20:04 -0700
Subject: [PATCH 1812/2864] Update changelog

---
 docs/changelog.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f08f67ec..72f71fa5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,10 @@ Release history
 Next release
 ============
 
-- Nothing yet
+* Fix installation errors related to Unicode in tests
+* Don't show pagination in ``notmyidea`` theme if there's only one page
+* Make hidden pages available in context
+* Improve URLWrapper comparison
 
 3.6.0 (2015-06-15)
 ==================

From 96b23e03bd7a2b8a904fafb70d87484f0c81c86e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 1 Aug 2015 13:39:10 -0700
Subject: [PATCH 1813/2864] Bump version 3.6.2

---
 docs/changelog.rst  | 4 ++--
 docs/conf.py        | 2 +-
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 72f71fa5..664e1310 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,8 +1,8 @@
 Release history
 ###############
 
-Next release
-============
+3.6.2 (2015-08-01)
+==================
 
 * Fix installation errors related to Unicode in tests
 * Don't show pagination in ``notmyidea`` theme if there's only one page
diff --git a/docs/conf.py b/docs/conf.py
index 43af8da4..15ae49b9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,7 @@ copyright = '2015, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
-last_stable = '3.6.0'
+last_stable = '3.6.2'
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 932974db..0b5c62d4 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -26,7 +26,7 @@ from pelican.utils import (clean_output_dir, folder_watcher,
                            file_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.6.1.dev"
+__version__ = "3.6.2"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 
diff --git a/setup.py b/setup.py
index 01d40ae4..b6b5c3d8 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.6.1.dev",
+    version="3.6.2",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',

From 7181cc36d59b7e50d1d2da0f4f03e0a77fe02be5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 1 Aug 2015 13:39:24 -0700
Subject: [PATCH 1814/2864] Prepare version 3.6.3.dev for next development
 cycle

---
 docs/changelog.rst  | 5 +++++
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 664e1310..b90fd997 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+Next release
+============
+
+- Nothing yet
+
 3.6.2 (2015-08-01)
 ==================
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0b5c62d4..2762ae71 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -26,7 +26,7 @@ from pelican.utils import (clean_output_dir, folder_watcher,
                            file_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.6.2"
+__version__ = "3.6.3.dev"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 
diff --git a/setup.py b/setup.py
index b6b5c3d8..806464f2 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.6.2",
+    version="3.6.3.dev",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',

From 2ca7aa8c80fa225021ff57da150ce25faaf315db Mon Sep 17 00:00:00 2001
From: Kubilay Kocak <koobs@users.noreply.github.com>
Date: Fri, 7 Aug 2015 14:46:12 +1000
Subject: [PATCH 1815/2864] Add missing *.markdown files to PyPI sdist

The following file is missing from the PyPI source distribution (sdist) due to *.markdown not being referenced in MANIFEST.in:

pelican/tests/content/article_with_markdown_extension.markdown

This missing file appears to cause a number of errors running the test suite. An alternative to this change would be to rename the file to .md so that the file is covered by the existing *.md entry.
---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index dcf9ea45..64ed4b3c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include *.rst
-recursive-include pelican *.html *.css *png *.in *.rst *.md *.mkd *.xml *.py
+recursive-include pelican *.html *.css *png *.in *.rst *.markdown *.md *.mkd *.xml *.py
 include LICENSE THANKS docs/changelog.rst

From 657ffdd75fc49f5364d7198e0f6ce80f1f473aa8 Mon Sep 17 00:00:00 2001
From: winlu <derwinlu+git@gmail.com>
Date: Sat, 8 Aug 2015 14:38:25 +0200
Subject: [PATCH 1816/2864] add warning for unknown replacement indicators

If an unknown replacement indicator {bla} was used, it was ignored
silently. This commit adds a warning when an unmatched indicator occurs
to help identify the issue.

closes #1794
---
 pelican/contents.py            |  5 +++++
 pelican/tests/test_contents.py | 24 +++++++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 0e91933b..a6b8cc5f 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -248,6 +248,11 @@ class Content(object):
                 origin = '/'.join((siteurl, Category(path, self.settings).url))
             elif what == 'tag':
                 origin = '/'.join((siteurl, Tag(path, self.settings).url))
+            else:
+                logger.warning(
+                        "Replacement Indicator '%s' not recognized, "
+                        "skipping replacement",
+                        what)
 
             # keep all other parts, such as query, fragment, etc.
             parts = list(value)
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 01d2ed3b..145a53b6 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals, absolute_import
 
+import logging
 import locale
 import os.path
 import six
@@ -11,7 +12,7 @@ from pelican.contents import (Page, Article, Static, URLWrapper,
                               Author, Category)
 from pelican.settings import DEFAULT_CONFIG
 from pelican.signals import content_object_init
-from pelican.tests.support import unittest, get_settings
+from pelican.tests.support import LoggedTestCase, mute, unittest, get_settings
 from pelican.utils import (path_to_url, truncate_html_words, SafeDatetime,
                            posix_join)
 
@@ -413,10 +414,10 @@ class TestArticle(TestPage):
         self.assertEqual(article.save_as, 'obrien/csharp-stuff/fnord/index.html')
 
 
-class TestStatic(unittest.TestCase):
+class TestStatic(LoggedTestCase):
 
     def setUp(self):
-
+        super(TestStatic, self).setUp()
         self.settings = get_settings(
             STATIC_SAVE_AS='{path}',
             STATIC_URL='{path}',
@@ -578,3 +579,20 @@ class TestStatic(unittest.TestCase):
         content = page.get_content('')
 
         self.assertNotEqual(content, html)
+
+    def test_unknown_link_syntax(self):
+        "{unknown} link syntax should trigger warning."
+
+        html = '<a href="{unknown}foo">link</a>'
+        page = Page(content=html,
+                    metadata={'title': 'fakepage'}, settings=self.settings,
+                    source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
+                    context=self.context)
+        content =  page.get_content('')
+
+        self.assertEqual(content, html)
+        self.assertLogCountEqual(
+                count=1,
+                msg="Replacement Indicator 'unknown' not recognized, "
+                    "skipping replacement",
+                level=logging.WARNING)

From 45ff578f69df5c0f8eb3728569e9e583469d7f1c Mon Sep 17 00:00:00 2001
From: Your Name <rosser.bjr@gmail.com>
Date: Mon, 10 Aug 2015 15:44:13 -0400
Subject: [PATCH 1817/2864] Added optional override_output to write_feed.

The write_feed function now takes an override_output parameter that
does the same thing as override_output does to write_file. Implemented
for custom generators.
---
 pelican/writers.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index e90a0004..36d2f038 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -79,7 +79,8 @@ class Writer(object):
         self._written_files.add(filename)
         return open(filename, 'w', encoding=encoding)
 
-    def write_feed(self, elements, context, path=None, feed_type='atom'):
+    def write_feed(self, elements, context, path=None, feed_type='atom',
+                   override_output=False):
         """Generate a feed with the list of articles provided
 
         Return the feed. If no path or output_path is specified, just
@@ -89,6 +90,9 @@ class Writer(object):
         :param context: the context to get the feed metadata.
         :param path: the path to output.
         :param feed_type: the feed type to use (atom or rss)
+        :param override_output: boolean telling if we can override previous
+            output with the same name (and if next files written with the same
+            name should be skipped to keep that one)
         """
         if not is_selected_for_writing(self.settings, path):
             return
@@ -115,7 +119,7 @@ class Writer(object):
                 pass
 
             encoding = 'utf-8' if six.PY3 else None
-            with self._open_w(complete_path, encoding) as fp:
+            with self._open_w(complete_path, encoding, override_output) as fp:
                 feed.write(fp, 'utf-8')
                 logger.info('Writing %s', complete_path)
 

From ed34ee1808699fa34d2170bf4fa8a26152f27514 Mon Sep 17 00:00:00 2001
From: jah <jah@jahboite.co.uk>
Date: Tue, 11 Aug 2015 20:03:43 +0100
Subject: [PATCH 1818/2864] Correct render of article description meta

in the simple theme: the template incorrectly assumed that the source
metadata is made available as a list of strings. Fixes #1792.
---
 pelican/themes/simple/templates/article.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index d558183d..8ddda4d0 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -5,9 +5,9 @@
     <meta name="keywords" content="{{keyword}}" />
   {% endfor %}
 
-  {% for description in article.description %}
-    <meta name="description" content="{{description}}" />
-  {% endfor %}
+  {% if article.description %}
+    <meta name="description" content="{{article.description}}" />
+  {% endif %}
 
   {% for tag in article.tags %}
     <meta name="tags" content="{{tag}}" />

From ed83ad75a9aeaea97c6ab530b0679d1555c7691c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 14 Aug 2015 16:34:25 -0700
Subject: [PATCH 1819/2864] Bump version 3.6.3

---
 docs/changelog.rst  | 5 +++++
 docs/conf.py        | 2 +-
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 664e1310..70a96b30 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+3.6.3 (2015-08-14)
+==================
+
+* Fix permissions issue in release tarball
+
 3.6.2 (2015-08-01)
 ==================
 
diff --git a/docs/conf.py b/docs/conf.py
index 15ae49b9..d3f58905 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,7 @@ copyright = '2015, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
-last_stable = '3.6.2'
+last_stable = '3.6.3'
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0b5c62d4..a738506a 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -26,7 +26,7 @@ from pelican.utils import (clean_output_dir, folder_watcher,
                            file_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.6.2"
+__version__ = "3.6.3"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 
diff --git a/setup.py b/setup.py
index b6b5c3d8..bdcdea37 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.6.2",
+    version="3.6.3",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',

From e06d0046b1e0ac988167810c0e8906d52d16960a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 14 Aug 2015 17:24:29 -0700
Subject: [PATCH 1820/2864] Prepare version 3.6.4.dev0 for next development
 cycle

---
 docs/changelog.rst  | 5 +++++
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 70a96b30..f52d6449 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+Next release
+============
+
+- Nothing yet
+
 3.6.3 (2015-08-14)
 ==================
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index a738506a..1af14897 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -26,7 +26,7 @@ from pelican.utils import (clean_output_dir, folder_watcher,
                            file_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.6.3"
+__version__ = "3.6.4.dev0"
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 
diff --git a/setup.py b/setup.py
index bdcdea37..86028424 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.6.3",
+    version="3.6.4.dev0",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',

From 5dc6d2914e702c2b599a592fb8d6faeb179e3b0e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Aug 2015 09:57:55 -0700
Subject: [PATCH 1821/2864] Minor tweaks to FAQ docs

---
 docs/faq.rst | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 08df017d..195a4e33 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -12,10 +12,10 @@ How can I help?
 ================
 
 There are several ways to help out. First, you can report any Pelican
-suggestions or problems you might have via IRC or the `issue tracker
-<https://github.com/getpelican/pelican/issues>`_. If submitting an issue
-report, please first check the existing issue list (both open and closed) in
-order to avoid submitting a duplicate issue.
+suggestions or problems you might have via IRC (preferred) or the
+`issue tracker <https://github.com/getpelican/pelican/issues>`_. If submitting
+an issue report, please first check the existing issue list (both open and
+closed) in order to avoid submitting a duplicate issue.
 
 If you want to contribute, please fork `the git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make
@@ -25,20 +25,20 @@ section for more details.
 
 You can also contribute by creating themes and improving the documentation.
 
-Is it mandatory to have a configuration file?
+Is the Pelican settings file mandatory?
 =============================================
 
 Configuration files are optional and are just an easy way to configure Pelican.
 For basic operations, it's possible to specify options while invoking Pelican
 via the command line. See ``pelican --help`` for more information.
 
-Changes to the setting file take no effect
+Changes to the settings file take no effect
 ==========================================
 
 When experimenting with different settings (especially the metadata
 ones) caching may interfere and the changes may not be visible. In
-such cases disable caching with ``LOAD_CONTENT_CACHE = False`` or
-use the ``--ignore-cache`` command-line switch.
+such cases, ensure that caching is disabled via ``LOAD_CONTENT_CACHE = False``
+or use the ``--ignore-cache`` command-line switch.
 
 I'm creating my own theme. How do I use Pygments for syntax highlighting?
 =========================================================================
@@ -251,15 +251,15 @@ moved out of the pelican core and into a separate `plugin
 See the :ref:`plugins` documentation further information about the
 Pelican plugin system.
 
-Since I upgraded Pelican my Pages are no longer rendered
+Since I upgraded Pelican my pages are no longer rendered
 ========================================================
-Pages were available to Themes as lowercase ``pages`` and uppercase
+Pages were available to themes as lowercase ``pages`` and uppercase
 ``PAGES``. To bring this inline with the :ref:`templates-variables` section,
 ``PAGES`` has been removed. This is quickly resolved by updating your theme
 to iterate over ``pages`` instead of ``PAGES``. Just replace::
 
     {% for pg in PAGES %}
 
-with something like::
+...with something like::
 
     {% for pg in pages %}

From bd3bec493eb395699e6564383a50e1b89a11d25f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Aug 2015 10:14:49 -0700
Subject: [PATCH 1822/2864] Fix reST error in docs

---
 docs/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 195a4e33..cd7f598a 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -260,6 +260,6 @@ to iterate over ``pages`` instead of ``PAGES``. Just replace::
 
     {% for pg in PAGES %}
 
-...with something like::
+with something like::
 
     {% for pg in pages %}

From de6bd537b51ccba24f0666ee5d732e3d8453b08e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Aug 2015 10:37:43 -0700
Subject: [PATCH 1823/2864] Fix FAQ header underlines

---
 docs/faq.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index cd7f598a..bb4cd9e6 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -9,7 +9,7 @@ What's the best way to communicate a problem, question, or suggestion?
 Please read our :doc:`feedback guidelines <contribute>`.
 
 How can I help?
-================
+===============
 
 There are several ways to help out. First, you can report any Pelican
 suggestions or problems you might have via IRC (preferred) or the
@@ -26,14 +26,14 @@ section for more details.
 You can also contribute by creating themes and improving the documentation.
 
 Is the Pelican settings file mandatory?
-=============================================
+=======================================
 
 Configuration files are optional and are just an easy way to configure Pelican.
 For basic operations, it's possible to specify options while invoking Pelican
 via the command line. See ``pelican --help`` for more information.
 
 Changes to the settings file take no effect
-==========================================
+===========================================
 
 When experimenting with different settings (especially the metadata
 ones) caching may interfere and the changes may not be visible. In
@@ -60,12 +60,12 @@ CSS file to your new theme::
 Don't forget to import your ``pygment.css`` file from your main CSS file.
 
 How do I create my own theme?
-==============================
+=============================
 
 Please refer to :ref:`theming-pelican`.
 
 I want to use Markdown, but I got an error.
-==========================================================================
+===========================================
 
 If you try to generate Markdown content without first installing the Markdown
 library, may see a message that says ``No valid files found in content``.
@@ -77,7 +77,7 @@ permissions require it::
     pip install markdown
 
 Can I use arbitrary metadata in my templates?
-==============================================
+=============================================
 
 Yes. For example, to include a modified date in a Markdown post, one could
 include the following at the top of the article::

From 44f9cfaaf1c4cb7553314be8c00357825520aaa9 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Mon, 8 Jun 2015 12:50:35 +0200
Subject: [PATCH 1824/2864] add flake8 testing environment

---
 .travis.yml |  1 +
 tox.ini     | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5d7d4a5f..1be196f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ python:
   - "2.7"
 env:
   - TOX_ENV=docs
+  - TOX_ENV=flake8
   - TOX_ENV=py27
   - TOX_ENV=py33
   - TOX_ENV=py34
diff --git a/tox.ini b/tox.ini
index ff16929e..34335b82 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,33,34},docs
+envlist = py{27,33,34},docs,flake8
 
 [testenv]
 basepython =
@@ -27,3 +27,15 @@ deps =
 changedir = docs
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html
+
+[flake8]
+application-import-names = pelican
+import-order-style = cryptography
+
+[testenv:flake8]
+basepython = python2.7
+deps =
+    flake8 <= 2.4.1
+    git+https://github.com/public/flake8-import-order@2ac7052a4e02b4a8a0125a106d87465a3b9fd688
+commands =
+    flake8 pelican

From 8993c55e6edc4993790e2aef182b924ff60b5239 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Tue, 16 Jun 2015 09:25:09 +0200
Subject: [PATCH 1825/2864] fulfil pep8 standard

---
 pelican/__init__.py                 |  68 +++---
 pelican/cache.py                    |  11 +-
 pelican/contents.py                 |  66 +++--
 pelican/generators.py               | 100 ++++----
 pelican/log.py                      |  30 +--
 pelican/paginator.py                |  13 +-
 pelican/readers.py                  | 100 ++++----
 pelican/rstdirectives.py            |  14 +-
 pelican/server.py                   |  16 +-
 pelican/settings.py                 |  88 ++++---
 pelican/signals.py                  |   3 +-
 pelican/tests/default_conf.py       |   7 +-
 pelican/tests/support.py            |  32 +--
 pelican/tests/test_cache.py         |  26 +-
 pelican/tests/test_contents.py      | 138 ++++++-----
 pelican/tests/test_generators.py    | 158 +++++++-----
 pelican/tests/test_importer.py      | 161 ++++++++-----
 pelican/tests/test_paginator.py     |  18 +-
 pelican/tests/test_pelican.py       |  70 +++---
 pelican/tests/test_readers.py       |  86 ++++---
 pelican/tests/test_rstdirectives.py |   7 +-
 pelican/tests/test_settings.py      |  65 ++---
 pelican/tests/test_urlwrappers.py   |   3 +-
 pelican/tests/test_utils.py         | 111 +++++----
 pelican/tools/pelican_import.py     | 361 +++++++++++++++++-----------
 pelican/tools/pelican_quickstart.py | 160 ++++++++----
 pelican/tools/pelican_themes.py     | 122 ++++++----
 pelican/urlwrappers.py              |   3 +-
 pelican/utils.py                    |  85 ++++---
 pelican/writers.py                  |  46 ++--
 tox.ini                             |   1 +
 31 files changed, 1280 insertions(+), 889 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 1af14897..7fb8dfe4 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,45 +1,41 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
-import six
+from __future__ import print_function, unicode_literals
 
+import argparse
+import collections
+import locale
+import logging
 import os
 import re
 import sys
 import time
-import logging
-import argparse
-import locale
-import collections
+
+import six
 
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
-from pelican.log import init
-
+from pelican.log import init  # noqa
 from pelican import signals
-
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
-                                StaticGenerator, SourceFileGenerator,
+                                SourceFileGenerator, StaticGenerator,
                                 TemplatePagesGenerator)
 from pelican.readers import Readers
 from pelican.settings import read_settings
-from pelican.utils import (clean_output_dir, folder_watcher,
-                           file_watcher, maybe_pluralize)
+from pelican.utils import (clean_output_dir, file_watcher,
+                           folder_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
 __version__ = "3.6.4.dev0"
-
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
-
-
 logger = logging.getLogger(__name__)
 
 
 class Pelican(object):
 
     def __init__(self, settings):
-        """
-        Pelican initialisation, performs some checks on the environment before
-        doing anything else.
+        """Pelican initialisation
+
+        Performs some checks on the environment before doing anything else.
         """
 
         # define the default settings
@@ -152,7 +148,7 @@ class Pelican(object):
         context = self.settings.copy()
         # Share these among all the generators and content objects:
         context['filenames'] = {}  # maps source path to Content object or None
-        context['localsiteurl'] = self.settings['SITEURL'] 
+        context['localsiteurl'] = self.settings['SITEURL']
 
         generators = [
             cls(
@@ -190,23 +186,23 @@ class Pelican(object):
                                if isinstance(g, PagesGenerator))
 
         pluralized_articles = maybe_pluralize(
-            len(articles_generator.articles) +
-                len(articles_generator.translations),
+            (len(articles_generator.articles) +
+             len(articles_generator.translations)),
             'article',
             'articles')
         pluralized_drafts = maybe_pluralize(
-            len(articles_generator.drafts) +
-                len(articles_generator.drafts_translations),
+            (len(articles_generator.drafts) +
+             len(articles_generator.drafts_translations)),
             'draft',
             'drafts')
         pluralized_pages = maybe_pluralize(
-            len(pages_generator.pages) +
-                len(pages_generator.translations),
+            (len(pages_generator.pages) +
+             len(pages_generator.translations)),
             'page',
             'pages')
         pluralized_hidden_pages = maybe_pluralize(
-            len(pages_generator.hidden_pages) +
-                len(pages_generator.hidden_translations),
+            (len(pages_generator.hidden_pages) +
+             len(pages_generator.hidden_translations)),
             'hidden page',
             'hidden pages')
 
@@ -243,8 +239,8 @@ class Pelican(object):
         return generators
 
     def get_writer(self):
-        writers = [ w for (_, w) in signals.get_writer.send(self)
-                    if isinstance(w, type) ]
+        writers = [w for (_, w) in signals.get_writer.send(self)
+                   if isinstance(w, type)]
         writers_found = len(writers)
         if writers_found == 0:
             return Writer(self.output_path, settings=self.settings)
@@ -254,15 +250,15 @@ class Pelican(object):
                 logger.debug('Found writer: %s', writer)
             else:
                 logger.warning(
-                    '%s writers found, using only first one: %s', 
+                    '%s writers found, using only first one: %s',
                     writers_found, writer)
             return writer(self.output_path, settings=self.settings)
 
 
 def parse_arguments():
     parser = argparse.ArgumentParser(
-        description="""A tool to generate a static blog,
-        with restructured text input files.""",
+        description='A tool to generate a static blog, '
+                    ' with restructured text input files.',
         formatter_class=argparse.ArgumentDefaultsHelpFormatter
     )
 
@@ -354,7 +350,7 @@ def get_config(args):
     # argparse returns bytes in Py2. There is no definite answer as to which
     # encoding argparse (or sys.argv) uses.
     # "Best" option seems to be locale.getpreferredencoding()
-    # ref: http://mail.python.org/pipermail/python-list/2006-October/405766.html
+    # http://mail.python.org/pipermail/python-list/2006-October/405766.html
     if not six.PY3:
         enc = locale.getpreferredencoding()
         for key in config:
@@ -424,7 +420,8 @@ def main():
 
                         # Added static paths
                         # Add new watchers and set them as modified
-                        for static_path in set(new_static).difference(old_static):
+                        new_watchers = set(new_static).difference(old_static)
+                        for static_path in new_watchers:
                             static_key = '[static]%s' % static_path
                             watchers[static_key] = folder_watcher(
                                 os.path.join(pelican.path, static_path),
@@ -434,7 +431,8 @@ def main():
 
                         # Removed static paths
                         # Remove watchers and modified values
-                        for static_path in set(old_static).difference(new_static):
+                        old_watchers = set(old_static).difference(new_static)
+                        for static_path in old_watchers:
                             static_key = '[static]%s' % static_path
                             watchers.pop(static_key)
                             modified.pop(static_key)
diff --git a/pelican/cache.py b/pelican/cache.py
index d955ae08..e6c10cb9 100644
--- a/pelican/cache.py
+++ b/pelican/cache.py
@@ -1,16 +1,14 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 import hashlib
 import logging
 import os
-try:
-    import cPickle as pickle
-except:
-    import pickle
+
+from six.moves import cPickle as pickle
 
 from pelican.utils import mkdir_p
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -83,6 +81,7 @@ class FileStampDataCacher(FileDataCacher):
         """This sublcass additionally sets filestamp function
         and base path for filestamping operations
         """
+
         super(FileStampDataCacher, self).__init__(settings, cache_name,
                                                   caching_policy,
                                                   load_policy)
@@ -118,6 +117,7 @@ class FileStampDataCacher(FileDataCacher):
         a hash for a function name in the hashlib module
         or an empty bytes string otherwise
         """
+
         try:
             return self._filestamp_func(filename)
         except (IOError, OSError, TypeError) as err:
@@ -133,6 +133,7 @@ class FileStampDataCacher(FileDataCacher):
         Modification is checked by comparing the cached
         and current file stamp.
         """
+
         stamp, data = super(FileStampDataCacher, self).get_cached_data(
             filename, (None, default))
         if stamp != self._get_file_stamp(filename):
diff --git a/pelican/contents.py b/pelican/contents.py
index a6b8cc5f..16d1f074 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,23 +1,24 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
-import six
-from six.moves.urllib.parse import urlparse, urlunparse
+from __future__ import print_function, unicode_literals
 
 import copy
 import locale
 import logging
-import functools
 import os
 import re
 import sys
 
 import pytz
 
+import six
+from six.moves.urllib.parse import urlparse, urlunparse
+
 from pelican import signals
 from pelican.settings import DEFAULT_CONFIG
-from pelican.utils import (slugify, truncate_html_words, memoized, strftime,
-                           python_2_unicode_compatible, deprecated_attribute,
-                           path_to_url, posixize_path, set_date_tzinfo, SafeDatetime)
+from pelican.utils import (SafeDatetime, deprecated_attribute, memoized,
+                           path_to_url, posixize_path,
+                           python_2_unicode_compatible, set_date_tzinfo,
+                           slugify, strftime, truncate_html_words)
 
 # Import these so that they're avalaible when you import from pelican.contents.
 from pelican.urlwrappers import (URLWrapper, Author, Category, Tag)  # NOQA
@@ -66,7 +67,7 @@ class Content(object):
         # also keep track of the metadata attributes available
         self.metadata = local_metadata
 
-        #default template if it's not defined in page
+        # default template if it's not defined in page
         self.template = self._get_template()
 
         # First, read the authors from "authors", if not, fallback to "author"
@@ -94,13 +95,16 @@ class Content(object):
         # create the slug if not existing, generate slug according to
         # setting of SLUG_ATTRIBUTE
         if not hasattr(self, 'slug'):
-            if settings['SLUGIFY_SOURCE'] == 'title' and hasattr(self, 'title'):
+            if (settings['SLUGIFY_SOURCE'] == 'title' and
+                    hasattr(self, 'title')):
                 self.slug = slugify(self.title,
-                                settings.get('SLUG_SUBSTITUTIONS', ()))
-            elif settings['SLUGIFY_SOURCE'] == 'basename' and source_path != None:
-                basename = os.path.basename(os.path.splitext(source_path)[0])
-                self.slug = slugify(basename,
-                                settings.get('SLUG_SUBSTITUTIONS', ()))
+                                    settings.get('SLUG_SUBSTITUTIONS', ()))
+            elif (settings['SLUGIFY_SOURCE'] == 'basename' and
+                    source_path is not None):
+                basename = os.path.basename(
+                    os.path.splitext(source_path)[0])
+                self.slug = slugify(
+                    basename, settings.get('SLUG_SUBSTITUTIONS', ()))
 
         self.source_path = source_path
 
@@ -233,7 +237,8 @@ class Content(object):
                         if isinstance(linked_content, Static):
                             linked_content.attach_to(self)
                         else:
-                            logger.warning("%s used {attach} link syntax on a "
+                            logger.warning(
+                                "%s used {attach} link syntax on a "
                                 "non-static file. Use {filename} instead.",
                                 self.get_relative_source_path())
                     origin = '/'.join((siteurl, linked_content.url))
@@ -241,7 +246,7 @@ class Content(object):
                 else:
                     logger.warning(
                         "Unable to find `%s`, skipping url replacement.",
-                        value.geturl(), extra = {
+                        value.geturl(), extra={
                             'limit_msg': ("Other resources were not found "
                                           "and their urls not replaced")})
             elif what == 'category':
@@ -250,9 +255,9 @@ class Content(object):
                 origin = '/'.join((siteurl, Tag(path, self.settings).url))
             else:
                 logger.warning(
-                        "Replacement Indicator '%s' not recognized, "
-                        "skipping replacement",
-                        what)
+                    "Replacement Indicator '%s' not recognized, "
+                    "skipping replacement",
+                    what)
 
             # keep all other parts, such as query, fragment, etc.
             parts = list(value)
@@ -337,7 +342,9 @@ class Content(object):
 
         return posixize_path(
             os.path.relpath(
-                os.path.abspath(os.path.join(self.settings['PATH'], source_path)),
+                os.path.abspath(os.path.join(
+                    self.settings['PATH'],
+                    source_path)),
                 os.path.abspath(self.settings['PATH'])
             ))
 
@@ -402,9 +409,12 @@ class Static(Page):
     def attach_to(self, content):
         """Override our output directory with that of the given content object.
         """
-        # Determine our file's new output path relative to the linking document.
-        # If it currently lives beneath the linking document's source directory,
-        # preserve that relationship on output. Otherwise, make it a sibling.
+
+        # Determine our file's new output path relative to the linking
+        # document. If it currently lives beneath the linking
+        # document's source directory, preserve that relationship on output.
+        # Otherwise, make it a sibling.
+
         linking_source_dir = os.path.dirname(content.source_path)
         tail_path = os.path.relpath(self.source_path, linking_source_dir)
         if tail_path.startswith(os.pardir + os.sep):
@@ -420,11 +430,14 @@ class Static(Page):
         # 'some/content' with a file named 'index.html'.) Rather than trying
         # to figure it out by comparing the linking document's url and save_as
         # path, we simply build our new url from our new save_as path.
+
         new_url = path_to_url(new_save_as)
 
         def _log_reason(reason):
-            logger.warning("The {attach} link in %s cannot relocate %s "
-                "because %s. Falling back to {filename} link behavior instead.",
+            logger.warning(
+                "The {attach} link in %s cannot relocate "
+                "%s because %s. Falling back to "
+                "{filename} link behavior instead.",
                 content.get_relative_source_path(),
                 self.get_relative_source_path(), reason,
                 extra={'limit_msg': "More {attach} warnings silenced."})
@@ -452,5 +465,6 @@ def is_valid_content(content, f):
         content.check_properties()
         return True
     except NameError as e:
-        logger.error("Skipping %s: could not find information about '%s'", f, e)
+        logger.error(
+            "Skipping %s: could not find information about '%s'", f, e)
         return False
diff --git a/pelican/generators.py b/pelican/generators.py
index da651252..ff9a9d7c 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,28 +1,28 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
 
-import os
-import six
-import logging
-import shutil
-import fnmatch
 import calendar
-
+import fnmatch
+import logging
+import os
+import shutil
 from codecs import open
 from collections import defaultdict
 from functools import partial
 from itertools import chain, groupby
 from operator import attrgetter
 
-from jinja2 import (Environment, FileSystemLoader, PrefixLoader, ChoiceLoader,
-                    BaseLoader, TemplateNotFound)
+from jinja2 import (BaseLoader, ChoiceLoader, Environment, FileSystemLoader,
+                    PrefixLoader, TemplateNotFound)
 
+import six
+
+from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Article, Draft, Page, Static, is_valid_content
 from pelican.readers import Readers
-from pelican.utils import (copy, process_translations, mkdir_p, DateFormatter,
-                           python_2_unicode_compatible, posixize_path)
-from pelican import signals
+from pelican.utils import (DateFormatter, copy, mkdir_p, posixize_path,
+                           process_translations, python_2_unicode_compatible)
 
 
 logger = logging.getLogger(__name__)
@@ -31,6 +31,7 @@ logger = logging.getLogger(__name__)
 class PelicanTemplateNotFound(Exception):
     pass
 
+
 @python_2_unicode_compatible
 class Generator(object):
     """Baseclass generator"""
@@ -90,8 +91,9 @@ class Generator(object):
             try:
                 self._templates[name] = self.env.get_template(name + '.html')
             except TemplateNotFound:
-                raise PelicanTemplateNotFound('[templates] unable to load %s.html from %s'
-                                % (name, self._templates_path))
+                raise PelicanTemplateNotFound(
+                    '[templates] unable to load {}.html from {}'.format(
+                        name, self._templates_path))
         return self._templates[name]
 
     def _include_path(self, path, extensions=None):
@@ -105,7 +107,7 @@ class Generator(object):
             extensions = tuple(self.readers.extensions)
         basename = os.path.basename(path)
 
-        #check IGNORE_FILES
+        # check IGNORE_FILES
         ignores = self.settings['IGNORE_FILES']
         if any(fnmatch.fnmatch(basename, ignore) for ignore in ignores):
             return False
@@ -122,8 +124,9 @@ class Generator(object):
         :param extensions: the list of allowed extensions (if False, all
             extensions are allowed)
         """
+        # backward compatibility for older generators
         if isinstance(paths, six.string_types):
-            paths = [paths] # backward compatibility for older generators
+            paths = [paths]
 
         # group the exclude dir names by parent path, for use with os.walk()
         exclusions_by_dirpath = {}
@@ -138,7 +141,8 @@ class Generator(object):
             root = os.path.join(self.path, path) if path else self.path
 
             if os.path.isdir(root):
-                for dirpath, dirs, temp_files in os.walk(root, followlinks=True):
+                for dirpath, dirs, temp_files in os.walk(
+                        root, followlinks=True):
                     drop = []
                     excl = exclusions_by_dirpath.get(dirpath, ())
                     for d in dirs:
@@ -178,7 +182,8 @@ class Generator(object):
         before this method is called, even if they failed to process.)
         The path argument is expected to be relative to self.path.
         """
-        return posixize_path(os.path.normpath(path)) in self.context['filenames']
+        return (posixize_path(os.path.normpath(path))
+                in self.context['filenames'])
 
     def _update_context(self, items):
         """Update the context with the given items from the currrent
@@ -211,7 +216,8 @@ class CachingGenerator(Generator, FileStampDataCacher):
                            readers_cache_name=(cls_name + '-Readers'),
                            **kwargs)
 
-        cache_this_level = self.settings['CONTENT_CACHING_LAYER'] == 'generator'
+        cache_this_level = \
+            self.settings['CONTENT_CACHING_LAYER'] == 'generator'
         caching_policy = cache_this_level and self.settings['CACHE_CONTENT']
         load_policy = cache_this_level and self.settings['LOAD_CONTENT_CACHE']
         FileStampDataCacher.__init__(self, self.settings, cls_name,
@@ -259,14 +265,14 @@ class ArticlesGenerator(CachingGenerator):
 
     def __init__(self, *args, **kwargs):
         """initialize properties"""
-        self.articles = []  # only articles in default language
+        self.articles = []                 # only articles in default language
         self.translations = []
         self.dates = {}
         self.tags = defaultdict(list)
         self.categories = defaultdict(list)
         self.related_posts = []
         self.authors = defaultdict(list)
-        self.drafts = [] # only drafts in default language
+        self.drafts = []                   # only drafts in default language
         self.drafts_translations = []
         super(ArticlesGenerator, self).__init__(*args, **kwargs)
         signals.article_generator_init.send(self)
@@ -282,8 +288,8 @@ class ArticlesGenerator(CachingGenerator):
             writer.write_feed(self.articles, self.context,
                               self.settings['FEED_RSS'], feed_type='rss')
 
-        if (self.settings.get('FEED_ALL_ATOM')
-                or self.settings.get('FEED_ALL_RSS')):
+        if (self.settings.get('FEED_ALL_ATOM') or
+                self.settings.get('FEED_ALL_RSS')):
             all_articles = list(self.articles)
             for article in self.articles:
                 all_articles.extend(article.translations)
@@ -322,8 +328,8 @@ class ArticlesGenerator(CachingGenerator):
                                   self.settings['AUTHOR_FEED_RSS']
                                   % auth.slug, feed_type='rss')
 
-        if (self.settings.get('TAG_FEED_ATOM')
-                or self.settings.get('TAG_FEED_RSS')):
+        if (self.settings.get('TAG_FEED_ATOM') or
+                self.settings.get('TAG_FEED_RSS')):
             for tag, arts in self.tags.items():
                 arts.sort(key=attrgetter('date'), reverse=True)
                 if self.settings.get('TAG_FEED_ATOM'):
@@ -336,8 +342,8 @@ class ArticlesGenerator(CachingGenerator):
                                       self.settings['TAG_FEED_RSS'] % tag.slug,
                                       feed_type='rss')
 
-        if (self.settings.get('TRANSLATION_FEED_ATOM')
-                or self.settings.get('TRANSLATION_FEED_RSS')):
+        if (self.settings.get('TRANSLATION_FEED_ATOM') or
+                self.settings.get('TRANSLATION_FEED_RSS')):
             translations_feeds = defaultdict(list)
             for article in chain(self.articles, self.translations):
                 translations_feeds[article.lang].append(article)
@@ -472,9 +478,9 @@ class ArticlesGenerator(CachingGenerator):
         """Generate drafts pages."""
         for draft in chain(self.drafts_translations, self.drafts):
             write(draft.save_as, self.get_template(draft.template),
-                self.context, article=draft, category=draft.category,
-                override_output=hasattr(draft, 'override_save_as'),
-                blog=True, all_articles=self.articles)
+                  self.context, article=draft, category=draft.category,
+                  override_output=hasattr(draft, 'override_save_as'),
+                  blog=True, all_articles=self.articles)
 
     def generate_pages(self, writer):
         """Generate the pages on the disk"""
@@ -503,7 +509,8 @@ class ArticlesGenerator(CachingGenerator):
                 exclude=self.settings['ARTICLE_EXCLUDES']):
             article_or_draft = self.get_cached_data(f, None)
             if article_or_draft is None:
-            #TODO needs overhaul, maybe nomad for read_file solution, unified behaviour
+                # TODO needs overhaul, maybe nomad for read_file
+                # solution, unified behaviour
                 try:
                     article_or_draft = self.readers.read_file(
                         base_path=self.path, path=f, content_class=Article,
@@ -513,7 +520,8 @@ class ArticlesGenerator(CachingGenerator):
                         context_signal=signals.article_generator_context,
                         context_sender=self)
                 except Exception as e:
-                    logger.error('Could not process %s\n%s', f, e,
+                    logger.error(
+                        'Could not process %s\n%s', f, e,
                         exc_info=self.settings.get('DEBUG', False))
                     self._add_failed_source_path(f)
                     continue
@@ -535,8 +543,9 @@ class ArticlesGenerator(CachingGenerator):
                     self.add_source_path(article_or_draft)
                     all_drafts.append(article_or_draft)
                 else:
-                    logger.error("Unknown status '%s' for file %s, skipping it.",
-                                   article_or_draft.status, f)
+                    logger.error(
+                        "Unknown status '%s' for file %s, skipping it.",
+                        article_or_draft.status, f)
                     self._add_failed_source_path(f)
                     continue
 
@@ -544,9 +553,9 @@ class ArticlesGenerator(CachingGenerator):
 
             self.add_source_path(article_or_draft)
 
-
-        self.articles, self.translations = process_translations(all_articles,
-                order_by=self.settings['ARTICLE_ORDER_BY'])
+        self.articles, self.translations = process_translations(
+            all_articles,
+            order_by=self.settings['ARTICLE_ORDER_BY'])
         self.drafts, self.drafts_translations = \
             process_translations(all_drafts)
 
@@ -615,7 +624,8 @@ class PagesGenerator(CachingGenerator):
                         context_signal=signals.page_generator_context,
                         context_sender=self)
                 except Exception as e:
-                    logger.error('Could not process %s\n%s', f, e,
+                    logger.error(
+                        'Could not process %s\n%s', f, e,
                         exc_info=self.settings.get('DEBUG', False))
                     self._add_failed_source_path(f)
                     continue
@@ -629,8 +639,9 @@ class PagesGenerator(CachingGenerator):
                 elif page.status.lower() == "hidden":
                     hidden_pages.append(page)
                 else:
-                    logger.error("Unknown status '%s' for file %s, skipping it.",
-                                   page.status, f)
+                    logger.error(
+                        "Unknown status '%s' for file %s, skipping it.",
+                        page.status, f)
                     self._add_failed_source_path(f)
                     continue
 
@@ -638,10 +649,11 @@ class PagesGenerator(CachingGenerator):
 
             self.add_source_path(page)
 
-        self.pages, self.translations = process_translations(all_pages,
-                order_by=self.settings['PAGE_ORDER_BY'])
-        self.hidden_pages, self.hidden_translations = (
-            process_translations(hidden_pages))
+        self.pages, self.translations = process_translations(
+            all_pages,
+            order_by=self.settings['PAGE_ORDER_BY'])
+        self.hidden_pages, self.hidden_translations = \
+            process_translations(hidden_pages)
 
         self._update_context(('pages', 'hidden_pages'))
 
diff --git a/pelican/log.py b/pelican/log.py
index c83c5810..0f4b795b 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
+
+import locale
+import logging
+import os
+import sys
+from collections import Mapping, defaultdict
+
+import six
 
 __all__ = [
     'init'
 ]
 
-import os
-import sys
-import logging
-import locale
-
-from collections import defaultdict, Mapping
-
-import six
 
 class BaseFormatter(logging.Formatter):
     def __init__(self, fmt=None, datefmt=None):
@@ -20,7 +20,8 @@ class BaseFormatter(logging.Formatter):
         super(BaseFormatter, self).__init__(fmt=FORMAT, datefmt=datefmt)
 
     def format(self, record):
-        record.__dict__['customlevelname'] = self._get_levelname(record.levelname)
+        customlevel = self._get_levelname(record.levelname)
+        record.__dict__['customlevelname'] = customlevel
         # format multiline messages 'nicely' to make it clear they are together
         record.msg = record.msg.replace('\n', '\n  | ')
         return super(BaseFormatter, self).format(record)
@@ -132,13 +133,13 @@ class SafeLogger(logging.Logger):
     def _log(self, level, msg, args, exc_info=None, extra=None):
         # if the only argument is a Mapping, Logger uses that for formatting
         # format values for that case
-        if args and len(args)==1 and isinstance(args[0], Mapping):
+        if args and len(args) == 1 and isinstance(args[0], Mapping):
             args = ({k: self._decode_arg(v) for k, v in args[0].items()},)
         # otherwise, format each arg
         else:
             args = tuple(self._decode_arg(arg) for arg in args)
-        super(SafeLogger, self)._log(level, msg, args,
-            exc_info=exc_info, extra=extra)
+        super(SafeLogger, self)._log(
+            level, msg, args, exc_info=exc_info, extra=extra)
 
     def _decode_arg(self, arg):
         '''
@@ -175,8 +176,7 @@ def init(level=None, handler=logging.StreamHandler()):
 
     logger = logging.getLogger()
 
-    if (os.isatty(sys.stdout.fileno())
-            and not sys.platform.startswith('win')):
+    if os.isatty(sys.stdout.fileno()) and not sys.platform.startswith('win'):
         fmt = ANSIFormatter()
     else:
         fmt = TextFormatter()
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 0189ec91..9aca550b 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -1,18 +1,15 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
-import six
+from __future__ import print_function, unicode_literals
 
-# From django.core.paginator
-from collections import namedtuple
 import functools
 import logging
 import os
-
+from collections import namedtuple
 from math import ceil
 
+import six
+
 logger = logging.getLogger(__name__)
-
-
 PaginationRule = namedtuple(
     'PaginationRule',
     'min_page URL SAVE_AS',
@@ -143,7 +140,7 @@ class Page(object):
             'settings': self.settings,
             'base_name': os.path.dirname(self.name),
             'number_sep': '/',
-            'extension':  self.extension,
+            'extension': self.extension,
         }
 
         if self.number == 1:
diff --git a/pelican/readers.py b/pelican/readers.py
index c1c8dbfa..bc4515e7 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
 
 import logging
 import os
@@ -9,24 +9,50 @@ import docutils
 import docutils.core
 import docutils.io
 from docutils.writers.html4css1 import HTMLTranslator
-import six
 
-# import the directives to have pygments support
+import six
+from six.moves.html_parser import HTMLParser
+
 from pelican import rstdirectives  # NOQA
+from pelican import signals
+from pelican.cache import FileStampDataCacher
+from pelican.contents import Author, Category, Page, Tag
+from pelican.utils import SafeDatetime, get_date, pelican_open, posixize_path
+
 try:
     from markdown import Markdown
 except ImportError:
     Markdown = False  # NOQA
+
 try:
     from html import escape
 except ImportError:
     from cgi import escape
-from six.moves.html_parser import HTMLParser
 
-from pelican import signals
-from pelican.cache import FileStampDataCacher
-from pelican.contents import Page, Category, Tag, Author
-from pelican.utils import get_date, pelican_open, SafeDatetime, posixize_path
+# Metadata processors have no way to discard an unwanted value, so we have
+# them return this value instead to signal that it should be discarded later.
+# This means that _filter_discardable_metadata() must be called on processed
+# metadata dicts before use, to remove the items with the special value.
+_DISCARD = object()
+METADATA_PROCESSORS = {
+    'tags': lambda x, y: ([
+        Tag(tag, y)
+        for tag in ensure_metadata_list(x)
+    ] or _DISCARD),
+    'date': lambda x, y: get_date(x.replace('_', ' ')),
+    'modified': lambda x, y: get_date(x),
+    'status': lambda x, y: x.strip() or _DISCARD,
+    'category': lambda x, y: _process_if_nonempty(Category, x, y),
+    'author': lambda x, y: _process_if_nonempty(Author, x, y),
+    'authors': lambda x, y: ([
+        Author(author, y)
+        for author in ensure_metadata_list(x)
+    ] or _DISCARD),
+    'slug': lambda x, y: x.strip() or _DISCARD,
+}
+
+logger = logging.getLogger(__name__)
+
 
 def ensure_metadata_list(text):
     """Canonicalize the format of a list of authors or tags.  This works
@@ -49,13 +75,6 @@ def ensure_metadata_list(text):
     return [v for v in (w.strip() for w in text) if v]
 
 
-# Metadata processors have no way to discard an unwanted value, so we have
-# them return this value instead to signal that it should be discarded later.
-# This means that _filter_discardable_metadata() must be called on processed
-# metadata dicts before use, to remove the items with the special value.
-_DISCARD = object()
-
-
 def _process_if_nonempty(processor, name, settings):
     """Removes extra whitespace from name and applies a metadata processor.
     If name is empty or all whitespace, returns _DISCARD instead.
@@ -64,28 +83,11 @@ def _process_if_nonempty(processor, name, settings):
     return processor(name, settings) if name else _DISCARD
 
 
-METADATA_PROCESSORS = {
-    'tags': lambda x, y: ([Tag(tag, y) for tag in ensure_metadata_list(x)]
-                          or _DISCARD),
-    'date': lambda x, y: get_date(x.replace('_', ' ')),
-    'modified': lambda x, y: get_date(x),
-    'status': lambda x, y: x.strip() or _DISCARD,
-    'category': lambda x, y: _process_if_nonempty(Category, x, y),
-    'author': lambda x, y: _process_if_nonempty(Author, x, y),
-    'authors': lambda x, y: ([Author(author, y)
-                              for author in ensure_metadata_list(x)]
-                             or _DISCARD),
-    'slug': lambda x, y: x.strip() or _DISCARD,
-}
-
-
 def _filter_discardable_metadata(metadata):
     """Return a copy of a dict, minus any items marked as discardable."""
     return {name: val for name, val in metadata.items() if val is not _DISCARD}
 
 
-logger = logging.getLogger(__name__)
-
 class BaseReader(object):
     """Base class to read files.
 
@@ -267,8 +269,10 @@ class MarkdownReader(BaseReader):
                 output[name] = self.process_metadata(name, summary)
             elif name in METADATA_PROCESSORS:
                 if len(value) > 1:
-                    logger.warning('Duplicate definition of `%s` '
-                        'for %s. Using first one.', name, self._source_path)
+                    logger.warning(
+                        'Duplicate definition of `%s` '
+                        'for %s. Using first one.',
+                        name, self._source_path)
                 output[name] = self.process_metadata(name, value[0])
             elif len(value) > 1:
                 # handle list metadata as list of string
@@ -380,7 +384,8 @@ class HTMLReader(BaseReader):
         def _handle_meta_tag(self, attrs):
             name = self._attr_value(attrs, 'name')
             if name is None:
-                attr_serialized = ', '.join(['{}="{}"'.format(k, v) for k, v in attrs])
+                attr_list = ['{}="{}"'.format(k, v) for k, v in attrs]
+                attr_serialized = ', '.join(attr_list)
                 logger.warning("Meta tag in file %s does not have a 'name' "
                                "attribute, skipping. Attributes: %s",
                                self._filename, attr_serialized)
@@ -394,9 +399,9 @@ class HTMLReader(BaseReader):
                         "Meta tag attribute 'contents' used in file %s, should"
                         " be changed to 'content'",
                         self._filename,
-                        extra={'limit_msg': ("Other files have meta tag "
-                                             "attribute 'contents' that should "
-                                             "be changed to 'content'")})
+                        extra={'limit_msg': "Other files have meta tag "
+                                            "attribute 'contents' that should "
+                                            "be changed to 'content'"})
 
             if name == 'keywords':
                 name = 'tags'
@@ -474,7 +479,8 @@ class Readers(FileStampDataCacher):
 
         path = os.path.abspath(os.path.join(base_path, path))
         source_path = posixize_path(os.path.relpath(path, base_path))
-        logger.debug('Read file %s -> %s',
+        logger.debug(
+            'Read file %s -> %s',
             source_path, content_class.__name__)
 
         if not fmt:
@@ -486,7 +492,8 @@ class Readers(FileStampDataCacher):
                 'Pelican does not know how to parse %s', path)
 
         if preread_signal:
-            logger.debug('Signal %s.send(%s)',
+            logger.debug(
+                'Signal %s.send(%s)',
                 preread_signal.name, preread_sender)
             preread_signal.send(preread_sender)
 
@@ -527,7 +534,9 @@ class Readers(FileStampDataCacher):
             def typogrify_wrapper(text):
                 """Ensures ignore_tags feature is backward compatible"""
                 try:
-                    return typogrify(text, self.settings['TYPOGRIFY_IGNORE_TAGS'])
+                    return typogrify(
+                        text,
+                        self.settings['TYPOGRIFY_IGNORE_TAGS'])
                 except TypeError:
                     return typogrify(text)
 
@@ -539,8 +548,10 @@ class Readers(FileStampDataCacher):
                 metadata['summary'] = typogrify_wrapper(metadata['summary'])
 
         if context_signal:
-            logger.debug('Signal %s.send(%s, <metadata>)',
-                context_signal.name, context_sender)
+            logger.debug(
+                'Signal %s.send(%s, <metadata>)',
+                context_signal.name,
+                context_sender)
             context_signal.send(context_sender, metadata=metadata)
 
         return content_class(content=content, metadata=metadata,
@@ -591,7 +602,8 @@ def default_metadata(settings=None, process=None):
             if process:
                 value = process('category', value)
             metadata['category'] = value
-        if settings.get('DEFAULT_DATE', None) and settings['DEFAULT_DATE'] != 'fs':
+        if settings.get('DEFAULT_DATE', None) and \
+           settings['DEFAULT_DATE'] != 'fs':
             metadata['date'] = SafeDatetime(*settings['DEFAULT_DATE'])
     return metadata
 
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index 1c25cc42..b52785dd 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -1,13 +1,17 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
+
+import re
 
 from docutils import nodes, utils
-from docutils.parsers.rst import directives, roles, Directive
-from pygments.formatters import HtmlFormatter
+from docutils.parsers.rst import Directive, directives, roles
+
 from pygments import highlight
-from pygments.lexers import get_lexer_by_name, TextLexer
-import re
+from pygments.formatters import HtmlFormatter
+from pygments.lexers import TextLexer, get_lexer_by_name
+
 import six
+
 import pelican.settings as pys
 
 
diff --git a/pelican/server.py b/pelican/server.py
index f58ac085..9074135b 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -1,16 +1,18 @@
-from __future__ import print_function
+# -*- coding: utf-8 -*-
+from __future__ import print_function, unicode_literals
+
+import logging
 import os
 import sys
-import logging
-
-from six.moves import SimpleHTTPServer as srvmod
-from six.moves import socketserver
 
 try:
     from magic import from_file as magic_from_file
 except ImportError:
     magic_from_file = None
 
+from six.moves import SimpleHTTPServer as srvmod
+from six.moves import socketserver
+
 
 class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
     SUFFIXES = ['', '.html', '/index.html']
@@ -54,12 +56,12 @@ if __name__ == '__main__':
 
     socketserver.TCPServer.allow_reuse_address = True
     try:
-        httpd = socketserver.TCPServer((SERVER, PORT), ComplexHTTPRequestHandler)
+        httpd = socketserver.TCPServer(
+            (SERVER, PORT), ComplexHTTPRequestHandler)
     except OSError as e:
         logging.error("Could not listen on port %s, server %s.", PORT, SERVER)
         sys.exit(getattr(e, 'exitcode', 1))
 
-
     logging.info("Serving at port %s, server %s.", PORT, SERVER)
     try:
         httpd.serve_forever()
diff --git a/pelican/settings.py b/pelican/settings.py
index c1a902cd..4d75333a 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,31 +1,32 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
-import six
+from __future__ import print_function, unicode_literals
 
 import copy
 import inspect
-import os
 import locale
 import logging
+import os
+from os.path import isabs
+from posixpath import join as posix_join
+
+import six
+
+from pelican.log import LimitFilter
 
 try:
     # SourceFileLoader is the recommended way in 3.3+
     from importlib.machinery import SourceFileLoader
-    load_source = lambda name, path: SourceFileLoader(name, path).load_module()
+
+    def load_source(name, path):
+        return SourceFileLoader(name, path).load_module()
 except ImportError:
     # but it does not exist in 3.2-, so fall back to imp
     import imp
     load_source = imp.load_source
 
-from os.path import isabs
-from pelican.utils import posix_join
-
-from pelican.log import LimitFilter
-
 
 logger = logging.getLogger(__name__)
 
-
 DEFAULT_THEME = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                              'themes', 'notmyidea')
 DEFAULT_CONFIG = {
@@ -131,7 +132,7 @@ DEFAULT_CONFIG = {
     'LOAD_CONTENT_CACHE': False,
     'WRITE_SELECTED': [],
     'FORMATTED_FIELDS': ['summary'],
-    }
+}
 
 PYGMENTS_RST_OPTIONS = None
 
@@ -158,8 +159,20 @@ def read_settings(path=None, override=None):
                            "has been deprecated (should be a list)")
             local_settings['PLUGIN_PATHS'] = [local_settings['PLUGIN_PATHS']]
         elif local_settings['PLUGIN_PATHS'] is not None:
-                local_settings['PLUGIN_PATHS'] = [os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(path), pluginpath)))
-                                    if not isabs(pluginpath) else pluginpath for pluginpath in local_settings['PLUGIN_PATHS']]
+            def getabs(path, pluginpath):
+                if isabs(pluginpath):
+                    return pluginpath
+                else:
+                    path_dirname = os.path.dirname(path)
+                    path_joined = os.path.join(path_dirname, pluginpath)
+                    path_normed = os.path.normpath(path_joined)
+                    path_absolute = os.path.abspath(path_normed)
+                    return path_absolute
+
+            pluginpath_list = [getabs(path, pluginpath)
+                               for pluginpath
+                               in local_settings['PLUGIN_PATHS']]
+            local_settings['PLUGIN_PATHS'] = pluginpath_list
     else:
         local_settings = copy.deepcopy(DEFAULT_CONFIG)
 
@@ -199,13 +212,13 @@ def configure_settings(settings):
     settings.
     Also, specify the log messages to be ignored.
     """
-    if not 'PATH' in settings or not os.path.isdir(settings['PATH']):
+    if 'PATH' not in settings or not os.path.isdir(settings['PATH']):
         raise Exception('You need to specify a path containing the content'
                         ' (see pelican --help for more information)')
 
     # specify the log messages to be ignored
-    LimitFilter._ignore.update(set(settings.get('LOG_FILTER',
-                                               DEFAULT_CONFIG['LOG_FILTER'])))
+    log_filter = settings.get('LOG_FILTER', DEFAULT_CONFIG['LOG_FILTER'])
+    LimitFilter._ignore.update(set(log_filter))
 
     # lookup the theme in "pelican/themes" if the given one doesn't exist
     if not os.path.isdir(settings['THEME']):
@@ -223,19 +236,15 @@ def configure_settings(settings):
     settings['WRITE_SELECTED'] = [
         os.path.abspath(path) for path in
         settings.get('WRITE_SELECTED', DEFAULT_CONFIG['WRITE_SELECTED'])
-        ]
+    ]
 
     # standardize strings to lowercase strings
-    for key in [
-            'DEFAULT_LANG',
-            ]:
+    for key in ['DEFAULT_LANG']:
         if key in settings:
             settings[key] = settings[key].lower()
 
     # standardize strings to lists
-    for key in [
-            'LOCALE',
-            ]:
+    for key in ['LOCALE']:
         if key in settings and isinstance(settings[key], six.string_types):
             settings[key] = [settings[key]]
 
@@ -243,12 +252,13 @@ def configure_settings(settings):
     for key, types in [
             ('OUTPUT_SOURCES_EXTENSION', six.string_types),
             ('FILENAME_METADATA', six.string_types),
-            ]:
+    ]:
         if key in settings and not isinstance(settings[key], types):
             value = settings.pop(key)
-            logger.warn('Detected misconfigured %s (%s), '
-                        'falling back to the default (%s)',
-                    key, value, DEFAULT_CONFIG[key])
+            logger.warn(
+                'Detected misconfigured %s (%s), '
+                'falling back to the default (%s)',
+                key, value, DEFAULT_CONFIG[key])
 
     # try to set the different locales, fallback on the default.
     locales = settings.get('LOCALE', DEFAULT_CONFIG['LOCALE'])
@@ -270,16 +280,16 @@ def configure_settings(settings):
             logger.warning("Removed extraneous trailing slash from SITEURL.")
         # If SITEURL is defined but FEED_DOMAIN isn't,
         # set FEED_DOMAIN to SITEURL
-        if not 'FEED_DOMAIN' in settings:
+        if 'FEED_DOMAIN' not in settings:
             settings['FEED_DOMAIN'] = settings['SITEURL']
 
     # check content caching layer and warn of incompatibilities
-    if (settings.get('CACHE_CONTENT', False) and
-        settings.get('CONTENT_CACHING_LAYER', '') == 'generator' and
-        settings.get('WITH_FUTURE_DATES', DEFAULT_CONFIG['WITH_FUTURE_DATES'])):
-        logger.warning('WITH_FUTURE_DATES conflicts with '
-                        "CONTENT_CACHING_LAYER set to 'generator', "
-                        "use 'reader' layer instead")
+    if settings.get('CACHE_CONTENT', False) and \
+       settings.get('CONTENT_CACHING_LAYER', '') == 'generator' and \
+       settings.get('WITH_FUTURE_DATES', False):
+            logger.warning(
+                "WITH_FUTURE_DATES conflicts with CONTENT_CACHING_LAYER "
+                "set to 'generator', use 'reader' layer instead")
 
     # Warn if feeds are generated with both SITEURL & FEED_DOMAIN undefined
     feed_keys = [
@@ -296,7 +306,7 @@ def configure_settings(settings):
             logger.warning('Feeds generated without SITEURL set properly may'
                            ' not be valid')
 
-    if not 'TIMEZONE' in settings:
+    if 'TIMEZONE' not in settings:
         logger.warning(
             'No timezone information specified in the settings. Assuming'
             ' your timezone is UTC for feed generation. Check '
@@ -321,7 +331,8 @@ def configure_settings(settings):
         old_key = key + '_DIR'
         new_key = key + '_PATHS'
         if old_key in settings:
-            logger.warning('Deprecated setting %s, moving it to %s list',
+            logger.warning(
+                'Deprecated setting %s, moving it to %s list',
                 old_key, new_key)
             settings[new_key] = [settings[old_key]]   # also make a list
             del settings[old_key]
@@ -365,8 +376,9 @@ def configure_settings(settings):
     for old, new, doc in [
             ('LESS_GENERATOR', 'the Webassets plugin', None),
             ('FILES_TO_COPY', 'STATIC_PATHS and EXTRA_PATH_METADATA',
-             'https://github.com/getpelican/pelican/blob/master/docs/settings.rst#path-metadata'),
-            ]:
+                'https://github.com/getpelican/pelican/'
+                'blob/master/docs/settings.rst#path-metadata'),
+    ]:
         if old in settings:
             message = 'The {} setting has been removed in favor of {}'.format(
                 old, new)
diff --git a/pelican/signals.py b/pelican/signals.py
index 65c98df7..aeeea9f6 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
+
 from blinker import signal
 
 # Run-level signals:
diff --git a/pelican/tests/default_conf.py b/pelican/tests/default_conf.py
index f38ef804..77c2b947 100644
--- a/pelican/tests/default_conf.py
+++ b/pelican/tests/default_conf.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
 AUTHOR = 'Alexis Métaireau'
 SITENAME = "Alexis' log"
 SITEURL = 'http://blog.notmyidea.org'
@@ -31,17 +31,16 @@ DEFAULT_METADATA = {'yeah': 'it is'}
 # path-specific metadata
 EXTRA_PATH_METADATA = {
     'extra/robots.txt': {'path': 'robots.txt'},
-    }
+}
 
 # static paths will be copied without parsing their contents
 STATIC_PATHS = [
     'pictures',
     'extra/robots.txt',
-    ]
+]
 
 FORMATTED_FIELDS = ['summary', 'custom_formatted_field']
 
 # foobar will not be used, because it's not in caps. All configuration keys
 # have to be in caps
 foobar = "barbaz"
-
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 151fa3b6..3c2a203f 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -1,25 +1,26 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
-__all__ = ['get_article', 'unittest', ]
+from __future__ import print_function, unicode_literals
 
+import locale
+import logging
 import os
 import re
 import subprocess
 import sys
-from six import StringIO
-import logging
-from logging.handlers import BufferingHandler
 import unittest
-import locale
-
-from functools import wraps
 from contextlib import contextmanager
-from tempfile import mkdtemp
+from functools import wraps
+from logging.handlers import BufferingHandler
 from shutil import rmtree
+from tempfile import mkdtemp
+
+from six import StringIO
 
 from pelican.contents import Article
 from pelican.settings import DEFAULT_CONFIG
 
+__all__ = ['get_article', 'unittest', ]
+
 
 @contextmanager
 def temporary_folder():
@@ -167,7 +168,7 @@ def get_settings(**kwargs):
     Set keyword arguments to override specific settings.
     """
     settings = DEFAULT_CONFIG.copy()
-    for key,value in kwargs.items():
+    for key, value in kwargs.items():
         settings[key] = value
     return settings
 
@@ -179,10 +180,13 @@ class LogCountHandler(BufferingHandler):
         logging.handlers.BufferingHandler.__init__(self, capacity)
 
     def count_logs(self, msg=None, level=None):
-        return len([l for l in self.buffer
-            if (msg is None or re.match(msg, l.getMessage()))
-            and (level is None or l.levelno == level)
-            ])
+        return len([
+            l
+            for l
+            in self.buffer
+            if (msg is None or re.match(msg, l.getMessage())) and
+               (level is None or l.levelno == level)
+        ])
 
 
 class LoggedTestCase(unittest.TestCase):
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index 8a20c36b..006e421b 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -1,7 +1,14 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 import os
-from codecs import open
+
+from shutil import rmtree
+from tempfile import mkdtemp
+
+from pelican.generators import ArticlesGenerator, PagesGenerator
+from pelican.tests.support import get_settings, unittest
+
 try:
     from unittest.mock import MagicMock
 except ImportError:
@@ -10,12 +17,6 @@ except ImportError:
     except ImportError:
         MagicMock = False
 
-from shutil import rmtree
-from tempfile import mkdtemp
-
-from pelican.generators import ArticlesGenerator, PagesGenerator
-from pelican.tests.support import unittest, get_settings
-
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_DIR = os.path.join(CUR_DIR, 'content')
 
@@ -35,7 +36,6 @@ class TestCache(unittest.TestCase):
         settings['CACHE_PATH'] = self.temp_cache
         return settings
 
-
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_article_object_caching(self):
         """Test Article objects caching at the generator level"""
@@ -44,7 +44,6 @@ class TestCache(unittest.TestCase):
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['READERS'] = {'asc': None}
 
-
         generator = ArticlesGenerator(
             context=settings.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
@@ -108,7 +107,9 @@ class TestCache(unittest.TestCase):
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.readers.read_file = MagicMock()
         generator.generate_context()
-        self.assertEqual(generator.readers.read_file.call_count, orig_call_count)
+        self.assertEqual(
+            generator.readers.read_file.call_count,
+            orig_call_count)
 
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_page_object_caching(self):
@@ -181,5 +182,6 @@ class TestCache(unittest.TestCase):
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.readers.read_file = MagicMock()
         generator.generate_context()
-        self.assertEqual(generator.readers.read_file.call_count, orig_call_count)
-
+        self.assertEqual(
+            generator.readers.read_file.call_count,
+            orig_call_count)
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 145a53b6..a3664383 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -1,20 +1,21 @@
-from __future__ import unicode_literals, absolute_import
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
 
-import logging
 import locale
+import logging
 import os.path
-import six
-
-from jinja2.utils import generate_lorem_ipsum
+from posixpath import join as posix_join
 from sys import platform
 
-from pelican.contents import (Page, Article, Static, URLWrapper,
-                              Author, Category)
+from jinja2.utils import generate_lorem_ipsum
+
+import six
+
+from pelican.contents import Article, Author, Category, Page, Static
 from pelican.settings import DEFAULT_CONFIG
 from pelican.signals import content_object_init
-from pelican.tests.support import LoggedTestCase, mute, unittest, get_settings
-from pelican.utils import (path_to_url, truncate_html_words, SafeDatetime,
-                           posix_join)
+from pelican.tests.support import LoggedTestCase, get_settings, unittest
+from pelican.utils import SafeDatetime, path_to_url, truncate_html_words
 
 
 # generate one paragraph, enclosed with <p>
@@ -49,7 +50,7 @@ class TestPage(unittest.TestCase):
         # them to initialise object's attributes.
         metadata = {'foo': 'bar', 'foobar': 'baz', 'title': 'foobar', }
         page = Page(TEST_CONTENT, metadata=metadata,
-                context={'localsiteurl': ''})
+                    context={'localsiteurl': ''})
         for key, value in metadata.items():
             self.assertTrue(hasattr(page, key))
             self.assertEqual(value, getattr(page, key))
@@ -139,14 +140,9 @@ class TestPage(unittest.TestCase):
         page = Page(**page_kwargs)
 
         # page.locale_date is a unicode string in both python2 and python3
-        dt_date = dt.strftime(DEFAULT_CONFIG['DEFAULT_DATE_FORMAT']) 
-        # dt_date is a byte string in python2, and a unicode string in python3
-        # Let's make sure it is a unicode string (relies on python 3.3 supporting the u prefix)
-        if type(dt_date) != type(u''):
-            # python2:
-            dt_date = unicode(dt_date, 'utf8')
+        dt_date = dt.strftime(DEFAULT_CONFIG['DEFAULT_DATE_FORMAT'])
 
-        self.assertEqual(page.locale_date, dt_date )
+        self.assertEqual(page.locale_date, dt_date)
         page_kwargs['settings'] = get_settings()
 
         # I doubt this can work on all platforms ...
@@ -307,10 +303,14 @@ class TestPage(unittest.TestCase):
         args['settings'] = get_settings()
         args['source_path'] = 'content'
         args['context']['filenames'] = {
-            'images/poster.jpg': type(cls_name, (object,), {'url': 'images/poster.jpg'}),
-            'assets/video.mp4': type(cls_name, (object,), {'url': 'assets/video.mp4'}),
-            'images/graph.svg': type(cls_name, (object,), {'url': 'images/graph.svg'}),
-            'reference.rst': type(cls_name, (object,), {'url': 'reference.html'}),
+            'images/poster.jpg': type(
+                cls_name, (object,), {'url': 'images/poster.jpg'}),
+            'assets/video.mp4': type(
+                cls_name, (object,), {'url': 'assets/video.mp4'}),
+            'images/graph.svg': type(
+                cls_name, (object,), {'url': 'images/graph.svg'}),
+            'reference.rst': type(
+                cls_name, (object,), {'url': 'reference.html'}),
         }
 
         # video.poster
@@ -325,20 +325,25 @@ class TestPage(unittest.TestCase):
             content,
             'There is a video with poster '
             '<video controls poster="http://notmyidea.org/images/poster.jpg">'
-            '<source src="http://notmyidea.org/assets/video.mp4" type="video/mp4">'
+            '<source src="http://notmyidea.org/assets/video.mp4"'
+            ' type="video/mp4">'
             '</video>'
         )
 
         # object.data
         args['content'] = (
             'There is a svg object '
-            '<object data="{filename}/images/graph.svg" type="image/svg+xml"></object>'
+            '<object data="{filename}/images/graph.svg"'
+            ' type="image/svg+xml">'
+            '</object>'
         )
         content = Page(**args).get_content('http://notmyidea.org')
         self.assertEqual(
             content,
             'There is a svg object '
-            '<object data="http://notmyidea.org/images/graph.svg" type="image/svg+xml"></object>'
+            '<object data="http://notmyidea.org/images/graph.svg"'
+            ' type="image/svg+xml">'
+            '</object>'
         )
 
         # blockquote.cite
@@ -350,7 +355,9 @@ class TestPage(unittest.TestCase):
         self.assertEqual(
             content,
             'There is a blockquote with cite attribute '
-            '<blockquote cite="http://notmyidea.org/reference.html">blah blah</blockquote>'
+            '<blockquote cite="http://notmyidea.org/reference.html">'
+            'blah blah'
+            '</blockquote>'
         )
 
     def test_intrasite_link_markdown_spaces(self):
@@ -401,17 +408,19 @@ class TestArticle(TestPage):
 
     def test_slugify_category_author(self):
         settings = get_settings()
-        settings['SLUG_SUBSTITUTIONS'] = [ ('C#', 'csharp') ]
+        settings['SLUG_SUBSTITUTIONS'] = [('C#', 'csharp')]
         settings['ARTICLE_URL'] = '{author}/{category}/{slug}/'
         settings['ARTICLE_SAVE_AS'] = '{author}/{category}/{slug}/index.html'
         article_kwargs = self._copy_page_kwargs()
         article_kwargs['metadata']['author'] = Author("O'Brien", settings)
-        article_kwargs['metadata']['category'] = Category('C# & stuff', settings)
+        article_kwargs['metadata']['category'] = Category(
+            'C# & stuff', settings)
         article_kwargs['metadata']['title'] = 'fnord'
         article_kwargs['settings'] = settings
         article = Article(**article_kwargs)
         self.assertEqual(article.url, 'obrien/csharp-stuff/fnord/')
-        self.assertEqual(article.save_as, 'obrien/csharp-stuff/fnord/index.html')
+        self.assertEqual(
+            article.save_as, 'obrien/csharp-stuff/fnord/index.html')
 
 
 class TestStatic(LoggedTestCase):
@@ -426,7 +435,8 @@ class TestStatic(LoggedTestCase):
         self.context = self.settings.copy()
 
         self.static = Static(content=None, metadata={}, settings=self.settings,
-            source_path=posix_join('dir', 'foo.jpg'), context=self.context)
+                             source_path=posix_join('dir', 'foo.jpg'),
+                             context=self.context)
 
         self.context['filenames'] = {self.static.source_path: self.static}
 
@@ -436,8 +446,10 @@ class TestStatic(LoggedTestCase):
     def test_attach_to_same_dir(self):
         """attach_to() overrides a static file's save_as and url.
         """
-        page = Page(content="fake page",
-            metadata={'title': 'fakepage'}, settings=self.settings,
+        page = Page(
+            content="fake page",
+            metadata={'title': 'fakepage'},
+            settings=self.settings,
             source_path=os.path.join('dir', 'fakepage.md'))
         self.static.attach_to(page)
 
@@ -449,7 +461,7 @@ class TestStatic(LoggedTestCase):
         """attach_to() preserves dirs inside the linking document dir.
         """
         page = Page(content="fake page", metadata={'title': 'fakepage'},
-            settings=self.settings, source_path='fakepage.md')
+                    settings=self.settings, source_path='fakepage.md')
         self.static.attach_to(page)
 
         expected_save_as = os.path.join('outpages', 'dir', 'foo.jpg')
@@ -460,8 +472,8 @@ class TestStatic(LoggedTestCase):
         """attach_to() ignores dirs outside the linking document dir.
         """
         page = Page(content="fake page",
-            metadata={'title': 'fakepage'}, settings=self.settings,
-            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'))
+                    metadata={'title': 'fakepage'}, settings=self.settings,
+                    source_path=os.path.join('dir', 'otherdir', 'fakepage.md'))
         self.static.attach_to(page)
 
         expected_save_as = os.path.join('outpages', 'foo.jpg')
@@ -472,8 +484,8 @@ class TestStatic(LoggedTestCase):
         """attach_to() does nothing when called a second time.
         """
         page = Page(content="fake page",
-            metadata={'title': 'fakepage'}, settings=self.settings,
-            source_path=os.path.join('dir', 'fakepage.md'))
+                    metadata={'title': 'fakepage'}, settings=self.settings,
+                    source_path=os.path.join('dir', 'fakepage.md'))
 
         self.static.attach_to(page)
 
@@ -481,8 +493,10 @@ class TestStatic(LoggedTestCase):
         otherdir_settings.update(dict(
             PAGE_SAVE_AS=os.path.join('otherpages', '{slug}.html'),
             PAGE_URL='otherpages/{slug}.html'))
-        otherdir_page = Page(content="other page",
-            metadata={'title': 'otherpage'}, settings=otherdir_settings,
+        otherdir_page = Page(
+            content="other page",
+            metadata={'title': 'otherpage'},
+            settings=otherdir_settings,
             source_path=os.path.join('dir', 'otherpage.md'))
 
         self.static.attach_to(otherdir_page)
@@ -497,8 +511,10 @@ class TestStatic(LoggedTestCase):
         """
         original_save_as = self.static.save_as
 
-        page = Page(content="fake page",
-            metadata={'title': 'fakepage'}, settings=self.settings,
+        page = Page(
+            content="fake page",
+            metadata={'title': 'fakepage'},
+            settings=self.settings,
             source_path=os.path.join('dir', 'fakepage.md'))
         self.static.attach_to(page)
 
@@ -511,8 +527,10 @@ class TestStatic(LoggedTestCase):
         """
         original_url = self.static.url
 
-        page = Page(content="fake page",
-            metadata={'title': 'fakepage'}, settings=self.settings,
+        page = Page(
+            content="fake page",
+            metadata={'title': 'fakepage'},
+            settings=self.settings,
             source_path=os.path.join('dir', 'fakepage.md'))
         self.static.attach_to(page)
 
@@ -523,13 +541,15 @@ class TestStatic(LoggedTestCase):
         """attach_to() does not override paths that were overridden elsewhere.
         (For example, by the user with EXTRA_PATH_METADATA)
         """
-        customstatic = Static(content=None,
+        customstatic = Static(
+            content=None,
             metadata=dict(save_as='customfoo.jpg', url='customfoo.jpg'),
             settings=self.settings,
             source_path=os.path.join('dir', 'foo.jpg'),
             context=self.settings.copy())
 
-        page = Page(content="fake page",
+        page = Page(
+            content="fake page",
             metadata={'title': 'fakepage'}, settings=self.settings,
             source_path=os.path.join('dir', 'fakepage.md'))
 
@@ -542,13 +562,16 @@ class TestStatic(LoggedTestCase):
         """{attach} link syntax triggers output path override & url replacement.
         """
         html = '<a href="{attach}../foo.jpg">link</a>'
-        page = Page(content=html,
-            metadata={'title': 'fakepage'}, settings=self.settings,
+        page = Page(
+            content=html,
+            metadata={'title': 'fakepage'},
+            settings=self.settings,
             source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
             context=self.context)
         content = page.get_content('')
 
-        self.assertNotEqual(content, html,
+        self.assertNotEqual(
+            content, html,
             "{attach} link syntax did not trigger URL replacement.")
 
         expected_save_as = os.path.join('outpages', 'foo.jpg')
@@ -561,7 +584,8 @@ class TestStatic(LoggedTestCase):
         html = '<a href="{tag}foo">link</a>'
         page = Page(
             content=html,
-            metadata={'title': 'fakepage'}, settings=self.settings,
+            metadata={'title': 'fakepage'},
+            settings=self.settings,
             source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
             context=self.context)
         content = page.get_content('')
@@ -572,8 +596,10 @@ class TestStatic(LoggedTestCase):
         "{category} link syntax triggers url replacement."
 
         html = '<a href="{category}foo">link</a>'
-        page = Page(content=html,
-            metadata={'title': 'fakepage'}, settings=self.settings,
+        page = Page(
+            content=html,
+            metadata={'title': 'fakepage'},
+            settings=self.settings,
             source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
             context=self.context)
         content = page.get_content('')
@@ -588,11 +614,11 @@ class TestStatic(LoggedTestCase):
                     metadata={'title': 'fakepage'}, settings=self.settings,
                     source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
                     context=self.context)
-        content =  page.get_content('')
+        content = page.get_content('')
 
         self.assertEqual(content, html)
         self.assertLogCountEqual(
-                count=1,
-                msg="Replacement Indicator 'unknown' not recognized, "
-                    "skipping replacement",
-                level=logging.WARNING)
+            count=1,
+            msg="Replacement Indicator 'unknown' not recognized, "
+                "skipping replacement",
+            level=logging.WARNING)
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index c424b60f..2cfca04f 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1,8 +1,18 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+import locale
 import os
+
 from codecs import open
+from shutil import rmtree
+from tempfile import mkdtemp
+
+from pelican.generators import (ArticlesGenerator, Generator, PagesGenerator,
+                                StaticGenerator, TemplatePagesGenerator)
+from pelican.tests.support import get_settings, unittest
+from pelican.writers import Writer
+
 try:
     from unittest.mock import MagicMock
 except ImportError:
@@ -10,14 +20,7 @@ except ImportError:
         from mock import MagicMock
     except ImportError:
         MagicMock = False
-from shutil import rmtree
-from tempfile import mkdtemp
 
-from pelican.generators import (Generator, ArticlesGenerator, PagesGenerator,
-                                StaticGenerator, TemplatePagesGenerator)
-from pelican.writers import Writer
-from pelican.tests.support import unittest, get_settings
-import locale
 
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_DIR = os.path.join(CUR_DIR, 'content')
@@ -35,7 +38,6 @@ class TestGenerator(unittest.TestCase):
     def tearDown(self):
         locale.setlocale(locale.LC_ALL, self.old_locale)
 
-
     def test_include_path(self):
         self.settings['IGNORE_FILES'] = {'ignored1.rst', 'ignored2.rst'}
 
@@ -52,7 +54,8 @@ class TestGenerator(unittest.TestCase):
         """Test that Generator.get_files() properly excludes directories.
         """
         # We use our own Generator so we can give it our own content path
-        generator = Generator(context=self.settings.copy(),
+        generator = Generator(
+            context=self.settings.copy(),
             settings=self.settings,
             path=os.path.join(CUR_DIR, 'nested_content'),
             theme=self.settings['THEME'], output_path=None)
@@ -60,34 +63,42 @@ class TestGenerator(unittest.TestCase):
         filepaths = generator.get_files(paths=['maindir'])
         found_files = {os.path.basename(f) for f in filepaths}
         expected_files = {'maindir.md', 'subdir.md'}
-        self.assertFalse(expected_files - found_files,
+        self.assertFalse(
+            expected_files - found_files,
             "get_files() failed to find one or more files")
 
         # Test string as `paths` argument rather than list
         filepaths = generator.get_files(paths='maindir')
         found_files = {os.path.basename(f) for f in filepaths}
         expected_files = {'maindir.md', 'subdir.md'}
-        self.assertFalse(expected_files - found_files,
+        self.assertFalse(
+            expected_files - found_files,
             "get_files() failed to find one or more files")
 
         filepaths = generator.get_files(paths=[''], exclude=['maindir'])
         found_files = {os.path.basename(f) for f in filepaths}
-        self.assertNotIn('maindir.md', found_files,
+        self.assertNotIn(
+            'maindir.md', found_files,
             "get_files() failed to exclude a top-level directory")
-        self.assertNotIn('subdir.md', found_files,
+        self.assertNotIn(
+            'subdir.md', found_files,
             "get_files() failed to exclude a subdir of an excluded directory")
 
-        filepaths = generator.get_files(paths=[''],
+        filepaths = generator.get_files(
+            paths=[''],
             exclude=[os.path.join('maindir', 'subdir')])
         found_files = {os.path.basename(f) for f in filepaths}
-        self.assertNotIn('subdir.md', found_files,
+        self.assertNotIn(
+            'subdir.md', found_files,
             "get_files() failed to exclude a subdirectory")
 
         filepaths = generator.get_files(paths=[''], exclude=['subdir'])
         found_files = {os.path.basename(f) for f in filepaths}
-        self.assertIn('subdir.md', found_files,
+        self.assertIn(
+            'subdir.md', found_files,
             "get_files() excluded a subdirectory by name, ignoring its path")
 
+
 class TestArticlesGenerator(unittest.TestCase):
 
     @classmethod
@@ -96,7 +107,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['READERS'] = {'asc': None}
-        settings['CACHE_CONTENT'] = False   # cache not needed for this logic tests
+        settings['CACHE_CONTENT'] = False
 
         cls.generator = ArticlesGenerator(
             context=settings.copy(), settings=settings,
@@ -152,25 +163,30 @@ class TestArticlesGenerator(unittest.TestCase):
             ['Test mkd File', 'published', 'test', 'article'],
             ['This is a super article !', 'published', 'Yeah', 'article'],
             ['This is a super article !', 'published', 'Yeah', 'article'],
-            ['Article with Nonconformant HTML meta tags', 'published', 'Default', 'article'],
+            ['Article with Nonconformant HTML meta tags', 'published',
+                'Default', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'Default', 'article'],
             ['This is an article with category !', 'published', 'yeah',
              'article'],
-            ['This is an article with multiple authors!', 'published', 'Default', 'article'],
-            ['This is an article with multiple authors!', 'published', 'Default', 'article'],
-            ['This is an article with multiple authors in list format!', 'published', 'Default', 'article'],
-            ['This is an article with multiple authors in lastname, firstname format!', 'published', 'Default', 'article'],
+            ['This is an article with multiple authors!', 'published',
+                'Default', 'article'],
+            ['This is an article with multiple authors!', 'published',
+                'Default', 'article'],
+            ['This is an article with multiple authors in list format!',
+                'published', 'Default', 'article'],
+            ['This is an article with multiple authors in lastname, '
+             'firstname format!', 'published', 'Default', 'article'],
             ['This is an article without category !', 'published', 'Default',
-             'article'],
+                'article'],
             ['This is an article without category !', 'published',
              'TestCategory', 'article'],
             ['An Article With Code Block To Test Typogrify Ignore',
-              'published', 'Default', 'article'],
-            ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定', 'published',
-             '指導書', 'article'],
+                'published', 'Default', 'article'],
+            ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定',
+                'published', '指導書', 'article'],
         ]
         self.assertEqual(sorted(articles_expected), sorted(self.articles))
 
@@ -292,7 +308,7 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_period_archives(write)
         dates = [d for d in generator.dates if d.date.year == 1970]
         self.assertEqual(len(dates), 1)
-        #among other things it must have at least been called with this
+        # among other things it must have at least been called with this
         settings["period"] = (1970,)
         write.assert_called_with("posts/1970/index.html",
                                  generator.get_template("period_archives"),
@@ -300,37 +316,42 @@ class TestArticlesGenerator(unittest.TestCase):
                                  blog=True, dates=dates)
 
         del settings["period"]
-        settings['MONTH_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/{date:%b}/index.html'
+        settings['MONTH_ARCHIVE_SAVE_AS'] = \
+            'posts/{date:%Y}/{date:%b}/index.html'
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         write = MagicMock()
         generator.generate_period_archives(write)
-        dates = [d for d in generator.dates if d.date.year == 1970
-                                            and d.date.month == 1]
+        dates = [d for d in generator.dates
+                 if d.date.year == 1970 and d.date.month == 1]
         self.assertEqual(len(dates), 1)
         settings["period"] = (1970, "January")
-        #among other things it must have at least been called with this
+        # among other things it must have at least been called with this
         write.assert_called_with("posts/1970/Jan/index.html",
                                  generator.get_template("period_archives"),
                                  settings,
                                  blog=True, dates=dates)
 
         del settings["period"]
-        settings['DAY_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/{date:%b}/{date:%d}/index.html'
+        settings['DAY_ARCHIVE_SAVE_AS'] = \
+            'posts/{date:%Y}/{date:%b}/{date:%d}/index.html'
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         write = MagicMock()
         generator.generate_period_archives(write)
-        dates = [d for d in generator.dates if d.date.year == 1970
-                                            and d.date.month == 1
-                                            and d.date.day == 1]
+        dates = [
+            d for d in generator.dates if
+            d.date.year == 1970 and
+            d.date.month == 1 and
+            d.date.day == 1
+        ]
         self.assertEqual(len(dates), 1)
         settings["period"] = (1970, "January", 1)
-        #among other things it must have at least been called with this
+        # among other things it must have at least been called with this
         write.assert_called_with("posts/1970/Jan/01/index.html",
                                  generator.get_template("period_archives"),
                                  settings,
@@ -347,11 +368,14 @@ class TestArticlesGenerator(unittest.TestCase):
     def test_generate_authors(self):
         """Check authors generation."""
         authors = [author.name for author, _ in self.generator.authors]
-        authors_expected = sorted(['Alexis Métaireau', 'Author, First', 'Author, Second', 'First Author', 'Second Author'])
+        authors_expected = sorted(
+            ['Alexis Métaireau', 'Author, First', 'Author, Second',
+             'First Author', 'Second Author'])
         self.assertEqual(sorted(authors), authors_expected)
         # test for slug
         authors = [author.slug for author, _ in self.generator.authors]
-        authors_expected = ['alexis-metaireau', 'author-first', 'author-second', 'first-author', 'second-author']
+        authors_expected = ['alexis-metaireau', 'author-first',
+                            'author-second', 'first-author', 'second-author']
         self.assertEqual(sorted(authors), sorted(authors_expected))
 
     def test_standard_metadata_in_default_metadata(self):
@@ -391,7 +415,6 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings(filenames={})
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
-        settings['CACHE_CONTENT'] = False   # cache not needed for this logic tests
         settings['ARTICLE_ORDER_BY'] = 'title'
 
         generator = ArticlesGenerator(
@@ -420,7 +443,8 @@ class TestArticlesGenerator(unittest.TestCase):
             'This is a super article !',
             'This is a super article !',
             'This is an article with category !',
-            'This is an article with multiple authors in lastname, firstname format!',
+            ('This is an article with multiple authors in lastname, '
+             'firstname format!'),
             'This is an article with multiple authors in list format!',
             'This is an article with multiple authors!',
             'This is an article with multiple authors!',
@@ -435,7 +459,6 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings(filenames={})
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
-        settings['CACHE_CONTENT'] = False   # cache not needed for this logic tests
         settings['ARTICLE_ORDER_BY'] = 'reversed-title'
 
         generator = ArticlesGenerator(
@@ -561,7 +584,7 @@ class TestPageGenerator(unittest.TestCase):
         are generated correctly on pages
         """
         settings = get_settings(filenames={})
-        settings['PAGE_PATHS'] = ['TestPages'] # relative to CUR_DIR
+        settings['PAGE_PATHS'] = ['TestPages']    # relative to CUR_DIR
         settings['CACHE_PATH'] = self.temp_cache
         settings['DEFAULT_DATE'] = (1970, 1, 1)
 
@@ -586,7 +609,6 @@ class TestTemplatePagesGenerator(unittest.TestCase):
         self.old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, str('C'))
 
-
     def tearDown(self):
         rmtree(self.temp_content)
         rmtree(self.temp_output)
@@ -632,59 +654,67 @@ class TestStaticGenerator(unittest.TestCase):
     def test_static_excludes(self):
         """Test that StaticGenerator respects STATIC_EXCLUDES.
         """
-        settings = get_settings(STATIC_EXCLUDES=['subdir'],
-            PATH=self.content_path, STATIC_PATHS=[''])
+        settings = get_settings(
+            STATIC_EXCLUDES=['subdir'],
+            PATH=self.content_path,
+            STATIC_PATHS=[''],
+            filenames={})
         context = settings.copy()
-        context['filenames'] = {}
 
-        StaticGenerator(context=context, settings=settings,
+        StaticGenerator(
+            context=context, settings=settings,
             path=settings['PATH'], output_path=None,
             theme=settings['THEME']).generate_context()
 
         staticnames = [os.path.basename(c.source_path)
-            for c in context['staticfiles']]
+                       for c in context['staticfiles']]
 
-        self.assertNotIn('subdir_fake_image.jpg', staticnames,
+        self.assertNotIn(
+            'subdir_fake_image.jpg', staticnames,
             "StaticGenerator processed a file in a STATIC_EXCLUDES directory")
-        self.assertIn('fake_image.jpg', staticnames,
+        self.assertIn(
+            'fake_image.jpg', staticnames,
             "StaticGenerator skipped a file that it should have included")
 
     def test_static_exclude_sources(self):
         """Test that StaticGenerator respects STATIC_EXCLUDE_SOURCES.
         """
-        # Test STATIC_EXCLUDE_SOURCES=True
 
-        settings = get_settings(STATIC_EXCLUDE_SOURCES=True,
-            PATH=self.content_path, PAGE_PATHS=[''], STATIC_PATHS=[''],
-            CACHE_CONTENT=False)
+        settings = get_settings(
+            STATIC_EXCLUDE_SOURCES=True,
+            PATH=self.content_path,
+            PAGE_PATHS=[''],
+            STATIC_PATHS=[''],
+            CACHE_CONTENT=False,
+            filenames={})
         context = settings.copy()
-        context['filenames'] = {}
 
         for generator_class in (PagesGenerator, StaticGenerator):
-            generator_class(context=context, settings=settings,
+            generator_class(
+                context=context, settings=settings,
                 path=settings['PATH'], output_path=None,
                 theme=settings['THEME']).generate_context()
 
         staticnames = [os.path.basename(c.source_path)
-            for c in context['staticfiles']]
+                       for c in context['staticfiles']]
 
-        self.assertFalse(any(name.endswith(".md") for name in staticnames),
+        self.assertFalse(
+            any(name.endswith(".md") for name in staticnames),
             "STATIC_EXCLUDE_SOURCES=True failed to exclude a markdown file")
 
-        # Test STATIC_EXCLUDE_SOURCES=False
-
         settings.update(STATIC_EXCLUDE_SOURCES=False)
         context = settings.copy()
         context['filenames'] = {}
 
         for generator_class in (PagesGenerator, StaticGenerator):
-            generator_class(context=context, settings=settings,
+            generator_class(
+                context=context, settings=settings,
                 path=settings['PATH'], output_path=None,
                 theme=settings['THEME']).generate_context()
 
         staticnames = [os.path.basename(c.source_path)
-            for c in context['staticfiles']]
+                       for c in context['staticfiles']]
 
-        self.assertTrue(any(name.endswith(".md") for name in staticnames),
+        self.assertTrue(
+            any(name.endswith(".md") for name in staticnames),
             "STATIC_EXCLUDE_SOURCES=False failed to include a markdown file")
-
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 4ace5ccc..6af59212 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -1,16 +1,19 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+# -*- coding: utf-8 -*-
+from __future__ import print_function, unicode_literals
 
+import locale
 import os
 import re
 
-import locale
 from codecs import open
-from pelican.tools.pelican_import import wp2fields, fields2pelican, decode_wp_content, build_header, build_markdown_header, get_attachments, download_attachments
-from pelican.tests.support import (unittest, temporary_folder, mute,
-                                   skipIfNoExecutable)
 
-from pelican.utils import slugify, path_to_file_url
+from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder,
+                                   unittest)
+from pelican.tools.pelican_import import (build_header, build_markdown_header,
+                                          decode_wp_content,
+                                          download_attachments, fields2pelican,
+                                          get_attachments, wp2fields)
+from pelican.utils import path_to_file_url, slugify
 
 CUR_DIR = os.path.abspath(os.path.dirname(__file__))
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
@@ -32,7 +35,6 @@ except ImportError:
     LXML = False
 
 
-
 @skipIfNoExecutable(['pandoc', '--version'])
 @unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
 class TestWordpressXmlImporter(unittest.TestCase):
@@ -48,17 +50,19 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
     def test_ignore_empty_posts(self):
         self.assertTrue(self.posts)
-        for title, content, fname, date, author, categ, tags, status, kind, format in self.posts:
-            self.assertTrue(title.strip())
+        for (title, content, fname, date, author,
+             categ, tags, status, kind, format) in self.posts:
+                self.assertTrue(title.strip())
 
     def test_recognise_page_kind(self):
         """ Check that we recognise pages in wordpress, as opposed to posts """
         self.assertTrue(self.posts)
         # Collect (title, filename, kind) of non-empty posts recognised as page
         pages_data = []
-        for title, content, fname, date, author, categ, tags, status, kind, format in self.posts:
-            if kind == 'page':
-                pages_data.append((title, fname))
+        for (title, content, fname, date, author,
+             categ, tags, status, kind, format) in self.posts:
+                if kind == 'page':
+                    pages_data.append((title, fname))
         self.assertEqual(2, len(pages_data))
         self.assertEqual(('Page', 'contact'), pages_data[0])
         self.assertEqual(('Empty Page', 'empty'), pages_data[1])
@@ -67,7 +71,8 @@ class TestWordpressXmlImporter(unittest.TestCase):
         silent_f2p = mute(True)(fields2pelican)
         test_post = filter(lambda p: p[0].startswith("Empty Page"), self.posts)
         with temporary_folder() as temp:
-            fname = list(silent_f2p(test_post, 'markdown', temp, dirpage=True))[0]
+            fname = list(silent_f2p(test_post, 'markdown',
+                                    temp, dirpage=True))[0]
             self.assertTrue(fname.endswith('pages%sempty.md' % os.path.sep))
 
     def test_dircat(self):
@@ -75,10 +80,11 @@ class TestWordpressXmlImporter(unittest.TestCase):
         test_posts = []
         for post in self.posts:
             # check post kind
-            if len(post[5]) > 0: # Has a category
+            if len(post[5]) > 0:  # Has a category
                 test_posts.append(post)
         with temporary_folder() as temp:
-            fnames = list(silent_f2p(test_posts, 'markdown', temp, dircat=True))
+            fnames = list(silent_f2p(test_posts, 'markdown',
+                                     temp, dircat=True))
         index = 0
         for post in test_posts:
             name = post[2]
@@ -92,25 +98,33 @@ class TestWordpressXmlImporter(unittest.TestCase):
     def test_unless_custom_post_all_items_should_be_pages_or_posts(self):
         self.assertTrue(self.posts)
         pages_data = []
-        for title, content, fname, date, author, categ, tags, status, kind, format in self.posts:
-            if kind == 'page' or kind == 'article':
-                pass
-            else:
-                pages_data.append((title, fname))
+        for (title, content, fname, date, author, categ,
+             tags, status, kind, format) in self.posts:
+                if kind == 'page' or kind == 'article':
+                    pass
+                else:
+                    pages_data.append((title, fname))
         self.assertEqual(0, len(pages_data))
 
     def test_recognise_custom_post_type(self):
         self.assertTrue(self.custposts)
         cust_data = []
-        for title, content, fname, date, author, categ, tags, status, kind, format in self.custposts:
-            if kind == 'article' or kind == 'page':
-                pass
-            else:
-                cust_data.append((title, kind))
+        for (title, content, fname, date, author, categ,
+             tags, status, kind, format) in self.custposts:
+                if kind == 'article' or kind == 'page':
+                    pass
+                else:
+                    cust_data.append((title, kind))
         self.assertEqual(3, len(cust_data))
-        self.assertEqual(('A custom post in category 4', 'custom1'), cust_data[0])
-        self.assertEqual(('A custom post in category 5', 'custom1'), cust_data[1])
-        self.assertEqual(('A 2nd custom post type also in category 5', 'custom2'), cust_data[2])
+        self.assertEqual(
+            ('A custom post in category 4', 'custom1'),
+            cust_data[0])
+        self.assertEqual(
+            ('A custom post in category 5', 'custom1'),
+            cust_data[1])
+        self.assertEqual(
+            ('A 2nd custom post type also in category 5', 'custom2'),
+            cust_data[2])
 
     def test_custom_posts_put_in_own_dir(self):
         silent_f2p = mute(True)(fields2pelican)
@@ -122,7 +136,8 @@ class TestWordpressXmlImporter(unittest.TestCase):
             else:
                 test_posts.append(post)
         with temporary_folder() as temp:
-            fnames = list(silent_f2p(test_posts, 'markdown', temp, wp_custpost = True))
+            fnames = list(silent_f2p(test_posts, 'markdown',
+                                     temp, wp_custpost=True))
         index = 0
         for post in test_posts:
             name = post[2]
@@ -144,7 +159,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
                 test_posts.append(post)
         with temporary_folder() as temp:
             fnames = list(silent_f2p(test_posts, 'markdown', temp,
-                wp_custpost=True, dircat=True))
+                                     wp_custpost=True, dircat=True))
         index = 0
         for post in test_posts:
             name = post[2]
@@ -157,7 +172,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
             index += 1
 
     def test_wp_custpost_true_dirpage_false(self):
-        #pages should only be put in their own directory when dirpage = True
+        # pages should only be put in their own directory when dirpage = True
         silent_f2p = mute(True)(fields2pelican)
         test_posts = []
         for post in self.custposts:
@@ -166,7 +181,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
                 test_posts.append(post)
         with temporary_folder() as temp:
             fnames = list(silent_f2p(test_posts, 'markdown', temp,
-                wp_custpost=True, dirpage=False))
+                                     wp_custpost=True, dirpage=False))
         index = 0
         for post in test_posts:
             name = post[2]
@@ -175,7 +190,6 @@ class TestWordpressXmlImporter(unittest.TestCase):
             out_name = fnames[index]
             self.assertFalse(out_name.endswith(filename))
 
-
     def test_can_toggle_raw_html_code_parsing(self):
         def r(f):
             with open(f, encoding='utf-8') as infile:
@@ -184,10 +198,12 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
         with temporary_folder() as temp:
 
-            rst_files = (r(f) for f in silent_f2p(self.posts, 'markdown', temp))
+            rst_files = (r(f) for f
+                         in silent_f2p(self.posts, 'markdown', temp))
             self.assertTrue(any('<iframe' in rst for rst in rst_files))
-            rst_files = (r(f) for f in silent_f2p(self.posts, 'markdown', temp,
-                         strip_raw=True))
+            rst_files = (r(f) for f
+                         in silent_f2p(self.posts, 'markdown',
+                                       temp, strip_raw=True))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
             # no effect in rst
             rst_files = (r(f) for f in silent_f2p(self.posts, 'rst', temp))
@@ -197,13 +213,14 @@ class TestWordpressXmlImporter(unittest.TestCase):
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
 
     def test_decode_html_entities_in_titles(self):
-        test_posts = [post for post in self.posts if post[2] == 'html-entity-test']
+        test_posts = [post for post
+                      in self.posts if post[2] == 'html-entity-test']
         self.assertEqual(len(test_posts), 1)
 
         post = test_posts[0]
         title = post[0]
-        self.assertTrue(title, "A normal post with some <html> entities in the"
-                               " title. You can't miss them.")
+        self.assertTrue(title, "A normal post with some <html> entities in "
+                               "the title. You can't miss them.")
         self.assertNotIn('&', title)
 
     def test_decode_wp_content_returns_empty(self):
@@ -216,14 +233,18 @@ class TestWordpressXmlImporter(unittest.TestCase):
             encoded_content = encoded_file.read()
             with open(WORDPRESS_DECODED_CONTENT_SAMPLE, 'r') as decoded_file:
                 decoded_content = decoded_file.read()
-                self.assertEqual(decode_wp_content(encoded_content, br=False), decoded_content)
+                self.assertEqual(
+                    decode_wp_content(encoded_content, br=False),
+                    decoded_content)
 
     def test_preserve_verbatim_formatting(self):
         def r(f):
             with open(f, encoding='utf-8') as infile:
                 return infile.read()
         silent_f2p = mute(True)(fields2pelican)
-        test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)
+        test_post = filter(
+            lambda p: p[0].startswith("Code in List"),
+            self.posts)
         with temporary_folder() as temp:
             md = [r(f) for f in silent_f2p(test_post, 'markdown', temp)][0]
             self.assertTrue(re.search(r'\s+a = \[1, 2, 3\]', md))
@@ -231,14 +252,17 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
             for_line = re.search(r'\s+for i in zip\(a, b\):', md).group(0)
             print_line = re.search(r'\s+print i', md).group(0)
-            self.assertTrue(for_line.rindex('for') < print_line.rindex('print'))
+            self.assertTrue(
+                for_line.rindex('for') < print_line.rindex('print'))
 
     def test_code_in_list(self):
         def r(f):
             with open(f, encoding='utf-8') as infile:
                 return infile.read()
         silent_f2p = mute(True)(fields2pelican)
-        test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)
+        test_post = filter(
+            lambda p: p[0].startswith("Code in List"),
+            self.posts)
         with temporary_folder() as temp:
             md = [r(f) for f in silent_f2p(test_post, 'markdown', temp)][0]
             sample_line = re.search(r'-   This is a code sample', md).group(0)
@@ -285,26 +309,29 @@ class TestBuildHeader(unittest.TestCase):
         self.assertEqual(build_header(*header_data), expected_docutils)
         self.assertEqual(build_markdown_header(*header_data), expected_md)
 
-
     def test_build_header_with_east_asian_characters(self):
         header = build_header('これは広い幅の文字だけで構成されたタイトルです',
-                None, None, None, None, None)
+                              None, None, None, None, None)
 
         self.assertEqual(header,
-                'これは広い幅の文字だけで構成されたタイトルです\n' +
-                '##############################################\n\n')
+                         ('これは広い幅の文字だけで構成されたタイトルです\n'
+                          '##############################################'
+                          '\n\n'))
 
     def test_galleries_added_to_header(self):
-        header = build_header('test', None, None, None, None,
-                None, attachments=['output/test1', 'output/test2'])
-        self.assertEqual(header, 'test\n####\n' + ':attachments: output/test1, '
-                + 'output/test2\n\n')
+        header = build_header('test', None, None, None, None, None,
+                              attachments=['output/test1', 'output/test2'])
+        self.assertEqual(header, ('test\n####\n'
+                                  ':attachments: output/test1, '
+                                  'output/test2\n\n'))
 
     def test_galleries_added_to_markdown_header(self):
         header = build_markdown_header('test', None, None, None, None, None,
-            attachments=['output/test1', 'output/test2'])
-        self.assertEqual(header, 'Title: test\n' + 'Attachments: output/test1, '
-                + 'output/test2\n\n')
+                                       attachments=['output/test1',
+                                                    'output/test2'])
+        self.assertEqual(
+            header,
+            'Title: test\nAttachments: output/test1, output/test2\n\n')
 
 
 @unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
@@ -326,14 +353,24 @@ class TestWordpressXMLAttachements(unittest.TestCase):
         self.assertTrue(self.attachments)
         for post in self.attachments.keys():
             if post is None:
-                self.assertTrue(self.attachments[post][0] == 'https://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/Pelican_lakes_entrance02.jpg/240px-Pelican_lakes_entrance02.jpg')
+                expected = ('https://upload.wikimedia.org/wikipedia/commons/'
+                            'thumb/2/2c/Pelican_lakes_entrance02.jpg/'
+                            '240px-Pelican_lakes_entrance02.jpg')
+                self.assertEqual(self.attachments[post][0], expected)
             elif post == 'with-excerpt':
-                self.assertTrue(self.attachments[post][0] == 'http://thisurlisinvalid.notarealdomain/not_an_image.jpg')
-                self.assertTrue(self.attachments[post][1] == 'http://en.wikipedia.org/wiki/File:Pelikan_Walvis_Bay.jpg')
+                expected_invalid = ('http://thisurlisinvalid.notarealdomain/'
+                                    'not_an_image.jpg')
+                expected_pelikan = ('http://en.wikipedia.org/wiki/'
+                                    'File:Pelikan_Walvis_Bay.jpg')
+                self.assertEqual(self.attachments[post][0], expected_invalid)
+                self.assertEqual(self.attachments[post][1], expected_pelikan)
             elif post == 'with-tags':
-                self.assertTrue(self.attachments[post][0] == 'http://thisurlisinvalid.notarealdomain')
+                expected_invalid = ('http://thisurlisinvalid.notarealdomain')
+                self.assertEqual(self.attachments[post][0], expected_invalid)
             else:
-                self.fail('all attachments should match to a filename or None, {}'.format(post))
+                self.fail('all attachments should match to a '
+                          'filename or None, {}'
+                          .format(post))
 
     def test_download_attachments(self):
         real_file = os.path.join(CUR_DIR, 'content/article.rst')
@@ -344,4 +381,6 @@ class TestWordpressXMLAttachements(unittest.TestCase):
             locations = list(silent_da(temp, [good_url, bad_url]))
             self.assertEqual(1, len(locations))
             directory = locations[0]
-            self.assertTrue(directory.endswith(os.path.join('content', 'article.rst')), directory)
+            self.assertTrue(
+                directory.endswith(os.path.join('content', 'article.rst')),
+                directory)
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 002d9e07..903a0305 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -1,18 +1,21 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
+
 import locale
 
-from pelican.tests.support import unittest, get_settings
-
-from pelican.paginator import Paginator
-from pelican.contents import Article, Author
-from pelican.settings import DEFAULT_CONFIG
 from jinja2.utils import generate_lorem_ipsum
 
+from pelican.contents import Article, Author
+from pelican.paginator import Paginator
+from pelican.settings import DEFAULT_CONFIG
+from pelican.tests.support import get_settings, unittest
+
+
 # generate one paragraph, enclosed with <p>
 TEST_CONTENT = str(generate_lorem_ipsum(n=1))
 TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
 
+
 class TestPage(unittest.TestCase):
     def setUp(self):
         super(TestPage, self).setUp()
@@ -49,7 +52,8 @@ class TestPage(unittest.TestCase):
         )
 
         self.page_kwargs['metadata']['author'] = Author('Blogger', settings)
-        object_list = [Article(**self.page_kwargs), Article(**self.page_kwargs)]
+        object_list = [Article(**self.page_kwargs),
+                       Article(**self.page_kwargs)]
         paginator = Paginator('foobar.foo', object_list, settings)
         page = paginator.page(1)
         self.assertEqual(page.save_as, 'foobar.foo')
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index c6332487..b88ad287 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -1,23 +1,25 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
 
 import collections
-import os
-import sys
-from tempfile import mkdtemp
-from shutil import rmtree
 import locale
 import logging
+import os
 import subprocess
+import sys
+
+from shutil import rmtree
+from tempfile import mkdtemp
 
 from pelican import Pelican
 from pelican.generators import StaticGenerator
 from pelican.settings import read_settings
-from pelican.tests.support import LoggedTestCase, mute, locale_available, unittest
+from pelican.tests.support import (LoggedTestCase, locale_available,
+                                   mute, unittest)
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
 SAMPLES_PATH = os.path.abspath(os.path.join(
-        CURRENT_DIR, os.pardir, os.pardir, 'samples'))
+    CURRENT_DIR, os.pardir, os.pardir, 'samples'))
 OUTPUT_PATH = os.path.abspath(os.path.join(CURRENT_DIR, 'output'))
 
 INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
@@ -27,13 +29,10 @@ SAMPLE_FR_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf_FR.py")
 
 def recursiveDiff(dcmp):
     diff = {
-            'diff_files': [os.path.join(dcmp.right, f)
-                for f in dcmp.diff_files],
-            'left_only': [os.path.join(dcmp.right, f)
-                for f in dcmp.left_only],
-            'right_only': [os.path.join(dcmp.right, f)
-                for f in dcmp.right_only],
-            }
+        'diff_files': [os.path.join(dcmp.right, f) for f in dcmp.diff_files],
+        'left_only': [os.path.join(dcmp.right, f) for f in dcmp.left_only],
+        'right_only': [os.path.join(dcmp.right, f) for f in dcmp.right_only],
+    }
     for sub_dcmp in dcmp.subdirs.values():
         for k, v in recursiveDiff(sub_dcmp).items():
             diff[k] += v
@@ -60,9 +59,13 @@ class TestPelican(LoggedTestCase):
 
     def assertDirsEqual(self, left_path, right_path):
         out, err = subprocess.Popen(
-            ['git', 'diff', '--no-ext-diff', '--exit-code', '-w', left_path, right_path],
-            env={str('PAGER'): str('')}, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+            ['git', 'diff', '--no-ext-diff', '--exit-code',
+             '-w', left_path, right_path],
+            env={str('PAGER'): str('')},
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
         ).communicate()
+
         def ignorable_git_crlf_errors(line):
             # Work around for running tests on Windows
             for msg in [
@@ -85,9 +88,11 @@ class TestPelican(LoggedTestCase):
         pelican = Pelican(settings=read_settings(path=None))
         generator_classes = pelican.get_generator_classes()
 
-        self.assertTrue(generator_classes[-1] is StaticGenerator,
+        self.assertTrue(
+            generator_classes[-1] is StaticGenerator,
             "StaticGenerator must be the last generator, but it isn't!")
-        self.assertIsInstance(generator_classes, collections.Sequence,
+        self.assertIsInstance(
+            generator_classes, collections.Sequence,
             "get_generator_classes() must return a Sequence to preserve order")
 
     def test_basic_generation_works(self):
@@ -98,10 +103,11 @@ class TestPelican(LoggedTestCase):
             'OUTPUT_PATH': self.temp_path,
             'CACHE_PATH': self.temp_cache,
             'LOCALE': locale.normalize('en_US'),
-            })
+        })
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
-        self.assertDirsEqual(self.temp_path, os.path.join(OUTPUT_PATH, 'basic'))
+        self.assertDirsEqual(
+            self.temp_path, os.path.join(OUTPUT_PATH, 'basic'))
         self.assertLogCountEqual(
             count=3,
             msg="Unable to find.*skipping url replacement",
@@ -114,10 +120,11 @@ class TestPelican(LoggedTestCase):
             'OUTPUT_PATH': self.temp_path,
             'CACHE_PATH': self.temp_cache,
             'LOCALE': locale.normalize('en_US'),
-            })
+        })
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
-        self.assertDirsEqual(self.temp_path, os.path.join(OUTPUT_PATH, 'custom'))
+        self.assertDirsEqual(
+            self.temp_path, os.path.join(OUTPUT_PATH, 'custom'))
 
     @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
                          locale_available('French'), 'French locale needed')
@@ -133,10 +140,11 @@ class TestPelican(LoggedTestCase):
             'OUTPUT_PATH': self.temp_path,
             'CACHE_PATH': self.temp_cache,
             'LOCALE': our_locale,
-            })
+        })
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
-        self.assertDirsEqual(self.temp_path, os.path.join(OUTPUT_PATH, 'custom_locale'))
+        self.assertDirsEqual(
+            self.temp_path, os.path.join(OUTPUT_PATH, 'custom_locale'))
 
     def test_theme_static_paths_copy(self):
         # the same thing with a specified set of settings should work
@@ -146,8 +154,9 @@ class TestPelican(LoggedTestCase):
             'CACHE_PATH': self.temp_cache,
             'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH, 'very'),
                                    os.path.join(SAMPLES_PATH, 'kinda'),
-                                   os.path.join(SAMPLES_PATH, 'theme_standard')]
-            })
+                                   os.path.join(SAMPLES_PATH,
+                                                'theme_standard')]
+        })
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
         theme_output = os.path.join(self.temp_path, 'theme')
@@ -165,8 +174,9 @@ class TestPelican(LoggedTestCase):
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
             'CACHE_PATH': self.temp_cache,
-            'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH, 'theme_standard')]
-            })
+            'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH,
+                                                'theme_standard')]
+        })
 
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
@@ -184,9 +194,9 @@ class TestPelican(LoggedTestCase):
             'WRITE_SELECTED': [
                 os.path.join(self.temp_path, 'oh-yeah.html'),
                 os.path.join(self.temp_path, 'categories.html'),
-                ],
+            ],
             'LOCALE': locale.normalize('en_US'),
-            })
+        })
         pelican = Pelican(settings=settings)
         logger = logging.getLogger()
         orig_level = logger.getEffectiveLevel()
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index dd7e5fc2..71394ee4 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
 
 import os
 
 from pelican import readers
+from pelican.tests.support import get_settings, unittest
 from pelican.utils import SafeDatetime
-from pelican.tests.support import unittest, get_settings
+
 
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_PATH = os.path.join(CUR_DIR, 'content')
@@ -29,22 +30,26 @@ class ReaderTest(unittest.TestCase):
                 self.assertEqual(
                     value,
                     real_value,
-                    'Expected %s to have value %s, but was %s' % (key, value, real_value))
+                    'Expected %s to have value %s, but was %s' %
+                    (key, value, real_value))
             else:
                 self.fail(
-                   'Expected %s to have value %s, but was not in Dict' % (key, value))
+                    'Expected %s to have value %s, but was not in Dict' %
+                    (key, value))
+
 
 class TestAssertDictHasSubset(ReaderTest):
     def setUp(self):
         self.dictionary = {
-        'key-a' : 'val-a',
-        'key-b' : 'val-b'}
+            'key-a': 'val-a',
+            'key-b': 'val-b'
+        }
 
     def tearDown(self):
         self.dictionary = None
 
     def test_subset(self):
-        self.assertDictHasSubset(self.dictionary, {'key-a':'val-a'})
+        self.assertDictHasSubset(self.dictionary, {'key-a': 'val-a'})
 
     def test_equal(self):
         self.assertDictHasSubset(self.dictionary, self.dictionary)
@@ -54,18 +59,17 @@ class TestAssertDictHasSubset(ReaderTest):
             AssertionError,
             'Expected.*key-c.*to have value.*val-c.*but was not in Dict',
             self.assertDictHasSubset,
-                self.dictionary,
-                {'key-c':'val-c'}
-            )
+            self.dictionary,
+            {'key-c': 'val-c'})
 
     def test_fail_wrong_val(self):
         self.assertRaisesRegexp(
             AssertionError,
             'Expected .*key-a.* to have value .*val-b.* but was .*val-a.*',
             self.assertDictHasSubset,
-                self.dictionary,
-                {'key-a':'val-b'}
-            )
+            self.dictionary,
+            {'key-a': 'val-b'})
+
 
 class DefaultReaderTest(ReaderTest):
 
@@ -153,17 +157,17 @@ class RstReaderTest(ReaderTest):
                 '(?P<date>\d{4}-\d{2}-\d{2})'
                 '_(?P<Slug>.*)'
                 '#(?P<MyMeta>.*)-(?P<author>.*)'
-                ),
+            ),
             EXTRA_PATH_METADATA={
                 input_with_metadata: {
                     'key-1a': 'value-1a',
                     'key-1b': 'value-1b'
-                    }
                 }
-            )
+            }
+        )
         expected_metadata = {
             'category': 'yeah',
-            'author' : 'Alexis Métaireau',
+            'author': 'Alexis Métaireau',
             'title': 'Rst with filename metadata',
             'date': SafeDatetime(2012, 11, 29),
             'slug': 'rst_w_filename_meta',
@@ -179,38 +183,41 @@ class RstReaderTest(ReaderTest):
             path=input_file_path_without_metadata,
             EXTRA_PATH_METADATA={
                 input_file_path_without_metadata: {
-                    'author': 'Charlès Overwrite'}
+                    'author': 'Charlès Overwrite'
                 }
-            )
+            }
+        )
         expected_without_metadata = {
-            'category' : 'misc',
-            'author'   : 'Charlès Overwrite',
-            'title'    : 'Article title',
-            'reader'   : 'rst',
+            'category': 'misc',
+            'author': 'Charlès Overwrite',
+            'title': 'Article title',
+            'reader': 'rst',
         }
         self.assertDictHasSubset(
             page_without_metadata.metadata,
             expected_without_metadata)
 
     def test_article_extra_path_metadata_dont_overwrite(self):
-        #EXTRA_PATH_METADATA['author'] should get ignored
-        #since we don't overwrite already set values
+        # EXTRA_PATH_METADATA['author'] should get ignored
+        # since we don't overwrite already set values
         input_file_path = '2012-11-29_rst_w_filename_meta#foo-bar.rst'
         page = self.read_file(
             path=input_file_path,
             FILENAME_METADATA=(
                 '(?P<date>\d{4}-\d{2}-\d{2})'
                 '_(?P<Slug>.*)'
-                '#(?P<MyMeta>.*)-(?P<orginalauthor>.*)'),
+                '#(?P<MyMeta>.*)-(?P<orginalauthor>.*)'
+            ),
             EXTRA_PATH_METADATA={
                 input_file_path: {
                     'author': 'Charlès Overwrite',
-                    'key-1b': 'value-1b'}
+                    'key-1b': 'value-1b'
                 }
-            )
+            }
+        )
         expected = {
             'category': 'yeah',
-            'author' : 'Alexis Métaireau',
+            'author': 'Alexis Métaireau',
             'title': 'Rst with filename metadata',
             'date': SafeDatetime(2012, 11, 29),
             'slug': 'rst_w_filename_meta',
@@ -273,7 +280,7 @@ class RstReaderTest(ReaderTest):
             # typogrify should be able to ignore user specified tags,
             # but tries to be clever with widont extension
             page = self.read_file(path='article.rst', TYPOGRIFY=True,
-                                  TYPOGRIFY_IGNORE_TAGS = ['p'])
+                                  TYPOGRIFY_IGNORE_TAGS=['p'])
             expected = ('<p>THIS is some content. With some stuff to&nbsp;'
                         '&quot;typogrify&quot;...</p>\n<p>Now with added '
                         'support for <abbr title="three letter acronym">'
@@ -284,7 +291,7 @@ class RstReaderTest(ReaderTest):
             # typogrify should ignore code blocks by default because
             # code blocks are composed inside the pre tag
             page = self.read_file(path='article_with_code_block.rst',
-                                 TYPOGRIFY=True)
+                                  TYPOGRIFY=True)
 
             expected = ('<p>An article with some&nbsp;code</p>\n'
                         '<div class="highlight"><pre><span class="n">x</span>'
@@ -292,13 +299,17 @@ class RstReaderTest(ReaderTest):
                         ' <span class="n">y</span>\n</pre></div>\n'
                         '<p>A block&nbsp;quote:</p>\n<blockquote>\nx '
                         '<span class="amp">&amp;</span> y</blockquote>\n'
-                        '<p>Normal:\nx <span class="amp">&amp;</span>&nbsp;y</p>\n')
+                        '<p>Normal:\nx'
+                        ' <span class="amp">&amp;</span>'
+                        '&nbsp;y'
+                        '</p>\n')
 
             self.assertEqual(page.content, expected)
 
             # instruct typogrify to also ignore blockquotes
             page = self.read_file(path='article_with_code_block.rst',
-                                 TYPOGRIFY=True, TYPOGRIFY_IGNORE_TAGS = ['blockquote'])
+                                  TYPOGRIFY=True,
+                                  TYPOGRIFY_IGNORE_TAGS=['blockquote'])
 
             expected = ('<p>An article with some&nbsp;code</p>\n'
                         '<div class="highlight"><pre><span class="n">x</span>'
@@ -306,7 +317,10 @@ class RstReaderTest(ReaderTest):
                         ' <span class="n">y</span>\n</pre></div>\n'
                         '<p>A block&nbsp;quote:</p>\n<blockquote>\nx '
                         '&amp; y</blockquote>\n'
-                        '<p>Normal:\nx <span class="amp">&amp;</span>&nbsp;y</p>\n')
+                        '<p>Normal:\nx'
+                        ' <span class="amp">&amp;</span>'
+                        '&nbsp;y'
+                        '</p>\n')
 
             self.assertEqual(page.content, expected)
         except ImportError:
@@ -339,6 +353,7 @@ class RstReaderTest(ReaderTest):
 
         self.assertDictHasSubset(page.metadata, expected)
 
+
 @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
 class MdReaderTest(ReaderTest):
 
@@ -400,7 +415,8 @@ class MdReaderTest(ReaderTest):
             'modified': SafeDatetime(2012, 11, 1),
             'multiline': [
                 'Line Metadata should be handle properly.',
-                'See syntax of Meta-Data extension of Python Markdown package:',
+                'See syntax of Meta-Data extension of '
+                'Python Markdown package:',
                 'If a line is indented by 4 or more spaces,',
                 'that line is assumed to be an additional line of the value',
                 'for the previous keyword.',
diff --git a/pelican/tests/test_rstdirectives.py b/pelican/tests/test_rstdirectives.py
index 7c5f8adf..f6a7221f 100644
--- a/pelican/tests/test_rstdirectives.py
+++ b/pelican/tests/test_rstdirectives.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
+
+from pelican.tests.support import unittest
+
 try:
     from unittest.mock import Mock
 except ImportError:
@@ -7,7 +10,7 @@ except ImportError:
         from mock import Mock
     except ImportError:
         Mock = False
-from pelican.tests.support import unittest
+
 
 @unittest.skipUnless(Mock, 'Needs Mock module')
 class Test_abbr_role(unittest.TestCase):
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 5653d07a..7b1e36df 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
-import copy
-import os
-import locale
-from sys import platform
-from os.path import dirname, abspath, join
+from __future__ import print_function, unicode_literals
 
-from pelican.settings import (read_settings, configure_settings,
-                              DEFAULT_CONFIG, DEFAULT_THEME)
+import copy
+import locale
+import os
+from os.path import abspath, dirname, join
+from sys import platform
+
+
+from pelican.settings import (DEFAULT_CONFIG, DEFAULT_THEME,
+                              configure_settings, read_settings)
 from pelican.tests.support import unittest
 
 
@@ -28,12 +30,14 @@ class TestSettingsConfiguration(unittest.TestCase):
 
     def test_overwrite_existing_settings(self):
         self.assertEqual(self.settings.get('SITENAME'), "Alexis' log")
-        self.assertEqual(self.settings.get('SITEURL'),
-                'http://blog.notmyidea.org')
+        self.assertEqual(
+            self.settings.get('SITEURL'),
+            'http://blog.notmyidea.org')
 
     def test_keep_default_settings(self):
         # Keep default settings if not defined.
-        self.assertEqual(self.settings.get('DEFAULT_CATEGORY'),
+        self.assertEqual(
+            self.settings.get('DEFAULT_CATEGORY'),
             DEFAULT_CONFIG['DEFAULT_CATEGORY'])
 
     def test_dont_copy_small_keys(self):
@@ -69,28 +73,31 @@ class TestSettingsConfiguration(unittest.TestCase):
 
     def test_static_path_settings_safety(self):
         # Disallow static paths from being strings
-        settings = {'STATIC_PATHS': 'foo/bar',
-                'THEME_STATIC_PATHS': 'bar/baz',
-                # These 4 settings are required to run configure_settings
-                'PATH': '.',
-                'THEME': DEFAULT_THEME,
-                'SITEURL': 'http://blog.notmyidea.org/',
-                'LOCALE': '',
-                }
+        settings = {
+            'STATIC_PATHS': 'foo/bar',
+            'THEME_STATIC_PATHS': 'bar/baz',
+            # These 4 settings are required to run configure_settings
+            'PATH': '.',
+            'THEME': DEFAULT_THEME,
+            'SITEURL': 'http://blog.notmyidea.org/',
+            'LOCALE': '',
+        }
         configure_settings(settings)
-        self.assertEqual(settings['STATIC_PATHS'],
-                DEFAULT_CONFIG['STATIC_PATHS'])
-        self.assertEqual(settings['THEME_STATIC_PATHS'],
-                DEFAULT_CONFIG['THEME_STATIC_PATHS'])
+        self.assertEqual(
+            settings['STATIC_PATHS'],
+            DEFAULT_CONFIG['STATIC_PATHS'])
+        self.assertEqual(
+            settings['THEME_STATIC_PATHS'],
+            DEFAULT_CONFIG['THEME_STATIC_PATHS'])
 
     def test_configure_settings(self):
         # Manipulations to settings should be applied correctly.
         settings = {
-                'SITEURL': 'http://blog.notmyidea.org/',
-                'LOCALE': '',
-                'PATH': os.curdir,
-                'THEME': DEFAULT_THEME,
-                }
+            'SITEURL': 'http://blog.notmyidea.org/',
+            'LOCALE': '',
+            'PATH': os.curdir,
+            'THEME': DEFAULT_THEME,
+        }
         configure_settings(settings)
 
         # SITEURL should not have a trailing slash
@@ -154,7 +161,7 @@ class TestSettingsConfiguration(unittest.TestCase):
         settings['PATH'] = ''
         self.assertRaises(Exception, configure_settings, settings)
 
-        # Test nonexistent THEME 
+        # Test nonexistent THEME
         settings['PATH'] = os.curdir
         settings['THEME'] = 'foo'
 
diff --git a/pelican/tests/test_urlwrappers.py b/pelican/tests/test_urlwrappers.py
index 20a87114..ae6eaaec 100644
--- a/pelican/tests/test_urlwrappers.py
+++ b/pelican/tests/test_urlwrappers.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from pelican.urlwrappers import URLWrapper, Tag, Category
 from pelican.tests.support import unittest
+from pelican.urlwrappers import Category, Tag, URLWrapper
+
 
 class TestURLWrapper(unittest.TestCase):
     def test_ordering(self):
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 0f8878af..d6fdf70e 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -1,20 +1,22 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function, absolute_import
-import logging
-import shutil
-import os
-import time
+from __future__ import absolute_import, print_function, unicode_literals
+
 import locale
+import logging
+import os
+import shutil
+import time
 from sys import platform
 from tempfile import mkdtemp
 
 import pytz
 
-from pelican.generators import TemplatePagesGenerator
-from pelican.writers import Writer
-from pelican.settings import read_settings
 from pelican import utils
-from pelican.tests.support import get_article, LoggedTestCase, locale_available, unittest
+from pelican.generators import TemplatePagesGenerator
+from pelican.settings import read_settings
+from pelican.tests.support import (LoggedTestCase, get_article,
+                                   locale_available, unittest)
+from pelican.writers import Writer
 
 
 class TestUtils(LoggedTestCase):
@@ -72,7 +74,7 @@ class TestUtils(LoggedTestCase):
             '2012-11-22T22:11:10Z': date_hour_sec_z,
             '2012-11-22T22:11:10-0500': date_hour_sec_est,
             '2012-11-22T22:11:10.123Z': date_hour_sec_frac_z,
-            }
+        }
 
         # examples from http://www.w3.org/TR/NOTE-datetime
         iso_8601_date = utils.SafeDatetime(year=1997, month=7, day=16)
@@ -95,7 +97,6 @@ class TestUtils(LoggedTestCase):
         # invalid ones
         invalid_dates = ['2010-110-12', 'yay']
 
-
         for value, expected in dates.items():
             self.assertEqual(utils.get_date(value), expected, value)
 
@@ -290,7 +291,9 @@ class TestUtils(LoggedTestCase):
         self.assertEqual(utils.strftime(d, '%d/%m/%Y'), '29/08/2012')
 
         # RFC 3339
-        self.assertEqual(utils.strftime(d, '%Y-%m-%dT%H:%M:%SZ'),'2012-08-29T00:00:00Z')
+        self.assertEqual(
+            utils.strftime(d, '%Y-%m-%dT%H:%M:%SZ'),
+            '2012-08-29T00:00:00Z')
 
         # % escaped
         self.assertEqual(utils.strftime(d, '%d%%%m%%%y'), '29%08%12')
@@ -306,8 +309,9 @@ class TestUtils(LoggedTestCase):
                          'Published in 29-08-2012')
 
         # with non-ascii text
-        self.assertEqual(utils.strftime(d, '%d/%m/%Y Øl trinken beim Besäufnis'),
-                         '29/08/2012 Øl trinken beim Besäufnis')
+        self.assertEqual(
+            utils.strftime(d, '%d/%m/%Y Øl trinken beim Besäufnis'),
+            '29/08/2012 Øl trinken beim Besäufnis')
 
         # alternative formatting options
         self.assertEqual(utils.strftime(d, '%-d/%-m/%y'), '29/8/12')
@@ -316,7 +320,6 @@ class TestUtils(LoggedTestCase):
         d = utils.SafeDatetime(2012, 8, 9)
         self.assertEqual(utils.strftime(d, '%-d/%-m/%y'), '9/8/12')
 
-
     # test the output of utils.strftime in a different locale
     # Turkish locale
     @unittest.skipUnless(locale_available('tr_TR.UTF-8') or
@@ -339,17 +342,18 @@ class TestUtils(LoggedTestCase):
                          'Çarşamba, 29 Ağustos 2012')
 
         # with text
-        self.assertEqual(utils.strftime(d, 'Yayınlanma tarihi: %A, %d %B %Y'),
+        self.assertEqual(
+            utils.strftime(d, 'Yayınlanma tarihi: %A, %d %B %Y'),
             'Yayınlanma tarihi: Çarşamba, 29 Ağustos 2012')
 
         # non-ascii format candidate (someone might pass it... for some reason)
-        self.assertEqual(utils.strftime(d, '%Y yılında %üretim artışı'),
+        self.assertEqual(
+            utils.strftime(d, '%Y yılında %üretim artışı'),
             '2012 yılında %üretim artışı')
 
         # restore locale back
         locale.setlocale(locale.LC_ALL, old_locale)
 
-
     # test the output of utils.strftime in a different locale
     # French locale
     @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
@@ -373,21 +377,28 @@ class TestUtils(LoggedTestCase):
         self.assertTrue(utils.strftime(d, '%A') in ('mercredi', 'Mercredi'))
 
         # with text
-        self.assertEqual(utils.strftime(d, 'Écrit le %d %B %Y'),
+        self.assertEqual(
+            utils.strftime(d, 'Écrit le %d %B %Y'),
             'Écrit le 29 août 2012')
 
         # non-ascii format candidate (someone might pass it... for some reason)
-        self.assertEqual(utils.strftime(d, '%écrits en %Y'),
+        self.assertEqual(
+            utils.strftime(d, '%écrits en %Y'),
             '%écrits en 2012')
 
         # restore locale back
         locale.setlocale(locale.LC_ALL, old_locale)
 
-
     def test_maybe_pluralize(self):
-        self.assertEqual(utils.maybe_pluralize(0, 'Article', 'Articles'), '0 Articles')
-        self.assertEqual(utils.maybe_pluralize(1, 'Article', 'Articles'), '1 Article')
-        self.assertEqual(utils.maybe_pluralize(2, 'Article', 'Articles'), '2 Articles')
+        self.assertEqual(
+            utils.maybe_pluralize(0, 'Article', 'Articles'),
+            '0 Articles')
+        self.assertEqual(
+            utils.maybe_pluralize(1, 'Article', 'Articles'),
+            '1 Article')
+        self.assertEqual(
+            utils.maybe_pluralize(2, 'Article', 'Articles'),
+            '2 Articles')
 
 
 class TestCopy(unittest.TestCase):
@@ -435,8 +446,9 @@ class TestCopy(unittest.TestCase):
 
     def test_copy_file_create_dirs(self):
         self._create_file('a.txt')
-        utils.copy(os.path.join(self.root_dir, 'a.txt'),
-                   os.path.join(self.root_dir, 'b0', 'b1', 'b2', 'b3', 'b.txt'))
+        utils.copy(
+            os.path.join(self.root_dir, 'a.txt'),
+            os.path.join(self.root_dir, 'b0', 'b1', 'b2', 'b3', 'b.txt'))
         self._exist_dir('b0')
         self._exist_dir('b0', 'b1')
         self._exist_dir('b0', 'b1', 'b2')
@@ -491,35 +503,39 @@ class TestDateFormatter(unittest.TestCase):
             template_file.write('date = {{ date|strftime("%A, %d %B %Y") }}')
         self.date = utils.SafeDatetime(2012, 8, 29)
 
-
     def tearDown(self):
         shutil.rmtree(self.temp_content)
         shutil.rmtree(self.temp_output)
         # reset locale to default
         locale.setlocale(locale.LC_ALL, '')
 
-
     @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
                          locale_available('French'),
                          'French locale needed')
     def test_french_strftime(self):
-        # This test tries to reproduce an issue that occurred with python3.3 under macos10 only
+        # This test tries to reproduce an issue that
+        # occurred with python3.3 under macos10 only
         if platform == 'win32':
             locale.setlocale(locale.LC_ALL, str('French'))
         else:
             locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8'))
-        date = utils.SafeDatetime(2014,8,14)
-        # we compare the lower() dates since macos10 returns "Jeudi" for %A whereas linux reports "jeudi"
-        self.assertEqual( u'jeudi, 14 août 2014', utils.strftime(date, date_format="%A, %d %B %Y").lower() )
+        date = utils.SafeDatetime(2014, 8, 14)
+        # we compare the lower() dates since macos10 returns
+        # "Jeudi" for %A whereas linux reports "jeudi"
+        self.assertEqual(
+            u'jeudi, 14 août 2014',
+            utils.strftime(date, date_format="%A, %d %B %Y").lower())
         df = utils.DateFormatter()
-        self.assertEqual( u'jeudi, 14 août 2014', df(date, date_format="%A, %d %B %Y").lower() )
+        self.assertEqual(
+            u'jeudi, 14 août 2014',
+            df(date, date_format="%A, %d %B %Y").lower())
         # Let us now set the global locale to C:
         locale.setlocale(locale.LC_ALL, str('C'))
-        # DateFormatter should still work as expected since it is the whole point of DateFormatter
+        # DateFormatter should still work as expected
+        # since it is the whole point of DateFormatter
         # (This is where pre-2014/4/15 code fails on macos10)
         df_date = df(date, date_format="%A, %d %B %Y").lower()
-        self.assertEqual( u'jeudi, 14 août 2014', df_date )
-
+        self.assertEqual(u'jeudi, 14 août 2014', df_date)
 
     @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
                          locale_available('French'),
@@ -530,9 +546,12 @@ class TestDateFormatter(unittest.TestCase):
         else:
             locale_string = 'fr_FR.UTF-8'
         settings = read_settings(
-            override = {'LOCALE': locale_string,
-                        'TEMPLATE_PAGES': {'template/source.html':
-                                         'generated/file.html'}})
+            override={
+                'LOCALE': locale_string,
+                'TEMPLATE_PAGES': {
+                    'template/source.html': 'generated/file.html'
+                }
+            })
 
         generator = TemplatePagesGenerator(
             {'date': self.date}, settings,
@@ -543,7 +562,7 @@ class TestDateFormatter(unittest.TestCase):
         generator.generate_output(writer)
 
         output_path = os.path.join(
-                self.temp_output, 'generated', 'file.html')
+            self.temp_output, 'generated', 'file.html')
 
         # output file has been generated
         self.assertTrue(os.path.exists(output_path))
@@ -553,7 +572,6 @@ class TestDateFormatter(unittest.TestCase):
             self.assertEqual(output_file,
                              utils.strftime(self.date, 'date = %A, %d %B %Y'))
 
-
     @unittest.skipUnless(locale_available('tr_TR.UTF-8') or
                          locale_available('Turkish'),
                          'Turkish locale needed')
@@ -563,9 +581,12 @@ class TestDateFormatter(unittest.TestCase):
         else:
             locale_string = 'tr_TR.UTF-8'
         settings = read_settings(
-            override = {'LOCALE': locale_string,
-                        'TEMPLATE_PAGES': {'template/source.html':
-                                           'generated/file.html'}})
+            override={
+                'LOCALE': locale_string,
+                'TEMPLATE_PAGES': {
+                    'template/source.html': 'generated/file.html'
+                }
+            })
 
         generator = TemplatePagesGenerator(
             {'date': self.date}, settings,
@@ -576,7 +597,7 @@ class TestDateFormatter(unittest.TestCase):
         generator.generate_output(writer)
 
         output_path = os.path.join(
-                self.temp_output, 'generated', 'file.html')
+            self.temp_output, 'generated', 'file.html')
 
         # output file has been generated
         self.assertTrue(os.path.exists(output_path))
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 92e8c919..f8abbd7a 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -1,29 +1,30 @@
 #!/usr/bin/env python
-
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
+
 import argparse
-try:
-    from html import unescape  # py3.4+
-except ImportError:
-    from six.moves.html_parser import HTMLParser
-    unescape = HTMLParser().unescape
+import logging
 import os
 import re
 import subprocess
 import sys
 import time
-import logging
 
 from codecs import open
+
 from six.moves.urllib.error import URLError
 from six.moves.urllib.parse import urlparse
 from six.moves.urllib.request import urlretrieve
 
-# pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import init
-from pelican.utils import slugify, SafeDatetime
+from pelican.utils import SafeDatetime, slugify
+
+try:
+    from html import unescape  # py3.4+
+except ImportError:
+    from six.moves.html_parser import HTMLParser
+    unescape = HTMLParser().unescape
 
 logger = logging.getLogger(__name__)
 
@@ -70,12 +71,19 @@ def decode_wp_content(content, br=True):
     content = ""
     for p in pgraphs:
         content = content + "<p>" + p.strip() + "</p>\n"
-    # under certain strange conditions it could create a P of entirely whitespace
+    # under certain strange conditions it could create
+    # a P of entirely whitespace
     content = re.sub(r'<p>\s*</p>', '', content)
-    content = re.sub(r'<p>([^<]+)</(div|address|form)>', "<p>\\1</p></\\2>", content)
+    content = re.sub(
+        r'<p>([^<]+)</(div|address|form)>',
+        "<p>\\1</p></\\2>",
+        content)
     # don't wrap tags
-    content = re.sub(r'<p>\s*(</?' + allblocks + r'[^>]*>)\s*</p>', "\\1", content)
-    #problem with nested lists
+    content = re.sub(
+        r'<p>\s*(</?' + allblocks + r'[^>]*>)\s*</p>',
+        "\\1",
+        content)
+    # problem with nested lists
     content = re.sub(r'<p>(<li.*)</p>', "\\1", content)
     content = re.sub(r'<p><blockquote([^>]*)>', "<blockquote\\1><p>", content)
     content = content.replace('</blockquote></p>', '</p></blockquote>')
@@ -84,12 +92,20 @@ def decode_wp_content(content, br=True):
     if br:
         def _preserve_newline(match):
             return match.group(0).replace("\n", "<WPPreserveNewline />")
-        content = re.sub(r'/<(script|style).*?<\/\\1>/s', _preserve_newline, content)
+        content = re.sub(
+            r'/<(script|style).*?<\/\\1>/s',
+            _preserve_newline,
+            content)
         # optionally make line breaks
         content = re.sub(r'(?<!<br />)\s*\n', "<br />\n", content)
         content = content.replace("<WPPreserveNewline />", "\n")
-    content = re.sub(r'(</?' + allblocks + r'[^>]*>)\s*<br />', "\\1", content)
-    content = re.sub(r'<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)', '\\1', content)
+    content = re.sub(
+        r'(</?' + allblocks + r'[^>]*>)\s*<br />', "\\1",
+        content)
+    content = re.sub(
+        r'<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)',
+        '\\1',
+        content)
     content = re.sub(r'\n</p>', "</p>", content)
 
     if pre_tags:
@@ -100,13 +116,14 @@ def decode_wp_content(content, br=True):
 
     return content
 
+
 def get_items(xml):
     """Opens a WordPress xml file and returns a list of items"""
     try:
         from bs4 import BeautifulSoup
     except ImportError:
-        error = ('Missing dependency '
-                 '"BeautifulSoup4" and "lxml" required to import WordPress XML files.')
+        error = ('Missing dependency "BeautifulSoup4" and "lxml" required to '
+                 'import WordPress XML files.')
         sys.exit(error)
     with open(xml, encoding='utf-8') as infile:
         xmlfile = infile.read()
@@ -114,12 +131,14 @@ def get_items(xml):
     items = soup.rss.channel.findAll('item')
     return items
 
+
 def get_filename(filename, post_id):
     if filename is not None:
         return filename
     else:
         return post_id
 
+
 def wp2fields(xml, wp_custpost=False):
     """Opens a wordpress XML file, and yield Pelican fields"""
 
@@ -141,16 +160,18 @@ def wp2fields(xml, wp_custpost=False):
 
             content = item.find('encoded').string
             raw_date = item.find('post_date').string
-            date_object = time.strptime(raw_date, "%Y-%m-%d %H:%M:%S")
-            date = time.strftime("%Y-%m-%d %H:%M", date_object)
+            date_object = time.strptime(raw_date, '%Y-%m-%d %H:%M:%S')
+            date = time.strftime('%Y-%m-%d %H:%M', date_object)
             author = item.find('creator').string
 
-            categories = [cat.string for cat in item.findAll('category', {'domain' : 'category'})]
-            # caturl = [cat['nicename'] for cat in item.find(domain='category')]
+            categories = [cat.string for cat
+                          in item.findAll('category', {'domain': 'category'})]
 
-            tags = [tag.string for tag in item.findAll('category', {'domain' : 'post_tag'})]
+            tags = [tag.string for tag
+                    in item.findAll('category', {'domain': 'post_tag'})]
             # To publish a post the status should be 'published'
-            status = 'published' if item.find('status').string == "publish" else item.find('status').string
+            status = 'published' if item.find('status').string == "publish" \
+                else item.find('status').string
 
             kind = 'article'
             post_type = item.find('post_type').string
@@ -159,16 +180,17 @@ def wp2fields(xml, wp_custpost=False):
             elif wp_custpost:
                 if post_type == 'post':
                     pass
-                # Old behaviour was to name everything not a page as an article.
-                # Theoretically all attachments have status == inherit so
-                # no attachments should be here. But this statement is to
+                # Old behaviour was to name everything not a page as an
+                # article.Theoretically all attachments have status == inherit
+                # so no attachments should be here. But this statement is to
                 # maintain existing behaviour in case that doesn't hold true.
                 elif post_type == 'attachment':
                     pass
                 else:
                     kind = post_type
-            yield (title, content, filename, date, author, categories, tags, status,
-                   kind, "wp-html")
+            yield (title, content, filename, date, author, categories,
+                   tags, status, kind, 'wp-html')
+
 
 def dc2fields(file):
     """Opens a Dotclear export file, and yield pelican fields"""
@@ -176,10 +198,10 @@ def dc2fields(file):
         from bs4 import BeautifulSoup
     except ImportError:
         error = ('Missing dependency '
-                 '"BeautifulSoup4" and "lxml" required to import Dotclear files.')
+                 '"BeautifulSoup4" and "lxml" required '
+                 'to import Dotclear files.')
         sys.exit(error)
 
-
     in_cat = False
     in_post = False
     category_list = {}
@@ -203,7 +225,7 @@ def dc2fields(file):
                     # remove 1st and last ""
                     fields[0] = fields[0][1:]
                     # fields[-1] = fields[-1][:-1]
-                    category_list[fields[0]]=fields[2]
+                    category_list[fields[0]] = fields[2]
             elif in_post:
                 if not line:
                     in_post = False
@@ -249,45 +271,50 @@ def dc2fields(file):
         # remove seconds
         post_creadt = ':'.join(post_creadt.split(':')[0:2])
 
-        author = ""
+        author = ''
         categories = []
         tags = []
 
         if cat_id:
-            categories = [category_list[id].strip() for id in cat_id.split(',')]
+            categories = [category_list[id].strip() for id
+                          in cat_id.split(',')]
 
         # Get tags related to a post
-        tag = post_meta.replace('{', '').replace('}', '').replace('a:1:s:3:\\"tag\\";a:', '').replace('a:0:', '')
+        tag = (post_meta.replace('{', '')
+                        .replace('}', '')
+                        .replace('a:1:s:3:\\"tag\\";a:', '')
+                        .replace('a:0:', ''))
         if len(tag) > 1:
             if int(tag[:1]) == 1:
                 newtag = tag.split('"')[1]
                 tags.append(
                     BeautifulSoup(
-                        newtag
-                        , "xml"
+                        newtag,
+                        'xml'
                     )
                     # bs4 always outputs UTF-8
                     .decode('utf-8')
                 )
             else:
-                i=1
-                j=1
+                i = 1
+                j = 1
                 while(i <= int(tag[:1])):
-                    newtag = tag.split('"')[j].replace('\\','')
+                    newtag = tag.split('"')[j].replace('\\', '')
                     tags.append(
                         BeautifulSoup(
-                            newtag
-                            , "xml"
+                            newtag,
+                            'xml'
                         )
                         # bs4 always outputs UTF-8
                         .decode('utf-8')
                     )
-                    i=i+1
-                    if j < int(tag[:1])*2:
-                        j=j+2
+                    i = i + 1
+                    if j < int(tag[:1]) * 2:
+                        j = j + 2
 
         """
-        dotclear2 does not use markdown by default unless you use the markdown plugin
+        dotclear2 does not use markdown by default unless
+        you use the markdown plugin
         Ref: http://plugins.dotaddict.org/dc2/details/formatting-markdown
         """
         if post_format == "markdown":
@@ -322,12 +349,13 @@ def posterous2fields(api_token, email, password):
         # py2 import
         import urllib2 as urllib_request
 
-
-    def get_posterous_posts(api_token, email, password, page = 1):
-        base64string = base64.encodestring(("%s:%s" % (email, password)).encode('utf-8')).replace(b'\n', b'')
-        url = "http://posterous.com/api/v2/users/me/sites/primary/posts?api_token=%s&page=%d" % (api_token, page)
+    def get_posterous_posts(api_token, email, password, page=1):
+        base64string = base64.encodestring(
+            ("%s:%s" % (email, password)).encode('utf-8')).replace('\n', '')
+        url = ("http://posterous.com/api/v2/users/me/sites/primary/"
+               "posts?api_token=%s&page=%d") % (api_token, page)
         request = urllib_request.Request(url)
-        request.add_header("Authorization", "Basic %s" % base64string.decode())
+        request.add_header('Authorization', 'Basic %s' % base64string.decode())
         handle = urllib_request.urlopen(request)
         posts = json.loads(handle.read().decode('utf-8'))
         return posts
@@ -344,16 +372,18 @@ def posterous2fields(api_token, email, password):
                 slug = slugify(post.get('title'))
             tags = [tag.get('name') for tag in post.get('tags')]
             raw_date = post.get('display_date')
-            date_object = SafeDatetime.strptime(raw_date[:-6], "%Y/%m/%d %H:%M:%S")
+            date_object = SafeDatetime.strptime(
+                raw_date[:-6], '%Y/%m/%d %H:%M:%S')
             offset = int(raw_date[-5:])
-            delta = timedelta(hours = offset / 100)
+            delta = timedelta(hours=(offset / 100))
             date_object -= delta
-            date = date_object.strftime("%Y-%m-%d %H:%M")
-            kind = 'article'  # TODO: Recognise pages
+            date = date_object.strftime('%Y-%m-%d %H:%M')
+            kind = 'article'      # TODO: Recognise pages
             status = 'published'  # TODO: Find a way for draft posts
 
-            yield (post.get('title'), post.get('body_cleaned'), slug, date,
-                post.get('user').get('display_name'), [], tags, status, kind, "html")
+            yield (post.get('title'), post.get('body_cleaned'),
+                   slug, date, post.get('user').get('display_name'),
+                   [], tags, status, kind, 'html')
 
 
 def tumblr2fields(api_key, blogname):
@@ -374,7 +404,9 @@ def tumblr2fields(api_key, blogname):
         import urllib2 as urllib_request
 
     def get_tumblr_posts(api_key, blogname, offset=0):
-        url = "http://api.tumblr.com/v2/blog/%s.tumblr.com/posts?api_key=%s&offset=%d&filter=raw" % (blogname, api_key, offset)
+        url = ("http://api.tumblr.com/v2/blog/%s.tumblr.com/"
+               "posts?api_key=%s&offset=%d&filter=raw") % (
+            blogname, api_key, offset)
         request = urllib_request.Request(url)
         handle = urllib_request.urlopen(request)
         posts = json.loads(handle.read().decode('utf-8'))
@@ -384,7 +416,10 @@ def tumblr2fields(api_key, blogname):
     posts = get_tumblr_posts(api_key, blogname, offset)
     while len(posts) > 0:
         for post in posts:
-            title = post.get('title') or post.get('source_title') or post.get('type').capitalize()
+            title = \
+                post.get('title') or \
+                post.get('source_title') or \
+                post.get('type').capitalize()
             slug = post.get('slug') or slugify(title)
             tags = post.get('tags')
             timestamp = post.get('timestamp')
@@ -398,7 +433,11 @@ def tumblr2fields(api_key, blogname):
                     fmtstr = '![%s](%s)'
                 else:
                     fmtstr = '<img alt="%s" src="%s" />'
-                content = '\n'.join(fmtstr % (photo.get('caption'), photo.get('original_size').get('url')) for photo in post.get('photos'))
+                content = ''
+                for photo in post.get('photos'):
+                    content += '\n'.join(
+                        fmtstr % (photo.get('caption'),
+                                  photo.get('original_size').get('url')))
                 content += '\n\n' + post.get('caption')
             elif type == 'quote':
                 if format == 'markdown':
@@ -417,16 +456,29 @@ def tumblr2fields(api_key, blogname):
                     fmtstr = '[via](%s)\n\n'
                 else:
                     fmtstr = '<p><a href="%s">via</a></p>\n'
-                content = fmtstr % post.get('source_url') + post.get('caption') + post.get('player')
+                content = fmtstr % post.get('source_url') + \
+                    post.get('caption') + \
+                    post.get('player')
             elif type == 'video':
                 if format == 'markdown':
                     fmtstr = '[via](%s)\n\n'
                 else:
                     fmtstr = '<p><a href="%s">via</a></p>\n'
-                content = fmtstr % post.get('source_url') + post.get('caption') + '\n'.join(player.get('embed_code') for player in post.get('player'))
+                source = fmtstr % post.get('source_url')
+                caption = post.get('caption')
+                players = '\n'.join(player.get('embed_code')
+                                    for player in post.get('player'))
+                content = source + caption + players
             elif type == 'answer':
                 title = post.get('question')
-                content = '<p><a href="%s" rel="external nofollow">%s</a>: %s</p>\n%s' % (post.get('asking_name'), post.get('asking_url'), post.get('question'), post.get('answer'))
+                content = ('<p>'
+                           '<a href="%s" rel="external nofollow">%s</a>'
+                           ': %s'
+                           '</p>\n'
+                           ' %s' % (post.get('asking_name'),
+                                    post.get('asking_url'),
+                                    post.get('question'),
+                                    post.get('answer')))
 
             content = content.rstrip() + '\n'
             kind = 'article'
@@ -438,25 +490,30 @@ def tumblr2fields(api_key, blogname):
         offset += len(posts)
         posts = get_tumblr_posts(api_key, blogname, offset)
 
+
 def feed2fields(file):
     """Read a feed and yield pelican fields"""
     import feedparser
     d = feedparser.parse(file)
     for entry in d.entries:
-        date = (time.strftime("%Y-%m-%d %H:%M", entry.updated_parsed)
-            if hasattr(entry, "updated_parsed") else None)
-        author = entry.author if hasattr(entry, "author") else None
-        tags = [e['term'] for e in entry.tags] if hasattr(entry, "tags") else None
+        date = (time.strftime('%Y-%m-%d %H:%M', entry.updated_parsed)
+                if hasattr(entry, 'updated_parsed') else None)
+        author = entry.author if hasattr(entry, 'author') else None
+        tags = ([e['term'] for e in entry.tags]
+                if hasattr(entry, 'tags') else None)
 
         slug = slugify(entry.title)
         kind = 'article'
-        yield (entry.title, entry.description, slug, date, author, [], tags, None,
-               kind, "html")
+        yield (entry.title, entry.description, slug, date,
+               author, [], tags, None, kind, 'html')
+
+
+def build_header(title, date, author, categories, tags, slug,
+                 status=None, attachments=None):
+    """Build a header from a list of fields"""
 
-def build_header(title, date, author, categories, tags, slug, status=None, attachments=None):
     from docutils.utils import column_width
 
-    """Build a header from a list of fields"""
     header = '%s\n%s\n' % (title, '#' * column_width(title))
     if date:
         header += ':date: %s\n' % date
@@ -475,8 +532,9 @@ def build_header(title, date, author, categories, tags, slug, status=None, attac
     header += '\n'
     return header
 
-def build_markdown_header(title, date, author, categories, tags, slug, status=None,
-    attachments=None):
+
+def build_markdown_header(title, date, author, categories, tags,
+                          slug, status=None, attachments=None):
     """Build a header from a list of fields"""
     header = 'Title: %s\n' % title
     if date:
@@ -496,6 +554,7 @@ def build_markdown_header(title, date, author, categories, tags, slug, status=No
     header += '\n'
     return header
 
+
 def get_ext(out_markup, in_markup='html'):
     if in_markup == 'markdown' or out_markup == 'markdown':
         ext = '.md'
@@ -503,26 +562,27 @@ def get_ext(out_markup, in_markup='html'):
         ext = '.rst'
     return ext
 
+
 def get_out_filename(output_path, filename, ext, kind,
-        dirpage, dircat, categories, wp_custpost):
+                     dirpage, dircat, categories, wp_custpost):
     filename = os.path.basename(filename)
 
     # Enforce filename restrictions for various filesystems at once; see
     # http://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
     # we do not need to filter words because an extension will be appended
-    filename = re.sub(r'[<>:"/\\|?*^% ]', '-', filename) # invalid chars
-    filename = filename.lstrip('.') # should not start with a dot
+    filename = re.sub(r'[<>:"/\\|?*^% ]', '-', filename)  # invalid chars
+    filename = filename.lstrip('.')  # should not start with a dot
     if not filename:
         filename = '_'
-    filename = filename[:249] # allow for 5 extra characters
+    filename = filename[:249]  # allow for 5 extra characters
 
-    out_filename = os.path.join(output_path, filename+ext)
+    out_filename = os.path.join(output_path, filename + ext)
     # option to put page posts in pages/ subdirectory
     if dirpage and kind == 'page':
         pages_dir = os.path.join(output_path, 'pages')
         if not os.path.isdir(pages_dir):
             os.mkdir(pages_dir)
-        out_filename = os.path.join(pages_dir, filename+ext)
+        out_filename = os.path.join(pages_dir, filename + ext)
     elif not dirpage and kind == 'page':
         pass
     # option to put wp custom post types in directories with post type
@@ -539,18 +599,19 @@ def get_out_filename(output_path, filename, ext, kind,
         else:
             catname = ''
         out_filename = os.path.join(output_path, typename,
-            catname, filename+ext)
+                                    catname, filename + ext)
         if not os.path.isdir(os.path.join(output_path, typename, catname)):
             os.makedirs(os.path.join(output_path, typename, catname))
     # option to put files in directories with categories names
     elif dircat and (len(categories) > 0):
         catname = slugify(categories[0])
-        out_filename = os.path.join(output_path, catname, filename+ext)
+        out_filename = os.path.join(output_path, catname, filename + ext)
         if not os.path.isdir(os.path.join(output_path, catname)):
             os.mkdir(os.path.join(output_path, catname))
 
     return out_filename
 
+
 def get_attachments(xml):
     """returns a dictionary of posts that have attachments with a list
     of the attachment_urls
@@ -566,7 +627,7 @@ def get_attachments(xml):
 
         if kind == 'attachment':
             attachments.append((item.find('post_parent').string,
-                item.find('attachment_url').string))
+                                item.find('attachment_url').string))
         else:
             filename = get_filename(filename, post_id)
             names[post_id] = filename
@@ -575,7 +636,7 @@ def get_attachments(xml):
         try:
             parent_name = names[parent]
         except KeyError:
-            #attachment's parent is not a valid post
+            # attachment's parent is not a valid post
             parent_name = None
 
         try:
@@ -585,6 +646,7 @@ def get_attachments(xml):
             attachedposts[parent_name].append(url)
     return attachedposts
 
+
 def download_attachments(output_path, urls):
     """Downloads WordPress attachments and returns a list of paths to
     attachments that can be associated with a post (relative path to output
@@ -592,8 +654,8 @@ def download_attachments(output_path, urls):
     locations = []
     for url in urls:
         path = urlparse(url).path
-        #teardown path and rebuild to negate any errors with
-        #os.path.join and leading /'s
+        # teardown path and rebuild to negate any errors with
+        # os.path.join and leading /'s
         path = path.split('/')
         filename = path.pop(-1)
         localpath = ''
@@ -608,12 +670,13 @@ def download_attachments(output_path, urls):
             urlretrieve(url, os.path.join(full_path, filename))
             locations.append(os.path.join(localpath, filename))
         except (URLError, IOError) as e:
-            #Python 2.7 throws an IOError rather Than URLError
+            # Python 2.7 throws an IOError rather Than URLError
             logger.warning("No file could be downloaded from %s\n%s", url, e)
     return locations
 
 
-def fields2pelican(fields, out_markup, output_path,
+def fields2pelican(
+        fields, out_markup, output_path,
         dircat=False, strip_raw=False, disable_slugs=False,
         dirpage=False, filename_template=None, filter_author=None,
         wp_custpost=False, wp_attach=False, attachments=None):
@@ -634,24 +697,26 @@ def fields2pelican(fields, out_markup, output_path,
 
         ext = get_ext(out_markup, in_markup)
         if ext == '.md':
-            header = build_markdown_header(title, date, author, categories,
-                    tags, slug, status, attached_files)
+            header = build_markdown_header(
+                title, date, author, categories, tags, slug,
+                status, attached_files)
         else:
-            out_markup = "rst"
+            out_markup = 'rst'
             header = build_header(title, date, author, categories,
-                    tags, slug, status, attached_files)
+                                  tags, slug, status, attached_files)
 
-        out_filename = get_out_filename(output_path, filename, ext,
-                kind, dirpage, dircat, categories, wp_custpost)
+        out_filename = get_out_filename(
+            output_path, filename, ext, kind, dirpage, dircat,
+            categories, wp_custpost)
         print(out_filename)
 
-        if in_markup in ("html", "wp-html"):
-            html_filename = os.path.join(output_path, filename+'.html')
+        if in_markup in ('html', 'wp-html'):
+            html_filename = os.path.join(output_path, filename + '.html')
 
             with open(html_filename, 'w', encoding='utf-8') as fp:
                 # Replace newlines with paragraphs wrapped with <p> so
                 # HTML is valid before conversion
-                if in_markup == "wp-html":
+                if in_markup == 'wp-html':
                     new_content = decode_wp_content(content)
                 else:
                     paragraphs = content.splitlines()
@@ -660,79 +725,95 @@ def fields2pelican(fields, out_markup, output_path,
 
                 fp.write(new_content)
 
-
             parse_raw = '--parse-raw' if not strip_raw else ''
             cmd = ('pandoc --normalize {0} --from=html'
-                   ' --to={1} -o "{2}" "{3}"').format(
-                    parse_raw, out_markup, out_filename, html_filename)
+                   ' --to={1} -o "{2}" "{3}"')
+            cmd = cmd.format(parse_raw, out_markup,
+                             out_filename, html_filename)
 
             try:
                 rc = subprocess.call(cmd, shell=True)
                 if rc < 0:
-                    error = "Child was terminated by signal %d" % -rc
+                    error = 'Child was terminated by signal %d' % -rc
                     exit(error)
 
                 elif rc > 0:
-                    error = "Please, check your Pandoc installation."
+                    error = 'Please, check your Pandoc installation.'
                     exit(error)
             except OSError as e:
-                error = "Pandoc execution failed: %s" % e
+                error = 'Pandoc execution failed: %s' % e
                 exit(error)
 
             os.remove(html_filename)
 
             with open(out_filename, 'r', encoding='utf-8') as fs:
                 content = fs.read()
-                if out_markup == "markdown":
-                    # In markdown, to insert a <br />, end a line with two or more spaces & then a end-of-line
-                    content = content.replace("\\\n ", "  \n")
-                    content = content.replace("\\\n", "  \n")
+                if out_markup == 'markdown':
+                    # In markdown, to insert a <br />, end a line with two
+                    # or more spaces & then a end-of-line
+                    content = content.replace('\\\n ', '  \n')
+                    content = content.replace('\\\n', '  \n')
 
         with open(out_filename, 'w', encoding='utf-8') as fs:
             fs.write(header + content)
     if wp_attach and attachments and None in attachments:
         print("downloading attachments that don't have a parent post")
         urls = attachments[None]
-        orphan_galleries = download_attachments(output_path, urls)
+        download_attachments(output_path, urls)
+
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Transform feed, WordPress, Tumblr, Dotclear, or Posterous "
-                    "files into reST (rst) or Markdown (md) files. Be sure to "
-                    "have pandoc installed.",
+        description="Transform feed, WordPress, Tumblr, Dotclear, or "
+                    "Posterous files into reST (rst) or Markdown (md) files. "
+                    "Be sure to have pandoc installed.",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
-    parser.add_argument(dest='input', help='The input file to read')
-    parser.add_argument('--wpfile', action='store_true', dest='wpfile',
+    parser.add_argument(
+        dest='input', help='The input file to read')
+    parser.add_argument(
+        '--wpfile', action='store_true', dest='wpfile',
         help='Wordpress XML export')
-    parser.add_argument('--dotclear', action='store_true', dest='dotclear',
+    parser.add_argument(
+        '--dotclear', action='store_true', dest='dotclear',
         help='Dotclear export')
-    parser.add_argument('--posterous', action='store_true', dest='posterous',
+    parser.add_argument(
+        '--posterous', action='store_true', dest='posterous',
         help='Posterous export')
-    parser.add_argument('--tumblr', action='store_true', dest='tumblr',
+    parser.add_argument(
+        '--tumblr', action='store_true', dest='tumblr',
         help='Tumblr export')
-    parser.add_argument('--feed', action='store_true', dest='feed',
+    parser.add_argument(
+        '--feed', action='store_true', dest='feed',
         help='Feed to parse')
-    parser.add_argument('-o', '--output', dest='output', default='output',
+    parser.add_argument(
+        '-o', '--output', dest='output', default='output',
         help='Output path')
-    parser.add_argument('-m', '--markup', dest='markup', default='rst',
+    parser.add_argument(
+        '-m', '--markup', dest='markup', default='rst',
         help='Output markup format (supports rst & markdown)')
-    parser.add_argument('--dir-cat', action='store_true', dest='dircat',
+    parser.add_argument(
+        '--dir-cat', action='store_true', dest='dircat',
         help='Put files in directories with categories name')
-    parser.add_argument('--dir-page', action='store_true', dest='dirpage',
+    parser.add_argument(
+        '--dir-page', action='store_true', dest='dirpage',
         help=('Put files recognised as pages in "pages/" sub-directory'
               ' (wordpress import only)'))
-    parser.add_argument('--filter-author', dest='author',
+    parser.add_argument(
+        '--filter-author', dest='author',
         help='Import only post from the specified author')
-    parser.add_argument('--strip-raw', action='store_true', dest='strip_raw',
+    parser.add_argument(
+        '--strip-raw', action='store_true', dest='strip_raw',
         help="Strip raw HTML code that can't be converted to "
              "markup such as flash embeds or iframes (wordpress import only)")
-    parser.add_argument('--wp-custpost', action='store_true',
+    parser.add_argument(
+        '--wp-custpost', action='store_true',
         dest='wp_custpost',
         help='Put wordpress custom post types in directories. If used with '
              '--dir-cat option directories will be created as '
              '/post_type/category/ (wordpress import only)')
-    parser.add_argument('--wp-attach', action='store_true', dest='wp_attach',
+    parser.add_argument(
+        '--wp-attach', action='store_true', dest='wp_attach',
         help='(wordpress import only) Download files uploaded to wordpress as '
              'attachments. Files will be added to posts as a list in the post '
              'header. All files will be downloaded, even if '
@@ -740,16 +821,20 @@ def main():
              'with their original path inside the output directory. '
              'e.g. output/wp-uploads/date/postname/file.jpg '
              '-- Requires an internet connection --')
-    parser.add_argument('--disable-slugs', action='store_true',
+    parser.add_argument(
+        '--disable-slugs', action='store_true',
         dest='disable_slugs',
         help='Disable storing slugs from imported posts within output. '
              'With this disabled, your Pelican URLs may not be consistent '
              'with your original posts.')
-    parser.add_argument('-e', '--email', dest='email',
+    parser.add_argument(
+        '-e', '--email', dest='email',
         help="Email address (posterous import only)")
-    parser.add_argument('-p', '--password', dest='password',
+    parser.add_argument(
+        '-p', '--password', dest='password',
         help="Password (posterous import only)")
-    parser.add_argument('-b', '--blogname', dest='blogname',
+    parser.add_argument(
+        '-b', '--blogname', dest='blogname',
         help="Blog name (Tumblr import only)")
 
     args = parser.parse_args()
@@ -766,18 +851,20 @@ def main():
     elif args.feed:
         input_type = 'feed'
     else:
-        error = "You must provide either --wpfile, --dotclear, --posterous, --tumblr or --feed options"
+        error = ('You must provide either --wpfile, --dotclear, '
+                 '--posterous, --tumblr or --feed options')
         exit(error)
 
     if not os.path.exists(args.output):
         try:
             os.mkdir(args.output)
         except OSError:
-            error = "Unable to create the output folder: " + args.output
+            error = 'Unable to create the output folder: ' + args.output
             exit(error)
 
     if args.wp_attach and input_type != 'wordpress':
-        error = "You must be importing a wordpress xml to use the --wp-attach option"
+        error = ('You must be importing a wordpress xml '
+                 'to use the --wp-attach option')
         exit(error)
 
     if input_type == 'wordpress':
@@ -796,14 +883,14 @@ def main():
     else:
         attachments = None
 
-    init() # init logging
-
+    # init logging
+    init()
     fields2pelican(fields, args.markup, args.output,
                    dircat=args.dircat or False,
                    dirpage=args.dirpage or False,
                    strip_raw=args.strip_raw or False,
                    disable_slugs=args.disable_slugs or False,
                    filter_author=args.author,
-                   wp_custpost = args.wp_custpost or False,
-                   wp_attach = args.wp_attach or False,
-                   attachments = attachments or None)
+                   wp_custpost=args.wp_custpost or False,
+                   wp_attach=args.wp_attach or False,
+                   attachments=attachments or None)
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 58da4649..e6ccf2a8 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -1,18 +1,20 @@
 #!/usr/bin/env python
-
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
-import six
+from __future__ import print_function, unicode_literals
 
+import argparse
+import codecs
 import os
 import string
-import argparse
 import sys
-import codecs
+
 import pytz
 
+import six
+
 from pelican import __version__
 
+
 _TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                               "templates")
 
@@ -44,9 +46,10 @@ CONF = {
     'timezone': 'Europe/Paris'
 }
 
-#url for list of valid timezones
+# url for list of valid timezones
 _TZ_URL = 'http://en.wikipedia.org/wiki/List_of_tz_database_time_zones'
 
+
 def _input_compat(prompt):
     if six.PY3:
         r = input(prompt)
@@ -59,6 +62,7 @@ if six.PY3:
 else:
     str_compat = unicode
 
+
 # Create a 'marked' default path, to determine if someone has supplied
 # a path on the command-line.
 class _DEFAULT_PATH_TYPE(str_compat):
@@ -66,6 +70,7 @@ class _DEFAULT_PATH_TYPE(str_compat):
 
 _DEFAULT_PATH = _DEFAULT_PATH_TYPE(os.curdir)
 
+
 def decoding_strings(f):
     def wrapper(*args, **kwargs):
         out = f(*args, **kwargs)
@@ -164,7 +169,8 @@ def ask(question, answer=str_compat, default=None, l=None):
                 print('You must enter an integer')
         return r
     else:
-        raise NotImplemented('Argument `answer` must be str_compat, bool, or integer')
+        raise NotImplemented(
+            'Argument `answer` must be str_compat, bool, or integer')
 
 
 def ask_timezone(question, default, tzurl):
@@ -177,7 +183,8 @@ def ask_timezone(question, default, tzurl):
             r = pytz.all_timezones[lower_tz.index(r)]
             break
         else:
-            print('Please enter a valid time zone:\n (check [{0}])'.format(tzurl))
+            print('Please enter a valid time zone:\n'
+                  ' (check [{0}])'.format(tzurl))
     return r
 
 
@@ -186,13 +193,13 @@ def main():
         description="A kickstarter for Pelican",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
     parser.add_argument('-p', '--path', default=_DEFAULT_PATH,
-            help="The path to generate the blog into")
+                        help="The path to generate the blog into")
     parser.add_argument('-t', '--title', metavar="title",
-            help='Set the title of the website')
+                        help='Set the title of the website')
     parser.add_argument('-a', '--author', metavar="author",
-            help='Set the author name of the website')
+                        help='Set the author name of the website')
     parser.add_argument('-l', '--lang', metavar="lang",
-            help='Set the default web site language')
+                        help='Set the default web site language')
 
     args = parser.parse_args()
 
@@ -214,50 +221,94 @@ needed by Pelican.
               'Will save to:\n%s\n' % CONF['basedir'])
     else:
         CONF['basedir'] = os.path.abspath(os.path.expanduser(
-            ask('Where do you want to create your new web site?', answer=str_compat, default=args.path)))
+            ask('Where do you want to create your new web site?',
+                answer=str_compat, default=args.path)))
 
-    CONF['sitename'] = ask('What will be the title of this web site?', answer=str_compat, default=args.title)
-    CONF['author'] = ask('Who will be the author of this web site?', answer=str_compat, default=args.author)
-    CONF['lang'] = ask('What will be the default language of this web site?', str_compat, args.lang or CONF['lang'], 2)
+    CONF['sitename'] = ask('What will be the title of this web site?',
+                           answer=str_compat, default=args.title)
+    CONF['author'] = ask('Who will be the author of this web site?',
+                         answer=str_compat, default=args.author)
+    CONF['lang'] = ask('What will be the default language of this web site?',
+                       str_compat, args.lang or CONF['lang'], 2)
 
-    if ask('Do you want to specify a URL prefix? e.g., http://example.com  ', answer=bool, default=True):
-        CONF['siteurl'] = ask('What is your URL prefix? (see above example; no trailing slash)', str_compat, CONF['siteurl'])
+    if ask('Do you want to specify a URL prefix? e.g., http://example.com  ',
+           answer=bool, default=True):
+        CONF['siteurl'] = ask('What is your URL prefix? (see '
+                              'above example; no trailing slash)',
+                              str_compat, CONF['siteurl'])
 
-    CONF['with_pagination'] = ask('Do you want to enable article pagination?', bool, bool(CONF['default_pagination']))
+    CONF['with_pagination'] = ask('Do you want to enable article pagination?',
+                                  bool, bool(CONF['default_pagination']))
 
     if CONF['with_pagination']:
-        CONF['default_pagination'] = ask('How many articles per page do you want?', int, CONF['default_pagination'])
+        CONF['default_pagination'] = ask('How many articles per page '
+                                         'do you want?',
+                                         int, CONF['default_pagination'])
     else:
         CONF['default_pagination'] = False
 
-    CONF['timezone'] = ask_timezone('What is your time zone?', CONF['timezone'], _TZ_URL)
+    CONF['timezone'] = ask_timezone('What is your time zone?',
+                                    CONF['timezone'], _TZ_URL)
 
-    automation = ask('Do you want to generate a Fabfile/Makefile to automate generation and publishing?', bool, True)
-    develop = ask('Do you want an auto-reload & simpleHTTP script to assist with theme and site development?', bool, True)
+    automation = ask('Do you want to generate a Fabfile/Makefile '
+                     'to automate generation and publishing?', bool, True)
+    develop = ask('Do you want an auto-reload & simpleHTTP script '
+                  'to assist with theme and site development?', bool, True)
 
     if automation:
-        if ask('Do you want to upload your website using FTP?', answer=bool, default=False):
-            CONF['ftp_host'] = ask('What is the hostname of your FTP server?', str_compat, CONF['ftp_host'])
-            CONF['ftp_user'] = ask('What is your username on that server?', str_compat, CONF['ftp_user'])
-            CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str_compat, CONF['ftp_target_dir'])
-        if ask('Do you want to upload your website using SSH?', answer=bool, default=False):
-            CONF['ssh_host'] = ask('What is the hostname of your SSH server?', str_compat, CONF['ssh_host'])
-            CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])
-            CONF['ssh_user'] = ask('What is your username on that server?', str_compat, CONF['ssh_user'])
-            CONF['ssh_target_dir'] = ask('Where do you want to put your web site on that server?', str_compat, CONF['ssh_target_dir'])
-        if ask('Do you want to upload your website using Dropbox?', answer=bool, default=False):
-            CONF['dropbox_dir'] = ask('Where is your Dropbox directory?', str_compat, CONF['dropbox_dir'])
-        if ask('Do you want to upload your website using S3?', answer=bool, default=False):
-            CONF['s3_bucket'] = ask('What is the name of your S3 bucket?', str_compat, CONF['s3_bucket'])
-        if ask('Do you want to upload your website using Rackspace Cloud Files?', answer=bool, default=False):
-            CONF['cloudfiles_username'] = ask('What is your Rackspace Cloud username?', str_compat, CONF['cloudfiles_username'])
-            CONF['cloudfiles_api_key'] = ask('What is your Rackspace Cloud API key?', str_compat, CONF['cloudfiles_api_key'])
-            CONF['cloudfiles_container'] = ask('What is the name of your Cloud Files container?', str_compat, CONF['cloudfiles_container'])
-        if ask('Do you want to upload your website using GitHub Pages?', answer=bool, default=False):
-            if ask('Is this your personal page (username.github.io)?', answer=bool, default=False):
-                CONF['github_pages_branch'] = _GITHUB_PAGES_BRANCHES['personal']
+        if ask('Do you want to upload your website using FTP?',
+               answer=bool, default=False):
+            CONF['ftp_host'] = ask('What is the hostname of your FTP server?',
+                                   str_compat, CONF['ftp_host'])
+            CONF['ftp_user'] = ask('What is your username on that server?',
+                                   str_compat, CONF['ftp_user'])
+            CONF['ftp_target_dir'] = ask('Where do you want to put your '
+                                         'web site on that server?',
+                                         str_compat, CONF['ftp_target_dir'])
+        if ask('Do you want to upload your website using SSH?',
+               answer=bool, default=False):
+            CONF['ssh_host'] = ask('What is the hostname of your SSH server?',
+                                   str_compat, CONF['ssh_host'])
+            CONF['ssh_port'] = ask('What is the port of your SSH server?',
+                                   int, CONF['ssh_port'])
+            CONF['ssh_user'] = ask('What is your username on that server?',
+                                   str_compat, CONF['ssh_user'])
+            CONF['ssh_target_dir'] = ask('Where do you want to put your '
+                                         'web site on that server?',
+                                         str_compat, CONF['ssh_target_dir'])
+
+        if ask('Do you want to upload your website using Dropbox?',
+               answer=bool, default=False):
+            CONF['dropbox_dir'] = ask('Where is your Dropbox directory?',
+                                      str_compat, CONF['dropbox_dir'])
+
+        if ask('Do you want to upload your website using S3?',
+               answer=bool, default=False):
+            CONF['s3_bucket'] = ask('What is the name of your S3 bucket?',
+                                    str_compat, CONF['s3_bucket'])
+
+        if ask('Do you want to upload your website using '
+               'Rackspace Cloud Files?', answer=bool, default=False):
+            CONF['cloudfiles_username'] = ask('What is your Rackspace '
+                                              'Cloud username?', str_compat,
+                                              CONF['cloudfiles_username'])
+            CONF['cloudfiles_api_key'] = ask('What is your Rackspace '
+                                             'Cloud API key?', str_compat,
+                                             CONF['cloudfiles_api_key'])
+            CONF['cloudfiles_container'] = ask('What is the name of your '
+                                               'Cloud Files container?',
+                                               str_compat,
+                                               CONF['cloudfiles_container'])
+
+        if ask('Do you want to upload your website using GitHub Pages?',
+               answer=bool, default=False):
+            if ask('Is this your personal page (username.github.io)?',
+                   answer=bool, default=False):
+                CONF['github_pages_branch'] = \
+                    _GITHUB_PAGES_BRANCHES['personal']
             else:
-                CONF['github_pages_branch'] = _GITHUB_PAGES_BRANCHES['project']
+                CONF['github_pages_branch'] = \
+                    _GITHUB_PAGES_BRANCHES['project']
 
     try:
         os.makedirs(os.path.join(CONF['basedir'], 'content'))
@@ -270,7 +321,8 @@ needed by Pelican.
         print('Error: {0}'.format(e))
 
     try:
-        with codecs.open(os.path.join(CONF['basedir'], 'pelicanconf.py'), 'w', 'utf-8') as fd:
+        with codecs.open(os.path.join(CONF['basedir'], 'pelicanconf.py'),
+                         'w', 'utf-8') as fd:
             conf_python = dict()
             for key, value in CONF.items():
                 conf_python[key] = repr(value)
@@ -283,7 +335,8 @@ needed by Pelican.
         print('Error: {0}'.format(e))
 
     try:
-        with codecs.open(os.path.join(CONF['basedir'], 'publishconf.py'), 'w', 'utf-8') as fd:
+        with codecs.open(os.path.join(CONF['basedir'], 'publishconf.py'),
+                         'w', 'utf-8') as fd:
             for line in get_template('publishconf.py'):
                 template = string.Template(line)
                 fd.write(template.safe_substitute(CONF))
@@ -293,7 +346,8 @@ needed by Pelican.
 
     if automation:
         try:
-            with codecs.open(os.path.join(CONF['basedir'], 'fabfile.py'), 'w', 'utf-8') as fd:
+            with codecs.open(os.path.join(CONF['basedir'], 'fabfile.py'),
+                             'w', 'utf-8') as fd:
                 for line in get_template('fabfile.py'):
                     template = string.Template(line)
                     fd.write(template.safe_substitute(CONF))
@@ -301,7 +355,8 @@ needed by Pelican.
         except OSError as e:
             print('Error: {0}'.format(e))
         try:
-            with codecs.open(os.path.join(CONF['basedir'], 'Makefile'), 'w', 'utf-8') as fd:
+            with codecs.open(os.path.join(CONF['basedir'], 'Makefile'),
+                             'w', 'utf-8') as fd:
                 mkfile_template_name = 'Makefile'
                 py_v = 'PY?=python'
                 if six.PY3:
@@ -323,7 +378,9 @@ needed by Pelican.
                 value = '"' + value.replace('"', '\\"') + '"'
             conf_shell[key] = value
         try:
-            with codecs.open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w', 'utf-8') as fd:
+            with codecs.open(os.path.join(CONF['basedir'],
+                                          'develop_server.sh'),
+                             'w', 'utf-8') as fd:
                 lines = list(get_template('develop_server.sh'))
                 py_v = 'PY=${PY:-python}\n'
                 if six.PY3:
@@ -333,7 +390,10 @@ needed by Pelican.
                     template = string.Template(line)
                     fd.write(template.safe_substitute(conf_shell))
                 fd.close()
-                os.chmod((os.path.join(CONF['basedir'], 'develop_server.sh')), 493) # mode 0o755
+
+                # mode 0o755
+                os.chmod((os.path.join(CONF['basedir'],
+                                       'develop_server.sh')), 493)
         except OSError as e:
             print('Error: {0}'.format(e))
 
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 8d71535d..e4bcb7c9 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -1,33 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
-
-import six
+from __future__ import print_function, unicode_literals
 
 import argparse
 import os
 import shutil
 import sys
 
-try:
-    import pelican
-except:
-    err('Cannot import pelican.\nYou must install Pelican in order to run this script.', -1)
-
-
-global _THEMES_PATH
-_THEMES_PATH = os.path.join(
-    os.path.dirname(
-        os.path.abspath(
-            pelican.__file__
-    )
-    ),
-    'themes'
-)
-
-__version__ = '0.2'
-_BUILTIN_THEMES = ['simple', 'notmyidea']
-
 
 def err(msg, die=None):
     """Print an error message and exits if an exit code is given"""
@@ -35,43 +14,71 @@ def err(msg, die=None):
     if die:
         sys.exit((die if type(die) is int else 1))
 
+try:
+    import pelican
+except:
+    err('Cannot import pelican.\nYou must '
+        'install Pelican in order to run this script.',
+        -1)
+
+
+global _THEMES_PATH
+_THEMES_PATH = os.path.join(
+    os.path.dirname(
+        os.path.abspath(pelican.__file__)
+    ),
+    'themes'
+)
+
+__version__ = '0.2'
+_BUILTIN_THEMES = ['simple', 'notmyidea']
+
 
 def main():
     """Main function"""
 
-    parser = argparse.ArgumentParser(description="""Install themes for Pelican""")
+    parser = argparse.ArgumentParser(
+        description="""Install themes for Pelican""")
 
-    excl= parser.add_mutually_exclusive_group()
-    excl.add_argument('-l', '--list', dest='action', action="store_const", const='list',
+    excl = parser.add_mutually_exclusive_group()
+    excl.add_argument(
+        '-l', '--list', dest='action', action="store_const", const='list',
         help="Show the themes already installed and exit")
-    excl.add_argument('-p', '--path', dest='action', action="store_const", const='path',
+    excl.add_argument(
+        '-p', '--path', dest='action', action="store_const", const='path',
         help="Show the themes path and exit")
-    excl.add_argument('-V', '--version', action='version', version='pelican-themes v{0}'.format(__version__),
+    excl.add_argument(
+        '-V', '--version', action='version',
+        version='pelican-themes v{0}'.format(__version__),
         help='Print the version of this script')
 
-
-    parser.add_argument('-i', '--install', dest='to_install', nargs='+', metavar="theme path",
+    parser.add_argument(
+        '-i', '--install', dest='to_install', nargs='+', metavar="theme path",
         help='The themes to install')
-    parser.add_argument('-r', '--remove', dest='to_remove', nargs='+', metavar="theme name",
+    parser.add_argument(
+        '-r', '--remove', dest='to_remove', nargs='+', metavar="theme name",
         help='The themes to remove')
-    parser.add_argument('-U', '--upgrade', dest='to_upgrade', nargs='+',
-            metavar="theme path", help='The themes to upgrade')
-    parser.add_argument('-s', '--symlink', dest='to_symlink', nargs='+', metavar="theme path",
-        help="Same as `--install', but create a symbolic link instead of copying the theme. Useful for theme development")
-    parser.add_argument('-c', '--clean', dest='clean', action="store_true",
+    parser.add_argument(
+        '-U', '--upgrade', dest='to_upgrade', nargs='+',
+        metavar="theme path", help='The themes to upgrade')
+    parser.add_argument(
+        '-s', '--symlink', dest='to_symlink', nargs='+', metavar="theme path",
+        help="Same as `--install', but create a symbolic link instead of "
+             "copying the theme. Useful for theme development")
+    parser.add_argument(
+        '-c', '--clean', dest='clean', action="store_true",
         help="Remove the broken symbolic links of the theme path")
 
-
-    parser.add_argument('-v', '--verbose', dest='verbose', action="store_true",
+    parser.add_argument(
+        '-v', '--verbose', dest='verbose',
+        action="store_true",
         help="Verbose output")
 
-
     args = parser.parse_args()
-    
+
     to_install = args.to_install or args.to_upgrade
     to_sym = args.to_symlink or args.clean
 
-
     if args.action:
         if args.action is 'list':
             list_themes(args.verbose)
@@ -95,7 +102,7 @@ def main():
         if args.to_upgrade:
             if args.verbose:
                 print('Upgrading themes...')
-            
+
             for i in args.to_upgrade:
                 install(i, v=args.verbose, u=True)
 
@@ -144,11 +151,13 @@ def list_themes(v=False):
 def remove(theme_name, v=False):
     """Removes a theme"""
 
-    theme_name = theme_name.replace('/','')
+    theme_name = theme_name.replace('/', '')
     target = os.path.join(_THEMES_PATH, theme_name)
 
     if theme_name in _BUILTIN_THEMES:
-        err(theme_name + ' is a builtin theme.\nYou cannot remove a builtin theme with this script, remove it by hand if you want.')
+        err(theme_name + ' is a builtin theme.\n'
+            'You cannot remove a builtin theme with this script, '
+            'remove it by hand if you want.')
     elif os.path.islink(target):
         if v:
             print('Removing link `' + target + "'")
@@ -180,7 +189,8 @@ def install(path, v=False, u=False):
             install(path, v)
         else:
             if v:
-                print("Copying `{p}' to `{t}' ...".format(p=path, t=theme_path))
+                print("Copying '{p}' to '{t}' ...".format(p=path,
+                                                          t=theme_path))
             try:
                 shutil.copytree(path, theme_path)
 
@@ -189,14 +199,18 @@ def install(path, v=False, u=False):
                         for root, dirs, files in os.walk(theme_path):
                             for d in dirs:
                                 dname = os.path.join(root, d)
-                                os.chmod(dname, 493) # 0o755
+                                os.chmod(dname, 493)  # 0o755
                             for f in files:
                                 fname = os.path.join(root, f)
-                                os.chmod(fname, 420) # 0o644
+                                os.chmod(fname, 420)  # 0o644
                 except OSError as e:
-                    err("Cannot change permissions of files or directory in `{r}':\n{e}".format(r=theme_path, e=str(e)), die=False)
+                    err("Cannot change permissions of files "
+                        "or directory in `{r}':\n{e}".format(r=theme_path,
+                                                             e=str(e)),
+                        die=False)
             except Exception as e:
-                err("Cannot copy `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
+                err("Cannot copy `{p}' to `{t}':\n{e}".format(
+                    p=path, t=theme_path, e=str(e)))
 
 
 def symlink(path, v=False):
@@ -212,11 +226,13 @@ def symlink(path, v=False):
             err(path + ' : already exists')
         else:
             if v:
-                print("Linking `{p}' to `{t}' ...".format(p=path, t=theme_path))
+                print("Linking `{p}' to `{t}' ...".format(
+                    p=path, t=theme_path))
             try:
                 os.symlink(path, theme_path)
             except Exception as e:
-                err("Cannot link `{p}' to `{t}':\n{e}".format(p=path, t=theme_path, e=str(e)))
+                err("Cannot link `{p}' to `{t}':\n{e}".format(
+                    p=path, t=theme_path, e=str(e)))
 
 
 def is_broken_link(path):
@@ -227,7 +243,7 @@ def is_broken_link(path):
 
 def clean(v=False):
     """Removes the broken symbolic links"""
-    c=0
+    c = 0
     for path in os.listdir(_THEMES_PATH):
         path = os.path.join(_THEMES_PATH, path)
         if os.path.islink(path):
@@ -236,9 +252,9 @@ def clean(v=False):
                     print('Removing {0}'.format(path))
                 try:
                     os.remove(path)
-                except OSError as e:
+                except OSError:
                     print('Error: cannot remove {0}'.format(path))
                 else:
-                    c+=1
+                    c += 1
 
     print("\nRemoved {0} broken links".format(c))
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 65dee23b..bf1199a8 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -4,9 +4,10 @@ from __future__ import unicode_literals
 import functools
 import logging
 import os
+
 import six
 
-from pelican.utils import (slugify, python_2_unicode_compatible)
+from pelican.utils import python_2_unicode_compatible, slugify
 
 logger = logging.getLogger(__name__)
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 43dca212..786a9425 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,29 +1,30 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
-import six
+from __future__ import print_function, unicode_literals
 
 import codecs
+import datetime
 import errno
 import fnmatch
 import locale
 import logging
 import os
-import pytz
 import re
 import shutil
 import sys
 import traceback
-import pickle
-import datetime
-
 from collections import Hashable
 from contextlib import contextmanager
-import dateutil.parser
 from functools import partial
 from itertools import groupby
-from jinja2 import Markup
 from operator import attrgetter
-from posixpath import join as posix_join
+
+import dateutil.parser
+
+from jinja2 import Markup
+
+import pytz
+
+import six
 from six.moves.html_parser import HTMLParser
 
 logger = logging.getLogger(__name__)
@@ -43,9 +44,9 @@ def strftime(date, date_format):
     formatting them with the date, (if necessary) decoding the output and
     replacing formatted output back.
     '''
-
+    def strip_zeros(x):
+        return x.lstrip('0') or '0'
     c89_directives = 'aAbBcdfHIjmMpSUwWxXyYzZ%'
-    strip_zeros = lambda x: x.lstrip('0') or '0'
 
     # grab candidate format options
     format_options = '%[-]?.'
@@ -200,8 +201,8 @@ def deprecated_attribute(old, new, since=None, remove=None, doc=None):
                 ' and will be removed by version {}'.format(version))
         message.append('.  Use {} instead.'.format(new))
         logger.warning(''.join(message))
-        logger.debug(''.join(
-                six.text_type(x) for x in traceback.format_stack()))
+        logger.debug(''.join(six.text_type(x) for x
+                             in traceback.format_stack()))
 
     def fget(self):
         _warn()
@@ -224,7 +225,7 @@ def get_date(string):
     """
     string = re.sub(' +', ' ', string)
     default = SafeDatetime.now().replace(hour=0, minute=0,
-                                        second=0, microsecond=0)
+                                         second=0, microsecond=0)
     try:
         return dateutil.parser.parse(string, default=default)
     except (TypeError, ValueError):
@@ -319,12 +320,12 @@ def copy(source, destination, ignores=None):
 
         for src_dir, subdirs, others in os.walk(source_):
             dst_dir = os.path.join(destination_,
-                                    os.path.relpath(src_dir, source_))
+                                   os.path.relpath(src_dir, source_))
 
             subdirs[:] = (s for s in subdirs if not any(fnmatch.fnmatch(s, i)
                                                         for i in ignores))
-            others[:] =  (o for o in others  if not any(fnmatch.fnmatch(o, i)
-                                                        for i in ignores))
+            others[:] = (o for o in others if not any(fnmatch.fnmatch(o, i)
+                                                      for i in ignores))
 
             if not os.path.isdir(dst_dir):
                 logger.info('Creating directory %s', dst_dir)
@@ -338,9 +339,11 @@ def copy(source, destination, ignores=None):
                     logger.info('Copying %s to %s', src_path, dst_path)
                     shutil.copy2(src_path, dst_path)
                 else:
-                    logger.warning('Skipped copy %s (not a file or directory) to %s',
+                    logger.warning('Skipped copy %s (not a file or '
+                                   'directory) to %s',
                                    src_path, dst_path)
 
+
 def clean_output_dir(path, retention):
     """Remove all files from output directory except those in retention list"""
 
@@ -366,8 +369,8 @@ def clean_output_dir(path, retention):
                 shutil.rmtree(file)
                 logger.debug("Deleted directory %s", file)
             except Exception as e:
-                logger.error("Unable to delete directory %s; %s", 
-                        file, e)
+                logger.error("Unable to delete directory %s; %s",
+                             file, e)
         elif os.path.isfile(file) or os.path.islink(file):
             try:
                 os.remove(file)
@@ -507,12 +510,12 @@ def process_translations(content_list, order_by=None):
 
     for slug, items in grouped_by_slugs:
         items = list(items)
-        # items with `translation` metadata will be used as translations…
+        # items with `translation` metadata will be used as translations...
         default_lang_items = list(filter(
-                lambda i: i.metadata.get('translation', 'false').lower()
-                        == 'false',
-                items))
-        # …unless all items with that slug are translations
+            lambda i:
+                i.metadata.get('translation', 'false').lower() == 'false',
+            items))
+        # ...unless all items with that slug are translations
         if not default_lang_items:
             default_lang_items = items
 
@@ -522,13 +525,14 @@ def process_translations(content_list, order_by=None):
             len_ = len(lang_items)
             if len_ > 1:
                 logger.warning('There are %s variants of "%s" with lang %s',
-                    len_, slug, lang)
+                               len_, slug, lang)
                 for x in lang_items:
                     logger.warning('\t%s', x.source_path)
 
         # find items with default language
-        default_lang_items = list(filter(attrgetter('in_default_lang'),
-                default_lang_items))
+        default_lang_items = list(filter(
+            attrgetter('in_default_lang'),
+            default_lang_items))
 
         # if there is no article with default language, take an other one
         if not default_lang_items:
@@ -536,10 +540,9 @@ def process_translations(content_list, order_by=None):
 
         if not slug:
             logger.warning(
-                    'empty slug for %s. '
-                    'You can fix this by adding a title or a slug to your '
-                    'content',
-                    default_lang_items[0].source_path)
+                'Empty slug for %s. You can fix this by '
+                'adding a title or a slug to your content',
+                default_lang_items[0].source_path)
         index.extend(default_lang_items)
         translations.extend([x for x in items if x not in default_lang_items])
         for a in items:
@@ -567,10 +570,12 @@ def process_translations(content_list, order_by=None):
                     index.sort(key=attrgetter(order_by),
                                reverse=order_reversed)
                 except AttributeError:
-                    logger.warning('There is no "%s" attribute in the item '
+                    logger.warning(
+                        'There is no "%s" attribute in the item '
                         'metadata. Defaulting to slug order.', order_by)
         else:
-            logger.warning('Invalid *_ORDER_BY setting (%s).'
+            logger.warning(
+                'Invalid *_ORDER_BY setting (%s).'
                 'Valid options are strings and functions.', order_by)
 
     return index, translations
@@ -589,12 +594,12 @@ def folder_watcher(path, extensions, ignores=[]):
             dirs[:] = [x for x in dirs if not x.startswith(os.curdir)]
 
             for f in files:
-                if (f.endswith(tuple(extensions)) and
-                    not any(fnmatch.fnmatch(f, ignore) for ignore in ignores)):
-                    try:
-                        yield os.stat(os.path.join(root, f)).st_mtime
-                    except OSError as e:
-                        logger.warning('Caught Exception: %s', e)
+                if f.endswith(tuple(extensions)) and \
+                   not any(fnmatch.fnmatch(f, ignore) for ignore in ignores):
+                        try:
+                            yield os.stat(os.path.join(root, f)).st_mtime
+                        except OSError as e:
+                            logger.warning('Caught Exception: %s', e)
 
     LAST_MTIME = 0
     while True:
diff --git a/pelican/writers.py b/pelican/writers.py
index e90a0004..4df7b859 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -1,22 +1,24 @@
 # -*- coding: utf-8 -*-
-from __future__ import with_statement, unicode_literals, print_function
-import six
+from __future__ import print_function, unicode_literals, with_statement
 
-import os
 import logging
+import os
+
+from feedgenerator import Atom1Feed, Rss201rev2Feed
+
+from jinja2 import Markup
+
+import six
+from six.moves.urllib.parse import urlparse
+
+from pelican import signals
+from pelican.paginator import Paginator
+from pelican.utils import (get_relative_path, is_selected_for_writing,
+                           path_to_url, set_date_tzinfo)
 
 if not six.PY3:
     from codecs import open
 
-from feedgenerator import Atom1Feed, Rss201rev2Feed
-from jinja2 import Markup
-from six.moves.urllib.parse import urlparse
-
-from pelican.paginator import Paginator
-from pelican.utils import (get_relative_path, path_to_url, set_date_tzinfo,
-                           is_selected_for_writing)
-from pelican import signals
-
 logger = logging.getLogger(__name__)
 
 
@@ -119,10 +121,10 @@ class Writer(object):
                 feed.write(fp, 'utf-8')
                 logger.info('Writing %s', complete_path)
 
-            signals.feed_written.send(complete_path, context=context, feed=feed)
+            signals.feed_written.send(
+                complete_path, context=context, feed=feed)
         return feed
 
-
     def write_file(self, name, template, context, relative_urls=False,
                    paginated=None, override_output=False, **kwargs):
         """Render the template and write the file.
@@ -139,9 +141,10 @@ class Writer(object):
         :param **kwargs: additional variables to pass to the templates
         """
 
-        if name is False or name == "" or\
-           not is_selected_for_writing(self.settings,\
-               os.path.join(self.output_path, name)):
+        if name is False or \
+           name == "" or \
+           not is_selected_for_writing(self.settings,
+                                       os.path.join(self.output_path, name)):
             return
         elif not name:
             # other stuff, just return for now
@@ -169,7 +172,8 @@ class Writer(object):
 
         def _get_localcontext(context, name, kwargs, relative_urls):
             localcontext = context.copy()
-            localcontext['localsiteurl'] = localcontext.get('localsiteurl', None)
+            localcontext['localsiteurl'] = localcontext.get(
+                'localsiteurl', None)
             if relative_urls:
                 relative_url = path_to_url(get_relative_path(name))
                 localcontext['SITEURL'] = relative_url
@@ -201,11 +205,13 @@ class Writer(object):
                          '%s_previous_page' % key: previous_page,
                          '%s_next_page' % key: next_page})
 
-                localcontext = _get_localcontext(context, page.save_as, paginated_kwargs, relative_urls)
+                localcontext = _get_localcontext(
+                    context, page.save_as, paginated_kwargs, relative_urls)
                 _write_file(template, localcontext, self.output_path,
                             page.save_as, override_output)
         else:
             # no pagination
-            localcontext = _get_localcontext(context, name, kwargs, relative_urls)
+            localcontext = _get_localcontext(
+                context, name, kwargs, relative_urls)
             _write_file(template, localcontext, self.output_path, name,
                         override_output)
diff --git a/tox.ini b/tox.ini
index 34335b82..56ad0c14 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,4 +38,5 @@ deps =
     flake8 <= 2.4.1
     git+https://github.com/public/flake8-import-order@2ac7052a4e02b4a8a0125a106d87465a3b9fd688
 commands =
+    flake8 --version
     flake8 pelican

From 9d57dcf020c11abfb0efc16d6d4387a269964b97 Mon Sep 17 00:00:00 2001
From: Julien Vehent <julien@linuxwall.info>
Date: Wed, 19 Aug 2015 12:28:14 -0400
Subject: [PATCH 1826/2864] Fix calculation of tag count in dotclear import

Upon import of a dotclear backup, `pelican-import` returned this stacktrace:

```
  File "/usr/bin/pelican-import", line 11, in <module>
    sys.exit(main())
  File "/usr/lib/python3.4/site-packages/pelican/tools/pelican_import.py", line 809, in main
    attachments = attachments or None)
  File "/usr/lib/python3.4/site-packages/pelican/tools/pelican_import.py", line 621, in fields2pelican
    kind, in_markup) in fields:
  File "/usr/lib/python3.4/site-packages/pelican/tools/pelican_import.py", line 262, in dc2fields
    if int(tag[:1]) == 1:
ValueError: invalid literal for int() with base 10: 'a'
```
---
 pelican/tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 92e8c919..a6547f63 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -259,7 +259,7 @@ def dc2fields(file):
         # Get tags related to a post
         tag = post_meta.replace('{', '').replace('}', '').replace('a:1:s:3:\\"tag\\";a:', '').replace('a:0:', '')
         if len(tag) > 1:
-            if int(tag[:1]) == 1:
+            if int(len(tag[:1])) == 1:
                 newtag = tag.split('"')[1]
                 tags.append(
                     BeautifulSoup(

From 170a429c52ed57c45826fa31c31d5bf692698cac Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 25 Aug 2015 10:05:15 -0700
Subject: [PATCH 1827/2864] Add flake8, sphinx, and tox to dev requirements

---
 dev_requirements.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index 028cbebd..d11b5c1f 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,5 +1,9 @@
 # Tests
+flake8
+-e git+https://github.com/public/flake8-import-order#egg=flake8-import-order
 mock
+sphinx
+tox
 
 # Optional Packages
 Markdown

From ad72287b4cff8c46f35f693b487bfe39d00f0500 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 25 Aug 2015 11:25:57 -0700
Subject: [PATCH 1828/2864] Revert dev requirement additions

Tox uses dev_requirements.txt to install things. That wasn't the
original purpose of the dev_requirements.txt file, but for now these
additions will have to remain a documentation issue until this can be
sorted out properly.
---
 dev_requirements.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index d11b5c1f..028cbebd 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,9 +1,5 @@
 # Tests
-flake8
--e git+https://github.com/public/flake8-import-order#egg=flake8-import-order
 mock
-sphinx
-tox
 
 # Optional Packages
 Markdown

From 7f795ed558f7eb5adabf1c2777db9b430ce121ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Fern=C3=A1ndez?= <fernandez.cuesta@gmail.com>
Date: Wed, 26 Aug 2015 11:23:28 +0200
Subject: [PATCH 1829/2864] Remove duplicate tags and authors in metadata

---
 pelican/readers.py                                |  5 ++++-
 .../article_with_duplicate_tags_authors.md        | 15 +++++++++++++++
 pelican/tests/test_generators.py                  |  2 ++
 pelican/tests/test_readers.py                     | 10 ++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pelican/tests/content/article_with_duplicate_tags_authors.md

diff --git a/pelican/readers.py b/pelican/readers.py
index bc4515e7..2e51c4ff 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -4,6 +4,7 @@ from __future__ import print_function, unicode_literals
 import logging
 import os
 import re
+from collections import OrderedDict
 
 import docutils
 import docutils.core
@@ -72,7 +73,9 @@ def ensure_metadata_list(text):
         else:
             text = text.split(',')
 
-    return [v for v in (w.strip() for w in text) if v]
+    return list(OrderedDict.fromkeys(
+        [v for v in (w.strip() for w in text) if v]
+    ))
 
 
 def _process_if_nonempty(processor, name, settings):
diff --git a/pelican/tests/content/article_with_duplicate_tags_authors.md b/pelican/tests/content/article_with_duplicate_tags_authors.md
new file mode 100644
index 00000000..7ab046f9
--- /dev/null
+++ b/pelican/tests/content/article_with_duplicate_tags_authors.md
@@ -0,0 +1,15 @@
+Title: Test metadata duplicates
+Category: test
+Tags: foo, bar, foobar, foo, bar
+Authors: Author, First; Author, Second; Author, First
+Date: 2010-12-02 10:14
+Modified: 2010-12-02 10:20
+Summary: I have a lot to test
+
+Test Markdown File Header
+=========================
+
+Used for pelican test
+---------------------
+
+The quick brown fox jumped over the lazy dog's back.
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 2cfca04f..c9aa1cff 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -160,6 +160,7 @@ class TestArticlesGenerator(unittest.TestCase):
             ['Test markdown File', 'published', 'test', 'article'],
             ['Test md File', 'published', 'test', 'article'],
             ['Test mdown File', 'published', 'test', 'article'],
+            ['Test metadata duplicates', 'published', 'test', 'article'],
             ['Test mkd File', 'published', 'test', 'article'],
             ['This is a super article !', 'published', 'Yeah', 'article'],
             ['This is a super article !', 'published', 'Yeah', 'article'],
@@ -435,6 +436,7 @@ class TestArticlesGenerator(unittest.TestCase):
             'Test markdown File',
             'Test md File',
             'Test mdown File',
+            'Test metadata duplicates',
             'Test mkd File',
             'This is a super article !',
             'This is a super article !',
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 71394ee4..5fabc470 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -516,6 +516,16 @@ class MdReaderTest(ReaderTest):
         }
         self.assertDictHasSubset(page.metadata, expected)
 
+    def test_duplicate_tags_or_authors_are_removed(self):
+        reader = readers.MarkdownReader(settings=get_settings())
+        content, metadata = reader.read(
+            _path('article_with_duplicate_tags_authors.md'))
+        expected = {
+            'tags': ['foo', 'bar', 'foobar'],
+            'authors': ['Author, First', 'Author, Second'],
+        }
+        self.assertDictHasSubset(metadata, expected)
+
 
 class HTMLReaderTest(ReaderTest):
     def test_article_with_comments(self):

From 9d0804de7af858880e5ef74f0c1c5d8f5ad6419b Mon Sep 17 00:00:00 2001
From: Andrea Corbellini <corbellini.andrea@gmail.com>
Date: Wed, 19 Aug 2015 16:43:59 +0200
Subject: [PATCH 1830/2864] When truncating, consider hypens, apostrophes and
 HTML entities.

---
 pelican/tests/output/basic/category/misc.html |  2 +-
 pelican/tests/output/basic/index.html         |  2 +-
 .../custom/author/alexis-metaireau3.html      |  2 +-
 .../tests/output/custom/category/misc.html    |  2 +-
 pelican/tests/output/custom/index3.html       |  2 +-
 .../author/alexis-metaireau3.html             |  4 +-
 .../output/custom_locale/category/misc.html   |  4 +-
 .../tests/output/custom_locale/index3.html    |  4 +-
 pelican/tests/test_utils.py                   | 28 ++++++--
 pelican/utils.py                              | 69 ++++++++++++++++---
 10 files changed, 95 insertions(+), 24 deletions(-)

diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 0368793e..f491a464 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -90,7 +90,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it ...</p></div>
+pelican.conf, it will ...</p></div>
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 3066172d..4c74500d 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -227,7 +227,7 @@ YEAH !</p>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it ...</p></div>
+pelican.conf, it will ...</p></div>
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 54c768ac..3ca4dd0d 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -59,7 +59,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it ...</p></div>
+pelican.conf, it will ...</p></div>
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index fa71085d..b705a552 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -103,7 +103,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it ...</p></div>
+pelican.conf, it will ...</p></div>
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 1dab4e7d..b968b7e8 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -59,7 +59,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it ...</p></div>
+pelican.conf, it will ...</p></div>
                 <a class="readmore" href="./unbelievable.html">read more</a>
 <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 66575c71..2fea24c3 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -59,7 +59,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it ...</p></div>
+pelican.conf, it will ...</p></div>
                 <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
 <p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
@@ -135,4 +135,4 @@ pelican.conf, it ...</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index bb78a8cc..f44f725d 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -103,7 +103,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it ...</p></div>
+pelican.conf, it will ...</p></div>
                 <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
 <p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
@@ -175,4 +175,4 @@ pelican.conf, it ...</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 49f70ba2..926bc25e 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -59,7 +59,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it ...</p></div>
+pelican.conf, it will ...</p></div>
                 <a class="readmore" href="./posts/2010/octobre/15/unbelievable/">read more</a>
 <p>There are <a href="./posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
@@ -135,4 +135,4 @@ pelican.conf, it ...</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index d6fdf70e..a076a2c7 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -146,31 +146,51 @@ class TestUtils(LoggedTestCase):
             self.assertEqual(utils.get_relative_path(value), expected)
 
     def test_truncate_html_words(self):
+        # Plain text.
         self.assertEqual(
             utils.truncate_html_words('short string', 20),
             'short string')
-
         self.assertEqual(
             utils.truncate_html_words('word ' * 100, 20),
             'word ' * 20 + '...')
 
+        # Words enclosed or intervaled by HTML tags.
         self.assertEqual(
             utils.truncate_html_words('<p>' + 'word ' * 100 + '</p>', 20),
             '<p>' + 'word ' * 20 + '...</p>')
-
         self.assertEqual(
             utils.truncate_html_words(
                 '<span\nstyle="\n...\n">' + 'word ' * 100 + '</span>', 20),
             '<span\nstyle="\n...\n">' + 'word ' * 20 + '...</span>')
-
         self.assertEqual(
             utils.truncate_html_words('<br>' + 'word ' * 100, 20),
             '<br>' + 'word ' * 20 + '...')
-
         self.assertEqual(
             utils.truncate_html_words('<!-- comment -->' + 'word ' * 100, 20),
             '<!-- comment -->' + 'word ' * 20 + '...')
 
+        # Words with hypens and apostrophes.
+        self.assertEqual(
+            utils.truncate_html_words("a-b " * 100, 20),
+            "a-b " * 20 + '...')
+        self.assertEqual(
+            utils.truncate_html_words("it's " * 100, 20),
+            "it's " * 20 + '...')
+
+        # Words with HTML entity references.
+        self.assertEqual(
+            utils.truncate_html_words("&eacute; " * 100, 20),
+            "&eacute; " * 20 + '...')
+        self.assertEqual(
+            utils.truncate_html_words("caf&eacute; " * 100, 20),
+            "caf&eacute; " * 20 + '...')
+        self.assertEqual(
+            utils.truncate_html_words("&egrave;lite " * 100, 20),
+            "&egrave;lite " * 20 + '...')
+        self.assertEqual(
+            utils.truncate_html_words("cafeti&eacute;re " * 100, 20),
+            "cafeti&eacute;re " * 20 + '...')
+
     def test_process_translations(self):
         # create a bunch of articles
         # 1: no translation metadata
diff --git a/pelican/utils.py b/pelican/utils.py
index 786a9425..7ad0914c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -25,6 +25,7 @@ from jinja2 import Markup
 import pytz
 
 import six
+from six.moves import html_entities
 from six.moves.html_parser import HTMLParser
 
 logger = logging.getLogger(__name__)
@@ -408,7 +409,8 @@ def posixize_path(rel_path):
 
 class _HTMLWordTruncator(HTMLParser):
 
-    _word_regex = re.compile(r'\w[\w-]*', re.U)
+    _word_regex = re.compile(r"\w[\w'-]*", re.U)
+    _word_prefix_regex = re.compile(r'\w', re.U)
     _singlets = ('br', 'col', 'link', 'base', 'img', 'param', 'area',
                  'hr', 'input')
 
@@ -420,17 +422,37 @@ class _HTMLWordTruncator(HTMLParser):
         self.max_words = max_words
         self.words_found = 0
         self.open_tags = []
+        self.last_word_end = None
         self.truncate_at = None
 
+    def getoffset(self):
+        line_start = 0
+        lineno, line_offset = self.getpos()
+        for i in range(lineno - 1):
+            line_start = self.rawdata.index('\n', line_start) + 1
+        return line_start + line_offset
+
+    def add_word(self, word_end):
+        self.words_found += 1
+        self.last_word_end = None
+        if self.words_found == self.max_words:
+            self.truncate_at = word_end
+
+    def add_last_word(self):
+        if self.last_word_end is not None:
+            self.add_word(self.last_word_end)
+
     def handle_starttag(self, tag, attrs):
         if self.truncate_at is not None:
             return
+        self.add_last_word()
         if tag not in self._singlets:
             self.open_tags.insert(0, tag)
 
     def handle_endtag(self, tag):
         if self.truncate_at is not None:
             return
+        self.add_last_word()
         try:
             i = self.open_tags.index(tag)
         except ValueError:
@@ -442,20 +464,49 @@ class _HTMLWordTruncator(HTMLParser):
 
     def handle_data(self, data):
         word_end = 0
+        offset = self.getoffset()
 
         while self.words_found < self.max_words:
             match = self._word_regex.search(data, word_end)
             if not match:
                 break
-            word_end = match.end(0)
-            self.words_found += 1
 
-            if self.words_found == self.max_words:
-                line_start = 0
-                lineno, line_offset = self.getpos()
-                for i in range(lineno - 1):
-                    line_start = self.rawdata.index('\n', line_start) + 1
-                self.truncate_at = line_start + line_offset + word_end
+            if match.start(0) > 0:
+                self.add_last_word()
+
+            word_end = match.end(0)
+            self.last_word_end = offset + word_end
+
+        if word_end < len(data):
+            self.add_last_word()
+
+    def handle_ref(self, char):
+        offset = self.getoffset()
+        ref_end = self.rawdata.index(';', offset) + 1
+
+        if self.last_word_end is None:
+            if self._word_prefix_regex.match(char):
+                self.last_word_end = ref_end
+        else:
+            if self._word_regex.match(char):
+                self.last_word_end = ref_end
+            else:
+                self.add_last_word()
+
+    def handle_entityref(self, name):
+        try:
+            codepoint = html_entities.name2codepoint[name]
+        except KeyError:
+            self.handle_ref('')
+        else:
+            self.handle_ref(chr(codepoint))
+
+    def handle_charref(self, name):
+        if name.startswith('x'):
+            codepoint = int(name[1:], 16)
+        else:
+            codepoint = int(name)
+        self.handle_ref(chr(codepoint))
 
 
 def truncate_html_words(s, num, end_text='...'):

From b0d41f081b83cb8b1534d907b95ea5f198f9ea67 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Sat, 5 Sep 2015 10:53:44 +0200
Subject: [PATCH 1831/2864] remove article.keywords from simple theme

We don't process 'keywords' metadata specially, so it never gets
processed into a list.

This prevents issues like #1733.
---
 pelican/themes/simple/templates/article.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 8ddda4d0..48464ce4 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -1,10 +1,6 @@
 {% extends "base.html" %}
 {% block head %}
   {{ super() }}
-  {% for keyword in article.keywords %}
-    <meta name="keywords" content="{{keyword}}" />
-  {% endfor %}
-
   {% if article.description %}
     <meta name="description" content="{{article.description}}" />
   {% endif %}

From 6afa7704b149c60384e5598afd9ceb11e064d373 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Fri, 11 Sep 2015 22:06:51 +0200
Subject: [PATCH 1832/2864] Add versioning information to debug output

---
 pelican/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 7fb8dfe4..48cb5980 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -379,6 +379,10 @@ def get_instance(args):
 def main():
     args = parse_arguments()
     init(args.verbosity)
+
+    logger.debug('Pelican version: %s', __version__)
+    logger.debug('Python version: %s', sys.version.split()[0])
+
     pelican, settings = get_instance(args)
     readers = Readers(settings)
 

From a6c258eb7fda71e7421ae6b41180f2103c166bf3 Mon Sep 17 00:00:00 2001
From: Onur Aslan <onuraslan@gmail.com>
Date: Tue, 15 Sep 2015 02:24:21 +0300
Subject: [PATCH 1833/2864] Add index and author replacement indicators

---
 docs/content.rst                  |  8 ++++----
 pelican/contents.py               |  6 +++++-
 pelican/settings.py               |  1 +
 pelican/tests/test_contents.py    | 34 +++++++++++++++++++++++++++++++
 pelican/tests/test_urlwrappers.py |  8 +++++++-
 5 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 1e6ba099..0fa89921 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -329,11 +329,11 @@ of ``{attach}``, and letting the file's location be determined by the project's
 ``STATIC_SAVE_AS`` and ``STATIC_URL`` settings. (Per-file ``save_as`` and
 ``url`` overrides can still be set in ``EXTRA_PATH_METADATA``.)
 
-Linking to tags and categories
-------------------------------
+Linking to authors, categories, index and tags
+----------------------------------------------
 
-You can link to tags and categories using the ``{tag}tagname`` and
-``{category}foobar`` syntax.
+You can link to authors, categories, index and tags using the ``{author}name``,
+``{category}foobar``, ``{index}`` and ``{tag}tagname`` syntax.
 
 Deprecated internal link syntax
 -------------------------------
diff --git a/pelican/contents.py b/pelican/contents.py
index 16d1f074..4d313ab8 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -21,7 +21,7 @@ from pelican.utils import (SafeDatetime, deprecated_attribute, memoized,
                            slugify, strftime, truncate_html_words)
 
 # Import these so that they're avalaible when you import from pelican.contents.
-from pelican.urlwrappers import (URLWrapper, Author, Category, Tag)  # NOQA
+from pelican.urlwrappers import (Author, Category, Tag, URLWrapper)  # NOQA
 
 logger = logging.getLogger(__name__)
 
@@ -253,6 +253,10 @@ class Content(object):
                 origin = '/'.join((siteurl, Category(path, self.settings).url))
             elif what == 'tag':
                 origin = '/'.join((siteurl, Tag(path, self.settings).url))
+            elif what == 'index':
+                origin = '/'.join((siteurl, self.settings['INDEX_SAVE_AS']))
+            elif what == 'author':
+                origin = '/'.join((siteurl, Author(path, self.settings).url))
             else:
                 logger.warning(
                     "Replacement Indicator '%s' not recognized, "
diff --git a/pelican/settings.py b/pelican/settings.py
index 4d75333a..d1b1648b 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -64,6 +64,7 @@ DEFAULT_CONFIG = {
     'REVERSE_CATEGORY_ORDER': False,
     'DELETE_OUTPUT_DIRECTORY': False,
     'OUTPUT_RETENTION': [],
+    'INDEX_SAVE_AS': 'index.html',
     'ARTICLE_URL': '{slug}.html',
     'ARTICLE_SAVE_AS': '{slug}.html',
     'ARTICLE_ORDER_BY': 'reversed-date',
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index a3664383..59cff844 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -606,6 +606,40 @@ class TestStatic(LoggedTestCase):
 
         self.assertNotEqual(content, html)
 
+    def test_author_link_syntax(self):
+        "{author} link syntax triggers url replacement."
+
+        html = '<a href="{author}foo">link</a>'
+        page = Page(
+            content=html,
+            metadata={'title': 'fakepage'},
+            settings=self.settings,
+            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
+            context=self.context)
+        content = page.get_content('')
+
+        self.assertNotEqual(content, html)
+
+    def test_index_link_syntax(self):
+        "{index} link syntax triggers url replacement."
+
+        html = '<a href="{index}">link</a>'
+        page = Page(
+            content=html,
+            metadata={'title': 'fakepage'},
+            settings=self.settings,
+            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
+            context=self.context)
+        content = page.get_content('')
+
+        self.assertNotEqual(content, html)
+
+        expected_html = ('<a href="' +
+                         '/'.join((self.settings['SITEURL'],
+                                   self.settings['INDEX_SAVE_AS'])) +
+                         '">link</a>')
+        self.assertEqual(content, expected_html)
+
     def test_unknown_link_syntax(self):
         "{unknown} link syntax should trigger warning."
 
diff --git a/pelican/tests/test_urlwrappers.py b/pelican/tests/test_urlwrappers.py
index ae6eaaec..f3dc8198 100644
--- a/pelican/tests/test_urlwrappers.py
+++ b/pelican/tests/test_urlwrappers.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from pelican.tests.support import unittest
-from pelican.urlwrappers import Category, Tag, URLWrapper
+from pelican.urlwrappers import Author, Category, Tag, URLWrapper
 
 
 class TestURLWrapper(unittest.TestCase):
@@ -34,9 +34,11 @@ class TestURLWrapper(unittest.TestCase):
     def test_equality(self):
         tag = Tag('test', settings={})
         cat = Category('test', settings={})
+        author = Author('test', settings={})
 
         # same name, but different class
         self.assertNotEqual(tag, cat)
+        self.assertNotEqual(tag, author)
 
         # should be equal vs text representing the same name
         self.assertEqual(tag, u'test')
@@ -48,5 +50,9 @@ class TestURLWrapper(unittest.TestCase):
         tag_equal = Tag('Test', settings={})
         self.assertEqual(tag, tag_equal)
 
+        # Author describing the same should be equal
+        author_equal = Author('Test', settings={})
+        self.assertEqual(author, author_equal)
+
         cat_ascii = Category('指導書', settings={})
         self.assertEqual(cat_ascii, u'zhi-dao-shu')

From d583efb8616cf19401865b04c4270b1a41a96d7f Mon Sep 17 00:00:00 2001
From: Andrea Corbellini <corbellini.andrea@gmail.com>
Date: Fri, 4 Sep 2015 16:49:41 +0200
Subject: [PATCH 1834/2864] When truncating, stop parsing the document
 immediately after finding the last word.

---
 pelican/utils.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 7ad0914c..97768f53 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -414,6 +414,13 @@ class _HTMLWordTruncator(HTMLParser):
     _singlets = ('br', 'col', 'link', 'base', 'img', 'param', 'area',
                  'hr', 'input')
 
+    class TruncationCompleted(Exception):
+
+        def __init__(self, truncate_at):
+            super(_HTMLWordTruncator.TruncationCompleted, self).__init__(
+                truncate_at)
+            self.truncate_at = truncate_at
+
     def __init__(self, max_words):
         # In Python 2, HTMLParser is not a new-style class,
         # hence super() cannot be used.
@@ -425,6 +432,16 @@ class _HTMLWordTruncator(HTMLParser):
         self.last_word_end = None
         self.truncate_at = None
 
+    def feed(self, *args, **kwargs):
+        try:
+            # With Python 2, super() cannot be used.
+            # See the comment for __init__().
+            HTMLParser.feed(self, *args, **kwargs)
+        except self.TruncationCompleted as exc:
+            self.truncate_at = exc.truncate_at
+        else:
+            self.truncate_at = None
+
     def getoffset(self):
         line_start = 0
         lineno, line_offset = self.getpos()
@@ -436,22 +453,18 @@ class _HTMLWordTruncator(HTMLParser):
         self.words_found += 1
         self.last_word_end = None
         if self.words_found == self.max_words:
-            self.truncate_at = word_end
+            raise self.TruncationCompleted(word_end)
 
     def add_last_word(self):
         if self.last_word_end is not None:
             self.add_word(self.last_word_end)
 
     def handle_starttag(self, tag, attrs):
-        if self.truncate_at is not None:
-            return
         self.add_last_word()
         if tag not in self._singlets:
             self.open_tags.insert(0, tag)
 
     def handle_endtag(self, tag):
-        if self.truncate_at is not None:
-            return
         self.add_last_word()
         try:
             i = self.open_tags.index(tag)

From c255a35800911f74a3d07689cc6f1296cb6660a9 Mon Sep 17 00:00:00 2001
From: Andrea Corbellini <corbellini.andrea@gmail.com>
Date: Tue, 22 Sep 2015 20:52:30 +0200
Subject: [PATCH 1835/2864] Use unichr() instead of chr() with Python 2.

---
 pelican/tests/test_utils.py | 12 ++++++++++++
 pelican/utils.py            |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index a076a2c7..d967b247 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -190,6 +190,18 @@ class TestUtils(LoggedTestCase):
         self.assertEqual(
             utils.truncate_html_words("cafeti&eacute;re " * 100, 20),
             "cafeti&eacute;re " * 20 + '...')
+        self.assertEqual(
+            utils.truncate_html_words("&int;dx " * 100, 20),
+            "&int;dx " * 20 + '...')
+
+        # Words with HTML character references inside and outside
+        # the ASCII range.
+        self.assertEqual(
+            utils.truncate_html_words("&#xe9; " * 100, 20),
+            "&#xe9; " * 20 + '...')
+        self.assertEqual(
+            utils.truncate_html_words("&#x222b;dx " * 100, 20),
+            "&#x222b;dx " * 20 + '...')
 
     def test_process_translations(self):
         # create a bunch of articles
diff --git a/pelican/utils.py b/pelican/utils.py
index 7ad0914c..697a182b 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -499,14 +499,14 @@ class _HTMLWordTruncator(HTMLParser):
         except KeyError:
             self.handle_ref('')
         else:
-            self.handle_ref(chr(codepoint))
+            self.handle_ref(six.unichr(codepoint))
 
     def handle_charref(self, name):
         if name.startswith('x'):
             codepoint = int(name[1:], 16)
         else:
             codepoint = int(name)
-        self.handle_ref(chr(codepoint))
+        self.handle_ref(six.unichr(codepoint))
 
 
 def truncate_html_words(s, num, end_text='...'):

From a670a3e0409719779d6dbe5939e6c39836e6162b Mon Sep 17 00:00:00 2001
From: Ben Rosser <rosser.bjr@gmail.com>
Date: Mon, 21 Sep 2015 00:15:29 -0400
Subject: [PATCH 1836/2864] Made name of blogroll/social widgets configurable.

The BLOGROLL_WIDGET_NAME and SOCIAL_WIDGET_NAME settings are now
respected by notmyidea if they are specified in your config file.
They override the default names of "blogroll" and "links" in the
notmyidea theme.

Used default() in template to simplify template code.

Renaming BLOGROLL setting to LINKS, changed default also.

Updated tests to check 'links' instead of 'blogroll'.

Whoops; links, not link.
---
 THANKS                                                        | 1 +
 docs/settings.rst                                             | 4 ++++
 pelican/tests/output/custom/a-markdown-powered-article.html   | 2 +-
 pelican/tests/output/custom/archives.html                     | 2 +-
 pelican/tests/output/custom/article-1.html                    | 2 +-
 pelican/tests/output/custom/article-2.html                    | 2 +-
 pelican/tests/output/custom/article-3.html                    | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau.html      | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau2.html     | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau3.html     | 2 +-
 pelican/tests/output/custom/authors.html                      | 2 +-
 pelican/tests/output/custom/categories.html                   | 2 +-
 pelican/tests/output/custom/category/bar.html                 | 2 +-
 pelican/tests/output/custom/category/cat1.html                | 2 +-
 pelican/tests/output/custom/category/misc.html                | 2 +-
 pelican/tests/output/custom/category/yeah.html                | 2 +-
 pelican/tests/output/custom/drafts/a-draft-article.html       | 2 +-
 pelican/tests/output/custom/filename_metadata-example.html    | 2 +-
 pelican/tests/output/custom/index.html                        | 2 +-
 pelican/tests/output/custom/index2.html                       | 2 +-
 pelican/tests/output/custom/index3.html                       | 2 +-
 pelican/tests/output/custom/jinja2_template.html              | 2 +-
 pelican/tests/output/custom/oh-yeah-fr.html                   | 2 +-
 pelican/tests/output/custom/oh-yeah.html                      | 2 +-
 pelican/tests/output/custom/override/index.html               | 2 +-
 .../tests/output/custom/pages/this-is-a-test-hidden-page.html | 2 +-
 pelican/tests/output/custom/pages/this-is-a-test-page.html    | 2 +-
 pelican/tests/output/custom/second-article-fr.html            | 2 +-
 pelican/tests/output/custom/second-article.html               | 2 +-
 pelican/tests/output/custom/tag/bar.html                      | 2 +-
 pelican/tests/output/custom/tag/baz.html                      | 2 +-
 pelican/tests/output/custom/tag/foo.html                      | 2 +-
 pelican/tests/output/custom/tag/foobar.html                   | 2 +-
 pelican/tests/output/custom/tag/oh.html                       | 2 +-
 pelican/tests/output/custom/tag/yeah.html                     | 2 +-
 pelican/tests/output/custom/tags.html                         | 2 +-
 pelican/tests/output/custom/this-is-a-super-article.html      | 2 +-
 pelican/tests/output/custom/unbelievable.html                 | 2 +-
 pelican/tests/output/custom_locale/archives.html              | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau.html   | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau2.html  | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau3.html  | 2 +-
 pelican/tests/output/custom_locale/authors.html               | 2 +-
 pelican/tests/output/custom_locale/categories.html            | 2 +-
 pelican/tests/output/custom_locale/category/bar.html          | 2 +-
 pelican/tests/output/custom_locale/category/cat1.html         | 2 +-
 pelican/tests/output/custom_locale/category/misc.html         | 2 +-
 pelican/tests/output/custom_locale/category/yeah.html         | 2 +-
 .../tests/output/custom_locale/drafts/a-draft-article.html    | 2 +-
 pelican/tests/output/custom_locale/index.html                 | 2 +-
 pelican/tests/output/custom_locale/index2.html                | 2 +-
 pelican/tests/output/custom_locale/index3.html                | 2 +-
 pelican/tests/output/custom_locale/jinja2_template.html       | 2 +-
 pelican/tests/output/custom_locale/oh-yeah-fr.html            | 2 +-
 pelican/tests/output/custom_locale/override/index.html        | 2 +-
 .../custom_locale/pages/this-is-a-test-hidden-page.html       | 2 +-
 .../tests/output/custom_locale/pages/this-is-a-test-page.html | 2 +-
 .../posts/2010/décembre/02/this-is-a-super-article/index.html | 2 +-
 .../posts/2010/octobre/15/unbelievable/index.html             | 2 +-
 .../custom_locale/posts/2010/octobre/20/oh-yeah/index.html    | 2 +-
 .../posts/2011/avril/20/a-markdown-powered-article/index.html | 2 +-
 .../custom_locale/posts/2011/février/17/article-1/index.html  | 2 +-
 .../custom_locale/posts/2011/février/17/article-2/index.html  | 2 +-
 .../custom_locale/posts/2011/février/17/article-3/index.html  | 2 +-
 .../posts/2012/février/29/second-article/index.html           | 2 +-
 .../2012/novembre/30/filename_metadata-example/index.html     | 2 +-
 pelican/tests/output/custom_locale/second-article-fr.html     | 2 +-
 pelican/tests/output/custom_locale/tag/bar.html               | 2 +-
 pelican/tests/output/custom_locale/tag/baz.html               | 2 +-
 pelican/tests/output/custom_locale/tag/foo.html               | 2 +-
 pelican/tests/output/custom_locale/tag/foobar.html            | 2 +-
 pelican/tests/output/custom_locale/tag/oh.html                | 2 +-
 pelican/tests/output/custom_locale/tag/yeah.html              | 2 +-
 pelican/tests/output/custom_locale/tags.html                  | 2 +-
 pelican/themes/notmyidea/templates/base.html                  | 4 ++--
 75 files changed, 79 insertions(+), 74 deletions(-)

diff --git a/THANKS b/THANKS
index 15503473..a3af2426 100644
--- a/THANKS
+++ b/THANKS
@@ -24,6 +24,7 @@ Andrew Spiers
 Arnaud BOS
 asselinpaul
 Axel Haustant
+Ben Rosser (TC01)
 Benoît HERVIER
 Borgar
 Brandon W Maister
diff --git a/docs/settings.rst b/docs/settings.rst
index 202fc45f..61fd8521 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -724,6 +724,10 @@ Setting name              What does it do?
 ``TWITTER_USERNAME``      Allows for adding a button to articles to encourage
                           others to tweet about them. Add your Twitter username
                           if you want this button to appear.
+``LINKS_WIDGET_NAME``     Allows override of the name of the links widget.
+                          If not specified, defaults to "links".
+``SOCIAL_WIDGET_NAME``    Allows override of the name of the "social" widget.
+                          If not specified, defaults to "social".
 =======================   =======================================================
 
 In addition, you can use the "wide" version of the ``notmyidea`` theme by
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 59ffa4d1..6ccc6c42 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -71,7 +71,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index e238b73d..c256b7de 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -56,7 +56,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 1fbd6719..33cf3a5f 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -70,7 +70,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index d62ddd14..8c8e47eb 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -70,7 +70,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index c862a0c2..773b89e0 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -70,7 +70,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index cbeb0555..d6521a5e 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -129,7 +129,7 @@
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 6357bfb3..2101719b 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -143,7 +143,7 @@ YEAH !</p>
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 3ca4dd0d..d531fd1e 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -94,7 +94,7 @@ pelican.conf, it will ...</p></div>
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index f157de26..6539b3e9 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -38,7 +38,7 @@
 
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index ddb1377b..17f44be7 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -36,7 +36,7 @@
 </ul>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 9666d2e2..79803b1a 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -54,7 +54,7 @@ YEAH !</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index d9132d10..0230ac2f 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -123,7 +123,7 @@
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index b705a552..abe32c8d 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -134,7 +134,7 @@ pelican.conf, it will ...</p></div>
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 6d94c9ad..d22bb9f8 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -62,7 +62,7 @@
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 963722f6..ba424259 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -56,7 +56,7 @@ listed anywhere else.</p>
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index cf4fc782..c4977f63 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -70,7 +70,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 284bd0f4..87af6a06 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -129,7 +129,7 @@
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 7e5b7230..0c457a65 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -143,7 +143,7 @@ YEAH !</p>
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index b968b7e8..523288c5 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -94,7 +94,7 @@ pelican.conf, it will ...</p></div>
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 21f678f9..a098ed49 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -33,7 +33,7 @@ Some text
 
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index d457b1bf..9f56f27b 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -72,7 +72,7 @@ Translations:
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 235a4903..caddf53c 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -77,7 +77,7 @@ YEAH !</p>
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 3753ba84..8ab5f7eb 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -37,7 +37,7 @@ at a custom location.</p>
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index f8c06b1f..41beb5a3 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -37,7 +37,7 @@ Anyone can see this page but it's not linked to anywhere!</p>
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index a4b171c9..b548b52c 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -37,7 +37,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 42289377..9ada2475 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -72,7 +72,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 689b1203..f2d9ffa4 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -72,7 +72,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index f462ffbd..b15860f1 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -113,7 +113,7 @@ YEAH !</p>
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 2c9b1d08..a581e319 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -70,7 +70,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 9c58956b..36282dd7 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -83,7 +83,7 @@ as well as <strong>inline markup</strong>.</p>
             </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 7d17d1fb..ab84124c 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -62,7 +62,7 @@
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 855d1f8b..c7f9701d 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -36,7 +36,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index e3c765fa..c14f1f47 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -54,7 +54,7 @@ YEAH !</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 23f70c0f..9d3e2bdf 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -43,7 +43,7 @@
 
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index e370769c..a36bf412 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -85,7 +85,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 2e51cf07..77a16a8d 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -102,7 +102,7 @@ pelican.conf, it will have nothing in default.</p>
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index 68b46b14..ed375051 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -56,7 +56,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index f8b36655..299578cf 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -129,7 +129,7 @@
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 5d9e6c3c..6f3a0b71 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -143,7 +143,7 @@ YEAH !</p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 2fea24c3..6eb5645e 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -94,7 +94,7 @@ pelican.conf, it will ...</p></div>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index 91ea479d..5cd227d9 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -38,7 +38,7 @@
 
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index ddb1377b..17f44be7 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -36,7 +36,7 @@
 </ul>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index c416b358..2aeef95c 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -54,7 +54,7 @@ YEAH !</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 871b2e3f..48c3ba18 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -123,7 +123,7 @@
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index f44f725d..d977a4cc 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -134,7 +134,7 @@ pelican.conf, it will ...</p></div>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index c5e6c7f0..a00e2028 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -62,7 +62,7 @@
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index dfd4f00e..c1817e25 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -56,7 +56,7 @@ listed anywhere else.</p>
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 3ad201de..f1174c31 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -129,7 +129,7 @@
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index bbd1efd0..286ff9c3 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -143,7 +143,7 @@ YEAH !</p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 926bc25e..c30b7bb3 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -94,7 +94,7 @@ pelican.conf, it will ...</p></div>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index 21f678f9..a098ed49 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -33,7 +33,7 @@ Some text
 
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index f5cae7cf..33e05c3b 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -72,7 +72,7 @@ Translations:
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index 3753ba84..8ab5f7eb 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -37,7 +37,7 @@ at a custom location.</p>
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index f8c06b1f..41beb5a3 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -37,7 +37,7 @@ Anyone can see this page but it's not linked to anywhere!</p>
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index a4b171c9..b548b52c 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -37,7 +37,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index def80358..b7018b64 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -85,7 +85,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index a6ea8699..3c364ffc 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -102,7 +102,7 @@ pelican.conf, it will have nothing in default.</p>
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index 59fd6edd..3ec06207 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -77,7 +77,7 @@ YEAH !</p>
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index e6d585ff..81421b37 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -71,7 +71,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index d768e15f..64bab330 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -70,7 +70,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index b223473a..60de5faa 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -70,7 +70,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index 3bd59fa5..13aa5797 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -70,7 +70,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index aff4d61f..9608314f 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -72,7 +72,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 659004bd..9b3df468 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -70,7 +70,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 79fb5406..dc17237f 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -72,7 +72,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index c1f33e64..12f368aa 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -113,7 +113,7 @@ YEAH !</p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 597199e7..8a2c1c31 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -70,7 +70,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 288f1768..c08baed4 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -83,7 +83,7 @@ as well as <strong>inline markup</strong>.</p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 59dcede1..42bb1325 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -62,7 +62,7 @@
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index 855d1f8b..c7f9701d 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -36,7 +36,7 @@
 </section>
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 4dc36ce5..581c67c0 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -54,7 +54,7 @@ YEAH !</p>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index aa182ab6..59a36ace 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -43,7 +43,7 @@
 
         <section id="extras" class="body">
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>links</h2>
                         <ul>
                             <li><a href="http://biologeek.org">Biologeek</a></li>
                             <li><a href="http://filyb.info/">Filyb</a></li>
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 188715d4..7818c235 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -41,7 +41,7 @@
         <section id="extras" class="body">
         {% if LINKS %}
                 <div class="blogroll">
-                        <h2>blogroll</h2>
+                        <h2>{{ LINKS_WIDGET_NAME | default('links') }}</h2>
                         <ul>
                         {% for name, link in LINKS %}
                             <li><a href="{{ link }}">{{ name }}</a></li>
@@ -51,7 +51,7 @@
         {% endif %}
         {% if SOCIAL or FEED_ALL_ATOM or FEED_ALL_RSS %}
                 <div class="social">
-                        <h2>social</h2>
+                        <h2>{{ SOCIAL_WIDGET_NAME | default('social') }}</h2>
                         <ul>
                             {% if FEED_ALL_ATOM %}
                             <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate">atom feed</a></li>

From 554cde1a22fb1548b2f79a9ceb869cafe854a429 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Tue, 13 Oct 2015 10:26:52 +0200
Subject: [PATCH 1837/2864] rename summary references to formatted_fields

Since FORMATTED_FIELDS was introduced the variables are not specific to
summary and contain other data as well.
---
 pelican/readers.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 2e51c4ff..f8bf0384 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -263,13 +263,12 @@ class MarkdownReader(BaseReader):
         for name, value in meta.items():
             name = name.lower()
             if name in formatted_fields:
-                # handle summary metadata as markdown
-                # summary metadata is special case and join all list values
-                summary_values = "\n".join(value)
+                # formatted metadata is special case and join all list values
+                formatted_values = "\n".join(value)
                 # reset the markdown instance to clear any state
                 self._md.reset()
-                summary = self._md.convert(summary_values)
-                output[name] = self.process_metadata(name, summary)
+                formatted = self._md.convert(formatted_values)
+                output[name] = self.process_metadata(name, formatted)
             elif name in METADATA_PROCESSORS:
                 if len(value) > 1:
                     logger.warning(

From d333ed12c6a1cf62cad2eeac75510e2fe5883b0b Mon Sep 17 00:00:00 2001
From: Simon StJG <Simon.StJohn-Green@softwire.com>
Date: Mon, 12 Oct 2015 20:31:32 +0000
Subject: [PATCH 1838/2864] Fix quote escaping in read html attributes.

* Wrap HTML attributes in quotes according to their content.  If it contains a double quote use single quotes, otherwise escape with double quotes.
* Add escape_html utility to ensure quote entities are converted identically across Python versions.

Fixes #1260
---
 pelican/readers.py                            | 21 ++++++++++---------
 ...h_attributes_containing_double_quotes.html | 11 ++++++++++
 pelican/tests/test_cache.py                   |  2 +-
 pelican/tests/test_readers.py                 | 11 ++++++++++
 pelican/utils.py                              | 13 ++++++++++++
 5 files changed, 47 insertions(+), 11 deletions(-)
 create mode 100644 pelican/tests/content/article_with_attributes_containing_double_quotes.html

diff --git a/pelican/readers.py b/pelican/readers.py
index 2e51c4ff..7a5f2ee2 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -18,18 +18,14 @@ from pelican import rstdirectives  # NOQA
 from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Author, Category, Page, Tag
-from pelican.utils import SafeDatetime, get_date, pelican_open, posixize_path
+from pelican.utils import SafeDatetime, escape_html, get_date, pelican_open, \
+    posixize_path
 
 try:
     from markdown import Markdown
 except ImportError:
     Markdown = False  # NOQA
 
-try:
-    from html import escape
-except ImportError:
-    from cgi import escape
-
 # Metadata processors have no way to discard an unwanted value, so we have
 # them return this value instead to signal that it should be discarded later.
 # This means that _filter_discardable_metadata() must be called on processed
@@ -354,7 +350,7 @@ class HTMLReader(BaseReader):
                 self._in_body = False
                 self._in_top_level = True
             elif self._in_body:
-                self._data_buffer += '</{}>'.format(escape(tag))
+                self._data_buffer += '</{}>'.format(escape_html(tag))
 
         def handle_startendtag(self, tag, attrs):
             if tag == 'meta' and self._in_head:
@@ -375,11 +371,16 @@ class HTMLReader(BaseReader):
             self._data_buffer += '&#{};'.format(data)
 
         def build_tag(self, tag, attrs, close_tag):
-            result = '<{}'.format(escape(tag))
+            result = '<{}'.format(escape_html(tag))
             for k, v in attrs:
-                result += ' ' + escape(k)
+                result += ' ' + escape_html(k)
                 if v is not None:
-                    result += '="{}"'.format(escape(v))
+                    # If the attribute value contains a double quote, surround
+                    # with single quotes, otherwise use double quotes.
+                    if '"' in v:
+                        result += "='{}'".format(escape_html(v, quote=False))
+                    else:
+                        result += '="{}"'.format(escape_html(v, quote=False))
             if close_tag:
                 return result + ' />'
             return result + '>'
diff --git a/pelican/tests/content/article_with_attributes_containing_double_quotes.html b/pelican/tests/content/article_with_attributes_containing_double_quotes.html
new file mode 100644
index 00000000..7daa5801
--- /dev/null
+++ b/pelican/tests/content/article_with_attributes_containing_double_quotes.html
@@ -0,0 +1,11 @@
+<html>
+    <head>
+    </head>
+    <body>
+        Ensure that if an attribute value contains a double quote, it is
+        surrounded with single quotes, otherwise with double quotes.
+        <span data-test="'single quoted string'">Span content</span>
+        <span data-test='"double quoted string"'>Span content</span>
+        <span data-test="string without quotes">Span content</span>
+    </body>
+</html>
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index 006e421b..3da3f789 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -61,7 +61,7 @@ class TestCache(unittest.TestCase):
         - article_with_null_attributes.html
         - 2012-11-30_md_w_filename_meta#foo-bar.md
         """
-        self.assertEqual(generator.readers.read_file.call_count, 3)
+        self.assertEqual(generator.readers.read_file.call_count, 4)
 
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_article_reader_content_caching(self):
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 5fabc470..dc434835 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -587,6 +587,17 @@ class HTMLReaderTest(ReaderTest):
         <input name="test" disabled style="" />
     ''', page.content)
 
+    def test_article_with_attributes_containing_double_quotes(self):
+        page = self.read_file(path='article_with_attributes_containing_' +
+                                   'double_quotes.html')
+        self.assertEqual('''
+        Ensure that if an attribute value contains a double quote, it is
+        surrounded with single quotes, otherwise with double quotes.
+        <span data-test="'single quoted string'">Span content</span>
+        <span data-test='"double quoted string"'>Span content</span>
+        <span data-test="string without quotes">Span content</span>
+    ''', page.content)
+
     def test_article_metadata_key_lowercase(self):
         # Keys of metadata should be lowercase.
         page = self.read_file(path='article_with_uppercase_metadata.html')
diff --git a/pelican/utils.py b/pelican/utils.py
index cc9eb405..1422a979 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -28,6 +28,11 @@ import six
 from six.moves import html_entities
 from six.moves.html_parser import HTMLParser
 
+try:
+    from html import escape
+except ImportError:
+    from cgi import escape
+
 logger = logging.getLogger(__name__)
 
 
@@ -548,6 +553,14 @@ def truncate_html_words(s, num, end_text='...'):
     return out
 
 
+def escape_html(text, quote=True):
+    """Escape '&', '<' and '>' to HTML-safe sequences.
+
+    In Python 2 this uses cgi.escape and in Python 3 this uses html.escape. We
+    wrap here to ensure the quote argument has an identical default."""
+    return escape(text, quote=quote)
+
+
 def process_translations(content_list, order_by=None):
     """ Finds translation and returns them.
 

From 43a872c98abe3e2f4c6cc4ed1fa20139ce2e12d1 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Sat, 17 Oct 2015 16:48:41 +0200
Subject: [PATCH 1839/2864] add missing linebreak

---
 docs/faq.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index bb4cd9e6..8ecdcb55 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -253,6 +253,7 @@ Pelican plugin system.
 
 Since I upgraded Pelican my pages are no longer rendered
 ========================================================
+
 Pages were available to themes as lowercase ``pages`` and uppercase
 ``PAGES``. To bring this inline with the :ref:`templates-variables` section,
 ``PAGES`` has been removed. This is quickly resolved by updating your theme

From 65f0f31b7baab9794567075c65c5d62e12d94011 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Sat, 17 Oct 2015 16:49:11 +0200
Subject: [PATCH 1840/2864] Add FAQ about static files parsed as content

Since #1509 got merged this pops up again and again (latest #1845). This
PR addresses the issue by adding a FAQ about it that explains why it is
necessary to add `*_EXCLUDES`.
---
 docs/faq.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index 8ecdcb55..f75e4e6c 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -264,3 +264,15 @@ to iterate over ``pages`` instead of ``PAGES``. Just replace::
 with something like::
 
     {% for pg in pages %}
+
+How can I stop Pelican from trying to parse my static files as content?
+=======================================================================
+
+Pelican's article and page generators run before it's static generator. That
+means if you use a setup similar to the default configuration, where a static
+source directory is defined inside a ``*_PATHS`` setting, all files that have a
+valid content file ending (``.html``, ``.rst``, ``.md``, ...) will be treated as
+articles or pages before they get treated as static files.
+
+To circumvent this issue either use the appropriate ``*_EXCLUDES`` setting or
+disable the offending reader via ``READERS`` if you don't need it.

From a69f4294bc3ab27c4a54d6512962a41f26d4df7b Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Mon, 19 Oct 2015 16:22:43 +0200
Subject: [PATCH 1841/2864] Add ability to toggle log filter

To test the output of warning functions it can be useful to disable the
log filter, producing the expected output instead of the limited output
that is used during normal operation.
---
 pelican/log.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pelican/log.py b/pelican/log.py
index 0f4b795b..12eb7371 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -167,6 +167,12 @@ class LimitLogger(SafeLogger):
 
     def __init__(self, *args, **kwargs):
         super(LimitLogger, self).__init__(*args, **kwargs)
+        self.enable_filter()
+
+    def disable_filter(self):
+        self.removeFilter(LimitLogger.limit_filter)
+
+    def enable_filter(self):
         self.addFilter(LimitLogger.limit_filter)
 
 logging.setLoggerClass(LimitLogger)

From 2cb2bf05dfca50afbd3400a344a4aa23f9474dfa Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Mon, 19 Oct 2015 16:38:07 +0200
Subject: [PATCH 1842/2864] replace get_summary with _get_summary

When memoizing summary a dummy get_summary function was introduced to
properly work. This has multiple problems:
* The siteurl argument is actually not used in the function, it is only
  used so it properly memoizes.
* It differs from how content is accessed and memoized.

This commit brings summary inline with how content is accessed and
processed. It also removes the old get_summary function with the unused
siteurl argument.

Additionally _get_summary is marked as deprecated and calls .summary
instead while also issueing a warning.
---
 pelican/contents.py            | 24 +++++++++++++-----------
 pelican/tests/test_contents.py | 24 +++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 4d313ab8..4397d424 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -273,6 +273,9 @@ class Content(object):
 
         return hrefs.sub(replacer, content)
 
+    def get_siteurl(self):
+        return self._context.get('localsiteurl', '')
+
     @memoized
     def get_content(self, siteurl):
         if hasattr(self, '_get_content'):
@@ -281,22 +284,19 @@ class Content(object):
             content = self._content
         return self._update_content(content, siteurl)
 
-    def get_siteurl(self):
-        return self._context.get('localsiteurl', '')
-
     @property
     def content(self):
         return self.get_content(self.get_siteurl())
 
-    def _get_summary(self):
+    @memoized
+    def get_summary(self, siteurl):
         """Returns the summary of an article.
 
         This is based on the summary metadata if set, otherwise truncate the
         content.
         """
         if hasattr(self, '_summary'):
-            return self._update_content(self._summary,
-                                        self.get_siteurl())
+            return self._update_content(self._summary, siteurl)
 
         if self.settings['SUMMARY_MAX_LENGTH'] is None:
             return self.content
@@ -304,15 +304,17 @@ class Content(object):
         return truncate_html_words(self.content,
                                    self.settings['SUMMARY_MAX_LENGTH'])
 
-    @memoized
-    def get_summary(self, siteurl):
-        """uses siteurl to be memoizable"""
-        return self._get_summary()
-
     @property
     def summary(self):
         return self.get_summary(self.get_siteurl())
 
+    def _get_summary(self):
+        """deprecated function to access summary"""
+
+        logger.warn('_get_summary() has been deprecated since 3.6.4. '
+                    'Use the summary decorator instead')
+        return self.summary
+
     @summary.setter
     def summary(self, value):
         """Dummy function"""
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 59cff844..1bceeb64 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -23,7 +23,7 @@ TEST_CONTENT = str(generate_lorem_ipsum(n=1))
 TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
 
 
-class TestPage(unittest.TestCase):
+class TestPage(LoggedTestCase):
 
     def setUp(self):
         super(TestPage, self).setUp()
@@ -41,9 +41,19 @@ class TestPage(unittest.TestCase):
             },
             'source_path': '/path/to/file/foo.ext'
         }
+        self._disable_limit_filter()
 
     def tearDown(self):
         locale.setlocale(locale.LC_ALL, self.old_locale)
+        self._enable_limit_filter()
+
+    def _disable_limit_filter(self):
+        from pelican.contents import logger
+        logger.disable_filter()
+
+    def _enable_limit_filter(self):
+        from pelican.contents import logger
+        logger.enable_filter()
 
     def test_use_args(self):
         # Creating a page with arguments passed to the constructor should use
@@ -87,6 +97,18 @@ class TestPage(unittest.TestCase):
         page = Page(**page_kwargs)
         self.assertEqual(page.summary, '')
 
+    def test_summary_get_summary_warning(self):
+        """calling ._get_summary() should issue a warning"""
+        page_kwargs = self._copy_page_kwargs()
+        page = Page(**page_kwargs)
+        self.assertEqual(page.summary, TEST_SUMMARY)
+        self.assertEqual(page._get_summary(), TEST_SUMMARY)
+        self.assertLogCountEqual(
+                count=1,
+                msg="_get_summary\(\) has been deprecated since 3\.6\.4\. "
+                    "Use the summary decorator instead",
+                level=logging.WARNING)
+
     def test_slug(self):
         page_kwargs = self._copy_page_kwargs()
         settings = get_settings()

From e50abb20b3c6debd9fc35da83b637422437c7e7c Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Mon, 19 Oct 2015 22:38:23 +0200
Subject: [PATCH 1843/2864] Add logging for warnings during test suite run

The default configuration for the warnings module changed some time ago
so we lost the ability to detect deprecation warnings and such early.

This commit sets up the test suite to redirect all warnings through our
logging system. Additionally we enable DeprecationWarnings as a default
and throw exceptions on all warnings related to pelican modules.

This enables output of warnings related to dependencies, while letting
tests only fail if the warnings are originating from pelican's source.

Also adding a test to detect if warnings cause an Exception as expected.
---
 pelican/log.py                  | 24 +++++++++++++++++-------
 pelican/tests/__init__.py       | 13 +++++++++++++
 pelican/tests/test_testsuite.py | 16 ++++++++++++++++
 3 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 pelican/tests/test_testsuite.py

diff --git a/pelican/log.py b/pelican/log.py
index 0f4b795b..ddeeb6d0 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -172,21 +172,31 @@ class LimitLogger(SafeLogger):
 logging.setLoggerClass(LimitLogger)
 
 
-def init(level=None, handler=logging.StreamHandler()):
-
-    logger = logging.getLogger()
-
+def get_formatter():
     if os.isatty(sys.stdout.fileno()) and not sys.platform.startswith('win'):
-        fmt = ANSIFormatter()
+        return ANSIFormatter()
     else:
-        fmt = TextFormatter()
-    handler.setFormatter(fmt)
+        return TextFormatter()
+
+
+def init(level=None, handler=logging.StreamHandler(), name=None):
+
+    logger = logging.getLogger(name)
+
+    handler.setFormatter(get_formatter())
     logger.addHandler(handler)
 
     if level:
         logger.setLevel(level)
 
 
+def log_warnings():
+    import warnings
+    logging.captureWarnings(True)
+    warnings.simplefilter("default", DeprecationWarning)
+    init(logging.DEBUG, name='py.warnings')
+
+
 if __name__ == '__main__':
     init(level=logging.DEBUG)
 
diff --git a/pelican/tests/__init__.py b/pelican/tests/__init__.py
index 32353ea2..4605a02b 100644
--- a/pelican/tests/__init__.py
+++ b/pelican/tests/__init__.py
@@ -1,2 +1,15 @@
 import logging
+import warnings
+
+from pelican.log import log_warnings
+
+# redirect warnings modulole to use logging instead
+log_warnings()
+
+# setup warnings to log DeprecationWarning's and error on
+# warnings in pelican's codebase
+warnings.simplefilter("default", DeprecationWarning)
+warnings.filterwarnings("error", ".*", Warning, "pelican")
+
+# Add a NullHandler to silence warning about no available handlers
 logging.getLogger().addHandler(logging.NullHandler())
diff --git a/pelican/tests/test_testsuite.py b/pelican/tests/test_testsuite.py
new file mode 100644
index 00000000..5dc92bb1
--- /dev/null
+++ b/pelican/tests/test_testsuite.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+from __future__ import print_function, unicode_literals
+
+import sys
+import warnings
+
+from pelican.tests.support import unittest
+
+
+class TestSuiteTest(unittest.TestCase):
+
+    @unittest.skipIf(sys.version_info[:2] == (3, 3),
+                     "does not throw an exception on python 3.3")
+    def test_error_on_warning(self):
+        with self.assertRaises(UserWarning):
+            warnings.warn('test warning')

From 8b299098c95004bbe8079bea95ab4bb05cf53e2b Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Mon, 19 Oct 2015 18:33:14 +0200
Subject: [PATCH 1844/2864] Make HTMLParser Python 3.5 ready

---
 pelican/utils.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index cc9eb405..92e819f9 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -424,7 +424,11 @@ class _HTMLWordTruncator(HTMLParser):
     def __init__(self, max_words):
         # In Python 2, HTMLParser is not a new-style class,
         # hence super() cannot be used.
-        HTMLParser.__init__(self)
+        try:
+            HTMLParser.__init__(self, convert_charrefs=False)
+        except TypeError:
+            # pre Python 3.3
+            HTMLParser.__init__(self)
 
         self.max_words = max_words
         self.words_found = 0

From 2d84c04add032b96092c3e578584a7ab9e503580 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Tue, 20 Oct 2015 10:26:32 +0200
Subject: [PATCH 1845/2864] Make ReaderTest py2 and py3 compatible

---
 pelican/tests/test_readers.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 5fabc470..6aa777c0 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -3,6 +3,8 @@ from __future__ import print_function, unicode_literals
 
 import os
 
+import six
+
 from pelican import readers
 from pelican.tests.support import get_settings, unittest
 from pelican.utils import SafeDatetime
@@ -55,7 +57,8 @@ class TestAssertDictHasSubset(ReaderTest):
         self.assertDictHasSubset(self.dictionary, self.dictionary)
 
     def test_fail_not_set(self):
-        self.assertRaisesRegexp(
+        six.assertRaisesRegex(
+            self,
             AssertionError,
             'Expected.*key-c.*to have value.*val-c.*but was not in Dict',
             self.assertDictHasSubset,
@@ -63,7 +66,8 @@ class TestAssertDictHasSubset(ReaderTest):
             {'key-c': 'val-c'})
 
     def test_fail_wrong_val(self):
-        self.assertRaisesRegexp(
+        six.assertRaisesRegex(
+            self,
             AssertionError,
             'Expected .*key-a.* to have value .*val-b.* but was .*val-a.*',
             self.assertDictHasSubset,

From bfafb3a492a16d3e5f3b4fc15a8c79021b889b08 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Mon, 19 Oct 2015 16:30:52 +0200
Subject: [PATCH 1846/2864] Add python 3.5 testing environment

Python 3.5 is not yet fully integrated in travis. Include
workaround to enable it for now.
---
 .travis.yml | 5 +++++
 tox.ini     | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1be196f2..7bb5a89f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,11 @@ env:
   - TOX_ENV=py27
   - TOX_ENV=py33
   - TOX_ENV=py34
+matrix:
+  include:
+    - python: 3.5
+      env:
+      - TOX_ENV=py35
 addons:
   apt_packages:
     - pandoc
diff --git a/tox.ini b/tox.ini
index 56ad0c14..151fad85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
-envlist = py{27,33,34},docs,flake8
+envlist = py{27,33,34,35},docs,flake8
 
 [testenv]
 basepython =
     py27: python2.7
     py33: python3.3
     py34: python3.4
+    py35: python3.5
 passenv = *
 usedevelop=True
 deps =

From c3f2e888a573b9c8d0887c74ca0b06f6680c9591 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Mon, 19 Oct 2015 19:26:31 +0200
Subject: [PATCH 1847/2864] Add 3.5 to setup.py tags

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 86028424..99cf7cb0 100755
--- a/setup.py
+++ b/setup.py
@@ -55,6 +55,7 @@ setup(
          'Programming Language :: Python :: 3',
          'Programming Language :: Python :: 3.3',
          'Programming Language :: Python :: 3.4',
+         'Programming Language :: Python :: 3.5',
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Software Development :: Libraries :: Python Modules',
     ],

From 22ec94ee560ad07fa0cafea9aca9a3c4d13189dc Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Tue, 13 Oct 2015 10:31:59 +0200
Subject: [PATCH 1848/2864] Do not fail tox run if coveralls push fails

When tox environments are run locally, coveralls exits with an error
code as it is not authenticated to push to coveralls. Adding the - in
front allows tox to ignore a fail on this command and not mark the test
case as failed.
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 151fad85..609be886 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ deps =
 commands =
     {envpython} --version
     nosetests -sv --with-coverage --cover-package=pelican pelican
-    coveralls
+    - coveralls
 
 [testenv:docs]
 basepython = python2.7

From ab2eec854d59a46f1a291bf318e996959fb57172 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Tue, 20 Oct 2015 11:13:02 +0200
Subject: [PATCH 1849/2864] Redo ANSI support detection

When using nose to directly run the test suite it 'steals' stdout per
default. This causes the old implementation of ANSI detection to error
as stdout does not have a fileno function anymore.
---
 pelican/log.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pelican/log.py b/pelican/log.py
index ddeeb6d0..d99cad88 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -172,8 +172,26 @@ class LimitLogger(SafeLogger):
 logging.setLoggerClass(LimitLogger)
 
 
+def supports_color():
+    """
+    Returns True if the running system's terminal supports color,
+    and False otherwise.
+
+    from django.core.management.color
+    """
+    plat = sys.platform
+    supported_platform = plat != 'Pocket PC' and \
+        (plat != 'win32' or 'ANSICON' in os.environ)
+
+    # isatty is not always implemented, #6223.
+    is_a_tty = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty()
+    if not supported_platform or not is_a_tty:
+        return False
+    return True
+
+
 def get_formatter():
-    if os.isatty(sys.stdout.fileno()) and not sys.platform.startswith('win'):
+    if supports_color():
         return ANSIFormatter()
     else:
         return TextFormatter()

From 5e7eb9180865f765fe49ffd82c35396bd624244b Mon Sep 17 00:00:00 2001
From: Michael Goodwin <xenithorb@users.noreply.github.com>
Date: Thu, 29 Oct 2015 11:36:41 -0400
Subject: [PATCH 1850/2864] add '--no-mime-magic --no-preserve' to s3_upload

---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index b97fbe43..cfc82a7d 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -111,7 +111,7 @@ ftp_upload: publish
 	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
 
 s3_upload: publish
-	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type
+	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type --no-mime-magic --no-preserve
 
 cf_upload: publish
 	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .

From 6bb743cb22b01a832edea73d040ac4375d2b5e12 Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
Date: Sat, 10 May 2014 05:48:45 +0200
Subject: [PATCH 1851/2864] Test if summary is parsed by replacer

---
 pelican/tests/test_contents.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 1bceeb64..6f0f6dd9 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -316,6 +316,19 @@ class TestPage(LoggedTestCase):
             '?utm_whatever=234&highlight=word#section-2">link</a>'
         )
 
+        # also test for summary in metadata
+        args['metadata']['summary'] = (
+            'A simple summary test, with a '
+            '<a href="|filename|article.rst">link</a>'
+        )
+        args['context']['localsiteurl'] = 'http://notmyidea.org'
+        p = Page(**args)
+        self.assertEqual(
+            p.summary,
+            'A simple summary test, with a '
+            '<a href="http://notmyidea.org/article.html">link</a>'
+        )
+
     def test_intrasite_link_more(self):
         # type does not take unicode in PY2 and bytes in PY3, which in
         # combination with unicode literals leads to following insane line:

From 9255ab22f9985900cd4b5917f458523976ff876e Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Tue, 3 Nov 2015 16:53:13 +0100
Subject: [PATCH 1852/2864] Fix DeprecationWarning in _get_summary

logging.warn is deprecated, should be replaced with .warning.
---
 pelican/contents.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 4397d424..0123384a 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -311,8 +311,8 @@ class Content(object):
     def _get_summary(self):
         """deprecated function to access summary"""
 
-        logger.warn('_get_summary() has been deprecated since 3.6.4. '
-                    'Use the summary decorator instead')
+        logger.warning('_get_summary() has been deprecated since 3.6.4. '
+                       'Use the summary decorator instead')
         return self.summary
 
     @summary.setter

From 2170ca4cd57d380f88ad39e66cf6742725dd1759 Mon Sep 17 00:00:00 2001
From: Lukas Prokop <admin@lukas-prokop.at>
Date: Thu, 1 Oct 2015 02:41:49 +0200
Subject: [PATCH 1853/2864] Use <time> instead of <abbr>.

The pubdate given is in no way an abbreviation. Hence the semantics of
<abbr> do not justify its usage in this context.

<time> was introduced in HTML5. It's datetime attribute can override the
textContent. Anyway it specifies a date+time of a given event.

http://www.w3.org/TR/html5/text-level-semantics.html#the-time-element

Originally the pubdate attribute was meant to annotate that the
publication date of the closest section unit is specified, but this was
dropped and is not part of the official specification.

https://www.w3.org/wiki/HTML/Elements/time
---
 pelican/themes/simple/templates/article.html | 8 ++++----
 pelican/themes/simple/templates/index.html   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 48464ce4..fb01b337 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -21,13 +21,13 @@
  {{ translations.translations_for(article) }}
   </header>
   <footer class="post-info">
-    <abbr class="published" title="{{ article.date.isoformat() }}">
+    <time class="published" datetime="{{ article.date.isoformat() }}">
       {{ article.locale_date }}
-    </abbr>
+    </time>
 	{% if article.modified %}
-    <abbr class="modified" title="{{ article.modified.isoformat() }}">
+    <time class="modified" datetime="{{ article.modified.isoformat() }}">
       {{ article.locale_modified }}
-    </abbr>
+    </time>
 	{% endif %}
     {% if article.authors %}
     <address class="vcard author">
diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index 4bd81985..ab4bc345 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -10,7 +10,7 @@
         <li><article class="hentry">
                 <header> <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2> </header>
                 <footer class="post-info">
-                    <abbr class="published" title="{{ article.date.isoformat() }}"> {{ article.locale_date }} </abbr>
+                    <time class="published" datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }} </time>
                     <address class="vcard author">By
                     {% for author in article.authors %}
                         <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>

From 1fe40db3cb3309e7a43816581babe469b25dac53 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@Aleksandars-iMac.local>
Date: Sat, 14 Nov 2015 00:17:09 +0100
Subject: [PATCH 1854/2864] Generate output directory before 'CD'ing into it.

If the output directory does not exist the 'cd' will fail, but the
script will resume, starting the server in the base directory. Therefore
we first make sure the output directory actually exists.
---
 pelican/tools/templates/develop_server.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index 732069c2..e345fefd 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -65,7 +65,7 @@ function start_up(){
   $$PELICAN --debug --autoreload -r $$INPUTDIR -o $$OUTPUTDIR -s $$CONFFILE $$PELICANOPTS &
   pelican_pid=$$!
   echo $$pelican_pid > $$PELICAN_PID
-  cd $$OUTPUTDIR
+  mkdir -p $$OUTPUTDIR && cd $$OUTPUTDIR
   $PY -m pelican.server $$port &
   srv_pid=$$!
   echo $$srv_pid > $$SRV_PID

From 510961bbb9be62a687c773b226374084ecd011ba Mon Sep 17 00:00:00 2001
From: Kernc <kerncece@gmail.com>
Date: Sun, 8 Nov 2015 23:08:03 +0100
Subject: [PATCH 1855/2864] Avoid Markdown 2.6 deprecations; make MD_EXTENSIONS
 a dict

* Make MD_EXTENSIONS setting a dict and add tests for this change;
* Short extension names ('extra', 'meta') are deprecated
  https://pythonhosted.org/Markdown/release-2.6.html#shortened-extension-names-deprecated
* Extension config as part of extension name is deprecated
  https://pythonhosted.org/Markdown/release-2.6.html#extension-configuration-as-part-of-extension-name-deprecated
---
 docs/internals.rst            |  5 ++++-
 docs/settings.rst             | 16 ++++++++--------
 pelican/readers.py            |  8 ++++----
 pelican/settings.py           | 14 +++++++++++++-
 pelican/tests/test_pelican.py | 16 ++++++++++++++++
 pelican/tests/test_readers.py |  7 ++++++-
 6 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/docs/internals.rst b/docs/internals.rst
index 303a327f..b267df76 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -50,7 +50,10 @@ Take a look at the Markdown reader::
         def read(self, source_path):
             """Parse content and metadata of markdown files"""
             text = pelican_open(source_path)
-            md = Markdown(extensions = ['meta', 'codehilite'])
+            md_extensions = {'markdown.extensions.meta': {},
+                             'markdown.extensions.codehilite': {}}
+            md = Markdown(extensions=md_extensions.keys(),
+                          extension_configs=md_extensions)
             content = md.convert(text)
 
             metadata = {}
diff --git a/docs/settings.rst b/docs/settings.rst
index 61fd8521..0f7280fa 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -112,15 +112,15 @@ Setting name (followed by default value, if any)
                                                                                  of these patterns will be ignored by the processor. For example,
                                                                                  the default ``['.#*']`` will ignore emacs lock files, and
                                                                                  ``['__pycache__']`` would ignore Python 3's bytecode caches.
-``MD_EXTENSIONS =`` ``['codehilite(css_class=highlight)','extra']``              A list of the extensions that the Markdown processor
-                                                                                 will use. Refer to the Python Markdown documentation's
+``MD_EXTENSIONS =`` ``{...}``                                                    A dict of the extensions that the Markdown processor
+                                                                                 will use, with extensions' settings as the values.
+                                                                                 Refer to the Python Markdown documentation's
                                                                                  `Extensions section <http://pythonhosted.org/Markdown/extensions/>`_
-                                                                                 for a complete list of supported extensions. (Note that
-                                                                                 defining this in your settings file will override and
-                                                                                 replace the default values. If your goal is to *add*
-                                                                                 to the default values for this setting, you'll need to
-                                                                                 include them explicitly and enumerate the full list of
-                                                                                 desired Markdown extensions.)
+                                                                                 for a complete list of supported extensions and their options.
+                                                                                 Default is ``{'markdown.extensions.codehilite' : {'css_class': 'highlight'},
+                                                                                 'markdown.extensions.extra': {}, 'markdown.extensions.meta': {}}``.
+                                                                                 (Note that the dictionary defined in your settings file will
+                                                                                 update this default one.)
 ``OUTPUT_PATH = 'output/'``                                                      Where to output the generated files.
 ``PATH``                                                                         Path to content directory to be processed by Pelican. If undefined,
                                                                                  and content path is not specified via an argument to the ``pelican``
diff --git a/pelican/readers.py b/pelican/readers.py
index 4ea234bb..e3b1012a 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -246,9 +246,8 @@ class MarkdownReader(BaseReader):
 
     def __init__(self, *args, **kwargs):
         super(MarkdownReader, self).__init__(*args, **kwargs)
-        self.extensions = list(self.settings['MD_EXTENSIONS'])
-        if 'meta' not in self.extensions:
-            self.extensions.append('meta')
+        self.extensions = self.settings['MD_EXTENSIONS']
+        self.extensions.setdefault('markdown.extensions.meta', {})
         self._source_path = None
 
     def _parse_metadata(self, meta):
@@ -284,7 +283,8 @@ class MarkdownReader(BaseReader):
         """Parse content and metadata of markdown files"""
 
         self._source_path = source_path
-        self._md = Markdown(extensions=self.extensions)
+        self._md = Markdown(extensions=self.extensions.keys(),
+                            extension_configs=self.extensions)
         with pelican_open(source_path) as text:
             content = self._md.convert(text)
 
diff --git a/pelican/settings.py b/pelican/settings.py
index d1b1648b..82c50c03 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -101,7 +101,11 @@ DEFAULT_CONFIG = {
     'PELICAN_CLASS': 'pelican.Pelican',
     'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
     'DATE_FORMATS': {},
-    'MD_EXTENSIONS': ['codehilite(css_class=highlight)', 'extra'],
+    'MD_EXTENSIONS': {
+        'markdown.extensions.codehilite': {'css_class': 'highlight'},
+        'markdown.extensions.extra': {},
+        'markdown.extensions.meta': {},
+    },
     'JINJA_EXTENSIONS': [],
     'JINJA_FILTERS': {},
     'LOG_FILTER': [],
@@ -362,6 +366,14 @@ def configure_settings(settings):
                            PATH_KEY)
             settings[PATH_KEY] = DEFAULT_CONFIG[PATH_KEY]
 
+    # Save people from declaring MD_EXTENSIONS as a list rather than a dict
+    if not isinstance(settings.get('MD_EXTENSIONS', {}), dict):
+        logger.warning('The format of the MD_EXTENSIONS setting has '
+                       'changed. It should now be a dict mapping '
+                       'fully-qualified extension names to their '
+                       'configurations. Falling back to the default.')
+        settings['MD_EXTENSIONS'] = DEFAULT_CONFIG['MD_EXTENSIONS']
+
     # Add {PAGE,ARTICLE}_PATHS to {ARTICLE,PAGE}_EXCLUDES
     mutually_exclusive = ('ARTICLE', 'PAGE')
     for type_1, type_2 in [mutually_exclusive, mutually_exclusive[::-1]]:
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index b88ad287..75d644bc 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -207,3 +207,19 @@ class TestPelican(LoggedTestCase):
             count=2,
             msg="Writing .*",
             level=logging.INFO)
+
+    def test_md_extensions_list_deprecation(self):
+        """Test that a warning is issued if MD_EXTENSIONS is a list"""
+        settings = read_settings(path=None, override={
+            'PATH': INPUT_PATH,
+            'OUTPUT_PATH': self.temp_path,
+            'CACHE_PATH': self.temp_cache,
+            'MD_EXTENSIONS': ['meta'],
+        })
+        pelican = Pelican(settings=settings)
+        mute(True)(pelican.run)()
+        self.assertIsInstance(pelican.settings['MD_EXTENSIONS'], dict)
+        self.assertLogCountEqual(
+            count=1,
+            msg="The format of the MD_EXTENSIONS setting has changed",
+            level=logging.WARNING)
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index db4aa44f..ad73a58b 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -471,7 +471,12 @@ class MdReaderTest(ReaderTest):
         # expected
         page = self.read_file(
             path='article_with_markdown_markup_extensions.md',
-            MD_EXTENSIONS=['toc', 'codehilite', 'extra'])
+            MD_EXTENSIONS={
+                'markdown.extensions.toc': {},
+                'markdown.extensions.codehilite': {},
+                'markdown.extensions.extra': {}
+            }
+        )
         expected = ('<div class="toc">\n'
                     '<ul>\n'
                     '<li><a href="#level1">Level1</a><ul>\n'

From 749f85e468fd53fbf2d4a48ed00674749cab575c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?A=20Bj=C3=B6rck?= <bjorck@ustwo.com>
Date: Sat, 26 Dec 2015 19:07:41 +0100
Subject: [PATCH 1856/2864] Update readers.py

change so that DEFAULT_DATE = 'fs' makes pelican actually uses file mtime as stated in the manual (was ctime)
---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index e3b1012a..83efce36 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -616,7 +616,7 @@ def path_metadata(full_path, source_path, settings=None):
     if settings:
         if settings.get('DEFAULT_DATE', None) == 'fs':
             metadata['date'] = SafeDatetime.fromtimestamp(
-                os.stat(full_path).st_ctime)
+                os.stat(full_path).st_mtime)
         metadata.update(settings.get('EXTRA_PATH_METADATA', {}).get(
             source_path, {}))
     return metadata

From eee2aa339d00e60ce07db00c3a740524dac6f261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <rhubscher@mozilla.com>
Date: Tue, 29 Dec 2015 11:17:47 +0100
Subject: [PATCH 1857/2864] Link the documentation section.

---
 docs/settings.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 0f7280fa..0adda992 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -44,7 +44,7 @@ Setting name (followed by default value, if any)
 ===============================================================================  =====================================================================
 ``AUTHOR``                                                                       Default author (put your name)
 ``DATE_FORMATS = {}``                                                            If you manage multiple languages, you can set the date formatting
-                                                                                 here. See the "Date format and locale" section below for details.
+                                                                                 here. See the :ref:`date_format_and_locale` section below for details.
 ``USE_FOLDER_AS_CATEGORY = True``                                                When you don't specify a category in your post metadata, set this
                                                                                  setting to ``True``, and organize your articles in subfolders, the
                                                                                  subfolder will become the category of your post. If set to ``False``,
@@ -373,6 +373,7 @@ Have a look at `the wikipedia page`_ to get a list of valid timezone values.
 
 .. _the wikipedia page: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
+.. _date_format_and_locale:
 
 Date format and locale
 ----------------------

From 23a84e9b82949d09f3c3db80b62f1145acf2455f Mon Sep 17 00:00:00 2001
From: Andreas Olsson <andreas@arrakis.se>
Date: Sun, 3 Jan 2016 11:03:10 +0100
Subject: [PATCH 1858/2864] Adding missing Makefile PHONY target stopserver

---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index cfc82a7d..079b2844 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -120,4 +120,4 @@ github: publish
 	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $$(OUTPUTDIR)
 	git push origin $(GITHUB_PAGES_BRANCH)
 
-.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
+.PHONY: html help clean regenerate serve serve-global devserver stopserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github

From 9a04ce660c9fbb04af9ebde523d010eec7aa5e86 Mon Sep 17 00:00:00 2001
From: Kernc <kerncece@gmail.com>
Date: Sun, 15 Nov 2015 20:34:35 +0100
Subject: [PATCH 1859/2864] Add --fatal=errors|warnings program option

---
 pelican/__init__.py |  7 ++++++-
 pelican/log.py      | 21 +++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 48cb5980..5074e182 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -322,6 +322,11 @@ def parse_arguments():
                         dest='selected_paths', default=None,
                         help='Comma separated list of selected paths to write')
 
+    parser.add_argument('--fatal', metavar='errors|warnings',
+                        choices=('errors', 'warnings'),
+                        help=('Exit the program with non-zero status if any '
+                              'errors/warnings encountered.'))
+
     return parser.parse_args()
 
 
@@ -378,7 +383,7 @@ def get_instance(args):
 
 def main():
     args = parse_arguments()
-    init(args.verbosity)
+    init(args.verbosity, args.fatal)
 
     logger.debug('Pelican version: %s', __version__)
     logger.debug('Python version: %s', sys.version.split()[0])
diff --git a/pelican/log.py b/pelican/log.py
index 747aa38d..3d365607 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -175,7 +175,22 @@ class LimitLogger(SafeLogger):
     def enable_filter(self):
         self.addFilter(LimitLogger.limit_filter)
 
-logging.setLoggerClass(LimitLogger)
+
+class FatalLogger(LimitLogger):
+    warnings_fatal = False
+    errors_fatal = False
+
+    def warning(self, *args, **kwargs):
+        super(FatalLogger, self).warning(*args, **kwargs)
+        if FatalLogger.warnings_fatal:
+            raise RuntimeError('Warning encountered')
+
+    def error(self, *args, **kwargs):
+        super(FatalLogger, self).error(*args, **kwargs)
+        if FatalLogger.errors_fatal:
+            raise RuntimeError('Error encountered')
+
+logging.setLoggerClass(FatalLogger)
 
 
 def supports_color():
@@ -203,7 +218,9 @@ def get_formatter():
         return TextFormatter()
 
 
-def init(level=None, handler=logging.StreamHandler(), name=None):
+def init(level=None, fatal='', handler=logging.StreamHandler(), name=None):
+    FatalLogger.warnings_fatal = fatal.startswith('warning')
+    FatalLogger.errors_fatal = bool(fatal)
 
     logger = logging.getLogger(name)
 

From ac48dc22c6396fec08cedff62ca21983fa835ade Mon Sep 17 00:00:00 2001
From: Kernc <kerncece@gmail.com>
Date: Tue, 17 Nov 2015 21:48:23 +0100
Subject: [PATCH 1860/2864] Wrap code that can cause a fatal warning in
 try-except

---
 pelican/__init__.py | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 5074e182..f27c930b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -388,26 +388,27 @@ def main():
     logger.debug('Pelican version: %s', __version__)
     logger.debug('Python version: %s', sys.version.split()[0])
 
-    pelican, settings = get_instance(args)
-    readers = Readers(settings)
-
-    watchers = {'content': folder_watcher(pelican.path,
-                                          readers.extensions,
-                                          pelican.ignore_files),
-                'theme': folder_watcher(pelican.theme,
-                                        [''],
-                                        pelican.ignore_files),
-                'settings': file_watcher(args.settings)}
-
-    old_static = settings.get("STATIC_PATHS", [])
-    for static_path in old_static:
-        # use a prefix to avoid possible overriding of standard watchers above
-        watchers['[static]%s' % static_path] = folder_watcher(
-            os.path.join(pelican.path, static_path),
-            [''],
-            pelican.ignore_files)
-
     try:
+        pelican, settings = get_instance(args)
+        readers = Readers(settings)
+
+        watchers = {'content': folder_watcher(pelican.path,
+                                              readers.extensions,
+                                              pelican.ignore_files),
+                    'theme': folder_watcher(pelican.theme,
+                                            [''],
+                                            pelican.ignore_files),
+                    'settings': file_watcher(args.settings)}
+
+        old_static = settings.get("STATIC_PATHS", [])
+        for static_path in old_static:
+            # use a prefix to avoid possible overriding of standard watchers
+            # above
+            watchers['[static]%s' % static_path] = folder_watcher(
+                os.path.join(pelican.path, static_path),
+                [''],
+                pelican.ignore_files)
+
         if args.autoreload:
             print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
                   ' `settings` for changes. ---')

From d7407eababb56dd32940fc858ef1687b309e59ea Mon Sep 17 00:00:00 2001
From: Kernc <kerncece@gmail.com>
Date: Mon, 18 Jan 2016 01:12:15 +0100
Subject: [PATCH 1861/2864] Don't fail if --fatal not provided

Fixes https://github.com/getpelican/pelican/issues/1891
---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index f27c930b..30b3c2f8 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -323,7 +323,7 @@ def parse_arguments():
                         help='Comma separated list of selected paths to write')
 
     parser.add_argument('--fatal', metavar='errors|warnings',
-                        choices=('errors', 'warnings'),
+                        choices=('errors', 'warnings'), default='',
                         help=('Exit the program with non-zero status if any '
                               'errors/warnings encountered.'))
 

From 6c5183486fe99f4aa2bc5947895d2e62427e6a1b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 Jan 2016 20:12:53 +0100
Subject: [PATCH 1862/2864] tests: fix failures with Pygments 2.1

---
 pelican/tests/output/basic/feeds/all-en.atom.xml                | 2 +-
 pelican/tests/output/basic/feeds/all.atom.xml                   | 2 +-
 pelican/tests/output/basic/feeds/misc.atom.xml                  | 2 +-
 pelican/tests/output/basic/unbelievable.html                    | 2 +-
 pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml     | 2 +-
 pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml      | 2 +-
 pelican/tests/output/custom/feeds/all-en.atom.xml               | 2 +-
 pelican/tests/output/custom/feeds/all.atom.xml                  | 2 +-
 pelican/tests/output/custom/feeds/all.rss.xml                   | 2 +-
 pelican/tests/output/custom/feeds/misc.atom.xml                 | 2 +-
 pelican/tests/output/custom/feeds/misc.rss.xml                  | 2 +-
 pelican/tests/output/custom/unbelievable.html                   | 2 +-
 .../tests/output/custom_locale/feeds/alexis-metaireau.atom.xml  | 2 +-
 .../tests/output/custom_locale/feeds/alexis-metaireau.rss.xml   | 2 +-
 pelican/tests/output/custom_locale/feeds/all-en.atom.xml        | 2 +-
 pelican/tests/output/custom_locale/feeds/all.atom.xml           | 2 +-
 pelican/tests/output/custom_locale/feeds/all.rss.xml            | 2 +-
 pelican/tests/output/custom_locale/feeds/misc.atom.xml          | 2 +-
 pelican/tests/output/custom_locale/feeds/misc.rss.xml           | 2 +-
 .../custom_locale/posts/2010/octobre/15/unbelievable/index.html | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 3ce41d77..cd8d4a69 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 3a9478a4..3d9bd271 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -43,7 +43,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index a9b5977b..506596a3 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index dfb0c54e..2b3fc177 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -58,7 +58,7 @@ pelican.conf, it will have nothing in default.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index cb746377..987f987c 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index 2c4b1160..89082ee6 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 3574ab42..75b63338 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 391ab85f..efb43cdd 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index a78d2dec..548b16cb 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 91d6b28f..dbab63c6 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 3493d2a3..2d13bda2 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 77a16a8d..554ef6ed 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 8fb3ef64..2090087c 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index 99255ee5..00944ce8 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 6b2f09ba..297558de 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index 5ef59e04..78da5279 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index 071e2f1a..84fd5dfb 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index c91d4d7e..fde02e6e 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index 82b58983..bd727bbf 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 3c364ffc..aef30c22 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">

From 034e2e19f3041b93f2ee8909c54c0a1555e0177f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 11 Feb 2016 10:11:00 -0800
Subject: [PATCH 1863/2864] Note explicit Python 3 support in install docs

Refs #1850
---
 docs/install.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/install.rst b/docs/install.rst
index 067a5cec..6c77342a 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -1,9 +1,8 @@
 Installing Pelican
 ##################
 
-Pelican currently runs best on Python 2.7.x; earlier versions of Python are
-not supported. There is provisional support for Python 3.3+, although there may
-be rough edges, particularly with regards to optional 3rd-party components.
+Pelican currently runs best on Python 2.7.x and 3.3+; earlier versions of
+Python are not supported.
 
 You can install Pelican via several different methods. The simplest is via
 `pip <http://www.pip-installer.org/>`_::

From 2dcc4ccf806761be8e0ac9bc0d3a0bd25ca5023d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 19 Feb 2016 12:03:48 -0800
Subject: [PATCH 1864/2864] Update functional test output for Pygments 2.1.1

---
 .../basic/a-markdown-powered-article.html     |  4 +-
 pelican/tests/output/basic/archives.html      |  2 +-
 pelican/tests/output/basic/article-1.html     |  4 +-
 pelican/tests/output/basic/article-2.html     |  4 +-
 pelican/tests/output/basic/article-3.html     |  4 +-
 .../output/basic/author/alexis-metaireau.html | 18 ++++----
 pelican/tests/output/basic/authors.html       |  2 +-
 pelican/tests/output/basic/categories.html    |  2 +-
 pelican/tests/output/basic/category/bar.html  |  8 ++--
 pelican/tests/output/basic/category/cat1.html | 14 +++---
 pelican/tests/output/basic/category/misc.html | 18 ++++----
 pelican/tests/output/basic/category/yeah.html |  8 ++--
 .../basic/feeds/alexis-metaireau.atom.xml     |  2 +-
 .../basic/feeds/alexis-metaireau.rss.xml      |  2 +-
 .../tests/output/basic/feeds/all-en.atom.xml  | 10 ++---
 .../tests/output/basic/feeds/all-fr.atom.xml  |  2 +-
 pelican/tests/output/basic/feeds/all.atom.xml | 10 ++---
 pelican/tests/output/basic/feeds/bar.atom.xml |  2 +-
 .../tests/output/basic/feeds/cat1.atom.xml    |  2 +-
 .../tests/output/basic/feeds/misc.atom.xml    | 10 ++---
 .../tests/output/basic/feeds/yeah.atom.xml    |  2 +-
 .../basic/filename_metadata-example.html      |  4 +-
 pelican/tests/output/basic/index.html         | 38 ++++++++--------
 pelican/tests/output/basic/oh-yeah.html       |  8 ++--
 .../tests/output/basic/override/index.html    |  2 +-
 .../pages/this-is-a-test-hidden-page.html     |  2 +-
 .../basic/pages/this-is-a-test-page.html      |  2 +-
 .../tests/output/basic/second-article-fr.html |  6 +--
 .../tests/output/basic/second-article.html    |  6 +--
 pelican/tests/output/basic/tag/bar.html       | 22 +++++-----
 pelican/tests/output/basic/tag/baz.html       |  4 +-
 pelican/tests/output/basic/tag/foo.html       | 16 +++----
 pelican/tests/output/basic/tag/foobar.html    |  8 ++--
 pelican/tests/output/basic/tag/yeah.html      |  8 ++--
 pelican/tests/output/basic/tags.html          |  2 +-
 .../output/basic/this-is-a-super-article.html |  8 ++--
 pelican/tests/output/basic/unbelievable.html  | 12 ++---
 .../custom/a-markdown-powered-article.html    |  6 +--
 pelican/tests/output/custom/article-1.html    |  6 +--
 pelican/tests/output/custom/article-2.html    |  6 +--
 pelican/tests/output/custom/article-3.html    |  6 +--
 .../custom/author/alexis-metaireau.html       | 24 +++++-----
 .../custom/author/alexis-metaireau2.html      | 26 +++++------
 .../custom/author/alexis-metaireau3.html      | 14 +++---
 pelican/tests/output/custom/authors.html      |  2 +-
 pelican/tests/output/custom/category/bar.html |  8 ++--
 .../tests/output/custom/category/cat1.html    | 20 ++++-----
 .../tests/output/custom/category/misc.html    | 24 +++++-----
 .../tests/output/custom/category/yeah.html    |  8 ++--
 .../output/custom/drafts/a-draft-article.html |  6 +--
 .../custom/feeds/alexis-metaireau.atom.xml    |  8 ++--
 .../custom/feeds/alexis-metaireau.rss.xml     |  8 ++--
 .../tests/output/custom/feeds/all-en.atom.xml |  8 ++--
 .../tests/output/custom/feeds/all.atom.xml    |  8 ++--
 pelican/tests/output/custom/feeds/all.rss.xml |  8 ++--
 .../tests/output/custom/feeds/misc.atom.xml   |  8 ++--
 .../tests/output/custom/feeds/misc.rss.xml    |  8 ++--
 .../custom/filename_metadata-example.html     |  4 +-
 pelican/tests/output/custom/index.html        | 22 +++++-----
 pelican/tests/output/custom/index2.html       | 26 +++++------
 pelican/tests/output/custom/index3.html       | 14 +++---
 pelican/tests/output/custom/oh-yeah-fr.html   |  4 +-
 pelican/tests/output/custom/oh-yeah.html      |  6 +--
 .../output/custom/second-article-fr.html      |  6 +--
 .../tests/output/custom/second-article.html   |  6 +--
 pelican/tests/output/custom/tag/bar.html      | 24 +++++-----
 pelican/tests/output/custom/tag/baz.html      |  4 +-
 pelican/tests/output/custom/tag/foo.html      | 18 ++++----
 pelican/tests/output/custom/tag/foobar.html   |  8 ++--
 pelican/tests/output/custom/tag/yeah.html     |  8 ++--
 pelican/tests/output/custom/tags.html         |  2 +-
 .../custom/this-is-a-super-article.html       |  8 ++--
 pelican/tests/output/custom/unbelievable.html | 12 ++---
 .../tests/output/custom_locale/archives.html  | 38 ++++++++--------
 .../author/alexis-metaireau.html              | 42 +++++++++---------
 .../author/alexis-metaireau2.html             | 44 +++++++++----------
 .../author/alexis-metaireau3.html             | 22 +++++-----
 .../output/custom_locale/category/bar.html    |  8 ++--
 .../output/custom_locale/category/cat1.html   | 40 ++++++++---------
 .../output/custom_locale/category/misc.html   | 40 ++++++++---------
 .../output/custom_locale/category/yeah.html   | 12 ++---
 .../custom_locale/drafts/a-draft-article.html |  4 +-
 .../feeds/alexis-metaireau.atom.xml           | 32 +++++++-------
 .../feeds/alexis-metaireau.rss.xml            | 34 +++++++-------
 .../custom_locale/feeds/all-en.atom.xml       | 32 +++++++-------
 .../output/custom_locale/feeds/all.atom.xml   | 32 +++++++-------
 .../output/custom_locale/feeds/all.rss.xml    | 38 ++++++++--------
 .../output/custom_locale/feeds/bar.atom.xml   |  2 +-
 .../output/custom_locale/feeds/bar.rss.xml    |  4 +-
 .../output/custom_locale/feeds/cat1.atom.xml  | 10 ++---
 .../output/custom_locale/feeds/cat1.rss.xml   | 12 ++---
 .../output/custom_locale/feeds/misc.atom.xml  | 18 ++++----
 .../output/custom_locale/feeds/misc.rss.xml   | 20 ++++-----
 .../output/custom_locale/feeds/yeah.atom.xml  |  2 +-
 .../output/custom_locale/feeds/yeah.rss.xml   |  4 +-
 pelican/tests/output/custom_locale/index.html | 42 +++++++++---------
 .../tests/output/custom_locale/index2.html    | 44 +++++++++----------
 .../tests/output/custom_locale/index3.html    | 22 +++++-----
 .../output/custom_locale/oh-yeah-fr.html      |  6 +--
 .../custom_locale/second-article-fr.html      |  6 +--
 .../tests/output/custom_locale/tag/bar.html   | 32 +++++++-------
 .../tests/output/custom_locale/tag/baz.html   |  4 +-
 .../tests/output/custom_locale/tag/foo.html   | 22 +++++-----
 .../output/custom_locale/tag/foobar.html      | 12 ++---
 .../tests/output/custom_locale/tag/yeah.html  |  8 ++--
 105 files changed, 675 insertions(+), 675 deletions(-)

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index dd92d691..f533fa3d 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -38,7 +38,7 @@
                 Published: Wed 20 April 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
 <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
@@ -66,4 +66,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 27b7c862..01f360eb 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -69,4 +69,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index b09eef79..a5c92675 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -38,7 +38,7 @@
                 Published: Thu 17 February 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Article 1</p>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index e340a4f6..1a182c5f 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -38,7 +38,7 @@
                 Published: Thu 17 February 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Article 2</p>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 08bf4fc1..7fab0edd 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -38,7 +38,7 @@
                 Published: Thu 17 February 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Article 3</p>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index eeca537a..3fe6c95e 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -38,10 +38,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
+<p>In <a href="/category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -74,10 +74,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/bar.html">bar</a>. </p>
-<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
+<p>In <a href="/category/bar.html">bar</a>.</p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -88,8 +88,8 @@ YEAH !</p>
                 <a class="readmore" href="/oh-yeah.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+                </ol><!-- /#posts-list -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -109,4 +109,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index 288543b5..c580269f 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -51,4 +51,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 9a6682c0..5aa2791f 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -49,4 +49,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index d3eb38da..6ae80ed1 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -34,10 +34,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/bar.html">bar</a>. </p>
-<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
+<p>In <a href="/category/bar.html">bar</a>.</p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -65,4 +65,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index f21bc9ab..369146d0 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -33,7 +33,7 @@
                 Published: Wed 20 April 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
 <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
@@ -56,7 +56,7 @@
                 Published: Thu 17 February 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
@@ -76,7 +76,7 @@
                 Published: Thu 17 February 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
@@ -96,15 +96,15 @@
                 Published: Thu 17 February 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="/article-3.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+                </ol><!-- /#posts-list -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -124,4 +124,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index f491a464..197ee1d5 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -33,7 +33,7 @@
                 Published: Fri 30 November 2012
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
                 </article>
@@ -55,8 +55,8 @@
                 Published: Wed 29 February 2012
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+<p>In <a href="/category/misc.html">misc</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
         <a href="/second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
@@ -77,14 +77,14 @@
                 Published: Fri 15 October 2010
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
@@ -107,15 +107,15 @@ pelican.conf, it will ...</p></div>
                 Published: Sun 14 March 2010
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
                 <a class="readmore" href="/tag/baz.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+                </ol><!-- /#posts-list -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -135,4 +135,4 @@ pelican.conf, it will ...</p></div>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 09db53bc..291d43aa 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -38,10 +38,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
+<p>In <a href="/category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -75,4 +75,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index f9a2e6e1..e2f76a2b 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -17,4 +17,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index 511ffa0e..91daa535 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -17,4 +17,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid>tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid>tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index cd8d4a69..a281653c 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -29,20 +29,20 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -53,9 +53,9 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index 54056df6..5a41b7db 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 3d9bd271..8deb0dc9 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -30,20 +30,20 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -54,9 +54,9 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index d1c678ae..d597482c 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index a3c35956..dffaffda 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -4,4 +4,4 @@
 &lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index 506596a3..d8d972e7 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -6,20 +6,20 @@
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -30,9 +30,9 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 0df396a2..976cb7f9 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 9f492fc2..9c6d2747 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -38,7 +38,7 @@
                 Published: Fri 30 November 2012
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Some cool stuff!</p>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 4c74500d..272ad852 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -33,7 +33,7 @@
                 Published: Fri 30 November 2012
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
                 </article>
@@ -55,8 +55,8 @@
                 Published: Wed 29 February 2012
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+<p>In <a href="/category/misc.html">misc</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
         <a href="/second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
@@ -77,7 +77,7 @@
                 Published: Wed 20 April 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
 <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
@@ -98,7 +98,7 @@
                 Published: Thu 17 February 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
@@ -118,7 +118,7 @@
                 Published: Thu 17 February 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
@@ -138,7 +138,7 @@
                 Published: Thu 17 February 2011
         </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
@@ -163,10 +163,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
+<p>In <a href="/category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
@@ -187,10 +187,10 @@ as well as <strong>inline markup</strong>.</p>
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/bar.html">bar</a>. </p>
-<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
+<p>In <a href="/category/bar.html">bar</a>.</p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -214,14 +214,14 @@ YEAH !</p>
                 Published: Fri 15 October 2010
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
@@ -244,15 +244,15 @@ pelican.conf, it will ...</p></div>
                 Published: Sun 14 March 2010
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
                 <a class="readmore" href="/tag/baz.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+                </ol><!-- /#posts-list -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -272,4 +272,4 @@ pelican.conf, it will ...</p></div>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index caeb8ddb..a8f0252b 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -39,10 +39,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/bar.html">bar</a>. </p>
-<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
+<p>In <a href="/category/bar.html">bar</a>.</p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
 </footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -73,4 +73,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index d98009a2..28486f79 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -50,4 +50,4 @@ at a custom location.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index b98f0008..16633b74 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -50,4 +50,4 @@ Anyone can see this page but it's not linked to anywhere!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index 282fe965..3c29e0af 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -50,4 +50,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index c13acce6..30c8ab0b 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -38,8 +38,8 @@
                 Published: Wed 29 February 2012
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+<p>In <a href="/category/misc.html">misc</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
         <a href="/second-article.html">en</a>
 
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
@@ -67,4 +67,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index e9a5b14c..090dc8dd 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -38,8 +38,8 @@
                 Published: Wed 29 February 2012
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+<p>In <a href="/category/misc.html">misc</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
         <a href="/second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info -->      <p>This is some article, in english</p>
@@ -67,4 +67,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index c461cac5..655e97c7 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -33,8 +33,8 @@
                 Published: Wed 29 February 2012
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+<p>In <a href="/category/misc.html">misc</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
         <a href="/second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
@@ -62,10 +62,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
+<p>In <a href="/category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
@@ -86,10 +86,10 @@ as well as <strong>inline markup</strong>.</p>
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/bar.html">bar</a>. </p>
-<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
+<p>In <a href="/category/bar.html">bar</a>.</p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -100,8 +100,8 @@ YEAH !</p>
                 <a class="readmore" href="/oh-yeah.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+                </ol><!-- /#posts-list -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -121,4 +121,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 7961b19f..c1e662d9 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -38,7 +38,7 @@
                 Published: Sun 14 March 2010
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 1a97fd4a..484f8884 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -33,8 +33,8 @@
                 Published: Wed 29 February 2012
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations:
+<p>In <a href="/category/misc.html">misc</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
         <a href="/second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
@@ -62,18 +62,18 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
+<p>In <a href="/category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="/this-is-a-super-article.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+                </ol><!-- /#posts-list -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -93,4 +93,4 @@ as well as <strong>inline markup</strong>.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 891b6866..c65d6a0c 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -38,10 +38,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
+<p>In <a href="/category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -75,4 +75,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index bd5ff204..0eb4c4b3 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -34,10 +34,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/bar.html">bar</a>. </p>
-<p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
+<p>In <a href="/category/bar.html">bar</a>.</p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -65,4 +65,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index 44b45591..114f032e 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -56,4 +56,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 1fe944eb..3f576aed 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -43,10 +43,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="/category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
+<p>In <a href="/category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -83,4 +83,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 2b3fc177..21691b29 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -38,27 +38,27 @@
                 Published: Fri 15 October 2010
         </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.</p>
-<div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
@@ -69,7 +69,7 @@ pelican.conf, it will have nothing in default.</p>
 <div class="section" id="testing-overriding-config-defaults">
 <h2>Testing overriding config defaults</h2>
 <p>Even if the default is line numbers, we can override it here</p>
-<div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 <p>Lovely.</p>
 </div>
@@ -97,4 +97,4 @@ pelican.conf, it will have nothing in default.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 6ccc6c42..9c53ec8e 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -43,9 +43,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
 <p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
@@ -112,4 +112,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 33cf3a5f..edd6f749 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -43,9 +43,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Article 1</p>
 
@@ -111,4 +111,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 8c8e47eb..74bf32ea 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -43,9 +43,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Article 2</p>
 
@@ -111,4 +111,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 773b89e0..850fce92 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -43,9 +43,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Article 3</p>
 
@@ -111,4 +111,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index d6521a5e..90d361d1 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -38,9 +38,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
 <p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
@@ -63,10 +63,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
+<p>In <a href="../category/misc.html">misc</a>.</p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
         <a href="../second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
@@ -88,9 +88,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
 <p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
@@ -112,21 +112,21 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="../article-1.html">read more</a>
 <p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
+                </ol><!-- /#posts-list -->
 <p class="paginator">
     Page 1 / 3
         <a href="../author/alexis-metaireau2.html">&raquo;</a>
 </p>
-            </section><!-- /#content -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
@@ -170,4 +170,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 2101719b..44e2f83b 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -44,9 +44,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
@@ -67,9 +67,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
@@ -94,10 +94,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
+<p>In <a href="../category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
@@ -118,10 +118,10 @@ as well as <strong>inline markup</strong>.</p>
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations:
+<p>In <a href="../category/bar.html">bar</a>.</p>
+<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
         <a href="../oh-yeah-fr.html">fr</a>
 
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
@@ -134,13 +134,13 @@ YEAH !</p>
                 <a class="readmore" href="../oh-yeah.html">read more</a>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
+                </ol><!-- /#posts-list -->
 <p class="paginator">
         <a href="../author/alexis-metaireau.html">&laquo;</a>
     Page 2 / 3
         <a href="../author/alexis-metaireau3.html">&raquo;</a>
 </p>
-            </section><!-- /#content -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index d531fd1e..e53c27ef 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -44,16 +44,16 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
@@ -77,21 +77,21 @@ pelican.conf, it will ...</p></div>
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
                 <a class="readmore" href="../tag/baz.html">read more</a>
 <p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
+                </ol><!-- /#posts-list -->
 <p class="paginator">
         <a href="../author/alexis-metaireau2.html">&laquo;</a>
     Page 3 / 3
 </p>
-            </section><!-- /#content -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index 6539b3e9..5cd227d9 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -79,4 +79,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 79803b1a..79d9f8ba 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -38,10 +38,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations:
+<p>In <a href="../category/bar.html">bar</a>.</p>
+<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
         <a href="../oh-yeah-fr.html">fr</a>
 
 </footer><!-- /.post-info --><div class="section" id="why-not">
@@ -95,4 +95,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 0230ac2f..a88094e4 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -38,9 +38,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
 <p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
@@ -64,9 +64,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
@@ -87,9 +87,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
@@ -110,17 +110,17 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="../article-3.html">read more</a>
 <p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+                </ol><!-- /#posts-list -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index abe32c8d..c798ebac 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -38,9 +38,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
 <p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
@@ -63,10 +63,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
+<p>In <a href="../category/misc.html">misc</a>.</p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
         <a href="../second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
@@ -88,16 +88,16 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
@@ -121,17 +121,17 @@ pelican.conf, it will ...</p></div>
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
                 <a class="readmore" href="../tag/baz.html">read more</a>
 <p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+                </ol><!-- /#posts-list -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index d22bb9f8..444039b7 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -42,10 +42,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
+<p>In <a href="../category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -103,4 +103,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index ba424259..d206e546 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -43,9 +43,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
 listed anywhere else.</p>
@@ -97,4 +97,4 @@ listed anywhere else.</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index 987f987c..051d90f4 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -29,20 +29,20 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -53,7 +53,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index 89082ee6..e3895ed0 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -29,20 +29,20 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -53,7 +53,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 75b63338..9c4a20d0 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -29,20 +29,20 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -53,7 +53,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index efb43cdd..9144f34b 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -31,20 +31,20 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 548b16cb..f8bc2182 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -31,20 +31,20 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index dbab63c6..04bc8efd 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -6,20 +6,20 @@
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 2d13bda2..da30d81a 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -6,20 +6,20 @@
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index c4977f63..6a5aaec6 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -43,9 +43,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Some cool stuff!</p>
 
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 87af6a06..6b7ec333 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -38,9 +38,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
 <p>There are <a href="./filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
@@ -63,10 +63,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations:
+<p>In <a href="./category/misc.html">misc</a>.</p>
+<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
         <a href="./second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
@@ -88,9 +88,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
 <p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
@@ -112,21 +112,21 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="./article-1.html">read more</a>
 <p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
+                </ol><!-- /#posts-list -->
 <p class="paginator">
     Page 1 / 3
         <a href="./index2.html">&raquo;</a>
 </p>
-            </section><!-- /#content -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 0c457a65..7d6adf80 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -44,9 +44,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
@@ -67,9 +67,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
@@ -94,10 +94,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
+<p>In <a href="./category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
@@ -118,10 +118,10 @@ as well as <strong>inline markup</strong>.</p>
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations:
+<p>In <a href="./category/bar.html">bar</a>.</p>
+<p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
         <a href="./oh-yeah-fr.html">fr</a>
 
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
@@ -134,13 +134,13 @@ YEAH !</p>
                 <a class="readmore" href="./oh-yeah.html">read more</a>
 <p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
+                </ol><!-- /#posts-list -->
 <p class="paginator">
         <a href="./index.html">&laquo;</a>
     Page 2 / 3
         <a href="./index3.html">&raquo;</a>
 </p>
-            </section><!-- /#content -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 523288c5..ff54fa4c 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -44,16 +44,16 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
@@ -77,21 +77,21 @@ pelican.conf, it will ...</p></div>
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
                 <a class="readmore" href="./tag/baz.html">read more</a>
 <p>There are <a href="./tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
+                </ol><!-- /#posts-list -->
 <p class="paginator">
         <a href="./index2.html">&laquo;</a>
     Page 3 / 3
 </p>
-            </section><!-- /#content -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 9f56f27b..b32acd70 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -43,9 +43,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 Translations:
         <a href="./oh-yeah.html">en</a>
 
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index caddf53c..ae1a43b3 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -43,10 +43,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/bar.html">bar</a>. </p>
-<p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations:
+<p>In <a href="./category/bar.html">bar</a>.</p>
+<p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
         <a href="./oh-yeah-fr.html">fr</a>
 
 </footer><!-- /.post-info -->      <div class="section" id="why-not">
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 9ada2475..2645bc53 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -43,10 +43,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations:
+<p>In <a href="./category/misc.html">misc</a>.</p>
+<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
         <a href="./second-article.html">en</a>
 
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index f2d9ffa4..b15a510f 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -43,10 +43,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations:
+<p>In <a href="./category/misc.html">misc</a>.</p>
+<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
         <a href="./second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info -->      <p>This is some article, in english</p>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index b15860f1..5f331d23 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -38,10 +38,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
+<p>In <a href="../category/misc.html">misc</a>.</p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
         <a href="../second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
@@ -69,10 +69,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
+<p>In <a href="../category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
@@ -93,10 +93,10 @@ as well as <strong>inline markup</strong>.</p>
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations:
+<p>In <a href="../category/bar.html">bar</a>.</p>
+<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
         <a href="../oh-yeah-fr.html">fr</a>
 
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
@@ -109,8 +109,8 @@ YEAH !</p>
                 <a class="readmore" href="../oh-yeah.html">read more</a>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+                </ol><!-- /#posts-list -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
@@ -154,4 +154,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index a581e319..3cbb841c 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -43,9 +43,9 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 36282dd7..9719ff75 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -38,10 +38,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
+<p>In <a href="../category/misc.html">misc</a>.</p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
         <a href="../second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
@@ -69,18 +69,18 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
+<p>In <a href="../category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="../this-is-a-super-article.html">read more</a>
 <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
+                </ol><!-- /#posts-list -->
+                </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
@@ -124,4 +124,4 @@ as well as <strong>inline markup</strong>.</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index ab84124c..ef47e789 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -42,10 +42,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
+<p>In <a href="../category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -103,4 +103,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index c14f1f47..1674e915 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -38,10 +38,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/bar.html">bar</a>. </p>
-<p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations:
+<p>In <a href="../category/bar.html">bar</a>.</p>
+<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
         <a href="../oh-yeah-fr.html">fr</a>
 
 </footer><!-- /.post-info --><div class="section" id="why-not">
@@ -95,4 +95,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 9d3e2bdf..59a36ace 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -84,4 +84,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index a36bf412..be9a5b00 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -47,10 +47,10 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/yeah.html">yeah</a>. </p>
-<p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
+<p>In <a href="./category/yeah.html">yeah</a>.</p>
+<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
@@ -126,4 +126,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 554ef6ed..16e0dc39 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -43,29 +43,29 @@
         </abbr>
 
         <address class="vcard author">
-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.</p>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table><p>Lovely.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
@@ -76,7 +76,7 @@ pelican.conf, it will have nothing in default.</p>
 <div class="section" id="testing-overriding-config-defaults">
 <h2>Testing overriding config defaults</h2>
 <p>Even if the default is line numbers, we can override it here</p>
-<div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 <p>Lovely.</p>
 </div>
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index ed375051..229923fb 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -32,25 +32,25 @@
 <h1>Archives for Alexis' log</h1>
 
 <dl>
-    <dt>30 novembre 2012</dt>
-    <dd><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></dd>
-    <dt>29 février 2012</dt>
-    <dd><a href="./posts/2012/février/29/second-article/">Second article</a></dd>
-    <dt>20 avril 2011</dt>
-    <dd><a href="./posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></dd>
-    <dt>17 février 2011</dt>
-    <dd><a href="./posts/2011/février/17/article-1/">Article 1</a></dd>
-    <dt>17 février 2011</dt>
-    <dd><a href="./posts/2011/février/17/article-2/">Article 2</a></dd>
-    <dt>17 février 2011</dt>
-    <dd><a href="./posts/2011/février/17/article-3/">Article 3</a></dd>
-    <dt>02 décembre 2010</dt>
-    <dd><a href="./posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></dd>
-    <dt>20 octobre 2010</dt>
-    <dd><a href="./posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></dd>
-    <dt>15 octobre 2010</dt>
-    <dd><a href="./posts/2010/octobre/15/unbelievable/">Unbelievable !</a></dd>
-    <dt>14 mars 2010</dt>
+    <dt>30 November 2012</dt>
+    <dd><a href="./posts/2012/November/30/filename_metadata-example/">FILENAME_METADATA example</a></dd>
+    <dt>29 February 2012</dt>
+    <dd><a href="./posts/2012/February/29/second-article/">Second article</a></dd>
+    <dt>20 April 2011</dt>
+    <dd><a href="./posts/2011/April/20/a-markdown-powered-article/">A markdown powered article</a></dd>
+    <dt>17 February 2011</dt>
+    <dd><a href="./posts/2011/February/17/article-1/">Article 1</a></dd>
+    <dt>17 February 2011</dt>
+    <dd><a href="./posts/2011/February/17/article-2/">Article 2</a></dd>
+    <dt>17 February 2011</dt>
+    <dd><a href="./posts/2011/February/17/article-3/">Article 3</a></dd>
+    <dt>02 December 2010</dt>
+    <dd><a href="./posts/2010/December/02/this-is-a-super-article/">This is a super article !</a></dd>
+    <dt>20 October 2010</dt>
+    <dd><a href="./posts/2010/October/20/oh-yeah/">Oh yeah !</a></dd>
+    <dt>15 October 2010</dt>
+    <dd><a href="./posts/2010/October/15/unbelievable/">Unbelievable !</a></dd>
+    <dt>14 March 2010</dt>
     <dd><a href="./tag/baz.html">The baz tag</a></dd>
 </dl>
 </section>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 299578cf..a57ceb28 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -31,19 +31,19 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2012/November/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: 30 novembre 2012
+                Published: 30 November 2012
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="../posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2012/November/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -52,74 +52,74 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2012/février/29/second-article/" rel="bookmark"
+                    <h1><a href="../posts/2012/February/29/second-article/" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
+                Published: 29 February 2012
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
         <a href="../second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="../posts/2012/février/29/second-article/">read more</a>
-<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2012/February/29/second-article/">read more</a>
+<p>There are <a href="../posts/2012/February/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
+                    <h1><a href="../posts/2011/April/20/a-markdown-powered-article/" rel="bookmark"
                            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: 20 avril 2011
+                Published: 20 April 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
-<a href="../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
-                <a class="readmore" href="../posts/2011/avril/20/a-markdown-powered-article/">read more</a>
-<p>There are <a href="../posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p><a href="../posts/2010/October/15/unbelievable/">a root-relative link to unbelievable</a>
+<a href="../posts/2010/October/15/unbelievable/">a file-relative link to unbelievable</a></p>
+                <a class="readmore" href="../posts/2011/April/20/a-markdown-powered-article/">read more</a>
+<p>There are <a href="../posts/2011/April/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/février/17/article-1/" rel="bookmark"
+                    <h1><a href="../posts/2011/February/17/article-1/" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
+                Published: 17 February 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-1/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/February/17/article-1/">read more</a>
+<p>There are <a href="../posts/2011/February/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 6f3a0b71..bdd7f254 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -33,94 +33,94 @@
                     <ol id="posts-list" class="hfeed" start="3">
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/février/17/article-2/" rel="bookmark"
+                    <h1><a href="../posts/2011/February/17/article-2/" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
+                Published: 17 February 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-2/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/February/17/article-2/">read more</a>
+<p>There are <a href="../posts/2011/February/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/février/17/article-3/" rel="bookmark"
+                    <h1><a href="../posts/2011/February/17/article-3/" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
+                Published: 17 February 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-3/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/February/17/article-3/">read more</a>
+<p>There are <a href="../posts/2011/February/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                    <h1><a href="../posts/2010/December/02/this-is-a-super-article/" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
+                Published: 02 December 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
+                Updated: 17 November 2013
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/December/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="../posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
+                    <h1><a href="../posts/2010/October/20/oh-yeah/" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
+                Published: 20 October 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
         <a href="../oh-yeah-fr.html">fr</a>
 
@@ -131,8 +131,8 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-                <a class="readmore" href="../posts/2010/octobre/20/oh-yeah/">read more</a>
-<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/October/20/oh-yeah/">read more</a>
+<p>There are <a href="../posts/2010/October/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 6eb5645e..a0212289 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -33,35 +33,35 @@
                     <ol id="posts-list" class="hfeed" start="3">
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/octobre/15/unbelievable/" rel="bookmark"
+                    <h1><a href="../posts/2010/October/15/unbelievable/" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: 15 octobre 2010
+                Published: 15 October 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
-<a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="../posts/2011/April/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+<a class="reference external" href="../posts/2011/April/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will ...</p></div>
-                <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
-<p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/October/15/unbelievable/">read more</a>
+<p>There are <a href="../posts/2010/October/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
@@ -73,13 +73,13 @@ pelican.conf, it will ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 mars 2010
+                Published: 14 March 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
@@ -135,4 +135,4 @@ pelican.conf, it will ...</p></div>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index 2aeef95c..c9f61687 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -31,16 +31,16 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2010/October/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
+                Published: 20 October 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
         <a href="../oh-yeah-fr.html">fr</a>
 
@@ -50,7 +50,7 @@
 YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2010/October/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 48c3ba18..f28c51d0 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -31,20 +31,20 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2011/April/20/a-markdown-powered-article/">A markdown powered article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: 20 avril 2011
+                Published: 20 April 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
-<a href="../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p><p>There are <a href="../posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </article>
+<p><a href="../posts/2010/October/15/unbelievable/">a root-relative link to unbelievable</a>
+<a href="../posts/2010/October/15/unbelievable/">a file-relative link to unbelievable</a></p><p>There are <a href="../posts/2011/April/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -53,71 +53,71 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/février/17/article-1/" rel="bookmark"
+                    <h1><a href="../posts/2011/February/17/article-1/" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
+                Published: 17 February 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-1/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/February/17/article-1/">read more</a>
+<p>There are <a href="../posts/2011/February/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/février/17/article-2/" rel="bookmark"
+                    <h1><a href="../posts/2011/February/17/article-2/" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
+                Published: 17 February 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-2/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/February/17/article-2/">read more</a>
+<p>There are <a href="../posts/2011/February/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/février/17/article-3/" rel="bookmark"
+                    <h1><a href="../posts/2011/February/17/article-3/" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
+                Published: 17 February 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-3/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/February/17/article-3/">read more</a>
+<p>There are <a href="../posts/2011/February/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index d977a4cc..20a88582 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -31,19 +31,19 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2012/November/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: 30 novembre 2012
+                Published: 30 November 2012
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="../posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2012/November/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -52,60 +52,60 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2012/février/29/second-article/" rel="bookmark"
+                    <h1><a href="../posts/2012/February/29/second-article/" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
+                Published: 29 February 2012
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
         <a href="../second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="../posts/2012/février/29/second-article/">read more</a>
-<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2012/February/29/second-article/">read more</a>
+<p>There are <a href="../posts/2012/February/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/octobre/15/unbelievable/" rel="bookmark"
+                    <h1><a href="../posts/2010/October/15/unbelievable/" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: 15 octobre 2010
+                Published: 15 October 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
-<a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="../posts/2011/April/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+<a class="reference external" href="../posts/2011/April/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will ...</p></div>
-                <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
-<p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/October/15/unbelievable/">read more</a>
+<p>There are <a href="../posts/2010/October/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
@@ -117,13 +117,13 @@ pelican.conf, it will ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 mars 2010
+                Published: 14 March 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
@@ -175,4 +175,4 @@ pelican.conf, it will ...</p></div>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index a00e2028..9a7cc1d3 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -31,20 +31,20 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2010/December/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
+                Published: 02 December 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
+                Updated: 17 November 2013
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -58,7 +58,7 @@
 </pre>
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
-<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
@@ -103,4 +103,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index c1817e25..473fa108 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -39,13 +39,13 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01+01:00">
-                Published: 02 mars 2012
+                Published: 02 March 2012
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
 listed anywhere else.</p>
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 2090087c..280f72d3 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,31 +18,31 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -53,7 +53,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index 00944ce8..f2345911 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,31 +18,31 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -53,9 +53,9 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 297558de..a36dabae 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,31 +18,31 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -53,7 +53,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index 78da5279..e9a97ef1 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,31 +20,31 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index 84fd5dfb..31c444dc 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,31 +20,31 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -55,9 +55,9 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index 02fae916..13a5cde2 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
index 96074958..4426eb6a 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index 96f70900..54d382c4 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
index b78f51cc..4f3b12f5 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index fde02e6e..d66c5146 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index bd727bbf..88bffff3 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
@@ -30,9 +30,9 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;div class="section" id="testing-overriding-config-defaults"&gt;
 &lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
 &lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index a8dbb270..5f7d8c4f 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index 379d1b93..50c5803c 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index f1174c31..30cca9d6 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -31,19 +31,19 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+                    <h1 class="entry-title"><a href="./posts/2012/November/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: 30 novembre 2012
+                Published: 30 November 2012
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="./posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="./posts/2012/November/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -52,74 +52,74 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2012/février/29/second-article/" rel="bookmark"
+                    <h1><a href="./posts/2012/February/29/second-article/" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
+                Published: 29 February 2012
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
         <a href="./second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="./posts/2012/février/29/second-article/">read more</a>
-<p>There are <a href="./posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2012/February/29/second-article/">read more</a>
+<p>There are <a href="./posts/2012/February/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
+                    <h1><a href="./posts/2011/April/20/a-markdown-powered-article/" rel="bookmark"
                            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: 20 avril 2011
+                Published: 20 April 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="./posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
-<a href="./posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
-                <a class="readmore" href="./posts/2011/avril/20/a-markdown-powered-article/">read more</a>
-<p>There are <a href="./posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p><a href="./posts/2010/October/15/unbelievable/">a root-relative link to unbelievable</a>
+<a href="./posts/2010/October/15/unbelievable/">a file-relative link to unbelievable</a></p>
+                <a class="readmore" href="./posts/2011/April/20/a-markdown-powered-article/">read more</a>
+<p>There are <a href="./posts/2011/April/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2011/février/17/article-1/" rel="bookmark"
+                    <h1><a href="./posts/2011/February/17/article-1/" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
+                Published: 17 February 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="./posts/2011/février/17/article-1/">read more</a>
-<p>There are <a href="./posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2011/February/17/article-1/">read more</a>
+<p>There are <a href="./posts/2011/February/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 286ff9c3..208f0972 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -33,94 +33,94 @@
                     <ol id="posts-list" class="hfeed" start="3">
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2011/février/17/article-2/" rel="bookmark"
+                    <h1><a href="./posts/2011/February/17/article-2/" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
+                Published: 17 February 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="./posts/2011/février/17/article-2/">read more</a>
-<p>There are <a href="./posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2011/February/17/article-2/">read more</a>
+<p>There are <a href="./posts/2011/February/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2011/février/17/article-3/" rel="bookmark"
+                    <h1><a href="./posts/2011/February/17/article-3/" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
+                Published: 17 February 2011
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="./posts/2011/février/17/article-3/">read more</a>
-<p>There are <a href="./posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2011/February/17/article-3/">read more</a>
+<p>There are <a href="./posts/2011/February/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                    <h1><a href="./posts/2010/December/02/this-is-a-super-article/" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
+                Published: 02 December 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
+                Updated: 17 November 2013
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/yeah.html">yeah</a>. </p>
+<p>In <a href="./category/yeah.html">yeah</a>.</p>
 <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="./posts/2010/décembre/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="./posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2010/December/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="./posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2010/octobre/20/oh-yeah/" rel="bookmark"
+                    <h1><a href="./posts/2010/October/20/oh-yeah/" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
+                Published: 20 October 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/bar.html">bar</a>. </p>
+<p>In <a href="./category/bar.html">bar</a>.</p>
 <p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
         <a href="./oh-yeah-fr.html">fr</a>
 
@@ -131,8 +131,8 @@ YEAH !</p>
 <img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-                <a class="readmore" href="./posts/2010/octobre/20/oh-yeah/">read more</a>
-<p>There are <a href="./posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2010/October/20/oh-yeah/">read more</a>
+<p>There are <a href="./posts/2010/October/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
@@ -184,4 +184,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index c30b7bb3..c0c5a00f 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -33,35 +33,35 @@
                     <ol id="posts-list" class="hfeed" start="3">
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2010/octobre/15/unbelievable/" rel="bookmark"
+                    <h1><a href="./posts/2010/October/15/unbelievable/" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: 15 octobre 2010
+                Published: 15 October 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
-<a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="./posts/2011/April/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+<a class="reference external" href="./posts/2011/April/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will ...</p></div>
-                <a class="readmore" href="./posts/2010/octobre/15/unbelievable/">read more</a>
-<p>There are <a href="./posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2010/October/15/unbelievable/">read more</a>
+<p>There are <a href="./posts/2010/October/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
@@ -73,13 +73,13 @@ pelican.conf, it will ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 mars 2010
+                Published: 14 March 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
@@ -135,4 +135,4 @@ pelican.conf, it will ...</p></div>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 33e05c3b..2fe492f4 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -39,15 +39,15 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01+01:00">
-                Published: 02 mars 2012
+                Published: 02 March 2012
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 Translations:
-        <a href="./posts/2010/octobre/20/oh-yeah/">en</a>
+        <a href="./posts/2010/October/20/oh-yeah/">en</a>
 
 </footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
 
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index dc17237f..198b9216 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -39,15 +39,15 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
+                Published: 29 February 2012
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>.</p>
 <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./posts/2012/février/29/second-article/">en</a>
+        <a href="./posts/2012/February/29/second-article/">en</a>
 
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index 12f368aa..03b101ae 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -31,21 +31,21 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2012/February/29/second-article/">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
+                Published: 29 February 2012
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
         <a href="../second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2012/February/29/second-article/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -54,48 +54,48 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                    <h1><a href="../posts/2010/December/02/this-is-a-super-article/" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
+                Published: 02 December 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
+                Updated: 17 November 2013
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/December/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="../posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
+                    <h1><a href="../posts/2010/October/20/oh-yeah/" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
+                Published: 20 October 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
         <a href="../oh-yeah-fr.html">fr</a>
 
@@ -106,8 +106,8 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-                <a class="readmore" href="../posts/2010/octobre/20/oh-yeah/">read more</a>
-<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/October/20/oh-yeah/">read more</a>
+<p>There are <a href="../posts/2010/October/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
@@ -154,4 +154,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 8a2c1c31..27e0b301 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -39,13 +39,13 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 mars 2010
+                Published: 14 March 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index c08baed4..0f253ae7 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -31,21 +31,21 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2012/February/29/second-article/">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
+                Published: 29 February 2012
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
         <a href="../second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2012/February/29/second-article/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -54,30 +54,30 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                    <h1><a href="../posts/2010/December/02/this-is-a-super-article/" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
+                Published: 02 December 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
+                Updated: 17 November 2013
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/December/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="../posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
@@ -124,4 +124,4 @@ as well as <strong>inline markup</strong>.</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 42bb1325..5e6623e5 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -31,20 +31,20 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2010/December/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
+                Published: 02 December 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
+                Updated: 17 November 2013
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -58,7 +58,7 @@
 </pre>
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
-<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
@@ -103,4 +103,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 581c67c0..3cf43840 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -31,16 +31,16 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2010/October/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
+                Published: 20 October 2010
         </abbr>
 
         <address class="vcard author">
                 By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../category/bar.html">bar</a>. </p>
+<p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
         <a href="../oh-yeah-fr.html">fr</a>
 
@@ -50,7 +50,7 @@
 YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2010/October/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">

From e4532eb8e06bc2ca29702afe319352391fef501e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 19 Feb 2016 12:48:30 -0800
Subject: [PATCH 1865/2864] Update test output for French locale

---
 .../tests/output/custom_locale/archives.html  | 38 +++++++++----------
 .../author/alexis-metaireau.html              | 34 ++++++++---------
 .../author/alexis-metaireau2.html             | 34 ++++++++---------
 .../author/alexis-metaireau3.html             | 14 +++----
 .../output/custom_locale/category/bar.html    |  6 +--
 .../output/custom_locale/category/cat1.html   | 32 ++++++++--------
 .../output/custom_locale/category/misc.html   | 28 +++++++-------
 .../output/custom_locale/category/yeah.html   |  8 ++--
 .../custom_locale/drafts/a-draft-article.html |  2 +-
 .../feeds/alexis-metaireau.atom.xml           | 24 ++++++------
 .../feeds/alexis-metaireau.rss.xml            | 26 ++++++-------
 .../custom_locale/feeds/all-en.atom.xml       | 24 ++++++------
 .../output/custom_locale/feeds/all.atom.xml   | 24 ++++++------
 .../output/custom_locale/feeds/all.rss.xml    | 30 +++++++--------
 .../output/custom_locale/feeds/bar.atom.xml   |  2 +-
 .../output/custom_locale/feeds/bar.rss.xml    |  4 +-
 .../output/custom_locale/feeds/cat1.atom.xml  | 10 ++---
 .../output/custom_locale/feeds/cat1.rss.xml   | 12 +++---
 .../output/custom_locale/feeds/misc.atom.xml  | 10 ++---
 .../output/custom_locale/feeds/misc.rss.xml   | 12 +++---
 .../output/custom_locale/feeds/yeah.atom.xml  |  2 +-
 .../output/custom_locale/feeds/yeah.rss.xml   |  4 +-
 pelican/tests/output/custom_locale/index.html | 34 ++++++++---------
 .../tests/output/custom_locale/index2.html    | 34 ++++++++---------
 .../tests/output/custom_locale/index3.html    | 14 +++----
 .../output/custom_locale/oh-yeah-fr.html      |  4 +-
 .../02/this-is-a-super-article/index.html     |  4 +-
 .../2010/octobre/15/unbelievable/index.html   | 10 ++---
 .../posts/2010/octobre/20/oh-yeah/index.html  |  2 +-
 .../20/a-markdown-powered-article/index.html  |  2 +-
 .../2011/février/17/article-1/index.html      |  2 +-
 .../2011/février/17/article-2/index.html      |  2 +-
 .../2011/février/17/article-3/index.html      |  2 +-
 .../2012/février/29/second-article/index.html |  2 +-
 .../30/filename_metadata-example/index.html   |  2 +-
 .../custom_locale/second-article-fr.html      |  4 +-
 .../tests/output/custom_locale/tag/bar.html   | 24 ++++++------
 .../tests/output/custom_locale/tag/baz.html   |  2 +-
 .../tests/output/custom_locale/tag/foo.html   | 16 ++++----
 .../output/custom_locale/tag/foobar.html      |  8 ++--
 .../tests/output/custom_locale/tag/yeah.html  |  6 +--
 41 files changed, 277 insertions(+), 277 deletions(-)

diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index 229923fb..ed375051 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -32,25 +32,25 @@
 <h1>Archives for Alexis' log</h1>
 
 <dl>
-    <dt>30 November 2012</dt>
-    <dd><a href="./posts/2012/November/30/filename_metadata-example/">FILENAME_METADATA example</a></dd>
-    <dt>29 February 2012</dt>
-    <dd><a href="./posts/2012/February/29/second-article/">Second article</a></dd>
-    <dt>20 April 2011</dt>
-    <dd><a href="./posts/2011/April/20/a-markdown-powered-article/">A markdown powered article</a></dd>
-    <dt>17 February 2011</dt>
-    <dd><a href="./posts/2011/February/17/article-1/">Article 1</a></dd>
-    <dt>17 February 2011</dt>
-    <dd><a href="./posts/2011/February/17/article-2/">Article 2</a></dd>
-    <dt>17 February 2011</dt>
-    <dd><a href="./posts/2011/February/17/article-3/">Article 3</a></dd>
-    <dt>02 December 2010</dt>
-    <dd><a href="./posts/2010/December/02/this-is-a-super-article/">This is a super article !</a></dd>
-    <dt>20 October 2010</dt>
-    <dd><a href="./posts/2010/October/20/oh-yeah/">Oh yeah !</a></dd>
-    <dt>15 October 2010</dt>
-    <dd><a href="./posts/2010/October/15/unbelievable/">Unbelievable !</a></dd>
-    <dt>14 March 2010</dt>
+    <dt>30 novembre 2012</dt>
+    <dd><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></dd>
+    <dt>29 février 2012</dt>
+    <dd><a href="./posts/2012/février/29/second-article/">Second article</a></dd>
+    <dt>20 avril 2011</dt>
+    <dd><a href="./posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></dd>
+    <dt>17 février 2011</dt>
+    <dd><a href="./posts/2011/février/17/article-1/">Article 1</a></dd>
+    <dt>17 février 2011</dt>
+    <dd><a href="./posts/2011/février/17/article-2/">Article 2</a></dd>
+    <dt>17 février 2011</dt>
+    <dd><a href="./posts/2011/février/17/article-3/">Article 3</a></dd>
+    <dt>02 décembre 2010</dt>
+    <dd><a href="./posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></dd>
+    <dt>20 octobre 2010</dt>
+    <dd><a href="./posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></dd>
+    <dt>15 octobre 2010</dt>
+    <dd><a href="./posts/2010/octobre/15/unbelievable/">Unbelievable !</a></dd>
+    <dt>14 mars 2010</dt>
     <dd><a href="./tag/baz.html">The baz tag</a></dd>
 </dl>
 </section>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index a57ceb28..01ca2814 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -31,10 +31,10 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2012/November/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: 30 November 2012
+                Published: 30 novembre 2012
         </abbr>
 
         <address class="vcard author">
@@ -43,7 +43,7 @@
 <p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="../posts/2012/November/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -52,14 +52,14 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2012/February/29/second-article/" rel="bookmark"
+                    <h1><a href="../posts/2012/février/29/second-article/" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 February 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -71,20 +71,20 @@
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="../posts/2012/February/29/second-article/">read more</a>
-<p>There are <a href="../posts/2012/February/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2012/février/29/second-article/">read more</a>
+<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/April/20/a-markdown-powered-article/" rel="bookmark"
+                    <h1><a href="../posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
                            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: 20 April 2011
+                Published: 20 avril 2011
         </abbr>
 
         <address class="vcard author">
@@ -93,22 +93,22 @@
 <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="../posts/2010/October/15/unbelievable/">a root-relative link to unbelievable</a>
-<a href="../posts/2010/October/15/unbelievable/">a file-relative link to unbelievable</a></p>
-                <a class="readmore" href="../posts/2011/April/20/a-markdown-powered-article/">read more</a>
-<p>There are <a href="../posts/2011/April/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p><a href="../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
+<a href="../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
+                <a class="readmore" href="../posts/2011/avril/20/a-markdown-powered-article/">read more</a>
+<p>There are <a href="../posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/February/17/article-1/" rel="bookmark"
+                    <h1><a href="../posts/2011/février/17/article-1/" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 February 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -118,8 +118,8 @@
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="../posts/2011/February/17/article-1/">read more</a>
-<p>There are <a href="../posts/2011/February/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/février/17/article-1/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index bdd7f254..2af2051f 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -33,14 +33,14 @@
                     <ol id="posts-list" class="hfeed" start="3">
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/February/17/article-2/" rel="bookmark"
+                    <h1><a href="../posts/2011/février/17/article-2/" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 February 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -50,20 +50,20 @@
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="../posts/2011/February/17/article-2/">read more</a>
-<p>There are <a href="../posts/2011/February/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/février/17/article-2/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/February/17/article-3/" rel="bookmark"
+                    <h1><a href="../posts/2011/février/17/article-3/" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 February 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -73,24 +73,24 @@
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="../posts/2011/February/17/article-3/">read more</a>
-<p>There are <a href="../posts/2011/February/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/février/17/article-3/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/December/02/this-is-a-super-article/" rel="bookmark"
+                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 December 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 November 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -101,20 +101,20 @@
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../posts/2010/December/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="../posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/October/20/oh-yeah/" rel="bookmark"
+                    <h1><a href="../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 October 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -131,8 +131,8 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-                <a class="readmore" href="../posts/2010/October/20/oh-yeah/">read more</a>
-<p>There are <a href="../posts/2010/October/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/octobre/20/oh-yeah/">read more</a>
+<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index a0212289..bc878499 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -33,14 +33,14 @@
                     <ol id="posts-list" class="hfeed" start="3">
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/October/15/unbelievable/" rel="bookmark"
+                    <h1><a href="../posts/2010/octobre/15/unbelievable/" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: 15 October 2010
+                Published: 15 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -49,8 +49,8 @@
 <p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../posts/2011/April/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
-<a class="reference external" href="../posts/2011/April/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+<a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
@@ -60,8 +60,8 @@
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will ...</p></div>
-                <a class="readmore" href="../posts/2010/October/15/unbelievable/">read more</a>
-<p>There are <a href="../posts/2010/October/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
+<p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
@@ -73,7 +73,7 @@ pelican.conf, it will ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 March 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index c9f61687..88560ad5 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -31,10 +31,10 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2010/October/20/oh-yeah/">Oh yeah !</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 October 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -50,7 +50,7 @@
 YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-<p>There are <a href="../posts/2010/October/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index f28c51d0..404832c8 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -31,10 +31,10 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2011/April/20/a-markdown-powered-article/">A markdown powered article</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: 20 April 2011
+                Published: 20 avril 2011
         </abbr>
 
         <address class="vcard author">
@@ -43,8 +43,8 @@
 <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="../posts/2010/October/15/unbelievable/">a root-relative link to unbelievable</a>
-<a href="../posts/2010/October/15/unbelievable/">a file-relative link to unbelievable</a></p><p>There are <a href="../posts/2011/April/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </article>
+<p><a href="../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
+<a href="../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p><p>There are <a href="../posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -53,14 +53,14 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/February/17/article-1/" rel="bookmark"
+                    <h1><a href="../posts/2011/février/17/article-1/" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 February 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -70,20 +70,20 @@
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="../posts/2011/February/17/article-1/">read more</a>
-<p>There are <a href="../posts/2011/February/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/février/17/article-1/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/February/17/article-2/" rel="bookmark"
+                    <h1><a href="../posts/2011/février/17/article-2/" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 February 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -93,20 +93,20 @@
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="../posts/2011/February/17/article-2/">read more</a>
-<p>There are <a href="../posts/2011/February/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/février/17/article-2/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2011/February/17/article-3/" rel="bookmark"
+                    <h1><a href="../posts/2011/février/17/article-3/" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 February 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -116,8 +116,8 @@
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="../posts/2011/February/17/article-3/">read more</a>
-<p>There are <a href="../posts/2011/February/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2011/février/17/article-3/">read more</a>
+<p>There are <a href="../posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 20a88582..2805b745 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -31,10 +31,10 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2012/November/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: 30 November 2012
+                Published: 30 novembre 2012
         </abbr>
 
         <address class="vcard author">
@@ -43,7 +43,7 @@
 <p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="../posts/2012/November/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -52,14 +52,14 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2012/February/29/second-article/" rel="bookmark"
+                    <h1><a href="../posts/2012/février/29/second-article/" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 February 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -71,20 +71,20 @@
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="../posts/2012/February/29/second-article/">read more</a>
-<p>There are <a href="../posts/2012/February/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2012/février/29/second-article/">read more</a>
+<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/October/15/unbelievable/" rel="bookmark"
+                    <h1><a href="../posts/2010/octobre/15/unbelievable/" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: 15 October 2010
+                Published: 15 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -93,8 +93,8 @@
 <p>In <a href="../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../posts/2011/April/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
-<a class="reference external" href="../posts/2011/April/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+<a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
@@ -104,8 +104,8 @@
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will ...</p></div>
-                <a class="readmore" href="../posts/2010/October/15/unbelievable/">read more</a>
-<p>There are <a href="../posts/2010/October/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
+<p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
@@ -117,7 +117,7 @@ pelican.conf, it will ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 March 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 9a7cc1d3..fe41a881 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -31,14 +31,14 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2010/December/02/this-is-a-super-article/">This is a super article !</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 December 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 November 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -58,7 +58,7 @@
 </pre>
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
-<p>There are <a href="../posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 473fa108..1065b096 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01+01:00">
-                Published: 02 March 2012
+                Published: 02 mars 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 280f72d3..c569be45 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,15 +18,15 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index f2345911..ee3dc399 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,15 +18,15 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index a36dabae..d84f2714 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,15 +18,15 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index e9a97ef1..bbdf3415 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,15 +20,15 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index 31c444dc..2ebaf4c0 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,15 +20,15 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index 13a5cde2..02fae916 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
index 4426eb6a..96074958 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/October/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/October/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index 54d382c4..96f70900 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/February/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
index 4f3b12f5..b78f51cc 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/April/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/February/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/February/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index d66c5146..cf933369 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/February/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/October/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index 88bffff3..698d227c 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/November/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/November/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/February/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/February/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/October/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
-&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
-&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/April/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
 &lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/October/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index 5f7d8c4f..a8dbb270 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index 50c5803c..379d1b93 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/December/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/December/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 30cca9d6..5cdab476 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -31,10 +31,10 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="./posts/2012/November/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+                    <h1 class="entry-title"><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: 30 November 2012
+                Published: 30 novembre 2012
         </abbr>
 
         <address class="vcard author">
@@ -43,7 +43,7 @@
 <p>In <a href="./category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="./posts/2012/November/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="./posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -52,14 +52,14 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2012/February/29/second-article/" rel="bookmark"
+                    <h1><a href="./posts/2012/février/29/second-article/" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 February 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -71,20 +71,20 @@
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="./posts/2012/February/29/second-article/">read more</a>
-<p>There are <a href="./posts/2012/February/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2012/février/29/second-article/">read more</a>
+<p>There are <a href="./posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2011/April/20/a-markdown-powered-article/" rel="bookmark"
+                    <h1><a href="./posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
                            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: 20 April 2011
+                Published: 20 avril 2011
         </abbr>
 
         <address class="vcard author">
@@ -93,22 +93,22 @@
 <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="./posts/2010/October/15/unbelievable/">a root-relative link to unbelievable</a>
-<a href="./posts/2010/October/15/unbelievable/">a file-relative link to unbelievable</a></p>
-                <a class="readmore" href="./posts/2011/April/20/a-markdown-powered-article/">read more</a>
-<p>There are <a href="./posts/2011/April/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p><a href="./posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
+<a href="./posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
+                <a class="readmore" href="./posts/2011/avril/20/a-markdown-powered-article/">read more</a>
+<p>There are <a href="./posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2011/February/17/article-1/" rel="bookmark"
+                    <h1><a href="./posts/2011/février/17/article-1/" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 February 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -118,8 +118,8 @@
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="./posts/2011/February/17/article-1/">read more</a>
-<p>There are <a href="./posts/2011/February/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2011/février/17/article-1/">read more</a>
+<p>There are <a href="./posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 208f0972..99af0346 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -33,14 +33,14 @@
                     <ol id="posts-list" class="hfeed" start="3">
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2011/February/17/article-2/" rel="bookmark"
+                    <h1><a href="./posts/2011/février/17/article-2/" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 February 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -50,20 +50,20 @@
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="./posts/2011/February/17/article-2/">read more</a>
-<p>There are <a href="./posts/2011/February/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2011/février/17/article-2/">read more</a>
+<p>There are <a href="./posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2011/February/17/article-3/" rel="bookmark"
+                    <h1><a href="./posts/2011/février/17/article-3/" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 February 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -73,24 +73,24 @@
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="./posts/2011/February/17/article-3/">read more</a>
-<p>There are <a href="./posts/2011/February/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2011/février/17/article-3/">read more</a>
+<p>There are <a href="./posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2010/December/02/this-is-a-super-article/" rel="bookmark"
+                    <h1><a href="./posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 December 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 November 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -101,20 +101,20 @@
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="./posts/2010/December/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="./posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="./posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2010/October/20/oh-yeah/" rel="bookmark"
+                    <h1><a href="./posts/2010/octobre/20/oh-yeah/" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 October 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -131,8 +131,8 @@ YEAH !</p>
 <img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-                <a class="readmore" href="./posts/2010/October/20/oh-yeah/">read more</a>
-<p>There are <a href="./posts/2010/October/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2010/octobre/20/oh-yeah/">read more</a>
+<p>There are <a href="./posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index c0c5a00f..fbb30f63 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -33,14 +33,14 @@
                     <ol id="posts-list" class="hfeed" start="3">
             <li><article class="hentry">
                 <header>
-                    <h1><a href="./posts/2010/October/15/unbelievable/" rel="bookmark"
+                    <h1><a href="./posts/2010/octobre/15/unbelievable/" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: 15 October 2010
+                Published: 15 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -49,8 +49,8 @@
 <p>In <a href="./category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="./posts/2011/April/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
-<a class="reference external" href="./posts/2011/April/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+<p><a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+<a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
@@ -60,8 +60,8 @@
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will ...</p></div>
-                <a class="readmore" href="./posts/2010/October/15/unbelievable/">read more</a>
-<p>There are <a href="./posts/2010/October/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="./posts/2010/octobre/15/unbelievable/">read more</a>
+<p>There are <a href="./posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
@@ -73,7 +73,7 @@ pelican.conf, it will ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 March 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 2fe492f4..a8cc93c3 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01+01:00">
-                Published: 02 March 2012
+                Published: 02 mars 2012
         </abbr>
 
         <address class="vcard author">
@@ -47,7 +47,7 @@
         </address>
 <p>In <a href="./category/misc.html">misc</a>.</p>
 Translations:
-        <a href="./posts/2010/October/20/oh-yeah/">en</a>
+        <a href="./posts/2010/octobre/20/oh-yeah/">en</a>
 
 </footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
 
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index b7018b64..5f7f87a7 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -49,7 +49,7 @@
         <address class="vcard author">
                 By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../../../../../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../../../../../category/yeah.html">yeah</a>.</p>
 <p>tags: <a href="../../../../../tag/foo.html">foo</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/foobar.html">foobar</a> </p>
 </footer><!-- /.post-info -->      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -126,4 +126,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index aef30c22..887af3be 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -45,27 +45,27 @@
         <address class="vcard author">
                 By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../../../../../category/misc.html">misc</a>. </p>
+<p>In <a href="../../../../../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
 <a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.</p>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table><p>Lovely.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
@@ -76,7 +76,7 @@ pelican.conf, it will have nothing in default.</p>
 <div class="section" id="testing-overriding-config-defaults">
 <h2>Testing overriding config defaults</h2>
 <p>Even if the default is line numbers, we can override it here</p>
-<div class="highlight"><pre><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 <p>Lovely.</p>
 </div>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index 3ec06207..c687f8bf 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -45,7 +45,7 @@
         <address class="vcard author">
                 By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../../../../../category/bar.html">bar</a>. </p>
+<p>In <a href="../../../../../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../../../../../tag/oh.html">oh</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/yeah.html">yeah</a> </p>Translations:
         <a href="../../../../../oh-yeah-fr.html">fr</a>
 
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 81421b37..4d61759a 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -45,7 +45,7 @@
         <address class="vcard author">
                 By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../../../../../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
 <p><a href="../../../../../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index 64bab330..c35090b9 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -45,7 +45,7 @@
         <address class="vcard author">
                 By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../../../../../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Article 1</p>
 
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index 60de5faa..6fe34cc9 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -45,7 +45,7 @@
         <address class="vcard author">
                 By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../../../../../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Article 2</p>
 
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index 13aa5797..e2195f64 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -45,7 +45,7 @@
         <address class="vcard author">
                 By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../../../../../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Article 3</p>
 
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 9608314f..608a44ef 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -45,7 +45,7 @@
         <address class="vcard author">
                 By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../../../../../category/misc.html">misc</a>. </p>
+<p>In <a href="../../../../../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../../../../../tag/foo.html">foo</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/baz.html">baz</a> </p>Translations:
         <a href="../../../../../second-article-fr.html">fr</a>
 
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 9b3df468..1d80b9f6 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -45,7 +45,7 @@
         <address class="vcard author">
                 By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-<p>In <a href="../../../../../category/misc.html">misc</a>. </p>
+<p>In <a href="../../../../../category/misc.html">misc</a>.</p>
 
 </footer><!-- /.post-info -->      <p>Some cool stuff!</p>
 
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 198b9216..c25f6dbb 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 February 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -47,7 +47,7 @@
         </address>
 <p>In <a href="./category/misc.html">misc</a>.</p>
 <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./posts/2012/February/29/second-article/">en</a>
+        <a href="./posts/2012/février/29/second-article/">en</a>
 
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index 03b101ae..87ef2c91 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -31,10 +31,10 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2012/February/29/second-article/">Second article</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 February 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -45,7 +45,7 @@
         <a href="../second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../posts/2012/February/29/second-article/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -54,18 +54,18 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/December/02/this-is-a-super-article/" rel="bookmark"
+                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 December 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 November 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -76,20 +76,20 @@
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../posts/2010/December/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="../posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/October/20/oh-yeah/" rel="bookmark"
+                    <h1><a href="../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 October 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -106,8 +106,8 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
-                <a class="readmore" href="../posts/2010/October/20/oh-yeah/">read more</a>
-<p>There are <a href="../posts/2010/October/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/octobre/20/oh-yeah/">read more</a>
+<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 27e0b301..50bf7583 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 March 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 0f253ae7..7f27c594 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -31,10 +31,10 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2012/February/29/second-article/">Second article</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 February 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -45,7 +45,7 @@
         <a href="../second-article-fr.html">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../posts/2012/February/29/second-article/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
                 <section id="content" class="body">
                     <h1>Other articles</h1>
@@ -54,18 +54,18 @@
 
             <li><article class="hentry">
                 <header>
-                    <h1><a href="../posts/2010/December/02/this-is-a-super-article/" rel="bookmark"
+                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
 
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 December 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 November 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -76,8 +76,8 @@
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../posts/2010/December/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="../posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 5e6623e5..3158cfda 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -31,14 +31,14 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2010/December/02/this-is-a-super-article/">This is a super article !</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 December 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 November 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -58,7 +58,7 @@
 </pre>
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
-<p>There are <a href="../posts/2010/December/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 3cf43840..bd12fa0c 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -31,10 +31,10 @@
 
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="../posts/2010/October/20/oh-yeah/">Oh yeah !</a></h1>
+                    <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 October 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -50,7 +50,7 @@
 YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
-<p>There are <a href="../posts/2010/October/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
+<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
             </aside><!-- /#featured -->
         <section id="extras" class="body">
                 <div class="blogroll">

From cff4db6e7ca3414ed69c1227a939431386a3a0c1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 19 Feb 2016 13:00:12 -0800
Subject: [PATCH 1866/2864] English and French locales must be installed

Clarifies our Contributing docs to ensure these two locales are present,
since they are required when updating functional test output.
---
 docs/contribute.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 2962ddb1..eae13225 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -76,7 +76,8 @@ mentioning that "some generated files differ from the expected functional tests
 output." If you have made changes that affect the HTML output generated by
 Pelican, and the changes to that output are expected and deemed correct given
 the nature of your changes, then you should update the output used by the
-functional tests. To do so, you can use the following two commands::
+functional tests. To do so, **make sure you have both ``en_EN.utf8`` and
+``fr_FR.utf8`` locales installed**, and then run the following two commands::
 
     $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/custom/ \
         -s samples/pelican.conf.py samples/content/

From 123fd0b65a715b2d4b86e0a3361df90f97163217 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 19 Feb 2016 13:21:26 -0800
Subject: [PATCH 1867/2864] Fix Typogrify test issue caused by Pygments update

---
 pelican/tests/test_readers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index ad73a58b..566ef241 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -298,7 +298,7 @@ class RstReaderTest(ReaderTest):
                                   TYPOGRIFY=True)
 
             expected = ('<p>An article with some&nbsp;code</p>\n'
-                        '<div class="highlight"><pre><span class="n">x</span>'
+                        '<div class="highlight"><pre><span></span><span class="n">x</span>'
                         ' <span class="o">&amp;</span>'
                         ' <span class="n">y</span>\n</pre></div>\n'
                         '<p>A block&nbsp;quote:</p>\n<blockquote>\nx '
@@ -316,7 +316,7 @@ class RstReaderTest(ReaderTest):
                                   TYPOGRIFY_IGNORE_TAGS=['blockquote'])
 
             expected = ('<p>An article with some&nbsp;code</p>\n'
-                        '<div class="highlight"><pre><span class="n">x</span>'
+                        '<div class="highlight"><pre><span></span><span class="n">x</span>'
                         ' <span class="o">&amp;</span>'
                         ' <span class="n">y</span>\n</pre></div>\n'
                         '<p>A block&nbsp;quote:</p>\n<blockquote>\nx '

From 14694c8357f8c2e387f7c7b4da6f6a650287e974 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 19 Feb 2016 13:29:41 -0800
Subject: [PATCH 1868/2864] Make Flake8 happy

Note to self: pre-commit hooks really are helpful
---
 pelican/tests/test_readers.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 566ef241..3bfca33a 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -298,7 +298,8 @@ class RstReaderTest(ReaderTest):
                                   TYPOGRIFY=True)
 
             expected = ('<p>An article with some&nbsp;code</p>\n'
-                        '<div class="highlight"><pre><span></span><span class="n">x</span>'
+                        '<div class="highlight"><pre><span></span>'
+                        '<span class="n">x</span>'
                         ' <span class="o">&amp;</span>'
                         ' <span class="n">y</span>\n</pre></div>\n'
                         '<p>A block&nbsp;quote:</p>\n<blockquote>\nx '
@@ -316,7 +317,8 @@ class RstReaderTest(ReaderTest):
                                   TYPOGRIFY_IGNORE_TAGS=['blockquote'])
 
             expected = ('<p>An article with some&nbsp;code</p>\n'
-                        '<div class="highlight"><pre><span></span><span class="n">x</span>'
+                        '<div class="highlight"><pre><span>'
+                        '</span><span class="n">x</span>'
                         ' <span class="o">&amp;</span>'
                         ' <span class="n">y</span>\n</pre></div>\n'
                         '<p>A block&nbsp;quote:</p>\n<blockquote>\nx '

From c360aebec3569c2893554782b951fba6bcbb70b1 Mon Sep 17 00:00:00 2001
From: Pierce Lopez <pierce.lopez@gmail.com>
Date: Fri, 19 Feb 2016 18:26:23 -0500
Subject: [PATCH 1869/2864] fix Installing/"Kickstart your site" heading level

"Kickstart your site" should not be a sub-heading of "Upgrading"
---
 docs/install.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/install.rst b/docs/install.rst
index 6c77342a..f163f180 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -87,7 +87,7 @@ If you installed Pelican via distutils or the bleeding-edge method, simply
 perform the same step to install the most recent version.
 
 Kickstart your site
-===================
+-------------------
 
 Once Pelican has been installed, you can create a skeleton project via the
 ``pelican-quickstart`` command, which begins by asking some questions about

From f864dd832c455cff9fbc614c73de9fbc2c30205b Mon Sep 17 00:00:00 2001
From: Daniel Himmelstein <daniel.himmelstein@gmail.com>
Date: Thu, 18 Feb 2016 21:43:51 -0800
Subject: [PATCH 1870/2864] =?UTF-8?q?Change=20...=20(periods)=20to=20?=
 =?UTF-8?q?=E2=80=A6=20(ellipsis)=20in=20summary?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also update HTML output by running (after making sure to have the fr_FR.utf8
locale installed):

```sh
LC_ALL=en_US.utf8 pelican -o pelican/tests/output/custom/ -s samples/pelican.conf.py samples/content/
LC_ALL=fr_FR.utf8 pelican -o pelican/tests/output/custom_locale/ -s samples/pelican.conf_FR.py samples/content/
LC_ALL=en_US.utf8 pelican -o pelican/tests/output/basic/ samples/content/
```
as described at
http://docs.getpelican.com/en/3.6.3/contribute.html#running-the-test-suite
---
 pelican/tests/output/basic/category/misc.html |  2 +-
 pelican/tests/output/basic/index.html         |  2 +-
 .../custom/author/alexis-metaireau3.html      |  2 +-
 .../tests/output/custom/category/misc.html    |  2 +-
 pelican/tests/output/custom/index3.html       |  2 +-
 .../author/alexis-metaireau3.html             |  2 +-
 .../output/custom_locale/category/misc.html   |  2 +-
 .../tests/output/custom_locale/index3.html    |  2 +-
 pelican/tests/test_utils.py                   | 34 +++++++++----------
 pelican/utils.py                              |  4 +--
 10 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 197ee1d5..0ad46b6c 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -90,7 +90,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will ...</p></div>
+pelican.conf, it will …</p></div>
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 272ad852..f6d1c7bf 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -227,7 +227,7 @@ YEAH !</p>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will ...</p></div>
+pelican.conf, it will …</p></div>
                 <a class="readmore" href="/unbelievable.html">read more</a>
                 </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index e53c27ef..e8322d4d 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -59,7 +59,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will ...</p></div>
+pelican.conf, it will …</p></div>
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index c798ebac..1cd34ee9 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -103,7 +103,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will ...</p></div>
+pelican.conf, it will …</p></div>
                 <a class="readmore" href="../unbelievable.html">read more</a>
 <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index ff54fa4c..33d6c193 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -59,7 +59,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will ...</p></div>
+pelican.conf, it will …</p></div>
                 <a class="readmore" href="./unbelievable.html">read more</a>
 <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index bc878499..93a3f6cc 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -59,7 +59,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will ...</p></div>
+pelican.conf, it will …</p></div>
                 <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
 <p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 2805b745..8ef1af55 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -103,7 +103,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will ...</p></div>
+pelican.conf, it will …</p></div>
                 <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
 <p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index fbb30f63..217e97a4 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -59,7 +59,7 @@
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will ...</p></div>
+pelican.conf, it will …</p></div>
                 <a class="readmore" href="./posts/2010/octobre/15/unbelievable/">read more</a>
 <p>There are <a href="./posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index d967b247..fed7e94b 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -152,56 +152,56 @@ class TestUtils(LoggedTestCase):
             'short string')
         self.assertEqual(
             utils.truncate_html_words('word ' * 100, 20),
-            'word ' * 20 + '...')
+            'word ' * 20 + '…')
 
         # Words enclosed or intervaled by HTML tags.
         self.assertEqual(
             utils.truncate_html_words('<p>' + 'word ' * 100 + '</p>', 20),
-            '<p>' + 'word ' * 20 + '...</p>')
+            '<p>' + 'word ' * 20 + '…</p>')
         self.assertEqual(
             utils.truncate_html_words(
-                '<span\nstyle="\n...\n">' + 'word ' * 100 + '</span>', 20),
-            '<span\nstyle="\n...\n">' + 'word ' * 20 + '...</span>')
+                '<span\nstyle="\n…\n">' + 'word ' * 100 + '</span>', 20),
+            '<span\nstyle="\n…\n">' + 'word ' * 20 + '…</span>')
         self.assertEqual(
             utils.truncate_html_words('<br>' + 'word ' * 100, 20),
-            '<br>' + 'word ' * 20 + '...')
+            '<br>' + 'word ' * 20 + '…')
         self.assertEqual(
             utils.truncate_html_words('<!-- comment -->' + 'word ' * 100, 20),
-            '<!-- comment -->' + 'word ' * 20 + '...')
+            '<!-- comment -->' + 'word ' * 20 + '…')
 
         # Words with hypens and apostrophes.
         self.assertEqual(
             utils.truncate_html_words("a-b " * 100, 20),
-            "a-b " * 20 + '...')
+            "a-b " * 20 + '…')
         self.assertEqual(
             utils.truncate_html_words("it's " * 100, 20),
-            "it's " * 20 + '...')
+            "it's " * 20 + '…')
 
         # Words with HTML entity references.
         self.assertEqual(
             utils.truncate_html_words("&eacute; " * 100, 20),
-            "&eacute; " * 20 + '...')
+            "&eacute; " * 20 + '…')
         self.assertEqual(
             utils.truncate_html_words("caf&eacute; " * 100, 20),
-            "caf&eacute; " * 20 + '...')
+            "caf&eacute; " * 20 + '…')
         self.assertEqual(
             utils.truncate_html_words("&egrave;lite " * 100, 20),
-            "&egrave;lite " * 20 + '...')
+            "&egrave;lite " * 20 + '…')
         self.assertEqual(
             utils.truncate_html_words("cafeti&eacute;re " * 100, 20),
-            "cafeti&eacute;re " * 20 + '...')
+            "cafeti&eacute;re " * 20 + '…')
         self.assertEqual(
             utils.truncate_html_words("&int;dx " * 100, 20),
-            "&int;dx " * 20 + '...')
+            "&int;dx " * 20 + '…')
 
         # Words with HTML character references inside and outside
         # the ASCII range.
         self.assertEqual(
             utils.truncate_html_words("&#xe9; " * 100, 20),
-            "&#xe9; " * 20 + '...')
+            "&#xe9; " * 20 + '…')
         self.assertEqual(
             utils.truncate_html_words("&#x222b;dx " * 100, 20),
-            "&#x222b;dx " * 20 + '...')
+            "&#x222b;dx " * 20 + '…')
 
     def test_process_translations(self):
         # create a bunch of articles
@@ -378,7 +378,7 @@ class TestUtils(LoggedTestCase):
             utils.strftime(d, 'Yayınlanma tarihi: %A, %d %B %Y'),
             'Yayınlanma tarihi: Çarşamba, 29 Ağustos 2012')
 
-        # non-ascii format candidate (someone might pass it... for some reason)
+        # non-ascii format candidate (someone might pass it… for some reason)
         self.assertEqual(
             utils.strftime(d, '%Y yılında %üretim artışı'),
             '2012 yılında %üretim artışı')
@@ -413,7 +413,7 @@ class TestUtils(LoggedTestCase):
             utils.strftime(d, 'Écrit le %d %B %Y'),
             'Écrit le 29 août 2012')
 
-        # non-ascii format candidate (someone might pass it... for some reason)
+        # non-ascii format candidate (someone might pass it… for some reason)
         self.assertEqual(
             utils.strftime(d, '%écrits en %Y'),
             '%écrits en 2012')
diff --git a/pelican/utils.py b/pelican/utils.py
index d2e896c6..b5685a3b 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -531,12 +531,12 @@ class _HTMLWordTruncator(HTMLParser):
         self.handle_ref(six.unichr(codepoint))
 
 
-def truncate_html_words(s, num, end_text='...'):
+def truncate_html_words(s, num, end_text='…'):
     """Truncates HTML to a certain number of words.
 
     (not counting tags and comments). Closes opened tags if they were correctly
     closed in the given html. Takes an optional argument of what should be used
-    to notify that the string has been truncated, defaulting to ellipsis (...).
+    to notify that the string has been truncated, defaulting to ellipsis (…).
 
     Newlines in the HTML are preserved. (From the django framework).
     """

From 3857145754a71986a202e930d1f7fad4e21bb06f Mon Sep 17 00:00:00 2001
From: Jangsea Park <jangsea.park@gmail.com>
Date: Wed, 2 Mar 2016 20:48:11 +0900
Subject: [PATCH 1871/2864] Import env.github_pages_branch from quickstart
 question

---
 pelican/tools/templates/fabfile.py.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.in
index bcc66f6a..370b4b78 100644
--- a/pelican/tools/templates/fabfile.py.in
+++ b/pelican/tools/templates/fabfile.py.in
@@ -21,7 +21,7 @@ env.cloudfiles_api_key = '$cloudfiles_api_key'
 env.cloudfiles_container = '$cloudfiles_container'
 
 # Github Pages configuration
-env.github_pages_branch = "gh-pages"
+env.github_pages_branch = "$github_pages_branch"
 
 # Port for `serve`
 PORT = 8000

From 23ab0f1ae184c7cc5f31251efd3da6cc9d33cedb Mon Sep 17 00:00:00 2001
From: Jangsea Park <jangsea.park@gmail.com>
Date: Thu, 3 Mar 2016 15:11:58 +0900
Subject: [PATCH 1872/2864] Delete 'git push origin' and use 'ghp-import -p',
 push option

---
 pelican/tools/templates/fabfile.py.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.in
index bcc66f6a..27cda566 100644
--- a/pelican/tools/templates/fabfile.py.in
+++ b/pelican/tools/templates/fabfile.py.in
@@ -90,5 +90,4 @@ def publish():
 def gh_pages():
     """Publish to GitHub Pages"""
     rebuild()
-    local("ghp-import -b {github_pages_branch} {deploy_path}".format(**env))
-    local("git push origin {github_pages_branch}".format(**env))
+    local("ghp-import -b {github_pages_branch} {deploy_path} -p".format(**env))

From 23c3a7c7f640ebebbbb93823f903523df874b021 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Sun, 20 Mar 2016 16:44:44 -0700
Subject: [PATCH 1873/2864] Remove Coveralls badge from README

Coveralls integration was removed in #1919.
---
 README.rst | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index f8b62732..a6341413 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-Pelican |build-status| |coverage-status| |pypi-version| |pypi-downloads|
-========================================================================
+Pelican |build-status| |pypi-version| |pypi-downloads|
+======================================================
 
 Pelican is a static site generator, written in Python_.
 
@@ -59,9 +59,6 @@ Why the name "Pelican"?
 .. |build-status| image:: https://img.shields.io/travis/getpelican/pelican/master.svg
    :target: https://travis-ci.org/getpelican/pelican
    :alt: Travis CI: continuous integration status
-.. |coverage-status| image:: https://img.shields.io/coveralls/getpelican/pelican.svg
-   :target: https://coveralls.io/r/getpelican/pelican
-   :alt: Coveralls: code coverage status
 .. |pypi-version| image:: https://img.shields.io/pypi/v/pelican.svg
    :target: https://pypi.python.org/pypi/pelican
    :alt: PyPI: the Python Package Index

From 648165b839fe9562822fa843cbdbfe224b12dfbd Mon Sep 17 00:00:00 2001
From: "Mr. Senko" <atodorov@mrsenko.com>
Date: Mon, 14 Mar 2016 00:16:58 +0200
Subject: [PATCH 1874/2864] More granular control of tags and categories slugs.
 Fixes #1873

- add TAG_SUBSTITUTIONS AND CATEGORY_SUBSTITURIONS settings
- make slugify keep non-alphanumeric characters if configured
---
 docs/changelog.rst                |  9 ++++++++-
 docs/settings.rst                 | 22 ++++++++++++++++++++--
 pelican/contents.py               |  1 +
 pelican/tests/test_contents.py    | 25 ++++++++++++++++++++++++-
 pelican/tests/test_urlwrappers.py | 15 +++++++++++++++
 pelican/tests/test_utils.py       | 12 ++++++++++++
 pelican/urlwrappers.py            | 17 ++++++++++++++++-
 pelican/utils.py                  | 30 +++++++++++++++++++++++++++---
 8 files changed, 123 insertions(+), 8 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f52d6449..315a6b2b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,14 @@ Release history
 Next release
 ============
 
-- Nothing yet
+* ``SLUG_SUBSTITUTIONS`` now accepts 3-tuple elements, allowing to keep
+  non-alphanum characters. Existing 2-tuple configurations will continue to work
+  without change in behavior. The new 3rd parameter has side effects when there
+  are multiple substitutions defined. Plese see the docs.
+* Tag and category slugs can be controlled with greater precision using the
+  ``TAG_SUBSTITUTIONS`` and ``CATEGORY_SUBSTITUTIONS`` settings. These also
+  allow for keeping non-alphanum characters for backward compatibility with
+  existing URLs.
 
 3.6.3 (2015-08-14)
 ==================
diff --git a/docs/settings.rst b/docs/settings.rst
index 0adda992..3a8511bc 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -306,8 +306,12 @@ Setting name (followed by default value, if any)        What does it do?
 ``DAY_ARCHIVE_SAVE_AS = ''``                            The location to save per-day archives of your posts.
 ``SLUG_SUBSTITUTIONS = ()``                             Substitutions to make prior to stripping out
                                                         non-alphanumerics when generating slugs. Specified
-                                                        as a list of 2-tuples of ``(from, to)`` which are
-                                                        applied in order.
+                                                        as a list of 3-tuples of ``(from, to, skip)`` which are
+                                                        applied in order. ``skip`` is a boolean indicating whether
+                                                        or not to skip replacement of non-alphanumeric characters.
+                                                        Useful for backward compatibility with existing URLs.
+``CATEGORY_SUBSTITUTIONS = ()``                         Added to ``SLUG_SUBSTITUTIONS`` for categories.
+``TAG_SUBSTITUTIONS = ()``                              Added to ``SLUG_SUBSTITUTIONS`` for tags.
 ======================================================  ==============================================================
 
 .. note::
@@ -317,6 +321,20 @@ Setting name (followed by default value, if any)        What does it do?
     set the corresponding ``*_SAVE_AS`` setting to ``''`` to prevent the
     relevant page from being generated.
 
+.. note::
+
+    Substitutions are applied in order with the side effect that keeping
+    non-alphanum characters applies to the whole string when a replacement
+    is made. For example if you have the following setting
+    ``SLUG_SUBSTITUTIONS = (('C++', 'cpp'), ('keep dot', 'keep.dot', True))``
+    the string ``Keep Dot`` will be converted to ``keep.dot``, however
+    ``C++ will keep dot`` will be converted to ``cpp will keep.dot`` instead
+    of ``cpp-will-keep.dot``!
+    
+    If you want to keep non-alphanum characters only for tags or categories
+    but not other slugs then configure ``TAG_SUBSTITUTIONS`` and
+    ``CATEGORY_SUBSTITUTIONS`` respectively!
+
 Pelican can optionally create per-year, per-month, and per-day archives of your
 posts. These secondary archives are disabled by default but are automatically
 enabled if you supply format strings for their respective ``_SAVE_AS`` settings.
diff --git a/pelican/contents.py b/pelican/contents.py
index 0123384a..9b6aa971 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -172,6 +172,7 @@ class Content(object):
             'lang': getattr(self, 'lang', 'en'),
             'date': getattr(self, 'date', SafeDatetime.now()),
             'author': self.author.slug if hasattr(self, 'author') else '',
+            'tag': self.tag.slug if hasattr(self, 'tag') else '',
             'category': self.category.slug if hasattr(self, 'category') else ''
         })
         return metadata
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 6f0f6dd9..d62d0ed6 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -11,7 +11,7 @@ from jinja2.utils import generate_lorem_ipsum
 
 import six
 
-from pelican.contents import Article, Author, Category, Page, Static
+from pelican.contents import Article, Author, Category, Page, Static, Tag
 from pelican.settings import DEFAULT_CONFIG
 from pelican.signals import content_object_init
 from pelican.tests.support import LoggedTestCase, get_settings, unittest
@@ -457,6 +457,29 @@ class TestArticle(TestPage):
         self.assertEqual(
             article.save_as, 'obrien/csharp-stuff/fnord/index.html')
 
+    def test_slugify_category_with_dots(self):
+        settings = get_settings()
+        settings['CATEGORY_SUBSTITUTIONS'] = [('Fedora QA', 'fedora.qa', True)]
+        settings['ARTICLE_URL'] = '{category}/{slug}/'
+        article_kwargs = self._copy_page_kwargs()
+        article_kwargs['metadata']['category'] = Category('Fedora QA',
+                                                          settings)
+        article_kwargs['metadata']['title'] = 'This Week in Fedora QA'
+        article_kwargs['settings'] = settings
+        article = Article(**article_kwargs)
+        self.assertEqual(article.url, 'fedora.qa/this-week-in-fedora-qa/')
+
+    def test_slugify_tags_with_dots(self):
+        settings = get_settings()
+        settings['TAG_SUBSTITUTIONS'] = [('Fedora QA', 'fedora.qa', True)]
+        settings['ARTICLE_URL'] = '{tag}/{slug}/'
+        article_kwargs = self._copy_page_kwargs()
+        article_kwargs['metadata']['tag'] = Tag('Fedora QA', settings)
+        article_kwargs['metadata']['title'] = 'This Week in Fedora QA'
+        article_kwargs['settings'] = settings
+        article = Article(**article_kwargs)
+        self.assertEqual(article.url, 'fedora.qa/this-week-in-fedora-qa/')
+
 
 class TestStatic(LoggedTestCase):
 
diff --git a/pelican/tests/test_urlwrappers.py b/pelican/tests/test_urlwrappers.py
index f3dc8198..db194776 100644
--- a/pelican/tests/test_urlwrappers.py
+++ b/pelican/tests/test_urlwrappers.py
@@ -56,3 +56,18 @@ class TestURLWrapper(unittest.TestCase):
 
         cat_ascii = Category('指導書', settings={})
         self.assertEqual(cat_ascii, u'zhi-dao-shu')
+
+    def test_slugify_with_substitutions_and_dots(self):
+        tag = Tag('Tag Dot',
+                  settings={
+                        'TAG_SUBSTITUTIONS': [('Tag Dot', 'tag.dot', True)]
+                    })
+        cat = Category('Category Dot',
+                       settings={
+                        'CATEGORY_SUBSTITUTIONS': (('Category Dot',
+                                                    'cat.dot',
+                                                    True),)
+                        })
+
+        self.assertEqual(tag.slug, 'tag.dot')
+        self.assertEqual(cat.slug, 'cat.dot')
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index fed7e94b..8dfc0b9b 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -131,6 +131,18 @@ class TestUtils(LoggedTestCase):
         for value, expected in samples:
             self.assertEqual(utils.slugify(value, subs), expected)
 
+    def test_slugify_substitute_and_keeping_non_alphanum(self):
+
+        samples = (('Fedora QA', 'fedora.qa'),
+                   ('C++ is used by Fedora QA', 'cpp is used by fedora.qa'),
+                   ('C++ is based on C', 'cpp-is-based-on-c'),
+                   ('C+++ test C+ test', 'cpp-test-c-test'),)
+
+        subs = (('Fedora QA', 'fedora.qa', True),
+                ('c++', 'cpp'),)
+        for value, expected in samples:
+            self.assertEqual(utils.slugify(value, subs), expected)
+
     def test_get_relative_path(self):
 
         samples = ((os.path.join('test', 'test.html'), os.pardir),
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index bf1199a8..e56fea8f 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -112,13 +112,28 @@ class URLWrapper(object):
 
 
 class Category(URLWrapper):
-    pass
+    @property
+    def slug(self):
+        if self._slug is None:
+            substitutions = self.settings.get('SLUG_SUBSTITUTIONS', ())
+            substitutions += tuple(self.settings.get('CATEGORY_SUBSTITUTIONS',
+                                                     ()))
+            self._slug = slugify(self.name, substitutions)
+        return self._slug
 
 
 class Tag(URLWrapper):
     def __init__(self, name, *args, **kwargs):
         super(Tag, self).__init__(name.strip(), *args, **kwargs)
 
+    @property
+    def slug(self):
+        if self._slug is None:
+            substitutions = self.settings.get('SLUG_SUBSTITUTIONS', ())
+            substitutions += tuple(self.settings.get('TAG_SUBSTITUTIONS', ()))
+            self._slug = slugify(self.name, substitutions)
+        return self._slug
+
 
 class Author(URLWrapper):
     pass
diff --git a/pelican/utils.py b/pelican/utils.py
index b5685a3b..4e729361 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -270,10 +270,34 @@ def slugify(value, substitutions=()):
         value = value.decode('ascii')
     # still unicode
     value = unicodedata.normalize('NFKD', value).lower()
-    for src, dst in substitutions:
+
+    # backward compatible covert from 2-tuples to 3-tuples
+    new_subs = []
+    for tpl in substitutions:
+        try:
+            src, dst, skip = tpl
+        except ValueError:
+            src, dst = tpl
+            skip = False
+        new_subs.append((src, dst, skip))
+    substitutions = tuple(new_subs)
+
+    # by default will replace non-alphanum characters
+    replace = True
+    for src, dst, skip in substitutions:
+        orig_value = value
         value = value.replace(src.lower(), dst.lower())
-    value = re.sub('[^\w\s-]', '', value).strip()
-    value = re.sub('[-\s]+', '-', value)
+        # if replacement was made then skip non-alphanum
+        # replacement if instructed to do so
+        if value != orig_value:
+            replace = replace and not skip
+
+    if replace:
+        value = re.sub('[^\w\s-]', '', value).strip()
+        value = re.sub('[-\s]+', '-', value)
+    else:
+        value = value.strip()
+
     # we want only ASCII chars
     value = value.encode('ascii', 'ignore')
     # but Pelican should generally use only unicode

From fcd4f9aa0d669b502087b77ba9a1214a16d780b7 Mon Sep 17 00:00:00 2001
From: "Mr. Senko" <atodorov@mrsenko.com>
Date: Fri, 1 Apr 2016 23:01:57 +0300
Subject: [PATCH 1875/2864] Add AUTHOR_SUBSTITUTIONS

---
 docs/changelog.rst                |  3 +++
 docs/settings.rst                 |  2 ++
 pelican/tests/test_contents.py    | 17 +++++++++++++++++
 pelican/tests/test_urlwrappers.py | 16 ++++++++++++++++
 pelican/urlwrappers.py            |  7 ++++++-
 5 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 315a6b2b..6a4d65a4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,9 @@ Next release
   ``TAG_SUBSTITUTIONS`` and ``CATEGORY_SUBSTITUTIONS`` settings. These also
   allow for keeping non-alphanum characters for backward compatibility with
   existing URLs.
+* Author slugs can be controlled with greater precision using the
+  ``AUTHOR_SUBSTITUTIONS`` setting. Keeping non-alphanum characters is supported
+  as well but discouraged.
 
 3.6.3 (2015-08-14)
 ==================
diff --git a/docs/settings.rst b/docs/settings.rst
index 3a8511bc..1de28c12 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -310,6 +310,8 @@ Setting name (followed by default value, if any)        What does it do?
                                                         applied in order. ``skip`` is a boolean indicating whether
                                                         or not to skip replacement of non-alphanumeric characters.
                                                         Useful for backward compatibility with existing URLs.
+``AUTHOR_SUBSTITUTIONS = ()``                           Substitutions for authors. ``SLUG_SUBSTITUTIONS`` is not
+                                                        taken into account here!
 ``CATEGORY_SUBSTITUTIONS = ()``                         Added to ``SLUG_SUBSTITUTIONS`` for categories.
 ``TAG_SUBSTITUTIONS = ()``                              Added to ``SLUG_SUBSTITUTIONS`` for tags.
 ======================================================  ==============================================================
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index d62d0ed6..2f774a6e 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -457,6 +457,23 @@ class TestArticle(TestPage):
         self.assertEqual(
             article.save_as, 'obrien/csharp-stuff/fnord/index.html')
 
+    def test_slugify_with_author_substitutions(self):
+        settings = get_settings()
+        settings['AUTHOR_SUBSTITUTIONS'] = [
+                                    ('Alexander Todorov', 'atodorov', False),
+                                    ('Krasimir Tsonev', 'krasimir', False),
+        ]
+        settings['ARTICLE_URL'] = 'blog/{author}/{slug}/'
+        settings['ARTICLE_SAVE_AS'] = 'blog/{author}/{slug}/index.html'
+        article_kwargs = self._copy_page_kwargs()
+        article_kwargs['metadata']['author'] = Author('Alexander Todorov',
+                                                      settings)
+        article_kwargs['metadata']['title'] = 'fnord'
+        article_kwargs['settings'] = settings
+        article = Article(**article_kwargs)
+        self.assertEqual(article.url, 'blog/atodorov/fnord/')
+        self.assertEqual(article.save_as, 'blog/atodorov/fnord/index.html')
+
     def test_slugify_category_with_dots(self):
         settings = get_settings()
         settings['CATEGORY_SUBSTITUTIONS'] = [('Fedora QA', 'fedora.qa', True)]
diff --git a/pelican/tests/test_urlwrappers.py b/pelican/tests/test_urlwrappers.py
index db194776..21a7d98f 100644
--- a/pelican/tests/test_urlwrappers.py
+++ b/pelican/tests/test_urlwrappers.py
@@ -71,3 +71,19 @@ class TestURLWrapper(unittest.TestCase):
 
         self.assertEqual(tag.slug, 'tag.dot')
         self.assertEqual(cat.slug, 'cat.dot')
+
+    def test_author_slug_substitutions(self):
+        settings = {
+            'AUTHOR_SUBSTITUTIONS': [
+                                    ('Alexander Todorov', 'atodorov', False),
+                                    ('Krasimir Tsonev', 'krasimir', False),
+            ]
+        }
+
+        author1 = Author('Mr. Senko', settings=settings)
+        author2 = Author('Alexander Todorov', settings=settings)
+        author3 = Author('Krasimir Tsonev', settings=settings)
+
+        self.assertEqual(author1.slug, 'mr-senko')
+        self.assertEqual(author2.slug, 'atodorov')
+        self.assertEqual(author3.slug, 'krasimir')
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index e56fea8f..7659471d 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -136,4 +136,9 @@ class Tag(URLWrapper):
 
 
 class Author(URLWrapper):
-    pass
+    @property
+    def slug(self):
+        if self._slug is None:
+            self._slug = slugify(self.name,
+                                 self.settings.get('AUTHOR_SUBSTITUTIONS', ()))
+        return self._slug

From e0769fe2a3b88dc92c5ff560a98d7c5bfa5792c1 Mon Sep 17 00:00:00 2001
From: Karl Dubost <karl+github@la-grange.net>
Date: Mon, 4 Apr 2016 16:53:54 +0900
Subject: [PATCH 1876/2864] Add updated date to feed using modified. Fix #1933

---
 pelican/writers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 347fa64e..b8183333 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -55,7 +55,9 @@ class Writer(object):
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', ''),
             pubdate=set_date_tzinfo(
-                item.modified if hasattr(item, 'modified') else item.date,
+                item.date, self.settings.get('TIMEZONE', None)),
+            pubdate=set_date_tzinfo(
+                item.modified if hasattr(item, 'modified') else None,
                 self.settings.get('TIMEZONE', None)))
 
     def _open_w(self, filename, encoding, override=False):

From 66410b9396bb3b0d31d54335d0bca483c8afa926 Mon Sep 17 00:00:00 2001
From: Karl Dubost <karl+github@la-grange.net>
Date: Tue, 5 Apr 2016 10:25:21 +0900
Subject: [PATCH 1877/2864] Fix typo for updated and failure for None. #1933

---
 pelican/writers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index b8183333..423fc9f3 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -56,9 +56,9 @@ class Writer(object):
             author_name=getattr(item, 'author', ''),
             pubdate=set_date_tzinfo(
                 item.date, self.settings.get('TIMEZONE', None)),
-            pubdate=set_date_tzinfo(
-                item.modified if hasattr(item, 'modified') else None,
-                self.settings.get('TIMEZONE', None)))
+            updateddate=set_date_tzinfo(
+                item.modified, self.settings.get('TIMEZONE', None)
+                ) if hasattr(item, 'modified') else None)
 
     def _open_w(self, filename, encoding, override=False):
         """Open a file to write some content to it.

From f91ea06cc55090584d76c3e84d7332d15350e3d3 Mon Sep 17 00:00:00 2001
From: Karl Dubost <karl+github@la-grange.net>
Date: Thu, 7 Apr 2016 10:27:46 +0900
Subject: [PATCH 1878/2864] Bump feedgenerator version number to 1.8 #1933

---
 .../basic/feeds/alexis-metaireau.atom.xml     |  4 +--
 .../basic/feeds/alexis-metaireau.rss.xml      |  6 ++---
 .../tests/output/basic/feeds/all-en.atom.xml  | 20 +++++++-------
 .../tests/output/basic/feeds/all-fr.atom.xml  |  2 +-
 pelican/tests/output/basic/feeds/all.atom.xml | 22 ++++++++--------
 pelican/tests/output/basic/feeds/bar.atom.xml |  2 +-
 .../tests/output/basic/feeds/cat1.atom.xml    |  8 +++---
 .../tests/output/basic/feeds/misc.atom.xml    |  8 +++---
 .../tests/output/basic/feeds/yeah.atom.xml    |  2 +-
 .../custom/feeds/alexis-metaireau.atom.xml    | 20 +++++++-------
 .../custom/feeds/alexis-metaireau.rss.xml     | 22 ++++++++--------
 .../tests/output/custom/feeds/all-en.atom.xml | 20 +++++++-------
 .../tests/output/custom/feeds/all-fr.atom.xml |  4 +--
 .../tests/output/custom/feeds/all.atom.xml    | 24 ++++++++---------
 pelican/tests/output/custom/feeds/all.rss.xml | 26 +++++++++----------
 .../tests/output/custom/feeds/bar.atom.xml    |  2 +-
 pelican/tests/output/custom/feeds/bar.rss.xml |  4 +--
 .../tests/output/custom/feeds/cat1.atom.xml   |  8 +++---
 .../tests/output/custom/feeds/cat1.rss.xml    | 10 +++----
 .../tests/output/custom/feeds/misc.atom.xml   |  8 +++---
 .../tests/output/custom/feeds/misc.rss.xml    | 10 +++----
 .../tests/output/custom/feeds/yeah.atom.xml   |  2 +-
 .../tests/output/custom/feeds/yeah.rss.xml    |  4 +--
 .../feeds/alexis-metaireau.atom.xml           | 20 +++++++-------
 .../feeds/alexis-metaireau.rss.xml            | 22 ++++++++--------
 .../custom_locale/feeds/all-en.atom.xml       | 20 +++++++-------
 .../custom_locale/feeds/all-fr.atom.xml       |  4 +--
 .../output/custom_locale/feeds/all.atom.xml   | 24 ++++++++---------
 .../output/custom_locale/feeds/all.rss.xml    | 26 +++++++++----------
 .../output/custom_locale/feeds/bar.atom.xml   |  2 +-
 .../output/custom_locale/feeds/bar.rss.xml    |  4 +--
 .../output/custom_locale/feeds/cat1.atom.xml  |  8 +++---
 .../output/custom_locale/feeds/cat1.rss.xml   | 10 +++----
 .../output/custom_locale/feeds/misc.atom.xml  |  8 +++---
 .../output/custom_locale/feeds/misc.rss.xml   | 10 +++----
 .../output/custom_locale/feeds/yeah.atom.xml  |  2 +-
 .../output/custom_locale/feeds/yeah.rss.xml   |  4 +--
 setup.py                                      |  2 +-
 38 files changed, 202 insertions(+), 202 deletions(-)

diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index e2f76a2b..7593ac2c 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,7 +11,7 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index 91daa535..77c80807 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>A Pelican Blog</title><link>/</link><description></description><atom:link href="/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0"><channel><title>A Pelican Blog</title><link>/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,10 +11,10 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0000</pubDate><guid>tag:,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid>tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index a281653c..56258af5 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index 5a41b7db..250feb85 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 8deb0dc9..c6a7e15b 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -19,13 +19,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -58,5 +58,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index d597482c..2d8a4213 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index dffaffda..56638087 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index d8d972e7..d5a39934 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 976cb7f9..6b12f6b9 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index 051d90f4..333c693b 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index e3895ed0..96b6b724 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 9c4a20d0..a7a90f1d 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index 5d58742c..90f71fee 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 9144f34b..4ff2522f 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index f8bc2182..c731b21a 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index 99b7cc45..3d0fcb15 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index 94bd93f2..34198564 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index 5454ce4d..6d032e0a 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index 62b93fd1..9537d078 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 04bc8efd..eb3f7c77 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index da30d81a..282d1d1d 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index bd1da591..6718b5fb 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index f054d3a6..a4ca39bc 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index c569be45..56c364cb 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index ee3dc399..a16faaef 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index d84f2714..77a868d8 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
index 5d58742c..90f71fee 100644
--- a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index bbdf3415..c5afb4a9 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index 2ebaf4c0..e0e3f55d 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index 02fae916..6ee7488a 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
index 96074958..f5563253 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index 96f70900..c4c99dfb 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
index b78f51cc..61044c80 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"></atom:link><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index cf933369..64571e2a 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index 698d227c..18663cf1 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"></atom:link><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index a8dbb270..ac1845e6 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index 379d1b93..92fd35b3 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"></atom:link><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 17 Nov 2013 23:29:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 99cf7cb0..cb2a70eb 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from os.path import join, relpath, dirname
 
 from setuptools import setup
 
-requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.7', 'pygments', 'docutils',
+requires = ['feedgenerator >= 1.8', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',
             'python-dateutil']
 

From d81c53a748dd89af52e3e90ebe68bf8a14470d20 Mon Sep 17 00:00:00 2001
From: Tory Law <t.law@torypages.com>
Date: Sat, 9 Apr 2016 09:05:17 -0400
Subject: [PATCH 1879/2864] Minor typo in docs

---
 docs/install.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/install.rst b/docs/install.rst
index f163f180..f05f3941 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -22,7 +22,7 @@ session and create a new virtual environment for Pelican::
     source bin/activate
 
 Once the virtual environment has been created and activated, Pelican can be
-be installed via ``pip install pelican`` as noted above. Alternatively, if
+installed via ``pip install pelican`` as noted above. Alternatively, if
 you have the project source, you can install Pelican using the distutils
 method::
 

From de2a5286ebb68e33f45cf6ad661cbf43ef4e005f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCller?= <mail@mueller-martin.net>
Date: Tue, 12 Apr 2016 22:48:04 +0200
Subject: [PATCH 1880/2864] Fix description of the search bar's positon

The search bar in the currently used Read the Docs Sphinx Theme is
located at the top-left instead of top-right.
---
 CONTRIBUTING.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 862cf7a7..a7b5a2a0 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -14,7 +14,7 @@ How to get help
 Before you ask for help, please make sure you do the following:
 
 1. Read the documentation_ thoroughly. If in a hurry, at least use the search
-   field that is provided at top-right on the documentation_ pages. Make sure
+   field that is provided at top-left on the documentation_ pages. Make sure
    you read the docs for the Pelican version you are using.
 2. Use a search engine (e.g., DuckDuckGo, Google) to search for a solution to
    your problem. Someone may have already found a solution, perhaps in the

From 3b6d059eac5c49aab7bb67212d3db8b1bf3841b0 Mon Sep 17 00:00:00 2001
From: davidlesieur <david@davidlesieur.com>
Date: Mon, 15 Sep 2014 19:58:31 -0400
Subject: [PATCH 1881/2864] Fix #1291: Feeds have ambiguous titles on sites
 with multiple categories.

---
 pelican/generators.py | 14 ++++++++------
 pelican/writers.py    | 14 +++++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index ff9a9d7c..d9923e35 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -309,24 +309,26 @@ class ArticlesGenerator(CachingGenerator):
             if self.settings.get('CATEGORY_FEED_ATOM'):
                 writer.write_feed(arts, self.context,
                                   self.settings['CATEGORY_FEED_ATOM']
-                                  % cat.slug)
+                                  % cat.slug, feed_title=cat.name)
 
             if self.settings.get('CATEGORY_FEED_RSS'):
                 writer.write_feed(arts, self.context,
                                   self.settings['CATEGORY_FEED_RSS']
-                                  % cat.slug, feed_type='rss')
+                                  % cat.slug, feed_title=cat.name,
+                                  feed_type='rss')
 
         for auth, arts in self.authors:
             arts.sort(key=attrgetter('date'), reverse=True)
             if self.settings.get('AUTHOR_FEED_ATOM'):
                 writer.write_feed(arts, self.context,
                                   self.settings['AUTHOR_FEED_ATOM']
-                                  % auth.slug)
+                                  % auth.slug, feed_title=auth.name)
 
             if self.settings.get('AUTHOR_FEED_RSS'):
                 writer.write_feed(arts, self.context,
                                   self.settings['AUTHOR_FEED_RSS']
-                                  % auth.slug, feed_type='rss')
+                                  % auth.slug, feed_title=auth.name,
+                                  feed_type='rss')
 
         if (self.settings.get('TAG_FEED_ATOM') or
                 self.settings.get('TAG_FEED_RSS')):
@@ -335,12 +337,12 @@ class ArticlesGenerator(CachingGenerator):
                 if self.settings.get('TAG_FEED_ATOM'):
                     writer.write_feed(arts, self.context,
                                       self.settings['TAG_FEED_ATOM']
-                                      % tag.slug)
+                                      % tag.slug, feed_title=tag.name)
 
                 if self.settings.get('TAG_FEED_RSS'):
                     writer.write_feed(arts, self.context,
                                       self.settings['TAG_FEED_RSS'] % tag.slug,
-                                      feed_type='rss')
+                                      feed_title=tag.name, feed_type='rss')
 
         if (self.settings.get('TRANSLATION_FEED_ATOM') or
                 self.settings.get('TRANSLATION_FEED_RSS')):
diff --git a/pelican/writers.py b/pelican/writers.py
index 423fc9f3..1f9262b1 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -31,11 +31,14 @@ class Writer(object):
         self._written_files = set()
         self._overridden_files = set()
 
-    def _create_new_feed(self, feed_type, context):
+    def _create_new_feed(self, feed_type, feed_title, context):
         feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
-        sitename = Markup(context['SITENAME']).striptags()
+        if feed_title:
+            feed_title = context['SITENAME'] + ' - ' + feed_title
+        else:
+            feed_title = context['SITENAME']
         feed = feed_class(
-            title=sitename,
+            title=Markup(feed_title).striptags(),
             link=(self.site_url + '/'),
             feed_url=self.feed_url,
             description=context.get('SITESUBTITLE', ''))
@@ -84,7 +87,7 @@ class Writer(object):
         return open(filename, 'w', encoding=encoding)
 
     def write_feed(self, elements, context, path=None, feed_type='atom',
-                   override_output=False):
+                   override_output=False, feed_title=None):
         """Generate a feed with the list of articles provided
 
         Return the feed. If no path or output_path is specified, just
@@ -97,6 +100,7 @@ class Writer(object):
         :param override_output: boolean telling if we can override previous
             output with the same name (and if next files written with the same
             name should be skipped to keep that one)
+        :param feed_title: the title of the feed.o
         """
         if not is_selected_for_writing(self.settings, path):
             return
@@ -107,7 +111,7 @@ class Writer(object):
         self.feed_domain = context.get('FEED_DOMAIN')
         self.feed_url = '{}/{}'.format(self.feed_domain, path)
 
-        feed = self._create_new_feed(feed_type, context)
+        feed = self._create_new_feed(feed_type, feed_title, context)
 
         max_items = len(elements)
         if self.settings['FEED_MAX_ITEMS']:

From e48365c3295e697237fb0db18c61f57a2b68393c Mon Sep 17 00:00:00 2001
From: davidlesieur <david@davidlesieur.com>
Date: Mon, 15 Sep 2014 21:00:07 -0400
Subject: [PATCH 1882/2864] Fix titles in feed tests.

---
 pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml    | 4 ++--
 pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml     | 4 ++--
 pelican/tests/output/basic/feeds/bar.atom.xml                 | 4 ++--
 pelican/tests/output/basic/feeds/cat1.atom.xml                | 4 ++--
 pelican/tests/output/basic/feeds/misc.atom.xml                | 4 ++--
 pelican/tests/output/basic/feeds/yeah.atom.xml                | 4 ++--
 pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml   | 4 ++--
 pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml    | 4 ++--
 pelican/tests/output/custom/feeds/bar.atom.xml                | 4 ++--
 pelican/tests/output/custom/feeds/bar.rss.xml                 | 4 ++--
 pelican/tests/output/custom/feeds/cat1.atom.xml               | 4 ++--
 pelican/tests/output/custom/feeds/cat1.rss.xml                | 4 ++--
 pelican/tests/output/custom/feeds/misc.atom.xml               | 4 ++--
 pelican/tests/output/custom/feeds/misc.rss.xml                | 4 ++--
 pelican/tests/output/custom/feeds/yeah.atom.xml               | 4 ++--
 pelican/tests/output/custom/feeds/yeah.rss.xml                | 4 ++--
 .../output/custom_locale/feeds/alexis-metaireau.atom.xml      | 4 ++--
 .../tests/output/custom_locale/feeds/alexis-metaireau.rss.xml | 4 ++--
 pelican/tests/output/custom_locale/feeds/bar.atom.xml         | 4 ++--
 pelican/tests/output/custom_locale/feeds/bar.rss.xml          | 4 ++--
 pelican/tests/output/custom_locale/feeds/cat1.atom.xml        | 4 ++--
 pelican/tests/output/custom_locale/feeds/cat1.rss.xml         | 4 ++--
 pelican/tests/output/custom_locale/feeds/misc.atom.xml        | 4 ++--
 pelican/tests/output/custom_locale/feeds/misc.rss.xml         | 4 ++--
 pelican/tests/output/custom_locale/feeds/yeah.atom.xml        | 4 ++--
 pelican/tests/output/custom_locale/feeds/yeah.rss.xml         | 4 ++--
 26 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index 7593ac2c..73a4681d 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - Alexis Métaireau</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -17,4 +17,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index 77c80807..d38a75d3 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>A Pelican Blog</title><link>/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0"><channel><title>A Pelican Blog - Alexis Métaireau</title><link>/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -17,4 +17,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index 2d8a4213..259d79be 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - bar</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index 56638087..7541a613 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - cat1</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index d5a39934..aee81226 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - misc</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 6b12f6b9..f5d02c55 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - yeah</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index 333c693b..edb8ed20 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
@@ -58,4 +58,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index 96b6b724..4925af32 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
@@ -58,4 +58,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index 3d0fcb15..e61d0f39 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index 34198564..ff09d564 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0"><channel><title>Alexis' log - bar</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index 6d032e0a..f2438dc8 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index 9537d078..56a334af 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index eb3f7c77..6de97a74 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 282d1d1d..74ebd728 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index 6718b5fb..6e4eb7e5 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index a4ca39bc..e442b032 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 56c364cb..04516ff4 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
@@ -58,4 +58,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index a16faaef..3ac29901 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
@@ -58,4 +58,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index 6ee7488a..55ce205e 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
index f5563253..078c01cc 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0"><channel><title>Alexis' log - bar</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index c4c99dfb..99350756 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
index 61044c80..9cd7a28c 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index 64571e2a..0e7989f1 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</summary></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index 18663cf1..eeb37d99 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index ac1845e6..dacd69ee 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index 92fd35b3..f2f6f947 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>

From 3d2eb1d45e843912f281869379c25567b4d7617a Mon Sep 17 00:00:00 2001
From: Tomasz Magulski <tomasz@magullab.io>
Date: Wed, 4 May 2016 20:28:03 +0200
Subject: [PATCH 1883/2864] fixing issue with one-element tuple

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 82c50c03..a996bf41 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -151,7 +151,7 @@ def read_settings(path=None, override=None):
                     and not isabs(local_settings[p]):
                 absp = os.path.abspath(os.path.normpath(os.path.join(
                     os.path.dirname(path), local_settings[p])))
-                if p not in ('THEME') or os.path.exists(absp):
+                if p != 'THEME' or os.path.exists(absp):
                     local_settings[p] = absp
 
         if 'PLUGIN_PATH' in local_settings:

From ed92d959b2293394399e47911a7d9928a6490c98 Mon Sep 17 00:00:00 2001
From: "Mr. Senko" <atodorov@mrsenko.com>
Date: Tue, 24 May 2016 16:41:08 +0300
Subject: [PATCH 1884/2864] Separate pip requirements. Fixes #1808

---
 docs/contribute.rst                           | 2 +-
 requirements/developer.pip                    | 6 ++++++
 requirements/owner.pip                        | 6 ++++++
 dev_requirements.txt => requirements/test.pip | 4 ----
 tox.ini                                       | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 requirements/developer.pip
 create mode 100644 requirements/owner.pip
 rename dev_requirements.txt => requirements/test.pip (64%)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index eae13225..ae44cd0b 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -37,7 +37,7 @@ To clone the Pelican source::
 To install the development dependencies::
 
     $ cd src/pelican
-    $ pip install -r dev_requirements.txt
+    $ pip install -r requirements/developer.pip
 
 To install Pelican and its dependencies::
 
diff --git a/requirements/developer.pip b/requirements/developer.pip
new file mode 100644
index 00000000..96317c7c
--- /dev/null
+++ b/requirements/developer.pip
@@ -0,0 +1,6 @@
+-r test.pip
+
+# Development
+flake8
+-e git+https://github.com/public/flake8-import-order#egg=flake8-import-order
+sphinx
diff --git a/requirements/owner.pip b/requirements/owner.pip
new file mode 100644
index 00000000..472823d4
--- /dev/null
+++ b/requirements/owner.pip
@@ -0,0 +1,6 @@
+-r developer.pip
+
+# Release issuance
+tox
+bumpr==0.2.0
+wheel
diff --git a/dev_requirements.txt b/requirements/test.pip
similarity index 64%
rename from dev_requirements.txt
rename to requirements/test.pip
index 028cbebd..fa2634a0 100644
--- a/dev_requirements.txt
+++ b/requirements/test.pip
@@ -6,7 +6,3 @@ Markdown
 BeautifulSoup4
 lxml
 typogrify
-
-# To perform release
-bumpr==0.2.0
-wheel
diff --git a/tox.ini b/tox.ini
index 609be886..398dc93f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ basepython =
 passenv = *
 usedevelop=True
 deps =
-    -rdev_requirements.txt
+    -rrequirements/developer.pip
     nose
     nose-cov
     coveralls

From 3f2d89c9d6c07b551a206252413dacb8c7283c46 Mon Sep 17 00:00:00 2001
From: Robert Utter <utter.robert@gmail.com>
Date: Mon, 22 Sep 2014 13:22:36 -0700
Subject: [PATCH 1885/2864] Makes DEFAULT_DATE accept string dates; fixes #1464

---
 docs/settings.rst             | 2 ++
 pelican/readers.py            | 5 ++++-
 pelican/tests/test_readers.py | 9 +++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 1de28c12..a0a4b1b2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -61,6 +61,8 @@ Setting name (followed by default value, if any)
                                                                                  If ``'fs'``, Pelican will use the file system
                                                                                  timestamp information (mtime) if it can't get
                                                                                  date information from the metadata.
+                                                                                 If given any other string, it will be parsed by the same method 
+                                                                                 as article metadata.
                                                                                  If set to a tuple object, the default datetime object will instead
                                                                                  be generated by passing the tuple to the
                                                                                  ``datetime.datetime`` constructor.
diff --git a/pelican/readers.py b/pelican/readers.py
index e3b1012a..585a6e79 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -607,7 +607,10 @@ def default_metadata(settings=None, process=None):
             metadata['category'] = value
         if settings.get('DEFAULT_DATE', None) and \
            settings['DEFAULT_DATE'] != 'fs':
-            metadata['date'] = SafeDatetime(*settings['DEFAULT_DATE'])
+            if isinstance(settings['DEFAULT_DATE'], six.string_types):
+                metadata['date'] = get_date(settings['DEFAULT_DATE'])
+            else:
+                metadata['date'] = SafeDatetime(*settings['DEFAULT_DATE'])
     return metadata
 
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 3bfca33a..e9100241 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -359,6 +359,15 @@ class RstReaderTest(ReaderTest):
 
         self.assertDictHasSubset(page.metadata, expected)
 
+    def test_default_date_formats(self):
+        tuple_date = self.read_file(path='article.rst',
+                                    DEFAULT_DATE=(2012, 5, 1))
+        string_date = self.read_file(path='article.rst',
+                                     DEFAULT_DATE='2012-05-01')
+
+        self.assertEqual(tuple_date.metadata['date'],
+                         string_date.metadata['date'])
+
 
 @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
 class MdReaderTest(ReaderTest):

From 090694dba79b759559edb8d798297d52d72c4581 Mon Sep 17 00:00:00 2001
From: "Mr. Senko" <atodorov@mrsenko.com>
Date: Thu, 26 May 2016 17:32:21 +0300
Subject: [PATCH 1886/2864] Pin Pygments version to 2.1.3. Fixes #1916

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 609be886..e68acd36 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,7 @@ deps =
     nose
     nose-cov
     coveralls
+    pygments==2.1.3
 
 commands =
     {envpython} --version

From 12c72d3e198425f860adbc1baedd3da2a18720cd Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <rr-@sakuya.pl>
Date: Sat, 28 May 2016 19:31:28 +0200
Subject: [PATCH 1887/2864] Fix typogrifying objects without title

This fixes my use case where I use `readers.read_file` from within plugin to load something that is neither a page nor an article.
---
 pelican/readers.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index 585a6e79..a3e89af8 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -545,6 +545,8 @@ class Readers(FileStampDataCacher):
 
             if content:
                 content = typogrify_wrapper(content)
+
+            if 'title' in metadata:
                 metadata['title'] = typogrify_wrapper(metadata['title'])
 
             if 'summary' in metadata:

From 76dcd64a8224f1f85144557b68618d3bd3ec6b86 Mon Sep 17 00:00:00 2001
From: Nathan Harrington <harrington.nathan@gmail.com>
Date: Mon, 30 May 2016 09:09:53 -0400
Subject: [PATCH 1888/2864] Fixes #1966

---
 pelican/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 30b3c2f8..f676c33f 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -277,6 +277,7 @@ def parse_arguments():
                         '"output" in the current path.')
 
     parser.add_argument('-s', '--settings', dest='settings',
+                        default=DEFAULT_CONFIG_NAME,
                         help='The settings of the application, this is '
                         'automatically set to {0} if a file exists with this '
                         'name.'.format(DEFAULT_CONFIG_NAME))

From c11b8ceb097837c61bfea8545a5e1d32bb1b3289 Mon Sep 17 00:00:00 2001
From: bnice5000 <brian4lawschool@gmail.com>
Date: Tue, 14 Jun 2016 08:42:48 -0400
Subject: [PATCH 1889/2864] Update rebuild to respect OUTPUT_RETENTION

Fixes #1955
---
 pelican/tools/templates/fabfile.py.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.in
index 5481f84f..18131d5f 100644
--- a/pelican/tools/templates/fabfile.py.in
+++ b/pelican/tools/templates/fabfile.py.in
@@ -37,9 +37,8 @@ def build():
     local('pelican -s pelicanconf.py')
 
 def rebuild():
-    """`clean` then `build`"""
-    clean()
-    build()
+    """`build` with the delete switch"""
+    local('pelican -d -s pelicanconf.py')
 
 def regenerate():
     """Automatically regenerate site upon file modification"""

From 5d860471ac6e14b4ada641eb1c3a5b7c4f3f3940 Mon Sep 17 00:00:00 2001
From: Will Thompson <will@willthompson.co.uk>
Date: Thu, 11 Aug 2016 07:46:53 +0100
Subject: [PATCH 1890/2864] pelican_open: don't raise IndexError on empty files

If the file is empty, content[0] raises IndexError.
---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 4e729361..06290d16 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -244,7 +244,7 @@ def pelican_open(filename, mode='rb', strip_crs=(sys.platform == 'win32')):
 
     with codecs.open(filename, mode, encoding='utf-8') as infile:
         content = infile.read()
-    if content[0] == codecs.BOM_UTF8.decode('utf8'):
+    if content[:1] == codecs.BOM_UTF8.decode('utf8'):
         content = content[1:]
     if strip_crs:
         content = content.replace('\r\n', '\n')

From 904f57d9c33d1ed9831d24ef360ca1ceaea790a3 Mon Sep 17 00:00:00 2001
From: Will Thompson <will@willthompson.co.uk>
Date: Thu, 11 Aug 2016 07:51:39 +0100
Subject: [PATCH 1891/2864] MarkdownReader: don't raise AttributeError on empty
 files

Markdown.convert() returns early, without running any preprocessors, if
source.strip() is empty.

Before, Pelican would raise AttributeError in this case; now, it logs a
more friendly error:

ERROR: Skipping ./foo.md: could not find information about 'NameError: title'

which is more consistent with the error from empty .rst files:

ERROR: Skipping ./foo.rst: could not find information about 'NameError: date'
---
 pelican/readers.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index a3e89af8..48985ed6 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -288,7 +288,10 @@ class MarkdownReader(BaseReader):
         with pelican_open(source_path) as text:
             content = self._md.convert(text)
 
-        metadata = self._parse_metadata(self._md.Meta)
+        if hasattr(self._md, 'Meta'):
+            metadata = self._parse_metadata(self._md.Meta)
+        else:
+            metadata = {}
         return content, metadata
 
 

From 36f93af27538ad04c1929b1759140d237dafa98f Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 14 Aug 2016 11:52:21 -0700
Subject: [PATCH 1892/2864] Compare Pelican hl_lines to Sphinx emphasize-lines

See #1510
---
 docs/content.rst | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/content.rst b/docs/content.rst
index 0fa89921..7f6a9591 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -455,7 +455,13 @@ Option          Valid values  Description
 =============   ============  =========================================
 anchorlinenos   N/A           If present wrap line numbers in <a> tags.
 classprefix     string        String to prepend to token class names
-hl_lines        numbers       List of lines to be highlighted.
+hl_lines        numbers       List of lines to be highlighted, where
+                              line numbers to highlight are separated
+                              by a space. This is similar to
+                              ``emphasize-lines`` in Sphinx, but it
+                              does not support a range of line numbers
+                              separated by a hyphen, or comma-separated
+                              line numbers.
 lineanchors     string        Wrap each line in an anchor using this
                               string and -linenumber.
 linenos         string        If present or set to "table" output line

From 129b144852979521126937f7e7e999295ea5cfc7 Mon Sep 17 00:00:00 2001
From: Will Thompson <will@willthompson.co.uk>
Date: Tue, 16 Aug 2016 07:12:04 +0100
Subject: [PATCH 1893/2864] test_cache: fix comment listing uncached files

This file was added in d333ed1; the number '3' in code was incremented
to '4' but the comment wasn't updated.
---
 pelican/tests/test_cache.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index 3da3f789..2e6786b3 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -56,7 +56,8 @@ class TestCache(unittest.TestCase):
         generator.readers.read_file = MagicMock()
         generator.generate_context()
         """
-        3 Files don't get cached because they were not valid
+        4 files don't get cached because they were not valid
+        - article_with_attributes_containing_double_quotes.html
         - article_with_comments.html
         - article_with_null_attributes.html
         - 2012-11-30_md_w_filename_meta#foo-bar.md

From 85a860d5dd1b1e05a1161d103d371bd83be8574a Mon Sep 17 00:00:00 2001
From: Will Thompson <will@willthompson.co.uk>
Date: Mon, 15 Aug 2016 11:18:24 +0100
Subject: [PATCH 1894/2864] test_readers: test reading empty Markdown files

---
 pelican/tests/content/empty.md          |  0
 pelican/tests/content/empty_with_bom.md |  1 +
 pelican/tests/test_cache.py             |  6 ++++--
 pelican/tests/test_readers.py           | 16 ++++++++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pelican/tests/content/empty.md
 create mode 100644 pelican/tests/content/empty_with_bom.md

diff --git a/pelican/tests/content/empty.md b/pelican/tests/content/empty.md
new file mode 100644
index 00000000..e69de29b
diff --git a/pelican/tests/content/empty_with_bom.md b/pelican/tests/content/empty_with_bom.md
new file mode 100644
index 00000000..5f282702
--- /dev/null
+++ b/pelican/tests/content/empty_with_bom.md
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index 2e6786b3..e8ea4967 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -56,13 +56,15 @@ class TestCache(unittest.TestCase):
         generator.readers.read_file = MagicMock()
         generator.generate_context()
         """
-        4 files don't get cached because they were not valid
+        6 files don't get cached because they were not valid
         - article_with_attributes_containing_double_quotes.html
         - article_with_comments.html
         - article_with_null_attributes.html
         - 2012-11-30_md_w_filename_meta#foo-bar.md
+        - empty.md
+        - empty_with_bom.md
         """
-        self.assertEqual(generator.readers.read_file.call_count, 4)
+        self.assertEqual(generator.readers.read_file.call_count, 6)
 
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_article_reader_content_caching(self):
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index e9100241..43279179 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -546,6 +546,22 @@ class MdReaderTest(ReaderTest):
         }
         self.assertDictHasSubset(metadata, expected)
 
+    def test_empty_file(self):
+        reader = readers.MarkdownReader(settings=get_settings())
+        content, metadata = reader.read(
+            _path('empty.md'))
+
+        self.assertEqual(metadata, {})
+        self.assertEqual(content, '')
+
+    def test_empty_file_with_bom(self):
+        reader = readers.MarkdownReader(settings=get_settings())
+        content, metadata = reader.read(
+            _path('empty_with_bom.md'))
+
+        self.assertEqual(metadata, {})
+        self.assertEqual(content, '')
+
 
 class HTMLReaderTest(ReaderTest):
     def test_article_with_comments(self):

From ac08cd5eb124cd1b8923d6d90f7014b1240b29d7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 15 Sep 2016 06:55:25 -0600
Subject: [PATCH 1895/2864] Docs: Custom 404 pages are pages -- not articles

---
 docs/tips.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/tips.rst b/docs/tips.rst
index 82018400..9f45f877 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -9,8 +9,8 @@ Custom 404 Pages
 When a browser requests a resource that the web server cannot find, the web
 server usually displays a generic "File not found" (404) error page that can be
 stark and unsightly. One way to provide an error page that matches the theme
-of your site is to create a custom 404 page, such as this Markdown-formatted
-example::
+of your site is to create a custom 404 page (*not* an article), such as this
+Markdown-formatted example stored in ``content/pages/404.md``::
 
     Title: Not Found
     Status: hidden
@@ -28,8 +28,8 @@ configuration file's ``location`` block::
 For Apache::
 
     ErrorDocument 404 /404.html
-    
-For Amazon S3, first navigate to the ``Static Site Hosting`` menu in the 
+
+For Amazon S3, first navigate to the ``Static Site Hosting`` menu in the
 bucket settings on your AWS cosole. From there::
 
     Error Document: 404.html

From 5cdd2645fde4bf42efce19a94887395c4aca8cb6 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 15 Sep 2016 11:57:30 -0600
Subject: [PATCH 1896/2864] Pelican now requires FeedGenerator 1.9+

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index cb2a70eb..3610936e 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from os.path import join, relpath, dirname
 
 from setuptools import setup
 
-requires = ['feedgenerator >= 1.8', 'jinja2 >= 2.7', 'pygments', 'docutils',
+requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',
             'python-dateutil']
 

From 6aa05ace195e36d78881403545128a95a5b2ee69 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 15 Sep 2016 11:58:43 -0600
Subject: [PATCH 1897/2864] Update functional test output for FeedGenerator 1.9

Refs https://github.com/getpelican/feedgenerator/pull/7
---
 .../basic/feeds/alexis-metaireau.atom.xml     |  4 ++--
 .../basic/feeds/alexis-metaireau.rss.xml      |  2 +-
 .../tests/output/basic/feeds/all-en.atom.xml  | 18 +++++++--------
 .../tests/output/basic/feeds/all-fr.atom.xml  |  2 +-
 pelican/tests/output/basic/feeds/all.atom.xml | 20 ++++++++---------
 pelican/tests/output/basic/feeds/bar.atom.xml |  4 ++--
 .../tests/output/basic/feeds/cat1.atom.xml    | 10 ++++-----
 .../tests/output/basic/feeds/misc.atom.xml    | 10 ++++-----
 .../tests/output/basic/feeds/yeah.atom.xml    |  2 +-
 .../custom/feeds/alexis-metaireau.atom.xml    | 20 ++++++++---------
 .../custom/feeds/alexis-metaireau.rss.xml     |  2 +-
 .../tests/output/custom/feeds/all-en.atom.xml | 18 +++++++--------
 .../tests/output/custom/feeds/all-fr.atom.xml |  4 ++--
 .../tests/output/custom/feeds/all.atom.xml    | 22 +++++++++----------
 .../tests/output/custom/feeds/bar.atom.xml    |  4 ++--
 pelican/tests/output/custom/feeds/bar.rss.xml |  2 +-
 .../tests/output/custom/feeds/cat1.atom.xml   | 10 ++++-----
 .../tests/output/custom/feeds/cat1.rss.xml    |  2 +-
 .../tests/output/custom/feeds/misc.atom.xml   | 10 ++++-----
 .../tests/output/custom/feeds/misc.rss.xml    |  2 +-
 .../tests/output/custom/feeds/yeah.atom.xml   |  2 +-
 .../tests/output/custom/feeds/yeah.rss.xml    |  2 +-
 .../feeds/alexis-metaireau.atom.xml           | 20 ++++++++---------
 .../feeds/alexis-metaireau.rss.xml            |  2 +-
 .../custom_locale/feeds/all-en.atom.xml       | 18 +++++++--------
 .../custom_locale/feeds/all-fr.atom.xml       |  4 ++--
 .../output/custom_locale/feeds/all.atom.xml   | 22 +++++++++----------
 .../output/custom_locale/feeds/bar.atom.xml   |  4 ++--
 .../output/custom_locale/feeds/bar.rss.xml    |  2 +-
 .../output/custom_locale/feeds/cat1.atom.xml  | 10 ++++-----
 .../output/custom_locale/feeds/cat1.rss.xml   |  2 +-
 .../output/custom_locale/feeds/misc.atom.xml  | 10 ++++-----
 .../output/custom_locale/feeds/misc.rss.xml   |  2 +-
 .../output/custom_locale/feeds/yeah.atom.xml  |  2 +-
 .../output/custom_locale/feeds/yeah.rss.xml   |  2 +-
 35 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index 73a4681d..78fab659 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -11,10 +11,10 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index d38a75d3..0a815c3a 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -17,4 +17,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 56258af5..5c9dc073 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index 250feb85..b654a426 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index c6a7e15b..f708324d 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -19,13 +19,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -58,5 +58,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index 259d79be..97b39128 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - bar</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - bar</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index 7541a613..f779db5f 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - cat1</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - cat1</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index aee81226..26980932 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - misc</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - misc</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index f5d02c55..8de838d4 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index edb8ed20..95b7f6f4 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index 4925af32..e2086153 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -58,4 +58,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index a7a90f1d..7b95086d 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index 90f71fee..fa29857f 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 4ff2522f..ea3ac887 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index e61d0f39..b0c8038e 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index ff09d564..cc573423 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index f2438dc8..aec1d9aa 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index 56a334af..030c934f 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -4,4 +4,4 @@
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 6de97a74..6f14d379 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 74ebd728..1d0c8915 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index 6e4eb7e5..6edcceea 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index e442b032..691c5e13 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 04516ff4..6d2da5c1 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index 3ac29901..bbb7c831 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -58,4 +58,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 77a868d8..335505f5 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
index 90f71fee..fa29857f 100644
--- a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index c5afb4a9..0c1a137a 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index 55ce205e..a2d8e852 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
index 078c01cc..e7d88130 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index 99350756..0c97fb66 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
index 9cd7a28c..829ff466 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -4,4 +4,4 @@
 &lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index 0e7989f1..d4855cde 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index eeb37d99..324cd226 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index dacd69ee..20c87053 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index f2f6f947..f78768dc 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file

From 9d1a1d428b639db080d811556a6bd7000b485ab4 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 16 Sep 2016 10:56:20 -0400
Subject: [PATCH 1898/2864] Fixes #1966: Track default settings file for
 changes in autoreload mode

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index f676c33f..12db9adf 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -277,7 +277,6 @@ def parse_arguments():
                         '"output" in the current path.')
 
     parser.add_argument('-s', '--settings', dest='settings',
-                        default=DEFAULT_CONFIG_NAME,
                         help='The settings of the application, this is '
                         'automatically set to {0} if a file exists with this '
                         'name.'.format(DEFAULT_CONFIG_NAME))
@@ -370,6 +369,7 @@ def get_instance(args):
     config_file = args.settings
     if config_file is None and os.path.isfile(DEFAULT_CONFIG_NAME):
             config_file = DEFAULT_CONFIG_NAME
+            args.settings = DEFAULT_CONFIG_NAME
 
     settings = read_settings(config_file, override=get_config(args))
 

From 77d8160dab5e8cbb3b0890a80f0dd5ba44b27349 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 16 Sep 2016 15:22:46 -0400
Subject: [PATCH 1899/2864] Add warnings override for unittest in the docs

Unittest supresses warning filters unless `-Wd` flag is supplied and
this will result in test failures in python 3.5+.
---
 docs/contribute.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index ae44cd0b..0ed82dfd 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -69,7 +69,7 @@ or bugfix.
 The tests live in ``pelican/tests`` and you can run them using the
 "discover" feature of ``unittest``::
 
-    $ python -m unittest discover
+    $ python -Wd -m unittest discover
 
 After making your changes and running the tests, you may see a test failure
 mentioning that "some generated files differ from the expected functional tests

From 9185e0b7a83c894aeeb1e4a3c6e1d6255ed29614 Mon Sep 17 00:00:00 2001
From: Li Jiapeng <coinfaces@126.com>
Date: Mon, 19 Sep 2016 18:26:16 +0800
Subject: [PATCH 1900/2864] Avoid circumvention of metadata name checking

See https://github.com/getpelican/pelican/issues/2011
---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 48985ed6..ed710b26 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -666,8 +666,8 @@ def parse_path_metadata(source_path, settings=None, process=None):
                 if match:
                     # .items() for py3k compat.
                     for k, v in match.groupdict().items():
+                        k = k.lower()  # metadata must be lowercase
                         if k not in metadata:
-                            k = k.lower()  # metadata must be lowercase
                             if process:
                                 v = process(k, v)
                             metadata[k] = v

From 0f6b98506efec3bb957dc4c55f1b6193fa179d77 Mon Sep 17 00:00:00 2001
From: Li Jiapeng <coinfaces@126.com>
Date: Mon, 19 Sep 2016 18:29:58 +0800
Subject: [PATCH 1901/2864] Revert to the old category processing order

If no category is specified in PATH_METADATA or FILENAME_METADATA,
fall back to USE_FOLDER_AS_CATEGORY, which defaults to True.
---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index ed710b26..9c0f715e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -659,7 +659,7 @@ def parse_path_metadata(source_path, settings=None, process=None):
                           ('PATH_METADATA', source_path)]:
             checks.append((settings.get(key, None), data))
         if settings.get('USE_FOLDER_AS_CATEGORY', None):
-            checks.insert(0, ('(?P<category>.*)', subdir))
+            checks.append(('(?P<category>.*)', subdir))
         for regexp, data in checks:
             if regexp and data:
                 match = re.match(regexp, data)

From e8a964fd577b39ee9051db71f406b3945a66e33c Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kdeldycke@scaleway.com>
Date: Mon, 28 Dec 2015 14:11:15 +0100
Subject: [PATCH 1902/2864] Upgrade legacy GA tracking code.

---
 docs/settings.rst                                 | 11 +++++++----
 pelican/themes/notmyidea/templates/analytics.html | 15 +++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 61fd8521..757f247e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -699,15 +699,18 @@ Following are example ways to specify your preferred theme::
 The built-in ``notmyidea`` theme can make good use of the following settings. Feel
 free to use them in your themes as well.
 
-=======================   =======================================================
+=======================   =====================================================
 Setting name              What does it do?
-=======================   =======================================================
+=======================   =====================================================
 ``SITESUBTITLE``          A subtitle to appear in the header.
 ``DISQUS_SITENAME``       Pelican can handle Disqus comments. Specify the
                           Disqus sitename identifier here.
 ``GITHUB_URL``            Your GitHub URL (if you have one). It will then
                           use this information to create a GitHub ribbon.
-``GOOGLE_ANALYTICS``      Set to 'UA-XXXX-YYYY' to activate Google Analytics.
+``GOOGLE_ANALYTICS``      Set to ``UA-XXXXX-Y`` Property's tracking ID to
+                          activate Google Analytics.
+``GA_COOKIE_DOMAIN``      Set cookie domain field of Google Analytics tracking
+                          code. Defaults to ``auto``.
 ``GOSQUARED_SITENAME``    Set to 'XXX-YYYYYY-X' to activate GoSquared.
 ``MENUITEMS``             A list of tuples (Title, URL) for additional menu
                           items to appear at the beginning of the main menu.
@@ -728,7 +731,7 @@ Setting name              What does it do?
                           If not specified, defaults to "links".
 ``SOCIAL_WIDGET_NAME``    Allows override of the name of the "social" widget.
                           If not specified, defaults to "social".
-=======================   =======================================================
+=======================   =====================================================
 
 In addition, you can use the "wide" version of the ``notmyidea`` theme by
 adding the following to your configuration::
diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
index 465754e2..a966c4c2 100644
--- a/pelican/themes/notmyidea/templates/analytics.html
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -1,13 +1,12 @@
 {% if GOOGLE_ANALYTICS %}
     <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '{{GOOGLE_ANALYTICS}}']);
-    _gaq.push(['_trackPageview']);
-    (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = 'https://ssl.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', '{{GOOGLE_ANALYTICS}}', '{{GA_COOKIE_DOMAIN if GA_COOKIE_DOMAIN else 'auto'}}');
+    ga('send', 'pageview');
     </script>
 {% endif %}
 {% if GAUGES %}

From 1b1d1fd9f7554ed128e87894779f685f22bf7a52 Mon Sep 17 00:00:00 2001
From: Alexander Turenko <totktonada.ru@gmail.com>
Date: Mon, 12 Sep 2016 03:01:22 +0300
Subject: [PATCH 1903/2864] Allow to filter out log messages by templates

Fixes #1594.
---
 docs/settings.rst | 10 ++++++++++
 pelican/log.py    | 15 +++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 6063e7a8..c1da7db6 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -777,6 +777,16 @@ be filtered out.
 
 For example: ``[(logging.WARN, 'TAG_SAVE_AS is set to False')]``
 
+It is possible to filter out messages by a template. Check out source code to
+obtain a template.
+
+For example: ``[(logging.WARN, 'Empty alt attribute for image %s in %s')]``
+
+**Warning:** Silencing messages by templates is a dangerous feature. It is
+possible to unintentionally filter out multiple message types with the same
+template (including messages from future Pelican versions). Proceed with
+caution.
+
 .. _reading_only_modified_content:
 
 
diff --git a/pelican/log.py b/pelican/log.py
index 3d365607..907981eb 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -92,6 +92,7 @@ class LimitFilter(logging.Filter):
     """
 
     _ignore = set()
+    _raised_messages = set()
     _threshold = 5
     _group_count = defaultdict(int)
 
@@ -105,12 +106,18 @@ class LimitFilter(logging.Filter):
         group_args = record.__dict__.get('limit_args', ())
 
         # ignore record if it was already raised
-        # use .getMessage() and not .msg for string formatting
-        ignore_key = (record.levelno, record.getMessage())
-        if ignore_key in self._ignore:
+        message_key = (record.levelno, record.getMessage())
+        if message_key in self._raised_messages:
             return False
         else:
-            self._ignore.add(ignore_key)
+            self._raised_messages.add(message_key)
+
+        # ignore LOG_FILTER records
+        # use .msg and not .getMessage() for string formatting to allow
+        # filtering by templates
+        ignore_key = (record.levelno, record.msg)
+        if ignore_key in self._ignore:
+            return False
 
         # check if we went over threshold
         if group:

From 30b8955134364738edd8d1aae0f91b8cc3865e39 Mon Sep 17 00:00:00 2001
From: Alexander Turenko <totktonada.ru@gmail.com>
Date: Mon, 12 Sep 2016 03:02:29 +0300
Subject: [PATCH 1904/2864] Don't suppress LOG_FILTER messages when --debug
 passed

---
 docs/settings.rst |  2 ++
 pelican/log.py    | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c1da7db6..6f695f90 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -787,6 +787,8 @@ possible to unintentionally filter out multiple message types with the same
 template (including messages from future Pelican versions). Proceed with
 caution.
 
+Note: This option does nothing ``--debug`` is passed.
+
 .. _reading_only_modified_content:
 
 
diff --git a/pelican/log.py b/pelican/log.py
index 907981eb..fe14a29b 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -112,12 +112,12 @@ class LimitFilter(logging.Filter):
         else:
             self._raised_messages.add(message_key)
 
-        # ignore LOG_FILTER records
-        # use .msg and not .getMessage() for string formatting to allow
-        # filtering by templates
-        ignore_key = (record.levelno, record.msg)
-        if ignore_key in self._ignore:
-            return False
+        # ignore LOG_FILTER records by templates when "debug" isn't enabled
+        logger_level = logging.getLogger().getEffectiveLevel()
+        if logger_level > logging.DEBUG:
+            ignore_key = (record.levelno, record.msg)
+            if ignore_key in self._ignore:
+                return False
 
         # check if we went over threshold
         if group:

From 577b748f5f58b0adaee91f4fa66407adaf5bd5f5 Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Sun, 25 Sep 2016 10:31:56 +0200
Subject: [PATCH 1905/2864] Fixes unit test test_period_in_timeperiod_archive
 (TestArticlesGenerator)

On systems with a none english default locale this test failed because the
period is a tuple of year and month name and the month name depends on the
locale.
---
 pelican/tests/test_generators.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index c9aa1cff..feded3e8 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -297,6 +297,8 @@ class TestArticlesGenerator(unittest.TestCase):
         Test that the context of a generated period_archive is passed
         'period' : a tuple of year, month, day according to the time period
         """
+        old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, str('C'))
         settings = get_settings(filenames={})
 
         settings['YEAR_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/index.html'
@@ -357,6 +359,7 @@ class TestArticlesGenerator(unittest.TestCase):
                                  generator.get_template("period_archives"),
                                  settings,
                                  blog=True, dates=dates)
+        locale.setlocale(locale.LC_ALL, old_locale)
 
     def test_nonexistent_template(self):
         """Attempt to load a non-existent template"""

From 1eee6f0211b61bbabe5396970ff3a04a41eb353b Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Mon, 4 Apr 2016 22:17:13 +0200
Subject: [PATCH 1906/2864] Simplified feed id generation and added support for
 url fragments

---
 pelican/writers.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 1f9262b1..7f67db9f 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -4,12 +4,11 @@ from __future__ import print_function, unicode_literals, with_statement
 import logging
 import os
 
-from feedgenerator import Atom1Feed, Rss201rev2Feed
+from feedgenerator import Atom1Feed, Rss201rev2Feed, get_tag_uri
 
 from jinja2 import Markup
 
 import six
-from six.moves.urllib.parse import urlparse
 
 from pelican import signals
 from pelican.paginator import Paginator
@@ -51,9 +50,7 @@ class Writer(object):
         feed.add_item(
             title=title,
             link=link,
-            unique_id='tag:%s,%s:%s' % (urlparse(link).netloc,
-                                        item.date.date(),
-                                        urlparse(link).path.lstrip('/')),
+            unique_id=get_tag_uri(link, item.date),
             description=item.get_content(self.site_url),
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', ''),

From eb435dc065270a8d0723995cac260c907a0add6b Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Sun, 25 Sep 2016 10:59:44 +0200
Subject: [PATCH 1907/2864] Update feed test output to match the new feed id

---
 .../basic/feeds/alexis-metaireau.atom.xml     |  4 ++--
 .../basic/feeds/alexis-metaireau.rss.xml      |  4 ++--
 .../tests/output/basic/feeds/all-en.atom.xml  | 20 ++++++++--------
 .../tests/output/basic/feeds/all-fr.atom.xml  |  2 +-
 pelican/tests/output/basic/feeds/all.atom.xml | 22 ++++++++---------
 pelican/tests/output/basic/feeds/bar.atom.xml |  2 +-
 .../tests/output/basic/feeds/cat1.atom.xml    |  8 +++----
 .../tests/output/basic/feeds/misc.atom.xml    |  8 +++----
 .../tests/output/basic/feeds/yeah.atom.xml    |  2 +-
 .../custom/feeds/alexis-metaireau.atom.xml    | 20 ++++++++--------
 .../custom/feeds/alexis-metaireau.rss.xml     | 20 ++++++++--------
 .../tests/output/custom/feeds/all-en.atom.xml | 20 ++++++++--------
 .../tests/output/custom/feeds/all-fr.atom.xml |  4 ++--
 .../tests/output/custom/feeds/all.atom.xml    | 24 +++++++++----------
 pelican/tests/output/custom/feeds/all.rss.xml | 24 +++++++++----------
 .../tests/output/custom/feeds/bar.atom.xml    |  2 +-
 pelican/tests/output/custom/feeds/bar.rss.xml |  2 +-
 .../tests/output/custom/feeds/cat1.atom.xml   |  8 +++----
 .../tests/output/custom/feeds/cat1.rss.xml    |  8 +++----
 .../tests/output/custom/feeds/misc.atom.xml   |  8 +++----
 .../tests/output/custom/feeds/misc.rss.xml    |  8 +++----
 .../tests/output/custom/feeds/yeah.atom.xml   |  2 +-
 .../tests/output/custom/feeds/yeah.rss.xml    |  2 +-
 .../feeds/alexis-metaireau.atom.xml           | 20 ++++++++--------
 .../feeds/alexis-metaireau.rss.xml            | 20 ++++++++--------
 .../custom_locale/feeds/all-en.atom.xml       | 20 ++++++++--------
 .../custom_locale/feeds/all-fr.atom.xml       |  4 ++--
 .../output/custom_locale/feeds/all.atom.xml   | 24 +++++++++----------
 .../output/custom_locale/feeds/all.rss.xml    | 24 +++++++++----------
 .../output/custom_locale/feeds/bar.atom.xml   |  2 +-
 .../output/custom_locale/feeds/bar.rss.xml    |  2 +-
 .../output/custom_locale/feeds/cat1.atom.xml  |  8 +++----
 .../output/custom_locale/feeds/cat1.rss.xml   |  8 +++----
 .../output/custom_locale/feeds/misc.atom.xml  |  8 +++----
 .../output/custom_locale/feeds/misc.rss.xml   |  8 +++----
 .../output/custom_locale/feeds/yeah.atom.xml  |  2 +-
 .../output/custom_locale/feeds/yeah.rss.xml   |  2 +-
 37 files changed, 188 insertions(+), 188 deletions(-)

diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index 78fab659..a8f28355 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - Alexis Métaireau</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - Alexis Métaireau</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,7 +11,7 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index 0a815c3a..77d5c682 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -11,10 +11,10 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-10-20:/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 5c9dc073..ddbb7c8a 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index b654a426..556b1931 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index f708324d..fc8947e8 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -19,13 +19,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -58,5 +58,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index 97b39128..22ae5c2a 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - bar</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - bar</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index f779db5f..cf135438 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - cat1</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - cat1</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index 26980932..ff2376f1 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - misc</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - misc</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 8de838d4..8c7f1b5b 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - yeah</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - yeah</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index 95b7f6f4..39ac7522 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index e2086153..8dc43772 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 7b95086d..a5cd26ee 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index fa29857f..93d0cff9 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index ea3ac887..fbb98bcf 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index c731b21a..9ccfa90c 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index b0c8038e..c940f2e9 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index cc573423..b5600543 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index aec1d9aa..11b1bb19 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index 030c934f..0752be2a 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:article-3.html</guid></item></channel></rss>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 6f14d379..8721a170 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 1d0c8915..8084bc30 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index 6edcceea..dc2fbef7 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index 691c5e13..779fdd1d 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 6d2da5c1..59672eb8 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index bbb7c831..b7a936bf 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 335505f5..3647896e 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +18,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +57,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
index fa29857f..93d0cff9 100644
--- a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index 0c1a137a..e5f6b8d8 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index e0e3f55d..f8562d65 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +20,13 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +59,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index a2d8e852..b4bb1ba1 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
index e7d88130..68c2317d 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index 0c97fb66..cb7feb17 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
index 829ff466..c9c58e74 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:posts/2011/février/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index d4855cde..d9f5b984 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </summary></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index 324cd226..42b524aa 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +34,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index 20c87053..e174623c 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index f78768dc..836764dc 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -11,4 +11,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file

From 24a1254f034a238f481f8b889a961dbde99c551d Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Fri, 30 Sep 2016 15:29:14 +0200
Subject: [PATCH 1908/2864] Explicitly disallow duplications of URL and
 save_as.

---
 pelican/readers.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 415e7558..56e54355 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -31,6 +31,20 @@ except ImportError:
 # This means that _filter_discardable_metadata() must be called on processed
 # metadata dicts before use, to remove the items with the special value.
 _DISCARD = object()
+
+DUPLICATES_DEFINITIONS_ALLOWED = {
+    'tags': False,
+    'date': False,
+    'modified': False,
+    'status': False,
+    'category': False,
+    'author': False,
+    'save_as': False,
+    'URL': False,
+    'authors': False,
+    'slug': False
+}
+
 METADATA_PROCESSORS = {
     'tags': lambda x, y: ([
         Tag(tag, y)
@@ -264,7 +278,7 @@ class MarkdownReader(BaseReader):
                 self._md.reset()
                 formatted = self._md.convert(formatted_values)
                 output[name] = self.process_metadata(name, formatted)
-            elif name in METADATA_PROCESSORS:
+            elif not DUPLICATES_DEFINITIONS_ALLOWED.get(name, True):
                 if len(value) > 1:
                     logger.warning(
                         'Duplicate definition of `%s` '

From 9e574e9d8c6e4d6377a6fcefe1579bb998c7223a Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Fri, 30 Sep 2016 15:33:05 +0200
Subject: [PATCH 1909/2864] Just in case someone forgot the
 DUPLICATES_DEFINITIONS_ALLOWED but add in METADATA_PROCESSORS.

---
 pelican/readers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 56e54355..5220f1a0 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -278,7 +278,8 @@ class MarkdownReader(BaseReader):
                 self._md.reset()
                 formatted = self._md.convert(formatted_values)
                 output[name] = self.process_metadata(name, formatted)
-            elif not DUPLICATES_DEFINITIONS_ALLOWED.get(name, True):
+            elif (not DUPLICATES_DEFINITIONS_ALLOWED.get(name, True) or
+                  name in METADATA_PROCESSORS):
                 if len(value) > 1:
                     logger.warning(
                         'Duplicate definition of `%s` '

From c1a5279da9863fdfacade8654437d9d7b73f6b13 Mon Sep 17 00:00:00 2001
From: Nicolas Stinus <nicolas.stinus@gmail.com>
Date: Sat, 4 Jun 2016 09:00:17 -0400
Subject: [PATCH 1910/2864] Localize default lang and timezone in
 pelican-quickstart

Fixes #1971.
---
 docs/quickstart.rst                 | 12 ++++++++++--
 pelican/tools/pelican_quickstart.py | 11 +++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index ef5256c2..752c1857 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -28,8 +28,9 @@ by asking some questions about your site::
     pelican-quickstart
 
 For questions that have default values denoted in brackets, feel free to use
-the Return key to accept those default values. When asked for your URL prefix,
-enter your domain name as indicated (e.g., ``http://example.com``).
+the Return key to accept those default values [#tzlocal_fn]_. When asked for
+your URL prefix, enter your domain name as indicated (e.g.,
+``http://example.com``).
 
 Create an article
 -----------------
@@ -72,3 +73,10 @@ Continue reading the other documentation sections for more detail, and check out
 the Pelican wiki's Tutorials_ page for links to community-published tutorials.
 
 .. _Tutorials: https://github.com/getpelican/pelican/wiki/Tutorials
+
+Footnotes
+---------
+
+.. [#tzlocal_fn] You can help localize default fields by installing the
+                 optional `tzlocal <https://pypi.python.org/pypi/tzlocal>`_
+                 module.
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index e6ccf2a8..6b4eb5a5 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -4,12 +4,19 @@ from __future__ import print_function, unicode_literals
 
 import argparse
 import codecs
+import locale
 import os
 import string
 import sys
 
 import pytz
 
+try:
+    import tzlocal
+    _DEFAULT_TIMEZONE = tzlocal.get_localzone().zone
+except:
+    _DEFAULT_TIMEZONE = 'Europe/Paris'
+
 import six
 
 from pelican import __version__
@@ -42,8 +49,8 @@ CONF = {
     'github_pages_branch': _GITHUB_PAGES_BRANCHES['project'],
     'default_pagination': 10,
     'siteurl': '',
-    'lang': 'en',
-    'timezone': 'Europe/Paris'
+    'lang': locale.getlocale()[0].split('_')[0],
+    'timezone': _DEFAULT_TIMEZONE
 }
 
 # url for list of valid timezones

From 0942fcb9ec736b62d12f57347f922e0eb67a011a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 7 Oct 2016 09:03:18 -0600
Subject: [PATCH 1911/2864] Use flake8-import-order packaged release

Packaged releases weren't available previously, which required us to
install the master branch version. Now that releases are being published
to PyPI, we should use those.
---
 requirements/developer.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/developer.pip b/requirements/developer.pip
index 96317c7c..6b839fa3 100644
--- a/requirements/developer.pip
+++ b/requirements/developer.pip
@@ -2,5 +2,5 @@
 
 # Development
 flake8
--e git+https://github.com/public/flake8-import-order#egg=flake8-import-order
+flake8-import-order
 sphinx

From f8031203d21fb3fb4e6c94a70d3738ef59e532d5 Mon Sep 17 00:00:00 2001
From: Jerry Asher <ja.2038@gmail.com>
Date: Fri, 23 Sep 2016 17:16:46 -0700
Subject: [PATCH 1912/2864] Python's shutil.copy2 fails on Android

Python's shutil.copy2 fails on Android when copying a file's meta data (perm bits, access times) onto certain filesystems. This is documented as python issue28141 https://bugs.python.org/issue28141

These commits workaround that bug by

+ creating a new function copy_file_metadata in utils.py
+ wrapping calls to copy2 in a try/except clause that logs any errors that occur but keep execution going
+ changing the calls to shutil.copy2 to calls to the new function
---
 pelican/generators.py |  8 ++++----
 pelican/utils.py      | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index d9923e35..2107e338 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -5,7 +5,6 @@ import calendar
 import fnmatch
 import logging
 import os
-import shutil
 from codecs import open
 from collections import defaultdict
 from functools import partial
@@ -21,8 +20,9 @@ from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Article, Draft, Page, Static, is_valid_content
 from pelican.readers import Readers
-from pelican.utils import (DateFormatter, copy, mkdir_p, posixize_path,
-                           process_translations, python_2_unicode_compatible)
+from pelican.utils import (DateFormatter, copy, copy_file_metadata, mkdir_p,
+                           posixize_path, process_translations,
+                           python_2_unicode_compatible)
 
 
 logger = logging.getLogger(__name__)
@@ -727,8 +727,8 @@ class StaticGenerator(Generator):
             source_path = os.path.join(self.path, sc.source_path)
             save_as = os.path.join(self.output_path, sc.save_as)
             mkdir_p(os.path.dirname(save_as))
-            shutil.copy2(source_path, save_as)
             logger.info('Copying %s to %s', sc.source_path, sc.save_as)
+            copy_file_metadata(source_path, save_as)
 
 
 class SourceFileGenerator(Generator):
diff --git a/pelican/utils.py b/pelican/utils.py
index 06290d16..f1558fda 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -337,7 +337,7 @@ def copy(source, destination, ignores=None):
             logger.info('Creating directory %s', dst_dir)
             os.makedirs(dst_dir)
         logger.info('Copying %s to %s', source_, destination_)
-        shutil.copy2(source_, destination_)
+        copy_file_metadata(source_, destination_)
 
     elif os.path.isdir(source_):
         if not os.path.exists(destination_):
@@ -367,13 +367,25 @@ def copy(source, destination, ignores=None):
                 dst_path = os.path.join(dst_dir, o)
                 if os.path.isfile(src_path):
                     logger.info('Copying %s to %s', src_path, dst_path)
-                    shutil.copy2(src_path, dst_path)
+                    copy_file_metadata(src_path, dst_path)
                 else:
                     logger.warning('Skipped copy %s (not a file or '
                                    'directory) to %s',
                                    src_path, dst_path)
 
 
+def copy_file_metadata(source, destination):
+    '''Copy a file and its metadata (perm bits, access times, ...)'''
+
+    # This function is a workaround for Android python copystat
+    # bug ([issue28141]) https://bugs.python.org/issue28141
+    try:
+        shutil.copy2(source, destination)
+    except OSError as e:
+        logger.warning("A problem occurred copying file %s to %s; %s",
+                       source, destination, e)
+
+
 def clean_output_dir(path, retention):
     """Remove all files from output directory except those in retention list"""
 

From e8a87e5d3cb82081127a8a07da574059668688de Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Mon, 10 Oct 2016 12:23:26 +0200
Subject: [PATCH 1913/2864] As not allowing duplicates in processed items is
 counter intuitive, let's allow it.

Also it may be allowed in the future (to process multiple values).

Also @avaris think it's bad to test something twice (see
https://github.com/getpelican/pelican/pull/2017), but for me confusion
lies in the "Why is list processing forbidden?", so, in a way, our
ideas converges in "let's not disallow processed items to be lists".

This reverts commit 9e574e9d8c6e4d6377a6fcefe1579bb998c7223a.
---
 pelican/readers.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 503db679..a7712f0b 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -278,8 +278,7 @@ class MarkdownReader(BaseReader):
                 self._md.reset()
                 formatted = self._md.convert(formatted_values)
                 output[name] = self.process_metadata(name, formatted)
-            elif (not DUPLICATES_DEFINITIONS_ALLOWED.get(name, True) or
-                  name in METADATA_PROCESSORS):
+            elif not DUPLICATES_DEFINITIONS_ALLOWED.get(name, True):
                 if len(value) > 1:
                     logger.warning(
                         'Duplicate definition of `%s` '

From 6cadbdf3541c92616c2788f334b61f65c5006f55 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Wed, 12 Oct 2016 23:22:33 -0700
Subject: [PATCH 1914/2864] Fix extension-matching bug in generators.py

Addresses #1946.
---
 pelican/generators.py                   | 8 +++++---
 pelican/tests/content/bad_extension.mmd | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 pelican/tests/content/bad_extension.mmd

diff --git a/pelican/generators.py b/pelican/generators.py
index 2107e338..af3e3513 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -100,8 +100,8 @@ class Generator(object):
         """Inclusion logic for .get_files(), returns True/False
 
         :param path: the path which might be including
-        :param extensions: the list of allowed extensions (if False, all
-            extensions are allowed)
+        :param extensions: the list of allowed extensions, or False if all
+            extensions are allowed
         """
         if extensions is None:
             extensions = tuple(self.readers.extensions)
@@ -112,8 +112,10 @@ class Generator(object):
         if any(fnmatch.fnmatch(basename, ignore) for ignore in ignores):
             return False
 
-        if extensions is False or basename.endswith(extensions):
+        ext = os.path.splitext(basename)[1][1:]
+        if extensions is False or ext in extensions:
             return True
+
         return False
 
     def get_files(self, paths, exclude=[], extensions=None):
diff --git a/pelican/tests/content/bad_extension.mmd b/pelican/tests/content/bad_extension.mmd
new file mode 100644
index 00000000..d282a749
--- /dev/null
+++ b/pelican/tests/content/bad_extension.mmd
@@ -0,0 +1,3 @@
+Title: Bad Extension
+
+This file shouldn't be included because its file extension is `.mmd`.

From aa2c84a59c847271d54ef444c45208b822ea072e Mon Sep 17 00:00:00 2001
From: Viorel Tabara <viorel.tabara@infrabit.net>
Date: Wed, 19 Oct 2016 11:21:42 -0600
Subject: [PATCH 1915/2864] Fixes #2032

When following the steps in the Github contributor wiki flake8 reports
PEP8 violation against setup.py and docs/conf.py.
---
 docs/conf.py | 23 +++++++++++++----------
 setup.py     | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index d3f58905..4b7d109a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,16 +1,19 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-import sys, os
+import os
+import sys
+
+from pelican import __version__
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
 sys.path.append(os.path.abspath(os.pardir))
 
-from pelican import __version__
-
-# -- General configuration -----------------------------------------------------
+# -- General configuration ----------------------------------------------------
 templates_path = ['_templates']
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.ifconfig', 'sphinx.ext.extlinks']
+extensions = ['sphinx.ext.autodoc',
+              'sphinx.ext.ifconfig',
+              'sphinx.ext.extlinks']
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Pelican'
@@ -30,7 +33,7 @@ extlinks = {
     'pelican-doc':  ('http://docs.getpelican.com/%s/', '')
 }
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output --------------------------------------------------
 
 html_theme = 'default'
 if not on_rtd:
@@ -63,13 +66,13 @@ def setup(app):
     app.add_stylesheet('theme_overrides.css')   # path relative to _static
 
 
-# -- Options for LaTeX output --------------------------------------------------
+# -- Options for LaTeX output -------------------------------------------------
 latex_documents = [
-    ('index', 'Pelican.tex', 'Pelican Documentation',
-   'Alexis Métaireau', 'manual'),
+    ('index', 'Pelican.tex', 'Pelican Documentation', 'Alexis Métaireau',
+     'manual'),
 ]
 
-# -- Options for manual page output --------------------------------------------
+# -- Options for manual page output -------------------------------------------
 man_pages = [
     ('index', 'pelican', 'pelican documentation',
      ['Alexis Métaireau'], 1),
diff --git a/setup.py b/setup.py
index 3610936e..164713b9 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from os import walk
-from os.path import join, relpath, dirname
+from os.path import join, relpath
 
 from setuptools import setup
 
@@ -31,22 +31,22 @@ setup(
     long_description=README + '\n' + CHANGELOG,
     packages=['pelican', 'pelican.tools'],
     package_data={
-        # we manually collect the package data, as opposed to using include_package_data=True
-        # because we don't want the tests to be included automatically as package data
-        # (MANIFEST.in is too greedy)
-        'pelican': [
-            relpath(join(root, name), 'pelican')
-            for root, _, names in walk(join('pelican', 'themes')) for name in names
-        ],
-        'pelican.tools': [
-            relpath(join(root, name), join('pelican', 'tools'))
-            for root, _, names in walk(join('pelican', 'tools', 'templates')) for name in names
-        ],
+        # we manually collect the package data, as opposed to using,
+        # include_package_data=True because we don't want the tests to be
+        # included automatically as package data (MANIFEST.in is too greedy)
+        'pelican': [relpath(join(root, name), 'pelican')
+                    for root, _, names in walk(join('pelican', 'themes'))
+                    for name in names],
+        'pelican.tools': [relpath(join(root, name), join('pelican', 'tools'))
+                          for root, _, names in walk(join('pelican',
+                                                          'tools',
+                                                          'templates'))
+                          for name in names],
     },
     install_requires=requires,
     entry_points=entry_points,
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
+         'Development Status :: 5 - Production/Stable',
          'Environment :: Console',
          'License :: OSI Approved :: GNU Affero General Public License v3',
          'Operating System :: OS Independent',

From ecc5d0b953f1081ee27e28c6aefcfd15be94fd85 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 22 Oct 2016 15:00:52 -0600
Subject: [PATCH 1916/2864] Add link to sample contect in docs. Refs #1741

---
 docs/content.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/content.rst b/docs/content.rst
index 7f6a9591..4ef73f65 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -11,6 +11,8 @@ The idea behind "pages" is that they are usually not temporal in nature and are
 used for content that does not change very often (e.g., "About" or "Contact"
 pages).
 
+You can find sample content in the repository at: ``pelican/samples/content/``
+
 .. _internal_metadata:
 
 File metadata

From 270817c02256b44648dcf48a3cfb5e19cac90791 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 22 Oct 2016 15:35:01 -0600
Subject: [PATCH 1917/2864] Clarify error message when LOCALE cannot be set

Fixes #1906
---
 pelican/settings.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index a996bf41..f1142077 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -275,7 +275,9 @@ def configure_settings(settings):
         except locale.Error:
             pass
     else:
-        logger.warning("LOCALE option doesn't contain a correct value")
+        logger.warning(
+            "Locale could not be set. Check the LOCALE setting, ensuring it "
+            "is valid and available on your system.")
 
     if ('SITEURL' in settings):
         # If SITEURL has a trailing slash, remove it and provide a warning

From eac8fa2abd91823f3ffbdc679147504ee9489618 Mon Sep 17 00:00:00 2001
From: "Eevee (Lexy Munroe)" <eevee.git@veekun.com>
Date: Sun, 7 Aug 2016 17:04:03 -0700
Subject: [PATCH 1918/2864] Use the summary as the feed's description, and put
 content in content

This adheres more closely to the specs, especially Atom, where the
'description' arg becomes <summary>.

Note that this means full article content will no longer appear in RSS
feeds.
---
 .../basic/feeds/alexis-metaireau.atom.xml     | 14 +++--
 .../basic/feeds/alexis-metaireau.rss.xml      | 14 +----
 .../tests/output/basic/feeds/all-en.atom.xml  | 47 ++++++++++++----
 .../tests/output/basic/feeds/all-fr.atom.xml  |  3 +-
 pelican/tests/output/basic/feeds/all.atom.xml | 50 +++++++++++++----
 pelican/tests/output/basic/feeds/bar.atom.xml |  8 ++-
 .../tests/output/basic/feeds/cat1.atom.xml    | 13 +++--
 .../tests/output/basic/feeds/misc.atom.xml    | 22 ++++++--
 .../tests/output/basic/feeds/yeah.atom.xml    |  6 ++-
 .../custom/feeds/alexis-metaireau.atom.xml    | 47 ++++++++++++----
 .../custom/feeds/alexis-metaireau.rss.xml     | 38 ++-----------
 .../tests/output/custom/feeds/all-en.atom.xml | 47 ++++++++++++----
 .../tests/output/custom/feeds/all-fr.atom.xml |  6 ++-
 .../tests/output/custom/feeds/all.atom.xml    | 53 ++++++++++++++-----
 pelican/tests/output/custom/feeds/all.rss.xml | 38 ++-----------
 .../tests/output/custom/feeds/bar.atom.xml    |  8 ++-
 .../tests/output/custom/feeds/cat1.atom.xml   | 13 +++--
 .../tests/output/custom/feeds/misc.atom.xml   | 22 ++++++--
 .../tests/output/custom/feeds/misc.rss.xml    | 24 +--------
 .../tests/output/custom/feeds/yeah.atom.xml   |  6 ++-
 .../tests/output/custom/feeds/yeah.rss.xml    | 14 +----
 .../feeds/alexis-metaireau.atom.xml           | 47 ++++++++++++----
 .../feeds/alexis-metaireau.rss.xml            | 38 ++-----------
 .../custom_locale/feeds/all-en.atom.xml       | 47 ++++++++++++----
 .../custom_locale/feeds/all-fr.atom.xml       |  6 ++-
 .../output/custom_locale/feeds/all.atom.xml   | 53 ++++++++++++++-----
 .../output/custom_locale/feeds/all.rss.xml    | 38 ++-----------
 .../output/custom_locale/feeds/bar.atom.xml   |  8 ++-
 .../output/custom_locale/feeds/cat1.atom.xml  | 13 +++--
 .../output/custom_locale/feeds/misc.atom.xml  | 22 ++++++--
 .../output/custom_locale/feeds/misc.rss.xml   | 24 +--------
 .../output/custom_locale/feeds/yeah.atom.xml  |  6 ++-
 .../output/custom_locale/feeds/yeah.rss.xml   | 14 +----
 pelican/writers.py                            |  3 +-
 34 files changed, 463 insertions(+), 349 deletions(-)

diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index a8f28355..fe670d13 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - Alexis Métaireau</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - Alexis Métaireau</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,10 +13,16 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index 77d5c682..9c3f82f0 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>A Pelican Blog - Alexis Métaireau</title><link>/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
-&lt;div class="section" id="this-is-a-simple-title"&gt;
-&lt;h2&gt;This is a simple title&lt;/h2&gt;
-&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;pre class="literal-block"&gt;
-&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
-&amp;gt;&amp;gt;&amp;gt; set_trace()
-&lt;/pre&gt;
-&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
-&lt;/div&gt;
+<rss version="2.0"><channel><title>A Pelican Blog - Alexis Métaireau</title><link>/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index ddbb7c8a..2a0c7ea3 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +27,30 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +83,6 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index 556b1931..f0f05185 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
+</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index fc8947e8..ba6322df 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -19,13 +29,30 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -58,5 +85,6 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index 22ae5c2a..0d0f0ce6 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -5,4 +5,10 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index cf135438..e0e6153d 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - cat1</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index ff2376f1..edd2dfaf 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - misc</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +47,6 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 8c7f1b5b..dfd37b62 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - yeah</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - yeah</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +13,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index 39ac7522..d4582496 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +27,30 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +83,6 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index 8dc43772..5409e039 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -6,18 +6,8 @@
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
-&lt;div class="section" id="this-is-a-simple-title"&gt;
-&lt;h2&gt;This is a simple title&lt;/h2&gt;
-&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;pre class="literal-block"&gt;
-&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
-&amp;gt;&amp;gt;&amp;gt; set_trace()
-&lt;/pre&gt;
-&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
-&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -35,27 +25,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
-&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-overriding-config-defaults"&gt;
-&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
-&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index a5cd26ee..56d64535 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +27,30 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +83,6 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index 93d0cff9..e50dfb34 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
+</summary><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index fbb98bcf..96428b33 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +31,30 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +87,6 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 9ccfa90c..8873b845 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -8,18 +8,8 @@
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
-&lt;div class="section" id="this-is-a-simple-title"&gt;
-&lt;h2&gt;This is a simple title&lt;/h2&gt;
-&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;pre class="literal-block"&gt;
-&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
-&amp;gt;&amp;gt;&amp;gt; set_trace()
-&lt;/pre&gt;
-&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
-&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -37,27 +27,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
-&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-overriding-config-defaults"&gt;
-&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
-&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index c940f2e9..119a86a2 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -5,4 +5,10 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index 11b1bb19..66435f58 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 8721a170..a48d73c1 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +47,6 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 8084bc30..82884344 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -12,27 +12,5 @@
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
-&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-overriding-config-defaults"&gt;
-&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
-&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index dc2fbef7..82dd0368 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +13,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index 779fdd1d..1b7f1bae 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
-&lt;div class="section" id="this-is-a-simple-title"&gt;
-&lt;h2&gt;This is a simple title&lt;/h2&gt;
-&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;pre class="literal-block"&gt;
-&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
-&amp;gt;&amp;gt;&amp;gt; set_trace()
-&lt;/pre&gt;
-&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
-&lt;/div&gt;
+<rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 59672eb8..d3c498f8 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +27,30 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +83,6 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index b7a936bf..b2ee2199 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -6,18 +6,8 @@
 &lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
-&lt;div class="section" id="this-is-a-simple-title"&gt;
-&lt;h2&gt;This is a simple title&lt;/h2&gt;
-&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;pre class="literal-block"&gt;
-&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
-&amp;gt;&amp;gt;&amp;gt; set_trace()
-&lt;/pre&gt;
-&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
-&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -35,27 +25,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
-&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-overriding-config-defaults"&gt;
-&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
-&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 3647896e..c3d37615 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -18,13 +27,30 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -57,5 +83,6 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
index 93d0cff9..e50dfb34 100644
--- a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
+</summary><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index e5f6b8d8..ed04561a 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -20,13 +31,30 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -59,5 +87,6 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index f8562d65..978ae6a6 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -8,18 +8,8 @@
 &lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
-&lt;div class="section" id="this-is-a-simple-title"&gt;
-&lt;h2&gt;This is a simple title&lt;/h2&gt;
-&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;pre class="literal-block"&gt;
-&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
-&amp;gt;&amp;gt;&amp;gt; set_trace()
-&lt;/pre&gt;
-&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
-&lt;/div&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -37,27 +27,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
-&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-overriding-config-defaults"&gt;
-&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
-&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index b4bb1ba1..03974937 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -5,4 +5,10 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</summary><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+&lt;h2&gt;Why not ?&lt;/h2&gt;
+&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+YEAH !&lt;/p&gt;
+&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;/div&gt;
+</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index cb7feb17..78ede4cb 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index d9f5b984..d243086f 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+&lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
+&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
+&lt;div class="section" id="testing-sourcecode-directive"&gt;
+&lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;
+&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="section" id="testing-another-case"&gt;
+&lt;h2&gt;Testing another case&lt;/h2&gt;
+&lt;p&gt;This will now have a line number in 'custom' since it's the default in
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -34,5 +47,6 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</summary></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary></entry></feed>
\ No newline at end of file
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index 42b524aa..dcdc18a4 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -12,27 +12,5 @@
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
-&lt;h2&gt;Testing even more sourcecode directives&lt;/h2&gt;
-&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-&lt;div class="section" id="testing-overriding-config-defaults"&gt;
-&lt;h2&gt;Testing overriding config defaults&lt;/h2&gt;
-&lt;p&gt;Even if the default is line numbers, we can override it here&lt;/p&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Lovely.&lt;/p&gt;
-&lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index e174623c..6b774b73 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p&gt;Some content here !&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
+</summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
@@ -11,4 +13,4 @@
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</summary><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index 836764dc..21e86d15 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p&gt;Some content here !&lt;/p&gt;
-&lt;div class="section" id="this-is-a-simple-title"&gt;
-&lt;h2&gt;This is a simple title&lt;/h2&gt;
-&lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;pre class="literal-block"&gt;
-&amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
-&amp;gt;&amp;gt;&amp;gt; set_trace()
-&lt;/pre&gt;
-&lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
-&lt;/div&gt;
+<rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/writers.py b/pelican/writers.py
index 7f67db9f..30000a5f 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -51,7 +51,8 @@ class Writer(object):
             title=title,
             link=link,
             unique_id=get_tag_uri(link, item.date),
-            description=item.get_content(self.site_url),
+            description=item.summary,
+            content=item.get_content(self.site_url),
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', ''),
             pubdate=set_date_tzinfo(

From e07c53a09dab16ec33e44a84a1c5db5e58deb61c Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Wed, 26 Oct 2016 08:34:52 +0200
Subject: [PATCH 1919/2864] FIX: Those keys are looked up lowercased.

---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index a7712f0b..74b617e6 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -40,7 +40,7 @@ DUPLICATES_DEFINITIONS_ALLOWED = {
     'category': False,
     'author': False,
     'save_as': False,
-    'URL': False,
+    'url': False,
     'authors': False,
     'slug': False
 }

From a8be1b562e82094c9ca59aef00b6276b4747226b Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 29 Oct 2016 14:04:13 -0400
Subject: [PATCH 1920/2864] Fixes Exception name related bugs

Fixes two bugs that was introduced by #1743:

 - First was the unnecessary exception name output when skipping
content files if a required metadata wasn't available.
It was
`ERROR: Skipping ./demo.rst: could not find information about 'NameError: date'`
and now should be
`ERROR: Skipping ./demo.rst: could not find information about 'date'`

 - Second was a more serious issue. Improper string formatting in the logger
resulted in implicit decoding and would break for non-ascii error messages.
---
 pelican/contents.py | 3 ++-
 pelican/log.py      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 9b6aa971..1ded6cdb 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -473,5 +473,6 @@ def is_valid_content(content, f):
         return True
     except NameError as e:
         logger.error(
-            "Skipping %s: could not find information about '%s'", f, e)
+            "Skipping %s: could not find information about '%s'",
+            f, six.text_type(e))
         return False
diff --git a/pelican/log.py b/pelican/log.py
index fe14a29b..cec07bf0 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -157,7 +157,7 @@ class SafeLogger(logging.Logger):
         so convert the message to unicode with the correct encoding
         '''
         if isinstance(arg, Exception):
-            text = '%s: %s' % (arg.__class__.__name__, arg)
+            text = str('%s: %s') % (arg.__class__.__name__, arg)
             if six.PY2:
                 text = text.decode(self._exc_encoding)
             return text

From 35dba138e0b3dc0f3ff58eae413f059ab68f57b3 Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Mon, 14 Mar 2016 20:37:27 +0100
Subject: [PATCH 1921/2864] Replaces MD_EXTENSIONS with MARKDOWN

MARKDOWN allows to configure the python markdown module

fixes #1024
---
 pelican/readers.py  | 15 +++++++++++----
 pelican/settings.py | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index f130991f..e54aa4e0 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -246,8 +246,16 @@ class MarkdownReader(BaseReader):
 
     def __init__(self, *args, **kwargs):
         super(MarkdownReader, self).__init__(*args, **kwargs)
-        self.extensions = self.settings['MD_EXTENSIONS']
-        self.extensions.setdefault('markdown.extensions.meta', {})
+        # make sure 'extension_configs' exists and
+        # and either way 'markdown.extensions.meta' must be in there
+        settings = self.settings['MARKDOWN']
+        settings.setdefault('extension_configs', {})
+        settings['extension_configs'].setdefault(
+            'markdown.extensions.meta', {})
+        settings.setdefault('extensions', [])
+        settings['extensions'].extend(
+            list(settings['extension_configs'].keys()))
+        settings['extensions'] = list(set(settings['extensions']))
         self._source_path = None
 
     def _parse_metadata(self, meta):
@@ -283,8 +291,7 @@ class MarkdownReader(BaseReader):
         """Parse content and metadata of markdown files"""
 
         self._source_path = source_path
-        self._md = Markdown(extensions=self.extensions.keys(),
-                            extension_configs=self.extensions)
+        self._md = Markdown(**self.settings['MARKDOWN'])
         with pelican_open(source_path) as text:
             content = self._md.convert(text)
 
diff --git a/pelican/settings.py b/pelican/settings.py
index f1142077..14ddb8ba 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -101,10 +101,12 @@ DEFAULT_CONFIG = {
     'PELICAN_CLASS': 'pelican.Pelican',
     'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
     'DATE_FORMATS': {},
-    'MD_EXTENSIONS': {
-        'markdown.extensions.codehilite': {'css_class': 'highlight'},
-        'markdown.extensions.extra': {},
-        'markdown.extensions.meta': {},
+    'MARKDOWN': {
+        'extension_configs': {
+            'markdown.extensions.codehilite': {'css_class': 'highlight'},
+            'markdown.extensions.extra': {},
+            'markdown.extensions.meta': {},
+        },
     },
     'JINJA_EXTENSIONS': [],
     'JINJA_FILTERS': {},
@@ -368,13 +370,11 @@ def configure_settings(settings):
                            PATH_KEY)
             settings[PATH_KEY] = DEFAULT_CONFIG[PATH_KEY]
 
-    # Save people from declaring MD_EXTENSIONS as a list rather than a dict
-    if not isinstance(settings.get('MD_EXTENSIONS', {}), dict):
-        logger.warning('The format of the MD_EXTENSIONS setting has '
-                       'changed. It should now be a dict mapping '
-                       'fully-qualified extension names to their '
-                       'configurations. Falling back to the default.')
-        settings['MD_EXTENSIONS'] = DEFAULT_CONFIG['MD_EXTENSIONS']
+    # Deprecated warning of MD_EXTENSIONS
+    if 'MD_EXTENSIONS' in settings:
+        logger.warning('MD_EXTENSIONS is deprecated use MARKDOWN '
+                       'instead. Falling back to the default.')
+        settings['MARKDOWN'] = DEFAULT_CONFIG['MARKDOWN']
 
     # Add {PAGE,ARTICLE}_PATHS to {ARTICLE,PAGE}_EXCLUDES
     mutually_exclusive = ('ARTICLE', 'PAGE')

From 9e399e7a0536894349b94d86b81a6645108b9a75 Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Mon, 14 Mar 2016 20:37:54 +0100
Subject: [PATCH 1922/2864] Updates test cases to use MARKDOWN

---
 pelican/tests/test_pelican.py |  9 ++++-----
 pelican/tests/test_readers.py | 10 ++++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 75d644bc..ea28e021 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -208,18 +208,17 @@ class TestPelican(LoggedTestCase):
             msg="Writing .*",
             level=logging.INFO)
 
-    def test_md_extensions_list_deprecation(self):
-        """Test that a warning is issued if MD_EXTENSIONS is a list"""
+    def test_md_extensions_deprecation(self):
+        """Test that a warning is issued if MD_EXTENSIONS is used"""
         settings = read_settings(path=None, override={
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
             'CACHE_PATH': self.temp_cache,
-            'MD_EXTENSIONS': ['meta'],
+            'MD_EXTENSIONS': {},
         })
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
-        self.assertIsInstance(pelican.settings['MD_EXTENSIONS'], dict)
         self.assertLogCountEqual(
             count=1,
-            msg="The format of the MD_EXTENSIONS setting has changed",
+            msg="MD_EXTENSIONS is deprecated use MARKDOWN instead.",
             level=logging.WARNING)
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 43279179..89c3dd61 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -482,10 +482,12 @@ class MdReaderTest(ReaderTest):
         # expected
         page = self.read_file(
             path='article_with_markdown_markup_extensions.md',
-            MD_EXTENSIONS={
-                'markdown.extensions.toc': {},
-                'markdown.extensions.codehilite': {},
-                'markdown.extensions.extra': {}
+            MARKDOWN={
+                'extension_configs': {
+                    'markdown.extensions.toc': {},
+                    'markdown.extensions.codehilite': {},
+                    'markdown.extensions.extra': {}
+                }
             }
         )
         expected = ('<div class="toc">\n'

From 114e64dcf7e65145bc2b79afcb3df939c4f0cb4f Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Tue, 1 Nov 2016 13:02:22 +0100
Subject: [PATCH 1923/2864] doc: updates MARKDOWN

---
 THANKS             |  1 +
 docs/changelog.rst |  1 +
 docs/content.rst   |  2 +-
 docs/settings.rst  | 17 +++++++++--------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/THANKS b/THANKS
index a3af2426..cfa343f6 100644
--- a/THANKS
+++ b/THANKS
@@ -26,6 +26,7 @@ asselinpaul
 Axel Haustant
 Ben Rosser (TC01)
 Benoît HERVIER
+Bernhard Scheirle
 Borgar
 Brandon W Maister
 Brendan Wholihan
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6a4d65a4..d7bbb99a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,6 +15,7 @@ Next release
 * Author slugs can be controlled with greater precision using the
   ``AUTHOR_SUBSTITUTIONS`` setting. Keeping non-alphanum characters is supported
   as well but discouraged.
+* Replaced ``MD_EXTENSIONS`` with ``MARKDOWN``
 
 3.6.3 (2015-08-14)
 ==================
diff --git a/docs/content.rst b/docs/content.rst
index 4ef73f65..507593bf 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -55,7 +55,7 @@ install Markdown``.
 
 Pelican also supports `Markdown Extensions`_, which might have to be installed
 separately if they are not included in the default ``Markdown`` package and can
-be configured and loaded via the ``MD_EXTENSIONS`` setting.
+be configured and loaded via the ``MARKDOWN`` setting.
 
 Metadata syntax for Markdown posts should follow this pattern::
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 6f695f90..231906e6 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -114,15 +114,16 @@ Setting name (followed by default value, if any)
                                                                                  of these patterns will be ignored by the processor. For example,
                                                                                  the default ``['.#*']`` will ignore emacs lock files, and
                                                                                  ``['__pycache__']`` would ignore Python 3's bytecode caches.
-``MD_EXTENSIONS =`` ``{...}``                                                    A dict of the extensions that the Markdown processor
-                                                                                 will use, with extensions' settings as the values.
+``MARKDOWN =`` ``{...}``                                                         Extra configuration settings for the Markdown processor.
                                                                                  Refer to the Python Markdown documentation's
-                                                                                 `Extensions section <http://pythonhosted.org/Markdown/extensions/>`_
-                                                                                 for a complete list of supported extensions and their options.
-                                                                                 Default is ``{'markdown.extensions.codehilite' : {'css_class': 'highlight'},
-                                                                                 'markdown.extensions.extra': {}, 'markdown.extensions.meta': {}}``.
-                                                                                 (Note that the dictionary defined in your settings file will
-                                                                                 update this default one.)
+                                                                                 `Options section 
+                                                                                 <http://pythonhosted.org/Markdown/reference.html#markdown>`_
+                                                                                 for a complete list of supported options.
+                                                                                 The ``extensions`` option will be automatically computed from the 
+                                                                                 ``extension_configs`` option.
+                                                                                 Default is ``'extension_configs': {'markdown.extensions.codehilite':
+                                                                                 {'css_class': 'highlight'},'markdown.extensions.extra': {},
+                                                                                 'markdown.extensions.meta': {},},``.
 ``OUTPUT_PATH = 'output/'``                                                      Where to output the generated files.
 ``PATH``                                                                         Path to content directory to be processed by Pelican. If undefined,
                                                                                  and content path is not specified via an argument to the ``pelican``

From a80a707321937062a8d6fe4514f7fd8a3efc0e29 Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Wed, 2 Nov 2016 21:00:04 +0100
Subject: [PATCH 1924/2864] Set the Markdown output format to html5 by default

---
 docs/settings.rst   | 4 ++--
 pelican/settings.py | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 231906e6..bf203841 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -121,9 +121,9 @@ Setting name (followed by default value, if any)
                                                                                  for a complete list of supported options.
                                                                                  The ``extensions`` option will be automatically computed from the 
                                                                                  ``extension_configs`` option.
-                                                                                 Default is ``'extension_configs': {'markdown.extensions.codehilite':
+                                                                                 Default is ``{'extension_configs': {'markdown.extensions.codehilite':
                                                                                  {'css_class': 'highlight'},'markdown.extensions.extra': {},
-                                                                                 'markdown.extensions.meta': {},},``.
+                                                                                 'markdown.extensions.meta': {},}, 'output_format': 'html5',}``.
 ``OUTPUT_PATH = 'output/'``                                                      Where to output the generated files.
 ``PATH``                                                                         Path to content directory to be processed by Pelican. If undefined,
                                                                                  and content path is not specified via an argument to the ``pelican``
diff --git a/pelican/settings.py b/pelican/settings.py
index 14ddb8ba..5773b925 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -107,6 +107,7 @@ DEFAULT_CONFIG = {
             'markdown.extensions.extra': {},
             'markdown.extensions.meta': {},
         },
+        'output_format': 'html5',
     },
     'JINJA_EXTENSIONS': [],
     'JINJA_FILTERS': {},

From 27d67f04cbbc808002e0a778475cd7dc92ebb9fe Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Wed, 2 Nov 2016 21:19:41 +0100
Subject: [PATCH 1925/2864] Update unittest to match the new Markdown output
 format

---
 pelican/tests/test_readers.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 89c3dd61..9f13473e 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -405,20 +405,20 @@ class MdReaderTest(ReaderTest):
             _path('article_with_markdown_and_footnote.md'))
         expected_content = (
             '<p>This is some content'
-            '<sup id="fnref:1"><a class="footnote-ref" href="#fn:1" '
-            'rel="footnote">1</a></sup>'
+            '<sup id="fnref-1"><a class="footnote-ref" href="#fn-1"'
+            '>1</a></sup>'
             ' with some footnotes'
-            '<sup id="fnref:footnote"><a class="footnote-ref" '
-            'href="#fn:footnote" rel="footnote">2</a></sup></p>\n'
+            '<sup id="fnref-footnote"><a class="footnote-ref" '
+            'href="#fn-footnote">2</a></sup></p>\n'
 
             '<div class="footnote">\n'
-            '<hr />\n<ol>\n<li id="fn:1">\n'
+            '<hr>\n<ol>\n<li id="fn-1">\n'
             '<p>Numbered footnote&#160;'
-            '<a class="footnote-backref" href="#fnref:1" rev="footnote" '
+            '<a class="footnote-backref" href="#fnref-1" '
             'title="Jump back to footnote 1 in the text">&#8617;</a></p>\n'
-            '</li>\n<li id="fn:footnote">\n'
+            '</li>\n<li id="fn-footnote">\n'
             '<p>Named footnote&#160;'
-            '<a class="footnote-backref" href="#fnref:footnote" rev="footnote"'
+            '<a class="footnote-backref" href="#fnref-footnote"'
             ' title="Jump back to footnote 2 in the text">&#8617;</a></p>\n'
             '</li>\n</ol>\n</div>')
         expected_metadata = {

From a445e81ae65e5b85d20687fb08fa431c5204f48c Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Tue, 15 Nov 2016 17:05:12 +0100
Subject: [PATCH 1926/2864] Make markdown extensions order non-arbitrary

---
 pelican/readers.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index e54aa4e0..4542e608 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -246,16 +246,14 @@ class MarkdownReader(BaseReader):
 
     def __init__(self, *args, **kwargs):
         super(MarkdownReader, self).__init__(*args, **kwargs)
-        # make sure 'extension_configs' exists and
-        # and either way 'markdown.extensions.meta' must be in there
         settings = self.settings['MARKDOWN']
         settings.setdefault('extension_configs', {})
-        settings['extension_configs'].setdefault(
-            'markdown.extensions.meta', {})
         settings.setdefault('extensions', [])
-        settings['extensions'].extend(
-            list(settings['extension_configs'].keys()))
-        settings['extensions'] = list(set(settings['extensions']))
+        for extension in settings['extension_configs'].keys():
+            if extension not in settings['extensions']:
+                settings['extensions'].append(extension)
+        if 'markdown.extensions.meta' not in settings['extensions']:
+            settings['extensions'].append('markdown.extensions.meta')
         self._source_path = None
 
     def _parse_metadata(self, meta):

From f30f4fe66b9fb88106ed56af11b270a86f414f1d Mon Sep 17 00:00:00 2001
From: Viorel Tabara <viorel.tabara@infrabit.net>
Date: Sun, 23 Oct 2016 17:04:14 -0600
Subject: [PATCH 1927/2864] Fix #2037. Major overhaul of settings page.

Convert all tables to 'data::' directives.

Replace inline literals with code blocks for better readability.

Per suggestion from Avaris on IRC:
- Section rename: "Path metadata" to "Metadata" and move over AUTHOR and
  all *_METADATA options.
- Merge "Date format and locale" and "Timezone" into a new section "Time
  and Date" and move over TIMEZONE, DEFAULT_DATE, DATE_FORMATS,
  DEFAULT_DATE_FORMAT.
- Move RELATIVE_URL under 'URL settings'. Here, convert URL settings
  example from a 4-bullet inline literal to a single code block for
  better readability in both source and output.
- Move *_TEMPLATE options under "Templates".

Cosmetic and wording updates to accommodate the above changes and
provide a consistent layout.
---
 docs/settings.rst | 1209 +++++++++++++++++++++++++++++----------------
 1 file changed, 771 insertions(+), 438 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index bf203841..235e1f37 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -6,8 +6,8 @@ the command line::
 
     pelican content -s path/to/your/pelicanconf.py
 
-(If you used the ``pelican-quickstart`` command, your primary settings file will
-be named ``pelicanconf.py`` by default.)
+If you used the ``pelican-quickstart`` command, your primary settings file will
+be named ``pelicanconf.py`` by default.
 
 .. note::
 
@@ -39,193 +39,276 @@ Here is a list of settings for Pelican:
 Basic settings
 ==============
 
-===============================================================================  =====================================================================
-Setting name (followed by default value, if any)                                 What does it do?
-===============================================================================  =====================================================================
-``AUTHOR``                                                                       Default author (put your name)
-``DATE_FORMATS = {}``                                                            If you manage multiple languages, you can set the date formatting
-                                                                                 here. See the :ref:`date_format_and_locale` section below for details.
-``USE_FOLDER_AS_CATEGORY = True``                                                When you don't specify a category in your post metadata, set this
-                                                                                 setting to ``True``, and organize your articles in subfolders, the
-                                                                                 subfolder will become the category of your post. If set to ``False``,
-                                                                                 ``DEFAULT_CATEGORY`` will be used as a fallback.
-``DEFAULT_CATEGORY = 'misc'``                                                    The default category to fall back on.
-``DEFAULT_DATE_FORMAT = '%a %d %B %Y'``                                          The default date format you want to use.
-``DISPLAY_PAGES_ON_MENU = True``                                                 Whether to display pages on the menu of the
-                                                                                 template. Templates may or may not honor this
-                                                                                 setting.
-``DISPLAY_CATEGORIES_ON_MENU = True``                                            Whether to display categories on the menu of the
-                                                                                 template. Templates may or not honor this
-                                                                                 setting.
-``DEFAULT_DATE = None``                                                          The default date you want to use.
-                                                                                 If ``'fs'``, Pelican will use the file system
-                                                                                 timestamp information (mtime) if it can't get
-                                                                                 date information from the metadata.
-                                                                                 If given any other string, it will be parsed by the same method 
-                                                                                 as article metadata.
-                                                                                 If set to a tuple object, the default datetime object will instead
-                                                                                 be generated by passing the tuple to the
-                                                                                 ``datetime.datetime`` constructor.
-``DEFAULT_METADATA = {}``                                                        The default metadata you want to use for all articles and pages.
-``DOCUTILS_SETTINGS = {}``                                                       Extra configuration settings for the docutils publisher
-                                                                                 (applicable only to reStructuredText). See `Docutils
-                                                                                 Configuration`_ settings for more details.
+.. data:: USE_FOLDER_AS_CATEGORY = True
 
-``FILENAME_METADATA =`` ``'(?P<date>\d{4}-\d{2}-\d{2}).*'``                      The regexp that will be used to extract any metadata
-                                                                                 from the filename. All named groups that are matched
-                                                                                 will be set in the metadata object.
-                                                                                 The default value will only extract the date from
-                                                                                 the filename.
-                                                                                 For example, if you would like to extract both the
-                                                                                 date and the slug, you could set something like:
-                                                                                 ``'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'``.
-                                                                                 See :ref:`path_metadata` and ``SLUGIFY_SOURCE``.
-``PATH_METADATA = ''``                                                           Like ``FILENAME_METADATA``, but parsed from a page's
-                                                                                 full path relative to the content source directory.
-                                                                                 See :ref:`path_metadata`.
-``EXTRA_PATH_METADATA = {}``                                                     Extra metadata dictionaries keyed by relative path. Relative paths
-                                                                                 require correct OS-specific directory separators (i.e. / in UNIX and
-                                                                                 \\ in Windows) unlike some other Pelican file settings.
-                                                                                 See :ref:`path_metadata`.
-``DELETE_OUTPUT_DIRECTORY = False``                                              Delete the output directory, and **all** of its contents, before
-                                                                                 generating new files. This can be useful in preventing older,
-                                                                                 unnecessary files from persisting in your output. However, **this is
-                                                                                 a destructive setting and should be handled with extreme care.**
-``OUTPUT_RETENTION = []``                                                        A list of filenames that should be retained and not deleted from the
-                                                                                 output directory. One use case would be the preservation of version
-                                                                                 control data. For example: ``[".hg", ".git", ".bzr"]``
-``JINJA_EXTENSIONS = []``                                                        A list of any Jinja2 extensions you want to use.
-``JINJA_FILTERS = {}``                                                           A dictionary of custom Jinja2 filters you want to use.
-                                                                                 The dictionary should map the filtername to the filter function.
-                                                                                 For example: ``{'urlencode': urlencode_filter}``
-                                                                                 See `Jinja custom filters documentation`_.
-``LOCALE`` [#]_                                                                  Change the locale. A list of locales can be provided
-                                                                                 here or a single string representing one locale.
-                                                                                 When providing a list, all the locales will be tried
-                                                                                 until one works.
-``LOG_FILTER = []``                                                              A list of tuples containing the logging level (up to ``warning``)
-                                                                                 and the message to be ignored.
-                                                                                 For example: ``[(logging.WARN, 'TAG_SAVE_AS is set to False')]``
-``READERS = {}``                                                                 A dictionary of file extensions / Reader classes for Pelican to
-                                                                                 process or ignore. For example, to avoid processing .html files,
-                                                                                 set: ``READERS = {'html': None}``. To add a custom reader for the
-                                                                                 ``foo`` extension, set: ``READERS = {'foo': FooReader}``
-``IGNORE_FILES = ['.#*']``                                                       A list of glob patterns.  Files and directories matching any
-                                                                                 of these patterns will be ignored by the processor. For example,
-                                                                                 the default ``['.#*']`` will ignore emacs lock files, and
-                                                                                 ``['__pycache__']`` would ignore Python 3's bytecode caches.
-``MARKDOWN =`` ``{...}``                                                         Extra configuration settings for the Markdown processor.
-                                                                                 Refer to the Python Markdown documentation's
-                                                                                 `Options section 
-                                                                                 <http://pythonhosted.org/Markdown/reference.html#markdown>`_
-                                                                                 for a complete list of supported options.
-                                                                                 The ``extensions`` option will be automatically computed from the 
-                                                                                 ``extension_configs`` option.
-                                                                                 Default is ``{'extension_configs': {'markdown.extensions.codehilite':
-                                                                                 {'css_class': 'highlight'},'markdown.extensions.extra': {},
-                                                                                 'markdown.extensions.meta': {},}, 'output_format': 'html5',}``.
-``OUTPUT_PATH = 'output/'``                                                      Where to output the generated files.
-``PATH``                                                                         Path to content directory to be processed by Pelican. If undefined,
-                                                                                 and content path is not specified via an argument to the ``pelican``
-                                                                                 command, Pelican will use the current working directory.
-``PAGE_PATHS = ['pages']``                                                       A list of directories and files to look at for pages,
-                                                                                 relative to ``PATH``.
-``PAGE_EXCLUDES = []``                                                           A list of directories to exclude when looking for pages in addition
-                                                                                 to ``ARTICLE_PATHS``.
-``ARTICLE_PATHS = ['']``                                                         A list of directories and files to look at for articles,
-                                                                                 relative to ``PATH``.
-``ARTICLE_EXCLUDES = []``                                                        A list of directories to exclude when looking for articles in addition
-                                                                                 to ``PAGE_PATHS``.
-``OUTPUT_SOURCES = False``                                                       Set to True if you want to copy the articles and pages in their
-                                                                                 original format (e.g. Markdown or reStructuredText) to the
-                                                                                 specified ``OUTPUT_PATH``.
-``OUTPUT_SOURCES_EXTENSION = '.text'``                                           Controls the extension that will be used by the SourcesGenerator.
-                                                                                 Defaults to ``.text``. If not a valid string the default value
-                                                                                 will be used.
-``RELATIVE_URLS = False``                                                        Defines whether Pelican should use document-relative URLs or
-                                                                                 not. Only set this to ``True`` when developing/testing and only
-                                                                                 if you fully understand the effect it can have on links/feeds.
-``PLUGINS = []``                                                                 The list of plugins to load. See :ref:`plugins`.
-``PLUGIN_PATHS = []``                                                            A list of directories where to look for plugins. See :ref:`plugins`.
-``SITENAME = 'A Pelican Blog'``                                                  Your site name
-``SITEURL``                                                                      Base URL of your website. Not defined by default,
-                                                                                 so it is best to specify your SITEURL; if you do not, feeds
-                                                                                 will not be generated with properly-formed URLs. You should
-                                                                                 include ``http://`` and your domain, with no trailing
-                                                                                 slash at the end. Example: ``SITEURL = 'http://mydomain.com'``
-``TEMPLATE_PAGES = None``                                                        A mapping containing template pages that will be rendered with
-                                                                                 the blog entries. See :ref:`template_pages`.
-``STATIC_PATHS = ['images']``                                                    A list of directories (relative to ``PATH``) in which to look for
-                                                                                 static files. Such files will be copied to the output directory
-                                                                                 without modification. Articles, pages, and other content source
-                                                                                 files will normally be skipped, so it is safe for a directory to
-                                                                                 appear both here and in ``PAGE_PATHS`` or ``ARTICLE_PATHS``.
-                                                                                 Pelican's default settings include the "images" directory here.
-``STATIC_EXCLUDES = []``                                                         A list of directories to exclude when looking for static files.
-``STATIC_EXCLUDE_SOURCES = True``                                                If set to False, content source files will not be skipped when
-                                                                                 copying files found in ``STATIC_PATHS``. This setting is for
-                                                                                 backward compatibility with Pelican releases before version 3.5.
-                                                                                 It has no effect unless ``STATIC_PATHS`` contains a directory that
-                                                                                 is also in ``ARTICLE_PATHS`` or ``PAGE_PATHS``. If you are trying
-                                                                                 to publish your site's source files, consider using the
-                                                                                 ``OUTPUT_SOURCES`` setting instead.
-``TIMEZONE``                                                                     The timezone used in the date information, to
-                                                                                 generate Atom and RSS feeds. See the *Timezone*
-                                                                                 section below for more info.
-``TYPOGRIFY = False``                                                            If set to True, several typographical improvements will be
-                                                                                 incorporated into the generated HTML via the `Typogrify
-                                                                                 <https://pypi.python.org/pypi/typogrify>`_ library,
-                                                                                 which can be installed via: ``pip install typogrify``
-``TYPOGRIFY_IGNORE_TAGS = []``                                                   A list of tags for Typogrify to ignore. By default
-                                                                                 Typogrify will ignore ``pre`` and ``code`` tags. This
-                                                                                 requires that Typogrify version 2.0.4 or later is installed
-``DIRECT_TEMPLATES =`` ``['index', 'categories', 'authors', 'archives']``        List of templates that are used directly to render
-                                                                                 content. Typically direct templates are used to generate
-                                                                                 index pages for collections of content (e.g., tags and
-                                                                                 category index pages). If the tag and category collections
-                                                                                 are not needed, set ``DIRECT_TEMPLATES = ['index', 'archives']``
-``PAGINATED_DIRECT_TEMPLATES = ['index']``                                       Provides the direct templates that should be paginated.
-``SUMMARY_MAX_LENGTH = 50``                                                      When creating a short summary of an article, this will
-                                                                                 be the default length (measured in words) of the text created.
-                                                                                 This only applies if your content does not otherwise
-                                                                                 specify a summary. Setting to ``None`` will cause the summary
-                                                                                 to be a copy of the original content.
-``EXTRA_TEMPLATES_PATHS = []``                                                   A list of paths you want Jinja2 to search for templates.
-                                                                                 Can be used to separate templates from the theme.
-                                                                                 Example: projects, resume, profile ...
-                                                                                 These templates need to use ``DIRECT_TEMPLATES`` setting.
-``WITH_FUTURE_DATES = True``                                                     If disabled, content with dates in the future will get a default
-                                                                                 status of ``draft``. See :ref:`reading_only_modified_content`
-                                                                                 for caveats.
-``INTRASITE_LINK_REGEX = '[{|](?P<what>.*?)[|}]'``                               Regular expression that is used to parse internal links. Default
-                                                                                 syntax when linking to internal files, tags, etc., is to enclose
-                                                                                 the identifier, say ``filename``, in ``{}`` or ``||``. Identifier
-                                                                                 between ``{`` and ``}`` goes into the ``what`` capturing group.
-                                                                                 For details see :ref:`ref-linking-to-internal-content`.
-``PYGMENTS_RST_OPTIONS = []``                                                    A list of default Pygments settings for your reStructuredText
-                                                                                 code blocks. See :ref:`internal_pygments_options` for a list of
-                                                                                 supported options.
-``SLUGIFY_SOURCE = 'title'``                                                     Specifies where you want the slug to be automatically generated
-                                                                                 from. Can be set to ``title`` to use the 'Title:' metadata tag or
-                                                                                 ``basename`` to use the article's file name when creating the slug.
-``CACHE_CONTENT = False``                                                        If ``True``, saves content in caches.
-                                                                                 See :ref:`reading_only_modified_content` for details about caching.
-``CONTENT_CACHING_LAYER = 'reader'``                                             If set to ``'reader'``, save only the raw content and metadata
-                                                                                 returned by readers. If set to ``'generator'``, save processed
-                                                                                 content objects.
-``CACHE_PATH = 'cache'``                                                         Directory in which to store cache files.
-``GZIP_CACHE = True``                                                            If ``True``, use gzip to (de)compress the cache files.
-``CHECK_MODIFIED_METHOD = 'mtime'``                                              Controls how files are checked for modifications.
-``LOAD_CONTENT_CACHE = False``                                                   If ``True``, load unmodified content from caches.
-``WRITE_SELECTED = []``                                                          If this list is not empty, **only** output files with their paths
-                                                                                 in this list are written. Paths should be either absolute or relative
-                                                                                 to the current Pelican working directory. For possible use cases see
-                                                                                 :ref:`writing_only_selected_content`.
-``FORMATTED_FIELDS = ['summary']``                                               A list of metadata fields containing reST/Markdown content to be
-                                                                                 parsed and translated to HTML.
-===============================================================================  =====================================================================
+   When you don't specify a category in your post metadata, set this setting to
+   ``True``, and organize your articles in subfolders, the subfolder will
+   become the category of your post. If set to ``False``, ``DEFAULT_CATEGORY``
+   will be used as a fallback.
 
-.. [#] Default is the system locale.
+.. data:: DEFAULT_CATEGORY = 'misc'
+
+   The default category to fall back on.
+
+.. data:: DISPLAY_PAGES_ON_MENU = True
+
+   Whether to display pages on the menu of the template. Templates may or may
+   not honor this setting.
+
+.. data:: DISPLAY_CATEGORIES_ON_MENU = True
+
+   Whether to display categories on the menu of the template. Templates may or
+   not honor this setting.
+
+.. data:: DOCUTILS_SETTINGS = {}
+
+   Extra configuration settings for the docutils publisher (applicable only to
+   reStructuredText). See `Docutils Configuration`_ settings for more details.
+
+.. data:: DELETE_OUTPUT_DIRECTORY = False
+
+   Delete the output directory, and **all** of its contents, before generating
+   new files. This can be useful in preventing older, unnecessary files from
+   persisting in your output. However, **this is a destructive setting and
+   should be handled with extreme care.**
+
+.. data:: OUTPUT_RETENTION = []
+
+   A list of filenames that should be retained and not deleted from the output
+   directory. One use case would be the preservation of version control data.
+
+   Example::
+
+      OUTPUT_RETENTION = [".hg", ".git", ".bzr"]
+
+.. data:: JINJA_EXTENSIONS = []
+
+   A list of any Jinja2 extensions you want to use.
+
+.. data:: JINJA_FILTERS = {}
+
+   A dictionary of custom Jinja2 filters you want to use.  The dictionary
+   should map the filtername to the filter function.
+
+   Example::
+
+    JINJA_FILTERS = {'urlencode': urlencode_filter}
+
+   See `Jinja custom filters documentation`_.
+
+.. data:: LOG_FILTER = []
+
+   A list of tuples containing the logging level (up to ``warning``) and the
+   message to be ignored.
+
+   Example::
+
+      LOG_FILTER = [(logging.WARN, 'TAG_SAVE_AS is set to False')]
+
+.. data:: READERS = {}
+
+   A dictionary of file extensions / Reader classes for Pelican to process or
+   ignore.
+
+   For example, to avoid processing .html files, set::
+
+      READERS = {'html': None}
+
+   To add a custom reader for the ``foo`` extension, set::
+
+      READERS = {'foo': FooReader}
+
+.. data:: IGNORE_FILES = ['.#*']
+
+   A list of glob patterns.  Files and directories matching any of these
+   patterns will be ignored by the processor. For example, the default
+   ``['.#*']`` will ignore emacs lock files, and ``['__pycache__']`` would
+   ignore Python 3's bytecode caches.
+
+.. data:: MARKDOWN = {...}
+
+   Extra configuration settings for the Markdown processor. Refer to the Python 
+   Markdown documentation's `Options section 
+   <http://pythonhosted.org/Markdown/reference.html#markdown>`_ for a complete 
+   list of supported options. The ``extensions`` option will be automatically 
+   computed from the ``extension_configs`` option.
+
+   Defaults to::
+
+        MARKDOWN = {
+            'extension_configs': {
+                'markdown.extensions.codehilite': {'css_class': 'highlight'},
+                'markdown.extensions.extra': {},
+                'markdown.extensions.meta': {},
+            },
+            'output_format': 'html5',
+        }
+
+   .. Note::
+      The dictionary defined in your settings file will update this default 
+      one.
+
+.. data:: OUTPUT_PATH = 'output/'
+
+   Where to output the generated files.
+
+.. data:: PATH
+
+   Path to content directory to be processed by Pelican. If undefined, and
+   content path is not specified via an argument to the ``pelican`` command,
+   Pelican will use the current working directory.
+
+.. data:: PAGE_PATHS = ['pages']
+
+   A list of directories and files to look at for pages, relative to ``PATH``.
+
+.. data:: PAGE_EXCLUDES = []
+
+   A list of directories to exclude when looking for pages in addition to
+   ``ARTICLE_PATHS``.
+
+.. data:: ARTICLE_PATHS = ['']
+
+   A list of directories and files to look at for articles, relative to
+   ``PATH``.
+
+.. data:: ARTICLE_EXCLUDES = []
+
+   A list of directories to exclude when looking for articles in addition to
+   ``PAGE_PATHS``.
+
+.. data:: OUTPUT_SOURCES = False
+
+   Set to True if you want to copy the articles and pages in their original
+   format (e.g. Markdown or reStructuredText) to the specified ``OUTPUT_PATH``.
+
+.. data:: OUTPUT_SOURCES_EXTENSION = '.text'
+
+   Controls the extension that will be used by the SourcesGenerator.  Defaults
+   to ``.text``. If not a valid string the default value will be used.
+
+.. data:: PLUGINS = []
+
+   The list of plugins to load. See :ref:`plugins`.
+
+.. data:: PLUGIN_PATHS = []
+
+   A list of directories where to look for plugins. See :ref:`plugins`.
+
+.. data:: SITENAME = 'A Pelican Blog'
+
+   Your site name
+
+.. data:: SITEURL
+
+   Base URL of your website. Not defined by default, so it is best to specify
+   your SITEURL; if you do not, feeds will not be generated with
+   properly-formed URLs. You should include ``http://`` and your domain, with
+   no trailing slash at the end. Example: ``SITEURL = 'http://mydomain.com'``
+
+.. data:: STATIC_PATHS = ['images']
+
+   A list of directories (relative to ``PATH``) in which to look for static
+   files. Such files will be copied to the output directory without
+   modification. Articles, pages, and other content source files will normally
+   be skipped, so it is safe for a directory to appear both here and in
+   ``PAGE_PATHS`` or ``ARTICLE_PATHS``.  Pelican's default settings include the
+   "images" directory here.
+
+.. data:: STATIC_EXCLUDES = []
+
+   A list of directories to exclude when looking for static files.
+
+.. data:: STATIC_EXCLUDE_SOURCES = True
+
+   If set to False, content source files will not be skipped when copying files
+   found in ``STATIC_PATHS``. This setting is for backward compatibility with
+   Pelican releases before version 3.5.  It has no effect unless
+   ``STATIC_PATHS`` contains a directory that is also in ``ARTICLE_PATHS`` or
+   ``PAGE_PATHS``. If you are trying to publish your site's source files,
+   consider using the ``OUTPUT_SOURCES`` setting instead.
+
+.. data:: TYPOGRIFY = False
+
+   If set to True, several typographical improvements will be incorporated into
+   the generated HTML via the `Typogrify
+   <https://pypi.python.org/pypi/typogrify>`_ library, which can be installed
+   via: ``pip install typogrify``
+
+.. data:: TYPOGRIFY_IGNORE_TAGS = []
+
+   A list of tags for Typogrify to ignore. By default Typogrify will ignore
+   ``pre`` and ``code`` tags. This requires that Typogrify version 2.0.4 or
+   later is installed
+
+.. data:: SUMMARY_MAX_LENGTH = 50
+
+   When creating a short summary of an article, this will be the default length
+   (measured in words) of the text created.  This only applies if your content
+   does not otherwise specify a summary. Setting to ``None`` will cause the
+   summary to be a copy of the original content.
+
+.. data:: WITH_FUTURE_DATES = True
+
+   If disabled, content with dates in the future will get a default status of
+   ``draft``. See :ref:`reading_only_modified_content` for caveats.
+
+.. data:: INTRASITE_LINK_REGEX = '[{|](?P<what>.*?)[|}]'
+
+   Regular expression that is used to parse internal links. Default syntax when
+   linking to internal files, tags, etc., is to enclose the identifier, say
+   ``filename``, in ``{}`` or ``||``. Identifier between ``{`` and ``}`` goes
+   into the ``what`` capturing group.  For details see
+   :ref:`ref-linking-to-internal-content`.
+
+.. data:: PYGMENTS_RST_OPTIONS = []
+
+   A list of default Pygments settings for your reStructuredText code blocks.
+   See :ref:`internal_pygments_options` for a list of supported options.
+
+.. data:: SLUGIFY_SOURCE = 'title'
+
+   Specifies where you want the slug to be automatically generated from. Can be
+   set to ``title`` to use the 'Title:' metadata tag or ``basename`` to use the
+   article's file name when creating the slug.
+
+.. data:: CACHE_CONTENT = False
+
+   If ``True``, saves content in caches.  See
+   :ref:`reading_only_modified_content` for details about caching.
+
+.. data:: CONTENT_CACHING_LAYER = 'reader'
+
+   If set to ``'reader'``, save only the raw content and metadata returned by
+   readers. If set to ``'generator'``, save processed content objects.
+
+.. data:: CACHE_PATH = 'cache'
+
+   Directory in which to store cache files.
+
+.. data:: GZIP_CACHE = True
+
+   If ``True``, use gzip to (de)compress the cache files.
+
+.. data:: CHECK_MODIFIED_METHOD = 'mtime'
+
+   Controls how files are checked for modifications.
+
+.. data:: LOAD_CONTENT_CACHE = False
+
+   If ``True``, load unmodified content from caches.
+
+.. data:: WRITE_SELECTED = []
+
+   If this list is not empty, **only** output files with their paths in this
+   list are written. Paths should be either absolute or relative to the current
+   Pelican working directory. For possible use cases see
+   :ref:`writing_only_selected_content`.
+
+.. data:: FORMATTED_FIELDS = ['summary']
+
+   A list of metadata fields containing reST/Markdown content to be parsed and
+   translated to HTML.
 
 
 URL settings
@@ -264,60 +347,133 @@ Also, you can use other file metadata attributes as well:
 * author
 * category
 
-Example usage:
+Example usage::
 
-* ``ARTICLE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'``
-* ``ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'``
-* ``PAGE_URL = 'pages/{slug}/'``
-* ``PAGE_SAVE_AS = 'pages/{slug}/index.html'``
+   ARTICLE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'
+   ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'
+   PAGE_URL = 'pages/{slug}/'
+   PAGE_SAVE_AS = 'pages/{slug}/index.html'
 
-This would save your articles into something like ``/posts/2011/Aug/07/sample-post/index.html``,
+This would save your articles into something like 
+``/posts/2011/Aug/07/sample-post/index.html``,
 save your pages into ``/pages/about/index.html``, and render them available at
-URLs of ``/posts/2011/Aug/07/sample-post/`` and ``/pages/about/``, respectively.
+URLs of ``/posts/2011/Aug/07/sample-post/`` and ``/pages/about/``, 
+respectively.
 
-======================================================  ==============================================================
-Setting name (followed by default value, if any)        What does it do?
-======================================================  ==============================================================
-``ARTICLE_URL = '{slug}.html'``                         The URL to refer to an article.
-``ARTICLE_SAVE_AS = '{slug}.html'``                     The place where we will save an article.
-``ARTICLE_LANG_URL = '{slug}-{lang}.html'``             The URL to refer to an article which doesn't use the
-                                                        default language.
-``ARTICLE_LANG_SAVE_AS = '{slug}-{lang}.html'``         The place where we will save an article which
-                                                        doesn't use the default language.
-``DRAFT_URL = 'drafts/{slug}.html'``                    The URL to refer to an article draft.
-``DRAFT_SAVE_AS = 'drafts/{slug}.html'``                The place where we will save an article draft.
-``DRAFT_LANG_URL = 'drafts/{slug}-{lang}.html'``        The URL to refer to an article draft which doesn't
-                                                        use the default language.
-``DRAFT_LANG_SAVE_AS = 'drafts/{slug}-{lang}.html'``    The place where we will save an article draft which
-                                                        doesn't use the default language.
-``PAGE_URL = 'pages/{slug}.html'``                      The URL we will use to link to a page.
-``PAGE_SAVE_AS = 'pages/{slug}.html'``                  The location we will save the page. This value has to be
-                                                        the same as PAGE_URL or you need to use a rewrite in
-                                                        your server config.
-``PAGE_LANG_URL = 'pages/{slug}-{lang}.html'``          The URL we will use to link to a page which doesn't
-                                                        use the default language.
-``PAGE_LANG_SAVE_AS = 'pages/{slug}-{lang}.html'``      The location we will save the page which doesn't
-                                                        use the default language.
-``CATEGORY_URL = 'category/{slug}.html'``               The URL to use for a category.
-``CATEGORY_SAVE_AS = 'category/{slug}.html'``           The location to save a category.
-``TAG_URL = 'tag/{slug}.html'``                         The URL to use for a tag.
-``TAG_SAVE_AS = 'tag/{slug}.html'``                     The location to save the tag page.
-``AUTHOR_URL = 'author/{slug}.html'``                   The URL to use for an author.
-``AUTHOR_SAVE_AS = 'author/{slug}.html'``               The location to save an author.
-``YEAR_ARCHIVE_SAVE_AS = ''``                           The location to save per-year archives of your posts.
-``MONTH_ARCHIVE_SAVE_AS = ''``                          The location to save per-month archives of your posts.
-``DAY_ARCHIVE_SAVE_AS = ''``                            The location to save per-day archives of your posts.
-``SLUG_SUBSTITUTIONS = ()``                             Substitutions to make prior to stripping out
-                                                        non-alphanumerics when generating slugs. Specified
-                                                        as a list of 3-tuples of ``(from, to, skip)`` which are
-                                                        applied in order. ``skip`` is a boolean indicating whether
-                                                        or not to skip replacement of non-alphanumeric characters.
-                                                        Useful for backward compatibility with existing URLs.
-``AUTHOR_SUBSTITUTIONS = ()``                           Substitutions for authors. ``SLUG_SUBSTITUTIONS`` is not
-                                                        taken into account here!
-``CATEGORY_SUBSTITUTIONS = ()``                         Added to ``SLUG_SUBSTITUTIONS`` for categories.
-``TAG_SUBSTITUTIONS = ()``                              Added to ``SLUG_SUBSTITUTIONS`` for tags.
-======================================================  ==============================================================
+.. data:: RELATIVE_URLS = False
+
+   Defines whether Pelican should use document-relative URLs or not. Only set
+   this to ``True`` when developing/testing and only if you fully understand
+   the effect it can have on links/feeds.
+
+.. data:: ARTICLE_URL = '{slug}.html'
+
+   The URL to refer to an article.
+
+.. data:: ARTICLE_SAVE_AS = '{slug}.html'
+
+   The place where we will save an article.
+
+.. data:: ARTICLE_LANG_URL = '{slug}-{lang}.html'
+
+   The URL to refer to an article which doesn't use the default language.
+
+.. data:: ARTICLE_LANG_SAVE_AS = '{slug}-{lang}.html'
+
+   The place where we will save an article which doesn't use the default
+   language.
+
+.. data:: DRAFT_URL = 'drafts/{slug}.html'
+
+   The URL to refer to an article draft.
+
+.. data:: DRAFT_SAVE_AS = 'drafts/{slug}.html'
+
+   The place where we will save an article draft.
+
+.. data:: DRAFT_LANG_URL = 'drafts/{slug}-{lang}.html'
+
+   The URL to refer to an article draft which doesn't use the default language.
+
+.. data:: DRAFT_LANG_SAVE_AS = 'drafts/{slug}-{lang}.html'
+
+   The place where we will save an article draft which doesn't use the default
+   language.
+
+.. data:: PAGE_URL = 'pages/{slug}.html'
+
+   The URL we will use to link to a page.
+
+.. data:: PAGE_SAVE_AS = 'pages/{slug}.html'
+
+   The location we will save the page. This value has to be the same as
+   PAGE_URL or you need to use a rewrite in your server config.
+
+.. data:: PAGE_LANG_URL = 'pages/{slug}-{lang}.html'
+
+   The URL we will use to link to a page which doesn't use the default
+   language.
+
+.. data:: PAGE_LANG_SAVE_AS = 'pages/{slug}-{lang}.html'
+
+   The location we will save the page which doesn't use the default language.
+
+.. data:: CATEGORY_URL = 'category/{slug}.html'
+
+   The URL to use for a category.
+
+.. data:: CATEGORY_SAVE_AS = 'category/{slug}.html'
+
+   The location to save a category.
+
+.. data:: TAG_URL = 'tag/{slug}.html'
+
+   The URL to use for a tag.
+
+.. data:: TAG_SAVE_AS = 'tag/{slug}.html'
+
+   The location to save the tag page.
+
+.. data:: AUTHOR_URL = 'author/{slug}.html'
+
+   The URL to use for an author.
+
+.. data:: AUTHOR_SAVE_AS = 'author/{slug}.html'
+
+   The location to save an author.
+
+.. data:: YEAR_ARCHIVE_SAVE_AS = ''
+
+   The location to save per-year archives of your posts.
+
+.. data:: MONTH_ARCHIVE_SAVE_AS = ''
+
+   The location to save per-month archives of your posts.
+
+.. data:: DAY_ARCHIVE_SAVE_AS = ''
+
+   The location to save per-day archives of your posts.
+
+.. data:: SLUG_SUBSTITUTIONS = ()
+
+   Substitutions to make prior to stripping out non-alphanumerics when
+   generating slugs. Specified as a list of 3-tuples of ``(from, to, skip)``
+   which are applied in order. ``skip`` is a boolean indicating whether or not
+   to skip replacement of non-alphanumeric characters.  Useful for backward
+   compatibility with existing URLs.
+
+.. data:: AUTHOR_SUBSTITUTIONS = ()
+
+   Substitutions for authors. ``SLUG_SUBSTITUTIONS`` is not taken into account
+   here!
+
+.. data:: CATEGORY_SUBSTITUTIONS = ()
+
+   Added to ``SLUG_SUBSTITUTIONS`` for categories.
+
+.. data:: TAG_SUBSTITUTIONS = ()
+
+   Added to ``SLUG_SUBSTITUTIONS`` for tags.
 
 .. note::
 
@@ -330,12 +486,16 @@ Setting name (followed by default value, if any)        What does it do?
 
     Substitutions are applied in order with the side effect that keeping
     non-alphanum characters applies to the whole string when a replacement
-    is made. For example if you have the following setting
-    ``SLUG_SUBSTITUTIONS = (('C++', 'cpp'), ('keep dot', 'keep.dot', True))``
+    is made.
+
+    For example if you have the following setting::
+
+       SLUG_SUBSTITUTIONS = (('C++', 'cpp'), ('keep dot', 'keep.dot', True))
+
     the string ``Keep Dot`` will be converted to ``keep.dot``, however
     ``C++ will keep dot`` will be converted to ``cpp will keep.dot`` instead
     of ``cpp-will-keep.dot``!
-    
+
     If you want to keep non-alphanum characters only for tags or categories
     but not other slugs then configure ``TAG_SUBSTITUTIONS`` and
     ``CATEGORY_SUBSTITUTIONS`` respectively!
@@ -346,10 +506,10 @@ enabled if you supply format strings for their respective ``_SAVE_AS`` settings.
 Period archives fit intuitively with the hierarchical model of web URLs and can
 make it easier for readers to navigate through the posts you've written over time.
 
-Example usage:
+Example usage::
 
-* ``YEAR_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/index.html'``
-* ``MONTH_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/index.html'``
+   YEAR_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/index.html'
+   MONTH_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/index.html'
 
 With these settings, Pelican will create an archive of all your posts for the
 year at (for instance) ``posts/2011/index.html`` and an archive of all your
@@ -361,92 +521,137 @@ posts for the month at ``posts/2011/Aug/index.html``.
     arrive at an appropriate archive of posts, without having to specify
     a page name.
 
-``DIRECT_TEMPLATES``, which are ``['index', 'tags', 'categories', 'archives']``
-by default, work a bit differently than noted above. Only the ``_SAVE_AS``
-settings are available, but it is available for any direct template.
+``DIRECT_TEMPLATES`` work a bit differently than noted above. Only the 
+``_SAVE_AS`` settings are available, but it is available for any direct 
+template.
 
-=============================================  ======================================================
-Setting name (followed by default value)       What does it do?
-=============================================  ======================================================
-``ARCHIVES_SAVE_AS = 'archives.html'``         The location to save the article archives page.
-``YEAR_ARCHIVE_SAVE_AS = ''``                  The location to save per-year archives of your posts.
-``MONTH_ARCHIVE_SAVE_AS = ''``                 The location to save per-month archives of your posts.
-``DAY_ARCHIVE_SAVE_AS = ''``                   The location to save per-day archives of your posts.
-``AUTHORS_SAVE_AS = 'authors.html'``           The location to save the author list.
-``CATEGORIES_SAVE_AS = 'categories.html'``     The location to save the category list.
-``TAGS_SAVE_AS = 'tags.html'``                 The location to save the tag list.
-``INDEX_SAVE_AS = 'index.html'``               The location to save the list of all articles.
-=============================================  ======================================================
+.. data:: ARCHIVES_SAVE_AS = 'archives.html'
+
+   The location to save the article archives page.
+
+.. data:: YEAR_ARCHIVE_SAVE_AS = ''
+
+   The location to save per-year archives of your posts.
+
+.. data:: MONTH_ARCHIVE_SAVE_AS = ''
+
+   The location to save per-month archives of your posts.
+
+.. data:: DAY_ARCHIVE_SAVE_AS = ''
+
+   The location to save per-day archives of your posts.
+
+.. data:: AUTHORS_SAVE_AS = 'authors.html'
+
+   The location to save the author list.
+
+.. data:: CATEGORIES_SAVE_AS = 'categories.html'
+
+   The location to save the category list.
+
+.. data:: TAGS_SAVE_AS = 'tags.html'
+
+   The location to save the tag list.
+
+.. data:: INDEX_SAVE_AS = 'index.html'
+
+   The location to save the list of all articles.
 
 URLs for direct template pages are theme-dependent. Some themes use
 corresponding ``*_URL`` setting as string, while others hard-code them:
 ``'archives.html'``, ``'authors.html'``, ``'categories.html'``, ``'tags.html'``.
 
+Time and Date
+=============
 
-Timezone
---------
+.. data:: TIMEZONE
 
-If no timezone is defined, UTC is assumed. This means that the generated Atom
-and RSS feeds will contain incorrect date information if your locale is not UTC.
+   The timezone used in the date information, to generate Atom and RSS feeds.
 
-Pelican issues a warning in case this setting is not defined, as it was not
-mandatory in previous versions.
+   If no timezone is defined, UTC is assumed. This means that the generated 
+   Atom and RSS feeds will contain incorrect date information if your locale is 
+   not UTC.
 
-Have a look at `the wikipedia page`_ to get a list of valid timezone values.
+   Pelican issues a warning in case this setting is not defined, as it was not
+   mandatory in previous versions.
+
+   Have a look at `the wikipedia page`_ to get a list of valid timezone values.
 
 .. _the wikipedia page: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
-.. _date_format_and_locale:
+.. data:: DEFAULT_DATE = None
 
-Date format and locale
-----------------------
+   The default date you want to use.  If ``'fs'``, Pelican will use the file
+   system timestamp information (mtime) if it can't get date information from
+   the metadata.  If given any other string, it will be parsed by the same
+   method as article metadata.  If set to a tuple object, the default datetime
+   object will instead be generated by passing the tuple to the
+   ``datetime.datetime`` constructor.
 
-If no ``DATE_FORMATS`` are set, Pelican will fall back to
-``DEFAULT_DATE_FORMAT``. If you need to maintain multiple languages with
-different date formats, you can set the ``DATE_FORMATS`` dictionary using the
-language name (``lang`` metadata in your post content) as the key.
+.. data:: DEFAULT_DATE_FORMAT = '%a %d %B %Y'
 
-In addition to the standard C89 strftime format codes that are listed in
-`Python strftime documentation`_, you can use ``-`` character between ``%`` and
-the format character to remove any leading zeros. For example, ``%d/%m/%Y`` will
-output ``01/01/2014`` whereas ``%-d/%-m/%Y`` will result in ``1/1/2014``.
+   The default date format you want to use.
 
-.. parsed-literal::
+.. data:: DATE_FORMATS = {}
 
-    DATE_FORMATS = {
-        'en': '%a, %d %b %Y',
-        'jp': '%Y-%m-%d(%a)',
-    }
+   If you manage multiple languages, you can set the date formatting here.
 
-You can set locale to further control date format:
+   If no ``DATE_FORMATS`` are set, Pelican will fall back to
+   ``DEFAULT_DATE_FORMAT``. If you need to maintain multiple languages with
+   different date formats, you can set the ``DATE_FORMATS`` dictionary using 
+   the language name (``lang`` metadata in your post content) as the key.
 
-.. parsed-literal::
+   In addition to the standard C89 strftime format codes that are listed in 
+   `Python strftime documentation`_, you can use the ``-`` character between 
+   ``%`` and the format character to remove any leading zeros. For example, 
+   ``%d/%m/%Y`` will output ``01/01/2014`` whereas ``%-d/%-m/%Y`` will result 
+   in ``1/1/2014``.
 
-    LOCALE = ('usa', 'jpn',  # On Windows
-        'en_US', 'ja_JP'     # On Unix/Linux
-        )
+   .. parsed-literal::
 
-Also, it is possible to set different locale settings for each language. If you
-put (locale, format) tuples in the dict, this will override the ``LOCALE``
-setting above:
+       DATE_FORMATS = {
+           'en': '%a, %d %b %Y',
+           'jp': '%Y-%m-%d(%a)',
+       }
 
-.. parsed-literal::
-    # On Unix/Linux
-    DATE_FORMATS = {
-        'en': ('en_US','%a, %d %b %Y'),
-        'jp': ('ja_JP','%Y-%m-%d(%a)'),
-    }
+   It is also possible to set different locale settings for each language by 
+   using a ``(locale, format)`` tuple as a dictionary value which will override 
+   the ``LOCALE`` setting:
 
-    # On Windows
-    DATE_FORMATS = {
-        'en': ('usa','%a, %d %b %Y'),
-        'jp': ('jpn','%Y-%m-%d(%a)'),
-    }
+   .. parsed-literal::
 
-This is a list of available `locales on Windows`_ . On Unix/Linux, usually you
-can get a list of available locales via the ``locale -a`` command; see manpage
-`locale(1)`_ for more information.
+      # On Unix/Linux
+      DATE_FORMATS = {
+          'en': ('en_US','%a, %d %b %Y'),
+          'jp': ('ja_JP','%Y-%m-%d(%a)'),
+      }
 
+      # On Windows
+      DATE_FORMATS = {
+          'en': ('usa','%a, %d %b %Y'),
+          'jp': ('jpn','%Y-%m-%d(%a)'),
+      }
+
+.. data:: LOCALE
+
+   Change the locale [#]_. A list of locales can be provided here or a single 
+   string representing one locale.  When providing a list, all the locales will 
+   be tried until one works.
+
+   You can set locale to further control date format:
+
+   .. parsed-literal::
+
+       LOCALE = ('usa', 'jpn',      # On Windows
+                 'en_US', 'ja_JP'   # On Unix/Linux
+      )
+
+   For a list of available locales refer to `locales on Windows`_  or on 
+   Unix/Linux, use the ``locale -a`` command; see manpage
+   `locale(1)`_ for more information.
+
+
+.. [#] Default is the system locale.
 
 .. _Python strftime documentation: http://docs.python.org/library/datetime.html#strftime-strptime-behavior
 
@@ -457,27 +662,76 @@ can get a list of available locales via the ``locale -a`` command; see manpage
 
 .. _template_pages:
 
-
 Template pages
 ==============
 
-If you want to generate custom pages besides your blog entries, you can point
-any Jinja2 template file with a path pointing to the file and the destination
-path for the generated file.
+.. data:: TEMPLATE_PAGES = None
 
-For instance, if you have a blog with three static pages — a list of books,
-your resume, and a contact page — you could have::
+   A mapping containing template pages that will be rendered with the blog
+   entries. See :ref:`template_pages`.
 
-    TEMPLATE_PAGES = {'src/books.html': 'dest/books.html',
-                      'src/resume.html': 'dest/resume.html',
-                      'src/contact.html': 'dest/contact.html'}
+   If you want to generate custom pages besides your blog entries, you can 
+   point any Jinja2 template file with a path pointing to the file and the 
+   destination path for the generated file.
+
+   For instance, if you have a blog with three static pages — a list of books,
+   your resume, and a contact page — you could have::
+
+       TEMPLATE_PAGES = {'src/books.html': 'dest/books.html',
+                         'src/resume.html': 'dest/resume.html',
+                         'src/contact.html': 'dest/contact.html'}
+
+.. data:: DIRECT_TEMPLATES = ['index', 'categories', 'authors', 'archives']
+
+   List of templates that are used directly to render content. Typically direct
+   templates are used to generate index pages for collections of content (e.g.,
+   tags and category index pages). If the tag and category collections are not
+   needed, set ``DIRECT_TEMPLATES = ['index', 'archives']``
+
+.. data:: PAGINATED_DIRECT_TEMPLATES = ['index']
+
+   Provides the direct templates that should be paginated.
+
+.. data:: EXTRA_TEMPLATES_PATHS = []
+
+   A list of paths you want Jinja2 to search for templates.  Can be used to
+   separate templates from the theme.  Example: projects, resume, profile ...
+   These templates need to use ``DIRECT_TEMPLATES`` setting.
 
 
-.. _path_metadata:
+Metadata
+========
 
+.. data:: AUTHOR
 
-Path metadata
-=============
+   Default author (usually your name).
+
+.. data:: DEFAULT_METADATA = {}
+
+   The default metadata you want to use for all articles and pages.
+
+.. data:: FILENAME_METADATA = '(?P<date>\d{4}-\d{2}-\d{2}).*'
+
+   The regexp that will be used to extract any metadata from the filename. All
+   named groups that are matched will be set in the metadata object.  The
+   default value will only extract the date from the filename.
+
+   For example, to extract both the date and the slug::
+
+      FILENAME_METADATA = '(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'
+
+   See also ``SLUGIFY_SOURCE``.
+
+.. data:: PATH_METADATA = ''
+
+   Like ``FILENAME_METADATA``, but parsed from a page's full path relative to
+   the content source directory.
+
+.. data:: EXTRA_PATH_METADATA = {}
+
+   Extra metadata dictionaries keyed by relative path. Relative paths require
+   correct OS-specific directory separators (i.e. / in UNIX and \\ in Windows)
+   unlike some other Pelican file settings.
 
 Not all metadata needs to be :ref:`embedded in source file itself
 <internal_metadata>`. For example, blog posts are often named
@@ -529,33 +783,61 @@ Pelican generates category feeds as well as feeds for all your articles. It does
 not generate feeds for tags by default, but it is possible to do so using
 the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 
-=================================================   =====================================================
-Setting name (followed by default value, if any)    What does it do?
-=================================================   =====================================================
-``FEED_DOMAIN = None``, i.e. base URL is "/"        The domain prepended to feed URLs. Since feed URLs
-                                                    should always be absolute, it is highly recommended
-                                                    to define this (e.g., "http://feeds.example.com"). If
-                                                    you have already explicitly defined SITEURL (see
-                                                    above) and want to use the same domain for your
-                                                    feeds, you can just set:  ``FEED_DOMAIN = SITEURL``.
-``FEED_ATOM = None``, i.e. no Atom feed             Relative URL to output the Atom feed.
-``FEED_RSS = None``, i.e. no RSS                    Relative URL to output the RSS feed.
-``FEED_ALL_ATOM = 'feeds/all.atom.xml'``            Relative URL to output the all-posts Atom feed:
-                                                    this feed will contain all posts regardless of their
-                                                    language.
-``FEED_ALL_RSS = None``, i.e. no all-posts RSS      Relative URL to output the all-posts RSS feed:
-                                                    this feed will contain all posts regardless of their
-                                                    language.
-``CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'`` [2]_   Where to put the category Atom feeds.
-``CATEGORY_FEED_RSS = None``, i.e. no RSS           Where to put the category RSS feeds.
-``AUTHOR_FEED_ATOM = 'feeds/%s.atom.xml'`` [2]_     Where to put the author Atom feeds.
-``AUTHOR_FEED_RSS = 'feeds/%s.rss.xml'`` [2]_       Where to put the author RSS feeds.
-``TAG_FEED_ATOM = None``, i.e. no tag feed          Relative URL to output the tag Atom feed. It should
-                                                    be defined using a "%s" match in the tag name.
-``TAG_FEED_RSS = None``, i.e. no RSS tag feed       Relative URL to output the tag RSS feed
-``FEED_MAX_ITEMS``                                  Maximum number of items allowed in a feed. Feed item
-                                                    quantity is unrestricted by default.
-=================================================   =====================================================
+.. data:: FEED_DOMAIN = None, i.e. base URL is "/"
+
+   The domain prepended to feed URLs. Since feed URLs should always be
+   absolute, it is highly recommended to define this (e.g.,
+   "http://feeds.example.com"). If you have already explicitly defined SITEURL
+   (see above) and want to use the same domain for your feeds, you can just
+   set:  ``FEED_DOMAIN = SITEURL``.
+
+.. data:: FEED_ATOM = None, i.e. no Atom feed
+
+   Relative URL to output the Atom feed.
+
+.. data:: FEED_RSS = None, i.e. no RSS
+
+   Relative URL to output the RSS feed.
+
+.. data:: FEED_ALL_ATOM = 'feeds/all.atom.xml'
+
+   Relative URL to output the all-posts Atom feed: this feed will contain all
+   posts regardless of their language.
+
+.. data:: FEED_ALL_RSS = None, i.e. no all-posts RSS
+
+   Relative URL to output the all-posts RSS feed: this feed will contain all
+   posts regardless of their language.
+
+.. data:: CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
+
+   Where to put the category Atom feeds. [2]_
+
+.. data:: CATEGORY_FEED_RSS = None, i.e. no RSS
+
+   Where to put the category RSS feeds.
+
+.. data:: AUTHOR_FEED_ATOM = 'feeds/%s.atom.xml'
+
+   Where to put the author Atom feeds. [2]_
+
+.. data:: AUTHOR_FEED_RSS = 'feeds/%s.rss.xml'
+
+   Where to put the author RSS feeds. [2]_
+
+.. data:: TAG_FEED_ATOM = None, i.e. no tag feed
+
+   Relative URL to output the tag Atom feed. It should be defined using a "%s"
+   match in the tag name.
+
+.. data:: TAG_FEED_RSS = None, i.e. no RSS tag feed
+
+   Relative URL to output the tag RSS feed
+
+.. data:: FEED_MAX_ITEMS
+
+   Maximum number of items allowed in a feed. Feed item quantity is
+   unrestricted by default.
 
 If you don't want to generate some or any of these feeds, set the above variables to ``None``.
 
@@ -592,18 +874,19 @@ benefit from paginating this list.
 
 You can use the following settings to configure the pagination.
 
-================================================    =====================================================
-Setting name (followed by default value, if any)    What does it do?
-================================================    =====================================================
-``DEFAULT_ORPHANS = 0``                             The minimum number of articles allowed on the
-                                                    last page. Use this when you don't want the last page
-                                                    to only contain a handful of articles.
-``DEFAULT_PAGINATION = False``                      The maximum number of articles to include on a
-                                                    page, not including orphans. False to disable
-                                                    pagination.
-``PAGINATION_PATTERNS``                             A set of patterns that are used to determine advanced
-                                                    pagination output.
-================================================    =====================================================
+.. data:: DEFAULT_ORPHANS = 0
+
+   The minimum number of articles allowed on the last page. Use this when you
+   don't want the last page to only contain a handful of articles.
+
+.. data:: DEFAULT_PAGINATION = False
+
+   The maximum number of articles to include on a page, not including orphans.
+   False to disable pagination.
+
+.. data:: PAGINATION_PATTERNS
+
+   A set of patterns that are used to determine advanced pagination output.
 
 
 Using Pagination Patterns
@@ -635,13 +918,17 @@ Translations
 Pelican offers a way to translate articles. See the :doc:`Content <content>` section for
 more information.
 
-========================================================    =====================================================
-Setting name (followed by default value, if any)            What does it do?
-========================================================    =====================================================
-``DEFAULT_LANG = 'en'``                                     The default language to use.
-``TRANSLATION_FEED_ATOM = 'feeds/all-%s.atom.xml'`` [3]_    Where to put the Atom feed for translations.
-``TRANSLATION_FEED_RSS = None``, i.e. no RSS                Where to put the RSS feed for translations.
-========================================================    =====================================================
+.. data:: DEFAULT_LANG = 'en'
+
+   The default language to use.
+
+.. data:: TRANSLATION_FEED_ATOM = 'feeds/all-%s.atom.xml'
+
+   Where to put the Atom feed for translations. [3]_
+
+.. data:: TRANSLATION_FEED_RSS = None, i.e. no RSS
+
+   Where to put the RSS feed for translations.
 
 .. [3] %s is the language
 
@@ -649,26 +936,31 @@ Setting name (followed by default value, if any)            What does it do?
 Ordering content
 ================
 
-================================================    ==============================================================
-Setting name (followed by default value)            What does it do?
-================================================    ==============================================================
-``NEWEST_FIRST_ARCHIVES = True``                    Order archives by newest first by date. (False:
-                                                    orders by date with older articles first.)
-``REVERSE_CATEGORY_ORDER = False``                  Reverse the category order. (True: lists by reverse
-                                                    alphabetical order; default lists alphabetically.)
-``ARTICLE_ORDER_BY = 'reversed-date'``              Defines how the articles (``articles_page.object_list`` in
-                                                    the template) are sorted. Valid options are: metadata as a
-                                                    string (use ``reversed-`` prefix the reverse the sort order),
-                                                    special option ``'basename'`` which will use the basename of
-                                                    the file (without path) or a custom function to extract the
-                                                    sorting key from articles. The default value,
-                                                    ``'reversed-date'``, will sort articles by date in reverse
-                                                    order (i.e. newest article comes first).
-``PAGE_ORDER_BY = 'basename'``                      Defines how the pages (``PAGES`` variable in the template)
-                                                    are sorted. Options are same as ``ARTICLE_ORDER_BY``.
-                                                    The default value, ``'basename'`` will sort pages by their
-                                                    basename.
-================================================    ==============================================================
+.. data:: NEWEST_FIRST_ARCHIVES = True
+
+   Order archives by newest first by date. (False: orders by date with older
+   articles first.)
+
+.. data:: REVERSE_CATEGORY_ORDER = False
+
+   Reverse the category order. (True: lists by reverse alphabetical order;
+   default lists alphabetically.)
+
+.. data:: ARTICLE_ORDER_BY = 'reversed-date'
+
+   Defines how the articles (``articles_page.object_list`` in the template) are
+   sorted. Valid options are: metadata as a string (use ``reversed-`` prefix
+   the reverse the sort order), special option ``'basename'`` which will use
+   the basename of the file (without path) or a custom function to extract the
+   sorting key from articles. The default value, ``'reversed-date'``, will sort
+   articles by date in reverse order (i.e. newest article comes first).
+
+.. data:: PAGE_ORDER_BY = 'basename'
+
+   Defines how the pages (``PAGES`` variable in the template) are sorted.
+   Options are same as ``ARTICLE_ORDER_BY``.  The default value, ``'basename'``
+   will sort pages by their basename.
+
 
 
 Themes
@@ -677,25 +969,27 @@ Themes
 Creating Pelican themes is addressed in a dedicated section (see :ref:`theming-pelican`).
 However, here are the settings that are related to themes.
 
-================================================    =====================================================
-Setting name (followed by default value, if any)    What does it do?
-================================================    =====================================================
-``THEME``                                           Theme to use to produce the output. Can be a relative
-                                                    or absolute path to a theme folder, or the name of a
-                                                    default theme or a theme installed via
-                                                    ``pelican-themes`` (see below).
-``THEME_STATIC_DIR = 'theme'``                      Destination directory in the output path where
-                                                    Pelican will place the files collected from
-                                                    `THEME_STATIC_PATHS`. Default is `theme`.
-``THEME_STATIC_PATHS = ['static']``                 Static theme paths you want to copy. Default
-                                                    value is `static`, but if your theme has
-                                                    other static paths, you can put them here. If files
-                                                    or directories with the same names are included in
-                                                    the paths defined in this settings, they will be
-                                                    progressively overwritten.
-``CSS_FILE = 'main.css'``                           Specify the CSS file you want to load.
-================================================    =====================================================
+.. data:: THEME
 
+   Theme to use to produce the output. Can be a relative or absolute path to a
+   theme folder, or the name of a default theme or a theme installed via
+   ``pelican-themes`` (see below).
+
+.. data:: THEME_STATIC_DIR = 'theme'
+
+   Destination directory in the output path where Pelican will place the files
+   collected from `THEME_STATIC_PATHS`. Default is `theme`.
+
+.. data:: THEME_STATIC_PATHS = ['static']
+
+   Static theme paths you want to copy. Default value is `static`, but if your
+   theme has other static paths, you can put them here. If files or directories
+   with the same names are included in the paths defined in this settings, they
+   will be progressively overwritten.
+
+.. data:: CSS_FILE = 'main.css'
+
+   Specify the CSS file you want to load.
 
 By default, two themes are available. You can specify them using the ``THEME``
 setting or by passing the ``-t`` option to the ``pelican`` command:
@@ -723,39 +1017,74 @@ Following are example ways to specify your preferred theme::
 The built-in ``notmyidea`` theme can make good use of the following settings. Feel
 free to use them in your themes as well.
 
-=======================   =====================================================
-Setting name              What does it do?
-=======================   =====================================================
-``SITESUBTITLE``          A subtitle to appear in the header.
-``DISQUS_SITENAME``       Pelican can handle Disqus comments. Specify the
-                          Disqus sitename identifier here.
-``GITHUB_URL``            Your GitHub URL (if you have one). It will then
-                          use this information to create a GitHub ribbon.
-``GOOGLE_ANALYTICS``      Set to ``UA-XXXXX-Y`` Property's tracking ID to
-                          activate Google Analytics.
-``GA_COOKIE_DOMAIN``      Set cookie domain field of Google Analytics tracking
-                          code. Defaults to ``auto``.
-``GOSQUARED_SITENAME``    Set to 'XXX-YYYYYY-X' to activate GoSquared.
-``MENUITEMS``             A list of tuples (Title, URL) for additional menu
-                          items to appear at the beginning of the main menu.
-``PIWIK_URL``             URL to your Piwik server - without 'http://' at the
-                          beginning.
-``PIWIK_SSL_URL``         If the SSL-URL differs from the normal Piwik-URL
-                          you have to include this setting too. (optional)
-``PIWIK_SITE_ID``         ID for the monitored website. You can find the ID
-                          in the Piwik admin interface > Settings > Websites.
-``LINKS``                 A list of tuples (Title, URL) for links to appear on
-                          the header.
-``SOCIAL``                A list of tuples (Title, URL) to appear in the
-                          "social" section.
-``TWITTER_USERNAME``      Allows for adding a button to articles to encourage
-                          others to tweet about them. Add your Twitter username
-                          if you want this button to appear.
-``LINKS_WIDGET_NAME``     Allows override of the name of the links widget.
-                          If not specified, defaults to "links".
-``SOCIAL_WIDGET_NAME``    Allows override of the name of the "social" widget.
-                          If not specified, defaults to "social".
-=======================   =====================================================
+.. data:: SITESUBTITLE
+
+   A subtitle to appear in the header.
+
+.. data:: DISQUS_SITENAME
+
+   Pelican can handle Disqus comments. Specify the Disqus sitename identifier
+   here.
+
+.. data:: GITHUB_URL
+
+   Your GitHub URL (if you have one). It will then use this information to
+   create a GitHub ribbon.
+
+.. data:: GOOGLE_ANALYTICS
+
+   Set to ``UA-XXXXX-Y`` Property's tracking ID to activate Google Analytics.
+
+.. data:: GA_COOKIE_DOMAIN
+
+   Set cookie domain field of Google Analytics tracking code. Defaults to
+   ``auto``.
+
+.. data:: GOSQUARED_SITENAME
+
+   Set to 'XXX-YYYYYY-X' to activate GoSquared.
+
+.. data:: MENUITEMS
+
+   A list of tuples (Title, URL) for additional menu items to appear at the
+   beginning of the main menu.
+
+.. data:: PIWIK_URL
+
+   URL to your Piwik server - without 'http://' at the beginning.
+
+.. data:: PIWIK_SSL_URL
+
+   If the SSL-URL differs from the normal Piwik-URL you have to include this
+   setting too. (optional)
+
+.. data:: PIWIK_SITE_ID
+
+   ID for the monitored website. You can find the ID in the Piwik admin
+   interface > Settings > Websites.
+
+.. data:: LINKS
+
+   A list of tuples (Title, URL) for links to appear on the header.
+
+.. data:: SOCIAL
+
+   A list of tuples (Title, URL) to appear in the "social" section.
+
+.. data:: TWITTER_USERNAME
+
+   Allows for adding a button to articles to encourage others to tweet about
+   them. Add your Twitter username if you want this button to appear.
+
+.. data:: LINKS_WIDGET_NAME
+
+   Allows override of the name of the links widget.  If not specified, defaults
+   to "links".
+
+.. data:: SOCIAL_WIDGET_NAME
+
+   Allows override of the name of the "social" widget.  If not specified,
+   defaults to "social".
 
 In addition, you can use the "wide" version of the ``notmyidea`` theme by
 adding the following to your configuration::
@@ -776,17 +1105,21 @@ composed of the logging level (up to ``warning``) and the message to be ignored.
 Simply populate the list with the log messages you want to hide, and they will
 be filtered out.
 
-For example: ``[(logging.WARN, 'TAG_SAVE_AS is set to False')]``
+For example::
+
+   [(logging.WARN, 'TAG_SAVE_AS is set to False')]
 
 It is possible to filter out messages by a template. Check out source code to
 obtain a template.
 
-For example: ``[(logging.WARN, 'Empty alt attribute for image %s in %s')]``
+For example::
 
-**Warning:** Silencing messages by templates is a dangerous feature. It is
-possible to unintentionally filter out multiple message types with the same
-template (including messages from future Pelican versions). Proceed with
-caution.
+   [(logging.WARN, 'Empty alt attribute for image %s in %s')]
+
+.. Warning::
+   Silencing messages by templates is a dangerous feature. It is possible to 
+   unintentionally filter out multiple message types with the same template 
+   (including messages from future Pelican versions). Proceed with caution.
 
 Note: This option does nothing ``--debug`` is passed.
 

From 6f9f0def0f6699d760f525658bbc6eb4a3a4cfef Mon Sep 17 00:00:00 2001
From: John <john.m.storey@gmail.com>
Date: Thu, 17 Nov 2016 23:15:46 +0000
Subject: [PATCH 1928/2864] Fix #1325 and add test_find_empty_alt

---
 pelican/readers.py            |  4 ++--
 pelican/tests/test_readers.py | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 4542e608..e899838a 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -584,7 +584,7 @@ def find_empty_alt(content, path):
             # src before alt
             <img
             [^\>]*
-            src=(['"])(.*)\1
+            src=(['"])(.*?)\1
             [^\>]*
             alt=(['"])\3
         )|(?:
@@ -593,7 +593,7 @@ def find_empty_alt(content, path):
             [^\>]*
             alt=(['"])\4
             [^\>]*
-            src=(['"])(.*)\5
+            src=(['"])(.*?)\5
         )
         """, re.X)
     for match in re.findall(imgs, content):
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 9f13473e..ac0f81dc 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -9,6 +9,13 @@ from pelican import readers
 from pelican.tests.support import get_settings, unittest
 from pelican.utils import SafeDatetime
 
+try:
+    from unittest.mock import patch
+except ImportError:
+    try:
+        from mock import patch
+    except ImportError:
+        patch = False
 
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_PATH = os.path.join(CUR_DIR, 'content')
@@ -81,6 +88,22 @@ class DefaultReaderTest(ReaderTest):
         with self.assertRaises(TypeError):
             self.read_file(path='article_with_metadata.unknownextension')
 
+    @unittest.skipUnless(patch, 'Needs Mock module')
+    def test_find_empty_alt(self):
+        with patch('pelican.readers.logger') as log_mock:
+            content = ['<img alt="" src="test-image.png" width="300px" />',
+                       '<img src="test-image.png"  width="300px" alt="" />']
+
+            for tag in content:
+                readers.find_empty_alt(tag, '/test/path')
+                log_mock.warning.assert_called_with(
+                    u'Empty alt attribute for image %s in %s',
+                    u'test-image.png',
+                    u'/test/path',
+                    extra={'limit_msg':
+                           'Other images have empty alt attributes'}
+                )
+
 
 class RstReaderTest(ReaderTest):
 

From d3b22c6e2113e3f1af483a3535b8681a67a60f54 Mon Sep 17 00:00:00 2001
From: Alexander Turenko <totktonada.ru@gmail.com>
Date: Wed, 16 Nov 2016 02:18:46 +0300
Subject: [PATCH 1929/2864] Add option to include full content into RSS feeds

Include only summary by default.

This follow ups pull [1], where RSS feeds become summary-only.

[1]: https://github.com/getpelican/pelican/pull/1989
---
 docs/settings.rst   | 6 ++++++
 pelican/settings.py | 1 +
 pelican/writers.py  | 7 ++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 235e1f37..3421d7c8 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -839,6 +839,12 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
    Maximum number of items allowed in a feed. Feed item quantity is
    unrestricted by default.
 
+.. data:: RSS_FEED_SUMMARY_ONLY = True
+
+   Only include item summaries in the ``description`` tag of RSS feeds. If set
+   to ``False``, the full content will be included instead. This setting
+   doesn't affect Atom feeds, only RSS ones.
+
 If you don't want to generate some or any of these feeds, set the above variables to ``None``.
 
 .. [2] %s is the name of the category.
diff --git a/pelican/settings.py b/pelican/settings.py
index 5773b925..7a6b7515 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -49,6 +49,7 @@ DEFAULT_CONFIG = {
     'AUTHOR_FEED_RSS': posix_join('feeds', '%s.rss.xml'),
     'TRANSLATION_FEED_ATOM': posix_join('feeds', 'all-%s.atom.xml'),
     'FEED_MAX_ITEMS': '',
+    'RSS_FEED_SUMMARY_ONLY': True,
     'SITEURL': '',
     'SITENAME': 'A Pelican Blog',
     'DISPLAY_PAGES_ON_MENU': True,
diff --git a/pelican/writers.py b/pelican/writers.py
index 30000a5f..d1c8069a 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -47,11 +47,16 @@ class Writer(object):
 
         title = Markup(item.title).striptags()
         link = '%s/%s' % (self.site_url, item.url)
+        is_rss = isinstance(feed, Rss201rev2Feed)
+        if not is_rss or self.settings.get('RSS_FEED_SUMMARY_ONLY'):
+            description = item.summary
+        else:
+            description = item.get_content(self.site_url)
         feed.add_item(
             title=title,
             link=link,
             unique_id=get_tag_uri(link, item.date),
-            description=item.summary,
+            description=description,
             content=item.get_content(self.site_url),
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', ''),

From 4645def789aa15df7191fbc2fe86798dc31b1484 Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sun, 20 Nov 2016 16:00:55 +0100
Subject: [PATCH 1930/2864] Fix translation metadata support

---
 pelican/tests/test_utils.py | 80 ++++++++++++++++++++++---------------
 pelican/utils.py            | 49 +++++++++++++----------
 2 files changed, 77 insertions(+), 52 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 8dfc0b9b..040707ca 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -216,46 +216,62 @@ class TestUtils(LoggedTestCase):
             "&#x222b;dx " * 20 + '…')
 
     def test_process_translations(self):
+        fr_articles = []
+        en_articles = []
+
         # create a bunch of articles
-        # 1: no translation metadata
-        fr_article1 = get_article(lang='fr', slug='yay', title='Un titre',
-                                  content='en français')
-        en_article1 = get_article(lang='en', slug='yay', title='A title',
-                                  content='in english')
-        # 2: reverse which one is the translation thanks to metadata
-        fr_article2 = get_article(lang='fr', slug='yay2', title='Un titre',
-                                  content='en français')
-        en_article2 = get_article(lang='en', slug='yay2', title='A title',
-                                  content='in english',
-                                  extra_metadata={'translation': 'true'})
+        # 0: no translation metadata
+        fr_articles.append(get_article(lang='fr', slug='yay0', title='Titre',
+                                       content='en français'))
+        en_articles.append(get_article(lang='en', slug='yay0', title='Title',
+                                       content='in english'))
+        # 1: translation metadata on default lang
+        fr_articles.append(get_article(lang='fr', slug='yay1', title='Titre',
+                                       content='en français'))
+        en_articles.append(get_article(lang='en', slug='yay1', title='Title',
+                                       content='in english',
+                                       extra_metadata={'translation': 'true'}))
+        # 2: translation metadata not on default lang
+        fr_articles.append(get_article(lang='fr', slug='yay2', title='Titre',
+                                       content='en français',
+                                       extra_metadata={'translation': 'true'}))
+        en_articles.append(get_article(lang='en', slug='yay2', title='Title',
+                                       content='in english'))
         # 3: back to default language detection if all items have the
         #    translation metadata
-        fr_article3 = get_article(lang='fr', slug='yay3', title='Un titre',
-                                  content='en français',
-                                  extra_metadata={'translation': 'yep'})
-        en_article3 = get_article(lang='en', slug='yay3', title='A title',
-                                  content='in english',
-                                  extra_metadata={'translation': 'yes'})
+        fr_articles.append(get_article(lang='fr', slug='yay3', title='Titre',
+                                       content='en français',
+                                       extra_metadata={'translation': 'yep'}))
+        en_articles.append(get_article(lang='en', slug='yay3', title='Title',
+                                       content='in english',
+                                       extra_metadata={'translation': 'yes'}))
 
-        articles = [fr_article1, en_article1, fr_article2, en_article2,
-                    fr_article3, en_article3]
+        # try adding articles in both orders
+        for lang0_articles, lang1_articles in ((fr_articles, en_articles),
+                                               (en_articles, fr_articles)):
+            articles = lang0_articles + lang1_articles
 
-        index, trans = utils.process_translations(articles)
+            index, trans = utils.process_translations(articles)
 
-        self.assertIn(en_article1, index)
-        self.assertIn(fr_article1, trans)
-        self.assertNotIn(en_article1, trans)
-        self.assertNotIn(fr_article1, index)
+            self.assertIn(en_articles[0], index)
+            self.assertIn(fr_articles[0], trans)
+            self.assertNotIn(en_articles[0], trans)
+            self.assertNotIn(fr_articles[0], index)
 
-        self.assertIn(fr_article2, index)
-        self.assertIn(en_article2, trans)
-        self.assertNotIn(fr_article2, trans)
-        self.assertNotIn(en_article2, index)
+            self.assertIn(fr_articles[1], index)
+            self.assertIn(en_articles[1], trans)
+            self.assertNotIn(fr_articles[1], trans)
+            self.assertNotIn(en_articles[1], index)
 
-        self.assertIn(en_article3, index)
-        self.assertIn(fr_article3, trans)
-        self.assertNotIn(en_article3, trans)
-        self.assertNotIn(fr_article3, index)
+            self.assertIn(en_articles[2], index)
+            self.assertIn(fr_articles[2], trans)
+            self.assertNotIn(en_articles[2], trans)
+            self.assertNotIn(fr_articles[2], index)
+
+            self.assertIn(en_articles[3], index)
+            self.assertIn(fr_articles[3], trans)
+            self.assertNotIn(en_articles[3], trans)
+            self.assertNotIn(fr_articles[3], index)
 
     def test_watchers(self):
         # Test if file changes are correctly detected
diff --git a/pelican/utils.py b/pelican/utils.py
index f1558fda..dbf6c639 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -627,41 +627,50 @@ def process_translations(content_list, order_by=None):
 
     for slug, items in grouped_by_slugs:
         items = list(items)
-        # items with `translation` metadata will be used as translations...
-        default_lang_items = list(filter(
-            lambda i:
-                i.metadata.get('translation', 'false').lower() == 'false',
-            items))
-        # ...unless all items with that slug are translations
-        if not default_lang_items:
-            default_lang_items = items
 
         # display warnings if several items have the same lang
         for lang, lang_items in groupby(items, attrgetter('lang')):
             lang_items = list(lang_items)
             len_ = len(lang_items)
             if len_ > 1:
-                logger.warning('There are %s variants of "%s" with lang %s',
-                               len_, slug, lang)
+                logger.warning(
+                    'There are %s items with slug "%s" with lang %s',
+                    len_, slug, lang)
                 for x in lang_items:
                     logger.warning('\t%s', x.source_path)
 
-        # find items with default language
-        default_lang_items = list(filter(
-            attrgetter('in_default_lang'),
-            default_lang_items))
+        # items with `translation` metadata will be used as translations...
+        candidate_items = list(filter(
+            lambda i:
+                i.metadata.get('translation', 'false').lower() == 'false',
+            items))
+        # ...unless all items with that slug are translations
+        if not candidate_items:
+            logger.warning('All items with slug "%s" are translations', slug)
+            candidate_items = items
 
-        # if there is no article with default language, take an other one
-        if not default_lang_items:
-            default_lang_items = items[:1]
+        # find items with default language
+        original_items = list(filter(
+            attrgetter('in_default_lang'),
+            candidate_items))
+
+        # if there is no article with default language, go back one step
+        if not original_items:
+            original_items = candidate_items
+
+        # display warning if there are several original items
+        if len(original_items) > 1:
+            logger.warning(
+                'There are %s original (not translated) items with slug "%s"',
+                len(original_items), slug)
 
         if not slug:
             logger.warning(
                 'Empty slug for %s. You can fix this by '
                 'adding a title or a slug to your content',
-                default_lang_items[0].source_path)
-        index.extend(default_lang_items)
-        translations.extend([x for x in items if x not in default_lang_items])
+                original_items[0].source_path)
+        index.extend(original_items)
+        translations.extend([x for x in items if x not in original_items])
         for a in items:
             a.translations = [x for x in items if x != a]
 

From 6cc053b920312f020a3adaa285ce8f4d0683307e Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Mon, 21 Nov 2016 23:18:54 +0100
Subject: [PATCH 1931/2864] Improve logging in translation detection

---
 pelican/utils.py | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index dbf6c639..9d780039 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -625,19 +625,28 @@ def process_translations(content_list, order_by=None):
     index = []
     translations = []
 
+    def _warn_source_paths(msg, items, *extra):
+        args = [len(items)]
+        args.extend(extra)
+        args.extend((x.source_path for x in items))
+        logger.warning('{}: {}'.format(msg, '\n%s' * len(items)), *args)
+
     for slug, items in grouped_by_slugs:
         items = list(items)
 
+        # display warnings if slug is empty
+        if not slug:
+            _warn_source_paths('There are %s items with empty slug', items)
+
         # display warnings if several items have the same lang
         for lang, lang_items in groupby(items, attrgetter('lang')):
             lang_items = list(lang_items)
-            len_ = len(lang_items)
-            if len_ > 1:
-                logger.warning(
+            if len(lang_items) > 1:
+                _warn_source_paths(
                     'There are %s items with slug "%s" with lang %s',
-                    len_, slug, lang)
-                for x in lang_items:
-                    logger.warning('\t%s', x.source_path)
+                    lang_items,
+                    slug,
+                    lang)
 
         # items with `translation` metadata will be used as translations...
         candidate_items = list(filter(
@@ -660,15 +669,11 @@ def process_translations(content_list, order_by=None):
 
         # display warning if there are several original items
         if len(original_items) > 1:
-            logger.warning(
+            _warn_source_paths(
                 'There are %s original (not translated) items with slug "%s"',
-                len(original_items), slug)
+                original_items,
+                slug)
 
-        if not slug:
-            logger.warning(
-                'Empty slug for %s. You can fix this by '
-                'adding a title or a slug to your content',
-                original_items[0].source_path)
         index.extend(original_items)
         translations.extend([x for x in items if x not in original_items])
         for a in items:

From 76709c672af1175feaf6a75704121d158f31954a Mon Sep 17 00:00:00 2001
From: Kevin Brotcke <brotckek@amazon.com>
Date: Wed, 23 Nov 2016 14:55:11 -0800
Subject: [PATCH 1932/2864] Fix missing word typo in settings.rst

Also convert to a note directive.
---
 docs/settings.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 235e1f37..937d51e4 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1121,7 +1121,9 @@ For example::
    unintentionally filter out multiple message types with the same template 
    (including messages from future Pelican versions). Proceed with caution.
 
-Note: This option does nothing ``--debug`` is passed.
+.. note::
+
+    This option does nothing if ``--debug`` is passed.
 
 .. _reading_only_modified_content:
 

From 335c40d23eb8b74bd6188646468a75f2c9c67dcd Mon Sep 17 00:00:00 2001
From: Ryan M <ryan@ryanmo.co>
Date: Mon, 29 Aug 2016 11:19:29 -0700
Subject: [PATCH 1933/2864] Allow setting Jinja environment arguments from
 settings

fix flake8 warnings

Set jinja environment defaults within settings

updating docs to remove JINJA_EXTENSIONS

update logger warning and defaults documentation

better way to grab jinja environment

updating settings after refactor
---
 docs/settings.rst                |  7 +++++--
 pelican/generators.py            |  4 +---
 pelican/settings.py              | 30 ++++++++++++++++++++++++++++--
 pelican/tests/test_generators.py | 19 +++++++++++++++++++
 4 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 937d51e4..9134d570 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -81,9 +81,11 @@ Basic settings
 
       OUTPUT_RETENTION = [".hg", ".git", ".bzr"]
 
-.. data:: JINJA_EXTENSIONS = []
+.. data:: JINJA_ENVIRONMENT = {'trim_blocks': True, 'lstrip_blocks': True}
 
-   A list of any Jinja2 extensions you want to use.
+   A dictionary of custom Jinja2 environment variables you want to use. This
+   also includes a list of extensions you may want to include.
+   See `Jinja Environment documentation`_.
 
 .. data:: JINJA_FILTERS = {}
 
@@ -1215,4 +1217,5 @@ Example settings
 
 
 .. _Jinja custom filters documentation: http://jinja.pocoo.org/docs/api/#custom-filters
+.. _Jinja Environment documentation: http://jinja.pocoo.org/docs/dev/api/#jinja2.Environment
 .. _Docutils Configuration: http://docutils.sourceforge.net/docs/user/config.html
diff --git a/pelican/generators.py b/pelican/generators.py
index af3e3513..a7a7fb25 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -61,14 +61,12 @@ class Generator(object):
         simple_loader = FileSystemLoader(os.path.join(theme_path,
                                          "themes", "simple", "templates"))
         self.env = Environment(
-            trim_blocks=True,
-            lstrip_blocks=True,
             loader=ChoiceLoader([
                 FileSystemLoader(self._templates_path),
                 simple_loader,  # implicit inheritance
                 PrefixLoader({'!simple': simple_loader})  # explicit one
             ]),
-            extensions=self.settings['JINJA_EXTENSIONS'],
+            **self.settings['JINJA_ENVIRONMENT']
         )
 
         logger.debug('Template list: %s', self.env.list_templates())
diff --git a/pelican/settings.py b/pelican/settings.py
index 5773b925..b7ddb814 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -109,8 +109,12 @@ DEFAULT_CONFIG = {
         },
         'output_format': 'html5',
     },
-    'JINJA_EXTENSIONS': [],
     'JINJA_FILTERS': {},
+    'JINJA_ENVIRONMENT': {
+        'trim_blocks': True,
+        'lstrip_blocks': True,
+        'extensions': [],
+    },
     'LOG_FILTER': [],
     'LOCALE': [''],  # defaults to user locale
     'DEFAULT_PAGINATION': False,
@@ -162,6 +166,12 @@ def read_settings(path=None, override=None):
                            'PLUGIN_PATHS, moving it to the new setting name.')
             local_settings['PLUGIN_PATHS'] = local_settings['PLUGIN_PATH']
             del local_settings['PLUGIN_PATH']
+        if 'JINJA_EXTENSIONS' in local_settings:
+            logger.warning('JINJA_EXTENSIONS setting has been deprecated, '
+                           'moving it to JINJA_ENVIRONMENT setting.')
+            local_settings['JINJA_ENVIRONMENT']['extensions'] = \
+                local_settings['JINJA_EXTENSIONS']
+            del local_settings['JINJA_EXTENSIONS']
         if isinstance(local_settings['PLUGIN_PATHS'], six.string_types):
             logger.warning("Defining PLUGIN_PATHS setting as string "
                            "has been deprecated (should be a list)")
@@ -215,6 +225,20 @@ def get_settings_from_file(path, default_settings=DEFAULT_CONFIG):
     return get_settings_from_module(module, default_settings=default_settings)
 
 
+def get_jinja_environment(settings):
+    """Sets the environment for Jinja"""
+
+    jinja_env = settings.setdefault('JINJA_ENVIRONMENT',
+                                    DEFAULT_CONFIG['JINJA_ENVIRONMENT'])
+
+    # Make sure we include the defaults if the user has set env variables
+    for key, value in DEFAULT_CONFIG['JINJA_ENVIRONMENT'].items():
+        if key not in jinja_env:
+            jinja_env[key] = value
+
+    return settings
+
+
 def configure_settings(settings):
     """Provide optimizations, error checking, and warnings for the given
     settings.
@@ -251,6 +275,9 @@ def configure_settings(settings):
         if key in settings:
             settings[key] = settings[key].lower()
 
+    # set defaults for Jinja environment
+    settings = get_jinja_environment(settings)
+
     # standardize strings to lists
     for key in ['LOCALE']:
         if key in settings and isinstance(settings[key], six.string_types):
@@ -355,7 +382,6 @@ def configure_settings(settings):
         'EXTRA_TEMPLATES_PATHS',
         'FILES_TO_COPY',
         'IGNORE_FILES',
-        'JINJA_EXTENSIONS',
         'PAGINATED_DIRECT_TEMPLATES',
         'PLUGINS',
         'STATIC_EXCLUDES',
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index feded3e8..3c4684df 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -98,6 +98,25 @@ class TestGenerator(unittest.TestCase):
             'subdir.md', found_files,
             "get_files() excluded a subdirectory by name, ignoring its path")
 
+    def test_custom_jinja_environment(self):
+        """
+            Test that setting the JINJA_ENVIRONMENT
+            properly gets set from the settings config
+        """
+        settings = get_settings()
+        comment_start_string = 'abc'
+        comment_end_string = '/abc'
+        settings['JINJA_ENVIRONMENT'] = {
+            'comment_start_string': comment_start_string,
+            'comment_end_string': comment_end_string
+        }
+        generator = Generator(settings.copy(), settings,
+                              CUR_DIR, settings['THEME'], None)
+        self.assertEqual(comment_start_string,
+                         generator.env.comment_start_string)
+        self.assertEqual(comment_end_string,
+                         generator.env.comment_end_string)
+
 
 class TestArticlesGenerator(unittest.TestCase):
 

From 4aa60a09055afa10be9b6bbb636d59cccb93a05e Mon Sep 17 00:00:00 2001
From: Michael Lissner <mlissner@michaeljaylissner.com>
Date: Tue, 14 Oct 2014 12:54:04 -0700
Subject: [PATCH 1934/2864] Add more docs for `--write-selected` option

Refs #1495
---
 docs/publish.rst  | 14 ++++++++++++++
 docs/settings.rst |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/docs/publish.rst b/docs/publish.rst
index 226662ed..90d91b00 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -1,6 +1,8 @@
 Publish your site
 #################
 
+.. _site_generation:
+
 Site generation
 ===============
 
@@ -16,6 +18,18 @@ folder, using the default theme to produce a simple site. The default theme
 consists of very simple HTML without styling and is provided so folks may use
 it as a basis for creating their own themes.
 
+When working on a single article or page, it is possible to generate only the
+file that corresponds to that content. To do this, use the ``--write-selected``
+argument, like so::
+
+    pelican --write-selected output/posts/my-post-title.html
+
+Note that you must specify the path to the generated *output* file — not the
+source content. To determine the output file path, use the ``--debug`` flag to
+determine the correct file name and location. If desired, ``--write-selected``
+can take a comma-separated list of paths or can be configured as a setting.
+(See: :ref:`writing_only_selected_content`)
+
 You can also tell Pelican to watch for your modifications, instead of
 manually re-running it every time you want to see your changes. To enable this,
 run the ``pelican`` command with the ``-r`` or ``--autoreload`` option.
diff --git a/docs/settings.rst b/docs/settings.rst
index fdb6e15e..56608621 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1212,7 +1212,8 @@ desired files as output paths in the ``WRITE_SELECTED`` list,
 **only** those files will be written. This list can be also specified
 on the command line using the ``--write-selected`` option, which
 accepts a comma-separated list of output file paths. By default this
-list is empty, so all output is written.
+list is empty, so all output is written. See :ref:`site_generation` for
+more details.
 
 
 Example settings

From 550ffe4599a856bb1c49e9116b364bb281577c00 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 3 Dec 2016 14:53:26 -0800
Subject: [PATCH 1935/2864] Remove spurious whitespace in documentation source

---
 docs/faq.rst      |  6 +++---
 docs/publish.rst  |  2 +-
 docs/settings.rst | 54 +++++++++++++++++++++++------------------------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index f75e4e6c..efb49f66 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -138,7 +138,7 @@ your home page. The following Markdown example could be stored in
 ``content/pages/home.md``::
 
     Title: Welcome to My Site
-    URL: 
+    URL:
     save_as: index.html
 
     Thank you for visiting. Welcome!
@@ -161,7 +161,7 @@ disable all feed generation, you only need to specify the following settings::
     AUTHOR_FEED_RSS = None
 
 The word ``None`` should not be surrounded by quotes. Please note that ``None``
-and ``''`` are not the same thing. 
+and ``''`` are not the same thing.
 
 I'm getting a warning about feeds generated without SITEURL being set properly
 ==============================================================================
@@ -203,7 +203,7 @@ Is Pelican only suitable for blogs?
 No. Pelican can be easily configured to create and maintain any type of static site.
 This may require a little customization of your theme and Pelican configuration.
 For example, if you are building a launch site for your product and do not need
-tags on your site, you could remove the relevant HTML code from your theme. 
+tags on your site, you could remove the relevant HTML code from your theme.
 You can also disable generation of tag-related pages via::
 
     TAGS_SAVE_AS = ''
diff --git a/docs/publish.rst b/docs/publish.rst
index 90d91b00..303797c9 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -50,7 +50,7 @@ HTML files directly::
 
 Because the above method may have trouble locating your CSS and other linked
 assets, running a simple web server using Python will often provide a more
-reliable previewing experience. 
+reliable previewing experience.
 
 For Python 2, run::
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 56608621..aef9f674 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -129,10 +129,10 @@ Basic settings
 
 .. data:: MARKDOWN = {...}
 
-   Extra configuration settings for the Markdown processor. Refer to the Python 
-   Markdown documentation's `Options section 
-   <http://pythonhosted.org/Markdown/reference.html#markdown>`_ for a complete 
-   list of supported options. The ``extensions`` option will be automatically 
+   Extra configuration settings for the Markdown processor. Refer to the Python
+   Markdown documentation's `Options section
+   <http://pythonhosted.org/Markdown/reference.html#markdown>`_ for a complete
+   list of supported options. The ``extensions`` option will be automatically
    computed from the ``extension_configs`` option.
 
    Defaults to::
@@ -147,7 +147,7 @@ Basic settings
         }
 
    .. Note::
-      The dictionary defined in your settings file will update this default 
+      The dictionary defined in your settings file will update this default
       one.
 
 .. data:: OUTPUT_PATH = 'output/'
@@ -356,10 +356,10 @@ Example usage::
    PAGE_URL = 'pages/{slug}/'
    PAGE_SAVE_AS = 'pages/{slug}/index.html'
 
-This would save your articles into something like 
+This would save your articles into something like
 ``/posts/2011/Aug/07/sample-post/index.html``,
 save your pages into ``/pages/about/index.html``, and render them available at
-URLs of ``/posts/2011/Aug/07/sample-post/`` and ``/pages/about/``, 
+URLs of ``/posts/2011/Aug/07/sample-post/`` and ``/pages/about/``,
 respectively.
 
 .. data:: RELATIVE_URLS = False
@@ -523,8 +523,8 @@ posts for the month at ``posts/2011/Aug/index.html``.
     arrive at an appropriate archive of posts, without having to specify
     a page name.
 
-``DIRECT_TEMPLATES`` work a bit differently than noted above. Only the 
-``_SAVE_AS`` settings are available, but it is available for any direct 
+``DIRECT_TEMPLATES`` work a bit differently than noted above. Only the
+``_SAVE_AS`` settings are available, but it is available for any direct
 template.
 
 .. data:: ARCHIVES_SAVE_AS = 'archives.html'
@@ -570,8 +570,8 @@ Time and Date
 
    The timezone used in the date information, to generate Atom and RSS feeds.
 
-   If no timezone is defined, UTC is assumed. This means that the generated 
-   Atom and RSS feeds will contain incorrect date information if your locale is 
+   If no timezone is defined, UTC is assumed. This means that the generated
+   Atom and RSS feeds will contain incorrect date information if your locale is
    not UTC.
 
    Pelican issues a warning in case this setting is not defined, as it was not
@@ -600,13 +600,13 @@ Time and Date
 
    If no ``DATE_FORMATS`` are set, Pelican will fall back to
    ``DEFAULT_DATE_FORMAT``. If you need to maintain multiple languages with
-   different date formats, you can set the ``DATE_FORMATS`` dictionary using 
+   different date formats, you can set the ``DATE_FORMATS`` dictionary using
    the language name (``lang`` metadata in your post content) as the key.
 
-   In addition to the standard C89 strftime format codes that are listed in 
-   `Python strftime documentation`_, you can use the ``-`` character between 
-   ``%`` and the format character to remove any leading zeros. For example, 
-   ``%d/%m/%Y`` will output ``01/01/2014`` whereas ``%-d/%-m/%Y`` will result 
+   In addition to the standard C89 strftime format codes that are listed in
+   `Python strftime documentation`_, you can use the ``-`` character between
+   ``%`` and the format character to remove any leading zeros. For example,
+   ``%d/%m/%Y`` will output ``01/01/2014`` whereas ``%-d/%-m/%Y`` will result
    in ``1/1/2014``.
 
    .. parsed-literal::
@@ -616,8 +616,8 @@ Time and Date
            'jp': '%Y-%m-%d(%a)',
        }
 
-   It is also possible to set different locale settings for each language by 
-   using a ``(locale, format)`` tuple as a dictionary value which will override 
+   It is also possible to set different locale settings for each language by
+   using a ``(locale, format)`` tuple as a dictionary value which will override
    the ``LOCALE`` setting:
 
    .. parsed-literal::
@@ -636,8 +636,8 @@ Time and Date
 
 .. data:: LOCALE
 
-   Change the locale [#]_. A list of locales can be provided here or a single 
-   string representing one locale.  When providing a list, all the locales will 
+   Change the locale [#]_. A list of locales can be provided here or a single
+   string representing one locale.  When providing a list, all the locales will
    be tried until one works.
 
    You can set locale to further control date format:
@@ -648,7 +648,7 @@ Time and Date
                  'en_US', 'ja_JP'   # On Unix/Linux
       )
 
-   For a list of available locales refer to `locales on Windows`_  or on 
+   For a list of available locales refer to `locales on Windows`_  or on
    Unix/Linux, use the ``locale -a`` command; see manpage
    `locale(1)`_ for more information.
 
@@ -672,8 +672,8 @@ Template pages
    A mapping containing template pages that will be rendered with the blog
    entries. See :ref:`template_pages`.
 
-   If you want to generate custom pages besides your blog entries, you can 
-   point any Jinja2 template file with a path pointing to the file and the 
+   If you want to generate custom pages besides your blog entries, you can
+   point any Jinja2 template file with a path pointing to the file and the
    destination path for the generated file.
 
    For instance, if you have a blog with three static pages — a list of books,
@@ -1125,8 +1125,8 @@ For example::
    [(logging.WARN, 'Empty alt attribute for image %s in %s')]
 
 .. Warning::
-   Silencing messages by templates is a dangerous feature. It is possible to 
-   unintentionally filter out multiple message types with the same template 
+   Silencing messages by templates is a dangerous feature. It is possible to
+   unintentionally filter out multiple message types with the same template
    (including messages from future Pelican versions). Proceed with caution.
 
 .. note::
@@ -1182,8 +1182,8 @@ can be invoked by passing the ``--archive`` flag).
 
 The cache files are Python pickles, so they may not be readable by
 different versions of Python as the pickle format often changes. If
-such an error is encountered, it is caught and the cache file is 
-rebuilt automatically in the new format. The cache files will also be 
+such an error is encountered, it is caught and the cache file is
+rebuilt automatically in the new format. The cache files will also be
 rebuilt after the ``GZIP_CACHE`` setting has been changed.
 
 The ``--ignore-cache`` command-line option is useful when the

From fc522349865e03ddf6a1e007093727451a8cb5b8 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 10 Dec 2016 01:58:38 -0500
Subject: [PATCH 1936/2864] Fix generator caching

With generator level caching, cached files weren't added to the
collections. Only new files were processed. This fixes the issue.
---
 pelican/generators.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index a7a7fb25..88752392 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -533,7 +533,7 @@ class ArticlesGenerator(CachingGenerator):
                     continue
 
                 if article_or_draft.status.lower() == "published":
-                    all_articles.append(article_or_draft)
+                    pass
                 elif article_or_draft.status.lower() == "draft":
                     article_or_draft = self.readers.read_file(
                         base_path=self.path, path=f, content_class=Draft,
@@ -542,8 +542,6 @@ class ArticlesGenerator(CachingGenerator):
                         preread_sender=self,
                         context_signal=signals.article_generator_context,
                         context_sender=self)
-                    self.add_source_path(article_or_draft)
-                    all_drafts.append(article_or_draft)
                 else:
                     logger.error(
                         "Unknown status '%s' for file %s, skipping it.",
@@ -553,6 +551,10 @@ class ArticlesGenerator(CachingGenerator):
 
                 self.cache_data(f, article_or_draft)
 
+            if article_or_draft.status.lower() == "published":
+                all_articles.append(article_or_draft)
+            else:
+                all_drafts.append(article_or_draft)
             self.add_source_path(article_or_draft)
 
         self.articles, self.translations = process_translations(
@@ -636,11 +638,7 @@ class PagesGenerator(CachingGenerator):
                     self._add_failed_source_path(f)
                     continue
 
-                if page.status.lower() == "published":
-                    all_pages.append(page)
-                elif page.status.lower() == "hidden":
-                    hidden_pages.append(page)
-                else:
+                if page.status.lower() not in ("published", "hidden"):
                     logger.error(
                         "Unknown status '%s' for file %s, skipping it.",
                         page.status, f)
@@ -649,6 +647,10 @@ class PagesGenerator(CachingGenerator):
 
                 self.cache_data(f, page)
 
+            if page.status.lower() == "published":
+                all_pages.append(page)
+            elif page.status.lower() == "hidden":
+                hidden_pages.append(page)
             self.add_source_path(page)
 
         self.pages, self.translations = process_translations(

From 1c09741280d6f3c448883e332ae5ac9e00c2ad96 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 10 Dec 2016 05:18:35 -0500
Subject: [PATCH 1937/2864] Add tests to make sure cached content is properly
 added to generators

---
 pelican/tests/test_cache.py | 94 +++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index e8ea4967..1f26deec 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -36,6 +36,100 @@ class TestCache(unittest.TestCase):
         settings['CACHE_PATH'] = self.temp_cache
         return settings
 
+    def test_generator_caching(self):
+        """Test that cached and uncached content is same in generator level"""
+        settings = self._get_cache_enabled_settings()
+        settings['CONTENT_CACHING_LAYER'] = 'generator'
+        settings['PAGE_PATHS'] = ['TestPages']
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
+        settings['READERS'] = {'asc': None}
+
+        def sorted_titles(items):
+            return sorted(item.title for item in items)
+
+        # Articles
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        uncached_articles = sorted_titles(generator.articles)
+        uncached_drafts = sorted_titles(generator.drafts)
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        cached_articles = sorted_titles(generator.articles)
+        cached_drafts = sorted_titles(generator.drafts)
+
+        self.assertEqual(uncached_articles, cached_articles)
+        self.assertEqual(uncached_drafts, cached_drafts)
+
+        # Pages
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        uncached_pages = sorted_titles(generator.pages)
+        uncached_hidden_pages = sorted_titles(generator.hidden_pages)
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        cached_pages = sorted_titles(generator.pages)
+        cached_hidden_pages = sorted_titles(generator.hidden_pages)
+
+        self.assertEqual(uncached_pages, cached_pages)
+        self.assertEqual(uncached_hidden_pages, cached_hidden_pages)
+
+    def test_reader_caching(self):
+        """Test that cached and uncached content is same in reader level"""
+        settings = self._get_cache_enabled_settings()
+        settings['CONTENT_CACHING_LAYER'] = 'reader'
+        settings['PAGE_PATHS'] = ['TestPages']
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
+        settings['READERS'] = {'asc': None}
+
+        def sorted_titles(items):
+            return sorted(item.title for item in items)
+
+        # Articles
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        uncached_articles = sorted_titles(generator.articles)
+        uncached_drafts = sorted_titles(generator.drafts)
+
+        generator = ArticlesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        cached_articles = sorted_titles(generator.articles)
+        cached_drafts = sorted_titles(generator.drafts)
+
+        self.assertEqual(uncached_articles, cached_articles)
+        self.assertEqual(uncached_drafts, cached_drafts)
+
+        # Pages
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        uncached_pages = sorted_titles(generator.pages)
+        uncached_hidden_pages = sorted_titles(generator.hidden_pages)
+
+        generator = PagesGenerator(
+            context=settings.copy(), settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        cached_pages = sorted_titles(generator.pages)
+        cached_hidden_pages = sorted_titles(generator.hidden_pages)
+
+        self.assertEqual(uncached_pages, cached_pages)
+        self.assertEqual(uncached_hidden_pages, cached_hidden_pages)
+
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_article_object_caching(self):
         """Test Article objects caching at the generator level"""

From 976a9efcc220833a1d00f015c8e15427cdfc0ec2 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 10 Dec 2016 12:15:42 -0500
Subject: [PATCH 1938/2864] Fixes 2059: Fix sphinx version to 1.4.9 for docs
 tests

---
 requirements/developer.pip | 2 +-
 tox.ini                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/developer.pip b/requirements/developer.pip
index 6b839fa3..e5507151 100644
--- a/requirements/developer.pip
+++ b/requirements/developer.pip
@@ -3,4 +3,4 @@
 # Development
 flake8
 flake8-import-order
-sphinx
+sphinx==1.4.9
diff --git a/tox.ini b/tox.ini
index 1e04df53..cb400ea7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,7 @@ commands =
 [testenv:docs]
 basepython = python2.7
 deps =
-    sphinx
+    sphinx==1.4.9
     sphinx_rtd_theme
 changedir = docs
 commands =

From 90025818eda5654a8a75bf2238873752c6c1d846 Mon Sep 17 00:00:00 2001
From: Ryan M <ryan@ryanmo.co>
Date: Sat, 8 Oct 2016 20:25:16 -0700
Subject: [PATCH 1939/2864] prevent server from dying when query strings
 present

split on first ?
---
 pelican/server.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/server.py b/pelican/server.py
index 9074135b..ad68a3bc 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -18,6 +18,10 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
     SUFFIXES = ['', '.html', '/index.html']
 
     def do_GET(self):
+        # cut off a query string
+        if '?' in self.path:
+            self.path, _ = self.path.split('?', 1)
+
         # Try to detect file by applying various suffixes
         for suffix in self.SUFFIXES:
             if not hasattr(self, 'original_path'):

From 97c058e94ff24ca484894179548d35b650630f1b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 12 Dec 2016 11:07:13 -0800
Subject: [PATCH 1940/2864] Remove download statistics badge from README

PyPI download statistics have been broken for a long time and appear to
have been officially disabled in May 2016. See GitHub issue for details:
https://github.com/pypa/pypi-legacy/issues/396
---
 README.rst | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index a6341413..05063251 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-Pelican |build-status| |pypi-version| |pypi-downloads|
-======================================================
+Pelican |build-status| |pypi-version|
+=====================================
 
 Pelican is a static site generator, written in Python_.
 
@@ -62,6 +62,3 @@ Why the name "Pelican"?
 .. |pypi-version| image:: https://img.shields.io/pypi/v/pelican.svg
    :target: https://pypi.python.org/pypi/pelican
    :alt: PyPI: the Python Package Index
-.. |pypi-downloads| image:: https://img.shields.io/pypi/dm/pelican.svg
-   :target: https://pypi.python.org/pypi/pelican
-   :alt: PyPI: the Python Package Index

From e3ab685a26b3dd2d198319b625d380c4f80afbf7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 12 Dec 2016 13:39:31 -0800
Subject: [PATCH 1941/2864] Update changelog for 3.7 release

---
 docs/changelog.rst | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d7bbb99a..129499c2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,21 +1,40 @@
 Release history
 ###############
 
-Next release
-============
+3.7.0 (2016-12-12)
+==================
 
-* ``SLUG_SUBSTITUTIONS`` now accepts 3-tuple elements, allowing to keep
-  non-alphanum characters. Existing 2-tuple configurations will continue to work
-  without change in behavior. The new 3rd parameter has side effects when there
-  are multiple substitutions defined. Plese see the docs.
+* Atom feeds output ``<content>`` in addition to ``<summary>``
+* Atom feeds use ``<published>`` for the original publication date and
+  ``<updated>`` for modifications
+* Simplify Atom feed ID generation and support URL fragments
+* Produce category feeds with category-specific titles
+* RSS feeds now default to summary instead of full content —
+  set ``RSS_FEED_SUMMARY_ONLY = False`` to revert to previous behavior
+* Replace ``MD_EXTENSIONS`` with ``MARKDOWN`` setting
+* Replace ``JINJA_EXTENSIONS`` with more-robust ``JINJA_ENVIRONMENT`` setting
+* Improve summary truncation logic to handle special characters and tags that
+  span multiple lines, using HTML parser instead of regular expressions
+* Include summary when looking for intra-site link substitutions
+* Link to authors and index via ``{author}name`` and ``{index}`` syntax
+* Override widget names via ``LINKS_WIDGET_NAME`` and ``SOCIAL_WIDGET_NAME``
+* Add ``INDEX_SAVE_AS`` option to override default ``index.html`` value
+* Remove ``PAGES`` context variable for themes in favor of ``pages``
+* ``SLUG_SUBSTITUTIONS`` now accepts 3-tuple elements, allowing URL slugs to
+  contain non-alphanumeric characters
 * Tag and category slugs can be controlled with greater precision using the
-  ``TAG_SUBSTITUTIONS`` and ``CATEGORY_SUBSTITUTIONS`` settings. These also
-  allow for keeping non-alphanum characters for backward compatibility with
-  existing URLs.
+  ``TAG_SUBSTITUTIONS`` and ``CATEGORY_SUBSTITUTIONS`` settings
 * Author slugs can be controlled with greater precision using the
-  ``AUTHOR_SUBSTITUTIONS`` setting. Keeping non-alphanum characters is supported
-  as well but discouraged.
-* Replaced ``MD_EXTENSIONS`` with ``MARKDOWN``
+  ``AUTHOR_SUBSTITUTIONS`` setting
+* ``DEFAULT_DATE`` can be defined as a string
+* Use ``mtime`` instead of ``ctime`` when ``DEFAULT_DATE = 'fs'``
+* Add ``--fatal=errors|warnings`` option for use with continuous integration
+* When using generator-level caching, ensure previously-cached files are
+  processed instead of just new files.
+* Add Python and Pelican version information to debug output
+* Improve compatibility with Python 3.5
+* Comply with and enforce PEP8 guidelines
+* Replace tables in settings documentation with ``data::`` directives
 
 3.6.3 (2015-08-14)
 ==================

From f4460a444932629008d25423ee88d2b878bd7126 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 12 Dec 2016 14:00:11 -0800
Subject: [PATCH 1942/2864] Update package metadata

---
 setup.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 164713b9..8d3f9c5e 100755
--- a/setup.py
+++ b/setup.py
@@ -21,13 +21,14 @@ README = open('README.rst').read()
 CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
-    name="pelican",
-    version="3.6.4.dev0",
+    name='pelican',
+    version='3.6.4.dev0',
     url='http://getpelican.com/',
     author='Alexis Metaireau',
+    maintainer='Justin Mayer',
     author_email='authors@getpelican.com',
-    description="A tool to generate a static blog from reStructuredText or "
-                "Markdown input files.",
+    description="Static site generator supporting reStructuredText and "
+                "Markdown source content.",
     long_description=README + '\n' + CHANGELOG,
     packages=['pelican', 'pelican.tools'],
     package_data={

From d13d57eaa6013426775493b971b0b48faabea536 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 12 Dec 2016 14:05:20 -0800
Subject: [PATCH 1943/2864] Bump version 3.7.0

---
 docs/conf.py        | 2 +-
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 4b7d109a..63a4a269 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,7 @@ copyright = '2015, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
-last_stable = '3.6.3'
+last_stable = '3.7.0'
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 12db9adf..159121fa 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -25,7 +25,7 @@ from pelican.utils import (clean_output_dir, file_watcher,
                            folder_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.6.4.dev0"
+__version__ = "3.7.0"
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 logger = logging.getLogger(__name__)
 
diff --git a/setup.py b/setup.py
index 8d3f9c5e..345ba0db 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name='pelican',
-    version='3.6.4.dev0',
+    version='3.7.0',
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     maintainer='Justin Mayer',

From 0936d5f6ee19908d455d9bae35552019237f13da Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 14 Dec 2016 13:56:47 -0800
Subject: [PATCH 1944/2864] Prepare version 3.7.1.dev0 for next development
 cycle

---
 docs/changelog.rst  | 5 +++++
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 129499c2..31868353 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+Next release
+============
+
+- Nothing yet
+
 3.7.0 (2016-12-12)
 ==================
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 159121fa..cdcd98b1 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -25,7 +25,7 @@ from pelican.utils import (clean_output_dir, file_watcher,
                            folder_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.7.0"
+__version__ = "3.7.1.dev0"
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 logger = logging.getLogger(__name__)
 
diff --git a/setup.py b/setup.py
index 345ba0db..e69080f5 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name='pelican',
-    version='3.7.0',
+    version='3.7.1.dev0',
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     maintainer='Justin Mayer',

From 5c6ae32f99c807364c0a3c439985e30c1c0f572d Mon Sep 17 00:00:00 2001
From: "L. E. Segovia" <amyspark@users.noreply.github.com>
Date: Wed, 14 Dec 2016 14:08:09 +0100
Subject: [PATCH 1945/2864] For python 2+, initialize locale. Fixes #2043

---
 pelican/tools/pelican_quickstart.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 6b4eb5a5..ecbc3510 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -21,6 +21,8 @@ import six
 
 from pelican import __version__
 
+if (sys.version_info.major == 2):
+    locale.setlocale(locale.LC_ALL, '')
 
 _TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                               "templates")

From c96edef571aaddc138f8e15946b99fd15c8cca64 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 23 Dec 2016 07:41:52 -0800
Subject: [PATCH 1946/2864] Ignore samples for GitHub language stats analysis

Fixes #2069
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index dfe07704..1b6f7c89 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,5 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+
+# Improve accuracy of GitHub's Linguist-powered language statistics
+samples/* linguist-vendored

From fc9227215b86914baf2082dba36f485743183679 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 23 Dec 2016 08:00:45 -0800
Subject: [PATCH 1947/2864] Ignore test content & output in language analysis

Refs #2069
---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 1b6f7c89..da974e4b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,4 +2,6 @@
 * text=auto
 
 # Improve accuracy of GitHub's Linguist-powered language statistics
+pelican/tests/content/*
+pelican/tests/output/*
 samples/* linguist-vendored

From 98d1d4e3387dc70a062f1897fa5d8f71d5431e2c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 23 Dec 2016 08:03:57 -0800
Subject: [PATCH 1948/2864] Add missing .gitattributes attributes. Refs #2069

---
 .gitattributes | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index da974e4b..9053428d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,6 @@
 * text=auto
 
 # Improve accuracy of GitHub's Linguist-powered language statistics
-pelican/tests/content/*
-pelican/tests/output/*
+pelican/tests/content/* linguist-vendored
+pelican/tests/output/* linguist-vendored
 samples/* linguist-vendored

From 84920e8fdf754b642b9a137cad38c38f9417bde5 Mon Sep 17 00:00:00 2001
From: Lucas Chavez <golucasplus@gmail.com>
Date: Wed, 21 Dec 2016 13:22:29 -0700
Subject: [PATCH 1949/2864] Set locale to LC_ALL in Quickstart script. Fixes
 #2043

---
 pelican/tools/pelican_quickstart.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index ecbc3510..39e58f6f 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -21,8 +21,12 @@ import six
 
 from pelican import __version__
 
-if (sys.version_info.major == 2):
-    locale.setlocale(locale.LC_ALL, '')
+locale.setlocale(locale.LC_ALL, '')
+_DEFAULT_LANGUAGE = locale.getlocale()[0]
+if _DEFAULT_LANGUAGE is None:
+    _DEFAULT_LANGUAGE = 'English'
+else:
+    _DEFAULT_LANGUAGE = _DEFAULT_LANGUAGE.split('_')[0]
 
 _TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                               "templates")
@@ -51,7 +55,7 @@ CONF = {
     'github_pages_branch': _GITHUB_PAGES_BRANCHES['project'],
     'default_pagination': 10,
     'siteurl': '',
-    'lang': locale.getlocale()[0].split('_')[0],
+    'lang': _DEFAULT_LANGUAGE,
     'timezone': _DEFAULT_TIMEZONE
 }
 

From b46fbb78793a873e6280a791b37ab2d42055eefc Mon Sep 17 00:00:00 2001
From: Alexandre de Verteuil <alexandre@deverteuil.net>
Date: Sat, 23 Jul 2016 03:04:04 -0400
Subject: [PATCH 1950/2864] Add two STATIC_ settings. Fix #1982
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

STATIC_CREATE_LINKS = False

Create links instead of copying files. If the content and output
directories are on the same device, then create hard links. Falls
back to symbolic links if the output directory is on a different
filesystem. If symlinks are created, don’t forget to add the -L or
--copy-links option to rsync when uploading your site.

STATIC_CHECK_IF_MODIFIED = False

If set to True, and STATIC_CREATE_LINKS is False, compare mtimes of
content and output files, and only copy content files that are newer
than existing output files.
---
 docs/settings.rst                |  14 +++
 pelican/generators.py            | 107 +++++++++++++++-----
 pelican/settings.py              |   2 +
 pelican/tests/test_generators.py | 164 ++++++++++++++++++++++++++++++-
 4 files changed, 261 insertions(+), 26 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index aef9f674..54797c83 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -230,6 +230,20 @@ Basic settings
    ``PAGE_PATHS``. If you are trying to publish your site's source files,
    consider using the ``OUTPUT_SOURCES`` setting instead.
 
+.. data:: STATIC_CREATE_LINKS = False
+
+   Create links instead of copying files. If the content and output
+   directories are on the same device, then create hard links.  Falls
+   back to symbolic links if the output directory is on a different
+   filesystem. If symlinks are created, don't forget to add the ``-L``
+   or ``--copy-links`` option to rsync when uploading your site.
+
+.. data:: STATIC_CHECK_IF_MODIFIED = False
+
+   If set to ``True``, and ``STATIC_CREATE_LINKS`` is ``False``, compare
+   mtimes of content and output files, and only copy content files that
+   are newer than existing output files.
+
 .. data:: TYPOGRIFY = False
 
    If set to True, several typographical improvements will be incorporated into
diff --git a/pelican/generators.py b/pelican/generators.py
index 88752392..f3590155 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -2,6 +2,7 @@
 from __future__ import print_function, unicode_literals
 
 import calendar
+import errno
 import fnmatch
 import logging
 import os
@@ -20,9 +21,8 @@ from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Article, Draft, Page, Static, is_valid_content
 from pelican.readers import Readers
-from pelican.utils import (DateFormatter, copy, copy_file_metadata, mkdir_p,
-                           posixize_path, process_translations,
-                           python_2_unicode_compatible)
+from pelican.utils import (DateFormatter, copy, mkdir_p, posixize_path,
+                           process_translations, python_2_unicode_compatible)
 
 
 logger = logging.getLogger(__name__)
@@ -682,21 +682,9 @@ class StaticGenerator(Generator):
 
     def __init__(self, *args, **kwargs):
         super(StaticGenerator, self).__init__(*args, **kwargs)
+        self.fallback_to_symlinks = False
         signals.static_generator_init.send(self)
 
-    def _copy_paths(self, paths, source, destination, output_path,
-                    final_path=None):
-        """Copy all the paths from source to destination"""
-        for path in paths:
-            if final_path:
-                copy(os.path.join(source, path),
-                     os.path.join(output_path, destination, final_path),
-                     self.settings['IGNORE_FILES'])
-            else:
-                copy(os.path.join(source, path),
-                     os.path.join(output_path, destination, path),
-                     self.settings['IGNORE_FILES'])
-
     def generate_context(self):
         self.staticfiles = []
         for f in self.get_files(self.settings['STATIC_PATHS'],
@@ -724,13 +712,88 @@ class StaticGenerator(Generator):
         self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
                          self.settings['THEME_STATIC_DIR'], self.output_path,
                          os.curdir)
-        # copy all Static files
         for sc in self.context['staticfiles']:
-            source_path = os.path.join(self.path, sc.source_path)
-            save_as = os.path.join(self.output_path, sc.save_as)
-            mkdir_p(os.path.dirname(save_as))
-            logger.info('Copying %s to %s', sc.source_path, sc.save_as)
-            copy_file_metadata(source_path, save_as)
+            if self._file_update_required(sc):
+                self._link_or_copy_staticfile(sc)
+            else:
+                logger.debug('%s is up to date, not copying', sc.source_path)
+
+    def _copy_paths(self, paths, source, destination, output_path,
+                    final_path=None):
+        """Copy all the paths from source to destination"""
+        for path in paths:
+            if final_path:
+                copy(os.path.join(source, path),
+                     os.path.join(output_path, destination, final_path),
+                     self.settings['IGNORE_FILES'])
+            else:
+                copy(os.path.join(source, path),
+                     os.path.join(output_path, destination, path),
+                     self.settings['IGNORE_FILES'])
+
+    def _file_update_required(self, staticfile):
+        source_path = os.path.join(self.path, staticfile.source_path)
+        save_as = os.path.join(self.output_path, staticfile.save_as)
+        if not os.path.exists(save_as):
+            return True
+        elif (self.settings['STATIC_CREATE_LINKS'] and
+              os.path.samefile(source_path, save_as)):
+            return False
+        elif (self.settings['STATIC_CREATE_LINKS'] and
+              os.path.realpath(save_as) == source_path):
+            return False
+        elif not self.settings['STATIC_CHECK_IF_MODIFIED']:
+            return True
+        else:
+            return self._source_is_newer(staticfile)
+
+    def _source_is_newer(self, staticfile):
+        source_path = os.path.join(self.path, staticfile.source_path)
+        save_as = os.path.join(self.output_path, staticfile.save_as)
+        s_mtime = os.path.getmtime(source_path)
+        d_mtime = os.path.getmtime(save_as)
+        return s_mtime > d_mtime
+
+    def _link_or_copy_staticfile(self, sc):
+        if self.settings['STATIC_CREATE_LINKS']:
+            self._link_staticfile(sc)
+        else:
+            self._copy_staticfile(sc)
+
+    def _copy_staticfile(self, sc):
+        source_path = os.path.join(self.path, sc.source_path)
+        save_as = os.path.join(self.output_path, sc.save_as)
+        self._mkdir(os.path.dirname(save_as))
+        copy(source_path, save_as)
+        logger.info('Copying %s to %s', sc.source_path, sc.save_as)
+
+    def _link_staticfile(self, sc):
+        source_path = os.path.join(self.path, sc.source_path)
+        save_as = os.path.join(self.output_path, sc.save_as)
+        self._mkdir(os.path.dirname(save_as))
+        try:
+            if os.path.lexists(save_as):
+                os.unlink(save_as)
+            logger.info('Linking %s and %s', sc.source_path, sc.save_as)
+            if self.fallback_to_symlinks:
+                os.symlink(source_path, save_as)
+            else:
+                os.link(source_path, save_as)
+        except OSError as err:
+            if err.errno == errno.EXDEV:  # 18: Invalid cross-device link
+                logger.debug(
+                    "Cross-device links not valid. "
+                    "Creating symbolic links instead."
+                    )
+                self.fallback_to_symlinks = True
+                self._link_staticfile(sc)
+            else:
+                raise err
+
+    def _mkdir(self, path):
+        if os.path.lexists(path) and not os.path.isdir(path):
+            os.unlink(path)
+        mkdir_p(path)
 
 
 class SourceFileGenerator(Generator):
diff --git a/pelican/settings.py b/pelican/settings.py
index 1b0bd67d..0088d3d2 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -82,6 +82,8 @@ DEFAULT_CONFIG = {
     'PAGE_LANG_SAVE_AS': posix_join('pages', '{slug}-{lang}.html'),
     'STATIC_URL': '{path}',
     'STATIC_SAVE_AS': '{path}',
+    'STATIC_CREATE_LINKS': False,
+    'STATIC_CHECK_IF_MODIFIED': False,
     'CATEGORY_URL': 'category/{slug}.html',
     'CATEGORY_SAVE_AS': posix_join('category', '{slug}.html'),
     'TAG_URL': 'tag/{slug}.html',
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 3c4684df..5f2151c3 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -5,7 +5,7 @@ import locale
 import os
 
 from codecs import open
-from shutil import rmtree
+from shutil import copy, rmtree
 from tempfile import mkdtemp
 
 from pelican.generators import (ArticlesGenerator, Generator, PagesGenerator,
@@ -674,6 +674,30 @@ class TestStaticGenerator(unittest.TestCase):
 
     def setUp(self):
         self.content_path = os.path.join(CUR_DIR, 'mixed_content')
+        self.temp_content = mkdtemp(prefix='testcontent.')
+        self.temp_output = mkdtemp(prefix='testoutput.')
+        self.settings = get_settings()
+        self.settings['PATH'] = self.temp_content
+        self.settings['STATIC_PATHS'] = ["static"]
+        self.settings['OUTPUT_PATH'] = self.temp_output
+        os.mkdir(os.path.join(self.temp_content, "static"))
+        self.startfile = os.path.join(self.temp_content,
+                                      "static", "staticfile")
+        self.endfile = os.path.join(self.temp_output, "static", "staticfile")
+        self.generator = StaticGenerator(
+            context={'filenames': {}},
+            settings=self.settings,
+            path=self.temp_content,
+            theme="",
+            output_path=self.temp_output,
+            )
+
+    def tearDown(self):
+        rmtree(self.temp_content)
+        rmtree(self.temp_output)
+
+    def set_ancient_mtime(self, path, timestamp=1):
+        os.utime(path, (timestamp, timestamp))
 
     def test_static_excludes(self):
         """Test that StaticGenerator respects STATIC_EXCLUDES.
@@ -687,7 +711,7 @@ class TestStaticGenerator(unittest.TestCase):
 
         StaticGenerator(
             context=context, settings=settings,
-            path=settings['PATH'], output_path=None,
+            path=settings['PATH'], output_path=self.temp_output,
             theme=settings['THEME']).generate_context()
 
         staticnames = [os.path.basename(c.source_path)
@@ -716,7 +740,7 @@ class TestStaticGenerator(unittest.TestCase):
         for generator_class in (PagesGenerator, StaticGenerator):
             generator_class(
                 context=context, settings=settings,
-                path=settings['PATH'], output_path=None,
+                path=settings['PATH'], output_path=self.temp_output,
                 theme=settings['THEME']).generate_context()
 
         staticnames = [os.path.basename(c.source_path)
@@ -733,7 +757,7 @@ class TestStaticGenerator(unittest.TestCase):
         for generator_class in (PagesGenerator, StaticGenerator):
             generator_class(
                 context=context, settings=settings,
-                path=settings['PATH'], output_path=None,
+                path=settings['PATH'], output_path=self.temp_output,
                 theme=settings['THEME']).generate_context()
 
         staticnames = [os.path.basename(c.source_path)
@@ -742,3 +766,135 @@ class TestStaticGenerator(unittest.TestCase):
         self.assertTrue(
             any(name.endswith(".md") for name in staticnames),
             "STATIC_EXCLUDE_SOURCES=False failed to include a markdown file")
+
+    def test_copy_one_file(self):
+        with open(self.startfile, "w") as f:
+            f.write("staticcontent")
+        self.generator.generate_context()
+        self.generator.generate_output(None)
+        with open(self.endfile, "r") as f:
+            self.assertEqual(f.read(), "staticcontent")
+
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
+    def test_file_update_required_when_dest_does_not_exist(self):
+        staticfile = MagicMock()
+        staticfile.source_path = self.startfile
+        staticfile.save_as = self.endfile
+        with open(staticfile.source_path, "w") as f:
+            f.write("a")
+        update_required = self.generator._file_update_required(staticfile)
+        self.assertTrue(update_required)
+
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
+    def test_dest_and_source_mtimes_are_equal(self):
+        staticfile = MagicMock()
+        staticfile.source_path = self.startfile
+        staticfile.save_as = self.endfile
+        self.settings['STATIC_CHECK_IF_MODIFIED'] = True
+        with open(staticfile.source_path, "w") as f:
+            f.write("a")
+        os.mkdir(os.path.join(self.temp_output, "static"))
+        copy(staticfile.source_path, staticfile.save_as)
+        isnewer = self.generator._source_is_newer(staticfile)
+        self.assertFalse(isnewer)
+
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
+    def test_source_is_newer(self):
+        staticfile = MagicMock()
+        staticfile.source_path = self.startfile
+        staticfile.save_as = self.endfile
+        with open(staticfile.source_path, "w") as f:
+            f.write("a")
+        os.mkdir(os.path.join(self.temp_output, "static"))
+        copy(staticfile.source_path, staticfile.save_as)
+        self.set_ancient_mtime(staticfile.save_as)
+        isnewer = self.generator._source_is_newer(staticfile)
+        self.assertTrue(isnewer)
+
+    def test_skip_file_when_source_is_not_newer(self):
+        self.settings['STATIC_CHECK_IF_MODIFIED'] = True
+        with open(self.startfile, "w") as f:
+            f.write("staticcontent")
+        os.mkdir(os.path.join(self.temp_output, "static"))
+        with open(self.endfile, "w") as f:
+            f.write("staticcontent")
+        expected = os.path.getmtime(self.endfile)
+        self.set_ancient_mtime(self.startfile)
+        self.generator.generate_context()
+        self.generator.generate_output(None)
+        self.assertEqual(os.path.getmtime(self.endfile), expected)
+
+    def test_dont_link_by_default(self):
+        with open(self.startfile, "w") as f:
+            f.write("staticcontent")
+        self.generator.generate_context()
+        self.generator.generate_output(None)
+        self.assertFalse(os.path.samefile(self.startfile, self.endfile))
+
+    def test_output_file_is_linked_to_source(self):
+        self.settings['STATIC_CREATE_LINKS'] = True
+        with open(self.startfile, "w") as f:
+            f.write("staticcontent")
+        self.generator.generate_context()
+        self.generator.generate_output(None)
+        self.assertTrue(os.path.samefile(self.startfile, self.endfile))
+
+    def test_output_file_exists_and_is_newer(self):
+        self.settings['STATIC_CREATE_LINKS'] = True
+        with open(self.startfile, "w") as f:
+            f.write("staticcontent")
+        os.mkdir(os.path.join(self.temp_output, "static"))
+        with open(self.endfile, "w") as f:
+            f.write("othercontent")
+        self.generator.generate_context()
+        self.generator.generate_output(None)
+        self.assertTrue(os.path.samefile(self.startfile, self.endfile))
+
+    def test_can_symlink_when_hardlink_not_possible(self):
+        self.settings['STATIC_CREATE_LINKS'] = True
+        with open(self.startfile, "w") as f:
+            f.write("staticcontent")
+        os.mkdir(os.path.join(self.temp_output, "static"))
+        self.generator.fallback_to_symlinks = True
+        self.generator.generate_context()
+        self.generator.generate_output(None)
+        self.assertTrue(os.path.islink(self.endfile))
+
+    def test_existing_symlink_is_considered_up_to_date(self):
+        self.settings['STATIC_CREATE_LINKS'] = True
+        with open(self.startfile, "w") as f:
+            f.write("staticcontent")
+        os.mkdir(os.path.join(self.temp_output, "static"))
+        os.symlink(self.startfile, self.endfile)
+        staticfile = MagicMock()
+        staticfile.source_path = self.startfile
+        staticfile.save_as = self.endfile
+        requires_update = self.generator._file_update_required(staticfile)
+        self.assertFalse(requires_update)
+
+    def test_invalid_symlink_is_overwritten(self):
+        self.settings['STATIC_CREATE_LINKS'] = True
+        with open(self.startfile, "w") as f:
+            f.write("staticcontent")
+        os.mkdir(os.path.join(self.temp_output, "static"))
+        os.symlink("invalid", self.endfile)
+        staticfile = MagicMock()
+        staticfile.source_path = self.startfile
+        staticfile.save_as = self.endfile
+        requires_update = self.generator._file_update_required(staticfile)
+        self.assertTrue(requires_update)
+        self.generator.fallback_to_symlinks = True
+        self.generator.generate_context()
+        self.generator.generate_output(None)
+        self.assertEqual(os.path.realpath(self.endfile), self.startfile)
+
+    def test_delete_existing_file_before_mkdir(self):
+        with open(self.startfile, "w") as f:
+            f.write("staticcontent")
+        with open(os.path.join(self.temp_output, "static"), "w") as f:
+            f.write("This file should be a directory")
+        self.generator.generate_context()
+        self.generator.generate_output(None)
+        self.assertTrue(
+            os.path.isdir(os.path.join(self.temp_output, "static")))
+        self.assertTrue(os.path.isfile(self.endfile))

From 01d536d7c9ddd6e1090d69b5f4445e37d4019d40 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 31 Dec 2016 15:10:46 -0800
Subject: [PATCH 1951/2864] Replace m-dash with semi-colon in changelog

Stop-gap measure to address:
https://github.com/getpelican/pelican/commit/e3ab685a26b3dd2d198319b625d380c4f80afbf7#commitcomment-20333961
---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 31868353..1956e47c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,7 +14,7 @@ Next release
   ``<updated>`` for modifications
 * Simplify Atom feed ID generation and support URL fragments
 * Produce category feeds with category-specific titles
-* RSS feeds now default to summary instead of full content —
+* RSS feeds now default to summary instead of full content;
   set ``RSS_FEED_SUMMARY_ONLY = False`` to revert to previous behavior
 * Replace ``MD_EXTENSIONS`` with ``MARKDOWN`` setting
 * Replace ``JINJA_EXTENSIONS`` with more-robust ``JINJA_ENVIRONMENT`` setting

From 6fe2fecb1327e8a72008e58b68329b8c25dbb667 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 3 Jan 2017 21:51:23 +0300
Subject: [PATCH 1952/2864] Specify encoding for README and CHANGELOG in
 setup.py

---
 setup.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index e69080f5..f221930d 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
+from io import open
 from os import walk
 from os.path import join, relpath
+import sys
 
 from setuptools import setup
 
@@ -17,8 +19,12 @@ entry_points = {
     ]
 }
 
-README = open('README.rst').read()
-CHANGELOG = open('docs/changelog.rst').read()
+README = open('README.rst', encoding='utf-8').read()
+CHANGELOG = open('docs/changelog.rst', encoding='utf-8').read()
+
+description = u'\n'.join([README, CHANGELOG])
+if sys.version_info.major < 3:
+    description = description.encode('utf-8')
 
 setup(
     name='pelican',
@@ -29,7 +35,7 @@ setup(
     author_email='authors@getpelican.com',
     description="Static site generator supporting reStructuredText and "
                 "Markdown source content.",
-    long_description=README + '\n' + CHANGELOG,
+    long_description=description,
     packages=['pelican', 'pelican.tools'],
     package_data={
         # we manually collect the package data, as opposed to using,

From ce38e318bd4905f75c988ee930620ebcd65588c0 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 10 Jan 2017 13:34:09 -0800
Subject: [PATCH 1953/2864] Bump version 3.7.1

---
 docs/changelog.rst  | 7 ++++---
 docs/conf.py        | 2 +-
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1956e47c..31c50182 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,10 +1,11 @@
 Release history
 ###############
 
-Next release
-============
+3.7.1 (2017-01-10)
+==================
 
-- Nothing yet
+* Fix locale issues in Quickstart script
+* Specify encoding for README and CHANGELOG in setup.py
 
 3.7.0 (2016-12-12)
 ==================
diff --git a/docs/conf.py b/docs/conf.py
index 63a4a269..81a06e3a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,7 @@ copyright = '2015, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
-last_stable = '3.7.0'
+last_stable = '3.7.1'
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index cdcd98b1..25da26e2 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -25,7 +25,7 @@ from pelican.utils import (clean_output_dir, file_watcher,
                            folder_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.7.1.dev0"
+__version__ = "3.7.1"
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 logger = logging.getLogger(__name__)
 
diff --git a/setup.py b/setup.py
index f221930d..62ce8124 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ if sys.version_info.major < 3:
 
 setup(
     name='pelican',
-    version='3.7.1.dev0',
+    version='3.7.1',
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     maintainer='Justin Mayer',

From 25732f7be68bfcfd1b761f10b56ff55a14c44dde Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 10 Jan 2017 13:51:37 -0800
Subject: [PATCH 1954/2864] Prepare version 3.7.2.dev0 for next development
 cycle

---
 docs/changelog.rst  | 5 +++++
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 31c50182..2b365a45 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+Next release
+============
+
+- Nothing yet
+
 3.7.1 (2017-01-10)
 ==================
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 25da26e2..69332706 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -25,7 +25,7 @@ from pelican.utils import (clean_output_dir, file_watcher,
                            folder_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.7.1"
+__version__ = "3.7.2.dev0"
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 logger = logging.getLogger(__name__)
 
diff --git a/setup.py b/setup.py
index 62ce8124..3645dc04 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ if sys.version_info.major < 3:
 
 setup(
     name='pelican',
-    version='3.7.1',
+    version='3.7.2.dev0',
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     maintainer='Justin Mayer',

From d61e2ccd6ba051ff581cc356c384936d240ea495 Mon Sep 17 00:00:00 2001
From: Sjoerd <sjoerd-github@linuxonly.nl>
Date: Sat, 14 Jan 2017 13:51:10 +0100
Subject: [PATCH 1955/2864] Use better headers in tips docs

Instead of "Tip 1", "Tip 2" under "Extra tips", use headers describing
the content.

Also, remove the "hint" pointer as it is not really a hint and the
document consists of tips anyway.
---
 docs/tips.rst | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/tips.rst b/docs/tips.rst
index 9f45f877..50160380 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -105,10 +105,8 @@ Custom 404 Pages
 GitHub Pages will display the custom 404 page described above, as noted in the
 relevant `GitHub docs <https://help.github.com/articles/custom-404-pages/>`_.
 
-Extra Tips
-----------
-
-Tip #1:
+Update your site on each commit
+-------------------------------
 
 To automatically update your Pelican site on each commit, you can create
 a post-commit hook. For example, you can add the following to
@@ -116,7 +114,8 @@ a post-commit hook. For example, you can add the following to
 
     pelican content -o output -s pelicanconf.py && ghp-import output && git push origin gh-pages
 
-Tip #2:
+Copy static files to the root of your site
+------------------------------------------
 
 To use a `custom domain
 <https://help.github.com/articles/setting-up-a-custom-domain-with-pages>`_ with
@@ -131,9 +130,8 @@ output directory. For example::
 
 Note: use forward slashes, ``/``, even on Windows.
 
-.. hint::
-    You can also use the ``EXTRA_PATH_METADATA`` mechanism
-    to place a ``favicon.ico`` or ``robots.txt`` at the root of any site.
+You can also use the ``EXTRA_PATH_METADATA`` mechanism
+to place a ``favicon.ico`` or ``robots.txt`` at the root of any site.
 
 How to add YouTube or Vimeo Videos
 ==================================

From 927d9c7ea5d40e5c1f930746d0f6d003a8503579 Mon Sep 17 00:00:00 2001
From: Bernhard Scheirle <bernhard+git@scheirle.de>
Date: Mon, 16 Jan 2017 11:33:13 +0100
Subject: [PATCH 1956/2864] Add new signal: feed_generated

This signal gets emitted before a feed gets written to disk.
Therefore it allows plugins to do arbitrary changes to the feed.
---
 docs/changelog.rst | 2 +-
 docs/plugins.rst   | 2 ++
 pelican/signals.py | 1 +
 pelican/writers.py | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2b365a45..aa594a2c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,7 @@ Release history
 Next release
 ============
 
-- Nothing yet
+* New signal: ``feed_generated``
 
 3.7.1 (2017-01-10)
 ==================
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 6a850100..008e7551 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -118,6 +118,8 @@ static_generator_init               static_generator               invoked in th
 static_generator_finalized          static_generator               invoked at the end of StaticGenerator.generate_context
 content_object_init                 content_object                 invoked at the end of Content.__init__
 content_written                     path, context                  invoked each time a content file is written.
+feed_generated                      context, feed                  invoked each time a feed gets generated. Can be used to modify a feed
+                                                                   object before it gets written.
 feed_written                        path, context, feed            invoked each time a feed file is written.
 =================================   ============================   ===========================================================================
 
diff --git a/pelican/signals.py b/pelican/signals.py
index aeeea9f6..0b10fdfa 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -47,4 +47,5 @@ content_object_init = signal('content_object_init')
 
 # Writers signals
 content_written = signal('content_written')
+feed_generated = signal('feed_generated')
 feed_written = signal('feed_written')
diff --git a/pelican/writers.py b/pelican/writers.py
index d1c8069a..48388481 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -122,6 +122,7 @@ class Writer(object):
         for i in range(max_items):
             self._add_item_to_the_feed(feed, elements[i])
 
+        signals.feed_generated.send(context, feed=feed)
         if path:
             complete_path = os.path.join(self.output_path, path)
             try:

From 9cca567bede872ad3383683478f0994576bb8ad5 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Mon, 23 Jan 2017 23:45:08 +0100
Subject: [PATCH 1957/2864] Add python3.6 test environment

* Add py36 environment to tox
* Unify dependencies across manual installation and tox
* Mention tox in the docs
---
 docs/contribute.rst        |  5 ++++-
 requirements/developer.pip |  7 ++-----
 requirements/docs.pip      |  2 ++
 requirements/style.pip     |  2 ++
 tox.ini                    | 11 +++++------
 5 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 requirements/docs.pip
 create mode 100644 requirements/style.pip

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 0ed82dfd..1fdc8212 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -47,13 +47,16 @@ Or using ``pip``::
 
     $ pip install -e .
 
+To conveniently test vs multiple python versions we also provide a tox file.
+
+
 Building the docs
 =================
 
 If you make changes to the documentation, you should preview your changes
 before committing them::
 
-    $ pip install sphinx
+    $ pip install -r requirements/docs.pip
     $ cd src/pelican/docs
     $ make html
 
diff --git a/requirements/developer.pip b/requirements/developer.pip
index e5507151..5c2f5a69 100644
--- a/requirements/developer.pip
+++ b/requirements/developer.pip
@@ -1,6 +1,3 @@
 -r test.pip
-
-# Development
-flake8
-flake8-import-order
-sphinx==1.4.9
+-r docs.pip
+-r style.pip
diff --git a/requirements/docs.pip b/requirements/docs.pip
new file mode 100644
index 00000000..525bdc40
--- /dev/null
+++ b/requirements/docs.pip
@@ -0,0 +1,2 @@
+sphinx==1.4.9
+sphinx_rtd_theme
diff --git a/requirements/style.pip b/requirements/style.pip
new file mode 100644
index 00000000..90225d01
--- /dev/null
+++ b/requirements/style.pip
@@ -0,0 +1,2 @@
+flake8
+flake8-import-order
diff --git a/tox.ini b/tox.ini
index cb400ea7..95cd5273 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,33,34,35},docs,flake8
+envlist = py{27,33,34,35,36},docs,flake8
 
 [testenv]
 basepython =
@@ -7,10 +7,11 @@ basepython =
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 passenv = *
 usedevelop=True
 deps =
-    -rrequirements/developer.pip
+    -rrequirements/test.pip
     nose
     nose-cov
     coveralls
@@ -24,8 +25,7 @@ commands =
 [testenv:docs]
 basepython = python2.7
 deps =
-    sphinx==1.4.9
-    sphinx_rtd_theme
+    -rrequirements/docs.pip
 changedir = docs
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html
@@ -37,8 +37,7 @@ import-order-style = cryptography
 [testenv:flake8]
 basepython = python2.7
 deps =
-    flake8 <= 2.4.1
-    git+https://github.com/public/flake8-import-order@2ac7052a4e02b4a8a0125a106d87465a3b9fd688
+    -rrequirements/style.pip
 commands =
     flake8 --version
     flake8 pelican

From a982e0c4f437328f625e45b21762971c4ec94654 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Tue, 24 Jan 2017 00:04:58 +0100
Subject: [PATCH 1958/2864] Add py36 to travis builds

---
 .travis.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7bb5a89f..5699cff1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,12 @@ env:
   - TOX_ENV=py27
   - TOX_ENV=py33
   - TOX_ENV=py34
+  - TOX_ENV=py35
 matrix:
-  include:
-    - python: 3.5
-      env:
-      - TOX_ENV=py35
+    include:
+        - python: 3.6
+          env:
+              - TOX_ENV=py36
 addons:
   apt_packages:
     - pandoc

From 5a19887a22eedc7060fe39711b383a61f57c4fa2 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Tue, 24 Jan 2017 00:07:15 +0100
Subject: [PATCH 1959/2864] Correct new flake8 warnings

---
 pelican/log.py                      | 1 +
 pelican/rstdirectives.py            | 2 ++
 pelican/tools/pelican_quickstart.py | 3 +++
 pelican/tools/pelican_themes.py     | 1 +
 4 files changed, 7 insertions(+)

diff --git a/pelican/log.py b/pelican/log.py
index cec07bf0..70e069d3 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -197,6 +197,7 @@ class FatalLogger(LimitLogger):
         if FatalLogger.errors_fatal:
             raise RuntimeError('Error encountered')
 
+
 logging.setLoggerClass(FatalLogger)
 
 
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index b52785dd..def67cc7 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -70,6 +70,7 @@ class Pygments(Directive):
         parsed = highlight('\n'.join(self.content), lexer, formatter)
         return [nodes.raw('', parsed, format='html')]
 
+
 directives.register_directive('code-block', Pygments)
 directives.register_directive('sourcecode', Pygments)
 
@@ -90,4 +91,5 @@ def abbr_role(typ, rawtext, text, lineno, inliner, options={}, content=[]):
     expl = m.group(1)
     return [abbreviation(abbr, abbr, explanation=expl)], []
 
+
 roles.register_local_role('abbr', abbr_role)
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 39e58f6f..ae0e8c9d 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -70,6 +70,7 @@ def _input_compat(prompt):
         r = raw_input(prompt)
     return r
 
+
 if six.PY3:
     str_compat = str
 else:
@@ -81,6 +82,7 @@ else:
 class _DEFAULT_PATH_TYPE(str_compat):
     is_default_path = True
 
+
 _DEFAULT_PATH = _DEFAULT_PATH_TYPE(os.curdir)
 
 
@@ -412,5 +414,6 @@ needed by Pelican.
 
     print('Done. Your new project is available at %s' % CONF['basedir'])
 
+
 if __name__ == "__main__":
     main()
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index e4bcb7c9..fd60c424 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -14,6 +14,7 @@ def err(msg, die=None):
     if die:
         sys.exit((die if type(die) is int else 1))
 
+
 try:
     import pelican
 except:

From dcb6882fbcd243cc146df73b04b1066c332aa9db Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Tue, 24 Jan 2017 00:32:37 +0100
Subject: [PATCH 1960/2864] Update tox to 2.5.0

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5699cff1..f4b68501 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ before_install:
   - sudo apt-get update -qq
   - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
 install:
-  - pip install tox==2.0.1
+  - pip install tox==2.5.0
 script: tox -e $TOX_ENV
 notifications:
   irc:

From 22208a9471b37a75af113fdede8d9bdb13608f4c Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Mon, 23 Jan 2017 23:54:38 +0100
Subject: [PATCH 1961/2864] Add test checking url replcmnt of unkn. file

There was no test case checking the behaviour of what happens when
trying to {filename} an unknown file.

Also changed the braces to `'` chars that we use elseware.
---
 pelican/contents.py            |  2 +-
 pelican/tests/test_contents.py | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 1ded6cdb..0e842b39 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -246,7 +246,7 @@ class Content(object):
                     origin = origin.replace('\\', '/')  # for Windows paths.
                 else:
                     logger.warning(
-                        "Unable to find `%s`, skipping url replacement.",
+                        "Unable to find '%s', skipping url replacement.",
                         value.geturl(), extra={
                             'limit_msg': ("Other resources were not found "
                                           "and their urls not replaced")})
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 2f774a6e..29a219f5 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -731,3 +731,19 @@ class TestStatic(LoggedTestCase):
             msg="Replacement Indicator 'unknown' not recognized, "
                 "skipping replacement",
             level=logging.WARNING)
+
+    def test_link_to_unknown_file(self):
+        "{filename} link to unknown file should trigger warning."
+
+        html = '<a href="{filename}foo">link</a>'
+        page = Page(content=html,
+                    metadata={'title': 'fakepage'}, settings=self.settings,
+                    source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
+                    context=self.context)
+        content = page.get_content('')
+
+        self.assertEqual(content, html)
+        self.assertLogCountEqual(
+            count=1,
+            msg="Unable to find 'foo', skipping url replacement.",
+            level=logging.WARNING)

From 4006554a493f81e2303f63c1bf803915828e125c Mon Sep 17 00:00:00 2001
From: Jonas Wielicki <j.wielicki@sotecware.net>
Date: Thu, 2 Feb 2017 20:38:42 +0100
Subject: [PATCH 1962/2864] Prevent to write outside the output directory

This is crude and simply raises RuntimeError. We would generally
want to have earlier checks which log a warning and do not call
write at all.
---
 pelican/writers.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index d1c8069a..88a2bcfd 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -21,6 +21,18 @@ if not six.PY3:
 logger = logging.getLogger(__name__)
 
 
+def _sanitised_join(base_directory, *parts):
+    joined = os.path.abspath(os.path.join(base_directory, *parts))
+    if not joined.startswith(base_directory):
+        raise RuntimeError(
+            "attempt to break out of output directory to {}".format(
+                joined
+            )
+        )
+
+    return joined
+
+
 class Writer(object):
 
     def __init__(self, output_path, settings=None):
@@ -123,7 +135,8 @@ class Writer(object):
             self._add_item_to_the_feed(feed, elements[i])
 
         if path:
-            complete_path = os.path.join(self.output_path, path)
+            complete_path = _sanitised_join(self.output_path, path)
+
             try:
                 os.makedirs(os.path.dirname(complete_path))
             except Exception:
@@ -169,7 +182,8 @@ class Writer(object):
             if localcontext['localsiteurl']:
                 context['localsiteurl'] = localcontext['localsiteurl']
             output = template.render(localcontext)
-            path = os.path.join(output_path, name)
+            path = _sanitised_join(output_path, name)
+
             try:
                 os.makedirs(os.path.dirname(path))
             except Exception:

From 018f4468cc480b533c9a7c6c8d48904e2019b4da Mon Sep 17 00:00:00 2001
From: Jonas Wielicki <j.wielicki@sotecware.net>
Date: Fri, 3 Feb 2017 09:13:14 +0100
Subject: [PATCH 1963/2864] Check safety of save_as earlier if possible

The check in the writer still serves as a safety net.
---
 pelican/contents.py            | 34 +++++++++++++++++++++++++++++++---
 pelican/tests/test_contents.py | 24 ++++++++++++++++++++++++
 pelican/tests/test_utils.py    | 33 +++++++++++++++++++++++++++++++++
 pelican/utils.py               | 12 ++++++++++++
 pelican/writers.py             | 18 +++---------------
 5 files changed, 103 insertions(+), 18 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 1ded6cdb..db63dd9e 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -17,8 +17,9 @@ from pelican import signals
 from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import (SafeDatetime, deprecated_attribute, memoized,
                            path_to_url, posixize_path,
-                           python_2_unicode_compatible, set_date_tzinfo,
-                           slugify, strftime, truncate_html_words)
+                           python_2_unicode_compatible, sanitised_join,
+                           set_date_tzinfo, slugify, strftime,
+                           truncate_html_words)
 
 # Import these so that they're avalaible when you import from pelican.contents.
 from pelican.urlwrappers import (Author, Category, Tag, URLWrapper)  # NOQA
@@ -161,6 +162,22 @@ class Content(object):
             if not hasattr(self, prop):
                 raise NameError(prop)
 
+    def valid_save_as(self):
+        """Return true if save_as doesn't write outside output path, false
+        otherwise."""
+        try:
+            output_path = self.settings["OUTPUT_PATH"]
+        except KeyError:
+            # we cannot check
+            return True
+
+        try:
+            sanitised_join(output_path, self.save_as)
+        except RuntimeError:  # outside output_dir
+            return False
+
+        return True
+
     @property
     def url_format(self):
         """Returns the URL, formatted with the proper values"""
@@ -470,9 +487,20 @@ class Static(Page):
 def is_valid_content(content, f):
     try:
         content.check_properties()
-        return True
     except NameError as e:
         logger.error(
             "Skipping %s: could not find information about '%s'",
             f, six.text_type(e))
         return False
+
+    if not content.valid_save_as():
+        logger.error(
+            "Skipping %s: file %r would be written outside output path",
+            f,
+            content.save_as,
+        )
+        # Note: future code might want to use a result variable instead, to
+        # allow showing multiple error messages at once.
+        return False
+
+    return True
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 2f774a6e..7f37edf1 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -497,6 +497,30 @@ class TestArticle(TestPage):
         article = Article(**article_kwargs)
         self.assertEqual(article.url, 'fedora.qa/this-week-in-fedora-qa/')
 
+    def test_valid_save_as_detects_breakout(self):
+        settings = get_settings()
+        article_kwargs = self._copy_page_kwargs()
+        article_kwargs['metadata']['slug'] = '../foo'
+        article_kwargs['settings'] = settings
+        article = Article(**article_kwargs)
+        self.assertFalse(article.valid_save_as())
+
+    def test_valid_save_as_detects_breakout_to_root(self):
+        settings = get_settings()
+        article_kwargs = self._copy_page_kwargs()
+        article_kwargs['metadata']['slug'] = '/foo'
+        article_kwargs['settings'] = settings
+        article = Article(**article_kwargs)
+        self.assertFalse(article.valid_save_as())
+
+    def test_valid_save_as_passes_valid(self):
+        settings = get_settings()
+        article_kwargs = self._copy_page_kwargs()
+        article_kwargs['metadata']['slug'] = 'foo'
+        article_kwargs['settings'] = settings
+        article = Article(**article_kwargs)
+        self.assertTrue(article.valid_save_as())
+
 
 class TestStatic(LoggedTestCase):
 
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 040707ca..9a7109d6 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -11,6 +11,8 @@ from tempfile import mkdtemp
 
 import pytz
 
+import six
+
 from pelican import utils
 from pelican.generators import TemplatePagesGenerator
 from pelican.settings import read_settings
@@ -666,3 +668,34 @@ class TestDateFormatter(unittest.TestCase):
         with utils.pelican_open(output_path) as output_file:
             self.assertEqual(output_file,
                              utils.strftime(self.date, 'date = %A, %d %B %Y'))
+
+
+class TestSanitisedJoin(unittest.TestCase):
+    def test_detect_parent_breakout(self):
+        with six.assertRaisesRegex(
+                self,
+                RuntimeError,
+                "Attempted to break out of output directory to /foo/test"):
+            utils.sanitised_join(
+                "/foo/bar",
+                "../test"
+            )
+
+    def test_detect_root_breakout(self):
+        with six.assertRaisesRegex(
+                self,
+                RuntimeError,
+                "Attempted to break out of output directory to /test"):
+            utils.sanitised_join(
+                "/foo/bar",
+                "/test"
+            )
+
+    def test_pass_deep_subpaths(self):
+        self.assertEqual(
+            utils.sanitised_join(
+                "/foo/bar",
+                "test"
+            ),
+            os.path.join("/foo/bar", "test")
+        )
diff --git a/pelican/utils.py b/pelican/utils.py
index 9d780039..a521d3a8 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -36,6 +36,18 @@ except ImportError:
 logger = logging.getLogger(__name__)
 
 
+def sanitised_join(base_directory, *parts):
+    joined = os.path.abspath(os.path.join(base_directory, *parts))
+    if not joined.startswith(os.path.abspath(base_directory)):
+        raise RuntimeError(
+            "Attempted to break out of output directory to {}".format(
+                joined
+            )
+        )
+
+    return joined
+
+
 def strftime(date, date_format):
     '''
     Replacement for built-in strftime
diff --git a/pelican/writers.py b/pelican/writers.py
index 88a2bcfd..049b05b2 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -13,7 +13,7 @@ import six
 from pelican import signals
 from pelican.paginator import Paginator
 from pelican.utils import (get_relative_path, is_selected_for_writing,
-                           path_to_url, set_date_tzinfo)
+                           path_to_url, sanitised_join, set_date_tzinfo)
 
 if not six.PY3:
     from codecs import open
@@ -21,18 +21,6 @@ if not six.PY3:
 logger = logging.getLogger(__name__)
 
 
-def _sanitised_join(base_directory, *parts):
-    joined = os.path.abspath(os.path.join(base_directory, *parts))
-    if not joined.startswith(base_directory):
-        raise RuntimeError(
-            "attempt to break out of output directory to {}".format(
-                joined
-            )
-        )
-
-    return joined
-
-
 class Writer(object):
 
     def __init__(self, output_path, settings=None):
@@ -135,7 +123,7 @@ class Writer(object):
             self._add_item_to_the_feed(feed, elements[i])
 
         if path:
-            complete_path = _sanitised_join(self.output_path, path)
+            complete_path = sanitised_join(self.output_path, path)
 
             try:
                 os.makedirs(os.path.dirname(complete_path))
@@ -182,7 +170,7 @@ class Writer(object):
             if localcontext['localsiteurl']:
                 context['localsiteurl'] = localcontext['localsiteurl']
             output = template.render(localcontext)
-            path = _sanitised_join(output_path, name)
+            path = sanitised_join(output_path, name)
 
             try:
                 os.makedirs(os.path.dirname(path))

From 490e3646ba4274a60e261319e5ce42235f6a3696 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Mon, 27 Feb 2017 22:29:27 +0100
Subject: [PATCH 1964/2864] Implement review feedback

* improve wording on testing with fox (contribute.rst)
* fix whitespace (.travis.xml)
---
 .travis.yml         | 8 ++++----
 docs/contribute.rst | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f4b68501..a7a8732d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,10 @@ env:
   - TOX_ENV=py34
   - TOX_ENV=py35
 matrix:
-    include:
-        - python: 3.6
-          env:
-              - TOX_ENV=py36
+  include:
+    - python: 3.6
+      env:
+      - TOX_ENV=py36
 addons:
   apt_packages:
     - pandoc
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 1fdc8212..187c3007 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -47,7 +47,7 @@ Or using ``pip``::
 
     $ pip install -e .
 
-To conveniently test vs multiple python versions we also provide a tox file.
+To conveniently test on multiple Python versions, we also provide a .tox file.
 
 
 Building the docs

From b65a790b500a62a660afc54a0b49812013fe9794 Mon Sep 17 00:00:00 2001
From: fxfitz <francis.x.fitzpatrick@gmail.com>
Date: Mon, 13 Mar 2017 17:59:43 -0500
Subject: [PATCH 1965/2864] Switch over to use awscli

---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 079b2844..06880c44 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -111,7 +111,7 @@ ftp_upload: publish
 	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
 
 s3_upload: publish
-	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type --no-mime-magic --no-preserve
+	aws s3 sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl public-read --delete
 
 cf_upload: publish
 	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .

From 4917b8618aa71221f640bbf749cee7944eba32f3 Mon Sep 17 00:00:00 2001
From: Tim Wienk <tim@wienk.name>
Date: Sat, 11 Mar 2017 13:38:54 +0100
Subject: [PATCH 1966/2864] Fix setting None metadata from FILENAME_METADATA
 matches.

This is relevant when using optional items in the expression. E.g. if an
optional captured group is not matched, the result of
`match.groupdict()` contains the captured group with value `None`.
---
 pelican/readers.py            |  2 +-
 pelican/tests/test_readers.py | 38 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index e899838a..a620a1e8 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -672,7 +672,7 @@ def parse_path_metadata(source_path, settings=None, process=None):
                     # .items() for py3k compat.
                     for k, v in match.groupdict().items():
                         k = k.lower()  # metadata must be lowercase
-                        if k not in metadata:
+                        if v is not None and k not in metadata:
                             if process:
                                 v = process(k, v)
                             metadata[k] = v
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index ac0f81dc..0d22bf44 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -166,6 +166,25 @@ class RstReaderTest(ReaderTest):
         }
         self.assertDictHasSubset(page.metadata, expected)
 
+    def test_article_with_optional_filename_metadata(self):
+        page = self.read_file(
+            path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
+            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2})?')
+        expected = {
+            'date': SafeDatetime(2012, 11, 29),
+            'reader': 'rst',
+        }
+        self.assertDictHasSubset(page.metadata, expected)
+
+        page = self.read_file(
+            path='article.rst',
+            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2})?')
+        expected = {
+            'reader': 'rst',
+        }
+        self.assertDictHasSubset(page.metadata, expected)
+        self.assertNotIn('date', page.metadata, 'Date should not be set.')
+
     def test_article_metadata_key_lowercase(self):
         # Keys of metadata should be lowercase.
         reader = readers.RstReader(settings=get_settings())
@@ -561,6 +580,25 @@ class MdReaderTest(ReaderTest):
         }
         self.assertDictHasSubset(page.metadata, expected)
 
+    def test_article_with_optional_filename_metadata(self):
+        page = self.read_file(
+            path='2012-11-30_md_w_filename_meta#foo-bar.md',
+            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2})?')
+        expected = {
+            'date': SafeDatetime(2012, 11, 30),
+            'reader': 'markdown',
+        }
+        self.assertDictHasSubset(page.metadata, expected)
+
+        page = self.read_file(
+            path='empty.md',
+            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2})?')
+        expected = {
+            'reader': 'markdown',
+        }
+        self.assertDictHasSubset(page.metadata, expected)
+        self.assertNotIn('date', page.metadata, 'Date should not be set.')
+
     def test_duplicate_tags_or_authors_are_removed(self):
         reader = readers.MarkdownReader(settings=get_settings())
         content, metadata = reader.read(

From 89b28fd36b38e61fcea6d4057b47d173bfd19dc0 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Mon, 27 Mar 2017 16:06:07 +0200
Subject: [PATCH 1967/2864] Fix warnings originating from bad regexes

Starting with python 3.6 warnings are issued for invalid escape
sequences in regular expressions. This commit corrects all
DeprecationWarning's via properly declaring the offending
regular expressions as raw strings.

Resolves #2095.
---
 docs/settings.rst        | 4 ++--
 pelican/__init__.py      | 4 ++--
 pelican/readers.py       | 6 +++---
 pelican/rstdirectives.py | 2 +-
 pelican/settings.py      | 2 +-
 pelican/utils.py         | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index aef9f674..4d09ec4c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -712,7 +712,7 @@ Metadata
 
    The default metadata you want to use for all articles and pages.
 
-.. data:: FILENAME_METADATA = '(?P<date>\d{4}-\d{2}-\d{2}).*'
+.. data:: FILENAME_METADATA = r'(?P<date>\d{4}-\d{2}-\d{2}).*'
 
    The regexp that will be used to extract any metadata from the filename. All
    named groups that are matched will be set in the metadata object.  The
@@ -720,7 +720,7 @@ Metadata
 
    For example, to extract both the date and the slug::
 
-      FILENAME_METADATA = '(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'
+      FILENAME_METADATA = r'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'
 
    See also ``SLUGIFY_SOURCE``.
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 69332706..fa636bb0 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -111,10 +111,10 @@ class Pelican(object):
             structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
 
             # Convert %(variable) into {variable}.
-            structure = re.sub('%\((\w+)\)s', '{\g<1>}', structure)
+            structure = re.sub(r'%\((\w+)\)s', '{\g<1>}', structure)
 
             # Convert %x into {date:%x} for strftime
-            structure = re.sub('(%[A-z])', '{date:\g<1>}', structure)
+            structure = re.sub(r'(%[A-z])', '{date:\g<1>}', structure)
 
             # Strip a / prefix
             structure = re.sub('^/', '', structure)
diff --git a/pelican/readers.py b/pelican/readers.py
index a620a1e8..afc0c4bf 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -650,9 +650,9 @@ def parse_path_metadata(source_path, settings=None, process=None):
     ...     settings=settings,
     ...     process=reader.process_metadata)
     >>> pprint.pprint(metadata)  # doctest: +ELLIPSIS
-    {'category': <pelican.urlwrappers.Category object at ...>,
-     'date': SafeDatetime(2013, 1, 1, 0, 0),
-     'slug': 'my-slug'}
+    ... {'category': <pelican.urlwrappers.Category object at ...>,
+    ...  'date': SafeDatetime(2013, 1, 1, 0, 0),
+    ...  'slug': 'my-slug'}
     """
     metadata = {}
     dirname, basename = os.path.split(source_path)
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index def67cc7..b4f44aa1 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -75,7 +75,7 @@ directives.register_directive('code-block', Pygments)
 directives.register_directive('sourcecode', Pygments)
 
 
-_abbr_re = re.compile('\((.*)\)$', re.DOTALL)
+_abbr_re = re.compile(r'\((.*)\)$', re.DOTALL)
 
 
 class abbreviation(nodes.Inline, nodes.TextElement):
diff --git a/pelican/settings.py b/pelican/settings.py
index 1b0bd67d..99840119 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -121,7 +121,7 @@ DEFAULT_CONFIG = {
     'DEFAULT_PAGINATION': False,
     'DEFAULT_ORPHANS': 0,
     'DEFAULT_METADATA': {},
-    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*',
+    'FILENAME_METADATA': r'(?P<date>\d{4}-\d{2}-\d{2}).*',
     'PATH_METADATA': '',
     'EXTRA_PATH_METADATA': {},
     'DEFAULT_STATUS': 'published',
diff --git a/pelican/utils.py b/pelican/utils.py
index a521d3a8..ef9da23b 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -305,8 +305,8 @@ def slugify(value, substitutions=()):
             replace = replace and not skip
 
     if replace:
-        value = re.sub('[^\w\s-]', '', value).strip()
-        value = re.sub('[-\s]+', '-', value)
+        value = re.sub(r'[^\w\s-]', '', value).strip()
+        value = re.sub(r'[-\s]+', '-', value)
     else:
         value = value.strip()
 

From 623eb0a4c0ff817bf656f15d513628af1d143668 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Wed, 29 Mar 2017 10:19:47 +0200
Subject: [PATCH 1968/2864] Fix more python 3.6 regex DeprecationWarning's

---
 pelican/__init__.py             |  4 ++--
 pelican/readers.py              |  4 ++--
 pelican/tests/test_contents.py  |  2 +-
 pelican/tests/test_readers.py   | 40 ++++++++++++++++-----------------
 pelican/tools/pelican_import.py |  2 +-
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index fa636bb0..70013804 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -111,10 +111,10 @@ class Pelican(object):
             structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
 
             # Convert %(variable) into {variable}.
-            structure = re.sub(r'%\((\w+)\)s', '{\g<1>}', structure)
+            structure = re.sub(r'%\((\w+)\)s', r'{\g<1>}', structure)
 
             # Convert %x into {date:%x} for strftime
-            structure = re.sub(r'(%[A-z])', '{date:\g<1>}', structure)
+            structure = re.sub(r'(%[A-z])', r'{date:\g<1>}', structure)
 
             # Strip a / prefix
             structure = re.sub('^/', '', structure)
diff --git a/pelican/readers.py b/pelican/readers.py
index afc0c4bf..fda60596 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -640,9 +640,9 @@ def parse_path_metadata(source_path, settings=None, process=None):
 
     >>> import pprint
     >>> settings = {
-    ...     'FILENAME_METADATA': '(?P<slug>[^.]*).*',
+    ...     'FILENAME_METADATA': r'(?P<slug>[^.]*).*',
     ...     'PATH_METADATA':
-    ...         '(?P<category>[^/]*)/(?P<date>\d{4}-\d{2}-\d{2})/.*',
+    ...         r'(?P<category>[^/]*)/(?P<date>\d{4}-\d{2}-\d{2})/.*',
     ...     }
     >>> reader = BaseReader(settings=settings)
     >>> metadata = parse_path_metadata(
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index b4146150..ac59f5a4 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -105,7 +105,7 @@ class TestPage(LoggedTestCase):
         self.assertEqual(page._get_summary(), TEST_SUMMARY)
         self.assertLogCountEqual(
                 count=1,
-                msg="_get_summary\(\) has been deprecated since 3\.6\.4\. "
+                msg=r"_get_summary\(\) has been deprecated since 3\.6\.4\. "
                     "Use the summary decorator instead",
                 level=logging.WARNING)
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 0d22bf44..4db4938e 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -67,7 +67,7 @@ class TestAssertDictHasSubset(ReaderTest):
         six.assertRaisesRegex(
             self,
             AssertionError,
-            'Expected.*key-c.*to have value.*val-c.*but was not in Dict',
+            r'Expected.*key-c.*to have value.*val-c.*but was not in Dict',
             self.assertDictHasSubset,
             self.dictionary,
             {'key-c': 'val-c'})
@@ -76,7 +76,7 @@ class TestAssertDictHasSubset(ReaderTest):
         six.assertRaisesRegex(
             self,
             AssertionError,
-            'Expected .*key-a.* to have value .*val-b.* but was .*val-a.*',
+            r'Expected .*key-a.* to have value .*val-b.* but was .*val-a.*',
             self.assertDictHasSubset,
             self.dictionary,
             {'key-a': 'val-b'})
@@ -139,7 +139,7 @@ class RstReaderTest(ReaderTest):
 
         page = self.read_file(
             path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
-            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2}).*')
+            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2}).*')
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -152,9 +152,9 @@ class RstReaderTest(ReaderTest):
         page = self.read_file(
             path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
             FILENAME_METADATA=(
-                '(?P<date>\d{4}-\d{2}-\d{2})'
-                '_(?P<Slug>.*)'
-                '#(?P<MyMeta>.*)-(?P<author>.*)'))
+                r'(?P<date>\d{4}-\d{2}-\d{2})'
+                r'_(?P<Slug>.*)'
+                r'#(?P<MyMeta>.*)-(?P<author>.*)'))
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -169,7 +169,7 @@ class RstReaderTest(ReaderTest):
     def test_article_with_optional_filename_metadata(self):
         page = self.read_file(
             path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
-            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2})?')
+            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2})?')
         expected = {
             'date': SafeDatetime(2012, 11, 29),
             'reader': 'rst',
@@ -178,7 +178,7 @@ class RstReaderTest(ReaderTest):
 
         page = self.read_file(
             path='article.rst',
-            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2})?')
+            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2})?')
         expected = {
             'reader': 'rst',
         }
@@ -200,9 +200,9 @@ class RstReaderTest(ReaderTest):
         page_metadata = self.read_file(
             path=input_with_metadata,
             FILENAME_METADATA=(
-                '(?P<date>\d{4}-\d{2}-\d{2})'
-                '_(?P<Slug>.*)'
-                '#(?P<MyMeta>.*)-(?P<author>.*)'
+                r'(?P<date>\d{4}-\d{2}-\d{2})'
+                r'_(?P<Slug>.*)'
+                r'#(?P<MyMeta>.*)-(?P<author>.*)'
             ),
             EXTRA_PATH_METADATA={
                 input_with_metadata: {
@@ -250,9 +250,9 @@ class RstReaderTest(ReaderTest):
         page = self.read_file(
             path=input_file_path,
             FILENAME_METADATA=(
-                '(?P<date>\d{4}-\d{2}-\d{2})'
-                '_(?P<Slug>.*)'
-                '#(?P<MyMeta>.*)-(?P<orginalauthor>.*)'
+                r'(?P<date>\d{4}-\d{2}-\d{2})'
+                r'_(?P<Slug>.*)'
+                r'#(?P<MyMeta>.*)-(?P<orginalauthor>.*)'
             ),
             EXTRA_PATH_METADATA={
                 input_file_path: {
@@ -557,7 +557,7 @@ class MdReaderTest(ReaderTest):
 
         page = self.read_file(
             path='2012-11-30_md_w_filename_meta#foo-bar.md',
-            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2}).*')
+            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2}).*')
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -568,9 +568,9 @@ class MdReaderTest(ReaderTest):
         page = self.read_file(
             path='2012-11-30_md_w_filename_meta#foo-bar.md',
             FILENAME_METADATA=(
-                '(?P<date>\d{4}-\d{2}-\d{2})'
-                '_(?P<Slug>.*)'
-                '#(?P<MyMeta>.*)-(?P<author>.*)'))
+                r'(?P<date>\d{4}-\d{2}-\d{2})'
+                r'_(?P<Slug>.*)'
+                r'#(?P<MyMeta>.*)-(?P<author>.*)'))
         expected = {
             'category': 'yeah',
             'author': 'Alexis Métaireau',
@@ -583,7 +583,7 @@ class MdReaderTest(ReaderTest):
     def test_article_with_optional_filename_metadata(self):
         page = self.read_file(
             path='2012-11-30_md_w_filename_meta#foo-bar.md',
-            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2})?')
+            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2})?')
         expected = {
             'date': SafeDatetime(2012, 11, 30),
             'reader': 'markdown',
@@ -592,7 +592,7 @@ class MdReaderTest(ReaderTest):
 
         page = self.read_file(
             path='empty.md',
-            FILENAME_METADATA='(?P<date>\d{4}-\d{2}-\d{2})?')
+            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2})?')
         expected = {
             'reader': 'markdown',
         }
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 204ab7b0..ef4a20e0 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -88,7 +88,7 @@ def decode_wp_content(content, br=True):
     content = re.sub(r'<p><blockquote([^>]*)>', "<blockquote\\1><p>", content)
     content = content.replace('</blockquote></p>', '</p></blockquote>')
     content = re.sub(r'<p>\s*(</?' + allblocks + '[^>]*>)', "\\1", content)
-    content = re.sub(r'(</?' + allblocks + '[^>]*>)\s*</p>', "\\1", content)
+    content = re.sub(r'(</?' + allblocks + r'[^>]*>)\s*</p>', "\\1", content)
     if br:
         def _preserve_newline(match):
             return match.group(0).replace("\n", "<WPPreserveNewline />")

From f49037e0ca1f1786b123fe25ca35a978653f410d Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Wed, 29 Mar 2017 10:45:41 +0200
Subject: [PATCH 1969/2864] Fixup 89b28fd

We need to mark the whole doctest string as raw as it contains
regular expressions.
---
 pelican/readers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index fda60596..46055962 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -636,7 +636,7 @@ def path_metadata(full_path, source_path, settings=None):
 
 
 def parse_path_metadata(source_path, settings=None, process=None):
-    """Extract a metadata dictionary from a file's path
+    r"""Extract a metadata dictionary from a file's path
 
     >>> import pprint
     >>> settings = {
@@ -650,9 +650,9 @@ def parse_path_metadata(source_path, settings=None, process=None):
     ...     settings=settings,
     ...     process=reader.process_metadata)
     >>> pprint.pprint(metadata)  # doctest: +ELLIPSIS
-    ... {'category': <pelican.urlwrappers.Category object at ...>,
-    ...  'date': SafeDatetime(2013, 1, 1, 0, 0),
-    ...  'slug': 'my-slug'}
+    {'category': <pelican.urlwrappers.Category object at ...>,
+     'date': SafeDatetime(2013, 1, 1, 0, 0),
+     'slug': 'my-slug'}
     """
     metadata = {}
     dirname, basename = os.path.split(source_path)

From ad38d602c710355fe5051f7857793fcb036d8bad Mon Sep 17 00:00:00 2001
From: jvoisin <jvo@nbs-system.com>
Date: Wed, 8 Mar 2017 14:05:57 +0100
Subject: [PATCH 1970/2864] Improve the regexp used in _update_content

a html tag always starts with <[a-z], < [a-z] is invalid
a space can be found after the = in href='bleh'

This function is taking 10% of the compilation time, with caching enabled,
maybe it's worth optimising the regexp a bit more, I don't know.
---
 pelican/contents.py            |  4 ++--
 pelican/tests/test_contents.py | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 3187f328..3d1128c9 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -219,8 +219,8 @@ class Content(object):
 
         instrasite_link_regex = self.settings['INTRASITE_LINK_REGEX']
         regex = r"""
-            (?P<markup><\s*[^\>]*  # match tag with all url-value attributes
-                (?:href|src|poster|data|cite|formaction|action)\s*=)
+            (?P<markup><[^\>]+  # match tag with all url-value attributes
+                (?:href|src|poster|data|cite|formaction|action)\s*=\s*)
 
             (?P<quote>["\'])      # require value to be quoted
             (?P<path>{0}(?P<value>.*?))  # the url value
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index b4146150..11fa958a 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -771,3 +771,24 @@ class TestStatic(LoggedTestCase):
             count=1,
             msg="Unable to find 'foo', skipping url replacement.",
             level=logging.WARNING)
+
+    def test_index_link_syntax_with_spaces(self):
+        """{index} link syntax triggers url replacement
+        with spaces around the equal sign."""
+
+        html = '<a href = "{index}">link</a>'
+        page = Page(
+            content=html,
+            metadata={'title': 'fakepage'},
+            settings=self.settings,
+            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
+            context=self.context)
+        content = page.get_content('')
+
+        self.assertNotEqual(content, html)
+
+        expected_html = ('<a href = "' +
+                         '/'.join((self.settings['SITEURL'],
+                                   self.settings['INDEX_SAVE_AS'])) +
+                         '">link</a>')
+        self.assertEqual(content, expected_html)

From 77faffa6f75e69c7028f798b80e7a0bbe68ad794 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sun, 16 Apr 2017 13:45:45 +0200
Subject: [PATCH 1971/2864] Add Python 3.6 classifier to setup.py

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 3645dc04..f3a0ebcb 100755
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(
          'Programming Language :: Python :: 3.3',
          'Programming Language :: Python :: 3.4',
          'Programming Language :: Python :: 3.5',
+         'Programming Language :: Python :: 3.6',
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Software Development :: Libraries :: Python Modules',
     ],

From 651ccbcddfbaef74de2e5a2b247686e525ebe017 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 20 Apr 2017 13:40:19 -0600
Subject: [PATCH 1972/2864] Pelican trove classifier now on PyPI

https://github.com/pypa/warehouse/issues/1650
(now sorted alphabetically)
---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index f3a0ebcb..c26f1e71 100755
--- a/setup.py
+++ b/setup.py
@@ -55,6 +55,7 @@ setup(
     classifiers=[
          'Development Status :: 5 - Production/Stable',
          'Environment :: Console',
+         'Framework :: Pelican',
          'License :: OSI Approved :: GNU Affero General Public License v3',
          'Operating System :: OS Independent',
          'Programming Language :: Python :: 2',

From 24c41195a669070d0970ad5d62f3fa5887902900 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Wed, 26 Apr 2017 10:34:47 -0600
Subject: [PATCH 1973/2864] Use 4-space indentation

---
 setup.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/setup.py b/setup.py
index c26f1e71..be038971 100755
--- a/setup.py
+++ b/setup.py
@@ -53,20 +53,20 @@ setup(
     install_requires=requires,
     entry_points=entry_points,
     classifiers=[
-         'Development Status :: 5 - Production/Stable',
-         'Environment :: Console',
-         'Framework :: Pelican',
-         'License :: OSI Approved :: GNU Affero General Public License v3',
-         'Operating System :: OS Independent',
-         'Programming Language :: Python :: 2',
-         'Programming Language :: Python :: 2.7',
-         'Programming Language :: Python :: 3',
-         'Programming Language :: Python :: 3.3',
-         'Programming Language :: Python :: 3.4',
-         'Programming Language :: Python :: 3.5',
-         'Programming Language :: Python :: 3.6',
-         'Topic :: Internet :: WWW/HTTP',
-         'Topic :: Software Development :: Libraries :: Python Modules',
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Framework :: Pelican',
+        'License :: OSI Approved :: GNU Affero General Public License v3',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     test_suite='pelican.tests',
 )

From 32c154be95cd71ea96284b1dbee1d3fa04a9adb1 Mon Sep 17 00:00:00 2001
From: Brandon B <outlace@users.noreply.github.com>
Date: Fri, 28 Apr 2017 19:18:44 -0700
Subject: [PATCH 1974/2864] Update tips.rst

I found that one of the easiest ways to publish to GitHub User Pages is to make Pelican a subdirectory within the ``<username>.github.io`` project, then generate the output files in the root level of ``<username>.github.io`` and push the entire project to GitHub.
---
 docs/tips.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/tips.rst b/docs/tips.rst
index 50160380..bf0b3599 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -98,6 +98,18 @@ by the ``ghp-import`` command) to the ``elemoine.github.io`` repository's
 
     To publish your Pelican site as User Pages, feel free to adjust the
     ``github`` target of the Makefile.
+    
+Another option for publishing to User Pages is to generate the output files in the root directory of the project.
+
+For example, your main project folder is ``<username>.github.io`` and you can create the Pelican project in a subdirectory called ``Pelican``. Then from inside the ``Pelican`` folder you can run::
+    
+    $ pelican content -o .. -s pelicanconf.py
+
+Now you can push the whole project ``<username>.github.io`` to the master branch of your GitHub repository::
+    
+    $ git push origin master
+    
+(assuming origin is set to your remote repository).
 
 Custom 404 Pages
 ----------------

From c68958e6b89459bbd0488208279d843a41cc5681 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Fri, 5 May 2017 16:02:48 +0200
Subject: [PATCH 1975/2864] Fixup ec5c77b25145f7c20fee24c6b85b478295dbc956

fix forgotten PAGES -> pages
---
 pelican/themes/notmyidea/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 6019987b..20ca7eee 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -51,7 +51,7 @@
 {% else %}
 <section id="content" class="body">
 <h2>Pages</h2>
-    {% for page in PAGES %}
+    {% for page in pages %}
         <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
     {% endfor %}
 </section>

From fdf355c377627d82026765872b8660086715a419 Mon Sep 17 00:00:00 2001
From: evilroot <k@e-dot.uk>
Date: Thu, 8 Jun 2017 22:54:12 +0100
Subject: [PATCH 1976/2864] Fix rsync_upload in Makefile template

---
 pelican/tools/templates/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 06880c44..5dc81baa 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -102,7 +102,7 @@ ssh_upload: publish
 	scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 rsync_upload: publish
-	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
+	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --cvs-exclude --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
 dropbox_upload: publish
 	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)

From 7336de45cbb5f60e934b65f823d0583b48a6c96b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 6 Jun 2017 20:34:56 +0200
Subject: [PATCH 1977/2864] Ability to override docutils HTML
 writer/translator.

The RstReader class can now use user-specified writer/translator classes
instead of the hardcoded ones from docutils. This allows for far easier
overriding of the default HTML output -- in the past one would need to
override the internal _parse_metadata() and _get_publisher() functions.
With hypothetical Html5Writer and Html5FieldBodyTranslator classes,
based for example on docutils.writers.html5_polyglot.Writer and
docutils.writers.html5_polyglot.HTMLTranslator, a plugin that overrides
the default behavior would now look just like this:

    # (definition of Writer / Translator classes omitted)

    class Html5RstReader(RstReader):
        writer_class = Html5Writer
        field_body_translator_class = Html5FieldBodyTranslator

    def add_reader(readers):
        readers.reader_classes['rst'] = Html5RstReader

    def register():
        pelican.signals.readers_init.connect(add_reader)
---
 pelican/readers.py | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 46055962..61126c9c 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -9,7 +9,7 @@ from collections import OrderedDict
 import docutils
 import docutils.core
 import docutils.io
-from docutils.writers.html4css1 import HTMLTranslator
+from docutils.writers.html4css1 import HTMLTranslator, Writer
 
 import six
 from six.moves.html_parser import HTMLParser
@@ -135,12 +135,19 @@ class _FieldBodyTranslator(HTMLTranslator):
         pass
 
 
-def render_node_to_html(document, node):
-    visitor = _FieldBodyTranslator(document)
+def render_node_to_html(document, node, field_body_translator_class):
+    visitor = field_body_translator_class(document)
     node.walkabout(visitor)
     return visitor.astext()
 
 
+class PelicanHTMLWriter(Writer):
+
+    def __init__(self):
+        Writer.__init__(self)
+        self.translator_class = PelicanHTMLTranslator
+
+
 class PelicanHTMLTranslator(HTMLTranslator):
 
     def visit_abbreviation(self, node):
@@ -160,11 +167,26 @@ class PelicanHTMLTranslator(HTMLTranslator):
 
 
 class RstReader(BaseReader):
-    """Reader for reStructuredText files"""
+    """Reader for reStructuredText files
+
+    By default the output HTML is written using
+    docutils.writers.html4css1.Writer and translated using a subclass of
+    docutils.writers.html4css1.HTMLTranslator. If you want to override it with
+    your own writer/translator (e.g. a HTML5-based one), pass your classes to
+    these two attributes. Look in the source code for details.
+
+        writer_class                    Used for writing contents
+        field_body_translator_class     Used for translating metadata such
+            as article summary
+
+    """
 
     enabled = bool(docutils)
     file_extensions = ['rst']
 
+    writer_class = PelicanHTMLWriter
+    field_body_translator_class = _FieldBodyTranslator
+
     class FileInput(docutils.io.FileInput):
         """Patch docutils.io.FileInput to remove "U" mode in py3.
 
@@ -192,7 +214,9 @@ class RstReader(BaseReader):
                     name_elem, body_elem = element.children
                     name = name_elem.astext()
                     if name in formatted_fields:
-                        value = render_node_to_html(document, body_elem)
+                        value = render_node_to_html(
+                            document, body_elem,
+                            self.field_body_translator_class)
                     else:
                         value = body_elem.astext()
                 elif element.tagname == 'authors':  # author list
@@ -217,10 +241,10 @@ class RstReader(BaseReader):
             extra_params.update(user_params)
 
         pub = docutils.core.Publisher(
+            writer=self.writer_class(),
             source_class=self.FileInput,
             destination_class=docutils.io.StringOutput)
         pub.set_components('standalone', 'restructuredtext', 'html')
-        pub.writer.translator_class = PelicanHTMLTranslator
         pub.process_programmatic_settings(None, extra_params, None)
         pub.set_source(source_path=source_path)
         pub.publish(enable_exit_status=True)

From 43ec3c4f7dd188bfa5a9ad430618a7b1fe570ffd Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 19 Jul 2017 13:29:04 -0700
Subject: [PATCH 1978/2864] Fix copyright year to date of first publication

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 81a06e3a..3748fd75 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -17,7 +17,7 @@ extensions = ['sphinx.ext.autodoc',
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Pelican'
-copyright = '2015, Alexis Metaireau and contributors'
+copyright = '2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])

From 1c96d8c933aaf8770b83a228d22936e36e40da3d Mon Sep 17 00:00:00 2001
From: Jonas Lundholm Bertelsen <drixi.b@gmail.com>
Date: Mon, 24 Jul 2017 12:25:21 +0200
Subject: [PATCH 1979/2864] Correct import of socketserver on Python 3

---
 pelican/tools/templates/fabfile.py.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.in
index 18131d5f..d3c50a83 100644
--- a/pelican/tools/templates/fabfile.py.in
+++ b/pelican/tools/templates/fabfile.py.in
@@ -3,7 +3,10 @@ import fabric.contrib.project as project
 import os
 import shutil
 import sys
-import SocketServer
+try:
+    import socketserver
+except ImportError:
+    import SocketServer as socketserver
 
 from pelican.server import ComplexHTTPRequestHandler
 
@@ -48,7 +51,7 @@ def serve():
     """Serve site at http://localhost:8000/"""
     os.chdir(env.deploy_path)
 
-    class AddressReuseTCPServer(SocketServer.TCPServer):
+    class AddressReuseTCPServer(socketserver.TCPServer):
         allow_reuse_address = True
 
     server = AddressReuseTCPServer(('', PORT), ComplexHTTPRequestHandler)

From 089b46b7eb86cb55491d3c8e8bccb956b6dceeff Mon Sep 17 00:00:00 2001
From: winlu <ingwinlu@users.noreply.github.com>
Date: Mon, 24 Jul 2017 19:01:14 +0200
Subject: [PATCH 1980/2864] Consolidate validation of content (#2128)

* Consolidate validation of content

Previously we validated content outside of the content class via
calls to `is_valid_content` and some additional checks in page /
article generators (valid status).
This commit moves those checks all into content.valid() resulting
in a cleaner code structure.
This allows us to restructure how generators interact with content,
removing several old bugs in pelican (#1748, #1356, #2098).

- move verification function into content class
- move generator verifying content to contents class
- remove unused quote class
- remove draft class (no more rereading drafts)
- move auto draft status setter into Article.__init__
- add now parsing draft to basic test output
- remove problematic DEFAULT_STATUS setting
- add setter/getter for content.status
  removes need for lower() calls when verifying status

* expand c4b184fa32f73a737ff9bade440ce0f7914dc350

Mostly implement feedback by @iKevinY.

* rename content.valid to content.is_valid
* rename valid_* functions to has_valid_*
* update tests and function calls in code accordingly
---
 pelican/contents.py                           | 108 +++++++++++-------
 pelican/generators.py                         |  54 +++------
 pelican/settings.py                           |   1 -
 .../output/basic/drafts/a-draft-article.html  |  69 +++++++++++
 pelican/tests/test_contents.py                |  16 +--
 5 files changed, 159 insertions(+), 89 deletions(-)
 create mode 100644 pelican/tests/output/basic/drafts/a-draft-article.html

diff --git a/pelican/contents.py b/pelican/contents.py
index 3d1128c9..15770fc8 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -138,14 +138,7 @@ class Content(object):
 
         # manage status
         if not hasattr(self, 'status'):
-            self.status = settings['DEFAULT_STATUS']
-            if not settings['WITH_FUTURE_DATES'] and hasattr(self, 'date'):
-                if self.date.tzinfo is None:
-                    now = SafeDatetime.now()
-                else:
-                    now = SafeDatetime.utcnow().replace(tzinfo=pytz.utc)
-                if self.date > now:
-                    self.status = 'draft'
+            self.status = getattr(self, 'default_status', None)
 
         # store the summary metadata if it is set
         if 'summary' in metadata:
@@ -156,13 +149,17 @@ class Content(object):
     def __str__(self):
         return self.source_path or repr(self)
 
-    def check_properties(self):
+    def _has_valid_mandatory_properties(self):
         """Test mandatory properties are set."""
         for prop in self.mandatory_properties:
             if not hasattr(self, prop):
-                raise NameError(prop)
+                logger.error(
+                    "Skipping %s: could not find information about '%s'",
+                    self, prop)
+                return False
+        return True
 
-    def valid_save_as(self):
+    def _has_valid_save_as(self):
         """Return true if save_as doesn't write outside output path, false
         otherwise."""
         try:
@@ -174,10 +171,35 @@ class Content(object):
         try:
             sanitised_join(output_path, self.save_as)
         except RuntimeError:  # outside output_dir
+            logger.error(
+                "Skipping %s: file %r would be written outside output path",
+                self,
+                self.save_as,
+            )
             return False
 
         return True
 
+    def _has_valid_status(self):
+        if hasattr(self, 'allowed_statuses'):
+            if self.status not in self.allowed_statuses:
+                logger.error(
+                    "Unknown status '%s' for file %s, skipping it.",
+                    self.status,
+                    self
+                )
+                return False
+
+        # if undefined we allow all
+        return True
+
+    def is_valid(self):
+        """Validate Content"""
+        # Use all() to not short circuit and get results of all validations
+        return all([self._has_valid_mandatory_properties(),
+                    self._has_valid_save_as(),
+                    self._has_valid_status()])
+
     @property
     def url_format(self):
         """Returns the URL, formatted with the proper values"""
@@ -194,8 +216,10 @@ class Content(object):
         })
         return metadata
 
-    def _expand_settings(self, key):
-        fq_key = ('%s_%s' % (self.__class__.__name__, key)).upper()
+    def _expand_settings(self, key, klass=None):
+        if not klass:
+            klass = self.__class__.__name__
+        fq_key = ('%s_%s' % (klass, key)).upper()
         return self.settings[fq_key].format(**self.url_format)
 
     def get_url_setting(self, key):
@@ -338,6 +362,15 @@ class Content(object):
         """Dummy function"""
         pass
 
+    @property
+    def status(self):
+        return self._status
+
+    @status.setter
+    def status(self, value):
+        # TODO maybe typecheck
+        self._status = value.lower()
+
     @property
     def url(self):
         return self.get_url_setting('url')
@@ -383,21 +416,36 @@ class Content(object):
 
 class Page(Content):
     mandatory_properties = ('title',)
+    allowed_statuses = ('published', 'hidden')
+    default_status = 'published'
     default_template = 'page'
 
 
-class Article(Page):
+class Article(Content):
     mandatory_properties = ('title', 'date', 'category')
+    allowed_statuses = ('published', 'draft')
+    default_status = 'published'
     default_template = 'article'
 
+    def __init__(self, *args, **kwargs):
+        super(Article, self).__init__(*args, **kwargs)
 
-class Draft(Page):
-    mandatory_properties = ('title', 'category')
-    default_template = 'article'
+        # handle WITH_FUTURE_DATES (designate article to draft based on date)
+        if not self.settings['WITH_FUTURE_DATES'] and hasattr(self, 'date'):
+            if self.date.tzinfo is None:
+                now = SafeDatetime.now()
+            else:
+                now = SafeDatetime.utcnow().replace(tzinfo=pytz.utc)
+            if self.date > now:
+                self.status = 'draft'
 
+        # if we are a draft and there is no date provided, set max datetime
+        if not hasattr(self, 'date') and self.status == 'draft':
+            self.date = SafeDatetime.max
 
-class Quote(Page):
-    base_properties = ('author', 'date')
+    def _expand_settings(self, key):
+        klass = 'article' if self.status == 'published' else 'draft'
+        return super(Article, self)._expand_settings(key, klass)
 
 
 @python_2_unicode_compatible
@@ -482,25 +530,3 @@ class Static(Page):
 
         self.override_save_as = new_save_as
         self.override_url = new_url
-
-
-def is_valid_content(content, f):
-    try:
-        content.check_properties()
-    except NameError as e:
-        logger.error(
-            "Skipping %s: could not find information about '%s'",
-            f, six.text_type(e))
-        return False
-
-    if not content.valid_save_as():
-        logger.error(
-            "Skipping %s: file %r would be written outside output path",
-            f,
-            content.save_as,
-        )
-        # Note: future code might want to use a result variable instead, to
-        # allow showing multiple error messages at once.
-        return False
-
-    return True
diff --git a/pelican/generators.py b/pelican/generators.py
index f3590155..eb97c115 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -19,7 +19,7 @@ import six
 
 from pelican import signals
 from pelican.cache import FileStampDataCacher
-from pelican.contents import Article, Draft, Page, Static, is_valid_content
+from pelican.contents import Article, Page, Static
 from pelican.readers import Readers
 from pelican.utils import (DateFormatter, copy, mkdir_p, posixize_path,
                            process_translations, python_2_unicode_compatible)
@@ -509,12 +509,10 @@ class ArticlesGenerator(CachingGenerator):
         for f in self.get_files(
                 self.settings['ARTICLE_PATHS'],
                 exclude=self.settings['ARTICLE_EXCLUDES']):
-            article_or_draft = self.get_cached_data(f, None)
-            if article_or_draft is None:
-                # TODO needs overhaul, maybe nomad for read_file
-                # solution, unified behaviour
+            article = self.get_cached_data(f, None)
+            if article is None:
                 try:
-                    article_or_draft = self.readers.read_file(
+                    article = self.readers.read_file(
                         base_path=self.path, path=f, content_class=Article,
                         context=self.context,
                         preread_signal=signals.article_generator_preread,
@@ -528,34 +526,17 @@ class ArticlesGenerator(CachingGenerator):
                     self._add_failed_source_path(f)
                     continue
 
-                if not is_valid_content(article_or_draft, f):
+                if not article.is_valid():
                     self._add_failed_source_path(f)
                     continue
 
-                if article_or_draft.status.lower() == "published":
-                    pass
-                elif article_or_draft.status.lower() == "draft":
-                    article_or_draft = self.readers.read_file(
-                        base_path=self.path, path=f, content_class=Draft,
-                        context=self.context,
-                        preread_signal=signals.article_generator_preread,
-                        preread_sender=self,
-                        context_signal=signals.article_generator_context,
-                        context_sender=self)
-                else:
-                    logger.error(
-                        "Unknown status '%s' for file %s, skipping it.",
-                        article_or_draft.status, f)
-                    self._add_failed_source_path(f)
-                    continue
+                self.cache_data(f, article)
 
-                self.cache_data(f, article_or_draft)
-
-            if article_or_draft.status.lower() == "published":
-                all_articles.append(article_or_draft)
-            else:
-                all_drafts.append(article_or_draft)
-            self.add_source_path(article_or_draft)
+            if article.status == "published":
+                all_articles.append(article)
+            elif article.status == "draft":
+                all_drafts.append(article)
+            self.add_source_path(article)
 
         self.articles, self.translations = process_translations(
             all_articles,
@@ -634,22 +615,15 @@ class PagesGenerator(CachingGenerator):
                     self._add_failed_source_path(f)
                     continue
 
-                if not is_valid_content(page, f):
-                    self._add_failed_source_path(f)
-                    continue
-
-                if page.status.lower() not in ("published", "hidden"):
-                    logger.error(
-                        "Unknown status '%s' for file %s, skipping it.",
-                        page.status, f)
+                if not page.is_valid():
                     self._add_failed_source_path(f)
                     continue
 
                 self.cache_data(f, page)
 
-            if page.status.lower() == "published":
+            if page.status == "published":
                 all_pages.append(page)
-            elif page.status.lower() == "hidden":
+            elif page.status == "hidden":
                 hidden_pages.append(page)
             self.add_source_path(page)
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 831e1851..d1249a24 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -126,7 +126,6 @@ DEFAULT_CONFIG = {
     'FILENAME_METADATA': r'(?P<date>\d{4}-\d{2}-\d{2}).*',
     'PATH_METADATA': '',
     'EXTRA_PATH_METADATA': {},
-    'DEFAULT_STATUS': 'published',
     'ARTICLE_PERMALINK_STRUCTURE': '',
     'TYPOGRIFY': False,
     'TYPOGRIFY_IGNORE_TAGS': [],
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
new file mode 100644
index 00000000..64d56ff9
--- /dev/null
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <title>A draft article</title>
+        <link rel="stylesheet" href="/theme/css/main.css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
+        <!--[if IE]>
+            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+</head>
+
+<body id="index" class="home">
+        <header id="banner" class="body">
+                <h1><a href="/">A Pelican Blog </a></h1>
+                <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="/drafts/a-draft-article.html" rel="bookmark"
+           title="Permalink to A draft article">A draft article</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="9999-12-31T23:59:59.999999">
+                Published: 
+        </abbr>
+
+<p>In <a href="/category/misc.html">misc</a>.</p>
+
+</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
+listed anywhere else.</p>
+
+    </div><!-- /.entry-content -->
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 56928b81..d028c7a1 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -69,11 +69,13 @@ class TestPage(LoggedTestCase):
     def test_mandatory_properties(self):
         # If the title is not set, must throw an exception.
         page = Page('content')
-        with self.assertRaises(NameError):
-            page.check_properties()
-
+        self.assertFalse(page._has_valid_mandatory_properties())
+        self.assertLogCountEqual(
+                count=1,
+                msg="Skipping .*: could not find information about 'title'",
+                level=logging.ERROR)
         page = Page('content', metadata={'title': 'foobar'})
-        page.check_properties()
+        self.assertTrue(page._has_valid_mandatory_properties())
 
     def test_summary_from_metadata(self):
         # If a :summary: metadata is given, it should be used
@@ -503,7 +505,7 @@ class TestArticle(TestPage):
         article_kwargs['metadata']['slug'] = '../foo'
         article_kwargs['settings'] = settings
         article = Article(**article_kwargs)
-        self.assertFalse(article.valid_save_as())
+        self.assertFalse(article._has_valid_save_as())
 
     def test_valid_save_as_detects_breakout_to_root(self):
         settings = get_settings()
@@ -511,7 +513,7 @@ class TestArticle(TestPage):
         article_kwargs['metadata']['slug'] = '/foo'
         article_kwargs['settings'] = settings
         article = Article(**article_kwargs)
-        self.assertFalse(article.valid_save_as())
+        self.assertFalse(article._has_valid_save_as())
 
     def test_valid_save_as_passes_valid(self):
         settings = get_settings()
@@ -519,7 +521,7 @@ class TestArticle(TestPage):
         article_kwargs['metadata']['slug'] = 'foo'
         article_kwargs['settings'] = settings
         article = Article(**article_kwargs)
-        self.assertTrue(article.valid_save_as())
+        self.assertTrue(article._has_valid_save_as())
 
 
 class TestStatic(LoggedTestCase):

From 68724e9682f91763104811ff72e092f07d9ad6b5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 25 Jul 2017 09:00:41 -0700
Subject: [PATCH 1981/2864] Encourage use of https:// in SITEURL

Refs #2183 #2186
---
 docs/settings.rst                         | 8 +++++---
 pelican/tools/pelican_quickstart.py       | 2 +-
 pelican/tools/templates/publishconf.py.in | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 462f9d36..e5ce19f5 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -203,10 +203,12 @@ Basic settings
 
 .. data:: SITEURL
 
-   Base URL of your website. Not defined by default, so it is best to specify
+   Base URL of your web site. Not defined by default, so it is best to specify
    your SITEURL; if you do not, feeds will not be generated with
-   properly-formed URLs. You should include ``http://`` and your domain, with
-   no trailing slash at the end. Example: ``SITEURL = 'http://mydomain.com'``
+   properly-formed URLs. If your site is available via HTTPS, this setting
+   should begin with ``https://`` — otherwise use ``http://``. Then append your
+   domain, with no trailing slash at the end.
+   Example: ``SITEURL = 'https://example.com'``
 
 .. data:: STATIC_PATHS = ['images']
 
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index ae0e8c9d..eb63ed1f 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -246,7 +246,7 @@ needed by Pelican.
     CONF['lang'] = ask('What will be the default language of this web site?',
                        str_compat, args.lang or CONF['lang'], 2)
 
-    if ask('Do you want to specify a URL prefix? e.g., http://example.com  ',
+    if ask('Do you want to specify a URL prefix? e.g., https://example.com  ',
            answer=bool, default=True):
         CONF['siteurl'] = ask('What is your URL prefix? (see '
                               'above example; no trailing slash)',
diff --git a/pelican/tools/templates/publishconf.py.in b/pelican/tools/templates/publishconf.py.in
index d1ed994d..473490a9 100755
--- a/pelican/tools/templates/publishconf.py.in
+++ b/pelican/tools/templates/publishconf.py.in
@@ -10,6 +10,7 @@ import sys
 sys.path.append(os.curdir)
 from pelicanconf import *
 
+# If your site is available via HTTPS, make sure SITEURL begins with https://
 SITEURL = '$siteurl'
 RELATIVE_URLS = False
 

From 9495a6c3df8d0417568a78fb03f6c0eccc7adf72 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sun, 30 Jul 2017 17:41:03 +0200
Subject: [PATCH 1982/2864] Remove trailing whitespaces from notmyidea

---
 pelican/themes/notmyidea/static/css/main.css  | 64 +++++++++----------
 .../themes/notmyidea/static/css/typogrify.css |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 03a77e69..8f3deef0 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -43,7 +43,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 h3, h4, h5, h6 { margin-top: .8em; }
-	
+
 hr { border: 2px solid #EEEEEE; }
 
 /* Anchors */
@@ -64,7 +64,7 @@ a:hover, a:active {
 h1 a:hover {
     background-color: inherit
 }
-	
+
 /* Paragraphs */
 div.line-block,
 p { margin-top: 1em;
@@ -124,7 +124,7 @@ div.note {
 
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
-	
+
 	/* Thead */
 	thead th {padding: .5em .4em; text-align: left;}
 	thead td {}
@@ -132,14 +132,14 @@ table {margin: .5em auto 1.5em auto; width: 98%;}
 	/* Tbody */
 	tbody td {padding: .5em .4em;}
 	tbody th {}
-	
+
 	tbody .alt td {}
 	tbody .alt th {}
-	
+
 	/* Tfoot */
 	tfoot th {}
 	tfoot td {}
-	
+
 /* HTML5 tags */
 header, section, footer,
 aside, nav, article, figure {
@@ -173,9 +173,9 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		color: #C74350;
 		text-shadow: none;
 	}
-	
+
 	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
-	
+
 	/* Main Nav */
 	#banner nav {
 		background: #000305;
@@ -186,15 +186,15 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		padding: 0;
 		text-align: center;
 		width: 800px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
-	
+
 	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
 	#banner nav li {float: left; display: inline; margin: 0;}
-	
+
 	#banner nav a:link, #banner nav a:visited {
 		color: #fff;
 		display: inline-block;
@@ -208,12 +208,12 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		color: #fff;
 		text-shadow: none !important;
 	}
-	
+
 	#banner nav li:first-child a {
 		border-top-left-radius: 5px;
 		-moz-border-radius-topleft: 5px;
 		-webkit-border-top-left-radius: 5px;
-		
+
 		border-bottom-left-radius: 5px;
 		-moz-border-radius-bottomleft: 5px;
 		-webkit-border-bottom-left-radius: 5px;
@@ -228,7 +228,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	overflow: hidden;
 	padding: 20px;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -257,7 +257,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	overflow: hidden;
 	padding: 20px 20px;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -292,21 +292,21 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		float: left;
 		width: 615px;
 	}
-	
+
 	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
-	
+
 	/* Social */
 	#extras .social {
 		float: right;
 		width: 175px;
 	}
-	
+
 	#extras div[class='social'] a {
 		background-repeat: no-repeat;
 		background-position: 3px 6px;
 		padding-left: 25px;
 	}
-	
+
 		/* Icons */
 		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
 		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
@@ -346,7 +346,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	padding: 20px;
 	text-align: left;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -390,7 +390,7 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 	/* Blog Index */
 	#posts-list {list-style: none; margin: 0;}
 	#posts-list .hentry {padding-left: 10px; position: relative;}
-	
+
 	#posts-list footer {
 		left: 10px;
 		position: relative;
@@ -398,7 +398,7 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		top: 0.5em;
 		width: 190px;
 	}
-	
+
 	/* About the Author */
 	#about-author {
 		background: #f9f9f9;
@@ -406,21 +406,21 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		font-style: normal;
 		margin: 2em 0;
 		padding: 10px 20px 15px 20px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
-	
+
 	#about-author strong {
 		color: #C64350;
 		clear: both;
 		display: block;
 		font-size: 1.429em;
 	}
-	
+
 	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
-	
+
 	/* Comments */
 	#comments-list {list-style: none; margin: 0 1em;}
 	#comments-list blockquote {
@@ -429,24 +429,24 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		font-style: normal;
 		margin: 0;
 		padding: 15px 20px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
 	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
-	
+
 	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
-	
+
 	/* Add a Comment */
 	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
 	#add-comment input[type='text'],
 	#add-comment input[type='email'],
 	#add-comment input[type='url'] {float: left; width: 200px;}
-	
+
 	#add-comment textarea {float: left; height: 150px; width: 495px;}
-	
+
 	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
-	
+
 	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
 	#add-comment * {margin-bottom: .5em;}
diff --git a/pelican/themes/notmyidea/static/css/typogrify.css b/pelican/themes/notmyidea/static/css/typogrify.css
index c9b34dc8..3bae4976 100644
--- a/pelican/themes/notmyidea/static/css/typogrify.css
+++ b/pelican/themes/notmyidea/static/css/typogrify.css
@@ -1,3 +1,3 @@
 .caps {font-size:.92em;}
-.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}    
+.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}
 .dquo {margin-left:-.38em;}

From 9ce09c07151e6876025bab2460fcd6b79af3e9da Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sun, 30 Jul 2017 17:46:18 +0200
Subject: [PATCH 1983/2864] Store fonts of notmyidea theme locally

Used google-font-download ((commit ecc521e894c55e83773351264fe5bbef99ae70ad))
to download the fonts.
  font-download -f 'woff woff2' -l 'latin' 'Yanone Kaffeesatz:400'
---
 pelican/themes/notmyidea/static/css/fonts.css |  12 +
 pelican/themes/notmyidea/static/css/main.css  |   2 +-
 .../static/fonts/Yanone_Kaffeesatz_400.eot    | Bin 0 -> 20932 bytes
 .../static/fonts/Yanone_Kaffeesatz_400.svg    | 407 ++++++++++++++++++
 .../static/fonts/Yanone_Kaffeesatz_400.ttf    | Bin 0 -> 39168 bytes
 .../static/fonts/Yanone_Kaffeesatz_400.woff   | Bin 0 -> 22256 bytes
 .../static/fonts/Yanone_Kaffeesatz_400.woff2  | Bin 0 -> 18320 bytes
 .../themes/notmyidea/static/fonts/font.css    |  12 +
 8 files changed, 432 insertions(+), 1 deletion(-)
 create mode 100644 pelican/themes/notmyidea/static/css/fonts.css
 create mode 100644 pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.eot
 create mode 100644 pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.svg
 create mode 100644 pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.ttf
 create mode 100644 pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.woff
 create mode 100644 pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.woff2
 create mode 100644 pelican/themes/notmyidea/static/fonts/font.css

diff --git a/pelican/themes/notmyidea/static/css/fonts.css b/pelican/themes/notmyidea/static/css/fonts.css
new file mode 100644
index 00000000..56015076
--- /dev/null
+++ b/pelican/themes/notmyidea/static/css/fonts.css
@@ -0,0 +1,12 @@
+@font-face {
+	font-family: 'Yanone Kaffeesatz';
+	font-style: normal;
+	font-weight: 400;
+	src:
+		local('Yanone Kaffeesatz Regular'),
+		local('YanoneKaffeesatz-Regular'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
+		url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
+		url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
+}
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 8f3deef0..9673ca45 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -12,7 +12,7 @@
 @import url("reset.css");
 @import url("pygment.css");
 @import url("typogrify.css");
-@import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+@import url("fonts.css");
 
 /***** Global *****/
 /* Body */
diff --git a/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.eot b/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.eot
new file mode 100644
index 0000000000000000000000000000000000000000..b3b90dbc3ef34775a8689ab6a4494810c14c5a59
GIT binary patch
literal 20932
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

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.svg b/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.svg
new file mode 100644
index 00000000..a69669b5
--- /dev/null
+++ b/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.svg
@@ -0,0 +1,407 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs >
+<font id="YanoneKaffeesatz" horiz-adv-x="384" ><font-face
+    font-family="Yanone Kaffeesatz"
+    units-per-em="1000"
+    panose-1="0 0 5 0 0 0 0 0 0 0"
+    ascent="957"
+    descent="-200"
+    alphabetic="0" />
+<glyph unicode=" " glyph-name="space" horiz-adv-x="158" />
+<glyph unicode="!" glyph-name="exclam" horiz-adv-x="195" d="M45 683Q45 694 53 699T83 705T155 706L139 251Q138 233 131 226T109 216T59 213L45 683ZM68 -7T55 7T42 50Q42 74 57 91T97 108Q153 108 153 50Q153 26 138 10T97 -7Q68 -7 55 7Z" />
+<glyph unicode="&quot;" glyph-name="quotedbl" horiz-adv-x="263" d="M42 607T37 667T31 760Q31 781 34 782Q41 786 65 786Q95 786 110 783Q110 740 103 665T89 586Q82 585 67 584T45 583Q42 607 37 667ZM166 590T160 659T153 761Q153 781 156 782Q163 786 187
+786Q218 786 233 783Q233 742 225 666T212 586Q205 585 190 584T168 583Q166 590 160 659Z" />
+<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="418" d="M323 254H390Q390 213 388 202T374 190H320L316 123Q315 112 302 110T245 107L249 190H154L150 123Q149 112 136 110T79 107L83 190H28Q28 232 30 243T44 254H87L92 360H28Q28 402 30 413T44
+424H96L99 487Q100 498 114 500T170 503L166 424H262L265 487Q266 498 280 500T336 503L332 424H390Q390 383 388 372T374 360H328L323 254ZM157 254H253L258 360H162L157 254Z" />
+<glyph unicode="$" glyph-name="dollar" horiz-adv-x="418" d="M363 20T237 -4V-91Q237 -110 221 -116T164 -122V-7Q128 -5 103 2T66 19T53 37Q53 46 59 68T74 102Q111 72 181 72Q228 72 251 94T274 158Q274 186 262 208T219 264L107 377Q53 434 53 488Q53 542
+86 574T181 615V704Q181 724 198 730T254 737V616Q304 613 330 602T357 581Q357 569 352 553T337 525Q326 533 299 539T239 546Q142 546 142 489Q142 469 152 452T185 409L306 288Q336 258 349 227T363 157Q363 20 237 -4Z" />
+<glyph unicode="%" glyph-name="percent" horiz-adv-x="692" d="M162 -7T150 -3T127 8T116 23L520 709Q523 708 534 703T555 691T565 674Q565 667 397 382T166 -8Q162 -7 150 -3ZM132 339T104 353T60 408T45 525Q45 618 81 663T186 708Q233 708 261 692T304 636T319
+526Q319 339 180 339Q132 339 104 353ZM212 402T228 430T245 525Q245 574 239 600T220 636T186 646Q154 646 138 619T122 523Q122 473 128 447T148 412T182 402Q212 402 228 430ZM460 -9T431 5T387 60T372 177Q372 270 408 315T514 360Q561 360 589 344T632 288T647
+178Q647 -9 508 -9Q460 -9 431 5ZM539 52T555 80T572 175Q572 224 566 250T548 286T513 296Q481 296 465 269T448 173Q448 123 454 97T474 62T509 52Q539 52 555 80Z" />
+<glyph unicode="&amp;" glyph-name="ampersand" horiz-adv-x="502" d="M458 70T488 55Q485 31 468 11T435 -10Q420 -10 362 54Q306 -10 212 -10Q27 -10 27 170Q27 229 59 278T139 358Q61 494 61 568Q61 636 104 671T228 706Q293 706 335 692T377 659Q377 644 372
+627T357 600Q330 619 301 627T237 635Q193 635 170 620T146 558Q146 508 205 405T343 201Q351 241 351 291Q351 423 291 496Q332 504 405 504Q447 504 483 501Q483 499 484 490T485 472Q485 453 477 444T443 435L394 436Q411 405 420 374T429 281Q429 194 404 129Q458
+70 488 55ZM272 66T309 115Q242 196 174 300Q110 254 110 168Q110 124 133 95T207 66Q272 66 309 115Z" />
+<glyph unicode="&apos;" glyph-name="quotesingle" horiz-adv-x="141" d="M42 607T37 667T31 760Q31 781 34 782Q41 786 65 786Q95 786 110 783Q110 740 103 665T89 586Q82 585 67 584T45 583Q42 607 37 667Z" />
+<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="292" d="M212 -196T172 -135T99 43T65 320Q65 470 98 578T172 744T226 803Q246 803 255 792T271 752Q218 680 183 573T147 318Q147 211 166 119T213 -38T271 -136Q265 -166 256 -181T227 -196Q212 -196 172 -135Z" />
+<glyph unicode=")" glyph-name="parenright" horiz-adv-x="292" d="M47 -196T37 -181T21 -136Q71 -70 108 44T145 318Q145 460 110 573T21 752Q28 781 37 792T66 803Q79 803 119 746T193 581T227 320Q227 168 194 52T120 -130T65 -196Q47 -196 37 -181Z" />
+<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="470" d="M199 667Q198 678 206 683T229 688Q256 688 278 677L258 519Q256 510 252 506T239 501Q231 501 221 504L199 667ZM269 469T269 478Q269 489 282 495L431 575Q441 566 447 551T454 521Q454 498 439
+494L280 455Q269 469 269 478ZM16 503Q15 532 29 551T60 570Q63 570 69 568L199 487Q200 470 194 463T175 459L16 503ZM249 404Q246 410 246 414Q246 424 271 434L386 299Q390 294 390 288Q390 274 370 261T327 245L249 404ZM130 250T120 250Q107 250 92 266T66
+300L187 423Q195 431 202 431Q212 431 224 415L136 259Q130 250 120 250Z" />
+<glyph unicode="+" glyph-name="plus" horiz-adv-x="418" d="M384 317Q384 275 382 261T368 247H245V123Q245 112 231 110T174 107V247H34Q34 290 36 303T51 317H174V441Q174 452 188 454T245 457V317H384Z" />
+<glyph unicode="," glyph-name="comma" horiz-adv-x="183" d="M43 -103T38 -80Q54 -53 59 -36T67 5Q43 21 43 54Q43 77 57 91T94 106Q148 106 148 47Q148 13 133 -21T99 -79T70 -103Q43 -103 38 -80Z" />
+<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="278" d="M37 290T39 303T54 317H241Q241 275 239 261T225 247H37Q37 290 39 303Z" />
+<glyph unicode="." glyph-name="period" horiz-adv-x="183" d="M63 -6T50 8T37 51Q37 75 52 91T93 108Q148 108 148 51Q148 26 133 10T93 -6Q63 -6 50 8Z" />
+<glyph unicode="/" glyph-name="slash" horiz-adv-x="334" d="M235 743Q238 754 243 758T265 763T324 765L99 0Q96 -10 91 -14T69 -19T10 -20L235 743Z" />
+<glyph unicode="0" glyph-name="zero" horiz-adv-x="418" d="M107 -9T68 65T29 296Q29 448 72 524T211 600Q306 600 347 532T389 320Q389 151 348 71T206 -9Q107 -9 68 65ZM260 64T282 124T305 321Q305 428 285 478T215 529Q160 529 138 469T116 290Q116 206 124
+157T153 86T208 64Q260 64 282 124Z" />
+<glyph unicode="1" glyph-name="one" horiz-adv-x="418" d="M28 32T28 56Q28 67 72 71T173 76L184 517Q163 516 123 509T70 499Q58 519 58 552Q58 558 97 569T183 590T247 600Q263 600 270 595L257 76H331Q353 76 368 77T389 79Q389 32 387 16T373 0H30Q28 32 28 56Z" />
+<glyph unicode="2" glyph-name="two" horiz-adv-x="418" d="M29 11T29 25Q29 45 33 56T54 96Q76 133 102 167T167 247Q227 317 255 362T283 454Q283 523 206 523Q166 523 125 513T59 488Q49 511 49 547Q49 559 73 571T139 592T226 600Q309 600 341 567T374 464Q374
+403 342 349T243 217Q171 131 136 76H271Q304 76 341 79T389 83Q389 34 386 17T372 0H33Q29 11 29 25Z" />
+<glyph unicode="3" glyph-name="three" horiz-adv-x="418" d="M99 -100T72 -86T44 -51Q44 -27 49 -11T55 9Q90 -23 153 -23Q218 -23 254 25T291 150Q291 209 248 231T132 254L130 305Q194 336 228 376T263 458Q263 486 248 504T191 523Q111 523 53 487Q43 507
+43 546Q43 559 64 571T125 592T216 600Q290 600 322 568T355 482Q355 380 245 301Q305 295 341 259T378 152Q378 71 349 15T269 -71T152 -100Q99 -100 72 -86Z" />
+<glyph unicode="4" glyph-name="four" horiz-adv-x="418" d="M235 131H54Q28 157 28 202Q28 227 65 311T152 478T237 592Q254 606 273 606Q297 606 319 595L316 206Q344 206 364 207T390 209Q391 208 392 202T394 186Q394 162 388 147T367 131H316V26Q316 12 313
+7T295 1T235 0V131ZM235 206L247 495Q208 450 161 361T98 206H235Z" />
+<glyph unicode="5" glyph-name="five" horiz-adv-x="418" d="M111 -100T85 -93T47 -77T34 -59Q34 -19 43 7Q78 -25 141 -25Q218 -25 256 33T294 178Q294 259 255 289T139 319Q100 319 42 306L71 600H377Q377 568 375 554T363 534T335 528Q291 528 229 529T140
+532L124 381Q159 386 187 386Q380 386 380 194Q380 56 322 -22T148 -100Q111 -100 85 -93Z" />
+<glyph unicode="6" glyph-name="six" horiz-adv-x="418" d="M313 439T352 392T391 245Q391 -8 202 -8Q128 -8 91 29T43 132T31 308Q31 702 259 702Q306 702 336 694T367 668Q367 636 359 611Q317 626 265 626Q119 626 108 367Q132 403 165 421T246 439Q313 439
+352 392ZM255 64T283 110T312 228Q312 295 289 330T223 365Q157 365 108 290V284Q106 169 129 117T205 64Q255 64 283 110Z" />
+<glyph unicode="7" glyph-name="seven" horiz-adv-x="418" d="M115 -88T98 -84T80 -66Q93 35 128 149T208 365T294 531Q220 527 67 527Q45 527 45 600H405Q303 403 242 238T163 -88Q115 -88 98 -84Z" />
+<glyph unicode="8" glyph-name="eight" horiz-adv-x="418" d="M362 293T377 259T392 182Q392 99 347 46T218 -8Q123 -8 78 45T32 183Q32 245 63 295T146 376Q101 407 81 429Q60 448 50 475T39 534Q39 617 87 661T210 706Q387 706 387 544Q387 485 358 444T279
+369Q317 339 333 323Q362 293 377 259ZM176 630T148 608T119 539Q119 489 159 457Q180 438 219 411Q313 469 313 541Q313 585 286 607T220 630Q176 630 148 608ZM259 69T286 100T313 183Q313 220 302 243T268 286Q248 307 210 333Q163 309 135 272T107 188Q107
+133 135 101T213 69Q259 69 286 100Z" />
+<glyph unicode="9" glyph-name="nine" horiz-adv-x="418" d="M288 609T324 580T373 486T389 297Q387 92 327 -6T138 -104Q98 -104 74 -96T49 -71Q49 -58 51 -43T56 -17Q89 -27 129 -27Q220 -27 261 39T310 229Q286 193 254 175T174 157Q109 157 69 209T28 358Q28
+485 75 547T217 609Q288 609 324 580ZM263 231T312 306V310Q312 392 305 439T278 512T218 537Q165 537 136 495T107 368Q107 302 131 267T198 231Q263 231 312 306Z" />
+<glyph unicode=":" glyph-name="colon" horiz-adv-x="183" d="M63 329T51 343T38 386Q38 410 53 426T93 443Q149 443 149 386Q149 361 134 345T93 329Q63 329 51 343ZM63 -6T51 8T38 51Q38 75 53 91T93 108Q149 108 149 51Q149 26 134 10T93 -6Q63 -6 51 8Z" />
+<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="183" d="M61 329T49 343T36 386Q36 410 51 426T91 443Q147 443 147 386Q147 361 132 345T91 329Q61 329 49 343ZM39 -103T34 -80Q50 -54 55 -37T63 5Q39 21 39 54Q39 77 53 91T90 106Q144 106 144 47Q144
+13 129 -21T95 -79T66 -103Q39 -103 34 -80Z" />
+<glyph unicode="&lt;" glyph-name="less" horiz-adv-x="400" d="M318 96T297 103L52 211Q39 234 39 258Q39 289 65 302L329 430Q342 418 349 404T357 377Q357 359 343 353L144 255L360 159Q359 134 348 115T324 96Q318 96 297 103Z" />
+<glyph unicode="=" glyph-name="equal" horiz-adv-x="418" d="M34 382T36 396T51 410H384Q384 367 382 353T368 339H34Q34 382 36 396ZM34 197T36 210T51 224H384Q384 182 382 168T368 154H34Q34 197 36 210Z" />
+<glyph unicode="&gt;" glyph-name="greater" horiz-adv-x="400" d="M62 97T55 112T46 139Q46 157 60 164L260 261L43 358Q44 383 56 401T80 420Q90 420 107 413L351 305Q364 285 364 258Q364 227 338 214L74 85Q62 97 55 112Z" />
+<glyph unicode="?" glyph-name="question" horiz-adv-x="295" d="M92 210T89 219T82 244T79 278Q79 319 97 351Q109 374 124 396T143 424Q171 465 184 491T197 552Q197 629 115 629Q66 629 31 603Q19 639 19 667Q19 684 58 697T144 710Q209 710 246 675T283 570Q283
+512 264 473T209 384Q182 350 172 330Q160 309 160 283Q160 271 165 243Q167 234 168 227T166 217Q156 206 120 206Q109 206 93 208Q92 210 89 219ZM100 -6T88 8T75 51Q75 75 90 91T130 108Q186 108 186 51Q186 26 171 10T130 -6Q100 -6 88 8Z" />
+<glyph unicode="@" glyph-name="at" horiz-adv-x="738" d="M442 -112T496 -101T602 -68Q623 -100 623 -126Q623 -141 592 -156T505 -180T375 -190Q268 -190 199 -159T89 -29T47 264Q47 479 139 581T394 683Q545 683 619 608T693 359Q693 145 644 74T533 2Q498
+2 471 25Q459 15 429 8T358 1Q319 1 293 12T252 57T237 151Q237 318 365 318Q403 318 423 307Q423 313 424 330T425 368Q426 401 411 413T364 426Q333 426 310 421T264 402Q256 419 256 448Q256 459 265 468Q281 479 312 486T391 494Q448 494 475 468T501 378L496
+177Q494 104 491 78Q508 72 524 72Q545 72 564 98T597 184T610 338Q610 441 590 500T523 585T393 611Q303 611 246 578T159 466T129 253Q129 106 155 27T233 -82T369 -112Q442 -112 496 -101ZM423 258Q402 261 388 261Q352 261 333 236T314 147Q314 98 327 80T368
+62Q390 62 404 74T419 114L423 258Z" />
+<glyph unicode="A" glyph-name="A" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499 183 395L149
+251H288Z" />
+<glyph unicode="B" glyph-name="B" horiz-adv-x="377" d="M44 681Q44 691 49 695T70 700H169Q337 700 337 546Q337 470 308 430T242 384Q289 381 324 350T360 238Q360 118 307 59T170 0H44V681ZM175 414Q209 414 229 443T249 530Q249 629 175 629H125V414H175ZM171
+71Q212 71 238 110T265 231Q265 280 254 305T223 337T172 345H125V71H171Z" />
+<glyph unicode="C" glyph-name="C" horiz-adv-x="341" d="M142 -10T107 13T51 109T30 321Q30 480 59 566T130 681T227 710Q277 710 299 694T321 655Q321 628 308 606Q277 631 243 631Q206 631 178 608T133 517T115 325Q115 227 127 173T161 99T215 79Q243 79 268
+88T308 111Q320 85 320 62Q320 32 285 11T196 -10Q142 -10 107 13Z" />
+<glyph unicode="D" glyph-name="D" horiz-adv-x="388" d="M44 681Q44 691 50 695T71 700H169Q237 700 279 672T342 575T364 386Q364 242 342 158T276 37T169 0H44V681ZM171 77Q201 77 223 100T259 193T273 394Q273 485 262 535T229 606T171 626H125V77H171Z" />
+<glyph unicode="E" glyph-name="E" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73Z" />
+<glyph unicode="F" glyph-name="F" horiz-adv-x="313" d="M301 700Q301 672 301 656T297 635T286 631H125V418H276Q276 391 276 373T272 350T261 344H125V16Q125 11 123 6T110 0H45V684Q45 688 48 694T61 700H301Z" />
+<glyph unicode="G" glyph-name="G" horiz-adv-x="386" d="M148 -10T108 18T49 121T30 334Q30 485 55 567T127 679T245 710Q293 710 322 695T352 659Q352 635 341 607Q327 618 306 624T261 631Q208 631 177 605T131 515T116 340Q116 225 128 167T162 89T220 69Q244
+69 259 77T280 94V343H205V394Q205 410 224 410H355V35Q301 -10 218 -10Q148 -10 108 18Z" />
+<glyph unicode="H" glyph-name="H" horiz-adv-x="410" d="M365 7T362 4T339 1T285 0V339H125V16Q125 7 122 4T98 1T44 0V684Q44 693 47 696T71 699T125 700V415H285V684Q285 693 288 696T311 699T365 700V16Q365 7 362 4Z" />
+<glyph unicode="I" glyph-name="I" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663Z" />
+<glyph unicode="J" glyph-name="J" horiz-adv-x="300" d="M63 -9T39 8T14 50Q14 64 17 73T26 96Q41 82 63 73T109 63Q138 63 151 76T169 114T174 183V663Q174 684 177 690T195 698T256 700V165Q256 82 226 37T119 -9Q63 -9 39 8Z" />
+<glyph unicode="K" glyph-name="K" horiz-adv-x="389" d="M371 701T371 686Q371 682 368 677L206 398Q326 307 367 18Q368 6 362 2T334 -2Q308 -2 278 1Q254 128 229 201T164 318Q151 333 124 345V16Q124 7 121 4T97 1T42 0V684Q42 693 45 696T69 699T124 700V398L284
+695Q313 701 335 701Q371 701 371 686Z" />
+<glyph unicode="L" glyph-name="L" horiz-adv-x="314" d="M44 677Q44 690 48 694T66 699T125 700V76H297V16Q297 7 293 4T281 0H44V677Z" />
+<glyph unicode="M" glyph-name="M" horiz-adv-x="489" d="M445 700V16Q445 7 442 4T418 1T363 0L366 245Q368 310 375 410T385 546L368 486Q329 342 319 315L266 161Q263 153 255 153H220L168 315Q155 354 104 541L103 540Q106 509 113 412T121 249L123 16Q123
+7 119 4T95 1T44 0V684Q44 694 48 697T60 700H118L214 396Q225 362 234 330T246 285Q249 297 257 329T275 393L364 684Q367 693 370 696T380 700H445Z" />
+<glyph unicode="N" glyph-name="N" horiz-adv-x="444" d="M320 693T324 696T348 699T401 700V16Q401 0 384 0H324L209 275Q185 339 114 560Q118 517 121 416T124 259V16Q124 7 121 4T97 1T44 0V684Q44 700 60 700H121L234 430Q247 395 308 211Q312 199 330 146V149Q325
+188 323 290T320 448V684Q320 693 324 696Z" />
+<glyph unicode="O" glyph-name="O" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459 304 517T276
+601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101Z" />
+<glyph unicode="P" glyph-name="P" horiz-adv-x="361" d="M254 700T298 653T343 503Q343 387 293 336T160 284H124V16Q124 7 121 4T97 1T44 0V684Q44 693 47 696T60 700H159Q254 700 298 653ZM212 359T233 394T254 512Q254 569 236 599T174 629H124V359H168Q212
+359 233 394Z" />
+<glyph unicode="Q" glyph-name="Q" horiz-adv-x="429" d="M404 -61T407 -74T410 -97Q410 -118 382 -127T320 -137Q269 -137 239 -107T190 -9Q131 -5 97 29T46 141T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 194 371 111T282
+2Q288 -37 300 -53T335 -70Q372 -70 398 -53Q404 -61 407 -74ZM121 238T129 182T158 99T214 73Q251 73 272 101T302 190T312 355Q312 459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182Z" />
+<glyph unicode="R" glyph-name="R" horiz-adv-x="372" d="M288 264T315 192T350 18Q350 6 343 2T309 -2Q298 -2 262 0Q255 110 231 179T180 285Q173 284 160 284H124V16Q124 7 121 4T97 1T44 0V684Q44 688 47 694T60 700H159Q254 700 298 653T343 503Q343 356
+256 306Q288 264 315 192ZM168 359Q212 359 233 393T254 506Q254 567 236 598T174 629H124V359H168Z" />
+<glyph unicode="S" glyph-name="S" horiz-adv-x="358" d="M94 -10T60 8T25 49Q25 62 30 78T46 107Q85 72 149 72Q248 72 248 174Q248 210 235 238T189 306L89 423Q55 464 41 497T26 567Q26 632 71 671T198 710Q265 710 297 697T329 660Q329 635 309 614Q298 623
+271 630T211 638Q166 638 140 620T113 569Q113 543 124 522T159 470L268 347Q306 302 320 264T335 178Q335 93 294 42T157 -10Q94 -10 60 8Z" />
+<glyph unicode="T" glyph-name="T" horiz-adv-x="373" d="M365 700V641Q365 631 361 628T348 624H225V16Q225 7 221 4T197 1T144 0V624H8V684Q8 700 25 700H365Z" />
+<glyph unicode="U" glyph-name="U" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10 109 18Z" />
+<glyph unicode="V" glyph-name="V" horiz-adv-x="420" d="M176 -7T165 8T146 51Q122 153 73 377T7 676Q5 686 5 689Q5 695 9 697T24 700H90L174 312Q187 246 207 117L214 69Q232 215 250 312L325 676Q328 689 332 694T346 700H416L262 -3Q233 -7 194 -7Q176 -7 165 8Z" />
+<glyph unicode="W" glyph-name="W" horiz-adv-x="654" d="M650 700L518 -3Q509 -4 492 -6T451 -8Q419 -8 408 49L356 276Q345 334 325 503Q306 341 296 277L241 -3Q208 -7 167 -7Q140 -7 126 54Q105 158 63 380T7 676Q6 680 6 687Q6 694 10 697T24 700H90L163
+311Q178 220 193 88H198Q203 187 224 311L286 642Q289 656 292 661T307 666H364L435 311Q450 232 462 118L465 88H471Q482 220 496 311L561 676Q563 689 566 694T581 700H650Z" />
+<glyph unicode="X" glyph-name="X" horiz-adv-x="424" d="M414 9T414 7Q414 0 403 0H315L261 135Q233 206 207 283Q178 198 151 135L97 10Q93 4 90 2T79 0H9L162 361L36 686Q33 694 37 696T66 699T131 700L172 586Q205 491 222 436Q248 520 271 586L310 687Q312
+694 316 696T341 699T397 700L268 368L412 13Q414 9 414 7Z" />
+<glyph unicode="Y" glyph-name="Y" horiz-adv-x="364" d="M225 16Q225 7 222 4T198 1T144 0V285L6 687Q4 694 8 696T35 699T97 700L137 563Q152 516 168 446T187 353Q189 375 206 445T238 563L273 685Q275 693 279 696T304 699T360 700L225 290V16Z" />
+<glyph unicode="Z" glyph-name="Z" horiz-adv-x="385" d="M19 11T19 31Q19 50 27 67L267 628H80Q49 628 37 625V683Q37 691 41 695T54 700H352Q360 689 360 674Q360 656 352 637L108 72H302Q343 72 361 80V16Q361 0 345 0H32Q19 11 19 31Z" />
+<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="386" d="M122 796Q122 808 125 812T140 819T184 821H377Q377 785 376 771T369 752T350 747H203V-123H376Q376 -161 374 -176T367 -195T349 -199H122V796Z" />
+<glyph unicode="\" glyph-name="backslash" horiz-adv-x="329" d="M12 743L10 752Q10 761 25 763T91 765L317 -10L319 -18Q319 -26 304 -28T237 -30L12 743Z" />
+<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="386" d="M9 -164T10 -150T17 -131T36 -126H183V746H10Q10 784 12 799T19 818T37 822H264V-175Q264 -187 261 -191T246 -198T202 -200H9Q9 -164 10 -150Z" />
+<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="430" d="M69 208T59 220T48 249L220 398L366 270Q380 259 380 244Q380 230 369 219T341 206L212 294L110 218Q94 208 85 208Q69 208 59 220Z" />
+<glyph unicode="_" glyph-name="underscore" horiz-adv-x="377" d="M14 -66T16 -52T30 -38H364Q364 -81 362 -95T347 -109H14Q14 -66 16 -52Z" />
+<glyph unicode="`" glyph-name="grave" horiz-adv-x="269" d="M162 568T111 604T49 655Q53 677 63 696T86 716Q93 716 141 675T220 598Q219 595 215 584T204 563T189 553Q162 568 111 604Z" />
+<glyph unicode="a" glyph-name="a" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317 388V335Q317
+115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63Z" />
+<glyph unicode="b" glyph-name="b" horiz-adv-x="385" d="M84 -10T48 20V698Q48 717 54 724T75 733T128 735V475Q173 510 235 510Q297 510 327 465T358 313Q358 120 303 55T164 -10Q84 -10 48 20ZM212 61T240 110T268 296Q268 374 251 405T198 437Q156 437 128
+409V75Q144 61 175 61Q212 61 240 110Z" />
+<glyph unicode="c" glyph-name="c" horiz-adv-x="313" d="M128 -10T96 9T48 83T31 239Q31 400 81 455T210 510Q246 510 270 497T294 465Q294 442 285 420Q251 439 214 439Q170 439 142 399T114 238Q114 169 123 131T152 77T204 62Q227 62 248 68T284 85Q292 56
+292 41Q292 20 260 5T180 -10Q128 -10 96 9Z" />
+<glyph unicode="d" glyph-name="d" horiz-adv-x="381" d="M142 -10T108 7T52 77T31 232Q31 373 73 441T184 510Q230 510 256 490V698Q256 717 262 724T284 733T337 735V20Q273 -10 193 -10Q142 -10 108 7ZM234 62T256 77V427Q239 440 210 440Q120 440 120 241Q120
+168 129 129T154 76T196 62Q234 62 256 77Z" />
+<glyph unicode="e" glyph-name="e" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125 121T155 80T207
+68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402Z" />
+<glyph unicode="f" glyph-name="f" horiz-adv-x="254" d="M82 432H13Q13 459 14 475T18 496T33 500H82V561Q82 665 129 702T249 739Q294 739 318 728T342 698Q342 675 333 654Q304 666 262 666Q215 666 189 646T162 567V500H252Q252 473 251 457T247 436T235 432H162V16Q162
+11 159 6T145 0H82V432Z" />
+<glyph unicode="g" glyph-name="g" horiz-adv-x="394" d="M308 72T341 47T375 -34Q375 -104 326 -150T183 -197Q91 -197 57 -167T23 -88Q23 -54 44 -23T100 33Q37 50 38 87Q38 127 101 177Q39 217 39 327Q39 422 83 466T206 510Q229 510 256 502H375Q383 488 383
+464Q383 433 355 433Q342 433 319 438Q357 400 357 329Q357 246 318 200T195 154Q169 154 150 158Q123 131 123 114Q123 102 148 97T242 82Q308 72 341 47ZM167 451T146 422T124 329Q124 271 139 244T200 216Q239 216 257 249T276 348Q276 402 258 426T203 451Q167
+451 146 422ZM240 -123T266 -99T293 -45Q293 -22 283 -10T249 9T180 19L160 21Q137 3 122 -21T106 -69Q106 -96 124 -109T190 -123Q240 -123 266 -99Z" />
+<glyph unicode="h" glyph-name="h" horiz-adv-x="380" d="M45 698Q45 717 51 724T72 733T125 735V471Q147 490 177 500T238 510Q299 510 320 479T342 378V16Q342 7 338 4T313 1T260 0V356Q260 394 248 414T201 435Q182 435 162 429T125 408V16Q125 7 122 4T99
+1T45 0V698Z" />
+<glyph unicode="i" glyph-name="i" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM300 570T300 628Q300 692 346 692Q368 692 377 679T386 634Q386 604 374 587T340 570Q300 570 300 628Z" />
+<glyph unicode="j" glyph-name="j" horiz-adv-x="184" d="M-50 -196T-76 -182T-103 -143Q-103 -117 -91 -102Q-53 -122 -6 -122Q31 -122 42 -101T54 -24V463Q54 482 60 489T81 498T134 500V-36Q134 -111 106 -153T4 -196Q-50 -196 -76 -182ZM306 570T306 628Q306
+692 352 692Q374 692 383 679T392 634Q392 604 380 587T346 570Q306 570 306 628Z" />
+<glyph unicode="k" glyph-name="k" horiz-adv-x="376" d="M46 698Q46 717 52 724T74 733T127 735V464Q153 485 187 497T253 510Q338 510 338 424Q338 369 312 331T254 269Q293 252 320 209T354 100Q355 90 355 67Q355 43 352 16Q351 7 347 4T321 1T261 0Q265 29
+265 62Q265 93 260 123Q251 175 231 201T183 227Q176 227 172 226Q161 224 146 217T127 207V16Q127 7 124 4T101 1T46 0V698ZM249 314T249 397Q249 437 212 437Q166 437 127 389V265Q249 314 249 397Z" />
+<glyph unicode="l" glyph-name="l" horiz-adv-x="173" d="M46 698Q46 717 52 724T74 733T127 735V16Q127 7 123 4T100 1T46 0V698Z" />
+<glyph unicode="m" glyph-name="m" horiz-adv-x="564" d="M458 510T482 494T515 449T523 369V16Q523 7 519 4T495 1T442 0V370Q442 409 433 424T393 439Q356 439 325 420V16Q325 7 322 4T299 1T246 0H245V372Q245 400 242 413T229 433T195 440Q159 440 127 422V16Q127
+7 123 4T99 1T46 0V477Q119 510 197 510Q259 510 288 479Q313 493 346 501T410 510Q458 510 482 494Z" />
+<glyph unicode="n" glyph-name="n" horiz-adv-x="383" d="M45 476Q76 490 121 500T204 510Q282 510 313 480T344 376V16Q344 7 340 4T316 1T261 0V352Q261 402 249 421T201 440Q183 440 162 436T126 422V16Q126 7 122 4T98 1T45 0V476Z" />
+<glyph unicode="o" glyph-name="o" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135 400T115
+248Q115 168 123 127T146 72T186 58Q222 58 241 100Z" />
+<glyph unicode="p" glyph-name="p" horiz-adv-x="382" d="M63 -197T55 -190T46 -162V470Q109 510 192 510Q272 510 313 464T355 302Q355 121 313 56T206 -10Q180 -10 160 -2T127 18V-191Q108 -197 85 -197Q63 -197 55 -190ZM266 62T266 293Q266 352 258 384T233
+428T188 440Q154 440 127 421V95Q147 62 181 62Q266 62 266 293Z" />
+<glyph unicode="q" glyph-name="q" horiz-adv-x="387" d="M276 -198T261 -195V34Q231 -10 165 -10Q107 -10 69 38T30 218Q30 373 86 441T235 510Q269 510 294 503T342 479V-163Q342 -186 334 -191T294 -198Q276 -198 261 -195ZM215 60T233 73T261 112V426Q243
+440 215 440Q169 440 145 389T121 220Q121 127 141 94T195 61Q215 60 233 73Z" />
+<glyph unicode="r" glyph-name="r" horiz-adv-x="263" d="M45 465Q109 510 181 510Q218 510 234 500T251 468Q251 443 242 421Q221 433 194 433Q155 433 128 410L127 16Q127 7 123 4T99 1T45 0V465Z" />
+<glyph unicode="s" glyph-name="s" horiz-adv-x="346" d="M97 -10T64 3T30 40Q30 64 45 87Q86 63 144 63Q183 63 204 78T226 124Q226 146 217 165T186 203L89 286Q31 333 31 392Q31 447 72 478T195 510Q263 510 291 492T320 454Q320 445 315 434T303 413Q259 440
+204 440Q168 440 147 427T125 391Q125 376 133 363T165 329L258 254Q291 222 304 194T318 129Q318 63 274 27T152 -10Q97 -10 64 3Z" />
+<glyph unicode="t" glyph-name="t" horiz-adv-x="292" d="M141 -10T121 7T94 56T87 139V431H19Q19 458 20 474T24 495T36 500H87V652Q87 666 93 671T114 678T167 680V500H271Q271 473 270 456T266 435T254 431H167V139Q167 98 173 79T204 59Q220 59 232 62T262
+74Q268 54 268 34Q268 10 243 0T182 -10Q141 -10 121 7Z" />
+<glyph unicode="u" glyph-name="u" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8Z" />
+<glyph unicode="v" glyph-name="v" horiz-adv-x="344" d="M143 -6T135 6T121 43L19 475Q17 485 17 487Q17 494 23 496T51 499T104 500L136 339Q150 274 161 193T176 86H178Q181 111 192 192T216 340L243 482Q245 492 249 495T273 499T328 500L213 -3Q198 -6 156
+-6Q143 -6 135 6Z" />
+<glyph unicode="w" glyph-name="w" horiz-adv-x="541" d="M448 492T452 495T476 499T526 500Q510 421 466 209T418 -3Q415 -4 401 -5T366 -6Q354 -6 342 7T324 46L311 114Q288 220 274 363Q256 205 237 113L214 -3Q207 -4 188 -5T147 -6Q123 -6 113 43Q95 120
+61 276T16 483Q14 492 19 495T46 499T103 500L134 337Q146 267 156 191T169 93H175Q194 229 203 278L235 469Q237 480 241 483T261 486H314L353 276Q364 228 373 170T384 93H389Q393 140 402 210T421 337L446 482Q448 492 452 495Z" />
+<glyph unicode="x" glyph-name="x" horiz-adv-x="411" d="M395 9T395 8Q395 3 384 2T337 0H302L265 66Q243 107 199 201Q164 121 136 65L107 16Q103 8 96 5T68 1T15 0L157 260L35 487Q32 494 35 496T60 499T120 500L157 431Q185 379 211 317Q244 390 266 432L297
+486Q300 494 305 496T330 499T386 500L258 267L391 19Q395 9 395 8Z" />
+<glyph unicode="y" glyph-name="y" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192 154T208 261L253
+477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154Z" />
+<glyph unicode="z" glyph-name="z" horiz-adv-x="335" d="M33 1T30 5T24 19T21 40Q21 58 28 70L223 432H120Q63 432 28 427Q25 444 25 465Q25 483 31 491T51 500H306Q307 499 310 493T314 475Q314 456 305 436L115 75H204Q270 75 310 85Q312 77 312 50Q312 23
+306 12T280 0H34Q33 1 30 5Z" />
+<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="277" d="M154 -150T122 -117T89 -15Q89 26 96 80Q97 89 100 120T103 182Q103 220 90 237T48 260Q41 275 41 293Q41 321 58 333Q74 343 83 352T97 378T103 427Q103 458 100 492T96 536Q89 590 89 626Q89
+686 130 714T244 744Q260 722 260 694Q260 683 256 676T245 666Q208 663 190 644T171 585Q171 556 176 511Q182 445 182 403Q182 357 169 335T128 300Q155 289 168 268T182 205Q182 164 176 100Q171 53 171 22Q171 -15 180 -35T206 -63T253 -76Q255 -102 255 -106Q255
+-126 248 -138T227 -150Q154 -150 122 -117Z" />
+<glyph unicode="|" glyph-name="bar" horiz-adv-x="324" d="M122 793Q122 805 126 809T145 814T203 815V-180Q203 -191 199 -194T175 -199T122 -200V793Z" />
+<glyph unicode="}" glyph-name="braceright" horiz-adv-x="277" d="M18 -128T18 -100Q18 -75 33 -72Q106 -66 106 8Q106 28 102 84Q96 148 96 191Q96 237 109 259T149 294Q122 305 109 326T96 389Q96 430 102 494Q106 550 106 573Q106 610 97 629T71 657T25 670Q21
+686 21 701Q21 720 29 732T50 744Q123 744 155 711T188 609Q188 568 181 514Q180 505 177 474T174 412Q174 374 187 357T229 334Q236 317 236 301Q236 272 218 261Q201 250 193 242T180 216T174 167Q174 128 182 58Q188 -6 188 -32Q188 -92 146 -121T33 -150Q18
+-128 18 -100Z" />
+<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="400" d="M237 212T221 218T185 237Q169 247 158 251T132 256Q115 256 102 250T72 232Q58 221 46 218Q32 217 22 230T11 266Q26 289 61 309T140 329Q164 329 178 324T212 306Q228 296 240 291T270 286Q309
+286 341 320Q347 325 357 325Q370 325 380 311T391 277Q373 252 340 232T263 212Q237 212 221 218Z" />
+<glyph unicode="&#xa0;" glyph-name="uni00A0" horiz-adv-x="158" />
+<glyph unicode="&#xa1;" glyph-name="exclamdown" horiz-adv-x="195" d="M46 394T46 451Q46 476 61 492T102 508Q132 508 144 494T157 451Q157 427 142 411T102 394Q46 394 46 451ZM61 256Q62 274 69 281T91 291T141 293L155 -174Q155 -185 147 -190T117 -196T45
+-197L61 256Z" />
+<glyph unicode="&#xa2;" glyph-name="cent" horiz-adv-x="418" d="M277 64T299 71T335 88Q343 68 343 37Q343 23 319 9T263 -9V-102Q263 -121 247 -127T190 -133V-7Q154 -1 131 20T96 91T83 228Q83 471 213 504V592Q213 611 230 618T286 626V508Q310 503 327 494T345
+475Q345 437 337 417Q305 435 269 435Q239 435 217 421T179 362T164 231Q164 156 174 121T202 75T257 64Q277 64 299 71Z" />
+<glyph unicode="&#xa3;" glyph-name="sterling" horiz-adv-x="366" d="M322 74Q329 54 329 37Q329 0 277 0H89Q80 121 78 277H15Q15 320 17 333T31 347H78Q82 480 122 537T238 595Q280 595 309 582T338 542Q338 530 335 518T327 493Q294 514 256 514Q210 514 185
+479T158 347H288Q288 305 286 291T272 277H158Q160 146 165 80L322 74Z" />
+<glyph unicode="&#xa4;" glyph-name="currency" horiz-adv-x="571" d="M560 49Q535 24 525 15T507 6Q504 6 498 10L417 91Q371 52 286 52Q201 52 154 90L62 -2Q39 21 30 32T20 51Q20 56 24 60L110 146Q87 198 87 276Q87 350 107 401L12 496Q37 521 47 530T65 539Q69
+539 73 535L147 461Q198 506 291 506Q380 506 427 463L510 546Q534 522 543 512T552 493Q552 489 548 485L466 403Q484 357 484 286Q484 202 460 148L560 49ZM348 121T377 162T407 288Q407 365 380 402T295 439Q230 439 199 398T167 271Q167 195 196 158T288 121Q348
+121 377 162Z" />
+<glyph unicode="&#xa5;" glyph-name="yen" horiz-adv-x="418" d="M249 243H379Q379 205 373 191T347 176H249V16Q249 7 246 4T223 1T169 0V176H38Q38 215 44 229T70 243H169V284L149 341H38Q38 380 44 394T70 408H126L30 687Q28 694 32 696T59 699T122 700L161
+563Q179 505 193 449T209 372Q211 392 226 451T259 563L297 685Q300 693 304 696T329 699T384 700L288 408H378Q378 370 372 356T347 341H266L249 290V243Z" />
+<glyph unicode="&#xa6;" glyph-name="brokenbar" horiz-adv-x="227" d="M90 326T73 330V711Q73 729 82 736T115 743Q135 743 153 737V354Q153 337 146 332T112 326Q90 326 73 330ZM89 -198T73 -193V192Q73 210 82 217T115 225Q135 225 153 219V-169Q153 -187 146
+-192T112 -198Q89 -198 73 -193Z" />
+<glyph unicode="&#xa7;" glyph-name="section" horiz-adv-x="348" d="M264 201Q284 174 292 155T301 112Q301 58 259 27T150 -4Q106 -4 78 9T43 39Q40 44 40 55Q40 83 56 105Q90 81 137 81Q171 81 190 94T209 128Q209 142 202 154T179 185Q179 185 141 223Q94
+268 72 296Q53 320 45 340T36 388Q36 415 49 442T91 489L83 499Q63 524 55 543T46 587Q46 641 88 672T198 703Q242 703 269 690T304 661Q307 652 307 644Q307 617 291 595Q259 618 209 618Q175 618 157 605T138 571Q138 557 144 546T167 515Q181 500 202 480Q221
+462 242 441T275 404Q295 380 303 360T311 312Q311 286 297 259T255 212L264 201ZM151 300T171 284T196 264Q214 271 225 287T236 318Q236 335 229 350T207 384Q196 399 176 415T151 435Q133 429 122 413T111 382Q111 363 118 348T140 315Q151 300 171 284Z" />
+<glyph unicode="&#xa8;" glyph-name="dieresis" horiz-adv-x="269" d="M53 573T44 586T34 632Q34 659 45 674T78 689Q100 689 108 677T117 634Q117 604 106 588T73 572Q53 573 44 586ZM173 573T163 585T153 628Q153 689 197 689Q219 689 227 677T236 634Q234 572
+192 572Q173 573 163 585Z" />
+<glyph unicode="&#xa9;" glyph-name="copyright" horiz-adv-x="471" d="M133 320T85 371T36 541Q36 652 89 706T242 760Q343 760 389 711T436 543Q436 435 384 378T234 320Q133 320 85 371ZM296 378T335 418T375 544Q375 628 342 666T241 705Q96 705 96 541Q96
+452 129 415T232 378Q296 378 335 418ZM211 416T193 424T166 456T157 531Q157 613 183 640T249 668Q264 668 279 663T294 652Q294 644 288 620Q268 628 254 628Q231 628 218 609T204 529Q204 497 208 482T222 462T247 457Q266 457 286 467Q289 461 291 452T293
+437Q293 430 277 423T243 416Q211 416 193 424Z" />
+<glyph unicode="&#xaa;" glyph-name="ordfeminine" horiz-adv-x="323" d="M100 288T71 312T41 411Q41 478 69 506T150 534Q182 534 214 524V582Q214 615 198 627T152 639Q105 639 57 617Q47 630 47 652Q47 668 53 675Q85 710 176 710Q225 710 253 685T282 608V317Q259
+306 224 297T154 288Q100 288 71 312ZM179 346T193 349T214 358V468Q206 472 194 474T172 476Q138 476 122 464T105 409Q105 373 120 360T165 346Q179 346 193 349Z" />
+<glyph unicode="&#xab;" glyph-name="guillemotleft" horiz-adv-x="416" d="M156 16T120 70T51 181T18 253Q18 268 50 322T118 430T164 500Q178 500 188 491T205 472T212 459Q212 442 186 397T132 309T94 253Q103 240 132 198T187 109T214 47Q213 43 207 32T191
+11T167 0Q156 16 120 70ZM326 38T291 86T223 185T190 251Q190 265 222 315T288 414T334 477Q347 477 357 469T374 451T381 439Q381 423 356 381T303 301T267 251Q276 240 303 203T357 125T383 69Q382 66 376 55T360 34T337 24Q326 38 291 86Z" />
+<glyph unicode="&#xac;" glyph-name="logicalnot" horiz-adv-x="400" d="M358 111Q342 105 321 105Q304 105 293 111T282 131V232H40Q34 252 34 270Q34 287 40 297T60 308H358V111Z" />
+<glyph unicode="&#xad;" glyph-name="uni00AD" horiz-adv-x="278" d="M37 290T39 303T54 317H241Q241 275 239 261T225 247H37Q37 290 39 303Z" />
+<glyph unicode="&#xae;" glyph-name="registered" horiz-adv-x="471" d="M343 760T389 711T436 543Q436 435 384 378T234 320Q133 320 85 371T36 541Q36 652 89 706T242 760Q343 760 389 711ZM296 378T335 418T375 544Q375 628 342 666T241 705Q96 705 96 541Q96
+452 129 415T232 378Q296 378 335 418ZM288 517T300 492T315 426Q315 420 312 418T299 416Q281 416 274 417Q268 491 239 518Q235 517 227 517H214V425Q214 419 208 418T176 417V665Q176 666 177 668T183 670H227Q308 670 308 598Q308 550 274 529Q288 517 300
+492ZM219 551T230 551Q249 551 258 562T268 600Q268 618 260 627T232 637H214V552Q219 551 230 551Z" />
+<glyph unicode="&#xaf;" glyph-name="overscore" horiz-adv-x="269" d="M1 601T1 624Q1 642 10 652T34 663H261Q268 646 268 629Q268 611 260 599T238 587H6Q1 601 1 624Z" />
+<glyph unicode="&#xb0;" glyph-name="degree" horiz-adv-x="358" d="M129 553T107 573T84 649Q84 746 184 746Q233 746 254 725T276 650Q276 602 251 578T177 553Q129 553 107 573ZM223 604T223 650Q223 674 214 684T184 694Q161 694 150 684T138 648Q138 604
+179 604Q223 604 223 650Z" />
+<glyph unicode="&#xb1;" glyph-name="plusminus" horiz-adv-x="419" d="M385 359Q385 317 383 303T369 289H246V165Q246 154 232 152T175 149V289H35Q35 332 37 345T52 359H175V483Q175 494 189 496T246 499V359H385ZM34 58T36 71T51 85H384Q384 43 382 29T368
+15H34Q34 58 36 71Z" />
+<glyph unicode="&#xb2;" glyph-name="uni00B2" d="M41 301T41 315Q41 344 53 357Q77 385 138 444Q188 491 210 518T232 576Q232 600 219 614T168 628Q139 628 116 618T66 590Q57 606 54 616T51 639Q51 657 74 673T134 700T205 710Q274 710 302 683T330 604Q330
+556 300 515T212 416Q170 373 162 365H339Q344 342 344 330Q344 289 318 289H47Q41 301 41 315Z" />
+<glyph unicode="&#xb3;" glyph-name="uni00B3" d="M304 503T322 478T340 423Q340 352 292 316T165 279Q126 279 98 286T57 305Q45 314 45 335Q45 347 50 359T64 379Q103 353 161 353Q205 353 231 369T257 416Q257 438 242 452T199 470Q181 473 128 473Q126 476
+123 489T119 510Q119 535 144 535Q171 535 197 532Q218 548 227 562T236 594Q236 612 221 625T171 638Q113 638 67 605Q51 622 51 645Q51 663 61 671Q79 688 116 699T204 710Q266 710 295 686T325 620Q325 592 312 565T273 516Q304 503 322 478Z" />
+<glyph unicode="&#xb4;" glyph-name="acute" horiz-adv-x="271" d="M73 560T66 570T55 591T50 605Q82 641 129 681T184 722Q197 722 207 703T221 661Q209 648 158 611T81 560Q73 560 66 570Z" />
+<glyph unicode="&#xb5;" glyph-name="uni00B5" horiz-adv-x="395" d="M70 -195T45 -190V470Q45 488 54 496T86 505Q110 505 125 500V131Q125 98 143 82T195 66Q237 66 269 81V470Q269 488 277 496T308 505Q334 505 349 500V24Q317 9 277 0T194 -10Q146 -10 125
+15V-163Q125 -195 80 -195Q70 -195 45 -190Z" />
+<glyph unicode="&#xb6;" glyph-name="paragraph" horiz-adv-x="541" d="M289 -3T271 3V205Q257 198 235 194T191 190Q121 190 78 242T34 420Q34 569 86 639T231 710Q298 710 352 682V26Q352 -3 312 -3Q289 -3 271 3ZM430 -3T414 2V658Q414 676 423 683T456 690Q477
+690 495 684V26Q495 8 487 3T453 -3Q430 -3 414 2ZM226 255T243 258T271 269V630Q253 641 220 641Q169 641 143 588T116 428Q116 331 143 294T212 255Q226 255 243 258Z" />
+<glyph unicode="&#xb7;" glyph-name="middot" horiz-adv-x="220" d="M79 212T66 226T53 269Q53 293 68 309T109 326Q165 326 165 269Q165 244 150 228T109 212Q79 212 66 226Z" />
+<glyph unicode="&#xb8;" glyph-name="cedilla" horiz-adv-x="269" d="M177 -58T191 -74T206 -122Q206 -160 184 -183T126 -206Q107 -206 89 -200T70 -193Q71 -188 75 -172T83 -152Q86 -149 101 -156T128 -163Q159 -163 159 -129Q159 -95 129 -95Q113 -95 102 -97T88
+-101L107 2H152L140 -59Q141 -58 157 -58Q177 -58 191 -74Z" />
+<glyph unicode="&#xb9;" glyph-name="uni00B9" horiz-adv-x="382" d="M45 308T45 323Q45 345 50 355T72 365H166V622L58 600Q48 616 48 638Q48 666 74 676Q109 688 157 699T223 710Q241 710 247 707V365H334Q338 339 338 329Q338 307 333 298T313 289H49Q45 308 45 323Z" />
+<glyph unicode="&#xba;" glyph-name="ordmasculine" horiz-adv-x="338" d="M121 289T93 307T50 372T35 499Q35 607 71 658T174 710Q220 710 247 692T289 628T303 501Q303 394 268 342T165 289Q121 289 93 307ZM200 356T217 389T235 499Q235 580 221 609T175 639Q139
+639 121 606T103 494Q103 414 118 385T166 356Q200 356 217 389Z" />
+<glyph unicode="&#xbb;" glyph-name="guillemotright" horiz-adv-x="414" d="M244 1T233 6T211 21T200 46Q200 62 227 108T283 197T321 253Q312 266 284 308T229 396T203 459Q203 471 213 480T235 494T251 500Q262 484 297 431T364 323T396 253Q396 237 363 181T295
+71T248 0Q244 1 233 6ZM73 23T63 28T43 43T33 68Q33 84 59 124T112 202T149 250Q152 250 126 284Q84 343 60 382T35 439Q35 451 45 460T65 474T79 480Q90 465 125 416T192 316T224 250Q224 234 191 184T123 85T76 22Q73 23 63 28Z" />
+<glyph unicode="&#xbc;" glyph-name="onequarter" horiz-adv-x="959" d="M41 307T41 323Q41 345 46 355T68 365H162V622L54 600Q44 616 44 638Q44 665 71 676Q105 688 153 699T219 710Q237 710 244 707V365H330Q334 348 334 329Q334 307 329 298T310 289H46Q41
+307 41 323ZM324 -10T309 -2T281 19L617 691Q625 710 645 710Q658 710 673 703T700 682L361 5Q355 -10 337 -10Q324 -10 309 -2ZM808 -6T792 -2V70H621Q607 85 607 110Q607 125 614 143Q632 202 677 275T764 390Q780 409 796 415T834 421Q853 421 868 416V147H927Q934
+130 934 109Q934 91 927 81T909 70H868V19Q868 -6 825 -6Q808 -6 792 -2ZM795 141L799 329Q766 303 731 247T682 141H795Z" />
+<glyph unicode="&#xbd;" glyph-name="onehalf" horiz-adv-x="947" d="M41 307T41 323Q41 345 46 355T68 365H162V622L54 600Q44 616 44 638Q44 665 71 676Q105 688 153 699T219 710Q237 710 244 707V365H330Q334 348 334 329Q334 307 329 298T310 289H46Q41 307
+41 323ZM324 -10T309 -2T281 19L617 691Q625 710 645 710Q658 710 673 703T700 682L361 5Q355 -10 337 -10Q324 -10 309 -2ZM607 12T607 26Q607 55 619 68Q643 96 704 155Q754 202 776 229T798 287Q798 311 785 325T734 339Q706 339 682 329T632 301Q623 317 621
+327T618 350Q618 368 641 384T700 411T771 421Q840 421 868 394T896 315Q896 281 879 249T839 190T776 125Q735 84 728 76H905Q910 53 910 41Q910 0 884 0H613Q607 12 607 26Z" />
+<glyph unicode="&#xbe;" glyph-name="threequarters" horiz-adv-x="961" d="M300 503T318 478T336 423Q336 352 288 316T161 279Q122 279 95 286T54 305Q41 314 41 335Q41 347 46 359T61 379Q98 353 158 353Q202 353 227 369T253 416Q253 438 238 452T196 470Q177
+473 124 473Q122 476 119 489T115 510Q115 535 140 535Q169 535 194 532Q215 547 223 561T232 594Q232 612 217 625T168 638Q109 638 64 605Q48 622 48 646Q48 664 57 671Q75 688 112 699T201 710Q262 710 291 686T321 620Q321 592 308 565T269 516Q300 503 318
+478ZM326 -10T311 -2T283 19L619 691Q627 710 647 710Q660 710 675 703T702 682L363 5Q357 -10 339 -10Q326 -10 311 -2ZM810 -6T794 -2V70H623Q609 85 609 110Q609 125 616 143Q634 202 679 275T766 390Q782 409 798 415T836 421Q855 421 870 416V147H929Q936
+130 936 109Q936 91 929 81T911 70H870V19Q870 -6 827 -6Q810 -6 794 -2ZM797 141L801 329Q768 303 733 247T684 141H797Z" />
+<glyph unicode="&#xbf;" glyph-name="questiondown" horiz-adv-x="306" d="M138 392T125 407T111 450Q111 474 126 490T167 506Q197 506 210 492T223 450Q223 426 208 409T167 392Q138 392 125 407ZM89 -195T52 -160T14 -56Q14 3 33 43T89 131Q117 170 125 184Q137
+205 137 232Q137 242 132 272Q130 281 130 288T131 298Q141 308 176 308Q188 308 204 306Q205 304 208 295T215 270T219 236Q219 198 201 163Q186 135 156 93Q127 49 114 23T101 -37Q101 -114 182 -114Q228 -114 266 -89Q278 -119 278 -153Q278 -170 239 -182T153
+-195Q89 -195 52 -160Z" />
+<glyph unicode="&#xc0;" glyph-name="Agrave" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM253 768T202 804T140 855Q144 877 154 896T177 916Q184 916 232 875T311 798Q310 795 306 784T295 763T280 753Q253 768 202 804Z" />
+<glyph unicode="&#xc1;" glyph-name="Aacute" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM163 760T156 770T145 791T140 805Q172 841 219 881T274 922Q287 922 297 903T311 861Q299 848 248 811T171 760Q163 760 156 770Z" />
+<glyph unicode="&#xc2;" glyph-name="Acircumflex" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208
+499 183 395L149 251H288ZM279 770T255 796T222 838Q218 832 203 814T172 779T147 762Q111 762 92 785L206 908Q214 911 223 911Q237 911 248 899Q255 892 278 867T323 817T345 784Q345 774 328 768T288 761Q279 770 255 796Z" />
+<glyph unicode="&#xc3;" glyph-name="Atilde" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM238 763T227 770T205 790Q195 801 188 806T170 811Q156 811 147 804T127 785T111 772Q101 772 93 781T79 799T72 812Q96 851 125 869T185 887Q200 887 209 881T230 863Q241 851 250 845T272 839Q292 839 302 846T322 866T337 878Q345 878
+351 868T361 847T366 833Q362 824 347 808T309 777T258 763Q238 763 227 770Z" />
+<glyph unicode="&#xc4;" glyph-name="Adieresis" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208
+499 183 395L149 251H288ZM137 773T128 786T118 832Q118 859 129 874T162 889Q184 889 192 877T201 834Q201 804 190 788T157 772Q137 773 128 786ZM257 773T247 785T237 828Q237 889 281 889Q303 889 311 877T320 834Q318 772 276 772Q257 773 247 785Z" />
+<glyph unicode="&#xc5;" glyph-name="Aring" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM169 743T146 764T123 839Q123 888 149 912T223 937Q271 937 293 916T315 840Q315 792 290 768T216 743Q169 743 146 764ZM259 797T259 840Q259 862 250 871T223 881Q180 881 180 838Q180 818 189 808T218 797Q259 797 259 840Z" />
+<glyph unicode="&#xc6;" glyph-name="AE" horiz-adv-x="615" d="M420 73H592Q592 44 592 26T588 4T576 0H340V178H174L105 14Q102 5 95 2T68 -2Q45 -2 17 1L311 686Q317 700 337 700H596Q596 672 596 654T592 632T581 627H420V418H571Q571 391 571 373T567 350T556
+344H420V73ZM340 251V615Q304 490 264 392L205 251H340Z" />
+<glyph unicode="&#xc7;" glyph-name="Ccedilla" horiz-adv-x="341" d="M243 79T268 88T308 111Q320 85 320 62Q320 35 293 15T220 -9L210 -59Q211 -58 227 -58Q247 -58 261 -74T276 -122Q276 -160 254 -183T196 -206Q177 -206 159 -200T140 -193Q141 -188 145
+-172T153 -152Q156 -149 171 -156T198 -163Q229 -163 229 -129Q229 -95 199 -95Q183 -95 172 -97T158 -101L175 -9Q128 -6 97 21T48 120T30 321Q30 480 59 566T130 681T227 710Q277 710 299 694T321 655Q321 628 308 606Q277 631 243 631Q206 631 178 608T133 517T115
+325Q115 227 127 173T161 99T215 79Q243 79 268 88Z" />
+<glyph unicode="&#xc8;" glyph-name="Egrave" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM204 768T153 804T91 855Q95
+877 105 896T128 916Q135 916 183 875T262 798Q261 795 257 784T246 763T231 753Q204 768 153 804Z" />
+<glyph unicode="&#xc9;" glyph-name="Eacute" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM114 760T107 770T96 791T91
+805Q123 841 170 881T225 922Q238 922 248 903T262 861Q250 848 199 811T122 760Q114 760 107 770Z" />
+<glyph unicode="&#xca;" glyph-name="Ecircumflex" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM230 770T206 796T173
+838Q169 832 154 814T123 779T98 762Q62 762 43 785L157 908Q165 911 174 911Q188 911 199 899Q206 892 229 867T274 817T296 784Q296 774 279 768T239 761Q230 770 206 796Z" />
+<glyph unicode="&#xcb;" glyph-name="Edieresis" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM88 773T79 786T69 832Q69
+859 80 874T113 889Q135 889 143 877T152 834Q152 804 141 788T108 772Q88 773 79 786ZM208 773T198 785T188 828Q188 889 232 889Q254 889 262 877T271 834Q269 772 227 772Q208 773 198 785Z" />
+<glyph unicode="&#xcc;" glyph-name="Igrave" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM119 768T68 804T6 855Q10 877 20 896T43 916Q50 916 98 875T177 798Q176 795 172 784T161 763T146 753Q119 768 68 804Z" />
+<glyph unicode="&#xcd;" glyph-name="Iacute" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM29 760T22 770T11 791T6 805Q38 841 85 881T140 922Q153 922 163 903T177 861Q165 848 114 811T37 760Q29 760 22 770Z" />
+<glyph unicode="&#xce;" glyph-name="Icircumflex" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM145 770T121 796T88 838Q84 832 69 814T38 779T13 762Q-23 762 -42 785L72 908Q80 911 89 911Q103 911 114 899Q121
+892 144 867T189 817T211 784Q211 774 194 768T154 761Q145 770 121 796Z" />
+<glyph unicode="&#xcf;" glyph-name="Idieresis" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM3 773T-6 786T-16 832Q-16 859 -5 874T28 889Q50 889 58 877T67 834Q67 804 56 788T23 772Q3 773 -6 786ZM123 773T113
+785T103 828Q103 889 147 889Q169 889 177 877T186 834Q184 772 142 772Q123 773 113 785Z" />
+<glyph unicode="&#xd0;" glyph-name="Eth" horiz-adv-x="388" d="M237 700T279 672T342 577T364 394Q364 247 342 160T276 37T169 0H44V331H5Q5 374 7 387T21 401H44V681Q44 691 50 695T71 700H169Q237 700 279 672ZM201 77T223 100T259 193T273 394Q273 485 262
+535T229 606T171 626H125V401H205Q205 359 203 345T188 331H125V77H171Q201 77 223 100Z" />
+<glyph unicode="&#xd1;" glyph-name="Ntilde" horiz-adv-x="444" d="M320 693T324 696T348 699T401 700V16Q401 0 384 0H324L209 275Q185 339 114 560Q118 517 121 416T124 259V16Q124 7 121 4T97 1T44 0V684Q44 700 60 700H121L234 430Q247 395 308 211Q312 199
+330 146V149Q325 188 323 290T320 448V684Q320 693 324 696ZM241 763T230 770T208 790Q198 801 191 806T173 811Q159 811 150 804T130 785T114 772Q104 772 96 781T82 799T75 812Q99 851 128 869T188 887Q203 887 212 881T233 863Q244 851 253 845T275 839Q295
+839 305 846T325 866T340 878Q348 878 354 868T364 847T369 833Q365 824 350 808T312 777T261 763Q241 763 230 770Z" />
+<glyph unicode="&#xd2;" glyph-name="Ograve" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM249 768T198 804T136 855Q140 877 150 896T173 916Q180 916 228 875T307 798Q306 795 302 784T291 763T276 753Q249 768 198 804Z" />
+<glyph unicode="&#xd3;" glyph-name="Oacute" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM159 760T152 770T141 791T136 805Q168 841 215 881T270 922Q283 922 293 903T307 861Q295 848 244 811T167 760Q159 760 152 770Z" />
+<glyph unicode="&#xd4;" glyph-name="Ocircumflex" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312
+459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM275 770T251 796T218 838Q214 832 199 814T168 779T143 762Q107 762 88 785L202 908Q210 911 219 911Q233 911 244 899Q251 892 274 867T319 817T341
+784Q341 774 324 768T284 761Q275 770 251 796Z" />
+<glyph unicode="&#xd5;" glyph-name="Otilde" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM234 763T223 770T201 790Q191 801 184 806T166 811Q152 811 143 804T123 785T107 772Q97 772 89 781T75 799T68 812Q92 851 121 869T181 887Q196 887
+205 881T226 863Q237 851 246 845T268 839Q288 839 298 846T318 866T333 878Q341 878 347 868T357 847T362 833Q358 824 343 808T305 777T254 763Q234 763 223 770Z" />
+<glyph unicode="&#xd6;" glyph-name="Odieresis" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312
+459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM133 773T124 786T114 832Q114 859 125 874T158 889Q180 889 188 877T197 834Q197 804 186 788T153 772Q133 773 124 786ZM253 773T243 785T233 828Q233
+889 277 889Q299 889 307 877T316 834Q314 772 272 772Q253 773 243 785Z" />
+<glyph unicode="&#xd7;" glyph-name="multiply" horiz-adv-x="418" d="M257 281L345 183Q319 157 309 149T292 140Q290 140 284 144L209 228L133 144Q127 140 125 140Q118 140 108 148T72 183L160 281L71 381Q76 386 90 399T111 418T124 423Q129 423 133 419L209
+335L284 419Q288 423 293 423Q300 423 308 416T329 398T346 381L257 281Z" />
+<glyph unicode="&#xd8;" glyph-name="Oslash" horiz-adv-x="436" d="M415 685T381 585Q403 506 403 357Q403 220 383 140T322 25T214 -10Q174 -10 145 0T94 35Q81 -1 73 -16Q59 -16 43 -9T24 9Q23 12 35 44T59 102Q33 183 33 354Q33 486 53 564T114 676T222 710Q262
+710 291 699T341 664Q359 712 363 719Q367 719 378 717T401 709T414 694Q415 685 381 585ZM186 628T165 600T134 507T124 334Q124 228 132 176L281 599Q261 628 222 628Q186 628 165 600ZM247 73T269 95T303 178T315 355Q315 463 307 516Q249 349 157 98Q176 73
+211 73Q247 73 269 95Z" />
+<glyph unicode="&#xd9;" glyph-name="Ugrave" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10
+109 18ZM253 768T202 804T140 855Q144 877 154 896T177 916Q184 916 232 875T311 798Q310 795 306 784T295 763T280 753Q253 768 202 804Z" />
+<glyph unicode="&#xda;" glyph-name="Uacute" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10
+109 18ZM163 760T156 770T145 791T140 805Q172 841 219 881T274 922Q287 922 297 903T311 861Q299 848 248 811T171 760Q163 760 156 770Z" />
+<glyph unicode="&#xdb;" glyph-name="Ucircumflex" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148
+-10 109 18ZM279 770T255 796T222 838Q218 832 203 814T172 779T147 762Q111 762 92 785L206 908Q214 911 223 911Q237 911 248 899Q255 892 278 867T323 817T345 784Q345 774 328 768T288 761Q279 770 255 796Z" />
+<glyph unicode="&#xdc;" glyph-name="Udieresis" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148
+-10 109 18ZM137 773T128 786T118 832Q118 859 129 874T162 889Q184 889 192 877T201 834Q201 804 190 788T157 772Q137 773 128 786ZM257 773T247 785T237 828Q237 889 281 889Q303 889 311 877T320 834Q318 772 276 772Q257 773 247 785Z" />
+<glyph unicode="&#xdd;" glyph-name="Yacute" horiz-adv-x="364" d="M225 16Q225 7 222 4T198 1T144 0V285L6 687Q4 694 8 696T35 699T97 700L137 563Q152 516 168 446T187 353Q189 375 206 445T238 563L273 685Q275 693 279 696T304 699T360 700L225 290V16ZM126
+760T119 770T108 791T103 805Q135 841 182 881T237 922Q250 922 260 903T274 861Q262 848 211 811T134 760Q126 760 119 770Z" />
+<glyph unicode="&#xde;" glyph-name="Thorn" horiz-adv-x="361" d="M44 680Q44 693 54 696T98 700H124V566H159Q254 566 298 519T343 369Q343 253 293 202T160 150H124V16Q124 7 120 4T96 1T44 0V680ZM212 225T233 260T254 378Q254 435 236 465T174 495Q139 495
+124 493V228Q131 228 144 227T168 225Q212 225 233 260Z" />
+<glyph unicode="&#xdf;" glyph-name="germandbls" horiz-adv-x="465" d="M65 -9T52 -4T39 2Q40 4 42 13T47 38T50 74L48 550Q48 629 90 667T208 705Q277 705 322 685T388 631T409 561Q409 529 394 510T348 467Q323 449 312 436T300 403Q300 385 313 368T355 325Q387
+294 407 270T441 213T456 138Q456 70 416 31T306 -9Q269 -9 242 -2T201 15T187 36Q187 69 208 90Q217 81 238 72T288 63Q324 63 345 82T366 137Q366 172 347 201T288 270Q250 309 231 337T212 399Q212 432 228 452T276 497Q300 515 311 528T323 560Q323 589 295
+609T214 630Q166 630 148 601T129 504L131 44Q131 14 122 3T84 -9Q65 -9 52 -4Z" />
+<glyph unicode="&#xe0;" glyph-name="agrave" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM209 568T158 604T96 655Q100 677 110 696T133 716Q140 716 188 675T267 598Q266
+595 262 584T251 563T236 553Q209 568 158 604Z" />
+<glyph unicode="&#xe1;" glyph-name="aacute" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM119 560T112 570T101 591T96 605Q128 641 175 681T230 722Q243 722 253 703T267
+661Q255 648 204 611T127 560Q119 560 112 570Z" />
+<glyph unicode="&#xe2;" glyph-name="acircumflex" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288
+482T317 388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM235 570T211 596T178 638Q174 632 159 614T128 579T103 562Q67 562
+48 585L162 708Q170 711 179 711Q193 711 204 699Q211 692 234 667T279 617T301 584Q301 574 284 568T244 561Q235 570 211 596Z" />
+<glyph unicode="&#xe3;" glyph-name="atilde" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM194 563T183 570T161 590Q151 601 144 606T126 611Q112 611 103 604T83 585T67
+572Q57 572 49 581T35 599T28 612Q52 651 81 669T141 687Q156 687 165 681T186 663Q197 651 206 645T228 639Q248 639 258 646T278 666T293 678Q301 678 307 668T317 647T322 633Q318 624 303 608T265 577T214 563Q194 563 183 570Z" />
+<glyph unicode="&#xe4;" glyph-name="adieresis" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288
+482T317 388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM93 573T84 586T74 632Q74 659 85 674T118 689Q140 689 148 677T157
+634Q157 604 146 588T113 572Q93 573 84 586ZM213 573T203 585T193 628Q193 689 237 689Q259 689 267 677T276 634Q274 572 232 572Q213 573 203 585Z" />
+<glyph unicode="&#xe5;" glyph-name="aring" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM125 543T102 564T79 639Q79 688 105 712T179 737Q227 737 249 716T271 640Q271
+592 246 568T172 543Q125 543 102 564ZM215 597T215 640Q215 662 206 671T179 681Q136 681 136 638Q136 618 145 608T174 597Q215 597 215 640Z" />
+<glyph unicode="&#xe6;" glyph-name="ae" horiz-adv-x="583" d="M478 69T532 100Q539 79 539 28Q539 21 520 13T468 -2T401 -9Q367 -9 344 -3T302 20Q255 -9 164 -9Q122 -9 94 1T47 46T29 148Q29 319 160 319Q210 319 236 306V378Q236 412 218 425T168 438Q93
+438 42 411Q32 429 32 459Q32 466 35 472T42 483Q58 494 98 502T197 510Q238 510 262 497T296 453Q317 487 346 498T418 510Q545 510 545 351Q545 270 534 220Q497 214 445 214Q383 214 324 225Q324 157 333 124T360 80T410 69Q478 69 532 100ZM376 439T354 406T326
+289Q388 277 426 277Q446 277 462 280Q467 303 467 342Q466 397 454 418T409 439Q376 439 354 406ZM236 250Q217 258 189 258Q154 258 134 235T113 149Q113 110 121 90T142 64T178 58Q195 58 212 62T236 74V250Z" />
+<glyph unicode="&#xe7;" glyph-name="ccedilla" horiz-adv-x="313" d="M227 62T248 68T284 85Q292 56 292 41Q292 20 262 6T184 -10L174 -59Q175 -58 191 -58Q211 -58 225 -74T240 -122Q240 -160 218 -183T160 -206Q141 -206 123 -200T104 -193Q105 -188 109 -172T117
+-152Q120 -149 135 -156T162 -163Q193 -163 193 -129Q193 -95 163 -95Q147 -95 136 -97T122 -101L139 -7Q102 -1 79 23T43 99T31 239Q31 400 81 455T210 510Q246 510 270 497T294 465Q294 442 285 420Q251 439 214 439Q170 439 142 399T114 238Q114 169 123 131T152
+77T204 62Q227 62 248 68Z" />
+<glyph unicode="&#xe8;" glyph-name="egrave" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM223 568T172 604T110 655Q114 677 124 696T147 716Q154 716 202 675T281 598Q280 595 276 584T265 563T250 553Q223 568
+172 604Z" />
+<glyph unicode="&#xe9;" glyph-name="eacute" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM133 560T126 570T115 591T110 605Q142 641 189 681T244 722Q257 722 267 703T281 661Q269 648 218 611T141 560Q133 560
+126 570Z" />
+<glyph unicode="&#xea;" glyph-name="ecircumflex" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150
+125 121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM249 570T225 596T192 638Q188 632 173 614T142 579T117 562Q81 562 62 585L176 708Q184 711 193 711Q207 711 218
+699Q225 692 248 667T293 617T315 584Q315 574 298 568T258 561Q249 570 225 596Z" />
+<glyph unicode="&#xeb;" glyph-name="edieresis" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM107 573T98 586T88 632Q88 659 99 674T132 689Q154 689 162 677T171 634Q171 604 160 588T127 572Q107 573 98 586ZM227
+573T217 585T207 628Q207 689 251 689Q273 689 281 677T290 634Q288 572 246 572Q227 573 217 585Z" />
+<glyph unicode="&#xec;" glyph-name="igrave" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM377 568T326 604T264 655Q268 677 278 696T301 716Q308 716 356 675T435 598Q434 595 430 584T419 563T404 553Q377
+568 326 604Z" />
+<glyph unicode="&#xed;" glyph-name="iacute" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM31 560T24 570T13 591T8 605Q40 641 87 681T142 722Q155 722 165 703T179 661Q167 648 116 611T39 560Q31 560 24 570Z" />
+<glyph unicode="&#xee;" glyph-name="icircumflex" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM147 570T123 596T90 638Q86 632 71 614T40 579T15 562Q-21 562 -40 585L74 708Q82 711 91 711Q105 711 116 699Q123
+692 146 667T191 617T213 584Q213 574 196 568T156 561Q147 570 123 596Z" />
+<glyph unicode="&#xef;" glyph-name="idieresis" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM261 573T252 586T242 632Q242 659 253 674T286 689Q308 689 316 677T325 634Q325 604 314 588T281 572Q261 573 252
+586ZM381 573T371 585T361 628Q361 689 405 689Q427 689 435 677T444 634Q442 572 400 572Q381 573 371 585Z" />
+<glyph unicode="&#xf0;" glyph-name="eth" horiz-adv-x="408" d="M380 504T380 289Q380 149 344 70T209 -10Q116 -10 73 51T30 257Q30 378 73 443T190 509Q244 509 278 480Q260 547 224 602L129 565Q121 585 116 600T111 623Q111 633 119 637L177 659Q163 675
+125 707Q134 724 150 734T183 744Q203 744 213 732Q233 716 257 690L326 717Q334 697 339 682T344 659Q344 649 336 646L300 632Q380 504 380 289ZM263 58T280 116T298 286Q298 349 293 388Q264 437 212 437Q163 437 138 383T112 244Q112 58 207 58Q263 58 280
+116Z" />
+<glyph unicode="&#xf1;" glyph-name="ntilde" horiz-adv-x="383" d="M45 476Q76 490 121 500T204 510Q282 510 313 480T344 376V16Q344 7 340 4T316 1T261 0V352Q261 402 249 421T201 440Q183 440 162 436T126 422V16Q126 7 122 4T98 1T45 0V476ZM211 563T200
+570T178 590Q168 601 161 606T143 611Q129 611 120 604T100 585T84 572Q74 572 66 581T52 599T45 612Q69 651 98 669T158 687Q173 687 182 681T203 663Q214 651 223 645T245 639Q265 639 275 646T295 666T310 678Q318 678 324 668T334 647T339 633Q335 624 320
+608T282 577T231 563Q211 563 200 570Z" />
+<glyph unicode="&#xf2;" glyph-name="ograve" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM224 568T173 604T111 655Q115 677 125 696T148 716Q155 716 203 675T282 598Q281 595 277 584T266 563T251 553Q224 568 173 604Z" />
+<glyph unicode="&#xf3;" glyph-name="oacute" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM134 560T127 570T116 591T111 605Q143 641 190 681T245 722Q258 722 268 703T282 661Q270 648 219 611T142 560Q134 560 127 570Z" />
+<glyph unicode="&#xf4;" glyph-name="ocircumflex" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442
+135 400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM250 570T226 596T193 638Q189 632 174 614T143 579T118 562Q82 562 63 585L177 708Q185 711 194 711Q208 711 219 699Q226 692 249 667T294 617T316 584Q316 574 299 568T259 561Q250 570 226 596Z"
+/>
+<glyph unicode="&#xf5;" glyph-name="otilde" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM209 563T198 570T176 590Q166 601 159 606T141 611Q127 611 118 604T98 585T82 572Q72 572 64 581T50 599T43 612Q67 651 96 669T156 687Q171 687 180 681T201 663Q212 651 221 645T243 639Q263 639
+273 646T293 666T308 678Q316 678 322 668T332 647T337 633Q333 624 318 608T280 577T229 563Q209 563 198 570Z" />
+<glyph unicode="&#xf6;" glyph-name="odieresis" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442
+135 400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM108 573T99 586T89 632Q89 659 100 674T133 689Q155 689 163 677T172 634Q172 604 161 588T128 572Q108 573 99 586ZM228 573T218 585T208 628Q208 689 252 689Q274 689 282 677T291 634Q289 572
+247 572Q228 573 218 585Z" />
+<glyph unicode="&#xf7;" glyph-name="divide" horiz-adv-x="418" d="M181 376T170 389T159 427Q159 448 172 463T208 478Q258 478 258 427Q258 405 245 391T208 376Q181 376 170 389ZM34 290T36 303T51 317H384Q384 275 382 261T368 247H34Q34 290 36 303ZM181
+81T170 94T159 132Q159 153 172 168T208 183Q258 183 258 132Q258 110 245 96T208 81Q181 81 170 94Z" />
+<glyph unicode="&#xf8;" glyph-name="oslash" horiz-adv-x="412" d="M403 484T388 454T356 395Q369 343 369 252Q369 116 329 53T207 -10Q167 -10 140 -2T93 29L62 -26Q46 -23 32 -14T17 8Q17 14 63 92Q48 149 48 250Q48 510 213 510Q250 510 277 501T323 468Q351
+515 357 522Q360 521 371 517T393 506T403 489Q403 484 388 454ZM174 440T155 399T135 248Q135 216 137 176L266 404Q257 425 244 432T211 440Q174 440 155 399ZM243 58T262 100T282 252Q282 298 279 331Q275 323 194 179L150 101Q158 76 172 67T207 58Q243 58
+262 100Z" />
+<glyph unicode="&#xf9;" glyph-name="ugrave" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM229
+568T178 604T116 655Q120 677 130 696T153 716Q160 716 208 675T287 598Q286 595 282 584T271 563T256 553Q229 568 178 604Z" />
+<glyph unicode="&#xfa;" glyph-name="uacute" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM139
+560T132 570T121 591T116 605Q148 641 195 681T250 722Q263 722 273 703T287 661Q275 648 224 611T147 560Q139 560 132 570Z" />
+<glyph unicode="&#xfb;" glyph-name="ucircumflex" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103
+8ZM255 570T231 596T198 638Q194 632 179 614T148 579T123 562Q87 562 68 585L182 708Q190 711 199 711Q213 711 224 699Q231 692 254 667T299 617T321 584Q321 574 304 568T264 561Q255 570 231 596Z" />
+<glyph unicode="&#xfc;" glyph-name="udieresis" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM113
+573T104 586T94 632Q94 659 105 674T138 689Q160 689 168 677T177 634Q177 604 166 588T133 572Q113 573 104 586ZM233 573T223 585T213 628Q213 689 257 689Q279 689 287 677T296 634Q294 572 252 572Q233 573 223 585Z" />
+<glyph unicode="&#xfd;" glyph-name="yacute" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192 154T208
+261L253 477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154ZM122 560T115 570T104 591T99 605Q131 641 178 681T233 722Q246 722 256 703T270 661Q258 648 207 611T130 560Q122 560 115 570Z" />
+<glyph unicode="&#xfe;" glyph-name="thorn" d="M273 509T314 463T355 300Q355 123 309 57T203 -10Q153 -10 127 16V-194Q108 -200 79 -200Q58 -200 52 -194T46 -166V698Q46 717 52 724T74 733T127 735V502Q156 509 192 509Q273 509 314 463ZM212 60T239 109T266
+293Q266 354 257 385T232 428T188 439Q154 439 127 418V88Q143 59 178 59Q212 60 239 109Z" />
+<glyph unicode="&#xff;" glyph-name="ydieresis" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192
+154T208 261L253 477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154ZM96 573T87 586T77 632Q77 659 88 674T121 689Q143 689 151 677T160 634Q160 604 149 588T116 572Q96 573 87 586ZM216 573T206 585T196 628Q196
+689 240 689Q262 689 270 677T279 634Q277 572 235 572Q216 573 206 585Z" />
+<glyph unicode="&#x2013;" glyph-name="endash" horiz-adv-x="424" d="M37 290T39 303T54 317H387Q387 275 385 261T371 247H37Q37 290 39 303Z" />
+<glyph unicode="&#x2014;" glyph-name="emdash" horiz-adv-x="700" d="M6 290T8 303T22 317H694Q694 275 692 261T678 247H6Q6 290 8 303Z" />
+<glyph unicode="&#x2018;" glyph-name="quoteleft" horiz-adv-x="174" d="M34 575T34 634Q34 668 48 705T80 769T108 795Q135 795 140 772Q127 747 122 725T115 676Q138 661 138 627Q138 605 124 590T88 575Q34 575 34 634Z" />
+<glyph unicode="&#x2019;" glyph-name="quoteright" horiz-adv-x="174" d="M41 572T34 595Q48 621 52 642T59 692Q36 706 36 740Q36 763 50 777T86 792Q141 792 141 733Q141 699 127 662T94 598T66 572Q41 572 34 595Z" />
+<glyph unicode="&#x201a;" glyph-name="quotesinglbase" horiz-adv-x="170" d="M41 -114T34 -91Q48 -66 52 -45T59 5Q36 19 36 54Q36 76 50 91T86 106Q141 106 141 47Q141 13 127 -24T94 -88T66 -114Q41 -114 34 -91Z" />
+<glyph unicode="&#x201c;" glyph-name="quotedblleft" horiz-adv-x="324" d="M34 575T34 634Q34 668 48 705T80 769T108 795Q135 795 140 772Q127 747 122 725T115 676Q138 661 138 627Q138 605 124 590T88 575Q34 575 34 634ZM184 575T184 634Q184 668 198 705T230
+769T258 795Q285 795 290 772Q276 747 272 726T265 676Q288 661 288 627Q288 605 274 590T238 575Q184 575 184 634Z" />
+<glyph unicode="&#x201d;" glyph-name="quotedblright" horiz-adv-x="324" d="M41 572T34 595Q48 621 52 642T59 692Q36 706 36 740Q36 763 50 777T86 792Q141 792 141 733Q141 699 127 662T94 598T66 572Q41 572 34 595ZM189 572T184 595Q198 621 202 642T209
+692Q186 706 186 740Q186 763 200 777T236 792Q291 792 291 733Q291 699 277 662T244 598T216 572Q189 572 184 595Z" />
+<glyph unicode="&#x201e;" glyph-name="quotedblbase" horiz-adv-x="321" d="M41 -114T34 -91Q48 -66 52 -45T59 5Q36 19 36 54Q36 76 50 91T86 106Q141 106 141 47Q141 13 127 -24T94 -88T66 -114Q41 -114 34 -91ZM189 -114T184 -91Q198 -66 202 -45T209 5Q186
+19 186 54Q186 76 200 91T236 106Q291 106 291 47Q291 13 277 -24T244 -88T216 -114Q189 -114 184 -91Z" />
+<glyph unicode="&#x2022;" glyph-name="bullet" horiz-adv-x="223" d="M75 208T58 227T41 284Q41 316 61 338T114 361Q153 361 171 341T189 284Q189 251 169 230T114 208Q75 208 58 227Z" />
+<glyph unicode="&#x2039;" glyph-name="guilsinglleft" horiz-adv-x="247" d="M156 16T120 69T51 178T18 250Q18 265 50 320T118 430T164 500Q178 500 188 491T205 472T212 459Q212 442 186 396T132 306T94 250Q103 238 132 196T187 109T214 47Q213 43 207 32T191
+11T167 0Q156 16 120 69Z" />
+<glyph unicode="&#x203a;" glyph-name="guilsinglright" horiz-adv-x="247" d="M77 1T66 6T44 21T33 46Q33 62 59 107T115 195T153 250Q144 263 116 306T61 395T35 459Q35 471 45 480T67 494T83 500Q94 484 129 430T196 321T229 250Q229 234 196 179T128 70T81
+0Q77 1 66 6Z" />
+</font>
+</defs>
+</svg>
diff --git a/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.ttf b/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6f4feb02d14c849ba1fb7dc112243386b2ad8f2f
GIT binary patch
literal 39168
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
C10J6M

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.woff b/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.woff
new file mode 100644
index 0000000000000000000000000000000000000000..ddccf765c758d5a4c8a96914418caedbb757ca8f
GIT binary patch
literal 22256
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

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.woff2 b/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..7b18f7ea49098fff3aac28a1feb0cecc429bb2ec
GIT binary patch
literal 18320
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

literal 0
HcmV?d00001

diff --git a/pelican/themes/notmyidea/static/fonts/font.css b/pelican/themes/notmyidea/static/fonts/font.css
new file mode 100644
index 00000000..a9eb87e6
--- /dev/null
+++ b/pelican/themes/notmyidea/static/fonts/font.css
@@ -0,0 +1,12 @@
+@font-face {
+	font-family: 'Yanone Kaffeesatz';
+	font-style: normal;
+	font-weight: 400;
+	src:
+		local('Yanone Kaffeesatz Regular'),
+		local('YanoneKaffeesatz-Regular'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
+		url('Yanone_Kaffeesatz_400.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
+		url('Yanone_Kaffeesatz_400.woff2') format('woff2');
+}

From a2d07059870def82c119d334b772cfd123c71f56 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sun, 30 Jul 2017 17:49:43 +0200
Subject: [PATCH 1984/2864] Remove Internet Explorer script, as it wasn't being
 used: 404 HTTP error

---
 pelican/themes/notmyidea/templates/base.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 7818c235..b041faa0 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -10,10 +10,6 @@
         {% if FEED_ALL_RSS %}
         <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">

From 9d8d555708f5a00e871e2af8dcc4683241f60cbd Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sun, 6 Aug 2017 13:55:12 +0200
Subject: [PATCH 1985/2864] Regenerate tests' output

---
 .../basic/a-markdown-powered-article.html     |   4 -
 pelican/tests/output/basic/archives.html      |   4 -
 pelican/tests/output/basic/article-1.html     |   4 -
 pelican/tests/output/basic/article-2.html     |   4 -
 pelican/tests/output/basic/article-3.html     |   4 -
 .../output/basic/author/alexis-metaireau.html |   4 -
 pelican/tests/output/basic/authors.html       |   4 -
 pelican/tests/output/basic/categories.html    |   4 -
 pelican/tests/output/basic/category/bar.html  |   4 -
 pelican/tests/output/basic/category/cat1.html |   4 -
 pelican/tests/output/basic/category/misc.html |   4 -
 pelican/tests/output/basic/category/yeah.html |   4 -
 .../output/basic/drafts/a-draft-article.html  |   4 -
 .../basic/filename_metadata-example.html      |   4 -
 pelican/tests/output/basic/index.html         |   4 -
 pelican/tests/output/basic/oh-yeah.html       |   4 -
 .../tests/output/basic/override/index.html    |   4 -
 .../pages/this-is-a-test-hidden-page.html     |   4 -
 .../basic/pages/this-is-a-test-page.html      |   4 -
 .../tests/output/basic/second-article-fr.html |   4 -
 .../tests/output/basic/second-article.html    |   4 -
 pelican/tests/output/basic/tag/bar.html       |   4 -
 pelican/tests/output/basic/tag/baz.html       |   4 -
 pelican/tests/output/basic/tag/foo.html       |   4 -
 pelican/tests/output/basic/tag/foobar.html    |   4 -
 pelican/tests/output/basic/tag/oh.html        |   4 -
 pelican/tests/output/basic/tag/yeah.html      |   4 -
 pelican/tests/output/basic/tags.html          |   4 -
 .../tests/output/basic/theme/css/fonts.css    |  12 +
 pelican/tests/output/basic/theme/css/main.css |  66 +--
 .../output/basic/theme/css/typogrify.css      |   2 +-
 .../theme/fonts/Yanone_Kaffeesatz_400.eot     | Bin 0 -> 20932 bytes
 .../theme/fonts/Yanone_Kaffeesatz_400.svg     | 407 ++++++++++++++++++
 .../theme/fonts/Yanone_Kaffeesatz_400.ttf     | Bin 0 -> 39168 bytes
 .../theme/fonts/Yanone_Kaffeesatz_400.woff    | Bin 0 -> 22256 bytes
 .../theme/fonts/Yanone_Kaffeesatz_400.woff2   | Bin 0 -> 18320 bytes
 .../tests/output/basic/theme/fonts/font.css   |  12 +
 .../output/basic/this-is-a-super-article.html |   4 -
 pelican/tests/output/basic/unbelievable.html  |   4 -
 .../custom/a-markdown-powered-article.html    |   4 -
 pelican/tests/output/custom/archives.html     |   4 -
 pelican/tests/output/custom/article-1.html    |   4 -
 pelican/tests/output/custom/article-2.html    |   4 -
 pelican/tests/output/custom/article-3.html    |   4 -
 .../custom/author/alexis-metaireau.html       |   4 -
 .../custom/author/alexis-metaireau2.html      |   4 -
 .../custom/author/alexis-metaireau3.html      |   4 -
 pelican/tests/output/custom/authors.html      |   4 -
 pelican/tests/output/custom/categories.html   |   4 -
 pelican/tests/output/custom/category/bar.html |   4 -
 .../tests/output/custom/category/cat1.html    |   4 -
 .../tests/output/custom/category/misc.html    |   4 -
 .../tests/output/custom/category/yeah.html    |   4 -
 .../output/custom/drafts/a-draft-article.html |   4 -
 .../custom/filename_metadata-example.html     |   4 -
 pelican/tests/output/custom/index.html        |   4 -
 pelican/tests/output/custom/index2.html       |   4 -
 pelican/tests/output/custom/index3.html       |   4 -
 .../tests/output/custom/jinja2_template.html  |   4 -
 pelican/tests/output/custom/oh-yeah-fr.html   |   4 -
 pelican/tests/output/custom/oh-yeah.html      |   4 -
 .../tests/output/custom/override/index.html   |   4 -
 .../pages/this-is-a-test-hidden-page.html     |   4 -
 .../custom/pages/this-is-a-test-page.html     |   4 -
 .../output/custom/second-article-fr.html      |   4 -
 .../tests/output/custom/second-article.html   |   4 -
 pelican/tests/output/custom/tag/bar.html      |   4 -
 pelican/tests/output/custom/tag/baz.html      |   4 -
 pelican/tests/output/custom/tag/foo.html      |   4 -
 pelican/tests/output/custom/tag/foobar.html   |   4 -
 pelican/tests/output/custom/tag/oh.html       |   4 -
 pelican/tests/output/custom/tag/yeah.html     |   4 -
 pelican/tests/output/custom/tags.html         |   4 -
 .../tests/output/custom/theme/css/fonts.css   |  12 +
 .../tests/output/custom/theme/css/main.css    |  66 +--
 .../output/custom/theme/css/typogrify.css     |   2 +-
 .../theme/fonts/Yanone_Kaffeesatz_400.eot     | Bin 0 -> 20932 bytes
 .../theme/fonts/Yanone_Kaffeesatz_400.svg     | 407 ++++++++++++++++++
 .../theme/fonts/Yanone_Kaffeesatz_400.ttf     | Bin 0 -> 39168 bytes
 .../theme/fonts/Yanone_Kaffeesatz_400.woff    | Bin 0 -> 22256 bytes
 .../theme/fonts/Yanone_Kaffeesatz_400.woff2   | Bin 0 -> 18320 bytes
 .../tests/output/custom/theme/fonts/font.css  |  12 +
 .../custom/this-is-a-super-article.html       |   4 -
 pelican/tests/output/custom/unbelievable.html |   4 -
 .../tests/output/custom_locale/archives.html  |   4 -
 .../author/alexis-metaireau.html              |   4 -
 .../author/alexis-metaireau2.html             |   4 -
 .../author/alexis-metaireau3.html             |   4 -
 .../tests/output/custom_locale/authors.html   |   4 -
 .../output/custom_locale/categories.html      |   4 -
 .../output/custom_locale/category/bar.html    |   4 -
 .../output/custom_locale/category/cat1.html   |   4 -
 .../output/custom_locale/category/misc.html   |   4 -
 .../output/custom_locale/category/yeah.html   |   4 -
 .../custom_locale/drafts/a-draft-article.html |   4 -
 pelican/tests/output/custom_locale/index.html |   4 -
 .../tests/output/custom_locale/index2.html    |   4 -
 .../tests/output/custom_locale/index3.html    |   4 -
 .../output/custom_locale/jinja2_template.html |   4 -
 .../output/custom_locale/oh-yeah-fr.html      |   4 -
 .../output/custom_locale/override/index.html  |   4 -
 .../pages/this-is-a-test-hidden-page.html     |   4 -
 .../pages/this-is-a-test-page.html            |   4 -
 .../02/this-is-a-super-article/index.html     |   4 -
 .../2010/octobre/15/unbelievable/index.html   |   4 -
 .../posts/2010/octobre/20/oh-yeah/index.html  |   4 -
 .../20/a-markdown-powered-article/index.html  |   4 -
 .../2011/février/17/article-1/index.html      |   4 -
 .../2011/février/17/article-2/index.html      |   4 -
 .../2011/février/17/article-3/index.html      |   4 -
 .../2012/février/29/second-article/index.html |   4 -
 .../30/filename_metadata-example/index.html   |   4 -
 .../custom_locale/second-article-fr.html      |   4 -
 .../tests/output/custom_locale/tag/bar.html   |   4 -
 .../tests/output/custom_locale/tag/baz.html   |   4 -
 .../tests/output/custom_locale/tag/foo.html   |   4 -
 .../output/custom_locale/tag/foobar.html      |   4 -
 .../tests/output/custom_locale/tag/oh.html    |   4 -
 .../tests/output/custom_locale/tag/yeah.html  |   4 -
 pelican/tests/output/custom_locale/tags.html  |   4 -
 .../output/custom_locale/theme/css/fonts.css  |  12 +
 .../output/custom_locale/theme/css/main.css   |  66 +--
 .../custom_locale/theme/css/typogrify.css     |   2 +-
 .../theme/fonts/Yanone_Kaffeesatz_400.eot     | Bin 0 -> 20932 bytes
 .../theme/fonts/Yanone_Kaffeesatz_400.svg     | 407 ++++++++++++++++++
 .../theme/fonts/Yanone_Kaffeesatz_400.ttf     | Bin 0 -> 39168 bytes
 .../theme/fonts/Yanone_Kaffeesatz_400.woff    | Bin 0 -> 22256 bytes
 .../theme/fonts/Yanone_Kaffeesatz_400.woff2   | Bin 0 -> 18320 bytes
 .../output/custom_locale/theme/fonts/font.css |  12 +
 129 files changed, 1395 insertions(+), 510 deletions(-)
 create mode 100644 pelican/tests/output/basic/theme/css/fonts.css
 create mode 100644 pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.eot
 create mode 100644 pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.svg
 create mode 100644 pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.ttf
 create mode 100644 pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.woff
 create mode 100644 pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.woff2
 create mode 100644 pelican/tests/output/basic/theme/fonts/font.css
 create mode 100644 pelican/tests/output/custom/theme/css/fonts.css
 create mode 100644 pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.eot
 create mode 100644 pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.svg
 create mode 100644 pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.ttf
 create mode 100644 pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.woff
 create mode 100644 pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.woff2
 create mode 100644 pelican/tests/output/custom/theme/fonts/font.css
 create mode 100644 pelican/tests/output/custom_locale/theme/css/fonts.css
 create mode 100644 pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.eot
 create mode 100644 pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.svg
 create mode 100644 pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.ttf
 create mode 100644 pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.woff
 create mode 100644 pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.woff2
 create mode 100644 pelican/tests/output/custom_locale/theme/fonts/font.css

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index f533fa3d..9053d5fe 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -5,10 +5,6 @@
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 01f360eb..dcebef2c 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index a5c92675..758ddf06 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -5,10 +5,6 @@
         <title>Article 1</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 1a182c5f..40d2cefd 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -5,10 +5,6 @@
         <title>Article 2</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 7fab0edd..1ef6b651 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -5,10 +5,6 @@
         <title>Article 3</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 3fe6c95e..bc05969e 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog - Alexis Métaireau</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index c580269f..c2b695c0 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog - Authors</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 5aa2791f..b1c0e932 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 6ae80ed1..a0b06964 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog - bar</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 369146d0..9d8a8883 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog - cat1</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 0ad46b6c..9012cedc 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog - misc</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 291d43aa..c7c8e507 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog - yeah</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index 64d56ff9..7fe1b180 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -5,10 +5,6 @@
         <title>A draft article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 9c6d2747..98930240 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -5,10 +5,6 @@
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index f6d1c7bf..ed1356ed 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index a8f0252b..86086bc1 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -5,10 +5,6 @@
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 28486f79..3b45f9e0 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -5,10 +5,6 @@
         <title>Override url/save_as</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 16633b74..6e1bd4eb 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -5,10 +5,6 @@
         <title>This is a test hidden page</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index 3c29e0af..ed9bce91 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -5,10 +5,6 @@
         <title>This is a test page</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 30c8ab0b..c5ceced3 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -5,10 +5,6 @@
         <title>Deuxième article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 090dc8dd..a68a1a6f 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -5,10 +5,6 @@
         <title>Second article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 655e97c7..b699a45d 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog - bar</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index c1e662d9..48a11061 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -5,10 +5,6 @@
         <title>The baz tag</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 484f8884..348efcc0 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog - foo</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index c65d6a0c..34505977 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog - foobar</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index 61148527..0993e43e 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -5,10 +5,6 @@
         <title>Oh Oh Oh</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 0eb4c4b3..2729561c 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog - yeah</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index 114f032e..afcd2bab 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -5,10 +5,6 @@
         <title>A Pelican Blog - Tags</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/theme/css/fonts.css b/pelican/tests/output/basic/theme/css/fonts.css
new file mode 100644
index 00000000..56015076
--- /dev/null
+++ b/pelican/tests/output/basic/theme/css/fonts.css
@@ -0,0 +1,12 @@
+@font-face {
+	font-family: 'Yanone Kaffeesatz';
+	font-style: normal;
+	font-weight: 400;
+	src:
+		local('Yanone Kaffeesatz Regular'),
+		local('YanoneKaffeesatz-Regular'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
+		url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
+		url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
+}
diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 03a77e69..9673ca45 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -12,7 +12,7 @@
 @import url("reset.css");
 @import url("pygment.css");
 @import url("typogrify.css");
-@import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+@import url("fonts.css");
 
 /***** Global *****/
 /* Body */
@@ -43,7 +43,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 h3, h4, h5, h6 { margin-top: .8em; }
-	
+
 hr { border: 2px solid #EEEEEE; }
 
 /* Anchors */
@@ -64,7 +64,7 @@ a:hover, a:active {
 h1 a:hover {
     background-color: inherit
 }
-	
+
 /* Paragraphs */
 div.line-block,
 p { margin-top: 1em;
@@ -124,7 +124,7 @@ div.note {
 
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
-	
+
 	/* Thead */
 	thead th {padding: .5em .4em; text-align: left;}
 	thead td {}
@@ -132,14 +132,14 @@ table {margin: .5em auto 1.5em auto; width: 98%;}
 	/* Tbody */
 	tbody td {padding: .5em .4em;}
 	tbody th {}
-	
+
 	tbody .alt td {}
 	tbody .alt th {}
-	
+
 	/* Tfoot */
 	tfoot th {}
 	tfoot td {}
-	
+
 /* HTML5 tags */
 header, section, footer,
 aside, nav, article, figure {
@@ -173,9 +173,9 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		color: #C74350;
 		text-shadow: none;
 	}
-	
+
 	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
-	
+
 	/* Main Nav */
 	#banner nav {
 		background: #000305;
@@ -186,15 +186,15 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		padding: 0;
 		text-align: center;
 		width: 800px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
-	
+
 	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
 	#banner nav li {float: left; display: inline; margin: 0;}
-	
+
 	#banner nav a:link, #banner nav a:visited {
 		color: #fff;
 		display: inline-block;
@@ -208,12 +208,12 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		color: #fff;
 		text-shadow: none !important;
 	}
-	
+
 	#banner nav li:first-child a {
 		border-top-left-radius: 5px;
 		-moz-border-radius-topleft: 5px;
 		-webkit-border-top-left-radius: 5px;
-		
+
 		border-bottom-left-radius: 5px;
 		-moz-border-radius-bottomleft: 5px;
 		-webkit-border-bottom-left-radius: 5px;
@@ -228,7 +228,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	overflow: hidden;
 	padding: 20px;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -257,7 +257,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	overflow: hidden;
 	padding: 20px 20px;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -292,21 +292,21 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		float: left;
 		width: 615px;
 	}
-	
+
 	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
-	
+
 	/* Social */
 	#extras .social {
 		float: right;
 		width: 175px;
 	}
-	
+
 	#extras div[class='social'] a {
 		background-repeat: no-repeat;
 		background-position: 3px 6px;
 		padding-left: 25px;
 	}
-	
+
 		/* Icons */
 		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
 		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
@@ -346,7 +346,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	padding: 20px;
 	text-align: left;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -390,7 +390,7 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 	/* Blog Index */
 	#posts-list {list-style: none; margin: 0;}
 	#posts-list .hentry {padding-left: 10px; position: relative;}
-	
+
 	#posts-list footer {
 		left: 10px;
 		position: relative;
@@ -398,7 +398,7 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		top: 0.5em;
 		width: 190px;
 	}
-	
+
 	/* About the Author */
 	#about-author {
 		background: #f9f9f9;
@@ -406,21 +406,21 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		font-style: normal;
 		margin: 2em 0;
 		padding: 10px 20px 15px 20px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
-	
+
 	#about-author strong {
 		color: #C64350;
 		clear: both;
 		display: block;
 		font-size: 1.429em;
 	}
-	
+
 	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
-	
+
 	/* Comments */
 	#comments-list {list-style: none; margin: 0 1em;}
 	#comments-list blockquote {
@@ -429,24 +429,24 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		font-style: normal;
 		margin: 0;
 		padding: 15px 20px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
 	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
-	
+
 	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
-	
+
 	/* Add a Comment */
 	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
 	#add-comment input[type='text'],
 	#add-comment input[type='email'],
 	#add-comment input[type='url'] {float: left; width: 200px;}
-	
+
 	#add-comment textarea {float: left; height: 150px; width: 495px;}
-	
+
 	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
-	
+
 	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
 	#add-comment * {margin-bottom: .5em;}
diff --git a/pelican/tests/output/basic/theme/css/typogrify.css b/pelican/tests/output/basic/theme/css/typogrify.css
index c9b34dc8..3bae4976 100644
--- a/pelican/tests/output/basic/theme/css/typogrify.css
+++ b/pelican/tests/output/basic/theme/css/typogrify.css
@@ -1,3 +1,3 @@
 .caps {font-size:.92em;}
-.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}    
+.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}
 .dquo {margin-left:-.38em;}
diff --git a/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.eot b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.eot
new file mode 100644
index 0000000000000000000000000000000000000000..b3b90dbc3ef34775a8689ab6a4494810c14c5a59
GIT binary patch
literal 20932
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.svg b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.svg
new file mode 100644
index 00000000..a69669b5
--- /dev/null
+++ b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.svg
@@ -0,0 +1,407 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs >
+<font id="YanoneKaffeesatz" horiz-adv-x="384" ><font-face
+    font-family="Yanone Kaffeesatz"
+    units-per-em="1000"
+    panose-1="0 0 5 0 0 0 0 0 0 0"
+    ascent="957"
+    descent="-200"
+    alphabetic="0" />
+<glyph unicode=" " glyph-name="space" horiz-adv-x="158" />
+<glyph unicode="!" glyph-name="exclam" horiz-adv-x="195" d="M45 683Q45 694 53 699T83 705T155 706L139 251Q138 233 131 226T109 216T59 213L45 683ZM68 -7T55 7T42 50Q42 74 57 91T97 108Q153 108 153 50Q153 26 138 10T97 -7Q68 -7 55 7Z" />
+<glyph unicode="&quot;" glyph-name="quotedbl" horiz-adv-x="263" d="M42 607T37 667T31 760Q31 781 34 782Q41 786 65 786Q95 786 110 783Q110 740 103 665T89 586Q82 585 67 584T45 583Q42 607 37 667ZM166 590T160 659T153 761Q153 781 156 782Q163 786 187
+786Q218 786 233 783Q233 742 225 666T212 586Q205 585 190 584T168 583Q166 590 160 659Z" />
+<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="418" d="M323 254H390Q390 213 388 202T374 190H320L316 123Q315 112 302 110T245 107L249 190H154L150 123Q149 112 136 110T79 107L83 190H28Q28 232 30 243T44 254H87L92 360H28Q28 402 30 413T44
+424H96L99 487Q100 498 114 500T170 503L166 424H262L265 487Q266 498 280 500T336 503L332 424H390Q390 383 388 372T374 360H328L323 254ZM157 254H253L258 360H162L157 254Z" />
+<glyph unicode="$" glyph-name="dollar" horiz-adv-x="418" d="M363 20T237 -4V-91Q237 -110 221 -116T164 -122V-7Q128 -5 103 2T66 19T53 37Q53 46 59 68T74 102Q111 72 181 72Q228 72 251 94T274 158Q274 186 262 208T219 264L107 377Q53 434 53 488Q53 542
+86 574T181 615V704Q181 724 198 730T254 737V616Q304 613 330 602T357 581Q357 569 352 553T337 525Q326 533 299 539T239 546Q142 546 142 489Q142 469 152 452T185 409L306 288Q336 258 349 227T363 157Q363 20 237 -4Z" />
+<glyph unicode="%" glyph-name="percent" horiz-adv-x="692" d="M162 -7T150 -3T127 8T116 23L520 709Q523 708 534 703T555 691T565 674Q565 667 397 382T166 -8Q162 -7 150 -3ZM132 339T104 353T60 408T45 525Q45 618 81 663T186 708Q233 708 261 692T304 636T319
+526Q319 339 180 339Q132 339 104 353ZM212 402T228 430T245 525Q245 574 239 600T220 636T186 646Q154 646 138 619T122 523Q122 473 128 447T148 412T182 402Q212 402 228 430ZM460 -9T431 5T387 60T372 177Q372 270 408 315T514 360Q561 360 589 344T632 288T647
+178Q647 -9 508 -9Q460 -9 431 5ZM539 52T555 80T572 175Q572 224 566 250T548 286T513 296Q481 296 465 269T448 173Q448 123 454 97T474 62T509 52Q539 52 555 80Z" />
+<glyph unicode="&amp;" glyph-name="ampersand" horiz-adv-x="502" d="M458 70T488 55Q485 31 468 11T435 -10Q420 -10 362 54Q306 -10 212 -10Q27 -10 27 170Q27 229 59 278T139 358Q61 494 61 568Q61 636 104 671T228 706Q293 706 335 692T377 659Q377 644 372
+627T357 600Q330 619 301 627T237 635Q193 635 170 620T146 558Q146 508 205 405T343 201Q351 241 351 291Q351 423 291 496Q332 504 405 504Q447 504 483 501Q483 499 484 490T485 472Q485 453 477 444T443 435L394 436Q411 405 420 374T429 281Q429 194 404 129Q458
+70 488 55ZM272 66T309 115Q242 196 174 300Q110 254 110 168Q110 124 133 95T207 66Q272 66 309 115Z" />
+<glyph unicode="&apos;" glyph-name="quotesingle" horiz-adv-x="141" d="M42 607T37 667T31 760Q31 781 34 782Q41 786 65 786Q95 786 110 783Q110 740 103 665T89 586Q82 585 67 584T45 583Q42 607 37 667Z" />
+<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="292" d="M212 -196T172 -135T99 43T65 320Q65 470 98 578T172 744T226 803Q246 803 255 792T271 752Q218 680 183 573T147 318Q147 211 166 119T213 -38T271 -136Q265 -166 256 -181T227 -196Q212 -196 172 -135Z" />
+<glyph unicode=")" glyph-name="parenright" horiz-adv-x="292" d="M47 -196T37 -181T21 -136Q71 -70 108 44T145 318Q145 460 110 573T21 752Q28 781 37 792T66 803Q79 803 119 746T193 581T227 320Q227 168 194 52T120 -130T65 -196Q47 -196 37 -181Z" />
+<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="470" d="M199 667Q198 678 206 683T229 688Q256 688 278 677L258 519Q256 510 252 506T239 501Q231 501 221 504L199 667ZM269 469T269 478Q269 489 282 495L431 575Q441 566 447 551T454 521Q454 498 439
+494L280 455Q269 469 269 478ZM16 503Q15 532 29 551T60 570Q63 570 69 568L199 487Q200 470 194 463T175 459L16 503ZM249 404Q246 410 246 414Q246 424 271 434L386 299Q390 294 390 288Q390 274 370 261T327 245L249 404ZM130 250T120 250Q107 250 92 266T66
+300L187 423Q195 431 202 431Q212 431 224 415L136 259Q130 250 120 250Z" />
+<glyph unicode="+" glyph-name="plus" horiz-adv-x="418" d="M384 317Q384 275 382 261T368 247H245V123Q245 112 231 110T174 107V247H34Q34 290 36 303T51 317H174V441Q174 452 188 454T245 457V317H384Z" />
+<glyph unicode="," glyph-name="comma" horiz-adv-x="183" d="M43 -103T38 -80Q54 -53 59 -36T67 5Q43 21 43 54Q43 77 57 91T94 106Q148 106 148 47Q148 13 133 -21T99 -79T70 -103Q43 -103 38 -80Z" />
+<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="278" d="M37 290T39 303T54 317H241Q241 275 239 261T225 247H37Q37 290 39 303Z" />
+<glyph unicode="." glyph-name="period" horiz-adv-x="183" d="M63 -6T50 8T37 51Q37 75 52 91T93 108Q148 108 148 51Q148 26 133 10T93 -6Q63 -6 50 8Z" />
+<glyph unicode="/" glyph-name="slash" horiz-adv-x="334" d="M235 743Q238 754 243 758T265 763T324 765L99 0Q96 -10 91 -14T69 -19T10 -20L235 743Z" />
+<glyph unicode="0" glyph-name="zero" horiz-adv-x="418" d="M107 -9T68 65T29 296Q29 448 72 524T211 600Q306 600 347 532T389 320Q389 151 348 71T206 -9Q107 -9 68 65ZM260 64T282 124T305 321Q305 428 285 478T215 529Q160 529 138 469T116 290Q116 206 124
+157T153 86T208 64Q260 64 282 124Z" />
+<glyph unicode="1" glyph-name="one" horiz-adv-x="418" d="M28 32T28 56Q28 67 72 71T173 76L184 517Q163 516 123 509T70 499Q58 519 58 552Q58 558 97 569T183 590T247 600Q263 600 270 595L257 76H331Q353 76 368 77T389 79Q389 32 387 16T373 0H30Q28 32 28 56Z" />
+<glyph unicode="2" glyph-name="two" horiz-adv-x="418" d="M29 11T29 25Q29 45 33 56T54 96Q76 133 102 167T167 247Q227 317 255 362T283 454Q283 523 206 523Q166 523 125 513T59 488Q49 511 49 547Q49 559 73 571T139 592T226 600Q309 600 341 567T374 464Q374
+403 342 349T243 217Q171 131 136 76H271Q304 76 341 79T389 83Q389 34 386 17T372 0H33Q29 11 29 25Z" />
+<glyph unicode="3" glyph-name="three" horiz-adv-x="418" d="M99 -100T72 -86T44 -51Q44 -27 49 -11T55 9Q90 -23 153 -23Q218 -23 254 25T291 150Q291 209 248 231T132 254L130 305Q194 336 228 376T263 458Q263 486 248 504T191 523Q111 523 53 487Q43 507
+43 546Q43 559 64 571T125 592T216 600Q290 600 322 568T355 482Q355 380 245 301Q305 295 341 259T378 152Q378 71 349 15T269 -71T152 -100Q99 -100 72 -86Z" />
+<glyph unicode="4" glyph-name="four" horiz-adv-x="418" d="M235 131H54Q28 157 28 202Q28 227 65 311T152 478T237 592Q254 606 273 606Q297 606 319 595L316 206Q344 206 364 207T390 209Q391 208 392 202T394 186Q394 162 388 147T367 131H316V26Q316 12 313
+7T295 1T235 0V131ZM235 206L247 495Q208 450 161 361T98 206H235Z" />
+<glyph unicode="5" glyph-name="five" horiz-adv-x="418" d="M111 -100T85 -93T47 -77T34 -59Q34 -19 43 7Q78 -25 141 -25Q218 -25 256 33T294 178Q294 259 255 289T139 319Q100 319 42 306L71 600H377Q377 568 375 554T363 534T335 528Q291 528 229 529T140
+532L124 381Q159 386 187 386Q380 386 380 194Q380 56 322 -22T148 -100Q111 -100 85 -93Z" />
+<glyph unicode="6" glyph-name="six" horiz-adv-x="418" d="M313 439T352 392T391 245Q391 -8 202 -8Q128 -8 91 29T43 132T31 308Q31 702 259 702Q306 702 336 694T367 668Q367 636 359 611Q317 626 265 626Q119 626 108 367Q132 403 165 421T246 439Q313 439
+352 392ZM255 64T283 110T312 228Q312 295 289 330T223 365Q157 365 108 290V284Q106 169 129 117T205 64Q255 64 283 110Z" />
+<glyph unicode="7" glyph-name="seven" horiz-adv-x="418" d="M115 -88T98 -84T80 -66Q93 35 128 149T208 365T294 531Q220 527 67 527Q45 527 45 600H405Q303 403 242 238T163 -88Q115 -88 98 -84Z" />
+<glyph unicode="8" glyph-name="eight" horiz-adv-x="418" d="M362 293T377 259T392 182Q392 99 347 46T218 -8Q123 -8 78 45T32 183Q32 245 63 295T146 376Q101 407 81 429Q60 448 50 475T39 534Q39 617 87 661T210 706Q387 706 387 544Q387 485 358 444T279
+369Q317 339 333 323Q362 293 377 259ZM176 630T148 608T119 539Q119 489 159 457Q180 438 219 411Q313 469 313 541Q313 585 286 607T220 630Q176 630 148 608ZM259 69T286 100T313 183Q313 220 302 243T268 286Q248 307 210 333Q163 309 135 272T107 188Q107
+133 135 101T213 69Q259 69 286 100Z" />
+<glyph unicode="9" glyph-name="nine" horiz-adv-x="418" d="M288 609T324 580T373 486T389 297Q387 92 327 -6T138 -104Q98 -104 74 -96T49 -71Q49 -58 51 -43T56 -17Q89 -27 129 -27Q220 -27 261 39T310 229Q286 193 254 175T174 157Q109 157 69 209T28 358Q28
+485 75 547T217 609Q288 609 324 580ZM263 231T312 306V310Q312 392 305 439T278 512T218 537Q165 537 136 495T107 368Q107 302 131 267T198 231Q263 231 312 306Z" />
+<glyph unicode=":" glyph-name="colon" horiz-adv-x="183" d="M63 329T51 343T38 386Q38 410 53 426T93 443Q149 443 149 386Q149 361 134 345T93 329Q63 329 51 343ZM63 -6T51 8T38 51Q38 75 53 91T93 108Q149 108 149 51Q149 26 134 10T93 -6Q63 -6 51 8Z" />
+<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="183" d="M61 329T49 343T36 386Q36 410 51 426T91 443Q147 443 147 386Q147 361 132 345T91 329Q61 329 49 343ZM39 -103T34 -80Q50 -54 55 -37T63 5Q39 21 39 54Q39 77 53 91T90 106Q144 106 144 47Q144
+13 129 -21T95 -79T66 -103Q39 -103 34 -80Z" />
+<glyph unicode="&lt;" glyph-name="less" horiz-adv-x="400" d="M318 96T297 103L52 211Q39 234 39 258Q39 289 65 302L329 430Q342 418 349 404T357 377Q357 359 343 353L144 255L360 159Q359 134 348 115T324 96Q318 96 297 103Z" />
+<glyph unicode="=" glyph-name="equal" horiz-adv-x="418" d="M34 382T36 396T51 410H384Q384 367 382 353T368 339H34Q34 382 36 396ZM34 197T36 210T51 224H384Q384 182 382 168T368 154H34Q34 197 36 210Z" />
+<glyph unicode="&gt;" glyph-name="greater" horiz-adv-x="400" d="M62 97T55 112T46 139Q46 157 60 164L260 261L43 358Q44 383 56 401T80 420Q90 420 107 413L351 305Q364 285 364 258Q364 227 338 214L74 85Q62 97 55 112Z" />
+<glyph unicode="?" glyph-name="question" horiz-adv-x="295" d="M92 210T89 219T82 244T79 278Q79 319 97 351Q109 374 124 396T143 424Q171 465 184 491T197 552Q197 629 115 629Q66 629 31 603Q19 639 19 667Q19 684 58 697T144 710Q209 710 246 675T283 570Q283
+512 264 473T209 384Q182 350 172 330Q160 309 160 283Q160 271 165 243Q167 234 168 227T166 217Q156 206 120 206Q109 206 93 208Q92 210 89 219ZM100 -6T88 8T75 51Q75 75 90 91T130 108Q186 108 186 51Q186 26 171 10T130 -6Q100 -6 88 8Z" />
+<glyph unicode="@" glyph-name="at" horiz-adv-x="738" d="M442 -112T496 -101T602 -68Q623 -100 623 -126Q623 -141 592 -156T505 -180T375 -190Q268 -190 199 -159T89 -29T47 264Q47 479 139 581T394 683Q545 683 619 608T693 359Q693 145 644 74T533 2Q498
+2 471 25Q459 15 429 8T358 1Q319 1 293 12T252 57T237 151Q237 318 365 318Q403 318 423 307Q423 313 424 330T425 368Q426 401 411 413T364 426Q333 426 310 421T264 402Q256 419 256 448Q256 459 265 468Q281 479 312 486T391 494Q448 494 475 468T501 378L496
+177Q494 104 491 78Q508 72 524 72Q545 72 564 98T597 184T610 338Q610 441 590 500T523 585T393 611Q303 611 246 578T159 466T129 253Q129 106 155 27T233 -82T369 -112Q442 -112 496 -101ZM423 258Q402 261 388 261Q352 261 333 236T314 147Q314 98 327 80T368
+62Q390 62 404 74T419 114L423 258Z" />
+<glyph unicode="A" glyph-name="A" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499 183 395L149
+251H288Z" />
+<glyph unicode="B" glyph-name="B" horiz-adv-x="377" d="M44 681Q44 691 49 695T70 700H169Q337 700 337 546Q337 470 308 430T242 384Q289 381 324 350T360 238Q360 118 307 59T170 0H44V681ZM175 414Q209 414 229 443T249 530Q249 629 175 629H125V414H175ZM171
+71Q212 71 238 110T265 231Q265 280 254 305T223 337T172 345H125V71H171Z" />
+<glyph unicode="C" glyph-name="C" horiz-adv-x="341" d="M142 -10T107 13T51 109T30 321Q30 480 59 566T130 681T227 710Q277 710 299 694T321 655Q321 628 308 606Q277 631 243 631Q206 631 178 608T133 517T115 325Q115 227 127 173T161 99T215 79Q243 79 268
+88T308 111Q320 85 320 62Q320 32 285 11T196 -10Q142 -10 107 13Z" />
+<glyph unicode="D" glyph-name="D" horiz-adv-x="388" d="M44 681Q44 691 50 695T71 700H169Q237 700 279 672T342 575T364 386Q364 242 342 158T276 37T169 0H44V681ZM171 77Q201 77 223 100T259 193T273 394Q273 485 262 535T229 606T171 626H125V77H171Z" />
+<glyph unicode="E" glyph-name="E" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73Z" />
+<glyph unicode="F" glyph-name="F" horiz-adv-x="313" d="M301 700Q301 672 301 656T297 635T286 631H125V418H276Q276 391 276 373T272 350T261 344H125V16Q125 11 123 6T110 0H45V684Q45 688 48 694T61 700H301Z" />
+<glyph unicode="G" glyph-name="G" horiz-adv-x="386" d="M148 -10T108 18T49 121T30 334Q30 485 55 567T127 679T245 710Q293 710 322 695T352 659Q352 635 341 607Q327 618 306 624T261 631Q208 631 177 605T131 515T116 340Q116 225 128 167T162 89T220 69Q244
+69 259 77T280 94V343H205V394Q205 410 224 410H355V35Q301 -10 218 -10Q148 -10 108 18Z" />
+<glyph unicode="H" glyph-name="H" horiz-adv-x="410" d="M365 7T362 4T339 1T285 0V339H125V16Q125 7 122 4T98 1T44 0V684Q44 693 47 696T71 699T125 700V415H285V684Q285 693 288 696T311 699T365 700V16Q365 7 362 4Z" />
+<glyph unicode="I" glyph-name="I" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663Z" />
+<glyph unicode="J" glyph-name="J" horiz-adv-x="300" d="M63 -9T39 8T14 50Q14 64 17 73T26 96Q41 82 63 73T109 63Q138 63 151 76T169 114T174 183V663Q174 684 177 690T195 698T256 700V165Q256 82 226 37T119 -9Q63 -9 39 8Z" />
+<glyph unicode="K" glyph-name="K" horiz-adv-x="389" d="M371 701T371 686Q371 682 368 677L206 398Q326 307 367 18Q368 6 362 2T334 -2Q308 -2 278 1Q254 128 229 201T164 318Q151 333 124 345V16Q124 7 121 4T97 1T42 0V684Q42 693 45 696T69 699T124 700V398L284
+695Q313 701 335 701Q371 701 371 686Z" />
+<glyph unicode="L" glyph-name="L" horiz-adv-x="314" d="M44 677Q44 690 48 694T66 699T125 700V76H297V16Q297 7 293 4T281 0H44V677Z" />
+<glyph unicode="M" glyph-name="M" horiz-adv-x="489" d="M445 700V16Q445 7 442 4T418 1T363 0L366 245Q368 310 375 410T385 546L368 486Q329 342 319 315L266 161Q263 153 255 153H220L168 315Q155 354 104 541L103 540Q106 509 113 412T121 249L123 16Q123
+7 119 4T95 1T44 0V684Q44 694 48 697T60 700H118L214 396Q225 362 234 330T246 285Q249 297 257 329T275 393L364 684Q367 693 370 696T380 700H445Z" />
+<glyph unicode="N" glyph-name="N" horiz-adv-x="444" d="M320 693T324 696T348 699T401 700V16Q401 0 384 0H324L209 275Q185 339 114 560Q118 517 121 416T124 259V16Q124 7 121 4T97 1T44 0V684Q44 700 60 700H121L234 430Q247 395 308 211Q312 199 330 146V149Q325
+188 323 290T320 448V684Q320 693 324 696Z" />
+<glyph unicode="O" glyph-name="O" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459 304 517T276
+601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101Z" />
+<glyph unicode="P" glyph-name="P" horiz-adv-x="361" d="M254 700T298 653T343 503Q343 387 293 336T160 284H124V16Q124 7 121 4T97 1T44 0V684Q44 693 47 696T60 700H159Q254 700 298 653ZM212 359T233 394T254 512Q254 569 236 599T174 629H124V359H168Q212
+359 233 394Z" />
+<glyph unicode="Q" glyph-name="Q" horiz-adv-x="429" d="M404 -61T407 -74T410 -97Q410 -118 382 -127T320 -137Q269 -137 239 -107T190 -9Q131 -5 97 29T46 141T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 194 371 111T282
+2Q288 -37 300 -53T335 -70Q372 -70 398 -53Q404 -61 407 -74ZM121 238T129 182T158 99T214 73Q251 73 272 101T302 190T312 355Q312 459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182Z" />
+<glyph unicode="R" glyph-name="R" horiz-adv-x="372" d="M288 264T315 192T350 18Q350 6 343 2T309 -2Q298 -2 262 0Q255 110 231 179T180 285Q173 284 160 284H124V16Q124 7 121 4T97 1T44 0V684Q44 688 47 694T60 700H159Q254 700 298 653T343 503Q343 356
+256 306Q288 264 315 192ZM168 359Q212 359 233 393T254 506Q254 567 236 598T174 629H124V359H168Z" />
+<glyph unicode="S" glyph-name="S" horiz-adv-x="358" d="M94 -10T60 8T25 49Q25 62 30 78T46 107Q85 72 149 72Q248 72 248 174Q248 210 235 238T189 306L89 423Q55 464 41 497T26 567Q26 632 71 671T198 710Q265 710 297 697T329 660Q329 635 309 614Q298 623
+271 630T211 638Q166 638 140 620T113 569Q113 543 124 522T159 470L268 347Q306 302 320 264T335 178Q335 93 294 42T157 -10Q94 -10 60 8Z" />
+<glyph unicode="T" glyph-name="T" horiz-adv-x="373" d="M365 700V641Q365 631 361 628T348 624H225V16Q225 7 221 4T197 1T144 0V624H8V684Q8 700 25 700H365Z" />
+<glyph unicode="U" glyph-name="U" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10 109 18Z" />
+<glyph unicode="V" glyph-name="V" horiz-adv-x="420" d="M176 -7T165 8T146 51Q122 153 73 377T7 676Q5 686 5 689Q5 695 9 697T24 700H90L174 312Q187 246 207 117L214 69Q232 215 250 312L325 676Q328 689 332 694T346 700H416L262 -3Q233 -7 194 -7Q176 -7 165 8Z" />
+<glyph unicode="W" glyph-name="W" horiz-adv-x="654" d="M650 700L518 -3Q509 -4 492 -6T451 -8Q419 -8 408 49L356 276Q345 334 325 503Q306 341 296 277L241 -3Q208 -7 167 -7Q140 -7 126 54Q105 158 63 380T7 676Q6 680 6 687Q6 694 10 697T24 700H90L163
+311Q178 220 193 88H198Q203 187 224 311L286 642Q289 656 292 661T307 666H364L435 311Q450 232 462 118L465 88H471Q482 220 496 311L561 676Q563 689 566 694T581 700H650Z" />
+<glyph unicode="X" glyph-name="X" horiz-adv-x="424" d="M414 9T414 7Q414 0 403 0H315L261 135Q233 206 207 283Q178 198 151 135L97 10Q93 4 90 2T79 0H9L162 361L36 686Q33 694 37 696T66 699T131 700L172 586Q205 491 222 436Q248 520 271 586L310 687Q312
+694 316 696T341 699T397 700L268 368L412 13Q414 9 414 7Z" />
+<glyph unicode="Y" glyph-name="Y" horiz-adv-x="364" d="M225 16Q225 7 222 4T198 1T144 0V285L6 687Q4 694 8 696T35 699T97 700L137 563Q152 516 168 446T187 353Q189 375 206 445T238 563L273 685Q275 693 279 696T304 699T360 700L225 290V16Z" />
+<glyph unicode="Z" glyph-name="Z" horiz-adv-x="385" d="M19 11T19 31Q19 50 27 67L267 628H80Q49 628 37 625V683Q37 691 41 695T54 700H352Q360 689 360 674Q360 656 352 637L108 72H302Q343 72 361 80V16Q361 0 345 0H32Q19 11 19 31Z" />
+<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="386" d="M122 796Q122 808 125 812T140 819T184 821H377Q377 785 376 771T369 752T350 747H203V-123H376Q376 -161 374 -176T367 -195T349 -199H122V796Z" />
+<glyph unicode="\" glyph-name="backslash" horiz-adv-x="329" d="M12 743L10 752Q10 761 25 763T91 765L317 -10L319 -18Q319 -26 304 -28T237 -30L12 743Z" />
+<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="386" d="M9 -164T10 -150T17 -131T36 -126H183V746H10Q10 784 12 799T19 818T37 822H264V-175Q264 -187 261 -191T246 -198T202 -200H9Q9 -164 10 -150Z" />
+<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="430" d="M69 208T59 220T48 249L220 398L366 270Q380 259 380 244Q380 230 369 219T341 206L212 294L110 218Q94 208 85 208Q69 208 59 220Z" />
+<glyph unicode="_" glyph-name="underscore" horiz-adv-x="377" d="M14 -66T16 -52T30 -38H364Q364 -81 362 -95T347 -109H14Q14 -66 16 -52Z" />
+<glyph unicode="`" glyph-name="grave" horiz-adv-x="269" d="M162 568T111 604T49 655Q53 677 63 696T86 716Q93 716 141 675T220 598Q219 595 215 584T204 563T189 553Q162 568 111 604Z" />
+<glyph unicode="a" glyph-name="a" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317 388V335Q317
+115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63Z" />
+<glyph unicode="b" glyph-name="b" horiz-adv-x="385" d="M84 -10T48 20V698Q48 717 54 724T75 733T128 735V475Q173 510 235 510Q297 510 327 465T358 313Q358 120 303 55T164 -10Q84 -10 48 20ZM212 61T240 110T268 296Q268 374 251 405T198 437Q156 437 128
+409V75Q144 61 175 61Q212 61 240 110Z" />
+<glyph unicode="c" glyph-name="c" horiz-adv-x="313" d="M128 -10T96 9T48 83T31 239Q31 400 81 455T210 510Q246 510 270 497T294 465Q294 442 285 420Q251 439 214 439Q170 439 142 399T114 238Q114 169 123 131T152 77T204 62Q227 62 248 68T284 85Q292 56
+292 41Q292 20 260 5T180 -10Q128 -10 96 9Z" />
+<glyph unicode="d" glyph-name="d" horiz-adv-x="381" d="M142 -10T108 7T52 77T31 232Q31 373 73 441T184 510Q230 510 256 490V698Q256 717 262 724T284 733T337 735V20Q273 -10 193 -10Q142 -10 108 7ZM234 62T256 77V427Q239 440 210 440Q120 440 120 241Q120
+168 129 129T154 76T196 62Q234 62 256 77Z" />
+<glyph unicode="e" glyph-name="e" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125 121T155 80T207
+68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402Z" />
+<glyph unicode="f" glyph-name="f" horiz-adv-x="254" d="M82 432H13Q13 459 14 475T18 496T33 500H82V561Q82 665 129 702T249 739Q294 739 318 728T342 698Q342 675 333 654Q304 666 262 666Q215 666 189 646T162 567V500H252Q252 473 251 457T247 436T235 432H162V16Q162
+11 159 6T145 0H82V432Z" />
+<glyph unicode="g" glyph-name="g" horiz-adv-x="394" d="M308 72T341 47T375 -34Q375 -104 326 -150T183 -197Q91 -197 57 -167T23 -88Q23 -54 44 -23T100 33Q37 50 38 87Q38 127 101 177Q39 217 39 327Q39 422 83 466T206 510Q229 510 256 502H375Q383 488 383
+464Q383 433 355 433Q342 433 319 438Q357 400 357 329Q357 246 318 200T195 154Q169 154 150 158Q123 131 123 114Q123 102 148 97T242 82Q308 72 341 47ZM167 451T146 422T124 329Q124 271 139 244T200 216Q239 216 257 249T276 348Q276 402 258 426T203 451Q167
+451 146 422ZM240 -123T266 -99T293 -45Q293 -22 283 -10T249 9T180 19L160 21Q137 3 122 -21T106 -69Q106 -96 124 -109T190 -123Q240 -123 266 -99Z" />
+<glyph unicode="h" glyph-name="h" horiz-adv-x="380" d="M45 698Q45 717 51 724T72 733T125 735V471Q147 490 177 500T238 510Q299 510 320 479T342 378V16Q342 7 338 4T313 1T260 0V356Q260 394 248 414T201 435Q182 435 162 429T125 408V16Q125 7 122 4T99
+1T45 0V698Z" />
+<glyph unicode="i" glyph-name="i" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM300 570T300 628Q300 692 346 692Q368 692 377 679T386 634Q386 604 374 587T340 570Q300 570 300 628Z" />
+<glyph unicode="j" glyph-name="j" horiz-adv-x="184" d="M-50 -196T-76 -182T-103 -143Q-103 -117 -91 -102Q-53 -122 -6 -122Q31 -122 42 -101T54 -24V463Q54 482 60 489T81 498T134 500V-36Q134 -111 106 -153T4 -196Q-50 -196 -76 -182ZM306 570T306 628Q306
+692 352 692Q374 692 383 679T392 634Q392 604 380 587T346 570Q306 570 306 628Z" />
+<glyph unicode="k" glyph-name="k" horiz-adv-x="376" d="M46 698Q46 717 52 724T74 733T127 735V464Q153 485 187 497T253 510Q338 510 338 424Q338 369 312 331T254 269Q293 252 320 209T354 100Q355 90 355 67Q355 43 352 16Q351 7 347 4T321 1T261 0Q265 29
+265 62Q265 93 260 123Q251 175 231 201T183 227Q176 227 172 226Q161 224 146 217T127 207V16Q127 7 124 4T101 1T46 0V698ZM249 314T249 397Q249 437 212 437Q166 437 127 389V265Q249 314 249 397Z" />
+<glyph unicode="l" glyph-name="l" horiz-adv-x="173" d="M46 698Q46 717 52 724T74 733T127 735V16Q127 7 123 4T100 1T46 0V698Z" />
+<glyph unicode="m" glyph-name="m" horiz-adv-x="564" d="M458 510T482 494T515 449T523 369V16Q523 7 519 4T495 1T442 0V370Q442 409 433 424T393 439Q356 439 325 420V16Q325 7 322 4T299 1T246 0H245V372Q245 400 242 413T229 433T195 440Q159 440 127 422V16Q127
+7 123 4T99 1T46 0V477Q119 510 197 510Q259 510 288 479Q313 493 346 501T410 510Q458 510 482 494Z" />
+<glyph unicode="n" glyph-name="n" horiz-adv-x="383" d="M45 476Q76 490 121 500T204 510Q282 510 313 480T344 376V16Q344 7 340 4T316 1T261 0V352Q261 402 249 421T201 440Q183 440 162 436T126 422V16Q126 7 122 4T98 1T45 0V476Z" />
+<glyph unicode="o" glyph-name="o" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135 400T115
+248Q115 168 123 127T146 72T186 58Q222 58 241 100Z" />
+<glyph unicode="p" glyph-name="p" horiz-adv-x="382" d="M63 -197T55 -190T46 -162V470Q109 510 192 510Q272 510 313 464T355 302Q355 121 313 56T206 -10Q180 -10 160 -2T127 18V-191Q108 -197 85 -197Q63 -197 55 -190ZM266 62T266 293Q266 352 258 384T233
+428T188 440Q154 440 127 421V95Q147 62 181 62Q266 62 266 293Z" />
+<glyph unicode="q" glyph-name="q" horiz-adv-x="387" d="M276 -198T261 -195V34Q231 -10 165 -10Q107 -10 69 38T30 218Q30 373 86 441T235 510Q269 510 294 503T342 479V-163Q342 -186 334 -191T294 -198Q276 -198 261 -195ZM215 60T233 73T261 112V426Q243
+440 215 440Q169 440 145 389T121 220Q121 127 141 94T195 61Q215 60 233 73Z" />
+<glyph unicode="r" glyph-name="r" horiz-adv-x="263" d="M45 465Q109 510 181 510Q218 510 234 500T251 468Q251 443 242 421Q221 433 194 433Q155 433 128 410L127 16Q127 7 123 4T99 1T45 0V465Z" />
+<glyph unicode="s" glyph-name="s" horiz-adv-x="346" d="M97 -10T64 3T30 40Q30 64 45 87Q86 63 144 63Q183 63 204 78T226 124Q226 146 217 165T186 203L89 286Q31 333 31 392Q31 447 72 478T195 510Q263 510 291 492T320 454Q320 445 315 434T303 413Q259 440
+204 440Q168 440 147 427T125 391Q125 376 133 363T165 329L258 254Q291 222 304 194T318 129Q318 63 274 27T152 -10Q97 -10 64 3Z" />
+<glyph unicode="t" glyph-name="t" horiz-adv-x="292" d="M141 -10T121 7T94 56T87 139V431H19Q19 458 20 474T24 495T36 500H87V652Q87 666 93 671T114 678T167 680V500H271Q271 473 270 456T266 435T254 431H167V139Q167 98 173 79T204 59Q220 59 232 62T262
+74Q268 54 268 34Q268 10 243 0T182 -10Q141 -10 121 7Z" />
+<glyph unicode="u" glyph-name="u" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8Z" />
+<glyph unicode="v" glyph-name="v" horiz-adv-x="344" d="M143 -6T135 6T121 43L19 475Q17 485 17 487Q17 494 23 496T51 499T104 500L136 339Q150 274 161 193T176 86H178Q181 111 192 192T216 340L243 482Q245 492 249 495T273 499T328 500L213 -3Q198 -6 156
+-6Q143 -6 135 6Z" />
+<glyph unicode="w" glyph-name="w" horiz-adv-x="541" d="M448 492T452 495T476 499T526 500Q510 421 466 209T418 -3Q415 -4 401 -5T366 -6Q354 -6 342 7T324 46L311 114Q288 220 274 363Q256 205 237 113L214 -3Q207 -4 188 -5T147 -6Q123 -6 113 43Q95 120
+61 276T16 483Q14 492 19 495T46 499T103 500L134 337Q146 267 156 191T169 93H175Q194 229 203 278L235 469Q237 480 241 483T261 486H314L353 276Q364 228 373 170T384 93H389Q393 140 402 210T421 337L446 482Q448 492 452 495Z" />
+<glyph unicode="x" glyph-name="x" horiz-adv-x="411" d="M395 9T395 8Q395 3 384 2T337 0H302L265 66Q243 107 199 201Q164 121 136 65L107 16Q103 8 96 5T68 1T15 0L157 260L35 487Q32 494 35 496T60 499T120 500L157 431Q185 379 211 317Q244 390 266 432L297
+486Q300 494 305 496T330 499T386 500L258 267L391 19Q395 9 395 8Z" />
+<glyph unicode="y" glyph-name="y" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192 154T208 261L253
+477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154Z" />
+<glyph unicode="z" glyph-name="z" horiz-adv-x="335" d="M33 1T30 5T24 19T21 40Q21 58 28 70L223 432H120Q63 432 28 427Q25 444 25 465Q25 483 31 491T51 500H306Q307 499 310 493T314 475Q314 456 305 436L115 75H204Q270 75 310 85Q312 77 312 50Q312 23
+306 12T280 0H34Q33 1 30 5Z" />
+<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="277" d="M154 -150T122 -117T89 -15Q89 26 96 80Q97 89 100 120T103 182Q103 220 90 237T48 260Q41 275 41 293Q41 321 58 333Q74 343 83 352T97 378T103 427Q103 458 100 492T96 536Q89 590 89 626Q89
+686 130 714T244 744Q260 722 260 694Q260 683 256 676T245 666Q208 663 190 644T171 585Q171 556 176 511Q182 445 182 403Q182 357 169 335T128 300Q155 289 168 268T182 205Q182 164 176 100Q171 53 171 22Q171 -15 180 -35T206 -63T253 -76Q255 -102 255 -106Q255
+-126 248 -138T227 -150Q154 -150 122 -117Z" />
+<glyph unicode="|" glyph-name="bar" horiz-adv-x="324" d="M122 793Q122 805 126 809T145 814T203 815V-180Q203 -191 199 -194T175 -199T122 -200V793Z" />
+<glyph unicode="}" glyph-name="braceright" horiz-adv-x="277" d="M18 -128T18 -100Q18 -75 33 -72Q106 -66 106 8Q106 28 102 84Q96 148 96 191Q96 237 109 259T149 294Q122 305 109 326T96 389Q96 430 102 494Q106 550 106 573Q106 610 97 629T71 657T25 670Q21
+686 21 701Q21 720 29 732T50 744Q123 744 155 711T188 609Q188 568 181 514Q180 505 177 474T174 412Q174 374 187 357T229 334Q236 317 236 301Q236 272 218 261Q201 250 193 242T180 216T174 167Q174 128 182 58Q188 -6 188 -32Q188 -92 146 -121T33 -150Q18
+-128 18 -100Z" />
+<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="400" d="M237 212T221 218T185 237Q169 247 158 251T132 256Q115 256 102 250T72 232Q58 221 46 218Q32 217 22 230T11 266Q26 289 61 309T140 329Q164 329 178 324T212 306Q228 296 240 291T270 286Q309
+286 341 320Q347 325 357 325Q370 325 380 311T391 277Q373 252 340 232T263 212Q237 212 221 218Z" />
+<glyph unicode="&#xa0;" glyph-name="uni00A0" horiz-adv-x="158" />
+<glyph unicode="&#xa1;" glyph-name="exclamdown" horiz-adv-x="195" d="M46 394T46 451Q46 476 61 492T102 508Q132 508 144 494T157 451Q157 427 142 411T102 394Q46 394 46 451ZM61 256Q62 274 69 281T91 291T141 293L155 -174Q155 -185 147 -190T117 -196T45
+-197L61 256Z" />
+<glyph unicode="&#xa2;" glyph-name="cent" horiz-adv-x="418" d="M277 64T299 71T335 88Q343 68 343 37Q343 23 319 9T263 -9V-102Q263 -121 247 -127T190 -133V-7Q154 -1 131 20T96 91T83 228Q83 471 213 504V592Q213 611 230 618T286 626V508Q310 503 327 494T345
+475Q345 437 337 417Q305 435 269 435Q239 435 217 421T179 362T164 231Q164 156 174 121T202 75T257 64Q277 64 299 71Z" />
+<glyph unicode="&#xa3;" glyph-name="sterling" horiz-adv-x="366" d="M322 74Q329 54 329 37Q329 0 277 0H89Q80 121 78 277H15Q15 320 17 333T31 347H78Q82 480 122 537T238 595Q280 595 309 582T338 542Q338 530 335 518T327 493Q294 514 256 514Q210 514 185
+479T158 347H288Q288 305 286 291T272 277H158Q160 146 165 80L322 74Z" />
+<glyph unicode="&#xa4;" glyph-name="currency" horiz-adv-x="571" d="M560 49Q535 24 525 15T507 6Q504 6 498 10L417 91Q371 52 286 52Q201 52 154 90L62 -2Q39 21 30 32T20 51Q20 56 24 60L110 146Q87 198 87 276Q87 350 107 401L12 496Q37 521 47 530T65 539Q69
+539 73 535L147 461Q198 506 291 506Q380 506 427 463L510 546Q534 522 543 512T552 493Q552 489 548 485L466 403Q484 357 484 286Q484 202 460 148L560 49ZM348 121T377 162T407 288Q407 365 380 402T295 439Q230 439 199 398T167 271Q167 195 196 158T288 121Q348
+121 377 162Z" />
+<glyph unicode="&#xa5;" glyph-name="yen" horiz-adv-x="418" d="M249 243H379Q379 205 373 191T347 176H249V16Q249 7 246 4T223 1T169 0V176H38Q38 215 44 229T70 243H169V284L149 341H38Q38 380 44 394T70 408H126L30 687Q28 694 32 696T59 699T122 700L161
+563Q179 505 193 449T209 372Q211 392 226 451T259 563L297 685Q300 693 304 696T329 699T384 700L288 408H378Q378 370 372 356T347 341H266L249 290V243Z" />
+<glyph unicode="&#xa6;" glyph-name="brokenbar" horiz-adv-x="227" d="M90 326T73 330V711Q73 729 82 736T115 743Q135 743 153 737V354Q153 337 146 332T112 326Q90 326 73 330ZM89 -198T73 -193V192Q73 210 82 217T115 225Q135 225 153 219V-169Q153 -187 146
+-192T112 -198Q89 -198 73 -193Z" />
+<glyph unicode="&#xa7;" glyph-name="section" horiz-adv-x="348" d="M264 201Q284 174 292 155T301 112Q301 58 259 27T150 -4Q106 -4 78 9T43 39Q40 44 40 55Q40 83 56 105Q90 81 137 81Q171 81 190 94T209 128Q209 142 202 154T179 185Q179 185 141 223Q94
+268 72 296Q53 320 45 340T36 388Q36 415 49 442T91 489L83 499Q63 524 55 543T46 587Q46 641 88 672T198 703Q242 703 269 690T304 661Q307 652 307 644Q307 617 291 595Q259 618 209 618Q175 618 157 605T138 571Q138 557 144 546T167 515Q181 500 202 480Q221
+462 242 441T275 404Q295 380 303 360T311 312Q311 286 297 259T255 212L264 201ZM151 300T171 284T196 264Q214 271 225 287T236 318Q236 335 229 350T207 384Q196 399 176 415T151 435Q133 429 122 413T111 382Q111 363 118 348T140 315Q151 300 171 284Z" />
+<glyph unicode="&#xa8;" glyph-name="dieresis" horiz-adv-x="269" d="M53 573T44 586T34 632Q34 659 45 674T78 689Q100 689 108 677T117 634Q117 604 106 588T73 572Q53 573 44 586ZM173 573T163 585T153 628Q153 689 197 689Q219 689 227 677T236 634Q234 572
+192 572Q173 573 163 585Z" />
+<glyph unicode="&#xa9;" glyph-name="copyright" horiz-adv-x="471" d="M133 320T85 371T36 541Q36 652 89 706T242 760Q343 760 389 711T436 543Q436 435 384 378T234 320Q133 320 85 371ZM296 378T335 418T375 544Q375 628 342 666T241 705Q96 705 96 541Q96
+452 129 415T232 378Q296 378 335 418ZM211 416T193 424T166 456T157 531Q157 613 183 640T249 668Q264 668 279 663T294 652Q294 644 288 620Q268 628 254 628Q231 628 218 609T204 529Q204 497 208 482T222 462T247 457Q266 457 286 467Q289 461 291 452T293
+437Q293 430 277 423T243 416Q211 416 193 424Z" />
+<glyph unicode="&#xaa;" glyph-name="ordfeminine" horiz-adv-x="323" d="M100 288T71 312T41 411Q41 478 69 506T150 534Q182 534 214 524V582Q214 615 198 627T152 639Q105 639 57 617Q47 630 47 652Q47 668 53 675Q85 710 176 710Q225 710 253 685T282 608V317Q259
+306 224 297T154 288Q100 288 71 312ZM179 346T193 349T214 358V468Q206 472 194 474T172 476Q138 476 122 464T105 409Q105 373 120 360T165 346Q179 346 193 349Z" />
+<glyph unicode="&#xab;" glyph-name="guillemotleft" horiz-adv-x="416" d="M156 16T120 70T51 181T18 253Q18 268 50 322T118 430T164 500Q178 500 188 491T205 472T212 459Q212 442 186 397T132 309T94 253Q103 240 132 198T187 109T214 47Q213 43 207 32T191
+11T167 0Q156 16 120 70ZM326 38T291 86T223 185T190 251Q190 265 222 315T288 414T334 477Q347 477 357 469T374 451T381 439Q381 423 356 381T303 301T267 251Q276 240 303 203T357 125T383 69Q382 66 376 55T360 34T337 24Q326 38 291 86Z" />
+<glyph unicode="&#xac;" glyph-name="logicalnot" horiz-adv-x="400" d="M358 111Q342 105 321 105Q304 105 293 111T282 131V232H40Q34 252 34 270Q34 287 40 297T60 308H358V111Z" />
+<glyph unicode="&#xad;" glyph-name="uni00AD" horiz-adv-x="278" d="M37 290T39 303T54 317H241Q241 275 239 261T225 247H37Q37 290 39 303Z" />
+<glyph unicode="&#xae;" glyph-name="registered" horiz-adv-x="471" d="M343 760T389 711T436 543Q436 435 384 378T234 320Q133 320 85 371T36 541Q36 652 89 706T242 760Q343 760 389 711ZM296 378T335 418T375 544Q375 628 342 666T241 705Q96 705 96 541Q96
+452 129 415T232 378Q296 378 335 418ZM288 517T300 492T315 426Q315 420 312 418T299 416Q281 416 274 417Q268 491 239 518Q235 517 227 517H214V425Q214 419 208 418T176 417V665Q176 666 177 668T183 670H227Q308 670 308 598Q308 550 274 529Q288 517 300
+492ZM219 551T230 551Q249 551 258 562T268 600Q268 618 260 627T232 637H214V552Q219 551 230 551Z" />
+<glyph unicode="&#xaf;" glyph-name="overscore" horiz-adv-x="269" d="M1 601T1 624Q1 642 10 652T34 663H261Q268 646 268 629Q268 611 260 599T238 587H6Q1 601 1 624Z" />
+<glyph unicode="&#xb0;" glyph-name="degree" horiz-adv-x="358" d="M129 553T107 573T84 649Q84 746 184 746Q233 746 254 725T276 650Q276 602 251 578T177 553Q129 553 107 573ZM223 604T223 650Q223 674 214 684T184 694Q161 694 150 684T138 648Q138 604
+179 604Q223 604 223 650Z" />
+<glyph unicode="&#xb1;" glyph-name="plusminus" horiz-adv-x="419" d="M385 359Q385 317 383 303T369 289H246V165Q246 154 232 152T175 149V289H35Q35 332 37 345T52 359H175V483Q175 494 189 496T246 499V359H385ZM34 58T36 71T51 85H384Q384 43 382 29T368
+15H34Q34 58 36 71Z" />
+<glyph unicode="&#xb2;" glyph-name="uni00B2" d="M41 301T41 315Q41 344 53 357Q77 385 138 444Q188 491 210 518T232 576Q232 600 219 614T168 628Q139 628 116 618T66 590Q57 606 54 616T51 639Q51 657 74 673T134 700T205 710Q274 710 302 683T330 604Q330
+556 300 515T212 416Q170 373 162 365H339Q344 342 344 330Q344 289 318 289H47Q41 301 41 315Z" />
+<glyph unicode="&#xb3;" glyph-name="uni00B3" d="M304 503T322 478T340 423Q340 352 292 316T165 279Q126 279 98 286T57 305Q45 314 45 335Q45 347 50 359T64 379Q103 353 161 353Q205 353 231 369T257 416Q257 438 242 452T199 470Q181 473 128 473Q126 476
+123 489T119 510Q119 535 144 535Q171 535 197 532Q218 548 227 562T236 594Q236 612 221 625T171 638Q113 638 67 605Q51 622 51 645Q51 663 61 671Q79 688 116 699T204 710Q266 710 295 686T325 620Q325 592 312 565T273 516Q304 503 322 478Z" />
+<glyph unicode="&#xb4;" glyph-name="acute" horiz-adv-x="271" d="M73 560T66 570T55 591T50 605Q82 641 129 681T184 722Q197 722 207 703T221 661Q209 648 158 611T81 560Q73 560 66 570Z" />
+<glyph unicode="&#xb5;" glyph-name="uni00B5" horiz-adv-x="395" d="M70 -195T45 -190V470Q45 488 54 496T86 505Q110 505 125 500V131Q125 98 143 82T195 66Q237 66 269 81V470Q269 488 277 496T308 505Q334 505 349 500V24Q317 9 277 0T194 -10Q146 -10 125
+15V-163Q125 -195 80 -195Q70 -195 45 -190Z" />
+<glyph unicode="&#xb6;" glyph-name="paragraph" horiz-adv-x="541" d="M289 -3T271 3V205Q257 198 235 194T191 190Q121 190 78 242T34 420Q34 569 86 639T231 710Q298 710 352 682V26Q352 -3 312 -3Q289 -3 271 3ZM430 -3T414 2V658Q414 676 423 683T456 690Q477
+690 495 684V26Q495 8 487 3T453 -3Q430 -3 414 2ZM226 255T243 258T271 269V630Q253 641 220 641Q169 641 143 588T116 428Q116 331 143 294T212 255Q226 255 243 258Z" />
+<glyph unicode="&#xb7;" glyph-name="middot" horiz-adv-x="220" d="M79 212T66 226T53 269Q53 293 68 309T109 326Q165 326 165 269Q165 244 150 228T109 212Q79 212 66 226Z" />
+<glyph unicode="&#xb8;" glyph-name="cedilla" horiz-adv-x="269" d="M177 -58T191 -74T206 -122Q206 -160 184 -183T126 -206Q107 -206 89 -200T70 -193Q71 -188 75 -172T83 -152Q86 -149 101 -156T128 -163Q159 -163 159 -129Q159 -95 129 -95Q113 -95 102 -97T88
+-101L107 2H152L140 -59Q141 -58 157 -58Q177 -58 191 -74Z" />
+<glyph unicode="&#xb9;" glyph-name="uni00B9" horiz-adv-x="382" d="M45 308T45 323Q45 345 50 355T72 365H166V622L58 600Q48 616 48 638Q48 666 74 676Q109 688 157 699T223 710Q241 710 247 707V365H334Q338 339 338 329Q338 307 333 298T313 289H49Q45 308 45 323Z" />
+<glyph unicode="&#xba;" glyph-name="ordmasculine" horiz-adv-x="338" d="M121 289T93 307T50 372T35 499Q35 607 71 658T174 710Q220 710 247 692T289 628T303 501Q303 394 268 342T165 289Q121 289 93 307ZM200 356T217 389T235 499Q235 580 221 609T175 639Q139
+639 121 606T103 494Q103 414 118 385T166 356Q200 356 217 389Z" />
+<glyph unicode="&#xbb;" glyph-name="guillemotright" horiz-adv-x="414" d="M244 1T233 6T211 21T200 46Q200 62 227 108T283 197T321 253Q312 266 284 308T229 396T203 459Q203 471 213 480T235 494T251 500Q262 484 297 431T364 323T396 253Q396 237 363 181T295
+71T248 0Q244 1 233 6ZM73 23T63 28T43 43T33 68Q33 84 59 124T112 202T149 250Q152 250 126 284Q84 343 60 382T35 439Q35 451 45 460T65 474T79 480Q90 465 125 416T192 316T224 250Q224 234 191 184T123 85T76 22Q73 23 63 28Z" />
+<glyph unicode="&#xbc;" glyph-name="onequarter" horiz-adv-x="959" d="M41 307T41 323Q41 345 46 355T68 365H162V622L54 600Q44 616 44 638Q44 665 71 676Q105 688 153 699T219 710Q237 710 244 707V365H330Q334 348 334 329Q334 307 329 298T310 289H46Q41
+307 41 323ZM324 -10T309 -2T281 19L617 691Q625 710 645 710Q658 710 673 703T700 682L361 5Q355 -10 337 -10Q324 -10 309 -2ZM808 -6T792 -2V70H621Q607 85 607 110Q607 125 614 143Q632 202 677 275T764 390Q780 409 796 415T834 421Q853 421 868 416V147H927Q934
+130 934 109Q934 91 927 81T909 70H868V19Q868 -6 825 -6Q808 -6 792 -2ZM795 141L799 329Q766 303 731 247T682 141H795Z" />
+<glyph unicode="&#xbd;" glyph-name="onehalf" horiz-adv-x="947" d="M41 307T41 323Q41 345 46 355T68 365H162V622L54 600Q44 616 44 638Q44 665 71 676Q105 688 153 699T219 710Q237 710 244 707V365H330Q334 348 334 329Q334 307 329 298T310 289H46Q41 307
+41 323ZM324 -10T309 -2T281 19L617 691Q625 710 645 710Q658 710 673 703T700 682L361 5Q355 -10 337 -10Q324 -10 309 -2ZM607 12T607 26Q607 55 619 68Q643 96 704 155Q754 202 776 229T798 287Q798 311 785 325T734 339Q706 339 682 329T632 301Q623 317 621
+327T618 350Q618 368 641 384T700 411T771 421Q840 421 868 394T896 315Q896 281 879 249T839 190T776 125Q735 84 728 76H905Q910 53 910 41Q910 0 884 0H613Q607 12 607 26Z" />
+<glyph unicode="&#xbe;" glyph-name="threequarters" horiz-adv-x="961" d="M300 503T318 478T336 423Q336 352 288 316T161 279Q122 279 95 286T54 305Q41 314 41 335Q41 347 46 359T61 379Q98 353 158 353Q202 353 227 369T253 416Q253 438 238 452T196 470Q177
+473 124 473Q122 476 119 489T115 510Q115 535 140 535Q169 535 194 532Q215 547 223 561T232 594Q232 612 217 625T168 638Q109 638 64 605Q48 622 48 646Q48 664 57 671Q75 688 112 699T201 710Q262 710 291 686T321 620Q321 592 308 565T269 516Q300 503 318
+478ZM326 -10T311 -2T283 19L619 691Q627 710 647 710Q660 710 675 703T702 682L363 5Q357 -10 339 -10Q326 -10 311 -2ZM810 -6T794 -2V70H623Q609 85 609 110Q609 125 616 143Q634 202 679 275T766 390Q782 409 798 415T836 421Q855 421 870 416V147H929Q936
+130 936 109Q936 91 929 81T911 70H870V19Q870 -6 827 -6Q810 -6 794 -2ZM797 141L801 329Q768 303 733 247T684 141H797Z" />
+<glyph unicode="&#xbf;" glyph-name="questiondown" horiz-adv-x="306" d="M138 392T125 407T111 450Q111 474 126 490T167 506Q197 506 210 492T223 450Q223 426 208 409T167 392Q138 392 125 407ZM89 -195T52 -160T14 -56Q14 3 33 43T89 131Q117 170 125 184Q137
+205 137 232Q137 242 132 272Q130 281 130 288T131 298Q141 308 176 308Q188 308 204 306Q205 304 208 295T215 270T219 236Q219 198 201 163Q186 135 156 93Q127 49 114 23T101 -37Q101 -114 182 -114Q228 -114 266 -89Q278 -119 278 -153Q278 -170 239 -182T153
+-195Q89 -195 52 -160Z" />
+<glyph unicode="&#xc0;" glyph-name="Agrave" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM253 768T202 804T140 855Q144 877 154 896T177 916Q184 916 232 875T311 798Q310 795 306 784T295 763T280 753Q253 768 202 804Z" />
+<glyph unicode="&#xc1;" glyph-name="Aacute" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM163 760T156 770T145 791T140 805Q172 841 219 881T274 922Q287 922 297 903T311 861Q299 848 248 811T171 760Q163 760 156 770Z" />
+<glyph unicode="&#xc2;" glyph-name="Acircumflex" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208
+499 183 395L149 251H288ZM279 770T255 796T222 838Q218 832 203 814T172 779T147 762Q111 762 92 785L206 908Q214 911 223 911Q237 911 248 899Q255 892 278 867T323 817T345 784Q345 774 328 768T288 761Q279 770 255 796Z" />
+<glyph unicode="&#xc3;" glyph-name="Atilde" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM238 763T227 770T205 790Q195 801 188 806T170 811Q156 811 147 804T127 785T111 772Q101 772 93 781T79 799T72 812Q96 851 125 869T185 887Q200 887 209 881T230 863Q241 851 250 845T272 839Q292 839 302 846T322 866T337 878Q345 878
+351 868T361 847T366 833Q362 824 347 808T309 777T258 763Q238 763 227 770Z" />
+<glyph unicode="&#xc4;" glyph-name="Adieresis" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208
+499 183 395L149 251H288ZM137 773T128 786T118 832Q118 859 129 874T162 889Q184 889 192 877T201 834Q201 804 190 788T157 772Q137 773 128 786ZM257 773T247 785T237 828Q237 889 281 889Q303 889 311 877T320 834Q318 772 276 772Q257 773 247 785Z" />
+<glyph unicode="&#xc5;" glyph-name="Aring" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM169 743T146 764T123 839Q123 888 149 912T223 937Q271 937 293 916T315 840Q315 792 290 768T216 743Q169 743 146 764ZM259 797T259 840Q259 862 250 871T223 881Q180 881 180 838Q180 818 189 808T218 797Q259 797 259 840Z" />
+<glyph unicode="&#xc6;" glyph-name="AE" horiz-adv-x="615" d="M420 73H592Q592 44 592 26T588 4T576 0H340V178H174L105 14Q102 5 95 2T68 -2Q45 -2 17 1L311 686Q317 700 337 700H596Q596 672 596 654T592 632T581 627H420V418H571Q571 391 571 373T567 350T556
+344H420V73ZM340 251V615Q304 490 264 392L205 251H340Z" />
+<glyph unicode="&#xc7;" glyph-name="Ccedilla" horiz-adv-x="341" d="M243 79T268 88T308 111Q320 85 320 62Q320 35 293 15T220 -9L210 -59Q211 -58 227 -58Q247 -58 261 -74T276 -122Q276 -160 254 -183T196 -206Q177 -206 159 -200T140 -193Q141 -188 145
+-172T153 -152Q156 -149 171 -156T198 -163Q229 -163 229 -129Q229 -95 199 -95Q183 -95 172 -97T158 -101L175 -9Q128 -6 97 21T48 120T30 321Q30 480 59 566T130 681T227 710Q277 710 299 694T321 655Q321 628 308 606Q277 631 243 631Q206 631 178 608T133 517T115
+325Q115 227 127 173T161 99T215 79Q243 79 268 88Z" />
+<glyph unicode="&#xc8;" glyph-name="Egrave" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM204 768T153 804T91 855Q95
+877 105 896T128 916Q135 916 183 875T262 798Q261 795 257 784T246 763T231 753Q204 768 153 804Z" />
+<glyph unicode="&#xc9;" glyph-name="Eacute" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM114 760T107 770T96 791T91
+805Q123 841 170 881T225 922Q238 922 248 903T262 861Q250 848 199 811T122 760Q114 760 107 770Z" />
+<glyph unicode="&#xca;" glyph-name="Ecircumflex" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM230 770T206 796T173
+838Q169 832 154 814T123 779T98 762Q62 762 43 785L157 908Q165 911 174 911Q188 911 199 899Q206 892 229 867T274 817T296 784Q296 774 279 768T239 761Q230 770 206 796Z" />
+<glyph unicode="&#xcb;" glyph-name="Edieresis" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM88 773T79 786T69 832Q69
+859 80 874T113 889Q135 889 143 877T152 834Q152 804 141 788T108 772Q88 773 79 786ZM208 773T198 785T188 828Q188 889 232 889Q254 889 262 877T271 834Q269 772 227 772Q208 773 198 785Z" />
+<glyph unicode="&#xcc;" glyph-name="Igrave" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM119 768T68 804T6 855Q10 877 20 896T43 916Q50 916 98 875T177 798Q176 795 172 784T161 763T146 753Q119 768 68 804Z" />
+<glyph unicode="&#xcd;" glyph-name="Iacute" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM29 760T22 770T11 791T6 805Q38 841 85 881T140 922Q153 922 163 903T177 861Q165 848 114 811T37 760Q29 760 22 770Z" />
+<glyph unicode="&#xce;" glyph-name="Icircumflex" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM145 770T121 796T88 838Q84 832 69 814T38 779T13 762Q-23 762 -42 785L72 908Q80 911 89 911Q103 911 114 899Q121
+892 144 867T189 817T211 784Q211 774 194 768T154 761Q145 770 121 796Z" />
+<glyph unicode="&#xcf;" glyph-name="Idieresis" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM3 773T-6 786T-16 832Q-16 859 -5 874T28 889Q50 889 58 877T67 834Q67 804 56 788T23 772Q3 773 -6 786ZM123 773T113
+785T103 828Q103 889 147 889Q169 889 177 877T186 834Q184 772 142 772Q123 773 113 785Z" />
+<glyph unicode="&#xd0;" glyph-name="Eth" horiz-adv-x="388" d="M237 700T279 672T342 577T364 394Q364 247 342 160T276 37T169 0H44V331H5Q5 374 7 387T21 401H44V681Q44 691 50 695T71 700H169Q237 700 279 672ZM201 77T223 100T259 193T273 394Q273 485 262
+535T229 606T171 626H125V401H205Q205 359 203 345T188 331H125V77H171Q201 77 223 100Z" />
+<glyph unicode="&#xd1;" glyph-name="Ntilde" horiz-adv-x="444" d="M320 693T324 696T348 699T401 700V16Q401 0 384 0H324L209 275Q185 339 114 560Q118 517 121 416T124 259V16Q124 7 121 4T97 1T44 0V684Q44 700 60 700H121L234 430Q247 395 308 211Q312 199
+330 146V149Q325 188 323 290T320 448V684Q320 693 324 696ZM241 763T230 770T208 790Q198 801 191 806T173 811Q159 811 150 804T130 785T114 772Q104 772 96 781T82 799T75 812Q99 851 128 869T188 887Q203 887 212 881T233 863Q244 851 253 845T275 839Q295
+839 305 846T325 866T340 878Q348 878 354 868T364 847T369 833Q365 824 350 808T312 777T261 763Q241 763 230 770Z" />
+<glyph unicode="&#xd2;" glyph-name="Ograve" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM249 768T198 804T136 855Q140 877 150 896T173 916Q180 916 228 875T307 798Q306 795 302 784T291 763T276 753Q249 768 198 804Z" />
+<glyph unicode="&#xd3;" glyph-name="Oacute" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM159 760T152 770T141 791T136 805Q168 841 215 881T270 922Q283 922 293 903T307 861Q295 848 244 811T167 760Q159 760 152 770Z" />
+<glyph unicode="&#xd4;" glyph-name="Ocircumflex" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312
+459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM275 770T251 796T218 838Q214 832 199 814T168 779T143 762Q107 762 88 785L202 908Q210 911 219 911Q233 911 244 899Q251 892 274 867T319 817T341
+784Q341 774 324 768T284 761Q275 770 251 796Z" />
+<glyph unicode="&#xd5;" glyph-name="Otilde" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM234 763T223 770T201 790Q191 801 184 806T166 811Q152 811 143 804T123 785T107 772Q97 772 89 781T75 799T68 812Q92 851 121 869T181 887Q196 887
+205 881T226 863Q237 851 246 845T268 839Q288 839 298 846T318 866T333 878Q341 878 347 868T357 847T362 833Q358 824 343 808T305 777T254 763Q234 763 223 770Z" />
+<glyph unicode="&#xd6;" glyph-name="Odieresis" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312
+459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM133 773T124 786T114 832Q114 859 125 874T158 889Q180 889 188 877T197 834Q197 804 186 788T153 772Q133 773 124 786ZM253 773T243 785T233 828Q233
+889 277 889Q299 889 307 877T316 834Q314 772 272 772Q253 773 243 785Z" />
+<glyph unicode="&#xd7;" glyph-name="multiply" horiz-adv-x="418" d="M257 281L345 183Q319 157 309 149T292 140Q290 140 284 144L209 228L133 144Q127 140 125 140Q118 140 108 148T72 183L160 281L71 381Q76 386 90 399T111 418T124 423Q129 423 133 419L209
+335L284 419Q288 423 293 423Q300 423 308 416T329 398T346 381L257 281Z" />
+<glyph unicode="&#xd8;" glyph-name="Oslash" horiz-adv-x="436" d="M415 685T381 585Q403 506 403 357Q403 220 383 140T322 25T214 -10Q174 -10 145 0T94 35Q81 -1 73 -16Q59 -16 43 -9T24 9Q23 12 35 44T59 102Q33 183 33 354Q33 486 53 564T114 676T222 710Q262
+710 291 699T341 664Q359 712 363 719Q367 719 378 717T401 709T414 694Q415 685 381 585ZM186 628T165 600T134 507T124 334Q124 228 132 176L281 599Q261 628 222 628Q186 628 165 600ZM247 73T269 95T303 178T315 355Q315 463 307 516Q249 349 157 98Q176 73
+211 73Q247 73 269 95Z" />
+<glyph unicode="&#xd9;" glyph-name="Ugrave" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10
+109 18ZM253 768T202 804T140 855Q144 877 154 896T177 916Q184 916 232 875T311 798Q310 795 306 784T295 763T280 753Q253 768 202 804Z" />
+<glyph unicode="&#xda;" glyph-name="Uacute" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10
+109 18ZM163 760T156 770T145 791T140 805Q172 841 219 881T274 922Q287 922 297 903T311 861Q299 848 248 811T171 760Q163 760 156 770Z" />
+<glyph unicode="&#xdb;" glyph-name="Ucircumflex" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148
+-10 109 18ZM279 770T255 796T222 838Q218 832 203 814T172 779T147 762Q111 762 92 785L206 908Q214 911 223 911Q237 911 248 899Q255 892 278 867T323 817T345 784Q345 774 328 768T288 761Q279 770 255 796Z" />
+<glyph unicode="&#xdc;" glyph-name="Udieresis" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148
+-10 109 18ZM137 773T128 786T118 832Q118 859 129 874T162 889Q184 889 192 877T201 834Q201 804 190 788T157 772Q137 773 128 786ZM257 773T247 785T237 828Q237 889 281 889Q303 889 311 877T320 834Q318 772 276 772Q257 773 247 785Z" />
+<glyph unicode="&#xdd;" glyph-name="Yacute" horiz-adv-x="364" d="M225 16Q225 7 222 4T198 1T144 0V285L6 687Q4 694 8 696T35 699T97 700L137 563Q152 516 168 446T187 353Q189 375 206 445T238 563L273 685Q275 693 279 696T304 699T360 700L225 290V16ZM126
+760T119 770T108 791T103 805Q135 841 182 881T237 922Q250 922 260 903T274 861Q262 848 211 811T134 760Q126 760 119 770Z" />
+<glyph unicode="&#xde;" glyph-name="Thorn" horiz-adv-x="361" d="M44 680Q44 693 54 696T98 700H124V566H159Q254 566 298 519T343 369Q343 253 293 202T160 150H124V16Q124 7 120 4T96 1T44 0V680ZM212 225T233 260T254 378Q254 435 236 465T174 495Q139 495
+124 493V228Q131 228 144 227T168 225Q212 225 233 260Z" />
+<glyph unicode="&#xdf;" glyph-name="germandbls" horiz-adv-x="465" d="M65 -9T52 -4T39 2Q40 4 42 13T47 38T50 74L48 550Q48 629 90 667T208 705Q277 705 322 685T388 631T409 561Q409 529 394 510T348 467Q323 449 312 436T300 403Q300 385 313 368T355 325Q387
+294 407 270T441 213T456 138Q456 70 416 31T306 -9Q269 -9 242 -2T201 15T187 36Q187 69 208 90Q217 81 238 72T288 63Q324 63 345 82T366 137Q366 172 347 201T288 270Q250 309 231 337T212 399Q212 432 228 452T276 497Q300 515 311 528T323 560Q323 589 295
+609T214 630Q166 630 148 601T129 504L131 44Q131 14 122 3T84 -9Q65 -9 52 -4Z" />
+<glyph unicode="&#xe0;" glyph-name="agrave" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM209 568T158 604T96 655Q100 677 110 696T133 716Q140 716 188 675T267 598Q266
+595 262 584T251 563T236 553Q209 568 158 604Z" />
+<glyph unicode="&#xe1;" glyph-name="aacute" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM119 560T112 570T101 591T96 605Q128 641 175 681T230 722Q243 722 253 703T267
+661Q255 648 204 611T127 560Q119 560 112 570Z" />
+<glyph unicode="&#xe2;" glyph-name="acircumflex" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288
+482T317 388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM235 570T211 596T178 638Q174 632 159 614T128 579T103 562Q67 562
+48 585L162 708Q170 711 179 711Q193 711 204 699Q211 692 234 667T279 617T301 584Q301 574 284 568T244 561Q235 570 211 596Z" />
+<glyph unicode="&#xe3;" glyph-name="atilde" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM194 563T183 570T161 590Q151 601 144 606T126 611Q112 611 103 604T83 585T67
+572Q57 572 49 581T35 599T28 612Q52 651 81 669T141 687Q156 687 165 681T186 663Q197 651 206 645T228 639Q248 639 258 646T278 666T293 678Q301 678 307 668T317 647T322 633Q318 624 303 608T265 577T214 563Q194 563 183 570Z" />
+<glyph unicode="&#xe4;" glyph-name="adieresis" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288
+482T317 388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM93 573T84 586T74 632Q74 659 85 674T118 689Q140 689 148 677T157
+634Q157 604 146 588T113 572Q93 573 84 586ZM213 573T203 585T193 628Q193 689 237 689Q259 689 267 677T276 634Q274 572 232 572Q213 573 203 585Z" />
+<glyph unicode="&#xe5;" glyph-name="aring" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM125 543T102 564T79 639Q79 688 105 712T179 737Q227 737 249 716T271 640Q271
+592 246 568T172 543Q125 543 102 564ZM215 597T215 640Q215 662 206 671T179 681Q136 681 136 638Q136 618 145 608T174 597Q215 597 215 640Z" />
+<glyph unicode="&#xe6;" glyph-name="ae" horiz-adv-x="583" d="M478 69T532 100Q539 79 539 28Q539 21 520 13T468 -2T401 -9Q367 -9 344 -3T302 20Q255 -9 164 -9Q122 -9 94 1T47 46T29 148Q29 319 160 319Q210 319 236 306V378Q236 412 218 425T168 438Q93
+438 42 411Q32 429 32 459Q32 466 35 472T42 483Q58 494 98 502T197 510Q238 510 262 497T296 453Q317 487 346 498T418 510Q545 510 545 351Q545 270 534 220Q497 214 445 214Q383 214 324 225Q324 157 333 124T360 80T410 69Q478 69 532 100ZM376 439T354 406T326
+289Q388 277 426 277Q446 277 462 280Q467 303 467 342Q466 397 454 418T409 439Q376 439 354 406ZM236 250Q217 258 189 258Q154 258 134 235T113 149Q113 110 121 90T142 64T178 58Q195 58 212 62T236 74V250Z" />
+<glyph unicode="&#xe7;" glyph-name="ccedilla" horiz-adv-x="313" d="M227 62T248 68T284 85Q292 56 292 41Q292 20 262 6T184 -10L174 -59Q175 -58 191 -58Q211 -58 225 -74T240 -122Q240 -160 218 -183T160 -206Q141 -206 123 -200T104 -193Q105 -188 109 -172T117
+-152Q120 -149 135 -156T162 -163Q193 -163 193 -129Q193 -95 163 -95Q147 -95 136 -97T122 -101L139 -7Q102 -1 79 23T43 99T31 239Q31 400 81 455T210 510Q246 510 270 497T294 465Q294 442 285 420Q251 439 214 439Q170 439 142 399T114 238Q114 169 123 131T152
+77T204 62Q227 62 248 68Z" />
+<glyph unicode="&#xe8;" glyph-name="egrave" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM223 568T172 604T110 655Q114 677 124 696T147 716Q154 716 202 675T281 598Q280 595 276 584T265 563T250 553Q223 568
+172 604Z" />
+<glyph unicode="&#xe9;" glyph-name="eacute" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM133 560T126 570T115 591T110 605Q142 641 189 681T244 722Q257 722 267 703T281 661Q269 648 218 611T141 560Q133 560
+126 570Z" />
+<glyph unicode="&#xea;" glyph-name="ecircumflex" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150
+125 121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM249 570T225 596T192 638Q188 632 173 614T142 579T117 562Q81 562 62 585L176 708Q184 711 193 711Q207 711 218
+699Q225 692 248 667T293 617T315 584Q315 574 298 568T258 561Q249 570 225 596Z" />
+<glyph unicode="&#xeb;" glyph-name="edieresis" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM107 573T98 586T88 632Q88 659 99 674T132 689Q154 689 162 677T171 634Q171 604 160 588T127 572Q107 573 98 586ZM227
+573T217 585T207 628Q207 689 251 689Q273 689 281 677T290 634Q288 572 246 572Q227 573 217 585Z" />
+<glyph unicode="&#xec;" glyph-name="igrave" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM377 568T326 604T264 655Q268 677 278 696T301 716Q308 716 356 675T435 598Q434 595 430 584T419 563T404 553Q377
+568 326 604Z" />
+<glyph unicode="&#xed;" glyph-name="iacute" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM31 560T24 570T13 591T8 605Q40 641 87 681T142 722Q155 722 165 703T179 661Q167 648 116 611T39 560Q31 560 24 570Z" />
+<glyph unicode="&#xee;" glyph-name="icircumflex" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM147 570T123 596T90 638Q86 632 71 614T40 579T15 562Q-21 562 -40 585L74 708Q82 711 91 711Q105 711 116 699Q123
+692 146 667T191 617T213 584Q213 574 196 568T156 561Q147 570 123 596Z" />
+<glyph unicode="&#xef;" glyph-name="idieresis" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM261 573T252 586T242 632Q242 659 253 674T286 689Q308 689 316 677T325 634Q325 604 314 588T281 572Q261 573 252
+586ZM381 573T371 585T361 628Q361 689 405 689Q427 689 435 677T444 634Q442 572 400 572Q381 573 371 585Z" />
+<glyph unicode="&#xf0;" glyph-name="eth" horiz-adv-x="408" d="M380 504T380 289Q380 149 344 70T209 -10Q116 -10 73 51T30 257Q30 378 73 443T190 509Q244 509 278 480Q260 547 224 602L129 565Q121 585 116 600T111 623Q111 633 119 637L177 659Q163 675
+125 707Q134 724 150 734T183 744Q203 744 213 732Q233 716 257 690L326 717Q334 697 339 682T344 659Q344 649 336 646L300 632Q380 504 380 289ZM263 58T280 116T298 286Q298 349 293 388Q264 437 212 437Q163 437 138 383T112 244Q112 58 207 58Q263 58 280
+116Z" />
+<glyph unicode="&#xf1;" glyph-name="ntilde" horiz-adv-x="383" d="M45 476Q76 490 121 500T204 510Q282 510 313 480T344 376V16Q344 7 340 4T316 1T261 0V352Q261 402 249 421T201 440Q183 440 162 436T126 422V16Q126 7 122 4T98 1T45 0V476ZM211 563T200
+570T178 590Q168 601 161 606T143 611Q129 611 120 604T100 585T84 572Q74 572 66 581T52 599T45 612Q69 651 98 669T158 687Q173 687 182 681T203 663Q214 651 223 645T245 639Q265 639 275 646T295 666T310 678Q318 678 324 668T334 647T339 633Q335 624 320
+608T282 577T231 563Q211 563 200 570Z" />
+<glyph unicode="&#xf2;" glyph-name="ograve" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM224 568T173 604T111 655Q115 677 125 696T148 716Q155 716 203 675T282 598Q281 595 277 584T266 563T251 553Q224 568 173 604Z" />
+<glyph unicode="&#xf3;" glyph-name="oacute" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM134 560T127 570T116 591T111 605Q143 641 190 681T245 722Q258 722 268 703T282 661Q270 648 219 611T142 560Q134 560 127 570Z" />
+<glyph unicode="&#xf4;" glyph-name="ocircumflex" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442
+135 400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM250 570T226 596T193 638Q189 632 174 614T143 579T118 562Q82 562 63 585L177 708Q185 711 194 711Q208 711 219 699Q226 692 249 667T294 617T316 584Q316 574 299 568T259 561Q250 570 226 596Z"
+/>
+<glyph unicode="&#xf5;" glyph-name="otilde" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM209 563T198 570T176 590Q166 601 159 606T141 611Q127 611 118 604T98 585T82 572Q72 572 64 581T50 599T43 612Q67 651 96 669T156 687Q171 687 180 681T201 663Q212 651 221 645T243 639Q263 639
+273 646T293 666T308 678Q316 678 322 668T332 647T337 633Q333 624 318 608T280 577T229 563Q209 563 198 570Z" />
+<glyph unicode="&#xf6;" glyph-name="odieresis" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442
+135 400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM108 573T99 586T89 632Q89 659 100 674T133 689Q155 689 163 677T172 634Q172 604 161 588T128 572Q108 573 99 586ZM228 573T218 585T208 628Q208 689 252 689Q274 689 282 677T291 634Q289 572
+247 572Q228 573 218 585Z" />
+<glyph unicode="&#xf7;" glyph-name="divide" horiz-adv-x="418" d="M181 376T170 389T159 427Q159 448 172 463T208 478Q258 478 258 427Q258 405 245 391T208 376Q181 376 170 389ZM34 290T36 303T51 317H384Q384 275 382 261T368 247H34Q34 290 36 303ZM181
+81T170 94T159 132Q159 153 172 168T208 183Q258 183 258 132Q258 110 245 96T208 81Q181 81 170 94Z" />
+<glyph unicode="&#xf8;" glyph-name="oslash" horiz-adv-x="412" d="M403 484T388 454T356 395Q369 343 369 252Q369 116 329 53T207 -10Q167 -10 140 -2T93 29L62 -26Q46 -23 32 -14T17 8Q17 14 63 92Q48 149 48 250Q48 510 213 510Q250 510 277 501T323 468Q351
+515 357 522Q360 521 371 517T393 506T403 489Q403 484 388 454ZM174 440T155 399T135 248Q135 216 137 176L266 404Q257 425 244 432T211 440Q174 440 155 399ZM243 58T262 100T282 252Q282 298 279 331Q275 323 194 179L150 101Q158 76 172 67T207 58Q243 58
+262 100Z" />
+<glyph unicode="&#xf9;" glyph-name="ugrave" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM229
+568T178 604T116 655Q120 677 130 696T153 716Q160 716 208 675T287 598Q286 595 282 584T271 563T256 553Q229 568 178 604Z" />
+<glyph unicode="&#xfa;" glyph-name="uacute" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM139
+560T132 570T121 591T116 605Q148 641 195 681T250 722Q263 722 273 703T287 661Q275 648 224 611T147 560Q139 560 132 570Z" />
+<glyph unicode="&#xfb;" glyph-name="ucircumflex" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103
+8ZM255 570T231 596T198 638Q194 632 179 614T148 579T123 562Q87 562 68 585L182 708Q190 711 199 711Q213 711 224 699Q231 692 254 667T299 617T321 584Q321 574 304 568T264 561Q255 570 231 596Z" />
+<glyph unicode="&#xfc;" glyph-name="udieresis" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM113
+573T104 586T94 632Q94 659 105 674T138 689Q160 689 168 677T177 634Q177 604 166 588T133 572Q113 573 104 586ZM233 573T223 585T213 628Q213 689 257 689Q279 689 287 677T296 634Q294 572 252 572Q233 573 223 585Z" />
+<glyph unicode="&#xfd;" glyph-name="yacute" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192 154T208
+261L253 477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154ZM122 560T115 570T104 591T99 605Q131 641 178 681T233 722Q246 722 256 703T270 661Q258 648 207 611T130 560Q122 560 115 570Z" />
+<glyph unicode="&#xfe;" glyph-name="thorn" d="M273 509T314 463T355 300Q355 123 309 57T203 -10Q153 -10 127 16V-194Q108 -200 79 -200Q58 -200 52 -194T46 -166V698Q46 717 52 724T74 733T127 735V502Q156 509 192 509Q273 509 314 463ZM212 60T239 109T266
+293Q266 354 257 385T232 428T188 439Q154 439 127 418V88Q143 59 178 59Q212 60 239 109Z" />
+<glyph unicode="&#xff;" glyph-name="ydieresis" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192
+154T208 261L253 477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154ZM96 573T87 586T77 632Q77 659 88 674T121 689Q143 689 151 677T160 634Q160 604 149 588T116 572Q96 573 87 586ZM216 573T206 585T196 628Q196
+689 240 689Q262 689 270 677T279 634Q277 572 235 572Q216 573 206 585Z" />
+<glyph unicode="&#x2013;" glyph-name="endash" horiz-adv-x="424" d="M37 290T39 303T54 317H387Q387 275 385 261T371 247H37Q37 290 39 303Z" />
+<glyph unicode="&#x2014;" glyph-name="emdash" horiz-adv-x="700" d="M6 290T8 303T22 317H694Q694 275 692 261T678 247H6Q6 290 8 303Z" />
+<glyph unicode="&#x2018;" glyph-name="quoteleft" horiz-adv-x="174" d="M34 575T34 634Q34 668 48 705T80 769T108 795Q135 795 140 772Q127 747 122 725T115 676Q138 661 138 627Q138 605 124 590T88 575Q34 575 34 634Z" />
+<glyph unicode="&#x2019;" glyph-name="quoteright" horiz-adv-x="174" d="M41 572T34 595Q48 621 52 642T59 692Q36 706 36 740Q36 763 50 777T86 792Q141 792 141 733Q141 699 127 662T94 598T66 572Q41 572 34 595Z" />
+<glyph unicode="&#x201a;" glyph-name="quotesinglbase" horiz-adv-x="170" d="M41 -114T34 -91Q48 -66 52 -45T59 5Q36 19 36 54Q36 76 50 91T86 106Q141 106 141 47Q141 13 127 -24T94 -88T66 -114Q41 -114 34 -91Z" />
+<glyph unicode="&#x201c;" glyph-name="quotedblleft" horiz-adv-x="324" d="M34 575T34 634Q34 668 48 705T80 769T108 795Q135 795 140 772Q127 747 122 725T115 676Q138 661 138 627Q138 605 124 590T88 575Q34 575 34 634ZM184 575T184 634Q184 668 198 705T230
+769T258 795Q285 795 290 772Q276 747 272 726T265 676Q288 661 288 627Q288 605 274 590T238 575Q184 575 184 634Z" />
+<glyph unicode="&#x201d;" glyph-name="quotedblright" horiz-adv-x="324" d="M41 572T34 595Q48 621 52 642T59 692Q36 706 36 740Q36 763 50 777T86 792Q141 792 141 733Q141 699 127 662T94 598T66 572Q41 572 34 595ZM189 572T184 595Q198 621 202 642T209
+692Q186 706 186 740Q186 763 200 777T236 792Q291 792 291 733Q291 699 277 662T244 598T216 572Q189 572 184 595Z" />
+<glyph unicode="&#x201e;" glyph-name="quotedblbase" horiz-adv-x="321" d="M41 -114T34 -91Q48 -66 52 -45T59 5Q36 19 36 54Q36 76 50 91T86 106Q141 106 141 47Q141 13 127 -24T94 -88T66 -114Q41 -114 34 -91ZM189 -114T184 -91Q198 -66 202 -45T209 5Q186
+19 186 54Q186 76 200 91T236 106Q291 106 291 47Q291 13 277 -24T244 -88T216 -114Q189 -114 184 -91Z" />
+<glyph unicode="&#x2022;" glyph-name="bullet" horiz-adv-x="223" d="M75 208T58 227T41 284Q41 316 61 338T114 361Q153 361 171 341T189 284Q189 251 169 230T114 208Q75 208 58 227Z" />
+<glyph unicode="&#x2039;" glyph-name="guilsinglleft" horiz-adv-x="247" d="M156 16T120 69T51 178T18 250Q18 265 50 320T118 430T164 500Q178 500 188 491T205 472T212 459Q212 442 186 396T132 306T94 250Q103 238 132 196T187 109T214 47Q213 43 207 32T191
+11T167 0Q156 16 120 69Z" />
+<glyph unicode="&#x203a;" glyph-name="guilsinglright" horiz-adv-x="247" d="M77 1T66 6T44 21T33 46Q33 62 59 107T115 195T153 250Q144 263 116 306T61 395T35 459Q35 471 45 480T67 494T83 500Q94 484 129 430T196 321T229 250Q229 234 196 179T128 70T81
+0Q77 1 66 6Z" />
+</font>
+</defs>
+</svg>
diff --git a/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.ttf b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6f4feb02d14c849ba1fb7dc112243386b2ad8f2f
GIT binary patch
literal 39168
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
C10J6M

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.woff b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.woff
new file mode 100644
index 0000000000000000000000000000000000000000..ddccf765c758d5a4c8a96914418caedbb757ca8f
GIT binary patch
literal 22256
zcmYg$V{|4>wDl8fVka}PZQHhO+qP{R6I&D8w#^AAeByk0?{|OPTD{j<XV*U6)vLOz
z>QuM8yqFjO1n^zd{sEBxvzdTz|9_bOy#HIoMMTBED+9hcwQsnA7lBucE66K<b87$q
z1Tz4DSiWUBA0e)+Dg*#P{rJ{2eb@0M`g@MaE7LQ5bA8{O>^BS;4{Jn>Z4Dg&0BEFd
zO)>xgs)Aeb-e~ORLI423lzeNrzmY;e3u|iTU~c=(?EwIgC;$LFhMS4Mm${+ycP!$=
zw+8xufn;vuY4**%0|5Nd0D!ezjh4lhg{h$l03aXntzr8QFi#RD7T@GI*Z1w?e}e>)
z5KP^|*2UwS+xu?I_c_7JWfCv}HulEfI>n`LZsk9yE%EBx8hU(RSGoE-j^IClsv#8E
z8QPkDb5q}b&9^S#S1QMqgT1p00HEUY?QeYFTg|3U-JFAy>36J}#<wo*8^z5G;}#wp
zq(h8w0st(?{WlX~rZJi-CMh#TNNiF~c$35w{u^5NM}vUbeBqGjaAc&32o16lCgOC6
z(&}c##j!NGryouxNzBnY>qj$$@^qfohx@~PI`lB|0D#9vZW>tqwg=X*Kl}J2^M#x3
zX6yIS%{{X5ZFg#Hfy=K?+01R3W_rvwZnKg1t7XXvAX1lO4I$h&9l-wP9GBrx^TnG>
zR64%&mPo+V5>=1e$SQb<d9KrbdoztMIOyEw&nmTAxSmy{za5grJn=Vfq#zJP=T6#b
zU)A181YUX2MZl)21sVPNP_{|GdhDl8U+dsY*=%!Sn<V(V59PPyxs&W<7ZY0?kL+=m
zAb3Fn<6ktWd_WrTH<p*5Hb0?7>-lZPPF0_)!{$7FaAlY4<CfU*H+2n?`#vRj@?*W@
z&{Wj&c8b_}scfClt&OGoe<LR~c>)}>-JF()EO>8KvuOV^-aq%)9$xy!KjJ>2FkV_#
z2EnJEa{o(|=<5N&1!EibBLcxqsQ;aWE4hYSp!n6GZ4=`2i5|4w;G#!Dh(A_IcZG*D
z`+;qG0DbXH6y$rM_p+nc$jHb3M71`^M!;DMUy{Q#c*B>4-|tu9aiDl1@PaaW%#L*M
zUS9z{eqkb$K4qs*cCwP}aeOn$WLo)wH2X`~{xDT2ik!ROZ)A5(;S&>W9znC-2RaAY
zRsg@XF!P5g8xct{yQn!9Gg0JEPuQ7i4H<?K5n|CS3T0t7vzn$jFLN*uYh=Zu(8i{=
z9q^?^u`oAt0eo|?4~@(pRrPEj7o1>h4s4Bu%qGNa#754o1e0kqWUWTlPBxQt4<_tS
z#ks*8Ie0%OZ(R<-<;rrIbGkVu*Jsve>~aoiobsB6UUXzKrT?Vh&^fa?bE+#%e#~&;
z?JH_|Zmoxt=hpBXSD#|%mG<4wTzAc6A9-%Bk95wk?YOtzf#56ep_)_ga^8dQgA+x(
ziU1cS?CbZROfh$ZRYaSCNJgY}J!Mp3&<FQU17RC10J%1Nj_5<qs#o;2%j0I}pMT3q
z(b*<@G>Yiih)anUPTqOdR#4V>(!`?kfF$y?oL7uC5u;6mhYb>b!?Pr;#Rp|dSzMHP
z$w-%FbUe&ePM>)$LzNkjZxZ_TmLv+cJhnS1xR;ByhgDB?^z*ja#Bh~C?{~^&oVyWU
z+9xFDnypvMv+1=5s)PjuszKXpxuD*T;G}U*Zl@YEB~a$hcvX%t>P;A{oa{u0S8YT9
zCb?J?W)dQKHo-BF1WY&>NG_p76!?@#!Pv!R^=fi(0_nc2g;TO_>r^IosZ8zCDQrsT
z;*@sPi7hJAYf@8$k`dd+KYCm_=KkhmATxLiM`m#jtrD5IB~zZ1&YdZo^rm(ROzz1{
z;tNOD3r9sPoRiBs@)WXk_ZdxUSvqNCtCGpqCF8uFnX43%na)ZlK`HG7rgYMo)+JM>
zl+JMk_Y}w`pYSWI>acH1zc+ZY1u^S^yz%5~`D|l7uDLG@KuNY)&KXDzC|yHSaJy1a
zZ|2*&ca$}THx=}_SVeRTl?emm+ovZ+Q*#uT&*X=O%7Di<!xAuW@v48nF3sOWPyHoB
zc`fk?%GH0gSw&4ty^k9Gs=%9^3w}d?8TCvm^U#|2%S-nRRrict^$ceB3<rATBR(g@
zKWE54#|3a*yPGYuA32&UYNAqEJMmmiSvO0xD=S=sPvpkjk*f5FOr$HkBoP*bpOaR3
zDVENaOO02E;iwYFRwi;SONf2Zda6nle5HYIazs~VnW@SqSN_&ZT_})(QKgivOe9;D
zi1^f2`DLmqUUFW(Pi0<XRnpVQw>E#%WP*}sQ|WOhshNA-Uc`f0VM~w?agL1g7ADXG
zbDT}^1pfsxQ<GBlJ!aZY1&V<y{tUg{{hF~^fi~%rvXc}71s9MqVBCO^(TE<RKoPO!
z6+*1P>2T~f*!RhI<^YWq$6fvy^r_JG??Jq)fAw%J4cnGuxSNaU+%$C)u~afts*nv!
zKTYi--(3lY3!#uSwYr`KNg8Rd)VR>HfJj2}GG(N`vT3%FHe(%7`9qn*vBc$evd|`F
zZm7KWmgM3`0@s_Q2fclED6(J?x=~@GeJRN(x$*^uSwqbB-DYD0LmPvfzP^dRzNKNb
z{=U9F_(JSMtQaiU0G|T1pY_ZHffD=>5Mf|Hen=I`0Kc>uG#bm9qo^4e<e<hG{R}t2
zO3<(}Kz6=hKfWg=j}6laFeFtN0L0vV!;Blfc4zkg%pCAd|C!DayPVkQeL*Z_5+r0H
z(0K=#BeaO9&<rO^i;T8Hp2CfN)P3%KZ^0k}%>*h5T$3NL5T-$V{T<D>3uHcT7(-}d
zH3_0OzBRLaehDNJxAU0q{oy-3Lcct+<Jc*8hrCde#V0*kp63h12l1D^Qce_;pt$jE
zkU=#SXCQ=<1Lpq7e~}_b*EBCFs_V8*kY!IhP6%z%G>w2(={n4KPU@nf3(GVNr%D(}
zlB7ym1vW2?6NKwHO&;ohQ5F;k!BSfVx3hKF*I-6bmUTr@RTci$va&93Aj`6>Esf*4
zD5|>lI;+b6gv7GR?Of?RN+3nxzK%e>ZvUI9Ew-`WcxC7PH!k{j)=2}kUB+o7rP#V<
zTBe!yzI^Y?_U`AubpN3w1)f{d1SO{NQY3LNO_LN!w#?i_Rll!E>U<)n^WP~4QWV7{
z3lo(E9aNQ-zXLnYE9#OkHmpipo;EnDa{0W@OWOjuut_=*S~ra9e4o0&=m)&P{_A4`
zaH4>@(Ed<ML@=;JOvtdW6`J!eJ*Ho8U$NiMsyz~3BhK%)^2z`onsY4l`6XX*H7I}}
z8KcN|Y_;mD+ol+jZhZwX4T}=2u7YA9=(^PlL}Y%u@)S@Ju;G1|q7U6`R`Af~qje1^
z@seyJg?D@HX4a@@8nR-q78j}WSO3VaYj6Az9h0}oi#i~-x(?GRC-Zlylxyj&1KNxl
zqBp=kY&0~gAid#fhf(s~{V_NTc%Fr)ll61tF?EG{{NPeQFB}}UYJN05vlz7t8^Xm^
zs1aeijp3OVK`w1~cj{ACXptL29Qp+0jp3klSdtBG;~M^ekF3$o%Nt*8T8k^DXk2$H
zmT205Ml2pXEFwIjR7G`BLtqo4v(Bg9fQpN#SvyRcKZ{0KxXY6_N{qYe0(+Sp{?ju%
zYzZ|IkhLTd_#oI0n~-hTWk{~ASWZk%q_>V>*aT9eyL;HUAJ@mL7MfE58@I7)pz{WU
z`4qRdA&#k&_w;8lp?L%K@=H(2n*`f~G;WAgZ&K@uW%L&>Rr%ZE3=B~B<ejGDo+hoT
z5b8SPTsC)3Fq+;Ju1tolE~h@^@0kfL{k*d*$F6XS(2}ZPHyN1A)}roEz3r9AV%(@N
z87<nmPeQflmi?Z@P<KBy%xLfv@pbYdhMX^lCr<!NFg7VT<db6hTX04eqa(k>y~kYF
z4$R_0zm`k<8^R+Z9%ANd_Ws3{jwSb8yveI!a%G?ay9^X0Xe&xSl+L=QO=JGkL_XiU
zp|uXGgH1?90#vhKlceUlr8sf*hs~*5$R7Kmh`@rt7re!6{CO70Z>d;|dh~iNu2vfA
z?Bxi>3aTY{A-p-h<#zG6t(pc0zF~^5$+?8m*VG&KLzh1Xck#8pm@KiNn-Lec8IrV#
zhkKewA(GKV{0x?oN8x0&(Ot$1Q4*UazlivmEX&5?Wj9FgoQpTRoJk=Ev#e}<Y3U<I
z7tLc1$wzLSioHiTJdNJ@*!_&qfbCzPyJdYqm{+1b)W3lIvCcknC9wQ4?>_QISRW$t
zK=~u{K5{46XAvA>xb-YANYij5SeCfJ7?h;gORMSn)5h?&e?5d&bF9is<1uNtw_=Fe
zbNn3GHLNqhvc*PLHAH+7?7nbL=G9DmY_F`xH!MH34=3bS9kgDpx)Fc1J9}Hn*^>Bb
zMi3x4xWZvpm?p${%&5Gqtx^A>d0V?tFmV6#C$r+AYNev^j*r7j<GRgRm>k6x7>Lb2
zmxr0AadCmmNC7Qgh;~I({#0xyD6n30Q3Ou*D4X|2sD%eJy&#a>ktTg)!t7Z&Fv{dh
zC4*)s(x+X5+mZZYO1th5eME!aMYe$S%MLB*8L){-0)<P65E*-_LDv|~7)h3rw{(H^
zTP)OdFL<nS$VC;IR+WW@ktDrA^H^FlQ4vYCiR_;{aW9p;wc(SqEgtm7ok=uQHz4X{
zlgwb|@}h%K)YJ>kRvYs7aQz01b#uWl+^kj<NqKRFii3x{%T-?d9aZb?tdz8EJ)T9$
zIXu-VG<@BVExengc@<QQRZj+Jb{iiiOTx-hR_molkCz<R$sG=J-FBv@-w~>V%-6CI
zzJpD6sNLg!AWJQ^SQfF?5zydHt=Spl<Dk}B1zCBPrn-aO!Sc{Qzy6}If7W%QqdAGv
zT5JiKvkgUR@vg{Lnr*QmUT{oz#Mv<xn$HB=0Uk6ygYc<6)5Wdc!Ef%Ptsm$UXK;S)
zmwEV^K64IP@7Ev%{jI~h0IdilfG#-0aYK~CrVHro?1XZMzxK*pgZR74yS}ixgipA0
zPY(QdiomHi@FKWhPYo%UZXkjbq^SM_jDZZgpF_6IAP7=sA%GHx;YvynsX5wAq|j<5
zRp@OqheBm~G1MYZu0^6ut4NvF*{sY!6e&n`2HZLbse17Nn$4n*41TQ$1iM>3+(H|z
z(v3sDg&J1X+l#(gzKp9t`PV{4+!3RlM1G%f?j7v_s&Uo76e!&?w#*qF!iVYh#1o<H
zIrj9%KaAUtQR8YlxSEc}B(oEIe1BL`wy<HYOKqiq-Uf~D^AevXB>risd>)J_T{tj1
zCAM-vZ}Z0YL5WXGlCPvxzGpU+cPtn`-3qeE34S&1^Sk9tA06&AT7SgVFR()Mj_)iS
z@SWd(eE|?XHcGpo3~)y?Dc*gX&^4AsH6I$`3_yZ@k@OKMB2`FLs!ukGj5m^CwsQ}Y
zI?2+z&B*bV0jtzrJDqEHOZDo$zMRsH%5-leuZjLmPtm275OI3~Z5$gieqH+6_Vj>(
zm!#t95%nT)l^B+AXNV|56A);oD1d__&ju1Kr9p$P)l*|cml|76E=)FNS*e*!Hrq-k
zuA5hH<FFgG>Nc5*_Dd5IXJb8+YD1HuzQ{vs62C`|PIpz8%4(A0e-+3hk1-SO-}U$U
zAM{*}+WCO0sd13>(sZH9Ab}_Z_V(lM!xiWeJx^igS+aIx$9psPgq78C9qQSS+&heA
z3a-q0Ol05Ma`-KK`%GouZe#u#o$SKa*GGgxil}`UBfO(Q>kFFRZbz9wp$qyEMMZ7y
zTMi16ngbz;A|F7p@}0q_Lx?mxsyApfN2Q^+tmzNcon$Sm<s_|TxlqPlsbwOP<T#Q}
zP<;053y6NaA=;x4FcOEea>jv9oWJdeA=a&{SIk~dsjGzl>&2Q-_3_WCu^|69Kwaxk
z8~_Lgco2uOgHkdSZf-+Uj6DD`(a{9bz+ZSEP~`vuwvwWf-=iQ>_T@y$qeXiL8}skP
zh~Ez?q<q)Pv1T?!+g7pU2aQQG3&p0xBb&*nXa=8}Rf<!PE&np(XH>*ncb)zn6r1@v
z`ut(ETpLEdW9+@j?R=6R`0Y#YPub&bb~2^^#MkQnwdU~$7!QCBP5m00J^~g1g15!E
z1fZ1$hz6JdKj=XS2O1-S7>F)G3zF|ztYnLjNUdAOBiYauVdIsWWHjZ5lE+s(ItM{~
z7N16@_Me^&>MhjDs+SBX+3^r;tlz|U-d}<512W@dWQ)XgUc--==M4rU6h9m|MmT>e
zJA9Re!zh~Q=y;8^-DF({L`BgAIY9xS!9#Eb(@ISztYC8~;uw$|v5~U>P;c7ajW-hM
zy^lA=yAlH)JaesR%{Edg^RsMQe?6lQ_s2+y+a|@eP@1Le{H}Hh8(;qS$sVO=J{F(o
z;Wrkgs)!z1q(&o>B;;aJ+n9&ujXks8!4X%gWXlntB#9>Un{wY(==3&xH5n?vL9;`^
zloFb<+?5syT-`y01Y90~dFL=D5u&uOVymN+T-(K<X?VAVZSSpw0<GVBtl)em0Ypc{
zfOH=3pI|^u_`BNk9vOeN#e4TE9-m*M|G9fvk@U8NrD7oLt|df7Oa-2~2TQJEA~h8r
zHDF+vMS}+wp?;92Np<9m9U-_Bv+}N@^uULu7%hly3bhRpQODu-4h2P~z3>Cpa6Hf^
zA8n0ACNI}(nOFXEK~BfYjPV$#>(>N!%ns?qOV%s=z#y{ElF_QFK=22eNP<AhTo7pt
zh9IOWn6K~;Uc{Ky?{!BtZYYbZJAVlM=f<!6?&Fy>t``W#J-Yi;^wSERHZk4pjeQ(A
z-kQ}TW;~#o54`y5%)e{LI`%`)`W$SNkC?J9?A@@y7NAD3FR0eG;xEA;MFL|)1V|ti
zLf}a95@W1I1ZzI<<ODMw{g?2yqTD#{k%7W^2TA@-m*lf26X*HLUEcYrEMk!A);Wb$
z%R#Z*nSiJaL825zBGBR<0g?SnE>a@eNeW3~6tF(f#h7I)R#92~La~*<iIUb%K~d2*
zye)Mr9d@H<)fhMuvNPyP!Ko^WT2Z_kd}sN7=a2Spdm~0Xsf$6$m^XjkNZp2jgK8zf
z4MKq)JG<i~#cPZ{#vXH09b?~28j(pE45}1RMJdpy{=LZ79K<fwhG`&`Yx1WzJ+G?C
zP;mF`iwQ}u0Alwkg9JYvKIo~ZLn7ZSRD)dzy@L9I(U4}+6^4IbK^DH!1(~OI4$h_U
z!)eMQ6F}$SF2(H#rl(y`OYIXB@Tualm3_<lysJL-Yz}xv-~VrnqV}&>%j+uRIi7z0
zUc~7W$`_{I5IcBQy2--yGeY`+AX~}9U=!B<z;2ajkYajr<rv&ZR>TywUd*5ghf;p2
zmLEs7U%O&nEYx5?n~Xs`SVa}wzXKxRL4|-=J>HPz2ZJtJtw%%<A?ct&45-mKA+)oN
zS}kQxgHRC*F{PQXb*dG|&Exnf+QZyn?0nrpLZW60S#{w}QMpEcdfW3!@?m0>?f~O}
zJs1k1Q291tVBNDGKi^Sp#^`|cf{d#K+p<sXtL&3%EMyMMQ=-AzdxEU&4{(*Qh)2SL
zsXBf}!SaQC>F$`QQV%j=WjEPQXWYYoC+qy<^zcLW?V51zVJH}2;RpzHQbZcXI6%&-
zf3waxq*0Bw2-_wSQN#N3iRN>Gh3zL5EJw}TKRCq%MdTMpz>$!M*nX81XrcCFz!H-5
zXi2J?%UO01i1?0zYZA^nfxO30>zCVj5WUGgemvC~-L{?dj#eC|d;6Q%A%J&~Hv35B
zi`oC4OD~w4Hv0ev!GthrCW@;vWt(c0D1@McP9t5isr*1ii1{HxY$>xq${(rQq8DfP
zhr2~LCDn_w@pfiUOfjA0j<Pk22<zh0^<G-}Yh*v-;dA-b#z3jwzxN*Ki_@Fw9i4VT
zyHhV01+yv_uY83TMs#l#fTWJvupGaXFZi=xHxXK(1dFmH$;GIgtSYjH>rUqMC+m}S
z^TJ^#b*wPleJ9OZpO7yBMuj@nv`4evt-aSOYCLbZ>HVhu{RYsEo5OWCmVJkr@nf&1
z>^jHbpOeM&Mr}vyL0HR94f~;^{mAOSAyxCOi)jzMCr`eI4QzQ&=AQ32`DG3ii~1|(
zhR`3{6e|GcPfhkjk-&)fMQdCmMaT!Zh#_OV$>;(z>$!U=R>K$*5>ppRF~tBAQ6IDd
zJvGocJwQ(rRBpvsw|kvs`b4D36d@xv&_mYHTHTSts?i|~&+1Ape@U!U_^)k<1d-j4
z6$TLgti%Lv*O=@gWuYmu0EY@y#ya!0|K(Li2vd|;G7mqZ%06=QZ+{Axv+fj8ugBm{
zo5Cx(QmTUlYDeY=zr1IXOe|H>Np`;9*-AF~KjN23e?E_0UQ9CnyIsq8Gx~drr^iPZ
zDA4uPn`HPS_d+4cC!qAK38ikcM~p;J5VQ&7q{J~o<TcXQ?~dKLU(S9ejT#UZ)dM-c
zqs4f7cW=;e%3CdmJ5^17Wc86$UV-p$u@{pZr#bM%Ax@@^U(yPy!0>;`{_Zh%Ra!N2
zD%xx<0jXJ*qAaX8p%O91bj2~_)V!n%c6HkL&tduknjc=qy90T!$4g4Gx4ff1k!_2E
z*1HQ4VV6;?Sn+IBQ-xMB?)iR;#PasmB0Qs&!1zVruFJhNS5y3s*LkhmE|7QPu$(2v
zE!+eR<ZRdTdP7n|Vs}ie7%=a`VoGwhm7uCv?zoVvL3v&wksBxtrPXb0j;K<;qv&H!
z230wID|mM~eh<vK`RFvpNZFaS=V$0H1lCy-%oPGqw;OE2oU$rxkVw&HCn-RXNu2Ni
zI{4AU51|@8R;m+Z&W?ZR^Be|YqUk~9*d|qq4#!svwx%>Df8gcozEVJpz*1w!`mmID
zMFl=k!OpW|F_Zv(LH^izWA`MVx8@iN{}6#h=qBmIp0IOQ4Wc+`Y{Iin^^&b)AQyKb
z#@UQETniYec86MXgy+7c^z7K$D4(^X<)pH=D$Zf5%-q>k^i{vQ=!wPlCu%i}{_~hy
z=lHM-#h27Nsn~p-^RJnpn6Tx6oD$wyA=Ir6U08CAFv>(xY?Zb+0gilyObqrVDzgrw
zlD3MqkRdvW<)C(3e^lw3W8;v{xM4|ANVBFW#x#Y%xc-vA$>;KnH8^IxoX?T2AZb%i
zUod^%Xz%ESe3ZQHdYwbuGdAJ(s{wtfZLVf)ibw|k0wNZrEXc~pfNQ-q7!QV9E&&G7
zicL0cIx7OLHg?#4$Q5~;m0zbfnQ~A66#j1ST&#8O!kh_{t2M2^!@53WP-%f{Et73;
zNrS?A7rAu_YL7!{jwQx5{sybpGY>&|tvs$7A1!gJLy+K-J_KMYMX@d|Fx0vv|7F3W
z>bx^QYkO5>ys63W_|6*}{(22*KP}hjlgn!tjivLEfrvywpiyGZHDrY-5470IQxdTH
z_mHmBnNB&~*Ivs~qh<ZUBf+a9^0?Li{2AjNH($o9utxhGmQzfgKK}=4rti`0$x}lM
znf&p(v;D~7&X2URj*S@amzWk$Dv}HH@43mqv+}X0uK7;bhrU!WYo09z+yR;Mv&zpN
zM=3V!5V*l=<SfTrH{$SKn?|5LizRg~6H>nMUTB~*|41tMXzy*lqXygV{ERE@Cz$4i
zIK|KN%3O9Uq|n)wNel2ih6+*i52-oxnjsJ9TVVkqVyK&Qju6jKA2VY;cO9ih%aC++
z3IXNThEs_K8<u}NJ#vkInNpF=E?}G3rDSg`94bVr{CvsXuO}fr0T<2Q!9##<#MqEQ
zi|q){R?P9UJ2AewdFr9I>q5@gMMD?8-u8cQU`E_i8r$_=-RXpl|23)|j6?7Y__w{q
zPvd$oN?h#_uh++l;M=Xlo*AwoIn<6gnWLFDi(-Yw6Z`_2%ejDJ^lW#P<wlo0+xi!*
zt^2TO54VbaVm`(YRe#Xy83tcbuiF>6FI$%&+6B{AiL%qO#mVBYmRJuQ-{}mfKxc<C
z7wE}m6iVtV!Vcoe*{}bhB6G6r{tW8~Qh@Y_z$ZA&r;hl%UKcSPhH((X`(G6?A2wq=
zzi|HjMj|`bID6by*~A+6Xk*5ur%s%?E~nlfp#dX+2dcg)n69>H-yb39gke9gqLF)B
z@}JB`s?_LWl$9G?j8-&Q+LJO>&?>sh=c&f${9jg#d&-Uis$U;%I9??{&xsWZY*aIq
ze2f+2^xo=5ffRwfiBGXhL6EHa;!f6(0N5ylLJ~8@1QEypia-xMq;?Q&ZKXdzLhk4u
z4R8v!Xs{O8=#lah^*60}ZwQ%5$_MRHm?O%Ftr6Fa<l0Z`+|739Ly6xCl{7e67<^0(
zo?>#eacHnnNRz7Pri;C|&vz?(dd#Q~<V=pk__<m6@8`D;HqrWQ_;-jl7MdwNKjH4k
z4F-NH52y6t0=jNzy$|&V$5{{4w;VxdSJlOP4`ThiO<W&vch1~jwtoJ~CGWl5e!1Wn
z=f7W~rcw5i6ToyE%%|fuRv4|(m_`;f@l24*DL1*NNc`wbq-fM9C>V=g$ILGrj~>mz
zW$ay~NB#0t5L8on@tG3`7t}HH%xNH{6+knMrRRGoY63fx)dQ8i_j9k#&Mx^wbG609
zzn;6r!Yt}&sY;d7qDCunUyvGiTHA?dkiQ7a?iP1A6PL0nbISmXXDIW{Y3Meibg4|A
z=<l_pc3Wi<e@Hw8TTB%nWlmjCnxv0T^lge&^fz+b6RhE4WXEliIw{~$j}|A9N%dz;
zYr;viVX_+6j*d)2frl)58CnU=N4#cW*6c0-7o|<2%^2~1il5v_3kBb4abO_8ax>p^
zJ|D}`MXWDR?V~t8;Jjmn77klRKtp3NMN$+ffg*c#J^ABE%s(=SEfhJ*$`_Bsoan+d
zGgX<Xka5!Xi~2O<nYBl!(X||fVkzw8gl)&q!DXWQ#}SdJf1nQs28I`ZV{P{_JN~-g
z39C2Tu@^ofh)|-C>LA`xMxCL>#oe{B`pLF)LMh*?)y}pwf8A^c{}SzPeH+s`b5*c1
zW2Xs=u$B9gy*>x9XOoGM7<=>UuBH=C(4Q}d!U1}O6Wn%fMHkD6637%J^v9lBVYfA(
z6JJ{?6Rn*w5BHh1o!4g2q{VO}wc$uUpQjh)`II6BSG+cht1hl&<$!rqaQ1L5HS#|B
zZtcZ-<p4Tl(VhR;3%oJrf(jOC5#}Rs&{br{HEtPQ=d@6SEvrx`UVuaKSf|c&Bd(JJ
z!_|!f@@F8s?JtflQw~&`rH(h8af?r_?v&eX_I&R{>qCDLPk+zGdg2)J;QZZo^3xMC
zJc8X&s+fi@uNDmkl>LMtl0IHK0+SjJDLohXPOFv;4O^FTPMro548=~g6N6=&P{Fmo
zOE!3wq_J{IikgHp8EzKa15j=`oQ_9hMw?62la>0pFv~ur7F+o8wxzpNs?rnkF)eAg
zQ2sArz^$*L?)Vc-u4NC!+vsuVT#N{l#>;G^j(2U~R>L@6r^B<lj?a?;;(`IAPknwM
zd62{mGxY&2jo_Ja(m24RIwo_LF}_l%iphIGbtcPUk&zf;U@59fMZuc-txQ|{!nl(R
zZwXSLNeso!(n5hp+4$8+no^TZs>PXH->Knc$M=x0ls9>xGhGfM=3IqexG{V)o^;iZ
z2Grv)A2`w*24_7&f9q(+zfo1Je=FA8jSL`^KolQyRxt8>W++M!#vU{BZ&{)w2FaOH
zHij`-PjlB)S)-*cnhQm3!WyZ0v^KWY`s`CHvM`?H4iocz2}~Tfj=bEgcxK;cUT^HU
z9T_&6k^nz%f_u=uNh!J2nWf>2;I-%@q3O$a8}vjwlFEok3X7tcThPkW%2HG#S0uUZ
zLNr~M6p3Nnzn4P~HG@-7<vh&lb3%i7?ZlucqM|w<#{Bwt&37BE{iLS*^`Rtdd}Xg;
z7qpQP82BXQ?KgPYcho1+WF;C-g)_NE&iit+#D)6Hov`_gfmM7)G#g4kq?14{qP&S1
ze!+w<3>9uQzsqhipaq6~`q!qhiT>}CATit7LKzzF9@h%ZpN&<iR<2BZTxjf3sq?>T
zW?E5k#iwN}EL!;VdTn2DSVgRnTdtt$P@CohP6oNn*{5AjPB)Fy{jHk~N`gV>#g*5q
zwJSJ<9u?z6HBewJ2$088PsBy?>}$1DsmUrV*$*$DRqf^`yJ`LSM5bk(j17$!)#=Ns
zHFzu6$X?LR?EH|T?Kd{Osqa<o%UOd8cP9T<WOIj#kCFF>2<v$DK8nkDiJ!d)Ki}vb
z7u|xUMk7}qmaE73kL4vgQ(;m8e1hsKg=Z>*PS?*hU#J1k&Uc>n@7DiTects!_B5Tw
zgZEzeL2u~(>-vv$n`>@0wmxf)=2fn_PYA%>yt<-=t6DMA8*5aUda;9TGQzw`>aZ1)
za*Ph33v~F|q<~F{HRxqy>EPyQA=9C2z5j;6^kchp@KSOR;1T9j1yW37OjsCFOe`pv
zKrwnIh%zP`?wr(|=d8vnS%Wp%>QU`{@dT;8PH5y9I>iI2srDznl=-lnB#hFLSz9Wc
zJlaiM48(Uji{b@GQ*;ToNT;nw=U3~m>rZJS-;$=y2)s-nZUv30aE}g+j0^z`Oz(^a
zpL0FmD*(VmvnP1R8ejK_xkv5Yd_FOA%s8Vi2a@@@5^}+DmCtvzlW4IP%(dve%p^#O
zOH|z{Dj;I1nFw=_DI)Yr8pE|_Rw~skm6`;eWL>(3Y~*(BYp92QPjxG8jGR>wfnF(E
zYF3oPKt=lMdz#no<5d{Yy>RJq!~0{o^HQkVJur7Wc@pw*XZrG?ZgN<mSs%A2Ovsu+
z5`?6H7{$(5xAVp&qW*X!cwr5Ww)vo?h1c0?P)7A3kO2a`7bnVoYu%gMd!ynuYjzZG
zs(d7Wj5y4c-Dqv3BE3}Y5ImFwklBJB+3<)SX@EqK0rUHiE4N(r6+IFf!fJW-;b&R+
zNlm=V$#gK3mD`_$+Koh^4gJo0HMH>Su6<U_wx1ogvw;JJn@_*S6#qQmzfkdBZS;@=
z?BDNqo>v_vvu>q*a_Sal&d=1l=Iv)2c16^CV&zfzj|w4;X?mt`L-rgNnTSO&B*x?g
zkT4b_xLHE3Y;rwjrYoflHbaAW&EhevLamy}lyAW`9aXz7HXVfOe+UMWWPGx5v5FTq
zk$_I}@oUC_18?fwjfN%sINl4bxYLp$h(Bqwc`hf1q+1ED%TznT`FaWY9p70oi^t=T
z;Ksav&lX`Zi=n9u_A~^yrJc``4|Izo>~iU-<*y~L@OELV%XjK*5AdyXtOxLx_i@++
z#MAI5{~lq?5y>QwDk4Kk2pPV7MHbcIIgzOjfGsMCItAk+nv6Ryy3IYnB(anYVE0+J
z^m`zqwJfKwCh8QbQmp}PW@|RvOkTb{U)uwO&Q;E>%^*}-o><f%Uh8z!KDHmZCjGAS
zGT_fa6ZLLl<-oM2nW53Zx0^X1Iq8Q2n@*22+@g99{WW9$hvIWM;WW)sR(C#FtYNxD
zc?@lO$=j{XcjB`8x=g5p-+fPws^mFpco77nlkrNrJDoYDR&lI<<+>{X)MR1HU7Rrn
ze0cb=wln!$FX`uY-37o)ZuWN)Qm8~}5r^yfnU#tW`Ja`VcE`=%XTO8r5b&<eZ~`-K
zD=aw8%??j)!VZs)A1|(7mWmVm@FyvJ%v-ag9{oyx{OqB$`-P$qR(c(W6(!WrM=d~5
z5kb&l*G0iaiAJ7#pgOK`ugC<GKtnG5LPPzVoHkDh1d0zb@2{B}s;yefKY`)1zzen*
zbE6lLfb&Zq(w!A)w5^EH^g8eHQgyRW5d^XjWtCWe`M<UupUb%Hq^RBUr@0;dKk)Wh
zrkS%K75hYT7E%ZzB0~DR=%7#LYRfG3X4_d>uw+HO7vKbvAXQUf9gB!Y+oHnZ?wLDp
zI1J-(=MQ!&<!9mJ*(Q3)eXRd28S}qwI2_%H3Ja60v&@9dbUzGr71!<eQpO;cyG#Z^
zX9+<kwKy`eH>O%;rXQ+rn~Lsvb#xYMJ&`uLVJvq<`tzhnlq7=`1C{b)KJ?n?p88H+
zd>wWD{4Xcod*E9(0#Kd35x^&Jyl>m8brN^@yOHds)|xL}yiWE$X&3!W>y<6Vl*lL6
zjXOUwRVF0R;l{Nt_r`3@l}WFeeb!@;XGYScl$T#}fAD3y>H7q}leuWtR0W9$$j@2J
zoo11s*iiz`NU~ZhR-<0RjLFF?8?-Y1RdO+fR}1`%JjHrYEa#;B={AEDF^`?iTn%$O
zS6j1+fCgttoK3xa|JJIy*&b4tS@om7Qmi6{={LDpmB{SdyTpUi&)yDqb>kkbMtEM-
z)oB?=m%;{9dy0K}av!f6qv@q9%BC%eznZ+e8S4w#6j(ndv5ti@e9&Y#UMhH`0;1#i
zrtZ~fk>6^v;ZJnO%g|Dekv-MZbj9z^;B@&{;K2f5Ofi@=9Z&53-G$(4H56ki)|koc
ztU=omMr{=3?ZrOaTQHzY{=M@Uwzsu1B-MWE<}HEApUSejse;#5JiJxO8K)fH!#NMc
znMy|_6xymvW2vo9!%C>usnKfGqVaTPFJ`H>Db6e9(=gQE)?ep~=GL&Ec++aZ>IuzV
zCc6FJ0B_%l+TGW>^#$xapLXBY?azE?8P6PT2e@kgKg$SoB<;A<{}X&LRD~~C_d2hk
z|6#FV_b6<@bVM?x{Snh{!;6<Vn`qFa0gDZaoYYTKD7U!155k!{VE!(W_|G?+KS9pl
z;8WHw^T7x7hU1kUrD)c+A7ba`CDV|ZhQQZrg%j2B7OQs-J`&UrfP78Ups`d`+_9&i
zi>6-Zf@;^fD(W_m%kOr{48~eXs9^ws=8>rphyHMmBnL7)ST%T;Q^j#$|7<lp#wa*O
z3TjDd5%Q2xxE7hBzgvX-RiOG~2!iv38d=|CVa0_gvV%X?pFX*}+d89Y)9L>3rso=u
z#JJP3@;G@Ms<oT<C96Sy^@tzaH<Irz>@PbrU&!D6#}qtMHDSt9qDpmP%j$|k4Lf+z
zYfMF<p{Vr>D~hPVy0Rj5Sp=>2E-W01?!SD3c-5-TnNE!q&$uhXbq|FkQ|xlr**MDR
zBDb6q`8BA{+)x{pA-iuN(Jg+>jWCFg7C75lTl8M6Xn1xoWf?i_nK{fJP(SES8&^?Q
z43!#tDuwpZOxNxIW=1_ZCFNc|4~BsI3J<Ac_3-Q1s`@V?l&FgS${zMtflz%uZP+YM
z+|>3T&Z_<_?JTZuJm?!z@1NXOt%vEu?Hw9zZ)V5lMSWlpX57;?qr@i+(CaR3Xx&k&
zQMK;cQL1W3PtQ_z`n#%=1L~)lmb%NwZwnKMR9$fJ)?$3`iW2id{`wGr*Oy&tArx<<
z5IyW|e_yp;4FVnnD3Qqv2C?W5?@Z(h;vzu_QAvRgAvH#+79ENQoICZ2tFU&GM2D~f
ztzZRZoa8wP84~e-GfUeb<i=9v^uBi4u?Fy=`-txkpESHnp%k$4amff;XH<hFnU)4g
z^}wi43ybC=%2za6)RfA&oQZHDei=Kk@{(F_znR#g%IolM<JHppvE;P6?TY6yE6p#P
zq+<1%=MaB%JPNNbjB=;Wv3d&t_yK>Fvfu|uY=X=?5+Q@Q2FlY`RuyUv6lj~%tR_KZ
zk+HG_BdbfZv9+Yzs%9@Y2-BVD`I6`9z!=&Ly{w#!d{SD@AOEVuc|W{WK>rB~8ut^y
zBVDM*xj7mkZ&NgqoA|u`c(A8dY?*hLWmnF=ln-NGxqkB>l^jbrU8rzTf?MizR##|A
zDpHvq7DCW;Ww#CXhZf)nEu#z-H-P0^ibYs~c^#o_lo&<<m#1MBd7yopKb@qb{Nd?D
zRDdFs6te+<`8Sj_Q<xlyINRITWrzOG_kbUYnL8?hn}06Tng!o^zOY2YTzI70!H+Kc
zH-90@D8JT3t6^H>H&=5k#krT29D+Kgn;h{|53-bU6ctkvdFsSeoYT`NOeSsW?VX;I
zojN7sFW3WVN(fr4AUSuUAPTg)ETF2$Kyz%A+zGp#rsHNK5g)6+>9x9Bh#7BKRc2QA
z&okz?GBeV|DDjF+SB8a-UQ`+-#d?ksT>G6wxtAtCS|l92oD1Uv(<=byQCp&Y(D05d
zVMJ6EI4bBV_gvj%_0eE~dBoV(bA+CDCB*N+6soFM0Pv%xigDx+TCCNioJpdjI`Km#
zuM_Waoc(d^*w-kaOSpmk@*yOB-yw3`0!%uCuonuuet*V}=Is0LZBL>|NNU|qB`pPo
zq`&U_GQA<Zz2J68O{yle(H|(lc=>O8Yl9Im0?*nclAl_uN>w>)ac(WW)irQ+6rOYU
zWKx5FvBkj6t4Ni4Ph9NR?&4#!@x6$3j>@{rJ~qOWHjai<{>*fu!j=(3v-T+hu4eHS
zOSDBAc@-o<fMTRMh8SUourxKLoD&rVn7>*Uc{Wm`fkKxGSNxGPhp23%7c4y7tC@yx
z|F^}hy2i=BHEz3Uq}i@iszhPj?zR01cUm<H+;v(U7^wYdg7bcwc93@?&g;V$LO7C-
z2q>=Z8drSsQE{WYFJQ5=l^#v1aA@ICh{DQru>9(?Fgj}^y-UGM^@>lIHuNFot_m^!
z8=s!j6MS<>J<eLd`3q5C6rA96^|%WZBtU@5;0&2-`sSpILr=XZ)n>c#^z81gAIyAH
z`0;kepxN#v&ueva_j6;E|7j-|*mIKBMDM>|cmV~HU<CHwZi#U!`VJmBq2GT90zS7W
z4)OglG>Bs3fX;d=?#{$Jo0pAjQmS`f(SYv<L{UzsnU?e=9OP3@j9AK^Q6q(<){Sv#
z%E{nYC?TO<T5N{POE|c=)a8pO@I@74G;J_$HV^>5|Be%1Y_utR?Z~l@6+cF^=-q`n
zLg|Zj*CXN7*lK9y{voiz?`H74cQSp?U9Fyu$*OtrQG^kN+kU=MXuBF`6B`~YMes{=
zt>bnekN6k%sEmL`El(^^G2@(J+crI!5CjG+ilKlmNPr*Q32!Zn6Bf|r4;bpU%h#sW
zOI}{GD#kUBy1Fxi?~2OS<XXHfZn3<dDdv`Nw>C7`jp=P~Yx(oi3eRmmGrgN2T{0o`
zcj<b)P|a~ypjIn#v){$!{;0kCF7E2>CI@7I^O?&DrBT6%SJAVKk4`!S8k(rkL<BAU
z*XOZQyHc&mvJCgYD=jxhc-bKK*g+R-Y<hA`r$4Y_YT+@}f+iKs$rU@)puF@b9Q0{?
ztT?mqL7ZRbhh_I0j8R`c)ehQSGJoIQ+~_H`zO2+B6a~EWWlcJZw3y^jA~li-QI2ad
zf|Qu#fyq%_cfin?Mo>|Efx6nR*X@}FRYPNToN|s;pzE8+hPmxVxAm-@H(C5)5+1IP
zD4Ef*-+i999rW;$*YAfU;x~5i2DJ%m&>q>>*i~Nmu9FWiAJ!LEi69v5j_g4Sq_k|R
z0utD0G-V`GL7v@NkEIopQiF6u0M>8C8FNAyn5>2y@{+C}g@;J6Da##j?m}{{4qmgT
z7?`oA;%t>*sQksH7-Bw)gVQgJOiY3KoSuWn!=rYCtD+A|Tw9$w6%Tse+i{_`(s$eJ
zAgg@%!)*#)VHs`&JSS*pi9C?d0pTFXa`m2_AZIxW%~w56OyXQAI?1M)6z<ynSED%5
zHxdW2r`L;?yw{g)JzMDRpLRFOHxNh#B9wPHciIVoI5PF0+xt#ZsG5-*lfsDliQzM5
zS1_HaHKtX;=y~CK+7_4Y?v15?RWLNWj#V+Pw0avoocA|`Cr8;^!VV&b{tinw8Mlme
z{=R^DGudq26l2oE&CJ3ZJWo66*S6#1ac@<S8Q~fZ9^K*h?xPW@XJz5hi!wEL`+=bQ
zIoKX~?!c2+2(O$=SKrcb=T@mJ=bZhgyOUJB9aoeH0%;tFPI(7ZFf!+~ndkiX9MV&5
zn~UA;FN+8=V8c<N_LsKwP4({}ZH<jY(xYR<)lrc`9ezInSzEmIF8`OKe;Vb6@-s1P
z<9{>7@t!|+BSnHmd%seF>QwBxUjG7js?vtQCJ)0Ar|qGRx}U=T3Db~o(}w<|nn-+E
zRjcG9pptvrv}%;9s8Nj5;bwxNRR^nxJq%vAvST?+4s+MgE}Po-5^g6k_4-1AJ`QeQ
zPn07}jlM_}5uhLCrggp#*;a@Z0E1SsJUIjnB?lAb*j{!r{B5lO-gxG6ggb$56<#Xt
z9H%TuLJ&?_v2JSlacsPeMefR|eH5~S+aYx;xsfa*=;%8eYh6{BPm_(J`!YH<8;<s|
z5h%fl3^z+fSTj!(aeO7HxrHnj{<xlx9RX3Y(>qVWJTJxnVskRXII;|x=7{)6phRPh
zq-eq}XD%)9Coj+3QC+l7JEnl^1~HbYrW+y1NjN&EYi~BIthmETWGSc{-+($PhM0_a
zyc$CSwmUz1B#FyEEAZ`XQHx>yS6v}ND{Kg~AYDKnr6A-gHj?O$ND8|9dW%$}USeuY
zTghe1(@?FZUH&>w=fdp|LIgFrn+ERwf|DvcEE{y@2Faq5`@bU11~UkvKCepFhc;xv
zyZH1ryVxr}kpfcFDRARm1kjqKv?2E$d6eSH9VoJKtWH-Xi~K28P<kO&_jJoX^g=C!
zaxF2U6=eA6El8ysB5S2uGqV+Gx1B1~hpg|pl1<t!$9Vw);A$!dl@@qznqs~I{5PS)
zJISwM)Q>Ow)$(|TO1*|=0>?t}!s^Md^TCU<bPqq>!4N-oZyk0H3vc|#1{FsJD+~mb
zuQK~1jnvF}rp!>h=5w&)o*#!-wxVwtlH!^0a5~QK62zf3yMhmH7pwK^)L8tNmpi>)
z&a2WJj>)Tc{A1sR6jtJ!mT?j73aZ=<3MkTA!x^ZrBT9rC*2!`CTYVglKUj!6Qx6Il
zIaOc;$;DZ><aIzDb~Orm8g!ZxSG5&dwT1!L%7^_z1;FUW>v-^SZ{xzb<3q!=W83QY
zvVUY=@~C-xgqzy8raanDWK3Wm7x+CBkE5$PUlhHcX293(>qq#hhCqgQs82jkNEQhp
zn5?<5ba!TCDQgBKN!ENck({5TK@@asifcU&GP#dqpx;YdOhFM4(Lk=e0pgEyxmZ&>
zYV}+}sJ-$|DF6`f!V2|pFgVj?>&U)y6^lCO-8PA7)YiA^&XAaL6Vf<yo_>Al5+VP~
zGbW^IoI}yK(x2rS!=K?DufyXWS<nwWI8c<(w{1=0vo;^6(OY#G|4-O^^~vha)jdp_
zd@}F_)=;=v{GPRu9|wcG@eJ6jl_ZQUNc9(3l~@)ix=y`2Bzwg4Y;dL=ai+?};&!X(
zki6XU+2$SR%XIBxwnl?wNZ$o6QTQmUltHk2`!a<8p`a?t=85w8gD+&WZ+2%8ypPWj
zn&})c2ggT8Ydfpm@MISCw?gP-_O4yUlS|j=75WpJFPuH_3Do`8q_&$3Pn+q&v~z*s
zYpgac3@6nIH9)}jxOb2CxoR&w1oiYbipa^ihlaBhNfvAlMT-aLWUhfjUOzOhI?qlD
z6RQB?6wJK?0HpIwSUl|p%L~dTymSHFK02|24<J=CgD0`+*6pC0R8fkuBu$WShGu<r
zCAP#!tdGrRX^WR{X)obEW9R@-`PPh`z675s(%%pd{0#meRKFwnrFo_BMKqOp4|LX=
zuHFDgKN_e|<$*PZY0q-CM4V{9EJPVpSbVXg%ot_;^zM^)n(@+lq~=-7mAYnlnwj8k
z2Ji#%4-DL?iE3{UA=!a=tAm7MD$+(Gy2q(PsMm};yN3x){dibK@*}H?Tue?qa){C0
zgs&FY>I1aTRPTH&hTwSDkW)VueL*sjOe$GqhFeD@Vvn8z^2_%L6a`dgLQO!E`h0;+
zIIlkN_|o?ckw*>r4Dn<N;$h*CmT7frH7U}=LD;Ot4Hi=|B3qb9v^|2-qr6ODmw1{p
zOT2fQE<Z6bNNQ+}S}E!7jl~zTl++i<z^C9N%AOs?7Q*~LQ(P)n88BG>61?F`?C>OP
zl}LK8>ks~UF%vjJR(k0G_yKhtbe_-}+M1KBNz&+Q<Opej5NOat<!GiAPtAroqQ4Ah
zH^2(1;QL~E3U({_iLNVGEv5H0Y)iN(yj7v;Df^6VX5a7YiO1irR|6b#i7o<zGA4gw
zHGz7Ev(v9oY5E6f^81TMQ_Oh1CTl3#r^E=hGg@BHs5s3}J=HLKkILW}fIIah6eRYZ
z6$=uGGzm+-)6W^?JU$_Cc6WnAlxRrgu{g2FF<z{r<@(Hc1hC~EHR%LXR8jN(rFA{o
z{Kv;p8>N}5<tVlC!8Li&sA5K`3#3_3&5>#lIA{Y!Rzc&{88d%ET&0M5&N5<CotTGk
zeo@|Ro4Uqr5ss|x6`22rDui64*&f&r<LsUlrIs~3YQpU!KSv1eIoD|@Oj`d7c`vV!
zN-_DT6apfBzV_9lJ`{_fB>I4%CM5+B@~<c3&%`rM&7QUt0Y!@*Rgt2u+Mi{ov2Baa
zfFt>?SboMW_;TpYK)#x&7!rCPpsTydf{BtZkYu$EdnFbN0cj+H)k+O%Y`&+FbU?4x
znpukrxwEpiTL{<Ag~V7W>KQ_vves(bS8PNExLj<!_=(q+FexWrXg=DNC)73qbPrO)
zdk!l|%{t=FqSC>5rvlNt@<pMqe*Y>E_?zT2m}VDLbv0-wh~UtsY1Y<GGMGlPn>tPv
zP67{<2;3n*ai0De@2X}emgs}|JF{(R&n&h6(3nSac;$>m#&jVF=QMiBvB=hqO?<1#
zZS*3M;Tao<<&l)=-?r1PDae_uUWBZhtjPI?xQJ@GlEnP4e`85D1PVfrtD$u9RW|jC
z3}^KzsNXgfM%(K~D*R%`l%*ljnwy`6pMeL3KzE;*dx=Jk_;3uCJV;QF6Z1Roa3TD<
z9aW!WfGXNX@(YdOo^l4|KZGG2LXNA+9jgPZ2X1Ly9U9&)<rL<18!-%5W_qz8Ze5cH
z3lZgG;Z6LBQV35*zGd4d!)&HXH<g$W;|kTBqQtJ>qBTX`HQDQZPQ$<&nZxb@k_!T(
zQu@7)F8l^|h@Na%X>%v<(=?Er__rgMTXqQA=Og;4&pl@$x;<2C&ae0#O=_xuJ?%^(
zRSRyQ>vnGwV6NAGIO^_tilnnfTiHQN+;@j}9gHvI9*%uM`;$WY1`#@2oy|a_o?zyP
z<ow1P<{yRNP7s6u{jk+QhcEsQImIW#kM*9=(2sr(nY=B%?3u}iwVSQ4ZD99fonF$^
z&GRI={mUisu@DFn3N`K?=W9yFVW<8TCF2}aPT5)<P3^j&5eZ#9y<NVFQNy0!>z}zB
zG}!xHui5Op%^dliNA(+zH}?t=g0X+Tca~ewuqApH!)Mo4iKMYz>I-!FLd@I=hwEuK
zhsFHc_Eky%_r;;7(bad1&tvk>v}}XdP5snn^A~z`wJv>>XA)qR3&1DAeJW-yC$-LU
zbbto#RLvemZkChqfdIO7voz;wBmmIFdb;{hg8$}1sLIeK<h!}f6GR$Zjt+x-ab7Hc
zld;<+3r7md!FY8)En`H0>@)i`y<MY~5ZAK7r*94lc5867!cDZVZ6A5&Na*$Mz~J%R
z5s@LYB$p2#K9h$a>PqNj(e|76DjIs6W3cK+fc>6FY|v}Pd<QaFF`mI-h`$0f7QuC!
zqt(L-!dGXa#q6`sA}WmVQmgA}n{{tagsh8?keLBZ9#RhB!{}h*MVx|1oH!UGzL;G*
z>(BPXm5BZkAidSeC0=f9cpX1xoPq!d_V7MEhe>8FGF+$A-^2z3hVM<Bp{Ok<ZxWw3
z2)PVY@t{EAQEWp1HpHIxJLesF3_}mnQ)leZ5mi?98^<sHpU`-m`+F|?PYy><+C*DB
z-7vJ*yO^5!o;*}VXXT#PN2q$rso;tRet!PA=`vAoZ+EKiAGg#!>?sNHSnVd{`j7uF
zKo-C0-7l@4-({o+@*yi(m^GIs)}Aw%$R;#}Y#*kK;a7e#OwNmgjsbRSO0wJ5JbuM@
zGgtLxrJ$d|a*Cb1aFI<8FoW5!xe6FN2M*N+w1m|Em{R)xkWyrWk)h-<jXZ;B?KuE4
zTEQEHtP`L4l^2W8xG$~02rbs*@7#R@yirK~)X|^*A~>zb0|1%q!5jY{V#|i|0`de1
z2UqULW8^NV!A!Sf=!9U75P<{~x9-k2Z96Zb03aL{-KvBD>~S@y+L;UsCo8V=!U#3V
z7FmZqJds?#At5FPL+V(uT(1nLAF*mFOD$CjLxp&?(hd3J#ZX>25er<Dn`e&xTltz;
z_@z?JSBvYpYmY2#PXK|yN{@^Z6PnP0UEQ6fTvDL^sGW$4lIWKSO2T3p32*2JB9KQ}
znF~SUy94sTbj*FnesFNGGuR#<wMHzH?c-5(HY{KV_l-q%usQn;c5st7>>#fxX_L`(
zLJ{Qs!-o%#TxZ0@BSw6gj)>x7>%_5<gDG7+pr`Jb?M!dpG&?tz*2VpH?K;CyB=N|^
zp2gNO9a$V|9!w=vQ9Llb{ZKo5;PCFn14ni-vQMtO3U49bfN?m}4QEjlYC%F+e8by}
zG}d3hMc{T2K_a4bBSo<8H01V^IC&;JkG;_KV_lyeE!fdG-)nA_b?x<S#V#kkHjsXA
zG2U{KGIBf}RIA%YhEv5m+VgX!JwEC8Yn{^RxN&bG8&4gL1@0!{nCctS3WEc=LG#Y(
zc6+mWEFQd9Ncsb1O$|=Rt@OQxIh(;6p|$zflanyRI@m1~Wr7+jWlA86l6+o4QANIw
zpAU&2Q6qRZfST5?lL63QPPZq<$4tF$nlUqG2i1IEIC;yl&0}@SUH-{9yo#CZ1ny41
zh{fJGz}b;-pg36^-!dd03&h*xnn1i8JF{R8QbADdn7t|dL?C`Ixi1huDrIZAt)W1&
zprxY4<A?2>FH^7O?>-dL)o4Lcf)hLKTrC}_<=fMGzo+s5IS6IerISG7?3g1GS|;=M
zwLGh?+02snGnP%gW}3Rinp~<Z;cmGodHL*BM3M&1D-+N9$R<e}5%(_*%*ax?Hat!q
zk+i#rv>1<8?|r(NedXQROdu6ZY(F)SdvxCIRCtK*{4v*^EukcjL<vY_(TB1hDJ!IN
zB7%TOzyYx4cEAr04m1WVQ#YfQ$@gpOv{sAU4&5DCe{5R|K2Q1KBZ2t!ifuj`h@Xky
z9*9q!BI<D6*7Hb;(VF0^Tc@rK#P&!3t(Iro#5`l?8q;<T4YuvY%$@Q0ODFlZ7hkRA
zTPrJG{+hsBf$LDX1s}pMLX7oa@R!Mt$`XrN0R=eg?oA|eH5!9h%#6nPPD$vX;9<ZP
z13n~a_ve~#kOK6G8wYX^Xwn;+S$1@u^nHAYd#Lg!B*anAmo=~SWw*l{@LK!`<XMI?
zpA3hB3M#C%Hcj;y5C9%Q^Vety?6oTvd&2+?M_nm0PaE5FgsG_x7i9zSnoL|F^3pDu
zDDliS$D~|XlEht0qNGGq5~i=uM8!jg#AxRF8>FnCorVmFDRdL|Q>gz2{Gd~Ku6MS5
z$gOq}C@6{28M&WeX)pz20?2N-@6Dr6JIaeQ{0B5Go{Yr+V)<AuZRn9ufJgu8`siPF
z36xwN`cyJwjAxBs>XYnA=R3YUlTH*`$@~#Y!4JFV%;$i2Qt00a3WQlDYc&!S1ajDo
z2Z^xTH2GeD9!KI=a>nD(MH<+@$>CBH4&w#<AVeYB4KbN<GA4E8X=r<*(>E2&K1g$6
z41MAM!&JZ@{r6y|_k+`gfUcZAovtbu;@M*GVg619oWdLNmmmsymoZ&{9qf+L2+{z%
z!u4*a>ew8{Y@AE{M=*nGFdX{)UtuzMO1WU9iou5h`G788e=1#LwGk7-_%Qw()Zhy^
zfC_vOU?m07OMuS|(4Af`A%1oxMNioCHTW}pHSUBGO!JJ#a6ah1cLE|gDj))gPUV|t
z0*Tmf7O6C--<aa55Q@2@H0l3t^l0#1yWEJ?`iD|Hk_<;P(NG{1$ME)MDj$oabh{+`
zgK^a72mdS>@cV+ACSb-e>RQ0>H>F%WU3b>dO?VC`AP8GO1qjHZGCvi_q-*mCBIhfM
z`v~sNb`#vzT{(X2Q<WHhEvL#m2PQ42eHzb264B(p%E2HG+)j^Y<9al)vf_1~5qJ~;
zB>MgP<kjSNd9PRvTCf=ocMqsMZ|XxqMU(~RU4X2J@_BDZNB-`cwCr~_mz|if?Q}X2
znAkkgot?H@HZ2mRYw2pKz&gxg(SRD~p+2&p1QfESf$oZTE8&GNy+4)2r-Wp@_setU
zbYbU~k?H*FOXXlXQ7Q#92~5ruc5Y>3#d08>q!%(tMGdLsm(U;fDVKlmCOn?szw5-c
z<-OZ}b<@<s*hIX&b$lY$JL`>ZTpa}hBP;XdQ{?Ai5sqNoDIXb46eSb=;?fjR{00(*
zppP1v?2lj3_?7+}hZ7)zUlG|}F{;}F1d=2#gDf{VC7rhm?WF+vd~4qM&(q(|z1VMI
z^{1d|SG`Mj10bj}s^`5M{q#R~JJk;z*t3fgVrQ*ZuT`u{mAf3G=W@6_>%aTIx^c}!
zd$PTLlOjdod(~XAe__mJGT*c2S8i=3=I-2i%j*t)_5*Kw>iRh=8`#jWCkhYM;sgt&
z;;^CmBAZ60+b9ts8cEoh`pJXW-aR{c{!lv+s?;*MWDf5z5~WPI5S#nG-}=k1y!Ds<
z;&H<tGUhjaM3c=#IjsewdCjMVC%RwUnUN=7cJlm7Cl=oIswdwwi+2g*-LXn4=e|4q
zU0QLPggIF3Zcm{oR8bPAJCo(0Bug?9kVUWM*xB@PnZFOCpe%bYhPK=7x%S4|fL%8&
zmARpgZKHoYyXcW_b=NwUdgK{uPEp&*k#=e}ClP+BAXwq>%+$&M)g9e)bl>JfnlC$J
z4UW8YuezbJbD%;ZnX#yzeyqAcm0oLGIMwKOKRJ7*@S4Rf+j6n6>5oN<!{dK=Lw)?Q
zovJ`|Urfj1+}zR4o5uFvIDBMqhFi*&%lJ>!vxq<r>hMT6kqQz?C>4n;5d>LBLV)!E
zk5dUP`%nfTGT$ANOQ&09QAI`IUQ>4M9PcuxoHyrKH=EB#qX7AO-nPooTr|t~lnhrY
ze)pxv)ooXzan?NQp32sm_a6-`>!HEqwxc(mSZLQ@8qre;J(79O)bw&|vOOTkUsBYY
zUh$SU<}Tlnm&g-(NWOfVt|3tryh*#|=F>|E1S%^(!VdX$=)wW^M&Pc6?ocr(qo5%m
z@i<OV<&FaPTt|oPs?E1Os3zBRXn1kPsNH}6&)cYw+tNPR%&-`)pPn?_)H!9jgOeJM
z9-beZQiO;(V%9>D+DI}M&F0wf!eECEm&VO%FcM0{1_JR&E_Y*H(vzXE=6rlHTT8X)
zvJpwkB~zJ1C>5&><x-7owjKAUZF(sap}uy~pqG;Ia9kgVr0Tg$JAO?`RLY@fAr>x)
zaw!}u=paA^yZA}+1Kxkog6p_#-9Ka!S>kyvA_8HWMv_J8Jji}j1X(%nLjh4Z>f;T_
zDm}%$hQTUUM#~r<9H?4_Tp$@pxV^}ln&9SF|M7lgwgRrUnbEl0Zu-j8H{Wpf#EsX_
z?VaE9=7p_^iat>f7vy-z$olk1EG~#89lPgVcKd}hFTHU0%>KiNc7O2LVl6T@exRdC
zYD%qbEERozS(lX%fVd9ZQJ8@{IlkxW=u<{fQY&d9O04;h9wkw@=tl&iAf<o;K2`CZ
z51<N?s7hxwC%K@lCKp;`i~!S}v6<G)P}8QU<g;st5Oj&KrVX;CuM(l%-<Q+w`|f;K
zPDT?);^-(IrIa{JDbjYRF_jWzzplu6Q4Iz%f;hO}>}auAG^UduFmf=m^d50(^7>X?
z7I86)*U97uDDD_dPyx|ne3y<xq=9krx4b?+#VIo6^_V-H_FByabgE);Ef#T#<?<Tt
zy3F<R4XuZVZWwE}Mu%f@!)TC3qjP$oJv!DJPQ?@HL0$`)f-egrYpY;9+i#icch<O1
zEi~17Sx5&|@}s<_5FoH~Wd`0sz5^N<Fx8z@kRZf@L?C3*tMJ#CyxxhX;M7!&Kypow
zyuMcLtU13ns;A<5IAcVdPuwQrE2wtqJsj08|GR__>tVU~fUW_;DEt9FfNz2zSe$k#
zzd)#W>_fLG3P3Lfh#K$vpl%Bdi-xww@fUt3l#D)nF5>&6bmT1$Y2i?kT(ip$xKbgb
zD}PA-1Okxa_YDSo#4CI{G$*yb8!OAo?}k(?Ei1ve7&w<9qw%Cr*>5L<iy^??f0Hq~
zH|FOd4ko{sp%Mb<6w4kZ3`)bQ3aa7W)eaFVi(XAxwid@!u~1ekvAa}XNK;0dra@*V
z!*azm?iT{ecuVmIfj;Luqy<5~!^4g2InJidSrCBAkW<Pf+^pcTED<J5Sr*t5fv^rG
z1PM@LP4tp*6jmqm?r(v`Wg+L)WV2E=D=gA=q2-pAEvmInJwHnt6qCD?nm?q4VhPC~
z)i5<%2<rh&55^NQNe!qd7Dlq96$;WxX+0*`l>q%OoTBvem01mDoQ%R>Q$DaaBpCn*
z+g8Tm4}d@hZs1t*;!8<FQ6PeNhu8IYWy5f{>`oyUUtkVJF$e$|NX1Os3tN&`-vq9u
zv|E?1-0Lki6u`*L75loK--sNKF&rVE=kGOlz|DHo>ggrWAOYiCF6^r&y!pCG1me-K
zvu>`Y&)wC}-VI15lhI`IhWKDIN(RWrY$;nv7YZdz7ifum4iK&*Gw^ZpN$^39J@x8c
zQ$A2lq5mXLwOlux)Kf_^Gt<qK3ML?okp_H~d}Vc&sKi|*arEHiV!>tM{pU0>9#l>h
zkp&Y|J3~qPK!p{d5RfckfV>T~7pkdOtbR@1>0;#oS*VAfQzD`7l4FLRh*Gt|C~K1<
ze2094QT8Wm)SrsJo~1ZEJTW>t*rF*Ky%~#<VsmnAtVxw>yP1qN;|buLZn52S_zo*e
z0RIPDDN>&R0096100IC2K(8A;Uk^O>00RT)00000)FgpE00000)OCX<{+s^!1E~Zf
z0000700IC200000c-muNWME+4``>~=migMh+5h91R{}*)!7BizCI@@~c-nQ*1FT*_
z5Cz~f`)u3R@7lI)n?Y^c4QkuA-MF@GTel}S&)DS4%vyL0=w&I9?14i;R5$p@5E!Hh
zB6Z_oAO|TAW4g4=yabKqn1wK4gU%5fv}^PM%*6mtnSfL&34_$5mvlJY7DVQ;8$rUT
z>LW~ga180~{TaI=L<Yc_XEfxon&+O${no=pdc&R^WDNYIBO(eAuBtJPfrWR7(v6_`
z+^a`k_y-S}%CilJ5!+xOGdW|Mc7s0Y`F?EyNCv}%E%X5<RTw521)~t#!}3@RA7NBY
znUCby(KL>GI&pkU#*0Xjc-~_IjCnMNkBZ>?E`pbI(f(wrhX6Sb57ic~sykd|E-j`?
zNRft!lWCm05)l-h9@EnESc)PeMeA)tkRTIi5a$k|k?b4IIGS+=QgBLJX}1e0cE{)h
z+pqB~HQ<UnD1!U!--kqyazPwUA(gl`!r7J}NxYYh=XXLBX3#$FUzg_`!nOdUkgtrz
zP;!xYRG<KL82n?-4NSM3W0oQY-{DI!Qh{q!Cc@Tq8)+%PeH*D#aAzz+-qIId`dN4f
z#@KY#GV|F;qa<0S=WY}$d^@$99>FZ%_-_$xYmIoho~|nzbMK*ej2f~P7C?&!{{5!s
z;su*{psIA#V=T2MD+wjZRM`FllZ~uN00000000000000*09F8J0C)h20Ga@+0RsV8
z0h|IU0%QWX0`mg|0~G@%12+S61H}XV1RDe_1U&>!1YZP|1l$Dw1rG&o1+fLf1_=fl
z1}g?U22BRm2ImK-2j~be2#N^a2`>p-37HA13A+i*3Ec`B3VsU33jGTX3rY*E3%Lu$
z3(yPO3+4;*49N`?4OI=q4iFA_4$ThP4&@H;4*L&75DXAc5Lys;5QGqr5StLD5U~*B
z5k?VY5pNO35&sek5=#<S5@Ql>5_uBp6800K6Y>;H6rL2$6&@9l74jA?7CIJ27Eu;l
z7MK?x7iSl-7rhtA7z!Aq8C4nf8dDml8yXu|8-^Rg90D9n9HSiW9X=hF9mgIq9+4i|
zA3Gm%AJ!lZAXFf@AsQh>Aygq`A#@@JA~GUXB6=dSBH$wMBPJtVBjO|jBxWSeB?l!c
zC2%E=C9x(GCT%8}CdDTBCn_gMCuS#uCyOWdC`2fDD55CrDK{yCDX}TwDh?_RDq||z
zD^x4WEEg<#EP^bzEX*wuEpaWMEyykME(k7JE|e~uFDNi6FsCslF|;x(GPW}FGZ8aY
zGl4UwGut#pG)^?BG_o}AH54^DHD5KJHKzao009610O|nn00#hI00aO6044x80E++s
z0ILla00aO5c-oYXfd;}*6o$XGRf0W0U<N>ICQtwbQG{4PveuZE-4%MGo})+V3Hosv
z6UpcD{jT$$0}R>Y;&>w*La^S$C$#ReB)0C6aJSxP%+vaSn3r{*8E;Y!T&VOi0#-^V
zkqIMjc(9e{+$fc65+Y&*3sTkuLe{o??U;00es2vr6Fa3ELxH9U+B^Q<eWnpt=1hg*
zNKK*K$RmurB%-1w*Z<}-V5s^404fJMp8x;=c-m~i1B?(*007YUFPo=q^RjK*wrwxl
zP1&|>bD8t9F|TI!o(SOY5pn+K10h0$cyhVnn(p@KVXq}}%cG~f-pi+#>u$OwzXA#>
z<hDERx~H%riiUWKDXzCT_dU?ZLrd+mUkRU;R7z=Ol=aACeLYc5c@<RjQ6)9?Gr&Oo
z4K~PnwbV959Us&+)NmsVQ%`*jH1yO+qm402qYz(XO+o@qH8WOo<4iEocpFS|Knq{A
z)Jkh}wb9mOQ%y5PJMDGQ(I+Q$3JF7^kl1+_tg$vEkxqJ%qC|@kD}#(Og`^=_NFGvz
zlp$3}9nv`Mm*4(Kp^8gp%Pf^$;@c#lG;-J|fuyoXtGdp*s;sJHk~`#})FG`Mb~@{v
zD-Jv2sADdNbY?gsQAls5RUuMJUww02HrZvhTsNCTl*DpMVvbqnn`gQ%-l-O%LrjRZ
z&>PPz@=6Uay!QN`So}hLd{}${EltG%gFq0B2j~U&AKC`)?v#)0-MY>s{qkSCk`qMr
z(_GCv^Rw^eehIOGrD)m2viD5V^(~q8>jV|icPZ1Y?L;lbl%f*OIZMY`z*)Srz^M}I
zO$TT0<E~Q=OM#d1u}p^Xx}<U6Mu?pg$fax&n4I_enJoYSc-mv|-obDpC}JZcV_)P3
z#+@7t91O_?8yVQ0wzwL~GBap_nA<HlR5*m#nK>XlCpJAcX;v_g%V`gv1E&Ma0S0CU
zP9UGxX%B+~2txSG3@#g07&`(ZHaK)dY-CPx*{BBM?c!))U}SOVNDherDTxGv?N%IW
j93t$@JX$*#|F>>n>D|c0;If%Dg^j_*1pu-}DEt5b3L#t0

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.woff2 b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_400.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..7b18f7ea49098fff3aac28a1feb0cecc429bb2ec
GIT binary patch
literal 18320
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/theme/fonts/font.css b/pelican/tests/output/basic/theme/fonts/font.css
new file mode 100644
index 00000000..a9eb87e6
--- /dev/null
+++ b/pelican/tests/output/basic/theme/fonts/font.css
@@ -0,0 +1,12 @@
+@font-face {
+	font-family: 'Yanone Kaffeesatz';
+	font-style: normal;
+	font-weight: 400;
+	src:
+		local('Yanone Kaffeesatz Regular'),
+		local('YanoneKaffeesatz-Regular'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
+		url('Yanone_Kaffeesatz_400.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
+		url('Yanone_Kaffeesatz_400.woff2') format('woff2');
+}
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 3f576aed..f8de5f85 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -5,10 +5,6 @@
         <title>This is a super article !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 21691b29..857b1dc1 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -5,10 +5,6 @@
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 9c53ec8e..86c6a98d 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index c256b7de..ecf57942 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index edd6f749..ee0fa3f3 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 74bf32ea..cb4785e0 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 850fce92..b2cffd66 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index 90d361d1..214d0e2f 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 44e2f83b..152d2111 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index e8322d4d..e738511e 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index 5cd227d9..0baa4e2a 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 17f44be7..a4728315 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 79d9f8ba..d375b47a 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index a88094e4..f42eabe5 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 1cd34ee9..fa964ffa 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 444039b7..21621cbd 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index d206e546..0fc2bd25 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 6a5aaec6..f66c6cd0 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 6b7ec333..17c822c6 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 7d6adf80..68940b8e 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 33d6c193..0db9b8aa 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index a098ed49..2d1032e1 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index b32acd70..479c5291 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index ae1a43b3..5037402b 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 8ab5f7eb..74bb4abe 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 41beb5a3..9af27061 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index b548b52c..96f51396 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 2645bc53..c48511bd 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index b15a510f..9454a041 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 5f331d23..077ed625 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 3cbb841c..aec86f76 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 9719ff75..10ac2c61 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index ef47e789..32eeae38 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index c7f9701d..a41e43f7 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 1674e915..88cf5b69 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 59a36ace..92f6615c 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/theme/css/fonts.css b/pelican/tests/output/custom/theme/css/fonts.css
new file mode 100644
index 00000000..56015076
--- /dev/null
+++ b/pelican/tests/output/custom/theme/css/fonts.css
@@ -0,0 +1,12 @@
+@font-face {
+	font-family: 'Yanone Kaffeesatz';
+	font-style: normal;
+	font-weight: 400;
+	src:
+		local('Yanone Kaffeesatz Regular'),
+		local('YanoneKaffeesatz-Regular'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
+		url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
+		url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
+}
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 03a77e69..9673ca45 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -12,7 +12,7 @@
 @import url("reset.css");
 @import url("pygment.css");
 @import url("typogrify.css");
-@import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+@import url("fonts.css");
 
 /***** Global *****/
 /* Body */
@@ -43,7 +43,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 h3, h4, h5, h6 { margin-top: .8em; }
-	
+
 hr { border: 2px solid #EEEEEE; }
 
 /* Anchors */
@@ -64,7 +64,7 @@ a:hover, a:active {
 h1 a:hover {
     background-color: inherit
 }
-	
+
 /* Paragraphs */
 div.line-block,
 p { margin-top: 1em;
@@ -124,7 +124,7 @@ div.note {
 
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
-	
+
 	/* Thead */
 	thead th {padding: .5em .4em; text-align: left;}
 	thead td {}
@@ -132,14 +132,14 @@ table {margin: .5em auto 1.5em auto; width: 98%;}
 	/* Tbody */
 	tbody td {padding: .5em .4em;}
 	tbody th {}
-	
+
 	tbody .alt td {}
 	tbody .alt th {}
-	
+
 	/* Tfoot */
 	tfoot th {}
 	tfoot td {}
-	
+
 /* HTML5 tags */
 header, section, footer,
 aside, nav, article, figure {
@@ -173,9 +173,9 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		color: #C74350;
 		text-shadow: none;
 	}
-	
+
 	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
-	
+
 	/* Main Nav */
 	#banner nav {
 		background: #000305;
@@ -186,15 +186,15 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		padding: 0;
 		text-align: center;
 		width: 800px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
-	
+
 	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
 	#banner nav li {float: left; display: inline; margin: 0;}
-	
+
 	#banner nav a:link, #banner nav a:visited {
 		color: #fff;
 		display: inline-block;
@@ -208,12 +208,12 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		color: #fff;
 		text-shadow: none !important;
 	}
-	
+
 	#banner nav li:first-child a {
 		border-top-left-radius: 5px;
 		-moz-border-radius-topleft: 5px;
 		-webkit-border-top-left-radius: 5px;
-		
+
 		border-bottom-left-radius: 5px;
 		-moz-border-radius-bottomleft: 5px;
 		-webkit-border-bottom-left-radius: 5px;
@@ -228,7 +228,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	overflow: hidden;
 	padding: 20px;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -257,7 +257,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	overflow: hidden;
 	padding: 20px 20px;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -292,21 +292,21 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		float: left;
 		width: 615px;
 	}
-	
+
 	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
-	
+
 	/* Social */
 	#extras .social {
 		float: right;
 		width: 175px;
 	}
-	
+
 	#extras div[class='social'] a {
 		background-repeat: no-repeat;
 		background-position: 3px 6px;
 		padding-left: 25px;
 	}
-	
+
 		/* Icons */
 		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
 		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
@@ -346,7 +346,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	padding: 20px;
 	text-align: left;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -390,7 +390,7 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 	/* Blog Index */
 	#posts-list {list-style: none; margin: 0;}
 	#posts-list .hentry {padding-left: 10px; position: relative;}
-	
+
 	#posts-list footer {
 		left: 10px;
 		position: relative;
@@ -398,7 +398,7 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		top: 0.5em;
 		width: 190px;
 	}
-	
+
 	/* About the Author */
 	#about-author {
 		background: #f9f9f9;
@@ -406,21 +406,21 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		font-style: normal;
 		margin: 2em 0;
 		padding: 10px 20px 15px 20px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
-	
+
 	#about-author strong {
 		color: #C64350;
 		clear: both;
 		display: block;
 		font-size: 1.429em;
 	}
-	
+
 	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
-	
+
 	/* Comments */
 	#comments-list {list-style: none; margin: 0 1em;}
 	#comments-list blockquote {
@@ -429,24 +429,24 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		font-style: normal;
 		margin: 0;
 		padding: 15px 20px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
 	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
-	
+
 	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
-	
+
 	/* Add a Comment */
 	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
 	#add-comment input[type='text'],
 	#add-comment input[type='email'],
 	#add-comment input[type='url'] {float: left; width: 200px;}
-	
+
 	#add-comment textarea {float: left; height: 150px; width: 495px;}
-	
+
 	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
-	
+
 	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
 	#add-comment * {margin-bottom: .5em;}
diff --git a/pelican/tests/output/custom/theme/css/typogrify.css b/pelican/tests/output/custom/theme/css/typogrify.css
index c9b34dc8..3bae4976 100644
--- a/pelican/tests/output/custom/theme/css/typogrify.css
+++ b/pelican/tests/output/custom/theme/css/typogrify.css
@@ -1,3 +1,3 @@
 .caps {font-size:.92em;}
-.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}    
+.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}
 .dquo {margin-left:-.38em;}
diff --git a/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.eot b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.eot
new file mode 100644
index 0000000000000000000000000000000000000000..b3b90dbc3ef34775a8689ab6a4494810c14c5a59
GIT binary patch
literal 20932
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.svg b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.svg
new file mode 100644
index 00000000..a69669b5
--- /dev/null
+++ b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.svg
@@ -0,0 +1,407 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs >
+<font id="YanoneKaffeesatz" horiz-adv-x="384" ><font-face
+    font-family="Yanone Kaffeesatz"
+    units-per-em="1000"
+    panose-1="0 0 5 0 0 0 0 0 0 0"
+    ascent="957"
+    descent="-200"
+    alphabetic="0" />
+<glyph unicode=" " glyph-name="space" horiz-adv-x="158" />
+<glyph unicode="!" glyph-name="exclam" horiz-adv-x="195" d="M45 683Q45 694 53 699T83 705T155 706L139 251Q138 233 131 226T109 216T59 213L45 683ZM68 -7T55 7T42 50Q42 74 57 91T97 108Q153 108 153 50Q153 26 138 10T97 -7Q68 -7 55 7Z" />
+<glyph unicode="&quot;" glyph-name="quotedbl" horiz-adv-x="263" d="M42 607T37 667T31 760Q31 781 34 782Q41 786 65 786Q95 786 110 783Q110 740 103 665T89 586Q82 585 67 584T45 583Q42 607 37 667ZM166 590T160 659T153 761Q153 781 156 782Q163 786 187
+786Q218 786 233 783Q233 742 225 666T212 586Q205 585 190 584T168 583Q166 590 160 659Z" />
+<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="418" d="M323 254H390Q390 213 388 202T374 190H320L316 123Q315 112 302 110T245 107L249 190H154L150 123Q149 112 136 110T79 107L83 190H28Q28 232 30 243T44 254H87L92 360H28Q28 402 30 413T44
+424H96L99 487Q100 498 114 500T170 503L166 424H262L265 487Q266 498 280 500T336 503L332 424H390Q390 383 388 372T374 360H328L323 254ZM157 254H253L258 360H162L157 254Z" />
+<glyph unicode="$" glyph-name="dollar" horiz-adv-x="418" d="M363 20T237 -4V-91Q237 -110 221 -116T164 -122V-7Q128 -5 103 2T66 19T53 37Q53 46 59 68T74 102Q111 72 181 72Q228 72 251 94T274 158Q274 186 262 208T219 264L107 377Q53 434 53 488Q53 542
+86 574T181 615V704Q181 724 198 730T254 737V616Q304 613 330 602T357 581Q357 569 352 553T337 525Q326 533 299 539T239 546Q142 546 142 489Q142 469 152 452T185 409L306 288Q336 258 349 227T363 157Q363 20 237 -4Z" />
+<glyph unicode="%" glyph-name="percent" horiz-adv-x="692" d="M162 -7T150 -3T127 8T116 23L520 709Q523 708 534 703T555 691T565 674Q565 667 397 382T166 -8Q162 -7 150 -3ZM132 339T104 353T60 408T45 525Q45 618 81 663T186 708Q233 708 261 692T304 636T319
+526Q319 339 180 339Q132 339 104 353ZM212 402T228 430T245 525Q245 574 239 600T220 636T186 646Q154 646 138 619T122 523Q122 473 128 447T148 412T182 402Q212 402 228 430ZM460 -9T431 5T387 60T372 177Q372 270 408 315T514 360Q561 360 589 344T632 288T647
+178Q647 -9 508 -9Q460 -9 431 5ZM539 52T555 80T572 175Q572 224 566 250T548 286T513 296Q481 296 465 269T448 173Q448 123 454 97T474 62T509 52Q539 52 555 80Z" />
+<glyph unicode="&amp;" glyph-name="ampersand" horiz-adv-x="502" d="M458 70T488 55Q485 31 468 11T435 -10Q420 -10 362 54Q306 -10 212 -10Q27 -10 27 170Q27 229 59 278T139 358Q61 494 61 568Q61 636 104 671T228 706Q293 706 335 692T377 659Q377 644 372
+627T357 600Q330 619 301 627T237 635Q193 635 170 620T146 558Q146 508 205 405T343 201Q351 241 351 291Q351 423 291 496Q332 504 405 504Q447 504 483 501Q483 499 484 490T485 472Q485 453 477 444T443 435L394 436Q411 405 420 374T429 281Q429 194 404 129Q458
+70 488 55ZM272 66T309 115Q242 196 174 300Q110 254 110 168Q110 124 133 95T207 66Q272 66 309 115Z" />
+<glyph unicode="&apos;" glyph-name="quotesingle" horiz-adv-x="141" d="M42 607T37 667T31 760Q31 781 34 782Q41 786 65 786Q95 786 110 783Q110 740 103 665T89 586Q82 585 67 584T45 583Q42 607 37 667Z" />
+<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="292" d="M212 -196T172 -135T99 43T65 320Q65 470 98 578T172 744T226 803Q246 803 255 792T271 752Q218 680 183 573T147 318Q147 211 166 119T213 -38T271 -136Q265 -166 256 -181T227 -196Q212 -196 172 -135Z" />
+<glyph unicode=")" glyph-name="parenright" horiz-adv-x="292" d="M47 -196T37 -181T21 -136Q71 -70 108 44T145 318Q145 460 110 573T21 752Q28 781 37 792T66 803Q79 803 119 746T193 581T227 320Q227 168 194 52T120 -130T65 -196Q47 -196 37 -181Z" />
+<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="470" d="M199 667Q198 678 206 683T229 688Q256 688 278 677L258 519Q256 510 252 506T239 501Q231 501 221 504L199 667ZM269 469T269 478Q269 489 282 495L431 575Q441 566 447 551T454 521Q454 498 439
+494L280 455Q269 469 269 478ZM16 503Q15 532 29 551T60 570Q63 570 69 568L199 487Q200 470 194 463T175 459L16 503ZM249 404Q246 410 246 414Q246 424 271 434L386 299Q390 294 390 288Q390 274 370 261T327 245L249 404ZM130 250T120 250Q107 250 92 266T66
+300L187 423Q195 431 202 431Q212 431 224 415L136 259Q130 250 120 250Z" />
+<glyph unicode="+" glyph-name="plus" horiz-adv-x="418" d="M384 317Q384 275 382 261T368 247H245V123Q245 112 231 110T174 107V247H34Q34 290 36 303T51 317H174V441Q174 452 188 454T245 457V317H384Z" />
+<glyph unicode="," glyph-name="comma" horiz-adv-x="183" d="M43 -103T38 -80Q54 -53 59 -36T67 5Q43 21 43 54Q43 77 57 91T94 106Q148 106 148 47Q148 13 133 -21T99 -79T70 -103Q43 -103 38 -80Z" />
+<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="278" d="M37 290T39 303T54 317H241Q241 275 239 261T225 247H37Q37 290 39 303Z" />
+<glyph unicode="." glyph-name="period" horiz-adv-x="183" d="M63 -6T50 8T37 51Q37 75 52 91T93 108Q148 108 148 51Q148 26 133 10T93 -6Q63 -6 50 8Z" />
+<glyph unicode="/" glyph-name="slash" horiz-adv-x="334" d="M235 743Q238 754 243 758T265 763T324 765L99 0Q96 -10 91 -14T69 -19T10 -20L235 743Z" />
+<glyph unicode="0" glyph-name="zero" horiz-adv-x="418" d="M107 -9T68 65T29 296Q29 448 72 524T211 600Q306 600 347 532T389 320Q389 151 348 71T206 -9Q107 -9 68 65ZM260 64T282 124T305 321Q305 428 285 478T215 529Q160 529 138 469T116 290Q116 206 124
+157T153 86T208 64Q260 64 282 124Z" />
+<glyph unicode="1" glyph-name="one" horiz-adv-x="418" d="M28 32T28 56Q28 67 72 71T173 76L184 517Q163 516 123 509T70 499Q58 519 58 552Q58 558 97 569T183 590T247 600Q263 600 270 595L257 76H331Q353 76 368 77T389 79Q389 32 387 16T373 0H30Q28 32 28 56Z" />
+<glyph unicode="2" glyph-name="two" horiz-adv-x="418" d="M29 11T29 25Q29 45 33 56T54 96Q76 133 102 167T167 247Q227 317 255 362T283 454Q283 523 206 523Q166 523 125 513T59 488Q49 511 49 547Q49 559 73 571T139 592T226 600Q309 600 341 567T374 464Q374
+403 342 349T243 217Q171 131 136 76H271Q304 76 341 79T389 83Q389 34 386 17T372 0H33Q29 11 29 25Z" />
+<glyph unicode="3" glyph-name="three" horiz-adv-x="418" d="M99 -100T72 -86T44 -51Q44 -27 49 -11T55 9Q90 -23 153 -23Q218 -23 254 25T291 150Q291 209 248 231T132 254L130 305Q194 336 228 376T263 458Q263 486 248 504T191 523Q111 523 53 487Q43 507
+43 546Q43 559 64 571T125 592T216 600Q290 600 322 568T355 482Q355 380 245 301Q305 295 341 259T378 152Q378 71 349 15T269 -71T152 -100Q99 -100 72 -86Z" />
+<glyph unicode="4" glyph-name="four" horiz-adv-x="418" d="M235 131H54Q28 157 28 202Q28 227 65 311T152 478T237 592Q254 606 273 606Q297 606 319 595L316 206Q344 206 364 207T390 209Q391 208 392 202T394 186Q394 162 388 147T367 131H316V26Q316 12 313
+7T295 1T235 0V131ZM235 206L247 495Q208 450 161 361T98 206H235Z" />
+<glyph unicode="5" glyph-name="five" horiz-adv-x="418" d="M111 -100T85 -93T47 -77T34 -59Q34 -19 43 7Q78 -25 141 -25Q218 -25 256 33T294 178Q294 259 255 289T139 319Q100 319 42 306L71 600H377Q377 568 375 554T363 534T335 528Q291 528 229 529T140
+532L124 381Q159 386 187 386Q380 386 380 194Q380 56 322 -22T148 -100Q111 -100 85 -93Z" />
+<glyph unicode="6" glyph-name="six" horiz-adv-x="418" d="M313 439T352 392T391 245Q391 -8 202 -8Q128 -8 91 29T43 132T31 308Q31 702 259 702Q306 702 336 694T367 668Q367 636 359 611Q317 626 265 626Q119 626 108 367Q132 403 165 421T246 439Q313 439
+352 392ZM255 64T283 110T312 228Q312 295 289 330T223 365Q157 365 108 290V284Q106 169 129 117T205 64Q255 64 283 110Z" />
+<glyph unicode="7" glyph-name="seven" horiz-adv-x="418" d="M115 -88T98 -84T80 -66Q93 35 128 149T208 365T294 531Q220 527 67 527Q45 527 45 600H405Q303 403 242 238T163 -88Q115 -88 98 -84Z" />
+<glyph unicode="8" glyph-name="eight" horiz-adv-x="418" d="M362 293T377 259T392 182Q392 99 347 46T218 -8Q123 -8 78 45T32 183Q32 245 63 295T146 376Q101 407 81 429Q60 448 50 475T39 534Q39 617 87 661T210 706Q387 706 387 544Q387 485 358 444T279
+369Q317 339 333 323Q362 293 377 259ZM176 630T148 608T119 539Q119 489 159 457Q180 438 219 411Q313 469 313 541Q313 585 286 607T220 630Q176 630 148 608ZM259 69T286 100T313 183Q313 220 302 243T268 286Q248 307 210 333Q163 309 135 272T107 188Q107
+133 135 101T213 69Q259 69 286 100Z" />
+<glyph unicode="9" glyph-name="nine" horiz-adv-x="418" d="M288 609T324 580T373 486T389 297Q387 92 327 -6T138 -104Q98 -104 74 -96T49 -71Q49 -58 51 -43T56 -17Q89 -27 129 -27Q220 -27 261 39T310 229Q286 193 254 175T174 157Q109 157 69 209T28 358Q28
+485 75 547T217 609Q288 609 324 580ZM263 231T312 306V310Q312 392 305 439T278 512T218 537Q165 537 136 495T107 368Q107 302 131 267T198 231Q263 231 312 306Z" />
+<glyph unicode=":" glyph-name="colon" horiz-adv-x="183" d="M63 329T51 343T38 386Q38 410 53 426T93 443Q149 443 149 386Q149 361 134 345T93 329Q63 329 51 343ZM63 -6T51 8T38 51Q38 75 53 91T93 108Q149 108 149 51Q149 26 134 10T93 -6Q63 -6 51 8Z" />
+<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="183" d="M61 329T49 343T36 386Q36 410 51 426T91 443Q147 443 147 386Q147 361 132 345T91 329Q61 329 49 343ZM39 -103T34 -80Q50 -54 55 -37T63 5Q39 21 39 54Q39 77 53 91T90 106Q144 106 144 47Q144
+13 129 -21T95 -79T66 -103Q39 -103 34 -80Z" />
+<glyph unicode="&lt;" glyph-name="less" horiz-adv-x="400" d="M318 96T297 103L52 211Q39 234 39 258Q39 289 65 302L329 430Q342 418 349 404T357 377Q357 359 343 353L144 255L360 159Q359 134 348 115T324 96Q318 96 297 103Z" />
+<glyph unicode="=" glyph-name="equal" horiz-adv-x="418" d="M34 382T36 396T51 410H384Q384 367 382 353T368 339H34Q34 382 36 396ZM34 197T36 210T51 224H384Q384 182 382 168T368 154H34Q34 197 36 210Z" />
+<glyph unicode="&gt;" glyph-name="greater" horiz-adv-x="400" d="M62 97T55 112T46 139Q46 157 60 164L260 261L43 358Q44 383 56 401T80 420Q90 420 107 413L351 305Q364 285 364 258Q364 227 338 214L74 85Q62 97 55 112Z" />
+<glyph unicode="?" glyph-name="question" horiz-adv-x="295" d="M92 210T89 219T82 244T79 278Q79 319 97 351Q109 374 124 396T143 424Q171 465 184 491T197 552Q197 629 115 629Q66 629 31 603Q19 639 19 667Q19 684 58 697T144 710Q209 710 246 675T283 570Q283
+512 264 473T209 384Q182 350 172 330Q160 309 160 283Q160 271 165 243Q167 234 168 227T166 217Q156 206 120 206Q109 206 93 208Q92 210 89 219ZM100 -6T88 8T75 51Q75 75 90 91T130 108Q186 108 186 51Q186 26 171 10T130 -6Q100 -6 88 8Z" />
+<glyph unicode="@" glyph-name="at" horiz-adv-x="738" d="M442 -112T496 -101T602 -68Q623 -100 623 -126Q623 -141 592 -156T505 -180T375 -190Q268 -190 199 -159T89 -29T47 264Q47 479 139 581T394 683Q545 683 619 608T693 359Q693 145 644 74T533 2Q498
+2 471 25Q459 15 429 8T358 1Q319 1 293 12T252 57T237 151Q237 318 365 318Q403 318 423 307Q423 313 424 330T425 368Q426 401 411 413T364 426Q333 426 310 421T264 402Q256 419 256 448Q256 459 265 468Q281 479 312 486T391 494Q448 494 475 468T501 378L496
+177Q494 104 491 78Q508 72 524 72Q545 72 564 98T597 184T610 338Q610 441 590 500T523 585T393 611Q303 611 246 578T159 466T129 253Q129 106 155 27T233 -82T369 -112Q442 -112 496 -101ZM423 258Q402 261 388 261Q352 261 333 236T314 147Q314 98 327 80T368
+62Q390 62 404 74T419 114L423 258Z" />
+<glyph unicode="A" glyph-name="A" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499 183 395L149
+251H288Z" />
+<glyph unicode="B" glyph-name="B" horiz-adv-x="377" d="M44 681Q44 691 49 695T70 700H169Q337 700 337 546Q337 470 308 430T242 384Q289 381 324 350T360 238Q360 118 307 59T170 0H44V681ZM175 414Q209 414 229 443T249 530Q249 629 175 629H125V414H175ZM171
+71Q212 71 238 110T265 231Q265 280 254 305T223 337T172 345H125V71H171Z" />
+<glyph unicode="C" glyph-name="C" horiz-adv-x="341" d="M142 -10T107 13T51 109T30 321Q30 480 59 566T130 681T227 710Q277 710 299 694T321 655Q321 628 308 606Q277 631 243 631Q206 631 178 608T133 517T115 325Q115 227 127 173T161 99T215 79Q243 79 268
+88T308 111Q320 85 320 62Q320 32 285 11T196 -10Q142 -10 107 13Z" />
+<glyph unicode="D" glyph-name="D" horiz-adv-x="388" d="M44 681Q44 691 50 695T71 700H169Q237 700 279 672T342 575T364 386Q364 242 342 158T276 37T169 0H44V681ZM171 77Q201 77 223 100T259 193T273 394Q273 485 262 535T229 606T171 626H125V77H171Z" />
+<glyph unicode="E" glyph-name="E" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73Z" />
+<glyph unicode="F" glyph-name="F" horiz-adv-x="313" d="M301 700Q301 672 301 656T297 635T286 631H125V418H276Q276 391 276 373T272 350T261 344H125V16Q125 11 123 6T110 0H45V684Q45 688 48 694T61 700H301Z" />
+<glyph unicode="G" glyph-name="G" horiz-adv-x="386" d="M148 -10T108 18T49 121T30 334Q30 485 55 567T127 679T245 710Q293 710 322 695T352 659Q352 635 341 607Q327 618 306 624T261 631Q208 631 177 605T131 515T116 340Q116 225 128 167T162 89T220 69Q244
+69 259 77T280 94V343H205V394Q205 410 224 410H355V35Q301 -10 218 -10Q148 -10 108 18Z" />
+<glyph unicode="H" glyph-name="H" horiz-adv-x="410" d="M365 7T362 4T339 1T285 0V339H125V16Q125 7 122 4T98 1T44 0V684Q44 693 47 696T71 699T125 700V415H285V684Q285 693 288 696T311 699T365 700V16Q365 7 362 4Z" />
+<glyph unicode="I" glyph-name="I" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663Z" />
+<glyph unicode="J" glyph-name="J" horiz-adv-x="300" d="M63 -9T39 8T14 50Q14 64 17 73T26 96Q41 82 63 73T109 63Q138 63 151 76T169 114T174 183V663Q174 684 177 690T195 698T256 700V165Q256 82 226 37T119 -9Q63 -9 39 8Z" />
+<glyph unicode="K" glyph-name="K" horiz-adv-x="389" d="M371 701T371 686Q371 682 368 677L206 398Q326 307 367 18Q368 6 362 2T334 -2Q308 -2 278 1Q254 128 229 201T164 318Q151 333 124 345V16Q124 7 121 4T97 1T42 0V684Q42 693 45 696T69 699T124 700V398L284
+695Q313 701 335 701Q371 701 371 686Z" />
+<glyph unicode="L" glyph-name="L" horiz-adv-x="314" d="M44 677Q44 690 48 694T66 699T125 700V76H297V16Q297 7 293 4T281 0H44V677Z" />
+<glyph unicode="M" glyph-name="M" horiz-adv-x="489" d="M445 700V16Q445 7 442 4T418 1T363 0L366 245Q368 310 375 410T385 546L368 486Q329 342 319 315L266 161Q263 153 255 153H220L168 315Q155 354 104 541L103 540Q106 509 113 412T121 249L123 16Q123
+7 119 4T95 1T44 0V684Q44 694 48 697T60 700H118L214 396Q225 362 234 330T246 285Q249 297 257 329T275 393L364 684Q367 693 370 696T380 700H445Z" />
+<glyph unicode="N" glyph-name="N" horiz-adv-x="444" d="M320 693T324 696T348 699T401 700V16Q401 0 384 0H324L209 275Q185 339 114 560Q118 517 121 416T124 259V16Q124 7 121 4T97 1T44 0V684Q44 700 60 700H121L234 430Q247 395 308 211Q312 199 330 146V149Q325
+188 323 290T320 448V684Q320 693 324 696Z" />
+<glyph unicode="O" glyph-name="O" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459 304 517T276
+601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101Z" />
+<glyph unicode="P" glyph-name="P" horiz-adv-x="361" d="M254 700T298 653T343 503Q343 387 293 336T160 284H124V16Q124 7 121 4T97 1T44 0V684Q44 693 47 696T60 700H159Q254 700 298 653ZM212 359T233 394T254 512Q254 569 236 599T174 629H124V359H168Q212
+359 233 394Z" />
+<glyph unicode="Q" glyph-name="Q" horiz-adv-x="429" d="M404 -61T407 -74T410 -97Q410 -118 382 -127T320 -137Q269 -137 239 -107T190 -9Q131 -5 97 29T46 141T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 194 371 111T282
+2Q288 -37 300 -53T335 -70Q372 -70 398 -53Q404 -61 407 -74ZM121 238T129 182T158 99T214 73Q251 73 272 101T302 190T312 355Q312 459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182Z" />
+<glyph unicode="R" glyph-name="R" horiz-adv-x="372" d="M288 264T315 192T350 18Q350 6 343 2T309 -2Q298 -2 262 0Q255 110 231 179T180 285Q173 284 160 284H124V16Q124 7 121 4T97 1T44 0V684Q44 688 47 694T60 700H159Q254 700 298 653T343 503Q343 356
+256 306Q288 264 315 192ZM168 359Q212 359 233 393T254 506Q254 567 236 598T174 629H124V359H168Z" />
+<glyph unicode="S" glyph-name="S" horiz-adv-x="358" d="M94 -10T60 8T25 49Q25 62 30 78T46 107Q85 72 149 72Q248 72 248 174Q248 210 235 238T189 306L89 423Q55 464 41 497T26 567Q26 632 71 671T198 710Q265 710 297 697T329 660Q329 635 309 614Q298 623
+271 630T211 638Q166 638 140 620T113 569Q113 543 124 522T159 470L268 347Q306 302 320 264T335 178Q335 93 294 42T157 -10Q94 -10 60 8Z" />
+<glyph unicode="T" glyph-name="T" horiz-adv-x="373" d="M365 700V641Q365 631 361 628T348 624H225V16Q225 7 221 4T197 1T144 0V624H8V684Q8 700 25 700H365Z" />
+<glyph unicode="U" glyph-name="U" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10 109 18Z" />
+<glyph unicode="V" glyph-name="V" horiz-adv-x="420" d="M176 -7T165 8T146 51Q122 153 73 377T7 676Q5 686 5 689Q5 695 9 697T24 700H90L174 312Q187 246 207 117L214 69Q232 215 250 312L325 676Q328 689 332 694T346 700H416L262 -3Q233 -7 194 -7Q176 -7 165 8Z" />
+<glyph unicode="W" glyph-name="W" horiz-adv-x="654" d="M650 700L518 -3Q509 -4 492 -6T451 -8Q419 -8 408 49L356 276Q345 334 325 503Q306 341 296 277L241 -3Q208 -7 167 -7Q140 -7 126 54Q105 158 63 380T7 676Q6 680 6 687Q6 694 10 697T24 700H90L163
+311Q178 220 193 88H198Q203 187 224 311L286 642Q289 656 292 661T307 666H364L435 311Q450 232 462 118L465 88H471Q482 220 496 311L561 676Q563 689 566 694T581 700H650Z" />
+<glyph unicode="X" glyph-name="X" horiz-adv-x="424" d="M414 9T414 7Q414 0 403 0H315L261 135Q233 206 207 283Q178 198 151 135L97 10Q93 4 90 2T79 0H9L162 361L36 686Q33 694 37 696T66 699T131 700L172 586Q205 491 222 436Q248 520 271 586L310 687Q312
+694 316 696T341 699T397 700L268 368L412 13Q414 9 414 7Z" />
+<glyph unicode="Y" glyph-name="Y" horiz-adv-x="364" d="M225 16Q225 7 222 4T198 1T144 0V285L6 687Q4 694 8 696T35 699T97 700L137 563Q152 516 168 446T187 353Q189 375 206 445T238 563L273 685Q275 693 279 696T304 699T360 700L225 290V16Z" />
+<glyph unicode="Z" glyph-name="Z" horiz-adv-x="385" d="M19 11T19 31Q19 50 27 67L267 628H80Q49 628 37 625V683Q37 691 41 695T54 700H352Q360 689 360 674Q360 656 352 637L108 72H302Q343 72 361 80V16Q361 0 345 0H32Q19 11 19 31Z" />
+<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="386" d="M122 796Q122 808 125 812T140 819T184 821H377Q377 785 376 771T369 752T350 747H203V-123H376Q376 -161 374 -176T367 -195T349 -199H122V796Z" />
+<glyph unicode="\" glyph-name="backslash" horiz-adv-x="329" d="M12 743L10 752Q10 761 25 763T91 765L317 -10L319 -18Q319 -26 304 -28T237 -30L12 743Z" />
+<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="386" d="M9 -164T10 -150T17 -131T36 -126H183V746H10Q10 784 12 799T19 818T37 822H264V-175Q264 -187 261 -191T246 -198T202 -200H9Q9 -164 10 -150Z" />
+<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="430" d="M69 208T59 220T48 249L220 398L366 270Q380 259 380 244Q380 230 369 219T341 206L212 294L110 218Q94 208 85 208Q69 208 59 220Z" />
+<glyph unicode="_" glyph-name="underscore" horiz-adv-x="377" d="M14 -66T16 -52T30 -38H364Q364 -81 362 -95T347 -109H14Q14 -66 16 -52Z" />
+<glyph unicode="`" glyph-name="grave" horiz-adv-x="269" d="M162 568T111 604T49 655Q53 677 63 696T86 716Q93 716 141 675T220 598Q219 595 215 584T204 563T189 553Q162 568 111 604Z" />
+<glyph unicode="a" glyph-name="a" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317 388V335Q317
+115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63Z" />
+<glyph unicode="b" glyph-name="b" horiz-adv-x="385" d="M84 -10T48 20V698Q48 717 54 724T75 733T128 735V475Q173 510 235 510Q297 510 327 465T358 313Q358 120 303 55T164 -10Q84 -10 48 20ZM212 61T240 110T268 296Q268 374 251 405T198 437Q156 437 128
+409V75Q144 61 175 61Q212 61 240 110Z" />
+<glyph unicode="c" glyph-name="c" horiz-adv-x="313" d="M128 -10T96 9T48 83T31 239Q31 400 81 455T210 510Q246 510 270 497T294 465Q294 442 285 420Q251 439 214 439Q170 439 142 399T114 238Q114 169 123 131T152 77T204 62Q227 62 248 68T284 85Q292 56
+292 41Q292 20 260 5T180 -10Q128 -10 96 9Z" />
+<glyph unicode="d" glyph-name="d" horiz-adv-x="381" d="M142 -10T108 7T52 77T31 232Q31 373 73 441T184 510Q230 510 256 490V698Q256 717 262 724T284 733T337 735V20Q273 -10 193 -10Q142 -10 108 7ZM234 62T256 77V427Q239 440 210 440Q120 440 120 241Q120
+168 129 129T154 76T196 62Q234 62 256 77Z" />
+<glyph unicode="e" glyph-name="e" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125 121T155 80T207
+68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402Z" />
+<glyph unicode="f" glyph-name="f" horiz-adv-x="254" d="M82 432H13Q13 459 14 475T18 496T33 500H82V561Q82 665 129 702T249 739Q294 739 318 728T342 698Q342 675 333 654Q304 666 262 666Q215 666 189 646T162 567V500H252Q252 473 251 457T247 436T235 432H162V16Q162
+11 159 6T145 0H82V432Z" />
+<glyph unicode="g" glyph-name="g" horiz-adv-x="394" d="M308 72T341 47T375 -34Q375 -104 326 -150T183 -197Q91 -197 57 -167T23 -88Q23 -54 44 -23T100 33Q37 50 38 87Q38 127 101 177Q39 217 39 327Q39 422 83 466T206 510Q229 510 256 502H375Q383 488 383
+464Q383 433 355 433Q342 433 319 438Q357 400 357 329Q357 246 318 200T195 154Q169 154 150 158Q123 131 123 114Q123 102 148 97T242 82Q308 72 341 47ZM167 451T146 422T124 329Q124 271 139 244T200 216Q239 216 257 249T276 348Q276 402 258 426T203 451Q167
+451 146 422ZM240 -123T266 -99T293 -45Q293 -22 283 -10T249 9T180 19L160 21Q137 3 122 -21T106 -69Q106 -96 124 -109T190 -123Q240 -123 266 -99Z" />
+<glyph unicode="h" glyph-name="h" horiz-adv-x="380" d="M45 698Q45 717 51 724T72 733T125 735V471Q147 490 177 500T238 510Q299 510 320 479T342 378V16Q342 7 338 4T313 1T260 0V356Q260 394 248 414T201 435Q182 435 162 429T125 408V16Q125 7 122 4T99
+1T45 0V698Z" />
+<glyph unicode="i" glyph-name="i" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM300 570T300 628Q300 692 346 692Q368 692 377 679T386 634Q386 604 374 587T340 570Q300 570 300 628Z" />
+<glyph unicode="j" glyph-name="j" horiz-adv-x="184" d="M-50 -196T-76 -182T-103 -143Q-103 -117 -91 -102Q-53 -122 -6 -122Q31 -122 42 -101T54 -24V463Q54 482 60 489T81 498T134 500V-36Q134 -111 106 -153T4 -196Q-50 -196 -76 -182ZM306 570T306 628Q306
+692 352 692Q374 692 383 679T392 634Q392 604 380 587T346 570Q306 570 306 628Z" />
+<glyph unicode="k" glyph-name="k" horiz-adv-x="376" d="M46 698Q46 717 52 724T74 733T127 735V464Q153 485 187 497T253 510Q338 510 338 424Q338 369 312 331T254 269Q293 252 320 209T354 100Q355 90 355 67Q355 43 352 16Q351 7 347 4T321 1T261 0Q265 29
+265 62Q265 93 260 123Q251 175 231 201T183 227Q176 227 172 226Q161 224 146 217T127 207V16Q127 7 124 4T101 1T46 0V698ZM249 314T249 397Q249 437 212 437Q166 437 127 389V265Q249 314 249 397Z" />
+<glyph unicode="l" glyph-name="l" horiz-adv-x="173" d="M46 698Q46 717 52 724T74 733T127 735V16Q127 7 123 4T100 1T46 0V698Z" />
+<glyph unicode="m" glyph-name="m" horiz-adv-x="564" d="M458 510T482 494T515 449T523 369V16Q523 7 519 4T495 1T442 0V370Q442 409 433 424T393 439Q356 439 325 420V16Q325 7 322 4T299 1T246 0H245V372Q245 400 242 413T229 433T195 440Q159 440 127 422V16Q127
+7 123 4T99 1T46 0V477Q119 510 197 510Q259 510 288 479Q313 493 346 501T410 510Q458 510 482 494Z" />
+<glyph unicode="n" glyph-name="n" horiz-adv-x="383" d="M45 476Q76 490 121 500T204 510Q282 510 313 480T344 376V16Q344 7 340 4T316 1T261 0V352Q261 402 249 421T201 440Q183 440 162 436T126 422V16Q126 7 122 4T98 1T45 0V476Z" />
+<glyph unicode="o" glyph-name="o" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135 400T115
+248Q115 168 123 127T146 72T186 58Q222 58 241 100Z" />
+<glyph unicode="p" glyph-name="p" horiz-adv-x="382" d="M63 -197T55 -190T46 -162V470Q109 510 192 510Q272 510 313 464T355 302Q355 121 313 56T206 -10Q180 -10 160 -2T127 18V-191Q108 -197 85 -197Q63 -197 55 -190ZM266 62T266 293Q266 352 258 384T233
+428T188 440Q154 440 127 421V95Q147 62 181 62Q266 62 266 293Z" />
+<glyph unicode="q" glyph-name="q" horiz-adv-x="387" d="M276 -198T261 -195V34Q231 -10 165 -10Q107 -10 69 38T30 218Q30 373 86 441T235 510Q269 510 294 503T342 479V-163Q342 -186 334 -191T294 -198Q276 -198 261 -195ZM215 60T233 73T261 112V426Q243
+440 215 440Q169 440 145 389T121 220Q121 127 141 94T195 61Q215 60 233 73Z" />
+<glyph unicode="r" glyph-name="r" horiz-adv-x="263" d="M45 465Q109 510 181 510Q218 510 234 500T251 468Q251 443 242 421Q221 433 194 433Q155 433 128 410L127 16Q127 7 123 4T99 1T45 0V465Z" />
+<glyph unicode="s" glyph-name="s" horiz-adv-x="346" d="M97 -10T64 3T30 40Q30 64 45 87Q86 63 144 63Q183 63 204 78T226 124Q226 146 217 165T186 203L89 286Q31 333 31 392Q31 447 72 478T195 510Q263 510 291 492T320 454Q320 445 315 434T303 413Q259 440
+204 440Q168 440 147 427T125 391Q125 376 133 363T165 329L258 254Q291 222 304 194T318 129Q318 63 274 27T152 -10Q97 -10 64 3Z" />
+<glyph unicode="t" glyph-name="t" horiz-adv-x="292" d="M141 -10T121 7T94 56T87 139V431H19Q19 458 20 474T24 495T36 500H87V652Q87 666 93 671T114 678T167 680V500H271Q271 473 270 456T266 435T254 431H167V139Q167 98 173 79T204 59Q220 59 232 62T262
+74Q268 54 268 34Q268 10 243 0T182 -10Q141 -10 121 7Z" />
+<glyph unicode="u" glyph-name="u" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8Z" />
+<glyph unicode="v" glyph-name="v" horiz-adv-x="344" d="M143 -6T135 6T121 43L19 475Q17 485 17 487Q17 494 23 496T51 499T104 500L136 339Q150 274 161 193T176 86H178Q181 111 192 192T216 340L243 482Q245 492 249 495T273 499T328 500L213 -3Q198 -6 156
+-6Q143 -6 135 6Z" />
+<glyph unicode="w" glyph-name="w" horiz-adv-x="541" d="M448 492T452 495T476 499T526 500Q510 421 466 209T418 -3Q415 -4 401 -5T366 -6Q354 -6 342 7T324 46L311 114Q288 220 274 363Q256 205 237 113L214 -3Q207 -4 188 -5T147 -6Q123 -6 113 43Q95 120
+61 276T16 483Q14 492 19 495T46 499T103 500L134 337Q146 267 156 191T169 93H175Q194 229 203 278L235 469Q237 480 241 483T261 486H314L353 276Q364 228 373 170T384 93H389Q393 140 402 210T421 337L446 482Q448 492 452 495Z" />
+<glyph unicode="x" glyph-name="x" horiz-adv-x="411" d="M395 9T395 8Q395 3 384 2T337 0H302L265 66Q243 107 199 201Q164 121 136 65L107 16Q103 8 96 5T68 1T15 0L157 260L35 487Q32 494 35 496T60 499T120 500L157 431Q185 379 211 317Q244 390 266 432L297
+486Q300 494 305 496T330 499T386 500L258 267L391 19Q395 9 395 8Z" />
+<glyph unicode="y" glyph-name="y" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192 154T208 261L253
+477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154Z" />
+<glyph unicode="z" glyph-name="z" horiz-adv-x="335" d="M33 1T30 5T24 19T21 40Q21 58 28 70L223 432H120Q63 432 28 427Q25 444 25 465Q25 483 31 491T51 500H306Q307 499 310 493T314 475Q314 456 305 436L115 75H204Q270 75 310 85Q312 77 312 50Q312 23
+306 12T280 0H34Q33 1 30 5Z" />
+<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="277" d="M154 -150T122 -117T89 -15Q89 26 96 80Q97 89 100 120T103 182Q103 220 90 237T48 260Q41 275 41 293Q41 321 58 333Q74 343 83 352T97 378T103 427Q103 458 100 492T96 536Q89 590 89 626Q89
+686 130 714T244 744Q260 722 260 694Q260 683 256 676T245 666Q208 663 190 644T171 585Q171 556 176 511Q182 445 182 403Q182 357 169 335T128 300Q155 289 168 268T182 205Q182 164 176 100Q171 53 171 22Q171 -15 180 -35T206 -63T253 -76Q255 -102 255 -106Q255
+-126 248 -138T227 -150Q154 -150 122 -117Z" />
+<glyph unicode="|" glyph-name="bar" horiz-adv-x="324" d="M122 793Q122 805 126 809T145 814T203 815V-180Q203 -191 199 -194T175 -199T122 -200V793Z" />
+<glyph unicode="}" glyph-name="braceright" horiz-adv-x="277" d="M18 -128T18 -100Q18 -75 33 -72Q106 -66 106 8Q106 28 102 84Q96 148 96 191Q96 237 109 259T149 294Q122 305 109 326T96 389Q96 430 102 494Q106 550 106 573Q106 610 97 629T71 657T25 670Q21
+686 21 701Q21 720 29 732T50 744Q123 744 155 711T188 609Q188 568 181 514Q180 505 177 474T174 412Q174 374 187 357T229 334Q236 317 236 301Q236 272 218 261Q201 250 193 242T180 216T174 167Q174 128 182 58Q188 -6 188 -32Q188 -92 146 -121T33 -150Q18
+-128 18 -100Z" />
+<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="400" d="M237 212T221 218T185 237Q169 247 158 251T132 256Q115 256 102 250T72 232Q58 221 46 218Q32 217 22 230T11 266Q26 289 61 309T140 329Q164 329 178 324T212 306Q228 296 240 291T270 286Q309
+286 341 320Q347 325 357 325Q370 325 380 311T391 277Q373 252 340 232T263 212Q237 212 221 218Z" />
+<glyph unicode="&#xa0;" glyph-name="uni00A0" horiz-adv-x="158" />
+<glyph unicode="&#xa1;" glyph-name="exclamdown" horiz-adv-x="195" d="M46 394T46 451Q46 476 61 492T102 508Q132 508 144 494T157 451Q157 427 142 411T102 394Q46 394 46 451ZM61 256Q62 274 69 281T91 291T141 293L155 -174Q155 -185 147 -190T117 -196T45
+-197L61 256Z" />
+<glyph unicode="&#xa2;" glyph-name="cent" horiz-adv-x="418" d="M277 64T299 71T335 88Q343 68 343 37Q343 23 319 9T263 -9V-102Q263 -121 247 -127T190 -133V-7Q154 -1 131 20T96 91T83 228Q83 471 213 504V592Q213 611 230 618T286 626V508Q310 503 327 494T345
+475Q345 437 337 417Q305 435 269 435Q239 435 217 421T179 362T164 231Q164 156 174 121T202 75T257 64Q277 64 299 71Z" />
+<glyph unicode="&#xa3;" glyph-name="sterling" horiz-adv-x="366" d="M322 74Q329 54 329 37Q329 0 277 0H89Q80 121 78 277H15Q15 320 17 333T31 347H78Q82 480 122 537T238 595Q280 595 309 582T338 542Q338 530 335 518T327 493Q294 514 256 514Q210 514 185
+479T158 347H288Q288 305 286 291T272 277H158Q160 146 165 80L322 74Z" />
+<glyph unicode="&#xa4;" glyph-name="currency" horiz-adv-x="571" d="M560 49Q535 24 525 15T507 6Q504 6 498 10L417 91Q371 52 286 52Q201 52 154 90L62 -2Q39 21 30 32T20 51Q20 56 24 60L110 146Q87 198 87 276Q87 350 107 401L12 496Q37 521 47 530T65 539Q69
+539 73 535L147 461Q198 506 291 506Q380 506 427 463L510 546Q534 522 543 512T552 493Q552 489 548 485L466 403Q484 357 484 286Q484 202 460 148L560 49ZM348 121T377 162T407 288Q407 365 380 402T295 439Q230 439 199 398T167 271Q167 195 196 158T288 121Q348
+121 377 162Z" />
+<glyph unicode="&#xa5;" glyph-name="yen" horiz-adv-x="418" d="M249 243H379Q379 205 373 191T347 176H249V16Q249 7 246 4T223 1T169 0V176H38Q38 215 44 229T70 243H169V284L149 341H38Q38 380 44 394T70 408H126L30 687Q28 694 32 696T59 699T122 700L161
+563Q179 505 193 449T209 372Q211 392 226 451T259 563L297 685Q300 693 304 696T329 699T384 700L288 408H378Q378 370 372 356T347 341H266L249 290V243Z" />
+<glyph unicode="&#xa6;" glyph-name="brokenbar" horiz-adv-x="227" d="M90 326T73 330V711Q73 729 82 736T115 743Q135 743 153 737V354Q153 337 146 332T112 326Q90 326 73 330ZM89 -198T73 -193V192Q73 210 82 217T115 225Q135 225 153 219V-169Q153 -187 146
+-192T112 -198Q89 -198 73 -193Z" />
+<glyph unicode="&#xa7;" glyph-name="section" horiz-adv-x="348" d="M264 201Q284 174 292 155T301 112Q301 58 259 27T150 -4Q106 -4 78 9T43 39Q40 44 40 55Q40 83 56 105Q90 81 137 81Q171 81 190 94T209 128Q209 142 202 154T179 185Q179 185 141 223Q94
+268 72 296Q53 320 45 340T36 388Q36 415 49 442T91 489L83 499Q63 524 55 543T46 587Q46 641 88 672T198 703Q242 703 269 690T304 661Q307 652 307 644Q307 617 291 595Q259 618 209 618Q175 618 157 605T138 571Q138 557 144 546T167 515Q181 500 202 480Q221
+462 242 441T275 404Q295 380 303 360T311 312Q311 286 297 259T255 212L264 201ZM151 300T171 284T196 264Q214 271 225 287T236 318Q236 335 229 350T207 384Q196 399 176 415T151 435Q133 429 122 413T111 382Q111 363 118 348T140 315Q151 300 171 284Z" />
+<glyph unicode="&#xa8;" glyph-name="dieresis" horiz-adv-x="269" d="M53 573T44 586T34 632Q34 659 45 674T78 689Q100 689 108 677T117 634Q117 604 106 588T73 572Q53 573 44 586ZM173 573T163 585T153 628Q153 689 197 689Q219 689 227 677T236 634Q234 572
+192 572Q173 573 163 585Z" />
+<glyph unicode="&#xa9;" glyph-name="copyright" horiz-adv-x="471" d="M133 320T85 371T36 541Q36 652 89 706T242 760Q343 760 389 711T436 543Q436 435 384 378T234 320Q133 320 85 371ZM296 378T335 418T375 544Q375 628 342 666T241 705Q96 705 96 541Q96
+452 129 415T232 378Q296 378 335 418ZM211 416T193 424T166 456T157 531Q157 613 183 640T249 668Q264 668 279 663T294 652Q294 644 288 620Q268 628 254 628Q231 628 218 609T204 529Q204 497 208 482T222 462T247 457Q266 457 286 467Q289 461 291 452T293
+437Q293 430 277 423T243 416Q211 416 193 424Z" />
+<glyph unicode="&#xaa;" glyph-name="ordfeminine" horiz-adv-x="323" d="M100 288T71 312T41 411Q41 478 69 506T150 534Q182 534 214 524V582Q214 615 198 627T152 639Q105 639 57 617Q47 630 47 652Q47 668 53 675Q85 710 176 710Q225 710 253 685T282 608V317Q259
+306 224 297T154 288Q100 288 71 312ZM179 346T193 349T214 358V468Q206 472 194 474T172 476Q138 476 122 464T105 409Q105 373 120 360T165 346Q179 346 193 349Z" />
+<glyph unicode="&#xab;" glyph-name="guillemotleft" horiz-adv-x="416" d="M156 16T120 70T51 181T18 253Q18 268 50 322T118 430T164 500Q178 500 188 491T205 472T212 459Q212 442 186 397T132 309T94 253Q103 240 132 198T187 109T214 47Q213 43 207 32T191
+11T167 0Q156 16 120 70ZM326 38T291 86T223 185T190 251Q190 265 222 315T288 414T334 477Q347 477 357 469T374 451T381 439Q381 423 356 381T303 301T267 251Q276 240 303 203T357 125T383 69Q382 66 376 55T360 34T337 24Q326 38 291 86Z" />
+<glyph unicode="&#xac;" glyph-name="logicalnot" horiz-adv-x="400" d="M358 111Q342 105 321 105Q304 105 293 111T282 131V232H40Q34 252 34 270Q34 287 40 297T60 308H358V111Z" />
+<glyph unicode="&#xad;" glyph-name="uni00AD" horiz-adv-x="278" d="M37 290T39 303T54 317H241Q241 275 239 261T225 247H37Q37 290 39 303Z" />
+<glyph unicode="&#xae;" glyph-name="registered" horiz-adv-x="471" d="M343 760T389 711T436 543Q436 435 384 378T234 320Q133 320 85 371T36 541Q36 652 89 706T242 760Q343 760 389 711ZM296 378T335 418T375 544Q375 628 342 666T241 705Q96 705 96 541Q96
+452 129 415T232 378Q296 378 335 418ZM288 517T300 492T315 426Q315 420 312 418T299 416Q281 416 274 417Q268 491 239 518Q235 517 227 517H214V425Q214 419 208 418T176 417V665Q176 666 177 668T183 670H227Q308 670 308 598Q308 550 274 529Q288 517 300
+492ZM219 551T230 551Q249 551 258 562T268 600Q268 618 260 627T232 637H214V552Q219 551 230 551Z" />
+<glyph unicode="&#xaf;" glyph-name="overscore" horiz-adv-x="269" d="M1 601T1 624Q1 642 10 652T34 663H261Q268 646 268 629Q268 611 260 599T238 587H6Q1 601 1 624Z" />
+<glyph unicode="&#xb0;" glyph-name="degree" horiz-adv-x="358" d="M129 553T107 573T84 649Q84 746 184 746Q233 746 254 725T276 650Q276 602 251 578T177 553Q129 553 107 573ZM223 604T223 650Q223 674 214 684T184 694Q161 694 150 684T138 648Q138 604
+179 604Q223 604 223 650Z" />
+<glyph unicode="&#xb1;" glyph-name="plusminus" horiz-adv-x="419" d="M385 359Q385 317 383 303T369 289H246V165Q246 154 232 152T175 149V289H35Q35 332 37 345T52 359H175V483Q175 494 189 496T246 499V359H385ZM34 58T36 71T51 85H384Q384 43 382 29T368
+15H34Q34 58 36 71Z" />
+<glyph unicode="&#xb2;" glyph-name="uni00B2" d="M41 301T41 315Q41 344 53 357Q77 385 138 444Q188 491 210 518T232 576Q232 600 219 614T168 628Q139 628 116 618T66 590Q57 606 54 616T51 639Q51 657 74 673T134 700T205 710Q274 710 302 683T330 604Q330
+556 300 515T212 416Q170 373 162 365H339Q344 342 344 330Q344 289 318 289H47Q41 301 41 315Z" />
+<glyph unicode="&#xb3;" glyph-name="uni00B3" d="M304 503T322 478T340 423Q340 352 292 316T165 279Q126 279 98 286T57 305Q45 314 45 335Q45 347 50 359T64 379Q103 353 161 353Q205 353 231 369T257 416Q257 438 242 452T199 470Q181 473 128 473Q126 476
+123 489T119 510Q119 535 144 535Q171 535 197 532Q218 548 227 562T236 594Q236 612 221 625T171 638Q113 638 67 605Q51 622 51 645Q51 663 61 671Q79 688 116 699T204 710Q266 710 295 686T325 620Q325 592 312 565T273 516Q304 503 322 478Z" />
+<glyph unicode="&#xb4;" glyph-name="acute" horiz-adv-x="271" d="M73 560T66 570T55 591T50 605Q82 641 129 681T184 722Q197 722 207 703T221 661Q209 648 158 611T81 560Q73 560 66 570Z" />
+<glyph unicode="&#xb5;" glyph-name="uni00B5" horiz-adv-x="395" d="M70 -195T45 -190V470Q45 488 54 496T86 505Q110 505 125 500V131Q125 98 143 82T195 66Q237 66 269 81V470Q269 488 277 496T308 505Q334 505 349 500V24Q317 9 277 0T194 -10Q146 -10 125
+15V-163Q125 -195 80 -195Q70 -195 45 -190Z" />
+<glyph unicode="&#xb6;" glyph-name="paragraph" horiz-adv-x="541" d="M289 -3T271 3V205Q257 198 235 194T191 190Q121 190 78 242T34 420Q34 569 86 639T231 710Q298 710 352 682V26Q352 -3 312 -3Q289 -3 271 3ZM430 -3T414 2V658Q414 676 423 683T456 690Q477
+690 495 684V26Q495 8 487 3T453 -3Q430 -3 414 2ZM226 255T243 258T271 269V630Q253 641 220 641Q169 641 143 588T116 428Q116 331 143 294T212 255Q226 255 243 258Z" />
+<glyph unicode="&#xb7;" glyph-name="middot" horiz-adv-x="220" d="M79 212T66 226T53 269Q53 293 68 309T109 326Q165 326 165 269Q165 244 150 228T109 212Q79 212 66 226Z" />
+<glyph unicode="&#xb8;" glyph-name="cedilla" horiz-adv-x="269" d="M177 -58T191 -74T206 -122Q206 -160 184 -183T126 -206Q107 -206 89 -200T70 -193Q71 -188 75 -172T83 -152Q86 -149 101 -156T128 -163Q159 -163 159 -129Q159 -95 129 -95Q113 -95 102 -97T88
+-101L107 2H152L140 -59Q141 -58 157 -58Q177 -58 191 -74Z" />
+<glyph unicode="&#xb9;" glyph-name="uni00B9" horiz-adv-x="382" d="M45 308T45 323Q45 345 50 355T72 365H166V622L58 600Q48 616 48 638Q48 666 74 676Q109 688 157 699T223 710Q241 710 247 707V365H334Q338 339 338 329Q338 307 333 298T313 289H49Q45 308 45 323Z" />
+<glyph unicode="&#xba;" glyph-name="ordmasculine" horiz-adv-x="338" d="M121 289T93 307T50 372T35 499Q35 607 71 658T174 710Q220 710 247 692T289 628T303 501Q303 394 268 342T165 289Q121 289 93 307ZM200 356T217 389T235 499Q235 580 221 609T175 639Q139
+639 121 606T103 494Q103 414 118 385T166 356Q200 356 217 389Z" />
+<glyph unicode="&#xbb;" glyph-name="guillemotright" horiz-adv-x="414" d="M244 1T233 6T211 21T200 46Q200 62 227 108T283 197T321 253Q312 266 284 308T229 396T203 459Q203 471 213 480T235 494T251 500Q262 484 297 431T364 323T396 253Q396 237 363 181T295
+71T248 0Q244 1 233 6ZM73 23T63 28T43 43T33 68Q33 84 59 124T112 202T149 250Q152 250 126 284Q84 343 60 382T35 439Q35 451 45 460T65 474T79 480Q90 465 125 416T192 316T224 250Q224 234 191 184T123 85T76 22Q73 23 63 28Z" />
+<glyph unicode="&#xbc;" glyph-name="onequarter" horiz-adv-x="959" d="M41 307T41 323Q41 345 46 355T68 365H162V622L54 600Q44 616 44 638Q44 665 71 676Q105 688 153 699T219 710Q237 710 244 707V365H330Q334 348 334 329Q334 307 329 298T310 289H46Q41
+307 41 323ZM324 -10T309 -2T281 19L617 691Q625 710 645 710Q658 710 673 703T700 682L361 5Q355 -10 337 -10Q324 -10 309 -2ZM808 -6T792 -2V70H621Q607 85 607 110Q607 125 614 143Q632 202 677 275T764 390Q780 409 796 415T834 421Q853 421 868 416V147H927Q934
+130 934 109Q934 91 927 81T909 70H868V19Q868 -6 825 -6Q808 -6 792 -2ZM795 141L799 329Q766 303 731 247T682 141H795Z" />
+<glyph unicode="&#xbd;" glyph-name="onehalf" horiz-adv-x="947" d="M41 307T41 323Q41 345 46 355T68 365H162V622L54 600Q44 616 44 638Q44 665 71 676Q105 688 153 699T219 710Q237 710 244 707V365H330Q334 348 334 329Q334 307 329 298T310 289H46Q41 307
+41 323ZM324 -10T309 -2T281 19L617 691Q625 710 645 710Q658 710 673 703T700 682L361 5Q355 -10 337 -10Q324 -10 309 -2ZM607 12T607 26Q607 55 619 68Q643 96 704 155Q754 202 776 229T798 287Q798 311 785 325T734 339Q706 339 682 329T632 301Q623 317 621
+327T618 350Q618 368 641 384T700 411T771 421Q840 421 868 394T896 315Q896 281 879 249T839 190T776 125Q735 84 728 76H905Q910 53 910 41Q910 0 884 0H613Q607 12 607 26Z" />
+<glyph unicode="&#xbe;" glyph-name="threequarters" horiz-adv-x="961" d="M300 503T318 478T336 423Q336 352 288 316T161 279Q122 279 95 286T54 305Q41 314 41 335Q41 347 46 359T61 379Q98 353 158 353Q202 353 227 369T253 416Q253 438 238 452T196 470Q177
+473 124 473Q122 476 119 489T115 510Q115 535 140 535Q169 535 194 532Q215 547 223 561T232 594Q232 612 217 625T168 638Q109 638 64 605Q48 622 48 646Q48 664 57 671Q75 688 112 699T201 710Q262 710 291 686T321 620Q321 592 308 565T269 516Q300 503 318
+478ZM326 -10T311 -2T283 19L619 691Q627 710 647 710Q660 710 675 703T702 682L363 5Q357 -10 339 -10Q326 -10 311 -2ZM810 -6T794 -2V70H623Q609 85 609 110Q609 125 616 143Q634 202 679 275T766 390Q782 409 798 415T836 421Q855 421 870 416V147H929Q936
+130 936 109Q936 91 929 81T911 70H870V19Q870 -6 827 -6Q810 -6 794 -2ZM797 141L801 329Q768 303 733 247T684 141H797Z" />
+<glyph unicode="&#xbf;" glyph-name="questiondown" horiz-adv-x="306" d="M138 392T125 407T111 450Q111 474 126 490T167 506Q197 506 210 492T223 450Q223 426 208 409T167 392Q138 392 125 407ZM89 -195T52 -160T14 -56Q14 3 33 43T89 131Q117 170 125 184Q137
+205 137 232Q137 242 132 272Q130 281 130 288T131 298Q141 308 176 308Q188 308 204 306Q205 304 208 295T215 270T219 236Q219 198 201 163Q186 135 156 93Q127 49 114 23T101 -37Q101 -114 182 -114Q228 -114 266 -89Q278 -119 278 -153Q278 -170 239 -182T153
+-195Q89 -195 52 -160Z" />
+<glyph unicode="&#xc0;" glyph-name="Agrave" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM253 768T202 804T140 855Q144 877 154 896T177 916Q184 916 232 875T311 798Q310 795 306 784T295 763T280 753Q253 768 202 804Z" />
+<glyph unicode="&#xc1;" glyph-name="Aacute" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM163 760T156 770T145 791T140 805Q172 841 219 881T274 922Q287 922 297 903T311 861Q299 848 248 811T171 760Q163 760 156 770Z" />
+<glyph unicode="&#xc2;" glyph-name="Acircumflex" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208
+499 183 395L149 251H288ZM279 770T255 796T222 838Q218 832 203 814T172 779T147 762Q111 762 92 785L206 908Q214 911 223 911Q237 911 248 899Q255 892 278 867T323 817T345 784Q345 774 328 768T288 761Q279 770 255 796Z" />
+<glyph unicode="&#xc3;" glyph-name="Atilde" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM238 763T227 770T205 790Q195 801 188 806T170 811Q156 811 147 804T127 785T111 772Q101 772 93 781T79 799T72 812Q96 851 125 869T185 887Q200 887 209 881T230 863Q241 851 250 845T272 839Q292 839 302 846T322 866T337 878Q345 878
+351 868T361 847T366 833Q362 824 347 808T309 777T258 763Q238 763 227 770Z" />
+<glyph unicode="&#xc4;" glyph-name="Adieresis" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208
+499 183 395L149 251H288ZM137 773T128 786T118 832Q118 859 129 874T162 889Q184 889 192 877T201 834Q201 804 190 788T157 772Q137 773 128 786ZM257 773T247 785T237 828Q237 889 281 889Q303 889 311 877T320 834Q318 772 276 772Q257 773 247 785Z" />
+<glyph unicode="&#xc5;" glyph-name="Aring" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM169 743T146 764T123 839Q123 888 149 912T223 937Q271 937 293 916T315 840Q315 792 290 768T216 743Q169 743 146 764ZM259 797T259 840Q259 862 250 871T223 881Q180 881 180 838Q180 818 189 808T218 797Q259 797 259 840Z" />
+<glyph unicode="&#xc6;" glyph-name="AE" horiz-adv-x="615" d="M420 73H592Q592 44 592 26T588 4T576 0H340V178H174L105 14Q102 5 95 2T68 -2Q45 -2 17 1L311 686Q317 700 337 700H596Q596 672 596 654T592 632T581 627H420V418H571Q571 391 571 373T567 350T556
+344H420V73ZM340 251V615Q304 490 264 392L205 251H340Z" />
+<glyph unicode="&#xc7;" glyph-name="Ccedilla" horiz-adv-x="341" d="M243 79T268 88T308 111Q320 85 320 62Q320 35 293 15T220 -9L210 -59Q211 -58 227 -58Q247 -58 261 -74T276 -122Q276 -160 254 -183T196 -206Q177 -206 159 -200T140 -193Q141 -188 145
+-172T153 -152Q156 -149 171 -156T198 -163Q229 -163 229 -129Q229 -95 199 -95Q183 -95 172 -97T158 -101L175 -9Q128 -6 97 21T48 120T30 321Q30 480 59 566T130 681T227 710Q277 710 299 694T321 655Q321 628 308 606Q277 631 243 631Q206 631 178 608T133 517T115
+325Q115 227 127 173T161 99T215 79Q243 79 268 88Z" />
+<glyph unicode="&#xc8;" glyph-name="Egrave" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM204 768T153 804T91 855Q95
+877 105 896T128 916Q135 916 183 875T262 798Q261 795 257 784T246 763T231 753Q204 768 153 804Z" />
+<glyph unicode="&#xc9;" glyph-name="Eacute" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM114 760T107 770T96 791T91
+805Q123 841 170 881T225 922Q238 922 248 903T262 861Q250 848 199 811T122 760Q114 760 107 770Z" />
+<glyph unicode="&#xca;" glyph-name="Ecircumflex" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM230 770T206 796T173
+838Q169 832 154 814T123 779T98 762Q62 762 43 785L157 908Q165 911 174 911Q188 911 199 899Q206 892 229 867T274 817T296 784Q296 774 279 768T239 761Q230 770 206 796Z" />
+<glyph unicode="&#xcb;" glyph-name="Edieresis" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM88 773T79 786T69 832Q69
+859 80 874T113 889Q135 889 143 877T152 834Q152 804 141 788T108 772Q88 773 79 786ZM208 773T198 785T188 828Q188 889 232 889Q254 889 262 877T271 834Q269 772 227 772Q208 773 198 785Z" />
+<glyph unicode="&#xcc;" glyph-name="Igrave" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM119 768T68 804T6 855Q10 877 20 896T43 916Q50 916 98 875T177 798Q176 795 172 784T161 763T146 753Q119 768 68 804Z" />
+<glyph unicode="&#xcd;" glyph-name="Iacute" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM29 760T22 770T11 791T6 805Q38 841 85 881T140 922Q153 922 163 903T177 861Q165 848 114 811T37 760Q29 760 22 770Z" />
+<glyph unicode="&#xce;" glyph-name="Icircumflex" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM145 770T121 796T88 838Q84 832 69 814T38 779T13 762Q-23 762 -42 785L72 908Q80 911 89 911Q103 911 114 899Q121
+892 144 867T189 817T211 784Q211 774 194 768T154 761Q145 770 121 796Z" />
+<glyph unicode="&#xcf;" glyph-name="Idieresis" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM3 773T-6 786T-16 832Q-16 859 -5 874T28 889Q50 889 58 877T67 834Q67 804 56 788T23 772Q3 773 -6 786ZM123 773T113
+785T103 828Q103 889 147 889Q169 889 177 877T186 834Q184 772 142 772Q123 773 113 785Z" />
+<glyph unicode="&#xd0;" glyph-name="Eth" horiz-adv-x="388" d="M237 700T279 672T342 577T364 394Q364 247 342 160T276 37T169 0H44V331H5Q5 374 7 387T21 401H44V681Q44 691 50 695T71 700H169Q237 700 279 672ZM201 77T223 100T259 193T273 394Q273 485 262
+535T229 606T171 626H125V401H205Q205 359 203 345T188 331H125V77H171Q201 77 223 100Z" />
+<glyph unicode="&#xd1;" glyph-name="Ntilde" horiz-adv-x="444" d="M320 693T324 696T348 699T401 700V16Q401 0 384 0H324L209 275Q185 339 114 560Q118 517 121 416T124 259V16Q124 7 121 4T97 1T44 0V684Q44 700 60 700H121L234 430Q247 395 308 211Q312 199
+330 146V149Q325 188 323 290T320 448V684Q320 693 324 696ZM241 763T230 770T208 790Q198 801 191 806T173 811Q159 811 150 804T130 785T114 772Q104 772 96 781T82 799T75 812Q99 851 128 869T188 887Q203 887 212 881T233 863Q244 851 253 845T275 839Q295
+839 305 846T325 866T340 878Q348 878 354 868T364 847T369 833Q365 824 350 808T312 777T261 763Q241 763 230 770Z" />
+<glyph unicode="&#xd2;" glyph-name="Ograve" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM249 768T198 804T136 855Q140 877 150 896T173 916Q180 916 228 875T307 798Q306 795 302 784T291 763T276 753Q249 768 198 804Z" />
+<glyph unicode="&#xd3;" glyph-name="Oacute" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM159 760T152 770T141 791T136 805Q168 841 215 881T270 922Q283 922 293 903T307 861Q295 848 244 811T167 760Q159 760 152 770Z" />
+<glyph unicode="&#xd4;" glyph-name="Ocircumflex" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312
+459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM275 770T251 796T218 838Q214 832 199 814T168 779T143 762Q107 762 88 785L202 908Q210 911 219 911Q233 911 244 899Q251 892 274 867T319 817T341
+784Q341 774 324 768T284 761Q275 770 251 796Z" />
+<glyph unicode="&#xd5;" glyph-name="Otilde" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM234 763T223 770T201 790Q191 801 184 806T166 811Q152 811 143 804T123 785T107 772Q97 772 89 781T75 799T68 812Q92 851 121 869T181 887Q196 887
+205 881T226 863Q237 851 246 845T268 839Q288 839 298 846T318 866T333 878Q341 878 347 868T357 847T362 833Q358 824 343 808T305 777T254 763Q234 763 223 770Z" />
+<glyph unicode="&#xd6;" glyph-name="Odieresis" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312
+459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM133 773T124 786T114 832Q114 859 125 874T158 889Q180 889 188 877T197 834Q197 804 186 788T153 772Q133 773 124 786ZM253 773T243 785T233 828Q233
+889 277 889Q299 889 307 877T316 834Q314 772 272 772Q253 773 243 785Z" />
+<glyph unicode="&#xd7;" glyph-name="multiply" horiz-adv-x="418" d="M257 281L345 183Q319 157 309 149T292 140Q290 140 284 144L209 228L133 144Q127 140 125 140Q118 140 108 148T72 183L160 281L71 381Q76 386 90 399T111 418T124 423Q129 423 133 419L209
+335L284 419Q288 423 293 423Q300 423 308 416T329 398T346 381L257 281Z" />
+<glyph unicode="&#xd8;" glyph-name="Oslash" horiz-adv-x="436" d="M415 685T381 585Q403 506 403 357Q403 220 383 140T322 25T214 -10Q174 -10 145 0T94 35Q81 -1 73 -16Q59 -16 43 -9T24 9Q23 12 35 44T59 102Q33 183 33 354Q33 486 53 564T114 676T222 710Q262
+710 291 699T341 664Q359 712 363 719Q367 719 378 717T401 709T414 694Q415 685 381 585ZM186 628T165 600T134 507T124 334Q124 228 132 176L281 599Q261 628 222 628Q186 628 165 600ZM247 73T269 95T303 178T315 355Q315 463 307 516Q249 349 157 98Q176 73
+211 73Q247 73 269 95Z" />
+<glyph unicode="&#xd9;" glyph-name="Ugrave" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10
+109 18ZM253 768T202 804T140 855Q144 877 154 896T177 916Q184 916 232 875T311 798Q310 795 306 784T295 763T280 753Q253 768 202 804Z" />
+<glyph unicode="&#xda;" glyph-name="Uacute" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10
+109 18ZM163 760T156 770T145 791T140 805Q172 841 219 881T274 922Q287 922 297 903T311 861Q299 848 248 811T171 760Q163 760 156 770Z" />
+<glyph unicode="&#xdb;" glyph-name="Ucircumflex" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148
+-10 109 18ZM279 770T255 796T222 838Q218 832 203 814T172 779T147 762Q111 762 92 785L206 908Q214 911 223 911Q237 911 248 899Q255 892 278 867T323 817T345 784Q345 774 328 768T288 761Q279 770 255 796Z" />
+<glyph unicode="&#xdc;" glyph-name="Udieresis" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148
+-10 109 18ZM137 773T128 786T118 832Q118 859 129 874T162 889Q184 889 192 877T201 834Q201 804 190 788T157 772Q137 773 128 786ZM257 773T247 785T237 828Q237 889 281 889Q303 889 311 877T320 834Q318 772 276 772Q257 773 247 785Z" />
+<glyph unicode="&#xdd;" glyph-name="Yacute" horiz-adv-x="364" d="M225 16Q225 7 222 4T198 1T144 0V285L6 687Q4 694 8 696T35 699T97 700L137 563Q152 516 168 446T187 353Q189 375 206 445T238 563L273 685Q275 693 279 696T304 699T360 700L225 290V16ZM126
+760T119 770T108 791T103 805Q135 841 182 881T237 922Q250 922 260 903T274 861Q262 848 211 811T134 760Q126 760 119 770Z" />
+<glyph unicode="&#xde;" glyph-name="Thorn" horiz-adv-x="361" d="M44 680Q44 693 54 696T98 700H124V566H159Q254 566 298 519T343 369Q343 253 293 202T160 150H124V16Q124 7 120 4T96 1T44 0V680ZM212 225T233 260T254 378Q254 435 236 465T174 495Q139 495
+124 493V228Q131 228 144 227T168 225Q212 225 233 260Z" />
+<glyph unicode="&#xdf;" glyph-name="germandbls" horiz-adv-x="465" d="M65 -9T52 -4T39 2Q40 4 42 13T47 38T50 74L48 550Q48 629 90 667T208 705Q277 705 322 685T388 631T409 561Q409 529 394 510T348 467Q323 449 312 436T300 403Q300 385 313 368T355 325Q387
+294 407 270T441 213T456 138Q456 70 416 31T306 -9Q269 -9 242 -2T201 15T187 36Q187 69 208 90Q217 81 238 72T288 63Q324 63 345 82T366 137Q366 172 347 201T288 270Q250 309 231 337T212 399Q212 432 228 452T276 497Q300 515 311 528T323 560Q323 589 295
+609T214 630Q166 630 148 601T129 504L131 44Q131 14 122 3T84 -9Q65 -9 52 -4Z" />
+<glyph unicode="&#xe0;" glyph-name="agrave" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM209 568T158 604T96 655Q100 677 110 696T133 716Q140 716 188 675T267 598Q266
+595 262 584T251 563T236 553Q209 568 158 604Z" />
+<glyph unicode="&#xe1;" glyph-name="aacute" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM119 560T112 570T101 591T96 605Q128 641 175 681T230 722Q243 722 253 703T267
+661Q255 648 204 611T127 560Q119 560 112 570Z" />
+<glyph unicode="&#xe2;" glyph-name="acircumflex" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288
+482T317 388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM235 570T211 596T178 638Q174 632 159 614T128 579T103 562Q67 562
+48 585L162 708Q170 711 179 711Q193 711 204 699Q211 692 234 667T279 617T301 584Q301 574 284 568T244 561Q235 570 211 596Z" />
+<glyph unicode="&#xe3;" glyph-name="atilde" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM194 563T183 570T161 590Q151 601 144 606T126 611Q112 611 103 604T83 585T67
+572Q57 572 49 581T35 599T28 612Q52 651 81 669T141 687Q156 687 165 681T186 663Q197 651 206 645T228 639Q248 639 258 646T278 666T293 678Q301 678 307 668T317 647T322 633Q318 624 303 608T265 577T214 563Q194 563 183 570Z" />
+<glyph unicode="&#xe4;" glyph-name="adieresis" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288
+482T317 388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM93 573T84 586T74 632Q74 659 85 674T118 689Q140 689 148 677T157
+634Q157 604 146 588T113 572Q93 573 84 586ZM213 573T203 585T193 628Q193 689 237 689Q259 689 267 677T276 634Q274 572 232 572Q213 573 203 585Z" />
+<glyph unicode="&#xe5;" glyph-name="aring" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM125 543T102 564T79 639Q79 688 105 712T179 737Q227 737 249 716T271 640Q271
+592 246 568T172 543Q125 543 102 564ZM215 597T215 640Q215 662 206 671T179 681Q136 681 136 638Q136 618 145 608T174 597Q215 597 215 640Z" />
+<glyph unicode="&#xe6;" glyph-name="ae" horiz-adv-x="583" d="M478 69T532 100Q539 79 539 28Q539 21 520 13T468 -2T401 -9Q367 -9 344 -3T302 20Q255 -9 164 -9Q122 -9 94 1T47 46T29 148Q29 319 160 319Q210 319 236 306V378Q236 412 218 425T168 438Q93
+438 42 411Q32 429 32 459Q32 466 35 472T42 483Q58 494 98 502T197 510Q238 510 262 497T296 453Q317 487 346 498T418 510Q545 510 545 351Q545 270 534 220Q497 214 445 214Q383 214 324 225Q324 157 333 124T360 80T410 69Q478 69 532 100ZM376 439T354 406T326
+289Q388 277 426 277Q446 277 462 280Q467 303 467 342Q466 397 454 418T409 439Q376 439 354 406ZM236 250Q217 258 189 258Q154 258 134 235T113 149Q113 110 121 90T142 64T178 58Q195 58 212 62T236 74V250Z" />
+<glyph unicode="&#xe7;" glyph-name="ccedilla" horiz-adv-x="313" d="M227 62T248 68T284 85Q292 56 292 41Q292 20 262 6T184 -10L174 -59Q175 -58 191 -58Q211 -58 225 -74T240 -122Q240 -160 218 -183T160 -206Q141 -206 123 -200T104 -193Q105 -188 109 -172T117
+-152Q120 -149 135 -156T162 -163Q193 -163 193 -129Q193 -95 163 -95Q147 -95 136 -97T122 -101L139 -7Q102 -1 79 23T43 99T31 239Q31 400 81 455T210 510Q246 510 270 497T294 465Q294 442 285 420Q251 439 214 439Q170 439 142 399T114 238Q114 169 123 131T152
+77T204 62Q227 62 248 68Z" />
+<glyph unicode="&#xe8;" glyph-name="egrave" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM223 568T172 604T110 655Q114 677 124 696T147 716Q154 716 202 675T281 598Q280 595 276 584T265 563T250 553Q223 568
+172 604Z" />
+<glyph unicode="&#xe9;" glyph-name="eacute" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM133 560T126 570T115 591T110 605Q142 641 189 681T244 722Q257 722 267 703T281 661Q269 648 218 611T141 560Q133 560
+126 570Z" />
+<glyph unicode="&#xea;" glyph-name="ecircumflex" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150
+125 121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM249 570T225 596T192 638Q188 632 173 614T142 579T117 562Q81 562 62 585L176 708Q184 711 193 711Q207 711 218
+699Q225 692 248 667T293 617T315 584Q315 574 298 568T258 561Q249 570 225 596Z" />
+<glyph unicode="&#xeb;" glyph-name="edieresis" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM107 573T98 586T88 632Q88 659 99 674T132 689Q154 689 162 677T171 634Q171 604 160 588T127 572Q107 573 98 586ZM227
+573T217 585T207 628Q207 689 251 689Q273 689 281 677T290 634Q288 572 246 572Q227 573 217 585Z" />
+<glyph unicode="&#xec;" glyph-name="igrave" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM377 568T326 604T264 655Q268 677 278 696T301 716Q308 716 356 675T435 598Q434 595 430 584T419 563T404 553Q377
+568 326 604Z" />
+<glyph unicode="&#xed;" glyph-name="iacute" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM31 560T24 570T13 591T8 605Q40 641 87 681T142 722Q155 722 165 703T179 661Q167 648 116 611T39 560Q31 560 24 570Z" />
+<glyph unicode="&#xee;" glyph-name="icircumflex" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM147 570T123 596T90 638Q86 632 71 614T40 579T15 562Q-21 562 -40 585L74 708Q82 711 91 711Q105 711 116 699Q123
+692 146 667T191 617T213 584Q213 574 196 568T156 561Q147 570 123 596Z" />
+<glyph unicode="&#xef;" glyph-name="idieresis" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM261 573T252 586T242 632Q242 659 253 674T286 689Q308 689 316 677T325 634Q325 604 314 588T281 572Q261 573 252
+586ZM381 573T371 585T361 628Q361 689 405 689Q427 689 435 677T444 634Q442 572 400 572Q381 573 371 585Z" />
+<glyph unicode="&#xf0;" glyph-name="eth" horiz-adv-x="408" d="M380 504T380 289Q380 149 344 70T209 -10Q116 -10 73 51T30 257Q30 378 73 443T190 509Q244 509 278 480Q260 547 224 602L129 565Q121 585 116 600T111 623Q111 633 119 637L177 659Q163 675
+125 707Q134 724 150 734T183 744Q203 744 213 732Q233 716 257 690L326 717Q334 697 339 682T344 659Q344 649 336 646L300 632Q380 504 380 289ZM263 58T280 116T298 286Q298 349 293 388Q264 437 212 437Q163 437 138 383T112 244Q112 58 207 58Q263 58 280
+116Z" />
+<glyph unicode="&#xf1;" glyph-name="ntilde" horiz-adv-x="383" d="M45 476Q76 490 121 500T204 510Q282 510 313 480T344 376V16Q344 7 340 4T316 1T261 0V352Q261 402 249 421T201 440Q183 440 162 436T126 422V16Q126 7 122 4T98 1T45 0V476ZM211 563T200
+570T178 590Q168 601 161 606T143 611Q129 611 120 604T100 585T84 572Q74 572 66 581T52 599T45 612Q69 651 98 669T158 687Q173 687 182 681T203 663Q214 651 223 645T245 639Q265 639 275 646T295 666T310 678Q318 678 324 668T334 647T339 633Q335 624 320
+608T282 577T231 563Q211 563 200 570Z" />
+<glyph unicode="&#xf2;" glyph-name="ograve" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM224 568T173 604T111 655Q115 677 125 696T148 716Q155 716 203 675T282 598Q281 595 277 584T266 563T251 553Q224 568 173 604Z" />
+<glyph unicode="&#xf3;" glyph-name="oacute" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM134 560T127 570T116 591T111 605Q143 641 190 681T245 722Q258 722 268 703T282 661Q270 648 219 611T142 560Q134 560 127 570Z" />
+<glyph unicode="&#xf4;" glyph-name="ocircumflex" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442
+135 400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM250 570T226 596T193 638Q189 632 174 614T143 579T118 562Q82 562 63 585L177 708Q185 711 194 711Q208 711 219 699Q226 692 249 667T294 617T316 584Q316 574 299 568T259 561Q250 570 226 596Z"
+/>
+<glyph unicode="&#xf5;" glyph-name="otilde" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM209 563T198 570T176 590Q166 601 159 606T141 611Q127 611 118 604T98 585T82 572Q72 572 64 581T50 599T43 612Q67 651 96 669T156 687Q171 687 180 681T201 663Q212 651 221 645T243 639Q263 639
+273 646T293 666T308 678Q316 678 322 668T332 647T337 633Q333 624 318 608T280 577T229 563Q209 563 198 570Z" />
+<glyph unicode="&#xf6;" glyph-name="odieresis" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442
+135 400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM108 573T99 586T89 632Q89 659 100 674T133 689Q155 689 163 677T172 634Q172 604 161 588T128 572Q108 573 99 586ZM228 573T218 585T208 628Q208 689 252 689Q274 689 282 677T291 634Q289 572
+247 572Q228 573 218 585Z" />
+<glyph unicode="&#xf7;" glyph-name="divide" horiz-adv-x="418" d="M181 376T170 389T159 427Q159 448 172 463T208 478Q258 478 258 427Q258 405 245 391T208 376Q181 376 170 389ZM34 290T36 303T51 317H384Q384 275 382 261T368 247H34Q34 290 36 303ZM181
+81T170 94T159 132Q159 153 172 168T208 183Q258 183 258 132Q258 110 245 96T208 81Q181 81 170 94Z" />
+<glyph unicode="&#xf8;" glyph-name="oslash" horiz-adv-x="412" d="M403 484T388 454T356 395Q369 343 369 252Q369 116 329 53T207 -10Q167 -10 140 -2T93 29L62 -26Q46 -23 32 -14T17 8Q17 14 63 92Q48 149 48 250Q48 510 213 510Q250 510 277 501T323 468Q351
+515 357 522Q360 521 371 517T393 506T403 489Q403 484 388 454ZM174 440T155 399T135 248Q135 216 137 176L266 404Q257 425 244 432T211 440Q174 440 155 399ZM243 58T262 100T282 252Q282 298 279 331Q275 323 194 179L150 101Q158 76 172 67T207 58Q243 58
+262 100Z" />
+<glyph unicode="&#xf9;" glyph-name="ugrave" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM229
+568T178 604T116 655Q120 677 130 696T153 716Q160 716 208 675T287 598Q286 595 282 584T271 563T256 553Q229 568 178 604Z" />
+<glyph unicode="&#xfa;" glyph-name="uacute" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM139
+560T132 570T121 591T116 605Q148 641 195 681T250 722Q263 722 273 703T287 661Q275 648 224 611T147 560Q139 560 132 570Z" />
+<glyph unicode="&#xfb;" glyph-name="ucircumflex" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103
+8ZM255 570T231 596T198 638Q194 632 179 614T148 579T123 562Q87 562 68 585L182 708Q190 711 199 711Q213 711 224 699Q231 692 254 667T299 617T321 584Q321 574 304 568T264 561Q255 570 231 596Z" />
+<glyph unicode="&#xfc;" glyph-name="udieresis" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM113
+573T104 586T94 632Q94 659 105 674T138 689Q160 689 168 677T177 634Q177 604 166 588T133 572Q113 573 104 586ZM233 573T223 585T213 628Q213 689 257 689Q279 689 287 677T296 634Q294 572 252 572Q233 573 223 585Z" />
+<glyph unicode="&#xfd;" glyph-name="yacute" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192 154T208
+261L253 477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154ZM122 560T115 570T104 591T99 605Q131 641 178 681T233 722Q246 722 256 703T270 661Q258 648 207 611T130 560Q122 560 115 570Z" />
+<glyph unicode="&#xfe;" glyph-name="thorn" d="M273 509T314 463T355 300Q355 123 309 57T203 -10Q153 -10 127 16V-194Q108 -200 79 -200Q58 -200 52 -194T46 -166V698Q46 717 52 724T74 733T127 735V502Q156 509 192 509Q273 509 314 463ZM212 60T239 109T266
+293Q266 354 257 385T232 428T188 439Q154 439 127 418V88Q143 59 178 59Q212 60 239 109Z" />
+<glyph unicode="&#xff;" glyph-name="ydieresis" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192
+154T208 261L253 477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154ZM96 573T87 586T77 632Q77 659 88 674T121 689Q143 689 151 677T160 634Q160 604 149 588T116 572Q96 573 87 586ZM216 573T206 585T196 628Q196
+689 240 689Q262 689 270 677T279 634Q277 572 235 572Q216 573 206 585Z" />
+<glyph unicode="&#x2013;" glyph-name="endash" horiz-adv-x="424" d="M37 290T39 303T54 317H387Q387 275 385 261T371 247H37Q37 290 39 303Z" />
+<glyph unicode="&#x2014;" glyph-name="emdash" horiz-adv-x="700" d="M6 290T8 303T22 317H694Q694 275 692 261T678 247H6Q6 290 8 303Z" />
+<glyph unicode="&#x2018;" glyph-name="quoteleft" horiz-adv-x="174" d="M34 575T34 634Q34 668 48 705T80 769T108 795Q135 795 140 772Q127 747 122 725T115 676Q138 661 138 627Q138 605 124 590T88 575Q34 575 34 634Z" />
+<glyph unicode="&#x2019;" glyph-name="quoteright" horiz-adv-x="174" d="M41 572T34 595Q48 621 52 642T59 692Q36 706 36 740Q36 763 50 777T86 792Q141 792 141 733Q141 699 127 662T94 598T66 572Q41 572 34 595Z" />
+<glyph unicode="&#x201a;" glyph-name="quotesinglbase" horiz-adv-x="170" d="M41 -114T34 -91Q48 -66 52 -45T59 5Q36 19 36 54Q36 76 50 91T86 106Q141 106 141 47Q141 13 127 -24T94 -88T66 -114Q41 -114 34 -91Z" />
+<glyph unicode="&#x201c;" glyph-name="quotedblleft" horiz-adv-x="324" d="M34 575T34 634Q34 668 48 705T80 769T108 795Q135 795 140 772Q127 747 122 725T115 676Q138 661 138 627Q138 605 124 590T88 575Q34 575 34 634ZM184 575T184 634Q184 668 198 705T230
+769T258 795Q285 795 290 772Q276 747 272 726T265 676Q288 661 288 627Q288 605 274 590T238 575Q184 575 184 634Z" />
+<glyph unicode="&#x201d;" glyph-name="quotedblright" horiz-adv-x="324" d="M41 572T34 595Q48 621 52 642T59 692Q36 706 36 740Q36 763 50 777T86 792Q141 792 141 733Q141 699 127 662T94 598T66 572Q41 572 34 595ZM189 572T184 595Q198 621 202 642T209
+692Q186 706 186 740Q186 763 200 777T236 792Q291 792 291 733Q291 699 277 662T244 598T216 572Q189 572 184 595Z" />
+<glyph unicode="&#x201e;" glyph-name="quotedblbase" horiz-adv-x="321" d="M41 -114T34 -91Q48 -66 52 -45T59 5Q36 19 36 54Q36 76 50 91T86 106Q141 106 141 47Q141 13 127 -24T94 -88T66 -114Q41 -114 34 -91ZM189 -114T184 -91Q198 -66 202 -45T209 5Q186
+19 186 54Q186 76 200 91T236 106Q291 106 291 47Q291 13 277 -24T244 -88T216 -114Q189 -114 184 -91Z" />
+<glyph unicode="&#x2022;" glyph-name="bullet" horiz-adv-x="223" d="M75 208T58 227T41 284Q41 316 61 338T114 361Q153 361 171 341T189 284Q189 251 169 230T114 208Q75 208 58 227Z" />
+<glyph unicode="&#x2039;" glyph-name="guilsinglleft" horiz-adv-x="247" d="M156 16T120 69T51 178T18 250Q18 265 50 320T118 430T164 500Q178 500 188 491T205 472T212 459Q212 442 186 396T132 306T94 250Q103 238 132 196T187 109T214 47Q213 43 207 32T191
+11T167 0Q156 16 120 69Z" />
+<glyph unicode="&#x203a;" glyph-name="guilsinglright" horiz-adv-x="247" d="M77 1T66 6T44 21T33 46Q33 62 59 107T115 195T153 250Q144 263 116 306T61 395T35 459Q35 471 45 480T67 494T83 500Q94 484 129 430T196 321T229 250Q229 234 196 179T128 70T81
+0Q77 1 66 6Z" />
+</font>
+</defs>
+</svg>
diff --git a/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.ttf b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6f4feb02d14c849ba1fb7dc112243386b2ad8f2f
GIT binary patch
literal 39168
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
C10J6M

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.woff b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.woff
new file mode 100644
index 0000000000000000000000000000000000000000..ddccf765c758d5a4c8a96914418caedbb757ca8f
GIT binary patch
literal 22256
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.woff2 b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_400.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..7b18f7ea49098fff3aac28a1feb0cecc429bb2ec
GIT binary patch
literal 18320
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom/theme/fonts/font.css b/pelican/tests/output/custom/theme/fonts/font.css
new file mode 100644
index 00000000..a9eb87e6
--- /dev/null
+++ b/pelican/tests/output/custom/theme/fonts/font.css
@@ -0,0 +1,12 @@
+@font-face {
+	font-family: 'Yanone Kaffeesatz';
+	font-style: normal;
+	font-weight: 400;
+	src:
+		local('Yanone Kaffeesatz Regular'),
+		local('YanoneKaffeesatz-Regular'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
+		url('Yanone_Kaffeesatz_400.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
+		url('Yanone_Kaffeesatz_400.woff2') format('woff2');
+}
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index be9a5b00..d89f42fd 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 16e0dc39..57da2f44 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index ed375051..46450fa2 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 01ca2814..2fbaced4 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 2af2051f..23621487 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 93a3f6cc..e495b4c8 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index 5cd227d9..0baa4e2a 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 17f44be7..a4728315 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index 88560ad5..a0ba9741 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 404832c8..aec43346 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 8ef1af55..d37f588e 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index fe41a881..76dd1936 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 1065b096..97d54561 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 5cdab476..a0172665 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 99af0346..bb5e036f 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 217e97a4..62dea214 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index a098ed49..2d1032e1 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index a8cc93c3..f7063c32 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index 8ab5f7eb..74bb4abe 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index 41beb5a3..9af27061 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index b548b52c..96f51396 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index 5f7f87a7..b7cdd47c 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 887af3be..13f79258 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index c687f8bf..deb2b9f6 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 4d61759a..92449abd 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index c35090b9..16532ac0 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index 6fe34cc9..46445d8a 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index e2195f64..e87bcbd1 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 608a44ef..c02722ad 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 1d80b9f6..c97160d4 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index c25f6dbb..d2a523c2 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index 87ef2c91..e0dd328d 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 50bf7583..53b8156d 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 7f27c594..7d4f2b86 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 3158cfda..8ca76c78 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index c7f9701d..a41e43f7 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index bd12fa0c..43a29971 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index 59a36ace..92f6615c 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -6,10 +6,6 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-
-        <!--[if IE]>
-            <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/theme/css/fonts.css b/pelican/tests/output/custom_locale/theme/css/fonts.css
new file mode 100644
index 00000000..56015076
--- /dev/null
+++ b/pelican/tests/output/custom_locale/theme/css/fonts.css
@@ -0,0 +1,12 @@
+@font-face {
+	font-family: 'Yanone Kaffeesatz';
+	font-style: normal;
+	font-weight: 400;
+	src:
+		local('Yanone Kaffeesatz Regular'),
+		local('YanoneKaffeesatz-Regular'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
+		url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
+		url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
+}
diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
index 03a77e69..9673ca45 100644
--- a/pelican/tests/output/custom_locale/theme/css/main.css
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -12,7 +12,7 @@
 @import url("reset.css");
 @import url("pygment.css");
 @import url("typogrify.css");
-@import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+@import url("fonts.css");
 
 /***** Global *****/
 /* Body */
@@ -43,7 +43,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 h3, h4, h5, h6 { margin-top: .8em; }
-	
+
 hr { border: 2px solid #EEEEEE; }
 
 /* Anchors */
@@ -64,7 +64,7 @@ a:hover, a:active {
 h1 a:hover {
     background-color: inherit
 }
-	
+
 /* Paragraphs */
 div.line-block,
 p { margin-top: 1em;
@@ -124,7 +124,7 @@ div.note {
 
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
-	
+
 	/* Thead */
 	thead th {padding: .5em .4em; text-align: left;}
 	thead td {}
@@ -132,14 +132,14 @@ table {margin: .5em auto 1.5em auto; width: 98%;}
 	/* Tbody */
 	tbody td {padding: .5em .4em;}
 	tbody th {}
-	
+
 	tbody .alt td {}
 	tbody .alt th {}
-	
+
 	/* Tfoot */
 	tfoot th {}
 	tfoot td {}
-	
+
 /* HTML5 tags */
 header, section, footer,
 aside, nav, article, figure {
@@ -173,9 +173,9 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		color: #C74350;
 		text-shadow: none;
 	}
-	
+
 	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
-	
+
 	/* Main Nav */
 	#banner nav {
 		background: #000305;
@@ -186,15 +186,15 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		padding: 0;
 		text-align: center;
 		width: 800px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
-	
+
 	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
 	#banner nav li {float: left; display: inline; margin: 0;}
-	
+
 	#banner nav a:link, #banner nav a:visited {
 		color: #fff;
 		display: inline-block;
@@ -208,12 +208,12 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		color: #fff;
 		text-shadow: none !important;
 	}
-	
+
 	#banner nav li:first-child a {
 		border-top-left-radius: 5px;
 		-moz-border-radius-topleft: 5px;
 		-webkit-border-top-left-radius: 5px;
-		
+
 		border-bottom-left-radius: 5px;
 		-moz-border-radius-bottomleft: 5px;
 		-webkit-border-bottom-left-radius: 5px;
@@ -228,7 +228,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	overflow: hidden;
 	padding: 20px;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -257,7 +257,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	overflow: hidden;
 	padding: 20px 20px;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -292,21 +292,21 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		float: left;
 		width: 615px;
 	}
-	
+
 	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
-	
+
 	/* Social */
 	#extras .social {
 		float: right;
 		width: 175px;
 	}
-	
+
 	#extras div[class='social'] a {
 		background-repeat: no-repeat;
 		background-position: 3px 6px;
 		padding-left: 25px;
 	}
-	
+
 		/* Icons */
 		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
 		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
@@ -346,7 +346,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	padding: 20px;
 	text-align: left;
 	width: 760px;
-	
+
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
@@ -390,7 +390,7 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 	/* Blog Index */
 	#posts-list {list-style: none; margin: 0;}
 	#posts-list .hentry {padding-left: 10px; position: relative;}
-	
+
 	#posts-list footer {
 		left: 10px;
 		position: relative;
@@ -398,7 +398,7 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		top: 0.5em;
 		width: 190px;
 	}
-	
+
 	/* About the Author */
 	#about-author {
 		background: #f9f9f9;
@@ -406,21 +406,21 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		font-style: normal;
 		margin: 2em 0;
 		padding: 10px 20px 15px 20px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
-	
+
 	#about-author strong {
 		color: #C64350;
 		clear: both;
 		display: block;
 		font-size: 1.429em;
 	}
-	
+
 	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
-	
+
 	/* Comments */
 	#comments-list {list-style: none; margin: 0 1em;}
 	#comments-list blockquote {
@@ -429,24 +429,24 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		font-style: normal;
 		margin: 0;
 		padding: 15px 20px;
-		
+
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
 	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
-	
+
 	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
-	
+
 	/* Add a Comment */
 	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
 	#add-comment input[type='text'],
 	#add-comment input[type='email'],
 	#add-comment input[type='url'] {float: left; width: 200px;}
-	
+
 	#add-comment textarea {float: left; height: 150px; width: 495px;}
-	
+
 	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
-	
+
 	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
 	#add-comment * {margin-bottom: .5em;}
diff --git a/pelican/tests/output/custom_locale/theme/css/typogrify.css b/pelican/tests/output/custom_locale/theme/css/typogrify.css
index c9b34dc8..3bae4976 100644
--- a/pelican/tests/output/custom_locale/theme/css/typogrify.css
+++ b/pelican/tests/output/custom_locale/theme/css/typogrify.css
@@ -1,3 +1,3 @@
 .caps {font-size:.92em;}
-.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}    
+.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}
 .dquo {margin-left:-.38em;}
diff --git a/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.eot b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.eot
new file mode 100644
index 0000000000000000000000000000000000000000..b3b90dbc3ef34775a8689ab6a4494810c14c5a59
GIT binary patch
literal 20932
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.svg b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.svg
new file mode 100644
index 00000000..a69669b5
--- /dev/null
+++ b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.svg
@@ -0,0 +1,407 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs >
+<font id="YanoneKaffeesatz" horiz-adv-x="384" ><font-face
+    font-family="Yanone Kaffeesatz"
+    units-per-em="1000"
+    panose-1="0 0 5 0 0 0 0 0 0 0"
+    ascent="957"
+    descent="-200"
+    alphabetic="0" />
+<glyph unicode=" " glyph-name="space" horiz-adv-x="158" />
+<glyph unicode="!" glyph-name="exclam" horiz-adv-x="195" d="M45 683Q45 694 53 699T83 705T155 706L139 251Q138 233 131 226T109 216T59 213L45 683ZM68 -7T55 7T42 50Q42 74 57 91T97 108Q153 108 153 50Q153 26 138 10T97 -7Q68 -7 55 7Z" />
+<glyph unicode="&quot;" glyph-name="quotedbl" horiz-adv-x="263" d="M42 607T37 667T31 760Q31 781 34 782Q41 786 65 786Q95 786 110 783Q110 740 103 665T89 586Q82 585 67 584T45 583Q42 607 37 667ZM166 590T160 659T153 761Q153 781 156 782Q163 786 187
+786Q218 786 233 783Q233 742 225 666T212 586Q205 585 190 584T168 583Q166 590 160 659Z" />
+<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="418" d="M323 254H390Q390 213 388 202T374 190H320L316 123Q315 112 302 110T245 107L249 190H154L150 123Q149 112 136 110T79 107L83 190H28Q28 232 30 243T44 254H87L92 360H28Q28 402 30 413T44
+424H96L99 487Q100 498 114 500T170 503L166 424H262L265 487Q266 498 280 500T336 503L332 424H390Q390 383 388 372T374 360H328L323 254ZM157 254H253L258 360H162L157 254Z" />
+<glyph unicode="$" glyph-name="dollar" horiz-adv-x="418" d="M363 20T237 -4V-91Q237 -110 221 -116T164 -122V-7Q128 -5 103 2T66 19T53 37Q53 46 59 68T74 102Q111 72 181 72Q228 72 251 94T274 158Q274 186 262 208T219 264L107 377Q53 434 53 488Q53 542
+86 574T181 615V704Q181 724 198 730T254 737V616Q304 613 330 602T357 581Q357 569 352 553T337 525Q326 533 299 539T239 546Q142 546 142 489Q142 469 152 452T185 409L306 288Q336 258 349 227T363 157Q363 20 237 -4Z" />
+<glyph unicode="%" glyph-name="percent" horiz-adv-x="692" d="M162 -7T150 -3T127 8T116 23L520 709Q523 708 534 703T555 691T565 674Q565 667 397 382T166 -8Q162 -7 150 -3ZM132 339T104 353T60 408T45 525Q45 618 81 663T186 708Q233 708 261 692T304 636T319
+526Q319 339 180 339Q132 339 104 353ZM212 402T228 430T245 525Q245 574 239 600T220 636T186 646Q154 646 138 619T122 523Q122 473 128 447T148 412T182 402Q212 402 228 430ZM460 -9T431 5T387 60T372 177Q372 270 408 315T514 360Q561 360 589 344T632 288T647
+178Q647 -9 508 -9Q460 -9 431 5ZM539 52T555 80T572 175Q572 224 566 250T548 286T513 296Q481 296 465 269T448 173Q448 123 454 97T474 62T509 52Q539 52 555 80Z" />
+<glyph unicode="&amp;" glyph-name="ampersand" horiz-adv-x="502" d="M458 70T488 55Q485 31 468 11T435 -10Q420 -10 362 54Q306 -10 212 -10Q27 -10 27 170Q27 229 59 278T139 358Q61 494 61 568Q61 636 104 671T228 706Q293 706 335 692T377 659Q377 644 372
+627T357 600Q330 619 301 627T237 635Q193 635 170 620T146 558Q146 508 205 405T343 201Q351 241 351 291Q351 423 291 496Q332 504 405 504Q447 504 483 501Q483 499 484 490T485 472Q485 453 477 444T443 435L394 436Q411 405 420 374T429 281Q429 194 404 129Q458
+70 488 55ZM272 66T309 115Q242 196 174 300Q110 254 110 168Q110 124 133 95T207 66Q272 66 309 115Z" />
+<glyph unicode="&apos;" glyph-name="quotesingle" horiz-adv-x="141" d="M42 607T37 667T31 760Q31 781 34 782Q41 786 65 786Q95 786 110 783Q110 740 103 665T89 586Q82 585 67 584T45 583Q42 607 37 667Z" />
+<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="292" d="M212 -196T172 -135T99 43T65 320Q65 470 98 578T172 744T226 803Q246 803 255 792T271 752Q218 680 183 573T147 318Q147 211 166 119T213 -38T271 -136Q265 -166 256 -181T227 -196Q212 -196 172 -135Z" />
+<glyph unicode=")" glyph-name="parenright" horiz-adv-x="292" d="M47 -196T37 -181T21 -136Q71 -70 108 44T145 318Q145 460 110 573T21 752Q28 781 37 792T66 803Q79 803 119 746T193 581T227 320Q227 168 194 52T120 -130T65 -196Q47 -196 37 -181Z" />
+<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="470" d="M199 667Q198 678 206 683T229 688Q256 688 278 677L258 519Q256 510 252 506T239 501Q231 501 221 504L199 667ZM269 469T269 478Q269 489 282 495L431 575Q441 566 447 551T454 521Q454 498 439
+494L280 455Q269 469 269 478ZM16 503Q15 532 29 551T60 570Q63 570 69 568L199 487Q200 470 194 463T175 459L16 503ZM249 404Q246 410 246 414Q246 424 271 434L386 299Q390 294 390 288Q390 274 370 261T327 245L249 404ZM130 250T120 250Q107 250 92 266T66
+300L187 423Q195 431 202 431Q212 431 224 415L136 259Q130 250 120 250Z" />
+<glyph unicode="+" glyph-name="plus" horiz-adv-x="418" d="M384 317Q384 275 382 261T368 247H245V123Q245 112 231 110T174 107V247H34Q34 290 36 303T51 317H174V441Q174 452 188 454T245 457V317H384Z" />
+<glyph unicode="," glyph-name="comma" horiz-adv-x="183" d="M43 -103T38 -80Q54 -53 59 -36T67 5Q43 21 43 54Q43 77 57 91T94 106Q148 106 148 47Q148 13 133 -21T99 -79T70 -103Q43 -103 38 -80Z" />
+<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="278" d="M37 290T39 303T54 317H241Q241 275 239 261T225 247H37Q37 290 39 303Z" />
+<glyph unicode="." glyph-name="period" horiz-adv-x="183" d="M63 -6T50 8T37 51Q37 75 52 91T93 108Q148 108 148 51Q148 26 133 10T93 -6Q63 -6 50 8Z" />
+<glyph unicode="/" glyph-name="slash" horiz-adv-x="334" d="M235 743Q238 754 243 758T265 763T324 765L99 0Q96 -10 91 -14T69 -19T10 -20L235 743Z" />
+<glyph unicode="0" glyph-name="zero" horiz-adv-x="418" d="M107 -9T68 65T29 296Q29 448 72 524T211 600Q306 600 347 532T389 320Q389 151 348 71T206 -9Q107 -9 68 65ZM260 64T282 124T305 321Q305 428 285 478T215 529Q160 529 138 469T116 290Q116 206 124
+157T153 86T208 64Q260 64 282 124Z" />
+<glyph unicode="1" glyph-name="one" horiz-adv-x="418" d="M28 32T28 56Q28 67 72 71T173 76L184 517Q163 516 123 509T70 499Q58 519 58 552Q58 558 97 569T183 590T247 600Q263 600 270 595L257 76H331Q353 76 368 77T389 79Q389 32 387 16T373 0H30Q28 32 28 56Z" />
+<glyph unicode="2" glyph-name="two" horiz-adv-x="418" d="M29 11T29 25Q29 45 33 56T54 96Q76 133 102 167T167 247Q227 317 255 362T283 454Q283 523 206 523Q166 523 125 513T59 488Q49 511 49 547Q49 559 73 571T139 592T226 600Q309 600 341 567T374 464Q374
+403 342 349T243 217Q171 131 136 76H271Q304 76 341 79T389 83Q389 34 386 17T372 0H33Q29 11 29 25Z" />
+<glyph unicode="3" glyph-name="three" horiz-adv-x="418" d="M99 -100T72 -86T44 -51Q44 -27 49 -11T55 9Q90 -23 153 -23Q218 -23 254 25T291 150Q291 209 248 231T132 254L130 305Q194 336 228 376T263 458Q263 486 248 504T191 523Q111 523 53 487Q43 507
+43 546Q43 559 64 571T125 592T216 600Q290 600 322 568T355 482Q355 380 245 301Q305 295 341 259T378 152Q378 71 349 15T269 -71T152 -100Q99 -100 72 -86Z" />
+<glyph unicode="4" glyph-name="four" horiz-adv-x="418" d="M235 131H54Q28 157 28 202Q28 227 65 311T152 478T237 592Q254 606 273 606Q297 606 319 595L316 206Q344 206 364 207T390 209Q391 208 392 202T394 186Q394 162 388 147T367 131H316V26Q316 12 313
+7T295 1T235 0V131ZM235 206L247 495Q208 450 161 361T98 206H235Z" />
+<glyph unicode="5" glyph-name="five" horiz-adv-x="418" d="M111 -100T85 -93T47 -77T34 -59Q34 -19 43 7Q78 -25 141 -25Q218 -25 256 33T294 178Q294 259 255 289T139 319Q100 319 42 306L71 600H377Q377 568 375 554T363 534T335 528Q291 528 229 529T140
+532L124 381Q159 386 187 386Q380 386 380 194Q380 56 322 -22T148 -100Q111 -100 85 -93Z" />
+<glyph unicode="6" glyph-name="six" horiz-adv-x="418" d="M313 439T352 392T391 245Q391 -8 202 -8Q128 -8 91 29T43 132T31 308Q31 702 259 702Q306 702 336 694T367 668Q367 636 359 611Q317 626 265 626Q119 626 108 367Q132 403 165 421T246 439Q313 439
+352 392ZM255 64T283 110T312 228Q312 295 289 330T223 365Q157 365 108 290V284Q106 169 129 117T205 64Q255 64 283 110Z" />
+<glyph unicode="7" glyph-name="seven" horiz-adv-x="418" d="M115 -88T98 -84T80 -66Q93 35 128 149T208 365T294 531Q220 527 67 527Q45 527 45 600H405Q303 403 242 238T163 -88Q115 -88 98 -84Z" />
+<glyph unicode="8" glyph-name="eight" horiz-adv-x="418" d="M362 293T377 259T392 182Q392 99 347 46T218 -8Q123 -8 78 45T32 183Q32 245 63 295T146 376Q101 407 81 429Q60 448 50 475T39 534Q39 617 87 661T210 706Q387 706 387 544Q387 485 358 444T279
+369Q317 339 333 323Q362 293 377 259ZM176 630T148 608T119 539Q119 489 159 457Q180 438 219 411Q313 469 313 541Q313 585 286 607T220 630Q176 630 148 608ZM259 69T286 100T313 183Q313 220 302 243T268 286Q248 307 210 333Q163 309 135 272T107 188Q107
+133 135 101T213 69Q259 69 286 100Z" />
+<glyph unicode="9" glyph-name="nine" horiz-adv-x="418" d="M288 609T324 580T373 486T389 297Q387 92 327 -6T138 -104Q98 -104 74 -96T49 -71Q49 -58 51 -43T56 -17Q89 -27 129 -27Q220 -27 261 39T310 229Q286 193 254 175T174 157Q109 157 69 209T28 358Q28
+485 75 547T217 609Q288 609 324 580ZM263 231T312 306V310Q312 392 305 439T278 512T218 537Q165 537 136 495T107 368Q107 302 131 267T198 231Q263 231 312 306Z" />
+<glyph unicode=":" glyph-name="colon" horiz-adv-x="183" d="M63 329T51 343T38 386Q38 410 53 426T93 443Q149 443 149 386Q149 361 134 345T93 329Q63 329 51 343ZM63 -6T51 8T38 51Q38 75 53 91T93 108Q149 108 149 51Q149 26 134 10T93 -6Q63 -6 51 8Z" />
+<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="183" d="M61 329T49 343T36 386Q36 410 51 426T91 443Q147 443 147 386Q147 361 132 345T91 329Q61 329 49 343ZM39 -103T34 -80Q50 -54 55 -37T63 5Q39 21 39 54Q39 77 53 91T90 106Q144 106 144 47Q144
+13 129 -21T95 -79T66 -103Q39 -103 34 -80Z" />
+<glyph unicode="&lt;" glyph-name="less" horiz-adv-x="400" d="M318 96T297 103L52 211Q39 234 39 258Q39 289 65 302L329 430Q342 418 349 404T357 377Q357 359 343 353L144 255L360 159Q359 134 348 115T324 96Q318 96 297 103Z" />
+<glyph unicode="=" glyph-name="equal" horiz-adv-x="418" d="M34 382T36 396T51 410H384Q384 367 382 353T368 339H34Q34 382 36 396ZM34 197T36 210T51 224H384Q384 182 382 168T368 154H34Q34 197 36 210Z" />
+<glyph unicode="&gt;" glyph-name="greater" horiz-adv-x="400" d="M62 97T55 112T46 139Q46 157 60 164L260 261L43 358Q44 383 56 401T80 420Q90 420 107 413L351 305Q364 285 364 258Q364 227 338 214L74 85Q62 97 55 112Z" />
+<glyph unicode="?" glyph-name="question" horiz-adv-x="295" d="M92 210T89 219T82 244T79 278Q79 319 97 351Q109 374 124 396T143 424Q171 465 184 491T197 552Q197 629 115 629Q66 629 31 603Q19 639 19 667Q19 684 58 697T144 710Q209 710 246 675T283 570Q283
+512 264 473T209 384Q182 350 172 330Q160 309 160 283Q160 271 165 243Q167 234 168 227T166 217Q156 206 120 206Q109 206 93 208Q92 210 89 219ZM100 -6T88 8T75 51Q75 75 90 91T130 108Q186 108 186 51Q186 26 171 10T130 -6Q100 -6 88 8Z" />
+<glyph unicode="@" glyph-name="at" horiz-adv-x="738" d="M442 -112T496 -101T602 -68Q623 -100 623 -126Q623 -141 592 -156T505 -180T375 -190Q268 -190 199 -159T89 -29T47 264Q47 479 139 581T394 683Q545 683 619 608T693 359Q693 145 644 74T533 2Q498
+2 471 25Q459 15 429 8T358 1Q319 1 293 12T252 57T237 151Q237 318 365 318Q403 318 423 307Q423 313 424 330T425 368Q426 401 411 413T364 426Q333 426 310 421T264 402Q256 419 256 448Q256 459 265 468Q281 479 312 486T391 494Q448 494 475 468T501 378L496
+177Q494 104 491 78Q508 72 524 72Q545 72 564 98T597 184T610 338Q610 441 590 500T523 585T393 611Q303 611 246 578T159 466T129 253Q129 106 155 27T233 -82T369 -112Q442 -112 496 -101ZM423 258Q402 261 388 261Q352 261 333 236T314 147Q314 98 327 80T368
+62Q390 62 404 74T419 114L423 258Z" />
+<glyph unicode="A" glyph-name="A" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499 183 395L149
+251H288Z" />
+<glyph unicode="B" glyph-name="B" horiz-adv-x="377" d="M44 681Q44 691 49 695T70 700H169Q337 700 337 546Q337 470 308 430T242 384Q289 381 324 350T360 238Q360 118 307 59T170 0H44V681ZM175 414Q209 414 229 443T249 530Q249 629 175 629H125V414H175ZM171
+71Q212 71 238 110T265 231Q265 280 254 305T223 337T172 345H125V71H171Z" />
+<glyph unicode="C" glyph-name="C" horiz-adv-x="341" d="M142 -10T107 13T51 109T30 321Q30 480 59 566T130 681T227 710Q277 710 299 694T321 655Q321 628 308 606Q277 631 243 631Q206 631 178 608T133 517T115 325Q115 227 127 173T161 99T215 79Q243 79 268
+88T308 111Q320 85 320 62Q320 32 285 11T196 -10Q142 -10 107 13Z" />
+<glyph unicode="D" glyph-name="D" horiz-adv-x="388" d="M44 681Q44 691 50 695T71 700H169Q237 700 279 672T342 575T364 386Q364 242 342 158T276 37T169 0H44V681ZM171 77Q201 77 223 100T259 193T273 394Q273 485 262 535T229 606T171 626H125V77H171Z" />
+<glyph unicode="E" glyph-name="E" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73Z" />
+<glyph unicode="F" glyph-name="F" horiz-adv-x="313" d="M301 700Q301 672 301 656T297 635T286 631H125V418H276Q276 391 276 373T272 350T261 344H125V16Q125 11 123 6T110 0H45V684Q45 688 48 694T61 700H301Z" />
+<glyph unicode="G" glyph-name="G" horiz-adv-x="386" d="M148 -10T108 18T49 121T30 334Q30 485 55 567T127 679T245 710Q293 710 322 695T352 659Q352 635 341 607Q327 618 306 624T261 631Q208 631 177 605T131 515T116 340Q116 225 128 167T162 89T220 69Q244
+69 259 77T280 94V343H205V394Q205 410 224 410H355V35Q301 -10 218 -10Q148 -10 108 18Z" />
+<glyph unicode="H" glyph-name="H" horiz-adv-x="410" d="M365 7T362 4T339 1T285 0V339H125V16Q125 7 122 4T98 1T44 0V684Q44 693 47 696T71 699T125 700V415H285V684Q285 693 288 696T311 699T365 700V16Q365 7 362 4Z" />
+<glyph unicode="I" glyph-name="I" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663Z" />
+<glyph unicode="J" glyph-name="J" horiz-adv-x="300" d="M63 -9T39 8T14 50Q14 64 17 73T26 96Q41 82 63 73T109 63Q138 63 151 76T169 114T174 183V663Q174 684 177 690T195 698T256 700V165Q256 82 226 37T119 -9Q63 -9 39 8Z" />
+<glyph unicode="K" glyph-name="K" horiz-adv-x="389" d="M371 701T371 686Q371 682 368 677L206 398Q326 307 367 18Q368 6 362 2T334 -2Q308 -2 278 1Q254 128 229 201T164 318Q151 333 124 345V16Q124 7 121 4T97 1T42 0V684Q42 693 45 696T69 699T124 700V398L284
+695Q313 701 335 701Q371 701 371 686Z" />
+<glyph unicode="L" glyph-name="L" horiz-adv-x="314" d="M44 677Q44 690 48 694T66 699T125 700V76H297V16Q297 7 293 4T281 0H44V677Z" />
+<glyph unicode="M" glyph-name="M" horiz-adv-x="489" d="M445 700V16Q445 7 442 4T418 1T363 0L366 245Q368 310 375 410T385 546L368 486Q329 342 319 315L266 161Q263 153 255 153H220L168 315Q155 354 104 541L103 540Q106 509 113 412T121 249L123 16Q123
+7 119 4T95 1T44 0V684Q44 694 48 697T60 700H118L214 396Q225 362 234 330T246 285Q249 297 257 329T275 393L364 684Q367 693 370 696T380 700H445Z" />
+<glyph unicode="N" glyph-name="N" horiz-adv-x="444" d="M320 693T324 696T348 699T401 700V16Q401 0 384 0H324L209 275Q185 339 114 560Q118 517 121 416T124 259V16Q124 7 121 4T97 1T44 0V684Q44 700 60 700H121L234 430Q247 395 308 211Q312 199 330 146V149Q325
+188 323 290T320 448V684Q320 693 324 696Z" />
+<glyph unicode="O" glyph-name="O" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459 304 517T276
+601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101Z" />
+<glyph unicode="P" glyph-name="P" horiz-adv-x="361" d="M254 700T298 653T343 503Q343 387 293 336T160 284H124V16Q124 7 121 4T97 1T44 0V684Q44 693 47 696T60 700H159Q254 700 298 653ZM212 359T233 394T254 512Q254 569 236 599T174 629H124V359H168Q212
+359 233 394Z" />
+<glyph unicode="Q" glyph-name="Q" horiz-adv-x="429" d="M404 -61T407 -74T410 -97Q410 -118 382 -127T320 -137Q269 -137 239 -107T190 -9Q131 -5 97 29T46 141T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 194 371 111T282
+2Q288 -37 300 -53T335 -70Q372 -70 398 -53Q404 -61 407 -74ZM121 238T129 182T158 99T214 73Q251 73 272 101T302 190T312 355Q312 459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182Z" />
+<glyph unicode="R" glyph-name="R" horiz-adv-x="372" d="M288 264T315 192T350 18Q350 6 343 2T309 -2Q298 -2 262 0Q255 110 231 179T180 285Q173 284 160 284H124V16Q124 7 121 4T97 1T44 0V684Q44 688 47 694T60 700H159Q254 700 298 653T343 503Q343 356
+256 306Q288 264 315 192ZM168 359Q212 359 233 393T254 506Q254 567 236 598T174 629H124V359H168Z" />
+<glyph unicode="S" glyph-name="S" horiz-adv-x="358" d="M94 -10T60 8T25 49Q25 62 30 78T46 107Q85 72 149 72Q248 72 248 174Q248 210 235 238T189 306L89 423Q55 464 41 497T26 567Q26 632 71 671T198 710Q265 710 297 697T329 660Q329 635 309 614Q298 623
+271 630T211 638Q166 638 140 620T113 569Q113 543 124 522T159 470L268 347Q306 302 320 264T335 178Q335 93 294 42T157 -10Q94 -10 60 8Z" />
+<glyph unicode="T" glyph-name="T" horiz-adv-x="373" d="M365 700V641Q365 631 361 628T348 624H225V16Q225 7 221 4T197 1T144 0V624H8V684Q8 700 25 700H365Z" />
+<glyph unicode="U" glyph-name="U" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10 109 18Z" />
+<glyph unicode="V" glyph-name="V" horiz-adv-x="420" d="M176 -7T165 8T146 51Q122 153 73 377T7 676Q5 686 5 689Q5 695 9 697T24 700H90L174 312Q187 246 207 117L214 69Q232 215 250 312L325 676Q328 689 332 694T346 700H416L262 -3Q233 -7 194 -7Q176 -7 165 8Z" />
+<glyph unicode="W" glyph-name="W" horiz-adv-x="654" d="M650 700L518 -3Q509 -4 492 -6T451 -8Q419 -8 408 49L356 276Q345 334 325 503Q306 341 296 277L241 -3Q208 -7 167 -7Q140 -7 126 54Q105 158 63 380T7 676Q6 680 6 687Q6 694 10 697T24 700H90L163
+311Q178 220 193 88H198Q203 187 224 311L286 642Q289 656 292 661T307 666H364L435 311Q450 232 462 118L465 88H471Q482 220 496 311L561 676Q563 689 566 694T581 700H650Z" />
+<glyph unicode="X" glyph-name="X" horiz-adv-x="424" d="M414 9T414 7Q414 0 403 0H315L261 135Q233 206 207 283Q178 198 151 135L97 10Q93 4 90 2T79 0H9L162 361L36 686Q33 694 37 696T66 699T131 700L172 586Q205 491 222 436Q248 520 271 586L310 687Q312
+694 316 696T341 699T397 700L268 368L412 13Q414 9 414 7Z" />
+<glyph unicode="Y" glyph-name="Y" horiz-adv-x="364" d="M225 16Q225 7 222 4T198 1T144 0V285L6 687Q4 694 8 696T35 699T97 700L137 563Q152 516 168 446T187 353Q189 375 206 445T238 563L273 685Q275 693 279 696T304 699T360 700L225 290V16Z" />
+<glyph unicode="Z" glyph-name="Z" horiz-adv-x="385" d="M19 11T19 31Q19 50 27 67L267 628H80Q49 628 37 625V683Q37 691 41 695T54 700H352Q360 689 360 674Q360 656 352 637L108 72H302Q343 72 361 80V16Q361 0 345 0H32Q19 11 19 31Z" />
+<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="386" d="M122 796Q122 808 125 812T140 819T184 821H377Q377 785 376 771T369 752T350 747H203V-123H376Q376 -161 374 -176T367 -195T349 -199H122V796Z" />
+<glyph unicode="\" glyph-name="backslash" horiz-adv-x="329" d="M12 743L10 752Q10 761 25 763T91 765L317 -10L319 -18Q319 -26 304 -28T237 -30L12 743Z" />
+<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="386" d="M9 -164T10 -150T17 -131T36 -126H183V746H10Q10 784 12 799T19 818T37 822H264V-175Q264 -187 261 -191T246 -198T202 -200H9Q9 -164 10 -150Z" />
+<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="430" d="M69 208T59 220T48 249L220 398L366 270Q380 259 380 244Q380 230 369 219T341 206L212 294L110 218Q94 208 85 208Q69 208 59 220Z" />
+<glyph unicode="_" glyph-name="underscore" horiz-adv-x="377" d="M14 -66T16 -52T30 -38H364Q364 -81 362 -95T347 -109H14Q14 -66 16 -52Z" />
+<glyph unicode="`" glyph-name="grave" horiz-adv-x="269" d="M162 568T111 604T49 655Q53 677 63 696T86 716Q93 716 141 675T220 598Q219 595 215 584T204 563T189 553Q162 568 111 604Z" />
+<glyph unicode="a" glyph-name="a" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317 388V335Q317
+115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63Z" />
+<glyph unicode="b" glyph-name="b" horiz-adv-x="385" d="M84 -10T48 20V698Q48 717 54 724T75 733T128 735V475Q173 510 235 510Q297 510 327 465T358 313Q358 120 303 55T164 -10Q84 -10 48 20ZM212 61T240 110T268 296Q268 374 251 405T198 437Q156 437 128
+409V75Q144 61 175 61Q212 61 240 110Z" />
+<glyph unicode="c" glyph-name="c" horiz-adv-x="313" d="M128 -10T96 9T48 83T31 239Q31 400 81 455T210 510Q246 510 270 497T294 465Q294 442 285 420Q251 439 214 439Q170 439 142 399T114 238Q114 169 123 131T152 77T204 62Q227 62 248 68T284 85Q292 56
+292 41Q292 20 260 5T180 -10Q128 -10 96 9Z" />
+<glyph unicode="d" glyph-name="d" horiz-adv-x="381" d="M142 -10T108 7T52 77T31 232Q31 373 73 441T184 510Q230 510 256 490V698Q256 717 262 724T284 733T337 735V20Q273 -10 193 -10Q142 -10 108 7ZM234 62T256 77V427Q239 440 210 440Q120 440 120 241Q120
+168 129 129T154 76T196 62Q234 62 256 77Z" />
+<glyph unicode="e" glyph-name="e" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125 121T155 80T207
+68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402Z" />
+<glyph unicode="f" glyph-name="f" horiz-adv-x="254" d="M82 432H13Q13 459 14 475T18 496T33 500H82V561Q82 665 129 702T249 739Q294 739 318 728T342 698Q342 675 333 654Q304 666 262 666Q215 666 189 646T162 567V500H252Q252 473 251 457T247 436T235 432H162V16Q162
+11 159 6T145 0H82V432Z" />
+<glyph unicode="g" glyph-name="g" horiz-adv-x="394" d="M308 72T341 47T375 -34Q375 -104 326 -150T183 -197Q91 -197 57 -167T23 -88Q23 -54 44 -23T100 33Q37 50 38 87Q38 127 101 177Q39 217 39 327Q39 422 83 466T206 510Q229 510 256 502H375Q383 488 383
+464Q383 433 355 433Q342 433 319 438Q357 400 357 329Q357 246 318 200T195 154Q169 154 150 158Q123 131 123 114Q123 102 148 97T242 82Q308 72 341 47ZM167 451T146 422T124 329Q124 271 139 244T200 216Q239 216 257 249T276 348Q276 402 258 426T203 451Q167
+451 146 422ZM240 -123T266 -99T293 -45Q293 -22 283 -10T249 9T180 19L160 21Q137 3 122 -21T106 -69Q106 -96 124 -109T190 -123Q240 -123 266 -99Z" />
+<glyph unicode="h" glyph-name="h" horiz-adv-x="380" d="M45 698Q45 717 51 724T72 733T125 735V471Q147 490 177 500T238 510Q299 510 320 479T342 378V16Q342 7 338 4T313 1T260 0V356Q260 394 248 414T201 435Q182 435 162 429T125 408V16Q125 7 122 4T99
+1T45 0V698Z" />
+<glyph unicode="i" glyph-name="i" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM300 570T300 628Q300 692 346 692Q368 692 377 679T386 634Q386 604 374 587T340 570Q300 570 300 628Z" />
+<glyph unicode="j" glyph-name="j" horiz-adv-x="184" d="M-50 -196T-76 -182T-103 -143Q-103 -117 -91 -102Q-53 -122 -6 -122Q31 -122 42 -101T54 -24V463Q54 482 60 489T81 498T134 500V-36Q134 -111 106 -153T4 -196Q-50 -196 -76 -182ZM306 570T306 628Q306
+692 352 692Q374 692 383 679T392 634Q392 604 380 587T346 570Q306 570 306 628Z" />
+<glyph unicode="k" glyph-name="k" horiz-adv-x="376" d="M46 698Q46 717 52 724T74 733T127 735V464Q153 485 187 497T253 510Q338 510 338 424Q338 369 312 331T254 269Q293 252 320 209T354 100Q355 90 355 67Q355 43 352 16Q351 7 347 4T321 1T261 0Q265 29
+265 62Q265 93 260 123Q251 175 231 201T183 227Q176 227 172 226Q161 224 146 217T127 207V16Q127 7 124 4T101 1T46 0V698ZM249 314T249 397Q249 437 212 437Q166 437 127 389V265Q249 314 249 397Z" />
+<glyph unicode="l" glyph-name="l" horiz-adv-x="173" d="M46 698Q46 717 52 724T74 733T127 735V16Q127 7 123 4T100 1T46 0V698Z" />
+<glyph unicode="m" glyph-name="m" horiz-adv-x="564" d="M458 510T482 494T515 449T523 369V16Q523 7 519 4T495 1T442 0V370Q442 409 433 424T393 439Q356 439 325 420V16Q325 7 322 4T299 1T246 0H245V372Q245 400 242 413T229 433T195 440Q159 440 127 422V16Q127
+7 123 4T99 1T46 0V477Q119 510 197 510Q259 510 288 479Q313 493 346 501T410 510Q458 510 482 494Z" />
+<glyph unicode="n" glyph-name="n" horiz-adv-x="383" d="M45 476Q76 490 121 500T204 510Q282 510 313 480T344 376V16Q344 7 340 4T316 1T261 0V352Q261 402 249 421T201 440Q183 440 162 436T126 422V16Q126 7 122 4T98 1T45 0V476Z" />
+<glyph unicode="o" glyph-name="o" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135 400T115
+248Q115 168 123 127T146 72T186 58Q222 58 241 100Z" />
+<glyph unicode="p" glyph-name="p" horiz-adv-x="382" d="M63 -197T55 -190T46 -162V470Q109 510 192 510Q272 510 313 464T355 302Q355 121 313 56T206 -10Q180 -10 160 -2T127 18V-191Q108 -197 85 -197Q63 -197 55 -190ZM266 62T266 293Q266 352 258 384T233
+428T188 440Q154 440 127 421V95Q147 62 181 62Q266 62 266 293Z" />
+<glyph unicode="q" glyph-name="q" horiz-adv-x="387" d="M276 -198T261 -195V34Q231 -10 165 -10Q107 -10 69 38T30 218Q30 373 86 441T235 510Q269 510 294 503T342 479V-163Q342 -186 334 -191T294 -198Q276 -198 261 -195ZM215 60T233 73T261 112V426Q243
+440 215 440Q169 440 145 389T121 220Q121 127 141 94T195 61Q215 60 233 73Z" />
+<glyph unicode="r" glyph-name="r" horiz-adv-x="263" d="M45 465Q109 510 181 510Q218 510 234 500T251 468Q251 443 242 421Q221 433 194 433Q155 433 128 410L127 16Q127 7 123 4T99 1T45 0V465Z" />
+<glyph unicode="s" glyph-name="s" horiz-adv-x="346" d="M97 -10T64 3T30 40Q30 64 45 87Q86 63 144 63Q183 63 204 78T226 124Q226 146 217 165T186 203L89 286Q31 333 31 392Q31 447 72 478T195 510Q263 510 291 492T320 454Q320 445 315 434T303 413Q259 440
+204 440Q168 440 147 427T125 391Q125 376 133 363T165 329L258 254Q291 222 304 194T318 129Q318 63 274 27T152 -10Q97 -10 64 3Z" />
+<glyph unicode="t" glyph-name="t" horiz-adv-x="292" d="M141 -10T121 7T94 56T87 139V431H19Q19 458 20 474T24 495T36 500H87V652Q87 666 93 671T114 678T167 680V500H271Q271 473 270 456T266 435T254 431H167V139Q167 98 173 79T204 59Q220 59 232 62T262
+74Q268 54 268 34Q268 10 243 0T182 -10Q141 -10 121 7Z" />
+<glyph unicode="u" glyph-name="u" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8Z" />
+<glyph unicode="v" glyph-name="v" horiz-adv-x="344" d="M143 -6T135 6T121 43L19 475Q17 485 17 487Q17 494 23 496T51 499T104 500L136 339Q150 274 161 193T176 86H178Q181 111 192 192T216 340L243 482Q245 492 249 495T273 499T328 500L213 -3Q198 -6 156
+-6Q143 -6 135 6Z" />
+<glyph unicode="w" glyph-name="w" horiz-adv-x="541" d="M448 492T452 495T476 499T526 500Q510 421 466 209T418 -3Q415 -4 401 -5T366 -6Q354 -6 342 7T324 46L311 114Q288 220 274 363Q256 205 237 113L214 -3Q207 -4 188 -5T147 -6Q123 -6 113 43Q95 120
+61 276T16 483Q14 492 19 495T46 499T103 500L134 337Q146 267 156 191T169 93H175Q194 229 203 278L235 469Q237 480 241 483T261 486H314L353 276Q364 228 373 170T384 93H389Q393 140 402 210T421 337L446 482Q448 492 452 495Z" />
+<glyph unicode="x" glyph-name="x" horiz-adv-x="411" d="M395 9T395 8Q395 3 384 2T337 0H302L265 66Q243 107 199 201Q164 121 136 65L107 16Q103 8 96 5T68 1T15 0L157 260L35 487Q32 494 35 496T60 499T120 500L157 431Q185 379 211 317Q244 390 266 432L297
+486Q300 494 305 496T330 499T386 500L258 267L391 19Q395 9 395 8Z" />
+<glyph unicode="y" glyph-name="y" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192 154T208 261L253
+477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154Z" />
+<glyph unicode="z" glyph-name="z" horiz-adv-x="335" d="M33 1T30 5T24 19T21 40Q21 58 28 70L223 432H120Q63 432 28 427Q25 444 25 465Q25 483 31 491T51 500H306Q307 499 310 493T314 475Q314 456 305 436L115 75H204Q270 75 310 85Q312 77 312 50Q312 23
+306 12T280 0H34Q33 1 30 5Z" />
+<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="277" d="M154 -150T122 -117T89 -15Q89 26 96 80Q97 89 100 120T103 182Q103 220 90 237T48 260Q41 275 41 293Q41 321 58 333Q74 343 83 352T97 378T103 427Q103 458 100 492T96 536Q89 590 89 626Q89
+686 130 714T244 744Q260 722 260 694Q260 683 256 676T245 666Q208 663 190 644T171 585Q171 556 176 511Q182 445 182 403Q182 357 169 335T128 300Q155 289 168 268T182 205Q182 164 176 100Q171 53 171 22Q171 -15 180 -35T206 -63T253 -76Q255 -102 255 -106Q255
+-126 248 -138T227 -150Q154 -150 122 -117Z" />
+<glyph unicode="|" glyph-name="bar" horiz-adv-x="324" d="M122 793Q122 805 126 809T145 814T203 815V-180Q203 -191 199 -194T175 -199T122 -200V793Z" />
+<glyph unicode="}" glyph-name="braceright" horiz-adv-x="277" d="M18 -128T18 -100Q18 -75 33 -72Q106 -66 106 8Q106 28 102 84Q96 148 96 191Q96 237 109 259T149 294Q122 305 109 326T96 389Q96 430 102 494Q106 550 106 573Q106 610 97 629T71 657T25 670Q21
+686 21 701Q21 720 29 732T50 744Q123 744 155 711T188 609Q188 568 181 514Q180 505 177 474T174 412Q174 374 187 357T229 334Q236 317 236 301Q236 272 218 261Q201 250 193 242T180 216T174 167Q174 128 182 58Q188 -6 188 -32Q188 -92 146 -121T33 -150Q18
+-128 18 -100Z" />
+<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="400" d="M237 212T221 218T185 237Q169 247 158 251T132 256Q115 256 102 250T72 232Q58 221 46 218Q32 217 22 230T11 266Q26 289 61 309T140 329Q164 329 178 324T212 306Q228 296 240 291T270 286Q309
+286 341 320Q347 325 357 325Q370 325 380 311T391 277Q373 252 340 232T263 212Q237 212 221 218Z" />
+<glyph unicode="&#xa0;" glyph-name="uni00A0" horiz-adv-x="158" />
+<glyph unicode="&#xa1;" glyph-name="exclamdown" horiz-adv-x="195" d="M46 394T46 451Q46 476 61 492T102 508Q132 508 144 494T157 451Q157 427 142 411T102 394Q46 394 46 451ZM61 256Q62 274 69 281T91 291T141 293L155 -174Q155 -185 147 -190T117 -196T45
+-197L61 256Z" />
+<glyph unicode="&#xa2;" glyph-name="cent" horiz-adv-x="418" d="M277 64T299 71T335 88Q343 68 343 37Q343 23 319 9T263 -9V-102Q263 -121 247 -127T190 -133V-7Q154 -1 131 20T96 91T83 228Q83 471 213 504V592Q213 611 230 618T286 626V508Q310 503 327 494T345
+475Q345 437 337 417Q305 435 269 435Q239 435 217 421T179 362T164 231Q164 156 174 121T202 75T257 64Q277 64 299 71Z" />
+<glyph unicode="&#xa3;" glyph-name="sterling" horiz-adv-x="366" d="M322 74Q329 54 329 37Q329 0 277 0H89Q80 121 78 277H15Q15 320 17 333T31 347H78Q82 480 122 537T238 595Q280 595 309 582T338 542Q338 530 335 518T327 493Q294 514 256 514Q210 514 185
+479T158 347H288Q288 305 286 291T272 277H158Q160 146 165 80L322 74Z" />
+<glyph unicode="&#xa4;" glyph-name="currency" horiz-adv-x="571" d="M560 49Q535 24 525 15T507 6Q504 6 498 10L417 91Q371 52 286 52Q201 52 154 90L62 -2Q39 21 30 32T20 51Q20 56 24 60L110 146Q87 198 87 276Q87 350 107 401L12 496Q37 521 47 530T65 539Q69
+539 73 535L147 461Q198 506 291 506Q380 506 427 463L510 546Q534 522 543 512T552 493Q552 489 548 485L466 403Q484 357 484 286Q484 202 460 148L560 49ZM348 121T377 162T407 288Q407 365 380 402T295 439Q230 439 199 398T167 271Q167 195 196 158T288 121Q348
+121 377 162Z" />
+<glyph unicode="&#xa5;" glyph-name="yen" horiz-adv-x="418" d="M249 243H379Q379 205 373 191T347 176H249V16Q249 7 246 4T223 1T169 0V176H38Q38 215 44 229T70 243H169V284L149 341H38Q38 380 44 394T70 408H126L30 687Q28 694 32 696T59 699T122 700L161
+563Q179 505 193 449T209 372Q211 392 226 451T259 563L297 685Q300 693 304 696T329 699T384 700L288 408H378Q378 370 372 356T347 341H266L249 290V243Z" />
+<glyph unicode="&#xa6;" glyph-name="brokenbar" horiz-adv-x="227" d="M90 326T73 330V711Q73 729 82 736T115 743Q135 743 153 737V354Q153 337 146 332T112 326Q90 326 73 330ZM89 -198T73 -193V192Q73 210 82 217T115 225Q135 225 153 219V-169Q153 -187 146
+-192T112 -198Q89 -198 73 -193Z" />
+<glyph unicode="&#xa7;" glyph-name="section" horiz-adv-x="348" d="M264 201Q284 174 292 155T301 112Q301 58 259 27T150 -4Q106 -4 78 9T43 39Q40 44 40 55Q40 83 56 105Q90 81 137 81Q171 81 190 94T209 128Q209 142 202 154T179 185Q179 185 141 223Q94
+268 72 296Q53 320 45 340T36 388Q36 415 49 442T91 489L83 499Q63 524 55 543T46 587Q46 641 88 672T198 703Q242 703 269 690T304 661Q307 652 307 644Q307 617 291 595Q259 618 209 618Q175 618 157 605T138 571Q138 557 144 546T167 515Q181 500 202 480Q221
+462 242 441T275 404Q295 380 303 360T311 312Q311 286 297 259T255 212L264 201ZM151 300T171 284T196 264Q214 271 225 287T236 318Q236 335 229 350T207 384Q196 399 176 415T151 435Q133 429 122 413T111 382Q111 363 118 348T140 315Q151 300 171 284Z" />
+<glyph unicode="&#xa8;" glyph-name="dieresis" horiz-adv-x="269" d="M53 573T44 586T34 632Q34 659 45 674T78 689Q100 689 108 677T117 634Q117 604 106 588T73 572Q53 573 44 586ZM173 573T163 585T153 628Q153 689 197 689Q219 689 227 677T236 634Q234 572
+192 572Q173 573 163 585Z" />
+<glyph unicode="&#xa9;" glyph-name="copyright" horiz-adv-x="471" d="M133 320T85 371T36 541Q36 652 89 706T242 760Q343 760 389 711T436 543Q436 435 384 378T234 320Q133 320 85 371ZM296 378T335 418T375 544Q375 628 342 666T241 705Q96 705 96 541Q96
+452 129 415T232 378Q296 378 335 418ZM211 416T193 424T166 456T157 531Q157 613 183 640T249 668Q264 668 279 663T294 652Q294 644 288 620Q268 628 254 628Q231 628 218 609T204 529Q204 497 208 482T222 462T247 457Q266 457 286 467Q289 461 291 452T293
+437Q293 430 277 423T243 416Q211 416 193 424Z" />
+<glyph unicode="&#xaa;" glyph-name="ordfeminine" horiz-adv-x="323" d="M100 288T71 312T41 411Q41 478 69 506T150 534Q182 534 214 524V582Q214 615 198 627T152 639Q105 639 57 617Q47 630 47 652Q47 668 53 675Q85 710 176 710Q225 710 253 685T282 608V317Q259
+306 224 297T154 288Q100 288 71 312ZM179 346T193 349T214 358V468Q206 472 194 474T172 476Q138 476 122 464T105 409Q105 373 120 360T165 346Q179 346 193 349Z" />
+<glyph unicode="&#xab;" glyph-name="guillemotleft" horiz-adv-x="416" d="M156 16T120 70T51 181T18 253Q18 268 50 322T118 430T164 500Q178 500 188 491T205 472T212 459Q212 442 186 397T132 309T94 253Q103 240 132 198T187 109T214 47Q213 43 207 32T191
+11T167 0Q156 16 120 70ZM326 38T291 86T223 185T190 251Q190 265 222 315T288 414T334 477Q347 477 357 469T374 451T381 439Q381 423 356 381T303 301T267 251Q276 240 303 203T357 125T383 69Q382 66 376 55T360 34T337 24Q326 38 291 86Z" />
+<glyph unicode="&#xac;" glyph-name="logicalnot" horiz-adv-x="400" d="M358 111Q342 105 321 105Q304 105 293 111T282 131V232H40Q34 252 34 270Q34 287 40 297T60 308H358V111Z" />
+<glyph unicode="&#xad;" glyph-name="uni00AD" horiz-adv-x="278" d="M37 290T39 303T54 317H241Q241 275 239 261T225 247H37Q37 290 39 303Z" />
+<glyph unicode="&#xae;" glyph-name="registered" horiz-adv-x="471" d="M343 760T389 711T436 543Q436 435 384 378T234 320Q133 320 85 371T36 541Q36 652 89 706T242 760Q343 760 389 711ZM296 378T335 418T375 544Q375 628 342 666T241 705Q96 705 96 541Q96
+452 129 415T232 378Q296 378 335 418ZM288 517T300 492T315 426Q315 420 312 418T299 416Q281 416 274 417Q268 491 239 518Q235 517 227 517H214V425Q214 419 208 418T176 417V665Q176 666 177 668T183 670H227Q308 670 308 598Q308 550 274 529Q288 517 300
+492ZM219 551T230 551Q249 551 258 562T268 600Q268 618 260 627T232 637H214V552Q219 551 230 551Z" />
+<glyph unicode="&#xaf;" glyph-name="overscore" horiz-adv-x="269" d="M1 601T1 624Q1 642 10 652T34 663H261Q268 646 268 629Q268 611 260 599T238 587H6Q1 601 1 624Z" />
+<glyph unicode="&#xb0;" glyph-name="degree" horiz-adv-x="358" d="M129 553T107 573T84 649Q84 746 184 746Q233 746 254 725T276 650Q276 602 251 578T177 553Q129 553 107 573ZM223 604T223 650Q223 674 214 684T184 694Q161 694 150 684T138 648Q138 604
+179 604Q223 604 223 650Z" />
+<glyph unicode="&#xb1;" glyph-name="plusminus" horiz-adv-x="419" d="M385 359Q385 317 383 303T369 289H246V165Q246 154 232 152T175 149V289H35Q35 332 37 345T52 359H175V483Q175 494 189 496T246 499V359H385ZM34 58T36 71T51 85H384Q384 43 382 29T368
+15H34Q34 58 36 71Z" />
+<glyph unicode="&#xb2;" glyph-name="uni00B2" d="M41 301T41 315Q41 344 53 357Q77 385 138 444Q188 491 210 518T232 576Q232 600 219 614T168 628Q139 628 116 618T66 590Q57 606 54 616T51 639Q51 657 74 673T134 700T205 710Q274 710 302 683T330 604Q330
+556 300 515T212 416Q170 373 162 365H339Q344 342 344 330Q344 289 318 289H47Q41 301 41 315Z" />
+<glyph unicode="&#xb3;" glyph-name="uni00B3" d="M304 503T322 478T340 423Q340 352 292 316T165 279Q126 279 98 286T57 305Q45 314 45 335Q45 347 50 359T64 379Q103 353 161 353Q205 353 231 369T257 416Q257 438 242 452T199 470Q181 473 128 473Q126 476
+123 489T119 510Q119 535 144 535Q171 535 197 532Q218 548 227 562T236 594Q236 612 221 625T171 638Q113 638 67 605Q51 622 51 645Q51 663 61 671Q79 688 116 699T204 710Q266 710 295 686T325 620Q325 592 312 565T273 516Q304 503 322 478Z" />
+<glyph unicode="&#xb4;" glyph-name="acute" horiz-adv-x="271" d="M73 560T66 570T55 591T50 605Q82 641 129 681T184 722Q197 722 207 703T221 661Q209 648 158 611T81 560Q73 560 66 570Z" />
+<glyph unicode="&#xb5;" glyph-name="uni00B5" horiz-adv-x="395" d="M70 -195T45 -190V470Q45 488 54 496T86 505Q110 505 125 500V131Q125 98 143 82T195 66Q237 66 269 81V470Q269 488 277 496T308 505Q334 505 349 500V24Q317 9 277 0T194 -10Q146 -10 125
+15V-163Q125 -195 80 -195Q70 -195 45 -190Z" />
+<glyph unicode="&#xb6;" glyph-name="paragraph" horiz-adv-x="541" d="M289 -3T271 3V205Q257 198 235 194T191 190Q121 190 78 242T34 420Q34 569 86 639T231 710Q298 710 352 682V26Q352 -3 312 -3Q289 -3 271 3ZM430 -3T414 2V658Q414 676 423 683T456 690Q477
+690 495 684V26Q495 8 487 3T453 -3Q430 -3 414 2ZM226 255T243 258T271 269V630Q253 641 220 641Q169 641 143 588T116 428Q116 331 143 294T212 255Q226 255 243 258Z" />
+<glyph unicode="&#xb7;" glyph-name="middot" horiz-adv-x="220" d="M79 212T66 226T53 269Q53 293 68 309T109 326Q165 326 165 269Q165 244 150 228T109 212Q79 212 66 226Z" />
+<glyph unicode="&#xb8;" glyph-name="cedilla" horiz-adv-x="269" d="M177 -58T191 -74T206 -122Q206 -160 184 -183T126 -206Q107 -206 89 -200T70 -193Q71 -188 75 -172T83 -152Q86 -149 101 -156T128 -163Q159 -163 159 -129Q159 -95 129 -95Q113 -95 102 -97T88
+-101L107 2H152L140 -59Q141 -58 157 -58Q177 -58 191 -74Z" />
+<glyph unicode="&#xb9;" glyph-name="uni00B9" horiz-adv-x="382" d="M45 308T45 323Q45 345 50 355T72 365H166V622L58 600Q48 616 48 638Q48 666 74 676Q109 688 157 699T223 710Q241 710 247 707V365H334Q338 339 338 329Q338 307 333 298T313 289H49Q45 308 45 323Z" />
+<glyph unicode="&#xba;" glyph-name="ordmasculine" horiz-adv-x="338" d="M121 289T93 307T50 372T35 499Q35 607 71 658T174 710Q220 710 247 692T289 628T303 501Q303 394 268 342T165 289Q121 289 93 307ZM200 356T217 389T235 499Q235 580 221 609T175 639Q139
+639 121 606T103 494Q103 414 118 385T166 356Q200 356 217 389Z" />
+<glyph unicode="&#xbb;" glyph-name="guillemotright" horiz-adv-x="414" d="M244 1T233 6T211 21T200 46Q200 62 227 108T283 197T321 253Q312 266 284 308T229 396T203 459Q203 471 213 480T235 494T251 500Q262 484 297 431T364 323T396 253Q396 237 363 181T295
+71T248 0Q244 1 233 6ZM73 23T63 28T43 43T33 68Q33 84 59 124T112 202T149 250Q152 250 126 284Q84 343 60 382T35 439Q35 451 45 460T65 474T79 480Q90 465 125 416T192 316T224 250Q224 234 191 184T123 85T76 22Q73 23 63 28Z" />
+<glyph unicode="&#xbc;" glyph-name="onequarter" horiz-adv-x="959" d="M41 307T41 323Q41 345 46 355T68 365H162V622L54 600Q44 616 44 638Q44 665 71 676Q105 688 153 699T219 710Q237 710 244 707V365H330Q334 348 334 329Q334 307 329 298T310 289H46Q41
+307 41 323ZM324 -10T309 -2T281 19L617 691Q625 710 645 710Q658 710 673 703T700 682L361 5Q355 -10 337 -10Q324 -10 309 -2ZM808 -6T792 -2V70H621Q607 85 607 110Q607 125 614 143Q632 202 677 275T764 390Q780 409 796 415T834 421Q853 421 868 416V147H927Q934
+130 934 109Q934 91 927 81T909 70H868V19Q868 -6 825 -6Q808 -6 792 -2ZM795 141L799 329Q766 303 731 247T682 141H795Z" />
+<glyph unicode="&#xbd;" glyph-name="onehalf" horiz-adv-x="947" d="M41 307T41 323Q41 345 46 355T68 365H162V622L54 600Q44 616 44 638Q44 665 71 676Q105 688 153 699T219 710Q237 710 244 707V365H330Q334 348 334 329Q334 307 329 298T310 289H46Q41 307
+41 323ZM324 -10T309 -2T281 19L617 691Q625 710 645 710Q658 710 673 703T700 682L361 5Q355 -10 337 -10Q324 -10 309 -2ZM607 12T607 26Q607 55 619 68Q643 96 704 155Q754 202 776 229T798 287Q798 311 785 325T734 339Q706 339 682 329T632 301Q623 317 621
+327T618 350Q618 368 641 384T700 411T771 421Q840 421 868 394T896 315Q896 281 879 249T839 190T776 125Q735 84 728 76H905Q910 53 910 41Q910 0 884 0H613Q607 12 607 26Z" />
+<glyph unicode="&#xbe;" glyph-name="threequarters" horiz-adv-x="961" d="M300 503T318 478T336 423Q336 352 288 316T161 279Q122 279 95 286T54 305Q41 314 41 335Q41 347 46 359T61 379Q98 353 158 353Q202 353 227 369T253 416Q253 438 238 452T196 470Q177
+473 124 473Q122 476 119 489T115 510Q115 535 140 535Q169 535 194 532Q215 547 223 561T232 594Q232 612 217 625T168 638Q109 638 64 605Q48 622 48 646Q48 664 57 671Q75 688 112 699T201 710Q262 710 291 686T321 620Q321 592 308 565T269 516Q300 503 318
+478ZM326 -10T311 -2T283 19L619 691Q627 710 647 710Q660 710 675 703T702 682L363 5Q357 -10 339 -10Q326 -10 311 -2ZM810 -6T794 -2V70H623Q609 85 609 110Q609 125 616 143Q634 202 679 275T766 390Q782 409 798 415T836 421Q855 421 870 416V147H929Q936
+130 936 109Q936 91 929 81T911 70H870V19Q870 -6 827 -6Q810 -6 794 -2ZM797 141L801 329Q768 303 733 247T684 141H797Z" />
+<glyph unicode="&#xbf;" glyph-name="questiondown" horiz-adv-x="306" d="M138 392T125 407T111 450Q111 474 126 490T167 506Q197 506 210 492T223 450Q223 426 208 409T167 392Q138 392 125 407ZM89 -195T52 -160T14 -56Q14 3 33 43T89 131Q117 170 125 184Q137
+205 137 232Q137 242 132 272Q130 281 130 288T131 298Q141 308 176 308Q188 308 204 306Q205 304 208 295T215 270T219 236Q219 198 201 163Q186 135 156 93Q127 49 114 23T101 -37Q101 -114 182 -114Q228 -114 266 -89Q278 -119 278 -153Q278 -170 239 -182T153
+-195Q89 -195 52 -160Z" />
+<glyph unicode="&#xc0;" glyph-name="Agrave" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM253 768T202 804T140 855Q144 877 154 896T177 916Q184 916 232 875T311 798Q310 795 306 784T295 763T280 753Q253 768 202 804Z" />
+<glyph unicode="&#xc1;" glyph-name="Aacute" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM163 760T156 770T145 791T140 805Q172 841 219 881T274 922Q287 922 297 903T311 861Q299 848 248 811T171 760Q163 760 156 770Z" />
+<glyph unicode="&#xc2;" glyph-name="Acircumflex" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208
+499 183 395L149 251H288ZM279 770T255 796T222 838Q218 832 203 814T172 779T147 762Q111 762 92 785L206 908Q214 911 223 911Q237 911 248 899Q255 892 278 867T323 817T345 784Q345 774 328 768T288 761Q279 770 255 796Z" />
+<glyph unicode="&#xc3;" glyph-name="Atilde" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM238 763T227 770T205 790Q195 801 188 806T170 811Q156 811 147 804T127 785T111 772Q101 772 93 781T79 799T72 812Q96 851 125 869T185 887Q200 887 209 881T230 863Q241 851 250 845T272 839Q292 839 302 846T322 866T337 878Q345 878
+351 868T361 847T366 833Q362 824 347 808T309 777T258 763Q238 763 227 770Z" />
+<glyph unicode="&#xc4;" glyph-name="Adieresis" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208
+499 183 395L149 251H288ZM137 773T128 786T118 832Q118 859 129 874T162 889Q184 889 192 877T201 834Q201 804 190 788T157 772Q137 773 128 786ZM257 773T247 785T237 828Q237 889 281 889Q303 889 311 877T320 834Q318 772 276 772Q257 773 247 785Z" />
+<glyph unicode="&#xc5;" glyph-name="Aring" horiz-adv-x="437" d="M433 6T426 2T396 -2Q369 -2 348 0L306 178H132L93 14Q90 5 84 2T55 -2Q34 -2 5 1L184 689Q187 703 214 703Q237 703 252 700L431 15Q433 6 426 2ZM288 251L254 395Q225 517 219 588Q208 499
+183 395L149 251H288ZM169 743T146 764T123 839Q123 888 149 912T223 937Q271 937 293 916T315 840Q315 792 290 768T216 743Q169 743 146 764ZM259 797T259 840Q259 862 250 871T223 881Q180 881 180 838Q180 818 189 808T218 797Q259 797 259 840Z" />
+<glyph unicode="&#xc6;" glyph-name="AE" horiz-adv-x="615" d="M420 73H592Q592 44 592 26T588 4T576 0H340V178H174L105 14Q102 5 95 2T68 -2Q45 -2 17 1L311 686Q317 700 337 700H596Q596 672 596 654T592 632T581 627H420V418H571Q571 391 571 373T567 350T556
+344H420V73ZM340 251V615Q304 490 264 392L205 251H340Z" />
+<glyph unicode="&#xc7;" glyph-name="Ccedilla" horiz-adv-x="341" d="M243 79T268 88T308 111Q320 85 320 62Q320 35 293 15T220 -9L210 -59Q211 -58 227 -58Q247 -58 261 -74T276 -122Q276 -160 254 -183T196 -206Q177 -206 159 -200T140 -193Q141 -188 145
+-172T153 -152Q156 -149 171 -156T198 -163Q229 -163 229 -129Q229 -95 199 -95Q183 -95 172 -97T158 -101L175 -9Q128 -6 97 21T48 120T30 321Q30 480 59 566T130 681T227 710Q277 710 299 694T321 655Q321 628 308 606Q277 631 243 631Q206 631 178 608T133 517T115
+325Q115 227 127 173T161 99T215 79Q243 79 268 88Z" />
+<glyph unicode="&#xc8;" glyph-name="Egrave" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM204 768T153 804T91 855Q95
+877 105 896T128 916Q135 916 183 875T262 798Q261 795 257 784T246 763T231 753Q204 768 153 804Z" />
+<glyph unicode="&#xc9;" glyph-name="Eacute" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM114 760T107 770T96 791T91
+805Q123 841 170 881T225 922Q238 922 248 903T262 861Q250 848 199 811T122 760Q114 760 107 770Z" />
+<glyph unicode="&#xca;" glyph-name="Ecircumflex" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM230 770T206 796T173
+838Q169 832 154 814T123 779T98 762Q62 762 43 785L157 908Q165 911 174 911Q188 911 199 899Q206 892 229 867T274 817T296 784Q296 774 279 768T239 761Q230 770 206 796Z" />
+<glyph unicode="&#xcb;" glyph-name="Edieresis" horiz-adv-x="320" d="M125 73H297Q297 44 297 26T293 4T281 0H45V684Q45 688 48 694T61 700H301Q301 672 301 654T297 632T286 627H125V418H276Q276 391 276 373T272 350T261 344H125V73ZM88 773T79 786T69 832Q69
+859 80 874T113 889Q135 889 143 877T152 834Q152 804 141 788T108 772Q88 773 79 786ZM208 773T198 785T188 828Q188 889 232 889Q254 889 262 877T271 834Q269 772 227 772Q208 773 198 785Z" />
+<glyph unicode="&#xcc;" glyph-name="Igrave" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM119 768T68 804T6 855Q10 877 20 896T43 916Q50 916 98 875T177 798Q176 795 172 784T161 763T146 753Q119 768 68 804Z" />
+<glyph unicode="&#xcd;" glyph-name="Iacute" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM29 760T22 770T11 791T6 805Q38 841 85 881T140 922Q153 922 163 903T177 861Q165 848 114 811T37 760Q29 760 22 770Z" />
+<glyph unicode="&#xce;" glyph-name="Icircumflex" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM145 770T121 796T88 838Q84 832 69 814T38 779T13 762Q-23 762 -42 785L72 908Q80 911 89 911Q103 911 114 899Q121
+892 144 867T189 817T211 784Q211 774 194 768T154 761Q145 770 121 796Z" />
+<glyph unicode="&#xcf;" glyph-name="Idieresis" horiz-adv-x="169" d="M44 663Q44 683 48 690T66 698T126 700V16Q126 7 122 4T98 1T44 0V663ZM3 773T-6 786T-16 832Q-16 859 -5 874T28 889Q50 889 58 877T67 834Q67 804 56 788T23 772Q3 773 -6 786ZM123 773T113
+785T103 828Q103 889 147 889Q169 889 177 877T186 834Q184 772 142 772Q123 773 113 785Z" />
+<glyph unicode="&#xd0;" glyph-name="Eth" horiz-adv-x="388" d="M237 700T279 672T342 577T364 394Q364 247 342 160T276 37T169 0H44V331H5Q5 374 7 387T21 401H44V681Q44 691 50 695T71 700H169Q237 700 279 672ZM201 77T223 100T259 193T273 394Q273 485 262
+535T229 606T171 626H125V401H205Q205 359 203 345T188 331H125V77H171Q201 77 223 100Z" />
+<glyph unicode="&#xd1;" glyph-name="Ntilde" horiz-adv-x="444" d="M320 693T324 696T348 699T401 700V16Q401 0 384 0H324L209 275Q185 339 114 560Q118 517 121 416T124 259V16Q124 7 121 4T97 1T44 0V684Q44 700 60 700H121L234 430Q247 395 308 211Q312 199
+330 146V149Q325 188 323 290T320 448V684Q320 693 324 696ZM241 763T230 770T208 790Q198 801 191 806T173 811Q159 811 150 804T130 785T114 772Q104 772 96 781T82 799T75 812Q99 851 128 869T188 887Q203 887 212 881T233 863Q244 851 253 845T275 839Q295
+839 305 846T325 866T340 878Q348 878 354 868T364 847T369 833Q365 824 350 808T312 777T261 763Q241 763 230 770Z" />
+<glyph unicode="&#xd2;" glyph-name="Ograve" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM249 768T198 804T136 855Q140 877 150 896T173 916Q180 916 228 875T307 798Q306 795 302 784T291 763T276 753Q249 768 198 804Z" />
+<glyph unicode="&#xd3;" glyph-name="Oacute" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM159 760T152 770T141 791T136 805Q168 841 215 881T270 922Q283 922 293 903T307 861Q295 848 244 811T167 760Q159 760 152 770Z" />
+<glyph unicode="&#xd4;" glyph-name="Ocircumflex" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312
+459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM275 770T251 796T218 838Q214 832 199 814T168 779T143 762Q107 762 88 785L202 908Q210 911 219 911Q233 911 244 899Q251 892 274 867T319 817T341
+784Q341 774 324 768T284 761Q275 770 251 796Z" />
+<glyph unicode="&#xd5;" glyph-name="Otilde" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312 459
+304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM234 763T223 770T201 790Q191 801 184 806T166 811Q152 811 143 804T123 785T107 772Q97 772 89 781T75 799T68 812Q92 851 121 869T181 887Q196 887
+205 881T226 863Q237 851 246 845T268 839Q288 839 298 846T318 866T333 878Q341 878 347 868T357 847T362 833Q358 824 343 808T305 777T254 763Q234 763 223 770Z" />
+<glyph unicode="&#xd6;" glyph-name="Odieresis" horiz-adv-x="429" d="M143 -10T105 21T48 131T30 354Q30 486 50 564T113 676T222 710Q288 710 326 678T381 569T399 357Q399 220 380 140T319 25T211 -10Q143 -10 105 21ZM251 73T272 101T302 190T312 355Q312
+459 304 517T276 601T220 627Q184 627 163 599T131 507T121 334Q121 238 129 182T158 99T214 73Q251 73 272 101ZM133 773T124 786T114 832Q114 859 125 874T158 889Q180 889 188 877T197 834Q197 804 186 788T153 772Q133 773 124 786ZM253 773T243 785T233 828Q233
+889 277 889Q299 889 307 877T316 834Q314 772 272 772Q253 773 243 785Z" />
+<glyph unicode="&#xd7;" glyph-name="multiply" horiz-adv-x="418" d="M257 281L345 183Q319 157 309 149T292 140Q290 140 284 144L209 228L133 144Q127 140 125 140Q118 140 108 148T72 183L160 281L71 381Q76 386 90 399T111 418T124 423Q129 423 133 419L209
+335L284 419Q288 423 293 423Q300 423 308 416T329 398T346 381L257 281Z" />
+<glyph unicode="&#xd8;" glyph-name="Oslash" horiz-adv-x="436" d="M415 685T381 585Q403 506 403 357Q403 220 383 140T322 25T214 -10Q174 -10 145 0T94 35Q81 -1 73 -16Q59 -16 43 -9T24 9Q23 12 35 44T59 102Q33 183 33 354Q33 486 53 564T114 676T222 710Q262
+710 291 699T341 664Q359 712 363 719Q367 719 378 717T401 709T414 694Q415 685 381 585ZM186 628T165 600T134 507T124 334Q124 228 132 176L281 599Q261 628 222 628Q186 628 165 600ZM247 73T269 95T303 178T315 355Q315 463 307 516Q249 349 157 98Q176 73
+211 73Q247 73 269 95Z" />
+<glyph unicode="&#xd9;" glyph-name="Ugrave" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10
+109 18ZM253 768T202 804T140 855Q144 877 154 896T177 916Q184 916 232 875T311 798Q310 795 306 784T295 763T280 753Q253 768 202 804Z" />
+<glyph unicode="&#xda;" glyph-name="Uacute" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148 -10
+109 18ZM163 760T156 770T145 791T140 805Q172 841 219 881T274 922Q287 922 297 903T311 861Q299 848 248 811T171 760Q163 760 156 770Z" />
+<glyph unicode="&#xdb;" glyph-name="Ucircumflex" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148
+-10 109 18ZM279 770T255 796T222 838Q218 832 203 814T172 779T147 762Q111 762 92 785L206 908Q214 911 223 911Q237 911 248 899Q255 892 278 867T323 817T345 784Q345 774 328 768T288 761Q279 770 255 796Z" />
+<glyph unicode="&#xdc;" glyph-name="Udieresis" horiz-adv-x="437" d="M148 -10T109 18T57 91T44 205V683Q44 692 47 695T71 699T127 700V202Q127 133 146 99T224 65Q249 65 274 70T312 82V683Q312 692 316 695T340 699T394 700V26Q373 12 326 1T224 -10Q148
+-10 109 18ZM137 773T128 786T118 832Q118 859 129 874T162 889Q184 889 192 877T201 834Q201 804 190 788T157 772Q137 773 128 786ZM257 773T247 785T237 828Q237 889 281 889Q303 889 311 877T320 834Q318 772 276 772Q257 773 247 785Z" />
+<glyph unicode="&#xdd;" glyph-name="Yacute" horiz-adv-x="364" d="M225 16Q225 7 222 4T198 1T144 0V285L6 687Q4 694 8 696T35 699T97 700L137 563Q152 516 168 446T187 353Q189 375 206 445T238 563L273 685Q275 693 279 696T304 699T360 700L225 290V16ZM126
+760T119 770T108 791T103 805Q135 841 182 881T237 922Q250 922 260 903T274 861Q262 848 211 811T134 760Q126 760 119 770Z" />
+<glyph unicode="&#xde;" glyph-name="Thorn" horiz-adv-x="361" d="M44 680Q44 693 54 696T98 700H124V566H159Q254 566 298 519T343 369Q343 253 293 202T160 150H124V16Q124 7 120 4T96 1T44 0V680ZM212 225T233 260T254 378Q254 435 236 465T174 495Q139 495
+124 493V228Q131 228 144 227T168 225Q212 225 233 260Z" />
+<glyph unicode="&#xdf;" glyph-name="germandbls" horiz-adv-x="465" d="M65 -9T52 -4T39 2Q40 4 42 13T47 38T50 74L48 550Q48 629 90 667T208 705Q277 705 322 685T388 631T409 561Q409 529 394 510T348 467Q323 449 312 436T300 403Q300 385 313 368T355 325Q387
+294 407 270T441 213T456 138Q456 70 416 31T306 -9Q269 -9 242 -2T201 15T187 36Q187 69 208 90Q217 81 238 72T288 63Q324 63 345 82T366 137Q366 172 347 201T288 270Q250 309 231 337T212 399Q212 432 228 452T276 497Q300 515 311 528T323 560Q323 589 295
+609T214 630Q166 630 148 601T129 504L131 44Q131 14 122 3T84 -9Q65 -9 52 -4Z" />
+<glyph unicode="&#xe0;" glyph-name="agrave" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM209 568T158 604T96 655Q100 677 110 696T133 716Q140 716 188 675T267 598Q266
+595 262 584T251 563T236 553Q209 568 158 604Z" />
+<glyph unicode="&#xe1;" glyph-name="aacute" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM119 560T112 570T101 591T96 605Q128 641 175 681T230 722Q243 722 253 703T267
+661Q255 648 204 611T127 560Q119 560 112 570Z" />
+<glyph unicode="&#xe2;" glyph-name="acircumflex" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288
+482T317 388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM235 570T211 596T178 638Q174 632 159 614T128 579T103 562Q67 562
+48 585L162 708Q170 711 179 711Q193 711 204 699Q211 692 234 667T279 617T301 584Q301 574 284 568T244 561Q235 570 211 596Z" />
+<glyph unicode="&#xe3;" glyph-name="atilde" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM194 563T183 570T161 590Q151 601 144 606T126 611Q112 611 103 604T83 585T67
+572Q57 572 49 581T35 599T28 612Q52 651 81 669T141 687Q156 687 165 681T186 663Q197 651 206 645T228 639Q248 639 258 646T278 666T293 678Q301 678 307 668T317 647T322 633Q318 624 303 608T265 577T214 563Q194 563 183 570Z" />
+<glyph unicode="&#xe4;" glyph-name="adieresis" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288
+482T317 388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM93 573T84 586T74 632Q74 659 85 674T118 689Q140 689 148 677T157
+634Q157 604 146 588T113 572Q93 573 84 586ZM213 573T203 585T193 628Q193 689 237 689Q259 689 267 677T276 634Q274 572 232 572Q213 573 203 585Z" />
+<glyph unicode="&#xe5;" glyph-name="aring" horiz-adv-x="354" d="M102 -10T66 20T29 142Q29 237 65 271T163 306Q210 306 236 293V372Q236 406 221 419T174 432Q138 432 101 426T41 409Q30 430 30 456Q30 476 41 483Q56 493 99 501T194 510Q259 510 288 482T317
+388V335Q317 115 311 24Q287 9 250 0T166 -10Q102 -10 66 20ZM196 58T211 63T233 74Q236 108 236 236Q217 246 189 246Q153 246 133 225T113 144Q113 93 129 76T180 58Q196 58 211 63ZM125 543T102 564T79 639Q79 688 105 712T179 737Q227 737 249 716T271 640Q271
+592 246 568T172 543Q125 543 102 564ZM215 597T215 640Q215 662 206 671T179 681Q136 681 136 638Q136 618 145 608T174 597Q215 597 215 640Z" />
+<glyph unicode="&#xe6;" glyph-name="ae" horiz-adv-x="583" d="M478 69T532 100Q539 79 539 28Q539 21 520 13T468 -2T401 -9Q367 -9 344 -3T302 20Q255 -9 164 -9Q122 -9 94 1T47 46T29 148Q29 319 160 319Q210 319 236 306V378Q236 412 218 425T168 438Q93
+438 42 411Q32 429 32 459Q32 466 35 472T42 483Q58 494 98 502T197 510Q238 510 262 497T296 453Q317 487 346 498T418 510Q545 510 545 351Q545 270 534 220Q497 214 445 214Q383 214 324 225Q324 157 333 124T360 80T410 69Q478 69 532 100ZM376 439T354 406T326
+289Q388 277 426 277Q446 277 462 280Q467 303 467 342Q466 397 454 418T409 439Q376 439 354 406ZM236 250Q217 258 189 258Q154 258 134 235T113 149Q113 110 121 90T142 64T178 58Q195 58 212 62T236 74V250Z" />
+<glyph unicode="&#xe7;" glyph-name="ccedilla" horiz-adv-x="313" d="M227 62T248 68T284 85Q292 56 292 41Q292 20 262 6T184 -10L174 -59Q175 -58 191 -58Q211 -58 225 -74T240 -122Q240 -160 218 -183T160 -206Q141 -206 123 -200T104 -193Q105 -188 109 -172T117
+-152Q120 -149 135 -156T162 -163Q193 -163 193 -129Q193 -95 163 -95Q147 -95 136 -97T122 -101L139 -7Q102 -1 79 23T43 99T31 239Q31 400 81 455T210 510Q246 510 270 497T294 465Q294 442 285 420Q251 439 214 439Q170 439 142 399T114 238Q114 169 123 131T152
+77T204 62Q227 62 248 68Z" />
+<glyph unicode="&#xe8;" glyph-name="egrave" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM223 568T172 604T110 655Q114 677 124 696T147 716Q154 716 202 675T281 598Q280 595 276 584T265 563T250 553Q223 568
+172 604Z" />
+<glyph unicode="&#xe9;" glyph-name="eacute" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM133 560T126 570T115 591T110 605Q142 641 189 681T244 722Q257 722 267 703T281 661Q269 648 218 611T141 560Q133 560
+126 570Z" />
+<glyph unicode="&#xea;" glyph-name="ecircumflex" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150
+125 121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM249 570T225 596T192 638Q188 632 173 614T142 579T117 562Q81 562 62 585L176 708Q184 711 193 711Q207 711 218
+699Q225 692 248 667T293 617T315 584Q315 574 298 568T258 561Q249 570 225 596Z" />
+<glyph unicode="&#xeb;" glyph-name="edieresis" horiz-adv-x="361" d="M267 68T321 100Q328 78 328 45Q328 22 288 6T190 -10Q139 -10 105 9T50 79T30 224Q30 341 54 404T117 488T207 510Q334 510 334 350Q334 270 323 220Q279 211 221 208T113 204Q115 150 125
+121T155 80T207 68Q267 68 321 100ZM162 439T140 402T114 268Q213 268 251 280Q256 303 256 340Q255 396 243 417T198 439Q162 439 140 402ZM107 573T98 586T88 632Q88 659 99 674T132 689Q154 689 162 677T171 634Q171 604 160 588T127 572Q107 573 98 586ZM227
+573T217 585T207 628Q207 689 251 689Q273 689 281 677T290 634Q288 572 246 572Q227 573 217 585Z" />
+<glyph unicode="&#xec;" glyph-name="igrave" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM377 568T326 604T264 655Q268 677 278 696T301 716Q308 716 356 675T435 598Q434 595 430 584T419 563T404 553Q377
+568 326 604Z" />
+<glyph unicode="&#xed;" glyph-name="iacute" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM31 560T24 570T13 591T8 605Q40 641 87 681T142 722Q155 722 165 703T179 661Q167 648 116 611T39 560Q31 560 24 570Z" />
+<glyph unicode="&#xee;" glyph-name="icircumflex" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM147 570T123 596T90 638Q86 632 71 614T40 579T15 562Q-21 562 -40 585L74 708Q82 711 91 711Q105 711 116 699Q123
+692 146 667T191 617T213 584Q213 574 196 568T156 561Q147 570 123 596Z" />
+<glyph unicode="&#xef;" glyph-name="idieresis" horiz-adv-x="175" d="M47 463Q47 482 53 489T75 498T128 500V16Q128 7 125 4T101 1T47 0V463ZM261 573T252 586T242 632Q242 659 253 674T286 689Q308 689 316 677T325 634Q325 604 314 588T281 572Q261 573 252
+586ZM381 573T371 585T361 628Q361 689 405 689Q427 689 435 677T444 634Q442 572 400 572Q381 573 371 585Z" />
+<glyph unicode="&#xf0;" glyph-name="eth" horiz-adv-x="408" d="M380 504T380 289Q380 149 344 70T209 -10Q116 -10 73 51T30 257Q30 378 73 443T190 509Q244 509 278 480Q260 547 224 602L129 565Q121 585 116 600T111 623Q111 633 119 637L177 659Q163 675
+125 707Q134 724 150 734T183 744Q203 744 213 732Q233 716 257 690L326 717Q334 697 339 682T344 659Q344 649 336 646L300 632Q380 504 380 289ZM263 58T280 116T298 286Q298 349 293 388Q264 437 212 437Q163 437 138 383T112 244Q112 58 207 58Q263 58 280
+116Z" />
+<glyph unicode="&#xf1;" glyph-name="ntilde" horiz-adv-x="383" d="M45 476Q76 490 121 500T204 510Q282 510 313 480T344 376V16Q344 7 340 4T316 1T261 0V352Q261 402 249 421T201 440Q183 440 162 436T126 422V16Q126 7 122 4T98 1T45 0V476ZM211 563T200
+570T178 590Q168 601 161 606T143 611Q129 611 120 604T100 585T84 572Q74 572 66 581T52 599T45 612Q69 651 98 669T158 687Q173 687 182 681T203 663Q214 651 223 645T245 639Q265 639 275 646T295 666T310 678Q318 678 324 668T334 647T339 633Q335 624 320
+608T282 577T231 563Q211 563 200 570Z" />
+<glyph unicode="&#xf2;" glyph-name="ograve" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM224 568T173 604T111 655Q115 677 125 696T148 716Q155 716 203 675T282 598Q281 595 277 584T266 563T251 553Q224 568 173 604Z" />
+<glyph unicode="&#xf3;" glyph-name="oacute" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM134 560T127 570T116 591T111 605Q143 641 190 681T245 722Q258 722 268 703T282 661Q270 648 219 611T142 560Q134 560 127 570Z" />
+<glyph unicode="&#xf4;" glyph-name="ocircumflex" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442
+135 400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM250 570T226 596T193 638Q189 632 174 614T143 579T118 562Q82 562 63 585L177 708Q185 711 194 711Q208 711 219 699Q226 692 249 667T294 617T316 584Q316 574 299 568T259 561Q250 570 226 596Z"
+/>
+<glyph unicode="&#xf5;" glyph-name="otilde" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442 135
+400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM209 563T198 570T176 590Q166 601 159 606T141 611Q127 611 118 604T98 585T82 572Q72 572 64 581T50 599T43 612Q67 651 96 669T156 687Q171 687 180 681T201 663Q212 651 221 645T243 639Q263 639
+273 646T293 666T308 678Q316 678 322 668T332 647T337 633Q333 624 318 608T280 577T229 563Q209 563 198 570Z" />
+<glyph unicode="&#xf6;" glyph-name="odieresis" horiz-adv-x="376" d="M128 -10T95 9T45 84T27 250Q27 510 194 510Q249 510 282 488T332 409T349 252Q349 116 308 53T184 -10Q128 -10 95 9ZM222 58T241 100T261 252Q261 330 254 371T231 427T191 442Q154 442
+135 400T115 248Q115 168 123 127T146 72T186 58Q222 58 241 100ZM108 573T99 586T89 632Q89 659 100 674T133 689Q155 689 163 677T172 634Q172 604 161 588T128 572Q108 573 99 586ZM228 573T218 585T208 628Q208 689 252 689Q274 689 282 677T291 634Q289 572
+247 572Q228 573 218 585Z" />
+<glyph unicode="&#xf7;" glyph-name="divide" horiz-adv-x="418" d="M181 376T170 389T159 427Q159 448 172 463T208 478Q258 478 258 427Q258 405 245 391T208 376Q181 376 170 389ZM34 290T36 303T51 317H384Q384 275 382 261T368 247H34Q34 290 36 303ZM181
+81T170 94T159 132Q159 153 172 168T208 183Q258 183 258 132Q258 110 245 96T208 81Q181 81 170 94Z" />
+<glyph unicode="&#xf8;" glyph-name="oslash" horiz-adv-x="412" d="M403 484T388 454T356 395Q369 343 369 252Q369 116 329 53T207 -10Q167 -10 140 -2T93 29L62 -26Q46 -23 32 -14T17 8Q17 14 63 92Q48 149 48 250Q48 510 213 510Q250 510 277 501T323 468Q351
+515 357 522Q360 521 371 517T393 506T403 489Q403 484 388 454ZM174 440T155 399T135 248Q135 216 137 176L266 404Q257 425 244 432T211 440Q174 440 155 399ZM243 58T262 100T282 252Q282 298 279 331Q275 323 194 179L150 101Q158 76 172 67T207 58Q243 58
+262 100Z" />
+<glyph unicode="&#xf9;" glyph-name="ugrave" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM229
+568T178 604T116 655Q120 677 130 696T153 716Q160 716 208 675T287 598Q286 595 282 584T271 563T256 553Q229 568 178 604Z" />
+<glyph unicode="&#xfa;" glyph-name="uacute" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM139
+560T132 570T121 591T116 605Q148 641 195 681T250 722Q263 722 273 703T287 661Q275 648 224 611T147 560Q139 560 132 570Z" />
+<glyph unicode="&#xfb;" glyph-name="ucircumflex" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103
+8ZM255 570T231 596T198 638Q194 632 179 614T148 579T123 562Q87 562 68 585L182 708Q190 711 199 711Q213 711 224 699Q231 692 254 667T299 617T321 584Q321 574 304 568T264 561Q255 570 231 596Z" />
+<glyph unicode="&#xfc;" glyph-name="udieresis" horiz-adv-x="389" d="M135 -10T103 8T58 61T45 156V484Q45 493 48 496T72 499T128 500V149Q128 98 141 79T196 60Q236 60 263 79V484Q263 493 267 496T290 499T344 500V26Q314 10 274 0T194 -10Q135 -10 103 8ZM113
+573T104 586T94 632Q94 659 105 674T138 689Q160 689 168 677T177 634Q177 604 166 588T133 572Q113 573 104 586ZM233 573T223 585T213 628Q213 689 257 689Q279 689 287 677T296 634Q294 572 252 572Q233 573 223 585Z" />
+<glyph unicode="&#xfd;" glyph-name="yacute" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192 154T208
+261L253 477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154ZM122 560T115 570T104 591T99 605Q131 641 178 681T233 722Q246 722 256 703T270 661Q258 648 207 611T130 560Q122 560 115 570Z" />
+<glyph unicode="&#xfe;" glyph-name="thorn" d="M273 509T314 463T355 300Q355 123 309 57T203 -10Q153 -10 127 16V-194Q108 -200 79 -200Q58 -200 52 -194T46 -166V698Q46 717 52 724T74 733T127 735V502Q156 509 192 509Q273 509 314 463ZM212 60T239 109T266
+293Q266 354 257 385T232 428T188 439Q154 439 127 418V88Q143 59 178 59Q212 60 239 109Z" />
+<glyph unicode="&#xff;" glyph-name="ydieresis" horiz-adv-x="357" d="M-4 -193T-4 -154Q-4 -142 -1 -130T8 -109Q18 -116 35 -120T71 -124Q97 -124 115 -100T144 -16L24 478Q22 486 22 489Q22 497 35 498T102 500L157 260Q167 211 174 156T184 83Q186 99 192
+154T208 261L253 477Q255 490 259 494T279 499T340 500L217 -27Q202 -91 184 -127T140 -178T77 -193Q-4 -193 -4 -154ZM96 573T87 586T77 632Q77 659 88 674T121 689Q143 689 151 677T160 634Q160 604 149 588T116 572Q96 573 87 586ZM216 573T206 585T196 628Q196
+689 240 689Q262 689 270 677T279 634Q277 572 235 572Q216 573 206 585Z" />
+<glyph unicode="&#x2013;" glyph-name="endash" horiz-adv-x="424" d="M37 290T39 303T54 317H387Q387 275 385 261T371 247H37Q37 290 39 303Z" />
+<glyph unicode="&#x2014;" glyph-name="emdash" horiz-adv-x="700" d="M6 290T8 303T22 317H694Q694 275 692 261T678 247H6Q6 290 8 303Z" />
+<glyph unicode="&#x2018;" glyph-name="quoteleft" horiz-adv-x="174" d="M34 575T34 634Q34 668 48 705T80 769T108 795Q135 795 140 772Q127 747 122 725T115 676Q138 661 138 627Q138 605 124 590T88 575Q34 575 34 634Z" />
+<glyph unicode="&#x2019;" glyph-name="quoteright" horiz-adv-x="174" d="M41 572T34 595Q48 621 52 642T59 692Q36 706 36 740Q36 763 50 777T86 792Q141 792 141 733Q141 699 127 662T94 598T66 572Q41 572 34 595Z" />
+<glyph unicode="&#x201a;" glyph-name="quotesinglbase" horiz-adv-x="170" d="M41 -114T34 -91Q48 -66 52 -45T59 5Q36 19 36 54Q36 76 50 91T86 106Q141 106 141 47Q141 13 127 -24T94 -88T66 -114Q41 -114 34 -91Z" />
+<glyph unicode="&#x201c;" glyph-name="quotedblleft" horiz-adv-x="324" d="M34 575T34 634Q34 668 48 705T80 769T108 795Q135 795 140 772Q127 747 122 725T115 676Q138 661 138 627Q138 605 124 590T88 575Q34 575 34 634ZM184 575T184 634Q184 668 198 705T230
+769T258 795Q285 795 290 772Q276 747 272 726T265 676Q288 661 288 627Q288 605 274 590T238 575Q184 575 184 634Z" />
+<glyph unicode="&#x201d;" glyph-name="quotedblright" horiz-adv-x="324" d="M41 572T34 595Q48 621 52 642T59 692Q36 706 36 740Q36 763 50 777T86 792Q141 792 141 733Q141 699 127 662T94 598T66 572Q41 572 34 595ZM189 572T184 595Q198 621 202 642T209
+692Q186 706 186 740Q186 763 200 777T236 792Q291 792 291 733Q291 699 277 662T244 598T216 572Q189 572 184 595Z" />
+<glyph unicode="&#x201e;" glyph-name="quotedblbase" horiz-adv-x="321" d="M41 -114T34 -91Q48 -66 52 -45T59 5Q36 19 36 54Q36 76 50 91T86 106Q141 106 141 47Q141 13 127 -24T94 -88T66 -114Q41 -114 34 -91ZM189 -114T184 -91Q198 -66 202 -45T209 5Q186
+19 186 54Q186 76 200 91T236 106Q291 106 291 47Q291 13 277 -24T244 -88T216 -114Q189 -114 184 -91Z" />
+<glyph unicode="&#x2022;" glyph-name="bullet" horiz-adv-x="223" d="M75 208T58 227T41 284Q41 316 61 338T114 361Q153 361 171 341T189 284Q189 251 169 230T114 208Q75 208 58 227Z" />
+<glyph unicode="&#x2039;" glyph-name="guilsinglleft" horiz-adv-x="247" d="M156 16T120 69T51 178T18 250Q18 265 50 320T118 430T164 500Q178 500 188 491T205 472T212 459Q212 442 186 396T132 306T94 250Q103 238 132 196T187 109T214 47Q213 43 207 32T191
+11T167 0Q156 16 120 69Z" />
+<glyph unicode="&#x203a;" glyph-name="guilsinglright" horiz-adv-x="247" d="M77 1T66 6T44 21T33 46Q33 62 59 107T115 195T153 250Q144 263 116 306T61 395T35 459Q35 471 45 480T67 494T83 500Q94 484 129 430T196 321T229 250Q229 234 196 179T128 70T81
+0Q77 1 66 6Z" />
+</font>
+</defs>
+</svg>
diff --git a/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.ttf b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6f4feb02d14c849ba1fb7dc112243386b2ad8f2f
GIT binary patch
literal 39168
zcmbrn2Y@6;bvItsJ<~lo=RDJs!-kpNnGJV)a~m$~Ue2pad%7s;PFX?;Wk3NWfdmL4
zkPre%2Em>{fI)l)Otdk{SYTTqfj|fw^T&V*Hn;ozUiIwW-XQ^>|0nhIOm}tHt5+|-
zSG9~Y#@zTYFxTqwiB*P23?F3d4UgjLm8&;x-1^*k-@J{n+hUA4A78z7`{<i*xcbYC
zz5Vly@nsvgcGr7fd~%$zOOK)b%)t`}E{;C&ho|rxZKQ1nue?0f{dLP>#%}&D?%#Lh
z;-e?7Jaoe~j9r2E*#k!pTy`<8yU^c*IGc_hzxv3N=Nx+u@5cQLHXJ*A;E?$@YYs7X
zAr96&h6_qs-ii04PnJD);_|E3-4n#u3-P@C`0<Ml9@z2i<@*^s{zkmx*%Jq@x>(xb
zco@HrqfzR@11Ap0-#YLgjNO9Y{Kktfy6p0Q-SgpZFm~(D0Pm9*UwZiBkM?{8W4XBx
z?cd8JW}KhnC#An(9u{WZ?P`D<WE*E(nly3)<IKR1Fj>w|NkCwMt@C=lVQ*N|JZZ%g
zs$>-{Qz&SvLT7KYQ4e|xg?vF#ResVDjQYzTD#-SLKmHLp8gzc-?o3><hBJyudg@WL
zDoe8t`P9~*-E+<A>0|e>`FR1!hvf%Y1~bLD%D&H!u`e^zNr}&XdA3nmY;pHui|6@)
zS8Q?hVv8TKZF&po%y-<k*y1I&`xW2u#A1t=U*#RIS#0sbnQ#EB?)f=soAeAzFpaHj
zkEFO_<daNcs!34~o4E;1OwwUyG#d6YgCReK$>95C&Ut~aOD2<AQq$ZT9WIM0R>?Jd
zK(W@}!8C6+(&B<&zplCo<BxujtEQj5e?oS8gE5|0d|c*=={;}9$8DRk#o@K_tVu`w
zla5%{{LN_Ax|bh+?YVCPVX-RuKL&VREQC?D+shf36+C~v%4Mb)W#uTqWP1T-e#*p+
zMrj|Dq=K|A685;$$#5o;3Hse3PbllFn@z!rx3Ae~)crn14FvG1Y2JFXzfaTr;+)T8
zWL2y4;NwHN?$sA;z5bR=akAc3>JJu@-O>{l^8@QP8|4+7uDX)HduZt3cjlhhxVg9P
zoclR|WQqCT@RiaRf!S)i6t+nc2VyyA;0e|>1*qix1}@9p@;Y2duy{U~Hv*zSKHuNh
z1c?G3HLqn9#qSFQ8ueyN0C?Bx($My1y=qTpasyhZnu^t(wpC3__nYs0=z~M4U^Ec!
ze*J6DJzn(MBf&&jz)=@)46tiI)+I@*!Y8L@&6{?$%O<WW2Bs3@%Mz21F-0-%$5aD4
zgQ1&1<of|}g|CaYE26QY8m|BIt*6_NBW!@Ra(Qp2kR33aqLro&zpCmZ10Ux5ajl7w
z0pA%#ZFNbnH11zvc&(a+yL|DQ=FM@FK~7qe30FXNcaLPxM8!rLbF^rv^HeI|W#h(_
zL3U&^M!rXG-F?%U=z)+Cv~(P_WCtzf+Zx12hj0uWL*I*`gUFqZpx+U4hVpfzDbS%8
zK`S7ZR=o*o(W%7dJa>FsrM9E}+8YwpSfHBiA_5t_{i=JOSi8Ra&RcdLE}r^V>eUG1
zpkBQ!%a*kVja*VVS0zq_EAKUdB=S>cuBrkSNHU*~F<;iFWm1WFEP}_}8F$_SO7Sd!
z;ns+X-SpvE0EjpaWZd`<9j1cO8U%zX9kNYE+lnsfnSs||e(#6Y@~KLchb-n(Z`Psw
zK{+-@^jpJ64R8iY+Jd_zkgoyI8;pm6DQPdrLl*}fL<u?IQcRIbOXqe0&{Fn)tzdk`
z@{2`wCsvm}Xs~tI9FkM?DrBo0{gZ5M38}{yWow1tl1aAeEuQB+XSLAZL9$hE@gvAK
zlFximw(2cNw(2cjV&$dpSTcG)YqWbjP%n01Kmr3ZN#+oU(9(OMct|43azXI0pZQ1-
zlD^?fhwY}BAY|~`;=qlTm5N1rCYCn+6U5uxCyZ7?1Kv(j;~=Dl#+J8-Y}~*jT$0n=
zD9MC<Su)6n&k!QU{R*U9w~>U1#xfaiKA%@j;j_fZ8FHjw>+b`(DB69S@{K)fdWNlz
za;SeK5vpcGN#m6FmgZK=;C*+#{n6z~Unpj^_g{bUWmgnj=HEA5bGO$3Bgx<sf-=(W
z1fU}2d)O!lx1)WD7Tjr~g)H=eTLTJkBC+NsI>m{fPz#xd)nW$!Ka8&sOML6xr_BnN
zK8TOG7r7m$Q`^uL^~bJ9e`e+tk_9*ytf_e=oh9);>Y!?h*G$EX^mZQ<_BK2YdQ$N0
zNkLCxou1eam(KM3{QR?M@sEO@^cK&ve?6<kFVNzXGSQRX;z#peJByz5UWlIb7B9{J
z)6#cf437EVf^?o?ewJ%PB4Gfe3<Lv7(5I5rEzuN$hJpnHMin3}&=P{b*{`DvWVE7J
zQJmFKJZe_sUCY*+Ghv6<?(jzHRsMqCE}#18*4^l<3`^-U>C;dukZMtvfg2c@*8utj
z$3g><eT2TCbF@;CbPj{6kptcUSx5Oi45KCU1#5|4CO>jjiQD~=M5tc0N7bT+{~wMA
zq)$5y#<`#Fo_pSAl5e=T;<U|ud~pW9#Y;eoPAw&j+{(i30J;^kCw0`a=Jv|E8Ya>Z
z8n|kT)jnu4{fG2EyGc5A&oZ-0HW$$xy(Pm^_@=N2uNfeY=CcE^xH`Rj8uzQLt6j-?
z%`%J%U|41{XV)7I(h}1UFjQGZE0=Uu6=Q8d7pX8#z^NEMjDcXVL$ZyA7r$`Z3$o>(
z#=vFCA-fBfe%Yk;*&AGTaLJrcnM^}7R*x*Z&C{}?O3w%a{I8W?&Mvzr`he+?!l!uh
zbE7{M*s&;c-^i@A+1e?tVRRkn-wfzeEYXfeE#M+P3BZ9XSPi6wGNnw~0KvkDcOYiu
zd;!uQ_#(C<5QBkWKP-oS-ZmA}?q!#SRvQ$xn076{#J=3%fgSWTag&RC+uy7F-N3H|
z9Im-vYM-$6%Y}bv{cHipZ<fhg)Bu#qUf_q$pkhf#r@JAYoGeLJ4OBqKoFVS#uxB{$
z=IdNg|E{Df5elH8Bd?hJOT-abF^V<<We>f%VBOrkK3m#0Ho8tLY#A$-y{=+5Tk*Mz
zS<8xd-E-@M<16pK?e>RPZ5_Dg*s;s|25&eqb4ee;OS1BA!P_|j@Ao_Kp0>mF7Njfm
z7SBVgpJ}P<Er_@E7C&N}^cIV{LT^F5t+#lI?Ogf}*rdVvU+{;dud_6?NFTef9g0F%
z)O(5r4_6Gb(;_j0JQ?TGnyJ}5?5+?YOWF_QbxkQyA#6YKWH*DA75k%GAXZpn0<F_+
zPo<K{RQf87OgU33`ylASyQ+@S47oG-$TwRH24t|=s)KeNlHV8f<~3m(pi!W~AIb!Z
z!1S=+ZgQk09=1k`TStpSeviQr3`jpJ`%G{36~fh!X=smElb$@Z@vXqWKa_Pkta3ZD
z`2(1fK&VGGTFs+_H=a1Zk3SYa^-tAnE<fJ?*#CqVXND+A$Jq;K;vH5{bpE%}GU*Gj
zf%@3bre>qSi`D0qjIs)3NRv?=RpOGNb4fHXb$(4x>knnfS7Go~$k^8{>aHn^Spq@q
z@9<9NU9B@)LTz^m5254O=+6jSMt@$+5TtUn-M{c8GnwT5;=$7n(W^c;jrq#ua(%f*
z0U9uy&uA{IDZc0;kp<kDs31grL${eaj*`?d;}-aXzwv`G9bPDH8rzV?Oikrg^NVCl
z+>ejj-&%4z3R$h{bC<GYP?hTK2k*N1!Br*KqG2`n^TBJ+JO7H-@GU21E^RK@zB?gt
zT+moO?HcG17&EY=!nA`;O17PlJZ@M>?yx%)^rNjq%c@XL9^r~CYIQO@!Ol?mjk)Q=
zTe6Tls`+4lIajGyrDygXz5M9huXVMc&V69@mceCnzwB7w1c3*NsIT1{jYviViEJ2{
z+;9|D4J<9AbX3<E!p4G6pYX<WS~i^_6G!-Ne&HyQsY_x-piRrD?s}k6^<^U3euBqb
zNIec<G^ZM|N{`#s*Aqyu2Sh(0V5GU<%7l@`{A>6FkZmzthXgr{uSsw>{y&K6?l3Hj
zbm0_1%;mGiyeCUWjzQo9%(v*n&;@9bM!m&4I($Lg@%xm)bYr<^cp{~Xyn*FPD42`P
z{X67cZb9}fk68TPW#fj42X52l-+Lbm7t(I7UDCHG1qp}H^!tFr82GH&Zg{y-jsb3I
zlIByGWq@4Xi%DG!j3naOOgxv!HMB;bN*W~qO{eR9GE*0|p71{l<PFor@>EN8M6Fr1
zH=^2Uf)&fb{nI;lRcVsB>7FAtlXT&oS>BmwgKgi@d+YrZ8<vk?t~m=sQf~xqi=;I|
zMv3f^1@{u(CUCsO7cR0wzTEMJg%Lz9Vjl4tVwa9zOsWHZaWE)+AZ_1-)lz65jHC}`
z;=4DGwSCrBs@5L}oyf<x?zd!v_LN;ak{v8uQ5wsx+z<_h{bpx29jPR)t*z_XeiRUz
zK>lRYIvH$QvSQ`E<ee{Y0YHQ*gH=oB6365&po(m1e!^tF7Hao4xAe@gMLqQ}5&Ol<
zpao(5VB~k;y&+a<7oCu8ei$awB=sQPy>#Fq7R+gjL4c0Y2O4U&^zR_>`!<Hvl9nG1
z*X^)${rj7if!*W$`({O&b4-j|RB0MtPwjIAgg&Rfg??-Rl+$sl)4r5|PT0PBi-kDV
z*)2#v>Ma)HRHuC@{T-wq^%e_ps?Ixr1LOSf`NP0Lm~iXl5{w(tc=@T*c5j%4N+sRy
zE##$wm}#<Vpu))RYRHN<8&pFFU6RQ<y3OuWJ)SAqWLfn<yr3pxNBC!^EV5#pyKeNR
zp0^y}$L-crD~SP=`QJ%|{cf@fi!n2qgWze<pDe7x1%nvMmlQ4QDiw>mRVV}52pN)6
zMc*)smjKo107dY1zDsx9YR-gG);?$~ODkQ9I{e!l++-PD>vS58{t;QV4z70EWX0-O
zDXCVNhby^Z@Wr7g9%;|LY*>DbKQn27^*ML#?pqID$EO^Yxp!^6G;!;0e!_0WILw&8
zcViqWmTJe7L8mG#dP3i#L0`-kGh`uV{V)#&+!XE9ymB7+gLT+!wML|d?B(ya?rO#&
z@n{nru6oDyvbncdO1mS$f@CgfH{D~F)HkeNzkS7P6$3wyPneAS(*3P%qlZ-^pZn<C
zyNISqRZt8r$l~ot&|#Fxn;~TjiWbgAIh!G?z9oc72LNG13lM$)m+ubA)Kw@t(~^{N
zYSi%?Twod==Wjtjw|BoW7<g0nH759hM_^4DsXsx-!}vyYJa&d%$`KS{{5(JuV&!(h
z1nb$S!Zd}uj_ah-0T|+KBnRQDYq@NeFa^=p@<LgVR7pc%t1`qju$T6le(|ZK&1~Xj
zlj+x=D|uXVU&6GyrCxc+WVSjz-cx^XB1cqWad6mjJ_ij}VQbnG4)m--@@m{@fDLFg
z5C8^*Odw&nP$0cis<2ZO$QDHYl1avrm1H@eC2tH?uL)=qt{+0wBzX}S124ckA-M+-
zF{KnW>!&-Ae~lw+*DmjlBvRSQpw;T!(YJC)2~Bn<5~}QtWsB*IW%=&?6ZVanh~46k
z_*9E~V6^|a-A?bgMakS~DKBeiz^@pE^eu4k2;h~0-(`&ChkpG_i`Sp${Y$Q&>|B@F
zkBX;Te|7QdOWmih{$TOy%c5-zcpH^Iy!hr9=*{Rk4y!N?eD<+6ThIP+YBmVFFqw-<
zvVr0tEuUnPR`y7WWj#kA(*j0TmC5LzZedj>VJp&$Dwr{gB3X_?+A9cfAGMp|7aI0c
z9H)26YLgIjJ8g^i|H;-iiqPqer<m2c_}p|m){n7FtsNijZ}+bl8o*c@*(|13%R3MU
z&5AHCBnl)8J}|ipGffkXsim2QyGcQ5c%zvD1%D+n+Uqp!c}?w1JuWm`{QFI{(AF~D
zp6=b{!R#&dNH#UquqX!Crr}bL#XnrW!J6wE8TM+aOjQ}l`&>pIN<Zn1X(d-QfLPT;
z(%(?scAGoypBVdqeN843^(0ig!Rm@8GQo#7*A?sdn4e!dw$&yF3$5~}P2D4fqK&*(
ziS=L>k4Vo$Ge#(PfEXbU1rebFt;6BLgcd0{Cd{Q?;ps>~wTN^G4>95j2YjSfGk!8E
z0|i~n5duiTF4}T|#<r|2k*|%6EWc=L&p;+yj=7SSg!F!|Q=a>ScFqN#y?OP)+cvC-
z%{}FSbV>rMJZK1ZT)Pyso)LHNJv;6mV^P@Xr{nG&^Frq?fnov6jqUWIjoBV^CRZKs
z7E-~A!_@Av6pkNx&xH|hFyP&M)x`RQ-4b{D69R&|fS}1%wa01_C^gNQDuRbV4unA`
z&fW|EgQy6Yf{)kn2`eHF)MWj+5@P4Qf&Yi#`B}if2q>3#zhdY-*Bx3qo)H0hocHpx
z0_Xdb-lMygjuEp?_}z?Icd;nVIs(?r>%oL03_`QcxtMh^s<UQYxDru!1hej9PJd3!
zddI3G9|)lhOnb`>3Kuz#yC%xp$Gal-M83VL6mZAS@uVV_%=t&&bi3~xnEO-xi8W5X
z&;F&g8)ATq{PgRjmthI_Qd~WkOa%Q-hsq_Ju(+TAmXag!ypDOcE}zf$=6h<Dt}JxF
zh=vhs3S%>fU=TsrYUK;Wlu)ECGC5UMg8C@vyx8E^tvR@N$BxNn#*^J|vY3V(d2`C`
zv-m<2_?69R#&}<EV?Y1hci#BWwf9_oOMI-A^CeY_A>cwYn=2BfU$W!W=Pti^MWOfj
z_D^=kvjKD*Ml=TF;R_LX$U^BTX^}<7Lf%5q5L*|CFc#4wnRpD3g|hh^=@VV#=)z_}
zuqawWBC*mDD%{#sHxD)@ioNUlZm?Fb=#~71RIO?_m?wELo(iOcsr-?BS6p9tcvIc1
zHits|vZ)zcFgHNiPQv^Kp+AHv5B&k=U%XEGL%;q!^!DlNq(A67^hfjbRni~&)t8n-
zc_TN&_zvksSU!lu!+wT;qmW|na7%Ftu~fMF6nQF5fw2n8Iv71UO>?P`wq9gLU_FYd
zq*)X5)$y_6>S)@Q30Pyj``6TZ%<*z}|2dLkUaMMG@Y!hEwEWm)z#H`2io;|0H8*3l
zLPG`ThxrYdl@jY`W9%Q>&N%XqS*K($TDc1PpPG$B)AUfDL^T?Ynz^Frfe45ml7(a@
z;j5|^rYziK5))TJ=x1s+f#(`bH6X%ay8h2Rf5xNj-dBDKtSCAashZLm-61vs9aAnh
z$C{(dhRglszDiDW*RocM*b9j#=)aY3^@(T_2)}{LP)GXBf^fbhVS?x`qK6zsIB6nX
z+2DO+=kD7xUe;Fd6(iFdg3;HQV)kHu!?uVwTA!GzBx{9SHka%7_0)X9WVUBbqqS=9
z@}A6!kULkb7cbnu%j7^VBENd;9z)b^vzqxO!z+ebqod8<Q=jWe1jBY&^7MqFQBVlw
za&|x-#mK`#{EP=-DG1YVDZf)n4{6|>meagOJ$L|dL+lXncbr}#4pn@wLEQwFCze;t
z#dJvX7TritNS`Ei^E<C^#l+m($W}d+FWDV)SK%vBFXGeeX6d7#UZgBQ(?9+OQExZC
z-^hQxn7IInzGCL08!`@7G5<RC5yLC-MtG#`BZ8~wjj+ntkBEEbsea?1B;qRl`t$62
z;`%Rf{TYe4N{8S_-ypd3w-8t9S6})Lz2hD8%h+uK+H>#}phXgdi>t2(v>ujgXAH1q
z!N-EF&_v`Yblv1(?m&)wHH8EtDaq3bih92--<=EE<N1Nf&&R?Mr?1lDKOtfL^3-<f
zsS6z)#B7yV4@E4D+{k;n?J^=g;Atb`e-b5_F>{OZtuu34F@OXxMOzT}=}es-WC;>y
zJ0wjAWK1HAWEFQ5%|n@G)!zl=M#fXy`;&zh>~3zZ<PAo1DXJQ*34>D9{yx`L&}a8Q
z{ox(0^+ETJQA;os#Wcjz$wXftN5KDYXv&AS7JIIvdBrH$4H(5jMhfu0;=EGVrVj0#
z>ec6!FreVs4BI1c|KNen8zn2`N|EGT4l!9{)B#6XLK=W`<9=0<jK<z61H2lhXKxTC
z$z*e|DosEMf=o-OSSMm61}MU=|8SG;0^0cB^|}zL@FsFeHJ{;%KbTG7_u363@$guJ
z&!vXza}Uu_FD)dzbI0l1<*}&UGj~3H{a!lhpoFR5xm|!ZNR$F7nFlr>X0VeF=!Iu5
z@BwxcPAU2DugGZ0bMhNTOr=aH>nS?{2!GDuTfTPge(G(eo;RCC$Dm{4@?FAXAXO(L
zH?c}!FACkW7m(OsgD%NP^g=Hz$w=6tM(h!L*ylk*D`IwfM#2T4gg{#iw+g%C#!>CD
z)@WwymVCjP2<Hl}MA(wQ<ODa=E;)4D_2b(v+^{9F?ZQo4Vt`BZFSr!bNL<RHy%w(%
zm+IG_=i^JR6PMC;=)TtJ*2Jay)tBIi$*9eFiQg+(Se)fy)4;!s2Vu>2RkVytQjmp0
zVnLQC!<?_Na<*C&El|CNKK2EZpioF83cZD%L_U$LAQuy;!1vLm_=0Vd?<YhcLXeRB
zB)@|#5Dp1+1V1Q<$?r|N?3*_iTi&EA-sOB>uIY^_a?tnVf^?HP;!71|!)9dd{QO7D
z;(fbsyWSmW$zGeXVel|Fc!S+4H#yC{TTi5lKk_^0Zr*;PD{Z=GL)f#3CGrDxEWJQj
z!pMPDX&GiU%j#?ydu(bp4CUwyfN#JI2CD&86f*q2Gp?vI`FYeZ3#n%?nhZy6W=T<W
z(FOkw7M9Vt=%_{8U9Z^80?Vq?XbLKQ!O3ImrrU`|BZquOV_9Rk*`KTDdaGqXsAb{X
z73|O{FtiA<%4z3L$17-`oH=20DMC*!_!pkj7TE9m4Ti!>tvcc@O%9D|@2?Ddf-9>x
z*eX}{a-WuXw&09M1SvjSTQtk86_4t%2a`>rPC1gygdSSoG^@kI9t((cb8O2A5GjA{
z<N+J`ZX|tSy&MEy-O!d3?NKC2StKlMcWyvnjw4{vF(!4>T@Q7Gmm~?Y-{WD-6Z1ro
z*K;#hR-^(DtRUI4Ku~@mb#=KDXsmFr*t%)!_I9LX^9G-Gr(>C@FY^VbPr9nO=klj-
zaoN5JdHj>%cE~&T$+XZ8^8-RV_*t4wwbyu2<CjbzFQ6ibXhO^o@Ch>>l`^P%kYzob
zqLVs_V3aBakYf&{1F3kFlIa0WgjARgUjg93un~Tyzo};}gop%<ySMCFR*!h&ej8+V
zJnL(EQUKSb@l$)QIQhEBw-mcyo`E9!sXDjf+&3&=5%AA_EKV>d=7;zWfzvqQ6m=qq
z4+EzN@xm%a?vHS~Xsa)H9cSP)?um79s*z7*DD(?BMYKBziv-Sw@QQ@J#eL4i=+OF$
z_h#xrcXDIS?1^>tl+s_6e_Wlp^_{mnU8k-OTG4Sd%!eFDuG~AS%WL*OfYHUW?KJSj
ztSTf41U9~sJQaR1%%f~BEz<G&jFP#m%0$q$_L^MU?2i_r9ARhv&6?jI4%mWoS3*vc
zJ|GXEjrSKw28Y0&OXB-@H&}W}e80f*`EtkSUN9g;e1E}AN6brSkcII6fiY)ksDQN7
zfuXIN#|JHHwUw>7LVMHE>GhUKC=?7O6M?*UYxi(#Mb>8ynxm1RGwPd44dh1G5_|<z
zUwm2mETT%tb!A~6QWRMCnnY-j??;J%NU{RfHbdB^m`}z_x}NAqvRW2%K~w}jro;n8
zCHw~wzya5j4TK>GU$)f=Tqu4oTC9vfo=Dr)O`KCsCc?pJELDteT9s?Y{N_q5Tc)f=
zDisP2_Vwf>Puy(bk|*Wk&uv^+8qK8&K~Kcz$wZPpW2Nzp4!<SsH+%9~ZKzln$fQdl
zPt+4H4UNzBB~W>bC@5yZDLoEpy6@>Y@@G`&NAfTZrpZsipzD-w!U{DSl^GSjNw<Rh
zChl|TmRGw!-F5;g8J4D$hvp-5gK8A1=uCI5nvF$|iV&gKDZZ&>AD2{91D4=1oOjwo
zu8>EmXD!-_2G2&*=KGOK{%AB~ntQHPP)$Bx$VYUF5$u8m8YElZ0pg_EP(52BOy{L!
z6l4KdKMSFo)7g^K$&xp;BS@A+OT{Q`u*9aKCA)f<uK~%<y{D1)^0(5ryvs+{1@$Ym
z_{Bu5(Bhkfw$`tc7T2#o&p}R$?MaK%b!hQrr>~M0*RQ?=cb7wp|2JQQF^TMloiAiR
zN@r$2DxIpIf=q!2ir5E`Tj&Js742@9azwIMk|{?}mgImvD#2*F%vn~#AwFx75Hx?!
z%J+uD?;X7h0nRz(IjG|3za<CyZLs5_-t*&K8K(@Reln_mLv|DTk_tf`5LS$pM6C((
zn(#$6T=k$aE+XN1`cB*5DfhZwze(OKo|vBgcsUOVL5>wws3?*Kp@9(RVje<Ipe&B7
z1tw{n9wYyZIiGY*%W}+b3mff0hsPUK3;vMBGj5eERV``r$%@yUlFZKjg4F|s;IV}H
z&lG9n+%6Jy<LBS~?md@tsdqgeXdnUh-c|PpZtMLUtMaX$D?HtA9DFm)1E`qa34Ej(
zaww^g%e0t7DJ>L5A%~)Mawv!m=)l9V@D|R<p{PNACrB?BsA{pe!BI}#b&af4^SM|g
z9Z1TSl6K?k%t*wJmiBEL=ry5u!SEvHXQFRpZMlhb%1?g>K<582zk+WQ(3IMFpT)44
zLjlG?fiskRtjLs=0=(s*pmPP3p$nUqpb~+=1sVaI21T)Go=Dbul@#r7S)7t&H`gR{
zqU%~`u95p}!4@{Drru%xbCYb6f6;r9+jUXnyHsTLpY1gXc!dHc!39?l4B&zlMD3mH
zMD27P)LtQc`tdP@5r`_YkQt^wg?;pV3kGpI-;zURv&grIKpJISh{Ta{fjAX87onWB
zG~BkoJvyk#HV2#Ms`>v+j}|4n_cz?^v3YF#e52d%adW%X>zjMK#T1PO0SU}{DUIk*
z8C3rMwyTIdZViH*h1>`MP%y?1Le5w~$fo@;22G~ulmZ_L#l28~oCk!L;FpQyyU;R4
zZO|HJ??+#`T{~yvW)m~-WPh?9;wvyi8ugwofL6*-1tdkK>}njY+AGDOM2RE>?1E4w
zZ>^ys_<~TVzrp{jdOAF%Slibq))gXf^<cBBIQh6UtgXLBdNCMspAJ?TY<zZZhCUIy
zns{F{^;9eC*tG$(Y5~sLz*!X$tQBmw?J5Cl-GsHUX9?D_I@TOZv9{l4RpHqMrtGLk
zl~3a>L#@uh+aI@V7aXsMxj$+N+#!lNvTSgmzpvf{Fe?lA%R3kGCk%u|wL{r>DqT1W
zflDwLfV|PeJd$zP<ZH$1{i_h`>sKu8YjI2<t=#jj!AfXF;iJxow*K1B>j4?*#c(Jb
zu-c045fK7Bjn!-jSdDodI$AxQunqq@@dsge5E$-84gCAs?rKru<~qoZgDlBo>yRak
zG;ZE+;bwDmN+pC!dr?IpNdcl!Dg|96OSB=2&diU#O1pNBS<KwBll|#-K&@|})!(R;
z3JCWJn#`n$C`Fa-UxZT-ri$v_1<I5L5gPMGa<x@Z@@HbRzbiMk7GdkTA2>jt*P_5z
zx>wB(tw~1_OFavb(NvnB+9;))IigX4L4GALsKM`VwfkI%`zBv8?yHj7Rze;{kNhI_
z?JFSmYeu2fS+QRjl{7#F>_ir=PA+;ViGFVsBye!^z_8H(@<>&p`iQLU&)buT&1rlV
zQ@;HCHQ|sYYO&fJUDc6=kt{~-AQdt9{6gu6fE;U60Gn!pTjhs-#k|AXR`*lNhoaUL
zzy?aBk}%Bln2yGX)HQD=M_C_K=IAv23KP?@y&Bv#9)U3MhqUg^py&1?ElWT2xK3>{
z*ra!;g=K3OiI>K3l4!KVQ#^u-oCs|8OWIyLgdSzC6LBclph#WoRGL7h0iKpoJ_zVV
z3VW1H0^v1G7^q|sGGC;)|F|IxgSHPbS_Z!%pGl#wa2_dcGnOt04N%up+@ua#!sBpb
zBB0MG&8eri4-F6YrBdm5caKF$?d}~6uF}FWR4rLD>13RzdMC#QEJNu~z#ed^TD@=X
zdsfeoYP`^32$!=_j8fxi-i=Y(VSPc*0_$+eWPWfVP&F#8b2u1tgdHJ-hV0CiQ_Oxq
zr-Qd7Hq?RV>Vd@C(XLi()wrg`QrT=G&C|I(n~xvO?cRLBd1GViHV=<&*faz>sLd}&
zT<Z7mvz3pa5~W8^Z-RT=$lBM*My2l<Z>E5_`l_%u5OU_y<&-NJai%txd;GP(HA?q+
z+{U@P(<vu^9ev9>z2T=)G<(RC^VdncP*W``9xw%x%%r1d#Jp@a#%v*5(BncgODE>F
z=wdCTSIL<PG%nb%bN~LWTMjpC#d@piE^6lc-gW=|x8ME5!)vd;?SjKsy=L3F2yk<Z
zhKYW|<mb6irz}yi1^h^IAaI}GLUy5HA1I_?Sf|wsZV_yUbJT2jq2CFwG;mZ}G*KO*
zrDMAWt^Q4R+lGB^mujC3B#lPv+!Lt~BL08P9kMU21ii*nzn6G7#?284)BDenADf1O
zLpBF`gz`GN#Nx;n3YAWUM-!H&@W?QO3*GB(oVox*-0TYU=a&tvFK!82dbf0KUAb~}
zjrNB0q*bxbJ!y6Lg0b90ZPhv56Fz4!YYV%^CYB%HumiE=-V8dg%s<Gl!CVyCV7r+P
zIN-1lP~-!%>!EKYB<@hf2%f=eNhYcdm|-KnB7&RG`w)@~EmZsKZls1xqp1B@0x!aF
zBC>R_W#QV2m1}pdk=hf9@}?n6Wn*J<<%P@E4jmai6!VADa%yJ%aIKNtRF37czJfjM
zTG@YOqq1i8=1Yb^IW&WJNc)hxO)=C&#r6ESVuZPdc!dNs!d~64&tEJSOT|)JK2tz4
zEnI17V)}?xgEIMfy4@z=>ZjTL_opLM=VsmBP(Y3qAvElch8nNg3j18QL~7y3-=B0?
z=dOiJv{^#Q^ANrK8c)}r8l`#70EgEBhbdb1f`F#Mi5fvcR}9%sEP2tZ8G%Lw=Ln5r
z*$Xog8dEHp8S`XMuX<^L!8!=^isgrJL}=L=IqVnph0WTE_3JjQFAT+b-RSXFUmJ00
zvCm$9`5}kbRE(sq*s*z;o##_=tIXeS{LCE>62B$qf5+b-{T~*94Lsgn>BN*$Y$}0Z
zq>Nfi84^%NULPu+0<d{e<g*Zf4Z=4MW`b!1qyo&3h&|<G$qE$F1Bwvp2B8ejpr9*c
zpXyf-ks93a>B-69kGhwe%6)IKhQ_+hgI$%;Ua7l}e|+DeQ<Jw|$nS7@Qeo%Zscd%c
z_C0IHR!u3Fok#er%|FiH3Vb?Pxm^Hnf=xh{Ou7~K7~c*UX>}P#jSYk!>KdD!B_|_N
z3lgb6tw`!+ntk<jY4RNbe(cCK9^~T=|M>6QhP7Xqd-`GW4N}0!ZPMo;)AOisLH%x5
zI%K7w*W_Xxx=U!e1vC^2(P*Ks(1_-vxhkX);?RPAI*CR-b|NN84FoB(NHuGO4S^H#
z#q{Xc`H6G3?ccqkQS<rz2PRJr_vT&i8Z7z?`<jJ9GZ^sYy9Wk)d2YP2^@8)aj~q@U
z1Kw70>+~bTTQUh3Z`8W#DQ|RWO|^FF>mz-+E}uVwf~i)UW;r&0Kcw3Mp%YiP$77gX
zH<yeyD841L3_S;)rpjc(<xavSLTH?AJX6zklJCgO1WC#h>j=VZE&OVDS{NQ?TOU_y
zO;nPux~bS}kkiH8TTG#q-77cm-`CaaC>8pLdMeU^p_{M!htIp*_N2w~x@)u9^JZ?i
zZtnF{hAsQ++qaFb1_V@Vzm30-V$$st$}wI+IKpPvLdCK{)yv;>(MT}BI?`n`O^Tu_
zs>t`IbGFd(dNrDh^+e3Zt~J`kK&Go$QcoHqbN^{`#O<-+?p7ic^Lbo;n<wpSH8Lyv
z3MEs}hP5Fqhseiqz!PCfcA#yIL0-e;h1(4am=;0=Va=W)c4#$3OgAbdAbC4bO;X9&
zkxHH0(`~OnbuyYHlOpRWc}y5jpwLeON|*PfTxkR_^uTDy`zh+rT_13$o^#5swBPF-
zRvp$-C1FUfwkw7;&al%n{FbuUW}N#Kyi9*1eD5=nOL}QmOFWI*hA%?TB5L4Lm5!fI
zEFhnYxsUR7Sr4KH008Mm1U1~cIYUCS13|iEb?rNDiDnMCJ?ajF)jsz--f#tcaHL#;
zsMQvb=l;s=4R}OvLB0vSHCTVUo`<#4NB~22L4b>@gvgE^goqZ4b)$xLg?u(p%qlA7
z0cpsPcZ=i(5-a32np^<1M6Uo%demO!)$D-{g_hlJHRqO98_9^bUsA*Iu-~1?4A)#{
z&s1aia3sQiTTiTB>$IBvwvZ{3P6XnzEJxL_?2LOnku=s+tL{K=Db@@Cx*D*y<xgO3
zw1YMCpTJs8U@f8nYsyZ8)d8&aIXhU3Sp?Q1mJZg^h~9k>Hg~3-?9e?7Zb?1>@g^kl
zC|jomLH2rotydxYMXE1#s6O6>BycxT{j#C5Nf14+y%N>;Y#po!q8DQi@@@Zbb2z#<
zhvxs~9QM#04%ls0Q(>sumyCL74x<sjCz%=Qa#=i+jgdb!hpxDr<}m0nEzBW#2vL49
z#_^YMFL9=h=vU<4rMF*+dudw!4EO%h^+CJh*-hN*vo8bpmdi;)YPEw$4QpH>hj;ki
z(jT!epML~#-3g4rO56+I8Wt+WsJa$Ho%l|+v5b7Mk}qJp0;EB?qBW8>zRBdXCv0<1
zDjti=E<NmZI8N<$Qk1te{~P%(yfee@!Q&cx8-ESXGP_F}60u>r|Nd9FfA^C6kBj>V
zON!^O7SG=;EyLM}IOTuwFG{ljEWlEzD{iu@+7TBdCBu>wDHjjGhw1M@6_{bN!sXRd
zvqgx~B*ZP&P4VlIb3%!s48v2txucp`o)++DU$F%lsbo*l<T1W+x^3;NcU2={Uq-BU
z&yyHag_jb5XcZ=(s^-MyU_dDZN#Iib1@s4r9bp@)U*axjG=N%Nv&qt9f2+mrd<e`N
zcgf1l+-{qc!<QLKfiGB~$gVc27TYfAomPwW-Db0_nXSqubHW)k6nf%$X|vmDXekDZ
z<qbx~5s{54&$T8O>@j%R^FQP(q*JKBs67ppf?3rw9ag#tM}&gX(YATv*X7e6#o98M
z9Nq#sB0<PVo0Mq$P)hVkKQWsPfB3x#(O^8<&%VvxhspvA!#Ye{SU?W+7O(?6S(sT+
zOOphwZc=WHB*O!V$hYIMP<k+&!dpu08|>5kJj~#$yk&vrI&Tp|dn!{*7qX?yHww8_
zt&~k8#wxM={C~5z@=u{#KUs2cA3y>OTLnNXpq5tDkXtcmtKaH#I|X!<v+B6lqzk0e
zfUXE92+)Ln;%hqq&z(FCd4B#K>^^orXi!uDb@=6v(SV}eA~8(>u1cps44o-j#ptq1
zp?IK~$XkvEqgv3F4#tNw6W!n&4c5Sq*>UjAqu5_SV~?`O1>HZ&H{&c})$;GzJ7H0p
znU8v3B;GShb}bf*&*IGyd5X<DnhhC&?@q-$jko45H(cD2%$PCIfn-?vfYl<+4SJl$
z=P=C7P$*4()#iuUyZ9e~Fdr+lvs67O>{O8l6-)d??A_;aItZy)^#i1e85eV<VkHHV
zdy3Yjqq9UEI?yw}0~A2$yu;%(%+=5}^%i3n@YnO-f|tA5O>J8y2F|c4kVa$(Il;Yo
z*vy#Ni)<Fj<g`mFGpR=$3KcmB+x@T=F~X7=6rH1n(yf1{9RjG`U9~EreED29ok}J$
z*fPTF_GVnJ&H_YDBc^V3KFMrpA@Yn*SOse56Ufx?UE^b8Mr+f+qZI>^xcF=ttrcV2
zXzi1EtZbMOpF>7#*9T^dGjpZjnANzIj&k7qa$tqkxRH)h@ci?^8L$XJU&nz{eJ!|N
z4+&;n!dgova|Kwdl?W>f1PWYwK}AtW&jKn#;C1M$iEtf$HiRBnmK-oFDO;%P?>4L}
z7Ew~zi?XyTx!O&Ug;)#<2p_v+3Bl|ow<Dm!geoinV~?tMYzadwvZYtEZR}b(na@To
zHnLqUS*uIc`RQBUq^Fb$R+UnJW_=_Zb4ONB3~lVqz`?M^%nsQqJ-aXr3AwrDJiz}O
z5(4!t?ZKK}+lxp6JdNv(OQ;dUm?7<1F{~5uoVpD~C-5Xmf~coCT~MW9b+T=!FgY(o
zF=eS?)sX9ipp$5IM-(&*yl$8(WMd|bf=d?7=0a4`<4nXOo4fKDBEKye4W(jWm{U)$
z9v|M+Q*ijBmIQ`jkt7T>uf@vMzRdbCNGlBNC#BWwr?LmWWSn{0&Y($RtHDz2@>-6>
zF3BSSk4T?uB=(m4EL&wYlyEu~HKAT@$M>YuWyE)B|J5l!bXnzXpnCO=v=84)_v1TB
zYU=Sq(WA3%Ll9~;=KgYQ52FjeS9$vxZzRslK;GRe<ZFbg5uG+9K*&N^6tjrZ?pzSI
zlDtvK+K4sm_r9X6Jxdxc*D0gV=(5Nip?F&AZVE;+;RW$XBeKl@jE@VQCU&`4)MK4p
zE@<%<MBTs3)^zy?vNctaequGrr(_Foji(*+_wwWO|H4$3I;k8QN1~Pl=yu`=EP!Hs
zeI`vaaZ+L90kJESmUf_Id4th5_mR<9g~CFxY|h8p(U;jEgSAw`<6>18<G121MX^F|
zkPSq_vdJd`RuC4#yTD|M<@_C|gNy+pINdA|Nj~y$1LC*#z)F-IMB=L3<*_PU-MYqQ
zQn3I-iQ=DP^kfo})Bd)x@lw+~lFVlmrzd8!c(i14!raU*8{~nQ)hWq^LcBIw?yA{f
z1(w>~$z0KGh!}h!jKMR1KKmKQ&}7ke2%fv{11}7r*&j#d9N-fH5}QD#qu5RVh4N+k
ztp{X8w1GfIWoc(Dn#Z};phTk4h+^<$;s%#}ZD%kZH<orQ+g9Hg3(Lx+Z=hXSfNda{
zE4U3Vr#EzZOm0`)YISSL!m4&;8O4gPnIGg=%l#;-!g@NIF{t>%3*k&CBFYI+I8$UR
zI@t^Tbd3^Depa^H?|sr>vA-zCY-U3?X8FSd`J{^Xno&(<lAE3P;-#?m4&(h|AspVD
z)!d>wlagbNPU=x4$u#rgJE?<5V;1=sUipV8-jBDeoL|PBvIgA=I&tf}RS^B$Lhe0E
zu+W8%dGo?RSPUy53L>Zgdgt4l#>O_=eO{%1b$&3ec)g#$_T~4y?Ymb5;%mNh?**T@
zIh~+YG=9`5zldJE)XSpnenu}|<|*sF=pj>lV)jVPDO$HrsZXx%SG`{QW_0KHd?GRW
z<A?5gab-Mk>3838|H~k1tPf?sl|IIogKI*s#xb4_w<y@6=V7Du)C|u=%P~BgW54CM
z{AJJP5JOsz!1hy1o@M{}XP?C!YZ{*Yl+pT(coJ3=dKFJf?4v+43U4ut8<2&^E=_E8
z+gvGlogxaSXKx?{sDy*EOwfphPL*=B?In!~U4wus-50gG(;rKO62ZkpJv1ax2~!zj
zS@J{j2*vqFS07w6x^k7(;kWU=L9=<NpWFQQhgPp_Pgw1^)@Yi|tv+t^*<B|tb~#U6
z;PUun_wMa>`}RF9teVdsIP7#BKHzYBWY@O!R_oLzmyFdxfDUFFf1?;z4>LX8Qw%z#
z9$j|>1bvx3m8%kXonLh*J+QB+Vx`N!4*HuzX7ga5KWMP7YLBkAe%SBrYnkOpx!32H
z^-J91bGr8I06e?hHm{kxE;!+IU3|h7r0bg}t(oBs9=h&4_lVO4Kr!#YID1w=7HJ2)
z&IO-x0gZ_u$=SagS*{B%ayc(LE)cVKhuyYqHz5Z700ZpDq95fWK_@au3-3I0^y`EE
z{?o%;iD8N{?cQ#)@7Sx4>G(xX*F_h&guc6rYr?)yQk}WajlF?%F;CiJC&mH;3ZZO7
z-T20ZZCoND_ydljD26*r!`09FT~bjA5R3&{@tpZu<LU302E*mJLklE^GgEy_zY|Q-
z3Z9Xp=tIC130l-Y50k!dP$ad;E+;n?Q!Wgg`dPm-v79+-v|9+S8S!0*OIo1=Q;j+^
zrvany!ZJYpu_n{V|96=3oQ0Xc6jRc&U<9bjklO@QE%{FJ3b<l#6u5$igw_5+y@{y<
zu?S;YcT+K6!c9FJH%oDG=J@ruFJo^KWB$v$zq7}<boS32hj{z^UF=Q&KYYujZ$E>c
zfS0ZF*YauUQsg3r+O41mu2l@yxnxs2d3QJmTsn%-2$bJWDy<@KPiExN=UJ{0iI6*)
zMSz}+7aUqYF&X0XsBIJ$428&r{%UZ4)nV#Qri<CG@XcC2q?uCLL@nXVW!nymFX@QO
zd%d>nmCC`Lze?}&I<GW(&3T_EcFvBe)qYUB4f}2ONE!HoEw-+`HWfoSN3In7ZiCT)
z(me#cC(~RK1^ob8x`p;ZLGd$OeyVwf5EtdNC>N+!tF3CY-lKIRUj*YI2c3rv3+O`?
z77h93Euj&ELE?{2@P<qpQH0(}JV-rZKejm7+_ims_nx5Fup{W(k1L2SHTF(-Zw+}2
zTRfqQhg*XyR}7EzhCPPOh5Vi%LidIpeH$hl`*CHmR@oZzn+%36U8}b>qg%GGpWL!z
z9VKS_=U>k+kbVF!=V03zh5eqlOA`4vqBzS6*B8tN$#W4Bd`7IHJB9&bEe+<6+&B@$
zp_DJX_0{fAx6K82g7zyzS!(w5)akhvGEa3IZ*e9m(IJ+X2I1)W`32WwBI{whDYvS-
zE0nyrIXaRl)cY+KY#?&L7rZ(V^@VnNZI?+-ugP4qCaUFFHFL>ev$@hV?XzDk2Q0R<
z)np&^Y2m9ABM8uN=0a}%PGnezsDfSN2284zQkh1k7>o*5ZW^#;7WLuST~)GhZiP)|
z<5sL72QljVPz<rbW?#KG<0)c4zl;}a3s9k>6DOt@W~%VjF}vctX!D4XA#p=igI?yM
z(JD_q-0id_`;+zYnlf$kHKkoPU)y_dEK>y`m<ry)3g<mG-__DJHs4NTG#{IA*a8V_
z$erB1y$~};iuw3u+Z+fCCsftmx3&<=hi&<IbC3)VNJoY^|5oTKRO$G!02s~_lA#Dr
zq86dEuO)V7!YT@+8{xB)X_#i|j3=MTcr+?<$$=g<turJs6k<V4QD-2C$BwFf&zPkZ
zMr*fW^Hh0AF{blfb?IiK^-{?=>2v3<ey|dK-DS~;EoAqvo+-y}83knI(A+3?{upTw
zr%=PvjoK?LGQ)yQtnk22u}7d}Xr($#Z30k~fujPxt6DCVwTvg@#wr`yuZcFZ?CdVo
zuj5@u{~v8@A=;_GzuD$H7d270*n9_l7ukFRGuY_@JAq;QucSLKn~U1aIX3TR_pkDC
z+9qbU5GxH9VjTR$Zy&nE=ex3BY<uxsKHfm(<wE>gVs8WHApa3bx{-ecHZiSrqQ&Gp
zk-CS^N;};lOD=-&1`(<BGOrg=AIOF<ZAU4FfQ@-6$|IP8-)OX68>_t0Xu~I8UXER7
zHNLSDrBA)5-=Zh7jFpdoVS6eIc5vowTXr>jBR_{f#^MyAj0c<!yUJB~8d#Vlt%1a2
z!h;q|Y9zK18&%N?0}gdf;)+5o2pbpR-PVIaa@%2Za=r_DRY=OzI^>~!kzLcq7&cKc
zteY|zRX27|3!fWt8@6pTxFhEtGDa=*)e$t3K+mwvfcpDz&OLzVTz%UIS{&Y~B0xgX
zU_6MmWqP=;L{Z`lW4Hi1KvZ?19eUd-5^UlDgvA41Y%$`Edt+hL(>QFx`!}7AzmUpM
zI*!7Uz|qrzNU$CaerN$@_v*j-Rgthi(FnwMz>|1?=Q}#jum=GB1HieHA(KTjPUHza
zAWPdj{-7kU&tx)UFTjNv@pU?0oSB90`1Nq?@6x@M3fqoc?4$4n-E9Zaj2<y5QpBX0
zFCezxQ5B>gj3Z9&`0_vVkj>)$wLLQTy8{WEM?G*LoKuhcqDlKrL?Hz>!;kR~;f;v+
zVA5r_1`uEFc5yh^sK6ohlM~8QrOD<a{{ON^xXJExeCfM9V4qQsW7&rNMqAwGQO=zS
z=P9?6VNQM%{}q(-mw6df^c7@OLd<=V@!2x=dBlE?pO_EPhL7mq%D&CtfO`BC8x#?b
zuDHFk?gRp8Cs>=pIHD{_)Z9p-=7x$zvL)D!ArT6}$VnY26eH6Y_#;daK&Xrek)ZyM
zl+P7#x+89f&EezD)s;}(i-in@lwz^_xM#HbZM)54wp&pw5(x&2R-46=F~)r1qRvC-
z@guwsb!8Jz17Iwtotm{k=b<zh&|L%`;bLAXLL>3@QQ?9@*PV5J`su7!EX&Cev-FEB
zH>R8)arxbWUn+JxFJFYu!#<DO4;(I3o=HfAP(G=KJyqTyeF6BwF2~3$uVmZXTTqpV
z$cUNCSXG7XvteCeRiFWzXCuu-il|GheKVpuRctQX*H<Wn!!}#r%D(pSV4+b!k|>-H
z=TZr(F!Q=?A|#aW=j4)Ms|(?Y>8`k5XhujDm1bD`L*hqx>1W+~BoyHH!Tp>2@JMDb
zv39(BFn(t$Z4diXDSO1v14D_m6Lc+^wuJ+@5ecX!he`Snw>Zt}sV|<#cgHuc+j~xW
z<El@s7#QpA^ED^xecrjli&vMQz6x&Zo*$K-mOj8H*$(d0(?^g?24jX>3{wM=YQZ{k
zSlDJLnP~fu?m%tRoz9BGKHv{-3+*gp5~d5(36|LG$A$zYfk}N4Vqpr^<7R<iea%1Z
z6)^Irp2bE13y)%#nT4-syrsPiw1usbOf-o)5Q|;^`NvTb407DIWy3lkVr@QO#PXtS
zPM92qB_@YHXC&q_1(Mt}i;&oT&Hg4$txC);w6_XY0t1QAAl=bt9lKBJWiGU5%_mPZ
z{3DmFz2J_mpLp-v?>l!yi`tfz3Vn$i^FE0uQpv8M$?RIuJ=mmOkKHbRAyVA8^_<Iw
z`;TsG`W@MPBo>JAi-Z1D#F_ApeDQPN`Rdy~^z7Y1iz7I?{4uMN@u$O9yE|^hR!x2F
zudIzI{jb?~^vb@mcfJ1Jhlcs3a=qP~4UtlywYx7P<J8Ya*kpTk2=-|X3SzL;pSBwn
zl)XwY*=V7dq;J-VDHWx0CDeB*%Hm4WX0ticT%Io%iW$^)!3@=P8?Xedb+Ti^u@IsL
zTtIbA1@J)7N0+sN5RwXZ7$Ia~iFQKPoX(+veSh8V*|2ld%57G2bV#dqU%An=thBbA
zm0Xctw<mmSZfv~W)mY^WmD=r(4j)Y1HaWg3=5=N)URScK{`Et}`mJkC*eAj4_3-4#
z$j+53dN&{I+EGQC8k%zc6#xH_M{&VYDzcl~{*WDu?^8($x&d)94=R(fa&c<54hl`f
zXo4D7AWX%Mc%7yB*gn&Mzm7oLDnysIS-dSUx7cR79gW9n3z&E@UeMC+m^&)=lyqjZ
z7DP;F(IZf%O9xcRQt>DW3Q+^SWc_21r#+5pVAalJd&io^D_x$D-{XqBn6Y}&js9j?
zR{l;ko%h<ezA1L<;<!<|$Ky~=UFd-UuB!Yz>jmc@m_ihkW#|9ETliZNZMKDBMc}%z
zb}eZ~9Us<Fld0aBaWHYmP=Mvy(^be7#I^@QsS&6`#SyWSpV5O7H6hzt`iT?>>Cz76
zqneFE;5r?E0>m>g<@Go-RHl3TXmvo9U77Ao-r>r32fXfRj4qE=TezI6XL5Fz!|yHI
ze6CpRSkdSSIGk4f^p$8n)EtSrjMi8n6v1}&-h3?<Dn+ABpCw$ttq3aOqk$l91$<7Q
zr|b$9W09tBSIVHK9qxqJnKCFTr#ImNWn_7qe^mM%^hE&LVvo?Rn`;>m28?@<0qVC%
z(iq{*U?(FBhx4dnpA#rtc_&U->I$7A^NqnEWvqgYU>%!8YKfRFV8cv_%#{^J2W28U
zd1}E00wcmRYlr|B@OK(}KypjqPJ7*f^A8=~d+gkijicjl9-HuIJ$*%ILh<3Rc$hsd
zuTM6lJiLA6H5VN}c;)fShBj~Cw*JxS$-Jw#zNKX~nnI@h@>J4nQLyqFh2MrVM%x3Q
z?GiEGBSmgjd$`e*#p-Cd<Ve98v7MWIJsdVBsfZ=ONHd#M^HCc&F{8m`M2=Pj7jRk#
zE;M=x0fVjHp~g_HQUD>uqf3xr?;v5JW{X5@r~Z?~KyzVV&ccH2j{8(`pyoT}t(u?j
z1SSpxBTXF}10h+lcvK~BFxhPp*-+h_X<5C<{CcF{5jqGhb2oQza%ZE6E&e8>e2*gi
zjvLnW_(32ZFH%Ml+a{H`Px?2Qxjr@^FoOLTV2A28<}}lbrRJDvIIqm=vwB^6vYY~i
z3$rU`5k>vr5TOAYH`NaHRvJBBUSBX+l1io4fpW8_x6u{y`NLHxvTNoC*x$?Dr~+7$
z1w&3j%ZU073iXK;#Wkix1^Y$FVJw;XLmaEQ0QK7WA@&aGCm^vP8))}qny@C;4);hx
zQEG>iMRY;0oj?Xe<Wz&Uz>*qy&r-3o<oh{p57r1cBSA<UI`dTq{#r<vxtrY9Q@=Ly
zn><cs?mCYZW9VUD<Ja-KVE1VPcOh(42kY33EG3{|mjjhpYCw4?LKAGzmdK5%1$aXf
zKK{YCI0EjQj=0R<2)o{Tqt)pMNW0cqux2nT^~`@A>+@_ZB;ISsay8wI7l}`L87wbh
z$CL4@e!*elsr{<mXRsZKNIkxQoZVaq*e4Oip8FrE7kguV3G<r~??TEJ79lts5)gSD
zKpE6><f-XzEg%7q(aU>8)LonGH5n3VQ`UQ_$?UMI-IYvG8tQi{*-Y?S*{0STss)Sl
z_}ovV2D6KOJC0F5`liiMh#An3p30SkTH*Ui@qn13<k(`)sD=rFFUE~jL~q2O8lpU>
z-dI$B%SQNR;9)ooY3ziOK|VaZ0IkrpB%&9vK}NkED8Y8v+GPQ&#bI@L{YH!1%0t5m
zr^jaX*nNJiRzNb@km!y|4Tl|#!XB?&$lCDF83O*yY1;FnF7>eQVIF9OBmuzLs`)zm
z8UT#2L;5Ib-C@cIg94$Di_uVD1OT+2Q83(2cbZ_+n^$Qw-3A)*-VpsIl?As&7lqK3
z$aXX_vd&*nX`sse<k^2F#apv+*U(w}x*c6kI}FvOUaXG!61sk#x6lj4;+G+NdJ-Ju
zXLUgrs2(RJcvfma@QvR_HAf3;OBOi3xxn(mLJas3OT`BI0e2v9$X5-xrLwd<nu?+b
zDUssg1XAQ9z~3I!#yy4oh|DZ6dVR&(D>E};ThWeeA@ft{jXhlfPbeS_4YebwL<aBb
zl}hY6>8q!?geY5-2l&X@)#2<g325PwBUXdYuFfPmITHhG9f87@EG41H6qw>R>FpTe
ztK`(P+Com90_}}X!7=wZUsPR=m!;{T$M1&NAj}q|B>M>>p@i8#FH!#z{0fmunqqrb
zUr$f9fe?+S;`K_&N`G%}1wyr133w|$Kl#;lgaK*y9GSg9`_tebNRj;;`vuh4474CB
z%@B{i6W2aq58yZ5UHCV_c7Q{#Vz;vg*ayI&yZD1rNjfBbLi!a#*M2!Kx8%#@FUY41
zQA5?R+^_*<LT@!ZXP7rSjTahE8b7C)m55SNmMQC%XO*9*kEt)4dQ5kizHja}?>4`~
z{8#2rnZIiOo+V<r-tq;@DXYUeX?@cA*VZpszhV7X>r2*O+P-4<*|*z2?{GP;a{Pni
zpB+DT{KD}+&M}wGwb6Bs>nhi+u6tbXbiLno()FTymHUwUBKH^F^B${b%CpmR&~u^Z
zYR|uUe&c<_`%B+C-@AQZ^C$do_Wv@_6&MPv3TzJS3EUq{1&;<#20tDAa>x>TG`v0h
zo5<G4W6?--XY}>a&&8zJy4ZVTKaY>Z-xmK;qBrs8#6Ks8lb0r+P1#f1QlCgi(&OoE
z=|kzuGfJkO*`B#3^Hk=A%rCUOwpaUMR?Z&Del4fw%DIbkcjr##z4;UQcjUj2|6QS6
zSW`GsxTSDs;kU){;#I{*ia#s0N;j8ImR=}3@ZZ7mzf`tW{;nFVUQ@lf`tj;lYo6LA
zwTEh7uKlvh)HU68U)O`(#hy~nW4-y_kJc;okJW#LKcca{aZ}^5#=rJW^lj*SqVK7`
zpZELv2mAN;zq|i2OexJQ1Zn%j(dGM{%l-?d?#ndM-_G7NBF<OblAn9$-0$Tl3>tnT
zjz?GV??3btdpFKF_|wQqyvhON$jz^2Rje~fh~rj#zZLD<s0-JR%HsDyT)P?V9>7B1
zC&Zz!C-65}o|yjyek;7n9Q<{x%!lxfjW~Xa1Apa198co8vyYFWN*33oO)QEE%&Iu3
z&E@!hgoXJP%mlcre{?*G;P74O?{Q}4#}PO>4tQ^3UVbi%zseDlR^#4HtcMS>q&QxS
z^Zn@SygxqJ9JBK~0NZs~(fVPG^TUYse;6AOeHi<>eR%$t;`=91jf8_=#k$y&IDWyp
zq(0WgZvc+yxC&!B`*;wz#x-dN?p=?zH{!Sj{i|qy4$j|X1)jw?UWeajAG?@aiUYsz
zMAYptJfekTBQ`1jGPL$SW|59D3x5la2XTy{CVUIi_?>vyBN+Q5EY>+!I^Q!mCvnjI
zl(=>^%c0*KYNSh`i4tI}0mc%J8h;ZiW&d{m5&0vmB>xSL&*J*CfMqT0&gbBj(=Krz
zhh)MbnNczNw^&U7x8mI~T+8tS##IOWDsr@M!trsI;Tr(w)wt%zyZqRe>}GZi4l{7D
z5{Dld0h;3+4|I-)(dOMOjj9R{jx=A1cZ}-?`w&bEI{pd=(flK9t2E4PIQQdl@e2Vf
za6n_gnZ{1X>c#K(unNBi_<t|1-@~jpGK4$mxtjDt*3Ex|d5h!P9(W<&=^RJcHuQfD
zdy%b0Y_$jR&n#ne|AXTv+{x<P&Q^gQ>72o_2S+asj-vqjsuO?9pN0(`m!F+`=lnkT
zi8Ew5G4a2Fx^Dz52$*AU^j)|zrJwmeythhCaBJb8y6}b0(;HGL_8C}Qe(8DiF=#08
zV2bg#(>?xc;Fhrzbc~QN;_SmGNgN+cx;D;TxNks}AQ`~js584BJ3aLBt<o2zf03R`
z`BG5fsZ1)L8cL0)E>C?BX&8!V(my+%B>(JTw8zR4(cYUvjiP8jct(3Z|6h25_B&+r
z8ZZ~1bIietdf|OIu6^N}7jAfA%M0ljLf`-R_n+!ur;MhnV8LN+Bt3=m>-9tbwd7M~
z?_rOz_ks@pk^K`Ym}l8Z=*2Iyhft66C@AIKkXm13UuFNm-p9U;vDyH+6EX4te3B3g
zvjpfg1$xp@$x{Okda$!w9ey^jiO~(S<)FBCLK=LJeSp1$xYR0`E^DzP>L#`sv5Kv1
z8h-_H58H<r;sJIZy8yMcClE=#m|elHWUqmizLtFuf4}NURG@!`J;FZAzQ8`mz6fsm
z4t9_HF1v|+jD3?m&HkDFg#8QqI=dIuxIbXuV$ZS%@prM_!fpl+-Ot|6-of4v*@QG1
zI1!F6tQH6C77y}HKIBy*EDEZ}UQ*!CJS!lVU1Wa;-fUqdU_UDFmSLVRWTR{a;w$59
zB^zTC$PH{n_HRAgz;?0iuqbvS+&F`j)wx*7bd()pf6tD<F}j3Z$}VG9qe|c!$jD>t
zBkU>mDfSHe<SeVEX4&>#6Vs{G)F+r@^VF=e^_*R^ebL$C^vsde9ou)!O1T4nZ35T_
z4{GN|)9G0@J<G<lahl_?nbF!Tug<1sj?`wQYU)sG_A{Gi4f%7PDss!%#KDPKWnx!)
zR?bat*}W^RrK5N3O3iNCgiGz|XlizVz70%Ir%vjv4;-RJ7wOKg)NBvk@1d5T*|aMK
zXzn<WqDcP?uB7Omg}ycETXQBlGd(>Wo#mD3X>FEm+I4t(x;86UQxmCKL+$_|GmdTA
zHEYyHXBBM}<Cvc1GqqVmRRdh9Lnn>rj;81iK^)Z~pwC%(X5!$iTu$TWSn7_{9q8a>
zk1>ZqZr(MsDSBYb^e$~WJ)N3uZ{3A^Q5ssO|JtmvI;)OVo`SX)m{Ral8`XeuZS=sb
zbncN^eh^U18q2j=wVEPOtz!p2VPNN?34m?SOjDDYaRI8S`jl#AV-ut0^dj!f)idY9
zqQ8Y#0Kyo?J(HTaLpwn8BJjncgwxqn6hJOOiP_N(jO$%kU*+-HES|!{i$h!bkc~)4
z8-2=Zkulj(Ej?XM*Jkb2lae$sd+5M;ZPro608*)0+t?(H3tzO+=~+Ad+Jawp{Ho15
z@fw#vNeUP^2(V`zV>78cW>T{bAgwm*s!na&b<%KXd^$U8KdfC<n{`*GHt(9+s$Yzz
zaosDfd#Wdyb8P#rlTPQ@EI%+h>#PvXf|5s1+UUcMk69kTOvt%SyG{}z16iYYV1B9F
za$3V<3*SKvbe|ppE709(jAS+7UyZA0PSvYS;7KGoHK2HGmW@1xkcprMZxu35n%K5$
z)~SuACT6W5K8pr|8%@oi`={Obo5c<`I(o;<Nsm&Qy}c6608KuO&0DF>`l}~7oddu#
zorBerGMz)!lLk76t0#?gj#N)7bdFX}s&tN3Pnzf)ubwp1xl{!fbiB_hGr+Kx>YC+y
zi9u?!<s~-*i#IRPZ&sGv%rD-&RKJ<1vRQlOe=)u!#+LwGDU6TKX^fA~8H|t48pcQG
zEXGIY9L7iIJjO@o0>($@BF0DOYBjY?uurWDw7O?fW0>0+qJ;xE&sK?6yQ;Ib%4`i>
z*bN5wznz_Za8<<>!0&xuc_ASmkPs!+dGP^GO?ZYN5+G>Eryo%QqD>S_ViF({h{m9(
zSm_6f%+#4qr~f#uRR?W{sht->Mez$;Tfe5ZDl=8FVwtH`OSL0aN2hiBJ7@2G?<IKw
z^zPhy&+eYxJ-d6(*|X=~cV8=<npF(r-L-Mih{wf%4d*7SQ&a2CNS=MxNZ2iH?m&^r
z1kTGGnTgpoRj~z1?|ksw=84(>C6kprNq1(*+pCV#bY8r6q{c0k&Yi;mKylVGT}VZD
z?cC&oszh1c+~m0@LWP5SKwrq5I5TF)60ug1e8%#^ojY6Ot!SDKmIyQ}>fl_L?=>={
zwWz2W$s*7~XwBJ*mdtIe?Aw`$$6|Fmsc+F(lvu*nl?+h`%viEZlt%rEj?q9Y7%LwQ
z%n8oyY!F2nMJLlPEyr6BVWxGgJfb|@O1o|Z8oPRtuEy?ObXlOWyBxTy69q87OgChq
z-s3IZwdHYIXrX`Hv=!>h(g=iz#toq*n1nE##R4&o5^C(G@N6Z5D~pz>%5+<>#$taQ
zVo(sC<BdbSjv-o-%1TDj7O_}Myj2>N*{k#Ov@_laJF7Ypu{xGqp*~;}sWd$Wk=ev9
zBrCPL+sT{Aab0n5rl5Cja;e{%j=nclU19=^@3KF==b<PPGKww9qQ;K)a+b_kU1wq>
z;g%qv=a0!<S>8S-w|-2nUpBM8@g<g3C2K1)5&S}agAG;5MU^{YJ>jpNi1cK%F`<cM
z0umdw%fi0?oCsUSk*fr9X1mdZ-eCz5URORpc_wbn#!_F0Z)Jo<Mb*V?%PTTCq@vTK
zu^HW3Tj`HO3$aC&6*5aQ5?)VIoo=PmrB=W(H<0D&iR3xR^97TnUr2Rs$@Js`a4xD!
zF64Hxj9W7U9BW}+^+&3$N?15~F#~%^)gF`;z@-4L0L!cPxSG-qpeZW^r<tskf+N6X
zf+N5x!4cr{s!_DwGN3DfT!p?>HR{^54j`M>DR{2nT`719T_t!5trk3mu9h|%LHo9}
zDZm<OQ-CgMQ-E&4X#u!Ka0KWP907U-M}R)1s{v@O(k0M3rAwgoN|!+WN|!*_DqR9?
zP`U&fP`U)#$QUn9P2eVtCC?*c(1Pa!UMGVtXvunF*RzZQ3eJ!P1?L9Ekqp5Zrtp$f
zt(!HbC2q8!l(@-)g1&`%me?w9wxA%~VnIQ;72LX1eOooA_1$JcLH~{g1^sqP*4g^D
zSx^wZYe7Ny9=J<W^?hGsTHg;WDCpZQDCl=ka;dHFP74ac4hssxT~(vGJPPrQ)rQJs
zv@aQ))xO1Frsu*-Y=)j+iDl^C&1z=1Ki7>oISqT8=baXG&Ju86ZFE+2T23%(V-1l+
zq&%##DGg5))aTZR4zNwnC3kAW6HdJbjR&2kky-AJ6&UzCI!1!MO(Sz8wm-U!zlyBi
z(Swx>3cH!keT$=Wq9r-O{Iec)&GuyIhpf9zqv2kjNHsy^362i-giTJ9_z(EKgJYJ2
z&iwNIz#n)!<4g0Yje(KE2^=1aMLY|hTQLsrvoUz$+q_b|6QNw>@C+!lFu%<tX5k>a
z?`jVYu}i<vgTw5Af9b&yFn;U71?+!6W{2L*?st&0kDdO-#MTn}2sZ!^v$I_ZypA3F
z0P!K}O;Cq~C6v9CGBJhHwPdSf?zmb`+-huGi7TK&cH8|*Yb=9~%(_md?e+9(7$3x9
z{26CcV-NNA6CVanXbS_}2T5H={&GgO%?VhZFu$SQY{v)if;`jZeFWYDd=5Xs!_@n0
zzPT_PpF=NRhxhS1^x=7V5#PZ#@jg`IF%ZAY%lI|s(%#u_kTIRd*w;9J#_O>TkIj$p
ztR(Ta{LAxHEX40}5I@d(JRsKpQs?{=A54?yTe+55-00kg|Dpx@Tk)M;K)+<vuE#5L
z5wqKdXJuG@FPoi9+z|7(oY#xRTeF4nz8QbaR%ZNu=Qj3GmpLEel@jmAUHCsb@P2K>
zBXc{mex-VKjyn6DtKEpp2lMgXJmdV#x!2`6I6jxsl>bP5FYXjxDbIJOx&>~bTjUnw
zA^DH<iSsGGrt|Sk-HDH;5dTpKKUD<Z(;0Yz!gz8{$Ai;=@2CsEQawJMeD$vsxzq4j
z?RK7Wp2l0W7w^y`c!8dEr}HM_lTMCX;%w&|7p2I>M|h+kg*z+oVf`51-Gvu5>csI6
z?Qrhk>CsN!I9%hrho`m7J;gm0pX}TCobJZ^)QGp~ug)8xOD}J03$^tQ4(Dv%)L&gQ
ze_?2VNO0|%wPDUR{dyhH%=rzC(czm06TO=TH|DM#+&rXEbZ}E&V$<f0LsN#=5A|74
z(W@I4dG{LcK40!N)eFzD@nucky*kvqd1z2GYvwJmi46;KyL&bd_w@{Jyhc;zSJ&hY
z_Yd@Hitr~(FP_Lk?tE3xW7q&=8)6*gUy3BBn0a#X^Hp$-!;SL)FAKRYBDlzOGuKu)
z$c1l~b6vsAyUe`&Kz9v1=&CnQ-V7ZEzLDUnM^D<6bBfMhu&JeOl~dAl^U#138|WV1
zL`xx|2>Jvo4fE-wR63Hhp>JrDQ<8ZlSL9IMh>9Rp7LF3n*OKyEH~I~4aGG1l=YJKP
zg2>{$g9W>sKxnsMh4zQ%z@xma%y)u6F)x{q&8y~l^Oo6bJ~v0qQJ|ydfH~*{%@-1c
zqDhW0&wLzk{AW!WXy$D%;+kU_$r&JRi`SRK9MGG0kyNA4xJclOAm$(xPN0HTt)JPM
zSikvuW_`zpCzkf{%~R$lw0@NHH9t-6=2Oo9W~OAqKIM~Q;EnZgB3hd_2GUdN{WtnE
z!gn?NLvYHNYrNt15PHT#sT6OdCyrJM<A{00yl3_^*Q4fPKb3YLO2fy4%wcf9kTEky
z#^RahNPCy_L-WURId7)o+GB8h-biJbQBtMWznJa9gFwHxndUAZ$>$b7E_XW`J}t-T
z_hH6R5AzK2?;YkT0nD##6dBlSUNjGzccpEU<h+;P=L<%P`^=$qX<N#_B16<>Ugi7~
zr;NmXmbb8o{CRoB$0k=f$b6KMk^yI=9`jo_&yH`K6g{APKQ%tX`5Na-oL<`*^^j{1
zp>g7o=Bvy+!xI*?0ki&f4xQ0sCe?$Ju0!mI5G$y|3b+(qCBGe*FE$(L0VE|C*bk~P
zGisK9mzReMVGV+t4)QJSV&c=NFW<uuys3l&R)j*Hkp!?ycrBYXJdbdi<^;%*ucVa`
z`2P?>krTttk>8Y8ks?-90Lx__wbu}WP`i*?<QY*ID{C<=F5xLlgmt``XECj;CS_O`
z9oVI^x}U<@yq=VP0^gn?l(Di5kiL<S%la}1MPi@j>2sreo*do8xNN~vnab0wd!YX3
zSUsiK4G%!wE<!2KvmS)*Utsx0SrK;gENc(eLJro#BlPA`!VK(}{a`+hEfK|<cpCTx
z0&fundFseoaeC+;`ovHA%-_tjvKsi@m@(of0MR#(S(NOWeDdOyv=Zabv45Yu$b=ko
zSk@?x^~l8r#(Kla_dqoL$sbVbuUgp(r8M}&Ojg3**;I3gHw&^IveIWcXwyowXtycM
zQhMbO>=M;_<;>?)T|+z_C|Txh=JOaU>;H%_u5$PFl;jh$T8~;amPI=;pWbRTUgz5~
z{uL^9mE-=RpO*bT>8h#d=1HhJ;>~BOf|H$3tQ)TnzP)k$`2~NEZN$7{KFhZHq(~SC
zFfQI2n9(LHoE%8dXBM*8^o)(|`&Vf%U7tT6>68;fVk3%Ha@5j|V(E6mNmmh0MK@iG
zh8jTooQdAqie|i>Fdx0wj6Sp0r&zFJmHL5SlfrLS`}$XYu%}o#<XG)28rlYFKT2*c
ztrnr*(nmfzTJ*AnLUgJed}NfJqv&V(`nNpe7R_9YzAOV4&FrdXE>_K4s+ze}HS;%A
zGY3=~&(Izhsvgc^@7GT4D+n`HCr@VtI*}dG%tfl1b5t{zsb<bm&0M6K`4rX6A=SyJ
zs!q;Tog8MYwo#|(<UID0_d~1b<UG~M1*((tRVSCTLmr_wqM0MAnWL(iqpF$nR5RzR
zX3kU1%wMUx_ldl^uLr6rR{}>JFdxBZ+4V+xG##wISIh_S=3Cechmih5tn8l?-ZO8G
zmHdoCX>gVY-r*-1`$R~i*veRw<{fBJ30M2)pjRt%YW~5w7Yj+&)NzMzz4^)JxlGH{
zPn~!-Z<u!`rlwQOKBeMaNii>rRmS~wxn@7iF7vpbBPIQVUVSLiXl+58istleIv*=_
zcj2OYbmkvm#vkOp3|WD9Gtc757-6PInd^PdW6ZF;De<K4<6nTU3v?w9YuTW#<hjZ<
zLFJkVH9ds%NNpkIov89oKzYYiehDhSgp^-`$}eIu%~W|2E2qGdlwy^Xh{{N@%1E)w
zNP)_Tt9DC{N=iWOmMB)(QY2LL#B`OKX(}~^Dk()ODM6K#X(}VrR7QfH-6C(g<f(Lo
zR66qUvD^wZA|r(!eGWV2tw^`kCU!7oH)}_7m-c${k;~PQ3+c!Obj$);BA78Y0Uev5
zj!hsnHvT?+CBB`nvQOvj{>EjiVo+#z@#sSKqvHMIhc*NK>$=(LPrMHH46tjLHl?3(
z2GM<O_{bu_@-G^*ND-(6e;9wJr8vCiPgw2c%+%DG896`I{FrD3An^vAtM@Savjltc
z4E%1lQMw)NCa<lxQ`c77Xh)X^NZZDBwbs#|QOD_|ihdEFL<O+462kLgp#WNT_5T6y
C10J6M

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.woff b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.woff
new file mode 100644
index 0000000000000000000000000000000000000000..ddccf765c758d5a4c8a96914418caedbb757ca8f
GIT binary patch
literal 22256
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.woff2 b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_400.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..7b18f7ea49098fff3aac28a1feb0cecc429bb2ec
GIT binary patch
literal 18320
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/custom_locale/theme/fonts/font.css b/pelican/tests/output/custom_locale/theme/fonts/font.css
new file mode 100644
index 00000000..a9eb87e6
--- /dev/null
+++ b/pelican/tests/output/custom_locale/theme/fonts/font.css
@@ -0,0 +1,12 @@
+@font-face {
+	font-family: 'Yanone Kaffeesatz';
+	font-style: normal;
+	font-weight: 400;
+	src:
+		local('Yanone Kaffeesatz Regular'),
+		local('YanoneKaffeesatz-Regular'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
+		url('Yanone_Kaffeesatz_400.woff') format('woff'),
+		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
+		url('Yanone_Kaffeesatz_400.woff2') format('woff2');
+}

From b1bc9a6f5fa24dd7c9350a9805123f1386301559 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Tue, 8 Aug 2017 01:16:13 +0200
Subject: [PATCH 1986/2864] Typofix: - paragraph missing stop - Remove
 unnecessary colon

---
 docs/content.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/content.rst b/docs/content.rst
index 507593bf..ae2cd6f2 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -11,7 +11,7 @@ The idea behind "pages" is that they are usually not temporal in nature and are
 used for content that does not change very often (e.g., "About" or "Contact"
 pages).
 
-You can find sample content in the repository at: ``pelican/samples/content/``
+You can find sample content in the repository at ``pelican/samples/content/``.
 
 .. _internal_metadata:
 

From d6dca3403d1a0cb45bf7f352080b6c233ac69825 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Tue, 8 Aug 2017 23:45:00 +0200
Subject: [PATCH 1987/2864] pelican/ is not necessary (documentation
 content.rst)

---
 docs/content.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/content.rst b/docs/content.rst
index ae2cd6f2..69212540 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -11,7 +11,7 @@ The idea behind "pages" is that they are usually not temporal in nature and are
 used for content that does not change very often (e.g., "About" or "Contact"
 pages).
 
-You can find sample content in the repository at ``pelican/samples/content/``.
+You can find sample content in the repository at ``samples/content/``.
 
 .. _internal_metadata:
 

From 2013fc0ab2b328f7be3df2265de2c9ad70152463 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sat, 12 Aug 2017 21:40:27 +0200
Subject: [PATCH 1988/2864] Fix typo from documentation

---
 docs/content.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 507593bf..cab38aa8 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -93,9 +93,9 @@ interprets the HTML in a very straightforward manner, reading metadata from
         </body>
     </html>
 
-With HTML, there is one simple exception to the standard metadata: ``tags`` can
-be specified either via the ``tags`` metadata, as is standard in Pelican, or
-via the ``keywords`` metadata, as is standard in HTML. The two can be used
+With HTML, there is one simple exception to the standard metadata: tags can be
+specified either via the ``tags`` metadata, as is standard in Pelican, or via
+the ``keywords`` metadata, as is standard in HTML. The two can be used
 interchangeably.
 
 Note that, aside from the title, none of this article metadata is mandatory:

From f8da7077d86e22590c850d5580aa95c0c829b326 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 21 Sep 2017 05:18:27 -0700
Subject: [PATCH 1989/2864] Remove outdated Python versions in CONTRIBUTING

 Refs #2139
---
 CONTRIBUTING.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index a7b5a2a0..5159955a 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -123,7 +123,7 @@ Contribution quality standards
   <http://pypi.python.org/pypi/flake8/>`_ tools, the latter of which in
   particular will give you some useful hints about ways in which the
   code/formatting can be improved.
-* Make sure your code is compatible with Python 2.7, 3.3, and 3.4 — see our
+* Ensure your code is compatible with the latest Python 2.7 and 3.x releases — see our
   `compatibility cheatsheet`_ for more details.
 * Add docs and tests for your changes. Undocumented and untested features will
   not be accepted.

From ce0787f0d383ce99e439ef3c338cbb5ea964f292 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Mon, 2 Oct 2017 18:33:21 +0300
Subject: [PATCH 1990/2864] Drop unsupported Python 3.3

---
 .travis.yml                     | 1 -
 docs/install.rst                | 2 +-
 pelican/settings.py             | 4 ++--
 pelican/tests/test_testsuite.py | 3 ---
 setup.py                        | 2 +-
 tox.ini                         | 3 +--
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7a8732d..889010b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ env:
   - TOX_ENV=docs
   - TOX_ENV=flake8
   - TOX_ENV=py27
-  - TOX_ENV=py33
   - TOX_ENV=py34
   - TOX_ENV=py35
 matrix:
diff --git a/docs/install.rst b/docs/install.rst
index f05f3941..02470f62 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -1,7 +1,7 @@
 Installing Pelican
 ##################
 
-Pelican currently runs best on Python 2.7.x and 3.3+; earlier versions of
+Pelican currently runs best on Python 2.7.x and 3.4+; earlier versions of
 Python are not supported.
 
 You can install Pelican via several different methods. The simplest is via
diff --git a/pelican/settings.py b/pelican/settings.py
index d1249a24..417de79a 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -14,13 +14,13 @@ import six
 from pelican.log import LimitFilter
 
 try:
-    # SourceFileLoader is the recommended way in 3.3+
+    # SourceFileLoader is the recommended way in Python 3.3+
     from importlib.machinery import SourceFileLoader
 
     def load_source(name, path):
         return SourceFileLoader(name, path).load_module()
 except ImportError:
-    # but it does not exist in 3.2-, so fall back to imp
+    # but it does not exist in Python 2.7, so fall back to imp
     import imp
     load_source = imp.load_source
 
diff --git a/pelican/tests/test_testsuite.py b/pelican/tests/test_testsuite.py
index 5dc92bb1..66c992bd 100644
--- a/pelican/tests/test_testsuite.py
+++ b/pelican/tests/test_testsuite.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function, unicode_literals
 
-import sys
 import warnings
 
 from pelican.tests.support import unittest
@@ -9,8 +8,6 @@ from pelican.tests.support import unittest
 
 class TestSuiteTest(unittest.TestCase):
 
-    @unittest.skipIf(sys.version_info[:2] == (3, 3),
-                     "does not throw an exception on python 3.3")
     def test_error_on_warning(self):
         with self.assertRaises(UserWarning):
             warnings.warn('test warning')
diff --git a/setup.py b/setup.py
index be038971..0f839bdc 100755
--- a/setup.py
+++ b/setup.py
@@ -61,10 +61,10 @@ setup(
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: Implementation :: CPython',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
diff --git a/tox.ini b/tox.ini
index 95cd5273..b0dd4fd2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,9 @@
 [tox]
-envlist = py{27,33,34,35,36},docs,flake8
+envlist = py{27,34,35,36},docs,flake8
 
 [testenv]
 basepython =
     py27: python2.7
-    py33: python3.3
     py34: python3.4
     py35: python3.5
     py36: python3.6

From ebf31e85c4efc86e2bb5e5ab3d1524d99727e534 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Mon, 2 Oct 2017 18:35:11 +0300
Subject: [PATCH 1991/2864] Update Python version for Tox to create py35

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a7a8732d..9f942bf0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: python
 python:
-  - "2.7"
+  - "3.5"
 env:
   - TOX_ENV=docs
   - TOX_ENV=flake8

From 012d034cba0664ad36b4130893b7bf699be7a8fd Mon Sep 17 00:00:00 2001
From: Stuart Axon <stuaxo2@yahoo.com>
Date: Mon, 2 Oct 2017 22:05:42 +0100
Subject: [PATCH 1992/2864] Check for 0 dates in pelican-import

Check for 0 dates.

For my own blog this means it doesn't break during import, but I don't know pelican well enough yet to say if this is correct or not.

Error that I was getting before applying this fix
```
Traceback (most recent call last):
  File "/mnt/data/home/stu/.virtualenvs/blog/bin/pelican-import", line 11, in <module>
    sys.exit(main())
  File "/mnt/data/home/stu/.virtualenvs/blog/local/lib/python2.7/site-packages/pelican/tools/pelican_import.py", line 896, in main
    attachments=attachments or None)
  File "/mnt/data/home/stu/.virtualenvs/blog/local/lib/python2.7/site-packages/pelican/tools/pelican_import.py", line 684, in fields2pelican
    kind, in_markup) in fields:
  File "/mnt/data/home/stu/.virtualenvs/blog/local/lib/python2.7/site-packages/pelican/tools/pelican_import.py", line 163, in wp2fields
    date_object = time.strptime(raw_date, '%Y-%m-%d %H:%M:%S')
  File "/usr/lib/python2.7/_strptime.py", line 478, in _strptime_time
    return _strptime(data_string, format)[0]
  File "/usr/lib/python2.7/_strptime.py", line 332, in _strptime
    (data_string, format))
ValueError: time data u'0000-00-00 00:00:00' does not match format u'%Y-%m-%d %H:%M:%S'

```
---
 pelican/tools/pelican_import.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index ef4a20e0..25fc45e5 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -160,8 +160,11 @@ def wp2fields(xml, wp_custpost=False):
 
             content = item.find('encoded').string
             raw_date = item.find('post_date').string
-            date_object = time.strptime(raw_date, '%Y-%m-%d %H:%M:%S')
-            date = time.strftime('%Y-%m-%d %H:%M', date_object)
+            if raw_date == u'0000-00-00 00:00:00':
+                date = None
+            else:
+                date_object = time.strptime(raw_date, '%Y-%m-%d %H:%M:%S')
+                date = time.strftime('%Y-%m-%d %H:%M', date_object)
             author = item.find('creator').string
 
             categories = [cat.string for cat

From 50af2ed45d3db08e4ac85cdcdeae5e30a7b50a24 Mon Sep 17 00:00:00 2001
From: Pedro H <pedro@digitalrounin.com>
Date: Sun, 16 Oct 2016 15:47:22 +0800
Subject: [PATCH 1993/2864] Add THEME_TEMPLATE_OVERRIDES. Refs 2021

Allow for overriding individual templates from the theme by configuring
the Jinja2 `Environment` loader to search for templates in the
`THEME_TEMPLATES_OVERRIDES` path before the theme's `templates/`
directory.
---
 docs/settings.rst                             | 24 ++++++--
 pelican/generators.py                         | 21 ++++---
 pelican/settings.py                           | 18 +++++-
 pelican/tests/test_generators.py              | 59 ++++++++++++++++++-
 pelican/tests/test_settings.py                | 17 ++++++
 .../tests/theme_overrides/level1/article.html |  4 ++
 .../tests/theme_overrides/level2/article.html |  4 ++
 .../tests/theme_overrides/level2/authors.html |  4 ++
 8 files changed, 134 insertions(+), 17 deletions(-)
 create mode 100644 pelican/tests/theme_overrides/level1/article.html
 create mode 100644 pelican/tests/theme_overrides/level2/article.html
 create mode 100644 pelican/tests/theme_overrides/level2/authors.html

diff --git a/docs/settings.rst b/docs/settings.rst
index e5ce19f5..e59e42d4 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -706,16 +706,13 @@ Template pages
    tags and category index pages). If the tag and category collections are not
    needed, set ``DIRECT_TEMPLATES = ['index', 'archives']``
 
+   ``DIRECT_TEMPLATES`` are searched for over paths maintained in
+   ``THEME_TEMPLATES_OVERRIDES``.
+
 .. data:: PAGINATED_DIRECT_TEMPLATES = ['index']
 
    Provides the direct templates that should be paginated.
 
-.. data:: EXTRA_TEMPLATES_PATHS = []
-
-   A list of paths you want Jinja2 to search for templates.  Can be used to
-   separate templates from the theme.  Example: projects, resume, profile ...
-   These templates need to use ``DIRECT_TEMPLATES`` setting.
-
 
 Metadata
 ========
@@ -1011,6 +1008,21 @@ However, here are the settings that are related to themes.
    with the same names are included in the paths defined in this settings, they
    will be progressively overwritten.
 
+.. data:: THEME_TEMPLATES_OVERRIDES = []
+
+   A list of paths you want Jinja2 to search for templates before searching the
+   theme's ``templates/`` directory.  Allows for overriding individual theme
+   template files without having to fork an existing theme.  Jinja2 searches in
+   the following order: files in ``THEME_TEMPLATES_OVERRIDES`` first, then the 
+   theme's ``templates/``.
+
+   You can also extend templates from the theme using the ``{% extends %}``
+   directive utilizing the ``!theme`` prefix as shown in the following example:
+
+   .. parsed-literal::
+
+      {% extends '!theme/article.html' %}
+
 .. data:: CSS_FILE = 'main.css'
 
    Specify the CSS file you want to load.
diff --git a/pelican/generators.py b/pelican/generators.py
index eb97c115..1dbca007 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -51,20 +51,25 @@ class Generator(object):
 
         # templates cache
         self._templates = {}
-        self._templates_path = []
-        self._templates_path.append(os.path.expanduser(
-            os.path.join(self.theme, 'templates')))
-        self._templates_path += self.settings['EXTRA_TEMPLATES_PATHS']
+        self._templates_path = list(self.settings['THEME_TEMPLATES_OVERRIDES'])
 
-        theme_path = os.path.dirname(os.path.abspath(__file__))
+        theme_templates_path = os.path.expanduser(
+            os.path.join(self.theme, 'templates'))
+        self._templates_path.append(theme_templates_path)
+        theme_loader = FileSystemLoader(theme_templates_path)
+
+        simple_theme_path = os.path.dirname(os.path.abspath(__file__))
+        simple_loader = FileSystemLoader(
+            os.path.join(simple_theme_path, "themes", "simple", "templates"))
 
-        simple_loader = FileSystemLoader(os.path.join(theme_path,
-                                         "themes", "simple", "templates"))
         self.env = Environment(
             loader=ChoiceLoader([
                 FileSystemLoader(self._templates_path),
                 simple_loader,  # implicit inheritance
-                PrefixLoader({'!simple': simple_loader})  # explicit one
+                PrefixLoader({
+                    '!simple': simple_loader,
+                    '!theme': theme_loader
+                })  # explicit ones
             ]),
             **self.settings['JINJA_ENVIRONMENT']
         )
diff --git a/pelican/settings.py b/pelican/settings.py
index 417de79a..d025cf7a 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -99,7 +99,7 @@ DEFAULT_CONFIG = {
     'RELATIVE_URLS': False,
     'DEFAULT_LANG': 'en',
     'DIRECT_TEMPLATES': ['index', 'tags', 'categories', 'authors', 'archives'],
-    'EXTRA_TEMPLATES_PATHS': [],
+    'THEME_TEMPLATES_OVERRIDES': [],
     'PAGINATED_DIRECT_TEMPLATES': ['index'],
     'PELICAN_CLASS': 'pelican.Pelican',
     'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
@@ -376,12 +376,26 @@ def configure_settings(settings):
             settings[new_key] = [settings[old_key]]   # also make a list
             del settings[old_key]
 
+    # Deprecated warning of EXTRA_TEMPLATES_PATHS
+    if 'EXTRA_TEMPLATES_PATHS' in settings:
+        logger.warning('EXTRA_TEMPLATES_PATHS is deprecated use '
+                       'THEME_TEMPLATES_OVERRIDES instead.')
+        if ('THEME_TEMPLATES_OVERRIDES' in settings and
+                settings['THEME_TEMPLATES_OVERRIDES']):
+            raise Exception(
+                'Setting both EXTRA_TEMPLATES_PATHS and '
+                'THEME_TEMPLATES_OVERRIDES is not permitted. Please move to '
+                'only setting THEME_TEMPLATES_OVERRIDES.')
+        settings['THEME_TEMPLATES_OVERRIDES'] = \
+            settings['EXTRA_TEMPLATES_PATHS']
+        del settings['EXTRA_TEMPLATES_PATHS']
+
     # Save people from accidentally setting a string rather than a list
     path_keys = (
         'ARTICLE_EXCLUDES',
         'DEFAULT_METADATA',
         'DIRECT_TEMPLATES',
-        'EXTRA_TEMPLATES_PATHS',
+        'THEME_TEMPLATES_OVERRIDES',
         'FILES_TO_COPY',
         'IGNORE_FILES',
         'PAGINATED_DIRECT_TEMPLATES',
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 5f2151c3..100b1c5a 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -9,7 +9,8 @@ from shutil import copy, rmtree
 from tempfile import mkdtemp
 
 from pelican.generators import (ArticlesGenerator, Generator, PagesGenerator,
-                                StaticGenerator, TemplatePagesGenerator)
+                                PelicanTemplateNotFound, StaticGenerator,
+                                TemplatePagesGenerator)
 from pelican.tests.support import get_settings, unittest
 from pelican.writers import Writer
 
@@ -117,6 +118,62 @@ class TestGenerator(unittest.TestCase):
         self.assertEqual(comment_end_string,
                          generator.env.comment_end_string)
 
+    def test_theme_overrides(self):
+        """
+            Test that the THEME_TEMPLATES_OVERRIDES configuration setting is
+            utilized correctly in the Generator.
+        """
+        override_dirs = (os.path.join(CUR_DIR, 'theme_overrides', 'level1'),
+                         os.path.join(CUR_DIR, 'theme_overrides', 'level2'))
+        self.settings['THEME_TEMPLATES_OVERRIDES'] = override_dirs
+        generator = Generator(
+            context=self.settings.copy(),
+            settings=self.settings,
+            path=CUR_DIR,
+            theme=self.settings['THEME'],
+            output_path=None)
+
+        filename = generator.get_template('article').filename
+        self.assertEqual(override_dirs[0], os.path.dirname(filename))
+        self.assertEqual('article.html', os.path.basename(filename))
+
+        filename = generator.get_template('authors').filename
+        self.assertEqual(override_dirs[1], os.path.dirname(filename))
+        self.assertEqual('authors.html', os.path.basename(filename))
+
+        filename = generator.get_template('taglist').filename
+        self.assertEqual(os.path.join(self.settings['THEME'], 'templates'),
+                         os.path.dirname(filename))
+        self.assertNotIn(os.path.dirname(filename), override_dirs)
+        self.assertEqual('taglist.html', os.path.basename(filename))
+
+    def test_simple_prefix(self):
+        """
+            Test `!simple` theme prefix.
+        """
+        filename = self.generator.get_template('!simple/authors').filename
+        expected_path = os.path.join(
+            os.path.dirname(CUR_DIR), 'themes', 'simple', 'templates')
+        self.assertEqual(expected_path, os.path.dirname(filename))
+        self.assertEqual('authors.html', os.path.basename(filename))
+
+    def test_theme_prefix(self):
+        """
+            Test `!theme` theme prefix.
+        """
+        filename = self.generator.get_template('!theme/authors').filename
+        expected_path = os.path.join(
+            os.path.dirname(CUR_DIR), 'themes', 'notmyidea', 'templates')
+        self.assertEqual(expected_path, os.path.dirname(filename))
+        self.assertEqual('authors.html', os.path.basename(filename))
+
+    def test_bad_prefix(self):
+        """
+            Test unknown/bad theme prefix throws exception.
+        """
+        self.assertRaises(PelicanTemplateNotFound, self.generator.get_template,
+                          '!UNKNOWN/authors')
+
 
 class TestArticlesGenerator(unittest.TestCase):
 
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 7b1e36df..4ec16c0f 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -166,3 +166,20 @@ class TestSettingsConfiguration(unittest.TestCase):
         settings['THEME'] = 'foo'
 
         self.assertRaises(Exception, configure_settings, settings)
+
+    def test_deprecated_extra_templates_paths(self):
+        settings = self.settings
+        settings['EXTRA_TEMPLATES_PATHS'] = ['/foo/bar', '/ha']
+
+        configure_settings(settings)
+
+        self.assertEqual(settings['THEME_TEMPLATES_OVERRIDES'],
+                         ['/foo/bar', '/ha'])
+        self.assertNotIn('EXTRA_TEMPLATES_PATHS', settings)
+
+    def test_theme_and_extra_templates_exception(self):
+        settings = self.settings
+        settings['EXTRA_TEMPLATES_PATHS'] = ['/ha']
+        settings['THEME_TEMPLATES_OVERRIDES'] = ['/foo/bar']
+
+        self.assertRaises(Exception, configure_settings, settings)
diff --git a/pelican/tests/theme_overrides/level1/article.html b/pelican/tests/theme_overrides/level1/article.html
new file mode 100644
index 00000000..12f6b7bf
--- /dev/null
+++ b/pelican/tests/theme_overrides/level1/article.html
@@ -0,0 +1,4 @@
+<!--
+  This file is only here to test the `THEME_TEMPLATES_OVERRIDES` configuration
+  setting.
+-->
diff --git a/pelican/tests/theme_overrides/level2/article.html b/pelican/tests/theme_overrides/level2/article.html
new file mode 100644
index 00000000..12f6b7bf
--- /dev/null
+++ b/pelican/tests/theme_overrides/level2/article.html
@@ -0,0 +1,4 @@
+<!--
+  This file is only here to test the `THEME_TEMPLATES_OVERRIDES` configuration
+  setting.
+-->
diff --git a/pelican/tests/theme_overrides/level2/authors.html b/pelican/tests/theme_overrides/level2/authors.html
new file mode 100644
index 00000000..12f6b7bf
--- /dev/null
+++ b/pelican/tests/theme_overrides/level2/authors.html
@@ -0,0 +1,4 @@
+<!--
+  This file is only here to test the `THEME_TEMPLATES_OVERRIDES` configuration
+  setting.
+-->

From 17b37358e9046ad840b37ff9fa20ed1a673ca727 Mon Sep 17 00:00:00 2001
From: Sergei K <skz169@outlook.com>
Date: Tue, 17 Oct 2017 07:38:18 +0500
Subject: [PATCH 1994/2864] Add a new signal: page_generator_write_page

---
 docs/plugins.rst      | 1 +
 pelican/generators.py | 1 +
 pelican/signals.py    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 008e7551..10780b66 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -108,6 +108,7 @@ page_generator_preread              page_generator                 invoked befor
                                                                    use if code needs to do something before every page is parsed.
 page_generator_init                 page_generator                 invoked in the PagesGenerator.__init__
 page_generator_finalized            page_generator                 invoked at the end of PagesGenerator.generate_context
+page_generator_write_page           page_generator, content        invoked before writing each page, the page is passed as content
 page_writer_finalized               page_generator, writer         invoked after all pages have been written, but before the page generator
                                                                    is closed.
 static_generator_context            static_generator, metadata
diff --git a/pelican/generators.py b/pelican/generators.py
index eb97c115..19c1d5a8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -642,6 +642,7 @@ class PagesGenerator(CachingGenerator):
     def generate_output(self, writer):
         for page in chain(self.translations, self.pages,
                           self.hidden_translations, self.hidden_pages):
+            signals.page_generator_write_page.send(self, content=page)
             writer.write_file(
                 page.save_as, self.get_template(page.template),
                 self.context, page=page,
diff --git a/pelican/signals.py b/pelican/signals.py
index 0b10fdfa..18a745b4 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -27,6 +27,7 @@ article_writer_finalized = signal('article_writer_finalized')
 
 page_generator_init = signal('page_generator_init')
 page_generator_finalized = signal('page_generator_finalized')
+page_generator_write_page = signal('page_generator_write_page')
 page_writer_finalized = signal('page_writer_finalized')
 
 static_generator_init = signal('static_generator_init')

From e83c3d97961d747657a8c2a589356e2b6b99cad3 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sun, 22 Oct 2017 15:51:56 +0200
Subject: [PATCH 1995/2864] Update URL from documentation.

The new URL saves us a redirection and uses HTTPS
---
 docs/contribute.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 187c3007..afba7523 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -15,8 +15,8 @@ Setting up the development environment
 ======================================
 
 While there are many ways to set up one's development environment, following
-is a method that uses `virtualenv <http://www.virtualenv.org/>`_. If you don't
-have ``virtualenv`` installed, you can install it via::
+is a method that uses `virtualenv <https://virtualenv.pypa.io/en/stable/>`_.
+If you don't have ``virtualenv`` installed, you can install it via::
 
     $ pip install virtualenv
 

From fa709884214619bfbde05e4970578957f54a3cc0 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sun, 22 Oct 2017 18:07:36 +0200
Subject: [PATCH 1996/2864] Correct typo from documentation

Missing comma before etc.
---
 docs/contribute.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 187c3007..7fce0242 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -116,8 +116,8 @@ and Python 3 at the same time:
   - Encode/decode strings if e.g. the source is a Python function that is known
     to handle this badly, e.g. strftime() in Python 2.
 
-- Use new syntax: print function, "except ... *as* e" (not comma) etc.
-- Refactor method calls like ``dict.iteritems()``, ``xrange()`` etc. in a way
+- Use new syntax: print function, "except ... *as* e" (not comma), etc.
+- Refactor method calls like ``dict.iteritems()``, ``xrange()``, etc. in a way
   that runs without code change in both Python versions.
 - Do not use magic method ``__unicode()__`` in new classes. Use only ``__str()__``
   and decorate the class with ``@python_2_unicode_compatible``.

From 88da1b89cbebe66278aca7933f2c5165511b8207 Mon Sep 17 00:00:00 2001
From: Dan Bate <dan@wildfish.com>
Date: Sun, 15 Jan 2017 22:57:01 +0000
Subject: [PATCH 1997/2864] made template extensions configurable

---
 docs/settings.rst     |  4 ++++
 pelican/generators.py | 17 ++++++++++++-----
 pelican/settings.py   |  1 +
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e5ce19f5..d32a9869 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -699,6 +699,10 @@ Template pages
                          'src/resume.html': 'dest/resume.html',
                          'src/contact.html': 'dest/contact.html'}
 
+.. data:: TEMPLATE_EXTENSION = ['.html']
+
+   The extensions to use when looking up template files from template names.
+
 .. data:: DIRECT_TEMPLATES = ['index', 'categories', 'authors', 'archives']
 
    List of templates that are used directly to render content. Typically direct
diff --git a/pelican/generators.py b/pelican/generators.py
index eb97c115..b9e40243 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -86,12 +86,19 @@ class Generator(object):
         templates ready to use with Jinja2.
         """
         if name not in self._templates:
-            try:
-                self._templates[name] = self.env.get_template(name + '.html')
-            except TemplateNotFound:
+            for ext in self.settings['TEMPLATE_EXTENSIONS']:
+                try:
+                    self._templates[name] = self.env.get_template(name + ext)
+                    break
+                except TemplateNotFound:
+                    continue
+
+            if name not in self._templates:
                 raise PelicanTemplateNotFound(
-                    '[templates] unable to load {}.html from {}'.format(
-                        name, self._templates_path))
+                    '[templates] unable to load {}[{}] from {}'.format(
+                        name, ', '.join(self.settings['TEMPLATE_EXTENSIONS']),
+                        self._templates_path))
+
         return self._templates[name]
 
     def _include_path(self, path, extensions=None):
diff --git a/pelican/settings.py b/pelican/settings.py
index 417de79a..0d09340b 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -134,6 +134,7 @@ DEFAULT_CONFIG = {
     'PLUGINS': [],
     'PYGMENTS_RST_OPTIONS': {},
     'TEMPLATE_PAGES': {},
+    'TEMPLATE_EXTENSIONS': ['.html'],
     'IGNORE_FILES': ['.#*'],
     'SLUG_SUBSTITUTIONS': (),
     'INTRASITE_LINK_REGEX': '[{|](?P<what>.*?)[|}]',

From 56a483475b0a42bd13cf114248c9141c9051ed84 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 26 Oct 2017 13:53:32 -0700
Subject: [PATCH 1998/2864] PyCodeStyle fixes to keep Flake8 happy

Travis appears to be using new versions of underlying code style
analyzers, so these changes were necessary in order to keep tests green.
---
 pelican/tests/support.py            |  4 ++--
 pelican/tools/pelican_quickstart.py | 10 +++++-----
 pelican/tools/pelican_themes.py     |  2 +-
 setup.py                            |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 3c2a203f..d425395d 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -55,11 +55,11 @@ def isplit(s, sep=None):
 
     """
     sep, hardsep = r'\s+' if sep is None else re.escape(sep), sep is not None
-    exp, pos, l = re.compile(sep), 0, len(s)
+    exp, pos, length = re.compile(sep), 0, len(s)
     while True:
         m = exp.search(s, pos)
         if not m:
-            if pos < l or hardsep:
+            if pos < length or hardsep:
                 #      ^ mimic "split()": ''.split() returns []
                 yield s[pos:]
             break
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index eb63ed1f..a03f52df 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -14,7 +14,7 @@ import pytz
 try:
     import tzlocal
     _DEFAULT_TIMEZONE = tzlocal.get_localzone().zone
-except:
+except ImportError:
     _DEFAULT_TIMEZONE = 'Europe/Paris'
 
 import six
@@ -114,7 +114,7 @@ def get_template(name, as_encoding='utf-8'):
 
 
 @decoding_strings
-def ask(question, answer=str_compat, default=None, l=None):
+def ask(question, answer=str_compat, default=None, length=None):
     if answer == str_compat:
         r = ''
         while True:
@@ -132,8 +132,8 @@ def ask(question, answer=str_compat, default=None, l=None):
                 else:
                     print('You must enter something')
             else:
-                if l and len(r) != l:
-                    print('You must enter a {0} letters long string'.format(l))
+                if length and len(r) != length:
+                    print('Entry must be {0} characters long'.format(length))
                 else:
                     break
 
@@ -180,7 +180,7 @@ def ask(question, answer=str_compat, default=None, l=None):
             try:
                 r = int(r)
                 break
-            except:
+            except ValueError:
                 print('You must enter an integer')
         return r
     else:
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index fd60c424..b99a7ba3 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -17,7 +17,7 @@ def err(msg, die=None):
 
 try:
     import pelican
-except:
+except ImportError:
     err('Cannot import pelican.\nYou must '
         'install Pelican in order to run this script.',
         -1)
diff --git a/setup.py b/setup.py
index 0f839bdc..c8ab9e30 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
+import sys
 from io import open
 from os import walk
 from os.path import join, relpath
-import sys
 
 from setuptools import setup
 

From 1f30306e2329e5a1f0c5dd39844d9bb0a0c04573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 19 Sep 2017 18:22:56 +0200
Subject: [PATCH 1999/2864] Make the internal link replacer function public.

So it can be used from outside.
---
 pelican/contents.py | 126 ++++++++++++++++++++++----------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 15770fc8..a534dbaa 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -228,6 +228,68 @@ class Content(object):
         key = key if self.in_default_lang else 'lang_%s' % key
         return self._expand_settings(key)
 
+    def _link_replacer(self, siteurl, m):
+        what = m.group('what')
+        value = urlparse(m.group('value'))
+        path = value.path
+        origin = m.group('path')
+
+        # XXX Put this in a different location.
+        if what in {'filename', 'attach'}:
+            if path.startswith('/'):
+                path = path[1:]
+            else:
+                # relative to the source path of this content
+                path = self.get_relative_source_path(
+                    os.path.join(self.relative_dir, path)
+                )
+
+            if path not in self._context['filenames']:
+                unquoted_path = path.replace('%20', ' ')
+
+                if unquoted_path in self._context['filenames']:
+                    path = unquoted_path
+
+            linked_content = self._context['filenames'].get(path)
+            if linked_content:
+                if what == 'attach':
+                    if isinstance(linked_content, Static):
+                        linked_content.attach_to(self)
+                    else:
+                        logger.warning(
+                            "%s used {attach} link syntax on a "
+                            "non-static file. Use {filename} instead.",
+                            self.get_relative_source_path())
+                origin = '/'.join((siteurl, linked_content.url))
+                origin = origin.replace('\\', '/')  # for Windows paths.
+            else:
+                logger.warning(
+                    "Unable to find '%s', skipping url replacement.",
+                    value.geturl(), extra={
+                        'limit_msg': ("Other resources were not found "
+                                      "and their urls not replaced")})
+        elif what == 'category':
+            origin = '/'.join((siteurl, Category(path, self.settings).url))
+        elif what == 'tag':
+            origin = '/'.join((siteurl, Tag(path, self.settings).url))
+        elif what == 'index':
+            origin = '/'.join((siteurl, self.settings['INDEX_SAVE_AS']))
+        elif what == 'author':
+            origin = '/'.join((siteurl, Author(path, self.settings).url))
+        else:
+            logger.warning(
+                "Replacement Indicator '%s' not recognized, "
+                "skipping replacement",
+                what)
+
+        # keep all other parts, such as query, fragment, etc.
+        parts = list(value)
+        parts[2] = origin
+        origin = urlunparse(parts)
+
+        return ''.join((m.group('markup'), m.group('quote'), origin,
+                        m.group('quote')))
+
     def _update_content(self, content, siteurl):
         """Update the content attribute.
 
@@ -251,69 +313,7 @@ class Content(object):
             \2""".format(instrasite_link_regex)
         hrefs = re.compile(regex, re.X)
 
-        def replacer(m):
-            what = m.group('what')
-            value = urlparse(m.group('value'))
-            path = value.path
-            origin = m.group('path')
-
-            # XXX Put this in a different location.
-            if what in {'filename', 'attach'}:
-                if path.startswith('/'):
-                    path = path[1:]
-                else:
-                    # relative to the source path of this content
-                    path = self.get_relative_source_path(
-                        os.path.join(self.relative_dir, path)
-                    )
-
-                if path not in self._context['filenames']:
-                    unquoted_path = path.replace('%20', ' ')
-
-                    if unquoted_path in self._context['filenames']:
-                        path = unquoted_path
-
-                linked_content = self._context['filenames'].get(path)
-                if linked_content:
-                    if what == 'attach':
-                        if isinstance(linked_content, Static):
-                            linked_content.attach_to(self)
-                        else:
-                            logger.warning(
-                                "%s used {attach} link syntax on a "
-                                "non-static file. Use {filename} instead.",
-                                self.get_relative_source_path())
-                    origin = '/'.join((siteurl, linked_content.url))
-                    origin = origin.replace('\\', '/')  # for Windows paths.
-                else:
-                    logger.warning(
-                        "Unable to find '%s', skipping url replacement.",
-                        value.geturl(), extra={
-                            'limit_msg': ("Other resources were not found "
-                                          "and their urls not replaced")})
-            elif what == 'category':
-                origin = '/'.join((siteurl, Category(path, self.settings).url))
-            elif what == 'tag':
-                origin = '/'.join((siteurl, Tag(path, self.settings).url))
-            elif what == 'index':
-                origin = '/'.join((siteurl, self.settings['INDEX_SAVE_AS']))
-            elif what == 'author':
-                origin = '/'.join((siteurl, Author(path, self.settings).url))
-            else:
-                logger.warning(
-                    "Replacement Indicator '%s' not recognized, "
-                    "skipping replacement",
-                    what)
-
-            # keep all other parts, such as query, fragment, etc.
-            parts = list(value)
-            parts[2] = origin
-            origin = urlunparse(parts)
-
-            return ''.join((m.group('markup'), m.group('quote'), origin,
-                            m.group('quote')))
-
-        return hrefs.sub(replacer, content)
+        return hrefs.sub(lambda m: self._link_replacer(siteurl, m), content)
 
     def get_siteurl(self):
         return self._context.get('localsiteurl', '')

From 0b13aa9b4610a8d26ece75cfcebebaa5fb3fa3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 20 Jul 2017 23:21:17 +0200
Subject: [PATCH 2000/2864] Make URL part joining aware of absolute URLs.

Previously, with RELATIVE_URLS disabled, when both SITEURL and
STATIC_URL were absolute, the final generate data URLs looked wrong like
this (two absolute URLs joined by `/`):

    http://your.site/http://static.your.site/image.png

With this patch, the data URLs are correctly:

    http://static.your.site/image.png

This also applies to all *_URL configuration options (for example,
ability to have pages and articles on different domains) and behaves
like one expects even with URLs starting with just `//`, thanks to
making use of urllib.parse.urljoin().

However, when RELATIVE_URLS are enabled, urllib.parse.urljoin() doesn't
handle the relative base correctly. In that case, simple os.path.join()
is used. That, however, breaks the above case, but as RELATIVE_URLS are
meant for local development (thus no data scattered across multiple
domains), I don't see any problem.

Just to clarify, this is a fully backwards-compatible change, it only
enables new use cases that were impossible before.
---
 pelican/contents.py            | 31 +++++++++++++++++-----
 pelican/tests/test_contents.py | 48 ++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index a534dbaa..e84c8296 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -11,7 +11,7 @@ import sys
 import pytz
 
 import six
-from six.moves.urllib.parse import urlparse, urlunparse
+from six.moves.urllib.parse import urljoin, urlparse, urlunparse
 
 from pelican import signals
 from pelican.settings import DEFAULT_CONFIG
@@ -234,6 +234,25 @@ class Content(object):
         path = value.path
         origin = m.group('path')
 
+        # urllib.parse.urljoin() produces `a.html` for urljoin("..", "a.html")
+        # so if RELATIVE_URLS are enabled, we fall back to os.path.join() to
+        # properly get `../a.html`. However, os.path.join() produces
+        # `baz/http://foo/bar.html` for join("baz", "http://foo/bar.html")
+        # instead of correct "http://foo/bar.html", so one has to pick a side
+        # as there is no silver bullet.
+        if self.settings['RELATIVE_URLS']:
+            joiner = os.path.join
+        else:
+            joiner = urljoin
+
+            # However, it's not *that* simple: urljoin("blog", "index.html")
+            # produces just `index.html` instead of `blog/index.html` (unlike
+            # os.path.join()), so in order to get a correct answer one needs to
+            # append a trailing slash to siteurl in that case. This also makes
+            # the new behavior fully compatible with Pelican 3.7.1.
+            if not siteurl.endswith('/'):
+                siteurl += '/'
+
         # XXX Put this in a different location.
         if what in {'filename', 'attach'}:
             if path.startswith('/'):
@@ -260,7 +279,7 @@ class Content(object):
                             "%s used {attach} link syntax on a "
                             "non-static file. Use {filename} instead.",
                             self.get_relative_source_path())
-                origin = '/'.join((siteurl, linked_content.url))
+                origin = joiner(siteurl, linked_content.url)
                 origin = origin.replace('\\', '/')  # for Windows paths.
             else:
                 logger.warning(
@@ -269,13 +288,13 @@ class Content(object):
                         'limit_msg': ("Other resources were not found "
                                       "and their urls not replaced")})
         elif what == 'category':
-            origin = '/'.join((siteurl, Category(path, self.settings).url))
+            origin = joiner(siteurl, Category(path, self.settings).url)
         elif what == 'tag':
-            origin = '/'.join((siteurl, Tag(path, self.settings).url))
+            origin = joiner(siteurl, Tag(path, self.settings).url)
         elif what == 'index':
-            origin = '/'.join((siteurl, self.settings['INDEX_SAVE_AS']))
+            origin = joiner(siteurl, self.settings['INDEX_SAVE_AS'])
         elif what == 'author':
-            origin = '/'.join((siteurl, Author(path, self.settings).url))
+            origin = joiner(siteurl, Author(path, self.settings).url)
         else:
             logger.warning(
                 "Replacement Indicator '%s' not recognized, "
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index d028c7a1..04c82f61 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -397,6 +397,54 @@ class TestPage(LoggedTestCase):
             '</blockquote>'
         )
 
+    def test_intrasite_link_absolute(self):
+        """Test that absolute URLs are merged properly."""
+
+        args = self.page_kwargs.copy()
+        args['settings'] = get_settings(
+            STATIC_URL='http://static.cool.site/{path}',
+            ARTICLE_URL='http://blog.cool.site/{slug}.html')
+        args['source_path'] = 'content'
+        args['context']['filenames'] = {
+            'images/poster.jpg': Static('',
+                                        settings=args['settings'],
+                                        source_path='images/poster.jpg'),
+            'article.rst': Article('',
+                                   settings=args['settings'],
+                                   metadata={'slug': 'article',
+                                             'title': 'Article'})
+        }
+
+        # Article link will go to blog
+        args['content'] = (
+            '<a href="{filename}article.rst">Article</a>'
+        )
+        content = Page(**args).get_content('http://cool.site')
+        self.assertEqual(
+            content,
+            '<a href="http://blog.cool.site/article.html">Article</a>'
+        )
+
+        # Page link will go to the main site
+        args['content'] = (
+            '<a href="{index}">Index</a>'
+        )
+        content = Page(**args).get_content('http://cool.site')
+        self.assertEqual(
+            content,
+            '<a href="http://cool.site/index.html">Index</a>'
+        )
+
+        # Image link will go to static
+        args['content'] = (
+            '<img src="{filename}/images/poster.jpg"/>'
+        )
+        content = Page(**args).get_content('http://cool.site')
+        self.assertEqual(
+            content,
+            '<img src="http://static.cool.site/images/poster.jpg"/>'
+        )
+
     def test_intrasite_link_markdown_spaces(self):
         # Markdown introduces %20 instead of spaces, this tests that
         # we support markdown doing this.

From fc4b3e44d8a92635cabcff57bdf078cb2385ad80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 29 Oct 2017 20:31:09 +0100
Subject: [PATCH 2001/2864] Make use of SITESUBTITLE setting also in Atom
 feeds.

For some reason, feedgenerator.py uses the `description` argument only
for RSS and the `subtitle` argument only for Atom. So setting both to
the same value.

In order to avoid unnecessary changes, if SITESUBTITLE is not present,
the subtitle is set to None instead of '', so the generated Atom feed
doesn't contain an empty <subtitle></subtitle> tag (in contrast, the RSS
feed contains an empty <description></description> tag now, though).
---
 pelican/writers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index fef0d5ca..ff3207fa 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -40,7 +40,8 @@ class Writer(object):
             title=Markup(feed_title).striptags(),
             link=(self.site_url + '/'),
             feed_url=self.feed_url,
-            description=context.get('SITESUBTITLE', ''))
+            description=context.get('SITESUBTITLE', ''),
+            subtitle=context.get('SITESUBTITLE', None))
         return feed
 
     def _add_item_to_the_feed(self, feed, item):

From d04b777159a7a28238a5bb989bbae1bce1a9c6b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 29 Oct 2017 21:28:11 +0100
Subject: [PATCH 2002/2864] Test for SITESUBTITLE in feeds.

It's now present in both RSS and Atom feeds.
---
 pelican/tests/output/custom/a-markdown-powered-article.html     | 2 +-
 pelican/tests/output/custom/archives.html                       | 2 +-
 pelican/tests/output/custom/article-1.html                      | 2 +-
 pelican/tests/output/custom/article-2.html                      | 2 +-
 pelican/tests/output/custom/article-3.html                      | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau.html        | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau2.html       | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau3.html       | 2 +-
 pelican/tests/output/custom/authors.html                        | 2 +-
 pelican/tests/output/custom/categories.html                     | 2 +-
 pelican/tests/output/custom/category/bar.html                   | 2 +-
 pelican/tests/output/custom/category/cat1.html                  | 2 +-
 pelican/tests/output/custom/category/misc.html                  | 2 +-
 pelican/tests/output/custom/category/yeah.html                  | 2 +-
 pelican/tests/output/custom/drafts/a-draft-article.html         | 2 +-
 pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml     | 2 +-
 pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml      | 2 +-
 pelican/tests/output/custom/feeds/all-en.atom.xml               | 2 +-
 pelican/tests/output/custom/feeds/all-fr.atom.xml               | 2 +-
 pelican/tests/output/custom/feeds/all.atom.xml                  | 2 +-
 pelican/tests/output/custom/feeds/all.rss.xml                   | 2 +-
 pelican/tests/output/custom/feeds/bar.atom.xml                  | 2 +-
 pelican/tests/output/custom/feeds/bar.rss.xml                   | 2 +-
 pelican/tests/output/custom/feeds/cat1.atom.xml                 | 2 +-
 pelican/tests/output/custom/feeds/cat1.rss.xml                  | 2 +-
 pelican/tests/output/custom/feeds/misc.atom.xml                 | 2 +-
 pelican/tests/output/custom/feeds/misc.rss.xml                  | 2 +-
 pelican/tests/output/custom/feeds/yeah.atom.xml                 | 2 +-
 pelican/tests/output/custom/feeds/yeah.rss.xml                  | 2 +-
 pelican/tests/output/custom/filename_metadata-example.html      | 2 +-
 pelican/tests/output/custom/index.html                          | 2 +-
 pelican/tests/output/custom/index2.html                         | 2 +-
 pelican/tests/output/custom/index3.html                         | 2 +-
 pelican/tests/output/custom/jinja2_template.html                | 2 +-
 pelican/tests/output/custom/oh-yeah-fr.html                     | 2 +-
 pelican/tests/output/custom/oh-yeah.html                        | 2 +-
 pelican/tests/output/custom/override/index.html                 | 2 +-
 .../tests/output/custom/pages/this-is-a-test-hidden-page.html   | 2 +-
 pelican/tests/output/custom/pages/this-is-a-test-page.html      | 2 +-
 pelican/tests/output/custom/second-article-fr.html              | 2 +-
 pelican/tests/output/custom/second-article.html                 | 2 +-
 pelican/tests/output/custom/tag/bar.html                        | 2 +-
 pelican/tests/output/custom/tag/baz.html                        | 2 +-
 pelican/tests/output/custom/tag/foo.html                        | 2 +-
 pelican/tests/output/custom/tag/foobar.html                     | 2 +-
 pelican/tests/output/custom/tag/oh.html                         | 2 +-
 pelican/tests/output/custom/tag/yeah.html                       | 2 +-
 pelican/tests/output/custom/tags.html                           | 2 +-
 pelican/tests/output/custom/this-is-a-super-article.html        | 2 +-
 pelican/tests/output/custom/unbelievable.html                   | 2 +-
 samples/pelican.conf.py                                         | 1 +
 51 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 86c6a98d..5c416f2f 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index ecf57942..ba2585cc 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index ee0fa3f3..0a837e4a 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index cb4785e0..abe47edc 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index b2cffd66..5017aa2f 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index 214d0e2f..045c4d94 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 152d2111..7c28bad8 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index e738511e..4eed4443 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index 0baa4e2a..dad0c239 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index a4728315..1d802b29 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index d375b47a..fa9e49df 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index f42eabe5..5ef75144 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index fa964ffa..339f3316 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 21621cbd..5c5af7af 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 0fc2bd25..b53e2243 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index d4582496..684c3574 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index 5409e039..707097f0 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 56d64535..3de34964 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index e50dfb34..31573dd0 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </content></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 96428b33..f6a54cbb 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </content></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 8873b845..c20aac95 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index 119a86a2..90d6e220 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><subtitle>A personal blog.</subtitle><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index b5600543..85aeee8d 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - bar</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0"><channel><title>Alexis' log - bar</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index 66435f58..eca9d3a5 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><subtitle>A personal blog.</subtitle><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index 0752be2a..64276d5a 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index a48d73c1..40e40d77 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 82884344..389f703b 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+<rss version="2.0"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index 82dd0368..e0398437 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index 1b7f1bae..9601e8b6 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+<rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index f66c6cd0..dec94688 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 17c822c6..d78b001f 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 68940b8e..434d8596 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 0db9b8aa..7530e0f2 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 2d1032e1..8e7e6836 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 479c5291..d86dc022 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 5037402b..f73a1ea7 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 74bb4abe..543aa8a3 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li class="active"><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 9af27061..19f5cd2c 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 96f51396..78dc57fc 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index c48511bd..124a675e 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 9454a041..1bff301a 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 077ed625..048df1d3 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index aec86f76..9fc3ee2c 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 10ac2c61..0aa4c524 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 32eeae38..97c8bfbb 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index a41e43f7..0aa17d98 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li class="active"><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 88cf5b69..f4d149e6 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 92f6615c..e8d8e6de 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index d89f42fd..e38291e6 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 57da2f44..b85f9e1f 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 360ebc1d..da5c5dc5 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 AUTHOR = 'Alexis Métaireau'
 SITENAME = "Alexis' log"
+SITESUBTITLE = 'A personal blog.'
 SITEURL = 'http://blog.notmyidea.org'
 TIMEZONE = "Europe/Paris"
 

From 343e24a26f28eb15c2b189d0fca233797dffcfc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 29 Oct 2017 19:58:26 +0100
Subject: [PATCH 2003/2864] Make it possible to specify custom URLs for feeds.

With this patch, there are new FEED_*_URL configuration options that
allow to specify custom URLs for feeds, which is helpful in case the
feed filename and the actual URL differ a lot -- for example if a feed
is saved to

    blog/feeds/all.atom.xml

but the actual URL from the user PoV is

    http://blog.your.site/feeds/all.atom.xml

This setting currently affects only the generated feed XML. This change
is also fully backwards compatible, so if the FEED_*_URL setting is not
present, the value of FEED_* is used for both file location and URL.
---
 docs/settings.rst                | 87 +++++++++++++++++++++++++++-----
 pelican/generators.py            | 51 +++++++++++++++++--
 pelican/tests/test_generators.py | 15 ++++++
 pelican/writers.py               |  8 +--
 4 files changed, 140 insertions(+), 21 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e5ce19f5..07069d2c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -811,46 +811,95 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 
 .. data:: FEED_ATOM = None, i.e. no Atom feed
 
-   Relative URL to output the Atom feed.
+   The location to save the Atom feed.
+
+.. data:: FEED_ATOM_URL = None
+
+   Relative URL of the Atom feed. If not set, ``FEED_ATOM`` is used both for
+   save location and URL.
 
 .. data:: FEED_RSS = None, i.e. no RSS
 
-   Relative URL to output the RSS feed.
+   The location to save the RSS feed.
+
+.. data:: FEED_RSS_URL = None
+
+   Relative URL of the RSS feed. If not set, ``FEED_RSS`` is used both for save
+   location and URL.
 
 .. data:: FEED_ALL_ATOM = 'feeds/all.atom.xml'
 
-   Relative URL to output the all-posts Atom feed: this feed will contain all
+   The location to save the all-posts Atom feed: this feed will contain all
    posts regardless of their language.
 
+.. data:: FEED_ALL_ATOM_URL = None
+
+   Relative URL of the all-posts Atom feed. If not set, ``FEED_ALL_ATOM`` is
+   used both for save location and URL.
+
 .. data:: FEED_ALL_RSS = None, i.e. no all-posts RSS
 
-   Relative URL to output the all-posts RSS feed: this feed will contain all
+   The location to save the the all-posts RSS feed: this feed will contain all
    posts regardless of their language.
 
+.. data:: FEED_ALL_RSS_URL = None
+
+   Relative URL of the all-posts RSS feed. If not set, ``FEED_ALL_RSS`` is used
+   both for save location and URL.
+
 .. data:: CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
 
-   Where to put the category Atom feeds. [2]_
+   The location to save the category Atom feeds. [2]_
+
+.. data:: CATEGORY_FEED_ATOM_URL = None
+
+   Relative URL of the category Atom feeds, including the ``%s`` placeholder.
+   [2]_ If not set, ``CATEGORY_FEED_ATOM`` is used both for save location and
+   URL.
 
 .. data:: CATEGORY_FEED_RSS = None, i.e. no RSS
 
-   Where to put the category RSS feeds.
+   The location to save the category RSS feeds, including the ``%s``
+   placeholder. [2]_
+
+.. data:: CATEGORY_FEED_RSS_URL = None
+
+   Relative URL of the category RSS feeds, including the ``%s`` placeholder.
+   [2]_ If not set, ``CATEGORY_FEED_RSS`` is used both for save location and
+   URL.
 
 .. data:: AUTHOR_FEED_ATOM = 'feeds/%s.atom.xml'
 
-   Where to put the author Atom feeds. [2]_
+   The location to save the author Atom feeds. [2]_
+
+.. data:: AUTHOR_FEED_ATOM_URL = None
+
+   Relative URL of the author Atom feeds, including the ``%s`` placeholder.
+   [2]_ If not set, ``AUTHOR_FEED_ATOM`` is used both for save location and
+   URL.
 
 .. data:: AUTHOR_FEED_RSS = 'feeds/%s.rss.xml'
 
-   Where to put the author RSS feeds. [2]_
+   The location to save the author RSS feeds. [2]_
+
+.. data:: AUTHOR_FEED_RSS_URL = None
+
+   Relative URL of the author RSS feeds, including the ``%s`` placeholder. [2]_
+   If not set, ``AUTHOR_FEED_RSS`` is used both for save location and URL.
 
 .. data:: TAG_FEED_ATOM = None, i.e. no tag feed
 
-   Relative URL to output the tag Atom feed. It should be defined using a "%s"
-   match in the tag name.
+   The location to save the tag Atom feed, including the ``%s`` placeholder.
+   [2]_
+
+.. data:: TAG_FEED_ATOM_URL = None
+
+   Relative URL of the tag Atom feed, including the ``%s`` placeholder. [2]_
 
 .. data:: TAG_FEED_RSS = None, i.e. no RSS tag feed
 
-   Relative URL to output the tag RSS feed
+   Relative URL to output the tag RSS feed, including the ``%s`` placeholder.
+   If not set, ``TAG_FEED_RSS`` is used both for save location and URL.
 
 .. data:: FEED_MAX_ITEMS
 
@@ -865,7 +914,7 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 
 If you don't want to generate some or any of these feeds, set the above variables to ``None``.
 
-.. [2] %s is the name of the category.
+.. [2] ``%s`` is replaced by name of the category / author / tag.
 
 
 FeedBurner
@@ -948,12 +997,24 @@ more information.
 
 .. data:: TRANSLATION_FEED_ATOM = 'feeds/all-%s.atom.xml'
 
-   Where to put the Atom feed for translations. [3]_
+   The location to save the Atom feed for translations. [3]_
+
+.. data:: TRANSLATION_FEED_ATOM_URL = None
+
+   Relative URL of the Atom feed for translations, including the ``%s``
+   placeholder. [3]_ If not set, ``TRANSLATION_FEED_ATOM`` is used both for
+   save location and URL.
 
 .. data:: TRANSLATION_FEED_RSS = None, i.e. no RSS
 
    Where to put the RSS feed for translations.
 
+.. data:: TRANSLATION_FEED_RSS_URL = None
+
+   Relative URL of the RSS feed for translations, including the ``%s``
+   placeholder. [3]_ If not set, ``TRANSLATION_FEED_RSS`` is used both for save
+   location and URL.
+
 .. [3] %s is the language
 
 
diff --git a/pelican/generators.py b/pelican/generators.py
index eb97c115..1f84b2b5 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -282,11 +282,16 @@ class ArticlesGenerator(CachingGenerator):
 
         if self.settings.get('FEED_ATOM'):
             writer.write_feed(self.articles, self.context,
-                              self.settings['FEED_ATOM'])
+                              self.settings['FEED_ATOM'],
+                              self.settings.get('FEED_ATOM_URL',
+                                                self.settings['FEED_ATOM']))
 
         if self.settings.get('FEED_RSS'):
             writer.write_feed(self.articles, self.context,
-                              self.settings['FEED_RSS'], feed_type='rss')
+                              self.settings['FEED_RSS'],
+                              self.settings.get('FEED_RSS_URL',
+                                                self.settings['FEED_RSS']),
+                              feed_type='rss')
 
         if (self.settings.get('FEED_ALL_ATOM') or
                 self.settings.get('FEED_ALL_RSS')):
@@ -297,11 +302,17 @@ class ArticlesGenerator(CachingGenerator):
 
             if self.settings.get('FEED_ALL_ATOM'):
                 writer.write_feed(all_articles, self.context,
-                                  self.settings['FEED_ALL_ATOM'])
+                                  self.settings['FEED_ALL_ATOM'],
+                                  self.settings.get(
+                                      'FEED_ALL_ATOM_URL',
+                                      self.settings['FEED_ALL_ATOM']))
 
             if self.settings.get('FEED_ALL_RSS'):
                 writer.write_feed(all_articles, self.context,
                                   self.settings['FEED_ALL_RSS'],
+                                  self.settings.get(
+                                      'FEED_ALL_RSS_URL',
+                                      self.settings['FEED_ALL_RSS']),
                                   feed_type='rss')
 
         for cat, arts in self.categories:
@@ -309,11 +320,19 @@ class ArticlesGenerator(CachingGenerator):
             if self.settings.get('CATEGORY_FEED_ATOM'):
                 writer.write_feed(arts, self.context,
                                   self.settings['CATEGORY_FEED_ATOM']
+                                  % cat.slug,
+                                  self.settings.get(
+                                      'CATEGORY_FEED_ATOM_URL',
+                                      self.settings['CATEGORY_FEED_ATOM'])
                                   % cat.slug, feed_title=cat.name)
 
             if self.settings.get('CATEGORY_FEED_RSS'):
                 writer.write_feed(arts, self.context,
                                   self.settings['CATEGORY_FEED_RSS']
+                                  % cat.slug,
+                                  self.settings.get(
+                                      'CATEGORY_FEED_RSS_URL',
+                                      self.settings['CATEGORY_FEED_RSS'])
                                   % cat.slug, feed_title=cat.name,
                                   feed_type='rss')
 
@@ -322,11 +341,19 @@ class ArticlesGenerator(CachingGenerator):
             if self.settings.get('AUTHOR_FEED_ATOM'):
                 writer.write_feed(arts, self.context,
                                   self.settings['AUTHOR_FEED_ATOM']
+                                  % auth.slug,
+                                  self.settings.get(
+                                      'AUTHOR_FEED_ATOM_URL',
+                                      self.settings['AUTHOR_FEED_ATOM'])
                                   % auth.slug, feed_title=auth.name)
 
             if self.settings.get('AUTHOR_FEED_RSS'):
                 writer.write_feed(arts, self.context,
                                   self.settings['AUTHOR_FEED_RSS']
+                                  % auth.slug,
+                                  self.settings.get(
+                                      'AUTHOR_FEED_RSS_URL',
+                                      self.settings['AUTHOR_FEED_RSS'])
                                   % auth.slug, feed_title=auth.name,
                                   feed_type='rss')
 
@@ -337,12 +364,20 @@ class ArticlesGenerator(CachingGenerator):
                 if self.settings.get('TAG_FEED_ATOM'):
                     writer.write_feed(arts, self.context,
                                       self.settings['TAG_FEED_ATOM']
+                                      % tag.slug,
+                                      self.settings.get(
+                                          'TAG_FEED_ATOM_URL',
+                                          self.settings['TAG_FEED_ATOM'])
                                       % tag.slug, feed_title=tag.name)
 
                 if self.settings.get('TAG_FEED_RSS'):
                     writer.write_feed(arts, self.context,
                                       self.settings['TAG_FEED_RSS'] % tag.slug,
-                                      feed_title=tag.name, feed_type='rss')
+                                      self.settings.get(
+                                          'TAG_FEED_RSS_URL',
+                                          self.settings['TAG_FEED_RSS'])
+                                      % tag.slug, feed_title=tag.name,
+                                      feed_type='rss')
 
         if (self.settings.get('TRANSLATION_FEED_ATOM') or
                 self.settings.get('TRANSLATION_FEED_RSS')):
@@ -355,11 +390,17 @@ class ArticlesGenerator(CachingGenerator):
                 if self.settings.get('TRANSLATION_FEED_ATOM'):
                     writer.write_feed(
                         items, self.context,
-                        self.settings['TRANSLATION_FEED_ATOM'] % lang)
+                        self.settings['TRANSLATION_FEED_ATOM'] % lang,
+                        self.settings.get(
+                            'TRANSLATION_FEED_ATOM_URL',
+                            self.settings['TRANSLATION_FEED_ATOM']) % lang)
                 if self.settings.get('TRANSLATION_FEED_RSS'):
                     writer.write_feed(
                         items, self.context,
                         self.settings['TRANSLATION_FEED_RSS'] % lang,
+                        self.settings.get(
+                            'TRANSLATION_FEED_RSS_URL',
+                            self.settings['TRANSLATION_FEED_RSS']) % lang,
                         feed_type='rss')
 
     def generate_articles(self, write):
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 5f2151c3..8fc3f3de 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -155,6 +155,7 @@ class TestArticlesGenerator(unittest.TestCase):
         writer = MagicMock()
         generator.generate_feeds(writer)
         writer.write_feed.assert_called_with([], settings,
+                                             'feeds/all.atom.xml',
                                              'feeds/all.atom.xml')
 
         generator = ArticlesGenerator(
@@ -164,6 +165,20 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_feeds(writer)
         self.assertFalse(writer.write_feed.called)
 
+    @unittest.skipUnless(MagicMock, 'Needs Mock module')
+    def test_generate_feeds_override_url(self):
+        settings = get_settings()
+        settings['CACHE_PATH'] = self.temp_cache
+        settings['FEED_ALL_ATOM_URL'] = 'feeds/atom/all/'
+        generator = ArticlesGenerator(
+            context=settings, settings=settings,
+            path=None, theme=settings['THEME'], output_path=None)
+        writer = MagicMock()
+        generator.generate_feeds(writer)
+        writer.write_feed.assert_called_with([], settings,
+                                             'feeds/all.atom.xml',
+                                             'feeds/atom/all/')
+
     def test_generate_context(self):
         articles_expected = [
             ['Article title', 'published', 'Default', 'article'],
diff --git a/pelican/writers.py b/pelican/writers.py
index fef0d5ca..ba77e7b5 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -89,8 +89,8 @@ class Writer(object):
         self._written_files.add(filename)
         return open(filename, 'w', encoding=encoding)
 
-    def write_feed(self, elements, context, path=None, feed_type='atom',
-                   override_output=False, feed_title=None):
+    def write_feed(self, elements, context, path=None, url=None,
+                   feed_type='atom', override_output=False, feed_title=None):
         """Generate a feed with the list of articles provided
 
         Return the feed. If no path or output_path is specified, just
@@ -99,6 +99,8 @@ class Writer(object):
         :param elements: the articles to put on the feed.
         :param context: the context to get the feed metadata.
         :param path: the path to output.
+        :param url: the publicly visible feed URL; if None, path is used
+            instead
         :param feed_type: the feed type to use (atom or rss)
         :param override_output: boolean telling if we can override previous
             output with the same name (and if next files written with the same
@@ -112,7 +114,7 @@ class Writer(object):
             'SITEURL', path_to_url(get_relative_path(path)))
 
         self.feed_domain = context.get('FEED_DOMAIN')
-        self.feed_url = '{}/{}'.format(self.feed_domain, path)
+        self.feed_url = '{}/{}'.format(self.feed_domain, url if url else path)
 
         feed = self._create_new_feed(feed_type, feed_title, context)
 

From e5110edccada0ca767a6ef9f6d39209193403084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 29 Oct 2017 19:58:57 +0100
Subject: [PATCH 2004/2864] Use FEED_*_URL settings in the builtin themes.

---
 pelican/themes/notmyidea/templates/base.html |  8 ++++----
 pelican/themes/simple/templates/base.html    | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index b041faa0..eb16c42e 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -5,10 +5,10 @@
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" />
         {% if FEED_ALL_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
         {% endif %}
         {% if FEED_ALL_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
 </head>
 
@@ -50,10 +50,10 @@
                         <h2>{{ SOCIAL_WIDGET_NAME | default('social') }}</h2>
                         <ul>
                             {% if FEED_ALL_ATOM %}
-                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate">atom feed</a></li>
                             {% endif %}
                             {% if FEED_ALL_RSS %}
-                            <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                            <li><a href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate">rss feed</a></li>
                             {% endif %}
 
                         {% for name, link in SOCIAL %}
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 760ca5da..e063995d 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -5,28 +5,28 @@
         <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
         <meta charset="utf-8" />
         {% if FEED_ALL_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
         {% endif %}
         {% if FEED_ALL_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" />
         {% endif %}
         {% if FEED_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{%if FEED_ATOM_URL %}{{ FEED_ATOM_URL }}{% else %}{{ FEED_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
         {% endif %}
         {% if FEED_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if FEED_RSS_URL %}{{ FEED_RSS_URL }}{% else %}{{ FEED_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
         {% if CATEGORY_FEED_ATOM and category %}
-        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL|format(category.slug) }}{% else %}{{ CATEGORY_FEED_ATOM|format(category.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
         {% endif %}
         {% if CATEGORY_FEED_RSS and category %}
-        <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_RSS_URL %}{{ CATEGORY_FEED_RSS_URL|format(category.slug) }}{% else %}{{ CATEGORY_FEED_RSS|format(category.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
         {% endif %}
         {% if TAG_FEED_ATOM and tag %}
-        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL|format(tag.slug) }}{% else %}{{ TAG_FEED_ATOM|format(tag.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
         {% endif %}
         {% if TAG_FEED_RSS and tag %}
-        <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL|format(tag.slug) }}{% else %}{{ TAG_FEED_RSS|format(tag.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
         {% endif %}
         {% endblock head %}
 </head>

From a8b594f9d992ad896fbe320c0ae8a41be39f6109 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 29 Oct 2017 19:59:20 +0100
Subject: [PATCH 2005/2864] Make feed generator aware of absolute URLs.

So for example in case both SITEURL and ARTICLE_URL is absolute, the
generated URLs are not improperly

    http://your.site/http://blog.your.site/the-article/

but rather

    http://blog.your.site/the-article/
---
 pelican/writers.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index ba77e7b5..28e1d75b 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -9,6 +9,7 @@ from feedgenerator import Atom1Feed, Rss201rev2Feed, get_tag_uri
 from jinja2 import Markup
 
 import six
+from six.moves.urllib.parse import urljoin
 
 from pelican import signals
 from pelican.paginator import Paginator
@@ -30,6 +31,13 @@ class Writer(object):
         self._written_files = set()
         self._overridden_files = set()
 
+        # See Content._link_replacer for details
+        if self.settings['RELATIVE_URLS']:
+            self.urljoiner = os.path.join
+        else:
+            self.urljoiner = lambda base, url: urljoin(
+                base if base.endswith('/') else base + '/', url)
+
     def _create_new_feed(self, feed_type, feed_title, context):
         feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
         if feed_title:
@@ -44,9 +52,8 @@ class Writer(object):
         return feed
 
     def _add_item_to_the_feed(self, feed, item):
-
         title = Markup(item.title).striptags()
-        link = '%s/%s' % (self.site_url, item.url)
+        link = self.urljoiner(self.site_url, item.url)
         is_rss = isinstance(feed, Rss201rev2Feed)
         if not is_rss or self.settings.get('RSS_FEED_SUMMARY_ONLY'):
             description = item.summary
@@ -114,7 +121,7 @@ class Writer(object):
             'SITEURL', path_to_url(get_relative_path(path)))
 
         self.feed_domain = context.get('FEED_DOMAIN')
-        self.feed_url = '{}/{}'.format(self.feed_domain, url if url else path)
+        self.feed_url = self.urljoiner(self.feed_domain, url if url else path)
 
         feed = self._create_new_feed(feed_type, feed_title, context)
 

From 19a9eeb97520fd0e922d2ed4d5189f5f13cb3bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 3 Nov 2017 16:03:35 +0100
Subject: [PATCH 2006/2864] Test that THEME_STATIC_PATHS works for both dirs
 and files.

It's documented like that. Doesn't work for files, though.
---
 pelican/tests/test_generators.py | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 5f2151c3..139fda10 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -699,6 +699,53 @@ class TestStaticGenerator(unittest.TestCase):
     def set_ancient_mtime(self, path, timestamp=1):
         os.utime(path, (timestamp, timestamp))
 
+    def test_theme_static_paths_dirs(self):
+        """Test that StaticGenerator properly copies also files mentioned in
+           TEMPLATE_STATIC_PATHS, not just directories."""
+        settings = get_settings(
+            PATH=self.content_path,
+            filenames={})
+        context = settings.copy()
+        context['staticfiles'] = []
+
+        StaticGenerator(
+            context=context, settings=settings,
+            path=settings['PATH'], output_path=self.temp_output,
+            theme=settings['THEME']).generate_output(None)
+
+        # The content of dirs listed in THEME_STATIC_PATHS (defaulting to
+        # "static") is put into the output
+        self.assertTrue(os.path.isdir(os.path.join(self.temp_output,
+                                                   "theme/css/")))
+        self.assertTrue(os.path.isdir(os.path.join(self.temp_output,
+                                                   "theme/fonts/")))
+
+    def test_theme_static_paths_files(self):
+        """Test that StaticGenerator properly copies also files mentioned in
+           TEMPLATE_STATIC_PATHS, not just directories."""
+        settings = get_settings(
+            PATH=self.content_path,
+            THEME_STATIC_PATHS=['static/css/fonts.css', 'static/fonts/'],
+            filenames={})
+        context = settings.copy()
+        context['staticfiles'] = []
+
+        StaticGenerator(
+            context=context, settings=settings,
+            path=settings['PATH'], output_path=self.temp_output,
+            theme=settings['THEME']).generate_output(None)
+
+        # Only the content of dirs and files listed in THEME_STATIC_PATHS are
+        # put into the output, not everything from static/
+        self.assertFalse(os.path.isdir(os.path.join(self.temp_output,
+                                                    "theme/css/")))
+        self.assertFalse(os.path.isdir(os.path.join(self.temp_output,
+                                                    "theme/fonts/")))
+        self.assertTrue(os.path.isfile(os.path.join(self.temp_output,
+                                                    "theme/font.css")))
+        self.assertTrue(os.path.isfile(os.path.join(self.temp_output,
+                                                    "theme/fonts.css")))
+
     def test_static_excludes(self):
         """Test that StaticGenerator respects STATIC_EXCLUDES.
         """

From 430868e85934a5a048ff75a9549f316943b1dec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 3 Nov 2017 16:04:52 +0100
Subject: [PATCH 2007/2864] Make THEME_STATIC_PATHS work for files as well.

The test passes now.
---
 pelican/generators.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index eb97c115..3a8909e4 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -696,14 +696,21 @@ class StaticGenerator(Generator):
                     final_path=None):
         """Copy all the paths from source to destination"""
         for path in paths:
+            source_path = os.path.join(source, path)
+
             if final_path:
-                copy(os.path.join(source, path),
-                     os.path.join(output_path, destination, final_path),
-                     self.settings['IGNORE_FILES'])
+                if os.path.isfile(source_path):
+                    destination_path = os.path.join(output_path, destination,
+                                                    final_path,
+                                                    os.path.basename(path))
+                else:
+                    destination_path = os.path.join(output_path, destination,
+                                                    final_path)
             else:
-                copy(os.path.join(source, path),
-                     os.path.join(output_path, destination, path),
-                     self.settings['IGNORE_FILES'])
+                destination_path = os.path.join(output_path, destination, path)
+
+            copy(source_path, destination_path,
+                 self.settings['IGNORE_FILES'])
 
     def _file_update_required(self, staticfile):
         source_path = os.path.join(self.path, staticfile.source_path)

From 8ebc120f365a4908c060fbc3e66d656e691be702 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 7 Nov 2017 04:18:03 -0800
Subject: [PATCH 2008/2864] Align import style with flake8-import-order 0.15

Addresses: https://github.com/PyCQA/flake8-import-order/issues/120

Refs #2246
---
 docs/conf.py                     | 1 +
 pelican/__init__.py              | 4 ++--
 pelican/tests/test_cache.py      | 1 -
 pelican/tests/test_generators.py | 1 -
 pelican/tests/test_importer.py   | 1 -
 pelican/tests/test_pelican.py    | 1 -
 pelican/tools/pelican_import.py  | 1 -
 7 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 3748fd75..bfe5880c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import os
 import sys
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 70013804..ab07efcf 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -14,8 +14,8 @@ import six
 
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
-from pelican.log import init  # noqa
-from pelican import signals
+from pelican.log import init
+from pelican import signals  # noqa
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 SourceFileGenerator, StaticGenerator,
                                 TemplatePagesGenerator)
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index 1f26deec..a0cc49b7 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -2,7 +2,6 @@
 from __future__ import unicode_literals
 
 import os
-
 from shutil import rmtree
 from tempfile import mkdtemp
 
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 5f2151c3..732dd60a 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 
 import locale
 import os
-
 from codecs import open
 from shutil import copy, rmtree
 from tempfile import mkdtemp
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 6af59212..aa16f6ad 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -4,7 +4,6 @@ from __future__ import print_function, unicode_literals
 import locale
 import os
 import re
-
 from codecs import open
 
 from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder,
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index ea28e021..c003c78f 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -7,7 +7,6 @@ import logging
 import os
 import subprocess
 import sys
-
 from shutil import rmtree
 from tempfile import mkdtemp
 
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 25fc45e5..27462462 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -9,7 +9,6 @@ import re
 import subprocess
 import sys
 import time
-
 from codecs import open
 
 from six.moves.urllib.error import URLError

From a091a4b8b913f96ff596ac6df21963921f1aa7b7 Mon Sep 17 00:00:00 2001
From: Florent Gallaire <fgallaire@gmail.com>
Date: Thu, 9 Nov 2017 06:56:05 +0100
Subject: [PATCH 2009/2864] Change pelican-import output directory default name
 to "content" (fix #2250)

---
 docs/importer.rst               | 2 +-
 pelican/tools/pelican_import.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 83f4e112..2a5365ee 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -63,7 +63,7 @@ Optional arguments
   --tumblr              Tumblr API (default: False)
   --feed                Feed to parse (default: False)
   -o OUTPUT, --output OUTPUT
-                        Output path (default: output)
+                        Output path (default: content)
   -m MARKUP, --markup MARKUP
                         Output markup format (supports rst & markdown)
                         (default: rst)
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 25fc45e5..e5dc325f 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -790,7 +790,7 @@ def main():
         '--feed', action='store_true', dest='feed',
         help='Feed to parse')
     parser.add_argument(
-        '-o', '--output', dest='output', default='output',
+        '-o', '--output', dest='output', default='content',
         help='Output path')
     parser.add_argument(
         '-m', '--markup', dest='markup', default='rst',

From abb91fc3be49517a0732968148477bd486ce46a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 29 Nov 2017 22:42:54 +0100
Subject: [PATCH 2010/2864] Propagate value of DEFAULT_LANG to docutils reST
 parser.

That way the parsed node tree gets proper information about the
language, which can be then used for e.g. language-aware smart quotes or
hyphenation.
---
 pelican/readers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/readers.py b/pelican/readers.py
index 61126c9c..8b50c044 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -234,6 +234,7 @@ class RstReader(BaseReader):
         extra_params = {'initial_header_level': '2',
                         'syntax_highlight': 'short',
                         'input_encoding': 'utf-8',
+                        'language_code': self.settings.get('DEFAULT_LANG'),
                         'exit_status_level': 2,
                         'embed_stylesheet': False}
         user_params = self.settings.get('DOCUTILS_SETTINGS')

From f62217f38e75457d92d8f4c8d87a453a928cba7a Mon Sep 17 00:00:00 2001
From: "Mr. Senko" <atodorov@mrsenko.com>
Date: Sat, 2 Dec 2017 13:10:43 +0200
Subject: [PATCH 2011/2864] Make HTMLReader parse multiple occurences of
 metadata tags as list

this means you can now specify:
<meta name="custom_field" content="value_1" />
<meta name="custom_field" content="value_2" />

and the resulting object.custom_field will be ['value_1', 'value_2']
---
 docs/changelog.rst                                   |  1 +
 pelican/readers.py                                   | 12 +++++++++++-
 .../content/article_with_multiple_metadata_tags.html | 11 +++++++++++
 pelican/tests/test_generators.py                     |  2 ++
 pelican/tests/test_readers.py                        |  8 ++++++++
 5 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pelican/tests/content/article_with_multiple_metadata_tags.html

diff --git a/docs/changelog.rst b/docs/changelog.rst
index aa594a2c..7ed84eba 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Next release
 ============
 
 * New signal: ``feed_generated``
+* Make the HTML reader parse multiple occurences of metadata tags as list
 
 3.7.1 (2017-01-10)
 ==================
diff --git a/pelican/readers.py b/pelican/readers.py
index 61126c9c..e24354e3 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -440,7 +440,17 @@ class HTMLReader(BaseReader):
 
             if name == 'keywords':
                 name = 'tags'
-            self.metadata[name] = contents
+
+            if name in self.metadata:
+                # if this metadata already exists (i.e. a previous tag with the
+                # same name has already been specified then either convert to
+                # list or append to list
+                if isinstance(self.metadata[name], list):
+                    self.metadata[name].append(contents)
+                else:
+                    self.metadata[name] = [self.metadata[name], contents]
+            else:
+                self.metadata[name] = contents
 
         @classmethod
         def _attr_value(cls, attrs, name, default=None):
diff --git a/pelican/tests/content/article_with_multiple_metadata_tags.html b/pelican/tests/content/article_with_multiple_metadata_tags.html
new file mode 100644
index 00000000..f03c0b46
--- /dev/null
+++ b/pelican/tests/content/article_with_multiple_metadata_tags.html
@@ -0,0 +1,11 @@
+<html>
+    <head>
+        <title>Metadata tags as list!</title>
+        <meta name="custom_field" content="http://notmyidea.org" />
+        <meta name="custom_field" content="http://mrsenko.com" />
+    </head>
+    <body>
+        When custom metadata tags are specified more than once
+        they are collected into a list!
+    </body>
+</html>
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 732dd60a..0326cb5e 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -173,6 +173,7 @@ class TestArticlesGenerator(unittest.TestCase):
             ['Article with markdown containing footnotes', 'published',
              'Default', 'article'],
             ['Article with template', 'published', 'Default', 'custom'],
+            ['Metadata tags as list!', 'published', 'Default', 'article'],
             ['Rst with filename metadata', 'published', 'yeah', 'article'],
             ['Test Markdown extensions', 'published', 'Default', 'article'],
             ['Test markdown File', 'published', 'test', 'article'],
@@ -452,6 +453,7 @@ class TestArticlesGenerator(unittest.TestCase):
             'Article with markdown and summary metadata single',
             'Article with markdown containing footnotes',
             'Article with template',
+            'Metadata tags as list!',
             'Rst with filename metadata',
             'Test Markdown extensions',
             'Test markdown File',
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 4db4938e..d21fcbfb 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -657,6 +657,14 @@ class HTMLReaderTest(ReaderTest):
 
         self.assertDictHasSubset(page.metadata, expected)
 
+    def test_article_with_multiple_similar_metadata_tags(self):
+        page = self.read_file(path='article_with_multiple_metadata_tags.html')
+        expected = {
+            'custom_field': ['http://notmyidea.org', 'http://mrsenko.com'],
+        }
+
+        self.assertDictHasSubset(page.metadata, expected)
+
     def test_article_with_multiple_authors(self):
         page = self.read_file(path='article_with_multiple_authors.html')
         expected = {

From 6d46bf425705ab6d3a3791eefef9bd84beed1e1e Mon Sep 17 00:00:00 2001
From: ix5 <ix5@users.noreply.github.com>
Date: Sun, 15 Jan 2017 08:47:21 +0100
Subject: [PATCH 2012/2864] pelican-quickstart: switch to jinja2

- Use the jinja2 templating language for Makefile, fabfile,
  pelicanconf, publishconf, and develop-server.sh
- Add logic in pelican_quickstart.py
- Let jinja2 handle opening and reading template files
- Remove thus unused functions for string.Template
---
 pelican/tools/pelican_quickstart.py           |  67 ++++------
 .../{Makefile.in => Makefile.jinja2}          | 117 ++++++++++++------
 ..._server.sh.in => develop_server.sh.jinja2} |  77 ++++++------
 .../{fabfile.py.in => fabfile.py.jinja2}      |  22 +++-
 ...elicanconf.py.in => pelicanconf.py.jinja2} |  10 +-
 ...ublishconf.py.in => publishconf.py.jinja2} |   2 +-
 6 files changed, 170 insertions(+), 125 deletions(-)
 rename pelican/tools/templates/{Makefile.in => Makefile.jinja2} (56%)
 rename pelican/tools/templates/{develop_server.sh.in => develop_server.sh.jinja2} (51%)
 rename pelican/tools/templates/{fabfile.py.in => fabfile.py.jinja2} (83%)
 rename pelican/tools/templates/{pelicanconf.py.in => pelicanconf.py.jinja2} (84%)
 rename pelican/tools/templates/{publishconf.py.in => publishconf.py.jinja2} (95%)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index a03f52df..1d136a0a 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -6,9 +6,10 @@ import argparse
 import codecs
 import locale
 import os
-import string
 import sys
 
+from jinja2 import Environment, FileSystemLoader
+
 import pytz
 
 try:
@@ -30,6 +31,11 @@ else:
 
 _TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                               "templates")
+_jinja_env = Environment(
+    loader=FileSystemLoader(_TEMPLATES_DIR),
+    trim_blocks=True,
+)
+
 
 _GITHUB_PAGES_BRANCHES = {
     'personal': 'master',
@@ -99,20 +105,6 @@ def decoding_strings(f):
     return wrapper
 
 
-def get_template(name, as_encoding='utf-8'):
-    template = os.path.join(_TEMPLATES_DIR, "{0}.in".format(name))
-
-    if not os.path.isfile(template):
-        raise RuntimeError("Cannot open {0}".format(template))
-
-    with codecs.open(template, 'r', as_encoding) as fd:
-        line = fd.readline()
-        while line:
-            yield line
-            line = fd.readline()
-        fd.close()
-
-
 @decoding_strings
 def ask(question, answer=str_compat, default=None, length=None):
     if answer == str_compat:
@@ -273,6 +265,7 @@ needed by Pelican.
     if automation:
         if ask('Do you want to upload your website using FTP?',
                answer=bool, default=False):
+            CONF['ftp'] = True,
             CONF['ftp_host'] = ask('What is the hostname of your FTP server?',
                                    str_compat, CONF['ftp_host'])
             CONF['ftp_user'] = ask('What is your username on that server?',
@@ -282,6 +275,7 @@ needed by Pelican.
                                          str_compat, CONF['ftp_target_dir'])
         if ask('Do you want to upload your website using SSH?',
                answer=bool, default=False):
+            CONF['ssh'] = True,
             CONF['ssh_host'] = ask('What is the hostname of your SSH server?',
                                    str_compat, CONF['ssh_host'])
             CONF['ssh_port'] = ask('What is the port of your SSH server?',
@@ -294,16 +288,19 @@ needed by Pelican.
 
         if ask('Do you want to upload your website using Dropbox?',
                answer=bool, default=False):
+            CONF['dropbox'] = True,
             CONF['dropbox_dir'] = ask('Where is your Dropbox directory?',
                                       str_compat, CONF['dropbox_dir'])
 
         if ask('Do you want to upload your website using S3?',
                answer=bool, default=False):
+            CONF['s3'] = True,
             CONF['s3_bucket'] = ask('What is the name of your S3 bucket?',
                                     str_compat, CONF['s3_bucket'])
 
         if ask('Do you want to upload your website using '
                'Rackspace Cloud Files?', answer=bool, default=False):
+            CONF['cloudfiles'] = True,
             CONF['cloudfiles_username'] = ask('What is your Rackspace '
                                               'Cloud username?', str_compat,
                                               CONF['cloudfiles_username'])
@@ -317,6 +314,7 @@ needed by Pelican.
 
         if ask('Do you want to upload your website using GitHub Pages?',
                answer=bool, default=False):
+            CONF['github'] = True,
             if ask('Is this your personal page (username.github.io)?',
                    answer=bool, default=False):
                 CONF['github_pages_branch'] = \
@@ -342,9 +340,8 @@ needed by Pelican.
             for key, value in CONF.items():
                 conf_python[key] = repr(value)
 
-            for line in get_template('pelicanconf.py'):
-                template = string.Template(line)
-                fd.write(template.safe_substitute(conf_python))
+            _template = _jinja_env.get_template('pelicanconf.py.jinja2')
+            fd.write(_template.render(**conf_python))
             fd.close()
     except OSError as e:
         print('Error: {0}'.format(e))
@@ -352,9 +349,8 @@ needed by Pelican.
     try:
         with codecs.open(os.path.join(CONF['basedir'], 'publishconf.py'),
                          'w', 'utf-8') as fd:
-            for line in get_template('publishconf.py'):
-                template = string.Template(line)
-                fd.write(template.safe_substitute(CONF))
+            _template = _jinja_env.get_template('publishconf.py.jinja2')
+            fd.write(_template.render(**CONF))
             fd.close()
     except OSError as e:
         print('Error: {0}'.format(e))
@@ -363,25 +359,19 @@ needed by Pelican.
         try:
             with codecs.open(os.path.join(CONF['basedir'], 'fabfile.py'),
                              'w', 'utf-8') as fd:
-                for line in get_template('fabfile.py'):
-                    template = string.Template(line)
-                    fd.write(template.safe_substitute(CONF))
+                _template = _jinja_env.get_template('fabfile.py.jinja2')
+                fd.write(_template.render(**CONF))
                 fd.close()
         except OSError as e:
             print('Error: {0}'.format(e))
         try:
             with codecs.open(os.path.join(CONF['basedir'], 'Makefile'),
                              'w', 'utf-8') as fd:
-                mkfile_template_name = 'Makefile'
-                py_v = 'PY?=python'
+                py_v = 'python'
                 if six.PY3:
-                    py_v = 'PY?=python3'
-                template = string.Template(py_v)
-                fd.write(template.safe_substitute(CONF))
-                fd.write('\n')
-                for line in get_template(mkfile_template_name):
-                    template = string.Template(line)
-                    fd.write(template.safe_substitute(CONF))
+                    py_v = 'python3'
+                _template = _jinja_env.get_template('Makefile.jinja2')
+                fd.write(_template.render(py_v=py_v, **CONF))
                 fd.close()
         except OSError as e:
             print('Error: {0}'.format(e))
@@ -396,14 +386,11 @@ needed by Pelican.
             with codecs.open(os.path.join(CONF['basedir'],
                                           'develop_server.sh'),
                              'w', 'utf-8') as fd:
-                lines = list(get_template('develop_server.sh'))
-                py_v = 'PY=${PY:-python}\n'
+                py_v = '${PY:-python}'
                 if six.PY3:
-                    py_v = 'PY=${PY:-python3}\n'
-                lines = lines[:4] + [py_v] + lines[4:]
-                for line in lines:
-                    template = string.Template(line)
-                    fd.write(template.safe_substitute(conf_shell))
+                    py_v = '${PY:-python3}'
+                _template = _jinja_env.get_template('develop_server.sh.jinja2')
+                fd.write(_template.render(py_v=py_v, **conf_shell))
                 fd.close()
 
                 # mode 0o755
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.jinja2
similarity index 56%
rename from pelican/tools/templates/Makefile.in
rename to pelican/tools/templates/Makefile.jinja2
index 5dc81baa..42424cdd 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -1,30 +1,44 @@
-PELICAN?=$pelican
-PELICANOPTS=$pelicanopts
+PY?={{py_v}}
+PELICAN?={{pelican}}
+PELICANOPTS={{pelicanopts}}
 
-BASEDIR=$$(CURDIR)
-INPUTDIR=$$(BASEDIR)/content
-OUTPUTDIR=$$(BASEDIR)/output
-CONFFILE=$$(BASEDIR)/pelicanconf.py
-PUBLISHCONF=$$(BASEDIR)/publishconf.py
+BASEDIR=$(CURDIR)
+INPUTDIR=$(BASEDIR)/content
+OUTPUTDIR=$(BASEDIR)/output
+CONFFILE=$(BASEDIR)/pelicanconf.py
+PUBLISHCONF=$(BASEDIR)/publishconf.py
 
-FTP_HOST=$ftp_host
-FTP_USER=$ftp_user
-FTP_TARGET_DIR=$ftp_target_dir
+{% if ftp %}
+FTP_HOST={{ftp_host}}
+FTP_USER={{ftp_user}}
+FTP_TARGET_DIR={{ftp_target_dir}}
 
-SSH_HOST=$ssh_host
-SSH_PORT=$ssh_port
-SSH_USER=$ssh_user
-SSH_TARGET_DIR=$ssh_target_dir
+{% endif %}
+{% if ssh %}
+SSH_HOST={{ssh_host}}
+SSH_PORT={{ssh_port}}
+SSH_USER={{ssh_user}}
+SSH_TARGET_DIR={{ssh_target_dir}}
 
-S3_BUCKET=$s3_bucket
+{% endif %}
+{% if s3 %}
+S3_BUCKET={{s3_bucket}}
 
-CLOUDFILES_USERNAME=$cloudfiles_username
-CLOUDFILES_API_KEY=$cloudfiles_api_key
-CLOUDFILES_CONTAINER=$cloudfiles_container
+{% endif %}
+{% if cloudfiles %}
+CLOUDFILES_USERNAME={{cloudfiles_username}}
+CLOUDFILES_API_KEY={{cloudfiles_api_key}}
+CLOUDFILES_CONTAINER={{cloudfiles_container}}
 
-DROPBOX_DIR=$dropbox_dir
+{% endif %}
+{% if dropbox %}
+DROPBOX_DIR={{dropbox_dir}}
 
-GITHUB_PAGES_BRANCH=$github_pages_branch
+{% endif %}
+{% if github %}
+GITHUB_PAGES_BRANCH={{github_pages_branch}}
+
+{% endif %}
 
 DEBUG ?= 0
 ifeq ($(DEBUG), 1)
@@ -48,47 +62,59 @@ help:
 	@echo '   make serve-global [SERVER=0.0.0.0]  serve (as root) to $(SERVER):80    '
 	@echo '   make devserver [PORT=8000]          start/restart develop_server.sh    '
 	@echo '   make stopserver                     stop local server                  '
+{% if ssh %}
 	@echo '   make ssh_upload                     upload the web site via SSH        '
 	@echo '   make rsync_upload                   upload the web site via rsync+ssh  '
+{% endif %}
+{% if dropbox %}
 	@echo '   make dropbox_upload                 upload the web site via Dropbox    '
+{% endif %}
+{% if ftp %}
 	@echo '   make ftp_upload                     upload the web site via FTP        '
+{% endif %}
+{% if s3 %}
 	@echo '   make s3_upload                      upload the web site via S3         '
+{% endif %}
+{% if cloudfiles %}
 	@echo '   make cf_upload                      upload the web site via Cloud Files'
+{% endif %}
+{% if github %}
 	@echo '   make github                         upload the web site via gh-pages   '
+{% endif %}
 	@echo '                                                                          '
 	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html   '
 	@echo 'Set the RELATIVE variable to 1 to enable relative urls                    '
 	@echo '                                                                          '
 
 html:
-	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
+	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
 
 clean:
-	[ ! -d $$(OUTPUTDIR) ] || rm -rf $$(OUTPUTDIR)
+	[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
 
 regenerate:
-	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
+	$(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
 
 serve:
 ifdef PORT
-	cd $$(OUTPUTDIR) && $(PY) -m pelican.server $$(PORT)
+	cd $(OUTPUTDIR) && $(PY) -m pelican.server $(PORT)
 else
-	cd $$(OUTPUTDIR) && $(PY) -m pelican.server
+	cd $(OUTPUTDIR) && $(PY) -m pelican.server
 endif
 
 serve-global:
 ifdef SERVER
-	cd $$(OUTPUTDIR) && $(PY) -m pelican.server 80 $$(SERVER)
+	cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 $(SERVER)
 else
-	cd $$(OUTPUTDIR) && $(PY) -m pelican.server 80 0.0.0.0
+	cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 0.0.0.0
 endif
 
 
 devserver:
 ifdef PORT
-	$$(BASEDIR)/develop_server.sh restart $$(PORT)
+	$(BASEDIR)/develop_server.sh restart $(PORT)
 else
-	$$(BASEDIR)/develop_server.sh restart
+	$(BASEDIR)/develop_server.sh restart
 endif
 
 stopserver:
@@ -96,28 +122,49 @@ stopserver:
 	@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
 
 publish:
-	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(PUBLISHCONF) $$(PELICANOPTS)
+	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
 
+{% set upload = [] %}
+{% if ssh %}
+{% set upload = upload + ["ssh_upload"] %}
 ssh_upload: publish
-	scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
+	scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
+{%- set upload = upload + ["rsync_upload"] -%}
 rsync_upload: publish
 	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --cvs-exclude --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
+{% endif %}
+{% if dropbox %}
+{% set upload = upload + ["dropbox_upload"] %}
 dropbox_upload: publish
-	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
+	cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
 
+{% endif %}
+{% if ftp %}
+{% set upload = upload + ["ftp_upload"] %}
 ftp_upload: publish
-	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
+	lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit"
 
+{% endif %}
+{% if s3 %}
+{% set upload = upload + ["s3_upload"] %}
 s3_upload: publish
 	aws s3 sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl public-read --delete
 
+{% endif %}
+{% if cloudfiles %}
+{% set upload = upload + ["cf_upload"] %}
 cf_upload: publish
 	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
 
+{% endif %}
+{% if github %}
+{% set upload = upload + ["github"] %}
 github: publish
-	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $$(OUTPUTDIR)
+	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $(OUTPUTDIR)
 	git push origin $(GITHUB_PAGES_BRANCH)
 
-.PHONY: html help clean regenerate serve serve-global devserver stopserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
+{% endif %}
+
+.PHONY: html help clean regenerate serve serve-global devserver stopserver publish {{ upload|join(" ") }}
diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.jinja2
similarity index 51%
rename from pelican/tools/templates/develop_server.sh.in
rename to pelican/tools/templates/develop_server.sh.jinja2
index e345fefd..b8f6c029 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.jinja2
@@ -2,23 +2,24 @@
 ##
 # This section should match your Makefile
 ##
-PELICAN=$${PELICAN:-$pelican}
-PELICANOPTS=$pelicanopts
+PY={{py_v}}
+PELICAN=${PELICAN:-pelican}
+PELICANOPTS={{pelicanopts}}
 
-BASEDIR=$$(pwd)
-INPUTDIR=$$BASEDIR/content
-OUTPUTDIR=$$BASEDIR/output
-CONFFILE=$$BASEDIR/pelicanconf.py
+BASEDIR=$(pwd)
+INPUTDIR=$BASEDIR/content
+OUTPUTDIR=$BASEDIR/output
+CONFFILE=$BASEDIR/pelicanconf.py
 
 ###
 # Don't change stuff below here unless you are sure
 ###
 
-SRV_PID=$$BASEDIR/srv.pid
-PELICAN_PID=$$BASEDIR/pelican.pid
+SRV_PID=$BASEDIR/srv.pid
+PELICAN_PID=$BASEDIR/pelican.pid
 
 function usage(){
-  echo "usage: $$0 (stop) (start) (restart) [port]"
+  echo "usage: $0 (stop) (start) (restart) [port]"
   echo "This starts Pelican in debug and reload mode and then launches"
   echo "an HTTP server to help site development. It doesn't read"
   echo "your Pelican settings, so if you edit any paths in your Makefile"
@@ -27,55 +28,55 @@ function usage(){
 }
 
 function alive() {
-  kill -0 $$1 >/dev/null 2>&1
+  kill -0 $1 >/dev/null 2>&1
 }
 
 function shut_down(){
-  PID=$$(cat $$SRV_PID)
-  if [[ $$? -eq 0 ]]; then
+  PID=$(cat $SRV_PID)
+  if [[ $? -eq 0 ]]; then
     if alive $PID; then
       echo "Stopping HTTP server"
-      kill $$PID
+      kill $PID
     else
       echo "Stale PID, deleting"
     fi
-    rm $$SRV_PID
+    rm $SRV_PID
   else
     echo "HTTP server PIDFile not found"
   fi
 
-  PID=$$(cat $$PELICAN_PID)
-  if [[ $$? -eq 0 ]]; then
-    if alive $$PID; then
+  PID=$(cat $PELICAN_PID)
+  if [[ $? -eq 0 ]]; then
+    if alive $PID; then
       echo "Killing Pelican"
-      kill $$PID
+      kill $PID
     else
       echo "Stale PID, deleting"
     fi
-    rm $$PELICAN_PID
+    rm $PELICAN_PID
   else
     echo "Pelican PIDFile not found"
   fi
 }
 
 function start_up(){
-  local port=$$1
+  local port=$1
   echo "Starting up Pelican and HTTP server"
   shift
-  $$PELICAN --debug --autoreload -r $$INPUTDIR -o $$OUTPUTDIR -s $$CONFFILE $$PELICANOPTS &
-  pelican_pid=$$!
-  echo $$pelican_pid > $$PELICAN_PID
-  mkdir -p $$OUTPUTDIR && cd $$OUTPUTDIR
-  $PY -m pelican.server $$port &
-  srv_pid=$$!
-  echo $$srv_pid > $$SRV_PID
-  cd $$BASEDIR
+  $PELICAN --debug --autoreload -r $INPUTDIR -o $OUTPUTDIR -s $CONFFILE $PELICANOPTS &
+  pelican_pid=$!
+  echo $pelican_pid > $PELICAN_PID
+  mkdir -p $OUTPUTDIR && cd $OUTPUTDIR
+  $PY -m pelican.server $port &
+  srv_pid=$!
+  echo $srv_pid > $SRV_PID
+  cd $BASEDIR
   sleep 1
-  if ! alive $$pelican_pid ; then
+  if ! alive $pelican_pid ; then
     echo "Pelican didn't start. Is the Pelican package installed?"
     return 1
-  elif ! alive $$srv_pid ; then
-    echo "The HTTP server didn't start. Is there another service using port" $$port "?"
+  elif ! alive $srv_pid ; then
+    echo "The HTTP server didn't start. Is there another service using port" $port "?"
     return 1
   fi
   echo 'Pelican and HTTP server processes now running in background.'
@@ -84,17 +85,17 @@ function start_up(){
 ###
 #  MAIN
 ###
-[[ ($$# -eq 0) || ($$# -gt 2) ]] && usage
+[[ ($# -eq 0) || ($# -gt 2) ]] && usage
 port=''
-[[ $$# -eq 2 ]] && port=$$2
+[[ $# -eq 2 ]] && port=$2
 
-if [[ $$1 == "stop" ]]; then
+if [[ $1 == "stop" ]]; then
   shut_down
-elif [[ $$1 == "restart" ]]; then
+elif [[ $1 == "restart" ]]; then
   shut_down
-  start_up $$port
-elif [[ $$1 == "start" ]]; then
-  if ! start_up $$port; then
+  start_up $port
+elif [[ $1 == "start" ]]; then
+  if ! start_up $port; then
     shut_down
   fi
 else
diff --git a/pelican/tools/templates/fabfile.py.in b/pelican/tools/templates/fabfile.py.jinja2
similarity index 83%
rename from pelican/tools/templates/fabfile.py.in
rename to pelican/tools/templates/fabfile.py.jinja2
index d3c50a83..eda60c42 100644
--- a/pelican/tools/templates/fabfile.py.in
+++ b/pelican/tools/templates/fabfile.py.jinja2
@@ -14,17 +14,23 @@ from pelican.server import ComplexHTTPRequestHandler
 env.deploy_path = 'output'
 DEPLOY_PATH = env.deploy_path
 
+{% if ssh %}
 # Remote server configuration
-production = '$ssh_user@$ssh_host:$ssh_port'
-dest_path = '$ssh_target_dir'
+production = '{{ssh_user}}@{{ssh_host}}:{{ssh_port}}'
+dest_path = '{{ssh_target_dir}}'
 
+{% endif %}
+{% if cloudfiles %}
 # Rackspace Cloud Files configuration settings
-env.cloudfiles_username = '$cloudfiles_username'
-env.cloudfiles_api_key = '$cloudfiles_api_key'
-env.cloudfiles_container = '$cloudfiles_container'
+env.cloudfiles_username = '{{cloudfiles_username}}'
+env.cloudfiles_api_key = '{{cloudfiles_api_key}}'
+env.cloudfiles_container = '{{cloudfiles_container}}'
 
+{% endif %}
+{% if github %}
 # Github Pages configuration
-env.github_pages_branch = "$github_pages_branch"
+env.github_pages_branch = '{{github_pages_branch}}'
+{% endif %}
 
 # Port for `serve`
 PORT = 8000
@@ -68,6 +74,7 @@ def preview():
     """Build production version of site"""
     local('pelican -s publishconf.py')
 
+{% if cloudfiles %}
 def cf_upload():
     """Publish to Rackspace Cloud Files"""
     rebuild()
@@ -76,6 +83,7 @@ def cf_upload():
               '-U {cloudfiles_username} '
               '-K {cloudfiles_api_key} '
               'upload -c {cloudfiles_container} .'.format(**env))
+{% endif %}
 
 @hosts(production)
 def publish():
@@ -89,7 +97,9 @@ def publish():
         extra_opts='-c',
     )
 
+{% if github %}
 def gh_pages():
     """Publish to GitHub Pages"""
     rebuild()
     local("ghp-import -b {github_pages_branch} {deploy_path} -p".format(**env))
+{% endif %}
diff --git a/pelican/tools/templates/pelicanconf.py.in b/pelican/tools/templates/pelicanconf.py.jinja2
similarity index 84%
rename from pelican/tools/templates/pelicanconf.py.in
rename to pelican/tools/templates/pelicanconf.py.jinja2
index 05d1a323..79f26a01 100644
--- a/pelican/tools/templates/pelicanconf.py.in
+++ b/pelican/tools/templates/pelicanconf.py.jinja2
@@ -2,15 +2,15 @@
 # -*- coding: utf-8 -*- #
 from __future__ import unicode_literals
 
-AUTHOR = $author
-SITENAME = $sitename
+AUTHOR = {{author}}
+SITENAME = {{sitename}}
 SITEURL = ''
 
 PATH = 'content'
 
-TIMEZONE = $timezone
+TIMEZONE = {{timezone}}
 
-DEFAULT_LANG = $lang
+DEFAULT_LANG = {{lang}}
 
 # Feed generation is usually not desired when developing
 FEED_ALL_ATOM = None
@@ -29,7 +29,7 @@ LINKS = (('Pelican', 'http://getpelican.com/'),
 SOCIAL = (('You can add links in your config file', '#'),
           ('Another social link', '#'),)
 
-DEFAULT_PAGINATION = $default_pagination
+DEFAULT_PAGINATION = {{default_pagination}}
 
 # Uncomment following line if you want document-relative URLs when developing
 #RELATIVE_URLS = True
diff --git a/pelican/tools/templates/publishconf.py.in b/pelican/tools/templates/publishconf.py.jinja2
similarity index 95%
rename from pelican/tools/templates/publishconf.py.in
rename to pelican/tools/templates/publishconf.py.jinja2
index 473490a9..4b9a7cba 100755
--- a/pelican/tools/templates/publishconf.py.in
+++ b/pelican/tools/templates/publishconf.py.jinja2
@@ -11,7 +11,7 @@ sys.path.append(os.curdir)
 from pelicanconf import *
 
 # If your site is available via HTTPS, make sure SITEURL begins with https://
-SITEURL = '$siteurl'
+SITEURL = '{{siteurl}}'
 RELATIVE_URLS = False
 
 FEED_ALL_ATOM = 'feeds/all.atom.xml'

From 69bd9e01b66e86a38de5b1ca5982a4779ab5c40d Mon Sep 17 00:00:00 2001
From: ix5 <ix5@users.noreply.github.com>
Date: Sun, 10 Dec 2017 07:17:51 +0100
Subject: [PATCH 2013/2864] Fix documentation for *_SAVE_AS in themes.rst:
 Update to current defaults

---
 docs/themes.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 3978e693..98d11bd3 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -154,8 +154,8 @@ author.html
 
 This template will be processed for each of the existing authors, with
 output generated according to the ``AUTHOR_SAVE_AS`` setting (`Default:`
-``author/{author_name}.html``). If pagination is active, subsequent pages will by
-default reside at ``author/{author_name}{number}.html``.
+``author/{slug}.html``). If pagination is active, subsequent pages will by
+default reside at ``author/{slug}{number}.html``.
 
 ======================  ===================================================
 Variable                Description
@@ -188,8 +188,8 @@ category.html
 
 This template will be processed for each of the existing categories, with
 output generated according to the ``CATEGORY_SAVE_AS`` setting (`Default:`
-``category/{category_name}.html``). If pagination is active, subsequent pages will by
-default reside at ``category/{category_name}{number}.html``.
+``category/{slug}.html``). If pagination is active, subsequent pages will by
+default reside at ``category/{slug}{number}.html``.
 
 ======================  ===================================================
 Variable                Description
@@ -222,7 +222,7 @@ article.html
 
 This template will be processed for each article, with
 output generated according to the ``ARTICLE_SAVE_AS`` setting (`Default:`
-``{article_name}.html``). The following variables are available when
+``{slug}.html``). The following variables are available when
 rendering.
 
 =============   ===================================================
@@ -263,7 +263,7 @@ page.html
 
 This template will be processed for each page, with
 output generated according to the ``PAGE_SAVE_AS`` setting (`Default:`
-``pages/{page_name}.html``). The following variables are available when
+``pages/{slug}.html``). The following variables are available when
 rendering.
 
 =============   ===================================================
@@ -279,8 +279,8 @@ tag.html
 
 This template will be processed for each tag, with
 output generated according to the ``TAG_SAVE_AS`` setting (`Default:`
-``tag/{tag_name}.html``). If pagination is active, subsequent pages will by
-default reside at ``tag/{tag_name}{number}.html``.
+``tag/{slug}.html``). If pagination is active, subsequent pages will by
+default reside at ``tag/{slug}{number}.html``.
 
 ======================  ===================================================
 Variable                Description

From f5cc21df0ef2cf0deed01ffa630de8c65512e027 Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Tue, 15 Aug 2017 16:26:03 +0200
Subject: [PATCH 2014/2864] Adding --logs-deduping-min-level CLI option

---
 pelican/__init__.py | 11 +++++++++--
 pelican/log.py      |  9 +++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index ab07efcf..942f07ed 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -14,7 +14,7 @@ import six
 
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
-from pelican.log import init
+from pelican.log import init as init_logging
 from pelican import signals  # noqa
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 SourceFileGenerator, StaticGenerator,
@@ -327,6 +327,11 @@ def parse_arguments():
                         help=('Exit the program with non-zero status if any '
                               'errors/warnings encountered.'))
 
+    parser.add_argument('--logs-dedup-min-level', default='WARNING',
+                        choices=('DEBUG', 'INFO', 'WARNING', 'ERROR'),
+                        help=('Only enable log de-duplication for levels equal'
+                              ' to or above the specified value'))
+
     return parser.parse_args()
 
 
@@ -384,7 +389,9 @@ def get_instance(args):
 
 def main():
     args = parse_arguments()
-    init(args.verbosity, args.fatal)
+    logs_dedup_min_level = getattr(logging, args.logs_dedup_min_level)
+    init_logging(args.verbosity, args.fatal,
+                 logs_dedup_min_level=logs_dedup_min_level)
 
     logger.debug('Pelican version: %s', __version__)
     logger.debug('Python version: %s', sys.version.split()[0])
diff --git a/pelican/log.py b/pelican/log.py
index 70e069d3..345f79d0 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -91,6 +91,8 @@ class LimitFilter(logging.Filter):
     E.g.: log.warning(('43 is not the answer', 'More erroneous answers'))
     """
 
+    LOGS_DEDUP_MIN_LEVEL = logging.WARNING
+
     _ignore = set()
     _raised_messages = set()
     _threshold = 5
@@ -98,7 +100,7 @@ class LimitFilter(logging.Filter):
 
     def filter(self, record):
         # don't limit log messages for anything above "warning"
-        if record.levelno > logging.WARN:
+        if record.levelno > self.LOGS_DEDUP_MIN_LEVEL:
             return True
 
         # extract group
@@ -226,7 +228,8 @@ def get_formatter():
         return TextFormatter()
 
 
-def init(level=None, fatal='', handler=logging.StreamHandler(), name=None):
+def init(level=None, fatal='', handler=logging.StreamHandler(), name=None,
+         logs_dedup_min_level=None):
     FatalLogger.warnings_fatal = fatal.startswith('warning')
     FatalLogger.errors_fatal = bool(fatal)
 
@@ -237,6 +240,8 @@ def init(level=None, fatal='', handler=logging.StreamHandler(), name=None):
 
     if level:
         logger.setLevel(level)
+    if logs_dedup_min_level:
+        LimitFilter.LOGS_DEDUP_MIN_LEVEL = logs_dedup_min_level
 
 
 def log_warnings():

From 4f969660203c501a3455f0ac283361f1bf3c658e Mon Sep 17 00:00:00 2001
From: Ben Ward <Ben.Ward@softwire.com>
Date: Mon, 18 Dec 2017 11:39:57 +0000
Subject: [PATCH 2015/2864] Remove redundancy from publish docs. Fixes #2233.

---
 docs/publish.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/publish.rst b/docs/publish.rst
index 303797c9..a9b0ec39 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -25,8 +25,8 @@ argument, like so::
     pelican --write-selected output/posts/my-post-title.html
 
 Note that you must specify the path to the generated *output* file — not the
-source content. To determine the output file path, use the ``--debug`` flag to
-determine the correct file name and location. If desired, ``--write-selected``
+source content. To determine the output file name and location, use the
+``--debug`` flag. If desired, ``--write-selected``
 can take a comma-separated list of paths or can be configured as a setting.
 (See: :ref:`writing_only_selected_content`)
 

From 0dc175434f6f7348cea078cccb3fa7961e2bca90 Mon Sep 17 00:00:00 2001
From: Peter Dave Hello <hsu@peterdavehello.org>
Date: Mon, 25 Dec 2017 01:43:34 +0800
Subject: [PATCH 2016/2864] Optimize PNG images losslessly using Google
 zopflipng

---
 docs/_static/overall.png                      | Bin 15732 -> 5030 bytes
 .../basic/theme/images/icons/aboutme.png      | Bin 751 -> 411 bytes
 .../basic/theme/images/icons/bitbucket.png    | Bin 3714 -> 3178 bytes
 .../basic/theme/images/icons/delicious.png    | Bin 958 -> 827 bytes
 .../basic/theme/images/icons/facebook.png     | Bin 202 -> 150 bytes
 .../basic/theme/images/icons/github.png       | Bin 1714 -> 606 bytes
 .../basic/theme/images/icons/gitorious.png    | Bin 227 -> 223 bytes
 .../basic/theme/images/icons/gittip.png       | Bin 487 -> 402 bytes
 .../theme/images/icons/google-groups.png      | Bin 803 -> 420 bytes
 .../basic/theme/images/icons/google-plus.png  | Bin 527 -> 511 bytes
 .../basic/theme/images/icons/hackernews.png   | Bin 3273 -> 2771 bytes
 .../basic/theme/images/icons/lastfm.png       | Bin 975 -> 840 bytes
 .../basic/theme/images/icons/linkedin.png     | Bin 896 -> 625 bytes
 .../basic/theme/images/icons/reddit.png       | Bin 693 -> 458 bytes
 .../output/basic/theme/images/icons/rss.png   | Bin 879 -> 751 bytes
 .../basic/theme/images/icons/slideshare.png   | Bin 535 -> 435 bytes
 .../basic/theme/images/icons/speakerdeck.png  | Bin 1049 -> 580 bytes
 .../theme/images/icons/stackoverflow.png      | Bin 916 -> 414 bytes
 .../basic/theme/images/icons/twitter.png      | Bin 1509 -> 416 bytes
 .../output/basic/theme/images/icons/vimeo.png | Bin 544 -> 349 bytes
 .../basic/theme/images/icons/youtube.png      | Bin 458 -> 316 bytes
 .../custom/theme/images/icons/aboutme.png     | Bin 751 -> 411 bytes
 .../custom/theme/images/icons/bitbucket.png   | Bin 3714 -> 3178 bytes
 .../custom/theme/images/icons/delicious.png   | Bin 958 -> 827 bytes
 .../custom/theme/images/icons/facebook.png    | Bin 202 -> 150 bytes
 .../custom/theme/images/icons/github.png      | Bin 1714 -> 606 bytes
 .../custom/theme/images/icons/gitorious.png   | Bin 227 -> 223 bytes
 .../custom/theme/images/icons/gittip.png      | Bin 487 -> 402 bytes
 .../theme/images/icons/google-groups.png      | Bin 803 -> 420 bytes
 .../custom/theme/images/icons/google-plus.png | Bin 527 -> 511 bytes
 .../custom/theme/images/icons/hackernews.png  | Bin 3273 -> 2771 bytes
 .../custom/theme/images/icons/lastfm.png      | Bin 975 -> 840 bytes
 .../custom/theme/images/icons/linkedin.png    | Bin 896 -> 625 bytes
 .../custom/theme/images/icons/reddit.png      | Bin 693 -> 458 bytes
 .../output/custom/theme/images/icons/rss.png  | Bin 879 -> 751 bytes
 .../custom/theme/images/icons/slideshare.png  | Bin 535 -> 435 bytes
 .../custom/theme/images/icons/speakerdeck.png | Bin 1049 -> 580 bytes
 .../theme/images/icons/stackoverflow.png      | Bin 916 -> 414 bytes
 .../custom/theme/images/icons/twitter.png     | Bin 1509 -> 416 bytes
 .../custom/theme/images/icons/vimeo.png       | Bin 544 -> 349 bytes
 .../custom/theme/images/icons/youtube.png     | Bin 458 -> 316 bytes
 .../theme/images/icons/aboutme.png            | Bin 751 -> 411 bytes
 .../theme/images/icons/bitbucket.png          | Bin 3714 -> 3178 bytes
 .../theme/images/icons/delicious.png          | Bin 958 -> 827 bytes
 .../theme/images/icons/facebook.png           | Bin 202 -> 150 bytes
 .../theme/images/icons/github.png             | Bin 1714 -> 606 bytes
 .../theme/images/icons/gitorious.png          | Bin 227 -> 223 bytes
 .../theme/images/icons/gittip.png             | Bin 487 -> 402 bytes
 .../theme/images/icons/google-groups.png      | Bin 803 -> 420 bytes
 .../theme/images/icons/google-plus.png        | Bin 527 -> 511 bytes
 .../theme/images/icons/hackernews.png         | Bin 3273 -> 2771 bytes
 .../theme/images/icons/lastfm.png             | Bin 975 -> 840 bytes
 .../theme/images/icons/linkedin.png           | Bin 896 -> 625 bytes
 .../theme/images/icons/reddit.png             | Bin 693 -> 458 bytes
 .../custom_locale/theme/images/icons/rss.png  | Bin 879 -> 751 bytes
 .../theme/images/icons/slideshare.png         | Bin 535 -> 435 bytes
 .../theme/images/icons/speakerdeck.png        | Bin 1049 -> 580 bytes
 .../theme/images/icons/stackoverflow.png      | Bin 916 -> 414 bytes
 .../theme/images/icons/twitter.png            | Bin 1509 -> 416 bytes
 .../theme/images/icons/vimeo.png              | Bin 544 -> 349 bytes
 .../theme/images/icons/youtube.png            | Bin 458 -> 316 bytes
 .../notmyidea/static/images/icons/aboutme.png | Bin 751 -> 411 bytes
 .../static/images/icons/bitbucket.png         | Bin 3714 -> 3178 bytes
 .../static/images/icons/delicious.png         | Bin 958 -> 827 bytes
 .../static/images/icons/facebook.png          | Bin 202 -> 150 bytes
 .../notmyidea/static/images/icons/github.png  | Bin 1714 -> 606 bytes
 .../static/images/icons/gitorious.png         | Bin 227 -> 223 bytes
 .../notmyidea/static/images/icons/gittip.png  | Bin 487 -> 402 bytes
 .../static/images/icons/google-groups.png     | Bin 803 -> 420 bytes
 .../static/images/icons/google-plus.png       | Bin 527 -> 511 bytes
 .../static/images/icons/hackernews.png        | Bin 3273 -> 2771 bytes
 .../notmyidea/static/images/icons/lastfm.png  | Bin 975 -> 840 bytes
 .../static/images/icons/linkedin.png          | Bin 896 -> 625 bytes
 .../notmyidea/static/images/icons/reddit.png  | Bin 693 -> 458 bytes
 .../notmyidea/static/images/icons/rss.png     | Bin 879 -> 751 bytes
 .../static/images/icons/slideshare.png        | Bin 535 -> 435 bytes
 .../static/images/icons/speakerdeck.png       | Bin 1049 -> 580 bytes
 .../static/images/icons/stackoverflow.png     | Bin 916 -> 414 bytes
 .../notmyidea/static/images/icons/twitter.png | Bin 1509 -> 416 bytes
 .../notmyidea/static/images/icons/vimeo.png   | Bin 544 -> 349 bytes
 .../notmyidea/static/images/icons/youtube.png | Bin 458 -> 316 bytes
 81 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/_static/overall.png b/docs/_static/overall.png
index 1240a1483242a258a01c26c0b16ca1573211ffe2..d70641f0c85a80efdc96f87aec5990260fa0565d 100644
GIT binary patch
literal 5030
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

literal 15732
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
L`?McY%>(`i!C#^4

diff --git a/pelican/tests/output/basic/theme/images/icons/aboutme.png b/pelican/tests/output/basic/theme/images/icons/aboutme.png
index 9609df3bd9d766cd4b827fb0a8339b700c1abf24..600110f2f63811ebea40af1b943fded0275b6a39 100644
GIT binary patch
delta 396
zcmV;70dxNE1)Bqq8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30003{Nkl<Zcma))
zHG>sF5C*?}?*0<o-QC?a!QF|F2zQ9_m|sE!DIOBy&biKXU(d|BZmm^Nz3u@>E;|N)
z)V_EYN-jDO9X%Hg?sQ-_!UBObw4%BSi9<}9RTCVhaC-wFDSt63Q`c8<W39w8ps2ag
zMG%-w$|ePCXf1(Bn;QU#%K%YBwbV8xCvJdA%M3R+ffOtf+big%np@9dNnKl7bMK`{
z^5T5hyRCch0YKv1BzFZwW^74pIM1(Vr#GBStv@RgUv)aQ`m{)F@j<g+xHq|YzY~c=
z_B71^RMl^erhg#R{!@{J69Dy3KSD581)`3(r2l>K$|J3OMSiddRs94I-RZ%BpPVQl
zG-*wE)^@pKur#bMkyS)ii4hvVB0PPwtX?$Lk2sgu3yxdrMHBD`H`aw%Ysl&kiS1h=
q1)tbo!~Ye`fCpjdO!(yU+ZHs&^bQiZ<l_JU002ovP6b4+LSTYh2B}p5

literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Ta>O
z6XFU~z-^brZ51PwI9(_Kh^7g}PZf%vA`~}SFm|F~be~{E7r$Q>mqnyt>;%CWAnF&0
z>J^CU7KrHN4{PNQZsheU=5fy8Gz;Yisssv#ckqX`@rAbXg*5X8HSz`4@%dHr`jqpy
z=5RZtaF_)12GsKU*YNsP@%UEo0L8sad4MK(6mq-eal2-7IizygC9)g&bNiP6KWohG
zS-|Cz#pRUFX_v@p6U%1c!{t%H>ygjnp2z8w&f}cUVI9k18Od!O&8Fwc>5|Q96~*D0
z#%UhPVH?k3;LWPz#^I34reVi!8_%X{#by@DrewmR<-%&@&nzOxqVB+|@6E{0!>ne@
zqU+A2Y{jhQ!lY=<q~X9QZ^Ec*%OGo*Ey1r33?s&pAirP+hi5m^fE>;OkH}&m?E%Ja
zC$sH<jJ=*Njv*44Lr+}~IuyX*dNEnZE1;`^i>aw(BO9N_QK10Mpk${dC;$Iv-Sgs1
z>}GlM0tE(@$Z4WS9~SJov+DT=kEZa@(E0WcEcx0FsV`5Db6NC!V}woNM4#AY#y4|V
zcGfJc2;H@B=ic4*7ff{9i&|5ruCcY7__a#1S1tN{P32SRuV!D_tlt0mk+S{xzkezF
zn-7Y&EBC3-DcWUz;LL;X@g_ZzKBs5>H{b4a!=6dHduc-B)u;`Jo`r8<+{W~Vq2`0N
zaE8$A3qX&kmbgZgq$HN4S|t~y0x1R~14Cn717lr7(-1=oD?>9YBLiInb1MS_`T5Fb
hC>nC}Q!>*kF*O*PK{PbaT?tCT44$rjF6*2UngApI;B){0

diff --git a/pelican/tests/output/basic/theme/images/icons/bitbucket.png b/pelican/tests/output/basic/theme/images/icons/bitbucket.png
index d05ba1610eab6ec3f9a4dcae689d4d88bda5433f..277a7dfb931349c3fc0d905c8225f7d08677025d 100644
GIT binary patch
delta 517
zcmV+g0{Z=e9qJgca0-6`<Vi$9RCobhlGEB8VGx9KW6RjKZD$qRwrx8Z|F&)0w%#@R
zse>*Jzj349X=?9_$gI2kIcwdunCZt<z;fkFc0^`9mM`WkG`96!{+zSmOyt_DF(=<-
zJouCUN-2J&l-&Q5f8ure>MPOnPe)w(oZZmY=P7Ks9%FQb&pCe?mRi(2I5a#OFhj#5
zX~ivAMte9hPvOw>RNVnVZxJRqq-7T(x806E@F;ozqonP3;+J2Doam6S2oUoW{v}rH
zEt0_^xDCBk=7xX;iioANNJ3Jzr;t_FYP1Ua15N{&ZKC~Y3NYIwcN)uN6>`ekJOw_&
z%wsAlFxlka@l}7tH66vZ9lzo$O>|s30b-uQ;Lym1>#=%^$O9}pA6eh#>;o1kA{GH+
zo&t01Rhr(a;LSXymDhJ&`<4S(pomxmi1`b@;wn*jb-hL2buS^av=!{Un*as8J%OMC
z-&;+q-S;qg>R|<&CSZZ?dzgepAgIvZJ#gcDZc;&0X<dD1dPz%URy{~7X@MpcG~fQ2
z-_<)9RNx1%y&7$@E1Pe|UHh8zS}g%AP(%(@=pC5zAF>RNaGgcuWqg1lVi5=}@L!f*
zh|*gn_umC9(52_2umTJIY3=O)msGvyLDH<_8eoAU24=<p$6qd8X#l}k00000NkvXX
Hu0mjf>frk{

delta 1058
zcmaDQ(ImT}fUBN?v%n*=n1O*?7=#%aX3ddcU|`J442dX-@b$4u&d=3LOvz75)vL%Y
zU;qJ|3M(KpH?<^Dp&~aYuh^=>Rtc=a3djZt>nkaMm6T-LDn<APC^+XAr7D={ndliP
z*>Nc-DA*LGq*(>IxPi6T7h3_jwn`Z#B?VUc`sL;2dgaD?`9<mahL)C=`UXb&Mn<|o
z6}rWhc_oPzx_QOQ5K~|Vxug~+7iAWdWaj57fDBGd$}cUkRZ;@k1P2g@rX<7dDJU(<
z0ozialB}PalbV~FS5mBRsAs4THyx<iCMDUbxHKs%HMs=ra=3Y5FE}Np>mv!<=wqt3
z(FZvR$%&8v0E+@cz>dqNULPKuc3e;Gc^w%Tm~uT`978ljU4zbN3p<L;yLq!@v*+Zy
z6Xb6%vEPz4`P!C%3)4D+T)5;!_~oiUs#I*|nD>=G;NWZ}Ih%?t6(5u;E;TO<5nP=a
ztTM%H$q}{E*=8@*Zr=SkJLlp<!_W83@6Z1JZ1%!A#h0YNy6xUjpQ<OG-TKz;>Xrt{
zUG~<C&Mrw#ci)l`@i9Y$bL-!4tNEAKY?KSSx#D8}3$FwE!cMcpw*NY=70S=wKj%)x
zmur7s?pW5*a@*hj|EjXmsrC^wX4$Mf?emH6@S7cfjxYQ9;cNM3*Yi9-;_mEim>dwL
zJB|NaPSO9T*IV9QZ?0u@eby3PFMHhP%^$P1+uklJbmni?5z<Q)o?mxOqtJTW?!C9Q
zuHP2=%ve5GuUyuPQ?(^HGtY=IAVj{8T}A8Mfi{;;pSyP=IMjmc&OBq1>0@^k6J=A%
z^7#7JeD{gOp1Zp(?F?nyz8%f^bMn%z$2%T;S#4Ls?H+QWsn*R!b&Au26qlJNkJO9J
zU$0{qJ@f35$%6X><^~BkG;3>}=;3p_+UwO_@cY4uW3uag_!-)p1^5>7uv~Z`r(IE}
zqg9~wcKe*;-mO1hs=T>4o5{&b^4%LjmgCi#Fa8#8{gt<K)3#JI>j_)F|Cz$}`^Axt
zvf8qOyi*ARN3uD+FK-GrKihg*ebK{`#aCMy>v>pfq7H=TmwbA?^`?)G#=QOI>^h9C
zwc2m@o(;dW^1+V)i+jQ;*SB0d-P`L`d?nz0j5IT^vr1>H=S;`7Te2TNUpsZST*u5}
z_eoPrwBCGWe)50&&WX}qFMFI~uD8V)Sa1YO9lo|-xljM?(I1vSlivQFKKIf&#tFeE
mFI+7?8KbsL>U+2Nhhy>AKQfj$R9TdPGPtL!pUXO@geCyhYq*dA

diff --git a/pelican/tests/output/basic/theme/images/icons/delicious.png b/pelican/tests/output/basic/theme/images/icons/delicious.png
index 3dccdd848ec99fba9950e8195d4e73867ada2738..34868c5c69979ebabe19d9808e1d20298c196f19 100644
GIT binary patch
delta 805
zcmV+=1KRw)2fGH4BYy(|Nkl<ZcmZ9E1FR)i0EWLgbMCykbA9(&>)pJqZACTW#!hM@
zD5IKDqq;%eMz!tbv+awqP8IHt=!XVSsZ`n>$2lgOwFdh8dv^BsZ><jO?rgQ?6?v<8
z&iuym=Ei)j$E*iAt2@8G+HYpo%Ugc?1M&LD+NGCX^~Sz^1Ao`_Z|$>=Ip!D&d6U-G
zE$rB_o9_?6^DjYr6*f0vYEJRT0S#~1<Jc26x$D+9E|smVJFk86$wvi8gOJ5}!NR;G
zbO8abtC2~YMBOGMYjr;O&~L~nN@qcB1%L>p0CY6X#gICFT%hKF?ZEuBN0h9f8yQT!
zsfw-V%t*t~0DlFfB#8n**8x)US;gXFOq?h-R$_?f$re2#SK`*QT6;%nx2#rMTo9yb
z2xw>;Kmt_J(kbSTxCo<!Raiz8T}Tv}jKB*r96Tg0m&IbH0U(6Q(O6tsfJQH=(6F06
zsC5V}z=D$UdppKHm#eF*hxhOQ`HWi4XJllC!6OH;?SGKb!Ou82aS_>V&vDGII@Q*0
ztXze>Y0y?EvpD;f$Qf_V$}hk8F8}sB-x3Bo_4+d40s#=w-C5?RuLQfc7J&pP0SeH0
z=IH~*E3ZyeWWLaKa;n<#{6&()M^FJ08g`RoPAL2{P5>Q<fDn~}CUlmTCHwae*`mL1
z$J=on(0^zwfl5$XO00aq!?ra*2Oy6Bcd7s&4E&Wd&NypYm|1Hm3>yT#OOnPY6%hC_
zU@<y8#LDs{0H6TSga8x@YCr${)rQ!*wKo?89#Tq_O8z?l9jLHYi?Evx08*MrX&^KM
z(5TmH)$6an!IIO{lVPDyA_&(p1bE&GN#X#@5PzF^fdatyZ4ASp(eP;6E`Aucc6GP+
z$gNxV9RBUMIRe*4mmX*yEiD2=&muFe-2cD}YS)f#dvt78q^aEW{a}1*>bFLvVlF-W
z@V)cWvaGQajvILP(n~H#fBxyi-<DQ}R?j&7qFTLShX0gXq;NO3@95sl7s~p(?|xa|
jzaIac5CCBBo@4kMSJ`#kmsvc!00000NkvXXu0mjf5RH*c

delta 937
zcmV;a16KUI2EGT7BYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH0~bj|K~y*q1;M><8+9DO;eXHl?&phr@k{KwZtJ8r
zq)AI+DoYGRC_<<k5ePBzFO-D^2^NsLF%$$$Y%Fv@g-Uco0>Oerq^Ob`+NMdMNmJK}
z)5LG*d-L6Wc^(6xSS(h?<8dRCv6pJK*-N!ry|lD=zU=6Cvvz*9eR|Y8ZTDx>gJ9aO
zW>1c5>D0;0nSYIYs2_ec*4Ey;wY<Faeyx7dZZsO?vT4fYGtAE~^4ER%_Is$5px1-F
zXTrVv2Hs<jSDQUP{^-`4E|)KTaP#ID3IG5A075!##q+i%bO8mfYmiDtOsZ+NUkv!=
zu0Pb1Npb*E2Y?A8049dvVrdgU%F!Q#GlurQ$0Y7zT7N0h=1B78)u-CB3_yT{I2Hg*
z6Cfd*5jvfSC>Bn;5kze=d5?*!aR(Wra;~tbOQk6n6iE^S28IC;10{@PkM=_sWfib<
zN2t6Dv5-nBydcHqKk6Nw&!>g}N~Hk+008J5K8N8Pi863TKFA4#Hef?R{JC?xzw6`U
z;|HzQ`hQBl@3X!Alt&LYah#ByN58T8-!(EXeM4hmK&f2Co-UG2Tb#|!&^frRrmfot
zymF=S<Jrox6be@bDgs%7lmJpazbZR>A|jE91R@fPNF*X6Uw!$hG@H#gbvAe5wL~g-
zeup^rQ51ogp);b<%&}090TY-2A(DWhOb(AUt$)^*qiPrDe~O}j;qVY7MvR0=e89tT
z48Q~+iXe(05da7Szq_*X#=c5t?5!{y68J805+M>0_z_^U^LUHy(Gvhb05FsS1cCng
z`k$w&UZ0x|0uQY<A~7NXU;;&6^d~r@F#uYp(b_^87GN;w_e<BWe`xFd{U>2AS0D&a
zuzwVIUY9r?14j_0@d5$B_Z=+DVmR~|IWB$}mM>H*v$|ft{9t3_8G-9yY7Y#LsVRkJ
zX3(iJpMCzFEX-G(o!tYKB)aGO!M}TZ8^dBTeR$)>Cv9!p_HOg)(${Nmzm=^2eRt!q
zyLG(s`nCRGm=1kEn9|BUeR;mx%jRaxJ0f@f7_?eHhX4RqE;sleG7W{b<gJ)y00000
LNkvXXu0mjfPe!3z

diff --git a/pelican/tests/output/basic/theme/images/icons/facebook.png b/pelican/tests/output/basic/theme/images/icons/facebook.png
index 74e7ad52f362b56d584df459bc5141395c32b7ed..1d8a4327d59337d8e0ea3c8e3760479a9c7a4952 100644
GIT binary patch
delta 133
zcmV;00DAw*0hR%f7=8!_0000V^Z#K0003P{L_t(|0b}_8|35_-Ojt+GI0MB0NyKN6
z4fszECfb06iq-#Lzx(nZ3P?5prkQL5&^6N009=5u0SLb%`ya-qgBR#;fNRpc|G6z&
naAGJx5d-R>+yJU&CW<fsk3gV{01W)j00000NkvXXu0mjf8~-+o

delta 186
zcmbQnc#3g?L_G^L0|Ud`yN`l^lth3}i0l9V|E(iu08v84>euhS0J*M7^Kx6Zyqb|N
z4phTb666=maOR1l^I{;6G0EHAg`tC0)&t1lEbxdd2GSt52ZP(mY&#&s*3-o?gyVX0
zLIb0ls)0a4LX&~W0iM+B3LMU=BBuh3d4rr%SF|}T4T*7{Q?R1Z;Kr%br@arK78c;y
cvDAQp;Yq6S>qU3dKqfJGy85}Sb4q9e03k|1@Bjb+

diff --git a/pelican/tests/output/basic/theme/images/icons/github.png b/pelican/tests/output/basic/theme/images/icons/github.png
index 8b25551a97921681334176ee143b41510a117d86..5d9109deab2b3669c845845515f4d53ab5d6daa6 100644
GIT binary patch
delta 582
zcmV-M0=fON4c-KhBYy%VNkl<Zcmd7U1MJmN6u|NKvTZjuXIrzCttneG@|bJLZVF?@
zlx^GQ>3g@6&i?1|w)NXSf84|8m&o+0UbR{k48>ZU#v6!wqi1V1r%EE$MYAT@gfEZ`
zebJgG`3x?P75EOx(Rb}pK9^g49TLfPG|6;$SG<Bm_6l9o4S#PIZMeTgGjDiB+%N^_
zu`S1?UTN)lbAAIA3tC_`#OSB7;uwmD=4H1(FfYr8np<3J`$3G=c6f6Ltfuyrfkr5l
zFjqL!Sb1~a)al*)&!p{6Qi}-hBQ2cX+kYn1z*i?}V1xw*LM)wGBP5J;67HZ<gas<$
zwlia7NZ8~AhkrzTJ0IfA*c5{2ox7)e#0APb5A*pDd=D{hB_dy;C&YN4u!ri(KUm-@
z#PSw+9en|MLM%6cY7vK5b8jd=PCCH>5f>QX%s3f>tDN8|6p1jri1rc-t3pC=h+|QN
z1r|XZy+cA-yn{HlphgaZYig}H-l6Qz<RuU_7oBhbqJKVPGlru%3Ojdo8;rtstq~V9
z|17SD4-kCE1Qf?{h_M~X0v1SOCnN(OP|r4)ZIW7}q5U91`xJM3M@R-{d(YNG5Vcp&
zD_|(5qbCZdSfFYK!w;c|*Pw=Z%N&#C6R!fqqrGdSYf>LqAnG6{VGyRGM2-twLH%sL
zMC^7NRX@mKf!$euxzT6!Fg(s<fhQP_WIpd?WiSDk@f5|~Tw<DY852<^@xNa`0K$+*
UVd5uE0ssI207*qoM6N<$f=PV_=Kufz

literal 1714
zcmaJ?X;2eq7*4oFu!ne{XxAht2qc?8LXr|_LPCfTpaBK7K$c{I0Ld=NLIOeuC;@2)
zZ$K%a)k+m-s0>xHmKxL%0V&0TRzzznhgyqrIC$F)0{WwLXLrBvd*^wc_uSc%h%m9E
z{W5z3f#4_!7RvAyFh6!S_*<8qJ%KOIm?#E|L=rJQq=gB5C6WLG5;c?r%V0>EmEH#X
z5eSwPRa6WXBMs#$5H%GtW2go-in9p>zW@UYDN<n!NPv@68XoE4nX@E7rR0&KnNm=S
z2Exgz;A|}%nH?6T$WB#ol%xQEz|X+N1=KJG0S0xNM#nYqNK?98d~Y_>NWc^XOXZQ?
z1QjEV00I#$3^1wQUJ8&-2UsjB-G|9y(LDhMNN3PM{APL4eYi{(m*ERcUnJa{R+-3^
z34^A6;U^v`8N*O6ji%S@sd{fJqD`XFIUJ5zgTe5^5nj414F(y!G&=H(f)Lgzv?>%+
zAsWD}2qhpH7>|TU`X&W6IxDNuO_vET7|j5oG&&VDr!)hUO8+0KR?nh!m<)a!?|%yG
zqOwq!CWCcIhE{<$E|F|@g>nP6FoYr6C<IBHsbWMjf+4zO1O);kS%8}qQm8a$gZmUi
zD&<NvIt<b%V2O}N!ZoNWm69uB(tX){2A{*><8>D?ID9%&5J(4oSbR1I^byW*g@__U
z4QsF&uJSEcFeleM3~ChjEQGbHOjsGDMbyAl(p=Ttv9RaVo8~I#js@@Y9C^_2U})yn
zzSHU%6FxuY?d;&<huP7GHTb-1@xlJO(B`!HdyxqFQHH(?73$<tXlZL#R;c$4@H*dP
z+g2Gl(SNi>65MyR({^lU*3$z$ZllDb(o&<7d;A_`h<Vt-co_6}4qhm4NL!6;QN;~C
ziOs0?+tNQdT6JgR$TNMl?(B>2U+3~BJ2Hv`{W}KEU801#cv_B|9Cm!ynR{S`AMsSn
z;7E=B;mb!wx$L;S>yGXG^6=&WlQn9$s?&L%Y1D8TI^MlKB1DqsEng$>f4=xYWBoPI
z_S1p!sJ#d2?YI4kPA{k}Eby?F=f-J9zIc`YDl^pzjVm~9ebE?Hn?t0Nx+la|D0MB;
z9)2xv1G>a1|A9kQ>~DV<Q;Z7ho$L^b&Ea$Dj%<sAD|e;zY><=X3-4yC&n!m8-3K#P
z{X@<rb5Hi2cU~WVHh|a|UznA=S2T~Zo%gX~ts(4Xc-Qdmw#zoiO^=#q#=Wa8_3kfM
zx=ub`8M3t4OXkYbtXVWMfw<I@{5w`SwWrV;vC8G9bB*bHN)Yk(=-utUw^Ilfg?CQ4
zGSWYIztN#z924;3n11kgM76CXFCp;!j+#P#S@z&Wc|z;)$KPUozl=B>0zRuQsy$+N
ziSCoLJU{Z$nQy4A4Y5UJ07$5FA~qL2%Q+cLaqDU?Lz3?=BC5;Nk6BbTmmceEaM>-Z
zi>O&-dSE=%ex;vcvCOk{*JQ5^_<YkKqpS$DAH0F(H<X7Bw`87_MOS)Pg#68pNxjDa
zB;jK$zmn_sWuB8y_{V!r7^(ToKe<wuXyxcEh_xT;sDAHiUbnkXO@U&w%;a;~8w^_5
z7JIw!*5j{umb8@5D<0X|rEcyQ=TV&ZS&EAftyyndd$Eih%<?R`$2~8S4QJH5$fAeG
z=l34zf}D3MsipO=ZSVHf&ktr)HOpO__7^nu7LNz%%Lk<ETz#8t6H|H@2wg%He@aa`
zq1}V7F@MGV3R$*cH!B-|SZ5VW<W<&vWR!!JM4Cx^@#nE|aNkx=5~sx;c)F*Skd>4M
z4lW7%l9IqY(z7pV(?I@@8=KPFO82)O{VDI18-*d-k$YmI^XiuPs_LuFw<^ZcD}yP5
c*NrbeloN*74g`U%%F6r~k%+>C^#XapzmV0H-2eap

diff --git a/pelican/tests/output/basic/theme/images/icons/gitorious.png b/pelican/tests/output/basic/theme/images/icons/gitorious.png
index 3eeb3ecec36a73ff505e04ecdecbcc4792ef6786..a6705d0f462b505be4d9a5a372743d206c141a11 100644
GIT binary patch
delta 122
zcmV-=0EPeK0p9_TY;#^oL_t(|0e#5D0fSHgK(Y7Teg9eOULeO1?3aKI<wLO8vObh&
z%oyiabZh%T%-*ZDwfFgmXdmJ=gdbWw=-~yJmQ!-zQp(M6jf(`SUF=6zDu2b30i^jL
cLGneO0S-n9?Iv%40{{R307*qoM6N<$f@ozpssI20

delta 126
zcmV-^0D=GC0pkIXY<FTwL_t&-(|ye`5`Z8K0Ko$#3IP-G|9`cS8ED+{nj_01Be_ko
zAnlp75qc?o2`=J4p}SuqmwW$08PD=GA)NOfKKp$JNLE!3I8>`8AeosdsG0qQx@~m{
gLjq!&M2IZn3l2sJ?G?F6i~s-t07*qoM6N<$g6fhoWB>pF

diff --git a/pelican/tests/output/basic/theme/images/icons/gittip.png b/pelican/tests/output/basic/theme/images/icons/gittip.png
index af949625ac83d2441215c81650e897c97d9e5d95..b9f67aaa32a0acd166d7271b3dbf9113717d3f00 100644
GIT binary patch
delta 386
zcmaFPJc)UNWIZzj1A~Sxe=v}m6W|l#3ZxT#Y!bY!fh3p#BB5*_n^<@ANM|FUY^1Ys
zjGO6|b0@!i{xo+&TfC=bPi^6ccW>|CzL62)x?$P8|NsC0`}c2FPg6@t#<6`n<2)@l
ztyu8;_pcKNcE@>Il&6OG))mLNo7JB^e(3+d|BoNsjdC$g_P77_^G9B^PjzNYPi;|x
zx7DJlJyY7NSIwK2;BAxOW%Vgy_jjNJIZJ~4f*Dk1-1@cP|G$f`-F8=jT<_`P7*fHQ
zdfqhYsDnUrV&-P$&9Z6d7@fZF_uSzloF<X{eV^Z5{Y8iQ_B2n_3{;<(I3aCTO0}ld
zG);Z4m20w6+dTdqJn?@@$}bPMOI(+X{|OdnfA1+#x$jqP{GMHK>EW*@CyFpP1YCWw
zVPl;|fw(eb)gC4ri^kIrmaM<S^u^#yo9Oqg*Ygk5a!eNU_xo&jwe5?s=X2}iUvGBK
a{H-f6U0bBbzD*J6PzFy|KbLh*2~7ZBnzA_n

delta 472
zcmV;}0Vn>F1Lp&f8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66
zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RX2>}BM1juc&=>Px$XGugsR5;6H
zV1R-IZyPY3=wqXj;B7qvNZ$hDUr>AtDyD+077l<CFhdpq*?<3m_#c!;#$Yj!8e~1l
zHeXD@)P#YdYA&L<1Y{~qbF91h|43&epiR~YO+a>}v+@5JH&eJFFqeS+jBLY|b0`0Q
z`TXhs+zD-9!{R+H|M%1u{{Qgq?f?6?Z~V^)aYc5K3IjB7{()@Sux#Fc5cv1+ADEui
z)AYZkBm*u6!hgs1?ff4HG!&|51_Ly-!Oq;YV!?kH04e_c`xn?|n1LYr#DU#F11w-J
zxWxdCCa^$xYWRObptr6V*$cl=42W?z`+xTMA)r;58bP){esK4Hl#4Nj0k@C?G1=e#
z|F54v;Lb)4le}mj^k}^W4@6{%>dY9FfCGV^+9H&wMNtk!6^z8<Z3Wf<1B<5iAO{?3
zG@>UY7zV}vl=kZXtL9Aurw8=Z2v0~TN!c6CC0<srILDuqDauTgW@i9z>i@@)Shtn{
O0000<MNUMnLSTY%0MZcv

diff --git a/pelican/tests/output/basic/theme/images/icons/google-groups.png b/pelican/tests/output/basic/theme/images/icons/google-groups.png
index 5de15e68f4d1e4176b46fe6346d42f53e3296b21..bbd0a0fd41295e94081103efe82742a5c6411765 100644
GIT binary patch
delta 405
zcmV;G0c!rE2BZU!8Gi-<001BJ|6u?C0c%M_K~#7Fh0rs=C}bbN(es&M%Trs%n63FP
z*|xU!S~91!#3kEHt~J}X-v2M_@;o;F0-t>JdX?YPsG(G*(IkH!TXUTa|MGXJEV^uU
zO%^6InT39DmnQRTDmNYeGWaW0niK{B0YDT075ME2GbG7G0e``erTaV7m>HqLq;ls;
z@E6;jJ_t!ni{D@@OvEAE{0m%k_m}t!5J&C&e{jw%pJ?$XC{2oj6x*FKDoI5ID2x9=
ziZ?$RtNv%)bLwC47XX(%^qmjB_^T#Z@(D9JVu$~NMVo(Par<w%;OfWz;rKmPan?;A
z{dt3#%;bVQKYs`3-$A9Q{GPt1rQRSFm;ow5sT2?@^QR4rg$anDgeCx$iqb6h2iG6)
zockYoL<MGs2$l1m-AhHOOk)WzKKEExUU5lR{E#fkMyI^rh9|$*1}D9nrFre;r@Q~Y
z8?zi6ocPX{>!0v;mgd!$p2~_@_rOO_1Na`l%Wwj6h7Q6{00000NkvXXu0mjf9WcY~

delta 791
zcmZ3&yqIl*WIZzj1A~Sxe=v|@Nq6*hWMJ6X&;2Kn7072S4sv&5Sa(k5C6J?#>=ES4
zz)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;1`b-0SLR^6g{{R24Q}jwX
z>GY=$Pd~nY^5Na%_irD)d-LG!>w9ls-F@@&&Z`&ow_ZNG`Qq7)=TEOadvfL3<I8US
ze_VTiJ9YnZ==^Ed_QSU2yH(RSi^i|!^<PYDKO0wnGOYUe^wA}kp5IQLzZ^P#+O&K(
zulr(B^ZCici_YD@9f7*qf7-VGumtL=|7uqE#lHQgUF(nU-@lvHeKx82WK{jpu;Rnx
z2N&$xe=I)wzkcD7|3+0G4Jtl7x_{ob_4}eD{}&zkXW978qT%a;!~Yf>`uFhOdF$qH
zom>9S-1~d_?q97N|2(*R?)8gXmW@CK|Mkn?-@kL#u=0aJ`TKjf&%Ahg!>Ia`UfH`l
zw@w?^e9|j@d;7+zg$rjaSTKFwys7i%PMte<>YO=KbW7gcynf>ToimH;7tLI>Xr@l_
z>w^b2YZtx*hS-+1tP6o*$5ImH2aJ^Owa0GBBm()2N#5=*jQ^Q*?*TavJzX3_Brcnt
zsElR|lxX`H{!MpNPvMys!%1t6rxr*|tvw|&b>kF`FMszt>A(8-eCIs*hND@Vt>@@%
zKVJRj^ZXeMYZ?<Y&ba>2=&a{_q}ik^;jd!Z*}p8s(MS2ld8e75*GxGr{_ns<PH}w|
zug;>%(paa0dj(I8{4-Ytt=uHlv|4Xv?``Wvcg$U{ITdXG={G%TuU)d#p~H(;U8-$v
z{MYh8wM8UpQ$TH+b8X9qMH-uQ_B=}ebz9<Kx<rNRw%?OAo8o7meg0m)+yBq$dQqkW
z*S}Yp8${+M@W0fRvHE4{!1>R(`K9>h#VV>L#h3m7y{lT{8c~vxSdwa$T$Bo=7>o=I
zjdcwSbq$R}42-M{4XuD|0}CqygM;j6rlM%b%}>cpt3=meU}bCu(I6nQL9Gg?gTd3)
K&t;ucLK6U@#)k6%

diff --git a/pelican/tests/output/basic/theme/images/icons/google-plus.png b/pelican/tests/output/basic/theme/images/icons/google-plus.png
index 3c6b74324031611f20c0a3810131aa74fd0a5a9f..f8553d45ef3c858672ca169868aadbaf3c14b8df 100644
GIT binary patch
delta 485
zcmV<B0UG{~1pfn&B!9+9L_t(|0hQ1LlOsVC0O0-~v5iT^PR_P{SG>a6wr$(C&9!aY
zX77u!?)s|hF_{^ZF-A8iD1Edxd6XulcM*01MA`|6VG^Z|G^cMnS@SQXv9beuPj!6h
zhB1jF)F8|%heEiGfH+~e8kNSDH@#e)JW?4qX;Q)GT<Ep_+<%ocTp8yPVwFKL)Fy*C
zc9;@j9F;R(5j#{714hoPEP-xa*=pT?i_{BB-WV3Xrwx-w+TBv`W<k5*=B&_BI^5HN
zh5X!w(lCoO)a($s`=jG8E=>7t5P3nx6N?e<z>UwA{x^#MIz^w4#;vg#Q`{-|sTaZm
z+z|gUicmu%q<^&)H&;eX85XhOcx`!R;U?1$y};|Mjt>)GwEXWn0YLw!%ul&`yZGam
zx=N@w6>l?tQS(0g`KaQ$xKi{>!+WpfyjM=iFUOs@I(NAe(mtT?O3oXC^_q}GyeP&k
z7&m8RudzETJws7@&*XmlUiji}_T#&GA=#Z6PF2alX<n~oj2D5PJ8#tR<?zqpyr&Y{
zGY8?%LvNZ|9XlCI#LkM3YX<#S(jJN^{$8zk(hMK&)(lq~1bvlIpNPnh1I)^4z~u*R
bt~5v&n>&-9Zv*P$00000NkvXXu0mjfW_j-N

delta 501
zcmV<R0Sf;A1CIodB!AXPL_t(2&ttgjZAlVhxZ`DU!_)jGZgkek5Qxq>83Nfrl?=B$
z?C#W0`gr{0w|9U4!@-9uuPVK-xtjseX$J$Kz!^tFAp5GD8N;hfZ@zCTx#3}QIWX|)
zo<~5rUx%8nyO~^up_2~!K*3Xv`at$2R}+T+|Ia`4GrHtrbbk?uJYwIy1j>GXU1E8{
zUJs6dLU1-v!-3nb2Irih=+?6PK<TfGB2Rf*{>KJ@8lF5#&^v9fcghZg&b90USur#C
zh_yBx0YzYJ9ftpZ|9@Mbb;3sH7#LlcapC{3OLv2zTp&7Rr3KUgB!TRsHrfndzX7?Q
z-YzOS8|-?va(}|7H}{@Z+a9#igrj|y8bB3$Ei?{TY620%iQu@K^On5WwfFNop!oL}
z^>%yB)b}8vU8ZUf1mQ9qHdo(aqPoK*_{p39|Neh?RA2(;;zSGwOjNfTDsM5=J-hM6
z|DXT=|G4|0)Cnwt9Wk75oBC+~foB_+Jy^5s@yQ4OKyE?z{$*F_7JbEysAvP2Wca$b
z=a8HFI$inoAf$Dud+YaKAU$`Jb=E@#p$MXe;e?6&Ds5S0w7GEY4`9G84o4G*AclRq
ra%;6^)}WxshhP7{>2h3yE)GHfn>&-9#5^N600000NkvXXu0mjf*YN&y

diff --git a/pelican/tests/output/basic/theme/images/icons/hackernews.png b/pelican/tests/output/basic/theme/images/icons/hackernews.png
index fc7a82d4d68068d5fb032885b93e670c385ae1b4..8e05e3ee207e114a96f3811f46f68d17d52fe80b 100644
GIT binary patch
delta 119
zcmV--0Eqv|8PgSz7zqRe0002(-QrTQAy5ip5>QN3Mg3?1|NsB>i~#tuXaD5J_o76e
z$B4WD001vZL_t(|0b{@m1Qi$r!3;wKW??Xc(Sbz(%wQEZ41g$d6oINX6oxVw1@JNO
Z0sz-j0)=#JDs2D&002ovPDHLkV1f^rEAjvU

delta 625
zcmcaCdQx(N1Sba@0|SHn=l_Wt6$7~HISV`@iy0WWg+Z8+Vb&Z81_s8w%#etZ2wxwo
z<osN{#FYG`RK1Ga0-!bq2Ac{iATu|$BvGLvHz%*ys=`(YtilS&1_|pcDS(xfWZNo5
z_y#CA=NF|anCO}487SFtDJUq|6s4qD1-ZCEwAWh!xwc9fB_#z``ugSN<$C4Ddih1^
z`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$`Dgv2DzjbCl_TFlw{`TDS!-4Ov*1Uu~kw6
z*#rj=ho&UM?I|cN$^qMwQlG4!nv<HFnpaY+Z>VRe4>ujC*(N2~s<<>MD>b<U>~gqy
zU@tf&rt2dK+vsDew$TSU3CW3&004^uL%@#9M!y~&oOWDK?Rg!6A-u)Y#WBP}F!|5y
zgCFKMG97SfjN1_QO8S7wUwdYb{{fDr(mpbwQyLi$v)Y@dH(WJXz4Y+af8UxmBo-BL
zDli{rxRz^t@Y5T&j|HU$W<Gp+j42xwiWA<*cgIRvB$XQ<$Vr>NErp?T<3SOHi#<DH
z7EN6FOoEv?Kv}}Z_S}c{N4Y$un>rt|&bV^Em^;yjEyXNG;M9SaOcQK0o;W^;S5uyG
v%<Vx5quJ3LN7(K$>`81md-6pR^Lti?o$UH5vr-H5L21O()z4*}Q$iB}X`Rn}

diff --git a/pelican/tests/output/basic/theme/images/icons/lastfm.png b/pelican/tests/output/basic/theme/images/icons/lastfm.png
index 3a6c6262b644dadbcf6cce5dfe4fed9740a9ec1f..2eedd2daa1429ba026c0b3c81f200c7df55d199a 100644
GIT binary patch
delta 818
zcmV-21I_%;2gnAHBYy)ANkl<ZcmX|+L!cx_7=XX3uJO$3DYk9fb}q5)9CO}VY&)k|
zm$hx1&u{#C-gHlORc$YS8)E3^KTb{*D^Dle+pd;{TwW^A3QsLn5p6`#iFjfNK@sOd
zj46@unxvEEI5$8_{h^Y@>KCJu$;;6iN)?b2a3_#VfTsWs$A4P(un?dlut21-!md(j
z9Ua7>U64$1pfE0S*6gu`5CGuZUX{%vln2{-@Rb=S30siM00Js?7;b_#5NL2>-(UeP
z15zP`goMKR4XBSCro@=M&u|0M893!QIPOTurV%{@uxK^-O&FDji_U_saj<k9bob(d
z09&nvQlwL5jDLfxE`$ru+<R(&Y44z$E{9?nE;t>IJ`{R~aHkyy-Tj!=n+Zl5ZOYaB
z0@qx&XN&peKjc6W(Td=Z4tV5FIPM6DV;tN;G;tP<Nps_mQ|S0=T}Vn9U_y>QjA;2f
z^o)gwgu+zIM8ExyU9<vs%|$dm`~kbQ8}-72q#wSEuz!1ypudQ9gt9n)S<3<P@Pl!!
z5IuVddgT`Uh3jd&^CKdcMd$PMo_quKAO9kC_jRae?xVSGE3%L)NV~Z^8-Dv6a@=SV
z_us_uqy<#wEGIhi6q@BardlWe+T-ZZ$A9Ms066_5eA9w~!Ry#`-kl4&J1=tn?-Si_
z(7glBUw^UIMX}xY(3`IR{#W+IZN=ZCO%S>r_q^a%r%rJ@Z+x)Fd-;e{U-Iff*T}z9
z(5p5g3wcDXPJR3rG$+nsWZfoYCWAb*gT_Bo7<z3y{^DiG_BOJ|9=1uWKlk>fg}|L9
zJ&75r5f0ZeI>gIn5MAw<$RbKrq)K4wK5le|R)2c|&sf@Ty=1z|<g$@hts&b+;SNcX
zjK(6YMG#}k!$^TmD5SQey4namORL#LDGz6iRGA|W>29ptcAlpLWIBa02672hA&bZ+
z@uZ9gIGpF<w8Ruk$VLmg;zdUu_PeU*Q*Y_>k6o^gJHm>QrZCMQ;exO;=5fSV#<6y(
wL@OF=l&Dn;;?VYu$*zvi1a?LH8!s;11*p%JbB}qZ)Bpeg07*qoM6N<$g4^_xBLDyZ

delta 954
zcmV;r14aDE2G0kOBYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH11L#EK~y*q1;I~j6jdC+@qh1o^LF-sk?xk2w$KnZ
zDpdlBD2<Us2~iSbKqDvA#DgC2Plz5pbL8U1a4~`C4T$m2sf0wM7y&IUG?q|==(cw0
zw%y&%?#%4Wdp|!PwfgntJ(<?V`+l|ZvMv`(+IUWRX2zscNYf|r)GCS=A~Dvkk?}%u
z{yJ&eBx^1kzkk&}H{|<=ND^4v0IdOe0zU(u0oZ|a;2bCgNeT`~6P$8)OfE?uXRHQ(
z7Mug;AW0Et!8w#t03ZT@6bdNg!NVm2V}~{I0E&4)!A2K0Lr5${35Wte3r@knf;K3n
zA!CrB2i^X-QIC}ZHhYlE!(<)m6Hv&ZmYQ&L9)b{tN`El5A8NxevjB}{B#LnDPOMcf
zyN(rj=^z~32O_Yt2K5OzdI(zU@cdrbH3rM8$TM|ltYGKw6ZLx)Bb}hk;TK`3g#G3R
zbhCvTq%b-H?;eBtPH47Z`v~duFZ8bbMlqiy+3b;&eXS#G%&u|L*#(lHZ=f;;+g>NV
z_#^J-9Dj0niryFJaSs}pQzyy2bDX&Gh-jsS6Jp)^{nkJLy<<Bvh)I6^ljQc_1UK%|
zJ9`0DERd8+Ebn=R?uBp3zHtQe!CQn2576aeS-bm<Lj2W5^zarkCyugt<vJVJW=Z!=
z60Uc#?JlL$?~%j-!P)Zwu=gnfJAme+BP<>`c7MIGZAyYm(;_00EH@>X`%6+0`S0z|
zWaY#sA|m280ud3hQ7r$wc}nK9lk)GYCzrgBcRu}**NtlZ@2`^FxrZ*7P@OK_Gv^4W
zuhCyvMCbG9u@QRTU1jz38G=7<p{o@NyT=#R-Dh8)DMzwjdm6jiA>Qm_lNhg%N7bs>
z)PJGY+Gvx(b^~Nfo<X&YXC2koUiiu6i-pu{chHp~WYot`x1yXwp-@>5s}(L|(1{~k
zs}OsRK^S6;hghpkeqyxIyZ!Khmqh4X7HcgOGnjG#Rq*k&#$^QYJS5TB)*8AufZA5n
z#P}uCEoDDXp4&ZZ>N}n4hsuUgMxuC|L^JU)j;iX1Rc%xbXN~H#%WAB8&##Sqsc>`E
cPd}XbAE?ijbKR<!LjV8(07*qoM6N<$g2l$WCjbBd

diff --git a/pelican/tests/output/basic/theme/images/icons/linkedin.png b/pelican/tests/output/basic/theme/images/icons/linkedin.png
index d29c1201bcb0c278d49f573f9ef95ebfe932fb5b..06a88016f191d1f7596e5d159eb9e3ef276b6ad4 100644
GIT binary patch
delta 611
zcmV-p0-XJT2k``u8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30006eNkl<ZcmYk1
zGk|qR6vuyOX5M-?wyi3*?WAv_GPe3QcG}psxv}kJZN9yC?wo&|e8+|X7d-lHKrR`8
z82}iF|G~&bSD(C{o%P^X8x3@}vlmwkmV&KXBw>F`)S1F}Q-AF=yim{8W!trS4%&S6
z_lM@+`)#2k0tSGBnS>A!gUz*@G`?K*=6LBro9?h)-)3ueJpbKPReY_URxs;Ip>eO8
zViu~#tKxsiG}F#YxxDn_Op4)+pJ(Q(rn?nptGrx0qLplVDff59VAgJ2uC!1$sj=JN
z9eVxe*<a^YDt~tx0n_cKw-wju?TEpCnQa%Dp=6epYZp3o*NqO?a`nMq=5Bpw=#2d~
z-DRWx4~G^{+-V(Pex=;^>FCXaLv`alDWtkCwY0;!z58#z#&T71?c1;2yXPjW|3Lt-
zK|fa>vgM24P7nS%my|*-?u{?k1z4y`Q@qLr7+I)}xPNx=j5|O5!vJ<%ueYvBm7B0q
z#9!Y4F0C|@0B(JI=(#T^ANqWJe6a>PW1y%m9$cbG{M|s^6h}ZVg#;!^fV*&a6p)bQ
z00`WX00V>x13(fkxd$YZ`Z^;p&>e%(-AX`jN5nmtb*2b(r+_Pkm=H~{XTP4zMX&uh
zQx!e=<y^${a(?@#Ibvw%a^FWIJFL_9!O*-L!GdwlQ$$ixaup-T&~im52TCxYqj(TG
xQe-_{Edw~`NunV@V3_#FG$b$pgX~;)?C+p<VWy}RPOSg{002ovPDHLkV1mgCCddE)

delta 884
zcmV-)1B?9e1b_#S8Gi!+001a04^sdD0yj`hR7C&)003yT0BN!SYqS7tv;=Fk0&KJZ
zZM6h#wE%Cn0B^SlZM6t(wgqmr25z+jZ?*()wg_&u1#h+kaJ2w&wg+#v0CBejaJB$)
zwg7Us2XMCpakv0;w*Yjw2XnXpb-4s|xdL{&33j;$ce)98w|@+Fxe9l?3VFE-dAkmH
zx(s=`4SBi{dAbREyb61~4tl%~db|>Pyc2r65_`K3e7zNWyb^r86n?)Hg1;4lz!`zS
z9D=|bhQc6)!XJjhABe&sio_y{!y}5rB#Xl(i^L|2#3zl#ERM!4j>a;P$1#$}GLpzL
zlgKlZ$VHLJIe(SPI+e;fmdQGn$vT$GJeSHnm&-hv%0ZaRL72=xnae?$%tn~XLYmA%
zo6JO<%t)NhPo2(7pw3U9&{Ck$Q=!sTqR>>M(N?3<R;1Ecq|{ud(_^L5S*X%pr_^4j
z)nBL8UZ~VwsMTPo)nTdCW~tL=s@7_()orfWYp>RCuYcBXui0?0*K@GfbFtZUvDtL7
z+H$hkb+OuWvfFjC+IX|re6`$rx7vKS+JCp*g1Os*x!!}h-GjN_fV$m-y55Al--Er~
zguUK~yx)ht-HN^6jKJZG!QYj~;+Dtam&fCv$>gES<f6;vpUmW=&E}`g=BLi*r_blB
z&gZMo=YOft=d94@tI_DK)9JL-=(N@8w$<vl*6Ov_>bThJz1i%(+wH&G@50~i$l~wM
z<?+zv@zCb-*68!s>Gas@_1f$8-tG0~^7#M%{}_&@Hvj+t0d!JMQvg8b*k%9#0QX5m
zK~xyi1;N2eLO~P;;QySNt6nv1m5>!_M4KKZ=znqAx99<Sj;KZN&?2Znf?5Sq<|4J5
zc*lEZ=FI8)2$$rE7@Pp`=87%`PK*V>(MHNAcHs|((^pH-OcELe|1D3t$8J%1Q#oJG
zOS^KD(O0omm6HFqxsGN}K7Pht{2IM{UItjN=ZDkVv)$PU@_r*3hjORWulwyIB6~V0
zBW<tU26c+i>pR786}b)xDJsVI4<4<s<`flDDQd$Bp%hL*p<Y3%gj5M@?4WBJ=&CX3
zNRy@U^7-hVXHQ&=zuzdMc5f3nkKQy<Nz3gM@@+}Xh*@BmW&IEI8i?#El2Z);0000<
KMNUMnLSTZ-AJ$y}

diff --git a/pelican/tests/output/basic/theme/images/icons/reddit.png b/pelican/tests/output/basic/theme/images/icons/reddit.png
index 71ae1215ac8ea274f089cc4aa55eaf8a546dea67..d826d3e746a18b712db7a68746c0c523af802fe0 100644
GIT binary patch
delta 170
zcmV;b09F6B1<C`EB(ZG>0e^`}L_t(|0d31QS_DB5hT-pTeMoSLkQhI}Z~!hma}r`K
zMM9j~t#x}_%UGs42+d|cE#R;^1PNeM?`wKxS7JDFAgAY}Crl@r_%gExoyh^1y9=e1
zkaMBr?0@>#A310I{FMSU*HeuMH(>)dx3;%7VIzRg?Nc55J|T1~XCJP^0(5N}YCBfw
Y0eY(=c;GCP9RL6T07*qoM6N<$f@R!B0{{R3

delta 404
zcmX@byp?r=iW^J1qpu?a!^VE@KZ&di3=E9LLGDfr>(0r%1acITJ%W507^>757#dm_
z7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD?*CMQ+A=&H|6fVxSTaFm^kcZ3kp*@pN$v
zk+_`Ne^sa{fPwY>*4@^OyZdD$G?dI<{QuwmVnN@o{@)vl`4sCf=*JyOFqx?vHv6yc
zio-99s`uE%{$MtdSY#s8`ASL5UnTe@&sjSup3_f1wI;2MS^3Ojn&OhMe3R&k3t48b
zOr7d)&DE>=%gFXuZr5Bh#lwOI^FBOKPfjqovM9J_M%KlfHH<o~Q#Y`P75lC^+S{^r
z&*beB%pMgV|5so$SO59tj~nW11FyV(yGrZVPWg8aJY<;H9X|ndKZ9zCYeY#(Vo9o1
za#1RfVlXl=G}bjR)-^N@F|@EUFtai+&^0i(GH^1OWAeKjMMrLaN@iLmx(-t-6H~Ab
Ug9|!0GeLHEy85}Sb4q9e0IndFRsaA1

diff --git a/pelican/tests/output/basic/theme/images/icons/rss.png b/pelican/tests/output/basic/theme/images/icons/rss.png
index 7862c65afeb66ba9cc7e9576a3a62b850b2e184d..12448f53417b4974fa041655a5fa82dee20c73d4 100644
GIT binary patch
delta 728
zcmV;}0w?|N2JZ!sBYy(6Nkl<ZcmWN~1CZ@j0LJm(ImxQFZQHhO+qOov$8T77RNJ;~
zx6jsI=H4WyJO20&0O{2e*R#;@enu8vSYz5U`lG9f^{QgNh`4A^uQ5^Zx{ys(=Yy8q
z{Ee{X4HE;T4==hy{l#^L7b6VOE2;ZbJ!B|o{YQH`*)Z)EiGQ@gE&FHn*Y|E4!j}(Q
zcn#8$j83CBN_!g3$+Z5aGZ8s)5&8vciX>F6<?;~b>>~~_f0V{AjQ&Q63WI@#mZd_`
zpq!6D9AL1bKYg`aYtoKJ|76h(S@#@@HqG%AGZ;HF`*#M0sVicJ06?&4t~GrzV`a-<
z!y2bafB-7qIe(mAUu4MvQUD+#_3CKBm1kOL73t^Oq&Iitqtm6CUrI<a_IQD{_hNpZ
zfRG4DT~O8wPm9UGKiZS2dMvq-(D+n%b{pxL)uj1<0(-sA(rZ$5NeDsRB@He=KI+Vv
zqnIl!wjo=LWB=cT6MqtBju)TVR4V5Yqy9>VDd(a}2!HCDD3meOMX<;^%>GRH=qTy0
zhol8J<g^*eR!8{!QqW)a07ZqYl6pzApwpbSd`yE&xAdBXjDB1A>O$f1rG%lS^>(;L
z_2Z+I4Fk*Xs$O(a+Lf}MR3+Ui=8>#n{&+@~k#>KD<J$T$XU2!hRZiAwq4~RPFdOri
z)}BkMlYcBDPyJp_oTNsog}SMT3+Z%oi+y>MVqi53FA<CZH0R8bTC=4{5QK^ph8v;!
z;n7v%FXxP}+g+hrQa5Endxqg|REJtzZE@AyuJ-JXp@j#9Jku>JQ^xo7*4+R80OflZ
zT^0WscTaBuO7ca6A_aA-H9M3Y@{DSLGBL)|Tv2kZf0o$sj%@=#`;E)i3gy)E>N)=%
z8p`IxR&$P`sFp8^v_L($c$u=1>0{o!xY#-&Uw)e>HazN%hv0uJiC~OG(V|}f0000<
KMNUMnLSTZiRB~DX

delta 857
zcmV-f1E&1%1@8usBYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH0?0{3K~y*q1;I;*Rb>DG;D7Hw=ggfkXPnV#w1Kig
z&7ujS0)<@kKqA{z;3AN~HWDP%A|l#_#4Kv*GBDiL!l0ngAOeLR)~1IkmN<>(%-Gy<
z?&I8h?mg%HeO~~GUmtnM_}KF{O-yJnZ#QhsN$UG0*%ry<z@WV(I4h*L)LFyyW9PyX
z?=1z0=Z`O_e}8({*c4%uK}kKN8X!eM_d59s=@@yJNPPIjp|t+xqx~UV{KUjA;xw&g
z1}*YsIydS5O>YSq$rgqMYKkaS-FvbSn$Jl_*=W(eMC&poDl`J)JE%~!DK`*EMrc$F
zSLQO^8wa$mGC9wK$0%|-ixjK0F0*!pkumCuBt-xqn19T4SEdxJ%)Y~}qaq-Hif>=$
z&o7xCAqD^v#6g|deBW*3JH<af5Wjhv3$KZ{FN%m#p8bLc4ze*MAVfk`7nJqHauSVP
zli#EoF#U+o{$BWepLk|Y+_(xHJj={(iarq`sQbjm>|&y~+ElCyQ}aB2l0%n;Bfkr`
z7bRyN6@SY+B#Gg@FDchiMFe$CB9uv}i(t!M)_xE!92WmNC2pSQ=&G{Y6MlRX40pVs
zsE}6TAnFwKI{(cku`$y%=nztdx$yHF!l!o&qca9io>2XEnzC(V_9^w`BzdLGqpGA|
zC0Rn+wz0^j?cy_E@k(x(WUQW7?tE3Zi_R5kBY!naX5{O{I!aTrI2>doH`Iu=P<Ir`
zxL!Xqb@6@0$ef97fsI9-W>f60i3vdvDq<LGhw9hUJCjSt7VEq(RMYw~74lVM{X`vV
z$=p`edSAZQGdj@_vQ)pU{JS_X*nQ~Z0Ofbb-%hTb{BZCOO0vnIh(R4|ogQV6ETtNu
zj8f!%I@5cuZ9A~AKLF(C-r5t&Td&v6>o10~v()W06-6~$6!EUQv9*lprj>4|c_*3L
j8?xDbpUod$I0gR$D~Vu?3V6ai00000NkvXXu0mjf9#4!g

diff --git a/pelican/tests/output/basic/theme/images/icons/slideshare.png b/pelican/tests/output/basic/theme/images/icons/slideshare.png
index ecc97410138bb3c457a898b1e868b22ae9db9989..9cbe8588e24976076e5fc3898fa97856122f6fa2 100644
GIT binary patch
delta 420
zcmV;V0bBl;1hWH>8Gi-<001BJ|6u?C0eVS9K~#7FrIQ1UBtaO3C+69T&Ir%8W8-Yw
zwr!hh+qUf;+t%B3Wm1i3k>o4B|7(^Afav}E_vyWXsU^iepAWr(sU-rB#{;|F-XoYA
zDsa2qyiLRZ8&GZ@K>CYe`4H`SPkL^Ksi6X=)5+V^9vMm*bAKU-BD@PK5N_Dh9>8>C
zH0j^xG-K}5WYTjpjWP`@(A-)F?VDXNch<vdwZh?WFt<p0?zmp6Mo4iJcKyi2j2oex
zJJ2bid$1AeJ%f2@t}VpD&oStK{0EQeH$qU{reFmIgMnPxlKlhvdrNrlpz7!(TtBfH
z|Bo%lpRcbFQGebBo6QEJ(Z~waYBd=2dOa)_3-qUlQ$o(JM$*}Z*m~g-OePa_IvoOe
zR-jNQz{PlZ6lKDV2#PRA1rmt_T+Fw|P-fhVCCq=C0AY>_#9}czIyxxk)H|>~8V7Uy
z1sn}2#;nIlxE)_f_XF?+t*xyTxm-@(N8ncJn41xc#T|S>FCc<GALlMGvMrTVfgm0L
O0000<MNUMnLSTZ{2E*w9

literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfjR2nz*S~-N{{H>@*RNkce*F0U
z{rk6X-@bnR`sK@)&!0bk{P^+1hY#=Hzkm1c-M6<d-oAbN>eZ{4FJC@?{`}dqXP+Kk
zfBg9I&8M#)J$iKg$*Tts9^Acq_w>EzpARqEaQ@!6eO+r#-}<z-?bG(EnMZEFU)j{U
z{o<QxDb?$a=dU@vZ2pulJ+g1Ryl2jw`L4q*WzoUcEgso(w|r`m{@5h-y21KGt>n8>
zu{U`lyUMLC`*)c4@4l3;wx-<Gq<7b=G@+FRjyfG%U&QjqSJgBY#cDUL(P>(%(zHRk
zY87AMB8Ie?|NsBbO`N?A=tqx|AirQBmq@T5pE`yXT^3ECnaey~977}|Sr4A{I}{+o
zaN%=YK67fKl);XLhVMN72>h>4j>!~t_j$}=vE_wj;Wj1)-!<nL8zwL@?458yC$D?*
z>S-z}KHD!>)!zx?ko4cYZua^>?$dWqKR+B>HaC57^UvfAaqpaV<uBr;H{$nQpPKaL
zwtfD!!1j*q@1|^-d1s2K;_0XI!p8)-c>es*Q+RSF`|DQgH%v`O+{1V2ALnUm<nUs4
dVP-J--|@jj(URrLY@mx7JYD@<);T3K0RY7iJHY?|

diff --git a/pelican/tests/output/basic/theme/images/icons/speakerdeck.png b/pelican/tests/output/basic/theme/images/icons/speakerdeck.png
index 087d0931caa301f8a1bba1497e1b91b7a7f105a4..7281ec48b41095180a83d71eaf0b00c85116965b 100644
GIT binary patch
delta 566
zcmV-60?GZE2*d=C8Gi-<001BJ|6u?C0t-n*K~#7Fb&|D$B}Ej5ztdggio3f*g1cKx
z#JmXl5Jbd~;2BPWyF0AA``+6n=O3^2ay|NmQ*XQW+4JwXYGz=3cw8=FU>HIiQv?{8
zndJlh{cAq|>y>c!tyj#Pde2ptcXE>p3>q^e0l<<lqZZ7Jp?{`T&OQ?u2xA9&(Q+xv
z3J_F{W*|{Fw)7%}V4C|IV#=gg@ZwPa2_&d`tLfDZl}wD8kYXlxh2jOPrXOi87?RgD
z2s0<fM3|Qn`w1jG6>vcf;gSBBHCWqVp#@{X@{prbV!^x2p5IrK_xEu*BSS-kHUN-v
zrq^|}O~YKan18zNB5bgwWG8rba<?cT?m5VS!=2aN#8dY_%C~?1h9Pdb_C{X+<UPLr
z{TKSX50ZM3h9OFFf{G~7@%diF*x)D+-FOR6-gY<tuU`uikKb}9dv@;PpOq`wuy5DG
zM>UIq4<$P}6+C9-V(ZSGy!i4<yz}t~WCXxxUwzHbD}Vl_mm}@yFgX?)D|i;cixyl^
zfq~Ocp^b?Ge79#ahJhJEG-pgR2sA^3xEme|B^82}Vju~do+Ox6nkrZlha;YoLl$xo
z<RW*uzLtcU0U%MiFaWcqJ1yR25m*djeaP}`R`;qvQ57_eVHklf?{6Jt$Bu+h73=B?
z)Uzg-N-vl8hu*r4ua3ae&A`A!{RJmLx)v)b?VJBQ3+!ZLngi$tLjV8(07*qoM6N<$
Ef{By}&;S4c

literal 1049
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)ORJo
zC&X36Qpczy)Vv|qtS-i^KE}L0*0?lOuQ1qcbDjH^di}y+y|QqP!eEVpVC8Ior7S<$
zRBzc7Z^?L1sRU2)Xm_y)H_-@J;Sd+WKxYAeM*&|)eqRTEZwEe4dwvgleoqH}M{A*k
zFrmaSekW@-6-5Cz2O#2iwYT3?W4EE&Zez8>rW*T=)%F`}tXEZ-FE2F%qGdo-V!pi0
zdUd7Ql2Vg}#l{PZj29FdFDNouRBSZ2NPl*|!JGnvIfaIE3w5UE>P*Se>d(~b&Cu#i
z*94*-AWGAokfk#vSF=A$y(3K`#!V!^PRQRzI?P!<(p@UlS<uf$GR94#GhMYKUAZwy
z$k#^P+a{nQciFD31rs_7C$z8FvpuLXPs-O`$j3&xAyKt6L#ZiMp*lgp%UUVGb?S;G
zpFV$Xnm4^^?zEY!mT8CkC{)MG)h5Z5#_)Ss@z@!QIGVep#5$zJxTeI3I$H498u7bZ
z$<-uDmBmXI#fZfD3PpGbMtJatx(bB4352=xhq;Nw`$-kYisi?M=0%GY#E1eJ`O#u|
z(Lxy!Lg^8L>EVLu5dvx9f@$GG8Ik-+VSI_9d<h}E2_XW>VSI6+ys<zO!V??J6BGQb
z?f5oe#A}oU`2|<sc=Gu1;~O{r{ks9AF~RkJ|E^a9l}zT~&jsq?Ebxdd2GSm2>~=ES
z4wz7QJY5_^BrYc>B%~yzC8jbmrirPUv9Xo$@%rlK%F4#-%F4>-`suOd+14`GGBZ2Z
zIx90L*9zyc$psr58y9nXdwUma8*2y0vDsxyM@uVg*vhOFU0uh<$nLJ5E*>6kZeE_w
z@6YbYrl_AUA8-G^q2YkS{Raa2iEI-uZ1~V|V#SLYH+KAJIie!ScJaxSD_g$woLSTJ
zX3mv6DTZtx_xx!(wCK^KNtZT#>iXkV$kw^))vQ~)ezhH2w(HijX<D9aE3a+acJ14>
zzH8ggT|2ifER${KyLs>Ky?eLs-#^Y;;oZMeB%i4H&a+A767ZjEQ~Byi<|iJmuFL6X
zSeha?J1&`I)ZEpyYSye-Rssx~p{$||UzYnt><E|>3Jf6C64!{5l*E!$tK_0oAjM#0
zU}&ssV61Cs8e(W+WoT$+XryakZe?KbBv`K%MMG|WN@iLmrUnB`h=%CJhhl*m7(8A5
KT-G@yGywnx3UT@X

diff --git a/pelican/tests/output/basic/theme/images/icons/stackoverflow.png b/pelican/tests/output/basic/theme/images/icons/stackoverflow.png
index f5b65e9990dbf423ff652b297f1d0172c8c1cf27..3c6862e902ef0624a812aa212ea0c075aa123284 100644
GIT binary patch
delta 400
zcmV;B0dM}42c83v7=H)`0000V^Z#K000Cu5L_t(|0b{@io}}n8JxSA<48;F|_y7>I
zGmr|NB!dlE3pHdRNQ@jq_@AWeoQ4`wO;E$@scbnwT=#k!t0=-dx=K${b)P~FiNLA(
z?KBonpysPU{2z#4zMjTb^Lhr0IM|SMZ8KoF`~VsN!Y)`1cz-yNpXuFnCY5*7ncLn>
zWBm*@=rz!g=9fLZ0#9?*eV!!i{{b4*NYE=UCUZ&x4QhHfjrr}HsjUBBPiJ}aY9eRT
zvkF<imqiLp7#h}B*mJI_a4KF^<`M|R+MBDbIY8n!dn9;(h84Y^&in}Iy8oYMGDu^!
zaYKcz*4hfk|9>#Ny4>l_$}-mjtIM5Rfrf<~ZPp69(<>T@)5(h~y!kg)*aU5;uxkP0
zoj`mKi2nm!_J3_T(7-aM|0~N~>@YOu=H&bbVQhxZt_TrXP~mU0q{1s@RfWsMMHN1h
u80rxM2sS20sG+3+gaJ+iNWoM!006J!F6HlsU$OuI00{s|MNUMnLSTXuY`7r+

delta 906
zcmbQoJcWINM7;nT0|SG9va%A8VoUONcli$noDtve07W<pJR*yMv<Dcwoy@jlU|_oB
z>EamTar|hAwTHH&$X;XX*(sr)6f`=89FH`t*eI}tJNlM}*s_fq1wINZ3+6CQQ;O<P
z_~^c9Ygks|OgGi3O$r+W0$i@W7g9+%m{Pyl`g50}f5(%f%Ma~7oA~_9oa%3P5(R2D
zilkQT*ejdN(4!d}_iXh+h2w{v`|jS&D>s?t^Q>rT$%k;>9d~EXe*Sz4(+ss^3kBlu
z-hHZZT4wRZBCB|_4|yrsukW6?Ai$8!uzdL(S(%V26DMxlHgjgs^NZ=yD_^}@bu_5s
z#zO{&j*azSzs{QFpfErD>LEK<Nx5%T($b6qOcr*}e!qHUVQp~0ebeU8nanG%+>%n9
z<f54@A^va8($>ePx${LjKkOFhzIvsnSMu2B&5L^awrwjbWt_20K}NQ4--2705BDB<
zoa(+H^Jh(Js-8NBgtS}ye1(LZS)V_1C?1J$W$mvio7S%|vp(c%FRxQty6eTqJ9qEi
z<>WD`$a4RDX+@TXpq|=&^>U7dwzjTHlR~1iHwr9z{rK^n6GvG5Pd!ZFNj?^&d8{N>
z<oY$9#~(ND`t>D5pd?m+k8jSorAu!|dwEOUxXs<38ac^F*g=4a(M$8_k7sS0!^0=3
zbmiw?zrJ^GadD@MS#@Ro&K)m`LPP)lO5M8bva)iRw&E^3)1wj$$zQ*=B>1enox8oi
zkLk|+>Anf|_A=joMn(AuH%#d6PMQ~VOu%cYMyij%B+nkfMJ5wB+~hc!cK)0U-|V+v
zrv@$GyvQkZ?X_jgUS@{gy{C6gaVbxV5kuMUzkBcUP4N5v-I%SR(49Tq+Pa>VQIVma
zok8*Ngw$gU0+Ui>&3U?6A3Ri?T)2}##P#y4S3h<O^w+=ntloI?WP*W2%9;<dooj$#
z!KQK*G4A%i|6XMUvYdE6dp768jExL0c3q!+mgz<gH@CX_tZNrOd<a<Mf67$DEG*{v
z^I6}vf8G<QairAl)BQTm{n4qyKi+86*WGd0`J#T+zuz2n%nz+SPqwyqg#Z(~YKdz^
zNlIc#s#S7PDv)9@GB7mOH89sTFb**?vNATXGOz@4tqcsF8M-V((U6;;l9^VC&|ny1
eXkuk*W@Tyu(ZF!!+kK!022WQ%mvzie2~7Zrl9o9D

diff --git a/pelican/tests/output/basic/theme/images/icons/twitter.png b/pelican/tests/output/basic/theme/images/icons/twitter.png
index 057ab004b5d826e151a4f9cc6a66d88caffa8911..cef1cef96bb2e0c957b77b79ee30894f798ce8f0 100644
GIT binary patch
delta 390
zcmV;10eSxA3!np#BYy#BNkl<Zcmb_aGlQ5x6x`UhZL^B)D*hR1W83!Gwr$(CZN1w$
zemobm8mt~8qG4fV0@y>VnQ8)X9Pc^YIsS936mToi>>TyPE<z~;YaQIr7-E{~#Qr4E
zsAo<UU4h{<-nw03E57@lWjfi!g&7DF28?}Xe+wKlDeHw{5q}|YjBa+-)XxF>?2>uR
z_6|ZnpV&)R5*~BWzsPssl(50B)R2faviTo8PHlFoG{z!;W3p#X2udIOBQjepfQZ&|
zFt%SO>>!RL72rgGl6ksid9v^qrV36lAgr;-*AoV?yTOHr_qbMSj5RH*9!LQ6qJT@r
z;R`1GjEuz#_kU+zWnW=WL=&ZzIF@7Yd7tVR5J0GQcdN|meTt=w8kqkp?9KRpi8*R!
zkHUtd*i0Az;{%TJjvDwDA$xhe3*JY`44_%*SJHImW?;=72p8K_c;gxvV+|ZMQnS(<
k%<U3xMTKFEHK|dGb`RI1Srg6^h5!Hn07*qoM6N<$f|GZ(bpQYW

literal 1509
zcmbVMT}%{L6dqg_sA8nmMy!cU7j3A8ow>X0-^j}T%x<BwNC7Kp)$TBJVJEmd<Ln>{
ziioWWjRg{0+q5?FKw6$ECbfwv%~C-uL8X=08cY)ugvM&sqT&xSy$h`N!T8Y0%-nm=
zobNl|IrrRYEXaRz;rv(TV;HtDH-|1nV^ZWvh(qs`357w!GTBuk7YSu@6(d2+&IzRu
z&-F9qun;m_^|n5kg<&cmUtA)Wc=9M#@N1cfk2d5N5gNm?vO^-nRzMjqh2?y}s=4_?
zScCJNRkP9HAw8lK`uLn02^Q7l7qc}LtcBBLuf?-M6e93LnZZN;t$`pFvT9~{DKw9m
z2@O8uB3D>7v!Y5o1-Mg?Aa2m=GguM;+-TH-OoPz~(s3OLbOecRV+P2i3`R<4!sjjx
ziY9SoR3Yu2i-lHJjZc<EiXf`0s<c&ltss>Xz+$mPICQ!U<dG4q4#-R>BM?lDGSD!{
zO1voZLI962GNnSLY}Fv8vnlvRkLL+-AUIbjR5BvOhy>7*gx?>@YsNb$7s979p6MMd
zt`;Ft2!leU#G?HuOO1k2?VcYf;)v8x>m?p-3bU0K*h)VP$hovtgT81vo}=6*lN$h2
zCTY@<Ml(R^XF45DquEZ=CWkB266JUn)@3#Vy~}O4yLEN|T);xQEN)uwa5)SPgWgU@
zvAKbu%mi2%jmx9Bb6CrBv6NGSj4VjSg0MB(0R=um7J@!O#GOS3Ex<ht%LgKs$Og^k
zOGAm@4mr0Z`0<$vQ~Wa&ka{!fpQo9dodBgyJAq4QrVVDKeiqC9pQ;f^3=wIM|Flcg
zgnBSCebW4B@#Ofx06H@gIvkrP`0W@rZ*eYdFAfcrPAN*ZYSr$>dPkQu+!Ygd+Id8M
z@6zpEU0-7><J+#)U&I<xux+UYH&pG1=cPJFUQ@Zt4yhGodYjD@+qNvNYB=0}c&#el
zr0TwTB=Nw}6}3~!qtiQEzf)x|TEF~Y=jR=xb?VKvttS`Q7RIHWW1(kWA4pgSNO3|>
zCNzMljmF{fmV(vZcR=xUfA7mZZNyK?67FFgbXMcFD||oiY#Fr0HN2J6x7+WIJCmM>
zt2V@*_`dEO5V$2@id`PMpS(NtP54!>I%NwWJ8NR)znkOJul$o<M{}@a?^(rb-{8If
z2lIB)<wv`&O^+mX=<V2_dF1rtqRWe#TE<z}sXCw7)O+yPedEWMz~8;?rEtGD-F8Q5
z9u!k7X7kjQ(WN`@e%ko)?YjfYY9%@OV#2A~rt8Y4Q|}*5Il1`!srZ4wrV|rgcLt7R
zXMLFYhNQpY)4jOnh340jj)9)xjFyikEe}_X4vmK&PKKu^x~@((zI&$9rYJUmrQM28
zuB_`>2}{;?h=1vBHI`oJ?AxP1yXC;+srnr`yt@5ZOwPD!<h|hwDXq<+2L*#vYWLFG
zn6cwOQr8#Mf3fI;bmyV+*fICs5uvUk@5H12(Xr3Ms|Ui$#<KFV`<kBK`-NZae~{m#
zyR>W_^V@RU@%6tLx)XO-t3TmGt;uakqXR^1oBArN#$w{Idt7(_nwNIiB0t_-S3do%
H!@K8S?9(ld

diff --git a/pelican/tests/output/basic/theme/images/icons/vimeo.png b/pelican/tests/output/basic/theme/images/icons/vimeo.png
index dba472022f0fcf7ecdd8f4847a8a3bde90789bc7..4b9d72127c574237090a2f5f2f7eb7be94a2b62e 100644
GIT binary patch
delta 333
zcmV-T0kZy}1l<CV8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30003JNkl<ZcmZPo
z0`6J+h(u7;)_d;puDwPO0hNLD05On5B!X)|n4!J>Hk=D&w_STxe({COrkhwaOuhZ~
z|Ns9Ve*S^z@jCS2KMX9n_ZCG1(10ZmKES2RPdxz2ZMysN{ePFQ5RrqoAERjS+<Uuu
z`>_jmA3>xipSTV*f<3dnY55k2$igG%Q8aK**~wWw*R*;f)Vw=Sc$R}yY`O+@mFwhH
zC>mg#0}o!jhNwXH!-iw$fF@!OrG@)XK@<T4=i=*6KnBno;zj*9gEeL8&i|;urKTTW
zJV^F$Kvtd9H%1TW7<?Llex0~}7sMq%)m-hXamF+pag<JVF7FbJE=H)v)PSZ3=nSA$
fSXBcN$;lf4{SCr3%yBq=00000NkvXXu0mjf6_k~N

literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

diff --git a/pelican/tests/output/basic/theme/images/icons/youtube.png b/pelican/tests/output/basic/theme/images/icons/youtube.png
index ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e..e334e68eed877dbd5109acea1858a533a3174b2f 100644
GIT binary patch
delta 300
zcmV+{0n`4<1H1x|8Gix*005AYXf^-<00wkYPE!EU0MP)^r>yKf0002-Nkl<Zcmb7A
zH9`bY41EWn+AVQ73hotG*bcb?H7ylx6>c3<;~pGJw8CA(gtzXSA9?Z2Ktv9vn%k<g
zRJGJMF}!%LiAh921mJGew5B4^98Na_;CQE_0)Vf5m4m3G8-HG|#sD0D|GpZqAl-}`
z`dYngi*9(m9=D3GA61?ApR}T?2X-plpApuOAwf@0wAk~{Ueigq$fKtxFccsr*i1K;
zkuaUCf$7Eu(?tPHavaOL`u<L3H(mp`5i{P^&E7-}p7;%cZ;Nbj90SB#+Xm+5EZfr)
yvEeocF5l&v4kcp-jSU!vHHb*~-y}#B5s^RLsrl%w&%5IQ0000<MNUMnLSTZXuY=?O

literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT

diff --git a/pelican/tests/output/custom/theme/images/icons/aboutme.png b/pelican/tests/output/custom/theme/images/icons/aboutme.png
index 9609df3bd9d766cd4b827fb0a8339b700c1abf24..600110f2f63811ebea40af1b943fded0275b6a39 100644
GIT binary patch
delta 396
zcmV;70dxNE1)Bqq8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30003{Nkl<Zcma))
zHG>sF5C*?}?*0<o-QC?a!QF|F2zQ9_m|sE!DIOBy&biKXU(d|BZmm^Nz3u@>E;|N)
z)V_EYN-jDO9X%Hg?sQ-_!UBObw4%BSi9<}9RTCVhaC-wFDSt63Q`c8<W39w8ps2ag
zMG%-w$|ePCXf1(Bn;QU#%K%YBwbV8xCvJdA%M3R+ffOtf+big%np@9dNnKl7bMK`{
z^5T5hyRCch0YKv1BzFZwW^74pIM1(Vr#GBStv@RgUv)aQ`m{)F@j<g+xHq|YzY~c=
z_B71^RMl^erhg#R{!@{J69Dy3KSD581)`3(r2l>K$|J3OMSiddRs94I-RZ%BpPVQl
zG-*wE)^@pKur#bMkyS)ii4hvVB0PPwtX?$Lk2sgu3yxdrMHBD`H`aw%Ysl&kiS1h=
q1)tbo!~Ye`fCpjdO!(yU+ZHs&^bQiZ<l_JU002ovP6b4+LSTYh2B}p5

literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Ta>O
z6XFU~z-^brZ51PwI9(_Kh^7g}PZf%vA`~}SFm|F~be~{E7r$Q>mqnyt>;%CWAnF&0
z>J^CU7KrHN4{PNQZsheU=5fy8Gz;Yisssv#ckqX`@rAbXg*5X8HSz`4@%dHr`jqpy
z=5RZtaF_)12GsKU*YNsP@%UEo0L8sad4MK(6mq-eal2-7IizygC9)g&bNiP6KWohG
zS-|Cz#pRUFX_v@p6U%1c!{t%H>ygjnp2z8w&f}cUVI9k18Od!O&8Fwc>5|Q96~*D0
z#%UhPVH?k3;LWPz#^I34reVi!8_%X{#by@DrewmR<-%&@&nzOxqVB+|@6E{0!>ne@
zqU+A2Y{jhQ!lY=<q~X9QZ^Ec*%OGo*Ey1r33?s&pAirP+hi5m^fE>;OkH}&m?E%Ja
zC$sH<jJ=*Njv*44Lr+}~IuyX*dNEnZE1;`^i>aw(BO9N_QK10Mpk${dC;$Iv-Sgs1
z>}GlM0tE(@$Z4WS9~SJov+DT=kEZa@(E0WcEcx0FsV`5Db6NC!V}woNM4#AY#y4|V
zcGfJc2;H@B=ic4*7ff{9i&|5ruCcY7__a#1S1tN{P32SRuV!D_tlt0mk+S{xzkezF
zn-7Y&EBC3-DcWUz;LL;X@g_ZzKBs5>H{b4a!=6dHduc-B)u;`Jo`r8<+{W~Vq2`0N
zaE8$A3qX&kmbgZgq$HN4S|t~y0x1R~14Cn717lr7(-1=oD?>9YBLiInb1MS_`T5Fb
hC>nC}Q!>*kF*O*PK{PbaT?tCT44$rjF6*2UngApI;B){0

diff --git a/pelican/tests/output/custom/theme/images/icons/bitbucket.png b/pelican/tests/output/custom/theme/images/icons/bitbucket.png
index d05ba1610eab6ec3f9a4dcae689d4d88bda5433f..277a7dfb931349c3fc0d905c8225f7d08677025d 100644
GIT binary patch
delta 517
zcmV+g0{Z=e9qJgca0-6`<Vi$9RCobhlGEB8VGx9KW6RjKZD$qRwrx8Z|F&)0w%#@R
zse>*Jzj349X=?9_$gI2kIcwdunCZt<z;fkFc0^`9mM`WkG`96!{+zSmOyt_DF(=<-
zJouCUN-2J&l-&Q5f8ure>MPOnPe)w(oZZmY=P7Ks9%FQb&pCe?mRi(2I5a#OFhj#5
zX~ivAMte9hPvOw>RNVnVZxJRqq-7T(x806E@F;ozqonP3;+J2Doam6S2oUoW{v}rH
zEt0_^xDCBk=7xX;iioANNJ3Jzr;t_FYP1Ua15N{&ZKC~Y3NYIwcN)uN6>`ekJOw_&
z%wsAlFxlka@l}7tH66vZ9lzo$O>|s30b-uQ;Lym1>#=%^$O9}pA6eh#>;o1kA{GH+
zo&t01Rhr(a;LSXymDhJ&`<4S(pomxmi1`b@;wn*jb-hL2buS^av=!{Un*as8J%OMC
z-&;+q-S;qg>R|<&CSZZ?dzgepAgIvZJ#gcDZc;&0X<dD1dPz%URy{~7X@MpcG~fQ2
z-_<)9RNx1%y&7$@E1Pe|UHh8zS}g%AP(%(@=pC5zAF>RNaGgcuWqg1lVi5=}@L!f*
zh|*gn_umC9(52_2umTJIY3=O)msGvyLDH<_8eoAU24=<p$6qd8X#l}k00000NkvXX
Hu0mjf>frk{

delta 1058
zcmaDQ(ImT}fUBN?v%n*=n1O*?7=#%aX3ddcU|`J442dX-@b$4u&d=3LOvz75)vL%Y
zU;qJ|3M(KpH?<^Dp&~aYuh^=>Rtc=a3djZt>nkaMm6T-LDn<APC^+XAr7D={ndliP
z*>Nc-DA*LGq*(>IxPi6T7h3_jwn`Z#B?VUc`sL;2dgaD?`9<mahL)C=`UXb&Mn<|o
z6}rWhc_oPzx_QOQ5K~|Vxug~+7iAWdWaj57fDBGd$}cUkRZ;@k1P2g@rX<7dDJU(<
z0ozialB}PalbV~FS5mBRsAs4THyx<iCMDUbxHKs%HMs=ra=3Y5FE}Np>mv!<=wqt3
z(FZvR$%&8v0E+@cz>dqNULPKuc3e;Gc^w%Tm~uT`978ljU4zbN3p<L;yLq!@v*+Zy
z6Xb6%vEPz4`P!C%3)4D+T)5;!_~oiUs#I*|nD>=G;NWZ}Ih%?t6(5u;E;TO<5nP=a
ztTM%H$q}{E*=8@*Zr=SkJLlp<!_W83@6Z1JZ1%!A#h0YNy6xUjpQ<OG-TKz;>Xrt{
zUG~<C&Mrw#ci)l`@i9Y$bL-!4tNEAKY?KSSx#D8}3$FwE!cMcpw*NY=70S=wKj%)x
zmur7s?pW5*a@*hj|EjXmsrC^wX4$Mf?emH6@S7cfjxYQ9;cNM3*Yi9-;_mEim>dwL
zJB|NaPSO9T*IV9QZ?0u@eby3PFMHhP%^$P1+uklJbmni?5z<Q)o?mxOqtJTW?!C9Q
zuHP2=%ve5GuUyuPQ?(^HGtY=IAVj{8T}A8Mfi{;;pSyP=IMjmc&OBq1>0@^k6J=A%
z^7#7JeD{gOp1Zp(?F?nyz8%f^bMn%z$2%T;S#4Ls?H+QWsn*R!b&Au26qlJNkJO9J
zU$0{qJ@f35$%6X><^~BkG;3>}=;3p_+UwO_@cY4uW3uag_!-)p1^5>7uv~Z`r(IE}
zqg9~wcKe*;-mO1hs=T>4o5{&b^4%LjmgCi#Fa8#8{gt<K)3#JI>j_)F|Cz$}`^Axt
zvf8qOyi*ARN3uD+FK-GrKihg*ebK{`#aCMy>v>pfq7H=TmwbA?^`?)G#=QOI>^h9C
zwc2m@o(;dW^1+V)i+jQ;*SB0d-P`L`d?nz0j5IT^vr1>H=S;`7Te2TNUpsZST*u5}
z_eoPrwBCGWe)50&&WX}qFMFI~uD8V)Sa1YO9lo|-xljM?(I1vSlivQFKKIf&#tFeE
mFI+7?8KbsL>U+2Nhhy>AKQfj$R9TdPGPtL!pUXO@geCyhYq*dA

diff --git a/pelican/tests/output/custom/theme/images/icons/delicious.png b/pelican/tests/output/custom/theme/images/icons/delicious.png
index 3dccdd848ec99fba9950e8195d4e73867ada2738..34868c5c69979ebabe19d9808e1d20298c196f19 100644
GIT binary patch
delta 805
zcmV+=1KRw)2fGH4BYy(|Nkl<ZcmZ9E1FR)i0EWLgbMCykbA9(&>)pJqZACTW#!hM@
zD5IKDqq;%eMz!tbv+awqP8IHt=!XVSsZ`n>$2lgOwFdh8dv^BsZ><jO?rgQ?6?v<8
z&iuym=Ei)j$E*iAt2@8G+HYpo%Ugc?1M&LD+NGCX^~Sz^1Ao`_Z|$>=Ip!D&d6U-G
zE$rB_o9_?6^DjYr6*f0vYEJRT0S#~1<Jc26x$D+9E|smVJFk86$wvi8gOJ5}!NR;G
zbO8abtC2~YMBOGMYjr;O&~L~nN@qcB1%L>p0CY6X#gICFT%hKF?ZEuBN0h9f8yQT!
zsfw-V%t*t~0DlFfB#8n**8x)US;gXFOq?h-R$_?f$re2#SK`*QT6;%nx2#rMTo9yb
z2xw>;Kmt_J(kbSTxCo<!Raiz8T}Tv}jKB*r96Tg0m&IbH0U(6Q(O6tsfJQH=(6F06
zsC5V}z=D$UdppKHm#eF*hxhOQ`HWi4XJllC!6OH;?SGKb!Ou82aS_>V&vDGII@Q*0
ztXze>Y0y?EvpD;f$Qf_V$}hk8F8}sB-x3Bo_4+d40s#=w-C5?RuLQfc7J&pP0SeH0
z=IH~*E3ZyeWWLaKa;n<#{6&()M^FJ08g`RoPAL2{P5>Q<fDn~}CUlmTCHwae*`mL1
z$J=on(0^zwfl5$XO00aq!?ra*2Oy6Bcd7s&4E&Wd&NypYm|1Hm3>yT#OOnPY6%hC_
zU@<y8#LDs{0H6TSga8x@YCr${)rQ!*wKo?89#Tq_O8z?l9jLHYi?Evx08*MrX&^KM
z(5TmH)$6an!IIO{lVPDyA_&(p1bE&GN#X#@5PzF^fdatyZ4ASp(eP;6E`Aucc6GP+
z$gNxV9RBUMIRe*4mmX*yEiD2=&muFe-2cD}YS)f#dvt78q^aEW{a}1*>bFLvVlF-W
z@V)cWvaGQajvILP(n~H#fBxyi-<DQ}R?j&7qFTLShX0gXq;NO3@95sl7s~p(?|xa|
jzaIac5CCBBo@4kMSJ`#kmsvc!00000NkvXXu0mjf5RH*c

delta 937
zcmV;a16KUI2EGT7BYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH0~bj|K~y*q1;M><8+9DO;eXHl?&phr@k{KwZtJ8r
zq)AI+DoYGRC_<<k5ePBzFO-D^2^NsLF%$$$Y%Fv@g-Uco0>Oerq^Ob`+NMdMNmJK}
z)5LG*d-L6Wc^(6xSS(h?<8dRCv6pJK*-N!ry|lD=zU=6Cvvz*9eR|Y8ZTDx>gJ9aO
zW>1c5>D0;0nSYIYs2_ec*4Ey;wY<Faeyx7dZZsO?vT4fYGtAE~^4ER%_Is$5px1-F
zXTrVv2Hs<jSDQUP{^-`4E|)KTaP#ID3IG5A075!##q+i%bO8mfYmiDtOsZ+NUkv!=
zu0Pb1Npb*E2Y?A8049dvVrdgU%F!Q#GlurQ$0Y7zT7N0h=1B78)u-CB3_yT{I2Hg*
z6Cfd*5jvfSC>Bn;5kze=d5?*!aR(Wra;~tbOQk6n6iE^S28IC;10{@PkM=_sWfib<
zN2t6Dv5-nBydcHqKk6Nw&!>g}N~Hk+008J5K8N8Pi863TKFA4#Hef?R{JC?xzw6`U
z;|HzQ`hQBl@3X!Alt&LYah#ByN58T8-!(EXeM4hmK&f2Co-UG2Tb#|!&^frRrmfot
zymF=S<Jrox6be@bDgs%7lmJpazbZR>A|jE91R@fPNF*X6Uw!$hG@H#gbvAe5wL~g-
zeup^rQ51ogp);b<%&}090TY-2A(DWhOb(AUt$)^*qiPrDe~O}j;qVY7MvR0=e89tT
z48Q~+iXe(05da7Szq_*X#=c5t?5!{y68J805+M>0_z_^U^LUHy(Gvhb05FsS1cCng
z`k$w&UZ0x|0uQY<A~7NXU;;&6^d~r@F#uYp(b_^87GN;w_e<BWe`xFd{U>2AS0D&a
zuzwVIUY9r?14j_0@d5$B_Z=+DVmR~|IWB$}mM>H*v$|ft{9t3_8G-9yY7Y#LsVRkJ
zX3(iJpMCzFEX-G(o!tYKB)aGO!M}TZ8^dBTeR$)>Cv9!p_HOg)(${Nmzm=^2eRt!q
zyLG(s`nCRGm=1kEn9|BUeR;mx%jRaxJ0f@f7_?eHhX4RqE;sleG7W{b<gJ)y00000
LNkvXXu0mjfPe!3z

diff --git a/pelican/tests/output/custom/theme/images/icons/facebook.png b/pelican/tests/output/custom/theme/images/icons/facebook.png
index 74e7ad52f362b56d584df459bc5141395c32b7ed..1d8a4327d59337d8e0ea3c8e3760479a9c7a4952 100644
GIT binary patch
delta 133
zcmV;00DAw*0hR%f7=8!_0000V^Z#K0003P{L_t(|0b}_8|35_-Ojt+GI0MB0NyKN6
z4fszECfb06iq-#Lzx(nZ3P?5prkQL5&^6N009=5u0SLb%`ya-qgBR#;fNRpc|G6z&
naAGJx5d-R>+yJU&CW<fsk3gV{01W)j00000NkvXXu0mjf8~-+o

delta 186
zcmbQnc#3g?L_G^L0|Ud`yN`l^lth3}i0l9V|E(iu08v84>euhS0J*M7^Kx6Zyqb|N
z4phTb666=maOR1l^I{;6G0EHAg`tC0)&t1lEbxdd2GSt52ZP(mY&#&s*3-o?gyVX0
zLIb0ls)0a4LX&~W0iM+B3LMU=BBuh3d4rr%SF|}T4T*7{Q?R1Z;Kr%br@arK78c;y
cvDAQp;Yq6S>qU3dKqfJGy85}Sb4q9e03k|1@Bjb+

diff --git a/pelican/tests/output/custom/theme/images/icons/github.png b/pelican/tests/output/custom/theme/images/icons/github.png
index 8b25551a97921681334176ee143b41510a117d86..5d9109deab2b3669c845845515f4d53ab5d6daa6 100644
GIT binary patch
delta 582
zcmV-M0=fON4c-KhBYy%VNkl<Zcmd7U1MJmN6u|NKvTZjuXIrzCttneG@|bJLZVF?@
zlx^GQ>3g@6&i?1|w)NXSf84|8m&o+0UbR{k48>ZU#v6!wqi1V1r%EE$MYAT@gfEZ`
zebJgG`3x?P75EOx(Rb}pK9^g49TLfPG|6;$SG<Bm_6l9o4S#PIZMeTgGjDiB+%N^_
zu`S1?UTN)lbAAIA3tC_`#OSB7;uwmD=4H1(FfYr8np<3J`$3G=c6f6Ltfuyrfkr5l
zFjqL!Sb1~a)al*)&!p{6Qi}-hBQ2cX+kYn1z*i?}V1xw*LM)wGBP5J;67HZ<gas<$
zwlia7NZ8~AhkrzTJ0IfA*c5{2ox7)e#0APb5A*pDd=D{hB_dy;C&YN4u!ri(KUm-@
z#PSw+9en|MLM%6cY7vK5b8jd=PCCH>5f>QX%s3f>tDN8|6p1jri1rc-t3pC=h+|QN
z1r|XZy+cA-yn{HlphgaZYig}H-l6Qz<RuU_7oBhbqJKVPGlru%3Ojdo8;rtstq~V9
z|17SD4-kCE1Qf?{h_M~X0v1SOCnN(OP|r4)ZIW7}q5U91`xJM3M@R-{d(YNG5Vcp&
zD_|(5qbCZdSfFYK!w;c|*Pw=Z%N&#C6R!fqqrGdSYf>LqAnG6{VGyRGM2-twLH%sL
zMC^7NRX@mKf!$euxzT6!Fg(s<fhQP_WIpd?WiSDk@f5|~Tw<DY852<^@xNa`0K$+*
UVd5uE0ssI207*qoM6N<$f=PV_=Kufz

literal 1714
zcmaJ?X;2eq7*4oFu!ne{XxAht2qc?8LXr|_LPCfTpaBK7K$c{I0Ld=NLIOeuC;@2)
zZ$K%a)k+m-s0>xHmKxL%0V&0TRzzznhgyqrIC$F)0{WwLXLrBvd*^wc_uSc%h%m9E
z{W5z3f#4_!7RvAyFh6!S_*<8qJ%KOIm?#E|L=rJQq=gB5C6WLG5;c?r%V0>EmEH#X
z5eSwPRa6WXBMs#$5H%GtW2go-in9p>zW@UYDN<n!NPv@68XoE4nX@E7rR0&KnNm=S
z2Exgz;A|}%nH?6T$WB#ol%xQEz|X+N1=KJG0S0xNM#nYqNK?98d~Y_>NWc^XOXZQ?
z1QjEV00I#$3^1wQUJ8&-2UsjB-G|9y(LDhMNN3PM{APL4eYi{(m*ERcUnJa{R+-3^
z34^A6;U^v`8N*O6ji%S@sd{fJqD`XFIUJ5zgTe5^5nj414F(y!G&=H(f)Lgzv?>%+
zAsWD}2qhpH7>|TU`X&W6IxDNuO_vET7|j5oG&&VDr!)hUO8+0KR?nh!m<)a!?|%yG
zqOwq!CWCcIhE{<$E|F|@g>nP6FoYr6C<IBHsbWMjf+4zO1O);kS%8}qQm8a$gZmUi
zD&<NvIt<b%V2O}N!ZoNWm69uB(tX){2A{*><8>D?ID9%&5J(4oSbR1I^byW*g@__U
z4QsF&uJSEcFeleM3~ChjEQGbHOjsGDMbyAl(p=Ttv9RaVo8~I#js@@Y9C^_2U})yn
zzSHU%6FxuY?d;&<huP7GHTb-1@xlJO(B`!HdyxqFQHH(?73$<tXlZL#R;c$4@H*dP
z+g2Gl(SNi>65MyR({^lU*3$z$ZllDb(o&<7d;A_`h<Vt-co_6}4qhm4NL!6;QN;~C
ziOs0?+tNQdT6JgR$TNMl?(B>2U+3~BJ2Hv`{W}KEU801#cv_B|9Cm!ynR{S`AMsSn
z;7E=B;mb!wx$L;S>yGXG^6=&WlQn9$s?&L%Y1D8TI^MlKB1DqsEng$>f4=xYWBoPI
z_S1p!sJ#d2?YI4kPA{k}Eby?F=f-J9zIc`YDl^pzjVm~9ebE?Hn?t0Nx+la|D0MB;
z9)2xv1G>a1|A9kQ>~DV<Q;Z7ho$L^b&Ea$Dj%<sAD|e;zY><=X3-4yC&n!m8-3K#P
z{X@<rb5Hi2cU~WVHh|a|UznA=S2T~Zo%gX~ts(4Xc-Qdmw#zoiO^=#q#=Wa8_3kfM
zx=ub`8M3t4OXkYbtXVWMfw<I@{5w`SwWrV;vC8G9bB*bHN)Yk(=-utUw^Ilfg?CQ4
zGSWYIztN#z924;3n11kgM76CXFCp;!j+#P#S@z&Wc|z;)$KPUozl=B>0zRuQsy$+N
ziSCoLJU{Z$nQy4A4Y5UJ07$5FA~qL2%Q+cLaqDU?Lz3?=BC5;Nk6BbTmmceEaM>-Z
zi>O&-dSE=%ex;vcvCOk{*JQ5^_<YkKqpS$DAH0F(H<X7Bw`87_MOS)Pg#68pNxjDa
zB;jK$zmn_sWuB8y_{V!r7^(ToKe<wuXyxcEh_xT;sDAHiUbnkXO@U&w%;a;~8w^_5
z7JIw!*5j{umb8@5D<0X|rEcyQ=TV&ZS&EAftyyndd$Eih%<?R`$2~8S4QJH5$fAeG
z=l34zf}D3MsipO=ZSVHf&ktr)HOpO__7^nu7LNz%%Lk<ETz#8t6H|H@2wg%He@aa`
zq1}V7F@MGV3R$*cH!B-|SZ5VW<W<&vWR!!JM4Cx^@#nE|aNkx=5~sx;c)F*Skd>4M
z4lW7%l9IqY(z7pV(?I@@8=KPFO82)O{VDI18-*d-k$YmI^XiuPs_LuFw<^ZcD}yP5
c*NrbeloN*74g`U%%F6r~k%+>C^#XapzmV0H-2eap

diff --git a/pelican/tests/output/custom/theme/images/icons/gitorious.png b/pelican/tests/output/custom/theme/images/icons/gitorious.png
index 3eeb3ecec36a73ff505e04ecdecbcc4792ef6786..a6705d0f462b505be4d9a5a372743d206c141a11 100644
GIT binary patch
delta 122
zcmV-=0EPeK0p9_TY;#^oL_t(|0e#5D0fSHgK(Y7Teg9eOULeO1?3aKI<wLO8vObh&
z%oyiabZh%T%-*ZDwfFgmXdmJ=gdbWw=-~yJmQ!-zQp(M6jf(`SUF=6zDu2b30i^jL
cLGneO0S-n9?Iv%40{{R307*qoM6N<$f@ozpssI20

delta 126
zcmV-^0D=GC0pkIXY<FTwL_t&-(|ye`5`Z8K0Ko$#3IP-G|9`cS8ED+{nj_01Be_ko
zAnlp75qc?o2`=J4p}SuqmwW$08PD=GA)NOfKKp$JNLE!3I8>`8AeosdsG0qQx@~m{
gLjq!&M2IZn3l2sJ?G?F6i~s-t07*qoM6N<$g6fhoWB>pF

diff --git a/pelican/tests/output/custom/theme/images/icons/gittip.png b/pelican/tests/output/custom/theme/images/icons/gittip.png
index af949625ac83d2441215c81650e897c97d9e5d95..b9f67aaa32a0acd166d7271b3dbf9113717d3f00 100644
GIT binary patch
delta 386
zcmaFPJc)UNWIZzj1A~Sxe=v}m6W|l#3ZxT#Y!bY!fh3p#BB5*_n^<@ANM|FUY^1Ys
zjGO6|b0@!i{xo+&TfC=bPi^6ccW>|CzL62)x?$P8|NsC0`}c2FPg6@t#<6`n<2)@l
ztyu8;_pcKNcE@>Il&6OG))mLNo7JB^e(3+d|BoNsjdC$g_P77_^G9B^PjzNYPi;|x
zx7DJlJyY7NSIwK2;BAxOW%Vgy_jjNJIZJ~4f*Dk1-1@cP|G$f`-F8=jT<_`P7*fHQ
zdfqhYsDnUrV&-P$&9Z6d7@fZF_uSzloF<X{eV^Z5{Y8iQ_B2n_3{;<(I3aCTO0}ld
zG);Z4m20w6+dTdqJn?@@$}bPMOI(+X{|OdnfA1+#x$jqP{GMHK>EW*@CyFpP1YCWw
zVPl;|fw(eb)gC4ri^kIrmaM<S^u^#yo9Oqg*Ygk5a!eNU_xo&jwe5?s=X2}iUvGBK
a{H-f6U0bBbzD*J6PzFy|KbLh*2~7ZBnzA_n

delta 472
zcmV;}0Vn>F1Lp&f8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66
zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RX2>}BM1juc&=>Px$XGugsR5;6H
zV1R-IZyPY3=wqXj;B7qvNZ$hDUr>AtDyD+077l<CFhdpq*?<3m_#c!;#$Yj!8e~1l
zHeXD@)P#YdYA&L<1Y{~qbF91h|43&epiR~YO+a>}v+@5JH&eJFFqeS+jBLY|b0`0Q
z`TXhs+zD-9!{R+H|M%1u{{Qgq?f?6?Z~V^)aYc5K3IjB7{()@Sux#Fc5cv1+ADEui
z)AYZkBm*u6!hgs1?ff4HG!&|51_Ly-!Oq;YV!?kH04e_c`xn?|n1LYr#DU#F11w-J
zxWxdCCa^$xYWRObptr6V*$cl=42W?z`+xTMA)r;58bP){esK4Hl#4Nj0k@C?G1=e#
z|F54v;Lb)4le}mj^k}^W4@6{%>dY9FfCGV^+9H&wMNtk!6^z8<Z3Wf<1B<5iAO{?3
zG@>UY7zV}vl=kZXtL9Aurw8=Z2v0~TN!c6CC0<srILDuqDauTgW@i9z>i@@)Shtn{
O0000<MNUMnLSTY%0MZcv

diff --git a/pelican/tests/output/custom/theme/images/icons/google-groups.png b/pelican/tests/output/custom/theme/images/icons/google-groups.png
index 5de15e68f4d1e4176b46fe6346d42f53e3296b21..bbd0a0fd41295e94081103efe82742a5c6411765 100644
GIT binary patch
delta 405
zcmV;G0c!rE2BZU!8Gi-<001BJ|6u?C0c%M_K~#7Fh0rs=C}bbN(es&M%Trs%n63FP
z*|xU!S~91!#3kEHt~J}X-v2M_@;o;F0-t>JdX?YPsG(G*(IkH!TXUTa|MGXJEV^uU
zO%^6InT39DmnQRTDmNYeGWaW0niK{B0YDT075ME2GbG7G0e``erTaV7m>HqLq;ls;
z@E6;jJ_t!ni{D@@OvEAE{0m%k_m}t!5J&C&e{jw%pJ?$XC{2oj6x*FKDoI5ID2x9=
ziZ?$RtNv%)bLwC47XX(%^qmjB_^T#Z@(D9JVu$~NMVo(Par<w%;OfWz;rKmPan?;A
z{dt3#%;bVQKYs`3-$A9Q{GPt1rQRSFm;ow5sT2?@^QR4rg$anDgeCx$iqb6h2iG6)
zockYoL<MGs2$l1m-AhHOOk)WzKKEExUU5lR{E#fkMyI^rh9|$*1}D9nrFre;r@Q~Y
z8?zi6ocPX{>!0v;mgd!$p2~_@_rOO_1Na`l%Wwj6h7Q6{00000NkvXXu0mjf9WcY~

delta 791
zcmZ3&yqIl*WIZzj1A~Sxe=v|@Nq6*hWMJ6X&;2Kn7072S4sv&5Sa(k5C6J?#>=ES4
zz)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;1`b-0SLR^6g{{R24Q}jwX
z>GY=$Pd~nY^5Na%_irD)d-LG!>w9ls-F@@&&Z`&ow_ZNG`Qq7)=TEOadvfL3<I8US
ze_VTiJ9YnZ==^Ed_QSU2yH(RSi^i|!^<PYDKO0wnGOYUe^wA}kp5IQLzZ^P#+O&K(
zulr(B^ZCici_YD@9f7*qf7-VGumtL=|7uqE#lHQgUF(nU-@lvHeKx82WK{jpu;Rnx
z2N&$xe=I)wzkcD7|3+0G4Jtl7x_{ob_4}eD{}&zkXW978qT%a;!~Yf>`uFhOdF$qH
zom>9S-1~d_?q97N|2(*R?)8gXmW@CK|Mkn?-@kL#u=0aJ`TKjf&%Ahg!>Ia`UfH`l
zw@w?^e9|j@d;7+zg$rjaSTKFwys7i%PMte<>YO=KbW7gcynf>ToimH;7tLI>Xr@l_
z>w^b2YZtx*hS-+1tP6o*$5ImH2aJ^Owa0GBBm()2N#5=*jQ^Q*?*TavJzX3_Brcnt
zsElR|lxX`H{!MpNPvMys!%1t6rxr*|tvw|&b>kF`FMszt>A(8-eCIs*hND@Vt>@@%
zKVJRj^ZXeMYZ?<Y&ba>2=&a{_q}ik^;jd!Z*}p8s(MS2ld8e75*GxGr{_ns<PH}w|
zug;>%(paa0dj(I8{4-Ytt=uHlv|4Xv?``Wvcg$U{ITdXG={G%TuU)d#p~H(;U8-$v
z{MYh8wM8UpQ$TH+b8X9qMH-uQ_B=}ebz9<Kx<rNRw%?OAo8o7meg0m)+yBq$dQqkW
z*S}Yp8${+M@W0fRvHE4{!1>R(`K9>h#VV>L#h3m7y{lT{8c~vxSdwa$T$Bo=7>o=I
zjdcwSbq$R}42-M{4XuD|0}CqygM;j6rlM%b%}>cpt3=meU}bCu(I6nQL9Gg?gTd3)
K&t;ucLK6U@#)k6%

diff --git a/pelican/tests/output/custom/theme/images/icons/google-plus.png b/pelican/tests/output/custom/theme/images/icons/google-plus.png
index 3c6b74324031611f20c0a3810131aa74fd0a5a9f..f8553d45ef3c858672ca169868aadbaf3c14b8df 100644
GIT binary patch
delta 485
zcmV<B0UG{~1pfn&B!9+9L_t(|0hQ1LlOsVC0O0-~v5iT^PR_P{SG>a6wr$(C&9!aY
zX77u!?)s|hF_{^ZF-A8iD1Edxd6XulcM*01MA`|6VG^Z|G^cMnS@SQXv9beuPj!6h
zhB1jF)F8|%heEiGfH+~e8kNSDH@#e)JW?4qX;Q)GT<Ep_+<%ocTp8yPVwFKL)Fy*C
zc9;@j9F;R(5j#{714hoPEP-xa*=pT?i_{BB-WV3Xrwx-w+TBv`W<k5*=B&_BI^5HN
zh5X!w(lCoO)a($s`=jG8E=>7t5P3nx6N?e<z>UwA{x^#MIz^w4#;vg#Q`{-|sTaZm
z+z|gUicmu%q<^&)H&;eX85XhOcx`!R;U?1$y};|Mjt>)GwEXWn0YLw!%ul&`yZGam
zx=N@w6>l?tQS(0g`KaQ$xKi{>!+WpfyjM=iFUOs@I(NAe(mtT?O3oXC^_q}GyeP&k
z7&m8RudzETJws7@&*XmlUiji}_T#&GA=#Z6PF2alX<n~oj2D5PJ8#tR<?zqpyr&Y{
zGY8?%LvNZ|9XlCI#LkM3YX<#S(jJN^{$8zk(hMK&)(lq~1bvlIpNPnh1I)^4z~u*R
bt~5v&n>&-9Zv*P$00000NkvXXu0mjfW_j-N

delta 501
zcmV<R0Sf;A1CIodB!AXPL_t(2&ttgjZAlVhxZ`DU!_)jGZgkek5Qxq>83Nfrl?=B$
z?C#W0`gr{0w|9U4!@-9uuPVK-xtjseX$J$Kz!^tFAp5GD8N;hfZ@zCTx#3}QIWX|)
zo<~5rUx%8nyO~^up_2~!K*3Xv`at$2R}+T+|Ia`4GrHtrbbk?uJYwIy1j>GXU1E8{
zUJs6dLU1-v!-3nb2Irih=+?6PK<TfGB2Rf*{>KJ@8lF5#&^v9fcghZg&b90USur#C
zh_yBx0YzYJ9ftpZ|9@Mbb;3sH7#LlcapC{3OLv2zTp&7Rr3KUgB!TRsHrfndzX7?Q
z-YzOS8|-?va(}|7H}{@Z+a9#igrj|y8bB3$Ei?{TY620%iQu@K^On5WwfFNop!oL}
z^>%yB)b}8vU8ZUf1mQ9qHdo(aqPoK*_{p39|Neh?RA2(;;zSGwOjNfTDsM5=J-hM6
z|DXT=|G4|0)Cnwt9Wk75oBC+~foB_+Jy^5s@yQ4OKyE?z{$*F_7JbEysAvP2Wca$b
z=a8HFI$inoAf$Dud+YaKAU$`Jb=E@#p$MXe;e?6&Ds5S0w7GEY4`9G84o4G*AclRq
ra%;6^)}WxshhP7{>2h3yE)GHfn>&-9#5^N600000NkvXXu0mjf*YN&y

diff --git a/pelican/tests/output/custom/theme/images/icons/hackernews.png b/pelican/tests/output/custom/theme/images/icons/hackernews.png
index fc7a82d4d68068d5fb032885b93e670c385ae1b4..8e05e3ee207e114a96f3811f46f68d17d52fe80b 100644
GIT binary patch
delta 119
zcmV--0Eqv|8PgSz7zqRe0002(-QrTQAy5ip5>QN3Mg3?1|NsB>i~#tuXaD5J_o76e
z$B4WD001vZL_t(|0b{@m1Qi$r!3;wKW??Xc(Sbz(%wQEZ41g$d6oINX6oxVw1@JNO
Z0sz-j0)=#JDs2D&002ovPDHLkV1f^rEAjvU

delta 625
zcmcaCdQx(N1Sba@0|SHn=l_Wt6$7~HISV`@iy0WWg+Z8+Vb&Z81_s8w%#etZ2wxwo
z<osN{#FYG`RK1Ga0-!bq2Ac{iATu|$BvGLvHz%*ys=`(YtilS&1_|pcDS(xfWZNo5
z_y#CA=NF|anCO}487SFtDJUq|6s4qD1-ZCEwAWh!xwc9fB_#z``ugSN<$C4Ddih1^
z`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$`Dgv2DzjbCl_TFlw{`TDS!-4Ov*1Uu~kw6
z*#rj=ho&UM?I|cN$^qMwQlG4!nv<HFnpaY+Z>VRe4>ujC*(N2~s<<>MD>b<U>~gqy
zU@tf&rt2dK+vsDew$TSU3CW3&004^uL%@#9M!y~&oOWDK?Rg!6A-u)Y#WBP}F!|5y
zgCFKMG97SfjN1_QO8S7wUwdYb{{fDr(mpbwQyLi$v)Y@dH(WJXz4Y+af8UxmBo-BL
zDli{rxRz^t@Y5T&j|HU$W<Gp+j42xwiWA<*cgIRvB$XQ<$Vr>NErp?T<3SOHi#<DH
z7EN6FOoEv?Kv}}Z_S}c{N4Y$un>rt|&bV^Em^;yjEyXNG;M9SaOcQK0o;W^;S5uyG
v%<Vx5quJ3LN7(K$>`81md-6pR^Lti?o$UH5vr-H5L21O()z4*}Q$iB}X`Rn}

diff --git a/pelican/tests/output/custom/theme/images/icons/lastfm.png b/pelican/tests/output/custom/theme/images/icons/lastfm.png
index 3a6c6262b644dadbcf6cce5dfe4fed9740a9ec1f..2eedd2daa1429ba026c0b3c81f200c7df55d199a 100644
GIT binary patch
delta 818
zcmV-21I_%;2gnAHBYy)ANkl<ZcmX|+L!cx_7=XX3uJO$3DYk9fb}q5)9CO}VY&)k|
zm$hx1&u{#C-gHlORc$YS8)E3^KTb{*D^Dle+pd;{TwW^A3QsLn5p6`#iFjfNK@sOd
zj46@unxvEEI5$8_{h^Y@>KCJu$;;6iN)?b2a3_#VfTsWs$A4P(un?dlut21-!md(j
z9Ua7>U64$1pfE0S*6gu`5CGuZUX{%vln2{-@Rb=S30siM00Js?7;b_#5NL2>-(UeP
z15zP`goMKR4XBSCro@=M&u|0M893!QIPOTurV%{@uxK^-O&FDji_U_saj<k9bob(d
z09&nvQlwL5jDLfxE`$ru+<R(&Y44z$E{9?nE;t>IJ`{R~aHkyy-Tj!=n+Zl5ZOYaB
z0@qx&XN&peKjc6W(Td=Z4tV5FIPM6DV;tN;G;tP<Nps_mQ|S0=T}Vn9U_y>QjA;2f
z^o)gwgu+zIM8ExyU9<vs%|$dm`~kbQ8}-72q#wSEuz!1ypudQ9gt9n)S<3<P@Pl!!
z5IuVddgT`Uh3jd&^CKdcMd$PMo_quKAO9kC_jRae?xVSGE3%L)NV~Z^8-Dv6a@=SV
z_us_uqy<#wEGIhi6q@BardlWe+T-ZZ$A9Ms066_5eA9w~!Ry#`-kl4&J1=tn?-Si_
z(7glBUw^UIMX}xY(3`IR{#W+IZN=ZCO%S>r_q^a%r%rJ@Z+x)Fd-;e{U-Iff*T}z9
z(5p5g3wcDXPJR3rG$+nsWZfoYCWAb*gT_Bo7<z3y{^DiG_BOJ|9=1uWKlk>fg}|L9
zJ&75r5f0ZeI>gIn5MAw<$RbKrq)K4wK5le|R)2c|&sf@Ty=1z|<g$@hts&b+;SNcX
zjK(6YMG#}k!$^TmD5SQey4namORL#LDGz6iRGA|W>29ptcAlpLWIBa02672hA&bZ+
z@uZ9gIGpF<w8Ruk$VLmg;zdUu_PeU*Q*Y_>k6o^gJHm>QrZCMQ;exO;=5fSV#<6y(
wL@OF=l&Dn;;?VYu$*zvi1a?LH8!s;11*p%JbB}qZ)Bpeg07*qoM6N<$g4^_xBLDyZ

delta 954
zcmV;r14aDE2G0kOBYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH11L#EK~y*q1;I~j6jdC+@qh1o^LF-sk?xk2w$KnZ
zDpdlBD2<Us2~iSbKqDvA#DgC2Plz5pbL8U1a4~`C4T$m2sf0wM7y&IUG?q|==(cw0
zw%y&%?#%4Wdp|!PwfgntJ(<?V`+l|ZvMv`(+IUWRX2zscNYf|r)GCS=A~Dvkk?}%u
z{yJ&eBx^1kzkk&}H{|<=ND^4v0IdOe0zU(u0oZ|a;2bCgNeT`~6P$8)OfE?uXRHQ(
z7Mug;AW0Et!8w#t03ZT@6bdNg!NVm2V}~{I0E&4)!A2K0Lr5${35Wte3r@knf;K3n
zA!CrB2i^X-QIC}ZHhYlE!(<)m6Hv&ZmYQ&L9)b{tN`El5A8NxevjB}{B#LnDPOMcf
zyN(rj=^z~32O_Yt2K5OzdI(zU@cdrbH3rM8$TM|ltYGKw6ZLx)Bb}hk;TK`3g#G3R
zbhCvTq%b-H?;eBtPH47Z`v~duFZ8bbMlqiy+3b;&eXS#G%&u|L*#(lHZ=f;;+g>NV
z_#^J-9Dj0niryFJaSs}pQzyy2bDX&Gh-jsS6Jp)^{nkJLy<<Bvh)I6^ljQc_1UK%|
zJ9`0DERd8+Ebn=R?uBp3zHtQe!CQn2576aeS-bm<Lj2W5^zarkCyugt<vJVJW=Z!=
z60Uc#?JlL$?~%j-!P)Zwu=gnfJAme+BP<>`c7MIGZAyYm(;_00EH@>X`%6+0`S0z|
zWaY#sA|m280ud3hQ7r$wc}nK9lk)GYCzrgBcRu}**NtlZ@2`^FxrZ*7P@OK_Gv^4W
zuhCyvMCbG9u@QRTU1jz38G=7<p{o@NyT=#R-Dh8)DMzwjdm6jiA>Qm_lNhg%N7bs>
z)PJGY+Gvx(b^~Nfo<X&YXC2koUiiu6i-pu{chHp~WYot`x1yXwp-@>5s}(L|(1{~k
zs}OsRK^S6;hghpkeqyxIyZ!Khmqh4X7HcgOGnjG#Rq*k&#$^QYJS5TB)*8AufZA5n
z#P}uCEoDDXp4&ZZ>N}n4hsuUgMxuC|L^JU)j;iX1Rc%xbXN~H#%WAB8&##Sqsc>`E
cPd}XbAE?ijbKR<!LjV8(07*qoM6N<$g2l$WCjbBd

diff --git a/pelican/tests/output/custom/theme/images/icons/linkedin.png b/pelican/tests/output/custom/theme/images/icons/linkedin.png
index d29c1201bcb0c278d49f573f9ef95ebfe932fb5b..06a88016f191d1f7596e5d159eb9e3ef276b6ad4 100644
GIT binary patch
delta 611
zcmV-p0-XJT2k``u8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30006eNkl<ZcmYk1
zGk|qR6vuyOX5M-?wyi3*?WAv_GPe3QcG}psxv}kJZN9yC?wo&|e8+|X7d-lHKrR`8
z82}iF|G~&bSD(C{o%P^X8x3@}vlmwkmV&KXBw>F`)S1F}Q-AF=yim{8W!trS4%&S6
z_lM@+`)#2k0tSGBnS>A!gUz*@G`?K*=6LBro9?h)-)3ueJpbKPReY_URxs;Ip>eO8
zViu~#tKxsiG}F#YxxDn_Op4)+pJ(Q(rn?nptGrx0qLplVDff59VAgJ2uC!1$sj=JN
z9eVxe*<a^YDt~tx0n_cKw-wju?TEpCnQa%Dp=6epYZp3o*NqO?a`nMq=5Bpw=#2d~
z-DRWx4~G^{+-V(Pex=;^>FCXaLv`alDWtkCwY0;!z58#z#&T71?c1;2yXPjW|3Lt-
zK|fa>vgM24P7nS%my|*-?u{?k1z4y`Q@qLr7+I)}xPNx=j5|O5!vJ<%ueYvBm7B0q
z#9!Y4F0C|@0B(JI=(#T^ANqWJe6a>PW1y%m9$cbG{M|s^6h}ZVg#;!^fV*&a6p)bQ
z00`WX00V>x13(fkxd$YZ`Z^;p&>e%(-AX`jN5nmtb*2b(r+_Pkm=H~{XTP4zMX&uh
zQx!e=<y^${a(?@#Ibvw%a^FWIJFL_9!O*-L!GdwlQ$$ixaup-T&~im52TCxYqj(TG
xQe-_{Edw~`NunV@V3_#FG$b$pgX~;)?C+p<VWy}RPOSg{002ovPDHLkV1mgCCddE)

delta 884
zcmV-)1B?9e1b_#S8Gi!+001a04^sdD0yj`hR7C&)003yT0BN!SYqS7tv;=Fk0&KJZ
zZM6h#wE%Cn0B^SlZM6t(wgqmr25z+jZ?*()wg_&u1#h+kaJ2w&wg+#v0CBejaJB$)
zwg7Us2XMCpakv0;w*Yjw2XnXpb-4s|xdL{&33j;$ce)98w|@+Fxe9l?3VFE-dAkmH
zx(s=`4SBi{dAbREyb61~4tl%~db|>Pyc2r65_`K3e7zNWyb^r86n?)Hg1;4lz!`zS
z9D=|bhQc6)!XJjhABe&sio_y{!y}5rB#Xl(i^L|2#3zl#ERM!4j>a;P$1#$}GLpzL
zlgKlZ$VHLJIe(SPI+e;fmdQGn$vT$GJeSHnm&-hv%0ZaRL72=xnae?$%tn~XLYmA%
zo6JO<%t)NhPo2(7pw3U9&{Ck$Q=!sTqR>>M(N?3<R;1Ecq|{ud(_^L5S*X%pr_^4j
z)nBL8UZ~VwsMTPo)nTdCW~tL=s@7_()orfWYp>RCuYcBXui0?0*K@GfbFtZUvDtL7
z+H$hkb+OuWvfFjC+IX|re6`$rx7vKS+JCp*g1Os*x!!}h-GjN_fV$m-y55Al--Er~
zguUK~yx)ht-HN^6jKJZG!QYj~;+Dtam&fCv$>gES<f6;vpUmW=&E}`g=BLi*r_blB
z&gZMo=YOft=d94@tI_DK)9JL-=(N@8w$<vl*6Ov_>bThJz1i%(+wH&G@50~i$l~wM
z<?+zv@zCb-*68!s>Gas@_1f$8-tG0~^7#M%{}_&@Hvj+t0d!JMQvg8b*k%9#0QX5m
zK~xyi1;N2eLO~P;;QySNt6nv1m5>!_M4KKZ=znqAx99<Sj;KZN&?2Znf?5Sq<|4J5
zc*lEZ=FI8)2$$rE7@Pp`=87%`PK*V>(MHNAcHs|((^pH-OcELe|1D3t$8J%1Q#oJG
zOS^KD(O0omm6HFqxsGN}K7Pht{2IM{UItjN=ZDkVv)$PU@_r*3hjORWulwyIB6~V0
zBW<tU26c+i>pR786}b)xDJsVI4<4<s<`flDDQd$Bp%hL*p<Y3%gj5M@?4WBJ=&CX3
zNRy@U^7-hVXHQ&=zuzdMc5f3nkKQy<Nz3gM@@+}Xh*@BmW&IEI8i?#El2Z);0000<
KMNUMnLSTZ-AJ$y}

diff --git a/pelican/tests/output/custom/theme/images/icons/reddit.png b/pelican/tests/output/custom/theme/images/icons/reddit.png
index 71ae1215ac8ea274f089cc4aa55eaf8a546dea67..d826d3e746a18b712db7a68746c0c523af802fe0 100644
GIT binary patch
delta 170
zcmV;b09F6B1<C`EB(ZG>0e^`}L_t(|0d31QS_DB5hT-pTeMoSLkQhI}Z~!hma}r`K
zMM9j~t#x}_%UGs42+d|cE#R;^1PNeM?`wKxS7JDFAgAY}Crl@r_%gExoyh^1y9=e1
zkaMBr?0@>#A310I{FMSU*HeuMH(>)dx3;%7VIzRg?Nc55J|T1~XCJP^0(5N}YCBfw
Y0eY(=c;GCP9RL6T07*qoM6N<$f@R!B0{{R3

delta 404
zcmX@byp?r=iW^J1qpu?a!^VE@KZ&di3=E9LLGDfr>(0r%1acITJ%W507^>757#dm_
z7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD?*CMQ+A=&H|6fVxSTaFm^kcZ3kp*@pN$v
zk+_`Ne^sa{fPwY>*4@^OyZdD$G?dI<{QuwmVnN@o{@)vl`4sCf=*JyOFqx?vHv6yc
zio-99s`uE%{$MtdSY#s8`ASL5UnTe@&sjSup3_f1wI;2MS^3Ojn&OhMe3R&k3t48b
zOr7d)&DE>=%gFXuZr5Bh#lwOI^FBOKPfjqovM9J_M%KlfHH<o~Q#Y`P75lC^+S{^r
z&*beB%pMgV|5so$SO59tj~nW11FyV(yGrZVPWg8aJY<;H9X|ndKZ9zCYeY#(Vo9o1
za#1RfVlXl=G}bjR)-^N@F|@EUFtai+&^0i(GH^1OWAeKjMMrLaN@iLmx(-t-6H~Ab
Ug9|!0GeLHEy85}Sb4q9e0IndFRsaA1

diff --git a/pelican/tests/output/custom/theme/images/icons/rss.png b/pelican/tests/output/custom/theme/images/icons/rss.png
index 7862c65afeb66ba9cc7e9576a3a62b850b2e184d..12448f53417b4974fa041655a5fa82dee20c73d4 100644
GIT binary patch
delta 728
zcmV;}0w?|N2JZ!sBYy(6Nkl<ZcmWN~1CZ@j0LJm(ImxQFZQHhO+qOov$8T77RNJ;~
zx6jsI=H4WyJO20&0O{2e*R#;@enu8vSYz5U`lG9f^{QgNh`4A^uQ5^Zx{ys(=Yy8q
z{Ee{X4HE;T4==hy{l#^L7b6VOE2;ZbJ!B|o{YQH`*)Z)EiGQ@gE&FHn*Y|E4!j}(Q
zcn#8$j83CBN_!g3$+Z5aGZ8s)5&8vciX>F6<?;~b>>~~_f0V{AjQ&Q63WI@#mZd_`
zpq!6D9AL1bKYg`aYtoKJ|76h(S@#@@HqG%AGZ;HF`*#M0sVicJ06?&4t~GrzV`a-<
z!y2bafB-7qIe(mAUu4MvQUD+#_3CKBm1kOL73t^Oq&Iitqtm6CUrI<a_IQD{_hNpZ
zfRG4DT~O8wPm9UGKiZS2dMvq-(D+n%b{pxL)uj1<0(-sA(rZ$5NeDsRB@He=KI+Vv
zqnIl!wjo=LWB=cT6MqtBju)TVR4V5Yqy9>VDd(a}2!HCDD3meOMX<;^%>GRH=qTy0
zhol8J<g^*eR!8{!QqW)a07ZqYl6pzApwpbSd`yE&xAdBXjDB1A>O$f1rG%lS^>(;L
z_2Z+I4Fk*Xs$O(a+Lf}MR3+Ui=8>#n{&+@~k#>KD<J$T$XU2!hRZiAwq4~RPFdOri
z)}BkMlYcBDPyJp_oTNsog}SMT3+Z%oi+y>MVqi53FA<CZH0R8bTC=4{5QK^ph8v;!
z;n7v%FXxP}+g+hrQa5Endxqg|REJtzZE@AyuJ-JXp@j#9Jku>JQ^xo7*4+R80OflZ
zT^0WscTaBuO7ca6A_aA-H9M3Y@{DSLGBL)|Tv2kZf0o$sj%@=#`;E)i3gy)E>N)=%
z8p`IxR&$P`sFp8^v_L($c$u=1>0{o!xY#-&Uw)e>HazN%hv0uJiC~OG(V|}f0000<
KMNUMnLSTZiRB~DX

delta 857
zcmV-f1E&1%1@8usBYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH0?0{3K~y*q1;I;*Rb>DG;D7Hw=ggfkXPnV#w1Kig
z&7ujS0)<@kKqA{z;3AN~HWDP%A|l#_#4Kv*GBDiL!l0ngAOeLR)~1IkmN<>(%-Gy<
z?&I8h?mg%HeO~~GUmtnM_}KF{O-yJnZ#QhsN$UG0*%ry<z@WV(I4h*L)LFyyW9PyX
z?=1z0=Z`O_e}8({*c4%uK}kKN8X!eM_d59s=@@yJNPPIjp|t+xqx~UV{KUjA;xw&g
z1}*YsIydS5O>YSq$rgqMYKkaS-FvbSn$Jl_*=W(eMC&poDl`J)JE%~!DK`*EMrc$F
zSLQO^8wa$mGC9wK$0%|-ixjK0F0*!pkumCuBt-xqn19T4SEdxJ%)Y~}qaq-Hif>=$
z&o7xCAqD^v#6g|deBW*3JH<af5Wjhv3$KZ{FN%m#p8bLc4ze*MAVfk`7nJqHauSVP
zli#EoF#U+o{$BWepLk|Y+_(xHJj={(iarq`sQbjm>|&y~+ElCyQ}aB2l0%n;Bfkr`
z7bRyN6@SY+B#Gg@FDchiMFe$CB9uv}i(t!M)_xE!92WmNC2pSQ=&G{Y6MlRX40pVs
zsE}6TAnFwKI{(cku`$y%=nztdx$yHF!l!o&qca9io>2XEnzC(V_9^w`BzdLGqpGA|
zC0Rn+wz0^j?cy_E@k(x(WUQW7?tE3Zi_R5kBY!naX5{O{I!aTrI2>doH`Iu=P<Ir`
zxL!Xqb@6@0$ef97fsI9-W>f60i3vdvDq<LGhw9hUJCjSt7VEq(RMYw~74lVM{X`vV
z$=p`edSAZQGdj@_vQ)pU{JS_X*nQ~Z0Ofbb-%hTb{BZCOO0vnIh(R4|ogQV6ETtNu
zj8f!%I@5cuZ9A~AKLF(C-r5t&Td&v6>o10~v()W06-6~$6!EUQv9*lprj>4|c_*3L
j8?xDbpUod$I0gR$D~Vu?3V6ai00000NkvXXu0mjf9#4!g

diff --git a/pelican/tests/output/custom/theme/images/icons/slideshare.png b/pelican/tests/output/custom/theme/images/icons/slideshare.png
index ecc97410138bb3c457a898b1e868b22ae9db9989..9cbe8588e24976076e5fc3898fa97856122f6fa2 100644
GIT binary patch
delta 420
zcmV;V0bBl;1hWH>8Gi-<001BJ|6u?C0eVS9K~#7FrIQ1UBtaO3C+69T&Ir%8W8-Yw
zwr!hh+qUf;+t%B3Wm1i3k>o4B|7(^Afav}E_vyWXsU^iepAWr(sU-rB#{;|F-XoYA
zDsa2qyiLRZ8&GZ@K>CYe`4H`SPkL^Ksi6X=)5+V^9vMm*bAKU-BD@PK5N_Dh9>8>C
zH0j^xG-K}5WYTjpjWP`@(A-)F?VDXNch<vdwZh?WFt<p0?zmp6Mo4iJcKyi2j2oex
zJJ2bid$1AeJ%f2@t}VpD&oStK{0EQeH$qU{reFmIgMnPxlKlhvdrNrlpz7!(TtBfH
z|Bo%lpRcbFQGebBo6QEJ(Z~waYBd=2dOa)_3-qUlQ$o(JM$*}Z*m~g-OePa_IvoOe
zR-jNQz{PlZ6lKDV2#PRA1rmt_T+Fw|P-fhVCCq=C0AY>_#9}czIyxxk)H|>~8V7Uy
z1sn}2#;nIlxE)_f_XF?+t*xyTxm-@(N8ncJn41xc#T|S>FCc<GALlMGvMrTVfgm0L
O0000<MNUMnLSTZ{2E*w9

literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfjR2nz*S~-N{{H>@*RNkce*F0U
z{rk6X-@bnR`sK@)&!0bk{P^+1hY#=Hzkm1c-M6<d-oAbN>eZ{4FJC@?{`}dqXP+Kk
zfBg9I&8M#)J$iKg$*Tts9^Acq_w>EzpARqEaQ@!6eO+r#-}<z-?bG(EnMZEFU)j{U
z{o<QxDb?$a=dU@vZ2pulJ+g1Ryl2jw`L4q*WzoUcEgso(w|r`m{@5h-y21KGt>n8>
zu{U`lyUMLC`*)c4@4l3;wx-<Gq<7b=G@+FRjyfG%U&QjqSJgBY#cDUL(P>(%(zHRk
zY87AMB8Ie?|NsBbO`N?A=tqx|AirQBmq@T5pE`yXT^3ECnaey~977}|Sr4A{I}{+o
zaN%=YK67fKl);XLhVMN72>h>4j>!~t_j$}=vE_wj;Wj1)-!<nL8zwL@?458yC$D?*
z>S-z}KHD!>)!zx?ko4cYZua^>?$dWqKR+B>HaC57^UvfAaqpaV<uBr;H{$nQpPKaL
zwtfD!!1j*q@1|^-d1s2K;_0XI!p8)-c>es*Q+RSF`|DQgH%v`O+{1V2ALnUm<nUs4
dVP-J--|@jj(URrLY@mx7JYD@<);T3K0RY7iJHY?|

diff --git a/pelican/tests/output/custom/theme/images/icons/speakerdeck.png b/pelican/tests/output/custom/theme/images/icons/speakerdeck.png
index 087d0931caa301f8a1bba1497e1b91b7a7f105a4..7281ec48b41095180a83d71eaf0b00c85116965b 100644
GIT binary patch
delta 566
zcmV-60?GZE2*d=C8Gi-<001BJ|6u?C0t-n*K~#7Fb&|D$B}Ej5ztdggio3f*g1cKx
z#JmXl5Jbd~;2BPWyF0AA``+6n=O3^2ay|NmQ*XQW+4JwXYGz=3cw8=FU>HIiQv?{8
zndJlh{cAq|>y>c!tyj#Pde2ptcXE>p3>q^e0l<<lqZZ7Jp?{`T&OQ?u2xA9&(Q+xv
z3J_F{W*|{Fw)7%}V4C|IV#=gg@ZwPa2_&d`tLfDZl}wD8kYXlxh2jOPrXOi87?RgD
z2s0<fM3|Qn`w1jG6>vcf;gSBBHCWqVp#@{X@{prbV!^x2p5IrK_xEu*BSS-kHUN-v
zrq^|}O~YKan18zNB5bgwWG8rba<?cT?m5VS!=2aN#8dY_%C~?1h9Pdb_C{X+<UPLr
z{TKSX50ZM3h9OFFf{G~7@%diF*x)D+-FOR6-gY<tuU`uikKb}9dv@;PpOq`wuy5DG
zM>UIq4<$P}6+C9-V(ZSGy!i4<yz}t~WCXxxUwzHbD}Vl_mm}@yFgX?)D|i;cixyl^
zfq~Ocp^b?Ge79#ahJhJEG-pgR2sA^3xEme|B^82}Vju~do+Ox6nkrZlha;YoLl$xo
z<RW*uzLtcU0U%MiFaWcqJ1yR25m*djeaP}`R`;qvQ57_eVHklf?{6Jt$Bu+h73=B?
z)Uzg-N-vl8hu*r4ua3ae&A`A!{RJmLx)v)b?VJBQ3+!ZLngi$tLjV8(07*qoM6N<$
Ef{By}&;S4c

literal 1049
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)ORJo
zC&X36Qpczy)Vv|qtS-i^KE}L0*0?lOuQ1qcbDjH^di}y+y|QqP!eEVpVC8Ior7S<$
zRBzc7Z^?L1sRU2)Xm_y)H_-@J;Sd+WKxYAeM*&|)eqRTEZwEe4dwvgleoqH}M{A*k
zFrmaSekW@-6-5Cz2O#2iwYT3?W4EE&Zez8>rW*T=)%F`}tXEZ-FE2F%qGdo-V!pi0
zdUd7Ql2Vg}#l{PZj29FdFDNouRBSZ2NPl*|!JGnvIfaIE3w5UE>P*Se>d(~b&Cu#i
z*94*-AWGAokfk#vSF=A$y(3K`#!V!^PRQRzI?P!<(p@UlS<uf$GR94#GhMYKUAZwy
z$k#^P+a{nQciFD31rs_7C$z8FvpuLXPs-O`$j3&xAyKt6L#ZiMp*lgp%UUVGb?S;G
zpFV$Xnm4^^?zEY!mT8CkC{)MG)h5Z5#_)Ss@z@!QIGVep#5$zJxTeI3I$H498u7bZ
z$<-uDmBmXI#fZfD3PpGbMtJatx(bB4352=xhq;Nw`$-kYisi?M=0%GY#E1eJ`O#u|
z(Lxy!Lg^8L>EVLu5dvx9f@$GG8Ik-+VSI_9d<h}E2_XW>VSI6+ys<zO!V??J6BGQb
z?f5oe#A}oU`2|<sc=Gu1;~O{r{ks9AF~RkJ|E^a9l}zT~&jsq?Ebxdd2GSm2>~=ES
z4wz7QJY5_^BrYc>B%~yzC8jbmrirPUv9Xo$@%rlK%F4#-%F4>-`suOd+14`GGBZ2Z
zIx90L*9zyc$psr58y9nXdwUma8*2y0vDsxyM@uVg*vhOFU0uh<$nLJ5E*>6kZeE_w
z@6YbYrl_AUA8-G^q2YkS{Raa2iEI-uZ1~V|V#SLYH+KAJIie!ScJaxSD_g$woLSTJ
zX3mv6DTZtx_xx!(wCK^KNtZT#>iXkV$kw^))vQ~)ezhH2w(HijX<D9aE3a+acJ14>
zzH8ggT|2ifER${KyLs>Ky?eLs-#^Y;;oZMeB%i4H&a+A767ZjEQ~Byi<|iJmuFL6X
zSeha?J1&`I)ZEpyYSye-Rssx~p{$||UzYnt><E|>3Jf6C64!{5l*E!$tK_0oAjM#0
zU}&ssV61Cs8e(W+WoT$+XryakZe?KbBv`K%MMG|WN@iLmrUnB`h=%CJhhl*m7(8A5
KT-G@yGywnx3UT@X

diff --git a/pelican/tests/output/custom/theme/images/icons/stackoverflow.png b/pelican/tests/output/custom/theme/images/icons/stackoverflow.png
index f5b65e9990dbf423ff652b297f1d0172c8c1cf27..3c6862e902ef0624a812aa212ea0c075aa123284 100644
GIT binary patch
delta 400
zcmV;B0dM}42c83v7=H)`0000V^Z#K000Cu5L_t(|0b{@io}}n8JxSA<48;F|_y7>I
zGmr|NB!dlE3pHdRNQ@jq_@AWeoQ4`wO;E$@scbnwT=#k!t0=-dx=K${b)P~FiNLA(
z?KBonpysPU{2z#4zMjTb^Lhr0IM|SMZ8KoF`~VsN!Y)`1cz-yNpXuFnCY5*7ncLn>
zWBm*@=rz!g=9fLZ0#9?*eV!!i{{b4*NYE=UCUZ&x4QhHfjrr}HsjUBBPiJ}aY9eRT
zvkF<imqiLp7#h}B*mJI_a4KF^<`M|R+MBDbIY8n!dn9;(h84Y^&in}Iy8oYMGDu^!
zaYKcz*4hfk|9>#Ny4>l_$}-mjtIM5Rfrf<~ZPp69(<>T@)5(h~y!kg)*aU5;uxkP0
zoj`mKi2nm!_J3_T(7-aM|0~N~>@YOu=H&bbVQhxZt_TrXP~mU0q{1s@RfWsMMHN1h
u80rxM2sS20sG+3+gaJ+iNWoM!006J!F6HlsU$OuI00{s|MNUMnLSTXuY`7r+

delta 906
zcmbQoJcWINM7;nT0|SG9va%A8VoUONcli$noDtve07W<pJR*yMv<Dcwoy@jlU|_oB
z>EamTar|hAwTHH&$X;XX*(sr)6f`=89FH`t*eI}tJNlM}*s_fq1wINZ3+6CQQ;O<P
z_~^c9Ygks|OgGi3O$r+W0$i@W7g9+%m{Pyl`g50}f5(%f%Ma~7oA~_9oa%3P5(R2D
zilkQT*ejdN(4!d}_iXh+h2w{v`|jS&D>s?t^Q>rT$%k;>9d~EXe*Sz4(+ss^3kBlu
z-hHZZT4wRZBCB|_4|yrsukW6?Ai$8!uzdL(S(%V26DMxlHgjgs^NZ=yD_^}@bu_5s
z#zO{&j*azSzs{QFpfErD>LEK<Nx5%T($b6qOcr*}e!qHUVQp~0ebeU8nanG%+>%n9
z<f54@A^va8($>ePx${LjKkOFhzIvsnSMu2B&5L^awrwjbWt_20K}NQ4--2705BDB<
zoa(+H^Jh(Js-8NBgtS}ye1(LZS)V_1C?1J$W$mvio7S%|vp(c%FRxQty6eTqJ9qEi
z<>WD`$a4RDX+@TXpq|=&^>U7dwzjTHlR~1iHwr9z{rK^n6GvG5Pd!ZFNj?^&d8{N>
z<oY$9#~(ND`t>D5pd?m+k8jSorAu!|dwEOUxXs<38ac^F*g=4a(M$8_k7sS0!^0=3
zbmiw?zrJ^GadD@MS#@Ro&K)m`LPP)lO5M8bva)iRw&E^3)1wj$$zQ*=B>1enox8oi
zkLk|+>Anf|_A=joMn(AuH%#d6PMQ~VOu%cYMyij%B+nkfMJ5wB+~hc!cK)0U-|V+v
zrv@$GyvQkZ?X_jgUS@{gy{C6gaVbxV5kuMUzkBcUP4N5v-I%SR(49Tq+Pa>VQIVma
zok8*Ngw$gU0+Ui>&3U?6A3Ri?T)2}##P#y4S3h<O^w+=ntloI?WP*W2%9;<dooj$#
z!KQK*G4A%i|6XMUvYdE6dp768jExL0c3q!+mgz<gH@CX_tZNrOd<a<Mf67$DEG*{v
z^I6}vf8G<QairAl)BQTm{n4qyKi+86*WGd0`J#T+zuz2n%nz+SPqwyqg#Z(~YKdz^
zNlIc#s#S7PDv)9@GB7mOH89sTFb**?vNATXGOz@4tqcsF8M-V((U6;;l9^VC&|ny1
eXkuk*W@Tyu(ZF!!+kK!022WQ%mvzie2~7Zrl9o9D

diff --git a/pelican/tests/output/custom/theme/images/icons/twitter.png b/pelican/tests/output/custom/theme/images/icons/twitter.png
index 057ab004b5d826e151a4f9cc6a66d88caffa8911..cef1cef96bb2e0c957b77b79ee30894f798ce8f0 100644
GIT binary patch
delta 390
zcmV;10eSxA3!np#BYy#BNkl<Zcmb_aGlQ5x6x`UhZL^B)D*hR1W83!Gwr$(CZN1w$
zemobm8mt~8qG4fV0@y>VnQ8)X9Pc^YIsS936mToi>>TyPE<z~;YaQIr7-E{~#Qr4E
zsAo<UU4h{<-nw03E57@lWjfi!g&7DF28?}Xe+wKlDeHw{5q}|YjBa+-)XxF>?2>uR
z_6|ZnpV&)R5*~BWzsPssl(50B)R2faviTo8PHlFoG{z!;W3p#X2udIOBQjepfQZ&|
zFt%SO>>!RL72rgGl6ksid9v^qrV36lAgr;-*AoV?yTOHr_qbMSj5RH*9!LQ6qJT@r
z;R`1GjEuz#_kU+zWnW=WL=&ZzIF@7Yd7tVR5J0GQcdN|meTt=w8kqkp?9KRpi8*R!
zkHUtd*i0Az;{%TJjvDwDA$xhe3*JY`44_%*SJHImW?;=72p8K_c;gxvV+|ZMQnS(<
k%<U3xMTKFEHK|dGb`RI1Srg6^h5!Hn07*qoM6N<$f|GZ(bpQYW

literal 1509
zcmbVMT}%{L6dqg_sA8nmMy!cU7j3A8ow>X0-^j}T%x<BwNC7Kp)$TBJVJEmd<Ln>{
ziioWWjRg{0+q5?FKw6$ECbfwv%~C-uL8X=08cY)ugvM&sqT&xSy$h`N!T8Y0%-nm=
zobNl|IrrRYEXaRz;rv(TV;HtDH-|1nV^ZWvh(qs`357w!GTBuk7YSu@6(d2+&IzRu
z&-F9qun;m_^|n5kg<&cmUtA)Wc=9M#@N1cfk2d5N5gNm?vO^-nRzMjqh2?y}s=4_?
zScCJNRkP9HAw8lK`uLn02^Q7l7qc}LtcBBLuf?-M6e93LnZZN;t$`pFvT9~{DKw9m
z2@O8uB3D>7v!Y5o1-Mg?Aa2m=GguM;+-TH-OoPz~(s3OLbOecRV+P2i3`R<4!sjjx
ziY9SoR3Yu2i-lHJjZc<EiXf`0s<c&ltss>Xz+$mPICQ!U<dG4q4#-R>BM?lDGSD!{
zO1voZLI962GNnSLY}Fv8vnlvRkLL+-AUIbjR5BvOhy>7*gx?>@YsNb$7s979p6MMd
zt`;Ft2!leU#G?HuOO1k2?VcYf;)v8x>m?p-3bU0K*h)VP$hovtgT81vo}=6*lN$h2
zCTY@<Ml(R^XF45DquEZ=CWkB266JUn)@3#Vy~}O4yLEN|T);xQEN)uwa5)SPgWgU@
zvAKbu%mi2%jmx9Bb6CrBv6NGSj4VjSg0MB(0R=um7J@!O#GOS3Ex<ht%LgKs$Og^k
zOGAm@4mr0Z`0<$vQ~Wa&ka{!fpQo9dodBgyJAq4QrVVDKeiqC9pQ;f^3=wIM|Flcg
zgnBSCebW4B@#Ofx06H@gIvkrP`0W@rZ*eYdFAfcrPAN*ZYSr$>dPkQu+!Ygd+Id8M
z@6zpEU0-7><J+#)U&I<xux+UYH&pG1=cPJFUQ@Zt4yhGodYjD@+qNvNYB=0}c&#el
zr0TwTB=Nw}6}3~!qtiQEzf)x|TEF~Y=jR=xb?VKvttS`Q7RIHWW1(kWA4pgSNO3|>
zCNzMljmF{fmV(vZcR=xUfA7mZZNyK?67FFgbXMcFD||oiY#Fr0HN2J6x7+WIJCmM>
zt2V@*_`dEO5V$2@id`PMpS(NtP54!>I%NwWJ8NR)znkOJul$o<M{}@a?^(rb-{8If
z2lIB)<wv`&O^+mX=<V2_dF1rtqRWe#TE<z}sXCw7)O+yPedEWMz~8;?rEtGD-F8Q5
z9u!k7X7kjQ(WN`@e%ko)?YjfYY9%@OV#2A~rt8Y4Q|}*5Il1`!srZ4wrV|rgcLt7R
zXMLFYhNQpY)4jOnh340jj)9)xjFyikEe}_X4vmK&PKKu^x~@((zI&$9rYJUmrQM28
zuB_`>2}{;?h=1vBHI`oJ?AxP1yXC;+srnr`yt@5ZOwPD!<h|hwDXq<+2L*#vYWLFG
zn6cwOQr8#Mf3fI;bmyV+*fICs5uvUk@5H12(Xr3Ms|Ui$#<KFV`<kBK`-NZae~{m#
zyR>W_^V@RU@%6tLx)XO-t3TmGt;uakqXR^1oBArN#$w{Idt7(_nwNIiB0t_-S3do%
H!@K8S?9(ld

diff --git a/pelican/tests/output/custom/theme/images/icons/vimeo.png b/pelican/tests/output/custom/theme/images/icons/vimeo.png
index dba472022f0fcf7ecdd8f4847a8a3bde90789bc7..4b9d72127c574237090a2f5f2f7eb7be94a2b62e 100644
GIT binary patch
delta 333
zcmV-T0kZy}1l<CV8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30003JNkl<ZcmZPo
z0`6J+h(u7;)_d;puDwPO0hNLD05On5B!X)|n4!J>Hk=D&w_STxe({COrkhwaOuhZ~
z|Ns9Ve*S^z@jCS2KMX9n_ZCG1(10ZmKES2RPdxz2ZMysN{ePFQ5RrqoAERjS+<Uuu
z`>_jmA3>xipSTV*f<3dnY55k2$igG%Q8aK**~wWw*R*;f)Vw=Sc$R}yY`O+@mFwhH
zC>mg#0}o!jhNwXH!-iw$fF@!OrG@)XK@<T4=i=*6KnBno;zj*9gEeL8&i|;urKTTW
zJV^F$Kvtd9H%1TW7<?Llex0~}7sMq%)m-hXamF+pag<JVF7FbJE=H)v)PSZ3=nSA$
fSXBcN$;lf4{SCr3%yBq=00000NkvXXu0mjf6_k~N

literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

diff --git a/pelican/tests/output/custom/theme/images/icons/youtube.png b/pelican/tests/output/custom/theme/images/icons/youtube.png
index ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e..e334e68eed877dbd5109acea1858a533a3174b2f 100644
GIT binary patch
delta 300
zcmV+{0n`4<1H1x|8Gix*005AYXf^-<00wkYPE!EU0MP)^r>yKf0002-Nkl<Zcmb7A
zH9`bY41EWn+AVQ73hotG*bcb?H7ylx6>c3<;~pGJw8CA(gtzXSA9?Z2Ktv9vn%k<g
zRJGJMF}!%LiAh921mJGew5B4^98Na_;CQE_0)Vf5m4m3G8-HG|#sD0D|GpZqAl-}`
z`dYngi*9(m9=D3GA61?ApR}T?2X-plpApuOAwf@0wAk~{Ueigq$fKtxFccsr*i1K;
zkuaUCf$7Eu(?tPHavaOL`u<L3H(mp`5i{P^&E7-}p7;%cZ;Nbj90SB#+Xm+5EZfr)
yvEeocF5l&v4kcp-jSU!vHHb*~-y}#B5s^RLsrl%w&%5IQ0000<MNUMnLSTZXuY=?O

literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/aboutme.png b/pelican/tests/output/custom_locale/theme/images/icons/aboutme.png
index 9609df3bd9d766cd4b827fb0a8339b700c1abf24..600110f2f63811ebea40af1b943fded0275b6a39 100644
GIT binary patch
delta 396
zcmV;70dxNE1)Bqq8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30003{Nkl<Zcma))
zHG>sF5C*?}?*0<o-QC?a!QF|F2zQ9_m|sE!DIOBy&biKXU(d|BZmm^Nz3u@>E;|N)
z)V_EYN-jDO9X%Hg?sQ-_!UBObw4%BSi9<}9RTCVhaC-wFDSt63Q`c8<W39w8ps2ag
zMG%-w$|ePCXf1(Bn;QU#%K%YBwbV8xCvJdA%M3R+ffOtf+big%np@9dNnKl7bMK`{
z^5T5hyRCch0YKv1BzFZwW^74pIM1(Vr#GBStv@RgUv)aQ`m{)F@j<g+xHq|YzY~c=
z_B71^RMl^erhg#R{!@{J69Dy3KSD581)`3(r2l>K$|J3OMSiddRs94I-RZ%BpPVQl
zG-*wE)^@pKur#bMkyS)ii4hvVB0PPwtX?$Lk2sgu3yxdrMHBD`H`aw%Ysl&kiS1h=
q1)tbo!~Ye`fCpjdO!(yU+ZHs&^bQiZ<l_JU002ovP6b4+LSTYh2B}p5

literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Ta>O
z6XFU~z-^brZ51PwI9(_Kh^7g}PZf%vA`~}SFm|F~be~{E7r$Q>mqnyt>;%CWAnF&0
z>J^CU7KrHN4{PNQZsheU=5fy8Gz;Yisssv#ckqX`@rAbXg*5X8HSz`4@%dHr`jqpy
z=5RZtaF_)12GsKU*YNsP@%UEo0L8sad4MK(6mq-eal2-7IizygC9)g&bNiP6KWohG
zS-|Cz#pRUFX_v@p6U%1c!{t%H>ygjnp2z8w&f}cUVI9k18Od!O&8Fwc>5|Q96~*D0
z#%UhPVH?k3;LWPz#^I34reVi!8_%X{#by@DrewmR<-%&@&nzOxqVB+|@6E{0!>ne@
zqU+A2Y{jhQ!lY=<q~X9QZ^Ec*%OGo*Ey1r33?s&pAirP+hi5m^fE>;OkH}&m?E%Ja
zC$sH<jJ=*Njv*44Lr+}~IuyX*dNEnZE1;`^i>aw(BO9N_QK10Mpk${dC;$Iv-Sgs1
z>}GlM0tE(@$Z4WS9~SJov+DT=kEZa@(E0WcEcx0FsV`5Db6NC!V}woNM4#AY#y4|V
zcGfJc2;H@B=ic4*7ff{9i&|5ruCcY7__a#1S1tN{P32SRuV!D_tlt0mk+S{xzkezF
zn-7Y&EBC3-DcWUz;LL;X@g_ZzKBs5>H{b4a!=6dHduc-B)u;`Jo`r8<+{W~Vq2`0N
zaE8$A3qX&kmbgZgq$HN4S|t~y0x1R~14Cn717lr7(-1=oD?>9YBLiInb1MS_`T5Fb
hC>nC}Q!>*kF*O*PK{PbaT?tCT44$rjF6*2UngApI;B){0

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/bitbucket.png b/pelican/tests/output/custom_locale/theme/images/icons/bitbucket.png
index d05ba1610eab6ec3f9a4dcae689d4d88bda5433f..277a7dfb931349c3fc0d905c8225f7d08677025d 100644
GIT binary patch
delta 517
zcmV+g0{Z=e9qJgca0-6`<Vi$9RCobhlGEB8VGx9KW6RjKZD$qRwrx8Z|F&)0w%#@R
zse>*Jzj349X=?9_$gI2kIcwdunCZt<z;fkFc0^`9mM`WkG`96!{+zSmOyt_DF(=<-
zJouCUN-2J&l-&Q5f8ure>MPOnPe)w(oZZmY=P7Ks9%FQb&pCe?mRi(2I5a#OFhj#5
zX~ivAMte9hPvOw>RNVnVZxJRqq-7T(x806E@F;ozqonP3;+J2Doam6S2oUoW{v}rH
zEt0_^xDCBk=7xX;iioANNJ3Jzr;t_FYP1Ua15N{&ZKC~Y3NYIwcN)uN6>`ekJOw_&
z%wsAlFxlka@l}7tH66vZ9lzo$O>|s30b-uQ;Lym1>#=%^$O9}pA6eh#>;o1kA{GH+
zo&t01Rhr(a;LSXymDhJ&`<4S(pomxmi1`b@;wn*jb-hL2buS^av=!{Un*as8J%OMC
z-&;+q-S;qg>R|<&CSZZ?dzgepAgIvZJ#gcDZc;&0X<dD1dPz%URy{~7X@MpcG~fQ2
z-_<)9RNx1%y&7$@E1Pe|UHh8zS}g%AP(%(@=pC5zAF>RNaGgcuWqg1lVi5=}@L!f*
zh|*gn_umC9(52_2umTJIY3=O)msGvyLDH<_8eoAU24=<p$6qd8X#l}k00000NkvXX
Hu0mjf>frk{

delta 1058
zcmaDQ(ImT}fUBN?v%n*=n1O*?7=#%aX3ddcU|`J442dX-@b$4u&d=3LOvz75)vL%Y
zU;qJ|3M(KpH?<^Dp&~aYuh^=>Rtc=a3djZt>nkaMm6T-LDn<APC^+XAr7D={ndliP
z*>Nc-DA*LGq*(>IxPi6T7h3_jwn`Z#B?VUc`sL;2dgaD?`9<mahL)C=`UXb&Mn<|o
z6}rWhc_oPzx_QOQ5K~|Vxug~+7iAWdWaj57fDBGd$}cUkRZ;@k1P2g@rX<7dDJU(<
z0ozialB}PalbV~FS5mBRsAs4THyx<iCMDUbxHKs%HMs=ra=3Y5FE}Np>mv!<=wqt3
z(FZvR$%&8v0E+@cz>dqNULPKuc3e;Gc^w%Tm~uT`978ljU4zbN3p<L;yLq!@v*+Zy
z6Xb6%vEPz4`P!C%3)4D+T)5;!_~oiUs#I*|nD>=G;NWZ}Ih%?t6(5u;E;TO<5nP=a
ztTM%H$q}{E*=8@*Zr=SkJLlp<!_W83@6Z1JZ1%!A#h0YNy6xUjpQ<OG-TKz;>Xrt{
zUG~<C&Mrw#ci)l`@i9Y$bL-!4tNEAKY?KSSx#D8}3$FwE!cMcpw*NY=70S=wKj%)x
zmur7s?pW5*a@*hj|EjXmsrC^wX4$Mf?emH6@S7cfjxYQ9;cNM3*Yi9-;_mEim>dwL
zJB|NaPSO9T*IV9QZ?0u@eby3PFMHhP%^$P1+uklJbmni?5z<Q)o?mxOqtJTW?!C9Q
zuHP2=%ve5GuUyuPQ?(^HGtY=IAVj{8T}A8Mfi{;;pSyP=IMjmc&OBq1>0@^k6J=A%
z^7#7JeD{gOp1Zp(?F?nyz8%f^bMn%z$2%T;S#4Ls?H+QWsn*R!b&Au26qlJNkJO9J
zU$0{qJ@f35$%6X><^~BkG;3>}=;3p_+UwO_@cY4uW3uag_!-)p1^5>7uv~Z`r(IE}
zqg9~wcKe*;-mO1hs=T>4o5{&b^4%LjmgCi#Fa8#8{gt<K)3#JI>j_)F|Cz$}`^Axt
zvf8qOyi*ARN3uD+FK-GrKihg*ebK{`#aCMy>v>pfq7H=TmwbA?^`?)G#=QOI>^h9C
zwc2m@o(;dW^1+V)i+jQ;*SB0d-P`L`d?nz0j5IT^vr1>H=S;`7Te2TNUpsZST*u5}
z_eoPrwBCGWe)50&&WX}qFMFI~uD8V)Sa1YO9lo|-xljM?(I1vSlivQFKKIf&#tFeE
mFI+7?8KbsL>U+2Nhhy>AKQfj$R9TdPGPtL!pUXO@geCyhYq*dA

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/delicious.png b/pelican/tests/output/custom_locale/theme/images/icons/delicious.png
index 3dccdd848ec99fba9950e8195d4e73867ada2738..34868c5c69979ebabe19d9808e1d20298c196f19 100644
GIT binary patch
delta 805
zcmV+=1KRw)2fGH4BYy(|Nkl<ZcmZ9E1FR)i0EWLgbMCykbA9(&>)pJqZACTW#!hM@
zD5IKDqq;%eMz!tbv+awqP8IHt=!XVSsZ`n>$2lgOwFdh8dv^BsZ><jO?rgQ?6?v<8
z&iuym=Ei)j$E*iAt2@8G+HYpo%Ugc?1M&LD+NGCX^~Sz^1Ao`_Z|$>=Ip!D&d6U-G
zE$rB_o9_?6^DjYr6*f0vYEJRT0S#~1<Jc26x$D+9E|smVJFk86$wvi8gOJ5}!NR;G
zbO8abtC2~YMBOGMYjr;O&~L~nN@qcB1%L>p0CY6X#gICFT%hKF?ZEuBN0h9f8yQT!
zsfw-V%t*t~0DlFfB#8n**8x)US;gXFOq?h-R$_?f$re2#SK`*QT6;%nx2#rMTo9yb
z2xw>;Kmt_J(kbSTxCo<!Raiz8T}Tv}jKB*r96Tg0m&IbH0U(6Q(O6tsfJQH=(6F06
zsC5V}z=D$UdppKHm#eF*hxhOQ`HWi4XJllC!6OH;?SGKb!Ou82aS_>V&vDGII@Q*0
ztXze>Y0y?EvpD;f$Qf_V$}hk8F8}sB-x3Bo_4+d40s#=w-C5?RuLQfc7J&pP0SeH0
z=IH~*E3ZyeWWLaKa;n<#{6&()M^FJ08g`RoPAL2{P5>Q<fDn~}CUlmTCHwae*`mL1
z$J=on(0^zwfl5$XO00aq!?ra*2Oy6Bcd7s&4E&Wd&NypYm|1Hm3>yT#OOnPY6%hC_
zU@<y8#LDs{0H6TSga8x@YCr${)rQ!*wKo?89#Tq_O8z?l9jLHYi?Evx08*MrX&^KM
z(5TmH)$6an!IIO{lVPDyA_&(p1bE&GN#X#@5PzF^fdatyZ4ASp(eP;6E`Aucc6GP+
z$gNxV9RBUMIRe*4mmX*yEiD2=&muFe-2cD}YS)f#dvt78q^aEW{a}1*>bFLvVlF-W
z@V)cWvaGQajvILP(n~H#fBxyi-<DQ}R?j&7qFTLShX0gXq;NO3@95sl7s~p(?|xa|
jzaIac5CCBBo@4kMSJ`#kmsvc!00000NkvXXu0mjf5RH*c

delta 937
zcmV;a16KUI2EGT7BYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH0~bj|K~y*q1;M><8+9DO;eXHl?&phr@k{KwZtJ8r
zq)AI+DoYGRC_<<k5ePBzFO-D^2^NsLF%$$$Y%Fv@g-Uco0>Oerq^Ob`+NMdMNmJK}
z)5LG*d-L6Wc^(6xSS(h?<8dRCv6pJK*-N!ry|lD=zU=6Cvvz*9eR|Y8ZTDx>gJ9aO
zW>1c5>D0;0nSYIYs2_ec*4Ey;wY<Faeyx7dZZsO?vT4fYGtAE~^4ER%_Is$5px1-F
zXTrVv2Hs<jSDQUP{^-`4E|)KTaP#ID3IG5A075!##q+i%bO8mfYmiDtOsZ+NUkv!=
zu0Pb1Npb*E2Y?A8049dvVrdgU%F!Q#GlurQ$0Y7zT7N0h=1B78)u-CB3_yT{I2Hg*
z6Cfd*5jvfSC>Bn;5kze=d5?*!aR(Wra;~tbOQk6n6iE^S28IC;10{@PkM=_sWfib<
zN2t6Dv5-nBydcHqKk6Nw&!>g}N~Hk+008J5K8N8Pi863TKFA4#Hef?R{JC?xzw6`U
z;|HzQ`hQBl@3X!Alt&LYah#ByN58T8-!(EXeM4hmK&f2Co-UG2Tb#|!&^frRrmfot
zymF=S<Jrox6be@bDgs%7lmJpazbZR>A|jE91R@fPNF*X6Uw!$hG@H#gbvAe5wL~g-
zeup^rQ51ogp);b<%&}090TY-2A(DWhOb(AUt$)^*qiPrDe~O}j;qVY7MvR0=e89tT
z48Q~+iXe(05da7Szq_*X#=c5t?5!{y68J805+M>0_z_^U^LUHy(Gvhb05FsS1cCng
z`k$w&UZ0x|0uQY<A~7NXU;;&6^d~r@F#uYp(b_^87GN;w_e<BWe`xFd{U>2AS0D&a
zuzwVIUY9r?14j_0@d5$B_Z=+DVmR~|IWB$}mM>H*v$|ft{9t3_8G-9yY7Y#LsVRkJ
zX3(iJpMCzFEX-G(o!tYKB)aGO!M}TZ8^dBTeR$)>Cv9!p_HOg)(${Nmzm=^2eRt!q
zyLG(s`nCRGm=1kEn9|BUeR;mx%jRaxJ0f@f7_?eHhX4RqE;sleG7W{b<gJ)y00000
LNkvXXu0mjfPe!3z

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/facebook.png b/pelican/tests/output/custom_locale/theme/images/icons/facebook.png
index 74e7ad52f362b56d584df459bc5141395c32b7ed..1d8a4327d59337d8e0ea3c8e3760479a9c7a4952 100644
GIT binary patch
delta 133
zcmV;00DAw*0hR%f7=8!_0000V^Z#K0003P{L_t(|0b}_8|35_-Ojt+GI0MB0NyKN6
z4fszECfb06iq-#Lzx(nZ3P?5prkQL5&^6N009=5u0SLb%`ya-qgBR#;fNRpc|G6z&
naAGJx5d-R>+yJU&CW<fsk3gV{01W)j00000NkvXXu0mjf8~-+o

delta 186
zcmbQnc#3g?L_G^L0|Ud`yN`l^lth3}i0l9V|E(iu08v84>euhS0J*M7^Kx6Zyqb|N
z4phTb666=maOR1l^I{;6G0EHAg`tC0)&t1lEbxdd2GSt52ZP(mY&#&s*3-o?gyVX0
zLIb0ls)0a4LX&~W0iM+B3LMU=BBuh3d4rr%SF|}T4T*7{Q?R1Z;Kr%br@arK78c;y
cvDAQp;Yq6S>qU3dKqfJGy85}Sb4q9e03k|1@Bjb+

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/github.png b/pelican/tests/output/custom_locale/theme/images/icons/github.png
index 8b25551a97921681334176ee143b41510a117d86..5d9109deab2b3669c845845515f4d53ab5d6daa6 100644
GIT binary patch
delta 582
zcmV-M0=fON4c-KhBYy%VNkl<Zcmd7U1MJmN6u|NKvTZjuXIrzCttneG@|bJLZVF?@
zlx^GQ>3g@6&i?1|w)NXSf84|8m&o+0UbR{k48>ZU#v6!wqi1V1r%EE$MYAT@gfEZ`
zebJgG`3x?P75EOx(Rb}pK9^g49TLfPG|6;$SG<Bm_6l9o4S#PIZMeTgGjDiB+%N^_
zu`S1?UTN)lbAAIA3tC_`#OSB7;uwmD=4H1(FfYr8np<3J`$3G=c6f6Ltfuyrfkr5l
zFjqL!Sb1~a)al*)&!p{6Qi}-hBQ2cX+kYn1z*i?}V1xw*LM)wGBP5J;67HZ<gas<$
zwlia7NZ8~AhkrzTJ0IfA*c5{2ox7)e#0APb5A*pDd=D{hB_dy;C&YN4u!ri(KUm-@
z#PSw+9en|MLM%6cY7vK5b8jd=PCCH>5f>QX%s3f>tDN8|6p1jri1rc-t3pC=h+|QN
z1r|XZy+cA-yn{HlphgaZYig}H-l6Qz<RuU_7oBhbqJKVPGlru%3Ojdo8;rtstq~V9
z|17SD4-kCE1Qf?{h_M~X0v1SOCnN(OP|r4)ZIW7}q5U91`xJM3M@R-{d(YNG5Vcp&
zD_|(5qbCZdSfFYK!w;c|*Pw=Z%N&#C6R!fqqrGdSYf>LqAnG6{VGyRGM2-twLH%sL
zMC^7NRX@mKf!$euxzT6!Fg(s<fhQP_WIpd?WiSDk@f5|~Tw<DY852<^@xNa`0K$+*
UVd5uE0ssI207*qoM6N<$f=PV_=Kufz

literal 1714
zcmaJ?X;2eq7*4oFu!ne{XxAht2qc?8LXr|_LPCfTpaBK7K$c{I0Ld=NLIOeuC;@2)
zZ$K%a)k+m-s0>xHmKxL%0V&0TRzzznhgyqrIC$F)0{WwLXLrBvd*^wc_uSc%h%m9E
z{W5z3f#4_!7RvAyFh6!S_*<8qJ%KOIm?#E|L=rJQq=gB5C6WLG5;c?r%V0>EmEH#X
z5eSwPRa6WXBMs#$5H%GtW2go-in9p>zW@UYDN<n!NPv@68XoE4nX@E7rR0&KnNm=S
z2Exgz;A|}%nH?6T$WB#ol%xQEz|X+N1=KJG0S0xNM#nYqNK?98d~Y_>NWc^XOXZQ?
z1QjEV00I#$3^1wQUJ8&-2UsjB-G|9y(LDhMNN3PM{APL4eYi{(m*ERcUnJa{R+-3^
z34^A6;U^v`8N*O6ji%S@sd{fJqD`XFIUJ5zgTe5^5nj414F(y!G&=H(f)Lgzv?>%+
zAsWD}2qhpH7>|TU`X&W6IxDNuO_vET7|j5oG&&VDr!)hUO8+0KR?nh!m<)a!?|%yG
zqOwq!CWCcIhE{<$E|F|@g>nP6FoYr6C<IBHsbWMjf+4zO1O);kS%8}qQm8a$gZmUi
zD&<NvIt<b%V2O}N!ZoNWm69uB(tX){2A{*><8>D?ID9%&5J(4oSbR1I^byW*g@__U
z4QsF&uJSEcFeleM3~ChjEQGbHOjsGDMbyAl(p=Ttv9RaVo8~I#js@@Y9C^_2U})yn
zzSHU%6FxuY?d;&<huP7GHTb-1@xlJO(B`!HdyxqFQHH(?73$<tXlZL#R;c$4@H*dP
z+g2Gl(SNi>65MyR({^lU*3$z$ZllDb(o&<7d;A_`h<Vt-co_6}4qhm4NL!6;QN;~C
ziOs0?+tNQdT6JgR$TNMl?(B>2U+3~BJ2Hv`{W}KEU801#cv_B|9Cm!ynR{S`AMsSn
z;7E=B;mb!wx$L;S>yGXG^6=&WlQn9$s?&L%Y1D8TI^MlKB1DqsEng$>f4=xYWBoPI
z_S1p!sJ#d2?YI4kPA{k}Eby?F=f-J9zIc`YDl^pzjVm~9ebE?Hn?t0Nx+la|D0MB;
z9)2xv1G>a1|A9kQ>~DV<Q;Z7ho$L^b&Ea$Dj%<sAD|e;zY><=X3-4yC&n!m8-3K#P
z{X@<rb5Hi2cU~WVHh|a|UznA=S2T~Zo%gX~ts(4Xc-Qdmw#zoiO^=#q#=Wa8_3kfM
zx=ub`8M3t4OXkYbtXVWMfw<I@{5w`SwWrV;vC8G9bB*bHN)Yk(=-utUw^Ilfg?CQ4
zGSWYIztN#z924;3n11kgM76CXFCp;!j+#P#S@z&Wc|z;)$KPUozl=B>0zRuQsy$+N
ziSCoLJU{Z$nQy4A4Y5UJ07$5FA~qL2%Q+cLaqDU?Lz3?=BC5;Nk6BbTmmceEaM>-Z
zi>O&-dSE=%ex;vcvCOk{*JQ5^_<YkKqpS$DAH0F(H<X7Bw`87_MOS)Pg#68pNxjDa
zB;jK$zmn_sWuB8y_{V!r7^(ToKe<wuXyxcEh_xT;sDAHiUbnkXO@U&w%;a;~8w^_5
z7JIw!*5j{umb8@5D<0X|rEcyQ=TV&ZS&EAftyyndd$Eih%<?R`$2~8S4QJH5$fAeG
z=l34zf}D3MsipO=ZSVHf&ktr)HOpO__7^nu7LNz%%Lk<ETz#8t6H|H@2wg%He@aa`
zq1}V7F@MGV3R$*cH!B-|SZ5VW<W<&vWR!!JM4Cx^@#nE|aNkx=5~sx;c)F*Skd>4M
z4lW7%l9IqY(z7pV(?I@@8=KPFO82)O{VDI18-*d-k$YmI^XiuPs_LuFw<^ZcD}yP5
c*NrbeloN*74g`U%%F6r~k%+>C^#XapzmV0H-2eap

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/gitorious.png b/pelican/tests/output/custom_locale/theme/images/icons/gitorious.png
index 3eeb3ecec36a73ff505e04ecdecbcc4792ef6786..a6705d0f462b505be4d9a5a372743d206c141a11 100644
GIT binary patch
delta 122
zcmV-=0EPeK0p9_TY;#^oL_t(|0e#5D0fSHgK(Y7Teg9eOULeO1?3aKI<wLO8vObh&
z%oyiabZh%T%-*ZDwfFgmXdmJ=gdbWw=-~yJmQ!-zQp(M6jf(`SUF=6zDu2b30i^jL
cLGneO0S-n9?Iv%40{{R307*qoM6N<$f@ozpssI20

delta 126
zcmV-^0D=GC0pkIXY<FTwL_t&-(|ye`5`Z8K0Ko$#3IP-G|9`cS8ED+{nj_01Be_ko
zAnlp75qc?o2`=J4p}SuqmwW$08PD=GA)NOfKKp$JNLE!3I8>`8AeosdsG0qQx@~m{
gLjq!&M2IZn3l2sJ?G?F6i~s-t07*qoM6N<$g6fhoWB>pF

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/gittip.png b/pelican/tests/output/custom_locale/theme/images/icons/gittip.png
index af949625ac83d2441215c81650e897c97d9e5d95..b9f67aaa32a0acd166d7271b3dbf9113717d3f00 100644
GIT binary patch
delta 386
zcmaFPJc)UNWIZzj1A~Sxe=v}m6W|l#3ZxT#Y!bY!fh3p#BB5*_n^<@ANM|FUY^1Ys
zjGO6|b0@!i{xo+&TfC=bPi^6ccW>|CzL62)x?$P8|NsC0`}c2FPg6@t#<6`n<2)@l
ztyu8;_pcKNcE@>Il&6OG))mLNo7JB^e(3+d|BoNsjdC$g_P77_^G9B^PjzNYPi;|x
zx7DJlJyY7NSIwK2;BAxOW%Vgy_jjNJIZJ~4f*Dk1-1@cP|G$f`-F8=jT<_`P7*fHQ
zdfqhYsDnUrV&-P$&9Z6d7@fZF_uSzloF<X{eV^Z5{Y8iQ_B2n_3{;<(I3aCTO0}ld
zG);Z4m20w6+dTdqJn?@@$}bPMOI(+X{|OdnfA1+#x$jqP{GMHK>EW*@CyFpP1YCWw
zVPl;|fw(eb)gC4ri^kIrmaM<S^u^#yo9Oqg*Ygk5a!eNU_xo&jwe5?s=X2}iUvGBK
a{H-f6U0bBbzD*J6PzFy|KbLh*2~7ZBnzA_n

delta 472
zcmV;}0Vn>F1Lp&f8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66
zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RX2>}BM1juc&=>Px$XGugsR5;6H
zV1R-IZyPY3=wqXj;B7qvNZ$hDUr>AtDyD+077l<CFhdpq*?<3m_#c!;#$Yj!8e~1l
zHeXD@)P#YdYA&L<1Y{~qbF91h|43&epiR~YO+a>}v+@5JH&eJFFqeS+jBLY|b0`0Q
z`TXhs+zD-9!{R+H|M%1u{{Qgq?f?6?Z~V^)aYc5K3IjB7{()@Sux#Fc5cv1+ADEui
z)AYZkBm*u6!hgs1?ff4HG!&|51_Ly-!Oq;YV!?kH04e_c`xn?|n1LYr#DU#F11w-J
zxWxdCCa^$xYWRObptr6V*$cl=42W?z`+xTMA)r;58bP){esK4Hl#4Nj0k@C?G1=e#
z|F54v;Lb)4le}mj^k}^W4@6{%>dY9FfCGV^+9H&wMNtk!6^z8<Z3Wf<1B<5iAO{?3
zG@>UY7zV}vl=kZXtL9Aurw8=Z2v0~TN!c6CC0<srILDuqDauTgW@i9z>i@@)Shtn{
O0000<MNUMnLSTY%0MZcv

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/google-groups.png b/pelican/tests/output/custom_locale/theme/images/icons/google-groups.png
index 5de15e68f4d1e4176b46fe6346d42f53e3296b21..bbd0a0fd41295e94081103efe82742a5c6411765 100644
GIT binary patch
delta 405
zcmV;G0c!rE2BZU!8Gi-<001BJ|6u?C0c%M_K~#7Fh0rs=C}bbN(es&M%Trs%n63FP
z*|xU!S~91!#3kEHt~J}X-v2M_@;o;F0-t>JdX?YPsG(G*(IkH!TXUTa|MGXJEV^uU
zO%^6InT39DmnQRTDmNYeGWaW0niK{B0YDT075ME2GbG7G0e``erTaV7m>HqLq;ls;
z@E6;jJ_t!ni{D@@OvEAE{0m%k_m}t!5J&C&e{jw%pJ?$XC{2oj6x*FKDoI5ID2x9=
ziZ?$RtNv%)bLwC47XX(%^qmjB_^T#Z@(D9JVu$~NMVo(Par<w%;OfWz;rKmPan?;A
z{dt3#%;bVQKYs`3-$A9Q{GPt1rQRSFm;ow5sT2?@^QR4rg$anDgeCx$iqb6h2iG6)
zockYoL<MGs2$l1m-AhHOOk)WzKKEExUU5lR{E#fkMyI^rh9|$*1}D9nrFre;r@Q~Y
z8?zi6ocPX{>!0v;mgd!$p2~_@_rOO_1Na`l%Wwj6h7Q6{00000NkvXXu0mjf9WcY~

delta 791
zcmZ3&yqIl*WIZzj1A~Sxe=v|@Nq6*hWMJ6X&;2Kn7072S4sv&5Sa(k5C6J?#>=ES4
zz)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;1`b-0SLR^6g{{R24Q}jwX
z>GY=$Pd~nY^5Na%_irD)d-LG!>w9ls-F@@&&Z`&ow_ZNG`Qq7)=TEOadvfL3<I8US
ze_VTiJ9YnZ==^Ed_QSU2yH(RSi^i|!^<PYDKO0wnGOYUe^wA}kp5IQLzZ^P#+O&K(
zulr(B^ZCici_YD@9f7*qf7-VGumtL=|7uqE#lHQgUF(nU-@lvHeKx82WK{jpu;Rnx
z2N&$xe=I)wzkcD7|3+0G4Jtl7x_{ob_4}eD{}&zkXW978qT%a;!~Yf>`uFhOdF$qH
zom>9S-1~d_?q97N|2(*R?)8gXmW@CK|Mkn?-@kL#u=0aJ`TKjf&%Ahg!>Ia`UfH`l
zw@w?^e9|j@d;7+zg$rjaSTKFwys7i%PMte<>YO=KbW7gcynf>ToimH;7tLI>Xr@l_
z>w^b2YZtx*hS-+1tP6o*$5ImH2aJ^Owa0GBBm()2N#5=*jQ^Q*?*TavJzX3_Brcnt
zsElR|lxX`H{!MpNPvMys!%1t6rxr*|tvw|&b>kF`FMszt>A(8-eCIs*hND@Vt>@@%
zKVJRj^ZXeMYZ?<Y&ba>2=&a{_q}ik^;jd!Z*}p8s(MS2ld8e75*GxGr{_ns<PH}w|
zug;>%(paa0dj(I8{4-Ytt=uHlv|4Xv?``Wvcg$U{ITdXG={G%TuU)d#p~H(;U8-$v
z{MYh8wM8UpQ$TH+b8X9qMH-uQ_B=}ebz9<Kx<rNRw%?OAo8o7meg0m)+yBq$dQqkW
z*S}Yp8${+M@W0fRvHE4{!1>R(`K9>h#VV>L#h3m7y{lT{8c~vxSdwa$T$Bo=7>o=I
zjdcwSbq$R}42-M{4XuD|0}CqygM;j6rlM%b%}>cpt3=meU}bCu(I6nQL9Gg?gTd3)
K&t;ucLK6U@#)k6%

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/google-plus.png b/pelican/tests/output/custom_locale/theme/images/icons/google-plus.png
index 3c6b74324031611f20c0a3810131aa74fd0a5a9f..f8553d45ef3c858672ca169868aadbaf3c14b8df 100644
GIT binary patch
delta 485
zcmV<B0UG{~1pfn&B!9+9L_t(|0hQ1LlOsVC0O0-~v5iT^PR_P{SG>a6wr$(C&9!aY
zX77u!?)s|hF_{^ZF-A8iD1Edxd6XulcM*01MA`|6VG^Z|G^cMnS@SQXv9beuPj!6h
zhB1jF)F8|%heEiGfH+~e8kNSDH@#e)JW?4qX;Q)GT<Ep_+<%ocTp8yPVwFKL)Fy*C
zc9;@j9F;R(5j#{714hoPEP-xa*=pT?i_{BB-WV3Xrwx-w+TBv`W<k5*=B&_BI^5HN
zh5X!w(lCoO)a($s`=jG8E=>7t5P3nx6N?e<z>UwA{x^#MIz^w4#;vg#Q`{-|sTaZm
z+z|gUicmu%q<^&)H&;eX85XhOcx`!R;U?1$y};|Mjt>)GwEXWn0YLw!%ul&`yZGam
zx=N@w6>l?tQS(0g`KaQ$xKi{>!+WpfyjM=iFUOs@I(NAe(mtT?O3oXC^_q}GyeP&k
z7&m8RudzETJws7@&*XmlUiji}_T#&GA=#Z6PF2alX<n~oj2D5PJ8#tR<?zqpyr&Y{
zGY8?%LvNZ|9XlCI#LkM3YX<#S(jJN^{$8zk(hMK&)(lq~1bvlIpNPnh1I)^4z~u*R
bt~5v&n>&-9Zv*P$00000NkvXXu0mjfW_j-N

delta 501
zcmV<R0Sf;A1CIodB!AXPL_t(2&ttgjZAlVhxZ`DU!_)jGZgkek5Qxq>83Nfrl?=B$
z?C#W0`gr{0w|9U4!@-9uuPVK-xtjseX$J$Kz!^tFAp5GD8N;hfZ@zCTx#3}QIWX|)
zo<~5rUx%8nyO~^up_2~!K*3Xv`at$2R}+T+|Ia`4GrHtrbbk?uJYwIy1j>GXU1E8{
zUJs6dLU1-v!-3nb2Irih=+?6PK<TfGB2Rf*{>KJ@8lF5#&^v9fcghZg&b90USur#C
zh_yBx0YzYJ9ftpZ|9@Mbb;3sH7#LlcapC{3OLv2zTp&7Rr3KUgB!TRsHrfndzX7?Q
z-YzOS8|-?va(}|7H}{@Z+a9#igrj|y8bB3$Ei?{TY620%iQu@K^On5WwfFNop!oL}
z^>%yB)b}8vU8ZUf1mQ9qHdo(aqPoK*_{p39|Neh?RA2(;;zSGwOjNfTDsM5=J-hM6
z|DXT=|G4|0)Cnwt9Wk75oBC+~foB_+Jy^5s@yQ4OKyE?z{$*F_7JbEysAvP2Wca$b
z=a8HFI$inoAf$Dud+YaKAU$`Jb=E@#p$MXe;e?6&Ds5S0w7GEY4`9G84o4G*AclRq
ra%;6^)}WxshhP7{>2h3yE)GHfn>&-9#5^N600000NkvXXu0mjf*YN&y

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/hackernews.png b/pelican/tests/output/custom_locale/theme/images/icons/hackernews.png
index fc7a82d4d68068d5fb032885b93e670c385ae1b4..8e05e3ee207e114a96f3811f46f68d17d52fe80b 100644
GIT binary patch
delta 119
zcmV--0Eqv|8PgSz7zqRe0002(-QrTQAy5ip5>QN3Mg3?1|NsB>i~#tuXaD5J_o76e
z$B4WD001vZL_t(|0b{@m1Qi$r!3;wKW??Xc(Sbz(%wQEZ41g$d6oINX6oxVw1@JNO
Z0sz-j0)=#JDs2D&002ovPDHLkV1f^rEAjvU

delta 625
zcmcaCdQx(N1Sba@0|SHn=l_Wt6$7~HISV`@iy0WWg+Z8+Vb&Z81_s8w%#etZ2wxwo
z<osN{#FYG`RK1Ga0-!bq2Ac{iATu|$BvGLvHz%*ys=`(YtilS&1_|pcDS(xfWZNo5
z_y#CA=NF|anCO}487SFtDJUq|6s4qD1-ZCEwAWh!xwc9fB_#z``ugSN<$C4Ddih1^
z`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$`Dgv2DzjbCl_TFlw{`TDS!-4Ov*1Uu~kw6
z*#rj=ho&UM?I|cN$^qMwQlG4!nv<HFnpaY+Z>VRe4>ujC*(N2~s<<>MD>b<U>~gqy
zU@tf&rt2dK+vsDew$TSU3CW3&004^uL%@#9M!y~&oOWDK?Rg!6A-u)Y#WBP}F!|5y
zgCFKMG97SfjN1_QO8S7wUwdYb{{fDr(mpbwQyLi$v)Y@dH(WJXz4Y+af8UxmBo-BL
zDli{rxRz^t@Y5T&j|HU$W<Gp+j42xwiWA<*cgIRvB$XQ<$Vr>NErp?T<3SOHi#<DH
z7EN6FOoEv?Kv}}Z_S}c{N4Y$un>rt|&bV^Em^;yjEyXNG;M9SaOcQK0o;W^;S5uyG
v%<Vx5quJ3LN7(K$>`81md-6pR^Lti?o$UH5vr-H5L21O()z4*}Q$iB}X`Rn}

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/lastfm.png b/pelican/tests/output/custom_locale/theme/images/icons/lastfm.png
index 3a6c6262b644dadbcf6cce5dfe4fed9740a9ec1f..2eedd2daa1429ba026c0b3c81f200c7df55d199a 100644
GIT binary patch
delta 818
zcmV-21I_%;2gnAHBYy)ANkl<ZcmX|+L!cx_7=XX3uJO$3DYk9fb}q5)9CO}VY&)k|
zm$hx1&u{#C-gHlORc$YS8)E3^KTb{*D^Dle+pd;{TwW^A3QsLn5p6`#iFjfNK@sOd
zj46@unxvEEI5$8_{h^Y@>KCJu$;;6iN)?b2a3_#VfTsWs$A4P(un?dlut21-!md(j
z9Ua7>U64$1pfE0S*6gu`5CGuZUX{%vln2{-@Rb=S30siM00Js?7;b_#5NL2>-(UeP
z15zP`goMKR4XBSCro@=M&u|0M893!QIPOTurV%{@uxK^-O&FDji_U_saj<k9bob(d
z09&nvQlwL5jDLfxE`$ru+<R(&Y44z$E{9?nE;t>IJ`{R~aHkyy-Tj!=n+Zl5ZOYaB
z0@qx&XN&peKjc6W(Td=Z4tV5FIPM6DV;tN;G;tP<Nps_mQ|S0=T}Vn9U_y>QjA;2f
z^o)gwgu+zIM8ExyU9<vs%|$dm`~kbQ8}-72q#wSEuz!1ypudQ9gt9n)S<3<P@Pl!!
z5IuVddgT`Uh3jd&^CKdcMd$PMo_quKAO9kC_jRae?xVSGE3%L)NV~Z^8-Dv6a@=SV
z_us_uqy<#wEGIhi6q@BardlWe+T-ZZ$A9Ms066_5eA9w~!Ry#`-kl4&J1=tn?-Si_
z(7glBUw^UIMX}xY(3`IR{#W+IZN=ZCO%S>r_q^a%r%rJ@Z+x)Fd-;e{U-Iff*T}z9
z(5p5g3wcDXPJR3rG$+nsWZfoYCWAb*gT_Bo7<z3y{^DiG_BOJ|9=1uWKlk>fg}|L9
zJ&75r5f0ZeI>gIn5MAw<$RbKrq)K4wK5le|R)2c|&sf@Ty=1z|<g$@hts&b+;SNcX
zjK(6YMG#}k!$^TmD5SQey4namORL#LDGz6iRGA|W>29ptcAlpLWIBa02672hA&bZ+
z@uZ9gIGpF<w8Ruk$VLmg;zdUu_PeU*Q*Y_>k6o^gJHm>QrZCMQ;exO;=5fSV#<6y(
wL@OF=l&Dn;;?VYu$*zvi1a?LH8!s;11*p%JbB}qZ)Bpeg07*qoM6N<$g4^_xBLDyZ

delta 954
zcmV;r14aDE2G0kOBYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH11L#EK~y*q1;I~j6jdC+@qh1o^LF-sk?xk2w$KnZ
zDpdlBD2<Us2~iSbKqDvA#DgC2Plz5pbL8U1a4~`C4T$m2sf0wM7y&IUG?q|==(cw0
zw%y&%?#%4Wdp|!PwfgntJ(<?V`+l|ZvMv`(+IUWRX2zscNYf|r)GCS=A~Dvkk?}%u
z{yJ&eBx^1kzkk&}H{|<=ND^4v0IdOe0zU(u0oZ|a;2bCgNeT`~6P$8)OfE?uXRHQ(
z7Mug;AW0Et!8w#t03ZT@6bdNg!NVm2V}~{I0E&4)!A2K0Lr5${35Wte3r@knf;K3n
zA!CrB2i^X-QIC}ZHhYlE!(<)m6Hv&ZmYQ&L9)b{tN`El5A8NxevjB}{B#LnDPOMcf
zyN(rj=^z~32O_Yt2K5OzdI(zU@cdrbH3rM8$TM|ltYGKw6ZLx)Bb}hk;TK`3g#G3R
zbhCvTq%b-H?;eBtPH47Z`v~duFZ8bbMlqiy+3b;&eXS#G%&u|L*#(lHZ=f;;+g>NV
z_#^J-9Dj0niryFJaSs}pQzyy2bDX&Gh-jsS6Jp)^{nkJLy<<Bvh)I6^ljQc_1UK%|
zJ9`0DERd8+Ebn=R?uBp3zHtQe!CQn2576aeS-bm<Lj2W5^zarkCyugt<vJVJW=Z!=
z60Uc#?JlL$?~%j-!P)Zwu=gnfJAme+BP<>`c7MIGZAyYm(;_00EH@>X`%6+0`S0z|
zWaY#sA|m280ud3hQ7r$wc}nK9lk)GYCzrgBcRu}**NtlZ@2`^FxrZ*7P@OK_Gv^4W
zuhCyvMCbG9u@QRTU1jz38G=7<p{o@NyT=#R-Dh8)DMzwjdm6jiA>Qm_lNhg%N7bs>
z)PJGY+Gvx(b^~Nfo<X&YXC2koUiiu6i-pu{chHp~WYot`x1yXwp-@>5s}(L|(1{~k
zs}OsRK^S6;hghpkeqyxIyZ!Khmqh4X7HcgOGnjG#Rq*k&#$^QYJS5TB)*8AufZA5n
z#P}uCEoDDXp4&ZZ>N}n4hsuUgMxuC|L^JU)j;iX1Rc%xbXN~H#%WAB8&##Sqsc>`E
cPd}XbAE?ijbKR<!LjV8(07*qoM6N<$g2l$WCjbBd

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/linkedin.png b/pelican/tests/output/custom_locale/theme/images/icons/linkedin.png
index d29c1201bcb0c278d49f573f9ef95ebfe932fb5b..06a88016f191d1f7596e5d159eb9e3ef276b6ad4 100644
GIT binary patch
delta 611
zcmV-p0-XJT2k``u8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30006eNkl<ZcmYk1
zGk|qR6vuyOX5M-?wyi3*?WAv_GPe3QcG}psxv}kJZN9yC?wo&|e8+|X7d-lHKrR`8
z82}iF|G~&bSD(C{o%P^X8x3@}vlmwkmV&KXBw>F`)S1F}Q-AF=yim{8W!trS4%&S6
z_lM@+`)#2k0tSGBnS>A!gUz*@G`?K*=6LBro9?h)-)3ueJpbKPReY_URxs;Ip>eO8
zViu~#tKxsiG}F#YxxDn_Op4)+pJ(Q(rn?nptGrx0qLplVDff59VAgJ2uC!1$sj=JN
z9eVxe*<a^YDt~tx0n_cKw-wju?TEpCnQa%Dp=6epYZp3o*NqO?a`nMq=5Bpw=#2d~
z-DRWx4~G^{+-V(Pex=;^>FCXaLv`alDWtkCwY0;!z58#z#&T71?c1;2yXPjW|3Lt-
zK|fa>vgM24P7nS%my|*-?u{?k1z4y`Q@qLr7+I)}xPNx=j5|O5!vJ<%ueYvBm7B0q
z#9!Y4F0C|@0B(JI=(#T^ANqWJe6a>PW1y%m9$cbG{M|s^6h}ZVg#;!^fV*&a6p)bQ
z00`WX00V>x13(fkxd$YZ`Z^;p&>e%(-AX`jN5nmtb*2b(r+_Pkm=H~{XTP4zMX&uh
zQx!e=<y^${a(?@#Ibvw%a^FWIJFL_9!O*-L!GdwlQ$$ixaup-T&~im52TCxYqj(TG
xQe-_{Edw~`NunV@V3_#FG$b$pgX~;)?C+p<VWy}RPOSg{002ovPDHLkV1mgCCddE)

delta 884
zcmV-)1B?9e1b_#S8Gi!+001a04^sdD0yj`hR7C&)003yT0BN!SYqS7tv;=Fk0&KJZ
zZM6h#wE%Cn0B^SlZM6t(wgqmr25z+jZ?*()wg_&u1#h+kaJ2w&wg+#v0CBejaJB$)
zwg7Us2XMCpakv0;w*Yjw2XnXpb-4s|xdL{&33j;$ce)98w|@+Fxe9l?3VFE-dAkmH
zx(s=`4SBi{dAbREyb61~4tl%~db|>Pyc2r65_`K3e7zNWyb^r86n?)Hg1;4lz!`zS
z9D=|bhQc6)!XJjhABe&sio_y{!y}5rB#Xl(i^L|2#3zl#ERM!4j>a;P$1#$}GLpzL
zlgKlZ$VHLJIe(SPI+e;fmdQGn$vT$GJeSHnm&-hv%0ZaRL72=xnae?$%tn~XLYmA%
zo6JO<%t)NhPo2(7pw3U9&{Ck$Q=!sTqR>>M(N?3<R;1Ecq|{ud(_^L5S*X%pr_^4j
z)nBL8UZ~VwsMTPo)nTdCW~tL=s@7_()orfWYp>RCuYcBXui0?0*K@GfbFtZUvDtL7
z+H$hkb+OuWvfFjC+IX|re6`$rx7vKS+JCp*g1Os*x!!}h-GjN_fV$m-y55Al--Er~
zguUK~yx)ht-HN^6jKJZG!QYj~;+Dtam&fCv$>gES<f6;vpUmW=&E}`g=BLi*r_blB
z&gZMo=YOft=d94@tI_DK)9JL-=(N@8w$<vl*6Ov_>bThJz1i%(+wH&G@50~i$l~wM
z<?+zv@zCb-*68!s>Gas@_1f$8-tG0~^7#M%{}_&@Hvj+t0d!JMQvg8b*k%9#0QX5m
zK~xyi1;N2eLO~P;;QySNt6nv1m5>!_M4KKZ=znqAx99<Sj;KZN&?2Znf?5Sq<|4J5
zc*lEZ=FI8)2$$rE7@Pp`=87%`PK*V>(MHNAcHs|((^pH-OcELe|1D3t$8J%1Q#oJG
zOS^KD(O0omm6HFqxsGN}K7Pht{2IM{UItjN=ZDkVv)$PU@_r*3hjORWulwyIB6~V0
zBW<tU26c+i>pR786}b)xDJsVI4<4<s<`flDDQd$Bp%hL*p<Y3%gj5M@?4WBJ=&CX3
zNRy@U^7-hVXHQ&=zuzdMc5f3nkKQy<Nz3gM@@+}Xh*@BmW&IEI8i?#El2Z);0000<
KMNUMnLSTZ-AJ$y}

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/reddit.png b/pelican/tests/output/custom_locale/theme/images/icons/reddit.png
index 71ae1215ac8ea274f089cc4aa55eaf8a546dea67..d826d3e746a18b712db7a68746c0c523af802fe0 100644
GIT binary patch
delta 170
zcmV;b09F6B1<C`EB(ZG>0e^`}L_t(|0d31QS_DB5hT-pTeMoSLkQhI}Z~!hma}r`K
zMM9j~t#x}_%UGs42+d|cE#R;^1PNeM?`wKxS7JDFAgAY}Crl@r_%gExoyh^1y9=e1
zkaMBr?0@>#A310I{FMSU*HeuMH(>)dx3;%7VIzRg?Nc55J|T1~XCJP^0(5N}YCBfw
Y0eY(=c;GCP9RL6T07*qoM6N<$f@R!B0{{R3

delta 404
zcmX@byp?r=iW^J1qpu?a!^VE@KZ&di3=E9LLGDfr>(0r%1acITJ%W507^>757#dm_
z7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD?*CMQ+A=&H|6fVxSTaFm^kcZ3kp*@pN$v
zk+_`Ne^sa{fPwY>*4@^OyZdD$G?dI<{QuwmVnN@o{@)vl`4sCf=*JyOFqx?vHv6yc
zio-99s`uE%{$MtdSY#s8`ASL5UnTe@&sjSup3_f1wI;2MS^3Ojn&OhMe3R&k3t48b
zOr7d)&DE>=%gFXuZr5Bh#lwOI^FBOKPfjqovM9J_M%KlfHH<o~Q#Y`P75lC^+S{^r
z&*beB%pMgV|5so$SO59tj~nW11FyV(yGrZVPWg8aJY<;H9X|ndKZ9zCYeY#(Vo9o1
za#1RfVlXl=G}bjR)-^N@F|@EUFtai+&^0i(GH^1OWAeKjMMrLaN@iLmx(-t-6H~Ab
Ug9|!0GeLHEy85}Sb4q9e0IndFRsaA1

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/rss.png b/pelican/tests/output/custom_locale/theme/images/icons/rss.png
index 7862c65afeb66ba9cc7e9576a3a62b850b2e184d..12448f53417b4974fa041655a5fa82dee20c73d4 100644
GIT binary patch
delta 728
zcmV;}0w?|N2JZ!sBYy(6Nkl<ZcmWN~1CZ@j0LJm(ImxQFZQHhO+qOov$8T77RNJ;~
zx6jsI=H4WyJO20&0O{2e*R#;@enu8vSYz5U`lG9f^{QgNh`4A^uQ5^Zx{ys(=Yy8q
z{Ee{X4HE;T4==hy{l#^L7b6VOE2;ZbJ!B|o{YQH`*)Z)EiGQ@gE&FHn*Y|E4!j}(Q
zcn#8$j83CBN_!g3$+Z5aGZ8s)5&8vciX>F6<?;~b>>~~_f0V{AjQ&Q63WI@#mZd_`
zpq!6D9AL1bKYg`aYtoKJ|76h(S@#@@HqG%AGZ;HF`*#M0sVicJ06?&4t~GrzV`a-<
z!y2bafB-7qIe(mAUu4MvQUD+#_3CKBm1kOL73t^Oq&Iitqtm6CUrI<a_IQD{_hNpZ
zfRG4DT~O8wPm9UGKiZS2dMvq-(D+n%b{pxL)uj1<0(-sA(rZ$5NeDsRB@He=KI+Vv
zqnIl!wjo=LWB=cT6MqtBju)TVR4V5Yqy9>VDd(a}2!HCDD3meOMX<;^%>GRH=qTy0
zhol8J<g^*eR!8{!QqW)a07ZqYl6pzApwpbSd`yE&xAdBXjDB1A>O$f1rG%lS^>(;L
z_2Z+I4Fk*Xs$O(a+Lf}MR3+Ui=8>#n{&+@~k#>KD<J$T$XU2!hRZiAwq4~RPFdOri
z)}BkMlYcBDPyJp_oTNsog}SMT3+Z%oi+y>MVqi53FA<CZH0R8bTC=4{5QK^ph8v;!
z;n7v%FXxP}+g+hrQa5Endxqg|REJtzZE@AyuJ-JXp@j#9Jku>JQ^xo7*4+R80OflZ
zT^0WscTaBuO7ca6A_aA-H9M3Y@{DSLGBL)|Tv2kZf0o$sj%@=#`;E)i3gy)E>N)=%
z8p`IxR&$P`sFp8^v_L($c$u=1>0{o!xY#-&Uw)e>HazN%hv0uJiC~OG(V|}f0000<
KMNUMnLSTZiRB~DX

delta 857
zcmV-f1E&1%1@8usBYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH0?0{3K~y*q1;I;*Rb>DG;D7Hw=ggfkXPnV#w1Kig
z&7ujS0)<@kKqA{z;3AN~HWDP%A|l#_#4Kv*GBDiL!l0ngAOeLR)~1IkmN<>(%-Gy<
z?&I8h?mg%HeO~~GUmtnM_}KF{O-yJnZ#QhsN$UG0*%ry<z@WV(I4h*L)LFyyW9PyX
z?=1z0=Z`O_e}8({*c4%uK}kKN8X!eM_d59s=@@yJNPPIjp|t+xqx~UV{KUjA;xw&g
z1}*YsIydS5O>YSq$rgqMYKkaS-FvbSn$Jl_*=W(eMC&poDl`J)JE%~!DK`*EMrc$F
zSLQO^8wa$mGC9wK$0%|-ixjK0F0*!pkumCuBt-xqn19T4SEdxJ%)Y~}qaq-Hif>=$
z&o7xCAqD^v#6g|deBW*3JH<af5Wjhv3$KZ{FN%m#p8bLc4ze*MAVfk`7nJqHauSVP
zli#EoF#U+o{$BWepLk|Y+_(xHJj={(iarq`sQbjm>|&y~+ElCyQ}aB2l0%n;Bfkr`
z7bRyN6@SY+B#Gg@FDchiMFe$CB9uv}i(t!M)_xE!92WmNC2pSQ=&G{Y6MlRX40pVs
zsE}6TAnFwKI{(cku`$y%=nztdx$yHF!l!o&qca9io>2XEnzC(V_9^w`BzdLGqpGA|
zC0Rn+wz0^j?cy_E@k(x(WUQW7?tE3Zi_R5kBY!naX5{O{I!aTrI2>doH`Iu=P<Ir`
zxL!Xqb@6@0$ef97fsI9-W>f60i3vdvDq<LGhw9hUJCjSt7VEq(RMYw~74lVM{X`vV
z$=p`edSAZQGdj@_vQ)pU{JS_X*nQ~Z0Ofbb-%hTb{BZCOO0vnIh(R4|ogQV6ETtNu
zj8f!%I@5cuZ9A~AKLF(C-r5t&Td&v6>o10~v()W06-6~$6!EUQv9*lprj>4|c_*3L
j8?xDbpUod$I0gR$D~Vu?3V6ai00000NkvXXu0mjf9#4!g

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/slideshare.png b/pelican/tests/output/custom_locale/theme/images/icons/slideshare.png
index ecc97410138bb3c457a898b1e868b22ae9db9989..9cbe8588e24976076e5fc3898fa97856122f6fa2 100644
GIT binary patch
delta 420
zcmV;V0bBl;1hWH>8Gi-<001BJ|6u?C0eVS9K~#7FrIQ1UBtaO3C+69T&Ir%8W8-Yw
zwr!hh+qUf;+t%B3Wm1i3k>o4B|7(^Afav}E_vyWXsU^iepAWr(sU-rB#{;|F-XoYA
zDsa2qyiLRZ8&GZ@K>CYe`4H`SPkL^Ksi6X=)5+V^9vMm*bAKU-BD@PK5N_Dh9>8>C
zH0j^xG-K}5WYTjpjWP`@(A-)F?VDXNch<vdwZh?WFt<p0?zmp6Mo4iJcKyi2j2oex
zJJ2bid$1AeJ%f2@t}VpD&oStK{0EQeH$qU{reFmIgMnPxlKlhvdrNrlpz7!(TtBfH
z|Bo%lpRcbFQGebBo6QEJ(Z~waYBd=2dOa)_3-qUlQ$o(JM$*}Z*m~g-OePa_IvoOe
zR-jNQz{PlZ6lKDV2#PRA1rmt_T+Fw|P-fhVCCq=C0AY>_#9}czIyxxk)H|>~8V7Uy
z1sn}2#;nIlxE)_f_XF?+t*xyTxm-@(N8ncJn41xc#T|S>FCc<GALlMGvMrTVfgm0L
O0000<MNUMnLSTZ{2E*w9

literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfjR2nz*S~-N{{H>@*RNkce*F0U
z{rk6X-@bnR`sK@)&!0bk{P^+1hY#=Hzkm1c-M6<d-oAbN>eZ{4FJC@?{`}dqXP+Kk
zfBg9I&8M#)J$iKg$*Tts9^Acq_w>EzpARqEaQ@!6eO+r#-}<z-?bG(EnMZEFU)j{U
z{o<QxDb?$a=dU@vZ2pulJ+g1Ryl2jw`L4q*WzoUcEgso(w|r`m{@5h-y21KGt>n8>
zu{U`lyUMLC`*)c4@4l3;wx-<Gq<7b=G@+FRjyfG%U&QjqSJgBY#cDUL(P>(%(zHRk
zY87AMB8Ie?|NsBbO`N?A=tqx|AirQBmq@T5pE`yXT^3ECnaey~977}|Sr4A{I}{+o
zaN%=YK67fKl);XLhVMN72>h>4j>!~t_j$}=vE_wj;Wj1)-!<nL8zwL@?458yC$D?*
z>S-z}KHD!>)!zx?ko4cYZua^>?$dWqKR+B>HaC57^UvfAaqpaV<uBr;H{$nQpPKaL
zwtfD!!1j*q@1|^-d1s2K;_0XI!p8)-c>es*Q+RSF`|DQgH%v`O+{1V2ALnUm<nUs4
dVP-J--|@jj(URrLY@mx7JYD@<);T3K0RY7iJHY?|

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/speakerdeck.png b/pelican/tests/output/custom_locale/theme/images/icons/speakerdeck.png
index 087d0931caa301f8a1bba1497e1b91b7a7f105a4..7281ec48b41095180a83d71eaf0b00c85116965b 100644
GIT binary patch
delta 566
zcmV-60?GZE2*d=C8Gi-<001BJ|6u?C0t-n*K~#7Fb&|D$B}Ej5ztdggio3f*g1cKx
z#JmXl5Jbd~;2BPWyF0AA``+6n=O3^2ay|NmQ*XQW+4JwXYGz=3cw8=FU>HIiQv?{8
zndJlh{cAq|>y>c!tyj#Pde2ptcXE>p3>q^e0l<<lqZZ7Jp?{`T&OQ?u2xA9&(Q+xv
z3J_F{W*|{Fw)7%}V4C|IV#=gg@ZwPa2_&d`tLfDZl}wD8kYXlxh2jOPrXOi87?RgD
z2s0<fM3|Qn`w1jG6>vcf;gSBBHCWqVp#@{X@{prbV!^x2p5IrK_xEu*BSS-kHUN-v
zrq^|}O~YKan18zNB5bgwWG8rba<?cT?m5VS!=2aN#8dY_%C~?1h9Pdb_C{X+<UPLr
z{TKSX50ZM3h9OFFf{G~7@%diF*x)D+-FOR6-gY<tuU`uikKb}9dv@;PpOq`wuy5DG
zM>UIq4<$P}6+C9-V(ZSGy!i4<yz}t~WCXxxUwzHbD}Vl_mm}@yFgX?)D|i;cixyl^
zfq~Ocp^b?Ge79#ahJhJEG-pgR2sA^3xEme|B^82}Vju~do+Ox6nkrZlha;YoLl$xo
z<RW*uzLtcU0U%MiFaWcqJ1yR25m*djeaP}`R`;qvQ57_eVHklf?{6Jt$Bu+h73=B?
z)Uzg-N-vl8hu*r4ua3ae&A`A!{RJmLx)v)b?VJBQ3+!ZLngi$tLjV8(07*qoM6N<$
Ef{By}&;S4c

literal 1049
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)ORJo
zC&X36Qpczy)Vv|qtS-i^KE}L0*0?lOuQ1qcbDjH^di}y+y|QqP!eEVpVC8Ior7S<$
zRBzc7Z^?L1sRU2)Xm_y)H_-@J;Sd+WKxYAeM*&|)eqRTEZwEe4dwvgleoqH}M{A*k
zFrmaSekW@-6-5Cz2O#2iwYT3?W4EE&Zez8>rW*T=)%F`}tXEZ-FE2F%qGdo-V!pi0
zdUd7Ql2Vg}#l{PZj29FdFDNouRBSZ2NPl*|!JGnvIfaIE3w5UE>P*Se>d(~b&Cu#i
z*94*-AWGAokfk#vSF=A$y(3K`#!V!^PRQRzI?P!<(p@UlS<uf$GR94#GhMYKUAZwy
z$k#^P+a{nQciFD31rs_7C$z8FvpuLXPs-O`$j3&xAyKt6L#ZiMp*lgp%UUVGb?S;G
zpFV$Xnm4^^?zEY!mT8CkC{)MG)h5Z5#_)Ss@z@!QIGVep#5$zJxTeI3I$H498u7bZ
z$<-uDmBmXI#fZfD3PpGbMtJatx(bB4352=xhq;Nw`$-kYisi?M=0%GY#E1eJ`O#u|
z(Lxy!Lg^8L>EVLu5dvx9f@$GG8Ik-+VSI_9d<h}E2_XW>VSI6+ys<zO!V??J6BGQb
z?f5oe#A}oU`2|<sc=Gu1;~O{r{ks9AF~RkJ|E^a9l}zT~&jsq?Ebxdd2GSm2>~=ES
z4wz7QJY5_^BrYc>B%~yzC8jbmrirPUv9Xo$@%rlK%F4#-%F4>-`suOd+14`GGBZ2Z
zIx90L*9zyc$psr58y9nXdwUma8*2y0vDsxyM@uVg*vhOFU0uh<$nLJ5E*>6kZeE_w
z@6YbYrl_AUA8-G^q2YkS{Raa2iEI-uZ1~V|V#SLYH+KAJIie!ScJaxSD_g$woLSTJ
zX3mv6DTZtx_xx!(wCK^KNtZT#>iXkV$kw^))vQ~)ezhH2w(HijX<D9aE3a+acJ14>
zzH8ggT|2ifER${KyLs>Ky?eLs-#^Y;;oZMeB%i4H&a+A767ZjEQ~Byi<|iJmuFL6X
zSeha?J1&`I)ZEpyYSye-Rssx~p{$||UzYnt><E|>3Jf6C64!{5l*E!$tK_0oAjM#0
zU}&ssV61Cs8e(W+WoT$+XryakZe?KbBv`K%MMG|WN@iLmrUnB`h=%CJhhl*m7(8A5
KT-G@yGywnx3UT@X

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/stackoverflow.png b/pelican/tests/output/custom_locale/theme/images/icons/stackoverflow.png
index f5b65e9990dbf423ff652b297f1d0172c8c1cf27..3c6862e902ef0624a812aa212ea0c075aa123284 100644
GIT binary patch
delta 400
zcmV;B0dM}42c83v7=H)`0000V^Z#K000Cu5L_t(|0b{@io}}n8JxSA<48;F|_y7>I
zGmr|NB!dlE3pHdRNQ@jq_@AWeoQ4`wO;E$@scbnwT=#k!t0=-dx=K${b)P~FiNLA(
z?KBonpysPU{2z#4zMjTb^Lhr0IM|SMZ8KoF`~VsN!Y)`1cz-yNpXuFnCY5*7ncLn>
zWBm*@=rz!g=9fLZ0#9?*eV!!i{{b4*NYE=UCUZ&x4QhHfjrr}HsjUBBPiJ}aY9eRT
zvkF<imqiLp7#h}B*mJI_a4KF^<`M|R+MBDbIY8n!dn9;(h84Y^&in}Iy8oYMGDu^!
zaYKcz*4hfk|9>#Ny4>l_$}-mjtIM5Rfrf<~ZPp69(<>T@)5(h~y!kg)*aU5;uxkP0
zoj`mKi2nm!_J3_T(7-aM|0~N~>@YOu=H&bbVQhxZt_TrXP~mU0q{1s@RfWsMMHN1h
u80rxM2sS20sG+3+gaJ+iNWoM!006J!F6HlsU$OuI00{s|MNUMnLSTXuY`7r+

delta 906
zcmbQoJcWINM7;nT0|SG9va%A8VoUONcli$noDtve07W<pJR*yMv<Dcwoy@jlU|_oB
z>EamTar|hAwTHH&$X;XX*(sr)6f`=89FH`t*eI}tJNlM}*s_fq1wINZ3+6CQQ;O<P
z_~^c9Ygks|OgGi3O$r+W0$i@W7g9+%m{Pyl`g50}f5(%f%Ma~7oA~_9oa%3P5(R2D
zilkQT*ejdN(4!d}_iXh+h2w{v`|jS&D>s?t^Q>rT$%k;>9d~EXe*Sz4(+ss^3kBlu
z-hHZZT4wRZBCB|_4|yrsukW6?Ai$8!uzdL(S(%V26DMxlHgjgs^NZ=yD_^}@bu_5s
z#zO{&j*azSzs{QFpfErD>LEK<Nx5%T($b6qOcr*}e!qHUVQp~0ebeU8nanG%+>%n9
z<f54@A^va8($>ePx${LjKkOFhzIvsnSMu2B&5L^awrwjbWt_20K}NQ4--2705BDB<
zoa(+H^Jh(Js-8NBgtS}ye1(LZS)V_1C?1J$W$mvio7S%|vp(c%FRxQty6eTqJ9qEi
z<>WD`$a4RDX+@TXpq|=&^>U7dwzjTHlR~1iHwr9z{rK^n6GvG5Pd!ZFNj?^&d8{N>
z<oY$9#~(ND`t>D5pd?m+k8jSorAu!|dwEOUxXs<38ac^F*g=4a(M$8_k7sS0!^0=3
zbmiw?zrJ^GadD@MS#@Ro&K)m`LPP)lO5M8bva)iRw&E^3)1wj$$zQ*=B>1enox8oi
zkLk|+>Anf|_A=joMn(AuH%#d6PMQ~VOu%cYMyij%B+nkfMJ5wB+~hc!cK)0U-|V+v
zrv@$GyvQkZ?X_jgUS@{gy{C6gaVbxV5kuMUzkBcUP4N5v-I%SR(49Tq+Pa>VQIVma
zok8*Ngw$gU0+Ui>&3U?6A3Ri?T)2}##P#y4S3h<O^w+=ntloI?WP*W2%9;<dooj$#
z!KQK*G4A%i|6XMUvYdE6dp768jExL0c3q!+mgz<gH@CX_tZNrOd<a<Mf67$DEG*{v
z^I6}vf8G<QairAl)BQTm{n4qyKi+86*WGd0`J#T+zuz2n%nz+SPqwyqg#Z(~YKdz^
zNlIc#s#S7PDv)9@GB7mOH89sTFb**?vNATXGOz@4tqcsF8M-V((U6;;l9^VC&|ny1
eXkuk*W@Tyu(ZF!!+kK!022WQ%mvzie2~7Zrl9o9D

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/twitter.png b/pelican/tests/output/custom_locale/theme/images/icons/twitter.png
index 057ab004b5d826e151a4f9cc6a66d88caffa8911..cef1cef96bb2e0c957b77b79ee30894f798ce8f0 100644
GIT binary patch
delta 390
zcmV;10eSxA3!np#BYy#BNkl<Zcmb_aGlQ5x6x`UhZL^B)D*hR1W83!Gwr$(CZN1w$
zemobm8mt~8qG4fV0@y>VnQ8)X9Pc^YIsS936mToi>>TyPE<z~;YaQIr7-E{~#Qr4E
zsAo<UU4h{<-nw03E57@lWjfi!g&7DF28?}Xe+wKlDeHw{5q}|YjBa+-)XxF>?2>uR
z_6|ZnpV&)R5*~BWzsPssl(50B)R2faviTo8PHlFoG{z!;W3p#X2udIOBQjepfQZ&|
zFt%SO>>!RL72rgGl6ksid9v^qrV36lAgr;-*AoV?yTOHr_qbMSj5RH*9!LQ6qJT@r
z;R`1GjEuz#_kU+zWnW=WL=&ZzIF@7Yd7tVR5J0GQcdN|meTt=w8kqkp?9KRpi8*R!
zkHUtd*i0Az;{%TJjvDwDA$xhe3*JY`44_%*SJHImW?;=72p8K_c;gxvV+|ZMQnS(<
k%<U3xMTKFEHK|dGb`RI1Srg6^h5!Hn07*qoM6N<$f|GZ(bpQYW

literal 1509
zcmbVMT}%{L6dqg_sA8nmMy!cU7j3A8ow>X0-^j}T%x<BwNC7Kp)$TBJVJEmd<Ln>{
ziioWWjRg{0+q5?FKw6$ECbfwv%~C-uL8X=08cY)ugvM&sqT&xSy$h`N!T8Y0%-nm=
zobNl|IrrRYEXaRz;rv(TV;HtDH-|1nV^ZWvh(qs`357w!GTBuk7YSu@6(d2+&IzRu
z&-F9qun;m_^|n5kg<&cmUtA)Wc=9M#@N1cfk2d5N5gNm?vO^-nRzMjqh2?y}s=4_?
zScCJNRkP9HAw8lK`uLn02^Q7l7qc}LtcBBLuf?-M6e93LnZZN;t$`pFvT9~{DKw9m
z2@O8uB3D>7v!Y5o1-Mg?Aa2m=GguM;+-TH-OoPz~(s3OLbOecRV+P2i3`R<4!sjjx
ziY9SoR3Yu2i-lHJjZc<EiXf`0s<c&ltss>Xz+$mPICQ!U<dG4q4#-R>BM?lDGSD!{
zO1voZLI962GNnSLY}Fv8vnlvRkLL+-AUIbjR5BvOhy>7*gx?>@YsNb$7s979p6MMd
zt`;Ft2!leU#G?HuOO1k2?VcYf;)v8x>m?p-3bU0K*h)VP$hovtgT81vo}=6*lN$h2
zCTY@<Ml(R^XF45DquEZ=CWkB266JUn)@3#Vy~}O4yLEN|T);xQEN)uwa5)SPgWgU@
zvAKbu%mi2%jmx9Bb6CrBv6NGSj4VjSg0MB(0R=um7J@!O#GOS3Ex<ht%LgKs$Og^k
zOGAm@4mr0Z`0<$vQ~Wa&ka{!fpQo9dodBgyJAq4QrVVDKeiqC9pQ;f^3=wIM|Flcg
zgnBSCebW4B@#Ofx06H@gIvkrP`0W@rZ*eYdFAfcrPAN*ZYSr$>dPkQu+!Ygd+Id8M
z@6zpEU0-7><J+#)U&I<xux+UYH&pG1=cPJFUQ@Zt4yhGodYjD@+qNvNYB=0}c&#el
zr0TwTB=Nw}6}3~!qtiQEzf)x|TEF~Y=jR=xb?VKvttS`Q7RIHWW1(kWA4pgSNO3|>
zCNzMljmF{fmV(vZcR=xUfA7mZZNyK?67FFgbXMcFD||oiY#Fr0HN2J6x7+WIJCmM>
zt2V@*_`dEO5V$2@id`PMpS(NtP54!>I%NwWJ8NR)znkOJul$o<M{}@a?^(rb-{8If
z2lIB)<wv`&O^+mX=<V2_dF1rtqRWe#TE<z}sXCw7)O+yPedEWMz~8;?rEtGD-F8Q5
z9u!k7X7kjQ(WN`@e%ko)?YjfYY9%@OV#2A~rt8Y4Q|}*5Il1`!srZ4wrV|rgcLt7R
zXMLFYhNQpY)4jOnh340jj)9)xjFyikEe}_X4vmK&PKKu^x~@((zI&$9rYJUmrQM28
zuB_`>2}{;?h=1vBHI`oJ?AxP1yXC;+srnr`yt@5ZOwPD!<h|hwDXq<+2L*#vYWLFG
zn6cwOQr8#Mf3fI;bmyV+*fICs5uvUk@5H12(Xr3Ms|Ui$#<KFV`<kBK`-NZae~{m#
zyR>W_^V@RU@%6tLx)XO-t3TmGt;uakqXR^1oBArN#$w{Idt7(_nwNIiB0t_-S3do%
H!@K8S?9(ld

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/vimeo.png b/pelican/tests/output/custom_locale/theme/images/icons/vimeo.png
index dba472022f0fcf7ecdd8f4847a8a3bde90789bc7..4b9d72127c574237090a2f5f2f7eb7be94a2b62e 100644
GIT binary patch
delta 333
zcmV-T0kZy}1l<CV8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30003JNkl<ZcmZPo
z0`6J+h(u7;)_d;puDwPO0hNLD05On5B!X)|n4!J>Hk=D&w_STxe({COrkhwaOuhZ~
z|Ns9Ve*S^z@jCS2KMX9n_ZCG1(10ZmKES2RPdxz2ZMysN{ePFQ5RrqoAERjS+<Uuu
z`>_jmA3>xipSTV*f<3dnY55k2$igG%Q8aK**~wWw*R*;f)Vw=Sc$R}yY`O+@mFwhH
zC>mg#0}o!jhNwXH!-iw$fF@!OrG@)XK@<T4=i=*6KnBno;zj*9gEeL8&i|;urKTTW
zJV^F$Kvtd9H%1TW7<?Llex0~}7sMq%)m-hXamF+pag<JVF7FbJE=H)v)PSZ3=nSA$
fSXBcN$;lf4{SCr3%yBq=00000NkvXXu0mjf6_k~N

literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/youtube.png b/pelican/tests/output/custom_locale/theme/images/icons/youtube.png
index ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e..e334e68eed877dbd5109acea1858a533a3174b2f 100644
GIT binary patch
delta 300
zcmV+{0n`4<1H1x|8Gix*005AYXf^-<00wkYPE!EU0MP)^r>yKf0002-Nkl<Zcmb7A
zH9`bY41EWn+AVQ73hotG*bcb?H7ylx6>c3<;~pGJw8CA(gtzXSA9?Z2Ktv9vn%k<g
zRJGJMF}!%LiAh921mJGew5B4^98Na_;CQE_0)Vf5m4m3G8-HG|#sD0D|GpZqAl-}`
z`dYngi*9(m9=D3GA61?ApR}T?2X-plpApuOAwf@0wAk~{Ueigq$fKtxFccsr*i1K;
zkuaUCf$7Eu(?tPHavaOL`u<L3H(mp`5i{P^&E7-}p7;%cZ;Nbj90SB#+Xm+5EZfr)
yvEeocF5l&v4kcp-jSU!vHHb*~-y}#B5s^RLsrl%w&%5IQ0000<MNUMnLSTZXuY=?O

literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT

diff --git a/pelican/themes/notmyidea/static/images/icons/aboutme.png b/pelican/themes/notmyidea/static/images/icons/aboutme.png
index 9609df3bd9d766cd4b827fb0a8339b700c1abf24..600110f2f63811ebea40af1b943fded0275b6a39 100644
GIT binary patch
delta 396
zcmV;70dxNE1)Bqq8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30003{Nkl<Zcma))
zHG>sF5C*?}?*0<o-QC?a!QF|F2zQ9_m|sE!DIOBy&biKXU(d|BZmm^Nz3u@>E;|N)
z)V_EYN-jDO9X%Hg?sQ-_!UBObw4%BSi9<}9RTCVhaC-wFDSt63Q`c8<W39w8ps2ag
zMG%-w$|ePCXf1(Bn;QU#%K%YBwbV8xCvJdA%M3R+ffOtf+big%np@9dNnKl7bMK`{
z^5T5hyRCch0YKv1BzFZwW^74pIM1(Vr#GBStv@RgUv)aQ`m{)F@j<g+xHq|YzY~c=
z_B71^RMl^erhg#R{!@{J69Dy3KSD581)`3(r2l>K$|J3OMSiddRs94I-RZ%BpPVQl
zG-*wE)^@pKur#bMkyS)ii4hvVB0PPwtX?$Lk2sgu3yxdrMHBD`H`aw%Ysl&kiS1h=
q1)tbo!~Ye`fCpjdO!(yU+ZHs&^bQiZ<l_JU002ovP6b4+LSTYh2B}p5

literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)Ta>O
z6XFU~z-^brZ51PwI9(_Kh^7g}PZf%vA`~}SFm|F~be~{E7r$Q>mqnyt>;%CWAnF&0
z>J^CU7KrHN4{PNQZsheU=5fy8Gz;Yisssv#ckqX`@rAbXg*5X8HSz`4@%dHr`jqpy
z=5RZtaF_)12GsKU*YNsP@%UEo0L8sad4MK(6mq-eal2-7IizygC9)g&bNiP6KWohG
zS-|Cz#pRUFX_v@p6U%1c!{t%H>ygjnp2z8w&f}cUVI9k18Od!O&8Fwc>5|Q96~*D0
z#%UhPVH?k3;LWPz#^I34reVi!8_%X{#by@DrewmR<-%&@&nzOxqVB+|@6E{0!>ne@
zqU+A2Y{jhQ!lY=<q~X9QZ^Ec*%OGo*Ey1r33?s&pAirP+hi5m^fE>;OkH}&m?E%Ja
zC$sH<jJ=*Njv*44Lr+}~IuyX*dNEnZE1;`^i>aw(BO9N_QK10Mpk${dC;$Iv-Sgs1
z>}GlM0tE(@$Z4WS9~SJov+DT=kEZa@(E0WcEcx0FsV`5Db6NC!V}woNM4#AY#y4|V
zcGfJc2;H@B=ic4*7ff{9i&|5ruCcY7__a#1S1tN{P32SRuV!D_tlt0mk+S{xzkezF
zn-7Y&EBC3-DcWUz;LL;X@g_ZzKBs5>H{b4a!=6dHduc-B)u;`Jo`r8<+{W~Vq2`0N
zaE8$A3qX&kmbgZgq$HN4S|t~y0x1R~14Cn717lr7(-1=oD?>9YBLiInb1MS_`T5Fb
hC>nC}Q!>*kF*O*PK{PbaT?tCT44$rjF6*2UngApI;B){0

diff --git a/pelican/themes/notmyidea/static/images/icons/bitbucket.png b/pelican/themes/notmyidea/static/images/icons/bitbucket.png
index d05ba1610eab6ec3f9a4dcae689d4d88bda5433f..277a7dfb931349c3fc0d905c8225f7d08677025d 100644
GIT binary patch
delta 517
zcmV+g0{Z=e9qJgca0-6`<Vi$9RCobhlGEB8VGx9KW6RjKZD$qRwrx8Z|F&)0w%#@R
zse>*Jzj349X=?9_$gI2kIcwdunCZt<z;fkFc0^`9mM`WkG`96!{+zSmOyt_DF(=<-
zJouCUN-2J&l-&Q5f8ure>MPOnPe)w(oZZmY=P7Ks9%FQb&pCe?mRi(2I5a#OFhj#5
zX~ivAMte9hPvOw>RNVnVZxJRqq-7T(x806E@F;ozqonP3;+J2Doam6S2oUoW{v}rH
zEt0_^xDCBk=7xX;iioANNJ3Jzr;t_FYP1Ua15N{&ZKC~Y3NYIwcN)uN6>`ekJOw_&
z%wsAlFxlka@l}7tH66vZ9lzo$O>|s30b-uQ;Lym1>#=%^$O9}pA6eh#>;o1kA{GH+
zo&t01Rhr(a;LSXymDhJ&`<4S(pomxmi1`b@;wn*jb-hL2buS^av=!{Un*as8J%OMC
z-&;+q-S;qg>R|<&CSZZ?dzgepAgIvZJ#gcDZc;&0X<dD1dPz%URy{~7X@MpcG~fQ2
z-_<)9RNx1%y&7$@E1Pe|UHh8zS}g%AP(%(@=pC5zAF>RNaGgcuWqg1lVi5=}@L!f*
zh|*gn_umC9(52_2umTJIY3=O)msGvyLDH<_8eoAU24=<p$6qd8X#l}k00000NkvXX
Hu0mjf>frk{

delta 1058
zcmaDQ(ImT}fUBN?v%n*=n1O*?7=#%aX3ddcU|`J442dX-@b$4u&d=3LOvz75)vL%Y
zU;qJ|3M(KpH?<^Dp&~aYuh^=>Rtc=a3djZt>nkaMm6T-LDn<APC^+XAr7D={ndliP
z*>Nc-DA*LGq*(>IxPi6T7h3_jwn`Z#B?VUc`sL;2dgaD?`9<mahL)C=`UXb&Mn<|o
z6}rWhc_oPzx_QOQ5K~|Vxug~+7iAWdWaj57fDBGd$}cUkRZ;@k1P2g@rX<7dDJU(<
z0ozialB}PalbV~FS5mBRsAs4THyx<iCMDUbxHKs%HMs=ra=3Y5FE}Np>mv!<=wqt3
z(FZvR$%&8v0E+@cz>dqNULPKuc3e;Gc^w%Tm~uT`978ljU4zbN3p<L;yLq!@v*+Zy
z6Xb6%vEPz4`P!C%3)4D+T)5;!_~oiUs#I*|nD>=G;NWZ}Ih%?t6(5u;E;TO<5nP=a
ztTM%H$q}{E*=8@*Zr=SkJLlp<!_W83@6Z1JZ1%!A#h0YNy6xUjpQ<OG-TKz;>Xrt{
zUG~<C&Mrw#ci)l`@i9Y$bL-!4tNEAKY?KSSx#D8}3$FwE!cMcpw*NY=70S=wKj%)x
zmur7s?pW5*a@*hj|EjXmsrC^wX4$Mf?emH6@S7cfjxYQ9;cNM3*Yi9-;_mEim>dwL
zJB|NaPSO9T*IV9QZ?0u@eby3PFMHhP%^$P1+uklJbmni?5z<Q)o?mxOqtJTW?!C9Q
zuHP2=%ve5GuUyuPQ?(^HGtY=IAVj{8T}A8Mfi{;;pSyP=IMjmc&OBq1>0@^k6J=A%
z^7#7JeD{gOp1Zp(?F?nyz8%f^bMn%z$2%T;S#4Ls?H+QWsn*R!b&Au26qlJNkJO9J
zU$0{qJ@f35$%6X><^~BkG;3>}=;3p_+UwO_@cY4uW3uag_!-)p1^5>7uv~Z`r(IE}
zqg9~wcKe*;-mO1hs=T>4o5{&b^4%LjmgCi#Fa8#8{gt<K)3#JI>j_)F|Cz$}`^Axt
zvf8qOyi*ARN3uD+FK-GrKihg*ebK{`#aCMy>v>pfq7H=TmwbA?^`?)G#=QOI>^h9C
zwc2m@o(;dW^1+V)i+jQ;*SB0d-P`L`d?nz0j5IT^vr1>H=S;`7Te2TNUpsZST*u5}
z_eoPrwBCGWe)50&&WX}qFMFI~uD8V)Sa1YO9lo|-xljM?(I1vSlivQFKKIf&#tFeE
mFI+7?8KbsL>U+2Nhhy>AKQfj$R9TdPGPtL!pUXO@geCyhYq*dA

diff --git a/pelican/themes/notmyidea/static/images/icons/delicious.png b/pelican/themes/notmyidea/static/images/icons/delicious.png
index 3dccdd848ec99fba9950e8195d4e73867ada2738..34868c5c69979ebabe19d9808e1d20298c196f19 100644
GIT binary patch
delta 805
zcmV+=1KRw)2fGH4BYy(|Nkl<ZcmZ9E1FR)i0EWLgbMCykbA9(&>)pJqZACTW#!hM@
zD5IKDqq;%eMz!tbv+awqP8IHt=!XVSsZ`n>$2lgOwFdh8dv^BsZ><jO?rgQ?6?v<8
z&iuym=Ei)j$E*iAt2@8G+HYpo%Ugc?1M&LD+NGCX^~Sz^1Ao`_Z|$>=Ip!D&d6U-G
zE$rB_o9_?6^DjYr6*f0vYEJRT0S#~1<Jc26x$D+9E|smVJFk86$wvi8gOJ5}!NR;G
zbO8abtC2~YMBOGMYjr;O&~L~nN@qcB1%L>p0CY6X#gICFT%hKF?ZEuBN0h9f8yQT!
zsfw-V%t*t~0DlFfB#8n**8x)US;gXFOq?h-R$_?f$re2#SK`*QT6;%nx2#rMTo9yb
z2xw>;Kmt_J(kbSTxCo<!Raiz8T}Tv}jKB*r96Tg0m&IbH0U(6Q(O6tsfJQH=(6F06
zsC5V}z=D$UdppKHm#eF*hxhOQ`HWi4XJllC!6OH;?SGKb!Ou82aS_>V&vDGII@Q*0
ztXze>Y0y?EvpD;f$Qf_V$}hk8F8}sB-x3Bo_4+d40s#=w-C5?RuLQfc7J&pP0SeH0
z=IH~*E3ZyeWWLaKa;n<#{6&()M^FJ08g`RoPAL2{P5>Q<fDn~}CUlmTCHwae*`mL1
z$J=on(0^zwfl5$XO00aq!?ra*2Oy6Bcd7s&4E&Wd&NypYm|1Hm3>yT#OOnPY6%hC_
zU@<y8#LDs{0H6TSga8x@YCr${)rQ!*wKo?89#Tq_O8z?l9jLHYi?Evx08*MrX&^KM
z(5TmH)$6an!IIO{lVPDyA_&(p1bE&GN#X#@5PzF^fdatyZ4ASp(eP;6E`Aucc6GP+
z$gNxV9RBUMIRe*4mmX*yEiD2=&muFe-2cD}YS)f#dvt78q^aEW{a}1*>bFLvVlF-W
z@V)cWvaGQajvILP(n~H#fBxyi-<DQ}R?j&7qFTLShX0gXq;NO3@95sl7s~p(?|xa|
jzaIac5CCBBo@4kMSJ`#kmsvc!00000NkvXXu0mjf5RH*c

delta 937
zcmV;a16KUI2EGT7BYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH0~bj|K~y*q1;M><8+9DO;eXHl?&phr@k{KwZtJ8r
zq)AI+DoYGRC_<<k5ePBzFO-D^2^NsLF%$$$Y%Fv@g-Uco0>Oerq^Ob`+NMdMNmJK}
z)5LG*d-L6Wc^(6xSS(h?<8dRCv6pJK*-N!ry|lD=zU=6Cvvz*9eR|Y8ZTDx>gJ9aO
zW>1c5>D0;0nSYIYs2_ec*4Ey;wY<Faeyx7dZZsO?vT4fYGtAE~^4ER%_Is$5px1-F
zXTrVv2Hs<jSDQUP{^-`4E|)KTaP#ID3IG5A075!##q+i%bO8mfYmiDtOsZ+NUkv!=
zu0Pb1Npb*E2Y?A8049dvVrdgU%F!Q#GlurQ$0Y7zT7N0h=1B78)u-CB3_yT{I2Hg*
z6Cfd*5jvfSC>Bn;5kze=d5?*!aR(Wra;~tbOQk6n6iE^S28IC;10{@PkM=_sWfib<
zN2t6Dv5-nBydcHqKk6Nw&!>g}N~Hk+008J5K8N8Pi863TKFA4#Hef?R{JC?xzw6`U
z;|HzQ`hQBl@3X!Alt&LYah#ByN58T8-!(EXeM4hmK&f2Co-UG2Tb#|!&^frRrmfot
zymF=S<Jrox6be@bDgs%7lmJpazbZR>A|jE91R@fPNF*X6Uw!$hG@H#gbvAe5wL~g-
zeup^rQ51ogp);b<%&}090TY-2A(DWhOb(AUt$)^*qiPrDe~O}j;qVY7MvR0=e89tT
z48Q~+iXe(05da7Szq_*X#=c5t?5!{y68J805+M>0_z_^U^LUHy(Gvhb05FsS1cCng
z`k$w&UZ0x|0uQY<A~7NXU;;&6^d~r@F#uYp(b_^87GN;w_e<BWe`xFd{U>2AS0D&a
zuzwVIUY9r?14j_0@d5$B_Z=+DVmR~|IWB$}mM>H*v$|ft{9t3_8G-9yY7Y#LsVRkJ
zX3(iJpMCzFEX-G(o!tYKB)aGO!M}TZ8^dBTeR$)>Cv9!p_HOg)(${Nmzm=^2eRt!q
zyLG(s`nCRGm=1kEn9|BUeR;mx%jRaxJ0f@f7_?eHhX4RqE;sleG7W{b<gJ)y00000
LNkvXXu0mjfPe!3z

diff --git a/pelican/themes/notmyidea/static/images/icons/facebook.png b/pelican/themes/notmyidea/static/images/icons/facebook.png
index 74e7ad52f362b56d584df459bc5141395c32b7ed..1d8a4327d59337d8e0ea3c8e3760479a9c7a4952 100644
GIT binary patch
delta 133
zcmV;00DAw*0hR%f7=8!_0000V^Z#K0003P{L_t(|0b}_8|35_-Ojt+GI0MB0NyKN6
z4fszECfb06iq-#Lzx(nZ3P?5prkQL5&^6N009=5u0SLb%`ya-qgBR#;fNRpc|G6z&
naAGJx5d-R>+yJU&CW<fsk3gV{01W)j00000NkvXXu0mjf8~-+o

delta 186
zcmbQnc#3g?L_G^L0|Ud`yN`l^lth3}i0l9V|E(iu08v84>euhS0J*M7^Kx6Zyqb|N
z4phTb666=maOR1l^I{;6G0EHAg`tC0)&t1lEbxdd2GSt52ZP(mY&#&s*3-o?gyVX0
zLIb0ls)0a4LX&~W0iM+B3LMU=BBuh3d4rr%SF|}T4T*7{Q?R1Z;Kr%br@arK78c;y
cvDAQp;Yq6S>qU3dKqfJGy85}Sb4q9e03k|1@Bjb+

diff --git a/pelican/themes/notmyidea/static/images/icons/github.png b/pelican/themes/notmyidea/static/images/icons/github.png
index 8b25551a97921681334176ee143b41510a117d86..5d9109deab2b3669c845845515f4d53ab5d6daa6 100644
GIT binary patch
delta 582
zcmV-M0=fON4c-KhBYy%VNkl<Zcmd7U1MJmN6u|NKvTZjuXIrzCttneG@|bJLZVF?@
zlx^GQ>3g@6&i?1|w)NXSf84|8m&o+0UbR{k48>ZU#v6!wqi1V1r%EE$MYAT@gfEZ`
zebJgG`3x?P75EOx(Rb}pK9^g49TLfPG|6;$SG<Bm_6l9o4S#PIZMeTgGjDiB+%N^_
zu`S1?UTN)lbAAIA3tC_`#OSB7;uwmD=4H1(FfYr8np<3J`$3G=c6f6Ltfuyrfkr5l
zFjqL!Sb1~a)al*)&!p{6Qi}-hBQ2cX+kYn1z*i?}V1xw*LM)wGBP5J;67HZ<gas<$
zwlia7NZ8~AhkrzTJ0IfA*c5{2ox7)e#0APb5A*pDd=D{hB_dy;C&YN4u!ri(KUm-@
z#PSw+9en|MLM%6cY7vK5b8jd=PCCH>5f>QX%s3f>tDN8|6p1jri1rc-t3pC=h+|QN
z1r|XZy+cA-yn{HlphgaZYig}H-l6Qz<RuU_7oBhbqJKVPGlru%3Ojdo8;rtstq~V9
z|17SD4-kCE1Qf?{h_M~X0v1SOCnN(OP|r4)ZIW7}q5U91`xJM3M@R-{d(YNG5Vcp&
zD_|(5qbCZdSfFYK!w;c|*Pw=Z%N&#C6R!fqqrGdSYf>LqAnG6{VGyRGM2-twLH%sL
zMC^7NRX@mKf!$euxzT6!Fg(s<fhQP_WIpd?WiSDk@f5|~Tw<DY852<^@xNa`0K$+*
UVd5uE0ssI207*qoM6N<$f=PV_=Kufz

literal 1714
zcmaJ?X;2eq7*4oFu!ne{XxAht2qc?8LXr|_LPCfTpaBK7K$c{I0Ld=NLIOeuC;@2)
zZ$K%a)k+m-s0>xHmKxL%0V&0TRzzznhgyqrIC$F)0{WwLXLrBvd*^wc_uSc%h%m9E
z{W5z3f#4_!7RvAyFh6!S_*<8qJ%KOIm?#E|L=rJQq=gB5C6WLG5;c?r%V0>EmEH#X
z5eSwPRa6WXBMs#$5H%GtW2go-in9p>zW@UYDN<n!NPv@68XoE4nX@E7rR0&KnNm=S
z2Exgz;A|}%nH?6T$WB#ol%xQEz|X+N1=KJG0S0xNM#nYqNK?98d~Y_>NWc^XOXZQ?
z1QjEV00I#$3^1wQUJ8&-2UsjB-G|9y(LDhMNN3PM{APL4eYi{(m*ERcUnJa{R+-3^
z34^A6;U^v`8N*O6ji%S@sd{fJqD`XFIUJ5zgTe5^5nj414F(y!G&=H(f)Lgzv?>%+
zAsWD}2qhpH7>|TU`X&W6IxDNuO_vET7|j5oG&&VDr!)hUO8+0KR?nh!m<)a!?|%yG
zqOwq!CWCcIhE{<$E|F|@g>nP6FoYr6C<IBHsbWMjf+4zO1O);kS%8}qQm8a$gZmUi
zD&<NvIt<b%V2O}N!ZoNWm69uB(tX){2A{*><8>D?ID9%&5J(4oSbR1I^byW*g@__U
z4QsF&uJSEcFeleM3~ChjEQGbHOjsGDMbyAl(p=Ttv9RaVo8~I#js@@Y9C^_2U})yn
zzSHU%6FxuY?d;&<huP7GHTb-1@xlJO(B`!HdyxqFQHH(?73$<tXlZL#R;c$4@H*dP
z+g2Gl(SNi>65MyR({^lU*3$z$ZllDb(o&<7d;A_`h<Vt-co_6}4qhm4NL!6;QN;~C
ziOs0?+tNQdT6JgR$TNMl?(B>2U+3~BJ2Hv`{W}KEU801#cv_B|9Cm!ynR{S`AMsSn
z;7E=B;mb!wx$L;S>yGXG^6=&WlQn9$s?&L%Y1D8TI^MlKB1DqsEng$>f4=xYWBoPI
z_S1p!sJ#d2?YI4kPA{k}Eby?F=f-J9zIc`YDl^pzjVm~9ebE?Hn?t0Nx+la|D0MB;
z9)2xv1G>a1|A9kQ>~DV<Q;Z7ho$L^b&Ea$Dj%<sAD|e;zY><=X3-4yC&n!m8-3K#P
z{X@<rb5Hi2cU~WVHh|a|UznA=S2T~Zo%gX~ts(4Xc-Qdmw#zoiO^=#q#=Wa8_3kfM
zx=ub`8M3t4OXkYbtXVWMfw<I@{5w`SwWrV;vC8G9bB*bHN)Yk(=-utUw^Ilfg?CQ4
zGSWYIztN#z924;3n11kgM76CXFCp;!j+#P#S@z&Wc|z;)$KPUozl=B>0zRuQsy$+N
ziSCoLJU{Z$nQy4A4Y5UJ07$5FA~qL2%Q+cLaqDU?Lz3?=BC5;Nk6BbTmmceEaM>-Z
zi>O&-dSE=%ex;vcvCOk{*JQ5^_<YkKqpS$DAH0F(H<X7Bw`87_MOS)Pg#68pNxjDa
zB;jK$zmn_sWuB8y_{V!r7^(ToKe<wuXyxcEh_xT;sDAHiUbnkXO@U&w%;a;~8w^_5
z7JIw!*5j{umb8@5D<0X|rEcyQ=TV&ZS&EAftyyndd$Eih%<?R`$2~8S4QJH5$fAeG
z=l34zf}D3MsipO=ZSVHf&ktr)HOpO__7^nu7LNz%%Lk<ETz#8t6H|H@2wg%He@aa`
zq1}V7F@MGV3R$*cH!B-|SZ5VW<W<&vWR!!JM4Cx^@#nE|aNkx=5~sx;c)F*Skd>4M
z4lW7%l9IqY(z7pV(?I@@8=KPFO82)O{VDI18-*d-k$YmI^XiuPs_LuFw<^ZcD}yP5
c*NrbeloN*74g`U%%F6r~k%+>C^#XapzmV0H-2eap

diff --git a/pelican/themes/notmyidea/static/images/icons/gitorious.png b/pelican/themes/notmyidea/static/images/icons/gitorious.png
index 3eeb3ecec36a73ff505e04ecdecbcc4792ef6786..a6705d0f462b505be4d9a5a372743d206c141a11 100644
GIT binary patch
delta 122
zcmV-=0EPeK0p9_TY;#^oL_t(|0e#5D0fSHgK(Y7Teg9eOULeO1?3aKI<wLO8vObh&
z%oyiabZh%T%-*ZDwfFgmXdmJ=gdbWw=-~yJmQ!-zQp(M6jf(`SUF=6zDu2b30i^jL
cLGneO0S-n9?Iv%40{{R307*qoM6N<$f@ozpssI20

delta 126
zcmV-^0D=GC0pkIXY<FTwL_t&-(|ye`5`Z8K0Ko$#3IP-G|9`cS8ED+{nj_01Be_ko
zAnlp75qc?o2`=J4p}SuqmwW$08PD=GA)NOfKKp$JNLE!3I8>`8AeosdsG0qQx@~m{
gLjq!&M2IZn3l2sJ?G?F6i~s-t07*qoM6N<$g6fhoWB>pF

diff --git a/pelican/themes/notmyidea/static/images/icons/gittip.png b/pelican/themes/notmyidea/static/images/icons/gittip.png
index af949625ac83d2441215c81650e897c97d9e5d95..b9f67aaa32a0acd166d7271b3dbf9113717d3f00 100644
GIT binary patch
delta 386
zcmaFPJc)UNWIZzj1A~Sxe=v}m6W|l#3ZxT#Y!bY!fh3p#BB5*_n^<@ANM|FUY^1Ys
zjGO6|b0@!i{xo+&TfC=bPi^6ccW>|CzL62)x?$P8|NsC0`}c2FPg6@t#<6`n<2)@l
ztyu8;_pcKNcE@>Il&6OG))mLNo7JB^e(3+d|BoNsjdC$g_P77_^G9B^PjzNYPi;|x
zx7DJlJyY7NSIwK2;BAxOW%Vgy_jjNJIZJ~4f*Dk1-1@cP|G$f`-F8=jT<_`P7*fHQ
zdfqhYsDnUrV&-P$&9Z6d7@fZF_uSzloF<X{eV^Z5{Y8iQ_B2n_3{;<(I3aCTO0}ld
zG);Z4m20w6+dTdqJn?@@$}bPMOI(+X{|OdnfA1+#x$jqP{GMHK>EW*@CyFpP1YCWw
zVPl;|fw(eb)gC4ri^kIrmaM<S^u^#yo9Oqg*Ygk5a!eNU_xo&jwe5?s=X2}iUvGBK
a{H-f6U0bBbzD*J6PzFy|KbLh*2~7ZBnzA_n

delta 472
zcmV;}0Vn>F1Lp&f8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66
zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RX2>}BM1juc&=>Px$XGugsR5;6H
zV1R-IZyPY3=wqXj;B7qvNZ$hDUr>AtDyD+077l<CFhdpq*?<3m_#c!;#$Yj!8e~1l
zHeXD@)P#YdYA&L<1Y{~qbF91h|43&epiR~YO+a>}v+@5JH&eJFFqeS+jBLY|b0`0Q
z`TXhs+zD-9!{R+H|M%1u{{Qgq?f?6?Z~V^)aYc5K3IjB7{()@Sux#Fc5cv1+ADEui
z)AYZkBm*u6!hgs1?ff4HG!&|51_Ly-!Oq;YV!?kH04e_c`xn?|n1LYr#DU#F11w-J
zxWxdCCa^$xYWRObptr6V*$cl=42W?z`+xTMA)r;58bP){esK4Hl#4Nj0k@C?G1=e#
z|F54v;Lb)4le}mj^k}^W4@6{%>dY9FfCGV^+9H&wMNtk!6^z8<Z3Wf<1B<5iAO{?3
zG@>UY7zV}vl=kZXtL9Aurw8=Z2v0~TN!c6CC0<srILDuqDauTgW@i9z>i@@)Shtn{
O0000<MNUMnLSTY%0MZcv

diff --git a/pelican/themes/notmyidea/static/images/icons/google-groups.png b/pelican/themes/notmyidea/static/images/icons/google-groups.png
index 5de15e68f4d1e4176b46fe6346d42f53e3296b21..bbd0a0fd41295e94081103efe82742a5c6411765 100644
GIT binary patch
delta 405
zcmV;G0c!rE2BZU!8Gi-<001BJ|6u?C0c%M_K~#7Fh0rs=C}bbN(es&M%Trs%n63FP
z*|xU!S~91!#3kEHt~J}X-v2M_@;o;F0-t>JdX?YPsG(G*(IkH!TXUTa|MGXJEV^uU
zO%^6InT39DmnQRTDmNYeGWaW0niK{B0YDT075ME2GbG7G0e``erTaV7m>HqLq;ls;
z@E6;jJ_t!ni{D@@OvEAE{0m%k_m}t!5J&C&e{jw%pJ?$XC{2oj6x*FKDoI5ID2x9=
ziZ?$RtNv%)bLwC47XX(%^qmjB_^T#Z@(D9JVu$~NMVo(Par<w%;OfWz;rKmPan?;A
z{dt3#%;bVQKYs`3-$A9Q{GPt1rQRSFm;ow5sT2?@^QR4rg$anDgeCx$iqb6h2iG6)
zockYoL<MGs2$l1m-AhHOOk)WzKKEExUU5lR{E#fkMyI^rh9|$*1}D9nrFre;r@Q~Y
z8?zi6ocPX{>!0v;mgd!$p2~_@_rOO_1Na`l%Wwj6h7Q6{00000NkvXXu0mjf9WcY~

delta 791
zcmZ3&yqIl*WIZzj1A~Sxe=v|@Nq6*hWMJ6X&;2Kn7072S4sv&5Sa(k5C6J?#>=ES4
zz)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;1`b-0SLR^6g{{R24Q}jwX
z>GY=$Pd~nY^5Na%_irD)d-LG!>w9ls-F@@&&Z`&ow_ZNG`Qq7)=TEOadvfL3<I8US
ze_VTiJ9YnZ==^Ed_QSU2yH(RSi^i|!^<PYDKO0wnGOYUe^wA}kp5IQLzZ^P#+O&K(
zulr(B^ZCici_YD@9f7*qf7-VGumtL=|7uqE#lHQgUF(nU-@lvHeKx82WK{jpu;Rnx
z2N&$xe=I)wzkcD7|3+0G4Jtl7x_{ob_4}eD{}&zkXW978qT%a;!~Yf>`uFhOdF$qH
zom>9S-1~d_?q97N|2(*R?)8gXmW@CK|Mkn?-@kL#u=0aJ`TKjf&%Ahg!>Ia`UfH`l
zw@w?^e9|j@d;7+zg$rjaSTKFwys7i%PMte<>YO=KbW7gcynf>ToimH;7tLI>Xr@l_
z>w^b2YZtx*hS-+1tP6o*$5ImH2aJ^Owa0GBBm()2N#5=*jQ^Q*?*TavJzX3_Brcnt
zsElR|lxX`H{!MpNPvMys!%1t6rxr*|tvw|&b>kF`FMszt>A(8-eCIs*hND@Vt>@@%
zKVJRj^ZXeMYZ?<Y&ba>2=&a{_q}ik^;jd!Z*}p8s(MS2ld8e75*GxGr{_ns<PH}w|
zug;>%(paa0dj(I8{4-Ytt=uHlv|4Xv?``Wvcg$U{ITdXG={G%TuU)d#p~H(;U8-$v
z{MYh8wM8UpQ$TH+b8X9qMH-uQ_B=}ebz9<Kx<rNRw%?OAo8o7meg0m)+yBq$dQqkW
z*S}Yp8${+M@W0fRvHE4{!1>R(`K9>h#VV>L#h3m7y{lT{8c~vxSdwa$T$Bo=7>o=I
zjdcwSbq$R}42-M{4XuD|0}CqygM;j6rlM%b%}>cpt3=meU}bCu(I6nQL9Gg?gTd3)
K&t;ucLK6U@#)k6%

diff --git a/pelican/themes/notmyidea/static/images/icons/google-plus.png b/pelican/themes/notmyidea/static/images/icons/google-plus.png
index 3c6b74324031611f20c0a3810131aa74fd0a5a9f..f8553d45ef3c858672ca169868aadbaf3c14b8df 100644
GIT binary patch
delta 485
zcmV<B0UG{~1pfn&B!9+9L_t(|0hQ1LlOsVC0O0-~v5iT^PR_P{SG>a6wr$(C&9!aY
zX77u!?)s|hF_{^ZF-A8iD1Edxd6XulcM*01MA`|6VG^Z|G^cMnS@SQXv9beuPj!6h
zhB1jF)F8|%heEiGfH+~e8kNSDH@#e)JW?4qX;Q)GT<Ep_+<%ocTp8yPVwFKL)Fy*C
zc9;@j9F;R(5j#{714hoPEP-xa*=pT?i_{BB-WV3Xrwx-w+TBv`W<k5*=B&_BI^5HN
zh5X!w(lCoO)a($s`=jG8E=>7t5P3nx6N?e<z>UwA{x^#MIz^w4#;vg#Q`{-|sTaZm
z+z|gUicmu%q<^&)H&;eX85XhOcx`!R;U?1$y};|Mjt>)GwEXWn0YLw!%ul&`yZGam
zx=N@w6>l?tQS(0g`KaQ$xKi{>!+WpfyjM=iFUOs@I(NAe(mtT?O3oXC^_q}GyeP&k
z7&m8RudzETJws7@&*XmlUiji}_T#&GA=#Z6PF2alX<n~oj2D5PJ8#tR<?zqpyr&Y{
zGY8?%LvNZ|9XlCI#LkM3YX<#S(jJN^{$8zk(hMK&)(lq~1bvlIpNPnh1I)^4z~u*R
bt~5v&n>&-9Zv*P$00000NkvXXu0mjfW_j-N

delta 501
zcmV<R0Sf;A1CIodB!AXPL_t(2&ttgjZAlVhxZ`DU!_)jGZgkek5Qxq>83Nfrl?=B$
z?C#W0`gr{0w|9U4!@-9uuPVK-xtjseX$J$Kz!^tFAp5GD8N;hfZ@zCTx#3}QIWX|)
zo<~5rUx%8nyO~^up_2~!K*3Xv`at$2R}+T+|Ia`4GrHtrbbk?uJYwIy1j>GXU1E8{
zUJs6dLU1-v!-3nb2Irih=+?6PK<TfGB2Rf*{>KJ@8lF5#&^v9fcghZg&b90USur#C
zh_yBx0YzYJ9ftpZ|9@Mbb;3sH7#LlcapC{3OLv2zTp&7Rr3KUgB!TRsHrfndzX7?Q
z-YzOS8|-?va(}|7H}{@Z+a9#igrj|y8bB3$Ei?{TY620%iQu@K^On5WwfFNop!oL}
z^>%yB)b}8vU8ZUf1mQ9qHdo(aqPoK*_{p39|Neh?RA2(;;zSGwOjNfTDsM5=J-hM6
z|DXT=|G4|0)Cnwt9Wk75oBC+~foB_+Jy^5s@yQ4OKyE?z{$*F_7JbEysAvP2Wca$b
z=a8HFI$inoAf$Dud+YaKAU$`Jb=E@#p$MXe;e?6&Ds5S0w7GEY4`9G84o4G*AclRq
ra%;6^)}WxshhP7{>2h3yE)GHfn>&-9#5^N600000NkvXXu0mjf*YN&y

diff --git a/pelican/themes/notmyidea/static/images/icons/hackernews.png b/pelican/themes/notmyidea/static/images/icons/hackernews.png
index fc7a82d4d68068d5fb032885b93e670c385ae1b4..8e05e3ee207e114a96f3811f46f68d17d52fe80b 100644
GIT binary patch
delta 119
zcmV--0Eqv|8PgSz7zqRe0002(-QrTQAy5ip5>QN3Mg3?1|NsB>i~#tuXaD5J_o76e
z$B4WD001vZL_t(|0b{@m1Qi$r!3;wKW??Xc(Sbz(%wQEZ41g$d6oINX6oxVw1@JNO
Z0sz-j0)=#JDs2D&002ovPDHLkV1f^rEAjvU

delta 625
zcmcaCdQx(N1Sba@0|SHn=l_Wt6$7~HISV`@iy0WWg+Z8+Vb&Z81_s8w%#etZ2wxwo
z<osN{#FYG`RK1Ga0-!bq2Ac{iATu|$BvGLvHz%*ys=`(YtilS&1_|pcDS(xfWZNo5
z_y#CA=NF|anCO}487SFtDJUq|6s4qD1-ZCEwAWh!xwc9fB_#z``ugSN<$C4Ddih1^
z`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$`Dgv2DzjbCl_TFlw{`TDS!-4Ov*1Uu~kw6
z*#rj=ho&UM?I|cN$^qMwQlG4!nv<HFnpaY+Z>VRe4>ujC*(N2~s<<>MD>b<U>~gqy
zU@tf&rt2dK+vsDew$TSU3CW3&004^uL%@#9M!y~&oOWDK?Rg!6A-u)Y#WBP}F!|5y
zgCFKMG97SfjN1_QO8S7wUwdYb{{fDr(mpbwQyLi$v)Y@dH(WJXz4Y+af8UxmBo-BL
zDli{rxRz^t@Y5T&j|HU$W<Gp+j42xwiWA<*cgIRvB$XQ<$Vr>NErp?T<3SOHi#<DH
z7EN6FOoEv?Kv}}Z_S}c{N4Y$un>rt|&bV^Em^;yjEyXNG;M9SaOcQK0o;W^;S5uyG
v%<Vx5quJ3LN7(K$>`81md-6pR^Lti?o$UH5vr-H5L21O()z4*}Q$iB}X`Rn}

diff --git a/pelican/themes/notmyidea/static/images/icons/lastfm.png b/pelican/themes/notmyidea/static/images/icons/lastfm.png
index 3a6c6262b644dadbcf6cce5dfe4fed9740a9ec1f..2eedd2daa1429ba026c0b3c81f200c7df55d199a 100644
GIT binary patch
delta 818
zcmV-21I_%;2gnAHBYy)ANkl<ZcmX|+L!cx_7=XX3uJO$3DYk9fb}q5)9CO}VY&)k|
zm$hx1&u{#C-gHlORc$YS8)E3^KTb{*D^Dle+pd;{TwW^A3QsLn5p6`#iFjfNK@sOd
zj46@unxvEEI5$8_{h^Y@>KCJu$;;6iN)?b2a3_#VfTsWs$A4P(un?dlut21-!md(j
z9Ua7>U64$1pfE0S*6gu`5CGuZUX{%vln2{-@Rb=S30siM00Js?7;b_#5NL2>-(UeP
z15zP`goMKR4XBSCro@=M&u|0M893!QIPOTurV%{@uxK^-O&FDji_U_saj<k9bob(d
z09&nvQlwL5jDLfxE`$ru+<R(&Y44z$E{9?nE;t>IJ`{R~aHkyy-Tj!=n+Zl5ZOYaB
z0@qx&XN&peKjc6W(Td=Z4tV5FIPM6DV;tN;G;tP<Nps_mQ|S0=T}Vn9U_y>QjA;2f
z^o)gwgu+zIM8ExyU9<vs%|$dm`~kbQ8}-72q#wSEuz!1ypudQ9gt9n)S<3<P@Pl!!
z5IuVddgT`Uh3jd&^CKdcMd$PMo_quKAO9kC_jRae?xVSGE3%L)NV~Z^8-Dv6a@=SV
z_us_uqy<#wEGIhi6q@BardlWe+T-ZZ$A9Ms066_5eA9w~!Ry#`-kl4&J1=tn?-Si_
z(7glBUw^UIMX}xY(3`IR{#W+IZN=ZCO%S>r_q^a%r%rJ@Z+x)Fd-;e{U-Iff*T}z9
z(5p5g3wcDXPJR3rG$+nsWZfoYCWAb*gT_Bo7<z3y{^DiG_BOJ|9=1uWKlk>fg}|L9
zJ&75r5f0ZeI>gIn5MAw<$RbKrq)K4wK5le|R)2c|&sf@Ty=1z|<g$@hts&b+;SNcX
zjK(6YMG#}k!$^TmD5SQey4namORL#LDGz6iRGA|W>29ptcAlpLWIBa02672hA&bZ+
z@uZ9gIGpF<w8Ruk$VLmg;zdUu_PeU*Q*Y_>k6o^gJHm>QrZCMQ;exO;=5fSV#<6y(
wL@OF=l&Dn;;?VYu$*zvi1a?LH8!s;11*p%JbB}qZ)Bpeg07*qoM6N<$g4^_xBLDyZ

delta 954
zcmV;r14aDE2G0kOBYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH11L#EK~y*q1;I~j6jdC+@qh1o^LF-sk?xk2w$KnZ
zDpdlBD2<Us2~iSbKqDvA#DgC2Plz5pbL8U1a4~`C4T$m2sf0wM7y&IUG?q|==(cw0
zw%y&%?#%4Wdp|!PwfgntJ(<?V`+l|ZvMv`(+IUWRX2zscNYf|r)GCS=A~Dvkk?}%u
z{yJ&eBx^1kzkk&}H{|<=ND^4v0IdOe0zU(u0oZ|a;2bCgNeT`~6P$8)OfE?uXRHQ(
z7Mug;AW0Et!8w#t03ZT@6bdNg!NVm2V}~{I0E&4)!A2K0Lr5${35Wte3r@knf;K3n
zA!CrB2i^X-QIC}ZHhYlE!(<)m6Hv&ZmYQ&L9)b{tN`El5A8NxevjB}{B#LnDPOMcf
zyN(rj=^z~32O_Yt2K5OzdI(zU@cdrbH3rM8$TM|ltYGKw6ZLx)Bb}hk;TK`3g#G3R
zbhCvTq%b-H?;eBtPH47Z`v~duFZ8bbMlqiy+3b;&eXS#G%&u|L*#(lHZ=f;;+g>NV
z_#^J-9Dj0niryFJaSs}pQzyy2bDX&Gh-jsS6Jp)^{nkJLy<<Bvh)I6^ljQc_1UK%|
zJ9`0DERd8+Ebn=R?uBp3zHtQe!CQn2576aeS-bm<Lj2W5^zarkCyugt<vJVJW=Z!=
z60Uc#?JlL$?~%j-!P)Zwu=gnfJAme+BP<>`c7MIGZAyYm(;_00EH@>X`%6+0`S0z|
zWaY#sA|m280ud3hQ7r$wc}nK9lk)GYCzrgBcRu}**NtlZ@2`^FxrZ*7P@OK_Gv^4W
zuhCyvMCbG9u@QRTU1jz38G=7<p{o@NyT=#R-Dh8)DMzwjdm6jiA>Qm_lNhg%N7bs>
z)PJGY+Gvx(b^~Nfo<X&YXC2koUiiu6i-pu{chHp~WYot`x1yXwp-@>5s}(L|(1{~k
zs}OsRK^S6;hghpkeqyxIyZ!Khmqh4X7HcgOGnjG#Rq*k&#$^QYJS5TB)*8AufZA5n
z#P}uCEoDDXp4&ZZ>N}n4hsuUgMxuC|L^JU)j;iX1Rc%xbXN~H#%WAB8&##Sqsc>`E
cPd}XbAE?ijbKR<!LjV8(07*qoM6N<$g2l$WCjbBd

diff --git a/pelican/themes/notmyidea/static/images/icons/linkedin.png b/pelican/themes/notmyidea/static/images/icons/linkedin.png
index d29c1201bcb0c278d49f573f9ef95ebfe932fb5b..06a88016f191d1f7596e5d159eb9e3ef276b6ad4 100644
GIT binary patch
delta 611
zcmV-p0-XJT2k``u8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30006eNkl<ZcmYk1
zGk|qR6vuyOX5M-?wyi3*?WAv_GPe3QcG}psxv}kJZN9yC?wo&|e8+|X7d-lHKrR`8
z82}iF|G~&bSD(C{o%P^X8x3@}vlmwkmV&KXBw>F`)S1F}Q-AF=yim{8W!trS4%&S6
z_lM@+`)#2k0tSGBnS>A!gUz*@G`?K*=6LBro9?h)-)3ueJpbKPReY_URxs;Ip>eO8
zViu~#tKxsiG}F#YxxDn_Op4)+pJ(Q(rn?nptGrx0qLplVDff59VAgJ2uC!1$sj=JN
z9eVxe*<a^YDt~tx0n_cKw-wju?TEpCnQa%Dp=6epYZp3o*NqO?a`nMq=5Bpw=#2d~
z-DRWx4~G^{+-V(Pex=;^>FCXaLv`alDWtkCwY0;!z58#z#&T71?c1;2yXPjW|3Lt-
zK|fa>vgM24P7nS%my|*-?u{?k1z4y`Q@qLr7+I)}xPNx=j5|O5!vJ<%ueYvBm7B0q
z#9!Y4F0C|@0B(JI=(#T^ANqWJe6a>PW1y%m9$cbG{M|s^6h}ZVg#;!^fV*&a6p)bQ
z00`WX00V>x13(fkxd$YZ`Z^;p&>e%(-AX`jN5nmtb*2b(r+_Pkm=H~{XTP4zMX&uh
zQx!e=<y^${a(?@#Ibvw%a^FWIJFL_9!O*-L!GdwlQ$$ixaup-T&~im52TCxYqj(TG
xQe-_{Edw~`NunV@V3_#FG$b$pgX~;)?C+p<VWy}RPOSg{002ovPDHLkV1mgCCddE)

delta 884
zcmV-)1B?9e1b_#S8Gi!+001a04^sdD0yj`hR7C&)003yT0BN!SYqS7tv;=Fk0&KJZ
zZM6h#wE%Cn0B^SlZM6t(wgqmr25z+jZ?*()wg_&u1#h+kaJ2w&wg+#v0CBejaJB$)
zwg7Us2XMCpakv0;w*Yjw2XnXpb-4s|xdL{&33j;$ce)98w|@+Fxe9l?3VFE-dAkmH
zx(s=`4SBi{dAbREyb61~4tl%~db|>Pyc2r65_`K3e7zNWyb^r86n?)Hg1;4lz!`zS
z9D=|bhQc6)!XJjhABe&sio_y{!y}5rB#Xl(i^L|2#3zl#ERM!4j>a;P$1#$}GLpzL
zlgKlZ$VHLJIe(SPI+e;fmdQGn$vT$GJeSHnm&-hv%0ZaRL72=xnae?$%tn~XLYmA%
zo6JO<%t)NhPo2(7pw3U9&{Ck$Q=!sTqR>>M(N?3<R;1Ecq|{ud(_^L5S*X%pr_^4j
z)nBL8UZ~VwsMTPo)nTdCW~tL=s@7_()orfWYp>RCuYcBXui0?0*K@GfbFtZUvDtL7
z+H$hkb+OuWvfFjC+IX|re6`$rx7vKS+JCp*g1Os*x!!}h-GjN_fV$m-y55Al--Er~
zguUK~yx)ht-HN^6jKJZG!QYj~;+Dtam&fCv$>gES<f6;vpUmW=&E}`g=BLi*r_blB
z&gZMo=YOft=d94@tI_DK)9JL-=(N@8w$<vl*6Ov_>bThJz1i%(+wH&G@50~i$l~wM
z<?+zv@zCb-*68!s>Gas@_1f$8-tG0~^7#M%{}_&@Hvj+t0d!JMQvg8b*k%9#0QX5m
zK~xyi1;N2eLO~P;;QySNt6nv1m5>!_M4KKZ=znqAx99<Sj;KZN&?2Znf?5Sq<|4J5
zc*lEZ=FI8)2$$rE7@Pp`=87%`PK*V>(MHNAcHs|((^pH-OcELe|1D3t$8J%1Q#oJG
zOS^KD(O0omm6HFqxsGN}K7Pht{2IM{UItjN=ZDkVv)$PU@_r*3hjORWulwyIB6~V0
zBW<tU26c+i>pR786}b)xDJsVI4<4<s<`flDDQd$Bp%hL*p<Y3%gj5M@?4WBJ=&CX3
zNRy@U^7-hVXHQ&=zuzdMc5f3nkKQy<Nz3gM@@+}Xh*@BmW&IEI8i?#El2Z);0000<
KMNUMnLSTZ-AJ$y}

diff --git a/pelican/themes/notmyidea/static/images/icons/reddit.png b/pelican/themes/notmyidea/static/images/icons/reddit.png
index 71ae1215ac8ea274f089cc4aa55eaf8a546dea67..d826d3e746a18b712db7a68746c0c523af802fe0 100644
GIT binary patch
delta 170
zcmV;b09F6B1<C`EB(ZG>0e^`}L_t(|0d31QS_DB5hT-pTeMoSLkQhI}Z~!hma}r`K
zMM9j~t#x}_%UGs42+d|cE#R;^1PNeM?`wKxS7JDFAgAY}Crl@r_%gExoyh^1y9=e1
zkaMBr?0@>#A310I{FMSU*HeuMH(>)dx3;%7VIzRg?Nc55J|T1~XCJP^0(5N}YCBfw
Y0eY(=c;GCP9RL6T07*qoM6N<$f@R!B0{{R3

delta 404
zcmX@byp?r=iW^J1qpu?a!^VE@KZ&di3=E9LLGDfr>(0r%1acITJ%W507^>757#dm_
z7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD?*CMQ+A=&H|6fVxSTaFm^kcZ3kp*@pN$v
zk+_`Ne^sa{fPwY>*4@^OyZdD$G?dI<{QuwmVnN@o{@)vl`4sCf=*JyOFqx?vHv6yc
zio-99s`uE%{$MtdSY#s8`ASL5UnTe@&sjSup3_f1wI;2MS^3Ojn&OhMe3R&k3t48b
zOr7d)&DE>=%gFXuZr5Bh#lwOI^FBOKPfjqovM9J_M%KlfHH<o~Q#Y`P75lC^+S{^r
z&*beB%pMgV|5so$SO59tj~nW11FyV(yGrZVPWg8aJY<;H9X|ndKZ9zCYeY#(Vo9o1
za#1RfVlXl=G}bjR)-^N@F|@EUFtai+&^0i(GH^1OWAeKjMMrLaN@iLmx(-t-6H~Ab
Ug9|!0GeLHEy85}Sb4q9e0IndFRsaA1

diff --git a/pelican/themes/notmyidea/static/images/icons/rss.png b/pelican/themes/notmyidea/static/images/icons/rss.png
index 7862c65afeb66ba9cc7e9576a3a62b850b2e184d..12448f53417b4974fa041655a5fa82dee20c73d4 100644
GIT binary patch
delta 728
zcmV;}0w?|N2JZ!sBYy(6Nkl<ZcmWN~1CZ@j0LJm(ImxQFZQHhO+qOov$8T77RNJ;~
zx6jsI=H4WyJO20&0O{2e*R#;@enu8vSYz5U`lG9f^{QgNh`4A^uQ5^Zx{ys(=Yy8q
z{Ee{X4HE;T4==hy{l#^L7b6VOE2;ZbJ!B|o{YQH`*)Z)EiGQ@gE&FHn*Y|E4!j}(Q
zcn#8$j83CBN_!g3$+Z5aGZ8s)5&8vciX>F6<?;~b>>~~_f0V{AjQ&Q63WI@#mZd_`
zpq!6D9AL1bKYg`aYtoKJ|76h(S@#@@HqG%AGZ;HF`*#M0sVicJ06?&4t~GrzV`a-<
z!y2bafB-7qIe(mAUu4MvQUD+#_3CKBm1kOL73t^Oq&Iitqtm6CUrI<a_IQD{_hNpZ
zfRG4DT~O8wPm9UGKiZS2dMvq-(D+n%b{pxL)uj1<0(-sA(rZ$5NeDsRB@He=KI+Vv
zqnIl!wjo=LWB=cT6MqtBju)TVR4V5Yqy9>VDd(a}2!HCDD3meOMX<;^%>GRH=qTy0
zhol8J<g^*eR!8{!QqW)a07ZqYl6pzApwpbSd`yE&xAdBXjDB1A>O$f1rG%lS^>(;L
z_2Z+I4Fk*Xs$O(a+Lf}MR3+Ui=8>#n{&+@~k#>KD<J$T$XU2!hRZiAwq4~RPFdOri
z)}BkMlYcBDPyJp_oTNsog}SMT3+Z%oi+y>MVqi53FA<CZH0R8bTC=4{5QK^ph8v;!
z;n7v%FXxP}+g+hrQa5Endxqg|REJtzZE@AyuJ-JXp@j#9Jku>JQ^xo7*4+R80OflZ
zT^0WscTaBuO7ca6A_aA-H9M3Y@{DSLGBL)|Tv2kZf0o$sj%@=#`;E)i3gy)E>N)=%
z8p`IxR&$P`sFp8^v_L($c$u=1>0{o!xY#-&Uw)e>HazN%hv0uJiC~OG(V|}f0000<
KMNUMnLSTZiRB~DX

delta 857
zcmV-f1E&1%1@8usBYyw{b3#c}2nYxWd<bNS00009a7bBm000XT000XT0n*)m`~Uy|
z9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?ocW-iQb09-gGzPNMpa1{>6?8>dbVG7wVRUJ4
zZXi@?ZDjy5FfTVRFgbe517iRH0?0{3K~y*q1;I;*Rb>DG;D7Hw=ggfkXPnV#w1Kig
z&7ujS0)<@kKqA{z;3AN~HWDP%A|l#_#4Kv*GBDiL!l0ngAOeLR)~1IkmN<>(%-Gy<
z?&I8h?mg%HeO~~GUmtnM_}KF{O-yJnZ#QhsN$UG0*%ry<z@WV(I4h*L)LFyyW9PyX
z?=1z0=Z`O_e}8({*c4%uK}kKN8X!eM_d59s=@@yJNPPIjp|t+xqx~UV{KUjA;xw&g
z1}*YsIydS5O>YSq$rgqMYKkaS-FvbSn$Jl_*=W(eMC&poDl`J)JE%~!DK`*EMrc$F
zSLQO^8wa$mGC9wK$0%|-ixjK0F0*!pkumCuBt-xqn19T4SEdxJ%)Y~}qaq-Hif>=$
z&o7xCAqD^v#6g|deBW*3JH<af5Wjhv3$KZ{FN%m#p8bLc4ze*MAVfk`7nJqHauSVP
zli#EoF#U+o{$BWepLk|Y+_(xHJj={(iarq`sQbjm>|&y~+ElCyQ}aB2l0%n;Bfkr`
z7bRyN6@SY+B#Gg@FDchiMFe$CB9uv}i(t!M)_xE!92WmNC2pSQ=&G{Y6MlRX40pVs
zsE}6TAnFwKI{(cku`$y%=nztdx$yHF!l!o&qca9io>2XEnzC(V_9^w`BzdLGqpGA|
zC0Rn+wz0^j?cy_E@k(x(WUQW7?tE3Zi_R5kBY!naX5{O{I!aTrI2>doH`Iu=P<Ir`
zxL!Xqb@6@0$ef97fsI9-W>f60i3vdvDq<LGhw9hUJCjSt7VEq(RMYw~74lVM{X`vV
z$=p`edSAZQGdj@_vQ)pU{JS_X*nQ~Z0Ofbb-%hTb{BZCOO0vnIh(R4|ogQV6ETtNu
zj8f!%I@5cuZ9A~AKLF(C-r5t&Td&v6>o10~v()W06-6~$6!EUQv9*lprj>4|c_*3L
j8?xDbpUod$I0gR$D~Vu?3V6ai00000NkvXXu0mjf9#4!g

diff --git a/pelican/themes/notmyidea/static/images/icons/slideshare.png b/pelican/themes/notmyidea/static/images/icons/slideshare.png
index ecc97410138bb3c457a898b1e868b22ae9db9989..9cbe8588e24976076e5fc3898fa97856122f6fa2 100644
GIT binary patch
delta 420
zcmV;V0bBl;1hWH>8Gi-<001BJ|6u?C0eVS9K~#7FrIQ1UBtaO3C+69T&Ir%8W8-Yw
zwr!hh+qUf;+t%B3Wm1i3k>o4B|7(^Afav}E_vyWXsU^iepAWr(sU-rB#{;|F-XoYA
zDsa2qyiLRZ8&GZ@K>CYe`4H`SPkL^Ksi6X=)5+V^9vMm*bAKU-BD@PK5N_Dh9>8>C
zH0j^xG-K}5WYTjpjWP`@(A-)F?VDXNch<vdwZh?WFt<p0?zmp6Mo4iJcKyi2j2oex
zJJ2bid$1AeJ%f2@t}VpD&oStK{0EQeH$qU{reFmIgMnPxlKlhvdrNrlpz7!(TtBfH
z|Bo%lpRcbFQGebBo6QEJ(Z~waYBd=2dOa)_3-qUlQ$o(JM$*}Z*m~g-OePa_IvoOe
zR-jNQz{PlZ6lKDV2#PRA1rmt_T+Fw|P-fhVCCq=C0AY>_#9}czIyxxk)H|>~8V7Uy
z1sn}2#;nIlxE)_f_XF?+t*xyTxm-@(N8ncJn41xc#T|S>FCc<GALlMGvMrTVfgm0L
O0000<MNUMnLSTZ{2E*w9

literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfjR2nz*S~-N{{H>@*RNkce*F0U
z{rk6X-@bnR`sK@)&!0bk{P^+1hY#=Hzkm1c-M6<d-oAbN>eZ{4FJC@?{`}dqXP+Kk
zfBg9I&8M#)J$iKg$*Tts9^Acq_w>EzpARqEaQ@!6eO+r#-}<z-?bG(EnMZEFU)j{U
z{o<QxDb?$a=dU@vZ2pulJ+g1Ryl2jw`L4q*WzoUcEgso(w|r`m{@5h-y21KGt>n8>
zu{U`lyUMLC`*)c4@4l3;wx-<Gq<7b=G@+FRjyfG%U&QjqSJgBY#cDUL(P>(%(zHRk
zY87AMB8Ie?|NsBbO`N?A=tqx|AirQBmq@T5pE`yXT^3ECnaey~977}|Sr4A{I}{+o
zaN%=YK67fKl);XLhVMN72>h>4j>!~t_j$}=vE_wj;Wj1)-!<nL8zwL@?458yC$D?*
z>S-z}KHD!>)!zx?ko4cYZua^>?$dWqKR+B>HaC57^UvfAaqpaV<uBr;H{$nQpPKaL
zwtfD!!1j*q@1|^-d1s2K;_0XI!p8)-c>es*Q+RSF`|DQgH%v`O+{1V2ALnUm<nUs4
dVP-J--|@jj(URrLY@mx7JYD@<);T3K0RY7iJHY?|

diff --git a/pelican/themes/notmyidea/static/images/icons/speakerdeck.png b/pelican/themes/notmyidea/static/images/icons/speakerdeck.png
index 087d0931caa301f8a1bba1497e1b91b7a7f105a4..7281ec48b41095180a83d71eaf0b00c85116965b 100644
GIT binary patch
delta 566
zcmV-60?GZE2*d=C8Gi-<001BJ|6u?C0t-n*K~#7Fb&|D$B}Ej5ztdggio3f*g1cKx
z#JmXl5Jbd~;2BPWyF0AA``+6n=O3^2ay|NmQ*XQW+4JwXYGz=3cw8=FU>HIiQv?{8
zndJlh{cAq|>y>c!tyj#Pde2ptcXE>p3>q^e0l<<lqZZ7Jp?{`T&OQ?u2xA9&(Q+xv
z3J_F{W*|{Fw)7%}V4C|IV#=gg@ZwPa2_&d`tLfDZl}wD8kYXlxh2jOPrXOi87?RgD
z2s0<fM3|Qn`w1jG6>vcf;gSBBHCWqVp#@{X@{prbV!^x2p5IrK_xEu*BSS-kHUN-v
zrq^|}O~YKan18zNB5bgwWG8rba<?cT?m5VS!=2aN#8dY_%C~?1h9Pdb_C{X+<UPLr
z{TKSX50ZM3h9OFFf{G~7@%diF*x)D+-FOR6-gY<tuU`uikKb}9dv@;PpOq`wuy5DG
zM>UIq4<$P}6+C9-V(ZSGy!i4<yz}t~WCXxxUwzHbD}Vl_mm}@yFgX?)D|i;cixyl^
zfq~Ocp^b?Ge79#ahJhJEG-pgR2sA^3xEme|B^82}Vju~do+Ox6nkrZlha;YoLl$xo
z<RW*uzLtcU0U%MiFaWcqJ1yR25m*djeaP}`R`;qvQ57_eVHklf?{6Jt$Bu+h73=B?
z)Uzg-N-vl8hu*r4ua3ae&A`A!{RJmLx)v)b?VJBQ3+!ZLngi$tLjV8(07*qoM6N<$
Ef{By}&;S4c

literal 1049
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)ORJo
zC&X36Qpczy)Vv|qtS-i^KE}L0*0?lOuQ1qcbDjH^di}y+y|QqP!eEVpVC8Ior7S<$
zRBzc7Z^?L1sRU2)Xm_y)H_-@J;Sd+WKxYAeM*&|)eqRTEZwEe4dwvgleoqH}M{A*k
zFrmaSekW@-6-5Cz2O#2iwYT3?W4EE&Zez8>rW*T=)%F`}tXEZ-FE2F%qGdo-V!pi0
zdUd7Ql2Vg}#l{PZj29FdFDNouRBSZ2NPl*|!JGnvIfaIE3w5UE>P*Se>d(~b&Cu#i
z*94*-AWGAokfk#vSF=A$y(3K`#!V!^PRQRzI?P!<(p@UlS<uf$GR94#GhMYKUAZwy
z$k#^P+a{nQciFD31rs_7C$z8FvpuLXPs-O`$j3&xAyKt6L#ZiMp*lgp%UUVGb?S;G
zpFV$Xnm4^^?zEY!mT8CkC{)MG)h5Z5#_)Ss@z@!QIGVep#5$zJxTeI3I$H498u7bZ
z$<-uDmBmXI#fZfD3PpGbMtJatx(bB4352=xhq;Nw`$-kYisi?M=0%GY#E1eJ`O#u|
z(Lxy!Lg^8L>EVLu5dvx9f@$GG8Ik-+VSI_9d<h}E2_XW>VSI6+ys<zO!V??J6BGQb
z?f5oe#A}oU`2|<sc=Gu1;~O{r{ks9AF~RkJ|E^a9l}zT~&jsq?Ebxdd2GSm2>~=ES
z4wz7QJY5_^BrYc>B%~yzC8jbmrirPUv9Xo$@%rlK%F4#-%F4>-`suOd+14`GGBZ2Z
zIx90L*9zyc$psr58y9nXdwUma8*2y0vDsxyM@uVg*vhOFU0uh<$nLJ5E*>6kZeE_w
z@6YbYrl_AUA8-G^q2YkS{Raa2iEI-uZ1~V|V#SLYH+KAJIie!ScJaxSD_g$woLSTJ
zX3mv6DTZtx_xx!(wCK^KNtZT#>iXkV$kw^))vQ~)ezhH2w(HijX<D9aE3a+acJ14>
zzH8ggT|2ifER${KyLs>Ky?eLs-#^Y;;oZMeB%i4H&a+A767ZjEQ~Byi<|iJmuFL6X
zSeha?J1&`I)ZEpyYSye-Rssx~p{$||UzYnt><E|>3Jf6C64!{5l*E!$tK_0oAjM#0
zU}&ssV61Cs8e(W+WoT$+XryakZe?KbBv`K%MMG|WN@iLmrUnB`h=%CJhhl*m7(8A5
KT-G@yGywnx3UT@X

diff --git a/pelican/themes/notmyidea/static/images/icons/stackoverflow.png b/pelican/themes/notmyidea/static/images/icons/stackoverflow.png
index f5b65e9990dbf423ff652b297f1d0172c8c1cf27..3c6862e902ef0624a812aa212ea0c075aa123284 100644
GIT binary patch
delta 400
zcmV;B0dM}42c83v7=H)`0000V^Z#K000Cu5L_t(|0b{@io}}n8JxSA<48;F|_y7>I
zGmr|NB!dlE3pHdRNQ@jq_@AWeoQ4`wO;E$@scbnwT=#k!t0=-dx=K${b)P~FiNLA(
z?KBonpysPU{2z#4zMjTb^Lhr0IM|SMZ8KoF`~VsN!Y)`1cz-yNpXuFnCY5*7ncLn>
zWBm*@=rz!g=9fLZ0#9?*eV!!i{{b4*NYE=UCUZ&x4QhHfjrr}HsjUBBPiJ}aY9eRT
zvkF<imqiLp7#h}B*mJI_a4KF^<`M|R+MBDbIY8n!dn9;(h84Y^&in}Iy8oYMGDu^!
zaYKcz*4hfk|9>#Ny4>l_$}-mjtIM5Rfrf<~ZPp69(<>T@)5(h~y!kg)*aU5;uxkP0
zoj`mKi2nm!_J3_T(7-aM|0~N~>@YOu=H&bbVQhxZt_TrXP~mU0q{1s@RfWsMMHN1h
u80rxM2sS20sG+3+gaJ+iNWoM!006J!F6HlsU$OuI00{s|MNUMnLSTXuY`7r+

delta 906
zcmbQoJcWINM7;nT0|SG9va%A8VoUONcli$noDtve07W<pJR*yMv<Dcwoy@jlU|_oB
z>EamTar|hAwTHH&$X;XX*(sr)6f`=89FH`t*eI}tJNlM}*s_fq1wINZ3+6CQQ;O<P
z_~^c9Ygks|OgGi3O$r+W0$i@W7g9+%m{Pyl`g50}f5(%f%Ma~7oA~_9oa%3P5(R2D
zilkQT*ejdN(4!d}_iXh+h2w{v`|jS&D>s?t^Q>rT$%k;>9d~EXe*Sz4(+ss^3kBlu
z-hHZZT4wRZBCB|_4|yrsukW6?Ai$8!uzdL(S(%V26DMxlHgjgs^NZ=yD_^}@bu_5s
z#zO{&j*azSzs{QFpfErD>LEK<Nx5%T($b6qOcr*}e!qHUVQp~0ebeU8nanG%+>%n9
z<f54@A^va8($>ePx${LjKkOFhzIvsnSMu2B&5L^awrwjbWt_20K}NQ4--2705BDB<
zoa(+H^Jh(Js-8NBgtS}ye1(LZS)V_1C?1J$W$mvio7S%|vp(c%FRxQty6eTqJ9qEi
z<>WD`$a4RDX+@TXpq|=&^>U7dwzjTHlR~1iHwr9z{rK^n6GvG5Pd!ZFNj?^&d8{N>
z<oY$9#~(ND`t>D5pd?m+k8jSorAu!|dwEOUxXs<38ac^F*g=4a(M$8_k7sS0!^0=3
zbmiw?zrJ^GadD@MS#@Ro&K)m`LPP)lO5M8bva)iRw&E^3)1wj$$zQ*=B>1enox8oi
zkLk|+>Anf|_A=joMn(AuH%#d6PMQ~VOu%cYMyij%B+nkfMJ5wB+~hc!cK)0U-|V+v
zrv@$GyvQkZ?X_jgUS@{gy{C6gaVbxV5kuMUzkBcUP4N5v-I%SR(49Tq+Pa>VQIVma
zok8*Ngw$gU0+Ui>&3U?6A3Ri?T)2}##P#y4S3h<O^w+=ntloI?WP*W2%9;<dooj$#
z!KQK*G4A%i|6XMUvYdE6dp768jExL0c3q!+mgz<gH@CX_tZNrOd<a<Mf67$DEG*{v
z^I6}vf8G<QairAl)BQTm{n4qyKi+86*WGd0`J#T+zuz2n%nz+SPqwyqg#Z(~YKdz^
zNlIc#s#S7PDv)9@GB7mOH89sTFb**?vNATXGOz@4tqcsF8M-V((U6;;l9^VC&|ny1
eXkuk*W@Tyu(ZF!!+kK!022WQ%mvzie2~7Zrl9o9D

diff --git a/pelican/themes/notmyidea/static/images/icons/twitter.png b/pelican/themes/notmyidea/static/images/icons/twitter.png
index 057ab004b5d826e151a4f9cc6a66d88caffa8911..cef1cef96bb2e0c957b77b79ee30894f798ce8f0 100644
GIT binary patch
delta 390
zcmV;10eSxA3!np#BYy#BNkl<Zcmb_aGlQ5x6x`UhZL^B)D*hR1W83!Gwr$(CZN1w$
zemobm8mt~8qG4fV0@y>VnQ8)X9Pc^YIsS936mToi>>TyPE<z~;YaQIr7-E{~#Qr4E
zsAo<UU4h{<-nw03E57@lWjfi!g&7DF28?}Xe+wKlDeHw{5q}|YjBa+-)XxF>?2>uR
z_6|ZnpV&)R5*~BWzsPssl(50B)R2faviTo8PHlFoG{z!;W3p#X2udIOBQjepfQZ&|
zFt%SO>>!RL72rgGl6ksid9v^qrV36lAgr;-*AoV?yTOHr_qbMSj5RH*9!LQ6qJT@r
z;R`1GjEuz#_kU+zWnW=WL=&ZzIF@7Yd7tVR5J0GQcdN|meTt=w8kqkp?9KRpi8*R!
zkHUtd*i0Az;{%TJjvDwDA$xhe3*JY`44_%*SJHImW?;=72p8K_c;gxvV+|ZMQnS(<
k%<U3xMTKFEHK|dGb`RI1Srg6^h5!Hn07*qoM6N<$f|GZ(bpQYW

literal 1509
zcmbVMT}%{L6dqg_sA8nmMy!cU7j3A8ow>X0-^j}T%x<BwNC7Kp)$TBJVJEmd<Ln>{
ziioWWjRg{0+q5?FKw6$ECbfwv%~C-uL8X=08cY)ugvM&sqT&xSy$h`N!T8Y0%-nm=
zobNl|IrrRYEXaRz;rv(TV;HtDH-|1nV^ZWvh(qs`357w!GTBuk7YSu@6(d2+&IzRu
z&-F9qun;m_^|n5kg<&cmUtA)Wc=9M#@N1cfk2d5N5gNm?vO^-nRzMjqh2?y}s=4_?
zScCJNRkP9HAw8lK`uLn02^Q7l7qc}LtcBBLuf?-M6e93LnZZN;t$`pFvT9~{DKw9m
z2@O8uB3D>7v!Y5o1-Mg?Aa2m=GguM;+-TH-OoPz~(s3OLbOecRV+P2i3`R<4!sjjx
ziY9SoR3Yu2i-lHJjZc<EiXf`0s<c&ltss>Xz+$mPICQ!U<dG4q4#-R>BM?lDGSD!{
zO1voZLI962GNnSLY}Fv8vnlvRkLL+-AUIbjR5BvOhy>7*gx?>@YsNb$7s979p6MMd
zt`;Ft2!leU#G?HuOO1k2?VcYf;)v8x>m?p-3bU0K*h)VP$hovtgT81vo}=6*lN$h2
zCTY@<Ml(R^XF45DquEZ=CWkB266JUn)@3#Vy~}O4yLEN|T);xQEN)uwa5)SPgWgU@
zvAKbu%mi2%jmx9Bb6CrBv6NGSj4VjSg0MB(0R=um7J@!O#GOS3Ex<ht%LgKs$Og^k
zOGAm@4mr0Z`0<$vQ~Wa&ka{!fpQo9dodBgyJAq4QrVVDKeiqC9pQ;f^3=wIM|Flcg
zgnBSCebW4B@#Ofx06H@gIvkrP`0W@rZ*eYdFAfcrPAN*ZYSr$>dPkQu+!Ygd+Id8M
z@6zpEU0-7><J+#)U&I<xux+UYH&pG1=cPJFUQ@Zt4yhGodYjD@+qNvNYB=0}c&#el
zr0TwTB=Nw}6}3~!qtiQEzf)x|TEF~Y=jR=xb?VKvttS`Q7RIHWW1(kWA4pgSNO3|>
zCNzMljmF{fmV(vZcR=xUfA7mZZNyK?67FFgbXMcFD||oiY#Fr0HN2J6x7+WIJCmM>
zt2V@*_`dEO5V$2@id`PMpS(NtP54!>I%NwWJ8NR)znkOJul$o<M{}@a?^(rb-{8If
z2lIB)<wv`&O^+mX=<V2_dF1rtqRWe#TE<z}sXCw7)O+yPedEWMz~8;?rEtGD-F8Q5
z9u!k7X7kjQ(WN`@e%ko)?YjfYY9%@OV#2A~rt8Y4Q|}*5Il1`!srZ4wrV|rgcLt7R
zXMLFYhNQpY)4jOnh340jj)9)xjFyikEe}_X4vmK&PKKu^x~@((zI&$9rYJUmrQM28
zuB_`>2}{;?h=1vBHI`oJ?AxP1yXC;+srnr`yt@5ZOwPD!<h|hwDXq<+2L*#vYWLFG
zn6cwOQr8#Mf3fI;bmyV+*fICs5uvUk@5H12(Xr3Ms|Ui$#<KFV`<kBK`-NZae~{m#
zyR>W_^V@RU@%6tLx)XO-t3TmGt;uakqXR^1oBArN#$w{Idt7(_nwNIiB0t_-S3do%
H!@K8S?9(ld

diff --git a/pelican/themes/notmyidea/static/images/icons/vimeo.png b/pelican/themes/notmyidea/static/images/icons/vimeo.png
index dba472022f0fcf7ecdd8f4847a8a3bde90789bc7..4b9d72127c574237090a2f5f2f7eb7be94a2b62e 100644
GIT binary patch
delta 333
zcmV-T0kZy}1l<CV8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30003JNkl<ZcmZPo
z0`6J+h(u7;)_d;puDwPO0hNLD05On5B!X)|n4!J>Hk=D&w_STxe({COrkhwaOuhZ~
z|Ns9Ve*S^z@jCS2KMX9n_ZCG1(10ZmKES2RPdxz2ZMysN{ePFQ5RrqoAERjS+<Uuu
z`>_jmA3>xipSTV*f<3dnY55k2$igG%Q8aK**~wWw*R*;f)Vw=Sc$R}yY`O+@mFwhH
zC>mg#0}o!jhNwXH!-iw$fF@!OrG@)XK@<T4=i=*6KnBno;zj*9gEeL8&i|;urKTTW
zJV^F$Kvtd9H%1TW7<?Llex0~}7sMq%)m-hXamF+pag<JVF7FbJE=H)v)PSZ3=nSA$
fSXBcN$;lf4{SCr3%yBq=00000NkvXXu0mjf6_k~N

literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l;{oc
z32_C|+_Uys@43gj_L}zg+illgm0x@zv+3s4+i(B>|Nr6VAFo3XmfU;0<iUsXQx7)X
zefj>&*Mqkod+xp6y#3gPyN@QHxXzy0-n4wn!XxLor|jgco@-h?@!*{&Jj>5-y7s_z
z@+$6G2Ohk5z2Vroh5JukeEmths6S=tPM4Z~$^H#Vee))+-^JCwnxk~8b9t9&bn*5L
zvT{HNF_r}R1v5B2yO9RsBze2LaDKeG^bL^H>FMGaB5^si|EAa>1s)gXg^zYT($l&Y
zn|<~Fe;e+k=x2)RJNb=;l_qw0c;tC<3C(%IzGPL~DJ!ccy{fL?3~Y=q61VnM<TQ9P
zT)rt2@!~001bc#cbi(rr{wEh77qIL(e)3=NIft^wo!2&+SKOT~$6qhLjqx34@RYU7
z{#4bU+Et}+?da|Ov-kaHT~opS;{5EL2Z4@KEpd$~Nl7e8wMs5Z1yT$~28PDE28OzZ
z#vukqRtDx)1{S&o7FGrZGx*g|HRR@}WTsW3YcR7iwuETV%lIh*w1L6X)z4*}Q$iB}
DsxjOm

diff --git a/pelican/themes/notmyidea/static/images/icons/youtube.png b/pelican/themes/notmyidea/static/images/icons/youtube.png
index ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e..e334e68eed877dbd5109acea1858a533a3174b2f 100644
GIT binary patch
delta 300
zcmV+{0n`4<1H1x|8Gix*005AYXf^-<00wkYPE!EU0MP)^r>yKf0002-Nkl<Zcmb7A
zH9`bY41EWn+AVQ73hotG*bcb?H7ylx6>c3<;~pGJw8CA(gtzXSA9?Z2Ktv9vn%k<g
zRJGJMF}!%LiAh921mJGew5B4^98Na_;CQE_0)Vf5m4m3G8-HG|#sD0D|GpZqAl-}`
z`dYngi*9(m9=D3GA61?ApR}T?2X-plpApuOAwf@0wAk~{Ueigq$fKtxFccsr*i1K;
zkuaUCf$7Eu(?tPHavaOL`u<L3H(mp`5i{P^&E7-}p7;%cZ;Nbj90SB#+Xm+5EZfr)
yvEeocF5l&v4kcp-jSU!vHHb*~-y}#B5s^RLsrl%w&%5IQ0000<MNUMnLSTZXuY=?O

literal 458
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6%)r1HuVsG}$dN2@jVKAuPb(=;EJ|f?Ovz75
zRq)JBOiv9;O-!jQJeg_(RFo6o6XN<G2$Y3@ymvAT|3m%%D+}NF^Y6VZ!~b2o{$ITG
z?b)jTGiQATl1f60jy`rtTeEAD`~RCa|KGa#UWTFGi|75y|Nm#to?9UNf77O`>+{k&
zPwWILICuW)Iw1Sxx96+>e|Uf6_up&l^DbVzD4uS~541_8B*-rqWG?~05TV1%3sir^
z)5S5Q;#N{XT0%k!1BU`zox({D0S6wQ93LMAIc5h2!;S_HIkiHz2^JA8f(i{15>tM#
zJZaz(V9+^u@ZiY<CwN%ioO#2*ctqj!0d^r~sZ&Q7LQft!df?cx1}2F}NylYIn?7tZ
zFwkm{a5!=H#3=?7=8QfAWrv2wEuBUSvmPZTJ!X<R#bzEc&vT;VEYB{-NuBaXL{nNM
zxEc32IYdiHD1I|Il))y(7N(Gv@*pkYK?_HLfx(6o1|9}ojVx0n6Wba*QyHvlSq!fv
S^UDJL!{F)a=d#Wzp$P!fz0HvT


From d496e81f2bedc9c67efb08cb7a778a7f3130472e Mon Sep 17 00:00:00 2001
From: Hyunwoo Park <ez.amiryo@gmail.com>
Date: Mon, 22 Jan 2018 19:26:57 +0900
Subject: [PATCH 2017/2864] We're not using SimpleHTTPServer anymore.

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index a03f52df..34bd7863 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -267,7 +267,7 @@ needed by Pelican.
 
     automation = ask('Do you want to generate a Fabfile/Makefile '
                      'to automate generation and publishing?', bool, True)
-    develop = ask('Do you want an auto-reload & simpleHTTP script '
+    develop = ask('Do you want an auto-reload & simple HTTP script '
                   'to assist with theme and site development?', bool, True)
 
     if automation:

From b888a4589e3e3091bb0418ffd5f277a339bf8969 Mon Sep 17 00:00:00 2001
From: Hyunwoo Park <ez.amiryo@gmail.com>
Date: Fri, 2 Feb 2018 17:16:09 +0900
Subject: [PATCH 2018/2864] Make it simpler again

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 34bd7863..eeda89bd 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -267,7 +267,7 @@ needed by Pelican.
 
     automation = ask('Do you want to generate a Fabfile/Makefile '
                      'to automate generation and publishing?', bool, True)
-    develop = ask('Do you want an auto-reload & simple HTTP script '
+    develop = ask('Do you want an auto-reload HTTP script '
                   'to assist with theme and site development?', bool, True)
 
     if automation:

From b573576b006152cceb8182911d888e0de424156a Mon Sep 17 00:00:00 2001
From: Andrea Corbellini <corbellini.andrea@gmail.com>
Date: Thu, 8 Feb 2018 18:30:09 +0100
Subject: [PATCH 2019/2864] Fix utils.truncate_html_words() to work with
 invalid HTML references

Invalid references like those missing semicolons (e.g. `&mdash`) or
those causing overflows (e.g. `&#9999999999;`) are now gracefully
handled and no exception is thrown.

This commit also adds tests and comments where needed.
---
 pelican/tests/test_utils.py |  8 +++++
 pelican/utils.py            | 67 +++++++++++++++++++++++++++++++------
 2 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 9a7109d6..634dfbee 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -217,6 +217,14 @@ class TestUtils(LoggedTestCase):
             utils.truncate_html_words("&#x222b;dx " * 100, 20),
             "&#x222b;dx " * 20 + '…')
 
+        # Words with invalid or broken HTML references.
+        self.assertEqual(utils.truncate_html_words('&invalid;', 20), '&invalid;')
+        self.assertEqual(utils.truncate_html_words('&#9999999999;', 20), '&#9999999999;')
+        self.assertEqual(utils.truncate_html_words('&#xfffffffff;', 20), '&#xfffffffff;')
+        self.assertEqual(utils.truncate_html_words('&mdash', 20), '&mdash')
+        self.assertEqual(utils.truncate_html_words('&#1234', 20), '&#1234')
+        self.assertEqual(utils.truncate_html_words('&#xabc', 20), '&#xabc')
+
     def test_process_translations(self):
         fr_articles = []
         en_articles = []
diff --git a/pelican/utils.py b/pelican/utils.py
index ef9da23b..59400699 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -550,9 +550,41 @@ class _HTMLWordTruncator(HTMLParser):
         if word_end < len(data):
             self.add_last_word()
 
-    def handle_ref(self, char):
+    def _handle_ref(self, name, char):
+        """
+        Called by handle_entityref() or handle_charref() when a ref like 
+        `&mdash;`, `&#8212;`, or `&#x2014` is found.
+        
+        The arguments for this method are:
+        
+        - `name`: the HTML entity name (such as `mdash` or `#8212` or `#x2014`)
+        - `char`: the Unicode representation of the ref (such as `—`)
+
+        This method checks whether the entity is considered to be part of a 
+        word or not and, if not, signals the end of a word.
+        """
+        # Compute the index of the character right after the ref.
+        #
+        # In a string like 'prefix&mdash;suffix', the end is the sum of:
+        #
+        # - `self.getoffset()` (the length of `prefix`)
+        # - `1` (the length of `&`)
+        # - `len(name)` (the length of `mdash`)
+        # - `1` (the length of `;`)
+        # - `1` (required to go to the start of `suffix`)
+        #
+        # Note that, in case of malformed HTML, the ';' character may
+        # not be present.
+
         offset = self.getoffset()
-        ref_end = self.rawdata.index(';', offset) + 1
+        ref_end = offset + len(name) + 1 + 1
+
+        try:
+            if self.rawdata[ref_end] == ';':
+                ref_end += 1
+        except IndexError:
+            # We are at the end of the string and there's no ';'
+            pass
 
         if self.last_word_end is None:
             if self._word_prefix_regex.match(char):
@@ -564,19 +596,34 @@ class _HTMLWordTruncator(HTMLParser):
                 self.add_last_word()
 
     def handle_entityref(self, name):
+        """
+        Called when an entity ref like '&mdash;' is found
+
+        `name` is the entity ref without ampersand and semicolon (e.g. `mdash`)
+        """
         try:
             codepoint = html_entities.name2codepoint[name]
+            char = six.unichr(codepoint)
         except KeyError:
-            self.handle_ref('')
-        else:
-            self.handle_ref(six.unichr(codepoint))
+            char = ''
+        self._handle_ref(name, char)
 
     def handle_charref(self, name):
-        if name.startswith('x'):
-            codepoint = int(name[1:], 16)
-        else:
-            codepoint = int(name)
-        self.handle_ref(six.unichr(codepoint))
+        """
+        Called when a char ref like '&#8212;' or '&#x2014' is found
+
+        `name` is the char ref without ampersand and semicolon (e.g. `#8212` or
+        `#x2014`)
+        """
+        try:
+            if name.startswith('x'):
+                codepoint = int(name[1:], 16)
+            else:
+                codepoint = int(name)
+            char = six.unichr(codepoint)
+        except (ValueError, OverflowError):
+            char = ''
+        self._handle_ref(name, char)
 
 
 def truncate_html_words(s, num, end_text='…'):

From fc7af9e1c3f08093c78f493b4903a63f8e0ca3a9 Mon Sep 17 00:00:00 2001
From: Andrea Corbellini <corbellini.andrea@gmail.com>
Date: Thu, 8 Feb 2018 18:39:29 +0100
Subject: [PATCH 2020/2864] flake8 fixes

---
 pelican/tests/test_utils.py | 18 ++++++++++++------
 pelican/utils.py            |  8 ++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 634dfbee..3863ba32 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -218,12 +218,18 @@ class TestUtils(LoggedTestCase):
             "&#x222b;dx " * 20 + '…')
 
         # Words with invalid or broken HTML references.
-        self.assertEqual(utils.truncate_html_words('&invalid;', 20), '&invalid;')
-        self.assertEqual(utils.truncate_html_words('&#9999999999;', 20), '&#9999999999;')
-        self.assertEqual(utils.truncate_html_words('&#xfffffffff;', 20), '&#xfffffffff;')
-        self.assertEqual(utils.truncate_html_words('&mdash', 20), '&mdash')
-        self.assertEqual(utils.truncate_html_words('&#1234', 20), '&#1234')
-        self.assertEqual(utils.truncate_html_words('&#xabc', 20), '&#xabc')
+        self.assertEqual(
+            utils.truncate_html_words('&invalid;', 20), '&invalid;')
+        self.assertEqual(
+            utils.truncate_html_words('&#9999999999;', 20), '&#9999999999;')
+        self.assertEqual(
+            utils.truncate_html_words('&#xfffffffff;', 20), '&#xfffffffff;')
+        self.assertEqual(
+            utils.truncate_html_words('&mdash', 20), '&mdash')
+        self.assertEqual(
+            utils.truncate_html_words('&#1234', 20), '&#1234')
+        self.assertEqual(
+            utils.truncate_html_words('&#xabc', 20), '&#xabc')
 
     def test_process_translations(self):
         fr_articles = []
diff --git a/pelican/utils.py b/pelican/utils.py
index 59400699..ab2e4a6e 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -552,15 +552,15 @@ class _HTMLWordTruncator(HTMLParser):
 
     def _handle_ref(self, name, char):
         """
-        Called by handle_entityref() or handle_charref() when a ref like 
+        Called by handle_entityref() or handle_charref() when a ref like
         `&mdash;`, `&#8212;`, or `&#x2014` is found.
-        
+
         The arguments for this method are:
-        
+
         - `name`: the HTML entity name (such as `mdash` or `#8212` or `#x2014`)
         - `char`: the Unicode representation of the ref (such as `—`)
 
-        This method checks whether the entity is considered to be part of a 
+        This method checks whether the entity is considered to be part of a
         word or not and, if not, signals the end of a word.
         """
         # Compute the index of the character right after the ref.

From 01480a539f0a8b631d3c0a9a41ddfbdf9e854d6e Mon Sep 17 00:00:00 2001
From: Andrea Corbellini <corbellini.andrea@gmail.com>
Date: Thu, 8 Feb 2018 20:10:08 +0100
Subject: [PATCH 2021/2864] more accurate code and tests

---
 pelican/tests/test_utils.py | 6 +++---
 pelican/utils.py            | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 3863ba32..b5b8b454 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -225,11 +225,11 @@ class TestUtils(LoggedTestCase):
         self.assertEqual(
             utils.truncate_html_words('&#xfffffffff;', 20), '&#xfffffffff;')
         self.assertEqual(
-            utils.truncate_html_words('&mdash', 20), '&mdash')
+            utils.truncate_html_words('&mdash text', 20), '&mdash text')
         self.assertEqual(
-            utils.truncate_html_words('&#1234', 20), '&#1234')
+            utils.truncate_html_words('&#1234 text', 20), '&#1234 text')
         self.assertEqual(
-            utils.truncate_html_words('&#xabc', 20), '&#xabc')
+            utils.truncate_html_words('&#xabc text', 20), '&#xabc text')
 
     def test_process_translations(self):
         fr_articles = []
diff --git a/pelican/utils.py b/pelican/utils.py
index ab2e4a6e..f9c5eb3f 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -571,13 +571,12 @@ class _HTMLWordTruncator(HTMLParser):
         # - `1` (the length of `&`)
         # - `len(name)` (the length of `mdash`)
         # - `1` (the length of `;`)
-        # - `1` (required to go to the start of `suffix`)
         #
         # Note that, in case of malformed HTML, the ';' character may
         # not be present.
 
         offset = self.getoffset()
-        ref_end = offset + len(name) + 1 + 1
+        ref_end = offset + len(name) + 1
 
         try:
             if self.rawdata[ref_end] == ';':
@@ -623,7 +622,7 @@ class _HTMLWordTruncator(HTMLParser):
             char = six.unichr(codepoint)
         except (ValueError, OverflowError):
             char = ''
-        self._handle_ref(name, char)
+        self._handle_ref('#' + name, char)
 
 
 def truncate_html_words(s, num, end_text='…'):

From ba1c7f6095e50e2dab2648bc3c092c3c195903a3 Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Mon, 16 Oct 2017 14:02:54 +0200
Subject: [PATCH 2022/2864] FIX: freenode.org/freenode.net

---
 CONTRIBUTING.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 5159955a..27002bdd 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -76,8 +76,8 @@ The #pelican IRC channel
   can manually join the ``#pelican`` IRC channel on the `freenode IRC network`_.
 
 .. _webchat: https://kiwiirc.com/client/irc.freenode.net/?#pelican
-.. _`IRC link`: irc://irc.freenode.org/pelican
-.. _`freenode IRC network`: http://www.freenode.org/
+.. _`IRC link`: irc://irc.freenode.net/pelican
+.. _`freenode IRC network`: https://freenode.net/
 
 
 Contributing code

From 65daa9e537052342ef44d75c3fda65ec637a0554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles=20Fl=C3=A8che?= <charles.fleche@free.fr>
Date: Fri, 9 Feb 2018 10:39:11 +0100
Subject: [PATCH 2023/2864] Extract refresh_metadata_intersite_links methods

---
 pelican/contents.py   | 10 ++++++++++
 pelican/generators.py | 15 +++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/pelican/contents.py b/pelican/contents.py
index 15770fc8..852bb49d 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -413,6 +413,16 @@ class Content(object):
                     os.path.abspath(self.source_path),
                     os.path.abspath(self.settings['PATH']))))
 
+    def refresh_metadata_intersite_links(self):
+        for key in self.settings['FORMATTED_FIELDS']:
+            if key in self.metadata:
+                value = self._update_content(
+                    self.metadata[key],
+                    self.get_siteurl()
+                )
+                self.metadata[key] = value
+                setattr(self, key.lower(), value)
+
 
 class Page(Content):
     mandatory_properties = ('title',)
diff --git a/pelican/generators.py b/pelican/generators.py
index eb97c115..8a0180f7 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -581,6 +581,14 @@ class ArticlesGenerator(CachingGenerator):
         self.generate_pages(writer)
         signals.article_writer_finalized.send(self, writer=writer)
 
+    def refresh_metadata_intersite_links(self):
+        for e in chain(self.articles,
+                       self.translations,
+                       self.drafts,
+                       self.drafts_translations):
+            if hasattr(e, 'refresh_metadata_intersite_links'):
+                e.refresh_metadata_intersite_links()
+
 
 class PagesGenerator(CachingGenerator):
     """Generate pages"""
@@ -649,6 +657,13 @@ class PagesGenerator(CachingGenerator):
                 override_output=hasattr(page, 'override_save_as'))
         signals.page_writer_finalized.send(self, writer=writer)
 
+    def refresh_metadata_intersite_links(self):
+        for e in chain(self.pages,
+                       self.hidden_pages,
+                       self.hidden_translations):
+            if hasattr(e, 'refresh_metadata_intersite_links'):
+                e.refresh_metadata_intersite_links()
+
 
 class StaticGenerator(Generator):
     """copy static paths (what you want to copy, like images, medias etc.

From 06fd9be1c22f3b5f70568389c206afdb9ad1f348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles=20Fl=C3=A8che?= <charles.fleche@free.fr>
Date: Fri, 9 Feb 2018 10:40:47 +0100
Subject: [PATCH 2024/2864] Get Content._summary from metadata

---
 pelican/contents.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 852bb49d..d8881fe9 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -337,8 +337,8 @@ class Content(object):
         This is based on the summary metadata if set, otherwise truncate the
         content.
         """
-        if hasattr(self, '_summary'):
-            return self._update_content(self._summary, siteurl)
+        if 'summary' in self.metadata:
+            return self.metadata['summary']
 
         if self.settings['SUMMARY_MAX_LENGTH'] is None:
             return self.content

From 31dc9366f0219c1a273fb8e844e1ccd35e38ba03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles=20Fl=C3=A8che?= <charles.fleche@free.fr>
Date: Fri, 9 Feb 2018 10:41:32 +0100
Subject: [PATCH 2025/2864] Initialize metadata with
 refresh_metadata_intersite_links

---
 pelican/__init__.py | 4 ++++
 pelican/contents.py | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 70013804..89eefdd3 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -170,6 +170,10 @@ class Pelican(object):
             if hasattr(p, 'generate_context'):
                 p.generate_context()
 
+        for p in generators:
+            if hasattr(p, 'refresh_metadata_intersite_links'):
+                p.refresh_metadata_intersite_links()
+
         signals.all_generators_finalized.send(generators)
 
         writer = self.get_writer()
diff --git a/pelican/contents.py b/pelican/contents.py
index d8881fe9..310690ba 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -140,9 +140,8 @@ class Content(object):
         if not hasattr(self, 'status'):
             self.status = getattr(self, 'default_status', None)
 
-        # store the summary metadata if it is set
-        if 'summary' in metadata:
-            self._summary = metadata['summary']
+        if len(self._context.get('filenames', [])) > 0:
+            self.refresh_metadata_intersite_links()
 
         signals.content_object_init.send(self)
 

From 3de422b1ab15cccce8e3b17e50bb31c137e9101c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles=20Fl=C3=A8che?= <charles.fleche@free.fr>
Date: Fri, 9 Feb 2018 10:43:23 +0100
Subject: [PATCH 2026/2864] Add test for parsed metadata

---
 pelican/tests/test_contents.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index d028c7a1..edd91fb6 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -319,17 +319,21 @@ class TestPage(LoggedTestCase):
         )
 
         # also test for summary in metadata
-        args['metadata']['summary'] = (
+        parsed = (
             'A simple summary test, with a '
             '<a href="|filename|article.rst">link</a>'
         )
-        args['context']['localsiteurl'] = 'http://notmyidea.org'
-        p = Page(**args)
-        self.assertEqual(
-            p.summary,
+        linked = (
             'A simple summary test, with a '
             '<a href="http://notmyidea.org/article.html">link</a>'
         )
+        args['settings']['FORMATTED_FIELDS'] = ['summary', 'custom']
+        args['metadata']['summary'] = parsed
+        args['metadata']['custom'] = parsed
+        args['context']['localsiteurl'] = 'http://notmyidea.org'
+        p = Page(**args)
+        self.assertEqual(p.summary, linked)
+        self.assertEqual(p.custom, linked)
 
     def test_intrasite_link_more(self):
         # type does not take unicode in PY2 and bytes in PY3, which in

From 4995a5c641c21c6230e2cedaa456a78489530a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 10 Feb 2018 18:07:33 +0100
Subject: [PATCH 2027/2864] test: explicitly verify that all static files are
 present.

---
 pelican/tests/test_generators.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 139fda10..804b3fdf 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -741,6 +741,17 @@ class TestStaticGenerator(unittest.TestCase):
                                                     "theme/css/")))
         self.assertFalse(os.path.isdir(os.path.join(self.temp_output,
                                                     "theme/fonts/")))
+
+        self.assertTrue(os.path.isfile(os.path.join(
+            self.temp_output, "theme/Yanone_Kaffeesatz_400.eot")))
+        self.assertTrue(os.path.isfile(os.path.join(
+            self.temp_output, "theme/Yanone_Kaffeesatz_400.svg")))
+        self.assertTrue(os.path.isfile(os.path.join(
+            self.temp_output, "theme/Yanone_Kaffeesatz_400.ttf")))
+        self.assertTrue(os.path.isfile(os.path.join(
+            self.temp_output, "theme/Yanone_Kaffeesatz_400.woff")))
+        self.assertTrue(os.path.isfile(os.path.join(
+            self.temp_output, "theme/Yanone_Kaffeesatz_400.woff2")))
         self.assertTrue(os.path.isfile(os.path.join(self.temp_output,
                                                     "theme/font.css")))
         self.assertTrue(os.path.isfile(os.path.join(self.temp_output,

From 182fb11c80935f2ef1661beaf1151969a24e833f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 26 Oct 2017 18:23:17 +0200
Subject: [PATCH 2028/2864] Allow to use page URL in pagination pattern.

Currently it was only possible to use page "save as" name or part of it
for generating pagination links. That's not sufficient when page URLs
differ a lot from actual filenames. With this patch it's possible to use
the `{url}` placeholder in PAGINATION_PATTERNS setting. For example, the
paginated archives would be saved to:

    blog/index.html
    blog/2/index.html
    blog/3/index.html

while the actual URLs would be like this (with the help of Apache's
mod_rewrite):

    http://blog.my.site/
    http://blog.my.site/2/
    http://blog.my.site/3/

The configuration that corresponds to this is roughly the following:

    ARCHIVES_SAVE_AS = 'blog/index.html'
    ARCHIVES_URL = 'http://blog.my.site/'
    PAGINATION_PATTERNS = [
        (1, '/{url}', '{base_name}/index.html'),
        (2, '/{url}{number}/', '{base_name}/{number}/index.html')
    ]

Also added YEAR_ARCHIVE_URL, MONTH_ARCHIVE_URL and DAY_ARCHIVE_URL
settings, as they were missing and now they make sense.
---
 pelican/generators.py            | 33 +++++++++++++++++++++-----------
 pelican/paginator.py             | 11 +++++++----
 pelican/settings.py              |  3 +++
 pelican/tests/test_generators.py | 23 +++++++++++++++-------
 pelican/tests/test_paginator.py  | 24 ++++++++++++++++++++++-
 pelican/writers.py               |  5 +++--
 6 files changed, 74 insertions(+), 25 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index eb97c115..877eefe9 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -255,7 +255,7 @@ class TemplatePagesGenerator(Generator):
                 template = self.env.get_template(source)
                 rurls = self.settings['RELATIVE_URLS']
                 writer.write_file(dest, template, self.context, rurls,
-                                  override_output=True)
+                                  override_output=True, url='')
             finally:
                 del self.env.loader.loaders[0]
 
@@ -369,7 +369,7 @@ class ArticlesGenerator(CachingGenerator):
             write(article.save_as, self.get_template(article.template),
                   self.context, article=article, category=article.category,
                   override_output=hasattr(article, 'override_save_as'),
-                  blog=True)
+                  url=article.url, blog=True)
 
     def generate_period_archives(self, write):
         """Generate per-year, per-month, and per-day archives."""
@@ -384,13 +384,19 @@ class ArticlesGenerator(CachingGenerator):
             'day': self.settings['DAY_ARCHIVE_SAVE_AS'],
         }
 
+        period_url = {
+            'year': self.settings['YEAR_ARCHIVE_URL'],
+            'month': self.settings['MONTH_ARCHIVE_URL'],
+            'day': self.settings['DAY_ARCHIVE_URL'],
+        }
+
         period_date_key = {
             'year': attrgetter('date.year'),
             'month': attrgetter('date.year', 'date.month'),
             'day': attrgetter('date.year', 'date.month', 'date.day')
         }
 
-        def _generate_period_archives(dates, key, save_as_fmt):
+        def _generate_period_archives(dates, key, save_as_fmt, url_fmt):
             """Generate period archives from `dates`, grouped by
             `key` and written to `save_as`.
             """
@@ -402,6 +408,7 @@ class ArticlesGenerator(CachingGenerator):
                 # period archive dates
                 date = archive[0].date
                 save_as = save_as_fmt.format(date=date)
+                url = url_fmt.format(date=date)
                 context = self.context.copy()
 
                 if key == period_date_key['year']:
@@ -419,13 +426,14 @@ class ArticlesGenerator(CachingGenerator):
                                              _period[2])
 
                 write(save_as, template, context,
-                      dates=archive, blog=True)
+                      dates=archive, blog=True, url=url)
 
         for period in 'year', 'month', 'day':
             save_as = period_save_as[period]
+            url = period_url[period]
             if save_as:
                 key = period_date_key[period]
-                _generate_period_archives(self.dates, key, save_as)
+                _generate_period_archives(self.dates, key, save_as, url)
 
     def generate_direct_templates(self, write):
         """Generate direct templates pages"""
@@ -436,12 +444,14 @@ class ArticlesGenerator(CachingGenerator):
                 paginated = {'articles': self.articles, 'dates': self.dates}
             save_as = self.settings.get("%s_SAVE_AS" % template.upper(),
                                         '%s.html' % template)
+            url = self.settings.get("%s_URL" % template.upper(),
+                                    '%s.html' % template)
             if not save_as:
                 continue
 
             write(save_as, self.get_template(template),
                   self.context, blog=True, paginated=paginated,
-                  page_name=os.path.splitext(save_as)[0])
+                  page_name=os.path.splitext(save_as)[0], url=url)
 
     def generate_tags(self, write):
         """Generate Tags pages."""
@@ -450,7 +460,7 @@ class ArticlesGenerator(CachingGenerator):
             articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write(tag.save_as, tag_template, self.context, tag=tag,
-                  articles=articles, dates=dates,
+                  url=tag.url, articles=articles, dates=dates,
                   paginated={'articles': articles, 'dates': dates}, blog=True,
                   page_name=tag.page_name, all_articles=self.articles)
 
@@ -461,7 +471,7 @@ class ArticlesGenerator(CachingGenerator):
             articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write(cat.save_as, category_template, self.context,
-                  category=cat, articles=articles, dates=dates,
+                  url=cat.url, category=cat, articles=articles, dates=dates,
                   paginated={'articles': articles, 'dates': dates}, blog=True,
                   page_name=cat.page_name, all_articles=self.articles)
 
@@ -472,7 +482,7 @@ class ArticlesGenerator(CachingGenerator):
             articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write(aut.save_as, author_template, self.context,
-                  author=aut, articles=articles, dates=dates,
+                  url=aut.url, author=aut, articles=articles, dates=dates,
                   paginated={'articles': articles, 'dates': dates}, blog=True,
                   page_name=aut.page_name, all_articles=self.articles)
 
@@ -482,7 +492,7 @@ class ArticlesGenerator(CachingGenerator):
             write(draft.save_as, self.get_template(draft.template),
                   self.context, article=draft, category=draft.category,
                   override_output=hasattr(draft, 'override_save_as'),
-                  blog=True, all_articles=self.articles)
+                  blog=True, all_articles=self.articles, url=draft.url)
 
     def generate_pages(self, writer):
         """Generate the pages on the disk"""
@@ -646,7 +656,8 @@ class PagesGenerator(CachingGenerator):
                 page.save_as, self.get_template(page.template),
                 self.context, page=page,
                 relative_urls=self.settings['RELATIVE_URLS'],
-                override_output=hasattr(page, 'override_save_as'))
+                override_output=hasattr(page, 'override_save_as'),
+                url=page.url)
         signals.page_writer_finalized.send(self, writer=writer)
 
 
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 9aca550b..6996cae9 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -17,8 +17,9 @@ PaginationRule = namedtuple(
 
 
 class Paginator(object):
-    def __init__(self, name, object_list, settings):
+    def __init__(self, name, url, object_list, settings):
         self.name = name
+        self.url = url
         self.object_list = object_list
         self.settings = settings
 
@@ -37,8 +38,8 @@ class Paginator(object):
         top = bottom + self.per_page
         if top + self.orphans >= self.count:
             top = self.count
-        return Page(self.name, self.object_list[bottom:top], number, self,
-                    self.settings)
+        return Page(self.name, self.url, self.object_list[bottom:top], number,
+                    self, self.settings)
 
     def _get_count(self):
         "Returns the total number of objects, across all pages."
@@ -65,8 +66,9 @@ class Paginator(object):
 
 
 class Page(object):
-    def __init__(self, name, object_list, number, paginator, settings):
+    def __init__(self, name, url, object_list, number, paginator, settings):
         self.name, self.extension = os.path.splitext(name)
+        self.base_url = url
         self.object_list = object_list
         self.number = number
         self.paginator = paginator
@@ -134,6 +136,7 @@ class Page(object):
         # URL or SAVE_AS is a string, format it with a controlled context
         context = {
             'name': self.name.replace(os.sep, '/'),
+            'url': self.base_url,
             'object_list': self.object_list,
             'number': self.number,
             'paginator': self.paginator,
diff --git a/pelican/settings.py b/pelican/settings.py
index 417de79a..b1ec3b0f 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -93,8 +93,11 @@ DEFAULT_CONFIG = {
     'PAGINATION_PATTERNS': [
         (0, '{name}{number}{extension}', '{name}{number}{extension}'),
     ],
+    'YEAR_ARCHIVE_URL': '',
     'YEAR_ARCHIVE_SAVE_AS': '',
+    'MONTH_ARCHIVE_URL': '',
     'MONTH_ARCHIVE_SAVE_AS': '',
+    'DAY_ARCHIVE_URL': '',
     'DAY_ARCHIVE_SAVE_AS': '',
     'RELATIVE_URLS': False,
     'DEFAULT_LANG': 'en',
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 5f2151c3..1f4c895e 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -255,7 +255,7 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertEqual(sorted(categories), sorted(categories_expected))
 
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
-    def test_direct_templates_save_as_default(self):
+    def test_direct_templates_save_as_url_default(self):
 
         settings = get_settings(filenames={})
         settings['CACHE_PATH'] = self.temp_cache
@@ -266,14 +266,16 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_direct_templates(write)
         write.assert_called_with("archives.html",
                                  generator.get_template("archives"), settings,
-                                 blog=True, paginated={}, page_name='archives')
+                                 blog=True, paginated={}, page_name='archives',
+                                 url="archives.html")
 
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
-    def test_direct_templates_save_as_modified(self):
+    def test_direct_templates_save_as_url_modified(self):
 
         settings = get_settings()
         settings['DIRECT_TEMPLATES'] = ['archives']
         settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
+        settings['ARCHIVES_URL'] = 'archives/'
         settings['CACHE_PATH'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
@@ -283,7 +285,8 @@ class TestArticlesGenerator(unittest.TestCase):
         write.assert_called_with("archives/index.html",
                                  generator.get_template("archives"), settings,
                                  blog=True, paginated={},
-                                 page_name='archives/index')
+                                 page_name='archives/index',
+                                 url="archives/")
 
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_direct_templates_save_as_false(self):
@@ -321,6 +324,7 @@ class TestArticlesGenerator(unittest.TestCase):
         settings = get_settings(filenames={})
 
         settings['YEAR_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/index.html'
+        settings['YEAR_ARCHIVE_URL'] = 'posts/{date:%Y}/'
         settings['CACHE_PATH'] = self.temp_cache
         generator = ArticlesGenerator(
             context=settings, settings=settings,
@@ -335,11 +339,13 @@ class TestArticlesGenerator(unittest.TestCase):
         write.assert_called_with("posts/1970/index.html",
                                  generator.get_template("period_archives"),
                                  settings,
-                                 blog=True, dates=dates)
+                                 blog=True, dates=dates, url="posts/1970/")
 
         del settings["period"]
         settings['MONTH_ARCHIVE_SAVE_AS'] = \
             'posts/{date:%Y}/{date:%b}/index.html'
+        settings['MONTH_ARCHIVE_URL'] = \
+            'posts/{date:%Y}/{date:%b}/'
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
@@ -354,11 +360,13 @@ class TestArticlesGenerator(unittest.TestCase):
         write.assert_called_with("posts/1970/Jan/index.html",
                                  generator.get_template("period_archives"),
                                  settings,
-                                 blog=True, dates=dates)
+                                 blog=True, dates=dates, url="posts/1970/Jan/")
 
         del settings["period"]
         settings['DAY_ARCHIVE_SAVE_AS'] = \
             'posts/{date:%Y}/{date:%b}/{date:%d}/index.html'
+        settings['DAY_ARCHIVE_URL'] = \
+            'posts/{date:%Y}/{date:%b}/{date:%d}/'
         generator = ArticlesGenerator(
             context=settings, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
@@ -377,7 +385,8 @@ class TestArticlesGenerator(unittest.TestCase):
         write.assert_called_with("posts/1970/Jan/01/index.html",
                                  generator.get_template("period_archives"),
                                  settings,
-                                 blog=True, dates=dates)
+                                 blog=True, dates=dates,
+                                 url="posts/1970/Jan/01/")
         locale.setlocale(locale.LC_ALL, old_locale)
 
     def test_nonexistent_template(self):
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 903a0305..12403410 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -54,6 +54,28 @@ class TestPage(unittest.TestCase):
         self.page_kwargs['metadata']['author'] = Author('Blogger', settings)
         object_list = [Article(**self.page_kwargs),
                        Article(**self.page_kwargs)]
-        paginator = Paginator('foobar.foo', object_list, settings)
+        paginator = Paginator('foobar.foo', 'foobar/foo', object_list,
+                              settings)
         page = paginator.page(1)
         self.assertEqual(page.save_as, 'foobar.foo')
+
+    def test_custom_pagination_pattern(self):
+        from pelican.paginator import PaginationRule
+        settings = get_settings()
+        settings['PAGINATION_PATTERNS'] = [PaginationRule(*r) for r in [
+            (1, '/{url}', '{base_name}/index.html'),
+            (2, '/{url}{number}/', '{base_name}/{number}/index.html')
+        ]]
+        settings['DEFAULT_PAGINATION'] = 1
+
+        self.page_kwargs['metadata']['author'] = Author('Blogger', settings)
+        object_list = [Article(**self.page_kwargs),
+                       Article(**self.page_kwargs)]
+        paginator = Paginator('blog/index.html', '//blog.my.site/',
+                              object_list, settings)
+        page1 = paginator.page(1)
+        self.assertEqual(page1.save_as, 'blog/index.html')
+        self.assertEqual(page1.url, '//blog.my.site/')
+        page2 = paginator.page(2)
+        self.assertEqual(page2.save_as, 'blog/2/index.html')
+        self.assertEqual(page2.url, '//blog.my.site/2/')
diff --git a/pelican/writers.py b/pelican/writers.py
index fef0d5ca..6c8b97d2 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -141,7 +141,7 @@ class Writer(object):
         return feed
 
     def write_file(self, name, template, context, relative_urls=False,
-                   paginated=None, override_output=False, **kwargs):
+                   paginated=None, override_output=False, url=None, **kwargs):
         """Render the template and write the file.
 
         :param name: name of the file to output
@@ -153,6 +153,7 @@ class Writer(object):
         :param override_output: boolean telling if we can override previous
             output with the same name (and if next files written with the same
             name should be skipped to keep that one)
+        :param url: url of the file (needed by the paginator)
         :param **kwargs: additional variables to pass to the templates
         """
 
@@ -202,7 +203,7 @@ class Writer(object):
         if paginated:
 
             # pagination needed, init paginators
-            paginators = {key: Paginator(name, val, self.settings)
+            paginators = {key: Paginator(name, url, val, self.settings)
                           for key, val in paginated.items()}
 
             # generated pages, and write

From 037d9aa11b87d6f723fb58352ecab0e2830934cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 29 Oct 2017 18:24:57 +0100
Subject: [PATCH 2029/2864] Minimal documentation for the new *_ARCHIVE_URL
 settings.

---
 docs/settings.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index e5ce19f5..7f56babd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -464,14 +464,29 @@ respectively.
 
    The location to save per-year archives of your posts.
 
+.. data:: YEAR_ARCHIVE_URL = ''
+
+   The URL to use for per-year archives of your posts. Used only if you have
+   the ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
+
 .. data:: MONTH_ARCHIVE_SAVE_AS = ''
 
    The location to save per-month archives of your posts.
 
+.. data:: MONTH_ARCHIVE_URL = ''
+
+   The URL to use for per-month archives of your posts. Used only if you have
+   the ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
+
 .. data:: DAY_ARCHIVE_SAVE_AS = ''
 
    The location to save per-day archives of your posts.
 
+.. data:: DAY_ARCHIVE_URL = ''
+
+   The URL to use for per-day archives of your posts. Used only if you have the
+   ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
+
 .. data:: SLUG_SUBSTITUTIONS = ()
 
    Substitutions to make prior to stripping out non-alphanumerics when

From 30a472a8a34cff4e549128b9948c23a1943cc9c8 Mon Sep 17 00:00:00 2001
From: Benjamin ABEL <bbig26@gmail.com>
Date: Mon, 12 Feb 2018 15:14:27 +0100
Subject: [PATCH 2030/2864] [DOC] register function missing

---
 docs/plugins.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 10780b66..4e0ec6d1 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -216,6 +216,7 @@ Adding a new generator is also really easy. You might want to have a look at
         # define a new generator here if you need to
         return MyGenerator
 
-    signals.get_generators.connect(get_generators)
+    def register():
+        signals.get_generators.connect(get_generators)
 
 .. _pelican-plugins bug #314: https://github.com/getpelican/pelican-plugins/issues/314

From b6b9f2af4078030f368dbd78c52073e81c26acb0 Mon Sep 17 00:00:00 2001
From: Manel Clos <manelclos@gmail.com>
Date: Mon, 26 Feb 2018 07:29:55 +0100
Subject: [PATCH 2031/2864] Don't fail on macosx: "unknown locale: UTF-8"

---
 pelican/tools/pelican_quickstart.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 1d136a0a..4682c24a 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -23,7 +23,11 @@ import six
 from pelican import __version__
 
 locale.setlocale(locale.LC_ALL, '')
-_DEFAULT_LANGUAGE = locale.getlocale()[0]
+try:
+    _DEFAULT_LANGUAGE = locale.getlocale()[0]
+except ValueError:
+    # Don't fail on macosx: "unknown locale: UTF-8"
+    _DEFAULT_LANGUAGE = None
 if _DEFAULT_LANGUAGE is None:
     _DEFAULT_LANGUAGE = 'English'
 else:

From 4c0c2a5893008412906741de37024d4640f9ecde Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Mon, 12 Mar 2018 14:35:40 +0100
Subject: [PATCH 2032/2864] Documentation: Fix broken links

---
 docs/content.rst  | 4 ++--
 docs/settings.rst | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 9372d8b3..3eb6950d 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -535,6 +535,6 @@ metadata to include ``Status: published``.
 .. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: http://www.methods.co.nz/asciidoc/
 .. _pelican-plugins: http://github.com/getpelican/pelican-plugins
-.. _Markdown Extensions: http://pythonhosted.org/Markdown/extensions/
-.. _CodeHilite extension: http://pythonhosted.org/Markdown/extensions/code_hilite.html#syntax
+.. _Markdown Extensions: https://python-markdown.github.io/extensions/
+.. _CodeHilite extension: https://python-markdown.github.io/extensions/code_hilite/#syntax
 .. _i18n_subsites plugin: http://github.com/getpelican/pelican-plugins/tree/master/i18n_subsites
diff --git a/docs/settings.rst b/docs/settings.rst
index a1a17e47..ea7887c8 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -131,7 +131,7 @@ Basic settings
 
    Extra configuration settings for the Markdown processor. Refer to the Python
    Markdown documentation's `Options section
-   <http://pythonhosted.org/Markdown/reference.html#markdown>`_ for a complete
+   <https://python-markdown.github.io/reference/#markdown>`_ for a complete
    list of supported options. The ``extensions`` option will be automatically
    computed from the ``extension_configs`` option.
 
@@ -1032,7 +1032,7 @@ However, here are the settings that are related to themes.
    A list of paths you want Jinja2 to search for templates before searching the
    theme's ``templates/`` directory.  Allows for overriding individual theme
    template files without having to fork an existing theme.  Jinja2 searches in
-   the following order: files in ``THEME_TEMPLATES_OVERRIDES`` first, then the 
+   the following order: files in ``THEME_TEMPLATES_OVERRIDES`` first, then the
    theme's ``templates/``.
 
    You can also extend templates from the theme using the ``{% extends %}``

From beef062bb81c80fa817bbab6c1f07203cec87bbd Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 16 Mar 2018 00:36:19 +0300
Subject: [PATCH 2033/2864] Fixes #2305: Follow symlinks while copying in
 static generator

---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index ef9da23b..c1c41253 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -360,7 +360,7 @@ def copy(source, destination, ignores=None):
                            source_, destination_)
             return
 
-        for src_dir, subdirs, others in os.walk(source_):
+        for src_dir, subdirs, others in os.walk(source_, followlinks=True):
             dst_dir = os.path.join(destination_,
                                    os.path.relpath(src_dir, source_))
 

From 15c069d4110d5857cf2162e74ade9592220e26c3 Mon Sep 17 00:00:00 2001
From: Peter Desmet <peter.desmet.work@gmail.com>
Date: Thu, 15 Mar 2018 16:12:47 +0100
Subject: [PATCH 2034/2864] Import logging in LOG_FILTER examples

---
 docs/settings.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index a1a17e47..7c8da63c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1161,15 +1161,17 @@ Simply populate the list with the log messages you want to hide, and they will
 be filtered out.
 
 For example::
-
-   [(logging.WARN, 'TAG_SAVE_AS is set to False')]
+    
+   import logging
+   LOG_FILTER = [(logging.WARN, 'TAG_SAVE_AS is set to False')]
 
 It is possible to filter out messages by a template. Check out source code to
 obtain a template.
 
 For example::
 
-   [(logging.WARN, 'Empty alt attribute for image %s in %s')]
+   import logging
+   LOG_FILTER = [(logging.WARN, 'Empty alt attribute for image %s in %s')]
 
 .. Warning::
    Silencing messages by templates is a dangerous feature. It is possible to

From c160cb73cce7d002de1e869d4b660178f3b1974b Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Sun, 18 Mar 2018 12:21:56 +0100
Subject: [PATCH 2035/2864] remove hardcoded sorting of articles within
 categories, tags, authors, feeds

---
 pelican/generators.py | 27 ++++++++++++---------------
 pelican/utils.py      | 41 ++++++++++++++++++++++++-----------------
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index d93e740e..363d29cf 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -21,8 +21,9 @@ from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Article, Page, Static
 from pelican.readers import Readers
-from pelican.utils import (DateFormatter, copy, mkdir_p, posixize_path,
-                           process_translations, python_2_unicode_compatible)
+from pelican.utils import (DateFormatter, copy, mkdir_p, order_content,
+                           posixize_path, process_translations,
+                           python_2_unicode_compatible)
 
 
 logger = logging.getLogger(__name__)
@@ -300,7 +301,8 @@ class ArticlesGenerator(CachingGenerator):
             all_articles = list(self.articles)
             for article in self.articles:
                 all_articles.extend(article.translations)
-            all_articles.sort(key=attrgetter('date'), reverse=True)
+            order_content(all_articles,
+                          order_by=self.settings['ARTICLE_ORDER_BY'])
 
             if self.settings.get('FEED_ALL_ATOM'):
                 writer.write_feed(all_articles, self.context,
@@ -312,7 +314,6 @@ class ArticlesGenerator(CachingGenerator):
                                   feed_type='rss')
 
         for cat, arts in self.categories:
-            arts.sort(key=attrgetter('date'), reverse=True)
             if self.settings.get('CATEGORY_FEED_ATOM'):
                 writer.write_feed(arts, self.context,
                                   self.settings['CATEGORY_FEED_ATOM']
@@ -325,7 +326,6 @@ class ArticlesGenerator(CachingGenerator):
                                   feed_type='rss')
 
         for auth, arts in self.authors:
-            arts.sort(key=attrgetter('date'), reverse=True)
             if self.settings.get('AUTHOR_FEED_ATOM'):
                 writer.write_feed(arts, self.context,
                                   self.settings['AUTHOR_FEED_ATOM']
@@ -340,7 +340,6 @@ class ArticlesGenerator(CachingGenerator):
         if (self.settings.get('TAG_FEED_ATOM') or
                 self.settings.get('TAG_FEED_RSS')):
             for tag, arts in self.tags.items():
-                arts.sort(key=attrgetter('date'), reverse=True)
                 if self.settings.get('TAG_FEED_ATOM'):
                     writer.write_feed(arts, self.context,
                                       self.settings['TAG_FEED_ATOM']
@@ -358,7 +357,8 @@ class ArticlesGenerator(CachingGenerator):
                 translations_feeds[article.lang].append(article)
 
             for lang, items in translations_feeds.items():
-                items.sort(key=attrgetter('date'), reverse=True)
+                items = order_content(
+                    items, order_by=self.settings['ARTICLE_ORDER_BY'])
                 if self.settings.get('TRANSLATION_FEED_ATOM'):
                     writer.write_feed(
                         items, self.context,
@@ -464,7 +464,6 @@ class ArticlesGenerator(CachingGenerator):
         """Generate Tags pages."""
         tag_template = self.get_template('tag')
         for tag, articles in self.tags.items():
-            articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write(tag.save_as, tag_template, self.context, tag=tag,
                   url=tag.url, articles=articles, dates=dates,
@@ -475,7 +474,6 @@ class ArticlesGenerator(CachingGenerator):
         """Generate category pages."""
         category_template = self.get_template('category')
         for cat, articles in self.categories:
-            articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write(cat.save_as, category_template, self.context,
                   url=cat.url, category=cat, articles=articles, dates=dates,
@@ -486,7 +484,6 @@ class ArticlesGenerator(CachingGenerator):
         """Generate Author pages."""
         author_template = self.get_template('author')
         for aut, articles in self.authors:
-            articles.sort(key=attrgetter('date'), reverse=True)
             dates = [article for article in self.dates if article in articles]
             write(aut.save_as, author_template, self.context,
                   url=aut.url, author=aut, articles=articles, dates=dates,
@@ -555,8 +552,9 @@ class ArticlesGenerator(CachingGenerator):
                 all_drafts.append(article)
             self.add_source_path(article)
 
-        self.articles, self.translations = process_translations(
-            all_articles,
+        self.articles, self.translations = process_translations(all_articles)
+        self.articles = order_content(
+            self.articles,
             order_by=self.settings['ARTICLE_ORDER_BY'])
         self.drafts, self.drafts_translations = \
             process_translations(all_drafts)
@@ -652,9 +650,8 @@ class PagesGenerator(CachingGenerator):
                 hidden_pages.append(page)
             self.add_source_path(page)
 
-        self.pages, self.translations = process_translations(
-            all_pages,
-            order_by=self.settings['PAGE_ORDER_BY'])
+        self.pages, self.translations = process_translations(all_pages)
+        self.pages = order_content(self.pages, self.settings['PAGE_ORDER_BY'])
         self.hidden_pages, self.hidden_translations = \
             process_translations(hidden_pages)
 
diff --git a/pelican/utils.py b/pelican/utils.py
index ef9da23b..ab02801a 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -613,7 +613,7 @@ def escape_html(text, quote=True):
     return escape(text, quote=quote)
 
 
-def process_translations(content_list, order_by=None):
+def process_translations(content_list):
     """ Finds translation and returns them.
 
     Returns a tuple with two lists (index, translations).  Index list includes
@@ -623,14 +623,6 @@ def process_translations(content_list, order_by=None):
     the same slug have that metadata.
 
     For each content_list item, sets the 'translations' attribute.
-
-    order_by can be a string of an attribute or sorting function. If order_by
-    is defined, content will be ordered by that attribute or sorting function.
-    By default, content is ordered by slug.
-
-    Different content types can have default order_by attributes defined
-    in settings, e.g. PAGES_ORDER_BY='sort-order', in which case `sort-order`
-    should be a defined metadata attribute in each page.
     """
     content_list.sort(key=attrgetter('slug'))
     grouped_by_slugs = groupby(content_list, attrgetter('slug'))
@@ -691,10 +683,25 @@ def process_translations(content_list, order_by=None):
         for a in items:
             a.translations = [x for x in items if x != a]
 
+    return index, translations
+
+
+def order_content(content_list, order_by='slug'):
+    """ Sorts content.
+
+    order_by can be a string of an attribute or sorting function. If order_by
+    is defined, content will be ordered by that attribute or sorting function.
+    By default, content is ordered by slug.
+
+    Different content types can have default order_by attributes defined
+    in settings, e.g. PAGES_ORDER_BY='sort-order', in which case `sort-order`
+    should be a defined metadata attribute in each page.
+    """
+
     if order_by:
         if callable(order_by):
             try:
-                index.sort(key=order_by)
+                content_list.sort(key=order_by)
             except Exception:
                 logger.error('Error sorting with function %s', order_by)
         elif isinstance(order_by, six.string_types):
@@ -705,13 +712,13 @@ def process_translations(content_list, order_by=None):
                 order_reversed = False
 
             if order_by == 'basename':
-                index.sort(key=lambda x: os.path.basename(x.source_path or ''),
-                           reverse=order_reversed)
-            # already sorted by slug, no need to sort again
-            elif not (order_by == 'slug' and not order_reversed):
+                content_list.sort(
+                    key=lambda x: os.path.basename(x.source_path or ''),
+                    reverse=order_reversed)
+            else:
                 try:
-                    index.sort(key=attrgetter(order_by),
-                               reverse=order_reversed)
+                    content_list.sort(key=attrgetter(order_by),
+                                      reverse=order_reversed)
                 except AttributeError:
                     logger.warning(
                         'There is no "%s" attribute in the item '
@@ -721,7 +728,7 @@ def process_translations(content_list, order_by=None):
                 'Invalid *_ORDER_BY setting (%s).'
                 'Valid options are strings and functions.', order_by)
 
-    return index, translations
+    return content_list
 
 
 def folder_watcher(path, extensions, ignores=[]):

From fb6d44712b008fa57f9f5fee74b2624885230dc6 Mon Sep 17 00:00:00 2001
From: George Leslie-Waksman <waksman@gmail.com>
Date: Mon, 26 Mar 2018 23:59:47 -0700
Subject: [PATCH 2036/2864] Warn on missing rst document title. Fixes #2311.

---
 pelican/readers.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 8b50c044..0349e580 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -203,11 +203,18 @@ class RstReader(BaseReader):
     def __init__(self, *args, **kwargs):
         super(RstReader, self).__init__(*args, **kwargs)
 
-    def _parse_metadata(self, document):
+    def _parse_metadata(self, document, source_path):
         """Return the dict containing document metadata"""
         formatted_fields = self.settings['FORMATTED_FIELDS']
 
         output = {}
+
+        if document.first_child_matching_class(docutils.nodes.title) is None:
+            logger.warning(
+                'Document title missing in file %s: '
+                'Ensure exactly one top level section',
+                source_path)
+
         for docinfo in document.traverse(docutils.nodes.docinfo):
             for element in docinfo.children:
                 if element.tagname == 'field':  # custom fields (e.g. summary)
@@ -257,7 +264,7 @@ class RstReader(BaseReader):
         parts = pub.writer.parts
         content = parts.get('body')
 
-        metadata = self._parse_metadata(pub.document)
+        metadata = self._parse_metadata(pub.document, source_path)
         metadata.setdefault('title', parts.get('title'))
 
         return content, metadata

From e9c2409eab1d68959b16db0e69d06e4699db262a Mon Sep 17 00:00:00 2001
From: Siltaar <siltaar@d12s.fr>
Date: Thu, 29 Mar 2018 15:05:00 +0200
Subject: [PATCH 2037/2864] Allow develop_server.sh to work with paths
 containing spaces

---
 .../tools/templates/develop_server.sh.jinja2  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pelican/tools/templates/develop_server.sh.jinja2 b/pelican/tools/templates/develop_server.sh.jinja2
index b8f6c029..aa0c7672 100755
--- a/pelican/tools/templates/develop_server.sh.jinja2
+++ b/pelican/tools/templates/develop_server.sh.jinja2
@@ -7,16 +7,16 @@ PELICAN=${PELICAN:-pelican}
 PELICANOPTS={{pelicanopts}}
 
 BASEDIR=$(pwd)
-INPUTDIR=$BASEDIR/content
-OUTPUTDIR=$BASEDIR/output
-CONFFILE=$BASEDIR/pelicanconf.py
+INPUTDIR="$BASEDIR"/content
+OUTPUTDIR="$BASEDIR"/output
+CONFFILE="$BASEDIR"/pelicanconf.py
 
 ###
 # Don't change stuff below here unless you are sure
 ###
 
-SRV_PID=$BASEDIR/srv.pid
-PELICAN_PID=$BASEDIR/pelican.pid
+SRV_PID="$BASEDIR"/srv.pid
+PELICAN_PID="$BASEDIR"/pelican.pid
 
 function usage(){
   echo "usage: $0 (stop) (start) (restart) [port]"
@@ -32,7 +32,7 @@ function alive() {
 }
 
 function shut_down(){
-  PID=$(cat $SRV_PID)
+  PID=$(cat "$SRV_PID")
   if [[ $? -eq 0 ]]; then
     if alive $PID; then
       echo "Stopping HTTP server"
@@ -40,12 +40,12 @@ function shut_down(){
     else
       echo "Stale PID, deleting"
     fi
-    rm $SRV_PID
+    rm "$SRV_PID"
   else
     echo "HTTP server PIDFile not found"
   fi
 
-  PID=$(cat $PELICAN_PID)
+  PID=$(cat "$PELICAN_PID")
   if [[ $? -eq 0 ]]; then
     if alive $PID; then
       echo "Killing Pelican"
@@ -53,7 +53,7 @@ function shut_down(){
     else
       echo "Stale PID, deleting"
     fi
-    rm $PELICAN_PID
+    rm "$PELICAN_PID"
   else
     echo "Pelican PIDFile not found"
   fi
@@ -63,14 +63,14 @@ function start_up(){
   local port=$1
   echo "Starting up Pelican and HTTP server"
   shift
-  $PELICAN --debug --autoreload -r $INPUTDIR -o $OUTPUTDIR -s $CONFFILE $PELICANOPTS &
+  $PELICAN --debug --autoreload -r "$INPUT"DIR -o "$OUTPUT"DIR -s "$CONFFILE" $PELICANOPTS &
   pelican_pid=$!
-  echo $pelican_pid > $PELICAN_PID
-  mkdir -p $OUTPUTDIR && cd $OUTPUTDIR
+  echo $pelican_pid > "$PELICAN_PID"
+  mkdir -p "$OUTPUT"DIR && cd "$OUTPUT"DIR
   $PY -m pelican.server $port &
   srv_pid=$!
-  echo $srv_pid > $SRV_PID
-  cd $BASEDIR
+  echo $srv_pid > "$SRV_PID"
+  cd "$BASEDIR"
   sleep 1
   if ! alive $pelican_pid ; then
     echo "Pelican didn't start. Is the Pelican package installed?"

From 9e035ed7272f07785316c60d03901f1534642d66 Mon Sep 17 00:00:00 2001
From: Siltaar <siltaar@d12s.fr>
Date: Thu, 29 Mar 2018 15:20:10 +0200
Subject: [PATCH 2038/2864] fix ""DIR

---
 pelican/tools/templates/develop_server.sh.jinja2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/templates/develop_server.sh.jinja2 b/pelican/tools/templates/develop_server.sh.jinja2
index aa0c7672..7d20fd22 100755
--- a/pelican/tools/templates/develop_server.sh.jinja2
+++ b/pelican/tools/templates/develop_server.sh.jinja2
@@ -63,10 +63,10 @@ function start_up(){
   local port=$1
   echo "Starting up Pelican and HTTP server"
   shift
-  $PELICAN --debug --autoreload -r "$INPUT"DIR -o "$OUTPUT"DIR -s "$CONFFILE" $PELICANOPTS &
+  $PELICAN --debug --autoreload -r "$INPUT"DIR -o "$OUTPUTDIR" -s "$CONFFILE" $PELICANOPTS &
   pelican_pid=$!
   echo $pelican_pid > "$PELICAN_PID"
-  mkdir -p "$OUTPUT"DIR && cd "$OUTPUT"DIR
+  mkdir -p "$OUTPUTDIR" && cd "$OUTPUTDIR"
   $PY -m pelican.server $port &
   srv_pid=$!
   echo $srv_pid > "$SRV_PID"

From 557e614083b1a3c3572d23e9e7f4bd9cd29e2287 Mon Sep 17 00:00:00 2001
From: Nicolas Le Manchet <nicolas@lemanchet.fr>
Date: Thu, 29 Mar 2018 21:28:16 +0200
Subject: [PATCH 2039/2864] Replace deprecated "PAGES" variable by "pages"

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 11c44697..0ae26ca4 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1058,7 +1058,7 @@ Ordering content
 
 .. data:: PAGE_ORDER_BY = 'basename'
 
-   Defines how the pages (``PAGES`` variable in the template) are sorted.
+   Defines how the pages (``pages`` variable in the template) are sorted.
    Options are same as ``ARTICLE_ORDER_BY``.  The default value, ``'basename'``
    will sort pages by their basename.
 

From 3f8af1ab765a3ae570de1e61d0fc7388dbba86e5 Mon Sep 17 00:00:00 2001
From: Giorgio <hi@gdelgado.ca>
Date: Sun, 1 Apr 2018 21:25:41 -0400
Subject: [PATCH 2040/2864] List reserved metadata keywords

Addresses https://github.com/getpelican/pelican/issues/2279
---
 docs/content.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/content.rst b/docs/content.rst
index 3eb6950d..8e9fd65f 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -70,6 +70,19 @@ Metadata syntax for Markdown posts should follow this pattern::
 
     This is the content of my super blog post.
 
+You can also have your own metadata keys (so long as they don't conflict with reserved metadata keywords) for use in your python templates. The following is the list of reserved metadata keywords:
+
+* `Title`
+* `Tags`
+* `Date`
+* `Modified`
+* `Status`
+* `Category`
+* `Author`
+* `Authors`
+* `Slug`
+* `Summary`
+
 Readers for additional formats (such as AsciiDoc_) are available via plugins.
 Refer to `pelican-plugins`_ repository for those.
 

From 859e7af8c71253e6dc111a174958bd91ac37d650 Mon Sep 17 00:00:00 2001
From: Giorgio <hi@gdelgado.ca>
Date: Mon, 2 Apr 2018 20:45:27 -0400
Subject: [PATCH 2041/2864] Add template, save_as and url to list

---
 docs/content.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/content.rst b/docs/content.rst
index 8e9fd65f..2c88741d 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -82,6 +82,9 @@ You can also have your own metadata keys (so long as they don't conflict with re
 * `Authors`
 * `Slug`
 * `Summary`
+* `Template`
+* `Save_as`
+* `Url`
 
 Readers for additional formats (such as AsciiDoc_) are available via plugins.
 Refer to `pelican-plugins`_ repository for those.

From 16d5236e62c316fe8be577976c394d13892003a8 Mon Sep 17 00:00:00 2001
From: Eli Bendersky <eliben@gmail.com>
Date: Thu, 6 Oct 2016 19:55:56 -0700
Subject: [PATCH 2042/2864] Try to rstrip '/' from the address in the server
 script when serving pages.

---
 pelican/server.py | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pelican/server.py b/pelican/server.py
index ad68a3bc..f3d59111 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -16,28 +16,35 @@ from six.moves import socketserver
 
 class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
     SUFFIXES = ['', '.html', '/index.html']
+    RSTRIP_PATTERNS = ['', '/']
 
     def do_GET(self):
         # cut off a query string
         if '?' in self.path:
             self.path, _ = self.path.split('?', 1)
 
-        # Try to detect file by applying various suffixes
-        for suffix in self.SUFFIXES:
-            if not hasattr(self, 'original_path'):
-                self.original_path = self.path
-
-            self.path = self.original_path + suffix
-            path = self.translate_path(self.path)
-
-            if os.path.exists(path):
-                srvmod.SimpleHTTPRequestHandler.do_GET(self)
-                logging.info("Found `%s`." % self.path)
+        found = False
+        # Try to detect file by applying various suffixes and stripping
+        # patterns.
+        for rstrip_pattern in self.RSTRIP_PATTERNS:
+            if found:
                 break
+            for suffix in self.SUFFIXES:
+                if not hasattr(self, 'original_path'):
+                    self.original_path = self.path
 
-            logging.info("Tried to find `%s`, but it doesn't exist.",
-                         self.path)
-        else:
+                self.path = self.original_path.rstrip(rstrip_pattern) + suffix
+                path = self.translate_path(self.path)
+
+                if os.path.exists(path):
+                    srvmod.SimpleHTTPRequestHandler.do_GET(self)
+                    logging.info("Found `%s`.", self.path)
+                    found = True
+                    break
+
+                logging.info("Tried to find `%s`, but it doesn't exist.", path)
+
+        if not found:
             # Fallback if there were no matches
             logging.warning("Unable to find `%s` or variations.",
                             self.original_path)

From 12db9ba0e1b06bc594094ab5790dded82ab93a5e Mon Sep 17 00:00:00 2001
From: Anthony Metzidis <anthony.metzidis@gmail.com>
Date: Tue, 26 Dec 2017 16:36:45 -0800
Subject: [PATCH 2043/2864] support ssl in pelican.server with --ssl, --cert &
 --key

---
 .gitignore        |  3 +++
 docs/tips.rst     | 22 ++++++++++++++++++++++
 pelican/server.py | 42 ++++++++++++++++++++++++++++++++++++------
 3 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ae0e9f6..45946946 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ tags
 htmlcov
 six-*.egg/
 *.orig
+venv
+samples/output
+*.pem
diff --git a/docs/tips.rst b/docs/tips.rst
index 50160380..4e89d148 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -147,3 +147,25 @@ embed videos in the markup. You can use `reST video directive
 <https://gist.github.com/dbrgn/2922648>`_ for reST or `mdx_video plugin
 <https://github.com/italomaia/mdx-video>`_ for Markdown.
 
+
+Develop Locally Using SSL
+==================================
+
+Here's how you can set up your local pelican server to support SSL.
+
+First, create a self-signed certificate and key using ``openssl`` (this creates ``cert.pem`` and ``key.pem``)::
+
+    $ openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 -nodes
+
+And use this command to launch the server (the server starts within your ``output`` directory)::
+
+    python -m pelican.server 8443 --key=../key.pem --cert=../cert.pem
+
+If you are using ``develop-server.sh``,  add this to the top::
+
+    CERT="$BASEDIR/cert.pem"
+    KEY="$BASEDIR/key.pem"
+
+and modify the ``pelican.server`` line as follows::
+
+    $PY -m pelican.server $port --ssl --cert="$CERT" --key="$KEY" &
\ No newline at end of file
diff --git a/pelican/server.py b/pelican/server.py
index ad68a3bc..7e74421b 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function, unicode_literals
 
+import argparse
 import logging
 import os
+import ssl
 import sys
 
 try:
@@ -14,6 +16,26 @@ from six.moves import SimpleHTTPServer as srvmod
 from six.moves import socketserver
 
 
+def parse_arguments():
+    parser = argparse.ArgumentParser(
+        description='Pelican Development Server',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter
+    )
+    parser.add_argument("port", default=8000, type=int, nargs="?",
+                        help="Port to Listen On")
+    parser.add_argument("server", default="", nargs="?",
+                        help="Interface to Listen On")
+    parser.add_argument('--ssl', action="store_true",
+                        help='Activate SSL listener')
+    parser.add_argument('--cert', default="./cert.pem", nargs="?",
+                        help='Path to certificate file. ' +
+                        'Relative to current directory')
+    parser.add_argument('--key', default="./key.pem", nargs="?",
+                        help='Path to certificate key file. ' +
+                        'Relative to current directory')
+    return parser.parse_args()
+
+
 class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
     SUFFIXES = ['', '.html', '/index.html']
 
@@ -55,18 +77,26 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
 
 
 if __name__ == '__main__':
-    PORT = len(sys.argv) in (2, 3) and int(sys.argv[1]) or 8000
-    SERVER = len(sys.argv) == 3 and sys.argv[2] or ""
-
+    args = parse_arguments()
     socketserver.TCPServer.allow_reuse_address = True
     try:
         httpd = socketserver.TCPServer(
-            (SERVER, PORT), ComplexHTTPRequestHandler)
+            (args.server, args.port),
+            ComplexHTTPRequestHandler)
+        if args.ssl:
+            httpd.socket = ssl.wrap_socket(
+                httpd.socket, keyfile=args.key,
+                certfile=args.cert, server_side=True)
+    except ssl.SSLError as e:
+        logging.error("Couldn't open certificate file %s or key file %s",
+                      args.cert, args.key)
     except OSError as e:
-        logging.error("Could not listen on port %s, server %s.", PORT, SERVER)
+        logging.error("Could not listen on port %s, server %s.",
+                      args.port, args.server)
         sys.exit(getattr(e, 'exitcode', 1))
 
-    logging.info("Serving at port %s, server %s.", PORT, SERVER)
+    logging.info("Serving at port %s, server %s.",
+                 args.port, args.server)
     try:
         httpd.serve_forever()
     except KeyboardInterrupt as e:

From 544b35fba5f33c90de1d9612bf776de115c64e5a Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Wed, 11 Apr 2018 19:08:33 +0200
Subject: [PATCH 2044/2864] Update setup.py

- Add license metadata
- Add `Programming Language :: Python :: 3.7` classifier
- Use HTTPS in the website link
---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index c8ab9e30..06da7628 100755
--- a/setup.py
+++ b/setup.py
@@ -29,12 +29,13 @@ if sys.version_info.major < 3:
 setup(
     name='pelican',
     version='3.7.2.dev0',
-    url='http://getpelican.com/',
+    url='https://getpelican.com/',
     author='Alexis Metaireau',
     maintainer='Justin Mayer',
     author_email='authors@getpelican.com',
     description="Static site generator supporting reStructuredText and "
                 "Markdown source content.",
+    license='AGPLv3',
     long_description=description,
     packages=['pelican', 'pelican.tools'],
     package_data={
@@ -64,6 +65,7 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries :: Python Modules',

From 80027bc71426679d02dafa205b48b606d2a4b7cc Mon Sep 17 00:00:00 2001
From: Alexandre Bonnetain <shir0kamii@gmail.com>
Date: Wed, 13 Jun 2018 00:20:55 +0000
Subject: [PATCH 2045/2864] Clean simple theme

---
 pelican/tests/output/basic/categories.html    | 10 +++++-----
 pelican/tests/output/custom/categories.html   | 10 +++++-----
 .../output/custom_locale/categories.html      | 10 +++++-----
 pelican/themes/simple/templates/archives.html |  3 +++
 pelican/themes/simple/templates/article.html  | 20 +++++++++++++++++--
 pelican/themes/simple/templates/author.html   |  1 +
 .../themes/simple/templates/categories.html   |  7 +++++--
 pelican/themes/simple/templates/category.html |  3 +++
 pelican/themes/simple/templates/page.html     | 14 +++++++------
 .../simple/templates/period_archives.html     |  3 +++
 pelican/themes/simple/templates/tag.html      |  7 +++++++
 11 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index b1c0e932..e5a6a429 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
-        <title>A Pelican Blog</title>
+        <title>A Pelican Blog - Categories</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
 </head>
@@ -21,10 +21,10 @@
                 </ul></nav>
         </header><!-- /#banner -->
 <ul>
-    <li><a href="/category/bar.html">bar</a></li>
-    <li><a href="/category/cat1.html">cat1</a></li>
-    <li><a href="/category/misc.html">misc</a></li>
-    <li><a href="/category/yeah.html">yeah</a></li>
+    <li><a href="/category/bar.html">bar</a> (1)</li>
+    <li><a href="/category/cat1.html">cat1</a> (4)</li>
+    <li><a href="/category/misc.html">misc</a> (4)</li>
+    <li><a href="/category/yeah.html">yeah</a> (1)</li>
 </ul>
         <section id="extras" class="body">
                 <div class="social">
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 1d802b29..ad887b7b 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
-        <title>Alexis' log</title>
+        <title>Alexis' log - Categories</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
@@ -25,10 +25,10 @@
                 </ul></nav>
         </header><!-- /#banner -->
 <ul>
-    <li><a href="./category/yeah.html">yeah</a></li>
-    <li><a href="./category/misc.html">misc</a></li>
-    <li><a href="./category/cat1.html">cat1</a></li>
-    <li><a href="./category/bar.html">bar</a></li>
+    <li><a href="./category/bar.html">bar</a> (1)</li>
+    <li><a href="./category/cat1.html">cat1</a> (4)</li>
+    <li><a href="./category/misc.html">misc</a> (4)</li>
+    <li><a href="./category/yeah.html">yeah</a> (1)</li>
 </ul>
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index a4728315..694a2bd6 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
-        <title>Alexis' log</title>
+        <title>Alexis' log - Categories</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
@@ -25,10 +25,10 @@
                 </ul></nav>
         </header><!-- /#banner -->
 <ul>
-    <li><a href="./category/yeah.html">yeah</a></li>
-    <li><a href="./category/misc.html">misc</a></li>
-    <li><a href="./category/cat1.html">cat1</a></li>
-    <li><a href="./category/bar.html">bar</a></li>
+    <li><a href="./category/bar.html">bar</a> (1)</li>
+    <li><a href="./category/cat1.html">cat1</a> (4)</li>
+    <li><a href="./category/misc.html">misc</a> (4)</li>
+    <li><a href="./category/yeah.html">yeah</a> (1)</li>
 </ul>
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/themes/simple/templates/archives.html b/pelican/themes/simple/templates/archives.html
index 050f2686..cd129507 100644
--- a/pelican/themes/simple/templates/archives.html
+++ b/pelican/themes/simple/templates/archives.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - Archives{% endblock %}
+
 {% block content %}
 <h1>Archives for {{ SITENAME }}</h1>
 
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index fb01b337..9dcf1bc2 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - {{ article.title }}{% endblock %}
+
 {% block head %}
   {{ super() }}
   {% if article.description %}
@@ -24,17 +27,30 @@
     <time class="published" datetime="{{ article.date.isoformat() }}">
       {{ article.locale_date }}
     </time>
-	{% if article.modified %}
+    {% if article.modified %}
     <time class="modified" datetime="{{ article.modified.isoformat() }}">
       {{ article.locale_modified }}
     </time>
-	{% endif %}
+    {% endif %}
     {% if article.authors %}
     <address class="vcard author">
       By {% for author in article.authors %}
           <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
         {% endfor %}
     </address>
+    {% if article.category %}
+    <div class="category">
+        Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
+    </div>
+    {% endif %}
+    {% if article.tags %}
+    <div class="tags">
+        Tags:
+        {% for tag in article.tags %}
+            <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>
+        {% endfor %}
+    </div>
+    {% endif %}
     {% endif %}
   </footer><!-- /.post-info -->
   <div class="entry-content">
diff --git a/pelican/themes/simple/templates/author.html b/pelican/themes/simple/templates/author.html
index e9f78702..a1901946 100644
--- a/pelican/themes/simple/templates/author.html
+++ b/pelican/themes/simple/templates/author.html
@@ -1,6 +1,7 @@
 {% extends "index.html" %}
 
 {% block title %}{{ SITENAME }} - Articles by {{ author }}{% endblock %}
+
 {% block content_title %}
 <h2>Articles by {{ author }}</h2>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/categories.html b/pelican/themes/simple/templates/categories.html
index e29be0ca..ec138480 100644
--- a/pelican/themes/simple/templates/categories.html
+++ b/pelican/themes/simple/templates/categories.html
@@ -1,8 +1,11 @@
 {% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - Categories{% endblock %}
+
 {% block content %}
 <ul>
-{% for category, articles in categories %}
-    <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
+{% for category, articles in categories|sort %}
+    <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
 {% endfor %}
 </ul>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/category.html b/pelican/themes/simple/templates/category.html
index 4e6fd24e..14d7ff09 100644
--- a/pelican/themes/simple/templates/category.html
+++ b/pelican/themes/simple/templates/category.html
@@ -1,4 +1,7 @@
 {% extends "index.html" %}
+
+{% block title %}{{ SITENAME }} - {{ category }} category{% endblock %}
+
 {% block content_title %}
 <h2>Articles in the {{ category }} category</h2>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
index 5ceb7796..999dd841 100644
--- a/pelican/themes/simple/templates/page.html
+++ b/pelican/themes/simple/templates/page.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
-{% block title %}{{ page.title }}{%endblock%}
+
+{% block title %}{{ SITENAME }} - {{ page.title }}{%endblock%}
+
 {% block content %}
     <h1>{{ page.title }}</h1>
     {% import 'translations.html' as translations with context %}
@@ -7,9 +9,9 @@
 
     {{ page.content }}
 
-	{% if page.modified %}
-		<p>
-		Last updated: {{ page.locale_modified }}
-		</p>
-	{% endif %}
+    {% if page.modified %}
+        <p>
+        Last updated: {{ page.locale_modified }}
+        </p>
+    {% endif %}
 {% endblock %}
diff --git a/pelican/themes/simple/templates/period_archives.html b/pelican/themes/simple/templates/period_archives.html
index d930dbbb..e1ddf626 100644
--- a/pelican/themes/simple/templates/period_archives.html
+++ b/pelican/themes/simple/templates/period_archives.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - {{ period | reverse | join(' ') }} archives{% endblock %}
+
 {% block content %}
 <h1>Archives for {{ period | reverse | join(' ') }}</h1>
 
diff --git a/pelican/themes/simple/templates/tag.html b/pelican/themes/simple/templates/tag.html
index e69de29b..9c958030 100644
--- a/pelican/themes/simple/templates/tag.html
+++ b/pelican/themes/simple/templates/tag.html
@@ -0,0 +1,7 @@
+{% extends "index.html" %}
+
+{% block title %}{{ SITENAME }} - {{ tag }} tag{% endblock %}
+
+{% block content_title %}
+<h2>Articles tagged with {{ tag }}</h2>
+{% endblock %}

From 8ef9d11bc40721e422b315258c7460776644a9bb Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Thu, 21 Jun 2018 15:03:00 +0200
Subject: [PATCH 2046/2864] Clarify contribution guidelines

---
 CONTRIBUTING.rst    |  12 +++--
 docs/contribute.rst | 107 +++++++++++++++++++++++---------------------
 2 files changed, 65 insertions(+), 54 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 27002bdd..26ae338a 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -114,15 +114,21 @@ Using Git and GitHub
   `install hub <https://github.com/github/hub/#installation>`_ and then run
   `hub pull-request <https://github.com/github/hub/#git-pull-request>`_ to
   turn your GitHub issue into a pull request containing your code.
+* After you have issued a pull request, Travis will run the test suite for all
+  supported Python versions and check for PEP8 compliance. If any of these
+  checks fail, you should fix them. (If tests fail on Travis but seem to pass
+  locally, ensure that local test runs aren't skipping any tests.)
 
 Contribution quality standards
 ------------------------------
 
-* Adhere to `PEP8 coding standards`_ whenever possible. This can be eased via
-  the `pep8 <http://pypi.python.org/pypi/pep8>`_ or `flake8
+* Adhere to `PEP8 coding standards`_. This can be eased via the `pycodestyle
+  <https://pypi.org/project/pycodestyle>`_ or `flake8
   <http://pypi.python.org/pypi/flake8/>`_ tools, the latter of which in
   particular will give you some useful hints about ways in which the
-  code/formatting can be improved.
+  code/formatting can be improved. If you are relying on your editor for PEP8
+  compliance, note that the line length specified by PEP8 is 79 (excluding the
+  line break).
 * Ensure your code is compatible with the latest Python 2.7 and 3.x releases — see our
   `compatibility cheatsheet`_ for more details.
 * Add docs and tests for your changes. Undocumented and untested features will
diff --git a/docs/contribute.rst b/docs/contribute.rst
index be5325a0..cbaa8ab9 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -14,32 +14,32 @@ When doing so, please adhere to the following guidelines.
 Setting up the development environment
 ======================================
 
-While there are many ways to set up one's development environment, following
-is a method that uses `virtualenv <https://virtualenv.pypa.io/en/stable/>`_.
+While there are many ways to set up one's development environment, we recommend
+using `Virtualenv <https://virtualenv.pypa.io/en/stable/>`_. This tool allows
+you to set up separate environments for separate Python projects that are
+isolated from one another so you can use different packages (and package
+versions) for each.
+
 If you don't have ``virtualenv`` installed, you can install it via::
 
     $ pip install virtualenv
 
-Virtual environments allow you to work on Python projects which are isolated
-from one another so you can use different packages (and package versions) with
-different projects.
-
-To create and activate a virtual environment, use the following syntax::
+Use ``virtualenv`` to create and activate a virtual environment::
 
     $ virtualenv ~/virtualenvs/pelican
     $ cd ~/virtualenvs/pelican
     $ . bin/activate
 
-To clone the Pelican source::
+Clone the Pelican source into a subfolder called ``src/pelican``::
 
     $ git clone https://github.com/getpelican/pelican.git src/pelican
-
-To install the development dependencies::
-
     $ cd src/pelican
+
+Install the development dependencies::
+
     $ pip install -r requirements/developer.pip
 
-To install Pelican and its dependencies::
+Install Pelican and its dependencies::
 
     $ python setup.py develop
 
@@ -47,7 +47,8 @@ Or using ``pip``::
 
     $ pip install -e .
 
-To conveniently test on multiple Python versions, we also provide a .tox file.
+To conveniently test on multiple Python versions, we also provide a ``.tox``
+file.
 
 
 Building the docs
@@ -57,7 +58,7 @@ If you make changes to the documentation, you should preview your changes
 before committing them::
 
     $ pip install -r requirements/docs.pip
-    $ cd src/pelican/docs
+    $ cd docs
     $ make html
 
 Open ``_build/html/index.html`` in your browser to preview the documentation.
@@ -89,56 +90,60 @@ functional tests. To do so, **make sure you have both ``en_EN.utf8`` and
     $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/basic/ \
         samples/content/
 
-Testing on Python 2 and 3
--------------------------
+You may also find that some tests are skipped because some dependency (e.g.,
+Pandoc) is not installed. This does not automatically mean that these tests
+have passed; you should at least verify that any skipped tests are not
+affected by your changes.
 
-Testing on Python 3 currently requires some extra steps: installing
-Python 3-compatible versions of dependent packages and plugins.
+You should run the test suite under each of the supported versions of Python.
+This is best done by creating a separate Python environment for each version.
+Tox_ is a useful tool to automate running tests inside ``virtualenv``
+environments.
 
-Tox_ is a useful tool to run tests on both versions. It will install the
-Python 3-compatible version of dependent packages.
+.. _Tox: https://tox.readthedocs.io/en/latest/
 
-.. _Tox: http://testrun.org/tox/latest/
+Python 2/3 compatibility development tips
+=========================================
 
-Python 3 development tips
-=========================
+Here are some tips that may be useful for writing code that is compatible with
+both Python 2.7 and Python 3:
 
-Here are some tips that may be useful when doing some code for both Python 2.7
-and Python 3 at the same time:
+- Use new syntax. For example:
 
-- Assume every string and literal is unicode (import unicode_literals):
+  - ``print .. -> print(..)``
+  - ``except .., e -> except .. as e``
 
-  - Do not use prefix ``u'``.
-  - Do not encode/decode strings in the middle of sth. Follow the code to the
-    source (or target) of a string and encode/decode at the first/last possible
-    point.
-  - In other words, write your functions to expect and to return unicode.
-  - Encode/decode strings if e.g. the source is a Python function that is known
-    to handle this badly, e.g. strftime() in Python 2.
+- Use new methods. For example:
 
-- Use new syntax: print function, "except ... *as* e" (not comma), etc.
-- Refactor method calls like ``dict.iteritems()``, ``xrange()``, etc. in a way
-  that runs without code change in both Python versions.
-- Do not use magic method ``__unicode()__`` in new classes. Use only ``__str()__``
-  and decorate the class with ``@python_2_unicode_compatible``.
-- Do not start int literals with a zero. This is a syntax error in Py3k.
-- Unfortunately I did not find an octal notation that is valid in both
-  Pythons. Use decimal instead.
-- use six, e.g.:
+  - ``dict.iteritems() -> dict.items()``
+  - ``xrange(..) - > list(range(..))``
+
+- Use ``six`` where necessary. For example:
 
   - ``isinstance(.., basestring) -> isinstance(.., six.string_types)``
   - ``isinstance(.., unicode) -> isinstance(.., six.text_type)``
 
-- ``setlocale()`` in Python 2 bails when we give the locale name as unicode,
+- Assume every string and literal is Unicode:
+
+  - Use ``from __future__ import unicode_literals``
+  - Do not use the prefix ``u'`` before strings.
+  - Do not encode/decode strings in the middle of something. Follow the code to
+    the source/target of a string and encode/decode at the first/last possible
+    point.
+  - In particular, write your functions to expect and to return Unicode.
+  - Encode/decode strings if the string is the output of a Python function that
+    is known to handle this badly. For example, ``strftime()`` in Python 2.
+  - Do not use the magic method ``__unicode()__`` in new classes. Use only
+    ``__str()__`` and decorate the class with ``@python_2_unicode_compatible``.
+
+- ``setlocale()`` in Python 2 fails when we give the locale name as Unicode,
   and since we are using ``from __future__ import unicode_literals``, we do
-  that everywhere!  As a workaround, I enclosed the localename with ``str()``;
-  in Python 2 this casts the name to a byte string, in Python 3 this should do
-  nothing, because the locale name already had been unicode.
-
-- Kept range() almost everywhere as-is (2to3 suggests list(range())), just
-  changed it where I felt necessary.
-
-- Changed xrange() back to range(), so it is valid in both Python versions.
+  that everywhere! As a workaround, enclose the locale name with ``str()``;
+  in Python 2 this casts the name to a byte string, while in Python 3 this
+  should do nothing, because the locale name was already Unicode.
+- Do not start integer literals with a zero. This is a syntax error in Python 3.
+- Unfortunately there seems to be no octal notation that is valid in both
+  Python 2 and 3. Use decimal notation instead.
 
 
 Logging tips

From 20b39dc761376488bb690ff8c76abcd4dc70c371 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 21 Jun 2018 17:40:58 +0200
Subject: [PATCH 2047/2864] Fix code-in-bold-text rendering in Contribute docs

---
 docs/contribute.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index cbaa8ab9..35e9797d 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -80,8 +80,8 @@ mentioning that "some generated files differ from the expected functional tests
 output." If you have made changes that affect the HTML output generated by
 Pelican, and the changes to that output are expected and deemed correct given
 the nature of your changes, then you should update the output used by the
-functional tests. To do so, **make sure you have both ``en_EN.utf8`` and
-``fr_FR.utf8`` locales installed**, and then run the following two commands::
+functional tests. To do so, **make sure you have both** ``en_EN.utf8`` **and**
+``fr_FR.utf8`` **locales installed**, and then run the following two commands::
 
     $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/custom/ \
         -s samples/pelican.conf.py samples/content/

From ee24ad1821774db2bfb199100eced17270a961d3 Mon Sep 17 00:00:00 2001
From: Adrin Jalali <adrin.jalali@gmail.com>
Date: Fri, 22 Jun 2018 15:00:21 +0200
Subject: [PATCH 2048/2864] Elaborate the warning message when no files are
 processed by readers. (#2310)

Elaborate warning message when no files are processed by readers
---
 pelican/__init__.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 94012e70..87d8bc24 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -403,6 +403,11 @@ def main():
     try:
         pelican, settings = get_instance(args)
         readers = Readers(settings)
+        reader_descs = sorted(set(['%s (%s)' %
+                                   (type(r).__name__,
+                                    ', '.join(r.file_extensions))
+                                   for r in readers.readers.values()
+                                   if r.enabled]))
 
         watchers = {'content': folder_watcher(pelican.path,
                                               readers.extensions,
@@ -467,7 +472,10 @@ def main():
                             ', '.join(k for k, v in modified.items() if v)))
 
                         if modified['content'] is None:
-                            logger.warning('No valid files found in content.')
+                            logger.warning(
+                                'No valid files found in content for '
+                                + 'the active readers:\n'
+                                + '\n'.join(reader_descs))
 
                         if modified['theme'] is None:
                             logger.warning('Empty theme folder. Using `basic` '
@@ -490,7 +498,10 @@ def main():
 
         else:
             if next(watchers['content']) is None:
-                logger.warning('No valid files found in content.')
+                logger.warning(
+                    'No valid files found in content for '
+                    + 'the active readers:\n'
+                    + '\n'.join(reader_descs))
 
             if next(watchers['theme']) is None:
                 logger.warning('Empty theme folder. Using `basic` theme.')

From a5edbf8546b1f0b1ede6e782041d843df58860f9 Mon Sep 17 00:00:00 2001
From: Johannes 'josch' Schauer <josch@mister-muffin.de>
Date: Mon, 10 Jul 2017 16:59:35 +0200
Subject: [PATCH 2049/2864] Remove develop_server.sh in favour of pelican
 serving static files itself

Competing static site generators integrate the functionality of regenerating
content and serving it into their main executable. In pelican this
functionality used to be in an external script `develop_server.sh` which
resides in the blog base directory. This has the disadvantage that changes in
pelican can break the `develop_server.sh` scripts which will not automatically
be upgraded together with pelican by package managers. Thus, pelican should
integrate this functionality into its main executable.

To this end, this commit removes `develop_server.sh` and adds three command
line options to the pelican executable:

 * `-l/--listen` starts the HTTP server (`-s/--serve` was already taken)
 * `-p/--port` specifies the port to listen at
 * `-b/--bind` specifies the IP to bind to

`--listen` and `--autoreload` can be used together to achieve the same
effect that other static site generators offer: Serve files via HTTP
while at the same time auto-generating the content.

Since the `develop_server.sh` script was removed, pelican-quickstart looses the
`develop` option.

Since the `develop_server.sh` script was removed, the Makefile looses the
`stopserver` target and the `devserver` target is replaced by running `pelican
-l` in the foreground.

Since pelican now offers the `--listen` option, the fabfile uses that instead
of starting the socketserver itself.
---
 docs/install.rst                              |   1 -
 docs/publish.rst                              |   5 +-
 docs/quickstart.rst                           |   7 +-
 docs/settings.rst                             |   9 +
 pelican/__init__.py                           | 208 ++++++++++++------
 pelican/server.py                             |  38 +++-
 pelican/settings.py                           |   2 +
 pelican/tools/pelican_quickstart.py           |  25 ---
 pelican/tools/templates/Makefile.jinja2       |  20 +-
 .../tools/templates/develop_server.sh.jinja2  | 103 ---------
 pelican/tools/templates/fabfile.py.jinja2     |  18 +-
 11 files changed, 199 insertions(+), 237 deletions(-)
 delete mode 100755 pelican/tools/templates/develop_server.sh.jinja2

diff --git a/docs/install.rst b/docs/install.rst
index 02470f62..8075632f 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -103,7 +103,6 @@ can optionally add yourself if you plan to create non-chronological content)::
     ├── content
     │   └── (pages)
     ├── output
-    ├── develop_server.sh
     ├── fabfile.py
     ├── Makefile
     ├── pelicanconf.py       # Main settings file
diff --git a/docs/publish.rst b/docs/publish.rst
index a9b0ec39..7fb4b587 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -201,10 +201,7 @@ separate terminal sessions, but you can run both at once via::
     make devserver
 
 The above command will simultaneously run Pelican in regeneration mode as well
-as serve the output at http://localhost:8000. Once you are done testing your
-changes, you should stop the development server via::
-
-    ./develop_server.sh stop
+as serve the output at http://localhost:8000.
 
 When you're ready to publish your site, you can upload it via the method(s) you
 chose during the ``pelican-quickstart`` questionnaire. For this example, we'll
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 752c1857..022322c1 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -61,11 +61,10 @@ ignored for now.)
 Preview your site
 -----------------
 
-Open a new terminal session and run the following commands to switch to your
-``output`` directory and launch Pelican's web server::
+Open a new terminal session, navigate to your site directory and run the
+following command to launch Pelican's web server::
 
-    cd ~/projects/yoursite/output
-    python -m pelican.server
+    pelican --listen
 
 Preview your site by navigating to http://localhost:8000/ in your browser.
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 0ae26ca4..dbd960d5 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -328,6 +328,15 @@ Basic settings
    A list of metadata fields containing reST/Markdown content to be parsed and
    translated to HTML.
 
+.. data:: PORT = 8000
+
+   The TCP port to serve content from the output folder via HTTP when pelican
+   is run with --listen
+
+.. data:: BIND = ''
+
+   The IP to which to bind the HTTP server.
+
 
 URL settings
 ============
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 87d8bc24..8dfbb7ba 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -5,10 +5,12 @@ import argparse
 import collections
 import locale
 import logging
+import multiprocessing
 import os
 import re
 import sys
 import time
+import traceback
 
 import six
 
@@ -20,6 +22,7 @@ from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 SourceFileGenerator, StaticGenerator,
                                 TemplatePagesGenerator)
 from pelican.readers import Readers
+from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import read_settings
 from pelican.utils import (clean_output_dir, file_watcher,
                            folder_watcher, maybe_pluralize)
@@ -336,7 +339,24 @@ def parse_arguments():
                         help=('Only enable log de-duplication for levels equal'
                               ' to or above the specified value'))
 
-    return parser.parse_args()
+    parser.add_argument('-l', '--listen', dest='listen', action='store_true',
+                        help='Serve content files via HTTP and port 8000.')
+
+    parser.add_argument('-p', '--port', dest='port', type=int,
+                        help='Port to serve HTTP files at. (default: 8000)')
+
+    parser.add_argument('-b', '--bind', dest='bind',
+                        help='IP to bind to when serving files via HTTP '
+                        '(default: 127.0.0.1)')
+
+    args = parser.parse_args()
+
+    if args.port is not None and not args.listen:
+        logger.warning('--port without --listen has no effect')
+    if args.bind is not None and not args.listen:
+        logger.warning('--bind without --listen has no effect')
+
+    return args
 
 
 def get_config(args):
@@ -359,6 +379,10 @@ def get_config(args):
         config['WRITE_SELECTED'] = args.selected_paths.split(',')
     if args.relative_paths:
         config['RELATIVE_URLS'] = args.relative_paths
+    if args.port is not None:
+        config['PORT'] = args.port
+    if args.bind is not None:
+        config['BIND'] = args.bind
     config['DEBUG'] = args.verbosity == logging.DEBUG
 
     # argparse returns bytes in Py2. There is no definite answer as to which
@@ -391,6 +415,100 @@ def get_instance(args):
     return cls(settings), settings
 
 
+def autoreload(watchers, args, old_static, reader_descs, excqueue=None):
+    while True:
+        try:
+            # Check source dir for changed files ending with the given
+            # extension in the settings. In the theme dir is no such
+            # restriction; all files are recursively checked if they
+            # have changed, no matter what extension the filenames
+            # have.
+            modified = {k: next(v) for k, v in watchers.items()}
+
+            if modified['settings']:
+                pelican, settings = get_instance(args)
+
+                # Adjust static watchers if there are any changes
+                new_static = settings.get("STATIC_PATHS", [])
+
+                # Added static paths
+                # Add new watchers and set them as modified
+                new_watchers = set(new_static).difference(old_static)
+                for static_path in new_watchers:
+                    static_key = '[static]%s' % static_path
+                    watchers[static_key] = folder_watcher(
+                        os.path.join(pelican.path, static_path),
+                        [''],
+                        pelican.ignore_files)
+                    modified[static_key] = next(watchers[static_key])
+
+                # Removed static paths
+                # Remove watchers and modified values
+                old_watchers = set(old_static).difference(new_static)
+                for static_path in old_watchers:
+                    static_key = '[static]%s' % static_path
+                    watchers.pop(static_key)
+                    modified.pop(static_key)
+
+                # Replace old_static with the new one
+                old_static = new_static
+
+            if any(modified.values()):
+                print('\n-> Modified: {}. re-generating...'.format(
+                    ', '.join(k for k, v in modified.items() if v)))
+
+                if modified['content'] is None:
+                    logger.warning(
+                        'No valid files found in content for '
+                        + 'the active readers:\n'
+                        + '\n'.join(reader_descs))
+
+                if modified['theme'] is None:
+                    logger.warning('Empty theme folder. Using `basic` '
+                                   'theme.')
+
+                pelican.run()
+
+        except KeyboardInterrupt as e:
+            logger.warning("Keyboard interrupt, quitting.")
+            if excqueue is not None:
+                excqueue.put(traceback.format_exception_only(type(e), e)[-1])
+            return
+
+        except Exception as e:
+            if (args.verbosity == logging.DEBUG):
+                if excqueue is not None:
+                    excqueue.put(
+                        traceback.format_exception_only(type(e), e)[-1])
+                else:
+                    raise
+            logger.warning(
+                'Caught exception "%s". Reloading.', e)
+
+        finally:
+            time.sleep(.5)  # sleep to avoid cpu load
+
+
+def listen(server, port, output, excqueue=None):
+    RootedHTTPServer.allow_reuse_address = True
+    try:
+        httpd = RootedHTTPServer(
+            output, (server, port), ComplexHTTPRequestHandler)
+    except OSError as e:
+        logging.error("Could not listen on port %s, server %s.", port, server)
+        if excqueue is not None:
+            excqueue.put(traceback.format_exception_only(type(e), e)[-1])
+        return
+
+    logging.info("Serving at port %s, server %s.", port, server)
+    try:
+        httpd.serve_forever()
+    except Exception as e:
+        if excqueue is not None:
+            excqueue.put(traceback.format_exception_only(type(e), e)[-1])
+        return
+
+
 def main():
     args = parse_arguments()
     logs_dedup_min_level = getattr(logging, args.logs_dedup_min_level)
@@ -426,76 +544,28 @@ def main():
                 [''],
                 pelican.ignore_files)
 
-        if args.autoreload:
+        if args.autoreload and args.listen:
+            excqueue = multiprocessing.Queue()
+            p1 = multiprocessing.Process(
+                target=autoreload,
+                args=(watchers, args, old_static, reader_descs, excqueue))
+            p2 = multiprocessing.Process(
+                target=listen,
+                args=(settings.get('BIND'), settings.get('PORT'),
+                      settings.get("OUTPUT_PATH"), excqueue))
+            p1.start()
+            p2.start()
+            exc = excqueue.get()
+            p1.terminate()
+            p2.terminate()
+            logger.critical(exc)
+        elif args.autoreload:
             print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
                   ' `settings` for changes. ---')
-
-            while True:
-                try:
-                    # Check source dir for changed files ending with the given
-                    # extension in the settings. In the theme dir is no such
-                    # restriction; all files are recursively checked if they
-                    # have changed, no matter what extension the filenames
-                    # have.
-                    modified = {k: next(v) for k, v in watchers.items()}
-
-                    if modified['settings']:
-                        pelican, settings = get_instance(args)
-
-                        # Adjust static watchers if there are any changes
-                        new_static = settings.get("STATIC_PATHS", [])
-
-                        # Added static paths
-                        # Add new watchers and set them as modified
-                        new_watchers = set(new_static).difference(old_static)
-                        for static_path in new_watchers:
-                            static_key = '[static]%s' % static_path
-                            watchers[static_key] = folder_watcher(
-                                os.path.join(pelican.path, static_path),
-                                [''],
-                                pelican.ignore_files)
-                            modified[static_key] = next(watchers[static_key])
-
-                        # Removed static paths
-                        # Remove watchers and modified values
-                        old_watchers = set(old_static).difference(new_static)
-                        for static_path in old_watchers:
-                            static_key = '[static]%s' % static_path
-                            watchers.pop(static_key)
-                            modified.pop(static_key)
-
-                        # Replace old_static with the new one
-                        old_static = new_static
-
-                    if any(modified.values()):
-                        print('\n-> Modified: {}. re-generating...'.format(
-                            ', '.join(k for k, v in modified.items() if v)))
-
-                        if modified['content'] is None:
-                            logger.warning(
-                                'No valid files found in content for '
-                                + 'the active readers:\n'
-                                + '\n'.join(reader_descs))
-
-                        if modified['theme'] is None:
-                            logger.warning('Empty theme folder. Using `basic` '
-                                           'theme.')
-
-                        pelican.run()
-
-                except KeyboardInterrupt:
-                    logger.warning("Keyboard interrupt, quitting.")
-                    break
-
-                except Exception as e:
-                    if (args.verbosity == logging.DEBUG):
-                        raise
-                    logger.warning(
-                        'Caught exception "%s". Reloading.', e)
-
-                finally:
-                    time.sleep(.5)  # sleep to avoid cpu load
-
+            autoreload(watchers, args, old_static, reader_descs)
+        elif args.listen:
+            listen(settings.get('BIND'), settings.get('PORT'),
+                   settings.get("OUTPUT_PATH"))
         else:
             if next(watchers['content']) is None:
                 logger.warning(
diff --git a/pelican/server.py b/pelican/server.py
index 99a5ed75..1f4c6041 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -4,6 +4,7 @@ from __future__ import print_function, unicode_literals
 import argparse
 import logging
 import os
+import posixpath
 import ssl
 import sys
 
@@ -12,8 +13,9 @@ try:
 except ImportError:
     magic_from_file = None
 
+from six.moves import BaseHTTPServer
 from six.moves import SimpleHTTPServer as srvmod
-from six.moves import socketserver
+from six.moves import urllib
 
 
 def parse_arguments():
@@ -33,6 +35,9 @@ def parse_arguments():
     parser.add_argument('--key', default="./key.pem", nargs="?",
                         help='Path to certificate key file. ' +
                         'Relative to current directory')
+    parser.add_argument('path', default=".",
+                        help='Path to pelican source directory to serve. ' +
+                        'Relative to current directory')
     return parser.parse_args()
 
 
@@ -40,6 +45,26 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
     SUFFIXES = ['', '.html', '/index.html']
     RSTRIP_PATTERNS = ['', '/']
 
+    def translate_path(self, path):
+        # abandon query parameters
+        path = path.split('?', 1)[0]
+        path = path.split('#', 1)[0]
+        # Don't forget explicit trailing slash when normalizing. Issue17324
+        trailing_slash = path.rstrip().endswith('/')
+        path = urllib.parse.unquote(path)
+        path = posixpath.normpath(path)
+        words = path.split('/')
+        words = filter(None, words)
+        path = self.base_path
+        for word in words:
+            if os.path.dirname(word) or word in (os.curdir, os.pardir):
+                # Ignore components that are not a simple file/directory name
+                continue
+            path = os.path.join(path, word)
+        if trailing_slash:
+            path += '/'
+        return path
+
     def do_GET(self):
         # cut off a query string
         if '?' in self.path:
@@ -83,11 +108,17 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
         return mimetype
 
 
+class RootedHTTPServer(BaseHTTPServer.HTTPServer):
+    def __init__(self, base_path, *args, **kwargs):
+        BaseHTTPServer.HTTPServer.__init__(self, *args, **kwargs)
+        self.RequestHandlerClass.base_path = base_path
+
+
 if __name__ == '__main__':
     args = parse_arguments()
-    socketserver.TCPServer.allow_reuse_address = True
+    RootedHTTPServer.allow_reuse_address = True
     try:
-        httpd = socketserver.TCPServer(
+        httpd = RootedHTTPServer(
             (args.server, args.port),
             ComplexHTTPRequestHandler)
         if args.ssl:
@@ -97,7 +128,6 @@ if __name__ == '__main__':
     except ssl.SSLError as e:
         logging.error("Couldn't open certificate file %s or key file %s",
                       args.cert, args.key)
-    except OSError as e:
         logging.error("Could not listen on port %s, server %s.",
                       args.port, args.server)
         sys.exit(getattr(e, 'exitcode', 1))
diff --git a/pelican/settings.py b/pelican/settings.py
index eac6ff19..6849249e 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -150,6 +150,8 @@ DEFAULT_CONFIG = {
     'LOAD_CONTENT_CACHE': False,
     'WRITE_SELECTED': [],
     'FORMATTED_FIELDS': ['summary'],
+    'PORT': 8000,
+    'BIND': '',
 }
 
 PYGMENTS_RST_OPTIONS = None
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index c77a4226..6ab62f8f 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -263,8 +263,6 @@ needed by Pelican.
 
     automation = ask('Do you want to generate a Fabfile/Makefile '
                      'to automate generation and publishing?', bool, True)
-    develop = ask('Do you want an auto-reload HTTP script '
-                  'to assist with theme and site development?', bool, True)
 
     if automation:
         if ask('Do you want to upload your website using FTP?',
@@ -380,29 +378,6 @@ needed by Pelican.
         except OSError as e:
             print('Error: {0}'.format(e))
 
-    if develop:
-        conf_shell = dict()
-        for key, value in CONF.items():
-            if isinstance(value, six.string_types) and ' ' in value:
-                value = '"' + value.replace('"', '\\"') + '"'
-            conf_shell[key] = value
-        try:
-            with codecs.open(os.path.join(CONF['basedir'],
-                                          'develop_server.sh'),
-                             'w', 'utf-8') as fd:
-                py_v = '${PY:-python}'
-                if six.PY3:
-                    py_v = '${PY:-python3}'
-                _template = _jinja_env.get_template('develop_server.sh.jinja2')
-                fd.write(_template.render(py_v=py_v, **conf_shell))
-                fd.close()
-
-                # mode 0o755
-                os.chmod((os.path.join(CONF['basedir'],
-                                       'develop_server.sh')), 493)
-        except OSError as e:
-            print('Error: {0}'.format(e))
-
     print('Done. Your new project is available at %s' % CONF['basedir'])
 
 
diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 42424cdd..3e07a367 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -60,9 +60,7 @@ help:
 	@echo '   make publish                        generate using production settings '
 	@echo '   make serve [PORT=8000]              serve site at http://localhost:8000'
 	@echo '   make serve-global [SERVER=0.0.0.0]  serve (as root) to $(SERVER):80    '
-	@echo '   make devserver [PORT=8000]          start/restart develop_server.sh    '
-	@echo '   make stopserver                     stop local server                  '
-{% if ssh %}
+	@echo '   make devserver [PORT=8000]          serve and regenerate together      '
 	@echo '   make ssh_upload                     upload the web site via SSH        '
 	@echo '   make rsync_upload                   upload the web site via rsync+ssh  '
 {% endif %}
@@ -97,30 +95,26 @@ regenerate:
 
 serve:
 ifdef PORT
-	cd $(OUTPUTDIR) && $(PY) -m pelican.server $(PORT)
+	$$(PELICAN) -l $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) -p $$(PORT)
 else
-	cd $(OUTPUTDIR) && $(PY) -m pelican.server
+	$$(PELICAN) -l $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 endif
 
 serve-global:
 ifdef SERVER
-	cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 $(SERVER)
+	$$(PELICAN) -l $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) -p $$(PORT) -b $$(SERVER)
 else
-	cd $(OUTPUTDIR) && $(PY) -m pelican.server 80 0.0.0.0
+	$$(PELICAN) -l $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) -p $$(PORT) -b 0.0.0.0
 endif
 
 
 devserver:
 ifdef PORT
-	$(BASEDIR)/develop_server.sh restart $(PORT)
+	$$(PELICAN) -lr $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) -p $$(PORT)
 else
-	$(BASEDIR)/develop_server.sh restart
+	$$(PELICAN) -lr $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 endif
 
-stopserver:
-	$(BASEDIR)/develop_server.sh stop
-	@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
-
 publish:
 	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
 
diff --git a/pelican/tools/templates/develop_server.sh.jinja2 b/pelican/tools/templates/develop_server.sh.jinja2
deleted file mode 100755
index 7d20fd22..00000000
--- a/pelican/tools/templates/develop_server.sh.jinja2
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env bash
-##
-# This section should match your Makefile
-##
-PY={{py_v}}
-PELICAN=${PELICAN:-pelican}
-PELICANOPTS={{pelicanopts}}
-
-BASEDIR=$(pwd)
-INPUTDIR="$BASEDIR"/content
-OUTPUTDIR="$BASEDIR"/output
-CONFFILE="$BASEDIR"/pelicanconf.py
-
-###
-# Don't change stuff below here unless you are sure
-###
-
-SRV_PID="$BASEDIR"/srv.pid
-PELICAN_PID="$BASEDIR"/pelican.pid
-
-function usage(){
-  echo "usage: $0 (stop) (start) (restart) [port]"
-  echo "This starts Pelican in debug and reload mode and then launches"
-  echo "an HTTP server to help site development. It doesn't read"
-  echo "your Pelican settings, so if you edit any paths in your Makefile"
-  echo "you will need to edit your settings as well."
-  exit 3
-}
-
-function alive() {
-  kill -0 $1 >/dev/null 2>&1
-}
-
-function shut_down(){
-  PID=$(cat "$SRV_PID")
-  if [[ $? -eq 0 ]]; then
-    if alive $PID; then
-      echo "Stopping HTTP server"
-      kill $PID
-    else
-      echo "Stale PID, deleting"
-    fi
-    rm "$SRV_PID"
-  else
-    echo "HTTP server PIDFile not found"
-  fi
-
-  PID=$(cat "$PELICAN_PID")
-  if [[ $? -eq 0 ]]; then
-    if alive $PID; then
-      echo "Killing Pelican"
-      kill $PID
-    else
-      echo "Stale PID, deleting"
-    fi
-    rm "$PELICAN_PID"
-  else
-    echo "Pelican PIDFile not found"
-  fi
-}
-
-function start_up(){
-  local port=$1
-  echo "Starting up Pelican and HTTP server"
-  shift
-  $PELICAN --debug --autoreload -r "$INPUT"DIR -o "$OUTPUTDIR" -s "$CONFFILE" $PELICANOPTS &
-  pelican_pid=$!
-  echo $pelican_pid > "$PELICAN_PID"
-  mkdir -p "$OUTPUTDIR" && cd "$OUTPUTDIR"
-  $PY -m pelican.server $port &
-  srv_pid=$!
-  echo $srv_pid > "$SRV_PID"
-  cd "$BASEDIR"
-  sleep 1
-  if ! alive $pelican_pid ; then
-    echo "Pelican didn't start. Is the Pelican package installed?"
-    return 1
-  elif ! alive $srv_pid ; then
-    echo "The HTTP server didn't start. Is there another service using port" $port "?"
-    return 1
-  fi
-  echo 'Pelican and HTTP server processes now running in background.'
-}
-
-###
-#  MAIN
-###
-[[ ($# -eq 0) || ($# -gt 2) ]] && usage
-port=''
-[[ $# -eq 2 ]] && port=$2
-
-if [[ $1 == "stop" ]]; then
-  shut_down
-elif [[ $1 == "restart" ]]; then
-  shut_down
-  start_up $port
-elif [[ $1 == "start" ]]; then
-  if ! start_up $port; then
-    shut_down
-  fi
-else
-  usage
-fi
diff --git a/pelican/tools/templates/fabfile.py.jinja2 b/pelican/tools/templates/fabfile.py.jinja2
index eda60c42..467f9ec2 100644
--- a/pelican/tools/templates/fabfile.py.jinja2
+++ b/pelican/tools/templates/fabfile.py.jinja2
@@ -3,12 +3,6 @@ import fabric.contrib.project as project
 import os
 import shutil
 import sys
-try:
-    import socketserver
-except ImportError:
-    import SocketServer as socketserver
-
-from pelican.server import ComplexHTTPRequestHandler
 
 # Local path configuration (can be absolute or relative to fabfile)
 env.deploy_path = 'output'
@@ -55,15 +49,11 @@ def regenerate():
 
 def serve():
     """Serve site at http://localhost:8000/"""
-    os.chdir(env.deploy_path)
+    local('pelican -l -s pelicanconf.py')
 
-    class AddressReuseTCPServer(socketserver.TCPServer):
-        allow_reuse_address = True
-
-    server = AddressReuseTCPServer(('', PORT), ComplexHTTPRequestHandler)
-
-    sys.stderr.write('Serving on port {0} ...\n'.format(PORT))
-    server.serve_forever()
+def devserver():
+    """Serve site at http://localhost:8000/ and regenerate automatically"""
+    local('pelican -r -l -s pelicanconf.py')
 
 def reserve():
     """`build`, then `serve`"""

From e44c4aba36c4fe59ccc2fed674e6e62d1c7fe1a5 Mon Sep 17 00:00:00 2001
From: David Alfonso <developer@davidalfonso.es>
Date: Fri, 22 Jun 2018 22:36:43 +0200
Subject: [PATCH 2050/2864] Add missing wordpress options to importer doc

---
 docs/importer.rst               | 19 +++++++++++++++----
 pelican/tools/pelican_import.py |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 2a5365ee..6a979be6 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -41,8 +41,8 @@ Usage
 ::
 
     pelican-import [-h] [--wpfile] [--dotclear] [--posterous] [--tumblr] [--feed] [-o OUTPUT]
-                   [-m MARKUP] [--dir-cat] [--dir-page] [--strip-raw] [--disable-slugs]
-                   [-e EMAIL] [-p PASSWORD] [-b BLOGNAME]
+                   [-m MARKUP] [--dir-cat] [--dir-page] [--strip-raw] [--wp-custpost]
+                   [--wp-attach] [--disable-slugs] [-e EMAIL] [-p PASSWORD] [-b BLOGNAME]
                    input|api_token|api_key
 
 Positional arguments
@@ -71,10 +71,21 @@ Optional arguments
                         (default: False)
   --dir-page            Put files recognised as pages in "pages/" sub-
                           directory (wordpress import only) (default: False)
-  --filter-author       Import only post from the specified author.
+  --filter-author       Import only post from the specified author
   --strip-raw           Strip raw HTML code that can't be converted to markup
                         such as flash embeds or iframes (wordpress import
                         only) (default: False)
+  --wp-custpost         Put wordpress custom post types in directories. If
+                        used with --dir-cat option directories will be created
+                        as "/post_type/category/" (wordpress import only)
+  --wp-attach           Download files uploaded to wordpress as attachments.
+                        Files will be added to posts as a list in the post
+                        header. All files will be downloaded, even if they
+                        aren't associated with a post. Files will be downloaded
+                        with their original path inside the output directory,
+                        e.g. "output/wp-uploads/date/postname/file.jpg"
+                        (wordpress import only) (requires an internet
+                        connection)
   --disable-slugs       Disable storing slugs from imported posts within
                         output. With this disabled, your Pelican URLs may not
                         be consistent with your original posts. (default:
@@ -111,5 +122,5 @@ Tests
 
 To test the module, one can use sample files:
 
-- for WordPress: http://wpcandy.com/made/the-sample-post-collection
+- for WordPress: http://www.wpbeginner.com/wp-themes/how-to-add-dummy-content-for-theme-development-in-wordpress/
 - for Dotclear: http://media.dotaddict.org/tda/downloads/lorem-backup.txt
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 8d252536..abeccd9d 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -819,7 +819,7 @@ def main():
         help='(wordpress import only) Download files uploaded to wordpress as '
              'attachments. Files will be added to posts as a list in the post '
              'header. All files will be downloaded, even if '
-             "they aren't associated with a post. Files with be downloaded "
+             "they aren't associated with a post. Files will be downloaded "
              'with their original path inside the output directory. '
              'e.g. output/wp-uploads/date/postname/file.jpg '
              '-- Requires an internet connection --')

From bdeb84adb9f4a29a1f9fdd5c2da280ae49ad0c27 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Wed, 27 Jun 2018 20:40:52 +0200
Subject: [PATCH 2051/2864] Fix typo

---
 pelican/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 1738de22..09da8fac 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -614,7 +614,7 @@ def escape_html(text, quote=True):
 
 
 def process_translations(content_list):
-    """ Finds translation and returns them.
+    """ Finds translations and returns them.
 
     Returns a tuple with two lists (index, translations).  Index list includes
     items in default language or items which have no variant in default

From 71af410285c3bd158962250da91d566ffd7a7cf7 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sun, 1 Jul 2018 20:32:08 +0200
Subject: [PATCH 2052/2864] Support translation of lang attribute in default
 themes

---
 pelican/tests/output/basic/second-article-fr.html         | 2 +-
 pelican/tests/output/custom/oh-yeah-fr.html               | 2 +-
 pelican/tests/output/custom/second-article-fr.html        | 2 +-
 pelican/tests/output/custom_locale/oh-yeah-fr.html        | 2 +-
 pelican/tests/output/custom_locale/second-article-fr.html | 2 +-
 pelican/themes/notmyidea/templates/article.html           | 1 +
 pelican/themes/notmyidea/templates/base.html              | 4 ++--
 pelican/themes/notmyidea/templates/page.html              | 1 +
 pelican/themes/simple/templates/article.html              | 1 +
 pelican/themes/simple/templates/base.html                 | 2 +-
 pelican/themes/simple/templates/page.html                 | 1 +
 11 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index c5ceced3..8b21ea5d 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="fr">
 <head>
         <meta charset="utf-8" />
         <title>Deuxième article</title>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index d86dc022..a4ec6936 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="fr">
 <head>
         <meta charset="utf-8" />
         <title>Trop bien !</title>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 124a675e..2a2ff9ad 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="fr">
 <head>
         <meta charset="utf-8" />
         <title>Deuxième article</title>
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index f7063c32..4d550682 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="fr">
 <head>
         <meta charset="utf-8" />
         <title>Trop bien !</title>
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index d2a523c2..fb7f5e23 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="fr">
 <head>
         <meta charset="utf-8" />
         <title>Deuxième article</title>
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 06110b43..390a89bb 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block html_lang %}{{ article.lang }}{% endblock %}
 {% block title %}{{ article.title|striptags }}{% endblock %}
 {% block content %}
 <section id="content" class="body">
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index eb16c42e..e97c3ea7 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ DEFAULT_LANG }}">
+<html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock html_lang %}">
 <head>
         <meta charset="utf-8" />
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
@@ -15,7 +15,7 @@
 <body id="index" class="home">
 {% include 'github.html' %}
         <header id="banner" class="body">
-                <h1><a href="{{ SITEURL }}/">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
+                <h1><a href="{{ SITEURL }}/">{{ SITENAME }} {% if SITESUBTITLE %}<strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
                 <nav><ul>
                 {% for title, link in MENUITEMS %}
                     <li><a href="{{ link }}">{{ title }}</a></li>
diff --git a/pelican/themes/notmyidea/templates/page.html b/pelican/themes/notmyidea/templates/page.html
index 0d8283fe..00c20834 100644
--- a/pelican/themes/notmyidea/templates/page.html
+++ b/pelican/themes/notmyidea/templates/page.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block html_lang %}{{ page.lang }}{% endblock %}
 {% block title %}{{ page.title }}{% endblock %}
 {% block content %}
 <section id="content" class="body">
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 9dcf1bc2..e02596f4 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block html_lang %}{{ article.lang }}{% endblock %}
 
 {% block title %}{{ SITENAME }} - {{ article.title }}{% endblock %}
 
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index e063995d..00aa3836 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ DEFAULT_LANG }}">
+<html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock html_lang %}">
 <head>
         {% block head %}
         <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
index 999dd841..e420c89a 100644
--- a/pelican/themes/simple/templates/page.html
+++ b/pelican/themes/simple/templates/page.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block html_lang %}{{ page.lang }}{% endblock %}
 
 {% block title %}{{ SITENAME }} - {{ page.title }}{%endblock%}
 

From 576229ad191fad82ee57f68ad675e9fa9d316501 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Tue, 3 Jul 2018 12:08:27 +0200
Subject: [PATCH 2053/2864] allows pages to have draft status, like articles

---
 docs/content.rst                              |  6 +++---
 docs/settings.rst                             | 18 ++++++++++++++++++
 docs/themes.rst                               |  3 ++-
 pelican/__init__.py                           | 19 +++++++++++++------
 pelican/contents.py                           |  8 ++++++--
 pelican/generators.py                         | 17 ++++++++++++++---
 pelican/settings.py                           |  5 +++++
 pelican/tests/TestPages/draft_page.rst        |  8 ++++++++
 .../tests/TestPages/draft_page_markdown.md    | 12 ++++++++++++
 .../TestPages/draft_page_with_template.rst    | 11 +++++++++++
 pelican/tests/test_cache.py                   |  3 +++
 pelican/tests/test_generators.py              | 13 ++++++++++++-
 12 files changed, 107 insertions(+), 16 deletions(-)
 create mode 100644 pelican/tests/TestPages/draft_page.rst
 create mode 100644 pelican/tests/TestPages/draft_page_markdown.md
 create mode 100644 pelican/tests/TestPages/draft_page_with_template.rst

diff --git a/docs/content.rst b/docs/content.rst
index 2c88741d..24f91900 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -533,9 +533,9 @@ your settings file.
 Publishing drafts
 =================
 
-If you want to publish an article as a draft (for friends to review before
-publishing, for example), you can add a ``Status: draft`` attribute to its
-metadata. That article will then be output to the ``drafts`` folder and not
+If you want to publish an article or a page as a draft (for friends to review
+before publishing, for example), you can add a ``Status: draft`` attribute to
+its metadata. That article will then be output to the ``drafts`` folder and not
 listed on the index page nor on any category or tag page.
 
 If your articles should be automatically published as a draft (to not accidentally
diff --git a/docs/settings.rst b/docs/settings.rst
index 0ae26ca4..02ce519b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -436,6 +436,24 @@ respectively.
 
    The location we will save the page which doesn't use the default language.
 
+.. data:: DRAFT_PAGE_URL = 'drafts/pages/{slug}.html'
+
+   The URL used to link to a page draft.
+
+.. data:: DRAFT_PAGE_SAVE_AS = 'drafts/pages/{slug}.html'
+
+   The actual location a page draft is saved at.
+
+.. data:: DRAFT_PAGE_LANG_URL = 'drafts/pages/{slug}-{lang}.html'
+
+   The URL used to link to a page draft which doesn't use the default
+   language.
+
+.. data:: DRAFT_PAGE_LANG_SAVE_AS = 'drafts/pages/{slug}-{lang}.html'
+
+   The actual location a page draft which doesn't use the default language is
+   saved at.
+
 .. data:: CATEGORY_URL = 'category/{slug}.html'
 
    The URL to use for a category.
diff --git a/docs/themes.rst b/docs/themes.rst
index 98d11bd3..e94ff08e 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -86,6 +86,7 @@ categories      A list of (category, articles) tuples, containing
                 all the categories and corresponding articles (values)
 pages           The list of pages
 hidden_pages    The list of hidden pages
+draft_pages     The list of draft pages
 =============   ===================================================
 
 
@@ -423,7 +424,7 @@ metadata                Page header metadata `dict`.
 save_as                 Location to save the page.
 slug                    Page slug.
 source_path             Full system path of the page source file.
-status                  The page status, can be any of 'published' or
+status                  The page status, can be any of 'published', 'hidden' or
                         'draft'.
 summary                 Rendered summary content.
 tags                    List of :ref:`Tag <object-author_cat_tag>`
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 87d8bc24..bb54e760 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -209,13 +209,20 @@ class Pelican(object):
              len(pages_generator.hidden_translations)),
             'hidden page',
             'hidden pages')
+        pluralized_draft_pages = maybe_pluralize(
+            (len(pages_generator.draft_pages) +
+             len(pages_generator.draft_translations)),
+            'draft page',
+            'draft pages')
 
-        print('Done: Processed {}, {}, {} and {} in {:.2f} seconds.'.format(
-            pluralized_articles,
-            pluralized_drafts,
-            pluralized_pages,
-            pluralized_hidden_pages,
-            time.time() - start_time))
+        print('Done: Processed {}, {}, {}, {} and {} in {:.2f} seconds.'
+              .format(
+                    pluralized_articles,
+                    pluralized_drafts,
+                    pluralized_pages,
+                    pluralized_hidden_pages,
+                    pluralized_draft_pages,
+                    time.time() - start_time))
 
     def get_generator_classes(self):
         generators = [ArticlesGenerator, PagesGenerator]
diff --git a/pelican/contents.py b/pelican/contents.py
index 03ce0a43..14dfc89b 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -444,10 +444,14 @@ class Content(object):
 
 class Page(Content):
     mandatory_properties = ('title',)
-    allowed_statuses = ('published', 'hidden')
+    allowed_statuses = ('published', 'hidden', 'draft')
     default_status = 'published'
     default_template = 'page'
 
+    def _expand_settings(self, key):
+        klass = 'draft_page' if self.status == 'draft' else None
+        return super(Page, self)._expand_settings(key, klass)
+
 
 class Article(Content):
     mandatory_properties = ('title', 'date', 'category')
@@ -472,7 +476,7 @@ class Article(Content):
             self.date = SafeDatetime.max
 
     def _expand_settings(self, key):
-        klass = 'article' if self.status == 'published' else 'draft'
+        klass = 'draft' if self.status == 'draft' else 'article'
         return super(Article, self)._expand_settings(key, klass)
 
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 069da0c1..d176e4ee 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -656,14 +656,18 @@ class PagesGenerator(CachingGenerator):
 
     def __init__(self, *args, **kwargs):
         self.pages = []
+        self.translations = []
         self.hidden_pages = []
         self.hidden_translations = []
+        self.draft_pages = []
+        self.draft_translations = []
         super(PagesGenerator, self).__init__(*args, **kwargs)
         signals.page_generator_init.send(self)
 
     def generate_context(self):
         all_pages = []
         hidden_pages = []
+        draft_pages = []
         for f in self.get_files(
                 self.settings['PAGE_PATHS'],
                 exclude=self.settings['PAGE_EXCLUDES']):
@@ -694,14 +698,18 @@ class PagesGenerator(CachingGenerator):
                 all_pages.append(page)
             elif page.status == "hidden":
                 hidden_pages.append(page)
+            elif page.status == "draft":
+                draft_pages.append(page)
             self.add_source_path(page)
 
         self.pages, self.translations = process_translations(all_pages)
         self.pages = order_content(self.pages, self.settings['PAGE_ORDER_BY'])
         self.hidden_pages, self.hidden_translations = \
             process_translations(hidden_pages)
+        self.draft_pages, self.draft_translations = \
+            process_translations(draft_pages)
 
-        self._update_context(('pages', 'hidden_pages'))
+        self._update_context(('pages', 'hidden_pages', 'draft_pages'))
 
         self.save_cache()
         self.readers.save_cache()
@@ -709,7 +717,8 @@ class PagesGenerator(CachingGenerator):
 
     def generate_output(self, writer):
         for page in chain(self.translations, self.pages,
-                          self.hidden_translations, self.hidden_pages):
+                          self.hidden_translations, self.hidden_pages,
+                          self.draft_translations, self.draft_pages):
             signals.page_generator_write_page.send(self, content=page)
             writer.write_file(
                 page.save_as, self.get_template(page.template),
@@ -722,7 +731,9 @@ class PagesGenerator(CachingGenerator):
     def refresh_metadata_intersite_links(self):
         for e in chain(self.pages,
                        self.hidden_pages,
-                       self.hidden_translations):
+                       self.hidden_translations,
+                       self.draft_pages,
+                       self.draft_translations):
             if hasattr(e, 'refresh_metadata_intersite_links'):
                 e.refresh_metadata_intersite_links()
 
diff --git a/pelican/settings.py b/pelican/settings.py
index eac6ff19..01ab5043 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -80,6 +80,11 @@ DEFAULT_CONFIG = {
     'PAGE_ORDER_BY': 'basename',
     'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
     'PAGE_LANG_SAVE_AS': posix_join('pages', '{slug}-{lang}.html'),
+    'DRAFT_PAGE_URL': 'drafts/pages/{slug}.html',
+    'DRAFT_PAGE_SAVE_AS': posix_join('drafts', 'pages', '{slug}.html'),
+    'DRAFT_PAGE_LANG_URL': 'drafts/pages/{slug}-{lang}.html',
+    'DRAFT_PAGE_LANG_SAVE_AS': posix_join('drafts', 'pages',
+                                          '{slug}-{lang}.html'),
     'STATIC_URL': '{path}',
     'STATIC_SAVE_AS': '{path}',
     'STATIC_CREATE_LINKS': False,
diff --git a/pelican/tests/TestPages/draft_page.rst b/pelican/tests/TestPages/draft_page.rst
new file mode 100644
index 00000000..19ca0646
--- /dev/null
+++ b/pelican/tests/TestPages/draft_page.rst
@@ -0,0 +1,8 @@
+This is a test draft page
+##########################
+
+:status: draft
+
+The quick brown fox .
+
+This page is a draft.
diff --git a/pelican/tests/TestPages/draft_page_markdown.md b/pelican/tests/TestPages/draft_page_markdown.md
new file mode 100644
index 00000000..fda71868
--- /dev/null
+++ b/pelican/tests/TestPages/draft_page_markdown.md
@@ -0,0 +1,12 @@
+title: This is a markdown test draft page
+status: draft
+
+Test Markdown File Header
+=========================
+
+Used for pelican test
+---------------------
+
+The quick brown fox .
+
+This page is a draft
\ No newline at end of file
diff --git a/pelican/tests/TestPages/draft_page_with_template.rst b/pelican/tests/TestPages/draft_page_with_template.rst
new file mode 100644
index 00000000..9d46e717
--- /dev/null
+++ b/pelican/tests/TestPages/draft_page_with_template.rst
@@ -0,0 +1,11 @@
+This is a test draft page with a custom template
+#################################################
+
+:status: draft
+:template: custom
+
+The quick brown fox .
+
+This page is a draft
+
+This page has a custom template to be called when rendered
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index a0cc49b7..72b2b557 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -71,6 +71,7 @@ class TestCache(unittest.TestCase):
         generator.generate_context()
         uncached_pages = sorted_titles(generator.pages)
         uncached_hidden_pages = sorted_titles(generator.hidden_pages)
+        uncached_draft_pages = sorted_titles(generator.draft_pages)
 
         generator = PagesGenerator(
             context=settings.copy(), settings=settings,
@@ -78,9 +79,11 @@ class TestCache(unittest.TestCase):
         generator.generate_context()
         cached_pages = sorted_titles(generator.pages)
         cached_hidden_pages = sorted_titles(generator.hidden_pages)
+        cached_draft_pages = sorted_titles(generator.draft_pages)
 
         self.assertEqual(uncached_pages, cached_pages)
         self.assertEqual(uncached_hidden_pages, cached_hidden_pages)
+        self.assertEqual(uncached_draft_pages, cached_draft_pages)
 
     def test_reader_caching(self):
         """Test that cached and uncached content is same in reader level"""
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index c1899ab8..52efe7fa 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -601,6 +601,7 @@ class TestPageGenerator(unittest.TestCase):
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
         hidden_pages = self.distill_pages(generator.hidden_pages)
+        draft_pages = self.distill_pages(generator.draft_pages)
 
         pages_expected = [
             ['This is a test page', 'published', 'page'],
@@ -614,7 +615,13 @@ class TestPageGenerator(unittest.TestCase):
             ['This is a test hidden page', 'hidden', 'page'],
             ['This is a markdown test hidden page', 'hidden', 'page'],
             ['This is a test hidden page with a custom template', 'hidden',
-             'custom']
+             'custom'],
+        ]
+        draft_pages_expected = [
+            ['This is a test draft page', 'draft', 'page'],
+            ['This is a markdown test draft page', 'draft', 'page'],
+            ['This is a test draft page with a custom template', 'draft',
+             'custom'],
         ]
 
         self.assertEqual(sorted(pages_expected), sorted(pages))
@@ -622,9 +629,13 @@ class TestPageGenerator(unittest.TestCase):
             sorted(pages_expected),
             sorted(self.distill_pages(generator.context['pages'])))
         self.assertEqual(sorted(hidden_pages_expected), sorted(hidden_pages))
+        self.assertEqual(sorted(draft_pages_expected), sorted(draft_pages))
         self.assertEqual(
             sorted(hidden_pages_expected),
             sorted(self.distill_pages(generator.context['hidden_pages'])))
+        self.assertEqual(
+            sorted(draft_pages_expected),
+            sorted(self.distill_pages(generator.context['draft_pages'])))
 
     def test_generate_sorted(self):
         settings = get_settings(filenames={})

From ec15105c2ff7cf4c6dffd9121199ec782b8642c6 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Tue, 3 Jul 2018 20:56:31 +0200
Subject: [PATCH 2054/2864] Remove extra endif from Makefile template

---
 pelican/tools/templates/Makefile.jinja2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 3e07a367..4ec5e244 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -63,7 +63,6 @@ help:
 	@echo '   make devserver [PORT=8000]          serve and regenerate together      '
 	@echo '   make ssh_upload                     upload the web site via SSH        '
 	@echo '   make rsync_upload                   upload the web site via rsync+ssh  '
-{% endif %}
 {% if dropbox %}
 	@echo '   make dropbox_upload                 upload the web site via Dropbox    '
 {% endif %}

From 63dfe7085042bcaaaa0baf5bb7851999aa45386c Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Tue, 3 Jul 2018 19:20:02 +0000
Subject: [PATCH 2055/2864] Import readline in pelican_quickstart.py if
 available (#2129)

---
 pelican/tools/pelican_quickstart.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 6ab62f8f..7033cf28 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -12,6 +12,11 @@ from jinja2 import Environment, FileSystemLoader
 
 import pytz
 
+try:
+    import readline  # NOQA
+except ImportError:
+    pass
+
 try:
     import tzlocal
     _DEFAULT_TIMEZONE = tzlocal.get_localzone().zone

From d1d1cccdade052e2dbfd232172fb5644072a3d13 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Thu, 5 Jul 2018 00:26:50 +0200
Subject: [PATCH 2056/2864] Add hreflang attribute to default themes

---
 pelican/tests/output/basic/category/misc.html         |  2 +-
 pelican/tests/output/basic/index.html                 |  2 +-
 pelican/tests/output/basic/second-article-fr.html     |  4 +++-
 pelican/tests/output/basic/second-article.html        |  4 +++-
 pelican/tests/output/basic/tag/bar.html               |  2 +-
 pelican/tests/output/basic/tag/foo.html               |  2 +-
 .../tests/output/custom/author/alexis-metaireau.html  |  2 +-
 .../tests/output/custom/author/alexis-metaireau2.html |  2 +-
 pelican/tests/output/custom/category/bar.html         |  2 +-
 pelican/tests/output/custom/category/misc.html        |  2 +-
 pelican/tests/output/custom/index.html                |  2 +-
 pelican/tests/output/custom/index2.html               |  2 +-
 pelican/tests/output/custom/oh-yeah-fr.html           |  4 +++-
 pelican/tests/output/custom/oh-yeah.html              |  4 +++-
 pelican/tests/output/custom/second-article-fr.html    |  4 +++-
 pelican/tests/output/custom/second-article.html       |  4 +++-
 pelican/tests/output/custom/tag/bar.html              |  4 ++--
 pelican/tests/output/custom/tag/foo.html              |  2 +-
 pelican/tests/output/custom/tag/yeah.html             |  2 +-
 .../output/custom_locale/author/alexis-metaireau.html |  2 +-
 .../custom_locale/author/alexis-metaireau2.html       |  2 +-
 pelican/tests/output/custom_locale/category/bar.html  |  2 +-
 pelican/tests/output/custom_locale/category/misc.html |  2 +-
 pelican/tests/output/custom_locale/index.html         |  2 +-
 pelican/tests/output/custom_locale/index2.html        |  2 +-
 pelican/tests/output/custom_locale/oh-yeah-fr.html    |  4 +++-
 .../posts/2010/octobre/20/oh-yeah/index.html          |  4 +++-
 .../posts/2012/février/29/second-article/index.html   |  4 +++-
 .../tests/output/custom_locale/second-article-fr.html |  4 +++-
 pelican/tests/output/custom_locale/tag/bar.html       |  4 ++--
 pelican/tests/output/custom_locale/tag/foo.html       |  2 +-
 pelican/tests/output/custom_locale/tag/yeah.html      |  2 +-
 pelican/themes/notmyidea/templates/article.html       |  8 ++++++++
 pelican/themes/notmyidea/templates/base.html          |  1 +
 pelican/themes/notmyidea/templates/page.html          |  8 ++++++++
 pelican/themes/notmyidea/templates/translations.html  | 10 +++++++++-
 pelican/themes/simple/templates/article.html          |  6 ++++++
 pelican/themes/simple/templates/page.html             |  9 +++++++++
 pelican/themes/simple/templates/translations.html     | 11 +++++++++--
 39 files changed, 104 insertions(+), 37 deletions(-)

diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 9012cedc..0542dba1 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -53,7 +53,7 @@
 
 <p>In <a href="/category/misc.html">misc</a>.</p>
 <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article-fr.html">fr</a>
+        <a href="/second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index ed1356ed..8fa23f79 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -53,7 +53,7 @@
 
 <p>In <a href="/category/misc.html">misc</a>.</p>
 <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article-fr.html">fr</a>
+        <a href="/second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 8b21ea5d..1e5f1ef9 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -5,6 +5,8 @@
         <title>Deuxième article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+      <link rel="alternate" hreflang="en" href="/second-article.html">
+
 </head>
 
 <body id="index" class="home">
@@ -36,7 +38,7 @@
 
 <p>In <a href="/category/misc.html">misc</a>.</p>
 <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article.html">en</a>
+        <a href="/second-article.html" hreflang="en">en</a>
 
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index a68a1a6f..4485e9f8 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -5,6 +5,8 @@
         <title>Second article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+      <link rel="alternate" hreflang="fr" href="/second-article-fr.html">
+
 </head>
 
 <body id="index" class="home">
@@ -36,7 +38,7 @@
 
 <p>In <a href="/category/misc.html">misc</a>.</p>
 <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article-fr.html">fr</a>
+        <a href="/second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index b699a45d..b8905a5b 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -31,7 +31,7 @@
 
 <p>In <a href="/category/misc.html">misc</a>.</p>
 <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article-fr.html">fr</a>
+        <a href="/second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 348efcc0..aad78781 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -31,7 +31,7 @@
 
 <p>In <a href="/category/misc.html">misc</a>.</p>
 <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article-fr.html">fr</a>
+        <a href="/second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index 045c4d94..ea7b44ad 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -63,7 +63,7 @@
         </address>
 <p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html">fr</a>
+        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 7c28bad8..52570882 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -118,7 +118,7 @@ as well as <strong>inline markup</strong>.</p>
         </address>
 <p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html">fr</a>
+        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index fa9e49df..eaddbb76 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -38,7 +38,7 @@
         </address>
 <p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html">fr</a>
+        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 339f3316..c0af7513 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -63,7 +63,7 @@
         </address>
 <p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html">fr</a>
+        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index d78b001f..465d4414 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -63,7 +63,7 @@
         </address>
 <p>In <a href="./category/misc.html">misc</a>.</p>
 <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./second-article-fr.html">fr</a>
+        <a href="./second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 434d8596..f52583ce 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -118,7 +118,7 @@ as well as <strong>inline markup</strong>.</p>
         </address>
 <p>In <a href="./category/bar.html">bar</a>.</p>
 <p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
-        <a href="./oh-yeah-fr.html">fr</a>
+        <a href="./oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index a4ec6936..9d1a317d 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -6,6 +6,8 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+      <link rel="alternate" hreflang="en" href="./oh-yeah.html">
+
 </head>
 
 <body id="index" class="home">
@@ -43,7 +45,7 @@
         </address>
 <p>In <a href="./category/misc.html">misc</a>.</p>
 Translations:
-        <a href="./oh-yeah.html">en</a>
+        <a href="./oh-yeah.html" hreflang="en">en</a>
 
 </footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
 
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index f73a1ea7..1bdf4791 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -6,6 +6,8 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+      <link rel="alternate" hreflang="fr" href="./oh-yeah-fr.html">
+
 </head>
 
 <body id="index" class="home">
@@ -43,7 +45,7 @@
         </address>
 <p>In <a href="./category/bar.html">bar</a>.</p>
 <p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
-        <a href="./oh-yeah-fr.html">fr</a>
+        <a href="./oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 2a2ff9ad..16273abd 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -6,6 +6,8 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+      <link rel="alternate" hreflang="en" href="./second-article.html">
+
 </head>
 
 <body id="index" class="home">
@@ -43,7 +45,7 @@
         </address>
 <p>In <a href="./category/misc.html">misc</a>.</p>
 <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./second-article.html">en</a>
+        <a href="./second-article.html" hreflang="en">en</a>
 
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 1bff301a..68a814f4 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -6,6 +6,8 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+      <link rel="alternate" hreflang="fr" href="./second-article-fr.html">
+
 </head>
 
 <body id="index" class="home">
@@ -43,7 +45,7 @@
         </address>
 <p>In <a href="./category/misc.html">misc</a>.</p>
 <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./second-article-fr.html">fr</a>
+        <a href="./second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 048df1d3..2723cef9 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -38,7 +38,7 @@
         </address>
 <p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html">fr</a>
+        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
@@ -93,7 +93,7 @@ as well as <strong>inline markup</strong>.</p>
         </address>
 <p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html">fr</a>
+        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 0aa4c524..9c117c9e 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -38,7 +38,7 @@
         </address>
 <p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html">fr</a>
+        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index f4d149e6..d73e6adb 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -38,7 +38,7 @@
         </address>
 <p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html">fr</a>
+        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 2fbaced4..c21a11ee 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -63,7 +63,7 @@
         </address>
 <p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html">fr</a>
+        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 23621487..5ec65bac 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -118,7 +118,7 @@ as well as <strong>inline markup</strong>.</p>
         </address>
 <p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html">fr</a>
+        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index a0ba9741..d2cc2214 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -38,7 +38,7 @@
         </address>
 <p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html">fr</a>
+        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index d37f588e..4e31e817 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -63,7 +63,7 @@
         </address>
 <p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html">fr</a>
+        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index a0172665..b56a6b8c 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -63,7 +63,7 @@
         </address>
 <p>In <a href="./category/misc.html">misc</a>.</p>
 <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./second-article-fr.html">fr</a>
+        <a href="./second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index bb5e036f..0fde251d 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -118,7 +118,7 @@ as well as <strong>inline markup</strong>.</p>
         </address>
 <p>In <a href="./category/bar.html">bar</a>.</p>
 <p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
-        <a href="./oh-yeah-fr.html">fr</a>
+        <a href="./oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 4d550682..1ecd77b6 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -6,6 +6,8 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+      <link rel="alternate" hreflang="en" href="./posts/2010/octobre/20/oh-yeah/">
+
 </head>
 
 <body id="index" class="home">
@@ -43,7 +45,7 @@
         </address>
 <p>In <a href="./category/misc.html">misc</a>.</p>
 Translations:
-        <a href="./posts/2010/octobre/20/oh-yeah/">en</a>
+        <a href="./posts/2010/octobre/20/oh-yeah/" hreflang="en">en</a>
 
 </footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
 
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index deb2b9f6..91acf1a8 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -6,6 +6,8 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+      <link rel="alternate" hreflang="fr" href="../../../../../oh-yeah-fr.html">
+
 </head>
 
 <body id="index" class="home">
@@ -43,7 +45,7 @@
         </address>
 <p>In <a href="../../../../../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../../../../../tag/oh.html">oh</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../../../../../oh-yeah-fr.html">fr</a>
+        <a href="../../../../../oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index c02722ad..c5790ae2 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -6,6 +6,8 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+      <link rel="alternate" hreflang="fr" href="../../../../../second-article-fr.html">
+
 </head>
 
 <body id="index" class="home">
@@ -43,7 +45,7 @@
         </address>
 <p>In <a href="../../../../../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../../../../../tag/foo.html">foo</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/baz.html">baz</a> </p>Translations:
-        <a href="../../../../../second-article-fr.html">fr</a>
+        <a href="../../../../../second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index fb7f5e23..33e10b19 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -6,6 +6,8 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+      <link rel="alternate" hreflang="en" href="./posts/2012/février/29/second-article/">
+
 </head>
 
 <body id="index" class="home">
@@ -43,7 +45,7 @@
         </address>
 <p>In <a href="./category/misc.html">misc</a>.</p>
 <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./posts/2012/février/29/second-article/">en</a>
+        <a href="./posts/2012/février/29/second-article/" hreflang="en">en</a>
 
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index e0dd328d..0d49090f 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -38,7 +38,7 @@
         </address>
 <p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html">fr</a>
+        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
@@ -93,7 +93,7 @@ as well as <strong>inline markup</strong>.</p>
         </address>
 <p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html">fr</a>
+        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 7d4f2b86..f85ae34d 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -38,7 +38,7 @@
         </address>
 <p>In <a href="../category/misc.html">misc</a>.</p>
 <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html">fr</a>
+        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 43a29971..fb0f2eb1 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -38,7 +38,7 @@
         </address>
 <p>In <a href="../category/bar.html">bar</a>.</p>
 <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html">fr</a>
+        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 390a89bb..98c91bbc 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -1,6 +1,14 @@
 {% extends "base.html" %}
 {% block html_lang %}{{ article.lang }}{% endblock %}
 {% block title %}{{ article.title|striptags }}{% endblock %}
+
+{% block extra_head %}
+{% import 'translations.html' as translations with context %}
+{% if translations.entry_hreflang(article) %}
+  {{ translations.entry_hreflang(article) }}
+{% endif %}
+{% endblock %}
+
 {% block content %}
 <section id="content" class="body">
   <article>
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index e97c3ea7..2de43b46 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -10,6 +10,7 @@
         {% if FEED_ALL_RSS %}
         <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
+        {% block extra_head %}{% endblock extra_head %}
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/themes/notmyidea/templates/page.html b/pelican/themes/notmyidea/templates/page.html
index 00c20834..7e50c1f6 100644
--- a/pelican/themes/notmyidea/templates/page.html
+++ b/pelican/themes/notmyidea/templates/page.html
@@ -1,6 +1,14 @@
 {% extends "base.html" %}
 {% block html_lang %}{{ page.lang }}{% endblock %}
 {% block title %}{{ page.title }}{% endblock %}
+
+{% block extra_head %}
+{% import 'translations.html' as translations with context %}
+{% if translations.entry_hreflang(page) %}
+  {{ translations.entry_hreflang(page) }}
+{% endif %}
+{% endblock %}
+
 {% block content %}
 <section id="content" class="body">
     <h1 class="entry-title">{{ page.title }}</h1>
diff --git a/pelican/themes/notmyidea/templates/translations.html b/pelican/themes/notmyidea/templates/translations.html
index 7894bb07..1eec7c43 100644
--- a/pelican/themes/notmyidea/templates/translations.html
+++ b/pelican/themes/notmyidea/templates/translations.html
@@ -2,7 +2,15 @@
 {% if article.translations %}
 Translations:
     {% for translation in article.translations %}
-        <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
+        <a href="{{ SITEURL }}/{{ translation.url }}" hreflang="{{ translation.lang }}">{{ translation.lang }}</a>
     {% endfor %}
 {% endif %}
 {% endmacro %}
+
+{% macro entry_hreflang(entry) %}
+{% if entry.translations %}
+  {% for translation in entry.translations %}
+    <link rel="alternate" hreflang="{{ translation.lang }}" href="{{ SITEURL }}/{{ translation.url }}">
+  {% endfor %}
+{% endif %}
+{% endmacro %}
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index e02596f4..04b9a758 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -5,6 +5,12 @@
 
 {% block head %}
   {{ super() }}
+
+  {% import 'translations.html' as translations with context %}
+  {% if translations.entry_hreflang(article) %}
+    {{ translations.entry_hreflang(article) }}
+  {% endif %}
+
   {% if article.description %}
     <meta name="description" content="{{article.description}}" />
   {% endif %}
diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
index e420c89a..7150d420 100644
--- a/pelican/themes/simple/templates/page.html
+++ b/pelican/themes/simple/templates/page.html
@@ -3,6 +3,15 @@
 
 {% block title %}{{ SITENAME }} - {{ page.title }}{%endblock%}
 
+{% block head %}
+  {{ super() }}
+
+  {% import 'translations.html' as translations with context %}
+  {% if translations.entry_hreflang(page) %}
+    {{ translations.entry_hreflang(page) }}
+  {% endif %}
+{% endblock %}
+
 {% block content %}
     <h1>{{ page.title }}</h1>
     {% import 'translations.html' as translations with context %}
diff --git a/pelican/themes/simple/templates/translations.html b/pelican/themes/simple/templates/translations.html
index db8c372d..f0e2478d 100644
--- a/pelican/themes/simple/templates/translations.html
+++ b/pelican/themes/simple/templates/translations.html
@@ -1,9 +1,16 @@
 {% macro translations_for(article) %}
 {% if article.translations %}
-Translations: 
+Translations:
 {% for translation in article.translations %}
-<a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
+<a href="{{ SITEURL }}/{{ translation.url }}" hreflang="{{ translation.lang }}">{{ translation.lang }}</a>
 {% endfor %}
 {% endif %}
 {% endmacro %}
 
+{% macro entry_hreflang(entry) %}
+{% if entry.translations %}
+  {% for translation in entry.translations %}
+    <link rel="alternate" hreflang="{{ translation.lang }}" href="{{ SITEURL }}/{{ translation.url }}">
+  {% endfor %}
+{% endif %}
+{% endmacro %}

From 6ec5a984ade7589261ccd42f8eebfca0e3d1ce9b Mon Sep 17 00:00:00 2001
From: Allen Zheng <strburst@users.noreply.github.com>
Date: Thu, 5 Jul 2018 15:18:28 -0400
Subject: [PATCH 2057/2864] Show article category/tags even if no authors

Before this commit, the behavior of the simple theme is to hide the
category and tags if there is no author defined, even if the
category/tags are present. This appears to be unintentional, due to a
misplaced `endif`.

Fix this by moving the endif to the right place, so that the other if
blocks aren't nested.
---
 pelican/themes/simple/templates/article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index e02596f4..9a3f3283 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -39,6 +39,7 @@
           <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
         {% endfor %}
     </address>
+    {% endif %}
     {% if article.category %}
     <div class="category">
         Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
@@ -52,7 +53,6 @@
         {% endfor %}
     </div>
     {% endif %}
-    {% endif %}
   </footer><!-- /.post-info -->
   <div class="entry-content">
     {{ article.content }}

From 10f70db9a6ec11fac4333c4098a8453373bf5934 Mon Sep 17 00:00:00 2001
From: Allen Zheng <strburst@users.noreply.github.com>
Date: Thu, 5 Jul 2018 10:06:34 -0400
Subject: [PATCH 2058/2864] Add h1 to the categories list in simple/notmyidea

The authors.html and tags.html templates both have this. Add it here as
well for consistency.

This also affects the notmyidea theme because it inherits the categories
template from simple.

While we're here, also make indentation consistent with other files (4
spaces within a block).
---
 pelican/tests/output/basic/categories.html         | 13 +++++++------
 pelican/tests/output/custom/categories.html        | 13 +++++++------
 pelican/tests/output/custom_locale/categories.html | 13 +++++++------
 pelican/themes/simple/templates/categories.html    | 11 ++++++-----
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index e5a6a429..934c224b 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -20,12 +20,13 @@
                     <li><a href="/category/yeah.html">yeah</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
-<ul>
-    <li><a href="/category/bar.html">bar</a> (1)</li>
-    <li><a href="/category/cat1.html">cat1</a> (4)</li>
-    <li><a href="/category/misc.html">misc</a> (4)</li>
-    <li><a href="/category/yeah.html">yeah</a> (1)</li>
-</ul>
+    <h1>Categories on A Pelican Blog</h1>
+    <ul>
+        <li><a href="/category/bar.html">bar</a> (1)</li>
+        <li><a href="/category/cat1.html">cat1</a> (4)</li>
+        <li><a href="/category/misc.html">misc</a> (4)</li>
+        <li><a href="/category/yeah.html">yeah</a> (1)</li>
+    </ul>
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index ad887b7b..0ab16b05 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -24,12 +24,13 @@
                     <li><a href="./category/bar.html">bar</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
-<ul>
-    <li><a href="./category/bar.html">bar</a> (1)</li>
-    <li><a href="./category/cat1.html">cat1</a> (4)</li>
-    <li><a href="./category/misc.html">misc</a> (4)</li>
-    <li><a href="./category/yeah.html">yeah</a> (1)</li>
-</ul>
+    <h1>Categories on Alexis' log</h1>
+    <ul>
+        <li><a href="./category/bar.html">bar</a> (1)</li>
+        <li><a href="./category/cat1.html">cat1</a> (4)</li>
+        <li><a href="./category/misc.html">misc</a> (4)</li>
+        <li><a href="./category/yeah.html">yeah</a> (1)</li>
+    </ul>
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 694a2bd6..a9ca139a 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -24,12 +24,13 @@
                     <li><a href="./category/bar.html">bar</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
-<ul>
-    <li><a href="./category/bar.html">bar</a> (1)</li>
-    <li><a href="./category/cat1.html">cat1</a> (4)</li>
-    <li><a href="./category/misc.html">misc</a> (4)</li>
-    <li><a href="./category/yeah.html">yeah</a> (1)</li>
-</ul>
+    <h1>Categories on Alexis' log</h1>
+    <ul>
+        <li><a href="./category/bar.html">bar</a> (1)</li>
+        <li><a href="./category/cat1.html">cat1</a> (4)</li>
+        <li><a href="./category/misc.html">misc</a> (4)</li>
+        <li><a href="./category/yeah.html">yeah</a> (1)</li>
+    </ul>
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
diff --git a/pelican/themes/simple/templates/categories.html b/pelican/themes/simple/templates/categories.html
index ec138480..7999de43 100644
--- a/pelican/themes/simple/templates/categories.html
+++ b/pelican/themes/simple/templates/categories.html
@@ -3,9 +3,10 @@
 {% block title %}{{ SITENAME }} - Categories{% endblock %}
 
 {% block content %}
-<ul>
-{% for category, articles in categories|sort %}
-    <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
-{% endfor %}
-</ul>
+    <h1>Categories on {{ SITENAME }}</h1>
+    <ul>
+    {% for category, articles in categories|sort %}
+        <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
+    {% endfor %}
+    </ul>
 {% endblock %}

From bf16faf1e22dd1b68df9109083e1cef76cace84c Mon Sep 17 00:00:00 2001
From: Allen Zheng <strburst@users.noreply.github.com>
Date: Thu, 5 Jul 2018 10:12:10 -0400
Subject: [PATCH 2059/2864] Add missing ul tag in tags list in simple theme

There are some li elements generated without a ul/ol around them.
Besides being malformed html, this results in there being no margin that
lists normally have.
---
 pelican/themes/simple/templates/tags.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/themes/simple/templates/tags.html b/pelican/themes/simple/templates/tags.html
index b5d1482d..78368e23 100644
--- a/pelican/themes/simple/templates/tags.html
+++ b/pelican/themes/simple/templates/tags.html
@@ -4,7 +4,9 @@
 
 {% block content %}
     <h1>Tags for {{ SITENAME }}</h1>
+    <ul>
     {%- for tag, articles in tags|sort %}
         <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
     {% endfor %}
+    </ul>
 {% endblock %}

From a3d76a0fd8f1bc4deab42f87d7a1d2b250c1ea8f Mon Sep 17 00:00:00 2001
From: Allen Zheng <strburst@users.noreply.github.com>
Date: Thu, 5 Jul 2018 10:28:52 -0400
Subject: [PATCH 2060/2864] Remove bad whitespace stripping in simple theme

This joins the contents of the block to the previous line, which messes
up the output formatting in this case.

Old vs new output:
- <ul>        <li>...
+ <ul>
+     <li>...

This change is already in the 'notmyidea' theme.
---
 pelican/themes/simple/templates/authors.html | 3 +--
 pelican/themes/simple/templates/tags.html    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pelican/themes/simple/templates/authors.html b/pelican/themes/simple/templates/authors.html
index 4914904f..9aee5db4 100644
--- a/pelican/themes/simple/templates/authors.html
+++ b/pelican/themes/simple/templates/authors.html
@@ -4,9 +4,8 @@
 
 {% block content %}
     <h1>Authors on {{ SITENAME }}</h1>
-
     <ul>
-    {%- for author, articles in authors|sort %}
+    {% for author, articles in authors|sort %}
         <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
     {% endfor %}
     </ul>
diff --git a/pelican/themes/simple/templates/tags.html b/pelican/themes/simple/templates/tags.html
index 78368e23..b90b0ac3 100644
--- a/pelican/themes/simple/templates/tags.html
+++ b/pelican/themes/simple/templates/tags.html
@@ -5,7 +5,7 @@
 {% block content %}
     <h1>Tags for {{ SITENAME }}</h1>
     <ul>
-    {%- for tag, articles in tags|sort %}
+    {% for tag, articles in tags|sort %}
         <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
     {% endfor %}
     </ul>

From 7d18a4f3b86502fbc956eb917ec5e8432b3494c4 Mon Sep 17 00:00:00 2001
From: David Alfonso <developer@davidalfonso.es>
Date: Sat, 7 Jul 2018 19:48:52 +0200
Subject: [PATCH 2061/2864] Avoid escaping dollars in Makefile template

If dollars are escaped, the commands don't work as expected (i.e. doing
variable substitution).
---
 pelican/tools/templates/Makefile.jinja2 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 4ec5e244..147ce0aa 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -94,24 +94,24 @@ regenerate:
 
 serve:
 ifdef PORT
-	$$(PELICAN) -l $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) -p $$(PORT)
+	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT)
 else
-	$$(PELICAN) -l $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
+	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
 endif
 
 serve-global:
 ifdef SERVER
-	$$(PELICAN) -l $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) -p $$(PORT) -b $$(SERVER)
+	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b $(SERVER)
 else
-	$$(PELICAN) -l $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) -p $$(PORT) -b 0.0.0.0
+	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b 0.0.0.0
 endif
 
 
 devserver:
 ifdef PORT
-	$$(PELICAN) -lr $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) -p $$(PORT)
+	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT)
 else
-	$$(PELICAN) -lr $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
+	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
 endif
 
 publish:

From 6e0ed07446695f54406a28987e7cdcc4d5283213 Mon Sep 17 00:00:00 2001
From: Thomas Fan <thomasjpfan@gmail.com>
Date: Mon, 25 Jun 2018 19:05:42 -0400
Subject: [PATCH 2062/2864] Resolve symlinks before comparison test

Fixes #2358
---
 pelican/tests/test_generators.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index c1899ab8..622e9797 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1024,7 +1024,9 @@ class TestStaticGenerator(unittest.TestCase):
         self.generator.fallback_to_symlinks = True
         self.generator.generate_context()
         self.generator.generate_output(None)
-        self.assertEqual(os.path.realpath(self.endfile), self.startfile)
+        self.assertTrue(os.path.islink(self.endfile))
+        self.assertEqual(os.path.realpath(self.endfile),
+                         os.path.realpath(self.startfile))
 
     def test_delete_existing_file_before_mkdir(self):
         with open(self.startfile, "w") as f:

From c04a4701b88a56248a0130d09583ee850a23cc6b Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Mon, 18 Jun 2018 00:38:23 +0200
Subject: [PATCH 2063/2864] Replace Fabric by Invoke.

---
 CONTRIBUTING.rst                          |   2 +-
 docs/changelog.rst                        |   1 +
 docs/install.rst                          |   4 +-
 docs/publish.rst                          |  39 +++-----
 docs/tips.rst                             |   2 +-
 pelican/tools/pelican_quickstart.py       |   6 +-
 pelican/tools/templates/fabfile.py.jinja2 |  95 ------------------
 pelican/tools/templates/tasks.py.jinja2   | 114 ++++++++++++++++++++++
 8 files changed, 135 insertions(+), 128 deletions(-)
 delete mode 100644 pelican/tools/templates/fabfile.py.jinja2
 create mode 100644 pelican/tools/templates/tasks.py.jinja2

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 26ae338a..37fc7ffb 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -27,7 +27,7 @@ Before you ask for help, please make sure you do the following:
 * no plugins or only those related to the issue
 
 **NOTE:** The most common sources of problems are anomalies in (1) themes,
-(2) settings files, and (3) ``make``/``fab`` automation wrappers. If you can't
+(2) settings files, and (3) ``make``/``invoke`` automation wrappers. If you can't
 reproduce your problem when using the following steps to generate your site,
 then the problem is almost certainly with your chosen theme and/or settings
 file (and not Pelican itself)::
diff --git a/docs/changelog.rst b/docs/changelog.rst
index aa594a2c..883c86d0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Next release
 ============
 
 * New signal: ``feed_generated``
+* Replace Fabric by Invoke and ``fabfile.py`` template by ``tasks.py``.
 
 3.7.1 (2017-01-10)
 ==================
diff --git a/docs/install.rst b/docs/install.rst
index 8075632f..09097666 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -101,9 +101,9 @@ can optionally add yourself if you plan to create non-chronological content)::
 
     yourproject/
     ├── content
-    │   └── (pages)
+    │   └── (pages)
     ├── output
-    ├── fabfile.py
+    ├── tasks.py
     ├── Makefile
     ├── pelicanconf.py       # Main settings file
     └── publishconf.py       # Settings to use when ready to publish
diff --git a/docs/publish.rst b/docs/publish.rst
index 7fb4b587..9b49ae3f 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -101,7 +101,7 @@ While the ``pelican`` command is the canonical way to generate your site,
 automation tools can be used to streamline the generation and publication
 flow. One of the questions asked during the ``pelican-quickstart`` process
 pertains to whether you want to automate site generation and publication.
-If you answered "yes" to that question, a ``fabfile.py`` and
+If you answered "yes" to that question, a ``tasks.py`` and
 ``Makefile`` will be generated in the root of your project. These files,
 pre-populated with certain information gleaned from other answers provided
 during the ``pelican-quickstart`` process, are meant as a starting point and
@@ -113,55 +113,43 @@ files can deleted at any time and will not affect usage of the canonical
 Following are automation tools that "wrap" the ``pelican`` command and can
 simplify the process of generating, previewing, and uploading your site.
 
-Fabric
+Invoke
 ------
 
-The advantage of Fabric_ is that it is written in Python and thus can be used
+The advantage of Invoke_ is that it is written in Python and thus can be used
 in a wide range of environments. The downside is that it must be installed
-separately. Use the following command to install Fabric, prefixing with
+separately. Use the following command to install Invoke, prefixing with
 ``sudo`` if your environment requires it::
 
-    pip install Fabric
+    pip install invoke
 
-.. note:: Installing PyCrypto on Windows
-
-    Fabric depends upon PyCrypto_, which is tricky to install
-    if your system doesn't have a C compiler.
-    For Windows users, before installing Fabric, use
-    ``easy_install http://www.voidspace.org.uk/downloads/pycrypto26/pycrypto-2.6.win32-py2.7.exe``
-    per this `StackOverflow suggestion <http://stackoverflow.com/a/11405769/6364>`_
-    You're more likely to have success
-    with the Win32 versions of Python 2.7 and PyCrypto,
-    than with the Win64—\
-    even if your operating system is a 64-bit version of Windows.
-
-Take a moment to open the ``fabfile.py`` file that was generated in your
+Take a moment to open the ``tasks.py`` file that was generated in your
 project root. You will see a number of commands, any one of which can be
 renamed, removed, and/or customized to your liking. Using the out-of-the-box
 configuration, you can generate your site via::
 
-    fab build
+    invoke build
 
 If you'd prefer to have Pelican automatically regenerate your site every time a
 change is detected (which is handy when testing locally), use the following
 command instead::
 
-    fab regenerate
+    invoke regenerate
 
 To serve the generated site so it can be previewed in your browser at
 http://localhost:8000/::
 
-    fab serve
+    invoke serve
 
 If during the ``pelican-quickstart`` process you answered "yes" when asked
 whether you want to upload your site via SSH, you can use the following command
 to publish your site via rsync over SSH::
 
-    fab publish
+    invoke publish
 
 These are just a few of the commands available by default, so feel free to
-explore ``fabfile.py`` and see what other commands are available. More
-importantly, don't hesitate to customize ``fabfile.py`` to suit your specific
+explore ``tasks.py`` and see what other commands are available. More
+importantly, don't hesitate to customize ``tasks.py`` to suit your specific
 needs and preferences.
 
 Make
@@ -216,5 +204,4 @@ That's it! Your site should now be live.
 executables, such as ``python3``, you can set the ``PY`` and ``PELICAN``
 environment variables, respectively, to override the default executable names.)
 
-.. _Fabric: http://fabfile.org/
-.. _PyCrypto: http://pycrypto.org
+.. _Invoke: http://www.pyinvoke.org
diff --git a/docs/tips.rst b/docs/tips.rst
index 4e89d148..f9da8217 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -67,7 +67,7 @@ already exist). The ``git push origin gh-pages`` command updates the remote
 ``gh-pages`` branch, effectively publishing the Pelican site.
 
 .. note::
-    The ``github`` target of the Makefile (and the ``gh_pages`` task of the Fabfile)
+    The ``github`` target of the Makefile (and the ``gh_pages`` task of ``tasks.py``)
     created by the ``pelican-quickstart`` command
     publishes the Pelican site as Project Pages, as described above.
 
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 7033cf28..1c6cbce9 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -266,7 +266,7 @@ needed by Pelican.
     CONF['timezone'] = ask_timezone('What is your time zone?',
                                     CONF['timezone'], _TZ_URL)
 
-    automation = ask('Do you want to generate a Fabfile/Makefile '
+    automation = ask('Do you want to generate a tasks.py/Makefile '
                      'to automate generation and publishing?', bool, True)
 
     if automation:
@@ -364,9 +364,9 @@ needed by Pelican.
 
     if automation:
         try:
-            with codecs.open(os.path.join(CONF['basedir'], 'fabfile.py'),
+            with codecs.open(os.path.join(CONF['basedir'], 'tasks.py'),
                              'w', 'utf-8') as fd:
-                _template = _jinja_env.get_template('fabfile.py.jinja2')
+                _template = _jinja_env.get_template('tasks.py.jinja2')
                 fd.write(_template.render(**CONF))
                 fd.close()
         except OSError as e:
diff --git a/pelican/tools/templates/fabfile.py.jinja2 b/pelican/tools/templates/fabfile.py.jinja2
deleted file mode 100644
index 467f9ec2..00000000
--- a/pelican/tools/templates/fabfile.py.jinja2
+++ /dev/null
@@ -1,95 +0,0 @@
-from fabric.api import *
-import fabric.contrib.project as project
-import os
-import shutil
-import sys
-
-# Local path configuration (can be absolute or relative to fabfile)
-env.deploy_path = 'output'
-DEPLOY_PATH = env.deploy_path
-
-{% if ssh %}
-# Remote server configuration
-production = '{{ssh_user}}@{{ssh_host}}:{{ssh_port}}'
-dest_path = '{{ssh_target_dir}}'
-
-{% endif %}
-{% if cloudfiles %}
-# Rackspace Cloud Files configuration settings
-env.cloudfiles_username = '{{cloudfiles_username}}'
-env.cloudfiles_api_key = '{{cloudfiles_api_key}}'
-env.cloudfiles_container = '{{cloudfiles_container}}'
-
-{% endif %}
-{% if github %}
-# Github Pages configuration
-env.github_pages_branch = '{{github_pages_branch}}'
-{% endif %}
-
-# Port for `serve`
-PORT = 8000
-
-def clean():
-    """Remove generated files"""
-    if os.path.isdir(DEPLOY_PATH):
-        shutil.rmtree(DEPLOY_PATH)
-        os.makedirs(DEPLOY_PATH)
-
-def build():
-    """Build local version of site"""
-    local('pelican -s pelicanconf.py')
-
-def rebuild():
-    """`build` with the delete switch"""
-    local('pelican -d -s pelicanconf.py')
-
-def regenerate():
-    """Automatically regenerate site upon file modification"""
-    local('pelican -r -s pelicanconf.py')
-
-def serve():
-    """Serve site at http://localhost:8000/"""
-    local('pelican -l -s pelicanconf.py')
-
-def devserver():
-    """Serve site at http://localhost:8000/ and regenerate automatically"""
-    local('pelican -r -l -s pelicanconf.py')
-
-def reserve():
-    """`build`, then `serve`"""
-    build()
-    serve()
-
-def preview():
-    """Build production version of site"""
-    local('pelican -s publishconf.py')
-
-{% if cloudfiles %}
-def cf_upload():
-    """Publish to Rackspace Cloud Files"""
-    rebuild()
-    with lcd(DEPLOY_PATH):
-        local('swift -v -A https://auth.api.rackspacecloud.com/v1.0 '
-              '-U {cloudfiles_username} '
-              '-K {cloudfiles_api_key} '
-              'upload -c {cloudfiles_container} .'.format(**env))
-{% endif %}
-
-@hosts(production)
-def publish():
-    """Publish to production via rsync"""
-    local('pelican -s publishconf.py')
-    project.rsync_project(
-        remote_dir=dest_path,
-        exclude=".DS_Store",
-        local_dir=DEPLOY_PATH.rstrip('/') + '/',
-        delete=True,
-        extra_opts='-c',
-    )
-
-{% if github %}
-def gh_pages():
-    """Publish to GitHub Pages"""
-    rebuild()
-    local("ghp-import -b {github_pages_branch} {deploy_path} -p".format(**env))
-{% endif %}
diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
new file mode 100644
index 00000000..d9645e19
--- /dev/null
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+
+import os
+import shutil
+import sys
+try:
+    import socketserver
+except ImportError:
+    import SocketServer as socketserver
+
+from invoke import task
+from invoke.util import cd
+from pelican.server import ComplexHTTPRequestHandler
+
+CONFIG = {
+    # Local path configuration (can be absolute or relative to tasks.py)
+    'deploy_path': 'output',
+{% if ssh %}
+    # Remote server configuration
+    'production': '{{ssh_user}}@{{ssh_host}}:{{ssh_port}}',
+    'dest_path': '{{ssh_target_dir}}',
+{% endif %}
+{% if cloudfiles %}
+    # Rackspace Cloud Files configuration settings
+    'cloudfiles_username': '{{cloudfiles_username}}',
+    'cloudfiles_api_key': '{{cloudfiles_api_key}}',
+    'cloudfiles_container': '{{cloudfiles_container}}',
+{% endif %}
+{% if github %}
+    # Github Pages configuration
+    'github_pages_branch': '{{github_pages_branch}}',
+{% endif %}
+    # Port for `serve`
+    'port': 8000,
+}
+
+@task
+def clean(c):
+    """Remove generated files"""
+    if os.path.isdir(CONFIG['deploy_path']):
+        shutil.rmtree(CONFIG['deploy_path'])
+        os.makedirs(CONFIG['deploy_path'])
+
+@task
+def build(c):
+    """Build local version of site"""
+    c.run('pelican -s pelicanconf.py')
+
+@task
+def rebuild(c):
+    """`build` with the delete switch"""
+    c.run('pelican -d -s pelicanconf.py')
+
+@task
+def regenerate(c):
+    """Automatically regenerate site upon file modification"""
+    c.run('pelican -r -s pelicanconf.py')
+
+@task
+def serve(c):
+    """Serve site at http://localhost:8000/"""
+    os.chdir(CONFIG['deploy_path'])
+
+    class AddressReuseTCPServer(socketserver.TCPServer):
+        allow_reuse_address = True
+
+    server = AddressReuseTCPServer(
+        ('', CONFIG['port']),
+        ComplexHTTPRequestHandler)
+
+    sys.stderr.write('Serving on port {port} ...\n'.format(**CONFIG))
+    server.serve_forever()
+
+@task
+def reserve(c):
+    """`build`, then `serve`"""
+    build(c)
+    serve(c)
+
+@task
+def preview(c):
+    """Build production version of site"""
+    c.run('pelican -s publishconf.py')
+
+{% if cloudfiles %}
+@task
+def cf_upload(c):
+    """Publish to Rackspace Cloud Files"""
+    rebuild(c)
+    with cd(CONFIG['deploy_path']):
+        c.run('swift -v -A https://auth.api.rackspacecloud.com/v1.0 '
+              '-U {cloudfiles_username} '
+              '-K {cloudfiles_api_key} '
+              'upload -c {cloudfiles_container} .'.format(**CONFIG))
+{% endif %}
+
+@task
+def publish(c):
+    """Publish to production via rsync"""
+    c.run('pelican -s publishconf.py')
+    c.run(
+        'rsync --delete --exclude ".DS_Store" -pthrvz -c '
+        '{} {production}:{dest_path}'.format(
+            CONFIG['deploy_path'].rstrip('/') + '/',
+            **CONFIG))
+
+{% if github %}
+@task
+def gh_pages(c):
+    """Publish to GitHub Pages"""
+    rebuild(c)
+    c.run("ghp-import -b {github_pages_branch} {deploy_path} -p".format(
+        **CONFIG))
+{% endif %}

From a5571ba1d56b56841d70d36eddf3b9dffbb79aaa Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Mon, 9 Jul 2018 11:26:50 +0200
Subject: [PATCH 2064/2864] importer: update links to attachments if
 --wp-attach

---
 docs/importer.rst               |  5 +++--
 pelican/tools/pelican_import.py | 37 +++++++++++++++++++++------------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 6a979be6..713cc3a3 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -80,10 +80,11 @@ Optional arguments
                         as "/post_type/category/" (wordpress import only)
   --wp-attach           Download files uploaded to wordpress as attachments.
                         Files will be added to posts as a list in the post
-                        header. All files will be downloaded, even if they
+                        header and links to the files within the post will be
+                        updated. All files will be downloaded, even if they
                         aren't associated with a post. Files will be downloaded
                         with their original path inside the output directory,
-                        e.g. "output/wp-uploads/date/postname/file.jpg"
+                        e.g. "output/wp-uploads/date/postname/file.jpg".
                         (wordpress import only) (requires an internet
                         connection)
   --disable-slugs       Disable storing slugs from imported posts within
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index abeccd9d..63d1b336 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -10,6 +10,7 @@ import subprocess
 import sys
 import time
 from codecs import open
+from collections import defaultdict
 
 from six.moves.urllib.error import URLError
 from six.moves.urllib.parse import urlparse
@@ -633,7 +634,7 @@ def get_attachments(xml):
         else:
             filename = get_filename(filename, post_id)
             names[post_id] = filename
-    attachedposts = {}
+    attachedposts = defaultdict(list)
     for parent, url in attachments:
         try:
             parent_name = names[parent]
@@ -641,11 +642,7 @@ def get_attachments(xml):
             # attachment's parent is not a valid post
             parent_name = None
 
-        try:
-            attachedposts[parent_name].append(url)
-        except KeyError:
-            attachedposts[parent_name] = []
-            attachedposts[parent_name].append(url)
+        attachedposts[parent_name].append(url)
     return attachedposts
 
 
@@ -653,7 +650,7 @@ def download_attachments(output_path, urls):
     """Downloads WordPress attachments and returns a list of paths to
     attachments that can be associated with a post (relative path to output
     directory). Files that fail to download, will not be added to posts"""
-    locations = []
+    locations = {}
     for url in urls:
         path = urlparse(url).path
         # teardown path and rebuild to negate any errors with
@@ -670,13 +667,23 @@ def download_attachments(output_path, urls):
         print('downloading {}'.format(filename))
         try:
             urlretrieve(url, os.path.join(full_path, filename))
-            locations.append(os.path.join(localpath, filename))
+            locations[url] = os.path.join(localpath, filename)
         except (URLError, IOError) as e:
             # Python 2.7 throws an IOError rather Than URLError
             logger.warning("No file could be downloaded from %s\n%s", url, e)
     return locations
 
 
+def update_links_to_attached_files(content, attachments):
+    for old_url, new_path in attachments.items():
+        # url may occur both with http:// and https://
+        http_url = old_url.replace('https://', 'http://')
+        https_url = old_url.replace('http://', 'https://')
+        for url in [http_url, https_url]:
+            content = content.replace(url, '{filename}' + new_path)
+    return content
+
+
 def fields2pelican(
         fields, out_markup, output_path,
         dircat=False, strip_raw=False, disable_slugs=False,
@@ -691,21 +698,22 @@ def fields2pelican(
         if wp_attach and attachments:
             try:
                 urls = attachments[filename]
-                attached_files = download_attachments(output_path, urls)
+                links = download_attachments(output_path, urls)
             except KeyError:
-                attached_files = None
+                links = None
         else:
-            attached_files = None
+            links = None
 
         ext = get_ext(out_markup, in_markup)
         if ext == '.md':
             header = build_markdown_header(
                 title, date, author, categories, tags, slug,
-                status, attached_files)
+                status, links.values() if links else None)
         else:
             out_markup = 'rst'
             header = build_header(title, date, author, categories,
-                                  tags, slug, status, attached_files)
+                                  tags, slug, status, links.values()
+                                  if links else None)
 
         out_filename = get_out_filename(
             output_path, filename, ext, kind, dirpage, dircat,
@@ -756,6 +764,9 @@ def fields2pelican(
                     content = content.replace('\\\n ', '  \n')
                     content = content.replace('\\\n', '  \n')
 
+            if wp_attach and links:
+                content = update_links_to_attached_files(content, links)
+
         with open(out_filename, 'w', encoding='utf-8') as fs:
             fs.write(header + content)
     if wp_attach and attachments and None in attachments:

From 62128fb948b0e868f513e150f5de2197c5c46b68 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Thu, 12 Jul 2018 13:41:05 +0200
Subject: [PATCH 2065/2864] control pagination per template

---
 docs/settings.rst                |  9 +++++----
 pelican/generators.py            | 29 ++++++++++++++--------------
 pelican/paginator.py             |  9 ++++-----
 pelican/settings.py              | 13 ++++++++++++-
 pelican/tests/test_generators.py | 33 +++++++++++++++++++++++---------
 pelican/tests/test_paginator.py  |  3 +--
 pelican/tests/test_settings.py   |  9 +++++++++
 pelican/writers.py               | 20 ++++++++++++++-----
 8 files changed, 84 insertions(+), 41 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index a4fc0ba5..e09a90dc 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -755,10 +755,6 @@ Template pages
    ``DIRECT_TEMPLATES`` are searched for over paths maintained in
    ``THEME_TEMPLATES_OVERRIDES``.
 
-.. data:: PAGINATED_DIRECT_TEMPLATES = ['index']
-
-   Provides the direct templates that should be paginated.
-
 
 Metadata
 ========
@@ -1000,6 +996,11 @@ You can use the following settings to configure the pagination.
    The maximum number of articles to include on a page, not including orphans.
    False to disable pagination.
 
+.. data:: PAGINATED_TEMPLATES = {'index': None, 'tag': None, 'category': None, 'author': None}
+
+   The templates to use pagination with, and the number of articles to include
+   on a page. If this value is ``None``, it defaults to ``DEFAULT_PAGINATION``.
+
 .. data:: PAGINATION_PATTERNS
 
    A set of patterns that are used to determine advanced pagination output.
diff --git a/pelican/generators.py b/pelican/generators.py
index d176e4ee..c7fc4a9e 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -456,6 +456,7 @@ class ArticlesGenerator(CachingGenerator):
             # `dates` is already sorted by date
             for _period, group in groupby(dates, key=key):
                 archive = list(group)
+                articles = [a for a in self.articles if a in archive]
                 # arbitrarily grab the first date so that the usual
                 # format string syntax can be used for specifying the
                 # period archive dates
@@ -478,8 +479,9 @@ class ArticlesGenerator(CachingGenerator):
                                              month_name,
                                              _period[2])
 
-                write(save_as, template, context,
-                      dates=archive, blog=True, url=url)
+                write(save_as, template, context, articles=articles,
+                      dates=archive, template_name='period_archives',
+                      blog=True, url=url)
 
         for period in 'year', 'month', 'day':
             save_as = period_save_as[period]
@@ -490,11 +492,7 @@ class ArticlesGenerator(CachingGenerator):
 
     def generate_direct_templates(self, write):
         """Generate direct templates pages"""
-        PAGINATED_TEMPLATES = self.settings['PAGINATED_DIRECT_TEMPLATES']
         for template in self.settings['DIRECT_TEMPLATES']:
-            paginated = {}
-            if template in PAGINATED_TEMPLATES:
-                paginated = {'articles': self.articles, 'dates': self.dates}
             save_as = self.settings.get("%s_SAVE_AS" % template.upper(),
                                         '%s.html' % template)
             url = self.settings.get("%s_URL" % template.upper(),
@@ -502,8 +500,9 @@ class ArticlesGenerator(CachingGenerator):
             if not save_as:
                 continue
 
-            write(save_as, self.get_template(template),
-                  self.context, blog=True, paginated=paginated,
+            write(save_as, self.get_template(template), self.context,
+                  articles=self.articles, dates=self.dates, blog=True,
+                  template_name=template,
                   page_name=os.path.splitext(save_as)[0], url=url)
 
     def generate_tags(self, write):
@@ -513,18 +512,18 @@ class ArticlesGenerator(CachingGenerator):
             dates = [article for article in self.dates if article in articles]
             write(tag.save_as, tag_template, self.context, tag=tag,
                   url=tag.url, articles=articles, dates=dates,
-                  paginated={'articles': articles, 'dates': dates}, blog=True,
-                  page_name=tag.page_name, all_articles=self.articles)
+                  template_name='tag', blog=True, page_name=tag.page_name,
+                  all_articles=self.articles)
 
     def generate_categories(self, write):
         """Generate category pages."""
         category_template = self.get_template('category')
         for cat, articles in self.categories:
             dates = [article for article in self.dates if article in articles]
-            write(cat.save_as, category_template, self.context,
-                  url=cat.url, category=cat, articles=articles, dates=dates,
-                  paginated={'articles': articles, 'dates': dates}, blog=True,
-                  page_name=cat.page_name, all_articles=self.articles)
+            write(cat.save_as, category_template, self.context, url=cat.url,
+                  category=cat, articles=articles, dates=dates,
+                  template_name='category', blog=True, page_name=cat.page_name,
+                  all_articles=self.articles)
 
     def generate_authors(self, write):
         """Generate Author pages."""
@@ -533,7 +532,7 @@ class ArticlesGenerator(CachingGenerator):
             dates = [article for article in self.dates if article in articles]
             write(aut.save_as, author_template, self.context,
                   url=aut.url, author=aut, articles=articles, dates=dates,
-                  paginated={'articles': articles, 'dates': dates}, blog=True,
+                  template_name='author', blog=True,
                   page_name=aut.page_name, all_articles=self.articles)
 
     def generate_drafts(self, write):
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 6996cae9..a0ce7c95 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -17,15 +17,14 @@ PaginationRule = namedtuple(
 
 
 class Paginator(object):
-    def __init__(self, name, url, object_list, settings):
+    def __init__(self, name, url, object_list, settings, per_page=None):
         self.name = name
         self.url = url
         self.object_list = object_list
         self.settings = settings
-
-        if settings.get('DEFAULT_PAGINATION'):
-            self.per_page = settings.get('DEFAULT_PAGINATION')
-            self.orphans = settings.get('DEFAULT_ORPHANS')
+        if per_page:
+            self.per_page = per_page
+            self.orphans = settings['DEFAULT_ORPHANS']
         else:
             self.per_page = len(object_list)
             self.orphans = 0
diff --git a/pelican/settings.py b/pelican/settings.py
index b6f481d2..9845dd18 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -108,7 +108,8 @@ DEFAULT_CONFIG = {
     'DEFAULT_LANG': 'en',
     'DIRECT_TEMPLATES': ['index', 'tags', 'categories', 'authors', 'archives'],
     'THEME_TEMPLATES_OVERRIDES': [],
-    'PAGINATED_DIRECT_TEMPLATES': ['index'],
+    'PAGINATED_TEMPLATES': {'index': None, 'tag': None, 'category': None,
+                            'author': None},
     'PELICAN_CLASS': 'pelican.Pelican',
     'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
     'DATE_FORMATS': {},
@@ -455,4 +456,14 @@ def configure_settings(settings):
                 message += ', see {} for details'.format(doc)
             logger.warning(message)
 
+    if 'PAGINATED_DIRECT_TEMPLATES' in settings:
+        message = 'The {} setting has been removed in favor of {}'.format(
+            'PAGINATED_DIRECT_TEMPLATES', 'PAGINATED_TEMPLATES')
+        logger.warning(message)
+
+        for t in settings['PAGINATED_DIRECT_TEMPLATES']:
+            if t not in settings['PAGINATED_TEMPLATES']:
+                settings['PAGINATED_TEMPLATES'][t] = None
+        del settings['PAGINATED_DIRECT_TEMPLATES']
+
     return settings
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 5f673d00..11ae144a 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -337,8 +337,10 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_direct_templates(write)
         write.assert_called_with("archives.html",
                                  generator.get_template("archives"), settings,
-                                 blog=True, paginated={}, page_name='archives',
-                                 url="archives.html")
+                                 articles=generator.articles,
+                                 dates=generator.dates, blog=True,
+                                 template_name='archives',
+                                 page_name='archives', url="archives.html")
 
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_direct_templates_save_as_url_modified(self):
@@ -355,7 +357,9 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_direct_templates(write)
         write.assert_called_with("archives/index.html",
                                  generator.get_template("archives"), settings,
-                                 blog=True, paginated={},
+                                 articles=generator.articles,
+                                 dates=generator.dates, blog=True,
+                                 template_name='archives',
                                  page_name='archives/index',
                                  url="archives/")
 
@@ -404,13 +408,15 @@ class TestArticlesGenerator(unittest.TestCase):
         write = MagicMock()
         generator.generate_period_archives(write)
         dates = [d for d in generator.dates if d.date.year == 1970]
+        articles = [d for d in generator.articles if d.date.year == 1970]
         self.assertEqual(len(dates), 1)
         # among other things it must have at least been called with this
         settings["period"] = (1970,)
         write.assert_called_with("posts/1970/index.html",
                                  generator.get_template("period_archives"),
-                                 settings,
-                                 blog=True, dates=dates, url="posts/1970/")
+                                 settings, blog=True, articles=articles,
+                                 dates=dates, template_name='period_archives',
+                                 url="posts/1970/")
 
         del settings["period"]
         settings['MONTH_ARCHIVE_SAVE_AS'] = \
@@ -425,13 +431,16 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_period_archives(write)
         dates = [d for d in generator.dates
                  if d.date.year == 1970 and d.date.month == 1]
+        articles = [d for d in generator.articles
+                    if d.date.year == 1970 and d.date.month == 1]
         self.assertEqual(len(dates), 1)
         settings["period"] = (1970, "January")
         # among other things it must have at least been called with this
         write.assert_called_with("posts/1970/Jan/index.html",
                                  generator.get_template("period_archives"),
-                                 settings,
-                                 blog=True, dates=dates, url="posts/1970/Jan/")
+                                 settings, blog=True, articles=articles,
+                                 dates=dates, template_name='period_archives',
+                                 url="posts/1970/Jan/")
 
         del settings["period"]
         settings['DAY_ARCHIVE_SAVE_AS'] = \
@@ -450,13 +459,19 @@ class TestArticlesGenerator(unittest.TestCase):
             d.date.month == 1 and
             d.date.day == 1
         ]
+        articles = [
+            d for d in generator.articles if
+            d.date.year == 1970 and
+            d.date.month == 1 and
+            d.date.day == 1
+        ]
         self.assertEqual(len(dates), 1)
         settings["period"] = (1970, "January", 1)
         # among other things it must have at least been called with this
         write.assert_called_with("posts/1970/Jan/01/index.html",
                                  generator.get_template("period_archives"),
-                                 settings,
-                                 blog=True, dates=dates,
+                                 settings, blog=True, articles=articles,
+                                 dates=dates, template_name='period_archives',
                                  url="posts/1970/Jan/01/")
         locale.setlocale(locale.LC_ALL, old_locale)
 
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 12403410..6174dca1 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -66,13 +66,12 @@ class TestPage(unittest.TestCase):
             (1, '/{url}', '{base_name}/index.html'),
             (2, '/{url}{number}/', '{base_name}/{number}/index.html')
         ]]
-        settings['DEFAULT_PAGINATION'] = 1
 
         self.page_kwargs['metadata']['author'] = Author('Blogger', settings)
         object_list = [Article(**self.page_kwargs),
                        Article(**self.page_kwargs)]
         paginator = Paginator('blog/index.html', '//blog.my.site/',
-                              object_list, settings)
+                              object_list, settings, 1)
         page1 = paginator.page(1)
         self.assertEqual(page1.save_as, 'blog/index.html')
         self.assertEqual(page1.url, '//blog.my.site/')
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 4ec16c0f..393c4337 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -177,6 +177,15 @@ class TestSettingsConfiguration(unittest.TestCase):
                          ['/foo/bar', '/ha'])
         self.assertNotIn('EXTRA_TEMPLATES_PATHS', settings)
 
+    def test_deprecated_paginated_direct_templates(self):
+        settings = self.settings
+        settings['PAGINATED_DIRECT_TEMPLATES'] = ['index', 'archives']
+        settings['PAGINATED_TEMPLATES'] = {'index': 10, 'category': None}
+        settings = configure_settings(settings)
+        self.assertEqual(settings['PAGINATED_TEMPLATES'],
+                         {'index': 10, 'category': None, 'archives': None})
+        self.assertNotIn('PAGINATED_DIRECT_TEMPLATES', settings)
+
     def test_theme_and_extra_templates_exception(self):
         settings = self.settings
         settings['EXTRA_TEMPLATES_PATHS'] = ['/ha']
diff --git a/pelican/writers.py b/pelican/writers.py
index 523af0d0..9311aa10 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -151,7 +151,8 @@ class Writer(object):
         return feed
 
     def write_file(self, name, template, context, relative_urls=False,
-                   paginated=None, override_output=False, url=None, **kwargs):
+                   paginated=None, template_name=None, override_output=False,
+                   url=None, **kwargs):
         """Render the template and write the file.
 
         :param name: name of the file to output
@@ -160,6 +161,7 @@ class Writer(object):
         :param relative_urls: use relative urls or absolutes ones
         :param paginated: dict of article list to paginate - must have the
             same length (same list in different orders)
+        :param template_name: the template name, for pagination
         :param override_output: boolean telling if we can override previous
             output with the same name (and if next files written with the same
             name should be skipped to keep that one)
@@ -209,11 +211,19 @@ class Writer(object):
             localcontext.update(kwargs)
             return localcontext
 
-        # pagination
-        if paginated:
+        if paginated is None:
+            paginated = {key: val for key, val in kwargs.items()
+                         if key in {'articles', 'dates'}}
 
-            # pagination needed, init paginators
-            paginators = {key: Paginator(name, url, val, self.settings)
+        # pagination
+        if paginated and template_name in self.settings['PAGINATED_TEMPLATES']:
+            # pagination needed
+            per_page = self.settings['PAGINATED_TEMPLATES'][template_name] \
+                or self.settings['DEFAULT_PAGINATION']
+
+            # init paginators
+            paginators = {key: Paginator(name, url, val, self.settings,
+                                         per_page)
                           for key, val in paginated.items()}
 
             # generated pages, and write

From 6d4fcedaccc6a95658bc44ea377f8e28f1ec50b6 Mon Sep 17 00:00:00 2001
From: Jiachen YANG <farseerfc@gmail.com>
Date: Wed, 25 Jul 2018 15:47:35 +0900
Subject: [PATCH 2066/2864] fix DeprecationWarnning about collections.abc

---
 pelican/tests/test_pelican.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index c003c78f..ed70944a 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function, unicode_literals
 
-import collections
+import collections.abc
 import locale
 import logging
 import os
@@ -91,7 +91,7 @@ class TestPelican(LoggedTestCase):
             generator_classes[-1] is StaticGenerator,
             "StaticGenerator must be the last generator, but it isn't!")
         self.assertIsInstance(
-            generator_classes, collections.Sequence,
+            generator_classes, collections.abc.Sequence,
             "get_generator_classes() must return a Sequence to preserve order")
 
     def test_basic_generation_works(self):

From 500c55697450a26cc1c74013302128b7de1599c8 Mon Sep 17 00:00:00 2001
From: Jiachen YANG <farseerfc@gmail.com>
Date: Wed, 25 Jul 2018 16:27:36 +0900
Subject: [PATCH 2067/2864] fix travis tests for py27 by try import
 collections.abc

---
 pelican/tests/test_pelican.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index ed70944a..93c240c2 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function, unicode_literals
 
-import collections.abc
+try:
+    import collections.abc as collections
+except ImportError:
+    import collections
+
 import locale
 import logging
 import os
@@ -91,7 +95,7 @@ class TestPelican(LoggedTestCase):
             generator_classes[-1] is StaticGenerator,
             "StaticGenerator must be the last generator, but it isn't!")
         self.assertIsInstance(
-            generator_classes, collections.abc.Sequence,
+            generator_classes, collections.Sequence,
             "get_generator_classes() must return a Sequence to preserve order")
 
     def test_basic_generation_works(self):

From 31fd6c6da6c8e7d9ab3bac9a0e40ddadacc1359e Mon Sep 17 00:00:00 2001
From: Bernardo Gomes <bgomesdeabreu@gmail.com>
Date: Sun, 29 Jul 2018 19:26:03 -0300
Subject: [PATCH 2068/2864] ghp-import ouput update the branch gh-pages

---
 docs/tips.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tips.rst b/docs/tips.rst
index f9da8217..8a0edc72 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -58,7 +58,7 @@ repository, and if you want to publish that Pelican site in the form of Project
 Pages to this repository, you can then use the following::
 
     $ pelican content -o output -s pelicanconf.py
-    $ ghp-import output
+    $ ghp-import output -b gh-pages
     $ git push origin gh-pages
 
 The ``ghp-import output`` command updates the local ``gh-pages`` branch with
@@ -87,7 +87,7 @@ your ``<username>.github.io`` repository on GitHub.
 Again, you can take advantage of ``ghp-import``::
 
     $ pelican content -o output -s pelicanconf.py
-    $ ghp-import output
+    $ ghp-import output -b gh-pages
     $ git push git@github.com:elemoine/elemoine.github.io.git gh-pages:master
 
 The ``git push`` command pushes the local ``gh-pages`` branch (freshly updated

From 36d61438c19be52cfc335e69254dbb6c576c390e Mon Sep 17 00:00:00 2001
From: Ryan Fox <ryan@foxrow.com>
Date: Mon, 30 Jul 2018 22:36:11 -0500
Subject: [PATCH 2069/2864] clarify error message when running deprecated
 command for dev server. Fixes #2390

---
 pelican/server.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pelican/server.py b/pelican/server.py
index 1f4c6041..09eeb493 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -131,6 +131,11 @@ if __name__ == '__main__':
         logging.error("Could not listen on port %s, server %s.",
                       args.port, args.server)
         sys.exit(getattr(e, 'exitcode', 1))
+    except TypeError as e:
+        logging.error("'python -m pelican.server' is deprecated. The " +
+                      "Pelican development server should be run via " +
+                      "'pelican --listen'")
+        sys.exit(getattr(e, 'exitcode', 1))
 
     logging.info("Serving at port %s, server %s.",
                  args.port, args.server)

From d2eb32c9106a0df87495da6464d0b9d037de4a1d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 3 Aug 2018 14:57:22 +0200
Subject: [PATCH 2070/2864] Remove *.in files from MANIFEST.in

There no longer appear to be any *.in files in this project, presumably
because we switched to Jinja2 templates instead. Refs #1155
---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 64ed4b3c..49e2bef9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include *.rst
-recursive-include pelican *.html *.css *png *.in *.rst *.markdown *.md *.mkd *.xml *.py
+recursive-include pelican *.html *.css *png *.rst *.markdown *.md *.mkd *.xml *.py
 include LICENSE THANKS docs/changelog.rst

From 150d1f05d0a25fc791e0e4b14060303a2742996b Mon Sep 17 00:00:00 2001
From: David Alfonso <developer@davidalfonso.es>
Date: Tue, 26 Jun 2018 18:47:42 +0200
Subject: [PATCH 2071/2864] Add pandoc2 support to pelican-import. Fix #2255

Specific options passed to pandoc2 in order to get similar results than
with pandoc1:

- Disable smart quotes from the markdown output.

- Enable raw parsing from html.
---
 pelican/tests/content/wordpressexport.xml |  6 +++-
 pelican/tests/test_importer.py            | 13 ++++++++
 pelican/tools/pelican_import.py           | 40 ++++++++++++++++++++---
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/pelican/tests/content/wordpressexport.xml b/pelican/tests/content/wordpressexport.xml
index 686b0fa7..9b194e8f 100644
--- a/pelican/tests/content/wordpressexport.xml
+++ b/pelican/tests/content/wordpressexport.xml
@@ -554,7 +554,11 @@ Pelicans are supposed to eat fish, damn it!
 
 <iframe width="420" height="315" src="http://www.youtube.com/embed/QNNl_uWmQXE" frameborder="0" allowfullscreen></iframe>
 
-Bottom line: don't mess up with birds]]></content:encoded>
+Bottom line: don't mess up with birds
+
+"That's a 'wonderful' shoe."
+
+“That’s a ‘magic’ sock.”]]></content:encoded>
         <excerpt:encoded><![CDATA[]]></excerpt:encoded>
         <wp:post_id>173</wp:post_id>
         <wp:post_date>2012-02-16 15:52:55</wp:post_date>
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index aa16f6ad..7bb4aa6e 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -268,6 +268,19 @@ class TestWordpressXmlImporter(unittest.TestCase):
             code_line = re.search(r'\s+a = \[1, 2, 3\]', md).group(0)
             self.assertTrue(sample_line.rindex('This') < code_line.rindex('a'))
 
+    def test_dont_use_smart_quotes(self):
+        def r(f):
+            with open(f, encoding='utf-8') as infile:
+                return infile.read()
+        silent_f2p = mute(True)(fields2pelican)
+        test_post = filter(
+            lambda p: p[0].startswith("Post with raw data"),
+            self.posts)
+        with temporary_folder() as temp:
+            md = [r(f) for f in silent_f2p(test_post, 'markdown', temp)][0]
+            escaped_quotes = re.search(r'\\[\'"“”‘’]', md)
+            self.assertFalse(escaped_quotes)
+
 
 class TestBuildHeader(unittest.TestCase):
     def test_build_header(self):
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 63d1b336..461a3263 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -674,6 +674,22 @@ def download_attachments(output_path, urls):
     return locations
 
 
+def is_pandoc_needed(fields):
+    in_markup_idx = 9
+    return filter(lambda f: f[in_markup_idx] in ('html', 'wp-html'), fields)
+
+
+def get_pandoc_version():
+    cmd = ['pandoc', '--version']
+    try:
+        output = subprocess.check_output(cmd, universal_newlines=True)
+    except (subprocess.CalledProcessError, OSError) as e:
+        logger.warning("Pandoc version unknown: %s", e)
+        return ''
+
+    return output.split()[1]
+
+
 def update_links_to_attached_files(content, attachments):
     for old_url, new_path in attachments.items():
         # url may occur both with http:// and https://
@@ -689,6 +705,14 @@ def fields2pelican(
         dircat=False, strip_raw=False, disable_slugs=False,
         dirpage=False, filename_template=None, filter_author=None,
         wp_custpost=False, wp_attach=False, attachments=None):
+
+    pandoc_version = get_pandoc_version()
+
+    if is_pandoc_needed(fields) and not pandoc_version:
+        error = ('Pandoc must be installed to complete the '
+                 'requested import action.')
+        exit(error)
+
     for (title, content, filename, date, author, categories, tags, status,
             kind, in_markup) in fields:
         if filter_author and filter_author != author:
@@ -735,11 +759,17 @@ def fields2pelican(
 
                 fp.write(new_content)
 
-            parse_raw = '--parse-raw' if not strip_raw else ''
-            cmd = ('pandoc --normalize {0} --from=html'
-                   ' --to={1} -o "{2}" "{3}"')
-            cmd = cmd.format(parse_raw, out_markup,
-                             out_filename, html_filename)
+            if pandoc_version[0] == '1':
+                parse_raw = '--parse-raw' if not strip_raw else ''
+                cmd = ('pandoc --normalize {0} --from=html'
+                       ' --to={1} -o "{2}" "{3}"')
+                cmd = cmd.format(parse_raw, out_markup,
+                                 out_filename, html_filename)
+            else:
+                from_arg = '-f html+raw_html' if not strip_raw else '-f html'
+                cmd = ('pandoc {0} --to={1}-smart -o "{2}" "{3}"')
+                cmd = cmd.format(from_arg, out_markup,
+                                 out_filename, html_filename)
 
             try:
                 rc = subprocess.call(cmd, shell=True)

From c388f14d3e9067ec9b6329a2eae3925d08d8cb8c Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Tue, 7 Aug 2018 14:06:46 +0200
Subject: [PATCH 2072/2864] add blogger importer

---
 docs/importer.rst                       |   21 +-
 pelican/tests/content/bloggerexport.xml | 1067 +++++++++++++++++++++++
 pelican/tests/test_importer.py          |   51 +-
 pelican/tools/pelican_import.py         |  112 ++-
 4 files changed, 1218 insertions(+), 33 deletions(-)
 create mode 100644 pelican/tests/content/bloggerexport.xml

diff --git a/docs/importer.rst b/docs/importer.rst
index 713cc3a3..e8614f2a 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -9,10 +9,11 @@ Description
 ``pelican-import`` is a command-line tool for converting articles from other
 software to reStructuredText or Markdown. The supported import formats are:
 
-- WordPress XML export
+- Blogger XML export
 - Dotclear export
 - Posterous API
 - Tumblr API
+- WordPress XML export
 - RSS/Atom feed
 
 The conversion from HTML to reStructuredText or Markdown relies on `Pandoc`_.
@@ -40,8 +41,8 @@ Usage
 
 ::
 
-    pelican-import [-h] [--wpfile] [--dotclear] [--posterous] [--tumblr] [--feed] [-o OUTPUT]
-                   [-m MARKUP] [--dir-cat] [--dir-page] [--strip-raw] [--wp-custpost]
+    pelican-import [-h] [--blogger] [--dotclear] [--posterous] [--tumblr] [--wpfile] [--feed]
+                   [-o OUTPUT] [-m MARKUP] [--dir-cat] [--dir-page] [--strip-raw] [--wp-custpost]
                    [--wp-attach] [--disable-slugs] [-e EMAIL] [-p PASSWORD] [-b BLOGNAME]
                    input|api_token|api_key
 
@@ -57,10 +58,11 @@ Optional arguments
 ------------------
 
   -h, --help            Show this help message and exit
-  --wpfile              WordPress XML export (default: False)
+  --blogger             Blogger XML export (default: False)
   --dotclear            Dotclear export (default: False)
   --posterous           Posterous API (default: False)
   --tumblr              Tumblr API (default: False)
+  --wpfile              WordPress XML export (default: False)
   --feed                Feed to parse (default: False)
   -o OUTPUT, --output OUTPUT
                         Output path (default: content)
@@ -70,7 +72,8 @@ Optional arguments
   --dir-cat             Put files in directories with categories name
                         (default: False)
   --dir-page            Put files recognised as pages in "pages/" sub-
-                          directory (wordpress import only) (default: False)
+                          directory (blogger and wordpress import only)
+                          (default: False)
   --filter-author       Import only post from the specified author
   --strip-raw           Strip raw HTML code that can't be converted to markup
                         such as flash embeds or iframes (wordpress import
@@ -102,9 +105,9 @@ Optional arguments
 Examples
 ========
 
-For WordPress::
+For Blogger::
 
-    $ pelican-import --wpfile -o ~/output ~/posts.xml
+    $ pelican-import --blogger -o ~/output ~/posts.xml
 
 For Dotclear::
 
@@ -118,6 +121,10 @@ For Tumblr::
 
     $ pelican-import --tumblr -o ~/output --blogname=<blogname> <api_token>
 
+For WordPress::
+
+    $ pelican-import --wpfile -o ~/output ~/posts.xml
+
 Tests
 =====
 
diff --git a/pelican/tests/content/bloggerexport.xml b/pelican/tests/content/bloggerexport.xml
new file mode 100644
index 00000000..4bc0985a
--- /dev/null
+++ b/pelican/tests/content/bloggerexport.xml
@@ -0,0 +1,1067 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet href="https://www.blogger.com/styles/atom.css" type="text/css"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:gd="http://schemas.google.com/g/2005" xmlns:georss="http://www.georss.org/georss" xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/" xmlns:thr="http://purl.org/syndication/thread/1.0">
+ <id>tag:blogger.com,1999:blog-6303278419262689239.archive
+ </id>
+ <updated>2018-08-02T12:38:27.320-07:00
+ </updated>
+ <title type="text">Notes of a Young Doctor </title>
+ <link href="https://www.blogger.com/feeds/6303278419262689239/archive" rel="http://schemas.google.com/g/2005#feed" type="application/atom+xml"/>
+ <link href="https://www.blogger.com/feeds/6303278419262689239/archive" rel="self" type="application/atom+xml"/>
+ <link href="https://www.blogger.com/feeds/6303278419262689239/archive" rel="http://schemas.google.com/g/2005#post" type="application/atom+xml"/>
+ <link href="http://youngdoctornotes.blogspot.com/" rel="alternate" type="text/html"/>
+ <author>
+  <name>Mikhail Afanasyevich Bulgakov
+  </name>
+  <uri>https://www.blogger.com/profile/000082957
+  </uri>
+  <email>noreply@blogger.com
+  </email>
+  <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+ </author>
+ <generator uri="https://www.blogger.com" version="7.00">Blogger
+ </generator>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.layout</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#template"/>
+  <title type="text">Template: Notes of a Young Doctor</title>
+  <content type="text">[Over 2000 lines of mostly css that we don't need here.]</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/template/default" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/template/default" rel="self" type="application/atom+xml"/>
+  <link href="http://youngdoctornotes.blogspot.com/" rel="alternate" type="text/html"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_PUBLISHING_MODE</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Het type publicatie voor deze blog.</title>
+  <content type="text">PUBLISH_MODE_BLOGSPOT</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_PUBLISHING_MODE" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_PUBLISHING_MODE" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_ADMIN_PERMISSION</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">De lijst van e-mails van beheerders voor de blog.</title>
+  <content type="text">mikhail.afanasyevich.bulgakov@gmail.com</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ADMIN_PERMISSION" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ADMIN_PERMISSION" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_ADULT_CONTENT</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of deze blog content voor volwassenen bevat</title>
+  <content type="text">false</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ADULT_CONTENT" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ADULT_CONTENT" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_ALTERNATE_JSRENDER_ALLOWED</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of alternatieve weergaven in JavaScript zijn toegestaan</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ALTERNATE_JSRENDER_ALLOWED" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ALTERNATE_JSRENDER_ALLOWED" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_ANALYTICS_ACCOUNT_NUMBER</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Google Analytics-accountnummer voor een blog</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ANALYTICS_ACCOUNT_NUMBER" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ANALYTICS_ACCOUNT_NUMBER" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_ARCHIVE_DATE_FORMAT</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Het getal van de datumnotatie voor de archiefindex</title>
+  <content type="text">9</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ARCHIVE_DATE_FORMAT" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ARCHIVE_DATE_FORMAT" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_ARCHIVE_FREQUENCY</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hoe vaak deze blog moet worden gearchiveerd</title>
+  <content type="text">MONTHLY</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ARCHIVE_FREQUENCY" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_ARCHIVE_FREQUENCY" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_AUTHOR_PERMISSION</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">De lijst van e-mails van auteurs die toestemming hebben om te publiceren.</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_AUTHOR_PERMISSION" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_AUTHOR_PERMISSION" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_BACKLINKS_ALLOWED</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of reactiebacklinks op de blog moeten worden getoond</title>
+  <content type="text">false</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_BACKLINKS_ALLOWED" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_BACKLINKS_ALLOWED" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_BY_POST_ARCHIVING</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of iedere post moet worden voorzien van een archiefpagina</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_BY_POST_ARCHIVING" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_BY_POST_ARCHIVING" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENT_ACCESS</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Wie kan reacties achterlaten</title>
+  <content type="text">BLOGGERS</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_ACCESS" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_ACCESS" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENT_CAPTCHA</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of personen die reacties geven, een Captcha (woordverificatie) moeten invullen</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_CAPTCHA" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_CAPTCHA" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENT_EMAIL</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Lijst met e-mailadressen om meldingen van nieuwe reacties naar te sturen</title>
+  <content type="text">mikhail.afanasyevich.bulgakov@gmail.com</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_EMAIL" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_EMAIL" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENT_FEED</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Het type feed dat voor blogreacties moet worden gegeven</title>
+  <content type="text">FULL</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_FEED" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_FEED" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENT_FORM_LOCATION</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Locatie van formulier voor blogreacties</title>
+  <content type="text">EMBEDDED_IFRAME</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_FORM_LOCATION" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_FORM_LOCATION" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENT_MESSAGE</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Bericht bij blogreactie</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_MESSAGE" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_MESSAGE" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENT_MODERATION</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of het modereren van reacties moet worden ingeschakeld</title>
+  <content type="text">DISABLED</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_MODERATION" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_MODERATION" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENT_MODERATION_DELAY</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Aantal dagen waarna nieuwe reacties in aanmerking komen voor moderaten</title>
+  <content type="text">14</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_MODERATION_DELAY" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_MODERATION_DELAY" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENT_MODERATION_EMAIL</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">E-mailadres waar meldingen binnenkomen over welke nieuwe reacties bewerkt of verwijderd moeten worden</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_MODERATION_EMAIL" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_MODERATION_EMAIL" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENT_PROFILE_IMAGES</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of profielafbeeldingen in reacties moeten worden getoond</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_PROFILE_IMAGES" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENT_PROFILE_IMAGES" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENTS_ALLOWED</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of er reacties moeten worden weergegeven</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENTS_ALLOWED" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENTS_ALLOWED" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_COMMENTS_TIME_STAMP_FORMAT</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Getal van de tijdstempelnotatie voor reacties</title>
+  <content type="text">29</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENTS_TIME_STAMP_FORMAT" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_COMMENTS_TIME_STAMP_FORMAT" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_CONVERT_LINE_BREAKS</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of de regelscheidingen moeten worden omgezet in &lt;br /&gt;-tags in de posteditor</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CONVERT_LINE_BREAKS" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CONVERT_LINE_BREAKS" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_CUSTOM_ADS_TXT</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">De aangepaste ads.txt-content van de blog die aan advertentiezoekmachines wordt getoond.</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CUSTOM_ADS_TXT" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CUSTOM_ADS_TXT" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_CUSTOM_ADS_TXT_ENABLED</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Bepaalt of deze blog aangepaste ads.txt-content aan advertentiezoekmachines toont.</title>
+  <content type="text">false</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CUSTOM_ADS_TXT_ENABLED" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CUSTOM_ADS_TXT_ENABLED" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_CUSTOM_PAGE_NOT_FOUND</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">De content die wordt weergegeven wanneer een post of pagina niet is gevonden.</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CUSTOM_PAGE_NOT_FOUND" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CUSTOM_PAGE_NOT_FOUND" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_CUSTOM_ROBOTS_TXT</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">De aangepaste robots.txt-content van de blog wordt aan zoekmachines getoond.</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CUSTOM_ROBOTS_TXT" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CUSTOM_ROBOTS_TXT" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_CUSTOM_ROBOTS_TXT_ENABLED</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Bepaalt of deze blog aangepaste robots.txt-content aan zoekmachines toont.</title>
+  <content type="text">false</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CUSTOM_ROBOTS_TXT_ENABLED" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_CUSTOM_ROBOTS_TXT_ENABLED" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_DATE_FORMAT</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Het getal van de datumnotatie voor koppen</title>
+  <content type="text">26</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_DATE_FORMAT" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_DATE_FORMAT" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_DEFAULT_BACKLINKS_MODE</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Standaardbacklinks voor posts</title>
+  <content type="text">DEFAULT_HAVE_BACKLINKS</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_DEFAULT_BACKLINKS_MODE" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_DEFAULT_BACKLINKS_MODE" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_DEFAULT_COMMENTS_MODE</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Standaardreactie voor posts</title>
+  <content type="text">DEFAULT_HAVE_COMMENTS</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_DEFAULT_COMMENTS_MODE" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_DEFAULT_COMMENTS_MODE" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_DESCRIPTION</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Een beschrijving van de blog</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_DESCRIPTION" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_DESCRIPTION" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_EMAIL_POST_LINKS</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of er een link moet worden weergegeven waarmee gebruikers posts kunnen e-mailen</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_EMAIL_POST_LINKS" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_EMAIL_POST_LINKS" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_FEED_REDIRECT_URL</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">URL waar verzoeken om postfeed naartoe worden geleid</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_FEED_REDIRECT_URL" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_FEED_REDIRECT_URL" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_FLOAT_ALIGNMENT</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of zwevende uitlijning is ingeschakeld voor de blog</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_FLOAT_ALIGNMENT" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_FLOAT_ALIGNMENT" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_LOCALE</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Taal voor deze blog</title>
+  <content type="text">nl</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_LOCALE" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_LOCALE" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_M2B_WHITELIST_EMAIL</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Lijst met e-mailadressen die via e-mail posts op de blog kunnen plaatsen.</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_M2B_WHITELIST_EMAIL" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_M2B_WHITELIST_EMAIL" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_MAX_NUM</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Maximaal aantal items voor weergave op de hoofdpagina"</title>
+  <content type="text">100</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_MAX_NUM" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_MAX_NUM" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_MAX_UNIT</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Eenheid van items voor weergave op de hoofdpagina</title>
+  <content type="text">POSTS</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_MAX_UNIT" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_MAX_UNIT" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_META_DESCRIPTION</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">De metabeschrijving van de blog die wordt gebruikt door zoekmachines.</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_META_DESCRIPTION" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_META_DESCRIPTION" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_META_DESCRIPTION_ENABLED</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Of deze blog wordt weergegeven met metabeschrijvingen.</title>
+  <content type="text">false</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_META_DESCRIPTION_ENABLED" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_META_DESCRIPTION_ENABLED" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_NAME</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">De naam van de blog</title>
+  <content type="text">Notes of a Young Doctor</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_NAME" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_NAME" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_PER_POST_FEED</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Het type feed dat voor reacties op afzonderlijke posts moet worden gegeven</title>
+  <content type="text">FULL</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_PER_POST_FEED" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_PER_POST_FEED" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_POST_FEED</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Het type feed dat voor blogposts moet worden gegeven</title>
+  <content type="text">FULL</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_POST_FEED" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_POST_FEED" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_POST_FEED_FOOTER</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Voettekst om aan het einde van iedere vermelding in de postfeed toe te voegen</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_POST_FEED_FOOTER" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_POST_FEED_FOOTER" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_POST_TEMPLATE</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">De template voor blogposts</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_POST_TEMPLATE" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_POST_TEMPLATE" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_PROMOTED</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of deze blog op Blogger kan worden aangeprezen</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_PROMOTED" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_PROMOTED" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_QUICK_EDITING</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of Snel bewerken is ingeschakeld</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_QUICK_EDITING" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_QUICK_EDITING" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_READ_ACCESS_MODE</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Het type toegang voor de lezers van de blog.</title>
+  <content type="text">PUBLIC</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_READ_ACCESS_MODE" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_READ_ACCESS_MODE" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_READER_PERMISSION</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">De e-maillijst voor gebruikers die toestemming hebben om de blog te lezen.</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_READER_PERMISSION" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_READER_PERMISSION" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_SEARCHABLE</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of deze blog door zoekmachines moet worden geïndexeerd</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_SEARCHABLE" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_SEARCHABLE" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_SEND_EMAIL</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Door komma's gescheiden lijst met e-mailadressen om nieuwe blogposts naar te sturen</title>
+  <content type="text"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_SEND_EMAIL" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_SEND_EMAIL" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_SHOW_TITLE</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of het titelveld moet worden weergegeven</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_SHOW_TITLE" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_SHOW_TITLE" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_SHOW_URL</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Hier wordt aangegeven of er een verwante link in de postopsteller moet worden weergegeven</title>
+  <content type="text">false</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_SHOW_URL" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_SHOW_URL" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_SUBDOMAIN</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Het subdomein van BlogSpot om je blog op te publiceren</title>
+  <content type="text">youngdoctornotes</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_SUBDOMAIN" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_SUBDOMAIN" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_TIME_STAMP_FORMAT</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Het getal van de tijdstempelnotatie</title>
+  <content type="text">27</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_TIME_STAMP_FORMAT" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_TIME_STAMP_FORMAT" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_TIME_ZONE</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">De tijdzone voor deze blog</title>
+  <content type="text">America/Los_Angeles</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_TIME_ZONE" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_TIME_ZONE" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.settings.BLOG_USE_LIGHTBOX</id>
+  <published>2010-11-27T07:08:20.877-08:00</published>
+  <updated>2018-08-02T12:38:27.320-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#settings"/>
+  <title type="text">Of afbeeldingen worden weergegeven in de lightbox wanneer erop wordt geklikt</title>
+  <content type="text">true</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_USE_LIGHTBOX" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/settings/BLOG_USE_LIGHTBOX" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.post-1276418104709695660</id>
+  <published>2010-11-27T08:21:00.000-08:00</published>
+  <updated>2018-08-02T12:22:48.286-07:00</updated>
+  <app:control>
+   <app:draft>yes</app:draft>
+  </app:control>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#post"/>
+  <category scheme="http://www.blogger.com/atom/ns#" term="Interesting cases"/>
+  <category scheme="http://www.blogger.com/atom/ns#" term="amputations"/>
+  <title type="text">Black as Egypt's Night</title>
+  <content type="html">Write next story here</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/posts/default/1276418104709695660" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/posts/default/1276418104709695660" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+  <thr:total>0</thr:total>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.post-1858599377741856733</id>
+  <published>2010-11-27T07:12:00.000-08:00</published>
+  <updated>2010-11-27T07:56:43.964-08:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#post"/>
+  <title type="text">The Steel Windpipe</title>
+  <content type="html">It was a cold Winter's night.&lt;br /&gt;&lt;br /&gt;&lt;ul&gt;&lt;li&gt;Very cold indeed.&lt;/li&gt;&lt;br /&gt;&lt;li&gt;Note to self: pad out ending&lt;/li&gt;&lt;/ul&gt;</content>
+  <link href="https://youngdoctornotes.blogspot.com/feeds/1858599377741856733/comments/default" rel="replies" title="Reacties posten" type="application/atom+xml"/>
+  <link href="http://youngdoctornotes.blogspot.com/2010/11/the-steel-windpipe.html#comment-form" rel="replies" title="1 reacties" type="text/html"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/posts/default/1858599377741856733" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/posts/default/1858599377741856733" rel="self" type="application/atom+xml"/>
+  <link href="http://youngdoctornotes.blogspot.com/2010/11/the-steel-windpipe.html" rel="alternate" title="The Steel Windpipe" type="text/html"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+  <thr:total>1</thr:total>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.page-4386962582497458967</id>
+  <published>2018-08-02T12:38:00.001-07:00</published>
+  <updated>2018-08-02T12:38:27.171-07:00</updated>
+  <app:control>
+   <app:draft>yes</app:draft>
+  </app:control>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#page"/>
+  <title type="text">Test page 2</title>
+  <content type="html">&lt;div dir="ltr" style="text-align: left;" trbidi="on"&gt;This is a second test&lt;/div&gt;</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/pages/default/4386962582497458967" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/pages/default/4386962582497458967" rel="self" type="application/atom+xml"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.page-1406163839769953231</id>
+  <published>2018-08-02T12:37:00.004-07:00</published>
+  <updated>2018-08-02T12:37:47.424-07:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#page"/>
+  <title type="text">Test page</title>
+  <content type="html">&lt;div dir="ltr" style="text-align: left;" trbidi="on"&gt;This is a test.&lt;/div&gt;</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/pages/default/1406163839769953231" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/pages/default/1406163839769953231" rel="self" type="application/atom+xml"/>
+  <link href="http://youngdoctornotes.blogspot.com/p/test-page.html" rel="alternate" title="Test page" type="text/html"/>
+  <author>
+   <name>Mikhail Afanasyevich Bulgakov</name>
+   <uri>https://www.blogger.com/profile/000082957</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+ </entry>
+ <entry>
+  <id>tag:blogger.com,1999:blog-6303278419262689239.post-5590533389087749201</id>
+  <published>2010-11-29T12:35:44.027-08:00</published>
+  <updated>2010-11-29T12:35:44.027-08:00</updated>
+  <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/blogger/2008/kind#comment"/>
+  <title type="text">Mishka, always a pleasure to read your adventures!...</title>
+  <content type="html">Mishka, always a pleasure to read your adventures!&lt;br /&gt;&lt;br /&gt;It's a shame you don't get more time for writing.</content>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/1858599377741856733/comments/default/5590533389087749201" rel="edit" type="application/atom+xml"/>
+  <link href="https://www.blogger.com/feeds/6303278419262689239/1858599377741856733/comments/default/5590533389087749201" rel="self" type="application/atom+xml"/>
+  <link href="http://youngdoctornotes.blogspot.com/2010/11/the-steel-windpipe.html?showComment=1291062944027#c5590533389087749201" rel="alternate" title="" type="text/html"/>
+  <author>
+   <name>Thomas Isidore Noël Sankara</name>
+   <uri>https://www.blogger.com/profile/0617349827</uri>
+   <email>noreply@blogger.com</email>
+   <gd:image height="35" rel="http://schemas.google.com/g/2005#thumbnail" src="//lh3.googleusercontent.com/zFdxGE77vvD2w5xHy6jkVuElKv-U9_9qLkRYK8OnbDeJPtjSZ82UPq5w6hJ-SA=s35" width="35"/>
+  </author>
+  <thr:in-reply-to href="http://youngdoctornotes.blogspot.com/2010/11/the-steel-windpipe.html" ref="tag:blogger.com,1999:blog-6303278419262689239.post-1858599377741856733" source="https://www.blogger.com/feeds/6303278419262689239/posts/default/1858599377741856733" type="text/html"/>
+  <gd:extendedProperty name="blogger.itemClass" value="pid-944253050"/>
+  <gd:extendedProperty name="blogger.displayTime" value="29 november 2010 om 12:35"/>
+ </entry>
+</feed>
\ No newline at end of file
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 7bb4aa6e..f913562f 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -8,13 +8,15 @@ from codecs import open
 
 from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder,
                                    unittest)
-from pelican.tools.pelican_import import (build_header, build_markdown_header,
+from pelican.tools.pelican_import import (blogger2fields, build_header,
+                                          build_markdown_header,
                                           decode_wp_content,
                                           download_attachments, fields2pelican,
                                           get_attachments, wp2fields)
 from pelican.utils import path_to_file_url, slugify
 
 CUR_DIR = os.path.abspath(os.path.dirname(__file__))
+BLOGGER_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'bloggerexport.xml')
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
 WORDPRESS_ENCODED_CONTENT_SAMPLE = os.path.join(CUR_DIR,
                                                 'content',
@@ -34,6 +36,53 @@ except ImportError:
     LXML = False
 
 
+@skipIfNoExecutable(['pandoc', '--version'])
+@unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
+class TestBloggerXmlImporter(unittest.TestCase):
+
+    def setUp(self):
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, str('C'))
+        self.posts = list(blogger2fields(BLOGGER_XML_SAMPLE))
+
+    def tearDown(self):
+        locale.setlocale(locale.LC_ALL, self.old_locale)
+
+    def test_recognise_kind_and_title(self):
+        """Check that importer only outputs pages, articles and comments,
+        that these are correctly identified and that titles are correct.
+        """
+        kinds = {x[8] for x in self.posts}
+        self.assertEqual({'page', 'article', 'comment'}, kinds)
+        page_titles = {x[0] for x in self.posts if x[8] == 'page'}
+        self.assertEqual({'Test page', 'Test page 2'}, page_titles)
+        article_titles = {x[0] for x in self.posts if x[8] == 'article'}
+        self.assertEqual({'Black as Egypt\'s Night', 'The Steel Windpipe'},
+                         article_titles)
+        comment_titles = {x[0] for x in self.posts if x[8] == 'comment'}
+        self.assertEqual({'Mishka, always a pleasure to read your '
+                          'adventures!...'},
+                         comment_titles)
+
+    def test_recognise_status_with_correct_filename(self):
+        """Check that importerer outputs only statuses 'published' and 'draft',
+        that these are correctly identified and that filenames are correct.
+        """
+        statuses = {x[7] for x in self.posts}
+        self.assertEqual({'published', 'draft'}, statuses)
+
+        draft_filenames = {x[2] for x in self.posts if x[7] == 'draft'}
+        # draft filenames are id-based
+        self.assertEqual({'page-4386962582497458967',
+                          'post-1276418104709695660'}, draft_filenames)
+
+        published_filenames = {x[2] for x in self.posts if x[7] == 'published'}
+        # published filenames are url-based, except comments
+        self.assertEqual({'the-steel-windpipe',
+                          'test-page',
+                          'post-5590533389087749201'}, published_filenames)
+
+
 @skipIfNoExecutable(['pandoc', '--version'])
 @unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
 class TestWordpressXmlImporter(unittest.TestCase):
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 461a3263..a3f2ffa8 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -8,7 +8,6 @@ import os
 import re
 import subprocess
 import sys
-import time
 from codecs import open
 from collections import defaultdict
 
@@ -117,19 +116,18 @@ def decode_wp_content(content, br=True):
     return content
 
 
-def get_items(xml):
-    """Opens a WordPress xml file and returns a list of items"""
+def xml_to_soup(xml):
+    """Opens an xml file"""
     try:
         from bs4 import BeautifulSoup
     except ImportError:
         error = ('Missing dependency "BeautifulSoup4" and "lxml" required to '
-                 'import WordPress XML files.')
+                 'import XML files.')
         sys.exit(error)
     with open(xml, encoding='utf-8') as infile:
         xmlfile = infile.read()
     soup = BeautifulSoup(xmlfile, "xml")
-    items = soup.rss.channel.findAll('item')
-    return items
+    return soup
 
 
 def get_filename(filename, post_id):
@@ -142,7 +140,8 @@ def get_filename(filename, post_id):
 def wp2fields(xml, wp_custpost=False):
     """Opens a wordpress XML file, and yield Pelican fields"""
 
-    items = get_items(xml)
+    soup = xml_to_soup(xml)
+    items = soup.rss.channel.findAll('item')
     for item in items:
 
         if item.find('status').string in ["publish", "draft"]:
@@ -163,8 +162,9 @@ def wp2fields(xml, wp_custpost=False):
             if raw_date == u'0000-00-00 00:00:00':
                 date = None
             else:
-                date_object = time.strptime(raw_date, '%Y-%m-%d %H:%M:%S')
-                date = time.strftime('%Y-%m-%d %H:%M', date_object)
+                date_object = SafeDatetime.strptime(
+                    raw_date, '%Y-%m-%d %H:%M:%S')
+                date = date_object.strftime('%Y-%m-%d %H:%M')
             author = item.find('creator').string
 
             categories = [cat.string for cat
@@ -195,6 +195,59 @@ def wp2fields(xml, wp_custpost=False):
                    tags, status, kind, 'wp-html')
 
 
+def blogger2fields(xml):
+    """Opens a blogger XML file, and yield Pelican fields"""
+
+    soup = xml_to_soup(xml)
+    entries = soup.feed.findAll('entry')
+    for entry in entries:
+        raw_kind = entry.find(
+            'category', {'scheme': 'http://schemas.google.com/g/2005#kind'}
+        ).get('term')
+        if raw_kind == 'http://schemas.google.com/blogger/2008/kind#post':
+            kind = 'article'
+        elif raw_kind == 'http://schemas.google.com/blogger/2008/kind#comment':
+            kind = 'comment'
+        elif raw_kind == 'http://schemas.google.com/blogger/2008/kind#page':
+            kind = 'page'
+        else:
+            continue
+
+        try:
+            assert kind != 'comment'
+            filename = entry.find('link', {'rel': 'alternate'})['href']
+            filename = os.path.splitext(os.path.basename(filename))[0]
+        except (AssertionError, TypeError, KeyError):
+            filename = entry.find('id').string.split('.')[-1]
+
+        title = entry.find('title').string or ''
+
+        content = entry.find('content').string
+        raw_date = entry.find('published').string
+        if hasattr(SafeDatetime, 'fromisoformat'):
+            date_object = SafeDatetime.fromisoformat(raw_date)
+        else:
+            date_object = SafeDatetime.strptime(
+                raw_date[:23], '%Y-%m-%dT%H:%M:%S.%f')
+        date = date_object.strftime('%Y-%m-%d %H:%M')
+        author = entry.find('author').find('name').string
+
+        # blogger posts only have tags, no category
+        tags = [tag.get('term') for tag in entry.findAll(
+            'category', {'scheme': 'http://www.blogger.com/atom/ns#'})]
+
+        # Drafts have <app:control><app:draft>yes</app:draft></app:control>
+        status = 'published'
+        try:
+            if entry.find('control').find('draft').string == 'yes':
+                status = 'draft'
+        except AttributeError:
+            pass
+
+        yield (title, content, filename, date, author, None, tags, status,
+               kind, 'html')
+
+
 def dc2fields(file):
     """Opens a Dotclear export file, and yield pelican fields"""
     try:
@@ -391,7 +444,6 @@ def posterous2fields(api_token, email, password):
 
 def tumblr2fields(api_key, blogname):
     """ Imports Tumblr posts (API v2)"""
-    from time import strftime, localtime
     try:
         # py3k import
         import json
@@ -426,8 +478,10 @@ def tumblr2fields(api_key, blogname):
             slug = post.get('slug') or slugify(title)
             tags = post.get('tags')
             timestamp = post.get('timestamp')
-            date = strftime("%Y-%m-%d %H:%M:%S", localtime(int(timestamp)))
-            slug = strftime("%Y-%m-%d-", localtime(int(timestamp))) + slug
+            date = SafeDatetime.fromtimestamp(int(timestamp)).strftime(
+                "%Y-%m-%d %H:%M:%S")
+            slug = SafeDatetime.fromtimestamp(int(timestamp)).strftime(
+                "%Y-%m-%d-") + slug
             format = post.get('format')
             content = post.get('body')
             type = post.get('type')
@@ -499,7 +553,7 @@ def feed2fields(file):
     import feedparser
     d = feedparser.parse(file)
     for entry in d.entries:
-        date = (time.strftime('%Y-%m-%d %H:%M', entry.updated_parsed)
+        date = (entry.updated_parsed.strftime('%Y-%m-%d %H:%M')
                 if hasattr(entry, 'updated_parsed') else None)
         author = entry.author if hasattr(entry, 'author') else None
         tags = ([e['term'] for e in entry.tags]
@@ -619,7 +673,8 @@ def get_attachments(xml):
     """returns a dictionary of posts that have attachments with a list
     of the attachment_urls
     """
-    items = get_items(xml)
+    soup = xml_to_soup(xml)
+    items = soup.rss.channel.findAll('item')
     names = {}
     attachments = []
 
@@ -807,16 +862,16 @@ def fields2pelican(
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Transform feed, WordPress, Tumblr, Dotclear, or "
-                    "Posterous files into reST (rst) or Markdown (md) files. "
+        description="Transform feed, Blogger, Dotclear, Posterous, Tumblr, or"
+                    "WordPress files into reST (rst) or Markdown (md) files. "
                     "Be sure to have pandoc installed.",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument(
         dest='input', help='The input file to read')
     parser.add_argument(
-        '--wpfile', action='store_true', dest='wpfile',
-        help='Wordpress XML export')
+        '--blogger', action='store_true', dest='blogger',
+        help='Blogger XML export')
     parser.add_argument(
         '--dotclear', action='store_true', dest='dotclear',
         help='Dotclear export')
@@ -826,6 +881,9 @@ def main():
     parser.add_argument(
         '--tumblr', action='store_true', dest='tumblr',
         help='Tumblr export')
+    parser.add_argument(
+        '--wpfile', action='store_true', dest='wpfile',
+        help='Wordpress XML export')
     parser.add_argument(
         '--feed', action='store_true', dest='feed',
         help='Feed to parse')
@@ -841,7 +899,7 @@ def main():
     parser.add_argument(
         '--dir-page', action='store_true', dest='dirpage',
         help=('Put files recognised as pages in "pages/" sub-directory'
-              ' (wordpress import only)'))
+              ' (blogger and wordpress import only)'))
     parser.add_argument(
         '--filter-author', dest='author',
         help='Import only post from the specified author')
@@ -883,19 +941,21 @@ def main():
     args = parser.parse_args()
 
     input_type = None
-    if args.wpfile:
-        input_type = 'wordpress'
+    if args.blogger:
+        input_type = 'blogger'
     elif args.dotclear:
         input_type = 'dotclear'
     elif args.posterous:
         input_type = 'posterous'
     elif args.tumblr:
         input_type = 'tumblr'
+    elif args.wpfile:
+        input_type = 'wordpress'
     elif args.feed:
         input_type = 'feed'
     else:
-        error = ('You must provide either --wpfile, --dotclear, '
-                 '--posterous, --tumblr or --feed options')
+        error = ('You must provide either --blogger, --dotclear, '
+                 '--posterous, --tumblr, --wpfile or --feed options')
         exit(error)
 
     if not os.path.exists(args.output):
@@ -910,14 +970,16 @@ def main():
                  'to use the --wp-attach option')
         exit(error)
 
-    if input_type == 'wordpress':
-        fields = wp2fields(args.input, args.wp_custpost or False)
+    if input_type == 'blogger':
+        fields = blogger2fields(args.input)
     elif input_type == 'dotclear':
         fields = dc2fields(args.input)
     elif input_type == 'posterous':
         fields = posterous2fields(args.input, args.email, args.password)
     elif input_type == 'tumblr':
         fields = tumblr2fields(args.input, args.blogname)
+    elif input_type == 'wordpress':
+        fields = wp2fields(args.input, args.wp_custpost or False)
     elif input_type == 'feed':
         fields = feed2fields(args.input)
 

From f3e95cf4735679d687b2b08bd15b8ecc5b9ff27d Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Tue, 7 Aug 2018 16:22:50 +0200
Subject: [PATCH 2073/2864] importer: don't wrap, because it breaks html
 attributes

---
 pelican/tools/pelican_import.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 461a3263..22d4b7cc 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -685,9 +685,9 @@ def get_pandoc_version():
         output = subprocess.check_output(cmd, universal_newlines=True)
     except (subprocess.CalledProcessError, OSError) as e:
         logger.warning("Pandoc version unknown: %s", e)
-        return ''
+        return ()
 
-    return output.split()[1]
+    return tuple(int(i) for i in output.split()[1].split('.'))
 
 
 def update_links_to_attached_files(content, attachments):
@@ -759,15 +759,17 @@ def fields2pelican(
 
                 fp.write(new_content)
 
-            if pandoc_version[0] == '1':
+            if pandoc_version < (2,):
                 parse_raw = '--parse-raw' if not strip_raw else ''
+                wrap_none = '--wrap=none' \
+                    if pandoc_version >= (1, 16) else '--no-wrap'
                 cmd = ('pandoc --normalize {0} --from=html'
-                       ' --to={1} -o "{2}" "{3}"')
-                cmd = cmd.format(parse_raw, out_markup,
+                       ' --to={1} {2} -o "{3}" "{4}"')
+                cmd = cmd.format(parse_raw, out_markup, wrap_none,
                                  out_filename, html_filename)
             else:
                 from_arg = '-f html+raw_html' if not strip_raw else '-f html'
-                cmd = ('pandoc {0} --to={1}-smart -o "{2}" "{3}"')
+                cmd = ('pandoc {0} --to={1}-smart --wrap=none -o "{2}" "{3}"')
                 cmd = cmd.format(from_arg, out_markup,
                                  out_filename, html_filename)
 

From 5cc40ee3ba51b6b9592642b2e1dd66a0505ecc46 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Wed, 8 Aug 2018 16:37:39 +0200
Subject: [PATCH 2074/2864] correct suffix order in ComplexHTTPRequestHandler

---
 pelican/server.py            | 49 +++++++++++++-----------------
 pelican/tests/test_server.py | 58 ++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 28 deletions(-)
 create mode 100644 pelican/tests/test_server.py

diff --git a/pelican/server.py b/pelican/server.py
index 09eeb493..0ba7b996 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -42,8 +42,7 @@ def parse_arguments():
 
 
 class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
-    SUFFIXES = ['', '.html', '/index.html']
-    RSTRIP_PATTERNS = ['', '/']
+    SUFFIXES = ['.html', '/index.html', '/', '']
 
     def translate_path(self, path):
         # abandon query parameters
@@ -67,34 +66,28 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
 
     def do_GET(self):
         # cut off a query string
-        if '?' in self.path:
-            self.path, _ = self.path.split('?', 1)
+        original_path = self.path.split('?', 1)[0]
+        # try to find file
+        self.path = self.get_path_that_exists(original_path)
 
-        found = False
-        # Try to detect file by applying various suffixes and stripping
-        # patterns.
-        for rstrip_pattern in self.RSTRIP_PATTERNS:
-            if found:
-                break
-            for suffix in self.SUFFIXES:
-                if not hasattr(self, 'original_path'):
-                    self.original_path = self.path
-
-                self.path = self.original_path.rstrip(rstrip_pattern) + suffix
-                path = self.translate_path(self.path)
-
-                if os.path.exists(path):
-                    srvmod.SimpleHTTPRequestHandler.do_GET(self)
-                    logging.info("Found `%s`.", self.path)
-                    found = True
-                    break
-
-                logging.info("Tried to find `%s`, but it doesn't exist.", path)
-
-        if not found:
-            # Fallback if there were no matches
+        if not self.path:
             logging.warning("Unable to find `%s` or variations.",
-                            self.original_path)
+                            original_path)
+            return
+
+        logging.info("Found `%s`.", self.path)
+        srvmod.SimpleHTTPRequestHandler.do_GET(self)
+
+    def get_path_that_exists(self, original_path):
+        # Try to strip trailing slash
+        original_path = original_path.rstrip('/')
+        # Try to detect file by applying various suffixes
+        for suffix in self.SUFFIXES:
+            path = original_path + suffix
+            if os.path.exists(self.translate_path(path)):
+                return path
+            logging.info("Tried to find `%s`, but it doesn't exist.", path)
+        return None
 
     def guess_type(self, path):
         """Guess at the mime type for the specified file.
diff --git a/pelican/tests/test_server.py b/pelican/tests/test_server.py
new file mode 100644
index 00000000..508b75ff
--- /dev/null
+++ b/pelican/tests/test_server.py
@@ -0,0 +1,58 @@
+import os
+from shutil import rmtree
+from tempfile import mkdtemp
+
+from six import BytesIO
+
+from pelican.server import ComplexHTTPRequestHandler
+from pelican.tests.support import unittest
+
+
+class MockRequest(object):
+    def makefile(self, *args, **kwargs):
+        return BytesIO(b"")
+
+
+class MockServer(object):
+    pass
+
+
+class TestServer(unittest.TestCase):
+
+    def setUp(self):
+        self.server = MockServer()
+        self.temp_output = mkdtemp(prefix='pelicantests.')
+        self.old_cwd = os.getcwd()
+        os.chdir(self.temp_output)
+
+    def tearDown(self):
+        rmtree(self.temp_output)
+        os.chdir(self.old_cwd)
+
+    def test_get_path_that_exists(self):
+
+        handler = ComplexHTTPRequestHandler(MockRequest(), ('0.0.0.0', 8888),
+                                            self.server)
+        handler.base_path = self.temp_output
+
+        os.mknod(os.path.join(self.temp_output, 'foo.html'))
+        os.mkdir(os.path.join(self.temp_output, 'foo'))
+        os.mknod(os.path.join(self.temp_output, 'foo', 'index.html'))
+
+        os.mkdir(os.path.join(self.temp_output, 'bar'))
+        os.mknod(os.path.join(self.temp_output, 'bar', 'index.html'))
+
+        os.mkdir(os.path.join(self.temp_output, 'baz'))
+
+        for suffix in ['', '/']:
+            path = handler.get_path_that_exists('foo' + suffix)
+            self.assertEqual(path, 'foo.html')
+
+            path = handler.get_path_that_exists('bar' + suffix)
+            self.assertEqual(path, 'bar/index.html')
+
+            path = handler.get_path_that_exists('baz' + suffix)
+            self.assertEqual(path, 'baz/')
+
+            path = handler.get_path_that_exists('quux' + suffix)
+            self.assertIsNone(path)

From 8c433616bfaf1089f409f59fc152633a3102530a Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Wed, 8 Aug 2018 17:43:46 +0200
Subject: [PATCH 2075/2864] fix pelican.server __main__ code, add deprecation
 warning

---
 pelican/server.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pelican/server.py b/pelican/server.py
index 09eeb493..13309976 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -35,7 +35,7 @@ def parse_arguments():
     parser.add_argument('--key', default="./key.pem", nargs="?",
                         help='Path to certificate key file. ' +
                         'Relative to current directory')
-    parser.add_argument('path', default=".",
+    parser.add_argument('--path', default=".",
                         help='Path to pelican source directory to serve. ' +
                         'Relative to current directory')
     return parser.parse_args()
@@ -115,12 +115,16 @@ class RootedHTTPServer(BaseHTTPServer.HTTPServer):
 
 
 if __name__ == '__main__':
+    logging.warning("'python -m pelican.server' is deprecated. The "
+                    "Pelican development server should be run via "
+                    "'pelican --listen' or 'pelican -l' (this can be combined "
+                    "with regeneration as 'pelican -lr'). Rerun 'pelican-"
+                    "quickstart' to get new Makefile and tasks.py files.")
     args = parse_arguments()
     RootedHTTPServer.allow_reuse_address = True
     try:
         httpd = RootedHTTPServer(
-            (args.server, args.port),
-            ComplexHTTPRequestHandler)
+            args.path, (args.server, args.port), ComplexHTTPRequestHandler)
         if args.ssl:
             httpd.socket = ssl.wrap_socket(
                 httpd.socket, keyfile=args.key,
@@ -131,11 +135,6 @@ if __name__ == '__main__':
         logging.error("Could not listen on port %s, server %s.",
                       args.port, args.server)
         sys.exit(getattr(e, 'exitcode', 1))
-    except TypeError as e:
-        logging.error("'python -m pelican.server' is deprecated. The " +
-                      "Pelican development server should be run via " +
-                      "'pelican --listen'")
-        sys.exit(getattr(e, 'exitcode', 1))
 
     logging.info("Serving at port %s, server %s.",
                  args.port, args.server)

From 00a14a02a64e4874a71827c2b50537cfeec19e1c Mon Sep 17 00:00:00 2001
From: Baillette <jfbaillette@gmail.com>
Date: Wed, 3 Oct 2018 19:13:39 +0200
Subject: [PATCH 2076/2864] Resolving mtime truncation issue #2412

Issue #2412 : python copy instruction doesn't preserve mtime under Debian/stretch (up to date).
This results in lot of files are copied to output even if not changed (and a lot of wasted time).

Proposed solution in pelican/pelican/generators.py, line 823:
#return s_mtime > d_mtime
return s_mtime - d_mtime > 0.000001
---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index c7fc4a9e..2b2c02a3 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -820,7 +820,7 @@ class StaticGenerator(Generator):
         save_as = os.path.join(self.output_path, staticfile.save_as)
         s_mtime = os.path.getmtime(source_path)
         d_mtime = os.path.getmtime(save_as)
-        return s_mtime > d_mtime
+        return s_mtime - d_mtime > 0.000001
 
     def _link_or_copy_staticfile(self, sc):
         if self.settings['STATIC_CREATE_LINKS']:

From e81a284c399befcce5594fef19f8b01e5f510490 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 23 Oct 2018 17:57:37 +0200
Subject: [PATCH 2077/2864] Add CLI argument to print current settings

Fixes #2275
Refs #1762
---
 docs/settings.rst   | 13 +++++++++----
 pelican/__init__.py | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e09a90dc..9c73dc04 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -21,6 +21,12 @@ Settings are configured in the form of a Python module (a file). There is an
 <https://github.com/getpelican/pelican/raw/master/samples/pelican.conf.py>`_
 available for reference.
 
+To see a list of current settings in your environment, including both default
+and any customized values, run the following command (append a specific
+setting name as an argument to see the value for that one setting)::
+
+    pelican --print-settings
+
 All the setting identifiers must be set in all-caps, otherwise they will not be
 processed. Setting values that are numbers (5, 20, etc.), booleans (True,
 False, None, etc.), dictionaries, or tuples should *not* be enclosed in
@@ -28,10 +34,9 @@ quotation marks. All other values (i.e., strings) *must* be enclosed in
 quotation marks.
 
 Unless otherwise specified, settings that refer to paths can be either absolute
-or relative to the configuration file.
-
-The settings you define in the configuration file will be passed to the
-templates, which allows you to use your settings to add site-wide content.
+or relative to the configuration file. The settings you define in the
+configuration file will be passed to the templates, which allows you to use your
+settings to add site-wide content.
 
 Here is a list of settings for Pelican:
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index c00bc591..0339681b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -11,6 +11,7 @@ import re
 import sys
 import time
 import traceback
+from pprint import pprint
 
 import six
 
@@ -319,6 +320,12 @@ def parse_arguments():
                         help='Relaunch pelican each time a modification occurs'
                         ' on the content files.')
 
+    parser.add_argument('--print-settings', dest='print_settings',
+                        action='append', nargs='?', metavar='SETTING_NAME',
+                        help='Print current configuration settings and exit. '
+                        'Append a setting name as argument to see the value '
+                        'for that specific setting only.')
+
     parser.add_argument('--relative-urls', dest='relative_paths',
                         action='store_true',
                         help='Use relative urls in output, '
@@ -527,6 +534,21 @@ def main():
 
     try:
         pelican, settings = get_instance(args)
+
+        if args.print_settings:
+            # If no argument was given to --print-settings, print all settings
+            if args.print_settings[0] is None:
+                pprint(settings)
+            # An argument was given to --print-settings, so print that setting
+            else:
+                try:
+                    pprint(settings[args.print_settings[0]])
+                except KeyError:
+                    print("{} is not a recognized setting.".format(
+                          args.print_settings[0]))
+                    return 1
+            return 0
+
         readers = Readers(settings)
         reader_descs = sorted(set(['%s (%s)' %
                                    (type(r).__name__,

From f130695bbf8572b38d314c8c30073fb383bb9790 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 24 Oct 2018 11:49:03 +0200
Subject: [PATCH 2078/2864] Support multiple --print-settings arguments

---
 docs/settings.rst   |  4 ++--
 pelican/__init__.py | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9c73dc04..26f0a233 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -22,8 +22,8 @@ Settings are configured in the form of a Python module (a file). There is an
 available for reference.
 
 To see a list of current settings in your environment, including both default
-and any customized values, run the following command (append a specific
-setting name as an argument to see the value for that one setting)::
+and any customized values, run the following command (append one or more
+specific setting names as arguments to see values for those settings only)::
 
     pelican --print-settings
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0339681b..48dc6dff 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -320,11 +320,11 @@ def parse_arguments():
                         help='Relaunch pelican each time a modification occurs'
                         ' on the content files.')
 
-    parser.add_argument('--print-settings', dest='print_settings',
-                        action='append', nargs='?', metavar='SETTING_NAME',
+    parser.add_argument('--print-settings', dest='print_settings', nargs='*',
+                        action='store', metavar='SETTING_NAME(S)',
                         help='Print current configuration settings and exit. '
-                        'Append a setting name as argument to see the value '
-                        'for that specific setting only.')
+                        'Append one or more setting name arguments to see the '
+                        'values for specific settings only.')
 
     parser.add_argument('--relative-urls', dest='relative_paths',
                         action='store_true',
@@ -535,18 +535,20 @@ def main():
     try:
         pelican, settings = get_instance(args)
 
-        if args.print_settings:
+        if args.print_settings != None:
             # If no argument was given to --print-settings, print all settings
-            if args.print_settings[0] is None:
+            if args.print_settings == []:
                 pprint(settings)
             # An argument was given to --print-settings, so print that setting
             else:
-                try:
-                    pprint(settings[args.print_settings[0]])
-                except KeyError:
-                    print("{} is not a recognized setting.".format(
-                          args.print_settings[0]))
-                    return 1
+                for setting in args.print_settings:
+                    try:
+                        setting_value = settings[setting]
+                        print("\n{}: ".format(setting))
+                        pprint(setting_value)
+                    except KeyError:
+                        print("\n{} is not a recognized setting.".format(setting))
+                        return 1
             return 0
 
         readers = Readers(settings)

From 08ae2ef36128a7f719724cb595b53f328c3e60f3 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 25 Oct 2018 09:28:42 +0200
Subject: [PATCH 2079/2864] Pin Python-Markdown until fixed v3.1 is released

---
 requirements/test.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/test.pip b/requirements/test.pip
index fa2634a0..32f81d86 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -2,7 +2,7 @@
 mock
 
 # Optional Packages
-Markdown
+Markdown < 3.0
 BeautifulSoup4
 lxml
 typogrify

From b27153fe9b9362a3f7f87b90225c26975ba18f1d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 25 Oct 2018 09:36:26 +0200
Subject: [PATCH 2080/2864] Conform to changes in Flake8 v3.6 code style

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 1c6cbce9..529eeb52 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -185,7 +185,7 @@ def ask(question, answer=str_compat, default=None, length=None):
                 print('You must enter an integer')
         return r
     else:
-        raise NotImplemented(
+        raise NotImplementedError(
             'Argument `answer` must be str_compat, bool, or integer')
 
 

From ab9b21c03d3c4faccb30136127a05126ca50fb92 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 26 Oct 2018 12:00:40 +0200
Subject: [PATCH 2081/2864] Move --print-settings logic out of main()

---
 pelican/__init__.py | 46 +++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 48dc6dff..83b2c169 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -7,11 +7,11 @@ import locale
 import logging
 import multiprocessing
 import os
+import pprint
 import re
 import sys
 import time
 import traceback
-from pprint import pprint
 
 import six
 
@@ -270,6 +270,32 @@ class Pelican(object):
             return writer(self.output_path, settings=self.settings)
 
 
+class PrintSettings(argparse.Action):
+    def __call__(self, parser, namespace, values, option_string):
+        instance, settings = get_instance(namespace)
+
+        if values:
+            # One or more arguments provided, so only print those settings
+            for setting in values:
+                if setting in settings:
+                    # Only add newline between setting name and value if dict
+                    if isinstance(settings[setting], dict):
+                        setting_format = '\n{}:\n{}'
+                    else:
+                        setting_format = '\n{}: {}'
+                    print(setting_format.format(
+                        setting,
+                        pprint.pformat(settings[setting])))
+                else:
+                    print('\n{} is not a recognized setting.'.format(setting))
+                    break
+        else:
+            # No argument was given to --print-settings, so print all settings
+            pprint.pprint(settings)
+
+        parser.exit()
+
+
 def parse_arguments():
     parser = argparse.ArgumentParser(
         description='A tool to generate a static blog, '
@@ -321,7 +347,7 @@ def parse_arguments():
                         ' on the content files.')
 
     parser.add_argument('--print-settings', dest='print_settings', nargs='*',
-                        action='store', metavar='SETTING_NAME(S)',
+                        action=PrintSettings, metavar='SETTING_NAME',
                         help='Print current configuration settings and exit. '
                         'Append one or more setting name arguments to see the '
                         'values for specific settings only.')
@@ -535,22 +561,6 @@ def main():
     try:
         pelican, settings = get_instance(args)
 
-        if args.print_settings != None:
-            # If no argument was given to --print-settings, print all settings
-            if args.print_settings == []:
-                pprint(settings)
-            # An argument was given to --print-settings, so print that setting
-            else:
-                for setting in args.print_settings:
-                    try:
-                        setting_value = settings[setting]
-                        print("\n{}: ".format(setting))
-                        pprint(setting_value)
-                    except KeyError:
-                        print("\n{} is not a recognized setting.".format(setting))
-                        return 1
-            return 0
-
         readers = Readers(settings)
         reader_descs = sorted(set(['%s (%s)' %
                                    (type(r).__name__,

From a247354db819ce8b2bbe2777afd9e32066243e8b Mon Sep 17 00:00:00 2001
From: Gordon Reeder <greeder@myself.com>
Date: Sun, 28 Oct 2018 20:08:41 -0700
Subject: [PATCH 2082/2864] Updated base.html to fix issue #2404.

---
 pelican/themes/simple/templates/base.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 00aa3836..a1fdcf78 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -43,12 +43,11 @@
           {% for p in pages %}
             <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
           {% endfor %}
-        {% else %}
-          {% if DISPLAY_CATEGORIES_ON_MENU %}
-            {% for cat, null in categories %}
-              <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
-            {% endfor %}
-          {% endif %}
+        {% endif %}
+        {% if DISPLAY_CATEGORIES_ON_MENU %}
+          {% for cat, null in categories %}
+            <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
+          {% endfor %}
         {% endif %}
         </ul></nav><!-- /#menu -->
         {% block content %}

From d965575f4a64f7dd9e2e18b2bb901dd5d4a50f6d Mon Sep 17 00:00:00 2001
From: Joao Moreira <13685125+jagmoreira@users.noreply.github.com>
Date: Tue, 30 Oct 2018 19:05:31 -0500
Subject: [PATCH 2083/2864] Add current date when publishing with ghp tool.

Re-submission of #2083 based on Invoke's task.py.
---
 pelican/tools/templates/tasks.py.jinja2 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index d9645e19..f3049085 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -3,6 +3,7 @@
 import os
 import shutil
 import sys
+import datetime
 try:
     import socketserver
 except ImportError:
@@ -29,6 +30,7 @@ CONFIG = {
 {% if github %}
     # Github Pages configuration
     'github_pages_branch': '{{github_pages_branch}}',
+    'commit_message': "'Publish site on {}'".format(datetime.date.today().isoformat()),
 {% endif %}
     # Port for `serve`
     'port': 8000,
@@ -108,7 +110,8 @@ def publish(c):
 @task
 def gh_pages(c):
     """Publish to GitHub Pages"""
-    rebuild(c)
-    c.run("ghp-import -b {github_pages_branch} {deploy_path} -p".format(
-        **CONFIG))
+    preview(c)
+    c.run('ghp-import -b {github_pages_branch} '
+          '-m {commit_message} '
+          '{deploy_path} -p'.format(**CONFIG))
 {% endif %}

From 5199fa51ea660dae30ebbf577403bd3768da656c Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Tue, 7 Aug 2018 17:35:16 +0200
Subject: [PATCH 2084/2864] control slug substitutions from settings with regex

---
 docs/changelog.rst                |   2 +
 docs/settings.rst                 |  66 +++----
 pelican/contents.py               |   8 +-
 pelican/settings.py               | 284 +++++++++++++++++++-----------
 pelican/tests/test_contents.py    |  26 ++-
 pelican/tests/test_importer.py    |   7 +-
 pelican/tests/test_settings.py    |  89 +++++++++-
 pelican/tests/test_urlwrappers.py |  31 ++--
 pelican/tests/test_utils.py       |  25 ++-
 pelican/tools/pelican_import.py   |  33 ++--
 pelican/urlwrappers.py            |  33 ++--
 pelican/utils.py                  |  36 +---
 12 files changed, 407 insertions(+), 233 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 883c86d0..13ef570e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,8 @@ Next release
 
 * New signal: ``feed_generated``
 * Replace Fabric by Invoke and ``fabfile.py`` template by ``tasks.py``.
+* Replace ``SLUG_SUBSTITUTIONS`` (and friends) by ``SLUG_REGEX_SUBSTITUTIONS``
+  for more finegrained control
 
 3.7.1 (2017-01-10)
 ==================
diff --git a/docs/settings.rst b/docs/settings.rst
index 26f0a233..a026f914 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -519,27 +519,6 @@ respectively.
    The URL to use for per-day archives of your posts. Used only if you have the
    ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
 
-.. data:: SLUG_SUBSTITUTIONS = ()
-
-   Substitutions to make prior to stripping out non-alphanumerics when
-   generating slugs. Specified as a list of 3-tuples of ``(from, to, skip)``
-   which are applied in order. ``skip`` is a boolean indicating whether or not
-   to skip replacement of non-alphanumeric characters.  Useful for backward
-   compatibility with existing URLs.
-
-.. data:: AUTHOR_SUBSTITUTIONS = ()
-
-   Substitutions for authors. ``SLUG_SUBSTITUTIONS`` is not taken into account
-   here!
-
-.. data:: CATEGORY_SUBSTITUTIONS = ()
-
-   Added to ``SLUG_SUBSTITUTIONS`` for categories.
-
-.. data:: TAG_SUBSTITUTIONS = ()
-
-   Added to ``SLUG_SUBSTITUTIONS`` for tags.
-
 .. note::
 
     If you do not want one or more of the default pages to be created (e.g.,
@@ -547,24 +526,6 @@ respectively.
     set the corresponding ``*_SAVE_AS`` setting to ``''`` to prevent the
     relevant page from being generated.
 
-.. note::
-
-    Substitutions are applied in order with the side effect that keeping
-    non-alphanum characters applies to the whole string when a replacement
-    is made.
-
-    For example if you have the following setting::
-
-       SLUG_SUBSTITUTIONS = (('C++', 'cpp'), ('keep dot', 'keep.dot', True))
-
-    the string ``Keep Dot`` will be converted to ``keep.dot``, however
-    ``C++ will keep dot`` will be converted to ``cpp will keep.dot`` instead
-    of ``cpp-will-keep.dot``!
-
-    If you want to keep non-alphanum characters only for tags or categories
-    but not other slugs then configure ``TAG_SUBSTITUTIONS`` and
-    ``CATEGORY_SUBSTITUTIONS`` respectively!
-
 Pelican can optionally create per-year, per-month, and per-day archives of your
 posts. These secondary archives are disabled by default but are automatically
 enabled if you supply format strings for their respective ``_SAVE_AS`` settings.
@@ -626,6 +587,33 @@ URLs for direct template pages are theme-dependent. Some themes use
 corresponding ``*_URL`` setting as string, while others hard-code them:
 ``'archives.html'``, ``'authors.html'``, ``'categories.html'``, ``'tags.html'``.
 
+.. data:: SLUG_REGEX_SUBSTITUTIONS = [
+        (r'[^\w\s-]', ''),  # remove non-alphabetical/whitespace/'-' chars
+        (r'(?u)\A\s*', ''),  # strip leading whitespace
+        (r'(?u)\s*\Z', ''),  # strip trailing whitespace
+        (r'[-\s]+', '-'),  # reduce multiple whitespace or '-' to single '-'
+    ]
+
+   Regex substitutions to make when generating slugs of articles and pages.
+   Specified as a list of pairs of ``(from, to)`` which are applied in order,
+   ignoring case. The default substitutions have the effect of removing
+   non-alphanumeric characters and converting internal whitespace to dashes.
+   Apart from these substitutions, slugs are always converted to lowercase
+   ascii characters and leading and trailing whitespace is stripped. Useful for
+   backward compatibility with existing URLs.
+
+.. data:: AUTHOR_REGEX_SUBSTITUTIONS = SLUG_REGEX_SUBSTITUTIONS
+
+   Regex substitutions for author slugs. Defaults to ``SLUG_REGEX_SUBSTITUTIONS``.
+
+.. data:: CATEGORY_REGEX_SUBSTITUTIONS = SLUG_REGEX_SUBSTITUTIONS
+
+   Regex substitutions for category slugs. Defaults to ``SLUG_REGEX_SUBSTITUTIONS``.
+
+.. data:: TAG_REGEX_SUBSTITUTIONS = SLUG_REGEX_SUBSTITUTIONS
+
+   Regex substitutions for tag slugs. Defaults to ``SLUG_REGEX_SUBSTITUTIONS``.
+
 Time and Date
 =============
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 14dfc89b..dbda19b0 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -98,14 +98,16 @@ class Content(object):
         if not hasattr(self, 'slug'):
             if (settings['SLUGIFY_SOURCE'] == 'title' and
                     hasattr(self, 'title')):
-                self.slug = slugify(self.title,
-                                    settings.get('SLUG_SUBSTITUTIONS', ()))
+                self.slug = slugify(
+                    self.title,
+                    regex_subs=settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
             elif (settings['SLUGIFY_SOURCE'] == 'basename' and
                     source_path is not None):
                 basename = os.path.basename(
                     os.path.splitext(source_path)[0])
                 self.slug = slugify(
-                    basename, settings.get('SLUG_SUBSTITUTIONS', ()))
+                    basename,
+                    regex_subs=settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
 
         self.source_path = source_path
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 9845dd18..5128ff6d 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -6,6 +6,7 @@ import inspect
 import locale
 import logging
 import os
+import re
 from os.path import isabs
 from posixpath import join as posix_join
 
@@ -145,7 +146,12 @@ DEFAULT_CONFIG = {
     'TEMPLATE_PAGES': {},
     'TEMPLATE_EXTENSIONS': ['.html'],
     'IGNORE_FILES': ['.#*'],
-    'SLUG_SUBSTITUTIONS': (),
+    'SLUG_REGEX_SUBSTITUTIONS': [
+        (r'[^\w\s-]', ''),  # remove non-alphabetical/whitespace/'-' chars
+        (r'(?u)\A\s*', ''),  # strip leading whitespace
+        (r'(?u)\s*\Z', ''),  # strip trailing whitespace
+        (r'[-\s]+', '-'),  # reduce multiple whitespace or '-' to single '-'
+    ],
     'INTRASITE_LINK_REGEX': '[{|](?P<what>.*?)[|}]',
     'SLUGIFY_SOURCE': 'title',
     'CACHE_CONTENT': False,
@@ -164,79 +170,62 @@ PYGMENTS_RST_OPTIONS = None
 
 
 def read_settings(path=None, override=None):
+    settings = override or {}
+
     if path:
-        local_settings = get_settings_from_file(path)
-        # Make the paths relative to the settings file
+        settings = dict(get_settings_from_file(path), **settings)
+
+    if settings:
+        settings = handle_deprecated_settings(settings)
+
+    if path:
+        # Make relative paths absolute
+        def getabs(maybe_relative, base_path=path):
+            if isabs(maybe_relative):
+                return maybe_relative
+            return os.path.abspath(os.path.normpath(os.path.join(
+                os.path.dirname(base_path), maybe_relative)))
+
         for p in ['PATH', 'OUTPUT_PATH', 'THEME', 'CACHE_PATH']:
-            if p in local_settings and local_settings[p] is not None \
-                    and not isabs(local_settings[p]):
-                absp = os.path.abspath(os.path.normpath(os.path.join(
-                    os.path.dirname(path), local_settings[p])))
+            if settings.get(p) is not None:
+                absp = getabs(settings[p])
+                # THEME may be a name rather than a path
                 if p != 'THEME' or os.path.exists(absp):
-                    local_settings[p] = absp
+                    settings[p] = absp
 
-        if 'PLUGIN_PATH' in local_settings:
-            logger.warning('PLUGIN_PATH setting has been replaced by '
-                           'PLUGIN_PATHS, moving it to the new setting name.')
-            local_settings['PLUGIN_PATHS'] = local_settings['PLUGIN_PATH']
-            del local_settings['PLUGIN_PATH']
-        if 'JINJA_EXTENSIONS' in local_settings:
-            logger.warning('JINJA_EXTENSIONS setting has been deprecated, '
-                           'moving it to JINJA_ENVIRONMENT setting.')
-            local_settings['JINJA_ENVIRONMENT']['extensions'] = \
-                local_settings['JINJA_EXTENSIONS']
-            del local_settings['JINJA_EXTENSIONS']
-        if isinstance(local_settings['PLUGIN_PATHS'], six.string_types):
-            logger.warning("Defining PLUGIN_PATHS setting as string "
-                           "has been deprecated (should be a list)")
-            local_settings['PLUGIN_PATHS'] = [local_settings['PLUGIN_PATHS']]
-        elif local_settings['PLUGIN_PATHS'] is not None:
-            def getabs(path, pluginpath):
-                if isabs(pluginpath):
-                    return pluginpath
-                else:
-                    path_dirname = os.path.dirname(path)
-                    path_joined = os.path.join(path_dirname, pluginpath)
-                    path_normed = os.path.normpath(path_joined)
-                    path_absolute = os.path.abspath(path_normed)
-                    return path_absolute
+        if settings.get('PLUGIN_PATHS') is not None:
+            settings['PLUGIN_PATHS'] = [getabs(pluginpath)
+                                        for pluginpath
+                                        in settings['PLUGIN_PATHS']]
 
-            pluginpath_list = [getabs(path, pluginpath)
-                               for pluginpath
-                               in local_settings['PLUGIN_PATHS']]
-            local_settings['PLUGIN_PATHS'] = pluginpath_list
-    else:
-        local_settings = copy.deepcopy(DEFAULT_CONFIG)
+    settings = dict(copy.deepcopy(DEFAULT_CONFIG), **settings)
+    settings = configure_settings(settings)
 
-    if override:
-        local_settings.update(override)
-
-    parsed_settings = configure_settings(local_settings)
     # This is because there doesn't seem to be a way to pass extra
     # parameters to docutils directive handlers, so we have to have a
     # variable here that we'll import from within Pygments.run (see
     # rstdirectives.py) to see what the user defaults were.
     global PYGMENTS_RST_OPTIONS
-    PYGMENTS_RST_OPTIONS = parsed_settings.get('PYGMENTS_RST_OPTIONS', None)
-    return parsed_settings
+    PYGMENTS_RST_OPTIONS = settings.get('PYGMENTS_RST_OPTIONS', None)
+    return settings
 
 
-def get_settings_from_module(module=None, default_settings=DEFAULT_CONFIG):
+def get_settings_from_module(module=None):
     """Loads settings from a module, returns a dictionary."""
 
-    context = copy.deepcopy(default_settings)
+    context = {}
     if module is not None:
         context.update(
             (k, v) for k, v in inspect.getmembers(module) if k.isupper())
     return context
 
 
-def get_settings_from_file(path, default_settings=DEFAULT_CONFIG):
+def get_settings_from_file(path):
     """Loads settings from a file path, returning a dict."""
 
     name, ext = os.path.splitext(os.path.basename(path))
     module = load_source(name, path)
-    return get_settings_from_module(module, default_settings=default_settings)
+    return get_settings_from_module(module)
 
 
 def get_jinja_environment(settings):
@@ -253,6 +242,149 @@ def get_jinja_environment(settings):
     return settings
 
 
+def handle_deprecated_settings(settings):
+    """Converts deprecated settings and issues warnings. Issues an exception
+    if both old and new setting is specified.
+    """
+
+    # PLUGIN_PATH -> PLUGIN_PATHS
+    if 'PLUGIN_PATH' in settings:
+        logger.warning('PLUGIN_PATH setting has been replaced by '
+                       'PLUGIN_PATHS, moving it to the new setting name.')
+        settings['PLUGIN_PATHS'] = settings['PLUGIN_PATH']
+        del settings['PLUGIN_PATH']
+
+    # PLUGIN_PATHS: str -> [str]
+    if isinstance(settings.get('PLUGIN_PATHS'), six.string_types):
+        logger.warning("Defining PLUGIN_PATHS setting as string "
+                       "has been deprecated (should be a list)")
+        settings['PLUGIN_PATHS'] = [settings['PLUGIN_PATHS']]
+
+    # JINJA_EXTENSIONS -> JINJA_ENVIRONMENT > extensions
+    if 'JINJA_EXTENSIONS' in settings:
+        logger.warning('JINJA_EXTENSIONS setting has been deprecated, '
+                       'moving it to JINJA_ENVIRONMENT setting.')
+        settings['JINJA_ENVIRONMENT']['extensions'] = \
+            settings['JINJA_EXTENSIONS']
+        del settings['JINJA_EXTENSIONS']
+
+    # {ARTICLE,PAGE}_DIR -> {ARTICLE,PAGE}_PATHS
+    for key in ['ARTICLE', 'PAGE']:
+        old_key = key + '_DIR'
+        new_key = key + '_PATHS'
+        if old_key in settings:
+            logger.warning(
+                'Deprecated setting %s, moving it to %s list',
+                old_key, new_key)
+            settings[new_key] = [settings[old_key]]   # also make a list
+            del settings[old_key]
+
+    # EXTRA_TEMPLATES_PATHS -> THEME_TEMPLATES_OVERRIDES
+    if 'EXTRA_TEMPLATES_PATHS' in settings:
+        logger.warning('EXTRA_TEMPLATES_PATHS is deprecated use '
+                       'THEME_TEMPLATES_OVERRIDES instead.')
+        if ('THEME_TEMPLATES_OVERRIDES' in settings and
+                settings['THEME_TEMPLATES_OVERRIDES']):
+            raise Exception(
+                'Setting both EXTRA_TEMPLATES_PATHS and '
+                'THEME_TEMPLATES_OVERRIDES is not permitted. Please move to '
+                'only setting THEME_TEMPLATES_OVERRIDES.')
+        settings['THEME_TEMPLATES_OVERRIDES'] = \
+            settings['EXTRA_TEMPLATES_PATHS']
+        del settings['EXTRA_TEMPLATES_PATHS']
+
+    # MD_EXTENSIONS -> MARKDOWN
+    if 'MD_EXTENSIONS' in settings:
+        logger.warning('MD_EXTENSIONS is deprecated use MARKDOWN '
+                       'instead. Falling back to the default.')
+        settings['MARKDOWN'] = DEFAULT_CONFIG['MARKDOWN']
+
+    # LESS_GENERATOR -> Webassets plugin
+    # FILES_TO_COPY -> STATIC_PATHS, EXTRA_PATH_METADATA
+    for old, new, doc in [
+            ('LESS_GENERATOR', 'the Webassets plugin', None),
+            ('FILES_TO_COPY', 'STATIC_PATHS and EXTRA_PATH_METADATA',
+                'https://github.com/getpelican/pelican/'
+                'blob/master/docs/settings.rst#path-metadata'),
+    ]:
+        if old in settings:
+            message = 'The {} setting has been removed in favor of {}'.format(
+                old, new)
+            if doc:
+                message += ', see {} for details'.format(doc)
+            logger.warning(message)
+
+    # PAGINATED_DIRECT_TEMPLATES -> PAGINATED_TEMPLATES
+    if 'PAGINATED_DIRECT_TEMPLATES' in settings:
+        message = 'The {} setting has been removed in favor of {}'.format(
+            'PAGINATED_DIRECT_TEMPLATES', 'PAGINATED_TEMPLATES')
+        logger.warning(message)
+
+        for t in settings['PAGINATED_DIRECT_TEMPLATES']:
+            if t not in settings['PAGINATED_TEMPLATES']:
+                settings['PAGINATED_TEMPLATES'][t] = None
+        del settings['PAGINATED_DIRECT_TEMPLATES']
+
+    # {SLUG,CATEGORY,TAG,AUTHOR}_SUBSTITUTIONS ->
+    # {SLUG,CATEGORY,TAG,AUTHOR}_REGEX_SUBSTITUTIONS
+    url_settings_url = \
+        'http://docs.getpelican.com/en/latest/settings.html#url-settings'
+    flavours = {'SLUG', 'CATEGORY', 'TAG', 'AUTHOR'}
+    old_values = {f: settings[f + '_SUBSTITUTIONS']
+                  for f in flavours if f + '_SUBSTITUTIONS' in settings}
+    new_values = {f: settings[f + '_REGEX_SUBSTITUTIONS']
+                  for f in flavours if f + '_REGEX_SUBSTITUTIONS' in settings}
+    if old_values and new_values:
+        raise Exception(
+            'Setting both {new_key} and {old_key} (or variants thereof) is '
+            'not permitted. Please move to only setting {new_key}.'
+            .format(old_key='SLUG_SUBSTITUTIONS',
+                    new_key='SLUG_REGEX_SUBSTITUTIONS'))
+    if old_values:
+        message = ('{} and variants thereof are deprecated and will be '
+                   'removed in the future. Please use {} and variants thereof '
+                   'instead. Check {}.'
+                   .format('SLUG_SUBSTITUTIONS', 'SLUG_REGEX_SUBSTITUTIONS',
+                           url_settings_url))
+        logger.warning(message)
+        if old_values.get('SLUG'):
+            for f in {'CATEGORY', 'TAG'}:
+                if old_values.get(f):
+                    old_values[f] = old_values['SLUG'] + old_values[f]
+            old_values['AUTHOR'] = old_values.get('AUTHOR', [])
+        for f in flavours:
+            if old_values.get(f) is not None:
+                regex_subs = []
+                # by default will replace non-alphanum characters
+                replace = True
+                for tpl in old_values[f]:
+                    try:
+                        src, dst, skip = tpl
+                        if skip:
+                            replace = False
+                    except ValueError:
+                        src, dst = tpl
+                    regex_subs.append(
+                        (re.escape(src), dst.replace('\\', r'\\')))
+
+                if replace:
+                    regex_subs += [
+                        (r'[^\w\s-]', ''),
+                        (r'(?u)\A\s*', ''),
+                        (r'(?u)\s*\Z', ''),
+                        (r'[-\s]+', '-'),
+                    ]
+                else:
+                    regex_subs += [
+                        (r'(?u)\A\s*', ''),
+                        (r'(?u)\s*\Z', ''),
+                    ]
+                settings[f + '_REGEX_SUBSTITUTIONS'] = regex_subs
+            settings.pop(f + '_SUBSTITUTIONS', None)
+
+    return settings
+
+
 def configure_settings(settings):
     """Provide optimizations, error checking, and warnings for the given
     settings.
@@ -377,31 +509,6 @@ def configure_settings(settings):
         key=lambda r: r[0],
     )
 
-    # move {ARTICLE,PAGE}_DIR -> {ARTICLE,PAGE}_PATHS
-    for key in ['ARTICLE', 'PAGE']:
-        old_key = key + '_DIR'
-        new_key = key + '_PATHS'
-        if old_key in settings:
-            logger.warning(
-                'Deprecated setting %s, moving it to %s list',
-                old_key, new_key)
-            settings[new_key] = [settings[old_key]]   # also make a list
-            del settings[old_key]
-
-    # Deprecated warning of EXTRA_TEMPLATES_PATHS
-    if 'EXTRA_TEMPLATES_PATHS' in settings:
-        logger.warning('EXTRA_TEMPLATES_PATHS is deprecated use '
-                       'THEME_TEMPLATES_OVERRIDES instead.')
-        if ('THEME_TEMPLATES_OVERRIDES' in settings and
-                settings['THEME_TEMPLATES_OVERRIDES']):
-            raise Exception(
-                'Setting both EXTRA_TEMPLATES_PATHS and '
-                'THEME_TEMPLATES_OVERRIDES is not permitted. Please move to '
-                'only setting THEME_TEMPLATES_OVERRIDES.')
-        settings['THEME_TEMPLATES_OVERRIDES'] = \
-            settings['EXTRA_TEMPLATES_PATHS']
-        del settings['EXTRA_TEMPLATES_PATHS']
-
     # Save people from accidentally setting a string rather than a list
     path_keys = (
         'ARTICLE_EXCLUDES',
@@ -425,12 +532,6 @@ def configure_settings(settings):
                            PATH_KEY)
             settings[PATH_KEY] = DEFAULT_CONFIG[PATH_KEY]
 
-    # Deprecated warning of MD_EXTENSIONS
-    if 'MD_EXTENSIONS' in settings:
-        logger.warning('MD_EXTENSIONS is deprecated use MARKDOWN '
-                       'instead. Falling back to the default.')
-        settings['MARKDOWN'] = DEFAULT_CONFIG['MARKDOWN']
-
     # Add {PAGE,ARTICLE}_PATHS to {ARTICLE,PAGE}_EXCLUDES
     mutually_exclusive = ('ARTICLE', 'PAGE')
     for type_1, type_2 in [mutually_exclusive, mutually_exclusive[::-1]]:
@@ -443,27 +544,4 @@ def configure_settings(settings):
         except KeyError:
             continue            # setting not specified, nothing to do
 
-    for old, new, doc in [
-            ('LESS_GENERATOR', 'the Webassets plugin', None),
-            ('FILES_TO_COPY', 'STATIC_PATHS and EXTRA_PATH_METADATA',
-                'https://github.com/getpelican/pelican/'
-                'blob/master/docs/settings.rst#path-metadata'),
-    ]:
-        if old in settings:
-            message = 'The {} setting has been removed in favor of {}'.format(
-                old, new)
-            if doc:
-                message += ', see {} for details'.format(doc)
-            logger.warning(message)
-
-    if 'PAGINATED_DIRECT_TEMPLATES' in settings:
-        message = 'The {} setting has been removed in favor of {}'.format(
-            'PAGINATED_DIRECT_TEMPLATES', 'PAGINATED_TEMPLATES')
-        logger.warning(message)
-
-        for t in settings['PAGINATED_DIRECT_TEMPLATES']:
-            if t not in settings['PAGINATED_TEMPLATES']:
-                settings['PAGINATED_TEMPLATES'][t] = None
-        del settings['PAGINATED_DIRECT_TEMPLATES']
-
     return settings
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 8ab60553..032df468 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -497,7 +497,13 @@ class TestArticle(TestPage):
 
     def test_slugify_category_author(self):
         settings = get_settings()
-        settings['SLUG_SUBSTITUTIONS'] = [('C#', 'csharp')]
+        settings['SLUG_REGEX_SUBSTITUTIONS'] = [
+            (r'C#', 'csharp'),
+            (r'[^\w\s-]', ''),
+            (r'(?u)\A\s*', ''),
+            (r'(?u)\s*\Z', ''),
+            (r'[-\s]+', '-'),
+        ]
         settings['ARTICLE_URL'] = '{author}/{category}/{slug}/'
         settings['ARTICLE_SAVE_AS'] = '{author}/{category}/{slug}/index.html'
         article_kwargs = self._copy_page_kwargs()
@@ -513,9 +519,13 @@ class TestArticle(TestPage):
 
     def test_slugify_with_author_substitutions(self):
         settings = get_settings()
-        settings['AUTHOR_SUBSTITUTIONS'] = [
-                                    ('Alexander Todorov', 'atodorov', False),
-                                    ('Krasimir Tsonev', 'krasimir', False),
+        settings['AUTHOR_REGEX_SUBSTITUTIONS'] = [
+            ('Alexander Todorov', 'atodorov'),
+            ('Krasimir Tsonev', 'krasimir'),
+            (r'[^\w\s-]', ''),
+            (r'(?u)\A\s*', ''),
+            (r'(?u)\s*\Z', ''),
+            (r'[-\s]+', '-'),
         ]
         settings['ARTICLE_URL'] = 'blog/{author}/{slug}/'
         settings['ARTICLE_SAVE_AS'] = 'blog/{author}/{slug}/index.html'
@@ -530,7 +540,9 @@ class TestArticle(TestPage):
 
     def test_slugify_category_with_dots(self):
         settings = get_settings()
-        settings['CATEGORY_SUBSTITUTIONS'] = [('Fedora QA', 'fedora.qa', True)]
+        settings['CATEGORY_REGEX_SUBSTITUTIONS'] = [
+            ('Fedora QA', 'fedora.qa'),
+        ]
         settings['ARTICLE_URL'] = '{category}/{slug}/'
         article_kwargs = self._copy_page_kwargs()
         article_kwargs['metadata']['category'] = Category('Fedora QA',
@@ -542,7 +554,9 @@ class TestArticle(TestPage):
 
     def test_slugify_tags_with_dots(self):
         settings = get_settings()
-        settings['TAG_SUBSTITUTIONS'] = [('Fedora QA', 'fedora.qa', True)]
+        settings['TAG_REGEX_SUBSTITUTIONS'] = [
+            ('Fedora QA', 'fedora.qa'),
+        ]
         settings['ARTICLE_URL'] = '{tag}/{slug}/'
         article_kwargs = self._copy_page_kwargs()
         article_kwargs['metadata']['tag'] = Tag('Fedora QA', settings)
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index f913562f..2cf05ba8 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -6,6 +6,7 @@ import os
 import re
 from codecs import open
 
+from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder,
                                    unittest)
 from pelican.tools.pelican_import import (blogger2fields, build_header,
@@ -133,10 +134,11 @@ class TestWordpressXmlImporter(unittest.TestCase):
         with temporary_folder() as temp:
             fnames = list(silent_f2p(test_posts, 'markdown',
                                      temp, dircat=True))
+        subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
         index = 0
         for post in test_posts:
             name = post[2]
-            category = slugify(post[5][0])
+            category = slugify(post[5][0], regex_subs=subs)
             name += '.md'
             filename = os.path.join(category, name)
             out_name = fnames[index]
@@ -208,11 +210,12 @@ class TestWordpressXmlImporter(unittest.TestCase):
         with temporary_folder() as temp:
             fnames = list(silent_f2p(test_posts, 'markdown', temp,
                                      wp_custpost=True, dircat=True))
+        subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
         index = 0
         for post in test_posts:
             name = post[2]
             kind = post[8]
-            category = slugify(post[5][0])
+            category = slugify(post[5][0], regex_subs=subs)
             name += '.md'
             filename = os.path.join(kind, category, name)
             out_name = fnames[index]
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 393c4337..5e794dc5 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -9,7 +9,8 @@ from sys import platform
 
 
 from pelican.settings import (DEFAULT_CONFIG, DEFAULT_THEME,
-                              configure_settings, read_settings)
+                              configure_settings, handle_deprecated_settings,
+                              read_settings)
 from pelican.tests.support import unittest
 
 
@@ -128,7 +129,7 @@ class TestSettingsConfiguration(unittest.TestCase):
         settings['ARTICLE_DIR'] = 'foo'
         settings['PAGE_DIR'] = 'bar'
 
-        configure_settings(settings)
+        settings = handle_deprecated_settings(settings)
 
         self.assertEqual(settings['ARTICLE_PATHS'], ['foo'])
         self.assertEqual(settings['PAGE_PATHS'], ['bar'])
@@ -171,7 +172,7 @@ class TestSettingsConfiguration(unittest.TestCase):
         settings = self.settings
         settings['EXTRA_TEMPLATES_PATHS'] = ['/foo/bar', '/ha']
 
-        configure_settings(settings)
+        settings = handle_deprecated_settings(settings)
 
         self.assertEqual(settings['THEME_TEMPLATES_OVERRIDES'],
                          ['/foo/bar', '/ha'])
@@ -181,7 +182,7 @@ class TestSettingsConfiguration(unittest.TestCase):
         settings = self.settings
         settings['PAGINATED_DIRECT_TEMPLATES'] = ['index', 'archives']
         settings['PAGINATED_TEMPLATES'] = {'index': 10, 'category': None}
-        settings = configure_settings(settings)
+        settings = handle_deprecated_settings(settings)
         self.assertEqual(settings['PAGINATED_TEMPLATES'],
                          {'index': 10, 'category': None, 'archives': None})
         self.assertNotIn('PAGINATED_DIRECT_TEMPLATES', settings)
@@ -191,4 +192,82 @@ class TestSettingsConfiguration(unittest.TestCase):
         settings['EXTRA_TEMPLATES_PATHS'] = ['/ha']
         settings['THEME_TEMPLATES_OVERRIDES'] = ['/foo/bar']
 
-        self.assertRaises(Exception, configure_settings, settings)
+        self.assertRaises(Exception, handle_deprecated_settings, settings)
+
+    def test_slug_and_slug_regex_substitutions_exception(self):
+        settings = {}
+        settings['SLUG_REGEX_SUBSTITUTIONS'] = [('C++', 'cpp')]
+        settings['TAG_SUBSTITUTIONS'] = [('C#', 'csharp')]
+
+        self.assertRaises(Exception, handle_deprecated_settings, settings)
+
+    def test_deprecated_slug_substitutions(self):
+        default_slug_regex_subs = self.settings['SLUG_REGEX_SUBSTITUTIONS']
+
+        # If no deprecated setting is set, don't set new ones
+        settings = {}
+        settings = handle_deprecated_settings(settings)
+        self.assertNotIn('SLUG_REGEX_SUBSTITUTIONS', settings)
+        self.assertNotIn('TAG_REGEX_SUBSTITUTIONS', settings)
+        self.assertNotIn('CATEGORY_REGEX_SUBSTITUTIONS', settings)
+        self.assertNotIn('AUTHOR_REGEX_SUBSTITUTIONS', settings)
+
+        # If SLUG_SUBSTITUTIONS is set, set {SLUG, AUTHOR}_REGEX_SUBSTITUTIONS
+        # correctly, don't set {CATEGORY, TAG}_REGEX_SUBSTITUTIONS
+        settings = {}
+        settings['SLUG_SUBSTITUTIONS'] = [('C++', 'cpp')]
+        settings = handle_deprecated_settings(settings)
+        self.assertEqual(settings.get('SLUG_REGEX_SUBSTITUTIONS'),
+                         [(r'C\+\+', 'cpp')] + default_slug_regex_subs)
+        self.assertNotIn('TAG_REGEX_SUBSTITUTIONS', settings)
+        self.assertNotIn('CATEGORY_REGEX_SUBSTITUTIONS', settings)
+        self.assertEqual(settings.get('AUTHOR_REGEX_SUBSTITUTIONS'),
+                         default_slug_regex_subs)
+
+        # If {CATEGORY, TAG, AUTHOR}_SUBSTITUTIONS are set, set
+        # {CATEGORY, TAG, AUTHOR}_REGEX_SUBSTITUTIONS correctly, don't set
+        # SLUG_REGEX_SUBSTITUTIONS
+        settings = {}
+        settings['TAG_SUBSTITUTIONS'] = [('C#', 'csharp')]
+        settings['CATEGORY_SUBSTITUTIONS'] = [('C#', 'csharp')]
+        settings['AUTHOR_SUBSTITUTIONS'] = [('Alexander Todorov', 'atodorov')]
+        settings = handle_deprecated_settings(settings)
+        self.assertNotIn('SLUG_REGEX_SUBSTITUTIONS', settings)
+        self.assertEqual(settings['TAG_REGEX_SUBSTITUTIONS'],
+                         [(r'C\#', 'csharp')] + default_slug_regex_subs)
+        self.assertEqual(settings['CATEGORY_REGEX_SUBSTITUTIONS'],
+                         [(r'C\#', 'csharp')] + default_slug_regex_subs)
+        self.assertEqual(settings['AUTHOR_REGEX_SUBSTITUTIONS'],
+                         [(r'Alexander\ Todorov', 'atodorov')] +
+                         default_slug_regex_subs)
+
+        # If {SLUG, CATEGORY, TAG, AUTHOR}_SUBSTITUTIONS are set, set
+        # {SLUG, CATEGORY, TAG, AUTHOR}_REGEX_SUBSTITUTIONS correctly
+        settings = {}
+        settings['SLUG_SUBSTITUTIONS'] = [('C++', 'cpp')]
+        settings['TAG_SUBSTITUTIONS'] = [('C#', 'csharp')]
+        settings['CATEGORY_SUBSTITUTIONS'] = [('C#', 'csharp')]
+        settings['AUTHOR_SUBSTITUTIONS'] = [('Alexander Todorov', 'atodorov')]
+        settings = handle_deprecated_settings(settings)
+        self.assertEqual(settings['TAG_REGEX_SUBSTITUTIONS'],
+                         [(r'C\+\+', 'cpp')] + [(r'C\#', 'csharp')] +
+                         default_slug_regex_subs)
+        self.assertEqual(settings['CATEGORY_REGEX_SUBSTITUTIONS'],
+                         [(r'C\+\+', 'cpp')] + [(r'C\#', 'csharp')] +
+                         default_slug_regex_subs)
+        self.assertEqual(settings['AUTHOR_REGEX_SUBSTITUTIONS'],
+                         [(r'Alexander\ Todorov', 'atodorov')] +
+                         default_slug_regex_subs)
+
+        # Handle old 'skip' flags correctly
+        settings = {}
+        settings['SLUG_SUBSTITUTIONS'] = [('C++', 'cpp', True)]
+        settings['AUTHOR_SUBSTITUTIONS'] = [('Alexander Todorov', 'atodorov',
+                                             False)]
+        settings = handle_deprecated_settings(settings)
+        self.assertEqual(settings.get('SLUG_REGEX_SUBSTITUTIONS'),
+                         [(r'C\+\+', 'cpp')] +
+                         [(r'(?u)\A\s*', ''), (r'(?u)\s*\Z', '')])
+        self.assertEqual(settings['AUTHOR_REGEX_SUBSTITUTIONS'],
+                         [(r'Alexander\ Todorov', 'atodorov')] +
+                         default_slug_regex_subs)
diff --git a/pelican/tests/test_urlwrappers.py b/pelican/tests/test_urlwrappers.py
index 21a7d98f..8ff3d9d6 100644
--- a/pelican/tests/test_urlwrappers.py
+++ b/pelican/tests/test_urlwrappers.py
@@ -55,30 +55,29 @@ class TestURLWrapper(unittest.TestCase):
         self.assertEqual(author, author_equal)
 
         cat_ascii = Category('指導書', settings={})
-        self.assertEqual(cat_ascii, u'zhi-dao-shu')
+        self.assertEqual(cat_ascii, u'zhi dao shu')
 
     def test_slugify_with_substitutions_and_dots(self):
-        tag = Tag('Tag Dot',
-                  settings={
-                        'TAG_SUBSTITUTIONS': [('Tag Dot', 'tag.dot', True)]
-                    })
+        tag = Tag('Tag Dot', settings={'TAG_REGEX_SUBSTITUTIONS': [
+            ('Tag Dot', 'tag.dot'),
+        ]})
         cat = Category('Category Dot',
-                       settings={
-                        'CATEGORY_SUBSTITUTIONS': (('Category Dot',
-                                                    'cat.dot',
-                                                    True),)
-                        })
+                       settings={'CATEGORY_REGEX_SUBSTITUTIONS': [
+                           ('Category Dot', 'cat.dot'),
+                       ]})
 
         self.assertEqual(tag.slug, 'tag.dot')
         self.assertEqual(cat.slug, 'cat.dot')
 
     def test_author_slug_substitutions(self):
-        settings = {
-            'AUTHOR_SUBSTITUTIONS': [
-                                    ('Alexander Todorov', 'atodorov', False),
-                                    ('Krasimir Tsonev', 'krasimir', False),
-            ]
-        }
+        settings = {'AUTHOR_REGEX_SUBSTITUTIONS': [
+            ('Alexander Todorov', 'atodorov'),
+            ('Krasimir Tsonev', 'krasimir'),
+            (r'[^\w\s-]', ''),
+            (r'(?u)\A\s*', ''),
+            (r'(?u)\s*\Z', ''),
+            (r'[-\s]+', '-'),
+        ]}
 
         author1 = Author('Mr. Senko', settings=settings)
         author2 = Author('Alexander Todorov', settings=settings)
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index b5b8b454..2c6c4cd8 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -119,8 +119,11 @@ class TestUtils(LoggedTestCase):
                    ('大飯原発４号機、１８日夜起動へ',
                     'da-fan-yuan-fa-4hao-ji-18ri-ye-qi-dong-he'),)
 
+        settings = read_settings()
+        subs = settings['SLUG_REGEX_SUBSTITUTIONS']
+
         for value, expected in samples:
-            self.assertEqual(utils.slugify(value), expected)
+            self.assertEqual(utils.slugify(value, regex_subs=subs), expected)
 
     def test_slugify_substitute(self):
 
@@ -129,21 +132,27 @@ class TestUtils(LoggedTestCase):
                    ('c++, c#, C#, C++', 'cpp-c-sharp-c-sharp-cpp'),
                    ('c++-streams', 'cpp-streams'),)
 
-        subs = (('C++', 'CPP'), ('C#', 'C-SHARP'))
+        settings = read_settings()
+        subs = [
+            (r'C\+\+', 'CPP'),
+            (r'C#', 'C-SHARP'),
+        ] + settings['SLUG_REGEX_SUBSTITUTIONS']
         for value, expected in samples:
-            self.assertEqual(utils.slugify(value, subs), expected)
+            self.assertEqual(utils.slugify(value, regex_subs=subs), expected)
 
     def test_slugify_substitute_and_keeping_non_alphanum(self):
 
         samples = (('Fedora QA', 'fedora.qa'),
                    ('C++ is used by Fedora QA', 'cpp is used by fedora.qa'),
-                   ('C++ is based on C', 'cpp-is-based-on-c'),
-                   ('C+++ test C+ test', 'cpp-test-c-test'),)
+                   ('C++ is based on C', 'cpp is based on c'),
+                   ('C+++ test C+ test', 'cpp+ test c+ test'),)
 
-        subs = (('Fedora QA', 'fedora.qa', True),
-                ('c++', 'cpp'),)
+        subs = [
+            (r'Fedora QA', 'fedora.qa'),
+            (r'c\+\+', 'cpp'),
+        ]
         for value, expected in samples:
-            self.assertEqual(utils.slugify(value, subs), expected)
+            self.assertEqual(utils.slugify(value, regex_subs=subs), expected)
 
     def test_get_relative_path(self):
 
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 5b09fdae..b7b26283 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -17,6 +17,7 @@ from six.moves.urllib.request import urlretrieve
 
 # because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import init
+from pelican.settings import read_settings
 from pelican.utils import SafeDatetime, slugify
 
 try:
@@ -291,6 +292,8 @@ def dc2fields(file):
 
     print("%i posts read." % len(posts))
 
+    settings = read_settings()
+    subs = settings['SLUG_REGEX_SUBSTITUTIONS']
     for post in posts:
         fields = post.split('","')
 
@@ -383,8 +386,9 @@ def dc2fields(file):
         kind = 'article'  # TODO: Recognise pages
         status = 'published'  # TODO: Find a way for draft posts
 
-        yield (post_title, content, slugify(post_title), post_creadt, author,
-               categories, tags, status, kind, post_format)
+        yield (post_title, content, slugify(post_title, regex_subs=subs),
+               post_creadt, author, categories, tags, status, kind,
+               post_format)
 
 
 def posterous2fields(api_token, email, password):
@@ -418,6 +422,8 @@ def posterous2fields(api_token, email, password):
 
     page = 1
     posts = get_posterous_posts(api_token, email, password, page)
+    settings = read_settings()
+    subs = settings['SLUG_REGEX_SUBSTITUTIONS']
     while len(posts) > 0:
         posts = get_posterous_posts(api_token, email, password, page)
         page += 1
@@ -425,7 +431,7 @@ def posterous2fields(api_token, email, password):
         for post in posts:
             slug = post.get('slug')
             if not slug:
-                slug = slugify(post.get('title'))
+                slug = slugify(post.get('title'), regex_subs=subs)
             tags = [tag.get('name') for tag in post.get('tags')]
             raw_date = post.get('display_date')
             date_object = SafeDatetime.strptime(
@@ -469,13 +475,15 @@ def tumblr2fields(api_key, blogname):
 
     offset = 0
     posts = get_tumblr_posts(api_key, blogname, offset)
+    settings = read_settings()
+    subs = settings['SLUG_REGEX_SUBSTITUTIONS']
     while len(posts) > 0:
         for post in posts:
             title = \
                 post.get('title') or \
                 post.get('source_title') or \
                 post.get('type').capitalize()
-            slug = post.get('slug') or slugify(title)
+            slug = post.get('slug') or slugify(title, regex_subs=subs)
             tags = post.get('tags')
             timestamp = post.get('timestamp')
             date = SafeDatetime.fromtimestamp(int(timestamp)).strftime(
@@ -552,6 +560,8 @@ def feed2fields(file):
     """Read a feed and yield pelican fields"""
     import feedparser
     d = feedparser.parse(file)
+    settings = read_settings()
+    subs = settings['SLUG_REGEX_SUBSTITUTIONS']
     for entry in d.entries:
         date = (entry.updated_parsed.strftime('%Y-%m-%d %H:%M')
                 if hasattr(entry, 'updated_parsed') else None)
@@ -559,7 +569,7 @@ def feed2fields(file):
         tags = ([e['term'] for e in entry.tags]
                 if hasattr(entry, 'tags') else None)
 
-        slug = slugify(entry.title)
+        slug = slugify(entry.title, regex_subs=subs)
         kind = 'article'
         yield (entry.title, entry.description, slug, date,
                author, [], tags, None, kind, 'html')
@@ -621,7 +631,7 @@ def get_ext(out_markup, in_markup='html'):
 
 
 def get_out_filename(output_path, filename, ext, kind,
-                     dirpage, dircat, categories, wp_custpost):
+                     dirpage, dircat, categories, wp_custpost, slug_subs):
     filename = os.path.basename(filename)
 
     # Enforce filename restrictions for various filesystems at once; see
@@ -647,12 +657,12 @@ def get_out_filename(output_path, filename, ext, kind,
     # create subdirectories with category names
     elif kind != 'article':
         if wp_custpost:
-            typename = slugify(kind)
+            typename = slugify(kind, regex_subs=slug_subs)
         else:
             typename = ''
             kind = 'article'
         if dircat and (len(categories) > 0):
-            catname = slugify(categories[0])
+            catname = slugify(categories[0], regex_subs=slug_subs)
         else:
             catname = ''
         out_filename = os.path.join(output_path, typename,
@@ -661,7 +671,7 @@ def get_out_filename(output_path, filename, ext, kind,
             os.makedirs(os.path.join(output_path, typename, catname))
     # option to put files in directories with categories names
     elif dircat and (len(categories) > 0):
-        catname = slugify(categories[0])
+        catname = slugify(categories[0], regex_subs=slug_subs)
         out_filename = os.path.join(output_path, catname, filename + ext)
         if not os.path.isdir(os.path.join(output_path, catname)):
             os.mkdir(os.path.join(output_path, catname))
@@ -768,6 +778,9 @@ def fields2pelican(
                  'requested import action.')
         exit(error)
 
+    settings = read_settings()
+    slug_subs = settings['SLUG_REGEX_SUBSTITUTIONS']
+
     for (title, content, filename, date, author, categories, tags, status,
             kind, in_markup) in fields:
         if filter_author and filter_author != author:
@@ -796,7 +809,7 @@ def fields2pelican(
 
         out_filename = get_out_filename(
             output_path, filename, ext, kind, dirpage, dircat,
-            categories, wp_custpost)
+            categories, wp_custpost, slug_subs)
         print(out_filename)
 
         if in_markup in ('html', 'wp-html'):
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 7659471d..860ca2ff 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -36,8 +36,9 @@ class URLWrapper(object):
     @property
     def slug(self):
         if self._slug is None:
-            self._slug = slugify(self.name,
-                                 self.settings.get('SLUG_SUBSTITUTIONS', ()))
+            self._slug = slugify(
+                self.name,
+                regex_subs=self.settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
         return self._slug
 
     @slug.setter
@@ -56,8 +57,8 @@ class URLWrapper(object):
         return hash(self.slug)
 
     def _normalize_key(self, key):
-        subs = self.settings.get('SLUG_SUBSTITUTIONS', ())
-        return six.text_type(slugify(key, subs))
+        subs = self.settings.get('SLUG_REGEX_SUBSTITUTIONS', [])
+        return six.text_type(slugify(key, regex_subs=subs))
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):
@@ -115,10 +116,11 @@ class Category(URLWrapper):
     @property
     def slug(self):
         if self._slug is None:
-            substitutions = self.settings.get('SLUG_SUBSTITUTIONS', ())
-            substitutions += tuple(self.settings.get('CATEGORY_SUBSTITUTIONS',
-                                                     ()))
-            self._slug = slugify(self.name, substitutions)
+            if 'CATEGORY_REGEX_SUBSTITUTIONS' in self.settings:
+                subs = self.settings['CATEGORY_REGEX_SUBSTITUTIONS']
+            else:
+                subs = self.settings.get('SLUG_REGEX_SUBSTITUTIONS', [])
+            self._slug = slugify(self.name, regex_subs=subs)
         return self._slug
 
 
@@ -129,9 +131,11 @@ class Tag(URLWrapper):
     @property
     def slug(self):
         if self._slug is None:
-            substitutions = self.settings.get('SLUG_SUBSTITUTIONS', ())
-            substitutions += tuple(self.settings.get('TAG_SUBSTITUTIONS', ()))
-            self._slug = slugify(self.name, substitutions)
+            if 'TAG_REGEX_SUBSTITUTIONS' in self.settings:
+                subs = self.settings['TAG_REGEX_SUBSTITUTIONS']
+            else:
+                subs = self.settings.get('SLUG_REGEX_SUBSTITUTIONS', [])
+            self._slug = slugify(self.name, regex_subs=subs)
         return self._slug
 
 
@@ -139,6 +143,9 @@ class Author(URLWrapper):
     @property
     def slug(self):
         if self._slug is None:
-            self._slug = slugify(self.name,
-                                 self.settings.get('AUTHOR_SUBSTITUTIONS', ()))
+            if 'AUTHOR_REGEX_SUBSTITUTIONS' in self.settings:
+                subs = self.settings['AUTHOR_REGEX_SUBSTITUTIONS']
+            else:
+                subs = self.settings.get('SLUG_REGEX_SUBSTITUTIONS', [])
+            self._slug = slugify(self.name, regex_subs=subs)
         return self._slug
diff --git a/pelican/utils.py b/pelican/utils.py
index 573603da..efc32e0c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -263,13 +263,14 @@ def pelican_open(filename, mode='rb', strip_crs=(sys.platform == 'win32')):
     yield content
 
 
-def slugify(value, substitutions=()):
+def slugify(value, regex_subs=()):
     """
     Normalizes string, converts to lowercase, removes non-alpha characters,
     and converts spaces to hyphens.
 
     Took from Django sources.
     """
+
     # TODO Maybe steal again from current Django 1.5dev
     value = Markup(value).striptags()
     # value must be unicode per se
@@ -281,37 +282,16 @@ def slugify(value, substitutions=()):
     if isinstance(value, six.binary_type):
         value = value.decode('ascii')
     # still unicode
-    value = unicodedata.normalize('NFKD', value).lower()
+    value = unicodedata.normalize('NFKD', value)
 
-    # backward compatible covert from 2-tuples to 3-tuples
-    new_subs = []
-    for tpl in substitutions:
-        try:
-            src, dst, skip = tpl
-        except ValueError:
-            src, dst = tpl
-            skip = False
-        new_subs.append((src, dst, skip))
-    substitutions = tuple(new_subs)
+    for src, dst in regex_subs:
+        value = re.sub(src, dst, value, flags=re.IGNORECASE)
 
-    # by default will replace non-alphanum characters
-    replace = True
-    for src, dst, skip in substitutions:
-        orig_value = value
-        value = value.replace(src.lower(), dst.lower())
-        # if replacement was made then skip non-alphanum
-        # replacement if instructed to do so
-        if value != orig_value:
-            replace = replace and not skip
-
-    if replace:
-        value = re.sub(r'[^\w\s-]', '', value).strip()
-        value = re.sub(r'[-\s]+', '-', value)
-    else:
-        value = value.strip()
+    # convert to lowercase
+    value = value.lower()
 
     # we want only ASCII chars
-    value = value.encode('ascii', 'ignore')
+    value = value.encode('ascii', 'ignore').strip()
     # but Pelican should generally use only unicode
     return value.decode('ascii')
 

From a78950bce7a2c220f0ee25d617562852a6eba180 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Thu, 5 Jul 2018 13:55:51 +0200
Subject: [PATCH 2085/2864] tweak paginator to accomodate {slug}.html patterns

---
 docs/changelog.rst              |  2 ++
 docs/settings.rst               | 32 +++++++++++++++++++-------------
 pelican/paginator.py            | 22 ++++++++--------------
 pelican/settings.py             |  3 ++-
 pelican/tests/test_paginator.py |  4 ++--
 5 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 13ef570e..58521e61 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,8 @@ Next release
 * Replace Fabric by Invoke and ``fabfile.py`` template by ``tasks.py``.
 * Replace ``SLUG_SUBSTITUTIONS`` (and friends) by ``SLUG_REGEX_SUBSTITUTIONS``
   for more finegrained control
+* ``'{base_name}'`` value in ``PAGINATION_PATTERNS`` setting no longer strips
+  ``'bar'`` from ``'foo/bar.html'`` (unless ``'bar' == 'index'``).
 
 3.7.1 (2017-01-10)
 ==================
diff --git a/docs/settings.rst b/docs/settings.rst
index a026f914..c397255c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -994,7 +994,10 @@ You can use the following settings to configure the pagination.
    The templates to use pagination with, and the number of articles to include
    on a page. If this value is ``None``, it defaults to ``DEFAULT_PAGINATION``.
 
-.. data:: PAGINATION_PATTERNS
+.. data:: PAGINATION_PATTERNS = (
+      (1, '{name}{extension}', '{name}{extension}'),
+      (2, '{name}{number}{extension}', '{name}{number}{extension}'),
+  )
 
    A set of patterns that are used to determine advanced pagination output.
 
@@ -1002,25 +1005,28 @@ You can use the following settings to configure the pagination.
 Using Pagination Patterns
 -------------------------
 
-The ``PAGINATION_PATTERNS`` setting can be used to configure where
-subsequent pages are created. The setting is a sequence of three
-element tuples, where each tuple consists of::
+By default, pages subsequent to ``.../foo.html`` are created as
+``.../foo2.html``, etc. The ``PAGINATION_PATTERNS`` setting can be used to
+change this. It takes a sequence of triples, where each triple consists of::
 
-  (minimum page, URL setting, SAVE_AS setting,)
+  (minimum_page, page_url, page_save_as,)
 
-For example, if you wanted the first page to just be ``/``, and the
-second (and subsequent) pages to be ``/page/2/``, you would set
-``PAGINATION_PATTERNS`` as follows::
+For ``page_url`` and ``page_save_as``, you may use a number of variables.
+``{url}`` and ``{save_as}`` correspond respectively to the ``*_URL`` and
+``*_SAVE_AS`` values of the corresponding page type (e.g. ``ARTICLE_SAVE_AS``).
+If ``{save_as} == foo/bar.html``, then ``{name} == foo/bar`` and
+``{extension} == .html``. ``{base_name}`` equals ``{name}`` except that it
+strips trailing ``/index`` if present. ``{number}`` equals the page number.
+
+For example, if you want to leave the first page unchanged, but place
+subsequent pages at ``.../page/2/`` etc, you could set ``PAGINATION_PATTERNS``
+as follows::
 
   PAGINATION_PATTERNS = (
-      (1, '{base_name}/', '{base_name}/index.html'),
+      (1, '{url}', '{save_as}`,
       (2, '{base_name}/page/{number}/', '{base_name}/page/{number}/index.html'),
   )
 
-This would cause the first page to be written to
-``{base_name}/index.html``, and subsequent ones would be written into
-``page/{number}`` directories.
-
 
 Translations
 ============
diff --git a/pelican/paginator.py b/pelican/paginator.py
index a0ce7c95..ceabf43b 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -66,7 +66,10 @@ class Paginator(object):
 
 class Page(object):
     def __init__(self, name, url, object_list, number, paginator, settings):
+        self.full_name = name
         self.name, self.extension = os.path.splitext(name)
+        dn, fn = os.path.split(name)
+        self.base_name = dn if fn in ('index.htm', 'index.html') else self.name
         self.base_url = url
         self.object_list = object_list
         self.number = number
@@ -134,25 +137,16 @@ class Page(object):
 
         # URL or SAVE_AS is a string, format it with a controlled context
         context = {
-            'name': self.name.replace(os.sep, '/'),
+            'save_as': self.full_name,
             'url': self.base_url,
-            'object_list': self.object_list,
-            'number': self.number,
-            'paginator': self.paginator,
-            'settings': self.settings,
-            'base_name': os.path.dirname(self.name),
-            'number_sep': '/',
+            'name': self.name,
+            'base_name': self.base_name,
             'extension': self.extension,
+            'number': self.number,
         }
 
-        if self.number == 1:
-            # no page numbers on the first page
-            context['number'] = ''
-            context['number_sep'] = ''
-
         ret = prop_value.format(**context)
-        if ret[0] == '/':
-            ret = ret[1:]
+        ret = ret.lstrip('/')
         return ret
 
     url = property(functools.partial(_from_settings, key='URL'))
diff --git a/pelican/settings.py b/pelican/settings.py
index 5128ff6d..a58052c3 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -97,7 +97,8 @@ DEFAULT_CONFIG = {
     'AUTHOR_URL': 'author/{slug}.html',
     'AUTHOR_SAVE_AS': posix_join('author', '{slug}.html'),
     'PAGINATION_PATTERNS': [
-        (0, '{name}{number}{extension}', '{name}{number}{extension}'),
+        (1, '{name}{extension}', '{name}{extension}'),
+        (2, '{name}{number}{extension}', '{name}{number}{extension}'),
     ],
     'YEAR_ARCHIVE_URL': '',
     'YEAR_ARCHIVE_SAVE_AS': '',
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 6174dca1..e06075fe 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -74,7 +74,7 @@ class TestPage(unittest.TestCase):
                               object_list, settings, 1)
         page1 = paginator.page(1)
         self.assertEqual(page1.save_as, 'blog/index.html')
-        self.assertEqual(page1.url, '//blog.my.site/')
+        self.assertEqual(page1.url, 'blog.my.site/')
         page2 = paginator.page(2)
         self.assertEqual(page2.save_as, 'blog/2/index.html')
-        self.assertEqual(page2.url, '//blog.my.site/2/')
+        self.assertEqual(page2.url, 'blog.my.site/2/')

From 77c967f1dbb4c50f900b843abf8693f924ef00a8 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Thu, 22 Mar 2018 23:47:51 +0100
Subject: [PATCH 2086/2864] control scope of identification of translations
 with new settings

---
 docs/changelog.rst          |   4 ++
 docs/content.rst            |   5 +-
 docs/settings.rst           |  12 ++++
 pelican/generators.py       |  29 +++++----
 pelican/settings.py         |   2 +
 pelican/tests/support.py    |   8 ++-
 pelican/tests/test_utils.py |  65 +++++++++++++------
 pelican/utils.py            | 123 ++++++++++++++++++++----------------
 8 files changed, 157 insertions(+), 91 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 58521e61..aa54009d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,10 @@ Next release
   for more finegrained control
 * ``'{base_name}'`` value in ``PAGINATION_PATTERNS`` setting no longer strips
   ``'bar'`` from ``'foo/bar.html'`` (unless ``'bar' == 'index'``).
+* ``ARTICLE_ORDER_BY`` and ``PAGE_ORDER_BY`` now also affect 1) category, tag
+  and author pages 2) feeds 3) draft and hidden articles and pages
+* New ``ARTICLE_TRANSLATION_ID`` and ``PAGE_TRANSLATION_ID`` settings to specify
+  metadata attributes used to identify translations; or to disable translations
 
 3.7.1 (2017-01-10)
 ==================
diff --git a/docs/content.rst b/docs/content.rst
index 24f91900..7bafbf6f 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -386,8 +386,9 @@ of available translations for that article.
    language. For such advanced functionality the `i18n_subsites
    plugin`_ can be used.
 
-Pelican uses the article's URL "slug" to determine if two or more articles are
-translations of one another. The slug can be set manually in the file's
+By default, Pelican uses the article's URL "slug" to determine if two or more
+articles are translations of one another. (This can be changed with the
+``ARTICLE_TRANSLATION_ID`` setting.) The slug can be set manually in the file's
 metadata; if not set explicitly, Pelican will auto-generate the slug from the
 title of the article.
 
diff --git a/docs/settings.rst b/docs/settings.rst
index c397255c..28b68980 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1038,6 +1038,18 @@ more information.
 
    The default language to use.
 
+.. data:: ARTICLE_TRANSLATION_ID = 'slug'
+
+   The metadata attribute(s) used to identify which articles are translations
+   of one another. May be a string or a collection of strings. Set to ``None``
+   or ``False`` to disable the identification of translations.
+
+.. data:: PAGE_TRANSLATION_ID = 'slug'
+
+   The metadata attribute(s) used to identify which pages are translations
+   of one another. May be a string or a collection of strings. Set to ``None``
+   or ``False`` to disable the identification of translations.
+
 .. data:: TRANSLATION_FEED_ATOM = 'feeds/all-%s.atom.xml'
 
    The location to save the Atom feed for translations. [3]_
diff --git a/pelican/generators.py b/pelican/generators.py
index 2b2c02a3..a960051d 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -597,12 +597,14 @@ class ArticlesGenerator(CachingGenerator):
                 all_drafts.append(article)
             self.add_source_path(article)
 
-        self.articles, self.translations = process_translations(all_articles)
-        self.articles = order_content(
-            self.articles,
-            order_by=self.settings['ARTICLE_ORDER_BY'])
-        self.drafts, self.drafts_translations = \
-            process_translations(all_drafts)
+        def _process(arts):
+            origs, translations = process_translations(
+                arts, translation_id=self.settings['ARTICLE_TRANSLATION_ID'])
+            origs = order_content(origs, self.settings['ARTICLE_ORDER_BY'])
+            return origs, translations
+
+        self.articles, self.translations = _process(all_articles)
+        self.drafts, self.drafts_translations = _process(all_drafts)
 
         signals.article_generator_pretaxonomy.send(self)
 
@@ -701,12 +703,15 @@ class PagesGenerator(CachingGenerator):
                 draft_pages.append(page)
             self.add_source_path(page)
 
-        self.pages, self.translations = process_translations(all_pages)
-        self.pages = order_content(self.pages, self.settings['PAGE_ORDER_BY'])
-        self.hidden_pages, self.hidden_translations = \
-            process_translations(hidden_pages)
-        self.draft_pages, self.draft_translations = \
-            process_translations(draft_pages)
+        def _process(pages):
+            origs, translations = process_translations(
+                pages, translation_id=self.settings['PAGE_TRANSLATION_ID'])
+            origs = order_content(origs, self.settings['PAGE_ORDER_BY'])
+            return origs, translations
+
+        self.pages, self.translations = _process(all_pages)
+        self.hidden_pages, self.hidden_translations = _process(hidden_pages)
+        self.draft_pages, self.draft_translations = _process(draft_pages)
 
         self._update_context(('pages', 'hidden_pages', 'draft_pages'))
 
diff --git a/pelican/settings.py b/pelican/settings.py
index a58052c3..0bf4284a 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -108,6 +108,8 @@ DEFAULT_CONFIG = {
     'DAY_ARCHIVE_SAVE_AS': '',
     'RELATIVE_URLS': False,
     'DEFAULT_LANG': 'en',
+    'ARTICLE_TRANSLATION_ID': 'slug',
+    'PAGE_TRANSLATION_ID': 'slug',
     'DIRECT_TEMPLATES': ['index', 'tags', 'categories', 'authors', 'archives'],
     'THEME_TEMPLATES_OVERRIDES': [],
     'PAGINATED_TEMPLATES': {'index': None, 'tag': None, 'category': None,
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index d425395d..252a28c8 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -17,6 +17,7 @@ from tempfile import mkdtemp
 from six import StringIO
 
 from pelican.contents import Article
+from pelican.readers import default_metadata
 from pelican.settings import DEFAULT_CONFIG
 
 __all__ = ['get_article', 'unittest', ]
@@ -113,9 +114,10 @@ def mute(returns_output=False):
     return decorator
 
 
-def get_article(title, slug, content, lang, extra_metadata=None):
-    metadata = {'slug': slug, 'title': title, 'lang': lang}
-    if extra_metadata is not None:
+def get_article(title, content, **extra_metadata):
+    metadata = default_metadata(settings=DEFAULT_CONFIG)
+    metadata['title'] = title
+    if extra_metadata:
         metadata.update(extra_metadata)
     return Article(content, metadata=metadata)
 
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 2c6c4cd8..2831eeed 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -255,48 +255,71 @@ class TestUtils(LoggedTestCase):
                                        content='en français'))
         en_articles.append(get_article(lang='en', slug='yay1', title='Title',
                                        content='in english',
-                                       extra_metadata={'translation': 'true'}))
+                                       translation='true'))
         # 2: translation metadata not on default lang
         fr_articles.append(get_article(lang='fr', slug='yay2', title='Titre',
                                        content='en français',
-                                       extra_metadata={'translation': 'true'}))
+                                       translation='true'))
         en_articles.append(get_article(lang='en', slug='yay2', title='Title',
                                        content='in english'))
         # 3: back to default language detection if all items have the
         #    translation metadata
         fr_articles.append(get_article(lang='fr', slug='yay3', title='Titre',
                                        content='en français',
-                                       extra_metadata={'translation': 'yep'}))
+                                       translation='yep'))
         en_articles.append(get_article(lang='en', slug='yay3', title='Title',
                                        content='in english',
-                                       extra_metadata={'translation': 'yes'}))
+                                       translation='yes'))
+        # 4-5: translation pairs with the same slug but different category
+        fr_articles.append(get_article(lang='fr', slug='yay4', title='Titre',
+                                       content='en français', category='foo'))
+        en_articles.append(get_article(lang='en', slug='yay4', title='Title',
+                                       content='in english', category='foo'))
+        fr_articles.append(get_article(lang='fr', slug='yay4', title='Titre',
+                                       content='en français', category='bar'))
+        en_articles.append(get_article(lang='en', slug='yay4', title='Title',
+                                       content='in english', category='bar'))
 
         # try adding articles in both orders
         for lang0_articles, lang1_articles in ((fr_articles, en_articles),
                                                (en_articles, fr_articles)):
             articles = lang0_articles + lang1_articles
 
-            index, trans = utils.process_translations(articles)
+            # test process_translations with falsy translation_id
+            index, trans = utils.process_translations(
+                articles, translation_id=None)
+            for i in range(6):
+                for lang_articles in [en_articles, fr_articles]:
+                    self.assertIn(lang_articles[i], index)
+                    self.assertNotIn(lang_articles[i], trans)
 
-            self.assertIn(en_articles[0], index)
-            self.assertIn(fr_articles[0], trans)
-            self.assertNotIn(en_articles[0], trans)
-            self.assertNotIn(fr_articles[0], index)
+            # test process_translations with simple and complex translation_id
+            for translation_id in ['slug', {'slug', 'category'}]:
+                index, trans = utils.process_translations(
+                    articles, translation_id=translation_id)
 
-            self.assertIn(fr_articles[1], index)
-            self.assertIn(en_articles[1], trans)
-            self.assertNotIn(fr_articles[1], trans)
-            self.assertNotIn(en_articles[1], index)
+                for a in [en_articles[0], fr_articles[1], en_articles[2],
+                          en_articles[3], en_articles[4], en_articles[5]]:
+                    self.assertIn(a, index)
+                    self.assertNotIn(a, trans)
 
-            self.assertIn(en_articles[2], index)
-            self.assertIn(fr_articles[2], trans)
-            self.assertNotIn(en_articles[2], trans)
-            self.assertNotIn(fr_articles[2], index)
+                for a in [fr_articles[0], en_articles[1], fr_articles[2],
+                          fr_articles[3], fr_articles[4], fr_articles[5]]:
+                    self.assertIn(a, trans)
+                    self.assertNotIn(a, index)
 
-            self.assertIn(en_articles[3], index)
-            self.assertIn(fr_articles[3], trans)
-            self.assertNotIn(en_articles[3], trans)
-            self.assertNotIn(fr_articles[3], index)
+                for i in range(6):
+                    self.assertIn(en_articles[i], fr_articles[i].translations)
+                    self.assertIn(fr_articles[i], en_articles[i].translations)
+
+                for a_arts in [en_articles, fr_articles]:
+                    for b_arts in [en_articles, fr_articles]:
+                        if translation_id == 'slug':
+                            self.assertIn(a_arts[4], b_arts[5].translations)
+                            self.assertIn(a_arts[5], b_arts[4].translations)
+                        elif translation_id == {'slug', 'category'}:
+                            self.assertNotIn(a_arts[4], b_arts[5].translations)
+                            self.assertNotIn(a_arts[5], b_arts[4].translations)
 
     def test_watchers(self):
         # Test if file changes are correctly detected
diff --git a/pelican/utils.py b/pelican/utils.py
index efc32e0c..96447586 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -639,77 +639,94 @@ def escape_html(text, quote=True):
     return escape(text, quote=quote)
 
 
-def process_translations(content_list):
+def process_translations(content_list, translation_id=None):
     """ Finds translations and returns them.
 
-    Returns a tuple with two lists (index, translations).  Index list includes
+    For each content_list item, populates the 'translations' attribute, and
+    returns a tuple with two lists (index, translations). Index list includes
     items in default language or items which have no variant in default
     language. Items with the `translation` metadata set to something else than
-    `False` or `false` will be used as translations, unless all the items with
-    the same slug have that metadata.
+    `False` or `false` will be used as translations, unless all the items in
+    the same group have that metadata.
 
-    For each content_list item, sets the 'translations' attribute.
+    Translations and original items are determined relative to one another
+    amongst items in the same group. Items are in the same group if they
+    have the same value(s) for the metadata attribute(s) specified by the
+    'translation_id', which must be a string or a collection of strings.
+    If 'translation_id' is falsy, the identification of translations is skipped
+    and all items are returned as originals.
     """
-    content_list.sort(key=attrgetter('slug'))
-    grouped_by_slugs = groupby(content_list, attrgetter('slug'))
-    index = []
-    translations = []
 
+    if not translation_id:
+        return content_list, []
+
+    if isinstance(translation_id, six.string_types):
+        translation_id = {translation_id}
+
+    index = []
+
+    try:
+        content_list.sort(key=attrgetter(*translation_id))
+    except TypeError:
+        raise TypeError('Cannot unpack {}, \'translation_id\' must be falsy, a'
+                        'string or a collection of strings'
+                        .format(translation_id))
+    except AttributeError:
+        raise AttributeError('Cannot use {} as \'translation_id\', there'
+                             'appear to be items without these metadata'
+                             'attributes'.format(translation_id))
+
+    for id_vals, items in groupby(content_list, attrgetter(*translation_id)):
+        items = list(items)
+        with_str = 'with' + ', '.join([' {} "{{}}"'] * len(translation_id))\
+            .format(*translation_id).format(*id_vals)
+        original_items = get_original_items(items, with_str)
+        index.extend(original_items)
+        for a in items:
+            a.translations = [x for x in items if x != a]
+
+    translations = [x for x in content_list if x not in index]
+
+    return index, translations
+
+
+def get_original_items(items, with_str):
     def _warn_source_paths(msg, items, *extra):
         args = [len(items)]
         args.extend(extra)
         args.extend((x.source_path for x in items))
         logger.warning('{}: {}'.format(msg, '\n%s' * len(items)), *args)
 
-    for slug, items in grouped_by_slugs:
-        items = list(items)
+    # warn if several items have the same lang
+    for lang, lang_items in groupby(items, attrgetter('lang')):
+        lang_items = list(lang_items)
+        if len(lang_items) > 1:
+            _warn_source_paths('There are %s items "%s" with lang %s',
+                               lang_items, with_str, lang)
 
-        # display warnings if slug is empty
-        if not slug:
-            _warn_source_paths('There are %s items with empty slug', items)
+    # items with `translation` metadata will be used as translations...
+    candidate_items = [
+        i for i in items
+        if i.metadata.get('translation', 'false').lower() == 'false']
 
-        # display warnings if several items have the same lang
-        for lang, lang_items in groupby(items, attrgetter('lang')):
-            lang_items = list(lang_items)
-            if len(lang_items) > 1:
-                _warn_source_paths(
-                    'There are %s items with slug "%s" with lang %s',
-                    lang_items,
-                    slug,
-                    lang)
+    # ...unless all items with that slug are translations
+    if not candidate_items:
+        _warn_source_paths('All items ("%s") "%s" are translations',
+                           items, with_str)
+        candidate_items = items
 
-        # items with `translation` metadata will be used as translations...
-        candidate_items = list(filter(
-            lambda i:
-                i.metadata.get('translation', 'false').lower() == 'false',
-            items))
-        # ...unless all items with that slug are translations
-        if not candidate_items:
-            logger.warning('All items with slug "%s" are translations', slug)
-            candidate_items = items
+    # find items with default language
+    original_items = [i for i in candidate_items if i.in_default_lang]
 
-        # find items with default language
-        original_items = list(filter(
-            attrgetter('in_default_lang'),
-            candidate_items))
+    # if there is no article with default language, go back one step
+    if not original_items:
+        original_items = candidate_items
 
-        # if there is no article with default language, go back one step
-        if not original_items:
-            original_items = candidate_items
-
-        # display warning if there are several original items
-        if len(original_items) > 1:
-            _warn_source_paths(
-                'There are %s original (not translated) items with slug "%s"',
-                original_items,
-                slug)
-
-        index.extend(original_items)
-        translations.extend([x for x in items if x not in original_items])
-        for a in items:
-            a.translations = [x for x in items if x != a]
-
-    return index, translations
+    # warn if there are several original items
+    if len(original_items) > 1:
+        _warn_source_paths('There are %s original (not translated) items %s',
+                           original_items, with_str)
+    return original_items
 
 
 def order_content(content_list, order_by='slug'):

From 048ea4dc0c18b82cf5f560cb86de5a054c11b6e8 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Wed, 11 Jul 2018 15:54:47 +0200
Subject: [PATCH 2087/2864] automatically copy linked static files

---
 docs/changelog.rst                            |   3 +
 docs/content.rst                              |  83 ++++----
 pelican/__init__.py                           |   7 +-
 pelican/contents.py                           |  82 +++++---
 pelican/generators.py                         |  41 ++--
 .../tests/TestPages/page_with_static_links.md |   7 +
 .../output/basic/author/alexis-metaireau.html |   6 +-
 pelican/tests/output/basic/category/bar.html  |   2 +-
 pelican/tests/output/basic/category/yeah.html |   4 +-
 .../basic/feeds/alexis-metaireau.atom.xml     |   8 +-
 .../basic/feeds/alexis-metaireau.rss.xml      |   2 +-
 .../tests/output/basic/feeds/all-en.atom.xml  |   8 +-
 pelican/tests/output/basic/feeds/all.atom.xml |   8 +-
 pelican/tests/output/basic/feeds/bar.atom.xml |   4 +-
 .../tests/output/basic/feeds/yeah.atom.xml    |   4 +-
 pelican/tests/output/basic/index.html         |   2 +-
 pelican/tests/output/basic/oh-yeah.html       |   2 +-
 pelican/tests/output/basic/pictures/Sushi.jpg | Bin 0 -> 28992 bytes
 .../output/basic/pictures/Sushi_Macro.jpg     | Bin 0 -> 38594 bytes
 pelican/tests/output/basic/tag/bar.html       |   2 +-
 pelican/tests/output/basic/tag/foobar.html    |   4 +-
 pelican/tests/output/basic/tag/yeah.html      |   2 +-
 .../output/basic/this-is-a-super-article.html |   4 +-
 pelican/tests/support.py                      |   9 +
 pelican/tests/test_cache.py                   |  52 ++---
 pelican/tests/test_contents.py                | 109 ++++++++---
 pelican/tests/test_generators.py              | 177 ++++++++++++------
 pelican/tests/test_pelican.py                 |   2 +-
 pelican/tools/pelican_import.py               |   2 +-
 pelican/utils.py                              |   2 +-
 samples/content/another_super_article.rst     |   2 +-
 samples/content/super_article.rst             |   4 +-
 32 files changed, 422 insertions(+), 222 deletions(-)
 create mode 100644 pelican/tests/TestPages/page_with_static_links.md
 create mode 100644 pelican/tests/output/basic/pictures/Sushi.jpg
 create mode 100644 pelican/tests/output/basic/pictures/Sushi_Macro.jpg

diff --git a/docs/changelog.rst b/docs/changelog.rst
index aa54009d..858a6e1b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,6 +14,9 @@ Next release
   and author pages 2) feeds 3) draft and hidden articles and pages
 * New ``ARTICLE_TRANSLATION_ID`` and ``PAGE_TRANSLATION_ID`` settings to specify
   metadata attributes used to identify translations; or to disable translations
+* New ``{static}`` syntax to link to static content; content linked to by
+  ``{static}`` and ``{attach}`` is automatically copied over even if not in
+  ``STATIC_PATHS``
 
 3.7.1 (2017-01-10)
 ==================
diff --git a/docs/content.rst b/docs/content.rst
index 7bafbf6f..8d07e390 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -168,6 +168,34 @@ If you want to exclude any pages from being linked to or listed in the menu
 then add a ``status: hidden`` attribute to its metadata. This is useful for
 things like making error pages that fit the generated theme of your site.
 
+Static content
+==============
+
+Static files are files other than articles and pages that are copied to the
+output folder as-is, without processing. You can control which static files
+are copied over with the ``STATIC_PATHS`` setting of the project's
+``pelicanconf.py`` file. Pelican's default configuration includes the
+``images`` directory for this, but others must be added manually. In addition,
+static files that are explicitly linked to are included (see below).
+
+Mixed content in the same directory
+-----------------------------------
+
+Starting with Pelican 3.5, static files can safely share a source directory with
+page source files, without exposing the page sources in the generated site.
+Any such directory must be added to both ``STATIC_PATHS`` and ``PAGE_PATHS``
+(or ``STATIC_PATHS`` and ``ARTICLE_PATHS``). Pelican will identify and process
+the page source files normally, and copy the remaining files as if they lived
+in a separate directory reserved for static files.
+
+Note: Placing static and content source files together in the same source
+directory does not guarantee that they will end up in the same place in the
+generated site. The easiest way to do this is by using the ``{attach}`` link
+syntax (described below). Alternatively, the ``STATIC_SAVE_AS``,
+``PAGE_SAVE_AS``, and ``ARTICLE_SAVE_AS`` settings (and the corresponding
+``*_URL`` settings) can be configured to place files of different types
+together, just as they could in earlier versions of Pelican.
+
 .. _ref-linking-to-internal-content:
 
 Linking to internal content
@@ -221,13 +249,10 @@ and ``article2.md``::
 Linking to static files
 -----------------------
 
-Linking to non-article or non-page content uses the same ``{filename}`` syntax
-as described above. It is important to remember that those files will not be
-copied to the output directory unless the source directories containing them
-are included in the ``STATIC_PATHS`` setting of the project's ``pelicanconf.py``
-file. Pelican's default configuration includes the ``images`` directory for
-this, but others must be added manually. Forgetting to do so will result in
-broken links.
+You can link to static content using ``{static}path/to/file``. Files linked to
+with this syntax will automatically be copied to the output directory, even if
+the source directories containing them are not included in the ``STATIC_PATHS``
+setting of the project's ``pelicanconf.py`` file.
 
 For example, a project's content directory might be structured like this::
 
@@ -241,48 +266,28 @@ For example, a project's content directory might be structured like this::
 
 ``test.md`` would include::
 
-    ![Alt Text]({filename}/images/han.jpg)
-    [Our Menu]({filename}/pdfs/menu.pdf)
-
-``pelicanconf.py`` would include::
-
-    STATIC_PATHS = ['images', 'pdfs']
+    ![Alt Text]({static}/images/han.jpg)
+    [Our Menu]({static}/pdfs/menu.pdf)
 
 Site generation would then copy ``han.jpg`` to ``output/images/han.jpg``,
 ``menu.pdf`` to ``output/pdfs/menu.pdf``, and write the appropriate links
 in ``test.md``.
 
-Mixed content in the same directory
------------------------------------
-
-Starting with Pelican 3.5, static files can safely share a source directory with
-page source files, without exposing the page sources in the generated site.
-Any such directory must be added to both ``STATIC_PATHS`` and ``PAGE_PATHS``
-(or ``STATIC_PATHS`` and ``ARTICLE_PATHS``). Pelican will identify and process
-the page source files normally, and copy the remaining files as if they lived
-in a separate directory reserved for static files.
-
-Note: Placing static and content source files together in the same source
-directory does not guarantee that they will end up in the same place in the
-generated site. The easiest way to do this is by using the ``{attach}`` link
-syntax (described below). Alternatively, the ``STATIC_SAVE_AS``,
-``PAGE_SAVE_AS``, and ``ARTICLE_SAVE_AS`` settings (and the corresponding
-``*_URL`` settings) can be configured to place files of different types
-together, just as they could in earlier versions of Pelican.
+If you use ``{static}`` to link to an article or a page, this will be turned into
+a link to its source code.
 
 Attaching static files
 ----------------------
 
 Starting with Pelican 3.5, static files can be "attached" to a page or article
 using this syntax for the link target: ``{attach}path/to/file`` This works
-like the ``{filename}`` syntax, but also relocates the static file into the
+like the ``{static}`` syntax, but also relocates the static file into the
 linking document's output directory. If the static file originates from a
 subdirectory beneath the linking document's source, that relationship will be
 preserved on output. Otherwise, it will become a sibling of the linking
 document.
 
-This only works for linking to static files, and only when they originate from
-a directory included in the ``STATIC_PATHS`` setting.
+This only works for linking to static files.
 
 For example, a project's content directory might be structured like this::
 
@@ -298,7 +303,6 @@ For example, a project's content directory might be structured like this::
 ``pelicanconf.py`` would include::
 
     PATH = 'content'
-    STATIC_PATHS = ['blog', 'downloads']
     ARTICLE_PATHS = ['blog']
     ARTICLE_SAVE_AS = '{date:%Y}/{slug}.html'
     ARTICLE_URL = '{date:%Y}/{slug}.html'
@@ -328,7 +332,7 @@ the article's output directory.
 
 If a static file is linked multiple times, the relocating feature of
 ``{attach}`` will only work in the first of those links to be processed.
-After the first link, Pelican will treat ``{attach}`` like ``{filename}``.
+After the first link, Pelican will treat ``{attach}`` like ``{static}``.
 This avoids breaking the already-processed links.
 
 **Be careful when linking to a file from multiple documents:**
@@ -342,7 +346,7 @@ file's old location might then find their links broken. **It is therefore
 advisable to use {attach} only if you use it in all links to a file, and only
 if the linking documents share a single directory.** Under these conditions,
 the file's output location will not change in future builds. In cases where
-these precautions are not possible, consider using ``{filename}`` links instead
+these precautions are not possible, consider using ``{static}`` links instead
 of ``{attach}``, and letting the file's location be determined by the project's
 ``STATIC_SAVE_AS`` and ``STATIC_URL`` settings. (Per-file ``save_as`` and
 ``url`` overrides can still be set in ``EXTRA_PATH_METADATA``.)
@@ -360,8 +364,11 @@ To remain compatible with earlier versions, Pelican still supports vertical bars
 (``||``) in addition to curly braces (``{}``) for internal links. For example:
 ``|filename|an_article.rst``, ``|tag|tagname``, ``|category|foobar``.
 The syntax was changed from ``||`` to ``{}`` to avoid collision with Markdown
-extensions or reST directives. Support for the old syntax may eventually be
-removed.
+extensions or reST directives. Similarly, Pelican also still supports linking to
+static content with ``{filename}``. The syntax was changed to ``{static}`` to allow
+linking to both generated articles and pages and their static sources.
+
+Support for the old syntax may eventually be removed.
 
 
 Importing an existing site
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 83b2c169..bc236708 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -150,8 +150,11 @@ class Pelican(object):
         start_time = time.time()
 
         context = self.settings.copy()
-        # Share these among all the generators and content objects:
-        context['filenames'] = {}  # maps source path to Content object or None
+        # Share these among all the generators and content objects
+        # They map source paths to Content objects or None
+        context['generated_content'] = {}
+        context['static_links'] = set()
+        context['static_content'] = {}
         context['localsiteurl'] = self.settings['SITEURL']
 
         generators = [
diff --git a/pelican/contents.py b/pelican/contents.py
index dbda19b0..327adc72 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -142,7 +142,8 @@ class Content(object):
         if not hasattr(self, 'status'):
             self.status = getattr(self, 'default_status', None)
 
-        if len(self._context.get('filenames', [])) > 0:
+        if (len(self._context.get('generated_content', [])) > 0 or
+                len(self._context.get('static_content', [])) > 0):
             self.refresh_metadata_intersite_links()
 
         signals.content_object_init.send(self)
@@ -255,7 +256,7 @@ class Content(object):
                 siteurl += '/'
 
         # XXX Put this in a different location.
-        if what in {'filename', 'attach'}:
+        if what in {'filename', 'static', 'attach'}:
             if path.startswith('/'):
                 path = path[1:]
             else:
@@ -264,22 +265,33 @@ class Content(object):
                     os.path.join(self.relative_dir, path)
                 )
 
-            if path not in self._context['filenames']:
-                unquoted_path = path.replace('%20', ' ')
+            key = 'static_content' if what in ('static', 'attach')\
+                else 'generated_content'
 
-                if unquoted_path in self._context['filenames']:
-                    path = unquoted_path
+            def _get_linked_content(key, path):
+                try:
+                    return self._context[key][path]
+                except KeyError:
+                    try:
+                        # Markdown escapes spaces, try unescaping
+                        return self._context[key][path.replace('%20', ' ')]
+                    except KeyError:
+                        if what == 'filename' and key == 'generated_content':
+                            key = 'static_content'
+                            linked_content = _get_linked_content(key, path)
+                            if linked_content:
+                                logger.warning(
+                                    '{filename} used for linking to static'
+                                    'content %s in %s. Use {static} instead',
+                                    path,
+                                    self.get_relative_source_path())
+                                return linked_content
+                        return None
 
-            linked_content = self._context['filenames'].get(path)
+            linked_content = _get_linked_content(key, path)
             if linked_content:
                 if what == 'attach':
-                    if isinstance(linked_content, Static):
-                        linked_content.attach_to(self)
-                    else:
-                        logger.warning(
-                            "%s used {attach} link syntax on a "
-                            "non-static file. Use {filename} instead.",
-                            self.get_relative_source_path())
+                    linked_content.attach_to(self)
                 origin = joiner(siteurl, linked_content.url)
                 origin = origin.replace('\\', '/')  # for Windows paths.
             else:
@@ -310,6 +322,17 @@ class Content(object):
         return ''.join((m.group('markup'), m.group('quote'), origin,
                         m.group('quote')))
 
+    def _get_intrasite_link_regex(self):
+        intrasite_link_regex = self.settings['INTRASITE_LINK_REGEX']
+        regex = r"""
+            (?P<markup><[^\>]+  # match tag with all url-value attributes
+                (?:href|src|poster|data|cite|formaction|action)\s*=\s*)
+
+            (?P<quote>["\'])      # require value to be quoted
+            (?P<path>{0}(?P<value>.*?))  # the url value
+            \2""".format(intrasite_link_regex)
+        return re.compile(regex, re.X)
+
     def _update_content(self, content, siteurl):
         """Update the content attribute.
 
@@ -323,18 +346,29 @@ class Content(object):
         if not content:
             return content
 
-        instrasite_link_regex = self.settings['INTRASITE_LINK_REGEX']
-        regex = r"""
-            (?P<markup><[^\>]+  # match tag with all url-value attributes
-                (?:href|src|poster|data|cite|formaction|action)\s*=\s*)
-
-            (?P<quote>["\'])      # require value to be quoted
-            (?P<path>{0}(?P<value>.*?))  # the url value
-            \2""".format(instrasite_link_regex)
-        hrefs = re.compile(regex, re.X)
-
+        hrefs = self._get_intrasite_link_regex()
         return hrefs.sub(lambda m: self._link_replacer(siteurl, m), content)
 
+    def get_static_links(self):
+        static_links = set()
+        hrefs = self._get_intrasite_link_regex()
+        for m in hrefs.finditer(self._content):
+            what = m.group('what')
+            value = urlparse(m.group('value'))
+            path = value.path
+            if what not in {'static', 'attach'}:
+                continue
+            if path.startswith('/'):
+                path = path[1:]
+            else:
+                # relative to the source path of this content
+                path = self.get_relative_source_path(
+                    os.path.join(self.relative_dir, path)
+                )
+            path = path.replace('%20', ' ')
+            static_links.add(path)
+        return static_links
+
     def get_siteurl(self):
         return self._context.get('localsiteurl', '')
 
diff --git a/pelican/generators.py b/pelican/generators.py
index a960051d..90e4c8a5 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -147,7 +147,7 @@ class Generator(object):
             parent_path, subdir = os.path.split(os.path.join(self.path, e))
             exclusions_by_dirpath.setdefault(parent_path, set()).add(subdir)
 
-        files = []
+        files = set()
         ignores = self.settings['IGNORE_FILES']
         for path in paths:
             # careful: os.path.join() will add a slash when path == ''.
@@ -170,33 +170,41 @@ class Generator(object):
                     for f in temp_files:
                         fp = os.path.join(reldir, f)
                         if self._include_path(fp, extensions):
-                            files.append(fp)
+                            files.add(fp)
             elif os.path.exists(root) and self._include_path(path, extensions):
-                files.append(path)  # can't walk non-directories
+                files.add(path)  # can't walk non-directories
         return files
 
-    def add_source_path(self, content):
+    def add_source_path(self, content, static=False):
         """Record a source file path that a Generator found and processed.
         Store a reference to its Content object, for url lookups later.
         """
         location = content.get_relative_source_path()
-        self.context['filenames'][location] = content
+        key = 'static_content' if static else 'generated_content'
+        self.context[key][location] = content
 
-    def _add_failed_source_path(self, path):
+    def _add_failed_source_path(self, path, static=False):
         """Record a source file path that a Generator failed to process.
         (For example, one that was missing mandatory metadata.)
         The path argument is expected to be relative to self.path.
         """
-        self.context['filenames'][posixize_path(os.path.normpath(path))] = None
+        key = 'static_content' if static else 'generated_content'
+        self.context[key][posixize_path(os.path.normpath(path))] = None
 
-    def _is_potential_source_path(self, path):
+    def _is_potential_source_path(self, path, static=False):
         """Return True if path was supposed to be used as a source file.
         (This includes all source files that have been found by generators
         before this method is called, even if they failed to process.)
         The path argument is expected to be relative to self.path.
         """
-        return (posixize_path(os.path.normpath(path))
-                in self.context['filenames'])
+        key = 'static_content' if static else 'generated_content'
+        return (posixize_path(os.path.normpath(path)) in self.context[key])
+
+    def add_static_links(self, content):
+        """Add file links in content to context to be processed as Static
+        content.
+        """
+        self.context['static_links'] |= content.get_static_links()
 
     def _update_context(self, items):
         """Update the context with the given items from the currrent
@@ -596,6 +604,7 @@ class ArticlesGenerator(CachingGenerator):
             elif article.status == "draft":
                 all_drafts.append(article)
             self.add_source_path(article)
+            self.add_static_links(article)
 
         def _process(arts):
             origs, translations = process_translations(
@@ -702,6 +711,7 @@ class PagesGenerator(CachingGenerator):
             elif page.status == "draft":
                 draft_pages.append(page)
             self.add_source_path(page)
+            self.add_static_links(page)
 
         def _process(pages):
             origs, translations = process_translations(
@@ -753,9 +763,12 @@ class StaticGenerator(Generator):
 
     def generate_context(self):
         self.staticfiles = []
-        for f in self.get_files(self.settings['STATIC_PATHS'],
-                                exclude=self.settings['STATIC_EXCLUDES'],
-                                extensions=False):
+        linked_files = {os.path.join(self.path, path)
+                        for path in self.context['static_links']}
+        found_files = self.get_files(self.settings['STATIC_PATHS'],
+                                     exclude=self.settings['STATIC_EXCLUDES'],
+                                     extensions=False)
+        for f in linked_files | found_files:
 
             # skip content source files unless the user explicitly wants them
             if self.settings['STATIC_EXCLUDE_SOURCES']:
@@ -770,7 +783,7 @@ class StaticGenerator(Generator):
                 context_signal=signals.static_generator_context,
                 context_sender=self)
             self.staticfiles.append(static)
-            self.add_source_path(static)
+            self.add_source_path(static, static=True)
         self._update_context(('staticfiles',))
         signals.static_generator_finalized.send(self)
 
diff --git a/pelican/tests/TestPages/page_with_static_links.md b/pelican/tests/TestPages/page_with_static_links.md
new file mode 100644
index 00000000..1967cfcf
--- /dev/null
+++ b/pelican/tests/TestPages/page_with_static_links.md
@@ -0,0 +1,7 @@
+Title: Page with static links
+
+My links:
+
+[Link 0]({static}image0.jpg)
+
+[Link 1]({attach}image1.jpg)
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index bc05969e..aa19e421 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -42,8 +42,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
@@ -78,7 +78,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="/oh-yeah.html">read more</a>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index a0b06964..2d327f5f 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -38,7 +38,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
             </aside><!-- /#featured -->
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index c7c8e507..2621e587 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -42,8 +42,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index fe670d13..54378c52 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -5,8 +5,8 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
@@ -17,12 +17,12 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index 9c3f82f0..57942aed 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -5,6 +5,6 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-10-20:/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 2a0c7ea3..b5965cc8 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -19,8 +19,8 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
@@ -31,13 +31,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index ba6322df..33e852a9 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -21,8 +21,8 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
@@ -33,13 +33,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index 0d0f0ce6..2d594f29 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -3,12 +3,12 @@
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </summary><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
 </content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index dfd37b62..3d48f4f3 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -5,8 +5,8 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
 &lt;h2&gt;This is a simple title&lt;/h2&gt;
 &lt;p&gt;And here comes the cool &lt;a class="reference external" href="http://books.couchdb.org/relax/design-documents/views"&gt;stuff&lt;/a&gt;.&lt;/p&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
+&lt;img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;pre class="literal-block"&gt;
 &amp;gt;&amp;gt;&amp;gt; from ipdb import set_trace
 &amp;gt;&amp;gt;&amp;gt; set_trace()
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index ed1356ed..077d0ba5 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -191,7 +191,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="/oh-yeah.html">read more</a>
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 86086bc1..df378418 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -43,7 +43,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
     </div><!-- /.entry-content -->
diff --git a/pelican/tests/output/basic/pictures/Sushi.jpg b/pelican/tests/output/basic/pictures/Sushi.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e49e5f0ab53461187c2cf61ebc1f3befdc937aed
GIT binary patch
literal 28992
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
GKmXZ^k)SRB

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/pictures/Sushi_Macro.jpg b/pelican/tests/output/basic/pictures/Sushi_Macro.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..21f935a1bf82808aa2ded423caba3cc9f2911973
GIT binary patch
literal 38594
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
V9RVclK)_SR8Zrq#de{_0|JgZd7T*8>

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index b699a45d..04bb26eb 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -90,7 +90,7 @@ as well as <strong>inline markup</strong>.</p>
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 
                 <a class="readmore" href="/oh-yeah.html">read more</a>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 34505977..cc72782c 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -42,8 +42,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 2729561c..49d1616d 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -38,7 +38,7 @@
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
             </aside><!-- /#featured -->
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index f8de5f85..5e6f1365 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -47,8 +47,8 @@
 <div class="section" id="this-is-a-simple-title">
 <h2>This is a simple title</h2>
 <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="|filename|/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 252a28c8..93db8328 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -175,6 +175,15 @@ def get_settings(**kwargs):
     return settings
 
 
+def get_context(settings=None, **kwargs):
+    context = settings.copy() if settings else {}
+    context['generated_content'] = {}
+    context['static_links'] = set()
+    context['static_content'] = {}
+    context.update(kwargs)
+    return context
+
+
 class LogCountHandler(BufferingHandler):
     """Capturing and counting logged messages."""
 
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index 72b2b557..ceba649e 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -6,7 +6,7 @@ from shutil import rmtree
 from tempfile import mkdtemp
 
 from pelican.generators import ArticlesGenerator, PagesGenerator
-from pelican.tests.support import get_settings, unittest
+from pelican.tests.support import get_context, get_settings, unittest
 
 try:
     from unittest.mock import MagicMock
@@ -29,7 +29,7 @@ class TestCache(unittest.TestCase):
         rmtree(self.temp_cache)
 
     def _get_cache_enabled_settings(self):
-        settings = get_settings(filenames={})
+        settings = get_settings()
         settings['CACHE_CONTENT'] = True
         settings['LOAD_CONTENT_CACHE'] = True
         settings['CACHE_PATH'] = self.temp_cache
@@ -42,20 +42,21 @@ class TestCache(unittest.TestCase):
         settings['PAGE_PATHS'] = ['TestPages']
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['READERS'] = {'asc': None}
+        context = get_context(settings)
 
         def sorted_titles(items):
             return sorted(item.title for item in items)
 
         # Articles
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         uncached_articles = sorted_titles(generator.articles)
         uncached_drafts = sorted_titles(generator.drafts)
 
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         cached_articles = sorted_titles(generator.articles)
@@ -66,7 +67,7 @@ class TestCache(unittest.TestCase):
 
         # Pages
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         uncached_pages = sorted_titles(generator.pages)
@@ -74,7 +75,7 @@ class TestCache(unittest.TestCase):
         uncached_draft_pages = sorted_titles(generator.draft_pages)
 
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         cached_pages = sorted_titles(generator.pages)
@@ -92,20 +93,21 @@ class TestCache(unittest.TestCase):
         settings['PAGE_PATHS'] = ['TestPages']
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['READERS'] = {'asc': None}
+        context = get_context(settings)
 
         def sorted_titles(items):
             return sorted(item.title for item in items)
 
         # Articles
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         uncached_articles = sorted_titles(generator.articles)
         uncached_drafts = sorted_titles(generator.drafts)
 
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         cached_articles = sorted_titles(generator.articles)
@@ -116,14 +118,14 @@ class TestCache(unittest.TestCase):
 
         # Pages
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         uncached_pages = sorted_titles(generator.pages)
         uncached_hidden_pages = sorted_titles(generator.hidden_pages)
 
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         cached_pages = sorted_titles(generator.pages)
@@ -139,15 +141,16 @@ class TestCache(unittest.TestCase):
         settings['CONTENT_CACHING_LAYER'] = 'generator'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['READERS'] = {'asc': None}
+        context = get_context(settings)
 
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         self.assertTrue(hasattr(generator, '_cache'))
 
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.readers.read_file = MagicMock()
         generator.generate_context()
@@ -167,15 +170,16 @@ class TestCache(unittest.TestCase):
         """Test raw article content caching at the reader level"""
         settings = self._get_cache_enabled_settings()
         settings['READERS'] = {'asc': None}
+        context = get_context(settings)
 
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         self.assertTrue(hasattr(generator.readers, '_cache'))
 
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         readers = generator.readers.readers
         for reader in readers.values():
@@ -191,9 +195,10 @@ class TestCache(unittest.TestCase):
         used in --ignore-cache or autoreload mode"""
         settings = self._get_cache_enabled_settings()
         settings['READERS'] = {'asc': None}
+        context = get_context(settings)
 
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.readers.read_file = MagicMock()
         generator.generate_context()
@@ -202,7 +207,7 @@ class TestCache(unittest.TestCase):
 
         settings['LOAD_CONTENT_CACHE'] = False
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.readers.read_file = MagicMock()
         generator.generate_context()
@@ -217,15 +222,16 @@ class TestCache(unittest.TestCase):
         settings['CONTENT_CACHING_LAYER'] = 'generator'
         settings['PAGE_PATHS'] = ['TestPages']
         settings['READERS'] = {'asc': None}
+        context = get_context(settings)
 
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         self.assertTrue(hasattr(generator, '_cache'))
 
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.readers.read_file = MagicMock()
         generator.generate_context()
@@ -241,15 +247,16 @@ class TestCache(unittest.TestCase):
         settings = self._get_cache_enabled_settings()
         settings['PAGE_PATHS'] = ['TestPages']
         settings['READERS'] = {'asc': None}
+        context = get_context(settings)
 
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         self.assertTrue(hasattr(generator.readers, '_cache'))
 
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         readers = generator.readers.readers
         for reader in readers.values():
@@ -266,9 +273,10 @@ class TestCache(unittest.TestCase):
         settings = self._get_cache_enabled_settings()
         settings['PAGE_PATHS'] = ['TestPages']
         settings['READERS'] = {'asc': None}
+        context = get_context(settings)
 
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.readers.read_file = MagicMock()
         generator.generate_context()
@@ -277,7 +285,7 @@ class TestCache(unittest.TestCase):
 
         settings['LOAD_CONTENT_CACHE'] = False
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.readers.read_file = MagicMock()
         generator.generate_context()
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 032df468..21766359 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -14,7 +14,8 @@ import six
 from pelican.contents import Article, Author, Category, Page, Static, Tag
 from pelican.settings import DEFAULT_CONFIG
 from pelican.signals import content_object_init
-from pelican.tests.support import LoggedTestCase, get_settings, unittest
+from pelican.tests.support import LoggedTestCase, get_context, get_settings,\
+    unittest
 from pelican.utils import SafeDatetime, path_to_url, truncate_html_words
 
 
@@ -264,7 +265,7 @@ class TestPage(LoggedTestCase):
         args = self.page_kwargs.copy()
         args['settings'] = get_settings()
         args['source_path'] = 'content'
-        args['context']['filenames'] = {'article.rst': article}
+        args['context']['generated_content'] = {'article.rst': article}
 
         # Classic intrasite link via filename
         args['content'] = (
@@ -343,22 +344,24 @@ class TestPage(LoggedTestCase):
         args = self.page_kwargs.copy()
         args['settings'] = get_settings()
         args['source_path'] = 'content'
-        args['context']['filenames'] = {
-            'images/poster.jpg': type(
-                cls_name, (object,), {'url': 'images/poster.jpg'}),
-            'assets/video.mp4': type(
-                cls_name, (object,), {'url': 'assets/video.mp4'}),
-            'images/graph.svg': type(
-                cls_name, (object,), {'url': 'images/graph.svg'}),
-            'reference.rst': type(
-                cls_name, (object,), {'url': 'reference.html'}),
+        args['context']['static_content'] = {
+            'images/poster.jpg':
+                type(cls_name, (object,), {'url': 'images/poster.jpg'}),
+            'assets/video.mp4':
+                type(cls_name, (object,), {'url': 'assets/video.mp4'}),
+            'images/graph.svg':
+                type(cls_name, (object,), {'url': 'images/graph.svg'}),
+        }
+        args['context']['generated_content'] = {
+            'reference.rst':
+                type(cls_name, (object,), {'url': 'reference.html'}),
         }
 
         # video.poster
         args['content'] = (
             'There is a video with poster '
-            '<video controls poster="{filename}/images/poster.jpg">'
-            '<source src="|filename|/assets/video.mp4" type="video/mp4">'
+            '<video controls poster="{static}/images/poster.jpg">'
+            '<source src="|static|/assets/video.mp4" type="video/mp4">'
             '</video>'
         )
         content = Page(**args).get_content('http://notmyidea.org')
@@ -374,7 +377,7 @@ class TestPage(LoggedTestCase):
         # object.data
         args['content'] = (
             'There is a svg object '
-            '<object data="{filename}/images/graph.svg"'
+            '<object data="{static}/images/graph.svg"'
             ' type="image/svg+xml">'
             '</object>'
         )
@@ -409,14 +412,15 @@ class TestPage(LoggedTestCase):
             STATIC_URL='http://static.cool.site/{path}',
             ARTICLE_URL='http://blog.cool.site/{slug}.html')
         args['source_path'] = 'content'
-        args['context']['filenames'] = {
-            'images/poster.jpg': Static('',
-                                        settings=args['settings'],
-                                        source_path='images/poster.jpg'),
-            'article.rst': Article('',
-                                   settings=args['settings'],
-                                   metadata={'slug': 'article',
-                                             'title': 'Article'})
+        args['context']['static_content'] = {
+            'images/poster.jpg':
+                Static('', settings=args['settings'],
+                       source_path='images/poster.jpg'),
+        }
+        args['context']['generated_content'] = {
+            'article.rst':
+                Article('', settings=args['settings'], metadata={
+                    'slug': 'article', 'title': 'Article'})
         }
 
         # Article link will go to blog
@@ -441,7 +445,7 @@ class TestPage(LoggedTestCase):
 
         # Image link will go to static
         args['content'] = (
-            '<img src="{filename}/images/poster.jpg"/>'
+            '<img src="{static}/images/poster.jpg"/>'
         )
         content = Page(**args).get_content('http://cool.site')
         self.assertEqual(
@@ -458,7 +462,7 @@ class TestPage(LoggedTestCase):
         args = self.page_kwargs.copy()
         args['settings'] = get_settings()
         args['source_path'] = 'content'
-        args['context']['filenames'] = {'article spaces.rst': article}
+        args['context']['generated_content'] = {'article spaces.rst': article}
 
         # An intrasite link via filename with %20 as a space
         args['content'] = (
@@ -472,6 +476,55 @@ class TestPage(LoggedTestCase):
             '<a href="http://notmyidea.org/article-spaces.html">link</a>'
         )
 
+    def test_intrasite_link_source_and_generated(self):
+        """Test linking both to the source and the generated article
+        """
+        cls_name = '_DummyAsset' if six.PY3 else b'_DummyAsset'
+
+        args = self.page_kwargs.copy()
+        args['settings'] = get_settings()
+        args['source_path'] = 'content'
+        args['context']['generated_content'] = {
+            'article.rst': type(cls_name, (object,), {'url': 'article.html'})}
+        args['context']['static_content'] = {
+            'article.rst': type(cls_name, (object,), {'url': 'article.rst'})}
+
+        args['content'] = (
+            'A simple test, with a link to an'
+            '<a href="{filename}article.rst">article</a> and its'
+            '<a href="{static}article.rst">source</a>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(
+            content,
+            'A simple test, with a link to an'
+            '<a href="http://notmyidea.org/article.html">article</a> and its'
+            '<a href="http://notmyidea.org/article.rst">source</a>'
+        )
+
+    def test_intrasite_link_to_static_content_with_filename(self):
+        """Test linking to a static resource with deprecated {filename}
+        """
+        cls_name = '_DummyAsset' if six.PY3 else b'_DummyAsset'
+
+        args = self.page_kwargs.copy()
+        args['settings'] = get_settings()
+        args['source_path'] = 'content'
+        args['context']['static_content'] = {
+            'poster.jpg':
+                type(cls_name, (object,), {'url': 'images/poster.jpg'})}
+
+        args['content'] = (
+            'A simple test, with a link to a'
+            '<a href="{filename}poster.jpg">poster</a>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(
+            content,
+            'A simple test, with a link to a'
+            '<a href="http://notmyidea.org/images/poster.jpg">poster</a>'
+        )
+
     def test_multiple_authors(self):
         """Test article with multiple authors."""
         args = self.page_kwargs.copy()
@@ -599,13 +652,13 @@ class TestStatic(LoggedTestCase):
             STATIC_URL='{path}',
             PAGE_SAVE_AS=os.path.join('outpages', '{slug}.html'),
             PAGE_URL='outpages/{slug}.html')
-        self.context = self.settings.copy()
+        self.context = get_context(self.settings)
 
         self.static = Static(content=None, metadata={}, settings=self.settings,
                              source_path=posix_join('dir', 'foo.jpg'),
                              context=self.context)
 
-        self.context['filenames'] = {self.static.source_path: self.static}
+        self.context['static_content'][self.static.source_path] = self.static
 
     def tearDown(self):
         pass
@@ -674,7 +727,7 @@ class TestStatic(LoggedTestCase):
 
     def test_attach_to_does_nothing_after_save_as_referenced(self):
         """attach_to() does nothing if the save_as was already referenced.
-        (For example, by a {filename} link an a document processed earlier.)
+        (For example, by a {static} link an a document processed earlier.)
         """
         original_save_as = self.static.save_as
 
@@ -690,7 +743,7 @@ class TestStatic(LoggedTestCase):
 
     def test_attach_to_does_nothing_after_url_referenced(self):
         """attach_to() does nothing if the url was already referenced.
-        (For example, by a {filename} link an a document processed earlier.)
+        (For example, by a {static} link an a document processed earlier.)
         """
         original_url = self.static.url
 
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 11ae144a..b59777ed 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -10,7 +10,7 @@ from tempfile import mkdtemp
 from pelican.generators import (ArticlesGenerator, Generator, PagesGenerator,
                                 PelicanTemplateNotFound, StaticGenerator,
                                 TemplatePagesGenerator)
-from pelican.tests.support import get_settings, unittest
+from pelican.tests.support import get_context, get_settings, unittest
 from pelican.writers import Writer
 
 try:
@@ -178,14 +178,15 @@ class TestArticlesGenerator(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        settings = get_settings(filenames={})
+        settings = get_settings()
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['READERS'] = {'asc': None}
         settings['CACHE_CONTENT'] = False
+        context = get_context(settings)
 
         cls.generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         cls.generator.generate_context()
         cls.articles = cls.distill_articles(cls.generator.articles)
@@ -299,15 +300,15 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertEqual(sorted(categories), sorted(categories_expected))
 
     def test_do_not_use_folder_as_category(self):
-        settings = get_settings(filenames={})
+        settings = get_settings()
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['USE_FOLDER_AS_CATEGORY'] = False
         settings['CACHE_PATH'] = self.temp_cache
         settings['READERS'] = {'asc': None}
-        settings['filenames'] = {}
+        context = get_context(settings)
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         # test for name
@@ -328,15 +329,16 @@ class TestArticlesGenerator(unittest.TestCase):
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_direct_templates_save_as_url_default(self):
 
-        settings = get_settings(filenames={})
+        settings = get_settings()
         settings['CACHE_PATH'] = self.temp_cache
+        context = get_context(settings)
         generator = ArticlesGenerator(
-            context=settings, settings=settings,
+            context=context, settings=settings,
             path=None, theme=settings['THEME'], output_path=None)
         write = MagicMock()
         generator.generate_direct_templates(write)
         write.assert_called_with("archives.html",
-                                 generator.get_template("archives"), settings,
+                                 generator.get_template("archives"), context,
                                  articles=generator.articles,
                                  dates=generator.dates, blog=True,
                                  template_name='archives',
@@ -396,13 +398,14 @@ class TestArticlesGenerator(unittest.TestCase):
         """
         old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, str('C'))
-        settings = get_settings(filenames={})
+        settings = get_settings()
 
         settings['YEAR_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/index.html'
         settings['YEAR_ARCHIVE_URL'] = 'posts/{date:%Y}/'
         settings['CACHE_PATH'] = self.temp_cache
+        context = get_context(settings)
         generator = ArticlesGenerator(
-            context=settings, settings=settings,
+            context=context, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         write = MagicMock()
@@ -411,20 +414,20 @@ class TestArticlesGenerator(unittest.TestCase):
         articles = [d for d in generator.articles if d.date.year == 1970]
         self.assertEqual(len(dates), 1)
         # among other things it must have at least been called with this
-        settings["period"] = (1970,)
+        context["period"] = (1970,)
         write.assert_called_with("posts/1970/index.html",
                                  generator.get_template("period_archives"),
-                                 settings, blog=True, articles=articles,
+                                 context, blog=True, articles=articles,
                                  dates=dates, template_name='period_archives',
                                  url="posts/1970/")
 
-        del settings["period"]
         settings['MONTH_ARCHIVE_SAVE_AS'] = \
             'posts/{date:%Y}/{date:%b}/index.html'
         settings['MONTH_ARCHIVE_URL'] = \
             'posts/{date:%Y}/{date:%b}/'
+        context = get_context(settings)
         generator = ArticlesGenerator(
-            context=settings, settings=settings,
+            context=context, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         write = MagicMock()
@@ -434,21 +437,21 @@ class TestArticlesGenerator(unittest.TestCase):
         articles = [d for d in generator.articles
                     if d.date.year == 1970 and d.date.month == 1]
         self.assertEqual(len(dates), 1)
-        settings["period"] = (1970, "January")
+        context["period"] = (1970, "January")
         # among other things it must have at least been called with this
         write.assert_called_with("posts/1970/Jan/index.html",
                                  generator.get_template("period_archives"),
-                                 settings, blog=True, articles=articles,
+                                 context, blog=True, articles=articles,
                                  dates=dates, template_name='period_archives',
                                  url="posts/1970/Jan/")
 
-        del settings["period"]
         settings['DAY_ARCHIVE_SAVE_AS'] = \
             'posts/{date:%Y}/{date:%b}/{date:%d}/index.html'
         settings['DAY_ARCHIVE_URL'] = \
             'posts/{date:%Y}/{date:%b}/{date:%d}/'
+        context = get_context(settings)
         generator = ArticlesGenerator(
-            context=settings, settings=settings,
+            context=context, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         write = MagicMock()
@@ -466,20 +469,21 @@ class TestArticlesGenerator(unittest.TestCase):
             d.date.day == 1
         ]
         self.assertEqual(len(dates), 1)
-        settings["period"] = (1970, "January", 1)
+        context["period"] = (1970, "January", 1)
         # among other things it must have at least been called with this
         write.assert_called_with("posts/1970/Jan/01/index.html",
                                  generator.get_template("period_archives"),
-                                 settings, blog=True, articles=articles,
+                                 context, blog=True, articles=articles,
                                  dates=dates, template_name='period_archives',
                                  url="posts/1970/Jan/01/")
         locale.setlocale(locale.LC_ALL, old_locale)
 
     def test_nonexistent_template(self):
         """Attempt to load a non-existent template"""
-        settings = get_settings(filenames={})
+        settings = get_settings()
+        context = get_context(settings)
         generator = ArticlesGenerator(
-            context=settings, settings=settings,
+            context=context, settings=settings,
             path=None, theme=settings['THEME'], output_path=None)
         self.assertRaises(Exception, generator.get_template, "not_a_template")
 
@@ -497,7 +501,7 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertEqual(sorted(authors), sorted(authors_expected))
 
     def test_standard_metadata_in_default_metadata(self):
-        settings = get_settings(filenames={})
+        settings = get_settings()
         settings['CACHE_CONTENT'] = False
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
@@ -506,8 +510,9 @@ class TestArticlesGenerator(unittest.TestCase):
                                         # DEFAULT_CATEGORY
                                         ('category', 'Random'),
                                         ('tags', 'general, untagged'))
+        context = get_context(settings)
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
 
@@ -530,13 +535,14 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertEqual(tags, tags_expected)
 
     def test_article_order_by(self):
-        settings = get_settings(filenames={})
+        settings = get_settings()
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['ARTICLE_ORDER_BY'] = 'title'
+        context = get_context(settings)
 
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
 
@@ -575,13 +581,14 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertEqual(articles, expected)
 
         # reversed title
-        settings = get_settings(filenames={})
+        settings = get_settings()
         settings['DEFAULT_CATEGORY'] = 'Default'
         settings['DEFAULT_DATE'] = (1970, 1, 1)
         settings['ARTICLE_ORDER_BY'] = 'reversed-title'
+        context = get_context(settings)
 
         generator = ArticlesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context, settings=settings,
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
 
@@ -605,13 +612,14 @@ class TestPageGenerator(unittest.TestCase):
         return [[page.title, page.status, page.template] for page in pages]
 
     def test_generate_context(self):
-        settings = get_settings(filenames={})
+        settings = get_settings()
         settings['CACHE_PATH'] = self.temp_cache
         settings['PAGE_PATHS'] = ['TestPages']  # relative to CUR_DIR
         settings['DEFAULT_DATE'] = (1970, 1, 1)
+        context = get_context(settings)
 
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context, settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
@@ -624,6 +632,7 @@ class TestPageGenerator(unittest.TestCase):
             ['This is a test page with a preset template', 'published',
              'custom'],
             ['Page with a bunch of links', 'published', 'page'],
+            ['Page with static links', 'published', 'page'],
             ['A Page (Test) for sorting', 'published', 'page'],
         ]
         hidden_pages_expected = [
@@ -653,10 +662,11 @@ class TestPageGenerator(unittest.TestCase):
             sorted(self.distill_pages(generator.context['draft_pages'])))
 
     def test_generate_sorted(self):
-        settings = get_settings(filenames={})
+        settings = get_settings()
         settings['PAGE_PATHS'] = ['TestPages']  # relative to CUR_DIR
         settings['CACHE_PATH'] = self.temp_cache
         settings['DEFAULT_DATE'] = (1970, 1, 1)
+        context = get_context(settings)
 
         # default sort (filename)
         pages_expected_sorted_by_filename = [
@@ -664,11 +674,12 @@ class TestPageGenerator(unittest.TestCase):
             ['This is a markdown test page', 'published', 'page'],
             ['A Page (Test) for sorting', 'published', 'page'],
             ['Page with a bunch of links', 'published', 'page'],
+            ['Page with static links', 'published', 'page'],
             ['This is a test page with a preset template', 'published',
              'custom'],
         ]
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context, settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
@@ -678,14 +689,16 @@ class TestPageGenerator(unittest.TestCase):
         pages_expected_sorted_by_title = [
             ['A Page (Test) for sorting', 'published', 'page'],
             ['Page with a bunch of links', 'published', 'page'],
+            ['Page with static links', 'published', 'page'],
             ['This is a markdown test page', 'published', 'page'],
             ['This is a test page', 'published', 'page'],
             ['This is a test page with a preset template', 'published',
              'custom'],
         ]
         settings['PAGE_ORDER_BY'] = 'title'
+        context = get_context(settings)
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context.copy(), settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
@@ -697,12 +710,14 @@ class TestPageGenerator(unittest.TestCase):
              'custom'],
             ['This is a test page', 'published', 'page'],
             ['This is a markdown test page', 'published', 'page'],
+            ['Page with static links', 'published', 'page'],
             ['Page with a bunch of links', 'published', 'page'],
             ['A Page (Test) for sorting', 'published', 'page'],
         ]
         settings['PAGE_ORDER_BY'] = 'reversed-title'
+        context = get_context(settings)
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context, settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
@@ -713,21 +728,43 @@ class TestPageGenerator(unittest.TestCase):
         Test to ensure links of the form {tag}tagname and {category}catname
         are generated correctly on pages
         """
-        settings = get_settings(filenames={})
+        settings = get_settings()
         settings['PAGE_PATHS'] = ['TestPages']    # relative to CUR_DIR
         settings['CACHE_PATH'] = self.temp_cache
         settings['DEFAULT_DATE'] = (1970, 1, 1)
+        context = get_context(settings)
 
         generator = PagesGenerator(
-            context=settings.copy(), settings=settings,
+            context=context, settings=settings,
             path=CUR_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
-        pages_by_title = {p.title: p.content for p in generator.pages}
+        pages_by_title = {p.title: p for p in generator.pages}
 
-        test_content = pages_by_title['Page with a bunch of links']
+        test_content = pages_by_title['Page with a bunch of links'].content
         self.assertIn('<a href="/category/yeah.html">', test_content)
         self.assertIn('<a href="/tag/matsuku.html">', test_content)
 
+    def test_static_and_attach_links_on_generated_pages(self):
+        """
+        Test to ensure links of the form {static}filename and {attach}filename
+        are included in context['static_links']
+        """
+        settings = get_settings()
+        settings['PAGE_PATHS'] = ['TestPages/page_with_static_links.md']
+        settings['CACHE_PATH'] = self.temp_cache
+        settings['DEFAULT_DATE'] = (1970, 1, 1)
+        context = get_context(settings)
+
+        generator = PagesGenerator(
+            context=context, settings=settings,
+            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+
+        self.assertIn('pelican/tests/TestPages/image0.jpg',
+                      context['static_links'])
+        self.assertIn('pelican/tests/TestPages/image1.jpg',
+                      context['static_links'])
+
 
 class TestTemplatePagesGenerator(unittest.TestCase):
 
@@ -791,7 +828,7 @@ class TestStaticGenerator(unittest.TestCase):
                                       "static", "staticfile")
         self.endfile = os.path.join(self.temp_output, "static", "staticfile")
         self.generator = StaticGenerator(
-            context={'filenames': {}},
+            context=get_context(),
             settings=self.settings,
             path=self.temp_content,
             theme="",
@@ -808,11 +845,8 @@ class TestStaticGenerator(unittest.TestCase):
     def test_theme_static_paths_dirs(self):
         """Test that StaticGenerator properly copies also files mentioned in
            TEMPLATE_STATIC_PATHS, not just directories."""
-        settings = get_settings(
-            PATH=self.content_path,
-            filenames={})
-        context = settings.copy()
-        context['staticfiles'] = []
+        settings = get_settings(PATH=self.content_path)
+        context = get_context(settings, staticfiles=[])
 
         StaticGenerator(
             context=context, settings=settings,
@@ -831,10 +865,8 @@ class TestStaticGenerator(unittest.TestCase):
            TEMPLATE_STATIC_PATHS, not just directories."""
         settings = get_settings(
             PATH=self.content_path,
-            THEME_STATIC_PATHS=['static/css/fonts.css', 'static/fonts/'],
-            filenames={})
-        context = settings.copy()
-        context['staticfiles'] = []
+            THEME_STATIC_PATHS=['static/css/fonts.css', 'static/fonts/'],)
+        context = get_context(settings, staticfiles=[])
 
         StaticGenerator(
             context=context, settings=settings,
@@ -869,9 +901,8 @@ class TestStaticGenerator(unittest.TestCase):
         settings = get_settings(
             STATIC_EXCLUDES=['subdir'],
             PATH=self.content_path,
-            STATIC_PATHS=[''],
-            filenames={})
-        context = settings.copy()
+            STATIC_PATHS=[''],)
+        context = get_context(settings)
 
         StaticGenerator(
             context=context, settings=settings,
@@ -897,9 +928,8 @@ class TestStaticGenerator(unittest.TestCase):
             PATH=self.content_path,
             PAGE_PATHS=[''],
             STATIC_PATHS=[''],
-            CACHE_CONTENT=False,
-            filenames={})
-        context = settings.copy()
+            CACHE_CONTENT=False,)
+        context = get_context(settings)
 
         for generator_class in (PagesGenerator, StaticGenerator):
             generator_class(
@@ -915,8 +945,7 @@ class TestStaticGenerator(unittest.TestCase):
             "STATIC_EXCLUDE_SOURCES=True failed to exclude a markdown file")
 
         settings.update(STATIC_EXCLUDE_SOURCES=False)
-        context = settings.copy()
-        context['filenames'] = {}
+        context = get_context(settings)
 
         for generator_class in (PagesGenerator, StaticGenerator):
             generator_class(
@@ -931,6 +960,40 @@ class TestStaticGenerator(unittest.TestCase):
             any(name.endswith(".md") for name in staticnames),
             "STATIC_EXCLUDE_SOURCES=False failed to include a markdown file")
 
+    def test_static_links(self):
+        """Test that StaticGenerator uses files in static_links
+        """
+        settings = get_settings(
+            STATIC_EXCLUDES=['subdir'],
+            PATH=self.content_path,
+            STATIC_PATHS=[],)
+        context = get_context(settings)
+        context['static_links'] |= {'short_page.md', 'subdir_fake_image.jpg'}
+
+        StaticGenerator(
+            context=context, settings=settings,
+            path=settings['PATH'], output_path=self.temp_output,
+            theme=settings['THEME']).generate_context()
+
+        staticfiles_names = [
+            os.path.basename(c.source_path) for c in context['staticfiles']]
+
+        static_content_names = [
+            os.path.basename(c) for c in context['static_content']]
+
+        self.assertIn(
+            'short_page.md', staticfiles_names,
+            "StaticGenerator skipped a file that it should have included")
+        self.assertIn(
+            'short_page.md', static_content_names,
+            "StaticGenerator skipped a file that it should have included")
+        self.assertIn(
+            'subdir_fake_image.jpg', staticfiles_names,
+            "StaticGenerator skipped a file that it should have included")
+        self.assertIn(
+            'subdir_fake_image.jpg', static_content_names,
+            "StaticGenerator skipped a file that it should have included")
+
     def test_copy_one_file(self):
         with open(self.startfile, "w") as f:
             f.write("staticcontent")
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 93c240c2..273fc430 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -112,7 +112,7 @@ class TestPelican(LoggedTestCase):
         self.assertDirsEqual(
             self.temp_path, os.path.join(OUTPUT_PATH, 'basic'))
         self.assertLogCountEqual(
-            count=3,
+            count=1,
             msg="Unable to find.*skipping url replacement",
             level=logging.WARNING)
 
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index b7b26283..8bbc58a7 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -761,7 +761,7 @@ def update_links_to_attached_files(content, attachments):
         http_url = old_url.replace('https://', 'http://')
         https_url = old_url.replace('http://', 'https://')
         for url in [http_url, https_url]:
-            content = content.replace(url, '{filename}' + new_path)
+            content = content.replace(url, '{static}' + new_path)
     return content
 
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 96447586..50d428a5 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -435,7 +435,7 @@ def path_to_url(path):
 
 def posixize_path(rel_path):
     """Use '/' as path separator, so that source references,
-    like '{filename}/foo/bar.jpg' or 'extras/favicon.ico',
+    like '{static}/foo/bar.jpg' or 'extras/favicon.ico',
     will work on Windows as well as on Mac and Linux."""
     return rel_path.replace(os.sep, '/')
 
diff --git a/samples/content/another_super_article.rst b/samples/content/another_super_article.rst
index e6e0a92c..37727116 100644
--- a/samples/content/another_super_article.rst
+++ b/samples/content/another_super_article.rst
@@ -14,7 +14,7 @@ Why not ?
 After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !
 
-.. image:: |filename|/pictures/Sushi.jpg
+.. image:: |static|/pictures/Sushi.jpg
    :height: 450 px
    :width: 600 px
    :alt: alternate text
diff --git a/samples/content/super_article.rst b/samples/content/super_article.rst
index a96176a1..b2caa070 100644
--- a/samples/content/super_article.rst
+++ b/samples/content/super_article.rst
@@ -17,12 +17,12 @@ This is a simple title
 
 And here comes the cool stuff_.
 
-.. image:: |filename|/pictures/Sushi.jpg
+.. image:: |static|/pictures/Sushi.jpg
    :height: 450 px
    :width: 600 px
    :alt: alternate text
 
-.. image:: |filename|/pictures/Sushi_Macro.jpg
+.. image:: |static|/pictures/Sushi_Macro.jpg
    :height: 450 px
    :width: 600 px
    :alt: alternate text

From dbdbd435118b39a27cf4d284f122f060d9ab3c17 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Fri, 2 Nov 2018 15:33:57 -0600
Subject: [PATCH 2088/2864] Add Python 3.7 support to Travis and Tox

---
 .travis.yml | 5 +++++
 tox.ini     | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 077aeedb..23f267c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,11 @@ matrix:
     - python: 3.6
       env:
       - TOX_ENV=py36
+    - python: 3.7
+      sudo: true
+      dist: xenial
+      env:
+      - TOX_ENV=py37
 addons:
   apt_packages:
     - pandoc
diff --git a/tox.ini b/tox.ini
index b0dd4fd2..4d941aac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,36},docs,flake8
+envlist = py{27,34,35,36,37},docs,flake8
 
 [testenv]
 basepython =
@@ -7,6 +7,7 @@ basepython =
     py34: python3.4
     py35: python3.5
     py36: python3.6
+    py37: python3.7
 passenv = *
 usedevelop=True
 deps =

From f595741b8e7dfd1cf6a59618edae0a465e2ef025 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Fri, 2 Nov 2018 20:53:15 -0600
Subject: [PATCH 2089/2864] Docs: Reflow to 79 char line limit

---
 docs/changelog.rst      |  21 ++--
 docs/content.rst        |  48 ++++----
 docs/contribute.rst     |  15 ++-
 docs/faq.rst            | 117 +++++++++---------
 docs/importer.rst       |   5 +-
 docs/index.rst          |   8 +-
 docs/install.rst        |  14 +--
 docs/internals.rst      |  40 +++---
 docs/pelican-themes.rst |  38 ++++--
 docs/plugins.rst        |  31 +++--
 docs/publish.rst        |  66 +++++-----
 docs/quickstart.rst     |  11 +-
 docs/report.rst         | 117 +++++++++---------
 docs/settings.rst       | 263 ++++++++++++++++++++--------------------
 docs/themes.rst         |  89 +++++++-------
 docs/tips.rst           |  40 +++---
 16 files changed, 472 insertions(+), 451 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 858a6e1b..85414a6f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,8 +12,9 @@ Next release
   ``'bar'`` from ``'foo/bar.html'`` (unless ``'bar' == 'index'``).
 * ``ARTICLE_ORDER_BY`` and ``PAGE_ORDER_BY`` now also affect 1) category, tag
   and author pages 2) feeds 3) draft and hidden articles and pages
-* New ``ARTICLE_TRANSLATION_ID`` and ``PAGE_TRANSLATION_ID`` settings to specify
-  metadata attributes used to identify translations; or to disable translations
+* New ``ARTICLE_TRANSLATION_ID`` and ``PAGE_TRANSLATION_ID`` settings to
+  specify metadata attributes used to identify translations; or to disable
+  translations
 * New ``{static}`` syntax to link to static content; content linked to by
   ``{static}`` and ``{attach}`` is automatically copied over even if not in
   ``STATIC_PATHS``
@@ -103,8 +104,8 @@ Next release
   directory as articles and pages using ``{attach}`` in the path.
 * Prevent Pelican from raising an exception when there are duplicate pieces of
   metadata in a Markdown file.
-* Introduce the ``TYPOGRIFY_IGNORE_TAGS`` setting to add HTML tags to be ignored
-  by Typogrify.
+* Introduce the ``TYPOGRIFY_IGNORE_TAGS`` setting to add HTML tags to be
+  ignored by Typogrify.
 * Add the ability to use ``-`` in date formats to strip leading zeros. For
   example, ``%-d/%-m/%y`` will now result in the date ``9/8/12``.
 * Ensure feed generation is correctly disabled during quickstart configuration.
@@ -207,8 +208,10 @@ Next release
 * Improve appearance of LinkedIn icon in default theme
 * Add GitHub and Google+ social icons support in default theme
 * Optimize social icons
-* Add ``FEED_ALL_ATOM`` and ``FEED_ALL_RSS`` to generate feeds containing all posts regardless of their language
-* Split ``TRANSLATION_FEED`` into ``TRANSLATION_FEED_ATOM`` and ``TRANSLATION_FEED_RSS``
+* Add ``FEED_ALL_ATOM`` and ``FEED_ALL_RSS`` to generate feeds containing all
+  posts regardless of their language
+* Split ``TRANSLATION_FEED`` into ``TRANSLATION_FEED_ATOM`` and
+  ``TRANSLATION_FEED_RSS``
 * Different feeds can now be enabled/disabled individually
 * Allow for blank author: if ``AUTHOR`` setting is not set, author won't
   default to ``${USER}`` anymore, and a post won't contain any author
@@ -216,7 +219,8 @@ Next release
 * Move LESS and Webassets support from Pelican core to plugin
 * The ``DEFAULT_DATE`` setting now defaults to ``None``, which means that
   articles won't be generated unless date metadata is specified
-* Add ``FILENAME_METADATA`` setting to support metadata extraction from filename
+* Add ``FILENAME_METADATA`` setting to support metadata extraction from
+  filename
 * Add ``gzip_cache`` plugin to compress common text files into a ``.gz``
   file within the same directory as the original file, preventing the server
   (e.g. Nginx) from having to compress files during an HTTP call
@@ -287,7 +291,8 @@ Next release
 * Added translations
 * Added a way to use cleaner URLs with a rewrite url module (or equivalent)
 * Added a tag cloud
-* Added an autoreloading feature: the blog is automatically regenerated each time a modification is detected
+* Added an autoreloading feature: the blog is automatically regenerated each
+  time a modification is detected
 * Translate the documentation into French
 * Import a blog from an RSS feed
 * Pagination support
diff --git a/docs/content.rst b/docs/content.rst
index 8d07e390..78fc7993 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -70,7 +70,9 @@ Metadata syntax for Markdown posts should follow this pattern::
 
     This is the content of my super blog post.
 
-You can also have your own metadata keys (so long as they don't conflict with reserved metadata keywords) for use in your python templates. The following is the list of reserved metadata keywords:
+You can also have your own metadata keys (so long as they don't conflict with
+reserved metadata keywords) for use in your python templates. The following is
+the list of reserved metadata keywords:
 
 * `Title`
 * `Tags`
@@ -133,12 +135,13 @@ the W3C's `suggested subset ISO 8601`__.
 
 __ `W3C ISO 8601`_
 
-``modified`` should be last time you updated the article, and defaults to ``date`` if not specified.
-Besides you can show ``modified`` in the templates, feed entries in feed readers will be updated automatically
-when you set ``modified`` to the current date after you modified your article.
+``modified`` should be last time you updated the article, and defaults to
+``date`` if not specified. Besides you can show ``modified`` in the templates,
+feed entries in feed readers will be updated automatically when you set
+``modified`` to the current date after you modified your article.
 
-``authors`` is a comma-separated list of article authors. If there's only one author you
-can use ``author`` field.
+``authors`` is a comma-separated list of article authors. If there's only one
+author you can use ``author`` field.
 
 If you do not explicitly specify summary metadata for a given post, the
 ``SUMMARY_MAX_LENGTH`` setting can be used to specify how many words from the
@@ -181,12 +184,12 @@ static files that are explicitly linked to are included (see below).
 Mixed content in the same directory
 -----------------------------------
 
-Starting with Pelican 3.5, static files can safely share a source directory with
-page source files, without exposing the page sources in the generated site.
-Any such directory must be added to both ``STATIC_PATHS`` and ``PAGE_PATHS``
-(or ``STATIC_PATHS`` and ``ARTICLE_PATHS``). Pelican will identify and process
-the page source files normally, and copy the remaining files as if they lived
-in a separate directory reserved for static files.
+Starting with Pelican 3.5, static files can safely share a source directory
+with page source files, without exposing the page sources in the generated
+site. Any such directory must be added to both ``STATIC_PATHS`` and
+``PAGE_PATHS`` (or ``STATIC_PATHS`` and ``ARTICLE_PATHS``). Pelican will
+identify and process the page source files normally, and copy the remaining
+files as if they lived in a separate directory reserved for static files.
 
 Note: Placing static and content source files together in the same source
 directory does not guarantee that they will end up in the same place in the
@@ -273,8 +276,8 @@ Site generation would then copy ``han.jpg`` to ``output/images/han.jpg``,
 ``menu.pdf`` to ``output/pdfs/menu.pdf``, and write the appropriate links
 in ``test.md``.
 
-If you use ``{static}`` to link to an article or a page, this will be turned into
-a link to its source code.
+If you use ``{static}`` to link to an article or a page, this will be turned
+into a link to its source code.
 
 Attaching static files
 ----------------------
@@ -360,13 +363,13 @@ You can link to authors, categories, index and tags using the ``{author}name``,
 Deprecated internal link syntax
 -------------------------------
 
-To remain compatible with earlier versions, Pelican still supports vertical bars
-(``||``) in addition to curly braces (``{}``) for internal links. For example:
-``|filename|an_article.rst``, ``|tag|tagname``, ``|category|foobar``.
+To remain compatible with earlier versions, Pelican still supports vertical
+bars (``||``) in addition to curly braces (``{}``) for internal links. For
+example: ``|filename|an_article.rst``, ``|tag|tagname``, ``|category|foobar``.
 The syntax was changed from ``||`` to ``{}`` to avoid collision with Markdown
-extensions or reST directives. Similarly, Pelican also still supports linking to
-static content with ``{filename}``. The syntax was changed to ``{static}`` to allow
-linking to both generated articles and pages and their static sources.
+extensions or reST directives. Similarly, Pelican also still supports linking
+to static content with ``{filename}``. The syntax was changed to ``{static}``
+to allow linking to both generated articles and pages and their static sources.
 
 Support for the old syntax may eventually be removed.
 
@@ -546,8 +549,9 @@ before publishing, for example), you can add a ``Status: draft`` attribute to
 its metadata. That article will then be output to the ``drafts`` folder and not
 listed on the index page nor on any category or tag page.
 
-If your articles should be automatically published as a draft (to not accidentally
-publish an article before it is finished) include the status in the ``DEFAULT_METADATA``::
+If your articles should be automatically published as a draft (to not
+accidentally publish an article before it is finished) include the status in
+the ``DEFAULT_METADATA``::
 
     DEFAULT_METADATA = {
         'status': 'draft',
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 35e9797d..5a314751 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -66,9 +66,8 @@ Open ``_build/html/index.html`` in your browser to preview the documentation.
 Running the test suite
 ======================
 
-Each time you add a feature, there are two things to do regarding tests:
-check that the existing tests pass, and add tests for the new feature
-or bugfix.
+Each time you add a feature, there are two things to do regarding tests: check
+that the existing tests pass, and add tests for the new feature or bugfix.
 
 The tests live in ``pelican/tests`` and you can run them using the
 "discover" feature of ``unittest``::
@@ -92,8 +91,8 @@ functional tests. To do so, **make sure you have both** ``en_EN.utf8`` **and**
 
 You may also find that some tests are skipped because some dependency (e.g.,
 Pandoc) is not installed. This does not automatically mean that these tests
-have passed; you should at least verify that any skipped tests are not
-affected by your changes.
+have passed; you should at least verify that any skipped tests are not affected
+by your changes.
 
 You should run the test suite under each of the supported versions of Python.
 This is best done by creating a separate Python environment for each version.
@@ -178,9 +177,9 @@ Optionally, you can also set ``'limit_args'`` as a tuple of arguments in
 ``extra`` dict if your generic message needs formatting.
 
 Limit is set to ``5``, i.e, first four logs with the same ``'limit_msg'`` are
-outputted normally but the fifth one will be logged using
-``'limit_msg'`` (and ``'limit_args'`` if present). After the fifth,
-corresponding log messages will be ignored.
+outputted normally but the fifth one will be logged using ``'limit_msg'`` (and
+``'limit_args'`` if present). After the fifth, corresponding log messages will
+be ignored.
 
 For example, if you want to log missing resources, use the following code::
 
diff --git a/docs/faq.rst b/docs/faq.rst
index efb49f66..d469f386 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -12,10 +12,10 @@ How can I help?
 ===============
 
 There are several ways to help out. First, you can report any Pelican
-suggestions or problems you might have via IRC (preferred) or the
-`issue tracker <https://github.com/getpelican/pelican/issues>`_. If submitting
-an issue report, please first check the existing issue list (both open and
-closed) in order to avoid submitting a duplicate issue.
+suggestions or problems you might have via IRC (preferred) or the `issue
+tracker <https://github.com/getpelican/pelican/issues>`_. If submitting an
+issue report, please first check the existing issue list (both open and closed)
+in order to avoid submitting a duplicate issue.
 
 If you want to contribute, please fork `the git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make
@@ -35,10 +35,10 @@ via the command line. See ``pelican --help`` for more information.
 Changes to the settings file take no effect
 ===========================================
 
-When experimenting with different settings (especially the metadata
-ones) caching may interfere and the changes may not be visible. In
-such cases, ensure that caching is disabled via ``LOAD_CONTENT_CACHE = False``
-or use the ``--ignore-cache`` command-line switch.
+When experimenting with different settings (especially the metadata ones)
+caching may interfere and the changes may not be visible. In such cases, ensure
+that caching is disabled via ``LOAD_CONTENT_CACHE = False`` or use the
+``--ignore-cache`` command-line switch.
 
 I'm creating my own theme. How do I use Pygments for syntax highlighting?
 =========================================================================
@@ -70,9 +70,9 @@ I want to use Markdown, but I got an error.
 If you try to generate Markdown content without first installing the Markdown
 library, may see a message that says ``No valid files found in content``.
 Markdown is not a hard dependency for Pelican, so if you have content in
-Markdown format, you will need to explicitly install the Markdown library.
-You can do so by typing the following command, prepending ``sudo`` if
-permissions require it::
+Markdown format, you will need to explicitly install the Markdown library. You
+can do so by typing the following command, prepending ``sudo`` if permissions
+require it::
 
     pip install markdown
 
@@ -150,9 +150,9 @@ the ``'index'`` direct template.
 What if I want to disable feed generation?
 ==========================================
 
-To disable feed generation, all feed settings should be set to ``None``.
-All but three feed settings already default to ``None``, so if you want to
-disable all feed generation, you only need to specify the following settings::
+To disable feed generation, all feed settings should be set to ``None``. All
+but three feed settings already default to ``None``, so if you want to disable
+all feed generation, you only need to specify the following settings::
 
     FEED_ALL_ATOM = None
     CATEGORY_FEED_ATOM = None
@@ -167,9 +167,9 @@ I'm getting a warning about feeds generated without SITEURL being set properly
 ==============================================================================
 
 `RSS and Atom feeds require all URL links to be absolute
-<http://validator.w3.org/feed/docs/rss2.html#comments>`_.
-In order to properly generate links in Pelican you will need to set ``SITEURL``
-to the full path of your site.
+<http://validator.w3.org/feed/docs/rss2.html#comments>`_. In order to properly
+generate links in Pelican you will need to set ``SITEURL`` to the full path of
+your site.
 
 Feeds are still generated when this warning is displayed, but links within may
 be malformed and thus the feed may not validate.
@@ -185,26 +185,26 @@ setting names). Here is an exact list of the renamed settings::
     TAG_FEED -> TAG_FEED_ATOM
     CATEGORY_FEED -> CATEGORY_FEED_ATOM
 
-Starting in 3.1, the new feed ``FEED_ALL_ATOM`` has been introduced: this
-feed will aggregate all posts regardless of their language. This setting
-generates ``'feeds/all.atom.xml'`` by default and ``FEED_ATOM`` now defaults to
-``None``. The following feed setting has also been renamed::
+Starting in 3.1, the new feed ``FEED_ALL_ATOM`` has been introduced: this feed
+will aggregate all posts regardless of their language. This setting generates
+``'feeds/all.atom.xml'`` by default and ``FEED_ATOM`` now defaults to ``None``.
+The following feed setting has also been renamed::
 
     TRANSLATION_FEED -> TRANSLATION_FEED_ATOM
 
-Older themes that referenced the old setting names may not link properly.
-In order to rectify this, please update your theme for compatibility by changing
+Older themes that referenced the old setting names may not link properly. In
+order to rectify this, please update your theme for compatibility by changing
 the relevant values in your template files. For an example of complete feed
 headers and usage please check out the ``simple`` theme.
 
 Is Pelican only suitable for blogs?
 ===================================
 
-No. Pelican can be easily configured to create and maintain any type of static site.
-This may require a little customization of your theme and Pelican configuration.
-For example, if you are building a launch site for your product and do not need
-tags on your site, you could remove the relevant HTML code from your theme.
-You can also disable generation of tag-related pages via::
+No. Pelican can be easily configured to create and maintain any type of static
+site. This may require a little customization of your theme and Pelican
+configuration. For example, if you are building a launch site for your product
+and do not need tags on your site, you could remove the relevant HTML code from
+your theme. You can also disable generation of tag-related pages via::
 
     TAGS_SAVE_AS = ''
     TAG_SAVE_AS = ''
@@ -212,52 +212,49 @@ You can also disable generation of tag-related pages via::
 Why does Pelican always write all HTML files even with content caching enabled?
 ===============================================================================
 
-In order to reliably determine whether the HTML output is different
-before writing it, a large part of the generation environment
-including the template contexts, imported plugins, etc. would have to
-be saved and compared, at least in the form of a hash (which would
-require special handling of unhashable types), because of all the
-possible combinations of plugins, pagination, etc. which may change in
-many different ways. This would require a lot more processing time
-and memory and storage space. Simply writing the files each time is a
-lot faster and a lot more reliable.
+In order to reliably determine whether the HTML output is different before
+writing it, a large part of the generation environment including the template
+contexts, imported plugins, etc. would have to be saved and compared, at least
+in the form of a hash (which would require special handling of unhashable
+types), because of all the possible combinations of plugins, pagination, etc.
+which may change in many different ways. This would require a lot more
+processing time and memory and storage space. Simply writing the files each
+time is a lot faster and a lot more reliable.
 
-However, this means that the modification time of the files changes
-every time, so a ``rsync`` based upload will transfer them even if
-their content hasn't changed. A simple solution is to make ``rsync``
-use the ``--checksum`` option, which will make it compare the file
-checksums in a much faster way than Pelican would.
+However, this means that the modification time of the files changes every time,
+so a ``rsync`` based upload will transfer them even if their content hasn't
+changed. A simple solution is to make ``rsync`` use the ``--checksum`` option,
+which will make it compare the file checksums in a much faster way than Pelican
+would.
 
-When only several specific output files are of interest (e.g. when
-working on some specific page or the theme templates), the
-`WRITE_SELECTED` option may help, see
-:ref:`writing_only_selected_content`.
+When only several specific output files are of interest (e.g. when working on
+some specific page or the theme templates), the `WRITE_SELECTED` option may
+help, see :ref:`writing_only_selected_content`.
 
 How to process only a subset of all articles?
 =============================================
 
-It is often useful to process only e.g. 10 articles for debugging
-purposes. This can be achieved by explicitly specifying only the
-filenames of those articles in ``ARTICLE_PATHS``. A list of such
-filenames could be found using a command similar to ``cd content;
-find -name '*.md' | head -n 10``.
+It is often useful to process only e.g. 10 articles for debugging purposes.
+This can be achieved by explicitly specifying only the filenames of those
+articles in ``ARTICLE_PATHS``. A list of such filenames could be found using a
+command similar to ``cd content; find -name '*.md' | head -n 10``.
 
 My tag-cloud is missing/broken since I upgraded Pelican
 =======================================================
 
 In an ongoing effort to steamline Pelican, `tag_cloud` generation has been
 moved out of the pelican core and into a separate `plugin
-<https://github.com/getpelican/pelican-plugins/tree/master/tag_cloud>`_.
-See the :ref:`plugins` documentation further information about the
-Pelican plugin system.
+<https://github.com/getpelican/pelican-plugins/tree/master/tag_cloud>`_. See
+the :ref:`plugins` documentation further information about the Pelican plugin
+system.
 
 Since I upgraded Pelican my pages are no longer rendered
 ========================================================
 
-Pages were available to themes as lowercase ``pages`` and uppercase
-``PAGES``. To bring this inline with the :ref:`templates-variables` section,
-``PAGES`` has been removed. This is quickly resolved by updating your theme
-to iterate over ``pages`` instead of ``PAGES``. Just replace::
+Pages were available to themes as lowercase ``pages`` and uppercase ``PAGES``.
+To bring this inline with the :ref:`templates-variables` section, ``PAGES`` has
+been removed. This is quickly resolved by updating your theme to iterate over
+``pages`` instead of ``PAGES``. Just replace::
 
     {% for pg in PAGES %}
 
@@ -271,8 +268,8 @@ How can I stop Pelican from trying to parse my static files as content?
 Pelican's article and page generators run before it's static generator. That
 means if you use a setup similar to the default configuration, where a static
 source directory is defined inside a ``*_PATHS`` setting, all files that have a
-valid content file ending (``.html``, ``.rst``, ``.md``, ...) will be treated as
-articles or pages before they get treated as static files.
+valid content file ending (``.html``, ``.rst``, ``.md``, ...) will be treated
+as articles or pages before they get treated as static files.
 
 To circumvent this issue either use the appropriate ``*_EXCLUDES`` setting or
 disable the offending reader via ``READERS`` if you don't need it.
diff --git a/docs/importer.rst b/docs/importer.rst
index e8614f2a..0f940808 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -26,8 +26,9 @@ Dependencies
 
 ``pelican-import`` has some dependencies not required by the rest of Pelican:
 
-- *BeautifulSoup4* and *lxml*, for WordPress and Dotclear import. Can be installed like
-  any other Python package (``pip install BeautifulSoup4 lxml``).
+- *BeautifulSoup4* and *lxml*, for WordPress and Dotclear import. Can be
+  installed like any other Python package (``pip install BeautifulSoup4
+  lxml``).
 - *Feedparser*, for feed import (``pip install feedparser``).
 - *Pandoc*, see the `Pandoc site`_ for installation instructions on your
   operating system.
diff --git a/docs/index.rst b/docs/index.rst
index ccfb9982..a0084ffb 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -6,14 +6,14 @@ Pelican |release|
 
     .. warning::
 
-        This documentation is for the version of Pelican currently under development.
-        Were you looking for version |last_stable| documentation?
+        This documentation is for the version of Pelican currently under
+        development. Were you looking for version |last_stable| documentation?
 
 
 Pelican is a static site generator, written in Python_. Highlights include:
 
-* Write your content directly with your editor of choice
-  in reStructuredText_ or Markdown_ formats
+* Write your content directly with your editor of choice in reStructuredText_
+  or Markdown_ formats
 * Includes a simple CLI tool to (re)generate your site
 * Easy to interface with distributed version control systems and web hooks
 * Completely static output is easy to host anywhere
diff --git a/docs/install.rst b/docs/install.rst
index 09097666..17f275af 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -12,8 +12,8 @@ You can install Pelican via several different methods. The simplest is via
 (Keep in mind that operating systems will often require you to prefix the above
 command with ``sudo`` in order to install Pelican system-wide.)
 
-While the above is the simplest method, the recommended approach is to create
-a virtual environment for Pelican via virtualenv_ before installing Pelican.
+While the above is the simplest method, the recommended approach is to create a
+virtual environment for Pelican via virtualenv_ before installing Pelican.
 Assuming you have virtualenv_ installed, you can then open a new terminal
 session and create a new virtual environment for Pelican::
 
@@ -22,9 +22,8 @@ session and create a new virtual environment for Pelican::
     source bin/activate
 
 Once the virtual environment has been created and activated, Pelican can be
-installed via ``pip install pelican`` as noted above. Alternatively, if
-you have the project source, you can install Pelican using the distutils
-method::
+installed via ``pip install pelican`` as noted above. Alternatively, if you
+have the project source, you can install Pelican using the distutils method::
 
     cd path-to-Pelican-source
     python setup.py install
@@ -96,8 +95,9 @@ your site::
     pelican-quickstart
 
 Once you finish answering all the questions, your project will consist of the
-following hierarchy (except for *pages* — shown in parentheses below — which you
-can optionally add yourself if you plan to create non-chronological content)::
+following hierarchy (except for *pages* — shown in parentheses below — which
+you can optionally add yourself if you plan to create non-chronological
+content)::
 
     yourproject/
     ├── content
diff --git a/docs/internals.rst b/docs/internals.rst
index b267df76..e8d35148 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -1,8 +1,8 @@
 Pelican internals
 #################
 
-This section describe how Pelican works internally. As you'll see, it's
-quite simple, but a bit of documentation doesn't hurt.  :)
+This section describe how Pelican works internally. As you'll see, it's quite
+simple, but a bit of documentation doesn't hurt.  :)
 
 You can also find in the :doc:`report` section an excerpt of a report the
 original author wrote with some software design information.
@@ -13,9 +13,8 @@ Overall structure
 =================
 
 What Pelican does is take a list of files and process them into some sort of
-output. Usually, the input files are reStructuredText and Markdown
-files, and the output is a blog, but both input and output can be anything you
-want.
+output. Usually, the input files are reStructuredText and Markdown files, and
+the output is a blog, but both input and output can be anything you want.
 
 The logic is separated into different classes and concepts:
 
@@ -27,9 +26,10 @@ The logic is separated into different classes and concepts:
   reStructuredText for now, but the system is extensible). Given a file, they
   return metadata (author, tags, category, etc.) and content (HTML-formatted).
 
-* **Generators** generate the different outputs. For instance, Pelican comes with
-  ``ArticlesGenerator`` and ``PageGenerator``. Given a configuration, they can do
-  whatever they want. Most of the time, it's generating files from inputs.
+* **Generators** generate the different outputs. For instance, Pelican comes
+  with ``ArticlesGenerator`` and ``PageGenerator``. Given a configuration, they
+  can do whatever they want. Most of the time, it's generating files from
+  inputs.
 
 * Pelican also uses templates, so it's easy to write your own theme. The
   syntax is `Jinja2 <http://jinja.pocoo.org/>`_ and is very easy to learn, so
@@ -38,9 +38,9 @@ The logic is separated into different classes and concepts:
 How to implement a new reader?
 ==============================
 
-Is there an awesome markup language you want to add to Pelican?
-Well, the only thing you have to do is to create a class with a ``read``
-method that returns HTML content and some metadata.
+Is there an awesome markup language you want to add to Pelican? Well, the only
+thing you have to do is to create a class with a ``read`` method that returns
+HTML content and some metadata.
 
 Take a look at the Markdown reader::
 
@@ -65,17 +65,17 @@ Take a look at the Markdown reader::
 
 Simple, isn't it?
 
-If your new reader requires additional Python dependencies, then you should wrap
-their ``import`` statements in a ``try...except`` block.  Then inside the reader's
-class, set the ``enabled`` class attribute to mark import success or failure.
-This makes it possible for users to continue using their favourite markup method
-without needing to install modules for formats they don't use.
+If your new reader requires additional Python dependencies, then you should
+wrap their ``import`` statements in a ``try...except`` block.  Then inside the
+reader's class, set the ``enabled`` class attribute to mark import success or
+failure. This makes it possible for users to continue using their favourite
+markup method without needing to install modules for formats they don't use.
 
 How to implement a new generator?
 =================================
 
-Generators have two important methods. You're not forced to create
-both; only the existing ones will be called.
+Generators have two important methods. You're not forced to create both; only
+the existing ones will be called.
 
 * ``generate_context``, that is called first, for all the generators.
   Do whatever you have to do, and update the global context if needed. This
@@ -89,5 +89,5 @@ both; only the existing ones will be called.
   generating the output.  :) It's here that you may want to look at the context
   and call the methods of the ``writer`` object that is passed as the first
   argument of this function. In the ``PageGenerator`` example, this method will
-  look at all the pages recorded in the global context and output a file on
-  the disk (using the writer method ``write_file``) for each page encountered.
+  look at all the pages recorded in the global context and output a file on the
+  disk (using the writer method ``write_file``) for each page encountered.
diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index e18ebadf..2802777a 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -44,7 +44,8 @@ Examples
 Listing the installed themes
 """"""""""""""""""""""""""""
 
-With ``pelican-themes``, you can see the available themes by using the ``-l`` or ``--list`` option:
+With ``pelican-themes``, you can see the available themes by using the ``-l``
+or ``--list`` option:
 
 .. code-block:: console
 
@@ -57,11 +58,15 @@ With ``pelican-themes``, you can see the available themes by using the ``-l`` or
     two-column@
     simple
 
-In this example, we can see there are three themes available: ``notmyidea``, ``simple``, and ``two-column``.
+In this example, we can see there are three themes available: ``notmyidea``,
+``simple``, and ``two-column``.
 
-``two-column`` is prefixed with an ``@`` because this theme is not copied to the Pelican theme path, but is instead just linked to it (see `Creating symbolic links`_ for details about creating symbolic links).
+``two-column`` is prefixed with an ``@`` because this theme is not copied to
+the Pelican theme path, but is instead just linked to it (see `Creating
+symbolic links`_ for details about creating symbolic links).
 
-Note that you can combine the ``--list`` option with the ``-v`` or ``--verbose`` option to get more verbose output, like this:
+Note that you can combine the ``--list`` option with the ``-v`` or
+``--verbose`` option to get more verbose output, like this:
 
 .. code-block:: console
 
@@ -75,7 +80,8 @@ Installing themes
 """""""""""""""""
 
 You can install one or more themes using the ``-i`` or ``--install`` option.
-This option takes as argument the path(s) of the theme(s) you want to install, and can be combined with the verbose option:
+This option takes as argument the path(s) of the theme(s) you want to install,
+and can be combined with the verbose option:
 
 .. code-block:: console
 
@@ -95,8 +101,9 @@ This option takes as argument the path(s) of the theme(s) you want to install, a
 Removing themes
 """""""""""""""
 
-The ``pelican-themes`` command can also remove themes from the Pelican themes path.
-The ``-r`` or ``--remove`` option takes as argument the name(s) of the theme(s) you want to remove, and can be combined with the ``--verbose`` option.
+The ``pelican-themes`` command can also remove themes from the Pelican themes
+path. The ``-r`` or ``--remove`` option takes as argument the name(s) of the
+theme(s) you want to remove, and can be combined with the ``--verbose`` option.
 
 .. code-block:: console
 
@@ -113,15 +120,19 @@ The ``-r`` or ``--remove`` option takes as argument the name(s) of the theme(s)
 Creating symbolic links
 """""""""""""""""""""""
 
-``pelican-themes`` can also install themes by creating symbolic links instead of copying entire themes into the Pelican themes path.
+``pelican-themes`` can also install themes by creating symbolic links instead
+of copying entire themes into the Pelican themes path.
 
-To symbolically link a theme, you can use the ``-s`` or ``--symlink``, which works exactly as the ``--install`` option:
+To symbolically link a theme, you can use the ``-s`` or ``--symlink``, which
+works exactly as the ``--install`` option:
 
 .. code-block:: console
 
     # pelican-themes --symlink ~/Dev/Python/pelican-themes/two-column
 
-In this example, the ``two-column`` theme is now symbolically linked to the Pelican themes path, so we can use it, but we can also modify it without having to reinstall it after each modification.
+In this example, the ``two-column`` theme is now symbolically linked to the
+Pelican themes path, so we can use it, but we can also modify it without having
+to reinstall it after each modification.
 
 This is useful for theme development:
 
@@ -142,7 +153,9 @@ This is useful for theme development:
 Doing several things at once
 """"""""""""""""""""""""""""
 
-The ``--install``, ``--remove`` and ``--symlink`` option are not mutually exclusive, so you can combine them in the same command line to do more than one operation at time, like this:
+The ``--install``, ``--remove`` and ``--symlink`` option are not mutually
+exclusive, so you can combine them in the same command line to do more than one
+operation at time, like this:
 
 
 .. code-block:: console
@@ -152,4 +165,5 @@ The ``--install``, ``--remove`` and ``--symlink`` option are not mutually exclus
                      --symlink ~/Dev/Python/pelican-themes/two-column \
                      --verbose
 
-In this example, the theme ``notmyidea-cms`` is replaced by the theme ``notmyidea-cms-fr``
+In this example, the theme ``notmyidea-cms`` is replaced by the theme
+``notmyidea-cms-fr``
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 4e0ec6d1..cc74adea 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -22,11 +22,10 @@ Alternatively, another method is to import them and add them to the list::
 
 .. note::
 
-   When experimenting with different plugins (especially the ones that
-   deal with metadata and content) caching may interfere and the
-   changes may not be visible. In such cases disable caching with
-   ``LOAD_CONTENT_CACHE = False`` or use the ``--ignore-cache``
-   command-line switch.
+   When experimenting with different plugins (especially the ones that deal
+   with metadata and content) caching may interfere and the changes may not be
+   visible. In such cases disable caching with ``LOAD_CONTENT_CACHE = False``
+   or use the ``--ignore-cache`` command-line switch.
 
 If your plugins are not in an importable path, you can specify a list of paths
 via the ``PLUGIN_PATHS`` setting. As shown in the following example, paths in
@@ -126,17 +125,17 @@ feed_written                        path, context, feed            invoked each
 
 .. warning::
 
-   Avoid ``content_object_init`` signal if you intend to read ``summary``
-   or ``content`` properties of the content object. That combination can
-   result in unresolved links when :ref:`ref-linking-to-internal-content`
-   (see `pelican-plugins bug #314`_). Use ``_summary`` and ``_content``
-   properties instead, or, alternatively, run your plugin at a later
-   stage (e.g. ``all_generators_finalized``).
+   Avoid ``content_object_init`` signal if you intend to read ``summary`` or
+   ``content`` properties of the content object. That combination can result in
+   unresolved links when :ref:`ref-linking-to-internal-content` (see
+   `pelican-plugins bug #314`_). Use ``_summary`` and ``_content`` properties
+   instead, or, alternatively, run your plugin at a later stage (e.g.
+   ``all_generators_finalized``).
 
 .. note::
 
-   After Pelican 3.2, signal names were standardized.  Older plugins
-   may need to be updated to use the new names:
+   After Pelican 3.2, signal names were standardized.  Older plugins may need
+   to be updated to use the new names:
 
    ==========================  ===========================
    Old name                    New name
@@ -162,9 +161,9 @@ How to create a new reader
 --------------------------
 
 One thing you might want is to add support for your very own input format.
-While it might make sense to add this feature in Pelican core, we
-wisely chose to avoid this situation and instead have the different readers
-defined via plugins.
+While it might make sense to add this feature in Pelican core, we wisely chose
+to avoid this situation and instead have the different readers defined via
+plugins.
 
 The rationale behind this choice is mainly that plugins are really easy to
 write and don't slow down Pelican itself when they're not active.
diff --git a/docs/publish.rst b/docs/publish.rst
index 9b49ae3f..4dc1e3ef 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -26,13 +26,13 @@ argument, like so::
 
 Note that you must specify the path to the generated *output* file — not the
 source content. To determine the output file name and location, use the
-``--debug`` flag. If desired, ``--write-selected``
-can take a comma-separated list of paths or can be configured as a setting.
-(See: :ref:`writing_only_selected_content`)
+``--debug`` flag. If desired, ``--write-selected`` can take a comma-separated
+list of paths or can be configured as a setting. (See:
+:ref:`writing_only_selected_content`)
 
-You can also tell Pelican to watch for your modifications, instead of
-manually re-running it every time you want to see your changes. To enable this,
-run the ``pelican`` command with the ``-r`` or ``--autoreload`` option.
+You can also tell Pelican to watch for your modifications, instead of manually
+re-running it every time you want to see your changes. To enable this, run the
+``pelican`` command with the ``-r`` or ``--autoreload`` option.
 
 Pelican has other command-line switches available. Have a look at the help to
 see all the options you can use::
@@ -75,17 +75,17 @@ feeds, etc.) that you may have defined::
 
     pelican content -s publishconf.py
 
-To base your publish configuration on top of your ``pelicanconf.py``, you
-can import your ``pelicanconf`` settings by including the following line in
-your ``publishconf.py``::
+To base your publish configuration on top of your ``pelicanconf.py``, you can
+import your ``pelicanconf`` settings by including the following line in your
+``publishconf.py``::
 
     from pelicanconf import *
 
-If you have generated a ``publishconf.py`` using ``pelican-quickstart``,
-this line is included by default.
+If you have generated a ``publishconf.py`` using ``pelican-quickstart``, this
+line is included by default.
 
-The steps for deploying your site will depend on where it will be hosted.
-If you have SSH access to a server running Nginx or Apache, you might use the
+The steps for deploying your site will depend on where it will be hosted. If
+you have SSH access to a server running Nginx or Apache, you might use the
 ``rsync`` tool to transmit your site files::
 
     rsync -avc --delete output/ host.example.com:/var/www/your-site/
@@ -98,17 +98,17 @@ Automation
 ==========
 
 While the ``pelican`` command is the canonical way to generate your site,
-automation tools can be used to streamline the generation and publication
-flow. One of the questions asked during the ``pelican-quickstart`` process
-pertains to whether you want to automate site generation and publication.
-If you answered "yes" to that question, a ``tasks.py`` and
-``Makefile`` will be generated in the root of your project. These files,
-pre-populated with certain information gleaned from other answers provided
-during the ``pelican-quickstart`` process, are meant as a starting point and
-should be customized to fit your particular needs and usage patterns. If you
-find one or both of these automation tools to be of limited utility, these
-files can deleted at any time and will not affect usage of the canonical
-``pelican`` command.
+automation tools can be used to streamline the generation and publication flow.
+One of the questions asked during the ``pelican-quickstart`` process pertains
+to whether you want to automate site generation and publication. If you
+answered "yes" to that question, a ``tasks.py`` and ``Makefile`` will be
+generated in the root of your project. These files, pre-populated with certain
+information gleaned from other answers provided during the
+``pelican-quickstart`` process, are meant as a starting point and should be
+customized to fit your particular needs and usage patterns. If you find one or
+both of these automation tools to be of limited utility, these files can
+deleted at any time and will not affect usage of the canonical ``pelican``
+command.
 
 Following are automation tools that "wrap" the ``pelican`` command and can
 simplify the process of generating, previewing, and uploading your site.
@@ -123,9 +123,9 @@ separately. Use the following command to install Invoke, prefixing with
 
     pip install invoke
 
-Take a moment to open the ``tasks.py`` file that was generated in your
-project root. You will see a number of commands, any one of which can be
-renamed, removed, and/or customized to your liking. Using the out-of-the-box
+Take a moment to open the ``tasks.py`` file that was generated in your project
+root. You will see a number of commands, any one of which can be renamed,
+removed, and/or customized to your liking. Using the out-of-the-box
 configuration, you can generate your site via::
 
     invoke build
@@ -155,12 +155,12 @@ needs and preferences.
 Make
 ----
 
-A ``Makefile`` is also automatically created for you when you say "yes" to
-the relevant question during the ``pelican-quickstart`` process. The advantage
-of this method is that the ``make`` command is built into most POSIX systems
-and thus doesn't require installing anything else in order to use it. The
-downside is that non-POSIX systems (e.g., Windows) do not include ``make``,
-and installing it on those systems can be a non-trivial task.
+A ``Makefile`` is also automatically created for you when you say "yes" to the
+relevant question during the ``pelican-quickstart`` process. The advantage of
+this method is that the ``make`` command is built into most POSIX systems and
+thus doesn't require installing anything else in order to use it. The downside
+is that non-POSIX systems (e.g., Windows) do not include ``make``, and
+installing it on those systems can be a non-trivial task.
 
 If you want to use ``make`` to generate your site using the settings in
 ``pelicanconf.py``, run::
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 022322c1..a5fdfa60 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -54,9 +54,9 @@ From your site directory, run the ``pelican`` command to generate your site::
 
     pelican content
 
-Your site has now been generated inside the ``output`` directory. (You may see a
-warning related to feeds, but that is normal when developing locally and can be
-ignored for now.)
+Your site has now been generated inside the ``output`` directory. (You may see
+a warning related to feeds, but that is normal when developing locally and can
+be ignored for now.)
 
 Preview your site
 -----------------
@@ -68,8 +68,9 @@ following command to launch Pelican's web server::
 
 Preview your site by navigating to http://localhost:8000/ in your browser.
 
-Continue reading the other documentation sections for more detail, and check out
-the Pelican wiki's Tutorials_ page for links to community-published tutorials.
+Continue reading the other documentation sections for more detail, and check
+out the Pelican wiki's Tutorials_ page for links to community-published
+tutorials.
 
 .. _Tutorials: https://github.com/getpelican/pelican/wiki/Tutorials
 
diff --git a/docs/report.rst b/docs/report.rst
index f3ddff31..278b5ab2 100644
--- a/docs/report.rst
+++ b/docs/report.rst
@@ -7,29 +7,27 @@ Some history about Pelican
     right after writing Pelican, in December 2010. The information may not be
     up-to-date.
 
-Pelican is a simple static blog generator. It parses markup files
-(Markdown or reStructuredText for now) and generates an HTML folder
-with all the files in it.
-I've chosen to use Python to implement Pelican because it seemed to
-be simple and to fit to my needs. I did not wanted to define a class for
-each thing, but still wanted to keep my things loosely coupled.
-It turns out that it was exactly what I wanted. From time to time,
-thanks to the feedback of some users, it took me a very few time to
-provide fixes on it. So far, I've re-factored the Pelican code by two
+Pelican is a simple static blog generator. It parses markup files (Markdown or
+reStructuredText for now) and generates an HTML folder with all the files in
+it. I've chosen to use Python to implement Pelican because it seemed to be
+simple and to fit to my needs. I did not wanted to define a class for each
+thing, but still wanted to keep my things loosely coupled. It turns out that it
+was exactly what I wanted. From time to time, thanks to the feedback of some
+users, it took me a very few time to provide fixes on it. So far, I've
+re-factored the Pelican code by two
 times; each time took less than 30 minutes.
 
 Use case
 ========
 
-I was previously using WordPress, a solution you can host on a web
-server to manage your blog. Most of the time, I prefer using markup
-languages such as Markdown or reStructuredText to type my articles.
-To do so, I use vim. I think it is important to let the people choose the
-tool they want to write the articles. In my opinion, a blog manager
-should just allow you to take any kind of input and transform it to a
-weblog. That's what Pelican does.
-You can write your articles using the tool you want, and the markup
-language you want, and then generate a static HTML weblog.
+I was previously using WordPress, a solution you can host on a web server to
+manage your blog. Most of the time, I prefer using markup languages such as
+Markdown or reStructuredText to type my articles. To do so, I use vim. I think
+it is important to let the people choose the tool they want to write the
+articles. In my opinion, a blog manager should just allow you to take any kind
+of input and transform it to a weblog. That's what Pelican does. You can write
+your articles using the tool you want, and the markup language you want, and
+then generate a static HTML weblog.
 
 .. image:: _static/overall.png
 
@@ -40,39 +38,36 @@ Design process
 ==============
 
 Pelican came from a need I have. I started by creating a single file
-application, and I have make it grow to support what it does by now.
-To start, I wrote a piece of documentation about what I wanted to do.
-Then, I created the content I wanted to parse (the reStructuredText files)
-and started experimenting with the code. Pelican was 200 lines long and
-contained almost ten functions and one class when it was first usable.
+application, and I have make it grow to support what it does by now. To start,
+I wrote a piece of documentation about what I wanted to do. Then, I created the
+content I wanted to parse (the reStructuredText files) and started
+experimenting with the code. Pelican was 200 lines long and contained almost
+ten functions and one class when it was first usable.
 
-I have been facing different problems all over the time and wanted to
-add features to Pelican while using it. The first change I have done was
-to add the support of a settings file. It is possible to pass the options to
-the command line, but can be tedious if there is a lot of them.
-In the same way, I have added the support of different things over
-time: Atom feeds, multiple themes, multiple markup support, etc.
-At some point, it appears that the "only one file" mantra was not good
-enough for Pelican, so I decided to rework a bit all that, and split this in
-multiple different files.
+I have been facing different problems all over the time and wanted to add
+features to Pelican while using it. The first change I have done was to add the
+support of a settings file. It is possible to pass the options to the command
+line, but can be tedious if there is a lot of them. In the same way, I have
+added the support of different things over time: Atom feeds, multiple themes,
+multiple markup support, etc. At some point, it appears that the "only one
+file" mantra was not good enough for Pelican, so I decided to rework a bit all
+that, and split this in multiple different files.
 
 I’ve separated the logic in different classes and concepts:
 
 * *writers* are responsible of all the writing process of the files.
-  They are responsible of writing .html files, RSS feeds and so on.
-  Since those operations are commonly used, the object is created
-  once, and then passed to the generators.
+  They are responsible of writing .html files, RSS feeds and so on. Since those
+  operations are commonly used, the object is created once, and then passed to
+  the generators.
 
 * *readers* are used to read from various formats (Markdown and
-  reStructuredText for now, but the system is extensible). Given a
-  file, they return metadata (author, tags, category, etc) and
-  content (HTML formatted).
+  reStructuredText for now, but the system is extensible). Given a file, they
+  return metadata (author, tags, category, etc) and content (HTML formatted).
 
 * *generators* generate the different outputs. For instance, Pelican
-  comes with an ArticlesGenerator and PagesGenerator, into
-  others. Given a configuration, they can do whatever you want
-  them to do. Most of the time it's generating files from inputs
-  (user inputs and files).
+  comes with an ArticlesGenerator and PagesGenerator, into others. Given a
+  configuration, they can do whatever you want them to do. Most of the time
+  it's generating files from inputs (user inputs and files).
 
 I also deal with contents objects. They can be ``Articles``, ``Pages``,
 ``Quotes``, or whatever you want. They are defined in the ``contents.py``
@@ -90,32 +85,30 @@ whole picture. I do use duck typing and not interfaces.
 
 Internally, the following process is followed:
 
-* First of all, the command line is parsed, and some content from
-  the user is used to initialize the different generator objects.
+* First of all, the command line is parsed, and some content from the user is
+  used to initialize the different generator objects.
 
-* A ``context`` is created. It contains the settings from the command
-  line and a settings file if provided.
+* A ``context`` is created. It contains the settings from the command line and
+  a settings file if provided.
 * The ``generate_context`` method of each generator is called, updating
   the context.
+* The writer is created and given to the ``generate_output`` method of each
+  generator.
 
-* The writer is created and given to the ``generate_output`` method of
-  each generator.
-
-I make two calls because it is important that when the output is
-generated by the generators, the context will not change. In other
-words, the first method ``generate_context`` should modify the context,
-whereas the second ``generate_output`` method should not.
+I make two calls because it is important that when the output is generated by
+the generators, the context will not change. In other words, the first method
+``generate_context`` should modify the context, whereas the second
+``generate_output`` method should not.
 
 Then, it is up to the generators to do what the want, in the
-``generate_context`` and ``generate_content`` method.
-Taking the ``ArticlesGenerator`` class will help to understand some others
-concepts. Here is what happens when calling the ``generate_context``
-method:
+``generate_context`` and ``generate_content`` method. Taking the
+``ArticlesGenerator`` class will help to understand some others concepts. Here
+is what happens when calling the ``generate_context`` method:
 
-* Read the folder “path”, looking for restructured text files, load
-  each of them, and construct a content object (``Article``) with it. To do so,
-  use ``Reader`` objects.
+* Read the folder “path”, looking for restructured text files, load each of
+  them, and construct a content object (``Article``) with it. To do so, use
+  ``Reader`` objects.
 * Update the ``context`` with all those articles.
 
-Then, the ``generate_content`` method uses the ``context`` and the ``writer`` to
-generate the wanted output.
+Then, the ``generate_content`` method uses the ``context`` and the ``writer``
+to generate the wanted output.
diff --git a/docs/settings.rst b/docs/settings.rst
index 28b68980..d465ddff 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1,8 +1,8 @@
 Settings
 ########
 
-Pelican is configurable thanks to a settings file you can pass to
-the command line::
+Pelican is configurable thanks to a settings file you can pass to the command
+line::
 
     pelican content -s path/to/your/pelicanconf.py
 
@@ -11,10 +11,10 @@ be named ``pelicanconf.py`` by default.
 
 .. note::
 
-   When experimenting with different settings (especially the metadata
-   ones) caching may interfere and the changes may not be visible. In
-   such cases disable caching with ``LOAD_CONTENT_CACHE = False`` or
-   use the ``--ignore-cache`` command-line switch.
+   When experimenting with different settings (especially the metadata ones)
+   caching may interfere and the changes may not be visible. In such cases
+   disable caching with ``LOAD_CONTENT_CACHE = False`` or use the
+   ``--ignore-cache`` command-line switch.
 
 Settings are configured in the form of a Python module (a file). There is an
 `example settings file
@@ -35,8 +35,8 @@ quotation marks.
 
 Unless otherwise specified, settings that refer to paths can be either absolute
 or relative to the configuration file. The settings you define in the
-configuration file will be passed to the templates, which allows you to use your
-settings to add site-wide content.
+configuration file will be passed to the templates, which allows you to use
+your settings to add site-wide content.
 
 Here is a list of settings for Pelican:
 
@@ -89,8 +89,8 @@ Basic settings
 .. data:: JINJA_ENVIRONMENT = {'trim_blocks': True, 'lstrip_blocks': True}
 
    A dictionary of custom Jinja2 environment variables you want to use. This
-   also includes a list of extensions you may want to include.
-   See `Jinja Environment documentation`_.
+   also includes a list of extensions you may want to include. See `Jinja
+   Environment documentation`_.
 
 .. data:: JINJA_FILTERS = {}
 
@@ -212,8 +212,8 @@ Basic settings
    your SITEURL; if you do not, feeds will not be generated with
    properly-formed URLs. If your site is available via HTTPS, this setting
    should begin with ``https://`` — otherwise use ``http://``. Then append your
-   domain, with no trailing slash at the end.
-   Example: ``SITEURL = 'https://example.com'``
+   domain, with no trailing slash at the end. Example: ``SITEURL =
+   'https://example.com'``
 
 .. data:: STATIC_PATHS = ['images']
 
@@ -239,17 +239,17 @@ Basic settings
 
 .. data:: STATIC_CREATE_LINKS = False
 
-   Create links instead of copying files. If the content and output
-   directories are on the same device, then create hard links.  Falls
-   back to symbolic links if the output directory is on a different
-   filesystem. If symlinks are created, don't forget to add the ``-L``
-   or ``--copy-links`` option to rsync when uploading your site.
+   Create links instead of copying files. If the content and output directories
+   are on the same device, then create hard links.  Falls back to symbolic
+   links if the output directory is on a different filesystem. If symlinks are
+   created, don't forget to add the ``-L`` or ``--copy-links`` option to rsync
+   when uploading your site.
 
 .. data:: STATIC_CHECK_IF_MODIFIED = False
 
-   If set to ``True``, and ``STATIC_CREATE_LINKS`` is ``False``, compare
-   mtimes of content and output files, and only copy content files that
-   are newer than existing output files.
+   If set to ``True``, and ``STATIC_CREATE_LINKS`` is ``False``, compare mtimes
+   of content and output files, and only copy content files that are newer than
+   existing output files.
 
 .. data:: TYPOGRIFY = False
 
@@ -347,11 +347,11 @@ URL settings
 ============
 
 The first thing to understand is that there are currently two supported methods
-for URL formation: *relative* and *absolute*. Relative URLs are useful
-when testing locally, and absolute URLs are reliable and most useful when
+for URL formation: *relative* and *absolute*. Relative URLs are useful when
+testing locally, and absolute URLs are reliable and most useful when
 publishing. One method of supporting both is to have one Pelican configuration
-file for local development and another for publishing. To see an example of this
-type of setup, use the ``pelican-quickstart`` script as described in the
+file for local development and another for publishing. To see an example of
+this type of setup, use the ``pelican-quickstart`` script as described in the
 :doc:`Installation <install>` section, which will produce two separate
 configuration files for local development and publishing, respectively.
 
@@ -365,8 +365,8 @@ and pages anywhere you want.
 .. note::
     If you specify a ``datetime`` directive, it will be substituted using the
     input files' date metadata attribute. If the date is not specified for a
-    particular file, Pelican will rely on the file's ``mtime`` timestamp.
-    Check the `Python datetime documentation`_ for more information.
+    particular file, Pelican will rely on the file's ``mtime`` timestamp. Check
+    the `Python datetime documentation`_ for more information.
 
 .. _Python datetime documentation:
     http://docs.python.org/2/library/datetime.html#strftime-and-strptime-behavior
@@ -387,10 +387,9 @@ Example usage::
    PAGE_SAVE_AS = 'pages/{slug}/index.html'
 
 This would save your articles into something like
-``/posts/2011/Aug/07/sample-post/index.html``,
-save your pages into ``/pages/about/index.html``, and render them available at
-URLs of ``/posts/2011/Aug/07/sample-post/`` and ``/pages/about/``,
-respectively.
+``/posts/2011/Aug/07/sample-post/index.html``, save your pages into
+``/pages/about/index.html``, and render them available at URLs of
+``/posts/2011/Aug/07/sample-post/`` and ``/pages/about/``, respectively.
 
 .. data:: RELATIVE_URLS = False
 
@@ -528,9 +527,10 @@ respectively.
 
 Pelican can optionally create per-year, per-month, and per-day archives of your
 posts. These secondary archives are disabled by default but are automatically
-enabled if you supply format strings for their respective ``_SAVE_AS`` settings.
-Period archives fit intuitively with the hierarchical model of web URLs and can
-make it easier for readers to navigate through the posts you've written over time.
+enabled if you supply format strings for their respective ``_SAVE_AS``
+settings. Period archives fit intuitively with the hierarchical model of web
+URLs and can make it easier for readers to navigate through the posts you've
+written over time.
 
 Example usage::
 
@@ -543,9 +543,8 @@ posts for the month at ``posts/2011/Aug/index.html``.
 
 .. note::
     Period archives work best when the final path segment is ``index.html``.
-    This way a reader can remove a portion of your URL and automatically
-    arrive at an appropriate archive of posts, without having to specify
-    a page name.
+    This way a reader can remove a portion of your URL and automatically arrive
+    at an appropriate archive of posts, without having to specify a page name.
 
 ``DIRECT_TEMPLATES`` work a bit differently than noted above. Only the
 ``_SAVE_AS`` settings are available, but it is available for any direct
@@ -585,7 +584,8 @@ template.
 
 URLs for direct template pages are theme-dependent. Some themes use
 corresponding ``*_URL`` setting as string, while others hard-code them:
-``'archives.html'``, ``'authors.html'``, ``'categories.html'``, ``'tags.html'``.
+``'archives.html'``, ``'authors.html'``, ``'categories.html'``,
+``'tags.html'``.
 
 .. data:: SLUG_REGEX_SUBSTITUTIONS = [
         (r'[^\w\s-]', ''),  # remove non-alphabetical/whitespace/'-' chars
@@ -604,11 +604,13 @@ corresponding ``*_URL`` setting as string, while others hard-code them:
 
 .. data:: AUTHOR_REGEX_SUBSTITUTIONS = SLUG_REGEX_SUBSTITUTIONS
 
-   Regex substitutions for author slugs. Defaults to ``SLUG_REGEX_SUBSTITUTIONS``.
+   Regex substitutions for author slugs. Defaults to
+   ``SLUG_REGEX_SUBSTITUTIONS``.
 
 .. data:: CATEGORY_REGEX_SUBSTITUTIONS = SLUG_REGEX_SUBSTITUTIONS
 
-   Regex substitutions for category slugs. Defaults to ``SLUG_REGEX_SUBSTITUTIONS``.
+   Regex substitutions for category slugs. Defaults to
+   ``SLUG_REGEX_SUBSTITUTIONS``.
 
 .. data:: TAG_REGEX_SUBSTITUTIONS = SLUG_REGEX_SUBSTITUTIONS
 
@@ -784,13 +786,13 @@ Metadata
    unlike some other Pelican file settings.
 
 Not all metadata needs to be :ref:`embedded in source file itself
-<internal_metadata>`. For example, blog posts are often named
-following a ``YYYY-MM-DD-SLUG.rst`` pattern, or nested into
-``YYYY/MM/DD-SLUG`` directories. To extract metadata from the
-filename or path, set ``FILENAME_METADATA`` or ``PATH_METADATA`` to
-regular expressions that use Python's `group name notation`_ ``(?P<name>…)``.
-If you want to attach additional metadata but don't want to encode
-it in the path, you can set ``EXTRA_PATH_METADATA``:
+<internal_metadata>`. For example, blog posts are often named following a
+``YYYY-MM-DD-SLUG.rst`` pattern, or nested into ``YYYY/MM/DD-SLUG``
+directories. To extract metadata from the filename or path, set
+``FILENAME_METADATA`` or ``PATH_METADATA`` to regular expressions that use
+Python's `group name notation`_ ``(?P<name>…)``. If you want to attach
+additional metadata but don't want to encode it in the path, you can set
+``EXTRA_PATH_METADATA``:
 
 .. parsed-literal::
 
@@ -804,8 +806,8 @@ it in the path, you can set ``EXTRA_PATH_METADATA``:
             },
         }
 
-This can be a convenient way to shift the installed location of a
-particular file:
+This can be a convenient way to shift the installed location of a particular
+file:
 
 .. parsed-literal::
 
@@ -829,8 +831,8 @@ Feed settings
 By default, Pelican uses Atom feeds. However, it is also possible to use RSS
 feeds if you prefer.
 
-Pelican generates category feeds as well as feeds for all your articles. It does
-not generate feeds for tags by default, but it is possible to do so using
+Pelican generates category feeds as well as feeds for all your articles. It
+does not generate feeds for tags by default, but it is possible to do so using
 the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 
 .. data:: FEED_DOMAIN = None, i.e. base URL is "/"
@@ -944,7 +946,8 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
    to ``False``, the full content will be included instead. This setting
    doesn't affect Atom feeds, only RSS ones.
 
-If you don't want to generate some or any of these feeds, set the above variables to ``None``.
+If you don't want to generate some or any of these feeds, set the above
+variables to ``None``.
 
 .. [2] ``%s`` is replaced by name of the category / author / tag.
 
@@ -954,17 +957,18 @@ FeedBurner
 
 If you want to use FeedBurner for your feed, you will likely need to decide
 upon a unique identifier. For example, if your site were called "Thyme" and
-hosted on the www.example.com domain, you might use "thymefeeds" as your
-unique identifier, which we'll use throughout this section for illustrative
-purposes. In your Pelican settings, set the ``FEED_ATOM`` attribute to
+hosted on the www.example.com domain, you might use "thymefeeds" as your unique
+identifier, which we'll use throughout this section for illustrative purposes.
+In your Pelican settings, set the ``FEED_ATOM`` attribute to
 ``thymefeeds/main.xml`` to create an Atom feed with an original address of
 ``http://www.example.com/thymefeeds/main.xml``. Set the ``FEED_DOMAIN``
-attribute to ``http://feeds.feedburner.com``, or ``http://feeds.example.com`` if
-you are using a CNAME on your own domain (i.e., FeedBurner's "MyBrand" feature).
+attribute to ``http://feeds.feedburner.com``, or ``http://feeds.example.com``
+if you are using a CNAME on your own domain (i.e., FeedBurner's "MyBrand"
+feature).
 
 There are two fields to configure in the `FeedBurner
-<http://feedburner.google.com>`_ interface: "Original Feed" and "Feed
-Address". In this example, the "Original Feed" would be
+<http://feedburner.google.com>`_ interface: "Original Feed" and "Feed Address".
+In this example, the "Original Feed" would be
 ``http://www.example.com/thymefeeds/main.xml`` and the "Feed Address" suffix
 would be ``thymefeeds/main.xml``.
 
@@ -972,10 +976,10 @@ would be ``thymefeeds/main.xml``.
 Pagination
 ==========
 
-The default behaviour of Pelican is to list all the article titles along
-with a short description on the index page. While this works well for
-small-to-medium sites, sites with a large quantity of articles will probably
-benefit from paginating this list.
+The default behaviour of Pelican is to list all the article titles along with a
+short description on the index page. While this works well for small-to-medium
+sites, sites with a large quantity of articles will probably benefit from
+paginating this list.
 
 You can use the following settings to configure the pagination.
 
@@ -1014,9 +1018,9 @@ change this. It takes a sequence of triples, where each triple consists of::
 For ``page_url`` and ``page_save_as``, you may use a number of variables.
 ``{url}`` and ``{save_as}`` correspond respectively to the ``*_URL`` and
 ``*_SAVE_AS`` values of the corresponding page type (e.g. ``ARTICLE_SAVE_AS``).
-If ``{save_as} == foo/bar.html``, then ``{name} == foo/bar`` and
-``{extension} == .html``. ``{base_name}`` equals ``{name}`` except that it
-strips trailing ``/index`` if present. ``{number}`` equals the page number.
+If ``{save_as} == foo/bar.html``, then ``{name} == foo/bar`` and ``{extension}
+== .html``. ``{base_name}`` equals ``{name}`` except that it strips trailing
+``/index`` if present. ``{number}`` equals the page number.
 
 For example, if you want to leave the first page unchanged, but place
 subsequent pages at ``.../page/2/`` etc, you could set ``PAGINATION_PATTERNS``
@@ -1031,8 +1035,8 @@ as follows::
 Translations
 ============
 
-Pelican offers a way to translate articles. See the :doc:`Content <content>` section for
-more information.
+Pelican offers a way to translate articles. See the :doc:`Content <content>`
+section for more information.
 
 .. data:: DEFAULT_LANG = 'en'
 
@@ -1046,9 +1050,9 @@ more information.
 
 .. data:: PAGE_TRANSLATION_ID = 'slug'
 
-   The metadata attribute(s) used to identify which pages are translations
-   of one another. May be a string or a collection of strings. Set to ``None``
-   or ``False`` to disable the identification of translations.
+   The metadata attribute(s) used to identify which pages are translations of
+   one another. May be a string or a collection of strings. Set to ``None`` or
+   ``False`` to disable the identification of translations.
 
 .. data:: TRANSLATION_FEED_ATOM = 'feeds/all-%s.atom.xml'
 
@@ -1106,8 +1110,9 @@ Ordering content
 Themes
 ======
 
-Creating Pelican themes is addressed in a dedicated section (see :ref:`theming-pelican`).
-However, here are the settings that are related to themes.
+Creating Pelican themes is addressed in a dedicated section (see
+:ref:`theming-pelican`). However, here are the settings that are related to
+themes.
 
 .. data:: THEME
 
@@ -1152,11 +1157,13 @@ setting or by passing the ``-t`` option to the ``pelican`` command:
 * notmyidea
 * simple (a synonym for "plain text" :)
 
-There are a number of other themes available at https://github.com/getpelican/pelican-themes.
-Pelican comes with :doc:`pelican-themes`, a small script for managing themes.
+There are a number of other themes available at
+https://github.com/getpelican/pelican-themes. Pelican comes with
+:doc:`pelican-themes`, a small script for managing themes.
 
-You can define your own theme, either by starting from scratch or by duplicating
-and modifying a pre-existing theme. Here is :doc:`a guide on how to create your theme <themes>`.
+You can define your own theme, either by starting from scratch or by
+duplicating and modifying a pre-existing theme. Here is :doc:`a guide on how to
+create your theme <themes>`.
 
 Following are example ways to specify your preferred theme::
 
@@ -1169,8 +1176,8 @@ Following are example ways to specify your preferred theme::
     # Specify a customized theme, via absolute path
     THEME = "/home/myuser/projects/mysite/themes/mycustomtheme"
 
-The built-in ``notmyidea`` theme can make good use of the following settings. Feel
-free to use them in your themes as well.
+The built-in ``notmyidea`` theme can make good use of the following settings.
+Feel free to use them in your themes as well.
 
 .. data:: SITESUBTITLE
 
@@ -1256,9 +1263,9 @@ can be quite tricky. In order to filter out redundant log messages, Pelican
 comes with the ``LOG_FILTER`` setting.
 
 ``LOG_FILTER`` should be a list of tuples ``(level, msg)``, each of them being
-composed of the logging level (up to ``warning``) and the message to be ignored.
-Simply populate the list with the log messages you want to hide, and they will
-be filtered out.
+composed of the logging level (up to ``warning``) and the message to be
+ignored. Simply populate the list with the log messages you want to hide, and
+they will be filtered out.
 
 For example::
     
@@ -1274,6 +1281,7 @@ For example::
    LOG_FILTER = [(logging.WARN, 'Empty alt attribute for image %s in %s')]
 
 .. Warning::
+
    Silencing messages by templates is a dangerous feature. It is possible to
    unintentionally filter out multiple message types with the same template
    (including messages from future Pelican versions). Proceed with caution.
@@ -1288,16 +1296,15 @@ For example::
 Reading only modified content
 =============================
 
-To speed up the build process, Pelican can optionally read only articles
-and pages with modified content.
+To speed up the build process, Pelican can optionally read only articles and
+pages with modified content.
 
 When Pelican is about to read some content source file:
 
 1. The hash or modification time information for the file from a
-   previous build are loaded from a cache file if ``LOAD_CONTENT_CACHE``
-   is ``True``. These files are stored in the ``CACHE_PATH``
-   directory.  If the file has no record in the cache file, it is read
-   as usual.
+   previous build are loaded from a cache file if ``LOAD_CONTENT_CACHE`` is
+   ``True``. These files are stored in the ``CACHE_PATH`` directory.  If the
+   file has no record in the cache file, it is read as usual.
 2. The file is checked according to ``CHECK_MODIFIED_METHOD``:
 
     - If set to ``'mtime'``, the modification time of the file is
@@ -1305,47 +1312,45 @@ When Pelican is about to read some content source file:
     - If set to a name of a function provided by the ``hashlib``
       module, e.g. ``'md5'``, the file hash is checked.
     - If set to anything else or the necessary information about the
-      file cannot be found in the cache file, the content is read as
-      usual.
+      file cannot be found in the cache file, the content is read as usual.
 
 3. If the file is considered unchanged, the content data saved in a
-   previous build corresponding to the file is loaded from the cache,
-   and the file is not read.
+   previous build corresponding to the file is loaded from the cache, and the
+   file is not read.
 4. If the file is considered changed, the file is read and the new
-   modification information and the content data are saved to the
-   cache if ``CACHE_CONTENT`` is ``True``.
+   modification information and the content data are saved to the cache if
+   ``CACHE_CONTENT`` is ``True``.
 
-If ``CONTENT_CACHING_LAYER`` is set to ``'reader'`` (the default),
-the raw content and metadata returned by a reader are cached. If this
-setting is instead set to ``'generator'``, the processed content
-object is cached. Caching the processed content object may conflict
-with plugins (as some reading related signals may be skipped) and the
-``WITH_FUTURE_DATES`` functionality (as the ``draft`` status of the
-cached content objects would not change automatically over time).
+If ``CONTENT_CACHING_LAYER`` is set to ``'reader'`` (the default), the raw
+content and metadata returned by a reader are cached. If this setting is
+instead set to ``'generator'``, the processed content object is cached. Caching
+the processed content object may conflict with plugins (as some reading related
+signals may be skipped) and the ``WITH_FUTURE_DATES`` functionality (as the
+``draft`` status of the cached content objects would not change automatically
+over time).
 
-Checking modification times is faster than comparing file hashes,
-but it is not as reliable because ``mtime`` information can be lost,
-e.g., when copying content source files using the ``cp`` or ``rsync``
-commands without the ``mtime`` preservation mode (which for ``rsync``
-can be invoked by passing the ``--archive`` flag).
+Checking modification times is faster than comparing file hashes, but it is not
+as reliable because ``mtime`` information can be lost, e.g., when copying
+content source files using the ``cp`` or ``rsync`` commands without the
+``mtime`` preservation mode (which for ``rsync`` can be invoked by passing the
+``--archive`` flag).
 
-The cache files are Python pickles, so they may not be readable by
-different versions of Python as the pickle format often changes. If
-such an error is encountered, it is caught and the cache file is
-rebuilt automatically in the new format. The cache files will also be
-rebuilt after the ``GZIP_CACHE`` setting has been changed.
+The cache files are Python pickles, so they may not be readable by different
+versions of Python as the pickle format often changes. If such an error is
+encountered, it is caught and the cache file is rebuilt automatically in the
+new format. The cache files will also be rebuilt after the ``GZIP_CACHE``
+setting has been changed.
 
-The ``--ignore-cache`` command-line option is useful when the
-whole cache needs to be regenerated, such as when making modifications
-to the settings file that will affect the cached content, or just for
-debugging purposes. When Pelican runs in autoreload mode, modification
-of the settings file will make it ignore the cache automatically if
-``AUTORELOAD_IGNORE_CACHE`` is ``True``.
+The ``--ignore-cache`` command-line option is useful when the whole cache needs
+to be regenerated, such as when making modifications to the settings file that
+will affect the cached content, or just for debugging purposes. When Pelican
+runs in autoreload mode, modification of the settings file will make it ignore
+the cache automatically if ``AUTORELOAD_IGNORE_CACHE`` is ``True``.
 
-Note that even when using cached content, all output is always
-written, so the modification times of the generated ``*.html`` files
-will always change. Therefore, ``rsync``-based uploading may benefit
-from the ``--checksum`` option.
+Note that even when using cached content, all output is always written, so the
+modification times of the generated ``*.html`` files will always change.
+Therefore, ``rsync``-based uploading may benefit from the ``--checksum``
+option.
 
 .. _writing_only_selected_content:
 
@@ -1353,16 +1358,14 @@ from the ``--checksum`` option.
 Writing only selected content
 =============================
 
-When only working on a single article or page, or making tweaks to
-your theme, it is often desirable to generate and review your work
-as quickly as possible. In such cases, generating and writing the
-entire site output is often unnecessary. By specifying only the
-desired files as output paths in the ``WRITE_SELECTED`` list,
-**only** those files will be written. This list can be also specified
-on the command line using the ``--write-selected`` option, which
-accepts a comma-separated list of output file paths. By default this
-list is empty, so all output is written. See :ref:`site_generation` for
-more details.
+When only working on a single article or page, or making tweaks to your theme,
+it is often desirable to generate and review your work as quickly as possible.
+In such cases, generating and writing the entire site output is often
+unnecessary. By specifying only the desired files as output paths in the
+``WRITE_SELECTED`` list, **only** those files will be written. This list can be
+also specified on the command line using the ``--write-selected`` option, which
+accepts a comma-separated list of output file paths. By default this list is
+empty, so all output is written. See :ref:`site_generation` for more details.
 
 
 Example settings
diff --git a/docs/themes.rst b/docs/themes.rst
index e94ff08e..3e186ee2 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -3,13 +3,14 @@
 Creating themes
 ###############
 
-To generate its HTML output, Pelican uses the `Jinja <http://jinja.pocoo.org/>`_
-templating engine due to its flexibility and straightforward syntax. If you want
-to create your own theme, feel free to take inspiration from the `"simple" theme
+To generate its HTML output, Pelican uses the `Jinja
+<http://jinja.pocoo.org/>`_ templating engine due to its flexibility and
+straightforward syntax. If you want to create your own theme, feel free to take
+inspiration from the `"simple" theme
 <https://github.com/getpelican/pelican/tree/master/pelican/themes/simple/templates>`_.
 
-To generate your site using a theme you have created (or downloaded manually and
-then modified), you can specify that theme via the ``-t`` flag::
+To generate your site using a theme you have created (or downloaded manually
+and then modified), you can specify that theme via the ``-t`` flag::
 
     pelican content -s pelicanconf.py -t /projects/your-site/themes/your-theme
 
@@ -42,9 +43,9 @@ To make your own theme, you must follow the following structure::
   `theme` folder. The above filesystem layout includes CSS and image folders,
   but those are just examples. Put what you need here.
 
-* `templates` contains all the templates that will be used to generate the content.
-  The template files listed above are mandatory; you can add your own templates
-  if it helps you keep things organized while creating your theme.
+* `templates` contains all the templates that will be used to generate the
+  content. The template files listed above are mandatory; you can add your own
+  templates if it helps you keep things organized while creating your theme.
 
 
 .. _templates-variables:
@@ -93,13 +94,13 @@ draft_pages     The list of draft pages
 Sorting
 -------
 
-URL wrappers (currently categories, tags, and authors), have
-comparison methods that allow them to be easily sorted by name::
+URL wrappers (currently categories, tags, and authors), have comparison methods
+that allow them to be easily sorted by name::
 
     {% for tag, articles in tags|sort %}
 
-If you want to sort based on different criteria, `Jinja's sort
-command`__ has a number of options.
+If you want to sort based on different criteria, `Jinja's sort command`__ has a
+number of options.
 
 __ http://jinja.pocoo.org/docs/templates/#sort
 
@@ -108,13 +109,12 @@ Date Formatting
 ---------------
 
 Pelican formats the date according to your settings and locale
-(``DATE_FORMATS``/``DEFAULT_DATE_FORMAT``) and provides a
-``locale_date`` attribute. On the other hand, the ``date`` attribute will
-be a `datetime`_ object. If you need custom formatting for a date
-different than your settings, use the Jinja filter ``strftime``
-that comes with Pelican. Usage is same as Python `strftime`_ format,
-but the filter will do the right thing and format your date according
-to the locale given in your settings::
+(``DATE_FORMATS``/``DEFAULT_DATE_FORMAT``) and provides a ``locale_date``
+attribute. On the other hand, the ``date`` attribute will be a `datetime`_
+object. If you need custom formatting for a date different than your settings,
+use the Jinja filter ``strftime`` that comes with Pelican. Usage is same as
+Python `strftime`_ format, but the filter will do the right thing and format
+your date according to the locale given in your settings::
 
     {{ article.date|strftime('%d %B %Y') }}
 
@@ -127,7 +127,8 @@ index.html
 
 This is the home page or index of your blog, generated at ``index.html``.
 
-If pagination is active, subsequent pages will reside in ``index{number}.html``.
+If pagination is active, subsequent pages will reside in
+``index{number}.html``.
 
 ======================  ===================================================
 Variable                Description
@@ -153,8 +154,8 @@ page_name               'index' -- useful for pagination links
 author.html
 -------------
 
-This template will be processed for each of the existing authors, with
-output generated according to the ``AUTHOR_SAVE_AS`` setting (`Default:`
+This template will be processed for each of the existing authors, with output
+generated according to the ``AUTHOR_SAVE_AS`` setting (`Default:`
 ``author/{slug}.html``). If pagination is active, subsequent pages will by
 default reside at ``author/{slug}{number}.html``.
 
@@ -221,10 +222,9 @@ page_name               CATEGORY_URL where everything after `{slug}` is
 article.html
 -------------
 
-This template will be processed for each article, with
-output generated according to the ``ARTICLE_SAVE_AS`` setting (`Default:`
-``{slug}.html``). The following variables are available when
-rendering.
+This template will be processed for each article, with output generated
+according to the ``ARTICLE_SAVE_AS`` setting (`Default:` ``{slug}.html``). The
+following variables are available when rendering.
 
 =============   ===================================================
 Variable        Description
@@ -233,9 +233,9 @@ article         The article object to be displayed
 category        The name of the category for the current article
 =============   ===================================================
 
-Any metadata that you put in the header of the article source file
-will be available as fields on the ``article`` object. The field name will be
-the same as the name of the metadata field, except in all-lowercase characters.
+Any metadata that you put in the header of the article source file will be
+available as fields on the ``article`` object. The field name will be the same
+as the name of the metadata field, except in all-lowercase characters.
 
 For example, you could add a field called `FacebookImage` to your article
 metadata, as shown below:
@@ -251,8 +251,8 @@ metadata, as shown below:
     FacebookImage: http://franciscabrel.com/images/pythonlove.png
 
 This new metadata will be made available as `article.facebookimage` in your
-`article.html` template. This would allow you, for example, to specify an
-image for the Facebook open graph tags that will change for each article:
+`article.html` template. This would allow you, for example, to specify an image
+for the Facebook open graph tags that will change for each article:
 
 .. code-block:: html+jinja
 
@@ -262,10 +262,9 @@ image for the Facebook open graph tags that will change for each article:
 page.html
 ---------
 
-This template will be processed for each page, with
-output generated according to the ``PAGE_SAVE_AS`` setting (`Default:`
-``pages/{slug}.html``). The following variables are available when
-rendering.
+This template will be processed for each page, with output generated according
+to the ``PAGE_SAVE_AS`` setting (`Default:` ``pages/{slug}.html``). The
+following variables are available when rendering.
 
 =============   ===================================================
 Variable        Description
@@ -278,10 +277,10 @@ page            The page object to be displayed. You can access its
 tag.html
 --------
 
-This template will be processed for each tag, with
-output generated according to the ``TAG_SAVE_AS`` setting (`Default:`
-``tag/{slug}.html``). If pagination is active, subsequent pages will by
-default reside at ``tag/{slug}{number}.html``.
+This template will be processed for each tag, with output generated according
+to the ``TAG_SAVE_AS`` setting (`Default:` ``tag/{slug}.html``). If pagination
+is active, subsequent pages will by default reside at
+``tag/{slug}{number}.html``.
 
 ======================  ===================================================
 Variable                Description
@@ -312,9 +311,9 @@ page_name               TAG_URL where everything after `{slug}` is removed
 period_archives.html
 --------------------
 
-This template will be processed for each year of your posts if a path
-for ``YEAR_ARCHIVE_SAVE_AS`` is defined, each month if ``MONTH_ARCHIVE_SAVE_AS``
-is defined, and each day if ``DAY_ARCHIVE_SAVE_AS`` is defined.
+This template will be processed for each year of your posts if a path for
+``YEAR_ARCHIVE_SAVE_AS`` is defined, each month if ``MONTH_ARCHIVE_SAVE_AS`` is
+defined, and each day if ``DAY_ARCHIVE_SAVE_AS`` is defined.
 
 ===================     ===================================================
 Variable                Description
@@ -464,9 +463,9 @@ Since version 3.0, Pelican supports inheritance from the ``simple`` theme, so
 you can re-use the ``simple`` theme templates in your own themes.
 
 If one of the mandatory files in the ``templates/`` directory of your theme is
-missing, it will be replaced by the matching template from the ``simple`` theme.
-So if the HTML structure of a template in the ``simple`` theme is right for you,
-you don't have to write a new template from scratch.
+missing, it will be replaced by the matching template from the ``simple``
+theme. So if the HTML structure of a template in the ``simple`` theme is right
+for you, you don't have to write a new template from scratch.
 
 You can also extend templates from the ``simple`` theme in your own themes by
 using the ``{% extends %}`` directive as in the following example:
diff --git a/docs/tips.rst b/docs/tips.rst
index b5df39ef..e5e89e91 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -8,8 +8,8 @@ Custom 404 Pages
 
 When a browser requests a resource that the web server cannot find, the web
 server usually displays a generic "File not found" (404) error page that can be
-stark and unsightly. One way to provide an error page that matches the theme
-of your site is to create a custom 404 page (*not* an article), such as this
+stark and unsightly. One way to provide an error page that matches the theme of
+your site is to create a custom 404 page (*not* an article), such as this
 Markdown-formatted example stored in ``content/pages/404.md``::
 
     Title: Not Found
@@ -29,8 +29,8 @@ For Apache::
 
     ErrorDocument 404 /404.html
 
-For Amazon S3, first navigate to the ``Static Site Hosting`` menu in the
-bucket settings on your AWS cosole. From there::
+For Amazon S3, first navigate to the ``Static Site Hosting`` menu in the bucket
+settings on your AWS cosole. From there::
 
     Error Document: 404.html
 
@@ -67,15 +67,17 @@ already exist). The ``git push origin gh-pages`` command updates the remote
 ``gh-pages`` branch, effectively publishing the Pelican site.
 
 .. note::
-    The ``github`` target of the Makefile (and the ``gh_pages`` task of ``tasks.py``)
-    created by the ``pelican-quickstart`` command
-    publishes the Pelican site as Project Pages, as described above.
+
+    The ``github`` target of the Makefile (and the ``gh_pages`` task of
+    ``tasks.py``) created by the ``pelican-quickstart`` command publishes the
+    Pelican site as Project Pages, as described above.
 
 .. note:: ghp-import on Windows
 
-    Until `ghp-import Pull Request #25 <https://github.com/davisp/ghp-import/pull/25>`_
-    is accepted, you will need to install a custom build of ghp-import:
-    ``pip install https://github.com/chevah/ghp-import/archive/win-support.zip``
+    Until `ghp-import Pull Request #25
+    <https://github.com/davisp/ghp-import/pull/25>`_ is accepted, you will need
+    to install a custom build of ghp-import: ``pip install
+    https://github.com/chevah/ghp-import/archive/win-support.zip``
 
 User Pages
 ----------
@@ -99,13 +101,17 @@ by the ``ghp-import`` command) to the ``elemoine.github.io`` repository's
     To publish your Pelican site as User Pages, feel free to adjust the
     ``github`` target of the Makefile.
     
-Another option for publishing to User Pages is to generate the output files in the root directory of the project.
+Another option for publishing to User Pages is to generate the output files in
+the root directory of the project.
 
-For example, your main project folder is ``<username>.github.io`` and you can create the Pelican project in a subdirectory called ``Pelican``. Then from inside the ``Pelican`` folder you can run::
+For example, your main project folder is ``<username>.github.io`` and you can
+create the Pelican project in a subdirectory called ``Pelican``. Then from
+inside the ``Pelican`` folder you can run::
     
     $ pelican content -o .. -s pelicanconf.py
 
-Now you can push the whole project ``<username>.github.io`` to the master branch of your GitHub repository::
+Now you can push the whole project ``<username>.github.io`` to the master
+branch of your GitHub repository::
     
     $ git push origin master
     
@@ -120,8 +126,8 @@ relevant `GitHub docs <https://help.github.com/articles/custom-404-pages/>`_.
 Update your site on each commit
 -------------------------------
 
-To automatically update your Pelican site on each commit, you can create
-a post-commit hook. For example, you can add the following to
+To automatically update your Pelican site on each commit, you can create a
+post-commit hook. For example, you can add the following to
 ``.git/hooks/post-commit``::
 
     pelican content -o output -s pelicanconf.py && ghp-import output && git push origin gh-pages
@@ -142,8 +148,8 @@ output directory. For example::
 
 Note: use forward slashes, ``/``, even on Windows.
 
-You can also use the ``EXTRA_PATH_METADATA`` mechanism
-to place a ``favicon.ico`` or ``robots.txt`` at the root of any site.
+You can also use the ``EXTRA_PATH_METADATA`` mechanism to place a
+``favicon.ico`` or ``robots.txt`` at the root of any site.
 
 How to add YouTube or Vimeo Videos
 ==================================

From f9c3ac73e0ad3d16d2454dc5ad9d084b13114286 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Fri, 2 Nov 2018 20:55:33 -0600
Subject: [PATCH 2090/2864] Docs: ghp-import works on Windows now

see https://github.com/davisp/ghp-import/pull/25
---
 docs/tips.rst | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/tips.rst b/docs/tips.rst
index b5df39ef..7aeee937 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -71,12 +71,6 @@ already exist). The ``git push origin gh-pages`` command updates the remote
     created by the ``pelican-quickstart`` command
     publishes the Pelican site as Project Pages, as described above.
 
-.. note:: ghp-import on Windows
-
-    Until `ghp-import Pull Request #25 <https://github.com/davisp/ghp-import/pull/25>`_
-    is accepted, you will need to install a custom build of ghp-import:
-    ``pip install https://github.com/chevah/ghp-import/archive/win-support.zip``
-
 User Pages
 ----------
 

From 3a0add4b6e66fe08e9f5710f98235491c09e4f81 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Sat, 3 Nov 2018 09:12:20 -0600
Subject: [PATCH 2091/2864] Convert FEED settings from `%s` to `{slug}` redux
 (#2432)

* Convert FEED settings from `%s` to `{slug}` redux

Closes #2106, Closes #2383
---
 THANKS                                        |   1 +
 docs/changelog.rst                            |   3 +
 docs/plugins.rst                              |   2 +-
 docs/settings.rst                             |  48 ++---
 pelican/generators.py                         | 177 +++++++++++-------
 pelican/settings.py                           |  28 ++-
 pelican/tests/default_conf.py                 |   2 +-
 pelican/tools/templates/publishconf.py.jinja2 |   2 +-
 samples/pelican.conf.py                       |   2 +-
 samples/pelican.conf_FR.py                    |   2 +-
 10 files changed, 165 insertions(+), 102 deletions(-)

diff --git a/THANKS b/THANKS
index cfa343f6..348c0b59 100644
--- a/THANKS
+++ b/THANKS
@@ -155,6 +155,7 @@ Tshepang Lekhonkhobe
 Valentin-Costel Hăloiu
 Vlad Niculae
 William Light
+William Minchin
 Wladislaw Merezhko
 W. Trevor King
 Zoresvit
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 858a6e1b..3d3fddc8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,9 @@ Release history
 Next release
 ============
 
+* All settings for slugs now use ``{slug}`` and/or ``{lang}`` rather than
+  ``%s``. If ``%s``-style settings are encountered, Pelican will emit a warning
+  and fallback to the default setting.
 * New signal: ``feed_generated``
 * Replace Fabric by Invoke and ``fabfile.py`` template by ``tasks.py``.
 * Replace ``SLUG_SUBSTITUTIONS`` (and friends) by ``SLUG_REGEX_SUBSTITUTIONS``
diff --git a/docs/plugins.rst b/docs/plugins.rst
index 4e0ec6d1..18c18364 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -60,7 +60,7 @@ which you map the signals to your plugin logic. Let's take a simple example::
     from pelican import signals
 
     def test(sender):
-        print "%s initialized !!" % sender
+        print("{} initialized !!".format(sender))
 
     def register():
         signals.initialized.connect(test)
diff --git a/docs/settings.rst b/docs/settings.rst
index 28b68980..7d5fa324 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -879,59 +879,61 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
    Relative URL of the all-posts RSS feed. If not set, ``FEED_ALL_RSS`` is used
    both for save location and URL.
 
-.. data:: CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
+.. data:: CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml'
 
    The location to save the category Atom feeds. [2]_
 
 .. data:: CATEGORY_FEED_ATOM_URL = None
 
-   Relative URL of the category Atom feeds, including the ``%s`` placeholder.
-   [2]_ If not set, ``CATEGORY_FEED_ATOM`` is used both for save location and
-   URL.
+   Relative URL of the category Atom feeds, including the ``{slug}``
+   placeholder. [2]_ If not set, ``CATEGORY_FEED_ATOM`` is used both for save
+   location and URL.
 
 .. data:: CATEGORY_FEED_RSS = None, i.e. no RSS
 
-   The location to save the category RSS feeds, including the ``%s``
+   The location to save the category RSS feeds, including the ``{slug}``
    placeholder. [2]_
 
 .. data:: CATEGORY_FEED_RSS_URL = None
 
-   Relative URL of the category RSS feeds, including the ``%s`` placeholder.
-   [2]_ If not set, ``CATEGORY_FEED_RSS`` is used both for save location and
-   URL.
+   Relative URL of the category RSS feeds, including the ``{slug}``
+   placeholder. [2]_ If not set, ``CATEGORY_FEED_RSS`` is used both for save
+   location and URL.
 
-.. data:: AUTHOR_FEED_ATOM = 'feeds/%s.atom.xml'
+.. data:: AUTHOR_FEED_ATOM = 'feeds/{slug}.atom.xml'
 
    The location to save the author Atom feeds. [2]_
 
 .. data:: AUTHOR_FEED_ATOM_URL = None
 
-   Relative URL of the author Atom feeds, including the ``%s`` placeholder.
+   Relative URL of the author Atom feeds, including the ``{slug}`` placeholder.
    [2]_ If not set, ``AUTHOR_FEED_ATOM`` is used both for save location and
    URL.
 
-.. data:: AUTHOR_FEED_RSS = 'feeds/%s.rss.xml'
+.. data:: AUTHOR_FEED_RSS = 'feeds/{slug}.rss.xml'
 
    The location to save the author RSS feeds. [2]_
 
 .. data:: AUTHOR_FEED_RSS_URL = None
 
-   Relative URL of the author RSS feeds, including the ``%s`` placeholder. [2]_
-   If not set, ``AUTHOR_FEED_RSS`` is used both for save location and URL.
+   Relative URL of the author RSS feeds, including the ``{slug}`` placeholder.
+   [2]_ If not set, ``AUTHOR_FEED_RSS`` is used both for save location and URL.
 
 .. data:: TAG_FEED_ATOM = None, i.e. no tag feed
 
-   The location to save the tag Atom feed, including the ``%s`` placeholder.
-   [2]_
+   The location to save the tag Atom feed, including the ``{slug}``
+   placeholder. [2]_
 
 .. data:: TAG_FEED_ATOM_URL = None
 
-   Relative URL of the tag Atom feed, including the ``%s`` placeholder. [2]_
+   Relative URL of the tag Atom feed, including the ``{slug}`` placeholder.
+   [2]_
 
 .. data:: TAG_FEED_RSS = None, i.e. no RSS tag feed
 
-   Relative URL to output the tag RSS feed, including the ``%s`` placeholder.
-   If not set, ``TAG_FEED_RSS`` is used both for save location and URL.
+   Relative URL to output the tag RSS feed, including the ``{slug}``
+   placeholder. If not set, ``TAG_FEED_RSS`` is used both for save location and
+   URL.
 
 .. data:: FEED_MAX_ITEMS
 
@@ -946,7 +948,7 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 
 If you don't want to generate some or any of these feeds, set the above variables to ``None``.
 
-.. [2] ``%s`` is replaced by name of the category / author / tag.
+.. [2] ``{slug}`` is replaced by name of the category / author / tag.
 
 
 FeedBurner
@@ -1050,13 +1052,13 @@ more information.
    of one another. May be a string or a collection of strings. Set to ``None``
    or ``False`` to disable the identification of translations.
 
-.. data:: TRANSLATION_FEED_ATOM = 'feeds/all-%s.atom.xml'
+.. data:: TRANSLATION_FEED_ATOM = 'feeds/all-{lang}.atom.xml'
 
    The location to save the Atom feed for translations. [3]_
 
 .. data:: TRANSLATION_FEED_ATOM_URL = None
 
-   Relative URL of the Atom feed for translations, including the ``%s``
+   Relative URL of the Atom feed for translations, including the ``{lang}``
    placeholder. [3]_ If not set, ``TRANSLATION_FEED_ATOM`` is used both for
    save location and URL.
 
@@ -1066,11 +1068,11 @@ more information.
 
 .. data:: TRANSLATION_FEED_RSS_URL = None
 
-   Relative URL of the RSS feed for translations, including the ``%s``
+   Relative URL of the RSS feed for translations, including the ``{lang}``
    placeholder. [3]_ If not set, ``TRANSLATION_FEED_RSS`` is used both for save
    location and URL.
 
-.. [3] %s is the language
+.. [3] {lang} is the language code
 
 
 Ordering content
diff --git a/pelican/generators.py b/pelican/generators.py
index 90e4c8a5..0e772a62 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -302,17 +302,21 @@ class ArticlesGenerator(CachingGenerator):
         """Generate the feeds from the current context, and output files."""
 
         if self.settings.get('FEED_ATOM'):
-            writer.write_feed(self.articles, self.context,
-                              self.settings['FEED_ATOM'],
-                              self.settings.get('FEED_ATOM_URL',
-                                                self.settings['FEED_ATOM']))
+            writer.write_feed(
+                self.articles,
+                self.context,
+                self.settings['FEED_ATOM'],
+                self.settings.get('FEED_ATOM_URL', self.settings['FEED_ATOM'])
+                )
 
         if self.settings.get('FEED_RSS'):
-            writer.write_feed(self.articles, self.context,
-                              self.settings['FEED_RSS'],
-                              self.settings.get('FEED_RSS_URL',
-                                                self.settings['FEED_RSS']),
-                              feed_type='rss')
+            writer.write_feed(
+                self.articles,
+                self.context,
+                self.settings['FEED_RSS'],
+                self.settings.get('FEED_RSS_URL', self.settings['FEED_RSS']),
+                feed_type='rss'
+                )
 
         if (self.settings.get('FEED_ALL_ATOM') or
                 self.settings.get('FEED_ALL_RSS')):
@@ -323,80 +327,105 @@ class ArticlesGenerator(CachingGenerator):
                           order_by=self.settings['ARTICLE_ORDER_BY'])
 
             if self.settings.get('FEED_ALL_ATOM'):
-                writer.write_feed(all_articles, self.context,
-                                  self.settings['FEED_ALL_ATOM'],
-                                  self.settings.get(
-                                      'FEED_ALL_ATOM_URL',
-                                      self.settings['FEED_ALL_ATOM']))
+                writer.write_feed(
+                    all_articles,
+                    self.context,
+                    self.settings['FEED_ALL_ATOM'],
+                    self.settings.get('FEED_ALL_ATOM_URL',
+                                      self.settings['FEED_ALL_ATOM'])
+                    )
 
             if self.settings.get('FEED_ALL_RSS'):
-                writer.write_feed(all_articles, self.context,
-                                  self.settings['FEED_ALL_RSS'],
-                                  self.settings.get(
-                                      'FEED_ALL_RSS_URL',
+                writer.write_feed(
+                    all_articles,
+                    self.context,
+                    self.settings['FEED_ALL_RSS'],
+                    self.settings.get('FEED_ALL_RSS_URL',
                                       self.settings['FEED_ALL_RSS']),
-                                  feed_type='rss')
+                    feed_type='rss'
+                    )
 
         for cat, arts in self.categories:
             if self.settings.get('CATEGORY_FEED_ATOM'):
-                writer.write_feed(arts, self.context,
-                                  self.settings['CATEGORY_FEED_ATOM']
-                                  % cat.slug,
-                                  self.settings.get(
-                                      'CATEGORY_FEED_ATOM_URL',
-                                      self.settings['CATEGORY_FEED_ATOM'])
-                                  % cat.slug, feed_title=cat.name)
+                writer.write_feed(
+                    arts,
+                    self.context,
+                    self.settings['CATEGORY_FEED_ATOM'].format(slug=cat.slug),
+                    self.settings.get(
+                        'CATEGORY_FEED_ATOM_URL',
+                        self.settings['CATEGORY_FEED_ATOM']).format(
+                            slug=cat.slug
+                        ),
+                    feed_title=cat.name
+                    )
 
             if self.settings.get('CATEGORY_FEED_RSS'):
-                writer.write_feed(arts, self.context,
-                                  self.settings['CATEGORY_FEED_RSS']
-                                  % cat.slug,
-                                  self.settings.get(
-                                      'CATEGORY_FEED_RSS_URL',
-                                      self.settings['CATEGORY_FEED_RSS'])
-                                  % cat.slug, feed_title=cat.name,
-                                  feed_type='rss')
+                writer.write_feed(
+                    arts,
+                    self.context,
+                    self.settings['CATEGORY_FEED_RSS'].format(slug=cat.slug),
+                    self.settings.get(
+                        'CATEGORY_FEED_RSS_URL',
+                        self.settings['CATEGORY_FEED_RSS']).format(
+                            slug=cat.slug
+                        ),
+                    feed_title=cat.name,
+                    feed_type='rss'
+                    )
 
         for auth, arts in self.authors:
             if self.settings.get('AUTHOR_FEED_ATOM'):
-                writer.write_feed(arts, self.context,
-                                  self.settings['AUTHOR_FEED_ATOM']
-                                  % auth.slug,
-                                  self.settings.get(
-                                      'AUTHOR_FEED_ATOM_URL',
-                                      self.settings['AUTHOR_FEED_ATOM'])
-                                  % auth.slug, feed_title=auth.name)
+                writer.write_feed(
+                    arts,
+                    self.context,
+                    self.settings['AUTHOR_FEED_ATOM'].format(slug=auth.slug),
+                    self.settings.get(
+                        'AUTHOR_FEED_ATOM_URL',
+                        self.settings['AUTHOR_FEED_ATOM']
+                        ).format(slug=auth.slug),
+                    feed_title=auth.name
+                    )
 
             if self.settings.get('AUTHOR_FEED_RSS'):
-                writer.write_feed(arts, self.context,
-                                  self.settings['AUTHOR_FEED_RSS']
-                                  % auth.slug,
-                                  self.settings.get(
-                                      'AUTHOR_FEED_RSS_URL',
-                                      self.settings['AUTHOR_FEED_RSS'])
-                                  % auth.slug, feed_title=auth.name,
-                                  feed_type='rss')
+                writer.write_feed(
+                    arts,
+                    self.context,
+                    self.settings['AUTHOR_FEED_RSS'].format(slug=auth.slug),
+                    self.settings.get(
+                        'AUTHOR_FEED_RSS_URL',
+                        self.settings['AUTHOR_FEED_RSS']
+                        ).format(slug=auth.slug),
+                    feed_title=auth.name,
+                    feed_type='rss'
+                    )
 
         if (self.settings.get('TAG_FEED_ATOM') or
                 self.settings.get('TAG_FEED_RSS')):
             for tag, arts in self.tags.items():
                 if self.settings.get('TAG_FEED_ATOM'):
-                    writer.write_feed(arts, self.context,
-                                      self.settings['TAG_FEED_ATOM']
-                                      % tag.slug,
-                                      self.settings.get(
-                                          'TAG_FEED_ATOM_URL',
-                                          self.settings['TAG_FEED_ATOM'])
-                                      % tag.slug, feed_title=tag.name)
+                    writer.write_feed(
+                        arts,
+                        self.context,
+                        self.settings['TAG_FEED_ATOM'].format(slug=tag.slug),
+                        self.settings.get(
+                            'TAG_FEED_ATOM_URL',
+                            self.settings['TAG_FEED_ATOM']
+                            ).format(slug=tag.slug),
+                        feed_title=tag.name
+                        )
 
                 if self.settings.get('TAG_FEED_RSS'):
-                    writer.write_feed(arts, self.context,
-                                      self.settings['TAG_FEED_RSS'] % tag.slug,
-                                      self.settings.get(
-                                          'TAG_FEED_RSS_URL',
-                                          self.settings['TAG_FEED_RSS'])
-                                      % tag.slug, feed_title=tag.name,
-                                      feed_type='rss')
+                    writer.write_feed(
+                        arts,
+                        self.context,
+                        self.settings['TAG_FEED_RSS'].format(slug=tag.slug),
+                        self.settings.get(
+                            'TAG_FEED_RSS_URL',
+                            self.settings['TAG_FEED_RSS']
+                            ).format(slug=tag.slug),
+                        feed_title=tag.name,
+                        feed_type='rss'
+                        )
 
         if (self.settings.get('TRANSLATION_FEED_ATOM') or
                 self.settings.get('TRANSLATION_FEED_RSS')):
@@ -409,19 +438,27 @@ class ArticlesGenerator(CachingGenerator):
                     items, order_by=self.settings['ARTICLE_ORDER_BY'])
                 if self.settings.get('TRANSLATION_FEED_ATOM'):
                     writer.write_feed(
-                        items, self.context,
-                        self.settings['TRANSLATION_FEED_ATOM'] % lang,
+                        items,
+                        self.context,
+                        self.settings['TRANSLATION_FEED_ATOM']
+                            .format(lang=lang),
                         self.settings.get(
                             'TRANSLATION_FEED_ATOM_URL',
-                            self.settings['TRANSLATION_FEED_ATOM']) % lang)
+                            self.settings['TRANSLATION_FEED_ATOM']
+                            ).format(lang=lang),
+                        )
                 if self.settings.get('TRANSLATION_FEED_RSS'):
                     writer.write_feed(
-                        items, self.context,
-                        self.settings['TRANSLATION_FEED_RSS'] % lang,
+                        items,
+                        self.context,
+                        self.settings['TRANSLATION_FEED_RSS']
+                            .format(lang=lang),
                         self.settings.get(
                             'TRANSLATION_FEED_RSS_URL',
-                            self.settings['TRANSLATION_FEED_RSS']) % lang,
-                        feed_type='rss')
+                            self.settings['TRANSLATION_FEED_RSS']
+                            ).format(lang=lang),
+                        feed_type='rss'
+                        )
 
     def generate_articles(self, write):
         """Generate the articles."""
diff --git a/pelican/settings.py b/pelican/settings.py
index 0bf4284a..6907051c 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -45,10 +45,10 @@ DEFAULT_CONFIG = {
     'THEME_STATIC_DIR': 'theme',
     'THEME_STATIC_PATHS': ['static', ],
     'FEED_ALL_ATOM': posix_join('feeds', 'all.atom.xml'),
-    'CATEGORY_FEED_ATOM': posix_join('feeds', '%s.atom.xml'),
-    'AUTHOR_FEED_ATOM': posix_join('feeds', '%s.atom.xml'),
-    'AUTHOR_FEED_RSS': posix_join('feeds', '%s.rss.xml'),
-    'TRANSLATION_FEED_ATOM': posix_join('feeds', 'all-%s.atom.xml'),
+    'CATEGORY_FEED_ATOM': posix_join('feeds', '{slug}.atom.xml'),
+    'AUTHOR_FEED_ATOM': posix_join('feeds', '{slug}.atom.xml'),
+    'AUTHOR_FEED_RSS': posix_join('feeds', '{slug}.rss.xml'),
+    'TRANSLATION_FEED_ATOM': posix_join('feeds', 'all-{lang}.atom.xml'),
     'FEED_MAX_ITEMS': '',
     'RSS_FEED_SUMMARY_ONLY': True,
     'SITEURL': '',
@@ -385,6 +385,26 @@ def handle_deprecated_settings(settings):
                 settings[f + '_REGEX_SUBSTITUTIONS'] = regex_subs
             settings.pop(f + '_SUBSTITUTIONS', None)
 
+    # `%s` -> '{slug}` or `{lang}` in FEED settings
+        for key in ['TRANSLATION_FEED_ATOM',
+                    'TRANSLATION_FEED_RSS'
+                    ]:
+            if key in settings and '%s' in settings[key]:
+                logger.warning('%%s usage in %s is deprecated, use {lang} '
+                               'instead. Falling back to default.', key)
+                settings[key] = DEFAULT_CONFIG[key]
+        for key in ['AUTHOR_FEED_ATOM',
+                    'AUTHOR_FEED_RSS',
+                    'CATEGORY_FEED_ATOM',
+                    'CATEGORY_FEED_RSS',
+                    'TAG_FEED_ATOM',
+                    'TAG_FEED_RSS',
+                    ]:
+            if key in settings and '%s' in settings[key]:
+                logger.warning('%%s usage in %s is deprecated, use {slug} '
+                               'instead. Falling back to default.', key)
+                settings[key] = DEFAULT_CONFIG[key]
+
     return settings
 
 
diff --git a/pelican/tests/default_conf.py b/pelican/tests/default_conf.py
index 77c2b947..a567dc10 100644
--- a/pelican/tests/default_conf.py
+++ b/pelican/tests/default_conf.py
@@ -12,7 +12,7 @@ REVERSE_CATEGORY_ORDER = True
 DEFAULT_PAGINATION = 2
 
 FEED_RSS = 'feeds/all.rss.xml'
-CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'
+CATEGORY_FEED_RSS = 'feeds/{slug}.rss.xml'
 
 LINKS = (('Biologeek', 'http://biologeek.org'),
          ('Filyb', "http://filyb.info/"),
diff --git a/pelican/tools/templates/publishconf.py.jinja2 b/pelican/tools/templates/publishconf.py.jinja2
index 4b9a7cba..913de7f1 100755
--- a/pelican/tools/templates/publishconf.py.jinja2
+++ b/pelican/tools/templates/publishconf.py.jinja2
@@ -15,7 +15,7 @@ SITEURL = '{{siteurl}}'
 RELATIVE_URLS = False
 
 FEED_ALL_ATOM = 'feeds/all.atom.xml'
-CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
+CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml'
 
 DELETE_OUTPUT_DIRECTORY = True
 
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index da5c5dc5..0f67ee83 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -18,7 +18,7 @@ DEFAULT_PAGINATION = 4
 DEFAULT_DATE = (2012, 3, 2, 14, 1, 1)
 
 FEED_ALL_RSS = 'feeds/all.rss.xml'
-CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'
+CATEGORY_FEED_RSS = 'feeds/{slug}.rss.xml'
 
 LINKS = (('Biologeek', 'http://biologeek.org'),
          ('Filyb', "http://filyb.info/"),
diff --git a/samples/pelican.conf_FR.py b/samples/pelican.conf_FR.py
index 54b348c4..b1571e8a 100644
--- a/samples/pelican.conf_FR.py
+++ b/samples/pelican.conf_FR.py
@@ -22,7 +22,7 @@ ARTICLE_URL = 'posts/{date:%Y}/{date:%B}/{date:%d}/{slug}/'
 ARTICLE_SAVE_AS = ARTICLE_URL + 'index.html'
 
 FEED_ALL_RSS = 'feeds/all.rss.xml'
-CATEGORY_FEED_RSS = 'feeds/%s.rss.xml'
+CATEGORY_FEED_RSS = 'feeds/{slug}.rss.xml'
 
 LINKS = (('Biologeek', 'http://biologeek.org'),
          ('Filyb', "http://filyb.info/"),

From a06fd61ffc731e0b669303a53f4a03883b20145d Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Sat, 3 Nov 2018 11:09:17 -0600
Subject: [PATCH 2092/2864] fix indent

The indent appears to have been messed up on the merge.
---
 pelican/settings.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 6907051c..3119a0b9 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -386,24 +386,24 @@ def handle_deprecated_settings(settings):
             settings.pop(f + '_SUBSTITUTIONS', None)
 
     # `%s` -> '{slug}` or `{lang}` in FEED settings
-        for key in ['TRANSLATION_FEED_ATOM',
-                    'TRANSLATION_FEED_RSS'
-                    ]:
-            if key in settings and '%s' in settings[key]:
-                logger.warning('%%s usage in %s is deprecated, use {lang} '
-                               'instead. Falling back to default.', key)
-                settings[key] = DEFAULT_CONFIG[key]
-        for key in ['AUTHOR_FEED_ATOM',
-                    'AUTHOR_FEED_RSS',
-                    'CATEGORY_FEED_ATOM',
-                    'CATEGORY_FEED_RSS',
-                    'TAG_FEED_ATOM',
-                    'TAG_FEED_RSS',
-                    ]:
-            if key in settings and '%s' in settings[key]:
-                logger.warning('%%s usage in %s is deprecated, use {slug} '
-                               'instead. Falling back to default.', key)
-                settings[key] = DEFAULT_CONFIG[key]
+    for key in ['TRANSLATION_FEED_ATOM',
+                'TRANSLATION_FEED_RSS'
+                ]:
+        if key in settings and '%s' in settings[key]:
+            logger.warning('%%s usage in %s is deprecated, use {lang} '
+                            'instead. Falling back to default.', key)
+            settings[key] = DEFAULT_CONFIG[key]
+    for key in ['AUTHOR_FEED_ATOM',
+                'AUTHOR_FEED_RSS',
+                'CATEGORY_FEED_ATOM',
+                'CATEGORY_FEED_RSS',
+                'TAG_FEED_ATOM',
+                'TAG_FEED_RSS',
+                ]:
+        if key in settings and '%s' in settings[key]:
+            logger.warning('%%s usage in %s is deprecated, use {slug} '
+                            'instead. Falling back to default.', key)
+            settings[key] = DEFAULT_CONFIG[key]
 
     return settings
 

From cbf4c3cae2e0829ce48a7eb1c2880cda26458d56 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Tue, 6 Nov 2018 09:10:00 +0100
Subject: [PATCH 2093/2864] importer docs: warn about multiple categories in
 wordpress

---
 docs/importer.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/importer.rst b/docs/importer.rst
index 0f940808..674dd9b1 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -20,6 +20,12 @@ The conversion from HTML to reStructuredText or Markdown relies on `Pandoc`_.
 For Dotclear, if the source posts are written with Markdown syntax, they will
 not be converted (as Pelican also supports Markdown).
 
+.. note::
+
+   Unlike Pelican, Wordpress supports multiple categories per article. These
+   are imported as a comma-separated string. You have to resolve these
+   manually, or use a plugin that enables multiple categories per article
+   (like `more_categories`_).
 
 Dependencies
 ============
@@ -133,3 +139,5 @@ To test the module, one can use sample files:
 
 - for WordPress: http://www.wpbeginner.com/wp-themes/how-to-add-dummy-content-for-theme-development-in-wordpress/
 - for Dotclear: http://media.dotaddict.org/tda/downloads/lorem-backup.txt
+
+.. _more_categories: http://github.com/getpelican/pelican-plugins/tree/master/more_categories
\ No newline at end of file

From 5ff553f6f337f2ddcb6173bd80af138cdbd298ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 10 Nov 2018 19:42:59 +0100
Subject: [PATCH 2094/2864] Add tests verifying graceful handling on reST
 errors.

Currently all fail.
---
 pelican/tests/parse_error/parse_error.rst |  4 ++++
 pelican/tests/test_pelican.py             | 15 +++++++++++++++
 pelican/tests/test_readers.py             |  6 ++++++
 3 files changed, 25 insertions(+)
 create mode 100644 pelican/tests/parse_error/parse_error.rst

diff --git a/pelican/tests/parse_error/parse_error.rst b/pelican/tests/parse_error/parse_error.rst
new file mode 100644
index 00000000..7aee68e1
--- /dev/null
+++ b/pelican/tests/parse_error/parse_error.rst
@@ -0,0 +1,4 @@
+Page with a parse error
+#############
+
+The underline is too short.
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 273fc430..adc07072 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -225,3 +225,18 @@ class TestPelican(LoggedTestCase):
             count=1,
             msg="MD_EXTENSIONS is deprecated use MARKDOWN instead.",
             level=logging.WARNING)
+
+    def test_parse_errors(self):
+        # Verify that just an error is printed and the application doesn't
+        # abort, exit or something.
+        settings = read_settings(path=None, override={
+            'PATH': os.path.abspath(os.path.join(CURRENT_DIR, 'parse_error')),
+            'OUTPUT_PATH': self.temp_path,
+            'CACHE_PATH': self.temp_cache,
+        })
+        pelican = Pelican(settings=settings)
+        mute(True)(pelican.run)()
+        self.assertLogCountEqual(
+            count=1,
+            msg="Could not process .*parse_error.rst",
+            level=logging.ERROR)
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 4db4938e..81a7d92d 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -410,6 +410,12 @@ class RstReaderTest(ReaderTest):
         self.assertEqual(tuple_date.metadata['date'],
                          string_date.metadata['date'])
 
+    def test_parse_error(self):
+        # Verify that it raises an Exception, not nothing and not SystemExit or
+        # some such
+        with six.assertRaisesRegex(self, Exception, "underline too short"):
+            self.read_file(path='../parse_error/parse_error.rst')
+
 
 @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
 class MdReaderTest(ReaderTest):

From 015eefe7de51eada383073711b99da23efa94285 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 10 Nov 2018 13:31:08 +0100
Subject: [PATCH 2095/2864] Let's handle reST errors in a simple and nice way,
 finally.

---
 pelican/readers.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 842602aa..b4bc9e91 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -12,6 +12,7 @@ import docutils.io
 from docutils.writers.html4css1 import HTMLTranslator, Writer
 
 import six
+from six import StringIO
 from six.moves.html_parser import HTMLParser
 
 from pelican import rstdirectives  # NOQA
@@ -256,7 +257,9 @@ class RstReader(BaseReader):
                         'syntax_highlight': 'short',
                         'input_encoding': 'utf-8',
                         'language_code': self.settings.get('DEFAULT_LANG'),
-                        'exit_status_level': 2,
+                        'halt_level': 2,
+                        'traceback': True,
+                        'warning_stream': StringIO(),
                         'embed_stylesheet': False}
         user_params = self.settings.get('DOCUTILS_SETTINGS')
         if user_params:
@@ -269,7 +272,7 @@ class RstReader(BaseReader):
         pub.set_components('standalone', 'restructuredtext', 'html')
         pub.process_programmatic_settings(None, extra_params, None)
         pub.set_source(source_path=source_path)
-        pub.publish(enable_exit_status=True)
+        pub.publish()
         return pub
 
     def read(self, source_path):

From dd76c7158f7e05b0d203818d3fe18bea26e48c3f Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 10 Nov 2018 13:57:27 +0100
Subject: [PATCH 2096/2864] Improve the looks of reST parser error output.

---
 pelican/log.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/log.py b/pelican/log.py
index 345f79d0..e7a6f317 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -24,6 +24,9 @@ class BaseFormatter(logging.Formatter):
         record.__dict__['customlevelname'] = customlevel
         # format multiline messages 'nicely' to make it clear they are together
         record.msg = record.msg.replace('\n', '\n  | ')
+        record.args = tuple(arg.replace('\n', '\n  | ') if
+                            isinstance(arg, six.string_types) else
+                            arg for arg in record.args)
         return super(BaseFormatter, self).format(record)
 
     def formatException(self, ei):

From c793e5c3949a382f4cf8d1e7b67362d6067d6f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 10 Nov 2018 20:53:04 +0100
Subject: [PATCH 2097/2864] Add a test for false-positive warnings about
 intersite links.

With the current implementation, links to articles/pages that have not
been processed yet are reported with a warning, yet later replaced with
a correct value. That's not wanted.
---
 .../cyclic_intersite_links/first-article.rst  |  7 ++++++
 .../cyclic_intersite_links/second-article.rst |  7 ++++++
 .../cyclic_intersite_links/third-article.rst  |  7 ++++++
 pelican/tests/test_pelican.py                 | 23 +++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 pelican/tests/cyclic_intersite_links/first-article.rst
 create mode 100644 pelican/tests/cyclic_intersite_links/second-article.rst
 create mode 100644 pelican/tests/cyclic_intersite_links/third-article.rst

diff --git a/pelican/tests/cyclic_intersite_links/first-article.rst b/pelican/tests/cyclic_intersite_links/first-article.rst
new file mode 100644
index 00000000..b9eb3f93
--- /dev/null
+++ b/pelican/tests/cyclic_intersite_links/first-article.rst
@@ -0,0 +1,7 @@
+First article
+#############
+
+:date: 2018-11-10
+:summary: Here's the `second <{filename}/second-article.rst>`_,
+    `third <{filename}/third-article.rst>`_ and a
+    `nonexistent article <{filename}/nonexistent.rst>`_.
diff --git a/pelican/tests/cyclic_intersite_links/second-article.rst b/pelican/tests/cyclic_intersite_links/second-article.rst
new file mode 100644
index 00000000..acb87d47
--- /dev/null
+++ b/pelican/tests/cyclic_intersite_links/second-article.rst
@@ -0,0 +1,7 @@
+Second article
+##############
+
+:date: 2018-11-10
+:summary: Here's the `first <{filename}/first-article.rst>`_,
+    `third <{filename}/third-article.rst>`_ and a
+    `nonexistent article <{filename}/nonexistent.rst>`_.
diff --git a/pelican/tests/cyclic_intersite_links/third-article.rst b/pelican/tests/cyclic_intersite_links/third-article.rst
new file mode 100644
index 00000000..4c7c1b76
--- /dev/null
+++ b/pelican/tests/cyclic_intersite_links/third-article.rst
@@ -0,0 +1,7 @@
+Third article
+#############
+
+:date: 2018-11-10
+:summary: Here's the `first <{filename}/first-article.rst>`_,
+    `second <{filename}/second-article.rst>`_ and a
+    `nonexistent article <{filename}/nonexistent.rst>`_.
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 273fc430..e547a69b 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -211,6 +211,29 @@ class TestPelican(LoggedTestCase):
             msg="Writing .*",
             level=logging.INFO)
 
+    def test_cyclic_intersite_links_no_warnings(self):
+        settings = read_settings(path=None, override={
+            'PATH': os.path.join(CURRENT_DIR, 'cyclic_intersite_links'),
+            'OUTPUT_PATH': self.temp_path,
+            'CACHE_PATH': self.temp_cache,
+        })
+        pelican = Pelican(settings=settings)
+        mute(True)(pelican.run)()
+        # There are four different intersite links:
+        # - one pointing to the second article from first and third
+        # - one pointing to the first article from second and third
+        # - one pointing to the third article from first and second
+        # - one pointing to a nonexistent from each
+        # If everything goes well, only the warning about the nonexistent
+        # article should be printed. Only two articles are not sufficient,
+        # since the first will always have _context['generated_content'] empty
+        # (thus skipping the link resolving) and the second will always have it
+        # non-empty, containing the first, thus always succeeding.
+        self.assertLogCountEqual(
+            count=1,
+            msg="Unable to find '.*\\.rst', skipping url replacement.",
+            level=logging.WARNING)
+
     def test_md_extensions_deprecation(self):
         """Test that a warning is issued if MD_EXTENSIONS is used"""
         settings = read_settings(path=None, override={

From 673e33840d124bc274805fe8ca3acb199d5c9cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 12 Sep 2018 12:56:24 +0200
Subject: [PATCH 2098/2864] Don't process metadata links before all files are
 present.

The refresh_metadata_intersite_links() is called again later, so this
bit was only causing everything to be processed twice. Besides
that, it makes the processing dependent on file order -- in particular,
when metadata references a file that was not parsed yet, it reported an
"Unable to find" warning. But everything is found in the second pass, so
this only causes a superflous false warning and no change to the output.

The related test now needs to call the
refresh_metadata_intersite_links() explicitly. That function is called
from Pelican.run() and all generators but the test processes just one
page so it has no chance of being called implicitly.

Related discussion: https://github.com/getpelican/pelican/pull/2288/files#r204337359
---
 pelican/contents.py            | 4 ----
 pelican/tests/test_contents.py | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 327adc72..dd2a74fa 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -142,10 +142,6 @@ class Content(object):
         if not hasattr(self, 'status'):
             self.status = getattr(self, 'default_status', None)
 
-        if (len(self._context.get('generated_content', [])) > 0 or
-                len(self._context.get('static_content', [])) > 0):
-            self.refresh_metadata_intersite_links()
-
         signals.content_object_init.send(self)
 
     def __str__(self):
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 21766359..da1a6ae2 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -333,6 +333,10 @@ class TestPage(LoggedTestCase):
         args['metadata']['custom'] = parsed
         args['context']['localsiteurl'] = 'http://notmyidea.org'
         p = Page(**args)
+        # This is called implicitly from all generators and Pelican.run() once
+        # all files are processed. Here we process just one page so it needs
+        # to be called explicitly.
+        p.refresh_metadata_intersite_links()
         self.assertEqual(p.summary, linked)
         self.assertEqual(p.custom, linked)
 

From 4df3b5156fb4da751b4a31aa77a1c39faf4f891d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 9 Oct 2018 23:39:41 +0200
Subject: [PATCH 2099/2864] Bring back Content._summary.

It's now just a (mutable) copy of metadata["summary"] and changes to it
are integrated back to the original.
---
 pelican/contents.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index dd2a74fa..8d534976 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -142,6 +142,10 @@ class Content(object):
         if not hasattr(self, 'status'):
             self.status = getattr(self, 'default_status', None)
 
+        # store the summary metadata if it is set
+        if 'summary' in metadata:
+            self._summary = metadata['summary']
+
         signals.content_object_init.send(self)
 
     def __str__(self):
@@ -465,7 +469,7 @@ class Content(object):
 
     def refresh_metadata_intersite_links(self):
         for key in self.settings['FORMATTED_FIELDS']:
-            if key in self.metadata:
+            if key in self.metadata and key != 'summary':
                 value = self._update_content(
                     self.metadata[key],
                     self.get_siteurl()
@@ -473,6 +477,16 @@ class Content(object):
                 self.metadata[key] = value
                 setattr(self, key.lower(), value)
 
+        # _summary is an internal variable that some plugins may be writing to,
+        # so ensure changes to it are picked up
+        if ('summary' in self.settings['FORMATTED_FIELDS'] and
+                'summary' in self.metadata):
+            self._summary = self._update_content(
+                self._summary,
+                self.get_siteurl()
+            )
+            self.metadata['summary'] = self._summary
+
 
 class Page(Content):
     mandatory_properties = ('title',)

From 686206161beb517d681c2cba59568c658e8576aa Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 11 Nov 2018 12:00:59 +0100
Subject: [PATCH 2100/2864] Fix example sites in metadata tags list test

---
 .../tests/content/article_with_multiple_metadata_tags.html    | 4 ++--
 pelican/tests/test_readers.py                                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/tests/content/article_with_multiple_metadata_tags.html b/pelican/tests/content/article_with_multiple_metadata_tags.html
index f03c0b46..b52fbcf7 100644
--- a/pelican/tests/content/article_with_multiple_metadata_tags.html
+++ b/pelican/tests/content/article_with_multiple_metadata_tags.html
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>Metadata tags as list!</title>
-        <meta name="custom_field" content="http://notmyidea.org" />
-        <meta name="custom_field" content="http://mrsenko.com" />
+        <meta name="custom_field" content="https://getpelican.com" />
+        <meta name="custom_field" content="https://www.eff.org" />
     </head>
     <body>
         When custom metadata tags are specified more than once
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 9c3db80d..b35a511e 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -666,7 +666,7 @@ class HTMLReaderTest(ReaderTest):
     def test_article_with_multiple_similar_metadata_tags(self):
         page = self.read_file(path='article_with_multiple_metadata_tags.html')
         expected = {
-            'custom_field': ['http://notmyidea.org', 'http://mrsenko.com'],
+            'custom_field': ['https://getpelican.com', 'https://www.eff.org'],
         }
 
         self.assertDictHasSubset(page.metadata, expected)

From 4d0de58409591187779814b5cc488d2558dedc68 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 11 Nov 2018 12:54:42 +0100
Subject: [PATCH 2101/2864] Fix PyCodeStyle violations

---
 pelican/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 3119a0b9..08a6c432 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -391,7 +391,7 @@ def handle_deprecated_settings(settings):
                 ]:
         if key in settings and '%s' in settings[key]:
             logger.warning('%%s usage in %s is deprecated, use {lang} '
-                            'instead. Falling back to default.', key)
+                           'instead. Falling back to default.', key)
             settings[key] = DEFAULT_CONFIG[key]
     for key in ['AUTHOR_FEED_ATOM',
                 'AUTHOR_FEED_RSS',
@@ -402,7 +402,7 @@ def handle_deprecated_settings(settings):
                 ]:
         if key in settings and '%s' in settings[key]:
             logger.warning('%%s usage in %s is deprecated, use {slug} '
-                            'instead. Falling back to default.', key)
+                           'instead. Falling back to default.', key)
             settings[key] = DEFAULT_CONFIG[key]
 
     return settings

From dc7579582ae9843b7bf485235bbeadf12b0f276e Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Sun, 11 Nov 2018 13:29:26 +0100
Subject: [PATCH 2102/2864] Add more changes to changelog

---
 docs/changelog.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0a229d30..229b4355 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,6 +9,9 @@ Next release
   and fallback to the default setting.
 * New signal: ``feed_generated``
 * Replace Fabric by Invoke and ``fabfile.py`` template by ``tasks.py``.
+* Replace ``PAGINATED_DIRECT_TEMPLATES`` by ``PAGINATED_TEMPLATES``, extending
+  control over pagination to all templates and making page size variable
+* Allow pages to have ``draft`` status
 * Replace ``SLUG_SUBSTITUTIONS`` (and friends) by ``SLUG_REGEX_SUBSTITUTIONS``
   for more finegrained control
 * ``'{base_name}'`` value in ``PAGINATION_PATTERNS`` setting no longer strips
@@ -21,6 +24,13 @@ Next release
   ``{static}`` and ``{attach}`` is automatically copied over even if not in
   ``STATIC_PATHS``
 * Make the HTML reader parse multiple occurrences of metadata tags as a list
+* New Blogger XML backup importer
+* Wordpress importer now updates file links to point to local copies if the
+  files were downloaded with ``--wp-attach``.
+* Importer no longer inserts extra newlines, to prevent breaking of HTML
+  attributes.
+* Pelican server now prioritises ``foo.html`` and ``foo/index.html`` over
+  ``foo/`` when resolving ``foo``.
 
 3.7.1 (2017-01-10)
 ==================

From d01614495fed0674d9c3745dc1bb76c3f98aff34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 10 Nov 2018 23:30:27 +0100
Subject: [PATCH 2103/2864] settings: test reading PAGINATED_DIRECT_TEMPLATES
 from pelicanconf.py.

At the moment aborts with the following:

      File "/usr/lib/python3.7/site-packages/pelican/settings.py", line 327, in handle_deprecated_settings
        if t not in settings['PAGINATED_TEMPLATES']:
    KeyError: 'PAGINATED_TEMPLATES'
---
 pelican/tests/test_settings.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 5e794dc5..bb05e2ae 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -187,6 +187,20 @@ class TestSettingsConfiguration(unittest.TestCase):
                          {'index': 10, 'category': None, 'archives': None})
         self.assertNotIn('PAGINATED_DIRECT_TEMPLATES', settings)
 
+    def test_deprecated_paginated_direct_templates_from_file(self):
+        # This is equivalent to reading a settings file that has
+        # PAGINATED_DIRECT_TEMPLATES defined but no PAGINATED_TEMPLATES.
+        settings = read_settings(None, override={
+            'PAGINATED_DIRECT_TEMPLATES': ['index', 'archives']
+        })
+        self.assertEqual(settings['PAGINATED_TEMPLATES'], {
+            'archives': None,
+            'author': None,
+            'index': None,
+            'category': None,
+            'tag': None})
+        self.assertNotIn('PAGINATED_DIRECT_TEMPLATES', settings)
+
     def test_theme_and_extra_templates_exception(self):
         settings = self.settings
         settings['EXTRA_TEMPLATES_PATHS'] = ['/ha']

From 4c3b6ac383115be4f6664d0e6389cdffd310b926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 11 Nov 2018 00:17:00 +0100
Subject: [PATCH 2104/2864] settings: add another consistency test for
 SLUG_SUBSTITUTIONS.

---
 pelican/tests/test_settings.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index bb05e2ae..a92cf09c 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -285,3 +285,14 @@ class TestSettingsConfiguration(unittest.TestCase):
         self.assertEqual(settings['AUTHOR_REGEX_SUBSTITUTIONS'],
                          [(r'Alexander\ Todorov', 'atodorov')] +
                          default_slug_regex_subs)
+
+    def test_deprecated_slug_substitutions_from_file(self):
+        # This is equivalent to reading a settings file that has
+        # SLUG_SUBSTITUTIONS defined but no SLUG_REGEX_SUBSTITUTIONS.
+        settings = read_settings(None, override={
+            'SLUG_SUBSTITUTIONS': [('C++', 'cpp')]
+        })
+        self.assertEqual(settings['SLUG_REGEX_SUBSTITUTIONS'],
+                         [(r'C\+\+', 'cpp')] +
+                         self.settings['SLUG_REGEX_SUBSTITUTIONS'])
+        self.assertNotIn('SLUG_SUBSTITUTIONS', settings)

From 74a2481bf3182f6e1b814eb02d52046d22905282 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 11 Nov 2018 13:57:13 +0100
Subject: [PATCH 2105/2864] settings: set backward-compatible
 PAGINATED_TEMPLATES if not present.

---
 pelican/settings.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pelican/settings.py b/pelican/settings.py
index 6907051c..b94859a6 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -323,6 +323,11 @@ def handle_deprecated_settings(settings):
             'PAGINATED_DIRECT_TEMPLATES', 'PAGINATED_TEMPLATES')
         logger.warning(message)
 
+        # set PAGINATED_TEMPLATES
+        if 'PAGINATED_TEMPLATES' not in settings:
+            settings['PAGINATED_TEMPLATES'] = {
+                'tag': None, 'category': None, 'author': None}
+
         for t in settings['PAGINATED_DIRECT_TEMPLATES']:
             if t not in settings['PAGINATED_TEMPLATES']:
                 settings['PAGINATED_TEMPLATES'][t] = None

From bc84075ded6c861bf28e58509a192ddb1362cbb6 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 11 Nov 2018 21:21:24 +0300
Subject: [PATCH 2106/2864] Make URLWrapper.slug settable again

Fixes #2242, Supersedes #2243
---
 pelican/urlwrappers.py | 44 +++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)

diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 860ca2ff..baa8eb23 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -36,9 +36,17 @@ class URLWrapper(object):
     @property
     def slug(self):
         if self._slug is None:
-            self._slug = slugify(
-                self.name,
-                regex_subs=self.settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
+            class_key = '{}_REGEX_SUBSTITUTIONS'.format(
+                self.__class__.__name__.upper())
+            if class_key in self.settings:
+                self._slug = slugify(
+                    self.name,
+                    regex_subs=self.settings[class_key])
+            else:
+                self._slug = slugify(
+                    self.name,
+                    regex_subs=self.settings.get(
+                        'SLUG_REGEX_SUBSTITUTIONS', []))
         return self._slug
 
     @slug.setter
@@ -113,39 +121,13 @@ class URLWrapper(object):
 
 
 class Category(URLWrapper):
-    @property
-    def slug(self):
-        if self._slug is None:
-            if 'CATEGORY_REGEX_SUBSTITUTIONS' in self.settings:
-                subs = self.settings['CATEGORY_REGEX_SUBSTITUTIONS']
-            else:
-                subs = self.settings.get('SLUG_REGEX_SUBSTITUTIONS', [])
-            self._slug = slugify(self.name, regex_subs=subs)
-        return self._slug
+    pass
 
 
 class Tag(URLWrapper):
     def __init__(self, name, *args, **kwargs):
         super(Tag, self).__init__(name.strip(), *args, **kwargs)
 
-    @property
-    def slug(self):
-        if self._slug is None:
-            if 'TAG_REGEX_SUBSTITUTIONS' in self.settings:
-                subs = self.settings['TAG_REGEX_SUBSTITUTIONS']
-            else:
-                subs = self.settings.get('SLUG_REGEX_SUBSTITUTIONS', [])
-            self._slug = slugify(self.name, regex_subs=subs)
-        return self._slug
-
 
 class Author(URLWrapper):
-    @property
-    def slug(self):
-        if self._slug is None:
-            if 'AUTHOR_REGEX_SUBSTITUTIONS' in self.settings:
-                subs = self.settings['AUTHOR_REGEX_SUBSTITUTIONS']
-            else:
-                subs = self.settings.get('SLUG_REGEX_SUBSTITUTIONS', [])
-            self._slug = slugify(self.name, regex_subs=subs)
-        return self._slug
+    pass

From b1d44c1c871acee8687b93ba34d6354f1a56d63f Mon Sep 17 00:00:00 2001
From: Andrew Jorgensen <andrew@jorgensenfamily.us>
Date: Fri, 9 Nov 2018 10:33:36 -0800
Subject: [PATCH 2107/2864] Replace %s rather than fallback to defaults

3a0add4b6e66fe08e9f5710f98235491c09e4f81 caused existing configs to fall
back to defaults. But since we know exactly how to fix the user config
so that the behavior doesn't change, we should do so, while still
warning that use of %s is deprecated.

Also fixes a bug where we tried to look for %s in None.
---
 pelican/settings.py            | 40 +++++++++++++++++++++++++++++-----
 pelican/tests/test_settings.py |  9 ++++++++
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index f681a182..b963007a 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -245,6 +245,22 @@ def get_jinja_environment(settings):
     return settings
 
 
+def _printf_s_to_format_field(printf_string, format_field):
+    """Tries to replace %s with {format_field} in the provided printf_string.
+    Raises ValueError in case of failure.
+    """
+    TEST_STRING = 'PELICAN_PRINTF_S_DEPRECATION'
+    expected = printf_string % TEST_STRING
+
+    result = printf_string.replace('{', '{{').replace('}', '}}') \
+        % '{{{}}}'.format(format_field)
+    if result.format(**{format_field: TEST_STRING}) != expected:
+        raise ValueError('Failed to safely replace %s with {{{}}}'.format(
+            format_field))
+
+    return result
+
+
 def handle_deprecated_settings(settings):
     """Converts deprecated settings and issues warnings. Issues an exception
     if both old and new setting is specified.
@@ -394,10 +410,16 @@ def handle_deprecated_settings(settings):
     for key in ['TRANSLATION_FEED_ATOM',
                 'TRANSLATION_FEED_RSS'
                 ]:
-        if key in settings and '%s' in settings[key]:
+        if settings.get(key) and '%s' in settings[key]:
             logger.warning('%%s usage in %s is deprecated, use {lang} '
-                           'instead. Falling back to default.', key)
-            settings[key] = DEFAULT_CONFIG[key]
+                           'instead.', key)
+            try:
+                settings[key] = _printf_s_to_format_field(
+                    settings[key], 'lang')
+            except ValueError:
+                logger.warning('Failed to convert %%s to {lang} for %s. '
+                               'Falling back to default.', key)
+                settings[key] = DEFAULT_CONFIG[key]
     for key in ['AUTHOR_FEED_ATOM',
                 'AUTHOR_FEED_RSS',
                 'CATEGORY_FEED_ATOM',
@@ -405,10 +427,16 @@ def handle_deprecated_settings(settings):
                 'TAG_FEED_ATOM',
                 'TAG_FEED_RSS',
                 ]:
-        if key in settings and '%s' in settings[key]:
+        if settings.get(key) and '%s' in settings[key]:
             logger.warning('%%s usage in %s is deprecated, use {slug} '
-                           'instead. Falling back to default.', key)
-            settings[key] = DEFAULT_CONFIG[key]
+                           'instead.', key)
+            try:
+                settings[key] = _printf_s_to_format_field(
+                    settings[key], 'slug')
+            except ValueError:
+                logger.warning('Failed to convert %%s to {slug} for %s. '
+                               'Falling back to default.', key)
+                settings[key] = DEFAULT_CONFIG[key]
 
     return settings
 
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index a92cf09c..21759d40 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -9,6 +9,7 @@ from sys import platform
 
 
 from pelican.settings import (DEFAULT_CONFIG, DEFAULT_THEME,
+                              _printf_s_to_format_field,
                               configure_settings, handle_deprecated_settings,
                               read_settings)
 from pelican.tests.support import unittest
@@ -168,6 +169,14 @@ class TestSettingsConfiguration(unittest.TestCase):
 
         self.assertRaises(Exception, configure_settings, settings)
 
+    def test__printf_s_to_format_field(self):
+        for s in ('%s', '{%s}', '{%s'):
+            option = 'foo/{}/bar.baz'.format(s)
+            result = _printf_s_to_format_field(option, 'slug')
+            expected = option % 'qux'
+            found = result.format(slug='qux')
+            self.assertEqual(expected, found)
+
     def test_deprecated_extra_templates_paths(self):
         settings = self.settings
         settings['EXTRA_TEMPLATES_PATHS'] = ['/foo/bar', '/ha']

From 36293da1e0cfb3db778019164f9d9b9d0131de9d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 13 Nov 2018 08:40:56 +0100
Subject: [PATCH 2108/2864] Add more changelog entries

---
 docs/changelog.rst | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 229b4355..77860f5b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,14 +4,20 @@ Release history
 Next release
 ============
 
+* Replace ``develop_server.sh`` script with ``pelican --listen``
+* Improved copy/link behavior for large static files (e.g., videos)
+* New ``{static}`` syntax to link to static content; content linked to by
+  ``{static}`` and ``{attach}`` is automatically copied over even if not in
+  ``STATIC_PATHS``
+* Pages can now have ``draft`` status
+* Show current settings via new ``--print-settings`` flag
 * All settings for slugs now use ``{slug}`` and/or ``{lang}`` rather than
   ``%s``. If ``%s``-style settings are encountered, Pelican will emit a warning
   and fallback to the default setting.
-* New signal: ``feed_generated``
-* Replace Fabric by Invoke and ``fabfile.py`` template by ``tasks.py``.
+* New signals: ``feed_generated`` and ``page_generated_write_page``
+* Replace Fabric with Invoke and ``fabfile.py`` template with ``tasks.py``
 * Replace ``PAGINATED_DIRECT_TEMPLATES`` by ``PAGINATED_TEMPLATES``, extending
   control over pagination to all templates and making page size variable
-* Allow pages to have ``draft`` status
 * Replace ``SLUG_SUBSTITUTIONS`` (and friends) by ``SLUG_REGEX_SUBSTITUTIONS``
   for more finegrained control
 * ``'{base_name}'`` value in ``PAGINATION_PATTERNS`` setting no longer strips
@@ -20,9 +26,6 @@ Next release
   and author pages 2) feeds 3) draft and hidden articles and pages
 * New ``ARTICLE_TRANSLATION_ID`` and ``PAGE_TRANSLATION_ID`` settings to
   specify metadata attributes used to identify/disable translations
-* New ``{static}`` syntax to link to static content; content linked to by
-  ``{static}`` and ``{attach}`` is automatically copied over even if not in
-  ``STATIC_PATHS``
 * Make the HTML reader parse multiple occurrences of metadata tags as a list
 * New Blogger XML backup importer
 * Wordpress importer now updates file links to point to local copies if the

From 940d4534a124271093414fbd392441d8528c0a9d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 13 Nov 2018 14:55:25 +0100
Subject: [PATCH 2109/2864] Prepare to release Pelican 4.0

---
 docs/changelog.rst  | 4 ++--
 docs/conf.py        | 2 +-
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 77860f5b..eeeab1df 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,8 +1,8 @@
 Release history
 ###############
 
-Next release
-============
+4.0.0 (2018-11-13)
+==================
 
 * Replace ``develop_server.sh`` script with ``pelican --listen``
 * Improved copy/link behavior for large static files (e.g., videos)
diff --git a/docs/conf.py b/docs/conf.py
index bfe5880c..76403159 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@ copyright = '2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
-last_stable = '3.7.1'
+last_stable = '4.0.0'
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index bc236708..c05f560c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -29,7 +29,7 @@ from pelican.utils import (clean_output_dir, file_watcher,
                            folder_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "3.7.2.dev0"
+__version__ = "4.0.0"
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 logger = logging.getLogger(__name__)
 
diff --git a/setup.py b/setup.py
index 06da7628..fe02fb6f 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ if sys.version_info.major < 3:
 
 setup(
     name='pelican',
-    version='3.7.2.dev0',
+    version='4.0.0',
     url='https://getpelican.com/',
     author='Alexis Metaireau',
     maintainer='Justin Mayer',

From 033d6ac4d676b4c376a21bb5d5ecafcba2f221cb Mon Sep 17 00:00:00 2001
From: Stuart Axon <stuaxo2@yahoo.com>
Date: Thu, 15 Nov 2018 13:44:30 +0000
Subject: [PATCH 2110/2864] pelican_import wordpress import

get_filename:
   use "post_name", where the parameter is the postname.
   fixup names that are entirely made up of spaces.
---
 pelican/tools/pelican_import.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 8bbc58a7..c11673f6 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -131,11 +131,11 @@ def xml_to_soup(xml):
     return soup
 
 
-def get_filename(filename, post_id):
-    if filename is not None:
-        return filename
-    else:
+def get_filename(post_name, post_id):
+    if post_name is None or post_name.isspace():
         return post_id
+    else:
+        return post_name
 
 
 def wp2fields(xml, wp_custpost=False):
@@ -154,9 +154,9 @@ def wp2fields(xml, wp_custpost=False):
                 title = 'No title [%s]' % item.find('post_name').string
                 logger.warning('Post "%s" is lacking a proper title', title)
 
-            filename = item.find('post_name').string
+            post_name = item.find('post_name').string
             post_id = item.find('post_id').string
-            filename = get_filename(filename, post_id)
+            filename = get_filename(post_name, post_id)
 
             content = item.find('encoded').string
             raw_date = item.find('post_date').string
@@ -690,14 +690,14 @@ def get_attachments(xml):
 
     for item in items:
         kind = item.find('post_type').string
-        filename = item.find('post_name').string
+        post_name = item.find('post_name').string
         post_id = item.find('post_id').string
 
         if kind == 'attachment':
             attachments.append((item.find('post_parent').string,
                                 item.find('attachment_url').string))
         else:
-            filename = get_filename(filename, post_id)
+            filename = get_filename(post_name, post_id)
             names[post_id] = filename
     attachedposts = defaultdict(list)
     for parent, url in attachments:

From 70b8ededa6279cd2ecfbbf91db9c5c1ea6860520 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Fri, 16 Nov 2018 18:09:22 +0100
Subject: [PATCH 2111/2864] Disinherit Page from Static so default draft status
 does not affect save_as

---
 pelican/contents.py            |  6 +++++-
 pelican/tests/test_contents.py | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 8d534976..21535ea0 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -527,7 +527,11 @@ class Article(Content):
 
 
 @python_2_unicode_compatible
-class Static(Page):
+class Static(Content):
+    mandatory_properties = ('title',)
+    default_status = 'published'
+    default_template = None
+
     def __init__(self, *args, **kwargs):
         super(Static, self).__init__(*args, **kwargs)
         self._output_location_referenced = False
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index da1a6ae2..8046d608 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -917,3 +917,18 @@ class TestStatic(LoggedTestCase):
                                    self.settings['INDEX_SAVE_AS'])) +
                          '">link</a>')
         self.assertEqual(content, expected_html)
+
+    def test_not_save_as_draft(self):
+        """Static.save_as is not affected by draft status."""
+
+        static = Static(
+            content=None,
+            metadata=dict(status='draft',),
+            settings=self.settings,
+            source_path=os.path.join('dir', 'foo.jpg'),
+            context=self.settings.copy())
+
+        expected_save_as = os.path.join('dir', 'foo.jpg')
+        self.assertEqual(static.status, 'draft')
+        self.assertEqual(static.save_as, expected_save_as)
+        self.assertEqual(static.url, path_to_url(expected_save_as))

From 4d1869002e198848465536a79c73a21dc82cbec3 Mon Sep 17 00:00:00 2001
From: Stuart Axon <stuaxo2@yahoo.com>
Date: Fri, 16 Nov 2018 13:54:18 +0000
Subject: [PATCH 2112/2864] Update pelican_import.py

Use a set to avoid downloading duplicate attachments on a post more than once.
---
 pelican/tests/test_importer.py  | 16 +++++++++-------
 pelican/tools/pelican_import.py |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 2cf05ba8..75358e84 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -417,20 +417,22 @@ class TestWordpressXMLAttachements(unittest.TestCase):
         self.assertTrue(self.attachments)
         for post in self.attachments.keys():
             if post is None:
-                expected = ('https://upload.wikimedia.org/wikipedia/commons/'
-                            'thumb/2/2c/Pelican_lakes_entrance02.jpg/'
-                            '240px-Pelican_lakes_entrance02.jpg')
-                self.assertEqual(self.attachments[post][0], expected)
+                expected = {
+                    ('https://upload.wikimedia.org/wikipedia/commons/'
+                     'thumb/2/2c/Pelican_lakes_entrance02.jpg/'
+                     '240px-Pelican_lakes_entrance02.jpg')
+                }
+                self.assertEqual(self.attachments[post], expected)
             elif post == 'with-excerpt':
                 expected_invalid = ('http://thisurlisinvalid.notarealdomain/'
                                     'not_an_image.jpg')
                 expected_pelikan = ('http://en.wikipedia.org/wiki/'
                                     'File:Pelikan_Walvis_Bay.jpg')
-                self.assertEqual(self.attachments[post][0], expected_invalid)
-                self.assertEqual(self.attachments[post][1], expected_pelikan)
+                self.assertEqual(self.attachments[post],
+                                 {expected_invalid, expected_pelikan})
             elif post == 'with-tags':
                 expected_invalid = ('http://thisurlisinvalid.notarealdomain')
-                self.assertEqual(self.attachments[post][0], expected_invalid)
+                self.assertEqual(self.attachments[post], {expected_invalid})
             else:
                 self.fail('all attachments should match to a '
                           'filename or None, {}'
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 8bbc58a7..6cd3adb2 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -699,7 +699,7 @@ def get_attachments(xml):
         else:
             filename = get_filename(filename, post_id)
             names[post_id] = filename
-    attachedposts = defaultdict(list)
+    attachedposts = defaultdict(set)
     for parent, url in attachments:
         try:
             parent_name = names[parent]
@@ -707,7 +707,7 @@ def get_attachments(xml):
             # attachment's parent is not a valid post
             parent_name = None
 
-        attachedposts[parent_name].append(url)
+        attachedposts[parent_name].add(url)
     return attachedposts
 
 

From 9ae32b8ff92b98c3baa04e5f92a590a7160b087a Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Sat, 24 Nov 2018 21:59:40 +0100
Subject: [PATCH 2113/2864] Try importing from collections.abc for
 compatibility with Python 3.8

---
 pelican/__init__.py | 5 ++++-
 pelican/log.py      | 6 +++++-
 pelican/utils.py    | 5 ++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index c05f560c..0a5080c3 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -2,7 +2,10 @@
 from __future__ import print_function, unicode_literals
 
 import argparse
-import collections
+try:
+    import collections.abc as collections
+except ImportError:
+    import collections
 import locale
 import logging
 import multiprocessing
diff --git a/pelican/log.py b/pelican/log.py
index e7a6f317..6f353264 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -5,7 +5,11 @@ import locale
 import logging
 import os
 import sys
-from collections import Mapping, defaultdict
+from collections import defaultdict
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
 
 import six
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 50d428a5..8ed08c2c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -12,7 +12,10 @@ import re
 import shutil
 import sys
 import traceback
-from collections import Hashable
+try:
+    from collections.abc import Hashable
+except ImportError:
+    from collections import Hashable
 from contextlib import contextmanager
 from functools import partial
 from itertools import groupby

From 6923a7bca0c15a5b31367e82b72812b2e20a2255 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Sun, 25 Nov 2018 13:27:18 +0100
Subject: [PATCH 2114/2864] Remove non-existent tag attribute handling from
 Content.url_format

---
 pelican/contents.py            |  1 -
 pelican/tests/test_contents.py | 15 +--------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 21535ea0..ccd38fe0 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -213,7 +213,6 @@ class Content(object):
             'lang': getattr(self, 'lang', 'en'),
             'date': getattr(self, 'date', SafeDatetime.now()),
             'author': self.author.slug if hasattr(self, 'author') else '',
-            'tag': self.tag.slug if hasattr(self, 'tag') else '',
             'category': self.category.slug if hasattr(self, 'category') else ''
         })
         return metadata
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 8046d608..de1edbc4 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -11,7 +11,7 @@ from jinja2.utils import generate_lorem_ipsum
 
 import six
 
-from pelican.contents import Article, Author, Category, Page, Static, Tag
+from pelican.contents import Article, Author, Category, Page, Static
 from pelican.settings import DEFAULT_CONFIG
 from pelican.signals import content_object_init
 from pelican.tests.support import LoggedTestCase, get_context, get_settings,\
@@ -609,19 +609,6 @@ class TestArticle(TestPage):
         article = Article(**article_kwargs)
         self.assertEqual(article.url, 'fedora.qa/this-week-in-fedora-qa/')
 
-    def test_slugify_tags_with_dots(self):
-        settings = get_settings()
-        settings['TAG_REGEX_SUBSTITUTIONS'] = [
-            ('Fedora QA', 'fedora.qa'),
-        ]
-        settings['ARTICLE_URL'] = '{tag}/{slug}/'
-        article_kwargs = self._copy_page_kwargs()
-        article_kwargs['metadata']['tag'] = Tag('Fedora QA', settings)
-        article_kwargs['metadata']['title'] = 'This Week in Fedora QA'
-        article_kwargs['settings'] = settings
-        article = Article(**article_kwargs)
-        self.assertEqual(article.url, 'fedora.qa/this-week-in-fedora-qa/')
-
     def test_valid_save_as_detects_breakout(self):
         settings = get_settings()
         article_kwargs = self._copy_page_kwargs()

From a3b256db1ed23d610f8d3e965cadbeb5abce9116 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 25 Nov 2018 21:43:40 +0300
Subject: [PATCH 2115/2864] Use pelican.server class in invoke template

---
 pelican/tools/templates/tasks.py.jinja2 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index f3049085..f022bfc0 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -4,14 +4,10 @@ import os
 import shutil
 import sys
 import datetime
-try:
-    import socketserver
-except ImportError:
-    import SocketServer as socketserver
 
 from invoke import task
 from invoke.util import cd
-from pelican.server import ComplexHTTPRequestHandler
+from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 
 CONFIG = {
     # Local path configuration (can be absolute or relative to tasks.py)
@@ -61,12 +57,12 @@ def regenerate(c):
 @task
 def serve(c):
     """Serve site at http://localhost:8000/"""
-    os.chdir(CONFIG['deploy_path'])
 
-    class AddressReuseTCPServer(socketserver.TCPServer):
+    class AddressReuseTCPServer(RootedHTTPServer):
         allow_reuse_address = True
 
     server = AddressReuseTCPServer(
+        CONFIG['deploy_path'],
         ('', CONFIG['port']),
         ComplexHTTPRequestHandler)
 

From 497271ea7ea9fe8c35ab112a9e4cdc209215a3a5 Mon Sep 17 00:00:00 2001
From: Bryan Brattlof <bryanbrattlof@gmail.com>
Date: Fri, 23 Nov 2018 16:20:31 -0600
Subject: [PATCH 2116/2864] List files missing tag needed to order content

---
 pelican/utils.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 50d428a5..32f508ae 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -763,9 +763,19 @@ def order_content(content_list, order_by='slug'):
                     content_list.sort(key=attrgetter(order_by),
                                       reverse=order_reversed)
                 except AttributeError:
-                    logger.warning(
-                        'There is no "%s" attribute in the item '
-                        'metadata. Defaulting to slug order.', order_by)
+                    for content in content_list:
+                        try:
+                            getattr(content, order_by)
+                        except AttributeError:
+                            logger.warning(
+                                'There is no "%s" attribute in "%s". '
+                                'Defaulting to slug order.',
+                                order_by,
+                                content.get_relative_source_path(),
+                                extra={
+                                    'limit_msg': ('More files are missing '
+                                                  'the needed attribute.')
+                                })
         else:
             logger.warning(
                 'Invalid *_ORDER_BY setting (%s).'

From 2afef16008fed2341ab45f5dbfba61b8ec142c51 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 25 Nov 2018 22:11:05 +0300
Subject: [PATCH 2117/2864] Use language_code if it is supported

---
 pelican/readers.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index dcfa8543..bacb45f8 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -9,6 +9,7 @@ from collections import OrderedDict
 import docutils
 import docutils.core
 import docutils.io
+from docutils.parsers.rst.languages import get_language as get_docutils_lang
 from docutils.writers.html4css1 import HTMLTranslator, Writer
 
 import six
@@ -218,6 +219,14 @@ class RstReader(BaseReader):
     def __init__(self, *args, **kwargs):
         super(RstReader, self).__init__(*args, **kwargs)
 
+        lang_code = self.settings.get('DEFAULT_LANG', 'en')
+        if get_docutils_lang(lang_code):
+            self._language_code = lang_code
+        else:
+            logger.warning("Docutils has no localization for '%s'."
+                           " Using 'en' instead.", lang_code)
+            self._language_code = 'en'
+
     def _parse_metadata(self, document, source_path):
         """Return the dict containing document metadata"""
         formatted_fields = self.settings['FORMATTED_FIELDS']
@@ -256,7 +265,7 @@ class RstReader(BaseReader):
         extra_params = {'initial_header_level': '2',
                         'syntax_highlight': 'short',
                         'input_encoding': 'utf-8',
-                        'language_code': self.settings.get('DEFAULT_LANG'),
+                        'language_code': self._language_code,
                         'halt_level': 2,
                         'traceback': True,
                         'warning_stream': StringIO(),

From ded234467d0f148a72008c08d4eb30c8e1b9228c Mon Sep 17 00:00:00 2001
From: Stuart Axon <stuaxo2@yahoo.com>
Date: Thu, 15 Nov 2018 15:12:20 +0000
Subject: [PATCH 2118/2864] Update pelican_import.py

pelican-import: Move pandoc check inside loop, fixing #2448
---
 pelican/tools/pelican_import.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 97df58ca..da636df5 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -739,9 +739,8 @@ def download_attachments(output_path, urls):
     return locations
 
 
-def is_pandoc_needed(fields):
-    in_markup_idx = 9
-    return filter(lambda f: f[in_markup_idx] in ('html', 'wp-html'), fields)
+def is_pandoc_needed(in_markup):
+    return in_markup in ('html', 'wp-html')
 
 
 def get_pandoc_version():
@@ -773,11 +772,6 @@ def fields2pelican(
 
     pandoc_version = get_pandoc_version()
 
-    if is_pandoc_needed(fields) and not pandoc_version:
-        error = ('Pandoc must be installed to complete the '
-                 'requested import action.')
-        exit(error)
-
     settings = read_settings()
     slug_subs = settings['SLUG_REGEX_SUBSTITUTIONS']
 
@@ -785,6 +779,11 @@ def fields2pelican(
             kind, in_markup) in fields:
         if filter_author and filter_author != author:
             continue
+        if is_pandoc_needed(in_markup) and not pandoc_version:
+            error = ('Pandoc must be installed to complete the '
+                     'requested import action.')
+            exit(error)
+
         slug = not disable_slugs and filename or None
 
         if wp_attach and attachments:

From 942e4622413a5098793a4201c076ec1366a2386e Mon Sep 17 00:00:00 2001
From: Stuart Axon <stu.axon@gmail.com>
Date: Thu, 15 Nov 2018 21:32:16 +0000
Subject: [PATCH 2119/2864] Don't convert posts to lists for wp importer.

---
 pelican/tests/test_importer.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 75358e84..7afaa479 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -91,8 +91,8 @@ class TestWordpressXmlImporter(unittest.TestCase):
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, str('C'))
-        self.posts = list(wp2fields(WORDPRESS_XML_SAMPLE))
-        self.custposts = list(wp2fields(WORDPRESS_XML_SAMPLE, True))
+        self.posts = wp2fields(WORDPRESS_XML_SAMPLE)
+        self.custposts = wp2fields(WORDPRESS_XML_SAMPLE, True)
 
     def tearDown(self):
         locale.setlocale(locale.LC_ALL, self.old_locale)
@@ -242,6 +242,8 @@ class TestWordpressXmlImporter(unittest.TestCase):
             self.assertFalse(out_name.endswith(filename))
 
     def test_can_toggle_raw_html_code_parsing(self):
+        test_posts = list(self.posts)
+        
         def r(f):
             with open(f, encoding='utf-8') as infile:
                 return infile.read()
@@ -250,16 +252,16 @@ class TestWordpressXmlImporter(unittest.TestCase):
         with temporary_folder() as temp:
 
             rst_files = (r(f) for f
-                         in silent_f2p(self.posts, 'markdown', temp))
+                         in silent_f2p(test_posts, 'markdown', temp))
             self.assertTrue(any('<iframe' in rst for rst in rst_files))
             rst_files = (r(f) for f
-                         in silent_f2p(self.posts, 'markdown',
+                         in silent_f2p(test_posts, 'markdown',
                                        temp, strip_raw=True))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
             # no effect in rst
-            rst_files = (r(f) for f in silent_f2p(self.posts, 'rst', temp))
+            rst_files = (r(f) for f in silent_f2p(test_posts, 'rst', temp))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
-            rst_files = (r(f) for f in silent_f2p(self.posts, 'rst', temp,
+            rst_files = (r(f) for f in silent_f2p(test_posts, 'rst', temp,
                          strip_raw=True))
             self.assertFalse(any('<iframe' in rst for rst in rst_files))
 

From a597a31dad07e3d0775d5d36cf0272901c28aab3 Mon Sep 17 00:00:00 2001
From: Stuart Axon <stu.axon@gmail.com>
Date: Thu, 15 Nov 2018 21:37:17 +0000
Subject: [PATCH 2120/2864] Make the blogger tests consistant with the wp ones
 - cast to list in test if needed.

---
 pelican/tests/test_importer.py  | 20 +++++++++++---------
 pelican/tools/pelican_import.py | 10 +++++++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 7afaa479..75310a80 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -44,7 +44,7 @@ class TestBloggerXmlImporter(unittest.TestCase):
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, str('C'))
-        self.posts = list(blogger2fields(BLOGGER_XML_SAMPLE))
+        self.posts = blogger2fields(BLOGGER_XML_SAMPLE)
 
     def tearDown(self):
         locale.setlocale(locale.LC_ALL, self.old_locale)
@@ -53,14 +53,15 @@ class TestBloggerXmlImporter(unittest.TestCase):
         """Check that importer only outputs pages, articles and comments,
         that these are correctly identified and that titles are correct.
         """
-        kinds = {x[8] for x in self.posts}
+        test_posts = list(self.posts)
+        kinds = {x[8] for x in test_posts}
         self.assertEqual({'page', 'article', 'comment'}, kinds)
-        page_titles = {x[0] for x in self.posts if x[8] == 'page'}
+        page_titles = {x[0] for x in test_posts if x[8] == 'page'}
         self.assertEqual({'Test page', 'Test page 2'}, page_titles)
-        article_titles = {x[0] for x in self.posts if x[8] == 'article'}
+        article_titles = {x[0] for x in test_posts if x[8] == 'article'}
         self.assertEqual({'Black as Egypt\'s Night', 'The Steel Windpipe'},
                          article_titles)
-        comment_titles = {x[0] for x in self.posts if x[8] == 'comment'}
+        comment_titles = {x[0] for x in test_posts if x[8] == 'comment'}
         self.assertEqual({'Mishka, always a pleasure to read your '
                           'adventures!...'},
                          comment_titles)
@@ -69,15 +70,16 @@ class TestBloggerXmlImporter(unittest.TestCase):
         """Check that importerer outputs only statuses 'published' and 'draft',
         that these are correctly identified and that filenames are correct.
         """
-        statuses = {x[7] for x in self.posts}
+        test_posts = list(self.posts)
+        statuses = {x[7] for x in test_posts}
         self.assertEqual({'published', 'draft'}, statuses)
 
-        draft_filenames = {x[2] for x in self.posts if x[7] == 'draft'}
+        draft_filenames = {x[2] for x in test_posts if x[7] == 'draft'}
         # draft filenames are id-based
         self.assertEqual({'page-4386962582497458967',
                           'post-1276418104709695660'}, draft_filenames)
 
-        published_filenames = {x[2] for x in self.posts if x[7] == 'published'}
+        published_filenames = {x[2] for x in test_posts if x[7] == 'published'}
         # published filenames are url-based, except comments
         self.assertEqual({'the-steel-windpipe',
                           'test-page',
@@ -243,7 +245,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
     def test_can_toggle_raw_html_code_parsing(self):
         test_posts = list(self.posts)
-        
+
         def r(f):
             with open(f, encoding='utf-8') as infile:
                 return infile.read()
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index da636df5..346fca16 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -771,6 +771,7 @@ def fields2pelican(
         wp_custpost=False, wp_attach=False, attachments=None):
 
     pandoc_version = get_pandoc_version()
+    posts_require_pandoc = []
 
     settings = read_settings()
     slug_subs = settings['SLUG_REGEX_SUBSTITUTIONS']
@@ -780,9 +781,7 @@ def fields2pelican(
         if filter_author and filter_author != author:
             continue
         if is_pandoc_needed(in_markup) and not pandoc_version:
-            error = ('Pandoc must be installed to complete the '
-                     'requested import action.')
-            exit(error)
+            posts_require_pandoc.append(filename)
 
         slug = not disable_slugs and filename or None
 
@@ -868,6 +867,11 @@ def fields2pelican(
 
         with open(out_filename, 'w', encoding='utf-8') as fs:
             fs.write(header + content)
+
+    if posts_require_pandoc:
+        logger.error("Pandoc must be installed to import the following posts:"
+                     "\n  {}".format("\n  ".join(posts_require_pandoc)))
+
     if wp_attach and attachments and None in attachments:
         print("downloading attachments that don't have a parent post")
         urls = attachments[None]

From 8aeed9b7bdf13e76bf1406a8c4fe0cd7998a4b71 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 27 Nov 2018 19:55:31 +0300
Subject: [PATCH 2121/2864] Refactor pelican.server logging

* Use pelican.log instead of default loggers
* Remove excessive logging (report failures if nothing matches, don't report successes)
---
 pelican/server.py | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pelican/server.py b/pelican/server.py
index 7e666e98..82ad70cd 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -17,6 +17,9 @@ from six.moves import BaseHTTPServer
 from six.moves import SimpleHTTPServer as srvmod
 from six.moves import urllib
 
+from pelican.log import init as init_logging
+logger = logging.getLogger(__name__)
+
 
 def parse_arguments():
     parser = argparse.ArgumentParser(
@@ -71,22 +74,23 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
         self.path = self.get_path_that_exists(original_path)
 
         if not self.path:
-            logging.warning("Unable to find `%s` or variations.",
-                            original_path)
             return
 
-        logging.info("Found `%s`.", self.path)
         srvmod.SimpleHTTPRequestHandler.do_GET(self)
 
     def get_path_that_exists(self, original_path):
         # Try to strip trailing slash
         original_path = original_path.rstrip('/')
         # Try to detect file by applying various suffixes
+        tries = []
         for suffix in self.SUFFIXES:
             path = original_path + suffix
             if os.path.exists(self.translate_path(path)):
                 return path
-            logging.info("Tried to find `%s`, but it doesn't exist.", path)
+            tries.append(path)
+        logger.warning("Unable to find `%s` or variations:\n%s",
+                       original_path,
+                       '\n'.join(tries))
         return None
 
     def guess_type(self, path):
@@ -108,11 +112,12 @@ class RootedHTTPServer(BaseHTTPServer.HTTPServer):
 
 
 if __name__ == '__main__':
-    logging.warning("'python -m pelican.server' is deprecated. The "
-                    "Pelican development server should be run via "
-                    "'pelican --listen' or 'pelican -l' (this can be combined "
-                    "with regeneration as 'pelican -lr'). Rerun 'pelican-"
-                    "quickstart' to get new Makefile and tasks.py files.")
+    init_logging(level=logging.INFO)
+    logger.warning("'python -m pelican.server' is deprecated.\nThe "
+                   "Pelican development server should be run via "
+                   "'pelican --listen' or 'pelican -l'.\nThis can be combined "
+                   "with regeneration as 'pelican -lr'.\nRerun 'pelican-"
+                   "quickstart' to get new Makefile and tasks.py files.")
     args = parse_arguments()
     RootedHTTPServer.allow_reuse_address = True
     try:
@@ -123,16 +128,16 @@ if __name__ == '__main__':
                 httpd.socket, keyfile=args.key,
                 certfile=args.cert, server_side=True)
     except ssl.SSLError as e:
-        logging.error("Couldn't open certificate file %s or key file %s",
-                      args.cert, args.key)
-        logging.error("Could not listen on port %s, server %s.",
-                      args.port, args.server)
+        logger.error("Couldn't open certificate file %s or key file %s",
+                     args.cert, args.key)
+        logger.error("Could not listen on port %s, server %s.",
+                     args.port, args.server)
         sys.exit(getattr(e, 'exitcode', 1))
 
-    logging.info("Serving at port %s, server %s.",
-                 args.port, args.server)
+    logger.info("Serving at port %s, server %s.",
+                args.port, args.server)
     try:
         httpd.serve_forever()
     except KeyboardInterrupt as e:
-        logging.info("Shutting down server.")
+        logger.info("Shutting down server.")
         httpd.socket.close()

From 59cca7adb5e24434cdaf186a2d9bcbc080681323 Mon Sep 17 00:00:00 2001
From: Bryan Brattlof <bryanbrattlof@gmail.com>
Date: Wed, 28 Nov 2018 10:31:21 -0600
Subject: [PATCH 2122/2864] Remove unnecessary whitespace stripping

---
 pelican/tools/templates/Makefile.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 147ce0aa..35f3a7fb 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -123,7 +123,7 @@ publish:
 ssh_upload: publish
 	scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
-{%- set upload = upload + ["rsync_upload"] -%}
+{% set upload = upload + ["rsync_upload"] %}
 rsync_upload: publish
 	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --cvs-exclude --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 

From f7e005cd0f8577c0151e243f0a1deb0b235815aa Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 29 Nov 2018 07:55:59 -0800
Subject: [PATCH 2123/2864] Add bug fixes to changelog

---
 docs/changelog.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index eeeab1df..6eb61c1e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,13 @@
 Release history
 ###############
 
+4.0.1 (2018-11-30)
+==================
+
+* Refactor ``pelican.server`` logging
+* Fix bug in which all static files were processed as "draft"
+* Bug fixes for Invoke/Makefile automation, Importer, and other miscellanea
+
 4.0.0 (2018-11-13)
 ==================
 

From 49c77d7412673c38306fd9a69a073544302148ba Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 29 Nov 2018 08:27:34 -0800
Subject: [PATCH 2124/2864] Add upgrade notes for slug-related settings

Refs #2442
---
 docs/changelog.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6eb61c1e..29350eb1 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,14 @@ Release history
 * Fix bug in which all static files were processed as "draft"
 * Bug fixes for Invoke/Makefile automation, Importer, and other miscellanea
 
+If upgrading from 3.7.x or earlier, please note that slug-related settings in
+4.0+ use ``{slug}`` and/or ``{lang}`` rather than ``%s``. If ``%s``-style
+settings are encountered, Pelican will emit a warning and fall back to the
+default setting. Some user-submitted themes might try to format setting values
+but fail upon site build with a ``TypeError``. In such cases, the theme needs
+to be updated. For example, instead of ``TAG_FEED_ATOM|format(tag.slug)``, use
+``TAG_FEED_ATOM|format(slug=tag.slug)``
+
 4.0.0 (2018-11-13)
 ==================
 

From 24d6efa9fda4ad45649ddf88c1c596193d589bf8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 30 Nov 2018 08:31:43 -0800
Subject: [PATCH 2125/2864] Prepare to release Pelican 4.0.1

---
 docs/conf.py        | 2 +-
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 76403159..bac5d9bf 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@ copyright = '2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
-last_stable = '4.0.0'
+last_stable = '4.0.1'
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index c05f560c..4743f4e3 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -29,7 +29,7 @@ from pelican.utils import (clean_output_dir, file_watcher,
                            folder_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "4.0.0"
+__version__ = "4.0.1"
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 logger = logging.getLogger(__name__)
 
diff --git a/setup.py b/setup.py
index fe02fb6f..a8dcae56 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ if sys.version_info.major < 3:
 
 setup(
     name='pelican',
-    version='4.0.0',
+    version='4.0.1',
     url='https://getpelican.com/',
     author='Alexis Metaireau',
     maintainer='Justin Mayer',

From 2f077037ba4c9d574a9c8a30e63b00f0faf598af Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 30 Nov 2018 09:00:11 -0800
Subject: [PATCH 2126/2864] Prepare for next version

---
 docs/changelog.rst  | 4 ++++
 pelican/__init__.py | 2 +-
 setup.py            | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 29350eb1..18bc5f81 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,10 @@
 Release history
 ###############
 
+Next Release
+==================
+
+
 4.0.1 (2018-11-30)
 ==================
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 4743f4e3..27fc7fba 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -29,7 +29,7 @@ from pelican.utils import (clean_output_dir, file_watcher,
                            folder_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "4.0.1"
+__version__ = "4.0.2.dev0"
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 logger = logging.getLogger(__name__)
 
diff --git a/setup.py b/setup.py
index a8dcae56..74d2d043 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ if sys.version_info.major < 3:
 
 setup(
     name='pelican',
-    version='4.0.1',
+    version='4.0.2.dev0',
     url='https://getpelican.com/',
     author='Alexis Metaireau',
     maintainer='Justin Mayer',

From 4a3a06af8a985bdf44901bca9ae47f397910cdee Mon Sep 17 00:00:00 2001
From: Kenneth Lyons <ixjlyons@gmail.com>
Date: Wed, 12 Dec 2018 13:25:14 -0800
Subject: [PATCH 2127/2864] Remove stopserver from .PHONY prereqs in Makefile
 template

---
 pelican/tools/templates/Makefile.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 35f3a7fb..91b44320 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -160,4 +160,4 @@ github: publish
 
 {% endif %}
 
-.PHONY: html help clean regenerate serve serve-global devserver stopserver publish {{ upload|join(" ") }}
+.PHONY: html help clean regenerate serve serve-global devserver publish {{ upload|join(" ") }}

From 1b8a7826c44f3817a04f9b5179968bed300dae14 Mon Sep 17 00:00:00 2001
From: Nicolas Le Manchet <nicolas@lemanchet.fr>
Date: Wed, 3 Oct 2018 21:53:24 +0200
Subject: [PATCH 2128/2864] Remove Atom summaries when they are unnecessary

Do not include a summary tag to Atom entries when:
- the summary is empty
- the summary and the full content are the same

Fixes #2403
---
 .../basic/feeds/alexis-metaireau.atom.xml     |  8 +----
 .../tests/output/basic/feeds/all-en.atom.xml  | 30 +++++-----------
 .../tests/output/basic/feeds/all-fr.atom.xml  |  3 +-
 pelican/tests/output/basic/feeds/all.atom.xml | 33 +++++------------
 pelican/tests/output/basic/feeds/bar.atom.xml |  8 +----
 .../tests/output/basic/feeds/cat1.atom.xml    | 13 +++----
 .../tests/output/basic/feeds/misc.atom.xml    |  9 ++---
 .../custom/feeds/alexis-metaireau.atom.xml    | 30 +++++-----------
 .../tests/output/custom/feeds/all-en.atom.xml | 30 +++++-----------
 .../tests/output/custom/feeds/all-fr.atom.xml |  6 ++--
 .../tests/output/custom/feeds/all.atom.xml    | 36 ++++++-------------
 .../tests/output/custom/feeds/bar.atom.xml    |  8 +----
 .../tests/output/custom/feeds/cat1.atom.xml   | 13 +++----
 .../tests/output/custom/feeds/misc.atom.xml   |  9 ++---
 .../feeds/alexis-metaireau.atom.xml           | 30 +++++-----------
 .../custom_locale/feeds/all-en.atom.xml       | 30 +++++-----------
 .../custom_locale/feeds/all-fr.atom.xml       |  6 ++--
 .../output/custom_locale/feeds/all.atom.xml   | 36 ++++++-------------
 .../output/custom_locale/feeds/bar.atom.xml   |  8 +----
 .../output/custom_locale/feeds/cat1.atom.xml  | 13 +++----
 .../output/custom_locale/feeds/misc.atom.xml  |  9 ++---
 pelican/writers.py                            | 28 ++++++++++++---
 22 files changed, 122 insertions(+), 274 deletions(-)

diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index 54378c52..a0cf576f 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -13,13 +13,7 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index b5965cc8..410d6855 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </content></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -27,13 +20,7 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
@@ -83,6 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index f0f05185..f4c1daf7 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 33e852a9..fcb4e401 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </content></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -29,13 +21,7 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
@@ -85,6 +71,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index 2d594f29..63d2dc24 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - bar</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - bar</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index e0e6153d..36312a89 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - cat1</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - cat1</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index edd2dfaf..5c672e95 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - misc</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - misc</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
@@ -47,6 +45,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index 684c3574..12519e14 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -27,13 +20,7 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
@@ -83,6 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 3de34964..d6dfd92f 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -27,13 +20,7 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
@@ -83,6 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index 31573dd0..2cdcfba7 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index f6a54cbb..2d890b99 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -31,13 +22,7 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
@@ -87,6 +72,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index 90d6e220..2ddcece8 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><subtitle>A personal blog.</subtitle><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><subtitle>A personal blog.</subtitle><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index eca9d3a5..ac77e9ad 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><subtitle>A personal blog.</subtitle><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><subtitle>A personal blog.</subtitle><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 40e40d77..1678e35a 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
@@ -47,6 +45,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index d3c498f8..e65c1498 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -27,13 +20,7 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
@@ -83,6 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index c3d37615..0862627c 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -27,13 +20,7 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
@@ -83,6 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
index e50dfb34..d76dbe0f 100644
--- a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index ed04561a..5b5e6a40 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><summary type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><summary type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
@@ -31,13 +22,7 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
@@ -87,6 +72,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index 03974937..6b0bfb10 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><summary type="html">&lt;div class="section" id="why-not"&gt;
-&lt;h2&gt;Why not ?&lt;/h2&gt;
-&lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !&lt;/p&gt;
-&lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
-&lt;/div&gt;
-</summary><content type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index 78ede4cb..7cc2f38e 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><summary type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</summary><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
-&lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><summary type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><summary type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><summary type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index d243086f..f871f134 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><summary type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><summary type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
@@ -47,6 +45,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</summary><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
 </content></entry></feed>
\ No newline at end of file
diff --git a/pelican/writers.py b/pelican/writers.py
index 9311aa10..bdaabd8d 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -55,17 +55,35 @@ class Writer(object):
     def _add_item_to_the_feed(self, feed, item):
         title = Markup(item.title).striptags()
         link = self.urljoiner(self.site_url, item.url)
-        is_rss = isinstance(feed, Rss201rev2Feed)
-        if not is_rss or self.settings.get('RSS_FEED_SUMMARY_ONLY'):
-            description = item.summary
+
+        if isinstance(feed, Rss201rev2Feed):
+            # RSS feeds use a single tag called 'description' for both the full
+            # content and the summary
+            content = None
+            if self.settings.get('RSS_FEED_SUMMARY_ONLY'):
+                description = item.summary
+            else:
+                description = item.get_content(self.site_url)
+
         else:
-            description = item.get_content(self.site_url)
+            # Atom feeds have two different tags for full content (called
+            # 'content' by feedgenerator) and summary (called 'description' by
+            # feedgenerator).
+            #
+            # It does not make sense to have the summary be the
+            # exact same thing as the full content. If we detect that
+            # they are we just remove the summary.
+            content = item.get_content(self.site_url)
+            description = item.summary
+            if description == content:
+                description = None
+
         feed.add_item(
             title=title,
             link=link,
             unique_id=get_tag_uri(link, item.date),
             description=description,
-            content=item.get_content(self.site_url),
+            content=content,
             categories=item.tags if hasattr(item, 'tags') else None,
             author_name=getattr(item, 'author', ''),
             pubdate=set_date_tzinfo(

From 58be4f0e042f152753640b44e545d25d4c1011b2 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Wed, 2 Jan 2019 13:13:16 +0100
Subject: [PATCH 2129/2864] Fix warning message

Add space between words 'static' and 'content'
---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index ccd38fe0..efaeb0a3 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -281,7 +281,7 @@ class Content(object):
                             if linked_content:
                                 logger.warning(
                                     '{filename} used for linking to static'
-                                    'content %s in %s. Use {static} instead',
+                                    ' content %s in %s. Use {static} instead',
                                     path,
                                     self.get_relative_source_path())
                                 return linked_content

From 94db14e801c58eb62df9588ae663eb40bbdf2c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 4 Jan 2019 17:08:32 +0100
Subject: [PATCH 2130/2864] docs: properly show escaped chars in
 SLUG_REGEX_SUBSTITUTIONS.

---
 docs/settings.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 640d0571..90b9e570 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -588,10 +588,10 @@ corresponding ``*_URL`` setting as string, while others hard-code them:
 ``'tags.html'``.
 
 .. data:: SLUG_REGEX_SUBSTITUTIONS = [
-        (r'[^\w\s-]', ''),  # remove non-alphabetical/whitespace/'-' chars
-        (r'(?u)\A\s*', ''),  # strip leading whitespace
-        (r'(?u)\s*\Z', ''),  # strip trailing whitespace
-        (r'[-\s]+', '-'),  # reduce multiple whitespace or '-' to single '-'
+        (r'[^\\w\\s-]', ''),  # remove non-alphabetical/whitespace/'-' chars
+        (r'(?u)\\A\\s*', ''),  # strip leading whitespace
+        (r'(?u)\\s*\\Z', ''),  # strip trailing whitespace
+        (r'[-\\s]+', '-'),  # reduce multiple whitespace or '-' to single '-'
     ]
 
    Regex substitutions to make when generating slugs of articles and pages.

From ec2a1bd42a5f2c9e92fb0f153c305e55bf1e90ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 4 Jan 2019 16:40:02 +0100
Subject: [PATCH 2131/2864] pagination: this lstrip() was way too hungry,
 eating absolute URLs.

Reverts back to how pagination worked for the {url} placeholder as I did
it in 182fb11c80935f2ef1661beaf1151969a24e833f. Absolute URLs with
one or two leading slashes were eaten by lstrip() and became relative,
which then caused broken links in my case.

Added extra comments to this piece of code (*and* the test) to make it
less likely that someone breaks this again in the future.
---
 pelican/paginator.py            | 12 +++++++++++-
 pelican/tests/test_paginator.py |  5 +++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pelican/paginator.py b/pelican/paginator.py
index ceabf43b..fe63863e 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -146,7 +146,17 @@ class Page(object):
         }
 
         ret = prop_value.format(**context)
-        ret = ret.lstrip('/')
+        # Remove a single leading slash, if any. This is done for backwards
+        # compatibility reasons. If a leading slash is needed (for URLs
+        # relative to server root or absolute URLs without the scheme such as
+        # //blog.my.site/), it can be worked around by prefixing the pagination
+        # pattern by an additional slash (which then gets removed, preserving
+        # the other slashes). This also means the following code *can't* be
+        # changed to lstrip() because that would remove all leading slashes and
+        # thus make the workaround impossible. See
+        # test_custom_pagination_pattern() for a verification of this.
+        if ret[0] == '/':
+            ret = ret[1:]
         return ret
 
     url = property(functools.partial(_from_settings, key='URL'))
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index e06075fe..4e3ef035 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -72,9 +72,10 @@ class TestPage(unittest.TestCase):
                        Article(**self.page_kwargs)]
         paginator = Paginator('blog/index.html', '//blog.my.site/',
                               object_list, settings, 1)
+        # The URL *has to* stay absolute (with // in the front), so verify that
         page1 = paginator.page(1)
         self.assertEqual(page1.save_as, 'blog/index.html')
-        self.assertEqual(page1.url, 'blog.my.site/')
+        self.assertEqual(page1.url, '//blog.my.site/')
         page2 = paginator.page(2)
         self.assertEqual(page2.save_as, 'blog/2/index.html')
-        self.assertEqual(page2.url, 'blog.my.site/2/')
+        self.assertEqual(page2.url, '//blog.my.site/2/')

From cc9598299d26ee39d6e256dbaa5ebbdff83039d1 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sat, 5 Jan 2019 15:52:05 +0100
Subject: [PATCH 2132/2864] Fix incorrect update note in changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 18bc5f81..cdd3697c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -18,7 +18,7 @@ settings are encountered, Pelican will emit a warning and fall back to the
 default setting. Some user-submitted themes might try to format setting values
 but fail upon site build with a ``TypeError``. In such cases, the theme needs
 to be updated. For example, instead of ``TAG_FEED_ATOM|format(tag.slug)``, use
-``TAG_FEED_ATOM|format(slug=tag.slug)``
+``TAG_FEED_ATOM.format(slug=tag.slug)``
 
 4.0.0 (2018-11-13)
 ==================

From 3cdf4fd4100763ff0a2c0d8bf45f8b9b49d79991 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Sat, 5 Jan 2019 19:19:46 +0100
Subject: [PATCH 2133/2864] reverts bug involving strftime accidentally
 introduced in feed importer

---
 pelican/tools/pelican_import.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 346fca16..e5686811 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -8,6 +8,7 @@ import os
 import re
 import subprocess
 import sys
+import time
 from codecs import open
 from collections import defaultdict
 
@@ -563,7 +564,7 @@ def feed2fields(file):
     settings = read_settings()
     subs = settings['SLUG_REGEX_SUBSTITUTIONS']
     for entry in d.entries:
-        date = (entry.updated_parsed.strftime('%Y-%m-%d %H:%M')
+        date = (time.strftime('%Y-%m-%d %H:%M', entry.updated_parsed)
                 if hasattr(entry, 'updated_parsed') else None)
         author = entry.author if hasattr(entry, 'author') else None
         tags = ([e['term'] for e in entry.tags]

From 2aebfd1cdc4ec7ba95bd091afbe0bd34357b1ba1 Mon Sep 17 00:00:00 2001
From: Roland Askew <rolandjamesaskew37@gmail.com>
Date: Sat, 12 Jan 2019 12:44:04 +1300
Subject: [PATCH 2134/2864] fix pelican-import error regarding wp-attach and
 Uncode

---
 pelican/tools/pelican_import.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 346fca16..a13ed699 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -12,7 +12,7 @@ from codecs import open
 from collections import defaultdict
 
 from six.moves.urllib.error import URLError
-from six.moves.urllib.parse import urlparse
+from six.moves.urllib.parse import quote, urlparse, urlsplit, urlunsplit
 from six.moves.urllib.request import urlretrieve
 
 # because logging.setLoggerClass has to be called before logging.getLogger
@@ -727,6 +727,12 @@ def download_attachments(output_path, urls):
             if sys.platform != 'win32' or ':' not in item:
                 localpath = os.path.join(localpath, item)
         full_path = os.path.join(output_path, localpath)
+
+        # Generate percent-encoded URL
+        scheme, netloc, path, query, fragment = urlsplit(url)
+        path = quote(path)
+        url = urlunsplit((scheme, netloc, path, query, fragment))
+
         if not os.path.exists(full_path):
             os.makedirs(full_path)
         print('downloading {}'.format(filename))

From 0153f55016a995d437b4ebe0ae8fe7a29956ba49 Mon Sep 17 00:00:00 2001
From: Bryan Brattlof <bryanbrattlof@gmail.com>
Date: Tue, 15 Jan 2019 10:53:56 -0600
Subject: [PATCH 2135/2864] Update 'simple' theme to use new Atom/RSS settings

---
 pelican/themes/simple/templates/base.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index a1fdcf78..4fde8de5 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -17,16 +17,16 @@
         <link href="{{ FEED_DOMAIN }}/{% if FEED_RSS_URL %}{{ FEED_RSS_URL }}{% else %}{{ FEED_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
         {% if CATEGORY_FEED_ATOM and category %}
-        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL|format(category.slug) }}{% else %}{{ CATEGORY_FEED_ATOM|format(category.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_ATOM.format(slug=category.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
         {% endif %}
         {% if CATEGORY_FEED_RSS and category %}
-        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_RSS_URL %}{{ CATEGORY_FEED_RSS_URL|format(category.slug) }}{% else %}{{ CATEGORY_FEED_RSS|format(category.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_RSS_URL %}{{ CATEGORY_FEED_RSS_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_RSS.format(slug=category.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
         {% endif %}
         {% if TAG_FEED_ATOM and tag %}
-        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL|format(tag.slug) }}{% else %}{{ TAG_FEED_ATOM|format(tag.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_ATOM.format(slug=tag.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
         {% endif %}
         {% if TAG_FEED_RSS and tag %}
-        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL|format(tag.slug) }}{% else %}{{ TAG_FEED_RSS|format(tag.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_RSS.format(slug=tag.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
         {% endif %}
         {% endblock head %}
 </head>

From 9ffaaa16f87b12a011282ef026d42c8ebae914e8 Mon Sep 17 00:00:00 2001
From: Patrick <4002194+askpatrickw@users.noreply.github.com>
Date: Mon, 21 Jan 2019 17:45:13 -0800
Subject: [PATCH 2136/2864] Move feedburner config to wiki

Fixes #2386

https://github.com/getpelican/pelican/wiki/FeedBurner-Configuration
---
 docs/settings.rst | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 640d0571..b821cc2e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -954,27 +954,6 @@ variables to ``None``.
 .. [2] ``{slug}`` is replaced by name of the category / author / tag.
 
 
-FeedBurner
-----------
-
-If you want to use FeedBurner for your feed, you will likely need to decide
-upon a unique identifier. For example, if your site were called "Thyme" and
-hosted on the www.example.com domain, you might use "thymefeeds" as your unique
-identifier, which we'll use throughout this section for illustrative purposes.
-In your Pelican settings, set the ``FEED_ATOM`` attribute to
-``thymefeeds/main.xml`` to create an Atom feed with an original address of
-``http://www.example.com/thymefeeds/main.xml``. Set the ``FEED_DOMAIN``
-attribute to ``http://feeds.feedburner.com``, or ``http://feeds.example.com``
-if you are using a CNAME on your own domain (i.e., FeedBurner's "MyBrand"
-feature).
-
-There are two fields to configure in the `FeedBurner
-<http://feedburner.google.com>`_ interface: "Original Feed" and "Feed Address".
-In this example, the "Original Feed" would be
-``http://www.example.com/thymefeeds/main.xml`` and the "Feed Address" suffix
-would be ``thymefeeds/main.xml``.
-
-
 Pagination
 ==========
 

From 15f5e815522a8af03d6277932007d205a0f9cc27 Mon Sep 17 00:00:00 2001
From: Jordan Nelson <jordannelson1.2014@u.northwestern.edu>
Date: Tue, 22 Jan 2019 19:59:20 -0600
Subject: [PATCH 2137/2864] fixed _DEFAULT_LANGUAGE in pelican-quickstart

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 529eeb52..4a6b8cbc 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -34,7 +34,7 @@ except ValueError:
     # Don't fail on macosx: "unknown locale: UTF-8"
     _DEFAULT_LANGUAGE = None
 if _DEFAULT_LANGUAGE is None:
-    _DEFAULT_LANGUAGE = 'English'
+    _DEFAULT_LANGUAGE = 'en'
 else:
     _DEFAULT_LANGUAGE = _DEFAULT_LANGUAGE.split('_')[0]
 

From f6724cb960920b2ec785d0a17986103d2515d433 Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Wed, 23 Jan 2019 19:41:44 +0100
Subject: [PATCH 2138/2864] Simplify _input_compat and str_compat

The __six__ module provides us these same constructs using different names.
---
 pelican/tools/pelican_quickstart.py | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 529eeb52..a97ef305 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -77,19 +77,8 @@ CONF = {
 # url for list of valid timezones
 _TZ_URL = 'http://en.wikipedia.org/wiki/List_of_tz_database_time_zones'
 
-
-def _input_compat(prompt):
-    if six.PY3:
-        r = input(prompt)
-    else:
-        r = raw_input(prompt)
-    return r
-
-
-if six.PY3:
-    str_compat = str
-else:
-    str_compat = unicode
+_input_compat = six.moves.input
+str_compat = six.text_type
 
 
 # Create a 'marked' default path, to determine if someone has supplied

From 42c27594abb5bc73530a390d184285e5b06132c3 Mon Sep 17 00:00:00 2001
From: Bryan Brattlof <bryanbrattlof@gmail.com>
Date: Fri, 30 Nov 2018 14:23:14 -0600
Subject: [PATCH 2139/2864] Add relative_source_path attribute to content

---
 docs/themes.rst                | 70 +++++++++++++++++++---------------
 pelican/contents.py            |  1 +
 pelican/tests/test_contents.py | 28 ++++++++++++++
 3 files changed, 68 insertions(+), 31 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 3e186ee2..dcd72d75 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -347,9 +347,9 @@ Article
 
 The string representation of an Article is the `source_path` attribute.
 
-===================     ===================================================
+======================  ===================================================
 Attribute               Description
-===================     ===================================================
+======================  ===================================================
 author                  The :ref:`Author <object-author_cat_tag>` of
                         this article.
 authors                 A list of :ref:`Authors <object-author_cat_tag>`
@@ -368,6 +368,7 @@ metadata                Article header metadata `dict`.
 save_as                 Location to save the article page.
 slug                    Page slug.
 source_path             Full system path of the article source file.
+relative_source_path    Relative path from PATH_ to the article source file.
 status                  The article status, can be any of 'published' or
                         'draft'.
 summary                 Rendered summary content.
@@ -378,7 +379,10 @@ title                   Title of the article.
 translations            List of translations
                         :ref:`Article <object-article>` objects.
 url                     URL to the article page.
-===================     ===================================================
+======================  ===================================================
+
+.. _PATH: settings.html#PATH
+
 
 .. _object-author_cat_tag:
 
@@ -406,34 +410,38 @@ Page
 
 The string representation of a Page is the `source_path` attribute.
 
-===================     ===================================================
-Attribute               Description
-===================     ===================================================
-author                  The :ref:`Author <object-author_cat_tag>` of
-                        this page.
-content                 The rendered content of the page.
-date                    Datetime object representing the page date.
-date_format             Either default date format or locale date format.
-default_template        Default template name.
-in_default_lang         Boolean representing if the article is written
-                        in the default language.
-lang                    Language of the article.
-locale_date             Date formatted by the `date_format`.
-metadata                Page header metadata `dict`.
-save_as                 Location to save the page.
-slug                    Page slug.
-source_path             Full system path of the page source file.
-status                  The page status, can be any of 'published', 'hidden' or
-                        'draft'.
-summary                 Rendered summary content.
-tags                    List of :ref:`Tag <object-author_cat_tag>`
-                        objects.
-template                Template name to use for rendering.
-title                   Title of the page.
-translations            List of translations
-                        :ref:`Article <object-article>` objects.
-url                     URL to the page.
-===================     ===================================================
+=====================  ===================================================
+Attribute              Description
+=====================  ===================================================
+author                 The :ref:`Author <object-author_cat_tag>` of
+                       this page.
+content                The rendered content of the page.
+date                   Datetime object representing the page date.
+date_format            Either default date format or locale date format.
+default_template       Default template name.
+in_default_lang        Boolean representing if the article is written
+                       in the default language.
+lang                   Language of the article.
+locale_date            Date formatted by the `date_format`.
+metadata               Page header metadata `dict`.
+save_as                Location to save the page.
+slug                   Page slug.
+source_path            Full system path of the page source file.
+relative_source_path   Relative path from PATH_ to the page source file.
+status                 The page status, can be any of 'published', 'hidden' or
+                       'draft'.
+summary                Rendered summary content.
+tags                   List of :ref:`Tag <object-author_cat_tag>`
+                       objects.
+template               Template name to use for rendering.
+title                  Title of the page.
+translations           List of translations
+                       :ref:`Article <object-article>` objects.
+url                    URL to the page.
+=====================  ===================================================
+
+.. _PATH: settings.html#PATH
+
 
 Feeds
 =====
diff --git a/pelican/contents.py b/pelican/contents.py
index ccd38fe0..235c814a 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -110,6 +110,7 @@ class Content(object):
                     regex_subs=settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
 
         self.source_path = source_path
+        self.relative_source_path = self.get_relative_source_path()
 
         # manage the date format
         if not hasattr(self, 'date_format'):
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index de1edbc4..104bc889 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -146,6 +146,34 @@ class TestPage(LoggedTestCase):
         page = Page(**self.page_kwargs)
         self.assertEqual(page.save_as, "pages/foo-bar-fr.html")
 
+    def test_relative_source_path(self):
+        # 'relative_source_path' should be the relative path
+        # from 'PATH' to 'source_path'
+        page_kwargs = self._copy_page_kwargs()
+
+        # If 'source_path' is None, 'relative_source_path' should
+        # also return None
+        page_kwargs['source_path'] = None
+        page = Page(**page_kwargs)
+        self.assertIsNone(page.relative_source_path)
+
+        page_kwargs = self._copy_page_kwargs()
+        settings = get_settings()
+        full_path = page_kwargs['source_path']
+
+        settings['PATH'] = os.path.dirname(full_path)
+        page_kwargs['settings'] = settings
+        page = Page(**page_kwargs)
+
+        # if 'source_path' is set, 'relative_source_path' should
+        # return the relative path from 'PATH' to 'source_path'
+        self.assertEqual(
+            page.relative_source_path,
+            os.path.relpath(
+                full_path,
+                os.path.dirname(full_path)
+            ))
+
     def test_metadata_url_format(self):
         # Arbitrary metadata should be passed through url_format()
         page = Page(**self.page_kwargs)

From 3395e71570c797d19067bf53faf8bd0c2a60d3f3 Mon Sep 17 00:00:00 2001
From: John Franey <johnfraney@gmail.com>
Date: Wed, 6 Feb 2019 10:22:57 -0400
Subject: [PATCH 2140/2864] Fix linting issues

Fixes linting issues that caused the `flake8` CI stage to fail.
---
 pelican/__init__.py             |  4 ++--
 pelican/settings.py             | 10 +++++-----
 pelican/tests/test_importer.py  | 30 +++++++++++++++---------------
 pelican/tools/pelican_themes.py |  4 ++--
 pelican/utils.py                | 15 +++++++++------
 5 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 27fc7fba..97d5fffa 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -444,8 +444,8 @@ def get_instance(args):
 
     config_file = args.settings
     if config_file is None and os.path.isfile(DEFAULT_CONFIG_NAME):
-            config_file = DEFAULT_CONFIG_NAME
-            args.settings = DEFAULT_CONFIG_NAME
+        config_file = DEFAULT_CONFIG_NAME
+        args.settings = DEFAULT_CONFIG_NAME
 
     settings = read_settings(config_file, override=get_config(args))
 
diff --git a/pelican/settings.py b/pelican/settings.py
index b963007a..a957b26c 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -524,11 +524,11 @@ def configure_settings(settings):
 
     # check content caching layer and warn of incompatibilities
     if settings.get('CACHE_CONTENT', False) and \
-       settings.get('CONTENT_CACHING_LAYER', '') == 'generator' and \
-       settings.get('WITH_FUTURE_DATES', False):
-            logger.warning(
-                "WITH_FUTURE_DATES conflicts with CONTENT_CACHING_LAYER "
-                "set to 'generator', use 'reader' layer instead")
+            settings.get('CONTENT_CACHING_LAYER', '') == 'generator' and \
+            settings.get('WITH_FUTURE_DATES', False):
+        logger.warning(
+            "WITH_FUTURE_DATES conflicts with CONTENT_CACHING_LAYER "
+            "set to 'generator', use 'reader' layer instead")
 
     # Warn if feeds are generated with both SITEURL & FEED_DOMAIN undefined
     feed_keys = [
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 75310a80..6eb62852 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -102,8 +102,8 @@ class TestWordpressXmlImporter(unittest.TestCase):
     def test_ignore_empty_posts(self):
         self.assertTrue(self.posts)
         for (title, content, fname, date, author,
-             categ, tags, status, kind, format) in self.posts:
-                self.assertTrue(title.strip())
+                categ, tags, status, kind, format) in self.posts:
+            self.assertTrue(title.strip())
 
     def test_recognise_page_kind(self):
         """ Check that we recognise pages in wordpress, as opposed to posts """
@@ -111,9 +111,9 @@ class TestWordpressXmlImporter(unittest.TestCase):
         # Collect (title, filename, kind) of non-empty posts recognised as page
         pages_data = []
         for (title, content, fname, date, author,
-             categ, tags, status, kind, format) in self.posts:
-                if kind == 'page':
-                    pages_data.append((title, fname))
+                categ, tags, status, kind, format) in self.posts:
+            if kind == 'page':
+                pages_data.append((title, fname))
         self.assertEqual(2, len(pages_data))
         self.assertEqual(('Page', 'contact'), pages_data[0])
         self.assertEqual(('Empty Page', 'empty'), pages_data[1])
@@ -151,22 +151,22 @@ class TestWordpressXmlImporter(unittest.TestCase):
         self.assertTrue(self.posts)
         pages_data = []
         for (title, content, fname, date, author, categ,
-             tags, status, kind, format) in self.posts:
-                if kind == 'page' or kind == 'article':
-                    pass
-                else:
-                    pages_data.append((title, fname))
+                tags, status, kind, format) in self.posts:
+            if kind == 'page' or kind == 'article':
+                pass
+            else:
+                pages_data.append((title, fname))
         self.assertEqual(0, len(pages_data))
 
     def test_recognise_custom_post_type(self):
         self.assertTrue(self.custposts)
         cust_data = []
         for (title, content, fname, date, author, categ,
-             tags, status, kind, format) in self.custposts:
-                if kind == 'article' or kind == 'page':
-                    pass
-                else:
-                    cust_data.append((title, kind))
+                tags, status, kind, format) in self.custposts:
+            if kind == 'article' or kind == 'page':
+                pass
+            else:
+                cust_data.append((title, kind))
         self.assertEqual(3, len(cust_data))
         self.assertEqual(
             ('A custom post in category 4', 'custom1'),
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index b99a7ba3..9f9b2328 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -81,9 +81,9 @@ def main():
     to_sym = args.to_symlink or args.clean
 
     if args.action:
-        if args.action is 'list':
+        if args.action == 'list':
             list_themes(args.verbose)
-        elif args.action is 'path':
+        elif args.action == 'path':
             print(_THEMES_PATH)
     elif to_install or args.to_remove or to_sym:
         if args.to_remove:
diff --git a/pelican/utils.py b/pelican/utils.py
index 50d428a5..4a31658b 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -787,12 +787,15 @@ def folder_watcher(path, extensions, ignores=[]):
             dirs[:] = [x for x in dirs if not x.startswith(os.curdir)]
 
             for f in files:
-                if f.endswith(tuple(extensions)) and \
-                   not any(fnmatch.fnmatch(f, ignore) for ignore in ignores):
-                        try:
-                            yield os.stat(os.path.join(root, f)).st_mtime
-                        except OSError as e:
-                            logger.warning('Caught Exception: %s', e)
+                valid_extension = f.endswith(tuple(extensions))
+                file_ignored = any(
+                    fnmatch.fnmatch(f, ignore) for ignore in ignores
+                )
+                if valid_extension and not file_ignored:
+                    try:
+                        yield os.stat(os.path.join(root, f)).st_mtime
+                    except OSError as e:
+                        logger.warning('Caught Exception: %s', e)
 
     LAST_MTIME = 0
     while True:

From 63a72fc6198e04c61aae36ea0456f54360d1076c Mon Sep 17 00:00:00 2001
From: John Franey <johnfraney@gmail.com>
Date: Wed, 6 Feb 2019 10:23:27 -0400
Subject: [PATCH 2141/2864] Remove Python 3.4 references

This PR removes the Python 3.4 tox task and updates references in the
code to Python 3.5+.

tox complains about Python 3.4, which is EOL after next month:

> py34 installed: DEPRECATION: Python 3.4 support has been deprecated. pip 19.1 will be the last one supporting it. Please upgrade your Python as Python 3.4 won't be maintained after March 2019 (cf PEP 429).
---
 .travis.yml                     | 1 -
 docs/install.rst                | 2 +-
 pelican/readers.py              | 2 +-
 pelican/tools/pelican_import.py | 2 +-
 setup.py                        | 1 -
 tox.ini                         | 3 +--
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 23f267c1..31b3ac8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ env:
   - TOX_ENV=docs
   - TOX_ENV=flake8
   - TOX_ENV=py27
-  - TOX_ENV=py34
   - TOX_ENV=py35
 matrix:
   include:
diff --git a/docs/install.rst b/docs/install.rst
index 17f275af..571de95e 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -1,7 +1,7 @@
 Installing Pelican
 ##################
 
-Pelican currently runs best on Python 2.7.x and 3.4+; earlier versions of
+Pelican currently runs best on Python 2.7.x and 3.5+; earlier versions of
 Python are not supported.
 
 You can install Pelican via several different methods. The simplest is via
diff --git a/pelican/readers.py b/pelican/readers.py
index bacb45f8..94c4481e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -367,7 +367,7 @@ class HTMLReader(BaseReader):
     class _HTMLParser(HTMLParser):
         def __init__(self, settings, filename):
             try:
-                # Python 3.4+
+                # Python 3.5+
                 HTMLParser.__init__(self, convert_charrefs=False)
             except TypeError:
                 HTMLParser.__init__(self)
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index e5686811..40a811a0 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -22,7 +22,7 @@ from pelican.settings import read_settings
 from pelican.utils import SafeDatetime, slugify
 
 try:
-    from html import unescape  # py3.4+
+    from html import unescape  # py3.5+
 except ImportError:
     from six.moves.html_parser import HTMLParser
     unescape = HTMLParser().unescape
diff --git a/setup.py b/setup.py
index 74d2d043..d1dc4c4d 100755
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,6 @@ setup(
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
diff --git a/tox.ini b/tox.ini
index 4d941aac..fc95ff91 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,9 @@
 [tox]
-envlist = py{27,34,35,36,37},docs,flake8
+envlist = py{27,35,36,37},docs,flake8
 
 [testenv]
 basepython =
     py27: python2.7
-    py34: python3.4
     py35: python3.5
     py36: python3.6
     py37: python3.7

From c9dc3223ebb509edab73c6751ff3186b01826e39 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Sun, 24 Feb 2019 11:19:12 +0100
Subject: [PATCH 2142/2864] Fix bug in process_translations warning message
 generation that caused error with empty slugs

---
 pelican/utils.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 4a31658b..cea00015 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -677,9 +677,12 @@ def process_translations(content_list, translation_id=None):
                              'attributes'.format(translation_id))
 
     for id_vals, items in groupby(content_list, attrgetter(*translation_id)):
-        items = list(items)
+        # prepare warning string
+        id_vals = (id_vals,) if len(translation_id) == 1 else id_vals
         with_str = 'with' + ', '.join([' {} "{{}}"'] * len(translation_id))\
             .format(*translation_id).format(*id_vals)
+
+        items = list(items)
         original_items = get_original_items(items, with_str)
         index.extend(original_items)
         for a in items:

From ce9f3d55a38d136e6c25125515ebf7a3c853614a Mon Sep 17 00:00:00 2001
From: Andrew Vant <ajv@andrewvant.com>
Date: Sun, 16 Jul 2017 17:17:51 -0400
Subject: [PATCH 2143/2864] Allow directories in EXTRA_PATH_METADATA

Metadata applied to a directory will apply to all files under
it. In case of conflicts, child paths beat parent paths, so metadata
applied to `dir/subdir/file.md` will take precedence over that applied
to `dir/subdir`, which will take precedence over just `dir`.
---
 docs/settings.rst             |  3 ++-
 pelican/readers.py            | 16 ++++++++++++++--
 pelican/tests/test_readers.py | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 90b9e570..3652788b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -783,7 +783,8 @@ Metadata
 
    Extra metadata dictionaries keyed by relative path. Relative paths require
    correct OS-specific directory separators (i.e. / in UNIX and \\ in Windows)
-   unlike some other Pelican file settings.
+   unlike some other Pelican file settings. Paths to a directory apply to all
+   files under it. The most-specific path wins conflicts.
 
 Not all metadata needs to be :ref:`embedded in source file itself
 <internal_metadata>`. For example, blog posts are often named following a
diff --git a/pelican/readers.py b/pelican/readers.py
index 94c4481e..0edfed0e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -698,8 +698,20 @@ def path_metadata(full_path, source_path, settings=None):
         if settings.get('DEFAULT_DATE', None) == 'fs':
             metadata['date'] = SafeDatetime.fromtimestamp(
                 os.stat(full_path).st_mtime)
-        metadata.update(settings.get('EXTRA_PATH_METADATA', {}).get(
-            source_path, {}))
+
+        # Apply EXTRA_PATH_METADATA for the source path and the paths of any
+        # parent directories. Sorting EPM first ensures that the most specific
+        # path wins conflicts.
+
+        epm = settings.get('EXTRA_PATH_METADATA', {})
+        for path, meta in sorted(epm.items()):
+            # Enforce a trailing slash when checking for parent directories.
+            # This prevents false positives when one file or directory's name
+            # is a prefix of another's.
+            dirpath = os.path.join(path, '')
+            if source_path == path or source_path.startswith(dirpath):
+                metadata.update(meta)
+
     return metadata
 
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index b35a511e..12c231de 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -273,6 +273,38 @@ class RstReaderTest(ReaderTest):
         }
         self.assertDictHasSubset(page.metadata, expected)
 
+    def test_article_extra_path_metadata_recurse(self):
+        parent = "TestCategory"
+        notparent = "TestCategory/article"
+        path = "TestCategory/article_without_category.rst"
+
+        epm = {
+            parent: {'epmr_inherit': parent,
+                     'epmr_override': parent, },
+            notparent: {'epmr_bogus': notparent},
+            path:   {'epmr_override': path, },
+            }
+        expected_metadata = {
+            'epmr_inherit': parent,
+            'epmr_override': path,
+            }
+
+        page = self.read_file(path=path, EXTRA_PATH_METADATA=epm)
+        self.assertDictHasSubset(page.metadata, expected_metadata)
+
+        # Make sure vars aren't getting "inherited" by mistake...
+        path = "article.rst"
+        page = self.read_file(path=path, EXTRA_PATH_METADATA=epm)
+        for k in expected_metadata.keys():
+            self.assertNotIn(k, page.metadata)
+
+        # Same, but for edge cases where one file's name is a prefix of
+        # another.
+        path = "TestCategory/article_without_category.rst"
+        page = self.read_file(path=path, EXTRA_PATH_METADATA=epm)
+        for k in epm[notparent].keys():
+            self.assertNotIn(k, page.metadata)
+
     def test_typogrify(self):
         # if nothing is specified in the settings, the content should be
         # unmodified

From 583c0d4e171fcc02c642270a49a737b63cc06342 Mon Sep 17 00:00:00 2001
From: Boian Berberov <bberberov+github@gmail.com>
Date: Wed, 13 Mar 2019 17:00:21 -0600
Subject: [PATCH 2144/2864] Change TEMPLATE_EXTENSION to TEMPLATE_EXTENSIONS in
 documentation

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 3652788b..53b10053 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -736,7 +736,7 @@ Template pages
                          'src/resume.html': 'dest/resume.html',
                          'src/contact.html': 'dest/contact.html'}
 
-.. data:: TEMPLATE_EXTENSION = ['.html']
+.. data:: TEMPLATE_EXTENSIONS = ['.html']
 
    The extensions to use when looking up template files from template names.
 

From de237e365a9c62daa22fc4ad28850025ae15801c Mon Sep 17 00:00:00 2001
From: Boian Berberov <bberberov+github@gmail.com>
Date: Tue, 19 Mar 2019 20:56:44 -0600
Subject: [PATCH 2145/2864] Remove redundant text and reorder settings for
 consistency

- Remove redundant `YEAR`, `MONTH`, and `DAY` `_ARCHIVE_SAVE_AS` sections
- Move `AUTHOR_URL` and `AUTHOR_SAVE_AS` to match `AUTHOR`, `CATEGORY`, `TAG` order throughout the rest of the document
- Move `YEAR`, `MONTH`, and `DAY` `_ARCHIVE_URL` and `_ARCHIVE_SAVE_AS` sections below paragraph describing them; and match ( `_URL`, `_SAVE_AS` ) order throughout the rest of the document

Recommend viewing with `--diff-algorithm=patience`
---
 docs/settings.rst | 82 ++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 47 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 53b10053..f9576bf7 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -467,6 +467,14 @@ This would save your articles into something like
    The actual location a page draft which doesn't use the default language is
    saved at.
 
+.. data:: AUTHOR_URL = 'author/{slug}.html'
+
+   The URL to use for an author.
+
+.. data:: AUTHOR_SAVE_AS = 'author/{slug}.html'
+
+   The location to save an author.
+
 .. data:: CATEGORY_URL = 'category/{slug}.html'
 
    The URL to use for a category.
@@ -483,41 +491,6 @@ This would save your articles into something like
 
    The location to save the tag page.
 
-.. data:: AUTHOR_URL = 'author/{slug}.html'
-
-   The URL to use for an author.
-
-.. data:: AUTHOR_SAVE_AS = 'author/{slug}.html'
-
-   The location to save an author.
-
-.. data:: YEAR_ARCHIVE_SAVE_AS = ''
-
-   The location to save per-year archives of your posts.
-
-.. data:: YEAR_ARCHIVE_URL = ''
-
-   The URL to use for per-year archives of your posts. Used only if you have
-   the ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
-
-.. data:: MONTH_ARCHIVE_SAVE_AS = ''
-
-   The location to save per-month archives of your posts.
-
-.. data:: MONTH_ARCHIVE_URL = ''
-
-   The URL to use for per-month archives of your posts. Used only if you have
-   the ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
-
-.. data:: DAY_ARCHIVE_SAVE_AS = ''
-
-   The location to save per-day archives of your posts.
-
-.. data:: DAY_ARCHIVE_URL = ''
-
-   The URL to use for per-day archives of your posts. Used only if you have the
-   ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
-
 .. note::
 
     If you do not want one or more of the default pages to be created (e.g.,
@@ -546,6 +519,33 @@ posts for the month at ``posts/2011/Aug/index.html``.
     This way a reader can remove a portion of your URL and automatically arrive
     at an appropriate archive of posts, without having to specify a page name.
 
+.. data:: YEAR_ARCHIVE_URL = ''
+
+   The URL to use for per-year archives of your posts. Used only if you have
+   the ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
+
+.. data:: YEAR_ARCHIVE_SAVE_AS = ''
+
+   The location to save per-year archives of your posts.
+
+.. data:: MONTH_ARCHIVE_URL = ''
+
+   The URL to use for per-month archives of your posts. Used only if you have
+   the ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
+
+.. data:: MONTH_ARCHIVE_SAVE_AS = ''
+
+   The location to save per-month archives of your posts.
+
+.. data:: DAY_ARCHIVE_URL = ''
+
+   The URL to use for per-day archives of your posts. Used only if you have the
+   ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
+
+.. data:: DAY_ARCHIVE_SAVE_AS = ''
+
+   The location to save per-day archives of your posts.
+
 ``DIRECT_TEMPLATES`` work a bit differently than noted above. Only the
 ``_SAVE_AS`` settings are available, but it is available for any direct
 template.
@@ -554,18 +554,6 @@ template.
 
    The location to save the article archives page.
 
-.. data:: YEAR_ARCHIVE_SAVE_AS = ''
-
-   The location to save per-year archives of your posts.
-
-.. data:: MONTH_ARCHIVE_SAVE_AS = ''
-
-   The location to save per-month archives of your posts.
-
-.. data:: DAY_ARCHIVE_SAVE_AS = ''
-
-   The location to save per-day archives of your posts.
-
 .. data:: AUTHORS_SAVE_AS = 'authors.html'
 
    The location to save the author list.

From 3d5cdad4734cedbd20d55d0c7e124344452c2796 Mon Sep 17 00:00:00 2001
From: Boian Berberov <bberberov+github@gmail.com>
Date: Sat, 23 Mar 2019 15:34:47 -0600
Subject: [PATCH 2146/2864] Updating DIRECT_TEMPLATES documentation to match
 default configuration

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index f9576bf7..df093c60 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -728,12 +728,12 @@ Template pages
 
    The extensions to use when looking up template files from template names.
 
-.. data:: DIRECT_TEMPLATES = ['index', 'categories', 'authors', 'archives']
+.. data:: DIRECT_TEMPLATES = ['index', 'tags', 'categories', 'authors', 'archives']
 
    List of templates that are used directly to render content. Typically direct
    templates are used to generate index pages for collections of content (e.g.,
    tags and category index pages). If the tag and category collections are not
-   needed, set ``DIRECT_TEMPLATES = ['index', 'archives']``
+   needed, set ``DIRECT_TEMPLATES = ['index', 'authors', 'archives']``
 
    ``DIRECT_TEMPLATES`` are searched for over paths maintained in
    ``THEME_TEMPLATES_OVERRIDES``.

From 86c1db1c63d9c51c4aa5231a72eeda0294914bcc Mon Sep 17 00:00:00 2001
From: Boian Berberov <bberberov+github@gmail.com>
Date: Tue, 26 Mar 2019 17:42:59 -0600
Subject: [PATCH 2147/2864] Adding `authors` to Common variables

- Adding `authors` to Common variables in the documentation
- Reordering the `authors`, `categories`, `tags` variables in the table
---
 docs/themes.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index dcd72d75..adc7ec65 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -81,10 +81,12 @@ articles        The list of articles, ordered descending by date.
 dates           The same list of articles, but ordered by date,
                 ascending.
 drafts          The list of draft articles
-tags            A list of (tag, articles) tuples, containing all
-                the tags.
+authors         A list of (author, articles) tuples, containing all
+                the authors.
 categories      A list of (category, articles) tuples, containing
                 all the categories and corresponding articles (values)
+tags            A list of (tag, articles) tuples, containing all
+                the tags.
 pages           The list of pages
 hidden_pages    The list of hidden pages
 draft_pages     The list of draft pages

From 4f494289611b514a62b3d0db2abecf79e54cba6b Mon Sep 17 00:00:00 2001
From: Boian Berberov <bberberov+github@gmail.com>
Date: Thu, 4 Apr 2019 17:11:58 -0600
Subject: [PATCH 2148/2864] Documentation changes based on pull request
 comments.

- Settings -> Template pages: DIRECT_TEMPLATES example
- Creating Themes -> Common variables: authors and tags descriptions
---
 docs/settings.rst | 6 +++---
 docs/themes.rst   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index df093c60..a10010d7 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -728,12 +728,12 @@ Template pages
 
    The extensions to use when looking up template files from template names.
 
-.. data:: DIRECT_TEMPLATES = ['index', 'tags', 'categories', 'authors', 'archives']
+.. data:: DIRECT_TEMPLATES = ['index', 'authors', 'categories', 'tags', 'archives']
 
    List of templates that are used directly to render content. Typically direct
    templates are used to generate index pages for collections of content (e.g.,
-   tags and category index pages). If the tag and category collections are not
-   needed, set ``DIRECT_TEMPLATES = ['index', 'authors', 'archives']``
+   category and tag index pages). If the author, category and tag collections are not
+   needed, set ``DIRECT_TEMPLATES = ['index', 'archives']``
 
    ``DIRECT_TEMPLATES`` are searched for over paths maintained in
    ``THEME_TEMPLATES_OVERRIDES``.
diff --git a/docs/themes.rst b/docs/themes.rst
index adc7ec65..e0854646 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -82,11 +82,11 @@ dates           The same list of articles, but ordered by date,
                 ascending.
 drafts          The list of draft articles
 authors         A list of (author, articles) tuples, containing all
-                the authors.
+                the authors and corresponding articles (values)
 categories      A list of (category, articles) tuples, containing
                 all the categories and corresponding articles (values)
 tags            A list of (tag, articles) tuples, containing all
-                the tags.
+                the tags and corresponding articles (values)
 pages           The list of pages
 hidden_pages    The list of hidden pages
 draft_pages     The list of draft pages

From 8520840be6bbe17a4aeeea5ffde5489c6d4d5fc4 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Fri, 19 Apr 2019 16:55:17 +0200
Subject: [PATCH 2149/2864] Provide 'all_articles' variable to period pages

This allows 'recent posts' functionality to work properly.
---
 pelican/generators.py            | 2 +-
 pelican/tests/test_generators.py | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 0e772a62..75eca388 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -526,7 +526,7 @@ class ArticlesGenerator(CachingGenerator):
 
                 write(save_as, template, context, articles=articles,
                       dates=archive, template_name='period_archives',
-                      blog=True, url=url)
+                      blog=True, url=url, all_articles=self.articles)
 
         for period in 'year', 'month', 'day':
             save_as = period_save_as[period]
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 9b27d289..267571da 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -420,7 +420,8 @@ class TestArticlesGenerator(unittest.TestCase):
                                  generator.get_template("period_archives"),
                                  context, blog=True, articles=articles,
                                  dates=dates, template_name='period_archives',
-                                 url="posts/1970/")
+                                 url="posts/1970/",
+                                 all_articles=generator.articles)
 
         settings['MONTH_ARCHIVE_SAVE_AS'] = \
             'posts/{date:%Y}/{date:%b}/index.html'
@@ -444,7 +445,8 @@ class TestArticlesGenerator(unittest.TestCase):
                                  generator.get_template("period_archives"),
                                  context, blog=True, articles=articles,
                                  dates=dates, template_name='period_archives',
-                                 url="posts/1970/Jan/")
+                                 url="posts/1970/Jan/",
+                                 all_articles=generator.articles)
 
         settings['DAY_ARCHIVE_SAVE_AS'] = \
             'posts/{date:%Y}/{date:%b}/{date:%d}/index.html'
@@ -476,7 +478,8 @@ class TestArticlesGenerator(unittest.TestCase):
                                  generator.get_template("period_archives"),
                                  context, blog=True, articles=articles,
                                  dates=dates, template_name='period_archives',
-                                 url="posts/1970/Jan/01/")
+                                 url="posts/1970/Jan/01/",
+                                 all_articles=generator.articles)
         locale.setlocale(locale.LC_ALL, old_locale)
 
     def test_nonexistent_template(self):

From 21a4169169784c9d8ee381ba1b31c8f830f31fa0 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 25 Apr 2019 14:25:39 +0200
Subject: [PATCH 2150/2864] Clarify copyright continues through to present day

This obviates the need to manually update the copyright every year.
---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index bac5d9bf..5b5255e3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,7 @@ extensions = ['sphinx.ext.autodoc',
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Pelican'
-copyright = '2010, Alexis Metaireau and contributors'
+copyright = '2010 – present, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])

From e6ecefb5948a6d634245394d4c1d07aab72cf5d1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 25 Apr 2019 15:08:04 +0200
Subject: [PATCH 2151/2864] Update http:// links to https:// where appropriate

---
 CONTRIBUTING.rst  | 14 +++++++-------
 README.rst        |  8 ++++----
 THANKS            |  5 +++--
 docs/conf.py      |  2 +-
 docs/content.rst  |  6 +++---
 docs/index.rst    |  8 ++++----
 docs/settings.rst | 12 ++++++------
 docs/themes.rst   |  4 ++--
 8 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 37fc7ffb..49660ea1 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -58,7 +58,7 @@ publicly-accessible location:
 * Upload detailed and **complete** output logs and backtraces (remember to add
   the ``--debug`` flag: ``pelican --debug content [...]``)
 
-.. _documentation: http://docs.getpelican.com/
+.. _documentation: https://docs.getpelican.com/
 .. _`paste service`: https://dpaste.de/
 
 Once the above preparation is ready, you can contact people willing to help via
@@ -124,7 +124,7 @@ Contribution quality standards
 
 * Adhere to `PEP8 coding standards`_. This can be eased via the `pycodestyle
   <https://pypi.org/project/pycodestyle>`_ or `flake8
-  <http://pypi.python.org/pypi/flake8/>`_ tools, the latter of which in
+  <https://pypi.org/project/flake8/>`_ tools, the latter of which in
   particular will give you some useful hints about ways in which the
   code/formatting can be improved. If you are relying on your editor for PEP8
   compliance, note that the line length specified by PEP8 is 79 (excluding the
@@ -139,12 +139,12 @@ Contribution quality standards
 Check out our `Git Tips`_ page or `ask for help`_ if you
 need assistance or have any questions about these guidelines.
 
-.. _`plugin`: http://docs.getpelican.com/en/latest/plugins.html
-.. _`#pelican IRC channel`: http://webchat.freenode.net/?channels=pelican&uio=d4
+.. _`plugin`: https://docs.getpelican.com/en/latest/plugins.html
+.. _`#pelican IRC channel`: https://webchat.freenode.net/?channels=pelican&uio=d4
 .. _`Create a new git branch`: https://github.com/getpelican/pelican/wiki/Git-Tips#making-your-changes
 .. _`Squash your commits`: https://github.com/getpelican/pelican/wiki/Git-Tips#squashing-commits
-.. _`Run all the tests`: http://docs.getpelican.com/en/latest/contribute.html#running-the-test-suite
+.. _`Run all the tests`: https://docs.getpelican.com/en/latest/contribute.html#running-the-test-suite
 .. _`Git Tips`: https://github.com/getpelican/pelican/wiki/Git-Tips
-.. _`PEP8 coding standards`: http://www.python.org/dev/peps/pep-0008/
+.. _`PEP8 coding standards`: https://www.python.org/dev/peps/pep-0008/
 .. _`ask for help`: `How to get help`_
-.. _`compatibility cheatsheet`: http://docs.getpelican.com/en/latest/contribute.html#python-3-development-tips
+.. _`compatibility cheatsheet`: https://docs.getpelican.com/en/latest/contribute.html#python-3-development-tips
diff --git a/README.rst b/README.rst
index 05063251..176dfce4 100644
--- a/README.rst
+++ b/README.rst
@@ -47,13 +47,13 @@ Why the name "Pelican"?
 
 .. Links
 
-.. _Python: http://www.python.org/
+.. _Python: https://www.python.org/
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
-.. _Markdown: http://daringfireball.net/projects/markdown/
+.. _Markdown: https://daringfireball.net/projects/markdown/
 .. _Jinja2: http://jinja.pocoo.org/
 .. _Pygments: http://pygments.org/
-.. _`Pelican's documentation`: http://docs.getpelican.com/
-.. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
+.. _`Pelican's documentation`: https://docs.getpelican.com/
+.. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html
 .. _`hosted on GitHub`: https://github.com/getpelican/pelican
 
 .. |build-status| image:: https://img.shields.io/travis/getpelican/pelican/master.svg
diff --git a/THANKS b/THANKS
index 348c0b59..121a8aca 100644
--- a/THANKS
+++ b/THANKS
@@ -1,11 +1,12 @@
 Pelican is a project originally created by Alexis Métaireau
-<http://notmyidea.org/>, but there are a large number of people that have
+<https://blog.notmyidea.org/> and subsequently maintained by Justin Mayer
+<https://justinmayer.com/>, but there are a large number of people that have
 contributed or implemented key features over time. We do our best to keep this
 list up-to-date, but you can also have a look at the nice contributor graphs
 produced by GitHub: https://github.com/getpelican/pelican/graphs/contributors
 
 If you want to contribute, check the documentation section about how to do so:
-<http://docs.getpelican.com/en/latest/contribute.html>
+<https://docs.getpelican.com/en/latest/contribute.html>
 
 Aaron Kavlie
 Abhishek L
diff --git a/docs/conf.py b/docs/conf.py
index 5b5255e3..7645a86d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,7 +31,7 @@ rst_prolog = '''
 pygments_style = 'sphinx'
 
 extlinks = {
-    'pelican-doc':  ('http://docs.getpelican.com/%s/', '')
+    'pelican-doc':  ('https://docs.getpelican.com/%s/', '')
 }
 
 # -- Options for HTML output --------------------------------------------------
diff --git a/docs/content.rst b/docs/content.rst
index 78fc7993..a6d1c4c6 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -560,9 +560,9 @@ the ``DEFAULT_METADATA``::
 To publish a post when the default status is ``draft``, update the post's
 metadata to include ``Status: published``.
 
-.. _W3C ISO 8601: http://www.w3.org/TR/NOTE-datetime
+.. _W3C ISO 8601: https://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: http://www.methods.co.nz/asciidoc/
-.. _pelican-plugins: http://github.com/getpelican/pelican-plugins
+.. _pelican-plugins: https://github.com/getpelican/pelican-plugins
 .. _Markdown Extensions: https://python-markdown.github.io/extensions/
 .. _CodeHilite extension: https://python-markdown.github.io/extensions/code_hilite/#syntax
-.. _i18n_subsites plugin: http://github.com/getpelican/pelican-plugins/tree/master/i18n_subsites
+.. _i18n_subsites plugin: https://github.com/getpelican/pelican-plugins/tree/master/i18n_subsites
diff --git a/docs/index.rst b/docs/index.rst
index a0084ffb..678732d8 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -76,10 +76,10 @@ Documentation
 
 .. Links
 
-.. _Python: http://www.python.org/
+.. _Python: https://www.python.org/
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
-.. _Markdown: http://daringfireball.net/projects/markdown/
+.. _Markdown: https://daringfireball.net/projects/markdown/
 .. _Jinja2: http://jinja.pocoo.org/
-.. _`Pelican documentation`: http://docs.getpelican.com/latest/
-.. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
+.. _`Pelican documentation`: https://docs.getpelican.com/latest/
+.. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html
 .. _`Pelican plugins`: https://github.com/getpelican/pelican-plugins
diff --git a/docs/settings.rst b/docs/settings.rst
index 153ec754..7e297c16 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -369,7 +369,7 @@ and pages anywhere you want.
     the `Python datetime documentation`_ for more information.
 
 .. _Python datetime documentation:
-    http://docs.python.org/2/library/datetime.html#strftime-and-strptime-behavior
+    https://docs.python.org/2/library/datetime.html#strftime-and-strptime-behavior
 
 Also, you can use other file metadata attributes as well:
 
@@ -620,7 +620,7 @@ Time and Date
 
    Have a look at `the wikipedia page`_ to get a list of valid timezone values.
 
-.. _the wikipedia page: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+.. _the wikipedia page: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
 .. data:: DEFAULT_DATE = None
 
@@ -696,11 +696,11 @@ Time and Date
 
 .. [#] Default is the system locale.
 
-.. _Python strftime documentation: http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+.. _Python strftime documentation: https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 
 .. _locales on Windows: http://msdn.microsoft.com/en-us/library/cdax410z%28VS.71%29.aspx
 
-.. _locale(1): http://linux.die.net/man/1/locale
+.. _locale(1): https://linux.die.net/man/1/locale
 
 
 .. _template_pages:
@@ -811,7 +811,7 @@ file:
         }
 
 .. _group name notation:
-   http://docs.python.org/3/library/re.html#regular-expression-syntax
+   https://docs.python.org/3/library/re.html#regular-expression-syntax
 
 
 Feed settings
@@ -828,7 +828,7 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 
    The domain prepended to feed URLs. Since feed URLs should always be
    absolute, it is highly recommended to define this (e.g.,
-   "http://feeds.example.com"). If you have already explicitly defined SITEURL
+   "https://feeds.example.com"). If you have already explicitly defined SITEURL
    (see above) and want to use the same domain for your feeds, you can just
    set:  ``FEED_DOMAIN = SITEURL``.
 
diff --git a/docs/themes.rst b/docs/themes.rst
index e0854646..354e0c36 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -120,8 +120,8 @@ your date according to the locale given in your settings::
 
     {{ article.date|strftime('%d %B %Y') }}
 
-.. _datetime: http://docs.python.org/2/library/datetime.html#datetime-objects
-.. _strftime: http://docs.python.org/2/library/datetime.html#strftime-strptime-behavior
+.. _datetime: https://docs.python.org/2/library/datetime.html#datetime-objects
+.. _strftime: https://docs.python.org/2/library/datetime.html#strftime-strptime-behavior
 
 
 index.html

From 8ed686136a666ec8b09f3843191cfe6d186dbf38 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 13 May 2019 09:59:31 +0200
Subject: [PATCH 2152/2864] Un-pin Python-Markdown version in test requirements

Refs #2493 #2569
---
 requirements/test.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/test.pip b/requirements/test.pip
index 32f81d86..fa2634a0 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -2,7 +2,7 @@
 mock
 
 # Optional Packages
-Markdown < 3.0
+Markdown
 BeautifulSoup4
 lxml
 typogrify

From 7e859c277f00ce49a3d3ca938930bbe5204c702a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 10 Jun 2019 21:12:12 +0200
Subject: [PATCH 2153/2864] Pin Python-Markdown to >= 3.1 in test requirements

Closes #2493
---
 requirements/test.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/test.pip b/requirements/test.pip
index fa2634a0..ec4ea874 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -2,7 +2,7 @@
 mock
 
 # Optional Packages
-Markdown
+Markdown >= 3.1
 BeautifulSoup4
 lxml
 typogrify

From 7f77106c1bd157ca230fd0af2edad43ea1067e4f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 10 Jun 2019 21:36:02 +0200
Subject: [PATCH 2154/2864] Configure footnote test to keep hyphen as separator

Closes #2493
---
 pelican/tests/test_readers.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 12c231de..181cefff 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -480,7 +480,11 @@ class MdReaderTest(ReaderTest):
         self.assertDictHasSubset(metadata, expected)
 
     def test_article_with_footnote(self):
-        reader = readers.MarkdownReader(settings=get_settings())
+        settings = get_settings()
+        from markdown.extensions.footnotes import FootnoteExtension
+        ec = settings['MARKDOWN']['extension_configs']
+        ec['markdown.extensions.footnotes'] = {'SEPARATOR': '-'}
+        reader = readers.MarkdownReader(settings)
         content, metadata = reader.read(
             _path('article_with_markdown_and_footnote.md'))
         expected_content = (

From d8d230b554397a145045d15a75b9a8c23b093fe3 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 10 Jun 2019 21:44:13 +0200
Subject: [PATCH 2155/2864] PyCodeStyle fix

---
 pelican/tests/test_readers.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 181cefff..30181f54 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -481,7 +481,6 @@ class MdReaderTest(ReaderTest):
 
     def test_article_with_footnote(self):
         settings = get_settings()
-        from markdown.extensions.footnotes import FootnoteExtension
         ec = settings['MARKDOWN']['extension_configs']
         ec['markdown.extensions.footnotes'] = {'SEPARATOR': '-'}
         reader = readers.MarkdownReader(settings)

From 4bae94834e5325fe0d90631641cd2bdaa98b2b55 Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Wed, 12 Jun 2019 17:02:49 +1000
Subject: [PATCH 2156/2864] Support for python -m pelican

Addresses https://github.com/getpelican/pelican/issues/2523

Note: @avaris made a good point that there is no need to replace the existing
module runner for pelican quickstart or the other tools as this can be run
via:

> python -m pelican.tools.pelican_quickstart
---
 pelican/__main__.py           | 10 ++++++++++
 pelican/tests/test_pelican.py |  7 +++++++
 setup.py                      |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pelican/__main__.py

diff --git a/pelican/__main__.py b/pelican/__main__.py
new file mode 100644
index 00000000..141823fc
--- /dev/null
+++ b/pelican/__main__.py
@@ -0,0 +1,10 @@
+"""
+python -m pelican module entry point to run via python -m
+"""
+from __future__ import absolute_import
+
+from . import main
+
+
+if __name__ == '__main__':
+    main()
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index e93c1223..502a45ac 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -263,3 +263,10 @@ class TestPelican(LoggedTestCase):
             count=1,
             msg="Could not process .*parse_error.rst",
             level=logging.ERROR)
+
+    def test_module_load(self):
+        """Test loading via python -m pelican --help displays the help"""
+        output = subprocess.check_output([
+            sys.executable, '-m', 'pelican', '--help'
+        ]).decode('ascii', 'replace')
+        assert 'usage:' in output
diff --git a/setup.py b/setup.py
index d1dc4c4d..e8918941 100755
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
 
 entry_points = {
     'console_scripts': [
-        'pelican = pelican:main',
+        'pelican = pelican.__main__:main',
         'pelican-import = pelican.tools.pelican_import:main',
         'pelican-quickstart = pelican.tools.pelican_quickstart:main',
         'pelican-themes = pelican.tools.pelican_themes:main'

From 2ab91bbaaa565dcb89726b6cac0002c1e0644dc3 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Jun 2019 18:51:10 +0200
Subject: [PATCH 2157/2864] Clarify that `pelican --listen` operates on output

---
 docs/quickstart.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index a5fdfa60..4e6714b4 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -61,8 +61,8 @@ be ignored for now.)
 Preview your site
 -----------------
 
-Open a new terminal session, navigate to your site directory and run the
-following command to launch Pelican's web server::
+Open a new terminal session, navigate to your generated output directory and
+run the following command to launch Pelican's web server::
 
     pelican --listen
 

From 9fdcb901f3825eb602f47eeea476204d26c2d97b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Jun 2019 18:56:08 +0200
Subject: [PATCH 2158/2864] Both --autoreload and --listen can be combined

But not on Windows. Refs #2400
---
 docs/publish.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/publish.rst b/docs/publish.rst
index 4dc1e3ef..197aa779 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -32,7 +32,12 @@ list of paths or can be configured as a setting. (See:
 
 You can also tell Pelican to watch for your modifications, instead of manually
 re-running it every time you want to see your changes. To enable this, run the
-``pelican`` command with the ``-r`` or ``--autoreload`` option.
+``pelican`` command with the ``-r`` or ``--autoreload`` option. On non-Windows
+environments, this option can also be combined with the ``-l`` or ``--listen``
+option to simultaneously both auto-regenerate *and* serve the output at
+http://localhost:8000::
+
+    pelican --autoreload --listen
 
 Pelican has other command-line switches available. Have a look at the help to
 see all the options you can use::

From a343b166e0cb71a231e644515ae3a68a9e70f53a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 7 Jun 2019 11:48:21 +0200
Subject: [PATCH 2159/2864] Add FUNDING.yml to project

This adds multiple methods for financially supporting Pelican's development. Primary motivations are to defray expenses for servers and domain name registration, as well to support and encourage Pelican's on-going maintenance and enhancement.
---
 .github/FUNDING.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..7e0d5359
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+custom: https://donate.getpelican.com
+liberapay: pelican

From 98071fab942037b0c92d0316c6e08eeffed97f75 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 17 Jun 2019 16:50:54 +0200
Subject: [PATCH 2160/2864] Docs: MARKDOWN var replaces, not updates, default

Closes #2100
---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 7e297c16..7085db84 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -152,7 +152,7 @@ Basic settings
         }
 
    .. Note::
-      The dictionary defined in your settings file will update this default
+      The dictionary defined in your settings file will replace this default
       one.
 
 .. data:: OUTPUT_PATH = 'output/'

From 2e82a53cdf3f1f9d66557850cc2811479d5bb645 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 17 Jun 2019 17:40:52 +0200
Subject: [PATCH 2161/2864] Document automatic titles from content file names

Closes #2107
---
 docs/content.rst | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/content.rst b/docs/content.rst
index a6d1c4c6..f0022c35 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -116,7 +116,7 @@ specified either via the ``tags`` metadata, as is standard in Pelican, or via
 the ``keywords`` metadata, as is standard in HTML. The two can be used
 interchangeably.
 
-Note that, aside from the title, none of this article metadata is mandatory:
+Note that, aside from the title, none of this content metadata is mandatory:
 if the date is not specified and ``DEFAULT_DATE`` is set to ``'fs'``, Pelican
 will rely on the file's "mtime" timestamp, and the category can be determined
 by the directory in which the file resides. For example, a file located at
@@ -126,6 +126,15 @@ not be a good category name, you can set the setting ``USE_FOLDER_AS_CATEGORY``
 to ``False``.  When parsing dates given in the page metadata, Pelican supports
 the W3C's `suggested subset ISO 8601`__.
 
+So the title is the only required metadata. If that bothers you, worry not.
+Instead of manually specifying a title in your metadata each time, you can use
+the source content file name as the title. For example, a Markdown source file
+named ``Publishing via Pelican.md`` would automatically be assigned a title of
+*Publishing via Pelican*. If you would prefer this behavior, add the following
+line to your settings file::
+
+    FILENAME_METADATA = '(?P<title>.*)'
+
 .. note::
 
    When experimenting with different settings (especially the metadata

From 9e07234baeb1542f37b1d2b9366d87e30de92f3c Mon Sep 17 00:00:00 2001
From: John Franey <johnfraney@gmail.com>
Date: Mon, 13 May 2019 17:30:29 -0400
Subject: [PATCH 2162/2864] Update Tox config and fix failing CI envs

Updates base Python version for Travis CI from 2.7 to 3.6 and fixes a
linting error.
---
 .travis.yml       | 4 ++--
 pelican/server.py | 2 +-
 tox.ini           | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 31b3ac8b..69034a97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 language: python
 python:
-  - "3.5"
+  - "3.6"
 env:
   - TOX_ENV=docs
   - TOX_ENV=flake8
   - TOX_ENV=py27
-  - TOX_ENV=py35
+  - TOX_ENV=py36
 matrix:
   include:
     - python: 3.6
diff --git a/pelican/server.py b/pelican/server.py
index 82ad70cd..841b8e88 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -138,6 +138,6 @@ if __name__ == '__main__':
                 args.port, args.server)
     try:
         httpd.serve_forever()
-    except KeyboardInterrupt as e:
+    except KeyboardInterrupt:
         logger.info("Shutting down server.")
         httpd.socket.close()
diff --git a/tox.ini b/tox.ini
index fc95ff91..15dbaee8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ commands =
     - coveralls
 
 [testenv:docs]
-basepython = python2.7
+basepython = python3.6
 deps =
     -rrequirements/docs.pip
 changedir = docs
@@ -34,7 +34,7 @@ application-import-names = pelican
 import-order-style = cryptography
 
 [testenv:flake8]
-basepython = python2.7
+basepython = python3.6
 deps =
     -rrequirements/style.pip
 commands =

From 28383a6355c6c238a86a469b4a410139a3ce3d7a Mon Sep 17 00:00:00 2001
From: John Franey <johnfraney@gmail.com>
Date: Sat, 2 Feb 2019 16:24:11 -0400
Subject: [PATCH 2163/2864] Add livereload invoke task. Fixes #1326

Adds a `livereload` invoke task that builds the project and reloads the
browser window when content files are updated.

Usage:

```console
$ invoke livereload
[I 190202 16:28:30 server:298] Serving on http://127.0.0.1:5500
[I 190202 16:28:30 handlers:59] Start watching changes
[I 190202 16:28:30 handlers:61] Start detecting changes
[I 190202 16:28:32 handlers:132] Browser Connected: http://127.0.0.1:5500/
```

See: https://livereload.readthedocs.io/en/latest/
---
 pelican/tools/templates/tasks.py.jinja2 | 20 ++++++++++++++++++++
 setup.py                                |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index f022bfc0..5b27e2b5 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -7,7 +7,14 @@ import datetime
 
 from invoke import task
 from invoke.util import cd
+from livereload import Server
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
+from pelican.settings import DEFAULT_CONFIG, get_settings_from_file
+
+SETTINGS = {}
+SETTINGS.update(DEFAULT_CONFIG)
+LOCAL_SETTINGS = get_settings_from_file('pelicanconf.py')
+SETTINGS.update(LOCAL_SETTINGS)
 
 CONFIG = {
     # Local path configuration (can be absolute or relative to tasks.py)
@@ -80,6 +87,19 @@ def preview(c):
     """Build production version of site"""
     c.run('pelican -s publishconf.py')
 
+@task
+def livereload(c):
+    """Automatically reload browser tab upon file modification."""
+    build(c)
+    server = Server()
+    deploy_path = CONFIG['deploy_path']
+    content_path = SETTINGS['PATH']
+    content_file_extensions = ['.md', '.rst']
+    for file_extension in content_file_extensions:
+        content_blob = '{0}/**/*{1}'.format(content_path, file_extension)
+        server.watch(content_blob, lambda: build(c))
+    server.serve(root=deploy_path)
+
 {% if cloudfiles %}
 @task
 def cf_upload(c):
diff --git a/setup.py b/setup.py
index e8918941..25e109c4 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ from setuptools import setup
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',
-            'python-dateutil']
+            'python-dateutil', 'livereload']
 
 entry_points = {
     'console_scripts': [

From ca012bd288d388c45fa060caddfdd1e48bca8d8a Mon Sep 17 00:00:00 2001
From: John Franey <johnfraney@gmail.com>
Date: Tue, 18 Jun 2019 22:56:18 -0400
Subject: [PATCH 2164/2864] Update livereload Invoke task and add docs

Removes the `livereload` dependency from `setup.py`.

Updates the `invoke livereload` task by moving the `livereload` import
into the task function since it is now an optional dependency.

Updates the Invoke section of the documentaion with instructions on
using the `livereload` Invoke task.
---
 docs/publish.rst                        | 6 ++++++
 pelican/tools/templates/tasks.py.jinja2 | 2 +-
 setup.py                                | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/publish.rst b/docs/publish.rst
index 197aa779..96d67d58 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -146,6 +146,12 @@ http://localhost:8000/::
 
     invoke serve
 
+To serve the generated site with automatic browser reloading every time a
+change is detected, first ``pip install livereload``, then use the
+following command::
+
+    invoke livereload
+
 If during the ``pelican-quickstart`` process you answered "yes" when asked
 whether you want to upload your site via SSH, you can use the following command
 to publish your site via rsync over SSH::
diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 5b27e2b5..ef48e968 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -7,7 +7,6 @@ import datetime
 
 from invoke import task
 from invoke.util import cd
-from livereload import Server
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import DEFAULT_CONFIG, get_settings_from_file
 
@@ -90,6 +89,7 @@ def preview(c):
 @task
 def livereload(c):
     """Automatically reload browser tab upon file modification."""
+    from livereload import Server
     build(c)
     server = Server()
     deploy_path = CONFIG['deploy_path']
diff --git a/setup.py b/setup.py
index 25e109c4..e8918941 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ from setuptools import setup
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',
-            'python-dateutil', 'livereload']
+            'python-dateutil']
 
 entry_points = {
     'console_scripts': [

From 5525a9021ed197d3f6edb488d37cd371c18a73c8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 19 Jun 2019 15:45:32 +0200
Subject: [PATCH 2165/2864] Use OUTPUT_PATH setting in Invoke tasks.py template

The default setting for OUTPUT_PATH is already 'output', so it would be
more DRY to use the existing default value instead of a hardcoded
'output' string.
---
 pelican/tools/templates/tasks.py.jinja2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index ef48e968..80bd2ae3 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -16,8 +16,8 @@ LOCAL_SETTINGS = get_settings_from_file('pelicanconf.py')
 SETTINGS.update(LOCAL_SETTINGS)
 
 CONFIG = {
-    # Local path configuration (can be absolute or relative to tasks.py)
-    'deploy_path': 'output',
+    # Output path. Can be absolute or relative to tasks.py. Default: 'output'
+    'deploy_path': SETTINGS['OUTPUT_PATH'],
 {% if ssh %}
     # Remote server configuration
     'production': '{{ssh_user}}@{{ssh_host}}:{{ssh_port}}',

From 4b5610175f9ae5698bb845b3853725bd9a097696 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 19 Jun 2019 16:11:16 +0200
Subject: [PATCH 2166/2864] Invoke: Make settings file name handling more DRY

Instead of repeating hard-coded 'pelicanconf.py' values throughout
Invoke's task.py template, assign default settings file names to
variables, and use those variables where applicable.
---
 pelican/tools/templates/tasks.py.jinja2 | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 80bd2ae3..889253c9 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -10,12 +10,15 @@ from invoke.util import cd
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import DEFAULT_CONFIG, get_settings_from_file
 
+SETTINGS_FILE_BASE = 'pelicanconf.py'
 SETTINGS = {}
 SETTINGS.update(DEFAULT_CONFIG)
-LOCAL_SETTINGS = get_settings_from_file('pelicanconf.py')
+LOCAL_SETTINGS = get_settings_from_file(SETTINGS_FILE_BASE)
 SETTINGS.update(LOCAL_SETTINGS)
 
 CONFIG = {
+    'settings_base': SETTINGS_FILE_BASE,
+    'settings_publish': 'publishconf.py',
     # Output path. Can be absolute or relative to tasks.py. Default: 'output'
     'deploy_path': SETTINGS['OUTPUT_PATH'],
 {% if ssh %}
@@ -48,17 +51,17 @@ def clean(c):
 @task
 def build(c):
     """Build local version of site"""
-    c.run('pelican -s pelicanconf.py')
+    c.run('pelican -s {settings_base}'.format(**CONFIG))
 
 @task
 def rebuild(c):
     """`build` with the delete switch"""
-    c.run('pelican -d -s pelicanconf.py')
+    c.run('pelican -d -s {settings_base}'.format(**CONFIG))
 
 @task
 def regenerate(c):
     """Automatically regenerate site upon file modification"""
-    c.run('pelican -r -s pelicanconf.py')
+    c.run('pelican -r -s {settings_base}'.format(**CONFIG))
 
 @task
 def serve(c):
@@ -84,7 +87,7 @@ def reserve(c):
 @task
 def preview(c):
     """Build production version of site"""
-    c.run('pelican -s publishconf.py')
+    c.run('pelican -s {settings_publish}'.format(**CONFIG))
 
 @task
 def livereload(c):
@@ -115,7 +118,7 @@ def cf_upload(c):
 @task
 def publish(c):
     """Publish to production via rsync"""
-    c.run('pelican -s publishconf.py')
+    c.run('pelican -s {settings_publish}'.format(**CONFIG))
     c.run(
         'rsync --delete --exclude ".DS_Store" -pthrvz -c '
         '{} {production}:{dest_path}'.format(

From 8b4c46d74b08851c8d4efa14ad31579f50bed55e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 20 Jun 2019 07:49:48 +0200
Subject: [PATCH 2167/2864] Invoke `serve` task docstring: port is configurable

---
 pelican/tools/templates/tasks.py.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 889253c9..95164354 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -65,7 +65,7 @@ def regenerate(c):
 
 @task
 def serve(c):
-    """Serve site at http://localhost:8000/"""
+    """Serve site at http://localhost:$PORT/ (default port is 8000)"""
 
     class AddressReuseTCPServer(RootedHTTPServer):
         allow_reuse_address = True

From ae7af1d696997f1194007c3a6859cd564557f403 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 20 Jun 2019 08:08:48 +0200
Subject: [PATCH 2168/2864] Remove redundant vars in Invoke livereload task

---
 pelican/tools/templates/tasks.py.jinja2 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 95164354..0e1fad7a 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -95,13 +95,12 @@ def livereload(c):
     from livereload import Server
     build(c)
     server = Server()
-    deploy_path = CONFIG['deploy_path']
-    content_path = SETTINGS['PATH']
+    # Watch content source files
     content_file_extensions = ['.md', '.rst']
-    for file_extension in content_file_extensions:
-        content_blob = '{0}/**/*{1}'.format(content_path, file_extension)
+    for extension in content_file_extensions:
+        content_blob = '{0}/**/*{1}'.format(SETTINGS['PATH'], extension)
         server.watch(content_blob, lambda: build(c))
-    server.serve(root=deploy_path)
+    server.serve(root=CONFIG['deploy_path'])
 
 {% if cloudfiles %}
 @task

From c8b0b52d4e8f76bfd9bd59cb0a6bb4cf0d697b5c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 20 Jun 2019 08:12:14 +0200
Subject: [PATCH 2169/2864] Use port settings in Invoke livereload task

Instead of using LiveReload's default port 5500, use the existing `port`
value from the task's CONFIG dictionary, which defaults to 8000.
---
 pelican/tools/templates/tasks.py.jinja2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 0e1fad7a..7922aa9a 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -100,7 +100,8 @@ def livereload(c):
     for extension in content_file_extensions:
         content_blob = '{0}/**/*{1}'.format(SETTINGS['PATH'], extension)
         server.watch(content_blob, lambda: build(c))
-    server.serve(root=CONFIG['deploy_path'])
+    # Serve output path on configured port
+    server.serve(port=CONFIG['port'], root=CONFIG['deploy_path'])
 
 {% if cloudfiles %}
 @task

From cf2275c3be307d4061be892524621e146811d8fd Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 20 Jun 2019 08:18:00 +0200
Subject: [PATCH 2170/2864] Add settings file to Invoke livereload watch list

---
 pelican/tools/templates/tasks.py.jinja2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 7922aa9a..45c8768d 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -95,6 +95,8 @@ def livereload(c):
     from livereload import Server
     build(c)
     server = Server()
+    # Watch the base settings file
+    server.watch(CONFIG['settings_base'], lambda: build(c))
     # Watch content source files
     content_file_extensions = ['.md', '.rst']
     for extension in content_file_extensions:

From a4cecd2d0c719beab52fa86b2bc5b7a9ddaa1659 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 20 Jun 2019 08:30:04 +0200
Subject: [PATCH 2171/2864] Add theme templates, CSS, JS to Invoke livereload
 task

---
 pelican/tools/templates/tasks.py.jinja2 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 45c8768d..a800b79b 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -102,6 +102,13 @@ def livereload(c):
     for extension in content_file_extensions:
         content_blob = '{0}/**/*{1}'.format(SETTINGS['PATH'], extension)
         server.watch(content_blob, lambda: build(c))
+    # Watch the theme's templates and static assets
+    theme_path = SETTINGS['THEME']
+    server.watch('{}/templates/*.html'.format(theme_path), lambda: build(c))
+    static_file_extensions = ['.css', '.js']
+    for extension in static_file_extensions:
+        static_file = '{0}/static/**/*{1}'.format(theme_path, extension)
+        server.watch(static_file, lambda: build(c))
     # Serve output path on configured port
     server.serve(port=CONFIG['port'], root=CONFIG['deploy_path'])
 

From 80540281bc245ca02933682f8b54be2d49a35226 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 24 Jun 2019 20:21:19 +0200
Subject: [PATCH 2172/2864] Add Python 3.5 env back to Travis tests. Refs #2571

Previous change resulted in Python 3.5 missing from the test
environment, as well as a duplicate Python 3.6 test run.
---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 69034a97..762ada98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,10 @@ env:
   - TOX_ENV=docs
   - TOX_ENV=flake8
   - TOX_ENV=py27
+  - TOX_ENV=py35
   - TOX_ENV=py36
 matrix:
   include:
-    - python: 3.6
-      env:
-      - TOX_ENV=py36
     - python: 3.7
       sudo: true
       dist: xenial

From 216eec50fcc19a29fc36c051147430b8f01a88ea Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 28 Jun 2019 16:57:23 +0200
Subject: [PATCH 2173/2864] Add pyproject.toml and poetry.lock to project

This could facilitate publishing new versions of Pelican as well as make
it easier for Poetry users to install Pelican via: `poetry install`

Closes #2450
---
 poetry.lock    | 547 +++++++++++++++++++++++++++++++++++++++++++++++++
 pyproject.toml |  57 ++++++
 2 files changed, 604 insertions(+)
 create mode 100644 poetry.lock
 create mode 100644 pyproject.toml

diff --git a/poetry.lock b/poetry.lock
new file mode 100644
index 00000000..027094e4
--- /dev/null
+++ b/poetry.lock
@@ -0,0 +1,547 @@
+[[package]]
+category = "dev"
+description = "A configurable sidebar-enabled Sphinx theme"
+name = "alabaster"
+optional = false
+python-versions = "*"
+version = "0.7.12"
+
+[[package]]
+category = "dev"
+description = "Internationalization utilities"
+name = "babel"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "2.7.0"
+
+[package.dependencies]
+pytz = ">=2015.7"
+
+[[package]]
+category = "dev"
+description = "backports.functools_lru_cache"
+marker = "python_version < \"3\""
+name = "backports.functools-lru-cache"
+optional = false
+python-versions = ">=2.6"
+version = "1.5"
+
+[[package]]
+category = "dev"
+description = "Screen-scraping library"
+name = "beautifulsoup4"
+optional = false
+python-versions = "*"
+version = "4.7.1"
+
+[package.dependencies]
+soupsieve = ">=1.2"
+
+[[package]]
+category = "main"
+description = "Fast, simple object-to-object and broadcast signaling"
+name = "blinker"
+optional = false
+python-versions = "*"
+version = "1.4"
+
+[[package]]
+category = "dev"
+description = "Cross-platform colored terminal text."
+marker = "sys_platform == \"win32\""
+name = "colorama"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "0.4.1"
+
+[[package]]
+category = "dev"
+description = "Updated configparser from Python 3.7 for Python 2.6+."
+marker = "python_version < \"3.2\""
+name = "configparser"
+optional = false
+python-versions = ">=2.6"
+version = "3.7.4"
+
+[[package]]
+category = "dev"
+description = "Backports and enhancements for the contextlib module"
+marker = "python_version < \"3\""
+name = "contextlib2"
+optional = false
+python-versions = "*"
+version = "0.5.5"
+
+[[package]]
+category = "main"
+description = "Docutils -- Python Documentation Utilities"
+name = "docutils"
+optional = false
+python-versions = "*"
+version = "0.14"
+
+[[package]]
+category = "dev"
+description = "Discover and load entry points from installed packages."
+name = "entrypoints"
+optional = false
+python-versions = ">=2.7"
+version = "0.3"
+
+[package.dependencies]
+[package.dependencies.configparser]
+python = ">=2.7,<2.8"
+version = ">=3.5"
+
+[[package]]
+category = "dev"
+description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"
+marker = "python_version < \"3.4\""
+name = "enum34"
+optional = false
+python-versions = "*"
+version = "1.1.6"
+
+[[package]]
+category = "main"
+description = "Standalone version of django.utils.feedgenerator"
+name = "feedgenerator"
+optional = false
+python-versions = "*"
+version = "1.9"
+
+[package.dependencies]
+pytz = ">=0a"
+six = "*"
+
+[[package]]
+category = "dev"
+description = "A platform independent file lock."
+name = "filelock"
+optional = false
+python-versions = "*"
+version = "3.0.12"
+
+[[package]]
+category = "dev"
+description = "the modular source code checker: pep8, pyflakes and co"
+name = "flake8"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "3.7.7"
+
+[package.dependencies]
+entrypoints = ">=0.3.0,<0.4.0"
+mccabe = ">=0.6.0,<0.7.0"
+pycodestyle = ">=2.5.0,<2.6.0"
+pyflakes = ">=2.1.0,<2.2.0"
+
+[package.dependencies.configparser]
+python = "<3.2"
+version = "*"
+
+[package.dependencies.enum34]
+python = "<3.4"
+version = "*"
+
+[package.dependencies.functools32]
+python = "<3.2"
+version = "*"
+
+[package.dependencies.typing]
+python = "<3.5"
+version = "*"
+
+[[package]]
+category = "dev"
+description = "Flake8 and pylama plugin that checks the ordering of import statements."
+name = "flake8-import-order"
+optional = false
+python-versions = "*"
+version = "0.18.1"
+
+[package.dependencies]
+pycodestyle = "*"
+setuptools = "*"
+
+[package.dependencies.enum34]
+python = "<2.8"
+version = "*"
+
+[[package]]
+category = "dev"
+description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"
+marker = "python_version < \"3.3\""
+name = "funcsigs"
+optional = false
+python-versions = "*"
+version = "1.0.2"
+
+[[package]]
+category = "dev"
+description = "Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy."
+marker = "python_version < \"3.2\""
+name = "functools32"
+optional = false
+python-versions = "*"
+version = "3.2.3-2"
+
+[[package]]
+category = "dev"
+description = "Getting image size from png/jpeg/jpeg2000/gif file"
+name = "imagesize"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "1.1.0"
+
+[[package]]
+category = "dev"
+description = "Read metadata from Python packages"
+name = "importlib-metadata"
+optional = false
+python-versions = ">=2.7,!=3.0,!=3.1,!=3.2,!=3.3"
+version = "0.18"
+
+[package.dependencies]
+zipp = ">=0.5"
+
+[package.dependencies.configparser]
+python = "<3"
+version = ">=3.5"
+
+[package.dependencies.contextlib2]
+python = "<3"
+version = "*"
+
+[[package]]
+category = "main"
+description = "A small but fast and easy to use stand-alone template engine written in pure python."
+name = "jinja2"
+optional = false
+python-versions = "*"
+version = "2.10.1"
+
+[package.dependencies]
+MarkupSafe = ">=0.23"
+
+[[package]]
+category = "dev"
+description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
+name = "lxml"
+optional = false
+python-versions = "*"
+version = "4.3.4"
+
+[[package]]
+category = "main"
+description = "Python implementation of Markdown."
+name = "markdown"
+optional = false
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*"
+version = "3.1.1"
+
+[package.dependencies]
+setuptools = ">=36"
+
+[[package]]
+category = "main"
+description = "Safely add untrusted strings to HTML/XML markup."
+name = "markupsafe"
+optional = false
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
+version = "1.1.1"
+
+[[package]]
+category = "dev"
+description = "McCabe checker, plugin for flake8"
+name = "mccabe"
+optional = false
+python-versions = "*"
+version = "0.6.1"
+
+[[package]]
+category = "dev"
+description = "Rolling backport of unittest.mock for all Pythons"
+name = "mock"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "3.0.5"
+
+[package.dependencies]
+six = "*"
+
+[package.dependencies.funcsigs]
+python = "<3.3"
+version = ">=1"
+
+[[package]]
+category = "dev"
+description = "Core utilities for Python packages"
+name = "packaging"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "19.0"
+
+[package.dependencies]
+pyparsing = ">=2.0.2"
+six = "*"
+
+[[package]]
+category = "dev"
+description = "plugin and hook calling mechanisms for python"
+name = "pluggy"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "0.12.0"
+
+[package.dependencies]
+importlib-metadata = ">=0.12"
+
+[[package]]
+category = "dev"
+description = "library with cross-python path, ini-parsing, io, code, log facilities"
+name = "py"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "1.8.0"
+
+[[package]]
+category = "dev"
+description = "Python style guide checker"
+name = "pycodestyle"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "2.5.0"
+
+[[package]]
+category = "dev"
+description = "passive checker of Python programs"
+name = "pyflakes"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "2.1.1"
+
+[[package]]
+category = "main"
+description = "Pygments is a syntax highlighting package written in Python."
+name = "pygments"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+version = "2.4.2"
+
+[[package]]
+category = "dev"
+description = "Python parsing module"
+name = "pyparsing"
+optional = false
+python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+version = "2.4.0"
+
+[[package]]
+category = "main"
+description = "Extensions to the standard Python datetime module"
+name = "python-dateutil"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+version = "2.8.0"
+
+[package.dependencies]
+six = ">=1.5"
+
+[[package]]
+category = "main"
+description = "World timezone definitions, modern and historical"
+name = "pytz"
+optional = false
+python-versions = "*"
+version = "2019.1"
+
+[[package]]
+category = "main"
+description = "Python 2 and 3 compatibility utilities"
+name = "six"
+optional = false
+python-versions = ">=2.6, !=3.0.*, !=3.1.*"
+version = "1.12.0"
+
+[[package]]
+category = "dev"
+description = "Python with the SmartyPants"
+name = "smartypants"
+optional = false
+python-versions = "*"
+version = "2.0.1"
+
+[[package]]
+category = "dev"
+description = "This package provides 23 stemmers for 22 languages generated from Snowball algorithms."
+name = "snowballstemmer"
+optional = false
+python-versions = "*"
+version = "1.9.0"
+
+[[package]]
+category = "dev"
+description = "A modern CSS selector implementation for Beautiful Soup."
+name = "soupsieve"
+optional = false
+python-versions = "*"
+version = "1.9.2"
+
+[package.dependencies]
+[package.dependencies."backports.functools-lru-cache"]
+python = "<3"
+version = "*"
+
+[[package]]
+category = "dev"
+description = "Python documentation generator"
+name = "sphinx"
+optional = false
+python-versions = "*"
+version = "1.4.9"
+
+[package.dependencies]
+Jinja2 = ">=2.3"
+Pygments = ">=2.0"
+alabaster = ">=0.7,<0.8"
+babel = ">=1.3,<2.0 || >2.0"
+colorama = ">=0.3.5"
+docutils = ">=0.11"
+imagesize = "*"
+six = ">=1.5"
+snowballstemmer = ">=1.1"
+
+[[package]]
+category = "dev"
+description = "Read the Docs theme for Sphinx"
+name = "sphinx-rtd-theme"
+optional = false
+python-versions = "*"
+version = "0.4.3"
+
+[package.dependencies]
+sphinx = "*"
+
+[[package]]
+category = "dev"
+description = "Python Library for Tom's Obvious, Minimal Language"
+name = "toml"
+optional = false
+python-versions = "*"
+version = "0.10.0"
+
+[[package]]
+category = "dev"
+description = "tox is a generic virtualenv management and test command line tool"
+name = "tox"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "3.13.1"
+
+[package.dependencies]
+filelock = ">=3.0.0,<4"
+importlib-metadata = ">=0.12,<1"
+packaging = ">=14"
+pluggy = ">=0.12.0,<1"
+py = ">=1.4.17,<2"
+six = ">=1.0.0,<2"
+toml = ">=0.9.4"
+virtualenv = ">=14.0.0"
+
+[[package]]
+category = "dev"
+description = "Type Hints for Python"
+marker = "python_version < \"3.5\""
+name = "typing"
+optional = false
+python-versions = "*"
+version = "3.7.4"
+
+[[package]]
+category = "dev"
+description = "Filters to enhance web typography, including support for Django & Jinja templates"
+name = "typogrify"
+optional = false
+python-versions = "*"
+version = "2.0.7"
+
+[package.dependencies]
+smartypants = ">=1.8.3"
+
+[[package]]
+category = "main"
+description = "ASCII transliterations of Unicode text"
+name = "unidecode"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "1.1.1"
+
+[[package]]
+category = "dev"
+description = "Virtual Python Environment builder"
+name = "virtualenv"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "16.6.1"
+
+[[package]]
+category = "dev"
+description = "Backport of pathlib-compatible object wrapper for zip files"
+name = "zipp"
+optional = false
+python-versions = ">=2.7"
+version = "0.5.1"
+
+[metadata]
+content-hash = "fe931042341d072acdb02907e16b4cd34947b8edbac5222f2521d961147280d7"
+python-versions = "~2.7 || ^3.5"
+
+[metadata.hashes]
+alabaster = ["446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359", "a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"]
+babel = ["af92e6106cb7c55286b25b38ad7695f8b4efb36a90ba483d7f7a6628c46158ab", "e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28"]
+"backports.functools-lru-cache" = ["9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd"]
+beautifulsoup4 = ["034740f6cb549b4e932ae1ab975581e6103ac8f942200a0e9759065984391858", "945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348", "ba6d5c59906a85ac23dadfe5c88deaf3e179ef565f4898671253e50a78680718"]
+blinker = ["471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6"]
+colorama = ["05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d", "f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48"]
+configparser = ["8be81d89d6e7b4c0d4e44bcc525845f6da25821de80cb5e06e7e0238a2899e32", "da60d0014fd8c55eb48c1c5354352e363e2d30bbf7057e5e171a468390184c75"]
+contextlib2 = ["509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48", "f5260a6e679d2ff42ec91ec5252f4eeffdcf21053db9113bd0a8e4d953769c00"]
+docutils = ["02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6", "51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274", "7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6"]
+entrypoints = ["589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19", "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"]
+enum34 = ["2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850", "644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a", "6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79", "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"]
+feedgenerator = ["5ae05daa9cfa47fa406ee4744d0b7fa1c8a05a7a47ee0ad328ddf55327cfb106"]
+filelock = ["18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59", "929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"]
+flake8 = ["859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661", "a796a115208f5c03b18f332f7c11729812c8c3ded6c46319c59b53efd3819da8"]
+flake8-import-order = ["90a80e46886259b9c396b578d75c749801a41ee969a235e163cfe1be7afd2543", "a28dc39545ea4606c1ac3c24e9d05c849c6e5444a50fb7e9cdd430fc94de6e92"]
+funcsigs = ["330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"]
+functools32 = ["89d824aa6c358c421a234d7f9ee0bd75933a67c29588ce50aaa3acdf4d403fa0", "f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d"]
+imagesize = ["3f349de3eb99145973fefb7dbe38554414e5c30abd0c8e4b970a7c9d09f3a1d8", "f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5"]
+importlib-metadata = ["6dfd58dfe281e8d240937776065dd3624ad5469c835248219bd16cf2e12dbeb7", "cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db"]
+jinja2 = ["065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", "14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b"]
+lxml = ["06c7616601430aa140a69f97e3116308fffe0848f543b639a5ec2e8920ae72fd", "177202792f9842374a8077735c69c41a4282183f7851443d2beb8ee310720819", "19317ad721ceb9e39847d11131903931e2794e447d4751ebb0d9236f1b349ff2", "36d206e62f3e5dbaafd4ec692b67157e271f5da7fd925fda8515da675eace50d", "387115b066c797c85f9861a9613abf50046a15aac16759bc92d04f94acfad082", "3ce1c49d4b4a7bc75fb12acb3a6247bb7a91fe420542e6d671ba9187d12a12c2", "4d2a5a7d6b0dbb8c37dab66a8ce09a8761409c044017721c21718659fa3365a1", "58d0a1b33364d1253a88d18df6c0b2676a1746d27c969dc9e32d143a3701dda5", "62a651c618b846b88fdcae0533ec23f185bb322d6c1845733f3123e8980c1d1b", "69ff21064e7debc9b1b1e2eee8c2d686d042d4257186d70b338206a80c5bc5ea", "7060453eba9ba59d821625c6af6a266bd68277dce6577f754d1eb9116c094266", "7d26b36a9c4bce53b9cfe42e67849ae3c5c23558bc08363e53ffd6d94f4ff4d2", "83b427ad2bfa0b9705e02a83d8d607d2c2f01889eb138168e462a3a052c42368", "923d03c84534078386cf50193057aae98fa94cace8ea7580b74754493fda73ad", "b773715609649a1a180025213f67ffdeb5a4878c784293ada300ee95a1f3257b", "baff149c174e9108d4a2fee192c496711be85534eab63adb122f93e70aa35431", "bca9d118b1014b4c2d19319b10a3ebed508ff649396ce1855e1c96528d9b2fa9", "ce580c28845581535dc6000fc7c35fdadf8bea7ccb57d6321b044508e9ba0685", "d34923a569e70224d88e6682490e24c842907ba2c948c5fd26185413cbe0cd96", "dd9f0e531a049d8b35ec5e6c68a37f1ba6ec3a591415e6804cbdf652793d15d7", "ecb805cbfe9102f3fd3d2ef16dfe5ae9e2d7a7dfbba92f4ff1e16ac9784dbfb0", "ede9aad2197a0202caff35d417b671f5f91a3631477441076082a17c94edd846", "ef2d1fc370400e0aa755aab0b20cf4f1d0e934e7fd5244f3dd4869078e4942b9", "f2fec194a49bfaef42a548ee657362af5c7a640da757f6f452a35da7dd9f923c"]
+markdown = ["2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a", "56a46ac655704b91e5b7e6326ce43d5ef72411376588afa1dd90e881b83c7e8c"]
+markupsafe = ["00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", "09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", "09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", "1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", "24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", "43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", "46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", "500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", "535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", "62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", "6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", "717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", "79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", "7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", "88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", "8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", "98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", "9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", "9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", "ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", "b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", "b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", "b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", "ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", "c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", "cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", "e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"]
+mccabe = ["ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", "dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"]
+mock = ["83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3", "d157e52d4e5b938c550f39eb2fd15610db062441a9c2747d3dbfa9298211d0f8"]
+packaging = ["0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af", "9e1cbf8c12b1f1ce0bb5344b8d7ecf66a6f8a6e91bcb0c84593ed6d3ab5c4ab3"]
+pluggy = ["0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc", "b9817417e95936bf75d85d3f8767f7df6cdde751fc40aed3bb3074cbcb77757c"]
+py = ["64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa", "dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53"]
+pycodestyle = ["95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56", "e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"]
+pyflakes = ["17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0", "d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2"]
+pygments = ["71e430bc85c88a430f000ac1d9b331d2407f681d6f6aec95e8bcfbc3df5b0127", "881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297"]
+pyparsing = ["1873c03321fc118f4e9746baf201ff990ceb915f433f23b395f5580d1840cb2a", "9b6323ef4ab914af344ba97510e966d64ba91055d6b9afa6b30799340e89cc03"]
+python-dateutil = ["7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb", "c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e"]
+pytz = ["303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda", "d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141"]
+six = ["3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"]
+smartypants = ["8db97f7cbdf08d15b158a86037cd9e116b4cf37703d24e0419a0d64ca5808f0d"]
+snowballstemmer = ["9f3b9ffe0809d174f7047e121431acf99c89a7040f0ca84f94ba53a498e6d0c9"]
+soupsieve = ["72b5f1aea9101cf720a36bb2327ede866fd6f1a07b1e87c92a1cc18113cbc946", "e4e9c053d59795e440163733a7fec6c5972210e1790c507e4c7b051d6c5259de"]
+sphinx = ["82cd2728c906be96e307b81352d3fd9fb731869234c6b835cc25e9a3dfb4b7e4", "b83f430200f546bfd5088c653f0c5516af708da36066dfde08d08bedb1b33a4b"]
+sphinx-rtd-theme = ["00cf895504a7895ee433807c62094cf1e95f065843bf3acd17037c3e9a2becd4", "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a"]
+toml = ["229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", "235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e", "f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"]
+tox = ["45a265e953368fb372cca3eac33b69fdb1b1453e5b114be231c84fc3dfadceed", "f5cb0b5b8d14f2100982b0981c750d840228180a348e6bad355aa38e949fbc3f"]
+typing = ["38566c558a0a94d6531012c8e917b1b8518a41e418f7f15f00e129cc80162ad3", "53765ec4f83a2b720214727e319607879fec4acde22c4fbb54fa2604e79e44ce", "84698954b4e6719e912ef9a42a2431407fe3755590831699debda6fba92aac55"]
+typogrify = ["8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"]
+unidecode = ["1d7a042116536098d05d599ef2b8616759f02985c85b4fef50c78a5aaf10822a", "2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8"]
+virtualenv = ["b7335cddd9260a3dd214b73a2521ffc09647bde3e9457fcca31dc3be3999d04a", "d28ca64c0f3f125f59cabf13e0a150e1c68e5eea60983cc4395d88c584495783"]
+zipp = ["8c1019c6aad13642199fbe458275ad6a84907634cc9f0989877ccc4a2840139d", "ca943a7e809cc12257001ccfb99e3563da9af99d52f261725e96dfe0f9275bc3"]
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 00000000..2545aa1c
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,57 @@
+[tool.poetry]
+name = "pelican"
+version = "4.0.1"
+description = "Static site generator supporting Markdown and reStructuredText"
+authors = ["Justin Mayer <entrop@gmail.com>"]
+license = "AGPLv3"
+readme = "README.rst"
+keywords = ["static site generator", "static sites", "ssg"]
+
+homepage = "https://getpelican.com"
+repository = "https://github.com/getpelican/pelican"
+documentation = "https://docs.getpelican.com"
+
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Framework :: Pelican",
+    "License :: OSI Approved :: GNU Affero General Public License v3",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 2",
+    "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.5",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Topic :: Internet :: WWW/HTTP",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+
+[tool.poetry.dependencies]
+python = "~2.7 || ^3.5"
+feedgenerator = "^1.9"
+jinja2 = "~2.10.1"
+pygments = "^2.4"
+pytz = "^2019.1"
+blinker = "^1.4"
+unidecode = "^1.1"
+python-dateutil = "^2.8"
+docutils = "^0.14"
+markdown = "~3.1.1"
+six = "^1.4"
+
+[tool.poetry.dev-dependencies]
+BeautifulSoup4 = "^4.7"
+lxml = "^4.3"
+typogrify = "^2.0"
+mock = "^3.0"
+sphinx = "=1.4.9"
+sphinx_rtd_theme = "^0.4.3"
+tox = "^3.13"
+flake8 = "^3.7"
+flake8-import-order = "^0.18.1"
+
+[build-system]
+requires = ["poetry>=0.12"]
+build-backend = "poetry.masonry.api"

From b5c7e6fbe8cadb51f925f7060e91c7abecffe2f4 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 1 Jul 2019 13:52:57 +0200
Subject: [PATCH 2174/2864] Make Markdown an optional dependency in pyproject

Refs #2585
---
 poetry.lock    | 9 ++++++---
 pyproject.toml | 6 +++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 027094e4..971f6520 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -437,7 +437,7 @@ description = "tox is a generic virtualenv management and test command line tool
 name = "tox"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "3.13.1"
+version = "3.13.2"
 
 [package.dependencies]
 filelock = ">=3.0.0,<4"
@@ -493,8 +493,11 @@ optional = false
 python-versions = ">=2.7"
 version = "0.5.1"
 
+[extras]
+markdown = ["markdown"]
+
 [metadata]
-content-hash = "fe931042341d072acdb02907e16b4cd34947b8edbac5222f2521d961147280d7"
+content-hash = "d22ff0db3331186ab2f809313de1f9efef1f9c708cc354eaa1638a5111404612"
 python-versions = "~2.7 || ^3.5"
 
 [metadata.hashes]
@@ -539,7 +542,7 @@ soupsieve = ["72b5f1aea9101cf720a36bb2327ede866fd6f1a07b1e87c92a1cc18113cbc946",
 sphinx = ["82cd2728c906be96e307b81352d3fd9fb731869234c6b835cc25e9a3dfb4b7e4", "b83f430200f546bfd5088c653f0c5516af708da36066dfde08d08bedb1b33a4b"]
 sphinx-rtd-theme = ["00cf895504a7895ee433807c62094cf1e95f065843bf3acd17037c3e9a2becd4", "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a"]
 toml = ["229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", "235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e", "f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"]
-tox = ["45a265e953368fb372cca3eac33b69fdb1b1453e5b114be231c84fc3dfadceed", "f5cb0b5b8d14f2100982b0981c750d840228180a348e6bad355aa38e949fbc3f"]
+tox = ["dab0b0160dd187b654fc33d690ee1d7bf328bd5b8dc6ef3bb3cc468969c659ba", "ee35ffce74933a6c6ac10c9a0182e41763140a5a5070e21b114feca56eaccdcd"]
 typing = ["38566c558a0a94d6531012c8e917b1b8518a41e418f7f15f00e129cc80162ad3", "53765ec4f83a2b720214727e319607879fec4acde22c4fbb54fa2604e79e44ce", "84698954b4e6719e912ef9a42a2431407fe3755590831699debda6fba92aac55"]
 typogrify = ["8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"]
 unidecode = ["1d7a042116536098d05d599ef2b8616759f02985c85b4fef50c78a5aaf10822a", "2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8"]
diff --git a/pyproject.toml b/pyproject.toml
index 2545aa1c..741b04bb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,12 +38,13 @@ blinker = "^1.4"
 unidecode = "^1.1"
 python-dateutil = "^2.8"
 docutils = "^0.14"
-markdown = "~3.1.1"
+markdown = {version = "~3.1.1", optional = true}
 six = "^1.4"
 
 [tool.poetry.dev-dependencies]
 BeautifulSoup4 = "^4.7"
 lxml = "^4.3"
+markdown = "~3.1.1"
 typogrify = "^2.0"
 mock = "^3.0"
 sphinx = "=1.4.9"
@@ -52,6 +53,9 @@ tox = "^3.13"
 flake8 = "^3.7"
 flake8-import-order = "^0.18.1"
 
+[tool.poetry.extras]
+markdown = ["markdown"]
+
 [build-system]
 requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"

From c988d6aaa25567ac71dd3db0b0e26eb7d3662326 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Wed, 3 Jul 2019 22:55:44 +0200
Subject: [PATCH 2175/2864] replace os.mknod with open for macos and windows
 compatibility

---
 pelican/tests/test_server.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/tests/test_server.py b/pelican/tests/test_server.py
index 508b75ff..8704c6b5 100644
--- a/pelican/tests/test_server.py
+++ b/pelican/tests/test_server.py
@@ -35,12 +35,12 @@ class TestServer(unittest.TestCase):
                                             self.server)
         handler.base_path = self.temp_output
 
-        os.mknod(os.path.join(self.temp_output, 'foo.html'))
+        open(os.path.join(self.temp_output, 'foo.html'), 'a').close()
         os.mkdir(os.path.join(self.temp_output, 'foo'))
-        os.mknod(os.path.join(self.temp_output, 'foo', 'index.html'))
+        open(os.path.join(self.temp_output, 'foo', 'index.html'), 'a').close()
 
         os.mkdir(os.path.join(self.temp_output, 'bar'))
-        os.mknod(os.path.join(self.temp_output, 'bar', 'index.html'))
+        open(os.path.join(self.temp_output, 'bar', 'index.html'), 'a').close()
 
         os.mkdir(os.path.join(self.temp_output, 'baz'))
 

From 54911fff39a57426f4b071675c5f0b0a5dc6e2ef Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 3 Jul 2019 23:31:38 +0200
Subject: [PATCH 2176/2864] Consolidate version strings in pyproject.toml

Storing the current version in a single place greatly simplifies
issuing new package releases.
---
 docs/conf.py        |  2 +-
 pelican/__init__.py |  7 ++++++-
 setup.py            | 20 +++++++++++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 7645a86d..43009cdd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@ copyright = '2010 – present, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
-last_stable = '4.0.1'
+last_stable = __version__
 rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 9b5791ac..0a06d905 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -32,7 +32,12 @@ from pelican.utils import (clean_output_dir, file_watcher,
                            folder_watcher, maybe_pluralize)
 from pelican.writers import Writer
 
-__version__ = "4.0.2.dev0"
+try:
+    __version__ = __import__('pkg_resources') \
+        .get_distribution('pelican').version
+except Exception:
+    __version__ = "unknown"
+
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 logger = logging.getLogger(__name__)
 
diff --git a/setup.py b/setup.py
index e8918941..53d9dd1c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import re
 import sys
 from io import open
 from os import walk
@@ -6,6 +7,23 @@ from os.path import join, relpath
 
 from setuptools import setup
 
+
+def get_version():
+    VERSION_REGEX = re.compile(
+        r"^version\s*=\s*\"(?P<version>.*)\"$"
+    )
+    with open("pyproject.toml") as f:
+        for line in f:
+            match = VERSION_REGEX.match(line)
+
+            if match:
+                return match.group("version")
+
+    return None
+
+
+version = get_version()
+
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',
             'python-dateutil']
@@ -28,7 +46,7 @@ if sys.version_info.major < 3:
 
 setup(
     name='pelican',
-    version='4.0.2.dev0',
+    version=version,
     url='https://getpelican.com/',
     author='Alexis Metaireau',
     maintainer='Justin Mayer',

From 126f72e1cdebbd6117b069260672df41511ee5b8 Mon Sep 17 00:00:00 2001
From: Eklavya Sharma <ekurgn@gmail.com>
Date: Tue, 9 Jul 2019 23:50:17 +0530
Subject: [PATCH 2177/2864] Only use relative paths in StaticGenerator

Previously some paths were relative and some were absolute,
which lead to multiple Content objects for the same static file
in self.staticfiles.
---
 pelican/generators.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 75eca388..994bd74f 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -800,8 +800,7 @@ class StaticGenerator(Generator):
 
     def generate_context(self):
         self.staticfiles = []
-        linked_files = {os.path.join(self.path, path)
-                        for path in self.context['static_links']}
+        linked_files = set(self.context['static_links'])
         found_files = self.get_files(self.settings['STATIC_PATHS'],
                                      exclude=self.settings['STATIC_EXCLUDES'],
                                      extensions=False)

From a52c67d42c5989ac939a231ee0611b60d96e91d2 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 14 Jul 2019 16:55:32 +0200
Subject: [PATCH 2178/2864] Revert setup.py portion of "version-in-one-place"

Defining the version string in a single place is a nice goal to have,
but since we are currently straddling the fence as it relates to
setuptools and pyproject.toml, mingling them together results in some
unexpected behavior and is thus not advisable. We can revisit this if
and when we make a full switch away from setuptools.
---
 setup.py | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/setup.py b/setup.py
index 53d9dd1c..2a7f60d9 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-import re
 import sys
 from io import open
 from os import walk
@@ -8,21 +7,7 @@ from os.path import join, relpath
 from setuptools import setup
 
 
-def get_version():
-    VERSION_REGEX = re.compile(
-        r"^version\s*=\s*\"(?P<version>.*)\"$"
-    )
-    with open("pyproject.toml") as f:
-        for line in f:
-            match = VERSION_REGEX.match(line)
-
-            if match:
-                return match.group("version")
-
-    return None
-
-
-version = get_version()
+version = "4.0.1"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',

From 3aacc114fd286c1bfea3ae33c29cf20ab2f90d6f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 14 Jul 2019 17:05:40 +0200
Subject: [PATCH 2179/2864] Add Pelican entry point to pyproject.toml

Otherwise, the `pelican` CLI command may not be available when installing
via Poetry.
---
 pyproject.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 741b04bb..4564d53f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,6 +56,9 @@ flake8-import-order = "^0.18.1"
 [tool.poetry.extras]
 markdown = ["markdown"]
 
+[tool.poetry.scripts]
+pelican = "pelican.__main__:main"
+
 [build-system]
 requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"

From 5bb4bab71858b21f887f737e97b4dd4c9599e7bf Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 14 Jul 2019 17:09:11 +0200
Subject: [PATCH 2180/2864] Add pyproject.toml to MANIFEST.in

---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 49e2bef9..138c8f00 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include *.rst
 recursive-include pelican *.html *.css *png *.rst *.markdown *.md *.mkd *.xml *.py
-include LICENSE THANKS docs/changelog.rst
+include LICENSE THANKS docs/changelog.rst pyproject.toml

From d9e58f3096d85e281df78fbc860b87354d2fa72a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 14 Jul 2019 17:21:54 +0200
Subject: [PATCH 2181/2864] Increment version in preparation for imminent
 release

---
 pyproject.toml | 2 +-
 setup.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 4564d53f..f27dc047 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.0.1"
+version = "4.1.0"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index 2a7f60d9..f9076f4d 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from os.path import join, relpath
 from setuptools import setup
 
 
-version = "4.0.1"
+version = "4.1.0"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',

From f61bd2ceba5be68833d6a7b9d1a6670046dc0581 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 14 Jul 2019 17:32:12 +0200
Subject: [PATCH 2182/2864] Update changelog for Pelican 4.1.0

---
 docs/changelog.rst | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index cdd3697c..be87ed17 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,9 +1,18 @@
 Release history
 ###############
 
-Next Release
+4.1.0 - 2019-07-14
 ==================
 
+* Live browser reload upon changed files (provided via Invoke task)
+* Add ``pyproject.toml``, managed by Poetry
+* Support for invoking ``python -m pelican``
+* Add relative source path attribute to content
+* Allow directories in ``EXTRA_PATH_METADATA``
+* Add ``all_articles`` variable to period pages (for recent posts functionality)
+* Improve debug mode output
+* Remove blank or duplicate summaries from Atom feed
+* Fix bugs in pagination, pelican-import, pelican-quickstart, and feed importer
 
 4.0.1 (2018-11-30)
 ==================

From 021f15256a825e256be0cb6a8a3d237abc59ecda Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 23 Jul 2019 16:37:09 +0200
Subject: [PATCH 2183/2864] Add CSS classes for reStructuredText figures

Fixes #2113
---
 pelican/tests/output/basic/theme/css/main.css | 19 +++++++++++++++++--
 .../tests/output/custom/theme/css/main.css    | 19 +++++++++++++++++--
 .../output/custom_locale/theme/css/main.css   | 19 +++++++++++++++++--
 pelican/themes/notmyidea/static/css/main.css  | 19 +++++++++++++++++--
 4 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 9673ca45..2b9d96e3 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -148,8 +148,23 @@ aside, nav, article, figure {
 
 /***** Layout *****/
 .body {clear: both; margin: 0 auto; width: 800px;}
-img.right, figure.right {float: right; margin: 0 0 2em 2em;}
-img.left, figure.left {float: left; margin: 0 2em 2em 0;}
+img.right, figure.right, div.figure.align-right {
+    float: right;
+    margin: 0 0 2em 2em;
+}
+img.left, figure.left, div.figure.align-left {
+    float: left;
+    margin: 0 2em 2em 0;
+}
+
+/* .rst support */
+div.figure img, figure img {  /* to fill figure exactly */
+    width: 100%;
+}
+div.figure p.caption, figure p.caption { /* margin provided by figure */
+    margin-top: 0;
+    margin-bottom: 0;
+}
 
 /*
 	Header
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 9673ca45..2b9d96e3 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -148,8 +148,23 @@ aside, nav, article, figure {
 
 /***** Layout *****/
 .body {clear: both; margin: 0 auto; width: 800px;}
-img.right, figure.right {float: right; margin: 0 0 2em 2em;}
-img.left, figure.left {float: left; margin: 0 2em 2em 0;}
+img.right, figure.right, div.figure.align-right {
+    float: right;
+    margin: 0 0 2em 2em;
+}
+img.left, figure.left, div.figure.align-left {
+    float: left;
+    margin: 0 2em 2em 0;
+}
+
+/* .rst support */
+div.figure img, figure img {  /* to fill figure exactly */
+    width: 100%;
+}
+div.figure p.caption, figure p.caption { /* margin provided by figure */
+    margin-top: 0;
+    margin-bottom: 0;
+}
 
 /*
 	Header
diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
index 9673ca45..2b9d96e3 100644
--- a/pelican/tests/output/custom_locale/theme/css/main.css
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -148,8 +148,23 @@ aside, nav, article, figure {
 
 /***** Layout *****/
 .body {clear: both; margin: 0 auto; width: 800px;}
-img.right, figure.right {float: right; margin: 0 0 2em 2em;}
-img.left, figure.left {float: left; margin: 0 2em 2em 0;}
+img.right, figure.right, div.figure.align-right {
+    float: right;
+    margin: 0 0 2em 2em;
+}
+img.left, figure.left, div.figure.align-left {
+    float: left;
+    margin: 0 2em 2em 0;
+}
+
+/* .rst support */
+div.figure img, figure img {  /* to fill figure exactly */
+    width: 100%;
+}
+div.figure p.caption, figure p.caption { /* margin provided by figure */
+    margin-top: 0;
+    margin-bottom: 0;
+}
 
 /*
 	Header
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 9673ca45..2b9d96e3 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -148,8 +148,23 @@ aside, nav, article, figure {
 
 /***** Layout *****/
 .body {clear: both; margin: 0 auto; width: 800px;}
-img.right, figure.right {float: right; margin: 0 0 2em 2em;}
-img.left, figure.left {float: left; margin: 0 2em 2em 0;}
+img.right, figure.right, div.figure.align-right {
+    float: right;
+    margin: 0 0 2em 2em;
+}
+img.left, figure.left, div.figure.align-left {
+    float: left;
+    margin: 0 2em 2em 0;
+}
+
+/* .rst support */
+div.figure img, figure img {  /* to fill figure exactly */
+    width: 100%;
+}
+div.figure p.caption, figure p.caption { /* margin provided by figure */
+    margin-top: 0;
+    margin-bottom: 0;
+}
 
 /*
 	Header

From daee3c2336b66141cf3aaf8e9824b21ab3661e72 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 23 Jul 2019 18:44:55 +0200
Subject: [PATCH 2184/2864] Add Stale bot

---
 .github/stale.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 00000000..d457dc02
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,25 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: true
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: true
+
+# Label to use when marking as stale
+staleLabel: retired
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your participation and understanding.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 1
+
+# Limit to only `issues` or `pulls`
+only: issues

From a7e58ac3a354e5476beb23200d968ec1cd9d0e7f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 28 Jul 2019 07:09:40 +0200
Subject: [PATCH 2185/2864] Keep building packages via setuptools for now

While it may make sense to switch to an alternate build system (such as
Poetry) at some point, at this early stage it seems prudent to designate
setuptools as the build system in pyproject.toml until the more modern
build system tooling matures.
---
 pyproject.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index f27dc047..903e4532 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,5 +60,4 @@ markdown = ["markdown"]
 pelican = "pelican.__main__:main"
 
 [build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
+requires = ["setuptools >= 40.6.0", "wheel"]

From 06dee4de581fffddc3e188b9ab8074f6a98bd461 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 28 Jul 2019 07:15:48 +0200
Subject: [PATCH 2186/2864] Add AutoPub to auto-publish releases on PR merge

Contributors will henceforth be asked to include a `RELEASE.md` file
containing the release type and summary of changes, which will be used
by the continuous integration (CI) system to automatically publish a new
release to PyPI when the pull request is merged.

For more details, see: https://github.com/autopub/autopub
---
 .travis.yml      | 23 +++++++++++++++++++++++
 CONTRIBUTING.rst |  8 ++++++++
 pyproject.toml   |  7 +++++++
 3 files changed, 38 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 762ada98..a4a1e1f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,31 @@ before_install:
 install:
   - pip install tox==2.5.0
 script: tox -e $TOX_ENV
+before_deploy:
+  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then travis_terminate 0; fi'
+  - pip install githubrelease
+  - pip install --pre autopub
+  - autopub check || travis_terminate 0
+  - pip install poetry
+  - pip install twine
+  - git checkout ${TRAVIS_BRANCH}
+  - git remote set-url origin https://$GITHUB_TOKEN@github.com/$TRAVIS_REPO_SLUG
+deploy:
+  provider: script
+  script: autopub deploy
+  skip_cleanup: true
+  on:
+    branch: master
+    python: "3.7"
 notifications:
   irc:
     channels:
       - "irc.freenode.org#pelican"
     on_success: change
+env:
+  global:
+    - PYPI_USERNAME=autopub
+    - secure: "h5V/+YL+CrqvfAesNkSb824Ngk5x+f0eFzj/LBbmnzjvArKAmc6R6WGyx8SDD7WF/PlaTf0M1fH3a7pjIS8Ee+TS1Rb0Lt1HPqUs1yntg1+Js2ZQp3p20wfsDc+bZ4/2g8xLsSMv1EJ4np7/GJ5fXqpSxjr/Xs5LYA7ZLwNNwDw="
+    - secure: "GiDFfmjH7uzYNnkjQMV/mIkbRdmgkGmtbFPeaj9taBNA5tPp3IBt3GOOS6UL/zm9xiwu9Xo6sxZWkGzY19Hsdv28YPH34N3abo0QSnz4IGiHs152Hi7Qi6Tb0QkT5D3OxuSIm8LmFL7+su89Q7vBFowrT6HL1Mn8CDDWSj3eqbo="
+    - TWINE_USERNAME=$PYPI_USERNAME
+    - TWINE_PASSWORD=$PYPI_PASSWORD
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 49660ea1..7ae47593 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -97,6 +97,14 @@ Using Git and GitHub
   For example, if you're hacking on a new feature and find a bugfix that
   doesn't *require* your new feature, **make a new distinct branch and pull
   request** for the bugfix.
+* Add a ``RELEASE.md`` file in the root of the project that contains the
+  release type (major, minor, patch) and a summary of the changes that will be
+  used as the release changelog entry. For example::
+
+       Release type: minor
+
+       Reload browser window upon changes to content, settings, or theme
+
 * Check for unnecessary whitespace via ``git diff --check`` before committing.
 * First line of your commit message should start with present-tense verb, be 50
   characters or less, and include the relevant issue number(s) if applicable.
diff --git a/pyproject.toml b/pyproject.toml
index 903e4532..185c605b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -59,5 +59,12 @@ markdown = ["markdown"]
 [tool.poetry.scripts]
 pelican = "pelican.__main__:main"
 
+[tool.autopub]
+project-name = "Pelican"
+git-username = "botpub"
+git-email = "botpub@autopub.rocks"
+version-strings = ["setup.py"]
+build-system = "setuptools"
+
 [build-system]
 requires = ["setuptools >= 40.6.0", "wheel"]

From 360ff420d34603ffa490aff29ff8c66fd6cf4223 Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Thu, 1 Aug 2019 13:53:56 +0200
Subject: [PATCH 2187/2864] Allowing to pass `argv` to pelican `main`
 entrypoint

---
 pelican/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0a06d905..86c956b0 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -307,7 +307,7 @@ class PrintSettings(argparse.Action):
         parser.exit()
 
 
-def parse_arguments():
+def parse_arguments(argv=None):
     parser = argparse.ArgumentParser(
         description='A tool to generate a static blog, '
                     ' with restructured text input files.',
@@ -400,7 +400,7 @@ def parse_arguments():
                         help='IP to bind to when serving files via HTTP '
                         '(default: 127.0.0.1)')
 
-    args = parser.parse_args()
+    args = parser.parse_args(argv)
 
     if args.port is not None and not args.listen:
         logger.warning('--port without --listen has no effect')
@@ -560,8 +560,8 @@ def listen(server, port, output, excqueue=None):
         return
 
 
-def main():
-    args = parse_arguments()
+def main(argv=None):
+    args = parse_arguments(argv)
     logs_dedup_min_level = getattr(logging, args.logs_dedup_min_level)
     init_logging(args.verbosity, args.fatal,
                  logs_dedup_min_level=logs_dedup_min_level)

From 7c2a7478d7a6024f6f854f934f213e7130666e2b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 2 Aug 2019 14:53:51 +0200
Subject: [PATCH 2188/2864] Consolidate duplicate Travis `env` definitions

---
 .travis.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a4a1e1f7..7bb5ef3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,18 @@ language: python
 python:
   - "3.6"
 env:
-  - TOX_ENV=docs
-  - TOX_ENV=flake8
-  - TOX_ENV=py27
-  - TOX_ENV=py35
-  - TOX_ENV=py36
+  global:
+    - PYPI_USERNAME=autopub
+    - secure: "h5V/+YL+CrqvfAesNkSb824Ngk5x+f0eFzj/LBbmnzjvArKAmc6R6WGyx8SDD7WF/PlaTf0M1fH3a7pjIS8Ee+TS1Rb0Lt1HPqUs1yntg1+Js2ZQp3p20wfsDc+bZ4/2g8xLsSMv1EJ4np7/GJ5fXqpSxjr/Xs5LYA7ZLwNNwDw="
+    - secure: "GiDFfmjH7uzYNnkjQMV/mIkbRdmgkGmtbFPeaj9taBNA5tPp3IBt3GOOS6UL/zm9xiwu9Xo6sxZWkGzY19Hsdv28YPH34N3abo0QSnz4IGiHs152Hi7Qi6Tb0QkT5D3OxuSIm8LmFL7+su89Q7vBFowrT6HL1Mn8CDDWSj3eqbo="
+    - TWINE_USERNAME=$PYPI_USERNAME
+    - TWINE_PASSWORD=$PYPI_PASSWORD
+  matrix:
+    - TOX_ENV=docs
+    - TOX_ENV=flake8
+    - TOX_ENV=py27
+    - TOX_ENV=py35
+    - TOX_ENV=py36
 matrix:
   include:
     - python: 3.7
@@ -44,10 +51,3 @@ notifications:
     channels:
       - "irc.freenode.org#pelican"
     on_success: change
-env:
-  global:
-    - PYPI_USERNAME=autopub
-    - secure: "h5V/+YL+CrqvfAesNkSb824Ngk5x+f0eFzj/LBbmnzjvArKAmc6R6WGyx8SDD7WF/PlaTf0M1fH3a7pjIS8Ee+TS1Rb0Lt1HPqUs1yntg1+Js2ZQp3p20wfsDc+bZ4/2g8xLsSMv1EJ4np7/GJ5fXqpSxjr/Xs5LYA7ZLwNNwDw="
-    - secure: "GiDFfmjH7uzYNnkjQMV/mIkbRdmgkGmtbFPeaj9taBNA5tPp3IBt3GOOS6UL/zm9xiwu9Xo6sxZWkGzY19Hsdv28YPH34N3abo0QSnz4IGiHs152Hi7Qi6Tb0QkT5D3OxuSIm8LmFL7+su89Q7vBFowrT6HL1Mn8CDDWSj3eqbo="
-    - TWINE_USERNAME=$PYPI_USERNAME
-    - TWINE_PASSWORD=$PYPI_PASSWORD

From b2da535fecafa7a81feee2dd5b19eb1fffcc9a94 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Tue, 20 Aug 2019 19:39:14 -0600
Subject: [PATCH 2189/2864] Set default content status to a blank string rather
 than `None`.

Fixes
#2558.
Fixes issues encountered by comment plugins among others

c.f. [1](https://github.com/bstpierre/pelican-comments/pull/4),
[2](https://github.com/Scheirle/pelican_comment_system/issues/8),
[3](https://github.com/Scheirle/pelican_comment_system/pull/7)
---
 RELEASE.md          | 7 +++++++
 pelican/contents.py | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..dccbdff8
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,7 @@
+Release type: patch
+
+Set default content status to a blank string rather than `None`. Fixes
+[#2558](https://github.com/getpelican/pelican/issues/2558). Fixes issues
+encountered by comment plugins among others
+([1](https://github.com/bstpierre/pelican-comments/pull/4),
+[2](https://github.com/Scheirle/pelican_comment_system/issues/8)).
diff --git a/pelican/contents.py b/pelican/contents.py
index 9292f14f..74524d60 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -141,7 +141,9 @@ class Content(object):
 
         # manage status
         if not hasattr(self, 'status'):
-            self.status = getattr(self, 'default_status', None)
+            # using None as the default here breaks comment plugins (and
+            # probably others)
+            self.status = getattr(self, 'default_status', '')
 
         # store the summary metadata if it is set
         if 'summary' in metadata:

From f1430472b8cb43302516de8acf356c56706b92ff Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 21 Aug 2019 14:31:51 +0200
Subject: [PATCH 2190/2864] Configure AutoPub for Pelican changelog path &
 format

---
 pyproject.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 185c605b..6a0e048a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -63,6 +63,9 @@ pelican = "pelican.__main__:main"
 project-name = "Pelican"
 git-username = "botpub"
 git-email = "botpub@autopub.rocks"
+changelog-file = "docs/changelog.rst"
+changelog-header = "###############"
+version-header = "="
 version-strings = ["setup.py"]
 build-system = "setuptools"
 

From 8353cea6b6b66f73893f6ccc7d886eb227cb1ce0 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 21 Aug 2019 14:38:17 +0200
Subject: [PATCH 2191/2864] Add changelog entries to prepare for release

---
 RELEASE.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index dccbdff8..920b6a14 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,7 +1,6 @@
 Release type: patch
 
-Set default content status to a blank string rather than `None`. Fixes
-[#2558](https://github.com/getpelican/pelican/issues/2558). Fixes issues
-encountered by comment plugins among others
-([1](https://github.com/bstpierre/pelican-comments/pull/4),
-[2](https://github.com/Scheirle/pelican_comment_system/issues/8)).
+* Add AutoPub to auto-publish releases on PR merge
+* Add CSS classes for reStructuredText figures
+* Pass `argv` to Pelican `main` entrypoint
+* Set default content status to a blank string rather than `None`

From 2ee423017bb444e1370b50862340559012bda739 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Tue, 20 Aug 2019 19:01:39 -0600
Subject: [PATCH 2192/2864] Skip some non-Windows tests on Windows

Some tests will never pass on Windows due to differences in filesystems between
Windows and Linux.
---
 RELEASE.md                       |  4 ++++
 pelican/tests/test_contents.py   |  9 +++++----
 pelican/tests/test_generators.py | 19 ++++++++++++++++---
 pelican/tests/test_utils.py      |  6 ++++++
 4 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..521973a9
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,4 @@
+Release type: patch
+
+Skip some tests (on Windows) that are un-able to pass on Windows due to the
+difference in Windows vs Linux filesystems.
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 104bc889..efc438c8 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -14,9 +14,10 @@ import six
 from pelican.contents import Article, Author, Category, Page, Static
 from pelican.settings import DEFAULT_CONFIG
 from pelican.signals import content_object_init
-from pelican.tests.support import LoggedTestCase, get_context, get_settings,\
-    unittest
-from pelican.utils import SafeDatetime, path_to_url, truncate_html_words
+from pelican.tests.support import (LoggedTestCase, get_context, get_settings,
+                                   unittest)
+from pelican.utils import (SafeDatetime, path_to_url, posixize_path,
+                           truncate_html_words)
 
 
 # generate one paragraph, enclosed with <p>
@@ -943,7 +944,7 @@ class TestStatic(LoggedTestCase):
             source_path=os.path.join('dir', 'foo.jpg'),
             context=self.settings.copy())
 
-        expected_save_as = os.path.join('dir', 'foo.jpg')
+        expected_save_as = posixize_path(os.path.join('dir', 'foo.jpg'))
         self.assertEqual(static.status, 'draft')
         self.assertEqual(static.save_as, expected_save_as)
         self.assertEqual(static.url, path_to_url(expected_save_as))
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 267571da..2455d1f4 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1089,7 +1089,12 @@ class TestStaticGenerator(unittest.TestCase):
         os.mkdir(os.path.join(self.temp_output, "static"))
         self.generator.fallback_to_symlinks = True
         self.generator.generate_context()
-        self.generator.generate_output(None)
+        try:
+            self.generator.generate_output(None)
+        except OSError as e:
+            # On Windows, possibly others, due to not holding symbolic link
+            # privilege
+            self.skipTest(e)
         self.assertTrue(os.path.islink(self.endfile))
 
     def test_existing_symlink_is_considered_up_to_date(self):
@@ -1097,7 +1102,11 @@ class TestStaticGenerator(unittest.TestCase):
         with open(self.startfile, "w") as f:
             f.write("staticcontent")
         os.mkdir(os.path.join(self.temp_output, "static"))
-        os.symlink(self.startfile, self.endfile)
+        try:
+            os.symlink(self.startfile, self.endfile)
+        except OSError as e:
+            # On Windows, possibly others
+            self.skipTest(e)
         staticfile = MagicMock()
         staticfile.source_path = self.startfile
         staticfile.save_as = self.endfile
@@ -1109,7 +1118,11 @@ class TestStaticGenerator(unittest.TestCase):
         with open(self.startfile, "w") as f:
             f.write("staticcontent")
         os.mkdir(os.path.join(self.temp_output, "static"))
-        os.symlink("invalid", self.endfile)
+        try:
+            os.symlink("invalid", self.endfile)
+        except OSError as e:
+            # On Windows, possibly others
+            self.skipTest(e)
         staticfile = MagicMock()
         staticfile.source_path = self.startfile
         staticfile.save_as = self.endfile
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 2831eeed..444190d3 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -717,6 +717,8 @@ class TestDateFormatter(unittest.TestCase):
 
 
 class TestSanitisedJoin(unittest.TestCase):
+    @unittest.skipIf(platform == 'win32',
+                     "Different filesystem root on Windows")
     def test_detect_parent_breakout(self):
         with six.assertRaisesRegex(
                 self,
@@ -727,6 +729,8 @@ class TestSanitisedJoin(unittest.TestCase):
                 "../test"
             )
 
+    @unittest.skipIf(platform == 'win32',
+                     "Different filesystem root on Windows")
     def test_detect_root_breakout(self):
         with six.assertRaisesRegex(
                 self,
@@ -737,6 +741,8 @@ class TestSanitisedJoin(unittest.TestCase):
                 "/test"
             )
 
+    @unittest.skipIf(platform == 'win32',
+                     "Different filesystem root on Windows")
     def test_pass_deep_subpaths(self):
         self.assertEqual(
             utils.sanitised_join(

From 9db42658e50254bf72b0f9a16755bb631f601b6c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 23 Aug 2019 17:02:47 +0200
Subject: [PATCH 2193/2864] Prevent Travis IRC spam from forks

See: https://github.com/travis-ci/travis-ci/issues/5063
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7bb5ef3b..6641d4cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,9 @@ deploy:
   on:
     branch: master
     python: "3.7"
+# The channel name "irc.freenode.org#pelican" is encrypted against getpelican/pelican to prevent IRC spam of forks
 notifications:
   irc:
     channels:
-      - "irc.freenode.org#pelican"
+      - secure: "JP57f61QovrhmLoAF6oPOzIK2aXGfSO06FHg7yiuKBOWMiaxQejZUGJX919muCLhWJXDugsviIqCMoAWwNV3o1WQbqIr+G5TR+N9MrtCs4Zi6vpGj09bR8giKUKx+PPKEoe1Ew56E4y2LxzGO4Lj9hZx8M2YVdwPNWrWZgp6WXE="
     on_success: change

From f6ef0270144b96863ae9811edbc802c56091a2a3 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 23 Aug 2019 19:02:48 +0200
Subject: [PATCH 2194/2864] Tidy and shorten a comment

---
 pelican/contents.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 74524d60..a862db2d 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -141,8 +141,7 @@ class Content(object):
 
         # manage status
         if not hasattr(self, 'status'):
-            # using None as the default here breaks comment plugins (and
-            # probably others)
+            # Previous default of None broke comment plugins and perhaps others
             self.status = getattr(self, 'default_status', '')
 
         # store the summary metadata if it is set

From e44aa294b0641655165fefdcbce72484e3ce7c57 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Fri, 23 Aug 2019 17:06:52 +0000
Subject: [PATCH 2195/2864] Release Pelican 4.1.1

---
 RELEASE.md         | 6 ------
 docs/changelog.rst | 8 ++++++++
 pyproject.toml     | 2 +-
 setup.py           | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 920b6a14..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Release type: patch
-
-* Add AutoPub to auto-publish releases on PR merge
-* Add CSS classes for reStructuredText figures
-* Pass `argv` to Pelican `main` entrypoint
-* Set default content status to a blank string rather than `None`
diff --git a/docs/changelog.rst b/docs/changelog.rst
index be87ed17..fd7cada4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,14 @@
 Release history
 ###############
 
+4.1.1 - 2019-08-23
+==================
+
+* Add AutoPub to auto-publish releases on PR merge
+* Add CSS classes for reStructuredText figures
+* Pass `argv` to Pelican `main` entrypoint
+* Set default content status to a blank string rather than `None`
+
 4.1.0 - 2019-07-14
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index 6a0e048a..31bb1829 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.1.0"
+version = "4.1.1"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index f9076f4d..1bdeee80 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from os.path import join, relpath
 from setuptools import setup
 
 
-version = "4.1.0"
+version = "4.1.1"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',

From 41fbf3adb29d35dd558999420858538bc41108a3 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Mon, 26 Aug 2019 00:35:53 +0200
Subject: [PATCH 2196/2864] [Documentation] Add comma after 'for instance'

---
 docs/themes.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 354e0c36..b00d0236 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -75,7 +75,7 @@ output_file     The name of the file currently being generated. For
 articles        The list of articles, ordered descending by date.
                 All the elements are `Article` objects, so you can
                 access their attributes (e.g. title, summary, author
-                etc.). Sometimes this is shadowed (for instance in
+                etc.). Sometimes this is shadowed (for instance, in
                 the tags page). You will then find info about it
                 in the `all_articles` variable.
 dates           The same list of articles, but ordered by date,

From 7f4e614bb8f7f43b8419c896ee0cd1bedd4e0a9c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 21 Sep 2019 10:57:35 -0600
Subject: [PATCH 2197/2864] Fix formatting, etc in Settings documentation

---
 docs/settings.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 7085db84..5d090a62 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -983,7 +983,7 @@ By default, pages subsequent to ``.../foo.html`` are created as
 ``.../foo2.html``, etc. The ``PAGINATION_PATTERNS`` setting can be used to
 change this. It takes a sequence of triples, where each triple consists of::
 
-  (minimum_page, page_url, page_save_as,)
+    (minimum_page, page_url, page_save_as,)
 
 For ``page_url`` and ``page_save_as``, you may use a number of variables.
 ``{url}`` and ``{save_as}`` correspond respectively to the ``*_URL`` and
@@ -997,7 +997,7 @@ subsequent pages at ``.../page/2/`` etc, you could set ``PAGINATION_PATTERNS``
 as follows::
 
   PAGINATION_PATTERNS = (
-      (1, '{url}', '{save_as}`,
+      (1, '{url}', '{save_as}',
       (2, '{base_name}/page/{number}/', '{base_name}/page/{number}/index.html'),
   )
 
@@ -1238,7 +1238,7 @@ ignored. Simply populate the list with the log messages you want to hide, and
 they will be filtered out.
 
 For example::
-    
+
    import logging
    LOG_FILTER = [(logging.WARN, 'TAG_SAVE_AS is set to False')]
 

From 589a31ddd0d447934b7cf09d8675bb0c73a92d90 Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Mon, 23 Sep 2019 19:38:18 +0200
Subject: [PATCH 2198/2864] Pushing Python compatibility to Python 3.5+

---
 docs/quickstart.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 4e6714b4..4ad9416f 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -8,7 +8,7 @@ Installation
 ------------
 
 Install Pelican (and optionally Markdown if you intend to use it) on Python
-2.7.x or Python 3.3+ by running the following command in your preferred
+2.7.x or Python 3.5+ by running the following command in your preferred
 terminal, prefixing with ``sudo`` if permissions warrant::
 
     pip install pelican markdown

From 367245cc47e9acae03e06f37de088551165154c7 Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Mon, 23 Sep 2019 17:48:56 +0200
Subject: [PATCH 2199/2864] Fix pelican.settings.load_source to avoid caching
 issues

---
 RELEASE.md          |  3 +++
 pelican/settings.py | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..5c1ba5d3
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,3 @@
+Release type: patch
+
+Fix pelican.settings.load_source to avoid caching issues - PR #2621
diff --git a/pelican/settings.py b/pelican/settings.py
index a957b26c..4aa31afe 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -14,12 +14,16 @@ import six
 
 from pelican.log import LimitFilter
 
+
 try:
-    # SourceFileLoader is the recommended way in Python 3.3+
-    from importlib.machinery import SourceFileLoader
+    # spec_from_file_location is the recommended way in Python 3.5+
+    import importlib.util
 
     def load_source(name, path):
-        return SourceFileLoader(name, path).load_module()
+        spec = importlib.util.spec_from_file_location(name, path)
+        mod = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(mod)
+        return mod
 except ImportError:
     # but it does not exist in Python 2.7, so fall back to imp
     import imp

From 3f96cb8a4a91742a85fe8b548749efd4b12a1ff0 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Mon, 23 Sep 2019 18:21:15 +0000
Subject: [PATCH 2200/2864] Release Pelican 4.1.2

---
 RELEASE.md         | 3 ---
 docs/changelog.rst | 5 +++++
 pyproject.toml     | 2 +-
 setup.py           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 5c1ba5d3..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Release type: patch
-
-Fix pelican.settings.load_source to avoid caching issues - PR #2621
diff --git a/docs/changelog.rst b/docs/changelog.rst
index fd7cada4..5e5d7cdf 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+4.1.2 - 2019-09-23
+==================
+
+Fix pelican.settings.load_source to avoid caching issues - PR #2621
+
 4.1.1 - 2019-08-23
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index 31bb1829..fce734f6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.1.1"
+version = "4.1.2"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index 1bdeee80..e4f2995a 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from os.path import join, relpath
 from setuptools import setup
 
 
-version = "4.1.1"
+version = "4.1.2"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',

From 8734bd1a6f0944442ac8536bf3d92a5ad28f9201 Mon Sep 17 00:00:00 2001
From: Romain Porte <microjoe@microjoe.org>
Date: Tue, 24 Sep 2019 22:07:01 +0200
Subject: [PATCH 2201/2864] templates: tasks.py: introduce "production_port" to
 fix #2623

The syntax passed to rsync for specifying the port is incorrect. In the
Makefile template, the -e option is correctly used to pass the port. We
use the same syntax here to pass the SSH port.

This fix issue #2623.

Signed-off-by: Romain Porte <microjoe@microjoe.org>
---
 pelican/tools/templates/tasks.py.jinja2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index a800b79b..1c063f08 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -23,7 +23,8 @@ CONFIG = {
     'deploy_path': SETTINGS['OUTPUT_PATH'],
 {% if ssh %}
     # Remote server configuration
-    'production': '{{ssh_user}}@{{ssh_host}}:{{ssh_port}}',
+    'production': '{{ssh_user}}@{{ssh_host}}',
+    'production_port': {{ssh_port}},
     'dest_path': '{{ssh_target_dir}}',
 {% endif %}
 {% if cloudfiles %}
@@ -130,6 +131,7 @@ def publish(c):
     c.run('pelican -s {settings_publish}'.format(**CONFIG))
     c.run(
         'rsync --delete --exclude ".DS_Store" -pthrvz -c '
+        '-e "ssh -p {production_port}" '
         '{} {production}:{dest_path}'.format(
             CONFIG['deploy_path'].rstrip('/') + '/',
             **CONFIG))

From db04f012971f154c3f7601ced1d666bee0ea8da9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 28 Sep 2019 13:45:58 -0700
Subject: [PATCH 2202/2864] Add related project URLs for display on PyPI

Adding `project_urls` and `keywords` to setup.py ensures they will be
available for the PyPI package page and any other place/service that
may look for these fields.
---
 setup.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index e4f2995a..5eea85b6 100755
--- a/setup.py
+++ b/setup.py
@@ -33,11 +33,17 @@ setup(
     name='pelican',
     version=version,
     url='https://getpelican.com/',
-    author='Alexis Metaireau',
-    maintainer='Justin Mayer',
+    author='Justin Mayer',
     author_email='authors@getpelican.com',
     description="Static site generator supporting reStructuredText and "
                 "Markdown source content.",
+    project_urls={
+        'Documentation': 'https://docs.getpelican.com/',
+        'Funding': 'https://donate.getpelican.com/',
+        'Source': 'https://github.com/getpelican/pelican',
+        'Tracker': 'https://github.com/getpelican/pelican/issues',
+    },
+    keywords='static web site generator SSG reStructuredText Markdown',
     license='AGPLv3',
     long_description=description,
     packages=['pelican', 'pelican.tools'],

From 047d884323a67495a4358acee984b276d3456f07 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 28 Sep 2019 13:51:20 -0700
Subject: [PATCH 2203/2864] Fix quick-start docs regarding `pelican --listen`

Reverts 2ab91bbaaa565dcb89726b6cac0002c1e0644dc3 and resolves #2626
---
 docs/publish.rst    | 16 ++++------------
 docs/quickstart.rst |  6 +++---
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/docs/publish.rst b/docs/publish.rst
index 96d67d58..489558d8 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -54,20 +54,12 @@ HTML files directly::
     firefox output/index.html
 
 Because the above method may have trouble locating your CSS and other linked
-assets, running a simple web server using Python will often provide a more
-reliable previewing experience.
+assets, running Pelican's simple built-in web server will often provide a more
+reliable previewing experience::
 
-For Python 2, run::
+    pelican --listen
 
-    cd output
-    python -m SimpleHTTPServer
-
-For Python 3, run::
-
-    cd output
-    python -m http.server
-
-Once the basic server has been started, you can preview your site at
+Once the web server has been started, you can preview your site at:
 http://localhost:8000/
 
 Deployment
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 4ad9416f..646dd987 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -50,18 +50,18 @@ Given that this example article is in Markdown format, save it as
 Generate your site
 ------------------
 
-From your site directory, run the ``pelican`` command to generate your site::
+From your project root directory, run the ``pelican`` command to generate your site::
 
     pelican content
 
-Your site has now been generated inside the ``output`` directory. (You may see
+Your site has now been generated inside the ``output/`` directory. (You may see
 a warning related to feeds, but that is normal when developing locally and can
 be ignored for now.)
 
 Preview your site
 -----------------
 
-Open a new terminal session, navigate to your generated output directory and
+Open a new terminal session, navigate to your project root directory, and
 run the following command to launch Pelican's web server::
 
     pelican --listen

From 2c8e7b3e6bc43f8e151b814957de617213f48382 Mon Sep 17 00:00:00 2001
From: Oliver Urs Lenz <oliver.urs.lenz@gmail.com>
Date: Fri, 4 Oct 2019 22:28:24 +0200
Subject: [PATCH 2204/2864] place all deprecated settings handling together

---
 pelican/__init__.py | 61 ---------------------------------------------
 pelican/settings.py | 61 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 86c956b0..499ded04 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -11,7 +11,6 @@ import logging
 import multiprocessing
 import os
 import pprint
-import re
 import sys
 import time
 import traceback
@@ -52,7 +51,6 @@ class Pelican(object):
 
         # define the default settings
         self.settings = settings
-        self._handle_deprecation()
 
         self.path = settings['PATH']
         self.theme = settings['THEME']
@@ -94,65 +92,6 @@ class Pelican(object):
         logger.debug('Restoring system path')
         sys.path = _sys_path
 
-    def _handle_deprecation(self):
-
-        if self.settings.get('CLEAN_URLS', False):
-            logger.warning('Found deprecated `CLEAN_URLS` in settings.'
-                           ' Modifying the following settings for the'
-                           ' same behaviour.')
-
-            self.settings['ARTICLE_URL'] = '{slug}/'
-            self.settings['ARTICLE_LANG_URL'] = '{slug}-{lang}/'
-            self.settings['PAGE_URL'] = 'pages/{slug}/'
-            self.settings['PAGE_LANG_URL'] = 'pages/{slug}-{lang}/'
-
-            for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
-                            'PAGE_LANG_URL'):
-                logger.warning("%s = '%s'", setting, self.settings[setting])
-
-        if self.settings.get('AUTORELOAD_IGNORE_CACHE'):
-            logger.warning('Found deprecated `AUTORELOAD_IGNORE_CACHE` in '
-                           'settings. Use --ignore-cache instead.')
-            self.settings.pop('AUTORELOAD_IGNORE_CACHE')
-
-        if self.settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
-            logger.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
-                           ' settings.  Modifying the following settings for'
-                           ' the same behaviour.')
-
-            structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
-
-            # Convert %(variable) into {variable}.
-            structure = re.sub(r'%\((\w+)\)s', r'{\g<1>}', structure)
-
-            # Convert %x into {date:%x} for strftime
-            structure = re.sub(r'(%[A-z])', r'{date:\g<1>}', structure)
-
-            # Strip a / prefix
-            structure = re.sub('^/', '', structure)
-
-            for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
-                            'PAGE_LANG_URL', 'DRAFT_URL', 'DRAFT_LANG_URL',
-                            'ARTICLE_SAVE_AS', 'ARTICLE_LANG_SAVE_AS',
-                            'DRAFT_SAVE_AS', 'DRAFT_LANG_SAVE_AS',
-                            'PAGE_SAVE_AS', 'PAGE_LANG_SAVE_AS'):
-                self.settings[setting] = os.path.join(structure,
-                                                      self.settings[setting])
-                logger.warning("%s = '%s'", setting, self.settings[setting])
-
-        for new, old in [('FEED', 'FEED_ATOM'), ('TAG_FEED', 'TAG_FEED_ATOM'),
-                         ('CATEGORY_FEED', 'CATEGORY_FEED_ATOM'),
-                         ('TRANSLATION_FEED', 'TRANSLATION_FEED_ATOM')]:
-            if self.settings.get(new, False):
-                logger.warning(
-                    'Found deprecated `%(new)s` in settings. Modify %(new)s '
-                    'to %(old)s in your settings and theme for the same '
-                    'behavior. Temporarily setting %(old)s for backwards '
-                    'compatibility.',
-                    {'new': new, 'old': old}
-                )
-                self.settings[old] = self.settings[new]
-
     def run(self):
         """Run the generators and return"""
         start_time = time.time()
diff --git a/pelican/settings.py b/pelican/settings.py
index 4aa31afe..ca415791 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -442,6 +442,67 @@ def handle_deprecated_settings(settings):
                                'Falling back to default.', key)
                 settings[key] = DEFAULT_CONFIG[key]
 
+    # CLEAN_URLS
+    if settings.get('CLEAN_URLS', False):
+        logger.warning('Found deprecated `CLEAN_URLS` in settings.'
+                       ' Modifying the following settings for the'
+                       ' same behaviour.')
+
+        settings['ARTICLE_URL'] = '{slug}/'
+        settings['ARTICLE_LANG_URL'] = '{slug}-{lang}/'
+        settings['PAGE_URL'] = 'pages/{slug}/'
+        settings['PAGE_LANG_URL'] = 'pages/{slug}-{lang}/'
+
+        for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
+                        'PAGE_LANG_URL'):
+            logger.warning("%s = '%s'", setting, settings[setting])
+
+    # AUTORELOAD_IGNORE_CACHE -> --ignore-cache
+    if settings.get('AUTORELOAD_IGNORE_CACHE'):
+        logger.warning('Found deprecated `AUTORELOAD_IGNORE_CACHE` in '
+                       'settings. Use --ignore-cache instead.')
+        settings.pop('AUTORELOAD_IGNORE_CACHE')
+
+    # ARTICLE_PERMALINK_STRUCTURE
+    if settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
+        logger.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
+                       ' settings.  Modifying the following settings for'
+                       ' the same behaviour.')
+
+        structure = settings['ARTICLE_PERMALINK_STRUCTURE']
+
+        # Convert %(variable) into {variable}.
+        structure = re.sub(r'%\((\w+)\)s', r'{\g<1>}', structure)
+
+        # Convert %x into {date:%x} for strftime
+        structure = re.sub(r'(%[A-z])', r'{date:\g<1>}', structure)
+
+        # Strip a / prefix
+        structure = re.sub('^/', '', structure)
+
+        for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
+                        'PAGE_LANG_URL', 'DRAFT_URL', 'DRAFT_LANG_URL',
+                        'ARTICLE_SAVE_AS', 'ARTICLE_LANG_SAVE_AS',
+                        'DRAFT_SAVE_AS', 'DRAFT_LANG_SAVE_AS',
+                        'PAGE_SAVE_AS', 'PAGE_LANG_SAVE_AS'):
+            settings[setting] = os.path.join(structure,
+                                             settings[setting])
+            logger.warning("%s = '%s'", setting, settings[setting])
+
+    # {,TAG,CATEGORY,TRANSLATION}_FEED -> {,TAG,CATEGORY,TRANSLATION}_FEED_ATOM
+    for new, old in [('FEED', 'FEED_ATOM'), ('TAG_FEED', 'TAG_FEED_ATOM'),
+                     ('CATEGORY_FEED', 'CATEGORY_FEED_ATOM'),
+                     ('TRANSLATION_FEED', 'TRANSLATION_FEED_ATOM')]:
+        if settings.get(new, False):
+            logger.warning(
+                'Found deprecated `%(new)s` in settings. Modify %(new)s '
+                'to %(old)s in your settings and theme for the same '
+                'behavior. Temporarily setting %(old)s for backwards '
+                'compatibility.',
+                {'new': new, 'old': old}
+            )
+            settings[old] = settings[new]
+
     return settings
 
 

From b88b5f7b3679f98d1aa3934f5fcf818b2a726ea8 Mon Sep 17 00:00:00 2001
From: Andrea Grandi <a.grandi@gmail.com>
Date: Sat, 5 Oct 2019 15:25:31 +0200
Subject: [PATCH 2205/2864] Set default binding addres to 127.0.0.1

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 4aa31afe..d79f64fe 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -170,7 +170,7 @@ DEFAULT_CONFIG = {
     'WRITE_SELECTED': [],
     'FORMATTED_FIELDS': ['summary'],
     'PORT': 8000,
-    'BIND': '',
+    'BIND': '127.0.0.1',
 }
 
 PYGMENTS_RST_OPTIONS = None

From bc450b3339d9eb4ce4649a5989836dcee496688f Mon Sep 17 00:00:00 2001
From: David Alfonso <developer@davidalfonso.es>
Date: Wed, 9 Oct 2019 11:08:39 +0200
Subject: [PATCH 2206/2864] Add extra/optional Markdown dependency to setup.py

- Modify documentation to use the extra dependency in order to install
the recommended markdown package version.
---
 docs/install.rst    | 10 +++++++++-
 docs/quickstart.rst |  2 +-
 setup.py            |  3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/install.rst b/docs/install.rst
index 571de95e..2da7b9be 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -9,6 +9,10 @@ You can install Pelican via several different methods. The simplest is via
 
     pip install pelican
 
+Or, if you plan on using Markdown::
+
+    pip install pelican[Markdown]
+
 (Keep in mind that operating systems will often require you to prefix the above
 command with ``sudo`` in order to install Pelican system-wide.)
 
@@ -40,7 +44,11 @@ Optional packages
 -----------------
 
 If you plan on using `Markdown <http://pypi.python.org/pypi/Markdown>`_ as a
-markup format, you'll need to install the Markdown library::
+markup format, you can install Pelican with Markdown support::
+
+   pip install pelican[Markdown]
+
+Or you might need to install it a posteriori::
 
     pip install Markdown
 
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 646dd987..484a318f 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -11,7 +11,7 @@ Install Pelican (and optionally Markdown if you intend to use it) on Python
 2.7.x or Python 3.5+ by running the following command in your preferred
 terminal, prefixing with ``sudo`` if permissions warrant::
 
-    pip install pelican markdown
+    pip install pelican[Markdown]
 
 Create a project
 ----------------
diff --git a/setup.py b/setup.py
index 5eea85b6..0979d1c4 100755
--- a/setup.py
+++ b/setup.py
@@ -61,6 +61,9 @@ setup(
                           for name in names],
     },
     install_requires=requires,
+    extras_require={
+        'Markdown': ['markdown~=3.1.1']
+    },
     entry_points=entry_points,
     classifiers=[
         'Development Status :: 5 - Production/Stable',

From f52f276f2ea9c23311cdd8c49d19358d432925a8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 9 Oct 2019 11:17:44 -0700
Subject: [PATCH 2207/2864] Separate SSH user/host/path vars in tasks.py

Refs #2623
---
 pelican/tools/templates/tasks.py.jinja2 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 1c063f08..0362eba7 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -23,9 +23,10 @@ CONFIG = {
     'deploy_path': SETTINGS['OUTPUT_PATH'],
 {% if ssh %}
     # Remote server configuration
-    'production': '{{ssh_user}}@{{ssh_host}}',
-    'production_port': {{ssh_port}},
-    'dest_path': '{{ssh_target_dir}}',
+    'ssh_user': '{{ssh_user}}',
+    'ssh_host': '{{ssh_host}}',
+    'ssh_port': '{{ssh_port}}',
+    'ssh_path': '{{ssh_target_dir}}',
 {% endif %}
 {% if cloudfiles %}
     # Rackspace Cloud Files configuration settings
@@ -131,8 +132,8 @@ def publish(c):
     c.run('pelican -s {settings_publish}'.format(**CONFIG))
     c.run(
         'rsync --delete --exclude ".DS_Store" -pthrvz -c '
-        '-e "ssh -p {production_port}" '
-        '{} {production}:{dest_path}'.format(
+        '-e "ssh -p {ssh_port}" '
+        '{} {ssh_user}@{ssh_host}:{ssh_path}'.format(
             CONFIG['deploy_path'].rstrip('/') + '/',
             **CONFIG))
 

From f9975ed47e8af49e723aa0c4cde50686e127292a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 9 Oct 2019 11:28:53 -0700
Subject: [PATCH 2208/2864] Update RELEASE.md

---
 RELEASE.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 521973a9..02c40331 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,4 +1,9 @@
 Release type: patch
 
-Skip some tests (on Windows) that are un-able to pass on Windows due to the
-difference in Windows vs Linux filesystems.
+* Fix quick-start docs regarding `pelican --listen`
+* Set default listen address to 127.0.0.1
+* Add extra/optional Markdown dependency to setup.py
+* Use correct SSH port syntax for rsync in tasks.py
+* Place all deprecated settings handling together
+* Add related project URLs for display on PyPI
+* Skip some tests on Windows that can't pass due to filesystem differences

From 643bccc497183d9cc2d7c80423fbd8e088dd3dad Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Wed, 9 Oct 2019 18:45:18 +0000
Subject: [PATCH 2209/2864] Release Pelican 4.1.3

---
 RELEASE.md         |  9 ---------
 docs/changelog.rst | 11 +++++++++++
 pyproject.toml     |  2 +-
 setup.py           |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 02c40331..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Release type: patch
-
-* Fix quick-start docs regarding `pelican --listen`
-* Set default listen address to 127.0.0.1
-* Add extra/optional Markdown dependency to setup.py
-* Use correct SSH port syntax for rsync in tasks.py
-* Place all deprecated settings handling together
-* Add related project URLs for display on PyPI
-* Skip some tests on Windows that can't pass due to filesystem differences
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5e5d7cdf..befe358a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,17 @@
 Release history
 ###############
 
+4.1.3 - 2019-10-09
+==================
+
+* Fix quick-start docs regarding `pelican --listen`
+* Set default listen address to 127.0.0.1
+* Add extra/optional Markdown dependency to setup.py
+* Use correct SSH port syntax for rsync in tasks.py
+* Place all deprecated settings handling together
+* Add related project URLs for display on PyPI
+* Skip some tests on Windows that can't pass due to filesystem differences
+
 4.1.2 - 2019-09-23
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index fce734f6..11c91c42 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.1.2"
+version = "4.1.3"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index 0979d1c4..23857608 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from os.path import join, relpath
 from setuptools import setup
 
 
-version = "4.1.2"
+version = "4.1.3"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',

From eaccca52dd440d76ed73d5027a29c4192c98f444 Mon Sep 17 00:00:00 2001
From: Stuart Axon <stuaxo2@yahoo.com>
Date: Fri, 11 Oct 2019 00:29:00 +0100
Subject: [PATCH 2210/2864] Support inline SVGs (don't break on title in inline
 SVG).

---
 RELEASE.md                                      |  3 +++
 pelican/readers.py                              |  2 +-
 .../tests/content/article_with_inline_svg.html  | 17 +++++++++++++++++
 pelican/tests/test_generators.py                |  2 ++
 pelican/tests/test_readers.py                   |  7 +++++++
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 RELEASE.md
 create mode 100644 pelican/tests/content/article_with_inline_svg.html

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..874bba5d
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,3 @@
+Release type: patch
+
+Support inline SVGs, don't treat titles in SVGs as HTML titles.  Fixes #2561.
diff --git a/pelican/readers.py b/pelican/readers.py
index 0edfed0e..52378c4f 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -407,7 +407,7 @@ class HTMLReader(BaseReader):
                 if self._in_head:
                     self._in_head = False
                     self._in_top_level = True
-            elif tag == 'title':
+            elif self._in_head and tag == 'title':
                 self._in_title = False
                 self.metadata['title'] = self._data_buffer
             elif tag == 'body':
diff --git a/pelican/tests/content/article_with_inline_svg.html b/pelican/tests/content/article_with_inline_svg.html
new file mode 100644
index 00000000..07f97a8a
--- /dev/null
+++ b/pelican/tests/content/article_with_inline_svg.html
@@ -0,0 +1,17 @@
+<html>
+    <head>
+        <title>Article with an inline SVG</title>
+    </head>
+    <body>
+        Ensure that the title attribute in an inline svg is not handled as an HTML title.
+        <svg xmlns="http://www.w3.org/2000/svg" width="210mm" height="297mm" viewBox="0 0 210 297">
+           <path fill="#b2b2ff" stroke="#000" stroke-width="2.646" d="M88.698 89.869l-8.899 15.63a38.894 38.894 0 00-16.474 31.722 38.894 38.894 0 0038.894 38.894 38.894 38.894 0 0038.894-38.894 38.894 38.894 0 00-9-24.83l-2.38-16.886-14.828 4.994a38.894 38.894 0 00-12.13-2.144z">
+              <title>A different title inside the inline SVG</title>
+           </path>
+           <ellipse cx="100.806" cy="125.285" rx="3.704" ry="10.583"/>
+           <ellipse cx="82.021" cy="125.285" rx="3.704" ry="10.583"/>
+           <ellipse cx="-111.432" cy="146.563" rx="3.704" ry="10.583" transform="rotate(-64.822)"/>
+           <ellipse cx="-118.245" cy="91.308" rx="6.18" ry="8.62" transform="matrix(.063 -.99801 .96163 .27436 0 0)"/>
+        </svg>
+    </body>
+</html>
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 2455d1f4..9ade301e 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -262,6 +262,7 @@ class TestArticlesGenerator(unittest.TestCase):
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'Default', 'article'],
+            ['Article with an inline SVG', 'published', 'Default', 'article'],
             ['This is an article with category !', 'published', 'yeah',
              'article'],
             ['This is an article with multiple authors!', 'published',
@@ -554,6 +555,7 @@ class TestArticlesGenerator(unittest.TestCase):
             'An Article With Code Block To Test Typogrify Ignore',
             'Article title',
             'Article with Nonconformant HTML meta tags',
+            'Article with an inline SVG',
             'Article with markdown and summary metadata multi',
             'Article with markdown and summary metadata single',
             'Article with markdown containing footnotes',
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 30181f54..3f05bb4a 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -764,3 +764,10 @@ class HTMLReaderTest(ReaderTest):
         }
 
         self.assertDictHasSubset(page.metadata, expected)
+
+    def test_article_with_inline_svg(self):
+        page = self.read_file(path='article_with_inline_svg.html')
+        expected = {
+            'title': 'Article with an inline SVG',
+        }
+        self.assertDictHasSubset(page.metadata, expected)

From bcac6e80b9e22cf6140e6ceba6fe1f977832c5b9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 21 Sep 2019 12:19:43 -0700
Subject: [PATCH 2211/2864] Improve content metadata field docs. Fixes #2347

---
 docs/content.rst | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index f0022c35..bff30e1d 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -71,22 +71,31 @@ Metadata syntax for Markdown posts should follow this pattern::
     This is the content of my super blog post.
 
 You can also have your own metadata keys (so long as they don't conflict with
-reserved metadata keywords) for use in your python templates. The following is
+reserved metadata keywords) for use in your templates. Following is
 the list of reserved metadata keywords:
 
-* `Title`
-* `Tags`
-* `Date`
-* `Modified`
-* `Status`
-* `Category`
-* `Author`
-* `Authors`
-* `Slug`
-* `Summary`
-* `Template`
-* `Save_as`
-* `Url`
+================= ================ ============================================
+reStructuredText      Markdown                     Description
+================= ================ ============================================
+``:title:``       ``Title:``       Title of the article or page
+``:date:``        ``Date:``        Publication date (``YYYY-MM-DD HH:SS``)
+``:modified:``    ``Modified:``    Modification date (``YYYY-MM-DD HH:SS``)
+``:tags:``        ``Tags:``        Content tags, separated by commas
+``:keywords:``    ``Keywords:``    Content keywords, separated by commas
+``:category:``    ``Category:``    Content category (one only — not multiple)
+``:slug:``        ``Slug:``        Identifier used in URLs and translations
+``:author:``      ``Author:``      Content author, when there is only one
+``:authors:``     ``Authors:``     Content authors, when there are multiple
+``:summary:``     ``Summary:``     Brief description of content for index pages
+``:lang:``        ``Lang:``        Content language ID (``en``, ``fr``, etc.)
+``:translation:`` ``Translation:`` Is article is a translation of another
+                                   (``true`` or ``false``)
+``:status:``      ``Status:``      Content status:
+                                   ``draft``, ``hidden``, or ``published``
+``:template:``    ``Template:``    Name of template to use to generate content
+``:save_us:``     ``Save_us:``     Save content to this relative file path
+``:url:``         ``Url:``         URL to use for this article/page
+================= ================ ============================================
 
 Readers for additional formats (such as AsciiDoc_) are available via plugins.
 Refer to `pelican-plugins`_ repository for those.

From f0617a53dc253432077fe3acbcd8d8bd87f636ab Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 16 Oct 2019 15:52:50 -0700
Subject: [PATCH 2212/2864] Follow-up changes to metadata field docs

---
 docs/content.rst | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index bff30e1d..2ca4a347 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -71,31 +71,29 @@ Metadata syntax for Markdown posts should follow this pattern::
     This is the content of my super blog post.
 
 You can also have your own metadata keys (so long as they don't conflict with
-reserved metadata keywords) for use in your templates. Following is
-the list of reserved metadata keywords:
+reserved metadata keywords) for use in your templates. The following table
+contains a list of reserved metadata keywords:
 
-================= ================ ============================================
-reStructuredText      Markdown                     Description
-================= ================ ============================================
-``:title:``       ``Title:``       Title of the article or page
-``:date:``        ``Date:``        Publication date (``YYYY-MM-DD HH:SS``)
-``:modified:``    ``Modified:``    Modification date (``YYYY-MM-DD HH:SS``)
-``:tags:``        ``Tags:``        Content tags, separated by commas
-``:keywords:``    ``Keywords:``    Content keywords, separated by commas
-``:category:``    ``Category:``    Content category (one only — not multiple)
-``:slug:``        ``Slug:``        Identifier used in URLs and translations
-``:author:``      ``Author:``      Content author, when there is only one
-``:authors:``     ``Authors:``     Content authors, when there are multiple
-``:summary:``     ``Summary:``     Brief description of content for index pages
-``:lang:``        ``Lang:``        Content language ID (``en``, ``fr``, etc.)
-``:translation:`` ``Translation:`` Is article is a translation of another
-                                   (``true`` or ``false``)
-``:status:``      ``Status:``      Content status:
-                                   ``draft``, ``hidden``, or ``published``
-``:template:``    ``Template:``    Name of template to use to generate content
-``:save_us:``     ``Save_us:``     Save content to this relative file path
-``:url:``         ``Url:``         URL to use for this article/page
-================= ================ ============================================
+=============== ===============================================================
+    Metadata                              Description
+=============== ===============================================================
+``title``       Title of the article or page
+``date``        Publication date (e.g., ``YYYY-MM-DD HH:SS``)
+``modified``    Modification date (e.g., ``YYYY-MM-DD HH:SS``)
+``tags``        Content tags, separated by commas
+``keywords``    Content keywords, separated by commas (HTML content only)
+``category``    Content category (one only — not multiple)
+``slug``        Identifier used in URLs and translations
+``author``      Content author, when there is only one
+``authors``     Content authors, when there are multiple
+``summary``     Brief description of content for index pages
+``lang``        Content language ID (``en``, ``fr``, etc.)
+``translation`` Is content is a translation of another (``true`` or ``false``)
+``status``      Content status: ``draft``, ``hidden``, or ``published``
+``template``    Name of template to use to generate content (without extension)
+``save_as``     Save content to this relative file path
+``url``         URL to use for this article/page
+=============== ===============================================================
 
 Readers for additional formats (such as AsciiDoc_) are available via plugins.
 Refer to `pelican-plugins`_ repository for those.

From e092f7ca75182024a9a96fcf50bd1d3fe4f487a6 Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Thu, 17 Oct 2019 13:05:53 +0200
Subject: [PATCH 2213/2864] Adding missing call to topdown=True in
 Generator.get_files

---
 pelican/generators.py    | 11 +++++------
 pelican/tests/support.py |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 75eca388..ef021070 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -155,16 +155,15 @@ class Generator(object):
 
             if os.path.isdir(root):
                 for dirpath, dirs, temp_files in os.walk(
-                        root, followlinks=True):
-                    drop = []
+                        root, topdown=True, followlinks=True):
                     excl = exclusions_by_dirpath.get(dirpath, ())
-                    for d in dirs:
+                    # We copy the `dirs` list as we will modify it in the loop:
+                    for d in list(dirs):
                         if (d in excl or
                             any(fnmatch.fnmatch(d, ignore)
                                 for ignore in ignores)):
-                            drop.append(d)
-                    for d in drop:
-                        dirs.remove(d)
+                            if d in dirs:
+                                dirs.remove(d)
 
                     reldir = os.path.relpath(dirpath, self.path)
                     for f in temp_files:
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 93db8328..751fb5ec 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -188,7 +188,7 @@ class LogCountHandler(BufferingHandler):
     """Capturing and counting logged messages."""
 
     def __init__(self, capacity=1000):
-        logging.handlers.BufferingHandler.__init__(self, capacity)
+        super(LogCountHandler, self).__init__(capacity)
 
     def count_logs(self, msg=None, level=None):
         return len([

From e5b94d7248527d2b721c9389fe26bdfe7191fd5c Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Thu, 17 Oct 2019 13:06:28 +0200
Subject: [PATCH 2214/2864]  Adding docs on how to include other files - fix
 #1902

---
 docs/content.rst | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/docs/content.rst b/docs/content.rst
index f0022c35..f169abed 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -382,6 +382,40 @@ to allow linking to both generated articles and pages and their static sources.
 
 Support for the old syntax may eventually be removed.
 
+Including other files
+---------------------
+Both Markdown and reStructuredText syntaxes provide mechanisms for this.
+
+Following below are some examples for **reStructuredText** using `the include directive`_:
+
+    .. code-block:: rst
+
+        .. include:: file.rst
+
+Include a fragment of a file delimited by two identifiers, highlighted as C++ (slicing based on line numbers is also possible):
+
+    .. code-block:: rst
+
+        .. include:: main.cpp
+            :code: c++
+            :start-after: // begin
+            :end-before: // end
+
+Include a raw HTML file (or an inline SVG) and put it directly into the output without any processing:
+
+    .. code-block:: rst
+
+        .. raw:: html
+            :file: table.html
+
+For **Markdown**, one must rely on an extension. For example, using the `mdx_include plugin`_:
+
+    .. code-block:: none
+
+        ```html
+        {! template.html !}
+        ```
+
 
 Importing an existing site
 ==========================
@@ -575,3 +609,5 @@ metadata to include ``Status: published``.
 .. _Markdown Extensions: https://python-markdown.github.io/extensions/
 .. _CodeHilite extension: https://python-markdown.github.io/extensions/code_hilite/#syntax
 .. _i18n_subsites plugin: https://github.com/getpelican/pelican-plugins/tree/master/i18n_subsites
+.. _the include directive: http://docutils.sourceforge.net/docs/ref/rst/directives.html#include
+.. _mdx_include plugin: https://github.com/neurobin/mdx_include

From f72d06a4a5271d1a4156ef042f307a479dd7b452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Gardini?=
 <mauriciogardini@users.noreply.github.com>
Date: Fri, 26 Apr 2019 20:11:37 -0300
Subject: [PATCH 2215/2864] Adds the category to the feed item. Fix #2556.

Adds the article category as a feed item category.
---
 pelican/writers.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index bdaabd8d..b610e2e2 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -78,13 +78,19 @@ class Writer(object):
             if description == content:
                 description = None
 
+        categories = list()
+        if hasattr(item, 'category'):
+            categories.append(item.category)
+        if hasattr(item, 'tags'):
+            categories.extend(item.tags)
+
         feed.add_item(
             title=title,
             link=link,
             unique_id=get_tag_uri(link, item.date),
             description=description,
             content=content,
-            categories=item.tags if hasattr(item, 'tags') else None,
+            categories=categories if categories else None,
             author_name=getattr(item, 'author', ''),
             pubdate=set_date_tzinfo(
                 item.date, self.settings.get('TIMEZONE', None)),

From 7bfc70c1538108dfaf1b0cbfc563ee4883bc1f2a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 17 Oct 2019 10:34:03 -0700
Subject: [PATCH 2216/2864] Update functional test output for category in feed

---
 .../basic/feeds/alexis-metaireau.atom.xml     |  4 ++--
 .../basic/feeds/alexis-metaireau.rss.xml      |  4 ++--
 .../tests/output/basic/feeds/all-en.atom.xml  | 20 ++++++++--------
 .../tests/output/basic/feeds/all-fr.atom.xml  |  2 +-
 pelican/tests/output/basic/feeds/all.atom.xml | 22 ++++++++---------
 pelican/tests/output/basic/feeds/bar.atom.xml |  2 +-
 .../tests/output/basic/feeds/cat1.atom.xml    |  8 +++----
 .../tests/output/basic/feeds/misc.atom.xml    |  8 +++----
 .../tests/output/basic/feeds/yeah.atom.xml    |  2 +-
 .../custom/feeds/alexis-metaireau.atom.xml    | 20 ++++++++--------
 .../custom/feeds/alexis-metaireau.rss.xml     | 20 ++++++++--------
 .../tests/output/custom/feeds/all-en.atom.xml | 20 ++++++++--------
 .../tests/output/custom/feeds/all-fr.atom.xml |  4 ++--
 .../tests/output/custom/feeds/all.atom.xml    | 24 +++++++++----------
 pelican/tests/output/custom/feeds/all.rss.xml | 24 +++++++++----------
 .../tests/output/custom/feeds/bar.atom.xml    |  2 +-
 pelican/tests/output/custom/feeds/bar.rss.xml |  2 +-
 .../tests/output/custom/feeds/cat1.atom.xml   |  8 +++----
 .../tests/output/custom/feeds/cat1.rss.xml    |  8 +++----
 .../tests/output/custom/feeds/misc.atom.xml   |  8 +++----
 .../tests/output/custom/feeds/misc.rss.xml    |  8 +++----
 .../tests/output/custom/feeds/yeah.atom.xml   |  2 +-
 .../tests/output/custom/feeds/yeah.rss.xml    |  2 +-
 .../feeds/alexis-metaireau.atom.xml           | 20 ++++++++--------
 .../feeds/alexis-metaireau.rss.xml            | 20 ++++++++--------
 .../custom_locale/feeds/all-en.atom.xml       | 20 ++++++++--------
 .../custom_locale/feeds/all-fr.atom.xml       |  4 ++--
 .../output/custom_locale/feeds/all.atom.xml   | 24 +++++++++----------
 .../output/custom_locale/feeds/all.rss.xml    | 24 +++++++++----------
 .../output/custom_locale/feeds/bar.atom.xml   |  2 +-
 .../output/custom_locale/feeds/bar.rss.xml    |  2 +-
 .../output/custom_locale/feeds/cat1.atom.xml  |  8 +++----
 .../output/custom_locale/feeds/cat1.rss.xml   |  8 +++----
 .../output/custom_locale/feeds/misc.atom.xml  |  8 +++----
 .../output/custom_locale/feeds/misc.rss.xml   |  8 +++----
 .../output/custom_locale/feeds/yeah.atom.xml  |  2 +-
 .../output/custom_locale/feeds/yeah.rss.xml   |  2 +-
 37 files changed, 188 insertions(+), 188 deletions(-)

diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index a0cf576f..8f9a85fa 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -13,10 +13,10 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index 57942aed..1af41d47 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>A Pelican Blog - Alexis Métaireau</title><link>/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-10-20:/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 410d6855..561b7484 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -20,13 +20,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -70,5 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index f4c1daf7..cf64e4ad 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index fcb4e401..d75aca63 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -21,13 +21,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -71,5 +71,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index 63d2dc24..edd1170a 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index 36312a89..8516b95c 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - cat1</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index 5c672e95..b9129ef7 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - misc</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -45,5 +45,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 3d48f4f3..6f871915 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index 12519e14..3e2f201d 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -20,13 +20,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -70,5 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index 707097f0..e5042f26 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -25,5 +25,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index d6dfd92f..ba66f3be 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -20,13 +20,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -70,5 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index 2cdcfba7..f380cd04 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 2d890b99..3c6a76cb 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -22,13 +22,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -72,5 +72,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index c20aac95..37285af5 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid><category>misc</category></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -27,5 +27,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index 2ddcece8..002de037 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index 85aeee8d..53035e71 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index ac77e9ad..e8ed355b 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><subtitle>A personal blog.</subtitle><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index 64276d5a..9951b293 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid></item></channel></rss>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 1678e35a..e5bd7e86 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -45,5 +45,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 389f703b..1c427eea 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -12,5 +12,5 @@
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index e0398437..127ab590 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index 9601e8b6..98b820ec 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index e65c1498..e17ba708 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -20,13 +20,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -70,5 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index b2ee2199..6cbd64db 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -25,5 +25,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 0862627c..7e9d6a41 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -20,13 +20,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -70,5 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
index d76dbe0f..2bf92b1f 100644
--- a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index 5b5e6a40..db861c1b 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -22,13 +22,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -72,5 +72,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index 978ae6a6..2fac2b5d 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid><category>misc</category></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -27,5 +27,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index 6b0bfb10..d4467ea7 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
index 68c2317d..d17d7703 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index 7cc2f38e..87a822e5 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
index c9c58e74..6b328fda 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid></item></channel></rss>
\ No newline at end of file
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index f871f134..40060893 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -45,5 +45,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index dcdc18a4..041c7687 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -12,5 +12,5 @@
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid></item></channel></rss>
\ No newline at end of file
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index 6b774b73..6f2e5f82 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index 21e86d15..b7fb81f8 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file

From 3be00060166ee23eb03d45508dd107554c0ce615 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 17 Oct 2019 10:42:59 -0700
Subject: [PATCH 2217/2864] Update RELEASE.md

---
 RELEASE.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 874bba5d..6b958464 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,3 +1,6 @@
-Release type: patch
+Release type: minor
 
-Support inline SVGs, don't treat titles in SVGs as HTML titles.  Fixes #2561.
+* Support inline SVGs; don't treat titles in SVGs as HTML titles
+* Add category to feeds (in addition to tags)
+* Improve content metadata field docs
+* Add docs for including other Markdown/reST files in content

From 01eb08c42b543450ee5e0e3de3854526708a6711 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Thu, 17 Oct 2019 17:50:30 +0000
Subject: [PATCH 2218/2864] Release Pelican 4.2.0

---
 RELEASE.md         | 6 ------
 docs/changelog.rst | 8 ++++++++
 pyproject.toml     | 2 +-
 setup.py           | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 6b958464..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Release type: minor
-
-* Support inline SVGs; don't treat titles in SVGs as HTML titles
-* Add category to feeds (in addition to tags)
-* Improve content metadata field docs
-* Add docs for including other Markdown/reST files in content
diff --git a/docs/changelog.rst b/docs/changelog.rst
index befe358a..febc5322 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,14 @@
 Release history
 ###############
 
+4.2.0 - 2019-10-17
+==================
+
+* Support inline SVGs; don't treat titles in SVGs as HTML titles
+* Add category to feeds (in addition to tags)
+* Improve content metadata field docs
+* Add docs for including other Markdown/reST files in content
+
 4.1.3 - 2019-10-09
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index 11c91c42..996570d0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.1.3"
+version = "4.2.0"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index 23857608..0649bd73 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from os.path import join, relpath
 from setuptools import setup
 
 
-version = "4.1.3"
+version = "4.2.0"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',

From 1c1640634f2311a7203bfd6271ca0412a33c9d7c Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Mon, 21 Oct 2019 14:29:20 +0200
Subject: [PATCH 2219/2864] Update stale.yml

---
 .github/stale.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/stale.yml b/.github/stale.yml
index d457dc02..b6991ba2 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,5 +1,11 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+daysUntilClose: 30
+
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: true
 
@@ -10,7 +16,7 @@ exemptMilestones: true
 exemptAssignees: true
 
 # Label to use when marking as stale
-staleLabel: retired
+staleLabel: stale
 
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: >

From 0806df606850b7f7544d99c6449dbea3a247981a Mon Sep 17 00:00:00 2001
From: kaliko <kaliko@azylum.org>
Date: Fri, 25 Oct 2019 09:19:15 +0200
Subject: [PATCH 2220/2864] Fixed simple theme, add missing striptags filter

page.title are missing striptags in title block
---
 pelican/themes/simple/templates/article.html | 2 +-
 pelican/themes/simple/templates/page.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 5a1c093d..c8c9a4f7 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block html_lang %}{{ article.lang }}{% endblock %}
 
-{% block title %}{{ SITENAME }} - {{ article.title }}{% endblock %}
+{% block title %}{{ SITENAME }} - {{ article.title|striptags  }}{% endblock %}
 
 {% block head %}
   {{ super() }}
diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
index 7150d420..33344eac 100644
--- a/pelican/themes/simple/templates/page.html
+++ b/pelican/themes/simple/templates/page.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block html_lang %}{{ page.lang }}{% endblock %}
 
-{% block title %}{{ SITENAME }} - {{ page.title }}{%endblock%}
+{% block title %}{{ SITENAME }} - {{ page.title|striptags }}{%endblock%}
 
 {% block head %}
   {{ super() }}

From ae73d063016d4de013eb3da2d0d6d4d6510cddd7 Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@20tab.com>
Date: Tue, 5 Nov 2019 21:04:56 +0100
Subject: [PATCH 2221/2864] Remove Python 2.7 support from settings

---
 .travis.yml    | 1 -
 THANKS         | 1 +
 pyproject.toml | 4 +---
 setup.py       | 2 --
 tox.ini        | 3 +--
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6641d4cc..af3a6ca8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ env:
   matrix:
     - TOX_ENV=docs
     - TOX_ENV=flake8
-    - TOX_ENV=py27
     - TOX_ENV=py35
     - TOX_ENV=py36
 matrix:
diff --git a/THANKS b/THANKS
index 121a8aca..625c56d3 100644
--- a/THANKS
+++ b/THANKS
@@ -117,6 +117,7 @@ Nico Di Rocco
 Nicolas Duhamel
 Nicolas Perriault
 Nicolas Steinmetz
+Paolo Melchiorre
 Paul Asselin
 Pavel Puchkin
 Perry Roper
diff --git a/pyproject.toml b/pyproject.toml
index 996570d0..f2f2d0f9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,8 +17,6 @@ classifiers = [
     "Framework :: Pelican",
     "License :: OSI Approved :: GNU Affero General Public License v3",
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 2",
-    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
@@ -29,7 +27,7 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = "~2.7 || ^3.5"
+python = "^3.5"
 feedgenerator = "^1.9"
 jinja2 = "~2.10.1"
 pygments = "^2.4"
diff --git a/setup.py b/setup.py
index 0649bd73..faf28f10 100755
--- a/setup.py
+++ b/setup.py
@@ -71,8 +71,6 @@ setup(
         'Framework :: Pelican',
         'License :: OSI Approved :: GNU Affero General Public License v3',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
diff --git a/tox.ini b/tox.ini
index 15dbaee8..b9178ac9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py{27,35,36,37},docs,flake8
+envlist = py{35,36,37},docs,flake8
 
 [testenv]
 basepython =
-    py27: python2.7
     py35: python3.5
     py36: python3.6
     py37: python3.7

From e46b6232546a75b31f5cf3ae8f9aa9a624344915 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 9 Nov 2019 08:36:45 -0800
Subject: [PATCH 2222/2864] Add initial Invoke tasks.py file

---
 tasks.py | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 tasks.py

diff --git a/tasks.py b/tasks.py
new file mode 100644
index 00000000..7d9ff1d9
--- /dev/null
+++ b/tasks.py
@@ -0,0 +1,81 @@
+import os
+from pathlib import Path
+from shutil import which
+
+from invoke import task
+
+PKG_NAME = "pelican"
+PKG_PATH = Path("pelican")
+ACTIVE_VENV = os.environ.get("VIRTUAL_ENV", None)
+VENV_HOME = Path(os.environ.get("WORKON_HOME", "~/virtualenvs"))
+VENV_PATH = Path(ACTIVE_VENV) if ACTIVE_VENV else (VENV_HOME / PKG_NAME)
+VENV = str(VENV_PATH.expanduser())
+
+TOOLS = ["poetry", "pre-commit"]
+POETRY = which("poetry") if which("poetry") else (VENV / Path("bin") / "poetry")
+PRECOMMIT = (
+    which("pre-commit") if which("pre-commit") else (VENV / Path("bin") / "pre-commit")
+)
+
+
+@task
+def tests(c):
+    """Run the test suite"""
+    c.run(f"{VENV}/bin/python -Wd -m unittest discover", pty=True)
+
+
+@task
+def black(c, check=False, diff=False):
+    """Run Black auto-formatter, optionally with --check or --diff"""
+    check_flag, diff_flag = "", ""
+    if check:
+        check_flag = "--check"
+    if diff:
+        diff_flag = "--diff"
+    c.run(f"{VENV}/bin/black {check_flag} {diff_flag} {PKG_PATH} tasks.py")
+
+
+@task
+def isort(c, check=False, diff=False):
+    check_flag, diff_flag = "", ""
+    if check:
+        check_flag = "-c"
+    if diff:
+        diff_flag = "--diff"
+    c.run(
+        f"{VENV}/bin/isort {check_flag} {diff_flag} --recursive {PKG_PATH}/* tasks.py"
+    )
+
+
+@task
+def flake8(c):
+    c.run(f"{VENV}/bin/flake8 {PKG_PATH} tasks.py")
+
+
+@task
+def lint(c):
+    isort(c, check=True)
+    black(c, check=True)
+    flake8(c)
+
+
+@task
+def tools(c):
+    """Install tools in the virtual environment if not already on PATH"""
+    for tool in TOOLS:
+        if not which(tool):
+            c.run(f"{VENV}/bin/pip install {tool}")
+
+
+@task
+def precommit(c):
+    """Install pre-commit hooks to .git/hooks/pre-commit"""
+    c.run(f"{PRECOMMIT} install")
+
+
+@task
+def setup(c):
+    c.run(f"{VENV}/bin/pip install -U pip")
+    tools(c)
+    c.run(f"{POETRY} install")
+    precommit(c)

From d859f93c7b7ed659eee4d8653e060e309f51cc2d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 9 Nov 2019 08:37:11 -0800
Subject: [PATCH 2223/2864] Add initial Pre-commit configuration file

---
 .pre-commit-config.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..ef27cfcf
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,13 @@
+# See https://pre-commit.com/hooks.html for info on hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-ast
+      - id: check-toml
+      - id: check-yaml
+      - id: debug-statements
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: trailing-whitespace

From 272778bc673bd10ff8a0031fd993676199cf60c9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 9 Nov 2019 08:37:54 -0800
Subject: [PATCH 2224/2864] Add initial EditorConfig configuration

---
 .editorconfig | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..b42ca8c2
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.py]
+max_line_length = 79
+
+[*.yml]
+indent_size = 2

From 04a602e381f8ec079482b7a87a412e02d133aa97 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 9 Nov 2019 08:40:26 -0800
Subject: [PATCH 2225/2864] Add Invoke as dependency in pyproject

---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index 996570d0..c498ef15 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -52,6 +52,7 @@ sphinx_rtd_theme = "^0.4.3"
 tox = "^3.13"
 flake8 = "^3.7"
 flake8-import-order = "^0.18.1"
+invoke = "^1.3"
 
 [tool.poetry.extras]
 markdown = ["markdown"]

From 68c9ef76b2503a33bf5595069ab6d693a7eaf130 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 9 Nov 2019 09:43:55 -0800
Subject: [PATCH 2226/2864] Update CONTRIBUTING docs for Python 2.x removal

This also updates the Contributing documentation with information on new
development tooling.
---
 CONTRIBUTING.rst    |   5 +-
 docs/contribute.rst | 180 +++++++++++++++++++++++++-------------------
 2 files changed, 105 insertions(+), 80 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 7ae47593..ac120128 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -137,8 +137,7 @@ Contribution quality standards
   code/formatting can be improved. If you are relying on your editor for PEP8
   compliance, note that the line length specified by PEP8 is 79 (excluding the
   line break).
-* Ensure your code is compatible with the latest Python 2.7 and 3.x releases — see our
-  `compatibility cheatsheet`_ for more details.
+* Ensure your code is compatible with the `officially-supported Python releases`_.
 * Add docs and tests for your changes. Undocumented and untested features will
   not be accepted.
 * `Run all the tests`_ **on all versions of Python supported by Pelican** to
@@ -155,4 +154,4 @@ need assistance or have any questions about these guidelines.
 .. _`Git Tips`: https://github.com/getpelican/pelican/wiki/Git-Tips
 .. _`PEP8 coding standards`: https://www.python.org/dev/peps/pep-0008/
 .. _`ask for help`: `How to get help`_
-.. _`compatibility cheatsheet`: https://docs.getpelican.com/en/latest/contribute.html#python-3-development-tips
+.. _`officially-supported Python releases`: https://devguide.python.org/#status-of-python-branches
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 5a314751..1e884463 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -7,72 +7,78 @@ can also help out by reviewing and commenting on
 `existing issues <https://github.com/getpelican/pelican/issues>`_.
 
 Don't hesitate to fork Pelican and submit an issue or pull request on GitHub.
-When doing so, please adhere to the following guidelines.
+When doing so, please consider the following guidelines.
 
 .. include:: ../CONTRIBUTING.rst
 
 Setting up the development environment
 ======================================
 
-While there are many ways to set up one's development environment, we recommend
-using `Virtualenv <https://virtualenv.pypa.io/en/stable/>`_. This tool allows
-you to set up separate environments for separate Python projects that are
-isolated from one another so you can use different packages (and package
-versions) for each.
+While there are many ways to set up one's development environment, the following
+instructions will utilize Pip_ and Poetry_. These tools facilitate managing
+virtual environments for separate Python projects that are isolated from one
+another, so you can use different packages (and package versions) for each.
 
-If you don't have ``virtualenv`` installed, you can install it via::
+Please note that Python 3.6+ is required for Pelican development.
 
-    $ pip install virtualenv
+*(Optional)* If you prefer to install Poetry once for use with multiple projects,
+you can install it via::
 
-Use ``virtualenv`` to create and activate a virtual environment::
+    curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
 
-    $ virtualenv ~/virtualenvs/pelican
-    $ cd ~/virtualenvs/pelican
-    $ . bin/activate
+Point your web browser to the `Pelican repository`_ and tap the **Fork** button
+at top-right. Then clone the source for your fork and add the upstream project
+as a Git remote::
 
-Clone the Pelican source into a subfolder called ``src/pelican``::
+    mkdir ~/projects
+    git clone https://github.com/YOUR_USERNAME/pelican.git ~/projects/pelican
+    cd ~/projects/pelican
+    git remote add upstream https://github.com/getpelican/pelican.git
 
-    $ git clone https://github.com/getpelican/pelican.git src/pelican
-    $ cd src/pelican
+While Poetry can dynamically create and manage virtual environments, we're going
+to manually create and activate a virtual environment::
 
-Install the development dependencies::
+    mkdir ~/virtualenvs
+    python3 -m venv ~/virtualenvs/pelican
+    source ~/virtualenvs/pelican/bin/activate
 
-    $ pip install -r requirements/developer.pip
+Install the needed dependencies and set up the project::
 
-Install Pelican and its dependencies::
+    pip install -e ~/projects/pelican invoke
+    invoke setup
 
-    $ python setup.py develop
+Your local environment should now be ready to go!
 
-Or using ``pip``::
+.. _Pip: https://pip.pypa.io/
+.. _Poetry: https://poetry.eustace.io/docs/#installation
+.. _Pelican repository: https://github.com/getpelican/pelican
 
-    $ pip install -e .
+Development
+===========
 
-To conveniently test on multiple Python versions, we also provide a ``.tox``
-file.
+Once Pelican has been set up for local development, create a topic branch for
+your bug fix or feature:
 
+    git checkout -b name-of-your-bugfix-or-feature
 
-Building the docs
-=================
-
-If you make changes to the documentation, you should preview your changes
-before committing them::
-
-    $ pip install -r requirements/docs.pip
-    $ cd docs
-    $ make html
-
-Open ``_build/html/index.html`` in your browser to preview the documentation.
+Now you can make changes to Pelican, its documentation, and/or other aspects of
+the project.
 
 Running the test suite
-======================
+----------------------
 
-Each time you add a feature, there are two things to do regarding tests: check
-that the existing tests pass, and add tests for the new feature or bugfix.
+Each time you make changes to Pelican, there are two things to do regarding
+tests: check that the existing tests pass, and add tests for any new features
+or bug fixes. The tests are located in ``pelican/tests``, and you can run them
+via::
 
-The tests live in ``pelican/tests`` and you can run them using the
-"discover" feature of ``unittest``::
+    invoke tests
 
-    $ python -Wd -m unittest discover
+In addition to running the test suite, the above invocation will also check code
+style and let you know whether non-conforming patterns were found. In some cases
+these linters will make the needed changes directly, while in other cases you
+may need to make additional changes until ``invoke tests`` no longer reports any
+code style violations.
 
 After making your changes and running the tests, you may see a test failure
 mentioning that "some generated files differ from the expected functional tests
@@ -82,11 +88,11 @@ the nature of your changes, then you should update the output used by the
 functional tests. To do so, **make sure you have both** ``en_EN.utf8`` **and**
 ``fr_FR.utf8`` **locales installed**, and then run the following two commands::
 
-    $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/custom/ \
+    LC_ALL=en_US.utf8 pelican -o pelican/tests/output/custom/ \
         -s samples/pelican.conf.py samples/content/
-    $ LC_ALL=fr_FR.utf8 pelican -o pelican/tests/output/custom_locale/ \
+    LC_ALL=fr_FR.utf8 pelican -o pelican/tests/output/custom_locale/ \
         -s samples/pelican.conf_FR.py samples/content/
-    $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/basic/ \
+    LC_ALL=en_US.utf8 pelican -o pelican/tests/output/basic/ \
         samples/content/
 
 You may also find that some tests are skipped because some dependency (e.g.,
@@ -101,48 +107,68 @@ environments.
 
 .. _Tox: https://tox.readthedocs.io/en/latest/
 
-Python 2/3 compatibility development tips
-=========================================
+Building the docs
+-----------------
 
-Here are some tips that may be useful for writing code that is compatible with
-both Python 2.7 and Python 3:
+If you make changes to the documentation, you should preview your changes
+before committing them::
 
-- Use new syntax. For example:
+    cd docs
+    make html
 
-  - ``print .. -> print(..)``
-  - ``except .., e -> except .. as e``
+Open ``_build/html/index.html`` in your browser to preview the documentation.
 
-- Use new methods. For example:
+Plugin development
+------------------
 
-  - ``dict.iteritems() -> dict.items()``
-  - ``xrange(..) - > list(range(..))``
+To create a *new* Pelican plugin, please refer to the `plugin template`_
+repository for detailed instructions.
 
-- Use ``six`` where necessary. For example:
+If you want to contribute to an *existing* Pelican plugin, follow the steps
+above to set up Pelican for local development, and then create a directory to
+store cloned plugin repositories::
 
-  - ``isinstance(.., basestring) -> isinstance(.., six.string_types)``
-  - ``isinstance(.., unicode) -> isinstance(.., six.text_type)``
+   mkdir -p ~/projects/pelican-plugins
 
-- Assume every string and literal is Unicode:
+Assuming you wanted to contribute to the Simple Footnotes plugin, you would
+first browse to the `Simple Footnotes`_ repository on GitHub and tap the **Fork**
+button at top-right. Then clone the source for your fork and add the upstream
+project as a Git remote::
 
-  - Use ``from __future__ import unicode_literals``
-  - Do not use the prefix ``u'`` before strings.
-  - Do not encode/decode strings in the middle of something. Follow the code to
-    the source/target of a string and encode/decode at the first/last possible
-    point.
-  - In particular, write your functions to expect and to return Unicode.
-  - Encode/decode strings if the string is the output of a Python function that
-    is known to handle this badly. For example, ``strftime()`` in Python 2.
-  - Do not use the magic method ``__unicode()__`` in new classes. Use only
-    ``__str()__`` and decorate the class with ``@python_2_unicode_compatible``.
+    git clone https://github.com/YOUR_USERNAME/simple-footnotes.git ~/projects/pelican-plugins/simple-footnotes
+    cd ~/projects/pelican-plugins/simple-footnotes
+    git remote add upstream https://github.com/pelican-plugins/simple-footnotes.git
 
-- ``setlocale()`` in Python 2 fails when we give the locale name as Unicode,
-  and since we are using ``from __future__ import unicode_literals``, we do
-  that everywhere! As a workaround, enclose the locale name with ``str()``;
-  in Python 2 this casts the name to a byte string, while in Python 3 this
-  should do nothing, because the locale name was already Unicode.
-- Do not start integer literals with a zero. This is a syntax error in Python 3.
-- Unfortunately there seems to be no octal notation that is valid in both
-  Python 2 and 3. Use decimal notation instead.
+Install the needed dependencies and set up the project::
+
+    invoke setup
+
+After writing new tests for your plugin changes, run the plugin test suite::
+
+    invoke tests
+
+.. _plugin template: https://github.com/getpelican/cookiecutter-pelican-plugin
+.. _Simple Footnotes: https://github.com/pelican-plugins/simple-footnotes
+
+Submitting your changes
+-----------------------
+
+Assuming linting validation and tests pass, add a ``RELEASE.md`` file in the root
+of the project that contains the release type (major, minor, patch) and a
+summary of the changes that will be used as the release changelog entry.
+For example::
+
+    Release type: patch
+
+    Fix browser reloading upon changes to content, settings, or theme
+
+Commit your changes and push your topic branch::
+
+    git add .
+    git commit -m "Your detailed description of your changes"
+    git push origin name-of-your-bugfix-or-feature
+
+Finally, browse to your repository fork on GitHub and submit a pull request.
 
 
 Logging tips
@@ -160,8 +186,8 @@ For logging messages that are not repeated, use the usual Python way::
     logger.warning("A warning with %s formatting", arg_to_be_formatted)
 
 Do not format log messages yourself. Use ``%s`` formatting in messages and pass
-arguments to logger. This is important, because Pelican logger will preprocess
-some arguments (like Exceptions) for Py2/Py3 compatibility.
+arguments to logger. This is important, because the Pelican logger will
+preprocess some arguments, such as exceptions.
 
 Limiting extraneous log messages
 --------------------------------

From e713407f898f964f927053ffa924edb9adbcc1bb Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 10 Nov 2019 20:08:47 -0800
Subject: [PATCH 2227/2864] Add Pytest `filterwarnings` config section

Fixes #2650
---
 tox.ini | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tox.ini b/tox.ini
index 15dbaee8..97f3a210 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,6 +29,11 @@ changedir = docs
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html
 
+[pytest]
+filterwarnings =
+    default::DeprecationWarning
+    error:.*:Warning:pelican
+
 [flake8]
 application-import-names = pelican
 import-order-style = cryptography

From 2d232d15aae0af895ede1146c0f2810adc8410e1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 10 Nov 2019 20:10:59 -0800
Subject: [PATCH 2228/2864] Switch `invoke tests` test runner to Pytest

---
 tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks.py b/tasks.py
index 7d9ff1d9..41ac2bde 100644
--- a/tasks.py
+++ b/tasks.py
@@ -21,7 +21,7 @@ PRECOMMIT = (
 @task
 def tests(c):
     """Run the test suite"""
-    c.run(f"{VENV}/bin/python -Wd -m unittest discover", pty=True)
+    c.run(f"{VENV}/bin/pytest", pty=True)
 
 
 @task

From dad376e0db64e583a2d7d81219c9eef48a7a4cae Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 11 Nov 2019 13:51:25 -0800
Subject: [PATCH 2229/2864] Switch Tox test runner from Nose to Pytest

---
 tox.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index 97f3a210..1c20b282 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,14 +11,14 @@ passenv = *
 usedevelop=True
 deps =
     -rrequirements/test.pip
-    nose
-    nose-cov
+    pytest
+    pytest-cov
     coveralls
     pygments==2.1.3
 
 commands =
     {envpython} --version
-    nosetests -sv --with-coverage --cover-package=pelican pelican
+    pytest -sv --cov=pelican pelican
     - coveralls
 
 [testenv:docs]

From c0df11ecb80f51d63dd33202fa059727a84d5c29 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 11 Nov 2019 13:53:14 -0800
Subject: [PATCH 2230/2864] Remove Coveralls from Tox configuration

---
 tox.ini | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 1c20b282..f975dd59 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,13 +13,11 @@ deps =
     -rrequirements/test.pip
     pytest
     pytest-cov
-    coveralls
     pygments==2.1.3
 
 commands =
     {envpython} --version
     pytest -sv --cov=pelican pelican
-    - coveralls
 
 [testenv:docs]
 basepython = python3.6

From 703c28108947222e25425f9b798fb0925cbdb89a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 12 Nov 2019 07:28:55 -0800
Subject: [PATCH 2231/2864] Add missing colon in Contribute docs

---
 docs/contribute.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 1e884463..752565f6 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -57,7 +57,7 @@ Development
 ===========
 
 Once Pelican has been set up for local development, create a topic branch for
-your bug fix or feature:
+your bug fix or feature::
 
     git checkout -b name-of-your-bugfix-or-feature
 

From b7368f919fdfe75dea585e13c5bad3911a34514a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 12 Nov 2019 07:40:05 -0800
Subject: [PATCH 2232/2864] Add Invoke task for updating functional test output

---
 docs/contribute.rst |  9 ++-------
 tasks.py            | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 752565f6..2f5ef873 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -86,14 +86,9 @@ output." If you have made changes that affect the HTML output generated by
 Pelican, and the changes to that output are expected and deemed correct given
 the nature of your changes, then you should update the output used by the
 functional tests. To do so, **make sure you have both** ``en_EN.utf8`` **and**
-``fr_FR.utf8`` **locales installed**, and then run the following two commands::
+``fr_FR.utf8`` **locales installed**, and then run the following command::
 
-    LC_ALL=en_US.utf8 pelican -o pelican/tests/output/custom/ \
-        -s samples/pelican.conf.py samples/content/
-    LC_ALL=fr_FR.utf8 pelican -o pelican/tests/output/custom_locale/ \
-        -s samples/pelican.conf_FR.py samples/content/
-    LC_ALL=en_US.utf8 pelican -o pelican/tests/output/basic/ \
-        samples/content/
+    invoke update-functional-tests
 
 You may also find that some tests are skipped because some dependency (e.g.,
 Pandoc) is not installed. This does not automatically mean that these tests
diff --git a/tasks.py b/tasks.py
index 41ac2bde..8ecfc467 100644
--- a/tasks.py
+++ b/tasks.py
@@ -79,3 +79,17 @@ def setup(c):
     tools(c)
     c.run(f"{POETRY} install")
     precommit(c)
+
+
+@task
+def update_functional_tests(c):
+    """Update the generated functional test output"""
+    c.run(
+        f"bash -c 'LC_ALL=en_US.utf8 pelican -o {PKG_PATH}/tests/output/custom/ -s samples/pelican.conf.py samples/content/'"
+    )
+    c.run(
+        f"bash -c 'LC_ALL=fr_FR.utf8 pelican -o {PKG_PATH}/tests/output/custom_locale/ -s samples/pelican.conf_FR.py samples/content/'"
+    )
+    c.run(
+        f"bash -c 'LC_ALL=en_US.utf8 pelican -o {PKG_PATH}/tests/output/basic/ samples/content/'"
+    )

From f18429f23a2edc11e91fabea5150c06f20589b08 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 12 Nov 2019 07:45:36 -0800
Subject: [PATCH 2233/2864] Add Pytest as development dependency

---
 pyproject.toml        | 7 ++++++-
 requirements/test.pip | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index c498ef15..a7afc595 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -46,9 +46,14 @@ BeautifulSoup4 = "^4.7"
 lxml = "^4.3"
 markdown = "~3.1.1"
 typogrify = "^2.0"
-mock = "^3.0"
 sphinx = "=1.4.9"
 sphinx_rtd_theme = "^0.4.3"
+mock = "^3.0"
+pytest = "^5.2"
+pytest-cov = "^2.8"
+pytest-emoji = "^0.2.0"
+pytest-pythonpath = "^0.7.3"
+pytest-sugar = "^0.9.2"
 tox = "^3.13"
 flake8 = "^3.7"
 flake8-import-order = "^0.18.1"
diff --git a/requirements/test.pip b/requirements/test.pip
index ec4ea874..f5d09e4a 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,5 +1,6 @@
 # Tests
 mock
+pytest
 
 # Optional Packages
 Markdown >= 3.1

From 535df9cd9ce5ac9217828ddf480aca07c822aafe Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 12 Nov 2019 08:36:22 -0800
Subject: [PATCH 2234/2864] Add Invoke tasks for building and serving docs

---
 docs/contribute.rst   | 12 +++++++-----
 pyproject.toml        |  1 +
 requirements/docs.pip |  1 +
 tasks.py              | 19 +++++++++++++++++++
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 2f5ef873..a96f2d02 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -105,13 +105,15 @@ environments.
 Building the docs
 -----------------
 
-If you make changes to the documentation, you should preview your changes
-before committing them::
+If you make changes to the documentation, you should build and inspect your
+changes before committing them::
 
-    cd docs
-    make html
+    invoke docserve
 
-Open ``_build/html/index.html`` in your browser to preview the documentation.
+Open http://localhost:8000 in your browser to review the documentation. While
+the above task is running, any changes you make and save to the documentation
+should automatically appear in the browser, as it live-reloads when it detects
+changes to the documentation source files.
 
 Plugin development
 ------------------
diff --git a/pyproject.toml b/pyproject.toml
index a7afc595..8b9db0c6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,6 +48,7 @@ markdown = "~3.1.1"
 typogrify = "^2.0"
 sphinx = "=1.4.9"
 sphinx_rtd_theme = "^0.4.3"
+livereload = "^2.6"
 mock = "^3.0"
 pytest = "^5.2"
 pytest-cov = "^2.8"
diff --git a/requirements/docs.pip b/requirements/docs.pip
index 525bdc40..acc5d5f5 100644
--- a/requirements/docs.pip
+++ b/requirements/docs.pip
@@ -1,2 +1,3 @@
 sphinx==1.4.9
 sphinx_rtd_theme
+livereload
diff --git a/tasks.py b/tasks.py
index 8ecfc467..42642e6a 100644
--- a/tasks.py
+++ b/tasks.py
@@ -6,6 +6,7 @@ from invoke import task
 
 PKG_NAME = "pelican"
 PKG_PATH = Path("pelican")
+DOCS_PORT = os.environ.get("DOCS_PORT", 8000)
 ACTIVE_VENV = os.environ.get("VIRTUAL_ENV", None)
 VENV_HOME = Path(os.environ.get("WORKON_HOME", "~/virtualenvs"))
 VENV_PATH = Path(ACTIVE_VENV) if ACTIVE_VENV else (VENV_HOME / PKG_NAME)
@@ -18,6 +19,24 @@ PRECOMMIT = (
 )
 
 
+@task
+def docbuild(c):
+    """Build documentation"""
+    c.run(f"{VENV}/bin/sphinx-build docs docs/_build")
+
+
+@task(docbuild)
+def docserve(c):
+    """Serve docs at http://localhost:$DOCS_PORT/ (default port is 8000)"""
+    from livereload import Server
+
+    server = Server()
+    server.watch("docs/conf.py", lambda: docbuild(c))
+    server.watch("CONTRIBUTING.rst", lambda: docbuild(c))
+    server.watch("docs/*.rst", lambda: docbuild(c))
+    server.serve(port=DOCS_PORT, root="docs/_build")
+
+
 @task
 def tests(c):
     """Run the test suite"""

From 4dc30dabab16602a0e6cf9348ecd385aab13a775 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 12 Nov 2019 14:13:43 -0800
Subject: [PATCH 2235/2864] Update `hub pull-request` docs in CONTRIBUTING

---
 CONTRIBUTING.rst | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index ac120128..5c1086a1 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -120,12 +120,13 @@ Using Git and GitHub
   GitHub's web UI to submit the pull request. This isn't an absolute
   requirement, but makes the maintainers' lives much easier! Specifically:
   `install hub <https://github.com/github/hub/#installation>`_ and then run
-  `hub pull-request <https://github.com/github/hub/#git-pull-request>`_ to
-  turn your GitHub issue into a pull request containing your code.
-* After you have issued a pull request, Travis will run the test suite for all
-  supported Python versions and check for PEP8 compliance. If any of these
-  checks fail, you should fix them. (If tests fail on Travis but seem to pass
-  locally, ensure that local test runs aren't skipping any tests.)
+  `hub pull-request -i [ISSUE] <https://hub.github.com/hub-pull-request.1.html>`_
+  to turn your GitHub issue into a pull request containing your code.
+* After you have issued a pull request, the continuous integration (CI) system
+  will run the test suite for all supported Python versions and check for PEP8
+  compliance. If any of these checks fail, you should fix them. (If tests fail
+  on the CI system but seem to pass locally, ensure that local test runs aren't
+  skipping any tests.)
 
 Contribution quality standards
 ------------------------------

From 74815af6e2ea136dd9ca6664b565ef0d0f4ab7d7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 12 Nov 2019 14:20:50 -0800
Subject: [PATCH 2236/2864] Minor CONTRIBUTING fixes

---
 CONTRIBUTING.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 5c1086a1..945a5303 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -22,7 +22,7 @@ Before you ask for help, please make sure you do the following:
 
 3. Try reproducing the issue in a clean environment, ensuring you are using:
 
-* latest Pelican release (or an up-to-date git clone of Pelican master)
+* latest Pelican release (or an up-to-date Git clone of Pelican master)
 * latest releases of libraries used by Pelican
 * no plugins or only those related to the issue
 
@@ -71,7 +71,7 @@ The #pelican IRC channel
 * Because of differing time zones, you may not get an immediate response to your
   question, but please be patient and stay logged into IRC — someone will almost
   always respond if you wait long enough (it may take a few hours).
-* If you don't have an IRC client handy, use the webchat_ for quick feedback.
+* If you don't have an IRC client handy, use the webchat_.
 * You can direct your IRC client to the channel using this `IRC link`_ or you
   can manually join the ``#pelican`` IRC channel on the `freenode IRC network`_.
 
@@ -94,7 +94,7 @@ Using Git and GitHub
 * `Create a new git branch`_ specific to your change (as opposed to making
   your commits in the master branch).
 * **Don't put multiple unrelated fixes/features in the same branch / pull request.**
-  For example, if you're hacking on a new feature and find a bugfix that
+  For example, if you're working on a new feature and find a bugfix that
   doesn't *require* your new feature, **make a new distinct branch and pull
   request** for the bugfix.
 * Add a ``RELEASE.md`` file in the root of the project that contains the

From 4821ad3ce7865d74e74b63e9c21decc871657bea Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 13 Nov 2019 06:48:09 -0800
Subject: [PATCH 2237/2864] Remove Bumpr

---
 bumpr.rc               | 32 --------------------------------
 requirements/owner.pip |  1 -
 2 files changed, 33 deletions(-)
 delete mode 100644 bumpr.rc

diff --git a/bumpr.rc b/bumpr.rc
deleted file mode 100644
index eebe4dd8..00000000
--- a/bumpr.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-[bumpr]
-file = pelican/__init__.py
-vcs = git
-clean =
-    python setup.py clean
-    rm -rf *egg-info build dist
-tests = python -m unittest discover
-publish = python setup.py sdist bdist_wheel register upload
-files =
-    README.rst
-    setup.py
-
-[bump]
-unsuffix = true
-message = Bump version {version}
-
-[prepare]
-part = patch
-suffix = dev
-message = Prepare version {version} for next development cycle
-
-[changelog]
-file = docs/changelog.rst
-separator = =
-bump = {version} ({date:%Y-%m-%d})
-prepare = Next release
-
-[readthedoc]
-url = http://docs.getpelican.com/{tag}
-
-[commands]
-bump = sed -i "" "s/last_stable[[:space:]]*=.*/last_stable = '{version}'/" docs/conf.py
diff --git a/requirements/owner.pip b/requirements/owner.pip
index 472823d4..45232fde 100644
--- a/requirements/owner.pip
+++ b/requirements/owner.pip
@@ -2,5 +2,4 @@
 
 # Release issuance
 tox
-bumpr==0.2.0
 wheel

From bae6de5d26646872fedbd00d37a849bba1837a3b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 16 Nov 2019 07:37:01 -0800
Subject: [PATCH 2238/2864] Remove pytest-emoji from dev dependencies

---
 pyproject.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8b9db0c6..43d17fb1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -52,7 +52,6 @@ livereload = "^2.6"
 mock = "^3.0"
 pytest = "^5.2"
 pytest-cov = "^2.8"
-pytest-emoji = "^0.2.0"
 pytest-pythonpath = "^0.7.3"
 pytest-sugar = "^0.9.2"
 tox = "^3.13"

From 1e0e541b575a377efa31b01bb13a60bb8c890d61 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Tue, 5 Nov 2019 23:17:19 -0800
Subject: [PATCH 2239/2864] Initial pass of removing Python 2 support

This commit removes Six as a dependency for Pelican, replacing the
relevant aliases with the proper Python 3 imports. It also removes
references to Python 2 logic that did not require Six.
---
 .gitignore                                    |   1 -
 THANKS                                        |   1 +
 docs/conf.py                                  |   1 -
 pelican/__init__.py                           |  20 +--
 pelican/__main__.py                           |   1 -
 pelican/cache.py                              |   4 +-
 pelican/contents.py                           |  32 ++---
 pelican/generators.py                         |  11 +-
 pelican/log.py                                |  53 +-------
 pelican/paginator.py                          |   5 +-
 pelican/readers.py                            |  24 ++--
 pelican/rstdirectives.py                      |   5 +-
 pelican/server.py                             |  17 +--
 pelican/settings.py                           |  13 +-
 pelican/signals.py                            |   1 -
 pelican/tests/default_conf.py                 |   1 -
 pelican/tests/support.py                      |   4 +-
 pelican/tests/test_cache.py                   |   1 -
 pelican/tests/test_contents.py                |  25 ++--
 pelican/tests/test_generators.py              |   1 -
 pelican/tests/test_importer.py                |   1 -
 pelican/tests/test_paginator.py               |   1 -
 pelican/tests/test_pelican.py                 |   1 -
 pelican/tests/test_readers.py                 |  11 +-
 pelican/tests/test_rstdirectives.py           |   1 -
 pelican/tests/test_server.py                  |   3 +-
 pelican/tests/test_settings.py                |   1 -
 pelican/tests/test_testsuite.py               |   1 -
 pelican/tests/test_urlwrappers.py             |   1 -
 pelican/tests/test_utils.py                   |   9 +-
 pelican/tools/pelican_import.py               |  40 ++----
 pelican/tools/pelican_quickstart.py           |  81 +++++-------
 pelican/tools/pelican_themes.py               |   1 -
 pelican/tools/templates/pelicanconf.py.jinja2 |   1 -
 pelican/tools/templates/publishconf.py.jinja2 |   1 -
 pelican/urlwrappers.py                        |  16 +--
 pelican/utils.py                              |  51 ++------
 pelican/writers.py                            |  11 +-
 poetry.lock                                   | 120 +-----------------
 pyproject.toml                                |   1 -
 samples/pelican.conf.py                       |   1 -
 samples/pelican.conf_FR.py                    |   1 -
 setup.py                                      |   9 +-
 43 files changed, 126 insertions(+), 459 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45946946..c1835e10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ tags
 .tox
 .coverage
 htmlcov
-six-*.egg/
 *.orig
 venv
 samples/output
diff --git a/THANKS b/THANKS
index 625c56d3..08ac7bb2 100644
--- a/THANKS
+++ b/THANKS
@@ -92,6 +92,7 @@ Joshua Adelman
 Julian Berman
 Justin Mayer
 Kevin Deldycke
+Kevin Yap
 Kyle Fuller
 Laureline Guerin
 Leonard Huang
diff --git a/docs/conf.py b/docs/conf.py
index 43009cdd..f0589b84 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 import os
 import sys
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 499ded04..456d0691 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import argparse
 try:
     import collections.abc as collections
 except ImportError:
     import collections
-import locale
 import logging
 import multiprocessing
 import os
@@ -15,8 +13,6 @@ import sys
 import time
 import traceback
 
-import six
-
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import init as init_logging
@@ -76,11 +72,10 @@ class Pelican(object):
             sys.path.insert(0, pluginpath)
         for plugin in self.settings['PLUGINS']:
             # if it's a string, then import it
-            if isinstance(plugin, six.string_types):
+            if isinstance(plugin, str):
                 logger.debug("Loading plugin `%s`", plugin)
                 try:
-                    plugin = __import__(plugin, globals(), locals(),
-                                        str('module'))
+                    plugin = __import__(plugin, globals(), locals(), 'module')
                 except ImportError as e:
                     logger.error(
                         "Cannot load plugin `%s`\n%s", plugin, e)
@@ -375,15 +370,6 @@ def get_config(args):
         config['BIND'] = args.bind
     config['DEBUG'] = args.verbosity == logging.DEBUG
 
-    # argparse returns bytes in Py2. There is no definite answer as to which
-    # encoding argparse (or sys.argv) uses.
-    # "Best" option seems to be locale.getpreferredencoding()
-    # http://mail.python.org/pipermail/python-list/2006-October/405766.html
-    if not six.PY3:
-        enc = locale.getpreferredencoding()
-        for key in config:
-            if key in ('PATH', 'OUTPUT_PATH', 'THEME'):
-                config[key] = config[key].decode(enc)
     return config
 
 
@@ -397,7 +383,7 @@ def get_instance(args):
     settings = read_settings(config_file, override=get_config(args))
 
     cls = settings['PELICAN_CLASS']
-    if isinstance(cls, six.string_types):
+    if isinstance(cls, str):
         module, cls_name = cls.rsplit('.', 1)
         module = __import__(module)
         cls = getattr(module, cls_name)
diff --git a/pelican/__main__.py b/pelican/__main__.py
index 141823fc..69a5b95d 100644
--- a/pelican/__main__.py
+++ b/pelican/__main__.py
@@ -1,7 +1,6 @@
 """
 python -m pelican module entry point to run via python -m
 """
-from __future__ import absolute_import
 
 from . import main
 
diff --git a/pelican/cache.py b/pelican/cache.py
index e6c10cb9..0d36234a 100644
--- a/pelican/cache.py
+++ b/pelican/cache.py
@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 import hashlib
 import logging
 import os
-
-from six.moves import cPickle as pickle
+import pickle
 
 from pelican.utils import mkdir_p
 
diff --git a/pelican/contents.py b/pelican/contents.py
index a862db2d..5193061f 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,25 +1,20 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import copy
+import datetime
 import locale
 import logging
 import os
 import re
-import sys
+from urllib.parse import urljoin, urlparse, urlunparse
 
 import pytz
 
-import six
-from six.moves.urllib.parse import urljoin, urlparse, urlunparse
-
 from pelican import signals
 from pelican.settings import DEFAULT_CONFIG
-from pelican.utils import (SafeDatetime, deprecated_attribute, memoized,
-                           path_to_url, posixize_path,
-                           python_2_unicode_compatible, sanitised_join,
-                           set_date_tzinfo, slugify, strftime,
-                           truncate_html_words)
+from pelican.utils import (deprecated_attribute, memoized, path_to_url,
+                           posixize_path, sanitised_join, set_date_tzinfo,
+                           slugify, truncate_html_words)
 
 # Import these so that they're avalaible when you import from pelican.contents.
 from pelican.urlwrappers import (Author, Category, Tag, URLWrapper)  # NOQA
@@ -27,7 +22,6 @@ from pelican.urlwrappers import (Author, Category, Tag, URLWrapper)  # NOQA
 logger = logging.getLogger(__name__)
 
 
-@python_2_unicode_compatible
 class Content(object):
     """Represents a content.
 
@@ -121,9 +115,6 @@ class Content(object):
 
         if isinstance(self.date_format, tuple):
             locale_string = self.date_format[0]
-            if sys.version_info < (3, ) and isinstance(locale_string,
-                                                       six.text_type):
-                locale_string = locale_string.encode('ascii')
             locale.setlocale(locale.LC_ALL, locale_string)
             self.date_format = self.date_format[1]
 
@@ -133,11 +124,11 @@ class Content(object):
 
         if hasattr(self, 'date'):
             self.date = set_date_tzinfo(self.date, timezone)
-            self.locale_date = strftime(self.date, self.date_format)
+            self.locale_date = self.date.strftime(self.date_format)
 
         if hasattr(self, 'modified'):
             self.modified = set_date_tzinfo(self.modified, timezone)
-            self.locale_modified = strftime(self.modified, self.date_format)
+            self.locale_modified = self.modified.strftime(self.date_format)
 
         # manage status
         if not hasattr(self, 'status'):
@@ -213,7 +204,7 @@ class Content(object):
             'path': path_to_url(path),
             'slug': getattr(self, 'slug', ''),
             'lang': getattr(self, 'lang', 'en'),
-            'date': getattr(self, 'date', SafeDatetime.now()),
+            'date': getattr(self, 'date', datetime.datetime.now()),
             'author': self.author.slug if hasattr(self, 'author') else '',
             'category': self.category.slug if hasattr(self, 'category') else ''
         })
@@ -512,22 +503,21 @@ class Article(Content):
         # handle WITH_FUTURE_DATES (designate article to draft based on date)
         if not self.settings['WITH_FUTURE_DATES'] and hasattr(self, 'date'):
             if self.date.tzinfo is None:
-                now = SafeDatetime.now()
+                now = datetime.datetime.now()
             else:
-                now = SafeDatetime.utcnow().replace(tzinfo=pytz.utc)
+                now = datetime.datetime.utcnow().replace(tzinfo=pytz.utc)
             if self.date > now:
                 self.status = 'draft'
 
         # if we are a draft and there is no date provided, set max datetime
         if not hasattr(self, 'date') and self.status == 'draft':
-            self.date = SafeDatetime.max
+            self.date = datetime.datetime.max
 
     def _expand_settings(self, key):
         klass = 'draft' if self.status == 'draft' else 'article'
         return super(Article, self)._expand_settings(key, klass)
 
 
-@python_2_unicode_compatible
 class Static(Content):
     mandatory_properties = ('title',)
     default_status = 'published'
diff --git a/pelican/generators.py b/pelican/generators.py
index ef021070..27c895e4 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import calendar
 import errno
@@ -15,15 +14,12 @@ from operator import attrgetter
 from jinja2 import (BaseLoader, ChoiceLoader, Environment, FileSystemLoader,
                     PrefixLoader, TemplateNotFound)
 
-import six
-
 from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Article, Page, Static
 from pelican.readers import Readers
 from pelican.utils import (DateFormatter, copy, mkdir_p, order_content,
-                           posixize_path, process_translations,
-                           python_2_unicode_compatible)
+                           posixize_path, process_translations)
 
 
 logger = logging.getLogger(__name__)
@@ -33,7 +29,6 @@ class PelicanTemplateNotFound(Exception):
     pass
 
 
-@python_2_unicode_compatible
 class Generator(object):
     """Baseclass generator"""
 
@@ -138,7 +133,7 @@ class Generator(object):
             extensions are allowed)
         """
         # backward compatibility for older generators
-        if isinstance(paths, six.string_types):
+        if isinstance(paths, str):
             paths = [paths]
 
         # group the exclude dir names by parent path, for use with os.walk()
@@ -513,8 +508,6 @@ class ArticlesGenerator(CachingGenerator):
                     context["period"] = (_period,)
                 else:
                     month_name = calendar.month_name[_period[1]]
-                    if not six.PY3:
-                        month_name = month_name.decode('utf-8')
                     if key == period_date_key['month']:
                         context["period"] = (_period[0],
                                              month_name)
diff --git a/pelican/log.py b/pelican/log.py
index 6f353264..c971636e 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,17 +1,9 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
-import locale
 import logging
 import os
 import sys
 from collections import defaultdict
-try:
-    from collections.abc import Mapping
-except ImportError:
-    from collections import Mapping
-
-import six
 
 __all__ = [
     'init'
@@ -29,20 +21,17 @@ class BaseFormatter(logging.Formatter):
         # format multiline messages 'nicely' to make it clear they are together
         record.msg = record.msg.replace('\n', '\n  | ')
         record.args = tuple(arg.replace('\n', '\n  | ') if
-                            isinstance(arg, six.string_types) else
+                            isinstance(arg, str) else
                             arg for arg in record.args)
         return super(BaseFormatter, self).format(record)
 
     def formatException(self, ei):
         ''' prefix traceback info for better representation '''
-        # .formatException returns a bytestring in py2 and unicode in py3
-        # since .format will handle unicode conversion,
-        # str() calls are used to normalize formatting string
         s = super(BaseFormatter, self).formatException(ei)
         # fancy format traceback
-        s = str('\n').join(str('  | ') + line for line in s.splitlines())
+        s = '\n'.join('  | ' + line for line in s.splitlines())
         # separate the traceback from the preceding lines
-        s = str('  |___\n{}').format(s)
+        s = '  |___\n{}'.format(s)
         return s
 
     def _get_levelname(self, name):
@@ -140,41 +129,7 @@ class LimitFilter(logging.Filter):
         return True
 
 
-class SafeLogger(logging.Logger):
-    """
-    Base Logger which properly encodes Exceptions in Py2
-    """
-    _exc_encoding = locale.getpreferredencoding()
-
-    def _log(self, level, msg, args, exc_info=None, extra=None):
-        # if the only argument is a Mapping, Logger uses that for formatting
-        # format values for that case
-        if args and len(args) == 1 and isinstance(args[0], Mapping):
-            args = ({k: self._decode_arg(v) for k, v in args[0].items()},)
-        # otherwise, format each arg
-        else:
-            args = tuple(self._decode_arg(arg) for arg in args)
-        super(SafeLogger, self)._log(
-            level, msg, args, exc_info=exc_info, extra=extra)
-
-    def _decode_arg(self, arg):
-        '''
-        properly decode an arg for Py2 if it's Exception
-
-
-        localized systems have errors in native language if locale is set
-        so convert the message to unicode with the correct encoding
-        '''
-        if isinstance(arg, Exception):
-            text = str('%s: %s') % (arg.__class__.__name__, arg)
-            if six.PY2:
-                text = text.decode(self._exc_encoding)
-            return text
-        else:
-            return arg
-
-
-class LimitLogger(SafeLogger):
+class LimitLogger(logging.Logger):
     """
     A logger which adds LimitFilter automatically
     """
diff --git a/pelican/paginator.py b/pelican/paginator.py
index fe63863e..61899056 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import functools
 import logging
@@ -7,8 +6,6 @@ import os
 from collections import namedtuple
 from math import ceil
 
-import six
-
 logger = logging.getLogger(__name__)
 PaginationRule = namedtuple(
     'PaginationRule',
@@ -131,7 +128,7 @@ class Page(object):
 
         prop_value = getattr(rule, key)
 
-        if not isinstance(prop_value, six.string_types):
+        if not isinstance(prop_value, str):
             logger.warning('%s is set to %s', key, prop_value)
             return prop_value
 
diff --git a/pelican/readers.py b/pelican/readers.py
index 52378c4f..bb4d6d81 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
+import datetime
 import logging
 import os
 import re
 from collections import OrderedDict
+from html.parser import HTMLParser
+from io import StringIO
 
 import docutils
 import docutils.core
@@ -12,16 +14,11 @@ import docutils.io
 from docutils.parsers.rst.languages import get_language as get_docutils_lang
 from docutils.writers.html4css1 import HTMLTranslator, Writer
 
-import six
-from six import StringIO
-from six.moves.html_parser import HTMLParser
-
 from pelican import rstdirectives  # NOQA
 from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Author, Category, Page, Tag
-from pelican.utils import SafeDatetime, escape_html, get_date, pelican_open, \
-    posixize_path
+from pelican.utils import escape_html, get_date, pelican_open, posixize_path
 
 try:
     from markdown import Markdown
@@ -79,7 +76,7 @@ def ensure_metadata_list(text):
        Regardless, all list items undergo .strip() before returning, and
        empty items are discarded.
     """
-    if isinstance(text, six.text_type):
+    if isinstance(text, str):
         if ';' in text:
             text = text.split(';')
         else:
@@ -212,8 +209,7 @@ class RstReader(BaseReader):
         """
 
         def __init__(self, *args, **kwargs):
-            if six.PY3:
-                kwargs['mode'] = kwargs.get('mode', 'r').replace('U', '')
+            kwargs['mode'] = kwargs.get('mode', 'r').replace('U', '')
             docutils.io.FileInput.__init__(self, *args, **kwargs)
 
     def __init__(self, *args, **kwargs):
@@ -685,10 +681,10 @@ def default_metadata(settings=None, process=None):
             metadata['category'] = value
         if settings.get('DEFAULT_DATE', None) and \
            settings['DEFAULT_DATE'] != 'fs':
-            if isinstance(settings['DEFAULT_DATE'], six.string_types):
+            if isinstance(settings['DEFAULT_DATE'], str):
                 metadata['date'] = get_date(settings['DEFAULT_DATE'])
             else:
-                metadata['date'] = SafeDatetime(*settings['DEFAULT_DATE'])
+                metadata['date'] = datetime.datetime(*settings['DEFAULT_DATE'])
     return metadata
 
 
@@ -696,7 +692,7 @@ def path_metadata(full_path, source_path, settings=None):
     metadata = {}
     if settings:
         if settings.get('DEFAULT_DATE', None) == 'fs':
-            metadata['date'] = SafeDatetime.fromtimestamp(
+            metadata['date'] = datetime.datetime.fromtimestamp(
                 os.stat(full_path).st_mtime)
 
         # Apply EXTRA_PATH_METADATA for the source path and the paths of any
@@ -731,7 +727,7 @@ def parse_path_metadata(source_path, settings=None, process=None):
     ...     process=reader.process_metadata)
     >>> pprint.pprint(metadata)  # doctest: +ELLIPSIS
     {'category': <pelican.urlwrappers.Category object at ...>,
-     'date': SafeDatetime(2013, 1, 1, 0, 0),
+     'date': datetime.datetime(2013, 1, 1, 0, 0),
      'slug': 'my-slug'}
     """
     metadata = {}
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index b4f44aa1..dda0e6a7 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import re
 
@@ -10,8 +9,6 @@ from pygments import highlight
 from pygments.formatters import HtmlFormatter
 from pygments.lexers import TextLexer, get_lexer_by_name
 
-import six
-
 import pelican.settings as pys
 
 
@@ -49,7 +46,7 @@ class Pygments(Directive):
 
         # Fetch the defaults
         if pys.PYGMENTS_RST_OPTIONS is not None:
-            for k, v in six.iteritems(pys.PYGMENTS_RST_OPTIONS):
+            for k, v in pys.PYGMENTS_RST_OPTIONS.items():
                 # Locally set options overrides the defaults
                 if k not in self.options:
                     self.options[k] = v
diff --git a/pelican/server.py b/pelican/server.py
index 841b8e88..8434ded5 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import argparse
 import logging
@@ -7,16 +6,14 @@ import os
 import posixpath
 import ssl
 import sys
+import urllib
+from http import server
 
 try:
     from magic import from_file as magic_from_file
 except ImportError:
     magic_from_file = None
 
-from six.moves import BaseHTTPServer
-from six.moves import SimpleHTTPServer as srvmod
-from six.moves import urllib
-
 from pelican.log import init as init_logging
 logger = logging.getLogger(__name__)
 
@@ -44,7 +41,7 @@ def parse_arguments():
     return parser.parse_args()
 
 
-class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
+class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
     SUFFIXES = ['.html', '/index.html', '/', '']
 
     def translate_path(self, path):
@@ -76,7 +73,7 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
         if not self.path:
             return
 
-        srvmod.SimpleHTTPRequestHandler.do_GET(self)
+        server.SimpleHTTPRequestHandler.do_GET(self)
 
     def get_path_that_exists(self, original_path):
         # Try to strip trailing slash
@@ -96,7 +93,7 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
     def guess_type(self, path):
         """Guess at the mime type for the specified file.
         """
-        mimetype = srvmod.SimpleHTTPRequestHandler.guess_type(self, path)
+        mimetype = server.SimpleHTTPRequestHandler.guess_type(self, path)
 
         # If the default guess is too generic, try the python-magic library
         if mimetype == 'application/octet-stream' and magic_from_file:
@@ -105,9 +102,9 @@ class ComplexHTTPRequestHandler(srvmod.SimpleHTTPRequestHandler):
         return mimetype
 
 
-class RootedHTTPServer(BaseHTTPServer.HTTPServer):
+class RootedHTTPServer(server.HTTPServer):
     def __init__(self, base_path, *args, **kwargs):
-        BaseHTTPServer.HTTPServer.__init__(self, *args, **kwargs)
+        server.HTTPServer.__init__(self, *args, **kwargs)
         self.RequestHandlerClass.base_path = base_path
 
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 58e6c63c..11bad8c4 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import copy
 import inspect
@@ -10,8 +9,6 @@ import re
 from os.path import isabs
 from posixpath import join as posix_join
 
-import six
-
 from pelican.log import LimitFilter
 
 
@@ -278,7 +275,7 @@ def handle_deprecated_settings(settings):
         del settings['PLUGIN_PATH']
 
     # PLUGIN_PATHS: str -> [str]
-    if isinstance(settings.get('PLUGIN_PATHS'), six.string_types):
+    if isinstance(settings.get('PLUGIN_PATHS'), str):
         logger.warning("Defining PLUGIN_PATHS setting as string "
                        "has been deprecated (should be a list)")
         settings['PLUGIN_PATHS'] = [settings['PLUGIN_PATHS']]
@@ -547,13 +544,13 @@ def configure_settings(settings):
 
     # standardize strings to lists
     for key in ['LOCALE']:
-        if key in settings and isinstance(settings[key], six.string_types):
+        if key in settings and isinstance(settings[key], str):
             settings[key] = [settings[key]]
 
     # check settings that must be a particular type
     for key, types in [
-            ('OUTPUT_SOURCES_EXTENSION', six.string_types),
-            ('FILENAME_METADATA', six.string_types),
+            ('OUTPUT_SOURCES_EXTENSION', str),
+            ('FILENAME_METADATA', str),
     ]:
         if key in settings and not isinstance(settings[key], types):
             value = settings.pop(key)
@@ -647,7 +644,7 @@ def configure_settings(settings):
         'PAGE_PATHS',
     )
     for PATH_KEY in filter(lambda k: k in settings, path_keys):
-        if isinstance(settings[PATH_KEY], six.string_types):
+        if isinstance(settings[PATH_KEY], str):
             logger.warning("Detected misconfiguration with %s setting "
                            "(must be a list), falling back to the default",
                            PATH_KEY)
diff --git a/pelican/signals.py b/pelican/signals.py
index 18a745b4..253b5fc3 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 from blinker import signal
 
diff --git a/pelican/tests/default_conf.py b/pelican/tests/default_conf.py
index a567dc10..13014572 100644
--- a/pelican/tests/default_conf.py
+++ b/pelican/tests/default_conf.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 AUTHOR = 'Alexis Métaireau'
 SITENAME = "Alexis' log"
 SITEURL = 'http://blog.notmyidea.org'
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 751fb5ec..86bf984f 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import locale
 import logging
@@ -10,12 +9,11 @@ import sys
 import unittest
 from contextlib import contextmanager
 from functools import wraps
+from io import StringIO
 from logging.handlers import BufferingHandler
 from shutil import rmtree
 from tempfile import mkdtemp
 
-from six import StringIO
-
 from pelican.contents import Article
 from pelican.readers import default_metadata
 from pelican.settings import DEFAULT_CONFIG
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index ceba649e..7357cd9f 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 import os
 from shutil import rmtree
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index efc438c8..e9592bd4 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 
+import datetime
 import locale
 import logging
 import os.path
@@ -9,15 +9,12 @@ from sys import platform
 
 from jinja2.utils import generate_lorem_ipsum
 
-import six
-
 from pelican.contents import Article, Author, Category, Page, Static
 from pelican.settings import DEFAULT_CONFIG
 from pelican.signals import content_object_init
 from pelican.tests.support import (LoggedTestCase, get_context, get_settings,
                                    unittest)
-from pelican.utils import (SafeDatetime, path_to_url, posixize_path,
-                           truncate_html_words)
+from pelican.utils import (path_to_url, posixize_path, truncate_html_words)
 
 
 # generate one paragraph, enclosed with <p>
@@ -185,7 +182,7 @@ class TestPage(LoggedTestCase):
 
     def test_datetime(self):
         # If DATETIME is set to a tuple, it should be used to override LOCALE
-        dt = SafeDatetime(2015, 9, 13)
+        dt = datetime.datetime(2015, 9, 13)
 
         page_kwargs = self._copy_page_kwargs()
 
@@ -286,9 +283,7 @@ class TestPage(LoggedTestCase):
              '<a href="http://notmyidea.org/category/category.html">link</a>'))
 
     def test_intrasite_link(self):
-        # type does not take unicode in PY2 and bytes in PY3, which in
-        # combination with unicode literals leads to following insane line:
-        cls_name = '_DummyArticle' if six.PY3 else b'_DummyArticle'
+        cls_name = '_DummyArticle'
         article = type(cls_name, (object,), {'url': 'article.html'})
 
         args = self.page_kwargs.copy()
@@ -370,9 +365,7 @@ class TestPage(LoggedTestCase):
         self.assertEqual(p.custom, linked)
 
     def test_intrasite_link_more(self):
-        # type does not take unicode in PY2 and bytes in PY3, which in
-        # combination with unicode literals leads to following insane line:
-        cls_name = '_DummyAsset' if six.PY3 else b'_DummyAsset'
+        cls_name = '_DummyAsset'
 
         args = self.page_kwargs.copy()
         args['settings'] = get_settings()
@@ -487,9 +480,7 @@ class TestPage(LoggedTestCase):
         )
 
     def test_intrasite_link_markdown_spaces(self):
-        # Markdown introduces %20 instead of spaces, this tests that
-        # we support markdown doing this.
-        cls_name = '_DummyArticle' if six.PY3 else b'_DummyArticle'
+        cls_name = '_DummyArticle'
         article = type(cls_name, (object,), {'url': 'article-spaces.html'})
 
         args = self.page_kwargs.copy()
@@ -512,7 +503,7 @@ class TestPage(LoggedTestCase):
     def test_intrasite_link_source_and_generated(self):
         """Test linking both to the source and the generated article
         """
-        cls_name = '_DummyAsset' if six.PY3 else b'_DummyAsset'
+        cls_name = '_DummyAsset'
 
         args = self.page_kwargs.copy()
         args['settings'] = get_settings()
@@ -538,7 +529,7 @@ class TestPage(LoggedTestCase):
     def test_intrasite_link_to_static_content_with_filename(self):
         """Test linking to a static resource with deprecated {filename}
         """
-        cls_name = '_DummyAsset' if six.PY3 else b'_DummyAsset'
+        cls_name = '_DummyAsset'
 
         args = self.page_kwargs.copy()
         args['settings'] = get_settings()
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 9ade301e..5b03b1d1 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 import locale
 import os
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 6eb62852..942b95fe 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import locale
 import os
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 4e3ef035..8080c146 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
 
 import locale
 
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 502a45ac..0d495ac7 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 try:
     import collections.abc as collections
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 3f05bb4a..5b87aeac 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -1,10 +1,7 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import os
 
-import six
-
 from pelican import readers
 from pelican.tests.support import get_settings, unittest
 from pelican.utils import SafeDatetime
@@ -64,8 +61,7 @@ class TestAssertDictHasSubset(ReaderTest):
         self.assertDictHasSubset(self.dictionary, self.dictionary)
 
     def test_fail_not_set(self):
-        six.assertRaisesRegex(
-            self,
+        self.assertRaisesRegex(
             AssertionError,
             r'Expected.*key-c.*to have value.*val-c.*but was not in Dict',
             self.assertDictHasSubset,
@@ -73,8 +69,7 @@ class TestAssertDictHasSubset(ReaderTest):
             {'key-c': 'val-c'})
 
     def test_fail_wrong_val(self):
-        six.assertRaisesRegex(
-            self,
+        self.assertRaisesRegex(
             AssertionError,
             r'Expected .*key-a.* to have value .*val-b.* but was .*val-a.*',
             self.assertDictHasSubset,
@@ -445,7 +440,7 @@ class RstReaderTest(ReaderTest):
     def test_parse_error(self):
         # Verify that it raises an Exception, not nothing and not SystemExit or
         # some such
-        with six.assertRaisesRegex(self, Exception, "underline too short"):
+        with self.assertRaisesRegex(Exception, "underline too short"):
             self.read_file(path='../parse_error/parse_error.rst')
 
 
diff --git a/pelican/tests/test_rstdirectives.py b/pelican/tests/test_rstdirectives.py
index f6a7221f..0ff28a4a 100644
--- a/pelican/tests/test_rstdirectives.py
+++ b/pelican/tests/test_rstdirectives.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 from pelican.tests.support import unittest
 
diff --git a/pelican/tests/test_server.py b/pelican/tests/test_server.py
index 8704c6b5..824e01ef 100644
--- a/pelican/tests/test_server.py
+++ b/pelican/tests/test_server.py
@@ -1,9 +1,8 @@
 import os
+from io import BytesIO
 from shutil import rmtree
 from tempfile import mkdtemp
 
-from six import BytesIO
-
 from pelican.server import ComplexHTTPRequestHandler
 from pelican.tests.support import unittest
 
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 21759d40..d995527c 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import copy
 import locale
diff --git a/pelican/tests/test_testsuite.py b/pelican/tests/test_testsuite.py
index 66c992bd..4f567516 100644
--- a/pelican/tests/test_testsuite.py
+++ b/pelican/tests/test_testsuite.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import warnings
 
diff --git a/pelican/tests/test_urlwrappers.py b/pelican/tests/test_urlwrappers.py
index 8ff3d9d6..37af232e 100644
--- a/pelican/tests/test_urlwrappers.py
+++ b/pelican/tests/test_urlwrappers.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 from pelican.tests.support import unittest
 from pelican.urlwrappers import Author, Category, Tag, URLWrapper
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 444190d3..ad90a78e 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
 
 import locale
 import logging
@@ -11,8 +10,6 @@ from tempfile import mkdtemp
 
 import pytz
 
-import six
-
 from pelican import utils
 from pelican.generators import TemplatePagesGenerator
 from pelican.settings import read_settings
@@ -720,8 +717,7 @@ class TestSanitisedJoin(unittest.TestCase):
     @unittest.skipIf(platform == 'win32',
                      "Different filesystem root on Windows")
     def test_detect_parent_breakout(self):
-        with six.assertRaisesRegex(
-                self,
+        with self.assertRaisesRegex(
                 RuntimeError,
                 "Attempted to break out of output directory to /foo/test"):
             utils.sanitised_join(
@@ -732,8 +728,7 @@ class TestSanitisedJoin(unittest.TestCase):
     @unittest.skipIf(platform == 'win32',
                      "Different filesystem root on Windows")
     def test_detect_root_breakout(self):
-        with six.assertRaisesRegex(
-                self,
+        with self.assertRaisesRegex(
                 RuntimeError,
                 "Attempted to break out of output directory to /test"):
             utils.sanitised_join(
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index d6566e32..9b2edf4c 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import argparse
 import logging
@@ -11,10 +10,9 @@ import sys
 import time
 from codecs import open
 from collections import defaultdict
-
-from six.moves.urllib.error import URLError
-from six.moves.urllib.parse import quote, urlparse, urlsplit, urlunsplit
-from six.moves.urllib.request import urlretrieve
+from urllib.error import URLError
+from urllib.parse import quote, urlparse, urlsplit, urlunsplit
+from urllib.request import urlretrieve
 
 # because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import init
@@ -24,7 +22,7 @@ from pelican.utils import SafeDatetime, slugify
 try:
     from html import unescape  # py3.5+
 except ImportError:
-    from six.moves.html_parser import HTMLParser
+    from html.parser import HTMLParser
     unescape = HTMLParser().unescape
 
 logger = logging.getLogger(__name__)
@@ -396,19 +394,8 @@ def posterous2fields(api_token, email, password):
     """Imports posterous posts"""
     import base64
     from datetime import timedelta
-    try:
-        # py3k import
-        import json
-    except ImportError:
-        # py2 import
-        import simplejson as json
-
-    try:
-        # py3k import
-        import urllib.request as urllib_request
-    except ImportError:
-        # py2 import
-        import urllib2 as urllib_request
+    import json
+    import urllib.request as urllib_request
 
     def get_posterous_posts(api_token, email, password, page=1):
         base64string = base64.encodestring(
@@ -451,19 +438,8 @@ def posterous2fields(api_token, email, password):
 
 def tumblr2fields(api_key, blogname):
     """ Imports Tumblr posts (API v2)"""
-    try:
-        # py3k import
-        import json
-    except ImportError:
-        # py2 import
-        import simplejson as json
-
-    try:
-        # py3k import
-        import urllib.request as urllib_request
-    except ImportError:
-        # py2 import
-        import urllib2 as urllib_request
+    import json
+    import urllib.request as urllib_request
 
     def get_tumblr_posts(api_key, blogname, offset=0):
         url = ("http://api.tumblr.com/v2/blog/%s.tumblr.com/"
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 463db900..5ff3dc33 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -1,12 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import argparse
 import codecs
 import locale
 import os
-import sys
 
 from jinja2 import Environment, FileSystemLoader
 
@@ -23,8 +21,6 @@ try:
 except ImportError:
     _DEFAULT_TIMEZONE = 'Europe/Paris'
 
-import six
-
 from pelican import __version__
 
 locale.setlocale(locale.LC_ALL, '')
@@ -77,41 +73,24 @@ CONF = {
 # url for list of valid timezones
 _TZ_URL = 'http://en.wikipedia.org/wiki/List_of_tz_database_time_zones'
 
-_input_compat = six.moves.input
-str_compat = six.text_type
-
 
 # Create a 'marked' default path, to determine if someone has supplied
 # a path on the command-line.
-class _DEFAULT_PATH_TYPE(str_compat):
+class _DEFAULT_PATH_TYPE(str):
     is_default_path = True
 
 
 _DEFAULT_PATH = _DEFAULT_PATH_TYPE(os.curdir)
 
 
-def decoding_strings(f):
-    def wrapper(*args, **kwargs):
-        out = f(*args, **kwargs)
-        if isinstance(out, six.string_types) and not six.PY3:
-            # todo: make encoding configurable?
-            if six.PY3:
-                return out
-            else:
-                return out.decode(sys.stdin.encoding)
-        return out
-    return wrapper
-
-
-@decoding_strings
-def ask(question, answer=str_compat, default=None, length=None):
-    if answer == str_compat:
+def ask(question, answer=str, default=None, length=None):
+    if answer == str:
         r = ''
         while True:
             if default:
-                r = _input_compat('> {0} [{1}] '.format(question, default))
+                r = input('> {0} [{1}] '.format(question, default))
             else:
-                r = _input_compat('> {0} '.format(question, default))
+                r = input('> {0} '.format(question, default))
 
             r = r.strip()
 
@@ -133,11 +112,11 @@ def ask(question, answer=str_compat, default=None, length=None):
         r = None
         while True:
             if default is True:
-                r = _input_compat('> {0} (Y/n) '.format(question))
+                r = input('> {0} (Y/n) '.format(question))
             elif default is False:
-                r = _input_compat('> {0} (y/N) '.format(question))
+                r = input('> {0} (y/N) '.format(question))
             else:
-                r = _input_compat('> {0} (y/n) '.format(question))
+                r = input('> {0} (y/n) '.format(question))
 
             r = r.strip().lower()
 
@@ -157,9 +136,9 @@ def ask(question, answer=str_compat, default=None, length=None):
         r = None
         while True:
             if default:
-                r = _input_compat('> {0} [{1}] '.format(question, default))
+                r = input('> {0} [{1}] '.format(question, default))
             else:
-                r = _input_compat('> {0} '.format(question))
+                r = input('> {0} '.format(question))
 
             r = r.strip()
 
@@ -175,14 +154,14 @@ def ask(question, answer=str_compat, default=None, length=None):
         return r
     else:
         raise NotImplementedError(
-            'Argument `answer` must be str_compat, bool, or integer')
+            'Argument `answer` must be str, bool, or integer')
 
 
 def ask_timezone(question, default, tzurl):
     """Prompt for time zone and validate input"""
     lower_tz = [tz.lower() for tz in pytz.all_timezones]
     while True:
-        r = ask(question, str_compat, default)
+        r = ask(question, str, default)
         r = r.strip().replace(' ', '_').lower()
         if r in lower_tz:
             r = pytz.all_timezones[lower_tz.index(r)]
@@ -227,20 +206,20 @@ needed by Pelican.
     else:
         CONF['basedir'] = os.path.abspath(os.path.expanduser(
             ask('Where do you want to create your new web site?',
-                answer=str_compat, default=args.path)))
+                answer=str, default=args.path)))
 
     CONF['sitename'] = ask('What will be the title of this web site?',
-                           answer=str_compat, default=args.title)
+                           answer=str, default=args.title)
     CONF['author'] = ask('Who will be the author of this web site?',
-                         answer=str_compat, default=args.author)
+                         answer=str, default=args.author)
     CONF['lang'] = ask('What will be the default language of this web site?',
-                       str_compat, args.lang or CONF['lang'], 2)
+                       str, args.lang or CONF['lang'], 2)
 
     if ask('Do you want to specify a URL prefix? e.g., https://example.com  ',
            answer=bool, default=True):
         CONF['siteurl'] = ask('What is your URL prefix? (see '
                               'above example; no trailing slash)',
-                              str_compat, CONF['siteurl'])
+                              str, CONF['siteurl'])
 
     CONF['with_pagination'] = ask('Do you want to enable article pagination?',
                                   bool, bool(CONF['default_pagination']))
@@ -263,49 +242,49 @@ needed by Pelican.
                answer=bool, default=False):
             CONF['ftp'] = True,
             CONF['ftp_host'] = ask('What is the hostname of your FTP server?',
-                                   str_compat, CONF['ftp_host'])
+                                   str, CONF['ftp_host'])
             CONF['ftp_user'] = ask('What is your username on that server?',
-                                   str_compat, CONF['ftp_user'])
+                                   str, CONF['ftp_user'])
             CONF['ftp_target_dir'] = ask('Where do you want to put your '
                                          'web site on that server?',
-                                         str_compat, CONF['ftp_target_dir'])
+                                         str, CONF['ftp_target_dir'])
         if ask('Do you want to upload your website using SSH?',
                answer=bool, default=False):
             CONF['ssh'] = True,
             CONF['ssh_host'] = ask('What is the hostname of your SSH server?',
-                                   str_compat, CONF['ssh_host'])
+                                   str, CONF['ssh_host'])
             CONF['ssh_port'] = ask('What is the port of your SSH server?',
                                    int, CONF['ssh_port'])
             CONF['ssh_user'] = ask('What is your username on that server?',
-                                   str_compat, CONF['ssh_user'])
+                                   str, CONF['ssh_user'])
             CONF['ssh_target_dir'] = ask('Where do you want to put your '
                                          'web site on that server?',
-                                         str_compat, CONF['ssh_target_dir'])
+                                         str, CONF['ssh_target_dir'])
 
         if ask('Do you want to upload your website using Dropbox?',
                answer=bool, default=False):
             CONF['dropbox'] = True,
             CONF['dropbox_dir'] = ask('Where is your Dropbox directory?',
-                                      str_compat, CONF['dropbox_dir'])
+                                      str, CONF['dropbox_dir'])
 
         if ask('Do you want to upload your website using S3?',
                answer=bool, default=False):
             CONF['s3'] = True,
             CONF['s3_bucket'] = ask('What is the name of your S3 bucket?',
-                                    str_compat, CONF['s3_bucket'])
+                                    str, CONF['s3_bucket'])
 
         if ask('Do you want to upload your website using '
                'Rackspace Cloud Files?', answer=bool, default=False):
             CONF['cloudfiles'] = True,
             CONF['cloudfiles_username'] = ask('What is your Rackspace '
-                                              'Cloud username?', str_compat,
+                                              'Cloud username?', str,
                                               CONF['cloudfiles_username'])
             CONF['cloudfiles_api_key'] = ask('What is your Rackspace '
-                                             'Cloud API key?', str_compat,
+                                             'Cloud API key?', str,
                                              CONF['cloudfiles_api_key'])
             CONF['cloudfiles_container'] = ask('What is the name of your '
                                                'Cloud Files container?',
-                                               str_compat,
+                                               str,
                                                CONF['cloudfiles_container'])
 
         if ask('Do you want to upload your website using GitHub Pages?',
@@ -363,9 +342,7 @@ needed by Pelican.
         try:
             with codecs.open(os.path.join(CONF['basedir'], 'Makefile'),
                              'w', 'utf-8') as fd:
-                py_v = 'python'
-                if six.PY3:
-                    py_v = 'python3'
+                py_v = 'python3'
                 _template = _jinja_env.get_template('Makefile.jinja2')
                 fd.write(_template.render(py_v=py_v, **CONF))
                 fd.close()
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 9f9b2328..03acd9ce 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import argparse
 import os
diff --git a/pelican/tools/templates/pelicanconf.py.jinja2 b/pelican/tools/templates/pelicanconf.py.jinja2
index 79f26a01..62939b6a 100644
--- a/pelican/tools/templates/pelicanconf.py.jinja2
+++ b/pelican/tools/templates/pelicanconf.py.jinja2
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*- #
-from __future__ import unicode_literals
 
 AUTHOR = {{author}}
 SITENAME = {{sitename}}
diff --git a/pelican/tools/templates/publishconf.py.jinja2 b/pelican/tools/templates/publishconf.py.jinja2
index 913de7f1..bb18966b 100755
--- a/pelican/tools/templates/publishconf.py.jinja2
+++ b/pelican/tools/templates/publishconf.py.jinja2
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*- #
-from __future__ import unicode_literals
 
 # This file is only used if you use `make publish` or
 # explicitly specify it as your config file.
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index baa8eb23..edfb11b4 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -1,18 +1,14 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 import functools
 import logging
 import os
 
-import six
-
-from pelican.utils import python_2_unicode_compatible, slugify
+from pelican.utils import slugify
 
 logger = logging.getLogger(__name__)
 
 
-@python_2_unicode_compatible
 @functools.total_ordering
 class URLWrapper(object):
     def __init__(self, name, settings):
@@ -66,26 +62,26 @@ class URLWrapper(object):
 
     def _normalize_key(self, key):
         subs = self.settings.get('SLUG_REGEX_SUBSTITUTIONS', [])
-        return six.text_type(slugify(key, regex_subs=subs))
+        return str(slugify(key, regex_subs=subs))
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):
             return self.slug == other.slug
-        if isinstance(other, six.text_type):
+        if isinstance(other, str):
             return self.slug == self._normalize_key(other)
         return False
 
     def __ne__(self, other):
         if isinstance(other, self.__class__):
             return self.slug != other.slug
-        if isinstance(other, six.text_type):
+        if isinstance(other, str):
             return self.slug != self._normalize_key(other)
         return True
 
     def __lt__(self, other):
         if isinstance(other, self.__class__):
             return self.slug < other.slug
-        if isinstance(other, six.text_type):
+        if isinstance(other, str):
             return self.slug < self._normalize_key(other)
         return False
 
@@ -105,7 +101,7 @@ class URLWrapper(object):
         """
         setting = "%s_%s" % (self.__class__.__name__.upper(), key)
         value = self.settings[setting]
-        if not isinstance(value, six.string_types):
+        if not isinstance(value, str):
             logger.warning('%s is set to %s', setting, value)
             return value
         else:
diff --git a/pelican/utils.py b/pelican/utils.py
index 9629c7e0..d031503d 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
 
 import codecs
 import datetime
@@ -12,12 +11,15 @@ import re
 import shutil
 import sys
 import traceback
+import urllib
 try:
     from collections.abc import Hashable
 except ImportError:
     from collections import Hashable
 from contextlib import contextmanager
 from functools import partial
+from html import entities
+from html.parser import HTMLParser
 from itertools import groupby
 from operator import attrgetter
 
@@ -27,10 +29,6 @@ from jinja2 import Markup
 
 import pytz
 
-import six
-from six.moves import html_entities
-from six.moves.html_parser import HTMLParser
-
 try:
     from html import escape
 except ImportError:
@@ -98,10 +96,6 @@ def strftime(date, date_format):
             else:
                 formatted = date.strftime(candidate)
 
-            # convert Py2 result to unicode
-            if not six.PY3 and enc is not None:
-                formatted = formatted.decode(enc)
-
             # strip zeros if '-' prefix is used
             if conversion:
                 formatted = conversion(formatted)
@@ -150,22 +144,6 @@ class DateFormatter(object):
         return formatted
 
 
-def python_2_unicode_compatible(klass):
-    """
-    A decorator that defines __unicode__ and __str__ methods under Python 2.
-    Under Python 3 it does nothing.
-
-    To support Python 2 and 3 with a single code base, define a __str__ method
-    returning text and apply this decorator to the class.
-
-    From django.utils.encoding.
-    """
-    if not six.PY3:
-        klass.__unicode__ = klass.__str__
-        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
-    return klass
-
-
 class memoized(object):
     """Function decorator to cache return values.
 
@@ -214,15 +192,15 @@ def deprecated_attribute(old, new, since=None, remove=None, doc=None):
     content of the dummy method is ignored.
     """
     def _warn():
-        version = '.'.join(six.text_type(x) for x in since)
+        version = '.'.join(str(x) for x in since)
         message = ['{} has been deprecated since {}'.format(old, version)]
         if remove:
-            version = '.'.join(six.text_type(x) for x in remove)
+            version = '.'.join(str(x) for x in remove)
             message.append(
                 ' and will be removed by version {}'.format(version))
         message.append('.  Use {} instead.'.format(new))
         logger.warning(''.join(message))
-        logger.debug(''.join(six.text_type(x) for x
+        logger.debug(''.join(str(x) for x
                              in traceback.format_stack()))
 
     def fget(self):
@@ -279,10 +257,8 @@ def slugify(value, regex_subs=()):
     # value must be unicode per se
     import unicodedata
     from unidecode import unidecode
-    # unidecode returns str in Py2 and 3, so in Py2 we have to make
-    # it unicode again
     value = unidecode(value)
-    if isinstance(value, six.binary_type):
+    if isinstance(value, bytes):
         value = value.decode('ascii')
     # still unicode
     value = unicodedata.normalize('NFKD', value)
@@ -584,8 +560,8 @@ class _HTMLWordTruncator(HTMLParser):
         `name` is the entity ref without ampersand and semicolon (e.g. `mdash`)
         """
         try:
-            codepoint = html_entities.name2codepoint[name]
-            char = six.unichr(codepoint)
+            codepoint = entities.name2codepoint[name]
+            char = chr(codepoint)
         except KeyError:
             char = ''
         self._handle_ref(name, char)
@@ -602,7 +578,7 @@ class _HTMLWordTruncator(HTMLParser):
                 codepoint = int(name[1:], 16)
             else:
                 codepoint = int(name)
-            char = six.unichr(codepoint)
+            char = chr(codepoint)
         except (ValueError, OverflowError):
             char = ''
         self._handle_ref('#' + name, char)
@@ -663,7 +639,7 @@ def process_translations(content_list, translation_id=None):
     if not translation_id:
         return content_list, []
 
-    if isinstance(translation_id, six.string_types):
+    if isinstance(translation_id, str):
         translation_id = {translation_id}
 
     index = []
@@ -753,7 +729,7 @@ def order_content(content_list, order_by='slug'):
                 content_list.sort(key=order_by)
             except Exception:
                 logger.error('Error sorting with function %s', order_by)
-        elif isinstance(order_by, six.string_types):
+        elif isinstance(order_by, str):
             if order_by.startswith('reversed-'):
                 order_reversed = True
                 order_by = order_by.replace('reversed-', '', 1)
@@ -901,8 +877,7 @@ def is_selected_for_writing(settings, path):
 
 def path_to_file_url(path):
     '''Convert file-system path to file:// URL'''
-    return six.moves.urllib_parse.urljoin(
-        "file://", six.moves.urllib.request.pathname2url(path))
+    return urllib.parse.urljoin("file://", urllib.request.pathname2url(path))
 
 
 def maybe_pluralize(count, singular, plural):
diff --git a/pelican/writers.py b/pelican/writers.py
index b610e2e2..daeb9dec 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -1,24 +1,18 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals, with_statement
 
 import logging
 import os
+from urllib.parse import urljoin
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed, get_tag_uri
 
 from jinja2 import Markup
 
-import six
-from six.moves.urllib.parse import urljoin
-
 from pelican import signals
 from pelican.paginator import Paginator
 from pelican.utils import (get_relative_path, is_selected_for_writing,
                            path_to_url, sanitised_join, set_date_tzinfo)
 
-if not six.PY3:
-    from codecs import open
-
 logger = logging.getLogger(__name__)
 
 
@@ -165,8 +159,7 @@ class Writer(object):
             except Exception:
                 pass
 
-            encoding = 'utf-8' if six.PY3 else None
-            with self._open_w(complete_path, encoding, override_output) as fp:
+            with self._open_w(complete_path, 'utf-8', override_output) as fp:
                 feed.write(fp, 'utf-8')
                 logger.info('Writing %s', complete_path)
 
diff --git a/poetry.lock b/poetry.lock
index 971f6520..50ba33bc 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -17,15 +17,6 @@ version = "2.7.0"
 [package.dependencies]
 pytz = ">=2015.7"
 
-[[package]]
-category = "dev"
-description = "backports.functools_lru_cache"
-marker = "python_version < \"3\""
-name = "backports.functools-lru-cache"
-optional = false
-python-versions = ">=2.6"
-version = "1.5"
-
 [[package]]
 category = "dev"
 description = "Screen-scraping library"
@@ -54,24 +45,6 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 version = "0.4.1"
 
-[[package]]
-category = "dev"
-description = "Updated configparser from Python 3.7 for Python 2.6+."
-marker = "python_version < \"3.2\""
-name = "configparser"
-optional = false
-python-versions = ">=2.6"
-version = "3.7.4"
-
-[[package]]
-category = "dev"
-description = "Backports and enhancements for the contextlib module"
-marker = "python_version < \"3\""
-name = "contextlib2"
-optional = false
-python-versions = "*"
-version = "0.5.5"
-
 [[package]]
 category = "main"
 description = "Docutils -- Python Documentation Utilities"
@@ -88,20 +61,6 @@ optional = false
 python-versions = ">=2.7"
 version = "0.3"
 
-[package.dependencies]
-[package.dependencies.configparser]
-python = ">=2.7,<2.8"
-version = ">=3.5"
-
-[[package]]
-category = "dev"
-description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"
-marker = "python_version < \"3.4\""
-name = "enum34"
-optional = false
-python-versions = "*"
-version = "1.1.6"
-
 [[package]]
 category = "main"
 description = "Standalone version of django.utils.feedgenerator"
@@ -136,22 +95,6 @@ mccabe = ">=0.6.0,<0.7.0"
 pycodestyle = ">=2.5.0,<2.6.0"
 pyflakes = ">=2.1.0,<2.2.0"
 
-[package.dependencies.configparser]
-python = "<3.2"
-version = "*"
-
-[package.dependencies.enum34]
-python = "<3.4"
-version = "*"
-
-[package.dependencies.functools32]
-python = "<3.2"
-version = "*"
-
-[package.dependencies.typing]
-python = "<3.5"
-version = "*"
-
 [[package]]
 category = "dev"
 description = "Flake8 and pylama plugin that checks the ordering of import statements."
@@ -164,28 +107,6 @@ version = "0.18.1"
 pycodestyle = "*"
 setuptools = "*"
 
-[package.dependencies.enum34]
-python = "<2.8"
-version = "*"
-
-[[package]]
-category = "dev"
-description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"
-marker = "python_version < \"3.3\""
-name = "funcsigs"
-optional = false
-python-versions = "*"
-version = "1.0.2"
-
-[[package]]
-category = "dev"
-description = "Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy."
-marker = "python_version < \"3.2\""
-name = "functools32"
-optional = false
-python-versions = "*"
-version = "3.2.3-2"
-
 [[package]]
 category = "dev"
 description = "Getting image size from png/jpeg/jpeg2000/gif file"
@@ -205,14 +126,6 @@ version = "0.18"
 [package.dependencies]
 zipp = ">=0.5"
 
-[package.dependencies.configparser]
-python = "<3"
-version = ">=3.5"
-
-[package.dependencies.contextlib2]
-python = "<3"
-version = "*"
-
 [[package]]
 category = "main"
 description = "A small but fast and easy to use stand-alone template engine written in pure python."
@@ -270,10 +183,6 @@ version = "3.0.5"
 [package.dependencies]
 six = "*"
 
-[package.dependencies.funcsigs]
-python = "<3.3"
-version = ">=1"
-
 [[package]]
 category = "dev"
 description = "Core utilities for Python packages"
@@ -362,7 +271,7 @@ description = "Python 2 and 3 compatibility utilities"
 name = "six"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*"
-version = "1.12.0"
+version = "1.13.0"
 
 [[package]]
 category = "dev"
@@ -388,11 +297,6 @@ optional = false
 python-versions = "*"
 version = "1.9.2"
 
-[package.dependencies]
-[package.dependencies."backports.functools-lru-cache"]
-python = "<3"
-version = "*"
-
 [[package]]
 category = "dev"
 description = "Python documentation generator"
@@ -449,15 +353,6 @@ six = ">=1.0.0,<2"
 toml = ">=0.9.4"
 virtualenv = ">=14.0.0"
 
-[[package]]
-category = "dev"
-description = "Type Hints for Python"
-marker = "python_version < \"3.5\""
-name = "typing"
-optional = false
-python-versions = "*"
-version = "3.7.4"
-
 [[package]]
 category = "dev"
 description = "Filters to enhance web typography, including support for Django & Jinja templates"
@@ -497,27 +392,21 @@ version = "0.5.1"
 markdown = ["markdown"]
 
 [metadata]
-content-hash = "d22ff0db3331186ab2f809313de1f9efef1f9c708cc354eaa1638a5111404612"
-python-versions = "~2.7 || ^3.5"
+content-hash = "0163177d87dca0955d111319de9481cf2ed0ef014e63a3740ffaf32a1cf07212"
+python-versions = "^3.5"
 
 [metadata.hashes]
 alabaster = ["446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359", "a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"]
 babel = ["af92e6106cb7c55286b25b38ad7695f8b4efb36a90ba483d7f7a6628c46158ab", "e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28"]
-"backports.functools-lru-cache" = ["9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd"]
 beautifulsoup4 = ["034740f6cb549b4e932ae1ab975581e6103ac8f942200a0e9759065984391858", "945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348", "ba6d5c59906a85ac23dadfe5c88deaf3e179ef565f4898671253e50a78680718"]
 blinker = ["471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6"]
 colorama = ["05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d", "f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48"]
-configparser = ["8be81d89d6e7b4c0d4e44bcc525845f6da25821de80cb5e06e7e0238a2899e32", "da60d0014fd8c55eb48c1c5354352e363e2d30bbf7057e5e171a468390184c75"]
-contextlib2 = ["509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48", "f5260a6e679d2ff42ec91ec5252f4eeffdcf21053db9113bd0a8e4d953769c00"]
 docutils = ["02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6", "51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274", "7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6"]
 entrypoints = ["589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19", "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"]
-enum34 = ["2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850", "644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a", "6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79", "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"]
 feedgenerator = ["5ae05daa9cfa47fa406ee4744d0b7fa1c8a05a7a47ee0ad328ddf55327cfb106"]
 filelock = ["18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59", "929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"]
 flake8 = ["859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661", "a796a115208f5c03b18f332f7c11729812c8c3ded6c46319c59b53efd3819da8"]
 flake8-import-order = ["90a80e46886259b9c396b578d75c749801a41ee969a235e163cfe1be7afd2543", "a28dc39545ea4606c1ac3c24e9d05c849c6e5444a50fb7e9cdd430fc94de6e92"]
-funcsigs = ["330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"]
-functools32 = ["89d824aa6c358c421a234d7f9ee0bd75933a67c29588ce50aaa3acdf4d403fa0", "f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d"]
 imagesize = ["3f349de3eb99145973fefb7dbe38554414e5c30abd0c8e4b970a7c9d09f3a1d8", "f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5"]
 importlib-metadata = ["6dfd58dfe281e8d240937776065dd3624ad5469c835248219bd16cf2e12dbeb7", "cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db"]
 jinja2 = ["065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", "14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b"]
@@ -535,7 +424,7 @@ pygments = ["71e430bc85c88a430f000ac1d9b331d2407f681d6f6aec95e8bcfbc3df5b0127",
 pyparsing = ["1873c03321fc118f4e9746baf201ff990ceb915f433f23b395f5580d1840cb2a", "9b6323ef4ab914af344ba97510e966d64ba91055d6b9afa6b30799340e89cc03"]
 python-dateutil = ["7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb", "c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e"]
 pytz = ["303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda", "d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141"]
-six = ["3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"]
+six = ["1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd", "30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66"]
 smartypants = ["8db97f7cbdf08d15b158a86037cd9e116b4cf37703d24e0419a0d64ca5808f0d"]
 snowballstemmer = ["9f3b9ffe0809d174f7047e121431acf99c89a7040f0ca84f94ba53a498e6d0c9"]
 soupsieve = ["72b5f1aea9101cf720a36bb2327ede866fd6f1a07b1e87c92a1cc18113cbc946", "e4e9c053d59795e440163733a7fec6c5972210e1790c507e4c7b051d6c5259de"]
@@ -543,7 +432,6 @@ sphinx = ["82cd2728c906be96e307b81352d3fd9fb731869234c6b835cc25e9a3dfb4b7e4", "b
 sphinx-rtd-theme = ["00cf895504a7895ee433807c62094cf1e95f065843bf3acd17037c3e9a2becd4", "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a"]
 toml = ["229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", "235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e", "f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"]
 tox = ["dab0b0160dd187b654fc33d690ee1d7bf328bd5b8dc6ef3bb3cc468969c659ba", "ee35ffce74933a6c6ac10c9a0182e41763140a5a5070e21b114feca56eaccdcd"]
-typing = ["38566c558a0a94d6531012c8e917b1b8518a41e418f7f15f00e129cc80162ad3", "53765ec4f83a2b720214727e319607879fec4acde22c4fbb54fa2604e79e44ce", "84698954b4e6719e912ef9a42a2431407fe3755590831699debda6fba92aac55"]
 typogrify = ["8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"]
 unidecode = ["1d7a042116536098d05d599ef2b8616759f02985c85b4fef50c78a5aaf10822a", "2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8"]
 virtualenv = ["b7335cddd9260a3dd214b73a2521ffc09647bde3e9457fcca31dc3be3999d04a", "d28ca64c0f3f125f59cabf13e0a150e1c68e5eea60983cc4395d88c584495783"]
diff --git a/pyproject.toml b/pyproject.toml
index f2f2d0f9..50408d7f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -37,7 +37,6 @@ unidecode = "^1.1"
 python-dateutil = "^2.8"
 docutils = "^0.14"
 markdown = {version = "~3.1.1", optional = true}
-six = "^1.4"
 
 [tool.poetry.dev-dependencies]
 BeautifulSoup4 = "^4.7"
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 0f67ee83..861c1f53 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 AUTHOR = 'Alexis Métaireau'
 SITENAME = "Alexis' log"
diff --git a/samples/pelican.conf_FR.py b/samples/pelican.conf_FR.py
index b1571e8a..f87653a4 100644
--- a/samples/pelican.conf_FR.py
+++ b/samples/pelican.conf_FR.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 AUTHOR = 'Alexis Métaireau'
 SITENAME = "Alexis' log"
diff --git a/setup.py b/setup.py
index faf28f10..d79f055a 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import sys
+
 from io import open
 from os import walk
 from os.path import join, relpath
@@ -10,8 +10,7 @@ from setuptools import setup
 version = "4.2.0"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
-            'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',
-            'python-dateutil']
+            'pytz >= 0a', 'blinker', 'unidecode', 'python-dateutil']
 
 entry_points = {
     'console_scripts': [
@@ -25,9 +24,7 @@ entry_points = {
 README = open('README.rst', encoding='utf-8').read()
 CHANGELOG = open('docs/changelog.rst', encoding='utf-8').read()
 
-description = u'\n'.join([README, CHANGELOG])
-if sys.version_info.major < 3:
-    description = description.encode('utf-8')
+description = '\n'.join([README, CHANGELOG])
 
 setup(
     name='pelican',

From 49bc6ed47f75cb29eade8e2b1a4cf10bfaf73d92 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 17 Nov 2019 19:19:37 +0300
Subject: [PATCH 2240/2864] Further remove python2-isms

---
 pelican/__init__.py                 |  7 ++--
 pelican/generators.py               |  1 -
 pelican/readers.py                  | 13 ++++----
 pelican/settings.py                 | 19 ++++-------
 pelican/tests/test_generators.py    |  1 -
 pelican/tests/test_importer.py      |  1 -
 pelican/tests/test_pelican.py       |  8 ++---
 pelican/tools/pelican_import.py     |  7 +---
 pelican/tools/pelican_quickstart.py | 17 +++++-----
 pelican/urlwrappers.py              |  2 +-
 pelican/utils.py                    | 50 +++++------------------------
 11 files changed, 35 insertions(+), 91 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 456d0691..83160684 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import argparse
-try:
-    import collections.abc as collections
-except ImportError:
-    import collections
 import logging
 import multiprocessing
 import os
@@ -12,6 +8,7 @@ import pprint
 import sys
 import time
 import traceback
+from collections.abc import Iterable
 
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
@@ -184,7 +181,7 @@ class Pelican(object):
         for pair in signals.get_generators.send(self):
             (funct, value) = pair
 
-            if not isinstance(value, collections.Iterable):
+            if not isinstance(value, Iterable):
                 value = (value, )
 
             for v in value:
diff --git a/pelican/generators.py b/pelican/generators.py
index 27c895e4..8782238b 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -5,7 +5,6 @@ import errno
 import fnmatch
 import logging
 import os
-from codecs import open
 from collections import defaultdict
 from functools import partial
 from itertools import chain, groupby
diff --git a/pelican/readers.py b/pelican/readers.py
index bb4d6d81..c650913f 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -5,6 +5,7 @@ import logging
 import os
 import re
 from collections import OrderedDict
+from html import escape
 from html.parser import HTMLParser
 from io import StringIO
 
@@ -18,7 +19,7 @@ from pelican import rstdirectives  # NOQA
 from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Author, Category, Page, Tag
-from pelican.utils import escape_html, get_date, pelican_open, posixize_path
+from pelican.utils import get_date, pelican_open, posixize_path
 
 try:
     from markdown import Markdown
@@ -411,7 +412,7 @@ class HTMLReader(BaseReader):
                 self._in_body = False
                 self._in_top_level = True
             elif self._in_body:
-                self._data_buffer += '</{}>'.format(escape_html(tag))
+                self._data_buffer += '</{}>'.format(escape(tag))
 
         def handle_startendtag(self, tag, attrs):
             if tag == 'meta' and self._in_head:
@@ -432,16 +433,16 @@ class HTMLReader(BaseReader):
             self._data_buffer += '&#{};'.format(data)
 
         def build_tag(self, tag, attrs, close_tag):
-            result = '<{}'.format(escape_html(tag))
+            result = '<{}'.format(escape(tag))
             for k, v in attrs:
-                result += ' ' + escape_html(k)
+                result += ' ' + escape(k)
                 if v is not None:
                     # If the attribute value contains a double quote, surround
                     # with single quotes, otherwise use double quotes.
                     if '"' in v:
-                        result += "='{}'".format(escape_html(v, quote=False))
+                        result += "='{}'".format(escape(v, quote=False))
                     else:
-                        result += '="{}"'.format(escape_html(v, quote=False))
+                        result += '="{}"'.format(escape(v, quote=False))
             if close_tag:
                 return result + ' />'
             return result + '>'
diff --git a/pelican/settings.py b/pelican/settings.py
index 11bad8c4..a4033001 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import copy
+import importlib.util
 import inspect
 import locale
 import logging
@@ -12,19 +13,11 @@ from posixpath import join as posix_join
 from pelican.log import LimitFilter
 
 
-try:
-    # spec_from_file_location is the recommended way in Python 3.5+
-    import importlib.util
-
-    def load_source(name, path):
-        spec = importlib.util.spec_from_file_location(name, path)
-        mod = importlib.util.module_from_spec(spec)
-        spec.loader.exec_module(mod)
-        return mod
-except ImportError:
-    # but it does not exist in Python 2.7, so fall back to imp
-    import imp
-    load_source = imp.load_source
+def load_source(name, path):
+    spec = importlib.util.spec_from_file_location(name, path)
+    mod = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(mod)
+    return mod
 
 
 logger = logging.getLogger(__name__)
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 5b03b1d1..3ab341a3 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -2,7 +2,6 @@
 
 import locale
 import os
-from codecs import open
 from shutil import copy, rmtree
 from tempfile import mkdtemp
 
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 942b95fe..1a6ce404 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -3,7 +3,6 @@
 import locale
 import os
 import re
-from codecs import open
 
 from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder,
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 0d495ac7..5625d617 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -1,15 +1,11 @@
 # -*- coding: utf-8 -*-
 
-try:
-    import collections.abc as collections
-except ImportError:
-    import collections
-
 import locale
 import logging
 import os
 import subprocess
 import sys
+from collections.abc import Sequence
 from shutil import rmtree
 from tempfile import mkdtemp
 
@@ -94,7 +90,7 @@ class TestPelican(LoggedTestCase):
             generator_classes[-1] is StaticGenerator,
             "StaticGenerator must be the last generator, but it isn't!")
         self.assertIsInstance(
-            generator_classes, collections.Sequence,
+            generator_classes, Sequence,
             "get_generator_classes() must return a Sequence to preserve order")
 
     def test_basic_generation_works(self):
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 9b2edf4c..21122eb1 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -8,8 +8,8 @@ import re
 import subprocess
 import sys
 import time
-from codecs import open
 from collections import defaultdict
+from html import unescape
 from urllib.error import URLError
 from urllib.parse import quote, urlparse, urlsplit, urlunsplit
 from urllib.request import urlretrieve
@@ -19,11 +19,6 @@ from pelican.log import init
 from pelican.settings import read_settings
 from pelican.utils import SafeDatetime, slugify
 
-try:
-    from html import unescape  # py3.5+
-except ImportError:
-    from html.parser import HTMLParser
-    unescape = HTMLParser().unescape
 
 logger = logging.getLogger(__name__)
 
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 5ff3dc33..a7801866 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 import argparse
-import codecs
 import locale
 import os
 
@@ -309,8 +308,8 @@ needed by Pelican.
         print('Error: {0}'.format(e))
 
     try:
-        with codecs.open(os.path.join(CONF['basedir'], 'pelicanconf.py'),
-                         'w', 'utf-8') as fd:
+        with open(os.path.join(CONF['basedir'], 'pelicanconf.py'),
+                  'w', 'utf-8') as fd:
             conf_python = dict()
             for key, value in CONF.items():
                 conf_python[key] = repr(value)
@@ -322,8 +321,8 @@ needed by Pelican.
         print('Error: {0}'.format(e))
 
     try:
-        with codecs.open(os.path.join(CONF['basedir'], 'publishconf.py'),
-                         'w', 'utf-8') as fd:
+        with open(os.path.join(CONF['basedir'], 'publishconf.py'),
+                  'w', 'utf-8') as fd:
             _template = _jinja_env.get_template('publishconf.py.jinja2')
             fd.write(_template.render(**CONF))
             fd.close()
@@ -332,16 +331,16 @@ needed by Pelican.
 
     if automation:
         try:
-            with codecs.open(os.path.join(CONF['basedir'], 'tasks.py'),
-                             'w', 'utf-8') as fd:
+            with open(os.path.join(CONF['basedir'], 'tasks.py'),
+                      'w', 'utf-8') as fd:
                 _template = _jinja_env.get_template('tasks.py.jinja2')
                 fd.write(_template.render(**CONF))
                 fd.close()
         except OSError as e:
             print('Error: {0}'.format(e))
         try:
-            with codecs.open(os.path.join(CONF['basedir'], 'Makefile'),
-                             'w', 'utf-8') as fd:
+            with open(os.path.join(CONF['basedir'], 'Makefile'),
+                      'w', 'utf-8') as fd:
                 py_v = 'python3'
                 _template = _jinja_env.get_template('Makefile.jinja2')
                 fd.write(_template.render(py_v=py_v, **CONF))
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index edfb11b4..6b512938 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -62,7 +62,7 @@ class URLWrapper(object):
 
     def _normalize_key(self, key):
         subs = self.settings.get('SLUG_REGEX_SUBSTITUTIONS', [])
-        return str(slugify(key, regex_subs=subs))
+        return slugify(key, regex_subs=subs)
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):
diff --git a/pelican/utils.py b/pelican/utils.py
index d031503d..6491f02e 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import codecs
 import datetime
-import errno
 import fnmatch
 import locale
 import logging
@@ -12,10 +10,7 @@ import shutil
 import sys
 import traceback
 import urllib
-try:
-    from collections.abc import Hashable
-except ImportError:
-    from collections import Hashable
+from collections.abc import Hashable
 from contextlib import contextmanager
 from functools import partial
 from html import entities
@@ -29,10 +24,6 @@ from jinja2 import Markup
 
 import pytz
 
-try:
-    from html import escape
-except ImportError:
-    from cgi import escape
 
 logger = logging.getLogger(__name__)
 
@@ -51,17 +42,11 @@ def sanitised_join(base_directory, *parts):
 
 def strftime(date, date_format):
     '''
-    Replacement for built-in strftime
-
-    This is necessary because of the way Py2 handles date format strings.
-    Specifically, Py2 strftime takes a bytestring. In the case of text output
-    (e.g. %b, %a, etc), the output is encoded with an encoding defined by
-    locale.LC_TIME. Things get messy if the formatting string has chars that
-    are not valid in LC_TIME defined encoding.
+    Enhanced replacement for built-in strftime with zero stripping
 
     This works by 'grabbing' possible format strings (those starting with %),
-    formatting them with the date, (if necessary) decoding the output and
-    replacing formatted output back.
+    formatting them with the date, stripping any leading zeros if - prefix is
+    used and replacing formatted output back.
     '''
     def strip_zeros(x):
         return x.lstrip('0') or '0'
@@ -74,10 +59,6 @@ def strftime(date, date_format):
     # replace candidates with placeholders for later % formatting
     template = re.sub(format_options, '%s', date_format)
 
-    # we need to convert formatted dates back to unicode in Py2
-    # LC_TIME determines the encoding for built-in strftime outputs
-    lang_code, enc = locale.getlocale(locale.LC_TIME)
-
     formatted_candidates = []
     for candidate in candidates:
         # test for valid C89 directives only
@@ -232,15 +213,12 @@ def get_date(string):
 
 
 @contextmanager
-def pelican_open(filename, mode='rb', strip_crs=(sys.platform == 'win32')):
+def pelican_open(filename, mode='r', strip_crs=(sys.platform == 'win32')):
     """Open a file and return its content"""
 
-    with codecs.open(filename, mode, encoding='utf-8') as infile:
+    # utf-8-sig will clear any BOM if present
+    with open(filename, mode, encoding='utf-8-sig') as infile:
         content = infile.read()
-    if content[:1] == codecs.BOM_UTF8.decode('utf8'):
-        content = content[1:]
-    if strip_crs:
-        content = content.replace('\r\n', '\n')
     yield content
 
 
@@ -610,14 +588,6 @@ def truncate_html_words(s, num, end_text='…'):
     return out
 
 
-def escape_html(text, quote=True):
-    """Escape '&', '<' and '>' to HTML-safe sequences.
-
-    In Python 2 this uses cgi.escape and in Python 3 this uses html.escape. We
-    wrap here to ensure the quote argument has an identical default."""
-    return escape(text, quote=quote)
-
-
 def process_translations(content_list, translation_id=None):
     """ Finds translations and returns them.
 
@@ -833,11 +803,7 @@ def set_date_tzinfo(d, tz_name=None):
 
 
 def mkdir_p(path):
-    try:
-        os.makedirs(path)
-    except OSError as e:
-        if e.errno != errno.EEXIST or not os.path.isdir(path):
-            raise
+    os.makedirs(path, exist_ok=True)
 
 
 def split_all(path):

From 3cc430b41814b1d7b30a3266ba6a39a6bda3fa32 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 17 Nov 2019 20:30:07 +0300
Subject: [PATCH 2241/2864] Update docutils and remove docutils workaround

---
 pelican/readers.py | 13 -------------
 poetry.lock        |  8 ++++----
 pyproject.toml     |  2 +-
 setup.py           |  5 +++--
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index c650913f..653464af 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -201,18 +201,6 @@ class RstReader(BaseReader):
     writer_class = PelicanHTMLWriter
     field_body_translator_class = _FieldBodyTranslator
 
-    class FileInput(docutils.io.FileInput):
-        """Patch docutils.io.FileInput to remove "U" mode in py3.
-
-        Universal newlines is enabled by default and "U" mode is deprecated
-        in py3.
-
-        """
-
-        def __init__(self, *args, **kwargs):
-            kwargs['mode'] = kwargs.get('mode', 'r').replace('U', '')
-            docutils.io.FileInput.__init__(self, *args, **kwargs)
-
     def __init__(self, *args, **kwargs):
         super(RstReader, self).__init__(*args, **kwargs)
 
@@ -273,7 +261,6 @@ class RstReader(BaseReader):
 
         pub = docutils.core.Publisher(
             writer=self.writer_class(),
-            source_class=self.FileInput,
             destination_class=docutils.io.StringOutput)
         pub.set_components('standalone', 'restructuredtext', 'html')
         pub.process_programmatic_settings(None, extra_params, None)
diff --git a/poetry.lock b/poetry.lock
index 50ba33bc..3b85d1d2 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -50,8 +50,8 @@ category = "main"
 description = "Docutils -- Python Documentation Utilities"
 name = "docutils"
 optional = false
-python-versions = "*"
-version = "0.14"
+python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+version = "0.15.2"
 
 [[package]]
 category = "dev"
@@ -392,7 +392,7 @@ version = "0.5.1"
 markdown = ["markdown"]
 
 [metadata]
-content-hash = "0163177d87dca0955d111319de9481cf2ed0ef014e63a3740ffaf32a1cf07212"
+content-hash = "b8fa239ebaf9bf4bcd5c2e02cf94d065a1add4e19d8354cedf19db6378d6b848"
 python-versions = "^3.5"
 
 [metadata.hashes]
@@ -401,7 +401,7 @@ babel = ["af92e6106cb7c55286b25b38ad7695f8b4efb36a90ba483d7f7a6628c46158ab", "e8
 beautifulsoup4 = ["034740f6cb549b4e932ae1ab975581e6103ac8f942200a0e9759065984391858", "945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348", "ba6d5c59906a85ac23dadfe5c88deaf3e179ef565f4898671253e50a78680718"]
 blinker = ["471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6"]
 colorama = ["05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d", "f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48"]
-docutils = ["02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6", "51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274", "7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6"]
+docutils = ["6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0", "9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827", "a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99"]
 entrypoints = ["589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19", "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"]
 feedgenerator = ["5ae05daa9cfa47fa406ee4744d0b7fa1c8a05a7a47ee0ad328ddf55327cfb106"]
 filelock = ["18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59", "929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"]
diff --git a/pyproject.toml b/pyproject.toml
index 50408d7f..41314c99 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@ pytz = "^2019.1"
 blinker = "^1.4"
 unidecode = "^1.1"
 python-dateutil = "^2.8"
-docutils = "^0.14"
+docutils = "^0.15"
 markdown = {version = "~3.1.1", optional = true}
 
 [tool.poetry.dev-dependencies]
diff --git a/setup.py b/setup.py
index d79f055a..7c583da2 100755
--- a/setup.py
+++ b/setup.py
@@ -9,8 +9,9 @@ from setuptools import setup
 
 version = "4.2.0"
 
-requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
-            'pytz >= 0a', 'blinker', 'unidecode', 'python-dateutil']
+requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
+            'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',
+            'python-dateutil']
 
 entry_points = {
     'console_scripts': [

From 16968834ce9d72e2e51b06ffe16a1c750c224370 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Mon, 18 Nov 2019 20:28:48 +0300
Subject: [PATCH 2242/2864] Convert super() calls to py3 style

---
 pelican/cache.py                |  9 +++------
 pelican/contents.py             | 12 ++++++------
 pelican/generators.py           |  8 ++++----
 pelican/log.py                  | 12 ++++++------
 pelican/readers.py              | 18 ++++++------------
 pelican/tests/support.py        |  6 +++---
 pelican/tests/test_contents.py  |  4 ++--
 pelican/tests/test_paginator.py |  2 +-
 pelican/tests/test_pelican.py   |  4 ++--
 pelican/urlwrappers.py          |  2 +-
 pelican/utils.py                | 17 ++++-------------
 11 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/pelican/cache.py b/pelican/cache.py
index 0d36234a..f6adbc35 100644
--- a/pelican/cache.py
+++ b/pelican/cache.py
@@ -80,9 +80,7 @@ class FileStampDataCacher(FileDataCacher):
         and base path for filestamping operations
         """
 
-        super(FileStampDataCacher, self).__init__(settings, cache_name,
-                                                  caching_policy,
-                                                  load_policy)
+        super().__init__(settings, cache_name, caching_policy, load_policy)
 
         method = self.settings['CHECK_MODIFIED_METHOD']
         if method == 'mtime':
@@ -104,7 +102,7 @@ class FileStampDataCacher(FileDataCacher):
     def cache_data(self, filename, data):
         """Cache stamp and data for the given file"""
         stamp = self._get_file_stamp(filename)
-        super(FileStampDataCacher, self).cache_data(filename, (stamp, data))
+        super().cache_data(filename, (stamp, data))
 
     def _get_file_stamp(self, filename):
         """Check if the given file has been modified
@@ -132,8 +130,7 @@ class FileStampDataCacher(FileDataCacher):
         and current file stamp.
         """
 
-        stamp, data = super(FileStampDataCacher, self).get_cached_data(
-            filename, (None, default))
+        stamp, data = super().get_cached_data(filename, (None, default))
         if stamp != self._get_file_stamp(filename):
             return default
         return data
diff --git a/pelican/contents.py b/pelican/contents.py
index 5193061f..6edf5152 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -488,7 +488,7 @@ class Page(Content):
 
     def _expand_settings(self, key):
         klass = 'draft_page' if self.status == 'draft' else None
-        return super(Page, self)._expand_settings(key, klass)
+        return super()._expand_settings(key, klass)
 
 
 class Article(Content):
@@ -498,7 +498,7 @@ class Article(Content):
     default_template = 'article'
 
     def __init__(self, *args, **kwargs):
-        super(Article, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         # handle WITH_FUTURE_DATES (designate article to draft based on date)
         if not self.settings['WITH_FUTURE_DATES'] and hasattr(self, 'date'):
@@ -515,7 +515,7 @@ class Article(Content):
 
     def _expand_settings(self, key):
         klass = 'draft' if self.status == 'draft' else 'article'
-        return super(Article, self)._expand_settings(key, klass)
+        return super()._expand_settings(key, klass)
 
 
 class Static(Content):
@@ -524,7 +524,7 @@ class Static(Content):
     default_template = None
 
     def __init__(self, *args, **kwargs):
-        super(Static, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._output_location_referenced = False
 
     @deprecated_attribute(old='filepath', new='source_path', since=(3, 2, 0))
@@ -543,13 +543,13 @@ class Static(Content):
     def url(self):
         # Note when url has been referenced, so we can avoid overriding it.
         self._output_location_referenced = True
-        return super(Static, self).url
+        return super().url
 
     @property
     def save_as(self):
         # Note when save_as has been referenced, so we can avoid overriding it.
         self._output_location_referenced = True
-        return super(Static, self).save_as
+        return super().save_as
 
     def attach_to(self, content):
         """Override our output directory with that of the given content object.
diff --git a/pelican/generators.py b/pelican/generators.py
index 8782238b..8bd2656f 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -241,7 +241,7 @@ class CachingGenerator(Generator, FileStampDataCacher):
     def _get_file_stamp(self, filename):
         '''Get filestamp for path relative to generator.path'''
         filename = os.path.join(self.path, filename)
-        return super(CachingGenerator, self)._get_file_stamp(filename)
+        return super()._get_file_stamp(filename)
 
 
 class _FileLoader(BaseLoader):
@@ -288,7 +288,7 @@ class ArticlesGenerator(CachingGenerator):
         self.authors = defaultdict(list)
         self.drafts = []                   # only drafts in default language
         self.drafts_translations = []
-        super(ArticlesGenerator, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         signals.article_generator_init.send(self)
 
     def generate_feeds(self, writer):
@@ -699,7 +699,7 @@ class PagesGenerator(CachingGenerator):
         self.hidden_translations = []
         self.draft_pages = []
         self.draft_translations = []
-        super(PagesGenerator, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         signals.page_generator_init.send(self)
 
     def generate_context(self):
@@ -785,7 +785,7 @@ class StaticGenerator(Generator):
     to output"""
 
     def __init__(self, *args, **kwargs):
-        super(StaticGenerator, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.fallback_to_symlinks = False
         signals.static_generator_init.send(self)
 
diff --git a/pelican/log.py b/pelican/log.py
index c971636e..bae15b4b 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -13,7 +13,7 @@ __all__ = [
 class BaseFormatter(logging.Formatter):
     def __init__(self, fmt=None, datefmt=None):
         FORMAT = '%(customlevelname)s %(message)s'
-        super(BaseFormatter, self).__init__(fmt=FORMAT, datefmt=datefmt)
+        super().__init__(fmt=FORMAT, datefmt=datefmt)
 
     def format(self, record):
         customlevel = self._get_levelname(record.levelname)
@@ -23,11 +23,11 @@ class BaseFormatter(logging.Formatter):
         record.args = tuple(arg.replace('\n', '\n  | ') if
                             isinstance(arg, str) else
                             arg for arg in record.args)
-        return super(BaseFormatter, self).format(record)
+        return super().format(record)
 
     def formatException(self, ei):
         ''' prefix traceback info for better representation '''
-        s = super(BaseFormatter, self).formatException(ei)
+        s = super().formatException(ei)
         # fancy format traceback
         s = '\n'.join('  | ' + line for line in s.splitlines())
         # separate the traceback from the preceding lines
@@ -137,7 +137,7 @@ class LimitLogger(logging.Logger):
     limit_filter = LimitFilter()
 
     def __init__(self, *args, **kwargs):
-        super(LimitLogger, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.enable_filter()
 
     def disable_filter(self):
@@ -152,12 +152,12 @@ class FatalLogger(LimitLogger):
     errors_fatal = False
 
     def warning(self, *args, **kwargs):
-        super(FatalLogger, self).warning(*args, **kwargs)
+        super().warning(*args, **kwargs)
         if FatalLogger.warnings_fatal:
             raise RuntimeError('Warning encountered')
 
     def error(self, *args, **kwargs):
-        super(FatalLogger, self).error(*args, **kwargs)
+        super().error(*args, **kwargs)
         if FatalLogger.errors_fatal:
             raise RuntimeError('Error encountered')
 
diff --git a/pelican/readers.py b/pelican/readers.py
index 653464af..b26bd381 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -136,7 +136,7 @@ class BaseReader(object):
 class _FieldBodyTranslator(HTMLTranslator):
 
     def __init__(self, document):
-        HTMLTranslator.__init__(self, document)
+        super().__init__(document)
         self.compact_p = None
 
     def astext(self):
@@ -158,7 +158,7 @@ def render_node_to_html(document, node, field_body_translator_class):
 class PelicanHTMLWriter(Writer):
 
     def __init__(self):
-        Writer.__init__(self)
+        super().__init__()
         self.translator_class = PelicanHTMLTranslator
 
 
@@ -202,7 +202,7 @@ class RstReader(BaseReader):
     field_body_translator_class = _FieldBodyTranslator
 
     def __init__(self, *args, **kwargs):
-        super(RstReader, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         lang_code = self.settings.get('DEFAULT_LANG', 'en')
         if get_docutils_lang(lang_code):
@@ -287,7 +287,7 @@ class MarkdownReader(BaseReader):
     file_extensions = ['md', 'markdown', 'mkd', 'mdown']
 
     def __init__(self, *args, **kwargs):
-        super(MarkdownReader, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         settings = self.settings['MARKDOWN']
         settings.setdefault('extension_configs', {})
         settings.setdefault('extensions', [])
@@ -350,11 +350,7 @@ class HTMLReader(BaseReader):
 
     class _HTMLParser(HTMLParser):
         def __init__(self, settings, filename):
-            try:
-                # Python 3.5+
-                HTMLParser.__init__(self, convert_charrefs=False)
-            except TypeError:
-                HTMLParser.__init__(self)
+            super().__init__(convert_charrefs=False)
             self.body = ''
             self.metadata = {}
             self.settings = settings
@@ -527,9 +523,7 @@ class Readers(FileStampDataCacher):
                             self.settings['CONTENT_CACHING_LAYER'] == 'reader')
         caching_policy = cache_this_level and self.settings['CACHE_CONTENT']
         load_policy = cache_this_level and self.settings['LOAD_CONTENT_CACHE']
-        super(Readers, self).__init__(settings, cache_name,
-                                      caching_policy, load_policy,
-                                      )
+        super().__init__(settings, cache_name, caching_policy, load_policy)
 
     @property
     def extensions(self):
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 86bf984f..327e672d 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -186,7 +186,7 @@ class LogCountHandler(BufferingHandler):
     """Capturing and counting logged messages."""
 
     def __init__(self, capacity=1000):
-        super(LogCountHandler, self).__init__(capacity)
+        super().__init__(capacity)
 
     def count_logs(self, msg=None, level=None):
         return len([
@@ -202,13 +202,13 @@ class LoggedTestCase(unittest.TestCase):
     """A test case that captures log messages."""
 
     def setUp(self):
-        super(LoggedTestCase, self).setUp()
+        super().setUp()
         self._logcount_handler = LogCountHandler()
         logging.getLogger().addHandler(self._logcount_handler)
 
     def tearDown(self):
         logging.getLogger().removeHandler(self._logcount_handler)
-        super(LoggedTestCase, self).tearDown()
+        super().tearDown()
 
     def assertLogCountEqual(self, count=None, msg=None, **kwargs):
         actual = self._logcount_handler.count_logs(msg=msg, **kwargs)
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index e9592bd4..256f08bb 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -25,7 +25,7 @@ TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
 class TestPage(LoggedTestCase):
 
     def setUp(self):
-        super(TestPage, self).setUp()
+        super().setUp()
         self.old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, str('C'))
         self.page_kwargs = {
@@ -657,7 +657,7 @@ class TestArticle(TestPage):
 class TestStatic(LoggedTestCase):
 
     def setUp(self):
-        super(TestStatic, self).setUp()
+        super().setUp()
         self.settings = get_settings(
             STATIC_SAVE_AS='{path}',
             STATIC_URL='{path}',
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 8080c146..9b600a9b 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -17,7 +17,7 @@ TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
 
 class TestPage(unittest.TestCase):
     def setUp(self):
-        super(TestPage, self).setUp()
+        super().setUp()
         self.old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, str('C'))
         self.page_kwargs = {
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 5625d617..2c7a77be 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -42,7 +42,7 @@ class TestPelican(LoggedTestCase):
     # to run pelican in different situations and see how it behaves
 
     def setUp(self):
-        super(TestPelican, self).setUp()
+        super().setUp()
         self.temp_path = mkdtemp(prefix='pelicantests.')
         self.temp_cache = mkdtemp(prefix='pelican_cache.')
         self.maxDiff = None
@@ -53,7 +53,7 @@ class TestPelican(LoggedTestCase):
         rmtree(self.temp_path)
         rmtree(self.temp_cache)
         locale.setlocale(locale.LC_ALL, self.old_locale)
-        super(TestPelican, self).tearDown()
+        super().tearDown()
 
     def assertDirsEqual(self, left_path, right_path):
         out, err = subprocess.Popen(
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 6b512938..cc276b3f 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -122,7 +122,7 @@ class Category(URLWrapper):
 
 class Tag(URLWrapper):
     def __init__(self, name, *args, **kwargs):
-        super(Tag, self).__init__(name.strip(), *args, **kwargs)
+        super().__init__(name.strip(), *args, **kwargs)
 
 
 class Author(URLWrapper):
diff --git a/pelican/utils.py b/pelican/utils.py
index 6491f02e..4b5b7134 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -96,7 +96,7 @@ class SafeDatetime(datetime.datetime):
         if safe:
             return strftime(self, fmt)
         else:
-            return super(SafeDatetime, self).strftime(fmt)
+            return super().strftime(fmt)
 
 
 class DateFormatter(object):
@@ -407,18 +407,11 @@ class _HTMLWordTruncator(HTMLParser):
     class TruncationCompleted(Exception):
 
         def __init__(self, truncate_at):
-            super(_HTMLWordTruncator.TruncationCompleted, self).__init__(
-                truncate_at)
+            super().__init__(truncate_at)
             self.truncate_at = truncate_at
 
     def __init__(self, max_words):
-        # In Python 2, HTMLParser is not a new-style class,
-        # hence super() cannot be used.
-        try:
-            HTMLParser.__init__(self, convert_charrefs=False)
-        except TypeError:
-            # pre Python 3.3
-            HTMLParser.__init__(self)
+        super().__init__(convert_charrefs=False)
 
         self.max_words = max_words
         self.words_found = 0
@@ -428,9 +421,7 @@ class _HTMLWordTruncator(HTMLParser):
 
     def feed(self, *args, **kwargs):
         try:
-            # With Python 2, super() cannot be used.
-            # See the comment for __init__().
-            HTMLParser.feed(self, *args, **kwargs)
+            super().feed(*args, **kwargs)
         except self.TruncationCompleted as exc:
             self.truncate_at = exc.truncate_at
         else:

From a2053c34c39a035a03d1fcce7a66e7ad1af885d0 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 27 Oct 2019 23:51:08 +0300
Subject: [PATCH 2243/2864] Namespace plugin implementation

* Creates pelican.plugins
* Moves plugin related code under pelican.plugins
  * pelican.plugins.signals is now the location for signals, pelican.signals is kept
    for backwards compatibility
  * pelican.plugins._utils contains necessary bits for plugin discovery and loading.
    Logic from Pelican class is moved here. Pelican class now just asks for plugins
    and registers them
* Contains tests for old and new plugin loading
---
 pelican/__init__.py                           |  35 ++---
 pelican/plugins/_utils.py                     |  77 +++++++++
 pelican/plugins/signals.py                    |  52 ++++++
 pelican/settings.py                           |   2 +-
 pelican/signals.py                            |  51 +-----
 .../pelican/plugins/ns_plugin/__init__.py     |   5 +
 .../normal_plugin/normal_plugin/__init__.py   |   5 +
 pelican/tests/test_plugins.py                 | 148 ++++++++++++++++++
 setup.py                                      |   5 +-
 9 files changed, 307 insertions(+), 73 deletions(-)
 create mode 100644 pelican/plugins/_utils.py
 create mode 100644 pelican/plugins/signals.py
 create mode 100644 pelican/tests/dummy_plugins/namespace_plugin/pelican/plugins/ns_plugin/__init__.py
 create mode 100644 pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py
 create mode 100644 pelican/tests/test_plugins.py

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 83160684..3dd04ce8 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,6 +9,11 @@ import sys
 import time
 import traceback
 from collections.abc import Iterable
+# Combines all paths to `pelican` package accessible from `sys.path`
+# Makes it possible to install `pelican` and namespace plugins into different
+# locations in the file system (e.g. pip with `-e` or `--user`)
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)
 
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
@@ -17,6 +22,7 @@ from pelican import signals  # noqa
 from pelican.generators import (ArticlesGenerator, PagesGenerator,
                                 SourceFileGenerator, StaticGenerator,
                                 TemplatePagesGenerator)
+from pelican.plugins._utils import load_plugins
 from pelican.readers import Readers
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import read_settings
@@ -62,27 +68,14 @@ class Pelican(object):
             sys.path.insert(0, '')
 
     def init_plugins(self):
-        self.plugins = []
-        logger.debug('Temporarily adding PLUGIN_PATHS to system path')
-        _sys_path = sys.path[:]
-        for pluginpath in self.settings['PLUGIN_PATHS']:
-            sys.path.insert(0, pluginpath)
-        for plugin in self.settings['PLUGINS']:
-            # if it's a string, then import it
-            if isinstance(plugin, str):
-                logger.debug("Loading plugin `%s`", plugin)
-                try:
-                    plugin = __import__(plugin, globals(), locals(), 'module')
-                except ImportError as e:
-                    logger.error(
-                        "Cannot load plugin `%s`\n%s", plugin, e)
-                    continue
-
-            logger.debug("Registering plugin `%s`", plugin.__name__)
-            plugin.register()
-            self.plugins.append(plugin)
-        logger.debug('Restoring system path')
-        sys.path = _sys_path
+        self.plugins = load_plugins(self.settings)
+        for plugin in self.plugins:
+            logger.debug('Registering plugin `%s`', plugin.__name__)
+            try:
+                plugin.register()
+            except Exception as e:
+                logger.error('Cannot register plugin `%s`\n%s',
+                             plugin.__name__, e)
 
     def run(self):
         """Run the generators and return"""
diff --git a/pelican/plugins/_utils.py b/pelican/plugins/_utils.py
new file mode 100644
index 00000000..c3125ab2
--- /dev/null
+++ b/pelican/plugins/_utils.py
@@ -0,0 +1,77 @@
+import importlib
+import logging
+import pkgutil
+import sys
+
+import six
+
+
+logger = logging.getLogger(__name__)
+
+
+def iter_namespace(ns_pkg):
+    # Specifying the second argument (prefix) to iter_modules makes the
+    # returned name an absolute name instead of a relative one. This allows
+    # import_module to work without having to do additional modification to
+    # the name.
+    return pkgutil.iter_modules(ns_pkg.__path__, ns_pkg.__name__ + ".")
+
+
+def get_namespace_plugins(ns_pkg=None):
+    if ns_pkg is None:
+        import pelican.plugins as ns_pkg
+
+    return {
+        name: importlib.import_module(name)
+        for finder, name, ispkg
+        in iter_namespace(ns_pkg)
+        if ispkg
+    }
+
+
+def list_plugins(ns_pkg=None):
+    from pelican.log import init as init_logging
+    init_logging(logging.INFO)
+    ns_plugins = get_namespace_plugins(ns_pkg)
+    if ns_plugins:
+        logger.info('Plugins found:\n' + '\n'.join(ns_plugins))
+    else:
+        logger.info('No plugins are installed')
+
+
+def load_plugins(settings):
+    logger.debug('Finding namespace plugins')
+    namespace_plugins = get_namespace_plugins()
+    if namespace_plugins:
+        logger.debug('Namespace plugins found:\n' +
+                     '\n'.join(namespace_plugins))
+    plugins = []
+    if settings.get('PLUGINS') is not None:
+        _sys_path = sys.path[:]
+
+        for path in settings.get('PLUGIN_PATHS', []):
+            sys.path.insert(0, path)
+
+        for plugin in settings['PLUGINS']:
+            if isinstance(plugin, six.string_types):
+                logger.debug('Loading plugin `%s`', plugin)
+                # try to find in namespace plugins
+                if plugin in namespace_plugins:
+                    plugin = namespace_plugins[plugin]
+                elif 'pelican.plugins.{}'.format(plugin) in namespace_plugins:
+                    plugin = namespace_plugins['pelican.plugins.{}'.format(
+                        plugin)]
+                # try to import it
+                else:
+                    try:
+                        plugin = __import__(plugin, globals(), locals(),
+                                            str('module'))
+                    except ImportError as e:
+                        logger.error('Cannot load plugin `%s`\n%s', plugin, e)
+                        continue
+            plugins.append(plugin)
+        sys.path = _sys_path
+    else:
+        plugins = list(namespace_plugins.values())
+
+    return plugins
diff --git a/pelican/plugins/signals.py b/pelican/plugins/signals.py
new file mode 100644
index 00000000..18a745b4
--- /dev/null
+++ b/pelican/plugins/signals.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+from __future__ import print_function, unicode_literals
+
+from blinker import signal
+
+# Run-level signals:
+
+initialized = signal('pelican_initialized')
+get_generators = signal('get_generators')
+all_generators_finalized = signal('all_generators_finalized')
+get_writer = signal('get_writer')
+finalized = signal('pelican_finalized')
+
+# Reader-level signals
+
+readers_init = signal('readers_init')
+
+# Generator-level signals
+
+generator_init = signal('generator_init')
+
+article_generator_init = signal('article_generator_init')
+article_generator_pretaxonomy = signal('article_generator_pretaxonomy')
+article_generator_finalized = signal('article_generator_finalized')
+article_generator_write_article = signal('article_generator_write_article')
+article_writer_finalized = signal('article_writer_finalized')
+
+page_generator_init = signal('page_generator_init')
+page_generator_finalized = signal('page_generator_finalized')
+page_generator_write_page = signal('page_generator_write_page')
+page_writer_finalized = signal('page_writer_finalized')
+
+static_generator_init = signal('static_generator_init')
+static_generator_finalized = signal('static_generator_finalized')
+
+# Page-level signals
+
+article_generator_preread = signal('article_generator_preread')
+article_generator_context = signal('article_generator_context')
+
+page_generator_preread = signal('page_generator_preread')
+page_generator_context = signal('page_generator_context')
+
+static_generator_preread = signal('static_generator_preread')
+static_generator_context = signal('static_generator_context')
+
+content_object_init = signal('content_object_init')
+
+# Writers signals
+content_written = signal('content_written')
+feed_generated = signal('feed_generated')
+feed_written = signal('feed_written')
diff --git a/pelican/settings.py b/pelican/settings.py
index a4033001..0cdcefc7 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -138,7 +138,7 @@ DEFAULT_CONFIG = {
     'TYPOGRIFY_IGNORE_TAGS': [],
     'SUMMARY_MAX_LENGTH': 50,
     'PLUGIN_PATHS': [],
-    'PLUGINS': [],
+    'PLUGINS': None,
     'PYGMENTS_RST_OPTIONS': {},
     'TEMPLATE_PAGES': {},
     'TEMPLATE_EXTENSIONS': ['.html'],
diff --git a/pelican/signals.py b/pelican/signals.py
index 253b5fc3..f7605f0c 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -1,51 +1,4 @@
 # -*- coding: utf-8 -*-
+# This file is for backwards compatibility
 
-from blinker import signal
-
-# Run-level signals:
-
-initialized = signal('pelican_initialized')
-get_generators = signal('get_generators')
-all_generators_finalized = signal('all_generators_finalized')
-get_writer = signal('get_writer')
-finalized = signal('pelican_finalized')
-
-# Reader-level signals
-
-readers_init = signal('readers_init')
-
-# Generator-level signals
-
-generator_init = signal('generator_init')
-
-article_generator_init = signal('article_generator_init')
-article_generator_pretaxonomy = signal('article_generator_pretaxonomy')
-article_generator_finalized = signal('article_generator_finalized')
-article_generator_write_article = signal('article_generator_write_article')
-article_writer_finalized = signal('article_writer_finalized')
-
-page_generator_init = signal('page_generator_init')
-page_generator_finalized = signal('page_generator_finalized')
-page_generator_write_page = signal('page_generator_write_page')
-page_writer_finalized = signal('page_writer_finalized')
-
-static_generator_init = signal('static_generator_init')
-static_generator_finalized = signal('static_generator_finalized')
-
-# Page-level signals
-
-article_generator_preread = signal('article_generator_preread')
-article_generator_context = signal('article_generator_context')
-
-page_generator_preread = signal('page_generator_preread')
-page_generator_context = signal('page_generator_context')
-
-static_generator_preread = signal('static_generator_preread')
-static_generator_context = signal('static_generator_context')
-
-content_object_init = signal('content_object_init')
-
-# Writers signals
-content_written = signal('content_written')
-feed_generated = signal('feed_generated')
-feed_written = signal('feed_written')
+from pelican.plugins.signals import * # noqa
diff --git a/pelican/tests/dummy_plugins/namespace_plugin/pelican/plugins/ns_plugin/__init__.py b/pelican/tests/dummy_plugins/namespace_plugin/pelican/plugins/ns_plugin/__init__.py
new file mode 100644
index 00000000..c514861d
--- /dev/null
+++ b/pelican/tests/dummy_plugins/namespace_plugin/pelican/plugins/ns_plugin/__init__.py
@@ -0,0 +1,5 @@
+NAME = 'namespace plugin'
+
+
+def register():
+    pass
diff --git a/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py b/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py
new file mode 100644
index 00000000..15896087
--- /dev/null
+++ b/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py
@@ -0,0 +1,5 @@
+NAME = 'normal plugin'
+
+
+def register():
+    pass
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
new file mode 100644
index 00000000..1adbbb5c
--- /dev/null
+++ b/pelican/tests/test_plugins.py
@@ -0,0 +1,148 @@
+# -*- coding: utf-8 -*-
+from __future__ import print_function, unicode_literals
+
+import os
+from contextlib import contextmanager
+
+from pelican.plugins._utils import get_namespace_plugins, load_plugins
+from pelican.tests.support import unittest
+
+
+@contextmanager
+def tmp_namespace_path(path):
+    '''Context manager for temporarily appending namespace plugin packages
+
+    path: path containing the `pelican` folder
+
+    This modifies the `pelican.__path__` and lets the `pelican.plugins`
+    namespace package resolve it from that.
+    '''
+    # This avoids calls to internal `pelican.plugins.__path__._recalculate()`
+    # as it should not be necessary
+    import pelican
+
+    old_path = pelican.__path__[:]
+    try:
+        pelican.__path__.append(os.path.join(path, 'pelican'))
+        yield
+    finally:
+        pelican.__path__ = old_path
+
+
+class PluginTest(unittest.TestCase):
+    _PLUGIN_FOLDER = os.path.join(
+        os.path.abspath(os.path.dirname(__file__)),
+        'dummy_plugins')
+    _NS_PLUGIN_FOLDER = os.path.join(_PLUGIN_FOLDER, 'namespace_plugin')
+    _NORMAL_PLUGIN_FOLDER = os.path.join(_PLUGIN_FOLDER, 'normal_plugin')
+
+    def test_namespace_path_modification(self):
+        import pelican
+        import pelican.plugins
+        old_path = pelican.__path__[:]
+
+        # not existing path
+        path = os.path.join(self._PLUGIN_FOLDER, 'foo')
+        with tmp_namespace_path(path):
+            self.assertIn(
+                os.path.join(path, 'pelican'),
+                pelican.__path__)
+            # foo/pelican does not exist, so it won't propagate
+            self.assertNotIn(
+                os.path.join(path, 'pelican', 'plugins'),
+                pelican.plugins.__path__)
+        # verify that we restored path back
+        self.assertEqual(pelican.__path__, old_path)
+
+        # existing path
+        with tmp_namespace_path(self._NS_PLUGIN_FOLDER):
+            self.assertIn(
+                os.path.join(self._NS_PLUGIN_FOLDER, 'pelican'),
+                pelican.__path__)
+            # /namespace_plugin/pelican exists, so it should be in
+            self.assertIn(
+                os.path.join(self._NS_PLUGIN_FOLDER, 'pelican', 'plugins'),
+                pelican.plugins.__path__)
+        self.assertEqual(pelican.__path__, old_path)
+
+    def test_get_namespace_plugins(self):
+        # without plugins
+        ns_plugins = get_namespace_plugins()
+        self.assertEqual(len(ns_plugins), 0)
+
+        # with plugin
+        with tmp_namespace_path(self._NS_PLUGIN_FOLDER):
+            ns_plugins = get_namespace_plugins()
+            self.assertEqual(len(ns_plugins), 1)
+            self.assertIn('pelican.plugins.ns_plugin', ns_plugins)
+            self.assertEqual(
+                ns_plugins['pelican.plugins.ns_plugin'].NAME,
+                'namespace plugin')
+
+        # should be back to 0 outside `with`
+        ns_plugins = get_namespace_plugins()
+        self.assertEqual(len(ns_plugins), 0)
+
+    def test_load_plugins(self):
+        # no plugins
+        plugins = load_plugins({})
+        self.assertEqual(len(plugins), 0)
+
+        with tmp_namespace_path(self._NS_PLUGIN_FOLDER):
+            # with no `PLUGINS` setting, load namespace plugins
+            plugins = load_plugins({})
+            self.assertEqual(len(plugins), 1, plugins)
+            self.assertEqual(
+                {'namespace plugin'},
+                set(plugin.NAME for plugin in plugins))
+
+            # disable namespace plugins with `PLUGINS = []`
+            SETTINGS = {
+                'PLUGINS': []
+            }
+            plugins = load_plugins(SETTINGS)
+            self.assertEqual(len(plugins), 0, plugins)
+
+            # using `PLUGINS`
+
+            # normal plugin
+            SETTINGS = {
+                'PLUGINS': ['normal_plugin'],
+                'PLUGIN_PATHS': [self._NORMAL_PLUGIN_FOLDER]
+            }
+            plugins = load_plugins(SETTINGS)
+            self.assertEqual(len(plugins), 1, plugins)
+            self.assertEqual(
+                {'normal plugin'},
+                set(plugin.NAME for plugin in plugins))
+
+            # namespace plugin short
+            SETTINGS = {
+                'PLUGINS': ['ns_plugin']
+            }
+            plugins = load_plugins(SETTINGS)
+            self.assertEqual(len(plugins), 1, plugins)
+            self.assertEqual(
+                {'namespace plugin'},
+                set(plugin.NAME for plugin in plugins))
+
+            # namespace plugin long
+            SETTINGS = {
+                'PLUGINS': ['pelican.plugins.ns_plugin']
+            }
+            plugins = load_plugins(SETTINGS)
+            self.assertEqual(len(plugins), 1, plugins)
+            self.assertEqual(
+                {'namespace plugin'},
+                set(plugin.NAME for plugin in plugins))
+
+            # normal and namespace plugin
+            SETTINGS = {
+                'PLUGINS': ['normal_plugin', 'ns_plugin'],
+                'PLUGIN_PATHS': [self._NORMAL_PLUGIN_FOLDER]
+            }
+            plugins = load_plugins(SETTINGS)
+            self.assertEqual(len(plugins), 2, plugins)
+            self.assertEqual(
+                {'normal plugin', 'namespace plugin'},
+                set(plugin.NAME for plugin in plugins))
diff --git a/setup.py b/setup.py
index 7c583da2..dc1cc527 100755
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,8 @@ entry_points = {
         'pelican = pelican.__main__:main',
         'pelican-import = pelican.tools.pelican_import:main',
         'pelican-quickstart = pelican.tools.pelican_quickstart:main',
-        'pelican-themes = pelican.tools.pelican_themes:main'
+        'pelican-themes = pelican.tools.pelican_themes:main',
+        'pelican-plugins = pelican.plugins._utils:list_plugins'
     ]
 }
 
@@ -44,7 +45,7 @@ setup(
     keywords='static web site generator SSG reStructuredText Markdown',
     license='AGPLv3',
     long_description=description,
-    packages=['pelican', 'pelican.tools'],
+    packages=['pelican', 'pelican.tools', 'pelican.plugins'],
     package_data={
         # we manually collect the package data, as opposed to using,
         # include_package_data=True because we don't want the tests to be

From 58edad6897931f21c7c2f4314cfab33c2b167680 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 1 Dec 2019 18:14:13 +0300
Subject: [PATCH 2244/2864] remove pelican.signals in favor of
 pelican.plugins.signals

---
 pelican/__init__.py            | 8 ++++----
 pelican/contents.py            | 2 +-
 pelican/generators.py          | 2 +-
 pelican/readers.py             | 2 +-
 pelican/signals.py             | 4 ----
 pelican/tests/test_contents.py | 2 +-
 pelican/writers.py             | 2 +-
 7 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 pelican/signals.py

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 3dd04ce8..17f4f922 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -18,10 +18,10 @@ __path__ = extend_path(__path__, __name__)
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import init as init_logging
-from pelican import signals  # noqa
-from pelican.generators import (ArticlesGenerator, PagesGenerator,
-                                SourceFileGenerator, StaticGenerator,
-                                TemplatePagesGenerator)
+from pelican.generators import (ArticlesGenerator,  # noqa: I100
+                                PagesGenerator, SourceFileGenerator,
+                                StaticGenerator, TemplatePagesGenerator)
+from pelican.plugins import signals
 from pelican.plugins._utils import load_plugins
 from pelican.readers import Readers
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
diff --git a/pelican/contents.py b/pelican/contents.py
index 6edf5152..594cd3b5 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -10,7 +10,7 @@ from urllib.parse import urljoin, urlparse, urlunparse
 
 import pytz
 
-from pelican import signals
+from pelican.plugins import signals
 from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import (deprecated_attribute, memoized, path_to_url,
                            posixize_path, sanitised_join, set_date_tzinfo,
diff --git a/pelican/generators.py b/pelican/generators.py
index 8bd2656f..02667cd7 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -13,9 +13,9 @@ from operator import attrgetter
 from jinja2 import (BaseLoader, ChoiceLoader, Environment, FileSystemLoader,
                     PrefixLoader, TemplateNotFound)
 
-from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Article, Page, Static
+from pelican.plugins import signals
 from pelican.readers import Readers
 from pelican.utils import (DateFormatter, copy, mkdir_p, order_content,
                            posixize_path, process_translations)
diff --git a/pelican/readers.py b/pelican/readers.py
index b26bd381..673b637e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -16,9 +16,9 @@ from docutils.parsers.rst.languages import get_language as get_docutils_lang
 from docutils.writers.html4css1 import HTMLTranslator, Writer
 
 from pelican import rstdirectives  # NOQA
-from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Author, Category, Page, Tag
+from pelican.plugins import signals
 from pelican.utils import get_date, pelican_open, posixize_path
 
 try:
diff --git a/pelican/signals.py b/pelican/signals.py
deleted file mode 100644
index f7605f0c..00000000
--- a/pelican/signals.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# This file is for backwards compatibility
-
-from pelican.plugins.signals import * # noqa
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 256f08bb..62608b7b 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -10,8 +10,8 @@ from sys import platform
 from jinja2.utils import generate_lorem_ipsum
 
 from pelican.contents import Article, Author, Category, Page, Static
+from pelican.plugins.signals import content_object_init
 from pelican.settings import DEFAULT_CONFIG
-from pelican.signals import content_object_init
 from pelican.tests.support import (LoggedTestCase, get_context, get_settings,
                                    unittest)
 from pelican.utils import (path_to_url, posixize_path, truncate_html_words)
diff --git a/pelican/writers.py b/pelican/writers.py
index daeb9dec..7bbd216e 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -8,8 +8,8 @@ from feedgenerator import Atom1Feed, Rss201rev2Feed, get_tag_uri
 
 from jinja2 import Markup
 
-from pelican import signals
 from pelican.paginator import Paginator
+from pelican.plugins import signals
 from pelican.utils import (get_relative_path, is_selected_for_writing,
                            path_to_url, sanitised_join, set_date_tzinfo)
 

From ed1eca160e80bebbfd5870afe1f2a111f388e0ed Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 1 Dec 2019 18:33:11 +0300
Subject: [PATCH 2245/2864] Remove py2-isms and avoid sys.path hacks

---
 pelican/plugins/_utils.py | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/pelican/plugins/_utils.py b/pelican/plugins/_utils.py
index c3125ab2..a3c9ee77 100644
--- a/pelican/plugins/_utils.py
+++ b/pelican/plugins/_utils.py
@@ -1,9 +1,8 @@
 import importlib
+import importlib.machinery
+import importlib.util
 import logging
 import pkgutil
-import sys
-
-import six
 
 
 logger = logging.getLogger(__name__)
@@ -39,6 +38,20 @@ def list_plugins(ns_pkg=None):
         logger.info('No plugins are installed')
 
 
+def load_legacy_plugin(plugin, plugin_paths):
+    # Try to find plugin in PLUGIN_PATHS
+    spec = importlib.machinery.PathFinder.find_spec(plugin, plugin_paths)
+    if spec is None:
+        # If failed, try to find it in normal importable locations
+        spec = importlib.util.find_spec(plugin)
+    if spec is None:
+        raise ImportError('Cannot import plugin `{}`'.format(plugin))
+    else:
+        mod = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(mod)
+        return mod
+
+
 def load_plugins(settings):
     logger.debug('Finding namespace plugins')
     namespace_plugins = get_namespace_plugins()
@@ -47,13 +60,8 @@ def load_plugins(settings):
                      '\n'.join(namespace_plugins))
     plugins = []
     if settings.get('PLUGINS') is not None:
-        _sys_path = sys.path[:]
-
-        for path in settings.get('PLUGIN_PATHS', []):
-            sys.path.insert(0, path)
-
         for plugin in settings['PLUGINS']:
-            if isinstance(plugin, six.string_types):
+            if isinstance(plugin, str):
                 logger.debug('Loading plugin `%s`', plugin)
                 # try to find in namespace plugins
                 if plugin in namespace_plugins:
@@ -64,13 +72,13 @@ def load_plugins(settings):
                 # try to import it
                 else:
                     try:
-                        plugin = __import__(plugin, globals(), locals(),
-                                            str('module'))
+                        plugin = load_legacy_plugin(
+                            plugin,
+                            settings.get('PLUGIN_PATHS', []))
                     except ImportError as e:
                         logger.error('Cannot load plugin `%s`\n%s', plugin, e)
                         continue
             plugins.append(plugin)
-        sys.path = _sys_path
     else:
         plugins = list(namespace_plugins.values())
 

From 87a5c82197c23eeddfd38525079c63856a1da030 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 1 Dec 2019 19:29:41 +0300
Subject: [PATCH 2246/2864] Documentation update for namespace plugins

---
 docs/plugins.rst  | 63 +++++++++++++++++++++++++++++++++++++++--------
 docs/settings.rst |  2 +-
 2 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 5a6f9e55..49799741 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -9,16 +9,31 @@ features to Pelican without having to directly modify the Pelican core.
 How to use plugins
 ==================
 
-To load plugins, you have to specify them in your settings file. There are two
-ways to do so. The first method is to specify strings with the path to the
-callables::
+Starting with version 4.3, Pelican moved to a new plugin structure utilizing
+namespace packages. Plugins supporting this structure will install under the
+namespace package ``pelican.plugins`` and can be automatically discovered
+by Pelican.
 
-    PLUGINS = ['package.myplugin',]
+If you leave the ``PLUGINS`` setting as default (``None``), Pelican will then
+collect the namespace plugins and register them. If on the other hand you
+specify a ``PLUGINS`` settings as a list of plugins, this autodiscovery will
+be disabled and only listed plugins will be registered and you will have to
+explicitly list the namespace plugins as well.
 
-Alternatively, another method is to import them and add them to the list::
+If you are using ``PLUGINS`` setting, you can specify plugins in two ways.
+First method is using strings to the plugins. Namespace plugins can be
+specified either by their full names (``pelican.plugins.myplugin``) or by
+their short names (``myplugin``)::
+
+    PLUGINS = ['package.myplugin',
+               'namespace_plugin1',
+               'pelican.plugins.namespace_plugin2']
+
+Alternatively, you can import them in your settings file and pass the modules::
 
     from package import myplugin
-    PLUGINS = [myplugin,]
+    from pelican.plugins import namespace_plugin1, namespace_plugin2
+    PLUGINS = [myplugin, namespace_plugin1, namespace_plugin2]
 
 .. note::
 
@@ -36,11 +51,12 @@ the ``PLUGIN_PATHS`` list can be absolute or relative to the settings file::
 
 Where to find plugins
 =====================
+Namespace plugins can be found in the `pelican-plugins organization`_ as
+individual repositories. Legacy plugins are collected in the `pelican-plugins
+repository`_ and they will be slowly phased out to the namespace versions.
 
-We maintain a separate repository of plugins for people to share and use.
-Please visit the `pelican-plugins`_ repository for a list of available plugins.
-
-.. _pelican-plugins: https://github.com/getpelican/pelican-plugins
+.. _pelican-plugins organization: https://github.com/pelican-plugins
+.. _pelican-plugins repository: https://github.com/getpelican/pelican-plugins
 
 Please note that while we do our best to review and maintain these plugins,
 they are submitted by the Pelican community and thus may have varying levels of
@@ -70,6 +86,33 @@ which you map the signals to your plugin logic. Let's take a simple example::
     your ``register`` callable or they will be garbage-collected before the
     signal is emitted.
 
+Namespace Plugin structure
+--------------------------
+
+Namespace plugins must adhere to a certain structure in order to function
+properly. They need to installable (i.e. contain ``setup.py`` or equivalent)
+and have a folder structure as follows::
+
+    myplugin
+    ├── pelican
+    │   └── plugins
+    │       └── myplugin
+    │           ├── __init__.py
+    │           └── ...
+    ├── ...
+    └── setup.py
+
+It is crucial that ``pelican`` or ``pelican/plugins`` folder **should not**
+contain an ``__init__.py`` file. In fact, it is best to have those folders
+empty besides the listed folders in the above structure and contain your
+plugin related files solely in the ``pelican/plugins/myplugin`` folder to
+avoid any issues.
+
+For easily setting up the proper structure, a `cookiecutter template for
+plugins`_ is provided. Refer to the README in the link for how to use it.
+
+.. _cookiecutter template for plugins: https://github.com/getpelican/cookiecutter-pelican-plugin
+
 List of signals
 ===============
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 5d090a62..39982315 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -194,7 +194,7 @@ Basic settings
    Controls the extension that will be used by the SourcesGenerator.  Defaults
    to ``.text``. If not a valid string the default value will be used.
 
-.. data:: PLUGINS = []
+.. data:: PLUGINS = None
 
    The list of plugins to load. See :ref:`plugins`.
 

From 8a56e1f1fabee2f164116d5f6cd45dacea1b11b4 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 1 Dec 2019 20:21:20 +0300
Subject: [PATCH 2247/2864] Update namespace docs to address review

---
 docs/plugins.rst | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 49799741..4d44eea7 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -9,7 +9,7 @@ features to Pelican without having to directly modify the Pelican core.
 How to use plugins
 ==================
 
-Starting with version 4.3, Pelican moved to a new plugin structure utilizing
+Starting with version 5.0, Pelican moved to a new plugin structure utilizing
 namespace packages. Plugins supporting this structure will install under the
 namespace package ``pelican.plugins`` and can be automatically discovered
 by Pelican.
@@ -21,8 +21,8 @@ be disabled and only listed plugins will be registered and you will have to
 explicitly list the namespace plugins as well.
 
 If you are using ``PLUGINS`` setting, you can specify plugins in two ways.
-First method is using strings to the plugins. Namespace plugins can be
-specified either by their full names (``pelican.plugins.myplugin``) or by
+The first method specifies plugins as a list of strings. Namespace plugins can
+be specified either by their full names (``pelican.plugins.myplugin``) or by
 their short names (``myplugin``)::
 
     PLUGINS = ['package.myplugin',
@@ -53,7 +53,8 @@ Where to find plugins
 =====================
 Namespace plugins can be found in the `pelican-plugins organization`_ as
 individual repositories. Legacy plugins are collected in the `pelican-plugins
-repository`_ and they will be slowly phased out to the namespace versions.
+repository`_ and they will be slowly phased out in favor of the namespace
+versions.
 
 .. _pelican-plugins organization: https://github.com/pelican-plugins
 .. _pelican-plugins repository: https://github.com/getpelican/pelican-plugins
@@ -86,11 +87,11 @@ which you map the signals to your plugin logic. Let's take a simple example::
     your ``register`` callable or they will be garbage-collected before the
     signal is emitted.
 
-Namespace Plugin structure
+Namespace plugin structure
 --------------------------
 
 Namespace plugins must adhere to a certain structure in order to function
-properly. They need to installable (i.e. contain ``setup.py`` or equivalent)
+properly. They need to be installable (i.e. contain ``setup.py`` or equivalent)
 and have a folder structure as follows::
 
     myplugin
@@ -102,11 +103,11 @@ and have a folder structure as follows::
     ├── ...
     └── setup.py
 
-It is crucial that ``pelican`` or ``pelican/plugins`` folder **should not**
+It is crucial that ``pelican`` or ``pelican/plugins`` folder **not**
 contain an ``__init__.py`` file. In fact, it is best to have those folders
-empty besides the listed folders in the above structure and contain your
-plugin related files solely in the ``pelican/plugins/myplugin`` folder to
-avoid any issues.
+empty besides the listed folders in the above structure and keep your
+plugin related files contained solely in the ``pelican/plugins/myplugin``
+folder to avoid any issues.
 
 For easily setting up the proper structure, a `cookiecutter template for
 plugins`_ is provided. Refer to the README in the link for how to use it.

From 3f1d4edea339665ad12aaa78637aebdbf2813542 Mon Sep 17 00:00:00 2001
From: Kurt McKee <contactme@kurtmckee.org>
Date: Thu, 5 Dec 2019 13:37:41 -0600
Subject: [PATCH 2248/2864] Fix a typo in the pagination settings docs

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 39982315..9bd2cbf2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -997,7 +997,7 @@ subsequent pages at ``.../page/2/`` etc, you could set ``PAGINATION_PATTERNS``
 as follows::
 
   PAGINATION_PATTERNS = (
-      (1, '{url}', '{save_as}',
+      (1, '{url}', '{save_as}'),
       (2, '{base_name}/page/{number}/', '{base_name}/page/{number}/index.html'),
   )
 

From b149a23507ba5a74f1ea6a85ddd019f094f89a2a Mon Sep 17 00:00:00 2001
From: Hong Xu <hong@topbug.net>
Date: Wed, 25 Dec 2019 18:29:45 +0800
Subject: [PATCH 2249/2864] Add cross links between theme settings and
 pelican-themes

---
 docs/pelican-themes.rst | 3 ++-
 docs/settings.rst       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index 2802777a..e63f6a19 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -6,7 +6,8 @@ pelican-themes
 Description
 ===========
 
-``pelican-themes`` is a command line tool for managing themes for Pelican.
+``pelican-themes`` is a command line tool for managing themes for Pelican. See
+:ref:`settings/themes` for settings related to themes.
 
 
 Usage
diff --git a/docs/settings.rst b/docs/settings.rst
index 39982315..1ab9cee3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1076,6 +1076,7 @@ Ordering content
    will sort pages by their basename.
 
 
+.. _settings/themes:
 
 Themes
 ======
@@ -1088,7 +1089,7 @@ themes.
 
    Theme to use to produce the output. Can be a relative or absolute path to a
    theme folder, or the name of a default theme or a theme installed via
-   ``pelican-themes`` (see below).
+   :doc:`pelican-themes` (see below).
 
 .. data:: THEME_STATIC_DIR = 'theme'
 

From 6a9aa1dca8bf24739aa075671f4e6c2b8e742e03 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 28 Dec 2019 09:48:07 +0100
Subject: [PATCH 2250/2864] Remove duplicate datetime URL in Settings docs

---
 docs/settings.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 39982315..3ffe735e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -645,7 +645,7 @@ Time and Date
    the language name (``lang`` metadata in your post content) as the key.
 
    In addition to the standard C89 strftime format codes that are listed in
-   `Python strftime documentation`_, you can use the ``-`` character between
+   `Python datetime documentation`_, you can use the ``-`` character between
    ``%`` and the format character to remove any leading zeros. For example,
    ``%d/%m/%Y`` will output ``01/01/2014`` whereas ``%-d/%-m/%Y`` will result
    in ``1/1/2014``.
@@ -696,8 +696,6 @@ Time and Date
 
 .. [#] Default is the system locale.
 
-.. _Python strftime documentation: https://docs.python.org/library/datetime.html#strftime-strptime-behavior
-
 .. _locales on Windows: http://msdn.microsoft.com/en-us/library/cdax410z%28VS.71%29.aspx
 
 .. _locale(1): https://linux.die.net/man/1/locale

From d2c857883f8829806b4c7021bc903cf9ad092989 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 28 Dec 2019 09:52:33 +0100
Subject: [PATCH 2251/2864] Update Python documentation links to Python 3

---
 docs/settings.rst | 2 +-
 docs/themes.rst   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 3ffe735e..832db001 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -369,7 +369,7 @@ and pages anywhere you want.
     the `Python datetime documentation`_ for more information.
 
 .. _Python datetime documentation:
-    https://docs.python.org/2/library/datetime.html#strftime-and-strptime-behavior
+    https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior
 
 Also, you can use other file metadata attributes as well:
 
diff --git a/docs/themes.rst b/docs/themes.rst
index b00d0236..ea9214fe 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -120,8 +120,8 @@ your date according to the locale given in your settings::
 
     {{ article.date|strftime('%d %B %Y') }}
 
-.. _datetime: https://docs.python.org/2/library/datetime.html#datetime-objects
-.. _strftime: https://docs.python.org/2/library/datetime.html#strftime-strptime-behavior
+.. _datetime: https://docs.python.org/3/library/datetime.html#datetime-objects
+.. _strftime: https://docs.python.org/3/library/datetime.html#strftime-strptime-behavior
 
 
 index.html

From d7795b8afde60fbc494bb3c9798ddf90c05dd0b1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 28 Dec 2019 09:57:41 +0100
Subject: [PATCH 2252/2864] Move Python datetime note further down Settings
 docs

---
 docs/settings.rst | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 832db001..1242205e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -362,15 +362,6 @@ variables allow you to place your articles in a location such as
 example below). These settings give you the flexibility to place your articles
 and pages anywhere you want.
 
-.. note::
-    If you specify a ``datetime`` directive, it will be substituted using the
-    input files' date metadata attribute. If the date is not specified for a
-    particular file, Pelican will rely on the file's ``mtime`` timestamp. Check
-    the `Python datetime documentation`_ for more information.
-
-.. _Python datetime documentation:
-    https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior
-
 Also, you can use other file metadata attributes as well:
 
 * slug
@@ -391,6 +382,15 @@ This would save your articles into something like
 ``/pages/about/index.html``, and render them available at URLs of
 ``/posts/2011/Aug/07/sample-post/`` and ``/pages/about/``, respectively.
 
+.. note::
+    If you specify a ``datetime`` directive, it will be substituted using the
+    input files' date metadata attribute. If the date is not specified for a
+    particular file, Pelican will rely on the file's ``mtime`` timestamp. Check
+    the `Python datetime documentation`_ for more information.
+
+.. _Python datetime documentation:
+    https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior
+
 .. data:: RELATIVE_URLS = False
 
    Defines whether Pelican should use document-relative URLs or not. Only set

From b8f2326fa656dc1e990c0a8ca4f6573ba3e205e5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 28 Dec 2019 10:02:48 +0100
Subject: [PATCH 2253/2864] Document mirroring content & output path
 hierarchies

---
 docs/settings.rst | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 1242205e..b4ec4761 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -362,7 +362,15 @@ variables allow you to place your articles in a location such as
 example below). These settings give you the flexibility to place your articles
 and pages anywhere you want.
 
-Also, you can use other file metadata attributes as well:
+If you don't want that flexibility and instead prefer that your generated
+output paths mirror your source content's filesystem path hierarchy, try the
+following settings::
+
+    PATH_METADATA = '(?P<path_no_ext>.*)\..*'
+    ARTICLE_URL = ARTICLE_SAVE_AS = PAGE_URL = PAGE_SAVE_AS = '{path_no_ext}.html'
+
+Otherwise, you can use a variety of file metadata attributes within URL-related
+settings:
 
 * slug
 * date

From 70c8d2a47431cc5de29b08a830d1af4f8e6f6e30 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 28 Dec 2019 10:20:19 +0100
Subject: [PATCH 2254/2864] Docs: Ensure plugin developers create new branch

---
 docs/contribute.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index a96f2d02..221c405b 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -140,6 +140,10 @@ Install the needed dependencies and set up the project::
 
     invoke setup
 
+Create a topic branch for your plugin bug fix or feature::
+
+    git checkout -b name-of-your-bugfix-or-feature
+
 After writing new tests for your plugin changes, run the plugin test suite::
 
     invoke tests

From 569f8a080ec1ba55ed36a49d607bea560fad53f8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 17 Jan 2020 15:11:42 +0100
Subject: [PATCH 2255/2864] Tell users they can use CTRL-C to stop web server

This knowledge was heretofore assumed but is better made explicit.
---
 pelican/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 17f4f922..e040ca4d 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -466,8 +466,9 @@ def listen(server, port, output, excqueue=None):
             excqueue.put(traceback.format_exception_only(type(e), e)[-1])
         return
 
-    logging.info("Serving at port %s, server %s.", port, server)
     try:
+        print("\nServing site at: {}:{} - Tap CTRL-C to stop".format(
+            server, port))
         httpd.serve_forever()
     except Exception as e:
         if excqueue is not None:

From fa719315035b38633aee88d1a10927b3ce018032 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 17 Jan 2020 15:22:12 +0100
Subject: [PATCH 2256/2864] Exit web server gracefully when user taps CTRL-C

Users were previously met with an ugly traceback. Now `pelican --listen`
invocations, when quit via CTRL-C, are followed instead by a more
user-friendly message.
---
 pelican/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index e040ca4d..97135a62 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -475,6 +475,10 @@ def listen(server, port, output, excqueue=None):
             excqueue.put(traceback.format_exception_only(type(e), e)[-1])
         return
 
+    except KeyboardInterrupt:
+        print("\nKeyboard interrupt received. Shutting down server.")
+        httpd.socket.close()
+
 
 def main(argv=None):
     args = parse_arguments(argv)

From bd1ab74031f3b589582848ffeb6361f3dbf6a630 Mon Sep 17 00:00:00 2001
From: LouisJackman <LouisJackman@users.noreply.github.com>
Date: Thu, 23 Jan 2020 21:29:13 +0000
Subject: [PATCH 2257/2864] Add a devserver-global task for non-local dev
 testing

The devserver target recently acquired a sane default of restricting
access only to localhost. This is good for security. However, it can
frustrate some usages like testing on phones on a local network or
hosting the dev server within VMs (e.g. Docker for Mac) which see host
OS browsers as not being 127.0.0.1.

Add a new target called `devserver-global` for this case. As it's longer
to type, the more svelte `devserver` will retain the more secure
defaults that will suffice for most users; they can use the
longer-to-type `devserver-global` target to relax the localhost-only
restriction.
---
 pelican/tools/templates/Makefile.jinja2 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 91b44320..0d27defd 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -114,6 +114,13 @@ else
 	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
 endif
 
+devserver-global:
+ifdef PORT
+	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b 0.0.0.0
+else
+	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -b 0.0.0.0
+endif
+
 publish:
 	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
 

From 652ec971d478a466cd4b72f96727ec17f7c18ca0 Mon Sep 17 00:00:00 2001
From: "luz.paz" <luzpaz@users.noreply.github.com>
Date: Thu, 20 Feb 2020 07:49:24 -0500
Subject: [PATCH 2258/2864] Add Repology badge to README

Closes #2633
---
 README.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 176dfce4..ea15e141 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-Pelican |build-status| |pypi-version|
+Pelican |build-status| |pypi-version| |repology|
 =====================================
 
 Pelican is a static site generator, written in Python_.
@@ -62,3 +62,6 @@ Why the name "Pelican"?
 .. |pypi-version| image:: https://img.shields.io/pypi/v/pelican.svg
    :target: https://pypi.python.org/pypi/pelican
    :alt: PyPI: the Python Package Index
+.. |repology| image:: https://repology.org/badge/tiny-repos/pelican.svg
+   :target: https://repology.org/project/pelican/versions
+   :alt: Repology: the packaging hub
\ No newline at end of file

From f2dbfbfcecd41c19438b22f6d1b25e9583a10867 Mon Sep 17 00:00:00 2001
From: Carlos Pereira Atencio <carlosperate@users.noreply.github.com>
Date: Wed, 26 Feb 2020 18:54:05 +0000
Subject: [PATCH 2259/2864] Docs: Add info about pelican-quickstart command
 path flag. (#2675)

---
 docs/install.rst                    | 7 +++++++
 pelican/tools/pelican_quickstart.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/install.rst b/docs/install.rst
index 2da7b9be..d683ed8f 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -102,6 +102,13 @@ your site::
 
     pelican-quickstart
 
+If run inside an activated virtual environment, ``pelican-quickstart`` will
+look for an associated project path inside ``$VIRTUAL_ENV/.project``. If that
+file exists and contains a valid directory path, the new Pelican project will
+be saved at that location. Otherwise, the default is the current working
+directory. To set the new project path on initial invocation, use:
+``pelican-quickstart --path /your/desired/directory``
+
 Once you finish answering all the questions, your project will consist of the
 following hierarchy (except for *pages* — shown in parentheses below — which
 you can optionally add yourself if you plan to create non-chronological
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index a7801866..63b32417 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -200,7 +200,7 @@ needed by Pelican.
     no_path_was_specified = hasattr(args.path, 'is_default_path')
     if os.path.isfile(project) and no_path_was_specified:
         CONF['basedir'] = open(project, 'r').read().rstrip("\n")
-        print('Using project associated with current virtual environment.'
+        print('Using project associated with current virtual environment. '
               'Will save to:\n%s\n' % CONF['basedir'])
     else:
         CONF['basedir'] = os.path.abspath(os.path.expanduser(

From bae37a7ae4d9b51280816d0a6d419517a9ea9c83 Mon Sep 17 00:00:00 2001
From: Nik <nik@drnik.org>
Date: Fri, 13 Mar 2020 15:47:48 +0100
Subject: [PATCH 2260/2864] Make encoding a named parameter

Without the name, the parameters are used in sequence and the "encoding"
param is used in place of the "buffering" param, which leads to
problems.
---
 pelican/tools/pelican_quickstart.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 63b32417..5a622365 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -309,7 +309,7 @@ needed by Pelican.
 
     try:
         with open(os.path.join(CONF['basedir'], 'pelicanconf.py'),
-                  'w', 'utf-8') as fd:
+                  'w', encoding='utf-8') as fd:
             conf_python = dict()
             for key, value in CONF.items():
                 conf_python[key] = repr(value)
@@ -322,7 +322,7 @@ needed by Pelican.
 
     try:
         with open(os.path.join(CONF['basedir'], 'publishconf.py'),
-                  'w', 'utf-8') as fd:
+                  'w', encoding='utf-8') as fd:
             _template = _jinja_env.get_template('publishconf.py.jinja2')
             fd.write(_template.render(**CONF))
             fd.close()
@@ -332,7 +332,7 @@ needed by Pelican.
     if automation:
         try:
             with open(os.path.join(CONF['basedir'], 'tasks.py'),
-                      'w', 'utf-8') as fd:
+                      'w', encoding='utf-8') as fd:
                 _template = _jinja_env.get_template('tasks.py.jinja2')
                 fd.write(_template.render(**CONF))
                 fd.close()
@@ -340,7 +340,7 @@ needed by Pelican.
             print('Error: {0}'.format(e))
         try:
             with open(os.path.join(CONF['basedir'], 'Makefile'),
-                      'w', 'utf-8') as fd:
+                      'w', encoding='utf-8') as fd:
                 py_v = 'python3'
                 _template = _jinja_env.get_template('Makefile.jinja2')
                 fd.write(_template.render(py_v=py_v, **CONF))

From ab5e78db2a1fc69ad8762d6d9d675348ede47c54 Mon Sep 17 00:00:00 2001
From: Nik <nik@drnik.org>
Date: Sat, 14 Mar 2020 08:44:34 +0100
Subject: [PATCH 2261/2864] Handle case of missing port in target
 "serve-global"

Also factor out the check for the SERVER variable to avoid nested
ifdefs.

Fixes #2696
---
 pelican/tools/templates/Makefile.jinja2 | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 91b44320..6b13a59c 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -50,6 +50,14 @@ ifeq ($(RELATIVE), 1)
 	PELICANOPTS += --relative-urls
 endif
 
+SERVER ?= "0.0.0.0"
+
+PORT ?= 0
+ifneq ($(PORT), 0)
+	PELICANOPTS += -p $(PORT)
+endif
+
+
 help:
 	@echo 'Makefile for a pelican Web site                                           '
 	@echo '                                                                          '
@@ -100,12 +108,7 @@ else
 endif
 
 serve-global:
-ifdef SERVER
-	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b $(SERVER)
-else
-	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b 0.0.0.0
-endif
-
+	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -b $(SERVER)
 
 devserver:
 ifdef PORT

From e412657581c060a117f178d1224a4bce53bbae26 Mon Sep 17 00:00:00 2001
From: "(GalaxyMaster)" <galaxy4public@users.noreply.github.com>
Date: Sat, 11 Apr 2020 15:35:26 +1000
Subject: [PATCH 2262/2864] Added support for the summary end marker
 configuration

---
 pelican/contents.py | 3 ++-
 pelican/settings.py | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 594cd3b5..620fa304 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -390,7 +390,8 @@ class Content(object):
             return self.content
 
         return truncate_html_words(self.content,
-                                   self.settings['SUMMARY_MAX_LENGTH'])
+                                   self.settings['SUMMARY_MAX_LENGTH'],
+                                   self.settings['SUMMARY_END_MARKER'])
 
     @property
     def summary(self):
diff --git a/pelican/settings.py b/pelican/settings.py
index 0cdcefc7..7d80ba90 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -136,6 +136,7 @@ DEFAULT_CONFIG = {
     'ARTICLE_PERMALINK_STRUCTURE': '',
     'TYPOGRIFY': False,
     'TYPOGRIFY_IGNORE_TAGS': [],
+    'SUMMARY_END_MARKER': '…',
     'SUMMARY_MAX_LENGTH': 50,
     'PLUGIN_PATHS': [],
     'PLUGINS': None,

From 4833a272436775aa44ac197e93ef4b4de3129372 Mon Sep 17 00:00:00 2001
From: "(GalaxyMaster)" <galaxy4public@users.noreply.github.com>
Date: Sat, 11 Apr 2020 15:42:18 +1000
Subject: [PATCH 2263/2864] Provided the settings documentation snippet

---
 docs/settings.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index b4ec4761..8ad149b2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -271,6 +271,11 @@ Basic settings
    does not otherwise specify a summary. Setting to ``None`` will cause the
    summary to be a copy of the original content.
 
+.. data:: SUMMARY_END_MARKER = '…'
+
+   When creating a short summary of an article and the result was truncated to
+   match the required word length, this will be used as the truncation marker.
+
 .. data:: WITH_FUTURE_DATES = True
 
    If disabled, content with dates in the future will get a default status of

From 56c2abe61351f520581fc70ccc8b3c4aecd38f6d Mon Sep 17 00:00:00 2001
From: "(GalaxyMaster)" <galaxy4public@users.noreply.github.com>
Date: Sat, 11 Apr 2020 17:30:50 +1000
Subject: [PATCH 2264/2864] Added a test for the emd marker

---
 pelican/tests/test_contents.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 62608b7b..0ac69f8d 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -98,6 +98,19 @@ class TestPage(LoggedTestCase):
         page = Page(**page_kwargs)
         self.assertEqual(page.summary, '')
 
+    def test_summary_end_marker(self):
+        # If a :SUMMARY_END_MARKER: is set, and there is no other summary,
+        # generated summary should contain the specified marker at the end.
+        page_kwargs = self._copy_page_kwargs()
+        settings = get_settings()
+        page_kwargs['settings'] = settings
+        del page_kwargs['metadata']['summary']
+        settings['SUMMARY_END_MARKER'] = 'test_marker'
+        settings['SUMMARY_MAX_LENGTH'] = 10
+        page = Page(**page_kwargs)
+        self.assertEqual(page.summary, truncate_html_words(TEST_CONTENT, 10,
+                                                           'test_marker'))
+
     def test_summary_get_summary_warning(self):
         """calling ._get_summary() should issue a warning"""
         page_kwargs = self._copy_page_kwargs()

From 7f8726929ba4aa9cdf1276fe7c8394e03d0df9ba Mon Sep 17 00:00:00 2001
From: "(GalaxyMaster)" <galaxy4public@users.noreply.github.com>
Date: Sun, 12 Apr 2020 05:18:29 +1000
Subject: [PATCH 2265/2864] Added an additional assert as requested

---
 pelican/tests/test_contents.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 0ac69f8d..08d4eb73 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -110,6 +110,7 @@ class TestPage(LoggedTestCase):
         page = Page(**page_kwargs)
         self.assertEqual(page.summary, truncate_html_words(TEST_CONTENT, 10,
                                                            'test_marker'))
+        self.assertIn('test_marker', page.summary)
 
     def test_summary_get_summary_warning(self):
         """calling ._get_summary() should issue a warning"""

From e06934a003e0514e35ea2b4914157d733c3554ed Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 06:07:37 +0200
Subject: [PATCH 2266/2864] Update documentation copyright & attribution info

---
 docs/conf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index f0589b84..2be4fbe1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -17,7 +17,7 @@ extensions = ['sphinx.ext.autodoc',
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Pelican'
-copyright = '2010 – present, Alexis Metaireau and contributors'
+copyright = '2010 – present, Justin Mayer, Alexis Metaireau, and contributors'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])
@@ -68,14 +68,14 @@ def setup(app):
 
 # -- Options for LaTeX output -------------------------------------------------
 latex_documents = [
-    ('index', 'Pelican.tex', 'Pelican Documentation', 'Alexis Métaireau',
+    ('index', 'Pelican.tex', 'Pelican Documentation', 'Justin Mayer',
      'manual'),
 ]
 
 # -- Options for manual page output -------------------------------------------
 man_pages = [
     ('index', 'pelican', 'pelican documentation',
-     ['Alexis Métaireau'], 1),
+     ['Justin Mayer'], 1),
     ('pelican-themes', 'pelican-themes', 'A theme manager for Pelican',
      ['Mickaël Raybaud'], 1),
     ('themes', 'pelican-theming', 'How to create themes for Pelican',

From 50808f644fb70420075623c47a8e63af83684bf3 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 09:36:20 +0200
Subject: [PATCH 2267/2864] Remove poetry.lock file

This seems to be causing problems for some folks, without adding any
noticeable benefit.
---
 poetry.lock | 438 ----------------------------------------------------
 1 file changed, 438 deletions(-)
 delete mode 100644 poetry.lock

diff --git a/poetry.lock b/poetry.lock
deleted file mode 100644
index 3b85d1d2..00000000
--- a/poetry.lock
+++ /dev/null
@@ -1,438 +0,0 @@
-[[package]]
-category = "dev"
-description = "A configurable sidebar-enabled Sphinx theme"
-name = "alabaster"
-optional = false
-python-versions = "*"
-version = "0.7.12"
-
-[[package]]
-category = "dev"
-description = "Internationalization utilities"
-name = "babel"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.7.0"
-
-[package.dependencies]
-pytz = ">=2015.7"
-
-[[package]]
-category = "dev"
-description = "Screen-scraping library"
-name = "beautifulsoup4"
-optional = false
-python-versions = "*"
-version = "4.7.1"
-
-[package.dependencies]
-soupsieve = ">=1.2"
-
-[[package]]
-category = "main"
-description = "Fast, simple object-to-object and broadcast signaling"
-name = "blinker"
-optional = false
-python-versions = "*"
-version = "1.4"
-
-[[package]]
-category = "dev"
-description = "Cross-platform colored terminal text."
-marker = "sys_platform == \"win32\""
-name = "colorama"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "0.4.1"
-
-[[package]]
-category = "main"
-description = "Docutils -- Python Documentation Utilities"
-name = "docutils"
-optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-version = "0.15.2"
-
-[[package]]
-category = "dev"
-description = "Discover and load entry points from installed packages."
-name = "entrypoints"
-optional = false
-python-versions = ">=2.7"
-version = "0.3"
-
-[[package]]
-category = "main"
-description = "Standalone version of django.utils.feedgenerator"
-name = "feedgenerator"
-optional = false
-python-versions = "*"
-version = "1.9"
-
-[package.dependencies]
-pytz = ">=0a"
-six = "*"
-
-[[package]]
-category = "dev"
-description = "A platform independent file lock."
-name = "filelock"
-optional = false
-python-versions = "*"
-version = "3.0.12"
-
-[[package]]
-category = "dev"
-description = "the modular source code checker: pep8, pyflakes and co"
-name = "flake8"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "3.7.7"
-
-[package.dependencies]
-entrypoints = ">=0.3.0,<0.4.0"
-mccabe = ">=0.6.0,<0.7.0"
-pycodestyle = ">=2.5.0,<2.6.0"
-pyflakes = ">=2.1.0,<2.2.0"
-
-[[package]]
-category = "dev"
-description = "Flake8 and pylama plugin that checks the ordering of import statements."
-name = "flake8-import-order"
-optional = false
-python-versions = "*"
-version = "0.18.1"
-
-[package.dependencies]
-pycodestyle = "*"
-setuptools = "*"
-
-[[package]]
-category = "dev"
-description = "Getting image size from png/jpeg/jpeg2000/gif file"
-name = "imagesize"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.1.0"
-
-[[package]]
-category = "dev"
-description = "Read metadata from Python packages"
-name = "importlib-metadata"
-optional = false
-python-versions = ">=2.7,!=3.0,!=3.1,!=3.2,!=3.3"
-version = "0.18"
-
-[package.dependencies]
-zipp = ">=0.5"
-
-[[package]]
-category = "main"
-description = "A small but fast and easy to use stand-alone template engine written in pure python."
-name = "jinja2"
-optional = false
-python-versions = "*"
-version = "2.10.1"
-
-[package.dependencies]
-MarkupSafe = ">=0.23"
-
-[[package]]
-category = "dev"
-description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
-name = "lxml"
-optional = false
-python-versions = "*"
-version = "4.3.4"
-
-[[package]]
-category = "main"
-description = "Python implementation of Markdown."
-name = "markdown"
-optional = false
-python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*"
-version = "3.1.1"
-
-[package.dependencies]
-setuptools = ">=36"
-
-[[package]]
-category = "main"
-description = "Safely add untrusted strings to HTML/XML markup."
-name = "markupsafe"
-optional = false
-python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
-version = "1.1.1"
-
-[[package]]
-category = "dev"
-description = "McCabe checker, plugin for flake8"
-name = "mccabe"
-optional = false
-python-versions = "*"
-version = "0.6.1"
-
-[[package]]
-category = "dev"
-description = "Rolling backport of unittest.mock for all Pythons"
-name = "mock"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "3.0.5"
-
-[package.dependencies]
-six = "*"
-
-[[package]]
-category = "dev"
-description = "Core utilities for Python packages"
-name = "packaging"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "19.0"
-
-[package.dependencies]
-pyparsing = ">=2.0.2"
-six = "*"
-
-[[package]]
-category = "dev"
-description = "plugin and hook calling mechanisms for python"
-name = "pluggy"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "0.12.0"
-
-[package.dependencies]
-importlib-metadata = ">=0.12"
-
-[[package]]
-category = "dev"
-description = "library with cross-python path, ini-parsing, io, code, log facilities"
-name = "py"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.8.0"
-
-[[package]]
-category = "dev"
-description = "Python style guide checker"
-name = "pycodestyle"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.5.0"
-
-[[package]]
-category = "dev"
-description = "passive checker of Python programs"
-name = "pyflakes"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.1.1"
-
-[[package]]
-category = "main"
-description = "Pygments is a syntax highlighting package written in Python."
-name = "pygments"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "2.4.2"
-
-[[package]]
-category = "dev"
-description = "Python parsing module"
-name = "pyparsing"
-optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-version = "2.4.0"
-
-[[package]]
-category = "main"
-description = "Extensions to the standard Python datetime module"
-name = "python-dateutil"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
-version = "2.8.0"
-
-[package.dependencies]
-six = ">=1.5"
-
-[[package]]
-category = "main"
-description = "World timezone definitions, modern and historical"
-name = "pytz"
-optional = false
-python-versions = "*"
-version = "2019.1"
-
-[[package]]
-category = "main"
-description = "Python 2 and 3 compatibility utilities"
-name = "six"
-optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*"
-version = "1.13.0"
-
-[[package]]
-category = "dev"
-description = "Python with the SmartyPants"
-name = "smartypants"
-optional = false
-python-versions = "*"
-version = "2.0.1"
-
-[[package]]
-category = "dev"
-description = "This package provides 23 stemmers for 22 languages generated from Snowball algorithms."
-name = "snowballstemmer"
-optional = false
-python-versions = "*"
-version = "1.9.0"
-
-[[package]]
-category = "dev"
-description = "A modern CSS selector implementation for Beautiful Soup."
-name = "soupsieve"
-optional = false
-python-versions = "*"
-version = "1.9.2"
-
-[[package]]
-category = "dev"
-description = "Python documentation generator"
-name = "sphinx"
-optional = false
-python-versions = "*"
-version = "1.4.9"
-
-[package.dependencies]
-Jinja2 = ">=2.3"
-Pygments = ">=2.0"
-alabaster = ">=0.7,<0.8"
-babel = ">=1.3,<2.0 || >2.0"
-colorama = ">=0.3.5"
-docutils = ">=0.11"
-imagesize = "*"
-six = ">=1.5"
-snowballstemmer = ">=1.1"
-
-[[package]]
-category = "dev"
-description = "Read the Docs theme for Sphinx"
-name = "sphinx-rtd-theme"
-optional = false
-python-versions = "*"
-version = "0.4.3"
-
-[package.dependencies]
-sphinx = "*"
-
-[[package]]
-category = "dev"
-description = "Python Library for Tom's Obvious, Minimal Language"
-name = "toml"
-optional = false
-python-versions = "*"
-version = "0.10.0"
-
-[[package]]
-category = "dev"
-description = "tox is a generic virtualenv management and test command line tool"
-name = "tox"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "3.13.2"
-
-[package.dependencies]
-filelock = ">=3.0.0,<4"
-importlib-metadata = ">=0.12,<1"
-packaging = ">=14"
-pluggy = ">=0.12.0,<1"
-py = ">=1.4.17,<2"
-six = ">=1.0.0,<2"
-toml = ">=0.9.4"
-virtualenv = ">=14.0.0"
-
-[[package]]
-category = "dev"
-description = "Filters to enhance web typography, including support for Django & Jinja templates"
-name = "typogrify"
-optional = false
-python-versions = "*"
-version = "2.0.7"
-
-[package.dependencies]
-smartypants = ">=1.8.3"
-
-[[package]]
-category = "main"
-description = "ASCII transliterations of Unicode text"
-name = "unidecode"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.1.1"
-
-[[package]]
-category = "dev"
-description = "Virtual Python Environment builder"
-name = "virtualenv"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "16.6.1"
-
-[[package]]
-category = "dev"
-description = "Backport of pathlib-compatible object wrapper for zip files"
-name = "zipp"
-optional = false
-python-versions = ">=2.7"
-version = "0.5.1"
-
-[extras]
-markdown = ["markdown"]
-
-[metadata]
-content-hash = "b8fa239ebaf9bf4bcd5c2e02cf94d065a1add4e19d8354cedf19db6378d6b848"
-python-versions = "^3.5"
-
-[metadata.hashes]
-alabaster = ["446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359", "a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"]
-babel = ["af92e6106cb7c55286b25b38ad7695f8b4efb36a90ba483d7f7a6628c46158ab", "e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28"]
-beautifulsoup4 = ["034740f6cb549b4e932ae1ab975581e6103ac8f942200a0e9759065984391858", "945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348", "ba6d5c59906a85ac23dadfe5c88deaf3e179ef565f4898671253e50a78680718"]
-blinker = ["471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6"]
-colorama = ["05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d", "f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48"]
-docutils = ["6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0", "9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827", "a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99"]
-entrypoints = ["589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19", "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"]
-feedgenerator = ["5ae05daa9cfa47fa406ee4744d0b7fa1c8a05a7a47ee0ad328ddf55327cfb106"]
-filelock = ["18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59", "929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"]
-flake8 = ["859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661", "a796a115208f5c03b18f332f7c11729812c8c3ded6c46319c59b53efd3819da8"]
-flake8-import-order = ["90a80e46886259b9c396b578d75c749801a41ee969a235e163cfe1be7afd2543", "a28dc39545ea4606c1ac3c24e9d05c849c6e5444a50fb7e9cdd430fc94de6e92"]
-imagesize = ["3f349de3eb99145973fefb7dbe38554414e5c30abd0c8e4b970a7c9d09f3a1d8", "f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5"]
-importlib-metadata = ["6dfd58dfe281e8d240937776065dd3624ad5469c835248219bd16cf2e12dbeb7", "cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db"]
-jinja2 = ["065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", "14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b"]
-lxml = ["06c7616601430aa140a69f97e3116308fffe0848f543b639a5ec2e8920ae72fd", "177202792f9842374a8077735c69c41a4282183f7851443d2beb8ee310720819", "19317ad721ceb9e39847d11131903931e2794e447d4751ebb0d9236f1b349ff2", "36d206e62f3e5dbaafd4ec692b67157e271f5da7fd925fda8515da675eace50d", "387115b066c797c85f9861a9613abf50046a15aac16759bc92d04f94acfad082", "3ce1c49d4b4a7bc75fb12acb3a6247bb7a91fe420542e6d671ba9187d12a12c2", "4d2a5a7d6b0dbb8c37dab66a8ce09a8761409c044017721c21718659fa3365a1", "58d0a1b33364d1253a88d18df6c0b2676a1746d27c969dc9e32d143a3701dda5", "62a651c618b846b88fdcae0533ec23f185bb322d6c1845733f3123e8980c1d1b", "69ff21064e7debc9b1b1e2eee8c2d686d042d4257186d70b338206a80c5bc5ea", "7060453eba9ba59d821625c6af6a266bd68277dce6577f754d1eb9116c094266", "7d26b36a9c4bce53b9cfe42e67849ae3c5c23558bc08363e53ffd6d94f4ff4d2", "83b427ad2bfa0b9705e02a83d8d607d2c2f01889eb138168e462a3a052c42368", "923d03c84534078386cf50193057aae98fa94cace8ea7580b74754493fda73ad", "b773715609649a1a180025213f67ffdeb5a4878c784293ada300ee95a1f3257b", "baff149c174e9108d4a2fee192c496711be85534eab63adb122f93e70aa35431", "bca9d118b1014b4c2d19319b10a3ebed508ff649396ce1855e1c96528d9b2fa9", "ce580c28845581535dc6000fc7c35fdadf8bea7ccb57d6321b044508e9ba0685", "d34923a569e70224d88e6682490e24c842907ba2c948c5fd26185413cbe0cd96", "dd9f0e531a049d8b35ec5e6c68a37f1ba6ec3a591415e6804cbdf652793d15d7", "ecb805cbfe9102f3fd3d2ef16dfe5ae9e2d7a7dfbba92f4ff1e16ac9784dbfb0", "ede9aad2197a0202caff35d417b671f5f91a3631477441076082a17c94edd846", "ef2d1fc370400e0aa755aab0b20cf4f1d0e934e7fd5244f3dd4869078e4942b9", "f2fec194a49bfaef42a548ee657362af5c7a640da757f6f452a35da7dd9f923c"]
-markdown = ["2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a", "56a46ac655704b91e5b7e6326ce43d5ef72411376588afa1dd90e881b83c7e8c"]
-markupsafe = ["00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", "09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", "09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", "1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", "24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", "43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", "46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", "500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", "535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", "62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", "6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", "717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", "79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", "7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", "88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", "8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", "98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", "9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", "9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", "ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", "b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", "b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", "b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", "ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", "c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", "cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", "e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"]
-mccabe = ["ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", "dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"]
-mock = ["83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3", "d157e52d4e5b938c550f39eb2fd15610db062441a9c2747d3dbfa9298211d0f8"]
-packaging = ["0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af", "9e1cbf8c12b1f1ce0bb5344b8d7ecf66a6f8a6e91bcb0c84593ed6d3ab5c4ab3"]
-pluggy = ["0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc", "b9817417e95936bf75d85d3f8767f7df6cdde751fc40aed3bb3074cbcb77757c"]
-py = ["64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa", "dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53"]
-pycodestyle = ["95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56", "e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"]
-pyflakes = ["17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0", "d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2"]
-pygments = ["71e430bc85c88a430f000ac1d9b331d2407f681d6f6aec95e8bcfbc3df5b0127", "881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297"]
-pyparsing = ["1873c03321fc118f4e9746baf201ff990ceb915f433f23b395f5580d1840cb2a", "9b6323ef4ab914af344ba97510e966d64ba91055d6b9afa6b30799340e89cc03"]
-python-dateutil = ["7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb", "c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e"]
-pytz = ["303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda", "d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141"]
-six = ["1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd", "30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66"]
-smartypants = ["8db97f7cbdf08d15b158a86037cd9e116b4cf37703d24e0419a0d64ca5808f0d"]
-snowballstemmer = ["9f3b9ffe0809d174f7047e121431acf99c89a7040f0ca84f94ba53a498e6d0c9"]
-soupsieve = ["72b5f1aea9101cf720a36bb2327ede866fd6f1a07b1e87c92a1cc18113cbc946", "e4e9c053d59795e440163733a7fec6c5972210e1790c507e4c7b051d6c5259de"]
-sphinx = ["82cd2728c906be96e307b81352d3fd9fb731869234c6b835cc25e9a3dfb4b7e4", "b83f430200f546bfd5088c653f0c5516af708da36066dfde08d08bedb1b33a4b"]
-sphinx-rtd-theme = ["00cf895504a7895ee433807c62094cf1e95f065843bf3acd17037c3e9a2becd4", "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a"]
-toml = ["229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", "235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e", "f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"]
-tox = ["dab0b0160dd187b654fc33d690ee1d7bf328bd5b8dc6ef3bb3cc468969c659ba", "ee35ffce74933a6c6ac10c9a0182e41763140a5a5070e21b114feca56eaccdcd"]
-typogrify = ["8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"]
-unidecode = ["1d7a042116536098d05d599ef2b8616759f02985c85b4fef50c78a5aaf10822a", "2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8"]
-virtualenv = ["b7335cddd9260a3dd214b73a2521ffc09647bde3e9457fcca31dc3be3999d04a", "d28ca64c0f3f125f59cabf13e0a150e1c68e5eea60983cc4395d88c584495783"]
-zipp = ["8c1019c6aad13642199fbe458275ad6a84907634cc9f0989877ccc4a2840139d", "ca943a7e809cc12257001ccfb99e3563da9af99d52f261725e96dfe0f9275bc3"]

From 4db9b944a237302b5558395038f6125a910c6a05 Mon Sep 17 00:00:00 2001
From: Kurt McKee <contactme@kurtmckee.org>
Date: Sun, 15 Dec 2019 23:53:33 -0600
Subject: [PATCH 2268/2864] Remove CSS references to the non-existent digg.png
 icon

---
 pelican/tests/output/basic/theme/css/main.css         | 1 -
 pelican/tests/output/custom/theme/css/main.css        | 1 -
 pelican/tests/output/custom_locale/theme/css/main.css | 1 -
 pelican/themes/notmyidea/static/css/main.css          | 1 -
 4 files changed, 4 deletions(-)

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 2b9d96e3..5feb71ce 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -326,7 +326,6 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
 		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
 		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
-		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
 		.social a[href*='github.com'],
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 2b9d96e3..5feb71ce 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -326,7 +326,6 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
 		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
 		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
-		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
 		.social a[href*='github.com'],
diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
index 2b9d96e3..5feb71ce 100644
--- a/pelican/tests/output/custom_locale/theme/css/main.css
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -326,7 +326,6 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
 		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
 		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
-		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
 		.social a[href*='github.com'],
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 2b9d96e3..5feb71ce 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -326,7 +326,6 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
 		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
 		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
-		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
 		.social a[href*='github.com'],

From 5d6513c36cb7cb16a97d21e7abe0108fbdd95557 Mon Sep 17 00:00:00 2001
From: Annika Backstrom <annika@sixohthree.com>
Date: Wed, 23 Nov 2016 00:13:28 -0500
Subject: [PATCH 2269/2864] Skip Markdown metadata parsing within metadata

---
 pelican/readers.py                                  |  3 +++
 .../article_with_markdown_and_nested_metadata.md    |  5 +++++
 pelican/tests/test_generators.py                    |  3 +++
 pelican/tests/test_readers.py                       | 13 +++++++++++++
 4 files changed, 24 insertions(+)
 create mode 100644 pelican/tests/content/article_with_markdown_and_nested_metadata.md

diff --git a/pelican/readers.py b/pelican/readers.py
index 673b637e..dea11fbd 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -302,6 +302,9 @@ class MarkdownReader(BaseReader):
         """Return the dict containing document metadata"""
         formatted_fields = self.settings['FORMATTED_FIELDS']
 
+        # prevent metadata extraction in fields
+        self._md.preprocessors.pop('meta', None)
+
         output = {}
         for name, value in meta.items():
             name = name.lower()
diff --git a/pelican/tests/content/article_with_markdown_and_nested_metadata.md b/pelican/tests/content/article_with_markdown_and_nested_metadata.md
new file mode 100644
index 00000000..3968027b
--- /dev/null
+++ b/pelican/tests/content/article_with_markdown_and_nested_metadata.md
@@ -0,0 +1,5 @@
+Title: Article with markdown and nested summary metadata
+Date: 2012-10-30
+Summary: Test: This metadata value looks like metadata
+
+This is some content.
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 3ab341a3..1f8157a6 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -239,6 +239,8 @@ class TestArticlesGenerator(unittest.TestCase):
             ['Article title', 'published', 'Default', 'article'],
             ['Article with markdown and summary metadata multi', 'published',
              'Default', 'article'],
+            ['Article with markdown and nested summary metadata', 'published',
+             'Default', 'article'],
             ['Article with markdown and summary metadata single', 'published',
              'Default', 'article'],
             ['Article with markdown containing footnotes', 'published',
@@ -554,6 +556,7 @@ class TestArticlesGenerator(unittest.TestCase):
             'Article title',
             'Article with Nonconformant HTML meta tags',
             'Article with an inline SVG',
+            'Article with markdown and nested summary metadata',
             'Article with markdown and summary metadata multi',
             'Article with markdown and summary metadata single',
             'Article with markdown containing footnotes',
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 5b87aeac..70e6da77 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -645,6 +645,19 @@ class MdReaderTest(ReaderTest):
         }
         self.assertDictHasSubset(metadata, expected)
 
+    def test_metadata_not_parsed_for_metadata(self):
+        settings = get_settings()
+        settings['FORMATTED_FIELDS'] = ['summary']
+
+        reader = readers.MarkdownReader(settings=settings)
+        content, metadata = reader.read(
+            _path('article_with_markdown_and_nested_metadata.md'))
+        expected = {
+            'title': 'Article with markdown and nested summary metadata',
+            'summary': '<p>Test: This metadata value looks like metadata</p>',
+        }
+        self.assertDictHasSubset(metadata, expected)
+
     def test_empty_file(self):
         reader = readers.MarkdownReader(settings=get_settings())
         content, metadata = reader.read(

From e618becfc08934a7813b8a9832ae5105c07d0595 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 11:37:10 +0200
Subject: [PATCH 2270/2864] Skip MD metadata parsing in latest Python-Markdown

The syntax for unloading Python-Markdown extensions has changed to a
"deregister" method on Registry objects.
---
 pelican/readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index dea11fbd..6d9923f2 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -303,7 +303,7 @@ class MarkdownReader(BaseReader):
         formatted_fields = self.settings['FORMATTED_FIELDS']
 
         # prevent metadata extraction in fields
-        self._md.preprocessors.pop('meta', None)
+        self._md.preprocessors.deregister('meta')
 
         output = {}
         for name, value in meta.items():

From 2a5bb109ba3ce0910b5e4ca3a19313c564f2017a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 15:04:22 +0200
Subject: [PATCH 2271/2864] Pin pytest until 5.4.x series has stabilized

Version 5.4.1 is currently incompatible with pytest-sugar.
---
 requirements/test.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/test.pip b/requirements/test.pip
index f5d09e4a..5cadfafb 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,6 +1,6 @@
 # Tests
 mock
-pytest
+pytest==5.3.5
 
 # Optional Packages
 Markdown >= 3.1

From 88100484e0aafc17fa4a8fcd01966c9c9ca8d25d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 15:16:12 +0200
Subject: [PATCH 2272/2864] Move more test deps from CI config to requirements

---
 requirements/test.pip | 1 +
 tox.ini               | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/requirements/test.pip b/requirements/test.pip
index 5cadfafb..25ab14ea 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,6 +1,7 @@
 # Tests
 mock
 pytest==5.3.5
+pytest-cov
 
 # Optional Packages
 Markdown >= 3.1
diff --git a/tox.ini b/tox.ini
index 7ddcfae0..cf8b150a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,8 +10,6 @@ passenv = *
 usedevelop=True
 deps =
     -rrequirements/test.pip
-    pytest
-    pytest-cov
     pygments==2.1.3
 
 commands =

From b6dc55f96c9e97b637f0b5e4720e61170d5d43fd Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 15:21:17 +0200
Subject: [PATCH 2273/2864] Add poetry.lock to list of files for Git to ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c1835e10..b94526d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ htmlcov
 venv
 samples/output
 *.pem
+poetry.lock

From 18c7a9c3a1cd152d03b76dd08fb876184ab4e5de Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 15:38:17 +0200
Subject: [PATCH 2274/2864] Pin pytest in pyproject also

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 4d1477c0..cf79a74e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -47,7 +47,7 @@ sphinx = "=1.4.9"
 sphinx_rtd_theme = "^0.4.3"
 livereload = "^2.6"
 mock = "^3.0"
-pytest = "^5.2"
+pytest = "~5.3.5"
 pytest-cov = "^2.8"
 pytest-pythonpath = "^0.7.3"
 pytest-sugar = "^0.9.2"

From 7bbd3dc6fbd31da5ce69a1347c5f72db73a5e6fc Mon Sep 17 00:00:00 2001
From: Kurt McKee <contactme@kurtmckee.org>
Date: Sun, 12 Apr 2020 09:38:35 -0500
Subject: [PATCH 2275/2864] Update links to HTTPS and current 301 redirects in
 docs/templates/themes (#2661)

This also updates the Tumblr API to use HTTPS as documented in the
current Tumblr API docs.
---
 LICENSE                                       |  6 ++--
 README.rst                                    |  4 +--
 docs/content.rst                              |  6 ++--
 docs/faq.rst                                  |  4 +--
 docs/importer.rst                             | 10 +++----
 docs/index.rst                                |  2 +-
 docs/install.rst                              | 28 +++++++++----------
 docs/internals.rst                            |  2 +-
 docs/publish.rst                              |  2 +-
 docs/quickstart.rst                           |  4 +--
 docs/settings.rst                             |  6 ++--
 docs/themes.rst                               |  4 +--
 .../basic/a-markdown-powered-article.html     |  4 +--
 pelican/tests/output/basic/archives.html      |  4 +--
 pelican/tests/output/basic/article-1.html     |  4 +--
 pelican/tests/output/basic/article-2.html     |  4 +--
 pelican/tests/output/basic/article-3.html     |  4 +--
 .../output/basic/author/alexis-metaireau.html |  4 +--
 pelican/tests/output/basic/authors.html       |  4 +--
 pelican/tests/output/basic/categories.html    |  4 +--
 pelican/tests/output/basic/category/bar.html  |  4 +--
 pelican/tests/output/basic/category/cat1.html |  4 +--
 pelican/tests/output/basic/category/misc.html |  4 +--
 pelican/tests/output/basic/category/yeah.html |  4 +--
 .../output/basic/drafts/a-draft-article.html  |  4 +--
 .../basic/filename_metadata-example.html      |  4 +--
 pelican/tests/output/basic/index.html         |  4 +--
 pelican/tests/output/basic/oh-yeah.html       |  4 +--
 .../tests/output/basic/override/index.html    |  4 +--
 .../pages/this-is-a-test-hidden-page.html     |  4 +--
 .../basic/pages/this-is-a-test-page.html      |  4 +--
 .../tests/output/basic/second-article-fr.html |  4 +--
 .../tests/output/basic/second-article.html    |  4 +--
 pelican/tests/output/basic/tag/bar.html       |  4 +--
 pelican/tests/output/basic/tag/baz.html       |  4 +--
 pelican/tests/output/basic/tag/foo.html       |  4 +--
 pelican/tests/output/basic/tag/foobar.html    |  4 +--
 pelican/tests/output/basic/tag/oh.html        |  4 +--
 pelican/tests/output/basic/tag/yeah.html      |  4 +--
 pelican/tests/output/basic/tags.html          |  4 +--
 pelican/tests/output/basic/theme/css/main.css |  4 +--
 .../tests/output/basic/theme/css/reset.css    |  2 +-
 .../output/basic/this-is-a-super-article.html |  4 +--
 pelican/tests/output/basic/unbelievable.html  |  4 +--
 .../custom/a-markdown-powered-article.html    |  4 +--
 pelican/tests/output/custom/archives.html     |  4 +--
 pelican/tests/output/custom/article-1.html    |  4 +--
 pelican/tests/output/custom/article-2.html    |  4 +--
 pelican/tests/output/custom/article-3.html    |  4 +--
 .../custom/author/alexis-metaireau.html       |  4 +--
 .../custom/author/alexis-metaireau2.html      |  4 +--
 .../custom/author/alexis-metaireau3.html      |  4 +--
 pelican/tests/output/custom/authors.html      |  4 +--
 pelican/tests/output/custom/categories.html   |  4 +--
 pelican/tests/output/custom/category/bar.html |  4 +--
 .../tests/output/custom/category/cat1.html    |  4 +--
 .../tests/output/custom/category/misc.html    |  4 +--
 .../tests/output/custom/category/yeah.html    |  4 +--
 .../output/custom/drafts/a-draft-article.html |  4 +--
 .../custom/filename_metadata-example.html     |  4 +--
 pelican/tests/output/custom/index.html        |  4 +--
 pelican/tests/output/custom/index2.html       |  4 +--
 pelican/tests/output/custom/index3.html       |  4 +--
 .../tests/output/custom/jinja2_template.html  |  4 +--
 pelican/tests/output/custom/oh-yeah-fr.html   |  4 +--
 pelican/tests/output/custom/oh-yeah.html      |  4 +--
 .../tests/output/custom/override/index.html   |  4 +--
 .../pages/this-is-a-test-hidden-page.html     |  4 +--
 .../custom/pages/this-is-a-test-page.html     |  4 +--
 .../output/custom/second-article-fr.html      |  4 +--
 .../tests/output/custom/second-article.html   |  4 +--
 pelican/tests/output/custom/tag/bar.html      |  4 +--
 pelican/tests/output/custom/tag/baz.html      |  4 +--
 pelican/tests/output/custom/tag/foo.html      |  4 +--
 pelican/tests/output/custom/tag/foobar.html   |  4 +--
 pelican/tests/output/custom/tag/oh.html       |  4 +--
 pelican/tests/output/custom/tag/yeah.html     |  4 +--
 pelican/tests/output/custom/tags.html         |  4 +--
 .../tests/output/custom/theme/css/main.css    |  4 +--
 .../tests/output/custom/theme/css/reset.css   |  2 +-
 .../custom/this-is-a-super-article.html       |  4 +--
 pelican/tests/output/custom/unbelievable.html |  4 +--
 .../tests/output/custom_locale/archives.html  |  4 +--
 .../author/alexis-metaireau.html              |  4 +--
 .../author/alexis-metaireau2.html             |  4 +--
 .../author/alexis-metaireau3.html             |  4 +--
 .../tests/output/custom_locale/authors.html   |  4 +--
 .../output/custom_locale/categories.html      |  4 +--
 .../output/custom_locale/category/bar.html    |  4 +--
 .../output/custom_locale/category/cat1.html   |  4 +--
 .../output/custom_locale/category/misc.html   |  4 +--
 .../output/custom_locale/category/yeah.html   |  4 +--
 .../custom_locale/drafts/a-draft-article.html |  4 +--
 pelican/tests/output/custom_locale/index.html |  4 +--
 .../tests/output/custom_locale/index2.html    |  4 +--
 .../tests/output/custom_locale/index3.html    |  4 +--
 .../output/custom_locale/jinja2_template.html |  4 +--
 .../output/custom_locale/oh-yeah-fr.html      |  4 +--
 .../output/custom_locale/override/index.html  |  4 +--
 .../pages/this-is-a-test-hidden-page.html     |  4 +--
 .../pages/this-is-a-test-page.html            |  4 +--
 .../02/this-is-a-super-article/index.html     |  4 +--
 .../2010/octobre/15/unbelievable/index.html   |  4 +--
 .../posts/2010/octobre/20/oh-yeah/index.html  |  4 +--
 .../20/a-markdown-powered-article/index.html  |  4 +--
 .../2011/février/17/article-1/index.html      |  4 +--
 .../2011/février/17/article-2/index.html      |  4 +--
 .../2011/février/17/article-3/index.html      |  4 +--
 .../2012/février/29/second-article/index.html |  4 +--
 .../30/filename_metadata-example/index.html   |  4 +--
 .../custom_locale/second-article-fr.html      |  4 +--
 .../tests/output/custom_locale/tag/bar.html   |  4 +--
 .../tests/output/custom_locale/tag/baz.html   |  4 +--
 .../tests/output/custom_locale/tag/foo.html   |  4 +--
 .../output/custom_locale/tag/foobar.html      |  4 +--
 .../tests/output/custom_locale/tag/oh.html    |  4 +--
 .../tests/output/custom_locale/tag/yeah.html  |  4 +--
 pelican/tests/output/custom_locale/tags.html  |  4 +--
 .../output/custom_locale/theme/css/main.css   |  4 +--
 .../output/custom_locale/theme/css/reset.css  |  2 +-
 pelican/tests/test_pelican.py                 |  3 +-
 pelican/themes/notmyidea/static/css/main.css  |  4 +--
 pelican/themes/notmyidea/static/css/reset.css |  2 +-
 pelican/themes/notmyidea/templates/base.html  |  4 +--
 pelican/themes/simple/templates/base.html     |  4 +--
 pelican/tools/pelican_import.py               |  4 +--
 pelican/tools/pelican_quickstart.py           |  2 +-
 pelican/tools/templates/pelicanconf.py.jinja2 |  6 ++--
 128 files changed, 267 insertions(+), 266 deletions(-)

diff --git a/LICENSE b/LICENSE
index dba13ed2..c03a4e46 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://www.fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -658,4 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
diff --git a/README.rst b/README.rst
index 176dfce4..6f83188c 100644
--- a/README.rst
+++ b/README.rst
@@ -50,8 +50,8 @@ Why the name "Pelican"?
 .. _Python: https://www.python.org/
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Markdown: https://daringfireball.net/projects/markdown/
-.. _Jinja2: http://jinja.pocoo.org/
-.. _Pygments: http://pygments.org/
+.. _Jinja2: https://palletsprojects.com/p/jinja/
+.. _Pygments: https://pygments.org/
 .. _`Pelican's documentation`: https://docs.getpelican.com/
 .. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html
 .. _`hosted on GitHub`: https://github.com/getpelican/pelican
diff --git a/docs/content.rst b/docs/content.rst
index c51e5e66..a52425a4 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -524,7 +524,7 @@ indenting both the identifier and the code::
         print("The path-less shebang syntax *will* show line numbers.")
 
 The specified identifier (e.g. ``python``, ``ruby``) should be one that
-appears on the `list of available lexers <http://pygments.org/docs/lexers/>`_.
+appears on the `list of available lexers <https://pygments.org/docs/lexers/>`_.
 
 When using reStructuredText the following options are available in the
 code-block directive:
@@ -565,7 +565,7 @@ tagurlformat    string        format for the ctag links.
 
 Note that, depending on the version, your Pygments module might not have
 all of these options available. Refer to the *HtmlFormatter* section of the
-`Pygments documentation <http://pygments.org/docs/formatters/>`_ for more
+`Pygments documentation <https://pygments.org/docs/formatters/>`_ for more
 details on each of the options.
 
 For example, the following code block enables line numbers, starting at 153,
@@ -611,7 +611,7 @@ To publish a post when the default status is ``draft``, update the post's
 metadata to include ``Status: published``.
 
 .. _W3C ISO 8601: https://www.w3.org/TR/NOTE-datetime
-.. _AsciiDoc: http://www.methods.co.nz/asciidoc/
+.. _AsciiDoc: https://www.methods.co.nz/asciidoc/
 .. _pelican-plugins: https://github.com/getpelican/pelican-plugins
 .. _Markdown Extensions: https://python-markdown.github.io/extensions/
 .. _CodeHilite extension: https://python-markdown.github.io/extensions/code_hilite/#syntax
diff --git a/docs/faq.rst b/docs/faq.rst
index d469f386..bfe51ec0 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -48,7 +48,7 @@ themes to style code syntax highlighting via CSS. Specifically, you can
 customize the appearance of your syntax highlighting via the ``.highlight pre``
 class in your theme's CSS file. To see how various styles can be used to render
 Django code, for example, use the style selector drop-down at top-right on the
-`Pygments project demo site <http://pygments.org/demo/>`_.
+`Pygments project demo site <https://pygments.org/demo/>`_.
 
 You can use the following example commands to generate a starting CSS file from
 a Pygments built-in style (in this case, "monokai") and then copy the generated
@@ -167,7 +167,7 @@ I'm getting a warning about feeds generated without SITEURL being set properly
 ==============================================================================
 
 `RSS and Atom feeds require all URL links to be absolute
-<http://validator.w3.org/feed/docs/rss2.html#comments>`_. In order to properly
+<https://validator.w3.org/feed/docs/rss2.html#comments>`_. In order to properly
 generate links in Pelican you will need to set ``SITEURL`` to the full path of
 your site.
 
diff --git a/docs/importer.rst b/docs/importer.rst
index 674dd9b1..88588d17 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -39,8 +39,8 @@ Dependencies
 - *Pandoc*, see the `Pandoc site`_ for installation instructions on your
   operating system.
 
-.. _Pandoc: http://johnmacfarlane.net/pandoc/
-.. _Pandoc site: http://johnmacfarlane.net/pandoc/installing.html
+.. _Pandoc: https://pandoc.org/
+.. _Pandoc site: https://pandoc.org/installing.html
 
 
 Usage
@@ -58,7 +58,7 @@ Positional arguments
   =============         ============================================================================
   ``input``             The input file to read
   ``api_token``         (Posterous only) api_token can be obtained from http://posterous.com/api/
-  ``api_key``           (Tumblr only) api_key can be obtained from http://www.tumblr.com/oauth/apps
+  ``api_key``           (Tumblr only) api_key can be obtained from https://www.tumblr.com/oauth/apps
   =============         ============================================================================
 
 Optional arguments
@@ -137,7 +137,7 @@ Tests
 
 To test the module, one can use sample files:
 
-- for WordPress: http://www.wpbeginner.com/wp-themes/how-to-add-dummy-content-for-theme-development-in-wordpress/
+- for WordPress: https://www.wpbeginner.com/wp-themes/how-to-add-dummy-content-for-theme-development-in-wordpress/
 - for Dotclear: http://media.dotaddict.org/tda/downloads/lorem-backup.txt
 
-.. _more_categories: http://github.com/getpelican/pelican-plugins/tree/master/more_categories
\ No newline at end of file
+.. _more_categories: https://github.com/getpelican/pelican-plugins/tree/master/more_categories
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
index 678732d8..4cbe41ae 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -79,7 +79,7 @@ Documentation
 .. _Python: https://www.python.org/
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
 .. _Markdown: https://daringfireball.net/projects/markdown/
-.. _Jinja2: http://jinja.pocoo.org/
+.. _Jinja2: https://palletsprojects.com/p/jinja/
 .. _`Pelican documentation`: https://docs.getpelican.com/latest/
 .. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html
 .. _`Pelican plugins`: https://github.com/getpelican/pelican-plugins
diff --git a/docs/install.rst b/docs/install.rst
index d683ed8f..03480e79 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -5,7 +5,7 @@ Pelican currently runs best on Python 2.7.x and 3.5+; earlier versions of
 Python are not supported.
 
 You can install Pelican via several different methods. The simplest is via
-`pip <http://www.pip-installer.org/>`_::
+`pip <https://pip.pypa.io/en/stable/>`_::
 
     pip install pelican
 
@@ -43,7 +43,7 @@ options. For more detail, refer to the :doc:`Publish<publish>` section.
 Optional packages
 -----------------
 
-If you plan on using `Markdown <http://pypi.python.org/pypi/Markdown>`_ as a
+If you plan on using `Markdown <https://pypi.org/project/Markdown/>`_ as a
 markup format, you can install Pelican with Markdown support::
 
    pip install pelican[Markdown]
@@ -53,7 +53,7 @@ Or you might need to install it a posteriori::
     pip install Markdown
 
 Typographical enhancements can be enabled in your settings file, but first the
-requisite `Typogrify <http://pypi.python.org/pypi/typogrify>`_ library must be
+requisite `Typogrify <https://pypi.org/project/typogrify/>`_ library must be
 installed::
 
     pip install typogrify
@@ -64,22 +64,22 @@ Dependencies
 When Pelican is installed, the following dependent Python packages should be
 automatically installed without any action on your part:
 
-* `feedgenerator <http://pypi.python.org/pypi/feedgenerator>`_, to generate the
+* `feedgenerator <https://pypi.org/project/feedgenerator/>`_, to generate the
   Atom feeds
-* `jinja2 <http://pypi.python.org/pypi/Jinja2>`_, for templating support
-* `pygments <http://pypi.python.org/pypi/Pygments>`_, for syntax highlighting
-* `docutils <http://pypi.python.org/pypi/docutils>`_, for supporting
+* `jinja2 <https://pypi.org/project/Jinja2/>`_, for templating support
+* `pygments <https://pypi.org/project/Pygments/>`_, for syntax highlighting
+* `docutils <https://pypi.org/project/docutils/>`_, for supporting
   reStructuredText as an input format
-* `pytz <http://pypi.python.org/pypi/pytz>`_, for timezone definitions
-* `blinker <http://pypi.python.org/pypi/blinker>`_, an object-to-object and
+* `pytz <https://pypi.org/project/pytz/>`_, for timezone definitions
+* `blinker <https://pypi.org/project/blinker/>`_, an object-to-object and
   broadcast signaling system
-* `unidecode <http://pypi.python.org/pypi/Unidecode>`_, for ASCII
+* `unidecode <https://pypi.org/project/Unidecode/>`_, for ASCII
   transliterations of Unicode text
-* `six <http://pypi.python.org/pypi/six>`_,  for Python 2 and 3 compatibility
+* `six <https://pypi.org/project/six/>`_,  for Python 2 and 3 compatibility
   utilities
-* `MarkupSafe <http://pypi.python.org/pypi/MarkupSafe>`_, for a markup safe
+* `MarkupSafe <https://pypi.org/project/MarkupSafe/>`_, for a markup safe
   string implementation
-* `python-dateutil <https://pypi.python.org/pypi/python-dateutil>`_, to read
+* `python-dateutil <https://pypi.org/project/python-dateutil/>`_, to read
   the date metadata
 
 Upgrading
@@ -126,4 +126,4 @@ content)::
 The next step is to begin to adding content to the *content* folder that has
 been created for you.
 
-.. _virtualenv: http://www.virtualenv.org/
+.. _virtualenv: https://virtualenv.pypa.io/en/latest/
diff --git a/docs/internals.rst b/docs/internals.rst
index e8d35148..5b41070e 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -32,7 +32,7 @@ The logic is separated into different classes and concepts:
   inputs.
 
 * Pelican also uses templates, so it's easy to write your own theme. The
-  syntax is `Jinja2 <http://jinja.pocoo.org/>`_ and is very easy to learn, so
+  syntax is `Jinja2 <https://palletsprojects.com/p/jinja/>`_ and is very easy to learn, so
   don't hesitate to jump in and build your own theme.
 
 How to implement a new reader?
diff --git a/docs/publish.rst b/docs/publish.rst
index 489558d8..9bea8938 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -207,4 +207,4 @@ That's it! Your site should now be live.
 executables, such as ``python3``, you can set the ``PY`` and ``PELICAN``
 environment variables, respectively, to override the default executable names.)
 
-.. _Invoke: http://www.pyinvoke.org
+.. _Invoke: https://www.pyinvoke.org/
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 484a318f..1f6358a7 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -30,7 +30,7 @@ by asking some questions about your site::
 For questions that have default values denoted in brackets, feel free to use
 the Return key to accept those default values [#tzlocal_fn]_. When asked for
 your URL prefix, enter your domain name as indicated (e.g.,
-``http://example.com``).
+``https://example.com``).
 
 Create an article
 -----------------
@@ -78,5 +78,5 @@ Footnotes
 ---------
 
 .. [#tzlocal_fn] You can help localize default fields by installing the
-                 optional `tzlocal <https://pypi.python.org/pypi/tzlocal>`_
+                 optional `tzlocal <https://pypi.org/project/tzlocal/>`_
                  module.
diff --git a/docs/settings.rst b/docs/settings.rst
index 51caad28..9ebf85c2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -709,7 +709,7 @@ Time and Date
 
 .. [#] Default is the system locale.
 
-.. _locales on Windows: http://msdn.microsoft.com/en-us/library/cdax410z%28VS.71%29.aspx
+.. _locales on Windows: https://www.microsoft.com/en-us/download/details.aspx?id=55979
 
 .. _locale(1): https://linux.die.net/man/1/locale
 
@@ -1357,6 +1357,6 @@ Example settings
     :language: python
 
 
-.. _Jinja custom filters documentation: http://jinja.pocoo.org/docs/api/#custom-filters
-.. _Jinja Environment documentation: http://jinja.pocoo.org/docs/dev/api/#jinja2.Environment
+.. _Jinja custom filters documentation: https://jinja.palletsprojects.com/en/master/api/#custom-filters
+.. _Jinja Environment documentation: https://jinja.palletsprojects.com/en/master/api/#jinja2.Environment
 .. _Docutils Configuration: http://docutils.sourceforge.net/docs/user/config.html
diff --git a/docs/themes.rst b/docs/themes.rst
index ea9214fe..a2332615 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -4,7 +4,7 @@ Creating themes
 ###############
 
 To generate its HTML output, Pelican uses the `Jinja
-<http://jinja.pocoo.org/>`_ templating engine due to its flexibility and
+<https://palletsprojects.com/p/jinja/>`_ templating engine due to its flexibility and
 straightforward syntax. If you want to create your own theme, feel free to take
 inspiration from the `"simple" theme
 <https://github.com/getpelican/pelican/tree/master/pelican/themes/simple/templates>`_.
@@ -104,7 +104,7 @@ that allow them to be easily sorted by name::
 If you want to sort based on different criteria, `Jinja's sort command`__ has a
 number of options.
 
-__ http://jinja.pocoo.org/docs/templates/#sort
+__ https://jinja.palletsprojects.com/en/master/templates/#sort
 
 
 Date Formatting
diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 9053d5fe..e08cabd8 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -55,10 +55,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index dcebef2c..79ad0452 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -58,10 +58,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 758ddf06..71449b0b 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -54,10 +54,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 40d2cefd..159eda1d 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -54,10 +54,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 1ef6b651..4c92c35b 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -54,10 +54,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index aa19e421..0a1c5e56 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -98,10 +98,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index c2b695c0..1aad3027 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -40,10 +40,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 934c224b..ecaf5669 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -39,10 +39,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 2d327f5f..a4cafcaf 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -54,10 +54,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 9d8a8883..bc45f1fe 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -113,10 +113,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 0542dba1..aaa35f6d 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -124,10 +124,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 2621e587..d0fd9130 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -64,10 +64,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index 7fe1b180..081c2e75 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -55,10 +55,10 @@ listed anywhere else.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 98930240..7203e648 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -54,10 +54,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 5b037545..092a4d30 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -261,10 +261,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index df378418..dba8b114 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -62,10 +62,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 3b45f9e0..8084f9b4 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -39,10 +39,10 @@ at a custom location.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 6e1bd4eb..898550bc 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -39,10 +39,10 @@ Anyone can see this page but it's not linked to anywhere!</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index ed9bce91..710f22b4 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -39,10 +39,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 1e5f1ef9..689c3373 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -58,10 +58,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 4485e9f8..784fdc9b 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -58,10 +58,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 7e977f0e..0227a65e 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -110,10 +110,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 48a11061..761d5b3d 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -54,10 +54,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index aad78781..7f1d586b 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -82,10 +82,10 @@ as well as <strong>inline markup</strong>.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index cc72782c..e558f4c2 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -64,10 +64,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index 0993e43e..d1f44c07 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -38,10 +38,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 49d1616d..6130eff8 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -54,10 +54,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index afcd2bab..3d8d45c3 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -45,10 +45,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 5feb71ce..63f5adc0 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -3,8 +3,8 @@
 	Date: July 2009
 	Description: Sample layout for HTML5 and CSS3 goodness.
 	Version: 1.0
-	License: MIT <http://opensource.org/licenses/MIT>
-	Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+	License: MIT <https://opensource.org/licenses/MIT>
+	Licensed by: Smashing Media GmbH <https://www.smashingmagazine.com/>
 	Original author: Enrique Ramírez <http://enrique-ramirez.com/>
 */
 
diff --git a/pelican/tests/output/basic/theme/css/reset.css b/pelican/tests/output/basic/theme/css/reset.css
index 1e217566..c88e6196 100644
--- a/pelican/tests/output/basic/theme/css/reset.css
+++ b/pelican/tests/output/basic/theme/css/reset.css
@@ -2,7 +2,7 @@
 	Name: Reset Stylesheet
 	Description: Resets browser's default CSS
 	Author: Eric Meyer
-	Author URI: http://meyerweb.com/eric/tools/css/reset/
+	Author URI: https://meyerweb.com/eric/tools/css/reset/
 */
 
 /* v1.0 | 20080212 */
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 5e6f1365..aed2ab39 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -72,10 +72,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 857b1dc1..518781eb 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -86,10 +86,10 @@ pelican.conf, it will have nothing in default.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 5c416f2f..e5fda57c 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -92,10 +92,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index ba2585cc..112f3295 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -77,10 +77,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 0a837e4a..0d5ef486 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -91,10 +91,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index abe47edc..70e68d37 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -91,10 +91,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 5017aa2f..cd6b025e 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -91,10 +91,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index ea7b44ad..635a18b1 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -150,10 +150,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 52570882..a76b1af4 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -164,10 +164,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 4eed4443..0c5bc517 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -115,10 +115,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index dad0c239..ec10a2f4 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -59,10 +59,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 0ab16b05..660ecd09 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -58,10 +58,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index eaddbb76..fa8bfd75 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -75,10 +75,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 5ef75144..18939824 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -144,10 +144,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index c0af7513..e636d7ea 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -155,10 +155,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 5c5af7af..72136b59 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -83,10 +83,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index b53e2243..761f9ae6 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -77,10 +77,10 @@ listed anywhere else.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index dec94688..fec79833 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -91,10 +91,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 465d4414..99c4f45a 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -150,10 +150,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index f52583ce..cf49e960 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -164,10 +164,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 7530e0f2..d5c2ff33 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -115,10 +115,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 8e7e6836..05ec898b 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -54,10 +54,10 @@ Some text
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 9d1a317d..8e3b7fe4 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -95,10 +95,10 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 1bdf4791..a6f1fe51 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -100,10 +100,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 543aa8a3..14ad77d0 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -58,10 +58,10 @@ at a custom location.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 19f5cd2c..64be472b 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -58,10 +58,10 @@ Anyone can see this page but it's not linked to anywhere!</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 78dc57fc..60553949 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -58,10 +58,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 16273abd..397f5aa0 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -95,10 +95,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 68a814f4..1c9de4bc 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -95,10 +95,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 2723cef9..3fe34b56 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -134,10 +134,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 9fc3ee2c..10e1edbc 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -91,10 +91,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 9c117c9e..bbb0f07a 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -104,10 +104,10 @@ as well as <strong>inline markup</strong>.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 97c8bfbb..791aea61 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -83,10 +83,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 0aa17d98..3dcb94ea 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -57,10 +57,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index d73e6adb..ba0b46c3 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -75,10 +75,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index e8d8e6de..a5e0ccae 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -64,10 +64,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 5feb71ce..63f5adc0 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -3,8 +3,8 @@
 	Date: July 2009
 	Description: Sample layout for HTML5 and CSS3 goodness.
 	Version: 1.0
-	License: MIT <http://opensource.org/licenses/MIT>
-	Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+	License: MIT <https://opensource.org/licenses/MIT>
+	Licensed by: Smashing Media GmbH <https://www.smashingmagazine.com/>
 	Original author: Enrique Ramírez <http://enrique-ramirez.com/>
 */
 
diff --git a/pelican/tests/output/custom/theme/css/reset.css b/pelican/tests/output/custom/theme/css/reset.css
index 1e217566..c88e6196 100644
--- a/pelican/tests/output/custom/theme/css/reset.css
+++ b/pelican/tests/output/custom/theme/css/reset.css
@@ -2,7 +2,7 @@
 	Name: Reset Stylesheet
 	Description: Resets browser's default CSS
 	Author: Eric Meyer
-	Author URI: http://meyerweb.com/eric/tools/css/reset/
+	Author URI: https://meyerweb.com/eric/tools/css/reset/
 */
 
 /* v1.0 | 20080212 */
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index e38291e6..756eaaf7 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -106,10 +106,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index b85f9e1f..bdb1b78e 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -123,10 +123,10 @@ pelican.conf, it will have nothing in default.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index 46450fa2..8c7ab3b2 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -77,10 +77,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index c21a11ee..115368cf 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -150,10 +150,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 5ec65bac..b71ca66a 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -164,10 +164,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index e495b4c8..8b036b4a 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -115,10 +115,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index 0baa4e2a..d83483b0 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -59,10 +59,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index a9ca139a..6fb39807 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -58,10 +58,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index d2cc2214..8c850fc9 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -75,10 +75,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index aec43346..d779a54c 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -144,10 +144,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 4e31e817..b02ea22d 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -155,10 +155,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 76dd1936..11d38359 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -83,10 +83,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 97d54561..6e159d8d 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -77,10 +77,10 @@ listed anywhere else.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index b56a6b8c..f3d2b884 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -150,10 +150,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 0fde251d..208e981f 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -164,10 +164,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 62dea214..166ac232 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -115,10 +115,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index 2d1032e1..aa170b50 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -54,10 +54,10 @@ Some text
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 1ecd77b6..b4b08837 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -95,10 +95,10 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index 74bb4abe..c2e37b8c 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -58,10 +58,10 @@ at a custom location.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index 9af27061..02ba844d 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -58,10 +58,10 @@ Anyone can see this page but it's not linked to anywhere!</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index 96f51396..8c551610 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -58,10 +58,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index b7cdd47c..8c78085f 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -106,10 +106,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 13f79258..433d52d5 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -123,10 +123,10 @@ pelican.conf, it will have nothing in default.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index 91acf1a8..aaad3336 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -100,10 +100,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 92449abd..f90a188f 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -92,10 +92,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index 16532ac0..40ac6a69 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -91,10 +91,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index 46445d8a..c3c4f548 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -91,10 +91,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index e87bcbd1..9c940441 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -91,10 +91,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index c5790ae2..53d7881f 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -95,10 +95,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index c97160d4..a359e870 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -91,10 +91,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 33e10b19..1b5149a7 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -95,10 +95,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index 0d49090f..58187269 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -134,10 +134,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 53b8156d..7eb50abe 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -91,10 +91,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index f85ae34d..1a3a1a19 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -104,10 +104,10 @@ as well as <strong>inline markup</strong>.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 8ca76c78..006bead9 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -83,10 +83,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index a41e43f7..7f552c02 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -57,10 +57,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index fb0f2eb1..d91a533e 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -75,10 +75,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index 92f6615c..aa08ee30 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -64,10 +64,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
index 5feb71ce..63f5adc0 100644
--- a/pelican/tests/output/custom_locale/theme/css/main.css
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -3,8 +3,8 @@
 	Date: July 2009
 	Description: Sample layout for HTML5 and CSS3 goodness.
 	Version: 1.0
-	License: MIT <http://opensource.org/licenses/MIT>
-	Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+	License: MIT <https://opensource.org/licenses/MIT>
+	Licensed by: Smashing Media GmbH <https://www.smashingmagazine.com/>
 	Original author: Enrique Ramírez <http://enrique-ramirez.com/>
 */
 
diff --git a/pelican/tests/output/custom_locale/theme/css/reset.css b/pelican/tests/output/custom_locale/theme/css/reset.css
index 1e217566..c88e6196 100644
--- a/pelican/tests/output/custom_locale/theme/css/reset.css
+++ b/pelican/tests/output/custom_locale/theme/css/reset.css
@@ -2,7 +2,7 @@
 	Name: Reset Stylesheet
 	Description: Resets browser's default CSS
 	Author: Eric Meyer
-	Author URI: http://meyerweb.com/eric/tools/css/reset/
+	Author URI: https://meyerweb.com/eric/tools/css/reset/
 */
 
 /* v1.0 | 20080212 */
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 2c7a77be..da23cb0a 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -68,6 +68,7 @@ class TestPelican(LoggedTestCase):
             # Work around for running tests on Windows
             for msg in [
                     "LF will be replaced by CRLF",
+                    "CRLF will be replaced by LF",
                     "The file will have its original line endings"]:
                 if msg in line:
                     return True
@@ -117,7 +118,7 @@ class TestPelican(LoggedTestCase):
             'PATH': INPUT_PATH,
             'OUTPUT_PATH': self.temp_path,
             'CACHE_PATH': self.temp_cache,
-            'LOCALE': locale.normalize('en_US'),
+            'LOCALE': locale.normalize('en_US.UTF-8'),
         })
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 5feb71ce..63f5adc0 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -3,8 +3,8 @@
 	Date: July 2009
 	Description: Sample layout for HTML5 and CSS3 goodness.
 	Version: 1.0
-	License: MIT <http://opensource.org/licenses/MIT>
-	Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+	License: MIT <https://opensource.org/licenses/MIT>
+	Licensed by: Smashing Media GmbH <https://www.smashingmagazine.com/>
 	Original author: Enrique Ramírez <http://enrique-ramirez.com/>
 */
 
diff --git a/pelican/themes/notmyidea/static/css/reset.css b/pelican/themes/notmyidea/static/css/reset.css
index 1e217566..c88e6196 100644
--- a/pelican/themes/notmyidea/static/css/reset.css
+++ b/pelican/themes/notmyidea/static/css/reset.css
@@ -2,7 +2,7 @@
 	Name: Reset Stylesheet
 	Description: Resets browser's default CSS
 	Author: Eric Meyer
-	Author URI: http://meyerweb.com/eric/tools/css/reset/
+	Author URI: https://meyerweb.com/eric/tools/css/reset/
 */
 
 /* v1.0 | 20080212 */
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 2de43b46..a5fb5be8 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -67,10 +67,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 {% include 'analytics.html' %}
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 4fde8de5..29bbeb27 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -54,8 +54,8 @@
         {% endblock %}
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 21122eb1..335f1953 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -437,7 +437,7 @@ def tumblr2fields(api_key, blogname):
     import urllib.request as urllib_request
 
     def get_tumblr_posts(api_key, blogname, offset=0):
-        url = ("http://api.tumblr.com/v2/blog/%s.tumblr.com/"
+        url = ("https://api.tumblr.com/v2/blog/%s.tumblr.com/"
                "posts?api_key=%s&offset=%d&filter=raw") % (
             blogname, api_key, offset)
         request = urllib_request.Request(url)
@@ -607,7 +607,7 @@ def get_out_filename(output_path, filename, ext, kind,
     filename = os.path.basename(filename)
 
     # Enforce filename restrictions for various filesystems at once; see
-    # http://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
+    # https://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
     # we do not need to filter words because an extension will be appended
     filename = re.sub(r'[<>:"/\\|?*^% ]', '-', filename)  # invalid chars
     filename = filename.lstrip('.')  # should not start with a dot
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 5a622365..2e0e2399 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -70,7 +70,7 @@ CONF = {
 }
 
 # url for list of valid timezones
-_TZ_URL = 'http://en.wikipedia.org/wiki/List_of_tz_database_time_zones'
+_TZ_URL = 'https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'
 
 
 # Create a 'marked' default path, to determine if someone has supplied
diff --git a/pelican/tools/templates/pelicanconf.py.jinja2 b/pelican/tools/templates/pelicanconf.py.jinja2
index 62939b6a..4ba0208c 100644
--- a/pelican/tools/templates/pelicanconf.py.jinja2
+++ b/pelican/tools/templates/pelicanconf.py.jinja2
@@ -19,9 +19,9 @@ AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None
 
 # Blogroll
-LINKS = (('Pelican', 'http://getpelican.com/'),
-         ('Python.org', 'http://python.org/'),
-         ('Jinja2', 'http://jinja.pocoo.org/'),
+LINKS = (('Pelican', 'https://getpelican.com/'),
+         ('Python.org', 'https://www.python.org/'),
+         ('Jinja2', 'https://palletsprojects.com/p/jinja/'),
          ('You can modify those links in your config file', '#'),)
 
 # Social widget

From 212742a56f66bc6636961e0295391ad3285be159 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 16:21:08 +0200
Subject: [PATCH 2276/2864] Ensure consistent title spacing in themes

Moving the space between the title and sub-title inside the "if"
statement eliminates a spurious trailing space when there is no
sub-title defined.
---
 pelican/themes/notmyidea/templates/base.html | 2 +-
 pelican/themes/simple/templates/base.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index a5fb5be8..66ec83ab 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -16,7 +16,7 @@
 <body id="index" class="home">
 {% include 'github.html' %}
         <header id="banner" class="body">
-                <h1><a href="{{ SITEURL }}/">{{ SITENAME }} {% if SITESUBTITLE %}<strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
+                <h1><a href="{{ SITEURL }}/">{{ SITENAME }}{% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
                 <nav><ul>
                 {% for title, link in MENUITEMS %}
                     <li><a href="{{ link }}">{{ title }}</a></li>
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 29bbeb27..9a97c254 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -33,7 +33,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="{{ SITEURL }}/">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
+                <h1><a href="{{ SITEURL }}/">{{ SITENAME }}{% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
         {% for title, link in MENUITEMS %}

From e2bbfcb0880988bdfc5985f059cbf6b7a1c85a1c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 15:52:01 +0200
Subject: [PATCH 2277/2864] Pin Pygments to 2.6.1

---
 pyproject.toml        | 2 +-
 requirements/test.pip | 1 +
 tox.ini               | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index cf79a74e..b09ab021 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,7 @@ classifiers = [
 python = "^3.5"
 feedgenerator = "^1.9"
 jinja2 = "~2.10.1"
-pygments = "^2.4"
+pygments = "~2.6.1"
 pytz = "^2019.1"
 blinker = "^1.4"
 unidecode = "^1.1"
diff --git a/requirements/test.pip b/requirements/test.pip
index 25ab14ea..d9d91914 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,4 +1,5 @@
 # Tests
+Pygments==2.6.1
 mock
 pytest==5.3.5
 pytest-cov
diff --git a/tox.ini b/tox.ini
index cf8b150a..ed025c25 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,6 @@ passenv = *
 usedevelop=True
 deps =
     -rrequirements/test.pip
-    pygments==2.1.3
 
 commands =
     {envpython} --version

From 6cef4ead88ba2510544fc3e57b1c1061fd4a9c6e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 16:03:13 +0200
Subject: [PATCH 2278/2864] Increase Jinja version minimum to 2.11+

This newer version slightly changes rendered output; upgrading our
dependency means our functional test output will match it more
consistently.
---
 pyproject.toml | 2 +-
 setup.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index b09ab021..f7876002 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,7 +29,7 @@ classifiers = [
 [tool.poetry.dependencies]
 python = "^3.5"
 feedgenerator = "^1.9"
-jinja2 = "~2.10.1"
+jinja2 = "~2.11"
 pygments = "~2.6.1"
 pytz = "^2019.1"
 blinker = "^1.4"
diff --git a/setup.py b/setup.py
index dc1cc527..571b1c5e 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ from setuptools import setup
 
 version = "4.2.0"
 
-requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
+requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.11', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',
             'python-dateutil']
 

From 9a0a08f460c784053b113a8de709eb4b1bdb6b80 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 06:31:16 +0200
Subject: [PATCH 2279/2864] Update functional test output

---
 pelican/tests/output/basic/a-markdown-powered-article.html    | 2 +-
 pelican/tests/output/basic/archives.html                      | 2 +-
 pelican/tests/output/basic/article-1.html                     | 2 +-
 pelican/tests/output/basic/article-2.html                     | 2 +-
 pelican/tests/output/basic/article-3.html                     | 2 +-
 pelican/tests/output/basic/author/alexis-metaireau.html       | 2 +-
 pelican/tests/output/basic/authors.html                       | 2 +-
 pelican/tests/output/basic/categories.html                    | 2 +-
 pelican/tests/output/basic/category/bar.html                  | 2 +-
 pelican/tests/output/basic/category/cat1.html                 | 2 +-
 pelican/tests/output/basic/category/misc.html                 | 2 +-
 pelican/tests/output/basic/category/yeah.html                 | 2 +-
 pelican/tests/output/basic/drafts/a-draft-article.html        | 2 +-
 pelican/tests/output/basic/feeds/all-en.atom.xml              | 2 +-
 pelican/tests/output/basic/feeds/all.atom.xml                 | 2 +-
 pelican/tests/output/basic/feeds/misc.atom.xml                | 2 +-
 pelican/tests/output/basic/filename_metadata-example.html     | 2 +-
 pelican/tests/output/basic/index.html                         | 2 +-
 pelican/tests/output/basic/oh-yeah.html                       | 2 +-
 pelican/tests/output/basic/override/index.html                | 2 +-
 .../tests/output/basic/pages/this-is-a-test-hidden-page.html  | 2 +-
 pelican/tests/output/basic/pages/this-is-a-test-page.html     | 2 +-
 pelican/tests/output/basic/second-article-fr.html             | 2 +-
 pelican/tests/output/basic/second-article.html                | 2 +-
 pelican/tests/output/basic/tag/bar.html                       | 2 +-
 pelican/tests/output/basic/tag/baz.html                       | 2 +-
 pelican/tests/output/basic/tag/foo.html                       | 2 +-
 pelican/tests/output/basic/tag/foobar.html                    | 2 +-
 pelican/tests/output/basic/tag/oh.html                        | 2 +-
 pelican/tests/output/basic/tag/yeah.html                      | 2 +-
 pelican/tests/output/basic/tags.html                          | 2 +-
 pelican/tests/output/basic/this-is-a-super-article.html       | 2 +-
 pelican/tests/output/basic/unbelievable.html                  | 4 ++--
 pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml   | 2 +-
 pelican/tests/output/custom/feeds/all-en.atom.xml             | 2 +-
 pelican/tests/output/custom/feeds/all.atom.xml                | 2 +-
 pelican/tests/output/custom/feeds/misc.atom.xml               | 2 +-
 pelican/tests/output/custom/unbelievable.html                 | 2 +-
 pelican/tests/output/custom_locale/archives.html              | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau.html   | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau2.html  | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau3.html  | 2 +-
 pelican/tests/output/custom_locale/authors.html               | 2 +-
 pelican/tests/output/custom_locale/categories.html            | 2 +-
 pelican/tests/output/custom_locale/category/bar.html          | 2 +-
 pelican/tests/output/custom_locale/category/cat1.html         | 2 +-
 pelican/tests/output/custom_locale/category/misc.html         | 2 +-
 pelican/tests/output/custom_locale/category/yeah.html         | 2 +-
 .../tests/output/custom_locale/drafts/a-draft-article.html    | 2 +-
 .../output/custom_locale/feeds/alexis-metaireau.atom.xml      | 2 +-
 pelican/tests/output/custom_locale/feeds/all-en.atom.xml      | 2 +-
 pelican/tests/output/custom_locale/feeds/all.atom.xml         | 2 +-
 pelican/tests/output/custom_locale/feeds/misc.atom.xml        | 2 +-
 pelican/tests/output/custom_locale/index.html                 | 2 +-
 pelican/tests/output/custom_locale/index2.html                | 2 +-
 pelican/tests/output/custom_locale/index3.html                | 2 +-
 pelican/tests/output/custom_locale/jinja2_template.html       | 2 +-
 pelican/tests/output/custom_locale/oh-yeah-fr.html            | 2 +-
 pelican/tests/output/custom_locale/override/index.html        | 2 +-
 .../custom_locale/pages/this-is-a-test-hidden-page.html       | 2 +-
 .../tests/output/custom_locale/pages/this-is-a-test-page.html | 2 +-
 .../posts/2010/décembre/02/this-is-a-super-article/index.html | 2 +-
 .../posts/2010/octobre/15/unbelievable/index.html             | 4 ++--
 .../custom_locale/posts/2010/octobre/20/oh-yeah/index.html    | 2 +-
 .../posts/2011/avril/20/a-markdown-powered-article/index.html | 2 +-
 .../custom_locale/posts/2011/février/17/article-1/index.html  | 2 +-
 .../custom_locale/posts/2011/février/17/article-2/index.html  | 2 +-
 .../custom_locale/posts/2011/février/17/article-3/index.html  | 2 +-
 .../posts/2012/février/29/second-article/index.html           | 2 +-
 .../2012/novembre/30/filename_metadata-example/index.html     | 2 +-
 pelican/tests/output/custom_locale/second-article-fr.html     | 2 +-
 pelican/tests/output/custom_locale/tag/bar.html               | 2 +-
 pelican/tests/output/custom_locale/tag/baz.html               | 2 +-
 pelican/tests/output/custom_locale/tag/foo.html               | 2 +-
 pelican/tests/output/custom_locale/tag/foobar.html            | 2 +-
 pelican/tests/output/custom_locale/tag/oh.html                | 2 +-
 pelican/tests/output/custom_locale/tag/yeah.html              | 2 +-
 pelican/tests/output/custom_locale/tags.html                  | 2 +-
 78 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index e08cabd8..400a639a 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 79ad0452..198283e0 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 71449b0b..c4a1a8b8 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 159eda1d..cb929284 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 4c92c35b..1773e313 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 0a1c5e56..b2c1188c 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index 1aad3027..858934c7 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index ecaf5669..1697927f 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index a4cafcaf..80d9ffb1 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index bc45f1fe..3864f311 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index aaa35f6d..2f045b0d 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index d0fd9130..1de9c0c5 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index 081c2e75..e8f337e3 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 561b7484..f59ea651 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index d75aca63..f69c8bb4 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -56,7 +56,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index b9129ef7..a8243b48 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 7203e648..a95dd788 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 092a4d30..440685bf 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index dba8b114..e972965a 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 8084f9b4..b2bcb3d4 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li class="active"><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 898550bc..50822c25 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index 710f22b4..dfc6136a 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 689c3373..2bbb3ba6 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -11,7 +11,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 784fdc9b..ab8e6169 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -11,7 +11,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 0227a65e..29698080 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 761d5b3d..f8830eeb 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 7f1d586b..d02252f9 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index e558f4c2..2b60ff32 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index d1f44c07..56e6059b 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li class="active"><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 6130eff8..6908eb9e 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index 3d8d45c3..ad54a9d8 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index aed2ab39..102cffb1 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 518781eb..3f6df318 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -9,7 +9,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog </a></h1>
+                <h1><a href="/">A Pelican Blog</a></h1>
                 <nav><ul>
                     <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="/override/">Override url/save_as</a></li>
@@ -54,7 +54,7 @@ pelican.conf, it will have nothing in default.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index 3e2f201d..19b706e8 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index ba66f3be..15ec3903 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 3c6a76cb..5d5d5461 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -57,7 +57,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index e5bd7e86..325e4c01 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index bdb1b78e..c7ed5d81 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -61,7 +61,7 @@ pelican.conf, it will have nothing in default.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index 8c7ab3b2..1750c871 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 115368cf..914997a6 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index b71ca66a..ac75e9e7 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 8b036b4a..d46b2ca8 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index d83483b0..2e619a5d 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 6fb39807..dcaac82a 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index 8c850fc9..de6d98a2 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index d779a54c..35623225 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index b02ea22d..eeb42aa2 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 11d38359..9ffd3172 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 6e159d8d..c22e2e85 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index e17ba708..5e5b888a 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 7e9d6a41..1b6dc18f 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index db861c1b..9d2ea4be 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -57,7 +57,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index 40060893..4b514b47 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index f3d2b884..38c035b4 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 208e981f..59493113 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 166ac232..7c7f6005 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index aa170b50..c9947fe3 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index b4b08837..c4431e17 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -15,7 +15,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index c2e37b8c..69b360a7 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li class="active"><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index 02ba844d..a2a21fbb 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index 8c551610..72e5e8a5 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index 8c78085f..72b880a8 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <h1><a href="../../../../../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../../../../../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 433d52d5..7ba80ce9 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <h1><a href="../../../../../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../../../../../override/">Override url/save_as</a></li>
@@ -61,7 +61,7 @@ pelican.conf, it will have nothing in default.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index aaad3336..bcefd49c 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -15,7 +15,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <h1><a href="../../../../../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../../../../../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index f90a188f..8da0746a 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <h1><a href="../../../../../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../../../../../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index 40ac6a69..9e0f8752 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <h1><a href="../../../../../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../../../../../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index c3c4f548..b9f5fa98 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <h1><a href="../../../../../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../../../../../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index 9c940441..bc346e9a 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <h1><a href="../../../../../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../../../../../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 53d7881f..119bdb56 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -15,7 +15,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <h1><a href="../../../../../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../../../../../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index a359e870..8b7ae27c 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log </a></h1>
+                <h1><a href="../../../../../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../../../../../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 1b5149a7..182c4b4c 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -15,7 +15,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index 58187269..3f9d2581 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 7eb50abe..1dc58182 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 1a3a1a19..4ecd9db3 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 006bead9..82d61078 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index 7f552c02..fdd09a1c 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li class="active"><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index d91a533e..cdf0e5de 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="../">Alexis' log </a></h1>
+                <h1><a href="../">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="../override/">Override url/save_as</a></li>
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index aa08ee30..fb01f1ba 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -13,7 +13,7 @@
 <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
 </a>
         <header id="banner" class="body">
-                <h1><a href="./">Alexis' log </a></h1>
+                <h1><a href="./">Alexis' log</a></h1>
                 <nav><ul>
                     <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
                     <li><a href="./override/">Override url/save_as</a></li>

From 7d19bcf5d4d2011612b8dc08167be761ad7bc3bb Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 17:03:53 +0200
Subject: [PATCH 2280/2864] Add settings for custom Jinja globals and tests
 (#2715)

Pelican has a setting for custom Jinja filters but not custom tests or
custom environment namespace globals. This adds both of the latter.
---
 docs/settings.rst                | 18 +++++++-
 pelican/generators.py            |  8 ++++
 pelican/settings.py              |  2 +
 pelican/tests/test_generators.py | 77 ++++++++++++++++++++++++++++++++
 4 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 9ebf85c2..befb6f05 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -101,7 +101,18 @@ Basic settings
 
     JINJA_FILTERS = {'urlencode': urlencode_filter}
 
-   See `Jinja custom filters documentation`_.
+   See: `Jinja custom filters documentation`_.
+
+.. data:: JINJA_GLOBALS = {}
+
+   A dictionary of custom objects to map into the Jinja2 global environment
+   namespace. The dictionary should map the global name to the global
+   variable/function. See: `Jinja global namespace documentation`_.
+
+.. data:: JINJA_TESTS = {}
+
+   A dictionary of custom Jinja2 tests you want to use. The dictionary should
+   map test names to test functions. See: `Jinja custom tests documentation`_.
 
 .. data:: LOG_FILTER = []
 
@@ -709,6 +720,10 @@ Time and Date
 
 .. [#] Default is the system locale.
 
+.. _Jinja custom filters documentation: https://jinja.palletsprojects.com/en/master/api/#custom-filters
+.. _Jinja global namespace documentation: https://jinja.palletsprojects.com/en/master/api/#the-global-namespace
+.. _Jinja custom tests documentation: https://jinja.palletsprojects.com/en/master/api/#custom-tests
+
 .. _locales on Windows: https://www.microsoft.com/en-us/download/details.aspx?id=55979
 
 .. _locale(1): https://linux.die.net/man/1/locale
@@ -1357,6 +1372,5 @@ Example settings
     :language: python
 
 
-.. _Jinja custom filters documentation: https://jinja.palletsprojects.com/en/master/api/#custom-filters
 .. _Jinja Environment documentation: https://jinja.palletsprojects.com/en/master/api/#jinja2.Environment
 .. _Docutils Configuration: http://docutils.sourceforge.net/docs/user/config.html
diff --git a/pelican/generators.py b/pelican/generators.py
index 02667cd7..43f6d41a 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -78,6 +78,14 @@ class Generator(object):
         custom_filters = self.settings['JINJA_FILTERS']
         self.env.filters.update(custom_filters)
 
+        # get custom Jinja globals from user settings
+        custom_globals = self.settings['JINJA_GLOBALS']
+        self.env.globals.update(custom_globals)
+
+        # get custom Jinja tests from user settings
+        custom_tests = self.settings['JINJA_TESTS']
+        self.env.tests.update(custom_tests)
+
         signals.generator_init.send(self)
 
     def get_template(self, name):
diff --git a/pelican/settings.py b/pelican/settings.py
index 7d80ba90..c3b29ca5 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -120,6 +120,8 @@ DEFAULT_CONFIG = {
         'output_format': 'html5',
     },
     'JINJA_FILTERS': {},
+    'JINJA_GLOBALS': {},
+    'JINJA_TESTS': {},
     'JINJA_ENVIRONMENT': {
         'trim_blocks': True,
         'lstrip_blocks': True,
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 1f8157a6..fdc1b937 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1148,3 +1148,80 @@ class TestStaticGenerator(unittest.TestCase):
         self.assertTrue(
             os.path.isdir(os.path.join(self.temp_output, "static")))
         self.assertTrue(os.path.isfile(self.endfile))
+
+
+class TestJinja2Environment(unittest.TestCase):
+
+    def setUp(self):
+        self.temp_content = mkdtemp(prefix='pelicantests.')
+        self.temp_output = mkdtemp(prefix='pelicantests.')
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, str('C'))
+
+    def tearDown(self):
+        rmtree(self.temp_content)
+        rmtree(self.temp_output)
+        locale.setlocale(locale.LC_ALL, self.old_locale)
+
+    def _test_jinja2_helper(self, additional_settings, content, expected):
+        settings = get_settings()
+        settings['STATIC_PATHS'] = ['static']
+        settings['TEMPLATE_PAGES'] = {
+            'template/source.html': 'generated/file.html'
+        }
+        settings.update(additional_settings)
+
+        generator = TemplatePagesGenerator(
+            context={'foo': 'foo', 'bar': 'bar'}, settings=settings,
+            path=self.temp_content, theme='', output_path=self.temp_output)
+
+        # create a dummy template file
+        template_dir = os.path.join(self.temp_content, 'template')
+        template_path = os.path.join(template_dir, 'source.html')
+        os.makedirs(template_dir)
+        with open(template_path, 'w') as template_file:
+            template_file.write(content)
+
+        writer = Writer(self.temp_output, settings=settings)
+        generator.generate_output(writer)
+
+        output_path = os.path.join(self.temp_output, 'generated', 'file.html')
+
+        # output file has been generated
+        self.assertTrue(os.path.exists(output_path))
+
+        # output content is correct
+        with open(output_path, 'r') as output_file:
+            self.assertEqual(output_file.read(), expected)
+
+    def test_jinja2_filter(self):
+        """JINJA_FILTERS adds custom filters to Jinja2 environment"""
+        content = 'foo: {{ foo|custom_filter }}, bar: {{ bar|custom_filter }}'
+        settings = {'JINJA_FILTERS': {'custom_filter': lambda x: x.upper()}}
+        expected = 'foo: FOO, bar: BAR'
+
+        self._test_jinja2_helper(settings, content, expected)
+
+    def test_jinja2_test(self):
+        """JINJA_TESTS adds custom tests to Jinja2 environment"""
+        content = 'foo {{ foo is custom_test }}, bar {{ bar is custom_test }}'
+        settings = {'JINJA_TESTS': {'custom_test': lambda x: x == 'bar'}}
+        expected = 'foo False, bar True'
+
+        self._test_jinja2_helper(settings, content, expected)
+
+    def test_jinja2_global(self):
+        """JINJA_GLOBALS adds custom globals to Jinja2 environment"""
+        content = '{{ custom_global }}'
+        settings = {'JINJA_GLOBALS': {'custom_global': 'foobar'}}
+        expected = 'foobar'
+
+        self._test_jinja2_helper(settings, content, expected)
+
+    def test_jinja2_extension(self):
+        """JINJA_ENVIRONMENT adds extensions to Jinja2 environment"""
+        content = '{% set stuff = [] %}{% do stuff.append(1) %}{{ stuff }}'
+        settings = {'JINJA_ENVIRONMENT': {'extensions': ['jinja2.ext.do']}}
+        expected = '[1]'
+
+        self._test_jinja2_helper(settings, content, expected)

From e7ef546661046a22f7c469186e1a97f98a6e8d24 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Apr 2020 19:43:09 +0200
Subject: [PATCH 2281/2864] Add PORT to serve-global Makefile task

---
 pelican/tools/templates/Makefile.jinja2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 6b13a59c..c8963cae 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -108,7 +108,11 @@ else
 endif
 
 serve-global:
+ifdef PORT
+	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b $(SERVER)
+else
 	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -b $(SERVER)
+endif
 
 devserver:
 ifdef PORT

From 97dbafcb897d56c963ddf92543b1b1c3000c6240 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 12 Apr 2020 20:56:07 +0300
Subject: [PATCH 2282/2864] Fix LOG_FILTER to act on exact messages

* Adds the ability to filter templated messages by exact message,
as well as templates.
* Adds a test for LimitFilter.

Fixes #2552,  #2682
---
 pelican/log.py            |  8 ++--
 pelican/tests/test_log.py | 78 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 pelican/tests/test_log.py

diff --git a/pelican/log.py b/pelican/log.py
index bae15b4b..0576af2a 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -110,11 +110,13 @@ class LimitFilter(logging.Filter):
         else:
             self._raised_messages.add(message_key)
 
-        # ignore LOG_FILTER records by templates when "debug" isn't enabled
+        # ignore LOG_FILTER records by templates or messages
+        # when "debug" isn't enabled
         logger_level = logging.getLogger().getEffectiveLevel()
         if logger_level > logging.DEBUG:
-            ignore_key = (record.levelno, record.msg)
-            if ignore_key in self._ignore:
+            template_key = (record.levelno, record.msg)
+            message_key = (record.levelno, record.getMessage())
+            if (template_key in self._ignore or message_key in self._ignore):
                 return False
 
         # check if we went over threshold
diff --git a/pelican/tests/test_log.py b/pelican/tests/test_log.py
new file mode 100644
index 00000000..90a4552d
--- /dev/null
+++ b/pelican/tests/test_log.py
@@ -0,0 +1,78 @@
+import logging
+import unittest
+from collections import defaultdict
+
+from pelican import log
+from pelican.tests.support import LogCountHandler
+
+
+class TestLog(unittest.TestCase):
+    def setUp(self):
+        super().setUp()
+        self.logger = logging.getLogger(__name__)
+        self.handler = LogCountHandler()
+        self.logger.addHandler(self.handler)
+
+    def tearDown(self):
+        self._reset_limit_filter()
+        self.logger.removeHandler(self.handler)
+        super().tearDown()
+
+    def _reset_limit_filter(self):
+        log.LimitFilter._ignore = set()
+        log.LimitFilter._raised_messages = set()
+        log.LimitFilter._threshold = 5
+        log.LimitFilter._group_count = defaultdict(int)
+
+    def test_log_filter(self):
+        def do_logging():
+            for i in range(5):
+                self.logger.warning('Log %s', i)
+                self.logger.warning('Another log %s', i)
+        # no filter
+        do_logging()
+        self.assertEqual(
+            self.handler.count_logs('Log \\d', logging.WARNING),
+            5)
+        self.assertEqual(
+            self.handler.count_logs('Another log \\d', logging.WARNING),
+            5)
+        self.handler.flush()
+        self._reset_limit_filter()
+
+        # filter by template
+        log.LimitFilter._ignore.add((logging.WARNING, 'Log %s'))
+        do_logging()
+        self.assertEqual(
+            self.handler.count_logs('Log \\d', logging.WARNING),
+            0)
+        self.assertEqual(
+            self.handler.count_logs('Another log \\d', logging.WARNING),
+            5)
+        self.handler.flush()
+        self._reset_limit_filter()
+
+        # filter by exact message
+        log.LimitFilter._ignore.add((logging.WARNING, 'Log 3'))
+        do_logging()
+        self.assertEqual(
+            self.handler.count_logs('Log \\d', logging.WARNING),
+            4)
+        self.assertEqual(
+            self.handler.count_logs('Another log \\d', logging.WARNING),
+            5)
+        self.handler.flush()
+        self._reset_limit_filter()
+
+        # filter by both
+        log.LimitFilter._ignore.add((logging.WARNING, 'Log 3'))
+        log.LimitFilter._ignore.add((logging.WARNING, 'Another log %s'))
+        do_logging()
+        self.assertEqual(
+            self.handler.count_logs('Log \\d', logging.WARNING),
+            4)
+        self.assertEqual(
+            self.handler.count_logs('Another log \\d', logging.WARNING),
+            0)
+        self.handler.flush()
+        self._reset_limit_filter()

From fc8a3c719f3332d9dcb9a204feaaf7775a237750 Mon Sep 17 00:00:00 2001
From: Boian Berberov <bberberov+github@gmail.com>
Date: Sun, 12 Apr 2020 20:03:48 +0000
Subject: [PATCH 2283/2864] Add missing <ul> element to index.html template in
 notmyidea theme (#2545)

---
 pelican/themes/notmyidea/templates/index.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 20ca7eee..14e9c14d 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -50,10 +50,16 @@
     {% endfor %}
 {% else %}
 <section id="content" class="body">
-<h2>Pages</h2>
+    {% if pages %}
+    <h2>Pages</h2>
+    <ul>
     {% for page in pages %}
         <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
     {% endfor %}
+    </ul>
+    {% else %}
+    <p>This site currently has no content.</p>
+    {% endif %}
 </section>
 {% endif %}
 {% endblock content %}

From 1a6d66f395992243e1d27818f01049486991dd98 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 13 Apr 2020 08:55:29 +0200
Subject: [PATCH 2284/2864] Run tests in parallel on multi-core systems

Uses pytest-xdist to run tests on two cores simultaneously, speeding up
test runs by nearly 40%.
---
 pyproject.toml        | 1 +
 requirements/test.pip | 1 +
 tox.ini               | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index f7876002..e1de7637 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,6 +51,7 @@ pytest = "~5.3.5"
 pytest-cov = "^2.8"
 pytest-pythonpath = "^0.7.3"
 pytest-sugar = "^0.9.2"
+pytest-xdist = "^1.31"
 tox = "^3.13"
 flake8 = "^3.7"
 flake8-import-order = "^0.18.1"
diff --git a/requirements/test.pip b/requirements/test.pip
index d9d91914..81d74c4e 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -3,6 +3,7 @@ Pygments==2.6.1
 mock
 pytest==5.3.5
 pytest-cov
+pytest-xdist
 
 # Optional Packages
 Markdown >= 3.1
diff --git a/tox.ini b/tox.ini
index ed025c25..a7543a17 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,6 +27,7 @@ commands =
 filterwarnings =
     default::DeprecationWarning
     error:.*:Warning:pelican
+addopts = -n 2
 
 [flake8]
 application-import-names = pelican

From bf85991ee648665f2abc224b9d3719c27470e696 Mon Sep 17 00:00:00 2001
From: Boian Berberov <bberberov+github@gmail.com>
Date: Mon, 13 Apr 2020 09:17:39 +0000
Subject: [PATCH 2285/2864] Quote Makefile paths so it handles spaces

---
 pelican/tools/templates/Makefile.jinja2 | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 6bdfea6f..0184cc88 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -92,33 +92,33 @@ help:
 	@echo '                                                                          '
 
 html:
-	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
 
 clean:
-	[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
+	[ ! -d "$(OUTPUTDIR)" ] || rm -rf "$(OUTPUTDIR)"
 
 regenerate:
-	$(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+	"$(PELICAN)" -r "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
 
 serve:
 ifdef PORT
-	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT)
+	"$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -p $(PORT)
 else
-	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+	"$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
 endif
 
 serve-global:
 ifdef PORT
-	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b $(SERVER)
+	"$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -p $(PORT) -b $(SERVER)
 else
-	$(PELICAN) -l $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -b $(SERVER)
+	"$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -b $(SERVER)
 endif
 
 devserver:
 ifdef PORT
-	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT)
+	"$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -p $(PORT)
 else
-	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+	"$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
 endif
 
 devserver-global:
@@ -129,23 +129,23 @@ else
 endif
 
 publish:
-	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
+	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)
 
 {% set upload = [] %}
 {% if ssh %}
 {% set upload = upload + ["ssh_upload"] %}
 ssh_upload: publish
-	scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+	scp -P $(SSH_PORT) -r "$(OUTPUTDIR)"/* "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)"
 
 {% set upload = upload + ["rsync_upload"] %}
 rsync_upload: publish
-	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --cvs-exclude --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --cvs-exclude --delete "$(OUTPUTDIR)"/ "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)"
 
 {% endif %}
 {% if dropbox %}
 {% set upload = upload + ["dropbox_upload"] %}
 dropbox_upload: publish
-	cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
+	cp -r "$(OUTPUTDIR)"/* "$(DROPBOX_DIR)"/
 
 {% endif %}
 {% if ftp %}
@@ -157,19 +157,19 @@ ftp_upload: publish
 {% if s3 %}
 {% set upload = upload + ["s3_upload"] %}
 s3_upload: publish
-	aws s3 sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl public-read --delete
+	aws s3 sync "$(OUTPUTDIR)"/ s3://$(S3_BUCKET) --acl public-read --delete
 
 {% endif %}
 {% if cloudfiles %}
 {% set upload = upload + ["cf_upload"] %}
 cf_upload: publish
-	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
+	cd "$(OUTPUTDIR)" && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
 
 {% endif %}
 {% if github %}
 {% set upload = upload + ["github"] %}
 github: publish
-	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $(OUTPUTDIR)
+	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) "$(OUTPUTDIR)"
 	git push origin $(GITHUB_PAGES_BRANCH)
 
 {% endif %}

From cff6a829c2c3962f0c0d7a706d4bc6791966ce20 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 14 Apr 2020 13:48:03 +0200
Subject: [PATCH 2286/2864] Set timezone when assigning max datetime to drafts

---
 pelican/contents.py                                    | 3 ++-
 pelican/tests/output/basic/drafts/a-draft-article.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 620fa304..40d9c28e 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -121,6 +121,7 @@ class Content(object):
         # manage timezone
         default_timezone = settings.get('TIMEZONE', 'UTC')
         timezone = getattr(self, 'timezone', default_timezone)
+        self.timezone = pytz.timezone(timezone)
 
         if hasattr(self, 'date'):
             self.date = set_date_tzinfo(self.date, timezone)
@@ -512,7 +513,7 @@ class Article(Content):
 
         # if we are a draft and there is no date provided, set max datetime
         if not hasattr(self, 'date') and self.status == 'draft':
-            self.date = datetime.datetime.max
+            self.date = datetime.datetime.max.replace(tzinfo=self.timezone)
 
     def _expand_settings(self, key):
         klass = 'draft' if self.status == 'draft' else 'article'
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index e8f337e3..1e5eb5ba 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -30,7 +30,7 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="9999-12-31T23:59:59.999999">
+        <abbr class="published" title="9999-12-31T23:59:59.999999+00:00">
                 Published: 
         </abbr>
 

From 863176040f0593b721581c5f7f44200ed8de54f7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 14 Apr 2020 14:14:56 +0200
Subject: [PATCH 2287/2864] Don't run pre-commit on functional test output

Otherwise, it will apply EOF and trailing whitespace fixes, which may
lead to test failures.
---
 .pre-commit-config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ef27cfcf..385a7144 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,6 +2,7 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0
+    exclude: ^pelican/tests/output/
     hooks:
       - id: check-added-large-files
       - id: check-ast

From 3f4166e7b6fb0e1e1a23c4b7f476d34640b0e488 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 14 Apr 2020 17:44:00 +0200
Subject: [PATCH 2288/2864] Put pre-commit excludes where they actually belong

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 385a7144..2a86f0aa 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0
-    exclude: ^pelican/tests/output/
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -12,3 +11,4 @@ repos:
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: trailing-whitespace
+exclude: ^pelican/tests/output/

From c8bf3ec5a470363b7284e1a18146a5062ec52a6f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 14 Apr 2020 17:35:22 +0200
Subject: [PATCH 2289/2864] Add HTML meta generator tag to theme base templates

---
 pelican/themes/notmyidea/templates/base.html | 1 +
 pelican/themes/simple/templates/base.html    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 66ec83ab..34ed4e97 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -2,6 +2,7 @@
 <html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock html_lang %}">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" />
         {% if FEED_ALL_ATOM %}
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 9a97c254..2c17dbfb 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -4,6 +4,7 @@
         {% block head %}
         <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         {% if FEED_ALL_ATOM %}
         <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
         {% endif %}

From 2d590bb8c183ba22af4b7ed3241fd4f80069fa73 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 14 Apr 2020 17:45:34 +0200
Subject: [PATCH 2290/2864] Add HTML meta generator tag to functional test
 output

---
 pelican/tests/output/basic/a-markdown-powered-article.html       | 1 +
 pelican/tests/output/basic/archives.html                         | 1 +
 pelican/tests/output/basic/article-1.html                        | 1 +
 pelican/tests/output/basic/article-2.html                        | 1 +
 pelican/tests/output/basic/article-3.html                        | 1 +
 pelican/tests/output/basic/author/alexis-metaireau.html          | 1 +
 pelican/tests/output/basic/authors.html                          | 1 +
 pelican/tests/output/basic/categories.html                       | 1 +
 pelican/tests/output/basic/category/bar.html                     | 1 +
 pelican/tests/output/basic/category/cat1.html                    | 1 +
 pelican/tests/output/basic/category/misc.html                    | 1 +
 pelican/tests/output/basic/category/yeah.html                    | 1 +
 pelican/tests/output/basic/drafts/a-draft-article.html           | 1 +
 pelican/tests/output/basic/filename_metadata-example.html        | 1 +
 pelican/tests/output/basic/index.html                            | 1 +
 pelican/tests/output/basic/oh-yeah.html                          | 1 +
 pelican/tests/output/basic/override/index.html                   | 1 +
 pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html | 1 +
 pelican/tests/output/basic/pages/this-is-a-test-page.html        | 1 +
 pelican/tests/output/basic/second-article-fr.html                | 1 +
 pelican/tests/output/basic/second-article.html                   | 1 +
 pelican/tests/output/basic/tag/bar.html                          | 1 +
 pelican/tests/output/basic/tag/baz.html                          | 1 +
 pelican/tests/output/basic/tag/foo.html                          | 1 +
 pelican/tests/output/basic/tag/foobar.html                       | 1 +
 pelican/tests/output/basic/tag/oh.html                           | 1 +
 pelican/tests/output/basic/tag/yeah.html                         | 1 +
 pelican/tests/output/basic/tags.html                             | 1 +
 pelican/tests/output/basic/this-is-a-super-article.html          | 1 +
 pelican/tests/output/basic/unbelievable.html                     | 1 +
 pelican/tests/output/custom/a-markdown-powered-article.html      | 1 +
 pelican/tests/output/custom/archives.html                        | 1 +
 pelican/tests/output/custom/article-1.html                       | 1 +
 pelican/tests/output/custom/article-2.html                       | 1 +
 pelican/tests/output/custom/article-3.html                       | 1 +
 pelican/tests/output/custom/author/alexis-metaireau.html         | 1 +
 pelican/tests/output/custom/author/alexis-metaireau2.html        | 1 +
 pelican/tests/output/custom/author/alexis-metaireau3.html        | 1 +
 pelican/tests/output/custom/authors.html                         | 1 +
 pelican/tests/output/custom/categories.html                      | 1 +
 pelican/tests/output/custom/category/bar.html                    | 1 +
 pelican/tests/output/custom/category/cat1.html                   | 1 +
 pelican/tests/output/custom/category/misc.html                   | 1 +
 pelican/tests/output/custom/category/yeah.html                   | 1 +
 pelican/tests/output/custom/drafts/a-draft-article.html          | 1 +
 pelican/tests/output/custom/filename_metadata-example.html       | 1 +
 pelican/tests/output/custom/index.html                           | 1 +
 pelican/tests/output/custom/index2.html                          | 1 +
 pelican/tests/output/custom/index3.html                          | 1 +
 pelican/tests/output/custom/jinja2_template.html                 | 1 +
 pelican/tests/output/custom/oh-yeah-fr.html                      | 1 +
 pelican/tests/output/custom/oh-yeah.html                         | 1 +
 pelican/tests/output/custom/override/index.html                  | 1 +
 .../tests/output/custom/pages/this-is-a-test-hidden-page.html    | 1 +
 pelican/tests/output/custom/pages/this-is-a-test-page.html       | 1 +
 pelican/tests/output/custom/second-article-fr.html               | 1 +
 pelican/tests/output/custom/second-article.html                  | 1 +
 pelican/tests/output/custom/tag/bar.html                         | 1 +
 pelican/tests/output/custom/tag/baz.html                         | 1 +
 pelican/tests/output/custom/tag/foo.html                         | 1 +
 pelican/tests/output/custom/tag/foobar.html                      | 1 +
 pelican/tests/output/custom/tag/oh.html                          | 1 +
 pelican/tests/output/custom/tag/yeah.html                        | 1 +
 pelican/tests/output/custom/tags.html                            | 1 +
 pelican/tests/output/custom/this-is-a-super-article.html         | 1 +
 pelican/tests/output/custom/unbelievable.html                    | 1 +
 pelican/tests/output/custom_locale/archives.html                 | 1 +
 pelican/tests/output/custom_locale/author/alexis-metaireau.html  | 1 +
 pelican/tests/output/custom_locale/author/alexis-metaireau2.html | 1 +
 pelican/tests/output/custom_locale/author/alexis-metaireau3.html | 1 +
 pelican/tests/output/custom_locale/authors.html                  | 1 +
 pelican/tests/output/custom_locale/categories.html               | 1 +
 pelican/tests/output/custom_locale/category/bar.html             | 1 +
 pelican/tests/output/custom_locale/category/cat1.html            | 1 +
 pelican/tests/output/custom_locale/category/misc.html            | 1 +
 pelican/tests/output/custom_locale/category/yeah.html            | 1 +
 pelican/tests/output/custom_locale/drafts/a-draft-article.html   | 1 +
 pelican/tests/output/custom_locale/index.html                    | 1 +
 pelican/tests/output/custom_locale/index2.html                   | 1 +
 pelican/tests/output/custom_locale/index3.html                   | 1 +
 pelican/tests/output/custom_locale/jinja2_template.html          | 1 +
 pelican/tests/output/custom_locale/oh-yeah-fr.html               | 1 +
 pelican/tests/output/custom_locale/override/index.html           | 1 +
 .../output/custom_locale/pages/this-is-a-test-hidden-page.html   | 1 +
 .../tests/output/custom_locale/pages/this-is-a-test-page.html    | 1 +
 .../posts/2010/décembre/02/this-is-a-super-article/index.html    | 1 +
 .../custom_locale/posts/2010/octobre/15/unbelievable/index.html  | 1 +
 .../custom_locale/posts/2010/octobre/20/oh-yeah/index.html       | 1 +
 .../posts/2011/avril/20/a-markdown-powered-article/index.html    | 1 +
 .../custom_locale/posts/2011/février/17/article-1/index.html     | 1 +
 .../custom_locale/posts/2011/février/17/article-2/index.html     | 1 +
 .../custom_locale/posts/2011/février/17/article-3/index.html     | 1 +
 .../posts/2012/février/29/second-article/index.html              | 1 +
 .../posts/2012/novembre/30/filename_metadata-example/index.html  | 1 +
 pelican/tests/output/custom_locale/second-article-fr.html        | 1 +
 pelican/tests/output/custom_locale/tag/bar.html                  | 1 +
 pelican/tests/output/custom_locale/tag/baz.html                  | 1 +
 pelican/tests/output/custom_locale/tag/foo.html                  | 1 +
 pelican/tests/output/custom_locale/tag/foobar.html               | 1 +
 pelican/tests/output/custom_locale/tag/oh.html                   | 1 +
 pelican/tests/output/custom_locale/tag/yeah.html                 | 1 +
 pelican/tests/output/custom_locale/tags.html                     | 1 +
 102 files changed, 102 insertions(+)

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 400a639a..1e080c8f 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 198283e0..27cbb73e 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index c4a1a8b8..63cc0170 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Article 1</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index cb929284..cde9dce1 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Article 2</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 1773e313..4887ecc8 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Article 3</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index b2c1188c..4218b21c 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - Alexis Métaireau</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index 858934c7..f062ccf6 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - Authors</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 1697927f..e9d981c8 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - Categories</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 80d9ffb1..d5e66b47 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - bar</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 3864f311..eccf5587 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - cat1</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 2f045b0d..4f597888 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - misc</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 1de9c0c5..31a95629 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - yeah</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index 1e5eb5ba..12860d7b 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A draft article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index a95dd788..29aabac3 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 440685bf..f2442bed 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index e972965a..d6c661fd 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index b2bcb3d4..c3613174 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Override url/save_as</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 50822c25..21fabf62 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>This is a test hidden page</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index dfc6136a..e6047f56 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>This is a test page</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 2bbb3ba6..f3c39ca4 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -2,6 +2,7 @@
 <html lang="fr">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Deuxième article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index ab8e6169..a7ea7780 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Second article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 29698080..384841f2 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - bar</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index f8830eeb..259b17fe 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>The baz tag</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index d02252f9..3a00a6ab 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - foo</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 2b60ff32..5418f872 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - foobar</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index 56e6059b..c2de8b5b 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Oh Oh Oh</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 6908eb9e..396bf076 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - yeah</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index ad54a9d8..3f88ce9e 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - Tags</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 102cffb1..220817d3 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>This is a super article !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 3f6df318..8cdc892c 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index e5fda57c..e797c35a 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 112f3295..1e9a8377 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 0d5ef486..a2954757 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Article 1</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 70e68d37..5a964cdb 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Article 2</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index cd6b025e..ef656391 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Article 3</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index 635a18b1..ca58ea85 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index a76b1af4..f295bfa0 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 0c5bc517..6740f612 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index ec10a2f4..6374c4a4 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Authors</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 660ecd09..393aef32 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Categories</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index fa8bfd75..4511bcb6 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 18939824..dc5c0579 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - cat1</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index e636d7ea..78b9837c 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - misc</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 72136b59..17e8103e 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 761f9ae6..259e2624 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A draft article</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index fec79833..765b06c1 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 99c4f45a..b1f0df5b 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index cf49e960..9460cc4e 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index d5c2ff33..0bb90e9e 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 05ec898b..1ba06323 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 8e3b7fe4..b49234f2 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -2,6 +2,7 @@
 <html lang="fr">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Trop bien !</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index a6f1fe51..dff78a30 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 14ad77d0..ebf07d8d 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Override url/save_as</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 64be472b..e5fa1aaf 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>This is a test hidden page</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 60553949..88675d58 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>This is a test page</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 397f5aa0..4c6894d3 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -2,6 +2,7 @@
 <html lang="fr">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Deuxième article</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 1c9de4bc..3004b068 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Second article</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 3fe34b56..b2b22714 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 10e1edbc..3bcda170 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>The baz tag</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index bbb0f07a..7684fbc5 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - foo</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 791aea61..5816e395 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - foobar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 3dcb94ea..16ea9d0d 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Oh Oh Oh</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index ba0b46c3..929a48e0 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index a5e0ccae..244c21e3 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Tags</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 756eaaf7..da602d45 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>This is a super article !</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index c7ed5d81..024d428f 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index 1750c871..66dbe94a 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 914997a6..b5fdcf36 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index ac75e9e7..5858b465 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index d46b2ca8..6a071a4a 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index 2e619a5d..84bd502e 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Authors</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index dcaac82a..24e83abf 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Categories</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index de6d98a2..f9d47948 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 35623225..2bc756e6 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - cat1</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index eeb42aa2..c9fc111f 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - misc</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 9ffd3172..660c593c 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index c22e2e85..82015a81 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A draft article</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 38c035b4..de6e3d69 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 59493113..54ff8fb8 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 7c7f6005..ac06a05e 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index c9947fe3..83b6e8e0 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index c4431e17..44c57ebd 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -2,6 +2,7 @@
 <html lang="fr">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Trop bien !</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index 69b360a7..5c273ed6 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Override url/save_as</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index a2a21fbb..91372822 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>This is a test hidden page</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index 72e5e8a5..1be5c115 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>This is a test page</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index 72b880a8..9a376c44 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>This is a super article !</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 7ba80ce9..c31cdfab 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index bcefd49c..fdc8efde 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 8da0746a..db3d04d2 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index 9e0f8752..1c153b0f 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Article 1</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index b9f5fa98..9ee6269f 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Article 2</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index bc346e9a..e1374f0c 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Article 3</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 119bdb56..ba8b3ee0 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Second article</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 8b7ae27c..7f15782e 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 182c4b4c..b0c92d9f 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -2,6 +2,7 @@
 <html lang="fr">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Deuxième article</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index 3f9d2581..aaa5fb0d 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 1dc58182..8896bad3 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>The baz tag</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 4ecd9db3..15523248 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - foo</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 82d61078..1393a76e 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - foobar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index fdd09a1c..b6fe445f 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Oh Oh Oh</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index cdf0e5de..3953f1b7 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index fb01f1ba..cf932f97 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <title>Alexis' log - Tags</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />

From 7eae9b1abcfccb14f451a441674a84c85294ae48 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 14 Apr 2020 21:39:47 +0200
Subject: [PATCH 2291/2864] Reduce warnings and errors in sample content

This reduces the warnings and errors when generating the sample content
from twelve to one (intentional) warning. The latter is expected by
assertLogCountEqual() in the "test_basic_generation_works" test.
---
 .../output/basic/author/alexis-metaireau.html |   4 +-
 pelican/tests/output/basic/category/bar.html  |   4 +-
 .../output/basic/drafts/a-draft-article.html  |   4 +-
 .../tests/output/basic/feeds/all-fr.atom.xml  |   3 +-
 pelican/tests/output/basic/feeds/all.atom.xml |   3 +-
 pelican/tests/output/basic/index.html         |   4 +-
 pelican/tests/output/basic/oh-yeah-fr.html    |  69 ++++++++++++++++++
 pelican/tests/output/basic/oh-yeah.html       |   6 +-
 .../basic/pages/this-is-a-test-page.html      |   3 +-
 .../tests/output/basic/pictures/Fat_Cat.jpg   | Bin 0 -> 62675 bytes
 pelican/tests/output/basic/tag/bar.html       |   4 +-
 pelican/tests/output/basic/tag/yeah.html      |   4 +-
 .../output/custom/drafts/a-draft-article.html |   4 +-
 .../tests/output/custom/feeds/all-fr.atom.xml |   6 +-
 .../tests/output/custom/feeds/all.atom.xml    |   4 +-
 pelican/tests/output/custom/feeds/all.rss.xml |   6 +-
 pelican/tests/output/custom/oh-yeah-fr.html   |   4 +-
 .../custom/pages/this-is-a-test-page.html     |   1 +
 .../custom_locale/drafts/a-draft-article.html |   4 +-
 .../custom_locale/feeds/all-fr.atom.xml       |   6 +-
 .../output/custom_locale/feeds/all.atom.xml   |   4 +-
 .../output/custom_locale/feeds/all.rss.xml    |   6 +-
 .../output/custom_locale/oh-yeah-fr.html      |   4 +-
 .../pages/this-is-a-test-page.html            |   1 +
 samples/content/another_super_article-fr.rst  |   1 +
 samples/content/another_super_article.rst     |   1 +
 samples/content/draft_article.rst             |   1 +
 samples/content/pages/test_page.rst           |   6 +-
 samples/pelican.conf.py                       |   5 +-
 29 files changed, 135 insertions(+), 37 deletions(-)
 create mode 100644 pelican/tests/output/basic/oh-yeah-fr.html
 create mode 100644 pelican/tests/output/basic/pictures/Fat_Cat.jpg

diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 4218b21c..a4d7a279 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -74,7 +74,9 @@
                 By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
 <p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index d5e66b47..7e272b78 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -34,7 +34,9 @@
                 By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
 <p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index 12860d7b..3e6ed5f0 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -31,8 +31,8 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="9999-12-31T23:59:59.999999+00:00">
-                Published: 
+        <abbr class="published" title="2011-05-08T15:58:00+00:00">
+                Published: Sun 08 May 2011
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>.</p>
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index cf64e4ad..4ecf7534 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index f69c8bb4..7407d2ff 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -27,7 +27,8 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index f2442bed..f215dc44 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -187,7 +187,9 @@ as well as <strong>inline markup</strong>.</p>
                 By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
 <p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/pelican/tests/output/basic/oh-yeah-fr.html b/pelican/tests/output/basic/oh-yeah-fr.html
new file mode 100644
index 00000000..e605ac2e
--- /dev/null
+++ b/pelican/tests/output/basic/oh-yeah-fr.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="fr">
+<head>
+        <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
+        <title>Trop bien !</title>
+        <link rel="stylesheet" href="/theme/css/main.css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+      <link rel="alternate" hreflang="en" href="/oh-yeah.html">
+
+</head>
+
+<body id="index" class="home">
+        <header id="banner" class="body">
+                <h1><a href="/">A Pelican Blog</a></h1>
+                <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="/oh-yeah-fr.html" rel="bookmark"
+           title="Permalink to Trop bien !">Trop bien !</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2010-10-20T10:14:00+00:00">
+                Published: Wed 20 October 2010
+        </abbr>
+
+<p>In <a href="/category/misc.html">misc</a>.</p>
+Translations:
+        <a href="/oh-yeah.html" hreflang="en">en</a>
+
+</footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
+
+    </div><!-- /.entry-content -->
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index d6c661fd..d01a631e 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -6,6 +6,8 @@
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+      <link rel="alternate" hreflang="fr" href="/oh-yeah-fr.html">
+
 </head>
 
 <body id="index" class="home">
@@ -39,7 +41,9 @@
                 By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
 <p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+
 </footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index e6047f56..3970e3ff 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -25,7 +25,8 @@
     <h1 class="entry-title">This is a test page</h1>
     
     <p>Just an image.</p>
-<img alt="alternate text" src="|filename|/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+<img alt="alternate text" src="/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+<img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
diff --git a/pelican/tests/output/basic/pictures/Fat_Cat.jpg b/pelican/tests/output/basic/pictures/Fat_Cat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d8a96d356be94e782aaf36ba4e47168435b56338
GIT binary patch
literal 62675
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

literal 0
HcmV?d00001

diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 384841f2..ead02cd8 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -86,7 +86,9 @@ as well as <strong>inline markup</strong>.</p>
                 By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
 <p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 396bf076..88660359 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -34,7 +34,9 @@
                 By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
 <p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>
+<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 259e2624..3316df7c 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -35,8 +35,8 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01+01:00">
-                Published: Fri 02 March 2012
+        <abbr class="published" title="2011-05-08T15:58:00+02:00">
+                Published: Sun 08 May 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index f380cd04..39565ca6 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 5d5d5461..cf214c5a 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
@@ -28,7 +27,8 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 37285af5..479f67ba 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid><category>misc</category></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
@@ -16,7 +15,8 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</guid><category>misc</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index b49234f2..b5504212 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -37,8 +37,8 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01+01:00">
-                Published: Fri 02 March 2012
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                Published: Wed 20 October 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 88675d58..26c6c0e9 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -30,6 +30,7 @@
     
     <p>Just an image.</p>
 <img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+<img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 82015a81..1a7e9427 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -35,8 +35,8 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01+01:00">
-                Published: 02 mars 2012
+        <abbr class="published" title="2011-05-08T15:58:00+02:00">
+                Published: 08 mai 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
index 2bf92b1f..cfd6eeb2 100644
--- a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-03-02T14:01:01+01:00</updated><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry></feed>
\ No newline at end of file
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index 9d2ea4be..67a57122 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2012-03-02T14:01:01+01:00</published><updated>2012-03-02T14:01:01+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
 </content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
 </content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
@@ -28,7 +27,8 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index 2fac2b5d..8e7dd649 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid><category>misc</category></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 02 Mar 2012 14:01:01 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-03-02:/oh-yeah-fr.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
@@ -16,7 +15,8 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</guid><category>misc</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 44c57ebd..01188766 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -37,8 +37,8 @@
 
     <div class="entry-content">
 <footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01+01:00">
-                Published: 02 mars 2012
+        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index 1be5c115..eb779355 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -30,6 +30,7 @@
     
     <p>Just an image.</p>
 <img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+<img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
diff --git a/samples/content/another_super_article-fr.rst b/samples/content/another_super_article-fr.rst
index 71ac9635..dcd252a7 100644
--- a/samples/content/another_super_article-fr.rst
+++ b/samples/content/another_super_article-fr.rst
@@ -1,6 +1,7 @@
 Trop bien !
 ###########
 
+:date: 2010-10-20 10:14
 :lang: fr
 :slug: oh-yeah
 
diff --git a/samples/content/another_super_article.rst b/samples/content/another_super_article.rst
index 37727116..a170c4a1 100644
--- a/samples/content/another_super_article.rst
+++ b/samples/content/another_super_article.rst
@@ -5,6 +5,7 @@ Oh yeah !
 :date: 2010-10-20 10:14
 :category: bar
 :author: Alexis Métaireau
+:lang: en
 :slug: oh-yeah
 :license: WTFPL
 
diff --git a/samples/content/draft_article.rst b/samples/content/draft_article.rst
index 76ce9a16..6b383ca6 100644
--- a/samples/content/draft_article.rst
+++ b/samples/content/draft_article.rst
@@ -1,6 +1,7 @@
 A draft article
 ###############
 
+:date: 2011-05-08 15:58
 :status: draft
 
 This is a draft article, it should live under the /drafts/ folder and not be
diff --git a/samples/content/pages/test_page.rst b/samples/content/pages/test_page.rst
index 2285f17b..3747faed 100644
--- a/samples/content/pages/test_page.rst
+++ b/samples/content/pages/test_page.rst
@@ -5,8 +5,12 @@ This is a test page
 
 Just an image.
 
-.. image:: |filename|/pictures/Fat_Cat.jpg
+.. image:: {static}/pictures/Fat_Cat.jpg
    :height: 450 px
    :width: 600 px
    :alt: alternate text
 
+.. image:: |filename|/images/Fat_Cat.jpg
+   :height: 450 px
+   :width: 600 px
+   :alt: wrong path since 'images' folder does not exist
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 861c1f53..2b99ef5b 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -40,13 +40,16 @@ EXTRA_PATH_METADATA = {
 
 # static paths will be copied without parsing their contents
 STATIC_PATHS = [
-    'pictures',
+    'images',
     'extra/robots.txt',
     ]
 
 # custom page generated with a jinja2 template
 TEMPLATE_PAGES = {'pages/jinja2_template.html': 'jinja2_template.html'}
 
+# there is no other HTML content
+READERS = {'html': None}
+
 # code blocks with line numbers
 PYGMENTS_RST_OPTIONS = {'linenos': 'table'}
 

From aa176b7939c017541887f160bbc948c9b37daa73 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 14 Apr 2020 01:44:34 +0300
Subject: [PATCH 2292/2864] Account for existing namespace plugins in plugin
 tests

---
 pelican/tests/test_plugins.py | 37 +++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
index 1adbbb5c..4f62c4a5 100644
--- a/pelican/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -66,35 +66,38 @@ class PluginTest(unittest.TestCase):
         self.assertEqual(pelican.__path__, old_path)
 
     def test_get_namespace_plugins(self):
-        # without plugins
-        ns_plugins = get_namespace_plugins()
-        self.assertEqual(len(ns_plugins), 0)
+        # existing namespace plugins
+        existing_ns_plugins = get_namespace_plugins()
 
         # with plugin
         with tmp_namespace_path(self._NS_PLUGIN_FOLDER):
             ns_plugins = get_namespace_plugins()
-            self.assertEqual(len(ns_plugins), 1)
+            self.assertEqual(len(ns_plugins), len(existing_ns_plugins)+1)
             self.assertIn('pelican.plugins.ns_plugin', ns_plugins)
             self.assertEqual(
                 ns_plugins['pelican.plugins.ns_plugin'].NAME,
                 'namespace plugin')
 
-        # should be back to 0 outside `with`
+        # should be back to existing namespace plugins outside `with`
         ns_plugins = get_namespace_plugins()
-        self.assertEqual(len(ns_plugins), 0)
+        self.assertEqual(ns_plugins, existing_ns_plugins)
 
     def test_load_plugins(self):
-        # no plugins
-        plugins = load_plugins({})
-        self.assertEqual(len(plugins), 0)
+        def get_plugin_names(plugins):
+            return set(
+                plugin.NAME if hasattr(plugin, 'NAME') else plugin.__name__
+                for plugin in plugins)
+
+        # existing namespace plugins
+        existing_ns_plugins = load_plugins({})
 
         with tmp_namespace_path(self._NS_PLUGIN_FOLDER):
             # with no `PLUGINS` setting, load namespace plugins
             plugins = load_plugins({})
-            self.assertEqual(len(plugins), 1, plugins)
+            self.assertEqual(len(plugins), len(existing_ns_plugins)+1, plugins)
             self.assertEqual(
-                {'namespace plugin'},
-                set(plugin.NAME for plugin in plugins))
+                {'namespace plugin'} | get_plugin_names(existing_ns_plugins),
+                get_plugin_names(plugins))
 
             # disable namespace plugins with `PLUGINS = []`
             SETTINGS = {
@@ -103,7 +106,7 @@ class PluginTest(unittest.TestCase):
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 0, plugins)
 
-            # using `PLUGINS`
+            # with `PLUGINS`, load only specified plugins
 
             # normal plugin
             SETTINGS = {
@@ -114,7 +117,7 @@ class PluginTest(unittest.TestCase):
             self.assertEqual(len(plugins), 1, plugins)
             self.assertEqual(
                 {'normal plugin'},
-                set(plugin.NAME for plugin in plugins))
+                get_plugin_names(plugins))
 
             # namespace plugin short
             SETTINGS = {
@@ -124,7 +127,7 @@ class PluginTest(unittest.TestCase):
             self.assertEqual(len(plugins), 1, plugins)
             self.assertEqual(
                 {'namespace plugin'},
-                set(plugin.NAME for plugin in plugins))
+                get_plugin_names(plugins))
 
             # namespace plugin long
             SETTINGS = {
@@ -134,7 +137,7 @@ class PluginTest(unittest.TestCase):
             self.assertEqual(len(plugins), 1, plugins)
             self.assertEqual(
                 {'namespace plugin'},
-                set(plugin.NAME for plugin in plugins))
+                get_plugin_names(plugins))
 
             # normal and namespace plugin
             SETTINGS = {
@@ -145,4 +148,4 @@ class PluginTest(unittest.TestCase):
             self.assertEqual(len(plugins), 2, plugins)
             self.assertEqual(
                 {'normal plugin', 'namespace plugin'},
-                set(plugin.NAME for plugin in plugins))
+                get_plugin_names(plugins))

From eb05aa8ce5c4dff8b836ce321dd371ee2eb8da85 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 14 Apr 2020 23:27:20 +0300
Subject: [PATCH 2293/2864] Add a draft without date for #2488

---
 .../drafts/a-draft-article-without-date.html  | 66 +++++++++++++
 .../drafts/a-draft-article-without-date.html  | 97 +++++++++++++++++++
 .../drafts/a-draft-article-without-date.html  | 97 +++++++++++++++++++
 .../content/draft_article without_date.rst    |  7 ++
 4 files changed, 267 insertions(+)
 create mode 100644 pelican/tests/output/basic/drafts/a-draft-article-without-date.html
 create mode 100644 pelican/tests/output/custom/drafts/a-draft-article-without-date.html
 create mode 100644 pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
 create mode 100644 samples/content/draft_article without_date.rst

diff --git a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
new file mode 100644
index 00000000..5187afab
--- /dev/null
+++ b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
+        <title>A draft article without date</title>
+        <link rel="stylesheet" href="/theme/css/main.css" />
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+</head>
+
+<body id="index" class="home">
+        <header id="banner" class="body">
+                <h1><a href="/">A Pelican Blog</a></h1>
+                <nav><ul>
+                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="/category/bar.html">bar</a></li>
+                    <li><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="/drafts/a-draft-article-without-date.html" rel="bookmark"
+           title="Permalink to A draft article without date">A draft article without date</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="9999-12-31T23:59:59.999999+00:00">
+                Published: 
+        </abbr>
+
+<p>In <a href="/category/misc.html">misc</a>.</p>
+
+</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
+listed anywhere else.</p>
+
+    </div><!-- /.entry-content -->
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
new file mode 100644
index 00000000..3c61b23c
--- /dev/null
+++ b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
+        <title>A draft article without date</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../drafts/a-draft-article-without-date.html" rel="bookmark"
+           title="Permalink to A draft article without date">A draft article without date</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2012-03-02T14:01:01+01:00">
+                Published: Fri 02 March 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>.</p>
+
+</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
+listed anywhere else.</p>
+
+    </div><!-- /.entry-content -->
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>links</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
new file mode 100644
index 00000000..327d6460
--- /dev/null
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+        <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
+        <title>A draft article without date</title>
+        <link rel="stylesheet" href="../theme/css/main.css" />
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+</head>
+
+<body id="index" class="home">
+<a href="http://github.com/ametaireau/">
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+        <header id="banner" class="body">
+                <h1><a href="../">Alexis' log</a></h1>
+                <nav><ul>
+                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li><a href="../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                    <li><a href="../category/cat1.html">cat1</a></li>
+                    <li><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
+        </header><!-- /#banner -->
+<section id="content" class="body">
+  <article>
+    <header>
+      <h1 class="entry-title">
+        <a href="../drafts/a-draft-article-without-date.html" rel="bookmark"
+           title="Permalink to A draft article without date">A draft article without date</a></h1>
+    </header>
+
+    <div class="entry-content">
+<footer class="post-info">
+        <abbr class="published" title="2012-03-02T14:01:01+01:00">
+                Published: 02 mars 2012
+        </abbr>
+
+        <address class="vcard author">
+                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+        </address>
+<p>In <a href="../category/misc.html">misc</a>.</p>
+
+</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
+listed anywhere else.</p>
+
+    </div><!-- /.entry-content -->
+
+  </article>
+</section>
+        <section id="extras" class="body">
+                <div class="blogroll">
+                        <h2>links</h2>
+                        <ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
+                </div><!-- /.blogroll -->
+                <div class="social">
+                        <h2>social</h2>
+                        <ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
+                </div><!-- /.social -->
+        </section><!-- /#extras -->
+
+        <footer id="contentinfo" class="body">
+                <address id="about" class="vcard body">
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                </address><!-- /#about -->
+
+                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+        </footer><!-- /#contentinfo -->
+
+<script type="text/javascript">
+    var disqus_shortname = 'blog-notmyidea';
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/samples/content/draft_article without_date.rst b/samples/content/draft_article without_date.rst
new file mode 100644
index 00000000..5ac62034
--- /dev/null
+++ b/samples/content/draft_article without_date.rst	
@@ -0,0 +1,7 @@
+A draft article without date
+############################
+
+:status: draft
+
+This is a draft article, it should live under the /drafts/ folder and not be
+listed anywhere else.

From 9eb259af82567a568b0c5a57e97859d04c1a8ec8 Mon Sep 17 00:00:00 2001
From: David Zaslavsky <diazona@ellipsix.net>
Date: Wed, 15 Apr 2020 01:35:04 -0700
Subject: [PATCH 2294/2864] Wrong path for attached static content urls (#2158)

* Document _URL/_SAVE_AS path matching req. Fix #2158

This commit addresses the fact that some URLs (primarily {attach}) are based
on the *_SAVE_AS path instead of the *_URL path. It updates the documentation
to point out that the paths of corresponding _URL and _SAVE_AS settings should
match, and that the OUTPUT directory should correspond to the web server's
document root, in order to avoid producing these incorrect URLs.

* Clarify {attach} and *_URL / *_SAVE_AS caveat

Co-authored-by: Justin Mayer <entroP@gmail.com>
---
 docs/content.rst  |  4 ++++
 docs/settings.rst | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/content.rst b/docs/content.rst
index a52425a4..6affecce 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -370,6 +370,10 @@ of ``{attach}``, and letting the file's location be determined by the project's
 ``STATIC_SAVE_AS`` and ``STATIC_URL`` settings. (Per-file ``save_as`` and
 ``url`` overrides can still be set in ``EXTRA_PATH_METADATA``.)
 
+.. note::
+    When using ``{attach}``, any parent directory in ``*_URL`` / ``*_SAVE_AS``
+    settings should match each other. See also: :ref:`url-settings`
+
 Linking to authors, categories, index and tags
 ----------------------------------------------
 
diff --git a/docs/settings.rst b/docs/settings.rst
index befb6f05..bb673ec0 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -168,7 +168,8 @@ Basic settings
 
 .. data:: OUTPUT_PATH = 'output/'
 
-   Where to output the generated files.
+   Where to output the generated files. This should correspond to your web
+   server's virtual host root directory.
 
 .. data:: PATH
 
@@ -358,6 +359,7 @@ Basic settings
 
    The IP to which to bind the HTTP server.
 
+.. _url-settings:
 
 URL settings
 ============
@@ -378,6 +380,12 @@ variables allow you to place your articles in a location such as
 example below). These settings give you the flexibility to place your articles
 and pages anywhere you want.
 
+.. note::
+    If a ``*_SAVE_AS`` setting contains a parent directory that doesn't match
+    the parent directory inside the corresponding ``*_URL`` setting, this may
+    cause Pelican to generate unexpected URLs in a few cases, such as when
+    using the ``{attach}`` syntax.
+
 If you don't want that flexibility and instead prefer that your generated
 output paths mirror your source content's filesystem path hierarchy, try the
 following settings::

From 7e52b61934b0fd2fa830125bfb1fedbddf08f11d Mon Sep 17 00:00:00 2001
From: Cropse <cropse@users.noreply.github.com>
Date: Wed, 15 Apr 2020 16:42:21 +0800
Subject: [PATCH 2295/2864] Enhance JINJA_FILTERS setting docs (#2126)

---
 docs/settings.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index bb673ec0..75bd6827 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -98,7 +98,10 @@ Basic settings
    should map the filtername to the filter function.
 
    Example::
+    import sys
+    sys.path.append('to/your/path')
 
+    from custom_filter import urlencode_filter
     JINJA_FILTERS = {'urlencode': urlencode_filter}
 
    See: `Jinja custom filters documentation`_.

From 9d10abaed4c3fd208dee98ed431ab6ddfbb0d6fa Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 15 Apr 2020 14:55:41 +0200
Subject: [PATCH 2296/2864] Fix output directory deletion logic

The intention was to prevent accidental source content data loss by
skipping output directory deletion if the output directory is a parent
of the source content directory. But the previous implementation did so
by checking path *strings*, resulting in scenarios where the following
settings would erroneously skip deletion of the output directory:

PATH = "/repo/docs-src/content"
OUTPUT_PATH = "/repo/docs"

The output directory should have been deleted but wasn't because the
PATH string contains "/repo/docs". This change eschews string comparison
and instead compares actual paths to ensure that the output path is not
a parent of the source content directory.
---
 pelican/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 97135a62..e19644e0 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -99,10 +99,11 @@ class Pelican(object):
             ) for cls in self.get_generator_classes()
         ]
 
-        # erase the directory if it is not the source and if that's
-        # explicitly asked
-        if (self.delete_outputdir and not
-                os.path.realpath(self.path).startswith(self.output_path)):
+        # Delete the output directory if (1) the appropriate setting is True
+        # and (2) that directory is not the parent of the source directory
+        if (self.delete_outputdir
+                and os.path.commonpath([self.output_path]) !=
+                os.path.commonpath([self.output_path, self.path])):
             clean_output_dir(self.output_path, self.output_retention)
 
         for p in generators:

From d536cd223957cc2591cbc0b1307007d07deba50c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 15 Apr 2020 16:54:17 +0200
Subject: [PATCH 2297/2864] Put summary in notmyidea "description" HTML
 metadata

---
 pelican/themes/notmyidea/templates/article.html | 7 +++++++
 pelican/themes/notmyidea/templates/base.html    | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 98c91bbc..6abcb09d 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -1,5 +1,12 @@
 {% extends "base.html" %}
 {% block html_lang %}{{ article.lang }}{% endblock %}
+{% block head -%}
+  {{ super() -}}
+  {% if article.summary %}
+        <meta name="description" content="{{ article.summary | striptags | safe | truncate(150) }}" />
+  {% endif %}
+{% endblock %}
+
 {% block title %}{{ article.title|striptags }}{% endblock %}
 
 {% block extra_head %}
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 34ed4e97..6be5f1d8 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock html_lang %}">
 <head>
+        {% block head %}
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
@@ -12,6 +13,7 @@
         <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
         {% endif %}
         {% block extra_head %}{% endblock extra_head %}
+        {% endblock head %}
 </head>
 
 <body id="index" class="home">

From 540c06b2b8b678992b22e4df29e5671f93851fda Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 15 Apr 2020 16:58:03 +0200
Subject: [PATCH 2298/2864] Update test output with "description" metadata tag

---
 pelican/tests/output/basic/a-markdown-powered-article.html       | 1 +
 pelican/tests/output/basic/article-1.html                        | 1 +
 pelican/tests/output/basic/article-2.html                        | 1 +
 pelican/tests/output/basic/article-3.html                        | 1 +
 .../tests/output/basic/drafts/a-draft-article-without-date.html  | 1 +
 pelican/tests/output/basic/drafts/a-draft-article.html           | 1 +
 pelican/tests/output/basic/filename_metadata-example.html        | 1 +
 pelican/tests/output/basic/oh-yeah-fr.html                       | 1 +
 pelican/tests/output/basic/oh-yeah.html                          | 1 +
 pelican/tests/output/basic/second-article-fr.html                | 1 +
 pelican/tests/output/basic/second-article.html                   | 1 +
 pelican/tests/output/basic/tag/baz.html                          | 1 +
 pelican/tests/output/basic/this-is-a-super-article.html          | 1 +
 pelican/tests/output/basic/unbelievable.html                     | 1 +
 pelican/tests/output/custom/a-markdown-powered-article.html      | 1 +
 pelican/tests/output/custom/article-1.html                       | 1 +
 pelican/tests/output/custom/article-2.html                       | 1 +
 pelican/tests/output/custom/article-3.html                       | 1 +
 .../tests/output/custom/drafts/a-draft-article-without-date.html | 1 +
 pelican/tests/output/custom/drafts/a-draft-article.html          | 1 +
 pelican/tests/output/custom/filename_metadata-example.html       | 1 +
 pelican/tests/output/custom/oh-yeah-fr.html                      | 1 +
 pelican/tests/output/custom/oh-yeah.html                         | 1 +
 pelican/tests/output/custom/second-article-fr.html               | 1 +
 pelican/tests/output/custom/second-article.html                  | 1 +
 pelican/tests/output/custom/tag/baz.html                         | 1 +
 pelican/tests/output/custom/this-is-a-super-article.html         | 1 +
 pelican/tests/output/custom/unbelievable.html                    | 1 +
 .../custom_locale/drafts/a-draft-article-without-date.html       | 1 +
 pelican/tests/output/custom_locale/drafts/a-draft-article.html   | 1 +
 pelican/tests/output/custom_locale/oh-yeah-fr.html               | 1 +
 .../posts/2010/décembre/02/this-is-a-super-article/index.html    | 1 +
 .../custom_locale/posts/2010/octobre/15/unbelievable/index.html  | 1 +
 .../custom_locale/posts/2010/octobre/20/oh-yeah/index.html       | 1 +
 .../posts/2011/avril/20/a-markdown-powered-article/index.html    | 1 +
 .../custom_locale/posts/2011/février/17/article-1/index.html     | 1 +
 .../custom_locale/posts/2011/février/17/article-2/index.html     | 1 +
 .../custom_locale/posts/2011/février/17/article-3/index.html     | 1 +
 .../posts/2012/février/29/second-article/index.html              | 1 +
 .../posts/2012/novembre/30/filename_metadata-example/index.html  | 1 +
 pelican/tests/output/custom_locale/second-article-fr.html        | 1 +
 pelican/tests/output/custom_locale/tag/baz.html                  | 1 +
 42 files changed, 42 insertions(+)

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 1e080c8f..894fb8c9 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -6,6 +6,7 @@
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 63cc0170..5e1196b7 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -6,6 +6,7 @@
         <title>Article 1</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        <meta name="description" content="Article 1" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index cde9dce1..7dab6907 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -6,6 +6,7 @@
         <title>Article 2</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        <meta name="description" content="Article 2" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 4887ecc8..ba934652 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -6,6 +6,7 @@
         <title>Article 3</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        <meta name="description" content="Article 3" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
index 5187afab..039f2187 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
@@ -6,6 +6,7 @@
         <title>A draft article without date</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index 3e6ed5f0..068b414a 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -6,6 +6,7 @@
         <title>A draft article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 29aabac3..6a6ee389 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -6,6 +6,7 @@
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        <meta name="description" content="Some cool stuff!" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/oh-yeah-fr.html b/pelican/tests/output/basic/oh-yeah-fr.html
index e605ac2e..58b933aa 100644
--- a/pelican/tests/output/basic/oh-yeah-fr.html
+++ b/pelican/tests/output/basic/oh-yeah-fr.html
@@ -8,6 +8,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
       <link rel="alternate" hreflang="en" href="/oh-yeah.html">
 
+        <meta name="description" content="Et voila du contenu en français" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index d01a631e..1b8077f8 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -8,6 +8,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
       <link rel="alternate" hreflang="fr" href="/oh-yeah-fr.html">
 
+        <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index f3c39ca4..87b95cc4 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -8,6 +8,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
       <link rel="alternate" hreflang="en" href="/second-article.html">
 
+        <meta name="description" content="Ceci est un article, en français." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index a7ea7780..3e0c5296 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -8,6 +8,7 @@
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
       <link rel="alternate" hreflang="fr" href="/second-article-fr.html">
 
+        <meta name="description" content="This is some article, in english" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 259b17fe..c891121e 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -6,6 +6,7 @@
         <title>The baz tag</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        <meta name="description" content="This article overrides the listening of the articles under the baz tag." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 220817d3..bd1472e4 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -6,6 +6,7 @@
         <title>This is a super article !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        <meta name="description" content="Multi-line metadata should be supported as well as inline markup." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 8cdc892c..e0836d70 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -6,6 +6,7 @@
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
         <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index e797c35a..00aa18e8 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index a2954757..cc15ba5c 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Article 1" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 5a964cdb..cc331a4d 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Article 2" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index ef656391..8b180180 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Article 3" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
index 3c61b23c..03aecc56 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 3316df7c..87be8bec 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 765b06c1..2fcbe562 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Some cool stuff!" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index b5504212..bb7eb44e 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -9,6 +9,7 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
       <link rel="alternate" hreflang="en" href="./oh-yeah.html">
 
+        <meta name="description" content="Et voila du contenu en français" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index dff78a30..f7afb399 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -9,6 +9,7 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
       <link rel="alternate" hreflang="fr" href="./oh-yeah-fr.html">
 
+        <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 4c6894d3..8e360e9c 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -9,6 +9,7 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
       <link rel="alternate" hreflang="en" href="./second-article.html">
 
+        <meta name="description" content="Ceci est un article, en français." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 3004b068..5001f0d0 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -9,6 +9,7 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
       <link rel="alternate" hreflang="fr" href="./second-article-fr.html">
 
+        <meta name="description" content="This is some article, in english" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 3bcda170..ef53c34c 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="This article overrides the listening of the articles under the baz tag." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index da602d45..55053cb2 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Multi-line metadata should be supported as well as inline markup." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 024d428f..0132162c 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="./theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
index 327d6460..c289ec72 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 1a7e9427..a166efdf 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 01188766..58859a3a 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -9,6 +9,7 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
       <link rel="alternate" hreflang="en" href="./posts/2010/octobre/20/oh-yeah/">
 
+        <meta name="description" content="Et voila du contenu en français" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index 9a376c44..dee44f28 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Multi-line metadata should be supported as well as inline markup." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index c31cdfab..e42c70f6 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index fdc8efde..1bf74b57 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -9,6 +9,7 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
       <link rel="alternate" hreflang="fr" href="../../../../../oh-yeah-fr.html">
 
+        <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index db3d04d2..0f35847a 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index 1c153b0f..05418036 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Article 1" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index 9ee6269f..8cb67749 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Article 2" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index e1374f0c..62423814 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Article 3" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index ba8b3ee0..615a7f30 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -9,6 +9,7 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
       <link rel="alternate" hreflang="fr" href="../../../../../second-article-fr.html">
 
+        <meta name="description" content="This is some article, in english" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 7f15782e..2213d174 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="Some cool stuff!" />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index b0c92d9f..3c21ef75 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -9,6 +9,7 @@
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
       <link rel="alternate" hreflang="en" href="./posts/2012/février/29/second-article/">
 
+        <meta name="description" content="Ceci est un article, en français." />
 </head>
 
 <body id="index" class="home">
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 8896bad3..9554bdd6 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="../theme/css/main.css" />
         <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
         <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        <meta name="description" content="This article overrides the listening of the articles under the baz tag." />
 </head>
 
 <body id="index" class="home">

From 8ba00dd9f12f59f67be88175f25b0109f2039a61 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 15 Apr 2020 20:42:21 +0200
Subject: [PATCH 2299/2864] Preserve category case in importer

Adds a `preserve_case` parameter to the `slugify()` function and uses it
to preserve capital letters in category names when using the Pelican
importer.
---
 pelican/tests/test_importer.py  | 6 +++---
 pelican/tests/test_utils.py     | 6 ++++++
 pelican/tools/pelican_import.py | 6 ++++--
 pelican/utils.py                | 5 +++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 1a6ce404..f7346b9a 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
 import locale
 import os
@@ -138,7 +138,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
         index = 0
         for post in test_posts:
             name = post[2]
-            category = slugify(post[5][0], regex_subs=subs)
+            category = slugify(post[5][0], regex_subs=subs, preserve_case=True)
             name += '.md'
             filename = os.path.join(category, name)
             out_name = fnames[index]
@@ -215,7 +215,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
         for post in test_posts:
             name = post[2]
             kind = post[8]
-            category = slugify(post[5][0], regex_subs=subs)
+            category = slugify(post[5][0], regex_subs=subs, preserve_case=True)
             name += '.md'
             filename = os.path.join(kind, category, name)
             out_name = fnames[index]
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index ad90a78e..3a8c4bd8 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -122,6 +122,12 @@ class TestUtils(LoggedTestCase):
         for value, expected in samples:
             self.assertEqual(utils.slugify(value, regex_subs=subs), expected)
 
+        self.assertEqual(utils.slugify('Cat', regex_subs=subs), 'cat')
+        self.assertEqual(
+            utils.slugify('Cat', regex_subs=subs, preserve_case=False), 'cat')
+        self.assertEqual(
+            utils.slugify('Cat', regex_subs=subs, preserve_case=True), 'Cat')
+
     def test_slugify_substitute(self):
 
         samples = (('C++ is based on C', 'cpp-is-based-on-c'),
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 335f1953..bb3b8fc3 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -634,7 +634,8 @@ def get_out_filename(output_path, filename, ext, kind,
             typename = ''
             kind = 'article'
         if dircat and (len(categories) > 0):
-            catname = slugify(categories[0], regex_subs=slug_subs)
+            catname = slugify(
+                categories[0], regex_subs=slug_subs, preserve_case=True)
         else:
             catname = ''
         out_filename = os.path.join(output_path, typename,
@@ -643,7 +644,8 @@ def get_out_filename(output_path, filename, ext, kind,
             os.makedirs(os.path.join(output_path, typename, catname))
     # option to put files in directories with categories names
     elif dircat and (len(categories) > 0):
-        catname = slugify(categories[0], regex_subs=slug_subs)
+        catname = slugify(
+            categories[0], regex_subs=slug_subs, preserve_case=True)
         out_filename = os.path.join(output_path, catname, filename + ext)
         if not os.path.isdir(os.path.join(output_path, catname)):
             os.mkdir(os.path.join(output_path, catname))
diff --git a/pelican/utils.py b/pelican/utils.py
index 4b5b7134..b1536de8 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -222,7 +222,7 @@ def pelican_open(filename, mode='r', strip_crs=(sys.platform == 'win32')):
     yield content
 
 
-def slugify(value, regex_subs=()):
+def slugify(value, regex_subs=(), preserve_case=False):
     """
     Normalizes string, converts to lowercase, removes non-alpha characters,
     and converts spaces to hyphens.
@@ -245,7 +245,8 @@ def slugify(value, regex_subs=()):
         value = re.sub(src, dst, value, flags=re.IGNORECASE)
 
     # convert to lowercase
-    value = value.lower()
+    if not preserve_case:
+        value = value.lower()
 
     # we want only ASCII chars
     value = value.encode('ascii', 'ignore').strip()

From 5365a1cdb3ae57e92b89e7c2d8c0915bbeaf05c4 Mon Sep 17 00:00:00 2001
From: Tim Janik <timj@gnu.org>
Date: Wed, 18 Apr 2018 23:10:34 +0200
Subject: [PATCH 2300/2864] PELICAN: pelican_import.py: add support for
 pelican-import -m asciidoc

Signed-off-by: Tim Janik <timj@gnu.org>
---
 pelican/tools/pelican_import.py | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index bb3b8fc3..77226cd3 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -571,6 +571,29 @@ def build_header(title, date, author, categories, tags, slug,
     header += '\n'
     return header
 
+def build_asciidoc_header(title, date, author, categories, tags, slug,
+                          status=None, attachments=None):
+    """Build a header from a list of fields"""
+
+    from docutils.utils import column_width
+
+    header = '= %s\n' % title
+    if author:
+        header += '%s\n' % author
+        if date:
+            header += '%s\n' % date
+    if categories:
+        header += ':category: %s\n' % ', '.join(categories)
+    if tags:
+        header += ':tags: %s\n' % ', '.join(tags)
+    if slug:
+        header += ':slug: %s\n' % slug
+    if status:
+        header += ':status: %s\n' % status
+    if attachments:
+        header += ':attachments: %s\n' % ', '.join(attachments)
+    header += '\n'
+    return header
 
 def build_markdown_header(title, date, author, categories, tags,
                           slug, status=None, attachments=None):
@@ -595,7 +618,9 @@ def build_markdown_header(title, date, author, categories, tags,
 
 
 def get_ext(out_markup, in_markup='html'):
-    if in_markup == 'markdown' or out_markup == 'markdown':
+    if out_markup == 'asciidoc':
+        ext = '.adoc'
+    elif in_markup == 'markdown' or out_markup == 'markdown':
         ext = '.md'
     else:
         ext = '.rst'
@@ -775,7 +800,10 @@ def fields2pelican(
             links = None
 
         ext = get_ext(out_markup, in_markup)
-        if ext == '.md':
+        if ext == '.adoc':
+            header = build_asciidoc_header(title, date, author, categories,
+                                           tags, slug, status, attached_files)
+        elif ext == '.md':
             header = build_markdown_header(
                 title, date, author, categories, tags, slug,
                 status, links.values() if links else None)

From 86ff02541f41702304297ff93f4e6bc007604743 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 16 Apr 2020 08:01:10 +0200
Subject: [PATCH 2301/2864] Fix building asciidoc headers in importer & add
 docs

---
 docs/importer.rst               | 6 +++---
 pelican/tools/pelican_import.py | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 88588d17..b8313f49 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -74,8 +74,8 @@ Optional arguments
   -o OUTPUT, --output OUTPUT
                         Output path (default: content)
   -m MARKUP, --markup MARKUP
-                        Output markup format (supports rst & markdown)
-                        (default: rst)
+                        Output markup format: ``rst``, ``markdown``, or ``asciidoc``
+                        (default: ``rst``)
   --dir-cat             Put files in directories with categories name
                         (default: False)
   --dir-page            Put files recognised as pages in "pages/" sub-
@@ -140,4 +140,4 @@ To test the module, one can use sample files:
 - for WordPress: https://www.wpbeginner.com/wp-themes/how-to-add-dummy-content-for-theme-development-in-wordpress/
 - for Dotclear: http://media.dotaddict.org/tda/downloads/lorem-backup.txt
 
-.. _more_categories: https://github.com/getpelican/pelican-plugins/tree/master/more_categories
\ No newline at end of file
+.. _more_categories: https://github.com/getpelican/pelican-plugins/tree/master/more_categories
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 77226cd3..f9a53dbd 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -571,12 +571,11 @@ def build_header(title, date, author, categories, tags, slug,
     header += '\n'
     return header
 
+
 def build_asciidoc_header(title, date, author, categories, tags, slug,
                           status=None, attachments=None):
     """Build a header from a list of fields"""
 
-    from docutils.utils import column_width
-
     header = '= %s\n' % title
     if author:
         header += '%s\n' % author
@@ -802,7 +801,7 @@ def fields2pelican(
         ext = get_ext(out_markup, in_markup)
         if ext == '.adoc':
             header = build_asciidoc_header(title, date, author, categories,
-                                           tags, slug, status, attached_files)
+                                           tags, slug, status, attachments)
         elif ext == '.md':
             header = build_markdown_header(
                 title, date, author, categories, tags, slug,

From fc031174bb1123cf177ff2fbf9b287902b0fc7ac Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 16 Apr 2020 08:10:30 +0200
Subject: [PATCH 2302/2864] Flake8 fix

---
 pelican/tools/pelican_import.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index f9a53dbd..b8a8a5c6 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -594,6 +594,7 @@ def build_asciidoc_header(title, date, author, categories, tags, slug,
     header += '\n'
     return header
 
+
 def build_markdown_header(title, date, author, categories, tags,
                           slug, status=None, attachments=None):
     """Build a header from a list of fields"""

From e18c9d2c60195b25049ad5660e57253410096dc2 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 16 Apr 2020 08:26:09 +0200
Subject: [PATCH 2303/2864] Remove Piwik from theme and settings docs

Name has been changed, and rather than fix it, it makes more sense to
deprecate analytics in Pelican core and relegate them to plugins/themes.
---
 docs/settings.rst                             | 14 --------------
 .../themes/notmyidea/templates/analytics.html | 19 -------------------
 2 files changed, 33 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 75bd6827..af8d627e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1219,20 +1219,6 @@ Feel free to use them in your themes as well.
    A list of tuples (Title, URL) for additional menu items to appear at the
    beginning of the main menu.
 
-.. data:: PIWIK_URL
-
-   URL to your Piwik server - without 'http://' at the beginning.
-
-.. data:: PIWIK_SSL_URL
-
-   If the SSL-URL differs from the normal Piwik-URL you have to include this
-   setting too. (optional)
-
-.. data:: PIWIK_SITE_ID
-
-   ID for the monitored website. You can find the ID in the Piwik admin
-   interface > Settings > Websites.
-
 .. data:: LINKS
 
    A list of tuples (Title, URL) for links to appear on the header.
diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
index a966c4c2..071c77f7 100644
--- a/pelican/themes/notmyidea/templates/analytics.html
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -24,22 +24,3 @@
     })();
     </script>
 {% endif %}
-{% if PIWIK_URL and PIWIK_SITE_ID %}
-    <script type="text/javascript">
-    {% if PIWIK_SSL_URL %}
-        var pkBaseURL = "{{ PIWIK_SSL_URL }}";
-    {% else %}
-        var pkBaseURL = "{{ PIWIK_URL }}";
-    {% endif %}
-    var _paq = _paq || [];
-    _paq.push(["trackPageView"]);
-    _paq.push(["enableLinkTracking"]);
-    (function() {
-        var u=(("https:" == document.location.protocol) ? "https" : "http")+"://"+pkBaseURL+"/";
-        _paq.push(["setTrackerUrl", u+"piwik.php"]);
-        _paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
-        var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-        g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-    })();
-    </script>
-{% endif %}

From d13108b03a0d403f641fbb6f803499e2c7ffa147 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Thu, 16 Apr 2020 11:11:24 +0300
Subject: [PATCH 2304/2864] Reset global state set by tests in test_pelican

Calling read_settings to clear the options put into
pelican.settings.PYGMENTS_RST_OPTIONS in tearDown so
that tests that are run after are not affected
---
 pelican/tests/test_pelican.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index da23cb0a..88122846 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -50,6 +50,7 @@ class TestPelican(LoggedTestCase):
         locale.setlocale(locale.LC_ALL, str('C'))
 
     def tearDown(self):
+        read_settings()  # cleanup PYGMENTS_RST_OPTIONS
         rmtree(self.temp_path)
         rmtree(self.temp_cache)
         locale.setlocale(locale.LC_ALL, self.old_locale)

From f610801ee8c67df5ed7e3223fe54a2578347b88e Mon Sep 17 00:00:00 2001
From: fancsali <fancsali@users.noreply.github.com>
Date: Thu, 16 Apr 2020 12:32:19 +0100
Subject: [PATCH 2305/2864] Add Typogrify/SmartyPants dashes config parameter
 (#2615)

---
 docs/settings.rst                             | 11 +++
 pelican/readers.py                            |  8 +++
 pelican/settings.py                           |  1 +
 .../content/article_with_typogrify_dashes.md  |  3 +
 .../content/article_with_typogrify_dashes.rst |  4 ++
 pelican/tests/test_generators.py              |  6 ++
 pelican/tests/test_readers.py                 | 68 +++++++++++++++++++
 7 files changed, 101 insertions(+)
 create mode 100644 pelican/tests/content/article_with_typogrify_dashes.md
 create mode 100644 pelican/tests/content/article_with_typogrify_dashes.rst

diff --git a/docs/settings.rst b/docs/settings.rst
index af8d627e..48344076 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -279,6 +279,17 @@ Basic settings
    ``pre`` and ``code`` tags. This requires that Typogrify version 2.0.4 or
    later is installed
 
+.. data:: TYPOGRIFY_DASHES = 'default'
+
+   This setting controls how Typogrify sets up the Smartypants filter to
+   interpret multiple dash/hyphen/minus characters. A single ASCII dash
+   character (``-``) is always rendered as a hyphen. The ``default`` setting
+   does not handle en-dashes and converts double-hyphens into em-dashes. The
+   ``oldschool`` setting renders both en-dashes and em-dashes when it sees two
+   (``--``) and three (``---``) hyphen characters, respectively. The
+   ``oldschool_inverted`` setting turns two hyphens into an em-dash and three
+   hyphens into an en-dash.
+
 .. data:: SUMMARY_MAX_LENGTH = 50
 
    When creating a short summary of an article, this will be the default length
diff --git a/pelican/readers.py b/pelican/readers.py
index 6d9923f2..fe53558d 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -585,6 +585,14 @@ class Readers(FileStampDataCacher):
             from typogrify.filters import typogrify
             import smartypants
 
+            typogrify_dashes = self.settings['TYPOGRIFY_DASHES']
+            if typogrify_dashes == 'oldschool':
+                smartypants.Attr.default = smartypants.Attr.set2
+            elif typogrify_dashes == 'oldschool_inverted':
+                smartypants.Attr.default = smartypants.Attr.set3
+            else:
+                smartypants.Attr.default = smartypants.Attr.set1
+
             # Tell `smartypants` to also replace &quot; HTML entities with
             # smart quotes. This is necessary because Docutils has already
             # replaced double quotes with said entities by the time we run
diff --git a/pelican/settings.py b/pelican/settings.py
index c3b29ca5..77aea059 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -138,6 +138,7 @@ DEFAULT_CONFIG = {
     'ARTICLE_PERMALINK_STRUCTURE': '',
     'TYPOGRIFY': False,
     'TYPOGRIFY_IGNORE_TAGS': [],
+    'TYPOGRIFY_DASHES': 'default',
     'SUMMARY_END_MARKER': '…',
     'SUMMARY_MAX_LENGTH': 50,
     'PLUGIN_PATHS': [],
diff --git a/pelican/tests/content/article_with_typogrify_dashes.md b/pelican/tests/content/article_with_typogrify_dashes.md
new file mode 100644
index 00000000..2914b2df
--- /dev/null
+++ b/pelican/tests/content/article_with_typogrify_dashes.md
@@ -0,0 +1,3 @@
+Title: One -, two --, three --- dashes!
+
+One: -; Two: --; Three: ---
diff --git a/pelican/tests/content/article_with_typogrify_dashes.rst b/pelican/tests/content/article_with_typogrify_dashes.rst
new file mode 100644
index 00000000..90064c5d
--- /dev/null
+++ b/pelican/tests/content/article_with_typogrify_dashes.rst
@@ -0,0 +1,4 @@
+One -, two --, three --- dashes!
+################################
+
+One: -; Two: --; Three: ---
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index fdc1b937..d559cec9 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -248,6 +248,10 @@ class TestArticlesGenerator(unittest.TestCase):
             ['Article with template', 'published', 'Default', 'custom'],
             ['Metadata tags as list!', 'published', 'Default', 'article'],
             ['Rst with filename metadata', 'published', 'yeah', 'article'],
+            ['One -, two --, three --- dashes!', 'published', 'Default',
+             'article'],
+            ['One -, two --, three --- dashes!', 'published', 'Default',
+             'article'],
             ['Test Markdown extensions', 'published', 'Default', 'article'],
             ['Test markdown File', 'published', 'test', 'article'],
             ['Test md File', 'published', 'test', 'article'],
@@ -562,6 +566,8 @@ class TestArticlesGenerator(unittest.TestCase):
             'Article with markdown containing footnotes',
             'Article with template',
             'Metadata tags as list!',
+            'One -, two --, three --- dashes!',
+            'One -, two --, three --- dashes!',
             'Rst with filename metadata',
             'Test Markdown extensions',
             'Test markdown File',
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 70e6da77..07590012 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -443,6 +443,40 @@ class RstReaderTest(ReaderTest):
         with self.assertRaisesRegex(Exception, "underline too short"):
             self.read_file(path='../parse_error/parse_error.rst')
 
+    def test_typogrify_dashes_config(self):
+        # Test default config
+        page = self.read_file(
+            path='article_with_typogrify_dashes.rst',
+            TYPOGRIFY=True,
+            TYPOGRIFY_DASHES='default')
+        expected = "<p>One: -; Two: &#8212;; Three:&nbsp;&#8212;-</p>\n"
+        expected_title = "One -, two &#8212;, three &#8212;-&nbsp;dashes!"
+
+        self.assertEqual(page.content, expected)
+        self.assertEqual(page.title, expected_title)
+
+        # Test 'oldschool' variant
+        page = self.read_file(
+            path='article_with_typogrify_dashes.rst',
+            TYPOGRIFY=True,
+            TYPOGRIFY_DASHES='oldschool')
+        expected = "<p>One: -; Two: &#8211;; Three:&nbsp;&#8212;</p>\n"
+        expected_title = "One -, two &#8211;, three &#8212;&nbsp;dashes!"
+
+        self.assertEqual(page.content, expected)
+        self.assertEqual(page.title, expected_title)
+
+        # Test 'oldschool_inverted' variant
+        page = self.read_file(
+            path='article_with_typogrify_dashes.rst',
+            TYPOGRIFY=True,
+            TYPOGRIFY_DASHES='oldschool_inverted')
+        expected = "<p>One: -; Two: &#8212;; Three:&nbsp;&#8211;</p>\n"
+        expected_title = "One -, two &#8212;, three &#8211;&nbsp;dashes!"
+
+        self.assertEqual(page.content, expected)
+        self.assertEqual(page.title, expected_title)
+
 
 @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
 class MdReaderTest(ReaderTest):
@@ -674,6 +708,40 @@ class MdReaderTest(ReaderTest):
         self.assertEqual(metadata, {})
         self.assertEqual(content, '')
 
+    def test_typogrify_dashes_config(self):
+        # Test default config
+        page = self.read_file(
+            path='article_with_typogrify_dashes.md',
+            TYPOGRIFY=True,
+            TYPOGRIFY_DASHES='default')
+        expected = "<p>One: -; Two: &#8212;; Three:&nbsp;&#8212;-</p>"
+        expected_title = "One -, two &#8212;, three &#8212;-&nbsp;dashes!"
+
+        self.assertEqual(page.content, expected)
+        self.assertEqual(page.title, expected_title)
+
+        # Test 'oldschool' variant
+        page = self.read_file(
+            path='article_with_typogrify_dashes.md',
+            TYPOGRIFY=True,
+            TYPOGRIFY_DASHES='oldschool')
+        expected = "<p>One: -; Two: &#8211;; Three:&nbsp;&#8212;</p>"
+        expected_title = "One -, two &#8211;, three &#8212;&nbsp;dashes!"
+
+        self.assertEqual(page.content, expected)
+        self.assertEqual(page.title, expected_title)
+
+        # Test 'oldschool_inverted' variant
+        page = self.read_file(
+            path='article_with_typogrify_dashes.md',
+            TYPOGRIFY=True,
+            TYPOGRIFY_DASHES='oldschool_inverted')
+        expected = "<p>One: -; Two: &#8212;; Three:&nbsp;&#8211;</p>"
+        expected_title = "One -, two &#8212;, three &#8211;&nbsp;dashes!"
+
+        self.assertEqual(page.content, expected)
+        self.assertEqual(page.title, expected_title)
+
 
 class HTMLReaderTest(ReaderTest):
     def test_article_with_comments(self):

From 46e1ec4f99be225d3f6f487de02832b97a26bc23 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 17 Apr 2020 20:08:41 +0300
Subject: [PATCH 2306/2864] Fix legacy plugin loading

---
 pelican/plugins/_utils.py                      | 18 +++++++++++++++++-
 .../normal_plugin/normal_plugin/__init__.py    |  2 ++
 .../normal_plugin/normal_plugin/submodule.py   |  2 ++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 pelican/tests/dummy_plugins/normal_plugin/normal_plugin/submodule.py

diff --git a/pelican/plugins/_utils.py b/pelican/plugins/_utils.py
index a3c9ee77..78c19e54 100644
--- a/pelican/plugins/_utils.py
+++ b/pelican/plugins/_utils.py
@@ -3,6 +3,7 @@ import importlib.machinery
 import importlib.util
 import logging
 import pkgutil
+import sys
 
 
 logger = logging.getLogger(__name__)
@@ -47,8 +48,23 @@ def load_legacy_plugin(plugin, plugin_paths):
     if spec is None:
         raise ImportError('Cannot import plugin `{}`'.format(plugin))
     else:
+        # create module object from spec
         mod = importlib.util.module_from_spec(spec)
-        spec.loader.exec_module(mod)
+        # place it into sys.modules cache
+        # necessary if module imports itself at some point (e.g. packages)
+        sys.modules[spec.name] = mod
+        try:
+            # try to execute it inside module object
+            spec.loader.exec_module(mod)
+        except Exception:  # problem with import
+            try:
+                # remove module from sys.modules since it can't be loaded
+                del sys.modules[spec.name]
+            except KeyError:
+                pass
+            raise
+
+        # if all went well, we have the plugin module
         return mod
 
 
diff --git a/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py b/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py
index 15896087..5838a835 100644
--- a/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py
+++ b/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py
@@ -1,3 +1,5 @@
+from .submodule import noop  # noqa: F401
+
 NAME = 'normal plugin'
 
 
diff --git a/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/submodule.py b/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/submodule.py
new file mode 100644
index 00000000..ba9c8f94
--- /dev/null
+++ b/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/submodule.py
@@ -0,0 +1,2 @@
+def noop():
+    pass

From 03d9c38871e0561c8796350d9f27bfc674027fc2 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 19 Apr 2020 17:23:26 +0300
Subject: [PATCH 2307/2864] Rewrite pelican.utils.slugify to use unicode and
 add tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds a use_unicode kwarg to slugify to keep unicode
characters as is (no ASCII-fying) and add tests for
it. Also reworks how slugification logic.

slugify started with the Django method for slugiying:
 - Normalize to compatibility decomposed from (NFKD)
 - Encode and decode with 'ascii'

This works fine if the decomposed form contains ASCII
characters (i.e. ç can be changed in to c+CEDILLA and
ASCII would keep c only), but fails when decomposition
doesn't result in ASCII characters (i.e. Chinese). To
solve that 'unidecode' was added, which works fine for
both cases. However, old method is now redundant but
was kept. This commit removes the old method and
adjusts logic slightly.

Now slugify will normalize all text with composition
mode (NFKC) to unify format for regex substitutions.
And then if use_unicode is False, uses unidecode to
convert it to ASCII.
---
 pelican/tests/test_utils.py | 39 ++++++++++++++++++++++++++++++++++++
 pelican/utils.py            | 40 ++++++++++++++++++++++---------------
 2 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 3a8c4bd8..4a03cdc4 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -128,6 +128,45 @@ class TestUtils(LoggedTestCase):
         self.assertEqual(
             utils.slugify('Cat', regex_subs=subs, preserve_case=True), 'Cat')
 
+    def test_slugify_use_unicode(self):
+
+        samples = (
+            ('this is a test', 'this-is-a-test'),
+            ('this        is a test', 'this-is-a-test'),
+            ('this → is ← a ↑ test', 'this-is-a-test'),
+            ('this--is---a test', 'this-is-a-test'),
+            ('unicode測試許功蓋，你看到了嗎？', 'unicode測試許功蓋你看到了嗎'),
+            ('Çığ', 'çığ')
+        )
+
+        settings = read_settings()
+        subs = settings['SLUG_REGEX_SUBSTITUTIONS']
+
+        for value, expected in samples:
+            self.assertEqual(
+                utils.slugify(value, regex_subs=subs, use_unicode=True),
+                expected)
+
+        # check with preserve case
+        for value, expected in samples:
+            self.assertEqual(
+                utils.slugify('Çığ', regex_subs=subs,
+                              preserve_case=True, use_unicode=True),
+                'Çığ')
+
+        # check normalization
+        samples = (
+            ('大飯原発４号機、１８日夜起動へ', '大飯原発4号機18日夜起動へ'),
+            (
+                '\N{LATIN SMALL LETTER C}\N{COMBINING CEDILLA}',
+                '\N{LATIN SMALL LETTER C WITH CEDILLA}'
+            )
+        )
+        for value, expected in samples:
+            self.assertEqual(
+                utils.slugify(value, regex_subs=subs, use_unicode=True),
+                expected)
+
     def test_slugify_substitute(self):
 
         samples = (('C++ is based on C', 'cpp-is-based-on-c'),
diff --git a/pelican/utils.py b/pelican/utils.py
index b1536de8..c1b79ed9 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -222,7 +222,7 @@ def pelican_open(filename, mode='r', strip_crs=(sys.platform == 'win32')):
     yield content
 
 
-def slugify(value, regex_subs=(), preserve_case=False):
+def slugify(value, regex_subs=(), preserve_case=False, use_unicode=False):
     """
     Normalizes string, converts to lowercase, removes non-alpha characters,
     and converts spaces to hyphens.
@@ -230,28 +230,36 @@ def slugify(value, regex_subs=(), preserve_case=False):
     Took from Django sources.
     """
 
-    # TODO Maybe steal again from current Django 1.5dev
-    value = Markup(value).striptags()
-    # value must be unicode per se
     import unicodedata
-    from unidecode import unidecode
-    value = unidecode(value)
-    if isinstance(value, bytes):
-        value = value.decode('ascii')
-    # still unicode
-    value = unicodedata.normalize('NFKD', value)
+    import unidecode
 
+    def normalize_unicode(text):
+        # normalize text by compatibility composition
+        # see: https://en.wikipedia.org/wiki/Unicode_equivalence
+        return unicodedata.normalize('NFKC', text)
+
+    # strip tags from value
+    value = Markup(value).striptags()
+
+    # normalization
+    value = normalize_unicode(value)
+
+    if not use_unicode:
+        # ASCII-fy
+        value = unidecode.unidecode(value)
+
+    # perform regex substitutions
     for src, dst in regex_subs:
-        value = re.sub(src, dst, value, flags=re.IGNORECASE)
+        value = re.sub(
+            normalize_unicode(src),
+            normalize_unicode(dst),
+            value,
+            flags=re.IGNORECASE)
 
-    # convert to lowercase
     if not preserve_case:
         value = value.lower()
 
-    # we want only ASCII chars
-    value = value.encode('ascii', 'ignore').strip()
-    # but Pelican should generally use only unicode
-    return value.decode('ascii')
+    return value.strip()
 
 
 def copy(source, destination, ignores=None):

From 97fe235e60a8f46346b35fa32a02ff9e1e5ba395 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 19 Apr 2020 18:51:55 +0300
Subject: [PATCH 2308/2864] Expose use_unicode setting of slugify in settings
 and use it

---
 docs/settings.rst              | 19 +++++++++++++------
 pelican/contents.py            | 15 ++++++++-------
 pelican/settings.py            |  1 +
 pelican/tests/test_contents.py | 11 +++++++++++
 pelican/urlwrappers.py         | 26 +++++++++++++++-----------
 5 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 48344076..60e539d3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -320,12 +320,6 @@ Basic settings
    A list of default Pygments settings for your reStructuredText code blocks.
    See :ref:`internal_pygments_options` for a list of supported options.
 
-.. data:: SLUGIFY_SOURCE = 'title'
-
-   Specifies where you want the slug to be automatically generated from. Can be
-   set to ``title`` to use the 'Title:' metadata tag or ``basename`` to use the
-   article's file name when creating the slug.
-
 .. data:: CACHE_CONTENT = False
 
    If ``True``, saves content in caches.  See
@@ -621,6 +615,19 @@ corresponding ``*_URL`` setting as string, while others hard-code them:
 ``'archives.html'``, ``'authors.html'``, ``'categories.html'``,
 ``'tags.html'``.
 
+
+.. data:: SLUGIFY_SOURCE = 'title'
+
+   Specifies where you want the slug to be automatically generated from. Can be
+   set to ``title`` to use the 'Title:' metadata tag or ``basename`` to use the
+   article's file name when creating the slug.
+
+.. data:: SLUGIFY_USE_UNICODE = False
+
+   Allow unicode characters in slugs. Set ``True`` to keep unicode characters
+   in auto-generated slugs. Otherwise, unicode characters will be replaced
+   with ASCII equivalents.
+
 .. data:: SLUG_REGEX_SUBSTITUTIONS = [
         (r'[^\\w\\s-]', ''),  # remove non-alphabetical/whitespace/'-' chars
         (r'(?u)\\A\\s*', ''),  # strip leading whitespace
diff --git a/pelican/contents.py b/pelican/contents.py
index 40d9c28e..b49e1f2e 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -92,16 +92,17 @@ class Content(object):
         if not hasattr(self, 'slug'):
             if (settings['SLUGIFY_SOURCE'] == 'title' and
                     hasattr(self, 'title')):
-                self.slug = slugify(
-                    self.title,
-                    regex_subs=settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
+                value = self.title
             elif (settings['SLUGIFY_SOURCE'] == 'basename' and
                     source_path is not None):
-                basename = os.path.basename(
-                    os.path.splitext(source_path)[0])
+                value = os.path.basename(os.path.splitext(source_path)[0])
+            else:
+                value = None
+            if value is not None:
                 self.slug = slugify(
-                    basename,
-                    regex_subs=settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
+                    value,
+                    regex_subs=settings.get('SLUG_REGEX_SUBSTITUTIONS', []),
+                    use_unicode=settings['SLUGIFY_USE_UNICODE'])
 
         self.source_path = source_path
         self.relative_source_path = self.get_relative_source_path()
diff --git a/pelican/settings.py b/pelican/settings.py
index 77aea059..0e0397c9 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -155,6 +155,7 @@ DEFAULT_CONFIG = {
     ],
     'INTRASITE_LINK_REGEX': '[{|](?P<what>.*?)[|}]',
     'SLUGIFY_SOURCE': 'title',
+    'SLUGIFY_USE_UNICODE': False,
     'CACHE_CONTENT': False,
     'CONTENT_CACHING_LAYER': 'reader',
     'CACHE_PATH': 'cache',
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 08d4eb73..2a377e75 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -135,6 +135,17 @@ class TestPage(LoggedTestCase):
         page = Page(**page_kwargs)
         self.assertEqual(page.slug, 'foo')
 
+        # test slug from unicode title
+        # slug doesn't use unicode
+        settings['SLUGIFY_SOURCE'] = "title"
+        page_kwargs['metadata']['title'] = '指導書'
+        page = Page(**page_kwargs)
+        self.assertEqual(page.slug, 'zhi-dao-shu')
+        # slug uses unicode
+        settings['SLUGIFY_USE_UNICODE'] = True
+        page = Page(**page_kwargs)
+        self.assertEqual(page.slug, '指導書')
+
     def test_defaultlang(self):
         # If no lang is given, default to the default one.
         page = Page(**self.page_kwargs)
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index cc276b3f..86f9ef32 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -34,15 +34,14 @@ class URLWrapper(object):
         if self._slug is None:
             class_key = '{}_REGEX_SUBSTITUTIONS'.format(
                 self.__class__.__name__.upper())
-            if class_key in self.settings:
-                self._slug = slugify(
-                    self.name,
-                    regex_subs=self.settings[class_key])
-            else:
-                self._slug = slugify(
-                    self.name,
-                    regex_subs=self.settings.get(
-                        'SLUG_REGEX_SUBSTITUTIONS', []))
+            regex_subs = self.settings.get(
+                class_key,
+                self.settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
+            self._slug = slugify(
+                self.name,
+                regex_subs=regex_subs,
+                use_unicode=self.settings.get('SLUGIFY_USE_UNICODE', False)
+            )
         return self._slug
 
     @slug.setter
@@ -61,8 +60,13 @@ class URLWrapper(object):
         return hash(self.slug)
 
     def _normalize_key(self, key):
-        subs = self.settings.get('SLUG_REGEX_SUBSTITUTIONS', [])
-        return slugify(key, regex_subs=subs)
+        class_key = '{}_REGEX_SUBSTITUTIONS'.format(
+            self.__class__.__name__.upper())
+        regex_subs = self.settings.get(
+            class_key,
+            self.settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
+        use_unicode = self.settings.get('SLUGIFY_USE_UNICODE', False)
+        return slugify(key, regex_subs=regex_subs, use_unicode=use_unicode)
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):

From 3b5cdef7f9193b5912d83c108874e0856ccc8fe8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 20 Apr 2020 09:00:38 +0200
Subject: [PATCH 2309/2864] Update dev docs to reflect Poetry behavior change

Otherwise, `poetry install` replaces the editable installation with the
current PyPI version.
---
 docs/contribute.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 221c405b..66890ae7 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -44,8 +44,9 @@ to manually create and activate a virtual environment::
 
 Install the needed dependencies and set up the project::
 
-    pip install -e ~/projects/pelican invoke
+    pip install invoke
     invoke setup
+    pip install -e ~/projects/pelican
 
 Your local environment should now be ready to go!
 

From 4a7cff7688d81e70b2f4dd698c2580ed376d1010 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 20 Apr 2020 11:32:02 +0200
Subject: [PATCH 2310/2864] Fix anchor link to TIMEZONE settings documentation

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 77aea059..b53cde50 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -608,7 +608,7 @@ def configure_settings(settings):
         logger.warning(
             'No timezone information specified in the settings. Assuming'
             ' your timezone is UTC for feed generation. Check '
-            'http://docs.getpelican.com/en/latest/settings.html#timezone '
+            'https://docs.getpelican.com/en/latest/settings.html#TIMEZONE '
             'for more information')
 
     # fix up pagination rules

From 3031ca64c879cd25e99f8b01b81cb162ea793fec Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 20 Apr 2020 11:40:51 +0200
Subject: [PATCH 2311/2864] Fix Python 2/3 cache pickle format incompatibility

---
 pelican/cache.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/cache.py b/pelican/cache.py
index f6adbc35..7d6ee992 100644
--- a/pelican/cache.py
+++ b/pelican/cache.py
@@ -33,7 +33,7 @@ class FileDataCacher(object):
             try:
                 with self._cache_open(self._cache_path, 'rb') as fhandle:
                     self._cache = pickle.load(fhandle)
-            except (IOError, OSError) as err:
+            except (IOError, OSError, UnicodeDecodeError) as err:
                 logger.debug('Cannot load cache %s (this is normal on first '
                              'run). Proceeding with empty cache.\n%s',
                              self._cache_path, err)

From bd699d34e88da469fa71e904e9ce3f7df6276c84 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 21 Apr 2020 00:26:00 +0300
Subject: [PATCH 2312/2864] Expose preserve_case option from slugify

---
 docs/settings.rst              |  6 ++++++
 pelican/contents.py            |  3 ++-
 pelican/settings.py            |  1 +
 pelican/tests/test_contents.py | 35 ++++++++++++++++++++++++----------
 pelican/urlwrappers.py         |  9 ++++++++-
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 60e539d3..8c021563 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -628,6 +628,12 @@ corresponding ``*_URL`` setting as string, while others hard-code them:
    in auto-generated slugs. Otherwise, unicode characters will be replaced
    with ASCII equivalents.
 
+
+.. data:: SLUGIFY_PRESERVE_CASE = False
+
+   Preserve uppercase characters in the slugs. Set ``True`` to keep the
+   uppercase characters in the ``SLUGIFY_SOURCE`` as is.
+
 .. data:: SLUG_REGEX_SUBSTITUTIONS = [
         (r'[^\\w\\s-]', ''),  # remove non-alphabetical/whitespace/'-' chars
         (r'(?u)\\A\\s*', ''),  # strip leading whitespace
diff --git a/pelican/contents.py b/pelican/contents.py
index b49e1f2e..d01b241f 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -102,7 +102,8 @@ class Content(object):
                 self.slug = slugify(
                     value,
                     regex_subs=settings.get('SLUG_REGEX_SUBSTITUTIONS', []),
-                    use_unicode=settings['SLUGIFY_USE_UNICODE'])
+                    preserve_case=settings.get('SLUGIFY_PRESERVE_CASE', False),
+                    use_unicode=settings.get('SLUGIFY_USE_UNICODE', False))
 
         self.source_path = source_path
         self.relative_source_path = self.get_relative_source_path()
diff --git a/pelican/settings.py b/pelican/settings.py
index 0e0397c9..85cacbf0 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -156,6 +156,7 @@ DEFAULT_CONFIG = {
     'INTRASITE_LINK_REGEX': '[{|](?P<what>.*?)[|}]',
     'SLUGIFY_SOURCE': 'title',
     'SLUGIFY_USE_UNICODE': False,
+    'SLUGIFY_PRESERVE_CASE': False,
     'CACHE_CONTENT': False,
     'CONTENT_CACHING_LAYER': 'reader',
     'CACHE_PATH': 'cache',
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 2a377e75..ebde9c3c 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -135,16 +135,31 @@ class TestPage(LoggedTestCase):
         page = Page(**page_kwargs)
         self.assertEqual(page.slug, 'foo')
 
-        # test slug from unicode title
-        # slug doesn't use unicode
-        settings['SLUGIFY_SOURCE'] = "title"
-        page_kwargs['metadata']['title'] = '指導書'
-        page = Page(**page_kwargs)
-        self.assertEqual(page.slug, 'zhi-dao-shu')
-        # slug uses unicode
-        settings['SLUGIFY_USE_UNICODE'] = True
-        page = Page(**page_kwargs)
-        self.assertEqual(page.slug, '指導書')
+        # test slug from title with unicode and case
+
+        inputs = (
+            # (title, expected, preserve_case, use_unicode)
+            ('指導書', 'zhi-dao-shu', False, False),
+            ('指導書', 'Zhi-Dao-Shu', True, False),
+            ('指導書', '指導書', False, True),
+            ('指導書', '指導書', True, True),
+            ('Çığ', 'cig', False, False),
+            ('Çığ', 'Cig', True, False),
+            ('Çığ', 'çığ', False, True),
+            ('Çığ', 'Çığ', True, True),
+        )
+
+        settings = get_settings()
+        page_kwargs = self._copy_page_kwargs()
+        page_kwargs['settings'] = settings
+
+        for title, expected, preserve_case, use_unicode in inputs:
+            settings['SLUGIFY_PRESERVE_CASE'] = preserve_case
+            settings['SLUGIFY_USE_UNICODE'] = use_unicode
+            page_kwargs['metadata']['title'] = title
+            page = Page(**page_kwargs)
+            self.assertEqual(page.slug, expected,
+                             (title, preserve_case, use_unicode))
 
     def test_defaultlang(self):
         # If no lang is given, default to the default one.
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 86f9ef32..d01611ba 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -37,9 +37,11 @@ class URLWrapper(object):
             regex_subs = self.settings.get(
                 class_key,
                 self.settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
+            preserve_case = self.settings.get('SLUGIFY_PRESERVE_CASE', False)
             self._slug = slugify(
                 self.name,
                 regex_subs=regex_subs,
+                preserve_case=preserve_case,
                 use_unicode=self.settings.get('SLUGIFY_USE_UNICODE', False)
             )
         return self._slug
@@ -66,7 +68,12 @@ class URLWrapper(object):
             class_key,
             self.settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
         use_unicode = self.settings.get('SLUGIFY_USE_UNICODE', False)
-        return slugify(key, regex_subs=regex_subs, use_unicode=use_unicode)
+        preserve_case = self.settings.get('SLUGIFY_PRESERVE_CASE', False)
+        return slugify(
+            key,
+            regex_subs=regex_subs,
+            preserve_case=preserve_case,
+            use_unicode=use_unicode)
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):

From 021ef45f758592966631ac0499530180e2cb7421 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 21 Apr 2020 05:36:28 +0200
Subject: [PATCH 2313/2864] Tidy SLUGIFY_* settings documentation

---
 docs/settings.rst | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 8c021563..5b255dcc 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -615,24 +615,22 @@ corresponding ``*_URL`` setting as string, while others hard-code them:
 ``'archives.html'``, ``'authors.html'``, ``'categories.html'``,
 ``'tags.html'``.
 
-
 .. data:: SLUGIFY_SOURCE = 'title'
 
-   Specifies where you want the slug to be automatically generated from. Can be
-   set to ``title`` to use the 'Title:' metadata tag or ``basename`` to use the
+   Specifies from where you want the slug to be automatically generated. Can be
+   set to ``title`` to use the "Title:" metadata tag or ``basename`` to use the
    article's file name when creating the slug.
 
 .. data:: SLUGIFY_USE_UNICODE = False
 
-   Allow unicode characters in slugs. Set ``True`` to keep unicode characters
-   in auto-generated slugs. Otherwise, unicode characters will be replaced
+   Allow Unicode characters in slugs. Set ``True`` to keep Unicode characters
+   in auto-generated slugs. Otherwise, Unicode characters will be replaced
    with ASCII equivalents.
 
-
 .. data:: SLUGIFY_PRESERVE_CASE = False
 
-   Preserve uppercase characters in the slugs. Set ``True`` to keep the
-   uppercase characters in the ``SLUGIFY_SOURCE`` as is.
+   Preserve uppercase characters in slugs. Set ``True`` to keep uppercase
+   characters from ``SLUGIFY_SOURCE`` as-is.
 
 .. data:: SLUG_REGEX_SUBSTITUTIONS = [
         (r'[^\\w\\s-]', ''),  # remove non-alphabetical/whitespace/'-' chars

From 82fcfbcbfcd8a3233f962c1a4a2c1843f8a5e3b1 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 21 Apr 2020 22:57:15 +0300
Subject: [PATCH 2314/2864] Remove duplicate tests in test_contents

TestArticle was a subclass of TestPage and therefore included all
the tests TestPage already had. Effectively tests from TestPage
were run twice. This splits the common parts of TestPage to a
base class called TestBase and TestPage/TestArticle will both
inherit from it.
---
 pelican/tests/test_contents.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index ebde9c3c..4c23a3da 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -22,7 +22,7 @@ TEST_CONTENT = str(generate_lorem_ipsum(n=1))
 TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
 
 
-class TestPage(LoggedTestCase):
+class TestBase(LoggedTestCase):
 
     def setUp(self):
         super().setUp()
@@ -54,6 +54,20 @@ class TestPage(LoggedTestCase):
         from pelican.contents import logger
         logger.enable_filter()
 
+    def _copy_page_kwargs(self):
+        # make a deep copy of page_kwargs
+        page_kwargs = dict([(key, self.page_kwargs[key]) for key in
+                            self.page_kwargs])
+        for key in page_kwargs:
+            if not isinstance(page_kwargs[key], dict):
+                break
+            page_kwargs[key] = dict([(subkey, page_kwargs[key][subkey])
+                                     for subkey in page_kwargs[key]])
+
+        return page_kwargs
+
+
+class TestPage(TestBase):
     def test_use_args(self):
         # Creating a page with arguments passed to the constructor should use
         # them to initialise object's attributes.
@@ -268,18 +282,6 @@ class TestPage(LoggedTestCase):
         custom_page = Page(**page_kwargs)
         self.assertEqual('custom', custom_page.template)
 
-    def _copy_page_kwargs(self):
-        # make a deep copy of page_kwargs
-        page_kwargs = dict([(key, self.page_kwargs[key]) for key in
-                            self.page_kwargs])
-        for key in page_kwargs:
-            if not isinstance(page_kwargs[key], dict):
-                break
-            page_kwargs[key] = dict([(subkey, page_kwargs[key][subkey])
-                                     for subkey in page_kwargs[key]])
-
-        return page_kwargs
-
     def test_signal(self):
         def receiver_test_function(sender):
             receiver_test_function.has_been_called = True
@@ -602,7 +604,7 @@ class TestPage(LoggedTestCase):
         assert content.author == content.authors[0]
 
 
-class TestArticle(TestPage):
+class TestArticle(TestBase):
     def test_template(self):
         # Articles default to article, metadata overwrites
         default_article = Article(**self.page_kwargs)

From 13e138aacd5f54011e9934ec288b0e00e73584ff Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 23 Apr 2020 12:57:04 -0600
Subject: [PATCH 2315/2864] Add dev dependencies expected by `tasks.py`

Black requires at least Python 3.6
---
 pyproject.toml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index e1de7637..20196d15 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.5"
+python = "^3.6"
 feedgenerator = "^1.9"
 jinja2 = "~2.11"
 pygments = "~2.6.1"
@@ -56,6 +56,8 @@ tox = "^3.13"
 flake8 = "^3.7"
 flake8-import-order = "^0.18.1"
 invoke = "^1.3"
+isort = "^4.3.21"
+black = {version = "^19.10b0", allow-prereleases = true}
 
 [tool.poetry.extras]
 markdown = ["markdown"]

From 1ac4abcb6775958119f1dac856306525cf5372aa Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 24 Apr 2020 15:21:05 +0200
Subject: [PATCH 2316/2864] Add Windows support to Invoke tasks

---
 tasks.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/tasks.py b/tasks.py
index 42642e6a..495194ab 100644
--- a/tasks.py
+++ b/tasks.py
@@ -7,22 +7,24 @@ from invoke import task
 PKG_NAME = "pelican"
 PKG_PATH = Path("pelican")
 DOCS_PORT = os.environ.get("DOCS_PORT", 8000)
+BIN_DIR = "bin" if os.name != "nt" else "Scripts"
 ACTIVE_VENV = os.environ.get("VIRTUAL_ENV", None)
 VENV_HOME = Path(os.environ.get("WORKON_HOME", "~/virtualenvs"))
 VENV_PATH = Path(ACTIVE_VENV) if ACTIVE_VENV else (VENV_HOME / PKG_NAME)
 VENV = str(VENV_PATH.expanduser())
+VENV_BIN = Path(VENV) / Path(BIN_DIR)
 
 TOOLS = ["poetry", "pre-commit"]
-POETRY = which("poetry") if which("poetry") else (VENV / Path("bin") / "poetry")
+POETRY = which("poetry") if which("poetry") else (VENV_BIN / "poetry")
 PRECOMMIT = (
-    which("pre-commit") if which("pre-commit") else (VENV / Path("bin") / "pre-commit")
+    which("pre-commit") if which("pre-commit") else (VENV_BIN / "pre-commit")
 )
 
 
 @task
 def docbuild(c):
     """Build documentation"""
-    c.run(f"{VENV}/bin/sphinx-build docs docs/_build")
+    c.run(f"{VENV_BIN}/sphinx-build docs docs/_build")
 
 
 @task(docbuild)
@@ -40,7 +42,7 @@ def docserve(c):
 @task
 def tests(c):
     """Run the test suite"""
-    c.run(f"{VENV}/bin/pytest", pty=True)
+    c.run(f"{VENV_BIN}/pytest", pty=True)
 
 
 @task
@@ -51,7 +53,7 @@ def black(c, check=False, diff=False):
         check_flag = "--check"
     if diff:
         diff_flag = "--diff"
-    c.run(f"{VENV}/bin/black {check_flag} {diff_flag} {PKG_PATH} tasks.py")
+    c.run(f"{VENV_BIN}/black {check_flag} {diff_flag} {PKG_PATH} tasks.py")
 
 
 @task
@@ -62,13 +64,13 @@ def isort(c, check=False, diff=False):
     if diff:
         diff_flag = "--diff"
     c.run(
-        f"{VENV}/bin/isort {check_flag} {diff_flag} --recursive {PKG_PATH}/* tasks.py"
+        f"{VENV_BIN}/isort {check_flag} {diff_flag} --recursive {PKG_PATH}/* tasks.py"
     )
 
 
 @task
 def flake8(c):
-    c.run(f"{VENV}/bin/flake8 {PKG_PATH} tasks.py")
+    c.run(f"{VENV_BIN}/flake8 {PKG_PATH} tasks.py")
 
 
 @task
@@ -83,7 +85,7 @@ def tools(c):
     """Install tools in the virtual environment if not already on PATH"""
     for tool in TOOLS:
         if not which(tool):
-            c.run(f"{VENV}/bin/pip install {tool}")
+            c.run(f"{VENV_BIN}/python -m pip install {tool}")
 
 
 @task
@@ -94,7 +96,7 @@ def precommit(c):
 
 @task
 def setup(c):
-    c.run(f"{VENV}/bin/pip install -U pip")
+    c.run(f"{VENV_BIN}/python -m pip install -U pip")
     tools(c)
     c.run(f"{POETRY} install")
     precommit(c)

From 2cd1d44576ecc4fd0cc532cbb19c2b934ab5c665 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 27 Apr 2020 09:44:09 +0200
Subject: [PATCH 2317/2864] Relax hard/enforced line length to 88 characters

---
 CONTRIBUTING.rst | 6 +++---
 tox.ini          | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 945a5303..9561b04f 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -135,9 +135,9 @@ Contribution quality standards
   <https://pypi.org/project/pycodestyle>`_ or `flake8
   <https://pypi.org/project/flake8/>`_ tools, the latter of which in
   particular will give you some useful hints about ways in which the
-  code/formatting can be improved. If you are relying on your editor for PEP8
-  compliance, note that the line length specified by PEP8 is 79 (excluding the
-  line break).
+  code/formatting can be improved. We try to keep line length within the
+  79-character maximum specified by PEP8. Because that can sometimes compromise
+  readability, the hard/enforced maximum is 88 characters.
 * Ensure your code is compatible with the `officially-supported Python releases`_.
 * Add docs and tests for your changes. Undocumented and untested features will
   not be accepted.
diff --git a/tox.ini b/tox.ini
index a7543a17..23bb518f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,6 +32,7 @@ addopts = -n 2
 [flake8]
 application-import-names = pelican
 import-order-style = cryptography
+max-line-length = 88
 
 [testenv:flake8]
 basepython = python3.6

From d43b786b300358e8a4cbae4afc4052199a7af762 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 26 Apr 2020 09:55:08 +0200
Subject: [PATCH 2318/2864] Modernize code base to Python 3+ syntax

Replaces syntax that was relevant in earlier Python versions but that
now has modernized equivalents.
---
 docs/conf.py                        |  4 +---
 pelican/__init__.py                 | 18 ++++++++--------
 pelican/cache.py                    | 10 ++++-----
 pelican/contents.py                 |  8 +++----
 pelican/generators.py               |  6 ++----
 pelican/log.py                      |  2 --
 pelican/paginator.py                |  8 +++----
 pelican/plugins/signals.py          |  3 ---
 pelican/readers.py                  |  4 +---
 pelican/rstdirectives.py            |  2 --
 pelican/server.py                   |  2 --
 pelican/settings.py                 |  2 --
 pelican/tests/default_conf.py       |  1 -
 pelican/tests/support.py            |  4 +---
 pelican/tests/test_cache.py         |  2 --
 pelican/tests/test_contents.py      | 12 +++++------
 pelican/tests/test_generators.py    | 16 ++++++--------
 pelican/tests/test_importer.py      | 12 +++++------
 pelican/tests/test_paginator.py     |  4 +---
 pelican/tests/test_pelican.py       | 10 ++++-----
 pelican/tests/test_plugins.py       |  7 ++----
 pelican/tests/test_readers.py       |  8 +++----
 pelican/tests/test_rstdirectives.py |  2 --
 pelican/tests/test_server.py        |  4 ++--
 pelican/tests/test_settings.py      |  6 ++----
 pelican/tests/test_testsuite.py     |  2 --
 pelican/tests/test_urlwrappers.py   |  6 ++----
 pelican/tests/test_utils.py         | 24 ++++++++++-----------
 pelican/tools/pelican_import.py     | 17 +++++++--------
 pelican/tools/pelican_quickstart.py | 33 ++++++++++++++---------------
 pelican/tools/pelican_themes.py     | 11 +++++-----
 pelican/urlwrappers.py              |  6 ++----
 pelican/utils.py                    | 10 ++++-----
 pelican/writers.py                  |  4 +---
 samples/pelican.conf.py             |  2 --
 samples/pelican.conf_FR.py          |  2 --
 setup.py                            |  1 -
 37 files changed, 104 insertions(+), 171 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 2be4fbe1..53171646 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 import sys
 
@@ -23,7 +21,7 @@ release = __version__
 version = '.'.join(release.split('.')[:1])
 last_stable = __version__
 rst_prolog = '''
-.. |last_stable| replace:: :pelican-doc:`{0}`
+.. |last_stable| replace:: :pelican-doc:`{}`
 '''.format(last_stable)
 
 # The name of the Pygments (syntax highlighting) style to use.
diff --git a/pelican/__init__.py b/pelican/__init__.py
index e19644e0..40a222ae 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import argparse
 import logging
 import multiprocessing
@@ -40,7 +38,7 @@ DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 logger = logging.getLogger(__name__)
 
 
-class Pelican(object):
+class Pelican:
 
     def __init__(self, settings):
         """Pelican initialisation
@@ -255,7 +253,7 @@ def parse_arguments(argv=None):
 
     parser.add_argument('-s', '--settings', dest='settings',
                         help='The settings of the application, this is '
-                        'automatically set to {0} if a file exists with this '
+                        'automatically set to {} if a file exists with this '
                         'name.'.format(DEFAULT_CONFIG_NAME))
 
     parser.add_argument('-d', '--delete-output-directory',
@@ -494,11 +492,13 @@ def main(argv=None):
         pelican, settings = get_instance(args)
 
         readers = Readers(settings)
-        reader_descs = sorted(set(['%s (%s)' %
-                                   (type(r).__name__,
-                                    ', '.join(r.file_extensions))
-                                   for r in readers.readers.values()
-                                   if r.enabled]))
+        reader_descs = sorted(
+            {
+                '%s (%s)' % (type(r).__name__, ', '.join(r.file_extensions))
+                for r in readers.readers.values()
+                if r.enabled
+            }
+        )
 
         watchers = {'content': folder_watcher(pelican.path,
                                               readers.extensions,
diff --git a/pelican/cache.py b/pelican/cache.py
index 7d6ee992..646f97bc 100644
--- a/pelican/cache.py
+++ b/pelican/cache.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import hashlib
 import logging
 import os
@@ -10,7 +8,7 @@ from pelican.utils import mkdir_p
 logger = logging.getLogger(__name__)
 
 
-class FileDataCacher(object):
+class FileDataCacher:
     """Class that can cache data contained in files"""
 
     def __init__(self, settings, cache_name, caching_policy, load_policy):
@@ -33,7 +31,7 @@ class FileDataCacher(object):
             try:
                 with self._cache_open(self._cache_path, 'rb') as fhandle:
                     self._cache = pickle.load(fhandle)
-            except (IOError, OSError, UnicodeDecodeError) as err:
+            except (OSError, UnicodeDecodeError) as err:
                 logger.debug('Cannot load cache %s (this is normal on first '
                              'run). Proceeding with empty cache.\n%s',
                              self._cache_path, err)
@@ -67,7 +65,7 @@ class FileDataCacher(object):
                 mkdir_p(self.settings['CACHE_PATH'])
                 with self._cache_open(self._cache_path, 'wb') as fhandle:
                     pickle.dump(self._cache, fhandle)
-            except (IOError, OSError, pickle.PicklingError) as err:
+            except (OSError, pickle.PicklingError) as err:
                 logger.warning('Could not save cache %s\n ... %s',
                                self._cache_path, err)
 
@@ -116,7 +114,7 @@ class FileStampDataCacher(FileDataCacher):
 
         try:
             return self._filestamp_func(filename)
-        except (IOError, OSError, TypeError) as err:
+        except (OSError, TypeError) as err:
             logger.warning('Cannot get modification stamp for %s\n\t%s',
                            filename, err)
             return ''
diff --git a/pelican/contents.py b/pelican/contents.py
index d01b241f..2bb2e3a0 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import copy
 import datetime
 import locale
@@ -22,7 +20,7 @@ from pelican.urlwrappers import (Author, Category, Tag, URLWrapper)  # NOQA
 logger = logging.getLogger(__name__)
 
 
-class Content(object):
+class Content:
     """Represents a content.
 
     :param content: the string to parse, containing the original content.
@@ -216,7 +214,7 @@ class Content(object):
     def _expand_settings(self, key, klass=None):
         if not klass:
             klass = self.__class__.__name__
-        fq_key = ('%s_%s' % (klass, key)).upper()
+        fq_key = ('{}_{}'.format(klass, key)).upper()
         return self.settings[fq_key].format(**self.url_format)
 
     def get_url_setting(self, key):
@@ -324,7 +322,7 @@ class Content(object):
                 (?:href|src|poster|data|cite|formaction|action)\s*=\s*)
 
             (?P<quote>["\'])      # require value to be quoted
-            (?P<path>{0}(?P<value>.*?))  # the url value
+            (?P<path>{}(?P<value>.*?))  # the url value
             \2""".format(intrasite_link_regex)
         return re.compile(regex, re.X)
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 232f4759..63e20a0a 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import calendar
 import errno
 import fnmatch
@@ -28,7 +26,7 @@ class PelicanTemplateNotFound(Exception):
     pass
 
 
-class Generator(object):
+class Generator:
     """Baseclass generator"""
 
     def __init__(self, context, settings, path, theme, output_path,
@@ -262,7 +260,7 @@ class _FileLoader(BaseLoader):
         if template != self.path or not os.path.exists(self.fullpath):
             raise TemplateNotFound(template)
         mtime = os.path.getmtime(self.fullpath)
-        with open(self.fullpath, 'r', encoding='utf-8') as f:
+        with open(self.fullpath, encoding='utf-8') as f:
             source = f.read()
         return (source, self.fullpath,
                 lambda: mtime == os.path.getmtime(self.fullpath))
diff --git a/pelican/log.py b/pelican/log.py
index 0576af2a..ac5034d9 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import logging
 import os
 import sys
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 61899056..9d169045 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import functools
 import logging
 import os
@@ -13,7 +11,7 @@ PaginationRule = namedtuple(
 )
 
 
-class Paginator(object):
+class Paginator:
     def __init__(self, name, url, object_list, settings, per_page=None):
         self.name = name
         self.url = url
@@ -61,7 +59,7 @@ class Paginator(object):
     page_range = property(_get_page_range)
 
 
-class Page(object):
+class Page:
     def __init__(self, name, url, object_list, number, paginator, settings):
         self.full_name = name
         self.name, self.extension = os.path.splitext(name)
@@ -74,7 +72,7 @@ class Page(object):
         self.settings = settings
 
     def __repr__(self):
-        return '<Page %s of %s>' % (self.number, self.paginator.num_pages)
+        return '<Page {} of {}>'.format(self.number, self.paginator.num_pages)
 
     def has_next(self):
         return self.number < self.paginator.num_pages
diff --git a/pelican/plugins/signals.py b/pelican/plugins/signals.py
index 18a745b4..4013360f 100644
--- a/pelican/plugins/signals.py
+++ b/pelican/plugins/signals.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
-
 from blinker import signal
 
 # Run-level signals:
diff --git a/pelican/readers.py b/pelican/readers.py
index fe53558d..e6d91760 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import datetime
 import logging
 import os
@@ -101,7 +99,7 @@ def _filter_discardable_metadata(metadata):
     return {name: val for name, val in metadata.items() if val is not _DISCARD}
 
 
-class BaseReader(object):
+class BaseReader:
     """Base class to read files.
 
     This class is used to process static files, and it can be inherited for
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index dda0e6a7..500c8578 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import re
 
 from docutils import nodes, utils
diff --git a/pelican/server.py b/pelican/server.py
index 8434ded5..6ebce876 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import argparse
 import logging
 import os
diff --git a/pelican/settings.py b/pelican/settings.py
index d508aa36..d219a8f2 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import copy
 import importlib.util
 import inspect
diff --git a/pelican/tests/default_conf.py b/pelican/tests/default_conf.py
index 13014572..99f3b6cf 100644
--- a/pelican/tests/default_conf.py
+++ b/pelican/tests/default_conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 AUTHOR = 'Alexis Métaireau'
 SITENAME = "Alexis' log"
 SITEURL = 'http://blog.notmyidea.org'
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 327e672d..8a22052e 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import locale
 import logging
 import os
@@ -134,7 +132,7 @@ def skipIfNoExecutable(executable):
             res = None
 
     if res is None:
-        return unittest.skip('{0} executable not found'.format(executable))
+        return unittest.skip('{} executable not found'.format(executable))
 
     return lambda func: func
 
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index 7357cd9f..cc5218b7 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 from shutil import rmtree
 from tempfile import mkdtemp
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 4c23a3da..93f5b212 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import datetime
 import locale
 import logging
@@ -27,7 +25,7 @@ class TestBase(LoggedTestCase):
     def setUp(self):
         super().setUp()
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
         self.page_kwargs = {
             'content': TEST_CONTENT,
             'context': {
@@ -56,13 +54,13 @@ class TestBase(LoggedTestCase):
 
     def _copy_page_kwargs(self):
         # make a deep copy of page_kwargs
-        page_kwargs = dict([(key, self.page_kwargs[key]) for key in
-                            self.page_kwargs])
+        page_kwargs = {key: self.page_kwargs[key] for key in self.page_kwargs}
         for key in page_kwargs:
             if not isinstance(page_kwargs[key], dict):
                 break
-            page_kwargs[key] = dict([(subkey, page_kwargs[key][subkey])
-                                     for subkey in page_kwargs[key]])
+            page_kwargs[key] = {
+                subkey: page_kwargs[key][subkey] for subkey in page_kwargs[key]
+            }
 
         return page_kwargs
 
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index d559cec9..50e08983 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import locale
 import os
 from shutil import copy, rmtree
@@ -27,7 +25,7 @@ CONTENT_DIR = os.path.join(CUR_DIR, 'content')
 class TestGenerator(unittest.TestCase):
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
         self.settings = get_settings()
         self.settings['READERS'] = {'asc': None}
         self.generator = Generator(self.settings.copy(), self.settings,
@@ -403,7 +401,7 @@ class TestArticlesGenerator(unittest.TestCase):
         'period' : a tuple of year, month, day according to the time period
         """
         old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
         settings = get_settings()
 
         settings['YEAR_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/index.html'
@@ -788,7 +786,7 @@ class TestTemplatePagesGenerator(unittest.TestCase):
         self.temp_content = mkdtemp(prefix='pelicantests.')
         self.temp_output = mkdtemp(prefix='pelicantests.')
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
 
     def tearDown(self):
         rmtree(self.temp_content)
@@ -823,7 +821,7 @@ class TestTemplatePagesGenerator(unittest.TestCase):
         self.assertTrue(os.path.exists(output_path))
 
         # output content is correct
-        with open(output_path, 'r') as output_file:
+        with open(output_path) as output_file:
             self.assertEqual(output_file.read(), 'foo: bar')
 
 
@@ -1013,7 +1011,7 @@ class TestStaticGenerator(unittest.TestCase):
             f.write("staticcontent")
         self.generator.generate_context()
         self.generator.generate_output(None)
-        with open(self.endfile, "r") as f:
+        with open(self.endfile) as f:
             self.assertEqual(f.read(), "staticcontent")
 
     @unittest.skipUnless(MagicMock, 'Needs Mock module')
@@ -1162,7 +1160,7 @@ class TestJinja2Environment(unittest.TestCase):
         self.temp_content = mkdtemp(prefix='pelicantests.')
         self.temp_output = mkdtemp(prefix='pelicantests.')
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
 
     def tearDown(self):
         rmtree(self.temp_content)
@@ -1197,7 +1195,7 @@ class TestJinja2Environment(unittest.TestCase):
         self.assertTrue(os.path.exists(output_path))
 
         # output content is correct
-        with open(output_path, 'r') as output_file:
+        with open(output_path) as output_file:
             self.assertEqual(output_file.read(), expected)
 
     def test_jinja2_filter(self):
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index f7346b9a..709086c0 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import locale
 import os
 import re
@@ -41,7 +39,7 @@ class TestBloggerXmlImporter(unittest.TestCase):
 
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
         self.posts = blogger2fields(BLOGGER_XML_SAMPLE)
 
     def tearDown(self):
@@ -90,7 +88,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
         self.posts = wp2fields(WORDPRESS_XML_SAMPLE)
         self.custposts = wp2fields(WORDPRESS_XML_SAMPLE, True)
 
@@ -282,9 +280,9 @@ class TestWordpressXmlImporter(unittest.TestCase):
 
     def test_decode_wp_content(self):
         """ Check that we can decode a wordpress content string."""
-        with open(WORDPRESS_ENCODED_CONTENT_SAMPLE, 'r') as encoded_file:
+        with open(WORDPRESS_ENCODED_CONTENT_SAMPLE) as encoded_file:
             encoded_content = encoded_file.read()
-            with open(WORDPRESS_DECODED_CONTENT_SAMPLE, 'r') as decoded_file:
+            with open(WORDPRESS_DECODED_CONTENT_SAMPLE) as decoded_file:
                 decoded_content = decoded_file.read()
                 self.assertEqual(
                     decode_wp_content(encoded_content, br=False),
@@ -405,7 +403,7 @@ class TestBuildHeader(unittest.TestCase):
 class TestWordpressXMLAttachements(unittest.TestCase):
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
         self.attachments = get_attachments(WORDPRESS_XML_SAMPLE)
 
     def tearDown(self):
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 9b600a9b..5dc285ae 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import locale
 
 from jinja2.utils import generate_lorem_ipsum
@@ -19,7 +17,7 @@ class TestPage(unittest.TestCase):
     def setUp(self):
         super().setUp()
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
         self.page_kwargs = {
             'content': TEST_CONTENT,
             'context': {
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 88122846..16131e8a 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import locale
 import logging
 import os
@@ -47,7 +45,7 @@ class TestPelican(LoggedTestCase):
         self.temp_cache = mkdtemp(prefix='pelican_cache.')
         self.maxDiff = None
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
 
     def tearDown(self):
         read_settings()  # cleanup PYGMENTS_RST_OPTIONS
@@ -60,7 +58,7 @@ class TestPelican(LoggedTestCase):
         out, err = subprocess.Popen(
             ['git', 'diff', '--no-ext-diff', '--exit-code',
              '-w', left_path, right_path],
-            env={str('PAGER'): str('')},
+            env={'PAGER': ''},
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE
         ).communicate()
@@ -131,9 +129,9 @@ class TestPelican(LoggedTestCase):
     def test_custom_locale_generation_works(self):
         '''Test that generation with fr_FR.UTF-8 locale works'''
         if sys.platform == 'win32':
-            our_locale = str('French')
+            our_locale = 'French'
         else:
-            our_locale = str('fr_FR.UTF-8')
+            our_locale = 'fr_FR.UTF-8'
 
         settings = read_settings(path=SAMPLE_FR_CONFIG, override={
             'PATH': INPUT_PATH,
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
index 4f62c4a5..730aa6d5 100644
--- a/pelican/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
-
 import os
 from contextlib import contextmanager
 
@@ -84,9 +81,9 @@ class PluginTest(unittest.TestCase):
 
     def test_load_plugins(self):
         def get_plugin_names(plugins):
-            return set(
+            return {
                 plugin.NAME if hasattr(plugin, 'NAME') else plugin.__name__
-                for plugin in plugins)
+                for plugin in plugins}
 
         # existing namespace plugins
         existing_ns_plugins = load_plugins({})
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 07590012..3aced39e 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 
 from pelican import readers
@@ -92,9 +90,9 @@ class DefaultReaderTest(ReaderTest):
             for tag in content:
                 readers.find_empty_alt(tag, '/test/path')
                 log_mock.warning.assert_called_with(
-                    u'Empty alt attribute for image %s in %s',
-                    u'test-image.png',
-                    u'/test/path',
+                    'Empty alt attribute for image %s in %s',
+                    'test-image.png',
+                    '/test/path',
                     extra={'limit_msg':
                            'Other images have empty alt attributes'}
                 )
diff --git a/pelican/tests/test_rstdirectives.py b/pelican/tests/test_rstdirectives.py
index 0ff28a4a..36623fc4 100644
--- a/pelican/tests/test_rstdirectives.py
+++ b/pelican/tests/test_rstdirectives.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from pelican.tests.support import unittest
 
 try:
diff --git a/pelican/tests/test_server.py b/pelican/tests/test_server.py
index 824e01ef..68747001 100644
--- a/pelican/tests/test_server.py
+++ b/pelican/tests/test_server.py
@@ -7,12 +7,12 @@ from pelican.server import ComplexHTTPRequestHandler
 from pelican.tests.support import unittest
 
 
-class MockRequest(object):
+class MockRequest:
     def makefile(self, *args, **kwargs):
         return BytesIO(b"")
 
 
-class MockServer(object):
+class MockServer:
     pass
 
 
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index d995527c..8f12f3fd 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import copy
 import locale
 import os
@@ -21,7 +19,7 @@ class TestSettingsConfiguration(unittest.TestCase):
     """
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
         self.PATH = abspath(dirname(__file__))
         default_conf = join(self.PATH, 'default_conf.py')
         self.settings = read_settings(default_conf)
@@ -143,7 +141,7 @@ class TestSettingsConfiguration(unittest.TestCase):
         # Test that the default locale is set if not specified in settings
 
         # Reset locale to Python's default locale
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
         self.assertEqual(self.settings['LOCALE'], DEFAULT_CONFIG['LOCALE'])
 
         configure_settings(self.settings)
diff --git a/pelican/tests/test_testsuite.py b/pelican/tests/test_testsuite.py
index 4f567516..fa930139 100644
--- a/pelican/tests/test_testsuite.py
+++ b/pelican/tests/test_testsuite.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import warnings
 
 from pelican.tests.support import unittest
diff --git a/pelican/tests/test_urlwrappers.py b/pelican/tests/test_urlwrappers.py
index 37af232e..66ae1524 100644
--- a/pelican/tests/test_urlwrappers.py
+++ b/pelican/tests/test_urlwrappers.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from pelican.tests.support import unittest
 from pelican.urlwrappers import Author, Category, Tag, URLWrapper
 
@@ -40,7 +38,7 @@ class TestURLWrapper(unittest.TestCase):
         self.assertNotEqual(tag, author)
 
         # should be equal vs text representing the same name
-        self.assertEqual(tag, u'test')
+        self.assertEqual(tag, 'test')
 
         # should not be equal vs binary
         self.assertNotEqual(tag, b'test')
@@ -54,7 +52,7 @@ class TestURLWrapper(unittest.TestCase):
         self.assertEqual(author, author_equal)
 
         cat_ascii = Category('指導書', settings={})
-        self.assertEqual(cat_ascii, u'zhi dao shu')
+        self.assertEqual(cat_ascii, 'zhi dao shu')
 
     def test_slugify_with_substitutions_and_dots(self):
         tag = Tag('Tag Dot', settings={'TAG_REGEX_SUBSTITUTIONS': [
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 4a03cdc4..f0bc290d 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import locale
 import logging
 import os
@@ -480,9 +478,9 @@ class TestUtils(LoggedTestCase):
         old_locale = locale.setlocale(locale.LC_ALL)
 
         if platform == 'win32':
-            locale.setlocale(locale.LC_ALL, str('Turkish'))
+            locale.setlocale(locale.LC_ALL, 'Turkish')
         else:
-            locale.setlocale(locale.LC_ALL, str('tr_TR.UTF-8'))
+            locale.setlocale(locale.LC_ALL, 'tr_TR.UTF-8')
 
         d = utils.SafeDatetime(2012, 8, 29)
 
@@ -514,9 +512,9 @@ class TestUtils(LoggedTestCase):
         old_locale = locale.setlocale(locale.LC_ALL)
 
         if platform == 'win32':
-            locale.setlocale(locale.LC_ALL, str('French'))
+            locale.setlocale(locale.LC_ALL, 'French')
         else:
-            locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8'))
+            locale.setlocale(locale.LC_ALL, 'fr_FR.UTF-8')
 
         d = utils.SafeDatetime(2012, 8, 29)
 
@@ -557,7 +555,7 @@ class TestCopy(unittest.TestCase):
     def setUp(self):
         self.root_dir = mkdtemp(prefix='pelicantests.')
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
 
     def tearDown(self):
         shutil.rmtree(self.root_dir)
@@ -666,26 +664,26 @@ class TestDateFormatter(unittest.TestCase):
         # This test tries to reproduce an issue that
         # occurred with python3.3 under macos10 only
         if platform == 'win32':
-            locale.setlocale(locale.LC_ALL, str('French'))
+            locale.setlocale(locale.LC_ALL, 'French')
         else:
-            locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8'))
+            locale.setlocale(locale.LC_ALL, 'fr_FR.UTF-8')
         date = utils.SafeDatetime(2014, 8, 14)
         # we compare the lower() dates since macos10 returns
         # "Jeudi" for %A whereas linux reports "jeudi"
         self.assertEqual(
-            u'jeudi, 14 août 2014',
+            'jeudi, 14 août 2014',
             utils.strftime(date, date_format="%A, %d %B %Y").lower())
         df = utils.DateFormatter()
         self.assertEqual(
-            u'jeudi, 14 août 2014',
+            'jeudi, 14 août 2014',
             df(date, date_format="%A, %d %B %Y").lower())
         # Let us now set the global locale to C:
-        locale.setlocale(locale.LC_ALL, str('C'))
+        locale.setlocale(locale.LC_ALL, 'C')
         # DateFormatter should still work as expected
         # since it is the whole point of DateFormatter
         # (This is where pre-2014/4/15 code fails on macos10)
         df_date = df(date, date_format="%A, %d %B %Y").lower()
-        self.assertEqual(u'jeudi, 14 août 2014', df_date)
+        self.assertEqual('jeudi, 14 août 2014', df_date)
 
     @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
                          locale_available('French'),
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index b8a8a5c6..917b78c2 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 import argparse
 import logging
@@ -40,7 +39,7 @@ def decode_wp_content(content, br=True):
             if start == -1:
                 content = content + pre_part
                 continue
-            name = "<pre wp-pre-tag-{0}></pre>".format(pre_index)
+            name = "<pre wp-pre-tag-{}></pre>".format(pre_index)
             pre_tags[name] = pre_part[start:] + "</pre>"
             content = content + pre_part[0:start] + name
             pre_index += 1
@@ -154,7 +153,7 @@ def wp2fields(xml, wp_custpost=False):
 
             content = item.find('encoded').string
             raw_date = item.find('post_date').string
-            if raw_date == u'0000-00-00 00:00:00':
+            if raw_date == '0000-00-00 00:00:00':
                 date = None
             else:
                 date_object = SafeDatetime.strptime(
@@ -258,7 +257,7 @@ def dc2fields(file):
     category_list = {}
     posts = []
 
-    with open(file, 'r', encoding='utf-8') as f:
+    with open(file, encoding='utf-8') as f:
 
         for line in f:
             # remove final \n
@@ -394,7 +393,7 @@ def posterous2fields(api_token, email, password):
 
     def get_posterous_posts(api_token, email, password, page=1):
         base64string = base64.encodestring(
-            ("%s:%s" % (email, password)).encode('utf-8')).replace('\n', '')
+            ("{}:{}".format(email, password)).encode('utf-8')).replace('\n', '')
         url = ("http://posterous.com/api/v2/users/me/sites/primary/"
                "posts?api_token=%s&page=%d") % (api_token, page)
         request = urllib_request.Request(url)
@@ -553,7 +552,7 @@ def build_header(title, date, author, categories, tags, slug,
 
     from docutils.utils import column_width
 
-    header = '%s\n%s\n' % (title, '#' * column_width(title))
+    header = '{}\n{}\n'.format(title, '#' * column_width(title))
     if date:
         header += ':date: %s\n' % date
     if author:
@@ -738,7 +737,7 @@ def download_attachments(output_path, urls):
         try:
             urlretrieve(url, os.path.join(full_path, filename))
             locations[url] = os.path.join(localpath, filename)
-        except (URLError, IOError) as e:
+        except (URLError, OSError) as e:
             # Python 2.7 throws an IOError rather Than URLError
             logger.warning("No file could be downloaded from %s\n%s", url, e)
     return locations
@@ -828,7 +827,7 @@ def fields2pelican(
                     new_content = decode_wp_content(content)
                 else:
                     paragraphs = content.splitlines()
-                    paragraphs = ['<p>{0}</p>'.format(p) for p in paragraphs]
+                    paragraphs = ['<p>{}</p>'.format(p) for p in paragraphs]
                     new_content = ''.join(paragraphs)
 
                 fp.write(new_content)
@@ -862,7 +861,7 @@ def fields2pelican(
 
             os.remove(html_filename)
 
-            with open(out_filename, 'r', encoding='utf-8') as fs:
+            with open(out_filename, encoding='utf-8') as fs:
                 content = fs.read()
                 if out_markup == 'markdown':
                     # In markdown, to insert a <br />, end a line with two
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 2e0e2399..50acdcb6 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 import argparse
 import locale
@@ -87,9 +86,9 @@ def ask(question, answer=str, default=None, length=None):
         r = ''
         while True:
             if default:
-                r = input('> {0} [{1}] '.format(question, default))
+                r = input('> {} [{}] '.format(question, default))
             else:
-                r = input('> {0} '.format(question, default))
+                r = input('> {} '.format(question, default))
 
             r = r.strip()
 
@@ -101,7 +100,7 @@ def ask(question, answer=str, default=None, length=None):
                     print('You must enter something')
             else:
                 if length and len(r) != length:
-                    print('Entry must be {0} characters long'.format(length))
+                    print('Entry must be {} characters long'.format(length))
                 else:
                     break
 
@@ -111,11 +110,11 @@ def ask(question, answer=str, default=None, length=None):
         r = None
         while True:
             if default is True:
-                r = input('> {0} (Y/n) '.format(question))
+                r = input('> {} (Y/n) '.format(question))
             elif default is False:
-                r = input('> {0} (y/N) '.format(question))
+                r = input('> {} (y/N) '.format(question))
             else:
-                r = input('> {0} (y/n) '.format(question))
+                r = input('> {} (y/n) '.format(question))
 
             r = r.strip().lower()
 
@@ -135,9 +134,9 @@ def ask(question, answer=str, default=None, length=None):
         r = None
         while True:
             if default:
-                r = input('> {0} [{1}] '.format(question, default))
+                r = input('> {} [{}] '.format(question, default))
             else:
-                r = input('> {0} '.format(question))
+                r = input('> {} '.format(question))
 
             r = r.strip()
 
@@ -167,7 +166,7 @@ def ask_timezone(question, default, tzurl):
             break
         else:
             print('Please enter a valid time zone:\n'
-                  ' (check [{0}])'.format(tzurl))
+                  ' (check [{}])'.format(tzurl))
     return r
 
 
@@ -199,7 +198,7 @@ needed by Pelican.
         os.environ.get('VIRTUAL_ENV', os.curdir), '.project')
     no_path_was_specified = hasattr(args.path, 'is_default_path')
     if os.path.isfile(project) and no_path_was_specified:
-        CONF['basedir'] = open(project, 'r').read().rstrip("\n")
+        CONF['basedir'] = open(project).read().rstrip("\n")
         print('Using project associated with current virtual environment. '
               'Will save to:\n%s\n' % CONF['basedir'])
     else:
@@ -300,12 +299,12 @@ needed by Pelican.
     try:
         os.makedirs(os.path.join(CONF['basedir'], 'content'))
     except OSError as e:
-        print('Error: {0}'.format(e))
+        print('Error: {}'.format(e))
 
     try:
         os.makedirs(os.path.join(CONF['basedir'], 'output'))
     except OSError as e:
-        print('Error: {0}'.format(e))
+        print('Error: {}'.format(e))
 
     try:
         with open(os.path.join(CONF['basedir'], 'pelicanconf.py'),
@@ -318,7 +317,7 @@ needed by Pelican.
             fd.write(_template.render(**conf_python))
             fd.close()
     except OSError as e:
-        print('Error: {0}'.format(e))
+        print('Error: {}'.format(e))
 
     try:
         with open(os.path.join(CONF['basedir'], 'publishconf.py'),
@@ -327,7 +326,7 @@ needed by Pelican.
             fd.write(_template.render(**CONF))
             fd.close()
     except OSError as e:
-        print('Error: {0}'.format(e))
+        print('Error: {}'.format(e))
 
     if automation:
         try:
@@ -337,7 +336,7 @@ needed by Pelican.
                 fd.write(_template.render(**CONF))
                 fd.close()
         except OSError as e:
-            print('Error: {0}'.format(e))
+            print('Error: {}'.format(e))
         try:
             with open(os.path.join(CONF['basedir'], 'Makefile'),
                       'w', encoding='utf-8') as fd:
@@ -346,7 +345,7 @@ needed by Pelican.
                 fd.write(_template.render(py_v=py_v, **CONF))
                 fd.close()
         except OSError as e:
-            print('Error: {0}'.format(e))
+            print('Error: {}'.format(e))
 
     print('Done. Your new project is available at %s' % CONF['basedir'])
 
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 03acd9ce..96d07c1f 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 import argparse
 import os
@@ -11,7 +10,7 @@ def err(msg, die=None):
     """Print an error message and exits if an exit code is given"""
     sys.stderr.write(msg + '\n')
     if die:
-        sys.exit((die if type(die) is int else 1))
+        sys.exit(die if type(die) is int else 1)
 
 
 try:
@@ -49,7 +48,7 @@ def main():
         help="Show the themes path and exit")
     excl.add_argument(
         '-V', '--version', action='version',
-        version='pelican-themes v{0}'.format(__version__),
+        version='pelican-themes v{}'.format(__version__),
         help='Print the version of this script')
 
     parser.add_argument(
@@ -249,12 +248,12 @@ def clean(v=False):
         if os.path.islink(path):
             if is_broken_link(path):
                 if v:
-                    print('Removing {0}'.format(path))
+                    print('Removing {}'.format(path))
                 try:
                     os.remove(path)
                 except OSError:
-                    print('Error: cannot remove {0}'.format(path))
+                    print('Error: cannot remove {}'.format(path))
                 else:
                     c += 1
 
-    print("\nRemoved {0} broken links".format(c))
+    print("\nRemoved {} broken links".format(c))
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index d01611ba..efe09fbc 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import functools
 import logging
 import os
@@ -10,7 +8,7 @@ logger = logging.getLogger(__name__)
 
 
 @functools.total_ordering
-class URLWrapper(object):
+class URLWrapper:
     def __init__(self, name, settings):
         self.settings = settings
         self._name = name
@@ -110,7 +108,7 @@ class URLWrapper(object):
         "cat/{slug}" Useful for pagination.
 
         """
-        setting = "%s_%s" % (self.__class__.__name__.upper(), key)
+        setting = "{}_{}".format(self.__class__.__name__.upper(), key)
         value = self.settings[setting]
         if not isinstance(value, str):
             logger.warning('%s is set to %s', setting, value)
diff --git a/pelican/utils.py b/pelican/utils.py
index c1b79ed9..d22fb98e 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import datetime
 import fnmatch
 import locale
@@ -99,7 +97,7 @@ class SafeDatetime(datetime.datetime):
             return super().strftime(fmt)
 
 
-class DateFormatter(object):
+class DateFormatter:
     '''A date formatter object used as a jinja filter
 
     Uses the `strftime` implementation and makes sure jinja uses the locale
@@ -125,7 +123,7 @@ class DateFormatter(object):
         return formatted
 
 
-class memoized(object):
+class memoized:
     """Function decorator to cache return values.
 
     If called later with the same arguments, the cached value is returned
@@ -209,7 +207,7 @@ def get_date(string):
     try:
         return dateutil.parser.parse(string, default=default)
     except (TypeError, ValueError):
-        raise ValueError('{0!r} is not a valid date'.format(string))
+        raise ValueError('{!r} is not a valid date'.format(string))
 
 
 @contextmanager
@@ -646,7 +644,7 @@ def get_original_items(items, with_str):
     def _warn_source_paths(msg, items, *extra):
         args = [len(items)]
         args.extend(extra)
-        args.extend((x.source_path for x in items))
+        args.extend(x.source_path for x in items)
         logger.warning('{}: {}'.format(msg, '\n%s' * len(items)), *args)
 
     # warn if several items have the same lang
diff --git a/pelican/writers.py b/pelican/writers.py
index 7bbd216e..7b14714a 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import logging
 import os
 from urllib.parse import urljoin
@@ -16,7 +14,7 @@ from pelican.utils import (get_relative_path, is_selected_for_writing,
 logger = logging.getLogger(__name__)
 
 
-class Writer(object):
+class Writer:
 
     def __init__(self, output_path, settings=None):
         self.output_path = output_path
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 2b99ef5b..1fa7c472 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 AUTHOR = 'Alexis Métaireau'
 SITENAME = "Alexis' log"
 SITESUBTITLE = 'A personal blog.'
diff --git a/samples/pelican.conf_FR.py b/samples/pelican.conf_FR.py
index f87653a4..dc657404 100644
--- a/samples/pelican.conf_FR.py
+++ b/samples/pelican.conf_FR.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 AUTHOR = 'Alexis Métaireau'
 SITENAME = "Alexis' log"
 SITEURL = 'http://blog.notmyidea.org'
diff --git a/setup.py b/setup.py
index 571b1c5e..2d831aa4 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from io import open
 from os import walk
 from os.path import join, relpath
 

From b8f7c584c5b6142ecdf0e08e7fca341ba674d068 Mon Sep 17 00:00:00 2001
From: Kernc <kerncece@gmail.com>
Date: Wed, 29 Apr 2020 18:08:38 +0200
Subject: [PATCH 2319/2864] Fix error strings whitespace

---
 pelican/tools/pelican_import.py | 2 +-
 pelican/utils.py                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 917b78c2..e288711e 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -887,7 +887,7 @@ def fields2pelican(
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Transform feed, Blogger, Dotclear, Posterous, Tumblr, or"
+        description="Transform feed, Blogger, Dotclear, Posterous, Tumblr, or "
                     "WordPress files into reST (rst) or Markdown (md) files. "
                     "Be sure to have pandoc installed.",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
diff --git a/pelican/utils.py b/pelican/utils.py
index d22fb98e..1f3d502c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -616,11 +616,11 @@ def process_translations(content_list, translation_id=None):
         content_list.sort(key=attrgetter(*translation_id))
     except TypeError:
         raise TypeError('Cannot unpack {}, \'translation_id\' must be falsy, a'
-                        'string or a collection of strings'
+                        ' string or a collection of strings'
                         .format(translation_id))
     except AttributeError:
-        raise AttributeError('Cannot use {} as \'translation_id\', there'
-                             'appear to be items without these metadata'
+        raise AttributeError('Cannot use {} as \'translation_id\', there '
+                             'appear to be items without these metadata '
                              'attributes'.format(translation_id))
 
     for id_vals, items in groupby(content_list, attrgetter(*translation_id)):
@@ -728,7 +728,7 @@ def order_content(content_list, order_by='slug'):
                                 })
         else:
             logger.warning(
-                'Invalid *_ORDER_BY setting (%s).'
+                'Invalid *_ORDER_BY setting (%s). '
                 'Valid options are strings and functions.', order_by)
 
     return content_list

From d9809c34fcc0c0fe8cd6e49f6e566e774b9f367c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 30 Apr 2020 15:21:04 +0200
Subject: [PATCH 2320/2864] Allow setting host in Invoke serve & livereload
 tasks

Instead of serving on localhost by default with no way to override, the
host can now be configured, allowing both `serve` and `livereload` tasks
to serve output on non-localhost addresses such as `0.0.0.0`.
---
 pelican/tools/templates/tasks.py.jinja2 | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 0362eba7..1b02d3c9 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -39,7 +39,8 @@ CONFIG = {
     'github_pages_branch': '{{github_pages_branch}}',
     'commit_message': "'Publish site on {}'".format(datetime.date.today().isoformat()),
 {% endif %}
-    # Port for `serve`
+    # Host and port for `serve`
+    'host': 'localhost',
     'port': 8000,
 }
 
@@ -67,17 +68,17 @@ def regenerate(c):
 
 @task
 def serve(c):
-    """Serve site at http://localhost:$PORT/ (default port is 8000)"""
+    """Serve site at http://$HOST:$PORT/ (default is localhost:8000)"""
 
     class AddressReuseTCPServer(RootedHTTPServer):
         allow_reuse_address = True
 
     server = AddressReuseTCPServer(
         CONFIG['deploy_path'],
-        ('', CONFIG['port']),
+        (CONFIG['host'], CONFIG['port']),
         ComplexHTTPRequestHandler)
 
-    sys.stderr.write('Serving on port {port} ...\n'.format(**CONFIG))
+    sys.stderr.write('Serving at {host}:{port} ...\n'.format(**CONFIG))
     server.serve_forever()
 
 @task
@@ -111,8 +112,8 @@ def livereload(c):
     for extension in static_file_extensions:
         static_file = '{0}/static/**/*{1}'.format(theme_path, extension)
         server.watch(static_file, lambda: build(c))
-    # Serve output path on configured port
-    server.serve(port=CONFIG['port'], root=CONFIG['deploy_path'])
+    # Serve output path on configured host and port
+    server.serve(host=CONFIG['host'], port=CONFIG['port'], root=CONFIG['deploy_path'])
 
 {% if cloudfiles %}
 @task

From 82ff563f6fdc098f953e6b1d8369a032ba2a6436 Mon Sep 17 00:00:00 2001
From: Joachim Lusiardi <joachim@lusiardi.de>
Date: Thu, 30 Apr 2020 19:05:48 +0200
Subject: [PATCH 2321/2864] Expose first and last page of pagination (#2618)

---
 pelican/tests/output/custom/author/alexis-metaireau.html      | 3 ++-
 pelican/tests/output/custom/author/alexis-metaireau2.html     | 4 +++-
 pelican/tests/output/custom/author/alexis-metaireau3.html     | 3 ++-
 pelican/tests/output/custom/index.html                        | 3 ++-
 pelican/tests/output/custom/index2.html                       | 4 +++-
 pelican/tests/output/custom/index3.html                       | 3 ++-
 .../tests/output/custom_locale/author/alexis-metaireau.html   | 3 ++-
 .../tests/output/custom_locale/author/alexis-metaireau2.html  | 4 +++-
 .../tests/output/custom_locale/author/alexis-metaireau3.html  | 3 ++-
 pelican/tests/output/custom_locale/index.html                 | 3 ++-
 pelican/tests/output/custom_locale/index2.html                | 4 +++-
 pelican/tests/output/custom_locale/index3.html                | 3 ++-
 pelican/themes/simple/templates/pagination.html               | 4 ++++
 13 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index ca58ea85..7a277e2c 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -122,6 +122,7 @@
 <p class="paginator">
     Page 1 / 3
         <a href="../author/alexis-metaireau2.html">&raquo;</a>
+        <a href="../author/alexis-metaireau3.html">&#8649;</a>
 </p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
@@ -167,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index f295bfa0..a5588090 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -133,9 +133,11 @@ YEAH !</p>
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
+        <a href="../author/alexis-metaireau.html">&#8647;</a>
         <a href="../author/alexis-metaireau.html">&laquo;</a>
     Page 2 / 3
         <a href="../author/alexis-metaireau3.html">&raquo;</a>
+        <a href="../author/alexis-metaireau3.html">&#8649;</a>
 </p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
@@ -181,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 6740f612..095b39b6 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -85,6 +85,7 @@ pelican.conf, it will …</p></div>
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
+        <a href="../author/alexis-metaireau.html">&#8647;</a>
         <a href="../author/alexis-metaireau2.html">&laquo;</a>
     Page 3 / 3
 </p>
@@ -132,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index b1f0df5b..e63db6ec 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -122,6 +122,7 @@
 <p class="paginator">
     Page 1 / 3
         <a href="./index2.html">&raquo;</a>
+        <a href="./index3.html">&#8649;</a>
 </p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
@@ -167,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 9460cc4e..570e3b81 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -133,9 +133,11 @@ YEAH !</p>
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
+        <a href="./index.html">&#8647;</a>
         <a href="./index.html">&laquo;</a>
     Page 2 / 3
         <a href="./index3.html">&raquo;</a>
+        <a href="./index3.html">&#8649;</a>
 </p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
@@ -181,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 0bb90e9e..f92bdbb1 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -85,6 +85,7 @@ pelican.conf, it will …</p></div>
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
+        <a href="./index.html">&#8647;</a>
         <a href="./index2.html">&laquo;</a>
     Page 3 / 3
 </p>
@@ -132,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index b5fdcf36..9b4ca7dd 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -122,6 +122,7 @@
 <p class="paginator">
     Page 1 / 3
         <a href="../author/alexis-metaireau2.html">&raquo;</a>
+        <a href="../author/alexis-metaireau3.html">&#8649;</a>
 </p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
@@ -167,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 5858b465..a1848677 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -133,9 +133,11 @@ YEAH !</p>
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
+        <a href="../author/alexis-metaireau.html">&#8647;</a>
         <a href="../author/alexis-metaireau.html">&laquo;</a>
     Page 2 / 3
         <a href="../author/alexis-metaireau3.html">&raquo;</a>
+        <a href="../author/alexis-metaireau3.html">&#8649;</a>
 </p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
@@ -181,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 6a071a4a..78fdd866 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -85,6 +85,7 @@ pelican.conf, it will …</p></div>
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
+        <a href="../author/alexis-metaireau.html">&#8647;</a>
         <a href="../author/alexis-metaireau2.html">&laquo;</a>
     Page 3 / 3
 </p>
@@ -132,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index de6e3d69..29e12b1b 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -122,6 +122,7 @@
 <p class="paginator">
     Page 1 / 3
         <a href="./index2.html">&raquo;</a>
+        <a href="./index3.html">&#8649;</a>
 </p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
@@ -167,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 54ff8fb8..c0727385 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -133,9 +133,11 @@ YEAH !</p>
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
+        <a href="./index.html">&#8647;</a>
         <a href="./index.html">&laquo;</a>
     Page 2 / 3
         <a href="./index3.html">&raquo;</a>
+        <a href="./index3.html">&#8649;</a>
 </p>
                 </section><!-- /#content -->
         <section id="extras" class="body">
@@ -181,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index ac06a05e..0d2722f2 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -85,6 +85,7 @@ pelican.conf, it will …</p></div>
             </article></li>
                 </ol><!-- /#posts-list -->
 <p class="paginator">
+        <a href="./index.html">&#8647;</a>
         <a href="./index2.html">&laquo;</a>
     Page 3 / 3
 </p>
@@ -132,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/themes/simple/templates/pagination.html b/pelican/themes/simple/templates/pagination.html
index 4219a5c3..588f130c 100644
--- a/pelican/themes/simple/templates/pagination.html
+++ b/pelican/themes/simple/templates/pagination.html
@@ -1,11 +1,15 @@
 {% if DEFAULT_PAGINATION %}
+{% set first_page = articles_paginator.page(1) %}
+{% set last_page = articles_paginator.page(articles_paginator.num_pages) %}
 <p class="paginator">
     {% if articles_page.has_previous() %}
+        <a href="{{ SITEURL }}/{{ first_page.url }}">&#8647;</a>
         <a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&laquo;</a>
     {% endif %}
     Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}
     {% if articles_page.has_next() %}
         <a href="{{ SITEURL }}/{{ articles_next_page.url }}">&raquo;</a>
+        <a href="{{ SITEURL }}/{{ last_page.url }}">&#8649;</a>
     {% endif %}
 </p>
 {% endif %}

From a15f2aba76cc613e134579be299c647057e834cd Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 30 Apr 2020 21:05:47 +0200
Subject: [PATCH 2322/2864] Ensure path & output path comparisons are absolute

Otherwise, the following error could be returned:
"ValueError: Can't mix absolute and relative paths"
---
 pelican/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 40a222ae..0cfb4841 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -100,8 +100,9 @@ class Pelican:
         # Delete the output directory if (1) the appropriate setting is True
         # and (2) that directory is not the parent of the source directory
         if (self.delete_outputdir
-                and os.path.commonpath([self.output_path]) !=
-                os.path.commonpath([self.output_path, self.path])):
+                and os.path.commonpath([os.path.realpath(self.output_path)]) !=
+                os.path.commonpath([os.path.realpath(self.output_path),
+                    os.path.realpath(self.path)])):
             clean_output_dir(self.output_path, self.output_retention)
 
         for p in generators:

From e83a8032e802caf0f9f2b0c409f78b42691532a0 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 30 Apr 2020 21:21:14 +0200
Subject: [PATCH 2323/2864] Flake8 fix

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0cfb4841..09ecf26a 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -102,7 +102,7 @@ class Pelican:
         if (self.delete_outputdir
                 and os.path.commonpath([os.path.realpath(self.output_path)]) !=
                 os.path.commonpath([os.path.realpath(self.output_path),
-                    os.path.realpath(self.path)])):
+                                    os.path.realpath(self.path)])):
             clean_output_dir(self.output_path, self.output_retention)
 
         for p in generators:

From 51b873b42eb52e0165758dcaa356135217432104 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 30 Apr 2020 21:26:02 +0200
Subject: [PATCH 2324/2864] Add Flake8 pre-commit hook

---
 .pre-commit-config.yaml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2a86f0aa..096780d6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 # See https://pre-commit.com/hooks.html for info on hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v2.5.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -11,4 +11,12 @@ repos:
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: trailing-whitespace
+
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.7.9
+    hooks:
+      - id: flake8
+        args: [--max-line-length=88]
+        language_version: python3.7
+
 exclude: ^pelican/tests/output/

From c8639fe547e093ce5416e353e20b8ad5fde95f02 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 30 Apr 2020 21:43:31 +0200
Subject: [PATCH 2325/2864] Only run Flake8 on changed lines

---
 .pre-commit-config.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 096780d6..579d3c45 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,12 +11,10 @@ repos:
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: trailing-whitespace
-
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.9
-    hooks:
       - id: flake8
-        args: [--max-line-length=88]
-        language_version: python3.7
+        name: Flake8 on commit diff
+        description: This hook limits Flake8 checks to changed lines of code.
+        entry: bash
+        args: [-c, 'git diff HEAD | flake8 --diff --max-line-length=88']
 
 exclude: ^pelican/tests/output/

From e6df35330205aa6bdbe56cd40e641fab4958af8c Mon Sep 17 00:00:00 2001
From: "(GalaxyMaster)" <galaxy4public@users.noreply.github.com>
Date: Mon, 4 May 2020 01:45:25 +1000
Subject: [PATCH 2326/2864] Set "modified:" from "date:" when the latter was
 set from the filesystem (#2748)

Sets the `modified:` metadata from `date:` if the user asked us
to use the filesystem for determining timestamps. Fixes #2497

* Added tests (ab)using the HTML reader a bit

There seems to be no way to test this generically since we need
to produce a valid document with meta information to be able to
compare, hence I used the lightest reader out there to do the
parsing of the samples.

* Fixed tests for generators since there were 4 more articles
introduced to the test content directory.
---
 pelican/readers.py                            |  1 +
 ...adata_explicit_date_implicit_modified.html | 15 +++++++
 .../article_with_metadata_explicit_dates.html | 16 +++++++
 ...adata_implicit_date_explicit_modified.html | 15 +++++++
 .../article_with_metadata_implicit_dates.html | 14 ++++++
 pelican/tests/test_generators.py              |  8 ++++
 pelican/tests/test_readers.py                 | 44 +++++++++++++++++++
 7 files changed, 113 insertions(+)
 create mode 100644 pelican/tests/content/article_with_metadata_explicit_date_implicit_modified.html
 create mode 100644 pelican/tests/content/article_with_metadata_explicit_dates.html
 create mode 100644 pelican/tests/content/article_with_metadata_implicit_date_explicit_modified.html
 create mode 100644 pelican/tests/content/article_with_metadata_implicit_dates.html

diff --git a/pelican/readers.py b/pelican/readers.py
index e6d91760..8174aa79 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -685,6 +685,7 @@ def path_metadata(full_path, source_path, settings=None):
         if settings.get('DEFAULT_DATE', None) == 'fs':
             metadata['date'] = datetime.datetime.fromtimestamp(
                 os.stat(full_path).st_mtime)
+            metadata['modified'] = metadata['date']
 
         # Apply EXTRA_PATH_METADATA for the source path and the paths of any
         # parent directories. Sorting EPM first ensures that the most specific
diff --git a/pelican/tests/content/article_with_metadata_explicit_date_implicit_modified.html b/pelican/tests/content/article_with_metadata_explicit_date_implicit_modified.html
new file mode 100644
index 00000000..b501ea29
--- /dev/null
+++ b/pelican/tests/content/article_with_metadata_explicit_date_implicit_modified.html
@@ -0,0 +1,15 @@
+<html>
+    <head>
+        <title>This is a super article !</title>
+        <meta name="tags" content="foo, bar, foobar" />
+        <meta name="date" content="2010-12-02 10:14" />
+        <meta name="category" content="yeah" />
+        <meta name="author" content="Alexis Métaireau" />
+        <meta name="summary" content="Summary and stuff" />
+        <meta name="custom_field" content="http://notmyidea.org" />
+    </head>
+    <body>
+        Multi-line metadata should be supported
+        as well as <strong>inline markup</strong>.
+    </body>
+</html>
diff --git a/pelican/tests/content/article_with_metadata_explicit_dates.html b/pelican/tests/content/article_with_metadata_explicit_dates.html
new file mode 100644
index 00000000..1c74f40e
--- /dev/null
+++ b/pelican/tests/content/article_with_metadata_explicit_dates.html
@@ -0,0 +1,16 @@
+<html>
+    <head>
+        <title>This is a super article !</title>
+        <meta name="tags" content="foo, bar, foobar" />
+        <meta name="date" content="2010-12-02 10:14" />
+        <meta name="modified" content="2010-12-31 23:59" />
+        <meta name="category" content="yeah" />
+        <meta name="author" content="Alexis Métaireau" />
+        <meta name="summary" content="Summary and stuff" />
+        <meta name="custom_field" content="http://notmyidea.org" />
+    </head>
+    <body>
+        Multi-line metadata should be supported
+        as well as <strong>inline markup</strong>.
+    </body>
+</html>
diff --git a/pelican/tests/content/article_with_metadata_implicit_date_explicit_modified.html b/pelican/tests/content/article_with_metadata_implicit_date_explicit_modified.html
new file mode 100644
index 00000000..8cd2885b
--- /dev/null
+++ b/pelican/tests/content/article_with_metadata_implicit_date_explicit_modified.html
@@ -0,0 +1,15 @@
+<html>
+    <head>
+        <title>This is a super article !</title>
+        <meta name="tags" content="foo, bar, foobar" />
+        <meta name="modified" content="2010-12-02 10:14" />
+        <meta name="category" content="yeah" />
+        <meta name="author" content="Alexis Métaireau" />
+        <meta name="summary" content="Summary and stuff" />
+        <meta name="custom_field" content="http://notmyidea.org" />
+    </head>
+    <body>
+        Multi-line metadata should be supported
+        as well as <strong>inline markup</strong>.
+    </body>
+</html>
diff --git a/pelican/tests/content/article_with_metadata_implicit_dates.html b/pelican/tests/content/article_with_metadata_implicit_dates.html
new file mode 100644
index 00000000..14d7e1e0
--- /dev/null
+++ b/pelican/tests/content/article_with_metadata_implicit_dates.html
@@ -0,0 +1,14 @@
+<html>
+    <head>
+        <title>This is a super article !</title>
+        <meta name="tags" content="foo, bar, foobar" />
+        <meta name="category" content="yeah" />
+        <meta name="author" content="Alexis Métaireau" />
+        <meta name="summary" content="Summary and stuff" />
+        <meta name="custom_field" content="http://notmyidea.org" />
+    </head>
+    <body>
+        Multi-line metadata should be supported
+        as well as <strong>inline markup</strong>.
+    </body>
+</html>
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 50e08983..5dd5c3ec 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -263,6 +263,10 @@ class TestArticlesGenerator(unittest.TestCase):
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
+            ['This is a super article !', 'published', 'yeah', 'article'],
+            ['This is a super article !', 'published', 'yeah', 'article'],
+            ['This is a super article !', 'published', 'yeah', 'article'],
+            ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'Default', 'article'],
             ['Article with an inline SVG', 'published', 'Default', 'article'],
             ['This is an article with category !', 'published', 'yeah',
@@ -579,6 +583,10 @@ class TestArticlesGenerator(unittest.TestCase):
             'This is a super article !',
             'This is a super article !',
             'This is a super article !',
+            'This is a super article !',
+            'This is a super article !',
+            'This is a super article !',
+            'This is a super article !',
             'This is an article with category !',
             ('This is an article with multiple authors in lastname, '
              'firstname format!'),
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 3aced39e..eb755338 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -81,6 +81,50 @@ class DefaultReaderTest(ReaderTest):
         with self.assertRaises(TypeError):
             self.read_file(path='article_with_metadata.unknownextension')
 
+    def test_readfile_path_metadata_implicit_dates(self):
+        test_file = 'article_with_metadata_implicit_dates.html'
+        page = self.read_file(path=test_file, DEFAULT_DATE='fs')
+        expected = {
+            'date': SafeDatetime.fromtimestamp(
+                os.stat(_path(test_file)).st_mtime),
+            'modified': SafeDatetime.fromtimestamp(
+                os.stat(_path(test_file)).st_mtime)
+        }
+
+        self.assertDictHasSubset(page.metadata, expected)
+
+    def test_readfile_path_metadata_explicit_dates(self):
+        test_file = 'article_with_metadata_explicit_dates.html'
+        page = self.read_file(path=test_file, DEFAULT_DATE='fs')
+        expected = {
+            'date': SafeDatetime(2010, 12, 2, 10, 14),
+            'modified': SafeDatetime(2010, 12, 31, 23, 59)
+        }
+
+        self.assertDictHasSubset(page.metadata, expected)
+
+    def test_readfile_path_metadata_implicit_date_explicit_modified(self):
+        test_file = 'article_with_metadata_implicit_date_explicit_modified.html'
+        page = self.read_file(path=test_file, DEFAULT_DATE='fs')
+        expected = {
+            'date': SafeDatetime.fromtimestamp(
+                os.stat(_path(test_file)).st_mtime),
+            'modified': SafeDatetime(2010, 12, 2, 10, 14),
+        }
+
+        self.assertDictHasSubset(page.metadata, expected)
+
+    def test_readfile_path_metadata_explicit_date_implicit_modified(self):
+        test_file = 'article_with_metadata_explicit_date_implicit_modified.html'
+        page = self.read_file(path=test_file, DEFAULT_DATE='fs')
+        expected = {
+            'date': SafeDatetime(2010, 12, 2, 10, 14),
+            'modified': SafeDatetime.fromtimestamp(
+                os.stat(_path(test_file)).st_mtime)
+        }
+
+        self.assertDictHasSubset(page.metadata, expected)
+
     @unittest.skipUnless(patch, 'Needs Mock module')
     def test_find_empty_alt(self):
         with patch('pelican.readers.logger') as log_mock:

From ffc960df5c0e066e5b07e8416a9e57b3b50dbe76 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Thu, 23 Apr 2020 23:41:16 +0300
Subject: [PATCH 2327/2864] Add Github Actions workflow

---
 .github/workflows/main.yml | 162 +++++++++++++++++++++++++++++++++++++
 1 file changed, 162 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 00000000..c2161ec2
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,162 @@
+name: build
+
+on: [push, pull_request]
+
+env:
+  # color output for pytest and tox
+  PYTEST_ADDOPTS: "--color=yes"
+  PY_COLORS: 1
+
+jobs:
+  test:
+    name: Test - ${{ matrix.config.python }} - ${{ matrix.config.os }}
+    runs-on: ${{ matrix.config.os }}-latest
+
+    strategy:
+      matrix:
+        config:
+          - os: ubuntu
+            python: 3.5
+            tox: py35
+          - os: ubuntu
+            python: 3.6
+            tox: py36
+          - os: ubuntu
+            python: 3.7
+            tox: py37
+          - os: macos
+            python: 3.7
+            tox: py37
+          - os: windows
+            python: 3.7
+            tox: py37
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python ${{ matrix.config.python }}
+        uses: actions/setup-python@v1.1.1
+        with:
+          python-version: ${{ matrix.config.python }}
+      - name: Set pip cache (Linux)
+        uses: actions/cache@v1
+        if: startsWith(runner.os, 'Linux')
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements/*') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: Setup pip cache (macOS)
+        uses: actions/cache@v1
+        if: startsWith(runner.os, 'macOS')
+        with:
+          path: ~/Library/Caches/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements/*') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: Setup pip cache (Windows)
+        uses: actions/cache@v1
+        if: startsWith(runner.os, 'Windows')
+        with:
+          path: ~\AppData\Local\pip\Cache
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements/*') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: Install locale (Linux)
+        if: startsWith(runner.os, 'Linux')
+        run: sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
+      - name: Install pandoc
+        uses: r-lib/actions/setup-pandoc@v1
+        with:
+          pandoc-version: "2.9.2"
+      - name: Install tox
+        run: python -m pip install -U pip tox
+      - name: Info
+        run: |
+          echo "=====  PYTHON  ====="
+          python --version
+          echo "=====  PANDOC  ====="
+          pandoc --version | head -2
+      - name: Run tests
+        run: tox -e ${{ matrix.config.tox }}
+
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1.1.1
+        with:
+          python-version: 3.6
+      - name: Set pip cache (Linux)
+        uses: actions/cache@v1
+        if: startsWith(runner.os, 'Linux')
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: Install tox
+        run: python -m pip install -U pip tox
+      - name: Check
+        run: tox -e flake8
+
+
+  docs:
+    name: Build docs
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1.1.1
+        with:
+          python-version: 3.6
+      - name: Set pip cache (Linux)
+        uses: actions/cache@v1
+        if: startsWith(runner.os, 'Linux')
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: Install tox
+        run: python -m pip install -U pip tox
+      - name: Check
+        run: tox -e docs
+
+
+  deploy:
+    name: Deploy
+    needs: [test, lint, docs]
+    runs-on: ubuntu-latest
+    if: ${{ github.ref=='refs/heads/master' && github.event_name!='pull_request' }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1.1.1
+        with:
+          python-version: 3.7
+      - name: Check release
+        id: check_release
+        run: |
+          python -m pip install pip --upgrade
+          pip install poetry
+          pip install githubrelease
+          pip install --pre autopub
+          echo "##[set-output name=release;]$(autopub check)"
+      - name: Publish
+        if: ${{ steps.check_release.outputs.release=='' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        run: |
+          git remote set-url origin https://$GITHUB_TOKEN@github.com/${{ github.repository }}
+          autopub prepare
+          poetry build
+          autopub commit
+          autopub githubrelease
+          poetry publish -u __token__ -p $PYPI_PASSWORD

From 125dec493e214d3d3f0d3ad540a55832a6ecef97 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 26 Apr 2020 15:01:56 +0300
Subject: [PATCH 2328/2864] Modify tox envs to simplify CI and add Python 3.8

---
 .github/workflows/main.yml | 9 +++------
 .travis.yml                | 6 +++---
 tox.ini                    | 9 +++++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c2161ec2..bcbd94d4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,19 +17,16 @@ jobs:
         config:
           - os: ubuntu
             python: 3.5
-            tox: py35
           - os: ubuntu
             python: 3.6
-            tox: py36
           - os: ubuntu
             python: 3.7
-            tox: py37
+          - os: ubuntu
+            python: 3.8
           - os: macos
             python: 3.7
-            tox: py37
           - os: windows
             python: 3.7
-            tox: py37
 
     steps:
       - uses: actions/checkout@v2
@@ -77,7 +74,7 @@ jobs:
           echo "=====  PANDOC  ====="
           pandoc --version | head -2
       - name: Run tests
-        run: tox -e ${{ matrix.config.tox }}
+        run: tox -e py${{ matrix.config.python }}
 
 
   lint:
diff --git a/.travis.yml b/.travis.yml
index af3a6ca8..c0637a7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,15 +11,15 @@ env:
   matrix:
     - TOX_ENV=docs
     - TOX_ENV=flake8
-    - TOX_ENV=py35
-    - TOX_ENV=py36
+    - TOX_ENV=py3.5
+    - TOX_ENV=py3.6
 matrix:
   include:
     - python: 3.7
       sudo: true
       dist: xenial
       env:
-      - TOX_ENV=py37
+      - TOX_ENV=py3.7
 addons:
   apt_packages:
     - pandoc
diff --git a/tox.ini b/tox.ini
index 23bb518f..6cc34498 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
-envlist = py{35,36,37},docs,flake8
+envlist = py{3.5,3.6,3.7,3.8},docs,flake8
 
 [testenv]
 basepython =
-    py35: python3.5
-    py36: python3.6
-    py37: python3.7
+    py3.5: python3.5
+    py3.6: python3.6
+    py3.7: python3.7
+    py3.8: python3.8
 passenv = *
 usedevelop=True
 deps =

From 839629b102e020fc9a3aa3a66cc9ae0e23f210f5 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 26 Apr 2020 00:59:54 +0300
Subject: [PATCH 2329/2864] Cleanup test environment and requirements

- pytest: verbose isn't needed but show skipped tests
- mock is not needed anymore. it is part of stdlib
- Unpin Sphinx and fix warning about lexer
- Mirror tox command for doc build in tasks.py
---
 docs/conf.py                        |  2 +-
 docs/themes.rst                     |  2 +-
 pelican/tests/test_cache.py         | 14 +-------------
 pelican/tests/test_generators.py    | 18 +-----------------
 pelican/tests/test_readers.py       |  9 +--------
 pelican/tests/test_rstdirectives.py | 11 ++---------
 requirements/docs.pip               |  2 +-
 requirements/test.pip               |  1 -
 tasks.py                            |  2 +-
 tox.ini                             |  4 ++--
 10 files changed, 11 insertions(+), 54 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 53171646..fc49975a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -61,7 +61,7 @@ html_show_sourcelink = False
 
 def setup(app):
     # overrides for wide tables in RTD theme
-    app.add_stylesheet('theme_overrides.css')   # path relative to _static
+    app.add_css_file('theme_overrides.css')   # path relative to _static
 
 
 # -- Options for LaTeX output -------------------------------------------------
diff --git a/docs/themes.rst b/docs/themes.rst
index a2332615..86a754bc 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -242,7 +242,7 @@ as the name of the metadata field, except in all-lowercase characters.
 For example, you could add a field called `FacebookImage` to your article
 metadata, as shown below:
 
-.. code-block:: markdown
+.. code-block:: md
 
     Title: I love Python more than music
     Date: 2013-11-06 10:06
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index cc5218b7..564f1d31 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -1,17 +1,11 @@
 import os
 from shutil import rmtree
 from tempfile import mkdtemp
+from unittest.mock import MagicMock
 
 from pelican.generators import ArticlesGenerator, PagesGenerator
 from pelican.tests.support import get_context, get_settings, unittest
 
-try:
-    from unittest.mock import MagicMock
-except ImportError:
-    try:
-        from mock import MagicMock
-    except ImportError:
-        MagicMock = False
 
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_DIR = os.path.join(CUR_DIR, 'content')
@@ -131,7 +125,6 @@ class TestCache(unittest.TestCase):
         self.assertEqual(uncached_pages, cached_pages)
         self.assertEqual(uncached_hidden_pages, cached_hidden_pages)
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_article_object_caching(self):
         """Test Article objects caching at the generator level"""
         settings = self._get_cache_enabled_settings()
@@ -162,7 +155,6 @@ class TestCache(unittest.TestCase):
         """
         self.assertEqual(generator.readers.read_file.call_count, 6)
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_article_reader_content_caching(self):
         """Test raw article content caching at the reader level"""
         settings = self._get_cache_enabled_settings()
@@ -185,7 +177,6 @@ class TestCache(unittest.TestCase):
         for reader in readers.values():
             self.assertEqual(reader.read.call_count, 0)
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_article_ignore_cache(self):
         """Test that all the articles are read again when not loading cache
 
@@ -212,7 +203,6 @@ class TestCache(unittest.TestCase):
             generator.readers.read_file.call_count,
             orig_call_count)
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_page_object_caching(self):
         """Test Page objects caching at the generator level"""
         settings = self._get_cache_enabled_settings()
@@ -238,7 +228,6 @@ class TestCache(unittest.TestCase):
         """
         self.assertEqual(generator.readers.read_file.call_count, 1)
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_page_reader_content_caching(self):
         """Test raw page content caching at the reader level"""
         settings = self._get_cache_enabled_settings()
@@ -262,7 +251,6 @@ class TestCache(unittest.TestCase):
         for reader in readers.values():
             self.assertEqual(reader.read.call_count, 0)
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_page_ignore_cache(self):
         """Test that all the pages are read again when not loading cache
 
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 5dd5c3ec..0fd84925 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -2,6 +2,7 @@ import locale
 import os
 from shutil import copy, rmtree
 from tempfile import mkdtemp
+from unittest.mock import MagicMock
 
 from pelican.generators import (ArticlesGenerator, Generator, PagesGenerator,
                                 PelicanTemplateNotFound, StaticGenerator,
@@ -9,14 +10,6 @@ from pelican.generators import (ArticlesGenerator, Generator, PagesGenerator,
 from pelican.tests.support import get_context, get_settings, unittest
 from pelican.writers import Writer
 
-try:
-    from unittest.mock import MagicMock
-except ImportError:
-    try:
-        from mock import MagicMock
-    except ImportError:
-        MagicMock = False
-
 
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_DIR = os.path.join(CUR_DIR, 'content')
@@ -198,7 +191,6 @@ class TestArticlesGenerator(unittest.TestCase):
         return [[article.title, article.status, article.category.name,
                  article.template] for article in articles]
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_generate_feeds(self):
         settings = get_settings()
         settings['CACHE_PATH'] = self.temp_cache
@@ -218,7 +210,6 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_feeds(writer)
         self.assertFalse(writer.write_feed.called)
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_generate_feeds_override_url(self):
         settings = get_settings()
         settings['CACHE_PATH'] = self.temp_cache
@@ -334,7 +325,6 @@ class TestArticlesGenerator(unittest.TestCase):
         categories_expected = ['default', 'yeah', 'test', 'zhi-dao-shu']
         self.assertEqual(sorted(categories), sorted(categories_expected))
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_direct_templates_save_as_url_default(self):
 
         settings = get_settings()
@@ -352,7 +342,6 @@ class TestArticlesGenerator(unittest.TestCase):
                                  template_name='archives',
                                  page_name='archives', url="archives.html")
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_direct_templates_save_as_url_modified(self):
 
         settings = get_settings()
@@ -373,7 +362,6 @@ class TestArticlesGenerator(unittest.TestCase):
                                  page_name='archives/index',
                                  url="archives/")
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_direct_templates_save_as_false(self):
 
         settings = get_settings()
@@ -398,7 +386,6 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertIn(custom_template, self.articles)
         self.assertIn(standard_template, self.articles)
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_period_in_timeperiod_archive(self):
         """
         Test that the context of a generated period_archive is passed
@@ -1022,7 +1009,6 @@ class TestStaticGenerator(unittest.TestCase):
         with open(self.endfile) as f:
             self.assertEqual(f.read(), "staticcontent")
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_file_update_required_when_dest_does_not_exist(self):
         staticfile = MagicMock()
         staticfile.source_path = self.startfile
@@ -1032,7 +1018,6 @@ class TestStaticGenerator(unittest.TestCase):
         update_required = self.generator._file_update_required(staticfile)
         self.assertTrue(update_required)
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_dest_and_source_mtimes_are_equal(self):
         staticfile = MagicMock()
         staticfile.source_path = self.startfile
@@ -1045,7 +1030,6 @@ class TestStaticGenerator(unittest.TestCase):
         isnewer = self.generator._source_is_newer(staticfile)
         self.assertFalse(isnewer)
 
-    @unittest.skipUnless(MagicMock, 'Needs Mock module')
     def test_source_is_newer(self):
         staticfile = MagicMock()
         staticfile.source_path = self.startfile
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index eb755338..de2a1b22 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -1,16 +1,10 @@
 import os
+from unittest.mock import patch
 
 from pelican import readers
 from pelican.tests.support import get_settings, unittest
 from pelican.utils import SafeDatetime
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    try:
-        from mock import patch
-    except ImportError:
-        patch = False
 
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_PATH = os.path.join(CUR_DIR, 'content')
@@ -125,7 +119,6 @@ class DefaultReaderTest(ReaderTest):
 
         self.assertDictHasSubset(page.metadata, expected)
 
-    @unittest.skipUnless(patch, 'Needs Mock module')
     def test_find_empty_alt(self):
         with patch('pelican.readers.logger') as log_mock:
             content = ['<img alt="" src="test-image.png" width="300px" />',
diff --git a/pelican/tests/test_rstdirectives.py b/pelican/tests/test_rstdirectives.py
index 36623fc4..6b733971 100644
--- a/pelican/tests/test_rstdirectives.py
+++ b/pelican/tests/test_rstdirectives.py
@@ -1,15 +1,8 @@
+from unittest.mock import Mock
+
 from pelican.tests.support import unittest
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    try:
-        from mock import Mock
-    except ImportError:
-        Mock = False
 
-
-@unittest.skipUnless(Mock, 'Needs Mock module')
 class Test_abbr_role(unittest.TestCase):
     def call_it(self, text):
         from pelican.rstdirectives import abbr_role
diff --git a/requirements/docs.pip b/requirements/docs.pip
index acc5d5f5..bd25c939 100644
--- a/requirements/docs.pip
+++ b/requirements/docs.pip
@@ -1,3 +1,3 @@
-sphinx==1.4.9
+sphinx
 sphinx_rtd_theme
 livereload
diff --git a/requirements/test.pip b/requirements/test.pip
index 81d74c4e..973b27ca 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,6 +1,5 @@
 # Tests
 Pygments==2.6.1
-mock
 pytest==5.3.5
 pytest-cov
 pytest-xdist
diff --git a/tasks.py b/tasks.py
index 495194ab..52bfe6a3 100644
--- a/tasks.py
+++ b/tasks.py
@@ -24,7 +24,7 @@ PRECOMMIT = (
 @task
 def docbuild(c):
     """Build documentation"""
-    c.run(f"{VENV_BIN}/sphinx-build docs docs/_build")
+    c.run(f"{VENV_BIN}/sphinx-build -W docs docs/_build")
 
 
 @task(docbuild)
diff --git a/tox.ini b/tox.ini
index 6cc34498..18b0e7a4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ deps =
 
 commands =
     {envpython} --version
-    pytest -sv --cov=pelican pelican
+    pytest -s --cov=pelican pelican
 
 [testenv:docs]
 basepython = python3.6
@@ -28,7 +28,7 @@ commands =
 filterwarnings =
     default::DeprecationWarning
     error:.*:Warning:pelican
-addopts = -n 2
+addopts = -n 2 -r a
 
 [flake8]
 application-import-names = pelican

From 2e482b207b344fa7ec1b7f4bb047407440f62690 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 28 Apr 2020 23:29:44 +0300
Subject: [PATCH 2330/2864] Fix Windows tests

* Unskip passable tests
* Fix broken tests
---
 pelican/readers.py               |  2 +-
 pelican/tests/support.py         | 13 +++++++++++
 pelican/tests/test_generators.py | 40 +++++++++++++++++---------------
 pelican/tests/test_importer.py   |  3 ++-
 pelican/tests/test_server.py     |  3 +--
 pelican/tests/test_settings.py   |  2 ++
 pelican/tests/test_utils.py      | 15 +++++-------
 pelican/tools/pelican_import.py  |  5 ++--
 pelican/utils.py                 | 13 ++++++-----
 pelican/writers.py               |  3 ++-
 10 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index 8174aa79..8c108510 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -696,7 +696,7 @@ def path_metadata(full_path, source_path, settings=None):
             # Enforce a trailing slash when checking for parent directories.
             # This prevents false positives when one file or directory's name
             # is a prefix of another's.
-            dirpath = os.path.join(path, '')
+            dirpath = posixize_path(os.path.join(path, ''))
             if source_path == path or source_path.startswith(dirpath):
                 metadata.update(meta)
 
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 8a22052e..e52bc0ae 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -160,6 +160,19 @@ def locale_available(locale_):
         return True
 
 
+def can_symlink():
+    res = True
+    try:
+        with temporary_folder() as f:
+            os.symlink(
+                f,
+                os.path.join(f, 'symlink')
+            )
+    except OSError:
+        res = False
+    return res
+
+
 def get_settings(**kwargs):
     """Provide tweaked setting dictionaries for testing
 
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 0fd84925..332d7e78 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1,5 +1,6 @@
 import locale
 import os
+import sys
 from shutil import copy, rmtree
 from tempfile import mkdtemp
 from unittest.mock import MagicMock
@@ -7,7 +8,8 @@ from unittest.mock import MagicMock
 from pelican.generators import (ArticlesGenerator, Generator, PagesGenerator,
                                 PelicanTemplateNotFound, StaticGenerator,
                                 TemplatePagesGenerator)
-from pelican.tests.support import get_context, get_settings, unittest
+from pelican.tests.support import (can_symlink, get_context, get_settings,
+                                   unittest)
 from pelican.writers import Writer
 
 
@@ -1081,6 +1083,7 @@ class TestStaticGenerator(unittest.TestCase):
         self.generator.generate_output(None)
         self.assertTrue(os.path.samefile(self.startfile, self.endfile))
 
+    @unittest.skipUnless(can_symlink(), 'No symlink privilege')
     def test_can_symlink_when_hardlink_not_possible(self):
         self.settings['STATIC_CREATE_LINKS'] = True
         with open(self.startfile, "w") as f:
@@ -1088,40 +1091,29 @@ class TestStaticGenerator(unittest.TestCase):
         os.mkdir(os.path.join(self.temp_output, "static"))
         self.generator.fallback_to_symlinks = True
         self.generator.generate_context()
-        try:
-            self.generator.generate_output(None)
-        except OSError as e:
-            # On Windows, possibly others, due to not holding symbolic link
-            # privilege
-            self.skipTest(e)
+        self.generator.generate_output(None)
         self.assertTrue(os.path.islink(self.endfile))
 
+    @unittest.skipUnless(can_symlink(), 'No symlink privilege')
     def test_existing_symlink_is_considered_up_to_date(self):
         self.settings['STATIC_CREATE_LINKS'] = True
         with open(self.startfile, "w") as f:
             f.write("staticcontent")
         os.mkdir(os.path.join(self.temp_output, "static"))
-        try:
-            os.symlink(self.startfile, self.endfile)
-        except OSError as e:
-            # On Windows, possibly others
-            self.skipTest(e)
+        os.symlink(self.startfile, self.endfile)
         staticfile = MagicMock()
         staticfile.source_path = self.startfile
         staticfile.save_as = self.endfile
         requires_update = self.generator._file_update_required(staticfile)
         self.assertFalse(requires_update)
 
+    @unittest.skipUnless(can_symlink(), 'No symlink privilege')
     def test_invalid_symlink_is_overwritten(self):
         self.settings['STATIC_CREATE_LINKS'] = True
         with open(self.startfile, "w") as f:
             f.write("staticcontent")
         os.mkdir(os.path.join(self.temp_output, "static"))
-        try:
-            os.symlink("invalid", self.endfile)
-        except OSError as e:
-            # On Windows, possibly others
-            self.skipTest(e)
+        os.symlink("invalid", self.endfile)
         staticfile = MagicMock()
         staticfile.source_path = self.startfile
         staticfile.save_as = self.endfile
@@ -1131,8 +1123,18 @@ class TestStaticGenerator(unittest.TestCase):
         self.generator.generate_context()
         self.generator.generate_output(None)
         self.assertTrue(os.path.islink(self.endfile))
-        self.assertEqual(os.path.realpath(self.endfile),
-                         os.path.realpath(self.startfile))
+
+        # os.path.realpath is broken on Windows before python3.8 for symlinks.
+        # This is a (ugly) workaround.
+        # see: https://bugs.python.org/issue9949
+        if os.name == 'nt' and sys.version_info < (3, 8):
+            def get_real_path(path):
+                return os.readlink(path) if os.path.islink(path) else path
+        else:
+            get_real_path = os.path.realpath
+
+        self.assertEqual(get_real_path(self.endfile),
+                         get_real_path(self.startfile))
 
     def test_delete_existing_file_before_mkdir(self):
         with open(self.startfile, "w") as f:
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 709086c0..76feb9ce 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -1,6 +1,7 @@
 import locale
 import os
 import re
+from posixpath import join as posix_join
 
 from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder,
@@ -448,5 +449,5 @@ class TestWordpressXMLAttachements(unittest.TestCase):
             self.assertEqual(1, len(locations))
             directory = locations[0]
             self.assertTrue(
-                directory.endswith(os.path.join('content', 'article.rst')),
+                directory.endswith(posix_join('content', 'article.rst')),
                 directory)
diff --git a/pelican/tests/test_server.py b/pelican/tests/test_server.py
index 68747001..307a3e10 100644
--- a/pelican/tests/test_server.py
+++ b/pelican/tests/test_server.py
@@ -25,11 +25,10 @@ class TestServer(unittest.TestCase):
         os.chdir(self.temp_output)
 
     def tearDown(self):
-        rmtree(self.temp_output)
         os.chdir(self.old_cwd)
+        rmtree(self.temp_output)
 
     def test_get_path_that_exists(self):
-
         handler = ComplexHTTPRequestHandler(MockRequest(), ('0.0.0.0', 8888),
                                             self.server)
         handler.base_path = self.temp_output
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 8f12f3fd..708c0981 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -136,6 +136,8 @@ class TestSettingsConfiguration(unittest.TestCase):
             settings['ARTICLE_DIR']
             settings['PAGE_DIR']
 
+    # locale.getdefaultlocale() is broken on Windows
+    # See: https://bugs.python.org/issue37945
     @unittest.skipIf(platform == 'win32', "Doesn't work on Windows")
     def test_default_encoding(self):
         # Test that the default locale is set if not specified in settings
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index f0bc290d..e12c4378 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -757,35 +757,32 @@ class TestDateFormatter(unittest.TestCase):
 
 
 class TestSanitisedJoin(unittest.TestCase):
-    @unittest.skipIf(platform == 'win32',
-                     "Different filesystem root on Windows")
     def test_detect_parent_breakout(self):
         with self.assertRaisesRegex(
                 RuntimeError,
-                "Attempted to break out of output directory to /foo/test"):
+                "Attempted to break out of output directory to "
+                "(.*?:)?/foo/test"):  # (.*?:)? accounts for Windows root
             utils.sanitised_join(
                 "/foo/bar",
                 "../test"
             )
 
-    @unittest.skipIf(platform == 'win32',
-                     "Different filesystem root on Windows")
     def test_detect_root_breakout(self):
         with self.assertRaisesRegex(
                 RuntimeError,
-                "Attempted to break out of output directory to /test"):
+                "Attempted to break out of output directory to "
+                "(.*?:)?/test"):  # (.*?:)? accounts for Windows root
             utils.sanitised_join(
                 "/foo/bar",
                 "/test"
             )
 
-    @unittest.skipIf(platform == 'win32',
-                     "Different filesystem root on Windows")
     def test_pass_deep_subpaths(self):
         self.assertEqual(
             utils.sanitised_join(
                 "/foo/bar",
                 "test"
             ),
-            os.path.join("/foo/bar", "test")
+            utils.posixize_path(
+                os.path.abspath(os.path.join("/foo/bar", "test")))
         )
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index e288711e..b74da750 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -728,8 +728,9 @@ def download_attachments(output_path, urls):
 
         # Generate percent-encoded URL
         scheme, netloc, path, query, fragment = urlsplit(url)
-        path = quote(path)
-        url = urlunsplit((scheme, netloc, path, query, fragment))
+        if scheme != 'file':
+            path = quote(path)
+            url = urlunsplit((scheme, netloc, path, query, fragment))
 
         if not os.path.exists(full_path):
             os.makedirs(full_path)
diff --git a/pelican/utils.py b/pelican/utils.py
index 1f3d502c..64a308c1 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -27,8 +27,10 @@ logger = logging.getLogger(__name__)
 
 
 def sanitised_join(base_directory, *parts):
-    joined = os.path.abspath(os.path.join(base_directory, *parts))
-    if not joined.startswith(os.path.abspath(base_directory)):
+    joined = posixize_path(
+        os.path.abspath(os.path.join(base_directory, *parts)))
+    base = posixize_path(os.path.abspath(base_directory))
+    if not joined.startswith(base):
         raise RuntimeError(
             "Attempted to break out of output directory to {}".format(
                 joined
@@ -391,10 +393,9 @@ def get_relative_path(path):
 
 def path_to_url(path):
     """Return the URL corresponding to a given path."""
-    if os.sep == '/':
-        return path
-    else:
-        return '/'.join(split_all(path))
+    if path is not None:
+        path = posixize_path(path)
+    return path
 
 
 def posixize_path(rel_path):
diff --git a/pelican/writers.py b/pelican/writers.py
index 7b14714a..9b27a748 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -1,5 +1,6 @@
 import logging
 import os
+from posixpath import join as posix_join
 from urllib.parse import urljoin
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed, get_tag_uri
@@ -25,7 +26,7 @@ class Writer:
 
         # See Content._link_replacer for details
         if self.settings['RELATIVE_URLS']:
-            self.urljoiner = os.path.join
+            self.urljoiner = posix_join
         else:
             self.urljoiner = lambda base, url: urljoin(
                 base if base.endswith('/') else base + '/', url)

From 48d842faa7f5a6ea9924072628c786987abf566c Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 6 May 2020 01:58:06 +0300
Subject: [PATCH 2331/2864] Refactor file/folder watchers and autoreload

Combined file and folder watchers under a class and refactored
common watcher related code from __init__.py to the class.
This simplifies the main and autoreload functions in __init__
as well as fix the problem with crashes related to multiprocessing
on systems where default spawn mode is "spawn" instead of "fork".
---
 pelican/__init__.py         | 127 ++++++------------------
 pelican/tests/test_utils.py | 111 +++++++++++++++------
 pelican/utils.py            | 193 ++++++++++++++++++++++++++++--------
 3 files changed, 260 insertions(+), 171 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 09ecf26a..6469c607 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -24,8 +24,7 @@ from pelican.plugins._utils import load_plugins
 from pelican.readers import Readers
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import read_settings
-from pelican.utils import (clean_output_dir, file_watcher,
-                           folder_watcher, maybe_pluralize)
+from pelican.utils import (FileSystemWatcher, clean_output_dir, maybe_pluralize)
 from pelican.writers import Writer
 
 try:
@@ -381,65 +380,36 @@ def get_instance(args):
     return cls(settings), settings
 
 
-def autoreload(watchers, args, old_static, reader_descs, excqueue=None):
+def autoreload(args, excqueue=None):
+    print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
+          ' `settings` for changes. ---')
+    pelican, settings = get_instance(args)
+    watcher = FileSystemWatcher(args.settings, Readers, settings)
+    sleep = False
     while True:
         try:
-            # Check source dir for changed files ending with the given
-            # extension in the settings. In the theme dir is no such
-            # restriction; all files are recursively checked if they
-            # have changed, no matter what extension the filenames
-            # have.
-            modified = {k: next(v) for k, v in watchers.items()}
+            # Don't sleep first time, but sleep afterwards to reduce cpu load
+            if sleep:
+                time.sleep(0.5)
+            else:
+                sleep = True
+
+            modified = watcher.check()
 
             if modified['settings']:
                 pelican, settings = get_instance(args)
-
-                # Adjust static watchers if there are any changes
-                new_static = settings.get("STATIC_PATHS", [])
-
-                # Added static paths
-                # Add new watchers and set them as modified
-                new_watchers = set(new_static).difference(old_static)
-                for static_path in new_watchers:
-                    static_key = '[static]%s' % static_path
-                    watchers[static_key] = folder_watcher(
-                        os.path.join(pelican.path, static_path),
-                        [''],
-                        pelican.ignore_files)
-                    modified[static_key] = next(watchers[static_key])
-
-                # Removed static paths
-                # Remove watchers and modified values
-                old_watchers = set(old_static).difference(new_static)
-                for static_path in old_watchers:
-                    static_key = '[static]%s' % static_path
-                    watchers.pop(static_key)
-                    modified.pop(static_key)
-
-                # Replace old_static with the new one
-                old_static = new_static
+                watcher.update_watchers(settings)
 
             if any(modified.values()):
                 print('\n-> Modified: {}. re-generating...'.format(
                     ', '.join(k for k, v in modified.items() if v)))
-
-                if modified['content'] is None:
-                    logger.warning(
-                        'No valid files found in content for '
-                        + 'the active readers:\n'
-                        + '\n'.join(reader_descs))
-
-                if modified['theme'] is None:
-                    logger.warning('Empty theme folder. Using `basic` '
-                                   'theme.')
-
                 pelican.run()
 
-        except KeyboardInterrupt as e:
-            logger.warning("Keyboard interrupt, quitting.")
+        except KeyboardInterrupt:
             if excqueue is not None:
-                excqueue.put(traceback.format_exception_only(type(e), e)[-1])
-            return
+                excqueue.put(None)
+                return
+            raise
 
         except Exception as e:
             if (args.verbosity == logging.DEBUG):
@@ -449,10 +419,8 @@ def autoreload(watchers, args, old_static, reader_descs, excqueue=None):
                 else:
                     raise
             logger.warning(
-                'Caught exception "%s". Reloading.', e)
-
-        finally:
-            time.sleep(.5)  # sleep to avoid cpu load
+                'Caught exception:\n"%s".', e,
+                exc_info=settings.get('DEBUG', False))
 
 
 def listen(server, port, output, excqueue=None):
@@ -476,8 +444,10 @@ def listen(server, port, output, excqueue=None):
         return
 
     except KeyboardInterrupt:
-        print("\nKeyboard interrupt received. Shutting down server.")
         httpd.socket.close()
+        if excqueue is not None:
+            return
+        raise
 
 
 def main(argv=None):
@@ -492,37 +462,11 @@ def main(argv=None):
     try:
         pelican, settings = get_instance(args)
 
-        readers = Readers(settings)
-        reader_descs = sorted(
-            {
-                '%s (%s)' % (type(r).__name__, ', '.join(r.file_extensions))
-                for r in readers.readers.values()
-                if r.enabled
-            }
-        )
-
-        watchers = {'content': folder_watcher(pelican.path,
-                                              readers.extensions,
-                                              pelican.ignore_files),
-                    'theme': folder_watcher(pelican.theme,
-                                            [''],
-                                            pelican.ignore_files),
-                    'settings': file_watcher(args.settings)}
-
-        old_static = settings.get("STATIC_PATHS", [])
-        for static_path in old_static:
-            # use a prefix to avoid possible overriding of standard watchers
-            # above
-            watchers['[static]%s' % static_path] = folder_watcher(
-                os.path.join(pelican.path, static_path),
-                [''],
-                pelican.ignore_files)
-
         if args.autoreload and args.listen:
             excqueue = multiprocessing.Queue()
             p1 = multiprocessing.Process(
                 target=autoreload,
-                args=(watchers, args, old_static, reader_descs, excqueue))
+                args=(args, excqueue))
             p2 = multiprocessing.Process(
                 target=listen,
                 args=(settings.get('BIND'), settings.get('PORT'),
@@ -532,26 +476,19 @@ def main(argv=None):
             exc = excqueue.get()
             p1.terminate()
             p2.terminate()
-            logger.critical(exc)
+            if exc is not None:
+                logger.critical(exc)
         elif args.autoreload:
-            print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
-                  ' `settings` for changes. ---')
-            autoreload(watchers, args, old_static, reader_descs)
+            autoreload(args)
         elif args.listen:
             listen(settings.get('BIND'), settings.get('PORT'),
                    settings.get("OUTPUT_PATH"))
         else:
-            if next(watchers['content']) is None:
-                logger.warning(
-                    'No valid files found in content for '
-                    + 'the active readers:\n'
-                    + '\n'.join(reader_descs))
-
-            if next(watchers['theme']) is None:
-                logger.warning('Empty theme folder. Using `basic` theme.')
-
+            watcher = FileSystemWatcher(args.settings, Readers, settings)
+            watcher.check()
             pelican.run()
-
+    except KeyboardInterrupt:
+        logger.warning('Keyboard interrupt received. Exiting.')
     except Exception as e:
         logger.critical('%s', e)
 
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index f0bc290d..ed205e6c 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -10,6 +10,7 @@ import pytz
 
 from pelican import utils
 from pelican.generators import TemplatePagesGenerator
+from pelican.readers import Readers
 from pelican.settings import read_settings
 from pelican.tests.support import (LoggedTestCase, get_article,
                                    locale_available, unittest)
@@ -361,47 +362,91 @@ class TestUtils(LoggedTestCase):
                             self.assertNotIn(a_arts[4], b_arts[5].translations)
                             self.assertNotIn(a_arts[5], b_arts[4].translations)
 
-    def test_watchers(self):
-        # Test if file changes are correctly detected
-        # Make sure to handle not getting any files correctly.
+    def test_filesystemwatcher(self):
+        def create_file(name, content):
+            with open(name, 'w') as f:
+                f.write(content)
 
-        dirname = os.path.join(os.path.dirname(__file__), 'content')
-        folder_watcher = utils.folder_watcher(dirname, ['rst'])
+        # disable logger filter
+        from pelican.utils import logger
+        logger.disable_filter()
 
-        path = os.path.join(dirname, 'article_with_metadata.rst')
-        file_watcher = utils.file_watcher(path)
+        # create a temp "project" dir
+        root = mkdtemp()
+        content_path = os.path.join(root, 'content')
+        static_path = os.path.join(root, 'content', 'static')
+        config_file = os.path.join(root, 'config.py')
+        theme_path = os.path.join(root, 'mytheme')
 
-        # first check returns True
-        self.assertEqual(next(folder_watcher), True)
-        self.assertEqual(next(file_watcher), True)
+        # populate
+        os.mkdir(content_path)
+        os.mkdir(theme_path)
+        create_file(config_file,
+                    'PATH = "content"\n'
+                    'THEME = "mytheme"\n'
+                    'STATIC_PATHS = ["static"]')
 
-        # next check without modification returns False
-        self.assertEqual(next(folder_watcher), False)
-        self.assertEqual(next(file_watcher), False)
+        t = time.time() - 1000  # make sure it's in the "past"
+        os.utime(config_file, (t, t))
+        settings = read_settings(config_file)
 
-        # after modification, returns True
-        t = time.time()
-        os.utime(path, (t, t))
-        self.assertEqual(next(folder_watcher), True)
-        self.assertEqual(next(file_watcher), True)
+        watcher = utils.FileSystemWatcher(config_file, Readers, settings)
+        # should get a warning for static not not existing
+        self.assertLogCountEqual(1, 'Watched path does not exist: .*static')
 
-        # file watcher with None or empty path should return None
-        self.assertEqual(next(utils.file_watcher('')), None)
-        self.assertEqual(next(utils.file_watcher(None)), None)
+        # create it and update config
+        os.mkdir(static_path)
+        watcher.update_watchers(settings)
+        # no new warning
+        self.assertLogCountEqual(1, 'Watched path does not exist: .*static')
 
-        empty_path = os.path.join(os.path.dirname(__file__), 'empty')
-        try:
-            os.mkdir(empty_path)
-            os.mkdir(os.path.join(empty_path, "empty_folder"))
-            shutil.copy(__file__, empty_path)
+        # get modified values
+        modified = watcher.check()
+        # empty theme and content should raise warnings
+        self.assertLogCountEqual(1, 'No valid files found in content')
+        self.assertLogCountEqual(1, 'Empty theme folder. Using `basic` theme')
 
-            # if no files of interest, returns None
-            watcher = utils.folder_watcher(empty_path, ['rst'])
-            self.assertEqual(next(watcher), None)
-        except OSError:
-            self.fail("OSError Exception in test_files_changed test")
-        finally:
-            shutil.rmtree(empty_path, True)
+        self.assertIsNone(modified['content'])  # empty
+        self.assertIsNone(modified['theme'])  # empty
+        self.assertIsNone(modified['[static]static'])  # empty
+        self.assertTrue(modified['settings'])  # modified, first time
+
+        # add a content, add file to theme and check again
+        create_file(os.path.join(content_path, 'article.md'),
+                    'Title: test\n'
+                    'Date: 01-01-2020')
+
+        create_file(os.path.join(theme_path, 'dummy'),
+                    'test')
+
+        modified = watcher.check()
+        # no new warning
+        self.assertLogCountEqual(1, 'No valid files found in content')
+        self.assertLogCountEqual(1, 'Empty theme folder. Using `basic` theme')
+
+        self.assertIsNone(modified['[static]static'])  # empty
+        self.assertFalse(modified['settings'])  # not modified
+        self.assertTrue(modified['theme'])  # modified
+        self.assertTrue(modified['content'])  # modified
+
+        # change config, remove static path
+        create_file(config_file,
+                    'PATH = "content"\n'
+                    'THEME = "mytheme"\n'
+                    'STATIC_PATHS = []')
+
+        settings = read_settings(config_file)
+        watcher.update_watchers(settings)
+
+        modified = watcher.check()
+        self.assertNotIn('[static]static', modified)  # should be gone
+        self.assertTrue(modified['settings'])  # modified
+        self.assertFalse(modified['content'])  # not modified
+        self.assertFalse(modified['theme'])  # not modified
+
+        # cleanup
+        logger.enable_filter()
+        shutil.rmtree(root)
 
     def test_clean_output_dir(self):
         retention = ()
diff --git a/pelican/utils.py b/pelican/utils.py
index 1f3d502c..9b414863 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -734,60 +734,167 @@ def order_content(content_list, order_by='slug'):
     return content_list
 
 
-def folder_watcher(path, extensions, ignores=[]):
-    '''Generator for monitoring a folder for modifications.
+class FileSystemWatcher:
+    def __init__(self, settings_file, reader_class, settings=None):
+        self.watchers = {
+            'settings': FileSystemWatcher.file_watcher(settings_file)
+        }
 
-    Returns a boolean indicating if files are changed since last check.
-    Returns None if there are no matching files in the folder'''
+        self.settings = None
+        self.reader_class = reader_class
+        self._extensions = None
+        self._content_path = None
+        self._theme_path = None
+        self._ignore_files = None
 
-    def file_times(path):
-        '''Return `mtime` for each file in path'''
+        if settings is not None:
+            self.update_watchers(settings)
 
-        for root, dirs, files in os.walk(path, followlinks=True):
-            dirs[:] = [x for x in dirs if not x.startswith(os.curdir)]
+    def update_watchers(self, settings):
+        new_extensions = set(self.reader_class(settings).extensions)
+        new_content_path = settings.get('PATH', '')
+        new_theme_path = settings.get('THEME', '')
+        new_ignore_files = set(settings.get('IGNORE_FILES', []))
 
-            for f in files:
-                valid_extension = f.endswith(tuple(extensions))
-                file_ignored = any(
-                    fnmatch.fnmatch(f, ignore) for ignore in ignores
-                )
-                if valid_extension and not file_ignored:
-                    try:
-                        yield os.stat(os.path.join(root, f)).st_mtime
-                    except OSError as e:
-                        logger.warning('Caught Exception: %s', e)
+        extensions_changed = new_extensions != self._extensions
+        content_changed = new_content_path != self._content_path
+        theme_changed = new_theme_path != self._theme_path
+        ignore_changed = new_ignore_files != self._ignore_files
 
-    LAST_MTIME = 0
-    while True:
-        try:
-            mtime = max(file_times(path))
-            if mtime > LAST_MTIME:
-                LAST_MTIME = mtime
-                yield True
-        except ValueError:
-            yield None
+        # Refresh content watcher if related settings changed
+        if extensions_changed or content_changed or ignore_changed:
+            self.add_watcher('content',
+                             new_content_path,
+                             new_extensions,
+                             new_ignore_files)
+
+        # Refresh theme watcher if related settings changed
+        if theme_changed or ignore_changed:
+            self.add_watcher('theme',
+                             new_theme_path,
+                             [''],
+                             new_ignore_files)
+
+        # Watch STATIC_PATHS
+        old_static_watchers = set(key
+                                  for key in self.watchers
+                                  if key.startswith('[static]'))
+
+        for path in settings.get('STATIC_PATHS', []):
+            key = '[static]{}'.format(path)
+            if ignore_changed or (key not in self.watchers):
+                self.add_watcher(
+                    key,
+                    os.path.join(new_content_path, path),
+                    [''],
+                    new_ignore_files)
+            if key in old_static_watchers:
+                old_static_watchers.remove(key)
+
+        # cleanup removed static watchers
+        for key in old_static_watchers:
+            del self.watchers[key]
+
+        # update values
+        self.settings = settings
+        self._extensions = new_extensions
+        self._content_path = new_content_path
+        self._theme_path = new_theme_path
+        self._ignore_files = new_ignore_files
+
+    def check(self):
+        '''return a key:watcher_status dict for all watchers'''
+        result = {key: next(watcher) for key, watcher in self.watchers.items()}
+
+        # Various warnings
+        if result.get('content') is None:
+            reader_descs = sorted(
+                {
+                    '%s (%s)' % (type(r).__name__, ', '.join(r.file_extensions))
+                    for r in self.reader_class(self.settings).readers.values()
+                    if r.enabled
+                }
+            )
+            logger.warning(
+                    'No valid files found in content for the active readers:\n'
+                    + '\n'.join(reader_descs))
+
+        if result.get('theme') is None:
+            logger.warning('Empty theme folder. Using `basic` theme.')
+
+        return result
+
+    def add_watcher(self, key, path, extensions=[''], ignores=[]):
+        watcher = self.get_watcher(path, extensions, ignores)
+        if watcher is not None:
+            self.watchers[key] = watcher
+
+    def get_watcher(self, path, extensions=[''], ignores=[]):
+        '''return a watcher depending on path type (file or folder)'''
+        if not os.path.exists(path):
+            logger.warning("Watched path does not exist: %s", path)
+            return None
+
+        if os.path.isdir(path):
+            return self.folder_watcher(path, extensions, ignores)
         else:
-            yield False
+            return self.file_watcher(path)
 
+    @staticmethod
+    def folder_watcher(path, extensions, ignores=[]):
+        '''Generator for monitoring a folder for modifications.
 
-def file_watcher(path):
-    '''Generator for monitoring a file for modifications'''
-    LAST_MTIME = 0
-    while True:
-        if path:
+        Returns a boolean indicating if files are changed since last check.
+        Returns None if there are no matching files in the folder'''
+
+        def file_times(path):
+            '''Return `mtime` for each file in path'''
+
+            for root, dirs, files in os.walk(path, followlinks=True):
+                dirs[:] = [x for x in dirs if not x.startswith(os.curdir)]
+
+                for f in files:
+                    valid_extension = f.endswith(tuple(extensions))
+                    file_ignored = any(
+                        fnmatch.fnmatch(f, ignore) for ignore in ignores
+                    )
+                    if valid_extension and not file_ignored:
+                        try:
+                            yield os.stat(os.path.join(root, f)).st_mtime
+                        except OSError as e:
+                            logger.warning('Caught Exception: %s', e)
+
+        LAST_MTIME = 0
+        while True:
             try:
-                mtime = os.stat(path).st_mtime
-            except OSError as e:
-                logger.warning('Caught Exception: %s', e)
-                continue
-
-            if mtime > LAST_MTIME:
-                LAST_MTIME = mtime
-                yield True
+                mtime = max(file_times(path))
+                if mtime > LAST_MTIME:
+                    LAST_MTIME = mtime
+                    yield True
+            except ValueError:
+                yield None
             else:
                 yield False
-        else:
-            yield None
+
+    @staticmethod
+    def file_watcher(path):
+        '''Generator for monitoring a file for modifications'''
+        LAST_MTIME = 0
+        while True:
+            if path:
+                try:
+                    mtime = os.stat(path).st_mtime
+                except OSError as e:
+                    logger.warning('Caught Exception: %s', e)
+                    continue
+
+                if mtime > LAST_MTIME:
+                    LAST_MTIME = mtime
+                    yield True
+                else:
+                    yield False
+            else:
+                yield None
 
 
 def set_date_tzinfo(d, tz_name=None):

From c19075816bd7b909421bbf20a463f332ee9e03be Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 9 May 2020 19:30:21 +0300
Subject: [PATCH 2332/2864] use context manager for log testing

---
 pelican/tests/test_log.py | 85 +++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/pelican/tests/test_log.py b/pelican/tests/test_log.py
index 90a4552d..41fd69ae 100644
--- a/pelican/tests/test_log.py
+++ b/pelican/tests/test_log.py
@@ -1,6 +1,7 @@
 import logging
 import unittest
 from collections import defaultdict
+from contextlib import contextmanager
 
 from pelican import log
 from pelican.tests.support import LogCountHandler
@@ -24,55 +25,59 @@ class TestLog(unittest.TestCase):
         log.LimitFilter._threshold = 5
         log.LimitFilter._group_count = defaultdict(int)
 
+    @contextmanager
+    def reset_logger(self):
+        try:
+            yield None
+        finally:
+            self._reset_limit_filter()
+            self.handler.flush()
+
     def test_log_filter(self):
         def do_logging():
             for i in range(5):
                 self.logger.warning('Log %s', i)
                 self.logger.warning('Another log %s', i)
         # no filter
-        do_logging()
-        self.assertEqual(
-            self.handler.count_logs('Log \\d', logging.WARNING),
-            5)
-        self.assertEqual(
-            self.handler.count_logs('Another log \\d', logging.WARNING),
-            5)
-        self.handler.flush()
-        self._reset_limit_filter()
+        with self.reset_logger():
+            do_logging()
+            self.assertEqual(
+                self.handler.count_logs('Log \\d', logging.WARNING),
+                5)
+            self.assertEqual(
+                self.handler.count_logs('Another log \\d', logging.WARNING),
+                5)
 
         # filter by template
-        log.LimitFilter._ignore.add((logging.WARNING, 'Log %s'))
-        do_logging()
-        self.assertEqual(
-            self.handler.count_logs('Log \\d', logging.WARNING),
-            0)
-        self.assertEqual(
-            self.handler.count_logs('Another log \\d', logging.WARNING),
-            5)
-        self.handler.flush()
-        self._reset_limit_filter()
+        with self.reset_logger():
+            log.LimitFilter._ignore.add((logging.WARNING, 'Log %s'))
+            do_logging()
+            self.assertEqual(
+                self.handler.count_logs('Log \\d', logging.WARNING),
+                0)
+            self.assertEqual(
+                self.handler.count_logs('Another log \\d', logging.WARNING),
+                5)
 
         # filter by exact message
-        log.LimitFilter._ignore.add((logging.WARNING, 'Log 3'))
-        do_logging()
-        self.assertEqual(
-            self.handler.count_logs('Log \\d', logging.WARNING),
-            4)
-        self.assertEqual(
-            self.handler.count_logs('Another log \\d', logging.WARNING),
-            5)
-        self.handler.flush()
-        self._reset_limit_filter()
+        with self.reset_logger():
+            log.LimitFilter._ignore.add((logging.WARNING, 'Log 3'))
+            do_logging()
+            self.assertEqual(
+                self.handler.count_logs('Log \\d', logging.WARNING),
+                4)
+            self.assertEqual(
+                self.handler.count_logs('Another log \\d', logging.WARNING),
+                5)
 
         # filter by both
-        log.LimitFilter._ignore.add((logging.WARNING, 'Log 3'))
-        log.LimitFilter._ignore.add((logging.WARNING, 'Another log %s'))
-        do_logging()
-        self.assertEqual(
-            self.handler.count_logs('Log \\d', logging.WARNING),
-            4)
-        self.assertEqual(
-            self.handler.count_logs('Another log \\d', logging.WARNING),
-            0)
-        self.handler.flush()
-        self._reset_limit_filter()
+        with self.reset_logger():
+            log.LimitFilter._ignore.add((logging.WARNING, 'Log 3'))
+            log.LimitFilter._ignore.add((logging.WARNING, 'Another log %s'))
+            do_logging()
+            self.assertEqual(
+                self.handler.count_logs('Log \\d', logging.WARNING),
+                4)
+            self.assertEqual(
+                self.handler.count_logs('Another log \\d', logging.WARNING),
+                0)

From 50281c42e5bd8d170bd666668ae527170997f357 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 9 May 2020 19:39:54 +0300
Subject: [PATCH 2333/2864] Fix dictionary logging in formatter

Python special cases single Mapping arguments to logging. This
adjusts BaseFormatter to skip "fancy" formatting if argument
is of type Mapping. Also adds various formatted log outputs.
---
 pelican/log.py            |  8 ++++---
 pelican/tests/support.py  |  9 +++++++
 pelican/tests/test_log.py | 49 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index ac5034d9..8b7869ac 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -2,6 +2,7 @@ import logging
 import os
 import sys
 from collections import defaultdict
+from collections.abc import Mapping
 
 __all__ = [
     'init'
@@ -18,9 +19,10 @@ class BaseFormatter(logging.Formatter):
         record.__dict__['customlevelname'] = customlevel
         # format multiline messages 'nicely' to make it clear they are together
         record.msg = record.msg.replace('\n', '\n  | ')
-        record.args = tuple(arg.replace('\n', '\n  | ') if
-                            isinstance(arg, str) else
-                            arg for arg in record.args)
+        if not isinstance(record.args, Mapping):
+            record.args = tuple(arg.replace('\n', '\n  | ') if
+                                isinstance(arg, str) else
+                                arg for arg in record.args)
         return super().format(record)
 
     def formatException(self, ei):
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 8a22052e..b6b547cd 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -195,6 +195,15 @@ class LogCountHandler(BufferingHandler):
                (level is None or l.levelno == level)
         ])
 
+    def count_formatted_logs(self, msg=None, level=None):
+        return len([
+            l
+            for l
+            in self.buffer
+            if (msg is None or re.search(msg, self.format(l))) and
+               (level is None or l.levelno == level)
+        ])
+
 
 class LoggedTestCase(unittest.TestCase):
     """A test case that captures log messages."""
diff --git a/pelican/tests/test_log.py b/pelican/tests/test_log.py
index 41fd69ae..3f9d7250 100644
--- a/pelican/tests/test_log.py
+++ b/pelican/tests/test_log.py
@@ -12,6 +12,7 @@ class TestLog(unittest.TestCase):
         super().setUp()
         self.logger = logging.getLogger(__name__)
         self.handler = LogCountHandler()
+        self.handler.setFormatter(log.get_formatter())
         self.logger.addHandler(self.handler)
 
     def tearDown(self):
@@ -33,6 +34,54 @@ class TestLog(unittest.TestCase):
             self._reset_limit_filter()
             self.handler.flush()
 
+    def test_log_formatter(self):
+        counter = self.handler.count_formatted_logs
+        with self.reset_logger():
+            # log simple case
+            self.logger.warning('Log %s', 'test')
+            self.assertEqual(
+                counter('Log test', logging.WARNING),
+                1)
+
+        with self.reset_logger():
+            # log multiline message
+            self.logger.warning('Log\n%s', 'test')
+            # Log
+            # | test
+            self.assertEqual(
+                counter('Log', logging.WARNING),
+                1)
+            self.assertEqual(
+                counter(' | test', logging.WARNING),
+                1)
+
+        with self.reset_logger():
+            # log multiline argument
+            self.logger.warning('Log %s', 'test1\ntest2')
+            # Log test1
+            # | test2
+            self.assertEqual(
+                counter('Log test1', logging.WARNING),
+                1)
+            self.assertEqual(
+                counter(' | test2', logging.WARNING),
+                1)
+
+        with self.reset_logger():
+            # log single list
+            self.logger.warning('Log %s', ['foo', 'bar'])
+            self.assertEqual(
+                counter(r"Log \['foo', 'bar'\]", logging.WARNING),
+                1)
+
+        with self.reset_logger():
+            # log single dict
+            self.logger.warning('Log %s', {'foo': 1, 'bar': 2})
+            self.assertEqual(
+                # dict order is not guaranteed
+                counter(r"Log {'.*': \d, '.*': \d}", logging.WARNING),
+                1)
+
     def test_log_filter(self):
         def do_logging():
             for i in range(5):

From 21242e3a475be7fcacc4de2e0ef54c396d421b93 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 10 May 2020 08:11:00 +0200
Subject: [PATCH 2334/2864] Switch README CI badge from Travis to GitHub
 Actions

---
 README.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 58c01b39..dee92234 100644
--- a/README.rst
+++ b/README.rst
@@ -56,12 +56,12 @@ Why the name "Pelican"?
 .. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html
 .. _`hosted on GitHub`: https://github.com/getpelican/pelican
 
-.. |build-status| image:: https://img.shields.io/travis/getpelican/pelican/master.svg
-   :target: https://travis-ci.org/getpelican/pelican
-   :alt: Travis CI: continuous integration status
+.. |build-status| image:: https://img.shields.io/github/workflow/status/getpelican/pelican/build
+   :target: https://github.com/getpelican/pelican/actions
+   :alt: GitHub Actions CI: continuous integration status
 .. |pypi-version| image:: https://img.shields.io/pypi/v/pelican.svg
    :target: https://pypi.python.org/pypi/pelican
    :alt: PyPI: the Python Package Index
 .. |repology| image:: https://repology.org/badge/tiny-repos/pelican.svg
    :target: https://repology.org/project/pelican/versions
-   :alt: Repology: the packaging hub
\ No newline at end of file
+   :alt: Repology: the packaging hub

From 873df9094a91c6a063ff932ce8cf803788fea7eb Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 12 May 2020 23:30:03 +0300
Subject: [PATCH 2335/2864] fix linting errors

---
 pelican/tests/support.py            | 16 ++++++++--------
 pelican/tests/test_pelican.py       |  4 ++--
 pelican/tools/pelican_quickstart.py |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index e85f26f2..55ddf625 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -201,20 +201,20 @@ class LogCountHandler(BufferingHandler):
 
     def count_logs(self, msg=None, level=None):
         return len([
-            l
-            for l
+            rec
+            for rec
             in self.buffer
-            if (msg is None or re.match(msg, l.getMessage())) and
-               (level is None or l.levelno == level)
+            if (msg is None or re.match(msg, rec.getMessage())) and
+               (level is None or rec.levelno == level)
         ])
 
     def count_formatted_logs(self, msg=None, level=None):
         return len([
-            l
-            for l
+            rec
+            for rec
             in self.buffer
-            if (msg is None or re.search(msg, self.format(l))) and
-               (level is None or l.levelno == level)
+            if (msg is None or re.search(msg, self.format(rec))) and
+               (level is None or rec.levelno == level)
         ])
 
 
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 16131e8a..219377ae 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -73,8 +73,8 @@ class TestPelican(LoggedTestCase):
                     return True
             return False
         if err:
-            err = '\n'.join([l for l in err.decode('utf8').splitlines()
-                             if not ignorable_git_crlf_errors(l)])
+            err = '\n'.join([line for line in err.decode('utf8').splitlines()
+                             if not ignorable_git_crlf_errors(line)])
         assert not out, out
         assert not err, err
 
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 50acdcb6..1a98ab14 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -88,7 +88,7 @@ def ask(question, answer=str, default=None, length=None):
             if default:
                 r = input('> {} [{}] '.format(question, default))
             else:
-                r = input('> {} '.format(question, default))
+                r = input('> {} '.format(question))
 
             r = r.strip()
 

From f0841dc45404834649298953e87d1b779fd7002f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 17 May 2020 06:26:30 +0200
Subject: [PATCH 2336/2864] Add FAQ entry about Markdown syntax variants

---
 docs/content.rst |  7 ++++---
 docs/faq.rst     | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 6affecce..28ef1cbd 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -48,9 +48,9 @@ Pelican implements an extension to reStructuredText to enable support for the
 
     This will be turned into :abbr:`HTML (HyperText Markup Language)`.
 
-You can also use Markdown syntax (with a file ending in ``.md``,
-``.markdown``, ``.mkd``, or ``.mdown``). Markdown generation requires that you
-first explicitly install the ``Markdown`` package, which can be done via ``pip
+You can also use Markdown syntax (with a file ending in ``.md``, ``.markdown``,
+``.mkd``, or ``.mdown``). Markdown generation requires that you first
+explicitly install the Python-Markdown_ package, which can be done via ``pip
 install Markdown``.
 
 Pelican also supports `Markdown Extensions`_, which might have to be installed
@@ -617,6 +617,7 @@ metadata to include ``Status: published``.
 .. _W3C ISO 8601: https://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: https://www.methods.co.nz/asciidoc/
 .. _pelican-plugins: https://github.com/getpelican/pelican-plugins
+.. _Python-Markdown: https://github.com/Python-Markdown/markdown
 .. _Markdown Extensions: https://python-markdown.github.io/extensions/
 .. _CodeHilite extension: https://python-markdown.github.io/extensions/code_hilite/#syntax
 .. _i18n_subsites plugin: https://github.com/getpelican/pelican-plugins/tree/master/i18n_subsites
diff --git a/docs/faq.rst b/docs/faq.rst
index bfe51ec0..c35cd6c6 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -273,3 +273,19 @@ as articles or pages before they get treated as static files.
 
 To circumvent this issue either use the appropriate ``*_EXCLUDES`` setting or
 disable the offending reader via ``READERS`` if you don't need it.
+
+Why is [arbitrary Markdown syntax] not supported?
+=================================================
+
+Pelican does not directly handle Markdown processing and instead delegates that
+task to the Python-Markdown_ project, the core of which purposefully follows
+the original Markdown syntax rules and not the myriad Markdown "flavors" that
+have subsequently propagated. That said, Python-Markdown_ is quite modular, and
+the syntax you are looking for may be provided by one of the many available
+`Markdown Extensions`_. Alternatively, some folks have created Pelican plugins
+that support Markdown variants, so that may be your best choice if there is a
+particular variant you want to use when writing your content.
+
+
+.. _Python-Markdown: https://github.com/Python-Markdown/markdown
+.. _Markdown Extensions: https://python-markdown.github.io/extensions/

From 7c9c1c63cc7e58add15cc7b9d87456c51f1a2c81 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 17 May 2020 07:04:26 +0200
Subject: [PATCH 2337/2864] Add issue templates

---
 .github/ISSUE_TEMPLATE/---bug-report.md       | 40 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/---documentation.md    | 22 ++++++++++
 .../ISSUE_TEMPLATE/---enhancement-request.md  | 24 +++++++++++
 .github/ISSUE_TEMPLATE/---everything-else.md  | 23 +++++++++++
 .github/ISSUE_TEMPLATE/config.yml             |  7 ++++
 5 files changed, 116 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/---bug-report.md
 create mode 100644 .github/ISSUE_TEMPLATE/---documentation.md
 create mode 100644 .github/ISSUE_TEMPLATE/---enhancement-request.md
 create mode 100644 .github/ISSUE_TEMPLATE/---everything-else.md
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
new file mode 100644
index 00000000..c0f9dec6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -0,0 +1,40 @@
+---
+name: "\U0001F41E Bug Report"
+about: Did you find a bug?
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!--
+  Hi there! Thank you for discovering and submitting an issue.
+
+  Before you submit this, let’s make sure of a few things.
+  Please make sure the following boxes are ticked if they are correct.
+  If not, please try and fulfill them first.
+-->
+
+<!-- Checked checkbox should look like this: [x] -->
+- [ ] I have read the [Filing Issues](https://docs.getpelican.com/en/latest/contribute.html#filing-issues) and subsequent “How to Get Help” sections of the documentation.
+- [ ] I have searched the [issues](https://github.com/getpelican/pelican/issues?q=is%3Aissue) (including closed ones) and believe that this is not a duplicate.
+
+<!--
+  Once the above boxes are checked, if you are able to fill in the following list
+  with your information, it would be very helpful for maintainers.
+-->
+
+- **OS version and name**: <!-- Replace with version + name -->
+- **Python version**: <!-- Replace with version -->
+- **Pelican version**: <!-- Replace with version -->
+- **Link to theme**: <!-- Replace with link to the theme you are using -->
+- **Links to plugins**: <!-- Replace with list of links to plugins you are using -->
+- **Link to your site**: <!-- If available, replace with link to your site -->
+- **Link to your source**: <!-- If available, replace with link to relevant source repository -->
+- **Link to a [Gist](https://gist.github.com/) with the contents of your settings file**: <!-- If your source is not accessible, put Gist link here -->
+
+## Issue
+<!--
+  Now feel free to write your issue. Please avoid vague phrases like “[…] doesn’t work”.
+  Be descriptive! Thanks again 🙌 ❤️
+-->
diff --git a/.github/ISSUE_TEMPLATE/---documentation.md b/.github/ISSUE_TEMPLATE/---documentation.md
new file mode 100644
index 00000000..03055b3a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---documentation.md
@@ -0,0 +1,22 @@
+---
+name: "\U0001F4DA Documentation"
+about: Did you find errors, problems, or anything unclear in the docs (https://docs.getpelican.com/)?
+title: ''
+labels: docs
+assignees: ''
+
+---
+
+<!--
+  Hi there! Thank you for discovering and submitting an issue with our documentation.
+
+  Before you submit this, let’s make sure of a few things.
+  Please make sure the following boxes are ticked if they are correct.
+  If not, please try and fulfill them first.
+-->
+
+<!-- Checked checkbox should look like this: [x] -->
+- [ ] I have searched the [issues](https://github.com/getpelican/pelican/issues?q=is%3Aissue) (including closed ones) and believe that this is not a duplicate.
+
+## Issue
+<!-- Now feel free to write your issue, but please be descriptive! Thanks again 🙌 ❤️ -->
diff --git a/.github/ISSUE_TEMPLATE/---enhancement-request.md b/.github/ISSUE_TEMPLATE/---enhancement-request.md
new file mode 100644
index 00000000..c9d545a7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---enhancement-request.md
@@ -0,0 +1,24 @@
+---
+name: "\U0001F381 Feature Request"
+about: Do you have ideas for new features and improvements?
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+<!--
+  Hi there! Thank you for wanting to make Pelican better.
+
+  Before you submit this, let’s make sure of a few things.
+  Please make sure the following boxes are ticked if they are correct.
+  If not, please try and fulfill them first. The last one is optional but encouraged.
+-->
+
+<!-- Checked checkbox should look like this: [x] -->
+- [ ] I have searched the [issues](https://github.com/getpelican/pelican/issues?q=is%3Aissue) (including closed ones) and believe that this is not a duplicate.
+- [ ] I have searched the [documentation](https://docs.getpelican.com/) and believe that my question is not covered.
+- [ ] I am willing to lend a hand to help implement this feature. <!-- optional but encouraged -->
+
+## Feature Request
+<!-- Now feel free to write your idea for improvement. Thanks again 🙌 ❤️ -->
diff --git a/.github/ISSUE_TEMPLATE/---everything-else.md b/.github/ISSUE_TEMPLATE/---everything-else.md
new file mode 100644
index 00000000..fd2a58ae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---everything-else.md
@@ -0,0 +1,23 @@
+---
+name: "\U0001F5C3 Everything Else"
+about: Do you have a question/issue that does not fall into any of the other categories?
+title: ''
+labels: question
+assignees: ''
+
+---
+
+<!--
+  Describe your question/issue here. This space is meant to be used for general questions
+  that are not bugs, feature requests, or documentation issues.
+  Before you submit this, let’s make sure of a few things.
+  Please make sure the following boxes are ticked if they are correct.
+  If not, please try and fulfill them first.
+-->
+
+<!-- Checked checkbox should look like this: [x] -->
+- [ ] I have searched the [issues](https://github.com/getpelican/pelican/issues?q=is%3Aissue) (including closed ones) and believe that this is not a duplicate.
+- [ ] I have searched the [documentation](https://docs.getpelican.com/) and believe that my question is not covered.
+
+## Issue
+<!-- Now feel free to write your issue, but please be descriptive! Thanks again 🙌 ❤️ -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..d080329a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+# Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
+blank_issues_enabled: true
+contact_links:
+- name: '💬 Pelican IRC Channel on Freenode'
+  url: https://kiwiirc.com/client/irc.freenode.net/?#pelican
+  about: |
+    Chat with the community, ask questions, and learn about best practices.

From 0ed7d6641eaf3d40b265d477dd237d2e38e8c152 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 17 May 2020 07:32:28 +0200
Subject: [PATCH 2338/2864] Add pull request template

---
 .github/pull_request_template.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..8300fb74
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,12 @@
+# Pull Request Checklist
+
+Resolves: #issue-number-here <!-- Only if related issue *already* exists — otherwise remove this line -->
+
+<!-- This is just a reminder about the most common mistakes. Please make sure that you tick all *appropriate* boxes. Also, please read our [contribution guide](https://docs.getpelican.com/en/latest/contribute.html#contributing-code) at least once — it will save you unnecessary review cycles! -->
+
+- [ ] Ensured **tests pass** and (if applicable) updated functional test output
+- [ ] Conformed to **code style guidelines** by running appropriate linting tools
+- [ ] Added **tests** for changed code
+- [ ] Updated **documentation** for changed code
+
+<!-- If you have *any* questions to *any* of the points above, just **submit and ask**! This checklist is here to *help* you, not to deter you from contributing! -->

From d0457dcfb8a10e48fdf6d6f7535ce0194bf601ee Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 10 May 2020 07:50:32 +0200
Subject: [PATCH 2339/2864] Build settings paths as strings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… instead of `posix_join`. Fixes #2431
---
 pelican/settings.py | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index d219a8f2..7b333de8 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -6,7 +6,6 @@ import logging
 import os
 import re
 from os.path import isabs
-from posixpath import join as posix_join
 
 from pelican.log import LimitFilter
 
@@ -36,11 +35,11 @@ DEFAULT_CONFIG = {
     'STATIC_EXCLUDE_SOURCES': True,
     'THEME_STATIC_DIR': 'theme',
     'THEME_STATIC_PATHS': ['static', ],
-    'FEED_ALL_ATOM': posix_join('feeds', 'all.atom.xml'),
-    'CATEGORY_FEED_ATOM': posix_join('feeds', '{slug}.atom.xml'),
-    'AUTHOR_FEED_ATOM': posix_join('feeds', '{slug}.atom.xml'),
-    'AUTHOR_FEED_RSS': posix_join('feeds', '{slug}.rss.xml'),
-    'TRANSLATION_FEED_ATOM': posix_join('feeds', 'all-{lang}.atom.xml'),
+    'FEED_ALL_ATOM': 'feeds/all.atom.xml',
+    'CATEGORY_FEED_ATOM': 'feeds/{slug}.atom.xml',
+    'AUTHOR_FEED_ATOM': 'feeds/{slug}.atom.xml',
+    'AUTHOR_FEED_RSS': 'feeds/{slug}.rss.xml',
+    'TRANSLATION_FEED_ATOM': 'feeds/all-{lang}.atom.xml',
     'FEED_MAX_ITEMS': '',
     'RSS_FEED_SUMMARY_ONLY': True,
     'SITEURL': '',
@@ -65,29 +64,28 @@ DEFAULT_CONFIG = {
     'ARTICLE_LANG_URL': '{slug}-{lang}.html',
     'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html',
     'DRAFT_URL': 'drafts/{slug}.html',
-    'DRAFT_SAVE_AS': posix_join('drafts', '{slug}.html'),
+    'DRAFT_SAVE_AS': 'drafts/{slug}.html',
     'DRAFT_LANG_URL': 'drafts/{slug}-{lang}.html',
-    'DRAFT_LANG_SAVE_AS': posix_join('drafts', '{slug}-{lang}.html'),
+    'DRAFT_LANG_SAVE_AS': 'drafts/{slug}-{lang}.html',
     'PAGE_URL': 'pages/{slug}.html',
-    'PAGE_SAVE_AS': posix_join('pages', '{slug}.html'),
+    'PAGE_SAVE_AS': 'pages/{slug}.html',
     'PAGE_ORDER_BY': 'basename',
     'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
-    'PAGE_LANG_SAVE_AS': posix_join('pages', '{slug}-{lang}.html'),
+    'PAGE_LANG_SAVE_AS': 'pages/{slug}-{lang}.html',
     'DRAFT_PAGE_URL': 'drafts/pages/{slug}.html',
-    'DRAFT_PAGE_SAVE_AS': posix_join('drafts', 'pages', '{slug}.html'),
+    'DRAFT_PAGE_SAVE_AS': 'drafts/pages/{slug}.html',
     'DRAFT_PAGE_LANG_URL': 'drafts/pages/{slug}-{lang}.html',
-    'DRAFT_PAGE_LANG_SAVE_AS': posix_join('drafts', 'pages',
-                                          '{slug}-{lang}.html'),
+    'DRAFT_PAGE_LANG_SAVE_AS': 'drafts/pages/{slug}-{lang}.html',
     'STATIC_URL': '{path}',
     'STATIC_SAVE_AS': '{path}',
     'STATIC_CREATE_LINKS': False,
     'STATIC_CHECK_IF_MODIFIED': False,
     'CATEGORY_URL': 'category/{slug}.html',
-    'CATEGORY_SAVE_AS': posix_join('category', '{slug}.html'),
+    'CATEGORY_SAVE_AS': 'category/{slug}.html',
     'TAG_URL': 'tag/{slug}.html',
-    'TAG_SAVE_AS': posix_join('tag', '{slug}.html'),
+    'TAG_SAVE_AS': 'tag/{slug}.html',
     'AUTHOR_URL': 'author/{slug}.html',
-    'AUTHOR_SAVE_AS': posix_join('author', '{slug}.html'),
+    'AUTHOR_SAVE_AS': 'author/{slug}.html',
     'PAGINATION_PATTERNS': [
         (1, '{name}{extension}', '{name}{extension}'),
         (2, '{name}{number}{extension}', '{name}{number}{extension}'),

From d8172318366f8147c1bee07f0f1cabf3d7256d5d Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 23 Apr 2020 12:49:44 -0600
Subject: [PATCH 2340/2864] Allow generators to deal with settings that are
 `pathlib.Path`s

---
 pelican/generators.py | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 63e20a0a..424e9c22 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -18,7 +18,6 @@ from pelican.readers import Readers
 from pelican.utils import (DateFormatter, copy, mkdir_p, order_content,
                            posixize_path, process_translations)
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -322,8 +321,9 @@ class ArticlesGenerator(CachingGenerator):
             all_articles = list(self.articles)
             for article in self.articles:
                 all_articles.extend(article.translations)
-            order_content(all_articles,
-                          order_by=self.settings['ARTICLE_ORDER_BY'])
+            order_content(
+                all_articles, order_by=self.settings['ARTICLE_ORDER_BY']
+            )
 
             if self.settings.get('FEED_ALL_ATOM'):
                 writer.write_feed(
@@ -352,7 +352,7 @@ class ArticlesGenerator(CachingGenerator):
                     self.settings['CATEGORY_FEED_ATOM'].format(slug=cat.slug),
                     self.settings.get(
                         'CATEGORY_FEED_ATOM_URL',
-                        self.settings['CATEGORY_FEED_ATOM']).format(
+                        str(self.settings['CATEGORY_FEED_ATOM'])).format(
                             slug=cat.slug
                         ),
                     feed_title=cat.name
@@ -365,7 +365,7 @@ class ArticlesGenerator(CachingGenerator):
                     self.settings['CATEGORY_FEED_RSS'].format(slug=cat.slug),
                     self.settings.get(
                         'CATEGORY_FEED_RSS_URL',
-                        self.settings['CATEGORY_FEED_RSS']).format(
+                        str(self.settings['CATEGORY_FEED_RSS'])).format(
                             slug=cat.slug
                         ),
                     feed_title=cat.name,
@@ -380,8 +380,9 @@ class ArticlesGenerator(CachingGenerator):
                     self.settings['AUTHOR_FEED_ATOM'].format(slug=auth.slug),
                     self.settings.get(
                         'AUTHOR_FEED_ATOM_URL',
-                        self.settings['AUTHOR_FEED_ATOM']
-                        ).format(slug=auth.slug),
+                        str(self.settings['AUTHOR_FEED_ATOM'])).format(
+                            slug=auth.slug
+                        ),
                     feed_title=auth.name
                     )
 
@@ -392,8 +393,9 @@ class ArticlesGenerator(CachingGenerator):
                     self.settings['AUTHOR_FEED_RSS'].format(slug=auth.slug),
                     self.settings.get(
                         'AUTHOR_FEED_RSS_URL',
-                        self.settings['AUTHOR_FEED_RSS']
-                        ).format(slug=auth.slug),
+                        str(self.settings['AUTHOR_FEED_RSS'])).format(
+                            slug=auth.slug
+                        ),
                     feed_title=auth.name,
                     feed_type='rss'
                     )
@@ -408,8 +410,9 @@ class ArticlesGenerator(CachingGenerator):
                         self.settings['TAG_FEED_ATOM'].format(slug=tag.slug),
                         self.settings.get(
                             'TAG_FEED_ATOM_URL',
-                            self.settings['TAG_FEED_ATOM']
-                            ).format(slug=tag.slug),
+                            str(self.settings['TAG_FEED_ATOM'])).format(
+                                slug=tag.slug
+                            ),
                         feed_title=tag.name
                         )
 
@@ -420,8 +423,9 @@ class ArticlesGenerator(CachingGenerator):
                         self.settings['TAG_FEED_RSS'].format(slug=tag.slug),
                         self.settings.get(
                             'TAG_FEED_RSS_URL',
-                            self.settings['TAG_FEED_RSS']
-                            ).format(slug=tag.slug),
+                            str(self.settings['TAG_FEED_RSS'])).format(
+                                slug=tag.slug
+                            ),
                         feed_title=tag.name,
                         feed_type='rss'
                         )
@@ -443,7 +447,8 @@ class ArticlesGenerator(CachingGenerator):
                             .format(lang=lang),
                         self.settings.get(
                             'TRANSLATION_FEED_ATOM_URL',
-                            self.settings['TRANSLATION_FEED_ATOM']
+                            str(
+                                self.settings['TRANSLATION_FEED_ATOM'])
                             ).format(lang=lang),
                         )
                 if self.settings.get('TRANSLATION_FEED_RSS'):
@@ -454,8 +459,9 @@ class ArticlesGenerator(CachingGenerator):
                             .format(lang=lang),
                         self.settings.get(
                             'TRANSLATION_FEED_RSS_URL',
-                            self.settings['TRANSLATION_FEED_RSS']
-                            ).format(lang=lang),
+                            str(self.settings['TRANSLATION_FEED_RSS'])).format(
+                                lang=lang
+                            ),
                         feed_type='rss'
                         )
 

From cfba3d72beef60de10311a75f83ebb259269fed8 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 23 Apr 2020 13:47:10 -0600
Subject: [PATCH 2341/2864] fix testing failures

when settings could be pathlib.Path
---
 pelican/contents.py    |  2 +-
 pelican/generators.py  | 52 +++++++++++++++++++++++-------------------
 pelican/settings.py    |  4 ++--
 pelican/urlwrappers.py |  3 +++
 pelican/utils.py       | 34 ++++++++++++++++++---------
 pelican/writers.py     |  2 +-
 6 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 2bb2e3a0..2e29d84e 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -215,7 +215,7 @@ class Content:
         if not klass:
             klass = self.__class__.__name__
         fq_key = ('{}_{}'.format(klass, key)).upper()
-        return self.settings[fq_key].format(**self.url_format)
+        return str(self.settings[fq_key]).format(**self.url_format)
 
     def get_url_setting(self, key):
         if hasattr(self, 'override_' + key):
diff --git a/pelican/generators.py b/pelican/generators.py
index 424e9c22..d92e8ff8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -349,12 +349,12 @@ class ArticlesGenerator(CachingGenerator):
                 writer.write_feed(
                     arts,
                     self.context,
-                    self.settings['CATEGORY_FEED_ATOM'].format(slug=cat.slug),
+                    str(self.settings['CATEGORY_FEED_ATOM']).format(slug=cat.slug),
                     self.settings.get(
                         'CATEGORY_FEED_ATOM_URL',
-                        str(self.settings['CATEGORY_FEED_ATOM'])).format(
+                        str(self.settings['CATEGORY_FEED_ATOM']).format(
                             slug=cat.slug
-                        ),
+                        )),
                     feed_title=cat.name
                     )
 
@@ -362,12 +362,12 @@ class ArticlesGenerator(CachingGenerator):
                 writer.write_feed(
                     arts,
                     self.context,
-                    self.settings['CATEGORY_FEED_RSS'].format(slug=cat.slug),
+                    str(self.settings['CATEGORY_FEED_RSS']).format(slug=cat.slug),
                     self.settings.get(
                         'CATEGORY_FEED_RSS_URL',
-                        str(self.settings['CATEGORY_FEED_RSS'])).format(
+                        str(self.settings['CATEGORY_FEED_RSS']).format(
                             slug=cat.slug
-                        ),
+                        )),
                     feed_title=cat.name,
                     feed_type='rss'
                     )
@@ -377,12 +377,12 @@ class ArticlesGenerator(CachingGenerator):
                 writer.write_feed(
                     arts,
                     self.context,
-                    self.settings['AUTHOR_FEED_ATOM'].format(slug=auth.slug),
+                    str(self.settings['AUTHOR_FEED_ATOM']).format(slug=auth.slug),
                     self.settings.get(
                         'AUTHOR_FEED_ATOM_URL',
-                        str(self.settings['AUTHOR_FEED_ATOM'])).format(
+                        str(self.settings['AUTHOR_FEED_ATOM']).format(
                             slug=auth.slug
-                        ),
+                        )),
                     feed_title=auth.name
                     )
 
@@ -390,12 +390,12 @@ class ArticlesGenerator(CachingGenerator):
                 writer.write_feed(
                     arts,
                     self.context,
-                    self.settings['AUTHOR_FEED_RSS'].format(slug=auth.slug),
+                    str(self.settings['AUTHOR_FEED_RSS']).format(slug=auth.slug),
                     self.settings.get(
                         'AUTHOR_FEED_RSS_URL',
-                        str(self.settings['AUTHOR_FEED_RSS'])).format(
+                        str(self.settings['AUTHOR_FEED_RSS']).format(
                             slug=auth.slug
-                        ),
+                        )),
                     feed_title=auth.name,
                     feed_type='rss'
                     )
@@ -407,12 +407,12 @@ class ArticlesGenerator(CachingGenerator):
                     writer.write_feed(
                         arts,
                         self.context,
-                        self.settings['TAG_FEED_ATOM'].format(slug=tag.slug),
+                        str(self.settings['TAG_FEED_ATOM']).format(slug=tag.slug),
                         self.settings.get(
                             'TAG_FEED_ATOM_URL',
-                            str(self.settings['TAG_FEED_ATOM'])).format(
+                            str(self.settings['TAG_FEED_ATOM']).format(
                                 slug=tag.slug
-                            ),
+                            )),
                         feed_title=tag.name
                         )
 
@@ -420,12 +420,12 @@ class ArticlesGenerator(CachingGenerator):
                     writer.write_feed(
                         arts,
                         self.context,
-                        self.settings['TAG_FEED_RSS'].format(slug=tag.slug),
+                        str(self.settings['TAG_FEED_RSS']).format(slug=tag.slug),
                         self.settings.get(
                             'TAG_FEED_RSS_URL',
-                            str(self.settings['TAG_FEED_RSS'])).format(
+                            str(self.settings['TAG_FEED_RSS']).format(
                                 slug=tag.slug
-                            ),
+                            )),
                         feed_title=tag.name,
                         feed_type='rss'
                         )
@@ -443,27 +443,31 @@ class ArticlesGenerator(CachingGenerator):
                     writer.write_feed(
                         items,
                         self.context,
-                        self.settings['TRANSLATION_FEED_ATOM']
-                            .format(lang=lang),
+                        str(
+                            self.settings['TRANSLATION_FEED_ATOM']
+                        ).format(lang=lang),
                         self.settings.get(
                             'TRANSLATION_FEED_ATOM_URL',
                             str(
-                                self.settings['TRANSLATION_FEED_ATOM'])
+                                self.settings['TRANSLATION_FEED_ATOM']
                             ).format(lang=lang),
                         )
+                    )
                 if self.settings.get('TRANSLATION_FEED_RSS'):
                     writer.write_feed(
                         items,
                         self.context,
-                        self.settings['TRANSLATION_FEED_RSS']
-                            .format(lang=lang),
+                        str(
+                            self.settings['TRANSLATION_FEED_RSS']
+                        ).format(lang=lang),
                         self.settings.get(
                             'TRANSLATION_FEED_RSS_URL',
-                            str(self.settings['TRANSLATION_FEED_RSS'])).format(
+                            str(self.settings['TRANSLATION_FEED_RSS']).format(
                                 lang=lang
                             ),
                         feed_type='rss'
                         )
+                    )
 
     def generate_articles(self, write):
         """Generate the articles."""
diff --git a/pelican/settings.py b/pelican/settings.py
index 7b333de8..ddb6748d 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -406,7 +406,7 @@ def handle_deprecated_settings(settings):
     for key in ['TRANSLATION_FEED_ATOM',
                 'TRANSLATION_FEED_RSS'
                 ]:
-        if settings.get(key) and '%s' in settings[key]:
+        if settings.get(key) and not isinstance(settings[key], Path) and '%s' in settings[key]:
             logger.warning('%%s usage in %s is deprecated, use {lang} '
                            'instead.', key)
             try:
@@ -423,7 +423,7 @@ def handle_deprecated_settings(settings):
                 'TAG_FEED_ATOM',
                 'TAG_FEED_RSS',
                 ]:
-        if settings.get(key) and '%s' in settings[key]:
+        if settings.get(key) and not isinstance(settings[key], Path) and '%s' in settings[key]:
             logger.warning('%%s usage in %s is deprecated, use {slug} '
                            'instead.', key)
             try:
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index efe09fbc..e00b914c 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -1,6 +1,7 @@
 import functools
 import logging
 import os
+import pathlib
 
 from pelican.utils import slugify
 
@@ -110,6 +111,8 @@ class URLWrapper:
         """
         setting = "{}_{}".format(self.__class__.__name__.upper(), key)
         value = self.settings[setting]
+        if isinstance(value, pathlib.Path):
+            value = str(value)
         if not isinstance(value, str):
             logger.warning('%s is set to %s', setting, value)
             return value
diff --git a/pelican/utils.py b/pelican/utils.py
index e82117d3..a3ece8ce 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -3,6 +3,7 @@ import fnmatch
 import locale
 import logging
 import os
+import pathlib
 import re
 import shutil
 import sys
@@ -921,17 +922,28 @@ def split_all(path):
     >>> split_all(os.path.join('a', 'b', 'c'))
     ['a', 'b', 'c']
     """
-    components = []
-    path = path.lstrip('/')
-    while path:
-        head, tail = os.path.split(path)
-        if tail:
-            components.insert(0, tail)
-        elif head == path:
-            components.insert(0, head)
-            break
-        path = head
-    return components
+    if isinstance(path, str):
+        components = []
+        path = path.lstrip('/')
+        while path:
+            head, tail = os.path.split(path)
+            if tail:
+                components.insert(0, tail)
+            elif head == path:
+                components.insert(0, head)
+                break
+            path = head
+        return components
+    elif isinstance(path, pathlib.Path):
+        return path.parts
+    elif path is None:
+        return None
+    else:
+        raise TypeError(
+            '"path" was {}, must be string, None, or pathlib.Path'.format(
+                type(path)
+            )
+        )
 
 
 def is_selected_for_writing(settings, path):
diff --git a/pelican/writers.py b/pelican/writers.py
index 9b27a748..379af1f4 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -29,7 +29,7 @@ class Writer:
             self.urljoiner = posix_join
         else:
             self.urljoiner = lambda base, url: urljoin(
-                base if base.endswith('/') else base + '/', url)
+                base if base.endswith('/') else base + '/', str(url))
 
     def _create_new_feed(self, feed_type, feed_title, context):
         feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed

From a13371670970661c7d3f673e9c634df83f7a95bf Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 21 May 2020 21:43:06 -0600
Subject: [PATCH 2342/2864] flake8 fixes

---
 pelican/generators.py |  3 +--
 pelican/settings.py   | 11 +++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index d92e8ff8..ecc06851 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -462,11 +462,10 @@ class ArticlesGenerator(CachingGenerator):
                         ).format(lang=lang),
                         self.settings.get(
                             'TRANSLATION_FEED_RSS_URL',
-                            str(self.settings['TRANSLATION_FEED_RSS']).format(
+                            str(self.settings['TRANSLATION_FEED_RSS'])).format(
                                 lang=lang
                             ),
                         feed_type='rss'
-                        )
                     )
 
     def generate_articles(self, write):
diff --git a/pelican/settings.py b/pelican/settings.py
index ddb6748d..a5e39161 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -6,6 +6,7 @@ import logging
 import os
 import re
 from os.path import isabs
+from pathlib import Path
 
 from pelican.log import LimitFilter
 
@@ -406,7 +407,10 @@ def handle_deprecated_settings(settings):
     for key in ['TRANSLATION_FEED_ATOM',
                 'TRANSLATION_FEED_RSS'
                 ]:
-        if settings.get(key) and not isinstance(settings[key], Path) and '%s' in settings[key]:
+        if (
+            settings.get(key) and not isinstance(settings[key], Path)
+            and '%s' in settings[key]
+        ):
             logger.warning('%%s usage in %s is deprecated, use {lang} '
                            'instead.', key)
             try:
@@ -423,7 +427,10 @@ def handle_deprecated_settings(settings):
                 'TAG_FEED_ATOM',
                 'TAG_FEED_RSS',
                 ]:
-        if settings.get(key) and not isinstance(settings[key], Path) and '%s' in settings[key]:
+        if (
+            settings.get(key) and not isinstance(settings[key], Path)
+            and '%s' in settings[key]
+        ):
             logger.warning('%%s usage in %s is deprecated, use {slug} '
                            'instead.', key)
             try:

From 9db937e581e03aee857a4e95d1a170a6d98ff687 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 26 May 2020 15:18:24 +0200
Subject: [PATCH 2343/2864] Document the `pelican-plugins` command

---
 docs/plugins.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 4d44eea7..6d9e46b5 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -9,10 +9,12 @@ features to Pelican without having to directly modify the Pelican core.
 How to use plugins
 ==================
 
-Starting with version 5.0, Pelican moved to a new plugin structure utilizing
+Starting with version 4.5, Pelican moved to a new plugin structure utilizing
 namespace packages. Plugins supporting this structure will install under the
 namespace package ``pelican.plugins`` and can be automatically discovered
-by Pelican.
+by Pelican. To see a list of plugins that are active in your environment, run::
+
+    pelican-plugins
 
 If you leave the ``PLUGINS`` setting as default (``None``), Pelican will then
 collect the namespace plugins and register them. If on the other hand you
@@ -20,7 +22,7 @@ specify a ``PLUGINS`` settings as a list of plugins, this autodiscovery will
 be disabled and only listed plugins will be registered and you will have to
 explicitly list the namespace plugins as well.
 
-If you are using ``PLUGINS`` setting, you can specify plugins in two ways.
+If you are using the ``PLUGINS`` setting, you can specify plugins in two ways.
 The first method specifies plugins as a list of strings. Namespace plugins can
 be specified either by their full names (``pelican.plugins.myplugin``) or by
 their short names (``myplugin``)::

From 78edd878a31d9dd900e79477a0a2789384ff75f1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 4 Jun 2020 11:14:37 +0200
Subject: [PATCH 2344/2864] Improve namespace plugin documentation

---
 docs/plugins.rst | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 6d9e46b5..76a88507 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -10,17 +10,18 @@ How to use plugins
 ==================
 
 Starting with version 4.5, Pelican moved to a new plugin structure utilizing
-namespace packages. Plugins supporting this structure will install under the
-namespace package ``pelican.plugins`` and can be automatically discovered
-by Pelican. To see a list of plugins that are active in your environment, run::
+namespace packages that can be easily installed via Pip_. Plugins supporting
+this structure will install under the namespace package ``pelican.plugins`` and
+can be automatically discovered by Pelican. To see a list of plugins that are
+active in your environment, run::
 
     pelican-plugins
 
-If you leave the ``PLUGINS`` setting as default (``None``), Pelican will then
-collect the namespace plugins and register them. If on the other hand you
-specify a ``PLUGINS`` settings as a list of plugins, this autodiscovery will
-be disabled and only listed plugins will be registered and you will have to
-explicitly list the namespace plugins as well.
+If you leave the ``PLUGINS`` setting as default (``None``), Pelican will
+automatically discover namespace plugins and register them. If, on the other
+hand, you specify a ``PLUGINS`` setting as a list of plugins, this
+auto-discovery will be disabled. At that point, only the plugins you specify
+will be registered, and you must explicitly list any namespace plugins as well.
 
 If you are using the ``PLUGINS`` setting, you can specify plugins in two ways.
 The first method specifies plugins as a list of strings. Namespace plugins can
@@ -54,8 +55,8 @@ the ``PLUGIN_PATHS`` list can be absolute or relative to the settings file::
 Where to find plugins
 =====================
 Namespace plugins can be found in the `pelican-plugins organization`_ as
-individual repositories. Legacy plugins are collected in the `pelican-plugins
-repository`_ and they will be slowly phased out in favor of the namespace
+individual repositories. Legacy plugins are located in the `pelican-plugins
+repository`_ and will be gradually phased out in favor of the namespace
 versions.
 
 .. _pelican-plugins organization: https://github.com/pelican-plugins
@@ -111,8 +112,8 @@ empty besides the listed folders in the above structure and keep your
 plugin related files contained solely in the ``pelican/plugins/myplugin``
 folder to avoid any issues.
 
-For easily setting up the proper structure, a `cookiecutter template for
-plugins`_ is provided. Refer to the README in the link for how to use it.
+To easily set up the proper structure, a `cookiecutter template for plugins`_
+is provided. Refer to that project's README for instructions on how to use it.
 
 .. _cookiecutter template for plugins: https://github.com/getpelican/cookiecutter-pelican-plugin
 
@@ -264,4 +265,6 @@ Adding a new generator is also really easy. You might want to have a look at
     def register():
         signals.get_generators.connect(get_generators)
 
+
+.. _Pip: https://pip.pypa.io/
 .. _pelican-plugins bug #314: https://github.com/getpelican/pelican-plugins/issues/314

From cd3048d4cf6d69ba95bf22ca55a2e9ddd6c91bff Mon Sep 17 00:00:00 2001
From: Kernc <kerncece@gmail.com>
Date: Fri, 5 Jun 2020 01:48:11 +0200
Subject: [PATCH 2345/2864] Force root logger to be of FatalLogger class

This enforces FatalLogger policy upon pelican plugins
that might contain codes such as:

    import logging
    log = logging.getLogger()

    log.warning(...)
    # or
    logging.warning(...)
---
 pelican/log.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/log.py b/pelican/log.py
index 8b7869ac..325ac3ea 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -165,6 +165,8 @@ class FatalLogger(LimitLogger):
 
 
 logging.setLoggerClass(FatalLogger)
+# force root logger to be of our preferred class
+logging.getLogger().__class__ = FatalLogger
 
 
 def supports_color():

From 20067da9f52b56510c3a510b9fe175b60b344543 Mon Sep 17 00:00:00 2001
From: Kernc <kerncece@gmail.com>
Date: Fri, 5 Jun 2020 14:24:55 +0200
Subject: [PATCH 2346/2864] Document how to logging in plugins

---
 docs/plugins.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 76a88507..a4ef91d6 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -76,10 +76,14 @@ section.
 The only rule to follow for plugins is to define a ``register`` callable, in
 which you map the signals to your plugin logic. Let's take a simple example::
 
+    import logging
+
     from pelican import signals
 
+    log = logging.getLogger(__name__)
+
     def test(sender):
-        print("{} initialized !!".format(sender))
+        log.debug("%s initialized !!", sender)
 
     def register():
         signals.initialized.connect(test)

From d6623c642fc6999fb57a5bbf8ce5a11c03c752de Mon Sep 17 00:00:00 2001
From: Kernc <kerncece@gmail.com>
Date: Fri, 5 Jun 2020 14:27:37 +0200
Subject: [PATCH 2347/2864] Docs: minor fix code block indent

---
 docs/settings.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 5b255dcc..2b99072f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -742,8 +742,8 @@ Time and Date
 
    .. parsed-literal::
 
-       LOCALE = ('usa', 'jpn',      # On Windows
-                 'en_US', 'ja_JP'   # On Unix/Linux
+      LOCALE = ('usa', 'jpn',      # On Windows
+                'en_US', 'ja_JP'   # On Unix/Linux
       )
 
    For a list of available locales refer to `locales on Windows`_  or on

From d3aa4f7c7c875b39ae78c394ee43d46ab6a386ed Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Sun, 7 Jun 2020 01:46:16 +0000
Subject: [PATCH 2348/2864] Remove duplicate port arguments in Makefile

The PORT variable check earlier in the Makefile sets up the `-p` argument as part of PELICANOPTS so prior to this change `-p` was duplicated on each of the serve targets.
---
 pelican/tools/templates/Makefile.jinja2 | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 0184cc88..ab447135 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -101,32 +101,16 @@ regenerate:
 	"$(PELICAN)" -r "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
 
 serve:
-ifdef PORT
-	"$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -p $(PORT)
-else
 	"$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
-endif
 
 serve-global:
-ifdef PORT
-	"$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -p $(PORT) -b $(SERVER)
-else
 	"$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -b $(SERVER)
-endif
 
 devserver:
-ifdef PORT
-	"$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -p $(PORT)
-else
 	"$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
-endif
 
 devserver-global:
-ifdef PORT
-	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -p $(PORT) -b 0.0.0.0
-else
 	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -b 0.0.0.0
-endif
 
 publish:
 	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)

From d3c4bcc2541f61421d07debdbc731b4d59c4e526 Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Tue, 9 Jun 2020 16:01:46 +0200
Subject: [PATCH 2349/2864] Invoke template : avoiding to spawn unnecessary
 process + passing-through CLI args to pelican

---
 THANKS                                  |  1 +
 pelican/tools/templates/tasks.py.jinja2 | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/THANKS b/THANKS
index 08ac7bb2..fd9f030e 100644
--- a/THANKS
+++ b/THANKS
@@ -97,6 +97,7 @@ Kyle Fuller
 Laureline Guerin
 Leonard Huang
 Leroy Jiang
+Lucas Cimon
 Marcel Hellkamp
 Marco Milanesi
 Marcus Fredriksson
diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 1b02d3c9..0f25953f 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -6,6 +6,7 @@ import sys
 import datetime
 
 from invoke import task
+from invoke.main import program
 from invoke.util import cd
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import DEFAULT_CONFIG, get_settings_from_file
@@ -54,17 +55,17 @@ def clean(c):
 @task
 def build(c):
     """Build local version of site"""
-    c.run('pelican -s {settings_base}'.format(**CONFIG))
+    pelican_run('-s {settings_base}'.format(**CONFIG))
 
 @task
 def rebuild(c):
     """`build` with the delete switch"""
-    c.run('pelican -d -s {settings_base}'.format(**CONFIG))
+    pelican_run('-d -s {settings_base}'.format(**CONFIG))
 
 @task
 def regenerate(c):
     """Automatically regenerate site upon file modification"""
-    c.run('pelican -r -s {settings_base}'.format(**CONFIG))
+    pelican_run('-r -s {settings_base}'.format(**CONFIG))
 
 @task
 def serve(c):
@@ -90,7 +91,7 @@ def reserve(c):
 @task
 def preview(c):
     """Build production version of site"""
-    c.run('pelican -s {settings_publish}'.format(**CONFIG))
+    pelican_run('-s {settings_publish}'.format(**CONFIG))
 
 @task
 def livereload(c):
@@ -130,7 +131,7 @@ def cf_upload(c):
 @task
 def publish(c):
     """Publish to production via rsync"""
-    c.run('pelican -s {settings_publish}'.format(**CONFIG))
+    pelican_run('-s {settings_publish}'.format(**CONFIG))
     c.run(
         'rsync --delete --exclude ".DS_Store" -pthrvz -c '
         '-e "ssh -p {ssh_port}" '
@@ -147,3 +148,7 @@ def gh_pages(c):
           '-m {commit_message} '
           '{deploy_path} -p'.format(**CONFIG))
 {% endif %}
+
+def pelican_run(cmd):
+    cmd += ' ' + program.core.remainder  # allows to pass-through args to pelican
+    pelican_main(cmd.split(' '))

From ee80399be1583fff15af09fbc487130c020a62b5 Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Tue, 9 Jun 2020 18:12:24 +0200
Subject: [PATCH 2350/2864] Fixups post-review

---
 pelican/tools/templates/tasks.py.jinja2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 0f25953f..b65f01d2 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
+import shlex
 import shutil
 import sys
 import datetime
@@ -8,6 +9,7 @@ import datetime
 from invoke import task
 from invoke.main import program
 from invoke.util import cd
+from pelican import main as pelican_main
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import DEFAULT_CONFIG, get_settings_from_file
 
@@ -151,4 +153,4 @@ def gh_pages(c):
 
 def pelican_run(cmd):
     cmd += ' ' + program.core.remainder  # allows to pass-through args to pelican
-    pelican_main(cmd.split(' '))
+    pelican_main(shlex.split(cmd))

From d200c4363cf4c690754e63968f966f4cd3320860 Mon Sep 17 00:00:00 2001
From: magicbrothers <47381891+magicbrothers@users.noreply.github.com>
Date: Fri, 12 Jun 2020 11:24:42 +0000
Subject: [PATCH 2351/2864] Fix sentence in docs

---
 docs/content.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/content.rst b/docs/content.rst
index 28ef1cbd..48c851ab 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -88,7 +88,7 @@ contains a list of reserved metadata keywords:
 ``authors``     Content authors, when there are multiple
 ``summary``     Brief description of content for index pages
 ``lang``        Content language ID (``en``, ``fr``, etc.)
-``translation`` Is content is a translation of another (``true`` or ``false``)
+``translation`` If content is a translation of another (``true`` or ``false``)
 ``status``      Content status: ``draft``, ``hidden``, or ``published``
 ``template``    Name of template to use to generate content (without extension)
 ``save_as``     Save content to this relative file path

From f05a806164a4ac202b109eeaf01db95c79743026 Mon Sep 17 00:00:00 2001
From: shakram02 <ahmedhamdyau@gmail.com>
Date: Sat, 11 Jul 2020 17:39:30 +0200
Subject: [PATCH 2352/2864] fix usage of pelican_open in docs

---
 docs/internals.rst | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/docs/internals.rst b/docs/internals.rst
index 5b41070e..01d60c39 100644
--- a/docs/internals.rst
+++ b/docs/internals.rst
@@ -44,17 +44,22 @@ HTML content and some metadata.
 
 Take a look at the Markdown reader::
 
+    from pelican.readers import BaseReader
+    from pelican.utils import pelican_open
+    from markdown import Markdown
+
     class MarkdownReader(BaseReader):
-        enabled = bool(Markdown)
+        enabled = True
 
         def read(self, source_path):
             """Parse content and metadata of markdown files"""
-            text = pelican_open(source_path)
-            md_extensions = {'markdown.extensions.meta': {},
-                             'markdown.extensions.codehilite': {}}
-            md = Markdown(extensions=md_extensions.keys(),
-                          extension_configs=md_extensions)
-            content = md.convert(text)
+
+            with pelican_open(source_path) as text:
+                md_extensions = {'markdown.extensions.meta': {},
+                                 'markdown.extensions.codehilite': {}}
+                md = Markdown(extensions=md_extensions.keys(),
+                              extension_configs=md_extensions)
+                content = md.convert(text)
 
             metadata = {}
             for name, value in md.Meta.items():

From 6289452e9580a95fa2a4b87eec28ca8d7142e4d8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 29 Jul 2020 06:41:28 +0200
Subject: [PATCH 2353/2864] Document inability to control plugin execution
 order

---
 docs/plugins.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index a4ef91d6..3a56ed07 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -70,8 +70,8 @@ How to create plugins
 =====================
 
 Plugins are based on the concept of signals. Pelican sends signals, and plugins
-subscribe to those signals. The list of signals are defined in a subsequent
-section.
+subscribe to those signals. The list of available signals is documented in a
+subsequent section.
 
 The only rule to follow for plugins is to define a ``register`` callable, in
 which you map the signals to your plugin logic. Let's take a simple example::
@@ -94,6 +94,10 @@ which you map the signals to your plugin logic. Let's take a simple example::
     your ``register`` callable or they will be garbage-collected before the
     signal is emitted.
 
+If multiple plugins connect to the same signal, there is no way to guarantee or
+control in which order the plugins will be executed. This is a limitation
+inherited from Blinker_, the dependency Pelican uses to implement signals.
+
 Namespace plugin structure
 --------------------------
 
@@ -272,3 +276,4 @@ Adding a new generator is also really easy. You might want to have a look at
 
 .. _Pip: https://pip.pypa.io/
 .. _pelican-plugins bug #314: https://github.com/getpelican/pelican-plugins/issues/314
+.. _Blinker: https://pythonhosted.org/blinker/

From dc6fb57c418c7b60138ad5c8105cc7138ac8339d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 29 Jul 2020 09:38:14 +0200
Subject: [PATCH 2354/2864] Update & re-order dependencies in pyproject

---
 pyproject.toml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 20196d15..ccd1e34e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,35 +28,34 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.6"
+blinker = "^1.4"
+docutils = "^0.16"
 feedgenerator = "^1.9"
 jinja2 = "~2.11"
 pygments = "~2.6.1"
-pytz = "^2019.1"
-blinker = "^1.4"
-unidecode = "^1.1"
 python-dateutil = "^2.8"
-docutils = "^0.15"
-markdown = {version = "~3.1.1", optional = true}
+pytz = "^2020.1"
+unidecode = "^1.1"
+markdown = {version = "~3.2.2", optional = true}
 
 [tool.poetry.dev-dependencies]
-BeautifulSoup4 = "^4.7"
+BeautifulSoup4 = "^4.9"
 lxml = "^4.3"
-markdown = "~3.1.1"
+markdown = "~3.2.2"
 typogrify = "^2.0"
-sphinx = "=1.4.9"
-sphinx_rtd_theme = "^0.4.3"
+sphinx = "^3.0"
+sphinx_rtd_theme = "^0.5"
 livereload = "^2.6"
-mock = "^3.0"
-pytest = "~5.3.5"
+pytest = "^6.0"
 pytest-cov = "^2.8"
 pytest-pythonpath = "^0.7.3"
-pytest-sugar = "^0.9.2"
+pytest-sugar = "^0.9.4"
 pytest-xdist = "^1.31"
 tox = "^3.13"
-flake8 = "^3.7"
+flake8 = "^3.8"
 flake8-import-order = "^0.18.1"
 invoke = "^1.3"
-isort = "^4.3.21"
+isort = "^5.2"
 black = {version = "^19.10b0", allow-prereleases = true}
 
 [tool.poetry.extras]

From 18b626aa8b43f513067d6c9ed00711e5e046ebca Mon Sep 17 00:00:00 2001
From: "John T. Wodder II" <git@varonathe.org>
Date: Thu, 30 Jul 2020 14:39:46 -0400
Subject: [PATCH 2355/2864] Lowercase metadata field name when comparing with
 FORMATTED_FIELDS in rST reader

---
 pelican/readers.py                             |  2 +-
 .../article_with_capitalized_metadata.rst      | 16 ++++++++++++++++
 pelican/tests/test_generators.py               |  2 ++
 pelican/tests/test_readers.py                  | 18 ++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pelican/tests/content/article_with_capitalized_metadata.rst

diff --git a/pelican/readers.py b/pelican/readers.py
index 8c108510..15d09908 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -227,7 +227,7 @@ class RstReader(BaseReader):
                 if element.tagname == 'field':  # custom fields (e.g. summary)
                     name_elem, body_elem = element.children
                     name = name_elem.astext()
-                    if name in formatted_fields:
+                    if name.lower() in formatted_fields:
                         value = render_node_to_html(
                             document, body_elem,
                             self.field_body_translator_class)
diff --git a/pelican/tests/content/article_with_capitalized_metadata.rst b/pelican/tests/content/article_with_capitalized_metadata.rst
new file mode 100644
index 00000000..93ed5b15
--- /dev/null
+++ b/pelican/tests/content/article_with_capitalized_metadata.rst
@@ -0,0 +1,16 @@
+
+This is a super article !
+#########################
+
+:TAGS: foo, bar, foobar
+:DATE: 2010-12-02 10:14
+:MODIFIED: 2010-12-02 10:20
+:CATEGORY: yeah
+:AUTHOR: Alexis Métaireau
+:SUMMARY:
+    Multi-line metadata should be supported
+    as well as **inline markup** and stuff to "typogrify"...
+:CUSTOM_FIELD: http://notmyidea.org
+:CUSTOM_FORMATTED_FIELD:
+    Multi-line metadata should also be supported
+    as well as *inline markup* and stuff to "typogrify"...
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 332d7e78..169765ac 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -260,6 +260,7 @@ class TestArticlesGenerator(unittest.TestCase):
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
+            ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'Default', 'article'],
             ['Article with an inline SVG', 'published', 'Default', 'article'],
             ['This is an article with category !', 'published', 'yeah',
@@ -576,6 +577,7 @@ class TestArticlesGenerator(unittest.TestCase):
             'This is a super article !',
             'This is a super article !',
             'This is a super article !',
+            'This is a super article !',
             'This is an article with category !',
             ('This is an article with multiple authors in lastname, '
              'firstname format!'),
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index de2a1b22..ea5f3bdd 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -155,6 +155,24 @@ class RstReaderTest(ReaderTest):
 
         self.assertDictHasSubset(page.metadata, expected)
 
+    def test_article_with_capitalized_metadata(self):
+        page = self.read_file(path='article_with_capitalized_metadata.rst')
+        expected = {
+            'category': 'yeah',
+            'author': 'Alexis Métaireau',
+            'title': 'This is a super article !',
+            'summary': '<p class="first last">Multi-line metadata should be'
+                       ' supported\nas well as <strong>inline'
+                       ' markup</strong> and stuff to &quot;typogrify'
+                       '&quot;...</p>\n',
+            'date': SafeDatetime(2010, 12, 2, 10, 14),
+            'modified': SafeDatetime(2010, 12, 2, 10, 20),
+            'tags': ['foo', 'bar', 'foobar'],
+            'custom_field': 'http://notmyidea.org',
+        }
+
+        self.assertDictHasSubset(page.metadata, expected)
+
     def test_article_with_filename_metadata(self):
         page = self.read_file(
             path='2012-11-29_rst_w_filename_meta#foo-bar.rst',

From d2bbfd967e70351d014ab11ec3e8dc8dbcf58867 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 2 Aug 2020 10:58:32 +0200
Subject: [PATCH 2356/2864] Remove self-referential Template Pages link in docs

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 2b99072f..b6ace4bd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -770,7 +770,7 @@ Template pages
 .. data:: TEMPLATE_PAGES = None
 
    A mapping containing template pages that will be rendered with the blog
-   entries. See :ref:`template_pages`.
+   entries.
 
    If you want to generate custom pages besides your blog entries, you can
    point any Jinja2 template file with a path pointing to the file and the

From 18a2720ea73da4ccb05739a57864c3cb3f008973 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 11 Aug 2020 09:13:00 +0200
Subject: [PATCH 2357/2864] Adjust isort task: v5.2+ is now recursive by
 default

---
 tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks.py b/tasks.py
index 52bfe6a3..76c48834 100644
--- a/tasks.py
+++ b/tasks.py
@@ -64,7 +64,7 @@ def isort(c, check=False, diff=False):
     if diff:
         diff_flag = "--diff"
     c.run(
-        f"{VENV_BIN}/isort {check_flag} {diff_flag} --recursive {PKG_PATH}/* tasks.py"
+        f"{VENV_BIN}/isort {check_flag} {diff_flag} ."
     )
 
 

From f80bf187a9c2a7d3d41fd91ebcdd09a7b0d2dd13 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 11 Aug 2020 09:14:55 +0200
Subject: [PATCH 2358/2864] Update PyPI classifiers; add funding & tracker
 links

---
 pyproject.toml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index ccd1e34e..1b09716a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,14 +18,18 @@ classifiers = [
     "License :: OSI Approved :: GNU Affero General Public License v3",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 
+[tool.poetry.urls]
+"Funding" = "https://donate.getpelican.com/"
+"Tracker" = "https://github.com/getpelican/pelican/issues"
+
 [tool.poetry.dependencies]
 python = "^3.6"
 blinker = "^1.4"

From 40d09875e6d45f6609b19ea367d1fd70affa3332 Mon Sep 17 00:00:00 2001
From: Arnaud Rebillout <elboulangero@gmail.com>
Date: Tue, 11 Aug 2020 16:23:35 +0700
Subject: [PATCH 2359/2864] Makefile, include tags directory in rsync command

By default, the rsync option '--cvs-exclude' excludes the 'tags'
directory. For a blog, it's a bit unfortunate, as it's quite common to
have a `tags` directory in a blog, either for the tag pages or the tag
feeds.

With this commit, we force rsync to include this directory, and save a
little headache to users who wonder why their tags are present in the
output directory, but are not present on the server.
---
 pelican/tools/templates/Makefile.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 0184cc88..94f68e27 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -139,7 +139,7 @@ ssh_upload: publish
 
 {% set upload = upload + ["rsync_upload"] %}
 rsync_upload: publish
-	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --cvs-exclude --delete "$(OUTPUTDIR)"/ "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)"
+	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --include tags --cvs-exclude --delete "$(OUTPUTDIR)"/ "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)"
 
 {% endif %}
 {% if dropbox %}

From 1c50a18d0a45d76f6b50647536faf25954740d20 Mon Sep 17 00:00:00 2001
From: Peter Sabaini <peter.sabaini@canonical.com>
Date: Sat, 9 May 2020 18:15:16 +0200
Subject: [PATCH 2360/2864] Override settings from the command line

Add a --setting-overrides KEY=VAL command line option to override
default settings or those defined in settings files. This adds
flexibility in running Pelican and helps reduce sprawl of settings
files. Cast int and str setting overrides to their respective types.
Support other setting types by treating them as JSON. Fall back to JSON
when an override typecast errors. This should make it possible to set
int values to None, resp. to JSON 'none'
---
 pelican/__init__.py            | 27 ++++++++++++++++++++++++++-
 pelican/settings.py            | 21 +++++++++++++++++++++
 pelican/tests/test_settings.py | 19 +++++++++++++++++--
 3 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 6469c607..9204d952 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -23,7 +23,7 @@ from pelican.plugins import signals
 from pelican.plugins._utils import load_plugins
 from pelican.readers import Readers
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
-from pelican.settings import read_settings
+from pelican.settings import coerce_overrides, read_settings
 from pelican.utils import (FileSystemWatcher, clean_output_dir, maybe_pluralize)
 from pelican.writers import Writer
 
@@ -230,6 +230,18 @@ class PrintSettings(argparse.Action):
         parser.exit()
 
 
+class ParseDict(argparse.Action):
+    def __call__(self, parser, namespace, values, option_string=None):
+        d = {}
+        if values:
+            for item in values:
+                split_items = item.split("=", 1)
+                key = split_items[0].strip()
+                value = split_items[1].strip()
+                d[key] = value
+        setattr(namespace, self.dest, d)
+
+
 def parse_arguments(argv=None):
     parser = argparse.ArgumentParser(
         description='A tool to generate a static blog, '
@@ -323,6 +335,18 @@ def parse_arguments(argv=None):
                         help='IP to bind to when serving files via HTTP '
                         '(default: 127.0.0.1)')
 
+    parser.add_argument('-c', '--setting-overrides', dest='overrides',
+                        help='Specify one ore more SETTING=VALUE pairs '
+                             '(without spaces around =) to override '
+                             'settings files. If VALUE contains spaces, add quotes: '
+                             'SETTING="VALUE". '
+                             'Integers and strings are autoconverted, other values '
+                        'can be passed in in json notation, '
+                             'e.g. SETTING=none',
+                        nargs='*',
+                        action=ParseDict
+                        )
+
     args = parser.parse_args(argv)
 
     if args.port is not None and not args.listen:
@@ -358,6 +382,7 @@ def get_config(args):
     if args.bind is not None:
         config['BIND'] = args.bind
     config['DEBUG'] = args.verbosity == logging.DEBUG
+    config.update(coerce_overrides(args.overrides))
 
     return config
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 7b333de8..40804e0b 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,6 +1,7 @@
 import copy
 import importlib.util
 import inspect
+import json
 import locale
 import logging
 import os
@@ -658,3 +659,23 @@ def configure_settings(settings):
             continue            # setting not specified, nothing to do
 
     return settings
+
+
+def coerce_overrides(overrides):
+    coerced = {}
+    types_to_cast = {int, str}
+    for k, v in overrides.items():
+        if k not in overrides:
+            logger.warning('Override for unknown setting %s, ignoring', k)
+            continue
+        setting_type = type(DEFAULT_CONFIG[k])
+        if setting_type not in types_to_cast:
+            coerced[k] = json.loads(v)
+        else:
+            try:
+                coerced[k] = setting_type(v)
+            except ValueError:
+                logger.debug('ValueError for %s override with %s, try to '
+                             'load as json', k, v)
+                coerced[k] = json.loads(v)
+    return coerced
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 708c0981..83203ae5 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -7,8 +7,8 @@ from sys import platform
 
 from pelican.settings import (DEFAULT_CONFIG, DEFAULT_THEME,
                               _printf_s_to_format_field,
-                              configure_settings, handle_deprecated_settings,
-                              read_settings)
+                              coerce_overrides, configure_settings,
+                              handle_deprecated_settings, read_settings)
 from pelican.tests.support import unittest
 
 
@@ -304,3 +304,18 @@ class TestSettingsConfiguration(unittest.TestCase):
                          [(r'C\+\+', 'cpp')] +
                          self.settings['SLUG_REGEX_SUBSTITUTIONS'])
         self.assertNotIn('SLUG_SUBSTITUTIONS', settings)
+
+    def test_coerce_overrides(self):
+        overrides = coerce_overrides({
+            'ARTICLE_EXCLUDES': '["testexcl"]',
+            'READERS': '{"foo": "bar"}',
+            'STATIC_EXCLUDE_SOURCES': 'true',
+            'THEME_STATIC_DIR': 'theme',
+            })
+        expected = {
+            'ARTICLE_EXCLUDES': ["testexcl"],
+            'READERS': {"foo": "bar"},
+            'STATIC_EXCLUDE_SOURCES': True,
+            'THEME_STATIC_DIR': 'theme',
+        }
+        self.assertDictEqual(overrides, expected)

From d728cd2696ecaef0f1070faf3c12ce1fd2819c6f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 11 Aug 2020 12:48:15 +0200
Subject: [PATCH 2361/2864] Rename CLI flag syntax for settings override
 feature

---
 pelican/__init__.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 9204d952..82366117 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -335,14 +335,12 @@ def parse_arguments(argv=None):
                         help='IP to bind to when serving files via HTTP '
                         '(default: 127.0.0.1)')
 
-    parser.add_argument('-c', '--setting-overrides', dest='overrides',
-                        help='Specify one ore more SETTING=VALUE pairs '
-                             '(without spaces around =) to override '
-                             'settings files. If VALUE contains spaces, add quotes: '
-                             'SETTING="VALUE". '
-                             'Integers and strings are autoconverted, other values '
-                        'can be passed in in json notation, '
-                             'e.g. SETTING=none',
+    parser.add_argument('-e', '--extra-settings', dest='overrides',
+                        help='Specify one or more SETTING=VALUE pairs to '
+                             'override settings. If VALUE contains spaces, '
+                             'add quotes: SETTING="VALUE". Values other than '
+                             'integers and strings can be specified via JSON '
+                             'notation. (e.g., SETTING=none)',
                         nargs='*',
                         action=ParseDict
                         )

From 04c0ea53e6bc79a1447e1ead246037103f39aca9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 11 Aug 2020 12:50:08 +0200
Subject: [PATCH 2362/2864] Document -e / --extra-settings option flags

---
 docs/settings.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index b6ace4bd..cc67815b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -9,6 +9,12 @@ line::
 If you used the ``pelican-quickstart`` command, your primary settings file will
 be named ``pelicanconf.py`` by default.
 
+You can also specify extra settings via ``-e`` / ``--extra-settings`` option
+flags, which will override default settings as well as any defined within
+settings files::
+
+    pelican content -e DELETE_OUTPUT_DIRECTORY=True
+
 .. note::
 
    When experimenting with different settings (especially the metadata ones)

From 45c5cb9029bc2d475ae7440ee1fed3065e353811 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 13 Aug 2020 12:07:58 +0200
Subject: [PATCH 2363/2864] Fix error in --extra-settings feature. Refs #2789

---
 docs/settings.rst   | 2 +-
 pelican/settings.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index cc67815b..fbd6169c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -13,7 +13,7 @@ You can also specify extra settings via ``-e`` / ``--extra-settings`` option
 flags, which will override default settings as well as any defined within
 settings files::
 
-    pelican content -e DELETE_OUTPUT_DIRECTORY=True
+    pelican content -e DELETE_OUTPUT_DIRECTORY=true
 
 .. note::
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 40804e0b..1554c1f1 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -662,10 +662,12 @@ def configure_settings(settings):
 
 
 def coerce_overrides(overrides):
+    if overrides is None:
+        return {}
     coerced = {}
     types_to_cast = {int, str}
     for k, v in overrides.items():
-        if k not in overrides:
+        if k not in DEFAULT_CONFIG:
             logger.warning('Override for unknown setting %s, ignoring', k)
             continue
         setting_type = type(DEFAULT_CONFIG[k])

From b769144a6380e7fd49ec4aa6bcdf66620e4b9eba Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 15 Aug 2020 08:36:56 +0200
Subject: [PATCH 2364/2864] Support Booleans in --extra-settings. Refs #2789

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 1554c1f1..11bbafbd 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -665,7 +665,7 @@ def coerce_overrides(overrides):
     if overrides is None:
         return {}
     coerced = {}
-    types_to_cast = {int, str}
+    types_to_cast = {int, str, bool}
     for k, v in overrides.items():
         if k not in DEFAULT_CONFIG:
             logger.warning('Override for unknown setting %s, ignoring', k)

From adbefe836355305c69818f8abb59decf0adf9cf9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Aug 2020 07:19:47 +0200
Subject: [PATCH 2365/2864] Upgrade pytest-xdist dev dependency to v2.0

Also, stop pinning pytest version, since older version combined with
pytest-xdist 2.0 caused CI test errors.
---
 pyproject.toml        | 2 +-
 requirements/test.pip | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 1b09716a..4456c913 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ pytest = "^6.0"
 pytest-cov = "^2.8"
 pytest-pythonpath = "^0.7.3"
 pytest-sugar = "^0.9.4"
-pytest-xdist = "^1.31"
+pytest-xdist = "^2.0"
 tox = "^3.13"
 flake8 = "^3.8"
 flake8-import-order = "^0.18.1"
diff --git a/requirements/test.pip b/requirements/test.pip
index 973b27ca..647a8694 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,6 +1,6 @@
 # Tests
 Pygments==2.6.1
-pytest==5.3.5
+pytest
 pytest-cov
 pytest-xdist
 

From 64bb392fefef1ad895626c6d4dc989fe73173766 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Aug 2020 07:23:13 +0200
Subject: [PATCH 2366/2864] Auto-detect physical CPU cores via pytest-xdist

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 18b0e7a4..69281e30 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ commands =
 filterwarnings =
     default::DeprecationWarning
     error:.*:Warning:pelican
-addopts = -n 2 -r a
+addopts = -n auto -r a
 
 [flake8]
 application-import-names = pelican

From 863421b1b8fbd352dbf34d1b66d9dfd0494c5fd2 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 17 Aug 2020 06:45:38 +0200
Subject: [PATCH 2367/2864] Use more reliable installation command in docs

Some shell environments may interpret brackets as glob patterns.
Wrapping the argument in quotation marks should help ensure correct
behavior in those environments. Refs #2786
---
 docs/install.rst    | 4 ++--
 docs/quickstart.rst | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/install.rst b/docs/install.rst
index 03480e79..bf2647ad 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -11,7 +11,7 @@ You can install Pelican via several different methods. The simplest is via
 
 Or, if you plan on using Markdown::
 
-    pip install pelican[Markdown]
+    pip install "pelican[markdown]"
 
 (Keep in mind that operating systems will often require you to prefix the above
 command with ``sudo`` in order to install Pelican system-wide.)
@@ -46,7 +46,7 @@ Optional packages
 If you plan on using `Markdown <https://pypi.org/project/Markdown/>`_ as a
 markup format, you can install Pelican with Markdown support::
 
-   pip install pelican[Markdown]
+    pip install "pelican[markdown]"
 
 Or you might need to install it a posteriori::
 
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 1f6358a7..8d6d6a5b 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -11,7 +11,7 @@ Install Pelican (and optionally Markdown if you intend to use it) on Python
 2.7.x or Python 3.5+ by running the following command in your preferred
 terminal, prefixing with ``sudo`` if permissions warrant::
 
-    pip install pelican[Markdown]
+    pip install "pelican[markdown]"
 
 Create a project
 ----------------

From 16975bc3a259b77b03673cf9cface69c77ff50f9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 17 Aug 2020 07:04:00 +0200
Subject: [PATCH 2368/2864] Prefix Pip commands with `python -m` in docs

This ensures Pip commands will be executed for the current Python
interpreter and not, say, whichever Python interpreter happens to be
associated with `/usr/local/bin/pip`.
---
 CONTRIBUTING.rst    |  2 +-
 docs/contribute.rst |  4 ++--
 docs/faq.rst        |  2 +-
 docs/install.rst    | 16 ++++++++--------
 docs/publish.rst    |  4 ++--
 docs/quickstart.rst |  2 +-
 docs/settings.rst   |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 9561b04f..61935f62 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -43,7 +43,7 @@ publicly-accessible location:
 
 * Describe what version of Pelican you are running (output of ``pelican --version``
   or the HEAD commit hash if you cloned the repo) and how exactly you installed
-  it (the full command you used, e.g. ``pip install pelican``).
+  it (the full command you used, e.g. ``python -m pip install pelican``).
 * If you are looking for a way to get some end result, prepare a detailed
   description of what the end result should look like (preferably in the form of
   an image or a mock-up page) and explain in detail what you have done so far to
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 66890ae7..62ed51f9 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -44,9 +44,9 @@ to manually create and activate a virtual environment::
 
 Install the needed dependencies and set up the project::
 
-    pip install invoke
+    python -m pip install invoke
     invoke setup
-    pip install -e ~/projects/pelican
+    python -m pip install -e ~/projects/pelican
 
 Your local environment should now be ready to go!
 
diff --git a/docs/faq.rst b/docs/faq.rst
index c35cd6c6..8532ab3f 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -74,7 +74,7 @@ Markdown format, you will need to explicitly install the Markdown library. You
 can do so by typing the following command, prepending ``sudo`` if permissions
 require it::
 
-    pip install markdown
+    python -m pip install markdown
 
 Can I use arbitrary metadata in my templates?
 =============================================
diff --git a/docs/install.rst b/docs/install.rst
index bf2647ad..69bb3e3a 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -7,11 +7,11 @@ Python are not supported.
 You can install Pelican via several different methods. The simplest is via
 `pip <https://pip.pypa.io/en/stable/>`_::
 
-    pip install pelican
+    python -m pip install pelican
 
 Or, if you plan on using Markdown::
 
-    pip install "pelican[markdown]"
+    python -m pip install "pelican[markdown]"
 
 (Keep in mind that operating systems will often require you to prefix the above
 command with ``sudo`` in order to install Pelican system-wide.)
@@ -26,7 +26,7 @@ session and create a new virtual environment for Pelican::
     source bin/activate
 
 Once the virtual environment has been created and activated, Pelican can be
-installed via ``pip install pelican`` as noted above. Alternatively, if you
+installed via ``python -m pip install pelican`` as noted above. Alternatively, if you
 have the project source, you can install Pelican using the distutils method::
 
     cd path-to-Pelican-source
@@ -35,7 +35,7 @@ have the project source, you can install Pelican using the distutils method::
 If you have Git installed and prefer to install the latest bleeding-edge
 version of Pelican rather than a stable release, use the following command::
 
-    pip install -e "git+https://github.com/getpelican/pelican.git#egg=pelican"
+    python -m pip install -e "git+https://github.com/getpelican/pelican.git#egg=pelican"
 
 Once Pelican is installed, you can run ``pelican --help`` to see basic usage
 options. For more detail, refer to the :doc:`Publish<publish>` section.
@@ -46,17 +46,17 @@ Optional packages
 If you plan on using `Markdown <https://pypi.org/project/Markdown/>`_ as a
 markup format, you can install Pelican with Markdown support::
 
-    pip install "pelican[markdown]"
+    python -m pip install "pelican[markdown]"
 
 Or you might need to install it a posteriori::
 
-    pip install Markdown
+    python -m pip install Markdown
 
 Typographical enhancements can be enabled in your settings file, but first the
 requisite `Typogrify <https://pypi.org/project/typogrify/>`_ library must be
 installed::
 
-    pip install typogrify
+    python -m pip install typogrify
 
 Dependencies
 ------------
@@ -88,7 +88,7 @@ Upgrading
 If you installed a stable Pelican release via ``pip`` and wish to upgrade to
 the latest stable release, you can do so by adding ``--upgrade``::
 
-    pip install --upgrade pelican
+    python -m pip install --upgrade pelican
 
 If you installed Pelican via distutils or the bleeding-edge method, simply
 perform the same step to install the most recent version.
diff --git a/docs/publish.rst b/docs/publish.rst
index 9bea8938..ae1428f5 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -118,7 +118,7 @@ in a wide range of environments. The downside is that it must be installed
 separately. Use the following command to install Invoke, prefixing with
 ``sudo`` if your environment requires it::
 
-    pip install invoke
+    python -m pip install invoke
 
 Take a moment to open the ``tasks.py`` file that was generated in your project
 root. You will see a number of commands, any one of which can be renamed,
@@ -139,7 +139,7 @@ http://localhost:8000/::
     invoke serve
 
 To serve the generated site with automatic browser reloading every time a
-change is detected, first ``pip install livereload``, then use the
+change is detected, first ``python -m pip install livereload``, then use the
 following command::
 
     invoke livereload
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 8d6d6a5b..a8387a54 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -11,7 +11,7 @@ Install Pelican (and optionally Markdown if you intend to use it) on Python
 2.7.x or Python 3.5+ by running the following command in your preferred
 terminal, prefixing with ``sudo`` if permissions warrant::
 
-    pip install "pelican[markdown]"
+    python -m pip install "pelican[markdown]"
 
 Create a project
 ----------------
diff --git a/docs/settings.rst b/docs/settings.rst
index fbd6169c..e05d7abf 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -277,7 +277,7 @@ Basic settings
    If set to True, several typographical improvements will be incorporated into
    the generated HTML via the `Typogrify
    <https://pypi.python.org/pypi/typogrify>`_ library, which can be installed
-   via: ``pip install typogrify``
+   via: ``python -m pip install typogrify``
 
 .. data:: TYPOGRIFY_IGNORE_TAGS = []
 

From a0335711afdb3354ca887673729992d9048139e6 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 17 Aug 2020 07:14:29 +0200
Subject: [PATCH 2369/2864] Remove outdated references to Python 2.7 in docs

---
 docs/install.rst    | 4 +---
 docs/quickstart.rst | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/install.rst b/docs/install.rst
index 69bb3e3a..b0a851c5 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -1,8 +1,7 @@
 Installing Pelican
 ##################
 
-Pelican currently runs best on Python 2.7.x and 3.5+; earlier versions of
-Python are not supported.
+Pelican currently runs best on 3.6+; earlier versions of Python are not supported.
 
 You can install Pelican via several different methods. The simplest is via
 `pip <https://pip.pypa.io/en/stable/>`_::
@@ -75,7 +74,6 @@ automatically installed without any action on your part:
   broadcast signaling system
 * `unidecode <https://pypi.org/project/Unidecode/>`_, for ASCII
   transliterations of Unicode text
-* `six <https://pypi.org/project/six/>`_,  for Python 2 and 3 compatibility
   utilities
 * `MarkupSafe <https://pypi.org/project/MarkupSafe/>`_, for a markup safe
   string implementation
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index a8387a54..ddc42651 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -8,8 +8,8 @@ Installation
 ------------
 
 Install Pelican (and optionally Markdown if you intend to use it) on Python
-2.7.x or Python 3.5+ by running the following command in your preferred
-terminal, prefixing with ``sudo`` if permissions warrant::
+3.6+ by running the following command in your preferred terminal, prefixing
+with ``sudo`` if permissions warrant::
 
     python -m pip install "pelican[markdown]"
 

From 145cd4be92c60cf1ae2eabc17c00f37660bdc7e1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 17 Aug 2020 07:21:57 +0200
Subject: [PATCH 2370/2864] Minor improvements to installation docs

---
 docs/install.rst | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/docs/install.rst b/docs/install.rst
index b0a851c5..eb618035 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -3,8 +3,7 @@ Installing Pelican
 
 Pelican currently runs best on 3.6+; earlier versions of Python are not supported.
 
-You can install Pelican via several different methods. The simplest is via
-`pip <https://pip.pypa.io/en/stable/>`_::
+You can install Pelican via several different methods. The simplest is via Pip_::
 
     python -m pip install pelican
 
@@ -12,7 +11,7 @@ Or, if you plan on using Markdown::
 
     python -m pip install "pelican[markdown]"
 
-(Keep in mind that operating systems will often require you to prefix the above
+(Keep in mind that some operating systems will require you to prefix the above
 command with ``sudo`` in order to install Pelican system-wide.)
 
 While the above is the simplest method, the recommended approach is to create a
@@ -47,10 +46,6 @@ markup format, you can install Pelican with Markdown support::
 
     python -m pip install "pelican[markdown]"
 
-Or you might need to install it a posteriori::
-
-    python -m pip install Markdown
-
 Typographical enhancements can be enabled in your settings file, but first the
 requisite `Typogrify <https://pypi.org/project/typogrify/>`_ library must be
 installed::
@@ -75,7 +70,7 @@ automatically installed without any action on your part:
 * `unidecode <https://pypi.org/project/Unidecode/>`_, for ASCII
   transliterations of Unicode text
   utilities
-* `MarkupSafe <https://pypi.org/project/MarkupSafe/>`_, for a markup safe
+* `MarkupSafe <https://pypi.org/project/MarkupSafe/>`_, for a markup-safe
   string implementation
 * `python-dateutil <https://pypi.org/project/python-dateutil/>`_, to read
   the date metadata
@@ -83,7 +78,7 @@ automatically installed without any action on your part:
 Upgrading
 ---------
 
-If you installed a stable Pelican release via ``pip`` and wish to upgrade to
+If you installed a stable Pelican release via Pip_ and wish to upgrade to
 the latest stable release, you can do so by adding ``--upgrade``::
 
     python -m pip install --upgrade pelican
@@ -124,4 +119,5 @@ content)::
 The next step is to begin to adding content to the *content* folder that has
 been created for you.
 
+.. _Pip: https://pip.pypa.io/
 .. _virtualenv: https://virtualenv.pypa.io/en/latest/

From ade70cb2e2622da5b136d6a01e04483805fc5dee Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 17 Aug 2020 09:47:57 +0200
Subject: [PATCH 2371/2864] Rename branch for GitHub Pages repo quickstart

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 1a98ab14..41ddea3c 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -41,7 +41,7 @@ _jinja_env = Environment(
 
 
 _GITHUB_PAGES_BRANCHES = {
-    'personal': 'master',
+    'personal': 'main',
     'project': 'gh-pages'
 }
 

From 64fcdb51723609550a7e28cb9529f23860ffdb32 Mon Sep 17 00:00:00 2001
From: kernc <kerncece@gmail.com>
Date: Wed, 19 Aug 2020 20:25:19 +0200
Subject: [PATCH 2372/2864] =?UTF-8?q?Rename=20setting=20SUMMARY=5FEND=5FMA?=
 =?UTF-8?q?RKER=20=E2=86=92=20SUMMARY=5FEND=5FSUFFIX=20(#2792)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Avoids clash with 'summary' plugin.

Refs: https://github.com/getpelican/pelican-plugins/pull/1284#issuecomment-660715086
---
 docs/settings.rst              | 4 ++--
 pelican/contents.py            | 2 +-
 pelican/settings.py            | 2 +-
 pelican/tests/test_contents.py | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e05d7abf..377051b0 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -303,10 +303,10 @@ Basic settings
    does not otherwise specify a summary. Setting to ``None`` will cause the
    summary to be a copy of the original content.
 
-.. data:: SUMMARY_END_MARKER = '…'
+.. data:: SUMMARY_END_SUFFIX = '…'
 
    When creating a short summary of an article and the result was truncated to
-   match the required word length, this will be used as the truncation marker.
+   match the required word length, this will be used as the truncation suffix.
 
 .. data:: WITH_FUTURE_DATES = True
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 2bb2e3a0..6470ee45 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -392,7 +392,7 @@ class Content:
 
         return truncate_html_words(self.content,
                                    self.settings['SUMMARY_MAX_LENGTH'],
-                                   self.settings['SUMMARY_END_MARKER'])
+                                   self.settings['SUMMARY_END_SUFFIX'])
 
     @property
     def summary(self):
diff --git a/pelican/settings.py b/pelican/settings.py
index 11bbafbd..ea3ee8eb 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -136,7 +136,7 @@ DEFAULT_CONFIG = {
     'TYPOGRIFY': False,
     'TYPOGRIFY_IGNORE_TAGS': [],
     'TYPOGRIFY_DASHES': 'default',
-    'SUMMARY_END_MARKER': '…',
+    'SUMMARY_END_SUFFIX': '…',
     'SUMMARY_MAX_LENGTH': 50,
     'PLUGIN_PATHS': [],
     'PLUGINS': None,
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 93f5b212..1a520bc7 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -110,14 +110,14 @@ class TestPage(TestBase):
         page = Page(**page_kwargs)
         self.assertEqual(page.summary, '')
 
-    def test_summary_end_marker(self):
-        # If a :SUMMARY_END_MARKER: is set, and there is no other summary,
+    def test_summary_end_suffix(self):
+        # If a :SUMMARY_END_SUFFIX: is set, and there is no other summary,
         # generated summary should contain the specified marker at the end.
         page_kwargs = self._copy_page_kwargs()
         settings = get_settings()
         page_kwargs['settings'] = settings
         del page_kwargs['metadata']['summary']
-        settings['SUMMARY_END_MARKER'] = 'test_marker'
+        settings['SUMMARY_END_SUFFIX'] = 'test_marker'
         settings['SUMMARY_MAX_LENGTH'] = 10
         page = Page(**page_kwargs)
         self.assertEqual(page.summary, truncate_html_words(TEST_CONTENT, 10,

From fafe0207ca69ab3bce5a6a8cf6d39200ce9cbc7d Mon Sep 17 00:00:00 2001
From: "Jason K. Moore" <moorepants@gmail.com>
Date: Sun, 13 Oct 2019 11:58:41 -0700
Subject: [PATCH 2373/2864] Include the tests package in the source
 distribution

Fixes #2635
---
 setup.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/setup.py b/setup.py
index 2d831aa4..af96c726 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from os import walk
 from os.path import join, relpath
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 version = "4.2.0"
@@ -44,19 +44,14 @@ setup(
     keywords='static web site generator SSG reStructuredText Markdown',
     license='AGPLv3',
     long_description=description,
-    packages=['pelican', 'pelican.tools', 'pelican.plugins'],
-    package_data={
-        # we manually collect the package data, as opposed to using,
-        # include_package_data=True because we don't want the tests to be
-        # included automatically as package data (MANIFEST.in is too greedy)
+    packages=find_packages(),
+    include_package_data=True,  # includes all in MANIFEST.in if in package
+    # NOTE : This will collect any files that happen to be in the themes
+    # directory, even though they may not be checked into version control.
+    package_data={  # pelican/themes is not a package, so include manually
         'pelican': [relpath(join(root, name), 'pelican')
                     for root, _, names in walk(join('pelican', 'themes'))
                     for name in names],
-        'pelican.tools': [relpath(join(root, name), join('pelican', 'tools'))
-                          for root, _, names in walk(join('pelican',
-                                                          'tools',
-                                                          'templates'))
-                          for name in names],
     },
     install_requires=requires,
     extras_require={

From 94bdcb7f185e14b9ef946ff5cc49b800e9aaad70 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 20 Aug 2020 13:46:09 +0200
Subject: [PATCH 2374/2864] Remove Travis since we've switched to GitHub
 Actions CI

---
 .travis.yml | 53 -----------------------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c0637a7f..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-language: python
-python:
-  - "3.6"
-env:
-  global:
-    - PYPI_USERNAME=autopub
-    - secure: "h5V/+YL+CrqvfAesNkSb824Ngk5x+f0eFzj/LBbmnzjvArKAmc6R6WGyx8SDD7WF/PlaTf0M1fH3a7pjIS8Ee+TS1Rb0Lt1HPqUs1yntg1+Js2ZQp3p20wfsDc+bZ4/2g8xLsSMv1EJ4np7/GJ5fXqpSxjr/Xs5LYA7ZLwNNwDw="
-    - secure: "GiDFfmjH7uzYNnkjQMV/mIkbRdmgkGmtbFPeaj9taBNA5tPp3IBt3GOOS6UL/zm9xiwu9Xo6sxZWkGzY19Hsdv28YPH34N3abo0QSnz4IGiHs152Hi7Qi6Tb0QkT5D3OxuSIm8LmFL7+su89Q7vBFowrT6HL1Mn8CDDWSj3eqbo="
-    - TWINE_USERNAME=$PYPI_USERNAME
-    - TWINE_PASSWORD=$PYPI_PASSWORD
-  matrix:
-    - TOX_ENV=docs
-    - TOX_ENV=flake8
-    - TOX_ENV=py3.5
-    - TOX_ENV=py3.6
-matrix:
-  include:
-    - python: 3.7
-      sudo: true
-      dist: xenial
-      env:
-      - TOX_ENV=py3.7
-addons:
-  apt_packages:
-    - pandoc
-before_install:
-  - sudo apt-get update -qq
-  - sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
-install:
-  - pip install tox==2.5.0
-script: tox -e $TOX_ENV
-before_deploy:
-  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then travis_terminate 0; fi'
-  - pip install githubrelease
-  - pip install --pre autopub
-  - autopub check || travis_terminate 0
-  - pip install poetry
-  - pip install twine
-  - git checkout ${TRAVIS_BRANCH}
-  - git remote set-url origin https://$GITHUB_TOKEN@github.com/$TRAVIS_REPO_SLUG
-deploy:
-  provider: script
-  script: autopub deploy
-  skip_cleanup: true
-  on:
-    branch: master
-    python: "3.7"
-# The channel name "irc.freenode.org#pelican" is encrypted against getpelican/pelican to prevent IRC spam of forks
-notifications:
-  irc:
-    channels:
-      - secure: "JP57f61QovrhmLoAF6oPOzIK2aXGfSO06FHg7yiuKBOWMiaxQejZUGJX919muCLhWJXDugsviIqCMoAWwNV3o1WQbqIr+G5TR+N9MrtCs4Zi6vpGj09bR8giKUKx+PPKEoe1Ew56E4y2LxzGO4Lj9hZx8M2YVdwPNWrWZgp6WXE="
-    on_success: change

From e11a7de051e3a8bb0158ba462bc8e69322047bf0 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 20 Aug 2020 13:51:23 +0200
Subject: [PATCH 2375/2864] Add missing Pelican entry points to pyproject.toml

---
 pyproject.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 4456c913..ce86ef72 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -67,6 +67,10 @@ markdown = ["markdown"]
 
 [tool.poetry.scripts]
 pelican = "pelican.__main__:main"
+pelican-import = "pelican.tools.pelican_import:main"
+pelican-plugins = "pelican.plugins._utils:list_plugins"
+pelican-quickstart = "pelican.tools.pelican_quickstart:main"
+pelican-themes = "pelican.tools.pelican_themes:main"
 
 [tool.autopub]
 project-name = "Pelican"

From 4bda2745ac2d654efd436d20e31895f3d7705036 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 20 Aug 2020 17:57:21 +0200
Subject: [PATCH 2376/2864] Prepare to release Pelican 4.5

---
 docs/changelog.rst | 22 +++++++++++++++++++---
 pyproject.toml     |  2 +-
 setup.py           |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index febc5322..019eb55e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,22 @@
 Release history
 ###############
 
+4.5.0 - 2020-08-20
+==================
+
+* Add namespace plugin support; list plugins via ``pelican-plugins`` command
+* Override settings via ``-e`` / ``--extra-settings`` CLI option flags
+* Add settings for custom Jinja globals and tests
+* Customize article summary ellipsis via ``SUMMARY_END_MARKER`` setting
+* Customize Typogrify dash handling via new ``TYPOGRIFY_DASHES`` setting
+* Support Unicode when generating slugs
+* Support Asciidoc ``.adoc`` file generation in Pelican importer
+* Improve user experience when ``pelican --listen`` web server is quit
+* Improve Invoke tasks template
+* Include tests in source distributions
+* Switch CI from Travis to GitHub Actions
+* Remove support for Python 2.7
+
 4.2.0 - 2019-10-17
 ==================
 
@@ -12,7 +28,7 @@ Release history
 4.1.3 - 2019-10-09
 ==================
 
-* Fix quick-start docs regarding `pelican --listen`
+* Fix quick-start docs regarding ``pelican --listen``
 * Set default listen address to 127.0.0.1
 * Add extra/optional Markdown dependency to setup.py
 * Use correct SSH port syntax for rsync in tasks.py
@@ -30,8 +46,8 @@ Fix pelican.settings.load_source to avoid caching issues - PR #2621
 
 * Add AutoPub to auto-publish releases on PR merge
 * Add CSS classes for reStructuredText figures
-* Pass `argv` to Pelican `main` entrypoint
-* Set default content status to a blank string rather than `None`
+* Pass ``argv`` to Pelican ``main`` entrypoint
+* Set default content status to a blank string rather than ``None``
 
 4.1.0 - 2019-07-14
 ==================
diff --git a/pyproject.toml b/pyproject.toml
index ce86ef72..ba0573fb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.2.0"
+version = "4.5.0"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index af96c726..e5aa7141 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from os.path import join, relpath
 from setuptools import setup, find_packages
 
 
-version = "4.2.0"
+version = "4.5.0"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.11', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',

From 0ab6ac97983952c00b7b7e8b8de3c1e0cd22127f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 20 Aug 2020 19:20:51 +0200
Subject: [PATCH 2377/2864] Fix PyPI-related reST/README issues

---
 README.rst | 2 +-
 setup.py   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index dee92234..f0685483 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
 Pelican |build-status| |pypi-version| |repology|
-=====================================
+================================================
 
 Pelican is a static site generator, written in Python_.
 
diff --git a/setup.py b/setup.py
index e5aa7141..00aff78b 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from os import walk
 from os.path import join, relpath
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 
 version = "4.5.0"
@@ -44,6 +44,7 @@ setup(
     keywords='static web site generator SSG reStructuredText Markdown',
     license='AGPLv3',
     long_description=description,
+    long_description_content_type='text/x-rst',
     packages=find_packages(),
     include_package_data=True,  # includes all in MANIFEST.in if in package
     # NOTE : This will collect any files that happen to be in the themes
@@ -68,6 +69,7 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: CPython',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries :: Python Modules',

From 3565094b10b74217f0b78d9c1f2f06f2c1cf61ea Mon Sep 17 00:00:00 2001
From: Jiachen Yang <farseerfc@gmail.com>
Date: Mon, 24 Aug 2020 22:34:02 +0900
Subject: [PATCH 2378/2864] MANIFEST.in include jinja2 templates

---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 138c8f00..469f6fff 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include *.rst
-recursive-include pelican *.html *.css *png *.rst *.markdown *.md *.mkd *.xml *.py
+recursive-include pelican *.html *.css *png *.rst *.markdown *.md *.mkd *.xml *.py *.jinja2
 include LICENSE THANKS docs/changelog.rst pyproject.toml

From 7a6686f4679adabdd690668a4ba7cedaf494e243 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 29 Aug 2020 12:46:44 +0200
Subject: [PATCH 2379/2864] Fix SUMMARY_END_SUFFIX variable name in changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 019eb55e..8287f8d6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,7 +7,7 @@ Release history
 * Add namespace plugin support; list plugins via ``pelican-plugins`` command
 * Override settings via ``-e`` / ``--extra-settings`` CLI option flags
 * Add settings for custom Jinja globals and tests
-* Customize article summary ellipsis via ``SUMMARY_END_MARKER`` setting
+* Customize article summary ellipsis via ``SUMMARY_END_SUFFIX`` setting
 * Customize Typogrify dash handling via new ``TYPOGRIFY_DASHES`` setting
 * Support Unicode when generating slugs
 * Support Asciidoc ``.adoc`` file generation in Pelican importer

From aed71c30f86f5b929e735e17a36e838b5ee527ec Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Thu, 3 Sep 2020 11:21:52 +0200
Subject: [PATCH 2380/2864] No need to maintain License and Python version
 classifiers.

Poetry takes care of it: https://python-poetry.org/docs/pyproject/#classifiers
---
 pyproject.toml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index ba0573fb..0e920513 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,12 +15,7 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
     "Framework :: Pelican",
-    "License :: OSI Approved :: GNU Affero General Public License v3",
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Software Development :: Libraries :: Python Modules",

From 30c9f6bb523e291f336932de063d60e4b40550aa Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Thu, 3 Sep 2020 11:30:11 +0200
Subject: [PATCH 2381/2864] Refine classification.

---
 pyproject.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0e920513..d766400e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,8 +17,11 @@ classifiers = [
     "Framework :: Pelican",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: Implementation :: CPython",
-    "Topic :: Internet :: WWW/HTTP",
+    "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Content Management System",
+    "Topic :: Internet :: WWW/HTTP :: Site Management",
     "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Text Processing :: Markup :: Markdown",
+    "Topic :: Text Processing :: Markup :: HTML",
 ]
 
 [tool.poetry.urls]

From 8fffcbef7af4d6e6f8fa07257e562cde10fe9f15 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Fri, 4 Sep 2020 13:04:50 +0200
Subject: [PATCH 2382/2864] Add new reStructuredText classifier.

Just been added to the canonical list in: https://github.com/pypa/trove-classifiers/pull/46
---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index d766400e..1cf84312 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,6 +22,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Text Processing :: Markup :: Markdown",
     "Topic :: Text Processing :: Markup :: HTML",
+    "Topic :: Text Processing :: Markup :: reStructuredText",
 ]
 
 [tool.poetry.urls]

From 991c00af95ac3cdb197b0d04e7349d801d6c951d Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Mon, 12 Oct 2020 14:50:42 +0300
Subject: [PATCH 2383/2864] resolve packages for legacy plugins

Updated legacy plugin loader to handle pakcages if the PLUGINS entry
contains `.`. Also adds a test for it.
---
 pelican/plugins/_utils.py                         |  5 +++++
 .../normal_submodule_plugin/__init__.py           |  0
 .../subpackage/__init__.py                        |  0
 .../subpackage/subpackage.py                      |  5 +++++
 .../normal_submodule_plugin/subplugin.py          |  5 +++++
 pelican/tests/test_plugins.py                     | 15 +++++++++++++++
 6 files changed, 30 insertions(+)
 create mode 100644 pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/__init__.py
 create mode 100644 pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subpackage/__init__.py
 create mode 100644 pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subpackage/subpackage.py
 create mode 100644 pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subplugin.py

diff --git a/pelican/plugins/_utils.py b/pelican/plugins/_utils.py
index 78c19e54..4e6ec3c5 100644
--- a/pelican/plugins/_utils.py
+++ b/pelican/plugins/_utils.py
@@ -40,6 +40,11 @@ def list_plugins(ns_pkg=None):
 
 
 def load_legacy_plugin(plugin, plugin_paths):
+    if '.' in plugin:
+        # it is in a package, try to resolve package first
+        package, _, _ = plugin.rpartition('.')
+        load_legacy_plugin(package, plugin_paths)
+
     # Try to find plugin in PLUGIN_PATHS
     spec = importlib.machinery.PathFinder.find_spec(plugin, plugin_paths)
     if spec is None:
diff --git a/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/__init__.py b/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subpackage/__init__.py b/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subpackage/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subpackage/subpackage.py b/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subpackage/subpackage.py
new file mode 100644
index 00000000..ddb0eeca
--- /dev/null
+++ b/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subpackage/subpackage.py
@@ -0,0 +1,5 @@
+NAME = 'normal subpackage plugin'
+
+
+def register():
+    pass
diff --git a/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subplugin.py b/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subplugin.py
new file mode 100644
index 00000000..377c788b
--- /dev/null
+++ b/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subplugin.py
@@ -0,0 +1,5 @@
+NAME = 'normal submodule plugin'
+
+
+def register():
+    pass
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
index 730aa6d5..06940884 100644
--- a/pelican/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -116,6 +116,21 @@ class PluginTest(unittest.TestCase):
                 {'normal plugin'},
                 get_plugin_names(plugins))
 
+            # normal submodule/subpackage plugins
+            SETTINGS = {
+                'PLUGINS': [
+                    'normal_submodule_plugin.subplugin',
+                    'normal_submodule_plugin.subpackage.subpackage',
+                ],
+                'PLUGIN_PATHS': [self._NORMAL_PLUGIN_FOLDER]
+            }
+            plugins = load_plugins(SETTINGS)
+            self.assertEqual(len(plugins), 2, plugins)
+            self.assertEqual(
+                {'normal submodule plugin',
+                 'normal subpackage plugin'},
+                get_plugin_names(plugins))
+
             # namespace plugin short
             SETTINGS = {
                 'PLUGINS': ['ns_plugin']

From 6da975fc73311d683593e59c1b4b24822ddaa0e4 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Mon, 12 Oct 2020 14:53:18 +0300
Subject: [PATCH 2384/2864] restore pelican.signals with an explicit
 ImportError mentioning move

---
 pelican/signals.py | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pelican/signals.py

diff --git a/pelican/signals.py b/pelican/signals.py
new file mode 100644
index 00000000..9b84a92a
--- /dev/null
+++ b/pelican/signals.py
@@ -0,0 +1,4 @@
+raise ImportError(
+    'Importing from `pelican.signals` is deprecated. '
+    'Use `from pelican import signals` or `import pelican.plugins.signals` instead.'
+)

From 8b8a0147e886d6a42b6d8c5c76d96627b7e1241d Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Mon, 12 Oct 2020 18:38:46 +0300
Subject: [PATCH 2385/2864] add python3.9 to CI

---
 .github/workflows/main.yml | 10 ++++++----
 tox.ini                    |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bcbd94d4..5c284a6d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,6 +23,8 @@ jobs:
             python: 3.7
           - os: ubuntu
             python: 3.8
+          - os: ubuntu
+            python: 3.9
           - os: macos
             python: 3.7
           - os: windows
@@ -31,7 +33,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python ${{ matrix.config.python }}
-        uses: actions/setup-python@v1.1.1
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.config.python }}
       - name: Set pip cache (Linux)
@@ -84,7 +86,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python
-        uses: actions/setup-python@v1.1.1
+        uses: actions/setup-python@v2
         with:
           python-version: 3.6
       - name: Set pip cache (Linux)
@@ -108,7 +110,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python
-        uses: actions/setup-python@v1.1.1
+        uses: actions/setup-python@v2
         with:
           python-version: 3.6
       - name: Set pip cache (Linux)
@@ -134,7 +136,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python
-        uses: actions/setup-python@v1.1.1
+        uses: actions/setup-python@v2
         with:
           python-version: 3.7
       - name: Check release
diff --git a/tox.ini b/tox.ini
index 69281e30..b4664e98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.5,3.6,3.7,3.8},docs,flake8
+envlist = py{3.5,3.6,3.7,3.8,3.9},docs,flake8
 
 [testenv]
 basepython =
@@ -7,6 +7,7 @@ basepython =
     py3.6: python3.6
     py3.7: python3.7
     py3.8: python3.8
+    py3.9: python3.9
 passenv = *
 usedevelop=True
 deps =

From fd0923d2f24c9833021c01f247f97f4d1d8e67b4 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 4 Oct 2020 19:29:32 +0300
Subject: [PATCH 2386/2864] Try unescaped paths in intrasite link discovery

Some content parsers escape link paths in their html output
(i.e. docutils uses HTML escaping and markdown uses URL encoding.
Intrasite link discovery is refactored to also attempt HTML or URL
unescaped versions of the path in order to match more permissively.
---
 pelican/contents.py            | 80 +++++++++++++++++++++-------------
 pelican/tests/test_contents.py | 57 ++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 31 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 6470ee45..75cedcdc 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -4,7 +4,8 @@ import locale
 import logging
 import os
 import re
-from urllib.parse import urljoin, urlparse, urlunparse
+from html import unescape
+from urllib.parse import unquote, urljoin, urlparse, urlunparse
 
 import pytz
 
@@ -250,38 +251,55 @@ class Content:
 
         # XXX Put this in a different location.
         if what in {'filename', 'static', 'attach'}:
-            if path.startswith('/'):
-                path = path[1:]
+            def _get_linked_content(key, url):
+                nonlocal value
+
+                def _find_path(path):
+                    if path.startswith('/'):
+                        path = path[1:]
+                    else:
+                        # relative to the source path of this content
+                        path = self.get_relative_source_path(
+                            os.path.join(self.relative_dir, path)
+                        )
+                    return self._context[key].get(path, None)
+
+                # try path
+                result = _find_path(url.path)
+                if result is not None:
+                    return result
+
+                # try unquoted path
+                result = _find_path(unquote(url.path))
+                if result is not None:
+                    return result
+
+                # try html unescaped url
+                unescaped_url = urlparse(unescape(url.geturl()))
+                result = _find_path(unescaped_url.path)
+                if result is not None:
+                    value = unescaped_url
+                    return result
+
+                # check if a static file is linked with {filename}
+                if what == 'filename' and key == 'generated_content':
+                    linked_content = _get_linked_content('static_content', value)
+                    if linked_content:
+                        logger.warning(
+                            '{filename} used for linking to static'
+                            ' content %s in %s. Use {static} instead',
+                            value.path,
+                            self.get_relative_source_path())
+                        return linked_content
+
+                return None
+
+            if what == 'filename':
+                key = 'generated_content'
             else:
-                # relative to the source path of this content
-                path = self.get_relative_source_path(
-                    os.path.join(self.relative_dir, path)
-                )
+                key = 'static_content'
 
-            key = 'static_content' if what in ('static', 'attach')\
-                else 'generated_content'
-
-            def _get_linked_content(key, path):
-                try:
-                    return self._context[key][path]
-                except KeyError:
-                    try:
-                        # Markdown escapes spaces, try unescaping
-                        return self._context[key][path.replace('%20', ' ')]
-                    except KeyError:
-                        if what == 'filename' and key == 'generated_content':
-                            key = 'static_content'
-                            linked_content = _get_linked_content(key, path)
-                            if linked_content:
-                                logger.warning(
-                                    '{filename} used for linking to static'
-                                    ' content %s in %s. Use {static} instead',
-                                    path,
-                                    self.get_relative_source_path())
-                                return linked_content
-                        return None
-
-            linked_content = _get_linked_content(key, path)
+            linked_content = _get_linked_content(key, value)
             if linked_content:
                 if what == 'attach':
                     linked_content.attach_to(self)
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 1a520bc7..32012d4f 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -30,6 +30,9 @@ class TestBase(LoggedTestCase):
             'content': TEST_CONTENT,
             'context': {
                 'localsiteurl': '',
+                'generated_content': {},
+                'static_content': {},
+                'static_links': set()
             },
             'metadata': {
                 'summary': TEST_SUMMARY,
@@ -519,6 +522,60 @@ class TestPage(TestBase):
             '<img src="http://static.cool.site/images/poster.jpg"/>'
         )
 
+    def test_intrasite_link_escape(self):
+        article = type(
+            '_DummyArticle', (object,), {'url': 'article-spaces.html'})
+        asset = type(
+            '_DummyAsset', (object,), {'url': 'name@example.com'})
+
+        args = self.page_kwargs.copy()
+        args['settings'] = get_settings()
+        args['source_path'] = 'content'
+        args['context']['generated_content'] = {'article spaces.rst': article}
+        args['context']['static_content'] = {'name@example.com': asset}
+
+        expected_output = (
+            'A simple test with a '
+            '<a href="http://notmyidea.org/article-spaces.html#anchor">link</a> '
+            '<a href="http://notmyidea.org/name@example.com#anchor">file</a>'
+        )
+
+        # not escaped
+        args['content'] = (
+            'A simple test with a '
+            '<a href="{filename}article spaces.rst#anchor">link</a> '
+            '<a href="{static}name@example.com#anchor">file</a>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(content, expected_output)
+
+        # html escaped
+        args['content'] = (
+            'A simple test with a '
+            '<a href="{filename}article spaces.rst#anchor">link</a> '
+            '<a href="{static}name&#64;example.com#anchor">file</a>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(content, expected_output)
+
+        # url escaped
+        args['content'] = (
+            'A simple test with a '
+            '<a href="{filename}article%20spaces.rst#anchor">link</a> '
+            '<a href="{static}name%40example.com#anchor">file</a>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(content, expected_output)
+
+        # html and url escaped
+        args['content'] = (
+            'A simple test with a '
+            '<a href="{filename}article%20spaces.rst#anchor">link</a> '
+            '<a href="{static}name&#64;example.com#anchor">file</a>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(content, expected_output)
+
     def test_intrasite_link_markdown_spaces(self):
         cls_name = '_DummyArticle'
         article = type(cls_name, (object,), {'url': 'article-spaces.html'})

From 587e1a4ad89da2be46368baafb4f00b3b3d0c64a Mon Sep 17 00:00:00 2001
From: shniubobo <shniubobo@outlook.com>
Date: Sat, 31 Oct 2020 20:34:45 +0800
Subject: [PATCH 2387/2864] Fix plugins running twice in autoreload mode

Fixes #2817
---
 pelican/plugins/_utils.py     |  3 +++
 pelican/tests/test_plugins.py | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/pelican/plugins/_utils.py b/pelican/plugins/_utils.py
index 4e6ec3c5..ffe32799 100644
--- a/pelican/plugins/_utils.py
+++ b/pelican/plugins/_utils.py
@@ -53,6 +53,9 @@ def load_legacy_plugin(plugin, plugin_paths):
     if spec is None:
         raise ImportError('Cannot import plugin `{}`'.format(plugin))
     else:
+        # Avoid loading the same plugin twice
+        if spec.name in sys.modules:
+            return sys.modules[spec.name]
         # create module object from spec
         mod = importlib.util.module_from_spec(spec)
         # place it into sys.modules cache
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
index 06940884..29729539 100644
--- a/pelican/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -131,6 +131,17 @@ class PluginTest(unittest.TestCase):
                  'normal subpackage plugin'},
                 get_plugin_names(plugins))
 
+            # ensure normal plugins are loaded only once
+            SETTINGS = {
+                'PLUGINS': ['normal_plugin'],
+                'PLUGIN_PATHS': [self._NORMAL_PLUGIN_FOLDER],
+            }
+            plugins = load_plugins(SETTINGS)
+            for plugin in load_plugins(SETTINGS):
+                # The second load_plugins() should return the same plugin
+                # objects as the first one
+                self.assertIn(plugin, plugins)
+
             # namespace plugin short
             SETTINGS = {
                 'PLUGINS': ['ns_plugin']

From b454f76f72dea65db9d360dc1bf51b8ddb76149d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 2 Nov 2020 13:17:53 +0100
Subject: [PATCH 2388/2864] Count CPU cores via psutil for parallel testing

psutil does a much better job at accurately counting CPU cores,
of which pytest-xdist takes advantage for the purposes of running
tests concurrently.
---
 pyproject.toml        | 1 +
 requirements/test.pip | 2 +-
 tasks.py              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 1cf84312..cbe7642e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,6 +49,7 @@ typogrify = "^2.0"
 sphinx = "^3.0"
 sphinx_rtd_theme = "^0.5"
 livereload = "^2.6"
+psutil = {version = "^5.7", optional = true}
 pytest = "^6.0"
 pytest-cov = "^2.8"
 pytest-pythonpath = "^0.7.3"
diff --git a/requirements/test.pip b/requirements/test.pip
index 647a8694..d36405f0 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -2,7 +2,7 @@
 Pygments==2.6.1
 pytest
 pytest-cov
-pytest-xdist
+pytest-xdist[psutil]
 
 # Optional Packages
 Markdown >= 3.1
diff --git a/tasks.py b/tasks.py
index 76c48834..171a9711 100644
--- a/tasks.py
+++ b/tasks.py
@@ -14,7 +14,7 @@ VENV_PATH = Path(ACTIVE_VENV) if ACTIVE_VENV else (VENV_HOME / PKG_NAME)
 VENV = str(VENV_PATH.expanduser())
 VENV_BIN = Path(VENV) / Path(BIN_DIR)
 
-TOOLS = ["poetry", "pre-commit"]
+TOOLS = ["poetry", "pre-commit", "psutil"]
 POETRY = which("poetry") if which("poetry") else (VENV_BIN / "poetry")
 PRECOMMIT = (
     which("pre-commit") if which("pre-commit") else (VENV_BIN / "pre-commit")

From 98b1a46362f6217216306527fb8715316982b995 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 2 Nov 2020 14:10:02 +0100
Subject: [PATCH 2389/2864] Prepare release

---
 RELEASE.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..0f25e64e
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,5 @@
+Release type: patch
+
+* Refactor intra-site link discovery in order to match more permissively [#2646](https://github.com/getpelican/pelican/issues/2646)
+* Fix plugins running twice in auto-reload mode [#2817](https://github.com/getpelican/pelican/issues/2817)
+* Add notice to use `from pelican import signals` instead of `import pelican.signals` [#2805](https://github.com/getpelican/pelican/issues/2805)

From 06d4eff4a52bf75c5fc447aa779b1694f44028c9 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Mon, 2 Nov 2020 13:15:26 +0000
Subject: [PATCH 2390/2864] Release Pelican 4.5.1

---
 RELEASE.md         | 5 -----
 docs/changelog.rst | 7 +++++++
 pyproject.toml     | 2 +-
 setup.py           | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 0f25e64e..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Release type: patch
-
-* Refactor intra-site link discovery in order to match more permissively [#2646](https://github.com/getpelican/pelican/issues/2646)
-* Fix plugins running twice in auto-reload mode [#2817](https://github.com/getpelican/pelican/issues/2817)
-* Add notice to use `from pelican import signals` instead of `import pelican.signals` [#2805](https://github.com/getpelican/pelican/issues/2805)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8287f8d6..e2900c48 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,13 @@
 Release history
 ###############
 
+4.5.1 - 2020-11-02
+==================
+
+* Refactor intra-site link discovery in order to match more permissively [#2646](https://github.com/getpelican/pelican/issues/2646)
+* Fix plugins running twice in auto-reload mode [#2817](https://github.com/getpelican/pelican/issues/2817)
+* Add notice to use `from pelican import signals` instead of `import pelican.signals` [#2805](https://github.com/getpelican/pelican/issues/2805)
+
 4.5.0 - 2020-08-20
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index cbe7642e..4331fce1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.5.0"
+version = "4.5.1"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index 00aff78b..fc4ec3ce 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from os.path import join, relpath
 from setuptools import find_packages, setup
 
 
-version = "4.5.0"
+version = "4.5.1"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.11', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',

From e3c7a915e500e17b668ddebfb1cc7e30673dbf33 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 2 Nov 2020 17:18:38 +0100
Subject: [PATCH 2391/2864] Fix changelog entry formatting and issue links

---
 docs/changelog.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e2900c48..7031b63b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,9 +4,9 @@ Release history
 4.5.1 - 2020-11-02
 ==================
 
-* Refactor intra-site link discovery in order to match more permissively [#2646](https://github.com/getpelican/pelican/issues/2646)
-* Fix plugins running twice in auto-reload mode [#2817](https://github.com/getpelican/pelican/issues/2817)
-* Add notice to use `from pelican import signals` instead of `import pelican.signals` [#2805](https://github.com/getpelican/pelican/issues/2805)
+* Refactor intra-site link discovery in order to match more permissively `(#2646) <https://github.com/getpelican/pelican/issues/2646>`_
+* Fix plugins running twice in auto-reload mode `(#2817) <https://github.com/getpelican/pelican/issues/2817>`_
+* Add notice to use ``from pelican import signals`` instead of ``import pelican.signals`` `(#2805) <https://github.com/getpelican/pelican/issues/2805>`_
 
 4.5.0 - 2020-08-20
 ==================

From 67e27ca7cd36f4b9cd27418d171cb2e5c25df9ea Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 20 Nov 2020 15:39:52 +0100
Subject: [PATCH 2392/2864] pelican-plugins only shows auto-discovered plugins

Document and clarify that only Pip-installed namespace plugins will be
shown when running the `pelican-plugins` command.
---
 docs/plugins.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 3a56ed07..f661afb8 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -12,8 +12,8 @@ How to use plugins
 Starting with version 4.5, Pelican moved to a new plugin structure utilizing
 namespace packages that can be easily installed via Pip_. Plugins supporting
 this structure will install under the namespace package ``pelican.plugins`` and
-can be automatically discovered by Pelican. To see a list of plugins that are
-active in your environment, run::
+can be automatically discovered by Pelican. To see a list of Pip-installed
+namespace plugins that are active in your environment, run::
 
     pelican-plugins
 

From 4b79d6dae67844ba7faff10101dc8b18780692d4 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 20 Nov 2020 15:46:05 +0100
Subject: [PATCH 2393/2864] Update PyPI URLs to new equivalents

---
 README.rst        | 2 +-
 docs/settings.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index f0685483..995d23b0 100644
--- a/README.rst
+++ b/README.rst
@@ -60,7 +60,7 @@ Why the name "Pelican"?
    :target: https://github.com/getpelican/pelican/actions
    :alt: GitHub Actions CI: continuous integration status
 .. |pypi-version| image:: https://img.shields.io/pypi/v/pelican.svg
-   :target: https://pypi.python.org/pypi/pelican
+   :target: https://pypi.org/project/pelican/
    :alt: PyPI: the Python Package Index
 .. |repology| image:: https://repology.org/badge/tiny-repos/pelican.svg
    :target: https://repology.org/project/pelican/versions
diff --git a/docs/settings.rst b/docs/settings.rst
index 377051b0..e7eae66a 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -276,7 +276,7 @@ Basic settings
 
    If set to True, several typographical improvements will be incorporated into
    the generated HTML via the `Typogrify
-   <https://pypi.python.org/pypi/typogrify>`_ library, which can be installed
+   <https://pypi.org/project/typogrify/>`_ library, which can be installed
    via: ``python -m pip install typogrify``
 
 .. data:: TYPOGRIFY_IGNORE_TAGS = []

From f21969a0161621642f60139b5735190ee633e7e6 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 20 Nov 2020 16:22:39 +0100
Subject: [PATCH 2394/2864] Ensure `invoke lint` task & its docs are in sync

Someday the entire Pelican code base will perhaps have Black and isort
formatting applied to it, but it doesn't make sense for the linter to
check that until it's actually done. This changes the `lint` Invoke task
to run Flake8 on changed lines only, which should bring it into line
with both the current Pre-commit and CI configurations.

Also, the docs erroneously stated that `invoke tests` would also check
for code style compliance, which has herein been fixed.
---
 docs/contribute.rst | 13 ++++++++-----
 tasks.py            |  4 +---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 62ed51f9..2e1dc317 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -75,11 +75,14 @@ via::
 
     invoke tests
 
-In addition to running the test suite, the above invocation will also check code
-style and let you know whether non-conforming patterns were found. In some cases
-these linters will make the needed changes directly, while in other cases you
-may need to make additional changes until ``invoke tests`` no longer reports any
-code style violations.
+In addition to running the test suite, it is important to also ensure that any
+lines you changed conform to code style guidelines. You can check that via::
+
+    invoke lint
+
+If code style violations are found in lines you changed, correct those lines
+and re-run the above lint command until they have all been fixed. You do not
+need to address style violations, if any, for code lines you did not touch.
 
 After making your changes and running the tests, you may see a test failure
 mentioning that "some generated files differ from the expected functional tests
diff --git a/tasks.py b/tasks.py
index 171a9711..1d511859 100644
--- a/tasks.py
+++ b/tasks.py
@@ -70,13 +70,11 @@ def isort(c, check=False, diff=False):
 
 @task
 def flake8(c):
-    c.run(f"{VENV_BIN}/flake8 {PKG_PATH} tasks.py")
+    c.run(f"git diff HEAD | {VENV_BIN}/flake8 --diff --max-line-length=88")
 
 
 @task
 def lint(c):
-    isort(c, check=True)
-    black(c, check=True)
     flake8(c)
 
 

From a9d9ccb58300c467d0b2aa721f5189706583a0b4 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 20 Nov 2020 16:30:18 +0100
Subject: [PATCH 2395/2864] Improve docs for plugin code style compliance

---
 docs/contribute.rst | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 2e1dc317..a86a5031 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -148,9 +148,20 @@ Create a topic branch for your plugin bug fix or feature::
 
     git checkout -b name-of-your-bugfix-or-feature
 
-After writing new tests for your plugin changes, run the plugin test suite::
+After writing new tests for your plugin changes, run the plugin test suite and
+check for code style compliance via::
 
     invoke tests
+    invoke lint
+
+If style violations are found, many of them can be addressed automatically via::
+
+    invoke black
+    invoke isort
+
+If style violations are found even after running the above auto-formatters,
+you will need to make additional manual changes until ``invoke lint`` no longer
+reports any code style violations.
 
 .. _plugin template: https://github.com/getpelican/cookiecutter-pelican-plugin
 .. _Simple Footnotes: https://github.com/pelican-plugins/simple-footnotes

From afdf0fb3cf6cd376a6f241e2d5bbf99cf0e348c2 Mon Sep 17 00:00:00 2001
From: Leonardo Giordani <giordani.leonardo@gmail.com>
Date: Sun, 22 Nov 2020 16:13:51 +0000
Subject: [PATCH 2396/2864] Improve logging of generators and writer loaders
 (#2821)

---
 RELEASE.md                    |  3 ++
 pelican/__init__.py           | 73 ++++++++++++++++++++---------------
 pelican/tests/test_pelican.py |  4 +-
 3 files changed, 47 insertions(+), 33 deletions(-)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..384c99f0
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,3 @@
+Release type: patch
+
+Improve logging of generators and writer loaders
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 82366117..b6ebb762 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -93,7 +93,7 @@ class Pelican:
                 path=self.path,
                 theme=self.theme,
                 output_path=self.output_path,
-            ) for cls in self.get_generator_classes()
+            ) for cls in self._get_generator_classes()
         ]
 
         # Delete the output directory if (1) the appropriate setting is True
@@ -114,7 +114,7 @@ class Pelican:
 
         signals.all_generators_finalized.send(generators)
 
-        writer = self.get_writer()
+        writer = self._get_writer()
 
         for p in generators:
             if hasattr(p, 'generate_output'):
@@ -162,46 +162,57 @@ class Pelican:
                     pluralized_draft_pages,
                     time.time() - start_time))
 
-    def get_generator_classes(self):
-        generators = [ArticlesGenerator, PagesGenerator]
+    def _get_generator_classes(self):
+        discovered_generators = [
+            (ArticlesGenerator, "internal"),
+            (PagesGenerator, "internal")
+        ]
 
-        if self.settings['TEMPLATE_PAGES']:
-            generators.append(TemplatePagesGenerator)
-        if self.settings['OUTPUT_SOURCES']:
-            generators.append(SourceFileGenerator)
+        if self.settings["TEMPLATE_PAGES"]:
+            discovered_generators.append((TemplatePagesGenerator, "internal"))
 
-        for pair in signals.get_generators.send(self):
-            (funct, value) = pair
+        if self.settings["OUTPUT_SOURCES"]:
+            discovered_generators.append((SourceFileGenerator, "internal"))
 
-            if not isinstance(value, Iterable):
-                value = (value, )
+        for receiver, values in signals.get_generators.send(self):
+            if not isinstance(values, Iterable):
+                values = (values,)
 
-            for v in value:
-                if isinstance(v, type):
-                    logger.debug('Found generator: %s', v)
-                    generators.append(v)
+                discovered_generators.extend(
+                    [(generator, receiver.__module__) for generator in values]
+                )
 
         # StaticGenerator must run last, so it can identify files that
         # were skipped by the other generators, and so static files can
         # have their output paths overridden by the {attach} link syntax.
-        generators.append(StaticGenerator)
+        discovered_generators.append((StaticGenerator, "internal"))
+
+        generators = []
+
+        for generator, origin in discovered_generators:
+            if not isinstance(generator, type):
+                logger.error("Generator %s (%s) cannot be loaded", generator, origin)
+                continue
+
+            logger.debug("Found generator: %s (%s)", generator.__name__, origin)
+            generators.append(generator)
+
         return generators
 
-    def get_writer(self):
-        writers = [w for (_, w) in signals.get_writer.send(self)
-                   if isinstance(w, type)]
-        writers_found = len(writers)
-        if writers_found == 0:
+    def _get_writer(self):
+        writers = [w for _, w in signals.get_writer.send(self) if isinstance(w, type)]
+        num_writers = len(writers)
+
+        if num_writers == 0:
             return Writer(self.output_path, settings=self.settings)
-        else:
-            writer = writers[0]
-            if writers_found == 1:
-                logger.debug('Found writer: %s', writer)
-            else:
-                logger.warning(
-                    '%s writers found, using only first one: %s',
-                    writers_found, writer)
-            return writer(self.output_path, settings=self.settings)
+
+        if num_writers > 1:
+            logger.warning("%s writers found, using only first one", num_writers)
+
+        writer = writers[0]
+
+        logger.debug("Found writer: %s", writer)
+        return writer(self.output_path, settings=self.settings)
 
 
 class PrintSettings(argparse.Action):
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 219377ae..cacc65c1 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -84,14 +84,14 @@ class TestPelican(LoggedTestCase):
         # have their output paths overridden by the {attach} link syntax.
 
         pelican = Pelican(settings=read_settings(path=None))
-        generator_classes = pelican.get_generator_classes()
+        generator_classes = pelican._get_generator_classes()
 
         self.assertTrue(
             generator_classes[-1] is StaticGenerator,
             "StaticGenerator must be the last generator, but it isn't!")
         self.assertIsInstance(
             generator_classes, Sequence,
-            "get_generator_classes() must return a Sequence to preserve order")
+            "_get_generator_classes() must return a Sequence to preserve order")
 
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default

From 246da3b4d815ac340e8bde889964022b20a5ac48 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Sun, 22 Nov 2020 16:16:28 +0000
Subject: [PATCH 2397/2864] Release Pelican 4.5.2

---
 RELEASE.md         | 3 ---
 docs/changelog.rst | 5 +++++
 pyproject.toml     | 2 +-
 setup.py           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 384c99f0..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Release type: patch
-
-Improve logging of generators and writer loaders
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7031b63b..a97fb9b4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+4.5.2 - 2020-11-22
+==================
+
+Improve logging of generators and writer loaders
+
 4.5.1 - 2020-11-02
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index 4331fce1..b78a0374 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.5.1"
+version = "4.5.2"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index fc4ec3ce..91847f03 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from os.path import join, relpath
 from setuptools import find_packages, setup
 
 
-version = "4.5.1"
+version = "4.5.2"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.11', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',

From 9435a6c0451a32ab3dba602fba3b79b3c06c929c Mon Sep 17 00:00:00 2001
From: Leonardo Giordani <giordani.leonardo@gmail.com>
Date: Tue, 1 Dec 2020 18:07:51 +0000
Subject: [PATCH 2398/2864] Fix code indented incorrectly in generators logging
 (#2823)

---
 RELEASE.md          | 3 +++
 pelican/__init__.py | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..c1978b31
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,3 @@
+Release type: patch
+
+Fix a mistake made in PR #2821
diff --git a/pelican/__init__.py b/pelican/__init__.py
index b6ebb762..0d723220 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -178,9 +178,9 @@ class Pelican:
             if not isinstance(values, Iterable):
                 values = (values,)
 
-                discovered_generators.extend(
-                    [(generator, receiver.__module__) for generator in values]
-                )
+            discovered_generators.extend(
+                [(generator, receiver.__module__) for generator in values]
+            )
 
         # StaticGenerator must run last, so it can identify files that
         # were skipped by the other generators, and so static files can

From 8033162ba4393db60791b201fb100d1be0f04431 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Tue, 1 Dec 2020 20:36:51 +0000
Subject: [PATCH 2399/2864] Release Pelican 4.5.3

---
 RELEASE.md         | 3 ---
 docs/changelog.rst | 5 +++++
 pyproject.toml     | 2 +-
 setup.py           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index c1978b31..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Release type: patch
-
-Fix a mistake made in PR #2821
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a97fb9b4..dfcd4c48 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+4.5.3 - 2020-12-01
+==================
+
+Fix a mistake made in PR #2821
+
 4.5.2 - 2020-11-22
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index b78a0374..18bc2f09 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.5.2"
+version = "4.5.3"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index 91847f03..ca1fc674 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from os.path import join, relpath
 from setuptools import find_packages, setup
 
 
-version = "4.5.2"
+version = "4.5.3"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.11', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',

From 049bb2e1b3d06721023a12be8e0885b96fed9a0e Mon Sep 17 00:00:00 2001
From: Someone <someone@somenet.org>
Date: Wed, 9 Dec 2020 22:52:42 +0100
Subject: [PATCH 2400/2864] add "http://" prefix to ip+port

---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0d723220..3f6f7f1c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -469,7 +469,7 @@ def listen(server, port, output, excqueue=None):
         return
 
     try:
-        print("\nServing site at: {}:{} - Tap CTRL-C to stop".format(
+        print("\nServing site at: http://{}:{} - Tap CTRL-C to stop".format(
             server, port))
         httpd.serve_forever()
     except Exception as e:

From 783a70da460e2d498041dabed28b2380ac8f489a Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@users.noreply.github.com>
Date: Sun, 3 Jan 2021 21:24:10 -0800
Subject: [PATCH 2401/2864] Fix typo in the FAQ: steamline --> streamline.

---
 docs/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 8532ab3f..e174cd4e 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -242,7 +242,7 @@ command similar to ``cd content; find -name '*.md' | head -n 10``.
 My tag-cloud is missing/broken since I upgraded Pelican
 =======================================================
 
-In an ongoing effort to steamline Pelican, `tag_cloud` generation has been
+In an ongoing effort to streamline Pelican, `tag_cloud` generation has been
 moved out of the pelican core and into a separate `plugin
 <https://github.com/getpelican/pelican-plugins/tree/master/tag_cloud>`_. See
 the :ref:`plugins` documentation further information about the Pelican plugin

From dc601059265bfd0722b8d07c67dd1f39b091fbfa Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Mon, 4 Jan 2021 17:13:32 +0100
Subject: [PATCH 2402/2864] Stringify plugin definitions so they can be pickled
 during caching (#2835)

---
 RELEASE.md                                    |  3 ++
 pelican/__init__.py                           | 14 ++++---
 pelican/plugins/_utils.py                     | 16 ++++++++
 .../normal_plugin/normal_plugin/__init__.py   |  2 -
 .../subpackage/subpackage.py                  |  3 --
 .../normal_submodule_plugin/subplugin.py      |  3 --
 pelican/tests/test_plugins.py                 | 39 +++++++++++++------
 7 files changed, 56 insertions(+), 24 deletions(-)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..9439717c
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,3 @@
+Release type: patch
+
+Replace plugin definitions in settings with string representations after registering, so they can be cached correctly (#2828).
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0d723220..1982f413 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -20,7 +20,7 @@ from pelican.generators import (ArticlesGenerator,  # noqa: I100
                                 PagesGenerator, SourceFileGenerator,
                                 StaticGenerator, TemplatePagesGenerator)
 from pelican.plugins import signals
-from pelican.plugins._utils import load_plugins
+from pelican.plugins._utils import get_plugin_name, load_plugins
 from pelican.readers import Readers
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import coerce_overrides, read_settings
@@ -65,14 +65,18 @@ class Pelican:
             sys.path.insert(0, '')
 
     def init_plugins(self):
-        self.plugins = load_plugins(self.settings)
-        for plugin in self.plugins:
-            logger.debug('Registering plugin `%s`', plugin.__name__)
+        self.plugins = []
+        for plugin in load_plugins(self.settings):
+            name = get_plugin_name(plugin)
+            logger.debug('Registering plugin `%s`', name)
             try:
                 plugin.register()
+                self.plugins.append(plugin)
             except Exception as e:
                 logger.error('Cannot register plugin `%s`\n%s',
-                             plugin.__name__, e)
+                             name, e)
+
+        self.settings['PLUGINS'] = [get_plugin_name(p) for p in self.plugins]
 
     def run(self):
         """Run the generators and return"""
diff --git a/pelican/plugins/_utils.py b/pelican/plugins/_utils.py
index ffe32799..87877b08 100644
--- a/pelican/plugins/_utils.py
+++ b/pelican/plugins/_utils.py
@@ -1,6 +1,7 @@
 import importlib
 import importlib.machinery
 import importlib.util
+import inspect
 import logging
 import pkgutil
 import sys
@@ -107,3 +108,18 @@ def load_plugins(settings):
         plugins = list(namespace_plugins.values())
 
     return plugins
+
+
+def get_plugin_name(plugin):
+    """
+    Plugins can be passed as module objects, however this breaks caching as
+    module objects cannot be pickled. To work around this, all plugins are
+    stringified post-initialization.
+    """
+    if inspect.isclass(plugin):
+        return plugin.__qualname__
+
+    if inspect.ismodule(plugin):
+        return plugin.__name__
+
+    return type(plugin).__qualname__
diff --git a/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py b/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py
index 5838a835..e714c7a6 100644
--- a/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py
+++ b/pelican/tests/dummy_plugins/normal_plugin/normal_plugin/__init__.py
@@ -1,7 +1,5 @@
 from .submodule import noop  # noqa: F401
 
-NAME = 'normal plugin'
-
 
 def register():
     pass
diff --git a/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subpackage/subpackage.py b/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subpackage/subpackage.py
index ddb0eeca..9e12b19f 100644
--- a/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subpackage/subpackage.py
+++ b/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subpackage/subpackage.py
@@ -1,5 +1,2 @@
-NAME = 'normal subpackage plugin'
-
-
 def register():
     pass
diff --git a/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subplugin.py b/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subplugin.py
index 377c788b..9e12b19f 100644
--- a/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subplugin.py
+++ b/pelican/tests/dummy_plugins/normal_plugin/normal_submodule_plugin/subplugin.py
@@ -1,5 +1,2 @@
-NAME = 'normal submodule plugin'
-
-
 def register():
     pass
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
index 29729539..348c3e94 100644
--- a/pelican/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -1,7 +1,9 @@
 import os
 from contextlib import contextmanager
 
-from pelican.plugins._utils import get_namespace_plugins, load_plugins
+import pelican.tests.dummy_plugins.normal_plugin.normal_plugin as normal_plugin
+from pelican.plugins._utils import (get_namespace_plugins, get_plugin_name,
+                                    load_plugins)
 from pelican.tests.support import unittest
 
 
@@ -81,9 +83,7 @@ class PluginTest(unittest.TestCase):
 
     def test_load_plugins(self):
         def get_plugin_names(plugins):
-            return {
-                plugin.NAME if hasattr(plugin, 'NAME') else plugin.__name__
-                for plugin in plugins}
+            return {get_plugin_name(p) for p in plugins}
 
         # existing namespace plugins
         existing_ns_plugins = load_plugins({})
@@ -93,7 +93,7 @@ class PluginTest(unittest.TestCase):
             plugins = load_plugins({})
             self.assertEqual(len(plugins), len(existing_ns_plugins)+1, plugins)
             self.assertEqual(
-                {'namespace plugin'} | get_plugin_names(existing_ns_plugins),
+                {'pelican.plugins.ns_plugin'} | get_plugin_names(existing_ns_plugins),
                 get_plugin_names(plugins))
 
             # disable namespace plugins with `PLUGINS = []`
@@ -113,7 +113,7 @@ class PluginTest(unittest.TestCase):
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 1, plugins)
             self.assertEqual(
-                {'normal plugin'},
+                {'normal_plugin'},
                 get_plugin_names(plugins))
 
             # normal submodule/subpackage plugins
@@ -127,8 +127,8 @@ class PluginTest(unittest.TestCase):
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 2, plugins)
             self.assertEqual(
-                {'normal submodule plugin',
-                 'normal subpackage plugin'},
+                {'normal_submodule_plugin.subplugin',
+                 'normal_submodule_plugin.subpackage.subpackage'},
                 get_plugin_names(plugins))
 
             # ensure normal plugins are loaded only once
@@ -149,7 +149,7 @@ class PluginTest(unittest.TestCase):
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 1, plugins)
             self.assertEqual(
-                {'namespace plugin'},
+                {'pelican.plugins.ns_plugin'},
                 get_plugin_names(plugins))
 
             # namespace plugin long
@@ -159,7 +159,7 @@ class PluginTest(unittest.TestCase):
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 1, plugins)
             self.assertEqual(
-                {'namespace plugin'},
+                {'pelican.plugins.ns_plugin'},
                 get_plugin_names(plugins))
 
             # normal and namespace plugin
@@ -170,5 +170,22 @@ class PluginTest(unittest.TestCase):
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 2, plugins)
             self.assertEqual(
-                {'normal plugin', 'namespace plugin'},
+                {'normal_plugin', 'pelican.plugins.ns_plugin'},
                 get_plugin_names(plugins))
+
+    def test_get_plugin_name(self):
+        self.assertEqual(
+            get_plugin_name(normal_plugin),
+            'pelican.tests.dummy_plugins.normal_plugin.normal_plugin',
+        )
+
+        class NoopPlugin:
+            def register(self):
+                pass
+
+        self.assertEqual(
+            get_plugin_name(NoopPlugin),
+            'PluginTest.test_get_plugin_name.<locals>.NoopPlugin')
+        self.assertEqual(
+            get_plugin_name(NoopPlugin()),
+            'PluginTest.test_get_plugin_name.<locals>.NoopPlugin')

From 9e72b29fc1a9bbd10725cc98878840e015d626a0 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Mon, 4 Jan 2021 16:16:16 +0000
Subject: [PATCH 2403/2864] Release Pelican 4.5.4

---
 RELEASE.md         | 3 ---
 docs/changelog.rst | 5 +++++
 pyproject.toml     | 2 +-
 setup.py           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 9439717c..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Release type: patch
-
-Replace plugin definitions in settings with string representations after registering, so they can be cached correctly (#2828).
diff --git a/docs/changelog.rst b/docs/changelog.rst
index dfcd4c48..c302d837 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+4.5.4 - 2021-01-04
+==================
+
+Replace plugin definitions in settings with string representations after registering, so they can be cached correctly (#2828).
+
 4.5.3 - 2020-12-01
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index 18bc2f09..c41f8787 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.5.3"
+version = "4.5.4"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index ca1fc674..b4e769c0 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from os.path import join, relpath
 from setuptools import find_packages, setup
 
 
-version = "4.5.3"
+version = "4.5.4"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.11', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',

From b12443f48a11f542d613f2c52a59fb38919f5604 Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@users.noreply.github.com>
Date: Tue, 5 Jan 2021 10:40:31 -0800
Subject: [PATCH 2404/2864] Use a top (instead of bottom) border in hentry.

`hentry` uses `clear: both` with the intention of placing a separator line (1px border) between each entry. However, it is wrongly using `border-bottom` instead of `border-top` to make that separator. CSS `clear` makes space to clear the **preceding** floats. Hence a `border-bottom` won't enjoy that `clear` effect.
---
 pelican/themes/notmyidea/static/css/main.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 63f5adc0..aaea9b81 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -384,10 +384,10 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 .hentry {
 	display: block;
 	clear: both;
-	border-bottom: 1px solid #eee;
+	border-top: 1px solid #eee;
 	padding: 1.5em 0;
 }
-li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
+li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 #content > .hentry {padding: 1em 0;}
 .hentry img{display : none ;}
 .entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;}

From b17e4a5ffaab2f4f235cbb76c6a05b91cf69c878 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 6 Jan 2021 07:36:21 +0100
Subject: [PATCH 2405/2864] Add FAQ re: Atom full-post vs. summary-only feeds

Replaces a FAQ about upgrading from a very old version of Pelican, which
isn't relevant to most folks at this point.
---
 docs/faq.rst | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 8532ab3f..2902a0e4 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -174,28 +174,18 @@ your site.
 Feeds are still generated when this warning is displayed, but links within may
 be malformed and thus the feed may not validate.
 
-My feeds are broken since I upgraded to Pelican 3.x
-===================================================
+Can I force Atom feeds to show only summaries instead of article content?
+=========================================================================
 
-Starting in 3.0, some of the FEED setting names were changed to more explicitly
-refer to the Atom feeds they inherently represent (much like the FEED_RSS
-setting names). Here is an exact list of the renamed settings::
-
-    FEED -> FEED_ATOM
-    TAG_FEED -> TAG_FEED_ATOM
-    CATEGORY_FEED -> CATEGORY_FEED_ATOM
-
-Starting in 3.1, the new feed ``FEED_ALL_ATOM`` has been introduced: this feed
-will aggregate all posts regardless of their language. This setting generates
-``'feeds/all.atom.xml'`` by default and ``FEED_ATOM`` now defaults to ``None``.
-The following feed setting has also been renamed::
-
-    TRANSLATION_FEED -> TRANSLATION_FEED_ATOM
-
-Older themes that referenced the old setting names may not link properly. In
-order to rectify this, please update your theme for compatibility by changing
-the relevant values in your template files. For an example of complete feed
-headers and usage please check out the ``simple`` theme.
+Instead of having to open a separate browser window to read articles, the
+overwhelming majority of folks who use feed readers prefer to read content
+within the feed reader itself. Mainly for that reason, Pelican does not support
+restricting Atom feeds to only contain summaries. Unlike Atom feeds, the RSS
+feed specification does not include a separate ``content`` field, so by default
+Pelican publishes RSS feeds that only contain summaries (but can optionally be
+set to instead publish full content RSS feeds). So the default feed generation
+behavior provides users with a choice: subscribe to Atom feeds for full content
+or to RSS feeds for just the summaries.
 
 Is Pelican only suitable for blogs?
 ===================================

From 507d68e5c6cb6eb6e184283944d8f4c543996619 Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@users.noreply.github.com>
Date: Thu, 7 Jan 2021 14:09:38 -0800
Subject: [PATCH 2406/2864] Update functional tests.

---
 pelican/tests/output/basic/theme/css/main.css                 | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau.html      | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau2.html     | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau3.html     | 2 +-
 pelican/tests/output/custom/index.html                        | 2 +-
 pelican/tests/output/custom/index2.html                       | 2 +-
 pelican/tests/output/custom/index3.html                       | 2 +-
 pelican/tests/output/custom/theme/css/main.css                | 4 ++--
 .../tests/output/custom_locale/author/alexis-metaireau.html   | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau2.html  | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau3.html  | 2 +-
 pelican/tests/output/custom_locale/index.html                 | 2 +-
 pelican/tests/output/custom_locale/index2.html                | 2 +-
 pelican/tests/output/custom_locale/index3.html                | 2 +-
 pelican/tests/output/custom_locale/theme/css/main.css         | 4 ++--
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 63f5adc0..aaea9b81 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -384,10 +384,10 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 .hentry {
 	display: block;
 	clear: both;
-	border-bottom: 1px solid #eee;
+	border-top: 1px solid #eee;
 	padding: 1.5em 0;
 }
-li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
+li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 #content > .hentry {padding: 1em 0;}
 .hentry img{display : none ;}
 .entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;}
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index 7a277e2c..f768b15e 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -168,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index a5588090..96b34bff 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -183,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 095b39b6..c8ee5759 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -133,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index e63db6ec..ff675f85 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -168,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 570e3b81..941c176e 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -183,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index f92bdbb1..ce73759d 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -133,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 63f5adc0..aaea9b81 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -384,10 +384,10 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 .hentry {
 	display: block;
 	clear: both;
-	border-bottom: 1px solid #eee;
+	border-top: 1px solid #eee;
 	padding: 1.5em 0;
 }
-li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
+li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 #content > .hentry {padding: 1em 0;}
 .hentry img{display : none ;}
 .entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;}
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 9b4ca7dd..68054d97 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -168,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index a1848677..16431fb9 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -183,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 78fdd866..d43663bd 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -133,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 29e12b1b..6e0d632d 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -168,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index c0727385..5ff21fac 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -183,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 0d2722f2..97ca0bb4 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -133,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
index 63f5adc0..aaea9b81 100644
--- a/pelican/tests/output/custom_locale/theme/css/main.css
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -384,10 +384,10 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 .hentry {
 	display: block;
 	clear: both;
-	border-bottom: 1px solid #eee;
+	border-top: 1px solid #eee;
 	padding: 1.5em 0;
 }
-li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
+li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 #content > .hentry {padding: 1em 0;}
 .hentry img{display : none ;}
 .entry-title {font-size: 3em; margin-bottom: 10px; margin-top: 0;}

From 89a31141ff51377ca97cde0f3da2f3651f46079d Mon Sep 17 00:00:00 2001
From: Tom Adler <me@arty.name>
Date: Sun, 13 Jul 2014 08:59:09 +0200
Subject: [PATCH 2407/2864] Support last page pattern in PAGINATION_PATTERNS

---
 docs/settings.rst               |  5 +++++
 pelican/paginator.py            |  9 +++++++--
 pelican/tests/test_paginator.py | 26 ++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e7eae66a..080856e3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1067,6 +1067,11 @@ as follows::
   )
 
 
+If you want a pattern to apply to the last page in the list, use ``-1``
+as the ``minimum_page`` value::
+
+    (-1, '{base_name}/last/', '{base_name}/last/index.html'),
+
 Translations
 ============
 
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 9d169045..7e738fe3 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -118,8 +118,13 @@ class Page:
 
         # find the last matching pagination rule
         for p in self.settings['PAGINATION_PATTERNS']:
-            if p.min_page <= self.number:
-                rule = p
+            if p.min_page == -1:
+                if not self.has_next():
+                    rule = p
+                    break
+            else:
+                if p.min_page <= self.number:
+                    rule = p
 
         if not rule:
             return ''
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 5dc285ae..f8233eb4 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -76,3 +76,29 @@ class TestPage(unittest.TestCase):
         page2 = paginator.page(2)
         self.assertEqual(page2.save_as, 'blog/2/index.html')
         self.assertEqual(page2.url, '//blog.my.site/2/')
+
+    def test_custom_pagination_pattern_last_page(self):
+        from pelican.paginator import PaginationRule
+        settings = get_settings()
+        settings['PAGINATION_PATTERNS'] = [PaginationRule(*r) for r in [
+            (1, '/{url}1/', '{base_name}/1/index.html'),
+            (2, '/{url}{number}/', '{base_name}/{number}/index.html'),
+            (-1, '/{url}', '{base_name}/index.html'),
+        ]]
+
+        self.page_kwargs['metadata']['author'] = Author('Blogger', settings)
+        object_list = [Article(**self.page_kwargs),
+                       Article(**self.page_kwargs),
+                       Article(**self.page_kwargs)]
+        paginator = Paginator('blog/index.html', '//blog.my.site/',
+                              object_list, settings, 1)
+        # The URL *has to* stay absolute (with // in the front), so verify that
+        page1 = paginator.page(1)
+        self.assertEqual(page1.save_as, 'blog/1/index.html')
+        self.assertEqual(page1.url, '//blog.my.site/1/')
+        page2 = paginator.page(2)
+        self.assertEqual(page2.save_as, 'blog/2/index.html')
+        self.assertEqual(page2.url, '//blog.my.site/2/')
+        page3 = paginator.page(3)
+        self.assertEqual(page3.save_as, 'blog/index.html')
+        self.assertEqual(page3.url, '//blog.my.site/')

From ab3001391e6fad0c5c6b527c8a8d4f4f7351bd3a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 15 Jan 2021 12:49:33 +0100
Subject: [PATCH 2408/2864] Match test output line endings with current
 rendering

---
 pelican/tests/output/custom/author/alexis-metaireau.html        | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau2.html       | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau3.html       | 2 +-
 pelican/tests/output/custom/index.html                          | 2 +-
 pelican/tests/output/custom/index2.html                         | 2 +-
 pelican/tests/output/custom/index3.html                         | 2 +-
 pelican/tests/output/custom_locale/author/alexis-metaireau.html | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau2.html    | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau3.html    | 2 +-
 pelican/tests/output/custom_locale/index.html                   | 2 +-
 pelican/tests/output/custom_locale/index2.html                  | 2 +-
 pelican/tests/output/custom_locale/index3.html                  | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index 7a277e2c..f768b15e 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -168,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index a5588090..96b34bff 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -183,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 095b39b6..c8ee5759 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -133,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index e63db6ec..ff675f85 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -168,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 570e3b81..941c176e 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -183,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index f92bdbb1..ce73759d 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -133,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 9b4ca7dd..68054d97 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -168,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index a1848677..16431fb9 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -183,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 78fdd866..d43663bd 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -133,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 29e12b1b..6e0d632d 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -168,4 +168,4 @@
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index c0727385..5ff21fac 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -183,4 +183,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 0d2722f2..97ca0bb4 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -133,4 +133,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file

From 34fc7f2a8498da4d8c8f801318ba1b172ffed66f Mon Sep 17 00:00:00 2001
From: Nam Nguyen <namn@users.noreply.github.com>
Date: Wed, 6 Jan 2021 12:19:46 -0800
Subject: [PATCH 2409/2864] Allow latest Pygments to be installed

Otherwise, installation conflicts can result when plugins/themes require
more recent Pygments versions.
---
 pyproject.toml        | 3 ++-
 requirements/test.pip | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index c41f8787..cef0a16f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@ blinker = "^1.4"
 docutils = "^0.16"
 feedgenerator = "^1.9"
 jinja2 = "~2.11"
-pygments = "~2.6.1"
+pygments = "^2.6"
 python-dateutil = "^2.8"
 pytz = "^2020.1"
 unidecode = "^1.1"
@@ -50,6 +50,7 @@ sphinx = "^3.0"
 sphinx_rtd_theme = "^0.5"
 livereload = "^2.6"
 psutil = {version = "^5.7", optional = true}
+pygments = "~2.7.4"
 pytest = "^6.0"
 pytest-cov = "^2.8"
 pytest-pythonpath = "^0.7.3"
diff --git a/requirements/test.pip b/requirements/test.pip
index d36405f0..30b52845 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,5 +1,5 @@
 # Tests
-Pygments==2.6.1
+Pygments==2.7.4
 pytest
 pytest-cov
 pytest-xdist[psutil]

From e01cde7fcb6ff4e3720059cd59a498972630f3d3 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 15 Jan 2021 12:55:57 +0100
Subject: [PATCH 2410/2864] Adjust functional test output for Pygments 2.7.x

Class `lineno` was changed to `linenos`.
---
 pelican/tests/output/basic/feeds/all-en.atom.xml                | 2 +-
 pelican/tests/output/basic/feeds/all.atom.xml                   | 2 +-
 pelican/tests/output/basic/feeds/misc.atom.xml                  | 2 +-
 pelican/tests/output/basic/unbelievable.html                    | 2 +-
 pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml     | 2 +-
 pelican/tests/output/custom/feeds/all-en.atom.xml               | 2 +-
 pelican/tests/output/custom/feeds/all.atom.xml                  | 2 +-
 pelican/tests/output/custom/feeds/misc.atom.xml                 | 2 +-
 pelican/tests/output/custom/unbelievable.html                   | 2 +-
 .../tests/output/custom_locale/feeds/alexis-metaireau.atom.xml  | 2 +-
 pelican/tests/output/custom_locale/feeds/all-en.atom.xml        | 2 +-
 pelican/tests/output/custom_locale/feeds/all.atom.xml           | 2 +-
 pelican/tests/output/custom_locale/feeds/misc.atom.xml          | 2 +-
 .../custom_locale/posts/2010/octobre/15/unbelievable/index.html | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index f59ea651..a0166567 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 7407d2ff..4ab55b48 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -57,7 +57,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index a8243b48..b6e4ebd4 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index e0836d70..378ba077 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -56,7 +56,7 @@ pelican.conf, it will have nothing in default.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="linenos special"> 8</span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="linenos">  </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="linenos special">10</span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="linenos">  </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="linenos special">12</span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="linenos">  </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="linenos special">14</span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="linenos">  </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="linenos special">16</span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="linenos">  </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="linenos special">18</span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="linenos">  </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="linenos special">20</span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="linenos">  </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="linenos special">22</span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="linenos">  </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="linenos special">24</span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="linenos">  </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="linenos special">26</span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="linenos">  </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index 19b706e8..ad2ec539 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 15ec3903..99b21a5a 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index cf214c5a..730e9de4 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -57,7 +57,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 325e4c01..a2740fdd 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 0132162c..da3b7d29 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -63,7 +63,7 @@ pelican.conf, it will have nothing in default.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="linenos special"> 8</span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="linenos">  </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="linenos special">10</span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="linenos">  </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="linenos special">12</span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="linenos">  </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="linenos special">14</span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="linenos">  </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="linenos special">16</span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="linenos">  </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="linenos special">18</span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="linenos">  </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="linenos special">20</span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="linenos">  </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="linenos special">22</span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="linenos">  </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="linenos special">24</span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="linenos">  </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="linenos special">26</span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="linenos">  </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 5e5b888a..54e1c1e2 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 1b6dc18f..2c08dde0 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index 67a57122..bbb04753 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -57,7 +57,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index 4b514b47..5c3cdb50 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index e42c70f6..663fb397 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -63,7 +63,7 @@ pelican.conf, it will have nothing in default.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="linenos special"> 8</span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="linenos">  </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="linenos special">10</span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="linenos">  </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="linenos special">12</span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="linenos">  </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="linenos special">14</span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="linenos">  </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="linenos special">16</span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="linenos">  </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="linenos special">18</span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="linenos">  </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="linenos special">20</span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="linenos">  </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="linenos special">22</span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="linenos">  </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="linenos special">24</span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="linenos">  </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="linenos special">26</span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="linenos">  </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">

From ce5d0635137009300b65edb15f73081f0ac4231b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 15 Jan 2021 13:04:07 +0100
Subject: [PATCH 2411/2864] Allow latest Python-Markdown to be installed

Pinning dependencies to specific versions creates conflicts when other
packages require more recent versions. We can do our part by allowing
for a wider range of dependency versions, specifying only the oldest
version that will still work. Meanwhile, we ensure that test
environments use a specific pinned dependency in order to match the
expected functional test output.
---
 pyproject.toml        | 4 ++--
 requirements/test.pip | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index cef0a16f..63fe09ba 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,12 +39,12 @@ pygments = "^2.6"
 python-dateutil = "^2.8"
 pytz = "^2020.1"
 unidecode = "^1.1"
-markdown = {version = "~3.2.2", optional = true}
+markdown = {version = "^3.2", optional = true}
 
 [tool.poetry.dev-dependencies]
 BeautifulSoup4 = "^4.9"
 lxml = "^4.3"
-markdown = "~3.2.2"
+markdown = "~3.3.3"
 typogrify = "^2.0"
 sphinx = "^3.0"
 sphinx_rtd_theme = "^0.5"
diff --git a/requirements/test.pip b/requirements/test.pip
index 30b52845..74c6bf9a 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -5,7 +5,7 @@ pytest-cov
 pytest-xdist[psutil]
 
 # Optional Packages
-Markdown >= 3.1
+Markdown==3.3.3
 BeautifulSoup4
 lxml
 typogrify

From 8bb5f1b786b6f2b22d1dc4501796d6df9a658a05 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 15 Jan 2021 13:19:19 +0100
Subject: [PATCH 2412/2864] Drop unsupported Python 3.5 from test matrix

---
 .github/workflows/main.yml | 2 --
 setup.py                   | 1 -
 tox.ini                    | 3 +--
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5c284a6d..468f1654 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,8 +15,6 @@ jobs:
     strategy:
       matrix:
         config:
-          - os: ubuntu
-            python: 3.5
           - os: ubuntu
             python: 3.6
           - os: ubuntu
diff --git a/setup.py b/setup.py
index b4e769c0..89225f21 100755
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,6 @@ setup(
         'License :: OSI Approved :: GNU Affero General Public License v3',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
diff --git a/tox.ini b/tox.ini
index b4664e98..f917476b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py{3.5,3.6,3.7,3.8,3.9},docs,flake8
+envlist = py{3.6,3.7,3.8,3.9},docs,flake8
 
 [testenv]
 basepython =
-    py3.5: python3.5
     py3.6: python3.6
     py3.7: python3.7
     py3.8: python3.8

From f846191edddabb6996c4a15490439f3b2ade1249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mirek=20D=C5=82ugosz?= <mirek@mirekdlugosz.com>
Date: Mon, 8 Feb 2021 22:16:25 +0100
Subject: [PATCH 2413/2864] livereload task improvements

- use custom build command, with caching turned on - this reduces site
  build time by around 40% on my testing machines
- collect all glob patterns in a list and then call `server.watch`
  on each item - this allows to have single place where callback
  function must be specified
- use '**/*.html' as glob in template, to track changes in
  subdirectories
---
 pelican/tools/templates/tasks.py.jinja2 | 32 +++++++++++++++----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index b65f01d2..ff8e526e 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -99,23 +99,31 @@ def preview(c):
 def livereload(c):
     """Automatically reload browser tab upon file modification."""
     from livereload import Server
-    build(c)
+
+    def cached_build():
+        cmd = '-s {settings_base} -e CACHE_CONTENT=True LOAD_CONTENT_CACHE=True'
+        pelican_run(cmd.format(**CONFIG))
+
+    cached_build()
     server = Server()
-    # Watch the base settings file
-    server.watch(CONFIG['settings_base'], lambda: build(c))
-    # Watch content source files
+    theme_path = SETTINGS['THEME']
+    watched_globs = [
+        CONFIG['settings_base'],
+        '{}/templates/**/*.html'.format(theme_path),
+    ]
+
     content_file_extensions = ['.md', '.rst']
     for extension in content_file_extensions:
-        content_blob = '{0}/**/*{1}'.format(SETTINGS['PATH'], extension)
-        server.watch(content_blob, lambda: build(c))
-    # Watch the theme's templates and static assets
-    theme_path = SETTINGS['THEME']
-    server.watch('{}/templates/*.html'.format(theme_path), lambda: build(c))
+        content_glob = '{0}/**/*{1}'.format(SETTINGS['PATH'], extension)
+        watched_globs.append(content_glob)
+
     static_file_extensions = ['.css', '.js']
     for extension in static_file_extensions:
-        static_file = '{0}/static/**/*{1}'.format(theme_path, extension)
-        server.watch(static_file, lambda: build(c))
-    # Serve output path on configured host and port
+        static_file_glob = '{0}/static/**/*{1}'.format(theme_path, extension)
+        watched_globs.append(static_file_glob)
+
+    for glob in watched_globs:
+        server.watch(glob, cached_build)
     server.serve(host=CONFIG['host'], port=CONFIG['port'], root=CONFIG['deploy_path'])
 
 {% if cloudfiles %}

From aa7c821c7084252ae6e0d9b5b6bfff78f03ec7a9 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 12 Feb 2021 21:17:42 +0300
Subject: [PATCH 2414/2864] ignore None return value from get_generators signal

---
 pelican/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 8f050a2c..cb91eb59 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -181,10 +181,10 @@ class Pelican:
         for receiver, values in signals.get_generators.send(self):
             if not isinstance(values, Iterable):
                 values = (values,)
-
-            discovered_generators.extend(
-                [(generator, receiver.__module__) for generator in values]
-            )
+            for generator in values:
+                if generator is None:
+                    continue  # plugin did not return a generator
+                discovered_generators.append((generator, receiver.__module__))
 
         # StaticGenerator must run last, so it can identify files that
         # were skipped by the other generators, and so static files can

From 27762d2cf70fd76f0f3f76ea02b7cf8bfa4e1236 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 18 Feb 2021 12:29:18 +0100
Subject: [PATCH 2415/2864] Make PKG_PATH var in Invoke tasks.py more DRY

---
 tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks.py b/tasks.py
index 1d511859..c7e4f42c 100644
--- a/tasks.py
+++ b/tasks.py
@@ -5,7 +5,7 @@ from shutil import which
 from invoke import task
 
 PKG_NAME = "pelican"
-PKG_PATH = Path("pelican")
+PKG_PATH = Path(PKG_NAME)
 DOCS_PORT = os.environ.get("DOCS_PORT", 8000)
 BIN_DIR = "bin" if os.name != "nt" else "Scripts"
 ACTIVE_VENV = os.environ.get("VIRTUAL_ENV", None)

From 68817845b048f160bb65887aaa8da1f5308da5fa Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 18 Feb 2021 12:30:44 +0100
Subject: [PATCH 2416/2864] Change FAQ entry to new Tag Cloud plugin repo

---
 docs/faq.rst | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 94a553ad..5ad372c5 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -218,7 +218,7 @@ which will make it compare the file checksums in a much faster way than Pelican
 would.
 
 When only several specific output files are of interest (e.g. when working on
-some specific page or the theme templates), the `WRITE_SELECTED` option may
+some specific page or the theme templates), the ``WRITE_SELECTED`` option may
 help, see :ref:`writing_only_selected_content`.
 
 How to process only a subset of all articles?
@@ -232,11 +232,10 @@ command similar to ``cd content; find -name '*.md' | head -n 10``.
 My tag-cloud is missing/broken since I upgraded Pelican
 =======================================================
 
-In an ongoing effort to streamline Pelican, `tag_cloud` generation has been
-moved out of the pelican core and into a separate `plugin
-<https://github.com/getpelican/pelican-plugins/tree/master/tag_cloud>`_. See
-the :ref:`plugins` documentation further information about the Pelican plugin
-system.
+In an ongoing effort to streamline Pelican, tag cloud generation has been
+moved out of Pelican core and into a separate `plugin
+<https://github.com/pelican-plugins/tag-cloud>`_. See the :ref:`plugins`
+documentation for further information about the Pelican plugin system.
 
 Since I upgraded Pelican my pages are no longer rendered
 ========================================================

From cdec5305729c461721f4bea1477bbc4df776caf0 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 18 Feb 2021 15:06:29 +0100
Subject: [PATCH 2417/2864] Add .yaml file extension to EditorConfig

---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index b42ca8c2..edb13c8a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,5 +11,5 @@ trim_trailing_whitespace = true
 [*.py]
 max_line_length = 79
 
-[*.yml]
+[*.{yml,yaml}]
 indent_size = 2

From 872c4dbd30fd0d891a850ae8685b73139c83bcbd Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 18 Feb 2021 15:16:36 +0100
Subject: [PATCH 2418/2864] Update Pygments dev dependency to v2.8

---
 pyproject.toml        | 2 +-
 requirements/test.pip | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 63fe09ba..5a1de530 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,7 +50,7 @@ sphinx = "^3.0"
 sphinx_rtd_theme = "^0.5"
 livereload = "^2.6"
 psutil = {version = "^5.7", optional = true}
-pygments = "~2.7.4"
+pygments = "~2.8"
 pytest = "^6.0"
 pytest-cov = "^2.8"
 pytest-pythonpath = "^0.7.3"
diff --git a/requirements/test.pip b/requirements/test.pip
index 74c6bf9a..0ecfdc3c 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,5 +1,5 @@
 # Tests
-Pygments==2.7.4
+Pygments==2.8.0
 pytest
 pytest-cov
 pytest-xdist[psutil]

From 0db5afb920bd8c3b840e363a3a3eac1ea7804c20 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 18 Feb 2021 15:18:45 +0100
Subject: [PATCH 2419/2864] Update functional test output for Pygments 2.8

---
 pelican/tests/output/basic/category/misc.html             | 2 +-
 pelican/tests/output/basic/feeds/all-en.atom.xml          | 6 +++---
 pelican/tests/output/basic/feeds/all.atom.xml             | 6 +++---
 pelican/tests/output/basic/feeds/misc.atom.xml            | 6 +++---
 pelican/tests/output/basic/index.html                     | 2 +-
 pelican/tests/output/basic/unbelievable.html              | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau3.html | 2 +-
 pelican/tests/output/custom/category/misc.html            | 2 +-
 .../tests/output/custom/feeds/alexis-metaireau.atom.xml   | 8 ++++----
 .../tests/output/custom/feeds/alexis-metaireau.rss.xml    | 2 +-
 pelican/tests/output/custom/feeds/all-en.atom.xml         | 8 ++++----
 pelican/tests/output/custom/feeds/all.atom.xml            | 8 ++++----
 pelican/tests/output/custom/feeds/all.rss.xml             | 2 +-
 pelican/tests/output/custom/feeds/misc.atom.xml           | 8 ++++----
 pelican/tests/output/custom/feeds/misc.rss.xml            | 2 +-
 pelican/tests/output/custom/index3.html                   | 2 +-
 pelican/tests/output/custom/unbelievable.html             | 6 +++---
 .../output/custom_locale/author/alexis-metaireau3.html    | 2 +-
 pelican/tests/output/custom_locale/category/misc.html     | 2 +-
 .../output/custom_locale/feeds/alexis-metaireau.atom.xml  | 8 ++++----
 .../output/custom_locale/feeds/alexis-metaireau.rss.xml   | 2 +-
 pelican/tests/output/custom_locale/feeds/all-en.atom.xml  | 8 ++++----
 pelican/tests/output/custom_locale/feeds/all.atom.xml     | 8 ++++----
 pelican/tests/output/custom_locale/feeds/all.rss.xml      | 2 +-
 pelican/tests/output/custom_locale/feeds/misc.atom.xml    | 8 ++++----
 pelican/tests/output/custom_locale/feeds/misc.rss.xml     | 2 +-
 pelican/tests/output/custom_locale/index3.html            | 2 +-
 .../posts/2010/octobre/15/unbelievable/index.html         | 6 +++---
 28 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 4f597888..119f5931 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -81,7 +81,7 @@
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index a0166567..250d75db 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -31,7 +31,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -42,7 +42,7 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 4ab55b48..1abfef18 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -33,7 +33,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -44,7 +44,7 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -57,7 +57,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index b6e4ebd4..2b09bda3 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -6,7 +6,7 @@
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -17,7 +17,7 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index f215dc44..e10477db 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -220,7 +220,7 @@ YEAH !</p>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 378ba077..33e0ad53 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -43,7 +43,7 @@
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
@@ -56,7 +56,7 @@ pelican.conf, it will have nothing in default.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="linenos special"> 8</span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="linenos">  </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="linenos special">10</span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="linenos">  </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="linenos special">12</span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="linenos">  </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="linenos special">14</span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="linenos">  </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="linenos special">16</span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="linenos">  </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="linenos special">18</span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="linenos">  </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="linenos special">20</span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="linenos">  </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="linenos special">22</span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="linenos">  </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="linenos special">24</span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="linenos">  </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="linenos special">26</span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="linenos">  </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index c8ee5759..407c1a51 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -50,7 +50,7 @@
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 78b9837c..053599ed 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -94,7 +94,7 @@
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index ad2ec539..a9aa4d38 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -31,7 +31,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -42,20 +42,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index e5042f26..1ea22155 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -19,7 +19,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 99b21a5a..3054a950 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -31,7 +31,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -42,20 +42,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 730e9de4..f340f71f 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -33,7 +33,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -44,20 +44,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 479f67ba..e93d4753 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -21,7 +21,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index a2740fdd..b5a006e7 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -6,7 +6,7 @@
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -17,20 +17,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 1c427eea..b9958cdb 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -6,7 +6,7 @@
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index ce73759d..de32dbe3 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -50,7 +50,7 @@
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index da3b7d29..a103868e 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -50,20 +50,20 @@
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.</p>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table><p>Lovely.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="linenos special"> 8</span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="linenos">  </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="linenos special">10</span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="linenos">  </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="linenos special">12</span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="linenos">  </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="linenos special">14</span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="linenos">  </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="linenos special">16</span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="linenos">  </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="linenos special">18</span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="linenos">  </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="linenos special">20</span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="linenos">  </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="linenos special">22</span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="linenos">  </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="linenos special">24</span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="linenos">  </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="linenos special">26</span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="linenos">  </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index d43663bd..ab91c56a 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -50,7 +50,7 @@
 <a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index c9fc111f..eb98db2a 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -94,7 +94,7 @@
 <a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 54e1c1e2..a2ee64e6 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -31,7 +31,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -42,20 +42,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index 6cbd64db..6b360712 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -19,7 +19,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 2c08dde0..a768d4e6 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -31,7 +31,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -42,20 +42,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index bbb04753..4680594a 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -33,7 +33,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -44,20 +44,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index 8e7dd649..dc4ef033 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -21,7 +21,7 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index 5c3cdb50..eb7a72f7 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -6,7 +6,7 @@
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
@@ -17,20 +17,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index 041c7687..6ac30929 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -6,7 +6,7 @@
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;1&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 97ca0bb4..45ea5a89 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -50,7 +50,7 @@
 <a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 663fb397..407d457f 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -50,20 +50,20 @@
 <a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table></div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.</p>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1</pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
 </td></tr></table><p>Lovely.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><span class="linenos special"> 8</span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="linenos">  </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="linenos special">10</span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="linenos">  </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="linenos special">12</span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="linenos">  </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="linenos special">14</span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="linenos">  </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="linenos special">16</span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="linenos">  </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="linenos special">18</span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="linenos">  </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="linenos special">20</span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="linenos">  </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="linenos special">22</span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="linenos">  </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="linenos special">24</span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="linenos">  </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="linenos special">26</span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="linenos">  </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">

From 31398d4247d4d7f78c5ee2e15145af3ffe9cacc0 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 19 Feb 2021 08:22:16 +0100
Subject: [PATCH 2420/2864] Improve consistency between Makefile targets & help

---
 pelican/tools/templates/Makefile.jinja2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index a60f1e16..df5b2643 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -69,8 +69,11 @@ help:
 	@echo '   make serve [PORT=8000]              serve site at http://localhost:8000'
 	@echo '   make serve-global [SERVER=0.0.0.0]  serve (as root) to $(SERVER):80    '
 	@echo '   make devserver [PORT=8000]          serve and regenerate together      '
+	@echo '   make devserver-global               regenerate and serve on 0.0.0.0    '
+{% if ssh %}
 	@echo '   make ssh_upload                     upload the web site via SSH        '
 	@echo '   make rsync_upload                   upload the web site via rsync+ssh  '
+{% endif %}
 {% if dropbox %}
 	@echo '   make dropbox_upload                 upload the web site via Dropbox    '
 {% endif %}

From 4b6b5f046166899ed7eb2c3c15db058690b7b650 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 19 Feb 2021 09:31:04 +0100
Subject: [PATCH 2421/2864] Clarify ARTICLE_ORDER_BY documentation

---
 docs/settings.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 080856e3..c66c42a3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1134,10 +1134,11 @@ Ordering content
 
    Defines how the articles (``articles_page.object_list`` in the template) are
    sorted. Valid options are: metadata as a string (use ``reversed-`` prefix
-   the reverse the sort order), special option ``'basename'`` which will use
-   the basename of the file (without path) or a custom function to extract the
-   sorting key from articles. The default value, ``'reversed-date'``, will sort
-   articles by date in reverse order (i.e. newest article comes first).
+   to reverse the sort order), special option ``'basename'`` which will use
+   the basename of the file (without path), or a custom function to extract the
+   sorting key from articles. Using a value of ``'date'`` will sort articles in
+   chronological order, while the default value, ``'reversed-date'``, will sort
+   articles by date in reverse order (i.e., newest article comes first).
 
 .. data:: PAGE_ORDER_BY = 'basename'
 

From ce4994bec8b4124a610b947281b35edcb11babc8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 19 Mar 2021 12:58:58 +0100
Subject: [PATCH 2422/2864] [Docs] Fix link to More Categories plugin

---
 docs/importer.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index b8313f49..7b839d30 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -24,8 +24,8 @@ not be converted (as Pelican also supports Markdown).
 
    Unlike Pelican, Wordpress supports multiple categories per article. These
    are imported as a comma-separated string. You have to resolve these
-   manually, or use a plugin that enables multiple categories per article
-   (like `more_categories`_).
+   manually, or use a plugin such as `More Categories`_ that enables multiple
+   categories per article.
 
 Dependencies
 ============
@@ -140,4 +140,4 @@ To test the module, one can use sample files:
 - for WordPress: https://www.wpbeginner.com/wp-themes/how-to-add-dummy-content-for-theme-development-in-wordpress/
 - for Dotclear: http://media.dotaddict.org/tda/downloads/lorem-backup.txt
 
-.. _more_categories: https://github.com/getpelican/pelican-plugins/tree/master/more_categories
+.. _More Categories: https://github.com/pelican-plugins/more-categories

From 2b08497c3237e7d98366f529d62c6b52d2a75227 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 23 Mar 2021 08:06:58 +0100
Subject: [PATCH 2423/2864] Relax dependency minimum versions

Specifying a floor, but not a ceiling, for core dependencies should help
prevent dependency resolution conflicts. Dependencies that affect
functional test output are pinned more tightly.
---
 .github/workflows/main.yml |  6 +++---
 pyproject.toml             | 23 ++++++++++++-----------
 requirements/test.pip      |  4 ++--
 setup.py                   |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 468f1654..53841102 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -86,7 +86,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: "3.x"
       - name: Set pip cache (Linux)
         uses: actions/cache@v1
         if: startsWith(runner.os, 'Linux')
@@ -110,7 +110,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: "3.x"
       - name: Set pip cache (Linux)
         uses: actions/cache@v1
         if: startsWith(runner.os, 'Linux')
@@ -136,7 +136,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: "3.x"
       - name: Check release
         id: check_release
         run: |
diff --git a/pyproject.toml b/pyproject.toml
index 5a1de530..0d2460b3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,20 +31,21 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.6"
-blinker = "^1.4"
-docutils = "^0.16"
-feedgenerator = "^1.9"
-jinja2 = "~2.11"
-pygments = "^2.6"
-python-dateutil = "^2.8"
-pytz = "^2020.1"
-unidecode = "^1.1"
-markdown = {version = "^3.2", optional = true}
+blinker = ">=1.4"
+docutils = ">=0.16"
+feedgenerator = ">=1.9"
+jinja2 = ">=2.7"
+pygments = ">=2.6"
+python-dateutil = ">=2.8"
+pytz = ">=2020.1"
+unidecode = ">=1.1"
+markdown = {version = ">=3.1", optional = true}
 
 [tool.poetry.dev-dependencies]
 BeautifulSoup4 = "^4.9"
+jinja2 = "~2.11"
 lxml = "^4.3"
-markdown = "~3.3.3"
+markdown = "~3.3.4"
 typogrify = "^2.0"
 sphinx = "^3.0"
 sphinx_rtd_theme = "^0.5"
@@ -56,7 +57,7 @@ pytest-cov = "^2.8"
 pytest-pythonpath = "^0.7.3"
 pytest-sugar = "^0.9.4"
 pytest-xdist = "^2.0"
-tox = "^3.13"
+tox = {version = "^3.13", optional = true}
 flake8 = "^3.8"
 flake8-import-order = "^0.18.1"
 invoke = "^1.3"
diff --git a/requirements/test.pip b/requirements/test.pip
index 0ecfdc3c..2d666b25 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,11 +1,11 @@
 # Tests
-Pygments==2.8.0
+Pygments==2.8.1
 pytest
 pytest-cov
 pytest-xdist[psutil]
 
 # Optional Packages
-Markdown==3.3.3
+Markdown==3.3.4
 BeautifulSoup4
 lxml
 typogrify
diff --git a/setup.py b/setup.py
index 89225f21..1be77c92 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ from setuptools import find_packages, setup
 
 version = "4.5.4"
 
-requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.11', 'pygments',
+requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',
             'python-dateutil']
 

From 1449840199febf204c81fd0357dbcfe2b80dc549 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 23 Mar 2021 08:23:07 +0100
Subject: [PATCH 2424/2864] Make Tox & GitHub CI jobs' Python versions match

Otherwise results in InterpreterNotFound errors
---
 .github/workflows/main.yml | 6 +++---
 tox.ini                    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 53841102..7e178b57 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -86,7 +86,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.x"
+          python-version: 3.7
       - name: Set pip cache (Linux)
         uses: actions/cache@v1
         if: startsWith(runner.os, 'Linux')
@@ -110,7 +110,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.x"
+          python-version: 3.7
       - name: Set pip cache (Linux)
         uses: actions/cache@v1
         if: startsWith(runner.os, 'Linux')
@@ -136,7 +136,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.x"
+          python-version: 3.7
       - name: Check release
         id: check_release
         run: |
diff --git a/tox.ini b/tox.ini
index f917476b..bb45229c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ commands =
     pytest -s --cov=pelican pelican
 
 [testenv:docs]
-basepython = python3.6
+basepython = python3.7
 deps =
     -rrequirements/docs.pip
 changedir = docs
@@ -36,7 +36,7 @@ import-order-style = cryptography
 max-line-length = 88
 
 [testenv:flake8]
-basepython = python3.6
+basepython = python3.7
 deps =
     -rrequirements/style.pip
 commands =

From 9a9dbcf523b719981aa489f7878500b07c8a9b0b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 23 Mar 2021 09:24:07 +0100
Subject: [PATCH 2425/2864] Prepare release

---
 RELEASE.md         | 6 ++++++
 docs/changelog.rst | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..be31d839
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,6 @@
+Release type: minor
+
+* Add new URL pattern to ``PAGINATION_PATTERNS`` for the last page in the list `(#1401) <https://github.com/getpelican/pelican/issues/1401>`_
+* Speed up ``livereload`` Invoke task via caching `(#2847) <https://github.com/getpelican/pelican/pull/2847>`_
+* Ignore ``None`` return value from ``get_generators`` signal `(#2850) <https://github.com/getpelican/pelican/pull/2850>`_
+* Relax dependency minimum versions and remove upper bounds
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c302d837..206554ae 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,7 @@ Release history
 4.5.4 - 2021-01-04
 ==================
 
-Replace plugin definitions in settings with string representations after registering, so they can be cached correctly (#2828).
+Replace plugin definitions in settings with string representations after registering, so they can be cached correctly `(#2828) <https://github.com/getpelican/pelican/issues/2828>`_.
 
 4.5.3 - 2020-12-01
 ==================

From 1219bcd029a9386fdc2a398b79a72e60fb1fdb08 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Tue, 23 Mar 2021 10:31:21 +0000
Subject: [PATCH 2426/2864] Release Pelican 4.6.0

---
 RELEASE.md         | 6 ------
 docs/changelog.rst | 8 ++++++++
 pyproject.toml     | 2 +-
 setup.py           | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index be31d839..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Release type: minor
-
-* Add new URL pattern to ``PAGINATION_PATTERNS`` for the last page in the list `(#1401) <https://github.com/getpelican/pelican/issues/1401>`_
-* Speed up ``livereload`` Invoke task via caching `(#2847) <https://github.com/getpelican/pelican/pull/2847>`_
-* Ignore ``None`` return value from ``get_generators`` signal `(#2850) <https://github.com/getpelican/pelican/pull/2850>`_
-* Relax dependency minimum versions and remove upper bounds
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 206554ae..fc673d90 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,14 @@
 Release history
 ###############
 
+4.6.0 - 2021-03-23
+==================
+
+* Add new URL pattern to ``PAGINATION_PATTERNS`` for the last page in the list `(#1401) <https://github.com/getpelican/pelican/issues/1401>`_
+* Speed up ``livereload`` Invoke task via caching `(#2847) <https://github.com/getpelican/pelican/pull/2847>`_
+* Ignore ``None`` return value from ``get_generators`` signal `(#2850) <https://github.com/getpelican/pelican/pull/2850>`_
+* Relax dependency minimum versions and remove upper bounds
+
 4.5.4 - 2021-01-04
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index 0d2460b3..32dd56e3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.5.4"
+version = "4.6.0"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index 1be77c92..0f991daf 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from os.path import join, relpath
 from setuptools import find_packages, setup
 
 
-version = "4.5.4"
+version = "4.6.0"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',

From cf4e8d527d6468fad5c4910d254642c3353a2f76 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Sun, 18 Apr 2021 22:20:54 -0600
Subject: [PATCH 2427/2864] Update tasks.py

PTY is not supported on Windows.
---
 tasks.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tasks.py b/tasks.py
index c7e4f42c..12116da3 100644
--- a/tasks.py
+++ b/tasks.py
@@ -42,7 +42,8 @@ def docserve(c):
 @task
 def tests(c):
     """Run the test suite"""
-    c.run(f"{VENV_BIN}/pytest", pty=True)
+    PTY = True if os.name != "nt" else False
+    c.run(f"{VENV_BIN}/pytest", pty=PTY)
 
 
 @task

From 88953d45d55d55ee7e79804749a40d47aa08c412 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 19 Apr 2021 09:49:03 +0200
Subject: [PATCH 2428/2864] Strip HTML tags from `notmyidea` page template's
 title

Fixes #2843
---
 pelican/themes/notmyidea/templates/page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/notmyidea/templates/page.html b/pelican/themes/notmyidea/templates/page.html
index 7e50c1f6..428c47f1 100644
--- a/pelican/themes/notmyidea/templates/page.html
+++ b/pelican/themes/notmyidea/templates/page.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block html_lang %}{{ page.lang }}{% endblock %}
-{% block title %}{{ page.title }}{% endblock %}
+{% block title %}{{ page.title|striptags }}{% endblock %}
 
 {% block extra_head %}
 {% import 'translations.html' as translations with context %}

From a00284f744450623f20e0409a98b07c2d5ccc2e6 Mon Sep 17 00:00:00 2001
From: Romain Porte <microjoe@microjoe.org>
Date: Mon, 19 Apr 2021 15:59:41 +0200
Subject: [PATCH 2429/2864] Automatically open browser when Invoke task starts
 web server (#2764)

When the `serve` and `livereload` targets are invoked, a web browser will be
automatically opened, pointing to the locally-served website.

If no web browser can be found by the module, the `open()` call returns
`False`, but no exception is raised. This means that it is still possible
to call livereload on a remote machine and access it without any error
being triggered.

Signed-off-by: Romain Porte <microjoe@microjoe.org>
---
 pelican/tools/templates/tasks.py.jinja2 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index ff8e526e..861dee37 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -13,6 +13,7 @@ from pelican import main as pelican_main
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import DEFAULT_CONFIG, get_settings_from_file
 
+OPEN_BROWSER_ON_SERVE = True
 SETTINGS_FILE_BASE = 'pelicanconf.py'
 SETTINGS = {}
 SETTINGS.update(DEFAULT_CONFIG)
@@ -81,6 +82,11 @@ def serve(c):
         (CONFIG['host'], CONFIG['port']),
         ComplexHTTPRequestHandler)
 
+    if OPEN_BROWSER_ON_SERVE:
+        # Open site in default browser
+        import webbrowser
+        webbrowser.open("http://{host}:{port}".format(**CONFIG))
+
     sys.stderr.write('Serving at {host}:{port} ...\n'.format(**CONFIG))
     server.serve_forever()
 
@@ -124,6 +130,12 @@ def livereload(c):
 
     for glob in watched_globs:
         server.watch(glob, cached_build)
+
+    if OPEN_BROWSER_ON_SERVE:
+        # Open site in default browser
+        import webbrowser
+        webbrowser.open("http://{host}:{port}".format(**CONFIG))
+
     server.serve(host=CONFIG['host'], port=CONFIG['port'], root=CONFIG['deploy_path'])
 
 {% if cloudfiles %}

From c461def10ac480647097b9ce09ffcff711f1e9b8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 21 Apr 2021 09:57:08 +0200
Subject: [PATCH 2430/2864] Update to v2 of `cache` GitHub Action

---
 .github/workflows/main.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7e178b57..863dec4b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,16 +34,16 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.config.python }}
-      - name: Set pip cache (Linux)
-        uses: actions/cache@v1
+      - name: Set up Pip cache (Linux)
+        uses: actions/cache@v2
         if: startsWith(runner.os, 'Linux')
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements/*') }}
           restore-keys: |
             ${{ runner.os }}-pip-
-      - name: Setup pip cache (macOS)
-        uses: actions/cache@v1
+      - name: Set up Pip cache (macOS)
+        uses: actions/cache@v2
         if: startsWith(runner.os, 'macOS')
         with:
           path: ~/Library/Caches/pip
@@ -51,7 +51,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Setup pip cache (Windows)
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         if: startsWith(runner.os, 'Windows')
         with:
           path: ~\AppData\Local\pip\Cache
@@ -88,7 +88,7 @@ jobs:
         with:
           python-version: 3.7
       - name: Set pip cache (Linux)
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         if: startsWith(runner.os, 'Linux')
         with:
           path: ~/.cache/pip
@@ -112,7 +112,7 @@ jobs:
         with:
           python-version: 3.7
       - name: Set pip cache (Linux)
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         if: startsWith(runner.os, 'Linux')
         with:
           path: ~/.cache/pip

From fd3ad0c16e19b0b024bd375a1cbd0870701dda3d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 21 Apr 2021 10:05:28 +0200
Subject: [PATCH 2431/2864] Update contributing docs and Poetry repository URL

---
 docs/contribute.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index a86a5031..d1ab322d 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -24,7 +24,7 @@ Please note that Python 3.6+ is required for Pelican development.
 *(Optional)* If you prefer to install Poetry once for use with multiple projects,
 you can install it via::
 
-    curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
+    curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
 
 Point your web browser to the `Pelican repository`_ and tap the **Fork** button
 at top-right. Then clone the source for your fork and add the upstream project
@@ -38,9 +38,9 @@ as a Git remote::
 While Poetry can dynamically create and manage virtual environments, we're going
 to manually create and activate a virtual environment::
 
-    mkdir ~/virtualenvs
-    python3 -m venv ~/virtualenvs/pelican
-    source ~/virtualenvs/pelican/bin/activate
+    mkdir ~/virtualenvs && cd ~/virtualenvs
+    python3 -m venv pelican
+    source ~/virtualenvs/pelican/*/activate
 
 Install the needed dependencies and set up the project::
 

From 14afc6c54a7e361bbc465fdc25511831cce29812 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 21 Apr 2021 10:16:28 +0200
Subject: [PATCH 2432/2864] Update Pelican feature documentation

---
 README.rst     | 10 ++++++----
 docs/index.rst | 16 +++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.rst b/README.rst
index 995d23b0..4e1f1812 100644
--- a/README.rst
+++ b/README.rst
@@ -12,16 +12,17 @@ Pelican is a static site generator, written in Python_.
 Features
 --------
 
-Pelican currently supports:
+Pelican’s feature highlights include:
 
 * Chronological content (e.g., articles, blog posts) as well as static pages
-* Integration with external services (e.g., Google Analytics and Disqus)
+* Integration with external services
 * Site themes (created using Jinja2_ templates)
 * Publication of articles in multiple languages
 * Generation of Atom and RSS feeds
-* Syntax highlighting via Pygments_
-* Importing existing content from WordPress, Dotclear, and other services
+* Code syntax highlighting via Pygments_
+* Import existing content from WordPress, Dotclear, or RSS feeds
 * Fast rebuild times due to content caching and selective output writing
+* Extensible via a rich plugin ecosystem: `Pelican Plugins`_
 
 Check out `Pelican's documentation`_ for further information.
 
@@ -52,6 +53,7 @@ Why the name "Pelican"?
 .. _Markdown: https://daringfireball.net/projects/markdown/
 .. _Jinja2: https://palletsprojects.com/p/jinja/
 .. _Pygments: https://pygments.org/
+.. _`Pelican Plugins`: https://github.com/pelican-plugins
 .. _`Pelican's documentation`: https://docs.getpelican.com/
 .. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html
 .. _`hosted on GitHub`: https://github.com/getpelican/pelican
diff --git a/docs/index.rst b/docs/index.rst
index 4cbe41ae..e64ffd7e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -23,19 +23,17 @@ Ready to get started? Check out the :doc:`Quickstart<quickstart>` guide.
 Features
 --------
 
-Pelican |version| currently supports:
+Pelican’s feature highlights include:
 
 * Articles (e.g., blog posts) and pages (e.g., "About", "Projects", "Contact")
-* Comments, via an external service (Disqus). If you prefer to have more
-  control over your comment data, self-hosted comments are another option.
-  Check out the `Pelican Plugins`_ repository for more details.
-* Theming support (themes are created using Jinja2_ templates)
+* Integration with external services
+* Site themes (created using Jinja2_ templates)
 * Publication of articles in multiple languages
-* Atom/RSS feeds
+* Generation of Atom and RSS feeds
 * Code syntax highlighting
-* Import from WordPress, Dotclear, or RSS feeds
-* Integration with external tools: Twitter, Google Analytics, etc. (optional)
+* Import existing content from WordPress, Dotclear, or RSS feeds
 * Fast rebuild times thanks to content caching and selective output writing
+* Extensible via a rich plugin ecosystem: `Pelican Plugins`_
 
 Why the name "Pelican"?
 -----------------------
@@ -82,4 +80,4 @@ Documentation
 .. _Jinja2: https://palletsprojects.com/p/jinja/
 .. _`Pelican documentation`: https://docs.getpelican.com/latest/
 .. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html
-.. _`Pelican plugins`: https://github.com/getpelican/pelican-plugins
+.. _`Pelican Plugins`: https://github.com/pelican-plugins

From 40f3d2df91e847ccbc64d015fe837650055b67bd Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 21 Apr 2021 09:51:06 +0200
Subject: [PATCH 2433/2864] Add progress spinner animation during generation

This is a first step at enriching console output via the `rich` project.
---
 pelican/__init__.py | 6 +++++-
 pyproject.toml      | 1 +
 setup.py            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index cb91eb59..6302fe21 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -13,6 +13,8 @@ from collections.abc import Iterable
 from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
 
+from rich.console import Console
+
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import init as init_logging
@@ -35,6 +37,7 @@ except Exception:
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 logger = logging.getLogger(__name__)
+console = Console()
 
 
 class Pelican:
@@ -524,7 +527,8 @@ def main(argv=None):
         else:
             watcher = FileSystemWatcher(args.settings, Readers, settings)
             watcher.check()
-            pelican.run()
+            with console.status("Generating..."):
+                pelican.run()
     except KeyboardInterrupt:
         logger.warning('Keyboard interrupt received. Exiting.')
     except Exception as e:
diff --git a/pyproject.toml b/pyproject.toml
index 32dd56e3..99b1d5d4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,6 +38,7 @@ jinja2 = ">=2.7"
 pygments = ">=2.6"
 python-dateutil = ">=2.8"
 pytz = ">=2020.1"
+rich = ">=10.1"
 unidecode = ">=1.1"
 markdown = {version = ">=3.1", optional = true}
 
diff --git a/setup.py b/setup.py
index 0f991daf..5ffd0fdf 100755
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ version = "4.6.0"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',
-            'python-dateutil']
+            'python-dateutil', 'rich']
 
 entry_points = {
     'console_scripts': [

From 487da3550bffb96ebfed9dbf206d8b3574886a21 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <encukou@gmail.com>
Date: Tue, 29 Dec 2020 19:22:37 +0100
Subject: [PATCH 2434/2864] Add period_num var for period_archives template

This makes it easier to create templates that are language-agnostic
or need extra processing for the date period.
---
 docs/themes.rst                  | 2 ++
 pelican/generators.py            | 2 ++
 pelican/tests/test_generators.py | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/docs/themes.rst b/docs/themes.rst
index 86a754bc..0c053fce 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -327,6 +327,8 @@ period                  A tuple of the form (`year`, `month`, `day`) that
                         given year. It contains both `year` and `month`
                         if the time period is over years and months and
                         so on.
+period_num              A tuple of the form (``year``, ``month``, ``day``),
+                        as in ``period``, except all values are numbers.
 
 ===================     ===================================================
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 63e20a0a..07370264 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -511,6 +511,7 @@ class ArticlesGenerator(CachingGenerator):
 
                 if key == period_date_key['year']:
                     context["period"] = (_period,)
+                    context["period_num"] = (_period,)
                 else:
                     month_name = calendar.month_name[_period[1]]
                     if key == period_date_key['month']:
@@ -520,6 +521,7 @@ class ArticlesGenerator(CachingGenerator):
                         context["period"] = (_period[0],
                                              month_name,
                                              _period[2])
+                    context["period_num"] = tuple(_period)
 
                 write(save_as, template, context, articles=articles,
                       dates=archive, template_name='period_archives',
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 169765ac..be43aa0e 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -413,6 +413,7 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertEqual(len(dates), 1)
         # among other things it must have at least been called with this
         context["period"] = (1970,)
+        context["period_num"] = (1970,)
         write.assert_called_with("posts/1970/index.html",
                                  generator.get_template("period_archives"),
                                  context, blog=True, articles=articles,
@@ -437,6 +438,7 @@ class TestArticlesGenerator(unittest.TestCase):
                     if d.date.year == 1970 and d.date.month == 1]
         self.assertEqual(len(dates), 1)
         context["period"] = (1970, "January")
+        context["period_num"] = (1970, 1)
         # among other things it must have at least been called with this
         write.assert_called_with("posts/1970/Jan/index.html",
                                  generator.get_template("period_archives"),
@@ -470,6 +472,7 @@ class TestArticlesGenerator(unittest.TestCase):
         ]
         self.assertEqual(len(dates), 1)
         context["period"] = (1970, "January", 1)
+        context["period_num"] = (1970, 1, 1)
         # among other things it must have at least been called with this
         write.assert_called_with("posts/1970/Jan/01/index.html",
                                  generator.get_template("period_archives"),

From add3628a6474f2bd145fe2ea55c5e5255e9970ba Mon Sep 17 00:00:00 2001
From: Gio <sethg@ipi.org>
Date: Fri, 16 Apr 2021 19:07:35 -0500
Subject: [PATCH 2435/2864] Add support for hidden articles

---
 docs/content.rst                        |  8 +++++++
 docs/themes.rst                         |  7 +++---
 pelican/__init__.py                     |  8 ++++++-
 pelican/contents.py                     |  6 ++---
 pelican/generators.py                   | 31 +++++++++++++++++++------
 pelican/tests/content/article_draft.md  |  5 ++++
 pelican/tests/content/article_hidden.md |  5 ++++
 pelican/tests/test_generators.py        | 14 +++++++++++
 8 files changed, 70 insertions(+), 14 deletions(-)
 create mode 100644 pelican/tests/content/article_draft.md
 create mode 100644 pelican/tests/content/article_hidden.md

diff --git a/docs/content.rst b/docs/content.rst
index 48c851ab..cd492012 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -614,6 +614,14 @@ the ``DEFAULT_METADATA``::
 To publish a post when the default status is ``draft``, update the post's
 metadata to include ``Status: published``.
 
+Hidden Posts
+============
+
+Like pages, posts can also be marked as ``hidden`` with the ``Status: hidden``
+attribute. Hidden posts will be output to ``ARTICLE_SAVE_AS`` as expected, but
+are not included by default in tag or category indexes, nor in the main
+article feed. This has the effect of creating an "unlisted" post.
+
 .. _W3C ISO 8601: https://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: https://www.methods.co.nz/asciidoc/
 .. _pelican-plugins: https://github.com/getpelican/pelican-plugins
diff --git a/docs/themes.rst b/docs/themes.rst
index 0c053fce..c4d3ed7f 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -66,9 +66,9 @@ Common variables
 
 All of these settings will be available to all templates.
 
-=============   ===================================================
+=============== ===================================================
 Variable        Description
-=============   ===================================================
+=============== ===================================================
 output_file     The name of the file currently being generated. For
                 instance, when Pelican is rendering the home page,
                 output_file will be "index.html".
@@ -80,6 +80,7 @@ articles        The list of articles, ordered descending by date.
                 in the `all_articles` variable.
 dates           The same list of articles, but ordered by date,
                 ascending.
+hidden_articles The list of hidden articles
 drafts          The list of draft articles
 authors         A list of (author, articles) tuples, containing all
                 the authors and corresponding articles (values)
@@ -90,7 +91,7 @@ tags            A list of (tag, articles) tuples, containing all
 pages           The list of pages
 hidden_pages    The list of hidden pages
 draft_pages     The list of draft pages
-=============   ===================================================
+=============== ===================================================
 
 
 Sorting
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 6302fe21..735002a2 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -144,6 +144,11 @@ class Pelican:
              len(articles_generator.drafts_translations)),
             'draft',
             'drafts')
+        pluralized_hidden_articles = maybe_pluralize(
+            (len(articles_generator.hidden_articles) +
+             len(articles_generator.hidden_translations)),
+            'hidden article',
+            'hidden articles')
         pluralized_pages = maybe_pluralize(
             (len(pages_generator.pages) +
              len(pages_generator.translations)),
@@ -160,10 +165,11 @@ class Pelican:
             'draft page',
             'draft pages')
 
-        print('Done: Processed {}, {}, {}, {} and {} in {:.2f} seconds.'
+        print('Done: Processed {}, {}, {}, {}, {} and {} in {:.2f} seconds.'
               .format(
                     pluralized_articles,
                     pluralized_drafts,
+                    pluralized_hidden_articles,
                     pluralized_pages,
                     pluralized_hidden_pages,
                     pluralized_draft_pages,
diff --git a/pelican/contents.py b/pelican/contents.py
index 75cedcdc..1740df88 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -181,9 +181,9 @@ class Content:
         if hasattr(self, 'allowed_statuses'):
             if self.status not in self.allowed_statuses:
                 logger.error(
-                    "Unknown status '%s' for file %s, skipping it.",
+                    "Unknown status '%s' for file %s, skipping it. (Not in %s)",
                     self.status,
-                    self
+                    self, self.allowed_statuses
                 )
                 return False
 
@@ -513,7 +513,7 @@ class Page(Content):
 
 class Article(Content):
     mandatory_properties = ('title', 'date', 'category')
-    allowed_statuses = ('published', 'draft')
+    allowed_statuses = ('published', 'hidden', 'draft')
     default_status = 'published'
     default_template = 'article'
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 07370264..85bc3d95 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -285,15 +285,20 @@ class ArticlesGenerator(CachingGenerator):
 
     def __init__(self, *args, **kwargs):
         """initialize properties"""
+        # Published, listed articles
         self.articles = []                 # only articles in default language
         self.translations = []
+        # Published, unlisted articles
+        self.hidden_articles = []
+        self.hidden_translations = []
+        # Draft articles
+        self.drafts = []                   # only drafts in default language
+        self.drafts_translations = []
         self.dates = {}
         self.tags = defaultdict(list)
         self.categories = defaultdict(list)
         self.related_posts = []
         self.authors = defaultdict(list)
-        self.drafts = []                   # only drafts in default language
-        self.drafts_translations = []
         super().__init__(*args, **kwargs)
         signals.article_generator_init.send(self)
 
@@ -461,7 +466,10 @@ class ArticlesGenerator(CachingGenerator):
 
     def generate_articles(self, write):
         """Generate the articles."""
-        for article in chain(self.translations, self.articles):
+        for article in chain(
+            self.translations, self.articles,
+            self.hidden_translations, self.hidden_articles
+        ):
             signals.article_generator_write_article.send(self, content=article)
             write(article.save_as, self.get_template(article.template),
                   self.context, article=article, category=article.category,
@@ -609,6 +617,7 @@ class ArticlesGenerator(CachingGenerator):
 
         all_articles = []
         all_drafts = []
+        hidden_articles = []
         for f in self.get_files(
                 self.settings['ARTICLE_PATHS'],
                 exclude=self.settings['ARTICLE_EXCLUDES']):
@@ -639,6 +648,9 @@ class ArticlesGenerator(CachingGenerator):
                 all_articles.append(article)
             elif article.status == "draft":
                 all_drafts.append(article)
+            elif article.status == "hidden":
+                hidden_articles.append(article)
+
             self.add_source_path(article)
             self.add_static_links(article)
 
@@ -649,13 +661,14 @@ class ArticlesGenerator(CachingGenerator):
             return origs, translations
 
         self.articles, self.translations = _process(all_articles)
+        self.hidden_articles, self.hidden_translations = _process(hidden_articles)
         self.drafts, self.drafts_translations = _process(all_drafts)
 
         signals.article_generator_pretaxonomy.send(self)
 
         for article in self.articles:
             # only main articles are listed in categories and tags
-            # not translations
+            # not translations or hidden articles
             self.categories[article.category].append(article)
             if hasattr(article, 'tags'):
                 for tag in article.tags:
@@ -677,8 +690,10 @@ class ArticlesGenerator(CachingGenerator):
         self.authors = list(self.authors.items())
         self.authors.sort()
 
-        self._update_context(('articles', 'dates', 'tags', 'categories',
-                              'authors', 'related_posts', 'drafts'))
+        self._update_context((
+            'articles', 'drafts', 'hidden_articles',
+            'dates', 'tags', 'categories',
+            'authors', 'related_posts'))
         self.save_cache()
         self.readers.save_cache()
         signals.article_generator_finalized.send(self)
@@ -692,7 +707,9 @@ class ArticlesGenerator(CachingGenerator):
         for e in chain(self.articles,
                        self.translations,
                        self.drafts,
-                       self.drafts_translations):
+                       self.drafts_translations,
+                       self.hidden_articles,
+                       self.hidden_translations):
             if hasattr(e, 'refresh_metadata_intersite_links'):
                 e.refresh_metadata_intersite_links()
 
diff --git a/pelican/tests/content/article_draft.md b/pelican/tests/content/article_draft.md
new file mode 100644
index 00000000..d2235553
--- /dev/null
+++ b/pelican/tests/content/article_draft.md
@@ -0,0 +1,5 @@
+Title: Draft article
+Date: 2012-10-31
+Status: draft
+
+This is some content.
diff --git a/pelican/tests/content/article_hidden.md b/pelican/tests/content/article_hidden.md
new file mode 100644
index 00000000..d449f701
--- /dev/null
+++ b/pelican/tests/content/article_hidden.md
@@ -0,0 +1,5 @@
+Title: Hidden article
+Date: 2012-10-31
+Status: hidden
+
+This is some unlisted content.
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index be43aa0e..0a4a8fdc 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -181,6 +181,8 @@ class TestArticlesGenerator(unittest.TestCase):
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         cls.generator.generate_context()
         cls.articles = cls.distill_articles(cls.generator.articles)
+        cls.drafts = cls.distill_articles(cls.generator.drafts)
+        cls.hidden_articles = cls.distill_articles(cls.generator.hidden_articles)
 
     def setUp(self):
         self.temp_cache = mkdtemp(prefix='pelican_cache.')
@@ -284,6 +286,18 @@ class TestArticlesGenerator(unittest.TestCase):
         ]
         self.assertEqual(sorted(articles_expected), sorted(self.articles))
 
+    def test_articles_draft(self):
+        draft_articles_expected = [
+            ['Draft article', 'draft', 'Default', 'article'],
+        ]
+        self.assertEqual(sorted(draft_articles_expected), sorted(self.drafts))
+
+    def test_articles_hidden(self):
+        hidden_articles_expected = [
+            ['Hidden article', 'hidden', 'Default', 'article'],
+        ]
+        self.assertEqual(sorted(hidden_articles_expected), sorted(self.hidden_articles))
+
     def test_generate_categories(self):
         # test for name
         # categories are grouped by slug; if two categories have the same slug

From c41b8abb133b85db83515bfe259e7fac5c4a7b7f Mon Sep 17 00:00:00 2001
From: jzc <justincai.lps@gmail.com>
Date: Thu, 20 May 2021 00:11:58 -0600
Subject: [PATCH 2436/2864] Fix FILENAME_METADATA doc to render correctly

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c66c42a3..a26dc1ba 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -815,7 +815,7 @@ Metadata
 
    The default metadata you want to use for all articles and pages.
 
-.. data:: FILENAME_METADATA = r'(?P<date>\d{4}-\d{2}-\d{2}).*'
+.. data:: FILENAME_METADATA = r'(?P<date>\\d{4}-\\d{2}-\\d{2}).*'
 
    The regexp that will be used to extract any metadata from the filename. All
    named groups that are matched will be set in the metadata object.  The

From c041bf2192dbf95cb2ac63f1ea979a0d955690b7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 8 Jun 2021 11:40:27 -0500
Subject: [PATCH 2437/2864] Fix failing tests on Jinja 3+

---
 pelican/utils.py   | 2 +-
 pelican/writers.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index e82117d3..8c3a886d 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -18,7 +18,7 @@ from operator import attrgetter
 
 import dateutil.parser
 
-from jinja2 import Markup
+from markupsafe import Markup
 
 import pytz
 
diff --git a/pelican/writers.py b/pelican/writers.py
index 9b27a748..73f025b6 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -5,7 +5,7 @@ from urllib.parse import urljoin
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed, get_tag_uri
 
-from jinja2 import Markup
+from markupsafe import Markup
 
 from pelican.paginator import Paginator
 from pelican.plugins import signals

From 845acfe1ac7c156513d928b01e4acdad0c47f6ee Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Mon, 7 Jun 2021 21:46:15 -0600
Subject: [PATCH 2438/2864] Allow easy subclassing of Writer

When you write a custom Writer, it gets called with `settings=None`. If you writer is simply a subclass of the built-in Writer, Pelican will through the error `CRITICAL: 'RELATIVE_URLS'`.

The source of the error is from `Pelican._get_writer()` in `__init__.py`.
---
 pelican/writers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 73f025b6..73ee4b33 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -25,7 +25,7 @@ class Writer:
         self._overridden_files = set()
 
         # See Content._link_replacer for details
-        if self.settings['RELATIVE_URLS']:
+        if "RELATIVE_URLS" in self.settings and self.settings['RELATIVE_URLS']:
             self.urljoiner = posix_join
         else:
             self.urljoiner = lambda base, url: urljoin(

From e800b23b4d9ec45663dbac6c5cb4775b0cacdb57 Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Sat, 12 Jun 2021 15:48:32 +0200
Subject: [PATCH 2439/2864] Update links to Jinja docs. Fixes #2883 (#2885)

---
 docs/settings.rst | 8 ++++----
 docs/themes.rst   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index a26dc1ba..e685d55d 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -759,9 +759,9 @@ Time and Date
 
 .. [#] Default is the system locale.
 
-.. _Jinja custom filters documentation: https://jinja.palletsprojects.com/en/master/api/#custom-filters
-.. _Jinja global namespace documentation: https://jinja.palletsprojects.com/en/master/api/#the-global-namespace
-.. _Jinja custom tests documentation: https://jinja.palletsprojects.com/en/master/api/#custom-tests
+.. _Jinja custom filters documentation: https://jinja.palletsprojects.com/en/latest/api/#custom-filters
+.. _Jinja global namespace documentation: https://jinja.palletsprojects.com/en/latest/api/#the-global-namespace
+.. _Jinja custom tests documentation: https://jinja.palletsprojects.com/en/latest/api/#custom-tests
 
 .. _locales on Windows: https://www.microsoft.com/en-us/download/details.aspx?id=55979
 
@@ -1403,5 +1403,5 @@ Example settings
     :language: python
 
 
-.. _Jinja Environment documentation: https://jinja.palletsprojects.com/en/master/api/#jinja2.Environment
+.. _Jinja Environment documentation: https://jinja.palletsprojects.com/en/latest/api/#jinja2.Environment
 .. _Docutils Configuration: http://docutils.sourceforge.net/docs/user/config.html
diff --git a/docs/themes.rst b/docs/themes.rst
index c4d3ed7f..e21a6c79 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -105,7 +105,7 @@ that allow them to be easily sorted by name::
 If you want to sort based on different criteria, `Jinja's sort command`__ has a
 number of options.
 
-__ https://jinja.palletsprojects.com/en/master/templates/#sort
+__ https://jinja.palletsprojects.com/en/latest/templates/#sort
 
 
 Date Formatting

From 2cafe926fa854b5b8c84b944d77b628574a2ec61 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Tue, 15 Jun 2021 22:41:38 -0600
Subject: [PATCH 2440/2864] typo fix

"current" only has two "r"s
---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 85bc3d95..e18531be 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -206,7 +206,7 @@ class Generator:
         self.context['static_links'] |= content.get_static_links()
 
     def _update_context(self, items):
-        """Update the context with the given items from the currrent
+        """Update the context with the given items from the current
         processor.
         """
         for item in items:

From 80f44c494a4d6aba21bafcd908d2f1cc930e3e87 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Wed, 30 Jun 2021 22:47:32 -0600
Subject: [PATCH 2441/2864] Switch to rich logging

---
 pelican/__init__.py |   8 +--
 pelican/log.py      | 115 +++++---------------------------------------
 2 files changed, 17 insertions(+), 106 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 735002a2..d3969e29 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -43,7 +43,7 @@ console = Console()
 class Pelican:
 
     def __init__(self, settings):
-        """Pelican initialisation
+        """Pelican initialization
 
         Performs some checks on the environment before doing anything else.
         """
@@ -500,7 +500,7 @@ def listen(server, port, output, excqueue=None):
 def main(argv=None):
     args = parse_arguments(argv)
     logs_dedup_min_level = getattr(logging, args.logs_dedup_min_level)
-    init_logging(args.verbosity, args.fatal,
+    init_logging(level=args.verbosity, fatal=args.fatal, name=__name__,
                  logs_dedup_min_level=logs_dedup_min_level)
 
     logger.debug('Pelican version: %s', __version__)
@@ -538,9 +538,9 @@ def main(argv=None):
     except KeyboardInterrupt:
         logger.warning('Keyboard interrupt received. Exiting.')
     except Exception as e:
-        logger.critical('%s', e)
+        logger.critical("%s: %s" % (e.__class__.__name__, e))
 
         if args.verbosity == logging.DEBUG:
-            raise
+            console.print_exception()
         else:
             sys.exit(getattr(e, 'exitcode', 1))
diff --git a/pelican/log.py b/pelican/log.py
index 325ac3ea..111ce777 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,82 +1,13 @@
 import logging
-import os
-import sys
 from collections import defaultdict
-from collections.abc import Mapping
+
+from rich.logging import RichHandler
 
 __all__ = [
     'init'
 ]
 
 
-class BaseFormatter(logging.Formatter):
-    def __init__(self, fmt=None, datefmt=None):
-        FORMAT = '%(customlevelname)s %(message)s'
-        super().__init__(fmt=FORMAT, datefmt=datefmt)
-
-    def format(self, record):
-        customlevel = self._get_levelname(record.levelname)
-        record.__dict__['customlevelname'] = customlevel
-        # format multiline messages 'nicely' to make it clear they are together
-        record.msg = record.msg.replace('\n', '\n  | ')
-        if not isinstance(record.args, Mapping):
-            record.args = tuple(arg.replace('\n', '\n  | ') if
-                                isinstance(arg, str) else
-                                arg for arg in record.args)
-        return super().format(record)
-
-    def formatException(self, ei):
-        ''' prefix traceback info for better representation '''
-        s = super().formatException(ei)
-        # fancy format traceback
-        s = '\n'.join('  | ' + line for line in s.splitlines())
-        # separate the traceback from the preceding lines
-        s = '  |___\n{}'.format(s)
-        return s
-
-    def _get_levelname(self, name):
-        ''' NOOP: overridden by subclasses '''
-        return name
-
-
-class ANSIFormatter(BaseFormatter):
-    ANSI_CODES = {
-        'red': '\033[1;31m',
-        'yellow': '\033[1;33m',
-        'cyan': '\033[1;36m',
-        'white': '\033[1;37m',
-        'bgred': '\033[1;41m',
-        'bggrey': '\033[1;100m',
-        'reset': '\033[0;m'}
-
-    LEVEL_COLORS = {
-        'INFO': 'cyan',
-        'WARNING': 'yellow',
-        'ERROR': 'red',
-        'CRITICAL': 'bgred',
-        'DEBUG': 'bggrey'}
-
-    def _get_levelname(self, name):
-        color = self.ANSI_CODES[self.LEVEL_COLORS.get(name, 'white')]
-        if name == 'INFO':
-            fmt = '{0}->{2}'
-        else:
-            fmt = '{0}{1}{2}:'
-        return fmt.format(color, name, self.ANSI_CODES['reset'])
-
-
-class TextFormatter(BaseFormatter):
-    """
-    Convert a `logging.LogRecord' object into text.
-    """
-
-    def _get_levelname(self, name):
-        if name == 'INFO':
-            return '->'
-        else:
-            return name + ':'
-
-
 class LimitFilter(logging.Filter):
     """
     Remove duplicates records, and limit the number of records in the same
@@ -169,40 +100,20 @@ logging.setLoggerClass(FatalLogger)
 logging.getLogger().__class__ = FatalLogger
 
 
-def supports_color():
-    """
-    Returns True if the running system's terminal supports color,
-    and False otherwise.
-
-    from django.core.management.color
-    """
-    plat = sys.platform
-    supported_platform = plat != 'Pocket PC' and \
-        (plat != 'win32' or 'ANSICON' in os.environ)
-
-    # isatty is not always implemented, #6223.
-    is_a_tty = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty()
-    if not supported_platform or not is_a_tty:
-        return False
-    return True
-
-
-def get_formatter():
-    if supports_color():
-        return ANSIFormatter()
-    else:
-        return TextFormatter()
-
-
-def init(level=None, fatal='', handler=logging.StreamHandler(), name=None,
+def init(level=None, fatal='', handler=RichHandler(), name=None,
          logs_dedup_min_level=None):
     FatalLogger.warnings_fatal = fatal.startswith('warning')
     FatalLogger.errors_fatal = bool(fatal)
 
-    logger = logging.getLogger(name)
+    LOG_FORMAT = "%(message)s"
+    logging.basicConfig(
+        level=level,
+        format=LOG_FORMAT,
+        datefmt="[%H:%M:%S]",
+        handlers=[handler]
+    )
 
-    handler.setFormatter(get_formatter())
-    logger.addHandler(handler)
+    logger = logging.getLogger(name)
 
     if level:
         logger.setLevel(level)
@@ -218,9 +129,9 @@ def log_warnings():
 
 
 if __name__ == '__main__':
-    init(level=logging.DEBUG)
+    init(level=logging.DEBUG, name=__name__)
 
-    root_logger = logging.getLogger()
+    root_logger = logging.getLogger(__name__)
     root_logger.debug('debug')
     root_logger.info('info')
     root_logger.warning('warning')

From 4bfcedb8a543fa8ecd509446efb3c80e36841f6a Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Wed, 30 Jun 2021 23:03:22 -0600
Subject: [PATCH 2442/2864] Share rich handler between spinner and logging

---
 pelican/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index d3969e29..c4e2580b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -14,6 +14,7 @@ from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
 
 from rich.console import Console
+from rich.logging import RichHandler
 
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
@@ -500,7 +501,8 @@ def listen(server, port, output, excqueue=None):
 def main(argv=None):
     args = parse_arguments(argv)
     logs_dedup_min_level = getattr(logging, args.logs_dedup_min_level)
-    init_logging(level=args.verbosity, fatal=args.fatal, name=__name__,
+    init_logging(level=args.verbosity, fatal=args.fatal,
+                 handler=RichHandler(console=console), name=__name__,
                  logs_dedup_min_level=logs_dedup_min_level)
 
     logger.debug('Pelican version: %s', __version__)

From 7d492bad67d78f4d08afa58abf1d1f83198c15fb Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Wed, 30 Jun 2021 23:29:20 -0600
Subject: [PATCH 2443/2864] Remove log format test

as *rich* is now doing this
---
 pelican/tests/test_log.py | 50 ---------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/pelican/tests/test_log.py b/pelican/tests/test_log.py
index 3f9d7250..1f2fb83a 100644
--- a/pelican/tests/test_log.py
+++ b/pelican/tests/test_log.py
@@ -12,12 +12,10 @@ class TestLog(unittest.TestCase):
         super().setUp()
         self.logger = logging.getLogger(__name__)
         self.handler = LogCountHandler()
-        self.handler.setFormatter(log.get_formatter())
         self.logger.addHandler(self.handler)
 
     def tearDown(self):
         self._reset_limit_filter()
-        self.logger.removeHandler(self.handler)
         super().tearDown()
 
     def _reset_limit_filter(self):
@@ -34,54 +32,6 @@ class TestLog(unittest.TestCase):
             self._reset_limit_filter()
             self.handler.flush()
 
-    def test_log_formatter(self):
-        counter = self.handler.count_formatted_logs
-        with self.reset_logger():
-            # log simple case
-            self.logger.warning('Log %s', 'test')
-            self.assertEqual(
-                counter('Log test', logging.WARNING),
-                1)
-
-        with self.reset_logger():
-            # log multiline message
-            self.logger.warning('Log\n%s', 'test')
-            # Log
-            # | test
-            self.assertEqual(
-                counter('Log', logging.WARNING),
-                1)
-            self.assertEqual(
-                counter(' | test', logging.WARNING),
-                1)
-
-        with self.reset_logger():
-            # log multiline argument
-            self.logger.warning('Log %s', 'test1\ntest2')
-            # Log test1
-            # | test2
-            self.assertEqual(
-                counter('Log test1', logging.WARNING),
-                1)
-            self.assertEqual(
-                counter(' | test2', logging.WARNING),
-                1)
-
-        with self.reset_logger():
-            # log single list
-            self.logger.warning('Log %s', ['foo', 'bar'])
-            self.assertEqual(
-                counter(r"Log \['foo', 'bar'\]", logging.WARNING),
-                1)
-
-        with self.reset_logger():
-            # log single dict
-            self.logger.warning('Log %s', {'foo': 1, 'bar': 2})
-            self.assertEqual(
-                # dict order is not guaranteed
-                counter(r"Log {'.*': \d, '.*': \d}", logging.WARNING),
-                1)
-
     def test_log_filter(self):
         def do_logging():
             for i in range(5):

From 82098a634f24c0a73192e1c82fe8f3c54f36f472 Mon Sep 17 00:00:00 2001
From: Tristan Miller <psychonaut@nothingisreal.com>
Date: Wed, 7 Jul 2021 08:48:10 +0200
Subject: [PATCH 2444/2864] Fix formatting of Jinja example code. Fixes #2884
 (#2886)

---
 docs/settings.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index e685d55d..47852527 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -104,6 +104,7 @@ Basic settings
    should map the filtername to the filter function.
 
    Example::
+
     import sys
     sys.path.append('to/your/path')
 

From a52922bfb597a4799cecff4641a5a2f9c40d99aa Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 8 Jul 2021 21:33:22 -0600
Subject: [PATCH 2445/2864] Move rich's console to log.py

---
 pelican/__init__.py | 11 +++--------
 pelican/log.py      |  5 ++++-
 pelican/utils.py    |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index c4e2580b..e4ff92be 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -13,11 +13,9 @@ from collections.abc import Iterable
 from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
 
-from rich.console import Console
-from rich.logging import RichHandler
-
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
+from pelican.log import console
 from pelican.log import init as init_logging
 from pelican.generators import (ArticlesGenerator,  # noqa: I100
                                 PagesGenerator, SourceFileGenerator,
@@ -38,7 +36,6 @@ except Exception:
 
 DEFAULT_CONFIG_NAME = 'pelicanconf.py'
 logger = logging.getLogger(__name__)
-console = Console()
 
 
 class Pelican:
@@ -502,8 +499,7 @@ def main(argv=None):
     args = parse_arguments(argv)
     logs_dedup_min_level = getattr(logging, args.logs_dedup_min_level)
     init_logging(level=args.verbosity, fatal=args.fatal,
-                 handler=RichHandler(console=console), name=__name__,
-                 logs_dedup_min_level=logs_dedup_min_level)
+                 name=__name__, logs_dedup_min_level=logs_dedup_min_level)
 
     logger.debug('Pelican version: %s', __version__)
     logger.debug('Python version: %s', sys.version.split()[0])
@@ -544,5 +540,4 @@ def main(argv=None):
 
         if args.verbosity == logging.DEBUG:
             console.print_exception()
-        else:
-            sys.exit(getattr(e, 'exitcode', 1))
+        sys.exit(getattr(e, 'exitcode', 1))
diff --git a/pelican/log.py b/pelican/log.py
index 111ce777..be176ea8 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,12 +1,15 @@
 import logging
 from collections import defaultdict
 
+from rich.console import Console
 from rich.logging import RichHandler
 
 __all__ = [
     'init'
 ]
 
+console = Console()
+
 
 class LimitFilter(logging.Filter):
     """
@@ -100,7 +103,7 @@ logging.setLoggerClass(FatalLogger)
 logging.getLogger().__class__ = FatalLogger
 
 
-def init(level=None, fatal='', handler=RichHandler(), name=None,
+def init(level=None, fatal='', handler=RichHandler(console=console), name=None,
          logs_dedup_min_level=None):
     FatalLogger.warnings_fatal = fatal.startswith('warning')
     FatalLogger.errors_fatal = bool(fatal)
diff --git a/pelican/utils.py b/pelican/utils.py
index 8c3a886d..e5c64470 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -811,7 +811,7 @@ class FileSystemWatcher:
         if result.get('content') is None:
             reader_descs = sorted(
                 {
-                    '%s (%s)' % (type(r).__name__, ', '.join(r.file_extensions))
+                    '  | %s (%s)' % (type(r).__name__, ', '.join(r.file_extensions))
                     for r in self.reader_class(self.settings).readers.values()
                     if r.enabled
                 }

From 7eb730af78b0a5375e077c6f02f4440bc4578d48 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Tue, 6 Jul 2021 21:31:54 -0600
Subject: [PATCH 2446/2864] Nicer logging of found writer

matches generator format
---
 pelican/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index e4ff92be..4014e971 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -222,7 +222,7 @@ class Pelican:
 
         writer = writers[0]
 
-        logger.debug("Found writer: %s", writer)
+        logger.debug("Found writer: %s (%s)" % (writer.__name__, writer.__module__))
         return writer(self.output_path, settings=self.settings)
 
 

From 58e3770b80a1e9649f29a0081041a81984e8f983 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Fri, 9 Jul 2021 08:28:15 -0600
Subject: [PATCH 2447/2864] Document how to add a new writer

c.f. #2899
---
 docs/plugins.rst | 27 +++++++++++++++++++++++++++
 docs/tips.rst    | 10 +++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index f661afb8..8e24b0af 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -274,6 +274,33 @@ Adding a new generator is also really easy. You might want to have a look at
         signals.get_generators.connect(get_generators)
 
 
+Adding a new writer
+-------------------
+
+Adding a writer will allow you to output additional file formats to disk, or
+change how the existing formats are written to disk. Note that only one writer
+will be active at a time, so be sure to either subclass the built-in Writer, or
+completely re-implement it.
+
+Here is a basic example of how to set up your own writer::
+
+    from pelican.writers import Writer
+    from pelican import signals
+
+    class MyWriter(Writer):
+        # define new writer functionality
+        pass
+
+
+    def add_writer(pelican_object):
+        # use pelican_instance to setup stuff if needed
+        return MyWriter
+
+
+    def register():
+        signals.get_writer.connect(add_writer)
+
+
 .. _Pip: https://pip.pypa.io/
 .. _pelican-plugins bug #314: https://github.com/getpelican/pelican-plugins/issues/314
 .. _Blinker: https://pythonhosted.org/blinker/
diff --git a/docs/tips.rst b/docs/tips.rst
index 18a79ef0..78013227 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -93,21 +93,21 @@ by the ``ghp-import`` command) to the ``elemoine.github.io`` repository's
 
     To publish your Pelican site as User Pages, feel free to adjust the
     ``github`` target of the Makefile.
-    
+
 Another option for publishing to User Pages is to generate the output files in
 the root directory of the project.
 
 For example, your main project folder is ``<username>.github.io`` and you can
 create the Pelican project in a subdirectory called ``Pelican``. Then from
 inside the ``Pelican`` folder you can run::
-    
+
     $ pelican content -o .. -s pelicanconf.py
 
 Now you can push the whole project ``<username>.github.io`` to the master
 branch of your GitHub repository::
-    
+
     $ git push origin master
-    
+
 (assuming origin is set to your remote repository).
 
 Custom 404 Pages
@@ -179,4 +179,4 @@ If you are using ``develop-server.sh``,  add this to the top::
 
 and modify the ``pelican.server`` line as follows::
 
-    $PY -m pelican.server $port --ssl --cert="$CERT" --key="$KEY" &
\ No newline at end of file
+    $PY -m pelican.server $port --ssl --cert="$CERT" --key="$KEY" &

From bc21922cf217c4e05f9c28fbc30349271735798e Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Fri, 9 Jul 2021 09:51:06 -0600
Subject: [PATCH 2448/2864] Don't preformat log messages

as per review notes
---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 4014e971..31f98e52 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -222,7 +222,7 @@ class Pelican:
 
         writer = writers[0]
 
-        logger.debug("Found writer: %s (%s)" % (writer.__name__, writer.__module__))
+        logger.debug("Found writer: %s (%s)", writer.__name__, writer.__module__)
         return writer(self.output_path, settings=self.settings)
 
 
@@ -536,7 +536,7 @@ def main(argv=None):
     except KeyboardInterrupt:
         logger.warning('Keyboard interrupt received. Exiting.')
     except Exception as e:
-        logger.critical("%s: %s" % (e.__class__.__name__, e))
+        logger.critical("%s: %s", e.__class__.__name__, e)
 
         if args.verbosity == logging.DEBUG:
             console.print_exception()

From 1cd7dd6a28998f0c003d938d68ae8b1081f6b9ac Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Fri, 9 Jul 2021 09:55:48 -0600
Subject: [PATCH 2449/2864] Print to the (rich) console, rather than directly

---
 pelican/__init__.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 31f98e52..ebf90b79 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -163,15 +163,15 @@ class Pelican:
             'draft page',
             'draft pages')
 
-        print('Done: Processed {}, {}, {}, {}, {} and {} in {:.2f} seconds.'
-              .format(
-                    pluralized_articles,
-                    pluralized_drafts,
-                    pluralized_hidden_articles,
-                    pluralized_pages,
-                    pluralized_hidden_pages,
-                    pluralized_draft_pages,
-                    time.time() - start_time))
+        console.print('Done: Processed {}, {}, {}, {}, {} and {} in {:.2f} seconds.'
+                      .format(
+                              pluralized_articles,
+                              pluralized_drafts,
+                              pluralized_hidden_articles,
+                              pluralized_pages,
+                              pluralized_hidden_pages,
+                              pluralized_draft_pages,
+                              time.time() - start_time))
 
     def _get_generator_classes(self):
         discovered_generators = [
@@ -426,8 +426,8 @@ def get_instance(args):
 
 
 def autoreload(args, excqueue=None):
-    print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
-          ' `settings` for changes. ---')
+    console.print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
+                  ' `settings` for changes. ---')
     pelican, settings = get_instance(args)
     watcher = FileSystemWatcher(args.settings, Readers, settings)
     sleep = False
@@ -446,8 +446,8 @@ def autoreload(args, excqueue=None):
                 watcher.update_watchers(settings)
 
             if any(modified.values()):
-                print('\n-> Modified: {}. re-generating...'.format(
-                    ', '.join(k for k, v in modified.items() if v)))
+                console.print('\n-> Modified: {}. re-generating...'.format(
+                              ', '.join(k for k, v in modified.items() if v)))
                 pelican.run()
 
         except KeyboardInterrupt:

From a168470f294575655750776335da189697cec84b Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Fri, 9 Jul 2021 09:56:11 -0600
Subject: [PATCH 2450/2864] Use rich.console with printing settings

---
 pelican/__init__.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index ebf90b79..6c2c3051 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -228,26 +228,33 @@ class Pelican:
 
 class PrintSettings(argparse.Action):
     def __call__(self, parser, namespace, values, option_string):
-        instance, settings = get_instance(namespace)
+        init_logging(name=__name__)
+
+        try:
+            instance, settings = get_instance(namespace)
+        except Exception as e:
+            logger.critical("%s: %s", e.__class__.__name__, e)
+            console.print_exception()
+            sys.exit(getattr(e, 'exitcode', 1))
 
         if values:
             # One or more arguments provided, so only print those settings
             for setting in values:
                 if setting in settings:
                     # Only add newline between setting name and value if dict
-                    if isinstance(settings[setting], dict):
+                    if isinstance(settings[setting], (dict, tuple, list)):
                         setting_format = '\n{}:\n{}'
                     else:
                         setting_format = '\n{}: {}'
-                    print(setting_format.format(
+                    console.print(setting_format.format(
                         setting,
                         pprint.pformat(settings[setting])))
                 else:
-                    print('\n{} is not a recognized setting.'.format(setting))
+                    console.print('\n{} is not a recognized setting.'.format(setting))
                     break
         else:
             # No argument was given to --print-settings, so print all settings
-            pprint.pprint(settings)
+            console.print(settings)
 
         parser.exit()
 

From 332be6e5c8005f699a708568939d31dd85e9cffb Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Tue, 13 Jul 2021 01:35:22 -0600
Subject: [PATCH 2451/2864] Support date format codes G, V, and u (used by ISO
 dates) (#2902)

---
 pelican/tests/test_utils.py | 3 +++
 pelican/utils.py            | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 10816199..5fbd066d 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -513,6 +513,9 @@ class TestUtils(LoggedTestCase):
         d = utils.SafeDatetime(2012, 8, 9)
         self.assertEqual(utils.strftime(d, '%-d/%-m/%y'), '9/8/12')
 
+        d = utils.SafeDatetime(2021, 1, 8)
+        self.assertEqual(utils.strftime(d, '%G - %-V - %u'), '2021 - 1 - 5')
+
     # test the output of utils.strftime in a different locale
     # Turkish locale
     @unittest.skipUnless(locale_available('tr_TR.UTF-8') or
diff --git a/pelican/utils.py b/pelican/utils.py
index 8c3a886d..b69cbf95 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -50,7 +50,8 @@ def strftime(date, date_format):
     '''
     def strip_zeros(x):
         return x.lstrip('0') or '0'
-    c89_directives = 'aAbBcdfHIjmMpSUwWxXyYzZ%'
+    # includes ISO date parameters added by Python 3.6
+    c89_directives = 'aAbBcdfGHIjmMpSUuVwWxXyYzZ%'
 
     # grab candidate format options
     format_options = '%[-]?.'

From 438938819e9c64a541e81df1d75ddfa144f92b52 Mon Sep 17 00:00:00 2001
From: Gio <sethg@ipi.org>
Date: Sun, 1 Aug 2021 17:06:34 -0500
Subject: [PATCH 2452/2864] Pickle.dump can raise TypeError (e.g. generators)

---
 pelican/cache.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/cache.py b/pelican/cache.py
index 646f97bc..c1d4a55d 100644
--- a/pelican/cache.py
+++ b/pelican/cache.py
@@ -65,7 +65,7 @@ class FileDataCacher:
                 mkdir_p(self.settings['CACHE_PATH'])
                 with self._cache_open(self._cache_path, 'wb') as fhandle:
                     pickle.dump(self._cache, fhandle)
-            except (OSError, pickle.PicklingError) as err:
+            except (OSError, pickle.PicklingError, TypeError) as err:
                 logger.warning('Could not save cache %s\n ... %s',
                                self._cache_path, err)
 

From 991cebf95dc49098f0c9ccc1d21298fac7663eae Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Tue, 17 Aug 2021 16:26:32 +1000
Subject: [PATCH 2453/2864] Update notmyidea theme to scale down to smaller
 screens

The aim here is to make the theme work respectably on mobile devices
with only modest changes. Providing different layouts at multiple
breakpoints is beyond the scope of this change.

The changes here are:

1. `base.html`: Add a `<meta name="viewport"` element

2. `main.css`:
  * Use "max-width" instead of "width"
  * Set "line-height" on the banner and adjust vertical spacing to match
  * Remove fixed height on the nav bar and force it to contain its
    child elements
---
 pelican/themes/notmyidea/static/css/main.css | 48 +++++++++++---------
 pelican/themes/notmyidea/templates/base.html |  1 +
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index aaea9b81..a4aa51a1 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -147,7 +147,8 @@ aside, nav, article, figure {
 }
 
 /***** Layout *****/
-.body {clear: both; margin: 0 auto; width: 800px;}
+.body {clear: both; margin: 0 auto; max-width: 800px;}
+img { max-width: 100%; }
 img.right, figure.right, div.figure.align-right {
     float: right;
     margin: 0 0 2em 2em;
@@ -159,7 +160,7 @@ img.left, figure.left, div.figure.align-left {
 
 /* .rst support */
 div.figure img, figure img {  /* to fill figure exactly */
-    width: 100%;
+    max-width: 100%;
 }
 div.figure p.caption, figure p.caption { /* margin provided by figure */
     margin-top: 0;
@@ -171,16 +172,21 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 *****************/
 #banner {
 	margin: 0 auto;
-	padding: 2.5em 0 0 0;
+	padding: 0.8em 0 0 0;
 }
 
 	/* Banner */
-	#banner h1 {font-size: 3.571em; line-height: 0;}
+	#banner h1 {
+		font-size: 3.571em;
+		line-height: 1.0;
+		margin-bottom: .3em;
+	}
+
 	#banner h1 a:link, #banner h1 a:visited {
 		color: #000305;
 		display: block;
 		font-weight: bold;
-		margin: 0 0 .6em .2em;
+		margin: 0 0 0 .2em;
 		text-decoration: none;
 	}
 	#banner h1 a:hover, #banner h1 a:active {
@@ -195,19 +201,19 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	#banner nav {
 		background: #000305;
 		font-size: 1.143em;
-		height: 40px;
+		overflow: auto;
 		line-height: 30px;
 		margin: 0 auto 2em auto;
 		padding: 0;
 		text-align: center;
-		width: 800px;
+		max-width: 800px;
 
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
 
-	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
+	#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
 	#banner nav li {float: left; display: inline; margin: 0;}
 
 	#banner nav a:link, #banner nav a:visited {
@@ -242,7 +248,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	margin-bottom: 2em;
 	overflow: hidden;
 	padding: 20px;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
@@ -253,7 +259,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	border: 2px solid #eee;
 	float: right;
 	margin: 0.786em 2em 0 5em;
-	width: 248px;
+	max-width: 248px;
 }
 #featured figure img {display: block; float: right;}
 
@@ -271,7 +277,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	margin-bottom: 2em;
 	overflow: hidden;
 	padding: 20px 20px;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
@@ -305,15 +311,15 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	/* Blogroll */
 	#extras .blogroll {
 		float: left;
-		width: 615px;
+		max-width: 615px;
 	}
 
-	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
+	#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
 
 	/* Social */
 	#extras .social {
 		float: right;
-		width: 175px;
+		max-width: 175px;
 	}
 
 	#extras div[class='social'] a {
@@ -359,20 +365,20 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	overflow: hidden;
 	padding: 20px;
 	text-align: left;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 }
 
-#about .primary {float: left; width: 165px;}
+#about .primary {float: left; max-width: 165px;}
 #about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
 #about .photo {float: left; margin: 5px 20px;}
 
 #about .url:link, #about .url:visited {text-decoration: none;}
 
-#about .bio {float: right; width: 500px;}
+#about .bio {float: right; max-width: 500px;}
 
 /*
 	Footer
@@ -410,7 +416,7 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		position: relative;
         float: left;
 		top: 0.5em;
-		width: 190px;
+		max-width: 190px;
 	}
 
 	/* About the Author */
@@ -453,12 +459,12 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
 
 	/* Add a Comment */
-	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
+	#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
 	#add-comment input[type='text'],
 	#add-comment input[type='email'],
-	#add-comment input[type='url'] {float: left; width: 200px;}
+	#add-comment input[type='url'] {float: left; max-width: 200px;}
 
-	#add-comment textarea {float: left; height: 150px; width: 495px;}
+	#add-comment textarea {float: left; height: 150px; max-width: 495px;}
 
 	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
 
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 6be5f1d8..2b302899 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -3,6 +3,7 @@
 <head>
         {% block head %}
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" />

From 62a878ded3606801b3a86961281fa5cd2a97beca Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Tue, 17 Aug 2021 21:56:18 +1000
Subject: [PATCH 2454/2864] Update tests to match theme changes

---
 .../article_with_nonconformant_meta_tags.html |  1 +
 .../basic/a-markdown-powered-article.html     |  1 +
 pelican/tests/output/basic/archives.html      |  1 +
 pelican/tests/output/basic/article-1.html     |  1 +
 pelican/tests/output/basic/article-2.html     |  1 +
 pelican/tests/output/basic/article-3.html     |  1 +
 .../output/basic/author/alexis-metaireau.html |  1 +
 pelican/tests/output/basic/authors.html       |  1 +
 pelican/tests/output/basic/categories.html    |  1 +
 pelican/tests/output/basic/category/bar.html  |  1 +
 pelican/tests/output/basic/category/cat1.html |  1 +
 pelican/tests/output/basic/category/misc.html |  1 +
 pelican/tests/output/basic/category/yeah.html |  1 +
 .../drafts/a-draft-article-without-date.html  |  1 +
 .../output/basic/drafts/a-draft-article.html  |  1 +
 .../basic/filename_metadata-example.html      |  1 +
 pelican/tests/output/basic/index.html         |  1 +
 pelican/tests/output/basic/oh-yeah-fr.html    |  1 +
 pelican/tests/output/basic/oh-yeah.html       |  1 +
 .../tests/output/basic/override/index.html    |  1 +
 .../pages/this-is-a-test-hidden-page.html     |  1 +
 .../basic/pages/this-is-a-test-page.html      |  1 +
 .../tests/output/basic/second-article-fr.html |  1 +
 .../tests/output/basic/second-article.html    |  1 +
 pelican/tests/output/basic/tag/bar.html       |  1 +
 pelican/tests/output/basic/tag/baz.html       |  1 +
 pelican/tests/output/basic/tag/foo.html       |  1 +
 pelican/tests/output/basic/tag/foobar.html    |  1 +
 pelican/tests/output/basic/tag/oh.html        |  1 +
 pelican/tests/output/basic/tag/yeah.html      |  1 +
 pelican/tests/output/basic/tags.html          |  1 +
 pelican/tests/output/basic/theme/css/main.css | 48 +++++++++++--------
 .../output/basic/this-is-a-super-article.html |  1 +
 pelican/tests/output/basic/unbelievable.html  |  1 +
 .../custom/a-markdown-powered-article.html    |  1 +
 pelican/tests/output/custom/archives.html     |  1 +
 pelican/tests/output/custom/article-1.html    |  1 +
 pelican/tests/output/custom/article-2.html    |  1 +
 pelican/tests/output/custom/article-3.html    |  1 +
 .../custom/author/alexis-metaireau.html       |  1 +
 .../custom/author/alexis-metaireau2.html      |  1 +
 .../custom/author/alexis-metaireau3.html      |  1 +
 pelican/tests/output/custom/authors.html      |  1 +
 pelican/tests/output/custom/categories.html   |  1 +
 pelican/tests/output/custom/category/bar.html |  1 +
 .../tests/output/custom/category/cat1.html    |  1 +
 .../tests/output/custom/category/misc.html    |  1 +
 .../tests/output/custom/category/yeah.html    |  1 +
 .../drafts/a-draft-article-without-date.html  |  1 +
 .../output/custom/drafts/a-draft-article.html |  1 +
 .../custom/filename_metadata-example.html     |  1 +
 pelican/tests/output/custom/index.html        |  1 +
 pelican/tests/output/custom/index2.html       |  1 +
 pelican/tests/output/custom/index3.html       |  1 +
 .../tests/output/custom/jinja2_template.html  |  1 +
 pelican/tests/output/custom/oh-yeah-fr.html   |  1 +
 pelican/tests/output/custom/oh-yeah.html      |  1 +
 .../tests/output/custom/override/index.html   |  1 +
 .../pages/this-is-a-test-hidden-page.html     |  1 +
 .../custom/pages/this-is-a-test-page.html     |  1 +
 .../output/custom/second-article-fr.html      |  1 +
 .../tests/output/custom/second-article.html   |  1 +
 pelican/tests/output/custom/tag/bar.html      |  1 +
 pelican/tests/output/custom/tag/baz.html      |  1 +
 pelican/tests/output/custom/tag/foo.html      |  1 +
 pelican/tests/output/custom/tag/foobar.html   |  1 +
 pelican/tests/output/custom/tag/oh.html       |  1 +
 pelican/tests/output/custom/tag/yeah.html     |  1 +
 pelican/tests/output/custom/tags.html         |  1 +
 .../tests/output/custom/theme/css/main.css    | 48 +++++++++++--------
 .../custom/this-is-a-super-article.html       |  1 +
 pelican/tests/output/custom/unbelievable.html |  1 +
 .../tests/output/custom_locale/archives.html  |  1 +
 .../author/alexis-metaireau.html              |  1 +
 .../author/alexis-metaireau2.html             |  1 +
 .../author/alexis-metaireau3.html             |  1 +
 .../tests/output/custom_locale/authors.html   |  1 +
 .../output/custom_locale/categories.html      |  1 +
 .../output/custom_locale/category/bar.html    |  1 +
 .../output/custom_locale/category/cat1.html   |  1 +
 .../output/custom_locale/category/misc.html   |  1 +
 .../output/custom_locale/category/yeah.html   |  1 +
 .../output/custom_locale/theme/css/main.css   | 48 +++++++++++--------
 83 files changed, 161 insertions(+), 63 deletions(-)

diff --git a/pelican/tests/content/article_with_nonconformant_meta_tags.html b/pelican/tests/content/article_with_nonconformant_meta_tags.html
index 5ed44bbd..b8ef1723 100644
--- a/pelican/tests/content/article_with_nonconformant_meta_tags.html
+++ b/pelican/tests/content/article_with_nonconformant_meta_tags.html
@@ -1,6 +1,7 @@
 <html>
     <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <title>Article with Nonconformant HTML meta tags</title>
         <meta name="summary" content="Summary and stuff" />
diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 894fb8c9..ca9b62eb 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 27cbb73e..93c1d5be 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 5e1196b7..4dee2eb6 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Article 1</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 7dab6907..7e5995c0 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Article 2</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index ba934652..b0b8ed1b 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Article 3</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index a4d7a279..87eaa461 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - Alexis Métaireau</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index f062ccf6..937a3085 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - Authors</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index e9d981c8..930503a8 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - Categories</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 7e272b78..65b7b04e 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - bar</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index eccf5587..62fb034c 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - cat1</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 119f5931..c7e86f19 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - misc</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 31a95629..9d2f30a2 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - yeah</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
index 039f2187..bc30dabd 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A draft article without date</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index 068b414a..4abd4946 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A draft article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 6a6ee389..ae19ceb1 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index e10477db..d67b9826 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/oh-yeah-fr.html b/pelican/tests/output/basic/oh-yeah-fr.html
index 58b933aa..183754ff 100644
--- a/pelican/tests/output/basic/oh-yeah-fr.html
+++ b/pelican/tests/output/basic/oh-yeah-fr.html
@@ -2,6 +2,7 @@
 <html lang="fr">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Trop bien !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 1b8077f8..f63302d2 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index c3613174..1d5531d7 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Override url/save_as</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 21fabf62..8c14e354 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>This is a test hidden page</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index 3970e3ff..1fdb846f 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>This is a test page</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 87b95cc4..b49c4517 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -2,6 +2,7 @@
 <html lang="fr">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Deuxième article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 3e0c5296..2b3bca88 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Second article</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index ead02cd8..a78c08f9 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - bar</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index c891121e..0b7d04ab 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>The baz tag</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 3a00a6ab..6ec55bee 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - foo</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 5418f872..def1d0c6 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - foobar</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index c2de8b5b..11b06e61 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Oh Oh Oh</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 88660359..565a3a25 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - yeah</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index 3f88ce9e..6dce2632 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A Pelican Blog - Tags</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index aaea9b81..a4aa51a1 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -147,7 +147,8 @@ aside, nav, article, figure {
 }
 
 /***** Layout *****/
-.body {clear: both; margin: 0 auto; width: 800px;}
+.body {clear: both; margin: 0 auto; max-width: 800px;}
+img { max-width: 100%; }
 img.right, figure.right, div.figure.align-right {
     float: right;
     margin: 0 0 2em 2em;
@@ -159,7 +160,7 @@ img.left, figure.left, div.figure.align-left {
 
 /* .rst support */
 div.figure img, figure img {  /* to fill figure exactly */
-    width: 100%;
+    max-width: 100%;
 }
 div.figure p.caption, figure p.caption { /* margin provided by figure */
     margin-top: 0;
@@ -171,16 +172,21 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 *****************/
 #banner {
 	margin: 0 auto;
-	padding: 2.5em 0 0 0;
+	padding: 0.8em 0 0 0;
 }
 
 	/* Banner */
-	#banner h1 {font-size: 3.571em; line-height: 0;}
+	#banner h1 {
+		font-size: 3.571em;
+		line-height: 1.0;
+		margin-bottom: .3em;
+	}
+
 	#banner h1 a:link, #banner h1 a:visited {
 		color: #000305;
 		display: block;
 		font-weight: bold;
-		margin: 0 0 .6em .2em;
+		margin: 0 0 0 .2em;
 		text-decoration: none;
 	}
 	#banner h1 a:hover, #banner h1 a:active {
@@ -195,19 +201,19 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	#banner nav {
 		background: #000305;
 		font-size: 1.143em;
-		height: 40px;
+		overflow: auto;
 		line-height: 30px;
 		margin: 0 auto 2em auto;
 		padding: 0;
 		text-align: center;
-		width: 800px;
+		max-width: 800px;
 
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
 
-	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
+	#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
 	#banner nav li {float: left; display: inline; margin: 0;}
 
 	#banner nav a:link, #banner nav a:visited {
@@ -242,7 +248,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	margin-bottom: 2em;
 	overflow: hidden;
 	padding: 20px;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
@@ -253,7 +259,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	border: 2px solid #eee;
 	float: right;
 	margin: 0.786em 2em 0 5em;
-	width: 248px;
+	max-width: 248px;
 }
 #featured figure img {display: block; float: right;}
 
@@ -271,7 +277,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	margin-bottom: 2em;
 	overflow: hidden;
 	padding: 20px 20px;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
@@ -305,15 +311,15 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	/* Blogroll */
 	#extras .blogroll {
 		float: left;
-		width: 615px;
+		max-width: 615px;
 	}
 
-	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
+	#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
 
 	/* Social */
 	#extras .social {
 		float: right;
-		width: 175px;
+		max-width: 175px;
 	}
 
 	#extras div[class='social'] a {
@@ -359,20 +365,20 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	overflow: hidden;
 	padding: 20px;
 	text-align: left;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 }
 
-#about .primary {float: left; width: 165px;}
+#about .primary {float: left; max-width: 165px;}
 #about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
 #about .photo {float: left; margin: 5px 20px;}
 
 #about .url:link, #about .url:visited {text-decoration: none;}
 
-#about .bio {float: right; width: 500px;}
+#about .bio {float: right; max-width: 500px;}
 
 /*
 	Footer
@@ -410,7 +416,7 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		position: relative;
         float: left;
 		top: 0.5em;
-		width: 190px;
+		max-width: 190px;
 	}
 
 	/* About the Author */
@@ -453,12 +459,12 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
 
 	/* Add a Comment */
-	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
+	#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
 	#add-comment input[type='text'],
 	#add-comment input[type='email'],
-	#add-comment input[type='url'] {float: left; width: 200px;}
+	#add-comment input[type='url'] {float: left; max-width: 200px;}
 
-	#add-comment textarea {float: left; height: 150px; width: 495px;}
+	#add-comment textarea {float: left; height: 150px; max-width: 495px;}
 
 	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
 
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index bd1472e4..8681bb1b 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>This is a super article !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 33e0ad53..d623eced 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="/theme/css/main.css" />
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 00aa18e8..36fb242f 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 1e9a8377..e1dad53d 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index cc15ba5c..6f3e0cc1 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Article 1</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index cc331a4d..094471de 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Article 2</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 8b180180..3d93d807 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Article 3</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index f768b15e..95653b66 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 96b34bff..281c7ad8 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 407c1a51..b5b86c42 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index 6374c4a4..303e79c4 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Authors</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 393aef32..543eb1ee 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Categories</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 4511bcb6..bd277a83 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index dc5c0579..73df4388 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - cat1</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 053599ed..dda4c75f 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - misc</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 17e8103e..8bfc1f48 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
index 03aecc56..12ddfbeb 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A draft article without date</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 87be8bec..77b12cf3 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A draft article</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 2fcbe562..2c5e8178 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index ff675f85..076cf519 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 941c176e..13a857a8 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index de32dbe3..147f2ee2 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 1ba06323..cefce74f 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index bb7eb44e..ec75b731 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -2,6 +2,7 @@
 <html lang="fr">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Trop bien !</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index f7afb399..109525a5 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index ebf07d8d..004c38fd 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Override url/save_as</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index e5fa1aaf..652fc7d0 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>This is a test hidden page</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 26c6c0e9..2bcefd3d 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>This is a test page</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 8e360e9c..09f43888 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -2,6 +2,7 @@
 <html lang="fr">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Deuxième article</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 5001f0d0..f21a5495 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Second article</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index b2b22714..1efa16e7 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index ef53c34c..c524db13 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>The baz tag</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 7684fbc5..ca3f40f2 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - foo</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 5816e395..ccca5477 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - foobar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 16ea9d0d..f3c70495 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Oh Oh Oh</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 929a48e0..96767503 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 244c21e3..b23f468f 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Tags</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index aaea9b81..a4aa51a1 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -147,7 +147,8 @@ aside, nav, article, figure {
 }
 
 /***** Layout *****/
-.body {clear: both; margin: 0 auto; width: 800px;}
+.body {clear: both; margin: 0 auto; max-width: 800px;}
+img { max-width: 100%; }
 img.right, figure.right, div.figure.align-right {
     float: right;
     margin: 0 0 2em 2em;
@@ -159,7 +160,7 @@ img.left, figure.left, div.figure.align-left {
 
 /* .rst support */
 div.figure img, figure img {  /* to fill figure exactly */
-    width: 100%;
+    max-width: 100%;
 }
 div.figure p.caption, figure p.caption { /* margin provided by figure */
     margin-top: 0;
@@ -171,16 +172,21 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 *****************/
 #banner {
 	margin: 0 auto;
-	padding: 2.5em 0 0 0;
+	padding: 0.8em 0 0 0;
 }
 
 	/* Banner */
-	#banner h1 {font-size: 3.571em; line-height: 0;}
+	#banner h1 {
+		font-size: 3.571em;
+		line-height: 1.0;
+		margin-bottom: .3em;
+	}
+
 	#banner h1 a:link, #banner h1 a:visited {
 		color: #000305;
 		display: block;
 		font-weight: bold;
-		margin: 0 0 .6em .2em;
+		margin: 0 0 0 .2em;
 		text-decoration: none;
 	}
 	#banner h1 a:hover, #banner h1 a:active {
@@ -195,19 +201,19 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	#banner nav {
 		background: #000305;
 		font-size: 1.143em;
-		height: 40px;
+		overflow: auto;
 		line-height: 30px;
 		margin: 0 auto 2em auto;
 		padding: 0;
 		text-align: center;
-		width: 800px;
+		max-width: 800px;
 
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
 
-	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
+	#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
 	#banner nav li {float: left; display: inline; margin: 0;}
 
 	#banner nav a:link, #banner nav a:visited {
@@ -242,7 +248,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	margin-bottom: 2em;
 	overflow: hidden;
 	padding: 20px;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
@@ -253,7 +259,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	border: 2px solid #eee;
 	float: right;
 	margin: 0.786em 2em 0 5em;
-	width: 248px;
+	max-width: 248px;
 }
 #featured figure img {display: block; float: right;}
 
@@ -271,7 +277,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	margin-bottom: 2em;
 	overflow: hidden;
 	padding: 20px 20px;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
@@ -305,15 +311,15 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	/* Blogroll */
 	#extras .blogroll {
 		float: left;
-		width: 615px;
+		max-width: 615px;
 	}
 
-	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
+	#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
 
 	/* Social */
 	#extras .social {
 		float: right;
-		width: 175px;
+		max-width: 175px;
 	}
 
 	#extras div[class='social'] a {
@@ -359,20 +365,20 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	overflow: hidden;
 	padding: 20px;
 	text-align: left;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 }
 
-#about .primary {float: left; width: 165px;}
+#about .primary {float: left; max-width: 165px;}
 #about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
 #about .photo {float: left; margin: 5px 20px;}
 
 #about .url:link, #about .url:visited {text-decoration: none;}
 
-#about .bio {float: right; width: 500px;}
+#about .bio {float: right; max-width: 500px;}
 
 /*
 	Footer
@@ -410,7 +416,7 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		position: relative;
         float: left;
 		top: 0.5em;
-		width: 190px;
+		max-width: 190px;
 	}
 
 	/* About the Author */
@@ -453,12 +459,12 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
 
 	/* Add a Comment */
-	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
+	#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
 	#add-comment input[type='text'],
 	#add-comment input[type='email'],
-	#add-comment input[type='url'] {float: left; width: 200px;}
+	#add-comment input[type='url'] {float: left; max-width: 200px;}
 
-	#add-comment textarea {float: left; height: 150px; width: 495px;}
+	#add-comment textarea {float: left; height: 150px; max-width: 495px;}
 
 	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
 
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 55053cb2..eb31a851 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>This is a super article !</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index a103868e..3117dc28 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index 66dbe94a..df9dd241 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 68054d97..6650fb9f 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 16431fb9..5fef108c 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index ab91c56a..557676d4 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index 84bd502e..aed3bd79 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Authors</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 24e83abf..0d46b9a0 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Categories</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index f9d47948..7d9abf0d 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 2bc756e6..f8b315ee 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - cat1</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index eb98db2a..54e3f784 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - misc</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 660c593c..1fd346ff 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
index aaea9b81..a4aa51a1 100644
--- a/pelican/tests/output/custom_locale/theme/css/main.css
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -147,7 +147,8 @@ aside, nav, article, figure {
 }
 
 /***** Layout *****/
-.body {clear: both; margin: 0 auto; width: 800px;}
+.body {clear: both; margin: 0 auto; max-width: 800px;}
+img { max-width: 100%; }
 img.right, figure.right, div.figure.align-right {
     float: right;
     margin: 0 0 2em 2em;
@@ -159,7 +160,7 @@ img.left, figure.left, div.figure.align-left {
 
 /* .rst support */
 div.figure img, figure img {  /* to fill figure exactly */
-    width: 100%;
+    max-width: 100%;
 }
 div.figure p.caption, figure p.caption { /* margin provided by figure */
     margin-top: 0;
@@ -171,16 +172,21 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 *****************/
 #banner {
 	margin: 0 auto;
-	padding: 2.5em 0 0 0;
+	padding: 0.8em 0 0 0;
 }
 
 	/* Banner */
-	#banner h1 {font-size: 3.571em; line-height: 0;}
+	#banner h1 {
+		font-size: 3.571em;
+		line-height: 1.0;
+		margin-bottom: .3em;
+	}
+
 	#banner h1 a:link, #banner h1 a:visited {
 		color: #000305;
 		display: block;
 		font-weight: bold;
-		margin: 0 0 .6em .2em;
+		margin: 0 0 0 .2em;
 		text-decoration: none;
 	}
 	#banner h1 a:hover, #banner h1 a:active {
@@ -195,19 +201,19 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	#banner nav {
 		background: #000305;
 		font-size: 1.143em;
-		height: 40px;
+		overflow: auto;
 		line-height: 30px;
 		margin: 0 auto 2em auto;
 		padding: 0;
 		text-align: center;
-		width: 800px;
+		max-width: 800px;
 
 		border-radius: 5px;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 	}
 
-	#banner nav ul {list-style: none; margin: 0 auto; width: 800px;}
+	#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
 	#banner nav li {float: left; display: inline; margin: 0;}
 
 	#banner nav a:link, #banner nav a:visited {
@@ -242,7 +248,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	margin-bottom: 2em;
 	overflow: hidden;
 	padding: 20px;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
@@ -253,7 +259,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	border: 2px solid #eee;
 	float: right;
 	margin: 0.786em 2em 0 5em;
-	width: 248px;
+	max-width: 248px;
 }
 #featured figure img {display: block; float: right;}
 
@@ -271,7 +277,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	margin-bottom: 2em;
 	overflow: hidden;
 	padding: 20px 20px;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
@@ -305,15 +311,15 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	/* Blogroll */
 	#extras .blogroll {
 		float: left;
-		width: 615px;
+		max-width: 615px;
 	}
 
-	#extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
+	#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
 
 	/* Social */
 	#extras .social {
 		float: right;
-		width: 175px;
+		max-width: 175px;
 	}
 
 	#extras div[class='social'] a {
@@ -359,20 +365,20 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	overflow: hidden;
 	padding: 20px;
 	text-align: left;
-	width: 760px;
+	max-width: 760px;
 
 	border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 }
 
-#about .primary {float: left; width: 165px;}
+#about .primary {float: left; max-width: 165px;}
 #about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
 #about .photo {float: left; margin: 5px 20px;}
 
 #about .url:link, #about .url:visited {text-decoration: none;}
 
-#about .bio {float: right; width: 500px;}
+#about .bio {float: right; max-width: 500px;}
 
 /*
 	Footer
@@ -410,7 +416,7 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 		position: relative;
         float: left;
 		top: 0.5em;
-		width: 190px;
+		max-width: 190px;
 	}
 
 	/* About the Author */
@@ -453,12 +459,12 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
 
 	/* Add a Comment */
-	#add-comment label {clear: left; float: left; text-align: left; width: 150px;}
+	#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
 	#add-comment input[type='text'],
 	#add-comment input[type='email'],
-	#add-comment input[type='url'] {float: left; width: 200px;}
+	#add-comment input[type='url'] {float: left; max-width: 200px;}
 
-	#add-comment textarea {float: left; height: 150px; width: 495px;}
+	#add-comment textarea {float: left; height: 150px; max-width: 495px;}
 
 	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
 

From a088f8bb9eb6c448248da159dd9264058c20b57e Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Wed, 18 Aug 2021 00:14:39 +1000
Subject: [PATCH 2455/2864] Update tests for other locales

---
 .../custom_locale/drafts/a-draft-article-without-date.html       | 1 +
 pelican/tests/output/custom_locale/drafts/a-draft-article.html   | 1 +
 pelican/tests/output/custom_locale/index.html                    | 1 +
 pelican/tests/output/custom_locale/index2.html                   | 1 +
 pelican/tests/output/custom_locale/index3.html                   | 1 +
 pelican/tests/output/custom_locale/jinja2_template.html          | 1 +
 pelican/tests/output/custom_locale/oh-yeah-fr.html               | 1 +
 pelican/tests/output/custom_locale/override/index.html           | 1 +
 .../output/custom_locale/pages/this-is-a-test-hidden-page.html   | 1 +
 .../tests/output/custom_locale/pages/this-is-a-test-page.html    | 1 +
 .../posts/2010/décembre/02/this-is-a-super-article/index.html    | 1 +
 .../custom_locale/posts/2010/octobre/15/unbelievable/index.html  | 1 +
 .../custom_locale/posts/2010/octobre/20/oh-yeah/index.html       | 1 +
 .../posts/2011/avril/20/a-markdown-powered-article/index.html    | 1 +
 .../custom_locale/posts/2011/février/17/article-1/index.html     | 1 +
 .../custom_locale/posts/2011/février/17/article-2/index.html     | 1 +
 .../custom_locale/posts/2011/février/17/article-3/index.html     | 1 +
 .../posts/2012/février/29/second-article/index.html              | 1 +
 .../posts/2012/novembre/30/filename_metadata-example/index.html  | 1 +
 pelican/tests/output/custom_locale/second-article-fr.html        | 1 +
 pelican/tests/output/custom_locale/tag/bar.html                  | 1 +
 pelican/tests/output/custom_locale/tag/baz.html                  | 1 +
 pelican/tests/output/custom_locale/tag/foo.html                  | 1 +
 pelican/tests/output/custom_locale/tag/foobar.html               | 1 +
 pelican/tests/output/custom_locale/tag/oh.html                   | 1 +
 pelican/tests/output/custom_locale/tag/yeah.html                 | 1 +
 pelican/tests/output/custom_locale/tags.html                     | 1 +
 27 files changed, 27 insertions(+)

diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
index c289ec72..bb80bd10 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A draft article without date</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index a166efdf..3ce73427 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A draft article</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 6e0d632d..e3079e41 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 5ff21fac..8067a087 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 45ea5a89..233f7ee1 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index 83b6e8e0..d55744fa 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 58859a3a..977c14e3 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -2,6 +2,7 @@
 <html lang="fr">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Trop bien !</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index 5c273ed6..fa3bcb10 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Override url/save_as</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index 91372822..86eb888b 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>This is a test hidden page</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index eb779355..7e835b50 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>This is a test page</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index dee44f28..7b3ce9cc 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>This is a super article !</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 407d457f..12806772 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index 1bf74b57..0e272f86 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 0f35847a..ae1e27dd 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index 05418036..e7d99cc7 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Article 1</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index 8cb67749..d8ba2cc6 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Article 2</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index 62423814..d2fa6936 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Article 3</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 615a7f30..5a718d8b 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Second article</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 2213d174..ea75a1db 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="../../../../../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 3c21ef75..e6989c42 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -2,6 +2,7 @@
 <html lang="fr">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Deuxième article</title>
         <link rel="stylesheet" href="./theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index aaa5fb0d..e6546987 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 9554bdd6..18976227 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>The baz tag</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 15523248..2c3c7622 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - foo</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 1393a76e..23b21342 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - foobar</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index b6fe445f..096b2727 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Oh Oh Oh</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 3953f1b7..29101c8d 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css" />
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index cf932f97..e4683371 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
         <title>Alexis' log - Tags</title>
         <link rel="stylesheet" href="./theme/css/main.css" />

From 22192c148a88b30dd942d7bad2a1ab243de59bc3 Mon Sep 17 00:00:00 2001
From: ImBearChild <imbearchild@outlook.com>
Date: Wed, 29 Sep 2021 14:44:47 +0800
Subject: [PATCH 2456/2864] Improve word count behavior when generating summary

Improve _HTMLWordTruncator by using more than one unicode block in
_word_regex, making word count function behave properly with CJK,
Cyrillic, and more Latin characters when generating summary.
---
 pelican/tests/test_utils.py | 13 +++++++++++++
 pelican/utils.py            | 21 ++++++++++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 5fbd066d..710e14ed 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -218,6 +218,19 @@ class TestUtils(LoggedTestCase):
             utils.truncate_html_words('word ' * 100, 20),
             'word ' * 20 + '…')
 
+        # Plain text with Unicode content.
+        self.assertEqual(
+            utils.truncate_html_words(
+                '我愿意这样，朋友——我独自远行，不但没有你，\
+                 并且再没有别的影在黑暗里。', 12
+            ),
+            '我愿意这样，朋友——我独自远行' + ' …')
+        self.assertEqual(
+            utils.truncate_html_words(
+                'Ты мелькнула, ты предстала, Снова сердце задрожало,', 3
+            ),
+            'Ты мелькнула, ты' + ' …')
+
         # Words enclosed or intervaled by HTML tags.
         self.assertEqual(
             utils.truncate_html_words('<p>' + 'word ' * 100 + '</p>', 20),
diff --git a/pelican/utils.py b/pelican/utils.py
index b69cbf95..5065d108 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -133,6 +133,7 @@ class memoized:
     (not reevaluated).
 
     """
+
     def __init__(self, func):
         self.func = func
         self.cache = {}
@@ -408,7 +409,21 @@ def posixize_path(rel_path):
 
 class _HTMLWordTruncator(HTMLParser):
 
-    _word_regex = re.compile(r"\w[\w'-]*", re.U)
+    _word_regex = re.compile(r"(({SBC})({SBC}|-|')*)|{DBC}".format(
+        # SBC means Latin-like characters. A word contains a few characters.
+        #         ASCII |Extended Latin | Cyrillic
+        SBC="[0-9a-zA-Z]|[\u00C0-\u024f]|[\u0400-\u04FF]",
+        # DBC means CJK-like characters. An character can stand for a word.
+        DBC=("([\u4E00-\u9FFF])|"          # CJK Unified Ideographs
+             "([\u3400-\u4DBF])|"          # CJK Unified Ideographs Extension A
+             "([\uF900-\uFAFF])|"          # CJK Compatibility Ideographs
+             "([\U00020000-\U0002A6DF])|"  # CJK Unified Ideographs Extension B
+             "([\U0002F800-\U0002FA1F])|"  # CJK Compatibility Ideographs Supplement
+             "([\u3040-\u30FF])|"          # Hiragana and Katakana
+             "([\u1100-\u11FF])|"          # Hangul Jamo
+             "([\uAC00-\uD7FF])|"          # Hangul Compatibility Jamo
+             "([\u3130-\u318F])"           # Hangul Syllables
+             )), re.UNICODE)
     _word_prefix_regex = re.compile(r'\w', re.U)
     _singlets = ('br', 'col', 'link', 'base', 'img', 'param', 'area',
                  'hr', 'input')
@@ -818,8 +833,8 @@ class FileSystemWatcher:
                 }
             )
             logger.warning(
-                    'No valid files found in content for the active readers:\n'
-                    + '\n'.join(reader_descs))
+                'No valid files found in content for the active readers:\n'
+                + '\n'.join(reader_descs))
 
         if result.get('theme') is None:
             logger.warning('Empty theme folder. Using `basic` theme.')

From eacd6435ef4835868c9590b0cea9420e4a74c529 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 1 Oct 2021 15:04:58 +0200
Subject: [PATCH 2457/2864] Minor README tweaks

---
 README.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index 4e1f1812..6d8be699 100644
--- a/README.rst
+++ b/README.rst
@@ -3,8 +3,8 @@ Pelican |build-status| |pypi-version| |repology|
 
 Pelican is a static site generator, written in Python_.
 
-* Write content in reStructuredText_ or Markdown_ using your editor of choice
-* Includes a simple command line tool to (re)generate site files
+* Compose content in Markdown_ or reStructuredText_ using your editor of choice
+* Simple command-line tool (re)generates HTML, CSS, and JS from your source content
 * Easy to interface with version control systems and web hooks
 * Completely static output is simple to host anywhere
 
@@ -24,7 +24,7 @@ Pelican’s feature highlights include:
 * Fast rebuild times due to content caching and selective output writing
 * Extensible via a rich plugin ecosystem: `Pelican Plugins`_
 
-Check out `Pelican's documentation`_ for further information.
+Check out the `Pelican documentation`_ for further information.
 
 
 How to get help, contribute, or provide feedback
@@ -36,14 +36,14 @@ See our `contribution submission and feedback guidelines <CONTRIBUTING.rst>`_.
 Source code
 -----------
 
-Pelican's source code is `hosted on GitHub`_. If you feel like hacking,
-take a look at `Pelican's internals`_.
+Pelican’s source code is `hosted on GitHub`_. For information on how it works,
+have a look at `Pelican's internals`_.
 
 
-Why the name "Pelican"?
+Why the name “Pelican”?
 -----------------------
 
-"Pelican" is an anagram of *calepin*, which means "notebook" in French.
+“Pelican” is an anagram of *calepin*, which means “notebook” in French.
 
 
 .. Links
@@ -54,7 +54,7 @@ Why the name "Pelican"?
 .. _Jinja2: https://palletsprojects.com/p/jinja/
 .. _Pygments: https://pygments.org/
 .. _`Pelican Plugins`: https://github.com/pelican-plugins
-.. _`Pelican's documentation`: https://docs.getpelican.com/
+.. _`Pelican documentation`: https://docs.getpelican.com/
 .. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html
 .. _`hosted on GitHub`: https://github.com/getpelican/pelican
 

From 492ed61c9f4dcf3b5d11feeae332d1e351b01fe3 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 1 Oct 2021 15:30:03 +0200
Subject: [PATCH 2458/2864] Update changelog

---
 docs/changelog.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index fc673d90..b9271ddc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,18 @@
 Release history
 ###############
 
+4.7.0 - 2021-10-01
+==================
+
+* Improve default theme rendering on mobile and other small screen devices `(#2914) <https://github.com/getpelican/pelican/pull/2914>`_
+* Add support for hidden articles `(#2866) <https://github.com/getpelican/pelican/pull/2866>`_
+* Improve word count behavior when generating summary CJK & other locales `(#2863) <https://github.com/getpelican/pelican/pull/2863>`_
+* Add progress spinner during generation `(#2869) <https://github.com/getpelican/pelican/pull/2869>`_
+  and better logging `(#2897) <https://github.com/getpelican/pelican/pull/2897>`_, both via `Rich <https://github.com/willmcgugan/rich>`_
+* Invoke tasks `serve` and `livereload` now auto-open a web browser pointing to the locally-served website `(#2764) <https://github.com/getpelican/pelican/pull/2764>`_
+* Support some date format codes used by ISO dates `(#2902) <https://github.com/getpelican/pelican/pull/2902>`_
+* Document how to add a new writer `(#2901) <https://github.com/getpelican/pelican/pull/2901>`_
+
 4.6.0 - 2021-03-23
 ==================
 

From f9238269d76fbb02051792b0e36c4cd2d94456ba Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 1 Oct 2021 15:35:41 +0200
Subject: [PATCH 2459/2864] Tweak changelog

---
 docs/changelog.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b9271ddc..b7418ca9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,10 +6,10 @@ Release history
 
 * Improve default theme rendering on mobile and other small screen devices `(#2914) <https://github.com/getpelican/pelican/pull/2914>`_
 * Add support for hidden articles `(#2866) <https://github.com/getpelican/pelican/pull/2866>`_
-* Improve word count behavior when generating summary CJK & other locales `(#2863) <https://github.com/getpelican/pelican/pull/2863>`_
+* Improve word count behavior when generating summary CJK & other locales `(#2864) <https://github.com/getpelican/pelican/pull/2864>`_
 * Add progress spinner during generation `(#2869) <https://github.com/getpelican/pelican/pull/2869>`_
-  and better logging `(#2897) <https://github.com/getpelican/pelican/pull/2897>`_, both via `Rich <https://github.com/willmcgugan/rich>`_
-* Invoke tasks `serve` and `livereload` now auto-open a web browser pointing to the locally-served website `(#2764) <https://github.com/getpelican/pelican/pull/2764>`_
+  and richer logging `(#2897) <https://github.com/getpelican/pelican/pull/2897>`_, both via `Rich <https://github.com/willmcgugan/rich>`_
+* Invoke tasks ``serve`` and ``livereload`` now auto-open a web browser pointing to the locally-served web site `(#2764) <https://github.com/getpelican/pelican/pull/2764>`_
 * Support some date format codes used by ISO dates `(#2902) <https://github.com/getpelican/pelican/pull/2902>`_
 * Document how to add a new writer `(#2901) <https://github.com/getpelican/pelican/pull/2901>`_
 

From 7dec2660fb24dd1d50d4425751dab1ec59db608c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 1 Oct 2021 16:04:47 +0200
Subject: [PATCH 2460/2864] Prepare release

---
 RELEASE.md         | 10 ++++++++++
 docs/changelog.rst | 12 ------------
 2 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..20087288
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,10 @@
+Release type: minor
+
+* Improve default theme rendering on mobile and other small screen devices `(#2914) <https://github.com/getpelican/pelican/pull/2914>`_
+* Add support for hidden articles `(#2866) <https://github.com/getpelican/pelican/pull/2866>`_
+* Improve word count behavior when generating summary CJK & other locales `(#2864) <https://github.com/getpelican/pelican/pull/2864>`_
+* Add progress spinner during generation `(#2869) <https://github.com/getpelican/pelican/pull/2869>`_
+  and richer logging `(#2897) <https://github.com/getpelican/pelican/pull/2897>`_, both via `Rich <https://github.com/willmcgugan/rich>`_
+* Invoke tasks ``serve`` and ``livereload`` now auto-open a web browser pointing to the locally-served web site `(#2764) <https://github.com/getpelican/pelican/pull/2764>`_
+* Support some date format codes used by ISO dates `(#2902) <https://github.com/getpelican/pelican/pull/2902>`_
+* Document how to add a new writer `(#2901) <https://github.com/getpelican/pelican/pull/2901>`_
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b7418ca9..fc673d90 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,18 +1,6 @@
 Release history
 ###############
 
-4.7.0 - 2021-10-01
-==================
-
-* Improve default theme rendering on mobile and other small screen devices `(#2914) <https://github.com/getpelican/pelican/pull/2914>`_
-* Add support for hidden articles `(#2866) <https://github.com/getpelican/pelican/pull/2866>`_
-* Improve word count behavior when generating summary CJK & other locales `(#2864) <https://github.com/getpelican/pelican/pull/2864>`_
-* Add progress spinner during generation `(#2869) <https://github.com/getpelican/pelican/pull/2869>`_
-  and richer logging `(#2897) <https://github.com/getpelican/pelican/pull/2897>`_, both via `Rich <https://github.com/willmcgugan/rich>`_
-* Invoke tasks ``serve`` and ``livereload`` now auto-open a web browser pointing to the locally-served web site `(#2764) <https://github.com/getpelican/pelican/pull/2764>`_
-* Support some date format codes used by ISO dates `(#2902) <https://github.com/getpelican/pelican/pull/2902>`_
-* Document how to add a new writer `(#2901) <https://github.com/getpelican/pelican/pull/2901>`_
-
 4.6.0 - 2021-03-23
 ==================
 

From f862d64b7a492f2af24e1228790a1d75371a1112 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Fri, 1 Oct 2021 14:10:26 +0000
Subject: [PATCH 2461/2864] Release Pelican 4.7.0

---
 RELEASE.md         | 10 ----------
 docs/changelog.rst | 12 ++++++++++++
 pyproject.toml     |  2 +-
 setup.py           |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 20087288..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Release type: minor
-
-* Improve default theme rendering on mobile and other small screen devices `(#2914) <https://github.com/getpelican/pelican/pull/2914>`_
-* Add support for hidden articles `(#2866) <https://github.com/getpelican/pelican/pull/2866>`_
-* Improve word count behavior when generating summary CJK & other locales `(#2864) <https://github.com/getpelican/pelican/pull/2864>`_
-* Add progress spinner during generation `(#2869) <https://github.com/getpelican/pelican/pull/2869>`_
-  and richer logging `(#2897) <https://github.com/getpelican/pelican/pull/2897>`_, both via `Rich <https://github.com/willmcgugan/rich>`_
-* Invoke tasks ``serve`` and ``livereload`` now auto-open a web browser pointing to the locally-served web site `(#2764) <https://github.com/getpelican/pelican/pull/2764>`_
-* Support some date format codes used by ISO dates `(#2902) <https://github.com/getpelican/pelican/pull/2902>`_
-* Document how to add a new writer `(#2901) <https://github.com/getpelican/pelican/pull/2901>`_
diff --git a/docs/changelog.rst b/docs/changelog.rst
index fc673d90..b7418ca9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,18 @@
 Release history
 ###############
 
+4.7.0 - 2021-10-01
+==================
+
+* Improve default theme rendering on mobile and other small screen devices `(#2914) <https://github.com/getpelican/pelican/pull/2914>`_
+* Add support for hidden articles `(#2866) <https://github.com/getpelican/pelican/pull/2866>`_
+* Improve word count behavior when generating summary CJK & other locales `(#2864) <https://github.com/getpelican/pelican/pull/2864>`_
+* Add progress spinner during generation `(#2869) <https://github.com/getpelican/pelican/pull/2869>`_
+  and richer logging `(#2897) <https://github.com/getpelican/pelican/pull/2897>`_, both via `Rich <https://github.com/willmcgugan/rich>`_
+* Invoke tasks ``serve`` and ``livereload`` now auto-open a web browser pointing to the locally-served web site `(#2764) <https://github.com/getpelican/pelican/pull/2764>`_
+* Support some date format codes used by ISO dates `(#2902) <https://github.com/getpelican/pelican/pull/2902>`_
+* Document how to add a new writer `(#2901) <https://github.com/getpelican/pelican/pull/2901>`_
+
 4.6.0 - 2021-03-23
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index 99b1d5d4..42bd9a14 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.6.0"
+version = "4.7.0"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index 5ffd0fdf..c59c2daa 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from os.path import join, relpath
 from setuptools import find_packages, setup
 
 
-version = "4.6.0"
+version = "4.7.0"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',

From 2d97a459024db000b5ee3b20a16176e0a12ca403 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Tue, 5 Oct 2021 01:39:35 +0300
Subject: [PATCH 2462/2864] Adjust suffix in server to allow redirection when
 needed

Folders without index.html has to be redirected (/foo -> /foo/) for
directory listing to work properly. Skip '/' suffix if original path
does not have it so that base class can return a redirect.
---
 pelican/server.py            | 5 +++++
 pelican/tests/test_server.py | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pelican/server.py b/pelican/server.py
index 6ebce876..317761c9 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -75,10 +75,15 @@ class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
 
     def get_path_that_exists(self, original_path):
         # Try to strip trailing slash
+        trailing_slash = original_path.endswith('/')
         original_path = original_path.rstrip('/')
         # Try to detect file by applying various suffixes
         tries = []
         for suffix in self.SUFFIXES:
+            if not trailing_slash and suffix == '/':
+                # if original request does not have trailing slash, skip the '/' suffix
+                # so that base class can redirect if needed
+                continue
             path = original_path + suffix
             if os.path.exists(self.translate_path(path)):
                 return path
diff --git a/pelican/tests/test_server.py b/pelican/tests/test_server.py
index 307a3e10..9af030f8 100644
--- a/pelican/tests/test_server.py
+++ b/pelican/tests/test_server.py
@@ -43,14 +43,18 @@ class TestServer(unittest.TestCase):
         os.mkdir(os.path.join(self.temp_output, 'baz'))
 
         for suffix in ['', '/']:
+            # foo.html has precedence over foo/index.html
             path = handler.get_path_that_exists('foo' + suffix)
             self.assertEqual(path, 'foo.html')
 
+            # folder with index.html should return folder/index.html
             path = handler.get_path_that_exists('bar' + suffix)
             self.assertEqual(path, 'bar/index.html')
 
+            # folder without index.html should return same as input
             path = handler.get_path_that_exists('baz' + suffix)
-            self.assertEqual(path, 'baz/')
+            self.assertEqual(path, 'baz' + suffix)
 
+            # not existing path should return None
             path = handler.get_path_that_exists('quux' + suffix)
             self.assertIsNone(path)

From c5c74832680d5aa376a386c9519b3364087904c8 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Tue, 5 Oct 2021 10:00:48 +1100
Subject: [PATCH 2463/2864] Remove shebang lines from generated pelicanconf.py
 and publishconf.py.

These configuration files do not need a #! line as they are not intended to be
executed directly and are not marked as executable. (In practise this doesn't
cause any problems - it just came up in a Guix bug report because Guix
transforms the #! lines.)

The "coding: utf-8" lines are also no longer required now that Pelican is Python
3 only.
---
 pelican/tools/templates/pelicanconf.py.jinja2 | 3 ---
 pelican/tools/templates/publishconf.py.jinja2 | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/pelican/tools/templates/pelicanconf.py.jinja2 b/pelican/tools/templates/pelicanconf.py.jinja2
index 4ba0208c..1112ac88 100644
--- a/pelican/tools/templates/pelicanconf.py.jinja2
+++ b/pelican/tools/templates/pelicanconf.py.jinja2
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*- #
-
 AUTHOR = {{author}}
 SITENAME = {{sitename}}
 SITEURL = ''
diff --git a/pelican/tools/templates/publishconf.py.jinja2 b/pelican/tools/templates/publishconf.py.jinja2
index bb18966b..e119222c 100755
--- a/pelican/tools/templates/publishconf.py.jinja2
+++ b/pelican/tools/templates/publishconf.py.jinja2
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*- #
-
 # This file is only used if you use `make publish` or
 # explicitly specify it as your config file.
 

From 0b9a488c26ecc139b4c64b5635833ba2f410d6c0 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Fri, 1 Oct 2021 18:05:06 -0600
Subject: [PATCH 2464/2864] Use rich logging for Pelican server

---
 pelican/__init__.py | 4 ++--
 pelican/server.py   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 6c2c3051..5a487c9f 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -487,8 +487,8 @@ def listen(server, port, output, excqueue=None):
         return
 
     try:
-        print("\nServing site at: http://{}:{} - Tap CTRL-C to stop".format(
-            server, port))
+        console.print("Serving site at: http://{}:{} - Tap CTRL-C to stop".format(
+                      server, port))
         httpd.serve_forever()
     except Exception as e:
         if excqueue is not None:
diff --git a/pelican/server.py b/pelican/server.py
index 317761c9..893cc800 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -12,6 +12,7 @@ try:
 except ImportError:
     magic_from_file = None
 
+from pelican.log import console  # noqa: F401
 from pelican.log import init as init_logging
 logger = logging.getLogger(__name__)
 
@@ -104,6 +105,9 @@ class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
 
         return mimetype
 
+    def log_message(self, format, *args):
+        logger.info(format, *args)
+
 
 class RootedHTTPServer(server.HTTPServer):
     def __init__(self, base_path, *args, **kwargs):

From 2b631ab4d316b2bc50b3462e19e3ba0bcd7a419c Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Sat, 2 Oct 2021 09:55:02 -0600
Subject: [PATCH 2465/2864] Listen: set minimum logging level to INFO

This way we can see the server requests.
---
 pelican/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 5a487c9f..99aa2776 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -476,6 +476,10 @@ def autoreload(args, excqueue=None):
 
 
 def listen(server, port, output, excqueue=None):
+    # set logging level to at least "INFO" (so we can see the server requests)
+    if logger.level < logging.INFO:
+        logger.setLevel(logging.INFO)
+
     RootedHTTPServer.allow_reuse_address = True
     try:
         httpd = RootedHTTPServer(

From 76cf879414909136a77bef846b8d71eaadd8dd48 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 5 Oct 2021 07:38:24 +0200
Subject: [PATCH 2466/2864] Add Pelican theme repo link to docs

---
 docs/index.rst  |  2 +-
 docs/themes.rst | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index e64ffd7e..60591482 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -61,8 +61,8 @@ Documentation
    content
    publish
    settings
-   themes
    plugins
+   themes
    pelican-themes
    importer
    faq
diff --git a/docs/themes.rst b/docs/themes.rst
index e21a6c79..fe6337d6 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -1,7 +1,17 @@
 .. _theming-pelican:
 
-Creating themes
-###############
+Themes
+######
+
+There is a community-managed repository of `Pelican Themes`_ for people to share
+and use.
+
+Please note that while we do our best to review and merge theme contributions,
+they are submitted by the Pelican community and thus may have varying levels of
+support and interoperability.
+
+Creating Themes
+~~~~~~~~~~~~~~~
 
 To generate its HTML output, Pelican uses the `Jinja
 <https://palletsprojects.com/p/jinja/>`_ templating engine due to its flexibility and
@@ -50,7 +60,7 @@ To make your own theme, you must follow the following structure::
 
 .. _templates-variables:
 
-Templates and variables
+Templates and Variables
 =======================
 
 The idea is to use a simple syntax that you can embed into your HTML pages.
@@ -61,7 +71,7 @@ All templates will receive the variables defined in your settings file, as long
 as they are in all-caps. You can access them directly.
 
 
-Common variables
+Common Variables
 ----------------
 
 All of these settings will be available to all templates.
@@ -571,3 +581,8 @@ Download
 """"""""
 
 You can download this example theme :download:`here <_static/theme-basic.zip>`.
+
+
+.. Links
+
+.. _`Pelican Themes`: https://github.com/getpelican/pelican-themes

From 31b282f3e267a4ce536fcdf598941cc9834c479b Mon Sep 17 00:00:00 2001
From: disk0x <mdtha@tutanota.com>
Date: Tue, 18 Aug 2020 20:22:42 +0200
Subject: [PATCH 2467/2864] Add SFTP upload to Makefile

Some managed web hosts do not allow uploads via scp or rsync, so the
sftp command is a necessary alternative.
---
 pelican/tools/templates/Makefile.jinja2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index df5b2643..a28d658c 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -72,6 +72,7 @@ help:
 	@echo '   make devserver-global               regenerate and serve on 0.0.0.0    '
 {% if ssh %}
 	@echo '   make ssh_upload                     upload the web site via SSH        '
+    @echo '   make sftp_upload                    upload the web site via SFTP       '
 	@echo '   make rsync_upload                   upload the web site via rsync+ssh  '
 {% endif %}
 {% if dropbox %}
@@ -124,6 +125,9 @@ publish:
 ssh_upload: publish
 	scp -P $(SSH_PORT) -r "$(OUTPUTDIR)"/* "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)"
 
+sftp_upload: publish
+	printf 'put -r $(OUTPUTDIR)/*' | sftp $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+
 {% set upload = upload + ["rsync_upload"] %}
 rsync_upload: publish
 	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --include tags --cvs-exclude --delete "$(OUTPUTDIR)"/ "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)"

From 5803052bb76a2648271739b6709b6ca17ae27ca7 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Sat, 2 Oct 2021 09:36:32 -0600
Subject: [PATCH 2468/2864] server: return proper MIME-types for webfonts

---
 pelican/server.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pelican/server.py b/pelican/server.py
index 893cc800..7a183bce 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -43,6 +43,21 @@ def parse_arguments():
 class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
     SUFFIXES = ['.html', '/index.html', '/', '']
 
+    extensions_map = _encodings_map_default = {
+        # included in Python default implementation
+        '.gz': 'application/gzip',
+        '.Z': 'application/octet-stream',
+        '.bz2': 'application/x-bzip2',
+        '.xz': 'application/x-xz',
+
+        # web fonts
+        ".oft": "font/oft",
+        ".sfnt": "font/sfnt",
+        ".ttf": "font/ttf",
+        ".woff": "font/woff",
+        ".woff2": "font/woff2",
+    }
+
     def translate_path(self, path):
         # abandon query parameters
         path = path.split('?', 1)[0]

From 30597b70f00e39e6f93c9f5ebffd961234062b67 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 6 Oct 2021 09:38:21 +0200
Subject: [PATCH 2469/2864] Quote version numbers in GitHub Actions workflow

Otherwise, YAML treats `python: 3.10` as a float, yielding Python 3.1.
---
 .github/workflows/main.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 863dec4b..ee08c25d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,17 +16,17 @@ jobs:
       matrix:
         config:
           - os: ubuntu
-            python: 3.6
+            python: "3.6"
           - os: ubuntu
-            python: 3.7
+            python: "3.7"
           - os: ubuntu
-            python: 3.8
+            python: "3.8"
           - os: ubuntu
-            python: 3.9
+            python: "3.9"
           - os: macos
-            python: 3.7
+            python: "3.7"
           - os: windows
-            python: 3.7
+            python: "3.7"
 
     steps:
       - uses: actions/checkout@v2
@@ -86,7 +86,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: "3.7"
       - name: Set pip cache (Linux)
         uses: actions/cache@v2
         if: startsWith(runner.os, 'Linux')
@@ -110,7 +110,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: "3.7"
       - name: Set pip cache (Linux)
         uses: actions/cache@v2
         if: startsWith(runner.os, 'Linux')
@@ -136,7 +136,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: "3.7"
       - name: Check release
         id: check_release
         run: |

From 0da8659d0ee5b23550fcf0d2314bb398a00b18a1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 6 Oct 2021 09:51:00 +0200
Subject: [PATCH 2470/2864] Add Python 3.10 to test matrix & classifier list

---
 .github/workflows/main.yml | 2 ++
 setup.py                   | 2 ++
 tox.ini                    | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ee08c25d..527b8db9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,6 +23,8 @@ jobs:
             python: "3.8"
           - os: ubuntu
             python: "3.9"
+          - os: ubuntu
+            python: "3.10"
           - os: macos
             python: "3.7"
           - os: windows
diff --git a/setup.py b/setup.py
index c59c2daa..f1ca9dc1 100755
--- a/setup.py
+++ b/setup.py
@@ -69,6 +69,8 @@ setup(
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: Implementation :: CPython',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries :: Python Modules',
diff --git a/tox.ini b/tox.ini
index bb45229c..15575cf2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.6,3.7,3.8,3.9},docs,flake8
+envlist = py{3.6,3.7,3.8,3.9,3.10},docs,flake8
 
 [testenv]
 basepython =
@@ -7,6 +7,7 @@ basepython =
     py3.7: python3.7
     py3.8: python3.8
     py3.9: python3.9
+    py3.10: python3.10
 passenv = *
 usedevelop=True
 deps =

From 8849721913f4b9bc8e3c234185d5fc2bf3da68b7 Mon Sep 17 00:00:00 2001
From: Jonas Borges <jonasborgesalves@gmail.com>
Date: Wed, 6 Oct 2021 09:19:17 +0100
Subject: [PATCH 2471/2864] Ensure _DISCARDED is not being cached. Fix #2825
 (#2926)

Filtration is now being applied before caching the metadata, solving the issue where _DISCARD objects from previous runs were being retrieved from cache.
---
 pelican/readers.py                             |  3 ++-
 .../article_with_markdown_and_empty_tags.md    |  4 ++++
 pelican/tests/test_generators.py               |  3 +++
 pelican/tests/test_readers.py                  | 18 ++++++++++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pelican/tests/content/article_with_markdown_and_empty_tags.md

diff --git a/pelican/readers.py b/pelican/readers.py
index 15d09908..b42fa4f8 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -571,8 +571,9 @@ class Readers(FileStampDataCacher):
         content, reader_metadata = self.get_cached_data(path, (None, None))
         if content is None:
             content, reader_metadata = reader.read(path)
+            reader_metadata = _filter_discardable_metadata(reader_metadata)
             self.cache_data(path, (content, reader_metadata))
-        metadata.update(_filter_discardable_metadata(reader_metadata))
+        metadata.update(reader_metadata)
 
         if content:
             # find images with empty alt
diff --git a/pelican/tests/content/article_with_markdown_and_empty_tags.md b/pelican/tests/content/article_with_markdown_and_empty_tags.md
new file mode 100644
index 00000000..ba013fe9
--- /dev/null
+++ b/pelican/tests/content/article_with_markdown_and_empty_tags.md
@@ -0,0 +1,4 @@
+Title: Article with markdown and empty tags
+Tags:
+
+This is some content.
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 0a4a8fdc..1bc8aff0 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -265,6 +265,8 @@ class TestArticlesGenerator(unittest.TestCase):
             ['This is a super article !', 'published', 'yeah', 'article'],
             ['This is a super article !', 'published', 'Default', 'article'],
             ['Article with an inline SVG', 'published', 'Default', 'article'],
+            ['Article with markdown and empty tags', 'published', 'Default',
+             'article'],
             ['This is an article with category !', 'published', 'yeah',
              'article'],
             ['This is an article with multiple authors!', 'published',
@@ -569,6 +571,7 @@ class TestArticlesGenerator(unittest.TestCase):
             'Article title',
             'Article with Nonconformant HTML meta tags',
             'Article with an inline SVG',
+            'Article with markdown and empty tags',
             'Article with markdown and nested summary metadata',
             'Article with markdown and summary metadata multi',
             'Article with markdown and summary metadata single',
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index ea5f3bdd..753a353d 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -18,6 +18,7 @@ class ReaderTest(unittest.TestCase):
 
     def read_file(self, path, **kwargs):
         # Isolate from future API changes to readers.read_file
+
         r = readers.Readers(settings=get_settings(**kwargs))
         return r.read_file(base_path=CONTENT_PATH, path=path)
 
@@ -795,6 +796,23 @@ class MdReaderTest(ReaderTest):
         self.assertEqual(page.content, expected)
         self.assertEqual(page.title, expected_title)
 
+    def test_metadata_has_no_discarded_data(self):
+        md_filename = 'article_with_markdown_and_empty_tags.md'
+
+        r = readers.Readers(cache_name='cache', settings=get_settings(
+            CACHE_CONTENT=True))
+        page = r.read_file(base_path=CONTENT_PATH, path=md_filename)
+
+        __, cached_metadata = r.get_cached_data(
+            _path(md_filename), (None, None))
+
+        expected = {
+            'title': 'Article with markdown and empty tags'
+        }
+        self.assertEqual(cached_metadata, expected)
+        self.assertNotIn('tags', page.metadata)
+        self.assertDictHasSubset(page.metadata, expected)
+
 
 class HTMLReaderTest(ReaderTest):
     def test_article_with_comments(self):

From 98372c9869146ad00b8f37ef5775561536c81b3b Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 7 Oct 2021 14:16:27 -0600
Subject: [PATCH 2472/2864] server: for extension_map, refer to upstream
 version rather than only overwriting it

---
 pelican/server.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/pelican/server.py b/pelican/server.py
index 7a183bce..913c3761 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -43,19 +43,16 @@ def parse_arguments():
 class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
     SUFFIXES = ['.html', '/index.html', '/', '']
 
-    extensions_map = _encodings_map_default = {
-        # included in Python default implementation
-        '.gz': 'application/gzip',
-        '.Z': 'application/octet-stream',
-        '.bz2': 'application/x-bzip2',
-        '.xz': 'application/x-xz',
-
-        # web fonts
-        ".oft": "font/oft",
-        ".sfnt": "font/sfnt",
-        ".ttf": "font/ttf",
-        ".woff": "font/woff",
-        ".woff2": "font/woff2",
+    extensions_map = {
+        **server.SimpleHTTPRequestHandler.extensions_map,
+        ** {
+            # web fonts
+            ".oft": "font/oft",
+            ".sfnt": "font/sfnt",
+            ".ttf": "font/ttf",
+            ".woff": "font/woff",
+            ".woff2": "font/woff2",
+        },
     }
 
     def translate_path(self, path):

From 793b93bd3441edf848dc4a765db18fcaf0640438 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Fri, 8 Oct 2021 18:47:40 +1100
Subject: [PATCH 2473/2864] Use `--no-pager` option rather than override all
 environment variables

Currently the `assertDirsEqual` test utility uses the `env` argument to `subprocess.Popen` to make git run non-interactively, but this overwrites all environment variables causing test failures on Guix. The `--no-pager` option is a more targeted way to achieve the same thing.
---
 pelican/tests/test_pelican.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index cacc65c1..389dbb3d 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -56,9 +56,8 @@ class TestPelican(LoggedTestCase):
 
     def assertDirsEqual(self, left_path, right_path):
         out, err = subprocess.Popen(
-            ['git', 'diff', '--no-ext-diff', '--exit-code',
+            ['git', '--no-pager', 'diff', '--no-ext-diff', '--exit-code',
              '-w', left_path, right_path],
-            env={'PAGER': ''},
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE
         ).communicate()

From eab67f7634af892c2b253e221c7613f5ef8c1c54 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 8 Oct 2021 08:59:35 +0200
Subject: [PATCH 2474/2864] PTY all the tasks

---
 tasks.py | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/tasks.py b/tasks.py
index 12116da3..148899c7 100644
--- a/tasks.py
+++ b/tasks.py
@@ -8,6 +8,7 @@ PKG_NAME = "pelican"
 PKG_PATH = Path(PKG_NAME)
 DOCS_PORT = os.environ.get("DOCS_PORT", 8000)
 BIN_DIR = "bin" if os.name != "nt" else "Scripts"
+PTY = True if os.name != "nt" else False
 ACTIVE_VENV = os.environ.get("VIRTUAL_ENV", None)
 VENV_HOME = Path(os.environ.get("WORKON_HOME", "~/virtualenvs"))
 VENV_PATH = Path(ACTIVE_VENV) if ACTIVE_VENV else (VENV_HOME / PKG_NAME)
@@ -16,15 +17,13 @@ VENV_BIN = Path(VENV) / Path(BIN_DIR)
 
 TOOLS = ["poetry", "pre-commit", "psutil"]
 POETRY = which("poetry") if which("poetry") else (VENV_BIN / "poetry")
-PRECOMMIT = (
-    which("pre-commit") if which("pre-commit") else (VENV_BIN / "pre-commit")
-)
+PRECOMMIT = which("pre-commit") if which("pre-commit") else (VENV_BIN / "pre-commit")
 
 
 @task
 def docbuild(c):
     """Build documentation"""
-    c.run(f"{VENV_BIN}/sphinx-build -W docs docs/_build")
+    c.run(f"{VENV_BIN}/sphinx-build -W docs docs/_build", pty=PTY)
 
 
 @task(docbuild)
@@ -42,7 +41,6 @@ def docserve(c):
 @task
 def tests(c):
     """Run the test suite"""
-    PTY = True if os.name != "nt" else False
     c.run(f"{VENV_BIN}/pytest", pty=PTY)
 
 
@@ -54,7 +52,7 @@ def black(c, check=False, diff=False):
         check_flag = "--check"
     if diff:
         diff_flag = "--diff"
-    c.run(f"{VENV_BIN}/black {check_flag} {diff_flag} {PKG_PATH} tasks.py")
+    c.run(f"{VENV_BIN}/black {check_flag} {diff_flag} {PKG_PATH} tasks.py", pty=PTY)
 
 
 @task
@@ -64,14 +62,12 @@ def isort(c, check=False, diff=False):
         check_flag = "-c"
     if diff:
         diff_flag = "--diff"
-    c.run(
-        f"{VENV_BIN}/isort {check_flag} {diff_flag} ."
-    )
+    c.run(f"{VENV_BIN}/isort {check_flag} {diff_flag} .", pty=PTY)
 
 
 @task
 def flake8(c):
-    c.run(f"git diff HEAD | {VENV_BIN}/flake8 --diff --max-line-length=88")
+    c.run(f"git diff HEAD | {VENV_BIN}/flake8 --diff --max-line-length=88", pty=PTY)
 
 
 @task
@@ -84,20 +80,20 @@ def tools(c):
     """Install tools in the virtual environment if not already on PATH"""
     for tool in TOOLS:
         if not which(tool):
-            c.run(f"{VENV_BIN}/python -m pip install {tool}")
+            c.run(f"{VENV_BIN}/python -m pip install {tool}", pty=PTY)
 
 
 @task
 def precommit(c):
     """Install pre-commit hooks to .git/hooks/pre-commit"""
-    c.run(f"{PRECOMMIT} install")
+    c.run(f"{PRECOMMIT} install", pty=PTY)
 
 
 @task
 def setup(c):
-    c.run(f"{VENV_BIN}/python -m pip install -U pip")
+    c.run(f"{VENV_BIN}/python -m pip install -U pip", pty=PTY)
     tools(c)
-    c.run(f"{POETRY} install")
+    c.run(f"{POETRY} install", pty=PTY)
     precommit(c)
 
 
@@ -105,11 +101,17 @@ def setup(c):
 def update_functional_tests(c):
     """Update the generated functional test output"""
     c.run(
-        f"bash -c 'LC_ALL=en_US.utf8 pelican -o {PKG_PATH}/tests/output/custom/ -s samples/pelican.conf.py samples/content/'"
+        f"bash -c 'LC_ALL=en_US.utf8 pelican -o {PKG_PATH}/tests/output/custom/ \
+            -s samples/pelican.conf.py samples/content/'",
+        pty=PTY,
     )
     c.run(
-        f"bash -c 'LC_ALL=fr_FR.utf8 pelican -o {PKG_PATH}/tests/output/custom_locale/ -s samples/pelican.conf_FR.py samples/content/'"
+        f"bash -c 'LC_ALL=fr_FR.utf8 pelican -o {PKG_PATH}/tests/output/custom_locale/ \
+            -s samples/pelican.conf_FR.py samples/content/'",
+        pty=PTY,
     )
     c.run(
-        f"bash -c 'LC_ALL=en_US.utf8 pelican -o {PKG_PATH}/tests/output/basic/ samples/content/'"
+        f"bash -c 'LC_ALL=en_US.utf8 pelican -o \
+            {PKG_PATH}/tests/output/basic/ samples/content/'",
+        pty=PTY,
     )

From 9bd54b7b607e66f8342399df121432d74098df64 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 8 Oct 2021 09:00:13 +0200
Subject: [PATCH 2475/2864] All roads lead to Rome

---
 pelican/tools/pelican_quickstart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 41ddea3c..e7cbfea0 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -17,7 +17,7 @@ try:
     import tzlocal
     _DEFAULT_TIMEZONE = tzlocal.get_localzone().zone
 except ImportError:
-    _DEFAULT_TIMEZONE = 'Europe/Paris'
+    _DEFAULT_TIMEZONE = 'Europe/Rome'
 
 from pelican import __version__
 

From aeec09b397314e7068020f58ce2e1e2e55b84437 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Fri, 8 Oct 2021 15:09:59 +1100
Subject: [PATCH 2476/2864] Distribute sample data used to run tests

---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 469f6fff..47d69d99 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
 include *.rst
 recursive-include pelican *.html *.css *png *.rst *.markdown *.md *.mkd *.xml *.py *.jinja2
 include LICENSE THANKS docs/changelog.rst pyproject.toml
+graft samples
\ No newline at end of file

From 99c935df8f3d110022ac0fed5f595acd52f36469 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Tue, 12 Oct 2021 22:29:59 +1100
Subject: [PATCH 2477/2864] Omit __pycache__ and *.pyc/pyo files in packages

---
 MANIFEST.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 47d69d99..87d433a8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,6 @@
 include *.rst
 recursive-include pelican *.html *.css *png *.rst *.markdown *.md *.mkd *.xml *.py *.jinja2
 include LICENSE THANKS docs/changelog.rst pyproject.toml
-graft samples
\ No newline at end of file
+graft samples
+global-exclude __pycache__
+global-exclude *.py[co]
\ No newline at end of file

From 17089aefc93b5d44c175db218375a5f013d61111 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 12 Oct 2021 15:58:53 +0200
Subject: [PATCH 2478/2864] Add more contributors to THANKS

---
 THANKS | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/THANKS b/THANKS
index fd9f030e..28b43884 100644
--- a/THANKS
+++ b/THANKS
@@ -1,9 +1,9 @@
-Pelican is a project originally created by Alexis Métaireau
-<https://blog.notmyidea.org/> and subsequently maintained by Justin Mayer
-<https://justinmayer.com/>, but there are a large number of people that have
-contributed or implemented key features over time. We do our best to keep this
-list up-to-date, but you can also have a look at the nice contributor graphs
-produced by GitHub: https://github.com/getpelican/pelican/graphs/contributors
+Pelican is a project led by Justin Mayer <https://justinmayer.com/>
+and originally created by Alexis Métaireau <https://blog.notmyidea.org/>, but
+there are a large number of people that have contributed or implemented key
+features over time. We do our best to keep this list up-to-date, but you can
+also have a look at the nice contributor graphs produced by GitHub:
+https://github.com/getpelican/pelican/graphs/contributors
 
 If you want to contribute, check the documentation section about how to do so:
 <https://docs.getpelican.com/en/latest/contribute.html>
@@ -26,6 +26,7 @@ Arnaud BOS
 asselinpaul
 Axel Haustant
 Ben Rosser (TC01)
+Ben Sturmfels
 Benoît HERVIER
 Bernhard Scheirle
 Borgar
@@ -64,6 +65,7 @@ Feth Arezki
 Florian Jacob
 Florian Preinstorfer
 Félix Delval
+Frederik Ring
 Freeculture
 George V. Reilly
 Guillaume
@@ -77,6 +79,7 @@ Iuri de Silvio
 Ivan Dyedov
 James King
 James Rowe
+Jason K. Moore
 jawher
 Jered Boxman
 Jerome
@@ -87,6 +90,7 @@ John Kristensen
 John Mastro
 Jökull Sólberg Auðunsson
 Jomel Imperio
+Jonas Borges
 Joseph Reagle
 Joshua Adelman
 Julian Berman
@@ -96,6 +100,7 @@ Kevin Yap
 Kyle Fuller
 Laureline Guerin
 Leonard Huang
+Leonardo Giordani
 Leroy Jiang
 Lucas Cimon
 Marcel Hellkamp
@@ -113,8 +118,11 @@ Michael Reneer
 Michael Yanovich
 Mike Yumatov
 Mikhail Korobov
+Mirek Długosz
 m-r-r
 mviera
+Nam Nguyen
+NianQing Yao
 Nico Di Rocco
 Nicolas Duhamel
 Nicolas Perriault
@@ -124,6 +132,8 @@ Paul Asselin
 Pavel Puchkin
 Perry Roper
 Peter Desmet
+Peter Sabaini
+Petr Viktorin
 Philippe Pepiot
 Rachid Belaid
 Randall Degges
@@ -133,6 +143,7 @@ Rémy HUBSCHER
 renhbo
 Richard Duivenvoorde
 Rogdham
+Romain Porte
 Roman Skvazh
 Ronny Pfannschmidt
 Rory McCann
@@ -153,8 +164,10 @@ Tarek Ziade
 Thanos Lefteris
 Thomas Thurman
 Tobias
+Tom Adler
 Tomi Pieviläinen
 Trae Blain
+Tristan Miller
 Tshepang Lekhonkhobe
 Valentin-Costel Hăloiu
 Vlad Niculae

From de2e9b7e4115034a0dedfb9d308850c8c5277db7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 12 Oct 2021 15:59:59 +0200
Subject: [PATCH 2479/2864] Prepare release

---
 RELEASE.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..cabb391e
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,8 @@
+Release type: patch
+
+* Extend rich logging to server component `(#2927) <https://github.com/getpelican/pelican/pull/2927>`_
+* Fix an issue where metadata flagged to be discarded was being cached `(#2926) <https://github.com/getpelican/pelican/pull/2926>`_
+* Adjust suffix in server to allow redirection when needed `(#2931) <https://github.com/getpelican/pelican/pull/2931>`_
+* Add MIME types for web fonts `(#2929) <https://github.com/getpelican/pelican/pull/2929>`_
+* Distribute sample data used to run tests `(#2935) <https://github.com/getpelican/pelican/pull/2935>`_
+* Add Python 3.10 to test matrix

From bb10d286a6ac2f283d332f7e80c5655b9997f827 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Tue, 12 Oct 2021 14:45:30 +0000
Subject: [PATCH 2480/2864] Release Pelican 4.7.1

---
 RELEASE.md         |  8 --------
 docs/changelog.rst | 10 ++++++++++
 pyproject.toml     |  2 +-
 setup.py           |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index cabb391e..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Release type: patch
-
-* Extend rich logging to server component `(#2927) <https://github.com/getpelican/pelican/pull/2927>`_
-* Fix an issue where metadata flagged to be discarded was being cached `(#2926) <https://github.com/getpelican/pelican/pull/2926>`_
-* Adjust suffix in server to allow redirection when needed `(#2931) <https://github.com/getpelican/pelican/pull/2931>`_
-* Add MIME types for web fonts `(#2929) <https://github.com/getpelican/pelican/pull/2929>`_
-* Distribute sample data used to run tests `(#2935) <https://github.com/getpelican/pelican/pull/2935>`_
-* Add Python 3.10 to test matrix
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b7418ca9..b76a4575 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,16 @@
 Release history
 ###############
 
+4.7.1 - 2021-10-12
+==================
+
+* Extend rich logging to server component `(#2927) <https://github.com/getpelican/pelican/pull/2927>`_
+* Fix an issue where metadata flagged to be discarded was being cached `(#2926) <https://github.com/getpelican/pelican/pull/2926>`_
+* Adjust suffix in server to allow redirection when needed `(#2931) <https://github.com/getpelican/pelican/pull/2931>`_
+* Add MIME types for web fonts `(#2929) <https://github.com/getpelican/pelican/pull/2929>`_
+* Distribute sample data used to run tests `(#2935) <https://github.com/getpelican/pelican/pull/2935>`_
+* Add Python 3.10 to test matrix
+
 4.7.0 - 2021-10-01
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index 42bd9a14..8d7749b0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.7.0"
+version = "4.7.1"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index f1ca9dc1..3b538992 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from os.path import join, relpath
 from setuptools import find_packages, setup
 
 
-version = "4.7.0"
+version = "4.7.1"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',

From 9ec1750709c5c2308ab5099e836d516d7478fe1e Mon Sep 17 00:00:00 2001
From: iUnknwn <iUnknwn@users.noreply.github.com>
Date: Tue, 21 Sep 2021 17:45:20 -0700
Subject: [PATCH 2481/2864] Document how to inject articles with a plugin

Add to the plugin documentation a recipe for injecting articles
programmatically when Pelican is running.
---
 docs/plugins.rst | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 8e24b0af..db7e00b4 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -301,6 +301,44 @@ Here is a basic example of how to set up your own writer::
         signals.get_writer.connect(add_writer)
 
 
+Using Plugins to Inject Content
+-------------------------------
+
+You can programmatically inject articles or pages using plugins. This can be
+useful if you plan to fetch articles from an API, for example.
+
+Following is a simple example of how one can build a plugin that injects a
+custom article, using the ``article_generator_pretaxonomy`` signal::
+
+    import datetime
+
+    from pelican import signals
+    from pelican.contents import Article
+    from pelican.readers import BaseReader
+
+    def addArticle(articleGenerator):
+        settings = articleGenerator.settings
+
+        # Author, category, and tags are objects, not strings, so they need to
+        # be handled using BaseReader's process_metadata() function.
+        baseReader = BaseReader(settings)
+
+        content = "I am the body of an injected article!"
+
+        newArticle = Article(content, {
+            "title": "Injected Article!",
+            "date": datetime.datetime.now(),
+            "category": baseReader.process_metadata("category", "fromAPI"),
+            "tags": baseReader.process_metadata("tags", "tagA, tagB")
+        })
+
+        articleGenerator.articles.insert(0, newArticle)
+
+    def register():
+        signals.article_generator_pretaxonomy.connect(addArticle)
+
+
+
 .. _Pip: https://pip.pypa.io/
 .. _pelican-plugins bug #314: https://github.com/getpelican/pelican-plugins/issues/314
 .. _Blinker: https://pythonhosted.org/blinker/

From 1b87ef6a7bdc472cd85c130638b14382457cf487 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 15 Nov 2021 15:39:10 -0600
Subject: [PATCH 2482/2864] Add funding link

---
 .github/FUNDING.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 7e0d5359..8845b0a9 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,5 @@
+---
+
+github: justinmayer
 custom: https://donate.getpelican.com
 liberapay: pelican

From 8eb4be521fe07272bc70ab1b3840cadd5d99923a Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Thu, 25 Nov 2021 23:51:47 +0300
Subject: [PATCH 2483/2864] use docutils.Node.findall instead of traverse

docutils.Node.traverse is being deprecated as of docutils==0.18.1
---
 pelican/readers.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index b42fa4f8..03c3cc20 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -222,7 +222,14 @@ class RstReader(BaseReader):
                 'Ensure exactly one top level section',
                 source_path)
 
-        for docinfo in document.traverse(docutils.nodes.docinfo):
+        try:
+            # docutils 0.18.1+
+            nodes = document.findall(docutils.nodes.docinfo)
+        except AttributeError:
+            # docutils 0.18.0 or before
+            nodes = document.traverse(docutils.nodes.docinfo)
+
+        for docinfo in nodes:
             for element in docinfo.children:
                 if element.tagname == 'field':  # custom fields (e.g. summary)
                     name_elem, body_elem = element.children

From fa31a7e279c3083b262237bfc88e125e110cd680 Mon Sep 17 00:00:00 2001
From: Lukas Winkler <derwinlu+git@gmail.com>
Date: Thu, 25 Nov 2021 20:19:33 +0100
Subject: [PATCH 2484/2864] Extend docstring

We want to hint at the location of our default set of substitutions.
This should allow easier reuse for plugin authors who need to access
this utility as well.

Closes #2845
---
 pelican/utils.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pelican/utils.py b/pelican/utils.py
index 4d025657..17667078 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -230,6 +230,9 @@ def slugify(value, regex_subs=(), preserve_case=False, use_unicode=False):
     and converts spaces to hyphens.
 
     Took from Django sources.
+
+    For a set of sensible default regex substitutions to pass to regex_subs
+    look into pelican.settings.DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS'].
     """
 
     import unicodedata

From 2e35bc90a6a24fc5175cb710c892a3c0ae520936 Mon Sep 17 00:00:00 2001
From: Lukas Winkler <derwinlu+git@gmail.com>
Date: Sat, 27 Nov 2021 10:31:14 +0100
Subject: [PATCH 2485/2864] Change spaces to tab as required by Makefile

Closes #2941
---
 pelican/tools/templates/Makefile.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index a28d658c..2bcb7473 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -72,7 +72,7 @@ help:
 	@echo '   make devserver-global               regenerate and serve on 0.0.0.0    '
 {% if ssh %}
 	@echo '   make ssh_upload                     upload the web site via SSH        '
-    @echo '   make sftp_upload                    upload the web site via SFTP       '
+	@echo '   make sftp_upload                    upload the web site via SFTP       '
 	@echo '   make rsync_upload                   upload the web site via rsync+ssh  '
 {% endif %}
 {% if dropbox %}

From 59f7f4beb85b156175b8573ab8b4da7e5bd9506c Mon Sep 17 00:00:00 2001
From: Lukas Winkler <derwinlu+git@gmail.com>
Date: Sat, 27 Nov 2021 13:56:33 +0100
Subject: [PATCH 2486/2864] Remove unneeded explicit close stmts

Closes #2951
---
 pelican/tools/pelican_quickstart.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index e7cbfea0..032b41a7 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -315,7 +315,6 @@ needed by Pelican.
 
             _template = _jinja_env.get_template('pelicanconf.py.jinja2')
             fd.write(_template.render(**conf_python))
-            fd.close()
     except OSError as e:
         print('Error: {}'.format(e))
 
@@ -324,7 +323,6 @@ needed by Pelican.
                   'w', encoding='utf-8') as fd:
             _template = _jinja_env.get_template('publishconf.py.jinja2')
             fd.write(_template.render(**CONF))
-            fd.close()
     except OSError as e:
         print('Error: {}'.format(e))
 
@@ -334,7 +332,6 @@ needed by Pelican.
                       'w', encoding='utf-8') as fd:
                 _template = _jinja_env.get_template('tasks.py.jinja2')
                 fd.write(_template.render(**CONF))
-                fd.close()
         except OSError as e:
             print('Error: {}'.format(e))
         try:
@@ -343,7 +340,6 @@ needed by Pelican.
                 py_v = 'python3'
                 _template = _jinja_env.get_template('Makefile.jinja2')
                 fd.write(_template.render(py_v=py_v, **CONF))
-                fd.close()
         except OSError as e:
             print('Error: {}'.format(e))
 

From 8f6a61439d8f08d1f3897076ffec9b66678a4f8a Mon Sep 17 00:00:00 2001
From: Lukas Winkler <derwinlu+git@gmail.com>
Date: Sat, 27 Nov 2021 14:04:36 +0100
Subject: [PATCH 2487/2864] Add helper method for rendering jinja templates

---
 pelican/tools/pelican_quickstart.py | 51 ++++++++++-------------------
 1 file changed, 18 insertions(+), 33 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 032b41a7..2d5629ef 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -3,6 +3,7 @@
 import argparse
 import locale
 import os
+from typing import Mapping
 
 from jinja2 import Environment, FileSystemLoader
 
@@ -170,6 +171,16 @@ def ask_timezone(question, default, tzurl):
     return r
 
 
+def render_jinja_template(tmpl_name: str, tmpl_vars: Mapping, target_path: str):
+    try:
+        with open(os.path.join(CONF['basedir'], target_path),
+                  'w', encoding='utf-8') as fd:
+            _template = _jinja_env.get_template(tmpl_name)
+            fd.write(_template.render(**tmpl_vars))
+    except OSError as e:
+        print('Error: {}'.format(e))
+
+
 def main():
     parser = argparse.ArgumentParser(
         description="A kickstarter for Pelican",
@@ -306,42 +317,16 @@ needed by Pelican.
     except OSError as e:
         print('Error: {}'.format(e))
 
-    try:
-        with open(os.path.join(CONF['basedir'], 'pelicanconf.py'),
-                  'w', encoding='utf-8') as fd:
-            conf_python = dict()
-            for key, value in CONF.items():
-                conf_python[key] = repr(value)
+    conf_python = dict()
+    for key, value in CONF.items():
+        conf_python[key] = repr(value)
+    render_jinja_template('pelicanconf.py.jinja2', conf_python, 'pelicanconf.py')
 
-            _template = _jinja_env.get_template('pelicanconf.py.jinja2')
-            fd.write(_template.render(**conf_python))
-    except OSError as e:
-        print('Error: {}'.format(e))
-
-    try:
-        with open(os.path.join(CONF['basedir'], 'publishconf.py'),
-                  'w', encoding='utf-8') as fd:
-            _template = _jinja_env.get_template('publishconf.py.jinja2')
-            fd.write(_template.render(**CONF))
-    except OSError as e:
-        print('Error: {}'.format(e))
+    render_jinja_template('publishconf.py.jinja2', CONF, 'publishconf.py')
 
     if automation:
-        try:
-            with open(os.path.join(CONF['basedir'], 'tasks.py'),
-                      'w', encoding='utf-8') as fd:
-                _template = _jinja_env.get_template('tasks.py.jinja2')
-                fd.write(_template.render(**CONF))
-        except OSError as e:
-            print('Error: {}'.format(e))
-        try:
-            with open(os.path.join(CONF['basedir'], 'Makefile'),
-                      'w', encoding='utf-8') as fd:
-                py_v = 'python3'
-                _template = _jinja_env.get_template('Makefile.jinja2')
-                fd.write(_template.render(py_v=py_v, **CONF))
-        except OSError as e:
-            print('Error: {}'.format(e))
+        render_jinja_template('tasks.py.jinja2', CONF, 'tasks.py')
+        render_jinja_template('Makefile.jinja2', CONF, 'Makefile')
 
     print('Done. Your new project is available at %s' % CONF['basedir'])
 

From 0384c9bc071dd82b9dbe29fb73521587311bfc84 Mon Sep 17 00:00:00 2001
From: "Gunung P. Wibisono" <55311527+gunungpw@users.noreply.github.com>
Date: Fri, 7 Jan 2022 07:26:41 +0700
Subject: [PATCH 2488/2864] Update Poetry install script to `install-poetry.py`
 (#2965)

---
 docs/contribute.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index d1ab322d..99a546a7 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -21,10 +21,10 @@ another, so you can use different packages (and package versions) for each.
 
 Please note that Python 3.6+ is required for Pelican development.
 
-*(Optional)* If you prefer to install Poetry once for use with multiple projects,
+*(Optional)* If you prefer to `install Poetry <https://python-poetry.org/docs/master/#installation>`_ once for use with multiple projects,
 you can install it via::
 
-    curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
+    curl -sSL https://install.python-poetry.org | python3 -
 
 Point your web browser to the `Pelican repository`_ and tap the **Fork** button
 at top-right. Then clone the source for your fork and add the upstream project
@@ -51,7 +51,7 @@ Install the needed dependencies and set up the project::
 Your local environment should now be ready to go!
 
 .. _Pip: https://pip.pypa.io/
-.. _Poetry: https://poetry.eustace.io/docs/#installation
+.. _Poetry: https://python-poetry.org/
 .. _Pelican repository: https://github.com/getpelican/pelican
 
 Development

From fe4f1ec4eada14b4da42a48b15c83082c112306d Mon Sep 17 00:00:00 2001
From: Pierre Equoy <pierre.equoy@protonmail.com>
Date: Mon, 17 Jan 2022 16:06:39 +0800
Subject: [PATCH 2489/2864] Uniformize headers in simple theme

In the simple theme, some templates are using `h1`, others are using
`h2` for the main title of the page (other than the one in the header).
This commit changes that so all of the pages are using `h1`.
---
 pelican/themes/simple/templates/article.html  | 4 ++--
 pelican/themes/simple/templates/author.html   | 2 +-
 pelican/themes/simple/templates/category.html | 2 +-
 pelican/themes/simple/templates/tag.html      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index c8c9a4f7..f85c7410 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -24,9 +24,9 @@
 {% block content %}
 <section id="content" class="body">
   <header>
-    <h2 class="entry-title">
+    <h1 class="entry-title">
       <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-         title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
+         title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
  {% import 'translations.html' as translations with context %}
  {{ translations.translations_for(article) }}
   </header>
diff --git a/pelican/themes/simple/templates/author.html b/pelican/themes/simple/templates/author.html
index a1901946..79d22c7d 100644
--- a/pelican/themes/simple/templates/author.html
+++ b/pelican/themes/simple/templates/author.html
@@ -3,6 +3,6 @@
 {% block title %}{{ SITENAME }} - Articles by {{ author }}{% endblock %}
 
 {% block content_title %}
-<h2>Articles by {{ author }}</h2>
+<h1>Articles by {{ author }}</h1>
 {% endblock %}
 
diff --git a/pelican/themes/simple/templates/category.html b/pelican/themes/simple/templates/category.html
index 14d7ff09..d73f6e31 100644
--- a/pelican/themes/simple/templates/category.html
+++ b/pelican/themes/simple/templates/category.html
@@ -3,6 +3,6 @@
 {% block title %}{{ SITENAME }} - {{ category }} category{% endblock %}
 
 {% block content_title %}
-<h2>Articles in the {{ category }} category</h2>
+<h1>Articles in the {{ category }} category</h1>
 {% endblock %}
 
diff --git a/pelican/themes/simple/templates/tag.html b/pelican/themes/simple/templates/tag.html
index 9c958030..93878134 100644
--- a/pelican/themes/simple/templates/tag.html
+++ b/pelican/themes/simple/templates/tag.html
@@ -3,5 +3,5 @@
 {% block title %}{{ SITENAME }} - {{ tag }} tag{% endblock %}
 
 {% block content_title %}
-<h2>Articles tagged with {{ tag }}</h2>
+<h1>Articles tagged with {{ tag }}</h1>
 {% endblock %}

From 7b9a859e5e30180808794748e47e529485544b8d Mon Sep 17 00:00:00 2001
From: Pierre Equoy <pierre.equoy@protonmail.com>
Date: Mon, 17 Jan 2022 16:11:06 +0800
Subject: [PATCH 2490/2864] Use <main> and <article> tags in simple theme

Add a <main> tag to surround all the content blocks, so that it's easier
to target the main part of a page (be it an article, the list of posts
or the different categories) using CSS.

Because of this, the <section> part of the article.html template is made
redundant, so it is removed.

Finally, the generic <div> is replaced by an <article> tag to surround
the article's content.
---
 pelican/themes/simple/templates/article.html | 6 ++----
 pelican/themes/simple/templates/base.html    | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index f85c7410..6dd0d967 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -22,7 +22,6 @@
 {% endblock %}
 
 {% block content %}
-<section id="content" class="body">
   <header>
     <h1 class="entry-title">
       <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
@@ -60,8 +59,7 @@
     </div>
     {% endif %}
   </footer><!-- /.post-info -->
-  <div class="entry-content">
+  <article>
     {{ article.content }}
-  </div><!-- /.entry-content -->
-</section>
+  </article>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 2c17dbfb..b1ea57da 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -51,8 +51,10 @@
           {% endfor %}
         {% endif %}
         </ul></nav><!-- /#menu -->
+        <main>
         {% block content %}
         {% endblock %}
+        </main>
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
                 Proudly powered by <a href="https://getpelican.com/">Pelican</a>,

From 4794752dd9ecd4f80eac52f84bd15abbf5bb9d4b Mon Sep 17 00:00:00 2001
From: Pierre Equoy <pierre.equoy@protonmail.com>
Date: Mon, 17 Jan 2022 16:14:19 +0800
Subject: [PATCH 2491/2864] Add a viewport meta tag in simple theme for better
 mobile support

See MDN article about this:

https://developer.mozilla.org/en-US/docs/Web/HTML/Viewport_meta_tag
---
 pelican/themes/simple/templates/base.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index b1ea57da..6ac81e26 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -5,6 +5,7 @@
         <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
         {% if FEED_ALL_ATOM %}
         <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
         {% endif %}

From 2f5fc106143558307651f738b904cd3dedea5a55 Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Tue, 1 Feb 2022 19:07:23 +0100
Subject: [PATCH 2492/2864] Add categories.html template to default theme

---
 pelican/tests/output/basic/categories.html       |  6 +++++-
 pelican/tests/output/custom/categories.html      |  6 +++++-
 .../tests/output/custom_locale/categories.html   |  6 +++++-
 .../themes/notmyidea/templates/categories.html   | 16 ++++++++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 pelican/themes/notmyidea/templates/categories.html

diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 930503a8..f6c17dd5 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -22,13 +22,17 @@
                     <li><a href="/category/yeah.html">yeah</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
-    <h1>Categories on A Pelican Blog</h1>
+
+    <section id="content" class="body">
+    <h1>Categories for A Pelican Blog</h1>
     <ul>
         <li><a href="/category/bar.html">bar</a> (1)</li>
         <li><a href="/category/cat1.html">cat1</a> (4)</li>
         <li><a href="/category/misc.html">misc</a> (4)</li>
         <li><a href="/category/yeah.html">yeah</a> (1)</li>
     </ul>
+    </section>
+
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 543eb1ee..74990d4b 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -26,13 +26,17 @@
                     <li><a href="./category/bar.html">bar</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
-    <h1>Categories on Alexis' log</h1>
+
+    <section id="content" class="body">
+    <h1>Categories for Alexis' log</h1>
     <ul>
         <li><a href="./category/bar.html">bar</a> (1)</li>
         <li><a href="./category/cat1.html">cat1</a> (4)</li>
         <li><a href="./category/misc.html">misc</a> (4)</li>
         <li><a href="./category/yeah.html">yeah</a> (1)</li>
     </ul>
+    </section>
+
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 0d46b9a0..1decaabd 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -26,13 +26,17 @@
                     <li><a href="./category/bar.html">bar</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
-    <h1>Categories on Alexis' log</h1>
+
+    <section id="content" class="body">
+    <h1>Categories for Alexis' log</h1>
     <ul>
         <li><a href="./category/bar.html">bar</a> (1)</li>
         <li><a href="./category/cat1.html">cat1</a> (4)</li>
         <li><a href="./category/misc.html">misc</a> (4)</li>
         <li><a href="./category/yeah.html">yeah</a> (1)</li>
     </ul>
+    </section>
+
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
diff --git a/pelican/themes/notmyidea/templates/categories.html b/pelican/themes/notmyidea/templates/categories.html
new file mode 100644
index 00000000..07f6290a
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/categories.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - Categories{% endblock %}
+
+{% block content %}
+
+<section id="content" class="body">
+    <h1>Categories for {{ SITENAME }}</h1>
+    <ul>
+    {% for category, articles in categories|sort %}
+        <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
+    {% endfor %}
+    </ul>
+</section>
+
+{% endblock %}

From fe19f1abb661a666af9fc194d02b86a7bb37252d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 1 Feb 2022 12:10:20 -0700
Subject: [PATCH 2493/2864] Pin Sphinx to avoid aggressive extlinks warning

See: https://github.com/sphinx-doc/sphinx/issues/10112
---
 pyproject.toml        | 2 +-
 requirements/docs.pip | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8d7749b0..7a2889cc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,7 +48,7 @@ jinja2 = "~2.11"
 lxml = "^4.3"
 markdown = "~3.3.4"
 typogrify = "^2.0"
-sphinx = "^3.0"
+sphinx = "<4.4.0"
 sphinx_rtd_theme = "^0.5"
 livereload = "^2.6"
 psutil = {version = "^5.7", optional = true}
diff --git a/requirements/docs.pip b/requirements/docs.pip
index bd25c939..a5a184ef 100644
--- a/requirements/docs.pip
+++ b/requirements/docs.pip
@@ -1,3 +1,3 @@
-sphinx
+sphinx<4.4.0
 sphinx_rtd_theme
 livereload

From ab81f183c6bdf7414f8a4a377f2db635886378f0 Mon Sep 17 00:00:00 2001
From: Victor Skvortsov <vds003@gmail.com>
Date: Wed, 20 Oct 2021 16:10:36 +0500
Subject: [PATCH 2494/2864] Add failing tests

---
 pelican/tests/test_cli.py | 72 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 pelican/tests/test_cli.py

diff --git a/pelican/tests/test_cli.py b/pelican/tests/test_cli.py
new file mode 100644
index 00000000..13b307e7
--- /dev/null
+++ b/pelican/tests/test_cli.py
@@ -0,0 +1,72 @@
+import unittest
+
+from pelican import get_config, parse_arguments
+
+
+class TestParseOverrides(unittest.TestCase):
+    def test_flags(self):
+        for flag in ['-e', '--extra-settings']:
+            args = parse_arguments([flag, 'k=1'])
+            self.assertDictEqual(args.overrides, {'k': 1})
+
+    def test_parse_multiple_items(self):
+        args = parse_arguments('-e k1=1 k2=2'.split())
+        self.assertDictEqual(args.overrides, {'k1': 1, 'k2': 2})
+
+    def test_parse_valid_json(self):
+        json_values_python_values_map = {
+            '""': '',
+            'null': None,
+            '"string"': 'string',
+            '["foo", 12, "4", {}]': ['foo', 12, '4', {}]
+        }
+        for k, v in json_values_python_values_map.items():
+            args = parse_arguments(['-e', 'k=' + k])
+            self.assertDictEqual(args.overrides, {'k': v})
+
+    def test_parse_invalid_syntax(self):
+        invalid_items = ['k= 1', 'k =1', 'k', 'k v']
+        for item in invalid_items:
+            with self.assertRaises(ValueError):
+                parse_arguments(f'-e {item}'.split())
+
+    def test_parse_invalid_json(self):
+        invalid_json = {
+            '', 'False', 'True', 'None', 'some other string',
+            '{"foo": bar}', '[foo]'
+        }
+        for v in invalid_json:
+            with self.assertRaises(ValueError):
+                parse_arguments(['-e ', 'k=' + v])
+
+
+class TestGetConfigFromArgs(unittest.TestCase):
+    def test_overrides_known_keys(self):
+        args = parse_arguments([
+            '-e',
+            'DELETE_OUTPUT_DIRECTORY=false',
+            'OUTPUT_RETENTION=["1.txt"]',
+            'SITENAME="Title"'
+        ])
+        config = get_config(args)
+        config_must_contain = {
+            'DELETE_OUTPUT_DIRECTORY': False,
+            'OUTPUT_RETENTION': ['1.txt'],
+            'SITENAME': 'Title'
+        }
+        self.assertDictEqual(config, {**config, **config_must_contain})
+
+    def test_overrides_non_default_type(self):
+        args = parse_arguments([
+            '-e',
+            'DISPLAY_PAGES_ON_MENU=123',
+            'PAGE_TRANSLATION_ID=null',
+            'TRANSLATION_FEED_RSS_URL="someurl"'
+        ])
+        config = get_config(args)
+        config_must_contain = {
+            'DISPLAY_PAGES_ON_MENU': 123,
+            'PAGE_TRANSLATION_ID': None,
+            'TRANSLATION_FEED_RSS_URL': 'someurl'
+        }
+        self.assertDictEqual(config, {**config, **config_must_contain})

From 5c178a1ccb8d6cbc7570ca0719128c2803aed974 Mon Sep 17 00:00:00 2001
From: Victor Skvortsov <vds003@gmail.com>
Date: Wed, 20 Oct 2021 16:17:31 +0500
Subject: [PATCH 2495/2864] Fix #2938

Get rid of the coerce_overrides() function.
Add the ParseOverrides argparse.Action to parse overrides.
Treat all extra settings values strictly as json values.
Test overrides.
Edit docs and cli help.
---
 RELEASE.md                     |  3 ++
 docs/settings.rst              |  9 +++---
 pelican/__init__.py            | 50 ++++++++++++++++++++++------------
 pelican/settings.py            | 23 ----------------
 pelican/tests/test_settings.py | 17 +-----------
 5 files changed, 42 insertions(+), 60 deletions(-)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..76e47100
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,3 @@
+Release type: patch
+
+Fix incorrect parsing of parameters specified via `-e` / `--extra-settings` option flags (#2938).
diff --git a/docs/settings.rst b/docs/settings.rst
index 47852527..675e6b8f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -9,11 +9,12 @@ line::
 If you used the ``pelican-quickstart`` command, your primary settings file will
 be named ``pelicanconf.py`` by default.
 
-You can also specify extra settings via ``-e`` / ``--extra-settings`` option
-flags, which will override default settings as well as any defined within
-settings files::
+You can also specify settings via ``-e`` / ``--extra-settings`` option
+flags. It will override default settings as well as any defined within the
+setting file. Note that values must follow JSON notation::
+
+    pelican content -e SITENAME='"A site"' READERS='{"html": null}' CACHE_CONTENT=true
 
-    pelican content -e DELETE_OUTPUT_DIRECTORY=true
 
 .. note::
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 99aa2776..9858dbd3 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,4 +1,5 @@
 import argparse
+import json
 import logging
 import multiprocessing
 import os
@@ -24,7 +25,7 @@ from pelican.plugins import signals
 from pelican.plugins._utils import get_plugin_name, load_plugins
 from pelican.readers import Readers
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
-from pelican.settings import coerce_overrides, read_settings
+from pelican.settings import read_settings
 from pelican.utils import (FileSystemWatcher, clean_output_dir, maybe_pluralize)
 from pelican.writers import Writer
 
@@ -259,16 +260,29 @@ class PrintSettings(argparse.Action):
         parser.exit()
 
 
-class ParseDict(argparse.Action):
+class ParseOverrides(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
-        d = {}
-        if values:
-            for item in values:
-                split_items = item.split("=", 1)
-                key = split_items[0].strip()
-                value = split_items[1].strip()
-                d[key] = value
-        setattr(namespace, self.dest, d)
+        overrides = {}
+        for item in values:
+            try:
+                k, v = item.split("=", 1)
+            except ValueError:
+                raise ValueError(
+                    'Extra settings must be specified as KEY=VALUE pairs '
+                    f'but you specified {item}'
+                )
+            try:
+                overrides[k] = json.loads(v)
+            except json.decoder.JSONDecodeError:
+                raise ValueError(
+                    f'Invalid JSON value: {v}. '
+                    'Values specified via -e / --extra-settings flags '
+                    'must be in JSON notation. '
+                    'Use -e KEY=\'"string"\' to specify a string value; '
+                    '-e KEY=null to specify None; '
+                    '-e KEY=false (or true) to specify False (or True).'
+                )
+        setattr(namespace, self.dest, overrides)
 
 
 def parse_arguments(argv=None):
@@ -366,13 +380,13 @@ def parse_arguments(argv=None):
 
     parser.add_argument('-e', '--extra-settings', dest='overrides',
                         help='Specify one or more SETTING=VALUE pairs to '
-                             'override settings. If VALUE contains spaces, '
-                             'add quotes: SETTING="VALUE". Values other than '
-                             'integers and strings can be specified via JSON '
-                             'notation. (e.g., SETTING=none)',
+                             'override settings. VALUE must be in JSON notation: '
+                             'specify string values as SETTING=\'"some string"\'; '
+                             'booleans as SETTING=true or SETTING=false; '
+                             'None as SETTING=null.',
                         nargs='*',
-                        action=ParseDict
-                        )
+                        action=ParseOverrides,
+                        default={})
 
     args = parser.parse_args(argv)
 
@@ -385,6 +399,8 @@ def parse_arguments(argv=None):
 
 
 def get_config(args):
+    """Builds a config dictionary based on supplied `args`.
+    """
     config = {}
     if args.path:
         config['PATH'] = os.path.abspath(os.path.expanduser(args.path))
@@ -409,7 +425,7 @@ def get_config(args):
     if args.bind is not None:
         config['BIND'] = args.bind
     config['DEBUG'] = args.verbosity == logging.DEBUG
-    config.update(coerce_overrides(args.overrides))
+    config.update(args.overrides)
 
     return config
 
diff --git a/pelican/settings.py b/pelican/settings.py
index ea3ee8eb..5b495e86 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,7 +1,6 @@
 import copy
 import importlib.util
 import inspect
-import json
 import locale
 import logging
 import os
@@ -659,25 +658,3 @@ def configure_settings(settings):
             continue            # setting not specified, nothing to do
 
     return settings
-
-
-def coerce_overrides(overrides):
-    if overrides is None:
-        return {}
-    coerced = {}
-    types_to_cast = {int, str, bool}
-    for k, v in overrides.items():
-        if k not in DEFAULT_CONFIG:
-            logger.warning('Override for unknown setting %s, ignoring', k)
-            continue
-        setting_type = type(DEFAULT_CONFIG[k])
-        if setting_type not in types_to_cast:
-            coerced[k] = json.loads(v)
-        else:
-            try:
-                coerced[k] = setting_type(v)
-            except ValueError:
-                logger.debug('ValueError for %s override with %s, try to '
-                             'load as json', k, v)
-                coerced[k] = json.loads(v)
-    return coerced
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 83203ae5..c407f7c8 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -7,7 +7,7 @@ from sys import platform
 
 from pelican.settings import (DEFAULT_CONFIG, DEFAULT_THEME,
                               _printf_s_to_format_field,
-                              coerce_overrides, configure_settings,
+                              configure_settings,
                               handle_deprecated_settings, read_settings)
 from pelican.tests.support import unittest
 
@@ -304,18 +304,3 @@ class TestSettingsConfiguration(unittest.TestCase):
                          [(r'C\+\+', 'cpp')] +
                          self.settings['SLUG_REGEX_SUBSTITUTIONS'])
         self.assertNotIn('SLUG_SUBSTITUTIONS', settings)
-
-    def test_coerce_overrides(self):
-        overrides = coerce_overrides({
-            'ARTICLE_EXCLUDES': '["testexcl"]',
-            'READERS': '{"foo": "bar"}',
-            'STATIC_EXCLUDE_SOURCES': 'true',
-            'THEME_STATIC_DIR': 'theme',
-            })
-        expected = {
-            'ARTICLE_EXCLUDES': ["testexcl"],
-            'READERS': {"foo": "bar"},
-            'STATIC_EXCLUDE_SOURCES': True,
-            'THEME_STATIC_DIR': 'theme',
-        }
-        self.assertDictEqual(overrides, expected)

From f3613af15547fce1130f5885aca5c4414f0b91f7 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Wed, 9 Feb 2022 22:15:59 +0900
Subject: [PATCH 2496/2864] Fix typo in cache.py (#2978)

sublcass -> subclass
---
 pelican/cache.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/cache.py b/pelican/cache.py
index c1d4a55d..d2665691 100644
--- a/pelican/cache.py
+++ b/pelican/cache.py
@@ -74,7 +74,7 @@ class FileStampDataCacher(FileDataCacher):
     """Subclass that also caches the stamp of the file"""
 
     def __init__(self, settings, cache_name, caching_policy, load_policy):
-        """This sublcass additionally sets filestamp function
+        """This subclass additionally sets filestamp function
         and base path for filestamping operations
         """
 

From 582341208533d595766a414a0e4ca7a3b2595c77 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Wed, 9 Feb 2022 13:25:50 +0000
Subject: [PATCH 2497/2864] Release Pelican 4.7.2

---
 RELEASE.md         | 3 ---
 docs/changelog.rst | 5 +++++
 pyproject.toml     | 2 +-
 setup.py           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 76e47100..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Release type: patch
-
-Fix incorrect parsing of parameters specified via `-e` / `--extra-settings` option flags (#2938).
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b76a4575..59102506 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+4.7.2 - 2022-02-09
+==================
+
+Fix incorrect parsing of parameters specified via `-e` / `--extra-settings` option flags (#2938).
+
 4.7.1 - 2021-10-12
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index 7a2889cc..3d226c5c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.7.1"
+version = "4.7.2"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index 3b538992..0b536e52 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from os.path import join, relpath
 from setuptools import find_packages, setup
 
 
-version = "4.7.1"
+version = "4.7.2"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',

From 77e5381be73347d7f1ad6e616d1460ca023e920f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 9 Feb 2022 09:07:42 -0700
Subject: [PATCH 2498/2864] Update CHANGELOG

---
 docs/changelog.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 59102506..576e3d0c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,9 @@ Release history
 4.7.2 - 2022-02-09
 ==================
 
-Fix incorrect parsing of parameters specified via `-e` / `--extra-settings` option flags (#2938).
+* Fix incorrect parsing of parameters specified via `-e` / `--extra-settings` option flags `(#2938) <https://github.com/getpelican/pelican/pull/2938>`_
+* Add ``categories.html`` template to default theme `(#2973) <https://github.com/getpelican/pelican/pull/2973>`_
+* Document how to use plugins to inject content `(#2922) <https://github.com/getpelican/pelican/pull/2922>`_
 
 4.7.1 - 2021-10-12
 ==================

From 16b8a03ad92c32788cb4ceb2d8d4e0a6f670c0a1 Mon Sep 17 00:00:00 2001
From: Pierre Equoy <pierre.equoy@protonmail.com>
Date: Sat, 22 Jan 2022 21:31:37 +0800
Subject: [PATCH 2499/2864] Remove unnecessary ids and classes in simple theme

All of the modified HTML tags can be accessed in CSS without the need
for a dedicated id or an additional class.
---
 pelican/themes/simple/templates/base.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 6ac81e26..1d8ae843 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -33,11 +33,11 @@
         {% endblock head %}
 </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
+<body>
+        <header>
                 <h1><a href="{{ SITEURL }}/">{{ SITENAME }}{% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
-        </header><!-- /#banner -->
-        <nav id="menu"><ul>
+        </header>
+        <nav><ul>
         {% for title, link in MENUITEMS %}
             <li><a href="{{ link }}">{{ title }}</a></li>
         {% endfor %}
@@ -51,16 +51,16 @@
             <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
           {% endfor %}
         {% endif %}
-        </ul></nav><!-- /#menu -->
+        </ul></nav>
         <main>
         {% block content %}
         {% endblock %}
         </main>
-        <footer id="contentinfo" class="body">
+        <footer>
                 <address id="about" class="vcard body">
                 Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
                 which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
-        </footer><!-- /#contentinfo -->
+        </footer>
 </body>
 </html>

From 433453924b75e312a8c24481dc818e0c197e6eaa Mon Sep 17 00:00:00 2001
From: chadmando <gobu99@gmail.com>
Date: Fri, 11 Mar 2022 11:09:59 -0600
Subject: [PATCH 2500/2864] fix missing word in Automation section

---
 docs/publish.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/publish.rst b/docs/publish.rst
index ae1428f5..46913dea 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -104,7 +104,7 @@ information gleaned from other answers provided during the
 ``pelican-quickstart`` process, are meant as a starting point and should be
 customized to fit your particular needs and usage patterns. If you find one or
 both of these automation tools to be of limited utility, these files can
-deleted at any time and will not affect usage of the canonical ``pelican``
+be deleted at any time and will not affect usage of the canonical ``pelican``
 command.
 
 Following are automation tools that "wrap" the ``pelican`` command and can

From eca0ee04b7cc5af36a1d9c43e9a9ba2cf8387a4c Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 23 Mar 2022 22:33:57 +0300
Subject: [PATCH 2501/2864] use JSON values for  extra settings in invoke
 template

Signed-off-by: Deniz Turgut <dturgut@gmail.com>
---
 pelican/tools/templates/tasks.py.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 861dee37..f3caed56 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -107,7 +107,7 @@ def livereload(c):
     from livereload import Server
 
     def cached_build():
-        cmd = '-s {settings_base} -e CACHE_CONTENT=True LOAD_CONTENT_CACHE=True'
+        cmd = '-s {settings_base} -e CACHE_CONTENT=true LOAD_CONTENT_CACHE=true'
         pelican_run(cmd.format(**CONFIG))
 
     cached_build()

From d89c6f6ed28065106857f2eae7c98a6b943f983f Mon Sep 17 00:00:00 2001
From: Ravin Kumar <ravinsdrive@gmail.com>
Date: Thu, 28 Apr 2022 19:28:26 -0700
Subject: [PATCH 2502/2864] Fix small typo

---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 1740df88..6ffffdc3 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -15,7 +15,7 @@ from pelican.utils import (deprecated_attribute, memoized, path_to_url,
                            posixize_path, sanitised_join, set_date_tzinfo,
                            slugify, truncate_html_words)
 
-# Import these so that they're avalaible when you import from pelican.contents.
+# Import these so that they're available when you import from pelican.contents.
 from pelican.urlwrappers import (Author, Category, Tag, URLWrapper)  # NOQA
 
 logger = logging.getLogger(__name__)

From 595f3be9880e63b0af479ffd88a31ef87c3ae8f5 Mon Sep 17 00:00:00 2001
From: Ravin Kumar <ravinsdrive@gmail.com>
Date: Thu, 28 Apr 2022 19:31:21 -0700
Subject: [PATCH 2503/2864] Add content expansion

---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 1740df88..73579807 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -337,7 +337,7 @@ class Content:
         intrasite_link_regex = self.settings['INTRASITE_LINK_REGEX']
         regex = r"""
             (?P<markup><[^\>]+  # match tag with all url-value attributes
-                (?:href|src|poster|data|cite|formaction|action)\s*=\s*)
+                (?:href|src|poster|data|cite|formaction|action|content)\s*=\s*)
 
             (?P<quote>["\'])      # require value to be quoted
             (?P<path>{}(?P<value>.*?))  # the url value

From 392bf981184ff1503f4a895b34d281d9f26dbbe0 Mon Sep 17 00:00:00 2001
From: Ravin Kumar <ravinsdrive@gmail.com>
Date: Thu, 28 Apr 2022 19:53:03 -0700
Subject: [PATCH 2504/2864] Add content tag static expansion

---
 pelican/tests/test_contents.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 32012d4f..3a223b5a 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -522,6 +522,16 @@ class TestPage(TestBase):
             '<img src="http://static.cool.site/images/poster.jpg"/>'
         )
 
+        # Image link will go to static
+        args['content'] = (
+            '<meta content="{static}/images/poster.jpg"/>'
+        )
+        content = Page(**args).get_content('http://cool.site')
+        self.assertEqual(
+            content,
+            '<meta content="http://static.cool.site/images/poster.jpg"/>'
+        )
+
     def test_intrasite_link_escape(self):
         article = type(
             '_DummyArticle', (object,), {'url': 'article-spaces.html'})

From 39e5edde9c92b959387a4b6096331cf6eeb1d70e Mon Sep 17 00:00:00 2001
From: Alex Peters <alex@peters.net>
Date: Thu, 16 Jun 2022 13:36:59 +1000
Subject: [PATCH 2505/2864] Describe all `CHECK_MODIFIED_METHOD` options

Fixes #2991.
---
 docs/settings.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 675e6b8f..e51c6a12 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -350,6 +350,11 @@ Basic settings
 
    Controls how files are checked for modifications.
 
+   - If set to ``'mtime'``, the modification time of the file is
+     checked.
+   - If set to a name of a function provided by the ``hashlib``
+     module, e.g. ``'md5'``, the file hash is checked.
+
 .. data:: LOAD_CONTENT_CACHE = False
 
    If ``True``, load unmodified content from caches.

From 70060161215d47ed9f9f51d8f490b0944e26e44e Mon Sep 17 00:00:00 2001
From: Alex Peters <alex@peters.net>
Date: Thu, 16 Jun 2022 14:18:52 +1000
Subject: [PATCH 2506/2864] Add note about unintended static page processing

Fixes #2990.
---
 docs/content.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/content.rst b/docs/content.rst
index cd492012..84ebb6da 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -197,6 +197,13 @@ are copied over with the ``STATIC_PATHS`` setting of the project's
 ``images`` directory for this, but others must be added manually. In addition,
 static files that are explicitly linked to are included (see below).
 
+.. note::
+
+   In the default configuration, all files with a valid content file suffix
+   (``.html``, ``.rst``, ``.md``, ...) get processed by the article and page
+   generators *before* the static generator. This is avoided by altering the
+   ``*_EXCLUDE`` settings appropriately.
+
 Mixed content in the same directory
 -----------------------------------
 

From d5d792060cd5e4c3ff6da82359589b990fa83f27 Mon Sep 17 00:00:00 2001
From: manhhomienbienthuy <1755796+manhhomienbienthuy@users.noreply.github.com>
Date: Tue, 12 Jul 2022 02:47:37 +0900
Subject: [PATCH 2507/2864] Fix #2982: Improve _HTMLWordTruncator (#3002)

---
 RELEASE.md                  | 5 +++++
 pelican/tests/test_utils.py | 5 +++++
 pelican/utils.py            | 5 +----
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..36f865f8
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,5 @@
+Release type: minor
+
+* Use JSON values for extra settings in Invoke tasks template (#2994)
+* Add content tag for links, which can help with things like Twitter social cards (#3001)
+* Improve word count behavior when generating summary (#3002)
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 710e14ed..ee5146df 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -230,6 +230,11 @@ class TestUtils(LoggedTestCase):
                 'Ты мелькнула, ты предстала, Снова сердце задрожало,', 3
             ),
             'Ты мелькнула, ты' + ' …')
+        self.assertEqual(
+            utils.truncate_html_words(
+                'Trong đầm gì đẹp bằng sen', 4
+            ),
+            'Trong đầm gì đẹp' + ' …')
 
         # Words enclosed or intervaled by HTML tags.
         self.assertEqual(
diff --git a/pelican/utils.py b/pelican/utils.py
index 17667078..f3a01217 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -412,10 +412,7 @@ def posixize_path(rel_path):
 
 class _HTMLWordTruncator(HTMLParser):
 
-    _word_regex = re.compile(r"(({SBC})({SBC}|-|')*)|{DBC}".format(
-        # SBC means Latin-like characters. A word contains a few characters.
-        #         ASCII |Extended Latin | Cyrillic
-        SBC="[0-9a-zA-Z]|[\u00C0-\u024f]|[\u0400-\u04FF]",
+    _word_regex = re.compile(r"{DBC}|(\w[\w'-]*)".format(
         # DBC means CJK-like characters. An character can stand for a word.
         DBC=("([\u4E00-\u9FFF])|"          # CJK Unified Ideographs
              "([\u3400-\u4DBF])|"          # CJK Unified Ideographs Extension A

From 9685e4b594253bb0effa3bbd9d1f78ab6868d842 Mon Sep 17 00:00:00 2001
From: botpub <botpub@autopub.rocks>
Date: Mon, 11 Jul 2022 17:51:01 +0000
Subject: [PATCH 2508/2864] Release Pelican 4.8.0

---
 RELEASE.md         | 5 -----
 docs/changelog.rst | 7 +++++++
 pyproject.toml     | 2 +-
 setup.py           | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 36f865f8..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Release type: minor
-
-* Use JSON values for extra settings in Invoke tasks template (#2994)
-* Add content tag for links, which can help with things like Twitter social cards (#3001)
-* Improve word count behavior when generating summary (#3002)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 576e3d0c..5ac34fd3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,13 @@
 Release history
 ###############
 
+4.8.0 - 2022-07-11
+==================
+
+* Use JSON values for extra settings in Invoke tasks template (#2994)
+* Add content tag for links, which can help with things like Twitter social cards (#3001)
+* Improve word count behavior when generating summary (#3002)
+
 4.7.2 - 2022-02-09
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index 3d226c5c..afcae0fb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pelican"
-version = "4.7.2"
+version = "4.8.0"
 description = "Static site generator supporting Markdown and reStructuredText"
 authors = ["Justin Mayer <entrop@gmail.com>"]
 license = "AGPLv3"
diff --git a/setup.py b/setup.py
index 0b536e52..ccaa44ab 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from os.path import join, relpath
 from setuptools import find_packages, setup
 
 
-version = "4.7.2"
+version = "4.8.0"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
             'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',

From 84dfbcf3dc7bcfd56a8bd8989ef3655ca31ac296 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 11 Jul 2022 19:54:13 +0200
Subject: [PATCH 2509/2864] Update PR links in changelog

---
 docs/changelog.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5ac34fd3..88353ed4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,9 +4,9 @@ Release history
 4.8.0 - 2022-07-11
 ==================
 
-* Use JSON values for extra settings in Invoke tasks template (#2994)
-* Add content tag for links, which can help with things like Twitter social cards (#3001)
-* Improve word count behavior when generating summary (#3002)
+* Use JSON values for extra settings in Invoke tasks template `(#2994) <https://github.com/getpelican/pelican/pull/2994>`_
+* Add content tag for links, which can help with things like Twitter social cards `(#3001) <https://github.com/getpelican/pelican/pull/3001>`_
+* Improve word count behavior when generating summary `(#3002) <https://github.com/getpelican/pelican/pull/3002>`_
 
 4.7.2 - 2022-02-09
 ==================

From 6cac8237ccfe3f91f5a4f40300c085a83eb18adc Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Sun, 24 Jul 2022 07:55:18 +1000
Subject: [PATCH 2510/2864] docs: Fix a few typos

There are small typos in:
- docs/tips.rst
- pelican/tests/__init__.py

Fixes:
- Should read `module` rather than `modulole`.
- Should read `console` rather than `cosole`.

Signed-off-by: Tim Gates <tim.gates@iress.com>
---
 docs/tips.rst             | 2 +-
 pelican/tests/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tips.rst b/docs/tips.rst
index 78013227..8b9dda15 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -30,7 +30,7 @@ For Apache::
     ErrorDocument 404 /404.html
 
 For Amazon S3, first navigate to the ``Static Site Hosting`` menu in the bucket
-settings on your AWS cosole. From there::
+settings on your AWS console. From there::
 
     Error Document: 404.html
 
diff --git a/pelican/tests/__init__.py b/pelican/tests/__init__.py
index 4605a02b..564e417c 100644
--- a/pelican/tests/__init__.py
+++ b/pelican/tests/__init__.py
@@ -3,7 +3,7 @@ import warnings
 
 from pelican.log import log_warnings
 
-# redirect warnings modulole to use logging instead
+# redirect warnings module to use logging instead
 log_warnings()
 
 # setup warnings to log DeprecationWarning's and error on

From 494b418ddaab52c064620b98ee77c0e392ae754d Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Tue, 4 Jan 2022 18:34:35 +0100
Subject: [PATCH 2511/2864] Use Furo as Sphinx documentation theme

---
 docs/_static/pelican-logo.svg |  1 +
 docs/conf.py                  | 21 +++++++--------------
 pyproject.toml                |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)
 create mode 100644 docs/_static/pelican-logo.svg

diff --git a/docs/_static/pelican-logo.svg b/docs/_static/pelican-logo.svg
new file mode 100644
index 00000000..95b947bf
--- /dev/null
+++ b/docs/_static/pelican-logo.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="svg33" width="64" height="64" style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.4142" version="1.1" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g id="g864" transform="matrix(.10228 0 0 .10228 2.441 6.0098e-5)"><g id="g4" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path2" d="m210.35 607.22c-.34-2.106-.842-4.303-1.491-6.591-1.537-5.441-4.918-10.074-9.506-13.854-1.205-1.001-2.503-1.946-3.88-2.823-5.293-3.381-11.692-5.851-18.522-7.32-4.588-.99-9.367-1.525-14.139-1.593-34.662-.774-56.234.387-90.373-.911.012.023.012.046.022.068 1.56 1.264 3.154 2.471 4.782 3.643 3.573 2.584 7.297 4.952 11.155 7.127 7.184 4.04 14.845 7.342 22.859 9.801.956.295 1.912.58 2.87.842 5.6.603 10.631 1.206 14.648 3.074 1.015.455 1.959 1.001 2.835 1.639 2.87 2.106 6.057 6.124 8.152 8.936 4.497 5.999 3.551 10.928 8.88 13.887.557.308 1.182.604 1.889.866 1.696.638 4.119 1.491 5.225-.91.16-.342.283-.764.387-1.264-.446-1.434-1.981-2.675-2.905-3.29-1.638-1.07-2.287-1.719-3.47-2.937-2.186-2.243-2.333-6.056-3.871-8.708 1.935-.82 12.146-2.186 14.287-1.89 4.576.204 8.185.557 10.939 3.392 1.08.854 1.672 1.594 2.652 2.334.069.057.125.114.194.159 4.338 3.153 8.343 4.28 11.894 5.362.936.284 1.822.558 2.69.876 1.332.478 2.582 1.048 3.754 1.81 1.39.922 3.748 3.336 3.849 5.419-3.496-1.116-1.185.296-6.342-.102-2.515-.285-5.087-.456-7.671-.638-4.018-.284-8.038-.581-11.805-1.297-.627-.115-1.254-.251-1.867-.399-.479-.102-.946-.227-1.401-.353-.011.193-.021.376-.021.546-.104 3.939 2.674 5.908-3.678 13.399-.057.08-.137.159-.205.25-1.686 1.97-10.449 5.715-13.182 6.432-11.634 2.334-20.502-5.237-34.515-1.423-4.929 1.833-8.549 9.824-10.815 15.8-3.016 7.936-5.406 17.576-8.139 27.06 5.329-.797 10.53-1.936 15.585-3.427 11.167-3.279 21.651-8.185 31.168-14.445.911-1.231 1.912-2.29 2.994-3.108.284-.217.58-.422.877-.603.215-.137.956-.286 2.127-.502 10.861-1.924 58.5-8.377 61.597-42.962.319-3.494.172-7.285-.513-11.372zm-106.94 18.59c-6.375-1.924-8.003-2.243-12.055-5.385.067.33.17.695.307 1.081 10.779 6.068 22.608 10.462 35.141 12.842-3.893-9.051-8.502-7.445-23.393-8.538zm29.518-4.099c-2.779-6.738-10.313-10.575-16.813-12.464-8.721-3.12-15.061-.125-33.458-8.811.147.239.284.467.432.694 3.575 2.584 7.297 4.963 11.157 7.126 7.184 4.041 14.844 7.343 22.857 9.802 4.167.489 8.175 1.184 11.863 2.96 1.639.773 3.21 1.764 4.702 3.039-.183-.82-.434-1.605-.74-2.346z" style="fill-rule:nonzero;fill:url(#_Linear1)"/></g><g id="g8" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path6" d="m114.13 595.61c-.958-.262-1.914-.547-2.87-.842-8.014-2.459-15.675-5.761-22.859-9.801-3.858-2.175-7.582-4.543-11.155-7.127-1.628-1.172-3.222-2.379-4.782-3.643 2.14 6.603 11.634 13.57 18.078 16.313 8.218 3.495 16.381 4.303 23.588 5.1z" style="fill:#90d4d1"/></g><g id="g12" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path10" d="m94.253 608.25c-3.86-2.163-7.582-4.542-11.157-7.126 10.006 15.823 22.575 15.584 34.014 16.928-8.013-2.459-15.673-5.761-22.857-9.802z" style="fill:#90d4d1"/></g><g id="g16" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path14" d="m126.81 634.34c-12.533-2.38-24.362-6.774-35.141-12.842 1.376 3.973 6.351 10.257 12.943 11.658 2.858 1.024 2.094.762 6.967.614 7.137-.364 10.552-.592 15.608 1.469-.126-.308-.251-.604-.377-.899z" style="fill:#90d4d1"/></g><g id="g20" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path18" d="m143.27 665.76c-.081.101-.159.204-.239.318-13.844 14.093-31.179 24.69-50.59 30.393 1.492-4.132 2.824-8.468 4.076-12.839 5.329-.797 10.53-1.936 15.585-3.427 11.167-3.279 21.651-8.185 31.168-14.445z" style="fill:#90d4d1"/></g><g id="g24" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path22" d="m143.03 666.08c-6.046 8.287-9.118 24.122-12.659 33.274-5.144 13.342-12.294 22.95-27.958 24.317-3.928.351-27.582 1.24-30.11-.035.159-1.344 4.098-2.961 5.123-3.747 6.852-4.847 11.416-13.5 15.014-23.416 19.411-5.703 36.746-16.3 50.59-30.393z" style="fill:#14a0c4"/></g></g><defs id="defs31"><linearGradient id="_Linear1" x2="1" gradientTransform="matrix(138.58 0 0 138.58 72.442 628.88)" gradientUnits="userSpaceOnUse"><stop id="stop26" style="stop-color:rgb(84,196,198)" offset="0"/><stop id="stop28" style="stop-color:rgb(18,186,213)" offset="1"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index fc49975a..0ec2a70d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -3,8 +3,6 @@ import sys
 
 from pelican import __version__
 
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
 sys.path.append(os.path.abspath(os.pardir))
 
 # -- General configuration ----------------------------------------------------
@@ -24,25 +22,20 @@ rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{}`
 '''.format(last_stable)
 
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
 extlinks = {
     'pelican-doc':  ('https://docs.getpelican.com/%s/', '')
 }
 
 # -- Options for HTML output --------------------------------------------------
 
-html_theme = 'default'
-if not on_rtd:
-    try:
-        import sphinx_rtd_theme
-        html_theme = 'sphinx_rtd_theme'
-        html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-    except ImportError:
-        pass
-
+html_theme = 'furo'
+html_title = f'<strong>{project}</strong> <i>{release}</i>'
 html_static_path = ['_static']
+html_theme_options = {
+    'light_logo': 'pelican-logo.svg',
+    'dark_logo': 'pelican-logo.svg',
+    'navigation_with_keys': True,
+}
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Pelicandoc'
diff --git a/pyproject.toml b/pyproject.toml
index afcae0fb..6b1f9054 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,7 +49,7 @@ lxml = "^4.3"
 markdown = "~3.3.4"
 typogrify = "^2.0"
 sphinx = "<4.4.0"
-sphinx_rtd_theme = "^0.5"
+furo = "^2022.1.2"
 livereload = "^2.6"
 psutil = {version = "^5.7", optional = true}
 pygments = "~2.8"

From ac416d7df240d3d93df6337a90d13957833ff850 Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Tue, 4 Jan 2022 18:45:13 +0100
Subject: [PATCH 2512/2864] Add Furo as requirement for docs

---
 requirements/docs.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/docs.pip b/requirements/docs.pip
index a5a184ef..fc2c4150 100644
--- a/requirements/docs.pip
+++ b/requirements/docs.pip
@@ -1,3 +1,3 @@
 sphinx<4.4.0
-sphinx_rtd_theme
+furo
 livereload

From 961909a149e15d3356043c6548fcee1cde7015b9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 1 Aug 2022 12:32:15 +0200
Subject: [PATCH 2513/2864] Update Sphinx and Furo theme dependency versions

---
 pyproject.toml        | 6 +++---
 requirements/docs.pip | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 6b1f9054..f68ca5bd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,7 @@ classifiers = [
 "Tracker" = "https://github.com/getpelican/pelican/issues"
 
 [tool.poetry.dependencies]
-python = "^3.6"
+python = ">=3.7,<4.0"
 blinker = ">=1.4"
 docutils = ">=0.16"
 feedgenerator = ">=1.9"
@@ -48,8 +48,8 @@ jinja2 = "~2.11"
 lxml = "^4.3"
 markdown = "~3.3.4"
 typogrify = "^2.0"
-sphinx = "<4.4.0"
-furo = "^2022.1.2"
+sphinx = "^5.1"
+furo = "2022.06.21"
 livereload = "^2.6"
 psutil = {version = "^5.7", optional = true}
 pygments = "~2.8"
diff --git a/requirements/docs.pip b/requirements/docs.pip
index fc2c4150..dda53a56 100644
--- a/requirements/docs.pip
+++ b/requirements/docs.pip
@@ -1,3 +1,3 @@
-sphinx<4.4.0
+sphinx<6.0
 furo
 livereload

From 33aca76d78601f0f0da635c8a14c89bbbc9ff8d6 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 1 Aug 2022 12:36:54 +0200
Subject: [PATCH 2514/2864] Adjust extlinks configuration for Sphinx 5.0+

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 0ec2a70d..a391bffa 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -23,7 +23,7 @@ rst_prolog = '''
 '''.format(last_stable)
 
 extlinks = {
-    'pelican-doc':  ('https://docs.getpelican.com/%s/', '')
+    'pelican-doc':  ('https://docs.getpelican.com/%s/', '%s')
 }
 
 # -- Options for HTML output --------------------------------------------------

From 81b5fbe174f55097a9b0c51802a2dd9f0942e16d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 1 Aug 2022 12:38:57 +0200
Subject: [PATCH 2515/2864] Add custom Furo page.html template for Sphinx docs

---
 docs/_templates/page.html | 199 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 199 insertions(+)
 create mode 100644 docs/_templates/page.html

diff --git a/docs/_templates/page.html b/docs/_templates/page.html
new file mode 100644
index 00000000..c238b54c
--- /dev/null
+++ b/docs/_templates/page.html
@@ -0,0 +1,199 @@
+{% extends "base.html" %}
+
+{% block body -%}
+{{ super() }}
+{% include "partials/icons.html" %}
+
+<input type="checkbox" class="sidebar-toggle" name="__navigation" id="__navigation">
+<input type="checkbox" class="sidebar-toggle" name="__toc" id="__toc">
+<label class="overlay sidebar-overlay" for="__navigation">
+  <div class="visually-hidden">Hide navigation sidebar</div>
+</label>
+<label class="overlay toc-overlay" for="__toc">
+  <div class="visually-hidden">Hide table of contents sidebar</div>
+</label>
+
+{% if theme_announcement -%}
+<div class="announcement">
+  <aside class="announcement-content">
+    {% block announcement %} {{ theme_announcement }} {% endblock announcement %}
+  </aside>
+</div>
+{%- endif %}
+
+<div class="page">
+  <header class="mobile-header">
+    <div class="header-left">
+      <label class="nav-overlay-icon" for="__navigation">
+        <div class="visually-hidden">Toggle site navigation sidebar</div>
+        <i class="icon"><svg><use href="#svg-menu"></use></svg></i>
+      </label>
+    </div>
+    <div class="header-center">
+      <a href="{{ pathto(master_doc) }}"><div class="brand">{{ docstitle if docstitle else project }}</div></a>
+    </div>
+    <div class="header-right">
+      <div class="theme-toggle-container theme-toggle-header">
+        <button class="theme-toggle">
+          <div class="visually-hidden">Toggle Light / Dark / Auto color theme</div>
+          <svg class="theme-icon-when-auto"><use href="#svg-sun-half"></use></svg>
+          <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
+          <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
+        </button>
+      </div>
+      <label class="toc-overlay-icon toc-header-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
+        <div class="visually-hidden">Toggle table of contents sidebar</div>
+        <i class="icon"><svg><use href="#svg-toc"></use></svg></i>
+      </label>
+    </div>
+  </header>
+  <aside class="sidebar-drawer">
+    <div class="sidebar-container">
+      {% block left_sidebar %}
+      <div class="sidebar-sticky">
+        {%- for sidebar_section in sidebars %}
+          {%- include sidebar_section %}
+        {%- endfor %}
+      </div>
+      {% endblock left_sidebar %}
+    </div>
+  </aside>
+  <div class="main">
+    <div class="content">
+      <div class="article-container">
+        <a href="#" class="back-to-top muted-link">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+            <path d="M13 20h-2V8l-5.5 5.5-1.42-1.42L12 4.16l7.92 7.92-1.42 1.42L13 8v12z"></path>
+          </svg>
+          <span>{% trans %}Back to top{% endtrans %}</span>
+        </a>
+        <div class="content-icon-container">
+          {% if theme_top_of_page_button == "edit" -%}
+          {%- include "components/edit-this-page.html" with context -%}
+          {%- elif theme_top_of_page_button != None -%}
+          {{ warning("Got an unsupported value for 'top_of_page_button'") }}
+          {%- endif -%}
+          {#- Theme toggle -#}
+          <div class="theme-toggle-container theme-toggle-content">
+            <button class="theme-toggle">
+              <div class="visually-hidden">Toggle Light / Dark / Auto color theme</div>
+              <svg class="theme-icon-when-auto"><use href="#svg-sun-half"></use></svg>
+              <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
+              <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
+            </button>
+          </div>
+          <label class="toc-overlay-icon toc-content-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
+            <div class="visually-hidden">Toggle table of contents sidebar</div>
+            <i class="icon"><svg><use href="#svg-toc"></use></svg></i>
+          </label>
+        </div>
+        <article role="main">
+          {% block content %}{{ body }}{% endblock %}
+        </article>
+      </div>
+      <footer>
+        {% block footer %}
+        <div class="related-pages">
+          {% if next -%}
+            <a class="next-page" href="{{ next.link }}">
+              <div class="page-info">
+                <div class="context">
+                  <span>{{ _("Next") }}</span>
+                </div>
+                <div class="title">{{ next.title }}</div>
+              </div>
+              <svg><use href="#svg-arrow-right"></use></svg>
+            </a>
+          {%- endif %}
+          {% if prev -%}
+            <a class="prev-page" href="{{ prev.link }}">
+              <svg><use href="#svg-arrow-right"></use></svg>
+              <div class="page-info">
+                <div class="context">
+                  <span>{{ _("Previous") }}</span>
+                </div>
+                {% if prev.link == pathto(master_doc) %}
+                <div class="title">{{ _("Home") }}</div>
+                {% else %}
+                <div class="title">{{ prev.title }}</div>
+                {% endif %}
+              </div>
+            </a>
+          {%- endif %}
+        </div>
+        <div class="bottom-of-page">
+          <div class="left-details">
+            {%- if show_copyright %}
+            <div class="copyright">
+              {%- if hasdoc('copyright') %}
+                {% trans path=pathto('copyright'), copyright=copyright|e -%}
+                  <a href="{{ path }}">Copyright</a> &#169; {{ copyright }}
+                {%- endtrans %}
+              {%- else %}
+                {% trans copyright=copyright|e -%}
+                  Copyright &#169; {{ copyright }}, <a href="https://justinmayer.com">Justin Mayer</a>, Alexis Metaireau, and contributors
+                {%- endtrans %}
+              {%- endif %}
+            </div>
+            {%- endif %}
+            {%- if last_updated -%}
+            <div class="last-updated">
+              {% trans last_updated=last_updated|e -%}
+                Last updated on {{ last_updated }}
+              {%- endtrans -%}
+            </div>
+            {%- endif %}
+          </div>
+          <div class="right-details">
+            <div class="icons">
+              {% if theme_footer_icons -%}
+              {% for icon_dict in theme_footer_icons -%}
+              <a class="muted-link {{ icon_dict.class }}" href="{{ icon_dict.url }}" aria-label="{{ icon_dict.name }}">
+                {{- icon_dict.html -}}
+              </a>
+              {% endfor %}
+              {%- else -%}
+              {#- Show Read the Docs project -#}
+              {%- if READTHEDOCS and slug -%}
+              <a class="muted-link" href="https://readthedocs.org/projects/{{ slug }}" aria-label="On Read the Docs">
+                <svg x="0px" y="0px" viewBox="-125 217 360 360" xml:space="preserve">
+                  <path fill="currentColor" d="M39.2,391.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3 c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2 c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,391.3,40.4,391.1,39.2,391.3z M39.2,353.6c-4.2,0.6-7.1,4.4-6.5,8.5 c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4 c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,353.6,40.4,353.4,39.2,353.6z M39.2,315.9 c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8 c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9 C41.7,315.9,40.4,315.8,39.2,315.9z M39.2,278.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7 c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6 c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,278.2,40.4,278.1,39.2,278.3z M-13.6,238.5c-39.6,0.3-54.3,12.5-54.3,12.5v295.7 c0,0,14.4-12.4,60.8-10.5s55.9,18.2,112.9,19.3s71.3-8.8,71.3-8.8l0.8-301.4c0,0-25.6,7.3-75.6,7.7c-49.9,0.4-61.9-12.7-107.7-14.2 C-8.2,238.6-10.9,238.5-13.6,238.5z M19.5,257.8c0,0,24,7.9,68.3,10.1c37.5,1.9,75-3.7,75-3.7v267.9c0,0-19,10-66.5,6.6 C59.5,536.1,19,522.1,19,522.1L19.5,257.8z M-3.6,264.8c4.2,0,7.7,3.4,7.7,7.7c0,4.2-3.4,7.7-7.7,7.7c0,0-12.4,0.1-20,0.8 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,0,0,0,0c0,0,11.3-6,27-7.5 C-16,264.9-3.6,264.8-3.6,264.8z M-11,302.6c4.2-0.1,7.4,0,7.4,0c4.2,0.5,7.2,4.3,6.7,8.5c-0.4,3.5-3.2,6.3-6.7,6.7 c0,0-12.4,0.1-20,0.8c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5 C-20.5,302.9-15.2,302.7-11,302.6z M-3.6,340.2c4.2,0,7.7,3.4,7.7,7.7s-3.4,7.7-7.7,7.7c0,0-12.4-0.1-20,0.7 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5C-16,340.1-3.6,340.2-3.6,340.2z" />
+                </svg>
+              </a>
+              {%- endif -%}
+              {#- Show GitHub repository home -#}
+              {%- if READTHEDOCS and display_github and github_user != "None" and github_repo != "None" -%}
+              <a class="muted-link" href="https://github.com/{{ github_user }}/{{ github_repo }}" aria-label="On GitHub">
+                <svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 16 16">
+                  <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path>
+                </svg>
+              </a>
+              {%- endif -%}
+              {%- endif %}
+            </div>
+          </div>
+        </div>
+        {% endblock footer %}
+      </footer>
+    </div>
+    <aside class="toc-drawer{% if furo_hide_toc %} no-toc{% endif %}">
+      {% block right_sidebar %}
+      {% if not furo_hide_toc %}
+      <div class="toc-sticky toc-scroll">
+        <div class="toc-title-container">
+          <span class="toc-title">
+            {{ _("Contents") }}
+          </span>
+        </div>
+        <div class="toc-tree-container">
+          <div class="toc-tree">
+            {{ toc }}
+          </div>
+        </div>
+      </div>
+      {% endif %}
+      {% endblock right_sidebar %}
+    </aside>
+  </div>
+</div>
+{%- endblock %}

From fcfb39b8f2924eaa7928c3235bfc1cdad2cabdff Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 1 Aug 2022 12:40:26 +0200
Subject: [PATCH 2516/2864] Improve copyright year logic in Sphinx
 configuration

---
 docs/conf.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index a391bffa..0211c71a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,3 +1,4 @@
+import datetime
 import os
 import sys
 
@@ -13,7 +14,8 @@ extensions = ['sphinx.ext.autodoc',
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Pelican'
-copyright = '2010 – present, Justin Mayer, Alexis Metaireau, and contributors'
+year = datetime.datetime.now().date().year
+copyright = f'2010–{year}'
 exclude_patterns = ['_build']
 release = __version__
 version = '.'.join(release.split('.')[:1])

From 09c420f40c31c23d3c28121737ee9b7590ba8f1b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 1 Aug 2022 12:55:02 +0200
Subject: [PATCH 2517/2864] Update Jinja & Markdown dev dependency versions

---
 pyproject.toml        | 4 ++--
 requirements/test.pip | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index f68ca5bd..39f45d5e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,9 +44,9 @@ markdown = {version = ">=3.1", optional = true}
 
 [tool.poetry.dev-dependencies]
 BeautifulSoup4 = "^4.9"
-jinja2 = "~2.11"
+jinja2 = "~3.1.2"
 lxml = "^4.3"
-markdown = "~3.3.4"
+markdown = "~3.3.7"
 typogrify = "^2.0"
 sphinx = "^5.1"
 furo = "2022.06.21"
diff --git a/requirements/test.pip b/requirements/test.pip
index 2d666b25..5873bb2b 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -5,7 +5,7 @@ pytest-cov
 pytest-xdist[psutil]
 
 # Optional Packages
-Markdown==3.3.4
+Markdown==3.3.7
 BeautifulSoup4
 lxml
 typogrify

From 6487735efb0858ef82bb53c78fb15e4ae40657af Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 1 Aug 2022 12:56:58 +0200
Subject: [PATCH 2518/2864] Update Pytest and plugin versions

Also remove pytest-pythonpath as Pytest 7+ includes comparable
functionality. Don't believe we were using it anyway.
---
 pyproject.toml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 39f45d5e..4c41abec 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -53,10 +53,9 @@ furo = "2022.06.21"
 livereload = "^2.6"
 psutil = {version = "^5.7", optional = true}
 pygments = "~2.8"
-pytest = "^6.0"
-pytest-cov = "^2.8"
-pytest-pythonpath = "^0.7.3"
-pytest-sugar = "^0.9.4"
+pytest = "^7.1"
+pytest-cov = "^3.0"
+pytest-sugar = "^0.9.5"
 pytest-xdist = "^2.0"
 tox = {version = "^3.13", optional = true}
 flake8 = "^3.8"

From 9c0c5b4929912a8d75436df726bbe62fb2e4c60b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 1 Aug 2022 13:23:01 +0200
Subject: [PATCH 2519/2864] Pin Flake8 due to upper bound on importlib-metadata

See: https://github.com/PyCQA/flake8/pull/1438
---
 requirements/style.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/style.pip b/requirements/style.pip
index 90225d01..fe4c25c4 100644
--- a/requirements/style.pip
+++ b/requirements/style.pip
@@ -1,2 +1,2 @@
-flake8
+flake8<4.0
 flake8-import-order

From 21e855a29f7c01640e400ce021b8e5f640e033e2 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 1 Aug 2022 13:24:21 +0200
Subject: [PATCH 2520/2864] Adjust code style for Flake8 5.0+

We are pinned to Flake8 <4.0, but at least we'll be compliant if we ever
upgrade to Flake8 5.0+.
---
 pelican/tools/pelican_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index b74da750..5b08b6b5 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -350,7 +350,7 @@ def dc2fields(file):
             else:
                 i = 1
                 j = 1
-                while(i <= int(tag[:1])):
+                while (i <= int(tag[:1])):
                     newtag = tag.split('"')[j].replace('\\', '')
                     tags.append(
                         BeautifulSoup(

From 23f3804c9646f2409ed9a0095f838067f4ee0e98 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Thu, 4 Aug 2022 15:01:17 +0200
Subject: [PATCH 2521/2864] Fix and update pre-commit hooks (#3011)

Co-authored-by: Justin Mayer <entroP@gmail.com>
---
 .pre-commit-config.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 579d3c45..c0e34a00 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 # See https://pre-commit.com/hooks.html for info on hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
+    rev: v4.3.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -11,6 +11,9 @@ repos:
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: trailing-whitespace
+  - repo: https://github.com/PyCQA/flake8
+    rev: 3.9.2
+    hooks:
       - id: flake8
         name: Flake8 on commit diff
         description: This hook limits Flake8 checks to changed lines of code.

From 09d434d87b42c206533f33847b99e32dd7934297 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 21 Aug 2022 08:57:07 +0200
Subject: [PATCH 2522/2864] Docs: Contact plugin/theme maintainers for those
 issues

---
 CONTRIBUTING.rst | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 61935f62..1ed0fd22 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -26,16 +26,21 @@ Before you ask for help, please make sure you do the following:
 * latest releases of libraries used by Pelican
 * no plugins or only those related to the issue
 
-**NOTE:** The most common sources of problems are anomalies in (1) themes,
-(2) settings files, and (3) ``make``/``invoke`` automation wrappers. If you can't
-reproduce your problem when using the following steps to generate your site,
-then the problem is almost certainly with your chosen theme and/or settings
-file (and not Pelican itself)::
+**NOTE:** The most common sources of problems are anomalies in (1) themes, (2)
+plugins, (3) settings files, and (4) ``make``/``invoke`` automation wrappers.
+If you can't reproduce your problem when using the following steps to generate
+your site, then the problem is almost certainly with one of the above-listed
+elements (and not Pelican itself)::
 
     cd ~/projects/your-site
     git clone https://github.com/getpelican/pelican ~/projects/pelican
     pelican content -s ~/projects/pelican/samples/pelican.conf.py -t ~/projects/pelican/pelican/themes/notmyidea
 
+If you can generate your site without problems using the steps above, then your
+problem is unlikely to be caused by Pelican itself, and therefore please
+consider reaching out to the maintainers of the plugins/theme you are using
+instead of raising the topic with the Pelican core community.
+
 If despite the above efforts you still cannot resolve your problem, be sure to
 include in your inquiry the following information, preferably in the form of
 links to content uploaded to a `paste service`_, GitHub repository, or other

From 5103aa9a389245d7067ed63a90cea47d27e22c97 Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Tue, 23 Aug 2022 13:02:58 +0200
Subject: [PATCH 2523/2864] Remove python 3.6 from supported language versions

---
 .github/workflows/main.yml | 2 --
 docs/contribute.rst        | 2 +-
 docs/install.rst           | 2 +-
 setup.py                   | 1 -
 tox.ini                    | 3 +--
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 527b8db9..50a8714c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,8 +15,6 @@ jobs:
     strategy:
       matrix:
         config:
-          - os: ubuntu
-            python: "3.6"
           - os: ubuntu
             python: "3.7"
           - os: ubuntu
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 99a546a7..64c144d6 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -19,7 +19,7 @@ instructions will utilize Pip_ and Poetry_. These tools facilitate managing
 virtual environments for separate Python projects that are isolated from one
 another, so you can use different packages (and package versions) for each.
 
-Please note that Python 3.6+ is required for Pelican development.
+Please note that Python 3.7+ is required for Pelican development.
 
 *(Optional)* If you prefer to `install Poetry <https://python-poetry.org/docs/master/#installation>`_ once for use with multiple projects,
 you can install it via::
diff --git a/docs/install.rst b/docs/install.rst
index eb618035..cdc17bb9 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -1,7 +1,7 @@
 Installing Pelican
 ##################
 
-Pelican currently runs best on 3.6+; earlier versions of Python are not supported.
+Pelican currently runs best on 3.7+; earlier versions of Python are not supported.
 
 You can install Pelican via several different methods. The simplest is via Pip_::
 
diff --git a/setup.py b/setup.py
index ccaa44ab..b88f5928 100755
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,6 @@ setup(
         'License :: OSI Approved :: GNU Affero General Public License v3',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
diff --git a/tox.ini b/tox.ini
index 15575cf2..4bceced8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py{3.6,3.7,3.8,3.9,3.10},docs,flake8
+envlist = py{3.7,3.8,3.9,3.10},docs,flake8
 
 [testenv]
 basepython =
-    py3.6: python3.6
     py3.7: python3.7
     py3.8: python3.8
     py3.9: python3.9

From 5d4cb5619b54cefb1afb152a12c0d992317f6f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D1=88=D0=B0=20=D0=A7=D0=B5=D1=80=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85?= <vspobog@gmail.com>
Date: Tue, 13 Sep 2022 15:30:43 +0300
Subject: [PATCH 2524/2864] Docs: Hidden posts also excluded from author index
 (#3025)

---
 docs/content.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 84ebb6da..0ab80670 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -626,8 +626,8 @@ Hidden Posts
 
 Like pages, posts can also be marked as ``hidden`` with the ``Status: hidden``
 attribute. Hidden posts will be output to ``ARTICLE_SAVE_AS`` as expected, but
-are not included by default in tag or category indexes, nor in the main
-article feed. This has the effect of creating an "unlisted" post.
+are not included by default in tag, category, and author indexes, nor in the 
+main article feed. This has the effect of creating an "unlisted" post.
 
 .. _W3C ISO 8601: https://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: https://www.methods.co.nz/asciidoc/

From 2a7e691000db4b69b1b4c960141f7c00eff5f06d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 15 Sep 2022 16:33:19 +0200
Subject: [PATCH 2525/2864] Document switch from IRC to GitHub Discussions

---
 CONTRIBUTING.rst | 31 ++++++++-----------------------
 docs/faq.rst     | 10 +++++-----
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 1ed0fd22..e7ab9fc4 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,11 +1,13 @@
 Filing issues
 =============
 
-* Before you file an issue, try `asking for help`_ first.
-* If determined to file an issue, first check for `existing issues`_, including
-  closed issues.
+* Before you submit a new issue, try `asking for help`_ first.
+* If determined to create a new issue, first search `Pelican Discussions`_
+  and `existing issues`_ (open and closed) to see if your question has already
+  been answered previously.
 
 .. _`asking for help`: `How to get help`_
+.. _`Pelican Discussions`: https://github.com/getpelican/pelican/discussions
 .. _`existing issues`: https://github.com/getpelican/pelican/issues
 
 How to get help
@@ -64,26 +66,10 @@ publicly-accessible location:
   the ``--debug`` flag: ``pelican --debug content [...]``)
 
 .. _documentation: https://docs.getpelican.com/
-.. _`paste service`: https://dpaste.de/
-
-Once the above preparation is ready, you can contact people willing to help via
-(preferably) the ``#pelican`` IRC channel or send a message to ``authors at getpelican dot com``.
-Remember to include all the information you prepared.
-
-The #pelican IRC channel
-------------------------
-
-* Because of differing time zones, you may not get an immediate response to your
-  question, but please be patient and stay logged into IRC — someone will almost
-  always respond if you wait long enough (it may take a few hours).
-* If you don't have an IRC client handy, use the webchat_.
-* You can direct your IRC client to the channel using this `IRC link`_ or you
-  can manually join the ``#pelican`` IRC channel on the `freenode IRC network`_.
-
-.. _webchat: https://kiwiirc.com/client/irc.freenode.net/?#pelican
-.. _`IRC link`: irc://irc.freenode.net/pelican
-.. _`freenode IRC network`: https://freenode.net/
+.. _`paste service`: https://dpaste.com
 
+Once the above preparation is ready, you can post your query as a new thread in
+`Pelican Discussions`_. Remember to include all the information you prepared.
 
 Contributing code
 =================
@@ -153,7 +139,6 @@ Check out our `Git Tips`_ page or `ask for help`_ if you
 need assistance or have any questions about these guidelines.
 
 .. _`plugin`: https://docs.getpelican.com/en/latest/plugins.html
-.. _`#pelican IRC channel`: https://webchat.freenode.net/?channels=pelican&uio=d4
 .. _`Create a new git branch`: https://github.com/getpelican/pelican/wiki/Git-Tips#making-your-changes
 .. _`Squash your commits`: https://github.com/getpelican/pelican/wiki/Git-Tips#squashing-commits
 .. _`Run all the tests`: https://docs.getpelican.com/en/latest/contribute.html#running-the-test-suite
diff --git a/docs/faq.rst b/docs/faq.rst
index 5ad372c5..8c91388d 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -11,11 +11,11 @@ Please read our :doc:`feedback guidelines <contribute>`.
 How can I help?
 ===============
 
-There are several ways to help out. First, you can report any Pelican
-suggestions or problems you might have via IRC (preferred) or the `issue
-tracker <https://github.com/getpelican/pelican/issues>`_. If submitting an
-issue report, please first check the existing issue list (both open and closed)
-in order to avoid submitting a duplicate issue.
+There are several ways to help out. First, you can communicate any Pelican
+suggestions or problems you might have via `Pelican Discussions
+<https://github.com/getpelican/pelican/discussions>`_. Please first check the
+existing list of discussions and issues (both open and closed) in order to
+avoid submitting topics that have already been covered before.
 
 If you want to contribute, please fork `the git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make

From 27f2c678cbf2e07371a7161fcd8cf0cade22bddc Mon Sep 17 00:00:00 2001
From: Ryan de Kleer <thinking.as.a.hobby@gmail.com>
Date: Thu, 15 Sep 2022 16:26:15 -0700
Subject: [PATCH 2526/2864] Use tmp dir for test output

`shutil.rmtree` would fail in `TestUtils.test_clean_output_dir` on some
filesystems if an application with a filewatcher had the pelican project
open while the test ran.

Using `tempfile.mkdtmp` for test directories circumvents this.
---
 pelican/tests/test_utils.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index ee5146df..449a6814 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -20,6 +20,14 @@ from pelican.writers import Writer
 class TestUtils(LoggedTestCase):
     _new_attribute = 'new_value'
 
+    def setUp(self):
+        super().setUp()
+        self.temp_output = mkdtemp(prefix='pelicantests.')
+
+    def tearDown(self):
+        super().tearDown()
+        shutil.rmtree(self.temp_output)
+
     @utils.deprecated_attribute(
         old='_old_attribute', new='_new_attribute',
         since=(3, 1, 0), remove=(4, 1, 3))
@@ -468,7 +476,7 @@ class TestUtils(LoggedTestCase):
 
     def test_clean_output_dir(self):
         retention = ()
-        test_directory = os.path.join(os.path.dirname(__file__),
+        test_directory = os.path.join(self.temp_output,
                                       'clean_output')
         content = os.path.join(os.path.dirname(__file__), 'content')
         shutil.copytree(content, test_directory)
@@ -479,14 +487,14 @@ class TestUtils(LoggedTestCase):
 
     def test_clean_output_dir_not_there(self):
         retention = ()
-        test_directory = os.path.join(os.path.dirname(__file__),
+        test_directory = os.path.join(self.temp_output,
                                       'does_not_exist')
         utils.clean_output_dir(test_directory, retention)
         self.assertFalse(os.path.exists(test_directory))
 
     def test_clean_output_dir_is_file(self):
         retention = ()
-        test_directory = os.path.join(os.path.dirname(__file__),
+        test_directory = os.path.join(self.temp_output,
                                       'this_is_a_file')
         f = open(test_directory, 'w')
         f.write('')

From 9d509253c3a25a1ab8082e2d7985d17a0ef187ea Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Thu, 20 Oct 2022 02:48:01 +0300
Subject: [PATCH 2527/2864] update github actions

see:
https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/
https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
---
 .github/workflows/main.yml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 50a8714c..59d6c95c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,13 +29,13 @@ jobs:
             python: "3.7"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Python ${{ matrix.config.python }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.config.python }}
       - name: Set up Pip cache (Linux)
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         if: startsWith(runner.os, 'Linux')
         with:
           path: ~/.cache/pip
@@ -43,7 +43,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Set up Pip cache (macOS)
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         if: startsWith(runner.os, 'macOS')
         with:
           path: ~/Library/Caches/pip
@@ -51,7 +51,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Setup pip cache (Windows)
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         if: startsWith(runner.os, 'Windows')
         with:
           path: ~\AppData\Local\pip\Cache
@@ -62,7 +62,7 @@ jobs:
         if: startsWith(runner.os, 'Linux')
         run: sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
       - name: Install pandoc
-        uses: r-lib/actions/setup-pandoc@v1
+        uses: r-lib/actions/setup-pandoc@v2
         with:
           pandoc-version: "2.9.2"
       - name: Install tox
@@ -82,13 +82,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: "3.7"
       - name: Set pip cache (Linux)
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         if: startsWith(runner.os, 'Linux')
         with:
           path: ~/.cache/pip
@@ -106,13 +106,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: "3.7"
       - name: Set pip cache (Linux)
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         if: startsWith(runner.os, 'Linux')
         with:
           path: ~/.cache/pip
@@ -132,9 +132,9 @@ jobs:
     if: ${{ github.ref=='refs/heads/master' && github.event_name!='pull_request' }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: "3.7"
       - name: Check release
@@ -144,9 +144,10 @@ jobs:
           pip install poetry
           pip install githubrelease
           pip install --pre autopub
-          echo "##[set-output name=release;]$(autopub check)"
+          autopub check
+        continue-on-error: true
       - name: Publish
-        if: ${{ steps.check_release.outputs.release=='' }}
+        if: steps.check_release.outcome=='success'
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

From 6d11c6f2e5d2086cefc7c1917c71e2f3899f72b8 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Thu, 20 Oct 2022 02:59:04 +0300
Subject: [PATCH 2528/2864] use python 3.9 for lint, docs and deploy actions

3.7 is old and will soon be EOLed
this also fixes flake8 + importlib-metadata issues
---
 .github/workflows/main.yml | 6 +++---
 tox.ini                    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 59d6c95c..c4f10faa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -86,7 +86,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.7"
+          python-version: "3.9"
       - name: Set pip cache (Linux)
         uses: actions/cache@v3
         if: startsWith(runner.os, 'Linux')
@@ -110,7 +110,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.7"
+          python-version: "3.9"
       - name: Set pip cache (Linux)
         uses: actions/cache@v3
         if: startsWith(runner.os, 'Linux')
@@ -136,7 +136,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.7"
+          python-version: "3.9"
       - name: Check release
         id: check_release
         run: |
diff --git a/tox.ini b/tox.ini
index 4bceced8..e50c5f67 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ commands =
     pytest -s --cov=pelican pelican
 
 [testenv:docs]
-basepython = python3.7
+basepython = python3.9
 deps =
     -rrequirements/docs.pip
 changedir = docs
@@ -36,7 +36,7 @@ import-order-style = cryptography
 max-line-length = 88
 
 [testenv:flake8]
-basepython = python3.7
+basepython = python3.9
 deps =
     -rrequirements/style.pip
 commands =

From cdc90d5d07691e5d7d35c81badd0d27074f8451c Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 23 Oct 2022 18:22:50 +0300
Subject: [PATCH 2529/2864] unpin flake8 and do not install pelican while
 checking

installing pelican brings in markdown. flake8 and markdown have
incompatible requirements for importlib-metadata. installing pelican
is not required to run flake8.
---
 requirements/style.pip | 2 +-
 tox.ini                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements/style.pip b/requirements/style.pip
index fe4c25c4..90225d01 100644
--- a/requirements/style.pip
+++ b/requirements/style.pip
@@ -1,2 +1,2 @@
-flake8<4.0
+flake8
 flake8-import-order
diff --git a/tox.ini b/tox.ini
index e50c5f67..a3be7529 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,6 +37,7 @@ max-line-length = 88
 
 [testenv:flake8]
 basepython = python3.9
+skip_install = true
 deps =
     -rrequirements/style.pip
 commands =

From cbddac44e49b637aa8035fbadb36e862865c7a8b Mon Sep 17 00:00:00 2001
From: "renyuneyun (Rui Zhao)" <renyuneyun@gmail.com>
Date: Sun, 23 Oct 2022 10:25:10 +0100
Subject: [PATCH 2530/2864] Use `(?P=)` to replace `\2` for intrasite link

---
 pelican/contents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index e59fa9ae..c979dd0a 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -341,7 +341,7 @@ class Content:
 
             (?P<quote>["\'])      # require value to be quoted
             (?P<path>{}(?P<value>.*?))  # the url value
-            \2""".format(intrasite_link_regex)
+            (?P=quote)""".format(intrasite_link_regex)
         return re.compile(regex, re.X)
 
     def _update_content(self, content, siteurl):

From 6ddbc83f43f65bf6c42c72b9bee3756bbb7b5e6e Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 26 Oct 2022 23:11:41 +0300
Subject: [PATCH 2531/2864] add python 3.11 to CI and use setup-python pip
 cache

---
 .github/workflows/main.yml | 48 +++++++-------------------------------
 tox.ini                    |  3 ++-
 2 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c4f10faa..9574a0bc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,6 +23,8 @@ jobs:
             python: "3.9"
           - os: ubuntu
             python: "3.10"
+          - os: ubuntu
+            python: "3.11"
           - os: macos
             python: "3.7"
           - os: windows
@@ -34,30 +36,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.config.python }}
-      - name: Set up Pip cache (Linux)
-        uses: actions/cache@v3
-        if: startsWith(runner.os, 'Linux')
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements/*') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Set up Pip cache (macOS)
-        uses: actions/cache@v3
-        if: startsWith(runner.os, 'macOS')
-        with:
-          path: ~/Library/Caches/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements/*') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Setup pip cache (Windows)
-        uses: actions/cache@v3
-        if: startsWith(runner.os, 'Windows')
-        with:
-          path: ~\AppData\Local\pip\Cache
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements/*') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          cache: 'pip'
+          cache-dependency-path: '**/requirements/*'
       - name: Install locale (Linux)
         if: startsWith(runner.os, 'Linux')
         run: sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
@@ -87,14 +67,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: "3.9"
-      - name: Set pip cache (Linux)
-        uses: actions/cache@v3
-        if: startsWith(runner.os, 'Linux')
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          cache: 'pip'
+          cache-dependency-path: '**/requirements/*'
       - name: Install tox
         run: python -m pip install -U pip tox
       - name: Check
@@ -111,14 +85,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: "3.9"
-      - name: Set pip cache (Linux)
-        uses: actions/cache@v3
-        if: startsWith(runner.os, 'Linux')
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          cache: 'pip'
+          cache-dependency-path: '**/requirements/*'
       - name: Install tox
         run: python -m pip install -U pip tox
       - name: Check
diff --git a/tox.ini b/tox.ini
index a3be7529..93819218 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.7,3.8,3.9,3.10},docs,flake8
+envlist = py{3.7,3.8,3.9,3.10,3.11},docs,flake8
 
 [testenv]
 basepython =
@@ -7,6 +7,7 @@ basepython =
     py3.8: python3.8
     py3.9: python3.9
     py3.10: python3.10
+    py3.11: python3.11
 passenv = *
 usedevelop=True
 deps =

From 3937028c00344dc82798750e5f13a8a1aea890d4 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 26 Oct 2022 23:27:06 +0300
Subject: [PATCH 2532/2864] update unit test to avoid using deprecated
 locale.getdefaultlocale()

---
 pelican/tests/test_settings.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index c407f7c8..0f630ad5 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -2,7 +2,6 @@ import copy
 import locale
 import os
 from os.path import abspath, dirname, join
-from sys import platform
 
 
 from pelican.settings import (DEFAULT_CONFIG, DEFAULT_THEME,
@@ -136,18 +135,19 @@ class TestSettingsConfiguration(unittest.TestCase):
             settings['ARTICLE_DIR']
             settings['PAGE_DIR']
 
-    # locale.getdefaultlocale() is broken on Windows
-    # See: https://bugs.python.org/issue37945
-    @unittest.skipIf(platform == 'win32', "Doesn't work on Windows")
     def test_default_encoding(self):
-        # Test that the default locale is set if not specified in settings
+        # Test that the user locale is set if not specified in settings
 
-        # Reset locale to Python's default locale
         locale.setlocale(locale.LC_ALL, 'C')
-        self.assertEqual(self.settings['LOCALE'], DEFAULT_CONFIG['LOCALE'])
+        # empty string = user system locale
+        self.assertEqual(self.settings['LOCALE'], [''])
 
         configure_settings(self.settings)
-        self.assertEqual(locale.getlocale(), locale.getdefaultlocale())
+        lc_time = locale.getlocale(locale.LC_TIME)  # should be set to user locale
+
+        # explicitly set locale to user pref and test
+        locale.setlocale(locale.LC_TIME, '')
+        self.assertEqual(lc_time, locale.getlocale(locale.LC_TIME))
 
     def test_invalid_settings_throw_exception(self):
         # Test that the path name is valid

From b10c7c699b49b1701692c0d0edc7691ac71c3c8f Mon Sep 17 00:00:00 2001
From: Ryan de Kleer <thinking.as.a.hobby@gmail.com>
Date: Thu, 15 Sep 2022 16:51:34 -0700
Subject: [PATCH 2533/2864] Fix false-positive in content gen. test failures

Assert equal dirs by return value of diff subprocess, rather than its output.

This prevents tests from failing when file contents are the same but the
file modes are different.

Fix #3042
---
 pelican/tests/support.py      | 17 ++++++++++++
 pelican/tests/test_pelican.py | 51 +++++++++++++++++------------------
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 55ddf625..8a394395 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -218,6 +218,23 @@ class LogCountHandler(BufferingHandler):
         ])
 
 
+def diff_subproc(first, second):
+    """
+    Return a subprocess that runs a diff on the two paths.
+
+    Check results with::
+
+        >>> out_stream, err_stream = proc.communicate()
+        >>> didCheckFail = proc.returnCode != 0
+    """
+    return subprocess.Popen(
+        ['git', '--no-pager', 'diff', '--no-ext-diff', '--exit-code',
+         '-w', first, second],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE
+    )
+
+
 class LoggedTestCase(unittest.TestCase):
     """A test case that captures log messages."""
 
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 389dbb3d..adba32e0 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -3,6 +3,7 @@ import logging
 import os
 import subprocess
 import sys
+import unittest
 from collections.abc import Sequence
 from shutil import rmtree
 from tempfile import mkdtemp
@@ -10,8 +11,12 @@ from tempfile import mkdtemp
 from pelican import Pelican
 from pelican.generators import StaticGenerator
 from pelican.settings import read_settings
-from pelican.tests.support import (LoggedTestCase, locale_available,
-                                   mute, unittest)
+from pelican.tests.support import (
+    LoggedTestCase,
+    diff_subproc,
+    locale_available,
+    mute
+)
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
 SAMPLES_PATH = os.path.abspath(os.path.join(
@@ -54,28 +59,19 @@ class TestPelican(LoggedTestCase):
         locale.setlocale(locale.LC_ALL, self.old_locale)
         super().tearDown()
 
-    def assertDirsEqual(self, left_path, right_path):
-        out, err = subprocess.Popen(
-            ['git', '--no-pager', 'diff', '--no-ext-diff', '--exit-code',
-             '-w', left_path, right_path],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE
-        ).communicate()
+    def assertDirsEqual(self, left_path, right_path, msg=None):
+        """
+        Check if the files are the same (ignoring whitespace) below both paths.
+        """
+        proc = diff_subproc(left_path, right_path)
 
-        def ignorable_git_crlf_errors(line):
-            # Work around for running tests on Windows
-            for msg in [
-                    "LF will be replaced by CRLF",
-                    "CRLF will be replaced by LF",
-                    "The file will have its original line endings"]:
-                if msg in line:
-                    return True
-            return False
-        if err:
-            err = '\n'.join([line for line in err.decode('utf8').splitlines()
-                             if not ignorable_git_crlf_errors(line)])
-        assert not out, out
-        assert not err, err
+        out, err = proc.communicate()
+        if proc.returncode != 0:
+            msg = self._formatMessage(
+                msg,
+                "%s and %s differ:\n%s" % (left_path, right_path, err)
+            )
+            raise self.failureException(msg)
 
     def test_order_of_generators(self):
         # StaticGenerator must run last, so it can identify files that
@@ -104,7 +100,8 @@ class TestPelican(LoggedTestCase):
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
         self.assertDirsEqual(
-            self.temp_path, os.path.join(OUTPUT_PATH, 'basic'))
+            self.temp_path, os.path.join(OUTPUT_PATH, 'basic')
+        )
         self.assertLogCountEqual(
             count=1,
             msg="Unable to find.*skipping url replacement",
@@ -121,7 +118,8 @@ class TestPelican(LoggedTestCase):
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
         self.assertDirsEqual(
-            self.temp_path, os.path.join(OUTPUT_PATH, 'custom'))
+            self.temp_path, os.path.join(OUTPUT_PATH, 'custom')
+        )
 
     @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
                          locale_available('French'), 'French locale needed')
@@ -141,7 +139,8 @@ class TestPelican(LoggedTestCase):
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
         self.assertDirsEqual(
-            self.temp_path, os.path.join(OUTPUT_PATH, 'custom_locale'))
+            self.temp_path, os.path.join(OUTPUT_PATH, 'custom_locale')
+        )
 
     def test_theme_static_paths_copy(self):
         # the same thing with a specified set of settings should work

From 5e986580e8199336e6bd1fb124c38c55723b07e1 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Tue, 3 Jan 2023 21:29:02 +0100
Subject: [PATCH 2534/2864] Change reference to Python version 3.6 from
 documentation (now 3.7)

---
 docs/quickstart.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index ddc42651..f1198b94 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -8,7 +8,7 @@ Installation
 ------------
 
 Install Pelican (and optionally Markdown if you intend to use it) on Python
-3.6+ by running the following command in your preferred terminal, prefixing
+3.7+ by running the following command in your preferred terminal, prefixing
 with ``sudo`` if permissions warrant::
 
     python -m pip install "pelican[markdown]"

From ff665de3ca9224829a445ee355e919592093af16 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 6 Jan 2023 10:23:14 +0100
Subject: [PATCH 2535/2864] Tweak README slightly

---
 CONTRIBUTING.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index e7ab9fc4..7d7b2c3a 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -82,7 +82,7 @@ a plugin_ — you can `ask for help`_  to make that determination.
 Using Git and GitHub
 --------------------
 
-* `Create a new git branch`_ specific to your change (as opposed to making
+* `Create a new branch`_ specific to your change (as opposed to making
   your commits in the master branch).
 * **Don't put multiple unrelated fixes/features in the same branch / pull request.**
   For example, if you're working on a new feature and find a bugfix that
@@ -139,7 +139,7 @@ Check out our `Git Tips`_ page or `ask for help`_ if you
 need assistance or have any questions about these guidelines.
 
 .. _`plugin`: https://docs.getpelican.com/en/latest/plugins.html
-.. _`Create a new git branch`: https://github.com/getpelican/pelican/wiki/Git-Tips#making-your-changes
+.. _`Create a new branch`: https://github.com/getpelican/pelican/wiki/Git-Tips#making-your-changes
 .. _`Squash your commits`: https://github.com/getpelican/pelican/wiki/Git-Tips#squashing-commits
 .. _`Run all the tests`: https://docs.getpelican.com/en/latest/contribute.html#running-the-test-suite
 .. _`Git Tips`: https://github.com/getpelican/pelican/wiki/Git-Tips

From 4d82a42229c4065a989bb7536cdd5cf56e7dc746 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 6 Jan 2023 10:31:01 +0100
Subject: [PATCH 2536/2864] Upgrade Furo theme to 2022.12.07. Refs #3077

Should fix "Previous" and "Next" arrow styling issue.
---
 docs/_templates/page.html | 8 +++++---
 pyproject.toml            | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/_templates/page.html b/docs/_templates/page.html
index c238b54c..233f43ad 100644
--- a/docs/_templates/page.html
+++ b/docs/_templates/page.html
@@ -102,12 +102,12 @@
                 </div>
                 <div class="title">{{ next.title }}</div>
               </div>
-              <svg><use href="#svg-arrow-right"></use></svg>
+              <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
             </a>
           {%- endif %}
           {% if prev -%}
             <a class="prev-page" href="{{ prev.link }}">
-              <svg><use href="#svg-arrow-right"></use></svg>
+              <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
               <div class="page-info">
                 <div class="context">
                   <span>{{ _("Previous") }}</span>
@@ -145,6 +145,7 @@
             {%- endif %}
           </div>
           <div class="right-details">
+            {% if theme_footer_icons or READTHEDOCS -%}
             <div class="icons">
               {% if theme_footer_icons -%}
               {% for icon_dict in theme_footer_icons -%}
@@ -171,6 +172,7 @@
               {%- endif -%}
               {%- endif %}
             </div>
+            {%- endif %}
           </div>
         </div>
         {% endblock footer %}
@@ -182,7 +184,7 @@
       <div class="toc-sticky toc-scroll">
         <div class="toc-title-container">
           <span class="toc-title">
-            {{ _("Contents") }}
+            {{ _("On this page") }}
           </span>
         </div>
         <div class="toc-tree-container">
diff --git a/pyproject.toml b/pyproject.toml
index 4c41abec..002ebfff 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,7 +49,7 @@ lxml = "^4.3"
 markdown = "~3.3.7"
 typogrify = "^2.0"
 sphinx = "^5.1"
-furo = "2022.06.21"
+furo = "2022.12.07"
 livereload = "^2.6"
 psutil = {version = "^5.7", optional = true}
 pygments = "~2.8"

From b777bedce30a624b689b5dc0b034ff8d18675747 Mon Sep 17 00:00:00 2001
From: Elliot Ford <elliot.ford@hotmail.co.uk>
Date: Fri, 20 Jan 2023 14:28:44 +0000
Subject: [PATCH 2537/2864] Update Github actions badge

See the linked GitHub issue from the previous version of the badge: badges/shields#8671

In summary, these badges were changed in a breaking fashion such that the badges were just linking to the github issue rather than showing the data. Updating the url resolves this.

Also updated the link added to the badge image, so that it shows exactly the history of actions that the badge shows the most recent one of.
---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 6d8be699..1d875772 100644
--- a/README.rst
+++ b/README.rst
@@ -58,8 +58,8 @@ Why the name “Pelican”?
 .. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html
 .. _`hosted on GitHub`: https://github.com/getpelican/pelican
 
-.. |build-status| image:: https://img.shields.io/github/workflow/status/getpelican/pelican/build
-   :target: https://github.com/getpelican/pelican/actions
+.. |build-status| image:: https://img.shields.io/github/actions/workflow/status/getpelican/pelican/main.yml?branch=master
+   :target: https://github.com/getpelican/pelican/actions/workflows/main.yml?query=branch%3Amaster
    :alt: GitHub Actions CI: continuous integration status
 .. |pypi-version| image:: https://img.shields.io/pypi/v/pelican.svg
    :target: https://pypi.org/project/pelican/

From f50bf26466f342d185760783cad018ca832ca858 Mon Sep 17 00:00:00 2001
From: Kurt McKee <contactme@kurtmckee.org>
Date: Mon, 30 Jan 2023 08:20:12 -0600
Subject: [PATCH 2538/2864] Use absolute URL's in the package
 `long_description` for PyPI

Fixes #3093
---
 setup.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/setup.py b/setup.py
index b88f5928..da038d24 100755
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,13 @@ entry_points = {
 README = open('README.rst', encoding='utf-8').read()
 CHANGELOG = open('docs/changelog.rst', encoding='utf-8').read()
 
+# Relative links in the README must be converted to absolute URL's
+# so that they render correctly on PyPI.
+README = README.replace(
+    "<CONTRIBUTING.rst>",
+    "<https://docs.getpelican.com/en/latest/contribute.html>",
+)
+
 description = '\n'.join([README, CHANGELOG])
 
 setup(

From b473280eac576705bc39b8151d27a1e05040d0e8 Mon Sep 17 00:00:00 2001
From: Boluwatife Victor <95125924+BirdboyBolu@users.noreply.github.com>
Date: Fri, 24 Feb 2023 03:22:56 +0100
Subject: [PATCH 2539/2864] Add better description of what Pelican does to
 README (#3102)

Co-authored-by: Justin Mayer <entroP@gmail.com>
---
 README.rst | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 1d875772..b8cf9371 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,13 @@
 Pelican |build-status| |pypi-version| |repology|
 ================================================
 
-Pelican is a static site generator, written in Python_.
+Pelican is a static site generator, written in Python_, that allows you to create
+web sites by composing text files in formats such as Markdown, reStructuredText, and HTML.
+
+With Pelican, you can create web sites without worrying about databases or server-side programming. 
+Pelican generates static sites that can be served via any web server or hosting service.
+
+You can perform the following functions with Pelican:
 
 * Compose content in Markdown_ or reStructuredText_ using your editor of choice
 * Simple command-line tool (re)generates HTML, CSS, and JS from your source content

From 385d5bf75ecc837de62af3a0f20309b80cfb97e7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 27 Mar 2023 10:02:07 +0200
Subject: [PATCH 2540/2864] Update functional test output

---
 pelican/tests/output/basic/categories.html    |  4 ++--
 pelican/tests/output/basic/category/misc.html |  6 +++---
 .../tests/output/basic/feeds/all-en.atom.xml  | 14 ++++++-------
 pelican/tests/output/basic/feeds/all.atom.xml | 14 ++++++-------
 .../tests/output/basic/feeds/misc.atom.xml    | 14 ++++++-------
 pelican/tests/output/basic/index.html         |  6 +++---
 pelican/tests/output/basic/unbelievable.html  |  8 ++++----
 .../custom/author/alexis-metaireau3.html      |  6 +++---
 pelican/tests/output/custom/categories.html   |  4 ++--
 .../tests/output/custom/category/misc.html    |  6 +++---
 .../custom/feeds/alexis-metaireau.atom.xml    | 20 +++++++++----------
 .../custom/feeds/alexis-metaireau.rss.xml     |  6 +++---
 .../tests/output/custom/feeds/all-en.atom.xml | 20 +++++++++----------
 .../tests/output/custom/feeds/all.atom.xml    | 20 +++++++++----------
 pelican/tests/output/custom/feeds/all.rss.xml |  6 +++---
 .../tests/output/custom/feeds/misc.atom.xml   | 20 +++++++++----------
 .../tests/output/custom/feeds/misc.rss.xml    |  6 +++---
 pelican/tests/output/custom/index3.html       |  6 +++---
 pelican/tests/output/custom/unbelievable.html | 14 ++++++-------
 .../author/alexis-metaireau3.html             |  6 +++---
 .../output/custom_locale/categories.html      |  4 ++--
 .../output/custom_locale/category/misc.html   |  6 +++---
 .../feeds/alexis-metaireau.atom.xml           | 20 +++++++++----------
 .../feeds/alexis-metaireau.rss.xml            |  6 +++---
 .../custom_locale/feeds/all-en.atom.xml       | 20 +++++++++----------
 .../output/custom_locale/feeds/all.atom.xml   | 20 +++++++++----------
 .../output/custom_locale/feeds/all.rss.xml    |  6 +++---
 .../output/custom_locale/feeds/misc.atom.xml  | 20 +++++++++----------
 .../output/custom_locale/feeds/misc.rss.xml   |  6 +++---
 .../tests/output/custom_locale/index3.html    |  6 +++---
 .../2010/octobre/15/unbelievable/index.html   | 14 ++++++-------
 31 files changed, 167 insertions(+), 167 deletions(-)

diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index f6c17dd5..96a61c73 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -23,7 +23,7 @@
                 </ul></nav>
         </header><!-- /#banner -->
 
-    <section id="content" class="body">
+<section id="content" class="body">
     <h1>Categories for A Pelican Blog</h1>
     <ul>
         <li><a href="/category/bar.html">bar</a> (1)</li>
@@ -31,7 +31,7 @@
         <li><a href="/category/misc.html">misc</a> (4)</li>
         <li><a href="/category/yeah.html">yeah</a> (1)</li>
     </ul>
-    </section>
+</section>
 
         <section id="extras" class="body">
                 <div class="social">
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index c7e86f19..ed06ebc0 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -82,9 +82,9 @@
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table></div>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+</div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 250d75db..9c44c860 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -31,9 +31,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -42,9 +42,9 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 1abfef18..e9dceb69 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -33,9 +33,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -44,9 +44,9 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -57,7 +57,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index 2b09bda3..a307ac4e 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -6,9 +6,9 @@
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -17,9 +17,9 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index d67b9826..711dd2bd 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -221,9 +221,9 @@ YEAH !</p>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table></div>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+</div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index d623eced..8a8b4f5a 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -44,9 +44,9 @@
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table></div>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+</div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
@@ -57,7 +57,7 @@ pelican.conf, it will have nothing in default.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index b5b86c42..2296ef04 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -51,9 +51,9 @@
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table></div>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+</div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 74990d4b..56eaad05 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -27,7 +27,7 @@
                 </ul></nav>
         </header><!-- /#banner -->
 
-    <section id="content" class="body">
+<section id="content" class="body">
     <h1>Categories for Alexis' log</h1>
     <ul>
         <li><a href="./category/bar.html">bar</a> (1)</li>
@@ -35,7 +35,7 @@
         <li><a href="./category/misc.html">misc</a> (4)</li>
         <li><a href="./category/yeah.html">yeah</a> (1)</li>
     </ul>
-    </section>
+</section>
 
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index dda4c75f..5a8b373c 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -95,9 +95,9 @@
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table></div>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+</div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index a9aa4d38..f6cde37e 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -31,9 +31,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -42,20 +42,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index 1ea22155..c13a742b 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -19,9 +19,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 3054a950..703f56f0 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -31,9 +31,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -42,20 +42,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index f340f71f..de5e733d 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -33,9 +33,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -44,20 +44,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index e93d4753..a8d984fa 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -21,9 +21,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index b5a006e7..a260f67d 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -6,9 +6,9 @@
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -17,20 +17,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index b9958cdb..828eae62 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -6,9 +6,9 @@
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 147f2ee2..375c1621 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -51,9 +51,9 @@
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table></div>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+</div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 3117dc28..e1a1984d 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -51,20 +51,20 @@
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table></div>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+</div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.</p>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table><p>Lovely.</p>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+<p>Lovely.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 557676d4..4bbcb948 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -51,9 +51,9 @@
 <a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table></div>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+</div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 1decaabd..d7655787 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -27,7 +27,7 @@
                 </ul></nav>
         </header><!-- /#banner -->
 
-    <section id="content" class="body">
+<section id="content" class="body">
     <h1>Categories for Alexis' log</h1>
     <ul>
         <li><a href="./category/bar.html">bar</a> (1)</li>
@@ -35,7 +35,7 @@
         <li><a href="./category/misc.html">misc</a> (4)</li>
         <li><a href="./category/yeah.html">yeah</a> (1)</li>
     </ul>
-    </section>
+</section>
 
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 54e3f784..c6dce612 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -95,9 +95,9 @@
 <a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table></div>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+</div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index a2ee64e6..d52de6f9 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -31,9 +31,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -42,20 +42,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index 6b360712..4d9f5165 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -19,9 +19,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index a768d4e6..974c63b3 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -31,9 +31,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -42,20 +42,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index 4680594a..e1063591 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -33,9 +33,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -44,20 +44,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index dc4ef033..442fc1ab 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -21,9 +21,9 @@ YEAH !&lt;/p&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index eb7a72f7..2e46b473 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -6,9 +6,9 @@
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
@@ -17,20 +17,20 @@ pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</summary><content type="html">&l
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.&lt;/p&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;p&gt;Lovely.&lt;/p&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index 6ac30929..01c24157 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -6,9 +6,9 @@
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
 &lt;h2&gt;Testing sourcecode directive&lt;/h2&gt;
-&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
-&lt;/pre&gt;&lt;/div&gt;
-&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;table class="highlighttable"&gt;&lt;tr&gt;&lt;td class="linenos"&gt;&lt;div class="linenodiv"&gt;&lt;pre&gt;&lt;span class="normal"&gt;1&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;td class="code"&gt;&lt;div&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span class="n"&gt;formatter&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt; &lt;span class="ow"&gt;and&lt;/span&gt; &lt;span class="n"&gt;VARIANTS&lt;/span&gt;&lt;span class="p"&gt;[&lt;/span&gt;&lt;span class="bp"&gt;self&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;options&lt;/span&gt;&lt;span class="o"&gt;.&lt;/span&gt;&lt;span class="n"&gt;keys&lt;/span&gt;&lt;span class="p"&gt;()[&lt;/span&gt;&lt;span class="mi"&gt;0&lt;/span&gt;&lt;span class="p"&gt;]]&lt;/span&gt;
+&lt;/pre&gt;&lt;/div&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;
+&lt;/div&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 233f7ee1..c7c9dae8 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -51,9 +51,9 @@
 <a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table></div>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+</div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 12806772..7f2ae039 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -51,20 +51,20 @@
 <a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
 <div class="section" id="testing-sourcecode-directive">
 <h2>Testing sourcecode directive</h2>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table></div>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+</div>
 <div class="section" id="testing-another-case">
 <h2>Testing another case</h2>
 <p>This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will have nothing in default.</p>
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-</pre></div>
-</td></tr></table><p>Lovely.</p>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+</pre></div></td></tr></table></div>
+<p>Lovely.</p>
 </div>
 <div class="section" id="testing-more-sourcecode-directives">
 <h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+<div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
 <p>Lovely.</p>
 </div>
 <div class="section" id="testing-even-more-sourcecode-directives">

From 06c9e0fb804c5b63dca48b59720bf98f8a06df24 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 27 Mar 2023 10:36:00 +0200
Subject: [PATCH 2541/2864] Pin Flake8 to 3.9.* in requirements/style.pip

---
 requirements/style.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/style.pip b/requirements/style.pip
index 90225d01..f1c82ed0 100644
--- a/requirements/style.pip
+++ b/requirements/style.pip
@@ -1,2 +1,2 @@
-flake8
+flake8==3.9.2
 flake8-import-order

From a2852942ea90cbd2dff789efde94feaeab47fa06 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 27 Mar 2023 10:44:01 +0200
Subject: [PATCH 2542/2864] Update Pygments and Markdown dependency versions

---
 pyproject.toml        | 4 ++--
 requirements/test.pip | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 002ebfff..43a418f4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -46,13 +46,13 @@ markdown = {version = ">=3.1", optional = true}
 BeautifulSoup4 = "^4.9"
 jinja2 = "~3.1.2"
 lxml = "^4.3"
-markdown = "~3.3.7"
+markdown = "~3.4.3"
 typogrify = "^2.0"
 sphinx = "^5.1"
 furo = "2022.12.07"
 livereload = "^2.6"
 psutil = {version = "^5.7", optional = true}
-pygments = "~2.8"
+pygments = "~2.14"
 pytest = "^7.1"
 pytest-cov = "^3.0"
 pytest-sugar = "^0.9.5"
diff --git a/requirements/test.pip b/requirements/test.pip
index 5873bb2b..a7d566f5 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,11 +1,11 @@
 # Tests
-Pygments==2.8.1
+Pygments==2.14.0
 pytest
 pytest-cov
 pytest-xdist[psutil]
 
 # Optional Packages
-Markdown==3.3.7
+Markdown==3.4.3
 BeautifulSoup4
 lxml
 typogrify

From 219c01afb07e41020224e5bd92ecb48ba6405000 Mon Sep 17 00:00:00 2001
From: "Martin (mart-e)" <me@mart-e.be>
Date: Wed, 29 Mar 2023 13:39:27 +0200
Subject: [PATCH 2543/2864] [IMP] pelican_import with gmf instead of markdown

The markdown import of pandoc is their own flavour of markdown. It for
instance uses fenced divs[1] which are not supported by
python-markdown.  When importing content from Wordpress, there is
several issues as explained in discussion 3113[2]
This change follows a discussion with pandoc developer[3]

[1] https://pandoc.org/MANUAL.html#divs-and-spans
[2] https://github.com/getpelican/pelican/discussions/3113
[3] https://fosstodon.org/@pandoc/110105559949588768

Take the following Wordpress blog post sample:
```html
<p><!-- wp:paragraph --></p>
<p>Paragraph content</p>
<p><!-- /wp:paragraph --></p>
<p><!-- wp:image {"align":"center","id":3747,"sizeSlug":"full"} --></p>
<div class="wp-block-image">
<figure class="aligncenter size-full"><img src="https://test.com/test.jpg" alt="" class="wp-image-3747" title="Some title"/><br />
<figcaption><em>Some caption</em></figcaption>
</figure>
</div>
<p><!-- /wp:image --></p>
```
Before this commit:
was imported as

```md
`<!-- wp:paragraph -->`{=html}

Paragraph content

`<!-- /wp:paragraph -->`{=html}

`<!-- wp:image {"align":"center","id":3747,"sizeSlug":"full"} -->`{=html}

::: wp-block-image
<figure class="aligncenter size-full">
<img src="https://test.com/test.jpg" title="Some title"
class="wp-image-3747" /><br />

<figcaption><em>Some caption</em></figcaption>
</figure>
:::

`<!-- /wp:image -->`{=html}
```

After this change:
```md
<!-- wp:paragraph -->

Paragraph content

<!-- /wp:paragraph -->

<!-- wp:image {"align":"center","id":3747,"sizeSlug":"full"} -->

<div class="wp-block-image">

<figure class="aligncenter size-full">
<img src="https://test.com/test.jpg" title="Some title"
class="wp-image-3747" /><br />

<figcaption><em>Some caption</em></figcaption>
</figure>

</div>

<!-- /wp:image -->
```

Fixes #3113
---
 pelican/tests/test_importer.py  | 2 +-
 pelican/tools/pelican_import.py | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 76feb9ce..198ee0fe 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -317,7 +317,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
             self.posts)
         with temporary_folder() as temp:
             md = [r(f) for f in silent_f2p(test_post, 'markdown', temp)][0]
-            sample_line = re.search(r'-   This is a code sample', md).group(0)
+            sample_line = re.search(r'- This is a code sample', md).group(0)
             code_line = re.search(r'\s+a = \[1, 2, 3\]', md).group(0)
             self.assertTrue(sample_line.rindex('This') < code_line.rindex('a'))
 
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 5b08b6b5..f8a6c631 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -839,12 +839,15 @@ def fields2pelican(
                     if pandoc_version >= (1, 16) else '--no-wrap'
                 cmd = ('pandoc --normalize {0} --from=html'
                        ' --to={1} {2} -o "{3}" "{4}"')
-                cmd = cmd.format(parse_raw, out_markup, wrap_none,
+                cmd = cmd.format(parse_raw,
+                                 out_markup if out_markup != 'markdown' else "gfm",
+                                 wrap_none,
                                  out_filename, html_filename)
             else:
                 from_arg = '-f html+raw_html' if not strip_raw else '-f html'
                 cmd = ('pandoc {0} --to={1}-smart --wrap=none -o "{2}" "{3}"')
-                cmd = cmd.format(from_arg, out_markup,
+                cmd = cmd.format(from_arg,
+                                 out_markup if out_markup != 'markdown' else "gfm",
                                  out_filename, html_filename)
 
             try:

From 6ac497922fe53fc46103ad18b44cc16aac581b85 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Apr 2023 09:07:44 +0200
Subject: [PATCH 2544/2864] Update pre-commit hooks

---
 .pre-commit-config.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c0e34a00..4c0c85b0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,8 @@
+---
 # See https://pre-commit.com/hooks.html for info on hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -10,6 +11,7 @@ repos:
       - id: debug-statements
       - id: detect-private-key
       - id: end-of-file-fixer
+      - id: forbid-new-submodules
       - id: trailing-whitespace
   - repo: https://github.com/PyCQA/flake8
     rev: 3.9.2

From 4db5c7ca4b4903d6fbebc406f922419a6a2bb283 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Apr 2023 09:08:31 +0200
Subject: [PATCH 2545/2864] Update to Invoke 2.0 for Python 3.11 compatibility

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 002ebfff..0f088e86 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,7 +60,7 @@ pytest-xdist = "^2.0"
 tox = {version = "^3.13", optional = true}
 flake8 = "^3.8"
 flake8-import-order = "^0.18.1"
-invoke = "^1.3"
+invoke = "^2.0"
 isort = "^5.2"
 black = {version = "^19.10b0", allow-prereleases = true}
 

From 8bb9e0da484cb944e216726a32e010ab59bed971 Mon Sep 17 00:00:00 2001
From: geoffff <github@8pup.net>
Date: Wed, 22 Dec 2021 16:23:06 -0800
Subject: [PATCH 2546/2864] Update paginator.py

Use str.startswith('/') to check whether 'ret' starts with a slash. The original code fails when 'ret' is an empty string, such as when INDEX_URL is set to "".
---
 pelican/paginator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/paginator.py b/pelican/paginator.py
index 7e738fe3..4231e67b 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -155,7 +155,7 @@ class Page:
         # changed to lstrip() because that would remove all leading slashes and
         # thus make the workaround impossible. See
         # test_custom_pagination_pattern() for a verification of this.
-        if ret[0] == '/':
+        if ret.startswith('/'):
             ret = ret[1:]
         return ret
 

From 7adcfc7938e0bd3a0ff406e87b200b760e3e455a Mon Sep 17 00:00:00 2001
From: FriedrichFroebel <FriedrichFroebel@users.noreply.github.com>
Date: Mon, 24 Apr 2023 18:44:50 +0200
Subject: [PATCH 2547/2864] Allow resetting `memoized` cache. Fixes #3110.

---
 pelican/tests/test_utils.py | 31 +++++++++++++++++++++++++++++++
 pelican/utils.py            |  4 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 449a6814..1890ffb9 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -860,3 +860,34 @@ class TestSanitisedJoin(unittest.TestCase):
             utils.posixize_path(
                 os.path.abspath(os.path.join("/foo/bar", "test")))
         )
+
+
+class TestMemoized(unittest.TestCase):
+    def test_memoized(self):
+        class Container:
+            def _get(self, key):
+                pass
+
+            @utils.memoized
+            def get(self, key):
+                return self._get(key)
+
+        container = Container()
+
+        with unittest.mock.patch.object(
+                container, "_get", side_effect=lambda x: x
+        ) as get_mock:
+            self.assertEqual("foo", container.get("foo"))
+            get_mock.assert_called_once_with("foo")
+
+            get_mock.reset_mock()
+            self.assertEqual("foo", container.get("foo"))
+            get_mock.assert_not_called()
+
+            self.assertEqual("bar", container.get("bar"))
+            get_mock.assert_called_once_with("bar")
+
+            get_mock.reset_mock()
+            container.get.cache.clear()
+            self.assertEqual("bar", container.get("bar"))
+            get_mock.assert_called_once_with("bar")
diff --git a/pelican/utils.py b/pelican/utils.py
index f3a01217..de6ef9bf 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -155,7 +155,9 @@ class memoized:
 
     def __get__(self, obj, objtype):
         '''Support instance methods.'''
-        return partial(self.__call__, obj)
+        fn = partial(self.__call__, obj)
+        fn.cache = self.cache
+        return fn
 
 
 def deprecated_attribute(old, new, since=None, remove=None, doc=None):

From bb682973fb9e71e378bc74b9e7130508721f3a44 Mon Sep 17 00:00:00 2001
From: "Martin (mart-e)" <me@mart-e.be>
Date: Sat, 6 May 2023 08:40:29 +0200
Subject: [PATCH 2548/2864] Don't specify unlimited feed size by default

Having a feed with hundreds of articles, making a very large file, is
rarely expected.

Set a high fallback value of 100 so it does not change for small sites.

Still allow to have infinite feed by setting FEED_MAX_ITEM = None
---
 docs/settings.rst   | 6 +++---
 pelican/settings.py | 2 +-
 pelican/writers.py  | 8 +++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e51c6a12..0c0353a3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -998,10 +998,10 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
    placeholder. If not set, ``TAG_FEED_RSS`` is used both for save location and
    URL.
 
-.. data:: FEED_MAX_ITEMS
+.. data:: FEED_MAX_ITEMS = 100
 
-   Maximum number of items allowed in a feed. Feed item quantity is
-   unrestricted by default.
+   Maximum number of items allowed in a feed. Setting to ``None`` will cause the
+   feed to contains every article. 100 if not specified.
 
 .. data:: RSS_FEED_SUMMARY_ONLY = True
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 5b495e86..f38b46f0 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -40,7 +40,7 @@ DEFAULT_CONFIG = {
     'AUTHOR_FEED_ATOM': 'feeds/{slug}.atom.xml',
     'AUTHOR_FEED_RSS': 'feeds/{slug}.rss.xml',
     'TRANSLATION_FEED_ATOM': 'feeds/all-{lang}.atom.xml',
-    'FEED_MAX_ITEMS': '',
+    'FEED_MAX_ITEMS': 100,
     'RSS_FEED_SUMMARY_ONLY': True,
     'SITEURL': '',
     'SITENAME': 'A Pelican Blog',
diff --git a/pelican/writers.py b/pelican/writers.py
index 73ee4b33..f0280269 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -143,11 +143,9 @@ class Writer:
 
         feed = self._create_new_feed(feed_type, feed_title, context)
 
-        max_items = len(elements)
-        if self.settings['FEED_MAX_ITEMS']:
-            max_items = min(self.settings['FEED_MAX_ITEMS'], max_items)
-        for i in range(max_items):
-            self._add_item_to_the_feed(feed, elements[i])
+        # FEED_MAX_ITEMS = None means [:None] to get every element
+        for element in elements[:self.settings['FEED_MAX_ITEMS']]:
+            self._add_item_to_the_feed(feed, element)
 
         signals.feed_generated.send(context, feed=feed)
         if path:

From ef844dbe0a204ce964dbbdcbc76013c966345f47 Mon Sep 17 00:00:00 2001
From: "Martin (mart-e)" <me@mart-e.be>
Date: Mon, 10 Apr 2023 12:50:06 +0200
Subject: [PATCH 2549/2864] Use the default configuration

When importing a blog, a error is logged: 'No timezone information
specified in the settings'.
This is because the code calls read_settings() but no configuration
file is provided.
Instead of providing one (users may not already have one if they are
at the import step), use the default settings.
---
 pelican/tools/pelican_import.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 5b08b6b5..37d1c21b 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -15,7 +15,7 @@ from urllib.request import urlretrieve
 
 # because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import init
-from pelican.settings import read_settings
+from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import SafeDatetime, slugify
 
 
@@ -285,8 +285,7 @@ def dc2fields(file):
 
     print("%i posts read." % len(posts))
 
-    settings = read_settings()
-    subs = settings['SLUG_REGEX_SUBSTITUTIONS']
+    subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
     for post in posts:
         fields = post.split('","')
 
@@ -404,8 +403,7 @@ def posterous2fields(api_token, email, password):
 
     page = 1
     posts = get_posterous_posts(api_token, email, password, page)
-    settings = read_settings()
-    subs = settings['SLUG_REGEX_SUBSTITUTIONS']
+    subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
     while len(posts) > 0:
         posts = get_posterous_posts(api_token, email, password, page)
         page += 1
@@ -446,8 +444,7 @@ def tumblr2fields(api_key, blogname):
 
     offset = 0
     posts = get_tumblr_posts(api_key, blogname, offset)
-    settings = read_settings()
-    subs = settings['SLUG_REGEX_SUBSTITUTIONS']
+    subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
     while len(posts) > 0:
         for post in posts:
             title = \
@@ -531,8 +528,7 @@ def feed2fields(file):
     """Read a feed and yield pelican fields"""
     import feedparser
     d = feedparser.parse(file)
-    settings = read_settings()
-    subs = settings['SLUG_REGEX_SUBSTITUTIONS']
+    subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
     for entry in d.entries:
         date = (time.strftime('%Y-%m-%d %H:%M', entry.updated_parsed)
                 if hasattr(entry, 'updated_parsed') else None)
@@ -778,8 +774,7 @@ def fields2pelican(
     pandoc_version = get_pandoc_version()
     posts_require_pandoc = []
 
-    settings = read_settings()
-    slug_subs = settings['SLUG_REGEX_SUBSTITUTIONS']
+    slug_subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
 
     for (title, content, filename, date, author, categories, tags, status,
             kind, in_markup) in fields:

From 6f93202e60e1b2468af5ef58905e906baa291466 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 22 May 2023 15:12:09 +0200
Subject: [PATCH 2550/2864] Add new Pelican Plugins org link to content docs

---
 docs/content.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 0ab80670..e7aeefdc 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -95,8 +95,9 @@ contains a list of reserved metadata keywords:
 ``url``         URL to use for this article/page
 =============== ===============================================================
 
-Readers for additional formats (such as AsciiDoc_) are available via plugins.
-Refer to `pelican-plugins`_ repository for those.
+Readers for additional formats (such as AsciiDoc_) are available via plugins,
+which you can find via the `Pelican Plugins`_ collection as well as the legacy
+`pelican-plugins`_ repository.
 
 Pelican can also process HTML files ending in ``.html`` and ``.htm``. Pelican
 interprets the HTML in a very straightforward manner, reading metadata from
@@ -626,11 +627,12 @@ Hidden Posts
 
 Like pages, posts can also be marked as ``hidden`` with the ``Status: hidden``
 attribute. Hidden posts will be output to ``ARTICLE_SAVE_AS`` as expected, but
-are not included by default in tag, category, and author indexes, nor in the 
+are not included by default in tag, category, and author indexes, nor in the
 main article feed. This has the effect of creating an "unlisted" post.
 
 .. _W3C ISO 8601: https://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: https://www.methods.co.nz/asciidoc/
+.. _Pelican Plugins: https://github.com/pelican-plugins
 .. _pelican-plugins: https://github.com/getpelican/pelican-plugins
 .. _Python-Markdown: https://github.com/Python-Markdown/markdown
 .. _Markdown Extensions: https://python-markdown.github.io/extensions/

From 0a42b5f250b53bce3c48e789592ab62106dabc2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikolaus=20Sch=C3=BCler?= <nik@drnik.org>
Date: Tue, 30 May 2023 15:58:09 +0200
Subject: [PATCH 2551/2864] Fix typo in pelican-themes.rst

The least change would be to just say "suffixed", but I don't think that's a correct english word, so I choose "followed by"
---
 docs/pelican-themes.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index e63f6a19..29c905a5 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -62,7 +62,7 @@ or ``--list`` option:
 In this example, we can see there are three themes available: ``notmyidea``,
 ``simple``, and ``two-column``.
 
-``two-column`` is prefixed with an ``@`` because this theme is not copied to
+``two-column`` is followed by an ``@`` because this theme is not copied to
 the Pelican theme path, but is instead just linked to it (see `Creating
 symbolic links`_ for details about creating symbolic links).
 

From bbbc96cf8321f1e6d8f2edda1d69e528d0304dce Mon Sep 17 00:00:00 2001
From: Matthew Pounsett <matt@conundrum.com>
Date: Sun, 4 Jun 2023 04:34:09 -0400
Subject: [PATCH 2552/2864] Add quoting to `devserver-global` target in
 Makefile, fixes #3072 (#3073)

---
 pelican/tools/templates/Makefile.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 2bcb7473..02de5e5b 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -114,7 +114,7 @@ devserver:
 	"$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
 
 devserver-global:
-	$(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -b 0.0.0.0
+	"$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -b 0.0.0.0
 
 publish:
 	"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)

From 418a9191b0424ba94ebd3d1ee1522c4a9440ef44 Mon Sep 17 00:00:00 2001
From: Matthew Pounsett <matt@conundrum.com>
Date: Tue, 20 Dec 2022 12:46:54 -0500
Subject: [PATCH 2553/2864] Add devserver-global Makefile target to .phony,
 fixes #3065

---
 pelican/tools/templates/Makefile.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 02de5e5b..a324d1b1 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -165,4 +165,4 @@ github: publish
 
 {% endif %}
 
-.PHONY: html help clean regenerate serve serve-global devserver publish {{ upload|join(" ") }}
+.PHONY: html help clean regenerate serve serve-global devserver devserver-global publish {{ upload|join(" ") }}

From 1f6b344f7d7b7e8dd0271cc333a257faca566c15 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 29 Apr 2023 19:00:52 +0300
Subject: [PATCH 2554/2864] Add sftp_upload Makefile target to .phony

Signed-off-by: Deniz Turgut <dturgut@gmail.com>
---
 pelican/tools/templates/Makefile.jinja2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index a324d1b1..93ab1aa7 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -125,6 +125,7 @@ publish:
 ssh_upload: publish
 	scp -P $(SSH_PORT) -r "$(OUTPUTDIR)"/* "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)"
 
+{% set upload = upload + ["sftp_upload"] %}
 sftp_upload: publish
 	printf 'put -r $(OUTPUTDIR)/*' | sftp $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 

From 5214248344ba75ec1e0ea804bcfcc25bc4b533e2 Mon Sep 17 00:00:00 2001
From: DJ Ramones <50655786+djramones@users.noreply.github.com>
Date: Sun, 18 Jun 2023 11:07:39 +0800
Subject: [PATCH 2555/2864] Implement period_archives common context variable

Also, set default patterns for time-period *_ARCHIVE_URL settings.
---
 docs/settings.rst                |  25 +++---
 docs/themes.rst                  |  61 ++++++++++++++
 pelican/generators.py            | 135 ++++++++++++++++++-------------
 pelican/settings.py              |   6 +-
 pelican/tests/test_generators.py |  97 ++++++++++++++++++++++
 5 files changed, 255 insertions(+), 69 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index e51c6a12..259b53f5 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -572,33 +572,36 @@ posts for the month at ``posts/2011/Aug/index.html``.
     This way a reader can remove a portion of your URL and automatically arrive
     at an appropriate archive of posts, without having to specify a page name.
 
-.. data:: YEAR_ARCHIVE_URL = ''
-
-   The URL to use for per-year archives of your posts. Used only if you have
-   the ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
-
 .. data:: YEAR_ARCHIVE_SAVE_AS = ''
 
    The location to save per-year archives of your posts.
 
-.. data:: MONTH_ARCHIVE_URL = ''
+.. data:: YEAR_ARCHIVE_URL = 'posts/{date:%Y}/'
 
-   The URL to use for per-month archives of your posts. Used only if you have
-   the ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
+   The URL to use for per-year archives of your posts. This default value
+   matches a ``YEAR_ARCHIVE_SAVE_AS`` setting of
+   ``posts/{date:%Y}/index.html``.
 
 .. data:: MONTH_ARCHIVE_SAVE_AS = ''
 
    The location to save per-month archives of your posts.
 
-.. data:: DAY_ARCHIVE_URL = ''
+.. data:: MONTH_ARCHIVE_URL = 'posts/{date:%Y}/{date:%b}/'
 
-   The URL to use for per-day archives of your posts. Used only if you have the
-   ``{url}`` placeholder in ``PAGINATION_PATTERNS``.
+   The URL to use for per-month archives of your posts. This default value
+   matches a ``MONTH_ARCHIVE_SAVE_AS`` setting of
+   ``posts/{date:%Y}/{date:%b}/index.html``.
 
 .. data:: DAY_ARCHIVE_SAVE_AS = ''
 
    The location to save per-day archives of your posts.
 
+.. data:: DAY_ARCHIVE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/'
+
+   The URL to use for per-day archives of your posts. This default value
+   matches a ``DAY_ARCHIVE_SAVE_AS`` setting of
+   ``posts/{date:%Y}/{date:%b}/{date:%d}/index.html``.
+
 ``DIRECT_TEMPLATES`` work a bit differently than noted above. Only the
 ``_SAVE_AS`` settings are available, but it is available for any direct
 template.
diff --git a/docs/themes.rst b/docs/themes.rst
index fe6337d6..8e46b716 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -71,6 +71,8 @@ All templates will receive the variables defined in your settings file, as long
 as they are in all-caps. You can access them directly.
 
 
+.. _common_variables:
+
 Common Variables
 ----------------
 
@@ -92,6 +94,10 @@ dates           The same list of articles, but ordered by date,
                 ascending.
 hidden_articles The list of hidden articles
 drafts          The list of draft articles
+period_archives A dictionary containing elements related to
+                time-period archives (if enabled). See the section
+                :ref:`Listing and Linking to Period Archives
+                <period_archives_variable>` for details.
 authors         A list of (author, articles) tuples, containing all
                 the authors and corresponding articles (values)
 categories      A list of (category, articles) tuples, containing
@@ -348,6 +354,61 @@ period_archives.html template
 <https://github.com/getpelican/pelican/blob/master/pelican/themes/simple/templates/period_archives.html>`_.
 
 
+.. _period_archives_variable:
+
+Listing and Linking to Period Archives
+""""""""""""""""""""""""""""""""""""""
+
+The ``period_archives`` variable can be used to generate a list of links to
+the set of period archives that Pelican generates. As a :ref:`common variable
+<common_variables>`, it is available for use in any template, so you
+can implement such an index in a custom direct template, or in a sidebar
+visible across different site pages.
+
+``period_archives`` is a dict that may contain ``year``, ``month``, and/or
+``day`` keys, depending on which ``*_ARCHIVE_SAVE_AS`` settings are enabled.
+The corresponding value is a list of dicts, where each dict in turn represents
+a time period, with the following keys and values:
+
+===================     ===================================================
+Key                     Value
+===================     ===================================================
+period                  The same tuple as described in
+                        ``period_archives.html``, e.g.
+                        ``(2023, 'June', 18)``.
+period_num              The same tuple as described in
+                        ``period_archives.html``, e.g. ``(2023, 6, 18)``.
+url                     The URL to the period archive page, e.g.
+                        ``posts/2023/06/18/``. This is controlled by the
+                        corresponding ``*_ARCHIVE_URL`` setting.
+save_as                 The path to the save location of the period archive
+                        page file, e.g. ``posts/2023/06/18/index.html``.
+                        This is used internally by Pelican and is usually
+                        not relevant to themes.
+articles                A list of :ref:`Article <object-article>` objects
+                        that fall under the time period.
+dates                   Same list as ``articles``, but ordered by date.
+===================     ===================================================
+
+Here is an example of how ``period_archives`` can be used in a template:
+
+.. code-block:: html+jinja
+
+    <ul>
+    {% for archive in period_archives.month %}
+        <li>
+            <a href="{{ SITEURL }}/{{ archive.url }}">
+                {{ archive.period | reverse | join(' ') }} ({{ archive.articles|count }})
+            </a>
+        </li>
+    {% endfor %}
+    </ul>
+
+You can change ``period_archives.month`` in the ``for`` statement to
+``period_archives.year`` or ``period_archives.day`` as appropriate, depending
+on the time period granularity desired.
+
+
 Objects
 =======
 
diff --git a/pelican/generators.py b/pelican/generators.py
index e18531be..ad0f84c4 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -295,6 +295,7 @@ class ArticlesGenerator(CachingGenerator):
         self.drafts = []                   # only drafts in default language
         self.drafts_translations = []
         self.dates = {}
+        self.period_archives = defaultdict(list)
         self.tags = defaultdict(list)
         self.categories = defaultdict(list)
         self.related_posts = []
@@ -483,64 +484,17 @@ class ArticlesGenerator(CachingGenerator):
         except PelicanTemplateNotFound:
             template = self.get_template('archives')
 
-        period_save_as = {
-            'year': self.settings['YEAR_ARCHIVE_SAVE_AS'],
-            'month': self.settings['MONTH_ARCHIVE_SAVE_AS'],
-            'day': self.settings['DAY_ARCHIVE_SAVE_AS'],
-        }
+        for granularity in list(self.period_archives.keys()):
+            for period in self.period_archives[granularity]:
 
-        period_url = {
-            'year': self.settings['YEAR_ARCHIVE_URL'],
-            'month': self.settings['MONTH_ARCHIVE_URL'],
-            'day': self.settings['DAY_ARCHIVE_URL'],
-        }
-
-        period_date_key = {
-            'year': attrgetter('date.year'),
-            'month': attrgetter('date.year', 'date.month'),
-            'day': attrgetter('date.year', 'date.month', 'date.day')
-        }
-
-        def _generate_period_archives(dates, key, save_as_fmt, url_fmt):
-            """Generate period archives from `dates`, grouped by
-            `key` and written to `save_as`.
-            """
-            # `dates` is already sorted by date
-            for _period, group in groupby(dates, key=key):
-                archive = list(group)
-                articles = [a for a in self.articles if a in archive]
-                # arbitrarily grab the first date so that the usual
-                # format string syntax can be used for specifying the
-                # period archive dates
-                date = archive[0].date
-                save_as = save_as_fmt.format(date=date)
-                url = url_fmt.format(date=date)
                 context = self.context.copy()
+                context['period'] = period['period']
+                context['period_num'] = period['period_num']
 
-                if key == period_date_key['year']:
-                    context["period"] = (_period,)
-                    context["period_num"] = (_period,)
-                else:
-                    month_name = calendar.month_name[_period[1]]
-                    if key == period_date_key['month']:
-                        context["period"] = (_period[0],
-                                             month_name)
-                    else:
-                        context["period"] = (_period[0],
-                                             month_name,
-                                             _period[2])
-                    context["period_num"] = tuple(_period)
-
-                write(save_as, template, context, articles=articles,
-                      dates=archive, template_name='period_archives',
-                      blog=True, url=url, all_articles=self.articles)
-
-        for period in 'year', 'month', 'day':
-            save_as = period_save_as[period]
-            url = period_url[period]
-            if save_as:
-                key = period_date_key[period]
-                _generate_period_archives(self.dates, key, save_as, url)
+                write(period['save_as'], template, context,
+                      articles=period['articles'], dates=period['dates'],
+                      template_name='period_archives', blog=True,
+                      url=period['url'], all_articles=self.articles)
 
     def generate_direct_templates(self, write):
         """Generate direct templates pages"""
@@ -680,6 +634,74 @@ class ArticlesGenerator(CachingGenerator):
         self.dates.sort(key=attrgetter('date'),
                         reverse=self.context['NEWEST_FIRST_ARCHIVES'])
 
+        def _build_period_archives(sorted_articles):
+            period_archives = defaultdict(list)
+
+            period_archives_settings = {
+                'year': {
+                    'save_as': self.settings['YEAR_ARCHIVE_SAVE_AS'],
+                    'url': self.settings['YEAR_ARCHIVE_URL'],
+                },
+                'month': {
+                    'save_as': self.settings['MONTH_ARCHIVE_SAVE_AS'],
+                    'url': self.settings['MONTH_ARCHIVE_URL'],
+                },
+                'day': {
+                    'save_as': self.settings['DAY_ARCHIVE_SAVE_AS'],
+                    'url': self.settings['DAY_ARCHIVE_URL'],
+                },
+            }
+
+            granularity_key_func = {
+                'year': attrgetter('date.year'),
+                'month': attrgetter('date.year', 'date.month'),
+                'day': attrgetter('date.year', 'date.month', 'date.day'),
+            }
+
+            for granularity in 'year', 'month', 'day':
+                save_as_fmt = period_archives_settings[granularity]['save_as']
+                url_fmt = period_archives_settings[granularity]['url']
+                key_func = granularity_key_func[granularity]
+
+                if not save_as_fmt:
+                    # the archives for this period granularity are not needed
+                    continue
+
+                for period, group in groupby(sorted_articles, key=key_func):
+                    period_archive = {}
+
+                    dates = list(group)
+                    period_archive['dates'] = dates
+                    period_archive['articles'] = [
+                        a for a in self.articles if a in dates
+                    ]
+
+                    # use the first date to specify the period archive URL
+                    # and save_as; the specific date used does not matter as
+                    # they all belong to the same period
+                    d = dates[0].date
+                    period_archive['save_as'] = save_as_fmt.format(date=d)
+                    period_archive['url'] = url_fmt.format(date=d)
+
+                    if granularity == 'year':
+                        period_archive['period'] = (period,)
+                        period_archive['period_num'] = (period,)
+                    else:
+                        month_name = calendar.month_name[period[1]]
+                        if granularity == 'month':
+                            period_archive['period'] = (period[0], month_name)
+                        else:
+                            period_archive['period'] = (period[0],
+                                                        month_name,
+                                                        period[2])
+                        period_archive['period_num'] = tuple(period)
+
+                    period_archives[granularity].append(period_archive)
+
+            return period_archives
+
+        self.period_archives = _build_period_archives(self.dates)
+
         # and generate the output :)
 
         # order the categories per name
@@ -694,6 +716,9 @@ class ArticlesGenerator(CachingGenerator):
             'articles', 'drafts', 'hidden_articles',
             'dates', 'tags', 'categories',
             'authors', 'related_posts'))
+        # _update_context flattens dicts, which should not happen to
+        # period_archives, so we update the context directly for it:
+        self.context['period_archives'] = self.period_archives
         self.save_cache()
         self.readers.save_cache()
         signals.article_generator_finalized.send(self)
diff --git a/pelican/settings.py b/pelican/settings.py
index 5b495e86..2405902f 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -90,11 +90,11 @@ DEFAULT_CONFIG = {
         (1, '{name}{extension}', '{name}{extension}'),
         (2, '{name}{number}{extension}', '{name}{number}{extension}'),
     ],
-    'YEAR_ARCHIVE_URL': '',
+    'YEAR_ARCHIVE_URL': 'posts/{date:%Y}/',
     'YEAR_ARCHIVE_SAVE_AS': '',
-    'MONTH_ARCHIVE_URL': '',
+    'MONTH_ARCHIVE_URL': 'posts/{date:%Y}/{date:%b}/',
     'MONTH_ARCHIVE_SAVE_AS': '',
-    'DAY_ARCHIVE_URL': '',
+    'DAY_ARCHIVE_URL': 'posts/{date:%Y}/{date:%b}/{date:%d}/',
     'DAY_ARCHIVE_SAVE_AS': '',
     'RELATIVE_URLS': False,
     'DEFAULT_LANG': 'en',
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 1bc8aff0..a6fe9731 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -405,6 +405,103 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertIn(custom_template, self.articles)
         self.assertIn(standard_template, self.articles)
 
+    def test_period_archives_context(self):
+        """Test correctness of the period_archives context values."""
+
+        old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, 'C')
+        settings = get_settings()
+        settings['CACHE_PATH'] = self.temp_cache
+
+        # No period archives enabled:
+        context = get_context(settings)
+        generator = ArticlesGenerator(
+            context=context, settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        period_archives = generator.context['period_archives']
+        self.assertEqual(len(period_archives.items()), 0)
+
+        # Year archives enabled:
+        settings['YEAR_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/index.html'
+        settings['YEAR_ARCHIVE_URL'] = 'posts/{date:%Y}/'
+        context = get_context(settings)
+        generator = ArticlesGenerator(
+            context=context, settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        period_archives = generator.context['period_archives']
+        self.assertEqual(len(period_archives.items()), 1)
+        self.assertIn('year', period_archives.keys())
+        archive_years = [p['period'][0] for p in period_archives['year']]
+        self.assertIn(1970, archive_years)
+        self.assertIn(2014, archive_years)
+
+        # Month archives enabled:
+        settings['MONTH_ARCHIVE_SAVE_AS'] = \
+            'posts/{date:%Y}/{date:%b}/index.html'
+        settings['MONTH_ARCHIVE_URL'] = \
+            'posts/{date:%Y}/{date:%b}/'
+        context = get_context(settings)
+        generator = ArticlesGenerator(
+            context=context, settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        period_archives = generator.context['period_archives']
+        self.assertEqual(len(period_archives.items()), 2)
+        self.assertIn('month', period_archives.keys())
+        month_archives_tuples = [p['period'] for p in period_archives['month']]
+        self.assertIn((1970, 'January'), month_archives_tuples)
+        self.assertIn((2014, 'February'), month_archives_tuples)
+
+        # Day archives enabled:
+        settings['DAY_ARCHIVE_SAVE_AS'] = \
+            'posts/{date:%Y}/{date:%b}/{date:%d}/index.html'
+        settings['DAY_ARCHIVE_URL'] = \
+            'posts/{date:%Y}/{date:%b}/{date:%d}/'
+        context = get_context(settings)
+        generator = ArticlesGenerator(
+            context=context, settings=settings,
+            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+        generator.generate_context()
+        period_archives = generator.context['period_archives']
+        self.assertEqual(len(period_archives.items()), 3)
+        self.assertIn('day', period_archives.keys())
+        day_archives_tuples = [p['period'] for p in period_archives['day']]
+        self.assertIn((1970, 'January', 1), day_archives_tuples)
+        self.assertIn((2014, 'February', 9), day_archives_tuples)
+
+        # Further item values tests
+        filtered_archives = [
+            p for p in period_archives['day']
+            if p['period'] == (2014, 'February', 9)
+        ]
+        self.assertEqual(len(filtered_archives), 1)
+        sample_archive = filtered_archives[0]
+        self.assertEqual(sample_archive['period_num'], (2014, 2, 9))
+        self.assertEqual(
+            sample_archive['save_as'], 'posts/2014/Feb/09/index.html')
+        self.assertEqual(
+            sample_archive['url'], 'posts/2014/Feb/09/')
+        articles = [
+            d for d in generator.articles if
+            d.date.year == 2014 and
+            d.date.month == 2 and
+            d.date.day == 9
+        ]
+        self.assertEqual(len(sample_archive['articles']), len(articles))
+        dates = [
+            d for d in generator.dates if
+            d.date.year == 2014 and
+            d.date.month == 2 and
+            d.date.day == 9
+        ]
+        self.assertEqual(len(sample_archive['dates']), len(dates))
+        self.assertEqual(sample_archive['dates'][0].title, dates[0].title)
+        self.assertEqual(sample_archive['dates'][0].date, dates[0].date)
+
+        locale.setlocale(locale.LC_ALL, old_locale)
+
     def test_period_in_timeperiod_archive(self):
         """
         Test that the context of a generated period_archive is passed

From 6ba7a0926d506ae3c6ce8e085eb7a7a64c9946f2 Mon Sep 17 00:00:00 2001
From: DJ Ramones <50655786+djramones@users.noreply.github.com>
Date: Mon, 19 Jun 2023 12:25:32 +0800
Subject: [PATCH 2556/2864] Clarify docs on ordering in period_archives var

---
 docs/themes.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 8e46b716..f68f50c0 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -368,7 +368,8 @@ visible across different site pages.
 ``period_archives`` is a dict that may contain ``year``, ``month``, and/or
 ``day`` keys, depending on which ``*_ARCHIVE_SAVE_AS`` settings are enabled.
 The corresponding value is a list of dicts, where each dict in turn represents
-a time period, with the following keys and values:
+a time period (ordered according to the ``NEWEST_FIRST_ARCHIVES`` setting)
+with the following keys and values:
 
 ===================     ===================================================
 Key                     Value
@@ -387,7 +388,8 @@ save_as                 The path to the save location of the period archive
                         not relevant to themes.
 articles                A list of :ref:`Article <object-article>` objects
                         that fall under the time period.
-dates                   Same list as ``articles``, but ordered by date.
+dates                   Same list as ``articles``, but ordered according
+                        to the ``NEWEST_FIRST_ARCHIVES`` setting.
 ===================     ===================================================
 
 Here is an example of how ``period_archives`` can be used in a template:

From 168093a75072c7d0f82df4541cf2c52ad6c71ea6 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Fri, 23 Jun 2023 09:05:10 +0200
Subject: [PATCH 2557/2864] Fix typo in pelican-themes.rst

---
 docs/pelican-themes.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index 29c905a5..9e0bf572 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -21,7 +21,7 @@ Optional arguments:
 """""""""""""""""""
 
 
--h, --help                              Show the help an exit
+-h, --help                              Show the help and exit
 
 -l, --list                              Show the themes already installed
 

From 787737615397e967ea42872238e183de25c35573 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Fri, 23 Jun 2023 09:20:32 +0200
Subject: [PATCH 2558/2864] More corrections to pelican-themes.rst

---
 docs/pelican-themes.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index 9e0bf572..b16b5389 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -82,7 +82,7 @@ Installing themes
 
 You can install one or more themes using the ``-i`` or ``--install`` option.
 This option takes as argument the path(s) of the theme(s) you want to install,
-and can be combined with the verbose option:
+and can be combined with the ``--verbose`` option:
 
 .. code-block:: console
 
@@ -154,7 +154,7 @@ This is useful for theme development:
 Doing several things at once
 """"""""""""""""""""""""""""
 
-The ``--install``, ``--remove`` and ``--symlink`` option are not mutually
+The ``--install``, ``--remove`` and ``--symlink`` options are not mutually
 exclusive, so you can combine them in the same command line to do more than one
 operation at time, like this:
 

From 7d6accac4dc3b5e8f43fa7788e3f60b55883010e Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Fri, 23 Jun 2023 09:27:51 +0200
Subject: [PATCH 2559/2864] Code should be between backquotes ()

---
 docs/pelican-themes.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pelican-themes.rst b/docs/pelican-themes.rst
index b16b5389..6cb8896a 100644
--- a/docs/pelican-themes.rst
+++ b/docs/pelican-themes.rst
@@ -29,7 +29,7 @@ Optional arguments:
 
 -r theme_name, --remove theme_name      One or more themes to remove
 
--s theme_path, --symlink theme_path     Same as "--install", but create a symbolic link instead of copying the theme.
+-s theme_path, --symlink theme_path     Same as ``--install``, but create a symbolic link instead of copying the theme.
                                         Useful for theme development
 
 -v, --verbose                           Verbose output

From d3daa4d79469d13c13a5287c9f7e7625857c4231 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 23 Jun 2023 15:53:21 +0200
Subject: [PATCH 2560/2864] Update Furo theme & pytest-cov dependency versions

---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index db18dd79..9acd5075 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,12 +49,12 @@ lxml = "^4.3"
 markdown = "~3.4.3"
 typogrify = "^2.0"
 sphinx = "^5.1"
-furo = "2022.12.07"
+furo = "2023.03.27"
 livereload = "^2.6"
 psutil = {version = "^5.7", optional = true}
 pygments = "~2.14"
 pytest = "^7.1"
-pytest-cov = "^3.0"
+pytest-cov = "^4.0"
 pytest-sugar = "^0.9.5"
 pytest-xdist = "^2.0"
 tox = {version = "^3.13", optional = true}

From 410f60d6b322cb2b3c952914d9673958c01601c1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 23 Jun 2023 15:54:39 +0200
Subject: [PATCH 2561/2864] Publish package via PyPI trusted publisher system

---
 .github/workflows/main.yml | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9574a0bc..b80d8926 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Setup Python ${{ matrix.config.python }}
+      - name: Set up Python ${{ matrix.config.python }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.config.python }}
@@ -63,7 +63,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Setup Python
+      - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: "3.9"
@@ -81,7 +81,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Setup Python
+      - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: "3.9"
@@ -95,34 +95,42 @@ jobs:
 
   deploy:
     name: Deploy
+    environment: Deployment
     needs: [test, lint, docs]
     runs-on: ubuntu-latest
-    if: ${{ github.ref=='refs/heads/master' && github.event_name!='pull_request' }}
+    if: github.ref=='refs/heads/master' && github.event_name!='pull_request'
+
+    permissions:
+      contents: write
+      id-token: write
 
     steps:
       - uses: actions/checkout@v3
-      - name: Setup Python
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+
+      - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: "3.9"
+
       - name: Check release
         id: check_release
         run: |
-          python -m pip install pip --upgrade
-          pip install poetry
-          pip install githubrelease
-          pip install --pre autopub
+          python -m pip install --upgrade pip
+          python -m pip install autopub[github]
           autopub check
-        continue-on-error: true
+
       - name: Publish
-        if: steps.check_release.outcome=='success'
+        if: ${{ steps.check_release.outputs.autopub_release=='true' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-          PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
-          git remote set-url origin https://$GITHUB_TOKEN@github.com/${{ github.repository }}
           autopub prepare
-          poetry build
           autopub commit
+          autopub build
           autopub githubrelease
-          poetry publish -u __token__ -p $PYPI_PASSWORD
+
+      - name: Upload package to PyPI
+        if: ${{ steps.check_release.outputs.autopub_release=='true' }}
+        uses: pypa/gh-action-pypi-publish@release/v1

From b260b3838e62ec903857a1e6c2d1c8a97cb130d6 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sat, 24 Jun 2023 13:29:02 +0200
Subject: [PATCH 2562/2864] Fix grammar errors/typos from docs/faq.rst

---
 docs/faq.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 8c91388d..c065b4ed 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -17,7 +17,7 @@ suggestions or problems you might have via `Pelican Discussions
 existing list of discussions and issues (both open and closed) in order to
 avoid submitting topics that have already been covered before.
 
-If you want to contribute, please fork `the git repository
+If you want to contribute, please fork `the Git repository
 <https://github.com/getpelican/pelican/>`_, create a new feature branch, make
 your changes, and issue a pull request. Someone will review your changes as
 soon as possible. Please refer to the :doc:`How to Contribute <contribute>`
@@ -68,7 +68,7 @@ I want to use Markdown, but I got an error.
 ===========================================
 
 If you try to generate Markdown content without first installing the Markdown
-library, may see a message that says ``No valid files found in content``.
+library, you may see a message that says ``No valid files found in content``.
 Markdown is not a hard dependency for Pelican, so if you have content in
 Markdown format, you will need to explicitly install the Markdown library. You
 can do so by typing the following command, prepending ``sudo`` if permissions
@@ -128,7 +128,7 @@ to override the generated URL. Here is an example page in reST format::
     :save_as: override/url/index.html
 
 With this metadata, the page will be written to ``override/url/index.html``
-and Pelican will use url ``override/url/`` to link to this page.
+and Pelican will use the URL ``override/url/`` to link to this page.
 
 How can I use a static page as my home page?
 ============================================
@@ -229,7 +229,7 @@ This can be achieved by explicitly specifying only the filenames of those
 articles in ``ARTICLE_PATHS``. A list of such filenames could be found using a
 command similar to ``cd content; find -name '*.md' | head -n 10``.
 
-My tag-cloud is missing/broken since I upgraded Pelican
+My tag cloud is missing/broken since I upgraded Pelican
 =======================================================
 
 In an ongoing effort to streamline Pelican, tag cloud generation has been

From 0533e2da9f85f75be500dc2ef544cad82acf10a4 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Tue, 27 Jun 2023 20:35:04 +0200
Subject: [PATCH 2563/2864] Small documentation fixes to docs/content.rst
 (#3156)

---
 docs/content.rst | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index e7aeefdc..cacacea9 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -184,7 +184,7 @@ files in it will be used to generate static pages, such as **About** or
 You can use the ``DISPLAY_PAGES_ON_MENU`` setting to control whether all those
 pages are displayed in the primary navigation menu. (Default is ``True``.)
 
-If you want to exclude any pages from being linked to or listed in the menu
+If you want to exclude any pages from being linked to or listed in the menu,
 then add a ``status: hidden`` attribute to its metadata. This is useful for
 things like making error pages that fit the generated theme of your site.
 
@@ -235,7 +235,7 @@ that may be sitting alongside that post (instead of having to determine where
 the other content will be placed after site generation).
 
 To link to internal content (files in the ``content`` directory), use the
-following syntax for the link target: ``{filename}path/to/file``
+following syntax for the link target: ``{filename}path/to/file``.
 Note: forward slashes, ``/``,
 are the required path separator in the ``{filename}`` directive
 on all operating systems, including Windows.
@@ -307,7 +307,7 @@ Attaching static files
 ----------------------
 
 Starting with Pelican 3.5, static files can be "attached" to a page or article
-using this syntax for the link target: ``{attach}path/to/file`` This works
+using this syntax for the link target: ``{attach}path/to/file``. This works
 like the ``{static}`` syntax, but also relocates the static file into the
 linking document's output directory. If the static file originates from a
 subdirectory beneath the linking document's source, that relationship will be
@@ -539,12 +539,12 @@ The specified identifier (e.g. ``python``, ``ruby``) should be one that
 appears on the `list of available lexers <https://pygments.org/docs/lexers/>`_.
 
 When using reStructuredText the following options are available in the
-code-block directive:
+`code-block` directive:
 
 =============   ============  =========================================
 Option          Valid values  Description
 =============   ============  =========================================
-anchorlinenos   N/A           If present wrap line numbers in <a> tags.
+anchorlinenos   N/A           If present, wrap line numbers in ``<a>`` tags.
 classprefix     string        String to prepend to token class names
 hl_lines        numbers       List of lines to be highlighted, where
                               line numbers to highlight are separated
@@ -555,22 +555,22 @@ hl_lines        numbers       List of lines to be highlighted, where
                               line numbers.
 lineanchors     string        Wrap each line in an anchor using this
                               string and -linenumber.
-linenos         string        If present or set to "table" output line
-                              numbers in a table, if set to
-                              "inline" output them inline. "none" means
+linenos         string        If present or set to "table", output line
+                              numbers in a table; if set to
+                              "inline", output them inline. "none" means
                               do not output the line numbers for this
                               table.
-linenospecial   number        If set every nth line will be given the
-                              'special' css class.
+linenospecial   number        If set, every nth line will be given the
+                              'special' CSS class.
 linenostart     number        Line number for the first line.
 linenostep      number        Print every nth line number.
 lineseparator   string        String to print between lines of code,
                               '\n' by default.
 linespans       string        Wrap each line in a span using this and
                               -linenumber.
-nobackground    N/A           If set do not output background color for
+nobackground    N/A           If set, do not output background color for
                               the wrapping element
-nowrap          N/A           If set do not wrap the tokens at all.
+nowrap          N/A           If set, do not wrap the tokens at all.
 tagsfile        string        ctags file to use for name definitions.
 tagurlformat    string        format for the ctag links.
 =============   ============  =========================================
@@ -596,7 +596,7 @@ Pelican settings file to include options that will be automatically applied to
 every code block.
 
 For example, if you want to have line numbers displayed for every code block
-and a CSS prefix you would set this variable to::
+and a CSS prefix, you would set this variable to::
 
     PYGMENTS_RST_OPTIONS = {'classprefix': 'pgcss', 'linenos': 'table'}
 
@@ -612,7 +612,7 @@ its metadata. That article will then be output to the ``drafts`` folder and not
 listed on the index page nor on any category or tag page.
 
 If your articles should be automatically published as a draft (to not
-accidentally publish an article before it is finished) include the status in
+accidentally publish an article before it is finished), include the status in
 the ``DEFAULT_METADATA``::
 
     DEFAULT_METADATA = {

From ef7e26329cbabcafa4027442cb8e8c45136f8d17 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 29 Jun 2023 11:15:41 +0200
Subject: [PATCH 2564/2864] Change botpub email address for Git commits

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 9acd5075..eb3a8f52 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -77,7 +77,7 @@ pelican-themes = "pelican.tools.pelican_themes:main"
 [tool.autopub]
 project-name = "Pelican"
 git-username = "botpub"
-git-email = "botpub@autopub.rocks"
+git-email = "52496925+botpub@users.noreply.github.com"
 changelog-file = "docs/changelog.rst"
 changelog-header = "###############"
 version-header = "="

From b8bf5950b6a6c684196a6d047d41efbff0f95c85 Mon Sep 17 00:00:00 2001
From: "(GalaxyMaster)" <galaxy4public@users.noreply.github.com>
Date: Wed, 12 Jul 2023 19:28:26 +1000
Subject: [PATCH 2565/2864] Adding missing tests for truncate_html_words()
 (#2918)

---
 pelican/tests/test_utils.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 1890ffb9..2dab2ab4 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -259,6 +259,26 @@ class TestUtils(LoggedTestCase):
             utils.truncate_html_words('<!-- comment -->' + 'word ' * 100, 20),
             '<!-- comment -->' + 'word ' * 20 + '…')
 
+        # Words enclosed or intervaled by HTML tags with a custom end
+        # marker containing HTML tags.
+        self.assertEqual(
+            utils.truncate_html_words('<p>' + 'word ' * 100 + '</p>', 20,
+                                      '<span>marker</span>'),
+            '<p>' + 'word ' * 20 + '<span>marker</span></p>')
+        self.assertEqual(
+            utils.truncate_html_words(
+                    '<span\nstyle="\n…\n">' + 'word ' * 100 + '</span>', 20,
+                    '<span>marker</span>'),
+            '<span\nstyle="\n…\n">' + 'word ' * 20 + '<span>marker</span></span>')
+        self.assertEqual(
+            utils.truncate_html_words('<br>' + 'word ' * 100, 20,
+                                      '<span>marker</span>'),
+            '<br>' + 'word ' * 20 + '<span>marker</span>')
+        self.assertEqual(
+            utils.truncate_html_words('<!-- comment -->' + 'word ' * 100, 20,
+                                      '<span>marker</span>'),
+            '<!-- comment -->' + 'word ' * 20 + '<span>marker</span>')
+
         # Words with hypens and apostrophes.
         self.assertEqual(
             utils.truncate_html_words("a-b " * 100, 20),

From 7f1ecdec8b88b9e0efa9bfa7b127862c4a2e85d5 Mon Sep 17 00:00:00 2001
From: Marcus Desai <marcus.desai@gmail.com>
Date: Tue, 25 Jul 2023 20:27:40 +0100
Subject: [PATCH 2566/2864] Fixes #3163; cleanup child processes on kill

---
 pelican/__init__.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 9858dbd3..bd867988 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -543,13 +543,15 @@ def main(argv=None):
                 target=listen,
                 args=(settings.get('BIND'), settings.get('PORT'),
                       settings.get("OUTPUT_PATH"), excqueue))
-            p1.start()
-            p2.start()
-            exc = excqueue.get()
-            p1.terminate()
-            p2.terminate()
-            if exc is not None:
-                logger.critical(exc)
+            try:
+                p1.start()
+                p2.start()
+                exc = excqueue.get()
+                if exc is not None:
+                    logger.critical(exc)
+            finally:
+                p1.terminate()
+                p2.terminate()
         elif args.autoreload:
             autoreload(args)
         elif args.listen:

From 715c056cd409b9f2a99092325c0ef6b5744613b5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 26 Jul 2023 11:24:20 +0200
Subject: [PATCH 2567/2864] Update Pygments dev dependency version

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index eb3a8f52..4ab2650a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -52,7 +52,7 @@ sphinx = "^5.1"
 furo = "2023.03.27"
 livereload = "^2.6"
 psutil = {version = "^5.7", optional = true}
-pygments = "~2.14"
+pygments = "~2.15"
 pytest = "^7.1"
 pytest-cov = "^4.0"
 pytest-sugar = "^0.9.5"

From 1d2bf8e96efa624743453f4bf8108f413e5c60f9 Mon Sep 17 00:00:00 2001
From: Will Thong <willthong@gmail.com>
Date: Wed, 26 Jul 2023 16:29:43 +0100
Subject: [PATCH 2568/2864] Replace `pytz` dependency with `zoneinfo`. Fix
 #2958 (#3161)

---
 pelican/contents.py                 | 15 ++++++++++-----
 pelican/tools/pelican_quickstart.py | 20 +++++++++++---------
 pelican/utils.py                    | 15 +++++++++------
 pyproject.toml                      |  2 +-
 setup.py                            |  4 ++--
 5 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index c979dd0a..b756f92d 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -4,10 +4,15 @@ import locale
 import logging
 import os
 import re
+from datetime import timezone
 from html import unescape
 from urllib.parse import unquote, urljoin, urlparse, urlunparse
 
-import pytz
+try:
+    import zoneinfo
+except ModuleNotFoundError:
+    from backports import zoneinfo
+
 
 from pelican.plugins import signals
 from pelican.settings import DEFAULT_CONFIG
@@ -120,9 +125,9 @@ class Content:
             self.date_format = self.date_format[1]
 
         # manage timezone
-        default_timezone = settings.get('TIMEZONE', 'UTC')
-        timezone = getattr(self, 'timezone', default_timezone)
-        self.timezone = pytz.timezone(timezone)
+        default_timezone = settings.get("TIMEZONE", "UTC")
+        timezone = getattr(self, "timezone", default_timezone)
+        self.timezone = zoneinfo.ZoneInfo(timezone)
 
         if hasattr(self, 'date'):
             self.date = set_date_tzinfo(self.date, timezone)
@@ -525,7 +530,7 @@ class Article(Content):
             if self.date.tzinfo is None:
                 now = datetime.datetime.now()
             else:
-                now = datetime.datetime.utcnow().replace(tzinfo=pytz.utc)
+                now = datetime.datetime.utcnow().replace(tzinfo=timezone.utc)
             if self.date > now:
                 self.status = 'draft'
 
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 2d5629ef..7bdf8538 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -7,7 +7,10 @@ from typing import Mapping
 
 from jinja2 import Environment, FileSystemLoader
 
-import pytz
+try:
+    import zoneinfo
+except ModuleNotFoundError:
+    from backports import zoneinfo
 
 try:
     import readline  # NOQA
@@ -17,8 +20,8 @@ except ImportError:
 try:
     import tzlocal
     _DEFAULT_TIMEZONE = tzlocal.get_localzone().zone
-except ImportError:
-    _DEFAULT_TIMEZONE = 'Europe/Rome'
+except ModuleNotFoundError:
+    _DEFAULT_TIMEZONE = "Europe/Rome"
 
 from pelican import __version__
 
@@ -158,16 +161,15 @@ def ask(question, answer=str, default=None, length=None):
 
 def ask_timezone(question, default, tzurl):
     """Prompt for time zone and validate input"""
-    lower_tz = [tz.lower() for tz in pytz.all_timezones]
+    tz_dict = {tz.lower(): tz for tz in zoneinfo.available_timezones()}
     while True:
         r = ask(question, str, default)
-        r = r.strip().replace(' ', '_').lower()
-        if r in lower_tz:
-            r = pytz.all_timezones[lower_tz.index(r)]
+        r = r.strip().replace(" ", "_").lower()
+        if r in tz_dict.keys():
+            r = tz_dict[r]
             break
         else:
-            print('Please enter a valid time zone:\n'
-                  ' (check [{}])'.format(tzurl))
+            print("Please enter a valid time zone:\n" " (check [{}])".format(tzurl))
     return r
 
 
diff --git a/pelican/utils.py b/pelican/utils.py
index de6ef9bf..8d91c487 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -18,10 +18,12 @@ from operator import attrgetter
 
 import dateutil.parser
 
+try:
+    import zoneinfo
+except ModuleNotFoundError:
+    from backports import zoneinfo
 from markupsafe import Markup
 
-import pytz
-
 
 logger = logging.getLogger(__name__)
 
@@ -919,10 +921,11 @@ class FileSystemWatcher:
 def set_date_tzinfo(d, tz_name=None):
     """Set the timezone for dates that don't have tzinfo"""
     if tz_name and not d.tzinfo:
-        tz = pytz.timezone(tz_name)
-        d = tz.localize(d)
-        return SafeDatetime(d.year, d.month, d.day, d.hour, d.minute, d.second,
-                            d.microsecond, d.tzinfo)
+        timezone = zoneinfo.ZoneInfo(tz_name)
+        d = d.replace(tzinfo=timezone)
+        return SafeDatetime(
+            d.year, d.month, d.day, d.hour, d.minute, d.second, d.microsecond, d.tzinfo
+        )
     return d
 
 
diff --git a/pyproject.toml b/pyproject.toml
index 4ab2650a..826c1179 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -37,10 +37,10 @@ feedgenerator = ">=1.9"
 jinja2 = ">=2.7"
 pygments = ">=2.6"
 python-dateutil = ">=2.8"
-pytz = ">=2020.1"
 rich = ">=10.1"
 unidecode = ">=1.1"
 markdown = {version = ">=3.1", optional = true}
+backports-zoneinfo = {version = "^0.2.1", python = "<3.9"}
 
 [tool.poetry.dev-dependencies]
 BeautifulSoup4 = "^4.9"
diff --git a/setup.py b/setup.py
index da038d24..5d2023c6 100755
--- a/setup.py
+++ b/setup.py
@@ -9,8 +9,8 @@ from setuptools import find_packages, setup
 version = "4.8.0"
 
 requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
-            'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',
-            'python-dateutil', 'rich']
+            'docutils>=0.15', 'blinker', 'unidecode', 'python-dateutil',
+            'rich', 'backports-zoneinfo[tzdata] >= 0.2; python_version<"3.9"']
 
 entry_points = {
     'console_scripts': [

From 44d97544665832b20b97fd6a2072feca0f24292f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 2 Aug 2023 11:01:40 +0200
Subject: [PATCH 2569/2864] Add monthly downloads badge to README

---
 README.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index b8cf9371..3f708242 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,10 @@
-Pelican |build-status| |pypi-version| |repology|
-================================================
+Pelican |build-status| |pypi-version| |downloads| |repology|
+============================================================
 
 Pelican is a static site generator, written in Python_, that allows you to create
 web sites by composing text files in formats such as Markdown, reStructuredText, and HTML.
 
-With Pelican, you can create web sites without worrying about databases or server-side programming. 
+With Pelican, you can create web sites without worrying about databases or server-side programming.
 Pelican generates static sites that can be served via any web server or hosting service.
 
 You can perform the following functions with Pelican:
@@ -70,6 +70,9 @@ Why the name “Pelican”?
 .. |pypi-version| image:: https://img.shields.io/pypi/v/pelican.svg
    :target: https://pypi.org/project/pelican/
    :alt: PyPI: the Python Package Index
+.. |downloads| image:: https://img.shields.io/pypi/dm/pelican.svg
+   :target: https://pypi.org/project/pelican/
+   :alt: Monthly Downloads from PyPI
 .. |repology| image:: https://repology.org/badge/tiny-repos/pelican.svg
    :target: https://repology.org/project/pelican/versions
    :alt: Repology: the packaging hub

From 413c6a1c7171ea447bb1817b118d811516283b2e Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Wed, 26 Jan 2022 20:30:03 +0100
Subject: [PATCH 2570/2864] Order codes in themes.rst

---
 docs/themes.rst | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index fe6337d6..db307878 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -34,11 +34,10 @@ Structure
 To make your own theme, you must follow the following structure::
 
     ├── static
-    │   ├── css
-    │   └── images
+    │   ├── css
+    │   └── images
     └── templates
         ├── archives.html         // to display archives
-        ├── period_archives.html  // to display time-period archives
         ├── article.html          // processed for each article
         ├── author.html           // processed for each author
         ├── authors.html          // must list all the authors
@@ -46,6 +45,7 @@ To make your own theme, you must follow the following structure::
         ├── category.html         // processed for each category
         ├── index.html            // the index (list all the articles)
         ├── page.html             // processed for each page
+        ├── period_archives.html  // to display time-period archives
         ├── tag.html              // processed for each tag
         └── tags.html             // must list all the tags. Can be a tag cloud.
 
@@ -465,14 +465,14 @@ The feed variables changed in 3.0. Each variable now explicitly lists ATOM or
 RSS in the name. ATOM is still the default. Old themes will need to be updated.
 Here is a complete list of the feed variables::
 
-    FEED_ATOM
-    FEED_RSS
-    FEED_ALL_ATOM
-    FEED_ALL_RSS
-    CATEGORY_FEED_ATOM
-    CATEGORY_FEED_RSS
     AUTHOR_FEED_ATOM
     AUTHOR_FEED_RSS
+    CATEGORY_FEED_ATOM
+    CATEGORY_FEED_RSS
+    FEED_ALL_ATOM
+    FEED_ALL_RSS
+    FEED_ATOM
+    FEED_RSS
     TAG_FEED_ATOM
     TAG_FEED_RSS
     TRANSLATION_FEED_ATOM

From 7acc9ac5546b8b3cc8d9960a34b2eff086740fc9 Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Wed, 26 Jan 2022 20:42:12 +0100
Subject: [PATCH 2571/2864] Fix documentations errors

---
 CONTRIBUTING.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 7d7b2c3a..59147b31 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -20,7 +20,7 @@ Before you ask for help, please make sure you do the following:
    you read the docs for the Pelican version you are using.
 2. Use a search engine (e.g., DuckDuckGo, Google) to search for a solution to
    your problem. Someone may have already found a solution, perhaps in the
-   form of a plugin_ or a specific combination of settings.
+   form of a ':pelican-doc:`plugins` or a specific combination of settings.
 
 3. Try reproducing the issue in a clean environment, ensuring you are using:
 
@@ -77,7 +77,7 @@ Contributing code
 Before you submit a contribution, please ask whether it is desired so that you
 don't spend a lot of time working on something that would be rejected for a
 known reason. Consider also whether your new feature might be better suited as
-a plugin_ — you can `ask for help`_  to make that determination.
+a ':pelican-doc:`plugins` — you can `ask for help`_  to make that determination.
 
 Using Git and GitHub
 --------------------

From bf0860ee86874777556d983b996a67b61fd5c5c4 Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Wed, 26 Jan 2022 20:59:02 +0100
Subject: [PATCH 2572/2864] Try to fix documentation build

---
 CONTRIBUTING.rst | 4 ++--
 docs/conf.py     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 59147b31..d994bb1d 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -132,8 +132,8 @@ Contribution quality standards
 * Ensure your code is compatible with the `officially-supported Python releases`_.
 * Add docs and tests for your changes. Undocumented and untested features will
   not be accepted.
-* `Run all the tests`_ **on all versions of Python supported by Pelican** to
-  ensure nothing was accidentally broken.
+* :pelican-doc:`Run all the tests <contribute>` **on all versions of Python
+  supported by Pelican** to ensure nothing was accidentally broken.
 
 Check out our `Git Tips`_ page or `ask for help`_ if you
 need assistance or have any questions about these guidelines.
diff --git a/docs/conf.py b/docs/conf.py
index 0211c71a..8f80ba63 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -25,7 +25,7 @@ rst_prolog = '''
 '''.format(last_stable)
 
 extlinks = {
-    'pelican-doc':  ('https://docs.getpelican.com/%s/', '%s')
+    'pelican-doc':  ('https://docs.getpelican.com/en/latest/%s.html', '%s')
 }
 
 # -- Options for HTML output --------------------------------------------------

From 5d1dcd8ed3531dda0431db473d0152ea0d476048 Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Wed, 26 Jan 2022 21:03:52 +0100
Subject: [PATCH 2573/2864] Remove useless url

---
 CONTRIBUTING.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index d994bb1d..c1175aa4 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -141,7 +141,6 @@ need assistance or have any questions about these guidelines.
 .. _`plugin`: https://docs.getpelican.com/en/latest/plugins.html
 .. _`Create a new branch`: https://github.com/getpelican/pelican/wiki/Git-Tips#making-your-changes
 .. _`Squash your commits`: https://github.com/getpelican/pelican/wiki/Git-Tips#squashing-commits
-.. _`Run all the tests`: https://docs.getpelican.com/en/latest/contribute.html#running-the-test-suite
 .. _`Git Tips`: https://github.com/getpelican/pelican/wiki/Git-Tips
 .. _`PEP8 coding standards`: https://www.python.org/dev/peps/pep-0008/
 .. _`ask for help`: `How to get help`_

From dcd3045f32420a7f4c5a535fba9b2578d9dbb613 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 3 Aug 2023 10:15:22 +0200
Subject: [PATCH 2574/2864] Docs: Escape extra setting environment variables.
 Fix #3016

---
 docs/settings.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index e51c6a12..44108ea2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -15,6 +15,9 @@ setting file. Note that values must follow JSON notation::
 
     pelican content -e SITENAME='"A site"' READERS='{"html": null}' CACHE_CONTENT=true
 
+Environment variables can also be used here but must be escaped appropriately::
+
+    pelican content -e API_KEY=''\"$API_KEY\"''
 
 .. note::
 

From 5435dd0d811aaeac6419d76510ded53d241fe226 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 3 Aug 2023 11:34:05 +0200
Subject: [PATCH 2575/2864] Document _update_context(dict) --> list of tuples

Fix #3024
---
 pelican/generators.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index e18531be..4fd796ba 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -206,8 +206,9 @@ class Generator:
         self.context['static_links'] |= content.get_static_links()
 
     def _update_context(self, items):
-        """Update the context with the given items from the current
-        processor.
+        """Update the context with the given items from the current processor.
+
+        Note that dictionary arguments will be converted to a list of tuples.
         """
         for item in items:
             value = getattr(self, item)

From 639173da6bf1917ca227ac20f91f19eea2ae4403 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 3 Aug 2023 14:05:17 +0200
Subject: [PATCH 2576/2864] Generalize analytics support in default theme

As the number of privacy-preserving analytics options proliferates,
it no longer makes sense to support specific solutions provided by
ad-tracking corporations.
---
 docs/publish.rst                              |  2 +-
 docs/settings.rst                             | 19 ++++++-------
 .../themes/notmyidea/templates/analytics.html | 27 ++-----------------
 .../themes/simple/templates/gosquared.html    | 14 ----------
 4 files changed, 13 insertions(+), 49 deletions(-)
 delete mode 100644 pelican/themes/simple/templates/gosquared.html

diff --git a/docs/publish.rst b/docs/publish.rst
index 46913dea..f5ebfff5 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -67,7 +67,7 @@ Deployment
 
 After you have generated your site, previewed it in your local development
 environment, and are ready to deploy it to production, you might first
-re-generate your site with any production-specific settings (e.g., analytics
+re-generate your site with any production-specific settings (e.g., analytics,
 feeds, etc.) that you may have defined::
 
     pelican content -s publishconf.py
diff --git a/docs/settings.rst b/docs/settings.rst
index 44108ea2..8417e209 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1245,18 +1245,19 @@ Feel free to use them in your themes as well.
    Your GitHub URL (if you have one). It will then use this information to
    create a GitHub ribbon.
 
-.. data:: GOOGLE_ANALYTICS
+.. data:: ANALYTICS
 
-   Set to ``UA-XXXXX-Y`` Property's tracking ID to activate Google Analytics.
+   Put any desired analytics scripts in this setting in ``publishconf.py``.
+   Example:
 
-.. data:: GA_COOKIE_DOMAIN
+   .. parsed-literal::
 
-   Set cookie domain field of Google Analytics tracking code. Defaults to
-   ``auto``.
-
-.. data:: GOSQUARED_SITENAME
-
-   Set to 'XXX-YYYYYY-X' to activate GoSquared.
+      ANALYTICS = """
+          <script src="/theme/js/primary-analytics.js"></script>
+          <script>
+              [ … in-line Javascript code for secondary analytics … ]
+          </script>
+      """
 
 .. data:: MENUITEMS
 
diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
index 071c77f7..22642579 100644
--- a/pelican/themes/notmyidea/templates/analytics.html
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -1,26 +1,3 @@
-{% if GOOGLE_ANALYTICS %}
-    <script type="text/javascript">
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '{{GOOGLE_ANALYTICS}}', '{{GA_COOKIE_DOMAIN if GA_COOKIE_DOMAIN else 'auto'}}');
-    ga('send', 'pageview');
-    </script>
-{% endif %}
-{% if GAUGES %}
-    <script type="text/javascript">
-    var _gauges = _gauges || [];
-    (function() {
-        var t   = document.createElement('script');
-        t.type  = 'text/javascript';
-        t.async = true;
-        t.id    = 'gauges-tracker';
-        t.setAttribute('data-site-id', '{{GAUGES}}');
-        t.src = '//secure.gaug.es/track.js';
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(t, s);
-    })();
-    </script>
+{% if ANALYTICS %}
+{{ ANALYTICS }}
 {% endif %}
diff --git a/pelican/themes/simple/templates/gosquared.html b/pelican/themes/simple/templates/gosquared.html
deleted file mode 100644
index 49ccbbef..00000000
--- a/pelican/themes/simple/templates/gosquared.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% if GOSQUARED_SITENAME %}
-<script type="text/javascript">
-    var GoSquared={};
-    GoSquared.acct = "{{ GOSQUARED_SITENAME }}";
-    (function(w){
-        function gs(){
-            w._gstc_lt=+(new Date); var d=document;
-            var g = d.createElement("script"); g.type = "text/javascript"; g.async = true; g.src = "https://d1l6p2sc9645hc.cloudfront.net/tracker.js";
-            var s = d.getElementsByTagName("script")[0]; s.parentNode.insertBefore(g, s);
-        }
-        w.addEventListener?w.addEventListener("load",gs,false):w.attachEvent("onload",gs);
-    })(window);
-</script>
-{% endif %}

From 9384e7cb0b91f6c0ccb9aaf31337410b7a57c111 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 3 Aug 2023 14:29:18 +0200
Subject: [PATCH 2577/2864] Add ReadTheDocs configuration file

---
 .readthedocs.yaml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .readthedocs.yaml

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 00000000..dec90401
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,21 @@
+---
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version, and any other needed tools
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.10"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Version of Python and requirements required to build the docs
+python:
+  install:
+    - requirements: requirements/developer.pip

From 48a0484d15636a6fab3d4e1be9de78ff500ae56a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 3 Aug 2023 14:37:39 +0200
Subject: [PATCH 2578/2864] Improve ReadTheDocs configuration

---
 .readthedocs.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index dec90401..17084beb 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -11,6 +11,9 @@ build:
   tools:
     python: "3.10"
 
+# Build all formats
+formats: all
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/conf.py
@@ -19,3 +22,5 @@ sphinx:
 python:
   install:
     - requirements: requirements/developer.pip
+    - method: pip
+      path: .

From 63b60da919937c04d55b7cddaad29fd171033dc6 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 3 Aug 2023 14:44:13 +0200
Subject: [PATCH 2579/2864] Build docs in zipped HTML and PDF formats

---
 .readthedocs.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 17084beb..b18ff005 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -11,8 +11,10 @@ build:
   tools:
     python: "3.10"
 
-# Build all formats
-formats: all
+# Build HTML & PDF formats
+formats:
+  - htmlzip
+  - pdf
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

From 0d1bcd4b1114f84fc775b422119185cab61cdd37 Mon Sep 17 00:00:00 2001
From: Moritz Meier <moritz.meier@uni-bremen.de>
Date: Tue, 8 Aug 2023 09:21:10 +0200
Subject: [PATCH 2580/2864] Pelican QuickStart: Address tzlocal API change
 (#3155)

---
 pelican/tools/pelican_quickstart.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 7bdf8538..4b6d93cc 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -19,7 +19,10 @@ except ImportError:
 
 try:
     import tzlocal
-    _DEFAULT_TIMEZONE = tzlocal.get_localzone().zone
+    if hasattr(tzlocal.get_localzone(), "zone"):
+        _DEFAULT_TIMEZONE = tzlocal.get_localzone().zone
+    else:
+        _DEFAULT_TIMEZONE = tzlocal.get_localzone_name()
 except ModuleNotFoundError:
     _DEFAULT_TIMEZONE = "Europe/Rome"
 

From 2eeff62fd70d6b150d85910bf7ebc1db3ca57651 Mon Sep 17 00:00:00 2001
From: Will Thong <will@willthong.com>
Date: Tue, 15 Aug 2023 19:07:39 +0100
Subject: [PATCH 2581/2864] Replace `pytz` dependency in tests (#3165)

---
 docs/install.rst            |  1 -
 pelican/contents.py         |  6 +++---
 pelican/tests/test_utils.py | 22 +++++++++++++---------
 pelican/utils.py            |  6 +++---
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/docs/install.rst b/docs/install.rst
index cdc17bb9..ea47311f 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -64,7 +64,6 @@ automatically installed without any action on your part:
 * `pygments <https://pypi.org/project/Pygments/>`_, for syntax highlighting
 * `docutils <https://pypi.org/project/docutils/>`_, for supporting
   reStructuredText as an input format
-* `pytz <https://pypi.org/project/pytz/>`_, for timezone definitions
 * `blinker <https://pypi.org/project/blinker/>`_, an object-to-object and
   broadcast signaling system
 * `unidecode <https://pypi.org/project/Unidecode/>`_, for ASCII
diff --git a/pelican/contents.py b/pelican/contents.py
index b756f92d..4541e2ae 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -9,9 +9,9 @@ from html import unescape
 from urllib.parse import unquote, urljoin, urlparse, urlunparse
 
 try:
-    import zoneinfo
+    from zoneinfo import ZoneInfo
 except ModuleNotFoundError:
-    from backports import zoneinfo
+    from backports.zoneinfo import ZoneInfo
 
 
 from pelican.plugins import signals
@@ -127,7 +127,7 @@ class Content:
         # manage timezone
         default_timezone = settings.get("TIMEZONE", "UTC")
         timezone = getattr(self, "timezone", default_timezone)
-        self.timezone = zoneinfo.ZoneInfo(timezone)
+        self.timezone = ZoneInfo(timezone)
 
         if hasattr(self, 'date'):
             self.date = set_date_tzinfo(self.date, timezone)
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 2dab2ab4..e1758726 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -3,10 +3,14 @@ import logging
 import os
 import shutil
 import time
+from datetime import timezone
 from sys import platform
 from tempfile import mkdtemp
 
-import pytz
+try:
+    from zoneinfo import ZoneInfo
+except ModuleNotFoundError:
+    from backports.zoneinfo import ZoneInfo
 
 from pelican import utils
 from pelican.generators import TemplatePagesGenerator
@@ -50,21 +54,21 @@ class TestUtils(LoggedTestCase):
             year=2012, month=11, day=22, hour=22, minute=11)
         date_hour_z = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11,
-            tzinfo=pytz.timezone('UTC'))
+            tzinfo=timezone.utc)
         date_hour_est = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11,
-            tzinfo=pytz.timezone('EST'))
+            tzinfo=ZoneInfo("EST"))
         date_hour_sec = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10)
         date_hour_sec_z = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10,
-            tzinfo=pytz.timezone('UTC'))
+            tzinfo=timezone.utc)
         date_hour_sec_est = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10,
-            tzinfo=pytz.timezone('EST'))
+            tzinfo=ZoneInfo("EST"))
         date_hour_sec_frac_z = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10,
-            microsecond=123000, tzinfo=pytz.timezone('UTC'))
+            microsecond=123000, tzinfo=timezone.utc)
         dates = {
             '2012-11-22': date,
             '2012/11/22': date,
@@ -86,13 +90,13 @@ class TestUtils(LoggedTestCase):
         iso_8601_date = utils.SafeDatetime(year=1997, month=7, day=16)
         iso_8601_date_hour_tz = utils.SafeDatetime(
             year=1997, month=7, day=16, hour=19, minute=20,
-            tzinfo=pytz.timezone('CET'))
+            tzinfo=ZoneInfo("Europe/London"))
         iso_8601_date_hour_sec_tz = utils.SafeDatetime(
             year=1997, month=7, day=16, hour=19, minute=20, second=30,
-            tzinfo=pytz.timezone('CET'))
+            tzinfo=ZoneInfo("Europe/London"))
         iso_8601_date_hour_sec_ms_tz = utils.SafeDatetime(
             year=1997, month=7, day=16, hour=19, minute=20, second=30,
-            microsecond=450000, tzinfo=pytz.timezone('CET'))
+            microsecond=450000, tzinfo=ZoneInfo("Europe/London"))
         iso_8601 = {
             '1997-07-16': iso_8601_date,
             '1997-07-16T19:20+01:00': iso_8601_date_hour_tz,
diff --git a/pelican/utils.py b/pelican/utils.py
index 8d91c487..d8cf15b4 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -19,9 +19,9 @@ from operator import attrgetter
 import dateutil.parser
 
 try:
-    import zoneinfo
+    from zoneinfo import ZoneInfo
 except ModuleNotFoundError:
-    from backports import zoneinfo
+    from backports.zoneinfo import ZoneInfo
 from markupsafe import Markup
 
 
@@ -921,7 +921,7 @@ class FileSystemWatcher:
 def set_date_tzinfo(d, tz_name=None):
     """Set the timezone for dates that don't have tzinfo"""
     if tz_name and not d.tzinfo:
-        timezone = zoneinfo.ZoneInfo(tz_name)
+        timezone = ZoneInfo(tz_name)
         d = d.replace(tzinfo=timezone)
         return SafeDatetime(
             d.year, d.month, d.day, d.hour, d.minute, d.second, d.microsecond, d.tzinfo

From 8a5f02ac6072e1fe7c406a7177a5745fc6e05112 Mon Sep 17 00:00:00 2001
From: DJ Ramones <50655786+djramones@users.noreply.github.com>
Date: Thu, 17 Aug 2023 02:04:06 +0800
Subject: [PATCH 2582/2864] Move _build_period_archives out of generate_context

So that we don't contribute to further clutter in generate_context.
---
 pelican/generators.py | 136 +++++++++++++++++++++---------------------
 1 file changed, 69 insertions(+), 67 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index ad0f84c4..7ab99263 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -634,73 +634,8 @@ class ArticlesGenerator(CachingGenerator):
         self.dates.sort(key=attrgetter('date'),
                         reverse=self.context['NEWEST_FIRST_ARCHIVES'])
 
-        def _build_period_archives(sorted_articles):
-            period_archives = defaultdict(list)
-
-            period_archives_settings = {
-                'year': {
-                    'save_as': self.settings['YEAR_ARCHIVE_SAVE_AS'],
-                    'url': self.settings['YEAR_ARCHIVE_URL'],
-                },
-                'month': {
-                    'save_as': self.settings['MONTH_ARCHIVE_SAVE_AS'],
-                    'url': self.settings['MONTH_ARCHIVE_URL'],
-                },
-                'day': {
-                    'save_as': self.settings['DAY_ARCHIVE_SAVE_AS'],
-                    'url': self.settings['DAY_ARCHIVE_URL'],
-                },
-            }
-
-            granularity_key_func = {
-                'year': attrgetter('date.year'),
-                'month': attrgetter('date.year', 'date.month'),
-                'day': attrgetter('date.year', 'date.month', 'date.day'),
-            }
-
-            for granularity in 'year', 'month', 'day':
-                save_as_fmt = period_archives_settings[granularity]['save_as']
-                url_fmt = period_archives_settings[granularity]['url']
-                key_func = granularity_key_func[granularity]
-
-                if not save_as_fmt:
-                    # the archives for this period granularity are not needed
-                    continue
-
-                for period, group in groupby(sorted_articles, key=key_func):
-                    period_archive = {}
-
-                    dates = list(group)
-                    period_archive['dates'] = dates
-                    period_archive['articles'] = [
-                        a for a in self.articles if a in dates
-                    ]
-
-                    # use the first date to specify the period archive URL
-                    # and save_as; the specific date used does not matter as
-                    # they all belong to the same period
-                    d = dates[0].date
-                    period_archive['save_as'] = save_as_fmt.format(date=d)
-                    period_archive['url'] = url_fmt.format(date=d)
-
-                    if granularity == 'year':
-                        period_archive['period'] = (period,)
-                        period_archive['period_num'] = (period,)
-                    else:
-                        month_name = calendar.month_name[period[1]]
-                        if granularity == 'month':
-                            period_archive['period'] = (period[0], month_name)
-                        else:
-                            period_archive['period'] = (period[0],
-                                                        month_name,
-                                                        period[2])
-                        period_archive['period_num'] = tuple(period)
-
-                    period_archives[granularity].append(period_archive)
-
-            return period_archives
-
-        self.period_archives = _build_period_archives(self.dates)
+        self.period_archives = self._build_period_archives(
+            self.dates, self.articles, self.settings)
 
         # and generate the output :)
 
@@ -723,6 +658,73 @@ class ArticlesGenerator(CachingGenerator):
         self.readers.save_cache()
         signals.article_generator_finalized.send(self)
 
+    def _build_period_archives(self, sorted_articles, articles, settings):
+        """
+        Compute the groupings of articles, with related attributes, for
+        per-year, per-month, and per-day archives.
+        """
+
+        period_archives = defaultdict(list)
+
+        period_archives_settings = {
+            'year': {
+                'save_as': settings['YEAR_ARCHIVE_SAVE_AS'],
+                'url': settings['YEAR_ARCHIVE_URL'],
+            },
+            'month': {
+                'save_as': settings['MONTH_ARCHIVE_SAVE_AS'],
+                'url': settings['MONTH_ARCHIVE_URL'],
+            },
+            'day': {
+                'save_as': settings['DAY_ARCHIVE_SAVE_AS'],
+                'url': settings['DAY_ARCHIVE_URL'],
+            },
+        }
+
+        granularity_key_func = {
+            'year': attrgetter('date.year'),
+            'month': attrgetter('date.year', 'date.month'),
+            'day': attrgetter('date.year', 'date.month', 'date.day'),
+        }
+
+        for granularity in 'year', 'month', 'day':
+            save_as_fmt = period_archives_settings[granularity]['save_as']
+            url_fmt = period_archives_settings[granularity]['url']
+            key_func = granularity_key_func[granularity]
+
+            if not save_as_fmt:
+                # the archives for this period granularity are not needed
+                continue
+
+            for period, group in groupby(sorted_articles, key=key_func):
+                archive = {}
+
+                dates = list(group)
+                archive['dates'] = dates
+                archive['articles'] = [a for a in articles if a in dates]
+
+                # use the first date to specify the period archive URL
+                # and save_as; the specific date used does not matter as
+                # they all belong to the same period
+                d = dates[0].date
+                archive['save_as'] = save_as_fmt.format(date=d)
+                archive['url'] = url_fmt.format(date=d)
+
+                if granularity == 'year':
+                    archive['period'] = (period,)
+                    archive['period_num'] = (period,)
+                else:
+                    month_name = calendar.month_name[period[1]]
+                    if granularity == 'month':
+                        archive['period'] = (period[0], month_name)
+                    else:
+                        archive['period'] = (period[0], month_name, period[2])
+                    archive['period_num'] = tuple(period)
+
+                period_archives[granularity].append(archive)
+
+        return period_archives
+
     def generate_output(self, writer):
         self.generate_feeds(writer)
         self.generate_pages(writer)

From 30adfba1cafb046a77ee52463d430941bd75dc3e Mon Sep 17 00:00:00 2001
From: DJ Ramones <50655786+djramones@users.noreply.github.com>
Date: Thu, 17 Aug 2023 02:35:39 +0800
Subject: [PATCH 2583/2864] Revert *_ARCHIVE_URL default settings to blank

---
 docs/settings.rst   | 26 +++++++++++++-------------
 pelican/settings.py |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 259b53f5..2950ea82 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -561,11 +561,14 @@ written over time.
 Example usage::
 
    YEAR_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/index.html'
+   YEAR_ARCHIVE_URL = 'posts/{date:%Y}/'
    MONTH_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/index.html'
+   MONTH_ARCHIVE_URL = 'posts/{date:%Y}/{date:%b}/'
 
 With these settings, Pelican will create an archive of all your posts for the
 year at (for instance) ``posts/2011/index.html`` and an archive of all your
-posts for the month at ``posts/2011/Aug/index.html``.
+posts for the month at ``posts/2011/Aug/index.html``. These can be accessed
+through the URLs ``posts/2011/`` and ``posts/2011/Aug/``, respectively.
 
 .. note::
     Period archives work best when the final path segment is ``index.html``.
@@ -576,31 +579,28 @@ posts for the month at ``posts/2011/Aug/index.html``.
 
    The location to save per-year archives of your posts.
 
-.. data:: YEAR_ARCHIVE_URL = 'posts/{date:%Y}/'
+.. data:: YEAR_ARCHIVE_URL = ''
 
-   The URL to use for per-year archives of your posts. This default value
-   matches a ``YEAR_ARCHIVE_SAVE_AS`` setting of
-   ``posts/{date:%Y}/index.html``.
+   The URL to use for per-year archives of your posts. You should set this if
+   you enable per-year archives.
 
 .. data:: MONTH_ARCHIVE_SAVE_AS = ''
 
    The location to save per-month archives of your posts.
 
-.. data:: MONTH_ARCHIVE_URL = 'posts/{date:%Y}/{date:%b}/'
+.. data:: MONTH_ARCHIVE_URL = ''
 
-   The URL to use for per-month archives of your posts. This default value
-   matches a ``MONTH_ARCHIVE_SAVE_AS`` setting of
-   ``posts/{date:%Y}/{date:%b}/index.html``.
+   The URL to use for per-month archives of your posts. You should set this if
+   you enable per-month archives.
 
 .. data:: DAY_ARCHIVE_SAVE_AS = ''
 
    The location to save per-day archives of your posts.
 
-.. data:: DAY_ARCHIVE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/'
+.. data:: DAY_ARCHIVE_URL = ''
 
-   The URL to use for per-day archives of your posts. This default value
-   matches a ``DAY_ARCHIVE_SAVE_AS`` setting of
-   ``posts/{date:%Y}/{date:%b}/{date:%d}/index.html``.
+   The URL to use for per-day archives of your posts. You should set this if
+   you enable per-day archives.
 
 ``DIRECT_TEMPLATES`` work a bit differently than noted above. Only the
 ``_SAVE_AS`` settings are available, but it is available for any direct
diff --git a/pelican/settings.py b/pelican/settings.py
index 2405902f..5b495e86 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -90,11 +90,11 @@ DEFAULT_CONFIG = {
         (1, '{name}{extension}', '{name}{extension}'),
         (2, '{name}{number}{extension}', '{name}{number}{extension}'),
     ],
-    'YEAR_ARCHIVE_URL': 'posts/{date:%Y}/',
+    'YEAR_ARCHIVE_URL': '',
     'YEAR_ARCHIVE_SAVE_AS': '',
-    'MONTH_ARCHIVE_URL': 'posts/{date:%Y}/{date:%b}/',
+    'MONTH_ARCHIVE_URL': '',
     'MONTH_ARCHIVE_SAVE_AS': '',
-    'DAY_ARCHIVE_URL': 'posts/{date:%Y}/{date:%b}/{date:%d}/',
+    'DAY_ARCHIVE_URL': '',
     'DAY_ARCHIVE_SAVE_AS': '',
     'RELATIVE_URLS': False,
     'DEFAULT_LANG': 'en',

From e724de9ffe6752416a44b86705590f076acf9951 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 27 Aug 2023 16:39:27 +0200
Subject: [PATCH 2584/2864] Improve GitHub-Linguist language breakdown

Refs #3188
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 9053428d..b6e6ec8f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,4 +4,7 @@
 # Improve accuracy of GitHub's Linguist-powered language statistics
 pelican/tests/content/* linguist-vendored
 pelican/tests/output/* linguist-vendored
+pelican/tests/theme_overrides/* linguist-vendored
+pelican/themes/notmyidea/templates/*.html linguist-language=Jinja
+pelican/themes/simple/templates/*.html linguist-language=Jinja
 samples/* linguist-vendored

From 3be0703b14e65aabd547122c311f3d820b18e416 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 27 Aug 2023 16:47:45 +0200
Subject: [PATCH 2585/2864] Tell GitHub-Linguist to ignore HTML files

Refs #3188
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index b6e6ec8f..652980b9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,4 @@ pelican/tests/theme_overrides/* linguist-vendored
 pelican/themes/notmyidea/templates/*.html linguist-language=Jinja
 pelican/themes/simple/templates/*.html linguist-language=Jinja
 samples/* linguist-vendored
+*.html linguist-vendored

From 29185e4ad7fbd6ec900657cc13c529e68454e8af Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanh@users.noreply.github.com>
Date: Mon, 28 Aug 2023 19:21:03 +0100
Subject: [PATCH 2586/2864] Add GitHub Actions workflow for GitHub Pages

Add a GitHub Actions workflow that users can use to publish their
Pelican sites to GitHub Pages by running `pelican` on GitHub Actions,
without having to run `pelican` locally and push the output directory to
a branch.

See: https://github.com/getpelican/pelican/discussions/3174
---
 .github/workflows/github_pages.yml |  61 +++++++++++++++
 docs/tips.rst                      | 114 ++++++++++++++++++++++++++---
 2 files changed, 164 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/github_pages.yml

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
new file mode 100644
index 00000000..481dd118
--- /dev/null
+++ b/.github/workflows/github_pages.yml
@@ -0,0 +1,61 @@
+name: Deploy to GitHub Pages
+on:
+  workflow_call:
+    inputs:
+      settings:
+        required: true
+        description: "The path to your Pelican settings file (`pelican`'s `--settings` option), for example: 'publishconf.py'"
+        type: string
+      requirements:
+        required: false
+        default: "pelican"
+        description: "The Python requirements to install, for example to enable markdown and typogrify use: 'pelican[markdown] typogrify'"
+        type: string
+      output-path:
+        required: false
+        default: "output/"
+        description: "Where to output the generated files (`pelican`'s `--output` option)"
+        type: string
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+      - name: Configure GitHub Pages
+        id: pages
+        uses: actions/configure-pages@v3
+      - name: Install requirements
+        run: pip install ${{ inputs.requirements }}
+      - name: Build Pelican site
+        run: |
+          pelican \
+            --settings "${{ inputs.settings }}" \
+            --extra-settings SITEURL='"${{ steps.pages.outputs.base_url }}"' \
+            --output "${{ inputs.output-path }}"
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          path: ${{ inputs.output-path }}
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2
+
diff --git a/docs/tips.rst b/docs/tips.rst
index 8b9dda15..abd46c8a 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -34,17 +34,30 @@ settings on your AWS console. From there::
 
     Error Document: 404.html
 
-Publishing to GitHub
-====================
+Publishing to GitHub Pages
+==========================
 
-`GitHub Pages <https://help.github.com/categories/20/articles>`_ offer an easy
-and convenient way to publish Pelican sites. There are `two types of GitHub
-Pages <https://help.github.com/articles/user-organization-and-project-pages>`_:
-*Project Pages* and *User Pages*. Pelican sites can be published as both
-Project Pages and User Pages.
+If you use `GitHub <https://github.com/>`_ for your Pelican site you can
+publish your site to `GitHub Pages <https://pages.github.com/>`_ for free.
+Your site will be published to ``https://<username>.github.io`` if it's a user or
+organization site or to ``https://<username>.github.io/<repository>`` if it's a
+project site. It's also possible to `use a custom domain with GitHub Pages <https://docs.github.com/en/pages/configuring-a-custom-domain-for-your-github-pages-site>`_.
 
-Project Pages
--------------
+There are `two ways to publish a site to GitHub Pages <https://docs.github.com/en/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site>`_:
+
+1. **Publishing from a branch:** run ``pelican`` locally and push the output
+   directory to a special branch of your GitHub repo. GitHub will then publish
+   the contents of this branch to your GitHub Pages site.
+2. **Publishing with a custom GitHub Actions workflow:** just push the source
+   files of your Pelican site to your GitHub repo's default branch and have a
+   custom GitHub Actions workflow run ``pelican`` for you to generate the
+   output directory and publish it to your GitHub Pages site.  This way you
+   don't need to run ``pelican`` locally. You can even edit your site's source
+   files using GitHub's web interface and any changes that you commit will be
+   published.
+
+Publishing a Project Site to GitHub Pages from a Branch
+-------------------------------------------------------
 
 To publish a Pelican site as a Project Page you need to *push* the content of
 the ``output`` dir generated by Pelican to a repository's ``gh-pages`` branch
@@ -72,8 +85,8 @@ already exist). The ``git push origin gh-pages`` command updates the remote
     ``tasks.py``) created by the ``pelican-quickstart`` command publishes the
     Pelican site as Project Pages, as described above.
 
-User Pages
-----------
+Publishing a User Site to GitHub Pages from a Branch
+----------------------------------------------------
 
 To publish a Pelican site in the form of User Pages, you need to *push* the
 content of the ``output`` dir generated by Pelican to the ``master`` branch of
@@ -110,6 +123,85 @@ branch of your GitHub repository::
 
 (assuming origin is set to your remote repository).
 
+Publishing to GitHub Pages Using a Custom GitHub Actions Workflow
+-----------------------------------------------------------------
+
+Pelican comes with a `custom workflow <https://github.com/getpelican/pelican/blob/master/.github/workflows/github_pages.yml>`_
+for publishing a Pelican site. To use it:
+
+1. Enable GitHub Pages in your repo: go to **Settings → Pages** and choose
+   **GitHub Actions** for the **Source** setting.
+
+2. Commit a ``.github/workflows/pelican.yml`` file to your repo with these contents:
+
+   .. code-block:: yaml
+
+       name: Deploy to GitHub Pages
+       on:
+         push:
+           branches: ["main"]
+         workflow_dispatch:
+       jobs:
+         deploy:
+           uses: "getpelican/pelican/.github/workflows/github_pages.yml@master"
+           permissions:
+             contents: "read"
+             pages: "write"
+             id-token: "write"
+           with:
+             settings: "publishconf.py"
+
+3. Go to the **Actions** tab in your repo
+   (``https://github.com/<username>/<repository>/actions``) and you should see a
+   **Deploy to GitHub Pages** action running.
+
+4. Once the action completes you should see your Pelican site deployed at your
+   repo's GitHub Pages URL: ``https://<username>.github.io`` for a user or
+   organization site or ``https://<username>.github.io/<repository>>`` for a
+   project site.
+
+Notes:
+
+* You don't need to set ``SITEURL`` in your Pelican settings: the workflow will
+  set it for you
+
+* You don't need to commit your ``--output`` / ``OUTPUT_PATH`` directory
+  (``output/``) to git: the workflow will run ``pelican`` to build the output
+  directory for you on GitHub Actions
+
+See `GitHub's docs about reusable workflows <https://docs.github.com/en/actions/using-workflows/reusing-workflows>`_
+for more information.
+
+A number of optional inputs can be added to the ``with:`` block when calling
+the workflow:
+
++--------------+----------+-----------------------------------+--------+---------------+
+| Name         | Required | Description                       | Type   | Default       |
++==============+==========+===================================+========+===============+
+| settings     | Yes      | The path to your Pelican settings | string |               |
+|              |          | file (``pelican``'s               |        |               |
+|              |          | ``--settings`` option),           |        |               |
+|              |          | for example: ``"publishconf.py"`` |        |               |
++--------------+----------+-----------------------------------+--------+---------------+
+| requirements | No       | The Python requirements to        | string | ``"pelican"`` |
+|              |          | install, for example to enable    |        |               |
+|              |          | markdown and typogrify use:       |        |               |
+|              |          | ``"pelican[markdown] typogrify"`` |        |               |
++--------------+----------+-----------------------------------+--------+---------------+
+| output-path  | No       | Where to output the generated     | string | ``"output/"`` |
+|              |          | files (``pelican``'s ``--output`` |        |               |
+|              |          | option)                           |        |               |
++--------------+----------+-----------------------------------+--------+---------------+
+
+For example:
+
+.. code-block:: yaml
+
+    with:
+      settings: "publishconf.py"
+      requirements: "pelican[markdown] typogrify"
+      output-path: "__output__/"
+
 Custom 404 Pages
 ----------------
 

From 48166bd6878352f0289b2761ed117b94b01ded03 Mon Sep 17 00:00:00 2001
From: "Martin (mart-e)" <me@mart-e.be>
Date: Sun, 4 Jun 2023 12:34:53 +0200
Subject: [PATCH 2587/2864] Convert Wordpress caption to figure

In Wordpress, inserting image with a caption can look like:

[caption id="attachment_42" caption="Image Description"]<a ...><img ... /></a>[/caption]
[caption id="attachment_42"]<a ...><img ... /></a> Image Description[/caption]
[caption id="attachment_42"]<img ... > Image Description[/caption]

Replace by an HTML figure tag
---
 pelican/tests/content/wordpressexport.xml | 47 ++++++++++++++++++++++-
 pelican/tests/test_importer.py            | 26 +++++++++++++
 pelican/tools/pelican_import.py           |  7 ++++
 3 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/pelican/tests/content/wordpressexport.xml b/pelican/tests/content/wordpressexport.xml
index 9b194e8f..4f5b3651 100644
--- a/pelican/tests/content/wordpressexport.xml
+++ b/pelican/tests/content/wordpressexport.xml
@@ -685,7 +685,52 @@ proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></con
             <wp:meta_key>_edit_last</wp:meta_key>
             <wp:meta_value><![CDATA[3]]></wp:meta_value>
         </wp:postmeta>
-    </item>   
+    </item>
+    <item>
+        <title>Caption on image</title>
+        <link>http://thisisa.test/?p=176</link>
+        <pubDate>Thu, 01 Jan 1970 00:00:00 +0000</pubDate>
+        <dc:creator>bob</dc:creator>
+        <guid isPermaLink="false">http://thisisa.test/?p=176</guid>
+        <description></description>
+        <content:encoded><![CDATA[Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+[caption attachment_id="42" align="aligncenter" width="300" caption="This is a pelican"]<img src="/theme/img/xpelican.png.pagespeed.ic.Rjep0025-y.png"/>[/caption]
+
+[caption attachment_id="43" align="aligncenter" width="300"]<img src="/theme/img/xpelican-3.png.pagespeed.ic.m-NAIdRCOM.png" width="300" height="216" class="size-medium wp-image-1055" /> This also a pelican[/caption]
+
+[caption attachment_id="44" align="aligncenter" width="300"]<a href="https://getpelican.com/"><img src="/theme/img/xpelican.png.pagespeed.ic.Rjep0025-y.png" alt=""/> Yet another pelican[/caption]
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></content:encoded>
+        <excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        <wp:post_id>176</wp:post_id>
+        <wp:post_date>2012-02-16 15:52:55</wp:post_date>
+        <wp:post_date_gmt>0000-00-00 00:00:00</wp:post_date_gmt>
+        <wp:comment_status>open</wp:comment_status>
+        <wp:ping_status>open</wp:ping_status>
+        <wp:post_name>caption-on-image</wp:post_name>
+        <wp:status>publish</wp:status>
+        <wp:post_parent>0</wp:post_parent>
+        <wp:menu_order>0</wp:menu_order>
+        <wp:post_type>post</wp:post_type>
+        <wp:post_password></wp:post_password>
+        <wp:is_sticky>0</wp:is_sticky>
+        <category domain="category" nicename="category-2"><![CDATA[Category 2]]></category>
+        <wp:postmeta>
+            <wp:meta_key>_edit_last</wp:meta_key>
+            <wp:meta_value><![CDATA[3]]></wp:meta_value>
+        </wp:postmeta>
+    </item>
     <item>
         <title>A custom post in category 4</title>
         <link>http://thisisa.test/?p=175</link>
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 198ee0fe..743cea8c 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -334,6 +334,32 @@ class TestWordpressXmlImporter(unittest.TestCase):
             escaped_quotes = re.search(r'\\[\'"“”‘’]', md)
             self.assertFalse(escaped_quotes)
 
+    def test_convert_caption_to_figure(self):
+        def r(f):
+            with open(f, encoding='utf-8') as infile:
+                return infile.read()
+        silent_f2p = mute(True)(fields2pelican)
+        test_post = filter(
+            lambda p: p[0].startswith("Caption on image"),
+            self.posts)
+        with temporary_folder() as temp:
+            md = [r(f) for f in silent_f2p(test_post, 'markdown', temp)][0]
+
+        caption = re.search(r'\[caption', md)
+        self.assertFalse(caption)
+
+        for occurence in [
+            '/theme/img/xpelican.png.pagespeed.ic.Rjep0025-y.png',
+            '/theme/img/xpelican-3.png.pagespeed.ic.m-NAIdRCOM.png',
+            '/theme/img/xpelican.png.pagespeed.ic.Rjep0025-y.png',
+            'This is a pelican',
+            'This also a pelican',
+            'Yet another pelican',
+        ]:
+            # pandoc 2.x converts into ![text](src)
+            # pandoc 3.x converts into <figure>src<figcaption>text</figcaption></figure>
+            self.assertIn(occurence, md)
+
 
 class TestBuildHeader(unittest.TestCase):
     def test_build_header(self):
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 7833ebbe..b426de9c 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -107,6 +107,13 @@ def decode_wp_content(content, br=True):
             return re.sub(pattern, lambda m: dic[m.group()], string)
         content = _multi_replace(pre_tags, content)
 
+    # convert [caption] tags into <figure>
+    content = re.sub(
+        r'\[caption(?:.*?)(?:caption=\"(.*?)\")?\]'
+        r'((?:\<a(?:.*?)\>)?(?:\<img.*?\>)(?:\<\/a\>)?)\s?(.*?)\[\/caption\]',
+        r'<figure>\n\2\n<figcaption>\1\3</figcaption>\n</figure>',
+        content)
+
     return content
 
 

From de0fae81821a78ed6b508d3570b56edb35293309 Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Tue, 3 Oct 2023 16:59:57 +0200
Subject: [PATCH 2588/2864] Add python 3.12 to test matrix

---
 .github/workflows/main.yml | 17 ++++++++---------
 setup.py                   |  2 ++
 tox.ini                    |  3 ++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b80d8926..58333075 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,6 +25,8 @@ jobs:
             python: "3.10"
           - os: ubuntu
             python: "3.11"
+          - os: ubuntu
+            python: "3.12"
           - os: macos
             python: "3.7"
           - os: windows
@@ -36,8 +38,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.config.python }}
-          cache: 'pip'
-          cache-dependency-path: '**/requirements/*'
+          cache: "pip"
+          cache-dependency-path: "**/requirements/*"
       - name: Install locale (Linux)
         if: startsWith(runner.os, 'Linux')
         run: sudo locale-gen fr_FR.UTF-8 tr_TR.UTF-8
@@ -56,7 +58,6 @@ jobs:
       - name: Run tests
         run: tox -e py${{ matrix.config.python }}
 
-
   lint:
     name: Lint
     runs-on: ubuntu-latest
@@ -67,14 +68,13 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: "3.9"
-          cache: 'pip'
-          cache-dependency-path: '**/requirements/*'
+          cache: "pip"
+          cache-dependency-path: "**/requirements/*"
       - name: Install tox
         run: python -m pip install -U pip tox
       - name: Check
         run: tox -e flake8
 
-
   docs:
     name: Build docs
     runs-on: ubuntu-latest
@@ -85,14 +85,13 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: "3.9"
-          cache: 'pip'
-          cache-dependency-path: '**/requirements/*'
+          cache: "pip"
+          cache-dependency-path: "**/requirements/*"
       - name: Install tox
         run: python -m pip install -U pip tox
       - name: Check
         run: tox -e docs
 
-
   deploy:
     name: Deploy
     environment: Deployment
diff --git a/setup.py b/setup.py
index 5d2023c6..18eedb00 100755
--- a/setup.py
+++ b/setup.py
@@ -77,6 +77,8 @@ setup(
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: Implementation :: CPython',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries :: Python Modules',
diff --git a/tox.ini b/tox.ini
index 93819218..8f43fbc5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.7,3.8,3.9,3.10,3.11},docs,flake8
+envlist = py{3.7,3.8,3.9,3.10,3.11.3.12},docs,flake8
 
 [testenv]
 basepython =
@@ -8,6 +8,7 @@ basepython =
     py3.9: python3.9
     py3.10: python3.10
     py3.11: python3.11
+    py3.12: python3.12
 passenv = *
 usedevelop=True
 deps =

From 5c36cfbb9b878ed7b2183dca6c6708bfb9371c3a Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Wed, 4 Oct 2023 10:58:18 +0200
Subject: [PATCH 2589/2864] Only run 'Deploy' action on main repository

Deploy action will always fail on forks as the token is not there.
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 58333075..f5a709b6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -97,7 +97,7 @@ jobs:
     environment: Deployment
     needs: [test, lint, docs]
     runs-on: ubuntu-latest
-    if: github.ref=='refs/heads/master' && github.event_name!='pull_request'
+    if: github.ref=='refs/heads/master' && github.event_name!='pull_request' && github.repository == 'getpelican/pelican'
 
     permissions:
       contents: write

From 5d8c03108b376299d614d386abfcb259de7f584a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <me@mart-e.be>
Date: Tue, 3 Oct 2023 11:32:35 +0200
Subject: [PATCH 2590/2864] Remove Posterous integration

Posterous closed down in 2013.
The API is no longer accessible and the code did not work in python 3
(base64.encodestring was expecting bytes, not string)
---
 docs/importer.rst               | 19 +++-------
 pelican/tools/pelican_import.py | 62 ++-------------------------------
 2 files changed, 6 insertions(+), 75 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 7b839d30..997a4632 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -11,7 +11,6 @@ software to reStructuredText or Markdown. The supported import formats are:
 
 - Blogger XML export
 - Dotclear export
-- Posterous API
 - Tumblr API
 - WordPress XML export
 - RSS/Atom feed
@@ -48,16 +47,15 @@ Usage
 
 ::
 
-    pelican-import [-h] [--blogger] [--dotclear] [--posterous] [--tumblr] [--wpfile] [--feed]
+    pelican-import [-h] [--blogger] [--dotclear] [--tumblr] [--wpfile] [--feed]
                    [-o OUTPUT] [-m MARKUP] [--dir-cat] [--dir-page] [--strip-raw] [--wp-custpost]
-                   [--wp-attach] [--disable-slugs] [-e EMAIL] [-p PASSWORD] [-b BLOGNAME]
-                   input|api_token|api_key
+                   [--wp-attach] [--disable-slugs] [-b BLOGNAME]
+                   input|api_key
 
 Positional arguments
 --------------------
   =============         ============================================================================
   ``input``             The input file to read
-  ``api_token``         (Posterous only) api_token can be obtained from http://posterous.com/api/
   ``api_key``           (Tumblr only) api_key can be obtained from https://www.tumblr.com/oauth/apps
   =============         ============================================================================
 
@@ -67,7 +65,6 @@ Optional arguments
   -h, --help            Show this help message and exit
   --blogger             Blogger XML export (default: False)
   --dotclear            Dotclear export (default: False)
-  --posterous           Posterous API (default: False)
   --tumblr              Tumblr API (default: False)
   --wpfile              WordPress XML export (default: False)
   --feed                Feed to parse (default: False)
@@ -101,10 +98,6 @@ Optional arguments
                         output. With this disabled, your Pelican URLs may not
                         be consistent with your original posts. (default:
                         False)
-  -e EMAIL, --email=EMAIL
-                        Email used to authenticate Posterous API
-  -p PASSWORD, --password=PASSWORD
-                        Password used to authenticate Posterous API
   -b BLOGNAME, --blogname=BLOGNAME
                         Blog name used in Tumblr API
 
@@ -120,13 +113,9 @@ For Dotclear::
 
     $ pelican-import --dotclear -o ~/output ~/backup.txt
 
-for Posterous::
-
-    $ pelican-import --posterous -o ~/output --email=<email_address> --password=<password> <api_token>
-
 For Tumblr::
 
-    $ pelican-import --tumblr -o ~/output --blogname=<blogname> <api_token>
+    $ pelican-import --tumblr -o ~/output --blogname=<blogname> <api_key>
 
 For WordPress::
 
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 7833ebbe..b5108aa4 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -383,51 +383,6 @@ def dc2fields(file):
                post_format)
 
 
-def posterous2fields(api_token, email, password):
-    """Imports posterous posts"""
-    import base64
-    from datetime import timedelta
-    import json
-    import urllib.request as urllib_request
-
-    def get_posterous_posts(api_token, email, password, page=1):
-        base64string = base64.encodestring(
-            ("{}:{}".format(email, password)).encode('utf-8')).replace('\n', '')
-        url = ("http://posterous.com/api/v2/users/me/sites/primary/"
-               "posts?api_token=%s&page=%d") % (api_token, page)
-        request = urllib_request.Request(url)
-        request.add_header('Authorization', 'Basic %s' % base64string.decode())
-        handle = urllib_request.urlopen(request)
-        posts = json.loads(handle.read().decode('utf-8'))
-        return posts
-
-    page = 1
-    posts = get_posterous_posts(api_token, email, password, page)
-    subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
-    while len(posts) > 0:
-        posts = get_posterous_posts(api_token, email, password, page)
-        page += 1
-
-        for post in posts:
-            slug = post.get('slug')
-            if not slug:
-                slug = slugify(post.get('title'), regex_subs=subs)
-            tags = [tag.get('name') for tag in post.get('tags')]
-            raw_date = post.get('display_date')
-            date_object = SafeDatetime.strptime(
-                raw_date[:-6], '%Y/%m/%d %H:%M:%S')
-            offset = int(raw_date[-5:])
-            delta = timedelta(hours=(offset / 100))
-            date_object -= delta
-            date = date_object.strftime('%Y-%m-%d %H:%M')
-            kind = 'article'      # TODO: Recognise pages
-            status = 'published'  # TODO: Find a way for draft posts
-
-            yield (post.get('title'), post.get('body_cleaned'),
-                   slug, date, post.get('user').get('display_name'),
-                   [], tags, status, kind, 'html')
-
-
 def tumblr2fields(api_key, blogname):
     """ Imports Tumblr posts (API v2)"""
     import json
@@ -886,7 +841,7 @@ def fields2pelican(
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Transform feed, Blogger, Dotclear, Posterous, Tumblr, or "
+        description="Transform feed, Blogger, Dotclear, Tumblr, or "
                     "WordPress files into reST (rst) or Markdown (md) files. "
                     "Be sure to have pandoc installed.",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
@@ -899,9 +854,6 @@ def main():
     parser.add_argument(
         '--dotclear', action='store_true', dest='dotclear',
         help='Dotclear export')
-    parser.add_argument(
-        '--posterous', action='store_true', dest='posterous',
-        help='Posterous export')
     parser.add_argument(
         '--tumblr', action='store_true', dest='tumblr',
         help='Tumblr export')
@@ -952,12 +904,6 @@ def main():
         help='Disable storing slugs from imported posts within output. '
              'With this disabled, your Pelican URLs may not be consistent '
              'with your original posts.')
-    parser.add_argument(
-        '-e', '--email', dest='email',
-        help="Email address (posterous import only)")
-    parser.add_argument(
-        '-p', '--password', dest='password',
-        help="Password (posterous import only)")
     parser.add_argument(
         '-b', '--blogname', dest='blogname',
         help="Blog name (Tumblr import only)")
@@ -969,8 +915,6 @@ def main():
         input_type = 'blogger'
     elif args.dotclear:
         input_type = 'dotclear'
-    elif args.posterous:
-        input_type = 'posterous'
     elif args.tumblr:
         input_type = 'tumblr'
     elif args.wpfile:
@@ -979,7 +923,7 @@ def main():
         input_type = 'feed'
     else:
         error = ('You must provide either --blogger, --dotclear, '
-                 '--posterous, --tumblr, --wpfile or --feed options')
+                 '--tumblr, --wpfile or --feed options')
         exit(error)
 
     if not os.path.exists(args.output):
@@ -998,8 +942,6 @@ def main():
         fields = blogger2fields(args.input)
     elif input_type == 'dotclear':
         fields = dc2fields(args.input)
-    elif input_type == 'posterous':
-        fields = posterous2fields(args.input, args.email, args.password)
     elif input_type == 'tumblr':
         fields = tumblr2fields(args.input, args.blogname)
     elif input_type == 'wordpress':

From ab9e55b398be3861526cda0456f0d9c1e9140700 Mon Sep 17 00:00:00 2001
From: FriedrichFroebel <FriedrichFroebel@users.noreply.github.com>
Date: Wed, 11 Oct 2023 19:29:17 +0200
Subject: [PATCH 2591/2864] Allow dataclasses in settings

---
 pelican/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/settings.py b/pelican/settings.py
index 5b495e86..6196d62a 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -5,6 +5,7 @@ import locale
 import logging
 import os
 import re
+import sys
 from os.path import isabs
 
 from pelican.log import LimitFilter
@@ -13,6 +14,7 @@ from pelican.log import LimitFilter
 def load_source(name, path):
     spec = importlib.util.spec_from_file_location(name, path)
     mod = importlib.util.module_from_spec(spec)
+    sys.modules[name] = mod
     spec.loader.exec_module(mod)
     return mod
 

From a8fefad33148883d54c26ea341beae4d6d79ad5c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 13 Oct 2023 08:01:29 +0200
Subject: [PATCH 2592/2864] Add OpenGraph metadata to docs via Sphinx extension

---
 docs/conf.py          | 9 ++++++---
 requirements/docs.pip | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 8f80ba63..f00ed3c2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -8,9 +8,12 @@ sys.path.append(os.path.abspath(os.pardir))
 
 # -- General configuration ----------------------------------------------------
 templates_path = ['_templates']
-extensions = ['sphinx.ext.autodoc',
-              'sphinx.ext.ifconfig',
-              'sphinx.ext.extlinks']
+extensions = [
+    "sphinx.ext.autodoc",
+    "sphinx.ext.ifconfig",
+    "sphinx.ext.extlinks",
+    "sphinxext.opengraph",
+]
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Pelican'
diff --git a/requirements/docs.pip b/requirements/docs.pip
index dda53a56..6db7c6c8 100644
--- a/requirements/docs.pip
+++ b/requirements/docs.pip
@@ -1,3 +1,4 @@
 sphinx<6.0
+sphinxext-opengraph
 furo
 livereload

From fab6e1a2c51317b1ff3523755cd82f7b3ea3d433 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 24 Oct 2023 11:07:25 +0200
Subject: [PATCH 2593/2864] Fix warning re: future dates setting. Fixes #3184

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 6196d62a..6680ea96 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -584,7 +584,7 @@ def configure_settings(settings):
     # check content caching layer and warn of incompatibilities
     if settings.get('CACHE_CONTENT', False) and \
             settings.get('CONTENT_CACHING_LAYER', '') == 'generator' and \
-            settings.get('WITH_FUTURE_DATES', False):
+            not settings.get('WITH_FUTURE_DATES', True):
         logger.warning(
             "WITH_FUTURE_DATES conflicts with CONTENT_CACHING_LAYER "
             "set to 'generator', use 'reader' layer instead")

From 1404a2dbc32296b6f2d8ceb46287a63e5bb37724 Mon Sep 17 00:00:00 2001
From: boxydog <93335439+boxydog@users.noreply.github.com>
Date: Fri, 27 Oct 2023 14:56:34 -0500
Subject: [PATCH 2594/2864] Remove newline when importing Tumblr post photos
 (#3215)

Co-authored-by: Dan Frankowski <dfrankow@gmail.com>
---
 pelican/tests/test_importer.py  | 79 ++++++++++++++++++++++++++++-----
 pelican/tools/pelican_import.py | 34 +++++++-------
 2 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 743cea8c..3855e382 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -1,7 +1,11 @@
+import datetime
 import locale
 import os
 import re
 from posixpath import join as posix_join
+from unittest.mock import patch
+
+import dateutil.tz
 
 from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder,
@@ -10,9 +14,12 @@ from pelican.tools.pelican_import import (blogger2fields, build_header,
                                           build_markdown_header,
                                           decode_wp_content,
                                           download_attachments, fields2pelican,
-                                          get_attachments, wp2fields)
+                                          get_attachments, tumblr2fields,
+                                          wp2fields,
+                                          )
 from pelican.utils import path_to_file_url, slugify
 
+
 CUR_DIR = os.path.abspath(os.path.dirname(__file__))
 BLOGGER_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'bloggerexport.xml')
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
@@ -34,17 +41,26 @@ except ImportError:
     LXML = False
 
 
-@skipIfNoExecutable(['pandoc', '--version'])
-@unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
-class TestBloggerXmlImporter(unittest.TestCase):
-
+class TestWithOsDefaults(unittest.TestCase):
+    """Set locale to C and timezone to UTC for tests, then restore."""
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, 'C')
-        self.posts = blogger2fields(BLOGGER_XML_SAMPLE)
+        self.old_timezone = datetime.datetime.now(dateutil.tz.tzlocal()).tzname()
+        os.environ['TZ'] = 'UTC'
 
     def tearDown(self):
         locale.setlocale(locale.LC_ALL, self.old_locale)
+        os.environ['TZ'] = self.old_timezone
+
+
+@skipIfNoExecutable(['pandoc', '--version'])
+@unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
+class TestBloggerXmlImporter(TestWithOsDefaults):
+
+    def setUp(self):
+        super().setUp()
+        self.posts = blogger2fields(BLOGGER_XML_SAMPLE)
 
     def test_recognise_kind_and_title(self):
         """Check that importer only outputs pages, articles and comments,
@@ -85,17 +101,13 @@ class TestBloggerXmlImporter(unittest.TestCase):
 
 @skipIfNoExecutable(['pandoc', '--version'])
 @unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
-class TestWordpressXmlImporter(unittest.TestCase):
+class TestWordpressXmlImporter(TestWithOsDefaults):
 
     def setUp(self):
-        self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
+        super().setUp()
         self.posts = wp2fields(WORDPRESS_XML_SAMPLE)
         self.custposts = wp2fields(WORDPRESS_XML_SAMPLE, True)
 
-    def tearDown(self):
-        locale.setlocale(locale.LC_ALL, self.old_locale)
-
     def test_ignore_empty_posts(self):
         self.assertTrue(self.posts)
         for (title, content, fname, date, author,
@@ -477,3 +489,46 @@ class TestWordpressXMLAttachements(unittest.TestCase):
             self.assertTrue(
                 directory.endswith(posix_join('content', 'article.rst')),
                 directory)
+
+
+class TestTumblrImporter(TestWithOsDefaults):
+    @patch("pelican.tools.pelican_import._get_tumblr_posts")
+    def test_posts(self, get):
+        def get_posts(api_key, blogname, offset=0):
+            if offset > 0:
+                return []
+
+            return [
+                {
+                    "type": "photo",
+                    "blog_name": "testy",
+                    "date": "2019-11-07 21:26:40 GMT",
+                    "timestamp": 1573162000,
+                    "format": "html",
+                    "slug": "a-slug",
+                    "tags": [
+                        "economics"
+                    ],
+                    "state": "published",
+
+                    "photos": [
+                        {
+                            "caption": "",
+                            "original_size": {
+                                "url": "https://..fccdc2360ba7182a.jpg",
+                                "width": 634,
+                                "height": 789
+                            },
+                        }]
+                }
+            ]
+        get.side_effect = get_posts
+
+        posts = list(tumblr2fields("api_key", "blogname"))
+        self.assertEqual(
+            [('Photo',
+              '<img alt="" src="https://..fccdc2360ba7182a.jpg" />\n',
+              '2019-11-07-a-slug', '2019-11-07 21:26:40', 'testy', ['photo'],
+              ['economics'], 'published', 'article', 'html')],
+            posts,
+            posts)
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index cd643ec6..474b5cba 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -390,22 +390,22 @@ def dc2fields(file):
                post_format)
 
 
-def tumblr2fields(api_key, blogname):
-    """ Imports Tumblr posts (API v2)"""
+def _get_tumblr_posts(api_key, blogname, offset=0):
     import json
     import urllib.request as urllib_request
+    url = ("https://api.tumblr.com/v2/blog/%s.tumblr.com/"
+           "posts?api_key=%s&offset=%d&filter=raw") % (
+        blogname, api_key, offset)
+    request = urllib_request.Request(url)
+    handle = urllib_request.urlopen(request)
+    posts = json.loads(handle.read().decode('utf-8'))
+    return posts.get('response').get('posts')
 
-    def get_tumblr_posts(api_key, blogname, offset=0):
-        url = ("https://api.tumblr.com/v2/blog/%s.tumblr.com/"
-               "posts?api_key=%s&offset=%d&filter=raw") % (
-            blogname, api_key, offset)
-        request = urllib_request.Request(url)
-        handle = urllib_request.urlopen(request)
-        posts = json.loads(handle.read().decode('utf-8'))
-        return posts.get('response').get('posts')
 
+def tumblr2fields(api_key, blogname):
+    """ Imports Tumblr posts (API v2)"""
     offset = 0
-    posts = get_tumblr_posts(api_key, blogname, offset)
+    posts = _get_tumblr_posts(api_key, blogname, offset)
     subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
     while len(posts) > 0:
         for post in posts:
@@ -428,12 +428,10 @@ def tumblr2fields(api_key, blogname):
                     fmtstr = '![%s](%s)'
                 else:
                     fmtstr = '<img alt="%s" src="%s" />'
-                content = ''
-                for photo in post.get('photos'):
-                    content += '\n'.join(
-                        fmtstr % (photo.get('caption'),
-                                  photo.get('original_size').get('url')))
-                content += '\n\n' + post.get('caption')
+                content = '\n'.join(
+                    fmtstr % (photo.get('caption'),
+                              photo.get('original_size').get('url'))
+                    for photo in post.get('photos'))
             elif type == 'quote':
                 if format == 'markdown':
                     fmtstr = '\n\n&mdash; %s'
@@ -483,7 +481,7 @@ def tumblr2fields(api_key, blogname):
                    tags, status, kind, format)
 
         offset += len(posts)
-        posts = get_tumblr_posts(api_key, blogname, offset)
+        posts = _get_tumblr_posts(api_key, blogname, offset)
 
 
 def feed2fields(file):

From 8fd5d6f51b20b5a842d4dac5304f181a6aa74cd7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 28 Oct 2023 09:55:16 +0200
Subject: [PATCH 2595/2864] Fix IRC server in new GitHub issue template

---
 .github/ISSUE_TEMPLATE/config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index d080329a..9e240bd9 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,8 @@
+---
 # Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
 blank_issues_enabled: true
 contact_links:
-- name: '💬 Pelican IRC Channel on Freenode'
-  url: https://kiwiirc.com/client/irc.freenode.net/?#pelican
+- name: '💬 Pelican IRC Channel'
+  url: https://web.libera.chat/?#pelican
   about: |
     Chat with the community, ask questions, and learn about best practices.

From 58e70082e0dc290e2c2d56079e020434e1ee5280 Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Sat, 28 Oct 2023 10:53:33 +0200
Subject: [PATCH 2596/2864] Remove python 3.7 build configuration

---
 .github/workflows/main.yml | 6 ++----
 tox.ini                    | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f5a709b6..c0ffd9c6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,8 +15,6 @@ jobs:
     strategy:
       matrix:
         config:
-          - os: ubuntu
-            python: "3.7"
           - os: ubuntu
             python: "3.8"
           - os: ubuntu
@@ -28,9 +26,9 @@ jobs:
           - os: ubuntu
             python: "3.12"
           - os: macos
-            python: "3.7"
+            python: "3.10"
           - os: windows
-            python: "3.7"
+            python: "3.10"
 
     steps:
       - uses: actions/checkout@v3
diff --git a/tox.ini b/tox.ini
index 8f43fbc5..c31044ca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py{3.7,3.8,3.9,3.10,3.11.3.12},docs,flake8
+envlist = py{3.8,3.9,3.10,3.11.3.12},docs,flake8
 
 [testenv]
 basepython =
-    py3.7: python3.7
     py3.8: python3.8
     py3.9: python3.9
     py3.10: python3.10

From 91d9ef7a7085bf9cf8aa341f23236970e9c6c2b6 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 28 Oct 2023 11:17:48 +0200
Subject: [PATCH 2597/2864] Add tzdata as dependency in test requirements

Otherwise yields the following error with Python 3.10 on Windows:

zoneinfo._common.ZoneInfoNotFoundError: 'No time zone found with key UTC'
---
 requirements/test.pip | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements/test.pip b/requirements/test.pip
index a7d566f5..2cf1ea1f 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -3,6 +3,7 @@ Pygments==2.14.0
 pytest
 pytest-cov
 pytest-xdist[psutil]
+tzdata
 
 # Optional Packages
 Markdown==3.4.3

From 865f7b10dd22899202c2874bd4232bffc2c36272 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Apr 2023 09:22:27 +0200
Subject: [PATCH 2598/2864] Replace deprecated pkg_resources

importlib.metadata.version() appears to be the anointed replacement.
---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index bd867988..f0af3429 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -1,4 +1,5 @@
 import argparse
+import importlib.metadata
 import json
 import logging
 import multiprocessing
@@ -30,8 +31,7 @@ from pelican.utils import (FileSystemWatcher, clean_output_dir, maybe_pluralize)
 from pelican.writers import Writer
 
 try:
-    __version__ = __import__('pkg_resources') \
-        .get_distribution('pelican').version
+    __version__ = importlib.metadata.version("pelican")
 except Exception:
     __version__ = "unknown"
 

From 9c87d8f3a36aab2462cc6e064abb7ed9fe5abca0 Mon Sep 17 00:00:00 2001
From: boxydog <93335439+boxydog@users.noreply.github.com>
Date: Sat, 28 Oct 2023 05:56:00 -0500
Subject: [PATCH 2599/2864] Deal with broken embedded video links when
 importing from Tumblr (#3218)

Co-authored-by: boxydog <boxydog@users.noreply.github.com>
Co-authored-by: Will Thong <will@willthong.com>
---
 pelican/tests/test_importer.py  | 110 ++++++++++++++++++++++++++++++++
 pelican/tools/pelican_import.py |  12 +++-
 2 files changed, 120 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 3855e382..f45f885c 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -532,3 +532,113 @@ class TestTumblrImporter(TestWithOsDefaults):
               ['economics'], 'published', 'article', 'html')],
             posts,
             posts)
+
+    @patch("pelican.tools.pelican_import._get_tumblr_posts")
+    def test_video_embed(self, get):
+        def get_posts(api_key, blogname, offset=0):
+            if offset > 0:
+                return []
+
+            return [
+                {
+                    "type": "video",
+                    "blog_name": "testy",
+                    "slug": "the-slug",
+                    "date": "2017-07-07 20:31:41 GMT",
+                    "timestamp": 1499459501,
+                    "state": "published",
+                    "format": "html",
+                    "tags": [],
+                    "source_url": "https://href.li/?https://www.youtube.com/a",
+                    "source_title": "youtube.com",
+                    "caption": "<p>Caption</p>",
+                    "player": [
+                        {
+                            "width": 250,
+                            "embed_code":
+                                "<iframe>1</iframe>"
+                        },
+                        {
+                            "width": 400,
+                            "embed_code":
+                                "<iframe>2</iframe>"
+                        },
+                        {
+                            "width": 500,
+                            "embed_code":
+                                "<iframe>3</iframe>"
+                        }
+                    ],
+                    "video_type": "youtube",
+                }
+                ]
+        get.side_effect = get_posts
+
+        posts = list(tumblr2fields("api_key", "blogname"))
+        self.assertEqual(
+            [('youtube.com',
+              '<p><a href="https://href.li/?'
+              'https://www.youtube.com/a">via</a></p>\n<p>Caption</p>'
+              '<iframe>1</iframe>\n'
+              '<iframe>2</iframe>\n'
+              '<iframe>3</iframe>\n',
+              '2017-07-07-the-slug',
+              '2017-07-07 20:31:41', 'testy', ['video'], [], 'published',
+              'article', 'html')],
+            posts,
+            posts)
+
+    @patch("pelican.tools.pelican_import._get_tumblr_posts")
+    def test_broken_video_embed(self, get):
+        def get_posts(api_key, blogname, offset=0):
+            if offset > 0:
+                return []
+
+            return [
+                {
+                    "type": "video",
+                    "blog_name": "testy",
+                    "slug": "the-slug",
+                    "date": "2016-08-14 16:37:35 GMT",
+                    "timestamp": 1471192655,
+                    "state": "published",
+                    "format": "html",
+                    "tags": [
+                        "interviews"
+                    ],
+                    "source_url":
+                        "https://href.li/?https://www.youtube.com/watch?v=b",
+                    "source_title": "youtube.com",
+                    "caption":
+                        "<p>Caption</p>",
+                    "player": [
+                        {
+                            "width": 250,
+                            # If video is gone, embed_code is False
+                            "embed_code": False
+                        },
+                        {
+                            "width": 400,
+                            "embed_code": False
+                        },
+                        {
+                            "width": 500,
+                            "embed_code": False
+                        }
+                    ],
+                    "video_type": "youtube",
+                }
+            ]
+        get.side_effect = get_posts
+
+        posts = list(tumblr2fields("api_key", "blogname"))
+        self.assertEqual(
+            [('youtube.com',
+              '<p><a href="https://href.li/?https://www.youtube.com/watch?'
+              'v=b">via</a></p>\n<p>Caption</p>'
+              '<p>(This video isn\'t available anymore.)</p>\n',
+              '2016-08-14-the-slug',
+              '2016-08-14 16:37:35', 'testy', ['video'], ['interviews'],
+              'published', 'article', 'html')],
+            posts,
+            posts)
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 474b5cba..16ce6305 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -459,8 +459,16 @@ def tumblr2fields(api_key, blogname):
                     fmtstr = '<p><a href="%s">via</a></p>\n'
                 source = fmtstr % post.get('source_url')
                 caption = post.get('caption')
-                players = '\n'.join(player.get('embed_code')
-                                    for player in post.get('player'))
+                players = [
+                    # If embed_code is False, couldn't get the video
+                    player.get('embed_code') or None
+                    for player in post.get('player')]
+                # If there are no embeddable players, say so, once
+                if len(players) > 0 and all(
+                        player is None for player in players):
+                    players = "<p>(This video isn't available anymore.)</p>\n"
+                else:
+                    players = '\n'.join(players)
                 content = source + caption + players
             elif type == 'answer':
                 title = post.get('question')

From b6a9a8333b285e9781d290187c69b5667f428579 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 28 Oct 2023 14:49:55 +0300
Subject: [PATCH 2600/2864] skip tests that require git if git is not installed

and minor tweaks to subprocess handling
---
 pelican/tests/support.py      | 3 ++-
 pelican/tests/test_pelican.py | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 8a394395..720e4d0e 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -231,7 +231,8 @@ def diff_subproc(first, second):
         ['git', '--no-pager', 'diff', '--no-ext-diff', '--exit-code',
          '-w', first, second],
         stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE
+        stderr=subprocess.PIPE,
+        text=True,
     )
 
 
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index adba32e0..885c2138 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -15,7 +15,8 @@ from pelican.tests.support import (
     LoggedTestCase,
     diff_subproc,
     locale_available,
-    mute
+    mute,
+    skipIfNoExecutable,
 )
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -69,7 +70,8 @@ class TestPelican(LoggedTestCase):
         if proc.returncode != 0:
             msg = self._formatMessage(
                 msg,
-                "%s and %s differ:\n%s" % (left_path, right_path, err)
+                "%s and %s differ:\nstdout:\n%s\nstderr\n%s" %
+                (left_path, right_path, out, err)
             )
             raise self.failureException(msg)
 
@@ -88,6 +90,7 @@ class TestPelican(LoggedTestCase):
             generator_classes, Sequence,
             "_get_generator_classes() must return a Sequence to preserve order")
 
+    @skipIfNoExecutable(['git', '--version'])
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
         # ones and generate correct output without raising any exception
@@ -107,6 +110,7 @@ class TestPelican(LoggedTestCase):
             msg="Unable to find.*skipping url replacement",
             level=logging.WARNING)
 
+    @skipIfNoExecutable(['git', '--version'])
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work
         settings = read_settings(path=SAMPLE_CONFIG, override={
@@ -121,6 +125,7 @@ class TestPelican(LoggedTestCase):
             self.temp_path, os.path.join(OUTPUT_PATH, 'custom')
         )
 
+    @skipIfNoExecutable(['git', '--version'])
     @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
                          locale_available('French'), 'French locale needed')
     def test_custom_locale_generation_works(self):

From dc427ad9d6e460debe0a667cfd41d6d9ca4133d1 Mon Sep 17 00:00:00 2001
From: Gullumluvl <7593801+Gullumluvl@users.noreply.github.com>
Date: Sat, 28 Oct 2023 14:24:16 +0200
Subject: [PATCH 2601/2864] Strip HTML tags from SITENAME inside title tags.
 Fixes #3147 (#3149)

---
 pelican/themes/notmyidea/templates/author.html |  2 +-
 .../themes/notmyidea/templates/authors.html    |  2 +-
 pelican/themes/notmyidea/templates/base.html   |  6 +++---
 .../themes/notmyidea/templates/categories.html |  2 +-
 .../themes/notmyidea/templates/category.html   |  2 +-
 pelican/themes/notmyidea/templates/tag.html    |  2 +-
 pelican/themes/notmyidea/templates/tags.html   |  2 +-
 pelican/themes/simple/templates/archives.html  |  2 +-
 pelican/themes/simple/templates/article.html   |  2 +-
 pelican/themes/simple/templates/author.html    |  2 +-
 pelican/themes/simple/templates/authors.html   |  2 +-
 pelican/themes/simple/templates/base.html      | 18 +++++++++---------
 .../themes/simple/templates/categories.html    |  2 +-
 pelican/themes/simple/templates/category.html  |  2 +-
 pelican/themes/simple/templates/page.html      |  2 +-
 .../simple/templates/period_archives.html      |  2 +-
 pelican/themes/simple/templates/tag.html       |  2 +-
 pelican/themes/simple/templates/tags.html      |  2 +-
 18 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/author.html b/pelican/themes/notmyidea/templates/author.html
index 0b372902..536ac50d 100644
--- a/pelican/themes/notmyidea/templates/author.html
+++ b/pelican/themes/notmyidea/templates/author.html
@@ -1,2 +1,2 @@
 {% extends "index.html" %}
-{% block title %}{{ SITENAME }} - {{ author }}{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - {{ author }}{% endblock %}
diff --git a/pelican/themes/notmyidea/templates/authors.html b/pelican/themes/notmyidea/templates/authors.html
index e61a332f..b9f87e22 100644
--- a/pelican/themes/notmyidea/templates/authors.html
+++ b/pelican/themes/notmyidea/templates/authors.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}{{ SITENAME }} - Authors{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - Authors{% endblock %}
 
 {% block content %}
 
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 2b302899..8483f268 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -5,13 +5,13 @@
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <meta name="generator" content="Pelican" />
-        <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
+        <title>{% block title %}{{ SITENAME|striptags }}{%endblock%}</title>
         <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" />
         {% if FEED_ALL_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Atom Feed" />
         {% endif %}
         {% if FEED_ALL_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} RSS Feed" />
         {% endif %}
         {% block extra_head %}{% endblock extra_head %}
         {% endblock head %}
diff --git a/pelican/themes/notmyidea/templates/categories.html b/pelican/themes/notmyidea/templates/categories.html
index 07f6290a..7c5951c7 100644
--- a/pelican/themes/notmyidea/templates/categories.html
+++ b/pelican/themes/notmyidea/templates/categories.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}{{ SITENAME }} - Categories{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - Categories{% endblock %}
 
 {% block content %}
 
diff --git a/pelican/themes/notmyidea/templates/category.html b/pelican/themes/notmyidea/templates/category.html
index 56f8e93e..ff14ed76 100644
--- a/pelican/themes/notmyidea/templates/category.html
+++ b/pelican/themes/notmyidea/templates/category.html
@@ -1,2 +1,2 @@
 {% extends "index.html" %}
-{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - {{ category }}{% endblock %}
diff --git a/pelican/themes/notmyidea/templates/tag.html b/pelican/themes/notmyidea/templates/tag.html
index 68cdcba6..1e32857b 100644
--- a/pelican/themes/notmyidea/templates/tag.html
+++ b/pelican/themes/notmyidea/templates/tag.html
@@ -1,2 +1,2 @@
 {% extends "index.html" %}
-{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - {{ tag }}{% endblock %}
diff --git a/pelican/themes/notmyidea/templates/tags.html b/pelican/themes/notmyidea/templates/tags.html
index fb099557..a1729321 100644
--- a/pelican/themes/notmyidea/templates/tags.html
+++ b/pelican/themes/notmyidea/templates/tags.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}{{ SITENAME }} - Tags{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - Tags{% endblock %}
 
 {% block content %}
 
diff --git a/pelican/themes/simple/templates/archives.html b/pelican/themes/simple/templates/archives.html
index cd129507..b7754c45 100644
--- a/pelican/themes/simple/templates/archives.html
+++ b/pelican/themes/simple/templates/archives.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}{{ SITENAME }} - Archives{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - Archives{% endblock %}
 
 {% block content %}
 <h1>Archives for {{ SITENAME }}</h1>
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 6dd0d967..a17f2759 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block html_lang %}{{ article.lang }}{% endblock %}
 
-{% block title %}{{ SITENAME }} - {{ article.title|striptags  }}{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - {{ article.title|striptags  }}{% endblock %}
 
 {% block head %}
   {{ super() }}
diff --git a/pelican/themes/simple/templates/author.html b/pelican/themes/simple/templates/author.html
index 79d22c7d..64aadffb 100644
--- a/pelican/themes/simple/templates/author.html
+++ b/pelican/themes/simple/templates/author.html
@@ -1,6 +1,6 @@
 {% extends "index.html" %}
 
-{% block title %}{{ SITENAME }} - Articles by {{ author }}{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - Articles by {{ author }}{% endblock %}
 
 {% block content_title %}
 <h1>Articles by {{ author }}</h1>
diff --git a/pelican/themes/simple/templates/authors.html b/pelican/themes/simple/templates/authors.html
index 9aee5db4..9b80b499 100644
--- a/pelican/themes/simple/templates/authors.html
+++ b/pelican/themes/simple/templates/authors.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}{{ SITENAME }} - Authors{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - Authors{% endblock %}
 
 {% block content %}
     <h1>Authors on {{ SITENAME }}</h1>
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 1d8ae843..3125e5aa 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -2,33 +2,33 @@
 <html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock html_lang %}">
 <head>
         {% block head %}
-        <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
+        <title>{% block title %}{{ SITENAME|striptags }}{% endblock title %}</title>
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         {% if FEED_ALL_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Full Atom Feed" />
         {% endif %}
         {% if FEED_ALL_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} Full RSS Feed" />
         {% endif %}
         {% if FEED_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{%if FEED_ATOM_URL %}{{ FEED_ATOM_URL }}{% else %}{{ FEED_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{%if FEED_ATOM_URL %}{{ FEED_ATOM_URL }}{% else %}{{ FEED_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Atom Feed" />
         {% endif %}
         {% if FEED_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{% if FEED_RSS_URL %}{{ FEED_RSS_URL }}{% else %}{{ FEED_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if FEED_RSS_URL %}{{ FEED_RSS_URL }}{% else %}{{ FEED_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} RSS Feed" />
         {% endif %}
         {% if CATEGORY_FEED_ATOM and category %}
-        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_ATOM.format(slug=category.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_ATOM.format(slug=category.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Categories Atom Feed" />
         {% endif %}
         {% if CATEGORY_FEED_RSS and category %}
-        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_RSS_URL %}{{ CATEGORY_FEED_RSS_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_RSS.format(slug=category.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_RSS_URL %}{{ CATEGORY_FEED_RSS_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_RSS.format(slug=category.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} Categories RSS Feed" />
         {% endif %}
         {% if TAG_FEED_ATOM and tag %}
-        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_ATOM.format(slug=tag.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_ATOM.format(slug=tag.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Tags Atom Feed" />
         {% endif %}
         {% if TAG_FEED_RSS and tag %}
-        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_RSS.format(slug=tag.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_RSS.format(slug=tag.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} Tags RSS Feed" />
         {% endif %}
         {% endblock head %}
 </head>
diff --git a/pelican/themes/simple/templates/categories.html b/pelican/themes/simple/templates/categories.html
index 7999de43..f099e88f 100644
--- a/pelican/themes/simple/templates/categories.html
+++ b/pelican/themes/simple/templates/categories.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}{{ SITENAME }} - Categories{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - Categories{% endblock %}
 
 {% block content %}
     <h1>Categories on {{ SITENAME }}</h1>
diff --git a/pelican/themes/simple/templates/category.html b/pelican/themes/simple/templates/category.html
index d73f6e31..f7889d00 100644
--- a/pelican/themes/simple/templates/category.html
+++ b/pelican/themes/simple/templates/category.html
@@ -1,6 +1,6 @@
 {% extends "index.html" %}
 
-{% block title %}{{ SITENAME }} - {{ category }} category{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - {{ category }} category{% endblock %}
 
 {% block content_title %}
 <h1>Articles in the {{ category }} category</h1>
diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
index 33344eac..eea816a9 100644
--- a/pelican/themes/simple/templates/page.html
+++ b/pelican/themes/simple/templates/page.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block html_lang %}{{ page.lang }}{% endblock %}
 
-{% block title %}{{ SITENAME }} - {{ page.title|striptags }}{%endblock%}
+{% block title %}{{ SITENAME|striptags }} - {{ page.title|striptags }}{%endblock%}
 
 {% block head %}
   {{ super() }}
diff --git a/pelican/themes/simple/templates/period_archives.html b/pelican/themes/simple/templates/period_archives.html
index e1ddf626..9cdc354d 100644
--- a/pelican/themes/simple/templates/period_archives.html
+++ b/pelican/themes/simple/templates/period_archives.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}{{ SITENAME }} - {{ period | reverse | join(' ') }} archives{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - {{ period | reverse | join(' ') }} archives{% endblock %}
 
 {% block content %}
 <h1>Archives for {{ period | reverse | join(' ') }}</h1>
diff --git a/pelican/themes/simple/templates/tag.html b/pelican/themes/simple/templates/tag.html
index 93878134..59725a05 100644
--- a/pelican/themes/simple/templates/tag.html
+++ b/pelican/themes/simple/templates/tag.html
@@ -1,6 +1,6 @@
 {% extends "index.html" %}
 
-{% block title %}{{ SITENAME }} - {{ tag }} tag{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - {{ tag }} tag{% endblock %}
 
 {% block content_title %}
 <h1>Articles tagged with {{ tag }}</h1>
diff --git a/pelican/themes/simple/templates/tags.html b/pelican/themes/simple/templates/tags.html
index b90b0ac3..92c142d2 100644
--- a/pelican/themes/simple/templates/tags.html
+++ b/pelican/themes/simple/templates/tags.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}{{ SITENAME }} - Tags{% endblock %}
+{% block title %}{{ SITENAME|striptags }} - Tags{% endblock %}
 
 {% block content %}
     <h1>Tags for {{ SITENAME }}</h1>

From 83a8059d02af772e1e094e36d8a22fa66b5030db Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 28 Oct 2023 15:55:02 +0300
Subject: [PATCH 2602/2864] force timestamp conversion in tumblr importer to be
 UTC with offset and adjust tests

---
 pelican/tests/test_importer.py  | 18 ++++++------------
 pelican/tools/pelican_import.py | 11 +++++++----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index f45f885c..0d9586f0 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -1,12 +1,9 @@
-import datetime
 import locale
 import os
 import re
 from posixpath import join as posix_join
 from unittest.mock import patch
 
-import dateutil.tz
-
 from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder,
                                    unittest)
@@ -46,12 +43,9 @@ class TestWithOsDefaults(unittest.TestCase):
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
         locale.setlocale(locale.LC_ALL, 'C')
-        self.old_timezone = datetime.datetime.now(dateutil.tz.tzlocal()).tzname()
-        os.environ['TZ'] = 'UTC'
 
     def tearDown(self):
         locale.setlocale(locale.LC_ALL, self.old_locale)
-        os.environ['TZ'] = self.old_timezone
 
 
 @skipIfNoExecutable(['pandoc', '--version'])
@@ -502,7 +496,7 @@ class TestTumblrImporter(TestWithOsDefaults):
                 {
                     "type": "photo",
                     "blog_name": "testy",
-                    "date": "2019-11-07 21:26:40 GMT",
+                    "date": "2019-11-07 21:26:40 UTC",
                     "timestamp": 1573162000,
                     "format": "html",
                     "slug": "a-slug",
@@ -528,7 +522,7 @@ class TestTumblrImporter(TestWithOsDefaults):
         self.assertEqual(
             [('Photo',
               '<img alt="" src="https://..fccdc2360ba7182a.jpg" />\n',
-              '2019-11-07-a-slug', '2019-11-07 21:26:40', 'testy', ['photo'],
+              '2019-11-07-a-slug', '2019-11-07 21:26:40+0000', 'testy', ['photo'],
               ['economics'], 'published', 'article', 'html')],
             posts,
             posts)
@@ -544,7 +538,7 @@ class TestTumblrImporter(TestWithOsDefaults):
                     "type": "video",
                     "blog_name": "testy",
                     "slug": "the-slug",
-                    "date": "2017-07-07 20:31:41 GMT",
+                    "date": "2017-07-07 20:31:41 UTC",
                     "timestamp": 1499459501,
                     "state": "published",
                     "format": "html",
@@ -583,7 +577,7 @@ class TestTumblrImporter(TestWithOsDefaults):
               '<iframe>2</iframe>\n'
               '<iframe>3</iframe>\n',
               '2017-07-07-the-slug',
-              '2017-07-07 20:31:41', 'testy', ['video'], [], 'published',
+              '2017-07-07 20:31:41+0000', 'testy', ['video'], [], 'published',
               'article', 'html')],
             posts,
             posts)
@@ -599,7 +593,7 @@ class TestTumblrImporter(TestWithOsDefaults):
                     "type": "video",
                     "blog_name": "testy",
                     "slug": "the-slug",
-                    "date": "2016-08-14 16:37:35 GMT",
+                    "date": "2016-08-14 16:37:35 UTC",
                     "timestamp": 1471192655,
                     "state": "published",
                     "format": "html",
@@ -638,7 +632,7 @@ class TestTumblrImporter(TestWithOsDefaults):
               'v=b">via</a></p>\n<p>Caption</p>'
               '<p>(This video isn\'t available anymore.)</p>\n',
               '2016-08-14-the-slug',
-              '2016-08-14 16:37:35', 'testy', ['video'], ['interviews'],
+              '2016-08-14 16:37:35+0000', 'testy', ['video'], ['interviews'],
               'published', 'article', 'html')],
             posts,
             posts)
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 16ce6305..44568161 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import argparse
+import datetime
 import logging
 import os
 import re
@@ -416,10 +417,12 @@ def tumblr2fields(api_key, blogname):
             slug = post.get('slug') or slugify(title, regex_subs=subs)
             tags = post.get('tags')
             timestamp = post.get('timestamp')
-            date = SafeDatetime.fromtimestamp(int(timestamp)).strftime(
-                "%Y-%m-%d %H:%M:%S")
-            slug = SafeDatetime.fromtimestamp(int(timestamp)).strftime(
-                "%Y-%m-%d-") + slug
+            date = SafeDatetime.fromtimestamp(
+                int(timestamp), tz=datetime.timezone.utc
+            ).strftime("%Y-%m-%d %H:%M:%S%z")
+            slug = SafeDatetime.fromtimestamp(
+                int(timestamp), tz=datetime.timezone.utc
+            ).strftime("%Y-%m-%d-") + slug
             format = post.get('format')
             content = post.get('body')
             type = post.get('type')

From 11c13ceae1c72bd786a1b09657de2926eb6ae267 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 28 Oct 2023 16:31:05 +0300
Subject: [PATCH 2603/2864] use a tempfile for intermediate html file for
 pandoc in importer

---
 pelican/tools/pelican_import.py | 64 ++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 44568161..95e196ba 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -7,6 +7,7 @@ import os
 import re
 import subprocess
 import sys
+import tempfile
 import time
 from collections import defaultdict
 from html import unescape
@@ -785,9 +786,8 @@ def fields2pelican(
         print(out_filename)
 
         if in_markup in ('html', 'wp-html'):
-            html_filename = os.path.join(output_path, filename + '.html')
-
-            with open(html_filename, 'w', encoding='utf-8') as fp:
+            with tempfile.TemporaryDirectory() as tmpdir:
+                html_filename = os.path.join(tmpdir, 'pandoc-input.html')
                 # Replace newlines with paragraphs wrapped with <p> so
                 # HTML is valid before conversion
                 if in_markup == 'wp-html':
@@ -796,41 +796,39 @@ def fields2pelican(
                     paragraphs = content.splitlines()
                     paragraphs = ['<p>{}</p>'.format(p) for p in paragraphs]
                     new_content = ''.join(paragraphs)
+                with open(html_filename, 'w', encoding='utf-8') as fp:
+                    fp.write(new_content)
 
-                fp.write(new_content)
+                if pandoc_version < (2,):
+                    parse_raw = '--parse-raw' if not strip_raw else ''
+                    wrap_none = '--wrap=none' \
+                        if pandoc_version >= (1, 16) else '--no-wrap'
+                    cmd = ('pandoc --normalize {0} --from=html'
+                           ' --to={1} {2} -o "{3}" "{4}"')
+                    cmd = cmd.format(parse_raw,
+                                     out_markup if out_markup != 'markdown' else "gfm",
+                                     wrap_none,
+                                     out_filename, html_filename)
+                else:
+                    from_arg = '-f html+raw_html' if not strip_raw else '-f html'
+                    cmd = ('pandoc {0} --to={1}-smart --wrap=none -o "{2}" "{3}"')
+                    cmd = cmd.format(from_arg,
+                                     out_markup if out_markup != 'markdown' else "gfm",
+                                     out_filename, html_filename)
 
-            if pandoc_version < (2,):
-                parse_raw = '--parse-raw' if not strip_raw else ''
-                wrap_none = '--wrap=none' \
-                    if pandoc_version >= (1, 16) else '--no-wrap'
-                cmd = ('pandoc --normalize {0} --from=html'
-                       ' --to={1} {2} -o "{3}" "{4}"')
-                cmd = cmd.format(parse_raw,
-                                 out_markup if out_markup != 'markdown' else "gfm",
-                                 wrap_none,
-                                 out_filename, html_filename)
-            else:
-                from_arg = '-f html+raw_html' if not strip_raw else '-f html'
-                cmd = ('pandoc {0} --to={1}-smart --wrap=none -o "{2}" "{3}"')
-                cmd = cmd.format(from_arg,
-                                 out_markup if out_markup != 'markdown' else "gfm",
-                                 out_filename, html_filename)
+                try:
+                    rc = subprocess.call(cmd, shell=True)
+                    if rc < 0:
+                        error = 'Child was terminated by signal %d' % -rc
+                        exit(error)
 
-            try:
-                rc = subprocess.call(cmd, shell=True)
-                if rc < 0:
-                    error = 'Child was terminated by signal %d' % -rc
+                    elif rc > 0:
+                        error = 'Please, check your Pandoc installation.'
+                        exit(error)
+                except OSError as e:
+                    error = 'Pandoc execution failed: %s' % e
                     exit(error)
 
-                elif rc > 0:
-                    error = 'Please, check your Pandoc installation.'
-                    exit(error)
-            except OSError as e:
-                error = 'Pandoc execution failed: %s' % e
-                exit(error)
-
-            os.remove(html_filename)
-
             with open(out_filename, encoding='utf-8') as fs:
                 content = fs.read()
                 if out_markup == 'markdown':

From 61ca47c5194f33ad28e96cf965ba9f582d6d7909 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Wed, 21 Jun 2023 22:01:38 +0100
Subject: [PATCH 2604/2864] Use watchfiles as a file watching backend

This doesn't use polling unless absolutely necessarily, making it more efficient. It also reduces the amount of first-party code required, and simplifies working out which files are being watched.
---
 pelican/__init__.py         |  25 ++---
 pelican/tests/test_utils.py |  86 -----------------
 pelican/utils.py            | 180 +++++-------------------------------
 pyproject.toml              |   1 +
 4 files changed, 32 insertions(+), 260 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index f0af3429..a4f5b38e 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -27,7 +27,7 @@ from pelican.plugins._utils import get_plugin_name, load_plugins
 from pelican.readers import Readers
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import read_settings
-from pelican.utils import (FileSystemWatcher, clean_output_dir, maybe_pluralize)
+from pelican.utils import (wait_for_changes, clean_output_dir, maybe_pluralize)
 from pelican.writers import Writer
 
 try:
@@ -452,26 +452,19 @@ def autoreload(args, excqueue=None):
     console.print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
                   ' `settings` for changes. ---')
     pelican, settings = get_instance(args)
-    watcher = FileSystemWatcher(args.settings, Readers, settings)
-    sleep = False
+    settings_file = os.path.abspath(args.settings)
     while True:
         try:
-            # Don't sleep first time, but sleep afterwards to reduce cpu load
-            if sleep:
-                time.sleep(0.5)
-            else:
-                sleep = True
+            changed_files = wait_for_changes(args.settings, Readers, settings)
 
-            modified = watcher.check()
+            changed_files = {c[1] for c in changed_files}
 
-            if modified['settings']:
+            if settings_file in changed_files:
                 pelican, settings = get_instance(args)
-                watcher.update_watchers(settings)
 
-            if any(modified.values()):
-                console.print('\n-> Modified: {}. re-generating...'.format(
-                              ', '.join(k for k, v in modified.items() if v)))
-                pelican.run()
+            console.print('\n-> Modified: {}. re-generating...'.format(
+                              ', '.join(changed_files)))
+            pelican.run()
 
         except KeyboardInterrupt:
             if excqueue is not None:
@@ -558,8 +551,6 @@ def main(argv=None):
             listen(settings.get('BIND'), settings.get('PORT'),
                    settings.get("OUTPUT_PATH"))
         else:
-            watcher = FileSystemWatcher(args.settings, Readers, settings)
-            watcher.check()
             with console.status("Generating..."):
                 pelican.run()
     except KeyboardInterrupt:
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index e1758726..7ff1af7a 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -412,92 +412,6 @@ class TestUtils(LoggedTestCase):
                             self.assertNotIn(a_arts[4], b_arts[5].translations)
                             self.assertNotIn(a_arts[5], b_arts[4].translations)
 
-    def test_filesystemwatcher(self):
-        def create_file(name, content):
-            with open(name, 'w') as f:
-                f.write(content)
-
-        # disable logger filter
-        from pelican.utils import logger
-        logger.disable_filter()
-
-        # create a temp "project" dir
-        root = mkdtemp()
-        content_path = os.path.join(root, 'content')
-        static_path = os.path.join(root, 'content', 'static')
-        config_file = os.path.join(root, 'config.py')
-        theme_path = os.path.join(root, 'mytheme')
-
-        # populate
-        os.mkdir(content_path)
-        os.mkdir(theme_path)
-        create_file(config_file,
-                    'PATH = "content"\n'
-                    'THEME = "mytheme"\n'
-                    'STATIC_PATHS = ["static"]')
-
-        t = time.time() - 1000  # make sure it's in the "past"
-        os.utime(config_file, (t, t))
-        settings = read_settings(config_file)
-
-        watcher = utils.FileSystemWatcher(config_file, Readers, settings)
-        # should get a warning for static not not existing
-        self.assertLogCountEqual(1, 'Watched path does not exist: .*static')
-
-        # create it and update config
-        os.mkdir(static_path)
-        watcher.update_watchers(settings)
-        # no new warning
-        self.assertLogCountEqual(1, 'Watched path does not exist: .*static')
-
-        # get modified values
-        modified = watcher.check()
-        # empty theme and content should raise warnings
-        self.assertLogCountEqual(1, 'No valid files found in content')
-        self.assertLogCountEqual(1, 'Empty theme folder. Using `basic` theme')
-
-        self.assertIsNone(modified['content'])  # empty
-        self.assertIsNone(modified['theme'])  # empty
-        self.assertIsNone(modified['[static]static'])  # empty
-        self.assertTrue(modified['settings'])  # modified, first time
-
-        # add a content, add file to theme and check again
-        create_file(os.path.join(content_path, 'article.md'),
-                    'Title: test\n'
-                    'Date: 01-01-2020')
-
-        create_file(os.path.join(theme_path, 'dummy'),
-                    'test')
-
-        modified = watcher.check()
-        # no new warning
-        self.assertLogCountEqual(1, 'No valid files found in content')
-        self.assertLogCountEqual(1, 'Empty theme folder. Using `basic` theme')
-
-        self.assertIsNone(modified['[static]static'])  # empty
-        self.assertFalse(modified['settings'])  # not modified
-        self.assertTrue(modified['theme'])  # modified
-        self.assertTrue(modified['content'])  # modified
-
-        # change config, remove static path
-        create_file(config_file,
-                    'PATH = "content"\n'
-                    'THEME = "mytheme"\n'
-                    'STATIC_PATHS = []')
-
-        settings = read_settings(config_file)
-        watcher.update_watchers(settings)
-
-        modified = watcher.check()
-        self.assertNotIn('[static]static', modified)  # should be gone
-        self.assertTrue(modified['settings'])  # modified
-        self.assertFalse(modified['content'])  # not modified
-        self.assertFalse(modified['theme'])  # not modified
-
-        # cleanup
-        logger.enable_filter()
-        shutil.rmtree(root)
-
     def test_clean_output_dir(self):
         retention = ()
         test_directory = os.path.join(self.temp_output,
diff --git a/pelican/utils.py b/pelican/utils.py
index d8cf15b4..4832e0c1 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -24,6 +24,8 @@ except ModuleNotFoundError:
     from backports.zoneinfo import ZoneInfo
 from markupsafe import Markup
 
+import watchfiles
+
 
 logger = logging.getLogger(__name__)
 
@@ -755,167 +757,31 @@ def order_content(content_list, order_by='slug'):
     return content_list
 
 
-class FileSystemWatcher:
-    def __init__(self, settings_file, reader_class, settings=None):
-        self.watchers = {
-            'settings': FileSystemWatcher.file_watcher(settings_file)
-        }
+def wait_for_changes(settings_file, reader_class, settings):
+    new_extensions = set(reader_class(settings).extensions)
+    content_path = settings.get('PATH', '')
+    theme_path = settings.get('THEME', '')
+    ignore_files = set(settings.get('IGNORE_FILES', []))
 
-        self.settings = None
-        self.reader_class = reader_class
-        self._extensions = None
-        self._content_path = None
-        self._theme_path = None
-        self._ignore_files = None
+    watching_paths = [
+        settings_file,
+        theme_path,
+        content_path,
+    ]
 
-        if settings is not None:
-            self.update_watchers(settings)
+    watching_paths.extend(
+        os.path.join(content_path, path) for path in settings.get('STATIC_PATHS', [])
+    )
 
-    def update_watchers(self, settings):
-        new_extensions = set(self.reader_class(settings).extensions)
-        new_content_path = settings.get('PATH', '')
-        new_theme_path = settings.get('THEME', '')
-        new_ignore_files = set(settings.get('IGNORE_FILES', []))
+    watching_paths = [os.path.abspath(p) for p in watching_paths if p and os.path.exists(p)]
 
-        extensions_changed = new_extensions != self._extensions
-        content_changed = new_content_path != self._content_path
-        theme_changed = new_theme_path != self._theme_path
-        ignore_changed = new_ignore_files != self._ignore_files
-
-        # Refresh content watcher if related settings changed
-        if extensions_changed or content_changed or ignore_changed:
-            self.add_watcher('content',
-                             new_content_path,
-                             new_extensions,
-                             new_ignore_files)
-
-        # Refresh theme watcher if related settings changed
-        if theme_changed or ignore_changed:
-            self.add_watcher('theme',
-                             new_theme_path,
-                             [''],
-                             new_ignore_files)
-
-        # Watch STATIC_PATHS
-        old_static_watchers = set(key
-                                  for key in self.watchers
-                                  if key.startswith('[static]'))
-
-        for path in settings.get('STATIC_PATHS', []):
-            key = '[static]{}'.format(path)
-            if ignore_changed or (key not in self.watchers):
-                self.add_watcher(
-                    key,
-                    os.path.join(new_content_path, path),
-                    [''],
-                    new_ignore_files)
-            if key in old_static_watchers:
-                old_static_watchers.remove(key)
-
-        # cleanup removed static watchers
-        for key in old_static_watchers:
-            del self.watchers[key]
-
-        # update values
-        self.settings = settings
-        self._extensions = new_extensions
-        self._content_path = new_content_path
-        self._theme_path = new_theme_path
-        self._ignore_files = new_ignore_files
-
-    def check(self):
-        '''return a key:watcher_status dict for all watchers'''
-        result = {key: next(watcher) for key, watcher in self.watchers.items()}
-
-        # Various warnings
-        if result.get('content') is None:
-            reader_descs = sorted(
-                {
-                    '  | %s (%s)' % (type(r).__name__, ', '.join(r.file_extensions))
-                    for r in self.reader_class(self.settings).readers.values()
-                    if r.enabled
-                }
-            )
-            logger.warning(
-                'No valid files found in content for the active readers:\n'
-                + '\n'.join(reader_descs))
-
-        if result.get('theme') is None:
-            logger.warning('Empty theme folder. Using `basic` theme.')
-
-        return result
-
-    def add_watcher(self, key, path, extensions=[''], ignores=[]):
-        watcher = self.get_watcher(path, extensions, ignores)
-        if watcher is not None:
-            self.watchers[key] = watcher
-
-    def get_watcher(self, path, extensions=[''], ignores=[]):
-        '''return a watcher depending on path type (file or folder)'''
-        if not os.path.exists(path):
-            logger.warning("Watched path does not exist: %s", path)
-            return None
-
-        if os.path.isdir(path):
-            return self.folder_watcher(path, extensions, ignores)
-        else:
-            return self.file_watcher(path)
-
-    @staticmethod
-    def folder_watcher(path, extensions, ignores=[]):
-        '''Generator for monitoring a folder for modifications.
-
-        Returns a boolean indicating if files are changed since last check.
-        Returns None if there are no matching files in the folder'''
-
-        def file_times(path):
-            '''Return `mtime` for each file in path'''
-
-            for root, dirs, files in os.walk(path, followlinks=True):
-                dirs[:] = [x for x in dirs if not x.startswith(os.curdir)]
-
-                for f in files:
-                    valid_extension = f.endswith(tuple(extensions))
-                    file_ignored = any(
-                        fnmatch.fnmatch(f, ignore) for ignore in ignores
-                    )
-                    if valid_extension and not file_ignored:
-                        try:
-                            yield os.stat(os.path.join(root, f)).st_mtime
-                        except OSError as e:
-                            logger.warning('Caught Exception: %s', e)
-
-        LAST_MTIME = 0
-        while True:
-            try:
-                mtime = max(file_times(path))
-                if mtime > LAST_MTIME:
-                    LAST_MTIME = mtime
-                    yield True
-            except ValueError:
-                yield None
-            else:
-                yield False
-
-    @staticmethod
-    def file_watcher(path):
-        '''Generator for monitoring a file for modifications'''
-        LAST_MTIME = 0
-        while True:
-            if path:
-                try:
-                    mtime = os.stat(path).st_mtime
-                except OSError as e:
-                    logger.warning('Caught Exception: %s', e)
-                    continue
-
-                if mtime > LAST_MTIME:
-                    LAST_MTIME = mtime
-                    yield True
-                else:
-                    yield False
-            else:
-                yield None
+    return next(watchfiles.watch(
+        *watching_paths,
+        watch_filter=watchfiles.DefaultFilter(
+            ignore_entity_patterns=[fnmatch.translate(pattern) for pattern in ignore_files]
+        ),
+        rust_timeout=0
+    ))
 
 
 def set_date_tzinfo(d, tz_name=None):
diff --git a/pyproject.toml b/pyproject.toml
index 826c1179..788b8dcb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,6 +41,7 @@ rich = ">=10.1"
 unidecode = ">=1.1"
 markdown = {version = ">=3.1", optional = true}
 backports-zoneinfo = {version = "^0.2.1", python = "<3.9"}
+watchfiles = "^0.19.0"
 
 [tool.poetry.dev-dependencies]
 BeautifulSoup4 = "^4.9"

From 7643e0e92b901d71ee1f4996e019682982abb3df Mon Sep 17 00:00:00 2001
From: Jake Howard <RealOrangeOne@users.noreply.github.com>
Date: Fri, 14 Jul 2023 16:50:43 +0100
Subject: [PATCH 2605/2864] Make sure the package depends on `watchfiles`

---
 setup.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 18eedb00..4ffee0cb 100755
--- a/setup.py
+++ b/setup.py
@@ -8,9 +8,18 @@ from setuptools import find_packages, setup
 
 version = "4.8.0"
 
-requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
-            'docutils>=0.15', 'blinker', 'unidecode', 'python-dateutil',
-            'rich', 'backports-zoneinfo[tzdata] >= 0.2; python_version<"3.9"']
+requires = [
+    'feedgenerator >= 1.9',
+    'jinja2 >= 2.7',
+    'pygments',
+    'docutils>=0.15',
+    'blinker',
+    'unidecode',
+    'python-dateutil',
+    'rich',
+    'backports-zoneinfo[tzdata] >= 0.2; python_version<"3.9"',
+    'watchfiles'
+]
 
 entry_points = {
     'console_scripts': [

From 5519efef2e24a3fef506a1e19222fc49053e39a6 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Tue, 15 Aug 2023 17:45:50 +0100
Subject: [PATCH 2606/2864] Log watching files which don't exist

---
 pelican/utils.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 4832e0c1..d8a19e4b 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -773,7 +773,11 @@ def wait_for_changes(settings_file, reader_class, settings):
         os.path.join(content_path, path) for path in settings.get('STATIC_PATHS', [])
     )
 
-    watching_paths = [os.path.abspath(p) for p in watching_paths if p and os.path.exists(p)]
+    watching_paths = [os.path.abspath(p) for p in watching_paths if p]
+
+    for path in watching_paths:
+        if not os.path.exists(path):
+            logger.warning("Unable to watch path '%s' as it does not exist.", path)
 
     return next(watchfiles.watch(
         *watching_paths,

From b388057d664daacb7a318e3334fdb975841b0962 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Tue, 15 Aug 2023 17:47:04 +0100
Subject: [PATCH 2607/2864] Remove unused extensions list

---
 pelican/utils.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index d8a19e4b..23c6fe1c 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -758,7 +758,6 @@ def order_content(content_list, order_by='slug'):
 
 
 def wait_for_changes(settings_file, reader_class, settings):
-    new_extensions = set(reader_class(settings).extensions)
     content_path = settings.get('PATH', '')
     theme_path = settings.get('THEME', '')
     ignore_files = set(settings.get('IGNORE_FILES', []))

From 631ac1bdb39d3ebe3d7dd94aa4e33a187ddb52c5 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Tue, 15 Aug 2023 17:49:58 +0100
Subject: [PATCH 2608/2864] Cleanup imports

---
 pelican/__init__.py         | 2 +-
 pelican/tests/test_utils.py | 2 --
 pelican/utils.py            | 8 ++++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index a4f5b38e..e0526b1f 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -27,7 +27,7 @@ from pelican.plugins._utils import get_plugin_name, load_plugins
 from pelican.readers import Readers
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import read_settings
-from pelican.utils import (wait_for_changes, clean_output_dir, maybe_pluralize)
+from pelican.utils import clean_output_dir, maybe_pluralize, wait_for_changes
 from pelican.writers import Writer
 
 try:
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 7ff1af7a..d8296285 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -2,7 +2,6 @@ import locale
 import logging
 import os
 import shutil
-import time
 from datetime import timezone
 from sys import platform
 from tempfile import mkdtemp
@@ -14,7 +13,6 @@ except ModuleNotFoundError:
 
 from pelican import utils
 from pelican.generators import TemplatePagesGenerator
-from pelican.readers import Readers
 from pelican.settings import read_settings
 from pelican.tests.support import (LoggedTestCase, get_article,
                                    locale_available, unittest)
diff --git a/pelican/utils.py b/pelican/utils.py
index 23c6fe1c..1225e479 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -760,7 +760,9 @@ def order_content(content_list, order_by='slug'):
 def wait_for_changes(settings_file, reader_class, settings):
     content_path = settings.get('PATH', '')
     theme_path = settings.get('THEME', '')
-    ignore_files = set(settings.get('IGNORE_FILES', []))
+    ignore_files = set(
+        fnmatch.translate(pattern) for pattern in settings.get('IGNORE_FILES', [])
+    )
 
     watching_paths = [
         settings_file,
@@ -780,9 +782,7 @@ def wait_for_changes(settings_file, reader_class, settings):
 
     return next(watchfiles.watch(
         *watching_paths,
-        watch_filter=watchfiles.DefaultFilter(
-            ignore_entity_patterns=[fnmatch.translate(pattern) for pattern in ignore_files]
-        ),
+        watch_filter=watchfiles.DefaultFilter(ignore_entity_patterns=ignore_files),
         rust_timeout=0
     ))
 

From b289dcea82bac461cf879be5935e64a1ff192622 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 28 Oct 2023 17:30:45 +0300
Subject: [PATCH 2609/2864] don't watch not existing paths

---
 pelican/utils.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index 1225e479..84a18deb 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -764,21 +764,25 @@ def wait_for_changes(settings_file, reader_class, settings):
         fnmatch.translate(pattern) for pattern in settings.get('IGNORE_FILES', [])
     )
 
-    watching_paths = [
+    candidate_paths = [
         settings_file,
         theme_path,
         content_path,
     ]
 
-    watching_paths.extend(
+    candidate_paths.extend(
         os.path.join(content_path, path) for path in settings.get('STATIC_PATHS', [])
     )
 
-    watching_paths = [os.path.abspath(p) for p in watching_paths if p]
-
-    for path in watching_paths:
+    watching_paths = []
+    for path in candidate_paths:
+        if not path:
+            continue
+        path = os.path.abspath(path)
         if not os.path.exists(path):
             logger.warning("Unable to watch path '%s' as it does not exist.", path)
+        else:
+            watching_paths.append(path)
 
     return next(watchfiles.watch(
         *watching_paths,

From 43e513f218e66ccdf128e5de5a4db279f47ff063 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 28 Oct 2023 17:37:56 +0300
Subject: [PATCH 2610/2864] run pelican first before waiting for changes

---
 pelican/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index e0526b1f..fcdda8a4 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -455,8 +455,9 @@ def autoreload(args, excqueue=None):
     settings_file = os.path.abspath(args.settings)
     while True:
         try:
-            changed_files = wait_for_changes(args.settings, Readers, settings)
+            pelican.run()
 
+            changed_files = wait_for_changes(args.settings, Readers, settings)
             changed_files = {c[1] for c in changed_files}
 
             if settings_file in changed_files:
@@ -464,7 +465,6 @@ def autoreload(args, excqueue=None):
 
             console.print('\n-> Modified: {}. re-generating...'.format(
                               ', '.join(changed_files)))
-            pelican.run()
 
         except KeyboardInterrupt:
             if excqueue is not None:

From f342dc309758a7f1197f2797b8965653f538b68a Mon Sep 17 00:00:00 2001
From: Chris Rose <offline@offby1.net>
Date: Sat, 28 Oct 2023 08:00:27 -0700
Subject: [PATCH 2611/2864] Add macOS testing for 3.11/3.12

---
 .github/workflows/main.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c0ffd9c6..6f146631 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,6 +27,10 @@ jobs:
             python: "3.12"
           - os: macos
             python: "3.10"
+          - os: macos
+            python: "3.11"
+          - os: macos
+            python: "3.12"
           - os: windows
             python: "3.10"
 

From 7dfc799f255815de1665e257a93987598aab95f4 Mon Sep 17 00:00:00 2001
From: Chris Rose <offline@offby1.net>
Date: Sat, 28 Oct 2023 10:44:39 -0700
Subject: [PATCH 2612/2864] Use ruff in pre-commit

---
 .pre-commit-config.yaml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4c0c85b0..f68521e5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,13 +13,11 @@ repos:
       - id: end-of-file-fixer
       - id: forbid-new-submodules
       - id: trailing-whitespace
-  - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.0
     hooks:
-      - id: flake8
-        name: Flake8 on commit diff
-        description: This hook limits Flake8 checks to changed lines of code.
-        entry: bash
-        args: [-c, 'git diff HEAD | flake8 --diff --max-line-length=88']
+      - id: ruff
+      - id: ruff-format
+        args: ["--check"]
 
 exclude: ^pelican/tests/output/

From 19c797af5e08dd7ccc38f939c5fc9c9bbe862e54 Mon Sep 17 00:00:00 2001
From: Chris Rose <offbyone@github.com>
Date: Sat, 28 Oct 2023 10:50:17 -0700
Subject: [PATCH 2613/2864] Add support to verify windows, too

---
 .github/workflows/main.yml | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6f146631..ba3aef55 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,37 +9,25 @@ env:
 
 jobs:
   test:
-    name: Test - ${{ matrix.config.python }} - ${{ matrix.config.os }}
-    runs-on: ${{ matrix.config.os }}-latest
+    name: Test - ${{ matrix.python }} - ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}-latest
 
     strategy:
       matrix:
-        config:
+        os: [ubuntu, macos, windows]
+        python: ["3.10", "3.11", "3.12"]
+        include:
           - os: ubuntu
             python: "3.8"
           - os: ubuntu
             python: "3.9"
-          - os: ubuntu
-            python: "3.10"
-          - os: ubuntu
-            python: "3.11"
-          - os: ubuntu
-            python: "3.12"
-          - os: macos
-            python: "3.10"
-          - os: macos
-            python: "3.11"
-          - os: macos
-            python: "3.12"
-          - os: windows
-            python: "3.10"
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.config.python }}
+      - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.config.python }}
+          python-version: ${{ matrix.python }}
           cache: "pip"
           cache-dependency-path: "**/requirements/*"
       - name: Install locale (Linux)
@@ -58,7 +46,7 @@ jobs:
           echo "=====  PANDOC  ====="
           pandoc --version | head -2
       - name: Run tests
-        run: tox -e py${{ matrix.config.python }}
+        run: tox -e py${{ matrix.python }}
 
   lint:
     name: Lint

From 58fd8553850a161f1656599f4d0d40f43eefbf82 Mon Sep 17 00:00:00 2001
From: Chris Rose <offline@offby1.net>
Date: Sat, 28 Oct 2023 10:54:09 -0700
Subject: [PATCH 2614/2864] inv task now uses ruff

---
 pyproject.toml |  1 +
 tasks.py       | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 826c1179..b3eaa0d1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,6 +57,7 @@ pytest = "^7.1"
 pytest-cov = "^4.0"
 pytest-sugar = "^0.9.5"
 pytest-xdist = "^2.0"
+ruff = "^0.1.3"
 tox = {version = "^3.13", optional = true}
 flake8 = "^3.8"
 flake8-import-order = "^0.18.1"
diff --git a/tasks.py b/tasks.py
index 148899c7..d41e2955 100644
--- a/tasks.py
+++ b/tasks.py
@@ -66,13 +66,20 @@ def isort(c, check=False, diff=False):
 
 
 @task
-def flake8(c):
-    c.run(f"git diff HEAD | {VENV_BIN}/flake8 --diff --max-line-length=88", pty=PTY)
+def ruff(c, fix=False, diff=False):
+    """Run Ruff to ensure code meets project standards."""
+    diff_flag, fix_flag = "", ""
+    if fix:
+        fix_flag = "--fix"
+    if diff:
+        diff_flag = "--diff"
+    c.run(f"{VENV_BIN}/ruff check {diff_flag} {fix_flag} .", pty=PTY)
 
 
 @task
-def lint(c):
-    flake8(c)
+def lint(c, fix=False, diff=False):
+    """Check code style via linting tools."""
+    ruff(c, fix=fix, diff=diff)
 
 
 @task

From 6cf6a1ffe97b23074cf4e8c223fb6174d4092ae4 Mon Sep 17 00:00:00 2001
From: Chris Rose <offline@offby1.net>
Date: Sat, 28 Oct 2023 10:58:41 -0700
Subject: [PATCH 2615/2864] Ruff lint fixes

---
 pelican/tools/pelican_themes.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 96d07c1f..b8bf1be2 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -10,7 +10,7 @@ def err(msg, die=None):
     """Print an error message and exits if an exit code is given"""
     sys.stderr.write(msg + '\n')
     if die:
-        sys.exit(die if type(die) is int else 1)
+        sys.exit(die if isinstance(die, int) else 1)
 
 
 try:
@@ -135,16 +135,16 @@ def themes():
 
 def list_themes(v=False):
     """Display the list of the themes"""
-    for t, l in themes():
+    for theme_path, link_target in themes():
         if not v:
-            t = os.path.basename(t)
-        if l:
+            theme_path = os.path.basename(theme_path)
+        if link_target:
             if v:
-                print(t + (" (symbolic link to `" + l + "')"))
+                print(theme_path + (" (symbolic link to `" + link_target + "')"))
             else:
-                print(t + '@')
+                print(theme_path + '@')
         else:
-            print(t)
+            print(theme_path)
 
 
 def remove(theme_name, v=False):

From 29b10ef6e640f017757fd0afeb67dcd607cf2e75 Mon Sep 17 00:00:00 2001
From: Chris Rose <offline@offby1.net>
Date: Sat, 28 Oct 2023 11:02:06 -0700
Subject: [PATCH 2616/2864] Use poetry directly in lints

---
 .github/workflows/main.yml | 16 ++++++++++------
 tox.ini                    | 14 --------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c0ffd9c6..b59c5316 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -62,16 +62,20 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - name: Install Poetry
+        run: pipx install poetry
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: "3.9"
-          cache: "pip"
-          cache-dependency-path: "**/requirements/*"
-      - name: Install tox
-        run: python -m pip install -U pip tox
-      - name: Check
-        run: tox -e flake8
+          cache: "poetry"
+          cache-dependency-path: "pyproject.toml"
+      - name: Install dependencies
+        run: |
+          poetry env use "3.9"
+          poetry install --no-interaction
+      - name: Run linters
+        run: poetry run invoke lint --diff
 
   docs:
     name: Build docs
diff --git a/tox.ini b/tox.ini
index c31044ca..361c52dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,17 +30,3 @@ filterwarnings =
     default::DeprecationWarning
     error:.*:Warning:pelican
 addopts = -n auto -r a
-
-[flake8]
-application-import-names = pelican
-import-order-style = cryptography
-max-line-length = 88
-
-[testenv:flake8]
-basepython = python3.9
-skip_install = true
-deps =
-    -rrequirements/style.pip
-commands =
-    flake8 --version
-    flake8 pelican

From 33d6712e8b1283354b305ea73ac0ee3331092dfc Mon Sep 17 00:00:00 2001
From: Chris Rose <offline@offby1.net>
Date: Sat, 28 Oct 2023 11:18:24 -0700
Subject: [PATCH 2617/2864] Don't install pelican's dependencies to lint

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b59c5316..b477cecb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -73,7 +73,7 @@ jobs:
       - name: Install dependencies
         run: |
           poetry env use "3.9"
-          poetry install --no-interaction
+          poetry install --no-interaction --no-root
       - name: Run linters
         run: poetry run invoke lint --diff
 

From b8d5919cd24edc0aeb322f5c1eb036810ae6b38e Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 28 Oct 2023 22:11:11 +0300
Subject: [PATCH 2618/2864] expand period tests to be more specific

---
 pelican/generators.py            |  2 +-
 pelican/tests/test_generators.py | 62 ++++++++++++++++++++++++--------
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 7ab99263..d874d97c 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -484,7 +484,7 @@ class ArticlesGenerator(CachingGenerator):
         except PelicanTemplateNotFound:
             template = self.get_template('archives')
 
-        for granularity in list(self.period_archives.keys()):
+        for granularity in self.period_archives:
             for period in self.period_archives[granularity]:
 
                 context = self.context.copy()
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index a6fe9731..ac271c1c 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -431,11 +431,12 @@ class TestArticlesGenerator(unittest.TestCase):
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         period_archives = generator.context['period_archives']
-        self.assertEqual(len(period_archives.items()), 1)
-        self.assertIn('year', period_archives.keys())
-        archive_years = [p['period'][0] for p in period_archives['year']]
-        self.assertIn(1970, archive_years)
-        self.assertIn(2014, archive_years)
+        abbreviated_archives = {
+            granularity: {period['period'] for period in periods}
+            for granularity, periods in period_archives.items()
+        }
+        expected = {'year': {(1970,), (2010,), (2012,), (2014,)}}
+        self.assertEqual(expected, abbreviated_archives)
 
         # Month archives enabled:
         settings['MONTH_ARCHIVE_SAVE_AS'] = \
@@ -448,11 +449,22 @@ class TestArticlesGenerator(unittest.TestCase):
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         period_archives = generator.context['period_archives']
-        self.assertEqual(len(period_archives.items()), 2)
-        self.assertIn('month', period_archives.keys())
-        month_archives_tuples = [p['period'] for p in period_archives['month']]
-        self.assertIn((1970, 'January'), month_archives_tuples)
-        self.assertIn((2014, 'February'), month_archives_tuples)
+        abbreviated_archives = {
+            granularity: {period['period'] for period in periods}
+            for granularity, periods in period_archives.items()
+        }
+        expected = {
+            'year': {(1970,), (2010,), (2012,), (2014,)},
+            'month': {
+                (1970, 'January'),
+                (2010, 'December'),
+                (2012, 'December'),
+                (2012, 'November'),
+                (2012, 'October'),
+                (2014, 'February'),
+            },
+        }
+        self.assertEqual(expected, abbreviated_archives)
 
         # Day archives enabled:
         settings['DAY_ARCHIVE_SAVE_AS'] = \
@@ -465,11 +477,31 @@ class TestArticlesGenerator(unittest.TestCase):
             path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
         generator.generate_context()
         period_archives = generator.context['period_archives']
-        self.assertEqual(len(period_archives.items()), 3)
-        self.assertIn('day', period_archives.keys())
-        day_archives_tuples = [p['period'] for p in period_archives['day']]
-        self.assertIn((1970, 'January', 1), day_archives_tuples)
-        self.assertIn((2014, 'February', 9), day_archives_tuples)
+        abbreviated_archives = {
+            granularity: {period['period'] for period in periods}
+            for granularity, periods in period_archives.items()
+        }
+        expected = {
+            'year': {(1970,), (2010,), (2012,), (2014,)},
+            'month': {
+                (1970, 'January'),
+                (2010, 'December'),
+                (2012, 'December'),
+                (2012, 'November'),
+                (2012, 'October'),
+                (2014, 'February'),
+            },
+            'day': {
+                (1970, 'January', 1),
+                (2010, 'December', 2),
+                (2012, 'December', 20),
+                (2012, 'November', 29),
+                (2012, 'October', 30),
+                (2012, 'October', 31),
+                (2014, 'February', 9),
+            },
+        }
+        self.assertEqual(expected, abbreviated_archives)
 
         # Further item values tests
         filtered_archives = [

From b812f2ad1c5feb010d5d33bda247c126dadd1b4b Mon Sep 17 00:00:00 2001
From: Yasser Tahiri <yasserth19@gmail.com>
Date: Sat, 28 Oct 2023 21:06:24 +0100
Subject: [PATCH 2619/2864] =?UTF-8?q?chore:=20Simplify=20boolean=20`if`=20?=
 =?UTF-8?q?expression=20=E2=9C=A8=20(#2944)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pelican/tools/pelican_themes.py | 21 ++++++++++-----------
 pelican/writers.py              | 22 ++++++++++++----------
 tasks.py                        |  6 +++---
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 96d07c1f..47f1a625 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -183,7 +183,7 @@ def install(path, v=False, u=False):
         exists = os.path.exists(theme_path)
         if exists and not u:
             err(path + ' : already exists')
-        elif exists and u:
+        elif exists:
             remove(theme_name, v)
             install(path, v)
         else:
@@ -245,15 +245,14 @@ def clean(v=False):
     c = 0
     for path in os.listdir(_THEMES_PATH):
         path = os.path.join(_THEMES_PATH, path)
-        if os.path.islink(path):
-            if is_broken_link(path):
-                if v:
-                    print('Removing {}'.format(path))
-                try:
-                    os.remove(path)
-                except OSError:
-                    print('Error: cannot remove {}'.format(path))
-                else:
-                    c += 1
+        if os.path.islink(path) and is_broken_link(path):
+            if v:
+                print('Removing {}'.format(path))
+            try:
+                os.remove(path)
+            except OSError:
+                print('Error: cannot remove {}'.format(path))
+            else:
+                c += 1
 
     print("\nRemoved {} broken links".format(c))
diff --git a/pelican/writers.py b/pelican/writers.py
index b08da1f3..afc8e4b7 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -37,13 +37,12 @@ class Writer:
             feed_title = context['SITENAME'] + ' - ' + feed_title
         else:
             feed_title = context['SITENAME']
-        feed = feed_class(
+        return feed_class(
             title=Markup(feed_title).striptags(),
             link=(self.site_url + '/'),
             feed_url=self.feed_url,
             description=context.get('SITESUBTITLE', ''),
             subtitle=context.get('SITESUBTITLE', None))
-        return feed
 
     def _add_item_to_the_feed(self, feed, item):
         title = Markup(item.title).striptags()
@@ -71,7 +70,7 @@ class Writer:
             if description == content:
                 description = None
 
-        categories = list()
+        categories = []
         if hasattr(item, 'category'):
             categories.append(item.category)
         if hasattr(item, 'tags'):
@@ -83,13 +82,17 @@ class Writer:
             unique_id=get_tag_uri(link, item.date),
             description=description,
             content=content,
-            categories=categories if categories else None,
+            categories=categories or None,
             author_name=getattr(item, 'author', ''),
             pubdate=set_date_tzinfo(
-                item.date, self.settings.get('TIMEZONE', None)),
+                item.date, self.settings.get('TIMEZONE', None)
+            ),
             updateddate=set_date_tzinfo(
                 item.modified, self.settings.get('TIMEZONE', None)
-                ) if hasattr(item, 'modified') else None)
+            )
+            if hasattr(item, 'modified')
+            else None,
+        )
 
     def _open_w(self, filename, encoding, override=False):
         """Open a file to write some content to it.
@@ -101,9 +104,8 @@ class Writer:
             if override:
                 raise RuntimeError('File %s is set to be overridden twice'
                                    % filename)
-            else:
-                logger.info('Skipping %s', filename)
-                filename = os.devnull
+            logger.info('Skipping %s', filename)
+            filename = os.devnull
         elif filename in self._written_files:
             if override:
                 logger.info('Overwriting %s', filename)
@@ -139,7 +141,7 @@ class Writer:
             'SITEURL', path_to_url(get_relative_path(path)))
 
         self.feed_domain = context.get('FEED_DOMAIN')
-        self.feed_url = self.urljoiner(self.feed_domain, url if url else path)
+        self.feed_url = self.urljoiner(self.feed_domain, url or path)
 
         feed = self._create_new_feed(feed_type, feed_title, context)
 
diff --git a/tasks.py b/tasks.py
index 148899c7..e4268ec6 100644
--- a/tasks.py
+++ b/tasks.py
@@ -8,7 +8,7 @@ PKG_NAME = "pelican"
 PKG_PATH = Path(PKG_NAME)
 DOCS_PORT = os.environ.get("DOCS_PORT", 8000)
 BIN_DIR = "bin" if os.name != "nt" else "Scripts"
-PTY = True if os.name != "nt" else False
+PTY = os.name != "nt"
 ACTIVE_VENV = os.environ.get("VIRTUAL_ENV", None)
 VENV_HOME = Path(os.environ.get("WORKON_HOME", "~/virtualenvs"))
 VENV_PATH = Path(ACTIVE_VENV) if ACTIVE_VENV else (VENV_HOME / PKG_NAME)
@@ -16,8 +16,8 @@ VENV = str(VENV_PATH.expanduser())
 VENV_BIN = Path(VENV) / Path(BIN_DIR)
 
 TOOLS = ["poetry", "pre-commit", "psutil"]
-POETRY = which("poetry") if which("poetry") else (VENV_BIN / "poetry")
-PRECOMMIT = which("pre-commit") if which("pre-commit") else (VENV_BIN / "pre-commit")
+POETRY = which("poetry") or VENV_BIN / "poetry"
+PRECOMMIT = which("pre-commit") or VENV_BIN / "pre-commit"
 
 
 @task

From 8a7e01646b4fa962f6225fa5d4cac4693876d7bb Mon Sep 17 00:00:00 2001
From: Will Thong <will@willthong.com>
Date: Sat, 28 Oct 2023 21:11:44 +0100
Subject: [PATCH 2620/2864] Add rel='nofollow' to all external hardcoded links
 in templates (#3162)

---
 pelican/tests/output/basic/a-markdown-powered-article.html    | 4 ++--
 pelican/tests/output/basic/archives.html                      | 4 ++--
 pelican/tests/output/basic/article-1.html                     | 4 ++--
 pelican/tests/output/basic/article-2.html                     | 4 ++--
 pelican/tests/output/basic/article-3.html                     | 4 ++--
 pelican/tests/output/basic/author/alexis-metaireau.html       | 4 ++--
 pelican/tests/output/basic/authors.html                       | 4 ++--
 pelican/tests/output/basic/categories.html                    | 4 ++--
 pelican/tests/output/basic/category/bar.html                  | 4 ++--
 pelican/tests/output/basic/category/cat1.html                 | 4 ++--
 pelican/tests/output/basic/category/misc.html                 | 4 ++--
 pelican/tests/output/basic/category/yeah.html                 | 4 ++--
 .../output/basic/drafts/a-draft-article-without-date.html     | 4 ++--
 pelican/tests/output/basic/drafts/a-draft-article.html        | 4 ++--
 pelican/tests/output/basic/filename_metadata-example.html     | 4 ++--
 pelican/tests/output/basic/index.html                         | 4 ++--
 pelican/tests/output/basic/oh-yeah-fr.html                    | 4 ++--
 pelican/tests/output/basic/oh-yeah.html                       | 4 ++--
 pelican/tests/output/basic/override/index.html                | 4 ++--
 .../tests/output/basic/pages/this-is-a-test-hidden-page.html  | 4 ++--
 pelican/tests/output/basic/pages/this-is-a-test-page.html     | 4 ++--
 pelican/tests/output/basic/second-article-fr.html             | 4 ++--
 pelican/tests/output/basic/second-article.html                | 4 ++--
 pelican/tests/output/basic/tag/bar.html                       | 4 ++--
 pelican/tests/output/basic/tag/baz.html                       | 4 ++--
 pelican/tests/output/basic/tag/foo.html                       | 4 ++--
 pelican/tests/output/basic/tag/foobar.html                    | 4 ++--
 pelican/tests/output/basic/tag/oh.html                        | 4 ++--
 pelican/tests/output/basic/tag/yeah.html                      | 4 ++--
 pelican/tests/output/basic/tags.html                          | 4 ++--
 pelican/tests/output/basic/this-is-a-super-article.html       | 4 ++--
 pelican/tests/output/basic/unbelievable.html                  | 4 ++--
 pelican/tests/output/custom/a-markdown-powered-article.html   | 4 ++--
 pelican/tests/output/custom/archives.html                     | 4 ++--
 pelican/tests/output/custom/article-1.html                    | 4 ++--
 pelican/tests/output/custom/article-2.html                    | 4 ++--
 pelican/tests/output/custom/article-3.html                    | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau.html      | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau2.html     | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau3.html     | 4 ++--
 pelican/tests/output/custom/authors.html                      | 4 ++--
 pelican/tests/output/custom/categories.html                   | 4 ++--
 pelican/tests/output/custom/category/bar.html                 | 4 ++--
 pelican/tests/output/custom/category/cat1.html                | 4 ++--
 pelican/tests/output/custom/category/misc.html                | 4 ++--
 pelican/tests/output/custom/category/yeah.html                | 4 ++--
 .../output/custom/drafts/a-draft-article-without-date.html    | 4 ++--
 pelican/tests/output/custom/drafts/a-draft-article.html       | 4 ++--
 pelican/tests/output/custom/filename_metadata-example.html    | 4 ++--
 pelican/tests/output/custom/index.html                        | 4 ++--
 pelican/tests/output/custom/index2.html                       | 4 ++--
 pelican/tests/output/custom/index3.html                       | 4 ++--
 pelican/tests/output/custom/jinja2_template.html              | 4 ++--
 pelican/tests/output/custom/oh-yeah-fr.html                   | 4 ++--
 pelican/tests/output/custom/oh-yeah.html                      | 4 ++--
 pelican/tests/output/custom/override/index.html               | 4 ++--
 .../tests/output/custom/pages/this-is-a-test-hidden-page.html | 4 ++--
 pelican/tests/output/custom/pages/this-is-a-test-page.html    | 4 ++--
 pelican/tests/output/custom/second-article-fr.html            | 4 ++--
 pelican/tests/output/custom/second-article.html               | 4 ++--
 pelican/tests/output/custom/tag/bar.html                      | 4 ++--
 pelican/tests/output/custom/tag/baz.html                      | 4 ++--
 pelican/tests/output/custom/tag/foo.html                      | 4 ++--
 pelican/tests/output/custom/tag/foobar.html                   | 4 ++--
 pelican/tests/output/custom/tag/oh.html                       | 4 ++--
 pelican/tests/output/custom/tag/yeah.html                     | 4 ++--
 pelican/tests/output/custom/tags.html                         | 4 ++--
 pelican/tests/output/custom/this-is-a-super-article.html      | 4 ++--
 pelican/tests/output/custom/unbelievable.html                 | 4 ++--
 pelican/tests/output/custom_locale/archives.html              | 4 ++--
 .../tests/output/custom_locale/author/alexis-metaireau.html   | 4 ++--
 .../tests/output/custom_locale/author/alexis-metaireau2.html  | 4 ++--
 .../tests/output/custom_locale/author/alexis-metaireau3.html  | 4 ++--
 pelican/tests/output/custom_locale/authors.html               | 4 ++--
 pelican/tests/output/custom_locale/categories.html            | 4 ++--
 pelican/tests/output/custom_locale/category/bar.html          | 4 ++--
 pelican/tests/output/custom_locale/category/cat1.html         | 4 ++--
 pelican/tests/output/custom_locale/category/misc.html         | 4 ++--
 pelican/tests/output/custom_locale/category/yeah.html         | 4 ++--
 .../custom_locale/drafts/a-draft-article-without-date.html    | 4 ++--
 .../tests/output/custom_locale/drafts/a-draft-article.html    | 4 ++--
 pelican/tests/output/custom_locale/index.html                 | 4 ++--
 pelican/tests/output/custom_locale/index2.html                | 4 ++--
 pelican/tests/output/custom_locale/index3.html                | 4 ++--
 pelican/tests/output/custom_locale/jinja2_template.html       | 4 ++--
 pelican/tests/output/custom_locale/oh-yeah-fr.html            | 4 ++--
 pelican/tests/output/custom_locale/override/index.html        | 4 ++--
 .../custom_locale/pages/this-is-a-test-hidden-page.html       | 4 ++--
 .../tests/output/custom_locale/pages/this-is-a-test-page.html | 4 ++--
 .../posts/2010/décembre/02/this-is-a-super-article/index.html | 4 ++--
 .../posts/2010/octobre/15/unbelievable/index.html             | 4 ++--
 .../custom_locale/posts/2010/octobre/20/oh-yeah/index.html    | 4 ++--
 .../posts/2011/avril/20/a-markdown-powered-article/index.html | 4 ++--
 .../custom_locale/posts/2011/février/17/article-1/index.html  | 4 ++--
 .../custom_locale/posts/2011/février/17/article-2/index.html  | 4 ++--
 .../custom_locale/posts/2011/février/17/article-3/index.html  | 4 ++--
 .../posts/2012/février/29/second-article/index.html           | 4 ++--
 .../2012/novembre/30/filename_metadata-example/index.html     | 4 ++--
 pelican/tests/output/custom_locale/second-article-fr.html     | 4 ++--
 pelican/tests/output/custom_locale/tag/bar.html               | 4 ++--
 pelican/tests/output/custom_locale/tag/baz.html               | 4 ++--
 pelican/tests/output/custom_locale/tag/foo.html               | 4 ++--
 pelican/tests/output/custom_locale/tag/foobar.html            | 4 ++--
 pelican/tests/output/custom_locale/tag/oh.html                | 4 ++--
 pelican/tests/output/custom_locale/tag/yeah.html              | 4 ++--
 pelican/tests/output/custom_locale/tags.html                  | 4 ++--
 pelican/themes/notmyidea/templates/base.html                  | 4 ++--
 pelican/themes/notmyidea/templates/twitter.html               | 2 +-
 pelican/themes/simple/templates/base.html                     | 4 ++--
 109 files changed, 217 insertions(+), 217 deletions(-)

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index ca9b62eb..0098ccac 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -58,10 +58,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 93c1d5be..e3a6c7df 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -60,10 +60,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 4dee2eb6..961ad390 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -57,10 +57,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 7e5995c0..e5389d35 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -57,10 +57,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index b0b8ed1b..d23e5da2 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -57,10 +57,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 87eaa461..12e05ec8 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -102,10 +102,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index 937a3085..cff1360b 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -42,10 +42,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 96a61c73..cc54f4a3 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -45,10 +45,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 65b7b04e..1f9c0d8d 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -58,10 +58,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index 62fb034c..ca47821b 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -115,10 +115,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index ed06ebc0..58490001 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -126,10 +126,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 9d2f30a2..815d42e4 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -66,10 +66,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
index bc30dabd..5a2d367b 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
@@ -58,10 +58,10 @@ listed anywhere else.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index 4abd4946..a0bed241 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -58,10 +58,10 @@ listed anywhere else.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index ae19ceb1..f3ae9cea 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -57,10 +57,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index 711dd2bd..fd334d38 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -265,10 +265,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/oh-yeah-fr.html b/pelican/tests/output/basic/oh-yeah-fr.html
index 183754ff..3fdfeae9 100644
--- a/pelican/tests/output/basic/oh-yeah-fr.html
+++ b/pelican/tests/output/basic/oh-yeah-fr.html
@@ -61,10 +61,10 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index f63302d2..f8d3d227 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -69,10 +69,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 1d5531d7..a74d802f 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -41,10 +41,10 @@ at a custom location.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 8c14e354..1c836201 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -41,10 +41,10 @@ Anyone can see this page but it's not linked to anywhere!</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index 1fdb846f..372eff76 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -42,10 +42,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index b49c4517..514c5585 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -61,10 +61,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 2b3bca88..365f99cd 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -61,10 +61,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index a78c08f9..047d772a 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -114,10 +114,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 0b7d04ab..51518620 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -57,10 +57,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 6ec55bee..0214cf26 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -84,10 +84,10 @@ as well as <strong>inline markup</strong>.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index def1d0c6..ab07e87f 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -66,10 +66,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index 11b06e61..f3af2a2f 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -40,10 +40,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 565a3a25..f04affa8 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -58,10 +58,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index 6dce2632..db5d6634 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -47,10 +47,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 8681bb1b..6ac68664 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -75,10 +75,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 8a8b4f5a..d87c31ea 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -89,10 +89,10 @@ pelican.conf, it will have nothing in default.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 36fb242f..422421d8 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -95,10 +95,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index e1dad53d..34c3f4cd 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -79,10 +79,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 6f3e0cc1..226489ea 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -94,10 +94,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 094471de..1a835849 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -94,10 +94,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 3d93d807..c3076e98 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -94,10 +94,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index 95653b66..a9c73e6b 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -153,10 +153,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 281c7ad8..41f00605 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -168,10 +168,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 2296ef04..45a5f0d1 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -118,10 +118,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index 303e79c4..de18662e 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -61,10 +61,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 56eaad05..b558d389 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -64,10 +64,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index bd277a83..6f3e9f5b 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -77,10 +77,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 73df4388..d9b1e41f 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -146,10 +146,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 5a8b373c..7cc5bf9b 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -157,10 +157,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 8bfc1f48..957c76ae 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -85,10 +85,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
index 12ddfbeb..94d2c8e9 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
@@ -80,10 +80,10 @@ listed anywhere else.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 77b12cf3..c926c14f 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -80,10 +80,10 @@ listed anywhere else.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 2c5e8178..70d41179 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -94,10 +94,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 076cf519..ceb6e4f5 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -153,10 +153,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 13a857a8..ddd4e96e 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -168,10 +168,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 375c1621..698139a0 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -118,10 +118,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index cefce74f..27a6df8e 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -56,10 +56,10 @@ Some text
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index ec75b731..f30c9b63 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -98,10 +98,10 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 109525a5..20b90351 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -103,10 +103,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 004c38fd..9d1c4f46 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -60,10 +60,10 @@ at a custom location.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 652fc7d0..bd0d03ed 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -60,10 +60,10 @@ Anyone can see this page but it's not linked to anywhere!</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 2bcefd3d..16d17c3b 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -61,10 +61,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 09f43888..ff7af42d 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -98,10 +98,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index f21a5495..a71df8cf 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -98,10 +98,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 1efa16e7..719ea12a 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -136,10 +136,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index c524db13..048dc5ce 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -94,10 +94,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index ca3f40f2..637bce0b 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -106,10 +106,10 @@ as well as <strong>inline markup</strong>.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index ccca5477..296ee098 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -85,10 +85,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index f3c70495..4a7ce439 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -59,10 +59,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 96767503..78618480 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -77,10 +77,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index b23f468f..1a8ef572 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -66,10 +66,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index eb31a851..ab9dc16f 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -109,10 +109,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index e1a1984d..a7ad0efa 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -126,10 +126,10 @@ pelican.conf, it will have nothing in default.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index df9dd241..25ef1c6c 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -79,10 +79,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 6650fb9f..41a21a98 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -153,10 +153,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 5fef108c..6412784f 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -168,10 +168,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 4bbcb948..2679b0a6 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -118,10 +118,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index aed3bd79..0907ff7c 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -61,10 +61,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index d7655787..01dc680a 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -64,10 +64,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index 7d9abf0d..d3dc29de 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -77,10 +77,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index f8b315ee..5278242c 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -146,10 +146,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index c6dce612..82a77efb 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -157,10 +157,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 1fd346ff..f0dff1b6 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -85,10 +85,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
index bb80bd10..788f01a3 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
@@ -80,10 +80,10 @@ listed anywhere else.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 3ce73427..bd54bc56 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -80,10 +80,10 @@ listed anywhere else.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index e3079e41..4a661093 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -153,10 +153,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 8067a087..60fee085 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -168,10 +168,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index c7c9dae8..76597e82 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -118,10 +118,10 @@ pelican.conf, it will …</p></div>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index d55744fa..01957524 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -56,10 +56,10 @@ Some text
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 977c14e3..01c7800f 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -98,10 +98,10 @@ Translations:
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index fa3bcb10..a5fcbe04 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -60,10 +60,10 @@ at a custom location.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index 86eb888b..3e33e3fc 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -60,10 +60,10 @@ Anyone can see this page but it's not linked to anywhere!</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index 7e835b50..e4f1d60b 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -61,10 +61,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index 7b3ce9cc..4b522248 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -109,10 +109,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 7f2ae039..f27464f8 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -126,10 +126,10 @@ pelican.conf, it will have nothing in default.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index 0e272f86..b47732b7 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -103,10 +103,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index ae1e27dd..80e57bc3 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -95,10 +95,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index e7d99cc7..c427e2c7 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -94,10 +94,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index d8ba2cc6..88c7adf2 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -94,10 +94,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index d2fa6936..257fb6dd 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -94,10 +94,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 5a718d8b..3b3bd10a 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -98,10 +98,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index ea75a1db..2618f705 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -94,10 +94,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index e6989c42..7edf7710 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -98,10 +98,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index e6546987..e0e0487f 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -136,10 +136,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 18976227..7fe3b54c 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -94,10 +94,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 2c3c7622..a31e348b 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -106,10 +106,10 @@ as well as <strong>inline markup</strong>.</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 23b21342..a33f3362 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -85,10 +85,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index 096b2727..5d021c7c 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -59,10 +59,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 29101c8d..72b905f5 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -77,10 +77,10 @@ YEAH !</p>
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index e4683371..88b02724 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -66,10 +66,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 <script type="text/javascript">
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 8483f268..6c8c20a7 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -71,10 +71,10 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
 
-                <p>The theme is by <a href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
         </footer><!-- /#contentinfo -->
 
 {% include 'analytics.html' %}
diff --git a/pelican/themes/notmyidea/templates/twitter.html b/pelican/themes/notmyidea/templates/twitter.html
index bf78c32d..48184ebe 100644
--- a/pelican/themes/notmyidea/templates/twitter.html
+++ b/pelican/themes/notmyidea/templates/twitter.html
@@ -1,3 +1,3 @@
 {% if TWITTER_USERNAME %}
-<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="https://platform.twitter.com/widgets.js"></script>
+<a rel="nofollow" href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="https://platform.twitter.com/widgets.js"></script>
 {% endif %}
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 3125e5aa..94a16930 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -58,8 +58,8 @@
         </main>
         <footer>
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="https://www.python.org/">Python</a>.
+                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer>
 </body>

From 3a6ae72333f447dececb8552800e507a619444c6 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Sat, 28 Oct 2023 17:01:33 -0500
Subject: [PATCH 2621/2864] Add a "coverage" task to generate a coverage report

Add a one-liner about "invoke" in docs.
---
 docs/contribute.rst | 3 +++
 tasks.py            | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 64c144d6..cfbfe351 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -75,6 +75,9 @@ via::
 
     invoke tests
 
+(For more on Invoke, see ``invoke -l`` to list tasks, or
+https://pyinvoke.org for documentation.)
+
 In addition to running the test suite, it is important to also ensure that any
 lines you changed conform to code style guidelines. You can check that via::
 
diff --git a/tasks.py b/tasks.py
index efdef8a4..e9f65db3 100644
--- a/tasks.py
+++ b/tasks.py
@@ -44,6 +44,13 @@ def tests(c):
     c.run(f"{VENV_BIN}/pytest", pty=PTY)
 
 
+@task
+def coverage(c):
+    """Generate code coverage of running the test suite."""
+    c.run(f"{VENV_BIN}/pytest --cov=pelican", pty=PTY)
+    c.run(f"{VENV_BIN}/coverage html", pty=PTY)
+
+
 @task
 def black(c, check=False, diff=False):
     """Run Black auto-formatter, optionally with --check or --diff"""

From fad2ff7ae3cd0ea8b974db5fe42de7383da679c1 Mon Sep 17 00:00:00 2001
From: boxydog <93335439+boxydog@users.noreply.github.com>
Date: Sat, 28 Oct 2023 17:40:40 -0500
Subject: [PATCH 2622/2864] Add unit test utilities temporary_locale and
 TestCaseWithCLocale (#3224)

---
 pelican/tests/support.py         |  13 +++
 pelican/tests/test_generators.py |  30 ++-----
 pelican/tests/test_importer.py   |  28 ++-----
 pelican/tests/test_utils.py      | 133 ++++++++++++++++---------------
 pelican/utils.py                 |  26 ++++--
 5 files changed, 111 insertions(+), 119 deletions(-)

diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 720e4d0e..3e4da785 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -254,3 +254,16 @@ class LoggedTestCase(unittest.TestCase):
             actual, count,
             msg='expected {} occurrences of {!r}, but found {}'.format(
                 count, msg, actual))
+
+
+class TestCaseWithCLocale(unittest.TestCase):
+    """Set locale to C for each test case, then restore afterward.
+
+    Use utils.temporary_locale if you want a context manager ("with" statement).
+    """
+    def setUp(self):
+        self.old_locale = locale.setlocale(locale.LC_ALL)
+        locale.setlocale(locale.LC_ALL, 'C')
+
+    def tearDown(self):
+        locale.setlocale(locale.LC_ALL, self.old_locale)
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index ac271c1c..05c37269 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1,4 +1,3 @@
-import locale
 import os
 import sys
 from shutil import copy, rmtree
@@ -9,26 +8,21 @@ from pelican.generators import (ArticlesGenerator, Generator, PagesGenerator,
                                 PelicanTemplateNotFound, StaticGenerator,
                                 TemplatePagesGenerator)
 from pelican.tests.support import (can_symlink, get_context, get_settings,
-                                   unittest)
+                                   unittest, TestCaseWithCLocale)
 from pelican.writers import Writer
 
-
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_DIR = os.path.join(CUR_DIR, 'content')
 
 
-class TestGenerator(unittest.TestCase):
+class TestGenerator(TestCaseWithCLocale):
     def setUp(self):
-        self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
+        super().setUp()
         self.settings = get_settings()
         self.settings['READERS'] = {'asc': None}
         self.generator = Generator(self.settings.copy(), self.settings,
                                    CUR_DIR, self.settings['THEME'], None)
 
-    def tearDown(self):
-        locale.setlocale(locale.LC_ALL, self.old_locale)
-
     def test_include_path(self):
         self.settings['IGNORE_FILES'] = {'ignored1.rst', 'ignored2.rst'}
 
@@ -408,8 +402,6 @@ class TestArticlesGenerator(unittest.TestCase):
     def test_period_archives_context(self):
         """Test correctness of the period_archives context values."""
 
-        old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
         settings = get_settings()
         settings['CACHE_PATH'] = self.temp_cache
 
@@ -532,15 +524,11 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertEqual(sample_archive['dates'][0].title, dates[0].title)
         self.assertEqual(sample_archive['dates'][0].date, dates[0].date)
 
-        locale.setlocale(locale.LC_ALL, old_locale)
-
     def test_period_in_timeperiod_archive(self):
         """
         Test that the context of a generated period_archive is passed
         'period' : a tuple of year, month, day according to the time period
         """
-        old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
         settings = get_settings()
 
         settings['YEAR_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/index.html'
@@ -625,7 +613,6 @@ class TestArticlesGenerator(unittest.TestCase):
                                  dates=dates, template_name='period_archives',
                                  url="posts/1970/Jan/01/",
                                  all_articles=generator.articles)
-        locale.setlocale(locale.LC_ALL, old_locale)
 
     def test_nonexistent_template(self):
         """Attempt to load a non-existent template"""
@@ -926,20 +913,18 @@ class TestPageGenerator(unittest.TestCase):
                       context['static_links'])
 
 
-class TestTemplatePagesGenerator(unittest.TestCase):
+class TestTemplatePagesGenerator(TestCaseWithCLocale):
 
     TEMPLATE_CONTENT = "foo: {{ foo }}"
 
     def setUp(self):
+        super().setUp()
         self.temp_content = mkdtemp(prefix='pelicantests.')
         self.temp_output = mkdtemp(prefix='pelicantests.')
-        self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
 
     def tearDown(self):
         rmtree(self.temp_content)
         rmtree(self.temp_output)
-        locale.setlocale(locale.LC_ALL, self.old_locale)
 
     def test_generate_output(self):
 
@@ -1299,18 +1284,15 @@ class TestStaticGenerator(unittest.TestCase):
         self.assertTrue(os.path.isfile(self.endfile))
 
 
-class TestJinja2Environment(unittest.TestCase):
+class TestJinja2Environment(TestCaseWithCLocale):
 
     def setUp(self):
         self.temp_content = mkdtemp(prefix='pelicantests.')
         self.temp_output = mkdtemp(prefix='pelicantests.')
-        self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
 
     def tearDown(self):
         rmtree(self.temp_content)
         rmtree(self.temp_output)
-        locale.setlocale(locale.LC_ALL, self.old_locale)
 
     def _test_jinja2_helper(self, additional_settings, content, expected):
         settings = get_settings()
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 0d9586f0..870d3001 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -1,4 +1,3 @@
-import locale
 import os
 import re
 from posixpath import join as posix_join
@@ -6,7 +5,7 @@ from unittest.mock import patch
 
 from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder,
-                                   unittest)
+                                   unittest, TestCaseWithCLocale)
 from pelican.tools.pelican_import import (blogger2fields, build_header,
                                           build_markdown_header,
                                           decode_wp_content,
@@ -16,7 +15,6 @@ from pelican.tools.pelican_import import (blogger2fields, build_header,
                                           )
 from pelican.utils import path_to_file_url, slugify
 
-
 CUR_DIR = os.path.abspath(os.path.dirname(__file__))
 BLOGGER_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'bloggerexport.xml')
 WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
@@ -38,19 +36,9 @@ except ImportError:
     LXML = False
 
 
-class TestWithOsDefaults(unittest.TestCase):
-    """Set locale to C and timezone to UTC for tests, then restore."""
-    def setUp(self):
-        self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
-
-    def tearDown(self):
-        locale.setlocale(locale.LC_ALL, self.old_locale)
-
-
 @skipIfNoExecutable(['pandoc', '--version'])
 @unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
-class TestBloggerXmlImporter(TestWithOsDefaults):
+class TestBloggerXmlImporter(TestCaseWithCLocale):
 
     def setUp(self):
         super().setUp()
@@ -95,7 +83,7 @@ class TestBloggerXmlImporter(TestWithOsDefaults):
 
 @skipIfNoExecutable(['pandoc', '--version'])
 @unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
-class TestWordpressXmlImporter(TestWithOsDefaults):
+class TestWordpressXmlImporter(TestCaseWithCLocale):
 
     def setUp(self):
         super().setUp()
@@ -433,15 +421,11 @@ class TestBuildHeader(unittest.TestCase):
 
 @unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
 @unittest.skipUnless(LXML, 'Needs lxml module')
-class TestWordpressXMLAttachements(unittest.TestCase):
+class TestWordpressXMLAttachements(TestCaseWithCLocale):
     def setUp(self):
-        self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
+        super().setUp()
         self.attachments = get_attachments(WORDPRESS_XML_SAMPLE)
 
-    def tearDown(self):
-        locale.setlocale(locale.LC_ALL, self.old_locale)
-
     def test_recognise_attachments(self):
         self.assertTrue(self.attachments)
         self.assertTrue(len(self.attachments.keys()) == 3)
@@ -485,7 +469,7 @@ class TestWordpressXMLAttachements(unittest.TestCase):
                 directory)
 
 
-class TestTumblrImporter(TestWithOsDefaults):
+class TestTumblrImporter(TestCaseWithCLocale):
     @patch("pelican.tools.pelican_import._get_tumblr_posts")
     def test_posts(self, get):
         def get_posts(api_key, blogname, offset=0):
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index d8296285..40aff005 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -484,33 +484,25 @@ class TestUtils(LoggedTestCase):
                          locale_available('Turkish'),
                          'Turkish locale needed')
     def test_strftime_locale_dependent_turkish(self):
-        # store current locale
-        old_locale = locale.setlocale(locale.LC_ALL)
+        temp_locale = 'Turkish' if platform == 'win32' else 'tr_TR.UTF-8'
 
-        if platform == 'win32':
-            locale.setlocale(locale.LC_ALL, 'Turkish')
-        else:
-            locale.setlocale(locale.LC_ALL, 'tr_TR.UTF-8')
+        with utils.temporary_locale(temp_locale):
+            d = utils.SafeDatetime(2012, 8, 29)
 
-        d = utils.SafeDatetime(2012, 8, 29)
+            # simple
+            self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 Ağustos 2012')
+            self.assertEqual(utils.strftime(d, '%A, %d %B %Y'),
+                             'Çarşamba, 29 Ağustos 2012')
 
-        # simple
-        self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 Ağustos 2012')
-        self.assertEqual(utils.strftime(d, '%A, %d %B %Y'),
-                         'Çarşamba, 29 Ağustos 2012')
+            # with text
+            self.assertEqual(
+                utils.strftime(d, 'Yayınlanma tarihi: %A, %d %B %Y'),
+                'Yayınlanma tarihi: Çarşamba, 29 Ağustos 2012')
 
-        # with text
-        self.assertEqual(
-            utils.strftime(d, 'Yayınlanma tarihi: %A, %d %B %Y'),
-            'Yayınlanma tarihi: Çarşamba, 29 Ağustos 2012')
-
-        # non-ascii format candidate (someone might pass it… for some reason)
-        self.assertEqual(
-            utils.strftime(d, '%Y yılında %üretim artışı'),
-            '2012 yılında %üretim artışı')
-
-        # restore locale back
-        locale.setlocale(locale.LC_ALL, old_locale)
+            # non-ascii format candidate (someone might pass it… for some reason)
+            self.assertEqual(
+                utils.strftime(d, '%Y yılında %üretim artışı'),
+                '2012 yılında %üretim artışı')
 
     # test the output of utils.strftime in a different locale
     # French locale
@@ -518,34 +510,26 @@ class TestUtils(LoggedTestCase):
                          locale_available('French'),
                          'French locale needed')
     def test_strftime_locale_dependent_french(self):
-        # store current locale
-        old_locale = locale.setlocale(locale.LC_ALL)
+        temp_locale = 'French' if platform == 'win32' else 'fr_FR.UTF-8'
 
-        if platform == 'win32':
-            locale.setlocale(locale.LC_ALL, 'French')
-        else:
-            locale.setlocale(locale.LC_ALL, 'fr_FR.UTF-8')
+        with utils.temporary_locale(temp_locale):
+            d = utils.SafeDatetime(2012, 8, 29)
 
-        d = utils.SafeDatetime(2012, 8, 29)
+            # simple
+            self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 août 2012')
 
-        # simple
-        self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 août 2012')
+            # depending on OS, the first letter is m or M
+            self.assertTrue(utils.strftime(d, '%A') in ('mercredi', 'Mercredi'))
 
-        # depending on OS, the first letter is m or M
-        self.assertTrue(utils.strftime(d, '%A') in ('mercredi', 'Mercredi'))
+            # with text
+            self.assertEqual(
+                utils.strftime(d, 'Écrit le %d %B %Y'),
+                'Écrit le 29 août 2012')
 
-        # with text
-        self.assertEqual(
-            utils.strftime(d, 'Écrit le %d %B %Y'),
-            'Écrit le 29 août 2012')
-
-        # non-ascii format candidate (someone might pass it… for some reason)
-        self.assertEqual(
-            utils.strftime(d, '%écrits en %Y'),
-            '%écrits en 2012')
-
-        # restore locale back
-        locale.setlocale(locale.LC_ALL, old_locale)
+            # non-ascii format candidate (someone might pass it… for some reason)
+            self.assertEqual(
+                utils.strftime(d, '%écrits en %Y'),
+                '%écrits en 2012')
 
     def test_maybe_pluralize(self):
         self.assertEqual(
@@ -558,6 +542,23 @@ class TestUtils(LoggedTestCase):
             utils.maybe_pluralize(2, 'Article', 'Articles'),
             '2 Articles')
 
+    def test_temporary_locale(self):
+        # test with default LC category
+        orig_locale = locale.setlocale(locale.LC_ALL)
+
+        with utils.temporary_locale('C'):
+            self.assertEqual(locale.setlocale(locale.LC_ALL), 'C')
+
+        self.assertEqual(locale.setlocale(locale.LC_ALL), orig_locale)
+
+        # test with custom LC category
+        orig_locale = locale.setlocale(locale.LC_TIME)
+
+        with utils.temporary_locale('C', locale.LC_TIME):
+            self.assertEqual(locale.setlocale(locale.LC_TIME), 'C')
+
+        self.assertEqual(locale.setlocale(locale.LC_TIME), orig_locale)
+
 
 class TestCopy(unittest.TestCase):
     '''Tests the copy utility'''
@@ -673,27 +674,27 @@ class TestDateFormatter(unittest.TestCase):
     def test_french_strftime(self):
         # This test tries to reproduce an issue that
         # occurred with python3.3 under macos10 only
-        if platform == 'win32':
-            locale.setlocale(locale.LC_ALL, 'French')
-        else:
-            locale.setlocale(locale.LC_ALL, 'fr_FR.UTF-8')
-        date = utils.SafeDatetime(2014, 8, 14)
-        # we compare the lower() dates since macos10 returns
-        # "Jeudi" for %A whereas linux reports "jeudi"
-        self.assertEqual(
-            'jeudi, 14 août 2014',
-            utils.strftime(date, date_format="%A, %d %B %Y").lower())
-        df = utils.DateFormatter()
-        self.assertEqual(
-            'jeudi, 14 août 2014',
-            df(date, date_format="%A, %d %B %Y").lower())
+        temp_locale = 'French' if platform == 'win32' else 'fr_FR.UTF-8'
+
+        with utils.temporary_locale(temp_locale):
+            date = utils.SafeDatetime(2014, 8, 14)
+            # we compare the lower() dates since macos10 returns
+            # "Jeudi" for %A whereas linux reports "jeudi"
+            self.assertEqual(
+                'jeudi, 14 août 2014',
+                utils.strftime(date, date_format="%A, %d %B %Y").lower())
+            df = utils.DateFormatter()
+            self.assertEqual(
+                'jeudi, 14 août 2014',
+                df(date, date_format="%A, %d %B %Y").lower())
+
         # Let us now set the global locale to C:
-        locale.setlocale(locale.LC_ALL, 'C')
-        # DateFormatter should still work as expected
-        # since it is the whole point of DateFormatter
-        # (This is where pre-2014/4/15 code fails on macos10)
-        df_date = df(date, date_format="%A, %d %B %Y").lower()
-        self.assertEqual('jeudi, 14 août 2014', df_date)
+        with utils.temporary_locale('C'):
+            # DateFormatter should still work as expected
+            # since it is the whole point of DateFormatter
+            # (This is where pre-2014/4/15 code fails on macos10)
+            df_date = df(date, date_format="%A, %d %B %Y").lower()
+            self.assertEqual('jeudi, 14 août 2014', df_date)
 
     @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
                          locale_available('French'),
diff --git a/pelican/utils.py b/pelican/utils.py
index 3c67369b..e1bed154 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -116,18 +116,14 @@ class DateFormatter:
         self.locale = locale.setlocale(locale.LC_TIME)
 
     def __call__(self, date, date_format):
-        old_lc_time = locale.setlocale(locale.LC_TIME)
-        old_lc_ctype = locale.setlocale(locale.LC_CTYPE)
 
-        locale.setlocale(locale.LC_TIME, self.locale)
         # on OSX, encoding from LC_CTYPE determines the unicode output in PY3
         # make sure it's same as LC_TIME
-        locale.setlocale(locale.LC_CTYPE, self.locale)
+        with temporary_locale(self.locale, locale.LC_TIME), \
+          temporary_locale(self.locale, locale.LC_CTYPE):
 
-        formatted = strftime(date, date_format)
+            formatted = strftime(date, date_format)
 
-        locale.setlocale(locale.LC_TIME, old_lc_time)
-        locale.setlocale(locale.LC_CTYPE, old_lc_ctype)
         return formatted
 
 
@@ -872,3 +868,19 @@ def maybe_pluralize(count, singular, plural):
     if count == 1:
         selection = singular
     return '{} {}'.format(count, selection)
+
+
+@contextmanager
+def temporary_locale(temp_locale=None, lc_category=locale.LC_ALL):
+    '''
+    Enable code to run in a context with a temporary locale
+    Resets the locale back when exiting context.
+
+    Use tests.support.TestCaseWithCLocale if you want every unit test in a
+    class to use the C locale.
+    '''
+    orig_locale = locale.setlocale(lc_category)
+    if temp_locale:
+        locale.setlocale(lc_category, temp_locale)
+    yield
+    locale.setlocale(lc_category, orig_locale)

From a76a4195856f6dde3e00345999727d59bb201f07 Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Sat, 28 Oct 2023 08:38:29 +0200
Subject: [PATCH 2623/2864] migrate configuration to PEP621 compatible one

---
 .pdm-python    |    1 +
 pdm.lock       | 1431 ++++++++++++++++++++++++++++++++++++++++++++++++
 pyproject.toml |  123 +++--
 3 files changed, 1500 insertions(+), 55 deletions(-)
 create mode 100644 .pdm-python
 create mode 100644 pdm.lock

diff --git a/.pdm-python b/.pdm-python
new file mode 100644
index 00000000..c740e1bd
--- /dev/null
+++ b/.pdm-python
@@ -0,0 +1 @@
+/Users/eliaskirchgaessner/Development/FOSS/pelican/.venv/bin/python
\ No newline at end of file
diff --git a/pdm.lock b/pdm.lock
new file mode 100644
index 00000000..0bfddb5e
--- /dev/null
+++ b/pdm.lock
@@ -0,0 +1,1431 @@
+# This file is @generated by PDM.
+# It is not intended for manual editing.
+
+[metadata]
+groups = ["default", "dev"]
+cross_platform = true
+static_urls = false
+lock_version = "4.3"
+content_hash = "sha256:0774056f38e53e29569c2888786ef845063ad0abcdaa8910c7795619996ef224"
+
+[[package]]
+name = "alabaster"
+version = "0.7.13"
+requires_python = ">=3.6"
+summary = "A configurable sidebar-enabled Sphinx theme"
+files = [
+    {file = "alabaster-0.7.13-py3-none-any.whl", hash = "sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"},
+    {file = "alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"},
+]
+
+[[package]]
+name = "appdirs"
+version = "1.4.4"
+summary = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+files = [
+    {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"},
+    {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"},
+]
+
+[[package]]
+name = "attrs"
+version = "23.1.0"
+requires_python = ">=3.7"
+summary = "Classes Without Boilerplate"
+dependencies = [
+    "importlib-metadata; python_version < \"3.8\"",
+]
+files = [
+    {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"},
+    {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"},
+]
+
+[[package]]
+name = "babel"
+version = "2.13.0"
+requires_python = ">=3.7"
+summary = "Internationalization utilities"
+dependencies = [
+    "pytz>=2015.7; python_version < \"3.9\"",
+]
+files = [
+    {file = "Babel-2.13.0-py3-none-any.whl", hash = "sha256:fbfcae1575ff78e26c7449136f1abbefc3c13ce542eeb13d43d50d8b047216ec"},
+    {file = "Babel-2.13.0.tar.gz", hash = "sha256:04c3e2d28d2b7681644508f836be388ae49e0cfe91465095340395b60d00f210"},
+]
+
+[[package]]
+name = "backports-zoneinfo"
+version = "0.2.1"
+requires_python = ">=3.6"
+summary = "Backport of the standard library zoneinfo module"
+files = [
+    {file = "backports.zoneinfo-0.2.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:f04e857b59d9d1ccc39ce2da1021d196e47234873820cbeaad210724b1ee28ac"},
+    {file = "backports.zoneinfo-0.2.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:17746bd546106fa389c51dbea67c8b7c8f0d14b5526a579ca6ccf5ed72c526cf"},
+    {file = "backports.zoneinfo-0.2.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:5c144945a7752ca544b4b78c8c41544cdfaf9786f25fe5ffb10e838e19a27570"},
+    {file = "backports.zoneinfo-0.2.1-cp37-cp37m-win32.whl", hash = "sha256:e55b384612d93be96506932a786bbcde5a2db7a9e6a4bb4bffe8b733f5b9036b"},
+    {file = "backports.zoneinfo-0.2.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a76b38c52400b762e48131494ba26be363491ac4f9a04c1b7e92483d169f6582"},
+    {file = "backports.zoneinfo-0.2.1-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:8961c0f32cd0336fb8e8ead11a1f8cd99ec07145ec2931122faaac1c8f7fd987"},
+    {file = "backports.zoneinfo-0.2.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e81b76cace8eda1fca50e345242ba977f9be6ae3945af8d46326d776b4cf78d1"},
+    {file = "backports.zoneinfo-0.2.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7b0a64cda4145548fed9efc10322770f929b944ce5cee6c0dfe0c87bf4c0c8c9"},
+    {file = "backports.zoneinfo-0.2.1-cp38-cp38-win32.whl", hash = "sha256:1b13e654a55cd45672cb54ed12148cd33628f672548f373963b0bff67b217328"},
+    {file = "backports.zoneinfo-0.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:4a0f800587060bf8880f954dbef70de6c11bbe59c673c3d818921f042f9954a6"},
+    {file = "backports.zoneinfo-0.2.1.tar.gz", hash = "sha256:fadbfe37f74051d024037f223b8e001611eac868b5c5b06144ef4d8b799862f2"},
+]
+
+[[package]]
+name = "beautifulsoup4"
+version = "4.12.2"
+requires_python = ">=3.6.0"
+summary = "Screen-scraping library"
+dependencies = [
+    "soupsieve>1.2",
+]
+files = [
+    {file = "beautifulsoup4-4.12.2-py3-none-any.whl", hash = "sha256:bd2520ca0d9d7d12694a53d44ac482d181b4ec1888909b035a3dbf40d0f57d4a"},
+    {file = "beautifulsoup4-4.12.2.tar.gz", hash = "sha256:492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da"},
+]
+
+[[package]]
+name = "black"
+version = "19.10b0"
+requires_python = ">=3.6"
+summary = "The uncompromising code formatter."
+dependencies = [
+    "appdirs",
+    "attrs>=18.1.0",
+    "click>=6.5",
+    "pathspec<1,>=0.6",
+    "regex",
+    "toml>=0.9.4",
+    "typed-ast>=1.4.0",
+]
+files = [
+    {file = "black-19.10b0.tar.gz", hash = "sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539"},
+]
+
+[[package]]
+name = "blinker"
+version = "1.6.3"
+requires_python = ">=3.7"
+summary = "Fast, simple object-to-object and broadcast signaling"
+files = [
+    {file = "blinker-1.6.3-py3-none-any.whl", hash = "sha256:296320d6c28b006eb5e32d4712202dbcdcbf5dc482da298c2f44881c43884aaa"},
+    {file = "blinker-1.6.3.tar.gz", hash = "sha256:152090d27c1c5c722ee7e48504b02d76502811ce02e1523553b4cf8c8b3d3a8d"},
+]
+
+[[package]]
+name = "certifi"
+version = "2023.7.22"
+requires_python = ">=3.6"
+summary = "Python package for providing Mozilla's CA Bundle."
+files = [
+    {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"},
+    {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"},
+]
+
+[[package]]
+name = "charset-normalizer"
+version = "3.3.1"
+requires_python = ">=3.7.0"
+summary = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
+files = [
+    {file = "charset-normalizer-3.3.1.tar.gz", hash = "sha256:d9137a876020661972ca6eec0766d81aef8a5627df628b664b234b73396e727e"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:8aee051c89e13565c6bd366813c386939f8e928af93c29fda4af86d25b73d8f8"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:352a88c3df0d1fa886562384b86f9a9e27563d4704ee0e9d56ec6fcd270ea690"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:223b4d54561c01048f657fa6ce41461d5ad8ff128b9678cfe8b2ecd951e3f8a2"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4f861d94c2a450b974b86093c6c027888627b8082f1299dfd5a4bae8e2292821"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1171ef1fc5ab4693c5d151ae0fdad7f7349920eabbaca6271f95969fa0756c2d"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28f512b9a33235545fbbdac6a330a510b63be278a50071a336afc1b78781b147"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c0e842112fe3f1a4ffcf64b06dc4c61a88441c2f02f373367f7b4c1aa9be2ad5"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3f9bc2ce123637a60ebe819f9fccc614da1bcc05798bbbaf2dd4ec91f3e08846"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f194cce575e59ffe442c10a360182a986535fd90b57f7debfaa5c845c409ecc3"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:9a74041ba0bfa9bc9b9bb2cd3238a6ab3b7618e759b41bd15b5f6ad958d17605"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b578cbe580e3b41ad17b1c428f382c814b32a6ce90f2d8e39e2e635d49e498d1"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:6db3cfb9b4fcecb4390db154e75b49578c87a3b9979b40cdf90d7e4b945656e1"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:debb633f3f7856f95ad957d9b9c781f8e2c6303ef21724ec94bea2ce2fcbd056"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-win32.whl", hash = "sha256:87071618d3d8ec8b186d53cb6e66955ef2a0e4fa63ccd3709c0c90ac5a43520f"},
+    {file = "charset_normalizer-3.3.1-cp310-cp310-win_amd64.whl", hash = "sha256:e372d7dfd154009142631de2d316adad3cc1c36c32a38b16a4751ba78da2a397"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ae4070f741f8d809075ef697877fd350ecf0b7c5837ed68738607ee0a2c572cf"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:58e875eb7016fd014c0eea46c6fa92b87b62c0cb31b9feae25cbbe62c919f54d"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:dbd95e300367aa0827496fe75a1766d198d34385a58f97683fe6e07f89ca3e3c"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:de0b4caa1c8a21394e8ce971997614a17648f94e1cd0640fbd6b4d14cab13a72"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:985c7965f62f6f32bf432e2681173db41336a9c2611693247069288bcb0c7f8b"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a15c1fe6d26e83fd2e5972425a772cca158eae58b05d4a25a4e474c221053e2d"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ae55d592b02c4349525b6ed8f74c692509e5adffa842e582c0f861751701a673"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:be4d9c2770044a59715eb57c1144dedea7c5d5ae80c68fb9959515037cde2008"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:851cf693fb3aaef71031237cd68699dded198657ec1e76a76eb8be58c03a5d1f"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:31bbaba7218904d2eabecf4feec0d07469284e952a27400f23b6628439439fa7"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:871d045d6ccc181fd863a3cd66ee8e395523ebfbc57f85f91f035f50cee8e3d4"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:501adc5eb6cd5f40a6f77fbd90e5ab915c8fd6e8c614af2db5561e16c600d6f3"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f5fb672c396d826ca16a022ac04c9dce74e00a1c344f6ad1a0fdc1ba1f332213"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-win32.whl", hash = "sha256:bb06098d019766ca16fc915ecaa455c1f1cd594204e7f840cd6258237b5079a8"},
+    {file = "charset_normalizer-3.3.1-cp311-cp311-win_amd64.whl", hash = "sha256:8af5a8917b8af42295e86b64903156b4f110a30dca5f3b5aedea123fbd638bff"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:7ae8e5142dcc7a49168f4055255dbcced01dc1714a90a21f87448dc8d90617d1"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5b70bab78accbc672f50e878a5b73ca692f45f5b5e25c8066d748c09405e6a55"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5ceca5876032362ae73b83347be8b5dbd2d1faf3358deb38c9c88776779b2e2f"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34d95638ff3613849f473afc33f65c401a89f3b9528d0d213c7037c398a51296"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9edbe6a5bf8b56a4a84533ba2b2f489d0046e755c29616ef8830f9e7d9cf5728"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f6a02a3c7950cafaadcd46a226ad9e12fc9744652cc69f9e5534f98b47f3bbcf"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10b8dd31e10f32410751b3430996f9807fc4d1587ca69772e2aa940a82ab571a"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:edc0202099ea1d82844316604e17d2b175044f9bcb6b398aab781eba957224bd"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b891a2f68e09c5ef989007fac11476ed33c5c9994449a4e2c3386529d703dc8b"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:71ef3b9be10070360f289aea4838c784f8b851be3ba58cf796262b57775c2f14"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:55602981b2dbf8184c098bc10287e8c245e351cd4fdcad050bd7199d5a8bf514"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:46fb9970aa5eeca547d7aa0de5d4b124a288b42eaefac677bde805013c95725c"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:520b7a142d2524f999447b3a0cf95115df81c4f33003c51a6ab637cbda9d0bf4"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-win32.whl", hash = "sha256:8ec8ef42c6cd5856a7613dcd1eaf21e5573b2185263d87d27c8edcae33b62a61"},
+    {file = "charset_normalizer-3.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:baec8148d6b8bd5cee1ae138ba658c71f5b03e0d69d5907703e3e1df96db5e41"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:63a6f59e2d01310f754c270e4a257426fe5a591dc487f1983b3bbe793cf6bac6"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d6bfc32a68bc0933819cfdfe45f9abc3cae3877e1d90aac7259d57e6e0f85b1"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f3100d86dcd03c03f7e9c3fdb23d92e32abbca07e7c13ebd7ddfbcb06f5991f"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:39b70a6f88eebe239fa775190796d55a33cfb6d36b9ffdd37843f7c4c1b5dc67"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e12f8ee80aa35e746230a2af83e81bd6b52daa92a8afaef4fea4a2ce9b9f4fa"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b6cefa579e1237ce198619b76eaa148b71894fb0d6bcf9024460f9bf30fd228"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:61f1e3fb621f5420523abb71f5771a204b33c21d31e7d9d86881b2cffe92c47c"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:4f6e2a839f83a6a76854d12dbebde50e4b1afa63e27761549d006fa53e9aa80e"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:1ec937546cad86d0dce5396748bf392bb7b62a9eeb8c66efac60e947697f0e58"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:82ca51ff0fc5b641a2d4e1cc8c5ff108699b7a56d7f3ad6f6da9dbb6f0145b48"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:633968254f8d421e70f91c6ebe71ed0ab140220469cf87a9857e21c16687c034"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-win32.whl", hash = "sha256:c0c72d34e7de5604df0fde3644cc079feee5e55464967d10b24b1de268deceb9"},
+    {file = "charset_normalizer-3.3.1-cp37-cp37m-win_amd64.whl", hash = "sha256:63accd11149c0f9a99e3bc095bbdb5a464862d77a7e309ad5938fbc8721235ae"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5a3580a4fdc4ac05f9e53c57f965e3594b2f99796231380adb2baaab96e22761"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2465aa50c9299d615d757c1c888bc6fef384b7c4aec81c05a0172b4400f98557"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cb7cd68814308aade9d0c93c5bd2ade9f9441666f8ba5aa9c2d4b389cb5e2a45"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91e43805ccafa0a91831f9cd5443aa34528c0c3f2cc48c4cb3d9a7721053874b"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:854cc74367180beb327ab9d00f964f6d91da06450b0855cbbb09187bcdb02de5"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c15070ebf11b8b7fd1bfff7217e9324963c82dbdf6182ff7050519e350e7ad9f"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2c4c99f98fc3a1835af8179dcc9013f93594d0670e2fa80c83aa36346ee763d2"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3fb765362688821404ad6cf86772fc54993ec11577cd5a92ac44b4c2ba52155b"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dced27917823df984fe0c80a5c4ad75cf58df0fbfae890bc08004cd3888922a2"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a66bcdf19c1a523e41b8e9d53d0cedbfbac2e93c649a2e9502cb26c014d0980c"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:ecd26be9f112c4f96718290c10f4caea6cc798459a3a76636b817a0ed7874e42"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:3f70fd716855cd3b855316b226a1ac8bdb3caf4f7ea96edcccc6f484217c9597"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:17a866d61259c7de1bdadef418a37755050ddb4b922df8b356503234fff7932c"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-win32.whl", hash = "sha256:548eefad783ed787b38cb6f9a574bd8664468cc76d1538215d510a3cd41406cb"},
+    {file = "charset_normalizer-3.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:45f053a0ece92c734d874861ffe6e3cc92150e32136dd59ab1fb070575189c97"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bc791ec3fd0c4309a753f95bb6c749ef0d8ea3aea91f07ee1cf06b7b02118f2f"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0c8c61fb505c7dad1d251c284e712d4e0372cef3b067f7ddf82a7fa82e1e9a93"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2c092be3885a1b7899cd85ce24acedc1034199d6fca1483fa2c3a35c86e43041"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c2000c54c395d9e5e44c99dc7c20a64dc371f777faf8bae4919ad3e99ce5253e"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4cb50a0335382aac15c31b61d8531bc9bb657cfd848b1d7158009472189f3d62"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c30187840d36d0ba2893bc3271a36a517a717f9fd383a98e2697ee890a37c273"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fe81b35c33772e56f4b6cf62cf4aedc1762ef7162a31e6ac7fe5e40d0149eb67"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d0bf89afcbcf4d1bb2652f6580e5e55a840fdf87384f6063c4a4f0c95e378656"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:06cf46bdff72f58645434d467bf5228080801298fbba19fe268a01b4534467f5"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:3c66df3f41abee950d6638adc7eac4730a306b022570f71dd0bd6ba53503ab57"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:cd805513198304026bd379d1d516afbf6c3c13f4382134a2c526b8b854da1c2e"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:9505dc359edb6a330efcd2be825fdb73ee3e628d9010597aa1aee5aa63442e97"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:31445f38053476a0c4e6d12b047b08ced81e2c7c712e5a1ad97bc913256f91b2"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-win32.whl", hash = "sha256:bd28b31730f0e982ace8663d108e01199098432a30a4c410d06fe08fdb9e93f4"},
+    {file = "charset_normalizer-3.3.1-cp39-cp39-win_amd64.whl", hash = "sha256:555fe186da0068d3354cdf4bbcbc609b0ecae4d04c921cc13e209eece7720727"},
+    {file = "charset_normalizer-3.3.1-py3-none-any.whl", hash = "sha256:800561453acdecedaac137bf09cd719c7a440b6800ec182f077bb8e7025fb708"},
+]
+
+[[package]]
+name = "click"
+version = "8.1.7"
+requires_python = ">=3.7"
+summary = "Composable command line interface toolkit"
+dependencies = [
+    "colorama; platform_system == \"Windows\"",
+    "importlib-metadata; python_version < \"3.8\"",
+]
+files = [
+    {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"},
+    {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"},
+]
+
+[[package]]
+name = "colorama"
+version = "0.4.6"
+requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+summary = "Cross-platform colored terminal text."
+files = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
+
+[[package]]
+name = "coverage"
+version = "7.2.7"
+requires_python = ">=3.7"
+summary = "Code coverage measurement for Python"
+files = [
+    {file = "coverage-7.2.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d39b5b4f2a66ccae8b7263ac3c8170994b65266797fb96cbbfd3fb5b23921db8"},
+    {file = "coverage-7.2.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6d040ef7c9859bb11dfeb056ff5b3872436e3b5e401817d87a31e1750b9ae2fb"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba90a9563ba44a72fda2e85302c3abc71c5589cea608ca16c22b9804262aaeb6"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7d9405291c6928619403db1d10bd07888888ec1abcbd9748fdaa971d7d661b2"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31563e97dae5598556600466ad9beea39fb04e0229e61c12eaa206e0aa202063"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ebba1cd308ef115925421d3e6a586e655ca5a77b5bf41e02eb0e4562a111f2d1"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:cb017fd1b2603ef59e374ba2063f593abe0fc45f2ad9abdde5b4d83bd922a353"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62a5c7dad11015c66fbb9d881bc4caa5b12f16292f857842d9d1871595f4495"},
+    {file = "coverage-7.2.7-cp310-cp310-win32.whl", hash = "sha256:ee57190f24fba796e36bb6d3aa8a8783c643d8fa9760c89f7a98ab5455fbf818"},
+    {file = "coverage-7.2.7-cp310-cp310-win_amd64.whl", hash = "sha256:f75f7168ab25dd93110c8a8117a22450c19976afbc44234cbf71481094c1b850"},
+    {file = "coverage-7.2.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:06a9a2be0b5b576c3f18f1a241f0473575c4a26021b52b2a85263a00f034d51f"},
+    {file = "coverage-7.2.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5baa06420f837184130752b7c5ea0808762083bf3487b5038d68b012e5937dbe"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdec9e8cbf13a5bf63290fc6013d216a4c7232efb51548594ca3631a7f13c3a3"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:52edc1a60c0d34afa421c9c37078817b2e67a392cab17d97283b64c5833f427f"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63426706118b7f5cf6bb6c895dc215d8a418d5952544042c8a2d9fe87fcf09cb"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:afb17f84d56068a7c29f5fa37bfd38d5aba69e3304af08ee94da8ed5b0865833"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:48c19d2159d433ccc99e729ceae7d5293fbffa0bdb94952d3579983d1c8c9d97"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0e1f928eaf5469c11e886fe0885ad2bf1ec606434e79842a879277895a50942a"},
+    {file = "coverage-7.2.7-cp311-cp311-win32.whl", hash = "sha256:33d6d3ea29d5b3a1a632b3c4e4f4ecae24ef170b0b9ee493883f2df10039959a"},
+    {file = "coverage-7.2.7-cp311-cp311-win_amd64.whl", hash = "sha256:5b7540161790b2f28143191f5f8ec02fb132660ff175b7747b95dcb77ac26562"},
+    {file = "coverage-7.2.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f2f67fe12b22cd130d34d0ef79206061bfb5eda52feb6ce0dba0644e20a03cf4"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a342242fe22407f3c17f4b499276a02b01e80f861f1682ad1d95b04018e0c0d4"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:171717c7cb6b453aebac9a2ef603699da237f341b38eebfee9be75d27dc38e01"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49969a9f7ffa086d973d91cec8d2e31080436ef0fb4a359cae927e742abfaaa6"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b46517c02ccd08092f4fa99f24c3b83d8f92f739b4657b0f146246a0ca6a831d"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:a3d33a6b3eae87ceaefa91ffdc130b5e8536182cd6dfdbfc1aa56b46ff8c86de"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:976b9c42fb2a43ebf304fa7d4a310e5f16cc99992f33eced91ef6f908bd8f33d"},
+    {file = "coverage-7.2.7-cp312-cp312-win32.whl", hash = "sha256:8de8bb0e5ad103888d65abef8bca41ab93721647590a3f740100cd65c3b00511"},
+    {file = "coverage-7.2.7-cp312-cp312-win_amd64.whl", hash = "sha256:9e31cb64d7de6b6f09702bb27c02d1904b3aebfca610c12772452c4e6c21a0d3"},
+    {file = "coverage-7.2.7-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:58c2ccc2f00ecb51253cbe5d8d7122a34590fac9646a960d1430d5b15321d95f"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d22656368f0e6189e24722214ed8d66b8022db19d182927b9a248a2a8a2f67eb"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a895fcc7b15c3fc72beb43cdcbdf0ddb7d2ebc959edac9cef390b0d14f39f8a9"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e84606b74eb7de6ff581a7915e2dab7a28a0517fbe1c9239eb227e1354064dcd"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0a5f9e1dbd7fbe30196578ca36f3fba75376fb99888c395c5880b355e2875f8a"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:419bfd2caae268623dd469eff96d510a920c90928b60f2073d79f8fe2bbc5959"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:2aee274c46590717f38ae5e4650988d1af340fe06167546cc32fe2f58ed05b02"},
+    {file = "coverage-7.2.7-cp37-cp37m-win32.whl", hash = "sha256:61b9a528fb348373c433e8966535074b802c7a5d7f23c4f421e6c6e2f1697a6f"},
+    {file = "coverage-7.2.7-cp37-cp37m-win_amd64.whl", hash = "sha256:b1c546aca0ca4d028901d825015dc8e4d56aac4b541877690eb76490f1dc8ed0"},
+    {file = "coverage-7.2.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:54b896376ab563bd38453cecb813c295cf347cf5906e8b41d340b0321a5433e5"},
+    {file = "coverage-7.2.7-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3d376df58cc111dc8e21e3b6e24606b5bb5dee6024f46a5abca99124b2229ef5"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e330fc79bd7207e46c7d7fd2bb4af2963f5f635703925543a70b99574b0fea9"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e9d683426464e4a252bf70c3498756055016f99ddaec3774bf368e76bbe02b6"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d13c64ee2d33eccf7437961b6ea7ad8673e2be040b4f7fd4fd4d4d28d9ccb1e"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b7aa5f8a41217360e600da646004f878250a0d6738bcdc11a0a39928d7dc2050"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8fa03bce9bfbeeef9f3b160a8bed39a221d82308b4152b27d82d8daa7041fee5"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:245167dd26180ab4c91d5e1496a30be4cd721a5cf2abf52974f965f10f11419f"},
+    {file = "coverage-7.2.7-cp38-cp38-win32.whl", hash = "sha256:d2c2db7fd82e9b72937969bceac4d6ca89660db0a0967614ce2481e81a0b771e"},
+    {file = "coverage-7.2.7-cp38-cp38-win_amd64.whl", hash = "sha256:2e07b54284e381531c87f785f613b833569c14ecacdcb85d56b25c4622c16c3c"},
+    {file = "coverage-7.2.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:537891ae8ce59ef63d0123f7ac9e2ae0fc8b72c7ccbe5296fec45fd68967b6c9"},
+    {file = "coverage-7.2.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:06fb182e69f33f6cd1d39a6c597294cff3143554b64b9825d1dc69d18cc2fff2"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:201e7389591af40950a6480bd9edfa8ed04346ff80002cec1a66cac4549c1ad7"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f6951407391b639504e3b3be51b7ba5f3528adbf1a8ac3302b687ecababf929e"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f48351d66575f535669306aa7d6d6f71bc43372473b54a832222803eb956fd1"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b29019c76039dc3c0fd815c41392a044ce555d9bcdd38b0fb60fb4cd8e475ba9"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:81c13a1fc7468c40f13420732805a4c38a105d89848b7c10af65a90beff25250"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:975d70ab7e3c80a3fe86001d8751f6778905ec723f5b110aed1e450da9d4b7f2"},
+    {file = "coverage-7.2.7-cp39-cp39-win32.whl", hash = "sha256:7ee7d9d4822c8acc74a5e26c50604dff824710bc8de424904c0982e25c39c6cb"},
+    {file = "coverage-7.2.7-cp39-cp39-win_amd64.whl", hash = "sha256:eb393e5ebc85245347950143969b241d08b52b88a3dc39479822e073a1a8eb27"},
+    {file = "coverage-7.2.7-pp37.pp38.pp39-none-any.whl", hash = "sha256:b7b4c971f05e6ae490fef852c218b0e79d4e52f79ef0c8475566584a8fb3e01d"},
+    {file = "coverage-7.2.7.tar.gz", hash = "sha256:924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59"},
+]
+
+[[package]]
+name = "coverage"
+version = "7.2.7"
+extras = ["toml"]
+requires_python = ">=3.7"
+summary = "Code coverage measurement for Python"
+dependencies = [
+    "coverage==7.2.7",
+    "tomli; python_full_version <= \"3.11.0a6\"",
+]
+files = [
+    {file = "coverage-7.2.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d39b5b4f2a66ccae8b7263ac3c8170994b65266797fb96cbbfd3fb5b23921db8"},
+    {file = "coverage-7.2.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6d040ef7c9859bb11dfeb056ff5b3872436e3b5e401817d87a31e1750b9ae2fb"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba90a9563ba44a72fda2e85302c3abc71c5589cea608ca16c22b9804262aaeb6"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7d9405291c6928619403db1d10bd07888888ec1abcbd9748fdaa971d7d661b2"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31563e97dae5598556600466ad9beea39fb04e0229e61c12eaa206e0aa202063"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ebba1cd308ef115925421d3e6a586e655ca5a77b5bf41e02eb0e4562a111f2d1"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:cb017fd1b2603ef59e374ba2063f593abe0fc45f2ad9abdde5b4d83bd922a353"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62a5c7dad11015c66fbb9d881bc4caa5b12f16292f857842d9d1871595f4495"},
+    {file = "coverage-7.2.7-cp310-cp310-win32.whl", hash = "sha256:ee57190f24fba796e36bb6d3aa8a8783c643d8fa9760c89f7a98ab5455fbf818"},
+    {file = "coverage-7.2.7-cp310-cp310-win_amd64.whl", hash = "sha256:f75f7168ab25dd93110c8a8117a22450c19976afbc44234cbf71481094c1b850"},
+    {file = "coverage-7.2.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:06a9a2be0b5b576c3f18f1a241f0473575c4a26021b52b2a85263a00f034d51f"},
+    {file = "coverage-7.2.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5baa06420f837184130752b7c5ea0808762083bf3487b5038d68b012e5937dbe"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdec9e8cbf13a5bf63290fc6013d216a4c7232efb51548594ca3631a7f13c3a3"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:52edc1a60c0d34afa421c9c37078817b2e67a392cab17d97283b64c5833f427f"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63426706118b7f5cf6bb6c895dc215d8a418d5952544042c8a2d9fe87fcf09cb"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:afb17f84d56068a7c29f5fa37bfd38d5aba69e3304af08ee94da8ed5b0865833"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:48c19d2159d433ccc99e729ceae7d5293fbffa0bdb94952d3579983d1c8c9d97"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0e1f928eaf5469c11e886fe0885ad2bf1ec606434e79842a879277895a50942a"},
+    {file = "coverage-7.2.7-cp311-cp311-win32.whl", hash = "sha256:33d6d3ea29d5b3a1a632b3c4e4f4ecae24ef170b0b9ee493883f2df10039959a"},
+    {file = "coverage-7.2.7-cp311-cp311-win_amd64.whl", hash = "sha256:5b7540161790b2f28143191f5f8ec02fb132660ff175b7747b95dcb77ac26562"},
+    {file = "coverage-7.2.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f2f67fe12b22cd130d34d0ef79206061bfb5eda52feb6ce0dba0644e20a03cf4"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a342242fe22407f3c17f4b499276a02b01e80f861f1682ad1d95b04018e0c0d4"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:171717c7cb6b453aebac9a2ef603699da237f341b38eebfee9be75d27dc38e01"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49969a9f7ffa086d973d91cec8d2e31080436ef0fb4a359cae927e742abfaaa6"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b46517c02ccd08092f4fa99f24c3b83d8f92f739b4657b0f146246a0ca6a831d"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:a3d33a6b3eae87ceaefa91ffdc130b5e8536182cd6dfdbfc1aa56b46ff8c86de"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:976b9c42fb2a43ebf304fa7d4a310e5f16cc99992f33eced91ef6f908bd8f33d"},
+    {file = "coverage-7.2.7-cp312-cp312-win32.whl", hash = "sha256:8de8bb0e5ad103888d65abef8bca41ab93721647590a3f740100cd65c3b00511"},
+    {file = "coverage-7.2.7-cp312-cp312-win_amd64.whl", hash = "sha256:9e31cb64d7de6b6f09702bb27c02d1904b3aebfca610c12772452c4e6c21a0d3"},
+    {file = "coverage-7.2.7-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:58c2ccc2f00ecb51253cbe5d8d7122a34590fac9646a960d1430d5b15321d95f"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d22656368f0e6189e24722214ed8d66b8022db19d182927b9a248a2a8a2f67eb"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a895fcc7b15c3fc72beb43cdcbdf0ddb7d2ebc959edac9cef390b0d14f39f8a9"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e84606b74eb7de6ff581a7915e2dab7a28a0517fbe1c9239eb227e1354064dcd"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0a5f9e1dbd7fbe30196578ca36f3fba75376fb99888c395c5880b355e2875f8a"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:419bfd2caae268623dd469eff96d510a920c90928b60f2073d79f8fe2bbc5959"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:2aee274c46590717f38ae5e4650988d1af340fe06167546cc32fe2f58ed05b02"},
+    {file = "coverage-7.2.7-cp37-cp37m-win32.whl", hash = "sha256:61b9a528fb348373c433e8966535074b802c7a5d7f23c4f421e6c6e2f1697a6f"},
+    {file = "coverage-7.2.7-cp37-cp37m-win_amd64.whl", hash = "sha256:b1c546aca0ca4d028901d825015dc8e4d56aac4b541877690eb76490f1dc8ed0"},
+    {file = "coverage-7.2.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:54b896376ab563bd38453cecb813c295cf347cf5906e8b41d340b0321a5433e5"},
+    {file = "coverage-7.2.7-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3d376df58cc111dc8e21e3b6e24606b5bb5dee6024f46a5abca99124b2229ef5"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e330fc79bd7207e46c7d7fd2bb4af2963f5f635703925543a70b99574b0fea9"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e9d683426464e4a252bf70c3498756055016f99ddaec3774bf368e76bbe02b6"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d13c64ee2d33eccf7437961b6ea7ad8673e2be040b4f7fd4fd4d4d28d9ccb1e"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b7aa5f8a41217360e600da646004f878250a0d6738bcdc11a0a39928d7dc2050"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8fa03bce9bfbeeef9f3b160a8bed39a221d82308b4152b27d82d8daa7041fee5"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:245167dd26180ab4c91d5e1496a30be4cd721a5cf2abf52974f965f10f11419f"},
+    {file = "coverage-7.2.7-cp38-cp38-win32.whl", hash = "sha256:d2c2db7fd82e9b72937969bceac4d6ca89660db0a0967614ce2481e81a0b771e"},
+    {file = "coverage-7.2.7-cp38-cp38-win_amd64.whl", hash = "sha256:2e07b54284e381531c87f785f613b833569c14ecacdcb85d56b25c4622c16c3c"},
+    {file = "coverage-7.2.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:537891ae8ce59ef63d0123f7ac9e2ae0fc8b72c7ccbe5296fec45fd68967b6c9"},
+    {file = "coverage-7.2.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:06fb182e69f33f6cd1d39a6c597294cff3143554b64b9825d1dc69d18cc2fff2"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:201e7389591af40950a6480bd9edfa8ed04346ff80002cec1a66cac4549c1ad7"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f6951407391b639504e3b3be51b7ba5f3528adbf1a8ac3302b687ecababf929e"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f48351d66575f535669306aa7d6d6f71bc43372473b54a832222803eb956fd1"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b29019c76039dc3c0fd815c41392a044ce555d9bcdd38b0fb60fb4cd8e475ba9"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:81c13a1fc7468c40f13420732805a4c38a105d89848b7c10af65a90beff25250"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:975d70ab7e3c80a3fe86001d8751f6778905ec723f5b110aed1e450da9d4b7f2"},
+    {file = "coverage-7.2.7-cp39-cp39-win32.whl", hash = "sha256:7ee7d9d4822c8acc74a5e26c50604dff824710bc8de424904c0982e25c39c6cb"},
+    {file = "coverage-7.2.7-cp39-cp39-win_amd64.whl", hash = "sha256:eb393e5ebc85245347950143969b241d08b52b88a3dc39479822e073a1a8eb27"},
+    {file = "coverage-7.2.7-pp37.pp38.pp39-none-any.whl", hash = "sha256:b7b4c971f05e6ae490fef852c218b0e79d4e52f79ef0c8475566584a8fb3e01d"},
+    {file = "coverage-7.2.7.tar.gz", hash = "sha256:924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59"},
+]
+
+[[package]]
+name = "distlib"
+version = "0.3.7"
+summary = "Distribution utilities"
+files = [
+    {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"},
+    {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"},
+]
+
+[[package]]
+name = "docutils"
+version = "0.19"
+requires_python = ">=3.7"
+summary = "Docutils -- Python Documentation Utilities"
+files = [
+    {file = "docutils-0.19-py3-none-any.whl", hash = "sha256:5e1de4d849fee02c63b040a4a3fd567f4ab104defd8a5511fbbc24a8a017efbc"},
+    {file = "docutils-0.19.tar.gz", hash = "sha256:33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6"},
+]
+
+[[package]]
+name = "exceptiongroup"
+version = "1.1.3"
+requires_python = ">=3.7"
+summary = "Backport of PEP 654 (exception groups)"
+files = [
+    {file = "exceptiongroup-1.1.3-py3-none-any.whl", hash = "sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3"},
+    {file = "exceptiongroup-1.1.3.tar.gz", hash = "sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9"},
+]
+
+[[package]]
+name = "execnet"
+version = "2.0.2"
+requires_python = ">=3.7"
+summary = "execnet: rapid multi-Python deployment"
+files = [
+    {file = "execnet-2.0.2-py3-none-any.whl", hash = "sha256:88256416ae766bc9e8895c76a87928c0012183da3cc4fc18016e6f050e025f41"},
+    {file = "execnet-2.0.2.tar.gz", hash = "sha256:cc59bc4423742fd71ad227122eb0dd44db51efb3dc4095b45ac9a08c770096af"},
+]
+
+[[package]]
+name = "feedgenerator"
+version = "2.1.0"
+requires_python = ">=3.7"
+summary = "Standalone version of django.utils.feedgenerator"
+dependencies = [
+    "pytz>=0a",
+]
+files = [
+    {file = "feedgenerator-2.1.0-py3-none-any.whl", hash = "sha256:93b7ce1c5a86195cafd6a8e9baf6a2a863ebd6d9905e840ce5778f73efd9a8d5"},
+    {file = "feedgenerator-2.1.0.tar.gz", hash = "sha256:f075f23f28fd227f097c36b212161c6cf012e1c6caaf7ff53d5d6bb02cd42b9d"},
+]
+
+[[package]]
+name = "filelock"
+version = "3.12.2"
+requires_python = ">=3.7"
+summary = "A platform independent file lock."
+files = [
+    {file = "filelock-3.12.2-py3-none-any.whl", hash = "sha256:cbb791cdea2a72f23da6ac5b5269ab0a0d161e9ef0100e653b69049a7706d1ec"},
+    {file = "filelock-3.12.2.tar.gz", hash = "sha256:002740518d8aa59a26b0c76e10fb8c6e15eae825d34b6fdf670333fd7b938d81"},
+]
+
+[[package]]
+name = "flake8"
+version = "3.9.2"
+requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+summary = "the modular source code checker: pep8 pyflakes and co"
+dependencies = [
+    "importlib-metadata; python_version < \"3.8\"",
+    "mccabe<0.7.0,>=0.6.0",
+    "pycodestyle<2.8.0,>=2.7.0",
+    "pyflakes<2.4.0,>=2.3.0",
+]
+files = [
+    {file = "flake8-3.9.2-py2.py3-none-any.whl", hash = "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"},
+    {file = "flake8-3.9.2.tar.gz", hash = "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"},
+]
+
+[[package]]
+name = "flake8-import-order"
+version = "0.18.2"
+summary = "Flake8 and pylama plugin that checks the ordering of import statements."
+dependencies = [
+    "pycodestyle",
+    "setuptools",
+]
+files = [
+    {file = "flake8-import-order-0.18.2.tar.gz", hash = "sha256:e23941f892da3e0c09d711babbb0c73bc735242e9b216b726616758a920d900e"},
+    {file = "flake8_import_order-0.18.2-py2.py3-none-any.whl", hash = "sha256:82ed59f1083b629b030ee9d3928d9e06b6213eb196fe745b3a7d4af2168130df"},
+]
+
+[[package]]
+name = "furo"
+version = "2023.3.27"
+requires_python = ">=3.7"
+summary = "A clean customisable Sphinx documentation theme."
+dependencies = [
+    "beautifulsoup4",
+    "pygments>=2.7",
+    "sphinx-basic-ng",
+    "sphinx<7.0,>=5.0",
+]
+files = [
+    {file = "furo-2023.3.27-py3-none-any.whl", hash = "sha256:4ab2be254a2d5e52792d0ca793a12c35582dd09897228a6dd47885dabd5c9521"},
+    {file = "furo-2023.3.27.tar.gz", hash = "sha256:b99e7867a5cc833b2b34d7230631dd6558c7a29f93071fdbb5709634bb33c5a5"},
+]
+
+[[package]]
+name = "idna"
+version = "3.4"
+requires_python = ">=3.5"
+summary = "Internationalized Domain Names in Applications (IDNA)"
+files = [
+    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
+    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+]
+
+[[package]]
+name = "imagesize"
+version = "1.4.1"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+summary = "Getting image size from png/jpeg/jpeg2000/gif file"
+files = [
+    {file = "imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b"},
+    {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"},
+]
+
+[[package]]
+name = "importlib-metadata"
+version = "6.7.0"
+requires_python = ">=3.7"
+summary = "Read metadata from Python packages"
+dependencies = [
+    "typing-extensions>=3.6.4; python_version < \"3.8\"",
+    "zipp>=0.5",
+]
+files = [
+    {file = "importlib_metadata-6.7.0-py3-none-any.whl", hash = "sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5"},
+    {file = "importlib_metadata-6.7.0.tar.gz", hash = "sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4"},
+]
+
+[[package]]
+name = "iniconfig"
+version = "2.0.0"
+requires_python = ">=3.7"
+summary = "brain-dead simple config-ini parsing"
+files = [
+    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
+    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
+]
+
+[[package]]
+name = "invoke"
+version = "2.2.0"
+requires_python = ">=3.6"
+summary = "Pythonic task execution"
+files = [
+    {file = "invoke-2.2.0-py3-none-any.whl", hash = "sha256:6ea924cc53d4f78e3d98bc436b08069a03077e6f85ad1ddaa8a116d7dad15820"},
+    {file = "invoke-2.2.0.tar.gz", hash = "sha256:ee6cbb101af1a859c7fe84f2a264c059020b0cb7fe3535f9424300ab568f6bd5"},
+]
+
+[[package]]
+name = "isort"
+version = "5.11.5"
+requires_python = ">=3.7.0"
+summary = "A Python utility / library to sort Python imports."
+files = [
+    {file = "isort-5.11.5-py3-none-any.whl", hash = "sha256:ba1d72fb2595a01c7895a5128f9585a5cc4b6d395f1c8d514989b9a7eb2a8746"},
+    {file = "isort-5.11.5.tar.gz", hash = "sha256:6be1f76a507cb2ecf16c7cf14a37e41609ca082330be4e3436a18ef74add55db"},
+]
+
+[[package]]
+name = "jinja2"
+version = "3.1.2"
+requires_python = ">=3.7"
+summary = "A very fast and expressive template engine."
+dependencies = [
+    "MarkupSafe>=2.0",
+]
+files = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
+
+[[package]]
+name = "livereload"
+version = "2.6.3"
+summary = "Python LiveReload is an awesome tool for web developers"
+dependencies = [
+    "six",
+    "tornado; python_version > \"2.7\"",
+]
+files = [
+    {file = "livereload-2.6.3-py2.py3-none-any.whl", hash = "sha256:ad4ac6f53b2d62bb6ce1a5e6e96f1f00976a32348afedcb4b6d68df2a1d346e4"},
+    {file = "livereload-2.6.3.tar.gz", hash = "sha256:776f2f865e59fde56490a56bcc6773b6917366bce0c267c60ee8aaf1a0959869"},
+]
+
+[[package]]
+name = "lxml"
+version = "4.9.3"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*"
+summary = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
+files = [
+    {file = "lxml-4.9.3-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:b86164d2cff4d3aaa1f04a14685cbc072efd0b4f99ca5708b2ad1b9b5988a991"},
+    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:42871176e7896d5d45138f6d28751053c711ed4d48d8e30b498da155af39aebd"},
+    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ae8b9c6deb1e634ba4f1930eb67ef6e6bf6a44b6eb5ad605642b2d6d5ed9ce3c"},
+    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:411007c0d88188d9f621b11d252cce90c4a2d1a49db6c068e3c16422f306eab8"},
+    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:cd47b4a0d41d2afa3e58e5bf1f62069255aa2fd6ff5ee41604418ca925911d76"},
+    {file = "lxml-4.9.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0e2cb47860da1f7e9a5256254b74ae331687b9672dfa780eed355c4c9c3dbd23"},
+    {file = "lxml-4.9.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1247694b26342a7bf47c02e513d32225ededd18045264d40758abeb3c838a51f"},
+    {file = "lxml-4.9.3-cp310-cp310-win32.whl", hash = "sha256:cdb650fc86227eba20de1a29d4b2c1bfe139dc75a0669270033cb2ea3d391b85"},
+    {file = "lxml-4.9.3-cp310-cp310-win_amd64.whl", hash = "sha256:97047f0d25cd4bcae81f9ec9dc290ca3e15927c192df17331b53bebe0e3ff96d"},
+    {file = "lxml-4.9.3-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:1f447ea5429b54f9582d4b955f5f1985f278ce5cf169f72eea8afd9502973dd5"},
+    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:57d6ba0ca2b0c462f339640d22882acc711de224d769edf29962b09f77129cbf"},
+    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:9767e79108424fb6c3edf8f81e6730666a50feb01a328f4a016464a5893f835a"},
+    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:71c52db65e4b56b8ddc5bb89fb2e66c558ed9d1a74a45ceb7dcb20c191c3df2f"},
+    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d73d8ecf8ecf10a3bd007f2192725a34bd62898e8da27eb9d32a58084f93962b"},
+    {file = "lxml-4.9.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0a3d3487f07c1d7f150894c238299934a2a074ef590b583103a45002035be120"},
+    {file = "lxml-4.9.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e28c51fa0ce5674be9f560c6761c1b441631901993f76700b1b30ca6c8378d6"},
+    {file = "lxml-4.9.3-cp311-cp311-win32.whl", hash = "sha256:0bfd0767c5c1de2551a120673b72e5d4b628737cb05414f03c3277bf9bed3305"},
+    {file = "lxml-4.9.3-cp311-cp311-win_amd64.whl", hash = "sha256:25f32acefac14ef7bd53e4218fe93b804ef6f6b92ffdb4322bb6d49d94cad2bc"},
+    {file = "lxml-4.9.3-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:d3ff32724f98fbbbfa9f49d82852b159e9784d6094983d9a8b7f2ddaebb063d4"},
+    {file = "lxml-4.9.3-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:48d6ed886b343d11493129e019da91d4039826794a3e3027321c56d9e71505be"},
+    {file = "lxml-4.9.3-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:9a92d3faef50658dd2c5470af249985782bf754c4e18e15afb67d3ab06233f13"},
+    {file = "lxml-4.9.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b4e4bc18382088514ebde9328da057775055940a1f2e18f6ad2d78aa0f3ec5b9"},
+    {file = "lxml-4.9.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fc9b106a1bf918db68619fdcd6d5ad4f972fdd19c01d19bdb6bf63f3589a9ec5"},
+    {file = "lxml-4.9.3-cp312-cp312-win_amd64.whl", hash = "sha256:d37017287a7adb6ab77e1c5bee9bcf9660f90ff445042b790402a654d2ad81d8"},
+    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:46f409a2d60f634fe550f7133ed30ad5321ae2e6630f13657fb9479506b00601"},
+    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:4c28a9144688aef80d6ea666c809b4b0e50010a2aca784c97f5e6bf143d9f129"},
+    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:141f1d1a9b663c679dc524af3ea1773e618907e96075262726c7612c02b149a4"},
+    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:53ace1c1fd5a74ef662f844a0413446c0629d151055340e9893da958a374f70d"},
+    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:17a753023436a18e27dd7769e798ce302963c236bc4114ceee5b25c18c52c693"},
+    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:7d298a1bd60c067ea75d9f684f5f3992c9d6766fadbc0bcedd39750bf344c2f4"},
+    {file = "lxml-4.9.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:081d32421db5df44c41b7f08a334a090a545c54ba977e47fd7cc2deece78809a"},
+    {file = "lxml-4.9.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:23eed6d7b1a3336ad92d8e39d4bfe09073c31bfe502f20ca5116b2a334f8ec02"},
+    {file = "lxml-4.9.3-cp37-cp37m-win32.whl", hash = "sha256:1509dd12b773c02acd154582088820893109f6ca27ef7291b003d0e81666109f"},
+    {file = "lxml-4.9.3-cp37-cp37m-win_amd64.whl", hash = "sha256:120fa9349a24c7043854c53cae8cec227e1f79195a7493e09e0c12e29f918e52"},
+    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:4d2d1edbca80b510443f51afd8496be95529db04a509bc8faee49c7b0fb6d2cc"},
+    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:8d7e43bd40f65f7d97ad8ef5c9b1778943d02f04febef12def25f7583d19baac"},
+    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:71d66ee82e7417828af6ecd7db817913cb0cf9d4e61aa0ac1fde0583d84358db"},
+    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:6fc3c450eaa0b56f815c7b62f2b7fba7266c4779adcf1cece9e6deb1de7305ce"},
+    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:65299ea57d82fb91c7f019300d24050c4ddeb7c5a190e076b5f48a2b43d19c42"},
+    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:eadfbbbfb41b44034a4c757fd5d70baccd43296fb894dba0295606a7cf3124aa"},
+    {file = "lxml-4.9.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:3e9bdd30efde2b9ccfa9cb5768ba04fe71b018a25ea093379c857c9dad262c40"},
+    {file = "lxml-4.9.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fcdd00edfd0a3001e0181eab3e63bd5c74ad3e67152c84f93f13769a40e073a7"},
+    {file = "lxml-4.9.3-cp38-cp38-win32.whl", hash = "sha256:57aba1bbdf450b726d58b2aea5fe47c7875f5afb2c4a23784ed78f19a0462574"},
+    {file = "lxml-4.9.3-cp38-cp38-win_amd64.whl", hash = "sha256:92af161ecbdb2883c4593d5ed4815ea71b31fafd7fd05789b23100d081ecac96"},
+    {file = "lxml-4.9.3-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:9bb6ad405121241e99a86efff22d3ef469024ce22875a7ae045896ad23ba2340"},
+    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:8ed74706b26ad100433da4b9d807eae371efaa266ffc3e9191ea436087a9d6a7"},
+    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:fbf521479bcac1e25a663df882c46a641a9bff6b56dc8b0fafaebd2f66fb231b"},
+    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:303bf1edce6ced16bf67a18a1cf8339d0db79577eec5d9a6d4a80f0fb10aa2da"},
+    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:5515edd2a6d1a5a70bfcdee23b42ec33425e405c5b351478ab7dc9347228f96e"},
+    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:690dafd0b187ed38583a648076865d8c229661ed20e48f2335d68e2cf7dc829d"},
+    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b6420a005548ad52154c8ceab4a1290ff78d757f9e5cbc68f8c77089acd3c432"},
+    {file = "lxml-4.9.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bb3bb49c7a6ad9d981d734ef7c7193bc349ac338776a0360cc671eaee89bcf69"},
+    {file = "lxml-4.9.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d27be7405547d1f958b60837dc4c1007da90b8b23f54ba1f8b728c78fdb19d50"},
+    {file = "lxml-4.9.3-cp39-cp39-win32.whl", hash = "sha256:8df133a2ea5e74eef5e8fc6f19b9e085f758768a16e9877a60aec455ed2609b2"},
+    {file = "lxml-4.9.3-cp39-cp39-win_amd64.whl", hash = "sha256:4dd9a263e845a72eacb60d12401e37c616438ea2e5442885f65082c276dfb2b2"},
+    {file = "lxml-4.9.3-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:6689a3d7fd13dc687e9102a27e98ef33730ac4fe37795d5036d18b4d527abd35"},
+    {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f6bdac493b949141b733c5345b6ba8f87a226029cbabc7e9e121a413e49441e0"},
+    {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:05186a0f1346ae12553d66df1cfce6f251589fea3ad3da4f3ef4e34b2d58c6a3"},
+    {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c2006f5c8d28dee289f7020f721354362fa304acbaaf9745751ac4006650254b"},
+    {file = "lxml-4.9.3-pp38-pypy38_pp73-macosx_11_0_x86_64.whl", hash = "sha256:5c245b783db29c4e4fbbbfc9c5a78be496c9fea25517f90606aa1f6b2b3d5f7b"},
+    {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:4fb960a632a49f2f089d522f70496640fdf1218f1243889da3822e0a9f5f3ba7"},
+    {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:50670615eaf97227d5dc60de2dc99fb134a7130d310d783314e7724bf163f75d"},
+    {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:9719fe17307a9e814580af1f5c6e05ca593b12fb7e44fe62450a5384dbf61b4b"},
+    {file = "lxml-4.9.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:3331bece23c9ee066e0fb3f96c61322b9e0f54d775fccefff4c38ca488de283a"},
+    {file = "lxml-4.9.3-pp39-pypy39_pp73-macosx_11_0_x86_64.whl", hash = "sha256:ed667f49b11360951e201453fc3967344d0d0263aa415e1619e85ae7fd17b4e0"},
+    {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:8b77946fd508cbf0fccd8e400a7f71d4ac0e1595812e66025bac475a8e811694"},
+    {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:e4da8ca0c0c0aea88fd46be8e44bd49716772358d648cce45fe387f7b92374a7"},
+    {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:fe4bda6bd4340caa6e5cf95e73f8fea5c4bfc55763dd42f1b50a94c1b4a2fbd4"},
+    {file = "lxml-4.9.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:f3df3db1d336b9356dd3112eae5f5c2b8b377f3bc826848567f10bfddfee77e9"},
+    {file = "lxml-4.9.3.tar.gz", hash = "sha256:48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"},
+]
+
+[[package]]
+name = "markdown"
+version = "3.4.4"
+requires_python = ">=3.7"
+summary = "Python implementation of John Gruber's Markdown."
+dependencies = [
+    "importlib-metadata>=4.4; python_version < \"3.10\"",
+]
+files = [
+    {file = "Markdown-3.4.4-py3-none-any.whl", hash = "sha256:a4c1b65c0957b4bd9e7d86ddc7b3c9868fb9670660f6f99f6d1bca8954d5a941"},
+    {file = "Markdown-3.4.4.tar.gz", hash = "sha256:225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6"},
+]
+
+[[package]]
+name = "markdown-it-py"
+version = "2.2.0"
+requires_python = ">=3.7"
+summary = "Python port of markdown-it. Markdown parsing, done right!"
+dependencies = [
+    "mdurl~=0.1",
+    "typing-extensions>=3.7.4; python_version < \"3.8\"",
+]
+files = [
+    {file = "markdown-it-py-2.2.0.tar.gz", hash = "sha256:7c9a5e412688bc771c67432cbfebcdd686c93ce6484913dccf06cb5a0bea35a1"},
+    {file = "markdown_it_py-2.2.0-py3-none-any.whl", hash = "sha256:5a35f8d1870171d9acc47b99612dc146129b631baf04970128b568f190d0cc30"},
+]
+
+[[package]]
+name = "markupsafe"
+version = "2.1.3"
+requires_python = ">=3.7"
+summary = "Safely add untrusted strings to HTML/XML markup."
+files = [
+    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-win32.whl", hash = "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431"},
+    {file = "MarkupSafe-2.1.3-cp310-cp310-win_amd64.whl", hash = "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
+    {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-win32.whl", hash = "sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0"},
+    {file = "MarkupSafe-2.1.3-cp37-cp37m-win_amd64.whl", hash = "sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-win32.whl", hash = "sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5"},
+    {file = "MarkupSafe-2.1.3-cp38-cp38-win_amd64.whl", hash = "sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-win32.whl", hash = "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"},
+    {file = "MarkupSafe-2.1.3-cp39-cp39-win_amd64.whl", hash = "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba"},
+    {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"},
+]
+
+[[package]]
+name = "mccabe"
+version = "0.6.1"
+summary = "McCabe checker, plugin for flake8"
+files = [
+    {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},
+    {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"},
+]
+
+[[package]]
+name = "mdurl"
+version = "0.1.2"
+requires_python = ">=3.7"
+summary = "Markdown URL utilities"
+files = [
+    {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"},
+    {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"},
+]
+
+[[package]]
+name = "packaging"
+version = "23.2"
+requires_python = ">=3.7"
+summary = "Core utilities for Python packages"
+files = [
+    {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"},
+    {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"},
+]
+
+[[package]]
+name = "pathspec"
+version = "0.11.2"
+requires_python = ">=3.7"
+summary = "Utility library for gitignore style pattern matching of file paths."
+files = [
+    {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"},
+    {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"},
+]
+
+[[package]]
+name = "platformdirs"
+version = "3.11.0"
+requires_python = ">=3.7"
+summary = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+dependencies = [
+    "typing-extensions>=4.7.1; python_version < \"3.8\"",
+]
+files = [
+    {file = "platformdirs-3.11.0-py3-none-any.whl", hash = "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e"},
+    {file = "platformdirs-3.11.0.tar.gz", hash = "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3"},
+]
+
+[[package]]
+name = "pluggy"
+version = "1.2.0"
+requires_python = ">=3.7"
+summary = "plugin and hook calling mechanisms for python"
+dependencies = [
+    "importlib-metadata>=0.12; python_version < \"3.8\"",
+]
+files = [
+    {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"},
+    {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"},
+]
+
+[[package]]
+name = "psutil"
+version = "5.9.6"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+summary = "Cross-platform lib for process and system monitoring in Python."
+files = [
+    {file = "psutil-5.9.6-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:c69596f9fc2f8acd574a12d5f8b7b1ba3765a641ea5d60fb4736bf3c08a8214a"},
+    {file = "psutil-5.9.6-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:92e0cc43c524834af53e9d3369245e6cc3b130e78e26100d1f63cdb0abeb3d3c"},
+    {file = "psutil-5.9.6-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:748c9dd2583ed86347ed65d0035f45fa8c851e8d90354c122ab72319b5f366f4"},
+    {file = "psutil-5.9.6-cp37-abi3-win32.whl", hash = "sha256:a6f01f03bf1843280f4ad16f4bde26b817847b4c1a0db59bf6419807bc5ce05c"},
+    {file = "psutil-5.9.6-cp37-abi3-win_amd64.whl", hash = "sha256:6e5fb8dc711a514da83098bc5234264e551ad980cec5f85dabf4d38ed6f15e9a"},
+    {file = "psutil-5.9.6-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:daecbcbd29b289aac14ece28eca6a3e60aa361754cf6da3dfb20d4d32b6c7f57"},
+    {file = "psutil-5.9.6.tar.gz", hash = "sha256:e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a"},
+]
+
+[[package]]
+name = "py"
+version = "1.11.0"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+summary = "library with cross-python path, ini-parsing, io, code, log facilities"
+files = [
+    {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
+    {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
+]
+
+[[package]]
+name = "pycodestyle"
+version = "2.7.0"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+summary = "Python style guide checker"
+files = [
+    {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"},
+    {file = "pycodestyle-2.7.0.tar.gz", hash = "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"},
+]
+
+[[package]]
+name = "pyflakes"
+version = "2.3.1"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+summary = "passive checker of Python programs"
+files = [
+    {file = "pyflakes-2.3.1-py2.py3-none-any.whl", hash = "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3"},
+    {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"},
+]
+
+[[package]]
+name = "pygments"
+version = "2.16.1"
+requires_python = ">=3.7"
+summary = "Pygments is a syntax highlighting package written in Python."
+files = [
+    {file = "Pygments-2.16.1-py3-none-any.whl", hash = "sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692"},
+    {file = "Pygments-2.16.1.tar.gz", hash = "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29"},
+]
+
+[[package]]
+name = "pytest"
+version = "7.4.2"
+requires_python = ">=3.7"
+summary = "pytest: simple powerful testing with Python"
+dependencies = [
+    "colorama; sys_platform == \"win32\"",
+    "exceptiongroup>=1.0.0rc8; python_version < \"3.11\"",
+    "importlib-metadata>=0.12; python_version < \"3.8\"",
+    "iniconfig",
+    "packaging",
+    "pluggy<2.0,>=0.12",
+    "tomli>=1.0.0; python_version < \"3.11\"",
+]
+files = [
+    {file = "pytest-7.4.2-py3-none-any.whl", hash = "sha256:1d881c6124e08ff0a1bb75ba3ec0bfd8b5354a01c194ddd5a0a870a48d99b002"},
+    {file = "pytest-7.4.2.tar.gz", hash = "sha256:a766259cfab564a2ad52cb1aae1b881a75c3eb7e34ca3779697c23ed47c47069"},
+]
+
+[[package]]
+name = "pytest-cov"
+version = "4.1.0"
+requires_python = ">=3.7"
+summary = "Pytest plugin for measuring coverage."
+dependencies = [
+    "coverage[toml]>=5.2.1",
+    "pytest>=4.6",
+]
+files = [
+    {file = "pytest-cov-4.1.0.tar.gz", hash = "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6"},
+    {file = "pytest_cov-4.1.0-py3-none-any.whl", hash = "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"},
+]
+
+[[package]]
+name = "pytest-forked"
+version = "1.6.0"
+requires_python = ">=3.7"
+summary = "run tests in isolated forked subprocesses"
+dependencies = [
+    "py",
+    "pytest>=3.10",
+]
+files = [
+    {file = "pytest-forked-1.6.0.tar.gz", hash = "sha256:4dafd46a9a600f65d822b8f605133ecf5b3e1941ebb3588e943b4e3eb71a5a3f"},
+    {file = "pytest_forked-1.6.0-py3-none-any.whl", hash = "sha256:810958f66a91afb1a1e2ae83089d8dc1cd2437ac96b12963042fbb9fb4d16af0"},
+]
+
+[[package]]
+name = "pytest-sugar"
+version = "0.9.7"
+summary = "pytest-sugar is a plugin for pytest that changes the default look and feel of pytest (e.g. progressbar, show tests that fail instantly)."
+dependencies = [
+    "packaging>=21.3",
+    "pytest>=6.2.0",
+    "termcolor>=2.1.0",
+]
+files = [
+    {file = "pytest-sugar-0.9.7.tar.gz", hash = "sha256:f1e74c1abfa55f7241cf7088032b6e378566f16b938f3f08905e2cf4494edd46"},
+    {file = "pytest_sugar-0.9.7-py2.py3-none-any.whl", hash = "sha256:8cb5a4e5f8bbcd834622b0235db9e50432f4cbd71fef55b467fe44e43701e062"},
+]
+
+[[package]]
+name = "pytest-xdist"
+version = "2.5.0"
+requires_python = ">=3.6"
+summary = "pytest xdist plugin for distributed testing and loop-on-failing modes"
+dependencies = [
+    "execnet>=1.1",
+    "pytest-forked",
+    "pytest>=6.2.0",
+]
+files = [
+    {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"},
+    {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"},
+]
+
+[[package]]
+name = "python-dateutil"
+version = "2.8.2"
+requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+summary = "Extensions to the standard Python datetime module"
+dependencies = [
+    "six>=1.5",
+]
+files = [
+    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+]
+
+[[package]]
+name = "pytz"
+version = "2023.3.post1"
+summary = "World timezone definitions, modern and historical"
+files = [
+    {file = "pytz-2023.3.post1-py2.py3-none-any.whl", hash = "sha256:ce42d816b81b68506614c11e8937d3aa9e41007ceb50bfdcb0749b921bf646c7"},
+    {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"},
+]
+
+[[package]]
+name = "regex"
+version = "2023.10.3"
+requires_python = ">=3.7"
+summary = "Alternative regular expression module, to replace re."
+files = [
+    {file = "regex-2023.10.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4c34d4f73ea738223a094d8e0ffd6d2c1a1b4c175da34d6b0de3d8d69bee6bcc"},
+    {file = "regex-2023.10.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a8f4e49fc3ce020f65411432183e6775f24e02dff617281094ba6ab079ef0915"},
+    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4cd1bccf99d3ef1ab6ba835308ad85be040e6a11b0977ef7ea8c8005f01a3c29"},
+    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:81dce2ddc9f6e8f543d94b05d56e70d03a0774d32f6cca53e978dc01e4fc75b8"},
+    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c6b4d23c04831e3ab61717a707a5d763b300213db49ca680edf8bf13ab5d91b"},
+    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c15ad0aee158a15e17e0495e1e18741573d04eb6da06d8b84af726cfc1ed02ee"},
+    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6239d4e2e0b52c8bd38c51b760cd870069f0bdf99700a62cd509d7a031749a55"},
+    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4a8bf76e3182797c6b1afa5b822d1d5802ff30284abe4599e1247be4fd6b03be"},
+    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d9c727bbcf0065cbb20f39d2b4f932f8fa1631c3e01fcedc979bd4f51fe051c5"},
+    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3ccf2716add72f80714b9a63899b67fa711b654be3fcdd34fa391d2d274ce767"},
+    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:107ac60d1bfdc3edb53be75e2a52aff7481b92817cfdddd9b4519ccf0e54a6ff"},
+    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:00ba3c9818e33f1fa974693fb55d24cdc8ebafcb2e4207680669d8f8d7cca79a"},
+    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f0a47efb1dbef13af9c9a54a94a0b814902e547b7f21acb29434504d18f36e3a"},
+    {file = "regex-2023.10.3-cp310-cp310-win32.whl", hash = "sha256:36362386b813fa6c9146da6149a001b7bd063dabc4d49522a1f7aa65b725c7ec"},
+    {file = "regex-2023.10.3-cp310-cp310-win_amd64.whl", hash = "sha256:c65a3b5330b54103e7d21cac3f6bf3900d46f6d50138d73343d9e5b2900b2353"},
+    {file = "regex-2023.10.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:90a79bce019c442604662d17bf69df99090e24cdc6ad95b18b6725c2988a490e"},
+    {file = "regex-2023.10.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c7964c2183c3e6cce3f497e3a9f49d182e969f2dc3aeeadfa18945ff7bdd7051"},
+    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ef80829117a8061f974b2fda8ec799717242353bff55f8a29411794d635d964"},
+    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5addc9d0209a9afca5fc070f93b726bf7003bd63a427f65ef797a931782e7edc"},
+    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c148bec483cc4b421562b4bcedb8e28a3b84fcc8f0aa4418e10898f3c2c0eb9b"},
+    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d1f21af4c1539051049796a0f50aa342f9a27cde57318f2fc41ed50b0dbc4ac"},
+    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0b9ac09853b2a3e0d0082104036579809679e7715671cfbf89d83c1cb2a30f58"},
+    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ebedc192abbc7fd13c5ee800e83a6df252bec691eb2c4bedc9f8b2e2903f5e2a"},
+    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:d8a993c0a0ffd5f2d3bda23d0cd75e7086736f8f8268de8a82fbc4bd0ac6791e"},
+    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:be6b7b8d42d3090b6c80793524fa66c57ad7ee3fe9722b258aec6d0672543fd0"},
+    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4023e2efc35a30e66e938de5aef42b520c20e7eda7bb5fb12c35e5d09a4c43f6"},
+    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0d47840dc05e0ba04fe2e26f15126de7c755496d5a8aae4a08bda4dd8d646c54"},
+    {file = "regex-2023.10.3-cp311-cp311-win32.whl", hash = "sha256:9145f092b5d1977ec8c0ab46e7b3381b2fd069957b9862a43bd383e5c01d18c2"},
+    {file = "regex-2023.10.3-cp311-cp311-win_amd64.whl", hash = "sha256:b6104f9a46bd8743e4f738afef69b153c4b8b592d35ae46db07fc28ae3d5fb7c"},
+    {file = "regex-2023.10.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:bff507ae210371d4b1fe316d03433ac099f184d570a1a611e541923f78f05037"},
+    {file = "regex-2023.10.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:be5e22bbb67924dea15039c3282fa4cc6cdfbe0cbbd1c0515f9223186fc2ec5f"},
+    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a992f702c9be9c72fa46f01ca6e18d131906a7180950958f766c2aa294d4b41"},
+    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7434a61b158be563c1362d9071358f8ab91b8d928728cd2882af060481244c9e"},
+    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c2169b2dcabf4e608416f7f9468737583ce5f0a6e8677c4efbf795ce81109d7c"},
+    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9e908ef5889cda4de038892b9accc36d33d72fb3e12c747e2799a0e806ec841"},
+    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:12bd4bc2c632742c7ce20db48e0d99afdc05e03f0b4c1af90542e05b809a03d9"},
+    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bc72c231f5449d86d6c7d9cc7cd819b6eb30134bb770b8cfdc0765e48ef9c420"},
+    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:bce8814b076f0ce5766dc87d5a056b0e9437b8e0cd351b9a6c4e1134a7dfbda9"},
+    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:ba7cd6dc4d585ea544c1412019921570ebd8a597fabf475acc4528210d7c4a6f"},
+    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b0c7d2f698e83f15228ba41c135501cfe7d5740181d5903e250e47f617eb4292"},
+    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:5a8f91c64f390ecee09ff793319f30a0f32492e99f5dc1c72bc361f23ccd0a9a"},
+    {file = "regex-2023.10.3-cp312-cp312-win32.whl", hash = "sha256:ad08a69728ff3c79866d729b095872afe1e0557251da4abb2c5faff15a91d19a"},
+    {file = "regex-2023.10.3-cp312-cp312-win_amd64.whl", hash = "sha256:39cdf8d141d6d44e8d5a12a8569d5a227f645c87df4f92179bd06e2e2705e76b"},
+    {file = "regex-2023.10.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4a3ee019a9befe84fa3e917a2dd378807e423d013377a884c1970a3c2792d293"},
+    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76066d7ff61ba6bf3cb5efe2428fc82aac91802844c022d849a1f0f53820502d"},
+    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bfe50b61bab1b1ec260fa7cd91106fa9fece57e6beba05630afe27c71259c59b"},
+    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fd88f373cb71e6b59b7fa597e47e518282455c2734fd4306a05ca219a1991b0"},
+    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3ab05a182c7937fb374f7e946f04fb23a0c0699c0450e9fb02ef567412d2fa3"},
+    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dac37cf08fcf2094159922edc7a2784cfcc5c70f8354469f79ed085f0328ebdf"},
+    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e54ddd0bb8fb626aa1f9ba7b36629564544954fff9669b15da3610c22b9a0991"},
+    {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:3367007ad1951fde612bf65b0dffc8fd681a4ab98ac86957d16491400d661302"},
+    {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:16f8740eb6dbacc7113e3097b0a36065a02e37b47c936b551805d40340fb9971"},
+    {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:f4f2ca6df64cbdd27f27b34f35adb640b5d2d77264228554e68deda54456eb11"},
+    {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:39807cbcbe406efca2a233884e169d056c35aa7e9f343d4e78665246a332f597"},
+    {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7eece6fbd3eae4a92d7c748ae825cbc1ee41a89bb1c3db05b5578ed3cfcfd7cb"},
+    {file = "regex-2023.10.3-cp37-cp37m-win32.whl", hash = "sha256:ce615c92d90df8373d9e13acddd154152645c0dc060871abf6bd43809673d20a"},
+    {file = "regex-2023.10.3-cp37-cp37m-win_amd64.whl", hash = "sha256:0f649fa32fe734c4abdfd4edbb8381c74abf5f34bc0b3271ce687b23729299ed"},
+    {file = "regex-2023.10.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9b98b7681a9437262947f41c7fac567c7e1f6eddd94b0483596d320092004533"},
+    {file = "regex-2023.10.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:91dc1d531f80c862441d7b66c4505cd6ea9d312f01fb2f4654f40c6fdf5cc37a"},
+    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82fcc1f1cc3ff1ab8a57ba619b149b907072e750815c5ba63e7aa2e1163384a4"},
+    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7979b834ec7a33aafae34a90aad9f914c41fd6eaa8474e66953f3f6f7cbd4368"},
+    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef71561f82a89af6cfcbee47f0fabfdb6e63788a9258e913955d89fdd96902ab"},
+    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd829712de97753367153ed84f2de752b86cd1f7a88b55a3a775eb52eafe8a94"},
+    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:00e871d83a45eee2f8688d7e6849609c2ca2a04a6d48fba3dff4deef35d14f07"},
+    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:706e7b739fdd17cb89e1fbf712d9dc21311fc2333f6d435eac2d4ee81985098c"},
+    {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:cc3f1c053b73f20c7ad88b0d1d23be7e7b3901229ce89f5000a8399746a6e039"},
+    {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6f85739e80d13644b981a88f529d79c5bdf646b460ba190bffcaf6d57b2a9863"},
+    {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:741ba2f511cc9626b7561a440f87d658aabb3d6b744a86a3c025f866b4d19e7f"},
+    {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:e77c90ab5997e85901da85131fd36acd0ed2221368199b65f0d11bca44549711"},
+    {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:979c24cbefaf2420c4e377ecd1f165ea08cc3d1fbb44bdc51bccbbf7c66a2cb4"},
+    {file = "regex-2023.10.3-cp38-cp38-win32.whl", hash = "sha256:58837f9d221744d4c92d2cf7201c6acd19623b50c643b56992cbd2b745485d3d"},
+    {file = "regex-2023.10.3-cp38-cp38-win_amd64.whl", hash = "sha256:c55853684fe08d4897c37dfc5faeff70607a5f1806c8be148f1695be4a63414b"},
+    {file = "regex-2023.10.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2c54e23836650bdf2c18222c87f6f840d4943944146ca479858404fedeb9f9af"},
+    {file = "regex-2023.10.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:69c0771ca5653c7d4b65203cbfc5e66db9375f1078689459fe196fe08b7b4930"},
+    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ac965a998e1388e6ff2e9781f499ad1eaa41e962a40d11c7823c9952c77123e"},
+    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1c0e8fae5b27caa34177bdfa5a960c46ff2f78ee2d45c6db15ae3f64ecadde14"},
+    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6c56c3d47da04f921b73ff9415fbaa939f684d47293f071aa9cbb13c94afc17d"},
+    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ef1e014eed78ab650bef9a6a9cbe50b052c0aebe553fb2881e0453717573f52"},
+    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d29338556a59423d9ff7b6eb0cb89ead2b0875e08fe522f3e068b955c3e7b59b"},
+    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9c6d0ced3c06d0f183b73d3c5920727268d2201aa0fe6d55c60d68c792ff3588"},
+    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:994645a46c6a740ee8ce8df7911d4aee458d9b1bc5639bc968226763d07f00fa"},
+    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:66e2fe786ef28da2b28e222c89502b2af984858091675044d93cb50e6f46d7af"},
+    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:11175910f62b2b8c055f2b089e0fedd694fe2be3941b3e2633653bc51064c528"},
+    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:06e9abc0e4c9ab4779c74ad99c3fc10d3967d03114449acc2c2762ad4472b8ca"},
+    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:fb02e4257376ae25c6dd95a5aec377f9b18c09be6ebdefa7ad209b9137b73d48"},
+    {file = "regex-2023.10.3-cp39-cp39-win32.whl", hash = "sha256:3b2c3502603fab52d7619b882c25a6850b766ebd1b18de3df23b2f939360e1bd"},
+    {file = "regex-2023.10.3-cp39-cp39-win_amd64.whl", hash = "sha256:adbccd17dcaff65704c856bd29951c58a1bd4b2b0f8ad6b826dbd543fe740988"},
+    {file = "regex-2023.10.3.tar.gz", hash = "sha256:3fef4f844d2290ee0ba57addcec17eec9e3df73f10a2748485dfd6a3a188cc0f"},
+]
+
+[[package]]
+name = "requests"
+version = "2.31.0"
+requires_python = ">=3.7"
+summary = "Python HTTP for Humans."
+dependencies = [
+    "certifi>=2017.4.17",
+    "charset-normalizer<4,>=2",
+    "idna<4,>=2.5",
+    "urllib3<3,>=1.21.1",
+]
+files = [
+    {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"},
+    {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
+]
+
+[[package]]
+name = "rich"
+version = "13.6.0"
+requires_python = ">=3.7.0"
+summary = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
+dependencies = [
+    "markdown-it-py>=2.2.0",
+    "pygments<3.0.0,>=2.13.0",
+    "typing-extensions<5.0,>=4.0.0; python_version < \"3.9\"",
+]
+files = [
+    {file = "rich-13.6.0-py3-none-any.whl", hash = "sha256:2b38e2fe9ca72c9a00170a1a2d20c63c790d0e10ef1fe35eba76e1e7b1d7d245"},
+    {file = "rich-13.6.0.tar.gz", hash = "sha256:5c14d22737e6d5084ef4771b62d5d4363165b403455a30a1c8ca39dc7b644bef"},
+]
+
+[[package]]
+name = "setuptools"
+version = "68.0.0"
+requires_python = ">=3.7"
+summary = "Easily download, build, install, upgrade, and uninstall Python packages"
+files = [
+    {file = "setuptools-68.0.0-py3-none-any.whl", hash = "sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f"},
+    {file = "setuptools-68.0.0.tar.gz", hash = "sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235"},
+]
+
+[[package]]
+name = "six"
+version = "1.16.0"
+requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+summary = "Python 2 and 3 compatibility utilities"
+files = [
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
+
+[[package]]
+name = "smartypants"
+version = "2.0.1"
+summary = "Python with the SmartyPants"
+files = [
+    {file = "smartypants-2.0.1-py2.py3-none-any.whl", hash = "sha256:8db97f7cbdf08d15b158a86037cd9e116b4cf37703d24e0419a0d64ca5808f0d"},
+]
+
+[[package]]
+name = "snowballstemmer"
+version = "2.2.0"
+summary = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms."
+files = [
+    {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"},
+    {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"},
+]
+
+[[package]]
+name = "soupsieve"
+version = "2.4.1"
+requires_python = ">=3.7"
+summary = "A modern CSS selector implementation for Beautiful Soup."
+files = [
+    {file = "soupsieve-2.4.1-py3-none-any.whl", hash = "sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8"},
+    {file = "soupsieve-2.4.1.tar.gz", hash = "sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea"},
+]
+
+[[package]]
+name = "sphinx"
+version = "5.3.0"
+requires_python = ">=3.6"
+summary = "Python documentation generator"
+dependencies = [
+    "Jinja2>=3.0",
+    "Pygments>=2.12",
+    "alabaster<0.8,>=0.7",
+    "babel>=2.9",
+    "colorama>=0.4.5; sys_platform == \"win32\"",
+    "docutils<0.20,>=0.14",
+    "imagesize>=1.3",
+    "importlib-metadata>=4.8; python_version < \"3.10\"",
+    "packaging>=21.0",
+    "requests>=2.5.0",
+    "snowballstemmer>=2.0",
+    "sphinxcontrib-applehelp",
+    "sphinxcontrib-devhelp",
+    "sphinxcontrib-htmlhelp>=2.0.0",
+    "sphinxcontrib-jsmath",
+    "sphinxcontrib-qthelp",
+    "sphinxcontrib-serializinghtml>=1.1.5",
+]
+files = [
+    {file = "Sphinx-5.3.0.tar.gz", hash = "sha256:51026de0a9ff9fc13c05d74913ad66047e104f56a129ff73e174eb5c3ee794b5"},
+    {file = "sphinx-5.3.0-py3-none-any.whl", hash = "sha256:060ca5c9f7ba57a08a1219e547b269fadf125ae25b06b9fa7f66768efb652d6d"},
+]
+
+[[package]]
+name = "sphinx-basic-ng"
+version = "1.0.0b2"
+requires_python = ">=3.7"
+summary = "A modern skeleton for Sphinx themes."
+dependencies = [
+    "sphinx>=4.0",
+]
+files = [
+    {file = "sphinx_basic_ng-1.0.0b2-py3-none-any.whl", hash = "sha256:eb09aedbabfb650607e9b4b68c9d240b90b1e1be221d6ad71d61c52e29f7932b"},
+    {file = "sphinx_basic_ng-1.0.0b2.tar.gz", hash = "sha256:9ec55a47c90c8c002b5960c57492ec3021f5193cb26cebc2dc4ea226848651c9"},
+]
+
+[[package]]
+name = "sphinxcontrib-applehelp"
+version = "1.0.2"
+requires_python = ">=3.5"
+summary = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"
+files = [
+    {file = "sphinxcontrib-applehelp-1.0.2.tar.gz", hash = "sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"},
+    {file = "sphinxcontrib_applehelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:806111e5e962be97c29ec4c1e7fe277bfd19e9652fb1a4392105b43e01af885a"},
+]
+
+[[package]]
+name = "sphinxcontrib-devhelp"
+version = "1.0.2"
+requires_python = ">=3.5"
+summary = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."
+files = [
+    {file = "sphinxcontrib-devhelp-1.0.2.tar.gz", hash = "sha256:ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"},
+    {file = "sphinxcontrib_devhelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:8165223f9a335cc1af7ffe1ed31d2871f325254c0423bc0c4c7cd1c1e4734a2e"},
+]
+
+[[package]]
+name = "sphinxcontrib-htmlhelp"
+version = "2.0.0"
+requires_python = ">=3.6"
+summary = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files"
+files = [
+    {file = "sphinxcontrib-htmlhelp-2.0.0.tar.gz", hash = "sha256:f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"},
+    {file = "sphinxcontrib_htmlhelp-2.0.0-py2.py3-none-any.whl", hash = "sha256:d412243dfb797ae3ec2b59eca0e52dac12e75a241bf0e4eb861e450d06c6ed07"},
+]
+
+[[package]]
+name = "sphinxcontrib-jsmath"
+version = "1.0.1"
+requires_python = ">=3.5"
+summary = "A sphinx extension which renders display math in HTML via JavaScript"
+files = [
+    {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"},
+    {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"},
+]
+
+[[package]]
+name = "sphinxcontrib-qthelp"
+version = "1.0.3"
+requires_python = ">=3.5"
+summary = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."
+files = [
+    {file = "sphinxcontrib-qthelp-1.0.3.tar.gz", hash = "sha256:4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"},
+    {file = "sphinxcontrib_qthelp-1.0.3-py2.py3-none-any.whl", hash = "sha256:bd9fc24bcb748a8d51fd4ecaade681350aa63009a347a8c14e637895444dfab6"},
+]
+
+[[package]]
+name = "sphinxcontrib-serializinghtml"
+version = "1.1.5"
+requires_python = ">=3.5"
+summary = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."
+files = [
+    {file = "sphinxcontrib-serializinghtml-1.1.5.tar.gz", hash = "sha256:aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"},
+    {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"},
+]
+
+[[package]]
+name = "termcolor"
+version = "2.3.0"
+requires_python = ">=3.7"
+summary = "ANSI color formatting for output in terminal"
+files = [
+    {file = "termcolor-2.3.0-py3-none-any.whl", hash = "sha256:3afb05607b89aed0ffe25202399ee0867ad4d3cb4180d98aaf8eefa6a5f7d475"},
+    {file = "termcolor-2.3.0.tar.gz", hash = "sha256:b5b08f68937f138fe92f6c089b99f1e2da0ae56c52b78bf7075fd95420fd9a5a"},
+]
+
+[[package]]
+name = "toml"
+version = "0.10.2"
+requires_python = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+summary = "Python Library for Tom's Obvious, Minimal Language"
+files = [
+    {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
+    {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
+]
+
+[[package]]
+name = "tomli"
+version = "2.0.1"
+requires_python = ">=3.7"
+summary = "A lil' TOML parser"
+files = [
+    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
+    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
+]
+
+[[package]]
+name = "tornado"
+version = "6.2"
+requires_python = ">= 3.7"
+summary = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed."
+files = [
+    {file = "tornado-6.2-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:20f638fd8cc85f3cbae3c732326e96addff0a15e22d80f049e00121651e82e72"},
+    {file = "tornado-6.2-cp37-abi3-macosx_10_9_x86_64.whl", hash = "sha256:87dcafae3e884462f90c90ecc200defe5e580a7fbbb4365eda7c7c1eb809ebc9"},
+    {file = "tornado-6.2-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba09ef14ca9893954244fd872798b4ccb2367c165946ce2dd7376aebdde8e3ac"},
+    {file = "tornado-6.2-cp37-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b8150f721c101abdef99073bf66d3903e292d851bee51910839831caba341a75"},
+    {file = "tornado-6.2-cp37-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3a2f5999215a3a06a4fc218026cd84c61b8b2b40ac5296a6db1f1451ef04c1e"},
+    {file = "tornado-6.2-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:5f8c52d219d4995388119af7ccaa0bcec289535747620116a58d830e7c25d8a8"},
+    {file = "tornado-6.2-cp37-abi3-musllinux_1_1_i686.whl", hash = "sha256:6fdfabffd8dfcb6cf887428849d30cf19a3ea34c2c248461e1f7d718ad30b66b"},
+    {file = "tornado-6.2-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:1d54d13ab8414ed44de07efecb97d4ef7c39f7438cf5e976ccd356bebb1b5fca"},
+    {file = "tornado-6.2-cp37-abi3-win32.whl", hash = "sha256:5c87076709343557ef8032934ce5f637dbb552efa7b21d08e89ae7619ed0eb23"},
+    {file = "tornado-6.2-cp37-abi3-win_amd64.whl", hash = "sha256:e5f923aa6a47e133d1cf87d60700889d7eae68988704e20c75fb2d65677a8e4b"},
+    {file = "tornado-6.2.tar.gz", hash = "sha256:9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13"},
+]
+
+[[package]]
+name = "tox"
+version = "3.28.0"
+requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+summary = "tox is a generic virtualenv management and test command line tool"
+dependencies = [
+    "colorama>=0.4.1; platform_system == \"Windows\"",
+    "filelock>=3.0.0",
+    "importlib-metadata>=0.12; python_version < \"3.8\"",
+    "packaging>=14",
+    "pluggy>=0.12.0",
+    "py>=1.4.17",
+    "six>=1.14.0",
+    "tomli>=2.0.1; python_version >= \"3.7\" and python_version < \"3.11\"",
+    "virtualenv!=20.0.0,!=20.0.1,!=20.0.2,!=20.0.3,!=20.0.4,!=20.0.5,!=20.0.6,!=20.0.7,>=16.0.0",
+]
+files = [
+    {file = "tox-3.28.0-py2.py3-none-any.whl", hash = "sha256:57b5ab7e8bb3074edc3c0c0b4b192a4f3799d3723b2c5b76f1fa9f2d40316eea"},
+    {file = "tox-3.28.0.tar.gz", hash = "sha256:d0d28f3fe6d6d7195c27f8b054c3e99d5451952b54abdae673b71609a581f640"},
+]
+
+[[package]]
+name = "typed-ast"
+version = "1.5.5"
+requires_python = ">=3.6"
+summary = "a fork of Python 2 and 3 ast modules with type comment support"
+files = [
+    {file = "typed_ast-1.5.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4bc1efe0ce3ffb74784e06460f01a223ac1f6ab31c6bc0376a21184bf5aabe3b"},
+    {file = "typed_ast-1.5.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5f7a8c46a8b333f71abd61d7ab9255440d4a588f34a21f126bbfc95f6049e686"},
+    {file = "typed_ast-1.5.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:597fc66b4162f959ee6a96b978c0435bd63791e31e4f410622d19f1686d5e769"},
+    {file = "typed_ast-1.5.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d41b7a686ce653e06c2609075d397ebd5b969d821b9797d029fccd71fdec8e04"},
+    {file = "typed_ast-1.5.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5fe83a9a44c4ce67c796a1b466c270c1272e176603d5e06f6afbc101a572859d"},
+    {file = "typed_ast-1.5.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d5c0c112a74c0e5db2c75882a0adf3133adedcdbfd8cf7c9d6ed77365ab90a1d"},
+    {file = "typed_ast-1.5.5-cp310-cp310-win_amd64.whl", hash = "sha256:e1a976ed4cc2d71bb073e1b2a250892a6e968ff02aa14c1f40eba4f365ffec02"},
+    {file = "typed_ast-1.5.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c631da9710271cb67b08bd3f3813b7af7f4c69c319b75475436fcab8c3d21bee"},
+    {file = "typed_ast-1.5.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b445c2abfecab89a932b20bd8261488d574591173d07827c1eda32c457358b18"},
+    {file = "typed_ast-1.5.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc95ffaaab2be3b25eb938779e43f513e0e538a84dd14a5d844b8f2932593d88"},
+    {file = "typed_ast-1.5.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61443214d9b4c660dcf4b5307f15c12cb30bdfe9588ce6158f4a005baeb167b2"},
+    {file = "typed_ast-1.5.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6eb936d107e4d474940469e8ec5b380c9b329b5f08b78282d46baeebd3692dc9"},
+    {file = "typed_ast-1.5.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e48bf27022897577d8479eaed64701ecaf0467182448bd95759883300ca818c8"},
+    {file = "typed_ast-1.5.5-cp311-cp311-win_amd64.whl", hash = "sha256:83509f9324011c9a39faaef0922c6f720f9623afe3fe220b6d0b15638247206b"},
+    {file = "typed_ast-1.5.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2188bc33d85951ea4ddad55d2b35598b2709d122c11c75cffd529fbc9965508e"},
+    {file = "typed_ast-1.5.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0635900d16ae133cab3b26c607586131269f88266954eb04ec31535c9a12ef1e"},
+    {file = "typed_ast-1.5.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:57bfc3cf35a0f2fdf0a88a3044aafaec1d2f24d8ae8cd87c4f58d615fb5b6311"},
+    {file = "typed_ast-1.5.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:fe58ef6a764de7b4b36edfc8592641f56e69b7163bba9f9c8089838ee596bfb2"},
+    {file = "typed_ast-1.5.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d09d930c2d1d621f717bb217bf1fe2584616febb5138d9b3e8cdd26506c3f6d4"},
+    {file = "typed_ast-1.5.5-cp37-cp37m-win_amd64.whl", hash = "sha256:d40c10326893ecab8a80a53039164a224984339b2c32a6baf55ecbd5b1df6431"},
+    {file = "typed_ast-1.5.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:fd946abf3c31fb50eee07451a6aedbfff912fcd13cf357363f5b4e834cc5e71a"},
+    {file = "typed_ast-1.5.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ed4a1a42df8a3dfb6b40c3d2de109e935949f2f66b19703eafade03173f8f437"},
+    {file = "typed_ast-1.5.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:045f9930a1550d9352464e5149710d56a2aed23a2ffe78946478f7b5416f1ede"},
+    {file = "typed_ast-1.5.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:381eed9c95484ceef5ced626355fdc0765ab51d8553fec08661dce654a935db4"},
+    {file = "typed_ast-1.5.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:bfd39a41c0ef6f31684daff53befddae608f9daf6957140228a08e51f312d7e6"},
+    {file = "typed_ast-1.5.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8c524eb3024edcc04e288db9541fe1f438f82d281e591c548903d5b77ad1ddd4"},
+    {file = "typed_ast-1.5.5-cp38-cp38-win_amd64.whl", hash = "sha256:7f58fabdde8dcbe764cef5e1a7fcb440f2463c1bbbec1cf2a86ca7bc1f95184b"},
+    {file = "typed_ast-1.5.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:042eb665ff6bf020dd2243307d11ed626306b82812aba21836096d229fdc6a10"},
+    {file = "typed_ast-1.5.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:622e4a006472b05cf6ef7f9f2636edc51bda670b7bbffa18d26b255269d3d814"},
+    {file = "typed_ast-1.5.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1efebbbf4604ad1283e963e8915daa240cb4bf5067053cf2f0baadc4d4fb51b8"},
+    {file = "typed_ast-1.5.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f0aefdd66f1784c58f65b502b6cf8b121544680456d1cebbd300c2c813899274"},
+    {file = "typed_ast-1.5.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:48074261a842acf825af1968cd912f6f21357316080ebaca5f19abbb11690c8a"},
+    {file = "typed_ast-1.5.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:429ae404f69dc94b9361bb62291885894b7c6fb4640d561179548c849f8492ba"},
+    {file = "typed_ast-1.5.5-cp39-cp39-win_amd64.whl", hash = "sha256:335f22ccb244da2b5c296e6f96b06ee9bed46526db0de38d2f0e5a6597b81155"},
+    {file = "typed_ast-1.5.5.tar.gz", hash = "sha256:94282f7a354f36ef5dbce0ef3467ebf6a258e370ab33d5b40c249fa996e590dd"},
+]
+
+[[package]]
+name = "typing-extensions"
+version = "4.7.1"
+requires_python = ">=3.7"
+summary = "Backported and Experimental Type Hints for Python 3.7+"
+files = [
+    {file = "typing_extensions-4.7.1-py3-none-any.whl", hash = "sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36"},
+    {file = "typing_extensions-4.7.1.tar.gz", hash = "sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"},
+]
+
+[[package]]
+name = "typogrify"
+version = "2.0.7"
+summary = "Filters to enhance web typography, including support for Django & Jinja templates"
+dependencies = [
+    "smartypants>=1.8.3",
+]
+files = [
+    {file = "typogrify-2.0.7.tar.gz", hash = "sha256:8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"},
+]
+
+[[package]]
+name = "unidecode"
+version = "1.3.7"
+requires_python = ">=3.5"
+summary = "ASCII transliterations of Unicode text"
+files = [
+    {file = "Unidecode-1.3.7-py3-none-any.whl", hash = "sha256:663a537f506834ed836af26a81b210d90cbde044c47bfbdc0fbbc9f94c86a6e4"},
+    {file = "Unidecode-1.3.7.tar.gz", hash = "sha256:3c90b4662aa0de0cb591884b934ead8d2225f1800d8da675a7750cbc3bd94610"},
+]
+
+[[package]]
+name = "urllib3"
+version = "2.0.7"
+requires_python = ">=3.7"
+summary = "HTTP library with thread-safe connection pooling, file post, and more."
+files = [
+    {file = "urllib3-2.0.7-py3-none-any.whl", hash = "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"},
+    {file = "urllib3-2.0.7.tar.gz", hash = "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84"},
+]
+
+[[package]]
+name = "virtualenv"
+version = "20.24.6"
+requires_python = ">=3.7"
+summary = "Virtual Python Environment builder"
+dependencies = [
+    "distlib<1,>=0.3.7",
+    "filelock<4,>=3.12.2",
+    "importlib-metadata>=6.6; python_version < \"3.8\"",
+    "platformdirs<4,>=3.9.1",
+]
+files = [
+    {file = "virtualenv-20.24.6-py3-none-any.whl", hash = "sha256:520d056652454c5098a00c0f073611ccbea4c79089331f60bf9d7ba247bb7381"},
+    {file = "virtualenv-20.24.6.tar.gz", hash = "sha256:02ece4f56fbf939dbbc33c0715159951d6bf14aaf5457b092e4548e1382455af"},
+]
+
+[[package]]
+name = "zipp"
+version = "3.15.0"
+requires_python = ">=3.7"
+summary = "Backport of pathlib-compatible object wrapper for zip files"
+files = [
+    {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"},
+    {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"},
+]
diff --git a/pyproject.toml b/pyproject.toml
index 02d1160e..9383029b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,17 +1,30 @@
-[tool.poetry]
+[project]
+authors = [{ name = "Justin Mayer", email = "authors@getpelican.com" }]
+license = { text = "AGPLv3" }
+requires-python = ">=3.8,<4.0"
+dependencies = [
+    "blinker>=1.4",
+    "docutils>=0.16",
+    "feedgenerator>=1.9",
+    "jinja2>=2.7",
+    "pygments>=2.6",
+    "python-dateutil>=2.8",
+    "rich>=10.1",
+    "unidecode>=1.1",
+    "backports-zoneinfo<1.0.0,>=0.2.1; python_version < \"3.9\"",
+]
 name = "pelican"
 version = "4.8.0"
 description = "Static site generator supporting Markdown and reStructuredText"
-authors = ["Justin Mayer <entrop@gmail.com>"]
-license = "AGPLv3"
 readme = "README.rst"
 keywords = ["static site generator", "static sites", "ssg"]
-
-homepage = "https://getpelican.com"
-repository = "https://github.com/getpelican/pelican"
-documentation = "https://docs.getpelican.com"
-
 classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
     "Framework :: Pelican",
@@ -25,56 +38,12 @@ classifiers = [
     "Topic :: Text Processing :: Markup :: reStructuredText",
 ]
 
-[tool.poetry.urls]
-"Funding" = "https://donate.getpelican.com/"
-"Tracker" = "https://github.com/getpelican/pelican/issues"
-
-[tool.poetry.dependencies]
-python = ">=3.7,<4.0"
-blinker = ">=1.4"
-docutils = ">=0.16"
-feedgenerator = ">=1.9"
-jinja2 = ">=2.7"
-pygments = ">=2.6"
-python-dateutil = ">=2.8"
-rich = ">=10.1"
-unidecode = ">=1.1"
-markdown = {version = ">=3.1", optional = true}
-backports-zoneinfo = {version = "^0.2.1", python = "<3.9"}
-watchfiles = "^0.19.0"
-
-[tool.poetry.dev-dependencies]
-BeautifulSoup4 = "^4.9"
-jinja2 = "~3.1.2"
-lxml = "^4.3"
-markdown = "~3.4.3"
-typogrify = "^2.0"
-sphinx = "^5.1"
-furo = "2023.03.27"
-livereload = "^2.6"
-psutil = {version = "^5.7", optional = true}
-pygments = "~2.15"
-pytest = "^7.1"
-pytest-cov = "^4.0"
-pytest-sugar = "^0.9.5"
-pytest-xdist = "^2.0"
-ruff = "^0.1.3"
-tox = {version = "^3.13", optional = true}
-flake8 = "^3.8"
-flake8-import-order = "^0.18.1"
-invoke = "^2.0"
-isort = "^5.2"
-black = {version = "^19.10b0", allow-prereleases = true}
-
-[tool.poetry.extras]
-markdown = ["markdown"]
-
-[tool.poetry.scripts]
+[project.scripts]
 pelican = "pelican.__main__:main"
 pelican-import = "pelican.tools.pelican_import:main"
-pelican-plugins = "pelican.plugins._utils:list_plugins"
 pelican-quickstart = "pelican.tools.pelican_quickstart:main"
 pelican-themes = "pelican.tools.pelican_themes:main"
+pelican-plugins = "pelican.plugins._utils:list_plugins"
 
 [tool.autopub]
 project-name = "Pelican"
@@ -86,5 +55,49 @@ version-header = "="
 version-strings = ["setup.py"]
 build-system = "setuptools"
 
+[tool.pdm]
+
+[tool.pdm.scripts]
+docbuild = "invoke docbuild"
+docserve = "invoke docserve"
+
+[tool.pdm.dev-dependencies]
+dev = [
+    "BeautifulSoup4<5.0,>=4.9",
+    "jinja2~=3.1.2",
+    "lxml<5.0,>=4.3",
+    "markdown~=3.4.3",
+    "typogrify<3.0,>=2.0",
+    "sphinx<6.0,>=5.1",
+    "furo==2023.03.27",
+    "livereload<3.0,>=2.6",
+    "psutil<6.0,>=5.7",
+    "pygments~=2.15",
+    "pytest<8.0,>=7.1",
+    "pytest-cov<5.0,>=4.0",
+    "pytest-sugar<1.0.0,>=0.9.5",
+    "pytest-xdist<3.0,>=2.0",
+    "tox<4.0,>=3.13",
+    "flake8<4.0,>=3.8",
+    "flake8-import-order<1.0.0,>=0.18.1",
+    "invoke<3.0,>=2.0",
+    "isort<6.0,>=5.2",
+    "black<20.0,>=19.10b0",
+]
+
+[tool.pdm.build]
+includes = []
+
+[project.urls]
+Funding = "https://donate.getpelican.com/"
+Tracker = "https://github.com/getpelican/pelican/issues"
+Homepage = "https://getpelican.com"
+Repository = "https://github.com/getpelican/pelican"
+Documentation = "https://docs.getpelican.com"
+
+[project.optional-dependencies]
+markdown = ["markdown>=3.1"]
+
 [build-system]
-requires = ["setuptools >= 40.6.0", "wheel"]
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"

From c18f1a7308d528743746986d9aaebf29b04af645 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 28 Oct 2023 12:17:57 +0200
Subject: [PATCH 2624/2864] Re-order pyproject items, with other small fixes

---
 pyproject.toml | 74 ++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 9383029b..da9deec1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,33 @@
 [project]
+name = "pelican"
 authors = [{ name = "Justin Mayer", email = "authors@getpelican.com" }]
+description = "Static site generator supporting Markdown and reStructuredText"
+version = "4.8.0"
 license = { text = "AGPLv3" }
-requires-python = ">=3.8,<4.0"
+readme = "README.rst"
+keywords = ["static site generator", "static sites", "ssg"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Framework :: Pelican",
+    "Intended Audience :: End Users/Desktop",
+    "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Content Management System",
+    "Topic :: Internet :: WWW/HTTP :: Site Management",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Text Processing :: Markup :: Markdown",
+    "Topic :: Text Processing :: Markup :: HTML",
+    "Topic :: Text Processing :: Markup :: reStructuredText",
+]
+requires-python = ">=3.8.1,<4.0"
 dependencies = [
     "blinker>=1.4",
     "docutils>=0.16",
@@ -11,33 +37,19 @@ dependencies = [
     "python-dateutil>=2.8",
     "rich>=10.1",
     "unidecode>=1.1",
-    "backports-zoneinfo<1.0.0,>=0.2.1; python_version < \"3.9\"",
-]
-name = "pelican"
-version = "4.8.0"
-description = "Static site generator supporting Markdown and reStructuredText"
-readme = "README.rst"
-keywords = ["static site generator", "static sites", "ssg"]
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Development Status :: 5 - Production/Stable",
-    "Environment :: Console",
-    "Framework :: Pelican",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python :: Implementation :: CPython",
-    "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Content Management System",
-    "Topic :: Internet :: WWW/HTTP :: Site Management",
-    "Topic :: Software Development :: Libraries :: Python Modules",
-    "Topic :: Text Processing :: Markup :: Markdown",
-    "Topic :: Text Processing :: Markup :: HTML",
-    "Topic :: Text Processing :: Markup :: reStructuredText",
+    "backports-zoneinfo<1.0.0,>=0.2.1; python_version<3.9",
 ]
 
+[project.optional-dependencies]
+markdown = ["markdown>=3.1"]
+
+[project.urls]
+Homepage = "https://getpelican.com"
+Funding = "https://donate.getpelican.com/"
+"Issue Tracker" = "https://github.com/getpelican/pelican/issues"
+Repository = "https://github.com/getpelican/pelican"
+Documentation = "https://docs.getpelican.com"
+
 [project.scripts]
 pelican = "pelican.__main__:main"
 pelican-import = "pelican.tools.pelican_import:main"
@@ -88,16 +100,6 @@ dev = [
 [tool.pdm.build]
 includes = []
 
-[project.urls]
-Funding = "https://donate.getpelican.com/"
-Tracker = "https://github.com/getpelican/pelican/issues"
-Homepage = "https://getpelican.com"
-Repository = "https://github.com/getpelican/pelican"
-Documentation = "https://docs.getpelican.com"
-
-[project.optional-dependencies]
-markdown = ["markdown>=3.1"]
-
 [build-system]
 requires = ["pdm-backend"]
 build-backend = "pdm.backend"

From 8b6d2159345ee9260a2fda0911decab3248f112f Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Sat, 28 Oct 2023 17:43:16 +0200
Subject: [PATCH 2625/2864] migrate configuration to PEP621 compatible config

- adapt documentation
- add wheel tests to check wheel contents.
- adapt pipeline to use pdm
- adapt autopub config
- add scripts as shortcuts to invoke tasks
---
 .github/workflows/main.yml             |   17 +-
 .gitignore                             |    3 +-
 .pdm-python                            |    1 -
 docs/conf.py                           |   82 +-
 docs/contribute.rst                    |   12 +-
 docs/install.rst                       |    2 +-
 docs/quickstart.rst                    |    2 +-
 pdm.lock                               | 1431 ------------------------
 pelican/tests/build_test/conftest.py   |    7 +
 pelican/tests/build_test/test_wheel.py |   28 +
 pyproject.toml                         |   14 +-
 requirements/docs.pip                  |    1 +
 tasks.py                               |    6 +-
 13 files changed, 112 insertions(+), 1494 deletions(-)
 delete mode 100644 .pdm-python
 delete mode 100644 pdm.lock
 create mode 100644 pelican/tests/build_test/conftest.py
 create mode 100644 pelican/tests/build_test/test_wheel.py

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d867122f..ff1c15b5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -51,23 +51,18 @@ jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v3
-      - name: Install Poetry
-        run: pipx install poetry
-      - name: Set up Python
-        uses: actions/setup-python@v4
+      - uses: pdm-project/setup-pdm@v3
         with:
-          python-version: "3.9"
-          cache: "poetry"
-          cache-dependency-path: "pyproject.toml"
+          python-version: 3.9
+          cache: true
+          cache-dependency-path: ./pyproject.toml
       - name: Install dependencies
         run: |
-          poetry env use "3.9"
-          poetry install --no-interaction --no-root
+          pdm install
       - name: Run linters
-        run: poetry run invoke lint --diff
+        run: pdm lint --diff
 
   docs:
     name: Build docs
diff --git a/.gitignore b/.gitignore
index b94526d6..b27f3eb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ htmlcov
 venv
 samples/output
 *.pem
-poetry.lock
+*.lock
+.pdm-python
diff --git a/.pdm-python b/.pdm-python
deleted file mode 100644
index c740e1bd..00000000
--- a/.pdm-python
+++ /dev/null
@@ -1 +0,0 @@
-/Users/eliaskirchgaessner/Development/FOSS/pelican/.venv/bin/python
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index f00ed3c2..8d8078a2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -2,48 +2,58 @@ import datetime
 import os
 import sys
 
-from pelican import __version__
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
+
 
 sys.path.append(os.path.abspath(os.pardir))
 
+
+with open("../pyproject.toml", "rb") as f:
+    project_data = tomllib.load(f).get("project")
+    if project_data is None:
+        raise KeyError("project data is not found")
+
+
 # -- General configuration ----------------------------------------------------
-templates_path = ['_templates']
+templates_path = ["_templates"]
 extensions = [
     "sphinx.ext.autodoc",
     "sphinx.ext.ifconfig",
     "sphinx.ext.extlinks",
     "sphinxext.opengraph",
 ]
-source_suffix = '.rst'
-master_doc = 'index'
-project = 'Pelican'
+source_suffix = ".rst"
+master_doc = "index"
+project = project_data.get("name").upper()
 year = datetime.datetime.now().date().year
-copyright = f'2010–{year}'
-exclude_patterns = ['_build']
-release = __version__
-version = '.'.join(release.split('.')[:1])
-last_stable = __version__
-rst_prolog = '''
-.. |last_stable| replace:: :pelican-doc:`{}`
-'''.format(last_stable)
+copyright = f"2010–{year}"
+exclude_patterns = ["_build"]
+release = project_data.get("version")
+version = ".".join(release.split(".")[:1])
+last_stable = project_data.get("version")
+rst_prolog = f"""
+.. |last_stable| replace:: :pelican-doc:`{last_stable}`
+.. |min_python| replace:: {project_data.get('requires-python').split(",")[0]}
+"""
 
-extlinks = {
-    'pelican-doc':  ('https://docs.getpelican.com/en/latest/%s.html', '%s')
-}
+extlinks = {"pelican-doc": ("https://docs.getpelican.com/en/latest/%s.html", "%s")}
 
 # -- Options for HTML output --------------------------------------------------
 
-html_theme = 'furo'
-html_title = f'<strong>{project}</strong> <i>{release}</i>'
-html_static_path = ['_static']
+html_theme = "furo"
+html_title = f"<strong>{project}</strong> <i>{release}</i>"
+html_static_path = ["_static"]
 html_theme_options = {
-    'light_logo': 'pelican-logo.svg',
-    'dark_logo': 'pelican-logo.svg',
-    'navigation_with_keys': True,
+    "light_logo": "pelican-logo.svg",
+    "dark_logo": "pelican-logo.svg",
+    "navigation_with_keys": True,
 }
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Pelicandoc'
+htmlhelp_basename = "Pelicandoc"
 
 html_use_smartypants = True
 
@@ -59,21 +69,29 @@ html_show_sourcelink = False
 
 def setup(app):
     # overrides for wide tables in RTD theme
-    app.add_css_file('theme_overrides.css')   # path relative to _static
+    app.add_css_file("theme_overrides.css")  # path relative to _static
 
 
 # -- Options for LaTeX output -------------------------------------------------
 latex_documents = [
-    ('index', 'Pelican.tex', 'Pelican Documentation', 'Justin Mayer',
-     'manual'),
+    ("index", "Pelican.tex", "Pelican Documentation", "Justin Mayer", "manual"),
 ]
 
 # -- Options for manual page output -------------------------------------------
 man_pages = [
-    ('index', 'pelican', 'pelican documentation',
-     ['Justin Mayer'], 1),
-    ('pelican-themes', 'pelican-themes', 'A theme manager for Pelican',
-     ['Mickaël Raybaud'], 1),
-    ('themes', 'pelican-theming', 'How to create themes for Pelican',
-     ['The Pelican contributors'], 1)
+    ("index", "pelican", "pelican documentation", ["Justin Mayer"], 1),
+    (
+        "pelican-themes",
+        "pelican-themes",
+        "A theme manager for Pelican",
+        ["Mickaël Raybaud"],
+        1,
+    ),
+    (
+        "themes",
+        "pelican-theming",
+        "How to create themes for Pelican",
+        ["The Pelican contributors"],
+        1,
+    ),
 ]
diff --git a/docs/contribute.rst b/docs/contribute.rst
index cfbfe351..a5292dd5 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -15,16 +15,16 @@ Setting up the development environment
 ======================================
 
 While there are many ways to set up one's development environment, the following
-instructions will utilize Pip_ and Poetry_. These tools facilitate managing
+instructions will utilize Pip_ and pdm_. These tools facilitate managing
 virtual environments for separate Python projects that are isolated from one
 another, so you can use different packages (and package versions) for each.
 
-Please note that Python 3.7+ is required for Pelican development.
+Please note that Python |min_python| is required for Pelican development.
 
-*(Optional)* If you prefer to `install Poetry <https://python-poetry.org/docs/master/#installation>`_ once for use with multiple projects,
+*(Optional)* If you prefer to `install pdm <https://pdm.fming.dev/latest/#installation>`_ once for use with multiple projects,
 you can install it via::
 
-    curl -sSL https://install.python-poetry.org | python3 -
+    curl -sSL https://pdm.fming.dev/install-pdm.py | python3 -
 
 Point your web browser to the `Pelican repository`_ and tap the **Fork** button
 at top-right. Then clone the source for your fork and add the upstream project
@@ -35,7 +35,7 @@ as a Git remote::
     cd ~/projects/pelican
     git remote add upstream https://github.com/getpelican/pelican.git
 
-While Poetry can dynamically create and manage virtual environments, we're going
+While pdm can dynamically create and manage virtual environments, we're going
 to manually create and activate a virtual environment::
 
     mkdir ~/virtualenvs && cd ~/virtualenvs
@@ -51,7 +51,7 @@ Install the needed dependencies and set up the project::
 Your local environment should now be ready to go!
 
 .. _Pip: https://pip.pypa.io/
-.. _Poetry: https://python-poetry.org/
+.. _pdm: https://pdm.fming.dev/latest/
 .. _Pelican repository: https://github.com/getpelican/pelican
 
 Development
diff --git a/docs/install.rst b/docs/install.rst
index ea47311f..aa3c92d0 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -1,7 +1,7 @@
 Installing Pelican
 ##################
 
-Pelican currently runs best on 3.7+; earlier versions of Python are not supported.
+Pelican currently runs best on |min_python|; earlier versions of Python are not supported.
 
 You can install Pelican via several different methods. The simplest is via Pip_::
 
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index f1198b94..686b822f 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -8,7 +8,7 @@ Installation
 ------------
 
 Install Pelican (and optionally Markdown if you intend to use it) on Python
-3.7+ by running the following command in your preferred terminal, prefixing
+|min_python| by running the following command in your preferred terminal, prefixing
 with ``sudo`` if permissions warrant::
 
     python -m pip install "pelican[markdown]"
diff --git a/pdm.lock b/pdm.lock
deleted file mode 100644
index 0bfddb5e..00000000
--- a/pdm.lock
+++ /dev/null
@@ -1,1431 +0,0 @@
-# This file is @generated by PDM.
-# It is not intended for manual editing.
-
-[metadata]
-groups = ["default", "dev"]
-cross_platform = true
-static_urls = false
-lock_version = "4.3"
-content_hash = "sha256:0774056f38e53e29569c2888786ef845063ad0abcdaa8910c7795619996ef224"
-
-[[package]]
-name = "alabaster"
-version = "0.7.13"
-requires_python = ">=3.6"
-summary = "A configurable sidebar-enabled Sphinx theme"
-files = [
-    {file = "alabaster-0.7.13-py3-none-any.whl", hash = "sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"},
-    {file = "alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"},
-]
-
-[[package]]
-name = "appdirs"
-version = "1.4.4"
-summary = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
-files = [
-    {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"},
-    {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"},
-]
-
-[[package]]
-name = "attrs"
-version = "23.1.0"
-requires_python = ">=3.7"
-summary = "Classes Without Boilerplate"
-dependencies = [
-    "importlib-metadata; python_version < \"3.8\"",
-]
-files = [
-    {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"},
-    {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"},
-]
-
-[[package]]
-name = "babel"
-version = "2.13.0"
-requires_python = ">=3.7"
-summary = "Internationalization utilities"
-dependencies = [
-    "pytz>=2015.7; python_version < \"3.9\"",
-]
-files = [
-    {file = "Babel-2.13.0-py3-none-any.whl", hash = "sha256:fbfcae1575ff78e26c7449136f1abbefc3c13ce542eeb13d43d50d8b047216ec"},
-    {file = "Babel-2.13.0.tar.gz", hash = "sha256:04c3e2d28d2b7681644508f836be388ae49e0cfe91465095340395b60d00f210"},
-]
-
-[[package]]
-name = "backports-zoneinfo"
-version = "0.2.1"
-requires_python = ">=3.6"
-summary = "Backport of the standard library zoneinfo module"
-files = [
-    {file = "backports.zoneinfo-0.2.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:f04e857b59d9d1ccc39ce2da1021d196e47234873820cbeaad210724b1ee28ac"},
-    {file = "backports.zoneinfo-0.2.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:17746bd546106fa389c51dbea67c8b7c8f0d14b5526a579ca6ccf5ed72c526cf"},
-    {file = "backports.zoneinfo-0.2.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:5c144945a7752ca544b4b78c8c41544cdfaf9786f25fe5ffb10e838e19a27570"},
-    {file = "backports.zoneinfo-0.2.1-cp37-cp37m-win32.whl", hash = "sha256:e55b384612d93be96506932a786bbcde5a2db7a9e6a4bb4bffe8b733f5b9036b"},
-    {file = "backports.zoneinfo-0.2.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a76b38c52400b762e48131494ba26be363491ac4f9a04c1b7e92483d169f6582"},
-    {file = "backports.zoneinfo-0.2.1-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:8961c0f32cd0336fb8e8ead11a1f8cd99ec07145ec2931122faaac1c8f7fd987"},
-    {file = "backports.zoneinfo-0.2.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e81b76cace8eda1fca50e345242ba977f9be6ae3945af8d46326d776b4cf78d1"},
-    {file = "backports.zoneinfo-0.2.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7b0a64cda4145548fed9efc10322770f929b944ce5cee6c0dfe0c87bf4c0c8c9"},
-    {file = "backports.zoneinfo-0.2.1-cp38-cp38-win32.whl", hash = "sha256:1b13e654a55cd45672cb54ed12148cd33628f672548f373963b0bff67b217328"},
-    {file = "backports.zoneinfo-0.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:4a0f800587060bf8880f954dbef70de6c11bbe59c673c3d818921f042f9954a6"},
-    {file = "backports.zoneinfo-0.2.1.tar.gz", hash = "sha256:fadbfe37f74051d024037f223b8e001611eac868b5c5b06144ef4d8b799862f2"},
-]
-
-[[package]]
-name = "beautifulsoup4"
-version = "4.12.2"
-requires_python = ">=3.6.0"
-summary = "Screen-scraping library"
-dependencies = [
-    "soupsieve>1.2",
-]
-files = [
-    {file = "beautifulsoup4-4.12.2-py3-none-any.whl", hash = "sha256:bd2520ca0d9d7d12694a53d44ac482d181b4ec1888909b035a3dbf40d0f57d4a"},
-    {file = "beautifulsoup4-4.12.2.tar.gz", hash = "sha256:492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da"},
-]
-
-[[package]]
-name = "black"
-version = "19.10b0"
-requires_python = ">=3.6"
-summary = "The uncompromising code formatter."
-dependencies = [
-    "appdirs",
-    "attrs>=18.1.0",
-    "click>=6.5",
-    "pathspec<1,>=0.6",
-    "regex",
-    "toml>=0.9.4",
-    "typed-ast>=1.4.0",
-]
-files = [
-    {file = "black-19.10b0.tar.gz", hash = "sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539"},
-]
-
-[[package]]
-name = "blinker"
-version = "1.6.3"
-requires_python = ">=3.7"
-summary = "Fast, simple object-to-object and broadcast signaling"
-files = [
-    {file = "blinker-1.6.3-py3-none-any.whl", hash = "sha256:296320d6c28b006eb5e32d4712202dbcdcbf5dc482da298c2f44881c43884aaa"},
-    {file = "blinker-1.6.3.tar.gz", hash = "sha256:152090d27c1c5c722ee7e48504b02d76502811ce02e1523553b4cf8c8b3d3a8d"},
-]
-
-[[package]]
-name = "certifi"
-version = "2023.7.22"
-requires_python = ">=3.6"
-summary = "Python package for providing Mozilla's CA Bundle."
-files = [
-    {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"},
-    {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"},
-]
-
-[[package]]
-name = "charset-normalizer"
-version = "3.3.1"
-requires_python = ">=3.7.0"
-summary = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
-files = [
-    {file = "charset-normalizer-3.3.1.tar.gz", hash = "sha256:d9137a876020661972ca6eec0766d81aef8a5627df628b664b234b73396e727e"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:8aee051c89e13565c6bd366813c386939f8e928af93c29fda4af86d25b73d8f8"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:352a88c3df0d1fa886562384b86f9a9e27563d4704ee0e9d56ec6fcd270ea690"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:223b4d54561c01048f657fa6ce41461d5ad8ff128b9678cfe8b2ecd951e3f8a2"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4f861d94c2a450b974b86093c6c027888627b8082f1299dfd5a4bae8e2292821"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1171ef1fc5ab4693c5d151ae0fdad7f7349920eabbaca6271f95969fa0756c2d"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28f512b9a33235545fbbdac6a330a510b63be278a50071a336afc1b78781b147"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c0e842112fe3f1a4ffcf64b06dc4c61a88441c2f02f373367f7b4c1aa9be2ad5"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3f9bc2ce123637a60ebe819f9fccc614da1bcc05798bbbaf2dd4ec91f3e08846"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f194cce575e59ffe442c10a360182a986535fd90b57f7debfaa5c845c409ecc3"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:9a74041ba0bfa9bc9b9bb2cd3238a6ab3b7618e759b41bd15b5f6ad958d17605"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b578cbe580e3b41ad17b1c428f382c814b32a6ce90f2d8e39e2e635d49e498d1"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:6db3cfb9b4fcecb4390db154e75b49578c87a3b9979b40cdf90d7e4b945656e1"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:debb633f3f7856f95ad957d9b9c781f8e2c6303ef21724ec94bea2ce2fcbd056"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-win32.whl", hash = "sha256:87071618d3d8ec8b186d53cb6e66955ef2a0e4fa63ccd3709c0c90ac5a43520f"},
-    {file = "charset_normalizer-3.3.1-cp310-cp310-win_amd64.whl", hash = "sha256:e372d7dfd154009142631de2d316adad3cc1c36c32a38b16a4751ba78da2a397"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ae4070f741f8d809075ef697877fd350ecf0b7c5837ed68738607ee0a2c572cf"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:58e875eb7016fd014c0eea46c6fa92b87b62c0cb31b9feae25cbbe62c919f54d"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:dbd95e300367aa0827496fe75a1766d198d34385a58f97683fe6e07f89ca3e3c"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:de0b4caa1c8a21394e8ce971997614a17648f94e1cd0640fbd6b4d14cab13a72"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:985c7965f62f6f32bf432e2681173db41336a9c2611693247069288bcb0c7f8b"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a15c1fe6d26e83fd2e5972425a772cca158eae58b05d4a25a4e474c221053e2d"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ae55d592b02c4349525b6ed8f74c692509e5adffa842e582c0f861751701a673"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:be4d9c2770044a59715eb57c1144dedea7c5d5ae80c68fb9959515037cde2008"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:851cf693fb3aaef71031237cd68699dded198657ec1e76a76eb8be58c03a5d1f"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:31bbaba7218904d2eabecf4feec0d07469284e952a27400f23b6628439439fa7"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:871d045d6ccc181fd863a3cd66ee8e395523ebfbc57f85f91f035f50cee8e3d4"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:501adc5eb6cd5f40a6f77fbd90e5ab915c8fd6e8c614af2db5561e16c600d6f3"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f5fb672c396d826ca16a022ac04c9dce74e00a1c344f6ad1a0fdc1ba1f332213"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-win32.whl", hash = "sha256:bb06098d019766ca16fc915ecaa455c1f1cd594204e7f840cd6258237b5079a8"},
-    {file = "charset_normalizer-3.3.1-cp311-cp311-win_amd64.whl", hash = "sha256:8af5a8917b8af42295e86b64903156b4f110a30dca5f3b5aedea123fbd638bff"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:7ae8e5142dcc7a49168f4055255dbcced01dc1714a90a21f87448dc8d90617d1"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5b70bab78accbc672f50e878a5b73ca692f45f5b5e25c8066d748c09405e6a55"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5ceca5876032362ae73b83347be8b5dbd2d1faf3358deb38c9c88776779b2e2f"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34d95638ff3613849f473afc33f65c401a89f3b9528d0d213c7037c398a51296"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9edbe6a5bf8b56a4a84533ba2b2f489d0046e755c29616ef8830f9e7d9cf5728"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f6a02a3c7950cafaadcd46a226ad9e12fc9744652cc69f9e5534f98b47f3bbcf"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10b8dd31e10f32410751b3430996f9807fc4d1587ca69772e2aa940a82ab571a"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:edc0202099ea1d82844316604e17d2b175044f9bcb6b398aab781eba957224bd"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b891a2f68e09c5ef989007fac11476ed33c5c9994449a4e2c3386529d703dc8b"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:71ef3b9be10070360f289aea4838c784f8b851be3ba58cf796262b57775c2f14"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:55602981b2dbf8184c098bc10287e8c245e351cd4fdcad050bd7199d5a8bf514"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:46fb9970aa5eeca547d7aa0de5d4b124a288b42eaefac677bde805013c95725c"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:520b7a142d2524f999447b3a0cf95115df81c4f33003c51a6ab637cbda9d0bf4"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-win32.whl", hash = "sha256:8ec8ef42c6cd5856a7613dcd1eaf21e5573b2185263d87d27c8edcae33b62a61"},
-    {file = "charset_normalizer-3.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:baec8148d6b8bd5cee1ae138ba658c71f5b03e0d69d5907703e3e1df96db5e41"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:63a6f59e2d01310f754c270e4a257426fe5a591dc487f1983b3bbe793cf6bac6"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d6bfc32a68bc0933819cfdfe45f9abc3cae3877e1d90aac7259d57e6e0f85b1"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f3100d86dcd03c03f7e9c3fdb23d92e32abbca07e7c13ebd7ddfbcb06f5991f"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:39b70a6f88eebe239fa775190796d55a33cfb6d36b9ffdd37843f7c4c1b5dc67"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e12f8ee80aa35e746230a2af83e81bd6b52daa92a8afaef4fea4a2ce9b9f4fa"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b6cefa579e1237ce198619b76eaa148b71894fb0d6bcf9024460f9bf30fd228"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:61f1e3fb621f5420523abb71f5771a204b33c21d31e7d9d86881b2cffe92c47c"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:4f6e2a839f83a6a76854d12dbebde50e4b1afa63e27761549d006fa53e9aa80e"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:1ec937546cad86d0dce5396748bf392bb7b62a9eeb8c66efac60e947697f0e58"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:82ca51ff0fc5b641a2d4e1cc8c5ff108699b7a56d7f3ad6f6da9dbb6f0145b48"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:633968254f8d421e70f91c6ebe71ed0ab140220469cf87a9857e21c16687c034"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-win32.whl", hash = "sha256:c0c72d34e7de5604df0fde3644cc079feee5e55464967d10b24b1de268deceb9"},
-    {file = "charset_normalizer-3.3.1-cp37-cp37m-win_amd64.whl", hash = "sha256:63accd11149c0f9a99e3bc095bbdb5a464862d77a7e309ad5938fbc8721235ae"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5a3580a4fdc4ac05f9e53c57f965e3594b2f99796231380adb2baaab96e22761"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2465aa50c9299d615d757c1c888bc6fef384b7c4aec81c05a0172b4400f98557"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cb7cd68814308aade9d0c93c5bd2ade9f9441666f8ba5aa9c2d4b389cb5e2a45"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91e43805ccafa0a91831f9cd5443aa34528c0c3f2cc48c4cb3d9a7721053874b"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:854cc74367180beb327ab9d00f964f6d91da06450b0855cbbb09187bcdb02de5"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c15070ebf11b8b7fd1bfff7217e9324963c82dbdf6182ff7050519e350e7ad9f"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2c4c99f98fc3a1835af8179dcc9013f93594d0670e2fa80c83aa36346ee763d2"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3fb765362688821404ad6cf86772fc54993ec11577cd5a92ac44b4c2ba52155b"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dced27917823df984fe0c80a5c4ad75cf58df0fbfae890bc08004cd3888922a2"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a66bcdf19c1a523e41b8e9d53d0cedbfbac2e93c649a2e9502cb26c014d0980c"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:ecd26be9f112c4f96718290c10f4caea6cc798459a3a76636b817a0ed7874e42"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:3f70fd716855cd3b855316b226a1ac8bdb3caf4f7ea96edcccc6f484217c9597"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:17a866d61259c7de1bdadef418a37755050ddb4b922df8b356503234fff7932c"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-win32.whl", hash = "sha256:548eefad783ed787b38cb6f9a574bd8664468cc76d1538215d510a3cd41406cb"},
-    {file = "charset_normalizer-3.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:45f053a0ece92c734d874861ffe6e3cc92150e32136dd59ab1fb070575189c97"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bc791ec3fd0c4309a753f95bb6c749ef0d8ea3aea91f07ee1cf06b7b02118f2f"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0c8c61fb505c7dad1d251c284e712d4e0372cef3b067f7ddf82a7fa82e1e9a93"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2c092be3885a1b7899cd85ce24acedc1034199d6fca1483fa2c3a35c86e43041"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c2000c54c395d9e5e44c99dc7c20a64dc371f777faf8bae4919ad3e99ce5253e"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4cb50a0335382aac15c31b61d8531bc9bb657cfd848b1d7158009472189f3d62"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c30187840d36d0ba2893bc3271a36a517a717f9fd383a98e2697ee890a37c273"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fe81b35c33772e56f4b6cf62cf4aedc1762ef7162a31e6ac7fe5e40d0149eb67"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d0bf89afcbcf4d1bb2652f6580e5e55a840fdf87384f6063c4a4f0c95e378656"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:06cf46bdff72f58645434d467bf5228080801298fbba19fe268a01b4534467f5"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:3c66df3f41abee950d6638adc7eac4730a306b022570f71dd0bd6ba53503ab57"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:cd805513198304026bd379d1d516afbf6c3c13f4382134a2c526b8b854da1c2e"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:9505dc359edb6a330efcd2be825fdb73ee3e628d9010597aa1aee5aa63442e97"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:31445f38053476a0c4e6d12b047b08ced81e2c7c712e5a1ad97bc913256f91b2"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-win32.whl", hash = "sha256:bd28b31730f0e982ace8663d108e01199098432a30a4c410d06fe08fdb9e93f4"},
-    {file = "charset_normalizer-3.3.1-cp39-cp39-win_amd64.whl", hash = "sha256:555fe186da0068d3354cdf4bbcbc609b0ecae4d04c921cc13e209eece7720727"},
-    {file = "charset_normalizer-3.3.1-py3-none-any.whl", hash = "sha256:800561453acdecedaac137bf09cd719c7a440b6800ec182f077bb8e7025fb708"},
-]
-
-[[package]]
-name = "click"
-version = "8.1.7"
-requires_python = ">=3.7"
-summary = "Composable command line interface toolkit"
-dependencies = [
-    "colorama; platform_system == \"Windows\"",
-    "importlib-metadata; python_version < \"3.8\"",
-]
-files = [
-    {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"},
-    {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"},
-]
-
-[[package]]
-name = "colorama"
-version = "0.4.6"
-requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
-summary = "Cross-platform colored terminal text."
-files = [
-    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
-    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
-]
-
-[[package]]
-name = "coverage"
-version = "7.2.7"
-requires_python = ">=3.7"
-summary = "Code coverage measurement for Python"
-files = [
-    {file = "coverage-7.2.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d39b5b4f2a66ccae8b7263ac3c8170994b65266797fb96cbbfd3fb5b23921db8"},
-    {file = "coverage-7.2.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6d040ef7c9859bb11dfeb056ff5b3872436e3b5e401817d87a31e1750b9ae2fb"},
-    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba90a9563ba44a72fda2e85302c3abc71c5589cea608ca16c22b9804262aaeb6"},
-    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7d9405291c6928619403db1d10bd07888888ec1abcbd9748fdaa971d7d661b2"},
-    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31563e97dae5598556600466ad9beea39fb04e0229e61c12eaa206e0aa202063"},
-    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ebba1cd308ef115925421d3e6a586e655ca5a77b5bf41e02eb0e4562a111f2d1"},
-    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:cb017fd1b2603ef59e374ba2063f593abe0fc45f2ad9abdde5b4d83bd922a353"},
-    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62a5c7dad11015c66fbb9d881bc4caa5b12f16292f857842d9d1871595f4495"},
-    {file = "coverage-7.2.7-cp310-cp310-win32.whl", hash = "sha256:ee57190f24fba796e36bb6d3aa8a8783c643d8fa9760c89f7a98ab5455fbf818"},
-    {file = "coverage-7.2.7-cp310-cp310-win_amd64.whl", hash = "sha256:f75f7168ab25dd93110c8a8117a22450c19976afbc44234cbf71481094c1b850"},
-    {file = "coverage-7.2.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:06a9a2be0b5b576c3f18f1a241f0473575c4a26021b52b2a85263a00f034d51f"},
-    {file = "coverage-7.2.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5baa06420f837184130752b7c5ea0808762083bf3487b5038d68b012e5937dbe"},
-    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdec9e8cbf13a5bf63290fc6013d216a4c7232efb51548594ca3631a7f13c3a3"},
-    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:52edc1a60c0d34afa421c9c37078817b2e67a392cab17d97283b64c5833f427f"},
-    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63426706118b7f5cf6bb6c895dc215d8a418d5952544042c8a2d9fe87fcf09cb"},
-    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:afb17f84d56068a7c29f5fa37bfd38d5aba69e3304af08ee94da8ed5b0865833"},
-    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:48c19d2159d433ccc99e729ceae7d5293fbffa0bdb94952d3579983d1c8c9d97"},
-    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0e1f928eaf5469c11e886fe0885ad2bf1ec606434e79842a879277895a50942a"},
-    {file = "coverage-7.2.7-cp311-cp311-win32.whl", hash = "sha256:33d6d3ea29d5b3a1a632b3c4e4f4ecae24ef170b0b9ee493883f2df10039959a"},
-    {file = "coverage-7.2.7-cp311-cp311-win_amd64.whl", hash = "sha256:5b7540161790b2f28143191f5f8ec02fb132660ff175b7747b95dcb77ac26562"},
-    {file = "coverage-7.2.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f2f67fe12b22cd130d34d0ef79206061bfb5eda52feb6ce0dba0644e20a03cf4"},
-    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a342242fe22407f3c17f4b499276a02b01e80f861f1682ad1d95b04018e0c0d4"},
-    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:171717c7cb6b453aebac9a2ef603699da237f341b38eebfee9be75d27dc38e01"},
-    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49969a9f7ffa086d973d91cec8d2e31080436ef0fb4a359cae927e742abfaaa6"},
-    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b46517c02ccd08092f4fa99f24c3b83d8f92f739b4657b0f146246a0ca6a831d"},
-    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:a3d33a6b3eae87ceaefa91ffdc130b5e8536182cd6dfdbfc1aa56b46ff8c86de"},
-    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:976b9c42fb2a43ebf304fa7d4a310e5f16cc99992f33eced91ef6f908bd8f33d"},
-    {file = "coverage-7.2.7-cp312-cp312-win32.whl", hash = "sha256:8de8bb0e5ad103888d65abef8bca41ab93721647590a3f740100cd65c3b00511"},
-    {file = "coverage-7.2.7-cp312-cp312-win_amd64.whl", hash = "sha256:9e31cb64d7de6b6f09702bb27c02d1904b3aebfca610c12772452c4e6c21a0d3"},
-    {file = "coverage-7.2.7-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:58c2ccc2f00ecb51253cbe5d8d7122a34590fac9646a960d1430d5b15321d95f"},
-    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d22656368f0e6189e24722214ed8d66b8022db19d182927b9a248a2a8a2f67eb"},
-    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a895fcc7b15c3fc72beb43cdcbdf0ddb7d2ebc959edac9cef390b0d14f39f8a9"},
-    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e84606b74eb7de6ff581a7915e2dab7a28a0517fbe1c9239eb227e1354064dcd"},
-    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0a5f9e1dbd7fbe30196578ca36f3fba75376fb99888c395c5880b355e2875f8a"},
-    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:419bfd2caae268623dd469eff96d510a920c90928b60f2073d79f8fe2bbc5959"},
-    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:2aee274c46590717f38ae5e4650988d1af340fe06167546cc32fe2f58ed05b02"},
-    {file = "coverage-7.2.7-cp37-cp37m-win32.whl", hash = "sha256:61b9a528fb348373c433e8966535074b802c7a5d7f23c4f421e6c6e2f1697a6f"},
-    {file = "coverage-7.2.7-cp37-cp37m-win_amd64.whl", hash = "sha256:b1c546aca0ca4d028901d825015dc8e4d56aac4b541877690eb76490f1dc8ed0"},
-    {file = "coverage-7.2.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:54b896376ab563bd38453cecb813c295cf347cf5906e8b41d340b0321a5433e5"},
-    {file = "coverage-7.2.7-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3d376df58cc111dc8e21e3b6e24606b5bb5dee6024f46a5abca99124b2229ef5"},
-    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e330fc79bd7207e46c7d7fd2bb4af2963f5f635703925543a70b99574b0fea9"},
-    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e9d683426464e4a252bf70c3498756055016f99ddaec3774bf368e76bbe02b6"},
-    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d13c64ee2d33eccf7437961b6ea7ad8673e2be040b4f7fd4fd4d4d28d9ccb1e"},
-    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b7aa5f8a41217360e600da646004f878250a0d6738bcdc11a0a39928d7dc2050"},
-    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8fa03bce9bfbeeef9f3b160a8bed39a221d82308b4152b27d82d8daa7041fee5"},
-    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:245167dd26180ab4c91d5e1496a30be4cd721a5cf2abf52974f965f10f11419f"},
-    {file = "coverage-7.2.7-cp38-cp38-win32.whl", hash = "sha256:d2c2db7fd82e9b72937969bceac4d6ca89660db0a0967614ce2481e81a0b771e"},
-    {file = "coverage-7.2.7-cp38-cp38-win_amd64.whl", hash = "sha256:2e07b54284e381531c87f785f613b833569c14ecacdcb85d56b25c4622c16c3c"},
-    {file = "coverage-7.2.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:537891ae8ce59ef63d0123f7ac9e2ae0fc8b72c7ccbe5296fec45fd68967b6c9"},
-    {file = "coverage-7.2.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:06fb182e69f33f6cd1d39a6c597294cff3143554b64b9825d1dc69d18cc2fff2"},
-    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:201e7389591af40950a6480bd9edfa8ed04346ff80002cec1a66cac4549c1ad7"},
-    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f6951407391b639504e3b3be51b7ba5f3528adbf1a8ac3302b687ecababf929e"},
-    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f48351d66575f535669306aa7d6d6f71bc43372473b54a832222803eb956fd1"},
-    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b29019c76039dc3c0fd815c41392a044ce555d9bcdd38b0fb60fb4cd8e475ba9"},
-    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:81c13a1fc7468c40f13420732805a4c38a105d89848b7c10af65a90beff25250"},
-    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:975d70ab7e3c80a3fe86001d8751f6778905ec723f5b110aed1e450da9d4b7f2"},
-    {file = "coverage-7.2.7-cp39-cp39-win32.whl", hash = "sha256:7ee7d9d4822c8acc74a5e26c50604dff824710bc8de424904c0982e25c39c6cb"},
-    {file = "coverage-7.2.7-cp39-cp39-win_amd64.whl", hash = "sha256:eb393e5ebc85245347950143969b241d08b52b88a3dc39479822e073a1a8eb27"},
-    {file = "coverage-7.2.7-pp37.pp38.pp39-none-any.whl", hash = "sha256:b7b4c971f05e6ae490fef852c218b0e79d4e52f79ef0c8475566584a8fb3e01d"},
-    {file = "coverage-7.2.7.tar.gz", hash = "sha256:924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59"},
-]
-
-[[package]]
-name = "coverage"
-version = "7.2.7"
-extras = ["toml"]
-requires_python = ">=3.7"
-summary = "Code coverage measurement for Python"
-dependencies = [
-    "coverage==7.2.7",
-    "tomli; python_full_version <= \"3.11.0a6\"",
-]
-files = [
-    {file = "coverage-7.2.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d39b5b4f2a66ccae8b7263ac3c8170994b65266797fb96cbbfd3fb5b23921db8"},
-    {file = "coverage-7.2.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6d040ef7c9859bb11dfeb056ff5b3872436e3b5e401817d87a31e1750b9ae2fb"},
-    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba90a9563ba44a72fda2e85302c3abc71c5589cea608ca16c22b9804262aaeb6"},
-    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7d9405291c6928619403db1d10bd07888888ec1abcbd9748fdaa971d7d661b2"},
-    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31563e97dae5598556600466ad9beea39fb04e0229e61c12eaa206e0aa202063"},
-    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ebba1cd308ef115925421d3e6a586e655ca5a77b5bf41e02eb0e4562a111f2d1"},
-    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:cb017fd1b2603ef59e374ba2063f593abe0fc45f2ad9abdde5b4d83bd922a353"},
-    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62a5c7dad11015c66fbb9d881bc4caa5b12f16292f857842d9d1871595f4495"},
-    {file = "coverage-7.2.7-cp310-cp310-win32.whl", hash = "sha256:ee57190f24fba796e36bb6d3aa8a8783c643d8fa9760c89f7a98ab5455fbf818"},
-    {file = "coverage-7.2.7-cp310-cp310-win_amd64.whl", hash = "sha256:f75f7168ab25dd93110c8a8117a22450c19976afbc44234cbf71481094c1b850"},
-    {file = "coverage-7.2.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:06a9a2be0b5b576c3f18f1a241f0473575c4a26021b52b2a85263a00f034d51f"},
-    {file = "coverage-7.2.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5baa06420f837184130752b7c5ea0808762083bf3487b5038d68b012e5937dbe"},
-    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdec9e8cbf13a5bf63290fc6013d216a4c7232efb51548594ca3631a7f13c3a3"},
-    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:52edc1a60c0d34afa421c9c37078817b2e67a392cab17d97283b64c5833f427f"},
-    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63426706118b7f5cf6bb6c895dc215d8a418d5952544042c8a2d9fe87fcf09cb"},
-    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:afb17f84d56068a7c29f5fa37bfd38d5aba69e3304af08ee94da8ed5b0865833"},
-    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:48c19d2159d433ccc99e729ceae7d5293fbffa0bdb94952d3579983d1c8c9d97"},
-    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0e1f928eaf5469c11e886fe0885ad2bf1ec606434e79842a879277895a50942a"},
-    {file = "coverage-7.2.7-cp311-cp311-win32.whl", hash = "sha256:33d6d3ea29d5b3a1a632b3c4e4f4ecae24ef170b0b9ee493883f2df10039959a"},
-    {file = "coverage-7.2.7-cp311-cp311-win_amd64.whl", hash = "sha256:5b7540161790b2f28143191f5f8ec02fb132660ff175b7747b95dcb77ac26562"},
-    {file = "coverage-7.2.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f2f67fe12b22cd130d34d0ef79206061bfb5eda52feb6ce0dba0644e20a03cf4"},
-    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a342242fe22407f3c17f4b499276a02b01e80f861f1682ad1d95b04018e0c0d4"},
-    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:171717c7cb6b453aebac9a2ef603699da237f341b38eebfee9be75d27dc38e01"},
-    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49969a9f7ffa086d973d91cec8d2e31080436ef0fb4a359cae927e742abfaaa6"},
-    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b46517c02ccd08092f4fa99f24c3b83d8f92f739b4657b0f146246a0ca6a831d"},
-    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:a3d33a6b3eae87ceaefa91ffdc130b5e8536182cd6dfdbfc1aa56b46ff8c86de"},
-    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:976b9c42fb2a43ebf304fa7d4a310e5f16cc99992f33eced91ef6f908bd8f33d"},
-    {file = "coverage-7.2.7-cp312-cp312-win32.whl", hash = "sha256:8de8bb0e5ad103888d65abef8bca41ab93721647590a3f740100cd65c3b00511"},
-    {file = "coverage-7.2.7-cp312-cp312-win_amd64.whl", hash = "sha256:9e31cb64d7de6b6f09702bb27c02d1904b3aebfca610c12772452c4e6c21a0d3"},
-    {file = "coverage-7.2.7-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:58c2ccc2f00ecb51253cbe5d8d7122a34590fac9646a960d1430d5b15321d95f"},
-    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d22656368f0e6189e24722214ed8d66b8022db19d182927b9a248a2a8a2f67eb"},
-    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a895fcc7b15c3fc72beb43cdcbdf0ddb7d2ebc959edac9cef390b0d14f39f8a9"},
-    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e84606b74eb7de6ff581a7915e2dab7a28a0517fbe1c9239eb227e1354064dcd"},
-    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0a5f9e1dbd7fbe30196578ca36f3fba75376fb99888c395c5880b355e2875f8a"},
-    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:419bfd2caae268623dd469eff96d510a920c90928b60f2073d79f8fe2bbc5959"},
-    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:2aee274c46590717f38ae5e4650988d1af340fe06167546cc32fe2f58ed05b02"},
-    {file = "coverage-7.2.7-cp37-cp37m-win32.whl", hash = "sha256:61b9a528fb348373c433e8966535074b802c7a5d7f23c4f421e6c6e2f1697a6f"},
-    {file = "coverage-7.2.7-cp37-cp37m-win_amd64.whl", hash = "sha256:b1c546aca0ca4d028901d825015dc8e4d56aac4b541877690eb76490f1dc8ed0"},
-    {file = "coverage-7.2.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:54b896376ab563bd38453cecb813c295cf347cf5906e8b41d340b0321a5433e5"},
-    {file = "coverage-7.2.7-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3d376df58cc111dc8e21e3b6e24606b5bb5dee6024f46a5abca99124b2229ef5"},
-    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e330fc79bd7207e46c7d7fd2bb4af2963f5f635703925543a70b99574b0fea9"},
-    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e9d683426464e4a252bf70c3498756055016f99ddaec3774bf368e76bbe02b6"},
-    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d13c64ee2d33eccf7437961b6ea7ad8673e2be040b4f7fd4fd4d4d28d9ccb1e"},
-    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b7aa5f8a41217360e600da646004f878250a0d6738bcdc11a0a39928d7dc2050"},
-    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8fa03bce9bfbeeef9f3b160a8bed39a221d82308b4152b27d82d8daa7041fee5"},
-    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:245167dd26180ab4c91d5e1496a30be4cd721a5cf2abf52974f965f10f11419f"},
-    {file = "coverage-7.2.7-cp38-cp38-win32.whl", hash = "sha256:d2c2db7fd82e9b72937969bceac4d6ca89660db0a0967614ce2481e81a0b771e"},
-    {file = "coverage-7.2.7-cp38-cp38-win_amd64.whl", hash = "sha256:2e07b54284e381531c87f785f613b833569c14ecacdcb85d56b25c4622c16c3c"},
-    {file = "coverage-7.2.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:537891ae8ce59ef63d0123f7ac9e2ae0fc8b72c7ccbe5296fec45fd68967b6c9"},
-    {file = "coverage-7.2.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:06fb182e69f33f6cd1d39a6c597294cff3143554b64b9825d1dc69d18cc2fff2"},
-    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:201e7389591af40950a6480bd9edfa8ed04346ff80002cec1a66cac4549c1ad7"},
-    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f6951407391b639504e3b3be51b7ba5f3528adbf1a8ac3302b687ecababf929e"},
-    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f48351d66575f535669306aa7d6d6f71bc43372473b54a832222803eb956fd1"},
-    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b29019c76039dc3c0fd815c41392a044ce555d9bcdd38b0fb60fb4cd8e475ba9"},
-    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:81c13a1fc7468c40f13420732805a4c38a105d89848b7c10af65a90beff25250"},
-    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:975d70ab7e3c80a3fe86001d8751f6778905ec723f5b110aed1e450da9d4b7f2"},
-    {file = "coverage-7.2.7-cp39-cp39-win32.whl", hash = "sha256:7ee7d9d4822c8acc74a5e26c50604dff824710bc8de424904c0982e25c39c6cb"},
-    {file = "coverage-7.2.7-cp39-cp39-win_amd64.whl", hash = "sha256:eb393e5ebc85245347950143969b241d08b52b88a3dc39479822e073a1a8eb27"},
-    {file = "coverage-7.2.7-pp37.pp38.pp39-none-any.whl", hash = "sha256:b7b4c971f05e6ae490fef852c218b0e79d4e52f79ef0c8475566584a8fb3e01d"},
-    {file = "coverage-7.2.7.tar.gz", hash = "sha256:924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59"},
-]
-
-[[package]]
-name = "distlib"
-version = "0.3.7"
-summary = "Distribution utilities"
-files = [
-    {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"},
-    {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"},
-]
-
-[[package]]
-name = "docutils"
-version = "0.19"
-requires_python = ">=3.7"
-summary = "Docutils -- Python Documentation Utilities"
-files = [
-    {file = "docutils-0.19-py3-none-any.whl", hash = "sha256:5e1de4d849fee02c63b040a4a3fd567f4ab104defd8a5511fbbc24a8a017efbc"},
-    {file = "docutils-0.19.tar.gz", hash = "sha256:33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6"},
-]
-
-[[package]]
-name = "exceptiongroup"
-version = "1.1.3"
-requires_python = ">=3.7"
-summary = "Backport of PEP 654 (exception groups)"
-files = [
-    {file = "exceptiongroup-1.1.3-py3-none-any.whl", hash = "sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3"},
-    {file = "exceptiongroup-1.1.3.tar.gz", hash = "sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9"},
-]
-
-[[package]]
-name = "execnet"
-version = "2.0.2"
-requires_python = ">=3.7"
-summary = "execnet: rapid multi-Python deployment"
-files = [
-    {file = "execnet-2.0.2-py3-none-any.whl", hash = "sha256:88256416ae766bc9e8895c76a87928c0012183da3cc4fc18016e6f050e025f41"},
-    {file = "execnet-2.0.2.tar.gz", hash = "sha256:cc59bc4423742fd71ad227122eb0dd44db51efb3dc4095b45ac9a08c770096af"},
-]
-
-[[package]]
-name = "feedgenerator"
-version = "2.1.0"
-requires_python = ">=3.7"
-summary = "Standalone version of django.utils.feedgenerator"
-dependencies = [
-    "pytz>=0a",
-]
-files = [
-    {file = "feedgenerator-2.1.0-py3-none-any.whl", hash = "sha256:93b7ce1c5a86195cafd6a8e9baf6a2a863ebd6d9905e840ce5778f73efd9a8d5"},
-    {file = "feedgenerator-2.1.0.tar.gz", hash = "sha256:f075f23f28fd227f097c36b212161c6cf012e1c6caaf7ff53d5d6bb02cd42b9d"},
-]
-
-[[package]]
-name = "filelock"
-version = "3.12.2"
-requires_python = ">=3.7"
-summary = "A platform independent file lock."
-files = [
-    {file = "filelock-3.12.2-py3-none-any.whl", hash = "sha256:cbb791cdea2a72f23da6ac5b5269ab0a0d161e9ef0100e653b69049a7706d1ec"},
-    {file = "filelock-3.12.2.tar.gz", hash = "sha256:002740518d8aa59a26b0c76e10fb8c6e15eae825d34b6fdf670333fd7b938d81"},
-]
-
-[[package]]
-name = "flake8"
-version = "3.9.2"
-requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
-summary = "the modular source code checker: pep8 pyflakes and co"
-dependencies = [
-    "importlib-metadata; python_version < \"3.8\"",
-    "mccabe<0.7.0,>=0.6.0",
-    "pycodestyle<2.8.0,>=2.7.0",
-    "pyflakes<2.4.0,>=2.3.0",
-]
-files = [
-    {file = "flake8-3.9.2-py2.py3-none-any.whl", hash = "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"},
-    {file = "flake8-3.9.2.tar.gz", hash = "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"},
-]
-
-[[package]]
-name = "flake8-import-order"
-version = "0.18.2"
-summary = "Flake8 and pylama plugin that checks the ordering of import statements."
-dependencies = [
-    "pycodestyle",
-    "setuptools",
-]
-files = [
-    {file = "flake8-import-order-0.18.2.tar.gz", hash = "sha256:e23941f892da3e0c09d711babbb0c73bc735242e9b216b726616758a920d900e"},
-    {file = "flake8_import_order-0.18.2-py2.py3-none-any.whl", hash = "sha256:82ed59f1083b629b030ee9d3928d9e06b6213eb196fe745b3a7d4af2168130df"},
-]
-
-[[package]]
-name = "furo"
-version = "2023.3.27"
-requires_python = ">=3.7"
-summary = "A clean customisable Sphinx documentation theme."
-dependencies = [
-    "beautifulsoup4",
-    "pygments>=2.7",
-    "sphinx-basic-ng",
-    "sphinx<7.0,>=5.0",
-]
-files = [
-    {file = "furo-2023.3.27-py3-none-any.whl", hash = "sha256:4ab2be254a2d5e52792d0ca793a12c35582dd09897228a6dd47885dabd5c9521"},
-    {file = "furo-2023.3.27.tar.gz", hash = "sha256:b99e7867a5cc833b2b34d7230631dd6558c7a29f93071fdbb5709634bb33c5a5"},
-]
-
-[[package]]
-name = "idna"
-version = "3.4"
-requires_python = ">=3.5"
-summary = "Internationalized Domain Names in Applications (IDNA)"
-files = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
-]
-
-[[package]]
-name = "imagesize"
-version = "1.4.1"
-requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-summary = "Getting image size from png/jpeg/jpeg2000/gif file"
-files = [
-    {file = "imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b"},
-    {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"},
-]
-
-[[package]]
-name = "importlib-metadata"
-version = "6.7.0"
-requires_python = ">=3.7"
-summary = "Read metadata from Python packages"
-dependencies = [
-    "typing-extensions>=3.6.4; python_version < \"3.8\"",
-    "zipp>=0.5",
-]
-files = [
-    {file = "importlib_metadata-6.7.0-py3-none-any.whl", hash = "sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5"},
-    {file = "importlib_metadata-6.7.0.tar.gz", hash = "sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4"},
-]
-
-[[package]]
-name = "iniconfig"
-version = "2.0.0"
-requires_python = ">=3.7"
-summary = "brain-dead simple config-ini parsing"
-files = [
-    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
-    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
-]
-
-[[package]]
-name = "invoke"
-version = "2.2.0"
-requires_python = ">=3.6"
-summary = "Pythonic task execution"
-files = [
-    {file = "invoke-2.2.0-py3-none-any.whl", hash = "sha256:6ea924cc53d4f78e3d98bc436b08069a03077e6f85ad1ddaa8a116d7dad15820"},
-    {file = "invoke-2.2.0.tar.gz", hash = "sha256:ee6cbb101af1a859c7fe84f2a264c059020b0cb7fe3535f9424300ab568f6bd5"},
-]
-
-[[package]]
-name = "isort"
-version = "5.11.5"
-requires_python = ">=3.7.0"
-summary = "A Python utility / library to sort Python imports."
-files = [
-    {file = "isort-5.11.5-py3-none-any.whl", hash = "sha256:ba1d72fb2595a01c7895a5128f9585a5cc4b6d395f1c8d514989b9a7eb2a8746"},
-    {file = "isort-5.11.5.tar.gz", hash = "sha256:6be1f76a507cb2ecf16c7cf14a37e41609ca082330be4e3436a18ef74add55db"},
-]
-
-[[package]]
-name = "jinja2"
-version = "3.1.2"
-requires_python = ">=3.7"
-summary = "A very fast and expressive template engine."
-dependencies = [
-    "MarkupSafe>=2.0",
-]
-files = [
-    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
-    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
-]
-
-[[package]]
-name = "livereload"
-version = "2.6.3"
-summary = "Python LiveReload is an awesome tool for web developers"
-dependencies = [
-    "six",
-    "tornado; python_version > \"2.7\"",
-]
-files = [
-    {file = "livereload-2.6.3-py2.py3-none-any.whl", hash = "sha256:ad4ac6f53b2d62bb6ce1a5e6e96f1f00976a32348afedcb4b6d68df2a1d346e4"},
-    {file = "livereload-2.6.3.tar.gz", hash = "sha256:776f2f865e59fde56490a56bcc6773b6917366bce0c267c60ee8aaf1a0959869"},
-]
-
-[[package]]
-name = "lxml"
-version = "4.9.3"
-requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*"
-summary = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
-files = [
-    {file = "lxml-4.9.3-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:b86164d2cff4d3aaa1f04a14685cbc072efd0b4f99ca5708b2ad1b9b5988a991"},
-    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:42871176e7896d5d45138f6d28751053c711ed4d48d8e30b498da155af39aebd"},
-    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ae8b9c6deb1e634ba4f1930eb67ef6e6bf6a44b6eb5ad605642b2d6d5ed9ce3c"},
-    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:411007c0d88188d9f621b11d252cce90c4a2d1a49db6c068e3c16422f306eab8"},
-    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:cd47b4a0d41d2afa3e58e5bf1f62069255aa2fd6ff5ee41604418ca925911d76"},
-    {file = "lxml-4.9.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0e2cb47860da1f7e9a5256254b74ae331687b9672dfa780eed355c4c9c3dbd23"},
-    {file = "lxml-4.9.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1247694b26342a7bf47c02e513d32225ededd18045264d40758abeb3c838a51f"},
-    {file = "lxml-4.9.3-cp310-cp310-win32.whl", hash = "sha256:cdb650fc86227eba20de1a29d4b2c1bfe139dc75a0669270033cb2ea3d391b85"},
-    {file = "lxml-4.9.3-cp310-cp310-win_amd64.whl", hash = "sha256:97047f0d25cd4bcae81f9ec9dc290ca3e15927c192df17331b53bebe0e3ff96d"},
-    {file = "lxml-4.9.3-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:1f447ea5429b54f9582d4b955f5f1985f278ce5cf169f72eea8afd9502973dd5"},
-    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:57d6ba0ca2b0c462f339640d22882acc711de224d769edf29962b09f77129cbf"},
-    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:9767e79108424fb6c3edf8f81e6730666a50feb01a328f4a016464a5893f835a"},
-    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:71c52db65e4b56b8ddc5bb89fb2e66c558ed9d1a74a45ceb7dcb20c191c3df2f"},
-    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d73d8ecf8ecf10a3bd007f2192725a34bd62898e8da27eb9d32a58084f93962b"},
-    {file = "lxml-4.9.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0a3d3487f07c1d7f150894c238299934a2a074ef590b583103a45002035be120"},
-    {file = "lxml-4.9.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e28c51fa0ce5674be9f560c6761c1b441631901993f76700b1b30ca6c8378d6"},
-    {file = "lxml-4.9.3-cp311-cp311-win32.whl", hash = "sha256:0bfd0767c5c1de2551a120673b72e5d4b628737cb05414f03c3277bf9bed3305"},
-    {file = "lxml-4.9.3-cp311-cp311-win_amd64.whl", hash = "sha256:25f32acefac14ef7bd53e4218fe93b804ef6f6b92ffdb4322bb6d49d94cad2bc"},
-    {file = "lxml-4.9.3-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:d3ff32724f98fbbbfa9f49d82852b159e9784d6094983d9a8b7f2ddaebb063d4"},
-    {file = "lxml-4.9.3-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:48d6ed886b343d11493129e019da91d4039826794a3e3027321c56d9e71505be"},
-    {file = "lxml-4.9.3-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:9a92d3faef50658dd2c5470af249985782bf754c4e18e15afb67d3ab06233f13"},
-    {file = "lxml-4.9.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b4e4bc18382088514ebde9328da057775055940a1f2e18f6ad2d78aa0f3ec5b9"},
-    {file = "lxml-4.9.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fc9b106a1bf918db68619fdcd6d5ad4f972fdd19c01d19bdb6bf63f3589a9ec5"},
-    {file = "lxml-4.9.3-cp312-cp312-win_amd64.whl", hash = "sha256:d37017287a7adb6ab77e1c5bee9bcf9660f90ff445042b790402a654d2ad81d8"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:46f409a2d60f634fe550f7133ed30ad5321ae2e6630f13657fb9479506b00601"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:4c28a9144688aef80d6ea666c809b4b0e50010a2aca784c97f5e6bf143d9f129"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:141f1d1a9b663c679dc524af3ea1773e618907e96075262726c7612c02b149a4"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:53ace1c1fd5a74ef662f844a0413446c0629d151055340e9893da958a374f70d"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:17a753023436a18e27dd7769e798ce302963c236bc4114ceee5b25c18c52c693"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:7d298a1bd60c067ea75d9f684f5f3992c9d6766fadbc0bcedd39750bf344c2f4"},
-    {file = "lxml-4.9.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:081d32421db5df44c41b7f08a334a090a545c54ba977e47fd7cc2deece78809a"},
-    {file = "lxml-4.9.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:23eed6d7b1a3336ad92d8e39d4bfe09073c31bfe502f20ca5116b2a334f8ec02"},
-    {file = "lxml-4.9.3-cp37-cp37m-win32.whl", hash = "sha256:1509dd12b773c02acd154582088820893109f6ca27ef7291b003d0e81666109f"},
-    {file = "lxml-4.9.3-cp37-cp37m-win_amd64.whl", hash = "sha256:120fa9349a24c7043854c53cae8cec227e1f79195a7493e09e0c12e29f918e52"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:4d2d1edbca80b510443f51afd8496be95529db04a509bc8faee49c7b0fb6d2cc"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:8d7e43bd40f65f7d97ad8ef5c9b1778943d02f04febef12def25f7583d19baac"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:71d66ee82e7417828af6ecd7db817913cb0cf9d4e61aa0ac1fde0583d84358db"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:6fc3c450eaa0b56f815c7b62f2b7fba7266c4779adcf1cece9e6deb1de7305ce"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:65299ea57d82fb91c7f019300d24050c4ddeb7c5a190e076b5f48a2b43d19c42"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:eadfbbbfb41b44034a4c757fd5d70baccd43296fb894dba0295606a7cf3124aa"},
-    {file = "lxml-4.9.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:3e9bdd30efde2b9ccfa9cb5768ba04fe71b018a25ea093379c857c9dad262c40"},
-    {file = "lxml-4.9.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fcdd00edfd0a3001e0181eab3e63bd5c74ad3e67152c84f93f13769a40e073a7"},
-    {file = "lxml-4.9.3-cp38-cp38-win32.whl", hash = "sha256:57aba1bbdf450b726d58b2aea5fe47c7875f5afb2c4a23784ed78f19a0462574"},
-    {file = "lxml-4.9.3-cp38-cp38-win_amd64.whl", hash = "sha256:92af161ecbdb2883c4593d5ed4815ea71b31fafd7fd05789b23100d081ecac96"},
-    {file = "lxml-4.9.3-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:9bb6ad405121241e99a86efff22d3ef469024ce22875a7ae045896ad23ba2340"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:8ed74706b26ad100433da4b9d807eae371efaa266ffc3e9191ea436087a9d6a7"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:fbf521479bcac1e25a663df882c46a641a9bff6b56dc8b0fafaebd2f66fb231b"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:303bf1edce6ced16bf67a18a1cf8339d0db79577eec5d9a6d4a80f0fb10aa2da"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:5515edd2a6d1a5a70bfcdee23b42ec33425e405c5b351478ab7dc9347228f96e"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:690dafd0b187ed38583a648076865d8c229661ed20e48f2335d68e2cf7dc829d"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b6420a005548ad52154c8ceab4a1290ff78d757f9e5cbc68f8c77089acd3c432"},
-    {file = "lxml-4.9.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bb3bb49c7a6ad9d981d734ef7c7193bc349ac338776a0360cc671eaee89bcf69"},
-    {file = "lxml-4.9.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d27be7405547d1f958b60837dc4c1007da90b8b23f54ba1f8b728c78fdb19d50"},
-    {file = "lxml-4.9.3-cp39-cp39-win32.whl", hash = "sha256:8df133a2ea5e74eef5e8fc6f19b9e085f758768a16e9877a60aec455ed2609b2"},
-    {file = "lxml-4.9.3-cp39-cp39-win_amd64.whl", hash = "sha256:4dd9a263e845a72eacb60d12401e37c616438ea2e5442885f65082c276dfb2b2"},
-    {file = "lxml-4.9.3-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:6689a3d7fd13dc687e9102a27e98ef33730ac4fe37795d5036d18b4d527abd35"},
-    {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f6bdac493b949141b733c5345b6ba8f87a226029cbabc7e9e121a413e49441e0"},
-    {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:05186a0f1346ae12553d66df1cfce6f251589fea3ad3da4f3ef4e34b2d58c6a3"},
-    {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c2006f5c8d28dee289f7020f721354362fa304acbaaf9745751ac4006650254b"},
-    {file = "lxml-4.9.3-pp38-pypy38_pp73-macosx_11_0_x86_64.whl", hash = "sha256:5c245b783db29c4e4fbbbfc9c5a78be496c9fea25517f90606aa1f6b2b3d5f7b"},
-    {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:4fb960a632a49f2f089d522f70496640fdf1218f1243889da3822e0a9f5f3ba7"},
-    {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:50670615eaf97227d5dc60de2dc99fb134a7130d310d783314e7724bf163f75d"},
-    {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:9719fe17307a9e814580af1f5c6e05ca593b12fb7e44fe62450a5384dbf61b4b"},
-    {file = "lxml-4.9.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:3331bece23c9ee066e0fb3f96c61322b9e0f54d775fccefff4c38ca488de283a"},
-    {file = "lxml-4.9.3-pp39-pypy39_pp73-macosx_11_0_x86_64.whl", hash = "sha256:ed667f49b11360951e201453fc3967344d0d0263aa415e1619e85ae7fd17b4e0"},
-    {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:8b77946fd508cbf0fccd8e400a7f71d4ac0e1595812e66025bac475a8e811694"},
-    {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:e4da8ca0c0c0aea88fd46be8e44bd49716772358d648cce45fe387f7b92374a7"},
-    {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:fe4bda6bd4340caa6e5cf95e73f8fea5c4bfc55763dd42f1b50a94c1b4a2fbd4"},
-    {file = "lxml-4.9.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:f3df3db1d336b9356dd3112eae5f5c2b8b377f3bc826848567f10bfddfee77e9"},
-    {file = "lxml-4.9.3.tar.gz", hash = "sha256:48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"},
-]
-
-[[package]]
-name = "markdown"
-version = "3.4.4"
-requires_python = ">=3.7"
-summary = "Python implementation of John Gruber's Markdown."
-dependencies = [
-    "importlib-metadata>=4.4; python_version < \"3.10\"",
-]
-files = [
-    {file = "Markdown-3.4.4-py3-none-any.whl", hash = "sha256:a4c1b65c0957b4bd9e7d86ddc7b3c9868fb9670660f6f99f6d1bca8954d5a941"},
-    {file = "Markdown-3.4.4.tar.gz", hash = "sha256:225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6"},
-]
-
-[[package]]
-name = "markdown-it-py"
-version = "2.2.0"
-requires_python = ">=3.7"
-summary = "Python port of markdown-it. Markdown parsing, done right!"
-dependencies = [
-    "mdurl~=0.1",
-    "typing-extensions>=3.7.4; python_version < \"3.8\"",
-]
-files = [
-    {file = "markdown-it-py-2.2.0.tar.gz", hash = "sha256:7c9a5e412688bc771c67432cbfebcdd686c93ce6484913dccf06cb5a0bea35a1"},
-    {file = "markdown_it_py-2.2.0-py3-none-any.whl", hash = "sha256:5a35f8d1870171d9acc47b99612dc146129b631baf04970128b568f190d0cc30"},
-]
-
-[[package]]
-name = "markupsafe"
-version = "2.1.3"
-requires_python = ">=3.7"
-summary = "Safely add untrusted strings to HTML/XML markup."
-files = [
-    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-win32.whl", hash = "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431"},
-    {file = "MarkupSafe-2.1.3-cp310-cp310-win_amd64.whl", hash = "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
-    {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"},
-    {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"},
-    {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"},
-    {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"},
-    {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e"},
-    {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc"},
-    {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48"},
-    {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155"},
-    {file = "MarkupSafe-2.1.3-cp37-cp37m-win32.whl", hash = "sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0"},
-    {file = "MarkupSafe-2.1.3-cp37-cp37m-win_amd64.whl", hash = "sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24"},
-    {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4"},
-    {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0"},
-    {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee"},
-    {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be"},
-    {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e"},
-    {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8"},
-    {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3"},
-    {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d"},
-    {file = "MarkupSafe-2.1.3-cp38-cp38-win32.whl", hash = "sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5"},
-    {file = "MarkupSafe-2.1.3-cp38-cp38-win_amd64.whl", hash = "sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-win32.whl", hash = "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"},
-    {file = "MarkupSafe-2.1.3-cp39-cp39-win_amd64.whl", hash = "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba"},
-    {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"},
-]
-
-[[package]]
-name = "mccabe"
-version = "0.6.1"
-summary = "McCabe checker, plugin for flake8"
-files = [
-    {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},
-    {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"},
-]
-
-[[package]]
-name = "mdurl"
-version = "0.1.2"
-requires_python = ">=3.7"
-summary = "Markdown URL utilities"
-files = [
-    {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"},
-    {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"},
-]
-
-[[package]]
-name = "packaging"
-version = "23.2"
-requires_python = ">=3.7"
-summary = "Core utilities for Python packages"
-files = [
-    {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"},
-    {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"},
-]
-
-[[package]]
-name = "pathspec"
-version = "0.11.2"
-requires_python = ">=3.7"
-summary = "Utility library for gitignore style pattern matching of file paths."
-files = [
-    {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"},
-    {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"},
-]
-
-[[package]]
-name = "platformdirs"
-version = "3.11.0"
-requires_python = ">=3.7"
-summary = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
-dependencies = [
-    "typing-extensions>=4.7.1; python_version < \"3.8\"",
-]
-files = [
-    {file = "platformdirs-3.11.0-py3-none-any.whl", hash = "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e"},
-    {file = "platformdirs-3.11.0.tar.gz", hash = "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3"},
-]
-
-[[package]]
-name = "pluggy"
-version = "1.2.0"
-requires_python = ">=3.7"
-summary = "plugin and hook calling mechanisms for python"
-dependencies = [
-    "importlib-metadata>=0.12; python_version < \"3.8\"",
-]
-files = [
-    {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"},
-    {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"},
-]
-
-[[package]]
-name = "psutil"
-version = "5.9.6"
-requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
-summary = "Cross-platform lib for process and system monitoring in Python."
-files = [
-    {file = "psutil-5.9.6-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:c69596f9fc2f8acd574a12d5f8b7b1ba3765a641ea5d60fb4736bf3c08a8214a"},
-    {file = "psutil-5.9.6-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:92e0cc43c524834af53e9d3369245e6cc3b130e78e26100d1f63cdb0abeb3d3c"},
-    {file = "psutil-5.9.6-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:748c9dd2583ed86347ed65d0035f45fa8c851e8d90354c122ab72319b5f366f4"},
-    {file = "psutil-5.9.6-cp37-abi3-win32.whl", hash = "sha256:a6f01f03bf1843280f4ad16f4bde26b817847b4c1a0db59bf6419807bc5ce05c"},
-    {file = "psutil-5.9.6-cp37-abi3-win_amd64.whl", hash = "sha256:6e5fb8dc711a514da83098bc5234264e551ad980cec5f85dabf4d38ed6f15e9a"},
-    {file = "psutil-5.9.6-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:daecbcbd29b289aac14ece28eca6a3e60aa361754cf6da3dfb20d4d32b6c7f57"},
-    {file = "psutil-5.9.6.tar.gz", hash = "sha256:e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a"},
-]
-
-[[package]]
-name = "py"
-version = "1.11.0"
-requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-summary = "library with cross-python path, ini-parsing, io, code, log facilities"
-files = [
-    {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
-    {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
-]
-
-[[package]]
-name = "pycodestyle"
-version = "2.7.0"
-requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-summary = "Python style guide checker"
-files = [
-    {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"},
-    {file = "pycodestyle-2.7.0.tar.gz", hash = "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"},
-]
-
-[[package]]
-name = "pyflakes"
-version = "2.3.1"
-requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-summary = "passive checker of Python programs"
-files = [
-    {file = "pyflakes-2.3.1-py2.py3-none-any.whl", hash = "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3"},
-    {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"},
-]
-
-[[package]]
-name = "pygments"
-version = "2.16.1"
-requires_python = ">=3.7"
-summary = "Pygments is a syntax highlighting package written in Python."
-files = [
-    {file = "Pygments-2.16.1-py3-none-any.whl", hash = "sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692"},
-    {file = "Pygments-2.16.1.tar.gz", hash = "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29"},
-]
-
-[[package]]
-name = "pytest"
-version = "7.4.2"
-requires_python = ">=3.7"
-summary = "pytest: simple powerful testing with Python"
-dependencies = [
-    "colorama; sys_platform == \"win32\"",
-    "exceptiongroup>=1.0.0rc8; python_version < \"3.11\"",
-    "importlib-metadata>=0.12; python_version < \"3.8\"",
-    "iniconfig",
-    "packaging",
-    "pluggy<2.0,>=0.12",
-    "tomli>=1.0.0; python_version < \"3.11\"",
-]
-files = [
-    {file = "pytest-7.4.2-py3-none-any.whl", hash = "sha256:1d881c6124e08ff0a1bb75ba3ec0bfd8b5354a01c194ddd5a0a870a48d99b002"},
-    {file = "pytest-7.4.2.tar.gz", hash = "sha256:a766259cfab564a2ad52cb1aae1b881a75c3eb7e34ca3779697c23ed47c47069"},
-]
-
-[[package]]
-name = "pytest-cov"
-version = "4.1.0"
-requires_python = ">=3.7"
-summary = "Pytest plugin for measuring coverage."
-dependencies = [
-    "coverage[toml]>=5.2.1",
-    "pytest>=4.6",
-]
-files = [
-    {file = "pytest-cov-4.1.0.tar.gz", hash = "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6"},
-    {file = "pytest_cov-4.1.0-py3-none-any.whl", hash = "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"},
-]
-
-[[package]]
-name = "pytest-forked"
-version = "1.6.0"
-requires_python = ">=3.7"
-summary = "run tests in isolated forked subprocesses"
-dependencies = [
-    "py",
-    "pytest>=3.10",
-]
-files = [
-    {file = "pytest-forked-1.6.0.tar.gz", hash = "sha256:4dafd46a9a600f65d822b8f605133ecf5b3e1941ebb3588e943b4e3eb71a5a3f"},
-    {file = "pytest_forked-1.6.0-py3-none-any.whl", hash = "sha256:810958f66a91afb1a1e2ae83089d8dc1cd2437ac96b12963042fbb9fb4d16af0"},
-]
-
-[[package]]
-name = "pytest-sugar"
-version = "0.9.7"
-summary = "pytest-sugar is a plugin for pytest that changes the default look and feel of pytest (e.g. progressbar, show tests that fail instantly)."
-dependencies = [
-    "packaging>=21.3",
-    "pytest>=6.2.0",
-    "termcolor>=2.1.0",
-]
-files = [
-    {file = "pytest-sugar-0.9.7.tar.gz", hash = "sha256:f1e74c1abfa55f7241cf7088032b6e378566f16b938f3f08905e2cf4494edd46"},
-    {file = "pytest_sugar-0.9.7-py2.py3-none-any.whl", hash = "sha256:8cb5a4e5f8bbcd834622b0235db9e50432f4cbd71fef55b467fe44e43701e062"},
-]
-
-[[package]]
-name = "pytest-xdist"
-version = "2.5.0"
-requires_python = ">=3.6"
-summary = "pytest xdist plugin for distributed testing and loop-on-failing modes"
-dependencies = [
-    "execnet>=1.1",
-    "pytest-forked",
-    "pytest>=6.2.0",
-]
-files = [
-    {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"},
-    {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"},
-]
-
-[[package]]
-name = "python-dateutil"
-version = "2.8.2"
-requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
-summary = "Extensions to the standard Python datetime module"
-dependencies = [
-    "six>=1.5",
-]
-files = [
-    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
-    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
-]
-
-[[package]]
-name = "pytz"
-version = "2023.3.post1"
-summary = "World timezone definitions, modern and historical"
-files = [
-    {file = "pytz-2023.3.post1-py2.py3-none-any.whl", hash = "sha256:ce42d816b81b68506614c11e8937d3aa9e41007ceb50bfdcb0749b921bf646c7"},
-    {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"},
-]
-
-[[package]]
-name = "regex"
-version = "2023.10.3"
-requires_python = ">=3.7"
-summary = "Alternative regular expression module, to replace re."
-files = [
-    {file = "regex-2023.10.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4c34d4f73ea738223a094d8e0ffd6d2c1a1b4c175da34d6b0de3d8d69bee6bcc"},
-    {file = "regex-2023.10.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a8f4e49fc3ce020f65411432183e6775f24e02dff617281094ba6ab079ef0915"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4cd1bccf99d3ef1ab6ba835308ad85be040e6a11b0977ef7ea8c8005f01a3c29"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:81dce2ddc9f6e8f543d94b05d56e70d03a0774d32f6cca53e978dc01e4fc75b8"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c6b4d23c04831e3ab61717a707a5d763b300213db49ca680edf8bf13ab5d91b"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c15ad0aee158a15e17e0495e1e18741573d04eb6da06d8b84af726cfc1ed02ee"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6239d4e2e0b52c8bd38c51b760cd870069f0bdf99700a62cd509d7a031749a55"},
-    {file = "regex-2023.10.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4a8bf76e3182797c6b1afa5b822d1d5802ff30284abe4599e1247be4fd6b03be"},
-    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d9c727bbcf0065cbb20f39d2b4f932f8fa1631c3e01fcedc979bd4f51fe051c5"},
-    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3ccf2716add72f80714b9a63899b67fa711b654be3fcdd34fa391d2d274ce767"},
-    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:107ac60d1bfdc3edb53be75e2a52aff7481b92817cfdddd9b4519ccf0e54a6ff"},
-    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:00ba3c9818e33f1fa974693fb55d24cdc8ebafcb2e4207680669d8f8d7cca79a"},
-    {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f0a47efb1dbef13af9c9a54a94a0b814902e547b7f21acb29434504d18f36e3a"},
-    {file = "regex-2023.10.3-cp310-cp310-win32.whl", hash = "sha256:36362386b813fa6c9146da6149a001b7bd063dabc4d49522a1f7aa65b725c7ec"},
-    {file = "regex-2023.10.3-cp310-cp310-win_amd64.whl", hash = "sha256:c65a3b5330b54103e7d21cac3f6bf3900d46f6d50138d73343d9e5b2900b2353"},
-    {file = "regex-2023.10.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:90a79bce019c442604662d17bf69df99090e24cdc6ad95b18b6725c2988a490e"},
-    {file = "regex-2023.10.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c7964c2183c3e6cce3f497e3a9f49d182e969f2dc3aeeadfa18945ff7bdd7051"},
-    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ef80829117a8061f974b2fda8ec799717242353bff55f8a29411794d635d964"},
-    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5addc9d0209a9afca5fc070f93b726bf7003bd63a427f65ef797a931782e7edc"},
-    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c148bec483cc4b421562b4bcedb8e28a3b84fcc8f0aa4418e10898f3c2c0eb9b"},
-    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d1f21af4c1539051049796a0f50aa342f9a27cde57318f2fc41ed50b0dbc4ac"},
-    {file = "regex-2023.10.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0b9ac09853b2a3e0d0082104036579809679e7715671cfbf89d83c1cb2a30f58"},
-    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ebedc192abbc7fd13c5ee800e83a6df252bec691eb2c4bedc9f8b2e2903f5e2a"},
-    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:d8a993c0a0ffd5f2d3bda23d0cd75e7086736f8f8268de8a82fbc4bd0ac6791e"},
-    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:be6b7b8d42d3090b6c80793524fa66c57ad7ee3fe9722b258aec6d0672543fd0"},
-    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4023e2efc35a30e66e938de5aef42b520c20e7eda7bb5fb12c35e5d09a4c43f6"},
-    {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0d47840dc05e0ba04fe2e26f15126de7c755496d5a8aae4a08bda4dd8d646c54"},
-    {file = "regex-2023.10.3-cp311-cp311-win32.whl", hash = "sha256:9145f092b5d1977ec8c0ab46e7b3381b2fd069957b9862a43bd383e5c01d18c2"},
-    {file = "regex-2023.10.3-cp311-cp311-win_amd64.whl", hash = "sha256:b6104f9a46bd8743e4f738afef69b153c4b8b592d35ae46db07fc28ae3d5fb7c"},
-    {file = "regex-2023.10.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:bff507ae210371d4b1fe316d03433ac099f184d570a1a611e541923f78f05037"},
-    {file = "regex-2023.10.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:be5e22bbb67924dea15039c3282fa4cc6cdfbe0cbbd1c0515f9223186fc2ec5f"},
-    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a992f702c9be9c72fa46f01ca6e18d131906a7180950958f766c2aa294d4b41"},
-    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7434a61b158be563c1362d9071358f8ab91b8d928728cd2882af060481244c9e"},
-    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c2169b2dcabf4e608416f7f9468737583ce5f0a6e8677c4efbf795ce81109d7c"},
-    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9e908ef5889cda4de038892b9accc36d33d72fb3e12c747e2799a0e806ec841"},
-    {file = "regex-2023.10.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:12bd4bc2c632742c7ce20db48e0d99afdc05e03f0b4c1af90542e05b809a03d9"},
-    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bc72c231f5449d86d6c7d9cc7cd819b6eb30134bb770b8cfdc0765e48ef9c420"},
-    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:bce8814b076f0ce5766dc87d5a056b0e9437b8e0cd351b9a6c4e1134a7dfbda9"},
-    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:ba7cd6dc4d585ea544c1412019921570ebd8a597fabf475acc4528210d7c4a6f"},
-    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b0c7d2f698e83f15228ba41c135501cfe7d5740181d5903e250e47f617eb4292"},
-    {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:5a8f91c64f390ecee09ff793319f30a0f32492e99f5dc1c72bc361f23ccd0a9a"},
-    {file = "regex-2023.10.3-cp312-cp312-win32.whl", hash = "sha256:ad08a69728ff3c79866d729b095872afe1e0557251da4abb2c5faff15a91d19a"},
-    {file = "regex-2023.10.3-cp312-cp312-win_amd64.whl", hash = "sha256:39cdf8d141d6d44e8d5a12a8569d5a227f645c87df4f92179bd06e2e2705e76b"},
-    {file = "regex-2023.10.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4a3ee019a9befe84fa3e917a2dd378807e423d013377a884c1970a3c2792d293"},
-    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76066d7ff61ba6bf3cb5efe2428fc82aac91802844c022d849a1f0f53820502d"},
-    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bfe50b61bab1b1ec260fa7cd91106fa9fece57e6beba05630afe27c71259c59b"},
-    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fd88f373cb71e6b59b7fa597e47e518282455c2734fd4306a05ca219a1991b0"},
-    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3ab05a182c7937fb374f7e946f04fb23a0c0699c0450e9fb02ef567412d2fa3"},
-    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dac37cf08fcf2094159922edc7a2784cfcc5c70f8354469f79ed085f0328ebdf"},
-    {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e54ddd0bb8fb626aa1f9ba7b36629564544954fff9669b15da3610c22b9a0991"},
-    {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:3367007ad1951fde612bf65b0dffc8fd681a4ab98ac86957d16491400d661302"},
-    {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:16f8740eb6dbacc7113e3097b0a36065a02e37b47c936b551805d40340fb9971"},
-    {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:f4f2ca6df64cbdd27f27b34f35adb640b5d2d77264228554e68deda54456eb11"},
-    {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:39807cbcbe406efca2a233884e169d056c35aa7e9f343d4e78665246a332f597"},
-    {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7eece6fbd3eae4a92d7c748ae825cbc1ee41a89bb1c3db05b5578ed3cfcfd7cb"},
-    {file = "regex-2023.10.3-cp37-cp37m-win32.whl", hash = "sha256:ce615c92d90df8373d9e13acddd154152645c0dc060871abf6bd43809673d20a"},
-    {file = "regex-2023.10.3-cp37-cp37m-win_amd64.whl", hash = "sha256:0f649fa32fe734c4abdfd4edbb8381c74abf5f34bc0b3271ce687b23729299ed"},
-    {file = "regex-2023.10.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9b98b7681a9437262947f41c7fac567c7e1f6eddd94b0483596d320092004533"},
-    {file = "regex-2023.10.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:91dc1d531f80c862441d7b66c4505cd6ea9d312f01fb2f4654f40c6fdf5cc37a"},
-    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82fcc1f1cc3ff1ab8a57ba619b149b907072e750815c5ba63e7aa2e1163384a4"},
-    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7979b834ec7a33aafae34a90aad9f914c41fd6eaa8474e66953f3f6f7cbd4368"},
-    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef71561f82a89af6cfcbee47f0fabfdb6e63788a9258e913955d89fdd96902ab"},
-    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd829712de97753367153ed84f2de752b86cd1f7a88b55a3a775eb52eafe8a94"},
-    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:00e871d83a45eee2f8688d7e6849609c2ca2a04a6d48fba3dff4deef35d14f07"},
-    {file = "regex-2023.10.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:706e7b739fdd17cb89e1fbf712d9dc21311fc2333f6d435eac2d4ee81985098c"},
-    {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:cc3f1c053b73f20c7ad88b0d1d23be7e7b3901229ce89f5000a8399746a6e039"},
-    {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6f85739e80d13644b981a88f529d79c5bdf646b460ba190bffcaf6d57b2a9863"},
-    {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:741ba2f511cc9626b7561a440f87d658aabb3d6b744a86a3c025f866b4d19e7f"},
-    {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:e77c90ab5997e85901da85131fd36acd0ed2221368199b65f0d11bca44549711"},
-    {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:979c24cbefaf2420c4e377ecd1f165ea08cc3d1fbb44bdc51bccbbf7c66a2cb4"},
-    {file = "regex-2023.10.3-cp38-cp38-win32.whl", hash = "sha256:58837f9d221744d4c92d2cf7201c6acd19623b50c643b56992cbd2b745485d3d"},
-    {file = "regex-2023.10.3-cp38-cp38-win_amd64.whl", hash = "sha256:c55853684fe08d4897c37dfc5faeff70607a5f1806c8be148f1695be4a63414b"},
-    {file = "regex-2023.10.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2c54e23836650bdf2c18222c87f6f840d4943944146ca479858404fedeb9f9af"},
-    {file = "regex-2023.10.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:69c0771ca5653c7d4b65203cbfc5e66db9375f1078689459fe196fe08b7b4930"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ac965a998e1388e6ff2e9781f499ad1eaa41e962a40d11c7823c9952c77123e"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1c0e8fae5b27caa34177bdfa5a960c46ff2f78ee2d45c6db15ae3f64ecadde14"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6c56c3d47da04f921b73ff9415fbaa939f684d47293f071aa9cbb13c94afc17d"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ef1e014eed78ab650bef9a6a9cbe50b052c0aebe553fb2881e0453717573f52"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d29338556a59423d9ff7b6eb0cb89ead2b0875e08fe522f3e068b955c3e7b59b"},
-    {file = "regex-2023.10.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9c6d0ced3c06d0f183b73d3c5920727268d2201aa0fe6d55c60d68c792ff3588"},
-    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:994645a46c6a740ee8ce8df7911d4aee458d9b1bc5639bc968226763d07f00fa"},
-    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:66e2fe786ef28da2b28e222c89502b2af984858091675044d93cb50e6f46d7af"},
-    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:11175910f62b2b8c055f2b089e0fedd694fe2be3941b3e2633653bc51064c528"},
-    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:06e9abc0e4c9ab4779c74ad99c3fc10d3967d03114449acc2c2762ad4472b8ca"},
-    {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:fb02e4257376ae25c6dd95a5aec377f9b18c09be6ebdefa7ad209b9137b73d48"},
-    {file = "regex-2023.10.3-cp39-cp39-win32.whl", hash = "sha256:3b2c3502603fab52d7619b882c25a6850b766ebd1b18de3df23b2f939360e1bd"},
-    {file = "regex-2023.10.3-cp39-cp39-win_amd64.whl", hash = "sha256:adbccd17dcaff65704c856bd29951c58a1bd4b2b0f8ad6b826dbd543fe740988"},
-    {file = "regex-2023.10.3.tar.gz", hash = "sha256:3fef4f844d2290ee0ba57addcec17eec9e3df73f10a2748485dfd6a3a188cc0f"},
-]
-
-[[package]]
-name = "requests"
-version = "2.31.0"
-requires_python = ">=3.7"
-summary = "Python HTTP for Humans."
-dependencies = [
-    "certifi>=2017.4.17",
-    "charset-normalizer<4,>=2",
-    "idna<4,>=2.5",
-    "urllib3<3,>=1.21.1",
-]
-files = [
-    {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"},
-    {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
-]
-
-[[package]]
-name = "rich"
-version = "13.6.0"
-requires_python = ">=3.7.0"
-summary = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
-dependencies = [
-    "markdown-it-py>=2.2.0",
-    "pygments<3.0.0,>=2.13.0",
-    "typing-extensions<5.0,>=4.0.0; python_version < \"3.9\"",
-]
-files = [
-    {file = "rich-13.6.0-py3-none-any.whl", hash = "sha256:2b38e2fe9ca72c9a00170a1a2d20c63c790d0e10ef1fe35eba76e1e7b1d7d245"},
-    {file = "rich-13.6.0.tar.gz", hash = "sha256:5c14d22737e6d5084ef4771b62d5d4363165b403455a30a1c8ca39dc7b644bef"},
-]
-
-[[package]]
-name = "setuptools"
-version = "68.0.0"
-requires_python = ">=3.7"
-summary = "Easily download, build, install, upgrade, and uninstall Python packages"
-files = [
-    {file = "setuptools-68.0.0-py3-none-any.whl", hash = "sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f"},
-    {file = "setuptools-68.0.0.tar.gz", hash = "sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235"},
-]
-
-[[package]]
-name = "six"
-version = "1.16.0"
-requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
-summary = "Python 2 and 3 compatibility utilities"
-files = [
-    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
-    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
-]
-
-[[package]]
-name = "smartypants"
-version = "2.0.1"
-summary = "Python with the SmartyPants"
-files = [
-    {file = "smartypants-2.0.1-py2.py3-none-any.whl", hash = "sha256:8db97f7cbdf08d15b158a86037cd9e116b4cf37703d24e0419a0d64ca5808f0d"},
-]
-
-[[package]]
-name = "snowballstemmer"
-version = "2.2.0"
-summary = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms."
-files = [
-    {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"},
-    {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"},
-]
-
-[[package]]
-name = "soupsieve"
-version = "2.4.1"
-requires_python = ">=3.7"
-summary = "A modern CSS selector implementation for Beautiful Soup."
-files = [
-    {file = "soupsieve-2.4.1-py3-none-any.whl", hash = "sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8"},
-    {file = "soupsieve-2.4.1.tar.gz", hash = "sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea"},
-]
-
-[[package]]
-name = "sphinx"
-version = "5.3.0"
-requires_python = ">=3.6"
-summary = "Python documentation generator"
-dependencies = [
-    "Jinja2>=3.0",
-    "Pygments>=2.12",
-    "alabaster<0.8,>=0.7",
-    "babel>=2.9",
-    "colorama>=0.4.5; sys_platform == \"win32\"",
-    "docutils<0.20,>=0.14",
-    "imagesize>=1.3",
-    "importlib-metadata>=4.8; python_version < \"3.10\"",
-    "packaging>=21.0",
-    "requests>=2.5.0",
-    "snowballstemmer>=2.0",
-    "sphinxcontrib-applehelp",
-    "sphinxcontrib-devhelp",
-    "sphinxcontrib-htmlhelp>=2.0.0",
-    "sphinxcontrib-jsmath",
-    "sphinxcontrib-qthelp",
-    "sphinxcontrib-serializinghtml>=1.1.5",
-]
-files = [
-    {file = "Sphinx-5.3.0.tar.gz", hash = "sha256:51026de0a9ff9fc13c05d74913ad66047e104f56a129ff73e174eb5c3ee794b5"},
-    {file = "sphinx-5.3.0-py3-none-any.whl", hash = "sha256:060ca5c9f7ba57a08a1219e547b269fadf125ae25b06b9fa7f66768efb652d6d"},
-]
-
-[[package]]
-name = "sphinx-basic-ng"
-version = "1.0.0b2"
-requires_python = ">=3.7"
-summary = "A modern skeleton for Sphinx themes."
-dependencies = [
-    "sphinx>=4.0",
-]
-files = [
-    {file = "sphinx_basic_ng-1.0.0b2-py3-none-any.whl", hash = "sha256:eb09aedbabfb650607e9b4b68c9d240b90b1e1be221d6ad71d61c52e29f7932b"},
-    {file = "sphinx_basic_ng-1.0.0b2.tar.gz", hash = "sha256:9ec55a47c90c8c002b5960c57492ec3021f5193cb26cebc2dc4ea226848651c9"},
-]
-
-[[package]]
-name = "sphinxcontrib-applehelp"
-version = "1.0.2"
-requires_python = ">=3.5"
-summary = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"
-files = [
-    {file = "sphinxcontrib-applehelp-1.0.2.tar.gz", hash = "sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"},
-    {file = "sphinxcontrib_applehelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:806111e5e962be97c29ec4c1e7fe277bfd19e9652fb1a4392105b43e01af885a"},
-]
-
-[[package]]
-name = "sphinxcontrib-devhelp"
-version = "1.0.2"
-requires_python = ">=3.5"
-summary = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."
-files = [
-    {file = "sphinxcontrib-devhelp-1.0.2.tar.gz", hash = "sha256:ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"},
-    {file = "sphinxcontrib_devhelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:8165223f9a335cc1af7ffe1ed31d2871f325254c0423bc0c4c7cd1c1e4734a2e"},
-]
-
-[[package]]
-name = "sphinxcontrib-htmlhelp"
-version = "2.0.0"
-requires_python = ">=3.6"
-summary = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files"
-files = [
-    {file = "sphinxcontrib-htmlhelp-2.0.0.tar.gz", hash = "sha256:f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"},
-    {file = "sphinxcontrib_htmlhelp-2.0.0-py2.py3-none-any.whl", hash = "sha256:d412243dfb797ae3ec2b59eca0e52dac12e75a241bf0e4eb861e450d06c6ed07"},
-]
-
-[[package]]
-name = "sphinxcontrib-jsmath"
-version = "1.0.1"
-requires_python = ">=3.5"
-summary = "A sphinx extension which renders display math in HTML via JavaScript"
-files = [
-    {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"},
-    {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"},
-]
-
-[[package]]
-name = "sphinxcontrib-qthelp"
-version = "1.0.3"
-requires_python = ">=3.5"
-summary = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."
-files = [
-    {file = "sphinxcontrib-qthelp-1.0.3.tar.gz", hash = "sha256:4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"},
-    {file = "sphinxcontrib_qthelp-1.0.3-py2.py3-none-any.whl", hash = "sha256:bd9fc24bcb748a8d51fd4ecaade681350aa63009a347a8c14e637895444dfab6"},
-]
-
-[[package]]
-name = "sphinxcontrib-serializinghtml"
-version = "1.1.5"
-requires_python = ">=3.5"
-summary = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."
-files = [
-    {file = "sphinxcontrib-serializinghtml-1.1.5.tar.gz", hash = "sha256:aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"},
-    {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"},
-]
-
-[[package]]
-name = "termcolor"
-version = "2.3.0"
-requires_python = ">=3.7"
-summary = "ANSI color formatting for output in terminal"
-files = [
-    {file = "termcolor-2.3.0-py3-none-any.whl", hash = "sha256:3afb05607b89aed0ffe25202399ee0867ad4d3cb4180d98aaf8eefa6a5f7d475"},
-    {file = "termcolor-2.3.0.tar.gz", hash = "sha256:b5b08f68937f138fe92f6c089b99f1e2da0ae56c52b78bf7075fd95420fd9a5a"},
-]
-
-[[package]]
-name = "toml"
-version = "0.10.2"
-requires_python = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-summary = "Python Library for Tom's Obvious, Minimal Language"
-files = [
-    {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
-    {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
-]
-
-[[package]]
-name = "tomli"
-version = "2.0.1"
-requires_python = ">=3.7"
-summary = "A lil' TOML parser"
-files = [
-    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
-    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
-]
-
-[[package]]
-name = "tornado"
-version = "6.2"
-requires_python = ">= 3.7"
-summary = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed."
-files = [
-    {file = "tornado-6.2-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:20f638fd8cc85f3cbae3c732326e96addff0a15e22d80f049e00121651e82e72"},
-    {file = "tornado-6.2-cp37-abi3-macosx_10_9_x86_64.whl", hash = "sha256:87dcafae3e884462f90c90ecc200defe5e580a7fbbb4365eda7c7c1eb809ebc9"},
-    {file = "tornado-6.2-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba09ef14ca9893954244fd872798b4ccb2367c165946ce2dd7376aebdde8e3ac"},
-    {file = "tornado-6.2-cp37-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b8150f721c101abdef99073bf66d3903e292d851bee51910839831caba341a75"},
-    {file = "tornado-6.2-cp37-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3a2f5999215a3a06a4fc218026cd84c61b8b2b40ac5296a6db1f1451ef04c1e"},
-    {file = "tornado-6.2-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:5f8c52d219d4995388119af7ccaa0bcec289535747620116a58d830e7c25d8a8"},
-    {file = "tornado-6.2-cp37-abi3-musllinux_1_1_i686.whl", hash = "sha256:6fdfabffd8dfcb6cf887428849d30cf19a3ea34c2c248461e1f7d718ad30b66b"},
-    {file = "tornado-6.2-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:1d54d13ab8414ed44de07efecb97d4ef7c39f7438cf5e976ccd356bebb1b5fca"},
-    {file = "tornado-6.2-cp37-abi3-win32.whl", hash = "sha256:5c87076709343557ef8032934ce5f637dbb552efa7b21d08e89ae7619ed0eb23"},
-    {file = "tornado-6.2-cp37-abi3-win_amd64.whl", hash = "sha256:e5f923aa6a47e133d1cf87d60700889d7eae68988704e20c75fb2d65677a8e4b"},
-    {file = "tornado-6.2.tar.gz", hash = "sha256:9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13"},
-]
-
-[[package]]
-name = "tox"
-version = "3.28.0"
-requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
-summary = "tox is a generic virtualenv management and test command line tool"
-dependencies = [
-    "colorama>=0.4.1; platform_system == \"Windows\"",
-    "filelock>=3.0.0",
-    "importlib-metadata>=0.12; python_version < \"3.8\"",
-    "packaging>=14",
-    "pluggy>=0.12.0",
-    "py>=1.4.17",
-    "six>=1.14.0",
-    "tomli>=2.0.1; python_version >= \"3.7\" and python_version < \"3.11\"",
-    "virtualenv!=20.0.0,!=20.0.1,!=20.0.2,!=20.0.3,!=20.0.4,!=20.0.5,!=20.0.6,!=20.0.7,>=16.0.0",
-]
-files = [
-    {file = "tox-3.28.0-py2.py3-none-any.whl", hash = "sha256:57b5ab7e8bb3074edc3c0c0b4b192a4f3799d3723b2c5b76f1fa9f2d40316eea"},
-    {file = "tox-3.28.0.tar.gz", hash = "sha256:d0d28f3fe6d6d7195c27f8b054c3e99d5451952b54abdae673b71609a581f640"},
-]
-
-[[package]]
-name = "typed-ast"
-version = "1.5.5"
-requires_python = ">=3.6"
-summary = "a fork of Python 2 and 3 ast modules with type comment support"
-files = [
-    {file = "typed_ast-1.5.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4bc1efe0ce3ffb74784e06460f01a223ac1f6ab31c6bc0376a21184bf5aabe3b"},
-    {file = "typed_ast-1.5.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5f7a8c46a8b333f71abd61d7ab9255440d4a588f34a21f126bbfc95f6049e686"},
-    {file = "typed_ast-1.5.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:597fc66b4162f959ee6a96b978c0435bd63791e31e4f410622d19f1686d5e769"},
-    {file = "typed_ast-1.5.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d41b7a686ce653e06c2609075d397ebd5b969d821b9797d029fccd71fdec8e04"},
-    {file = "typed_ast-1.5.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5fe83a9a44c4ce67c796a1b466c270c1272e176603d5e06f6afbc101a572859d"},
-    {file = "typed_ast-1.5.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d5c0c112a74c0e5db2c75882a0adf3133adedcdbfd8cf7c9d6ed77365ab90a1d"},
-    {file = "typed_ast-1.5.5-cp310-cp310-win_amd64.whl", hash = "sha256:e1a976ed4cc2d71bb073e1b2a250892a6e968ff02aa14c1f40eba4f365ffec02"},
-    {file = "typed_ast-1.5.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c631da9710271cb67b08bd3f3813b7af7f4c69c319b75475436fcab8c3d21bee"},
-    {file = "typed_ast-1.5.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b445c2abfecab89a932b20bd8261488d574591173d07827c1eda32c457358b18"},
-    {file = "typed_ast-1.5.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc95ffaaab2be3b25eb938779e43f513e0e538a84dd14a5d844b8f2932593d88"},
-    {file = "typed_ast-1.5.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61443214d9b4c660dcf4b5307f15c12cb30bdfe9588ce6158f4a005baeb167b2"},
-    {file = "typed_ast-1.5.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6eb936d107e4d474940469e8ec5b380c9b329b5f08b78282d46baeebd3692dc9"},
-    {file = "typed_ast-1.5.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e48bf27022897577d8479eaed64701ecaf0467182448bd95759883300ca818c8"},
-    {file = "typed_ast-1.5.5-cp311-cp311-win_amd64.whl", hash = "sha256:83509f9324011c9a39faaef0922c6f720f9623afe3fe220b6d0b15638247206b"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2188bc33d85951ea4ddad55d2b35598b2709d122c11c75cffd529fbc9965508e"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0635900d16ae133cab3b26c607586131269f88266954eb04ec31535c9a12ef1e"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:57bfc3cf35a0f2fdf0a88a3044aafaec1d2f24d8ae8cd87c4f58d615fb5b6311"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:fe58ef6a764de7b4b36edfc8592641f56e69b7163bba9f9c8089838ee596bfb2"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d09d930c2d1d621f717bb217bf1fe2584616febb5138d9b3e8cdd26506c3f6d4"},
-    {file = "typed_ast-1.5.5-cp37-cp37m-win_amd64.whl", hash = "sha256:d40c10326893ecab8a80a53039164a224984339b2c32a6baf55ecbd5b1df6431"},
-    {file = "typed_ast-1.5.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:fd946abf3c31fb50eee07451a6aedbfff912fcd13cf357363f5b4e834cc5e71a"},
-    {file = "typed_ast-1.5.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ed4a1a42df8a3dfb6b40c3d2de109e935949f2f66b19703eafade03173f8f437"},
-    {file = "typed_ast-1.5.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:045f9930a1550d9352464e5149710d56a2aed23a2ffe78946478f7b5416f1ede"},
-    {file = "typed_ast-1.5.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:381eed9c95484ceef5ced626355fdc0765ab51d8553fec08661dce654a935db4"},
-    {file = "typed_ast-1.5.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:bfd39a41c0ef6f31684daff53befddae608f9daf6957140228a08e51f312d7e6"},
-    {file = "typed_ast-1.5.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8c524eb3024edcc04e288db9541fe1f438f82d281e591c548903d5b77ad1ddd4"},
-    {file = "typed_ast-1.5.5-cp38-cp38-win_amd64.whl", hash = "sha256:7f58fabdde8dcbe764cef5e1a7fcb440f2463c1bbbec1cf2a86ca7bc1f95184b"},
-    {file = "typed_ast-1.5.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:042eb665ff6bf020dd2243307d11ed626306b82812aba21836096d229fdc6a10"},
-    {file = "typed_ast-1.5.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:622e4a006472b05cf6ef7f9f2636edc51bda670b7bbffa18d26b255269d3d814"},
-    {file = "typed_ast-1.5.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1efebbbf4604ad1283e963e8915daa240cb4bf5067053cf2f0baadc4d4fb51b8"},
-    {file = "typed_ast-1.5.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f0aefdd66f1784c58f65b502b6cf8b121544680456d1cebbd300c2c813899274"},
-    {file = "typed_ast-1.5.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:48074261a842acf825af1968cd912f6f21357316080ebaca5f19abbb11690c8a"},
-    {file = "typed_ast-1.5.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:429ae404f69dc94b9361bb62291885894b7c6fb4640d561179548c849f8492ba"},
-    {file = "typed_ast-1.5.5-cp39-cp39-win_amd64.whl", hash = "sha256:335f22ccb244da2b5c296e6f96b06ee9bed46526db0de38d2f0e5a6597b81155"},
-    {file = "typed_ast-1.5.5.tar.gz", hash = "sha256:94282f7a354f36ef5dbce0ef3467ebf6a258e370ab33d5b40c249fa996e590dd"},
-]
-
-[[package]]
-name = "typing-extensions"
-version = "4.7.1"
-requires_python = ">=3.7"
-summary = "Backported and Experimental Type Hints for Python 3.7+"
-files = [
-    {file = "typing_extensions-4.7.1-py3-none-any.whl", hash = "sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36"},
-    {file = "typing_extensions-4.7.1.tar.gz", hash = "sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"},
-]
-
-[[package]]
-name = "typogrify"
-version = "2.0.7"
-summary = "Filters to enhance web typography, including support for Django & Jinja templates"
-dependencies = [
-    "smartypants>=1.8.3",
-]
-files = [
-    {file = "typogrify-2.0.7.tar.gz", hash = "sha256:8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"},
-]
-
-[[package]]
-name = "unidecode"
-version = "1.3.7"
-requires_python = ">=3.5"
-summary = "ASCII transliterations of Unicode text"
-files = [
-    {file = "Unidecode-1.3.7-py3-none-any.whl", hash = "sha256:663a537f506834ed836af26a81b210d90cbde044c47bfbdc0fbbc9f94c86a6e4"},
-    {file = "Unidecode-1.3.7.tar.gz", hash = "sha256:3c90b4662aa0de0cb591884b934ead8d2225f1800d8da675a7750cbc3bd94610"},
-]
-
-[[package]]
-name = "urllib3"
-version = "2.0.7"
-requires_python = ">=3.7"
-summary = "HTTP library with thread-safe connection pooling, file post, and more."
-files = [
-    {file = "urllib3-2.0.7-py3-none-any.whl", hash = "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"},
-    {file = "urllib3-2.0.7.tar.gz", hash = "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84"},
-]
-
-[[package]]
-name = "virtualenv"
-version = "20.24.6"
-requires_python = ">=3.7"
-summary = "Virtual Python Environment builder"
-dependencies = [
-    "distlib<1,>=0.3.7",
-    "filelock<4,>=3.12.2",
-    "importlib-metadata>=6.6; python_version < \"3.8\"",
-    "platformdirs<4,>=3.9.1",
-]
-files = [
-    {file = "virtualenv-20.24.6-py3-none-any.whl", hash = "sha256:520d056652454c5098a00c0f073611ccbea4c79089331f60bf9d7ba247bb7381"},
-    {file = "virtualenv-20.24.6.tar.gz", hash = "sha256:02ece4f56fbf939dbbc33c0715159951d6bf14aaf5457b092e4548e1382455af"},
-]
-
-[[package]]
-name = "zipp"
-version = "3.15.0"
-requires_python = ">=3.7"
-summary = "Backport of pathlib-compatible object wrapper for zip files"
-files = [
-    {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"},
-    {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"},
-]
diff --git a/pelican/tests/build_test/conftest.py b/pelican/tests/build_test/conftest.py
new file mode 100644
index 00000000..548f7970
--- /dev/null
+++ b/pelican/tests/build_test/conftest.py
@@ -0,0 +1,7 @@
+def pytest_addoption(parser):
+    parser.addoption(
+        "--check-wheel",
+        action="store",
+        default=False,
+        help="Check wheel contents.",
+    )
diff --git a/pelican/tests/build_test/test_wheel.py b/pelican/tests/build_test/test_wheel.py
new file mode 100644
index 00000000..a4635481
--- /dev/null
+++ b/pelican/tests/build_test/test_wheel.py
@@ -0,0 +1,28 @@
+from pathlib import Path
+import pytest
+from zipfile import ZipFile
+
+
+@pytest.mark.skipif(
+    "not config.getoption('--check-wheel')",
+    reason="Only run when --check-wheel is given",
+)
+def test_wheel_contents(pytestconfig):
+    """
+    This test, should test the contents of the wheel to make sure,
+    that everything that is needed is included in the final build
+    """
+    wheel_file = pytestconfig.getoption("--check-wheel")
+    assert wheel_file.endswith(".whl")
+    files_list = ZipFile(wheel_file).namelist()
+    ## Check is theme files are copiedto wheel
+    simple_theme = Path("./pelican/themes/simple/templates")
+    for x in simple_theme.iterdir():
+        assert str(x) in files_list
+
+    ## Check is tool templatesare copiedto wheel
+    tools = Path("./pelican/tools/templates")
+    for x in tools.iterdir():
+        assert str(x) in files_list
+
+    assert "pelican/tools/templates/tasks.py.jinja2" in files_list
diff --git a/pyproject.toml b/pyproject.toml
index da9deec1..9d439680 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -37,7 +37,8 @@ dependencies = [
     "python-dateutil>=2.8",
     "rich>=10.1",
     "unidecode>=1.1",
-    "backports-zoneinfo<1.0.0,>=0.2.1; python_version<3.9",
+    "backports-zoneinfo<1.0.0,>=0.2.1;python_version<'3.9'",
+    "watchfiles",
 ]
 
 [project.optional-dependencies]
@@ -53,9 +54,9 @@ Documentation = "https://docs.getpelican.com"
 [project.scripts]
 pelican = "pelican.__main__:main"
 pelican-import = "pelican.tools.pelican_import:main"
+pelican-plugins = "pelican.plugins._utils:list_plugins"
 pelican-quickstart = "pelican.tools.pelican_quickstart:main"
 pelican-themes = "pelican.tools.pelican_themes:main"
-pelican-plugins = "pelican.plugins._utils:list_plugins"
 
 [tool.autopub]
 project-name = "Pelican"
@@ -64,14 +65,14 @@ git-email = "52496925+botpub@users.noreply.github.com"
 changelog-file = "docs/changelog.rst"
 changelog-header = "###############"
 version-header = "="
-version-strings = ["setup.py"]
-build-system = "setuptools"
 
 [tool.pdm]
 
 [tool.pdm.scripts]
 docbuild = "invoke docbuild"
 docserve = "invoke docserve"
+lint = "invoke lint"
+test = "invoke tests"
 
 [tool.pdm.dev-dependencies]
 dev = [
@@ -95,11 +96,10 @@ dev = [
     "invoke<3.0,>=2.0",
     "isort<6.0,>=5.2",
     "black<20.0,>=19.10b0",
+    "ruff>=0.1.3,<1.0.0",
+    "tomli;python_version<'3.11'",
 ]
 
-[tool.pdm.build]
-includes = []
-
 [build-system]
 requires = ["pdm-backend"]
 build-backend = "pdm.backend"
diff --git a/requirements/docs.pip b/requirements/docs.pip
index 6db7c6c8..961a6473 100644
--- a/requirements/docs.pip
+++ b/requirements/docs.pip
@@ -2,3 +2,4 @@ sphinx<6.0
 sphinxext-opengraph
 furo
 livereload
+tomli;python_version<"3.11"
diff --git a/tasks.py b/tasks.py
index e9f65db3..56461679 100644
--- a/tasks.py
+++ b/tasks.py
@@ -15,8 +15,8 @@ VENV_PATH = Path(ACTIVE_VENV) if ACTIVE_VENV else (VENV_HOME / PKG_NAME)
 VENV = str(VENV_PATH.expanduser())
 VENV_BIN = Path(VENV) / Path(BIN_DIR)
 
-TOOLS = ["poetry", "pre-commit", "psutil"]
-POETRY = which("poetry") or VENV_BIN / "poetry"
+TOOLS = ["pdm", "pre-commit", "psutil"]
+PDM = which("pdm") or VENV_BIN / "pdm"
 PRECOMMIT = which("pre-commit") or VENV_BIN / "pre-commit"
 
 
@@ -107,7 +107,7 @@ def precommit(c):
 def setup(c):
     c.run(f"{VENV_BIN}/python -m pip install -U pip", pty=PTY)
     tools(c)
-    c.run(f"{POETRY} install", pty=PTY)
+    c.run(f"{PDM} install", pty=PTY)
     precommit(c)
 
 

From 00d26fc0686acc6b8405cbc9c9e014b9671eaccd Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Sun, 29 Oct 2023 11:56:28 +0100
Subject: [PATCH 2626/2864] remove old setup files

---
 MANIFEST.in |  6 ----
 setup.cfg   |  2 --
 setup.py    | 96 -----------------------------------------------------
 3 files changed, 104 deletions(-)
 delete mode 100644 MANIFEST.in
 delete mode 100644 setup.cfg
 delete mode 100755 setup.py

diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 87d433a8..00000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include *.rst
-recursive-include pelican *.html *.css *png *.rst *.markdown *.md *.mkd *.xml *.py *.jinja2
-include LICENSE THANKS docs/changelog.rst pyproject.toml
-graft samples
-global-exclude __pycache__
-global-exclude *.py[co]
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 2a9acf13..00000000
--- a/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[bdist_wheel]
-universal = 1
diff --git a/setup.py b/setup.py
deleted file mode 100755
index 4ffee0cb..00000000
--- a/setup.py
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env python
-
-from os import walk
-from os.path import join, relpath
-
-from setuptools import find_packages, setup
-
-
-version = "4.8.0"
-
-requires = [
-    'feedgenerator >= 1.9',
-    'jinja2 >= 2.7',
-    'pygments',
-    'docutils>=0.15',
-    'blinker',
-    'unidecode',
-    'python-dateutil',
-    'rich',
-    'backports-zoneinfo[tzdata] >= 0.2; python_version<"3.9"',
-    'watchfiles'
-]
-
-entry_points = {
-    'console_scripts': [
-        'pelican = pelican.__main__:main',
-        'pelican-import = pelican.tools.pelican_import:main',
-        'pelican-quickstart = pelican.tools.pelican_quickstart:main',
-        'pelican-themes = pelican.tools.pelican_themes:main',
-        'pelican-plugins = pelican.plugins._utils:list_plugins'
-    ]
-}
-
-README = open('README.rst', encoding='utf-8').read()
-CHANGELOG = open('docs/changelog.rst', encoding='utf-8').read()
-
-# Relative links in the README must be converted to absolute URL's
-# so that they render correctly on PyPI.
-README = README.replace(
-    "<CONTRIBUTING.rst>",
-    "<https://docs.getpelican.com/en/latest/contribute.html>",
-)
-
-description = '\n'.join([README, CHANGELOG])
-
-setup(
-    name='pelican',
-    version=version,
-    url='https://getpelican.com/',
-    author='Justin Mayer',
-    author_email='authors@getpelican.com',
-    description="Static site generator supporting reStructuredText and "
-                "Markdown source content.",
-    project_urls={
-        'Documentation': 'https://docs.getpelican.com/',
-        'Funding': 'https://donate.getpelican.com/',
-        'Source': 'https://github.com/getpelican/pelican',
-        'Tracker': 'https://github.com/getpelican/pelican/issues',
-    },
-    keywords='static web site generator SSG reStructuredText Markdown',
-    license='AGPLv3',
-    long_description=description,
-    long_description_content_type='text/x-rst',
-    packages=find_packages(),
-    include_package_data=True,  # includes all in MANIFEST.in if in package
-    # NOTE : This will collect any files that happen to be in the themes
-    # directory, even though they may not be checked into version control.
-    package_data={  # pelican/themes is not a package, so include manually
-        'pelican': [relpath(join(root, name), 'pelican')
-                    for root, _, names in walk(join('pelican', 'themes'))
-                    for name in names],
-    },
-    install_requires=requires,
-    extras_require={
-        'Markdown': ['markdown~=3.1.1']
-    },
-    entry_points=entry_points,
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Console',
-        'Framework :: Pelican',
-        'License :: OSI Approved :: GNU Affero General Public License v3',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Topic :: Internet :: WWW/HTTP',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-    ],
-    test_suite='pelican.tests',
-)

From eb052cae096c27dba40ccf3a467b197a7bc91e1b Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Sun, 29 Oct 2023 12:41:55 +0100
Subject: [PATCH 2627/2864] Capitalize PDM in docs

---
 docs/contribute.rst | 8 ++++----
 pyproject.toml      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index a5292dd5..33a62064 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -15,13 +15,13 @@ Setting up the development environment
 ======================================
 
 While there are many ways to set up one's development environment, the following
-instructions will utilize Pip_ and pdm_. These tools facilitate managing
+instructions will utilize Pip_ and PDM_. These tools facilitate managing
 virtual environments for separate Python projects that are isolated from one
 another, so you can use different packages (and package versions) for each.
 
 Please note that Python |min_python| is required for Pelican development.
 
-*(Optional)* If you prefer to `install pdm <https://pdm.fming.dev/latest/#installation>`_ once for use with multiple projects,
+*(Optional)* If you prefer to `install PDM <https://pdm.fming.dev/latest/#installation>`_ once for use with multiple projects,
 you can install it via::
 
     curl -sSL https://pdm.fming.dev/install-pdm.py | python3 -
@@ -35,7 +35,7 @@ as a Git remote::
     cd ~/projects/pelican
     git remote add upstream https://github.com/getpelican/pelican.git
 
-While pdm can dynamically create and manage virtual environments, we're going
+While PDM can dynamically create and manage virtual environments, we're going
 to manually create and activate a virtual environment::
 
     mkdir ~/virtualenvs && cd ~/virtualenvs
@@ -51,7 +51,7 @@ Install the needed dependencies and set up the project::
 Your local environment should now be ready to go!
 
 .. _Pip: https://pip.pypa.io/
-.. _pdm: https://pdm.fming.dev/latest/
+.. _PDM: https://pdm.fming.dev/latest/
 .. _Pelican repository: https://github.com/getpelican/pelican
 
 Development
diff --git a/pyproject.toml b/pyproject.toml
index 9d439680..ac4a73df 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,7 +38,7 @@ dependencies = [
     "rich>=10.1",
     "unidecode>=1.1",
     "backports-zoneinfo<1.0.0,>=0.2.1;python_version<'3.9'",
-    "watchfiles",
+    "watchfiles>=0.21.0",
 ]
 
 [project.optional-dependencies]

From 8a0f335e2bfb8cb3bba0a1e6b9ec0468e5bcd8c9 Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Sun, 29 Oct 2023 15:23:14 +0100
Subject: [PATCH 2628/2864] only install dev dependencies during lint step

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ff1c15b5..0127982e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -60,7 +60,7 @@ jobs:
           cache-dependency-path: ./pyproject.toml
       - name: Install dependencies
         run: |
-          pdm install
+          pdm install --no-default --dev
       - name: Run linters
         run: pdm lint --diff
 

From cce15701359f028bddb3f4115c614b006efc560b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 29 Oct 2023 15:53:11 +0100
Subject: [PATCH 2629/2864] Fix some comments in wheel-related test

---
 pelican/tests/build_test/test_wheel.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/tests/build_test/test_wheel.py b/pelican/tests/build_test/test_wheel.py
index a4635481..8e643981 100644
--- a/pelican/tests/build_test/test_wheel.py
+++ b/pelican/tests/build_test/test_wheel.py
@@ -15,12 +15,12 @@ def test_wheel_contents(pytestconfig):
     wheel_file = pytestconfig.getoption("--check-wheel")
     assert wheel_file.endswith(".whl")
     files_list = ZipFile(wheel_file).namelist()
-    ## Check is theme files are copiedto wheel
+    # Check if theme files are copied to wheel
     simple_theme = Path("./pelican/themes/simple/templates")
     for x in simple_theme.iterdir():
         assert str(x) in files_list
 
-    ## Check is tool templatesare copiedto wheel
+    # Check if tool templates are copied to wheel
     tools = Path("./pelican/tools/templates")
     for x in tools.iterdir():
         assert str(x) in files_list

From 9437de63419080a61733b26444517ac81a5e6b65 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 29 Oct 2023 15:51:24 +0100
Subject: [PATCH 2630/2864] Include more files in PDM sdist builds

This was previously the job of directives in MANIFEST.in, which should
be covered by this PDM-specific configuration.
---
 pyproject.toml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index ac4a73df..58fda86b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -100,6 +100,14 @@ dev = [
     "tomli;python_version<'3.11'",
 ]
 
+[tool.pdm.build]
+source-includes = [
+    "CONTRIBUTING.rst",
+    "THANKS",
+    "docs/changelog.rst",
+    "samples/",
+]
+
 [build-system]
 requires = ["pdm-backend"]
 build-backend = "pdm.backend"

From 6f1605edf9b434fd311a4e801b5d441a5f04985d Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 29 Oct 2023 18:30:25 +0300
Subject: [PATCH 2631/2864] Extend GHA documentation to specify requirements
 file

---
 .github/workflows/github_pages.yml | 3 +--
 docs/tips.rst                      | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index 481dd118..ccf172b4 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -9,7 +9,7 @@ on:
       requirements:
         required: false
         default: "pelican"
-        description: "The Python requirements to install, for example to enable markdown and typogrify use: 'pelican[markdown] typogrify'"
+        description: "The Python requirements to install, for example to enable markdown and typogrify use: 'pelican[markdown] typogrify' or if you have a requirements file use: '-r requirements.txt'"
         type: string
       output-path:
         required: false
@@ -58,4 +58,3 @@ jobs:
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v2
-
diff --git a/docs/tips.rst b/docs/tips.rst
index abd46c8a..904e5ee7 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -187,6 +187,8 @@ the workflow:
 |              |          | install, for example to enable    |        |               |
 |              |          | markdown and typogrify use:       |        |               |
 |              |          | ``"pelican[markdown] typogrify"`` |        |               |
+|              |          | or if you have a requirements     |        |               |
+|              |          | file: ``"-r requirements.txt"``   |        |               |
 +--------------+----------+-----------------------------------+--------+---------------+
 | output-path  | No       | Where to output the generated     | string | ``"output/"`` |
 |              |          | files (``pelican``'s ``--output`` |        |               |

From dbe0b1125f573721dd25211bc19523baf1082425 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Sun, 29 Oct 2023 12:55:37 -0500
Subject: [PATCH 2632/2864] Don't copy file ownership, permissions and metadata

---
 pelican/utils.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index e1bed154..09ffcfe6 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -303,7 +303,7 @@ def copy(source, destination, ignores=None):
             logger.info('Creating directory %s', dst_dir)
             os.makedirs(dst_dir)
         logger.info('Copying %s to %s', source_, destination_)
-        copy_file_metadata(source_, destination_)
+        copy_file(source_, destination_)
 
     elif os.path.isdir(source_):
         if not os.path.exists(destination_):
@@ -333,20 +333,17 @@ def copy(source, destination, ignores=None):
                 dst_path = os.path.join(dst_dir, o)
                 if os.path.isfile(src_path):
                     logger.info('Copying %s to %s', src_path, dst_path)
-                    copy_file_metadata(src_path, dst_path)
+                    copy_file(src_path, dst_path)
                 else:
                     logger.warning('Skipped copy %s (not a file or '
                                    'directory) to %s',
                                    src_path, dst_path)
 
 
-def copy_file_metadata(source, destination):
-    '''Copy a file and its metadata (perm bits, access times, ...)'''
-
-    # This function is a workaround for Android python copystat
-    # bug ([issue28141]) https://bugs.python.org/issue28141
+def copy_file(source, destination):
+    '''Copy a file'''
     try:
-        shutil.copy2(source, destination)
+        shutil.copyfile(source, destination)
     except OSError as e:
         logger.warning("A problem occurred copying file %s to %s; %s",
                        source, destination, e)

From 8ea27b82f6c0c6fccd4362246ae1d2ff76b46d05 Mon Sep 17 00:00:00 2001
From: Chris Rose <offline@offby1.net>
Date: Sun, 29 Oct 2023 09:50:01 -0700
Subject: [PATCH 2633/2864] Bump all of the dev dependencies

- remove upper version caps
- updated the minimum version of most of Pelican's runtime deps
- replaced black with ruff as a formatter for pelican
- added a cache step to the docs CI task so that the docs can be
  downloaded and inspected.
---
 .github/workflows/main.yml |  5 +++
 pyproject.toml             | 62 +++++++++++++++++++-------------------
 tasks.py                   | 19 ++++--------
 3 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0127982e..59a22862 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -80,6 +80,11 @@ jobs:
         run: python -m pip install -U pip tox
       - name: Check
         run: tox -e docs
+      - name: cache the docs for inspection
+        uses: actions/upload-artifact@v3
+        with:
+          name: docs
+          path: docs/_build/html/
 
   deploy:
     name: Deploy
diff --git a/pyproject.toml b/pyproject.toml
index 58fda86b..4e3e712a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,15 +29,15 @@ classifiers = [
 ]
 requires-python = ">=3.8.1,<4.0"
 dependencies = [
-    "blinker>=1.4",
-    "docutils>=0.16",
-    "feedgenerator>=1.9",
-    "jinja2>=2.7",
-    "pygments>=2.6",
-    "python-dateutil>=2.8",
-    "rich>=10.1",
-    "unidecode>=1.1",
-    "backports-zoneinfo<1.0.0,>=0.2.1;python_version<'3.9'",
+    "blinker>=1.6.3",
+    "docutils>=0.20.1",
+    "feedgenerator>=2.1.0",
+    "jinja2>=3.1.2",
+    "pygments>=2.16.1",
+    "python-dateutil>=2.8.2",
+    "rich>=13.6.0",
+    "unidecode>=1.3.7",
+    "backports-zoneinfo>=0.2.1; python_version < \"3.9\"",
     "watchfiles>=0.21.0",
 ]
 
@@ -76,28 +76,28 @@ test = "invoke tests"
 
 [tool.pdm.dev-dependencies]
 dev = [
-    "BeautifulSoup4<5.0,>=4.9",
-    "jinja2~=3.1.2",
-    "lxml<5.0,>=4.3",
-    "markdown~=3.4.3",
-    "typogrify<3.0,>=2.0",
-    "sphinx<6.0,>=5.1",
-    "furo==2023.03.27",
-    "livereload<3.0,>=2.6",
-    "psutil<6.0,>=5.7",
-    "pygments~=2.15",
-    "pytest<8.0,>=7.1",
-    "pytest-cov<5.0,>=4.0",
-    "pytest-sugar<1.0.0,>=0.9.5",
-    "pytest-xdist<3.0,>=2.0",
-    "tox<4.0,>=3.13",
-    "flake8<4.0,>=3.8",
-    "flake8-import-order<1.0.0,>=0.18.1",
-    "invoke<3.0,>=2.0",
-    "isort<6.0,>=5.2",
-    "black<20.0,>=19.10b0",
-    "ruff>=0.1.3,<1.0.0",
-    "tomli;python_version<'3.11'",
+    "BeautifulSoup4>=4.12.2",
+    "jinja2>=3.1.2",
+    "lxml>=4.9.3",
+    "markdown>=3.5",
+    "typogrify>=2.0.7",
+    "sphinx>=7.1.2",
+    "furo>=2023.9.10",
+    "livereload>=2.6.3",
+    "psutil>=5.9.6",
+    "pygments>=2.16.1",
+    "pytest>=7.4.3",
+    "pytest-cov>=4.1.0",
+    "pytest-sugar>=0.9.7",
+    "pytest-xdist>=3.3.1",
+    "tox>=4.11.3",
+    "flake8>=6.1.0",
+    "flake8-import-order>=0.18.2",
+    "invoke>=2.2.0",
+    "isort>=5.12.0",
+    "black>=23.10.1",
+    "ruff>=0.1.3",
+    "tomli>=2.0.1; python_version < \"3.11\"",
 ]
 
 [tool.pdm.build]
diff --git a/tasks.py b/tasks.py
index 56461679..64409e20 100644
--- a/tasks.py
+++ b/tasks.py
@@ -52,24 +52,16 @@ def coverage(c):
 
 
 @task
-def black(c, check=False, diff=False):
-    """Run Black auto-formatter, optionally with --check or --diff"""
+def format(c, check=False, diff=False):
+    """Run Ruff's auto-formatter, optionally with --check or --diff"""
     check_flag, diff_flag = "", ""
     if check:
         check_flag = "--check"
     if diff:
         diff_flag = "--diff"
-    c.run(f"{VENV_BIN}/black {check_flag} {diff_flag} {PKG_PATH} tasks.py", pty=PTY)
-
-
-@task
-def isort(c, check=False, diff=False):
-    check_flag, diff_flag = "", ""
-    if check:
-        check_flag = "-c"
-    if diff:
-        diff_flag = "--diff"
-    c.run(f"{VENV_BIN}/isort {check_flag} {diff_flag} .", pty=PTY)
+    c.run(
+        f"{VENV_BIN}/ruff format {check_flag} {diff_flag} {PKG_PATH} tasks.py", pty=PTY
+    )
 
 
 @task
@@ -87,6 +79,7 @@ def ruff(c, fix=False, diff=False):
 def lint(c, fix=False, diff=False):
     """Check code style via linting tools."""
     ruff(c, fix=fix, diff=diff)
+    format(c, check=not fix, diff=diff)
 
 
 @task

From cabdb26cee66e1173cf16cb31d3fe5f9fa4392e7 Mon Sep 17 00:00:00 2001
From: Chris Rose <offline@offby1.net>
Date: Sun, 29 Oct 2023 22:18:29 +0100
Subject: [PATCH 2634/2864] Apply code style to project via: ruff format .

---
 pelican/__init__.py                           |  530 +++---
 pelican/__main__.py                           |    2 +-
 pelican/cache.py                              |   52 +-
 pelican/contents.py                           |  323 ++--
 pelican/generators.py                         |  796 +++++----
 pelican/log.py                                |   45 +-
 pelican/paginator.py                          |   47 +-
 pelican/plugins/_utils.py                     |   36 +-
 pelican/plugins/signals.py                    |   56 +-
 pelican/readers.py                            |  416 ++---
 pelican/rstdirectives.py                      |   60 +-
 pelican/server.py                             |  110 +-
 pelican/settings.py                           |  819 +++++----
 pelican/signals.py                            |    4 +-
 pelican/tests/default_conf.py                 |   44 +-
 .../pelican/plugins/ns_plugin/__init__.py     |    2 +-
 pelican/tests/support.py                      |   80 +-
 pelican/tests/test_cache.py                   |  235 ++-
 pelican/tests/test_cli.py                     |   77 +-
 pelican/tests/test_contents.py                |  870 +++++-----
 pelican/tests/test_generators.py              | 1500 ++++++++++-------
 pelican/tests/test_importer.py                |  638 ++++---
 pelican/tests/test_log.py                     |   45 +-
 pelican/tests/test_paginator.py               |  111 +-
 pelican/tests/test_pelican.py                 |  250 +--
 pelican/tests/test_plugins.py                 |  118 +-
 pelican/tests/test_readers.py                 |  853 +++++-----
 pelican/tests/test_rstdirectives.py           |   12 +-
 pelican/tests/test_server.py                  |   36 +-
 pelican/tests/test_settings.py                |  292 ++--
 pelican/tests/test_testsuite.py               |    3 +-
 pelican/tests/test_urlwrappers.py             |   83 +-
 pelican/tests/test_utils.py                   |  920 +++++-----
 pelican/tools/pelican_import.py               |  963 ++++++-----
 pelican/tools/pelican_quickstart.py           |  367 ++--
 pelican/tools/pelican_themes.py               |  181 +-
 pelican/urlwrappers.py                        |   42 +-
 pelican/utils.py                              |  323 ++--
 pelican/writers.py                            |  185 +-
 samples/pelican.conf.py                       |   52 +-
 samples/pelican.conf_FR.py                    |   54 +-
 41 files changed, 6487 insertions(+), 5145 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index fcdda8a4..a0ff4989 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -9,19 +9,25 @@ import sys
 import time
 import traceback
 from collections.abc import Iterable
+
 # Combines all paths to `pelican` package accessible from `sys.path`
 # Makes it possible to install `pelican` and namespace plugins into different
 # locations in the file system (e.g. pip with `-e` or `--user`)
 from pkgutil import extend_path
+
 __path__ = extend_path(__path__, __name__)
 
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import console
 from pelican.log import init as init_logging
-from pelican.generators import (ArticlesGenerator,  # noqa: I100
-                                PagesGenerator, SourceFileGenerator,
-                                StaticGenerator, TemplatePagesGenerator)
+from pelican.generators import (
+    ArticlesGenerator,  # noqa: I100
+    PagesGenerator,
+    SourceFileGenerator,
+    StaticGenerator,
+    TemplatePagesGenerator,
+)
 from pelican.plugins import signals
 from pelican.plugins._utils import get_plugin_name, load_plugins
 from pelican.readers import Readers
@@ -35,12 +41,11 @@ try:
 except Exception:
     __version__ = "unknown"
 
-DEFAULT_CONFIG_NAME = 'pelicanconf.py'
+DEFAULT_CONFIG_NAME = "pelicanconf.py"
 logger = logging.getLogger(__name__)
 
 
 class Pelican:
-
     def __init__(self, settings):
         """Pelican initialization
 
@@ -50,35 +55,34 @@ class Pelican:
         # define the default settings
         self.settings = settings
 
-        self.path = settings['PATH']
-        self.theme = settings['THEME']
-        self.output_path = settings['OUTPUT_PATH']
-        self.ignore_files = settings['IGNORE_FILES']
-        self.delete_outputdir = settings['DELETE_OUTPUT_DIRECTORY']
-        self.output_retention = settings['OUTPUT_RETENTION']
+        self.path = settings["PATH"]
+        self.theme = settings["THEME"]
+        self.output_path = settings["OUTPUT_PATH"]
+        self.ignore_files = settings["IGNORE_FILES"]
+        self.delete_outputdir = settings["DELETE_OUTPUT_DIRECTORY"]
+        self.output_retention = settings["OUTPUT_RETENTION"]
 
         self.init_path()
         self.init_plugins()
         signals.initialized.send(self)
 
     def init_path(self):
-        if not any(p in sys.path for p in ['', os.curdir]):
+        if not any(p in sys.path for p in ["", os.curdir]):
             logger.debug("Adding current directory to system path")
-            sys.path.insert(0, '')
+            sys.path.insert(0, "")
 
     def init_plugins(self):
         self.plugins = []
         for plugin in load_plugins(self.settings):
             name = get_plugin_name(plugin)
-            logger.debug('Registering plugin `%s`', name)
+            logger.debug("Registering plugin `%s`", name)
             try:
                 plugin.register()
                 self.plugins.append(plugin)
             except Exception as e:
-                logger.error('Cannot register plugin `%s`\n%s',
-                             name, e)
+                logger.error("Cannot register plugin `%s`\n%s", name, e)
 
-        self.settings['PLUGINS'] = [get_plugin_name(p) for p in self.plugins]
+        self.settings["PLUGINS"] = [get_plugin_name(p) for p in self.plugins]
 
     def run(self):
         """Run the generators and return"""
@@ -87,10 +91,10 @@ class Pelican:
         context = self.settings.copy()
         # Share these among all the generators and content objects
         # They map source paths to Content objects or None
-        context['generated_content'] = {}
-        context['static_links'] = set()
-        context['static_content'] = {}
-        context['localsiteurl'] = self.settings['SITEURL']
+        context["generated_content"] = {}
+        context["static_links"] = set()
+        context["static_content"] = {}
+        context["localsiteurl"] = self.settings["SITEURL"]
 
         generators = [
             cls(
@@ -99,23 +103,25 @@ class Pelican:
                 path=self.path,
                 theme=self.theme,
                 output_path=self.output_path,
-            ) for cls in self._get_generator_classes()
+            )
+            for cls in self._get_generator_classes()
         ]
 
         # Delete the output directory if (1) the appropriate setting is True
         # and (2) that directory is not the parent of the source directory
-        if (self.delete_outputdir
-                and os.path.commonpath([os.path.realpath(self.output_path)]) !=
-                os.path.commonpath([os.path.realpath(self.output_path),
-                                    os.path.realpath(self.path)])):
+        if self.delete_outputdir and os.path.commonpath(
+            [os.path.realpath(self.output_path)]
+        ) != os.path.commonpath(
+            [os.path.realpath(self.output_path), os.path.realpath(self.path)]
+        ):
             clean_output_dir(self.output_path, self.output_retention)
 
         for p in generators:
-            if hasattr(p, 'generate_context'):
+            if hasattr(p, "generate_context"):
                 p.generate_context()
 
         for p in generators:
-            if hasattr(p, 'refresh_metadata_intersite_links'):
+            if hasattr(p, "refresh_metadata_intersite_links"):
                 p.refresh_metadata_intersite_links()
 
         signals.all_generators_finalized.send(generators)
@@ -123,61 +129,75 @@ class Pelican:
         writer = self._get_writer()
 
         for p in generators:
-            if hasattr(p, 'generate_output'):
+            if hasattr(p, "generate_output"):
                 p.generate_output(writer)
 
         signals.finalized.send(self)
 
-        articles_generator = next(g for g in generators
-                                  if isinstance(g, ArticlesGenerator))
-        pages_generator = next(g for g in generators
-                               if isinstance(g, PagesGenerator))
+        articles_generator = next(
+            g for g in generators if isinstance(g, ArticlesGenerator)
+        )
+        pages_generator = next(g for g in generators if isinstance(g, PagesGenerator))
 
         pluralized_articles = maybe_pluralize(
-            (len(articles_generator.articles) +
-             len(articles_generator.translations)),
-            'article',
-            'articles')
+            (len(articles_generator.articles) + len(articles_generator.translations)),
+            "article",
+            "articles",
+        )
         pluralized_drafts = maybe_pluralize(
-            (len(articles_generator.drafts) +
-             len(articles_generator.drafts_translations)),
-            'draft',
-            'drafts')
+            (
+                len(articles_generator.drafts)
+                + len(articles_generator.drafts_translations)
+            ),
+            "draft",
+            "drafts",
+        )
         pluralized_hidden_articles = maybe_pluralize(
-            (len(articles_generator.hidden_articles) +
-             len(articles_generator.hidden_translations)),
-            'hidden article',
-            'hidden articles')
+            (
+                len(articles_generator.hidden_articles)
+                + len(articles_generator.hidden_translations)
+            ),
+            "hidden article",
+            "hidden articles",
+        )
         pluralized_pages = maybe_pluralize(
-            (len(pages_generator.pages) +
-             len(pages_generator.translations)),
-            'page',
-            'pages')
+            (len(pages_generator.pages) + len(pages_generator.translations)),
+            "page",
+            "pages",
+        )
         pluralized_hidden_pages = maybe_pluralize(
-            (len(pages_generator.hidden_pages) +
-             len(pages_generator.hidden_translations)),
-            'hidden page',
-            'hidden pages')
+            (
+                len(pages_generator.hidden_pages)
+                + len(pages_generator.hidden_translations)
+            ),
+            "hidden page",
+            "hidden pages",
+        )
         pluralized_draft_pages = maybe_pluralize(
-            (len(pages_generator.draft_pages) +
-             len(pages_generator.draft_translations)),
-            'draft page',
-            'draft pages')
+            (
+                len(pages_generator.draft_pages)
+                + len(pages_generator.draft_translations)
+            ),
+            "draft page",
+            "draft pages",
+        )
 
-        console.print('Done: Processed {}, {}, {}, {}, {} and {} in {:.2f} seconds.'
-                      .format(
-                              pluralized_articles,
-                              pluralized_drafts,
-                              pluralized_hidden_articles,
-                              pluralized_pages,
-                              pluralized_hidden_pages,
-                              pluralized_draft_pages,
-                              time.time() - start_time))
+        console.print(
+            "Done: Processed {}, {}, {}, {}, {} and {} in {:.2f} seconds.".format(
+                pluralized_articles,
+                pluralized_drafts,
+                pluralized_hidden_articles,
+                pluralized_pages,
+                pluralized_hidden_pages,
+                pluralized_draft_pages,
+                time.time() - start_time,
+            )
+        )
 
     def _get_generator_classes(self):
         discovered_generators = [
             (ArticlesGenerator, "internal"),
-            (PagesGenerator, "internal")
+            (PagesGenerator, "internal"),
         ]
 
         if self.settings["TEMPLATE_PAGES"]:
@@ -236,7 +256,7 @@ class PrintSettings(argparse.Action):
         except Exception as e:
             logger.critical("%s: %s", e.__class__.__name__, e)
             console.print_exception()
-            sys.exit(getattr(e, 'exitcode', 1))
+            sys.exit(getattr(e, "exitcode", 1))
 
         if values:
             # One or more arguments provided, so only print those settings
@@ -244,14 +264,16 @@ class PrintSettings(argparse.Action):
                 if setting in settings:
                     # Only add newline between setting name and value if dict
                     if isinstance(settings[setting], (dict, tuple, list)):
-                        setting_format = '\n{}:\n{}'
+                        setting_format = "\n{}:\n{}"
                     else:
-                        setting_format = '\n{}: {}'
-                    console.print(setting_format.format(
-                        setting,
-                        pprint.pformat(settings[setting])))
+                        setting_format = "\n{}: {}"
+                    console.print(
+                        setting_format.format(
+                            setting, pprint.pformat(settings[setting])
+                        )
+                    )
                 else:
-                    console.print('\n{} is not a recognized setting.'.format(setting))
+                    console.print("\n{} is not a recognized setting.".format(setting))
                     break
         else:
             # No argument was given to --print-settings, so print all settings
@@ -268,170 +290,258 @@ class ParseOverrides(argparse.Action):
                 k, v = item.split("=", 1)
             except ValueError:
                 raise ValueError(
-                    'Extra settings must be specified as KEY=VALUE pairs '
-                    f'but you specified {item}'
+                    "Extra settings must be specified as KEY=VALUE pairs "
+                    f"but you specified {item}"
                 )
             try:
                 overrides[k] = json.loads(v)
             except json.decoder.JSONDecodeError:
                 raise ValueError(
-                    f'Invalid JSON value: {v}. '
-                    'Values specified via -e / --extra-settings flags '
-                    'must be in JSON notation. '
-                    'Use -e KEY=\'"string"\' to specify a string value; '
-                    '-e KEY=null to specify None; '
-                    '-e KEY=false (or true) to specify False (or True).'
+                    f"Invalid JSON value: {v}. "
+                    "Values specified via -e / --extra-settings flags "
+                    "must be in JSON notation. "
+                    "Use -e KEY='\"string\"' to specify a string value; "
+                    "-e KEY=null to specify None; "
+                    "-e KEY=false (or true) to specify False (or True)."
                 )
         setattr(namespace, self.dest, overrides)
 
 
 def parse_arguments(argv=None):
     parser = argparse.ArgumentParser(
-        description='A tool to generate a static blog, '
-                    ' with restructured text input files.',
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter
+        description="A tool to generate a static blog, "
+        " with restructured text input files.",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
 
-    parser.add_argument(dest='path', nargs='?',
-                        help='Path where to find the content files.',
-                        default=None)
+    parser.add_argument(
+        dest="path",
+        nargs="?",
+        help="Path where to find the content files.",
+        default=None,
+    )
 
-    parser.add_argument('-t', '--theme-path', dest='theme',
-                        help='Path where to find the theme templates. If not '
-                        'specified, it will use the default one included with '
-                        'pelican.')
+    parser.add_argument(
+        "-t",
+        "--theme-path",
+        dest="theme",
+        help="Path where to find the theme templates. If not "
+        "specified, it will use the default one included with "
+        "pelican.",
+    )
 
-    parser.add_argument('-o', '--output', dest='output',
-                        help='Where to output the generated files. If not '
-                        'specified, a directory will be created, named '
-                        '"output" in the current path.')
+    parser.add_argument(
+        "-o",
+        "--output",
+        dest="output",
+        help="Where to output the generated files. If not "
+        "specified, a directory will be created, named "
+        '"output" in the current path.',
+    )
 
-    parser.add_argument('-s', '--settings', dest='settings',
-                        help='The settings of the application, this is '
-                        'automatically set to {} if a file exists with this '
-                        'name.'.format(DEFAULT_CONFIG_NAME))
+    parser.add_argument(
+        "-s",
+        "--settings",
+        dest="settings",
+        help="The settings of the application, this is "
+        "automatically set to {} if a file exists with this "
+        "name.".format(DEFAULT_CONFIG_NAME),
+    )
 
-    parser.add_argument('-d', '--delete-output-directory',
-                        dest='delete_outputdir', action='store_true',
-                        default=None, help='Delete the output directory.')
+    parser.add_argument(
+        "-d",
+        "--delete-output-directory",
+        dest="delete_outputdir",
+        action="store_true",
+        default=None,
+        help="Delete the output directory.",
+    )
 
-    parser.add_argument('-v', '--verbose', action='store_const',
-                        const=logging.INFO, dest='verbosity',
-                        help='Show all messages.')
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        action="store_const",
+        const=logging.INFO,
+        dest="verbosity",
+        help="Show all messages.",
+    )
 
-    parser.add_argument('-q', '--quiet', action='store_const',
-                        const=logging.CRITICAL, dest='verbosity',
-                        help='Show only critical errors.')
+    parser.add_argument(
+        "-q",
+        "--quiet",
+        action="store_const",
+        const=logging.CRITICAL,
+        dest="verbosity",
+        help="Show only critical errors.",
+    )
 
-    parser.add_argument('-D', '--debug', action='store_const',
-                        const=logging.DEBUG, dest='verbosity',
-                        help='Show all messages, including debug messages.')
+    parser.add_argument(
+        "-D",
+        "--debug",
+        action="store_const",
+        const=logging.DEBUG,
+        dest="verbosity",
+        help="Show all messages, including debug messages.",
+    )
 
-    parser.add_argument('--version', action='version', version=__version__,
-                        help='Print the pelican version and exit.')
+    parser.add_argument(
+        "--version",
+        action="version",
+        version=__version__,
+        help="Print the pelican version and exit.",
+    )
 
-    parser.add_argument('-r', '--autoreload', dest='autoreload',
-                        action='store_true',
-                        help='Relaunch pelican each time a modification occurs'
-                        ' on the content files.')
+    parser.add_argument(
+        "-r",
+        "--autoreload",
+        dest="autoreload",
+        action="store_true",
+        help="Relaunch pelican each time a modification occurs"
+        " on the content files.",
+    )
 
-    parser.add_argument('--print-settings', dest='print_settings', nargs='*',
-                        action=PrintSettings, metavar='SETTING_NAME',
-                        help='Print current configuration settings and exit. '
-                        'Append one or more setting name arguments to see the '
-                        'values for specific settings only.')
+    parser.add_argument(
+        "--print-settings",
+        dest="print_settings",
+        nargs="*",
+        action=PrintSettings,
+        metavar="SETTING_NAME",
+        help="Print current configuration settings and exit. "
+        "Append one or more setting name arguments to see the "
+        "values for specific settings only.",
+    )
 
-    parser.add_argument('--relative-urls', dest='relative_paths',
-                        action='store_true',
-                        help='Use relative urls in output, '
-                             'useful for site development')
+    parser.add_argument(
+        "--relative-urls",
+        dest="relative_paths",
+        action="store_true",
+        help="Use relative urls in output, " "useful for site development",
+    )
 
-    parser.add_argument('--cache-path', dest='cache_path',
-                        help=('Directory in which to store cache files. '
-                              'If not specified, defaults to "cache".'))
+    parser.add_argument(
+        "--cache-path",
+        dest="cache_path",
+        help=(
+            "Directory in which to store cache files. "
+            'If not specified, defaults to "cache".'
+        ),
+    )
 
-    parser.add_argument('--ignore-cache', action='store_true',
-                        dest='ignore_cache', help='Ignore content cache '
-                        'from previous runs by not loading cache files.')
+    parser.add_argument(
+        "--ignore-cache",
+        action="store_true",
+        dest="ignore_cache",
+        help="Ignore content cache " "from previous runs by not loading cache files.",
+    )
 
-    parser.add_argument('-w', '--write-selected', type=str,
-                        dest='selected_paths', default=None,
-                        help='Comma separated list of selected paths to write')
+    parser.add_argument(
+        "-w",
+        "--write-selected",
+        type=str,
+        dest="selected_paths",
+        default=None,
+        help="Comma separated list of selected paths to write",
+    )
 
-    parser.add_argument('--fatal', metavar='errors|warnings',
-                        choices=('errors', 'warnings'), default='',
-                        help=('Exit the program with non-zero status if any '
-                              'errors/warnings encountered.'))
+    parser.add_argument(
+        "--fatal",
+        metavar="errors|warnings",
+        choices=("errors", "warnings"),
+        default="",
+        help=(
+            "Exit the program with non-zero status if any "
+            "errors/warnings encountered."
+        ),
+    )
 
-    parser.add_argument('--logs-dedup-min-level', default='WARNING',
-                        choices=('DEBUG', 'INFO', 'WARNING', 'ERROR'),
-                        help=('Only enable log de-duplication for levels equal'
-                              ' to or above the specified value'))
+    parser.add_argument(
+        "--logs-dedup-min-level",
+        default="WARNING",
+        choices=("DEBUG", "INFO", "WARNING", "ERROR"),
+        help=(
+            "Only enable log de-duplication for levels equal"
+            " to or above the specified value"
+        ),
+    )
 
-    parser.add_argument('-l', '--listen', dest='listen', action='store_true',
-                        help='Serve content files via HTTP and port 8000.')
+    parser.add_argument(
+        "-l",
+        "--listen",
+        dest="listen",
+        action="store_true",
+        help="Serve content files via HTTP and port 8000.",
+    )
 
-    parser.add_argument('-p', '--port', dest='port', type=int,
-                        help='Port to serve HTTP files at. (default: 8000)')
+    parser.add_argument(
+        "-p",
+        "--port",
+        dest="port",
+        type=int,
+        help="Port to serve HTTP files at. (default: 8000)",
+    )
 
-    parser.add_argument('-b', '--bind', dest='bind',
-                        help='IP to bind to when serving files via HTTP '
-                        '(default: 127.0.0.1)')
+    parser.add_argument(
+        "-b",
+        "--bind",
+        dest="bind",
+        help="IP to bind to when serving files via HTTP " "(default: 127.0.0.1)",
+    )
 
-    parser.add_argument('-e', '--extra-settings', dest='overrides',
-                        help='Specify one or more SETTING=VALUE pairs to '
-                             'override settings. VALUE must be in JSON notation: '
-                             'specify string values as SETTING=\'"some string"\'; '
-                             'booleans as SETTING=true or SETTING=false; '
-                             'None as SETTING=null.',
-                        nargs='*',
-                        action=ParseOverrides,
-                        default={})
+    parser.add_argument(
+        "-e",
+        "--extra-settings",
+        dest="overrides",
+        help="Specify one or more SETTING=VALUE pairs to "
+        "override settings. VALUE must be in JSON notation: "
+        "specify string values as SETTING='\"some string\"'; "
+        "booleans as SETTING=true or SETTING=false; "
+        "None as SETTING=null.",
+        nargs="*",
+        action=ParseOverrides,
+        default={},
+    )
 
     args = parser.parse_args(argv)
 
     if args.port is not None and not args.listen:
-        logger.warning('--port without --listen has no effect')
+        logger.warning("--port without --listen has no effect")
     if args.bind is not None and not args.listen:
-        logger.warning('--bind without --listen has no effect')
+        logger.warning("--bind without --listen has no effect")
 
     return args
 
 
 def get_config(args):
-    """Builds a config dictionary based on supplied `args`.
-    """
+    """Builds a config dictionary based on supplied `args`."""
     config = {}
     if args.path:
-        config['PATH'] = os.path.abspath(os.path.expanduser(args.path))
+        config["PATH"] = os.path.abspath(os.path.expanduser(args.path))
     if args.output:
-        config['OUTPUT_PATH'] = \
-            os.path.abspath(os.path.expanduser(args.output))
+        config["OUTPUT_PATH"] = os.path.abspath(os.path.expanduser(args.output))
     if args.theme:
         abstheme = os.path.abspath(os.path.expanduser(args.theme))
-        config['THEME'] = abstheme if os.path.exists(abstheme) else args.theme
+        config["THEME"] = abstheme if os.path.exists(abstheme) else args.theme
     if args.delete_outputdir is not None:
-        config['DELETE_OUTPUT_DIRECTORY'] = args.delete_outputdir
+        config["DELETE_OUTPUT_DIRECTORY"] = args.delete_outputdir
     if args.ignore_cache:
-        config['LOAD_CONTENT_CACHE'] = False
+        config["LOAD_CONTENT_CACHE"] = False
     if args.cache_path:
-        config['CACHE_PATH'] = args.cache_path
+        config["CACHE_PATH"] = args.cache_path
     if args.selected_paths:
-        config['WRITE_SELECTED'] = args.selected_paths.split(',')
+        config["WRITE_SELECTED"] = args.selected_paths.split(",")
     if args.relative_paths:
-        config['RELATIVE_URLS'] = args.relative_paths
+        config["RELATIVE_URLS"] = args.relative_paths
     if args.port is not None:
-        config['PORT'] = args.port
+        config["PORT"] = args.port
     if args.bind is not None:
-        config['BIND'] = args.bind
-    config['DEBUG'] = args.verbosity == logging.DEBUG
+        config["BIND"] = args.bind
+    config["DEBUG"] = args.verbosity == logging.DEBUG
     config.update(args.overrides)
 
     return config
 
 
 def get_instance(args):
-
     config_file = args.settings
     if config_file is None and os.path.isfile(DEFAULT_CONFIG_NAME):
         config_file = DEFAULT_CONFIG_NAME
@@ -439,9 +549,9 @@ def get_instance(args):
 
     settings = read_settings(config_file, override=get_config(args))
 
-    cls = settings['PELICAN_CLASS']
+    cls = settings["PELICAN_CLASS"]
     if isinstance(cls, str):
-        module, cls_name = cls.rsplit('.', 1)
+        module, cls_name = cls.rsplit(".", 1)
         module = __import__(module)
         cls = getattr(module, cls_name)
 
@@ -449,8 +559,10 @@ def get_instance(args):
 
 
 def autoreload(args, excqueue=None):
-    console.print('  --- AutoReload Mode: Monitoring `content`, `theme` and'
-                  ' `settings` for changes. ---')
+    console.print(
+        "  --- AutoReload Mode: Monitoring `content`, `theme` and"
+        " `settings` for changes. ---"
+    )
     pelican, settings = get_instance(args)
     settings_file = os.path.abspath(args.settings)
     while True:
@@ -463,8 +575,9 @@ def autoreload(args, excqueue=None):
             if settings_file in changed_files:
                 pelican, settings = get_instance(args)
 
-            console.print('\n-> Modified: {}. re-generating...'.format(
-                              ', '.join(changed_files)))
+            console.print(
+                "\n-> Modified: {}. re-generating...".format(", ".join(changed_files))
+            )
 
         except KeyboardInterrupt:
             if excqueue is not None:
@@ -473,15 +586,14 @@ def autoreload(args, excqueue=None):
             raise
 
         except Exception as e:
-            if (args.verbosity == logging.DEBUG):
+            if args.verbosity == logging.DEBUG:
                 if excqueue is not None:
-                    excqueue.put(
-                        traceback.format_exception_only(type(e), e)[-1])
+                    excqueue.put(traceback.format_exception_only(type(e), e)[-1])
                 else:
                     raise
             logger.warning(
-                'Caught exception:\n"%s".', e,
-                exc_info=settings.get('DEBUG', False))
+                'Caught exception:\n"%s".', e, exc_info=settings.get("DEBUG", False)
+            )
 
 
 def listen(server, port, output, excqueue=None):
@@ -491,8 +603,7 @@ def listen(server, port, output, excqueue=None):
 
     RootedHTTPServer.allow_reuse_address = True
     try:
-        httpd = RootedHTTPServer(
-            output, (server, port), ComplexHTTPRequestHandler)
+        httpd = RootedHTTPServer(output, (server, port), ComplexHTTPRequestHandler)
     except OSError as e:
         logging.error("Could not listen on port %s, server %s.", port, server)
         if excqueue is not None:
@@ -500,8 +611,9 @@ def listen(server, port, output, excqueue=None):
         return
 
     try:
-        console.print("Serving site at: http://{}:{} - Tap CTRL-C to stop".format(
-                      server, port))
+        console.print(
+            "Serving site at: http://{}:{} - Tap CTRL-C to stop".format(server, port)
+        )
         httpd.serve_forever()
     except Exception as e:
         if excqueue is not None:
@@ -518,24 +630,31 @@ def listen(server, port, output, excqueue=None):
 def main(argv=None):
     args = parse_arguments(argv)
     logs_dedup_min_level = getattr(logging, args.logs_dedup_min_level)
-    init_logging(level=args.verbosity, fatal=args.fatal,
-                 name=__name__, logs_dedup_min_level=logs_dedup_min_level)
+    init_logging(
+        level=args.verbosity,
+        fatal=args.fatal,
+        name=__name__,
+        logs_dedup_min_level=logs_dedup_min_level,
+    )
 
-    logger.debug('Pelican version: %s', __version__)
-    logger.debug('Python version: %s', sys.version.split()[0])
+    logger.debug("Pelican version: %s", __version__)
+    logger.debug("Python version: %s", sys.version.split()[0])
 
     try:
         pelican, settings = get_instance(args)
 
         if args.autoreload and args.listen:
             excqueue = multiprocessing.Queue()
-            p1 = multiprocessing.Process(
-                target=autoreload,
-                args=(args, excqueue))
+            p1 = multiprocessing.Process(target=autoreload, args=(args, excqueue))
             p2 = multiprocessing.Process(
                 target=listen,
-                args=(settings.get('BIND'), settings.get('PORT'),
-                      settings.get("OUTPUT_PATH"), excqueue))
+                args=(
+                    settings.get("BIND"),
+                    settings.get("PORT"),
+                    settings.get("OUTPUT_PATH"),
+                    excqueue,
+                ),
+            )
             try:
                 p1.start()
                 p2.start()
@@ -548,16 +667,17 @@ def main(argv=None):
         elif args.autoreload:
             autoreload(args)
         elif args.listen:
-            listen(settings.get('BIND'), settings.get('PORT'),
-                   settings.get("OUTPUT_PATH"))
+            listen(
+                settings.get("BIND"), settings.get("PORT"), settings.get("OUTPUT_PATH")
+            )
         else:
             with console.status("Generating..."):
                 pelican.run()
     except KeyboardInterrupt:
-        logger.warning('Keyboard interrupt received. Exiting.')
+        logger.warning("Keyboard interrupt received. Exiting.")
     except Exception as e:
         logger.critical("%s: %s", e.__class__.__name__, e)
 
         if args.verbosity == logging.DEBUG:
             console.print_exception()
-        sys.exit(getattr(e, 'exitcode', 1))
+        sys.exit(getattr(e, "exitcode", 1))
diff --git a/pelican/__main__.py b/pelican/__main__.py
index 69a5b95d..17aead3b 100644
--- a/pelican/__main__.py
+++ b/pelican/__main__.py
@@ -5,5 +5,5 @@ python -m pelican module entry point to run via python -m
 from . import main
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/pelican/cache.py b/pelican/cache.py
index d2665691..d1f8550e 100644
--- a/pelican/cache.py
+++ b/pelican/cache.py
@@ -19,29 +19,35 @@ class FileDataCacher:
         Sets caching policy according to *caching_policy*.
         """
         self.settings = settings
-        self._cache_path = os.path.join(self.settings['CACHE_PATH'],
-                                        cache_name)
+        self._cache_path = os.path.join(self.settings["CACHE_PATH"], cache_name)
         self._cache_data_policy = caching_policy
-        if self.settings['GZIP_CACHE']:
+        if self.settings["GZIP_CACHE"]:
             import gzip
+
             self._cache_open = gzip.open
         else:
             self._cache_open = open
         if load_policy:
             try:
-                with self._cache_open(self._cache_path, 'rb') as fhandle:
+                with self._cache_open(self._cache_path, "rb") as fhandle:
                     self._cache = pickle.load(fhandle)
             except (OSError, UnicodeDecodeError) as err:
-                logger.debug('Cannot load cache %s (this is normal on first '
-                             'run). Proceeding with empty cache.\n%s',
-                             self._cache_path, err)
+                logger.debug(
+                    "Cannot load cache %s (this is normal on first "
+                    "run). Proceeding with empty cache.\n%s",
+                    self._cache_path,
+                    err,
+                )
                 self._cache = {}
             except pickle.PickleError as err:
-                logger.warning('Cannot unpickle cache %s, cache may be using '
-                               'an incompatible protocol (see pelican '
-                               'caching docs). '
-                               'Proceeding with empty cache.\n%s',
-                               self._cache_path, err)
+                logger.warning(
+                    "Cannot unpickle cache %s, cache may be using "
+                    "an incompatible protocol (see pelican "
+                    "caching docs). "
+                    "Proceeding with empty cache.\n%s",
+                    self._cache_path,
+                    err,
+                )
                 self._cache = {}
         else:
             self._cache = {}
@@ -62,12 +68,13 @@ class FileDataCacher:
         """Save the updated cache"""
         if self._cache_data_policy:
             try:
-                mkdir_p(self.settings['CACHE_PATH'])
-                with self._cache_open(self._cache_path, 'wb') as fhandle:
+                mkdir_p(self.settings["CACHE_PATH"])
+                with self._cache_open(self._cache_path, "wb") as fhandle:
                     pickle.dump(self._cache, fhandle)
             except (OSError, pickle.PicklingError, TypeError) as err:
-                logger.warning('Could not save cache %s\n ... %s',
-                               self._cache_path, err)
+                logger.warning(
+                    "Could not save cache %s\n ... %s", self._cache_path, err
+                )
 
 
 class FileStampDataCacher(FileDataCacher):
@@ -80,8 +87,8 @@ class FileStampDataCacher(FileDataCacher):
 
         super().__init__(settings, cache_name, caching_policy, load_policy)
 
-        method = self.settings['CHECK_MODIFIED_METHOD']
-        if method == 'mtime':
+        method = self.settings["CHECK_MODIFIED_METHOD"]
+        if method == "mtime":
             self._filestamp_func = os.path.getmtime
         else:
             try:
@@ -89,12 +96,12 @@ class FileStampDataCacher(FileDataCacher):
 
                 def filestamp_func(filename):
                     """return hash of file contents"""
-                    with open(filename, 'rb') as fhandle:
+                    with open(filename, "rb") as fhandle:
                         return hash_func(fhandle.read()).digest()
 
                 self._filestamp_func = filestamp_func
             except AttributeError as err:
-                logger.warning('Could not get hashing function\n\t%s', err)
+                logger.warning("Could not get hashing function\n\t%s", err)
                 self._filestamp_func = None
 
     def cache_data(self, filename, data):
@@ -115,9 +122,8 @@ class FileStampDataCacher(FileDataCacher):
         try:
             return self._filestamp_func(filename)
         except (OSError, TypeError) as err:
-            logger.warning('Cannot get modification stamp for %s\n\t%s',
-                           filename, err)
-            return ''
+            logger.warning("Cannot get modification stamp for %s\n\t%s", filename, err)
+            return ""
 
     def get_cached_data(self, filename, default=None):
         """Get the cached data for the given filename
diff --git a/pelican/contents.py b/pelican/contents.py
index c347a999..f99e6426 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -16,12 +16,19 @@ except ModuleNotFoundError:
 
 from pelican.plugins import signals
 from pelican.settings import DEFAULT_CONFIG
-from pelican.utils import (deprecated_attribute, memoized, path_to_url,
-                           posixize_path, sanitised_join, set_date_tzinfo,
-                           slugify, truncate_html_words)
+from pelican.utils import (
+    deprecated_attribute,
+    memoized,
+    path_to_url,
+    posixize_path,
+    sanitised_join,
+    set_date_tzinfo,
+    slugify,
+    truncate_html_words,
+)
 
 # Import these so that they're available when you import from pelican.contents.
-from pelican.urlwrappers import (Author, Category, Tag, URLWrapper)  # NOQA
+from pelican.urlwrappers import Author, Category, Tag, URLWrapper  # NOQA
 
 logger = logging.getLogger(__name__)
 
@@ -36,12 +43,14 @@ class Content:
     :param context: The shared context between generators.
 
     """
-    @deprecated_attribute(old='filename', new='source_path', since=(3, 2, 0))
+
+    @deprecated_attribute(old="filename", new="source_path", since=(3, 2, 0))
     def filename():
         return None
 
-    def __init__(self, content, metadata=None, settings=None,
-                 source_path=None, context=None):
+    def __init__(
+        self, content, metadata=None, settings=None, source_path=None, context=None
+    ):
         if metadata is None:
             metadata = {}
         if settings is None:
@@ -59,8 +68,8 @@ class Content:
 
         # set metadata as attributes
         for key, value in local_metadata.items():
-            if key in ('save_as', 'url'):
-                key = 'override_' + key
+            if key in ("save_as", "url"):
+                key = "override_" + key
             setattr(self, key.lower(), value)
 
         # also keep track of the metadata attributes available
@@ -71,53 +80,52 @@ class Content:
 
         # First, read the authors from "authors", if not, fallback to "author"
         # and if not use the settings defined one, if any.
-        if not hasattr(self, 'author'):
-            if hasattr(self, 'authors'):
+        if not hasattr(self, "author"):
+            if hasattr(self, "authors"):
                 self.author = self.authors[0]
-            elif 'AUTHOR' in settings:
-                self.author = Author(settings['AUTHOR'], settings)
+            elif "AUTHOR" in settings:
+                self.author = Author(settings["AUTHOR"], settings)
 
-        if not hasattr(self, 'authors') and hasattr(self, 'author'):
+        if not hasattr(self, "authors") and hasattr(self, "author"):
             self.authors = [self.author]
 
         # XXX Split all the following code into pieces, there is too much here.
 
         # manage languages
         self.in_default_lang = True
-        if 'DEFAULT_LANG' in settings:
-            default_lang = settings['DEFAULT_LANG'].lower()
-            if not hasattr(self, 'lang'):
+        if "DEFAULT_LANG" in settings:
+            default_lang = settings["DEFAULT_LANG"].lower()
+            if not hasattr(self, "lang"):
                 self.lang = default_lang
 
-            self.in_default_lang = (self.lang == default_lang)
+            self.in_default_lang = self.lang == default_lang
 
         # create the slug if not existing, generate slug according to
         # setting of SLUG_ATTRIBUTE
-        if not hasattr(self, 'slug'):
-            if (settings['SLUGIFY_SOURCE'] == 'title' and
-                    hasattr(self, 'title')):
+        if not hasattr(self, "slug"):
+            if settings["SLUGIFY_SOURCE"] == "title" and hasattr(self, "title"):
                 value = self.title
-            elif (settings['SLUGIFY_SOURCE'] == 'basename' and
-                    source_path is not None):
+            elif settings["SLUGIFY_SOURCE"] == "basename" and source_path is not None:
                 value = os.path.basename(os.path.splitext(source_path)[0])
             else:
                 value = None
             if value is not None:
                 self.slug = slugify(
                     value,
-                    regex_subs=settings.get('SLUG_REGEX_SUBSTITUTIONS', []),
-                    preserve_case=settings.get('SLUGIFY_PRESERVE_CASE', False),
-                    use_unicode=settings.get('SLUGIFY_USE_UNICODE', False))
+                    regex_subs=settings.get("SLUG_REGEX_SUBSTITUTIONS", []),
+                    preserve_case=settings.get("SLUGIFY_PRESERVE_CASE", False),
+                    use_unicode=settings.get("SLUGIFY_USE_UNICODE", False),
+                )
 
         self.source_path = source_path
         self.relative_source_path = self.get_relative_source_path()
 
         # manage the date format
-        if not hasattr(self, 'date_format'):
-            if hasattr(self, 'lang') and self.lang in settings['DATE_FORMATS']:
-                self.date_format = settings['DATE_FORMATS'][self.lang]
+        if not hasattr(self, "date_format"):
+            if hasattr(self, "lang") and self.lang in settings["DATE_FORMATS"]:
+                self.date_format = settings["DATE_FORMATS"][self.lang]
             else:
-                self.date_format = settings['DEFAULT_DATE_FORMAT']
+                self.date_format = settings["DEFAULT_DATE_FORMAT"]
 
         if isinstance(self.date_format, tuple):
             locale_string = self.date_format[0]
@@ -129,22 +137,22 @@ class Content:
         timezone = getattr(self, "timezone", default_timezone)
         self.timezone = ZoneInfo(timezone)
 
-        if hasattr(self, 'date'):
+        if hasattr(self, "date"):
             self.date = set_date_tzinfo(self.date, timezone)
             self.locale_date = self.date.strftime(self.date_format)
 
-        if hasattr(self, 'modified'):
+        if hasattr(self, "modified"):
             self.modified = set_date_tzinfo(self.modified, timezone)
             self.locale_modified = self.modified.strftime(self.date_format)
 
         # manage status
-        if not hasattr(self, 'status'):
+        if not hasattr(self, "status"):
             # Previous default of None broke comment plugins and perhaps others
-            self.status = getattr(self, 'default_status', '')
+            self.status = getattr(self, "default_status", "")
 
         # store the summary metadata if it is set
-        if 'summary' in metadata:
-            self._summary = metadata['summary']
+        if "summary" in metadata:
+            self._summary = metadata["summary"]
 
         signals.content_object_init.send(self)
 
@@ -156,8 +164,8 @@ class Content:
         for prop in self.mandatory_properties:
             if not hasattr(self, prop):
                 logger.error(
-                    "Skipping %s: could not find information about '%s'",
-                    self, prop)
+                    "Skipping %s: could not find information about '%s'", self, prop
+                )
                 return False
         return True
 
@@ -183,12 +191,13 @@ class Content:
         return True
 
     def _has_valid_status(self):
-        if hasattr(self, 'allowed_statuses'):
+        if hasattr(self, "allowed_statuses"):
             if self.status not in self.allowed_statuses:
                 logger.error(
                     "Unknown status '%s' for file %s, skipping it. (Not in %s)",
                     self.status,
-                    self, self.allowed_statuses
+                    self,
+                    self.allowed_statuses,
                 )
                 return False
 
@@ -198,42 +207,48 @@ class Content:
     def is_valid(self):
         """Validate Content"""
         # Use all() to not short circuit and get results of all validations
-        return all([self._has_valid_mandatory_properties(),
-                    self._has_valid_save_as(),
-                    self._has_valid_status()])
+        return all(
+            [
+                self._has_valid_mandatory_properties(),
+                self._has_valid_save_as(),
+                self._has_valid_status(),
+            ]
+        )
 
     @property
     def url_format(self):
         """Returns the URL, formatted with the proper values"""
         metadata = copy.copy(self.metadata)
-        path = self.metadata.get('path', self.get_relative_source_path())
-        metadata.update({
-            'path': path_to_url(path),
-            'slug': getattr(self, 'slug', ''),
-            'lang': getattr(self, 'lang', 'en'),
-            'date': getattr(self, 'date', datetime.datetime.now()),
-            'author': self.author.slug if hasattr(self, 'author') else '',
-            'category': self.category.slug if hasattr(self, 'category') else ''
-        })
+        path = self.metadata.get("path", self.get_relative_source_path())
+        metadata.update(
+            {
+                "path": path_to_url(path),
+                "slug": getattr(self, "slug", ""),
+                "lang": getattr(self, "lang", "en"),
+                "date": getattr(self, "date", datetime.datetime.now()),
+                "author": self.author.slug if hasattr(self, "author") else "",
+                "category": self.category.slug if hasattr(self, "category") else "",
+            }
+        )
         return metadata
 
     def _expand_settings(self, key, klass=None):
         if not klass:
             klass = self.__class__.__name__
-        fq_key = ('{}_{}'.format(klass, key)).upper()
+        fq_key = ("{}_{}".format(klass, key)).upper()
         return str(self.settings[fq_key]).format(**self.url_format)
 
     def get_url_setting(self, key):
-        if hasattr(self, 'override_' + key):
-            return getattr(self, 'override_' + key)
-        key = key if self.in_default_lang else 'lang_%s' % key
+        if hasattr(self, "override_" + key):
+            return getattr(self, "override_" + key)
+        key = key if self.in_default_lang else "lang_%s" % key
         return self._expand_settings(key)
 
     def _link_replacer(self, siteurl, m):
-        what = m.group('what')
-        value = urlparse(m.group('value'))
+        what = m.group("what")
+        value = urlparse(m.group("value"))
         path = value.path
-        origin = m.group('path')
+        origin = m.group("path")
 
         # urllib.parse.urljoin() produces `a.html` for urljoin("..", "a.html")
         # so if RELATIVE_URLS are enabled, we fall back to os.path.join() to
@@ -241,7 +256,7 @@ class Content:
         # `baz/http://foo/bar.html` for join("baz", "http://foo/bar.html")
         # instead of correct "http://foo/bar.html", so one has to pick a side
         # as there is no silver bullet.
-        if self.settings['RELATIVE_URLS']:
+        if self.settings["RELATIVE_URLS"]:
             joiner = os.path.join
         else:
             joiner = urljoin
@@ -251,16 +266,17 @@ class Content:
             # os.path.join()), so in order to get a correct answer one needs to
             # append a trailing slash to siteurl in that case. This also makes
             # the new behavior fully compatible with Pelican 3.7.1.
-            if not siteurl.endswith('/'):
-                siteurl += '/'
+            if not siteurl.endswith("/"):
+                siteurl += "/"
 
         # XXX Put this in a different location.
-        if what in {'filename', 'static', 'attach'}:
+        if what in {"filename", "static", "attach"}:
+
             def _get_linked_content(key, url):
                 nonlocal value
 
                 def _find_path(path):
-                    if path.startswith('/'):
+                    if path.startswith("/"):
                         path = path[1:]
                     else:
                         # relative to the source path of this content
@@ -287,59 +303,64 @@ class Content:
                     return result
 
                 # check if a static file is linked with {filename}
-                if what == 'filename' and key == 'generated_content':
-                    linked_content = _get_linked_content('static_content', value)
+                if what == "filename" and key == "generated_content":
+                    linked_content = _get_linked_content("static_content", value)
                     if linked_content:
                         logger.warning(
-                            '{filename} used for linking to static'
-                            ' content %s in %s. Use {static} instead',
+                            "{filename} used for linking to static"
+                            " content %s in %s. Use {static} instead",
                             value.path,
-                            self.get_relative_source_path())
+                            self.get_relative_source_path(),
+                        )
                         return linked_content
 
                 return None
 
-            if what == 'filename':
-                key = 'generated_content'
+            if what == "filename":
+                key = "generated_content"
             else:
-                key = 'static_content'
+                key = "static_content"
 
             linked_content = _get_linked_content(key, value)
             if linked_content:
-                if what == 'attach':
+                if what == "attach":
                     linked_content.attach_to(self)
                 origin = joiner(siteurl, linked_content.url)
-                origin = origin.replace('\\', '/')  # for Windows paths.
+                origin = origin.replace("\\", "/")  # for Windows paths.
             else:
                 logger.warning(
                     "Unable to find '%s', skipping url replacement.",
-                    value.geturl(), extra={
-                        'limit_msg': ("Other resources were not found "
-                                      "and their urls not replaced")})
-        elif what == 'category':
+                    value.geturl(),
+                    extra={
+                        "limit_msg": (
+                            "Other resources were not found "
+                            "and their urls not replaced"
+                        )
+                    },
+                )
+        elif what == "category":
             origin = joiner(siteurl, Category(path, self.settings).url)
-        elif what == 'tag':
+        elif what == "tag":
             origin = joiner(siteurl, Tag(path, self.settings).url)
-        elif what == 'index':
-            origin = joiner(siteurl, self.settings['INDEX_SAVE_AS'])
-        elif what == 'author':
+        elif what == "index":
+            origin = joiner(siteurl, self.settings["INDEX_SAVE_AS"])
+        elif what == "author":
             origin = joiner(siteurl, Author(path, self.settings).url)
         else:
             logger.warning(
-                "Replacement Indicator '%s' not recognized, "
-                "skipping replacement",
-                what)
+                "Replacement Indicator '%s' not recognized, " "skipping replacement",
+                what,
+            )
 
         # keep all other parts, such as query, fragment, etc.
         parts = list(value)
         parts[2] = origin
         origin = urlunparse(parts)
 
-        return ''.join((m.group('markup'), m.group('quote'), origin,
-                        m.group('quote')))
+        return "".join((m.group("markup"), m.group("quote"), origin, m.group("quote")))
 
     def _get_intrasite_link_regex(self):
-        intrasite_link_regex = self.settings['INTRASITE_LINK_REGEX']
+        intrasite_link_regex = self.settings["INTRASITE_LINK_REGEX"]
         regex = r"""
             (?P<markup><[^\>]+  # match tag with all url-value attributes
                 (?:href|src|poster|data|cite|formaction|action|content)\s*=\s*)
@@ -369,28 +390,28 @@ class Content:
         static_links = set()
         hrefs = self._get_intrasite_link_regex()
         for m in hrefs.finditer(self._content):
-            what = m.group('what')
-            value = urlparse(m.group('value'))
+            what = m.group("what")
+            value = urlparse(m.group("value"))
             path = value.path
-            if what not in {'static', 'attach'}:
+            if what not in {"static", "attach"}:
                 continue
-            if path.startswith('/'):
+            if path.startswith("/"):
                 path = path[1:]
             else:
                 # relative to the source path of this content
                 path = self.get_relative_source_path(
                     os.path.join(self.relative_dir, path)
                 )
-            path = path.replace('%20', ' ')
+            path = path.replace("%20", " ")
             static_links.add(path)
         return static_links
 
     def get_siteurl(self):
-        return self._context.get('localsiteurl', '')
+        return self._context.get("localsiteurl", "")
 
     @memoized
     def get_content(self, siteurl):
-        if hasattr(self, '_get_content'):
+        if hasattr(self, "_get_content"):
             content = self._get_content()
         else:
             content = self._content
@@ -407,15 +428,17 @@ class Content:
         This is based on the summary metadata if set, otherwise truncate the
         content.
         """
-        if 'summary' in self.metadata:
-            return self.metadata['summary']
+        if "summary" in self.metadata:
+            return self.metadata["summary"]
 
-        if self.settings['SUMMARY_MAX_LENGTH'] is None:
+        if self.settings["SUMMARY_MAX_LENGTH"] is None:
             return self.content
 
-        return truncate_html_words(self.content,
-                                   self.settings['SUMMARY_MAX_LENGTH'],
-                                   self.settings['SUMMARY_END_SUFFIX'])
+        return truncate_html_words(
+            self.content,
+            self.settings["SUMMARY_MAX_LENGTH"],
+            self.settings["SUMMARY_END_SUFFIX"],
+        )
 
     @property
     def summary(self):
@@ -424,8 +447,10 @@ class Content:
     def _get_summary(self):
         """deprecated function to access summary"""
 
-        logger.warning('_get_summary() has been deprecated since 3.6.4. '
-                       'Use the summary decorator instead')
+        logger.warning(
+            "_get_summary() has been deprecated since 3.6.4. "
+            "Use the summary decorator instead"
+        )
         return self.summary
 
     @summary.setter
@@ -444,14 +469,14 @@ class Content:
 
     @property
     def url(self):
-        return self.get_url_setting('url')
+        return self.get_url_setting("url")
 
     @property
     def save_as(self):
-        return self.get_url_setting('save_as')
+        return self.get_url_setting("save_as")
 
     def _get_template(self):
-        if hasattr(self, 'template') and self.template is not None:
+        if hasattr(self, "template") and self.template is not None:
             return self.template
         else:
             return self.default_template
@@ -470,11 +495,10 @@ class Content:
 
         return posixize_path(
             os.path.relpath(
-                os.path.abspath(os.path.join(
-                    self.settings['PATH'],
-                    source_path)),
-                os.path.abspath(self.settings['PATH'])
-            ))
+                os.path.abspath(os.path.join(self.settings["PATH"], source_path)),
+                os.path.abspath(self.settings["PATH"]),
+            )
+        )
 
     @property
     def relative_dir(self):
@@ -482,85 +506,84 @@ class Content:
             os.path.dirname(
                 os.path.relpath(
                     os.path.abspath(self.source_path),
-                    os.path.abspath(self.settings['PATH']))))
+                    os.path.abspath(self.settings["PATH"]),
+                )
+            )
+        )
 
     def refresh_metadata_intersite_links(self):
-        for key in self.settings['FORMATTED_FIELDS']:
-            if key in self.metadata and key != 'summary':
-                value = self._update_content(
-                    self.metadata[key],
-                    self.get_siteurl()
-                )
+        for key in self.settings["FORMATTED_FIELDS"]:
+            if key in self.metadata and key != "summary":
+                value = self._update_content(self.metadata[key], self.get_siteurl())
                 self.metadata[key] = value
                 setattr(self, key.lower(), value)
 
         # _summary is an internal variable that some plugins may be writing to,
         # so ensure changes to it are picked up
-        if ('summary' in self.settings['FORMATTED_FIELDS'] and
-                'summary' in self.metadata):
-            self._summary = self._update_content(
-                self._summary,
-                self.get_siteurl()
-            )
-            self.metadata['summary'] = self._summary
+        if (
+            "summary" in self.settings["FORMATTED_FIELDS"]
+            and "summary" in self.metadata
+        ):
+            self._summary = self._update_content(self._summary, self.get_siteurl())
+            self.metadata["summary"] = self._summary
 
 
 class Page(Content):
-    mandatory_properties = ('title',)
-    allowed_statuses = ('published', 'hidden', 'draft')
-    default_status = 'published'
-    default_template = 'page'
+    mandatory_properties = ("title",)
+    allowed_statuses = ("published", "hidden", "draft")
+    default_status = "published"
+    default_template = "page"
 
     def _expand_settings(self, key):
-        klass = 'draft_page' if self.status == 'draft' else None
+        klass = "draft_page" if self.status == "draft" else None
         return super()._expand_settings(key, klass)
 
 
 class Article(Content):
-    mandatory_properties = ('title', 'date', 'category')
-    allowed_statuses = ('published', 'hidden', 'draft')
-    default_status = 'published'
-    default_template = 'article'
+    mandatory_properties = ("title", "date", "category")
+    allowed_statuses = ("published", "hidden", "draft")
+    default_status = "published"
+    default_template = "article"
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         # handle WITH_FUTURE_DATES (designate article to draft based on date)
-        if not self.settings['WITH_FUTURE_DATES'] and hasattr(self, 'date'):
+        if not self.settings["WITH_FUTURE_DATES"] and hasattr(self, "date"):
             if self.date.tzinfo is None:
                 now = datetime.datetime.now()
             else:
                 now = datetime.datetime.utcnow().replace(tzinfo=timezone.utc)
             if self.date > now:
-                self.status = 'draft'
+                self.status = "draft"
 
         # if we are a draft and there is no date provided, set max datetime
-        if not hasattr(self, 'date') and self.status == 'draft':
+        if not hasattr(self, "date") and self.status == "draft":
             self.date = datetime.datetime.max.replace(tzinfo=self.timezone)
 
     def _expand_settings(self, key):
-        klass = 'draft' if self.status == 'draft' else 'article'
+        klass = "draft" if self.status == "draft" else "article"
         return super()._expand_settings(key, klass)
 
 
 class Static(Content):
-    mandatory_properties = ('title',)
-    default_status = 'published'
+    mandatory_properties = ("title",)
+    default_status = "published"
     default_template = None
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._output_location_referenced = False
 
-    @deprecated_attribute(old='filepath', new='source_path', since=(3, 2, 0))
+    @deprecated_attribute(old="filepath", new="source_path", since=(3, 2, 0))
     def filepath():
         return None
 
-    @deprecated_attribute(old='src', new='source_path', since=(3, 2, 0))
+    @deprecated_attribute(old="src", new="source_path", since=(3, 2, 0))
     def src():
         return None
 
-    @deprecated_attribute(old='dst', new='save_as', since=(3, 2, 0))
+    @deprecated_attribute(old="dst", new="save_as", since=(3, 2, 0))
     def dst():
         return None
 
@@ -577,8 +600,7 @@ class Static(Content):
         return super().save_as
 
     def attach_to(self, content):
-        """Override our output directory with that of the given content object.
-        """
+        """Override our output directory with that of the given content object."""
 
         # Determine our file's new output path relative to the linking
         # document. If it currently lives beneath the linking
@@ -589,8 +611,7 @@ class Static(Content):
         tail_path = os.path.relpath(self.source_path, linking_source_dir)
         if tail_path.startswith(os.pardir + os.sep):
             tail_path = os.path.basename(tail_path)
-        new_save_as = os.path.join(
-            os.path.dirname(content.save_as), tail_path)
+        new_save_as = os.path.join(os.path.dirname(content.save_as), tail_path)
 
         # We do not build our new url by joining tail_path with the linking
         # document's url, because we cannot know just by looking at the latter
@@ -609,12 +630,14 @@ class Static(Content):
                 "%s because %s. Falling back to "
                 "{filename} link behavior instead.",
                 content.get_relative_source_path(),
-                self.get_relative_source_path(), reason,
-                extra={'limit_msg': "More {attach} warnings silenced."})
+                self.get_relative_source_path(),
+                reason,
+                extra={"limit_msg": "More {attach} warnings silenced."},
+            )
 
         # We never override an override, because we don't want to interfere
         # with user-defined overrides that might be in EXTRA_PATH_METADATA.
-        if hasattr(self, 'override_save_as') or hasattr(self, 'override_url'):
+        if hasattr(self, "override_save_as") or hasattr(self, "override_url"):
             if new_save_as != self.save_as or new_url != self.url:
                 _log_reason("its output location was already overridden")
             return
diff --git a/pelican/generators.py b/pelican/generators.py
index b9063304..0bbb7268 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -8,15 +8,27 @@ from functools import partial
 from itertools import chain, groupby
 from operator import attrgetter
 
-from jinja2 import (BaseLoader, ChoiceLoader, Environment, FileSystemLoader,
-                    PrefixLoader, TemplateNotFound)
+from jinja2 import (
+    BaseLoader,
+    ChoiceLoader,
+    Environment,
+    FileSystemLoader,
+    PrefixLoader,
+    TemplateNotFound,
+)
 
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Article, Page, Static
 from pelican.plugins import signals
 from pelican.readers import Readers
-from pelican.utils import (DateFormatter, copy, mkdir_p, order_content,
-                           posixize_path, process_translations)
+from pelican.utils import (
+    DateFormatter,
+    copy,
+    mkdir_p,
+    order_content,
+    posixize_path,
+    process_translations,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -28,8 +40,16 @@ class PelicanTemplateNotFound(Exception):
 class Generator:
     """Baseclass generator"""
 
-    def __init__(self, context, settings, path, theme, output_path,
-                 readers_cache_name='', **kwargs):
+    def __init__(
+        self,
+        context,
+        settings,
+        path,
+        theme,
+        output_path,
+        readers_cache_name="",
+        **kwargs,
+    ):
         self.context = context
         self.settings = settings
         self.path = path
@@ -43,44 +63,45 @@ class Generator:
 
         # templates cache
         self._templates = {}
-        self._templates_path = list(self.settings['THEME_TEMPLATES_OVERRIDES'])
+        self._templates_path = list(self.settings["THEME_TEMPLATES_OVERRIDES"])
 
-        theme_templates_path = os.path.expanduser(
-            os.path.join(self.theme, 'templates'))
+        theme_templates_path = os.path.expanduser(os.path.join(self.theme, "templates"))
         self._templates_path.append(theme_templates_path)
         theme_loader = FileSystemLoader(theme_templates_path)
 
         simple_theme_path = os.path.dirname(os.path.abspath(__file__))
         simple_loader = FileSystemLoader(
-            os.path.join(simple_theme_path, "themes", "simple", "templates"))
-
-        self.env = Environment(
-            loader=ChoiceLoader([
-                FileSystemLoader(self._templates_path),
-                simple_loader,  # implicit inheritance
-                PrefixLoader({
-                    '!simple': simple_loader,
-                    '!theme': theme_loader
-                })  # explicit ones
-            ]),
-            **self.settings['JINJA_ENVIRONMENT']
+            os.path.join(simple_theme_path, "themes", "simple", "templates")
         )
 
-        logger.debug('Template list: %s', self.env.list_templates())
+        self.env = Environment(
+            loader=ChoiceLoader(
+                [
+                    FileSystemLoader(self._templates_path),
+                    simple_loader,  # implicit inheritance
+                    PrefixLoader(
+                        {"!simple": simple_loader, "!theme": theme_loader}
+                    ),  # explicit ones
+                ]
+            ),
+            **self.settings["JINJA_ENVIRONMENT"],
+        )
+
+        logger.debug("Template list: %s", self.env.list_templates())
 
         # provide utils.strftime as a jinja filter
-        self.env.filters.update({'strftime': DateFormatter()})
+        self.env.filters.update({"strftime": DateFormatter()})
 
         # get custom Jinja filters from user settings
-        custom_filters = self.settings['JINJA_FILTERS']
+        custom_filters = self.settings["JINJA_FILTERS"]
         self.env.filters.update(custom_filters)
 
         # get custom Jinja globals from user settings
-        custom_globals = self.settings['JINJA_GLOBALS']
+        custom_globals = self.settings["JINJA_GLOBALS"]
         self.env.globals.update(custom_globals)
 
         # get custom Jinja tests from user settings
-        custom_tests = self.settings['JINJA_TESTS']
+        custom_tests = self.settings["JINJA_TESTS"]
         self.env.tests.update(custom_tests)
 
         signals.generator_init.send(self)
@@ -91,7 +112,7 @@ class Generator:
         templates ready to use with Jinja2.
         """
         if name not in self._templates:
-            for ext in self.settings['TEMPLATE_EXTENSIONS']:
+            for ext in self.settings["TEMPLATE_EXTENSIONS"]:
                 try:
                     self._templates[name] = self.env.get_template(name + ext)
                     break
@@ -100,9 +121,12 @@ class Generator:
 
             if name not in self._templates:
                 raise PelicanTemplateNotFound(
-                    '[templates] unable to load {}[{}] from {}'.format(
-                        name, ', '.join(self.settings['TEMPLATE_EXTENSIONS']),
-                        self._templates_path))
+                    "[templates] unable to load {}[{}] from {}".format(
+                        name,
+                        ", ".join(self.settings["TEMPLATE_EXTENSIONS"]),
+                        self._templates_path,
+                    )
+                )
 
         return self._templates[name]
 
@@ -118,7 +142,7 @@ class Generator:
         basename = os.path.basename(path)
 
         # check IGNORE_FILES
-        ignores = self.settings['IGNORE_FILES']
+        ignores = self.settings["IGNORE_FILES"]
         if any(fnmatch.fnmatch(basename, ignore) for ignore in ignores):
             return False
 
@@ -147,20 +171,21 @@ class Generator:
             exclusions_by_dirpath.setdefault(parent_path, set()).add(subdir)
 
         files = set()
-        ignores = self.settings['IGNORE_FILES']
+        ignores = self.settings["IGNORE_FILES"]
         for path in paths:
             # careful: os.path.join() will add a slash when path == ''.
             root = os.path.join(self.path, path) if path else self.path
 
             if os.path.isdir(root):
                 for dirpath, dirs, temp_files in os.walk(
-                        root, topdown=True, followlinks=True):
+                    root, topdown=True, followlinks=True
+                ):
                     excl = exclusions_by_dirpath.get(dirpath, ())
                     # We copy the `dirs` list as we will modify it in the loop:
                     for d in list(dirs):
-                        if (d in excl or
-                            any(fnmatch.fnmatch(d, ignore)
-                                for ignore in ignores)):
+                        if d in excl or any(
+                            fnmatch.fnmatch(d, ignore) for ignore in ignores
+                        ):
                             if d in dirs:
                                 dirs.remove(d)
 
@@ -178,7 +203,7 @@ class Generator:
         Store a reference to its Content object, for url lookups later.
         """
         location = content.get_relative_source_path()
-        key = 'static_content' if static else 'generated_content'
+        key = "static_content" if static else "generated_content"
         self.context[key][location] = content
 
     def _add_failed_source_path(self, path, static=False):
@@ -186,7 +211,7 @@ class Generator:
         (For example, one that was missing mandatory metadata.)
         The path argument is expected to be relative to self.path.
         """
-        key = 'static_content' if static else 'generated_content'
+        key = "static_content" if static else "generated_content"
         self.context[key][posixize_path(os.path.normpath(path))] = None
 
     def _is_potential_source_path(self, path, static=False):
@@ -195,14 +220,14 @@ class Generator:
         before this method is called, even if they failed to process.)
         The path argument is expected to be relative to self.path.
         """
-        key = 'static_content' if static else 'generated_content'
-        return (posixize_path(os.path.normpath(path)) in self.context[key])
+        key = "static_content" if static else "generated_content"
+        return posixize_path(os.path.normpath(path)) in self.context[key]
 
     def add_static_links(self, content):
         """Add file links in content to context to be processed as Static
         content.
         """
-        self.context['static_links'] |= content.get_static_links()
+        self.context["static_links"] |= content.get_static_links()
 
     def _update_context(self, items):
         """Update the context with the given items from the current processor.
@@ -211,7 +236,7 @@ class Generator:
         """
         for item in items:
             value = getattr(self, item)
-            if hasattr(value, 'items'):
+            if hasattr(value, "items"):
                 value = list(value.items())  # py3k safeguard for iterators
             self.context[item] = value
 
@@ -221,37 +246,35 @@ class Generator:
 
 
 class CachingGenerator(Generator, FileStampDataCacher):
-    '''Subclass of Generator and FileStampDataCacher classes
+    """Subclass of Generator and FileStampDataCacher classes
 
     enables content caching, either at the generator or reader level
-    '''
+    """
 
     def __init__(self, *args, **kwargs):
-        '''Initialize the generator, then set up caching
+        """Initialize the generator, then set up caching
 
         note the multiple inheritance structure
-        '''
+        """
         cls_name = self.__class__.__name__
-        Generator.__init__(self, *args,
-                           readers_cache_name=(cls_name + '-Readers'),
-                           **kwargs)
+        Generator.__init__(
+            self, *args, readers_cache_name=(cls_name + "-Readers"), **kwargs
+        )
 
-        cache_this_level = \
-            self.settings['CONTENT_CACHING_LAYER'] == 'generator'
-        caching_policy = cache_this_level and self.settings['CACHE_CONTENT']
-        load_policy = cache_this_level and self.settings['LOAD_CONTENT_CACHE']
-        FileStampDataCacher.__init__(self, self.settings, cls_name,
-                                     caching_policy, load_policy
-                                     )
+        cache_this_level = self.settings["CONTENT_CACHING_LAYER"] == "generator"
+        caching_policy = cache_this_level and self.settings["CACHE_CONTENT"]
+        load_policy = cache_this_level and self.settings["LOAD_CONTENT_CACHE"]
+        FileStampDataCacher.__init__(
+            self, self.settings, cls_name, caching_policy, load_policy
+        )
 
     def _get_file_stamp(self, filename):
-        '''Get filestamp for path relative to generator.path'''
+        """Get filestamp for path relative to generator.path"""
         filename = os.path.join(self.path, filename)
         return super()._get_file_stamp(filename)
 
 
 class _FileLoader(BaseLoader):
-
     def __init__(self, path, basedir):
         self.path = path
         self.fullpath = os.path.join(basedir, path)
@@ -260,22 +283,21 @@ class _FileLoader(BaseLoader):
         if template != self.path or not os.path.exists(self.fullpath):
             raise TemplateNotFound(template)
         mtime = os.path.getmtime(self.fullpath)
-        with open(self.fullpath, encoding='utf-8') as f:
+        with open(self.fullpath, encoding="utf-8") as f:
             source = f.read()
-        return (source, self.fullpath,
-                lambda: mtime == os.path.getmtime(self.fullpath))
+        return (source, self.fullpath, lambda: mtime == os.path.getmtime(self.fullpath))
 
 
 class TemplatePagesGenerator(Generator):
-
     def generate_output(self, writer):
-        for source, dest in self.settings['TEMPLATE_PAGES'].items():
+        for source, dest in self.settings["TEMPLATE_PAGES"].items():
             self.env.loader.loaders.insert(0, _FileLoader(source, self.path))
             try:
                 template = self.env.get_template(source)
-                rurls = self.settings['RELATIVE_URLS']
-                writer.write_file(dest, template, self.context, rurls,
-                                  override_output=True, url='')
+                rurls = self.settings["RELATIVE_URLS"]
+                writer.write_file(
+                    dest, template, self.context, rurls, override_output=True, url=""
+                )
             finally:
                 del self.env.loader.loaders[0]
 
@@ -286,13 +308,13 @@ class ArticlesGenerator(CachingGenerator):
     def __init__(self, *args, **kwargs):
         """initialize properties"""
         # Published, listed articles
-        self.articles = []                 # only articles in default language
+        self.articles = []  # only articles in default language
         self.translations = []
         # Published, unlisted articles
         self.hidden_articles = []
         self.hidden_translations = []
         # Draft articles
-        self.drafts = []                   # only drafts in default language
+        self.drafts = []  # only drafts in default language
         self.drafts_translations = []
         self.dates = {}
         self.period_archives = defaultdict(list)
@@ -306,263 +328,304 @@ class ArticlesGenerator(CachingGenerator):
     def generate_feeds(self, writer):
         """Generate the feeds from the current context, and output files."""
 
-        if self.settings.get('FEED_ATOM'):
+        if self.settings.get("FEED_ATOM"):
             writer.write_feed(
                 self.articles,
                 self.context,
-                self.settings['FEED_ATOM'],
-                self.settings.get('FEED_ATOM_URL', self.settings['FEED_ATOM'])
-                )
+                self.settings["FEED_ATOM"],
+                self.settings.get("FEED_ATOM_URL", self.settings["FEED_ATOM"]),
+            )
 
-        if self.settings.get('FEED_RSS'):
+        if self.settings.get("FEED_RSS"):
             writer.write_feed(
                 self.articles,
                 self.context,
-                self.settings['FEED_RSS'],
-                self.settings.get('FEED_RSS_URL', self.settings['FEED_RSS']),
-                feed_type='rss'
-                )
+                self.settings["FEED_RSS"],
+                self.settings.get("FEED_RSS_URL", self.settings["FEED_RSS"]),
+                feed_type="rss",
+            )
 
-        if (self.settings.get('FEED_ALL_ATOM') or
-                self.settings.get('FEED_ALL_RSS')):
+        if self.settings.get("FEED_ALL_ATOM") or self.settings.get("FEED_ALL_RSS"):
             all_articles = list(self.articles)
             for article in self.articles:
                 all_articles.extend(article.translations)
-            order_content(
-                all_articles, order_by=self.settings['ARTICLE_ORDER_BY']
-            )
+            order_content(all_articles, order_by=self.settings["ARTICLE_ORDER_BY"])
 
-            if self.settings.get('FEED_ALL_ATOM'):
+            if self.settings.get("FEED_ALL_ATOM"):
                 writer.write_feed(
                     all_articles,
                     self.context,
-                    self.settings['FEED_ALL_ATOM'],
-                    self.settings.get('FEED_ALL_ATOM_URL',
-                                      self.settings['FEED_ALL_ATOM'])
-                    )
+                    self.settings["FEED_ALL_ATOM"],
+                    self.settings.get(
+                        "FEED_ALL_ATOM_URL", self.settings["FEED_ALL_ATOM"]
+                    ),
+                )
 
-            if self.settings.get('FEED_ALL_RSS'):
+            if self.settings.get("FEED_ALL_RSS"):
                 writer.write_feed(
                     all_articles,
                     self.context,
-                    self.settings['FEED_ALL_RSS'],
-                    self.settings.get('FEED_ALL_RSS_URL',
-                                      self.settings['FEED_ALL_RSS']),
-                    feed_type='rss'
-                    )
+                    self.settings["FEED_ALL_RSS"],
+                    self.settings.get(
+                        "FEED_ALL_RSS_URL", self.settings["FEED_ALL_RSS"]
+                    ),
+                    feed_type="rss",
+                )
 
         for cat, arts in self.categories:
-            if self.settings.get('CATEGORY_FEED_ATOM'):
+            if self.settings.get("CATEGORY_FEED_ATOM"):
                 writer.write_feed(
                     arts,
                     self.context,
-                    str(self.settings['CATEGORY_FEED_ATOM']).format(slug=cat.slug),
+                    str(self.settings["CATEGORY_FEED_ATOM"]).format(slug=cat.slug),
                     self.settings.get(
-                        'CATEGORY_FEED_ATOM_URL',
-                        str(self.settings['CATEGORY_FEED_ATOM']).format(
-                            slug=cat.slug
-                        )),
-                    feed_title=cat.name
-                    )
-
-            if self.settings.get('CATEGORY_FEED_RSS'):
-                writer.write_feed(
-                    arts,
-                    self.context,
-                    str(self.settings['CATEGORY_FEED_RSS']).format(slug=cat.slug),
-                    self.settings.get(
-                        'CATEGORY_FEED_RSS_URL',
-                        str(self.settings['CATEGORY_FEED_RSS']).format(
-                            slug=cat.slug
-                        )),
+                        "CATEGORY_FEED_ATOM_URL",
+                        str(self.settings["CATEGORY_FEED_ATOM"]).format(slug=cat.slug),
+                    ),
                     feed_title=cat.name,
-                    feed_type='rss'
-                    )
+                )
+
+            if self.settings.get("CATEGORY_FEED_RSS"):
+                writer.write_feed(
+                    arts,
+                    self.context,
+                    str(self.settings["CATEGORY_FEED_RSS"]).format(slug=cat.slug),
+                    self.settings.get(
+                        "CATEGORY_FEED_RSS_URL",
+                        str(self.settings["CATEGORY_FEED_RSS"]).format(slug=cat.slug),
+                    ),
+                    feed_title=cat.name,
+                    feed_type="rss",
+                )
 
         for auth, arts in self.authors:
-            if self.settings.get('AUTHOR_FEED_ATOM'):
+            if self.settings.get("AUTHOR_FEED_ATOM"):
                 writer.write_feed(
                     arts,
                     self.context,
-                    str(self.settings['AUTHOR_FEED_ATOM']).format(slug=auth.slug),
+                    str(self.settings["AUTHOR_FEED_ATOM"]).format(slug=auth.slug),
                     self.settings.get(
-                        'AUTHOR_FEED_ATOM_URL',
-                        str(self.settings['AUTHOR_FEED_ATOM']).format(
-                            slug=auth.slug
-                        )),
-                    feed_title=auth.name
-                    )
-
-            if self.settings.get('AUTHOR_FEED_RSS'):
-                writer.write_feed(
-                    arts,
-                    self.context,
-                    str(self.settings['AUTHOR_FEED_RSS']).format(slug=auth.slug),
-                    self.settings.get(
-                        'AUTHOR_FEED_RSS_URL',
-                        str(self.settings['AUTHOR_FEED_RSS']).format(
-                            slug=auth.slug
-                        )),
+                        "AUTHOR_FEED_ATOM_URL",
+                        str(self.settings["AUTHOR_FEED_ATOM"]).format(slug=auth.slug),
+                    ),
                     feed_title=auth.name,
-                    feed_type='rss'
+                )
+
+            if self.settings.get("AUTHOR_FEED_RSS"):
+                writer.write_feed(
+                    arts,
+                    self.context,
+                    str(self.settings["AUTHOR_FEED_RSS"]).format(slug=auth.slug),
+                    self.settings.get(
+                        "AUTHOR_FEED_RSS_URL",
+                        str(self.settings["AUTHOR_FEED_RSS"]).format(slug=auth.slug),
+                    ),
+                    feed_title=auth.name,
+                    feed_type="rss",
+                )
+
+        if self.settings.get("TAG_FEED_ATOM") or self.settings.get("TAG_FEED_RSS"):
+            for tag, arts in self.tags.items():
+                if self.settings.get("TAG_FEED_ATOM"):
+                    writer.write_feed(
+                        arts,
+                        self.context,
+                        str(self.settings["TAG_FEED_ATOM"]).format(slug=tag.slug),
+                        self.settings.get(
+                            "TAG_FEED_ATOM_URL",
+                            str(self.settings["TAG_FEED_ATOM"]).format(slug=tag.slug),
+                        ),
+                        feed_title=tag.name,
                     )
 
-        if (self.settings.get('TAG_FEED_ATOM') or
-                self.settings.get('TAG_FEED_RSS')):
-            for tag, arts in self.tags.items():
-                if self.settings.get('TAG_FEED_ATOM'):
+                if self.settings.get("TAG_FEED_RSS"):
                     writer.write_feed(
                         arts,
                         self.context,
-                        str(self.settings['TAG_FEED_ATOM']).format(slug=tag.slug),
+                        str(self.settings["TAG_FEED_RSS"]).format(slug=tag.slug),
                         self.settings.get(
-                            'TAG_FEED_ATOM_URL',
-                            str(self.settings['TAG_FEED_ATOM']).format(
-                                slug=tag.slug
-                            )),
-                        feed_title=tag.name
-                        )
-
-                if self.settings.get('TAG_FEED_RSS'):
-                    writer.write_feed(
-                        arts,
-                        self.context,
-                        str(self.settings['TAG_FEED_RSS']).format(slug=tag.slug),
-                        self.settings.get(
-                            'TAG_FEED_RSS_URL',
-                            str(self.settings['TAG_FEED_RSS']).format(
-                                slug=tag.slug
-                            )),
+                            "TAG_FEED_RSS_URL",
+                            str(self.settings["TAG_FEED_RSS"]).format(slug=tag.slug),
+                        ),
                         feed_title=tag.name,
-                        feed_type='rss'
-                        )
+                        feed_type="rss",
+                    )
 
-        if (self.settings.get('TRANSLATION_FEED_ATOM') or
-                self.settings.get('TRANSLATION_FEED_RSS')):
+        if self.settings.get("TRANSLATION_FEED_ATOM") or self.settings.get(
+            "TRANSLATION_FEED_RSS"
+        ):
             translations_feeds = defaultdict(list)
             for article in chain(self.articles, self.translations):
                 translations_feeds[article.lang].append(article)
 
             for lang, items in translations_feeds.items():
-                items = order_content(
-                    items, order_by=self.settings['ARTICLE_ORDER_BY'])
-                if self.settings.get('TRANSLATION_FEED_ATOM'):
+                items = order_content(items, order_by=self.settings["ARTICLE_ORDER_BY"])
+                if self.settings.get("TRANSLATION_FEED_ATOM"):
                     writer.write_feed(
                         items,
                         self.context,
-                        str(
-                            self.settings['TRANSLATION_FEED_ATOM']
-                        ).format(lang=lang),
+                        str(self.settings["TRANSLATION_FEED_ATOM"]).format(lang=lang),
                         self.settings.get(
-                            'TRANSLATION_FEED_ATOM_URL',
-                            str(
-                                self.settings['TRANSLATION_FEED_ATOM']
-                            ).format(lang=lang),
-                        )
-                    )
-                if self.settings.get('TRANSLATION_FEED_RSS'):
-                    writer.write_feed(
-                        items,
-                        self.context,
-                        str(
-                            self.settings['TRANSLATION_FEED_RSS']
-                        ).format(lang=lang),
-                        self.settings.get(
-                            'TRANSLATION_FEED_RSS_URL',
-                            str(self.settings['TRANSLATION_FEED_RSS'])).format(
+                            "TRANSLATION_FEED_ATOM_URL",
+                            str(self.settings["TRANSLATION_FEED_ATOM"]).format(
                                 lang=lang
                             ),
-                        feed_type='rss'
+                        ),
+                    )
+                if self.settings.get("TRANSLATION_FEED_RSS"):
+                    writer.write_feed(
+                        items,
+                        self.context,
+                        str(self.settings["TRANSLATION_FEED_RSS"]).format(lang=lang),
+                        self.settings.get(
+                            "TRANSLATION_FEED_RSS_URL",
+                            str(self.settings["TRANSLATION_FEED_RSS"]),
+                        ).format(lang=lang),
+                        feed_type="rss",
                     )
 
     def generate_articles(self, write):
         """Generate the articles."""
         for article in chain(
-            self.translations, self.articles,
-            self.hidden_translations, self.hidden_articles
+            self.translations,
+            self.articles,
+            self.hidden_translations,
+            self.hidden_articles,
         ):
             signals.article_generator_write_article.send(self, content=article)
-            write(article.save_as, self.get_template(article.template),
-                  self.context, article=article, category=article.category,
-                  override_output=hasattr(article, 'override_save_as'),
-                  url=article.url, blog=True)
+            write(
+                article.save_as,
+                self.get_template(article.template),
+                self.context,
+                article=article,
+                category=article.category,
+                override_output=hasattr(article, "override_save_as"),
+                url=article.url,
+                blog=True,
+            )
 
     def generate_period_archives(self, write):
         """Generate per-year, per-month, and per-day archives."""
         try:
-            template = self.get_template('period_archives')
+            template = self.get_template("period_archives")
         except PelicanTemplateNotFound:
-            template = self.get_template('archives')
+            template = self.get_template("archives")
 
         for granularity in self.period_archives:
             for period in self.period_archives[granularity]:
-
                 context = self.context.copy()
-                context['period'] = period['period']
-                context['period_num'] = period['period_num']
+                context["period"] = period["period"]
+                context["period_num"] = period["period_num"]
 
-                write(period['save_as'], template, context,
-                      articles=period['articles'], dates=period['dates'],
-                      template_name='period_archives', blog=True,
-                      url=period['url'], all_articles=self.articles)
+                write(
+                    period["save_as"],
+                    template,
+                    context,
+                    articles=period["articles"],
+                    dates=period["dates"],
+                    template_name="period_archives",
+                    blog=True,
+                    url=period["url"],
+                    all_articles=self.articles,
+                )
 
     def generate_direct_templates(self, write):
         """Generate direct templates pages"""
-        for template in self.settings['DIRECT_TEMPLATES']:
-            save_as = self.settings.get("%s_SAVE_AS" % template.upper(),
-                                        '%s.html' % template)
-            url = self.settings.get("%s_URL" % template.upper(),
-                                    '%s.html' % template)
+        for template in self.settings["DIRECT_TEMPLATES"]:
+            save_as = self.settings.get(
+                "%s_SAVE_AS" % template.upper(), "%s.html" % template
+            )
+            url = self.settings.get("%s_URL" % template.upper(), "%s.html" % template)
             if not save_as:
                 continue
 
-            write(save_as, self.get_template(template), self.context,
-                  articles=self.articles, dates=self.dates, blog=True,
-                  template_name=template,
-                  page_name=os.path.splitext(save_as)[0], url=url)
+            write(
+                save_as,
+                self.get_template(template),
+                self.context,
+                articles=self.articles,
+                dates=self.dates,
+                blog=True,
+                template_name=template,
+                page_name=os.path.splitext(save_as)[0],
+                url=url,
+            )
 
     def generate_tags(self, write):
         """Generate Tags pages."""
-        tag_template = self.get_template('tag')
+        tag_template = self.get_template("tag")
         for tag, articles in self.tags.items():
             dates = [article for article in self.dates if article in articles]
-            write(tag.save_as, tag_template, self.context, tag=tag,
-                  url=tag.url, articles=articles, dates=dates,
-                  template_name='tag', blog=True, page_name=tag.page_name,
-                  all_articles=self.articles)
+            write(
+                tag.save_as,
+                tag_template,
+                self.context,
+                tag=tag,
+                url=tag.url,
+                articles=articles,
+                dates=dates,
+                template_name="tag",
+                blog=True,
+                page_name=tag.page_name,
+                all_articles=self.articles,
+            )
 
     def generate_categories(self, write):
         """Generate category pages."""
-        category_template = self.get_template('category')
+        category_template = self.get_template("category")
         for cat, articles in self.categories:
             dates = [article for article in self.dates if article in articles]
-            write(cat.save_as, category_template, self.context, url=cat.url,
-                  category=cat, articles=articles, dates=dates,
-                  template_name='category', blog=True, page_name=cat.page_name,
-                  all_articles=self.articles)
+            write(
+                cat.save_as,
+                category_template,
+                self.context,
+                url=cat.url,
+                category=cat,
+                articles=articles,
+                dates=dates,
+                template_name="category",
+                blog=True,
+                page_name=cat.page_name,
+                all_articles=self.articles,
+            )
 
     def generate_authors(self, write):
         """Generate Author pages."""
-        author_template = self.get_template('author')
+        author_template = self.get_template("author")
         for aut, articles in self.authors:
             dates = [article for article in self.dates if article in articles]
-            write(aut.save_as, author_template, self.context,
-                  url=aut.url, author=aut, articles=articles, dates=dates,
-                  template_name='author', blog=True,
-                  page_name=aut.page_name, all_articles=self.articles)
+            write(
+                aut.save_as,
+                author_template,
+                self.context,
+                url=aut.url,
+                author=aut,
+                articles=articles,
+                dates=dates,
+                template_name="author",
+                blog=True,
+                page_name=aut.page_name,
+                all_articles=self.articles,
+            )
 
     def generate_drafts(self, write):
         """Generate drafts pages."""
         for draft in chain(self.drafts_translations, self.drafts):
-            write(draft.save_as, self.get_template(draft.template),
-                  self.context, article=draft, category=draft.category,
-                  override_output=hasattr(draft, 'override_save_as'),
-                  blog=True, all_articles=self.articles, url=draft.url)
+            write(
+                draft.save_as,
+                self.get_template(draft.template),
+                self.context,
+                article=draft,
+                category=draft.category,
+                override_output=hasattr(draft, "override_save_as"),
+                blog=True,
+                all_articles=self.articles,
+                url=draft.url,
+            )
 
     def generate_pages(self, writer):
         """Generate the pages on the disk"""
-        write = partial(writer.write_file,
-                        relative_urls=self.settings['RELATIVE_URLS'])
+        write = partial(writer.write_file, relative_urls=self.settings["RELATIVE_URLS"])
 
         # to minimize the number of relative path stuff modification
         # in writer, articles pass first
@@ -583,22 +646,28 @@ class ArticlesGenerator(CachingGenerator):
         all_drafts = []
         hidden_articles = []
         for f in self.get_files(
-                self.settings['ARTICLE_PATHS'],
-                exclude=self.settings['ARTICLE_EXCLUDES']):
+            self.settings["ARTICLE_PATHS"], exclude=self.settings["ARTICLE_EXCLUDES"]
+        ):
             article = self.get_cached_data(f, None)
             if article is None:
                 try:
                     article = self.readers.read_file(
-                        base_path=self.path, path=f, content_class=Article,
+                        base_path=self.path,
+                        path=f,
+                        content_class=Article,
                         context=self.context,
                         preread_signal=signals.article_generator_preread,
                         preread_sender=self,
                         context_signal=signals.article_generator_context,
-                        context_sender=self)
+                        context_sender=self,
+                    )
                 except Exception as e:
                     logger.error(
-                        'Could not process %s\n%s', f, e,
-                        exc_info=self.settings.get('DEBUG', False))
+                        "Could not process %s\n%s",
+                        f,
+                        e,
+                        exc_info=self.settings.get("DEBUG", False),
+                    )
                     self._add_failed_source_path(f)
                     continue
 
@@ -620,8 +689,9 @@ class ArticlesGenerator(CachingGenerator):
 
         def _process(arts):
             origs, translations = process_translations(
-                arts, translation_id=self.settings['ARTICLE_TRANSLATION_ID'])
-            origs = order_content(origs, self.settings['ARTICLE_ORDER_BY'])
+                arts, translation_id=self.settings["ARTICLE_TRANSLATION_ID"]
+            )
+            origs = order_content(origs, self.settings["ARTICLE_ORDER_BY"])
             return origs, translations
 
         self.articles, self.translations = _process(all_articles)
@@ -634,36 +704,45 @@ class ArticlesGenerator(CachingGenerator):
             # only main articles are listed in categories and tags
             # not translations or hidden articles
             self.categories[article.category].append(article)
-            if hasattr(article, 'tags'):
+            if hasattr(article, "tags"):
                 for tag in article.tags:
                     self.tags[tag].append(article)
-            for author in getattr(article, 'authors', []):
+            for author in getattr(article, "authors", []):
                 self.authors[author].append(article)
 
         self.dates = list(self.articles)
-        self.dates.sort(key=attrgetter('date'),
-                        reverse=self.context['NEWEST_FIRST_ARCHIVES'])
+        self.dates.sort(
+            key=attrgetter("date"), reverse=self.context["NEWEST_FIRST_ARCHIVES"]
+        )
 
         self.period_archives = self._build_period_archives(
-            self.dates, self.articles, self.settings)
+            self.dates, self.articles, self.settings
+        )
 
         # and generate the output :)
 
         # order the categories per name
         self.categories = list(self.categories.items())
-        self.categories.sort(
-            reverse=self.settings['REVERSE_CATEGORY_ORDER'])
+        self.categories.sort(reverse=self.settings["REVERSE_CATEGORY_ORDER"])
 
         self.authors = list(self.authors.items())
         self.authors.sort()
 
-        self._update_context((
-            'articles', 'drafts', 'hidden_articles',
-            'dates', 'tags', 'categories',
-            'authors', 'related_posts'))
+        self._update_context(
+            (
+                "articles",
+                "drafts",
+                "hidden_articles",
+                "dates",
+                "tags",
+                "categories",
+                "authors",
+                "related_posts",
+            )
+        )
         # _update_context flattens dicts, which should not happen to
         # period_archives, so we update the context directly for it:
-        self.context['period_archives'] = self.period_archives
+        self.context["period_archives"] = self.period_archives
         self.save_cache()
         self.readers.save_cache()
         signals.article_generator_finalized.send(self)
@@ -677,29 +756,29 @@ class ArticlesGenerator(CachingGenerator):
         period_archives = defaultdict(list)
 
         period_archives_settings = {
-            'year': {
-                'save_as': settings['YEAR_ARCHIVE_SAVE_AS'],
-                'url': settings['YEAR_ARCHIVE_URL'],
+            "year": {
+                "save_as": settings["YEAR_ARCHIVE_SAVE_AS"],
+                "url": settings["YEAR_ARCHIVE_URL"],
             },
-            'month': {
-                'save_as': settings['MONTH_ARCHIVE_SAVE_AS'],
-                'url': settings['MONTH_ARCHIVE_URL'],
+            "month": {
+                "save_as": settings["MONTH_ARCHIVE_SAVE_AS"],
+                "url": settings["MONTH_ARCHIVE_URL"],
             },
-            'day': {
-                'save_as': settings['DAY_ARCHIVE_SAVE_AS'],
-                'url': settings['DAY_ARCHIVE_URL'],
+            "day": {
+                "save_as": settings["DAY_ARCHIVE_SAVE_AS"],
+                "url": settings["DAY_ARCHIVE_URL"],
             },
         }
 
         granularity_key_func = {
-            'year': attrgetter('date.year'),
-            'month': attrgetter('date.year', 'date.month'),
-            'day': attrgetter('date.year', 'date.month', 'date.day'),
+            "year": attrgetter("date.year"),
+            "month": attrgetter("date.year", "date.month"),
+            "day": attrgetter("date.year", "date.month", "date.day"),
         }
 
-        for granularity in 'year', 'month', 'day':
-            save_as_fmt = period_archives_settings[granularity]['save_as']
-            url_fmt = period_archives_settings[granularity]['url']
+        for granularity in "year", "month", "day":
+            save_as_fmt = period_archives_settings[granularity]["save_as"]
+            url_fmt = period_archives_settings[granularity]["url"]
             key_func = granularity_key_func[granularity]
 
             if not save_as_fmt:
@@ -710,26 +789,26 @@ class ArticlesGenerator(CachingGenerator):
                 archive = {}
 
                 dates = list(group)
-                archive['dates'] = dates
-                archive['articles'] = [a for a in articles if a in dates]
+                archive["dates"] = dates
+                archive["articles"] = [a for a in articles if a in dates]
 
                 # use the first date to specify the period archive URL
                 # and save_as; the specific date used does not matter as
                 # they all belong to the same period
                 d = dates[0].date
-                archive['save_as'] = save_as_fmt.format(date=d)
-                archive['url'] = url_fmt.format(date=d)
+                archive["save_as"] = save_as_fmt.format(date=d)
+                archive["url"] = url_fmt.format(date=d)
 
-                if granularity == 'year':
-                    archive['period'] = (period,)
-                    archive['period_num'] = (period,)
+                if granularity == "year":
+                    archive["period"] = (period,)
+                    archive["period_num"] = (period,)
                 else:
                     month_name = calendar.month_name[period[1]]
-                    if granularity == 'month':
-                        archive['period'] = (period[0], month_name)
+                    if granularity == "month":
+                        archive["period"] = (period[0], month_name)
                     else:
-                        archive['period'] = (period[0], month_name, period[2])
-                    archive['period_num'] = tuple(period)
+                        archive["period"] = (period[0], month_name, period[2])
+                    archive["period_num"] = tuple(period)
 
                 period_archives[granularity].append(archive)
 
@@ -741,13 +820,15 @@ class ArticlesGenerator(CachingGenerator):
         signals.article_writer_finalized.send(self, writer=writer)
 
     def refresh_metadata_intersite_links(self):
-        for e in chain(self.articles,
-                       self.translations,
-                       self.drafts,
-                       self.drafts_translations,
-                       self.hidden_articles,
-                       self.hidden_translations):
-            if hasattr(e, 'refresh_metadata_intersite_links'):
+        for e in chain(
+            self.articles,
+            self.translations,
+            self.drafts,
+            self.drafts_translations,
+            self.hidden_articles,
+            self.hidden_translations,
+        ):
+            if hasattr(e, "refresh_metadata_intersite_links"):
                 e.refresh_metadata_intersite_links()
 
 
@@ -769,22 +850,28 @@ class PagesGenerator(CachingGenerator):
         hidden_pages = []
         draft_pages = []
         for f in self.get_files(
-                self.settings['PAGE_PATHS'],
-                exclude=self.settings['PAGE_EXCLUDES']):
+            self.settings["PAGE_PATHS"], exclude=self.settings["PAGE_EXCLUDES"]
+        ):
             page = self.get_cached_data(f, None)
             if page is None:
                 try:
                     page = self.readers.read_file(
-                        base_path=self.path, path=f, content_class=Page,
+                        base_path=self.path,
+                        path=f,
+                        content_class=Page,
                         context=self.context,
                         preread_signal=signals.page_generator_preread,
                         preread_sender=self,
                         context_signal=signals.page_generator_context,
-                        context_sender=self)
+                        context_sender=self,
+                    )
                 except Exception as e:
                     logger.error(
-                        'Could not process %s\n%s', f, e,
-                        exc_info=self.settings.get('DEBUG', False))
+                        "Could not process %s\n%s",
+                        f,
+                        e,
+                        exc_info=self.settings.get("DEBUG", False),
+                    )
                     self._add_failed_source_path(f)
                     continue
 
@@ -805,40 +892,51 @@ class PagesGenerator(CachingGenerator):
 
         def _process(pages):
             origs, translations = process_translations(
-                pages, translation_id=self.settings['PAGE_TRANSLATION_ID'])
-            origs = order_content(origs, self.settings['PAGE_ORDER_BY'])
+                pages, translation_id=self.settings["PAGE_TRANSLATION_ID"]
+            )
+            origs = order_content(origs, self.settings["PAGE_ORDER_BY"])
             return origs, translations
 
         self.pages, self.translations = _process(all_pages)
         self.hidden_pages, self.hidden_translations = _process(hidden_pages)
         self.draft_pages, self.draft_translations = _process(draft_pages)
 
-        self._update_context(('pages', 'hidden_pages', 'draft_pages'))
+        self._update_context(("pages", "hidden_pages", "draft_pages"))
 
         self.save_cache()
         self.readers.save_cache()
         signals.page_generator_finalized.send(self)
 
     def generate_output(self, writer):
-        for page in chain(self.translations, self.pages,
-                          self.hidden_translations, self.hidden_pages,
-                          self.draft_translations, self.draft_pages):
+        for page in chain(
+            self.translations,
+            self.pages,
+            self.hidden_translations,
+            self.hidden_pages,
+            self.draft_translations,
+            self.draft_pages,
+        ):
             signals.page_generator_write_page.send(self, content=page)
             writer.write_file(
-                page.save_as, self.get_template(page.template),
-                self.context, page=page,
-                relative_urls=self.settings['RELATIVE_URLS'],
-                override_output=hasattr(page, 'override_save_as'),
-                url=page.url)
+                page.save_as,
+                self.get_template(page.template),
+                self.context,
+                page=page,
+                relative_urls=self.settings["RELATIVE_URLS"],
+                override_output=hasattr(page, "override_save_as"),
+                url=page.url,
+            )
         signals.page_writer_finalized.send(self, writer=writer)
 
     def refresh_metadata_intersite_links(self):
-        for e in chain(self.pages,
-                       self.hidden_pages,
-                       self.hidden_translations,
-                       self.draft_pages,
-                       self.draft_translations):
-            if hasattr(e, 'refresh_metadata_intersite_links'):
+        for e in chain(
+            self.pages,
+            self.hidden_pages,
+            self.hidden_translations,
+            self.draft_pages,
+            self.draft_translations,
+        ):
+            if hasattr(e, "refresh_metadata_intersite_links"):
                 e.refresh_metadata_intersite_links()
 
 
@@ -853,71 +951,82 @@ class StaticGenerator(Generator):
 
     def generate_context(self):
         self.staticfiles = []
-        linked_files = set(self.context['static_links'])
-        found_files = self.get_files(self.settings['STATIC_PATHS'],
-                                     exclude=self.settings['STATIC_EXCLUDES'],
-                                     extensions=False)
+        linked_files = set(self.context["static_links"])
+        found_files = self.get_files(
+            self.settings["STATIC_PATHS"],
+            exclude=self.settings["STATIC_EXCLUDES"],
+            extensions=False,
+        )
         for f in linked_files | found_files:
-
             # skip content source files unless the user explicitly wants them
-            if self.settings['STATIC_EXCLUDE_SOURCES']:
+            if self.settings["STATIC_EXCLUDE_SOURCES"]:
                 if self._is_potential_source_path(f):
                     continue
 
             static = self.readers.read_file(
-                base_path=self.path, path=f, content_class=Static,
-                fmt='static', context=self.context,
+                base_path=self.path,
+                path=f,
+                content_class=Static,
+                fmt="static",
+                context=self.context,
                 preread_signal=signals.static_generator_preread,
                 preread_sender=self,
                 context_signal=signals.static_generator_context,
-                context_sender=self)
+                context_sender=self,
+            )
             self.staticfiles.append(static)
             self.add_source_path(static, static=True)
-        self._update_context(('staticfiles',))
+        self._update_context(("staticfiles",))
         signals.static_generator_finalized.send(self)
 
     def generate_output(self, writer):
-        self._copy_paths(self.settings['THEME_STATIC_PATHS'], self.theme,
-                         self.settings['THEME_STATIC_DIR'], self.output_path,
-                         os.curdir)
-        for sc in self.context['staticfiles']:
+        self._copy_paths(
+            self.settings["THEME_STATIC_PATHS"],
+            self.theme,
+            self.settings["THEME_STATIC_DIR"],
+            self.output_path,
+            os.curdir,
+        )
+        for sc in self.context["staticfiles"]:
             if self._file_update_required(sc):
                 self._link_or_copy_staticfile(sc)
             else:
-                logger.debug('%s is up to date, not copying', sc.source_path)
+                logger.debug("%s is up to date, not copying", sc.source_path)
 
-    def _copy_paths(self, paths, source, destination, output_path,
-                    final_path=None):
+    def _copy_paths(self, paths, source, destination, output_path, final_path=None):
         """Copy all the paths from source to destination"""
         for path in paths:
             source_path = os.path.join(source, path)
 
             if final_path:
                 if os.path.isfile(source_path):
-                    destination_path = os.path.join(output_path, destination,
-                                                    final_path,
-                                                    os.path.basename(path))
+                    destination_path = os.path.join(
+                        output_path, destination, final_path, os.path.basename(path)
+                    )
                 else:
-                    destination_path = os.path.join(output_path, destination,
-                                                    final_path)
+                    destination_path = os.path.join(
+                        output_path, destination, final_path
+                    )
             else:
                 destination_path = os.path.join(output_path, destination, path)
 
-            copy(source_path, destination_path,
-                 self.settings['IGNORE_FILES'])
+            copy(source_path, destination_path, self.settings["IGNORE_FILES"])
 
     def _file_update_required(self, staticfile):
         source_path = os.path.join(self.path, staticfile.source_path)
         save_as = os.path.join(self.output_path, staticfile.save_as)
         if not os.path.exists(save_as):
             return True
-        elif (self.settings['STATIC_CREATE_LINKS'] and
-              os.path.samefile(source_path, save_as)):
+        elif self.settings["STATIC_CREATE_LINKS"] and os.path.samefile(
+            source_path, save_as
+        ):
             return False
-        elif (self.settings['STATIC_CREATE_LINKS'] and
-              os.path.realpath(save_as) == source_path):
+        elif (
+            self.settings["STATIC_CREATE_LINKS"]
+            and os.path.realpath(save_as) == source_path
+        ):
             return False
-        elif not self.settings['STATIC_CHECK_IF_MODIFIED']:
+        elif not self.settings["STATIC_CHECK_IF_MODIFIED"]:
             return True
         else:
             return self._source_is_newer(staticfile)
@@ -930,7 +1039,7 @@ class StaticGenerator(Generator):
         return s_mtime - d_mtime > 0.000001
 
     def _link_or_copy_staticfile(self, sc):
-        if self.settings['STATIC_CREATE_LINKS']:
+        if self.settings["STATIC_CREATE_LINKS"]:
             self._link_staticfile(sc)
         else:
             self._copy_staticfile(sc)
@@ -940,7 +1049,7 @@ class StaticGenerator(Generator):
         save_as = os.path.join(self.output_path, sc.save_as)
         self._mkdir(os.path.dirname(save_as))
         copy(source_path, save_as)
-        logger.info('Copying %s to %s', sc.source_path, sc.save_as)
+        logger.info("Copying %s to %s", sc.source_path, sc.save_as)
 
     def _link_staticfile(self, sc):
         source_path = os.path.join(self.path, sc.source_path)
@@ -949,7 +1058,7 @@ class StaticGenerator(Generator):
         try:
             if os.path.lexists(save_as):
                 os.unlink(save_as)
-            logger.info('Linking %s and %s', sc.source_path, sc.save_as)
+            logger.info("Linking %s and %s", sc.source_path, sc.save_as)
             if self.fallback_to_symlinks:
                 os.symlink(source_path, save_as)
             else:
@@ -957,9 +1066,8 @@ class StaticGenerator(Generator):
         except OSError as err:
             if err.errno == errno.EXDEV:  # 18: Invalid cross-device link
                 logger.debug(
-                    "Cross-device links not valid. "
-                    "Creating symbolic links instead."
-                    )
+                    "Cross-device links not valid. " "Creating symbolic links instead."
+                )
                 self.fallback_to_symlinks = True
                 self._link_staticfile(sc)
             else:
@@ -972,19 +1080,17 @@ class StaticGenerator(Generator):
 
 
 class SourceFileGenerator(Generator):
-
     def generate_context(self):
-        self.output_extension = self.settings['OUTPUT_SOURCES_EXTENSION']
+        self.output_extension = self.settings["OUTPUT_SOURCES_EXTENSION"]
 
     def _create_source(self, obj):
         output_path, _ = os.path.splitext(obj.save_as)
-        dest = os.path.join(self.output_path,
-                            output_path + self.output_extension)
+        dest = os.path.join(self.output_path, output_path + self.output_extension)
         copy(obj.source_path, dest)
 
     def generate_output(self, writer=None):
-        logger.info('Generating source files...')
-        for obj in chain(self.context['articles'], self.context['pages']):
+        logger.info("Generating source files...")
+        for obj in chain(self.context["articles"], self.context["pages"]):
             self._create_source(obj)
             for obj_trans in obj.translations:
                 self._create_source(obj_trans)
diff --git a/pelican/log.py b/pelican/log.py
index be176ea8..0d2b6a3f 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -4,9 +4,7 @@ from collections import defaultdict
 from rich.console import Console
 from rich.logging import RichHandler
 
-__all__ = [
-    'init'
-]
+__all__ = ["init"]
 
 console = Console()
 
@@ -34,8 +32,8 @@ class LimitFilter(logging.Filter):
             return True
 
         # extract group
-        group = record.__dict__.get('limit_msg', None)
-        group_args = record.__dict__.get('limit_args', ())
+        group = record.__dict__.get("limit_msg", None)
+        group_args = record.__dict__.get("limit_args", ())
 
         # ignore record if it was already raised
         message_key = (record.levelno, record.getMessage())
@@ -50,7 +48,7 @@ class LimitFilter(logging.Filter):
         if logger_level > logging.DEBUG:
             template_key = (record.levelno, record.msg)
             message_key = (record.levelno, record.getMessage())
-            if (template_key in self._ignore or message_key in self._ignore):
+            if template_key in self._ignore or message_key in self._ignore:
                 return False
 
         # check if we went over threshold
@@ -90,12 +88,12 @@ class FatalLogger(LimitLogger):
     def warning(self, *args, **kwargs):
         super().warning(*args, **kwargs)
         if FatalLogger.warnings_fatal:
-            raise RuntimeError('Warning encountered')
+            raise RuntimeError("Warning encountered")
 
     def error(self, *args, **kwargs):
         super().error(*args, **kwargs)
         if FatalLogger.errors_fatal:
-            raise RuntimeError('Error encountered')
+            raise RuntimeError("Error encountered")
 
 
 logging.setLoggerClass(FatalLogger)
@@ -103,17 +101,19 @@ logging.setLoggerClass(FatalLogger)
 logging.getLogger().__class__ = FatalLogger
 
 
-def init(level=None, fatal='', handler=RichHandler(console=console), name=None,
-         logs_dedup_min_level=None):
-    FatalLogger.warnings_fatal = fatal.startswith('warning')
+def init(
+    level=None,
+    fatal="",
+    handler=RichHandler(console=console),
+    name=None,
+    logs_dedup_min_level=None,
+):
+    FatalLogger.warnings_fatal = fatal.startswith("warning")
     FatalLogger.errors_fatal = bool(fatal)
 
     LOG_FORMAT = "%(message)s"
     logging.basicConfig(
-        level=level,
-        format=LOG_FORMAT,
-        datefmt="[%H:%M:%S]",
-        handlers=[handler]
+        level=level, format=LOG_FORMAT, datefmt="[%H:%M:%S]", handlers=[handler]
     )
 
     logger = logging.getLogger(name)
@@ -126,17 +126,18 @@ def init(level=None, fatal='', handler=RichHandler(console=console), name=None,
 
 def log_warnings():
     import warnings
+
     logging.captureWarnings(True)
     warnings.simplefilter("default", DeprecationWarning)
-    init(logging.DEBUG, name='py.warnings')
+    init(logging.DEBUG, name="py.warnings")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     init(level=logging.DEBUG, name=__name__)
 
     root_logger = logging.getLogger(__name__)
-    root_logger.debug('debug')
-    root_logger.info('info')
-    root_logger.warning('warning')
-    root_logger.error('error')
-    root_logger.critical('critical')
+    root_logger.debug("debug")
+    root_logger.info("info")
+    root_logger.warning("warning")
+    root_logger.error("error")
+    root_logger.critical("critical")
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 4231e67b..930c915b 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -6,8 +6,8 @@ from math import ceil
 
 logger = logging.getLogger(__name__)
 PaginationRule = namedtuple(
-    'PaginationRule',
-    'min_page URL SAVE_AS',
+    "PaginationRule",
+    "min_page URL SAVE_AS",
 )
 
 
@@ -19,7 +19,7 @@ class Paginator:
         self.settings = settings
         if per_page:
             self.per_page = per_page
-            self.orphans = settings['DEFAULT_ORPHANS']
+            self.orphans = settings["DEFAULT_ORPHANS"]
         else:
             self.per_page = len(object_list)
             self.orphans = 0
@@ -32,14 +32,21 @@ class Paginator:
         top = bottom + self.per_page
         if top + self.orphans >= self.count:
             top = self.count
-        return Page(self.name, self.url, self.object_list[bottom:top], number,
-                    self, self.settings)
+        return Page(
+            self.name,
+            self.url,
+            self.object_list[bottom:top],
+            number,
+            self,
+            self.settings,
+        )
 
     def _get_count(self):
         "Returns the total number of objects, across all pages."
         if self._count is None:
             self._count = len(self.object_list)
         return self._count
+
     count = property(_get_count)
 
     def _get_num_pages(self):
@@ -48,6 +55,7 @@ class Paginator:
             hits = max(1, self.count - self.orphans)
             self._num_pages = int(ceil(hits / (float(self.per_page) or 1)))
         return self._num_pages
+
     num_pages = property(_get_num_pages)
 
     def _get_page_range(self):
@@ -56,6 +64,7 @@ class Paginator:
         a template for loop.
         """
         return list(range(1, self.num_pages + 1))
+
     page_range = property(_get_page_range)
 
 
@@ -64,7 +73,7 @@ class Page:
         self.full_name = name
         self.name, self.extension = os.path.splitext(name)
         dn, fn = os.path.split(name)
-        self.base_name = dn if fn in ('index.htm', 'index.html') else self.name
+        self.base_name = dn if fn in ("index.htm", "index.html") else self.name
         self.base_url = url
         self.object_list = object_list
         self.number = number
@@ -72,7 +81,7 @@ class Page:
         self.settings = settings
 
     def __repr__(self):
-        return '<Page {} of {}>'.format(self.number, self.paginator.num_pages)
+        return "<Page {} of {}>".format(self.number, self.paginator.num_pages)
 
     def has_next(self):
         return self.number < self.paginator.num_pages
@@ -117,7 +126,7 @@ class Page:
         rule = None
 
         # find the last matching pagination rule
-        for p in self.settings['PAGINATION_PATTERNS']:
+        for p in self.settings["PAGINATION_PATTERNS"]:
             if p.min_page == -1:
                 if not self.has_next():
                     rule = p
@@ -127,22 +136,22 @@ class Page:
                     rule = p
 
         if not rule:
-            return ''
+            return ""
 
         prop_value = getattr(rule, key)
 
         if not isinstance(prop_value, str):
-            logger.warning('%s is set to %s', key, prop_value)
+            logger.warning("%s is set to %s", key, prop_value)
             return prop_value
 
         # URL or SAVE_AS is a string, format it with a controlled context
         context = {
-            'save_as': self.full_name,
-            'url': self.base_url,
-            'name': self.name,
-            'base_name': self.base_name,
-            'extension': self.extension,
-            'number': self.number,
+            "save_as": self.full_name,
+            "url": self.base_url,
+            "name": self.name,
+            "base_name": self.base_name,
+            "extension": self.extension,
+            "number": self.number,
         }
 
         ret = prop_value.format(**context)
@@ -155,9 +164,9 @@ class Page:
         # changed to lstrip() because that would remove all leading slashes and
         # thus make the workaround impossible. See
         # test_custom_pagination_pattern() for a verification of this.
-        if ret.startswith('/'):
+        if ret.startswith("/"):
             ret = ret[1:]
         return ret
 
-    url = property(functools.partial(_from_settings, key='URL'))
-    save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
+    url = property(functools.partial(_from_settings, key="URL"))
+    save_as = property(functools.partial(_from_settings, key="SAVE_AS"))
diff --git a/pelican/plugins/_utils.py b/pelican/plugins/_utils.py
index 87877b08..f0c18f5c 100644
--- a/pelican/plugins/_utils.py
+++ b/pelican/plugins/_utils.py
@@ -24,26 +24,26 @@ def get_namespace_plugins(ns_pkg=None):
 
     return {
         name: importlib.import_module(name)
-        for finder, name, ispkg
-        in iter_namespace(ns_pkg)
+        for finder, name, ispkg in iter_namespace(ns_pkg)
         if ispkg
     }
 
 
 def list_plugins(ns_pkg=None):
     from pelican.log import init as init_logging
+
     init_logging(logging.INFO)
     ns_plugins = get_namespace_plugins(ns_pkg)
     if ns_plugins:
-        logger.info('Plugins found:\n' + '\n'.join(ns_plugins))
+        logger.info("Plugins found:\n" + "\n".join(ns_plugins))
     else:
-        logger.info('No plugins are installed')
+        logger.info("No plugins are installed")
 
 
 def load_legacy_plugin(plugin, plugin_paths):
-    if '.' in plugin:
+    if "." in plugin:
         # it is in a package, try to resolve package first
-        package, _, _ = plugin.rpartition('.')
+        package, _, _ = plugin.rpartition(".")
         load_legacy_plugin(package, plugin_paths)
 
     # Try to find plugin in PLUGIN_PATHS
@@ -52,7 +52,7 @@ def load_legacy_plugin(plugin, plugin_paths):
         # If failed, try to find it in normal importable locations
         spec = importlib.util.find_spec(plugin)
     if spec is None:
-        raise ImportError('Cannot import plugin `{}`'.format(plugin))
+        raise ImportError("Cannot import plugin `{}`".format(plugin))
     else:
         # Avoid loading the same plugin twice
         if spec.name in sys.modules:
@@ -78,30 +78,28 @@ def load_legacy_plugin(plugin, plugin_paths):
 
 
 def load_plugins(settings):
-    logger.debug('Finding namespace plugins')
+    logger.debug("Finding namespace plugins")
     namespace_plugins = get_namespace_plugins()
     if namespace_plugins:
-        logger.debug('Namespace plugins found:\n' +
-                     '\n'.join(namespace_plugins))
+        logger.debug("Namespace plugins found:\n" + "\n".join(namespace_plugins))
     plugins = []
-    if settings.get('PLUGINS') is not None:
-        for plugin in settings['PLUGINS']:
+    if settings.get("PLUGINS") is not None:
+        for plugin in settings["PLUGINS"]:
             if isinstance(plugin, str):
-                logger.debug('Loading plugin `%s`', plugin)
+                logger.debug("Loading plugin `%s`", plugin)
                 # try to find in namespace plugins
                 if plugin in namespace_plugins:
                     plugin = namespace_plugins[plugin]
-                elif 'pelican.plugins.{}'.format(plugin) in namespace_plugins:
-                    plugin = namespace_plugins['pelican.plugins.{}'.format(
-                        plugin)]
+                elif "pelican.plugins.{}".format(plugin) in namespace_plugins:
+                    plugin = namespace_plugins["pelican.plugins.{}".format(plugin)]
                 # try to import it
                 else:
                     try:
                         plugin = load_legacy_plugin(
-                            plugin,
-                            settings.get('PLUGIN_PATHS', []))
+                            plugin, settings.get("PLUGIN_PATHS", [])
+                        )
                     except ImportError as e:
-                        logger.error('Cannot load plugin `%s`\n%s', plugin, e)
+                        logger.error("Cannot load plugin `%s`\n%s", plugin, e)
                         continue
             plugins.append(plugin)
     else:
diff --git a/pelican/plugins/signals.py b/pelican/plugins/signals.py
index 4013360f..ff129cb4 100644
--- a/pelican/plugins/signals.py
+++ b/pelican/plugins/signals.py
@@ -2,48 +2,48 @@ from blinker import signal
 
 # Run-level signals:
 
-initialized = signal('pelican_initialized')
-get_generators = signal('get_generators')
-all_generators_finalized = signal('all_generators_finalized')
-get_writer = signal('get_writer')
-finalized = signal('pelican_finalized')
+initialized = signal("pelican_initialized")
+get_generators = signal("get_generators")
+all_generators_finalized = signal("all_generators_finalized")
+get_writer = signal("get_writer")
+finalized = signal("pelican_finalized")
 
 # Reader-level signals
 
-readers_init = signal('readers_init')
+readers_init = signal("readers_init")
 
 # Generator-level signals
 
-generator_init = signal('generator_init')
+generator_init = signal("generator_init")
 
-article_generator_init = signal('article_generator_init')
-article_generator_pretaxonomy = signal('article_generator_pretaxonomy')
-article_generator_finalized = signal('article_generator_finalized')
-article_generator_write_article = signal('article_generator_write_article')
-article_writer_finalized = signal('article_writer_finalized')
+article_generator_init = signal("article_generator_init")
+article_generator_pretaxonomy = signal("article_generator_pretaxonomy")
+article_generator_finalized = signal("article_generator_finalized")
+article_generator_write_article = signal("article_generator_write_article")
+article_writer_finalized = signal("article_writer_finalized")
 
-page_generator_init = signal('page_generator_init')
-page_generator_finalized = signal('page_generator_finalized')
-page_generator_write_page = signal('page_generator_write_page')
-page_writer_finalized = signal('page_writer_finalized')
+page_generator_init = signal("page_generator_init")
+page_generator_finalized = signal("page_generator_finalized")
+page_generator_write_page = signal("page_generator_write_page")
+page_writer_finalized = signal("page_writer_finalized")
 
-static_generator_init = signal('static_generator_init')
-static_generator_finalized = signal('static_generator_finalized')
+static_generator_init = signal("static_generator_init")
+static_generator_finalized = signal("static_generator_finalized")
 
 # Page-level signals
 
-article_generator_preread = signal('article_generator_preread')
-article_generator_context = signal('article_generator_context')
+article_generator_preread = signal("article_generator_preread")
+article_generator_context = signal("article_generator_context")
 
-page_generator_preread = signal('page_generator_preread')
-page_generator_context = signal('page_generator_context')
+page_generator_preread = signal("page_generator_preread")
+page_generator_context = signal("page_generator_context")
 
-static_generator_preread = signal('static_generator_preread')
-static_generator_context = signal('static_generator_context')
+static_generator_preread = signal("static_generator_preread")
+static_generator_context = signal("static_generator_context")
 
-content_object_init = signal('content_object_init')
+content_object_init = signal("content_object_init")
 
 # Writers signals
-content_written = signal('content_written')
-feed_generated = signal('feed_generated')
-feed_written = signal('feed_written')
+content_written = signal("content_written")
+feed_generated = signal("feed_generated")
+feed_written = signal("feed_written")
diff --git a/pelican/readers.py b/pelican/readers.py
index 03c3cc20..5033c0bd 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -31,33 +31,29 @@ except ImportError:
 _DISCARD = object()
 
 DUPLICATES_DEFINITIONS_ALLOWED = {
-    'tags': False,
-    'date': False,
-    'modified': False,
-    'status': False,
-    'category': False,
-    'author': False,
-    'save_as': False,
-    'url': False,
-    'authors': False,
-    'slug': False
+    "tags": False,
+    "date": False,
+    "modified": False,
+    "status": False,
+    "category": False,
+    "author": False,
+    "save_as": False,
+    "url": False,
+    "authors": False,
+    "slug": False,
 }
 
 METADATA_PROCESSORS = {
-    'tags': lambda x, y: ([
-        Tag(tag, y)
-        for tag in ensure_metadata_list(x)
-    ] or _DISCARD),
-    'date': lambda x, y: get_date(x.replace('_', ' ')),
-    'modified': lambda x, y: get_date(x),
-    'status': lambda x, y: x.strip() or _DISCARD,
-    'category': lambda x, y: _process_if_nonempty(Category, x, y),
-    'author': lambda x, y: _process_if_nonempty(Author, x, y),
-    'authors': lambda x, y: ([
-        Author(author, y)
-        for author in ensure_metadata_list(x)
-    ] or _DISCARD),
-    'slug': lambda x, y: x.strip() or _DISCARD,
+    "tags": lambda x, y: ([Tag(tag, y) for tag in ensure_metadata_list(x)] or _DISCARD),
+    "date": lambda x, y: get_date(x.replace("_", " ")),
+    "modified": lambda x, y: get_date(x),
+    "status": lambda x, y: x.strip() or _DISCARD,
+    "category": lambda x, y: _process_if_nonempty(Category, x, y),
+    "author": lambda x, y: _process_if_nonempty(Author, x, y),
+    "authors": lambda x, y: (
+        [Author(author, y) for author in ensure_metadata_list(x)] or _DISCARD
+    ),
+    "slug": lambda x, y: x.strip() or _DISCARD,
 }
 
 logger = logging.getLogger(__name__)
@@ -65,25 +61,23 @@ logger = logging.getLogger(__name__)
 
 def ensure_metadata_list(text):
     """Canonicalize the format of a list of authors or tags.  This works
-       the same way as Docutils' "authors" field: if it's already a list,
-       those boundaries are preserved; otherwise, it must be a string;
-       if the string contains semicolons, it is split on semicolons;
-       otherwise, it is split on commas.  This allows you to write
-       author lists in either "Jane Doe, John Doe" or "Doe, Jane; Doe, John"
-       format.
+    the same way as Docutils' "authors" field: if it's already a list,
+    those boundaries are preserved; otherwise, it must be a string;
+    if the string contains semicolons, it is split on semicolons;
+    otherwise, it is split on commas.  This allows you to write
+    author lists in either "Jane Doe, John Doe" or "Doe, Jane; Doe, John"
+    format.
 
-       Regardless, all list items undergo .strip() before returning, and
-       empty items are discarded.
+    Regardless, all list items undergo .strip() before returning, and
+    empty items are discarded.
     """
     if isinstance(text, str):
-        if ';' in text:
-            text = text.split(';')
+        if ";" in text:
+            text = text.split(";")
         else:
-            text = text.split(',')
+            text = text.split(",")
 
-    return list(OrderedDict.fromkeys(
-        [v for v in (w.strip() for w in text) if v]
-    ))
+    return list(OrderedDict.fromkeys([v for v in (w.strip() for w in text) if v]))
 
 
 def _process_if_nonempty(processor, name, settings):
@@ -112,8 +106,9 @@ class BaseReader:
       Markdown).
 
     """
+
     enabled = True
-    file_extensions = ['static']
+    file_extensions = ["static"]
     extensions = None
 
     def __init__(self, settings):
@@ -132,13 +127,12 @@ class BaseReader:
 
 
 class _FieldBodyTranslator(HTMLTranslator):
-
     def __init__(self, document):
         super().__init__(document)
         self.compact_p = None
 
     def astext(self):
-        return ''.join(self.body)
+        return "".join(self.body)
 
     def visit_field_body(self, node):
         pass
@@ -154,27 +148,25 @@ def render_node_to_html(document, node, field_body_translator_class):
 
 
 class PelicanHTMLWriter(Writer):
-
     def __init__(self):
         super().__init__()
         self.translator_class = PelicanHTMLTranslator
 
 
 class PelicanHTMLTranslator(HTMLTranslator):
-
     def visit_abbreviation(self, node):
         attrs = {}
-        if node.hasattr('explanation'):
-            attrs['title'] = node['explanation']
-        self.body.append(self.starttag(node, 'abbr', '', **attrs))
+        if node.hasattr("explanation"):
+            attrs["title"] = node["explanation"]
+        self.body.append(self.starttag(node, "abbr", "", **attrs))
 
     def depart_abbreviation(self, node):
-        self.body.append('</abbr>')
+        self.body.append("</abbr>")
 
     def visit_image(self, node):
         # set an empty alt if alt is not specified
         # avoids that alt is taken from src
-        node['alt'] = node.get('alt', '')
+        node["alt"] = node.get("alt", "")
         return HTMLTranslator.visit_image(self, node)
 
 
@@ -194,7 +186,7 @@ class RstReader(BaseReader):
     """
 
     enabled = bool(docutils)
-    file_extensions = ['rst']
+    file_extensions = ["rst"]
 
     writer_class = PelicanHTMLWriter
     field_body_translator_class = _FieldBodyTranslator
@@ -202,25 +194,28 @@ class RstReader(BaseReader):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        lang_code = self.settings.get('DEFAULT_LANG', 'en')
+        lang_code = self.settings.get("DEFAULT_LANG", "en")
         if get_docutils_lang(lang_code):
             self._language_code = lang_code
         else:
-            logger.warning("Docutils has no localization for '%s'."
-                           " Using 'en' instead.", lang_code)
-            self._language_code = 'en'
+            logger.warning(
+                "Docutils has no localization for '%s'." " Using 'en' instead.",
+                lang_code,
+            )
+            self._language_code = "en"
 
     def _parse_metadata(self, document, source_path):
         """Return the dict containing document metadata"""
-        formatted_fields = self.settings['FORMATTED_FIELDS']
+        formatted_fields = self.settings["FORMATTED_FIELDS"]
 
         output = {}
 
         if document.first_child_matching_class(docutils.nodes.title) is None:
             logger.warning(
-                'Document title missing in file %s: '
-                'Ensure exactly one top level section',
-                source_path)
+                "Document title missing in file %s: "
+                "Ensure exactly one top level section",
+                source_path,
+            )
 
         try:
             # docutils 0.18.1+
@@ -231,16 +226,16 @@ class RstReader(BaseReader):
 
         for docinfo in nodes:
             for element in docinfo.children:
-                if element.tagname == 'field':  # custom fields (e.g. summary)
+                if element.tagname == "field":  # custom fields (e.g. summary)
                     name_elem, body_elem = element.children
                     name = name_elem.astext()
                     if name.lower() in formatted_fields:
                         value = render_node_to_html(
-                            document, body_elem,
-                            self.field_body_translator_class)
+                            document, body_elem, self.field_body_translator_class
+                        )
                     else:
                         value = body_elem.astext()
-                elif element.tagname == 'authors':  # author list
+                elif element.tagname == "authors":  # author list
                     name = element.tagname
                     value = [element.astext() for element in element.children]
                 else:  # standard fields (e.g. address)
@@ -252,22 +247,24 @@ class RstReader(BaseReader):
         return output
 
     def _get_publisher(self, source_path):
-        extra_params = {'initial_header_level': '2',
-                        'syntax_highlight': 'short',
-                        'input_encoding': 'utf-8',
-                        'language_code': self._language_code,
-                        'halt_level': 2,
-                        'traceback': True,
-                        'warning_stream': StringIO(),
-                        'embed_stylesheet': False}
-        user_params = self.settings.get('DOCUTILS_SETTINGS')
+        extra_params = {
+            "initial_header_level": "2",
+            "syntax_highlight": "short",
+            "input_encoding": "utf-8",
+            "language_code": self._language_code,
+            "halt_level": 2,
+            "traceback": True,
+            "warning_stream": StringIO(),
+            "embed_stylesheet": False,
+        }
+        user_params = self.settings.get("DOCUTILS_SETTINGS")
         if user_params:
             extra_params.update(user_params)
 
         pub = docutils.core.Publisher(
-            writer=self.writer_class(),
-            destination_class=docutils.io.StringOutput)
-        pub.set_components('standalone', 'restructuredtext', 'html')
+            writer=self.writer_class(), destination_class=docutils.io.StringOutput
+        )
+        pub.set_components("standalone", "restructuredtext", "html")
         pub.process_programmatic_settings(None, extra_params, None)
         pub.set_source(source_path=source_path)
         pub.publish()
@@ -277,10 +274,10 @@ class RstReader(BaseReader):
         """Parses restructured text"""
         pub = self._get_publisher(source_path)
         parts = pub.writer.parts
-        content = parts.get('body')
+        content = parts.get("body")
 
         metadata = self._parse_metadata(pub.document, source_path)
-        metadata.setdefault('title', parts.get('title'))
+        metadata.setdefault("title", parts.get("title"))
 
         return content, metadata
 
@@ -289,26 +286,26 @@ class MarkdownReader(BaseReader):
     """Reader for Markdown files"""
 
     enabled = bool(Markdown)
-    file_extensions = ['md', 'markdown', 'mkd', 'mdown']
+    file_extensions = ["md", "markdown", "mkd", "mdown"]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        settings = self.settings['MARKDOWN']
-        settings.setdefault('extension_configs', {})
-        settings.setdefault('extensions', [])
-        for extension in settings['extension_configs'].keys():
-            if extension not in settings['extensions']:
-                settings['extensions'].append(extension)
-        if 'markdown.extensions.meta' not in settings['extensions']:
-            settings['extensions'].append('markdown.extensions.meta')
+        settings = self.settings["MARKDOWN"]
+        settings.setdefault("extension_configs", {})
+        settings.setdefault("extensions", [])
+        for extension in settings["extension_configs"].keys():
+            if extension not in settings["extensions"]:
+                settings["extensions"].append(extension)
+        if "markdown.extensions.meta" not in settings["extensions"]:
+            settings["extensions"].append("markdown.extensions.meta")
         self._source_path = None
 
     def _parse_metadata(self, meta):
         """Return the dict containing document metadata"""
-        formatted_fields = self.settings['FORMATTED_FIELDS']
+        formatted_fields = self.settings["FORMATTED_FIELDS"]
 
         # prevent metadata extraction in fields
-        self._md.preprocessors.deregister('meta')
+        self._md.preprocessors.deregister("meta")
 
         output = {}
         for name, value in meta.items():
@@ -323,9 +320,10 @@ class MarkdownReader(BaseReader):
             elif not DUPLICATES_DEFINITIONS_ALLOWED.get(name, True):
                 if len(value) > 1:
                     logger.warning(
-                        'Duplicate definition of `%s` '
-                        'for %s. Using first one.',
-                        name, self._source_path)
+                        "Duplicate definition of `%s` " "for %s. Using first one.",
+                        name,
+                        self._source_path,
+                    )
                 output[name] = self.process_metadata(name, value[0])
             elif len(value) > 1:
                 # handle list metadata as list of string
@@ -339,11 +337,11 @@ class MarkdownReader(BaseReader):
         """Parse content and metadata of markdown files"""
 
         self._source_path = source_path
-        self._md = Markdown(**self.settings['MARKDOWN'])
+        self._md = Markdown(**self.settings["MARKDOWN"])
         with pelican_open(source_path) as text:
             content = self._md.convert(text)
 
-        if hasattr(self._md, 'Meta'):
+        if hasattr(self._md, "Meta"):
             metadata = self._parse_metadata(self._md.Meta)
         else:
             metadata = {}
@@ -353,17 +351,17 @@ class MarkdownReader(BaseReader):
 class HTMLReader(BaseReader):
     """Parses HTML files as input, looking for meta, title, and body tags"""
 
-    file_extensions = ['htm', 'html']
+    file_extensions = ["htm", "html"]
     enabled = True
 
     class _HTMLParser(HTMLParser):
         def __init__(self, settings, filename):
             super().__init__(convert_charrefs=False)
-            self.body = ''
+            self.body = ""
             self.metadata = {}
             self.settings = settings
 
-            self._data_buffer = ''
+            self._data_buffer = ""
 
             self._filename = filename
 
@@ -374,59 +372,59 @@ class HTMLReader(BaseReader):
             self._in_tags = False
 
         def handle_starttag(self, tag, attrs):
-            if tag == 'head' and self._in_top_level:
+            if tag == "head" and self._in_top_level:
                 self._in_top_level = False
                 self._in_head = True
-            elif tag == 'title' and self._in_head:
+            elif tag == "title" and self._in_head:
                 self._in_title = True
-                self._data_buffer = ''
-            elif tag == 'body' and self._in_top_level:
+                self._data_buffer = ""
+            elif tag == "body" and self._in_top_level:
                 self._in_top_level = False
                 self._in_body = True
-                self._data_buffer = ''
-            elif tag == 'meta' and self._in_head:
+                self._data_buffer = ""
+            elif tag == "meta" and self._in_head:
                 self._handle_meta_tag(attrs)
 
             elif self._in_body:
                 self._data_buffer += self.build_tag(tag, attrs, False)
 
         def handle_endtag(self, tag):
-            if tag == 'head':
+            if tag == "head":
                 if self._in_head:
                     self._in_head = False
                     self._in_top_level = True
-            elif self._in_head and tag == 'title':
+            elif self._in_head and tag == "title":
                 self._in_title = False
-                self.metadata['title'] = self._data_buffer
-            elif tag == 'body':
+                self.metadata["title"] = self._data_buffer
+            elif tag == "body":
                 self.body = self._data_buffer
                 self._in_body = False
                 self._in_top_level = True
             elif self._in_body:
-                self._data_buffer += '</{}>'.format(escape(tag))
+                self._data_buffer += "</{}>".format(escape(tag))
 
         def handle_startendtag(self, tag, attrs):
-            if tag == 'meta' and self._in_head:
+            if tag == "meta" and self._in_head:
                 self._handle_meta_tag(attrs)
             if self._in_body:
                 self._data_buffer += self.build_tag(tag, attrs, True)
 
         def handle_comment(self, data):
-            self._data_buffer += '<!--{}-->'.format(data)
+            self._data_buffer += "<!--{}-->".format(data)
 
         def handle_data(self, data):
             self._data_buffer += data
 
         def handle_entityref(self, data):
-            self._data_buffer += '&{};'.format(data)
+            self._data_buffer += "&{};".format(data)
 
         def handle_charref(self, data):
-            self._data_buffer += '&#{};'.format(data)
+            self._data_buffer += "&#{};".format(data)
 
         def build_tag(self, tag, attrs, close_tag):
-            result = '<{}'.format(escape(tag))
+            result = "<{}".format(escape(tag))
             for k, v in attrs:
-                result += ' ' + escape(k)
+                result += " " + escape(k)
                 if v is not None:
                     # If the attribute value contains a double quote, surround
                     # with single quotes, otherwise use double quotes.
@@ -435,33 +433,39 @@ class HTMLReader(BaseReader):
                     else:
                         result += '="{}"'.format(escape(v, quote=False))
             if close_tag:
-                return result + ' />'
-            return result + '>'
+                return result + " />"
+            return result + ">"
 
         def _handle_meta_tag(self, attrs):
-            name = self._attr_value(attrs, 'name')
+            name = self._attr_value(attrs, "name")
             if name is None:
                 attr_list = ['{}="{}"'.format(k, v) for k, v in attrs]
-                attr_serialized = ', '.join(attr_list)
-                logger.warning("Meta tag in file %s does not have a 'name' "
-                               "attribute, skipping. Attributes: %s",
-                               self._filename, attr_serialized)
+                attr_serialized = ", ".join(attr_list)
+                logger.warning(
+                    "Meta tag in file %s does not have a 'name' "
+                    "attribute, skipping. Attributes: %s",
+                    self._filename,
+                    attr_serialized,
+                )
                 return
             name = name.lower()
-            contents = self._attr_value(attrs, 'content', '')
+            contents = self._attr_value(attrs, "content", "")
             if not contents:
-                contents = self._attr_value(attrs, 'contents', '')
+                contents = self._attr_value(attrs, "contents", "")
                 if contents:
                     logger.warning(
                         "Meta tag attribute 'contents' used in file %s, should"
                         " be changed to 'content'",
                         self._filename,
-                        extra={'limit_msg': "Other files have meta tag "
-                                            "attribute 'contents' that should "
-                                            "be changed to 'content'"})
+                        extra={
+                            "limit_msg": "Other files have meta tag "
+                            "attribute 'contents' that should "
+                            "be changed to 'content'"
+                        },
+                    )
 
-            if name == 'keywords':
-                name = 'tags'
+            if name == "keywords":
+                name = "tags"
 
             if name in self.metadata:
                 # if this metadata already exists (i.e. a previous tag with the
@@ -501,22 +505,23 @@ class Readers(FileStampDataCacher):
 
     """
 
-    def __init__(self, settings=None, cache_name=''):
+    def __init__(self, settings=None, cache_name=""):
         self.settings = settings or {}
         self.readers = {}
         self.reader_classes = {}
 
         for cls in [BaseReader] + BaseReader.__subclasses__():
             if not cls.enabled:
-                logger.debug('Missing dependencies for %s',
-                             ', '.join(cls.file_extensions))
+                logger.debug(
+                    "Missing dependencies for %s", ", ".join(cls.file_extensions)
+                )
                 continue
 
             for ext in cls.file_extensions:
                 self.reader_classes[ext] = cls
 
-        if self.settings['READERS']:
-            self.reader_classes.update(self.settings['READERS'])
+        if self.settings["READERS"]:
+            self.reader_classes.update(self.settings["READERS"])
 
         signals.readers_init.send(self)
 
@@ -527,53 +532,67 @@ class Readers(FileStampDataCacher):
             self.readers[fmt] = reader_class(self.settings)
 
         # set up caching
-        cache_this_level = (cache_name != '' and
-                            self.settings['CONTENT_CACHING_LAYER'] == 'reader')
-        caching_policy = cache_this_level and self.settings['CACHE_CONTENT']
-        load_policy = cache_this_level and self.settings['LOAD_CONTENT_CACHE']
+        cache_this_level = (
+            cache_name != "" and self.settings["CONTENT_CACHING_LAYER"] == "reader"
+        )
+        caching_policy = cache_this_level and self.settings["CACHE_CONTENT"]
+        load_policy = cache_this_level and self.settings["LOAD_CONTENT_CACHE"]
         super().__init__(settings, cache_name, caching_policy, load_policy)
 
     @property
     def extensions(self):
         return self.readers.keys()
 
-    def read_file(self, base_path, path, content_class=Page, fmt=None,
-                  context=None, preread_signal=None, preread_sender=None,
-                  context_signal=None, context_sender=None):
+    def read_file(
+        self,
+        base_path,
+        path,
+        content_class=Page,
+        fmt=None,
+        context=None,
+        preread_signal=None,
+        preread_sender=None,
+        context_signal=None,
+        context_sender=None,
+    ):
         """Return a content object parsed with the given format."""
 
         path = os.path.abspath(os.path.join(base_path, path))
         source_path = posixize_path(os.path.relpath(path, base_path))
-        logger.debug(
-            'Read file %s -> %s',
-            source_path, content_class.__name__)
+        logger.debug("Read file %s -> %s", source_path, content_class.__name__)
 
         if not fmt:
             _, ext = os.path.splitext(os.path.basename(path))
             fmt = ext[1:]
 
         if fmt not in self.readers:
-            raise TypeError(
-                'Pelican does not know how to parse %s', path)
+            raise TypeError("Pelican does not know how to parse %s", path)
 
         if preread_signal:
-            logger.debug(
-                'Signal %s.send(%s)',
-                preread_signal.name, preread_sender)
+            logger.debug("Signal %s.send(%s)", preread_signal.name, preread_sender)
             preread_signal.send(preread_sender)
 
         reader = self.readers[fmt]
 
-        metadata = _filter_discardable_metadata(default_metadata(
-            settings=self.settings, process=reader.process_metadata))
-        metadata.update(path_metadata(
-            full_path=path, source_path=source_path,
-            settings=self.settings))
-        metadata.update(_filter_discardable_metadata(parse_path_metadata(
-            source_path=source_path, settings=self.settings,
-            process=reader.process_metadata)))
+        metadata = _filter_discardable_metadata(
+            default_metadata(settings=self.settings, process=reader.process_metadata)
+        )
+        metadata.update(
+            path_metadata(
+                full_path=path, source_path=source_path, settings=self.settings
+            )
+        )
+        metadata.update(
+            _filter_discardable_metadata(
+                parse_path_metadata(
+                    source_path=source_path,
+                    settings=self.settings,
+                    process=reader.process_metadata,
+                )
+            )
+        )
         reader_name = reader.__class__.__name__
-        metadata['reader'] = reader_name.replace('Reader', '').lower()
+        metadata["reader"] = reader_name.replace("Reader", "").lower()
 
         content, reader_metadata = self.get_cached_data(path, (None, None))
         if content is None:
@@ -587,14 +606,14 @@ class Readers(FileStampDataCacher):
             find_empty_alt(content, path)
 
         # eventually filter the content with typogrify if asked so
-        if self.settings['TYPOGRIFY']:
+        if self.settings["TYPOGRIFY"]:
             from typogrify.filters import typogrify
             import smartypants
 
-            typogrify_dashes = self.settings['TYPOGRIFY_DASHES']
-            if typogrify_dashes == 'oldschool':
+            typogrify_dashes = self.settings["TYPOGRIFY_DASHES"]
+            if typogrify_dashes == "oldschool":
                 smartypants.Attr.default = smartypants.Attr.set2
-            elif typogrify_dashes == 'oldschool_inverted':
+            elif typogrify_dashes == "oldschool_inverted":
                 smartypants.Attr.default = smartypants.Attr.set3
             else:
                 smartypants.Attr.default = smartypants.Attr.set1
@@ -608,31 +627,32 @@ class Readers(FileStampDataCacher):
             def typogrify_wrapper(text):
                 """Ensures ignore_tags feature is backward compatible"""
                 try:
-                    return typogrify(
-                        text,
-                        self.settings['TYPOGRIFY_IGNORE_TAGS'])
+                    return typogrify(text, self.settings["TYPOGRIFY_IGNORE_TAGS"])
                 except TypeError:
                     return typogrify(text)
 
             if content:
                 content = typogrify_wrapper(content)
 
-            if 'title' in metadata:
-                metadata['title'] = typogrify_wrapper(metadata['title'])
+            if "title" in metadata:
+                metadata["title"] = typogrify_wrapper(metadata["title"])
 
-            if 'summary' in metadata:
-                metadata['summary'] = typogrify_wrapper(metadata['summary'])
+            if "summary" in metadata:
+                metadata["summary"] = typogrify_wrapper(metadata["summary"])
 
         if context_signal:
             logger.debug(
-                'Signal %s.send(%s, <metadata>)',
-                context_signal.name,
-                context_sender)
+                "Signal %s.send(%s, <metadata>)", context_signal.name, context_sender
+            )
             context_signal.send(context_sender, metadata=metadata)
 
-        return content_class(content=content, metadata=metadata,
-                             settings=self.settings, source_path=path,
-                             context=context)
+        return content_class(
+            content=content,
+            metadata=metadata,
+            settings=self.settings,
+            source_path=path,
+            context=context,
+        )
 
 
 def find_empty_alt(content, path):
@@ -642,7 +662,8 @@ def find_empty_alt(content, path):
     as they are really likely to be accessibility flaws.
 
     """
-    imgs = re.compile(r"""
+    imgs = re.compile(
+        r"""
         (?:
             # src before alt
             <img
@@ -658,53 +679,57 @@ def find_empty_alt(content, path):
             [^\>]*
             src=(['"])(.*?)\5
         )
-        """, re.X)
+        """,
+        re.X,
+    )
     for match in re.findall(imgs, content):
         logger.warning(
-            'Empty alt attribute for image %s in %s',
-            os.path.basename(match[1] + match[5]), path,
-            extra={'limit_msg': 'Other images have empty alt attributes'})
+            "Empty alt attribute for image %s in %s",
+            os.path.basename(match[1] + match[5]),
+            path,
+            extra={"limit_msg": "Other images have empty alt attributes"},
+        )
 
 
 def default_metadata(settings=None, process=None):
     metadata = {}
     if settings:
-        for name, value in dict(settings.get('DEFAULT_METADATA', {})).items():
+        for name, value in dict(settings.get("DEFAULT_METADATA", {})).items():
             if process:
                 value = process(name, value)
             metadata[name] = value
-        if 'DEFAULT_CATEGORY' in settings:
-            value = settings['DEFAULT_CATEGORY']
+        if "DEFAULT_CATEGORY" in settings:
+            value = settings["DEFAULT_CATEGORY"]
             if process:
-                value = process('category', value)
-            metadata['category'] = value
-        if settings.get('DEFAULT_DATE', None) and \
-           settings['DEFAULT_DATE'] != 'fs':
-            if isinstance(settings['DEFAULT_DATE'], str):
-                metadata['date'] = get_date(settings['DEFAULT_DATE'])
+                value = process("category", value)
+            metadata["category"] = value
+        if settings.get("DEFAULT_DATE", None) and settings["DEFAULT_DATE"] != "fs":
+            if isinstance(settings["DEFAULT_DATE"], str):
+                metadata["date"] = get_date(settings["DEFAULT_DATE"])
             else:
-                metadata['date'] = datetime.datetime(*settings['DEFAULT_DATE'])
+                metadata["date"] = datetime.datetime(*settings["DEFAULT_DATE"])
     return metadata
 
 
 def path_metadata(full_path, source_path, settings=None):
     metadata = {}
     if settings:
-        if settings.get('DEFAULT_DATE', None) == 'fs':
-            metadata['date'] = datetime.datetime.fromtimestamp(
-                os.stat(full_path).st_mtime)
-            metadata['modified'] = metadata['date']
+        if settings.get("DEFAULT_DATE", None) == "fs":
+            metadata["date"] = datetime.datetime.fromtimestamp(
+                os.stat(full_path).st_mtime
+            )
+            metadata["modified"] = metadata["date"]
 
         # Apply EXTRA_PATH_METADATA for the source path and the paths of any
         # parent directories. Sorting EPM first ensures that the most specific
         # path wins conflicts.
 
-        epm = settings.get('EXTRA_PATH_METADATA', {})
+        epm = settings.get("EXTRA_PATH_METADATA", {})
         for path, meta in sorted(epm.items()):
             # Enforce a trailing slash when checking for parent directories.
             # This prevents false positives when one file or directory's name
             # is a prefix of another's.
-            dirpath = posixize_path(os.path.join(path, ''))
+            dirpath = posixize_path(os.path.join(path, ""))
             if source_path == path or source_path.startswith(dirpath):
                 metadata.update(meta)
 
@@ -736,11 +761,10 @@ def parse_path_metadata(source_path, settings=None, process=None):
     subdir = os.path.basename(dirname)
     if settings:
         checks = []
-        for key, data in [('FILENAME_METADATA', base),
-                          ('PATH_METADATA', source_path)]:
+        for key, data in [("FILENAME_METADATA", base), ("PATH_METADATA", source_path)]:
             checks.append((settings.get(key, None), data))
-        if settings.get('USE_FOLDER_AS_CATEGORY', None):
-            checks.append(('(?P<category>.*)', subdir))
+        if settings.get("USE_FOLDER_AS_CATEGORY", None):
+            checks.append(("(?P<category>.*)", subdir))
         for regexp, data in checks:
             if regexp and data:
                 match = re.match(regexp, data)
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index 500c8578..0a549424 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -11,26 +11,26 @@ import pelican.settings as pys
 
 
 class Pygments(Directive):
-    """ Source code syntax highlighting.
-    """
+    """Source code syntax highlighting."""
+
     required_arguments = 1
     optional_arguments = 0
     final_argument_whitespace = True
     option_spec = {
-        'anchorlinenos': directives.flag,
-        'classprefix': directives.unchanged,
-        'hl_lines': directives.unchanged,
-        'lineanchors': directives.unchanged,
-        'linenos': directives.unchanged,
-        'linenospecial': directives.nonnegative_int,
-        'linenostart': directives.nonnegative_int,
-        'linenostep': directives.nonnegative_int,
-        'lineseparator': directives.unchanged,
-        'linespans': directives.unchanged,
-        'nobackground': directives.flag,
-        'nowrap': directives.flag,
-        'tagsfile': directives.unchanged,
-        'tagurlformat': directives.unchanged,
+        "anchorlinenos": directives.flag,
+        "classprefix": directives.unchanged,
+        "hl_lines": directives.unchanged,
+        "lineanchors": directives.unchanged,
+        "linenos": directives.unchanged,
+        "linenospecial": directives.nonnegative_int,
+        "linenostart": directives.nonnegative_int,
+        "linenostep": directives.nonnegative_int,
+        "lineseparator": directives.unchanged,
+        "linespans": directives.unchanged,
+        "nobackground": directives.flag,
+        "nowrap": directives.flag,
+        "tagsfile": directives.unchanged,
+        "tagurlformat": directives.unchanged,
     }
     has_content = True
 
@@ -49,28 +49,30 @@ class Pygments(Directive):
                 if k not in self.options:
                     self.options[k] = v
 
-        if ('linenos' in self.options and
-                self.options['linenos'] not in ('table', 'inline')):
-            if self.options['linenos'] == 'none':
-                self.options.pop('linenos')
+        if "linenos" in self.options and self.options["linenos"] not in (
+            "table",
+            "inline",
+        ):
+            if self.options["linenos"] == "none":
+                self.options.pop("linenos")
             else:
-                self.options['linenos'] = 'table'
+                self.options["linenos"] = "table"
 
-        for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
+        for flag in ("nowrap", "nobackground", "anchorlinenos"):
             if flag in self.options:
                 self.options[flag] = True
 
         # noclasses should already default to False, but just in case...
         formatter = HtmlFormatter(noclasses=False, **self.options)
-        parsed = highlight('\n'.join(self.content), lexer, formatter)
-        return [nodes.raw('', parsed, format='html')]
+        parsed = highlight("\n".join(self.content), lexer, formatter)
+        return [nodes.raw("", parsed, format="html")]
 
 
-directives.register_directive('code-block', Pygments)
-directives.register_directive('sourcecode', Pygments)
+directives.register_directive("code-block", Pygments)
+directives.register_directive("sourcecode", Pygments)
 
 
-_abbr_re = re.compile(r'\((.*)\)$', re.DOTALL)
+_abbr_re = re.compile(r"\((.*)\)$", re.DOTALL)
 
 
 class abbreviation(nodes.Inline, nodes.TextElement):
@@ -82,9 +84,9 @@ def abbr_role(typ, rawtext, text, lineno, inliner, options={}, content=[]):
     m = _abbr_re.search(text)
     if m is None:
         return [abbreviation(text, text)], []
-    abbr = text[:m.start()].strip()
+    abbr = text[: m.start()].strip()
     expl = m.group(1)
     return [abbreviation(abbr, abbr, explanation=expl)], []
 
 
-roles.register_local_role('abbr', abbr_role)
+roles.register_local_role("abbr", abbr_role)
diff --git a/pelican/server.py b/pelican/server.py
index 913c3761..61729bf1 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -14,38 +14,47 @@ except ImportError:
 
 from pelican.log import console  # noqa: F401
 from pelican.log import init as init_logging
+
 logger = logging.getLogger(__name__)
 
 
 def parse_arguments():
     parser = argparse.ArgumentParser(
-        description='Pelican Development Server',
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter
+        description="Pelican Development Server",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
+    parser.add_argument(
+        "port", default=8000, type=int, nargs="?", help="Port to Listen On"
+    )
+    parser.add_argument("server", default="", nargs="?", help="Interface to Listen On")
+    parser.add_argument("--ssl", action="store_true", help="Activate SSL listener")
+    parser.add_argument(
+        "--cert",
+        default="./cert.pem",
+        nargs="?",
+        help="Path to certificate file. " + "Relative to current directory",
+    )
+    parser.add_argument(
+        "--key",
+        default="./key.pem",
+        nargs="?",
+        help="Path to certificate key file. " + "Relative to current directory",
+    )
+    parser.add_argument(
+        "--path",
+        default=".",
+        help="Path to pelican source directory to serve. "
+        + "Relative to current directory",
     )
-    parser.add_argument("port", default=8000, type=int, nargs="?",
-                        help="Port to Listen On")
-    parser.add_argument("server", default="", nargs="?",
-                        help="Interface to Listen On")
-    parser.add_argument('--ssl', action="store_true",
-                        help='Activate SSL listener')
-    parser.add_argument('--cert', default="./cert.pem", nargs="?",
-                        help='Path to certificate file. ' +
-                        'Relative to current directory')
-    parser.add_argument('--key', default="./key.pem", nargs="?",
-                        help='Path to certificate key file. ' +
-                        'Relative to current directory')
-    parser.add_argument('--path', default=".",
-                        help='Path to pelican source directory to serve. ' +
-                        'Relative to current directory')
     return parser.parse_args()
 
 
 class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
-    SUFFIXES = ['.html', '/index.html', '/', '']
+    SUFFIXES = [".html", "/index.html", "/", ""]
 
     extensions_map = {
         **server.SimpleHTTPRequestHandler.extensions_map,
-        ** {
+        **{
             # web fonts
             ".oft": "font/oft",
             ".sfnt": "font/sfnt",
@@ -57,13 +66,13 @@ class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
 
     def translate_path(self, path):
         # abandon query parameters
-        path = path.split('?', 1)[0]
-        path = path.split('#', 1)[0]
+        path = path.split("?", 1)[0]
+        path = path.split("#", 1)[0]
         # Don't forget explicit trailing slash when normalizing. Issue17324
-        trailing_slash = path.rstrip().endswith('/')
+        trailing_slash = path.rstrip().endswith("/")
         path = urllib.parse.unquote(path)
         path = posixpath.normpath(path)
-        words = path.split('/')
+        words = path.split("/")
         words = filter(None, words)
         path = self.base_path
         for word in words:
@@ -72,12 +81,12 @@ class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
                 continue
             path = os.path.join(path, word)
         if trailing_slash:
-            path += '/'
+            path += "/"
         return path
 
     def do_GET(self):
         # cut off a query string
-        original_path = self.path.split('?', 1)[0]
+        original_path = self.path.split("?", 1)[0]
         # try to find file
         self.path = self.get_path_that_exists(original_path)
 
@@ -88,12 +97,12 @@ class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
 
     def get_path_that_exists(self, original_path):
         # Try to strip trailing slash
-        trailing_slash = original_path.endswith('/')
-        original_path = original_path.rstrip('/')
+        trailing_slash = original_path.endswith("/")
+        original_path = original_path.rstrip("/")
         # Try to detect file by applying various suffixes
         tries = []
         for suffix in self.SUFFIXES:
-            if not trailing_slash and suffix == '/':
+            if not trailing_slash and suffix == "/":
                 # if original request does not have trailing slash, skip the '/' suffix
                 # so that base class can redirect if needed
                 continue
@@ -101,18 +110,17 @@ class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
             if os.path.exists(self.translate_path(path)):
                 return path
             tries.append(path)
-        logger.warning("Unable to find `%s` or variations:\n%s",
-                       original_path,
-                       '\n'.join(tries))
+        logger.warning(
+            "Unable to find `%s` or variations:\n%s", original_path, "\n".join(tries)
+        )
         return None
 
     def guess_type(self, path):
-        """Guess at the mime type for the specified file.
-        """
+        """Guess at the mime type for the specified file."""
         mimetype = server.SimpleHTTPRequestHandler.guess_type(self, path)
 
         # If the default guess is too generic, try the python-magic library
-        if mimetype == 'application/octet-stream' and magic_from_file:
+        if mimetype == "application/octet-stream" and magic_from_file:
             mimetype = magic_from_file(path, mime=True)
 
         return mimetype
@@ -127,31 +135,33 @@ class RootedHTTPServer(server.HTTPServer):
         self.RequestHandlerClass.base_path = base_path
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     init_logging(level=logging.INFO)
-    logger.warning("'python -m pelican.server' is deprecated.\nThe "
-                   "Pelican development server should be run via "
-                   "'pelican --listen' or 'pelican -l'.\nThis can be combined "
-                   "with regeneration as 'pelican -lr'.\nRerun 'pelican-"
-                   "quickstart' to get new Makefile and tasks.py files.")
+    logger.warning(
+        "'python -m pelican.server' is deprecated.\nThe "
+        "Pelican development server should be run via "
+        "'pelican --listen' or 'pelican -l'.\nThis can be combined "
+        "with regeneration as 'pelican -lr'.\nRerun 'pelican-"
+        "quickstart' to get new Makefile and tasks.py files."
+    )
     args = parse_arguments()
     RootedHTTPServer.allow_reuse_address = True
     try:
         httpd = RootedHTTPServer(
-            args.path, (args.server, args.port), ComplexHTTPRequestHandler)
+            args.path, (args.server, args.port), ComplexHTTPRequestHandler
+        )
         if args.ssl:
             httpd.socket = ssl.wrap_socket(
-                httpd.socket, keyfile=args.key,
-                certfile=args.cert, server_side=True)
+                httpd.socket, keyfile=args.key, certfile=args.cert, server_side=True
+            )
     except ssl.SSLError as e:
-        logger.error("Couldn't open certificate file %s or key file %s",
-                     args.cert, args.key)
-        logger.error("Could not listen on port %s, server %s.",
-                     args.port, args.server)
-        sys.exit(getattr(e, 'exitcode', 1))
+        logger.error(
+            "Couldn't open certificate file %s or key file %s", args.cert, args.key
+        )
+        logger.error("Could not listen on port %s, server %s.", args.port, args.server)
+        sys.exit(getattr(e, "exitcode", 1))
 
-    logger.info("Serving at port %s, server %s.",
-                args.port, args.server)
+    logger.info("Serving at port %s, server %s.", args.port, args.server)
     try:
         httpd.serve_forever()
     except KeyboardInterrupt:
diff --git a/pelican/settings.py b/pelican/settings.py
index 9a54b2a6..2c84b6f0 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -22,150 +22,157 @@ def load_source(name, path):
 
 logger = logging.getLogger(__name__)
 
-DEFAULT_THEME = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                             'themes', 'notmyidea')
+DEFAULT_THEME = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), "themes", "notmyidea"
+)
 DEFAULT_CONFIG = {
-    'PATH': os.curdir,
-    'ARTICLE_PATHS': [''],
-    'ARTICLE_EXCLUDES': [],
-    'PAGE_PATHS': ['pages'],
-    'PAGE_EXCLUDES': [],
-    'THEME': DEFAULT_THEME,
-    'OUTPUT_PATH': 'output',
-    'READERS': {},
-    'STATIC_PATHS': ['images'],
-    'STATIC_EXCLUDES': [],
-    'STATIC_EXCLUDE_SOURCES': True,
-    'THEME_STATIC_DIR': 'theme',
-    'THEME_STATIC_PATHS': ['static', ],
-    'FEED_ALL_ATOM': 'feeds/all.atom.xml',
-    'CATEGORY_FEED_ATOM': 'feeds/{slug}.atom.xml',
-    'AUTHOR_FEED_ATOM': 'feeds/{slug}.atom.xml',
-    'AUTHOR_FEED_RSS': 'feeds/{slug}.rss.xml',
-    'TRANSLATION_FEED_ATOM': 'feeds/all-{lang}.atom.xml',
-    'FEED_MAX_ITEMS': 100,
-    'RSS_FEED_SUMMARY_ONLY': True,
-    'SITEURL': '',
-    'SITENAME': 'A Pelican Blog',
-    'DISPLAY_PAGES_ON_MENU': True,
-    'DISPLAY_CATEGORIES_ON_MENU': True,
-    'DOCUTILS_SETTINGS': {},
-    'OUTPUT_SOURCES': False,
-    'OUTPUT_SOURCES_EXTENSION': '.text',
-    'USE_FOLDER_AS_CATEGORY': True,
-    'DEFAULT_CATEGORY': 'misc',
-    'WITH_FUTURE_DATES': True,
-    'CSS_FILE': 'main.css',
-    'NEWEST_FIRST_ARCHIVES': True,
-    'REVERSE_CATEGORY_ORDER': False,
-    'DELETE_OUTPUT_DIRECTORY': False,
-    'OUTPUT_RETENTION': [],
-    'INDEX_SAVE_AS': 'index.html',
-    'ARTICLE_URL': '{slug}.html',
-    'ARTICLE_SAVE_AS': '{slug}.html',
-    'ARTICLE_ORDER_BY': 'reversed-date',
-    'ARTICLE_LANG_URL': '{slug}-{lang}.html',
-    'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html',
-    'DRAFT_URL': 'drafts/{slug}.html',
-    'DRAFT_SAVE_AS': 'drafts/{slug}.html',
-    'DRAFT_LANG_URL': 'drafts/{slug}-{lang}.html',
-    'DRAFT_LANG_SAVE_AS': 'drafts/{slug}-{lang}.html',
-    'PAGE_URL': 'pages/{slug}.html',
-    'PAGE_SAVE_AS': 'pages/{slug}.html',
-    'PAGE_ORDER_BY': 'basename',
-    'PAGE_LANG_URL': 'pages/{slug}-{lang}.html',
-    'PAGE_LANG_SAVE_AS': 'pages/{slug}-{lang}.html',
-    'DRAFT_PAGE_URL': 'drafts/pages/{slug}.html',
-    'DRAFT_PAGE_SAVE_AS': 'drafts/pages/{slug}.html',
-    'DRAFT_PAGE_LANG_URL': 'drafts/pages/{slug}-{lang}.html',
-    'DRAFT_PAGE_LANG_SAVE_AS': 'drafts/pages/{slug}-{lang}.html',
-    'STATIC_URL': '{path}',
-    'STATIC_SAVE_AS': '{path}',
-    'STATIC_CREATE_LINKS': False,
-    'STATIC_CHECK_IF_MODIFIED': False,
-    'CATEGORY_URL': 'category/{slug}.html',
-    'CATEGORY_SAVE_AS': 'category/{slug}.html',
-    'TAG_URL': 'tag/{slug}.html',
-    'TAG_SAVE_AS': 'tag/{slug}.html',
-    'AUTHOR_URL': 'author/{slug}.html',
-    'AUTHOR_SAVE_AS': 'author/{slug}.html',
-    'PAGINATION_PATTERNS': [
-        (1, '{name}{extension}', '{name}{extension}'),
-        (2, '{name}{number}{extension}', '{name}{number}{extension}'),
+    "PATH": os.curdir,
+    "ARTICLE_PATHS": [""],
+    "ARTICLE_EXCLUDES": [],
+    "PAGE_PATHS": ["pages"],
+    "PAGE_EXCLUDES": [],
+    "THEME": DEFAULT_THEME,
+    "OUTPUT_PATH": "output",
+    "READERS": {},
+    "STATIC_PATHS": ["images"],
+    "STATIC_EXCLUDES": [],
+    "STATIC_EXCLUDE_SOURCES": True,
+    "THEME_STATIC_DIR": "theme",
+    "THEME_STATIC_PATHS": [
+        "static",
     ],
-    'YEAR_ARCHIVE_URL': '',
-    'YEAR_ARCHIVE_SAVE_AS': '',
-    'MONTH_ARCHIVE_URL': '',
-    'MONTH_ARCHIVE_SAVE_AS': '',
-    'DAY_ARCHIVE_URL': '',
-    'DAY_ARCHIVE_SAVE_AS': '',
-    'RELATIVE_URLS': False,
-    'DEFAULT_LANG': 'en',
-    'ARTICLE_TRANSLATION_ID': 'slug',
-    'PAGE_TRANSLATION_ID': 'slug',
-    'DIRECT_TEMPLATES': ['index', 'tags', 'categories', 'authors', 'archives'],
-    'THEME_TEMPLATES_OVERRIDES': [],
-    'PAGINATED_TEMPLATES': {'index': None, 'tag': None, 'category': None,
-                            'author': None},
-    'PELICAN_CLASS': 'pelican.Pelican',
-    'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
-    'DATE_FORMATS': {},
-    'MARKDOWN': {
-        'extension_configs': {
-            'markdown.extensions.codehilite': {'css_class': 'highlight'},
-            'markdown.extensions.extra': {},
-            'markdown.extensions.meta': {},
+    "FEED_ALL_ATOM": "feeds/all.atom.xml",
+    "CATEGORY_FEED_ATOM": "feeds/{slug}.atom.xml",
+    "AUTHOR_FEED_ATOM": "feeds/{slug}.atom.xml",
+    "AUTHOR_FEED_RSS": "feeds/{slug}.rss.xml",
+    "TRANSLATION_FEED_ATOM": "feeds/all-{lang}.atom.xml",
+    "FEED_MAX_ITEMS": 100,
+    "RSS_FEED_SUMMARY_ONLY": True,
+    "SITEURL": "",
+    "SITENAME": "A Pelican Blog",
+    "DISPLAY_PAGES_ON_MENU": True,
+    "DISPLAY_CATEGORIES_ON_MENU": True,
+    "DOCUTILS_SETTINGS": {},
+    "OUTPUT_SOURCES": False,
+    "OUTPUT_SOURCES_EXTENSION": ".text",
+    "USE_FOLDER_AS_CATEGORY": True,
+    "DEFAULT_CATEGORY": "misc",
+    "WITH_FUTURE_DATES": True,
+    "CSS_FILE": "main.css",
+    "NEWEST_FIRST_ARCHIVES": True,
+    "REVERSE_CATEGORY_ORDER": False,
+    "DELETE_OUTPUT_DIRECTORY": False,
+    "OUTPUT_RETENTION": [],
+    "INDEX_SAVE_AS": "index.html",
+    "ARTICLE_URL": "{slug}.html",
+    "ARTICLE_SAVE_AS": "{slug}.html",
+    "ARTICLE_ORDER_BY": "reversed-date",
+    "ARTICLE_LANG_URL": "{slug}-{lang}.html",
+    "ARTICLE_LANG_SAVE_AS": "{slug}-{lang}.html",
+    "DRAFT_URL": "drafts/{slug}.html",
+    "DRAFT_SAVE_AS": "drafts/{slug}.html",
+    "DRAFT_LANG_URL": "drafts/{slug}-{lang}.html",
+    "DRAFT_LANG_SAVE_AS": "drafts/{slug}-{lang}.html",
+    "PAGE_URL": "pages/{slug}.html",
+    "PAGE_SAVE_AS": "pages/{slug}.html",
+    "PAGE_ORDER_BY": "basename",
+    "PAGE_LANG_URL": "pages/{slug}-{lang}.html",
+    "PAGE_LANG_SAVE_AS": "pages/{slug}-{lang}.html",
+    "DRAFT_PAGE_URL": "drafts/pages/{slug}.html",
+    "DRAFT_PAGE_SAVE_AS": "drafts/pages/{slug}.html",
+    "DRAFT_PAGE_LANG_URL": "drafts/pages/{slug}-{lang}.html",
+    "DRAFT_PAGE_LANG_SAVE_AS": "drafts/pages/{slug}-{lang}.html",
+    "STATIC_URL": "{path}",
+    "STATIC_SAVE_AS": "{path}",
+    "STATIC_CREATE_LINKS": False,
+    "STATIC_CHECK_IF_MODIFIED": False,
+    "CATEGORY_URL": "category/{slug}.html",
+    "CATEGORY_SAVE_AS": "category/{slug}.html",
+    "TAG_URL": "tag/{slug}.html",
+    "TAG_SAVE_AS": "tag/{slug}.html",
+    "AUTHOR_URL": "author/{slug}.html",
+    "AUTHOR_SAVE_AS": "author/{slug}.html",
+    "PAGINATION_PATTERNS": [
+        (1, "{name}{extension}", "{name}{extension}"),
+        (2, "{name}{number}{extension}", "{name}{number}{extension}"),
+    ],
+    "YEAR_ARCHIVE_URL": "",
+    "YEAR_ARCHIVE_SAVE_AS": "",
+    "MONTH_ARCHIVE_URL": "",
+    "MONTH_ARCHIVE_SAVE_AS": "",
+    "DAY_ARCHIVE_URL": "",
+    "DAY_ARCHIVE_SAVE_AS": "",
+    "RELATIVE_URLS": False,
+    "DEFAULT_LANG": "en",
+    "ARTICLE_TRANSLATION_ID": "slug",
+    "PAGE_TRANSLATION_ID": "slug",
+    "DIRECT_TEMPLATES": ["index", "tags", "categories", "authors", "archives"],
+    "THEME_TEMPLATES_OVERRIDES": [],
+    "PAGINATED_TEMPLATES": {
+        "index": None,
+        "tag": None,
+        "category": None,
+        "author": None,
+    },
+    "PELICAN_CLASS": "pelican.Pelican",
+    "DEFAULT_DATE_FORMAT": "%a %d %B %Y",
+    "DATE_FORMATS": {},
+    "MARKDOWN": {
+        "extension_configs": {
+            "markdown.extensions.codehilite": {"css_class": "highlight"},
+            "markdown.extensions.extra": {},
+            "markdown.extensions.meta": {},
         },
-        'output_format': 'html5',
+        "output_format": "html5",
     },
-    'JINJA_FILTERS': {},
-    'JINJA_GLOBALS': {},
-    'JINJA_TESTS': {},
-    'JINJA_ENVIRONMENT': {
-        'trim_blocks': True,
-        'lstrip_blocks': True,
-        'extensions': [],
+    "JINJA_FILTERS": {},
+    "JINJA_GLOBALS": {},
+    "JINJA_TESTS": {},
+    "JINJA_ENVIRONMENT": {
+        "trim_blocks": True,
+        "lstrip_blocks": True,
+        "extensions": [],
     },
-    'LOG_FILTER': [],
-    'LOCALE': [''],  # defaults to user locale
-    'DEFAULT_PAGINATION': False,
-    'DEFAULT_ORPHANS': 0,
-    'DEFAULT_METADATA': {},
-    'FILENAME_METADATA': r'(?P<date>\d{4}-\d{2}-\d{2}).*',
-    'PATH_METADATA': '',
-    'EXTRA_PATH_METADATA': {},
-    'ARTICLE_PERMALINK_STRUCTURE': '',
-    'TYPOGRIFY': False,
-    'TYPOGRIFY_IGNORE_TAGS': [],
-    'TYPOGRIFY_DASHES': 'default',
-    'SUMMARY_END_SUFFIX': '…',
-    'SUMMARY_MAX_LENGTH': 50,
-    'PLUGIN_PATHS': [],
-    'PLUGINS': None,
-    'PYGMENTS_RST_OPTIONS': {},
-    'TEMPLATE_PAGES': {},
-    'TEMPLATE_EXTENSIONS': ['.html'],
-    'IGNORE_FILES': ['.#*'],
-    'SLUG_REGEX_SUBSTITUTIONS': [
-        (r'[^\w\s-]', ''),  # remove non-alphabetical/whitespace/'-' chars
-        (r'(?u)\A\s*', ''),  # strip leading whitespace
-        (r'(?u)\s*\Z', ''),  # strip trailing whitespace
-        (r'[-\s]+', '-'),  # reduce multiple whitespace or '-' to single '-'
+    "LOG_FILTER": [],
+    "LOCALE": [""],  # defaults to user locale
+    "DEFAULT_PAGINATION": False,
+    "DEFAULT_ORPHANS": 0,
+    "DEFAULT_METADATA": {},
+    "FILENAME_METADATA": r"(?P<date>\d{4}-\d{2}-\d{2}).*",
+    "PATH_METADATA": "",
+    "EXTRA_PATH_METADATA": {},
+    "ARTICLE_PERMALINK_STRUCTURE": "",
+    "TYPOGRIFY": False,
+    "TYPOGRIFY_IGNORE_TAGS": [],
+    "TYPOGRIFY_DASHES": "default",
+    "SUMMARY_END_SUFFIX": "…",
+    "SUMMARY_MAX_LENGTH": 50,
+    "PLUGIN_PATHS": [],
+    "PLUGINS": None,
+    "PYGMENTS_RST_OPTIONS": {},
+    "TEMPLATE_PAGES": {},
+    "TEMPLATE_EXTENSIONS": [".html"],
+    "IGNORE_FILES": [".#*"],
+    "SLUG_REGEX_SUBSTITUTIONS": [
+        (r"[^\w\s-]", ""),  # remove non-alphabetical/whitespace/'-' chars
+        (r"(?u)\A\s*", ""),  # strip leading whitespace
+        (r"(?u)\s*\Z", ""),  # strip trailing whitespace
+        (r"[-\s]+", "-"),  # reduce multiple whitespace or '-' to single '-'
     ],
-    'INTRASITE_LINK_REGEX': '[{|](?P<what>.*?)[|}]',
-    'SLUGIFY_SOURCE': 'title',
-    'SLUGIFY_USE_UNICODE': False,
-    'SLUGIFY_PRESERVE_CASE': False,
-    'CACHE_CONTENT': False,
-    'CONTENT_CACHING_LAYER': 'reader',
-    'CACHE_PATH': 'cache',
-    'GZIP_CACHE': True,
-    'CHECK_MODIFIED_METHOD': 'mtime',
-    'LOAD_CONTENT_CACHE': False,
-    'WRITE_SELECTED': [],
-    'FORMATTED_FIELDS': ['summary'],
-    'PORT': 8000,
-    'BIND': '127.0.0.1',
+    "INTRASITE_LINK_REGEX": "[{|](?P<what>.*?)[|}]",
+    "SLUGIFY_SOURCE": "title",
+    "SLUGIFY_USE_UNICODE": False,
+    "SLUGIFY_PRESERVE_CASE": False,
+    "CACHE_CONTENT": False,
+    "CONTENT_CACHING_LAYER": "reader",
+    "CACHE_PATH": "cache",
+    "GZIP_CACHE": True,
+    "CHECK_MODIFIED_METHOD": "mtime",
+    "LOAD_CONTENT_CACHE": False,
+    "WRITE_SELECTED": [],
+    "FORMATTED_FIELDS": ["summary"],
+    "PORT": 8000,
+    "BIND": "127.0.0.1",
 }
 
 PYGMENTS_RST_OPTIONS = None
@@ -185,20 +192,23 @@ def read_settings(path=None, override=None):
         def getabs(maybe_relative, base_path=path):
             if isabs(maybe_relative):
                 return maybe_relative
-            return os.path.abspath(os.path.normpath(os.path.join(
-                os.path.dirname(base_path), maybe_relative)))
+            return os.path.abspath(
+                os.path.normpath(
+                    os.path.join(os.path.dirname(base_path), maybe_relative)
+                )
+            )
 
-        for p in ['PATH', 'OUTPUT_PATH', 'THEME', 'CACHE_PATH']:
+        for p in ["PATH", "OUTPUT_PATH", "THEME", "CACHE_PATH"]:
             if settings.get(p) is not None:
                 absp = getabs(settings[p])
                 # THEME may be a name rather than a path
-                if p != 'THEME' or os.path.exists(absp):
+                if p != "THEME" or os.path.exists(absp):
                     settings[p] = absp
 
-        if settings.get('PLUGIN_PATHS') is not None:
-            settings['PLUGIN_PATHS'] = [getabs(pluginpath)
-                                        for pluginpath
-                                        in settings['PLUGIN_PATHS']]
+        if settings.get("PLUGIN_PATHS") is not None:
+            settings["PLUGIN_PATHS"] = [
+                getabs(pluginpath) for pluginpath in settings["PLUGIN_PATHS"]
+            ]
 
     settings = dict(copy.deepcopy(DEFAULT_CONFIG), **settings)
     settings = configure_settings(settings)
@@ -208,7 +218,7 @@ def read_settings(path=None, override=None):
     # variable here that we'll import from within Pygments.run (see
     # rstdirectives.py) to see what the user defaults were.
     global PYGMENTS_RST_OPTIONS
-    PYGMENTS_RST_OPTIONS = settings.get('PYGMENTS_RST_OPTIONS', None)
+    PYGMENTS_RST_OPTIONS = settings.get("PYGMENTS_RST_OPTIONS", None)
     return settings
 
 
@@ -217,8 +227,7 @@ def get_settings_from_module(module=None):
 
     context = {}
     if module is not None:
-        context.update(
-            (k, v) for k, v in inspect.getmembers(module) if k.isupper())
+        context.update((k, v) for k, v in inspect.getmembers(module) if k.isupper())
     return context
 
 
@@ -233,11 +242,12 @@ def get_settings_from_file(path):
 def get_jinja_environment(settings):
     """Sets the environment for Jinja"""
 
-    jinja_env = settings.setdefault('JINJA_ENVIRONMENT',
-                                    DEFAULT_CONFIG['JINJA_ENVIRONMENT'])
+    jinja_env = settings.setdefault(
+        "JINJA_ENVIRONMENT", DEFAULT_CONFIG["JINJA_ENVIRONMENT"]
+    )
 
     # Make sure we include the defaults if the user has set env variables
-    for key, value in DEFAULT_CONFIG['JINJA_ENVIRONMENT'].items():
+    for key, value in DEFAULT_CONFIG["JINJA_ENVIRONMENT"].items():
         if key not in jinja_env:
             jinja_env[key] = value
 
@@ -248,14 +258,14 @@ def _printf_s_to_format_field(printf_string, format_field):
     """Tries to replace %s with {format_field} in the provided printf_string.
     Raises ValueError in case of failure.
     """
-    TEST_STRING = 'PELICAN_PRINTF_S_DEPRECATION'
+    TEST_STRING = "PELICAN_PRINTF_S_DEPRECATION"
     expected = printf_string % TEST_STRING
 
-    result = printf_string.replace('{', '{{').replace('}', '}}') \
-        % '{{{}}}'.format(format_field)
+    result = printf_string.replace("{", "{{").replace("}", "}}") % "{{{}}}".format(
+        format_field
+    )
     if result.format(**{format_field: TEST_STRING}) != expected:
-        raise ValueError('Failed to safely replace %s with {{{}}}'.format(
-            format_field))
+        raise ValueError("Failed to safely replace %s with {{{}}}".format(format_field))
 
     return result
 
@@ -266,115 +276,140 @@ def handle_deprecated_settings(settings):
     """
 
     # PLUGIN_PATH -> PLUGIN_PATHS
-    if 'PLUGIN_PATH' in settings:
-        logger.warning('PLUGIN_PATH setting has been replaced by '
-                       'PLUGIN_PATHS, moving it to the new setting name.')
-        settings['PLUGIN_PATHS'] = settings['PLUGIN_PATH']
-        del settings['PLUGIN_PATH']
+    if "PLUGIN_PATH" in settings:
+        logger.warning(
+            "PLUGIN_PATH setting has been replaced by "
+            "PLUGIN_PATHS, moving it to the new setting name."
+        )
+        settings["PLUGIN_PATHS"] = settings["PLUGIN_PATH"]
+        del settings["PLUGIN_PATH"]
 
     # PLUGIN_PATHS: str -> [str]
-    if isinstance(settings.get('PLUGIN_PATHS'), str):
-        logger.warning("Defining PLUGIN_PATHS setting as string "
-                       "has been deprecated (should be a list)")
-        settings['PLUGIN_PATHS'] = [settings['PLUGIN_PATHS']]
+    if isinstance(settings.get("PLUGIN_PATHS"), str):
+        logger.warning(
+            "Defining PLUGIN_PATHS setting as string "
+            "has been deprecated (should be a list)"
+        )
+        settings["PLUGIN_PATHS"] = [settings["PLUGIN_PATHS"]]
 
     # JINJA_EXTENSIONS -> JINJA_ENVIRONMENT > extensions
-    if 'JINJA_EXTENSIONS' in settings:
-        logger.warning('JINJA_EXTENSIONS setting has been deprecated, '
-                       'moving it to JINJA_ENVIRONMENT setting.')
-        settings['JINJA_ENVIRONMENT']['extensions'] = \
-            settings['JINJA_EXTENSIONS']
-        del settings['JINJA_EXTENSIONS']
+    if "JINJA_EXTENSIONS" in settings:
+        logger.warning(
+            "JINJA_EXTENSIONS setting has been deprecated, "
+            "moving it to JINJA_ENVIRONMENT setting."
+        )
+        settings["JINJA_ENVIRONMENT"]["extensions"] = settings["JINJA_EXTENSIONS"]
+        del settings["JINJA_EXTENSIONS"]
 
     # {ARTICLE,PAGE}_DIR -> {ARTICLE,PAGE}_PATHS
-    for key in ['ARTICLE', 'PAGE']:
-        old_key = key + '_DIR'
-        new_key = key + '_PATHS'
+    for key in ["ARTICLE", "PAGE"]:
+        old_key = key + "_DIR"
+        new_key = key + "_PATHS"
         if old_key in settings:
             logger.warning(
-                'Deprecated setting %s, moving it to %s list',
-                old_key, new_key)
-            settings[new_key] = [settings[old_key]]   # also make a list
+                "Deprecated setting %s, moving it to %s list", old_key, new_key
+            )
+            settings[new_key] = [settings[old_key]]  # also make a list
             del settings[old_key]
 
     # EXTRA_TEMPLATES_PATHS -> THEME_TEMPLATES_OVERRIDES
-    if 'EXTRA_TEMPLATES_PATHS' in settings:
-        logger.warning('EXTRA_TEMPLATES_PATHS is deprecated use '
-                       'THEME_TEMPLATES_OVERRIDES instead.')
-        if ('THEME_TEMPLATES_OVERRIDES' in settings and
-                settings['THEME_TEMPLATES_OVERRIDES']):
+    if "EXTRA_TEMPLATES_PATHS" in settings:
+        logger.warning(
+            "EXTRA_TEMPLATES_PATHS is deprecated use "
+            "THEME_TEMPLATES_OVERRIDES instead."
+        )
+        if (
+            "THEME_TEMPLATES_OVERRIDES" in settings
+            and settings["THEME_TEMPLATES_OVERRIDES"]
+        ):
             raise Exception(
-                'Setting both EXTRA_TEMPLATES_PATHS and '
-                'THEME_TEMPLATES_OVERRIDES is not permitted. Please move to '
-                'only setting THEME_TEMPLATES_OVERRIDES.')
-        settings['THEME_TEMPLATES_OVERRIDES'] = \
-            settings['EXTRA_TEMPLATES_PATHS']
-        del settings['EXTRA_TEMPLATES_PATHS']
+                "Setting both EXTRA_TEMPLATES_PATHS and "
+                "THEME_TEMPLATES_OVERRIDES is not permitted. Please move to "
+                "only setting THEME_TEMPLATES_OVERRIDES."
+            )
+        settings["THEME_TEMPLATES_OVERRIDES"] = settings["EXTRA_TEMPLATES_PATHS"]
+        del settings["EXTRA_TEMPLATES_PATHS"]
 
     # MD_EXTENSIONS -> MARKDOWN
-    if 'MD_EXTENSIONS' in settings:
-        logger.warning('MD_EXTENSIONS is deprecated use MARKDOWN '
-                       'instead. Falling back to the default.')
-        settings['MARKDOWN'] = DEFAULT_CONFIG['MARKDOWN']
+    if "MD_EXTENSIONS" in settings:
+        logger.warning(
+            "MD_EXTENSIONS is deprecated use MARKDOWN "
+            "instead. Falling back to the default."
+        )
+        settings["MARKDOWN"] = DEFAULT_CONFIG["MARKDOWN"]
 
     # LESS_GENERATOR -> Webassets plugin
     # FILES_TO_COPY -> STATIC_PATHS, EXTRA_PATH_METADATA
     for old, new, doc in [
-            ('LESS_GENERATOR', 'the Webassets plugin', None),
-            ('FILES_TO_COPY', 'STATIC_PATHS and EXTRA_PATH_METADATA',
-                'https://github.com/getpelican/pelican/'
-                'blob/master/docs/settings.rst#path-metadata'),
+        ("LESS_GENERATOR", "the Webassets plugin", None),
+        (
+            "FILES_TO_COPY",
+            "STATIC_PATHS and EXTRA_PATH_METADATA",
+            "https://github.com/getpelican/pelican/"
+            "blob/master/docs/settings.rst#path-metadata",
+        ),
     ]:
         if old in settings:
-            message = 'The {} setting has been removed in favor of {}'.format(
-                old, new)
+            message = "The {} setting has been removed in favor of {}".format(old, new)
             if doc:
-                message += ', see {} for details'.format(doc)
+                message += ", see {} for details".format(doc)
             logger.warning(message)
 
     # PAGINATED_DIRECT_TEMPLATES -> PAGINATED_TEMPLATES
-    if 'PAGINATED_DIRECT_TEMPLATES' in settings:
-        message = 'The {} setting has been removed in favor of {}'.format(
-            'PAGINATED_DIRECT_TEMPLATES', 'PAGINATED_TEMPLATES')
+    if "PAGINATED_DIRECT_TEMPLATES" in settings:
+        message = "The {} setting has been removed in favor of {}".format(
+            "PAGINATED_DIRECT_TEMPLATES", "PAGINATED_TEMPLATES"
+        )
         logger.warning(message)
 
         # set PAGINATED_TEMPLATES
-        if 'PAGINATED_TEMPLATES' not in settings:
-            settings['PAGINATED_TEMPLATES'] = {
-                'tag': None, 'category': None, 'author': None}
+        if "PAGINATED_TEMPLATES" not in settings:
+            settings["PAGINATED_TEMPLATES"] = {
+                "tag": None,
+                "category": None,
+                "author": None,
+            }
 
-        for t in settings['PAGINATED_DIRECT_TEMPLATES']:
-            if t not in settings['PAGINATED_TEMPLATES']:
-                settings['PAGINATED_TEMPLATES'][t] = None
-        del settings['PAGINATED_DIRECT_TEMPLATES']
+        for t in settings["PAGINATED_DIRECT_TEMPLATES"]:
+            if t not in settings["PAGINATED_TEMPLATES"]:
+                settings["PAGINATED_TEMPLATES"][t] = None
+        del settings["PAGINATED_DIRECT_TEMPLATES"]
 
     # {SLUG,CATEGORY,TAG,AUTHOR}_SUBSTITUTIONS ->
     # {SLUG,CATEGORY,TAG,AUTHOR}_REGEX_SUBSTITUTIONS
-    url_settings_url = \
-        'http://docs.getpelican.com/en/latest/settings.html#url-settings'
-    flavours = {'SLUG', 'CATEGORY', 'TAG', 'AUTHOR'}
-    old_values = {f: settings[f + '_SUBSTITUTIONS']
-                  for f in flavours if f + '_SUBSTITUTIONS' in settings}
-    new_values = {f: settings[f + '_REGEX_SUBSTITUTIONS']
-                  for f in flavours if f + '_REGEX_SUBSTITUTIONS' in settings}
+    url_settings_url = "http://docs.getpelican.com/en/latest/settings.html#url-settings"
+    flavours = {"SLUG", "CATEGORY", "TAG", "AUTHOR"}
+    old_values = {
+        f: settings[f + "_SUBSTITUTIONS"]
+        for f in flavours
+        if f + "_SUBSTITUTIONS" in settings
+    }
+    new_values = {
+        f: settings[f + "_REGEX_SUBSTITUTIONS"]
+        for f in flavours
+        if f + "_REGEX_SUBSTITUTIONS" in settings
+    }
     if old_values and new_values:
         raise Exception(
-            'Setting both {new_key} and {old_key} (or variants thereof) is '
-            'not permitted. Please move to only setting {new_key}.'
-            .format(old_key='SLUG_SUBSTITUTIONS',
-                    new_key='SLUG_REGEX_SUBSTITUTIONS'))
+            "Setting both {new_key} and {old_key} (or variants thereof) is "
+            "not permitted. Please move to only setting {new_key}.".format(
+                old_key="SLUG_SUBSTITUTIONS", new_key="SLUG_REGEX_SUBSTITUTIONS"
+            )
+        )
     if old_values:
-        message = ('{} and variants thereof are deprecated and will be '
-                   'removed in the future. Please use {} and variants thereof '
-                   'instead. Check {}.'
-                   .format('SLUG_SUBSTITUTIONS', 'SLUG_REGEX_SUBSTITUTIONS',
-                           url_settings_url))
+        message = (
+            "{} and variants thereof are deprecated and will be "
+            "removed in the future. Please use {} and variants thereof "
+            "instead. Check {}.".format(
+                "SLUG_SUBSTITUTIONS", "SLUG_REGEX_SUBSTITUTIONS", url_settings_url
+            )
+        )
         logger.warning(message)
-        if old_values.get('SLUG'):
-            for f in {'CATEGORY', 'TAG'}:
+        if old_values.get("SLUG"):
+            for f in {"CATEGORY", "TAG"}:
                 if old_values.get(f):
-                    old_values[f] = old_values['SLUG'] + old_values[f]
-            old_values['AUTHOR'] = old_values.get('AUTHOR', [])
+                    old_values[f] = old_values["SLUG"] + old_values[f]
+            old_values["AUTHOR"] = old_values.get("AUTHOR", [])
         for f in flavours:
             if old_values.get(f) is not None:
                 regex_subs = []
@@ -387,120 +422,138 @@ def handle_deprecated_settings(settings):
                             replace = False
                     except ValueError:
                         src, dst = tpl
-                    regex_subs.append(
-                        (re.escape(src), dst.replace('\\', r'\\')))
+                    regex_subs.append((re.escape(src), dst.replace("\\", r"\\")))
 
                 if replace:
                     regex_subs += [
-                        (r'[^\w\s-]', ''),
-                        (r'(?u)\A\s*', ''),
-                        (r'(?u)\s*\Z', ''),
-                        (r'[-\s]+', '-'),
+                        (r"[^\w\s-]", ""),
+                        (r"(?u)\A\s*", ""),
+                        (r"(?u)\s*\Z", ""),
+                        (r"[-\s]+", "-"),
                     ]
                 else:
                     regex_subs += [
-                        (r'(?u)\A\s*', ''),
-                        (r'(?u)\s*\Z', ''),
+                        (r"(?u)\A\s*", ""),
+                        (r"(?u)\s*\Z", ""),
                     ]
-                settings[f + '_REGEX_SUBSTITUTIONS'] = regex_subs
-            settings.pop(f + '_SUBSTITUTIONS', None)
+                settings[f + "_REGEX_SUBSTITUTIONS"] = regex_subs
+            settings.pop(f + "_SUBSTITUTIONS", None)
 
     # `%s` -> '{slug}` or `{lang}` in FEED settings
-    for key in ['TRANSLATION_FEED_ATOM',
-                'TRANSLATION_FEED_RSS'
-                ]:
+    for key in ["TRANSLATION_FEED_ATOM", "TRANSLATION_FEED_RSS"]:
         if (
-            settings.get(key) and not isinstance(settings[key], Path)
-            and '%s' in settings[key]
+            settings.get(key)
+            and not isinstance(settings[key], Path)
+            and "%s" in settings[key]
         ):
-            logger.warning('%%s usage in %s is deprecated, use {lang} '
-                           'instead.', key)
+            logger.warning("%%s usage in %s is deprecated, use {lang} " "instead.", key)
             try:
-                settings[key] = _printf_s_to_format_field(
-                    settings[key], 'lang')
+                settings[key] = _printf_s_to_format_field(settings[key], "lang")
             except ValueError:
-                logger.warning('Failed to convert %%s to {lang} for %s. '
-                               'Falling back to default.', key)
+                logger.warning(
+                    "Failed to convert %%s to {lang} for %s. "
+                    "Falling back to default.",
+                    key,
+                )
                 settings[key] = DEFAULT_CONFIG[key]
-    for key in ['AUTHOR_FEED_ATOM',
-                'AUTHOR_FEED_RSS',
-                'CATEGORY_FEED_ATOM',
-                'CATEGORY_FEED_RSS',
-                'TAG_FEED_ATOM',
-                'TAG_FEED_RSS',
-                ]:
+    for key in [
+        "AUTHOR_FEED_ATOM",
+        "AUTHOR_FEED_RSS",
+        "CATEGORY_FEED_ATOM",
+        "CATEGORY_FEED_RSS",
+        "TAG_FEED_ATOM",
+        "TAG_FEED_RSS",
+    ]:
         if (
-            settings.get(key) and not isinstance(settings[key], Path)
-            and '%s' in settings[key]
+            settings.get(key)
+            and not isinstance(settings[key], Path)
+            and "%s" in settings[key]
         ):
-            logger.warning('%%s usage in %s is deprecated, use {slug} '
-                           'instead.', key)
+            logger.warning("%%s usage in %s is deprecated, use {slug} " "instead.", key)
             try:
-                settings[key] = _printf_s_to_format_field(
-                    settings[key], 'slug')
+                settings[key] = _printf_s_to_format_field(settings[key], "slug")
             except ValueError:
-                logger.warning('Failed to convert %%s to {slug} for %s. '
-                               'Falling back to default.', key)
+                logger.warning(
+                    "Failed to convert %%s to {slug} for %s. "
+                    "Falling back to default.",
+                    key,
+                )
                 settings[key] = DEFAULT_CONFIG[key]
 
     # CLEAN_URLS
-    if settings.get('CLEAN_URLS', False):
-        logger.warning('Found deprecated `CLEAN_URLS` in settings.'
-                       ' Modifying the following settings for the'
-                       ' same behaviour.')
+    if settings.get("CLEAN_URLS", False):
+        logger.warning(
+            "Found deprecated `CLEAN_URLS` in settings."
+            " Modifying the following settings for the"
+            " same behaviour."
+        )
 
-        settings['ARTICLE_URL'] = '{slug}/'
-        settings['ARTICLE_LANG_URL'] = '{slug}-{lang}/'
-        settings['PAGE_URL'] = 'pages/{slug}/'
-        settings['PAGE_LANG_URL'] = 'pages/{slug}-{lang}/'
+        settings["ARTICLE_URL"] = "{slug}/"
+        settings["ARTICLE_LANG_URL"] = "{slug}-{lang}/"
+        settings["PAGE_URL"] = "pages/{slug}/"
+        settings["PAGE_LANG_URL"] = "pages/{slug}-{lang}/"
 
-        for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
-                        'PAGE_LANG_URL'):
+        for setting in ("ARTICLE_URL", "ARTICLE_LANG_URL", "PAGE_URL", "PAGE_LANG_URL"):
             logger.warning("%s = '%s'", setting, settings[setting])
 
     # AUTORELOAD_IGNORE_CACHE -> --ignore-cache
-    if settings.get('AUTORELOAD_IGNORE_CACHE'):
-        logger.warning('Found deprecated `AUTORELOAD_IGNORE_CACHE` in '
-                       'settings. Use --ignore-cache instead.')
-        settings.pop('AUTORELOAD_IGNORE_CACHE')
+    if settings.get("AUTORELOAD_IGNORE_CACHE"):
+        logger.warning(
+            "Found deprecated `AUTORELOAD_IGNORE_CACHE` in "
+            "settings. Use --ignore-cache instead."
+        )
+        settings.pop("AUTORELOAD_IGNORE_CACHE")
 
     # ARTICLE_PERMALINK_STRUCTURE
-    if settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
-        logger.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
-                       ' settings.  Modifying the following settings for'
-                       ' the same behaviour.')
+    if settings.get("ARTICLE_PERMALINK_STRUCTURE", False):
+        logger.warning(
+            "Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in"
+            " settings.  Modifying the following settings for"
+            " the same behaviour."
+        )
 
-        structure = settings['ARTICLE_PERMALINK_STRUCTURE']
+        structure = settings["ARTICLE_PERMALINK_STRUCTURE"]
 
         # Convert %(variable) into {variable}.
-        structure = re.sub(r'%\((\w+)\)s', r'{\g<1>}', structure)
+        structure = re.sub(r"%\((\w+)\)s", r"{\g<1>}", structure)
 
         # Convert %x into {date:%x} for strftime
-        structure = re.sub(r'(%[A-z])', r'{date:\g<1>}', structure)
+        structure = re.sub(r"(%[A-z])", r"{date:\g<1>}", structure)
 
         # Strip a / prefix
-        structure = re.sub('^/', '', structure)
+        structure = re.sub("^/", "", structure)
 
-        for setting in ('ARTICLE_URL', 'ARTICLE_LANG_URL', 'PAGE_URL',
-                        'PAGE_LANG_URL', 'DRAFT_URL', 'DRAFT_LANG_URL',
-                        'ARTICLE_SAVE_AS', 'ARTICLE_LANG_SAVE_AS',
-                        'DRAFT_SAVE_AS', 'DRAFT_LANG_SAVE_AS',
-                        'PAGE_SAVE_AS', 'PAGE_LANG_SAVE_AS'):
-            settings[setting] = os.path.join(structure,
-                                             settings[setting])
+        for setting in (
+            "ARTICLE_URL",
+            "ARTICLE_LANG_URL",
+            "PAGE_URL",
+            "PAGE_LANG_URL",
+            "DRAFT_URL",
+            "DRAFT_LANG_URL",
+            "ARTICLE_SAVE_AS",
+            "ARTICLE_LANG_SAVE_AS",
+            "DRAFT_SAVE_AS",
+            "DRAFT_LANG_SAVE_AS",
+            "PAGE_SAVE_AS",
+            "PAGE_LANG_SAVE_AS",
+        ):
+            settings[setting] = os.path.join(structure, settings[setting])
             logger.warning("%s = '%s'", setting, settings[setting])
 
     # {,TAG,CATEGORY,TRANSLATION}_FEED -> {,TAG,CATEGORY,TRANSLATION}_FEED_ATOM
-    for new, old in [('FEED', 'FEED_ATOM'), ('TAG_FEED', 'TAG_FEED_ATOM'),
-                     ('CATEGORY_FEED', 'CATEGORY_FEED_ATOM'),
-                     ('TRANSLATION_FEED', 'TRANSLATION_FEED_ATOM')]:
+    for new, old in [
+        ("FEED", "FEED_ATOM"),
+        ("TAG_FEED", "TAG_FEED_ATOM"),
+        ("CATEGORY_FEED", "CATEGORY_FEED_ATOM"),
+        ("TRANSLATION_FEED", "TRANSLATION_FEED_ATOM"),
+    ]:
         if settings.get(new, False):
             logger.warning(
-                'Found deprecated `%(new)s` in settings. Modify %(new)s '
-                'to %(old)s in your settings and theme for the same '
-                'behavior. Temporarily setting %(old)s for backwards '
-                'compatibility.',
-                {'new': new, 'old': old}
+                "Found deprecated `%(new)s` in settings. Modify %(new)s "
+                "to %(old)s in your settings and theme for the same "
+                "behavior. Temporarily setting %(old)s for backwards "
+                "compatibility.",
+                {"new": new, "old": old},
             )
             settings[old] = settings[new]
 
@@ -512,34 +565,34 @@ def configure_settings(settings):
     settings.
     Also, specify the log messages to be ignored.
     """
-    if 'PATH' not in settings or not os.path.isdir(settings['PATH']):
-        raise Exception('You need to specify a path containing the content'
-                        ' (see pelican --help for more information)')
+    if "PATH" not in settings or not os.path.isdir(settings["PATH"]):
+        raise Exception(
+            "You need to specify a path containing the content"
+            " (see pelican --help for more information)"
+        )
 
     # specify the log messages to be ignored
-    log_filter = settings.get('LOG_FILTER', DEFAULT_CONFIG['LOG_FILTER'])
+    log_filter = settings.get("LOG_FILTER", DEFAULT_CONFIG["LOG_FILTER"])
     LimitFilter._ignore.update(set(log_filter))
 
     # lookup the theme in "pelican/themes" if the given one doesn't exist
-    if not os.path.isdir(settings['THEME']):
+    if not os.path.isdir(settings["THEME"]):
         theme_path = os.path.join(
-            os.path.dirname(os.path.abspath(__file__)),
-            'themes',
-            settings['THEME'])
+            os.path.dirname(os.path.abspath(__file__)), "themes", settings["THEME"]
+        )
         if os.path.exists(theme_path):
-            settings['THEME'] = theme_path
+            settings["THEME"] = theme_path
         else:
-            raise Exception("Could not find the theme %s"
-                            % settings['THEME'])
+            raise Exception("Could not find the theme %s" % settings["THEME"])
 
     # make paths selected for writing absolute if necessary
-    settings['WRITE_SELECTED'] = [
-        os.path.abspath(path) for path in
-        settings.get('WRITE_SELECTED', DEFAULT_CONFIG['WRITE_SELECTED'])
+    settings["WRITE_SELECTED"] = [
+        os.path.abspath(path)
+        for path in settings.get("WRITE_SELECTED", DEFAULT_CONFIG["WRITE_SELECTED"])
     ]
 
     # standardize strings to lowercase strings
-    for key in ['DEFAULT_LANG']:
+    for key in ["DEFAULT_LANG"]:
         if key in settings:
             settings[key] = settings[key].lower()
 
@@ -547,24 +600,26 @@ def configure_settings(settings):
     settings = get_jinja_environment(settings)
 
     # standardize strings to lists
-    for key in ['LOCALE']:
+    for key in ["LOCALE"]:
         if key in settings and isinstance(settings[key], str):
             settings[key] = [settings[key]]
 
     # check settings that must be a particular type
     for key, types in [
-            ('OUTPUT_SOURCES_EXTENSION', str),
-            ('FILENAME_METADATA', str),
+        ("OUTPUT_SOURCES_EXTENSION", str),
+        ("FILENAME_METADATA", str),
     ]:
         if key in settings and not isinstance(settings[key], types):
             value = settings.pop(key)
             logger.warn(
-                'Detected misconfigured %s (%s), '
-                'falling back to the default (%s)',
-                key, value, DEFAULT_CONFIG[key])
+                "Detected misconfigured %s (%s), " "falling back to the default (%s)",
+                key,
+                value,
+                DEFAULT_CONFIG[key],
+            )
 
     # try to set the different locales, fallback on the default.
-    locales = settings.get('LOCALE', DEFAULT_CONFIG['LOCALE'])
+    locales = settings.get("LOCALE", DEFAULT_CONFIG["LOCALE"])
 
     for locale_ in locales:
         try:
@@ -575,95 +630,111 @@ def configure_settings(settings):
     else:
         logger.warning(
             "Locale could not be set. Check the LOCALE setting, ensuring it "
-            "is valid and available on your system.")
+            "is valid and available on your system."
+        )
 
-    if ('SITEURL' in settings):
+    if "SITEURL" in settings:
         # If SITEURL has a trailing slash, remove it and provide a warning
-        siteurl = settings['SITEURL']
-        if (siteurl.endswith('/')):
-            settings['SITEURL'] = siteurl[:-1]
+        siteurl = settings["SITEURL"]
+        if siteurl.endswith("/"):
+            settings["SITEURL"] = siteurl[:-1]
             logger.warning("Removed extraneous trailing slash from SITEURL.")
         # If SITEURL is defined but FEED_DOMAIN isn't,
         # set FEED_DOMAIN to SITEURL
-        if 'FEED_DOMAIN' not in settings:
-            settings['FEED_DOMAIN'] = settings['SITEURL']
+        if "FEED_DOMAIN" not in settings:
+            settings["FEED_DOMAIN"] = settings["SITEURL"]
 
     # check content caching layer and warn of incompatibilities
-    if settings.get('CACHE_CONTENT', False) and \
-            settings.get('CONTENT_CACHING_LAYER', '') == 'generator' and \
-            not settings.get('WITH_FUTURE_DATES', True):
+    if (
+        settings.get("CACHE_CONTENT", False)
+        and settings.get("CONTENT_CACHING_LAYER", "") == "generator"
+        and not settings.get("WITH_FUTURE_DATES", True)
+    ):
         logger.warning(
             "WITH_FUTURE_DATES conflicts with CONTENT_CACHING_LAYER "
-            "set to 'generator', use 'reader' layer instead")
+            "set to 'generator', use 'reader' layer instead"
+        )
 
     # Warn if feeds are generated with both SITEURL & FEED_DOMAIN undefined
     feed_keys = [
-        'FEED_ATOM', 'FEED_RSS',
-        'FEED_ALL_ATOM', 'FEED_ALL_RSS',
-        'CATEGORY_FEED_ATOM', 'CATEGORY_FEED_RSS',
-        'AUTHOR_FEED_ATOM', 'AUTHOR_FEED_RSS',
-        'TAG_FEED_ATOM', 'TAG_FEED_RSS',
-        'TRANSLATION_FEED_ATOM', 'TRANSLATION_FEED_RSS',
+        "FEED_ATOM",
+        "FEED_RSS",
+        "FEED_ALL_ATOM",
+        "FEED_ALL_RSS",
+        "CATEGORY_FEED_ATOM",
+        "CATEGORY_FEED_RSS",
+        "AUTHOR_FEED_ATOM",
+        "AUTHOR_FEED_RSS",
+        "TAG_FEED_ATOM",
+        "TAG_FEED_RSS",
+        "TRANSLATION_FEED_ATOM",
+        "TRANSLATION_FEED_RSS",
     ]
 
     if any(settings.get(k) for k in feed_keys):
-        if not settings.get('SITEURL'):
-            logger.warning('Feeds generated without SITEURL set properly may'
-                           ' not be valid')
+        if not settings.get("SITEURL"):
+            logger.warning(
+                "Feeds generated without SITEURL set properly may" " not be valid"
+            )
 
-    if 'TIMEZONE' not in settings:
+    if "TIMEZONE" not in settings:
         logger.warning(
-            'No timezone information specified in the settings. Assuming'
-            ' your timezone is UTC for feed generation. Check '
-            'https://docs.getpelican.com/en/latest/settings.html#TIMEZONE '
-            'for more information')
+            "No timezone information specified in the settings. Assuming"
+            " your timezone is UTC for feed generation. Check "
+            "https://docs.getpelican.com/en/latest/settings.html#TIMEZONE "
+            "for more information"
+        )
 
     # fix up pagination rules
     from pelican.paginator import PaginationRule
+
     pagination_rules = [
-        PaginationRule(*r) for r in settings.get(
-            'PAGINATION_PATTERNS',
-            DEFAULT_CONFIG['PAGINATION_PATTERNS'],
+        PaginationRule(*r)
+        for r in settings.get(
+            "PAGINATION_PATTERNS",
+            DEFAULT_CONFIG["PAGINATION_PATTERNS"],
         )
     ]
-    settings['PAGINATION_PATTERNS'] = sorted(
+    settings["PAGINATION_PATTERNS"] = sorted(
         pagination_rules,
         key=lambda r: r[0],
     )
 
     # Save people from accidentally setting a string rather than a list
     path_keys = (
-        'ARTICLE_EXCLUDES',
-        'DEFAULT_METADATA',
-        'DIRECT_TEMPLATES',
-        'THEME_TEMPLATES_OVERRIDES',
-        'FILES_TO_COPY',
-        'IGNORE_FILES',
-        'PAGINATED_DIRECT_TEMPLATES',
-        'PLUGINS',
-        'STATIC_EXCLUDES',
-        'STATIC_PATHS',
-        'THEME_STATIC_PATHS',
-        'ARTICLE_PATHS',
-        'PAGE_PATHS',
+        "ARTICLE_EXCLUDES",
+        "DEFAULT_METADATA",
+        "DIRECT_TEMPLATES",
+        "THEME_TEMPLATES_OVERRIDES",
+        "FILES_TO_COPY",
+        "IGNORE_FILES",
+        "PAGINATED_DIRECT_TEMPLATES",
+        "PLUGINS",
+        "STATIC_EXCLUDES",
+        "STATIC_PATHS",
+        "THEME_STATIC_PATHS",
+        "ARTICLE_PATHS",
+        "PAGE_PATHS",
     )
     for PATH_KEY in filter(lambda k: k in settings, path_keys):
         if isinstance(settings[PATH_KEY], str):
-            logger.warning("Detected misconfiguration with %s setting "
-                           "(must be a list), falling back to the default",
-                           PATH_KEY)
+            logger.warning(
+                "Detected misconfiguration with %s setting "
+                "(must be a list), falling back to the default",
+                PATH_KEY,
+            )
             settings[PATH_KEY] = DEFAULT_CONFIG[PATH_KEY]
 
     # Add {PAGE,ARTICLE}_PATHS to {ARTICLE,PAGE}_EXCLUDES
-    mutually_exclusive = ('ARTICLE', 'PAGE')
+    mutually_exclusive = ("ARTICLE", "PAGE")
     for type_1, type_2 in [mutually_exclusive, mutually_exclusive[::-1]]:
         try:
-            includes = settings[type_1 + '_PATHS']
-            excludes = settings[type_2 + '_EXCLUDES']
+            includes = settings[type_1 + "_PATHS"]
+            excludes = settings[type_2 + "_EXCLUDES"]
             for path in includes:
                 if path not in excludes:
                     excludes.append(path)
         except KeyError:
-            continue            # setting not specified, nothing to do
+            continue  # setting not specified, nothing to do
 
     return settings
diff --git a/pelican/signals.py b/pelican/signals.py
index 9b84a92a..4d232e34 100644
--- a/pelican/signals.py
+++ b/pelican/signals.py
@@ -1,4 +1,4 @@
 raise ImportError(
-    'Importing from `pelican.signals` is deprecated. '
-    'Use `from pelican import signals` or `import pelican.plugins.signals` instead.'
+    "Importing from `pelican.signals` is deprecated. "
+    "Use `from pelican import signals` or `import pelican.plugins.signals` instead."
 )
diff --git a/pelican/tests/default_conf.py b/pelican/tests/default_conf.py
index 99f3b6cf..583c3253 100644
--- a/pelican/tests/default_conf.py
+++ b/pelican/tests/default_conf.py
@@ -1,43 +1,47 @@
-AUTHOR = 'Alexis Métaireau'
+AUTHOR = "Alexis Métaireau"
 SITENAME = "Alexis' log"
-SITEURL = 'http://blog.notmyidea.org'
-TIMEZONE = 'UTC'
+SITEURL = "http://blog.notmyidea.org"
+TIMEZONE = "UTC"
 
-GITHUB_URL = 'http://github.com/ametaireau/'
+GITHUB_URL = "http://github.com/ametaireau/"
 DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
 DEFAULT_PAGINATION = 2
 
-FEED_RSS = 'feeds/all.rss.xml'
-CATEGORY_FEED_RSS = 'feeds/{slug}.rss.xml'
+FEED_RSS = "feeds/all.rss.xml"
+CATEGORY_FEED_RSS = "feeds/{slug}.rss.xml"
 
-LINKS = (('Biologeek', 'http://biologeek.org'),
-         ('Filyb', "http://filyb.info/"),
-         ('Libert-fr', "http://www.libert-fr.com"),
-         ('N1k0', "http://prendreuncafe.com/blog/"),
-         ('Tarek Ziadé', "http://ziade.org/blog"),
-         ('Zubin Mithra', "http://zubin71.wordpress.com/"),)
+LINKS = (
+    ("Biologeek", "http://biologeek.org"),
+    ("Filyb", "http://filyb.info/"),
+    ("Libert-fr", "http://www.libert-fr.com"),
+    ("N1k0", "http://prendreuncafe.com/blog/"),
+    ("Tarek Ziadé", "http://ziade.org/blog"),
+    ("Zubin Mithra", "http://zubin71.wordpress.com/"),
+)
 
-SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
-          ('lastfm', 'http://lastfm.com/user/akounet'),
-          ('github', 'http://github.com/ametaireau'),)
+SOCIAL = (
+    ("twitter", "http://twitter.com/ametaireau"),
+    ("lastfm", "http://lastfm.com/user/akounet"),
+    ("github", "http://github.com/ametaireau"),
+)
 
 # global metadata to all the contents
-DEFAULT_METADATA = {'yeah': 'it is'}
+DEFAULT_METADATA = {"yeah": "it is"}
 
 # path-specific metadata
 EXTRA_PATH_METADATA = {
-    'extra/robots.txt': {'path': 'robots.txt'},
+    "extra/robots.txt": {"path": "robots.txt"},
 }
 
 # static paths will be copied without parsing their contents
 STATIC_PATHS = [
-    'pictures',
-    'extra/robots.txt',
+    "pictures",
+    "extra/robots.txt",
 ]
 
-FORMATTED_FIELDS = ['summary', 'custom_formatted_field']
+FORMATTED_FIELDS = ["summary", "custom_formatted_field"]
 
 # foobar will not be used, because it's not in caps. All configuration keys
 # have to be in caps
diff --git a/pelican/tests/dummy_plugins/namespace_plugin/pelican/plugins/ns_plugin/__init__.py b/pelican/tests/dummy_plugins/namespace_plugin/pelican/plugins/ns_plugin/__init__.py
index c514861d..1979cf09 100644
--- a/pelican/tests/dummy_plugins/namespace_plugin/pelican/plugins/ns_plugin/__init__.py
+++ b/pelican/tests/dummy_plugins/namespace_plugin/pelican/plugins/ns_plugin/__init__.py
@@ -1,4 +1,4 @@
-NAME = 'namespace plugin'
+NAME = "namespace plugin"
 
 
 def register():
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 3e4da785..31b12ce8 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -16,7 +16,10 @@ from pelican.contents import Article
 from pelican.readers import default_metadata
 from pelican.settings import DEFAULT_CONFIG
 
-__all__ = ['get_article', 'unittest', ]
+__all__ = [
+    "get_article",
+    "unittest",
+]
 
 
 @contextmanager
@@ -51,7 +54,7 @@ def isplit(s, sep=None):
     True
 
     """
-    sep, hardsep = r'\s+' if sep is None else re.escape(sep), sep is not None
+    sep, hardsep = r"\s+" if sep is None else re.escape(sep), sep is not None
     exp, pos, length = re.compile(sep), 0, len(s)
     while True:
         m = exp.search(s, pos)
@@ -89,10 +92,8 @@ def mute(returns_output=False):
     """
 
     def decorator(func):
-
         @wraps(func)
         def wrapper(*args, **kwargs):
-
             saved_stdout = sys.stdout
             sys.stdout = StringIO()
 
@@ -112,7 +113,7 @@ def mute(returns_output=False):
 
 def get_article(title, content, **extra_metadata):
     metadata = default_metadata(settings=DEFAULT_CONFIG)
-    metadata['title'] = title
+    metadata["title"] = title
     if extra_metadata:
         metadata.update(extra_metadata)
     return Article(content, metadata=metadata)
@@ -125,14 +126,14 @@ def skipIfNoExecutable(executable):
     and skips the tests if not found (if subprocess raises a `OSError`).
     """
 
-    with open(os.devnull, 'w') as fnull:
+    with open(os.devnull, "w") as fnull:
         try:
             res = subprocess.call(executable, stdout=fnull, stderr=fnull)
         except OSError:
             res = None
 
     if res is None:
-        return unittest.skip('{} executable not found'.format(executable))
+        return unittest.skip("{} executable not found".format(executable))
 
     return lambda func: func
 
@@ -164,10 +165,7 @@ def can_symlink():
     res = True
     try:
         with temporary_folder() as f:
-            os.symlink(
-                f,
-                os.path.join(f, 'symlink')
-            )
+            os.symlink(f, os.path.join(f, "symlink"))
     except OSError:
         res = False
     return res
@@ -186,9 +184,9 @@ def get_settings(**kwargs):
 
 def get_context(settings=None, **kwargs):
     context = settings.copy() if settings else {}
-    context['generated_content'] = {}
-    context['static_links'] = set()
-    context['static_content'] = {}
+    context["generated_content"] = {}
+    context["static_links"] = set()
+    context["static_content"] = {}
     context.update(kwargs)
     return context
 
@@ -200,22 +198,24 @@ class LogCountHandler(BufferingHandler):
         super().__init__(capacity)
 
     def count_logs(self, msg=None, level=None):
-        return len([
-            rec
-            for rec
-            in self.buffer
-            if (msg is None or re.match(msg, rec.getMessage())) and
-               (level is None or rec.levelno == level)
-        ])
+        return len(
+            [
+                rec
+                for rec in self.buffer
+                if (msg is None or re.match(msg, rec.getMessage()))
+                and (level is None or rec.levelno == level)
+            ]
+        )
 
     def count_formatted_logs(self, msg=None, level=None):
-        return len([
-            rec
-            for rec
-            in self.buffer
-            if (msg is None or re.search(msg, self.format(rec))) and
-               (level is None or rec.levelno == level)
-        ])
+        return len(
+            [
+                rec
+                for rec in self.buffer
+                if (msg is None or re.search(msg, self.format(rec)))
+                and (level is None or rec.levelno == level)
+            ]
+        )
 
 
 def diff_subproc(first, second):
@@ -228,8 +228,16 @@ def diff_subproc(first, second):
         >>> didCheckFail = proc.returnCode != 0
     """
     return subprocess.Popen(
-        ['git', '--no-pager', 'diff', '--no-ext-diff', '--exit-code',
-         '-w', first, second],
+        [
+            "git",
+            "--no-pager",
+            "diff",
+            "--no-ext-diff",
+            "--exit-code",
+            "-w",
+            first,
+            second,
+        ],
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
         text=True,
@@ -251,9 +259,12 @@ class LoggedTestCase(unittest.TestCase):
     def assertLogCountEqual(self, count=None, msg=None, **kwargs):
         actual = self._logcount_handler.count_logs(msg=msg, **kwargs)
         self.assertEqual(
-            actual, count,
-            msg='expected {} occurrences of {!r}, but found {}'.format(
-                count, msg, actual))
+            actual,
+            count,
+            msg="expected {} occurrences of {!r}, but found {}".format(
+                count, msg, actual
+            ),
+        )
 
 
 class TestCaseWithCLocale(unittest.TestCase):
@@ -261,9 +272,10 @@ class TestCaseWithCLocale(unittest.TestCase):
 
     Use utils.temporary_locale if you want a context manager ("with" statement).
     """
+
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
+        locale.setlocale(locale.LC_ALL, "C")
 
     def tearDown(self):
         locale.setlocale(locale.LC_ALL, self.old_locale)
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index 564f1d31..6dc91b2c 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -8,31 +8,30 @@ from pelican.tests.support import get_context, get_settings, unittest
 
 
 CUR_DIR = os.path.dirname(__file__)
-CONTENT_DIR = os.path.join(CUR_DIR, 'content')
+CONTENT_DIR = os.path.join(CUR_DIR, "content")
 
 
 class TestCache(unittest.TestCase):
-
     def setUp(self):
-        self.temp_cache = mkdtemp(prefix='pelican_cache.')
+        self.temp_cache = mkdtemp(prefix="pelican_cache.")
 
     def tearDown(self):
         rmtree(self.temp_cache)
 
     def _get_cache_enabled_settings(self):
         settings = get_settings()
-        settings['CACHE_CONTENT'] = True
-        settings['LOAD_CONTENT_CACHE'] = True
-        settings['CACHE_PATH'] = self.temp_cache
+        settings["CACHE_CONTENT"] = True
+        settings["LOAD_CONTENT_CACHE"] = True
+        settings["CACHE_PATH"] = self.temp_cache
         return settings
 
     def test_generator_caching(self):
         """Test that cached and uncached content is same in generator level"""
         settings = self._get_cache_enabled_settings()
-        settings['CONTENT_CACHING_LAYER'] = 'generator'
-        settings['PAGE_PATHS'] = ['TestPages']
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
-        settings['READERS'] = {'asc': None}
+        settings["CONTENT_CACHING_LAYER"] = "generator"
+        settings["PAGE_PATHS"] = ["TestPages"]
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
+        settings["READERS"] = {"asc": None}
         context = get_context(settings)
 
         def sorted_titles(items):
@@ -40,15 +39,23 @@ class TestCache(unittest.TestCase):
 
         # Articles
         generator = ArticlesGenerator(
-            context=context.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         uncached_articles = sorted_titles(generator.articles)
         uncached_drafts = sorted_titles(generator.drafts)
 
         generator = ArticlesGenerator(
-            context=context.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         cached_articles = sorted_titles(generator.articles)
         cached_drafts = sorted_titles(generator.drafts)
@@ -58,16 +65,24 @@ class TestCache(unittest.TestCase):
 
         # Pages
         generator = PagesGenerator(
-            context=context.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         uncached_pages = sorted_titles(generator.pages)
         uncached_hidden_pages = sorted_titles(generator.hidden_pages)
         uncached_draft_pages = sorted_titles(generator.draft_pages)
 
         generator = PagesGenerator(
-            context=context.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         cached_pages = sorted_titles(generator.pages)
         cached_hidden_pages = sorted_titles(generator.hidden_pages)
@@ -80,10 +95,10 @@ class TestCache(unittest.TestCase):
     def test_reader_caching(self):
         """Test that cached and uncached content is same in reader level"""
         settings = self._get_cache_enabled_settings()
-        settings['CONTENT_CACHING_LAYER'] = 'reader'
-        settings['PAGE_PATHS'] = ['TestPages']
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
-        settings['READERS'] = {'asc': None}
+        settings["CONTENT_CACHING_LAYER"] = "reader"
+        settings["PAGE_PATHS"] = ["TestPages"]
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
+        settings["READERS"] = {"asc": None}
         context = get_context(settings)
 
         def sorted_titles(items):
@@ -91,15 +106,23 @@ class TestCache(unittest.TestCase):
 
         # Articles
         generator = ArticlesGenerator(
-            context=context.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         uncached_articles = sorted_titles(generator.articles)
         uncached_drafts = sorted_titles(generator.drafts)
 
         generator = ArticlesGenerator(
-            context=context.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         cached_articles = sorted_titles(generator.articles)
         cached_drafts = sorted_titles(generator.drafts)
@@ -109,15 +132,23 @@ class TestCache(unittest.TestCase):
 
         # Pages
         generator = PagesGenerator(
-            context=context.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         uncached_pages = sorted_titles(generator.pages)
         uncached_hidden_pages = sorted_titles(generator.hidden_pages)
 
         generator = PagesGenerator(
-            context=context.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         cached_pages = sorted_titles(generator.pages)
         cached_hidden_pages = sorted_titles(generator.hidden_pages)
@@ -128,20 +159,28 @@ class TestCache(unittest.TestCase):
     def test_article_object_caching(self):
         """Test Article objects caching at the generator level"""
         settings = self._get_cache_enabled_settings()
-        settings['CONTENT_CACHING_LAYER'] = 'generator'
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
-        settings['READERS'] = {'asc': None}
+        settings["CONTENT_CACHING_LAYER"] = "generator"
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
+        settings["READERS"] = {"asc": None}
         context = get_context(settings)
 
         generator = ArticlesGenerator(
-            context=context.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
-        self.assertTrue(hasattr(generator, '_cache'))
+        self.assertTrue(hasattr(generator, "_cache"))
 
         generator = ArticlesGenerator(
-            context=context.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.readers.read_file = MagicMock()
         generator.generate_context()
         """
@@ -158,18 +197,26 @@ class TestCache(unittest.TestCase):
     def test_article_reader_content_caching(self):
         """Test raw article content caching at the reader level"""
         settings = self._get_cache_enabled_settings()
-        settings['READERS'] = {'asc': None}
+        settings["READERS"] = {"asc": None}
         context = get_context(settings)
 
         generator = ArticlesGenerator(
-            context=context.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
-        self.assertTrue(hasattr(generator.readers, '_cache'))
+        self.assertTrue(hasattr(generator.readers, "_cache"))
 
         generator = ArticlesGenerator(
-            context=context.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         readers = generator.readers.readers
         for reader in readers.values():
             reader.read = MagicMock()
@@ -182,44 +229,58 @@ class TestCache(unittest.TestCase):
 
         used in --ignore-cache or autoreload mode"""
         settings = self._get_cache_enabled_settings()
-        settings['READERS'] = {'asc': None}
+        settings["READERS"] = {"asc": None}
         context = get_context(settings)
 
         generator = ArticlesGenerator(
-            context=context.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.readers.read_file = MagicMock()
         generator.generate_context()
-        self.assertTrue(hasattr(generator, '_cache_open'))
+        self.assertTrue(hasattr(generator, "_cache_open"))
         orig_call_count = generator.readers.read_file.call_count
 
-        settings['LOAD_CONTENT_CACHE'] = False
+        settings["LOAD_CONTENT_CACHE"] = False
         generator = ArticlesGenerator(
-            context=context.copy(), settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.readers.read_file = MagicMock()
         generator.generate_context()
-        self.assertEqual(
-            generator.readers.read_file.call_count,
-            orig_call_count)
+        self.assertEqual(generator.readers.read_file.call_count, orig_call_count)
 
     def test_page_object_caching(self):
         """Test Page objects caching at the generator level"""
         settings = self._get_cache_enabled_settings()
-        settings['CONTENT_CACHING_LAYER'] = 'generator'
-        settings['PAGE_PATHS'] = ['TestPages']
-        settings['READERS'] = {'asc': None}
+        settings["CONTENT_CACHING_LAYER"] = "generator"
+        settings["PAGE_PATHS"] = ["TestPages"]
+        settings["READERS"] = {"asc": None}
         context = get_context(settings)
 
         generator = PagesGenerator(
-            context=context.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
-        self.assertTrue(hasattr(generator, '_cache'))
+        self.assertTrue(hasattr(generator, "_cache"))
 
         generator = PagesGenerator(
-            context=context.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.readers.read_file = MagicMock()
         generator.generate_context()
         """
@@ -231,19 +292,27 @@ class TestCache(unittest.TestCase):
     def test_page_reader_content_caching(self):
         """Test raw page content caching at the reader level"""
         settings = self._get_cache_enabled_settings()
-        settings['PAGE_PATHS'] = ['TestPages']
-        settings['READERS'] = {'asc': None}
+        settings["PAGE_PATHS"] = ["TestPages"]
+        settings["READERS"] = {"asc": None}
         context = get_context(settings)
 
         generator = PagesGenerator(
-            context=context.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
-        self.assertTrue(hasattr(generator.readers, '_cache'))
+        self.assertTrue(hasattr(generator.readers, "_cache"))
 
         generator = PagesGenerator(
-            context=context.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         readers = generator.readers.readers
         for reader in readers.values():
             reader.read = MagicMock()
@@ -256,24 +325,30 @@ class TestCache(unittest.TestCase):
 
         used in --ignore_cache or autoreload mode"""
         settings = self._get_cache_enabled_settings()
-        settings['PAGE_PATHS'] = ['TestPages']
-        settings['READERS'] = {'asc': None}
+        settings["PAGE_PATHS"] = ["TestPages"]
+        settings["READERS"] = {"asc": None}
         context = get_context(settings)
 
         generator = PagesGenerator(
-            context=context.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.readers.read_file = MagicMock()
         generator.generate_context()
-        self.assertTrue(hasattr(generator, '_cache_open'))
+        self.assertTrue(hasattr(generator, "_cache_open"))
         orig_call_count = generator.readers.read_file.call_count
 
-        settings['LOAD_CONTENT_CACHE'] = False
+        settings["LOAD_CONTENT_CACHE"] = False
         generator = PagesGenerator(
-            context=context.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.readers.read_file = MagicMock()
         generator.generate_context()
-        self.assertEqual(
-            generator.readers.read_file.call_count,
-            orig_call_count)
+        self.assertEqual(generator.readers.read_file.call_count, orig_call_count)
diff --git a/pelican/tests/test_cli.py b/pelican/tests/test_cli.py
index 13b307e7..0b9656be 100644
--- a/pelican/tests/test_cli.py
+++ b/pelican/tests/test_cli.py
@@ -5,68 +5,77 @@ from pelican import get_config, parse_arguments
 
 class TestParseOverrides(unittest.TestCase):
     def test_flags(self):
-        for flag in ['-e', '--extra-settings']:
-            args = parse_arguments([flag, 'k=1'])
-            self.assertDictEqual(args.overrides, {'k': 1})
+        for flag in ["-e", "--extra-settings"]:
+            args = parse_arguments([flag, "k=1"])
+            self.assertDictEqual(args.overrides, {"k": 1})
 
     def test_parse_multiple_items(self):
-        args = parse_arguments('-e k1=1 k2=2'.split())
-        self.assertDictEqual(args.overrides, {'k1': 1, 'k2': 2})
+        args = parse_arguments("-e k1=1 k2=2".split())
+        self.assertDictEqual(args.overrides, {"k1": 1, "k2": 2})
 
     def test_parse_valid_json(self):
         json_values_python_values_map = {
-            '""': '',
-            'null': None,
-            '"string"': 'string',
-            '["foo", 12, "4", {}]': ['foo', 12, '4', {}]
+            '""': "",
+            "null": None,
+            '"string"': "string",
+            '["foo", 12, "4", {}]': ["foo", 12, "4", {}],
         }
         for k, v in json_values_python_values_map.items():
-            args = parse_arguments(['-e', 'k=' + k])
-            self.assertDictEqual(args.overrides, {'k': v})
+            args = parse_arguments(["-e", "k=" + k])
+            self.assertDictEqual(args.overrides, {"k": v})
 
     def test_parse_invalid_syntax(self):
-        invalid_items = ['k= 1', 'k =1', 'k', 'k v']
+        invalid_items = ["k= 1", "k =1", "k", "k v"]
         for item in invalid_items:
             with self.assertRaises(ValueError):
-                parse_arguments(f'-e {item}'.split())
+                parse_arguments(f"-e {item}".split())
 
     def test_parse_invalid_json(self):
         invalid_json = {
-            '', 'False', 'True', 'None', 'some other string',
-            '{"foo": bar}', '[foo]'
+            "",
+            "False",
+            "True",
+            "None",
+            "some other string",
+            '{"foo": bar}',
+            "[foo]",
         }
         for v in invalid_json:
             with self.assertRaises(ValueError):
-                parse_arguments(['-e ', 'k=' + v])
+                parse_arguments(["-e ", "k=" + v])
 
 
 class TestGetConfigFromArgs(unittest.TestCase):
     def test_overrides_known_keys(self):
-        args = parse_arguments([
-            '-e',
-            'DELETE_OUTPUT_DIRECTORY=false',
-            'OUTPUT_RETENTION=["1.txt"]',
-            'SITENAME="Title"'
-        ])
+        args = parse_arguments(
+            [
+                "-e",
+                "DELETE_OUTPUT_DIRECTORY=false",
+                'OUTPUT_RETENTION=["1.txt"]',
+                'SITENAME="Title"',
+            ]
+        )
         config = get_config(args)
         config_must_contain = {
-            'DELETE_OUTPUT_DIRECTORY': False,
-            'OUTPUT_RETENTION': ['1.txt'],
-            'SITENAME': 'Title'
+            "DELETE_OUTPUT_DIRECTORY": False,
+            "OUTPUT_RETENTION": ["1.txt"],
+            "SITENAME": "Title",
         }
         self.assertDictEqual(config, {**config, **config_must_contain})
 
     def test_overrides_non_default_type(self):
-        args = parse_arguments([
-            '-e',
-            'DISPLAY_PAGES_ON_MENU=123',
-            'PAGE_TRANSLATION_ID=null',
-            'TRANSLATION_FEED_RSS_URL="someurl"'
-        ])
+        args = parse_arguments(
+            [
+                "-e",
+                "DISPLAY_PAGES_ON_MENU=123",
+                "PAGE_TRANSLATION_ID=null",
+                'TRANSLATION_FEED_RSS_URL="someurl"',
+            ]
+        )
         config = get_config(args)
         config_must_contain = {
-            'DISPLAY_PAGES_ON_MENU': 123,
-            'PAGE_TRANSLATION_ID': None,
-            'TRANSLATION_FEED_RSS_URL': 'someurl'
+            "DISPLAY_PAGES_ON_MENU": 123,
+            "PAGE_TRANSLATION_ID": None,
+            "TRANSLATION_FEED_RSS_URL": "someurl",
         }
         self.assertDictEqual(config, {**config, **config_must_contain})
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 3a223b5a..9dc7b70d 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -10,9 +10,8 @@ from jinja2.utils import generate_lorem_ipsum
 from pelican.contents import Article, Author, Category, Page, Static
 from pelican.plugins.signals import content_object_init
 from pelican.settings import DEFAULT_CONFIG
-from pelican.tests.support import (LoggedTestCase, get_context, get_settings,
-                                   unittest)
-from pelican.utils import (path_to_url, posixize_path, truncate_html_words)
+from pelican.tests.support import LoggedTestCase, get_context, get_settings, unittest
+from pelican.utils import path_to_url, posixize_path, truncate_html_words
 
 
 # generate one paragraph, enclosed with <p>
@@ -21,25 +20,24 @@ TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
 
 
 class TestBase(LoggedTestCase):
-
     def setUp(self):
         super().setUp()
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
+        locale.setlocale(locale.LC_ALL, "C")
         self.page_kwargs = {
-            'content': TEST_CONTENT,
-            'context': {
-                'localsiteurl': '',
-                'generated_content': {},
-                'static_content': {},
-                'static_links': set()
+            "content": TEST_CONTENT,
+            "context": {
+                "localsiteurl": "",
+                "generated_content": {},
+                "static_content": {},
+                "static_links": set(),
             },
-            'metadata': {
-                'summary': TEST_SUMMARY,
-                'title': 'foo bar',
-                'author': Author('Blogger', DEFAULT_CONFIG),
+            "metadata": {
+                "summary": TEST_SUMMARY,
+                "title": "foo bar",
+                "author": Author("Blogger", DEFAULT_CONFIG),
             },
-            'source_path': '/path/to/file/foo.ext'
+            "source_path": "/path/to/file/foo.ext",
         }
         self._disable_limit_filter()
 
@@ -49,10 +47,12 @@ class TestBase(LoggedTestCase):
 
     def _disable_limit_filter(self):
         from pelican.contents import logger
+
         logger.disable_filter()
 
     def _enable_limit_filter(self):
         from pelican.contents import logger
+
         logger.enable_filter()
 
     def _copy_page_kwargs(self):
@@ -72,9 +72,12 @@ class TestPage(TestBase):
     def test_use_args(self):
         # Creating a page with arguments passed to the constructor should use
         # them to initialise object's attributes.
-        metadata = {'foo': 'bar', 'foobar': 'baz', 'title': 'foobar', }
-        page = Page(TEST_CONTENT, metadata=metadata,
-                    context={'localsiteurl': ''})
+        metadata = {
+            "foo": "bar",
+            "foobar": "baz",
+            "title": "foobar",
+        }
+        page = Page(TEST_CONTENT, metadata=metadata, context={"localsiteurl": ""})
         for key, value in metadata.items():
             self.assertTrue(hasattr(page, key))
             self.assertEqual(value, getattr(page, key))
@@ -82,13 +85,14 @@ class TestPage(TestBase):
 
     def test_mandatory_properties(self):
         # If the title is not set, must throw an exception.
-        page = Page('content')
+        page = Page("content")
         self.assertFalse(page._has_valid_mandatory_properties())
         self.assertLogCountEqual(
-                count=1,
-                msg="Skipping .*: could not find information about 'title'",
-                level=logging.ERROR)
-        page = Page('content', metadata={'title': 'foobar'})
+            count=1,
+            msg="Skipping .*: could not find information about 'title'",
+            level=logging.ERROR,
+        )
+        page = Page("content", metadata={"title": "foobar"})
         self.assertTrue(page._has_valid_mandatory_properties())
 
     def test_summary_from_metadata(self):
@@ -101,31 +105,32 @@ class TestPage(TestBase):
         # generated summary should not exceed the given length.
         page_kwargs = self._copy_page_kwargs()
         settings = get_settings()
-        page_kwargs['settings'] = settings
-        del page_kwargs['metadata']['summary']
-        settings['SUMMARY_MAX_LENGTH'] = None
+        page_kwargs["settings"] = settings
+        del page_kwargs["metadata"]["summary"]
+        settings["SUMMARY_MAX_LENGTH"] = None
         page = Page(**page_kwargs)
         self.assertEqual(page.summary, TEST_CONTENT)
-        settings['SUMMARY_MAX_LENGTH'] = 10
+        settings["SUMMARY_MAX_LENGTH"] = 10
         page = Page(**page_kwargs)
         self.assertEqual(page.summary, truncate_html_words(TEST_CONTENT, 10))
-        settings['SUMMARY_MAX_LENGTH'] = 0
+        settings["SUMMARY_MAX_LENGTH"] = 0
         page = Page(**page_kwargs)
-        self.assertEqual(page.summary, '')
+        self.assertEqual(page.summary, "")
 
     def test_summary_end_suffix(self):
         # If a :SUMMARY_END_SUFFIX: is set, and there is no other summary,
         # generated summary should contain the specified marker at the end.
         page_kwargs = self._copy_page_kwargs()
         settings = get_settings()
-        page_kwargs['settings'] = settings
-        del page_kwargs['metadata']['summary']
-        settings['SUMMARY_END_SUFFIX'] = 'test_marker'
-        settings['SUMMARY_MAX_LENGTH'] = 10
+        page_kwargs["settings"] = settings
+        del page_kwargs["metadata"]["summary"]
+        settings["SUMMARY_END_SUFFIX"] = "test_marker"
+        settings["SUMMARY_MAX_LENGTH"] = 10
         page = Page(**page_kwargs)
-        self.assertEqual(page.summary, truncate_html_words(TEST_CONTENT, 10,
-                                                           'test_marker'))
-        self.assertIn('test_marker', page.summary)
+        self.assertEqual(
+            page.summary, truncate_html_words(TEST_CONTENT, 10, "test_marker")
+        )
+        self.assertIn("test_marker", page.summary)
 
     def test_summary_get_summary_warning(self):
         """calling ._get_summary() should issue a warning"""
@@ -134,57 +139,61 @@ class TestPage(TestBase):
         self.assertEqual(page.summary, TEST_SUMMARY)
         self.assertEqual(page._get_summary(), TEST_SUMMARY)
         self.assertLogCountEqual(
-                count=1,
-                msg=r"_get_summary\(\) has been deprecated since 3\.6\.4\. "
-                    "Use the summary decorator instead",
-                level=logging.WARNING)
+            count=1,
+            msg=r"_get_summary\(\) has been deprecated since 3\.6\.4\. "
+            "Use the summary decorator instead",
+            level=logging.WARNING,
+        )
 
     def test_slug(self):
         page_kwargs = self._copy_page_kwargs()
         settings = get_settings()
-        page_kwargs['settings'] = settings
-        settings['SLUGIFY_SOURCE'] = "title"
+        page_kwargs["settings"] = settings
+        settings["SLUGIFY_SOURCE"] = "title"
         page = Page(**page_kwargs)
-        self.assertEqual(page.slug, 'foo-bar')
-        settings['SLUGIFY_SOURCE'] = "basename"
+        self.assertEqual(page.slug, "foo-bar")
+        settings["SLUGIFY_SOURCE"] = "basename"
         page = Page(**page_kwargs)
-        self.assertEqual(page.slug, 'foo')
+        self.assertEqual(page.slug, "foo")
 
         # test slug from title with unicode and case
 
         inputs = (
             # (title, expected, preserve_case, use_unicode)
-            ('指導書', 'zhi-dao-shu', False, False),
-            ('指導書', 'Zhi-Dao-Shu', True, False),
-            ('指導書', '指導書', False, True),
-            ('指導書', '指導書', True, True),
-            ('Çığ', 'cig', False, False),
-            ('Çığ', 'Cig', True, False),
-            ('Çığ', 'çığ', False, True),
-            ('Çığ', 'Çığ', True, True),
+            ("指導書", "zhi-dao-shu", False, False),
+            ("指導書", "Zhi-Dao-Shu", True, False),
+            ("指導書", "指導書", False, True),
+            ("指導書", "指導書", True, True),
+            ("Çığ", "cig", False, False),
+            ("Çığ", "Cig", True, False),
+            ("Çığ", "çığ", False, True),
+            ("Çığ", "Çığ", True, True),
         )
 
         settings = get_settings()
         page_kwargs = self._copy_page_kwargs()
-        page_kwargs['settings'] = settings
+        page_kwargs["settings"] = settings
 
         for title, expected, preserve_case, use_unicode in inputs:
-            settings['SLUGIFY_PRESERVE_CASE'] = preserve_case
-            settings['SLUGIFY_USE_UNICODE'] = use_unicode
-            page_kwargs['metadata']['title'] = title
+            settings["SLUGIFY_PRESERVE_CASE"] = preserve_case
+            settings["SLUGIFY_USE_UNICODE"] = use_unicode
+            page_kwargs["metadata"]["title"] = title
             page = Page(**page_kwargs)
-            self.assertEqual(page.slug, expected,
-                             (title, preserve_case, use_unicode))
+            self.assertEqual(page.slug, expected, (title, preserve_case, use_unicode))
 
     def test_defaultlang(self):
         # If no lang is given, default to the default one.
         page = Page(**self.page_kwargs)
-        self.assertEqual(page.lang, DEFAULT_CONFIG['DEFAULT_LANG'])
+        self.assertEqual(page.lang, DEFAULT_CONFIG["DEFAULT_LANG"])
 
         # it is possible to specify the lang in the metadata infos
-        self.page_kwargs['metadata'].update({'lang': 'fr', })
+        self.page_kwargs["metadata"].update(
+            {
+                "lang": "fr",
+            }
+        )
         page = Page(**self.page_kwargs)
-        self.assertEqual(page.lang, 'fr')
+        self.assertEqual(page.lang, "fr")
 
     def test_save_as(self):
         # If a lang is not the default lang, save_as should be set
@@ -195,7 +204,11 @@ class TestPage(TestBase):
         self.assertEqual(page.save_as, "pages/foo-bar.html")
 
         # if a language is defined, save_as should include it accordingly
-        self.page_kwargs['metadata'].update({'lang': 'fr', })
+        self.page_kwargs["metadata"].update(
+            {
+                "lang": "fr",
+            }
+        )
         page = Page(**self.page_kwargs)
         self.assertEqual(page.save_as, "pages/foo-bar-fr.html")
 
@@ -206,34 +219,32 @@ class TestPage(TestBase):
 
         # If 'source_path' is None, 'relative_source_path' should
         # also return None
-        page_kwargs['source_path'] = None
+        page_kwargs["source_path"] = None
         page = Page(**page_kwargs)
         self.assertIsNone(page.relative_source_path)
 
         page_kwargs = self._copy_page_kwargs()
         settings = get_settings()
-        full_path = page_kwargs['source_path']
+        full_path = page_kwargs["source_path"]
 
-        settings['PATH'] = os.path.dirname(full_path)
-        page_kwargs['settings'] = settings
+        settings["PATH"] = os.path.dirname(full_path)
+        page_kwargs["settings"] = settings
         page = Page(**page_kwargs)
 
         # if 'source_path' is set, 'relative_source_path' should
         # return the relative path from 'PATH' to 'source_path'
         self.assertEqual(
             page.relative_source_path,
-            os.path.relpath(
-                full_path,
-                os.path.dirname(full_path)
-            ))
+            os.path.relpath(full_path, os.path.dirname(full_path)),
+        )
 
     def test_metadata_url_format(self):
         # Arbitrary metadata should be passed through url_format()
         page = Page(**self.page_kwargs)
-        self.assertIn('summary', page.url_format.keys())
-        page.metadata['directory'] = 'test-dir'
-        page.settings = get_settings(PAGE_SAVE_AS='{directory}/{slug}')
-        self.assertEqual(page.save_as, 'test-dir/foo-bar')
+        self.assertIn("summary", page.url_format.keys())
+        page.metadata["directory"] = "test-dir"
+        page.settings = get_settings(PAGE_SAVE_AS="{directory}/{slug}")
+        self.assertEqual(page.save_as, "test-dir/foo-bar")
 
     def test_datetime(self):
         # If DATETIME is set to a tuple, it should be used to override LOCALE
@@ -242,28 +253,28 @@ class TestPage(TestBase):
         page_kwargs = self._copy_page_kwargs()
 
         # set its date to dt
-        page_kwargs['metadata']['date'] = dt
+        page_kwargs["metadata"]["date"] = dt
         page = Page(**page_kwargs)
 
         # page.locale_date is a unicode string in both python2 and python3
-        dt_date = dt.strftime(DEFAULT_CONFIG['DEFAULT_DATE_FORMAT'])
+        dt_date = dt.strftime(DEFAULT_CONFIG["DEFAULT_DATE_FORMAT"])
 
         self.assertEqual(page.locale_date, dt_date)
-        page_kwargs['settings'] = get_settings()
+        page_kwargs["settings"] = get_settings()
 
         # I doubt this can work on all platforms ...
         if platform == "win32":
-            locale = 'jpn'
+            locale = "jpn"
         else:
-            locale = 'ja_JP.utf8'
-        page_kwargs['settings']['DATE_FORMATS'] = {'jp': (locale,
-                                                          '%Y-%m-%d(%a)')}
-        page_kwargs['metadata']['lang'] = 'jp'
+            locale = "ja_JP.utf8"
+        page_kwargs["settings"]["DATE_FORMATS"] = {"jp": (locale, "%Y-%m-%d(%a)")}
+        page_kwargs["metadata"]["lang"] = "jp"
 
         import locale as locale_module
+
         try:
             page = Page(**page_kwargs)
-            self.assertEqual(page.locale_date, '2015-09-13(\u65e5)')
+            self.assertEqual(page.locale_date, "2015-09-13(\u65e5)")
         except locale_module.Error:
             # The constructor of ``Page`` will try to set the locale to
             # ``ja_JP.utf8``. But this attempt will failed when there is no
@@ -277,22 +288,21 @@ class TestPage(TestBase):
     def test_template(self):
         # Pages default to page, metadata overwrites
         default_page = Page(**self.page_kwargs)
-        self.assertEqual('page', default_page.template)
+        self.assertEqual("page", default_page.template)
         page_kwargs = self._copy_page_kwargs()
-        page_kwargs['metadata']['template'] = 'custom'
+        page_kwargs["metadata"]["template"] = "custom"
         custom_page = Page(**page_kwargs)
-        self.assertEqual('custom', custom_page.template)
+        self.assertEqual("custom", custom_page.template)
 
     def test_signal(self):
         def receiver_test_function(sender):
             receiver_test_function.has_been_called = True
             pass
+
         receiver_test_function.has_been_called = False
 
         content_object_init.connect(receiver_test_function)
-        self.assertIn(
-            receiver_test_function,
-            content_object_init.receivers_for(Page))
+        self.assertIn(receiver_test_function, content_object_init.receivers_for(Page))
 
         self.assertFalse(receiver_test_function.has_been_called)
         Page(**self.page_kwargs)
@@ -303,102 +313,106 @@ class TestPage(TestBase):
         # filenames, tags and categories.
         settings = get_settings()
         args = self.page_kwargs.copy()
-        args['settings'] = settings
+        args["settings"] = settings
 
         # Tag
-        args['content'] = ('A simple test, with a '
-                           '<a href="|tag|tagname">link</a>')
+        args["content"] = "A simple test, with a " '<a href="|tag|tagname">link</a>'
         page = Page(**args)
-        content = page.get_content('http://notmyidea.org')
+        content = page.get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            ('A simple test, with a '
-             '<a href="http://notmyidea.org/tag/tagname.html">link</a>'))
+            (
+                "A simple test, with a "
+                '<a href="http://notmyidea.org/tag/tagname.html">link</a>'
+            ),
+        )
 
         # Category
-        args['content'] = ('A simple test, with a '
-                           '<a href="|category|category">link</a>')
+        args["content"] = (
+            "A simple test, with a " '<a href="|category|category">link</a>'
+        )
         page = Page(**args)
-        content = page.get_content('http://notmyidea.org')
+        content = page.get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            ('A simple test, with a '
-             '<a href="http://notmyidea.org/category/category.html">link</a>'))
+            (
+                "A simple test, with a "
+                '<a href="http://notmyidea.org/category/category.html">link</a>'
+            ),
+        )
 
     def test_intrasite_link(self):
-        cls_name = '_DummyArticle'
-        article = type(cls_name, (object,), {'url': 'article.html'})
+        cls_name = "_DummyArticle"
+        article = type(cls_name, (object,), {"url": "article.html"})
 
         args = self.page_kwargs.copy()
-        args['settings'] = get_settings()
-        args['source_path'] = 'content'
-        args['context']['generated_content'] = {'article.rst': article}
+        args["settings"] = get_settings()
+        args["source_path"] = "content"
+        args["context"]["generated_content"] = {"article.rst": article}
 
         # Classic intrasite link via filename
-        args['content'] = (
-            'A simple test, with a '
-            '<a href="|filename|article.rst">link</a>'
+        args["content"] = (
+            "A simple test, with a " '<a href="|filename|article.rst">link</a>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            'A simple test, with a '
-            '<a href="http://notmyidea.org/article.html">link</a>'
+            "A simple test, with a "
+            '<a href="http://notmyidea.org/article.html">link</a>',
         )
 
         # fragment
-        args['content'] = (
-            'A simple test, with a '
+        args["content"] = (
+            "A simple test, with a "
             '<a href="|filename|article.rst#section-2">link</a>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            'A simple test, with a '
-            '<a href="http://notmyidea.org/article.html#section-2">link</a>'
+            "A simple test, with a "
+            '<a href="http://notmyidea.org/article.html#section-2">link</a>',
         )
 
         # query
-        args['content'] = (
-            'A simple test, with a '
+        args["content"] = (
+            "A simple test, with a "
             '<a href="|filename|article.rst'
             '?utm_whatever=234&highlight=word">link</a>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            'A simple test, with a '
+            "A simple test, with a "
             '<a href="http://notmyidea.org/article.html'
-            '?utm_whatever=234&highlight=word">link</a>'
+            '?utm_whatever=234&highlight=word">link</a>',
         )
 
         # combination
-        args['content'] = (
-            'A simple test, with a '
+        args["content"] = (
+            "A simple test, with a "
             '<a href="|filename|article.rst'
             '?utm_whatever=234&highlight=word#section-2">link</a>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            'A simple test, with a '
+            "A simple test, with a "
             '<a href="http://notmyidea.org/article.html'
-            '?utm_whatever=234&highlight=word#section-2">link</a>'
+            '?utm_whatever=234&highlight=word#section-2">link</a>',
         )
 
         # also test for summary in metadata
         parsed = (
-            'A simple summary test, with a '
-            '<a href="|filename|article.rst">link</a>'
+            "A simple summary test, with a " '<a href="|filename|article.rst">link</a>'
         )
         linked = (
-            'A simple summary test, with a '
+            "A simple summary test, with a "
             '<a href="http://notmyidea.org/article.html">link</a>'
         )
-        args['settings']['FORMATTED_FIELDS'] = ['summary', 'custom']
-        args['metadata']['summary'] = parsed
-        args['metadata']['custom'] = parsed
-        args['context']['localsiteurl'] = 'http://notmyidea.org'
+        args["settings"]["FORMATTED_FIELDS"] = ["summary", "custom"]
+        args["metadata"]["summary"] = parsed
+        args["metadata"]["custom"] = parsed
+        args["context"]["localsiteurl"] = "http://notmyidea.org"
         p = Page(**args)
         # This is called implicitly from all generators and Pelican.run() once
         # all files are processed. Here we process just one page so it needs
@@ -408,252 +422,236 @@ class TestPage(TestBase):
         self.assertEqual(p.custom, linked)
 
     def test_intrasite_link_more(self):
-        cls_name = '_DummyAsset'
+        cls_name = "_DummyAsset"
 
         args = self.page_kwargs.copy()
-        args['settings'] = get_settings()
-        args['source_path'] = 'content'
-        args['context']['static_content'] = {
-            'images/poster.jpg':
-                type(cls_name, (object,), {'url': 'images/poster.jpg'}),
-            'assets/video.mp4':
-                type(cls_name, (object,), {'url': 'assets/video.mp4'}),
-            'images/graph.svg':
-                type(cls_name, (object,), {'url': 'images/graph.svg'}),
+        args["settings"] = get_settings()
+        args["source_path"] = "content"
+        args["context"]["static_content"] = {
+            "images/poster.jpg": type(
+                cls_name, (object,), {"url": "images/poster.jpg"}
+            ),
+            "assets/video.mp4": type(cls_name, (object,), {"url": "assets/video.mp4"}),
+            "images/graph.svg": type(cls_name, (object,), {"url": "images/graph.svg"}),
         }
-        args['context']['generated_content'] = {
-            'reference.rst':
-                type(cls_name, (object,), {'url': 'reference.html'}),
+        args["context"]["generated_content"] = {
+            "reference.rst": type(cls_name, (object,), {"url": "reference.html"}),
         }
 
         # video.poster
-        args['content'] = (
-            'There is a video with poster '
+        args["content"] = (
+            "There is a video with poster "
             '<video controls poster="{static}/images/poster.jpg">'
             '<source src="|static|/assets/video.mp4" type="video/mp4">'
-            '</video>'
+            "</video>"
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            'There is a video with poster '
+            "There is a video with poster "
             '<video controls poster="http://notmyidea.org/images/poster.jpg">'
             '<source src="http://notmyidea.org/assets/video.mp4"'
             ' type="video/mp4">'
-            '</video>'
+            "</video>",
         )
 
         # object.data
-        args['content'] = (
-            'There is a svg object '
+        args["content"] = (
+            "There is a svg object "
             '<object data="{static}/images/graph.svg"'
             ' type="image/svg+xml">'
-            '</object>'
+            "</object>"
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            'There is a svg object '
+            "There is a svg object "
             '<object data="http://notmyidea.org/images/graph.svg"'
             ' type="image/svg+xml">'
-            '</object>'
+            "</object>",
         )
 
         # blockquote.cite
-        args['content'] = (
-            'There is a blockquote with cite attribute '
+        args["content"] = (
+            "There is a blockquote with cite attribute "
             '<blockquote cite="{filename}reference.rst">blah blah</blockquote>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            'There is a blockquote with cite attribute '
+            "There is a blockquote with cite attribute "
             '<blockquote cite="http://notmyidea.org/reference.html">'
-            'blah blah'
-            '</blockquote>'
+            "blah blah"
+            "</blockquote>",
         )
 
     def test_intrasite_link_absolute(self):
         """Test that absolute URLs are merged properly."""
 
         args = self.page_kwargs.copy()
-        args['settings'] = get_settings(
-            STATIC_URL='http://static.cool.site/{path}',
-            ARTICLE_URL='http://blog.cool.site/{slug}.html')
-        args['source_path'] = 'content'
-        args['context']['static_content'] = {
-            'images/poster.jpg':
-                Static('', settings=args['settings'],
-                       source_path='images/poster.jpg'),
+        args["settings"] = get_settings(
+            STATIC_URL="http://static.cool.site/{path}",
+            ARTICLE_URL="http://blog.cool.site/{slug}.html",
+        )
+        args["source_path"] = "content"
+        args["context"]["static_content"] = {
+            "images/poster.jpg": Static(
+                "", settings=args["settings"], source_path="images/poster.jpg"
+            ),
         }
-        args['context']['generated_content'] = {
-            'article.rst':
-                Article('', settings=args['settings'], metadata={
-                    'slug': 'article', 'title': 'Article'})
+        args["context"]["generated_content"] = {
+            "article.rst": Article(
+                "",
+                settings=args["settings"],
+                metadata={"slug": "article", "title": "Article"},
+            )
         }
 
         # Article link will go to blog
-        args['content'] = (
-            '<a href="{filename}article.rst">Article</a>'
-        )
-        content = Page(**args).get_content('http://cool.site')
+        args["content"] = '<a href="{filename}article.rst">Article</a>'
+        content = Page(**args).get_content("http://cool.site")
         self.assertEqual(
-            content,
-            '<a href="http://blog.cool.site/article.html">Article</a>'
+            content, '<a href="http://blog.cool.site/article.html">Article</a>'
         )
 
         # Page link will go to the main site
-        args['content'] = (
-            '<a href="{index}">Index</a>'
-        )
-        content = Page(**args).get_content('http://cool.site')
+        args["content"] = '<a href="{index}">Index</a>'
+        content = Page(**args).get_content("http://cool.site")
+        self.assertEqual(content, '<a href="http://cool.site/index.html">Index</a>')
+
+        # Image link will go to static
+        args["content"] = '<img src="{static}/images/poster.jpg"/>'
+        content = Page(**args).get_content("http://cool.site")
         self.assertEqual(
-            content,
-            '<a href="http://cool.site/index.html">Index</a>'
+            content, '<img src="http://static.cool.site/images/poster.jpg"/>'
         )
 
         # Image link will go to static
-        args['content'] = (
-            '<img src="{static}/images/poster.jpg"/>'
-        )
-        content = Page(**args).get_content('http://cool.site')
+        args["content"] = '<meta content="{static}/images/poster.jpg"/>'
+        content = Page(**args).get_content("http://cool.site")
         self.assertEqual(
-            content,
-            '<img src="http://static.cool.site/images/poster.jpg"/>'
-        )
-
-        # Image link will go to static
-        args['content'] = (
-            '<meta content="{static}/images/poster.jpg"/>'
-        )
-        content = Page(**args).get_content('http://cool.site')
-        self.assertEqual(
-            content,
-            '<meta content="http://static.cool.site/images/poster.jpg"/>'
+            content, '<meta content="http://static.cool.site/images/poster.jpg"/>'
         )
 
     def test_intrasite_link_escape(self):
-        article = type(
-            '_DummyArticle', (object,), {'url': 'article-spaces.html'})
-        asset = type(
-            '_DummyAsset', (object,), {'url': 'name@example.com'})
+        article = type("_DummyArticle", (object,), {"url": "article-spaces.html"})
+        asset = type("_DummyAsset", (object,), {"url": "name@example.com"})
 
         args = self.page_kwargs.copy()
-        args['settings'] = get_settings()
-        args['source_path'] = 'content'
-        args['context']['generated_content'] = {'article spaces.rst': article}
-        args['context']['static_content'] = {'name@example.com': asset}
+        args["settings"] = get_settings()
+        args["source_path"] = "content"
+        args["context"]["generated_content"] = {"article spaces.rst": article}
+        args["context"]["static_content"] = {"name@example.com": asset}
 
         expected_output = (
-            'A simple test with a '
+            "A simple test with a "
             '<a href="http://notmyidea.org/article-spaces.html#anchor">link</a> '
             '<a href="http://notmyidea.org/name@example.com#anchor">file</a>'
         )
 
         # not escaped
-        args['content'] = (
-            'A simple test with a '
+        args["content"] = (
+            "A simple test with a "
             '<a href="{filename}article spaces.rst#anchor">link</a> '
             '<a href="{static}name@example.com#anchor">file</a>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(content, expected_output)
 
         # html escaped
-        args['content'] = (
-            'A simple test with a '
+        args["content"] = (
+            "A simple test with a "
             '<a href="{filename}article spaces.rst#anchor">link</a> '
             '<a href="{static}name&#64;example.com#anchor">file</a>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(content, expected_output)
 
         # url escaped
-        args['content'] = (
-            'A simple test with a '
+        args["content"] = (
+            "A simple test with a "
             '<a href="{filename}article%20spaces.rst#anchor">link</a> '
             '<a href="{static}name%40example.com#anchor">file</a>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(content, expected_output)
 
         # html and url escaped
-        args['content'] = (
-            'A simple test with a '
+        args["content"] = (
+            "A simple test with a "
             '<a href="{filename}article%20spaces.rst#anchor">link</a> '
             '<a href="{static}name&#64;example.com#anchor">file</a>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(content, expected_output)
 
     def test_intrasite_link_markdown_spaces(self):
-        cls_name = '_DummyArticle'
-        article = type(cls_name, (object,), {'url': 'article-spaces.html'})
+        cls_name = "_DummyArticle"
+        article = type(cls_name, (object,), {"url": "article-spaces.html"})
 
         args = self.page_kwargs.copy()
-        args['settings'] = get_settings()
-        args['source_path'] = 'content'
-        args['context']['generated_content'] = {'article spaces.rst': article}
+        args["settings"] = get_settings()
+        args["source_path"] = "content"
+        args["context"]["generated_content"] = {"article spaces.rst": article}
 
         # An intrasite link via filename with %20 as a space
-        args['content'] = (
-            'A simple test, with a '
-            '<a href="|filename|article%20spaces.rst">link</a>'
+        args["content"] = (
+            "A simple test, with a " '<a href="|filename|article%20spaces.rst">link</a>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            'A simple test, with a '
-            '<a href="http://notmyidea.org/article-spaces.html">link</a>'
+            "A simple test, with a "
+            '<a href="http://notmyidea.org/article-spaces.html">link</a>',
         )
 
     def test_intrasite_link_source_and_generated(self):
-        """Test linking both to the source and the generated article
-        """
-        cls_name = '_DummyAsset'
+        """Test linking both to the source and the generated article"""
+        cls_name = "_DummyAsset"
 
         args = self.page_kwargs.copy()
-        args['settings'] = get_settings()
-        args['source_path'] = 'content'
-        args['context']['generated_content'] = {
-            'article.rst': type(cls_name, (object,), {'url': 'article.html'})}
-        args['context']['static_content'] = {
-            'article.rst': type(cls_name, (object,), {'url': 'article.rst'})}
+        args["settings"] = get_settings()
+        args["source_path"] = "content"
+        args["context"]["generated_content"] = {
+            "article.rst": type(cls_name, (object,), {"url": "article.html"})
+        }
+        args["context"]["static_content"] = {
+            "article.rst": type(cls_name, (object,), {"url": "article.rst"})
+        }
 
-        args['content'] = (
-            'A simple test, with a link to an'
+        args["content"] = (
+            "A simple test, with a link to an"
             '<a href="{filename}article.rst">article</a> and its'
             '<a href="{static}article.rst">source</a>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            'A simple test, with a link to an'
+            "A simple test, with a link to an"
             '<a href="http://notmyidea.org/article.html">article</a> and its'
-            '<a href="http://notmyidea.org/article.rst">source</a>'
+            '<a href="http://notmyidea.org/article.rst">source</a>',
         )
 
     def test_intrasite_link_to_static_content_with_filename(self):
-        """Test linking to a static resource with deprecated {filename}
-        """
-        cls_name = '_DummyAsset'
+        """Test linking to a static resource with deprecated {filename}"""
+        cls_name = "_DummyAsset"
 
         args = self.page_kwargs.copy()
-        args['settings'] = get_settings()
-        args['source_path'] = 'content'
-        args['context']['static_content'] = {
-            'poster.jpg':
-                type(cls_name, (object,), {'url': 'images/poster.jpg'})}
+        args["settings"] = get_settings()
+        args["source_path"] = "content"
+        args["context"]["static_content"] = {
+            "poster.jpg": type(cls_name, (object,), {"url": "images/poster.jpg"})
+        }
 
-        args['content'] = (
-            'A simple test, with a link to a'
+        args["content"] = (
+            "A simple test, with a link to a"
             '<a href="{filename}poster.jpg">poster</a>'
         )
-        content = Page(**args).get_content('http://notmyidea.org')
+        content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
             content,
-            'A simple test, with a link to a'
-            '<a href="http://notmyidea.org/images/poster.jpg">poster</a>'
+            "A simple test, with a link to a"
+            '<a href="http://notmyidea.org/images/poster.jpg">poster</a>',
         )
 
     def test_multiple_authors(self):
@@ -661,9 +659,11 @@ class TestPage(TestBase):
         args = self.page_kwargs.copy()
         content = Page(**args)
         assert content.authors == [content.author]
-        args['metadata'].pop('author')
-        args['metadata']['authors'] = [Author('First Author', DEFAULT_CONFIG),
-                                       Author('Second Author', DEFAULT_CONFIG)]
+        args["metadata"].pop("author")
+        args["metadata"]["authors"] = [
+            Author("First Author", DEFAULT_CONFIG),
+            Author("Second Author", DEFAULT_CONFIG),
+        ]
         content = Page(**args)
         assert content.authors
         assert content.author == content.authors[0]
@@ -673,173 +673,184 @@ class TestArticle(TestBase):
     def test_template(self):
         # Articles default to article, metadata overwrites
         default_article = Article(**self.page_kwargs)
-        self.assertEqual('article', default_article.template)
+        self.assertEqual("article", default_article.template)
         article_kwargs = self._copy_page_kwargs()
-        article_kwargs['metadata']['template'] = 'custom'
+        article_kwargs["metadata"]["template"] = "custom"
         custom_article = Article(**article_kwargs)
-        self.assertEqual('custom', custom_article.template)
+        self.assertEqual("custom", custom_article.template)
 
     def test_slugify_category_author(self):
         settings = get_settings()
-        settings['SLUG_REGEX_SUBSTITUTIONS'] = [
-            (r'C#', 'csharp'),
-            (r'[^\w\s-]', ''),
-            (r'(?u)\A\s*', ''),
-            (r'(?u)\s*\Z', ''),
-            (r'[-\s]+', '-'),
+        settings["SLUG_REGEX_SUBSTITUTIONS"] = [
+            (r"C#", "csharp"),
+            (r"[^\w\s-]", ""),
+            (r"(?u)\A\s*", ""),
+            (r"(?u)\s*\Z", ""),
+            (r"[-\s]+", "-"),
         ]
-        settings['ARTICLE_URL'] = '{author}/{category}/{slug}/'
-        settings['ARTICLE_SAVE_AS'] = '{author}/{category}/{slug}/index.html'
+        settings["ARTICLE_URL"] = "{author}/{category}/{slug}/"
+        settings["ARTICLE_SAVE_AS"] = "{author}/{category}/{slug}/index.html"
         article_kwargs = self._copy_page_kwargs()
-        article_kwargs['metadata']['author'] = Author("O'Brien", settings)
-        article_kwargs['metadata']['category'] = Category(
-            'C# & stuff', settings)
-        article_kwargs['metadata']['title'] = 'fnord'
-        article_kwargs['settings'] = settings
+        article_kwargs["metadata"]["author"] = Author("O'Brien", settings)
+        article_kwargs["metadata"]["category"] = Category("C# & stuff", settings)
+        article_kwargs["metadata"]["title"] = "fnord"
+        article_kwargs["settings"] = settings
         article = Article(**article_kwargs)
-        self.assertEqual(article.url, 'obrien/csharp-stuff/fnord/')
-        self.assertEqual(
-            article.save_as, 'obrien/csharp-stuff/fnord/index.html')
+        self.assertEqual(article.url, "obrien/csharp-stuff/fnord/")
+        self.assertEqual(article.save_as, "obrien/csharp-stuff/fnord/index.html")
 
     def test_slugify_with_author_substitutions(self):
         settings = get_settings()
-        settings['AUTHOR_REGEX_SUBSTITUTIONS'] = [
-            ('Alexander Todorov', 'atodorov'),
-            ('Krasimir Tsonev', 'krasimir'),
-            (r'[^\w\s-]', ''),
-            (r'(?u)\A\s*', ''),
-            (r'(?u)\s*\Z', ''),
-            (r'[-\s]+', '-'),
+        settings["AUTHOR_REGEX_SUBSTITUTIONS"] = [
+            ("Alexander Todorov", "atodorov"),
+            ("Krasimir Tsonev", "krasimir"),
+            (r"[^\w\s-]", ""),
+            (r"(?u)\A\s*", ""),
+            (r"(?u)\s*\Z", ""),
+            (r"[-\s]+", "-"),
         ]
-        settings['ARTICLE_URL'] = 'blog/{author}/{slug}/'
-        settings['ARTICLE_SAVE_AS'] = 'blog/{author}/{slug}/index.html'
+        settings["ARTICLE_URL"] = "blog/{author}/{slug}/"
+        settings["ARTICLE_SAVE_AS"] = "blog/{author}/{slug}/index.html"
         article_kwargs = self._copy_page_kwargs()
-        article_kwargs['metadata']['author'] = Author('Alexander Todorov',
-                                                      settings)
-        article_kwargs['metadata']['title'] = 'fnord'
-        article_kwargs['settings'] = settings
+        article_kwargs["metadata"]["author"] = Author("Alexander Todorov", settings)
+        article_kwargs["metadata"]["title"] = "fnord"
+        article_kwargs["settings"] = settings
         article = Article(**article_kwargs)
-        self.assertEqual(article.url, 'blog/atodorov/fnord/')
-        self.assertEqual(article.save_as, 'blog/atodorov/fnord/index.html')
+        self.assertEqual(article.url, "blog/atodorov/fnord/")
+        self.assertEqual(article.save_as, "blog/atodorov/fnord/index.html")
 
     def test_slugify_category_with_dots(self):
         settings = get_settings()
-        settings['CATEGORY_REGEX_SUBSTITUTIONS'] = [
-            ('Fedora QA', 'fedora.qa'),
+        settings["CATEGORY_REGEX_SUBSTITUTIONS"] = [
+            ("Fedora QA", "fedora.qa"),
         ]
-        settings['ARTICLE_URL'] = '{category}/{slug}/'
+        settings["ARTICLE_URL"] = "{category}/{slug}/"
         article_kwargs = self._copy_page_kwargs()
-        article_kwargs['metadata']['category'] = Category('Fedora QA',
-                                                          settings)
-        article_kwargs['metadata']['title'] = 'This Week in Fedora QA'
-        article_kwargs['settings'] = settings
+        article_kwargs["metadata"]["category"] = Category("Fedora QA", settings)
+        article_kwargs["metadata"]["title"] = "This Week in Fedora QA"
+        article_kwargs["settings"] = settings
         article = Article(**article_kwargs)
-        self.assertEqual(article.url, 'fedora.qa/this-week-in-fedora-qa/')
+        self.assertEqual(article.url, "fedora.qa/this-week-in-fedora-qa/")
 
     def test_valid_save_as_detects_breakout(self):
         settings = get_settings()
         article_kwargs = self._copy_page_kwargs()
-        article_kwargs['metadata']['slug'] = '../foo'
-        article_kwargs['settings'] = settings
+        article_kwargs["metadata"]["slug"] = "../foo"
+        article_kwargs["settings"] = settings
         article = Article(**article_kwargs)
         self.assertFalse(article._has_valid_save_as())
 
     def test_valid_save_as_detects_breakout_to_root(self):
         settings = get_settings()
         article_kwargs = self._copy_page_kwargs()
-        article_kwargs['metadata']['slug'] = '/foo'
-        article_kwargs['settings'] = settings
+        article_kwargs["metadata"]["slug"] = "/foo"
+        article_kwargs["settings"] = settings
         article = Article(**article_kwargs)
         self.assertFalse(article._has_valid_save_as())
 
     def test_valid_save_as_passes_valid(self):
         settings = get_settings()
         article_kwargs = self._copy_page_kwargs()
-        article_kwargs['metadata']['slug'] = 'foo'
-        article_kwargs['settings'] = settings
+        article_kwargs["metadata"]["slug"] = "foo"
+        article_kwargs["settings"] = settings
         article = Article(**article_kwargs)
         self.assertTrue(article._has_valid_save_as())
 
 
 class TestStatic(LoggedTestCase):
-
     def setUp(self):
         super().setUp()
         self.settings = get_settings(
-            STATIC_SAVE_AS='{path}',
-            STATIC_URL='{path}',
-            PAGE_SAVE_AS=os.path.join('outpages', '{slug}.html'),
-            PAGE_URL='outpages/{slug}.html')
+            STATIC_SAVE_AS="{path}",
+            STATIC_URL="{path}",
+            PAGE_SAVE_AS=os.path.join("outpages", "{slug}.html"),
+            PAGE_URL="outpages/{slug}.html",
+        )
         self.context = get_context(self.settings)
 
-        self.static = Static(content=None, metadata={}, settings=self.settings,
-                             source_path=posix_join('dir', 'foo.jpg'),
-                             context=self.context)
+        self.static = Static(
+            content=None,
+            metadata={},
+            settings=self.settings,
+            source_path=posix_join("dir", "foo.jpg"),
+            context=self.context,
+        )
 
-        self.context['static_content'][self.static.source_path] = self.static
+        self.context["static_content"][self.static.source_path] = self.static
 
     def tearDown(self):
         pass
 
     def test_attach_to_same_dir(self):
-        """attach_to() overrides a static file's save_as and url.
-        """
+        """attach_to() overrides a static file's save_as and url."""
         page = Page(
             content="fake page",
-            metadata={'title': 'fakepage'},
+            metadata={"title": "fakepage"},
             settings=self.settings,
-            source_path=os.path.join('dir', 'fakepage.md'))
+            source_path=os.path.join("dir", "fakepage.md"),
+        )
         self.static.attach_to(page)
 
-        expected_save_as = os.path.join('outpages', 'foo.jpg')
+        expected_save_as = os.path.join("outpages", "foo.jpg")
         self.assertEqual(self.static.save_as, expected_save_as)
         self.assertEqual(self.static.url, path_to_url(expected_save_as))
 
     def test_attach_to_parent_dir(self):
-        """attach_to() preserves dirs inside the linking document dir.
-        """
-        page = Page(content="fake page", metadata={'title': 'fakepage'},
-                    settings=self.settings, source_path='fakepage.md')
+        """attach_to() preserves dirs inside the linking document dir."""
+        page = Page(
+            content="fake page",
+            metadata={"title": "fakepage"},
+            settings=self.settings,
+            source_path="fakepage.md",
+        )
         self.static.attach_to(page)
 
-        expected_save_as = os.path.join('outpages', 'dir', 'foo.jpg')
+        expected_save_as = os.path.join("outpages", "dir", "foo.jpg")
         self.assertEqual(self.static.save_as, expected_save_as)
         self.assertEqual(self.static.url, path_to_url(expected_save_as))
 
     def test_attach_to_other_dir(self):
-        """attach_to() ignores dirs outside the linking document dir.
-        """
-        page = Page(content="fake page",
-                    metadata={'title': 'fakepage'}, settings=self.settings,
-                    source_path=os.path.join('dir', 'otherdir', 'fakepage.md'))
+        """attach_to() ignores dirs outside the linking document dir."""
+        page = Page(
+            content="fake page",
+            metadata={"title": "fakepage"},
+            settings=self.settings,
+            source_path=os.path.join("dir", "otherdir", "fakepage.md"),
+        )
         self.static.attach_to(page)
 
-        expected_save_as = os.path.join('outpages', 'foo.jpg')
+        expected_save_as = os.path.join("outpages", "foo.jpg")
         self.assertEqual(self.static.save_as, expected_save_as)
         self.assertEqual(self.static.url, path_to_url(expected_save_as))
 
     def test_attach_to_ignores_subsequent_calls(self):
-        """attach_to() does nothing when called a second time.
-        """
-        page = Page(content="fake page",
-                    metadata={'title': 'fakepage'}, settings=self.settings,
-                    source_path=os.path.join('dir', 'fakepage.md'))
+        """attach_to() does nothing when called a second time."""
+        page = Page(
+            content="fake page",
+            metadata={"title": "fakepage"},
+            settings=self.settings,
+            source_path=os.path.join("dir", "fakepage.md"),
+        )
 
         self.static.attach_to(page)
 
         otherdir_settings = self.settings.copy()
-        otherdir_settings.update(dict(
-            PAGE_SAVE_AS=os.path.join('otherpages', '{slug}.html'),
-            PAGE_URL='otherpages/{slug}.html'))
+        otherdir_settings.update(
+            dict(
+                PAGE_SAVE_AS=os.path.join("otherpages", "{slug}.html"),
+                PAGE_URL="otherpages/{slug}.html",
+            )
+        )
         otherdir_page = Page(
             content="other page",
-            metadata={'title': 'otherpage'},
+            metadata={"title": "otherpage"},
             settings=otherdir_settings,
-            source_path=os.path.join('dir', 'otherpage.md'))
+            source_path=os.path.join("dir", "otherpage.md"),
+        )
 
         self.static.attach_to(otherdir_page)
 
-        otherdir_save_as = os.path.join('otherpages', 'foo.jpg')
+        otherdir_save_as = os.path.join("otherpages", "foo.jpg")
         self.assertNotEqual(self.static.save_as, otherdir_save_as)
         self.assertNotEqual(self.static.url, path_to_url(otherdir_save_as))
 
@@ -851,9 +862,10 @@ class TestStatic(LoggedTestCase):
 
         page = Page(
             content="fake page",
-            metadata={'title': 'fakepage'},
+            metadata={"title": "fakepage"},
             settings=self.settings,
-            source_path=os.path.join('dir', 'fakepage.md'))
+            source_path=os.path.join("dir", "fakepage.md"),
+        )
         self.static.attach_to(page)
 
         self.assertEqual(self.static.save_as, original_save_as)
@@ -867,9 +879,10 @@ class TestStatic(LoggedTestCase):
 
         page = Page(
             content="fake page",
-            metadata={'title': 'fakepage'},
+            metadata={"title": "fakepage"},
             settings=self.settings,
-            source_path=os.path.join('dir', 'fakepage.md'))
+            source_path=os.path.join("dir", "fakepage.md"),
+        )
         self.static.attach_to(page)
 
         self.assertEqual(self.static.save_as, self.static.source_path)
@@ -881,38 +894,41 @@ class TestStatic(LoggedTestCase):
         """
         customstatic = Static(
             content=None,
-            metadata=dict(save_as='customfoo.jpg', url='customfoo.jpg'),
+            metadata=dict(save_as="customfoo.jpg", url="customfoo.jpg"),
             settings=self.settings,
-            source_path=os.path.join('dir', 'foo.jpg'),
-            context=self.settings.copy())
+            source_path=os.path.join("dir", "foo.jpg"),
+            context=self.settings.copy(),
+        )
 
         page = Page(
             content="fake page",
-            metadata={'title': 'fakepage'}, settings=self.settings,
-            source_path=os.path.join('dir', 'fakepage.md'))
+            metadata={"title": "fakepage"},
+            settings=self.settings,
+            source_path=os.path.join("dir", "fakepage.md"),
+        )
 
         customstatic.attach_to(page)
 
-        self.assertEqual(customstatic.save_as, 'customfoo.jpg')
-        self.assertEqual(customstatic.url, 'customfoo.jpg')
+        self.assertEqual(customstatic.save_as, "customfoo.jpg")
+        self.assertEqual(customstatic.url, "customfoo.jpg")
 
     def test_attach_link_syntax(self):
-        """{attach} link syntax triggers output path override & url replacement.
-        """
+        """{attach} link syntax triggers output path override & url replacement."""
         html = '<a href="{attach}../foo.jpg">link</a>'
         page = Page(
             content=html,
-            metadata={'title': 'fakepage'},
+            metadata={"title": "fakepage"},
             settings=self.settings,
-            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
-            context=self.context)
-        content = page.get_content('')
+            source_path=os.path.join("dir", "otherdir", "fakepage.md"),
+            context=self.context,
+        )
+        content = page.get_content("")
 
         self.assertNotEqual(
-            content, html,
-            "{attach} link syntax did not trigger URL replacement.")
+            content, html, "{attach} link syntax did not trigger URL replacement."
+        )
 
-        expected_save_as = os.path.join('outpages', 'foo.jpg')
+        expected_save_as = os.path.join("outpages", "foo.jpg")
         self.assertEqual(self.static.save_as, expected_save_as)
         self.assertEqual(self.static.url, path_to_url(expected_save_as))
 
@@ -922,11 +938,12 @@ class TestStatic(LoggedTestCase):
         html = '<a href="{tag}foo">link</a>'
         page = Page(
             content=html,
-            metadata={'title': 'fakepage'},
+            metadata={"title": "fakepage"},
             settings=self.settings,
-            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
-            context=self.context)
-        content = page.get_content('')
+            source_path=os.path.join("dir", "otherdir", "fakepage.md"),
+            context=self.context,
+        )
+        content = page.get_content("")
 
         self.assertNotEqual(content, html)
 
@@ -936,11 +953,12 @@ class TestStatic(LoggedTestCase):
         html = '<a href="{category}foo">link</a>'
         page = Page(
             content=html,
-            metadata={'title': 'fakepage'},
+            metadata={"title": "fakepage"},
             settings=self.settings,
-            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
-            context=self.context)
-        content = page.get_content('')
+            source_path=os.path.join("dir", "otherdir", "fakepage.md"),
+            context=self.context,
+        )
+        content = page.get_content("")
 
         self.assertNotEqual(content, html)
 
@@ -950,11 +968,12 @@ class TestStatic(LoggedTestCase):
         html = '<a href="{author}foo">link</a>'
         page = Page(
             content=html,
-            metadata={'title': 'fakepage'},
+            metadata={"title": "fakepage"},
             settings=self.settings,
-            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
-            context=self.context)
-        content = page.get_content('')
+            source_path=os.path.join("dir", "otherdir", "fakepage.md"),
+            context=self.context,
+        )
+        content = page.get_content("")
 
         self.assertNotEqual(content, html)
 
@@ -964,52 +983,62 @@ class TestStatic(LoggedTestCase):
         html = '<a href="{index}">link</a>'
         page = Page(
             content=html,
-            metadata={'title': 'fakepage'},
+            metadata={"title": "fakepage"},
             settings=self.settings,
-            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
-            context=self.context)
-        content = page.get_content('')
+            source_path=os.path.join("dir", "otherdir", "fakepage.md"),
+            context=self.context,
+        )
+        content = page.get_content("")
 
         self.assertNotEqual(content, html)
 
-        expected_html = ('<a href="' +
-                         '/'.join((self.settings['SITEURL'],
-                                   self.settings['INDEX_SAVE_AS'])) +
-                         '">link</a>')
+        expected_html = (
+            '<a href="'
+            + "/".join((self.settings["SITEURL"], self.settings["INDEX_SAVE_AS"]))
+            + '">link</a>'
+        )
         self.assertEqual(content, expected_html)
 
     def test_unknown_link_syntax(self):
         "{unknown} link syntax should trigger warning."
 
         html = '<a href="{unknown}foo">link</a>'
-        page = Page(content=html,
-                    metadata={'title': 'fakepage'}, settings=self.settings,
-                    source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
-                    context=self.context)
-        content = page.get_content('')
+        page = Page(
+            content=html,
+            metadata={"title": "fakepage"},
+            settings=self.settings,
+            source_path=os.path.join("dir", "otherdir", "fakepage.md"),
+            context=self.context,
+        )
+        content = page.get_content("")
 
         self.assertEqual(content, html)
         self.assertLogCountEqual(
             count=1,
             msg="Replacement Indicator 'unknown' not recognized, "
-                "skipping replacement",
-            level=logging.WARNING)
+            "skipping replacement",
+            level=logging.WARNING,
+        )
 
     def test_link_to_unknown_file(self):
         "{filename} link to unknown file should trigger warning."
 
         html = '<a href="{filename}foo">link</a>'
-        page = Page(content=html,
-                    metadata={'title': 'fakepage'}, settings=self.settings,
-                    source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
-                    context=self.context)
-        content = page.get_content('')
+        page = Page(
+            content=html,
+            metadata={"title": "fakepage"},
+            settings=self.settings,
+            source_path=os.path.join("dir", "otherdir", "fakepage.md"),
+            context=self.context,
+        )
+        content = page.get_content("")
 
         self.assertEqual(content, html)
         self.assertLogCountEqual(
             count=1,
             msg="Unable to find 'foo', skipping url replacement.",
-            level=logging.WARNING)
+            level=logging.WARNING,
+        )
 
     def test_index_link_syntax_with_spaces(self):
         """{index} link syntax triggers url replacement
@@ -1018,18 +1047,20 @@ class TestStatic(LoggedTestCase):
         html = '<a href = "{index}">link</a>'
         page = Page(
             content=html,
-            metadata={'title': 'fakepage'},
+            metadata={"title": "fakepage"},
             settings=self.settings,
-            source_path=os.path.join('dir', 'otherdir', 'fakepage.md'),
-            context=self.context)
-        content = page.get_content('')
+            source_path=os.path.join("dir", "otherdir", "fakepage.md"),
+            context=self.context,
+        )
+        content = page.get_content("")
 
         self.assertNotEqual(content, html)
 
-        expected_html = ('<a href = "' +
-                         '/'.join((self.settings['SITEURL'],
-                                   self.settings['INDEX_SAVE_AS'])) +
-                         '">link</a>')
+        expected_html = (
+            '<a href = "'
+            + "/".join((self.settings["SITEURL"], self.settings["INDEX_SAVE_AS"]))
+            + '">link</a>'
+        )
         self.assertEqual(content, expected_html)
 
     def test_not_save_as_draft(self):
@@ -1037,12 +1068,15 @@ class TestStatic(LoggedTestCase):
 
         static = Static(
             content=None,
-            metadata=dict(status='draft',),
+            metadata=dict(
+                status="draft",
+            ),
             settings=self.settings,
-            source_path=os.path.join('dir', 'foo.jpg'),
-            context=self.settings.copy())
+            source_path=os.path.join("dir", "foo.jpg"),
+            context=self.settings.copy(),
+        )
 
-        expected_save_as = posixize_path(os.path.join('dir', 'foo.jpg'))
-        self.assertEqual(static.status, 'draft')
+        expected_save_as = posixize_path(os.path.join("dir", "foo.jpg"))
+        self.assertEqual(static.status, "draft")
         self.assertEqual(static.save_as, expected_save_as)
         self.assertEqual(static.url, path_to_url(expected_save_as))
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 05c37269..52adb2c9 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -4,293 +4,383 @@ from shutil import copy, rmtree
 from tempfile import mkdtemp
 from unittest.mock import MagicMock
 
-from pelican.generators import (ArticlesGenerator, Generator, PagesGenerator,
-                                PelicanTemplateNotFound, StaticGenerator,
-                                TemplatePagesGenerator)
-from pelican.tests.support import (can_symlink, get_context, get_settings,
-                                   unittest, TestCaseWithCLocale)
+from pelican.generators import (
+    ArticlesGenerator,
+    Generator,
+    PagesGenerator,
+    PelicanTemplateNotFound,
+    StaticGenerator,
+    TemplatePagesGenerator,
+)
+from pelican.tests.support import (
+    can_symlink,
+    get_context,
+    get_settings,
+    unittest,
+    TestCaseWithCLocale,
+)
 from pelican.writers import Writer
 
 CUR_DIR = os.path.dirname(__file__)
-CONTENT_DIR = os.path.join(CUR_DIR, 'content')
+CONTENT_DIR = os.path.join(CUR_DIR, "content")
 
 
 class TestGenerator(TestCaseWithCLocale):
     def setUp(self):
         super().setUp()
         self.settings = get_settings()
-        self.settings['READERS'] = {'asc': None}
-        self.generator = Generator(self.settings.copy(), self.settings,
-                                   CUR_DIR, self.settings['THEME'], None)
+        self.settings["READERS"] = {"asc": None}
+        self.generator = Generator(
+            self.settings.copy(), self.settings, CUR_DIR, self.settings["THEME"], None
+        )
 
     def test_include_path(self):
-        self.settings['IGNORE_FILES'] = {'ignored1.rst', 'ignored2.rst'}
+        self.settings["IGNORE_FILES"] = {"ignored1.rst", "ignored2.rst"}
 
-        filename = os.path.join(CUR_DIR, 'content', 'article.rst')
+        filename = os.path.join(CUR_DIR, "content", "article.rst")
         include_path = self.generator._include_path
         self.assertTrue(include_path(filename))
-        self.assertTrue(include_path(filename, extensions=('rst',)))
-        self.assertFalse(include_path(filename, extensions=('md',)))
+        self.assertTrue(include_path(filename, extensions=("rst",)))
+        self.assertFalse(include_path(filename, extensions=("md",)))
 
-        ignored_file = os.path.join(CUR_DIR, 'content', 'ignored1.rst')
+        ignored_file = os.path.join(CUR_DIR, "content", "ignored1.rst")
         self.assertFalse(include_path(ignored_file))
 
     def test_get_files_exclude(self):
-        """Test that Generator.get_files() properly excludes directories.
-        """
+        """Test that Generator.get_files() properly excludes directories."""
         # We use our own Generator so we can give it our own content path
         generator = Generator(
             context=self.settings.copy(),
             settings=self.settings,
-            path=os.path.join(CUR_DIR, 'nested_content'),
-            theme=self.settings['THEME'], output_path=None)
+            path=os.path.join(CUR_DIR, "nested_content"),
+            theme=self.settings["THEME"],
+            output_path=None,
+        )
 
-        filepaths = generator.get_files(paths=['maindir'])
+        filepaths = generator.get_files(paths=["maindir"])
         found_files = {os.path.basename(f) for f in filepaths}
-        expected_files = {'maindir.md', 'subdir.md'}
+        expected_files = {"maindir.md", "subdir.md"}
         self.assertFalse(
-            expected_files - found_files,
-            "get_files() failed to find one or more files")
+            expected_files - found_files, "get_files() failed to find one or more files"
+        )
 
         # Test string as `paths` argument rather than list
-        filepaths = generator.get_files(paths='maindir')
+        filepaths = generator.get_files(paths="maindir")
         found_files = {os.path.basename(f) for f in filepaths}
-        expected_files = {'maindir.md', 'subdir.md'}
+        expected_files = {"maindir.md", "subdir.md"}
         self.assertFalse(
-            expected_files - found_files,
-            "get_files() failed to find one or more files")
+            expected_files - found_files, "get_files() failed to find one or more files"
+        )
 
-        filepaths = generator.get_files(paths=[''], exclude=['maindir'])
+        filepaths = generator.get_files(paths=[""], exclude=["maindir"])
         found_files = {os.path.basename(f) for f in filepaths}
         self.assertNotIn(
-            'maindir.md', found_files,
-            "get_files() failed to exclude a top-level directory")
+            "maindir.md",
+            found_files,
+            "get_files() failed to exclude a top-level directory",
+        )
         self.assertNotIn(
-            'subdir.md', found_files,
-            "get_files() failed to exclude a subdir of an excluded directory")
+            "subdir.md",
+            found_files,
+            "get_files() failed to exclude a subdir of an excluded directory",
+        )
 
         filepaths = generator.get_files(
-            paths=[''],
-            exclude=[os.path.join('maindir', 'subdir')])
+            paths=[""], exclude=[os.path.join("maindir", "subdir")]
+        )
         found_files = {os.path.basename(f) for f in filepaths}
         self.assertNotIn(
-            'subdir.md', found_files,
-            "get_files() failed to exclude a subdirectory")
+            "subdir.md", found_files, "get_files() failed to exclude a subdirectory"
+        )
 
-        filepaths = generator.get_files(paths=[''], exclude=['subdir'])
+        filepaths = generator.get_files(paths=[""], exclude=["subdir"])
         found_files = {os.path.basename(f) for f in filepaths}
         self.assertIn(
-            'subdir.md', found_files,
-            "get_files() excluded a subdirectory by name, ignoring its path")
+            "subdir.md",
+            found_files,
+            "get_files() excluded a subdirectory by name, ignoring its path",
+        )
 
     def test_custom_jinja_environment(self):
         """
-            Test that setting the JINJA_ENVIRONMENT
-            properly gets set from the settings config
+        Test that setting the JINJA_ENVIRONMENT
+        properly gets set from the settings config
         """
         settings = get_settings()
-        comment_start_string = 'abc'
-        comment_end_string = '/abc'
-        settings['JINJA_ENVIRONMENT'] = {
-            'comment_start_string': comment_start_string,
-            'comment_end_string': comment_end_string
+        comment_start_string = "abc"
+        comment_end_string = "/abc"
+        settings["JINJA_ENVIRONMENT"] = {
+            "comment_start_string": comment_start_string,
+            "comment_end_string": comment_end_string,
         }
-        generator = Generator(settings.copy(), settings,
-                              CUR_DIR, settings['THEME'], None)
-        self.assertEqual(comment_start_string,
-                         generator.env.comment_start_string)
-        self.assertEqual(comment_end_string,
-                         generator.env.comment_end_string)
+        generator = Generator(
+            settings.copy(), settings, CUR_DIR, settings["THEME"], None
+        )
+        self.assertEqual(comment_start_string, generator.env.comment_start_string)
+        self.assertEqual(comment_end_string, generator.env.comment_end_string)
 
     def test_theme_overrides(self):
         """
-            Test that the THEME_TEMPLATES_OVERRIDES configuration setting is
-            utilized correctly in the Generator.
+        Test that the THEME_TEMPLATES_OVERRIDES configuration setting is
+        utilized correctly in the Generator.
         """
-        override_dirs = (os.path.join(CUR_DIR, 'theme_overrides', 'level1'),
-                         os.path.join(CUR_DIR, 'theme_overrides', 'level2'))
-        self.settings['THEME_TEMPLATES_OVERRIDES'] = override_dirs
+        override_dirs = (
+            os.path.join(CUR_DIR, "theme_overrides", "level1"),
+            os.path.join(CUR_DIR, "theme_overrides", "level2"),
+        )
+        self.settings["THEME_TEMPLATES_OVERRIDES"] = override_dirs
         generator = Generator(
             context=self.settings.copy(),
             settings=self.settings,
             path=CUR_DIR,
-            theme=self.settings['THEME'],
-            output_path=None)
+            theme=self.settings["THEME"],
+            output_path=None,
+        )
 
-        filename = generator.get_template('article').filename
+        filename = generator.get_template("article").filename
         self.assertEqual(override_dirs[0], os.path.dirname(filename))
-        self.assertEqual('article.html', os.path.basename(filename))
+        self.assertEqual("article.html", os.path.basename(filename))
 
-        filename = generator.get_template('authors').filename
+        filename = generator.get_template("authors").filename
         self.assertEqual(override_dirs[1], os.path.dirname(filename))
-        self.assertEqual('authors.html', os.path.basename(filename))
+        self.assertEqual("authors.html", os.path.basename(filename))
 
-        filename = generator.get_template('taglist').filename
-        self.assertEqual(os.path.join(self.settings['THEME'], 'templates'),
-                         os.path.dirname(filename))
+        filename = generator.get_template("taglist").filename
+        self.assertEqual(
+            os.path.join(self.settings["THEME"], "templates"), os.path.dirname(filename)
+        )
         self.assertNotIn(os.path.dirname(filename), override_dirs)
-        self.assertEqual('taglist.html', os.path.basename(filename))
+        self.assertEqual("taglist.html", os.path.basename(filename))
 
     def test_simple_prefix(self):
         """
-            Test `!simple` theme prefix.
+        Test `!simple` theme prefix.
         """
-        filename = self.generator.get_template('!simple/authors').filename
+        filename = self.generator.get_template("!simple/authors").filename
         expected_path = os.path.join(
-            os.path.dirname(CUR_DIR), 'themes', 'simple', 'templates')
+            os.path.dirname(CUR_DIR), "themes", "simple", "templates"
+        )
         self.assertEqual(expected_path, os.path.dirname(filename))
-        self.assertEqual('authors.html', os.path.basename(filename))
+        self.assertEqual("authors.html", os.path.basename(filename))
 
     def test_theme_prefix(self):
         """
-            Test `!theme` theme prefix.
+        Test `!theme` theme prefix.
         """
-        filename = self.generator.get_template('!theme/authors').filename
+        filename = self.generator.get_template("!theme/authors").filename
         expected_path = os.path.join(
-            os.path.dirname(CUR_DIR), 'themes', 'notmyidea', 'templates')
+            os.path.dirname(CUR_DIR), "themes", "notmyidea", "templates"
+        )
         self.assertEqual(expected_path, os.path.dirname(filename))
-        self.assertEqual('authors.html', os.path.basename(filename))
+        self.assertEqual("authors.html", os.path.basename(filename))
 
     def test_bad_prefix(self):
         """
-            Test unknown/bad theme prefix throws exception.
+        Test unknown/bad theme prefix throws exception.
         """
-        self.assertRaises(PelicanTemplateNotFound, self.generator.get_template,
-                          '!UNKNOWN/authors')
+        self.assertRaises(
+            PelicanTemplateNotFound, self.generator.get_template, "!UNKNOWN/authors"
+        )
 
 
 class TestArticlesGenerator(unittest.TestCase):
-
     @classmethod
     def setUpClass(cls):
         settings = get_settings()
-        settings['DEFAULT_CATEGORY'] = 'Default'
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
-        settings['READERS'] = {'asc': None}
-        settings['CACHE_CONTENT'] = False
+        settings["DEFAULT_CATEGORY"] = "Default"
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
+        settings["READERS"] = {"asc": None}
+        settings["CACHE_CONTENT"] = False
         context = get_context(settings)
 
         cls.generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         cls.generator.generate_context()
         cls.articles = cls.distill_articles(cls.generator.articles)
         cls.drafts = cls.distill_articles(cls.generator.drafts)
         cls.hidden_articles = cls.distill_articles(cls.generator.hidden_articles)
 
     def setUp(self):
-        self.temp_cache = mkdtemp(prefix='pelican_cache.')
+        self.temp_cache = mkdtemp(prefix="pelican_cache.")
 
     def tearDown(self):
         rmtree(self.temp_cache)
 
     @staticmethod
     def distill_articles(articles):
-        return [[article.title, article.status, article.category.name,
-                 article.template] for article in articles]
+        return [
+            [article.title, article.status, article.category.name, article.template]
+            for article in articles
+        ]
 
     def test_generate_feeds(self):
         settings = get_settings()
-        settings['CACHE_PATH'] = self.temp_cache
+        settings["CACHE_PATH"] = self.temp_cache
         generator = ArticlesGenerator(
-            context=settings, settings=settings,
-            path=None, theme=settings['THEME'], output_path=None)
+            context=settings,
+            settings=settings,
+            path=None,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         writer = MagicMock()
         generator.generate_feeds(writer)
-        writer.write_feed.assert_called_with([], settings,
-                                             'feeds/all.atom.xml',
-                                             'feeds/all.atom.xml')
+        writer.write_feed.assert_called_with(
+            [], settings, "feeds/all.atom.xml", "feeds/all.atom.xml"
+        )
 
         generator = ArticlesGenerator(
-            context=settings, settings=get_settings(FEED_ALL_ATOM=None),
-            path=None, theme=settings['THEME'], output_path=None)
+            context=settings,
+            settings=get_settings(FEED_ALL_ATOM=None),
+            path=None,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         writer = MagicMock()
         generator.generate_feeds(writer)
         self.assertFalse(writer.write_feed.called)
 
     def test_generate_feeds_override_url(self):
         settings = get_settings()
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['FEED_ALL_ATOM_URL'] = 'feeds/atom/all/'
+        settings["CACHE_PATH"] = self.temp_cache
+        settings["FEED_ALL_ATOM_URL"] = "feeds/atom/all/"
         generator = ArticlesGenerator(
-            context=settings, settings=settings,
-            path=None, theme=settings['THEME'], output_path=None)
+            context=settings,
+            settings=settings,
+            path=None,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         writer = MagicMock()
         generator.generate_feeds(writer)
-        writer.write_feed.assert_called_with([], settings,
-                                             'feeds/all.atom.xml',
-                                             'feeds/atom/all/')
+        writer.write_feed.assert_called_with(
+            [], settings, "feeds/all.atom.xml", "feeds/atom/all/"
+        )
 
     def test_generate_context(self):
         articles_expected = [
-            ['Article title', 'published', 'Default', 'article'],
-            ['Article with markdown and summary metadata multi', 'published',
-             'Default', 'article'],
-            ['Article with markdown and nested summary metadata', 'published',
-             'Default', 'article'],
-            ['Article with markdown and summary metadata single', 'published',
-             'Default', 'article'],
-            ['Article with markdown containing footnotes', 'published',
-             'Default', 'article'],
-            ['Article with template', 'published', 'Default', 'custom'],
-            ['Metadata tags as list!', 'published', 'Default', 'article'],
-            ['Rst with filename metadata', 'published', 'yeah', 'article'],
-            ['One -, two --, three --- dashes!', 'published', 'Default',
-             'article'],
-            ['One -, two --, three --- dashes!', 'published', 'Default',
-             'article'],
-            ['Test Markdown extensions', 'published', 'Default', 'article'],
-            ['Test markdown File', 'published', 'test', 'article'],
-            ['Test md File', 'published', 'test', 'article'],
-            ['Test mdown File', 'published', 'test', 'article'],
-            ['Test metadata duplicates', 'published', 'test', 'article'],
-            ['Test mkd File', 'published', 'test', 'article'],
-            ['This is a super article !', 'published', 'Yeah', 'article'],
-            ['This is a super article !', 'published', 'Yeah', 'article'],
-            ['Article with Nonconformant HTML meta tags', 'published',
-                'Default', 'article'],
-            ['This is a super article !', 'published', 'yeah', 'article'],
-            ['This is a super article !', 'published', 'yeah', 'article'],
-            ['This is a super article !', 'published', 'yeah', 'article'],
-            ['This is a super article !', 'published', 'yeah', 'article'],
-            ['This is a super article !', 'published', 'yeah', 'article'],
-            ['This is a super article !', 'published', 'yeah', 'article'],
-            ['This is a super article !', 'published', 'yeah', 'article'],
-            ['This is a super article !', 'published', 'yeah', 'article'],
-            ['This is a super article !', 'published', 'Default', 'article'],
-            ['Article with an inline SVG', 'published', 'Default', 'article'],
-            ['Article with markdown and empty tags', 'published', 'Default',
-             'article'],
-            ['This is an article with category !', 'published', 'yeah',
-             'article'],
-            ['This is an article with multiple authors!', 'published',
-                'Default', 'article'],
-            ['This is an article with multiple authors!', 'published',
-                'Default', 'article'],
-            ['This is an article with multiple authors in list format!',
-                'published', 'Default', 'article'],
-            ['This is an article with multiple authors in lastname, '
-             'firstname format!', 'published', 'Default', 'article'],
-            ['This is an article without category !', 'published', 'Default',
-                'article'],
-            ['This is an article without category !', 'published',
-             'TestCategory', 'article'],
-            ['An Article With Code Block To Test Typogrify Ignore',
-                'published', 'Default', 'article'],
-            ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定',
-                'published', '指導書', 'article'],
+            ["Article title", "published", "Default", "article"],
+            [
+                "Article with markdown and summary metadata multi",
+                "published",
+                "Default",
+                "article",
+            ],
+            [
+                "Article with markdown and nested summary metadata",
+                "published",
+                "Default",
+                "article",
+            ],
+            [
+                "Article with markdown and summary metadata single",
+                "published",
+                "Default",
+                "article",
+            ],
+            [
+                "Article with markdown containing footnotes",
+                "published",
+                "Default",
+                "article",
+            ],
+            ["Article with template", "published", "Default", "custom"],
+            ["Metadata tags as list!", "published", "Default", "article"],
+            ["Rst with filename metadata", "published", "yeah", "article"],
+            ["One -, two --, three --- dashes!", "published", "Default", "article"],
+            ["One -, two --, three --- dashes!", "published", "Default", "article"],
+            ["Test Markdown extensions", "published", "Default", "article"],
+            ["Test markdown File", "published", "test", "article"],
+            ["Test md File", "published", "test", "article"],
+            ["Test mdown File", "published", "test", "article"],
+            ["Test metadata duplicates", "published", "test", "article"],
+            ["Test mkd File", "published", "test", "article"],
+            ["This is a super article !", "published", "Yeah", "article"],
+            ["This is a super article !", "published", "Yeah", "article"],
+            [
+                "Article with Nonconformant HTML meta tags",
+                "published",
+                "Default",
+                "article",
+            ],
+            ["This is a super article !", "published", "yeah", "article"],
+            ["This is a super article !", "published", "yeah", "article"],
+            ["This is a super article !", "published", "yeah", "article"],
+            ["This is a super article !", "published", "yeah", "article"],
+            ["This is a super article !", "published", "yeah", "article"],
+            ["This is a super article !", "published", "yeah", "article"],
+            ["This is a super article !", "published", "yeah", "article"],
+            ["This is a super article !", "published", "yeah", "article"],
+            ["This is a super article !", "published", "Default", "article"],
+            ["Article with an inline SVG", "published", "Default", "article"],
+            ["Article with markdown and empty tags", "published", "Default", "article"],
+            ["This is an article with category !", "published", "yeah", "article"],
+            [
+                "This is an article with multiple authors!",
+                "published",
+                "Default",
+                "article",
+            ],
+            [
+                "This is an article with multiple authors!",
+                "published",
+                "Default",
+                "article",
+            ],
+            [
+                "This is an article with multiple authors in list format!",
+                "published",
+                "Default",
+                "article",
+            ],
+            [
+                "This is an article with multiple authors in lastname, "
+                "firstname format!",
+                "published",
+                "Default",
+                "article",
+            ],
+            [
+                "This is an article without category !",
+                "published",
+                "Default",
+                "article",
+            ],
+            [
+                "This is an article without category !",
+                "published",
+                "TestCategory",
+                "article",
+            ],
+            [
+                "An Article With Code Block To Test Typogrify Ignore",
+                "published",
+                "Default",
+                "article",
+            ],
+            [
+                "マックOS X 10.8でパイソンとVirtualenvをインストールと設定",
+                "published",
+                "指導書",
+                "article",
+            ],
         ]
         self.assertEqual(sorted(articles_expected), sorted(self.articles))
 
     def test_articles_draft(self):
         draft_articles_expected = [
-            ['Draft article', 'draft', 'Default', 'article'],
+            ["Draft article", "draft", "Default", "article"],
         ]
         self.assertEqual(sorted(draft_articles_expected), sorted(self.drafts))
 
     def test_articles_hidden(self):
         hidden_articles_expected = [
-            ['Hidden article', 'hidden', 'Default', 'article'],
+            ["Hidden article", "hidden", "Default", "article"],
         ]
         self.assertEqual(sorted(hidden_articles_expected), sorted(self.hidden_articles))
 
@@ -301,27 +391,30 @@ class TestArticlesGenerator(unittest.TestCase):
         # terms of process order will define the name for that category
         categories = [cat.name for cat, _ in self.generator.categories]
         categories_alternatives = (
-            sorted(['Default', 'TestCategory', 'Yeah', 'test', '指導書']),
-            sorted(['Default', 'TestCategory', 'yeah', 'test', '指導書']),
+            sorted(["Default", "TestCategory", "Yeah", "test", "指導書"]),
+            sorted(["Default", "TestCategory", "yeah", "test", "指導書"]),
         )
         self.assertIn(sorted(categories), categories_alternatives)
         # test for slug
         categories = [cat.slug for cat, _ in self.generator.categories]
-        categories_expected = ['default', 'testcategory', 'yeah', 'test',
-                               'zhi-dao-shu']
+        categories_expected = ["default", "testcategory", "yeah", "test", "zhi-dao-shu"]
         self.assertEqual(sorted(categories), sorted(categories_expected))
 
     def test_do_not_use_folder_as_category(self):
         settings = get_settings()
-        settings['DEFAULT_CATEGORY'] = 'Default'
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
-        settings['USE_FOLDER_AS_CATEGORY'] = False
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['READERS'] = {'asc': None}
+        settings["DEFAULT_CATEGORY"] = "Default"
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
+        settings["USE_FOLDER_AS_CATEGORY"] = False
+        settings["CACHE_PATH"] = self.temp_cache
+        settings["READERS"] = {"asc": None}
         context = get_context(settings)
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         # test for name
         # categories are grouped by slug; if two categories have the same slug
@@ -329,61 +422,79 @@ class TestArticlesGenerator(unittest.TestCase):
         # terms of process order will define the name for that category
         categories = [cat.name for cat, _ in generator.categories]
         categories_alternatives = (
-            sorted(['Default', 'Yeah', 'test', '指導書']),
-            sorted(['Default', 'yeah', 'test', '指導書']),
+            sorted(["Default", "Yeah", "test", "指導書"]),
+            sorted(["Default", "yeah", "test", "指導書"]),
         )
         self.assertIn(sorted(categories), categories_alternatives)
         # test for slug
         categories = [cat.slug for cat, _ in generator.categories]
-        categories_expected = ['default', 'yeah', 'test', 'zhi-dao-shu']
+        categories_expected = ["default", "yeah", "test", "zhi-dao-shu"]
         self.assertEqual(sorted(categories), sorted(categories_expected))
 
     def test_direct_templates_save_as_url_default(self):
-
         settings = get_settings()
-        settings['CACHE_PATH'] = self.temp_cache
+        settings["CACHE_PATH"] = self.temp_cache
         context = get_context(settings)
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=None, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=None,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         write = MagicMock()
         generator.generate_direct_templates(write)
-        write.assert_called_with("archives.html",
-                                 generator.get_template("archives"), context,
-                                 articles=generator.articles,
-                                 dates=generator.dates, blog=True,
-                                 template_name='archives',
-                                 page_name='archives', url="archives.html")
+        write.assert_called_with(
+            "archives.html",
+            generator.get_template("archives"),
+            context,
+            articles=generator.articles,
+            dates=generator.dates,
+            blog=True,
+            template_name="archives",
+            page_name="archives",
+            url="archives.html",
+        )
 
     def test_direct_templates_save_as_url_modified(self):
-
         settings = get_settings()
-        settings['DIRECT_TEMPLATES'] = ['archives']
-        settings['ARCHIVES_SAVE_AS'] = 'archives/index.html'
-        settings['ARCHIVES_URL'] = 'archives/'
-        settings['CACHE_PATH'] = self.temp_cache
+        settings["DIRECT_TEMPLATES"] = ["archives"]
+        settings["ARCHIVES_SAVE_AS"] = "archives/index.html"
+        settings["ARCHIVES_URL"] = "archives/"
+        settings["CACHE_PATH"] = self.temp_cache
         generator = ArticlesGenerator(
-            context=settings, settings=settings,
-            path=None, theme=settings['THEME'], output_path=None)
+            context=settings,
+            settings=settings,
+            path=None,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         write = MagicMock()
         generator.generate_direct_templates(write)
-        write.assert_called_with("archives/index.html",
-                                 generator.get_template("archives"), settings,
-                                 articles=generator.articles,
-                                 dates=generator.dates, blog=True,
-                                 template_name='archives',
-                                 page_name='archives/index',
-                                 url="archives/")
+        write.assert_called_with(
+            "archives/index.html",
+            generator.get_template("archives"),
+            settings,
+            articles=generator.articles,
+            dates=generator.dates,
+            blog=True,
+            template_name="archives",
+            page_name="archives/index",
+            url="archives/",
+        )
 
     def test_direct_templates_save_as_false(self):
-
         settings = get_settings()
-        settings['DIRECT_TEMPLATES'] = ['archives']
-        settings['ARCHIVES_SAVE_AS'] = False
-        settings['CACHE_PATH'] = self.temp_cache
+        settings["DIRECT_TEMPLATES"] = ["archives"]
+        settings["ARCHIVES_SAVE_AS"] = False
+        settings["CACHE_PATH"] = self.temp_cache
         generator = ArticlesGenerator(
-            context=settings, settings=settings,
-            path=None, theme=settings['THEME'], output_path=None)
+            context=settings,
+            settings=settings,
+            path=None,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         write = MagicMock()
         generator.generate_direct_templates(write)
         self.assertEqual(write.call_count, 0)
@@ -392,10 +503,13 @@ class TestArticlesGenerator(unittest.TestCase):
         """
         Custom template articles get the field but standard/unset are None
         """
-        custom_template = ['Article with template', 'published', 'Default',
-                           'custom']
-        standard_template = ['This is a super article !', 'published', 'Yeah',
-                             'article']
+        custom_template = ["Article with template", "published", "Default", "custom"]
+        standard_template = [
+            "This is a super article !",
+            "published",
+            "Yeah",
+            "article",
+        ]
         self.assertIn(custom_template, self.articles)
         self.assertIn(standard_template, self.articles)
 
@@ -403,126 +517,135 @@ class TestArticlesGenerator(unittest.TestCase):
         """Test correctness of the period_archives context values."""
 
         settings = get_settings()
-        settings['CACHE_PATH'] = self.temp_cache
+        settings["CACHE_PATH"] = self.temp_cache
 
         # No period archives enabled:
         context = get_context(settings)
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
-        period_archives = generator.context['period_archives']
+        period_archives = generator.context["period_archives"]
         self.assertEqual(len(period_archives.items()), 0)
 
         # Year archives enabled:
-        settings['YEAR_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/index.html'
-        settings['YEAR_ARCHIVE_URL'] = 'posts/{date:%Y}/'
+        settings["YEAR_ARCHIVE_SAVE_AS"] = "posts/{date:%Y}/index.html"
+        settings["YEAR_ARCHIVE_URL"] = "posts/{date:%Y}/"
         context = get_context(settings)
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
-        period_archives = generator.context['period_archives']
+        period_archives = generator.context["period_archives"]
         abbreviated_archives = {
-            granularity: {period['period'] for period in periods}
+            granularity: {period["period"] for period in periods}
             for granularity, periods in period_archives.items()
         }
-        expected = {'year': {(1970,), (2010,), (2012,), (2014,)}}
+        expected = {"year": {(1970,), (2010,), (2012,), (2014,)}}
         self.assertEqual(expected, abbreviated_archives)
 
         # Month archives enabled:
-        settings['MONTH_ARCHIVE_SAVE_AS'] = \
-            'posts/{date:%Y}/{date:%b}/index.html'
-        settings['MONTH_ARCHIVE_URL'] = \
-            'posts/{date:%Y}/{date:%b}/'
+        settings["MONTH_ARCHIVE_SAVE_AS"] = "posts/{date:%Y}/{date:%b}/index.html"
+        settings["MONTH_ARCHIVE_URL"] = "posts/{date:%Y}/{date:%b}/"
         context = get_context(settings)
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
-        period_archives = generator.context['period_archives']
+        period_archives = generator.context["period_archives"]
         abbreviated_archives = {
-            granularity: {period['period'] for period in periods}
+            granularity: {period["period"] for period in periods}
             for granularity, periods in period_archives.items()
         }
         expected = {
-            'year': {(1970,), (2010,), (2012,), (2014,)},
-            'month': {
-                (1970, 'January'),
-                (2010, 'December'),
-                (2012, 'December'),
-                (2012, 'November'),
-                (2012, 'October'),
-                (2014, 'February'),
+            "year": {(1970,), (2010,), (2012,), (2014,)},
+            "month": {
+                (1970, "January"),
+                (2010, "December"),
+                (2012, "December"),
+                (2012, "November"),
+                (2012, "October"),
+                (2014, "February"),
             },
         }
         self.assertEqual(expected, abbreviated_archives)
 
         # Day archives enabled:
-        settings['DAY_ARCHIVE_SAVE_AS'] = \
-            'posts/{date:%Y}/{date:%b}/{date:%d}/index.html'
-        settings['DAY_ARCHIVE_URL'] = \
-            'posts/{date:%Y}/{date:%b}/{date:%d}/'
+        settings[
+            "DAY_ARCHIVE_SAVE_AS"
+        ] = "posts/{date:%Y}/{date:%b}/{date:%d}/index.html"
+        settings["DAY_ARCHIVE_URL"] = "posts/{date:%Y}/{date:%b}/{date:%d}/"
         context = get_context(settings)
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
-        period_archives = generator.context['period_archives']
+        period_archives = generator.context["period_archives"]
         abbreviated_archives = {
-            granularity: {period['period'] for period in periods}
+            granularity: {period["period"] for period in periods}
             for granularity, periods in period_archives.items()
         }
         expected = {
-            'year': {(1970,), (2010,), (2012,), (2014,)},
-            'month': {
-                (1970, 'January'),
-                (2010, 'December'),
-                (2012, 'December'),
-                (2012, 'November'),
-                (2012, 'October'),
-                (2014, 'February'),
+            "year": {(1970,), (2010,), (2012,), (2014,)},
+            "month": {
+                (1970, "January"),
+                (2010, "December"),
+                (2012, "December"),
+                (2012, "November"),
+                (2012, "October"),
+                (2014, "February"),
             },
-            'day': {
-                (1970, 'January', 1),
-                (2010, 'December', 2),
-                (2012, 'December', 20),
-                (2012, 'November', 29),
-                (2012, 'October', 30),
-                (2012, 'October', 31),
-                (2014, 'February', 9),
+            "day": {
+                (1970, "January", 1),
+                (2010, "December", 2),
+                (2012, "December", 20),
+                (2012, "November", 29),
+                (2012, "October", 30),
+                (2012, "October", 31),
+                (2014, "February", 9),
             },
         }
         self.assertEqual(expected, abbreviated_archives)
 
         # Further item values tests
         filtered_archives = [
-            p for p in period_archives['day']
-            if p['period'] == (2014, 'February', 9)
+            p for p in period_archives["day"] if p["period"] == (2014, "February", 9)
         ]
         self.assertEqual(len(filtered_archives), 1)
         sample_archive = filtered_archives[0]
-        self.assertEqual(sample_archive['period_num'], (2014, 2, 9))
-        self.assertEqual(
-            sample_archive['save_as'], 'posts/2014/Feb/09/index.html')
-        self.assertEqual(
-            sample_archive['url'], 'posts/2014/Feb/09/')
+        self.assertEqual(sample_archive["period_num"], (2014, 2, 9))
+        self.assertEqual(sample_archive["save_as"], "posts/2014/Feb/09/index.html")
+        self.assertEqual(sample_archive["url"], "posts/2014/Feb/09/")
         articles = [
-            d for d in generator.articles if
-            d.date.year == 2014 and
-            d.date.month == 2 and
-            d.date.day == 9
+            d
+            for d in generator.articles
+            if d.date.year == 2014 and d.date.month == 2 and d.date.day == 9
         ]
-        self.assertEqual(len(sample_archive['articles']), len(articles))
+        self.assertEqual(len(sample_archive["articles"]), len(articles))
         dates = [
-            d for d in generator.dates if
-            d.date.year == 2014 and
-            d.date.month == 2 and
-            d.date.day == 9
+            d
+            for d in generator.dates
+            if d.date.year == 2014 and d.date.month == 2 and d.date.day == 9
         ]
-        self.assertEqual(len(sample_archive['dates']), len(dates))
-        self.assertEqual(sample_archive['dates'][0].title, dates[0].title)
-        self.assertEqual(sample_archive['dates'][0].date, dates[0].date)
+        self.assertEqual(len(sample_archive["dates"]), len(dates))
+        self.assertEqual(sample_archive["dates"][0].title, dates[0].title)
+        self.assertEqual(sample_archive["dates"][0].date, dates[0].date)
 
     def test_period_in_timeperiod_archive(self):
         """
@@ -531,13 +654,17 @@ class TestArticlesGenerator(unittest.TestCase):
         """
         settings = get_settings()
 
-        settings['YEAR_ARCHIVE_SAVE_AS'] = 'posts/{date:%Y}/index.html'
-        settings['YEAR_ARCHIVE_URL'] = 'posts/{date:%Y}/'
-        settings['CACHE_PATH'] = self.temp_cache
+        settings["YEAR_ARCHIVE_SAVE_AS"] = "posts/{date:%Y}/index.html"
+        settings["YEAR_ARCHIVE_URL"] = "posts/{date:%Y}/"
+        settings["CACHE_PATH"] = self.temp_cache
         context = get_context(settings)
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         write = MagicMock()
         generator.generate_period_archives(write)
@@ -547,196 +674,257 @@ class TestArticlesGenerator(unittest.TestCase):
         # among other things it must have at least been called with this
         context["period"] = (1970,)
         context["period_num"] = (1970,)
-        write.assert_called_with("posts/1970/index.html",
-                                 generator.get_template("period_archives"),
-                                 context, blog=True, articles=articles,
-                                 dates=dates, template_name='period_archives',
-                                 url="posts/1970/",
-                                 all_articles=generator.articles)
+        write.assert_called_with(
+            "posts/1970/index.html",
+            generator.get_template("period_archives"),
+            context,
+            blog=True,
+            articles=articles,
+            dates=dates,
+            template_name="period_archives",
+            url="posts/1970/",
+            all_articles=generator.articles,
+        )
 
-        settings['MONTH_ARCHIVE_SAVE_AS'] = \
-            'posts/{date:%Y}/{date:%b}/index.html'
-        settings['MONTH_ARCHIVE_URL'] = \
-            'posts/{date:%Y}/{date:%b}/'
+        settings["MONTH_ARCHIVE_SAVE_AS"] = "posts/{date:%Y}/{date:%b}/index.html"
+        settings["MONTH_ARCHIVE_URL"] = "posts/{date:%Y}/{date:%b}/"
         context = get_context(settings)
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
-        generator.generate_context()
-        write = MagicMock()
-        generator.generate_period_archives(write)
-        dates = [d for d in generator.dates
-                 if d.date.year == 1970 and d.date.month == 1]
-        articles = [d for d in generator.articles
-                    if d.date.year == 1970 and d.date.month == 1]
-        self.assertEqual(len(dates), 1)
-        context["period"] = (1970, "January")
-        context["period_num"] = (1970, 1)
-        # among other things it must have at least been called with this
-        write.assert_called_with("posts/1970/Jan/index.html",
-                                 generator.get_template("period_archives"),
-                                 context, blog=True, articles=articles,
-                                 dates=dates, template_name='period_archives',
-                                 url="posts/1970/Jan/",
-                                 all_articles=generator.articles)
-
-        settings['DAY_ARCHIVE_SAVE_AS'] = \
-            'posts/{date:%Y}/{date:%b}/{date:%d}/index.html'
-        settings['DAY_ARCHIVE_URL'] = \
-            'posts/{date:%Y}/{date:%b}/{date:%d}/'
-        context = get_context(settings)
-        generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         write = MagicMock()
         generator.generate_period_archives(write)
         dates = [
-            d for d in generator.dates if
-            d.date.year == 1970 and
-            d.date.month == 1 and
-            d.date.day == 1
+            d for d in generator.dates if d.date.year == 1970 and d.date.month == 1
         ]
         articles = [
-            d for d in generator.articles if
-            d.date.year == 1970 and
-            d.date.month == 1 and
-            d.date.day == 1
+            d for d in generator.articles if d.date.year == 1970 and d.date.month == 1
+        ]
+        self.assertEqual(len(dates), 1)
+        context["period"] = (1970, "January")
+        context["period_num"] = (1970, 1)
+        # among other things it must have at least been called with this
+        write.assert_called_with(
+            "posts/1970/Jan/index.html",
+            generator.get_template("period_archives"),
+            context,
+            blog=True,
+            articles=articles,
+            dates=dates,
+            template_name="period_archives",
+            url="posts/1970/Jan/",
+            all_articles=generator.articles,
+        )
+
+        settings[
+            "DAY_ARCHIVE_SAVE_AS"
+        ] = "posts/{date:%Y}/{date:%b}/{date:%d}/index.html"
+        settings["DAY_ARCHIVE_URL"] = "posts/{date:%Y}/{date:%b}/{date:%d}/"
+        context = get_context(settings)
+        generator = ArticlesGenerator(
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
+        generator.generate_context()
+        write = MagicMock()
+        generator.generate_period_archives(write)
+        dates = [
+            d
+            for d in generator.dates
+            if d.date.year == 1970 and d.date.month == 1 and d.date.day == 1
+        ]
+        articles = [
+            d
+            for d in generator.articles
+            if d.date.year == 1970 and d.date.month == 1 and d.date.day == 1
         ]
         self.assertEqual(len(dates), 1)
         context["period"] = (1970, "January", 1)
         context["period_num"] = (1970, 1, 1)
         # among other things it must have at least been called with this
-        write.assert_called_with("posts/1970/Jan/01/index.html",
-                                 generator.get_template("period_archives"),
-                                 context, blog=True, articles=articles,
-                                 dates=dates, template_name='period_archives',
-                                 url="posts/1970/Jan/01/",
-                                 all_articles=generator.articles)
+        write.assert_called_with(
+            "posts/1970/Jan/01/index.html",
+            generator.get_template("period_archives"),
+            context,
+            blog=True,
+            articles=articles,
+            dates=dates,
+            template_name="period_archives",
+            url="posts/1970/Jan/01/",
+            all_articles=generator.articles,
+        )
 
     def test_nonexistent_template(self):
         """Attempt to load a non-existent template"""
         settings = get_settings()
         context = get_context(settings)
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=None, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=None,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         self.assertRaises(Exception, generator.get_template, "not_a_template")
 
     def test_generate_authors(self):
         """Check authors generation."""
         authors = [author.name for author, _ in self.generator.authors]
         authors_expected = sorted(
-            ['Alexis Métaireau', 'Author, First', 'Author, Second',
-             'First Author', 'Second Author'])
+            [
+                "Alexis Métaireau",
+                "Author, First",
+                "Author, Second",
+                "First Author",
+                "Second Author",
+            ]
+        )
         self.assertEqual(sorted(authors), authors_expected)
         # test for slug
         authors = [author.slug for author, _ in self.generator.authors]
-        authors_expected = ['alexis-metaireau', 'author-first',
-                            'author-second', 'first-author', 'second-author']
+        authors_expected = [
+            "alexis-metaireau",
+            "author-first",
+            "author-second",
+            "first-author",
+            "second-author",
+        ]
         self.assertEqual(sorted(authors), sorted(authors_expected))
 
     def test_standard_metadata_in_default_metadata(self):
         settings = get_settings()
-        settings['CACHE_CONTENT'] = False
-        settings['DEFAULT_CATEGORY'] = 'Default'
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
-        settings['DEFAULT_METADATA'] = (('author', 'Blogger'),
-                                        # category will be ignored in favor of
-                                        # DEFAULT_CATEGORY
-                                        ('category', 'Random'),
-                                        ('tags', 'general, untagged'))
+        settings["CACHE_CONTENT"] = False
+        settings["DEFAULT_CATEGORY"] = "Default"
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
+        settings["DEFAULT_METADATA"] = (
+            ("author", "Blogger"),
+            # category will be ignored in favor of
+            # DEFAULT_CATEGORY
+            ("category", "Random"),
+            ("tags", "general, untagged"),
+        )
         context = get_context(settings)
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
 
         authors = sorted([author.name for author, _ in generator.authors])
-        authors_expected = sorted(['Alexis Métaireau', 'Blogger',
-                                   'Author, First', 'Author, Second',
-                                   'First Author', 'Second Author'])
+        authors_expected = sorted(
+            [
+                "Alexis Métaireau",
+                "Blogger",
+                "Author, First",
+                "Author, Second",
+                "First Author",
+                "Second Author",
+            ]
+        )
         self.assertEqual(authors, authors_expected)
 
-        categories = sorted([category.name
-                             for category, _ in generator.categories])
+        categories = sorted([category.name for category, _ in generator.categories])
         categories_expected = [
-            sorted(['Default', 'TestCategory', 'yeah', 'test', '指導書']),
-            sorted(['Default', 'TestCategory', 'Yeah', 'test', '指導書'])]
+            sorted(["Default", "TestCategory", "yeah", "test", "指導書"]),
+            sorted(["Default", "TestCategory", "Yeah", "test", "指導書"]),
+        ]
         self.assertIn(categories, categories_expected)
 
         tags = sorted([tag.name for tag in generator.tags])
-        tags_expected = sorted(['bar', 'foo', 'foobar', 'general', 'untagged',
-                                'パイソン', 'マック'])
+        tags_expected = sorted(
+            ["bar", "foo", "foobar", "general", "untagged", "パイソン", "マック"]
+        )
         self.assertEqual(tags, tags_expected)
 
     def test_article_order_by(self):
         settings = get_settings()
-        settings['DEFAULT_CATEGORY'] = 'Default'
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
-        settings['ARTICLE_ORDER_BY'] = 'title'
+        settings["DEFAULT_CATEGORY"] = "Default"
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
+        settings["ARTICLE_ORDER_BY"] = "title"
         context = get_context(settings)
 
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
 
         expected = [
-            'An Article With Code Block To Test Typogrify Ignore',
-            'Article title',
-            'Article with Nonconformant HTML meta tags',
-            'Article with an inline SVG',
-            'Article with markdown and empty tags',
-            'Article with markdown and nested summary metadata',
-            'Article with markdown and summary metadata multi',
-            'Article with markdown and summary metadata single',
-            'Article with markdown containing footnotes',
-            'Article with template',
-            'Metadata tags as list!',
-            'One -, two --, three --- dashes!',
-            'One -, two --, three --- dashes!',
-            'Rst with filename metadata',
-            'Test Markdown extensions',
-            'Test markdown File',
-            'Test md File',
-            'Test mdown File',
-            'Test metadata duplicates',
-            'Test mkd File',
-            'This is a super article !',
-            'This is a super article !',
-            'This is a super article !',
-            'This is a super article !',
-            'This is a super article !',
-            'This is a super article !',
-            'This is a super article !',
-            'This is a super article !',
-            'This is a super article !',
-            'This is a super article !',
-            'This is a super article !',
-            'This is an article with category !',
-            ('This is an article with multiple authors in lastname, '
-             'firstname format!'),
-            'This is an article with multiple authors in list format!',
-            'This is an article with multiple authors!',
-            'This is an article with multiple authors!',
-            'This is an article without category !',
-            'This is an article without category !',
-            'マックOS X 10.8でパイソンとVirtualenvをインストールと設定']
+            "An Article With Code Block To Test Typogrify Ignore",
+            "Article title",
+            "Article with Nonconformant HTML meta tags",
+            "Article with an inline SVG",
+            "Article with markdown and empty tags",
+            "Article with markdown and nested summary metadata",
+            "Article with markdown and summary metadata multi",
+            "Article with markdown and summary metadata single",
+            "Article with markdown containing footnotes",
+            "Article with template",
+            "Metadata tags as list!",
+            "One -, two --, three --- dashes!",
+            "One -, two --, three --- dashes!",
+            "Rst with filename metadata",
+            "Test Markdown extensions",
+            "Test markdown File",
+            "Test md File",
+            "Test mdown File",
+            "Test metadata duplicates",
+            "Test mkd File",
+            "This is a super article !",
+            "This is a super article !",
+            "This is a super article !",
+            "This is a super article !",
+            "This is a super article !",
+            "This is a super article !",
+            "This is a super article !",
+            "This is a super article !",
+            "This is a super article !",
+            "This is a super article !",
+            "This is a super article !",
+            "This is an article with category !",
+            (
+                "This is an article with multiple authors in lastname, "
+                "firstname format!"
+            ),
+            "This is an article with multiple authors in list format!",
+            "This is an article with multiple authors!",
+            "This is an article with multiple authors!",
+            "This is an article without category !",
+            "This is an article without category !",
+            "マックOS X 10.8でパイソンとVirtualenvをインストールと設定",
+        ]
 
         articles = [article.title for article in generator.articles]
         self.assertEqual(articles, expected)
 
         # reversed title
         settings = get_settings()
-        settings['DEFAULT_CATEGORY'] = 'Default'
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
-        settings['ARTICLE_ORDER_BY'] = 'reversed-title'
+        settings["DEFAULT_CATEGORY"] = "Default"
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
+        settings["ARTICLE_ORDER_BY"] = "reversed-title"
         context = get_context(settings)
 
         generator = ArticlesGenerator(
-            context=context, settings=settings,
-            path=CONTENT_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CONTENT_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
 
         articles = [article.title for article in generator.articles]
@@ -750,7 +938,7 @@ class TestPageGenerator(unittest.TestCase):
     # to match expected
 
     def setUp(self):
-        self.temp_cache = mkdtemp(prefix='pelican_cache.')
+        self.temp_cache = mkdtemp(prefix="pelican_cache.")
 
     def tearDown(self):
         rmtree(self.temp_cache)
@@ -760,112 +948,125 @@ class TestPageGenerator(unittest.TestCase):
 
     def test_generate_context(self):
         settings = get_settings()
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['PAGE_PATHS'] = ['TestPages']  # relative to CUR_DIR
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
+        settings["CACHE_PATH"] = self.temp_cache
+        settings["PAGE_PATHS"] = ["TestPages"]  # relative to CUR_DIR
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
         context = get_context(settings)
 
         generator = PagesGenerator(
-            context=context, settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
         hidden_pages = self.distill_pages(generator.hidden_pages)
         draft_pages = self.distill_pages(generator.draft_pages)
 
         pages_expected = [
-            ['This is a test page', 'published', 'page'],
-            ['This is a markdown test page', 'published', 'page'],
-            ['This is a test page with a preset template', 'published',
-             'custom'],
-            ['Page with a bunch of links', 'published', 'page'],
-            ['Page with static links', 'published', 'page'],
-            ['A Page (Test) for sorting', 'published', 'page'],
+            ["This is a test page", "published", "page"],
+            ["This is a markdown test page", "published", "page"],
+            ["This is a test page with a preset template", "published", "custom"],
+            ["Page with a bunch of links", "published", "page"],
+            ["Page with static links", "published", "page"],
+            ["A Page (Test) for sorting", "published", "page"],
         ]
         hidden_pages_expected = [
-            ['This is a test hidden page', 'hidden', 'page'],
-            ['This is a markdown test hidden page', 'hidden', 'page'],
-            ['This is a test hidden page with a custom template', 'hidden',
-             'custom'],
+            ["This is a test hidden page", "hidden", "page"],
+            ["This is a markdown test hidden page", "hidden", "page"],
+            ["This is a test hidden page with a custom template", "hidden", "custom"],
         ]
         draft_pages_expected = [
-            ['This is a test draft page', 'draft', 'page'],
-            ['This is a markdown test draft page', 'draft', 'page'],
-            ['This is a test draft page with a custom template', 'draft',
-             'custom'],
+            ["This is a test draft page", "draft", "page"],
+            ["This is a markdown test draft page", "draft", "page"],
+            ["This is a test draft page with a custom template", "draft", "custom"],
         ]
 
         self.assertEqual(sorted(pages_expected), sorted(pages))
         self.assertEqual(
             sorted(pages_expected),
-            sorted(self.distill_pages(generator.context['pages'])))
+            sorted(self.distill_pages(generator.context["pages"])),
+        )
         self.assertEqual(sorted(hidden_pages_expected), sorted(hidden_pages))
         self.assertEqual(sorted(draft_pages_expected), sorted(draft_pages))
         self.assertEqual(
             sorted(hidden_pages_expected),
-            sorted(self.distill_pages(generator.context['hidden_pages'])))
+            sorted(self.distill_pages(generator.context["hidden_pages"])),
+        )
         self.assertEqual(
             sorted(draft_pages_expected),
-            sorted(self.distill_pages(generator.context['draft_pages'])))
+            sorted(self.distill_pages(generator.context["draft_pages"])),
+        )
 
     def test_generate_sorted(self):
         settings = get_settings()
-        settings['PAGE_PATHS'] = ['TestPages']  # relative to CUR_DIR
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
+        settings["PAGE_PATHS"] = ["TestPages"]  # relative to CUR_DIR
+        settings["CACHE_PATH"] = self.temp_cache
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
         context = get_context(settings)
 
         # default sort (filename)
         pages_expected_sorted_by_filename = [
-            ['This is a test page', 'published', 'page'],
-            ['This is a markdown test page', 'published', 'page'],
-            ['A Page (Test) for sorting', 'published', 'page'],
-            ['Page with a bunch of links', 'published', 'page'],
-            ['Page with static links', 'published', 'page'],
-            ['This is a test page with a preset template', 'published',
-             'custom'],
+            ["This is a test page", "published", "page"],
+            ["This is a markdown test page", "published", "page"],
+            ["A Page (Test) for sorting", "published", "page"],
+            ["Page with a bunch of links", "published", "page"],
+            ["Page with static links", "published", "page"],
+            ["This is a test page with a preset template", "published", "custom"],
         ]
         generator = PagesGenerator(
-            context=context, settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
         self.assertEqual(pages_expected_sorted_by_filename, pages)
 
         # sort by title
         pages_expected_sorted_by_title = [
-            ['A Page (Test) for sorting', 'published', 'page'],
-            ['Page with a bunch of links', 'published', 'page'],
-            ['Page with static links', 'published', 'page'],
-            ['This is a markdown test page', 'published', 'page'],
-            ['This is a test page', 'published', 'page'],
-            ['This is a test page with a preset template', 'published',
-             'custom'],
+            ["A Page (Test) for sorting", "published", "page"],
+            ["Page with a bunch of links", "published", "page"],
+            ["Page with static links", "published", "page"],
+            ["This is a markdown test page", "published", "page"],
+            ["This is a test page", "published", "page"],
+            ["This is a test page with a preset template", "published", "custom"],
         ]
-        settings['PAGE_ORDER_BY'] = 'title'
+        settings["PAGE_ORDER_BY"] = "title"
         context = get_context(settings)
         generator = PagesGenerator(
-            context=context.copy(), settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context.copy(),
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
         self.assertEqual(pages_expected_sorted_by_title, pages)
 
         # sort by title reversed
         pages_expected_sorted_by_title = [
-            ['This is a test page with a preset template', 'published',
-             'custom'],
-            ['This is a test page', 'published', 'page'],
-            ['This is a markdown test page', 'published', 'page'],
-            ['Page with static links', 'published', 'page'],
-            ['Page with a bunch of links', 'published', 'page'],
-            ['A Page (Test) for sorting', 'published', 'page'],
+            ["This is a test page with a preset template", "published", "custom"],
+            ["This is a test page", "published", "page"],
+            ["This is a markdown test page", "published", "page"],
+            ["Page with static links", "published", "page"],
+            ["Page with a bunch of links", "published", "page"],
+            ["A Page (Test) for sorting", "published", "page"],
         ]
-        settings['PAGE_ORDER_BY'] = 'reversed-title'
+        settings["PAGE_ORDER_BY"] = "reversed-title"
         context = get_context(settings)
         generator = PagesGenerator(
-            context=context, settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         pages = self.distill_pages(generator.pages)
         self.assertEqual(pages_expected_sorted_by_title, pages)
@@ -876,18 +1077,22 @@ class TestPageGenerator(unittest.TestCase):
         are generated correctly on pages
         """
         settings = get_settings()
-        settings['PAGE_PATHS'] = ['TestPages']    # relative to CUR_DIR
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
+        settings["PAGE_PATHS"] = ["TestPages"]  # relative to CUR_DIR
+        settings["CACHE_PATH"] = self.temp_cache
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
         context = get_context(settings)
 
         generator = PagesGenerator(
-            context=context, settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
         pages_by_title = {p.title: p for p in generator.pages}
 
-        test_content = pages_by_title['Page with a bunch of links'].content
+        test_content = pages_by_title["Page with a bunch of links"].content
         self.assertIn('<a href="/category/yeah.html">', test_content)
         self.assertIn('<a href="/tag/matsuku.html">', test_content)
 
@@ -897,80 +1102,80 @@ class TestPageGenerator(unittest.TestCase):
         are included in context['static_links']
         """
         settings = get_settings()
-        settings['PAGE_PATHS'] = ['TestPages/page_with_static_links.md']
-        settings['CACHE_PATH'] = self.temp_cache
-        settings['DEFAULT_DATE'] = (1970, 1, 1)
+        settings["PAGE_PATHS"] = ["TestPages/page_with_static_links.md"]
+        settings["CACHE_PATH"] = self.temp_cache
+        settings["DEFAULT_DATE"] = (1970, 1, 1)
         context = get_context(settings)
 
         generator = PagesGenerator(
-            context=context, settings=settings,
-            path=CUR_DIR, theme=settings['THEME'], output_path=None)
+            context=context,
+            settings=settings,
+            path=CUR_DIR,
+            theme=settings["THEME"],
+            output_path=None,
+        )
         generator.generate_context()
 
-        self.assertIn('pelican/tests/TestPages/image0.jpg',
-                      context['static_links'])
-        self.assertIn('pelican/tests/TestPages/image1.jpg',
-                      context['static_links'])
+        self.assertIn("pelican/tests/TestPages/image0.jpg", context["static_links"])
+        self.assertIn("pelican/tests/TestPages/image1.jpg", context["static_links"])
 
 
 class TestTemplatePagesGenerator(TestCaseWithCLocale):
-
     TEMPLATE_CONTENT = "foo: {{ foo }}"
 
     def setUp(self):
         super().setUp()
-        self.temp_content = mkdtemp(prefix='pelicantests.')
-        self.temp_output = mkdtemp(prefix='pelicantests.')
+        self.temp_content = mkdtemp(prefix="pelicantests.")
+        self.temp_output = mkdtemp(prefix="pelicantests.")
 
     def tearDown(self):
         rmtree(self.temp_content)
         rmtree(self.temp_output)
 
     def test_generate_output(self):
-
         settings = get_settings()
-        settings['STATIC_PATHS'] = ['static']
-        settings['TEMPLATE_PAGES'] = {
-            'template/source.html': 'generated/file.html'
-        }
+        settings["STATIC_PATHS"] = ["static"]
+        settings["TEMPLATE_PAGES"] = {"template/source.html": "generated/file.html"}
 
         generator = TemplatePagesGenerator(
-            context={'foo': 'bar'}, settings=settings,
-            path=self.temp_content, theme='', output_path=self.temp_output)
+            context={"foo": "bar"},
+            settings=settings,
+            path=self.temp_content,
+            theme="",
+            output_path=self.temp_output,
+        )
 
         # create a dummy template file
-        template_dir = os.path.join(self.temp_content, 'template')
-        template_path = os.path.join(template_dir, 'source.html')
+        template_dir = os.path.join(self.temp_content, "template")
+        template_path = os.path.join(template_dir, "source.html")
         os.makedirs(template_dir)
-        with open(template_path, 'w') as template_file:
+        with open(template_path, "w") as template_file:
             template_file.write(self.TEMPLATE_CONTENT)
 
         writer = Writer(self.temp_output, settings=settings)
         generator.generate_output(writer)
 
-        output_path = os.path.join(self.temp_output, 'generated', 'file.html')
+        output_path = os.path.join(self.temp_output, "generated", "file.html")
 
         # output file has been generated
         self.assertTrue(os.path.exists(output_path))
 
         # output content is correct
         with open(output_path) as output_file:
-            self.assertEqual(output_file.read(), 'foo: bar')
+            self.assertEqual(output_file.read(), "foo: bar")
 
 
 class TestStaticGenerator(unittest.TestCase):
-
     def setUp(self):
-        self.content_path = os.path.join(CUR_DIR, 'mixed_content')
-        self.temp_content = mkdtemp(prefix='testcontent.')
-        self.temp_output = mkdtemp(prefix='testoutput.')
+        self.content_path = os.path.join(CUR_DIR, "mixed_content")
+        self.temp_content = mkdtemp(prefix="testcontent.")
+        self.temp_output = mkdtemp(prefix="testoutput.")
         self.settings = get_settings()
-        self.settings['PATH'] = self.temp_content
-        self.settings['STATIC_PATHS'] = ["static"]
-        self.settings['OUTPUT_PATH'] = self.temp_output
+        self.settings["PATH"] = self.temp_content
+        self.settings["STATIC_PATHS"] = ["static"]
+        self.settings["OUTPUT_PATH"] = self.temp_output
         os.mkdir(os.path.join(self.temp_content, "static"))
-        self.startfile = os.path.join(self.temp_content,
-                                      "static", "staticfile")
+        self.startfile = os.path.join(self.temp_content, "static", "staticfile")
         self.endfile = os.path.join(self.temp_output, "static", "staticfile")
         self.generator = StaticGenerator(
             context=get_context(),
@@ -978,7 +1183,7 @@ class TestStaticGenerator(unittest.TestCase):
             path=self.temp_content,
             theme="",
             output_path=self.temp_output,
-            )
+        )
 
     def tearDown(self):
         rmtree(self.temp_content)
@@ -989,155 +1194,198 @@ class TestStaticGenerator(unittest.TestCase):
 
     def test_theme_static_paths_dirs(self):
         """Test that StaticGenerator properly copies also files mentioned in
-           TEMPLATE_STATIC_PATHS, not just directories."""
+        TEMPLATE_STATIC_PATHS, not just directories."""
         settings = get_settings(PATH=self.content_path)
         context = get_context(settings, staticfiles=[])
 
         StaticGenerator(
-            context=context, settings=settings,
-            path=settings['PATH'], output_path=self.temp_output,
-            theme=settings['THEME']).generate_output(None)
+            context=context,
+            settings=settings,
+            path=settings["PATH"],
+            output_path=self.temp_output,
+            theme=settings["THEME"],
+        ).generate_output(None)
 
         # The content of dirs listed in THEME_STATIC_PATHS (defaulting to
         # "static") is put into the output
-        self.assertTrue(os.path.isdir(os.path.join(self.temp_output,
-                                                   "theme/css/")))
-        self.assertTrue(os.path.isdir(os.path.join(self.temp_output,
-                                                   "theme/fonts/")))
+        self.assertTrue(os.path.isdir(os.path.join(self.temp_output, "theme/css/")))
+        self.assertTrue(os.path.isdir(os.path.join(self.temp_output, "theme/fonts/")))
 
     def test_theme_static_paths_files(self):
         """Test that StaticGenerator properly copies also files mentioned in
-           TEMPLATE_STATIC_PATHS, not just directories."""
+        TEMPLATE_STATIC_PATHS, not just directories."""
         settings = get_settings(
             PATH=self.content_path,
-            THEME_STATIC_PATHS=['static/css/fonts.css', 'static/fonts/'],)
+            THEME_STATIC_PATHS=["static/css/fonts.css", "static/fonts/"],
+        )
         context = get_context(settings, staticfiles=[])
 
         StaticGenerator(
-            context=context, settings=settings,
-            path=settings['PATH'], output_path=self.temp_output,
-            theme=settings['THEME']).generate_output(None)
+            context=context,
+            settings=settings,
+            path=settings["PATH"],
+            output_path=self.temp_output,
+            theme=settings["THEME"],
+        ).generate_output(None)
 
         # Only the content of dirs and files listed in THEME_STATIC_PATHS are
         # put into the output, not everything from static/
-        self.assertFalse(os.path.isdir(os.path.join(self.temp_output,
-                                                    "theme/css/")))
-        self.assertFalse(os.path.isdir(os.path.join(self.temp_output,
-                                                    "theme/fonts/")))
+        self.assertFalse(os.path.isdir(os.path.join(self.temp_output, "theme/css/")))
+        self.assertFalse(os.path.isdir(os.path.join(self.temp_output, "theme/fonts/")))
 
-        self.assertTrue(os.path.isfile(os.path.join(
-            self.temp_output, "theme/Yanone_Kaffeesatz_400.eot")))
-        self.assertTrue(os.path.isfile(os.path.join(
-            self.temp_output, "theme/Yanone_Kaffeesatz_400.svg")))
-        self.assertTrue(os.path.isfile(os.path.join(
-            self.temp_output, "theme/Yanone_Kaffeesatz_400.ttf")))
-        self.assertTrue(os.path.isfile(os.path.join(
-            self.temp_output, "theme/Yanone_Kaffeesatz_400.woff")))
-        self.assertTrue(os.path.isfile(os.path.join(
-            self.temp_output, "theme/Yanone_Kaffeesatz_400.woff2")))
-        self.assertTrue(os.path.isfile(os.path.join(self.temp_output,
-                                                    "theme/font.css")))
-        self.assertTrue(os.path.isfile(os.path.join(self.temp_output,
-                                                    "theme/fonts.css")))
+        self.assertTrue(
+            os.path.isfile(
+                os.path.join(self.temp_output, "theme/Yanone_Kaffeesatz_400.eot")
+            )
+        )
+        self.assertTrue(
+            os.path.isfile(
+                os.path.join(self.temp_output, "theme/Yanone_Kaffeesatz_400.svg")
+            )
+        )
+        self.assertTrue(
+            os.path.isfile(
+                os.path.join(self.temp_output, "theme/Yanone_Kaffeesatz_400.ttf")
+            )
+        )
+        self.assertTrue(
+            os.path.isfile(
+                os.path.join(self.temp_output, "theme/Yanone_Kaffeesatz_400.woff")
+            )
+        )
+        self.assertTrue(
+            os.path.isfile(
+                os.path.join(self.temp_output, "theme/Yanone_Kaffeesatz_400.woff2")
+            )
+        )
+        self.assertTrue(
+            os.path.isfile(os.path.join(self.temp_output, "theme/font.css"))
+        )
+        self.assertTrue(
+            os.path.isfile(os.path.join(self.temp_output, "theme/fonts.css"))
+        )
 
     def test_static_excludes(self):
-        """Test that StaticGenerator respects STATIC_EXCLUDES.
-        """
+        """Test that StaticGenerator respects STATIC_EXCLUDES."""
         settings = get_settings(
-            STATIC_EXCLUDES=['subdir'],
+            STATIC_EXCLUDES=["subdir"],
             PATH=self.content_path,
-            STATIC_PATHS=[''],)
+            STATIC_PATHS=[""],
+        )
         context = get_context(settings)
 
         StaticGenerator(
-            context=context, settings=settings,
-            path=settings['PATH'], output_path=self.temp_output,
-            theme=settings['THEME']).generate_context()
+            context=context,
+            settings=settings,
+            path=settings["PATH"],
+            output_path=self.temp_output,
+            theme=settings["THEME"],
+        ).generate_context()
 
-        staticnames = [os.path.basename(c.source_path)
-                       for c in context['staticfiles']]
+        staticnames = [os.path.basename(c.source_path) for c in context["staticfiles"]]
 
         self.assertNotIn(
-            'subdir_fake_image.jpg', staticnames,
-            "StaticGenerator processed a file in a STATIC_EXCLUDES directory")
+            "subdir_fake_image.jpg",
+            staticnames,
+            "StaticGenerator processed a file in a STATIC_EXCLUDES directory",
+        )
         self.assertIn(
-            'fake_image.jpg', staticnames,
-            "StaticGenerator skipped a file that it should have included")
+            "fake_image.jpg",
+            staticnames,
+            "StaticGenerator skipped a file that it should have included",
+        )
 
     def test_static_exclude_sources(self):
-        """Test that StaticGenerator respects STATIC_EXCLUDE_SOURCES.
-        """
+        """Test that StaticGenerator respects STATIC_EXCLUDE_SOURCES."""
 
         settings = get_settings(
             STATIC_EXCLUDE_SOURCES=True,
             PATH=self.content_path,
-            PAGE_PATHS=[''],
-            STATIC_PATHS=[''],
-            CACHE_CONTENT=False,)
+            PAGE_PATHS=[""],
+            STATIC_PATHS=[""],
+            CACHE_CONTENT=False,
+        )
         context = get_context(settings)
 
         for generator_class in (PagesGenerator, StaticGenerator):
             generator_class(
-                context=context, settings=settings,
-                path=settings['PATH'], output_path=self.temp_output,
-                theme=settings['THEME']).generate_context()
+                context=context,
+                settings=settings,
+                path=settings["PATH"],
+                output_path=self.temp_output,
+                theme=settings["THEME"],
+            ).generate_context()
 
-        staticnames = [os.path.basename(c.source_path)
-                       for c in context['staticfiles']]
+        staticnames = [os.path.basename(c.source_path) for c in context["staticfiles"]]
 
         self.assertFalse(
             any(name.endswith(".md") for name in staticnames),
-            "STATIC_EXCLUDE_SOURCES=True failed to exclude a markdown file")
+            "STATIC_EXCLUDE_SOURCES=True failed to exclude a markdown file",
+        )
 
         settings.update(STATIC_EXCLUDE_SOURCES=False)
         context = get_context(settings)
 
         for generator_class in (PagesGenerator, StaticGenerator):
             generator_class(
-                context=context, settings=settings,
-                path=settings['PATH'], output_path=self.temp_output,
-                theme=settings['THEME']).generate_context()
+                context=context,
+                settings=settings,
+                path=settings["PATH"],
+                output_path=self.temp_output,
+                theme=settings["THEME"],
+            ).generate_context()
 
-        staticnames = [os.path.basename(c.source_path)
-                       for c in context['staticfiles']]
+        staticnames = [os.path.basename(c.source_path) for c in context["staticfiles"]]
 
         self.assertTrue(
             any(name.endswith(".md") for name in staticnames),
-            "STATIC_EXCLUDE_SOURCES=False failed to include a markdown file")
+            "STATIC_EXCLUDE_SOURCES=False failed to include a markdown file",
+        )
 
     def test_static_links(self):
-        """Test that StaticGenerator uses files in static_links
-        """
+        """Test that StaticGenerator uses files in static_links"""
         settings = get_settings(
-            STATIC_EXCLUDES=['subdir'],
+            STATIC_EXCLUDES=["subdir"],
             PATH=self.content_path,
-            STATIC_PATHS=[],)
+            STATIC_PATHS=[],
+        )
         context = get_context(settings)
-        context['static_links'] |= {'short_page.md', 'subdir_fake_image.jpg'}
+        context["static_links"] |= {"short_page.md", "subdir_fake_image.jpg"}
 
         StaticGenerator(
-            context=context, settings=settings,
-            path=settings['PATH'], output_path=self.temp_output,
-            theme=settings['THEME']).generate_context()
+            context=context,
+            settings=settings,
+            path=settings["PATH"],
+            output_path=self.temp_output,
+            theme=settings["THEME"],
+        ).generate_context()
 
         staticfiles_names = [
-            os.path.basename(c.source_path) for c in context['staticfiles']]
+            os.path.basename(c.source_path) for c in context["staticfiles"]
+        ]
 
-        static_content_names = [
-            os.path.basename(c) for c in context['static_content']]
+        static_content_names = [os.path.basename(c) for c in context["static_content"]]
 
         self.assertIn(
-            'short_page.md', staticfiles_names,
-            "StaticGenerator skipped a file that it should have included")
+            "short_page.md",
+            staticfiles_names,
+            "StaticGenerator skipped a file that it should have included",
+        )
         self.assertIn(
-            'short_page.md', static_content_names,
-            "StaticGenerator skipped a file that it should have included")
+            "short_page.md",
+            static_content_names,
+            "StaticGenerator skipped a file that it should have included",
+        )
         self.assertIn(
-            'subdir_fake_image.jpg', staticfiles_names,
-            "StaticGenerator skipped a file that it should have included")
+            "subdir_fake_image.jpg",
+            staticfiles_names,
+            "StaticGenerator skipped a file that it should have included",
+        )
         self.assertIn(
-            'subdir_fake_image.jpg', static_content_names,
-            "StaticGenerator skipped a file that it should have included")
+            "subdir_fake_image.jpg",
+            static_content_names,
+            "StaticGenerator skipped a file that it should have included",
+        )
 
     def test_copy_one_file(self):
         with open(self.startfile, "w") as f:
@@ -1160,7 +1408,7 @@ class TestStaticGenerator(unittest.TestCase):
         staticfile = MagicMock()
         staticfile.source_path = self.startfile
         staticfile.save_as = self.endfile
-        self.settings['STATIC_CHECK_IF_MODIFIED'] = True
+        self.settings["STATIC_CHECK_IF_MODIFIED"] = True
         with open(staticfile.source_path, "w") as f:
             f.write("a")
         os.mkdir(os.path.join(self.temp_output, "static"))
@@ -1181,7 +1429,7 @@ class TestStaticGenerator(unittest.TestCase):
         self.assertTrue(isnewer)
 
     def test_skip_file_when_source_is_not_newer(self):
-        self.settings['STATIC_CHECK_IF_MODIFIED'] = True
+        self.settings["STATIC_CHECK_IF_MODIFIED"] = True
         with open(self.startfile, "w") as f:
             f.write("staticcontent")
         os.mkdir(os.path.join(self.temp_output, "static"))
@@ -1201,7 +1449,7 @@ class TestStaticGenerator(unittest.TestCase):
         self.assertFalse(os.path.samefile(self.startfile, self.endfile))
 
     def test_output_file_is_linked_to_source(self):
-        self.settings['STATIC_CREATE_LINKS'] = True
+        self.settings["STATIC_CREATE_LINKS"] = True
         with open(self.startfile, "w") as f:
             f.write("staticcontent")
         self.generator.generate_context()
@@ -1209,7 +1457,7 @@ class TestStaticGenerator(unittest.TestCase):
         self.assertTrue(os.path.samefile(self.startfile, self.endfile))
 
     def test_output_file_exists_and_is_newer(self):
-        self.settings['STATIC_CREATE_LINKS'] = True
+        self.settings["STATIC_CREATE_LINKS"] = True
         with open(self.startfile, "w") as f:
             f.write("staticcontent")
         os.mkdir(os.path.join(self.temp_output, "static"))
@@ -1219,9 +1467,9 @@ class TestStaticGenerator(unittest.TestCase):
         self.generator.generate_output(None)
         self.assertTrue(os.path.samefile(self.startfile, self.endfile))
 
-    @unittest.skipUnless(can_symlink(), 'No symlink privilege')
+    @unittest.skipUnless(can_symlink(), "No symlink privilege")
     def test_can_symlink_when_hardlink_not_possible(self):
-        self.settings['STATIC_CREATE_LINKS'] = True
+        self.settings["STATIC_CREATE_LINKS"] = True
         with open(self.startfile, "w") as f:
             f.write("staticcontent")
         os.mkdir(os.path.join(self.temp_output, "static"))
@@ -1230,9 +1478,9 @@ class TestStaticGenerator(unittest.TestCase):
         self.generator.generate_output(None)
         self.assertTrue(os.path.islink(self.endfile))
 
-    @unittest.skipUnless(can_symlink(), 'No symlink privilege')
+    @unittest.skipUnless(can_symlink(), "No symlink privilege")
     def test_existing_symlink_is_considered_up_to_date(self):
-        self.settings['STATIC_CREATE_LINKS'] = True
+        self.settings["STATIC_CREATE_LINKS"] = True
         with open(self.startfile, "w") as f:
             f.write("staticcontent")
         os.mkdir(os.path.join(self.temp_output, "static"))
@@ -1243,9 +1491,9 @@ class TestStaticGenerator(unittest.TestCase):
         requires_update = self.generator._file_update_required(staticfile)
         self.assertFalse(requires_update)
 
-    @unittest.skipUnless(can_symlink(), 'No symlink privilege')
+    @unittest.skipUnless(can_symlink(), "No symlink privilege")
     def test_invalid_symlink_is_overwritten(self):
-        self.settings['STATIC_CREATE_LINKS'] = True
+        self.settings["STATIC_CREATE_LINKS"] = True
         with open(self.startfile, "w") as f:
             f.write("staticcontent")
         os.mkdir(os.path.join(self.temp_output, "static"))
@@ -1263,14 +1511,14 @@ class TestStaticGenerator(unittest.TestCase):
         # os.path.realpath is broken on Windows before python3.8 for symlinks.
         # This is a (ugly) workaround.
         # see: https://bugs.python.org/issue9949
-        if os.name == 'nt' and sys.version_info < (3, 8):
+        if os.name == "nt" and sys.version_info < (3, 8):
+
             def get_real_path(path):
                 return os.readlink(path) if os.path.islink(path) else path
         else:
             get_real_path = os.path.realpath
 
-        self.assertEqual(get_real_path(self.endfile),
-                         get_real_path(self.startfile))
+        self.assertEqual(get_real_path(self.endfile), get_real_path(self.startfile))
 
     def test_delete_existing_file_before_mkdir(self):
         with open(self.startfile, "w") as f:
@@ -1279,16 +1527,14 @@ class TestStaticGenerator(unittest.TestCase):
             f.write("This file should be a directory")
         self.generator.generate_context()
         self.generator.generate_output(None)
-        self.assertTrue(
-            os.path.isdir(os.path.join(self.temp_output, "static")))
+        self.assertTrue(os.path.isdir(os.path.join(self.temp_output, "static")))
         self.assertTrue(os.path.isfile(self.endfile))
 
 
 class TestJinja2Environment(TestCaseWithCLocale):
-
     def setUp(self):
-        self.temp_content = mkdtemp(prefix='pelicantests.')
-        self.temp_output = mkdtemp(prefix='pelicantests.')
+        self.temp_content = mkdtemp(prefix="pelicantests.")
+        self.temp_output = mkdtemp(prefix="pelicantests.")
 
     def tearDown(self):
         rmtree(self.temp_content)
@@ -1296,27 +1542,29 @@ class TestJinja2Environment(TestCaseWithCLocale):
 
     def _test_jinja2_helper(self, additional_settings, content, expected):
         settings = get_settings()
-        settings['STATIC_PATHS'] = ['static']
-        settings['TEMPLATE_PAGES'] = {
-            'template/source.html': 'generated/file.html'
-        }
+        settings["STATIC_PATHS"] = ["static"]
+        settings["TEMPLATE_PAGES"] = {"template/source.html": "generated/file.html"}
         settings.update(additional_settings)
 
         generator = TemplatePagesGenerator(
-            context={'foo': 'foo', 'bar': 'bar'}, settings=settings,
-            path=self.temp_content, theme='', output_path=self.temp_output)
+            context={"foo": "foo", "bar": "bar"},
+            settings=settings,
+            path=self.temp_content,
+            theme="",
+            output_path=self.temp_output,
+        )
 
         # create a dummy template file
-        template_dir = os.path.join(self.temp_content, 'template')
-        template_path = os.path.join(template_dir, 'source.html')
+        template_dir = os.path.join(self.temp_content, "template")
+        template_path = os.path.join(template_dir, "source.html")
         os.makedirs(template_dir)
-        with open(template_path, 'w') as template_file:
+        with open(template_path, "w") as template_file:
             template_file.write(content)
 
         writer = Writer(self.temp_output, settings=settings)
         generator.generate_output(writer)
 
-        output_path = os.path.join(self.temp_output, 'generated', 'file.html')
+        output_path = os.path.join(self.temp_output, "generated", "file.html")
 
         # output file has been generated
         self.assertTrue(os.path.exists(output_path))
@@ -1327,32 +1575,32 @@ class TestJinja2Environment(TestCaseWithCLocale):
 
     def test_jinja2_filter(self):
         """JINJA_FILTERS adds custom filters to Jinja2 environment"""
-        content = 'foo: {{ foo|custom_filter }}, bar: {{ bar|custom_filter }}'
-        settings = {'JINJA_FILTERS': {'custom_filter': lambda x: x.upper()}}
-        expected = 'foo: FOO, bar: BAR'
+        content = "foo: {{ foo|custom_filter }}, bar: {{ bar|custom_filter }}"
+        settings = {"JINJA_FILTERS": {"custom_filter": lambda x: x.upper()}}
+        expected = "foo: FOO, bar: BAR"
 
         self._test_jinja2_helper(settings, content, expected)
 
     def test_jinja2_test(self):
         """JINJA_TESTS adds custom tests to Jinja2 environment"""
-        content = 'foo {{ foo is custom_test }}, bar {{ bar is custom_test }}'
-        settings = {'JINJA_TESTS': {'custom_test': lambda x: x == 'bar'}}
-        expected = 'foo False, bar True'
+        content = "foo {{ foo is custom_test }}, bar {{ bar is custom_test }}"
+        settings = {"JINJA_TESTS": {"custom_test": lambda x: x == "bar"}}
+        expected = "foo False, bar True"
 
         self._test_jinja2_helper(settings, content, expected)
 
     def test_jinja2_global(self):
         """JINJA_GLOBALS adds custom globals to Jinja2 environment"""
-        content = '{{ custom_global }}'
-        settings = {'JINJA_GLOBALS': {'custom_global': 'foobar'}}
-        expected = 'foobar'
+        content = "{{ custom_global }}"
+        settings = {"JINJA_GLOBALS": {"custom_global": "foobar"}}
+        expected = "foobar"
 
         self._test_jinja2_helper(settings, content, expected)
 
     def test_jinja2_extension(self):
         """JINJA_ENVIRONMENT adds extensions to Jinja2 environment"""
-        content = '{% set stuff = [] %}{% do stuff.append(1) %}{{ stuff }}'
-        settings = {'JINJA_ENVIRONMENT': {'extensions': ['jinja2.ext.do']}}
-        expected = '[1]'
+        content = "{% set stuff = [] %}{% do stuff.append(1) %}{{ stuff }}"
+        settings = {"JINJA_ENVIRONMENT": {"extensions": ["jinja2.ext.do"]}}
+        expected = "[1]"
 
         self._test_jinja2_helper(settings, content, expected)
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 870d3001..05ef5bbd 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -4,26 +4,35 @@ from posixpath import join as posix_join
 from unittest.mock import patch
 
 from pelican.settings import DEFAULT_CONFIG
-from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder,
-                                   unittest, TestCaseWithCLocale)
-from pelican.tools.pelican_import import (blogger2fields, build_header,
-                                          build_markdown_header,
-                                          decode_wp_content,
-                                          download_attachments, fields2pelican,
-                                          get_attachments, tumblr2fields,
-                                          wp2fields,
-                                          )
+from pelican.tests.support import (
+    mute,
+    skipIfNoExecutable,
+    temporary_folder,
+    unittest,
+    TestCaseWithCLocale,
+)
+from pelican.tools.pelican_import import (
+    blogger2fields,
+    build_header,
+    build_markdown_header,
+    decode_wp_content,
+    download_attachments,
+    fields2pelican,
+    get_attachments,
+    tumblr2fields,
+    wp2fields,
+)
 from pelican.utils import path_to_file_url, slugify
 
 CUR_DIR = os.path.abspath(os.path.dirname(__file__))
-BLOGGER_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'bloggerexport.xml')
-WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, 'content', 'wordpressexport.xml')
-WORDPRESS_ENCODED_CONTENT_SAMPLE = os.path.join(CUR_DIR,
-                                                'content',
-                                                'wordpress_content_encoded')
-WORDPRESS_DECODED_CONTENT_SAMPLE = os.path.join(CUR_DIR,
-                                                'content',
-                                                'wordpress_content_decoded')
+BLOGGER_XML_SAMPLE = os.path.join(CUR_DIR, "content", "bloggerexport.xml")
+WORDPRESS_XML_SAMPLE = os.path.join(CUR_DIR, "content", "wordpressexport.xml")
+WORDPRESS_ENCODED_CONTENT_SAMPLE = os.path.join(
+    CUR_DIR, "content", "wordpress_content_encoded"
+)
+WORDPRESS_DECODED_CONTENT_SAMPLE = os.path.join(
+    CUR_DIR, "content", "wordpress_content_decoded"
+)
 
 try:
     from bs4 import BeautifulSoup
@@ -36,10 +45,9 @@ except ImportError:
     LXML = False
 
 
-@skipIfNoExecutable(['pandoc', '--version'])
-@unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
+@skipIfNoExecutable(["pandoc", "--version"])
+@unittest.skipUnless(BeautifulSoup, "Needs BeautifulSoup module")
 class TestBloggerXmlImporter(TestCaseWithCLocale):
-
     def setUp(self):
         super().setUp()
         self.posts = blogger2fields(BLOGGER_XML_SAMPLE)
@@ -50,16 +58,17 @@ class TestBloggerXmlImporter(TestCaseWithCLocale):
         """
         test_posts = list(self.posts)
         kinds = {x[8] for x in test_posts}
-        self.assertEqual({'page', 'article', 'comment'}, kinds)
-        page_titles = {x[0] for x in test_posts if x[8] == 'page'}
-        self.assertEqual({'Test page', 'Test page 2'}, page_titles)
-        article_titles = {x[0] for x in test_posts if x[8] == 'article'}
-        self.assertEqual({'Black as Egypt\'s Night', 'The Steel Windpipe'},
-                         article_titles)
-        comment_titles = {x[0] for x in test_posts if x[8] == 'comment'}
-        self.assertEqual({'Mishka, always a pleasure to read your '
-                          'adventures!...'},
-                         comment_titles)
+        self.assertEqual({"page", "article", "comment"}, kinds)
+        page_titles = {x[0] for x in test_posts if x[8] == "page"}
+        self.assertEqual({"Test page", "Test page 2"}, page_titles)
+        article_titles = {x[0] for x in test_posts if x[8] == "article"}
+        self.assertEqual(
+            {"Black as Egypt's Night", "The Steel Windpipe"}, article_titles
+        )
+        comment_titles = {x[0] for x in test_posts if x[8] == "comment"}
+        self.assertEqual(
+            {"Mishka, always a pleasure to read your " "adventures!..."}, comment_titles
+        )
 
     def test_recognise_status_with_correct_filename(self):
         """Check that importerer outputs only statuses 'published' and 'draft',
@@ -67,24 +76,25 @@ class TestBloggerXmlImporter(TestCaseWithCLocale):
         """
         test_posts = list(self.posts)
         statuses = {x[7] for x in test_posts}
-        self.assertEqual({'published', 'draft'}, statuses)
+        self.assertEqual({"published", "draft"}, statuses)
 
-        draft_filenames = {x[2] for x in test_posts if x[7] == 'draft'}
+        draft_filenames = {x[2] for x in test_posts if x[7] == "draft"}
         # draft filenames are id-based
-        self.assertEqual({'page-4386962582497458967',
-                          'post-1276418104709695660'}, draft_filenames)
+        self.assertEqual(
+            {"page-4386962582497458967", "post-1276418104709695660"}, draft_filenames
+        )
 
-        published_filenames = {x[2] for x in test_posts if x[7] == 'published'}
+        published_filenames = {x[2] for x in test_posts if x[7] == "published"}
         # published filenames are url-based, except comments
-        self.assertEqual({'the-steel-windpipe',
-                          'test-page',
-                          'post-5590533389087749201'}, published_filenames)
+        self.assertEqual(
+            {"the-steel-windpipe", "test-page", "post-5590533389087749201"},
+            published_filenames,
+        )
 
 
-@skipIfNoExecutable(['pandoc', '--version'])
-@unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
+@skipIfNoExecutable(["pandoc", "--version"])
+@unittest.skipUnless(BeautifulSoup, "Needs BeautifulSoup module")
 class TestWordpressXmlImporter(TestCaseWithCLocale):
-
     def setUp(self):
         super().setUp()
         self.posts = wp2fields(WORDPRESS_XML_SAMPLE)
@@ -92,30 +102,49 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
 
     def test_ignore_empty_posts(self):
         self.assertTrue(self.posts)
-        for (title, content, fname, date, author,
-                categ, tags, status, kind, format) in self.posts:
+        for (
+            title,
+            content,
+            fname,
+            date,
+            author,
+            categ,
+            tags,
+            status,
+            kind,
+            format,
+        ) in self.posts:
             self.assertTrue(title.strip())
 
     def test_recognise_page_kind(self):
-        """ Check that we recognise pages in wordpress, as opposed to posts """
+        """Check that we recognise pages in wordpress, as opposed to posts"""
         self.assertTrue(self.posts)
         # Collect (title, filename, kind) of non-empty posts recognised as page
         pages_data = []
-        for (title, content, fname, date, author,
-                categ, tags, status, kind, format) in self.posts:
-            if kind == 'page':
+        for (
+            title,
+            content,
+            fname,
+            date,
+            author,
+            categ,
+            tags,
+            status,
+            kind,
+            format,
+        ) in self.posts:
+            if kind == "page":
                 pages_data.append((title, fname))
         self.assertEqual(2, len(pages_data))
-        self.assertEqual(('Page', 'contact'), pages_data[0])
-        self.assertEqual(('Empty Page', 'empty'), pages_data[1])
+        self.assertEqual(("Page", "contact"), pages_data[0])
+        self.assertEqual(("Empty Page", "empty"), pages_data[1])
 
     def test_dirpage_directive_for_page_kind(self):
         silent_f2p = mute(True)(fields2pelican)
         test_post = filter(lambda p: p[0].startswith("Empty Page"), self.posts)
         with temporary_folder() as temp:
-            fname = list(silent_f2p(test_post, 'markdown',
-                                    temp, dirpage=True))[0]
-            self.assertTrue(fname.endswith('pages%sempty.md' % os.path.sep))
+            fname = list(silent_f2p(test_post, "markdown", temp, dirpage=True))[0]
+            self.assertTrue(fname.endswith("pages%sempty.md" % os.path.sep))
 
     def test_dircat(self):
         silent_f2p = mute(True)(fields2pelican)
@@ -125,14 +154,13 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
             if len(post[5]) > 0:  # Has a category
                 test_posts.append(post)
         with temporary_folder() as temp:
-            fnames = list(silent_f2p(test_posts, 'markdown',
-                                     temp, dircat=True))
-        subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
+            fnames = list(silent_f2p(test_posts, "markdown", temp, dircat=True))
+        subs = DEFAULT_CONFIG["SLUG_REGEX_SUBSTITUTIONS"]
         index = 0
         for post in test_posts:
             name = post[2]
             category = slugify(post[5][0], regex_subs=subs, preserve_case=True)
-            name += '.md'
+            name += ".md"
             filename = os.path.join(category, name)
             out_name = fnames[index]
             self.assertTrue(out_name.endswith(filename))
@@ -141,9 +169,19 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
     def test_unless_custom_post_all_items_should_be_pages_or_posts(self):
         self.assertTrue(self.posts)
         pages_data = []
-        for (title, content, fname, date, author, categ,
-                tags, status, kind, format) in self.posts:
-            if kind == 'page' or kind == 'article':
+        for (
+            title,
+            content,
+            fname,
+            date,
+            author,
+            categ,
+            tags,
+            status,
+            kind,
+            format,
+        ) in self.posts:
+            if kind == "page" or kind == "article":
                 pass
             else:
                 pages_data.append((title, fname))
@@ -152,40 +190,45 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
     def test_recognise_custom_post_type(self):
         self.assertTrue(self.custposts)
         cust_data = []
-        for (title, content, fname, date, author, categ,
-                tags, status, kind, format) in self.custposts:
-            if kind == 'article' or kind == 'page':
+        for (
+            title,
+            content,
+            fname,
+            date,
+            author,
+            categ,
+            tags,
+            status,
+            kind,
+            format,
+        ) in self.custposts:
+            if kind == "article" or kind == "page":
                 pass
             else:
                 cust_data.append((title, kind))
         self.assertEqual(3, len(cust_data))
+        self.assertEqual(("A custom post in category 4", "custom1"), cust_data[0])
+        self.assertEqual(("A custom post in category 5", "custom1"), cust_data[1])
         self.assertEqual(
-            ('A custom post in category 4', 'custom1'),
-            cust_data[0])
-        self.assertEqual(
-            ('A custom post in category 5', 'custom1'),
-            cust_data[1])
-        self.assertEqual(
-            ('A 2nd custom post type also in category 5', 'custom2'),
-            cust_data[2])
+            ("A 2nd custom post type also in category 5", "custom2"), cust_data[2]
+        )
 
     def test_custom_posts_put_in_own_dir(self):
         silent_f2p = mute(True)(fields2pelican)
         test_posts = []
         for post in self.custposts:
             # check post kind
-            if post[8] == 'article' or post[8] == 'page':
+            if post[8] == "article" or post[8] == "page":
                 pass
             else:
                 test_posts.append(post)
         with temporary_folder() as temp:
-            fnames = list(silent_f2p(test_posts, 'markdown',
-                                     temp, wp_custpost=True))
+            fnames = list(silent_f2p(test_posts, "markdown", temp, wp_custpost=True))
         index = 0
         for post in test_posts:
             name = post[2]
             kind = post[8]
-            name += '.md'
+            name += ".md"
             filename = os.path.join(kind, name)
             out_name = fnames[index]
             self.assertTrue(out_name.endswith(filename))
@@ -196,20 +239,21 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         test_posts = []
         for post in self.custposts:
             # check post kind
-            if post[8] == 'article' or post[8] == 'page':
+            if post[8] == "article" or post[8] == "page":
                 pass
             else:
                 test_posts.append(post)
         with temporary_folder() as temp:
-            fnames = list(silent_f2p(test_posts, 'markdown', temp,
-                                     wp_custpost=True, dircat=True))
-        subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
+            fnames = list(
+                silent_f2p(test_posts, "markdown", temp, wp_custpost=True, dircat=True)
+            )
+        subs = DEFAULT_CONFIG["SLUG_REGEX_SUBSTITUTIONS"]
         index = 0
         for post in test_posts:
             name = post[2]
             kind = post[8]
             category = slugify(post[5][0], regex_subs=subs, preserve_case=True)
-            name += '.md'
+            name += ".md"
             filename = os.path.join(kind, category, name)
             out_name = fnames[index]
             self.assertTrue(out_name.endswith(filename))
@@ -221,16 +265,19 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         test_posts = []
         for post in self.custposts:
             # check post kind
-            if post[8] == 'page':
+            if post[8] == "page":
                 test_posts.append(post)
         with temporary_folder() as temp:
-            fnames = list(silent_f2p(test_posts, 'markdown', temp,
-                                     wp_custpost=True, dirpage=False))
+            fnames = list(
+                silent_f2p(
+                    test_posts, "markdown", temp, wp_custpost=True, dirpage=False
+                )
+            )
         index = 0
         for post in test_posts:
             name = post[2]
-            name += '.md'
-            filename = os.path.join('pages', name)
+            name += ".md"
+            filename = os.path.join("pages", name)
             out_name = fnames[index]
             self.assertFalse(out_name.endswith(filename))
 
@@ -238,117 +285,114 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         test_posts = list(self.posts)
 
         def r(f):
-            with open(f, encoding='utf-8') as infile:
+            with open(f, encoding="utf-8") as infile:
                 return infile.read()
+
         silent_f2p = mute(True)(fields2pelican)
 
         with temporary_folder() as temp:
-
-            rst_files = (r(f) for f
-                         in silent_f2p(test_posts, 'markdown', temp))
-            self.assertTrue(any('<iframe' in rst for rst in rst_files))
-            rst_files = (r(f) for f
-                         in silent_f2p(test_posts, 'markdown',
-                                       temp, strip_raw=True))
-            self.assertFalse(any('<iframe' in rst for rst in rst_files))
+            rst_files = (r(f) for f in silent_f2p(test_posts, "markdown", temp))
+            self.assertTrue(any("<iframe" in rst for rst in rst_files))
+            rst_files = (
+                r(f) for f in silent_f2p(test_posts, "markdown", temp, strip_raw=True)
+            )
+            self.assertFalse(any("<iframe" in rst for rst in rst_files))
             # no effect in rst
-            rst_files = (r(f) for f in silent_f2p(test_posts, 'rst', temp))
-            self.assertFalse(any('<iframe' in rst for rst in rst_files))
-            rst_files = (r(f) for f in silent_f2p(test_posts, 'rst', temp,
-                         strip_raw=True))
-            self.assertFalse(any('<iframe' in rst for rst in rst_files))
+            rst_files = (r(f) for f in silent_f2p(test_posts, "rst", temp))
+            self.assertFalse(any("<iframe" in rst for rst in rst_files))
+            rst_files = (
+                r(f) for f in silent_f2p(test_posts, "rst", temp, strip_raw=True)
+            )
+            self.assertFalse(any("<iframe" in rst for rst in rst_files))
 
     def test_decode_html_entities_in_titles(self):
-        test_posts = [post for post
-                      in self.posts if post[2] == 'html-entity-test']
+        test_posts = [post for post in self.posts if post[2] == "html-entity-test"]
         self.assertEqual(len(test_posts), 1)
 
         post = test_posts[0]
         title = post[0]
-        self.assertTrue(title, "A normal post with some <html> entities in "
-                               "the title. You can't miss them.")
-        self.assertNotIn('&', title)
+        self.assertTrue(
+            title,
+            "A normal post with some <html> entities in "
+            "the title. You can't miss them.",
+        )
+        self.assertNotIn("&", title)
 
     def test_decode_wp_content_returns_empty(self):
-        """ Check that given an empty string we return an empty string."""
+        """Check that given an empty string we return an empty string."""
         self.assertEqual(decode_wp_content(""), "")
 
     def test_decode_wp_content(self):
-        """ Check that we can decode a wordpress content string."""
+        """Check that we can decode a wordpress content string."""
         with open(WORDPRESS_ENCODED_CONTENT_SAMPLE) as encoded_file:
             encoded_content = encoded_file.read()
             with open(WORDPRESS_DECODED_CONTENT_SAMPLE) as decoded_file:
                 decoded_content = decoded_file.read()
                 self.assertEqual(
-                    decode_wp_content(encoded_content, br=False),
-                    decoded_content)
+                    decode_wp_content(encoded_content, br=False), decoded_content
+                )
 
     def test_preserve_verbatim_formatting(self):
         def r(f):
-            with open(f, encoding='utf-8') as infile:
+            with open(f, encoding="utf-8") as infile:
                 return infile.read()
-        silent_f2p = mute(True)(fields2pelican)
-        test_post = filter(
-            lambda p: p[0].startswith("Code in List"),
-            self.posts)
-        with temporary_folder() as temp:
-            md = [r(f) for f in silent_f2p(test_post, 'markdown', temp)][0]
-            self.assertTrue(re.search(r'\s+a = \[1, 2, 3\]', md))
-            self.assertTrue(re.search(r'\s+b = \[4, 5, 6\]', md))
 
-            for_line = re.search(r'\s+for i in zip\(a, b\):', md).group(0)
-            print_line = re.search(r'\s+print i', md).group(0)
-            self.assertTrue(
-                for_line.rindex('for') < print_line.rindex('print'))
+        silent_f2p = mute(True)(fields2pelican)
+        test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)
+        with temporary_folder() as temp:
+            md = [r(f) for f in silent_f2p(test_post, "markdown", temp)][0]
+            self.assertTrue(re.search(r"\s+a = \[1, 2, 3\]", md))
+            self.assertTrue(re.search(r"\s+b = \[4, 5, 6\]", md))
+
+            for_line = re.search(r"\s+for i in zip\(a, b\):", md).group(0)
+            print_line = re.search(r"\s+print i", md).group(0)
+            self.assertTrue(for_line.rindex("for") < print_line.rindex("print"))
 
     def test_code_in_list(self):
         def r(f):
-            with open(f, encoding='utf-8') as infile:
+            with open(f, encoding="utf-8") as infile:
                 return infile.read()
+
         silent_f2p = mute(True)(fields2pelican)
-        test_post = filter(
-            lambda p: p[0].startswith("Code in List"),
-            self.posts)
+        test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)
         with temporary_folder() as temp:
-            md = [r(f) for f in silent_f2p(test_post, 'markdown', temp)][0]
-            sample_line = re.search(r'- This is a code sample', md).group(0)
-            code_line = re.search(r'\s+a = \[1, 2, 3\]', md).group(0)
-            self.assertTrue(sample_line.rindex('This') < code_line.rindex('a'))
+            md = [r(f) for f in silent_f2p(test_post, "markdown", temp)][0]
+            sample_line = re.search(r"- This is a code sample", md).group(0)
+            code_line = re.search(r"\s+a = \[1, 2, 3\]", md).group(0)
+            self.assertTrue(sample_line.rindex("This") < code_line.rindex("a"))
 
     def test_dont_use_smart_quotes(self):
         def r(f):
-            with open(f, encoding='utf-8') as infile:
+            with open(f, encoding="utf-8") as infile:
                 return infile.read()
+
         silent_f2p = mute(True)(fields2pelican)
-        test_post = filter(
-            lambda p: p[0].startswith("Post with raw data"),
-            self.posts)
+        test_post = filter(lambda p: p[0].startswith("Post with raw data"), self.posts)
         with temporary_folder() as temp:
-            md = [r(f) for f in silent_f2p(test_post, 'markdown', temp)][0]
+            md = [r(f) for f in silent_f2p(test_post, "markdown", temp)][0]
             escaped_quotes = re.search(r'\\[\'"“”‘’]', md)
             self.assertFalse(escaped_quotes)
 
     def test_convert_caption_to_figure(self):
         def r(f):
-            with open(f, encoding='utf-8') as infile:
+            with open(f, encoding="utf-8") as infile:
                 return infile.read()
-        silent_f2p = mute(True)(fields2pelican)
-        test_post = filter(
-            lambda p: p[0].startswith("Caption on image"),
-            self.posts)
-        with temporary_folder() as temp:
-            md = [r(f) for f in silent_f2p(test_post, 'markdown', temp)][0]
 
-        caption = re.search(r'\[caption', md)
+        silent_f2p = mute(True)(fields2pelican)
+        test_post = filter(lambda p: p[0].startswith("Caption on image"), self.posts)
+        with temporary_folder() as temp:
+            md = [r(f) for f in silent_f2p(test_post, "markdown", temp)][0]
+
+        caption = re.search(r"\[caption", md)
         self.assertFalse(caption)
 
         for occurence in [
-            '/theme/img/xpelican.png.pagespeed.ic.Rjep0025-y.png',
-            '/theme/img/xpelican-3.png.pagespeed.ic.m-NAIdRCOM.png',
-            '/theme/img/xpelican.png.pagespeed.ic.Rjep0025-y.png',
-            'This is a pelican',
-            'This also a pelican',
-            'Yet another pelican',
+            "/theme/img/xpelican.png.pagespeed.ic.Rjep0025-y.png",
+            "/theme/img/xpelican-3.png.pagespeed.ic.m-NAIdRCOM.png",
+            "/theme/img/xpelican.png.pagespeed.ic.Rjep0025-y.png",
+            "This is a pelican",
+            "This also a pelican",
+            "Yet another pelican",
         ]:
             # pandoc 2.x converts into ![text](src)
             # pandoc 3.x converts into <figure>src<figcaption>text</figcaption></figure>
@@ -357,70 +401,97 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
 
 class TestBuildHeader(unittest.TestCase):
     def test_build_header(self):
-        header = build_header('test', None, None, None, None, None)
-        self.assertEqual(header, 'test\n####\n\n')
+        header = build_header("test", None, None, None, None, None)
+        self.assertEqual(header, "test\n####\n\n")
 
     def test_build_header_with_fields(self):
         header_data = [
-            'Test Post',
-            '2014-11-04',
-            'Alexis Métaireau',
-            ['Programming'],
-            ['Pelican', 'Python'],
-            'test-post',
+            "Test Post",
+            "2014-11-04",
+            "Alexis Métaireau",
+            ["Programming"],
+            ["Pelican", "Python"],
+            "test-post",
         ]
 
-        expected_docutils = '\n'.join([
-            'Test Post',
-            '#########',
-            ':date: 2014-11-04',
-            ':author: Alexis Métaireau',
-            ':category: Programming',
-            ':tags: Pelican, Python',
-            ':slug: test-post',
-            '\n',
-        ])
+        expected_docutils = "\n".join(
+            [
+                "Test Post",
+                "#########",
+                ":date: 2014-11-04",
+                ":author: Alexis Métaireau",
+                ":category: Programming",
+                ":tags: Pelican, Python",
+                ":slug: test-post",
+                "\n",
+            ]
+        )
 
-        expected_md = '\n'.join([
-            'Title: Test Post',
-            'Date: 2014-11-04',
-            'Author: Alexis Métaireau',
-            'Category: Programming',
-            'Tags: Pelican, Python',
-            'Slug: test-post',
-            '\n',
-        ])
+        expected_md = "\n".join(
+            [
+                "Title: Test Post",
+                "Date: 2014-11-04",
+                "Author: Alexis Métaireau",
+                "Category: Programming",
+                "Tags: Pelican, Python",
+                "Slug: test-post",
+                "\n",
+            ]
+        )
 
         self.assertEqual(build_header(*header_data), expected_docutils)
         self.assertEqual(build_markdown_header(*header_data), expected_md)
 
     def test_build_header_with_east_asian_characters(self):
-        header = build_header('これは広い幅の文字だけで構成されたタイトルです',
-                              None, None, None, None, None)
+        header = build_header(
+            "これは広い幅の文字だけで構成されたタイトルです",
+            None,
+            None,
+            None,
+            None,
+            None,
+        )
 
-        self.assertEqual(header,
-                         ('これは広い幅の文字だけで構成されたタイトルです\n'
-                          '##############################################'
-                          '\n\n'))
-
-    def test_galleries_added_to_header(self):
-        header = build_header('test', None, None, None, None, None,
-                              attachments=['output/test1', 'output/test2'])
-        self.assertEqual(header, ('test\n####\n'
-                                  ':attachments: output/test1, '
-                                  'output/test2\n\n'))
-
-    def test_galleries_added_to_markdown_header(self):
-        header = build_markdown_header('test', None, None, None, None, None,
-                                       attachments=['output/test1',
-                                                    'output/test2'])
         self.assertEqual(
             header,
-            'Title: test\nAttachments: output/test1, output/test2\n\n')
+            (
+                "これは広い幅の文字だけで構成されたタイトルです\n"
+                "##############################################"
+                "\n\n"
+            ),
+        )
+
+    def test_galleries_added_to_header(self):
+        header = build_header(
+            "test",
+            None,
+            None,
+            None,
+            None,
+            None,
+            attachments=["output/test1", "output/test2"],
+        )
+        self.assertEqual(
+            header, ("test\n####\n" ":attachments: output/test1, " "output/test2\n\n")
+        )
+
+    def test_galleries_added_to_markdown_header(self):
+        header = build_markdown_header(
+            "test",
+            None,
+            None,
+            None,
+            None,
+            None,
+            attachments=["output/test1", "output/test2"],
+        )
+        self.assertEqual(
+            header, "Title: test\nAttachments: output/test1, output/test2\n\n"
+        )
 
 
-@unittest.skipUnless(BeautifulSoup, 'Needs BeautifulSoup module')
-@unittest.skipUnless(LXML, 'Needs lxml module')
+@unittest.skipUnless(BeautifulSoup, "Needs BeautifulSoup module")
+@unittest.skipUnless(LXML, "Needs lxml module")
 class TestWordpressXMLAttachements(TestCaseWithCLocale):
     def setUp(self):
         super().setUp()
@@ -435,38 +506,45 @@ class TestWordpressXMLAttachements(TestCaseWithCLocale):
         for post in self.attachments.keys():
             if post is None:
                 expected = {
-                    ('https://upload.wikimedia.org/wikipedia/commons/'
-                     'thumb/2/2c/Pelican_lakes_entrance02.jpg/'
-                     '240px-Pelican_lakes_entrance02.jpg')
+                    (
+                        "https://upload.wikimedia.org/wikipedia/commons/"
+                        "thumb/2/2c/Pelican_lakes_entrance02.jpg/"
+                        "240px-Pelican_lakes_entrance02.jpg"
+                    )
                 }
                 self.assertEqual(self.attachments[post], expected)
-            elif post == 'with-excerpt':
-                expected_invalid = ('http://thisurlisinvalid.notarealdomain/'
-                                    'not_an_image.jpg')
-                expected_pelikan = ('http://en.wikipedia.org/wiki/'
-                                    'File:Pelikan_Walvis_Bay.jpg')
-                self.assertEqual(self.attachments[post],
-                                 {expected_invalid, expected_pelikan})
-            elif post == 'with-tags':
-                expected_invalid = ('http://thisurlisinvalid.notarealdomain')
+            elif post == "with-excerpt":
+                expected_invalid = (
+                    "http://thisurlisinvalid.notarealdomain/" "not_an_image.jpg"
+                )
+                expected_pelikan = (
+                    "http://en.wikipedia.org/wiki/" "File:Pelikan_Walvis_Bay.jpg"
+                )
+                self.assertEqual(
+                    self.attachments[post], {expected_invalid, expected_pelikan}
+                )
+            elif post == "with-tags":
+                expected_invalid = "http://thisurlisinvalid.notarealdomain"
                 self.assertEqual(self.attachments[post], {expected_invalid})
             else:
-                self.fail('all attachments should match to a '
-                          'filename or None, {}'
-                          .format(post))
+                self.fail(
+                    "all attachments should match to a " "filename or None, {}".format(
+                        post
+                    )
+                )
 
     def test_download_attachments(self):
-        real_file = os.path.join(CUR_DIR, 'content/article.rst')
+        real_file = os.path.join(CUR_DIR, "content/article.rst")
         good_url = path_to_file_url(real_file)
-        bad_url = 'http://localhost:1/not_a_file.txt'
+        bad_url = "http://localhost:1/not_a_file.txt"
         silent_da = mute()(download_attachments)
         with temporary_folder() as temp:
             locations = list(silent_da(temp, [good_url, bad_url]))
             self.assertEqual(1, len(locations))
             directory = locations[0]
             self.assertTrue(
-                directory.endswith(posix_join('content', 'article.rst')),
-                directory)
+                directory.endswith(posix_join("content", "article.rst")), directory
+            )
 
 
 class TestTumblrImporter(TestCaseWithCLocale):
@@ -484,32 +562,42 @@ class TestTumblrImporter(TestCaseWithCLocale):
                     "timestamp": 1573162000,
                     "format": "html",
                     "slug": "a-slug",
-                    "tags": [
-                        "economics"
-                    ],
+                    "tags": ["economics"],
                     "state": "published",
-
                     "photos": [
                         {
                             "caption": "",
                             "original_size": {
                                 "url": "https://..fccdc2360ba7182a.jpg",
                                 "width": 634,
-                                "height": 789
+                                "height": 789,
                             },
-                        }]
+                        }
+                    ],
                 }
             ]
+
         get.side_effect = get_posts
 
         posts = list(tumblr2fields("api_key", "blogname"))
         self.assertEqual(
-            [('Photo',
-              '<img alt="" src="https://..fccdc2360ba7182a.jpg" />\n',
-              '2019-11-07-a-slug', '2019-11-07 21:26:40+0000', 'testy', ['photo'],
-              ['economics'], 'published', 'article', 'html')],
+            [
+                (
+                    "Photo",
+                    '<img alt="" src="https://..fccdc2360ba7182a.jpg" />\n',
+                    "2019-11-07-a-slug",
+                    "2019-11-07 21:26:40+0000",
+                    "testy",
+                    ["photo"],
+                    ["economics"],
+                    "published",
+                    "article",
+                    "html",
+                )
+            ],
             posts,
-            posts)
+            posts,
+        )
 
     @patch("pelican.tools.pelican_import._get_tumblr_posts")
     def test_video_embed(self, get):
@@ -531,40 +619,39 @@ class TestTumblrImporter(TestCaseWithCLocale):
                     "source_title": "youtube.com",
                     "caption": "<p>Caption</p>",
                     "player": [
-                        {
-                            "width": 250,
-                            "embed_code":
-                                "<iframe>1</iframe>"
-                        },
-                        {
-                            "width": 400,
-                            "embed_code":
-                                "<iframe>2</iframe>"
-                        },
-                        {
-                            "width": 500,
-                            "embed_code":
-                                "<iframe>3</iframe>"
-                        }
+                        {"width": 250, "embed_code": "<iframe>1</iframe>"},
+                        {"width": 400, "embed_code": "<iframe>2</iframe>"},
+                        {"width": 500, "embed_code": "<iframe>3</iframe>"},
                     ],
                     "video_type": "youtube",
                 }
-                ]
+            ]
+
         get.side_effect = get_posts
 
         posts = list(tumblr2fields("api_key", "blogname"))
         self.assertEqual(
-            [('youtube.com',
-              '<p><a href="https://href.li/?'
-              'https://www.youtube.com/a">via</a></p>\n<p>Caption</p>'
-              '<iframe>1</iframe>\n'
-              '<iframe>2</iframe>\n'
-              '<iframe>3</iframe>\n',
-              '2017-07-07-the-slug',
-              '2017-07-07 20:31:41+0000', 'testy', ['video'], [], 'published',
-              'article', 'html')],
+            [
+                (
+                    "youtube.com",
+                    '<p><a href="https://href.li/?'
+                    'https://www.youtube.com/a">via</a></p>\n<p>Caption</p>'
+                    "<iframe>1</iframe>\n"
+                    "<iframe>2</iframe>\n"
+                    "<iframe>3</iframe>\n",
+                    "2017-07-07-the-slug",
+                    "2017-07-07 20:31:41+0000",
+                    "testy",
+                    ["video"],
+                    [],
+                    "published",
+                    "article",
+                    "html",
+                )
+            ],
             posts,
-            posts)
+            posts,
+        )
 
     @patch("pelican.tools.pelican_import._get_tumblr_posts")
     def test_broken_video_embed(self, get):
@@ -581,42 +668,43 @@ class TestTumblrImporter(TestCaseWithCLocale):
                     "timestamp": 1471192655,
                     "state": "published",
                     "format": "html",
-                    "tags": [
-                        "interviews"
-                    ],
-                    "source_url":
-                        "https://href.li/?https://www.youtube.com/watch?v=b",
+                    "tags": ["interviews"],
+                    "source_url": "https://href.li/?https://www.youtube.com/watch?v=b",
                     "source_title": "youtube.com",
-                    "caption":
-                        "<p>Caption</p>",
+                    "caption": "<p>Caption</p>",
                     "player": [
                         {
                             "width": 250,
                             # If video is gone, embed_code is False
-                            "embed_code": False
+                            "embed_code": False,
                         },
-                        {
-                            "width": 400,
-                            "embed_code": False
-                        },
-                        {
-                            "width": 500,
-                            "embed_code": False
-                        }
+                        {"width": 400, "embed_code": False},
+                        {"width": 500, "embed_code": False},
                     ],
                     "video_type": "youtube",
                 }
             ]
+
         get.side_effect = get_posts
 
         posts = list(tumblr2fields("api_key", "blogname"))
         self.assertEqual(
-            [('youtube.com',
-              '<p><a href="https://href.li/?https://www.youtube.com/watch?'
-              'v=b">via</a></p>\n<p>Caption</p>'
-              '<p>(This video isn\'t available anymore.)</p>\n',
-              '2016-08-14-the-slug',
-              '2016-08-14 16:37:35+0000', 'testy', ['video'], ['interviews'],
-              'published', 'article', 'html')],
+            [
+                (
+                    "youtube.com",
+                    '<p><a href="https://href.li/?https://www.youtube.com/watch?'
+                    'v=b">via</a></p>\n<p>Caption</p>'
+                    "<p>(This video isn't available anymore.)</p>\n",
+                    "2016-08-14-the-slug",
+                    "2016-08-14 16:37:35+0000",
+                    "testy",
+                    ["video"],
+                    ["interviews"],
+                    "published",
+                    "article",
+                    "html",
+                )
+            ],
             posts,
-            posts)
+            posts,
+        )
diff --git a/pelican/tests/test_log.py b/pelican/tests/test_log.py
index 1f2fb83a..8791fc7c 100644
--- a/pelican/tests/test_log.py
+++ b/pelican/tests/test_log.py
@@ -35,48 +35,41 @@ class TestLog(unittest.TestCase):
     def test_log_filter(self):
         def do_logging():
             for i in range(5):
-                self.logger.warning('Log %s', i)
-                self.logger.warning('Another log %s', i)
+                self.logger.warning("Log %s", i)
+                self.logger.warning("Another log %s", i)
+
         # no filter
         with self.reset_logger():
             do_logging()
+            self.assertEqual(self.handler.count_logs("Log \\d", logging.WARNING), 5)
             self.assertEqual(
-                self.handler.count_logs('Log \\d', logging.WARNING),
-                5)
-            self.assertEqual(
-                self.handler.count_logs('Another log \\d', logging.WARNING),
-                5)
+                self.handler.count_logs("Another log \\d", logging.WARNING), 5
+            )
 
         # filter by template
         with self.reset_logger():
-            log.LimitFilter._ignore.add((logging.WARNING, 'Log %s'))
+            log.LimitFilter._ignore.add((logging.WARNING, "Log %s"))
             do_logging()
+            self.assertEqual(self.handler.count_logs("Log \\d", logging.WARNING), 0)
             self.assertEqual(
-                self.handler.count_logs('Log \\d', logging.WARNING),
-                0)
-            self.assertEqual(
-                self.handler.count_logs('Another log \\d', logging.WARNING),
-                5)
+                self.handler.count_logs("Another log \\d", logging.WARNING), 5
+            )
 
         # filter by exact message
         with self.reset_logger():
-            log.LimitFilter._ignore.add((logging.WARNING, 'Log 3'))
+            log.LimitFilter._ignore.add((logging.WARNING, "Log 3"))
             do_logging()
+            self.assertEqual(self.handler.count_logs("Log \\d", logging.WARNING), 4)
             self.assertEqual(
-                self.handler.count_logs('Log \\d', logging.WARNING),
-                4)
-            self.assertEqual(
-                self.handler.count_logs('Another log \\d', logging.WARNING),
-                5)
+                self.handler.count_logs("Another log \\d", logging.WARNING), 5
+            )
 
         # filter by both
         with self.reset_logger():
-            log.LimitFilter._ignore.add((logging.WARNING, 'Log 3'))
-            log.LimitFilter._ignore.add((logging.WARNING, 'Another log %s'))
+            log.LimitFilter._ignore.add((logging.WARNING, "Log 3"))
+            log.LimitFilter._ignore.add((logging.WARNING, "Another log %s"))
             do_logging()
+            self.assertEqual(self.handler.count_logs("Log \\d", logging.WARNING), 4)
             self.assertEqual(
-                self.handler.count_logs('Log \\d', logging.WARNING),
-                4)
-            self.assertEqual(
-                self.handler.count_logs('Another log \\d', logging.WARNING),
-                0)
+                self.handler.count_logs("Another log \\d", logging.WARNING), 0
+            )
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index f8233eb4..2160421f 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -17,17 +17,17 @@ class TestPage(unittest.TestCase):
     def setUp(self):
         super().setUp()
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
+        locale.setlocale(locale.LC_ALL, "C")
         self.page_kwargs = {
-            'content': TEST_CONTENT,
-            'context': {
-                'localsiteurl': '',
+            "content": TEST_CONTENT,
+            "context": {
+                "localsiteurl": "",
             },
-            'metadata': {
-                'summary': TEST_SUMMARY,
-                'title': 'foo bar',
+            "metadata": {
+                "summary": TEST_SUMMARY,
+                "title": "foo bar",
             },
-            'source_path': '/path/to/file/foo.ext'
+            "source_path": "/path/to/file/foo.ext",
         }
 
     def tearDown(self):
@@ -37,68 +37,79 @@ class TestPage(unittest.TestCase):
         settings = get_settings()
         # fix up pagination rules
         from pelican.paginator import PaginationRule
+
         pagination_rules = [
-            PaginationRule(*r) for r in settings.get(
-                'PAGINATION_PATTERNS',
-                DEFAULT_CONFIG['PAGINATION_PATTERNS'],
+            PaginationRule(*r)
+            for r in settings.get(
+                "PAGINATION_PATTERNS",
+                DEFAULT_CONFIG["PAGINATION_PATTERNS"],
             )
         ]
-        settings['PAGINATION_PATTERNS'] = sorted(
+        settings["PAGINATION_PATTERNS"] = sorted(
             pagination_rules,
             key=lambda r: r[0],
         )
 
-        self.page_kwargs['metadata']['author'] = Author('Blogger', settings)
-        object_list = [Article(**self.page_kwargs),
-                       Article(**self.page_kwargs)]
-        paginator = Paginator('foobar.foo', 'foobar/foo', object_list,
-                              settings)
+        self.page_kwargs["metadata"]["author"] = Author("Blogger", settings)
+        object_list = [Article(**self.page_kwargs), Article(**self.page_kwargs)]
+        paginator = Paginator("foobar.foo", "foobar/foo", object_list, settings)
         page = paginator.page(1)
-        self.assertEqual(page.save_as, 'foobar.foo')
+        self.assertEqual(page.save_as, "foobar.foo")
 
     def test_custom_pagination_pattern(self):
         from pelican.paginator import PaginationRule
-        settings = get_settings()
-        settings['PAGINATION_PATTERNS'] = [PaginationRule(*r) for r in [
-            (1, '/{url}', '{base_name}/index.html'),
-            (2, '/{url}{number}/', '{base_name}/{number}/index.html')
-        ]]
 
-        self.page_kwargs['metadata']['author'] = Author('Blogger', settings)
-        object_list = [Article(**self.page_kwargs),
-                       Article(**self.page_kwargs)]
-        paginator = Paginator('blog/index.html', '//blog.my.site/',
-                              object_list, settings, 1)
+        settings = get_settings()
+        settings["PAGINATION_PATTERNS"] = [
+            PaginationRule(*r)
+            for r in [
+                (1, "/{url}", "{base_name}/index.html"),
+                (2, "/{url}{number}/", "{base_name}/{number}/index.html"),
+            ]
+        ]
+
+        self.page_kwargs["metadata"]["author"] = Author("Blogger", settings)
+        object_list = [Article(**self.page_kwargs), Article(**self.page_kwargs)]
+        paginator = Paginator(
+            "blog/index.html", "//blog.my.site/", object_list, settings, 1
+        )
         # The URL *has to* stay absolute (with // in the front), so verify that
         page1 = paginator.page(1)
-        self.assertEqual(page1.save_as, 'blog/index.html')
-        self.assertEqual(page1.url, '//blog.my.site/')
+        self.assertEqual(page1.save_as, "blog/index.html")
+        self.assertEqual(page1.url, "//blog.my.site/")
         page2 = paginator.page(2)
-        self.assertEqual(page2.save_as, 'blog/2/index.html')
-        self.assertEqual(page2.url, '//blog.my.site/2/')
+        self.assertEqual(page2.save_as, "blog/2/index.html")
+        self.assertEqual(page2.url, "//blog.my.site/2/")
 
     def test_custom_pagination_pattern_last_page(self):
         from pelican.paginator import PaginationRule
-        settings = get_settings()
-        settings['PAGINATION_PATTERNS'] = [PaginationRule(*r) for r in [
-            (1, '/{url}1/', '{base_name}/1/index.html'),
-            (2, '/{url}{number}/', '{base_name}/{number}/index.html'),
-            (-1, '/{url}', '{base_name}/index.html'),
-        ]]
 
-        self.page_kwargs['metadata']['author'] = Author('Blogger', settings)
-        object_list = [Article(**self.page_kwargs),
-                       Article(**self.page_kwargs),
-                       Article(**self.page_kwargs)]
-        paginator = Paginator('blog/index.html', '//blog.my.site/',
-                              object_list, settings, 1)
+        settings = get_settings()
+        settings["PAGINATION_PATTERNS"] = [
+            PaginationRule(*r)
+            for r in [
+                (1, "/{url}1/", "{base_name}/1/index.html"),
+                (2, "/{url}{number}/", "{base_name}/{number}/index.html"),
+                (-1, "/{url}", "{base_name}/index.html"),
+            ]
+        ]
+
+        self.page_kwargs["metadata"]["author"] = Author("Blogger", settings)
+        object_list = [
+            Article(**self.page_kwargs),
+            Article(**self.page_kwargs),
+            Article(**self.page_kwargs),
+        ]
+        paginator = Paginator(
+            "blog/index.html", "//blog.my.site/", object_list, settings, 1
+        )
         # The URL *has to* stay absolute (with // in the front), so verify that
         page1 = paginator.page(1)
-        self.assertEqual(page1.save_as, 'blog/1/index.html')
-        self.assertEqual(page1.url, '//blog.my.site/1/')
+        self.assertEqual(page1.save_as, "blog/1/index.html")
+        self.assertEqual(page1.url, "//blog.my.site/1/")
         page2 = paginator.page(2)
-        self.assertEqual(page2.save_as, 'blog/2/index.html')
-        self.assertEqual(page2.url, '//blog.my.site/2/')
+        self.assertEqual(page2.save_as, "blog/2/index.html")
+        self.assertEqual(page2.url, "//blog.my.site/2/")
         page3 = paginator.page(3)
-        self.assertEqual(page3.save_as, 'blog/index.html')
-        self.assertEqual(page3.url, '//blog.my.site/')
+        self.assertEqual(page3.save_as, "blog/index.html")
+        self.assertEqual(page3.url, "//blog.my.site/")
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 885c2138..3c0c0572 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -20,9 +20,10 @@ from pelican.tests.support import (
 )
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
-SAMPLES_PATH = os.path.abspath(os.path.join(
-    CURRENT_DIR, os.pardir, os.pardir, 'samples'))
-OUTPUT_PATH = os.path.abspath(os.path.join(CURRENT_DIR, 'output'))
+SAMPLES_PATH = os.path.abspath(
+    os.path.join(CURRENT_DIR, os.pardir, os.pardir, "samples")
+)
+OUTPUT_PATH = os.path.abspath(os.path.join(CURRENT_DIR, "output"))
 
 INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
 SAMPLE_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf.py")
@@ -31,9 +32,9 @@ SAMPLE_FR_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf_FR.py")
 
 def recursiveDiff(dcmp):
     diff = {
-        'diff_files': [os.path.join(dcmp.right, f) for f in dcmp.diff_files],
-        'left_only': [os.path.join(dcmp.right, f) for f in dcmp.left_only],
-        'right_only': [os.path.join(dcmp.right, f) for f in dcmp.right_only],
+        "diff_files": [os.path.join(dcmp.right, f) for f in dcmp.diff_files],
+        "left_only": [os.path.join(dcmp.right, f) for f in dcmp.left_only],
+        "right_only": [os.path.join(dcmp.right, f) for f in dcmp.right_only],
     }
     for sub_dcmp in dcmp.subdirs.values():
         for k, v in recursiveDiff(sub_dcmp).items():
@@ -47,11 +48,11 @@ class TestPelican(LoggedTestCase):
 
     def setUp(self):
         super().setUp()
-        self.temp_path = mkdtemp(prefix='pelicantests.')
-        self.temp_cache = mkdtemp(prefix='pelican_cache.')
+        self.temp_path = mkdtemp(prefix="pelicantests.")
+        self.temp_cache = mkdtemp(prefix="pelican_cache.")
         self.maxDiff = None
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
+        locale.setlocale(locale.LC_ALL, "C")
 
     def tearDown(self):
         read_settings()  # cleanup PYGMENTS_RST_OPTIONS
@@ -70,8 +71,8 @@ class TestPelican(LoggedTestCase):
         if proc.returncode != 0:
             msg = self._formatMessage(
                 msg,
-                "%s and %s differ:\nstdout:\n%s\nstderr\n%s" %
-                (left_path, right_path, out, err)
+                "%s and %s differ:\nstdout:\n%s\nstderr\n%s"
+                % (left_path, right_path, out, err),
             )
             raise self.failureException(msg)
 
@@ -85,136 +86,154 @@ class TestPelican(LoggedTestCase):
 
         self.assertTrue(
             generator_classes[-1] is StaticGenerator,
-            "StaticGenerator must be the last generator, but it isn't!")
+            "StaticGenerator must be the last generator, but it isn't!",
+        )
         self.assertIsInstance(
-            generator_classes, Sequence,
-            "_get_generator_classes() must return a Sequence to preserve order")
+            generator_classes,
+            Sequence,
+            "_get_generator_classes() must return a Sequence to preserve order",
+        )
 
-    @skipIfNoExecutable(['git', '--version'])
+    @skipIfNoExecutable(["git", "--version"])
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
         # ones and generate correct output without raising any exception
-        settings = read_settings(path=None, override={
-            'PATH': INPUT_PATH,
-            'OUTPUT_PATH': self.temp_path,
-            'CACHE_PATH': self.temp_cache,
-            'LOCALE': locale.normalize('en_US'),
-        })
+        settings = read_settings(
+            path=None,
+            override={
+                "PATH": INPUT_PATH,
+                "OUTPUT_PATH": self.temp_path,
+                "CACHE_PATH": self.temp_cache,
+                "LOCALE": locale.normalize("en_US"),
+            },
+        )
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
-        self.assertDirsEqual(
-            self.temp_path, os.path.join(OUTPUT_PATH, 'basic')
-        )
+        self.assertDirsEqual(self.temp_path, os.path.join(OUTPUT_PATH, "basic"))
         self.assertLogCountEqual(
             count=1,
             msg="Unable to find.*skipping url replacement",
-            level=logging.WARNING)
+            level=logging.WARNING,
+        )
 
-    @skipIfNoExecutable(['git', '--version'])
+    @skipIfNoExecutable(["git", "--version"])
     def test_custom_generation_works(self):
         # the same thing with a specified set of settings should work
-        settings = read_settings(path=SAMPLE_CONFIG, override={
-            'PATH': INPUT_PATH,
-            'OUTPUT_PATH': self.temp_path,
-            'CACHE_PATH': self.temp_cache,
-            'LOCALE': locale.normalize('en_US.UTF-8'),
-        })
+        settings = read_settings(
+            path=SAMPLE_CONFIG,
+            override={
+                "PATH": INPUT_PATH,
+                "OUTPUT_PATH": self.temp_path,
+                "CACHE_PATH": self.temp_cache,
+                "LOCALE": locale.normalize("en_US.UTF-8"),
+            },
+        )
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
-        self.assertDirsEqual(
-            self.temp_path, os.path.join(OUTPUT_PATH, 'custom')
-        )
+        self.assertDirsEqual(self.temp_path, os.path.join(OUTPUT_PATH, "custom"))
 
-    @skipIfNoExecutable(['git', '--version'])
-    @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
-                         locale_available('French'), 'French locale needed')
+    @skipIfNoExecutable(["git", "--version"])
+    @unittest.skipUnless(
+        locale_available("fr_FR.UTF-8") or locale_available("French"),
+        "French locale needed",
+    )
     def test_custom_locale_generation_works(self):
-        '''Test that generation with fr_FR.UTF-8 locale works'''
-        if sys.platform == 'win32':
-            our_locale = 'French'
+        """Test that generation with fr_FR.UTF-8 locale works"""
+        if sys.platform == "win32":
+            our_locale = "French"
         else:
-            our_locale = 'fr_FR.UTF-8'
+            our_locale = "fr_FR.UTF-8"
 
-        settings = read_settings(path=SAMPLE_FR_CONFIG, override={
-            'PATH': INPUT_PATH,
-            'OUTPUT_PATH': self.temp_path,
-            'CACHE_PATH': self.temp_cache,
-            'LOCALE': our_locale,
-        })
+        settings = read_settings(
+            path=SAMPLE_FR_CONFIG,
+            override={
+                "PATH": INPUT_PATH,
+                "OUTPUT_PATH": self.temp_path,
+                "CACHE_PATH": self.temp_cache,
+                "LOCALE": our_locale,
+            },
+        )
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
-        self.assertDirsEqual(
-            self.temp_path, os.path.join(OUTPUT_PATH, 'custom_locale')
-        )
+        self.assertDirsEqual(self.temp_path, os.path.join(OUTPUT_PATH, "custom_locale"))
 
     def test_theme_static_paths_copy(self):
         # the same thing with a specified set of settings should work
-        settings = read_settings(path=SAMPLE_CONFIG, override={
-            'PATH': INPUT_PATH,
-            'OUTPUT_PATH': self.temp_path,
-            'CACHE_PATH': self.temp_cache,
-            'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH, 'very'),
-                                   os.path.join(SAMPLES_PATH, 'kinda'),
-                                   os.path.join(SAMPLES_PATH,
-                                                'theme_standard')]
-        })
+        settings = read_settings(
+            path=SAMPLE_CONFIG,
+            override={
+                "PATH": INPUT_PATH,
+                "OUTPUT_PATH": self.temp_path,
+                "CACHE_PATH": self.temp_cache,
+                "THEME_STATIC_PATHS": [
+                    os.path.join(SAMPLES_PATH, "very"),
+                    os.path.join(SAMPLES_PATH, "kinda"),
+                    os.path.join(SAMPLES_PATH, "theme_standard"),
+                ],
+            },
+        )
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
-        theme_output = os.path.join(self.temp_path, 'theme')
-        extra_path = os.path.join(theme_output, 'exciting', 'new', 'files')
+        theme_output = os.path.join(self.temp_path, "theme")
+        extra_path = os.path.join(theme_output, "exciting", "new", "files")
 
-        for file in ['a_stylesheet', 'a_template']:
+        for file in ["a_stylesheet", "a_template"]:
             self.assertTrue(os.path.exists(os.path.join(theme_output, file)))
 
-        for file in ['wow!', 'boom!', 'bap!', 'zap!']:
+        for file in ["wow!", "boom!", "bap!", "zap!"]:
             self.assertTrue(os.path.exists(os.path.join(extra_path, file)))
 
     def test_theme_static_paths_copy_single_file(self):
         # the same thing with a specified set of settings should work
-        settings = read_settings(path=SAMPLE_CONFIG, override={
-            'PATH': INPUT_PATH,
-            'OUTPUT_PATH': self.temp_path,
-            'CACHE_PATH': self.temp_cache,
-            'THEME_STATIC_PATHS': [os.path.join(SAMPLES_PATH,
-                                                'theme_standard')]
-        })
+        settings = read_settings(
+            path=SAMPLE_CONFIG,
+            override={
+                "PATH": INPUT_PATH,
+                "OUTPUT_PATH": self.temp_path,
+                "CACHE_PATH": self.temp_cache,
+                "THEME_STATIC_PATHS": [os.path.join(SAMPLES_PATH, "theme_standard")],
+            },
+        )
 
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
-        theme_output = os.path.join(self.temp_path, 'theme')
+        theme_output = os.path.join(self.temp_path, "theme")
 
-        for file in ['a_stylesheet', 'a_template']:
+        for file in ["a_stylesheet", "a_template"]:
             self.assertTrue(os.path.exists(os.path.join(theme_output, file)))
 
     def test_write_only_selected(self):
         """Test that only the selected files are written"""
-        settings = read_settings(path=None, override={
-            'PATH': INPUT_PATH,
-            'OUTPUT_PATH': self.temp_path,
-            'CACHE_PATH': self.temp_cache,
-            'WRITE_SELECTED': [
-                os.path.join(self.temp_path, 'oh-yeah.html'),
-                os.path.join(self.temp_path, 'categories.html'),
-            ],
-            'LOCALE': locale.normalize('en_US'),
-        })
+        settings = read_settings(
+            path=None,
+            override={
+                "PATH": INPUT_PATH,
+                "OUTPUT_PATH": self.temp_path,
+                "CACHE_PATH": self.temp_cache,
+                "WRITE_SELECTED": [
+                    os.path.join(self.temp_path, "oh-yeah.html"),
+                    os.path.join(self.temp_path, "categories.html"),
+                ],
+                "LOCALE": locale.normalize("en_US"),
+            },
+        )
         pelican = Pelican(settings=settings)
         logger = logging.getLogger()
         orig_level = logger.getEffectiveLevel()
         logger.setLevel(logging.INFO)
         mute(True)(pelican.run)()
         logger.setLevel(orig_level)
-        self.assertLogCountEqual(
-            count=2,
-            msg="Writing .*",
-            level=logging.INFO)
+        self.assertLogCountEqual(count=2, msg="Writing .*", level=logging.INFO)
 
     def test_cyclic_intersite_links_no_warnings(self):
-        settings = read_settings(path=None, override={
-            'PATH': os.path.join(CURRENT_DIR, 'cyclic_intersite_links'),
-            'OUTPUT_PATH': self.temp_path,
-            'CACHE_PATH': self.temp_cache,
-        })
+        settings = read_settings(
+            path=None,
+            override={
+                "PATH": os.path.join(CURRENT_DIR, "cyclic_intersite_links"),
+                "OUTPUT_PATH": self.temp_path,
+                "CACHE_PATH": self.temp_cache,
+            },
+        )
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
         # There are four different intersite links:
@@ -230,41 +249,48 @@ class TestPelican(LoggedTestCase):
         self.assertLogCountEqual(
             count=1,
             msg="Unable to find '.*\\.rst', skipping url replacement.",
-            level=logging.WARNING)
+            level=logging.WARNING,
+        )
 
     def test_md_extensions_deprecation(self):
         """Test that a warning is issued if MD_EXTENSIONS is used"""
-        settings = read_settings(path=None, override={
-            'PATH': INPUT_PATH,
-            'OUTPUT_PATH': self.temp_path,
-            'CACHE_PATH': self.temp_cache,
-            'MD_EXTENSIONS': {},
-        })
+        settings = read_settings(
+            path=None,
+            override={
+                "PATH": INPUT_PATH,
+                "OUTPUT_PATH": self.temp_path,
+                "CACHE_PATH": self.temp_cache,
+                "MD_EXTENSIONS": {},
+            },
+        )
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
         self.assertLogCountEqual(
             count=1,
             msg="MD_EXTENSIONS is deprecated use MARKDOWN instead.",
-            level=logging.WARNING)
+            level=logging.WARNING,
+        )
 
     def test_parse_errors(self):
         # Verify that just an error is printed and the application doesn't
         # abort, exit or something.
-        settings = read_settings(path=None, override={
-            'PATH': os.path.abspath(os.path.join(CURRENT_DIR, 'parse_error')),
-            'OUTPUT_PATH': self.temp_path,
-            'CACHE_PATH': self.temp_cache,
-        })
+        settings = read_settings(
+            path=None,
+            override={
+                "PATH": os.path.abspath(os.path.join(CURRENT_DIR, "parse_error")),
+                "OUTPUT_PATH": self.temp_path,
+                "CACHE_PATH": self.temp_cache,
+            },
+        )
         pelican = Pelican(settings=settings)
         mute(True)(pelican.run)()
         self.assertLogCountEqual(
-            count=1,
-            msg="Could not process .*parse_error.rst",
-            level=logging.ERROR)
+            count=1, msg="Could not process .*parse_error.rst", level=logging.ERROR
+        )
 
     def test_module_load(self):
         """Test loading via python -m pelican --help displays the help"""
-        output = subprocess.check_output([
-            sys.executable, '-m', 'pelican', '--help'
-        ]).decode('ascii', 'replace')
-        assert 'usage:' in output
+        output = subprocess.check_output(
+            [sys.executable, "-m", "pelican", "--help"]
+        ).decode("ascii", "replace")
+        assert "usage:" in output
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
index 348c3e94..4f02022c 100644
--- a/pelican/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -2,27 +2,26 @@ import os
 from contextlib import contextmanager
 
 import pelican.tests.dummy_plugins.normal_plugin.normal_plugin as normal_plugin
-from pelican.plugins._utils import (get_namespace_plugins, get_plugin_name,
-                                    load_plugins)
+from pelican.plugins._utils import get_namespace_plugins, get_plugin_name, load_plugins
 from pelican.tests.support import unittest
 
 
 @contextmanager
 def tmp_namespace_path(path):
-    '''Context manager for temporarily appending namespace plugin packages
+    """Context manager for temporarily appending namespace plugin packages
 
     path: path containing the `pelican` folder
 
     This modifies the `pelican.__path__` and lets the `pelican.plugins`
     namespace package resolve it from that.
-    '''
+    """
     # This avoids calls to internal `pelican.plugins.__path__._recalculate()`
     # as it should not be necessary
     import pelican
 
     old_path = pelican.__path__[:]
     try:
-        pelican.__path__.append(os.path.join(path, 'pelican'))
+        pelican.__path__.append(os.path.join(path, "pelican"))
         yield
     finally:
         pelican.__path__ = old_path
@@ -30,38 +29,38 @@ def tmp_namespace_path(path):
 
 class PluginTest(unittest.TestCase):
     _PLUGIN_FOLDER = os.path.join(
-        os.path.abspath(os.path.dirname(__file__)),
-        'dummy_plugins')
-    _NS_PLUGIN_FOLDER = os.path.join(_PLUGIN_FOLDER, 'namespace_plugin')
-    _NORMAL_PLUGIN_FOLDER = os.path.join(_PLUGIN_FOLDER, 'normal_plugin')
+        os.path.abspath(os.path.dirname(__file__)), "dummy_plugins"
+    )
+    _NS_PLUGIN_FOLDER = os.path.join(_PLUGIN_FOLDER, "namespace_plugin")
+    _NORMAL_PLUGIN_FOLDER = os.path.join(_PLUGIN_FOLDER, "normal_plugin")
 
     def test_namespace_path_modification(self):
         import pelican
         import pelican.plugins
+
         old_path = pelican.__path__[:]
 
         # not existing path
-        path = os.path.join(self._PLUGIN_FOLDER, 'foo')
+        path = os.path.join(self._PLUGIN_FOLDER, "foo")
         with tmp_namespace_path(path):
-            self.assertIn(
-                os.path.join(path, 'pelican'),
-                pelican.__path__)
+            self.assertIn(os.path.join(path, "pelican"), pelican.__path__)
             # foo/pelican does not exist, so it won't propagate
             self.assertNotIn(
-                os.path.join(path, 'pelican', 'plugins'),
-                pelican.plugins.__path__)
+                os.path.join(path, "pelican", "plugins"), pelican.plugins.__path__
+            )
         # verify that we restored path back
         self.assertEqual(pelican.__path__, old_path)
 
         # existing path
         with tmp_namespace_path(self._NS_PLUGIN_FOLDER):
             self.assertIn(
-                os.path.join(self._NS_PLUGIN_FOLDER, 'pelican'),
-                pelican.__path__)
+                os.path.join(self._NS_PLUGIN_FOLDER, "pelican"), pelican.__path__
+            )
             # /namespace_plugin/pelican exists, so it should be in
             self.assertIn(
-                os.path.join(self._NS_PLUGIN_FOLDER, 'pelican', 'plugins'),
-                pelican.plugins.__path__)
+                os.path.join(self._NS_PLUGIN_FOLDER, "pelican", "plugins"),
+                pelican.plugins.__path__,
+            )
         self.assertEqual(pelican.__path__, old_path)
 
     def test_get_namespace_plugins(self):
@@ -71,11 +70,11 @@ class PluginTest(unittest.TestCase):
         # with plugin
         with tmp_namespace_path(self._NS_PLUGIN_FOLDER):
             ns_plugins = get_namespace_plugins()
-            self.assertEqual(len(ns_plugins), len(existing_ns_plugins)+1)
-            self.assertIn('pelican.plugins.ns_plugin', ns_plugins)
+            self.assertEqual(len(ns_plugins), len(existing_ns_plugins) + 1)
+            self.assertIn("pelican.plugins.ns_plugin", ns_plugins)
             self.assertEqual(
-                ns_plugins['pelican.plugins.ns_plugin'].NAME,
-                'namespace plugin')
+                ns_plugins["pelican.plugins.ns_plugin"].NAME, "namespace plugin"
+            )
 
         # should be back to existing namespace plugins outside `with`
         ns_plugins = get_namespace_plugins()
@@ -91,15 +90,14 @@ class PluginTest(unittest.TestCase):
         with tmp_namespace_path(self._NS_PLUGIN_FOLDER):
             # with no `PLUGINS` setting, load namespace plugins
             plugins = load_plugins({})
-            self.assertEqual(len(plugins), len(existing_ns_plugins)+1, plugins)
+            self.assertEqual(len(plugins), len(existing_ns_plugins) + 1, plugins)
             self.assertEqual(
-                {'pelican.plugins.ns_plugin'} | get_plugin_names(existing_ns_plugins),
-                get_plugin_names(plugins))
+                {"pelican.plugins.ns_plugin"} | get_plugin_names(existing_ns_plugins),
+                get_plugin_names(plugins),
+            )
 
             # disable namespace plugins with `PLUGINS = []`
-            SETTINGS = {
-                'PLUGINS': []
-            }
+            SETTINGS = {"PLUGINS": []}
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 0, plugins)
 
@@ -107,34 +105,35 @@ class PluginTest(unittest.TestCase):
 
             # normal plugin
             SETTINGS = {
-                'PLUGINS': ['normal_plugin'],
-                'PLUGIN_PATHS': [self._NORMAL_PLUGIN_FOLDER]
+                "PLUGINS": ["normal_plugin"],
+                "PLUGIN_PATHS": [self._NORMAL_PLUGIN_FOLDER],
             }
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 1, plugins)
-            self.assertEqual(
-                {'normal_plugin'},
-                get_plugin_names(plugins))
+            self.assertEqual({"normal_plugin"}, get_plugin_names(plugins))
 
             # normal submodule/subpackage plugins
             SETTINGS = {
-                'PLUGINS': [
-                    'normal_submodule_plugin.subplugin',
-                    'normal_submodule_plugin.subpackage.subpackage',
+                "PLUGINS": [
+                    "normal_submodule_plugin.subplugin",
+                    "normal_submodule_plugin.subpackage.subpackage",
                 ],
-                'PLUGIN_PATHS': [self._NORMAL_PLUGIN_FOLDER]
+                "PLUGIN_PATHS": [self._NORMAL_PLUGIN_FOLDER],
             }
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 2, plugins)
             self.assertEqual(
-                {'normal_submodule_plugin.subplugin',
-                 'normal_submodule_plugin.subpackage.subpackage'},
-                get_plugin_names(plugins))
+                {
+                    "normal_submodule_plugin.subplugin",
+                    "normal_submodule_plugin.subpackage.subpackage",
+                },
+                get_plugin_names(plugins),
+            )
 
             # ensure normal plugins are loaded only once
             SETTINGS = {
-                'PLUGINS': ['normal_plugin'],
-                'PLUGIN_PATHS': [self._NORMAL_PLUGIN_FOLDER],
+                "PLUGINS": ["normal_plugin"],
+                "PLUGIN_PATHS": [self._NORMAL_PLUGIN_FOLDER],
             }
             plugins = load_plugins(SETTINGS)
             for plugin in load_plugins(SETTINGS):
@@ -143,40 +142,33 @@ class PluginTest(unittest.TestCase):
                 self.assertIn(plugin, plugins)
 
             # namespace plugin short
-            SETTINGS = {
-                'PLUGINS': ['ns_plugin']
-            }
+            SETTINGS = {"PLUGINS": ["ns_plugin"]}
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 1, plugins)
-            self.assertEqual(
-                {'pelican.plugins.ns_plugin'},
-                get_plugin_names(plugins))
+            self.assertEqual({"pelican.plugins.ns_plugin"}, get_plugin_names(plugins))
 
             # namespace plugin long
-            SETTINGS = {
-                'PLUGINS': ['pelican.plugins.ns_plugin']
-            }
+            SETTINGS = {"PLUGINS": ["pelican.plugins.ns_plugin"]}
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 1, plugins)
-            self.assertEqual(
-                {'pelican.plugins.ns_plugin'},
-                get_plugin_names(plugins))
+            self.assertEqual({"pelican.plugins.ns_plugin"}, get_plugin_names(plugins))
 
             # normal and namespace plugin
             SETTINGS = {
-                'PLUGINS': ['normal_plugin', 'ns_plugin'],
-                'PLUGIN_PATHS': [self._NORMAL_PLUGIN_FOLDER]
+                "PLUGINS": ["normal_plugin", "ns_plugin"],
+                "PLUGIN_PATHS": [self._NORMAL_PLUGIN_FOLDER],
             }
             plugins = load_plugins(SETTINGS)
             self.assertEqual(len(plugins), 2, plugins)
             self.assertEqual(
-                {'normal_plugin', 'pelican.plugins.ns_plugin'},
-                get_plugin_names(plugins))
+                {"normal_plugin", "pelican.plugins.ns_plugin"},
+                get_plugin_names(plugins),
+            )
 
     def test_get_plugin_name(self):
         self.assertEqual(
             get_plugin_name(normal_plugin),
-            'pelican.tests.dummy_plugins.normal_plugin.normal_plugin',
+            "pelican.tests.dummy_plugins.normal_plugin.normal_plugin",
         )
 
         class NoopPlugin:
@@ -185,7 +177,9 @@ class PluginTest(unittest.TestCase):
 
         self.assertEqual(
             get_plugin_name(NoopPlugin),
-            'PluginTest.test_get_plugin_name.<locals>.NoopPlugin')
+            "PluginTest.test_get_plugin_name.<locals>.NoopPlugin",
+        )
         self.assertEqual(
             get_plugin_name(NoopPlugin()),
-            'PluginTest.test_get_plugin_name.<locals>.NoopPlugin')
+            "PluginTest.test_get_plugin_name.<locals>.NoopPlugin",
+        )
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 753a353d..cf0f39f1 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -7,7 +7,7 @@ from pelican.utils import SafeDatetime
 
 
 CUR_DIR = os.path.dirname(__file__)
-CONTENT_PATH = os.path.join(CUR_DIR, 'content')
+CONTENT_PATH = os.path.join(CUR_DIR, "content")
 
 
 def _path(*args):
@@ -15,7 +15,6 @@ def _path(*args):
 
 
 class ReaderTest(unittest.TestCase):
-
     def read_file(self, path, **kwargs):
         # Isolate from future API changes to readers.read_file
 
@@ -29,26 +28,24 @@ class ReaderTest(unittest.TestCase):
                 self.assertEqual(
                     value,
                     real_value,
-                    'Expected %s to have value %s, but was %s' %
-                    (key, value, real_value))
+                    "Expected %s to have value %s, but was %s"
+                    % (key, value, real_value),
+                )
             else:
                 self.fail(
-                    'Expected %s to have value %s, but was not in Dict' %
-                    (key, value))
+                    "Expected %s to have value %s, but was not in Dict" % (key, value)
+                )
 
 
 class TestAssertDictHasSubset(ReaderTest):
     def setUp(self):
-        self.dictionary = {
-            'key-a': 'val-a',
-            'key-b': 'val-b'
-        }
+        self.dictionary = {"key-a": "val-a", "key-b": "val-b"}
 
     def tearDown(self):
         self.dictionary = None
 
     def test_subset(self):
-        self.assertDictHasSubset(self.dictionary, {'key-a': 'val-a'})
+        self.assertDictHasSubset(self.dictionary, {"key-a": "val-a"})
 
     def test_equal(self):
         self.assertDictHasSubset(self.dictionary, self.dictionary)
@@ -56,269 +53,260 @@ class TestAssertDictHasSubset(ReaderTest):
     def test_fail_not_set(self):
         self.assertRaisesRegex(
             AssertionError,
-            r'Expected.*key-c.*to have value.*val-c.*but was not in Dict',
+            r"Expected.*key-c.*to have value.*val-c.*but was not in Dict",
             self.assertDictHasSubset,
             self.dictionary,
-            {'key-c': 'val-c'})
+            {"key-c": "val-c"},
+        )
 
     def test_fail_wrong_val(self):
         self.assertRaisesRegex(
             AssertionError,
-            r'Expected .*key-a.* to have value .*val-b.* but was .*val-a.*',
+            r"Expected .*key-a.* to have value .*val-b.* but was .*val-a.*",
             self.assertDictHasSubset,
             self.dictionary,
-            {'key-a': 'val-b'})
+            {"key-a": "val-b"},
+        )
 
 
 class DefaultReaderTest(ReaderTest):
-
     def test_readfile_unknown_extension(self):
         with self.assertRaises(TypeError):
-            self.read_file(path='article_with_metadata.unknownextension')
+            self.read_file(path="article_with_metadata.unknownextension")
 
     def test_readfile_path_metadata_implicit_dates(self):
-        test_file = 'article_with_metadata_implicit_dates.html'
-        page = self.read_file(path=test_file, DEFAULT_DATE='fs')
+        test_file = "article_with_metadata_implicit_dates.html"
+        page = self.read_file(path=test_file, DEFAULT_DATE="fs")
         expected = {
-            'date': SafeDatetime.fromtimestamp(
-                os.stat(_path(test_file)).st_mtime),
-            'modified': SafeDatetime.fromtimestamp(
-                os.stat(_path(test_file)).st_mtime)
+            "date": SafeDatetime.fromtimestamp(os.stat(_path(test_file)).st_mtime),
+            "modified": SafeDatetime.fromtimestamp(os.stat(_path(test_file)).st_mtime),
         }
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_readfile_path_metadata_explicit_dates(self):
-        test_file = 'article_with_metadata_explicit_dates.html'
-        page = self.read_file(path=test_file, DEFAULT_DATE='fs')
+        test_file = "article_with_metadata_explicit_dates.html"
+        page = self.read_file(path=test_file, DEFAULT_DATE="fs")
         expected = {
-            'date': SafeDatetime(2010, 12, 2, 10, 14),
-            'modified': SafeDatetime(2010, 12, 31, 23, 59)
+            "date": SafeDatetime(2010, 12, 2, 10, 14),
+            "modified": SafeDatetime(2010, 12, 31, 23, 59),
         }
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_readfile_path_metadata_implicit_date_explicit_modified(self):
-        test_file = 'article_with_metadata_implicit_date_explicit_modified.html'
-        page = self.read_file(path=test_file, DEFAULT_DATE='fs')
+        test_file = "article_with_metadata_implicit_date_explicit_modified.html"
+        page = self.read_file(path=test_file, DEFAULT_DATE="fs")
         expected = {
-            'date': SafeDatetime.fromtimestamp(
-                os.stat(_path(test_file)).st_mtime),
-            'modified': SafeDatetime(2010, 12, 2, 10, 14),
+            "date": SafeDatetime.fromtimestamp(os.stat(_path(test_file)).st_mtime),
+            "modified": SafeDatetime(2010, 12, 2, 10, 14),
         }
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_readfile_path_metadata_explicit_date_implicit_modified(self):
-        test_file = 'article_with_metadata_explicit_date_implicit_modified.html'
-        page = self.read_file(path=test_file, DEFAULT_DATE='fs')
+        test_file = "article_with_metadata_explicit_date_implicit_modified.html"
+        page = self.read_file(path=test_file, DEFAULT_DATE="fs")
         expected = {
-            'date': SafeDatetime(2010, 12, 2, 10, 14),
-            'modified': SafeDatetime.fromtimestamp(
-                os.stat(_path(test_file)).st_mtime)
+            "date": SafeDatetime(2010, 12, 2, 10, 14),
+            "modified": SafeDatetime.fromtimestamp(os.stat(_path(test_file)).st_mtime),
         }
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_find_empty_alt(self):
-        with patch('pelican.readers.logger') as log_mock:
-            content = ['<img alt="" src="test-image.png" width="300px" />',
-                       '<img src="test-image.png"  width="300px" alt="" />']
+        with patch("pelican.readers.logger") as log_mock:
+            content = [
+                '<img alt="" src="test-image.png" width="300px" />',
+                '<img src="test-image.png"  width="300px" alt="" />',
+            ]
 
             for tag in content:
-                readers.find_empty_alt(tag, '/test/path')
+                readers.find_empty_alt(tag, "/test/path")
                 log_mock.warning.assert_called_with(
-                    'Empty alt attribute for image %s in %s',
-                    'test-image.png',
-                    '/test/path',
-                    extra={'limit_msg':
-                           'Other images have empty alt attributes'}
+                    "Empty alt attribute for image %s in %s",
+                    "test-image.png",
+                    "/test/path",
+                    extra={"limit_msg": "Other images have empty alt attributes"},
                 )
 
 
 class RstReaderTest(ReaderTest):
-
     def test_article_with_metadata(self):
-        page = self.read_file(path='article_with_metadata.rst')
+        page = self.read_file(path="article_with_metadata.rst")
         expected = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
-            'title': 'This is a super article !',
-            'summary': '<p class="first last">Multi-line metadata should be'
-                       ' supported\nas well as <strong>inline'
-                       ' markup</strong> and stuff to &quot;typogrify'
-                       '&quot;...</p>\n',
-            'date': SafeDatetime(2010, 12, 2, 10, 14),
-            'modified': SafeDatetime(2010, 12, 2, 10, 20),
-            'tags': ['foo', 'bar', 'foobar'],
-            'custom_field': 'http://notmyidea.org',
+            "category": "yeah",
+            "author": "Alexis Métaireau",
+            "title": "This is a super article !",
+            "summary": '<p class="first last">Multi-line metadata should be'
+            " supported\nas well as <strong>inline"
+            " markup</strong> and stuff to &quot;typogrify"
+            "&quot;...</p>\n",
+            "date": SafeDatetime(2010, 12, 2, 10, 14),
+            "modified": SafeDatetime(2010, 12, 2, 10, 20),
+            "tags": ["foo", "bar", "foobar"],
+            "custom_field": "http://notmyidea.org",
         }
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_capitalized_metadata(self):
-        page = self.read_file(path='article_with_capitalized_metadata.rst')
+        page = self.read_file(path="article_with_capitalized_metadata.rst")
         expected = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
-            'title': 'This is a super article !',
-            'summary': '<p class="first last">Multi-line metadata should be'
-                       ' supported\nas well as <strong>inline'
-                       ' markup</strong> and stuff to &quot;typogrify'
-                       '&quot;...</p>\n',
-            'date': SafeDatetime(2010, 12, 2, 10, 14),
-            'modified': SafeDatetime(2010, 12, 2, 10, 20),
-            'tags': ['foo', 'bar', 'foobar'],
-            'custom_field': 'http://notmyidea.org',
+            "category": "yeah",
+            "author": "Alexis Métaireau",
+            "title": "This is a super article !",
+            "summary": '<p class="first last">Multi-line metadata should be'
+            " supported\nas well as <strong>inline"
+            " markup</strong> and stuff to &quot;typogrify"
+            "&quot;...</p>\n",
+            "date": SafeDatetime(2010, 12, 2, 10, 14),
+            "modified": SafeDatetime(2010, 12, 2, 10, 20),
+            "tags": ["foo", "bar", "foobar"],
+            "custom_field": "http://notmyidea.org",
         }
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_filename_metadata(self):
         page = self.read_file(
-            path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
-            FILENAME_METADATA=None)
+            path="2012-11-29_rst_w_filename_meta#foo-bar.rst", FILENAME_METADATA=None
+        )
         expected = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
-            'title': 'Rst with filename metadata',
-            'reader': 'rst',
+            "category": "yeah",
+            "author": "Alexis Métaireau",
+            "title": "Rst with filename metadata",
+            "reader": "rst",
         }
         self.assertDictHasSubset(page.metadata, expected)
 
         page = self.read_file(
-            path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
-            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2}).*')
+            path="2012-11-29_rst_w_filename_meta#foo-bar.rst",
+            FILENAME_METADATA=r"(?P<date>\d{4}-\d{2}-\d{2}).*",
+        )
         expected = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
-            'title': 'Rst with filename metadata',
-            'date': SafeDatetime(2012, 11, 29),
-            'reader': 'rst',
+            "category": "yeah",
+            "author": "Alexis Métaireau",
+            "title": "Rst with filename metadata",
+            "date": SafeDatetime(2012, 11, 29),
+            "reader": "rst",
         }
         self.assertDictHasSubset(page.metadata, expected)
 
         page = self.read_file(
-            path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
+            path="2012-11-29_rst_w_filename_meta#foo-bar.rst",
             FILENAME_METADATA=(
-                r'(?P<date>\d{4}-\d{2}-\d{2})'
-                r'_(?P<Slug>.*)'
-                r'#(?P<MyMeta>.*)-(?P<author>.*)'))
+                r"(?P<date>\d{4}-\d{2}-\d{2})"
+                r"_(?P<Slug>.*)"
+                r"#(?P<MyMeta>.*)-(?P<author>.*)"
+            ),
+        )
         expected = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
-            'title': 'Rst with filename metadata',
-            'date': SafeDatetime(2012, 11, 29),
-            'slug': 'rst_w_filename_meta',
-            'mymeta': 'foo',
-            'reader': 'rst',
+            "category": "yeah",
+            "author": "Alexis Métaireau",
+            "title": "Rst with filename metadata",
+            "date": SafeDatetime(2012, 11, 29),
+            "slug": "rst_w_filename_meta",
+            "mymeta": "foo",
+            "reader": "rst",
         }
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_optional_filename_metadata(self):
         page = self.read_file(
-            path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
-            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2})?')
+            path="2012-11-29_rst_w_filename_meta#foo-bar.rst",
+            FILENAME_METADATA=r"(?P<date>\d{4}-\d{2}-\d{2})?",
+        )
         expected = {
-            'date': SafeDatetime(2012, 11, 29),
-            'reader': 'rst',
+            "date": SafeDatetime(2012, 11, 29),
+            "reader": "rst",
         }
         self.assertDictHasSubset(page.metadata, expected)
 
         page = self.read_file(
-            path='article.rst',
-            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2})?')
+            path="article.rst", FILENAME_METADATA=r"(?P<date>\d{4}-\d{2}-\d{2})?"
+        )
         expected = {
-            'reader': 'rst',
+            "reader": "rst",
         }
         self.assertDictHasSubset(page.metadata, expected)
-        self.assertNotIn('date', page.metadata, 'Date should not be set.')
+        self.assertNotIn("date", page.metadata, "Date should not be set.")
 
     def test_article_metadata_key_lowercase(self):
         # Keys of metadata should be lowercase.
         reader = readers.RstReader(settings=get_settings())
-        content, metadata = reader.read(
-            _path('article_with_uppercase_metadata.rst'))
+        content, metadata = reader.read(_path("article_with_uppercase_metadata.rst"))
 
-        self.assertIn('category', metadata, 'Key should be lowercase.')
-        self.assertEqual('Yeah', metadata.get('category'),
-                         'Value keeps case.')
+        self.assertIn("category", metadata, "Key should be lowercase.")
+        self.assertEqual("Yeah", metadata.get("category"), "Value keeps case.")
 
     def test_article_extra_path_metadata(self):
-        input_with_metadata = '2012-11-29_rst_w_filename_meta#foo-bar.rst'
+        input_with_metadata = "2012-11-29_rst_w_filename_meta#foo-bar.rst"
         page_metadata = self.read_file(
             path=input_with_metadata,
             FILENAME_METADATA=(
-                r'(?P<date>\d{4}-\d{2}-\d{2})'
-                r'_(?P<Slug>.*)'
-                r'#(?P<MyMeta>.*)-(?P<author>.*)'
+                r"(?P<date>\d{4}-\d{2}-\d{2})"
+                r"_(?P<Slug>.*)"
+                r"#(?P<MyMeta>.*)-(?P<author>.*)"
             ),
             EXTRA_PATH_METADATA={
-                input_with_metadata: {
-                    'key-1a': 'value-1a',
-                    'key-1b': 'value-1b'
-                }
-            }
+                input_with_metadata: {"key-1a": "value-1a", "key-1b": "value-1b"}
+            },
         )
         expected_metadata = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
-            'title': 'Rst with filename metadata',
-            'date': SafeDatetime(2012, 11, 29),
-            'slug': 'rst_w_filename_meta',
-            'mymeta': 'foo',
-            'reader': 'rst',
-            'key-1a': 'value-1a',
-            'key-1b': 'value-1b'
+            "category": "yeah",
+            "author": "Alexis Métaireau",
+            "title": "Rst with filename metadata",
+            "date": SafeDatetime(2012, 11, 29),
+            "slug": "rst_w_filename_meta",
+            "mymeta": "foo",
+            "reader": "rst",
+            "key-1a": "value-1a",
+            "key-1b": "value-1b",
         }
         self.assertDictHasSubset(page_metadata.metadata, expected_metadata)
 
-        input_file_path_without_metadata = 'article.rst'
+        input_file_path_without_metadata = "article.rst"
         page_without_metadata = self.read_file(
             path=input_file_path_without_metadata,
             EXTRA_PATH_METADATA={
-                input_file_path_without_metadata: {
-                    'author': 'Charlès Overwrite'
-                }
-            }
+                input_file_path_without_metadata: {"author": "Charlès Overwrite"}
+            },
         )
         expected_without_metadata = {
-            'category': 'misc',
-            'author': 'Charlès Overwrite',
-            'title': 'Article title',
-            'reader': 'rst',
+            "category": "misc",
+            "author": "Charlès Overwrite",
+            "title": "Article title",
+            "reader": "rst",
         }
         self.assertDictHasSubset(
-            page_without_metadata.metadata,
-            expected_without_metadata)
+            page_without_metadata.metadata, expected_without_metadata
+        )
 
     def test_article_extra_path_metadata_dont_overwrite(self):
         # EXTRA_PATH_METADATA['author'] should get ignored
         # since we don't overwrite already set values
-        input_file_path = '2012-11-29_rst_w_filename_meta#foo-bar.rst'
+        input_file_path = "2012-11-29_rst_w_filename_meta#foo-bar.rst"
         page = self.read_file(
             path=input_file_path,
             FILENAME_METADATA=(
-                r'(?P<date>\d{4}-\d{2}-\d{2})'
-                r'_(?P<Slug>.*)'
-                r'#(?P<MyMeta>.*)-(?P<orginalauthor>.*)'
+                r"(?P<date>\d{4}-\d{2}-\d{2})"
+                r"_(?P<Slug>.*)"
+                r"#(?P<MyMeta>.*)-(?P<orginalauthor>.*)"
             ),
             EXTRA_PATH_METADATA={
-                input_file_path: {
-                    'author': 'Charlès Overwrite',
-                    'key-1b': 'value-1b'
-                }
-            }
+                input_file_path: {"author": "Charlès Overwrite", "key-1b": "value-1b"}
+            },
         )
         expected = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
-            'title': 'Rst with filename metadata',
-            'date': SafeDatetime(2012, 11, 29),
-            'slug': 'rst_w_filename_meta',
-            'mymeta': 'foo',
-            'reader': 'rst',
-            'key-1b': 'value-1b'
+            "category": "yeah",
+            "author": "Alexis Métaireau",
+            "title": "Rst with filename metadata",
+            "date": SafeDatetime(2012, 11, 29),
+            "slug": "rst_w_filename_meta",
+            "mymeta": "foo",
+            "reader": "rst",
+            "key-1b": "value-1b",
         }
         self.assertDictHasSubset(page.metadata, expected)
 
@@ -328,15 +316,19 @@ class RstReaderTest(ReaderTest):
         path = "TestCategory/article_without_category.rst"
 
         epm = {
-            parent: {'epmr_inherit': parent,
-                     'epmr_override': parent, },
-            notparent: {'epmr_bogus': notparent},
-            path:   {'epmr_override': path, },
-            }
+            parent: {
+                "epmr_inherit": parent,
+                "epmr_override": parent,
+            },
+            notparent: {"epmr_bogus": notparent},
+            path: {
+                "epmr_override": path,
+            },
+        }
         expected_metadata = {
-            'epmr_inherit': parent,
-            'epmr_override': path,
-            }
+            "epmr_inherit": parent,
+            "epmr_override": path,
+        }
 
         page = self.read_file(path=path, EXTRA_PATH_METADATA=epm)
         self.assertDictHasSubset(page.metadata, expected_metadata)
@@ -357,152 +349,157 @@ class RstReaderTest(ReaderTest):
     def test_typogrify(self):
         # if nothing is specified in the settings, the content should be
         # unmodified
-        page = self.read_file(path='article.rst')
-        expected = ('<p>THIS is some content. With some stuff to '
-                    '&quot;typogrify&quot;...</p>\n<p>Now with added '
-                    'support for <abbr title="three letter acronym">'
-                    'TLA</abbr>.</p>\n')
+        page = self.read_file(path="article.rst")
+        expected = (
+            "<p>THIS is some content. With some stuff to "
+            "&quot;typogrify&quot;...</p>\n<p>Now with added "
+            'support for <abbr title="three letter acronym">'
+            "TLA</abbr>.</p>\n"
+        )
 
         self.assertEqual(page.content, expected)
 
         try:
             # otherwise, typogrify should be applied
-            page = self.read_file(path='article.rst', TYPOGRIFY=True)
+            page = self.read_file(path="article.rst", TYPOGRIFY=True)
             expected = (
                 '<p><span class="caps">THIS</span> is some content. '
-                'With some stuff to&nbsp;&#8220;typogrify&#8221;&#8230;</p>\n'
+                "With some stuff to&nbsp;&#8220;typogrify&#8221;&#8230;</p>\n"
                 '<p>Now with added support for <abbr title="three letter '
-                'acronym"><span class="caps">TLA</span></abbr>.</p>\n')
+                'acronym"><span class="caps">TLA</span></abbr>.</p>\n'
+            )
 
             self.assertEqual(page.content, expected)
         except ImportError:
-            return unittest.skip('need the typogrify distribution')
+            return unittest.skip("need the typogrify distribution")
 
     def test_typogrify_summary(self):
         # if nothing is specified in the settings, the summary should be
         # unmodified
-        page = self.read_file(path='article_with_metadata.rst')
-        expected = ('<p class="first last">Multi-line metadata should be'
-                    ' supported\nas well as <strong>inline'
-                    ' markup</strong> and stuff to &quot;typogrify'
-                    '&quot;...</p>\n')
+        page = self.read_file(path="article_with_metadata.rst")
+        expected = (
+            '<p class="first last">Multi-line metadata should be'
+            " supported\nas well as <strong>inline"
+            " markup</strong> and stuff to &quot;typogrify"
+            "&quot;...</p>\n"
+        )
 
-        self.assertEqual(page.metadata['summary'], expected)
+        self.assertEqual(page.metadata["summary"], expected)
 
         try:
             # otherwise, typogrify should be applied
-            page = self.read_file(path='article_with_metadata.rst',
-                                  TYPOGRIFY=True)
-            expected = ('<p class="first last">Multi-line metadata should be'
-                        ' supported\nas well as <strong>inline'
-                        ' markup</strong> and stuff to&nbsp;&#8220;typogrify'
-                        '&#8221;&#8230;</p>\n')
+            page = self.read_file(path="article_with_metadata.rst", TYPOGRIFY=True)
+            expected = (
+                '<p class="first last">Multi-line metadata should be'
+                " supported\nas well as <strong>inline"
+                " markup</strong> and stuff to&nbsp;&#8220;typogrify"
+                "&#8221;&#8230;</p>\n"
+            )
 
-            self.assertEqual(page.metadata['summary'], expected)
+            self.assertEqual(page.metadata["summary"], expected)
         except ImportError:
-            return unittest.skip('need the typogrify distribution')
+            return unittest.skip("need the typogrify distribution")
 
     def test_typogrify_ignore_tags(self):
         try:
             # typogrify should be able to ignore user specified tags,
             # but tries to be clever with widont extension
-            page = self.read_file(path='article.rst', TYPOGRIFY=True,
-                                  TYPOGRIFY_IGNORE_TAGS=['p'])
-            expected = ('<p>THIS is some content. With some stuff to&nbsp;'
-                        '&quot;typogrify&quot;...</p>\n<p>Now with added '
-                        'support for <abbr title="three letter acronym">'
-                        'TLA</abbr>.</p>\n')
+            page = self.read_file(
+                path="article.rst", TYPOGRIFY=True, TYPOGRIFY_IGNORE_TAGS=["p"]
+            )
+            expected = (
+                "<p>THIS is some content. With some stuff to&nbsp;"
+                "&quot;typogrify&quot;...</p>\n<p>Now with added "
+                'support for <abbr title="three letter acronym">'
+                "TLA</abbr>.</p>\n"
+            )
 
             self.assertEqual(page.content, expected)
 
             # typogrify should ignore code blocks by default because
             # code blocks are composed inside the pre tag
-            page = self.read_file(path='article_with_code_block.rst',
-                                  TYPOGRIFY=True)
+            page = self.read_file(path="article_with_code_block.rst", TYPOGRIFY=True)
 
-            expected = ('<p>An article with some&nbsp;code</p>\n'
-                        '<div class="highlight"><pre><span></span>'
-                        '<span class="n">x</span>'
-                        ' <span class="o">&amp;</span>'
-                        ' <span class="n">y</span>\n</pre></div>\n'
-                        '<p>A block&nbsp;quote:</p>\n<blockquote>\nx '
-                        '<span class="amp">&amp;</span> y</blockquote>\n'
-                        '<p>Normal:\nx'
-                        ' <span class="amp">&amp;</span>'
-                        '&nbsp;y'
-                        '</p>\n')
+            expected = (
+                "<p>An article with some&nbsp;code</p>\n"
+                '<div class="highlight"><pre><span></span>'
+                '<span class="n">x</span>'
+                ' <span class="o">&amp;</span>'
+                ' <span class="n">y</span>\n</pre></div>\n'
+                "<p>A block&nbsp;quote:</p>\n<blockquote>\nx "
+                '<span class="amp">&amp;</span> y</blockquote>\n'
+                "<p>Normal:\nx"
+                ' <span class="amp">&amp;</span>'
+                "&nbsp;y"
+                "</p>\n"
+            )
 
             self.assertEqual(page.content, expected)
 
             # instruct typogrify to also ignore blockquotes
-            page = self.read_file(path='article_with_code_block.rst',
-                                  TYPOGRIFY=True,
-                                  TYPOGRIFY_IGNORE_TAGS=['blockquote'])
+            page = self.read_file(
+                path="article_with_code_block.rst",
+                TYPOGRIFY=True,
+                TYPOGRIFY_IGNORE_TAGS=["blockquote"],
+            )
 
-            expected = ('<p>An article with some&nbsp;code</p>\n'
-                        '<div class="highlight"><pre><span>'
-                        '</span><span class="n">x</span>'
-                        ' <span class="o">&amp;</span>'
-                        ' <span class="n">y</span>\n</pre></div>\n'
-                        '<p>A block&nbsp;quote:</p>\n<blockquote>\nx '
-                        '&amp; y</blockquote>\n'
-                        '<p>Normal:\nx'
-                        ' <span class="amp">&amp;</span>'
-                        '&nbsp;y'
-                        '</p>\n')
+            expected = (
+                "<p>An article with some&nbsp;code</p>\n"
+                '<div class="highlight"><pre><span>'
+                '</span><span class="n">x</span>'
+                ' <span class="o">&amp;</span>'
+                ' <span class="n">y</span>\n</pre></div>\n'
+                "<p>A block&nbsp;quote:</p>\n<blockquote>\nx "
+                "&amp; y</blockquote>\n"
+                "<p>Normal:\nx"
+                ' <span class="amp">&amp;</span>'
+                "&nbsp;y"
+                "</p>\n"
+            )
 
             self.assertEqual(page.content, expected)
         except ImportError:
-            return unittest.skip('need the typogrify distribution')
+            return unittest.skip("need the typogrify distribution")
         except TypeError:
-            return unittest.skip('need typogrify version 2.0.4 or later')
+            return unittest.skip("need typogrify version 2.0.4 or later")
 
     def test_article_with_multiple_authors(self):
-        page = self.read_file(path='article_with_multiple_authors.rst')
-        expected = {
-            'authors': ['First Author', 'Second Author']
-        }
+        page = self.read_file(path="article_with_multiple_authors.rst")
+        expected = {"authors": ["First Author", "Second Author"]}
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_multiple_authors_semicolon(self):
-        page = self.read_file(
-            path='article_with_multiple_authors_semicolon.rst')
-        expected = {
-            'authors': ['Author, First', 'Author, Second']
-        }
+        page = self.read_file(path="article_with_multiple_authors_semicolon.rst")
+        expected = {"authors": ["Author, First", "Author, Second"]}
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_multiple_authors_list(self):
-        page = self.read_file(path='article_with_multiple_authors_list.rst')
-        expected = {
-            'authors': ['Author, First', 'Author, Second']
-        }
+        page = self.read_file(path="article_with_multiple_authors_list.rst")
+        expected = {"authors": ["Author, First", "Author, Second"]}
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_default_date_formats(self):
-        tuple_date = self.read_file(path='article.rst',
-                                    DEFAULT_DATE=(2012, 5, 1))
-        string_date = self.read_file(path='article.rst',
-                                     DEFAULT_DATE='2012-05-01')
+        tuple_date = self.read_file(path="article.rst", DEFAULT_DATE=(2012, 5, 1))
+        string_date = self.read_file(path="article.rst", DEFAULT_DATE="2012-05-01")
 
-        self.assertEqual(tuple_date.metadata['date'],
-                         string_date.metadata['date'])
+        self.assertEqual(tuple_date.metadata["date"], string_date.metadata["date"])
 
     def test_parse_error(self):
         # Verify that it raises an Exception, not nothing and not SystemExit or
         # some such
         with self.assertRaisesRegex(Exception, "underline too short"):
-            self.read_file(path='../parse_error/parse_error.rst')
+            self.read_file(path="../parse_error/parse_error.rst")
 
     def test_typogrify_dashes_config(self):
         # Test default config
         page = self.read_file(
-            path='article_with_typogrify_dashes.rst',
+            path="article_with_typogrify_dashes.rst",
             TYPOGRIFY=True,
-            TYPOGRIFY_DASHES='default')
+            TYPOGRIFY_DASHES="default",
+        )
         expected = "<p>One: -; Two: &#8212;; Three:&nbsp;&#8212;-</p>\n"
         expected_title = "One -, two &#8212;, three &#8212;-&nbsp;dashes!"
 
@@ -511,9 +508,10 @@ class RstReaderTest(ReaderTest):
 
         # Test 'oldschool' variant
         page = self.read_file(
-            path='article_with_typogrify_dashes.rst',
+            path="article_with_typogrify_dashes.rst",
             TYPOGRIFY=True,
-            TYPOGRIFY_DASHES='oldschool')
+            TYPOGRIFY_DASHES="oldschool",
+        )
         expected = "<p>One: -; Two: &#8211;; Three:&nbsp;&#8212;</p>\n"
         expected_title = "One -, two &#8211;, three &#8212;&nbsp;dashes!"
 
@@ -522,9 +520,10 @@ class RstReaderTest(ReaderTest):
 
         # Test 'oldschool_inverted' variant
         page = self.read_file(
-            path='article_with_typogrify_dashes.rst',
+            path="article_with_typogrify_dashes.rst",
             TYPOGRIFY=True,
-            TYPOGRIFY_DASHES='oldschool_inverted')
+            TYPOGRIFY_DASHES="oldschool_inverted",
+        )
         expected = "<p>One: -; Two: &#8212;; Three:&nbsp;&#8211;</p>\n"
         expected_title = "One -, two &#8212;, three &#8211;&nbsp;dashes!"
 
@@ -534,75 +533,73 @@ class RstReaderTest(ReaderTest):
 
 @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
 class MdReaderTest(ReaderTest):
-
     def test_article_with_metadata(self):
         reader = readers.MarkdownReader(settings=get_settings())
-        content, metadata = reader.read(
-            _path('article_with_md_extension.md'))
+        content, metadata = reader.read(_path("article_with_md_extension.md"))
         expected = {
-            'category': 'test',
-            'title': 'Test md File',
-            'summary': '<p>I have a lot to test</p>',
-            'date': SafeDatetime(2010, 12, 2, 10, 14),
-            'modified': SafeDatetime(2010, 12, 2, 10, 20),
-            'tags': ['foo', 'bar', 'foobar'],
+            "category": "test",
+            "title": "Test md File",
+            "summary": "<p>I have a lot to test</p>",
+            "date": SafeDatetime(2010, 12, 2, 10, 14),
+            "modified": SafeDatetime(2010, 12, 2, 10, 20),
+            "tags": ["foo", "bar", "foobar"],
         }
         self.assertDictHasSubset(metadata, expected)
 
         content, metadata = reader.read(
-            _path('article_with_markdown_and_nonascii_summary.md'))
+            _path("article_with_markdown_and_nonascii_summary.md")
+        )
         expected = {
-            'title': 'マックOS X 10.8でパイソンとVirtualenvをインストールと設定',
-            'summary': '<p>パイソンとVirtualenvをまっくでインストールする方法について明確に説明します。</p>',
-            'category': '指導書',
-            'date': SafeDatetime(2012, 12, 20),
-            'modified': SafeDatetime(2012, 12, 22),
-            'tags': ['パイソン', 'マック'],
-            'slug': 'python-virtualenv-on-mac-osx-mountain-lion-10.8',
+            "title": "マックOS X 10.8でパイソンとVirtualenvをインストールと設定",
+            "summary": "<p>パイソンとVirtualenvをまっくでインストールする方法について明確に説明します。</p>",
+            "category": "指導書",
+            "date": SafeDatetime(2012, 12, 20),
+            "modified": SafeDatetime(2012, 12, 22),
+            "tags": ["パイソン", "マック"],
+            "slug": "python-virtualenv-on-mac-osx-mountain-lion-10.8",
         }
         self.assertDictHasSubset(metadata, expected)
 
     def test_article_with_footnote(self):
         settings = get_settings()
-        ec = settings['MARKDOWN']['extension_configs']
-        ec['markdown.extensions.footnotes'] = {'SEPARATOR': '-'}
+        ec = settings["MARKDOWN"]["extension_configs"]
+        ec["markdown.extensions.footnotes"] = {"SEPARATOR": "-"}
         reader = readers.MarkdownReader(settings)
-        content, metadata = reader.read(
-            _path('article_with_markdown_and_footnote.md'))
+        content, metadata = reader.read(_path("article_with_markdown_and_footnote.md"))
         expected_content = (
-            '<p>This is some content'
+            "<p>This is some content"
             '<sup id="fnref-1"><a class="footnote-ref" href="#fn-1"'
-            '>1</a></sup>'
-            ' with some footnotes'
+            ">1</a></sup>"
+            " with some footnotes"
             '<sup id="fnref-footnote"><a class="footnote-ref" '
             'href="#fn-footnote">2</a></sup></p>\n'
-
             '<div class="footnote">\n'
             '<hr>\n<ol>\n<li id="fn-1">\n'
-            '<p>Numbered footnote&#160;'
+            "<p>Numbered footnote&#160;"
             '<a class="footnote-backref" href="#fnref-1" '
             'title="Jump back to footnote 1 in the text">&#8617;</a></p>\n'
             '</li>\n<li id="fn-footnote">\n'
-            '<p>Named footnote&#160;'
+            "<p>Named footnote&#160;"
             '<a class="footnote-backref" href="#fnref-footnote"'
             ' title="Jump back to footnote 2 in the text">&#8617;</a></p>\n'
-            '</li>\n</ol>\n</div>')
+            "</li>\n</ol>\n</div>"
+        )
         expected_metadata = {
-            'title': 'Article with markdown containing footnotes',
-            'summary': (
-                '<p>Summary with <strong>inline</strong> markup '
-                '<em>should</em> be supported.</p>'),
-            'date': SafeDatetime(2012, 10, 31),
-            'modified': SafeDatetime(2012, 11, 1),
-            'multiline': [
-                'Line Metadata should be handle properly.',
-                'See syntax of Meta-Data extension of '
-                'Python Markdown package:',
-                'If a line is indented by 4 or more spaces,',
-                'that line is assumed to be an additional line of the value',
-                'for the previous keyword.',
-                'A keyword may have as many lines as desired.',
-            ]
+            "title": "Article with markdown containing footnotes",
+            "summary": (
+                "<p>Summary with <strong>inline</strong> markup "
+                "<em>should</em> be supported.</p>"
+            ),
+            "date": SafeDatetime(2012, 10, 31),
+            "modified": SafeDatetime(2012, 11, 1),
+            "multiline": [
+                "Line Metadata should be handle properly.",
+                "See syntax of Meta-Data extension of " "Python Markdown package:",
+                "If a line is indented by 4 or more spaces,",
+                "that line is assumed to be an additional line of the value",
+                "for the previous keyword.",
+                "A keyword may have as many lines as desired.",
+            ],
         }
         self.assertEqual(content, expected_content)
         self.assertDictHasSubset(metadata, expected_metadata)
@@ -611,163 +608,173 @@ class MdReaderTest(ReaderTest):
         reader = readers.MarkdownReader(settings=get_settings())
         # test to ensure the md file extension is being processed by the
         # correct reader
-        content, metadata = reader.read(
-            _path('article_with_md_extension.md'))
+        content, metadata = reader.read(_path("article_with_md_extension.md"))
         expected = (
             "<h1>Test Markdown File Header</h1>\n"
             "<h2>Used for pelican test</h2>\n"
-            "<p>The quick brown fox jumped over the lazy dog's back.</p>")
+            "<p>The quick brown fox jumped over the lazy dog's back.</p>"
+        )
         self.assertEqual(content, expected)
         # test to ensure the mkd file extension is being processed by the
         # correct reader
-        content, metadata = reader.read(
-            _path('article_with_mkd_extension.mkd'))
-        expected = ("<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"
-                    " test</h2>\n<p>This is another markdown test file.  Uses"
-                    " the mkd extension.</p>")
+        content, metadata = reader.read(_path("article_with_mkd_extension.mkd"))
+        expected = (
+            "<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"
+            " test</h2>\n<p>This is another markdown test file.  Uses"
+            " the mkd extension.</p>"
+        )
         self.assertEqual(content, expected)
         # test to ensure the markdown file extension is being processed by the
         # correct reader
         content, metadata = reader.read(
-            _path('article_with_markdown_extension.markdown'))
-        expected = ("<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"
-                    " test</h2>\n<p>This is another markdown test file.  Uses"
-                    " the markdown extension.</p>")
+            _path("article_with_markdown_extension.markdown")
+        )
+        expected = (
+            "<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"
+            " test</h2>\n<p>This is another markdown test file.  Uses"
+            " the markdown extension.</p>"
+        )
         self.assertEqual(content, expected)
         # test to ensure the mdown file extension is being processed by the
         # correct reader
-        content, metadata = reader.read(
-            _path('article_with_mdown_extension.mdown'))
-        expected = ("<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"
-                    " test</h2>\n<p>This is another markdown test file.  Uses"
-                    " the mdown extension.</p>")
+        content, metadata = reader.read(_path("article_with_mdown_extension.mdown"))
+        expected = (
+            "<h1>Test Markdown File Header</h1>\n<h2>Used for pelican"
+            " test</h2>\n<p>This is another markdown test file.  Uses"
+            " the mdown extension.</p>"
+        )
         self.assertEqual(content, expected)
 
     def test_article_with_markdown_markup_extension(self):
         # test to ensure the markdown markup extension is being processed as
         # expected
         page = self.read_file(
-            path='article_with_markdown_markup_extensions.md',
+            path="article_with_markdown_markup_extensions.md",
             MARKDOWN={
-                'extension_configs': {
-                    'markdown.extensions.toc': {},
-                    'markdown.extensions.codehilite': {},
-                    'markdown.extensions.extra': {}
+                "extension_configs": {
+                    "markdown.extensions.toc": {},
+                    "markdown.extensions.codehilite": {},
+                    "markdown.extensions.extra": {},
                 }
-            }
+            },
+        )
+        expected = (
+            '<div class="toc">\n'
+            "<ul>\n"
+            '<li><a href="#level1">Level1</a><ul>\n'
+            '<li><a href="#level2">Level2</a></li>\n'
+            "</ul>\n"
+            "</li>\n"
+            "</ul>\n"
+            "</div>\n"
+            '<h2 id="level1">Level1</h2>\n'
+            '<h3 id="level2">Level2</h3>'
         )
-        expected = ('<div class="toc">\n'
-                    '<ul>\n'
-                    '<li><a href="#level1">Level1</a><ul>\n'
-                    '<li><a href="#level2">Level2</a></li>\n'
-                    '</ul>\n'
-                    '</li>\n'
-                    '</ul>\n'
-                    '</div>\n'
-                    '<h2 id="level1">Level1</h2>\n'
-                    '<h3 id="level2">Level2</h3>')
 
         self.assertEqual(page.content, expected)
 
     def test_article_with_filename_metadata(self):
         page = self.read_file(
-            path='2012-11-30_md_w_filename_meta#foo-bar.md',
-            FILENAME_METADATA=None)
+            path="2012-11-30_md_w_filename_meta#foo-bar.md", FILENAME_METADATA=None
+        )
         expected = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
+            "category": "yeah",
+            "author": "Alexis Métaireau",
         }
         self.assertDictHasSubset(page.metadata, expected)
 
         page = self.read_file(
-            path='2012-11-30_md_w_filename_meta#foo-bar.md',
-            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2}).*')
+            path="2012-11-30_md_w_filename_meta#foo-bar.md",
+            FILENAME_METADATA=r"(?P<date>\d{4}-\d{2}-\d{2}).*",
+        )
         expected = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
-            'date': SafeDatetime(2012, 11, 30),
+            "category": "yeah",
+            "author": "Alexis Métaireau",
+            "date": SafeDatetime(2012, 11, 30),
         }
         self.assertDictHasSubset(page.metadata, expected)
 
         page = self.read_file(
-            path='2012-11-30_md_w_filename_meta#foo-bar.md',
+            path="2012-11-30_md_w_filename_meta#foo-bar.md",
             FILENAME_METADATA=(
-                r'(?P<date>\d{4}-\d{2}-\d{2})'
-                r'_(?P<Slug>.*)'
-                r'#(?P<MyMeta>.*)-(?P<author>.*)'))
+                r"(?P<date>\d{4}-\d{2}-\d{2})"
+                r"_(?P<Slug>.*)"
+                r"#(?P<MyMeta>.*)-(?P<author>.*)"
+            ),
+        )
         expected = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
-            'date': SafeDatetime(2012, 11, 30),
-            'slug': 'md_w_filename_meta',
-            'mymeta': 'foo',
+            "category": "yeah",
+            "author": "Alexis Métaireau",
+            "date": SafeDatetime(2012, 11, 30),
+            "slug": "md_w_filename_meta",
+            "mymeta": "foo",
         }
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_optional_filename_metadata(self):
         page = self.read_file(
-            path='2012-11-30_md_w_filename_meta#foo-bar.md',
-            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2})?')
+            path="2012-11-30_md_w_filename_meta#foo-bar.md",
+            FILENAME_METADATA=r"(?P<date>\d{4}-\d{2}-\d{2})?",
+        )
         expected = {
-            'date': SafeDatetime(2012, 11, 30),
-            'reader': 'markdown',
+            "date": SafeDatetime(2012, 11, 30),
+            "reader": "markdown",
         }
         self.assertDictHasSubset(page.metadata, expected)
 
         page = self.read_file(
-            path='empty.md',
-            FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2})?')
+            path="empty.md", FILENAME_METADATA=r"(?P<date>\d{4}-\d{2}-\d{2})?"
+        )
         expected = {
-            'reader': 'markdown',
+            "reader": "markdown",
         }
         self.assertDictHasSubset(page.metadata, expected)
-        self.assertNotIn('date', page.metadata, 'Date should not be set.')
+        self.assertNotIn("date", page.metadata, "Date should not be set.")
 
     def test_duplicate_tags_or_authors_are_removed(self):
         reader = readers.MarkdownReader(settings=get_settings())
-        content, metadata = reader.read(
-            _path('article_with_duplicate_tags_authors.md'))
+        content, metadata = reader.read(_path("article_with_duplicate_tags_authors.md"))
         expected = {
-            'tags': ['foo', 'bar', 'foobar'],
-            'authors': ['Author, First', 'Author, Second'],
+            "tags": ["foo", "bar", "foobar"],
+            "authors": ["Author, First", "Author, Second"],
         }
         self.assertDictHasSubset(metadata, expected)
 
     def test_metadata_not_parsed_for_metadata(self):
         settings = get_settings()
-        settings['FORMATTED_FIELDS'] = ['summary']
+        settings["FORMATTED_FIELDS"] = ["summary"]
 
         reader = readers.MarkdownReader(settings=settings)
         content, metadata = reader.read(
-            _path('article_with_markdown_and_nested_metadata.md'))
+            _path("article_with_markdown_and_nested_metadata.md")
+        )
         expected = {
-            'title': 'Article with markdown and nested summary metadata',
-            'summary': '<p>Test: This metadata value looks like metadata</p>',
+            "title": "Article with markdown and nested summary metadata",
+            "summary": "<p>Test: This metadata value looks like metadata</p>",
         }
         self.assertDictHasSubset(metadata, expected)
 
     def test_empty_file(self):
         reader = readers.MarkdownReader(settings=get_settings())
-        content, metadata = reader.read(
-            _path('empty.md'))
+        content, metadata = reader.read(_path("empty.md"))
 
         self.assertEqual(metadata, {})
-        self.assertEqual(content, '')
+        self.assertEqual(content, "")
 
     def test_empty_file_with_bom(self):
         reader = readers.MarkdownReader(settings=get_settings())
-        content, metadata = reader.read(
-            _path('empty_with_bom.md'))
+        content, metadata = reader.read(_path("empty_with_bom.md"))
 
         self.assertEqual(metadata, {})
-        self.assertEqual(content, '')
+        self.assertEqual(content, "")
 
     def test_typogrify_dashes_config(self):
         # Test default config
         page = self.read_file(
-            path='article_with_typogrify_dashes.md',
+            path="article_with_typogrify_dashes.md",
             TYPOGRIFY=True,
-            TYPOGRIFY_DASHES='default')
+            TYPOGRIFY_DASHES="default",
+        )
         expected = "<p>One: -; Two: &#8212;; Three:&nbsp;&#8212;-</p>"
         expected_title = "One -, two &#8212;, three &#8212;-&nbsp;dashes!"
 
@@ -776,9 +783,10 @@ class MdReaderTest(ReaderTest):
 
         # Test 'oldschool' variant
         page = self.read_file(
-            path='article_with_typogrify_dashes.md',
+            path="article_with_typogrify_dashes.md",
             TYPOGRIFY=True,
-            TYPOGRIFY_DASHES='oldschool')
+            TYPOGRIFY_DASHES="oldschool",
+        )
         expected = "<p>One: -; Two: &#8211;; Three:&nbsp;&#8212;</p>"
         expected_title = "One -, two &#8211;, three &#8212;&nbsp;dashes!"
 
@@ -787,9 +795,10 @@ class MdReaderTest(ReaderTest):
 
         # Test 'oldschool_inverted' variant
         page = self.read_file(
-            path='article_with_typogrify_dashes.md',
+            path="article_with_typogrify_dashes.md",
             TYPOGRIFY=True,
-            TYPOGRIFY_DASHES='oldschool_inverted')
+            TYPOGRIFY_DASHES="oldschool_inverted",
+        )
         expected = "<p>One: -; Two: &#8212;; Three:&nbsp;&#8211;</p>"
         expected_title = "One -, two &#8212;, three &#8211;&nbsp;dashes!"
 
@@ -797,124 +806,130 @@ class MdReaderTest(ReaderTest):
         self.assertEqual(page.title, expected_title)
 
     def test_metadata_has_no_discarded_data(self):
-        md_filename = 'article_with_markdown_and_empty_tags.md'
+        md_filename = "article_with_markdown_and_empty_tags.md"
 
-        r = readers.Readers(cache_name='cache', settings=get_settings(
-            CACHE_CONTENT=True))
+        r = readers.Readers(
+            cache_name="cache", settings=get_settings(CACHE_CONTENT=True)
+        )
         page = r.read_file(base_path=CONTENT_PATH, path=md_filename)
 
-        __, cached_metadata = r.get_cached_data(
-            _path(md_filename), (None, None))
+        __, cached_metadata = r.get_cached_data(_path(md_filename), (None, None))
 
-        expected = {
-            'title': 'Article with markdown and empty tags'
-        }
+        expected = {"title": "Article with markdown and empty tags"}
         self.assertEqual(cached_metadata, expected)
-        self.assertNotIn('tags', page.metadata)
+        self.assertNotIn("tags", page.metadata)
         self.assertDictHasSubset(page.metadata, expected)
 
 
 class HTMLReaderTest(ReaderTest):
     def test_article_with_comments(self):
-        page = self.read_file(path='article_with_comments.html')
+        page = self.read_file(path="article_with_comments.html")
 
-        self.assertEqual('''
+        self.assertEqual(
+            """
         Body content
         <!--  This comment is included (including extra whitespace)   -->
-    ''', page.content)
+    """,
+            page.content,
+        )
 
     def test_article_with_keywords(self):
-        page = self.read_file(path='article_with_keywords.html')
+        page = self.read_file(path="article_with_keywords.html")
         expected = {
-            'tags': ['foo', 'bar', 'foobar'],
+            "tags": ["foo", "bar", "foobar"],
         }
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_metadata(self):
-        page = self.read_file(path='article_with_metadata.html')
+        page = self.read_file(path="article_with_metadata.html")
         expected = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
-            'title': 'This is a super article !',
-            'summary': 'Summary and stuff',
-            'date': SafeDatetime(2010, 12, 2, 10, 14),
-            'tags': ['foo', 'bar', 'foobar'],
-            'custom_field': 'http://notmyidea.org',
+            "category": "yeah",
+            "author": "Alexis Métaireau",
+            "title": "This is a super article !",
+            "summary": "Summary and stuff",
+            "date": SafeDatetime(2010, 12, 2, 10, 14),
+            "tags": ["foo", "bar", "foobar"],
+            "custom_field": "http://notmyidea.org",
         }
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_multiple_similar_metadata_tags(self):
-        page = self.read_file(path='article_with_multiple_metadata_tags.html')
+        page = self.read_file(path="article_with_multiple_metadata_tags.html")
         expected = {
-            'custom_field': ['https://getpelican.com', 'https://www.eff.org'],
+            "custom_field": ["https://getpelican.com", "https://www.eff.org"],
         }
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_multiple_authors(self):
-        page = self.read_file(path='article_with_multiple_authors.html')
-        expected = {
-            'authors': ['First Author', 'Second Author']
-        }
+        page = self.read_file(path="article_with_multiple_authors.html")
+        expected = {"authors": ["First Author", "Second Author"]}
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_metadata_and_contents_attrib(self):
-        page = self.read_file(path='article_with_metadata_and_contents.html')
+        page = self.read_file(path="article_with_metadata_and_contents.html")
         expected = {
-            'category': 'yeah',
-            'author': 'Alexis Métaireau',
-            'title': 'This is a super article !',
-            'summary': 'Summary and stuff',
-            'date': SafeDatetime(2010, 12, 2, 10, 14),
-            'tags': ['foo', 'bar', 'foobar'],
-            'custom_field': 'http://notmyidea.org',
+            "category": "yeah",
+            "author": "Alexis Métaireau",
+            "title": "This is a super article !",
+            "summary": "Summary and stuff",
+            "date": SafeDatetime(2010, 12, 2, 10, 14),
+            "tags": ["foo", "bar", "foobar"],
+            "custom_field": "http://notmyidea.org",
         }
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_null_attributes(self):
-        page = self.read_file(path='article_with_null_attributes.html')
+        page = self.read_file(path="article_with_null_attributes.html")
 
-        self.assertEqual('''
+        self.assertEqual(
+            """
         Ensure that empty attributes are copied properly.
         <input name="test" disabled style="" />
-    ''', page.content)
+    """,
+            page.content,
+        )
 
     def test_article_with_attributes_containing_double_quotes(self):
-        page = self.read_file(path='article_with_attributes_containing_' +
-                                   'double_quotes.html')
-        self.assertEqual('''
+        page = self.read_file(
+            path="article_with_attributes_containing_" + "double_quotes.html"
+        )
+        self.assertEqual(
+            """
         Ensure that if an attribute value contains a double quote, it is
         surrounded with single quotes, otherwise with double quotes.
         <span data-test="'single quoted string'">Span content</span>
         <span data-test='"double quoted string"'>Span content</span>
         <span data-test="string without quotes">Span content</span>
-    ''', page.content)
+    """,
+            page.content,
+        )
 
     def test_article_metadata_key_lowercase(self):
         # Keys of metadata should be lowercase.
-        page = self.read_file(path='article_with_uppercase_metadata.html')
+        page = self.read_file(path="article_with_uppercase_metadata.html")
 
         # Key should be lowercase
-        self.assertIn('category', page.metadata, 'Key should be lowercase.')
+        self.assertIn("category", page.metadata, "Key should be lowercase.")
 
         # Value should keep cases
-        self.assertEqual('Yeah', page.metadata.get('category'))
+        self.assertEqual("Yeah", page.metadata.get("category"))
 
     def test_article_with_nonconformant_meta_tags(self):
-        page = self.read_file(path='article_with_nonconformant_meta_tags.html')
+        page = self.read_file(path="article_with_nonconformant_meta_tags.html")
         expected = {
-            'summary': 'Summary and stuff',
-            'title': 'Article with Nonconformant HTML meta tags',
+            "summary": "Summary and stuff",
+            "title": "Article with Nonconformant HTML meta tags",
         }
 
         self.assertDictHasSubset(page.metadata, expected)
 
     def test_article_with_inline_svg(self):
-        page = self.read_file(path='article_with_inline_svg.html')
+        page = self.read_file(path="article_with_inline_svg.html")
         expected = {
-            'title': 'Article with an inline SVG',
+            "title": "Article with an inline SVG",
         }
         self.assertDictHasSubset(page.metadata, expected)
diff --git a/pelican/tests/test_rstdirectives.py b/pelican/tests/test_rstdirectives.py
index 6b733971..46ed6f49 100644
--- a/pelican/tests/test_rstdirectives.py
+++ b/pelican/tests/test_rstdirectives.py
@@ -6,11 +6,11 @@ from pelican.tests.support import unittest
 class Test_abbr_role(unittest.TestCase):
     def call_it(self, text):
         from pelican.rstdirectives import abbr_role
+
         rawtext = text
         lineno = 42
-        inliner = Mock(name='inliner')
-        nodes, system_messages = abbr_role(
-            'abbr', rawtext, text, lineno, inliner)
+        inliner = Mock(name="inliner")
+        nodes, system_messages = abbr_role("abbr", rawtext, text, lineno, inliner)
         self.assertEqual(system_messages, [])
         self.assertEqual(len(nodes), 1)
         return nodes[0]
@@ -18,14 +18,14 @@ class Test_abbr_role(unittest.TestCase):
     def test(self):
         node = self.call_it("Abbr (Abbreviation)")
         self.assertEqual(node.astext(), "Abbr")
-        self.assertEqual(node['explanation'], "Abbreviation")
+        self.assertEqual(node["explanation"], "Abbreviation")
 
     def test_newlines_in_explanation(self):
         node = self.call_it("CUL (See you\nlater)")
         self.assertEqual(node.astext(), "CUL")
-        self.assertEqual(node['explanation'], "See you\nlater")
+        self.assertEqual(node["explanation"], "See you\nlater")
 
     def test_newlines_in_abbr(self):
         node = self.call_it("US of\nA \n (USA)")
         self.assertEqual(node.astext(), "US of\nA")
-        self.assertEqual(node['explanation'], "USA")
+        self.assertEqual(node["explanation"], "USA")
diff --git a/pelican/tests/test_server.py b/pelican/tests/test_server.py
index 9af030f8..fd616ef7 100644
--- a/pelican/tests/test_server.py
+++ b/pelican/tests/test_server.py
@@ -17,10 +17,9 @@ class MockServer:
 
 
 class TestServer(unittest.TestCase):
-
     def setUp(self):
         self.server = MockServer()
-        self.temp_output = mkdtemp(prefix='pelicantests.')
+        self.temp_output = mkdtemp(prefix="pelicantests.")
         self.old_cwd = os.getcwd()
         os.chdir(self.temp_output)
 
@@ -29,32 +28,33 @@ class TestServer(unittest.TestCase):
         rmtree(self.temp_output)
 
     def test_get_path_that_exists(self):
-        handler = ComplexHTTPRequestHandler(MockRequest(), ('0.0.0.0', 8888),
-                                            self.server)
+        handler = ComplexHTTPRequestHandler(
+            MockRequest(), ("0.0.0.0", 8888), self.server
+        )
         handler.base_path = self.temp_output
 
-        open(os.path.join(self.temp_output, 'foo.html'), 'a').close()
-        os.mkdir(os.path.join(self.temp_output, 'foo'))
-        open(os.path.join(self.temp_output, 'foo', 'index.html'), 'a').close()
+        open(os.path.join(self.temp_output, "foo.html"), "a").close()
+        os.mkdir(os.path.join(self.temp_output, "foo"))
+        open(os.path.join(self.temp_output, "foo", "index.html"), "a").close()
 
-        os.mkdir(os.path.join(self.temp_output, 'bar'))
-        open(os.path.join(self.temp_output, 'bar', 'index.html'), 'a').close()
+        os.mkdir(os.path.join(self.temp_output, "bar"))
+        open(os.path.join(self.temp_output, "bar", "index.html"), "a").close()
 
-        os.mkdir(os.path.join(self.temp_output, 'baz'))
+        os.mkdir(os.path.join(self.temp_output, "baz"))
 
-        for suffix in ['', '/']:
+        for suffix in ["", "/"]:
             # foo.html has precedence over foo/index.html
-            path = handler.get_path_that_exists('foo' + suffix)
-            self.assertEqual(path, 'foo.html')
+            path = handler.get_path_that_exists("foo" + suffix)
+            self.assertEqual(path, "foo.html")
 
             # folder with index.html should return folder/index.html
-            path = handler.get_path_that_exists('bar' + suffix)
-            self.assertEqual(path, 'bar/index.html')
+            path = handler.get_path_that_exists("bar" + suffix)
+            self.assertEqual(path, "bar/index.html")
 
             # folder without index.html should return same as input
-            path = handler.get_path_that_exists('baz' + suffix)
-            self.assertEqual(path, 'baz' + suffix)
+            path = handler.get_path_that_exists("baz" + suffix)
+            self.assertEqual(path, "baz" + suffix)
 
             # not existing path should return None
-            path = handler.get_path_that_exists('quux' + suffix)
+            path = handler.get_path_that_exists("quux" + suffix)
             self.assertIsNone(path)
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 0f630ad5..0e77674d 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -4,10 +4,14 @@ import os
 from os.path import abspath, dirname, join
 
 
-from pelican.settings import (DEFAULT_CONFIG, DEFAULT_THEME,
-                              _printf_s_to_format_field,
-                              configure_settings,
-                              handle_deprecated_settings, read_settings)
+from pelican.settings import (
+    DEFAULT_CONFIG,
+    DEFAULT_THEME,
+    _printf_s_to_format_field,
+    configure_settings,
+    handle_deprecated_settings,
+    read_settings,
+)
 from pelican.tests.support import unittest
 
 
@@ -16,40 +20,39 @@ class TestSettingsConfiguration(unittest.TestCase):
     append new values to the settings (if any), and apply basic settings
     optimizations.
     """
+
     def setUp(self):
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
+        locale.setlocale(locale.LC_ALL, "C")
         self.PATH = abspath(dirname(__file__))
-        default_conf = join(self.PATH, 'default_conf.py')
+        default_conf = join(self.PATH, "default_conf.py")
         self.settings = read_settings(default_conf)
 
     def tearDown(self):
         locale.setlocale(locale.LC_ALL, self.old_locale)
 
     def test_overwrite_existing_settings(self):
-        self.assertEqual(self.settings.get('SITENAME'), "Alexis' log")
-        self.assertEqual(
-            self.settings.get('SITEURL'),
-            'http://blog.notmyidea.org')
+        self.assertEqual(self.settings.get("SITENAME"), "Alexis' log")
+        self.assertEqual(self.settings.get("SITEURL"), "http://blog.notmyidea.org")
 
     def test_keep_default_settings(self):
         # Keep default settings if not defined.
         self.assertEqual(
-            self.settings.get('DEFAULT_CATEGORY'),
-            DEFAULT_CONFIG['DEFAULT_CATEGORY'])
+            self.settings.get("DEFAULT_CATEGORY"), DEFAULT_CONFIG["DEFAULT_CATEGORY"]
+        )
 
     def test_dont_copy_small_keys(self):
         # Do not copy keys not in caps.
-        self.assertNotIn('foobar', self.settings)
+        self.assertNotIn("foobar", self.settings)
 
     def test_read_empty_settings(self):
         # Ensure an empty settings file results in default settings.
         settings = read_settings(None)
         expected = copy.deepcopy(DEFAULT_CONFIG)
         # Added by configure settings
-        expected['FEED_DOMAIN'] = ''
-        expected['ARTICLE_EXCLUDES'] = ['pages']
-        expected['PAGE_EXCLUDES'] = ['']
+        expected["FEED_DOMAIN"] = ""
+        expected["ARTICLE_EXCLUDES"] = ["pages"]
+        expected["PAGE_EXCLUDES"] = [""]
         self.maxDiff = None
         self.assertDictEqual(settings, expected)
 
@@ -57,250 +60,265 @@ class TestSettingsConfiguration(unittest.TestCase):
         # Make sure that the results from one settings call doesn't
         # effect past or future instances.
         self.PATH = abspath(dirname(__file__))
-        default_conf = join(self.PATH, 'default_conf.py')
+        default_conf = join(self.PATH, "default_conf.py")
         settings = read_settings(default_conf)
-        settings['SITEURL'] = 'new-value'
+        settings["SITEURL"] = "new-value"
         new_settings = read_settings(default_conf)
-        self.assertNotEqual(new_settings['SITEURL'], settings['SITEURL'])
+        self.assertNotEqual(new_settings["SITEURL"], settings["SITEURL"])
 
     def test_defaults_not_overwritten(self):
         # This assumes 'SITENAME': 'A Pelican Blog'
         settings = read_settings(None)
-        settings['SITENAME'] = 'Not a Pelican Blog'
-        self.assertNotEqual(settings['SITENAME'], DEFAULT_CONFIG['SITENAME'])
+        settings["SITENAME"] = "Not a Pelican Blog"
+        self.assertNotEqual(settings["SITENAME"], DEFAULT_CONFIG["SITENAME"])
 
     def test_static_path_settings_safety(self):
         # Disallow static paths from being strings
         settings = {
-            'STATIC_PATHS': 'foo/bar',
-            'THEME_STATIC_PATHS': 'bar/baz',
+            "STATIC_PATHS": "foo/bar",
+            "THEME_STATIC_PATHS": "bar/baz",
             # These 4 settings are required to run configure_settings
-            'PATH': '.',
-            'THEME': DEFAULT_THEME,
-            'SITEURL': 'http://blog.notmyidea.org/',
-            'LOCALE': '',
+            "PATH": ".",
+            "THEME": DEFAULT_THEME,
+            "SITEURL": "http://blog.notmyidea.org/",
+            "LOCALE": "",
         }
         configure_settings(settings)
+        self.assertEqual(settings["STATIC_PATHS"], DEFAULT_CONFIG["STATIC_PATHS"])
         self.assertEqual(
-            settings['STATIC_PATHS'],
-            DEFAULT_CONFIG['STATIC_PATHS'])
-        self.assertEqual(
-            settings['THEME_STATIC_PATHS'],
-            DEFAULT_CONFIG['THEME_STATIC_PATHS'])
+            settings["THEME_STATIC_PATHS"], DEFAULT_CONFIG["THEME_STATIC_PATHS"]
+        )
 
     def test_configure_settings(self):
         # Manipulations to settings should be applied correctly.
         settings = {
-            'SITEURL': 'http://blog.notmyidea.org/',
-            'LOCALE': '',
-            'PATH': os.curdir,
-            'THEME': DEFAULT_THEME,
+            "SITEURL": "http://blog.notmyidea.org/",
+            "LOCALE": "",
+            "PATH": os.curdir,
+            "THEME": DEFAULT_THEME,
         }
         configure_settings(settings)
 
         # SITEURL should not have a trailing slash
-        self.assertEqual(settings['SITEURL'], 'http://blog.notmyidea.org')
+        self.assertEqual(settings["SITEURL"], "http://blog.notmyidea.org")
 
         # FEED_DOMAIN, if undefined, should default to SITEURL
-        self.assertEqual(settings['FEED_DOMAIN'], 'http://blog.notmyidea.org')
+        self.assertEqual(settings["FEED_DOMAIN"], "http://blog.notmyidea.org")
 
-        settings['FEED_DOMAIN'] = 'http://feeds.example.com'
+        settings["FEED_DOMAIN"] = "http://feeds.example.com"
         configure_settings(settings)
-        self.assertEqual(settings['FEED_DOMAIN'], 'http://feeds.example.com')
+        self.assertEqual(settings["FEED_DOMAIN"], "http://feeds.example.com")
 
     def test_theme_settings_exceptions(self):
         settings = self.settings
 
         # Check that theme lookup in "pelican/themes" functions as expected
-        settings['THEME'] = os.path.split(settings['THEME'])[1]
+        settings["THEME"] = os.path.split(settings["THEME"])[1]
         configure_settings(settings)
-        self.assertEqual(settings['THEME'], DEFAULT_THEME)
+        self.assertEqual(settings["THEME"], DEFAULT_THEME)
 
         # Check that non-existent theme raises exception
-        settings['THEME'] = 'foo'
+        settings["THEME"] = "foo"
         self.assertRaises(Exception, configure_settings, settings)
 
     def test_deprecated_dir_setting(self):
         settings = self.settings
 
-        settings['ARTICLE_DIR'] = 'foo'
-        settings['PAGE_DIR'] = 'bar'
+        settings["ARTICLE_DIR"] = "foo"
+        settings["PAGE_DIR"] = "bar"
 
         settings = handle_deprecated_settings(settings)
 
-        self.assertEqual(settings['ARTICLE_PATHS'], ['foo'])
-        self.assertEqual(settings['PAGE_PATHS'], ['bar'])
+        self.assertEqual(settings["ARTICLE_PATHS"], ["foo"])
+        self.assertEqual(settings["PAGE_PATHS"], ["bar"])
 
         with self.assertRaises(KeyError):
-            settings['ARTICLE_DIR']
-            settings['PAGE_DIR']
+            settings["ARTICLE_DIR"]
+            settings["PAGE_DIR"]
 
     def test_default_encoding(self):
         # Test that the user locale is set if not specified in settings
 
-        locale.setlocale(locale.LC_ALL, 'C')
+        locale.setlocale(locale.LC_ALL, "C")
         # empty string = user system locale
-        self.assertEqual(self.settings['LOCALE'], [''])
+        self.assertEqual(self.settings["LOCALE"], [""])
 
         configure_settings(self.settings)
         lc_time = locale.getlocale(locale.LC_TIME)  # should be set to user locale
 
         # explicitly set locale to user pref and test
-        locale.setlocale(locale.LC_TIME, '')
+        locale.setlocale(locale.LC_TIME, "")
         self.assertEqual(lc_time, locale.getlocale(locale.LC_TIME))
 
     def test_invalid_settings_throw_exception(self):
         # Test that the path name is valid
 
         # test that 'PATH' is set
-        settings = {
-        }
+        settings = {}
 
         self.assertRaises(Exception, configure_settings, settings)
 
         # Test that 'PATH' is valid
-        settings['PATH'] = ''
+        settings["PATH"] = ""
         self.assertRaises(Exception, configure_settings, settings)
 
         # Test nonexistent THEME
-        settings['PATH'] = os.curdir
-        settings['THEME'] = 'foo'
+        settings["PATH"] = os.curdir
+        settings["THEME"] = "foo"
 
         self.assertRaises(Exception, configure_settings, settings)
 
     def test__printf_s_to_format_field(self):
-        for s in ('%s', '{%s}', '{%s'):
-            option = 'foo/{}/bar.baz'.format(s)
-            result = _printf_s_to_format_field(option, 'slug')
-            expected = option % 'qux'
-            found = result.format(slug='qux')
+        for s in ("%s", "{%s}", "{%s"):
+            option = "foo/{}/bar.baz".format(s)
+            result = _printf_s_to_format_field(option, "slug")
+            expected = option % "qux"
+            found = result.format(slug="qux")
             self.assertEqual(expected, found)
 
     def test_deprecated_extra_templates_paths(self):
         settings = self.settings
-        settings['EXTRA_TEMPLATES_PATHS'] = ['/foo/bar', '/ha']
+        settings["EXTRA_TEMPLATES_PATHS"] = ["/foo/bar", "/ha"]
 
         settings = handle_deprecated_settings(settings)
 
-        self.assertEqual(settings['THEME_TEMPLATES_OVERRIDES'],
-                         ['/foo/bar', '/ha'])
-        self.assertNotIn('EXTRA_TEMPLATES_PATHS', settings)
+        self.assertEqual(settings["THEME_TEMPLATES_OVERRIDES"], ["/foo/bar", "/ha"])
+        self.assertNotIn("EXTRA_TEMPLATES_PATHS", settings)
 
     def test_deprecated_paginated_direct_templates(self):
         settings = self.settings
-        settings['PAGINATED_DIRECT_TEMPLATES'] = ['index', 'archives']
-        settings['PAGINATED_TEMPLATES'] = {'index': 10, 'category': None}
+        settings["PAGINATED_DIRECT_TEMPLATES"] = ["index", "archives"]
+        settings["PAGINATED_TEMPLATES"] = {"index": 10, "category": None}
         settings = handle_deprecated_settings(settings)
-        self.assertEqual(settings['PAGINATED_TEMPLATES'],
-                         {'index': 10, 'category': None, 'archives': None})
-        self.assertNotIn('PAGINATED_DIRECT_TEMPLATES', settings)
+        self.assertEqual(
+            settings["PAGINATED_TEMPLATES"],
+            {"index": 10, "category": None, "archives": None},
+        )
+        self.assertNotIn("PAGINATED_DIRECT_TEMPLATES", settings)
 
     def test_deprecated_paginated_direct_templates_from_file(self):
         # This is equivalent to reading a settings file that has
         # PAGINATED_DIRECT_TEMPLATES defined but no PAGINATED_TEMPLATES.
-        settings = read_settings(None, override={
-            'PAGINATED_DIRECT_TEMPLATES': ['index', 'archives']
-        })
-        self.assertEqual(settings['PAGINATED_TEMPLATES'], {
-            'archives': None,
-            'author': None,
-            'index': None,
-            'category': None,
-            'tag': None})
-        self.assertNotIn('PAGINATED_DIRECT_TEMPLATES', settings)
+        settings = read_settings(
+            None, override={"PAGINATED_DIRECT_TEMPLATES": ["index", "archives"]}
+        )
+        self.assertEqual(
+            settings["PAGINATED_TEMPLATES"],
+            {
+                "archives": None,
+                "author": None,
+                "index": None,
+                "category": None,
+                "tag": None,
+            },
+        )
+        self.assertNotIn("PAGINATED_DIRECT_TEMPLATES", settings)
 
     def test_theme_and_extra_templates_exception(self):
         settings = self.settings
-        settings['EXTRA_TEMPLATES_PATHS'] = ['/ha']
-        settings['THEME_TEMPLATES_OVERRIDES'] = ['/foo/bar']
+        settings["EXTRA_TEMPLATES_PATHS"] = ["/ha"]
+        settings["THEME_TEMPLATES_OVERRIDES"] = ["/foo/bar"]
 
         self.assertRaises(Exception, handle_deprecated_settings, settings)
 
     def test_slug_and_slug_regex_substitutions_exception(self):
         settings = {}
-        settings['SLUG_REGEX_SUBSTITUTIONS'] = [('C++', 'cpp')]
-        settings['TAG_SUBSTITUTIONS'] = [('C#', 'csharp')]
+        settings["SLUG_REGEX_SUBSTITUTIONS"] = [("C++", "cpp")]
+        settings["TAG_SUBSTITUTIONS"] = [("C#", "csharp")]
 
         self.assertRaises(Exception, handle_deprecated_settings, settings)
 
     def test_deprecated_slug_substitutions(self):
-        default_slug_regex_subs = self.settings['SLUG_REGEX_SUBSTITUTIONS']
+        default_slug_regex_subs = self.settings["SLUG_REGEX_SUBSTITUTIONS"]
 
         # If no deprecated setting is set, don't set new ones
         settings = {}
         settings = handle_deprecated_settings(settings)
-        self.assertNotIn('SLUG_REGEX_SUBSTITUTIONS', settings)
-        self.assertNotIn('TAG_REGEX_SUBSTITUTIONS', settings)
-        self.assertNotIn('CATEGORY_REGEX_SUBSTITUTIONS', settings)
-        self.assertNotIn('AUTHOR_REGEX_SUBSTITUTIONS', settings)
+        self.assertNotIn("SLUG_REGEX_SUBSTITUTIONS", settings)
+        self.assertNotIn("TAG_REGEX_SUBSTITUTIONS", settings)
+        self.assertNotIn("CATEGORY_REGEX_SUBSTITUTIONS", settings)
+        self.assertNotIn("AUTHOR_REGEX_SUBSTITUTIONS", settings)
 
         # If SLUG_SUBSTITUTIONS is set, set {SLUG, AUTHOR}_REGEX_SUBSTITUTIONS
         # correctly, don't set {CATEGORY, TAG}_REGEX_SUBSTITUTIONS
         settings = {}
-        settings['SLUG_SUBSTITUTIONS'] = [('C++', 'cpp')]
+        settings["SLUG_SUBSTITUTIONS"] = [("C++", "cpp")]
         settings = handle_deprecated_settings(settings)
-        self.assertEqual(settings.get('SLUG_REGEX_SUBSTITUTIONS'),
-                         [(r'C\+\+', 'cpp')] + default_slug_regex_subs)
-        self.assertNotIn('TAG_REGEX_SUBSTITUTIONS', settings)
-        self.assertNotIn('CATEGORY_REGEX_SUBSTITUTIONS', settings)
-        self.assertEqual(settings.get('AUTHOR_REGEX_SUBSTITUTIONS'),
-                         default_slug_regex_subs)
+        self.assertEqual(
+            settings.get("SLUG_REGEX_SUBSTITUTIONS"),
+            [(r"C\+\+", "cpp")] + default_slug_regex_subs,
+        )
+        self.assertNotIn("TAG_REGEX_SUBSTITUTIONS", settings)
+        self.assertNotIn("CATEGORY_REGEX_SUBSTITUTIONS", settings)
+        self.assertEqual(
+            settings.get("AUTHOR_REGEX_SUBSTITUTIONS"), default_slug_regex_subs
+        )
 
         # If {CATEGORY, TAG, AUTHOR}_SUBSTITUTIONS are set, set
         # {CATEGORY, TAG, AUTHOR}_REGEX_SUBSTITUTIONS correctly, don't set
         # SLUG_REGEX_SUBSTITUTIONS
         settings = {}
-        settings['TAG_SUBSTITUTIONS'] = [('C#', 'csharp')]
-        settings['CATEGORY_SUBSTITUTIONS'] = [('C#', 'csharp')]
-        settings['AUTHOR_SUBSTITUTIONS'] = [('Alexander Todorov', 'atodorov')]
+        settings["TAG_SUBSTITUTIONS"] = [("C#", "csharp")]
+        settings["CATEGORY_SUBSTITUTIONS"] = [("C#", "csharp")]
+        settings["AUTHOR_SUBSTITUTIONS"] = [("Alexander Todorov", "atodorov")]
         settings = handle_deprecated_settings(settings)
-        self.assertNotIn('SLUG_REGEX_SUBSTITUTIONS', settings)
-        self.assertEqual(settings['TAG_REGEX_SUBSTITUTIONS'],
-                         [(r'C\#', 'csharp')] + default_slug_regex_subs)
-        self.assertEqual(settings['CATEGORY_REGEX_SUBSTITUTIONS'],
-                         [(r'C\#', 'csharp')] + default_slug_regex_subs)
-        self.assertEqual(settings['AUTHOR_REGEX_SUBSTITUTIONS'],
-                         [(r'Alexander\ Todorov', 'atodorov')] +
-                         default_slug_regex_subs)
+        self.assertNotIn("SLUG_REGEX_SUBSTITUTIONS", settings)
+        self.assertEqual(
+            settings["TAG_REGEX_SUBSTITUTIONS"],
+            [(r"C\#", "csharp")] + default_slug_regex_subs,
+        )
+        self.assertEqual(
+            settings["CATEGORY_REGEX_SUBSTITUTIONS"],
+            [(r"C\#", "csharp")] + default_slug_regex_subs,
+        )
+        self.assertEqual(
+            settings["AUTHOR_REGEX_SUBSTITUTIONS"],
+            [(r"Alexander\ Todorov", "atodorov")] + default_slug_regex_subs,
+        )
 
         # If {SLUG, CATEGORY, TAG, AUTHOR}_SUBSTITUTIONS are set, set
         # {SLUG, CATEGORY, TAG, AUTHOR}_REGEX_SUBSTITUTIONS correctly
         settings = {}
-        settings['SLUG_SUBSTITUTIONS'] = [('C++', 'cpp')]
-        settings['TAG_SUBSTITUTIONS'] = [('C#', 'csharp')]
-        settings['CATEGORY_SUBSTITUTIONS'] = [('C#', 'csharp')]
-        settings['AUTHOR_SUBSTITUTIONS'] = [('Alexander Todorov', 'atodorov')]
+        settings["SLUG_SUBSTITUTIONS"] = [("C++", "cpp")]
+        settings["TAG_SUBSTITUTIONS"] = [("C#", "csharp")]
+        settings["CATEGORY_SUBSTITUTIONS"] = [("C#", "csharp")]
+        settings["AUTHOR_SUBSTITUTIONS"] = [("Alexander Todorov", "atodorov")]
         settings = handle_deprecated_settings(settings)
-        self.assertEqual(settings['TAG_REGEX_SUBSTITUTIONS'],
-                         [(r'C\+\+', 'cpp')] + [(r'C\#', 'csharp')] +
-                         default_slug_regex_subs)
-        self.assertEqual(settings['CATEGORY_REGEX_SUBSTITUTIONS'],
-                         [(r'C\+\+', 'cpp')] + [(r'C\#', 'csharp')] +
-                         default_slug_regex_subs)
-        self.assertEqual(settings['AUTHOR_REGEX_SUBSTITUTIONS'],
-                         [(r'Alexander\ Todorov', 'atodorov')] +
-                         default_slug_regex_subs)
+        self.assertEqual(
+            settings["TAG_REGEX_SUBSTITUTIONS"],
+            [(r"C\+\+", "cpp")] + [(r"C\#", "csharp")] + default_slug_regex_subs,
+        )
+        self.assertEqual(
+            settings["CATEGORY_REGEX_SUBSTITUTIONS"],
+            [(r"C\+\+", "cpp")] + [(r"C\#", "csharp")] + default_slug_regex_subs,
+        )
+        self.assertEqual(
+            settings["AUTHOR_REGEX_SUBSTITUTIONS"],
+            [(r"Alexander\ Todorov", "atodorov")] + default_slug_regex_subs,
+        )
 
         # Handle old 'skip' flags correctly
         settings = {}
-        settings['SLUG_SUBSTITUTIONS'] = [('C++', 'cpp', True)]
-        settings['AUTHOR_SUBSTITUTIONS'] = [('Alexander Todorov', 'atodorov',
-                                             False)]
+        settings["SLUG_SUBSTITUTIONS"] = [("C++", "cpp", True)]
+        settings["AUTHOR_SUBSTITUTIONS"] = [("Alexander Todorov", "atodorov", False)]
         settings = handle_deprecated_settings(settings)
-        self.assertEqual(settings.get('SLUG_REGEX_SUBSTITUTIONS'),
-                         [(r'C\+\+', 'cpp')] +
-                         [(r'(?u)\A\s*', ''), (r'(?u)\s*\Z', '')])
-        self.assertEqual(settings['AUTHOR_REGEX_SUBSTITUTIONS'],
-                         [(r'Alexander\ Todorov', 'atodorov')] +
-                         default_slug_regex_subs)
+        self.assertEqual(
+            settings.get("SLUG_REGEX_SUBSTITUTIONS"),
+            [(r"C\+\+", "cpp")] + [(r"(?u)\A\s*", ""), (r"(?u)\s*\Z", "")],
+        )
+        self.assertEqual(
+            settings["AUTHOR_REGEX_SUBSTITUTIONS"],
+            [(r"Alexander\ Todorov", "atodorov")] + default_slug_regex_subs,
+        )
 
     def test_deprecated_slug_substitutions_from_file(self):
         # This is equivalent to reading a settings file that has
         # SLUG_SUBSTITUTIONS defined but no SLUG_REGEX_SUBSTITUTIONS.
-        settings = read_settings(None, override={
-            'SLUG_SUBSTITUTIONS': [('C++', 'cpp')]
-        })
-        self.assertEqual(settings['SLUG_REGEX_SUBSTITUTIONS'],
-                         [(r'C\+\+', 'cpp')] +
-                         self.settings['SLUG_REGEX_SUBSTITUTIONS'])
-        self.assertNotIn('SLUG_SUBSTITUTIONS', settings)
+        settings = read_settings(
+            None, override={"SLUG_SUBSTITUTIONS": [("C++", "cpp")]}
+        )
+        self.assertEqual(
+            settings["SLUG_REGEX_SUBSTITUTIONS"],
+            [(r"C\+\+", "cpp")] + self.settings["SLUG_REGEX_SUBSTITUTIONS"],
+        )
+        self.assertNotIn("SLUG_SUBSTITUTIONS", settings)
diff --git a/pelican/tests/test_testsuite.py b/pelican/tests/test_testsuite.py
index fa930139..a9a0c200 100644
--- a/pelican/tests/test_testsuite.py
+++ b/pelican/tests/test_testsuite.py
@@ -4,7 +4,6 @@ from pelican.tests.support import unittest
 
 
 class TestSuiteTest(unittest.TestCase):
-
     def test_error_on_warning(self):
         with self.assertRaises(UserWarning):
-            warnings.warn('test warning')
+            warnings.warn("test warning")
diff --git a/pelican/tests/test_urlwrappers.py b/pelican/tests/test_urlwrappers.py
index 66ae1524..13632e3a 100644
--- a/pelican/tests/test_urlwrappers.py
+++ b/pelican/tests/test_urlwrappers.py
@@ -5,22 +5,22 @@ from pelican.urlwrappers import Author, Category, Tag, URLWrapper
 class TestURLWrapper(unittest.TestCase):
     def test_ordering(self):
         # URLWrappers are sorted by name
-        wrapper_a = URLWrapper(name='first', settings={})
-        wrapper_b = URLWrapper(name='last', settings={})
+        wrapper_a = URLWrapper(name="first", settings={})
+        wrapper_b = URLWrapper(name="last", settings={})
         self.assertFalse(wrapper_a > wrapper_b)
         self.assertFalse(wrapper_a >= wrapper_b)
         self.assertFalse(wrapper_a == wrapper_b)
         self.assertTrue(wrapper_a != wrapper_b)
         self.assertTrue(wrapper_a <= wrapper_b)
         self.assertTrue(wrapper_a < wrapper_b)
-        wrapper_b.name = 'first'
+        wrapper_b.name = "first"
         self.assertFalse(wrapper_a > wrapper_b)
         self.assertTrue(wrapper_a >= wrapper_b)
         self.assertTrue(wrapper_a == wrapper_b)
         self.assertFalse(wrapper_a != wrapper_b)
         self.assertTrue(wrapper_a <= wrapper_b)
         self.assertFalse(wrapper_a < wrapper_b)
-        wrapper_a.name = 'last'
+        wrapper_a.name = "last"
         self.assertTrue(wrapper_a > wrapper_b)
         self.assertTrue(wrapper_a >= wrapper_b)
         self.assertFalse(wrapper_a == wrapper_b)
@@ -29,57 +29,68 @@ class TestURLWrapper(unittest.TestCase):
         self.assertFalse(wrapper_a < wrapper_b)
 
     def test_equality(self):
-        tag = Tag('test', settings={})
-        cat = Category('test', settings={})
-        author = Author('test', settings={})
+        tag = Tag("test", settings={})
+        cat = Category("test", settings={})
+        author = Author("test", settings={})
 
         # same name, but different class
         self.assertNotEqual(tag, cat)
         self.assertNotEqual(tag, author)
 
         # should be equal vs text representing the same name
-        self.assertEqual(tag, 'test')
+        self.assertEqual(tag, "test")
 
         # should not be equal vs binary
-        self.assertNotEqual(tag, b'test')
+        self.assertNotEqual(tag, b"test")
 
         # Tags describing the same should be equal
-        tag_equal = Tag('Test', settings={})
+        tag_equal = Tag("Test", settings={})
         self.assertEqual(tag, tag_equal)
 
         # Author describing the same should be equal
-        author_equal = Author('Test', settings={})
+        author_equal = Author("Test", settings={})
         self.assertEqual(author, author_equal)
 
-        cat_ascii = Category('指導書', settings={})
-        self.assertEqual(cat_ascii, 'zhi dao shu')
+        cat_ascii = Category("指導書", settings={})
+        self.assertEqual(cat_ascii, "zhi dao shu")
 
     def test_slugify_with_substitutions_and_dots(self):
-        tag = Tag('Tag Dot', settings={'TAG_REGEX_SUBSTITUTIONS': [
-            ('Tag Dot', 'tag.dot'),
-        ]})
-        cat = Category('Category Dot',
-                       settings={'CATEGORY_REGEX_SUBSTITUTIONS': [
-                           ('Category Dot', 'cat.dot'),
-                       ]})
+        tag = Tag(
+            "Tag Dot",
+            settings={
+                "TAG_REGEX_SUBSTITUTIONS": [
+                    ("Tag Dot", "tag.dot"),
+                ]
+            },
+        )
+        cat = Category(
+            "Category Dot",
+            settings={
+                "CATEGORY_REGEX_SUBSTITUTIONS": [
+                    ("Category Dot", "cat.dot"),
+                ]
+            },
+        )
 
-        self.assertEqual(tag.slug, 'tag.dot')
-        self.assertEqual(cat.slug, 'cat.dot')
+        self.assertEqual(tag.slug, "tag.dot")
+        self.assertEqual(cat.slug, "cat.dot")
 
     def test_author_slug_substitutions(self):
-        settings = {'AUTHOR_REGEX_SUBSTITUTIONS': [
-            ('Alexander Todorov', 'atodorov'),
-            ('Krasimir Tsonev', 'krasimir'),
-            (r'[^\w\s-]', ''),
-            (r'(?u)\A\s*', ''),
-            (r'(?u)\s*\Z', ''),
-            (r'[-\s]+', '-'),
-        ]}
+        settings = {
+            "AUTHOR_REGEX_SUBSTITUTIONS": [
+                ("Alexander Todorov", "atodorov"),
+                ("Krasimir Tsonev", "krasimir"),
+                (r"[^\w\s-]", ""),
+                (r"(?u)\A\s*", ""),
+                (r"(?u)\s*\Z", ""),
+                (r"[-\s]+", "-"),
+            ]
+        }
 
-        author1 = Author('Mr. Senko', settings=settings)
-        author2 = Author('Alexander Todorov', settings=settings)
-        author3 = Author('Krasimir Tsonev', settings=settings)
+        author1 = Author("Mr. Senko", settings=settings)
+        author2 = Author("Alexander Todorov", settings=settings)
+        author3 = Author("Krasimir Tsonev", settings=settings)
 
-        self.assertEqual(author1.slug, 'mr-senko')
-        self.assertEqual(author2.slug, 'atodorov')
-        self.assertEqual(author3.slug, 'krasimir')
+        self.assertEqual(author1.slug, "mr-senko")
+        self.assertEqual(author2.slug, "atodorov")
+        self.assertEqual(author3.slug, "krasimir")
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 40aff005..22dd8e38 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -14,25 +14,29 @@ except ModuleNotFoundError:
 from pelican import utils
 from pelican.generators import TemplatePagesGenerator
 from pelican.settings import read_settings
-from pelican.tests.support import (LoggedTestCase, get_article,
-                                   locale_available, unittest)
+from pelican.tests.support import (
+    LoggedTestCase,
+    get_article,
+    locale_available,
+    unittest,
+)
 from pelican.writers import Writer
 
 
 class TestUtils(LoggedTestCase):
-    _new_attribute = 'new_value'
+    _new_attribute = "new_value"
 
     def setUp(self):
         super().setUp()
-        self.temp_output = mkdtemp(prefix='pelicantests.')
+        self.temp_output = mkdtemp(prefix="pelicantests.")
 
     def tearDown(self):
         super().tearDown()
         shutil.rmtree(self.temp_output)
 
     @utils.deprecated_attribute(
-        old='_old_attribute', new='_new_attribute',
-        since=(3, 1, 0), remove=(4, 1, 3))
+        old="_old_attribute", new="_new_attribute", since=(3, 1, 0), remove=(4, 1, 3)
+    )
     def _old_attribute():
         return None
 
@@ -41,69 +45,109 @@ class TestUtils(LoggedTestCase):
         self.assertEqual(value, self._new_attribute)
         self.assertLogCountEqual(
             count=1,
-            msg=('_old_attribute has been deprecated since 3.1.0 and will be '
-                 'removed by version 4.1.3.  Use _new_attribute instead'),
-            level=logging.WARNING)
+            msg=(
+                "_old_attribute has been deprecated since 3.1.0 and will be "
+                "removed by version 4.1.3.  Use _new_attribute instead"
+            ),
+            level=logging.WARNING,
+        )
 
     def test_get_date(self):
         # valid ones
         date = utils.SafeDatetime(year=2012, month=11, day=22)
-        date_hour = utils.SafeDatetime(
-            year=2012, month=11, day=22, hour=22, minute=11)
+        date_hour = utils.SafeDatetime(year=2012, month=11, day=22, hour=22, minute=11)
         date_hour_z = utils.SafeDatetime(
-            year=2012, month=11, day=22, hour=22, minute=11,
-            tzinfo=timezone.utc)
+            year=2012, month=11, day=22, hour=22, minute=11, tzinfo=timezone.utc
+        )
         date_hour_est = utils.SafeDatetime(
-            year=2012, month=11, day=22, hour=22, minute=11,
-            tzinfo=ZoneInfo("EST"))
+            year=2012, month=11, day=22, hour=22, minute=11, tzinfo=ZoneInfo("EST")
+        )
         date_hour_sec = utils.SafeDatetime(
-            year=2012, month=11, day=22, hour=22, minute=11, second=10)
+            year=2012, month=11, day=22, hour=22, minute=11, second=10
+        )
         date_hour_sec_z = utils.SafeDatetime(
-            year=2012, month=11, day=22, hour=22, minute=11, second=10,
-            tzinfo=timezone.utc)
+            year=2012,
+            month=11,
+            day=22,
+            hour=22,
+            minute=11,
+            second=10,
+            tzinfo=timezone.utc,
+        )
         date_hour_sec_est = utils.SafeDatetime(
-            year=2012, month=11, day=22, hour=22, minute=11, second=10,
-            tzinfo=ZoneInfo("EST"))
+            year=2012,
+            month=11,
+            day=22,
+            hour=22,
+            minute=11,
+            second=10,
+            tzinfo=ZoneInfo("EST"),
+        )
         date_hour_sec_frac_z = utils.SafeDatetime(
-            year=2012, month=11, day=22, hour=22, minute=11, second=10,
-            microsecond=123000, tzinfo=timezone.utc)
+            year=2012,
+            month=11,
+            day=22,
+            hour=22,
+            minute=11,
+            second=10,
+            microsecond=123000,
+            tzinfo=timezone.utc,
+        )
         dates = {
-            '2012-11-22': date,
-            '2012/11/22': date,
-            '2012-11-22 22:11': date_hour,
-            '2012/11/22 22:11': date_hour,
-            '22-11-2012': date,
-            '22/11/2012': date,
-            '22.11.2012': date,
-            '22.11.2012 22:11': date_hour,
-            '2012-11-22T22:11Z': date_hour_z,
-            '2012-11-22T22:11-0500': date_hour_est,
-            '2012-11-22 22:11:10': date_hour_sec,
-            '2012-11-22T22:11:10Z': date_hour_sec_z,
-            '2012-11-22T22:11:10-0500': date_hour_sec_est,
-            '2012-11-22T22:11:10.123Z': date_hour_sec_frac_z,
+            "2012-11-22": date,
+            "2012/11/22": date,
+            "2012-11-22 22:11": date_hour,
+            "2012/11/22 22:11": date_hour,
+            "22-11-2012": date,
+            "22/11/2012": date,
+            "22.11.2012": date,
+            "22.11.2012 22:11": date_hour,
+            "2012-11-22T22:11Z": date_hour_z,
+            "2012-11-22T22:11-0500": date_hour_est,
+            "2012-11-22 22:11:10": date_hour_sec,
+            "2012-11-22T22:11:10Z": date_hour_sec_z,
+            "2012-11-22T22:11:10-0500": date_hour_sec_est,
+            "2012-11-22T22:11:10.123Z": date_hour_sec_frac_z,
         }
 
         # examples from http://www.w3.org/TR/NOTE-datetime
         iso_8601_date = utils.SafeDatetime(year=1997, month=7, day=16)
         iso_8601_date_hour_tz = utils.SafeDatetime(
-            year=1997, month=7, day=16, hour=19, minute=20,
-            tzinfo=ZoneInfo("Europe/London"))
+            year=1997,
+            month=7,
+            day=16,
+            hour=19,
+            minute=20,
+            tzinfo=ZoneInfo("Europe/London"),
+        )
         iso_8601_date_hour_sec_tz = utils.SafeDatetime(
-            year=1997, month=7, day=16, hour=19, minute=20, second=30,
-            tzinfo=ZoneInfo("Europe/London"))
+            year=1997,
+            month=7,
+            day=16,
+            hour=19,
+            minute=20,
+            second=30,
+            tzinfo=ZoneInfo("Europe/London"),
+        )
         iso_8601_date_hour_sec_ms_tz = utils.SafeDatetime(
-            year=1997, month=7, day=16, hour=19, minute=20, second=30,
-            microsecond=450000, tzinfo=ZoneInfo("Europe/London"))
+            year=1997,
+            month=7,
+            day=16,
+            hour=19,
+            minute=20,
+            second=30,
+            microsecond=450000,
+            tzinfo=ZoneInfo("Europe/London"),
+        )
         iso_8601 = {
-            '1997-07-16': iso_8601_date,
-            '1997-07-16T19:20+01:00': iso_8601_date_hour_tz,
-            '1997-07-16T19:20:30+01:00': iso_8601_date_hour_sec_tz,
-            '1997-07-16T19:20:30.45+01:00': iso_8601_date_hour_sec_ms_tz,
+            "1997-07-16": iso_8601_date,
+            "1997-07-16T19:20+01:00": iso_8601_date_hour_tz,
+            "1997-07-16T19:20:30+01:00": iso_8601_date_hour_sec_tz,
+            "1997-07-16T19:20:30.45+01:00": iso_8601_date_hour_sec_ms_tz,
         }
 
         # invalid ones
-        invalid_dates = ['2010-110-12', 'yay']
+        invalid_dates = ["2010-110-12", "yay"]
 
         for value, expected in dates.items():
             self.assertEqual(utils.get_date(value), expected, value)
@@ -115,219 +159,247 @@ class TestUtils(LoggedTestCase):
             self.assertRaises(ValueError, utils.get_date, item)
 
     def test_slugify(self):
-
-        samples = (('this is a test', 'this-is-a-test'),
-                   ('this        is a test', 'this-is-a-test'),
-                   ('this → is ← a ↑ test', 'this-is-a-test'),
-                   ('this--is---a test', 'this-is-a-test'),
-                   ('unicode測試許功蓋，你看到了嗎？',
-                    'unicodece-shi-xu-gong-gai-ni-kan-dao-liao-ma'),
-                   ('大飯原発４号機、１８日夜起動へ',
-                    'da-fan-yuan-fa-4hao-ji-18ri-ye-qi-dong-he'),)
+        samples = (
+            ("this is a test", "this-is-a-test"),
+            ("this        is a test", "this-is-a-test"),
+            ("this → is ← a ↑ test", "this-is-a-test"),
+            ("this--is---a test", "this-is-a-test"),
+            (
+                "unicode測試許功蓋，你看到了嗎？",
+                "unicodece-shi-xu-gong-gai-ni-kan-dao-liao-ma",
+            ),
+            (
+                "大飯原発４号機、１８日夜起動へ",
+                "da-fan-yuan-fa-4hao-ji-18ri-ye-qi-dong-he",
+            ),
+        )
 
         settings = read_settings()
-        subs = settings['SLUG_REGEX_SUBSTITUTIONS']
+        subs = settings["SLUG_REGEX_SUBSTITUTIONS"]
 
         for value, expected in samples:
             self.assertEqual(utils.slugify(value, regex_subs=subs), expected)
 
-        self.assertEqual(utils.slugify('Cat', regex_subs=subs), 'cat')
+        self.assertEqual(utils.slugify("Cat", regex_subs=subs), "cat")
         self.assertEqual(
-            utils.slugify('Cat', regex_subs=subs, preserve_case=False), 'cat')
+            utils.slugify("Cat", regex_subs=subs, preserve_case=False), "cat"
+        )
         self.assertEqual(
-            utils.slugify('Cat', regex_subs=subs, preserve_case=True), 'Cat')
+            utils.slugify("Cat", regex_subs=subs, preserve_case=True), "Cat"
+        )
 
     def test_slugify_use_unicode(self):
-
         samples = (
-            ('this is a test', 'this-is-a-test'),
-            ('this        is a test', 'this-is-a-test'),
-            ('this → is ← a ↑ test', 'this-is-a-test'),
-            ('this--is---a test', 'this-is-a-test'),
-            ('unicode測試許功蓋，你看到了嗎？', 'unicode測試許功蓋你看到了嗎'),
-            ('Çığ', 'çığ')
+            ("this is a test", "this-is-a-test"),
+            ("this        is a test", "this-is-a-test"),
+            ("this → is ← a ↑ test", "this-is-a-test"),
+            ("this--is---a test", "this-is-a-test"),
+            ("unicode測試許功蓋，你看到了嗎？", "unicode測試許功蓋你看到了嗎"),
+            ("Çığ", "çığ"),
         )
 
         settings = read_settings()
-        subs = settings['SLUG_REGEX_SUBSTITUTIONS']
+        subs = settings["SLUG_REGEX_SUBSTITUTIONS"]
 
         for value, expected in samples:
             self.assertEqual(
-                utils.slugify(value, regex_subs=subs, use_unicode=True),
-                expected)
+                utils.slugify(value, regex_subs=subs, use_unicode=True), expected
+            )
 
         # check with preserve case
         for value, expected in samples:
             self.assertEqual(
-                utils.slugify('Çığ', regex_subs=subs,
-                              preserve_case=True, use_unicode=True),
-                'Çığ')
+                utils.slugify(
+                    "Çığ", regex_subs=subs, preserve_case=True, use_unicode=True
+                ),
+                "Çığ",
+            )
 
         # check normalization
         samples = (
-            ('大飯原発４号機、１８日夜起動へ', '大飯原発4号機18日夜起動へ'),
+            ("大飯原発４号機、１８日夜起動へ", "大飯原発4号機18日夜起動へ"),
             (
-                '\N{LATIN SMALL LETTER C}\N{COMBINING CEDILLA}',
-                '\N{LATIN SMALL LETTER C WITH CEDILLA}'
-            )
+                "\N{LATIN SMALL LETTER C}\N{COMBINING CEDILLA}",
+                "\N{LATIN SMALL LETTER C WITH CEDILLA}",
+            ),
         )
         for value, expected in samples:
             self.assertEqual(
-                utils.slugify(value, regex_subs=subs, use_unicode=True),
-                expected)
+                utils.slugify(value, regex_subs=subs, use_unicode=True), expected
+            )
 
     def test_slugify_substitute(self):
-
-        samples = (('C++ is based on C', 'cpp-is-based-on-c'),
-                   ('C+++ test C+ test', 'cpp-test-c-test'),
-                   ('c++, c#, C#, C++', 'cpp-c-sharp-c-sharp-cpp'),
-                   ('c++-streams', 'cpp-streams'),)
+        samples = (
+            ("C++ is based on C", "cpp-is-based-on-c"),
+            ("C+++ test C+ test", "cpp-test-c-test"),
+            ("c++, c#, C#, C++", "cpp-c-sharp-c-sharp-cpp"),
+            ("c++-streams", "cpp-streams"),
+        )
 
         settings = read_settings()
         subs = [
-            (r'C\+\+', 'CPP'),
-            (r'C#', 'C-SHARP'),
-        ] + settings['SLUG_REGEX_SUBSTITUTIONS']
+            (r"C\+\+", "CPP"),
+            (r"C#", "C-SHARP"),
+        ] + settings["SLUG_REGEX_SUBSTITUTIONS"]
         for value, expected in samples:
             self.assertEqual(utils.slugify(value, regex_subs=subs), expected)
 
     def test_slugify_substitute_and_keeping_non_alphanum(self):
-
-        samples = (('Fedora QA', 'fedora.qa'),
-                   ('C++ is used by Fedora QA', 'cpp is used by fedora.qa'),
-                   ('C++ is based on C', 'cpp is based on c'),
-                   ('C+++ test C+ test', 'cpp+ test c+ test'),)
+        samples = (
+            ("Fedora QA", "fedora.qa"),
+            ("C++ is used by Fedora QA", "cpp is used by fedora.qa"),
+            ("C++ is based on C", "cpp is based on c"),
+            ("C+++ test C+ test", "cpp+ test c+ test"),
+        )
 
         subs = [
-            (r'Fedora QA', 'fedora.qa'),
-            (r'c\+\+', 'cpp'),
+            (r"Fedora QA", "fedora.qa"),
+            (r"c\+\+", "cpp"),
         ]
         for value, expected in samples:
             self.assertEqual(utils.slugify(value, regex_subs=subs), expected)
 
     def test_get_relative_path(self):
-
-        samples = ((os.path.join('test', 'test.html'), os.pardir),
-                   (os.path.join('test', 'test', 'test.html'),
-                    os.path.join(os.pardir, os.pardir)),
-                   ('test.html', os.curdir),
-                   (os.path.join('/test', 'test.html'), os.pardir),
-                   (os.path.join('/test', 'test', 'test.html'),
-                    os.path.join(os.pardir, os.pardir)),
-                   ('/test.html', os.curdir),)
+        samples = (
+            (os.path.join("test", "test.html"), os.pardir),
+            (
+                os.path.join("test", "test", "test.html"),
+                os.path.join(os.pardir, os.pardir),
+            ),
+            ("test.html", os.curdir),
+            (os.path.join("/test", "test.html"), os.pardir),
+            (
+                os.path.join("/test", "test", "test.html"),
+                os.path.join(os.pardir, os.pardir),
+            ),
+            ("/test.html", os.curdir),
+        )
 
         for value, expected in samples:
             self.assertEqual(utils.get_relative_path(value), expected)
 
     def test_truncate_html_words(self):
         # Plain text.
+        self.assertEqual(utils.truncate_html_words("short string", 20), "short string")
         self.assertEqual(
-            utils.truncate_html_words('short string', 20),
-            'short string')
-        self.assertEqual(
-            utils.truncate_html_words('word ' * 100, 20),
-            'word ' * 20 + '…')
+            utils.truncate_html_words("word " * 100, 20), "word " * 20 + "…"
+        )
 
         # Plain text with Unicode content.
         self.assertEqual(
             utils.truncate_html_words(
-                '我愿意这样，朋友——我独自远行，不但没有你，\
-                 并且再没有别的影在黑暗里。', 12
+                "我愿意这样，朋友——我独自远行，不但没有你，\
+                 并且再没有别的影在黑暗里。",
+                12,
             ),
-            '我愿意这样，朋友——我独自远行' + ' …')
+            "我愿意这样，朋友——我独自远行" + " …",
+        )
         self.assertEqual(
             utils.truncate_html_words(
-                'Ты мелькнула, ты предстала, Снова сердце задрожало,', 3
+                "Ты мелькнула, ты предстала, Снова сердце задрожало,", 3
             ),
-            'Ты мелькнула, ты' + ' …')
+            "Ты мелькнула, ты" + " …",
+        )
         self.assertEqual(
-            utils.truncate_html_words(
-                'Trong đầm gì đẹp bằng sen', 4
-            ),
-            'Trong đầm gì đẹp' + ' …')
+            utils.truncate_html_words("Trong đầm gì đẹp bằng sen", 4),
+            "Trong đầm gì đẹp" + " …",
+        )
 
         # Words enclosed or intervaled by HTML tags.
         self.assertEqual(
-            utils.truncate_html_words('<p>' + 'word ' * 100 + '</p>', 20),
-            '<p>' + 'word ' * 20 + '…</p>')
+            utils.truncate_html_words("<p>" + "word " * 100 + "</p>", 20),
+            "<p>" + "word " * 20 + "…</p>",
+        )
         self.assertEqual(
             utils.truncate_html_words(
-                '<span\nstyle="\n…\n">' + 'word ' * 100 + '</span>', 20),
-            '<span\nstyle="\n…\n">' + 'word ' * 20 + '…</span>')
+                '<span\nstyle="\n…\n">' + "word " * 100 + "</span>", 20
+            ),
+            '<span\nstyle="\n…\n">' + "word " * 20 + "…</span>",
+        )
         self.assertEqual(
-            utils.truncate_html_words('<br>' + 'word ' * 100, 20),
-            '<br>' + 'word ' * 20 + '…')
+            utils.truncate_html_words("<br>" + "word " * 100, 20),
+            "<br>" + "word " * 20 + "…",
+        )
         self.assertEqual(
-            utils.truncate_html_words('<!-- comment -->' + 'word ' * 100, 20),
-            '<!-- comment -->' + 'word ' * 20 + '…')
+            utils.truncate_html_words("<!-- comment -->" + "word " * 100, 20),
+            "<!-- comment -->" + "word " * 20 + "…",
+        )
 
         # Words enclosed or intervaled by HTML tags with a custom end
         # marker containing HTML tags.
         self.assertEqual(
-            utils.truncate_html_words('<p>' + 'word ' * 100 + '</p>', 20,
-                                      '<span>marker</span>'),
-            '<p>' + 'word ' * 20 + '<span>marker</span></p>')
+            utils.truncate_html_words(
+                "<p>" + "word " * 100 + "</p>", 20, "<span>marker</span>"
+            ),
+            "<p>" + "word " * 20 + "<span>marker</span></p>",
+        )
         self.assertEqual(
             utils.truncate_html_words(
-                    '<span\nstyle="\n…\n">' + 'word ' * 100 + '</span>', 20,
-                    '<span>marker</span>'),
-            '<span\nstyle="\n…\n">' + 'word ' * 20 + '<span>marker</span></span>')
+                '<span\nstyle="\n…\n">' + "word " * 100 + "</span>",
+                20,
+                "<span>marker</span>",
+            ),
+            '<span\nstyle="\n…\n">' + "word " * 20 + "<span>marker</span></span>",
+        )
         self.assertEqual(
-            utils.truncate_html_words('<br>' + 'word ' * 100, 20,
-                                      '<span>marker</span>'),
-            '<br>' + 'word ' * 20 + '<span>marker</span>')
+            utils.truncate_html_words(
+                "<br>" + "word " * 100, 20, "<span>marker</span>"
+            ),
+            "<br>" + "word " * 20 + "<span>marker</span>",
+        )
         self.assertEqual(
-            utils.truncate_html_words('<!-- comment -->' + 'word ' * 100, 20,
-                                      '<span>marker</span>'),
-            '<!-- comment -->' + 'word ' * 20 + '<span>marker</span>')
+            utils.truncate_html_words(
+                "<!-- comment -->" + "word " * 100, 20, "<span>marker</span>"
+            ),
+            "<!-- comment -->" + "word " * 20 + "<span>marker</span>",
+        )
 
         # Words with hypens and apostrophes.
+        self.assertEqual(utils.truncate_html_words("a-b " * 100, 20), "a-b " * 20 + "…")
         self.assertEqual(
-            utils.truncate_html_words("a-b " * 100, 20),
-            "a-b " * 20 + '…')
-        self.assertEqual(
-            utils.truncate_html_words("it's " * 100, 20),
-            "it's " * 20 + '…')
+            utils.truncate_html_words("it's " * 100, 20), "it's " * 20 + "…"
+        )
 
         # Words with HTML entity references.
         self.assertEqual(
-            utils.truncate_html_words("&eacute; " * 100, 20),
-            "&eacute; " * 20 + '…')
+            utils.truncate_html_words("&eacute; " * 100, 20), "&eacute; " * 20 + "…"
+        )
         self.assertEqual(
             utils.truncate_html_words("caf&eacute; " * 100, 20),
-            "caf&eacute; " * 20 + '…')
+            "caf&eacute; " * 20 + "…",
+        )
         self.assertEqual(
             utils.truncate_html_words("&egrave;lite " * 100, 20),
-            "&egrave;lite " * 20 + '…')
+            "&egrave;lite " * 20 + "…",
+        )
         self.assertEqual(
             utils.truncate_html_words("cafeti&eacute;re " * 100, 20),
-            "cafeti&eacute;re " * 20 + '…')
+            "cafeti&eacute;re " * 20 + "…",
+        )
         self.assertEqual(
-            utils.truncate_html_words("&int;dx " * 100, 20),
-            "&int;dx " * 20 + '…')
+            utils.truncate_html_words("&int;dx " * 100, 20), "&int;dx " * 20 + "…"
+        )
 
         # Words with HTML character references inside and outside
         # the ASCII range.
         self.assertEqual(
-            utils.truncate_html_words("&#xe9; " * 100, 20),
-            "&#xe9; " * 20 + '…')
+            utils.truncate_html_words("&#xe9; " * 100, 20), "&#xe9; " * 20 + "…"
+        )
         self.assertEqual(
-            utils.truncate_html_words("&#x222b;dx " * 100, 20),
-            "&#x222b;dx " * 20 + '…')
+            utils.truncate_html_words("&#x222b;dx " * 100, 20), "&#x222b;dx " * 20 + "…"
+        )
 
         # Words with invalid or broken HTML references.
+        self.assertEqual(utils.truncate_html_words("&invalid;", 20), "&invalid;")
         self.assertEqual(
-            utils.truncate_html_words('&invalid;', 20), '&invalid;')
+            utils.truncate_html_words("&#9999999999;", 20), "&#9999999999;"
+        )
         self.assertEqual(
-            utils.truncate_html_words('&#9999999999;', 20), '&#9999999999;')
-        self.assertEqual(
-            utils.truncate_html_words('&#xfffffffff;', 20), '&#xfffffffff;')
-        self.assertEqual(
-            utils.truncate_html_words('&mdash text', 20), '&mdash text')
-        self.assertEqual(
-            utils.truncate_html_words('&#1234 text', 20), '&#1234 text')
-        self.assertEqual(
-            utils.truncate_html_words('&#xabc text', 20), '&#xabc text')
+            utils.truncate_html_words("&#xfffffffff;", 20), "&#xfffffffff;"
+        )
+        self.assertEqual(utils.truncate_html_words("&mdash text", 20), "&mdash text")
+        self.assertEqual(utils.truncate_html_words("&#1234 text", 20), "&#1234 text")
+        self.assertEqual(utils.truncate_html_words("&#xabc text", 20), "&#xabc text")
 
     def test_process_translations(self):
         fr_articles = []
@@ -335,65 +407,135 @@ class TestUtils(LoggedTestCase):
 
         # create a bunch of articles
         # 0: no translation metadata
-        fr_articles.append(get_article(lang='fr', slug='yay0', title='Titre',
-                                       content='en français'))
-        en_articles.append(get_article(lang='en', slug='yay0', title='Title',
-                                       content='in english'))
+        fr_articles.append(
+            get_article(lang="fr", slug="yay0", title="Titre", content="en français")
+        )
+        en_articles.append(
+            get_article(lang="en", slug="yay0", title="Title", content="in english")
+        )
         # 1: translation metadata on default lang
-        fr_articles.append(get_article(lang='fr', slug='yay1', title='Titre',
-                                       content='en français'))
-        en_articles.append(get_article(lang='en', slug='yay1', title='Title',
-                                       content='in english',
-                                       translation='true'))
+        fr_articles.append(
+            get_article(lang="fr", slug="yay1", title="Titre", content="en français")
+        )
+        en_articles.append(
+            get_article(
+                lang="en",
+                slug="yay1",
+                title="Title",
+                content="in english",
+                translation="true",
+            )
+        )
         # 2: translation metadata not on default lang
-        fr_articles.append(get_article(lang='fr', slug='yay2', title='Titre',
-                                       content='en français',
-                                       translation='true'))
-        en_articles.append(get_article(lang='en', slug='yay2', title='Title',
-                                       content='in english'))
+        fr_articles.append(
+            get_article(
+                lang="fr",
+                slug="yay2",
+                title="Titre",
+                content="en français",
+                translation="true",
+            )
+        )
+        en_articles.append(
+            get_article(lang="en", slug="yay2", title="Title", content="in english")
+        )
         # 3: back to default language detection if all items have the
         #    translation metadata
-        fr_articles.append(get_article(lang='fr', slug='yay3', title='Titre',
-                                       content='en français',
-                                       translation='yep'))
-        en_articles.append(get_article(lang='en', slug='yay3', title='Title',
-                                       content='in english',
-                                       translation='yes'))
+        fr_articles.append(
+            get_article(
+                lang="fr",
+                slug="yay3",
+                title="Titre",
+                content="en français",
+                translation="yep",
+            )
+        )
+        en_articles.append(
+            get_article(
+                lang="en",
+                slug="yay3",
+                title="Title",
+                content="in english",
+                translation="yes",
+            )
+        )
         # 4-5: translation pairs with the same slug but different category
-        fr_articles.append(get_article(lang='fr', slug='yay4', title='Titre',
-                                       content='en français', category='foo'))
-        en_articles.append(get_article(lang='en', slug='yay4', title='Title',
-                                       content='in english', category='foo'))
-        fr_articles.append(get_article(lang='fr', slug='yay4', title='Titre',
-                                       content='en français', category='bar'))
-        en_articles.append(get_article(lang='en', slug='yay4', title='Title',
-                                       content='in english', category='bar'))
+        fr_articles.append(
+            get_article(
+                lang="fr",
+                slug="yay4",
+                title="Titre",
+                content="en français",
+                category="foo",
+            )
+        )
+        en_articles.append(
+            get_article(
+                lang="en",
+                slug="yay4",
+                title="Title",
+                content="in english",
+                category="foo",
+            )
+        )
+        fr_articles.append(
+            get_article(
+                lang="fr",
+                slug="yay4",
+                title="Titre",
+                content="en français",
+                category="bar",
+            )
+        )
+        en_articles.append(
+            get_article(
+                lang="en",
+                slug="yay4",
+                title="Title",
+                content="in english",
+                category="bar",
+            )
+        )
 
         # try adding articles in both orders
-        for lang0_articles, lang1_articles in ((fr_articles, en_articles),
-                                               (en_articles, fr_articles)):
+        for lang0_articles, lang1_articles in (
+            (fr_articles, en_articles),
+            (en_articles, fr_articles),
+        ):
             articles = lang0_articles + lang1_articles
 
             # test process_translations with falsy translation_id
-            index, trans = utils.process_translations(
-                articles, translation_id=None)
+            index, trans = utils.process_translations(articles, translation_id=None)
             for i in range(6):
                 for lang_articles in [en_articles, fr_articles]:
                     self.assertIn(lang_articles[i], index)
                     self.assertNotIn(lang_articles[i], trans)
 
             # test process_translations with simple and complex translation_id
-            for translation_id in ['slug', {'slug', 'category'}]:
+            for translation_id in ["slug", {"slug", "category"}]:
                 index, trans = utils.process_translations(
-                    articles, translation_id=translation_id)
+                    articles, translation_id=translation_id
+                )
 
-                for a in [en_articles[0], fr_articles[1], en_articles[2],
-                          en_articles[3], en_articles[4], en_articles[5]]:
+                for a in [
+                    en_articles[0],
+                    fr_articles[1],
+                    en_articles[2],
+                    en_articles[3],
+                    en_articles[4],
+                    en_articles[5],
+                ]:
                     self.assertIn(a, index)
                     self.assertNotIn(a, trans)
 
-                for a in [fr_articles[0], en_articles[1], fr_articles[2],
-                          fr_articles[3], fr_articles[4], fr_articles[5]]:
+                for a in [
+                    fr_articles[0],
+                    en_articles[1],
+                    fr_articles[2],
+                    fr_articles[3],
+                    fr_articles[4],
+                    fr_articles[5],
+                ]:
                     self.assertIn(a, trans)
                     self.assertNotIn(a, index)
 
@@ -403,18 +545,17 @@ class TestUtils(LoggedTestCase):
 
                 for a_arts in [en_articles, fr_articles]:
                     for b_arts in [en_articles, fr_articles]:
-                        if translation_id == 'slug':
+                        if translation_id == "slug":
                             self.assertIn(a_arts[4], b_arts[5].translations)
                             self.assertIn(a_arts[5], b_arts[4].translations)
-                        elif translation_id == {'slug', 'category'}:
+                        elif translation_id == {"slug", "category"}:
                             self.assertNotIn(a_arts[4], b_arts[5].translations)
                             self.assertNotIn(a_arts[5], b_arts[4].translations)
 
     def test_clean_output_dir(self):
         retention = ()
-        test_directory = os.path.join(self.temp_output,
-                                      'clean_output')
-        content = os.path.join(os.path.dirname(__file__), 'content')
+        test_directory = os.path.join(self.temp_output, "clean_output")
+        content = os.path.join(os.path.dirname(__file__), "content")
         shutil.copytree(content, test_directory)
         utils.clean_output_dir(test_directory, retention)
         self.assertTrue(os.path.isdir(test_directory))
@@ -423,17 +564,15 @@ class TestUtils(LoggedTestCase):
 
     def test_clean_output_dir_not_there(self):
         retention = ()
-        test_directory = os.path.join(self.temp_output,
-                                      'does_not_exist')
+        test_directory = os.path.join(self.temp_output, "does_not_exist")
         utils.clean_output_dir(test_directory, retention)
         self.assertFalse(os.path.exists(test_directory))
 
     def test_clean_output_dir_is_file(self):
         retention = ()
-        test_directory = os.path.join(self.temp_output,
-                                      'this_is_a_file')
-        f = open(test_directory, 'w')
-        f.write('')
+        test_directory = os.path.join(self.temp_output, "this_is_a_file")
+        f = open(test_directory, "w")
+        f.write("")
         f.close()
         utils.clean_output_dir(test_directory, retention)
         self.assertFalse(os.path.exists(test_directory))
@@ -442,223 +581,230 @@ class TestUtils(LoggedTestCase):
         d = utils.SafeDatetime(2012, 8, 29)
 
         # simple formatting
-        self.assertEqual(utils.strftime(d, '%d/%m/%y'), '29/08/12')
-        self.assertEqual(utils.strftime(d, '%d/%m/%Y'), '29/08/2012')
+        self.assertEqual(utils.strftime(d, "%d/%m/%y"), "29/08/12")
+        self.assertEqual(utils.strftime(d, "%d/%m/%Y"), "29/08/2012")
 
         # RFC 3339
         self.assertEqual(
-            utils.strftime(d, '%Y-%m-%dT%H:%M:%SZ'),
-            '2012-08-29T00:00:00Z')
+            utils.strftime(d, "%Y-%m-%dT%H:%M:%SZ"), "2012-08-29T00:00:00Z"
+        )
 
         # % escaped
-        self.assertEqual(utils.strftime(d, '%d%%%m%%%y'), '29%08%12')
-        self.assertEqual(utils.strftime(d, '%d %% %m %% %y'), '29 % 08 % 12')
+        self.assertEqual(utils.strftime(d, "%d%%%m%%%y"), "29%08%12")
+        self.assertEqual(utils.strftime(d, "%d %% %m %% %y"), "29 % 08 % 12")
         # not valid % formatter
-        self.assertEqual(utils.strftime(d, '10% reduction in %Y'),
-                         '10% reduction in 2012')
-        self.assertEqual(utils.strftime(d, '%10 reduction in %Y'),
-                         '%10 reduction in 2012')
+        self.assertEqual(
+            utils.strftime(d, "10% reduction in %Y"), "10% reduction in 2012"
+        )
+        self.assertEqual(
+            utils.strftime(d, "%10 reduction in %Y"), "%10 reduction in 2012"
+        )
 
         # with text
-        self.assertEqual(utils.strftime(d, 'Published in %d-%m-%Y'),
-                         'Published in 29-08-2012')
+        self.assertEqual(
+            utils.strftime(d, "Published in %d-%m-%Y"), "Published in 29-08-2012"
+        )
 
         # with non-ascii text
         self.assertEqual(
-            utils.strftime(d, '%d/%m/%Y Øl trinken beim Besäufnis'),
-            '29/08/2012 Øl trinken beim Besäufnis')
+            utils.strftime(d, "%d/%m/%Y Øl trinken beim Besäufnis"),
+            "29/08/2012 Øl trinken beim Besäufnis",
+        )
 
         # alternative formatting options
-        self.assertEqual(utils.strftime(d, '%-d/%-m/%y'), '29/8/12')
-        self.assertEqual(utils.strftime(d, '%-H:%-M:%-S'), '0:0:0')
+        self.assertEqual(utils.strftime(d, "%-d/%-m/%y"), "29/8/12")
+        self.assertEqual(utils.strftime(d, "%-H:%-M:%-S"), "0:0:0")
 
         d = utils.SafeDatetime(2012, 8, 9)
-        self.assertEqual(utils.strftime(d, '%-d/%-m/%y'), '9/8/12')
+        self.assertEqual(utils.strftime(d, "%-d/%-m/%y"), "9/8/12")
 
         d = utils.SafeDatetime(2021, 1, 8)
-        self.assertEqual(utils.strftime(d, '%G - %-V - %u'), '2021 - 1 - 5')
+        self.assertEqual(utils.strftime(d, "%G - %-V - %u"), "2021 - 1 - 5")
 
     # test the output of utils.strftime in a different locale
     # Turkish locale
-    @unittest.skipUnless(locale_available('tr_TR.UTF-8') or
-                         locale_available('Turkish'),
-                         'Turkish locale needed')
+    @unittest.skipUnless(
+        locale_available("tr_TR.UTF-8") or locale_available("Turkish"),
+        "Turkish locale needed",
+    )
     def test_strftime_locale_dependent_turkish(self):
-        temp_locale = 'Turkish' if platform == 'win32' else 'tr_TR.UTF-8'
+        temp_locale = "Turkish" if platform == "win32" else "tr_TR.UTF-8"
 
         with utils.temporary_locale(temp_locale):
             d = utils.SafeDatetime(2012, 8, 29)
 
             # simple
-            self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 Ağustos 2012')
-            self.assertEqual(utils.strftime(d, '%A, %d %B %Y'),
-                             'Çarşamba, 29 Ağustos 2012')
+            self.assertEqual(utils.strftime(d, "%d %B %Y"), "29 Ağustos 2012")
+            self.assertEqual(
+                utils.strftime(d, "%A, %d %B %Y"), "Çarşamba, 29 Ağustos 2012"
+            )
 
             # with text
             self.assertEqual(
-                utils.strftime(d, 'Yayınlanma tarihi: %A, %d %B %Y'),
-                'Yayınlanma tarihi: Çarşamba, 29 Ağustos 2012')
+                utils.strftime(d, "Yayınlanma tarihi: %A, %d %B %Y"),
+                "Yayınlanma tarihi: Çarşamba, 29 Ağustos 2012",
+            )
 
             # non-ascii format candidate (someone might pass it… for some reason)
             self.assertEqual(
-                utils.strftime(d, '%Y yılında %üretim artışı'),
-                '2012 yılında %üretim artışı')
+                utils.strftime(d, "%Y yılında %üretim artışı"),
+                "2012 yılında %üretim artışı",
+            )
 
     # test the output of utils.strftime in a different locale
     # French locale
-    @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
-                         locale_available('French'),
-                         'French locale needed')
+    @unittest.skipUnless(
+        locale_available("fr_FR.UTF-8") or locale_available("French"),
+        "French locale needed",
+    )
     def test_strftime_locale_dependent_french(self):
-        temp_locale = 'French' if platform == 'win32' else 'fr_FR.UTF-8'
+        temp_locale = "French" if platform == "win32" else "fr_FR.UTF-8"
 
         with utils.temporary_locale(temp_locale):
             d = utils.SafeDatetime(2012, 8, 29)
 
             # simple
-            self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 août 2012')
+            self.assertEqual(utils.strftime(d, "%d %B %Y"), "29 août 2012")
 
             # depending on OS, the first letter is m or M
-            self.assertTrue(utils.strftime(d, '%A') in ('mercredi', 'Mercredi'))
+            self.assertTrue(utils.strftime(d, "%A") in ("mercredi", "Mercredi"))
 
             # with text
             self.assertEqual(
-                utils.strftime(d, 'Écrit le %d %B %Y'),
-                'Écrit le 29 août 2012')
+                utils.strftime(d, "Écrit le %d %B %Y"), "Écrit le 29 août 2012"
+            )
 
             # non-ascii format candidate (someone might pass it… for some reason)
-            self.assertEqual(
-                utils.strftime(d, '%écrits en %Y'),
-                '%écrits en 2012')
+            self.assertEqual(utils.strftime(d, "%écrits en %Y"), "%écrits en 2012")
 
     def test_maybe_pluralize(self):
-        self.assertEqual(
-            utils.maybe_pluralize(0, 'Article', 'Articles'),
-            '0 Articles')
-        self.assertEqual(
-            utils.maybe_pluralize(1, 'Article', 'Articles'),
-            '1 Article')
-        self.assertEqual(
-            utils.maybe_pluralize(2, 'Article', 'Articles'),
-            '2 Articles')
+        self.assertEqual(utils.maybe_pluralize(0, "Article", "Articles"), "0 Articles")
+        self.assertEqual(utils.maybe_pluralize(1, "Article", "Articles"), "1 Article")
+        self.assertEqual(utils.maybe_pluralize(2, "Article", "Articles"), "2 Articles")
 
     def test_temporary_locale(self):
         # test with default LC category
         orig_locale = locale.setlocale(locale.LC_ALL)
 
-        with utils.temporary_locale('C'):
-            self.assertEqual(locale.setlocale(locale.LC_ALL), 'C')
+        with utils.temporary_locale("C"):
+            self.assertEqual(locale.setlocale(locale.LC_ALL), "C")
 
         self.assertEqual(locale.setlocale(locale.LC_ALL), orig_locale)
 
         # test with custom LC category
         orig_locale = locale.setlocale(locale.LC_TIME)
 
-        with utils.temporary_locale('C', locale.LC_TIME):
-            self.assertEqual(locale.setlocale(locale.LC_TIME), 'C')
+        with utils.temporary_locale("C", locale.LC_TIME):
+            self.assertEqual(locale.setlocale(locale.LC_TIME), "C")
 
         self.assertEqual(locale.setlocale(locale.LC_TIME), orig_locale)
 
 
 class TestCopy(unittest.TestCase):
-    '''Tests the copy utility'''
+    """Tests the copy utility"""
 
     def setUp(self):
-        self.root_dir = mkdtemp(prefix='pelicantests.')
+        self.root_dir = mkdtemp(prefix="pelicantests.")
         self.old_locale = locale.setlocale(locale.LC_ALL)
-        locale.setlocale(locale.LC_ALL, 'C')
+        locale.setlocale(locale.LC_ALL, "C")
 
     def tearDown(self):
         shutil.rmtree(self.root_dir)
         locale.setlocale(locale.LC_ALL, self.old_locale)
 
     def _create_file(self, *path):
-        with open(os.path.join(self.root_dir, *path), 'w') as f:
-            f.write('42\n')
+        with open(os.path.join(self.root_dir, *path), "w") as f:
+            f.write("42\n")
 
     def _create_dir(self, *path):
         os.makedirs(os.path.join(self.root_dir, *path))
 
     def _exist_file(self, *path):
         path = os.path.join(self.root_dir, *path)
-        self.assertTrue(os.path.isfile(path), 'File does not exist: %s' % path)
+        self.assertTrue(os.path.isfile(path), "File does not exist: %s" % path)
 
     def _exist_dir(self, *path):
         path = os.path.join(self.root_dir, *path)
-        self.assertTrue(os.path.exists(path),
-                        'Directory does not exist: %s' % path)
+        self.assertTrue(os.path.exists(path), "Directory does not exist: %s" % path)
 
     def test_copy_file_same_path(self):
-        self._create_file('a.txt')
-        utils.copy(os.path.join(self.root_dir, 'a.txt'),
-                   os.path.join(self.root_dir, 'b.txt'))
-        self._exist_file('b.txt')
+        self._create_file("a.txt")
+        utils.copy(
+            os.path.join(self.root_dir, "a.txt"), os.path.join(self.root_dir, "b.txt")
+        )
+        self._exist_file("b.txt")
 
     def test_copy_file_different_path(self):
-        self._create_dir('a')
-        self._create_dir('b')
-        self._create_file('a', 'a.txt')
-        utils.copy(os.path.join(self.root_dir, 'a', 'a.txt'),
-                   os.path.join(self.root_dir, 'b', 'b.txt'))
-        self._exist_dir('b')
-        self._exist_file('b', 'b.txt')
+        self._create_dir("a")
+        self._create_dir("b")
+        self._create_file("a", "a.txt")
+        utils.copy(
+            os.path.join(self.root_dir, "a", "a.txt"),
+            os.path.join(self.root_dir, "b", "b.txt"),
+        )
+        self._exist_dir("b")
+        self._exist_file("b", "b.txt")
 
     def test_copy_file_create_dirs(self):
-        self._create_file('a.txt')
+        self._create_file("a.txt")
         utils.copy(
-            os.path.join(self.root_dir, 'a.txt'),
-            os.path.join(self.root_dir, 'b0', 'b1', 'b2', 'b3', 'b.txt'))
-        self._exist_dir('b0')
-        self._exist_dir('b0', 'b1')
-        self._exist_dir('b0', 'b1', 'b2')
-        self._exist_dir('b0', 'b1', 'b2', 'b3')
-        self._exist_file('b0', 'b1', 'b2', 'b3', 'b.txt')
+            os.path.join(self.root_dir, "a.txt"),
+            os.path.join(self.root_dir, "b0", "b1", "b2", "b3", "b.txt"),
+        )
+        self._exist_dir("b0")
+        self._exist_dir("b0", "b1")
+        self._exist_dir("b0", "b1", "b2")
+        self._exist_dir("b0", "b1", "b2", "b3")
+        self._exist_file("b0", "b1", "b2", "b3", "b.txt")
 
     def test_copy_dir_same_path(self):
-        self._create_dir('a')
-        self._create_file('a', 'a.txt')
-        utils.copy(os.path.join(self.root_dir, 'a'),
-                   os.path.join(self.root_dir, 'b'))
-        self._exist_dir('b')
-        self._exist_file('b', 'a.txt')
+        self._create_dir("a")
+        self._create_file("a", "a.txt")
+        utils.copy(os.path.join(self.root_dir, "a"), os.path.join(self.root_dir, "b"))
+        self._exist_dir("b")
+        self._exist_file("b", "a.txt")
 
     def test_copy_dir_different_path(self):
-        self._create_dir('a0')
-        self._create_dir('a0', 'a1')
-        self._create_file('a0', 'a1', 'a.txt')
-        self._create_dir('b0')
-        utils.copy(os.path.join(self.root_dir, 'a0', 'a1'),
-                   os.path.join(self.root_dir, 'b0', 'b1'))
-        self._exist_dir('b0', 'b1')
-        self._exist_file('b0', 'b1', 'a.txt')
+        self._create_dir("a0")
+        self._create_dir("a0", "a1")
+        self._create_file("a0", "a1", "a.txt")
+        self._create_dir("b0")
+        utils.copy(
+            os.path.join(self.root_dir, "a0", "a1"),
+            os.path.join(self.root_dir, "b0", "b1"),
+        )
+        self._exist_dir("b0", "b1")
+        self._exist_file("b0", "b1", "a.txt")
 
     def test_copy_dir_create_dirs(self):
-        self._create_dir('a')
-        self._create_file('a', 'a.txt')
-        utils.copy(os.path.join(self.root_dir, 'a'),
-                   os.path.join(self.root_dir, 'b0', 'b1', 'b2', 'b3', 'b'))
-        self._exist_dir('b0')
-        self._exist_dir('b0', 'b1')
-        self._exist_dir('b0', 'b1', 'b2')
-        self._exist_dir('b0', 'b1', 'b2', 'b3')
-        self._exist_dir('b0', 'b1', 'b2', 'b3', 'b')
-        self._exist_file('b0', 'b1', 'b2', 'b3', 'b', 'a.txt')
+        self._create_dir("a")
+        self._create_file("a", "a.txt")
+        utils.copy(
+            os.path.join(self.root_dir, "a"),
+            os.path.join(self.root_dir, "b0", "b1", "b2", "b3", "b"),
+        )
+        self._exist_dir("b0")
+        self._exist_dir("b0", "b1")
+        self._exist_dir("b0", "b1", "b2")
+        self._exist_dir("b0", "b1", "b2", "b3")
+        self._exist_dir("b0", "b1", "b2", "b3", "b")
+        self._exist_file("b0", "b1", "b2", "b3", "b", "a.txt")
 
 
 class TestDateFormatter(unittest.TestCase):
-    '''Tests that the output of DateFormatter jinja filter is same as
-    utils.strftime'''
+    """Tests that the output of DateFormatter jinja filter is same as
+    utils.strftime"""
 
     def setUp(self):
         # prepare a temp content and output folder
-        self.temp_content = mkdtemp(prefix='pelicantests.')
-        self.temp_output = mkdtemp(prefix='pelicantests.')
+        self.temp_content = mkdtemp(prefix="pelicantests.")
+        self.temp_output = mkdtemp(prefix="pelicantests.")
 
         # prepare a template file
-        template_dir = os.path.join(self.temp_content, 'template')
-        template_path = os.path.join(template_dir, 'source.html')
+        template_dir = os.path.join(self.temp_content, "template")
+        template_path = os.path.join(template_dir, "source.html")
         os.makedirs(template_dir)
-        with open(template_path, 'w') as template_file:
+        with open(template_path, "w") as template_file:
             template_file.write('date = {{ date|strftime("%A, %d %B %Y") }}')
         self.date = utils.SafeDatetime(2012, 8, 29)
 
@@ -666,136 +812,128 @@ class TestDateFormatter(unittest.TestCase):
         shutil.rmtree(self.temp_content)
         shutil.rmtree(self.temp_output)
         # reset locale to default
-        locale.setlocale(locale.LC_ALL, '')
+        locale.setlocale(locale.LC_ALL, "")
 
-    @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
-                         locale_available('French'),
-                         'French locale needed')
+    @unittest.skipUnless(
+        locale_available("fr_FR.UTF-8") or locale_available("French"),
+        "French locale needed",
+    )
     def test_french_strftime(self):
         # This test tries to reproduce an issue that
         # occurred with python3.3 under macos10 only
-        temp_locale = 'French' if platform == 'win32' else 'fr_FR.UTF-8'
+        temp_locale = "French" if platform == "win32" else "fr_FR.UTF-8"
 
         with utils.temporary_locale(temp_locale):
             date = utils.SafeDatetime(2014, 8, 14)
             # we compare the lower() dates since macos10 returns
             # "Jeudi" for %A whereas linux reports "jeudi"
             self.assertEqual(
-                'jeudi, 14 août 2014',
-                utils.strftime(date, date_format="%A, %d %B %Y").lower())
+                "jeudi, 14 août 2014",
+                utils.strftime(date, date_format="%A, %d %B %Y").lower(),
+            )
             df = utils.DateFormatter()
             self.assertEqual(
-                'jeudi, 14 août 2014',
-                df(date, date_format="%A, %d %B %Y").lower())
+                "jeudi, 14 août 2014", df(date, date_format="%A, %d %B %Y").lower()
+            )
 
         # Let us now set the global locale to C:
-        with utils.temporary_locale('C'):
+        with utils.temporary_locale("C"):
             # DateFormatter should still work as expected
             # since it is the whole point of DateFormatter
             # (This is where pre-2014/4/15 code fails on macos10)
             df_date = df(date, date_format="%A, %d %B %Y").lower()
-            self.assertEqual('jeudi, 14 août 2014', df_date)
+            self.assertEqual("jeudi, 14 août 2014", df_date)
 
-    @unittest.skipUnless(locale_available('fr_FR.UTF-8') or
-                         locale_available('French'),
-                         'French locale needed')
+    @unittest.skipUnless(
+        locale_available("fr_FR.UTF-8") or locale_available("French"),
+        "French locale needed",
+    )
     def test_french_locale(self):
-        if platform == 'win32':
-            locale_string = 'French'
+        if platform == "win32":
+            locale_string = "French"
         else:
-            locale_string = 'fr_FR.UTF-8'
+            locale_string = "fr_FR.UTF-8"
         settings = read_settings(
             override={
-                'LOCALE': locale_string,
-                'TEMPLATE_PAGES': {
-                    'template/source.html': 'generated/file.html'
-                }
-            })
+                "LOCALE": locale_string,
+                "TEMPLATE_PAGES": {"template/source.html": "generated/file.html"},
+            }
+        )
 
         generator = TemplatePagesGenerator(
-            {'date': self.date}, settings,
-            self.temp_content, '', self.temp_output)
-        generator.env.filters.update({'strftime': utils.DateFormatter()})
+            {"date": self.date}, settings, self.temp_content, "", self.temp_output
+        )
+        generator.env.filters.update({"strftime": utils.DateFormatter()})
 
         writer = Writer(self.temp_output, settings=settings)
         generator.generate_output(writer)
 
-        output_path = os.path.join(
-            self.temp_output, 'generated', 'file.html')
+        output_path = os.path.join(self.temp_output, "generated", "file.html")
 
         # output file has been generated
         self.assertTrue(os.path.exists(output_path))
 
         # output content is correct
         with utils.pelican_open(output_path) as output_file:
-            self.assertEqual(output_file,
-                             utils.strftime(self.date, 'date = %A, %d %B %Y'))
+            self.assertEqual(
+                output_file, utils.strftime(self.date, "date = %A, %d %B %Y")
+            )
 
-    @unittest.skipUnless(locale_available('tr_TR.UTF-8') or
-                         locale_available('Turkish'),
-                         'Turkish locale needed')
+    @unittest.skipUnless(
+        locale_available("tr_TR.UTF-8") or locale_available("Turkish"),
+        "Turkish locale needed",
+    )
     def test_turkish_locale(self):
-        if platform == 'win32':
-            locale_string = 'Turkish'
+        if platform == "win32":
+            locale_string = "Turkish"
         else:
-            locale_string = 'tr_TR.UTF-8'
+            locale_string = "tr_TR.UTF-8"
         settings = read_settings(
             override={
-                'LOCALE': locale_string,
-                'TEMPLATE_PAGES': {
-                    'template/source.html': 'generated/file.html'
-                }
-            })
+                "LOCALE": locale_string,
+                "TEMPLATE_PAGES": {"template/source.html": "generated/file.html"},
+            }
+        )
 
         generator = TemplatePagesGenerator(
-            {'date': self.date}, settings,
-            self.temp_content, '', self.temp_output)
-        generator.env.filters.update({'strftime': utils.DateFormatter()})
+            {"date": self.date}, settings, self.temp_content, "", self.temp_output
+        )
+        generator.env.filters.update({"strftime": utils.DateFormatter()})
 
         writer = Writer(self.temp_output, settings=settings)
         generator.generate_output(writer)
 
-        output_path = os.path.join(
-            self.temp_output, 'generated', 'file.html')
+        output_path = os.path.join(self.temp_output, "generated", "file.html")
 
         # output file has been generated
         self.assertTrue(os.path.exists(output_path))
 
         # output content is correct
         with utils.pelican_open(output_path) as output_file:
-            self.assertEqual(output_file,
-                             utils.strftime(self.date, 'date = %A, %d %B %Y'))
+            self.assertEqual(
+                output_file, utils.strftime(self.date, "date = %A, %d %B %Y")
+            )
 
 
 class TestSanitisedJoin(unittest.TestCase):
     def test_detect_parent_breakout(self):
         with self.assertRaisesRegex(
-                RuntimeError,
-                "Attempted to break out of output directory to "
-                "(.*?:)?/foo/test"):  # (.*?:)? accounts for Windows root
-            utils.sanitised_join(
-                "/foo/bar",
-                "../test"
-            )
+            RuntimeError,
+            "Attempted to break out of output directory to " "(.*?:)?/foo/test",
+        ):  # (.*?:)? accounts for Windows root
+            utils.sanitised_join("/foo/bar", "../test")
 
     def test_detect_root_breakout(self):
         with self.assertRaisesRegex(
-                RuntimeError,
-                "Attempted to break out of output directory to "
-                "(.*?:)?/test"):  # (.*?:)? accounts for Windows root
-            utils.sanitised_join(
-                "/foo/bar",
-                "/test"
-            )
+            RuntimeError,
+            "Attempted to break out of output directory to " "(.*?:)?/test",
+        ):  # (.*?:)? accounts for Windows root
+            utils.sanitised_join("/foo/bar", "/test")
 
     def test_pass_deep_subpaths(self):
         self.assertEqual(
-            utils.sanitised_join(
-                "/foo/bar",
-                "test"
-            ),
-            utils.posixize_path(
-                os.path.abspath(os.path.join("/foo/bar", "test")))
+            utils.sanitised_join("/foo/bar", "test"),
+            utils.posixize_path(os.path.abspath(os.path.join("/foo/bar", "test"))),
         )
 
 
@@ -812,7 +950,7 @@ class TestMemoized(unittest.TestCase):
         container = Container()
 
         with unittest.mock.patch.object(
-                container, "_get", side_effect=lambda x: x
+            container, "_get", side_effect=lambda x: x
         ) as get_mock:
             self.assertEqual("foo", container.get("foo"))
             get_mock.assert_called_once_with("foo")
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 95e196ba..27102f38 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -47,74 +47,69 @@ def decode_wp_content(content, br=True):
             pre_index += 1
         content = content + last_pre
 
-    content = re.sub(r'<br />\s*<br />', "\n\n", content)
-    allblocks = ('(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|'
-                 'td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|'
-                 'map|area|blockquote|address|math|style|p|h[1-6]|hr|'
-                 'fieldset|noscript|samp|legend|section|article|aside|'
-                 'hgroup|header|footer|nav|figure|figcaption|details|'
-                 'menu|summary)')
-    content = re.sub(r'(<' + allblocks + r'[^>]*>)', "\n\\1", content)
-    content = re.sub(r'(</' + allblocks + r'>)', "\\1\n\n", content)
+    content = re.sub(r"<br />\s*<br />", "\n\n", content)
+    allblocks = (
+        "(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|"
+        "td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|"
+        "map|area|blockquote|address|math|style|p|h[1-6]|hr|"
+        "fieldset|noscript|samp|legend|section|article|aside|"
+        "hgroup|header|footer|nav|figure|figcaption|details|"
+        "menu|summary)"
+    )
+    content = re.sub(r"(<" + allblocks + r"[^>]*>)", "\n\\1", content)
+    content = re.sub(r"(</" + allblocks + r">)", "\\1\n\n", content)
     #    content = content.replace("\r\n", "\n")
     if "<object" in content:
         # no <p> inside object/embed
-        content = re.sub(r'\s*<param([^>]*)>\s*', "<param\\1>", content)
-        content = re.sub(r'\s*</embed>\s*', '</embed>', content)
+        content = re.sub(r"\s*<param([^>]*)>\s*", "<param\\1>", content)
+        content = re.sub(r"\s*</embed>\s*", "</embed>", content)
         #    content = re.sub(r'/\n\n+/', '\n\n', content)
-    pgraphs = filter(lambda s: s != "", re.split(r'\n\s*\n', content))
+    pgraphs = filter(lambda s: s != "", re.split(r"\n\s*\n", content))
     content = ""
     for p in pgraphs:
         content = content + "<p>" + p.strip() + "</p>\n"
     # under certain strange conditions it could create
     # a P of entirely whitespace
-    content = re.sub(r'<p>\s*</p>', '', content)
-    content = re.sub(
-        r'<p>([^<]+)</(div|address|form)>',
-        "<p>\\1</p></\\2>",
-        content)
+    content = re.sub(r"<p>\s*</p>", "", content)
+    content = re.sub(r"<p>([^<]+)</(div|address|form)>", "<p>\\1</p></\\2>", content)
     # don't wrap tags
-    content = re.sub(
-        r'<p>\s*(</?' + allblocks + r'[^>]*>)\s*</p>',
-        "\\1",
-        content)
+    content = re.sub(r"<p>\s*(</?" + allblocks + r"[^>]*>)\s*</p>", "\\1", content)
     # problem with nested lists
-    content = re.sub(r'<p>(<li.*)</p>', "\\1", content)
-    content = re.sub(r'<p><blockquote([^>]*)>', "<blockquote\\1><p>", content)
-    content = content.replace('</blockquote></p>', '</p></blockquote>')
-    content = re.sub(r'<p>\s*(</?' + allblocks + '[^>]*>)', "\\1", content)
-    content = re.sub(r'(</?' + allblocks + r'[^>]*>)\s*</p>', "\\1", content)
+    content = re.sub(r"<p>(<li.*)</p>", "\\1", content)
+    content = re.sub(r"<p><blockquote([^>]*)>", "<blockquote\\1><p>", content)
+    content = content.replace("</blockquote></p>", "</p></blockquote>")
+    content = re.sub(r"<p>\s*(</?" + allblocks + "[^>]*>)", "\\1", content)
+    content = re.sub(r"(</?" + allblocks + r"[^>]*>)\s*</p>", "\\1", content)
     if br:
+
         def _preserve_newline(match):
             return match.group(0).replace("\n", "<WPPreserveNewline />")
-        content = re.sub(
-            r'/<(script|style).*?<\/\\1>/s',
-            _preserve_newline,
-            content)
+
+        content = re.sub(r"/<(script|style).*?<\/\\1>/s", _preserve_newline, content)
         # optionally make line breaks
-        content = re.sub(r'(?<!<br />)\s*\n', "<br />\n", content)
+        content = re.sub(r"(?<!<br />)\s*\n", "<br />\n", content)
         content = content.replace("<WPPreserveNewline />", "\n")
+    content = re.sub(r"(</?" + allblocks + r"[^>]*>)\s*<br />", "\\1", content)
     content = re.sub(
-        r'(</?' + allblocks + r'[^>]*>)\s*<br />', "\\1",
-        content)
-    content = re.sub(
-        r'<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)',
-        '\\1',
-        content)
-    content = re.sub(r'\n</p>', "</p>", content)
+        r"<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)", "\\1", content
+    )
+    content = re.sub(r"\n</p>", "</p>", content)
 
     if pre_tags:
+
         def _multi_replace(dic, string):
-            pattern = r'|'.join(map(re.escape, dic.keys()))
+            pattern = r"|".join(map(re.escape, dic.keys()))
             return re.sub(pattern, lambda m: dic[m.group()], string)
+
         content = _multi_replace(pre_tags, content)
 
     # convert [caption] tags into <figure>
     content = re.sub(
-        r'\[caption(?:.*?)(?:caption=\"(.*?)\")?\]'
-        r'((?:\<a(?:.*?)\>)?(?:\<img.*?\>)(?:\<\/a\>)?)\s?(.*?)\[\/caption\]',
-        r'<figure>\n\2\n<figcaption>\1\3</figcaption>\n</figure>',
-        content)
+        r"\[caption(?:.*?)(?:caption=\"(.*?)\")?\]"
+        r"((?:\<a(?:.*?)\>)?(?:\<img.*?\>)(?:\<\/a\>)?)\s?(.*?)\[\/caption\]",
+        r"<figure>\n\2\n<figcaption>\1\3</figcaption>\n</figure>",
+        content,
+    )
 
     return content
 
@@ -124,10 +119,12 @@ def xml_to_soup(xml):
     try:
         from bs4 import BeautifulSoup
     except ImportError:
-        error = ('Missing dependency "BeautifulSoup4" and "lxml" required to '
-                 'import XML files.')
+        error = (
+            'Missing dependency "BeautifulSoup4" and "lxml" required to '
+            "import XML files."
+        )
         sys.exit(error)
-    with open(xml, encoding='utf-8') as infile:
+    with open(xml, encoding="utf-8") as infile:
         xmlfile = infile.read()
     soup = BeautifulSoup(xmlfile, "xml")
     return soup
@@ -144,111 +141,125 @@ def wp2fields(xml, wp_custpost=False):
     """Opens a wordpress XML file, and yield Pelican fields"""
 
     soup = xml_to_soup(xml)
-    items = soup.rss.channel.findAll('item')
+    items = soup.rss.channel.findAll("item")
     for item in items:
-
-        if item.find('status').string in ["publish", "draft"]:
-
+        if item.find("status").string in ["publish", "draft"]:
             try:
                 # Use HTMLParser due to issues with BeautifulSoup 3
                 title = unescape(item.title.contents[0])
             except IndexError:
-                title = 'No title [%s]' % item.find('post_name').string
+                title = "No title [%s]" % item.find("post_name").string
                 logger.warning('Post "%s" is lacking a proper title', title)
 
-            post_name = item.find('post_name').string
-            post_id = item.find('post_id').string
+            post_name = item.find("post_name").string
+            post_id = item.find("post_id").string
             filename = get_filename(post_name, post_id)
 
-            content = item.find('encoded').string
-            raw_date = item.find('post_date').string
-            if raw_date == '0000-00-00 00:00:00':
+            content = item.find("encoded").string
+            raw_date = item.find("post_date").string
+            if raw_date == "0000-00-00 00:00:00":
                 date = None
             else:
-                date_object = SafeDatetime.strptime(
-                    raw_date, '%Y-%m-%d %H:%M:%S')
-                date = date_object.strftime('%Y-%m-%d %H:%M')
-            author = item.find('creator').string
+                date_object = SafeDatetime.strptime(raw_date, "%Y-%m-%d %H:%M:%S")
+                date = date_object.strftime("%Y-%m-%d %H:%M")
+            author = item.find("creator").string
 
-            categories = [cat.string for cat
-                          in item.findAll('category', {'domain': 'category'})]
+            categories = [
+                cat.string for cat in item.findAll("category", {"domain": "category"})
+            ]
 
-            tags = [tag.string for tag
-                    in item.findAll('category', {'domain': 'post_tag'})]
+            tags = [
+                tag.string for tag in item.findAll("category", {"domain": "post_tag"})
+            ]
             # To publish a post the status should be 'published'
-            status = 'published' if item.find('status').string == "publish" \
-                else item.find('status').string
+            status = (
+                "published"
+                if item.find("status").string == "publish"
+                else item.find("status").string
+            )
 
-            kind = 'article'
-            post_type = item.find('post_type').string
-            if post_type == 'page':
-                kind = 'page'
+            kind = "article"
+            post_type = item.find("post_type").string
+            if post_type == "page":
+                kind = "page"
             elif wp_custpost:
-                if post_type == 'post':
+                if post_type == "post":
                     pass
                 # Old behaviour was to name everything not a page as an
                 # article.Theoretically all attachments have status == inherit
                 # so no attachments should be here. But this statement is to
                 # maintain existing behaviour in case that doesn't hold true.
-                elif post_type == 'attachment':
+                elif post_type == "attachment":
                     pass
                 else:
                     kind = post_type
-            yield (title, content, filename, date, author, categories,
-                   tags, status, kind, 'wp-html')
+            yield (
+                title,
+                content,
+                filename,
+                date,
+                author,
+                categories,
+                tags,
+                status,
+                kind,
+                "wp-html",
+            )
 
 
 def blogger2fields(xml):
     """Opens a blogger XML file, and yield Pelican fields"""
 
     soup = xml_to_soup(xml)
-    entries = soup.feed.findAll('entry')
+    entries = soup.feed.findAll("entry")
     for entry in entries:
         raw_kind = entry.find(
-            'category', {'scheme': 'http://schemas.google.com/g/2005#kind'}
-        ).get('term')
-        if raw_kind == 'http://schemas.google.com/blogger/2008/kind#post':
-            kind = 'article'
-        elif raw_kind == 'http://schemas.google.com/blogger/2008/kind#comment':
-            kind = 'comment'
-        elif raw_kind == 'http://schemas.google.com/blogger/2008/kind#page':
-            kind = 'page'
+            "category", {"scheme": "http://schemas.google.com/g/2005#kind"}
+        ).get("term")
+        if raw_kind == "http://schemas.google.com/blogger/2008/kind#post":
+            kind = "article"
+        elif raw_kind == "http://schemas.google.com/blogger/2008/kind#comment":
+            kind = "comment"
+        elif raw_kind == "http://schemas.google.com/blogger/2008/kind#page":
+            kind = "page"
         else:
             continue
 
         try:
-            assert kind != 'comment'
-            filename = entry.find('link', {'rel': 'alternate'})['href']
+            assert kind != "comment"
+            filename = entry.find("link", {"rel": "alternate"})["href"]
             filename = os.path.splitext(os.path.basename(filename))[0]
         except (AssertionError, TypeError, KeyError):
-            filename = entry.find('id').string.split('.')[-1]
+            filename = entry.find("id").string.split(".")[-1]
 
-        title = entry.find('title').string or ''
+        title = entry.find("title").string or ""
 
-        content = entry.find('content').string
-        raw_date = entry.find('published').string
-        if hasattr(SafeDatetime, 'fromisoformat'):
+        content = entry.find("content").string
+        raw_date = entry.find("published").string
+        if hasattr(SafeDatetime, "fromisoformat"):
             date_object = SafeDatetime.fromisoformat(raw_date)
         else:
-            date_object = SafeDatetime.strptime(
-                raw_date[:23], '%Y-%m-%dT%H:%M:%S.%f')
-        date = date_object.strftime('%Y-%m-%d %H:%M')
-        author = entry.find('author').find('name').string
+            date_object = SafeDatetime.strptime(raw_date[:23], "%Y-%m-%dT%H:%M:%S.%f")
+        date = date_object.strftime("%Y-%m-%d %H:%M")
+        author = entry.find("author").find("name").string
 
         # blogger posts only have tags, no category
-        tags = [tag.get('term') for tag in entry.findAll(
-            'category', {'scheme': 'http://www.blogger.com/atom/ns#'})]
+        tags = [
+            tag.get("term")
+            for tag in entry.findAll(
+                "category", {"scheme": "http://www.blogger.com/atom/ns#"}
+            )
+        ]
 
         # Drafts have <app:control><app:draft>yes</app:draft></app:control>
-        status = 'published'
+        status = "published"
         try:
-            if entry.find('control').find('draft').string == 'yes':
-                status = 'draft'
+            if entry.find("control").find("draft").string == "yes":
+                status = "draft"
         except AttributeError:
             pass
 
-        yield (title, content, filename, date, author, None, tags, status,
-               kind, 'html')
+        yield (title, content, filename, date, author, None, tags, status, kind, "html")
 
 
 def dc2fields(file):
@@ -256,9 +267,11 @@ def dc2fields(file):
     try:
         from bs4 import BeautifulSoup
     except ImportError:
-        error = ('Missing dependency '
-                 '"BeautifulSoup4" and "lxml" required '
-                 'to import Dotclear files.')
+        error = (
+            "Missing dependency "
+            '"BeautifulSoup4" and "lxml" required '
+            "to import Dotclear files."
+        )
         sys.exit(error)
 
     in_cat = False
@@ -266,15 +279,14 @@ def dc2fields(file):
     category_list = {}
     posts = []
 
-    with open(file, encoding='utf-8') as f:
-
+    with open(file, encoding="utf-8") as f:
         for line in f:
             # remove final \n
             line = line[:-1]
 
-            if line.startswith('[category'):
+            if line.startswith("[category"):
                 in_cat = True
-            elif line.startswith('[post'):
+            elif line.startswith("[post"):
                 in_post = True
             elif in_cat:
                 fields = line.split('","')
@@ -294,7 +306,7 @@ def dc2fields(file):
 
     print("%i posts read." % len(posts))
 
-    subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
+    subs = DEFAULT_CONFIG["SLUG_REGEX_SUBSTITUTIONS"]
     for post in posts:
         fields = post.split('","')
 
@@ -329,44 +341,39 @@ def dc2fields(file):
         # redirect_url = fields[28][:-1]
 
         # remove seconds
-        post_creadt = ':'.join(post_creadt.split(':')[0:2])
+        post_creadt = ":".join(post_creadt.split(":")[0:2])
 
-        author = ''
+        author = ""
         categories = []
         tags = []
 
         if cat_id:
-            categories = [category_list[id].strip() for id
-                          in cat_id.split(',')]
+            categories = [category_list[id].strip() for id in cat_id.split(",")]
 
         # Get tags related to a post
-        tag = (post_meta.replace('{', '')
-                        .replace('}', '')
-                        .replace('a:1:s:3:\\"tag\\";a:', '')
-                        .replace('a:0:', ''))
+        tag = (
+            post_meta.replace("{", "")
+            .replace("}", "")
+            .replace('a:1:s:3:\\"tag\\";a:', "")
+            .replace("a:0:", "")
+        )
         if len(tag) > 1:
             if int(len(tag[:1])) == 1:
                 newtag = tag.split('"')[1]
                 tags.append(
-                    BeautifulSoup(
-                        newtag,
-                        'xml'
-                    )
+                    BeautifulSoup(newtag, "xml")
                     # bs4 always outputs UTF-8
-                    .decode('utf-8')
+                    .decode("utf-8")
                 )
             else:
                 i = 1
                 j = 1
-                while (i <= int(tag[:1])):
-                    newtag = tag.split('"')[j].replace('\\', '')
+                while i <= int(tag[:1]):
+                    newtag = tag.split('"')[j].replace("\\", "")
                     tags.append(
-                        BeautifulSoup(
-                            newtag,
-                            'xml'
-                        )
+                        BeautifulSoup(newtag, "xml")
                         # bs4 always outputs UTF-8
-                        .decode('utf-8')
+                        .decode("utf-8")
                     )
                     i = i + 1
                     if j < int(tag[:1]) * 2:
@@ -381,116 +388,149 @@ def dc2fields(file):
             content = post_excerpt + post_content
         else:
             content = post_excerpt_xhtml + post_content_xhtml
-            content = content.replace('\\n', '')
+            content = content.replace("\\n", "")
             post_format = "html"
 
-        kind = 'article'  # TODO: Recognise pages
-        status = 'published'  # TODO: Find a way for draft posts
+        kind = "article"  # TODO: Recognise pages
+        status = "published"  # TODO: Find a way for draft posts
 
-        yield (post_title, content, slugify(post_title, regex_subs=subs),
-               post_creadt, author, categories, tags, status, kind,
-               post_format)
+        yield (
+            post_title,
+            content,
+            slugify(post_title, regex_subs=subs),
+            post_creadt,
+            author,
+            categories,
+            tags,
+            status,
+            kind,
+            post_format,
+        )
 
 
 def _get_tumblr_posts(api_key, blogname, offset=0):
     import json
     import urllib.request as urllib_request
-    url = ("https://api.tumblr.com/v2/blog/%s.tumblr.com/"
-           "posts?api_key=%s&offset=%d&filter=raw") % (
-        blogname, api_key, offset)
+
+    url = (
+        "https://api.tumblr.com/v2/blog/%s.tumblr.com/"
+        "posts?api_key=%s&offset=%d&filter=raw"
+    ) % (blogname, api_key, offset)
     request = urllib_request.Request(url)
     handle = urllib_request.urlopen(request)
-    posts = json.loads(handle.read().decode('utf-8'))
-    return posts.get('response').get('posts')
+    posts = json.loads(handle.read().decode("utf-8"))
+    return posts.get("response").get("posts")
 
 
 def tumblr2fields(api_key, blogname):
-    """ Imports Tumblr posts (API v2)"""
+    """Imports Tumblr posts (API v2)"""
     offset = 0
     posts = _get_tumblr_posts(api_key, blogname, offset)
-    subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
+    subs = DEFAULT_CONFIG["SLUG_REGEX_SUBSTITUTIONS"]
     while len(posts) > 0:
         for post in posts:
-            title = \
-                post.get('title') or \
-                post.get('source_title') or \
-                post.get('type').capitalize()
-            slug = post.get('slug') or slugify(title, regex_subs=subs)
-            tags = post.get('tags')
-            timestamp = post.get('timestamp')
+            title = (
+                post.get("title")
+                or post.get("source_title")
+                or post.get("type").capitalize()
+            )
+            slug = post.get("slug") or slugify(title, regex_subs=subs)
+            tags = post.get("tags")
+            timestamp = post.get("timestamp")
             date = SafeDatetime.fromtimestamp(
                 int(timestamp), tz=datetime.timezone.utc
             ).strftime("%Y-%m-%d %H:%M:%S%z")
-            slug = SafeDatetime.fromtimestamp(
-                int(timestamp), tz=datetime.timezone.utc
-            ).strftime("%Y-%m-%d-") + slug
-            format = post.get('format')
-            content = post.get('body')
-            type = post.get('type')
-            if type == 'photo':
-                if format == 'markdown':
-                    fmtstr = '![%s](%s)'
+            slug = (
+                SafeDatetime.fromtimestamp(
+                    int(timestamp), tz=datetime.timezone.utc
+                ).strftime("%Y-%m-%d-")
+                + slug
+            )
+            format = post.get("format")
+            content = post.get("body")
+            type = post.get("type")
+            if type == "photo":
+                if format == "markdown":
+                    fmtstr = "![%s](%s)"
                 else:
                     fmtstr = '<img alt="%s" src="%s" />'
-                content = '\n'.join(
-                    fmtstr % (photo.get('caption'),
-                              photo.get('original_size').get('url'))
-                    for photo in post.get('photos'))
-            elif type == 'quote':
-                if format == 'markdown':
-                    fmtstr = '\n\n&mdash; %s'
+                content = "\n".join(
+                    fmtstr
+                    % (photo.get("caption"), photo.get("original_size").get("url"))
+                    for photo in post.get("photos")
+                )
+            elif type == "quote":
+                if format == "markdown":
+                    fmtstr = "\n\n&mdash; %s"
                 else:
-                    fmtstr = '<p>&mdash; %s</p>'
-                content = post.get('text') + fmtstr % post.get('source')
-            elif type == 'link':
-                if format == 'markdown':
-                    fmtstr = '[via](%s)\n\n'
+                    fmtstr = "<p>&mdash; %s</p>"
+                content = post.get("text") + fmtstr % post.get("source")
+            elif type == "link":
+                if format == "markdown":
+                    fmtstr = "[via](%s)\n\n"
                 else:
                     fmtstr = '<p><a href="%s">via</a></p>\n'
-                content = fmtstr % post.get('url') + post.get('description')
-            elif type == 'audio':
-                if format == 'markdown':
-                    fmtstr = '[via](%s)\n\n'
+                content = fmtstr % post.get("url") + post.get("description")
+            elif type == "audio":
+                if format == "markdown":
+                    fmtstr = "[via](%s)\n\n"
                 else:
                     fmtstr = '<p><a href="%s">via</a></p>\n'
-                content = fmtstr % post.get('source_url') + \
-                    post.get('caption') + \
-                    post.get('player')
-            elif type == 'video':
-                if format == 'markdown':
-                    fmtstr = '[via](%s)\n\n'
+                content = (
+                    fmtstr % post.get("source_url")
+                    + post.get("caption")
+                    + post.get("player")
+                )
+            elif type == "video":
+                if format == "markdown":
+                    fmtstr = "[via](%s)\n\n"
                 else:
                     fmtstr = '<p><a href="%s">via</a></p>\n'
-                source = fmtstr % post.get('source_url')
-                caption = post.get('caption')
+                source = fmtstr % post.get("source_url")
+                caption = post.get("caption")
                 players = [
                     # If embed_code is False, couldn't get the video
-                    player.get('embed_code') or None
-                    for player in post.get('player')]
+                    player.get("embed_code") or None
+                    for player in post.get("player")
+                ]
                 # If there are no embeddable players, say so, once
-                if len(players) > 0 and all(
-                        player is None for player in players):
+                if len(players) > 0 and all(player is None for player in players):
                     players = "<p>(This video isn't available anymore.)</p>\n"
                 else:
-                    players = '\n'.join(players)
+                    players = "\n".join(players)
                 content = source + caption + players
-            elif type == 'answer':
-                title = post.get('question')
-                content = ('<p>'
-                           '<a href="%s" rel="external nofollow">%s</a>'
-                           ': %s'
-                           '</p>\n'
-                           ' %s' % (post.get('asking_name'),
-                                    post.get('asking_url'),
-                                    post.get('question'),
-                                    post.get('answer')))
+            elif type == "answer":
+                title = post.get("question")
+                content = (
+                    "<p>"
+                    '<a href="%s" rel="external nofollow">%s</a>'
+                    ": %s"
+                    "</p>\n"
+                    " %s"
+                    % (
+                        post.get("asking_name"),
+                        post.get("asking_url"),
+                        post.get("question"),
+                        post.get("answer"),
+                    )
+                )
 
-            content = content.rstrip() + '\n'
-            kind = 'article'
-            status = 'published'  # TODO: Find a way for draft posts
+            content = content.rstrip() + "\n"
+            kind = "article"
+            status = "published"  # TODO: Find a way for draft posts
 
-            yield (title, content, slug, date, post.get('blog_name'), [type],
-                   tags, status, kind, format)
+            yield (
+                title,
+                content,
+                slug,
+                date,
+                post.get("blog_name"),
+                [type],
+                tags,
+                status,
+                kind,
+                format,
+            )
 
         offset += len(posts)
         posts = _get_tumblr_posts(api_key, blogname, offset)
@@ -499,145 +539,167 @@ def tumblr2fields(api_key, blogname):
 def feed2fields(file):
     """Read a feed and yield pelican fields"""
     import feedparser
+
     d = feedparser.parse(file)
-    subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
+    subs = DEFAULT_CONFIG["SLUG_REGEX_SUBSTITUTIONS"]
     for entry in d.entries:
-        date = (time.strftime('%Y-%m-%d %H:%M', entry.updated_parsed)
-                if hasattr(entry, 'updated_parsed') else None)
-        author = entry.author if hasattr(entry, 'author') else None
-        tags = ([e['term'] for e in entry.tags]
-                if hasattr(entry, 'tags') else None)
+        date = (
+            time.strftime("%Y-%m-%d %H:%M", entry.updated_parsed)
+            if hasattr(entry, "updated_parsed")
+            else None
+        )
+        author = entry.author if hasattr(entry, "author") else None
+        tags = [e["term"] for e in entry.tags] if hasattr(entry, "tags") else None
 
         slug = slugify(entry.title, regex_subs=subs)
-        kind = 'article'
-        yield (entry.title, entry.description, slug, date,
-               author, [], tags, None, kind, 'html')
+        kind = "article"
+        yield (
+            entry.title,
+            entry.description,
+            slug,
+            date,
+            author,
+            [],
+            tags,
+            None,
+            kind,
+            "html",
+        )
 
 
-def build_header(title, date, author, categories, tags, slug,
-                 status=None, attachments=None):
+def build_header(
+    title, date, author, categories, tags, slug, status=None, attachments=None
+):
     """Build a header from a list of fields"""
 
     from docutils.utils import column_width
 
-    header = '{}\n{}\n'.format(title, '#' * column_width(title))
+    header = "{}\n{}\n".format(title, "#" * column_width(title))
     if date:
-        header += ':date: %s\n' % date
+        header += ":date: %s\n" % date
     if author:
-        header += ':author: %s\n' % author
+        header += ":author: %s\n" % author
     if categories:
-        header += ':category: %s\n' % ', '.join(categories)
+        header += ":category: %s\n" % ", ".join(categories)
     if tags:
-        header += ':tags: %s\n' % ', '.join(tags)
+        header += ":tags: %s\n" % ", ".join(tags)
     if slug:
-        header += ':slug: %s\n' % slug
+        header += ":slug: %s\n" % slug
     if status:
-        header += ':status: %s\n' % status
+        header += ":status: %s\n" % status
     if attachments:
-        header += ':attachments: %s\n' % ', '.join(attachments)
-    header += '\n'
+        header += ":attachments: %s\n" % ", ".join(attachments)
+    header += "\n"
     return header
 
 
-def build_asciidoc_header(title, date, author, categories, tags, slug,
-                          status=None, attachments=None):
+def build_asciidoc_header(
+    title, date, author, categories, tags, slug, status=None, attachments=None
+):
     """Build a header from a list of fields"""
 
-    header = '= %s\n' % title
+    header = "= %s\n" % title
     if author:
-        header += '%s\n' % author
+        header += "%s\n" % author
         if date:
-            header += '%s\n' % date
+            header += "%s\n" % date
     if categories:
-        header += ':category: %s\n' % ', '.join(categories)
+        header += ":category: %s\n" % ", ".join(categories)
     if tags:
-        header += ':tags: %s\n' % ', '.join(tags)
+        header += ":tags: %s\n" % ", ".join(tags)
     if slug:
-        header += ':slug: %s\n' % slug
+        header += ":slug: %s\n" % slug
     if status:
-        header += ':status: %s\n' % status
+        header += ":status: %s\n" % status
     if attachments:
-        header += ':attachments: %s\n' % ', '.join(attachments)
-    header += '\n'
+        header += ":attachments: %s\n" % ", ".join(attachments)
+    header += "\n"
     return header
 
 
-def build_markdown_header(title, date, author, categories, tags,
-                          slug, status=None, attachments=None):
+def build_markdown_header(
+    title, date, author, categories, tags, slug, status=None, attachments=None
+):
     """Build a header from a list of fields"""
-    header = 'Title: %s\n' % title
+    header = "Title: %s\n" % title
     if date:
-        header += 'Date: %s\n' % date
+        header += "Date: %s\n" % date
     if author:
-        header += 'Author: %s\n' % author
+        header += "Author: %s\n" % author
     if categories:
-        header += 'Category: %s\n' % ', '.join(categories)
+        header += "Category: %s\n" % ", ".join(categories)
     if tags:
-        header += 'Tags: %s\n' % ', '.join(tags)
+        header += "Tags: %s\n" % ", ".join(tags)
     if slug:
-        header += 'Slug: %s\n' % slug
+        header += "Slug: %s\n" % slug
     if status:
-        header += 'Status: %s\n' % status
+        header += "Status: %s\n" % status
     if attachments:
-        header += 'Attachments: %s\n' % ', '.join(attachments)
-    header += '\n'
+        header += "Attachments: %s\n" % ", ".join(attachments)
+    header += "\n"
     return header
 
 
-def get_ext(out_markup, in_markup='html'):
-    if out_markup == 'asciidoc':
-        ext = '.adoc'
-    elif in_markup == 'markdown' or out_markup == 'markdown':
-        ext = '.md'
+def get_ext(out_markup, in_markup="html"):
+    if out_markup == "asciidoc":
+        ext = ".adoc"
+    elif in_markup == "markdown" or out_markup == "markdown":
+        ext = ".md"
     else:
-        ext = '.rst'
+        ext = ".rst"
     return ext
 
 
-def get_out_filename(output_path, filename, ext, kind,
-                     dirpage, dircat, categories, wp_custpost, slug_subs):
+def get_out_filename(
+    output_path,
+    filename,
+    ext,
+    kind,
+    dirpage,
+    dircat,
+    categories,
+    wp_custpost,
+    slug_subs,
+):
     filename = os.path.basename(filename)
 
     # Enforce filename restrictions for various filesystems at once; see
     # https://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
     # we do not need to filter words because an extension will be appended
-    filename = re.sub(r'[<>:"/\\|?*^% ]', '-', filename)  # invalid chars
-    filename = filename.lstrip('.')  # should not start with a dot
+    filename = re.sub(r'[<>:"/\\|?*^% ]', "-", filename)  # invalid chars
+    filename = filename.lstrip(".")  # should not start with a dot
     if not filename:
-        filename = '_'
+        filename = "_"
     filename = filename[:249]  # allow for 5 extra characters
 
     out_filename = os.path.join(output_path, filename + ext)
     # option to put page posts in pages/ subdirectory
-    if dirpage and kind == 'page':
-        pages_dir = os.path.join(output_path, 'pages')
+    if dirpage and kind == "page":
+        pages_dir = os.path.join(output_path, "pages")
         if not os.path.isdir(pages_dir):
             os.mkdir(pages_dir)
         out_filename = os.path.join(pages_dir, filename + ext)
-    elif not dirpage and kind == 'page':
+    elif not dirpage and kind == "page":
         pass
     # option to put wp custom post types in directories with post type
     # names. Custom post types can also have categories so option to
     # create subdirectories with category names
-    elif kind != 'article':
+    elif kind != "article":
         if wp_custpost:
             typename = slugify(kind, regex_subs=slug_subs)
         else:
-            typename = ''
-            kind = 'article'
+            typename = ""
+            kind = "article"
         if dircat and (len(categories) > 0):
-            catname = slugify(
-                categories[0], regex_subs=slug_subs, preserve_case=True)
+            catname = slugify(categories[0], regex_subs=slug_subs, preserve_case=True)
         else:
-            catname = ''
-        out_filename = os.path.join(output_path, typename,
-                                    catname, filename + ext)
+            catname = ""
+        out_filename = os.path.join(output_path, typename, catname, filename + ext)
         if not os.path.isdir(os.path.join(output_path, typename, catname)):
             os.makedirs(os.path.join(output_path, typename, catname))
     # option to put files in directories with categories names
     elif dircat and (len(categories) > 0):
-        catname = slugify(
-            categories[0], regex_subs=slug_subs, preserve_case=True)
+        catname = slugify(categories[0], regex_subs=slug_subs, preserve_case=True)
         out_filename = os.path.join(output_path, catname, filename + ext)
         if not os.path.isdir(os.path.join(output_path, catname)):
             os.mkdir(os.path.join(output_path, catname))
@@ -650,18 +712,19 @@ def get_attachments(xml):
     of the attachment_urls
     """
     soup = xml_to_soup(xml)
-    items = soup.rss.channel.findAll('item')
+    items = soup.rss.channel.findAll("item")
     names = {}
     attachments = []
 
     for item in items:
-        kind = item.find('post_type').string
-        post_name = item.find('post_name').string
-        post_id = item.find('post_id').string
+        kind = item.find("post_type").string
+        post_name = item.find("post_name").string
+        post_id = item.find("post_id").string
 
-        if kind == 'attachment':
-            attachments.append((item.find('post_parent').string,
-                                item.find('attachment_url').string))
+        if kind == "attachment":
+            attachments.append(
+                (item.find("post_parent").string, item.find("attachment_url").string)
+            )
         else:
             filename = get_filename(post_name, post_id)
             names[post_id] = filename
@@ -686,23 +749,23 @@ def download_attachments(output_path, urls):
         path = urlparse(url).path
         # teardown path and rebuild to negate any errors with
         # os.path.join and leading /'s
-        path = path.split('/')
+        path = path.split("/")
         filename = path.pop(-1)
-        localpath = ''
+        localpath = ""
         for item in path:
-            if sys.platform != 'win32' or ':' not in item:
+            if sys.platform != "win32" or ":" not in item:
                 localpath = os.path.join(localpath, item)
         full_path = os.path.join(output_path, localpath)
 
         # Generate percent-encoded URL
         scheme, netloc, path, query, fragment = urlsplit(url)
-        if scheme != 'file':
+        if scheme != "file":
             path = quote(path)
             url = urlunsplit((scheme, netloc, path, query, fragment))
 
         if not os.path.exists(full_path):
             os.makedirs(full_path)
-        print('downloading {}'.format(filename))
+        print("downloading {}".format(filename))
         try:
             urlretrieve(url, os.path.join(full_path, filename))
             locations[url] = os.path.join(localpath, filename)
@@ -713,43 +776,61 @@ def download_attachments(output_path, urls):
 
 
 def is_pandoc_needed(in_markup):
-    return in_markup in ('html', 'wp-html')
+    return in_markup in ("html", "wp-html")
 
 
 def get_pandoc_version():
-    cmd = ['pandoc', '--version']
+    cmd = ["pandoc", "--version"]
     try:
         output = subprocess.check_output(cmd, universal_newlines=True)
     except (subprocess.CalledProcessError, OSError) as e:
         logger.warning("Pandoc version unknown: %s", e)
         return ()
 
-    return tuple(int(i) for i in output.split()[1].split('.'))
+    return tuple(int(i) for i in output.split()[1].split("."))
 
 
 def update_links_to_attached_files(content, attachments):
     for old_url, new_path in attachments.items():
         # url may occur both with http:// and https://
-        http_url = old_url.replace('https://', 'http://')
-        https_url = old_url.replace('http://', 'https://')
+        http_url = old_url.replace("https://", "http://")
+        https_url = old_url.replace("http://", "https://")
         for url in [http_url, https_url]:
-            content = content.replace(url, '{static}' + new_path)
+            content = content.replace(url, "{static}" + new_path)
     return content
 
 
 def fields2pelican(
-        fields, out_markup, output_path,
-        dircat=False, strip_raw=False, disable_slugs=False,
-        dirpage=False, filename_template=None, filter_author=None,
-        wp_custpost=False, wp_attach=False, attachments=None):
-
+    fields,
+    out_markup,
+    output_path,
+    dircat=False,
+    strip_raw=False,
+    disable_slugs=False,
+    dirpage=False,
+    filename_template=None,
+    filter_author=None,
+    wp_custpost=False,
+    wp_attach=False,
+    attachments=None,
+):
     pandoc_version = get_pandoc_version()
     posts_require_pandoc = []
 
-    slug_subs = DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS']
+    slug_subs = DEFAULT_CONFIG["SLUG_REGEX_SUBSTITUTIONS"]
 
-    for (title, content, filename, date, author, categories, tags, status,
-            kind, in_markup) in fields:
+    for (
+        title,
+        content,
+        filename,
+        date,
+        author,
+        categories,
+        tags,
+        status,
+        kind,
+        in_markup,
+    ) in fields:
         if filter_author and filter_author != author:
             continue
         if is_pandoc_needed(in_markup) and not pandoc_version:
@@ -767,85 +848,120 @@ def fields2pelican(
             links = None
 
         ext = get_ext(out_markup, in_markup)
-        if ext == '.adoc':
-            header = build_asciidoc_header(title, date, author, categories,
-                                           tags, slug, status, attachments)
-        elif ext == '.md':
+        if ext == ".adoc":
+            header = build_asciidoc_header(
+                title, date, author, categories, tags, slug, status, attachments
+            )
+        elif ext == ".md":
             header = build_markdown_header(
-                title, date, author, categories, tags, slug,
-                status, links.values() if links else None)
+                title,
+                date,
+                author,
+                categories,
+                tags,
+                slug,
+                status,
+                links.values() if links else None,
+            )
         else:
-            out_markup = 'rst'
-            header = build_header(title, date, author, categories,
-                                  tags, slug, status, links.values()
-                                  if links else None)
+            out_markup = "rst"
+            header = build_header(
+                title,
+                date,
+                author,
+                categories,
+                tags,
+                slug,
+                status,
+                links.values() if links else None,
+            )
 
         out_filename = get_out_filename(
-            output_path, filename, ext, kind, dirpage, dircat,
-            categories, wp_custpost, slug_subs)
+            output_path,
+            filename,
+            ext,
+            kind,
+            dirpage,
+            dircat,
+            categories,
+            wp_custpost,
+            slug_subs,
+        )
         print(out_filename)
 
-        if in_markup in ('html', 'wp-html'):
+        if in_markup in ("html", "wp-html"):
             with tempfile.TemporaryDirectory() as tmpdir:
-                html_filename = os.path.join(tmpdir, 'pandoc-input.html')
+                html_filename = os.path.join(tmpdir, "pandoc-input.html")
                 # Replace newlines with paragraphs wrapped with <p> so
                 # HTML is valid before conversion
-                if in_markup == 'wp-html':
+                if in_markup == "wp-html":
                     new_content = decode_wp_content(content)
                 else:
                     paragraphs = content.splitlines()
-                    paragraphs = ['<p>{}</p>'.format(p) for p in paragraphs]
-                    new_content = ''.join(paragraphs)
-                with open(html_filename, 'w', encoding='utf-8') as fp:
+                    paragraphs = ["<p>{}</p>".format(p) for p in paragraphs]
+                    new_content = "".join(paragraphs)
+                with open(html_filename, "w", encoding="utf-8") as fp:
                     fp.write(new_content)
 
                 if pandoc_version < (2,):
-                    parse_raw = '--parse-raw' if not strip_raw else ''
-                    wrap_none = '--wrap=none' \
-                        if pandoc_version >= (1, 16) else '--no-wrap'
-                    cmd = ('pandoc --normalize {0} --from=html'
-                           ' --to={1} {2} -o "{3}" "{4}"')
-                    cmd = cmd.format(parse_raw,
-                                     out_markup if out_markup != 'markdown' else "gfm",
-                                     wrap_none,
-                                     out_filename, html_filename)
+                    parse_raw = "--parse-raw" if not strip_raw else ""
+                    wrap_none = (
+                        "--wrap=none" if pandoc_version >= (1, 16) else "--no-wrap"
+                    )
+                    cmd = (
+                        "pandoc --normalize {0} --from=html"
+                        ' --to={1} {2} -o "{3}" "{4}"'
+                    )
+                    cmd = cmd.format(
+                        parse_raw,
+                        out_markup if out_markup != "markdown" else "gfm",
+                        wrap_none,
+                        out_filename,
+                        html_filename,
+                    )
                 else:
-                    from_arg = '-f html+raw_html' if not strip_raw else '-f html'
-                    cmd = ('pandoc {0} --to={1}-smart --wrap=none -o "{2}" "{3}"')
-                    cmd = cmd.format(from_arg,
-                                     out_markup if out_markup != 'markdown' else "gfm",
-                                     out_filename, html_filename)
+                    from_arg = "-f html+raw_html" if not strip_raw else "-f html"
+                    cmd = 'pandoc {0} --to={1}-smart --wrap=none -o "{2}" "{3}"'
+                    cmd = cmd.format(
+                        from_arg,
+                        out_markup if out_markup != "markdown" else "gfm",
+                        out_filename,
+                        html_filename,
+                    )
 
                 try:
                     rc = subprocess.call(cmd, shell=True)
                     if rc < 0:
-                        error = 'Child was terminated by signal %d' % -rc
+                        error = "Child was terminated by signal %d" % -rc
                         exit(error)
 
                     elif rc > 0:
-                        error = 'Please, check your Pandoc installation.'
+                        error = "Please, check your Pandoc installation."
                         exit(error)
                 except OSError as e:
-                    error = 'Pandoc execution failed: %s' % e
+                    error = "Pandoc execution failed: %s" % e
                     exit(error)
 
-            with open(out_filename, encoding='utf-8') as fs:
+            with open(out_filename, encoding="utf-8") as fs:
                 content = fs.read()
-                if out_markup == 'markdown':
+                if out_markup == "markdown":
                     # In markdown, to insert a <br />, end a line with two
                     # or more spaces & then a end-of-line
-                    content = content.replace('\\\n ', '  \n')
-                    content = content.replace('\\\n', '  \n')
+                    content = content.replace("\\\n ", "  \n")
+                    content = content.replace("\\\n", "  \n")
 
             if wp_attach and links:
                 content = update_links_to_attached_files(content, links)
 
-        with open(out_filename, 'w', encoding='utf-8') as fs:
+        with open(out_filename, "w", encoding="utf-8") as fs:
             fs.write(header + content)
 
     if posts_require_pandoc:
-        logger.error("Pandoc must be installed to import the following posts:"
-                     "\n  {}".format("\n  ".join(posts_require_pandoc)))
+        logger.error(
+            "Pandoc must be installed to import the following posts:" "\n  {}".format(
+                "\n  ".join(posts_require_pandoc)
+            )
+        )
 
     if wp_attach and attachments and None in attachments:
         print("downloading attachments that don't have a parent post")
@@ -856,111 +972,136 @@ def fields2pelican(
 def main():
     parser = argparse.ArgumentParser(
         description="Transform feed, Blogger, Dotclear, Tumblr, or "
-                    "WordPress files into reST (rst) or Markdown (md) files. "
-                    "Be sure to have pandoc installed.",
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+        "WordPress files into reST (rst) or Markdown (md) files. "
+        "Be sure to have pandoc installed.",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
 
+    parser.add_argument(dest="input", help="The input file to read")
     parser.add_argument(
-        dest='input', help='The input file to read')
+        "--blogger", action="store_true", dest="blogger", help="Blogger XML export"
+    )
     parser.add_argument(
-        '--blogger', action='store_true', dest='blogger',
-        help='Blogger XML export')
+        "--dotclear", action="store_true", dest="dotclear", help="Dotclear export"
+    )
     parser.add_argument(
-        '--dotclear', action='store_true', dest='dotclear',
-        help='Dotclear export')
+        "--tumblr", action="store_true", dest="tumblr", help="Tumblr export"
+    )
     parser.add_argument(
-        '--tumblr', action='store_true', dest='tumblr',
-        help='Tumblr export')
+        "--wpfile", action="store_true", dest="wpfile", help="Wordpress XML export"
+    )
     parser.add_argument(
-        '--wpfile', action='store_true', dest='wpfile',
-        help='Wordpress XML export')
+        "--feed", action="store_true", dest="feed", help="Feed to parse"
+    )
     parser.add_argument(
-        '--feed', action='store_true', dest='feed',
-        help='Feed to parse')
+        "-o", "--output", dest="output", default="content", help="Output path"
+    )
     parser.add_argument(
-        '-o', '--output', dest='output', default='content',
-        help='Output path')
+        "-m",
+        "--markup",
+        dest="markup",
+        default="rst",
+        help="Output markup format (supports rst & markdown)",
+    )
     parser.add_argument(
-        '-m', '--markup', dest='markup', default='rst',
-        help='Output markup format (supports rst & markdown)')
+        "--dir-cat",
+        action="store_true",
+        dest="dircat",
+        help="Put files in directories with categories name",
+    )
     parser.add_argument(
-        '--dir-cat', action='store_true', dest='dircat',
-        help='Put files in directories with categories name')
+        "--dir-page",
+        action="store_true",
+        dest="dirpage",
+        help=(
+            'Put files recognised as pages in "pages/" sub-directory'
+            " (blogger and wordpress import only)"
+        ),
+    )
     parser.add_argument(
-        '--dir-page', action='store_true', dest='dirpage',
-        help=('Put files recognised as pages in "pages/" sub-directory'
-              ' (blogger and wordpress import only)'))
+        "--filter-author",
+        dest="author",
+        help="Import only post from the specified author",
+    )
     parser.add_argument(
-        '--filter-author', dest='author',
-        help='Import only post from the specified author')
-    parser.add_argument(
-        '--strip-raw', action='store_true', dest='strip_raw',
+        "--strip-raw",
+        action="store_true",
+        dest="strip_raw",
         help="Strip raw HTML code that can't be converted to "
-             "markup such as flash embeds or iframes (wordpress import only)")
+        "markup such as flash embeds or iframes (wordpress import only)",
+    )
     parser.add_argument(
-        '--wp-custpost', action='store_true',
-        dest='wp_custpost',
-        help='Put wordpress custom post types in directories. If used with '
-             '--dir-cat option directories will be created as '
-             '/post_type/category/ (wordpress import only)')
+        "--wp-custpost",
+        action="store_true",
+        dest="wp_custpost",
+        help="Put wordpress custom post types in directories. If used with "
+        "--dir-cat option directories will be created as "
+        "/post_type/category/ (wordpress import only)",
+    )
     parser.add_argument(
-        '--wp-attach', action='store_true', dest='wp_attach',
-        help='(wordpress import only) Download files uploaded to wordpress as '
-             'attachments. Files will be added to posts as a list in the post '
-             'header. All files will be downloaded, even if '
-             "they aren't associated with a post. Files will be downloaded "
-             'with their original path inside the output directory. '
-             'e.g. output/wp-uploads/date/postname/file.jpg '
-             '-- Requires an internet connection --')
+        "--wp-attach",
+        action="store_true",
+        dest="wp_attach",
+        help="(wordpress import only) Download files uploaded to wordpress as "
+        "attachments. Files will be added to posts as a list in the post "
+        "header. All files will be downloaded, even if "
+        "they aren't associated with a post. Files will be downloaded "
+        "with their original path inside the output directory. "
+        "e.g. output/wp-uploads/date/postname/file.jpg "
+        "-- Requires an internet connection --",
+    )
     parser.add_argument(
-        '--disable-slugs', action='store_true',
-        dest='disable_slugs',
-        help='Disable storing slugs from imported posts within output. '
-             'With this disabled, your Pelican URLs may not be consistent '
-             'with your original posts.')
+        "--disable-slugs",
+        action="store_true",
+        dest="disable_slugs",
+        help="Disable storing slugs from imported posts within output. "
+        "With this disabled, your Pelican URLs may not be consistent "
+        "with your original posts.",
+    )
     parser.add_argument(
-        '-b', '--blogname', dest='blogname',
-        help="Blog name (Tumblr import only)")
+        "-b", "--blogname", dest="blogname", help="Blog name (Tumblr import only)"
+    )
 
     args = parser.parse_args()
 
     input_type = None
     if args.blogger:
-        input_type = 'blogger'
+        input_type = "blogger"
     elif args.dotclear:
-        input_type = 'dotclear'
+        input_type = "dotclear"
     elif args.tumblr:
-        input_type = 'tumblr'
+        input_type = "tumblr"
     elif args.wpfile:
-        input_type = 'wordpress'
+        input_type = "wordpress"
     elif args.feed:
-        input_type = 'feed'
+        input_type = "feed"
     else:
-        error = ('You must provide either --blogger, --dotclear, '
-                 '--tumblr, --wpfile or --feed options')
+        error = (
+            "You must provide either --blogger, --dotclear, "
+            "--tumblr, --wpfile or --feed options"
+        )
         exit(error)
 
     if not os.path.exists(args.output):
         try:
             os.mkdir(args.output)
         except OSError:
-            error = 'Unable to create the output folder: ' + args.output
+            error = "Unable to create the output folder: " + args.output
             exit(error)
 
-    if args.wp_attach and input_type != 'wordpress':
-        error = ('You must be importing a wordpress xml '
-                 'to use the --wp-attach option')
+    if args.wp_attach and input_type != "wordpress":
+        error = "You must be importing a wordpress xml " "to use the --wp-attach option"
         exit(error)
 
-    if input_type == 'blogger':
+    if input_type == "blogger":
         fields = blogger2fields(args.input)
-    elif input_type == 'dotclear':
+    elif input_type == "dotclear":
         fields = dc2fields(args.input)
-    elif input_type == 'tumblr':
+    elif input_type == "tumblr":
         fields = tumblr2fields(args.input, args.blogname)
-    elif input_type == 'wordpress':
+    elif input_type == "wordpress":
         fields = wp2fields(args.input, args.wp_custpost or False)
-    elif input_type == 'feed':
+    elif input_type == "feed":
         fields = feed2fields(args.input)
 
     if args.wp_attach:
@@ -970,12 +1111,16 @@ def main():
 
     # init logging
     init()
-    fields2pelican(fields, args.markup, args.output,
-                   dircat=args.dircat or False,
-                   dirpage=args.dirpage or False,
-                   strip_raw=args.strip_raw or False,
-                   disable_slugs=args.disable_slugs or False,
-                   filter_author=args.author,
-                   wp_custpost=args.wp_custpost or False,
-                   wp_attach=args.wp_attach or False,
-                   attachments=attachments or None)
+    fields2pelican(
+        fields,
+        args.markup,
+        args.output,
+        dircat=args.dircat or False,
+        dirpage=args.dirpage or False,
+        strip_raw=args.strip_raw or False,
+        disable_slugs=args.disable_slugs or False,
+        filter_author=args.author,
+        wp_custpost=args.wp_custpost or False,
+        wp_attach=args.wp_attach or False,
+        attachments=attachments or None,
+    )
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 4b6d93cc..fba0c9c3 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -19,6 +19,7 @@ except ImportError:
 
 try:
     import tzlocal
+
     if hasattr(tzlocal.get_localzone(), "zone"):
         _DEFAULT_TIMEZONE = tzlocal.get_localzone().zone
     else:
@@ -28,55 +29,51 @@ except ModuleNotFoundError:
 
 from pelican import __version__
 
-locale.setlocale(locale.LC_ALL, '')
+locale.setlocale(locale.LC_ALL, "")
 try:
     _DEFAULT_LANGUAGE = locale.getlocale()[0]
 except ValueError:
     # Don't fail on macosx: "unknown locale: UTF-8"
     _DEFAULT_LANGUAGE = None
 if _DEFAULT_LANGUAGE is None:
-    _DEFAULT_LANGUAGE = 'en'
+    _DEFAULT_LANGUAGE = "en"
 else:
-    _DEFAULT_LANGUAGE = _DEFAULT_LANGUAGE.split('_')[0]
+    _DEFAULT_LANGUAGE = _DEFAULT_LANGUAGE.split("_")[0]
 
-_TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                              "templates")
+_TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templates")
 _jinja_env = Environment(
     loader=FileSystemLoader(_TEMPLATES_DIR),
     trim_blocks=True,
 )
 
 
-_GITHUB_PAGES_BRANCHES = {
-    'personal': 'main',
-    'project': 'gh-pages'
-}
+_GITHUB_PAGES_BRANCHES = {"personal": "main", "project": "gh-pages"}
 
 CONF = {
-    'pelican': 'pelican',
-    'pelicanopts': '',
-    'basedir': os.curdir,
-    'ftp_host': 'localhost',
-    'ftp_user': 'anonymous',
-    'ftp_target_dir': '/',
-    'ssh_host': 'localhost',
-    'ssh_port': 22,
-    'ssh_user': 'root',
-    'ssh_target_dir': '/var/www',
-    's3_bucket': 'my_s3_bucket',
-    'cloudfiles_username': 'my_rackspace_username',
-    'cloudfiles_api_key': 'my_rackspace_api_key',
-    'cloudfiles_container': 'my_cloudfiles_container',
-    'dropbox_dir': '~/Dropbox/Public/',
-    'github_pages_branch': _GITHUB_PAGES_BRANCHES['project'],
-    'default_pagination': 10,
-    'siteurl': '',
-    'lang': _DEFAULT_LANGUAGE,
-    'timezone': _DEFAULT_TIMEZONE
+    "pelican": "pelican",
+    "pelicanopts": "",
+    "basedir": os.curdir,
+    "ftp_host": "localhost",
+    "ftp_user": "anonymous",
+    "ftp_target_dir": "/",
+    "ssh_host": "localhost",
+    "ssh_port": 22,
+    "ssh_user": "root",
+    "ssh_target_dir": "/var/www",
+    "s3_bucket": "my_s3_bucket",
+    "cloudfiles_username": "my_rackspace_username",
+    "cloudfiles_api_key": "my_rackspace_api_key",
+    "cloudfiles_container": "my_cloudfiles_container",
+    "dropbox_dir": "~/Dropbox/Public/",
+    "github_pages_branch": _GITHUB_PAGES_BRANCHES["project"],
+    "default_pagination": 10,
+    "siteurl": "",
+    "lang": _DEFAULT_LANGUAGE,
+    "timezone": _DEFAULT_TIMEZONE,
 }
 
 # url for list of valid timezones
-_TZ_URL = 'https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'
+_TZ_URL = "https://en.wikipedia.org/wiki/List_of_tz_database_time_zones"
 
 
 # Create a 'marked' default path, to determine if someone has supplied
@@ -90,12 +87,12 @@ _DEFAULT_PATH = _DEFAULT_PATH_TYPE(os.curdir)
 
 def ask(question, answer=str, default=None, length=None):
     if answer == str:
-        r = ''
+        r = ""
         while True:
             if default:
-                r = input('> {} [{}] '.format(question, default))
+                r = input("> {} [{}] ".format(question, default))
             else:
-                r = input('> {} '.format(question))
+                r = input("> {} ".format(question))
 
             r = r.strip()
 
@@ -104,10 +101,10 @@ def ask(question, answer=str, default=None, length=None):
                     r = default
                     break
                 else:
-                    print('You must enter something')
+                    print("You must enter something")
             else:
                 if length and len(r) != length:
-                    print('Entry must be {} characters long'.format(length))
+                    print("Entry must be {} characters long".format(length))
                 else:
                     break
 
@@ -117,18 +114,18 @@ def ask(question, answer=str, default=None, length=None):
         r = None
         while True:
             if default is True:
-                r = input('> {} (Y/n) '.format(question))
+                r = input("> {} (Y/n) ".format(question))
             elif default is False:
-                r = input('> {} (y/N) '.format(question))
+                r = input("> {} (y/N) ".format(question))
             else:
-                r = input('> {} (y/n) '.format(question))
+                r = input("> {} (y/n) ".format(question))
 
             r = r.strip().lower()
 
-            if r in ('y', 'yes'):
+            if r in ("y", "yes"):
                 r = True
                 break
-            elif r in ('n', 'no'):
+            elif r in ("n", "no"):
                 r = False
                 break
             elif not r:
@@ -141,9 +138,9 @@ def ask(question, answer=str, default=None, length=None):
         r = None
         while True:
             if default:
-                r = input('> {} [{}] '.format(question, default))
+                r = input("> {} [{}] ".format(question, default))
             else:
-                r = input('> {} '.format(question))
+                r = input("> {} ".format(question))
 
             r = r.strip()
 
@@ -155,11 +152,10 @@ def ask(question, answer=str, default=None, length=None):
                 r = int(r)
                 break
             except ValueError:
-                print('You must enter an integer')
+                print("You must enter an integer")
         return r
     else:
-        raise NotImplementedError(
-            'Argument `answer` must be str, bool, or integer')
+        raise NotImplementedError("Argument `answer` must be str, bool, or integer")
 
 
 def ask_timezone(question, default, tzurl):
@@ -178,162 +174,227 @@ def ask_timezone(question, default, tzurl):
 
 def render_jinja_template(tmpl_name: str, tmpl_vars: Mapping, target_path: str):
     try:
-        with open(os.path.join(CONF['basedir'], target_path),
-                  'w', encoding='utf-8') as fd:
+        with open(
+            os.path.join(CONF["basedir"], target_path), "w", encoding="utf-8"
+        ) as fd:
             _template = _jinja_env.get_template(tmpl_name)
             fd.write(_template.render(**tmpl_vars))
     except OSError as e:
-        print('Error: {}'.format(e))
+        print("Error: {}".format(e))
 
 
 def main():
     parser = argparse.ArgumentParser(
         description="A kickstarter for Pelican",
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-    parser.add_argument('-p', '--path', default=_DEFAULT_PATH,
-                        help="The path to generate the blog into")
-    parser.add_argument('-t', '--title', metavar="title",
-                        help='Set the title of the website')
-    parser.add_argument('-a', '--author', metavar="author",
-                        help='Set the author name of the website')
-    parser.add_argument('-l', '--lang', metavar="lang",
-                        help='Set the default web site language')
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
+    parser.add_argument(
+        "-p", "--path", default=_DEFAULT_PATH, help="The path to generate the blog into"
+    )
+    parser.add_argument(
+        "-t", "--title", metavar="title", help="Set the title of the website"
+    )
+    parser.add_argument(
+        "-a", "--author", metavar="author", help="Set the author name of the website"
+    )
+    parser.add_argument(
+        "-l", "--lang", metavar="lang", help="Set the default web site language"
+    )
 
     args = parser.parse_args()
 
-    print('''Welcome to pelican-quickstart v{v}.
+    print(
+        """Welcome to pelican-quickstart v{v}.
 
 This script will help you create a new Pelican-based website.
 
 Please answer the following questions so this script can generate the files
 needed by Pelican.
 
-    '''.format(v=__version__))
+    """.format(v=__version__)
+    )
 
-    project = os.path.join(
-        os.environ.get('VIRTUAL_ENV', os.curdir), '.project')
-    no_path_was_specified = hasattr(args.path, 'is_default_path')
+    project = os.path.join(os.environ.get("VIRTUAL_ENV", os.curdir), ".project")
+    no_path_was_specified = hasattr(args.path, "is_default_path")
     if os.path.isfile(project) and no_path_was_specified:
-        CONF['basedir'] = open(project).read().rstrip("\n")
-        print('Using project associated with current virtual environment. '
-              'Will save to:\n%s\n' % CONF['basedir'])
+        CONF["basedir"] = open(project).read().rstrip("\n")
+        print(
+            "Using project associated with current virtual environment. "
+            "Will save to:\n%s\n" % CONF["basedir"]
+        )
     else:
-        CONF['basedir'] = os.path.abspath(os.path.expanduser(
-            ask('Where do you want to create your new web site?',
-                answer=str, default=args.path)))
+        CONF["basedir"] = os.path.abspath(
+            os.path.expanduser(
+                ask(
+                    "Where do you want to create your new web site?",
+                    answer=str,
+                    default=args.path,
+                )
+            )
+        )
 
-    CONF['sitename'] = ask('What will be the title of this web site?',
-                           answer=str, default=args.title)
-    CONF['author'] = ask('Who will be the author of this web site?',
-                         answer=str, default=args.author)
-    CONF['lang'] = ask('What will be the default language of this web site?',
-                       str, args.lang or CONF['lang'], 2)
+    CONF["sitename"] = ask(
+        "What will be the title of this web site?", answer=str, default=args.title
+    )
+    CONF["author"] = ask(
+        "Who will be the author of this web site?", answer=str, default=args.author
+    )
+    CONF["lang"] = ask(
+        "What will be the default language of this web site?",
+        str,
+        args.lang or CONF["lang"],
+        2,
+    )
 
-    if ask('Do you want to specify a URL prefix? e.g., https://example.com  ',
-           answer=bool, default=True):
-        CONF['siteurl'] = ask('What is your URL prefix? (see '
-                              'above example; no trailing slash)',
-                              str, CONF['siteurl'])
+    if ask(
+        "Do you want to specify a URL prefix? e.g., https://example.com  ",
+        answer=bool,
+        default=True,
+    ):
+        CONF["siteurl"] = ask(
+            "What is your URL prefix? (see " "above example; no trailing slash)",
+            str,
+            CONF["siteurl"],
+        )
 
-    CONF['with_pagination'] = ask('Do you want to enable article pagination?',
-                                  bool, bool(CONF['default_pagination']))
+    CONF["with_pagination"] = ask(
+        "Do you want to enable article pagination?",
+        bool,
+        bool(CONF["default_pagination"]),
+    )
 
-    if CONF['with_pagination']:
-        CONF['default_pagination'] = ask('How many articles per page '
-                                         'do you want?',
-                                         int, CONF['default_pagination'])
+    if CONF["with_pagination"]:
+        CONF["default_pagination"] = ask(
+            "How many articles per page " "do you want?",
+            int,
+            CONF["default_pagination"],
+        )
     else:
-        CONF['default_pagination'] = False
+        CONF["default_pagination"] = False
 
-    CONF['timezone'] = ask_timezone('What is your time zone?',
-                                    CONF['timezone'], _TZ_URL)
+    CONF["timezone"] = ask_timezone(
+        "What is your time zone?", CONF["timezone"], _TZ_URL
+    )
 
-    automation = ask('Do you want to generate a tasks.py/Makefile '
-                     'to automate generation and publishing?', bool, True)
+    automation = ask(
+        "Do you want to generate a tasks.py/Makefile "
+        "to automate generation and publishing?",
+        bool,
+        True,
+    )
 
     if automation:
-        if ask('Do you want to upload your website using FTP?',
-               answer=bool, default=False):
-            CONF['ftp'] = True,
-            CONF['ftp_host'] = ask('What is the hostname of your FTP server?',
-                                   str, CONF['ftp_host'])
-            CONF['ftp_user'] = ask('What is your username on that server?',
-                                   str, CONF['ftp_user'])
-            CONF['ftp_target_dir'] = ask('Where do you want to put your '
-                                         'web site on that server?',
-                                         str, CONF['ftp_target_dir'])
-        if ask('Do you want to upload your website using SSH?',
-               answer=bool, default=False):
-            CONF['ssh'] = True,
-            CONF['ssh_host'] = ask('What is the hostname of your SSH server?',
-                                   str, CONF['ssh_host'])
-            CONF['ssh_port'] = ask('What is the port of your SSH server?',
-                                   int, CONF['ssh_port'])
-            CONF['ssh_user'] = ask('What is your username on that server?',
-                                   str, CONF['ssh_user'])
-            CONF['ssh_target_dir'] = ask('Where do you want to put your '
-                                         'web site on that server?',
-                                         str, CONF['ssh_target_dir'])
+        if ask(
+            "Do you want to upload your website using FTP?", answer=bool, default=False
+        ):
+            CONF["ftp"] = (True,)
+            CONF["ftp_host"] = ask(
+                "What is the hostname of your FTP server?", str, CONF["ftp_host"]
+            )
+            CONF["ftp_user"] = ask(
+                "What is your username on that server?", str, CONF["ftp_user"]
+            )
+            CONF["ftp_target_dir"] = ask(
+                "Where do you want to put your " "web site on that server?",
+                str,
+                CONF["ftp_target_dir"],
+            )
+        if ask(
+            "Do you want to upload your website using SSH?", answer=bool, default=False
+        ):
+            CONF["ssh"] = (True,)
+            CONF["ssh_host"] = ask(
+                "What is the hostname of your SSH server?", str, CONF["ssh_host"]
+            )
+            CONF["ssh_port"] = ask(
+                "What is the port of your SSH server?", int, CONF["ssh_port"]
+            )
+            CONF["ssh_user"] = ask(
+                "What is your username on that server?", str, CONF["ssh_user"]
+            )
+            CONF["ssh_target_dir"] = ask(
+                "Where do you want to put your " "web site on that server?",
+                str,
+                CONF["ssh_target_dir"],
+            )
 
-        if ask('Do you want to upload your website using Dropbox?',
-               answer=bool, default=False):
-            CONF['dropbox'] = True,
-            CONF['dropbox_dir'] = ask('Where is your Dropbox directory?',
-                                      str, CONF['dropbox_dir'])
+        if ask(
+            "Do you want to upload your website using Dropbox?",
+            answer=bool,
+            default=False,
+        ):
+            CONF["dropbox"] = (True,)
+            CONF["dropbox_dir"] = ask(
+                "Where is your Dropbox directory?", str, CONF["dropbox_dir"]
+            )
 
-        if ask('Do you want to upload your website using S3?',
-               answer=bool, default=False):
-            CONF['s3'] = True,
-            CONF['s3_bucket'] = ask('What is the name of your S3 bucket?',
-                                    str, CONF['s3_bucket'])
+        if ask(
+            "Do you want to upload your website using S3?", answer=bool, default=False
+        ):
+            CONF["s3"] = (True,)
+            CONF["s3_bucket"] = ask(
+                "What is the name of your S3 bucket?", str, CONF["s3_bucket"]
+            )
 
-        if ask('Do you want to upload your website using '
-               'Rackspace Cloud Files?', answer=bool, default=False):
-            CONF['cloudfiles'] = True,
-            CONF['cloudfiles_username'] = ask('What is your Rackspace '
-                                              'Cloud username?', str,
-                                              CONF['cloudfiles_username'])
-            CONF['cloudfiles_api_key'] = ask('What is your Rackspace '
-                                             'Cloud API key?', str,
-                                             CONF['cloudfiles_api_key'])
-            CONF['cloudfiles_container'] = ask('What is the name of your '
-                                               'Cloud Files container?',
-                                               str,
-                                               CONF['cloudfiles_container'])
+        if ask(
+            "Do you want to upload your website using " "Rackspace Cloud Files?",
+            answer=bool,
+            default=False,
+        ):
+            CONF["cloudfiles"] = (True,)
+            CONF["cloudfiles_username"] = ask(
+                "What is your Rackspace " "Cloud username?",
+                str,
+                CONF["cloudfiles_username"],
+            )
+            CONF["cloudfiles_api_key"] = ask(
+                "What is your Rackspace " "Cloud API key?",
+                str,
+                CONF["cloudfiles_api_key"],
+            )
+            CONF["cloudfiles_container"] = ask(
+                "What is the name of your " "Cloud Files container?",
+                str,
+                CONF["cloudfiles_container"],
+            )
 
-        if ask('Do you want to upload your website using GitHub Pages?',
-               answer=bool, default=False):
-            CONF['github'] = True,
-            if ask('Is this your personal page (username.github.io)?',
-                   answer=bool, default=False):
-                CONF['github_pages_branch'] = \
-                    _GITHUB_PAGES_BRANCHES['personal']
+        if ask(
+            "Do you want to upload your website using GitHub Pages?",
+            answer=bool,
+            default=False,
+        ):
+            CONF["github"] = (True,)
+            if ask(
+                "Is this your personal page (username.github.io)?",
+                answer=bool,
+                default=False,
+            ):
+                CONF["github_pages_branch"] = _GITHUB_PAGES_BRANCHES["personal"]
             else:
-                CONF['github_pages_branch'] = \
-                    _GITHUB_PAGES_BRANCHES['project']
+                CONF["github_pages_branch"] = _GITHUB_PAGES_BRANCHES["project"]
 
     try:
-        os.makedirs(os.path.join(CONF['basedir'], 'content'))
+        os.makedirs(os.path.join(CONF["basedir"], "content"))
     except OSError as e:
-        print('Error: {}'.format(e))
+        print("Error: {}".format(e))
 
     try:
-        os.makedirs(os.path.join(CONF['basedir'], 'output'))
+        os.makedirs(os.path.join(CONF["basedir"], "output"))
     except OSError as e:
-        print('Error: {}'.format(e))
+        print("Error: {}".format(e))
 
     conf_python = dict()
     for key, value in CONF.items():
         conf_python[key] = repr(value)
-    render_jinja_template('pelicanconf.py.jinja2', conf_python, 'pelicanconf.py')
+    render_jinja_template("pelicanconf.py.jinja2", conf_python, "pelicanconf.py")
 
-    render_jinja_template('publishconf.py.jinja2', CONF, 'publishconf.py')
+    render_jinja_template("publishconf.py.jinja2", CONF, "publishconf.py")
 
     if automation:
-        render_jinja_template('tasks.py.jinja2', CONF, 'tasks.py')
-        render_jinja_template('Makefile.jinja2', CONF, 'Makefile')
+        render_jinja_template("tasks.py.jinja2", CONF, "tasks.py")
+        render_jinja_template("Makefile.jinja2", CONF, "Makefile")
 
-    print('Done. Your new project is available at %s' % CONF['basedir'])
+    print("Done. Your new project is available at %s" % CONF["basedir"])
 
 
 if __name__ == "__main__":
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 1ad3a333..4069f99b 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -8,7 +8,7 @@ import sys
 
 def err(msg, die=None):
     """Print an error message and exits if an exit code is given"""
-    sys.stderr.write(msg + '\n')
+    sys.stderr.write(msg + "\n")
     if die:
         sys.exit(die if isinstance(die, int) else 1)
 
@@ -16,62 +16,96 @@ def err(msg, die=None):
 try:
     import pelican
 except ImportError:
-    err('Cannot import pelican.\nYou must '
-        'install Pelican in order to run this script.',
-        -1)
+    err(
+        "Cannot import pelican.\nYou must "
+        "install Pelican in order to run this script.",
+        -1,
+    )
 
 
 global _THEMES_PATH
 _THEMES_PATH = os.path.join(
-    os.path.dirname(
-        os.path.abspath(pelican.__file__)
-    ),
-    'themes'
+    os.path.dirname(os.path.abspath(pelican.__file__)), "themes"
 )
 
-__version__ = '0.2'
-_BUILTIN_THEMES = ['simple', 'notmyidea']
+__version__ = "0.2"
+_BUILTIN_THEMES = ["simple", "notmyidea"]
 
 
 def main():
     """Main function"""
 
-    parser = argparse.ArgumentParser(
-        description="""Install themes for Pelican""")
+    parser = argparse.ArgumentParser(description="""Install themes for Pelican""")
 
     excl = parser.add_mutually_exclusive_group()
     excl.add_argument(
-        '-l', '--list', dest='action', action="store_const", const='list',
-        help="Show the themes already installed and exit")
+        "-l",
+        "--list",
+        dest="action",
+        action="store_const",
+        const="list",
+        help="Show the themes already installed and exit",
+    )
     excl.add_argument(
-        '-p', '--path', dest='action', action="store_const", const='path',
-        help="Show the themes path and exit")
+        "-p",
+        "--path",
+        dest="action",
+        action="store_const",
+        const="path",
+        help="Show the themes path and exit",
+    )
     excl.add_argument(
-        '-V', '--version', action='version',
-        version='pelican-themes v{}'.format(__version__),
-        help='Print the version of this script')
+        "-V",
+        "--version",
+        action="version",
+        version="pelican-themes v{}".format(__version__),
+        help="Print the version of this script",
+    )
 
     parser.add_argument(
-        '-i', '--install', dest='to_install', nargs='+', metavar="theme path",
-        help='The themes to install')
+        "-i",
+        "--install",
+        dest="to_install",
+        nargs="+",
+        metavar="theme path",
+        help="The themes to install",
+    )
     parser.add_argument(
-        '-r', '--remove', dest='to_remove', nargs='+', metavar="theme name",
-        help='The themes to remove')
+        "-r",
+        "--remove",
+        dest="to_remove",
+        nargs="+",
+        metavar="theme name",
+        help="The themes to remove",
+    )
     parser.add_argument(
-        '-U', '--upgrade', dest='to_upgrade', nargs='+',
-        metavar="theme path", help='The themes to upgrade')
+        "-U",
+        "--upgrade",
+        dest="to_upgrade",
+        nargs="+",
+        metavar="theme path",
+        help="The themes to upgrade",
+    )
     parser.add_argument(
-        '-s', '--symlink', dest='to_symlink', nargs='+', metavar="theme path",
+        "-s",
+        "--symlink",
+        dest="to_symlink",
+        nargs="+",
+        metavar="theme path",
         help="Same as `--install', but create a symbolic link instead of "
-             "copying the theme. Useful for theme development")
+        "copying the theme. Useful for theme development",
+    )
     parser.add_argument(
-        '-c', '--clean', dest='clean', action="store_true",
-        help="Remove the broken symbolic links of the theme path")
+        "-c",
+        "--clean",
+        dest="clean",
+        action="store_true",
+        help="Remove the broken symbolic links of the theme path",
+    )
 
     parser.add_argument(
-        '-v', '--verbose', dest='verbose',
-        action="store_true",
-        help="Verbose output")
+        "-v", "--verbose", dest="verbose", action="store_true", help="Verbose output"
+    )
 
     args = parser.parse_args()
 
@@ -79,46 +113,46 @@ def main():
     to_sym = args.to_symlink or args.clean
 
     if args.action:
-        if args.action == 'list':
+        if args.action == "list":
             list_themes(args.verbose)
-        elif args.action == 'path':
+        elif args.action == "path":
             print(_THEMES_PATH)
     elif to_install or args.to_remove or to_sym:
         if args.to_remove:
             if args.verbose:
-                print('Removing themes...')
+                print("Removing themes...")
 
             for i in args.to_remove:
                 remove(i, v=args.verbose)
 
         if args.to_install:
             if args.verbose:
-                print('Installing themes...')
+                print("Installing themes...")
 
             for i in args.to_install:
                 install(i, v=args.verbose)
 
         if args.to_upgrade:
             if args.verbose:
-                print('Upgrading themes...')
+                print("Upgrading themes...")
 
             for i in args.to_upgrade:
                 install(i, v=args.verbose, u=True)
 
         if args.to_symlink:
             if args.verbose:
-                print('Linking themes...')
+                print("Linking themes...")
 
             for i in args.to_symlink:
                 symlink(i, v=args.verbose)
 
         if args.clean:
             if args.verbose:
-                print('Cleaning the themes directory...')
+                print("Cleaning the themes directory...")
 
             clean(v=args.verbose)
     else:
-        print('No argument given... exiting.')
+        print("No argument given... exiting.")
 
 
 def themes():
@@ -142,7 +176,7 @@ def list_themes(v=False):
             if v:
                 print(theme_path + (" (symbolic link to `" + link_target + "')"))
             else:
-                print(theme_path + '@')
+                print(theme_path + "@")
         else:
             print(theme_path)
 
@@ -150,51 +184,52 @@ def list_themes(v=False):
 def remove(theme_name, v=False):
     """Removes a theme"""
 
-    theme_name = theme_name.replace('/', '')
+    theme_name = theme_name.replace("/", "")
     target = os.path.join(_THEMES_PATH, theme_name)
 
     if theme_name in _BUILTIN_THEMES:
-        err(theme_name + ' is a builtin theme.\n'
-            'You cannot remove a builtin theme with this script, '
-            'remove it by hand if you want.')
+        err(
+            theme_name + " is a builtin theme.\n"
+            "You cannot remove a builtin theme with this script, "
+            "remove it by hand if you want."
+        )
     elif os.path.islink(target):
         if v:
-            print('Removing link `' + target + "'")
+            print("Removing link `" + target + "'")
         os.remove(target)
     elif os.path.isdir(target):
         if v:
-            print('Removing directory `' + target + "'")
+            print("Removing directory `" + target + "'")
         shutil.rmtree(target)
     elif os.path.exists(target):
-        err(target + ' : not a valid theme')
+        err(target + " : not a valid theme")
     else:
-        err(target + ' : no such file or directory')
+        err(target + " : no such file or directory")
 
 
 def install(path, v=False, u=False):
     """Installs a theme"""
     if not os.path.exists(path):
-        err(path + ' : no such file or directory')
+        err(path + " : no such file or directory")
     elif not os.path.isdir(path):
-        err(path + ' : not a directory')
+        err(path + " : not a directory")
     else:
         theme_name = os.path.basename(os.path.normpath(path))
         theme_path = os.path.join(_THEMES_PATH, theme_name)
         exists = os.path.exists(theme_path)
         if exists and not u:
-            err(path + ' : already exists')
+            err(path + " : already exists")
         elif exists:
             remove(theme_name, v)
             install(path, v)
         else:
             if v:
-                print("Copying '{p}' to '{t}' ...".format(p=path,
-                                                          t=theme_path))
+                print("Copying '{p}' to '{t}' ...".format(p=path, t=theme_path))
             try:
                 shutil.copytree(path, theme_path)
 
                 try:
-                    if os.name == 'posix':
+                    if os.name == "posix":
                         for root, dirs, files in os.walk(theme_path):
                             for d in dirs:
                                 dname = os.path.join(root, d)
@@ -203,35 +238,41 @@ def install(path, v=False, u=False):
                                 fname = os.path.join(root, f)
                                 os.chmod(fname, 420)  # 0o644
                 except OSError as e:
-                    err("Cannot change permissions of files "
-                        "or directory in `{r}':\n{e}".format(r=theme_path,
-                                                             e=str(e)),
-                        die=False)
+                    err(
+                        "Cannot change permissions of files "
+                        "or directory in `{r}':\n{e}".format(r=theme_path, e=str(e)),
+                        die=False,
+                    )
             except Exception as e:
-                err("Cannot copy `{p}' to `{t}':\n{e}".format(
-                    p=path, t=theme_path, e=str(e)))
+                err(
+                    "Cannot copy `{p}' to `{t}':\n{e}".format(
+                        p=path, t=theme_path, e=str(e)
+                    )
+                )
 
 
 def symlink(path, v=False):
     """Symbolically link a theme"""
     if not os.path.exists(path):
-        err(path + ' : no such file or directory')
+        err(path + " : no such file or directory")
     elif not os.path.isdir(path):
-        err(path + ' : not a directory')
+        err(path + " : not a directory")
     else:
         theme_name = os.path.basename(os.path.normpath(path))
         theme_path = os.path.join(_THEMES_PATH, theme_name)
         if os.path.exists(theme_path):
-            err(path + ' : already exists')
+            err(path + " : already exists")
         else:
             if v:
-                print("Linking `{p}' to `{t}' ...".format(
-                    p=path, t=theme_path))
+                print("Linking `{p}' to `{t}' ...".format(p=path, t=theme_path))
             try:
                 os.symlink(path, theme_path)
             except Exception as e:
-                err("Cannot link `{p}' to `{t}':\n{e}".format(
-                    p=path, t=theme_path, e=str(e)))
+                err(
+                    "Cannot link `{p}' to `{t}':\n{e}".format(
+                        p=path, t=theme_path, e=str(e)
+                    )
+                )
 
 
 def is_broken_link(path):
@@ -247,11 +288,11 @@ def clean(v=False):
         path = os.path.join(_THEMES_PATH, path)
         if os.path.islink(path) and is_broken_link(path):
             if v:
-                print('Removing {}'.format(path))
+                print("Removing {}".format(path))
             try:
                 os.remove(path)
             except OSError:
-                print('Error: cannot remove {}'.format(path))
+                print("Error: cannot remove {}".format(path))
             else:
                 c += 1
 
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index e00b914c..2e8cc953 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -31,17 +31,16 @@ class URLWrapper:
     @property
     def slug(self):
         if self._slug is None:
-            class_key = '{}_REGEX_SUBSTITUTIONS'.format(
-                self.__class__.__name__.upper())
+            class_key = "{}_REGEX_SUBSTITUTIONS".format(self.__class__.__name__.upper())
             regex_subs = self.settings.get(
-                class_key,
-                self.settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
-            preserve_case = self.settings.get('SLUGIFY_PRESERVE_CASE', False)
+                class_key, self.settings.get("SLUG_REGEX_SUBSTITUTIONS", [])
+            )
+            preserve_case = self.settings.get("SLUGIFY_PRESERVE_CASE", False)
             self._slug = slugify(
                 self.name,
                 regex_subs=regex_subs,
                 preserve_case=preserve_case,
-                use_unicode=self.settings.get('SLUGIFY_USE_UNICODE', False)
+                use_unicode=self.settings.get("SLUGIFY_USE_UNICODE", False),
             )
         return self._slug
 
@@ -53,26 +52,26 @@ class URLWrapper:
 
     def as_dict(self):
         d = self.__dict__
-        d['name'] = self.name
-        d['slug'] = self.slug
+        d["name"] = self.name
+        d["slug"] = self.slug
         return d
 
     def __hash__(self):
         return hash(self.slug)
 
     def _normalize_key(self, key):
-        class_key = '{}_REGEX_SUBSTITUTIONS'.format(
-            self.__class__.__name__.upper())
+        class_key = "{}_REGEX_SUBSTITUTIONS".format(self.__class__.__name__.upper())
         regex_subs = self.settings.get(
-            class_key,
-            self.settings.get('SLUG_REGEX_SUBSTITUTIONS', []))
-        use_unicode = self.settings.get('SLUGIFY_USE_UNICODE', False)
-        preserve_case = self.settings.get('SLUGIFY_PRESERVE_CASE', False)
+            class_key, self.settings.get("SLUG_REGEX_SUBSTITUTIONS", [])
+        )
+        use_unicode = self.settings.get("SLUGIFY_USE_UNICODE", False)
+        preserve_case = self.settings.get("SLUGIFY_PRESERVE_CASE", False)
         return slugify(
             key,
             regex_subs=regex_subs,
             preserve_case=preserve_case,
-            use_unicode=use_unicode)
+            use_unicode=use_unicode,
+        )
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):
@@ -99,7 +98,7 @@ class URLWrapper:
         return self.name
 
     def __repr__(self):
-        return '<{} {}>'.format(type(self).__name__, repr(self._name))
+        return "<{} {}>".format(type(self).__name__, repr(self._name))
 
     def _from_settings(self, key, get_page_name=False):
         """Returns URL information as defined in settings.
@@ -114,7 +113,7 @@ class URLWrapper:
         if isinstance(value, pathlib.Path):
             value = str(value)
         if not isinstance(value, str):
-            logger.warning('%s is set to %s', setting, value)
+            logger.warning("%s is set to %s", setting, value)
             return value
         else:
             if get_page_name:
@@ -122,10 +121,11 @@ class URLWrapper:
             else:
                 return value.format(**self.as_dict())
 
-    page_name = property(functools.partial(_from_settings, key='URL',
-                         get_page_name=True))
-    url = property(functools.partial(_from_settings, key='URL'))
-    save_as = property(functools.partial(_from_settings, key='SAVE_AS'))
+    page_name = property(
+        functools.partial(_from_settings, key="URL", get_page_name=True)
+    )
+    url = property(functools.partial(_from_settings, key="URL"))
+    save_as = property(functools.partial(_from_settings, key="SAVE_AS"))
 
 
 class Category(URLWrapper):
diff --git a/pelican/utils.py b/pelican/utils.py
index 09ffcfe6..08a08f7e 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -32,38 +32,37 @@ logger = logging.getLogger(__name__)
 
 
 def sanitised_join(base_directory, *parts):
-    joined = posixize_path(
-        os.path.abspath(os.path.join(base_directory, *parts)))
+    joined = posixize_path(os.path.abspath(os.path.join(base_directory, *parts)))
     base = posixize_path(os.path.abspath(base_directory))
     if not joined.startswith(base):
         raise RuntimeError(
-            "Attempted to break out of output directory to {}".format(
-                joined
-            )
+            "Attempted to break out of output directory to {}".format(joined)
         )
 
     return joined
 
 
 def strftime(date, date_format):
-    '''
+    """
     Enhanced replacement for built-in strftime with zero stripping
 
     This works by 'grabbing' possible format strings (those starting with %),
     formatting them with the date, stripping any leading zeros if - prefix is
     used and replacing formatted output back.
-    '''
+    """
+
     def strip_zeros(x):
-        return x.lstrip('0') or '0'
+        return x.lstrip("0") or "0"
+
     # includes ISO date parameters added by Python 3.6
-    c89_directives = 'aAbBcdfGHIjmMpSUuVwWxXyYzZ%'
+    c89_directives = "aAbBcdfGHIjmMpSUuVwWxXyYzZ%"
 
     # grab candidate format options
-    format_options = '%[-]?.'
+    format_options = "%[-]?."
     candidates = re.findall(format_options, date_format)
 
     # replace candidates with placeholders for later % formatting
-    template = re.sub(format_options, '%s', date_format)
+    template = re.sub(format_options, "%s", date_format)
 
     formatted_candidates = []
     for candidate in candidates:
@@ -72,7 +71,7 @@ def strftime(date, date_format):
             # check for '-' prefix
             if len(candidate) == 3:
                 # '-' prefix
-                candidate = '%{}'.format(candidate[-1])
+                candidate = "%{}".format(candidate[-1])
                 conversion = strip_zeros
             else:
                 conversion = None
@@ -95,10 +94,10 @@ def strftime(date, date_format):
 
 
 class SafeDatetime(datetime.datetime):
-    '''Subclass of datetime that works with utf-8 format strings on PY2'''
+    """Subclass of datetime that works with utf-8 format strings on PY2"""
 
     def strftime(self, fmt, safe=True):
-        '''Uses our custom strftime if supposed to be *safe*'''
+        """Uses our custom strftime if supposed to be *safe*"""
         if safe:
             return strftime(self, fmt)
         else:
@@ -106,22 +105,21 @@ class SafeDatetime(datetime.datetime):
 
 
 class DateFormatter:
-    '''A date formatter object used as a jinja filter
+    """A date formatter object used as a jinja filter
 
     Uses the `strftime` implementation and makes sure jinja uses the locale
     defined in LOCALE setting
-    '''
+    """
 
     def __init__(self):
         self.locale = locale.setlocale(locale.LC_TIME)
 
     def __call__(self, date, date_format):
-
         # on OSX, encoding from LC_CTYPE determines the unicode output in PY3
         # make sure it's same as LC_TIME
-        with temporary_locale(self.locale, locale.LC_TIME), \
-          temporary_locale(self.locale, locale.LC_CTYPE):
-
+        with temporary_locale(self.locale, locale.LC_TIME), temporary_locale(
+            self.locale, locale.LC_CTYPE
+        ):
             formatted = strftime(date, date_format)
 
         return formatted
@@ -155,7 +153,7 @@ class memoized:
         return self.func.__doc__
 
     def __get__(self, obj, objtype):
-        '''Support instance methods.'''
+        """Support instance methods."""
         fn = partial(self.__call__, obj)
         fn.cache = self.cache
         return fn
@@ -177,17 +175,16 @@ def deprecated_attribute(old, new, since=None, remove=None, doc=None):
     Note that the decorator needs a dummy method to attach to, but the
     content of the dummy method is ignored.
     """
+
     def _warn():
-        version = '.'.join(str(x) for x in since)
-        message = ['{} has been deprecated since {}'.format(old, version)]
+        version = ".".join(str(x) for x in since)
+        message = ["{} has been deprecated since {}".format(old, version)]
         if remove:
-            version = '.'.join(str(x) for x in remove)
-            message.append(
-                ' and will be removed by version {}'.format(version))
-        message.append('.  Use {} instead.'.format(new))
-        logger.warning(''.join(message))
-        logger.debug(''.join(str(x) for x
-                             in traceback.format_stack()))
+            version = ".".join(str(x) for x in remove)
+            message.append(" and will be removed by version {}".format(version))
+        message.append(".  Use {} instead.".format(new))
+        logger.warning("".join(message))
+        logger.debug("".join(str(x) for x in traceback.format_stack()))
 
     def fget(self):
         _warn()
@@ -208,21 +205,20 @@ def get_date(string):
 
     If no format matches the given date, raise a ValueError.
     """
-    string = re.sub(' +', ' ', string)
-    default = SafeDatetime.now().replace(hour=0, minute=0,
-                                         second=0, microsecond=0)
+    string = re.sub(" +", " ", string)
+    default = SafeDatetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
     try:
         return dateutil.parser.parse(string, default=default)
     except (TypeError, ValueError):
-        raise ValueError('{!r} is not a valid date'.format(string))
+        raise ValueError("{!r} is not a valid date".format(string))
 
 
 @contextmanager
-def pelican_open(filename, mode='r', strip_crs=(sys.platform == 'win32')):
+def pelican_open(filename, mode="r", strip_crs=(sys.platform == "win32")):
     """Open a file and return its content"""
 
     # utf-8-sig will clear any BOM if present
-    with open(filename, mode, encoding='utf-8-sig') as infile:
+    with open(filename, mode, encoding="utf-8-sig") as infile:
         content = infile.read()
     yield content
 
@@ -244,7 +240,7 @@ def slugify(value, regex_subs=(), preserve_case=False, use_unicode=False):
     def normalize_unicode(text):
         # normalize text by compatibility composition
         # see: https://en.wikipedia.org/wiki/Unicode_equivalence
-        return unicodedata.normalize('NFKC', text)
+        return unicodedata.normalize("NFKC", text)
 
     # strip tags from value
     value = Markup(value).striptags()
@@ -259,10 +255,8 @@ def slugify(value, regex_subs=(), preserve_case=False, use_unicode=False):
     # perform regex substitutions
     for src, dst in regex_subs:
         value = re.sub(
-            normalize_unicode(src),
-            normalize_unicode(dst),
-            value,
-            flags=re.IGNORECASE)
+            normalize_unicode(src), normalize_unicode(dst), value, flags=re.IGNORECASE
+        )
 
     if not preserve_case:
         value = value.lower()
@@ -283,8 +277,7 @@ def copy(source, destination, ignores=None):
     """
 
     def walk_error(err):
-        logger.warning("While copying %s: %s: %s",
-                       source_, err.filename, err.strerror)
+        logger.warning("While copying %s: %s: %s", source_, err.filename, err.strerror)
 
     source_ = os.path.abspath(os.path.expanduser(source))
     destination_ = os.path.abspath(os.path.expanduser(destination))
@@ -292,39 +285,40 @@ def copy(source, destination, ignores=None):
     if ignores is None:
         ignores = []
 
-    if any(fnmatch.fnmatch(os.path.basename(source), ignore)
-           for ignore in ignores):
-        logger.info('Not copying %s due to ignores', source_)
+    if any(fnmatch.fnmatch(os.path.basename(source), ignore) for ignore in ignores):
+        logger.info("Not copying %s due to ignores", source_)
         return
 
     if os.path.isfile(source_):
         dst_dir = os.path.dirname(destination_)
         if not os.path.exists(dst_dir):
-            logger.info('Creating directory %s', dst_dir)
+            logger.info("Creating directory %s", dst_dir)
             os.makedirs(dst_dir)
-        logger.info('Copying %s to %s', source_, destination_)
+        logger.info("Copying %s to %s", source_, destination_)
         copy_file(source_, destination_)
 
     elif os.path.isdir(source_):
         if not os.path.exists(destination_):
-            logger.info('Creating directory %s', destination_)
+            logger.info("Creating directory %s", destination_)
             os.makedirs(destination_)
         if not os.path.isdir(destination_):
-            logger.warning('Cannot copy %s (a directory) to %s (a file)',
-                           source_, destination_)
+            logger.warning(
+                "Cannot copy %s (a directory) to %s (a file)", source_, destination_
+            )
             return
 
         for src_dir, subdirs, others in os.walk(source_, followlinks=True):
-            dst_dir = os.path.join(destination_,
-                                   os.path.relpath(src_dir, source_))
+            dst_dir = os.path.join(destination_, os.path.relpath(src_dir, source_))
 
-            subdirs[:] = (s for s in subdirs if not any(fnmatch.fnmatch(s, i)
-                                                        for i in ignores))
-            others[:] = (o for o in others if not any(fnmatch.fnmatch(o, i)
-                                                      for i in ignores))
+            subdirs[:] = (
+                s for s in subdirs if not any(fnmatch.fnmatch(s, i) for i in ignores)
+            )
+            others[:] = (
+                o for o in others if not any(fnmatch.fnmatch(o, i) for i in ignores)
+            )
 
             if not os.path.isdir(dst_dir):
-                logger.info('Creating directory %s', dst_dir)
+                logger.info("Creating directory %s", dst_dir)
                 # Parent directories are known to exist, so 'mkdir' suffices.
                 os.mkdir(dst_dir)
 
@@ -332,21 +326,24 @@ def copy(source, destination, ignores=None):
                 src_path = os.path.join(src_dir, o)
                 dst_path = os.path.join(dst_dir, o)
                 if os.path.isfile(src_path):
-                    logger.info('Copying %s to %s', src_path, dst_path)
+                    logger.info("Copying %s to %s", src_path, dst_path)
                     copy_file(src_path, dst_path)
                 else:
-                    logger.warning('Skipped copy %s (not a file or '
-                                   'directory) to %s',
-                                   src_path, dst_path)
+                    logger.warning(
+                        "Skipped copy %s (not a file or " "directory) to %s",
+                        src_path,
+                        dst_path,
+                    )
 
 
 def copy_file(source, destination):
-    '''Copy a file'''
+    """Copy a file"""
     try:
         shutil.copyfile(source, destination)
     except OSError as e:
-        logger.warning("A problem occurred copying file %s to %s; %s",
-                       source, destination, e)
+        logger.warning(
+            "A problem occurred copying file %s to %s; %s", source, destination, e
+        )
 
 
 def clean_output_dir(path, retention):
@@ -367,15 +364,15 @@ def clean_output_dir(path, retention):
     for filename in os.listdir(path):
         file = os.path.join(path, filename)
         if any(filename == retain for retain in retention):
-            logger.debug("Skipping deletion; %s is on retention list: %s",
-                         filename, file)
+            logger.debug(
+                "Skipping deletion; %s is on retention list: %s", filename, file
+            )
         elif os.path.isdir(file):
             try:
                 shutil.rmtree(file)
                 logger.debug("Deleted directory %s", file)
             except Exception as e:
-                logger.error("Unable to delete directory %s; %s",
-                             file, e)
+                logger.error("Unable to delete directory %s; %s", file, e)
         elif os.path.isfile(file) or os.path.islink(file):
             try:
                 os.remove(file)
@@ -407,29 +404,31 @@ def posixize_path(rel_path):
     """Use '/' as path separator, so that source references,
     like '{static}/foo/bar.jpg' or 'extras/favicon.ico',
     will work on Windows as well as on Mac and Linux."""
-    return rel_path.replace(os.sep, '/')
+    return rel_path.replace(os.sep, "/")
 
 
 class _HTMLWordTruncator(HTMLParser):
-
-    _word_regex = re.compile(r"{DBC}|(\w[\w'-]*)".format(
-        # DBC means CJK-like characters. An character can stand for a word.
-        DBC=("([\u4E00-\u9FFF])|"          # CJK Unified Ideographs
-             "([\u3400-\u4DBF])|"          # CJK Unified Ideographs Extension A
-             "([\uF900-\uFAFF])|"          # CJK Compatibility Ideographs
-             "([\U00020000-\U0002A6DF])|"  # CJK Unified Ideographs Extension B
-             "([\U0002F800-\U0002FA1F])|"  # CJK Compatibility Ideographs Supplement
-             "([\u3040-\u30FF])|"          # Hiragana and Katakana
-             "([\u1100-\u11FF])|"          # Hangul Jamo
-             "([\uAC00-\uD7FF])|"          # Hangul Compatibility Jamo
-             "([\u3130-\u318F])"           # Hangul Syllables
-             )), re.UNICODE)
-    _word_prefix_regex = re.compile(r'\w', re.U)
-    _singlets = ('br', 'col', 'link', 'base', 'img', 'param', 'area',
-                 'hr', 'input')
+    _word_regex = re.compile(
+        r"{DBC}|(\w[\w'-]*)".format(
+            # DBC means CJK-like characters. An character can stand for a word.
+            DBC=(
+                "([\u4E00-\u9FFF])|"  # CJK Unified Ideographs
+                "([\u3400-\u4DBF])|"  # CJK Unified Ideographs Extension A
+                "([\uF900-\uFAFF])|"  # CJK Compatibility Ideographs
+                "([\U00020000-\U0002A6DF])|"  # CJK Unified Ideographs Extension B
+                "([\U0002F800-\U0002FA1F])|"  # CJK Compatibility Ideographs Supplement
+                "([\u3040-\u30FF])|"  # Hiragana and Katakana
+                "([\u1100-\u11FF])|"  # Hangul Jamo
+                "([\uAC00-\uD7FF])|"  # Hangul Compatibility Jamo
+                "([\u3130-\u318F])"  # Hangul Syllables
+            )
+        ),
+        re.UNICODE,
+    )
+    _word_prefix_regex = re.compile(r"\w", re.U)
+    _singlets = ("br", "col", "link", "base", "img", "param", "area", "hr", "input")
 
     class TruncationCompleted(Exception):
-
         def __init__(self, truncate_at):
             super().__init__(truncate_at)
             self.truncate_at = truncate_at
@@ -455,7 +454,7 @@ class _HTMLWordTruncator(HTMLParser):
         line_start = 0
         lineno, line_offset = self.getpos()
         for i in range(lineno - 1):
-            line_start = self.rawdata.index('\n', line_start) + 1
+            line_start = self.rawdata.index("\n", line_start) + 1
         return line_start + line_offset
 
     def add_word(self, word_end):
@@ -482,7 +481,7 @@ class _HTMLWordTruncator(HTMLParser):
         else:
             # SGML: An end tag closes, back to the matching start tag,
             # all unclosed intervening start tags with omitted end tags
-            del self.open_tags[:i + 1]
+            del self.open_tags[: i + 1]
 
     def handle_data(self, data):
         word_end = 0
@@ -531,7 +530,7 @@ class _HTMLWordTruncator(HTMLParser):
         ref_end = offset + len(name) + 1
 
         try:
-            if self.rawdata[ref_end] == ';':
+            if self.rawdata[ref_end] == ";":
                 ref_end += 1
         except IndexError:
             # We are at the end of the string and there's no ';'
@@ -556,7 +555,7 @@ class _HTMLWordTruncator(HTMLParser):
             codepoint = entities.name2codepoint[name]
             char = chr(codepoint)
         except KeyError:
-            char = ''
+            char = ""
         self._handle_ref(name, char)
 
     def handle_charref(self, name):
@@ -567,17 +566,17 @@ class _HTMLWordTruncator(HTMLParser):
         `#x2014`)
         """
         try:
-            if name.startswith('x'):
+            if name.startswith("x"):
                 codepoint = int(name[1:], 16)
             else:
                 codepoint = int(name)
             char = chr(codepoint)
         except (ValueError, OverflowError):
-            char = ''
-        self._handle_ref('#' + name, char)
+            char = ""
+        self._handle_ref("#" + name, char)
 
 
-def truncate_html_words(s, num, end_text='…'):
+def truncate_html_words(s, num, end_text="…"):
     """Truncates HTML to a certain number of words.
 
     (not counting tags and comments). Closes opened tags if they were correctly
@@ -588,23 +587,23 @@ def truncate_html_words(s, num, end_text='…'):
     """
     length = int(num)
     if length <= 0:
-        return ''
+        return ""
     truncator = _HTMLWordTruncator(length)
     truncator.feed(s)
     if truncator.truncate_at is None:
         return s
-    out = s[:truncator.truncate_at]
+    out = s[: truncator.truncate_at]
     if end_text:
-        out += ' ' + end_text
+        out += " " + end_text
     # Close any tags still open
     for tag in truncator.open_tags:
-        out += '</%s>' % tag
+        out += "</%s>" % tag
     # Return string
     return out
 
 
 def process_translations(content_list, translation_id=None):
-    """ Finds translations and returns them.
+    """Finds translations and returns them.
 
     For each content_list item, populates the 'translations' attribute, and
     returns a tuple with two lists (index, translations). Index list includes
@@ -632,19 +631,23 @@ def process_translations(content_list, translation_id=None):
     try:
         content_list.sort(key=attrgetter(*translation_id))
     except TypeError:
-        raise TypeError('Cannot unpack {}, \'translation_id\' must be falsy, a'
-                        ' string or a collection of strings'
-                        .format(translation_id))
+        raise TypeError(
+            "Cannot unpack {}, 'translation_id' must be falsy, a"
+            " string or a collection of strings".format(translation_id)
+        )
     except AttributeError:
-        raise AttributeError('Cannot use {} as \'translation_id\', there '
-                             'appear to be items without these metadata '
-                             'attributes'.format(translation_id))
+        raise AttributeError(
+            "Cannot use {} as 'translation_id', there "
+            "appear to be items without these metadata "
+            "attributes".format(translation_id)
+        )
 
     for id_vals, items in groupby(content_list, attrgetter(*translation_id)):
         # prepare warning string
         id_vals = (id_vals,) if len(translation_id) == 1 else id_vals
-        with_str = 'with' + ', '.join([' {} "{{}}"'] * len(translation_id))\
-            .format(*translation_id).format(*id_vals)
+        with_str = "with" + ", ".join([' {} "{{}}"'] * len(translation_id)).format(
+            *translation_id
+        ).format(*id_vals)
 
         items = list(items)
         original_items = get_original_items(items, with_str)
@@ -662,24 +665,24 @@ def get_original_items(items, with_str):
         args = [len(items)]
         args.extend(extra)
         args.extend(x.source_path for x in items)
-        logger.warning('{}: {}'.format(msg, '\n%s' * len(items)), *args)
+        logger.warning("{}: {}".format(msg, "\n%s" * len(items)), *args)
 
     # warn if several items have the same lang
-    for lang, lang_items in groupby(items, attrgetter('lang')):
+    for lang, lang_items in groupby(items, attrgetter("lang")):
         lang_items = list(lang_items)
         if len(lang_items) > 1:
-            _warn_source_paths('There are %s items "%s" with lang %s',
-                               lang_items, with_str, lang)
+            _warn_source_paths(
+                'There are %s items "%s" with lang %s', lang_items, with_str, lang
+            )
 
     # items with `translation` metadata will be used as translations...
     candidate_items = [
-        i for i in items
-        if i.metadata.get('translation', 'false').lower() == 'false']
+        i for i in items if i.metadata.get("translation", "false").lower() == "false"
+    ]
 
     # ...unless all items with that slug are translations
     if not candidate_items:
-        _warn_source_paths('All items ("%s") "%s" are translations',
-                           items, with_str)
+        _warn_source_paths('All items ("%s") "%s" are translations', items, with_str)
         candidate_items = items
 
     # find items with default language
@@ -691,13 +694,14 @@ def get_original_items(items, with_str):
 
     # warn if there are several original items
     if len(original_items) > 1:
-        _warn_source_paths('There are %s original (not translated) items %s',
-                           original_items, with_str)
+        _warn_source_paths(
+            "There are %s original (not translated) items %s", original_items, with_str
+        )
     return original_items
 
 
-def order_content(content_list, order_by='slug'):
-    """ Sorts content.
+def order_content(content_list, order_by="slug"):
+    """Sorts content.
 
     order_by can be a string of an attribute or sorting function. If order_by
     is defined, content will be ordered by that attribute or sorting function.
@@ -713,22 +717,22 @@ def order_content(content_list, order_by='slug'):
             try:
                 content_list.sort(key=order_by)
             except Exception:
-                logger.error('Error sorting with function %s', order_by)
+                logger.error("Error sorting with function %s", order_by)
         elif isinstance(order_by, str):
-            if order_by.startswith('reversed-'):
+            if order_by.startswith("reversed-"):
                 order_reversed = True
-                order_by = order_by.replace('reversed-', '', 1)
+                order_by = order_by.replace("reversed-", "", 1)
             else:
                 order_reversed = False
 
-            if order_by == 'basename':
+            if order_by == "basename":
                 content_list.sort(
-                    key=lambda x: os.path.basename(x.source_path or ''),
-                    reverse=order_reversed)
+                    key=lambda x: os.path.basename(x.source_path or ""),
+                    reverse=order_reversed,
+                )
             else:
                 try:
-                    content_list.sort(key=attrgetter(order_by),
-                                      reverse=order_reversed)
+                    content_list.sort(key=attrgetter(order_by), reverse=order_reversed)
                 except AttributeError:
                     for content in content_list:
                         try:
@@ -736,26 +740,31 @@ def order_content(content_list, order_by='slug'):
                         except AttributeError:
                             logger.warning(
                                 'There is no "%s" attribute in "%s". '
-                                'Defaulting to slug order.',
+                                "Defaulting to slug order.",
                                 order_by,
                                 content.get_relative_source_path(),
                                 extra={
-                                    'limit_msg': ('More files are missing '
-                                                  'the needed attribute.')
-                                })
+                                    "limit_msg": (
+                                        "More files are missing "
+                                        "the needed attribute."
+                                    )
+                                },
+                            )
         else:
             logger.warning(
-                'Invalid *_ORDER_BY setting (%s). '
-                'Valid options are strings and functions.', order_by)
+                "Invalid *_ORDER_BY setting (%s). "
+                "Valid options are strings and functions.",
+                order_by,
+            )
 
     return content_list
 
 
 def wait_for_changes(settings_file, reader_class, settings):
-    content_path = settings.get('PATH', '')
-    theme_path = settings.get('THEME', '')
+    content_path = settings.get("PATH", "")
+    theme_path = settings.get("THEME", "")
     ignore_files = set(
-        fnmatch.translate(pattern) for pattern in settings.get('IGNORE_FILES', [])
+        fnmatch.translate(pattern) for pattern in settings.get("IGNORE_FILES", [])
     )
 
     candidate_paths = [
@@ -765,7 +774,7 @@ def wait_for_changes(settings_file, reader_class, settings):
     ]
 
     candidate_paths.extend(
-        os.path.join(content_path, path) for path in settings.get('STATIC_PATHS', [])
+        os.path.join(content_path, path) for path in settings.get("STATIC_PATHS", [])
     )
 
     watching_paths = []
@@ -778,11 +787,13 @@ def wait_for_changes(settings_file, reader_class, settings):
         else:
             watching_paths.append(path)
 
-    return next(watchfiles.watch(
-        *watching_paths,
-        watch_filter=watchfiles.DefaultFilter(ignore_entity_patterns=ignore_files),
-        rust_timeout=0
-    ))
+    return next(
+        watchfiles.watch(
+            *watching_paths,
+            watch_filter=watchfiles.DefaultFilter(ignore_entity_patterns=ignore_files),
+            rust_timeout=0,
+        )
+    )
 
 
 def set_date_tzinfo(d, tz_name=None):
@@ -811,7 +822,7 @@ def split_all(path):
     """
     if isinstance(path, str):
         components = []
-        path = path.lstrip('/')
+        path = path.lstrip("/")
         while path:
             head, tail = os.path.split(path)
             if tail:
@@ -827,32 +838,30 @@ def split_all(path):
         return None
     else:
         raise TypeError(
-            '"path" was {}, must be string, None, or pathlib.Path'.format(
-                type(path)
-            )
+            '"path" was {}, must be string, None, or pathlib.Path'.format(type(path))
         )
 
 
 def is_selected_for_writing(settings, path):
-    '''Check whether path is selected for writing
+    """Check whether path is selected for writing
     according to the WRITE_SELECTED list
 
     If WRITE_SELECTED is an empty list (default),
     any path is selected for writing.
-    '''
-    if settings['WRITE_SELECTED']:
-        return path in settings['WRITE_SELECTED']
+    """
+    if settings["WRITE_SELECTED"]:
+        return path in settings["WRITE_SELECTED"]
     else:
         return True
 
 
 def path_to_file_url(path):
-    '''Convert file-system path to file:// URL'''
+    """Convert file-system path to file:// URL"""
     return urllib.parse.urljoin("file://", urllib.request.pathname2url(path))
 
 
 def maybe_pluralize(count, singular, plural):
-    '''
+    """
     Returns a formatted string containing count and plural if count is not 1
     Returns count and singular if count is 1
 
@@ -860,22 +869,22 @@ def maybe_pluralize(count, singular, plural):
     maybe_pluralize(1, 'Article', 'Articles') -> '1 Article'
     maybe_pluralize(2, 'Article', 'Articles') -> '2 Articles'
 
-    '''
+    """
     selection = plural
     if count == 1:
         selection = singular
-    return '{} {}'.format(count, selection)
+    return "{} {}".format(count, selection)
 
 
 @contextmanager
 def temporary_locale(temp_locale=None, lc_category=locale.LC_ALL):
-    '''
+    """
     Enable code to run in a context with a temporary locale
     Resets the locale back when exiting context.
 
     Use tests.support.TestCaseWithCLocale if you want every unit test in a
     class to use the C locale.
-    '''
+    """
     orig_locale = locale.setlocale(lc_category)
     if temp_locale:
         locale.setlocale(lc_category, temp_locale)
diff --git a/pelican/writers.py b/pelican/writers.py
index 632c6b87..ec12d125 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -9,14 +9,18 @@ from markupsafe import Markup
 
 from pelican.paginator import Paginator
 from pelican.plugins import signals
-from pelican.utils import (get_relative_path, is_selected_for_writing,
-                           path_to_url, sanitised_join, set_date_tzinfo)
+from pelican.utils import (
+    get_relative_path,
+    is_selected_for_writing,
+    path_to_url,
+    sanitised_join,
+    set_date_tzinfo,
+)
 
 logger = logging.getLogger(__name__)
 
 
 class Writer:
-
     def __init__(self, output_path, settings=None):
         self.output_path = output_path
         self.reminder = dict()
@@ -25,24 +29,26 @@ class Writer:
         self._overridden_files = set()
 
         # See Content._link_replacer for details
-        if "RELATIVE_URLS" in self.settings and self.settings['RELATIVE_URLS']:
+        if "RELATIVE_URLS" in self.settings and self.settings["RELATIVE_URLS"]:
             self.urljoiner = posix_join
         else:
             self.urljoiner = lambda base, url: urljoin(
-                base if base.endswith('/') else base + '/', str(url))
+                base if base.endswith("/") else base + "/", str(url)
+            )
 
     def _create_new_feed(self, feed_type, feed_title, context):
-        feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
+        feed_class = Rss201rev2Feed if feed_type == "rss" else Atom1Feed
         if feed_title:
-            feed_title = context['SITENAME'] + ' - ' + feed_title
+            feed_title = context["SITENAME"] + " - " + feed_title
         else:
-            feed_title = context['SITENAME']
+            feed_title = context["SITENAME"]
         return feed_class(
             title=Markup(feed_title).striptags(),
-            link=(self.site_url + '/'),
+            link=(self.site_url + "/"),
             feed_url=self.feed_url,
-            description=context.get('SITESUBTITLE', ''),
-            subtitle=context.get('SITESUBTITLE', None))
+            description=context.get("SITESUBTITLE", ""),
+            subtitle=context.get("SITESUBTITLE", None),
+        )
 
     def _add_item_to_the_feed(self, feed, item):
         title = Markup(item.title).striptags()
@@ -52,7 +58,7 @@ class Writer:
             # RSS feeds use a single tag called 'description' for both the full
             # content and the summary
             content = None
-            if self.settings.get('RSS_FEED_SUMMARY_ONLY'):
+            if self.settings.get("RSS_FEED_SUMMARY_ONLY"):
                 description = item.summary
             else:
                 description = item.get_content(self.site_url)
@@ -71,9 +77,9 @@ class Writer:
                 description = None
 
         categories = []
-        if hasattr(item, 'category'):
+        if hasattr(item, "category"):
             categories.append(item.category)
-        if hasattr(item, 'tags'):
+        if hasattr(item, "tags"):
             categories.extend(item.tags)
 
         feed.add_item(
@@ -83,14 +89,12 @@ class Writer:
             description=description,
             content=content,
             categories=categories or None,
-            author_name=getattr(item, 'author', ''),
-            pubdate=set_date_tzinfo(
-                item.date, self.settings.get('TIMEZONE', None)
-            ),
+            author_name=getattr(item, "author", ""),
+            pubdate=set_date_tzinfo(item.date, self.settings.get("TIMEZONE", None)),
             updateddate=set_date_tzinfo(
-                item.modified, self.settings.get('TIMEZONE', None)
+                item.modified, self.settings.get("TIMEZONE", None)
             )
-            if hasattr(item, 'modified')
+            if hasattr(item, "modified")
             else None,
         )
 
@@ -102,22 +106,29 @@ class Writer:
         """
         if filename in self._overridden_files:
             if override:
-                raise RuntimeError('File %s is set to be overridden twice'
-                                   % filename)
-            logger.info('Skipping %s', filename)
+                raise RuntimeError("File %s is set to be overridden twice" % filename)
+            logger.info("Skipping %s", filename)
             filename = os.devnull
         elif filename in self._written_files:
             if override:
-                logger.info('Overwriting %s', filename)
+                logger.info("Overwriting %s", filename)
             else:
-                raise RuntimeError('File %s is to be overwritten' % filename)
+                raise RuntimeError("File %s is to be overwritten" % filename)
         if override:
             self._overridden_files.add(filename)
         self._written_files.add(filename)
-        return open(filename, 'w', encoding=encoding)
+        return open(filename, "w", encoding=encoding)
 
-    def write_feed(self, elements, context, path=None, url=None,
-                   feed_type='atom', override_output=False, feed_title=None):
+    def write_feed(
+        self,
+        elements,
+        context,
+        path=None,
+        url=None,
+        feed_type="atom",
+        override_output=False,
+        feed_title=None,
+    ):
         """Generate a feed with the list of articles provided
 
         Return the feed. If no path or output_path is specified, just
@@ -137,16 +148,15 @@ class Writer:
         if not is_selected_for_writing(self.settings, path):
             return
 
-        self.site_url = context.get(
-            'SITEURL', path_to_url(get_relative_path(path)))
+        self.site_url = context.get("SITEURL", path_to_url(get_relative_path(path)))
 
-        self.feed_domain = context.get('FEED_DOMAIN')
+        self.feed_domain = context.get("FEED_DOMAIN")
         self.feed_url = self.urljoiner(self.feed_domain, url or path)
 
         feed = self._create_new_feed(feed_type, feed_title, context)
 
         # FEED_MAX_ITEMS = None means [:None] to get every element
-        for element in elements[:self.settings['FEED_MAX_ITEMS']]:
+        for element in elements[: self.settings["FEED_MAX_ITEMS"]]:
             self._add_item_to_the_feed(feed, element)
 
         signals.feed_generated.send(context, feed=feed)
@@ -158,17 +168,25 @@ class Writer:
             except Exception:
                 pass
 
-            with self._open_w(complete_path, 'utf-8', override_output) as fp:
-                feed.write(fp, 'utf-8')
-                logger.info('Writing %s', complete_path)
+            with self._open_w(complete_path, "utf-8", override_output) as fp:
+                feed.write(fp, "utf-8")
+                logger.info("Writing %s", complete_path)
 
-            signals.feed_written.send(
-                complete_path, context=context, feed=feed)
+            signals.feed_written.send(complete_path, context=context, feed=feed)
         return feed
 
-    def write_file(self, name, template, context, relative_urls=False,
-                   paginated=None, template_name=None, override_output=False,
-                   url=None, **kwargs):
+    def write_file(
+        self,
+        name,
+        template,
+        context,
+        relative_urls=False,
+        paginated=None,
+        template_name=None,
+        override_output=False,
+        url=None,
+        **kwargs,
+    ):
         """Render the template and write the file.
 
         :param name: name of the file to output
@@ -185,10 +203,13 @@ class Writer:
         :param **kwargs: additional variables to pass to the templates
         """
 
-        if name is False or \
-           name == "" or \
-           not is_selected_for_writing(self.settings,
-                                       os.path.join(self.output_path, name)):
+        if (
+            name is False
+            or name == ""
+            or not is_selected_for_writing(
+                self.settings, os.path.join(self.output_path, name)
+            )
+        ):
             return
         elif not name:
             # other stuff, just return for now
@@ -197,8 +218,8 @@ class Writer:
         def _write_file(template, localcontext, output_path, name, override):
             """Render the template write the file."""
             # set localsiteurl for context so that Contents can adjust links
-            if localcontext['localsiteurl']:
-                context['localsiteurl'] = localcontext['localsiteurl']
+            if localcontext["localsiteurl"]:
+                context["localsiteurl"] = localcontext["localsiteurl"]
             output = template.render(localcontext)
             path = sanitised_join(output_path, name)
 
@@ -207,9 +228,9 @@ class Writer:
             except Exception:
                 pass
 
-            with self._open_w(path, 'utf-8', override=override) as f:
+            with self._open_w(path, "utf-8", override=override) as f:
                 f.write(output)
-            logger.info('Writing %s', path)
+            logger.info("Writing %s", path)
 
             # Send a signal to say we're writing a file with some specific
             # local context.
@@ -217,54 +238,66 @@ class Writer:
 
         def _get_localcontext(context, name, kwargs, relative_urls):
             localcontext = context.copy()
-            localcontext['localsiteurl'] = localcontext.get(
-                'localsiteurl', None)
+            localcontext["localsiteurl"] = localcontext.get("localsiteurl", None)
             if relative_urls:
                 relative_url = path_to_url(get_relative_path(name))
-                localcontext['SITEURL'] = relative_url
-                localcontext['localsiteurl'] = relative_url
-            localcontext['output_file'] = name
+                localcontext["SITEURL"] = relative_url
+                localcontext["localsiteurl"] = relative_url
+            localcontext["output_file"] = name
             localcontext.update(kwargs)
             return localcontext
 
         if paginated is None:
-            paginated = {key: val for key, val in kwargs.items()
-                         if key in {'articles', 'dates'}}
+            paginated = {
+                key: val for key, val in kwargs.items() if key in {"articles", "dates"}
+            }
 
         # pagination
-        if paginated and template_name in self.settings['PAGINATED_TEMPLATES']:
+        if paginated and template_name in self.settings["PAGINATED_TEMPLATES"]:
             # pagination needed
-            per_page = self.settings['PAGINATED_TEMPLATES'][template_name] \
-                or self.settings['DEFAULT_PAGINATION']
+            per_page = (
+                self.settings["PAGINATED_TEMPLATES"][template_name]
+                or self.settings["DEFAULT_PAGINATION"]
+            )
 
             # init paginators
-            paginators = {key: Paginator(name, url, val, self.settings,
-                                         per_page)
-                          for key, val in paginated.items()}
+            paginators = {
+                key: Paginator(name, url, val, self.settings, per_page)
+                for key, val in paginated.items()
+            }
 
             # generated pages, and write
             for page_num in range(list(paginators.values())[0].num_pages):
                 paginated_kwargs = kwargs.copy()
                 for key in paginators.keys():
                     paginator = paginators[key]
-                    previous_page = paginator.page(page_num) \
-                        if page_num > 0 else None
+                    previous_page = paginator.page(page_num) if page_num > 0 else None
                     page = paginator.page(page_num + 1)
-                    next_page = paginator.page(page_num + 2) \
-                        if page_num + 1 < paginator.num_pages else None
+                    next_page = (
+                        paginator.page(page_num + 2)
+                        if page_num + 1 < paginator.num_pages
+                        else None
+                    )
                     paginated_kwargs.update(
-                        {'%s_paginator' % key: paginator,
-                         '%s_page' % key: page,
-                         '%s_previous_page' % key: previous_page,
-                         '%s_next_page' % key: next_page})
+                        {
+                            "%s_paginator" % key: paginator,
+                            "%s_page" % key: page,
+                            "%s_previous_page" % key: previous_page,
+                            "%s_next_page" % key: next_page,
+                        }
+                    )
 
                 localcontext = _get_localcontext(
-                    context, page.save_as, paginated_kwargs, relative_urls)
-                _write_file(template, localcontext, self.output_path,
-                            page.save_as, override_output)
+                    context, page.save_as, paginated_kwargs, relative_urls
+                )
+                _write_file(
+                    template,
+                    localcontext,
+                    self.output_path,
+                    page.save_as,
+                    override_output,
+                )
         else:
             # no pagination
-            localcontext = _get_localcontext(
-                context, name, kwargs, relative_urls)
-            _write_file(template, localcontext, self.output_path, name,
-                        override_output)
+            localcontext = _get_localcontext(context, name, kwargs, relative_urls)
+            _write_file(template, localcontext, self.output_path, name, override_output)
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index 1fa7c472..d10254e8 100755
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -1,55 +1,59 @@
-AUTHOR = 'Alexis Métaireau'
+AUTHOR = "Alexis Métaireau"
 SITENAME = "Alexis' log"
-SITESUBTITLE = 'A personal blog.'
-SITEURL = 'http://blog.notmyidea.org'
+SITESUBTITLE = "A personal blog."
+SITEURL = "http://blog.notmyidea.org"
 TIMEZONE = "Europe/Paris"
 
 # can be useful in development, but set to False when you're ready to publish
 RELATIVE_URLS = True
 
-GITHUB_URL = 'http://github.com/ametaireau/'
+GITHUB_URL = "http://github.com/ametaireau/"
 DISQUS_SITENAME = "blog-notmyidea"
 REVERSE_CATEGORY_ORDER = True
 LOCALE = "C"
 DEFAULT_PAGINATION = 4
 DEFAULT_DATE = (2012, 3, 2, 14, 1, 1)
 
-FEED_ALL_RSS = 'feeds/all.rss.xml'
-CATEGORY_FEED_RSS = 'feeds/{slug}.rss.xml'
+FEED_ALL_RSS = "feeds/all.rss.xml"
+CATEGORY_FEED_RSS = "feeds/{slug}.rss.xml"
 
-LINKS = (('Biologeek', 'http://biologeek.org'),
-         ('Filyb', "http://filyb.info/"),
-         ('Libert-fr', "http://www.libert-fr.com"),
-         ('N1k0', "http://prendreuncafe.com/blog/"),
-         ('Tarek Ziadé', "http://ziade.org/blog"),
-         ('Zubin Mithra', "http://zubin71.wordpress.com/"),)
+LINKS = (
+    ("Biologeek", "http://biologeek.org"),
+    ("Filyb", "http://filyb.info/"),
+    ("Libert-fr", "http://www.libert-fr.com"),
+    ("N1k0", "http://prendreuncafe.com/blog/"),
+    ("Tarek Ziadé", "http://ziade.org/blog"),
+    ("Zubin Mithra", "http://zubin71.wordpress.com/"),
+)
 
-SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
-          ('lastfm', 'http://lastfm.com/user/akounet'),
-          ('github', 'http://github.com/ametaireau'),)
+SOCIAL = (
+    ("twitter", "http://twitter.com/ametaireau"),
+    ("lastfm", "http://lastfm.com/user/akounet"),
+    ("github", "http://github.com/ametaireau"),
+)
 
 # global metadata to all the contents
-DEFAULT_METADATA = {'yeah': 'it is'}
+DEFAULT_METADATA = {"yeah": "it is"}
 
 # path-specific metadata
 EXTRA_PATH_METADATA = {
-    'extra/robots.txt': {'path': 'robots.txt'},
-    }
+    "extra/robots.txt": {"path": "robots.txt"},
+}
 
 # static paths will be copied without parsing their contents
 STATIC_PATHS = [
-    'images',
-    'extra/robots.txt',
-    ]
+    "images",
+    "extra/robots.txt",
+]
 
 # custom page generated with a jinja2 template
-TEMPLATE_PAGES = {'pages/jinja2_template.html': 'jinja2_template.html'}
+TEMPLATE_PAGES = {"pages/jinja2_template.html": "jinja2_template.html"}
 
 # there is no other HTML content
-READERS = {'html': None}
+READERS = {"html": None}
 
 # code blocks with line numbers
-PYGMENTS_RST_OPTIONS = {'linenos': 'table'}
+PYGMENTS_RST_OPTIONS = {"linenos": "table"}
 
 # foobar will not be used, because it's not in caps. All configuration keys
 # have to be in caps
diff --git a/samples/pelican.conf_FR.py b/samples/pelican.conf_FR.py
index dc657404..cbca06df 100644
--- a/samples/pelican.conf_FR.py
+++ b/samples/pelican.conf_FR.py
@@ -1,56 +1,60 @@
-AUTHOR = 'Alexis Métaireau'
+AUTHOR = "Alexis Métaireau"
 SITENAME = "Alexis' log"
-SITEURL = 'http://blog.notmyidea.org'
+SITEURL = "http://blog.notmyidea.org"
 TIMEZONE = "Europe/Paris"
 
 # can be useful in development, but set to False when you're ready to publish
 RELATIVE_URLS = True
 
-GITHUB_URL = 'http://github.com/ametaireau/'
+GITHUB_URL = "http://github.com/ametaireau/"
 DISQUS_SITENAME = "blog-notmyidea"
 PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
 LOCALE = "fr_FR.UTF-8"
 DEFAULT_PAGINATION = 4
 DEFAULT_DATE = (2012, 3, 2, 14, 1, 1)
-DEFAULT_DATE_FORMAT = '%d %B %Y'
+DEFAULT_DATE_FORMAT = "%d %B %Y"
 
-ARTICLE_URL = 'posts/{date:%Y}/{date:%B}/{date:%d}/{slug}/'
-ARTICLE_SAVE_AS = ARTICLE_URL + 'index.html'
+ARTICLE_URL = "posts/{date:%Y}/{date:%B}/{date:%d}/{slug}/"
+ARTICLE_SAVE_AS = ARTICLE_URL + "index.html"
 
-FEED_ALL_RSS = 'feeds/all.rss.xml'
-CATEGORY_FEED_RSS = 'feeds/{slug}.rss.xml'
+FEED_ALL_RSS = "feeds/all.rss.xml"
+CATEGORY_FEED_RSS = "feeds/{slug}.rss.xml"
 
-LINKS = (('Biologeek', 'http://biologeek.org'),
-         ('Filyb', "http://filyb.info/"),
-         ('Libert-fr', "http://www.libert-fr.com"),
-         ('N1k0', "http://prendreuncafe.com/blog/"),
-         ('Tarek Ziadé', "http://ziade.org/blog"),
-         ('Zubin Mithra', "http://zubin71.wordpress.com/"),)
+LINKS = (
+    ("Biologeek", "http://biologeek.org"),
+    ("Filyb", "http://filyb.info/"),
+    ("Libert-fr", "http://www.libert-fr.com"),
+    ("N1k0", "http://prendreuncafe.com/blog/"),
+    ("Tarek Ziadé", "http://ziade.org/blog"),
+    ("Zubin Mithra", "http://zubin71.wordpress.com/"),
+)
 
-SOCIAL = (('twitter', 'http://twitter.com/ametaireau'),
-          ('lastfm', 'http://lastfm.com/user/akounet'),
-          ('github', 'http://github.com/ametaireau'),)
+SOCIAL = (
+    ("twitter", "http://twitter.com/ametaireau"),
+    ("lastfm", "http://lastfm.com/user/akounet"),
+    ("github", "http://github.com/ametaireau"),
+)
 
 # global metadata to all the contents
-DEFAULT_METADATA = {'yeah': 'it is'}
+DEFAULT_METADATA = {"yeah": "it is"}
 
 # path-specific metadata
 EXTRA_PATH_METADATA = {
-    'extra/robots.txt': {'path': 'robots.txt'},
-    }
+    "extra/robots.txt": {"path": "robots.txt"},
+}
 
 # static paths will be copied without parsing their contents
 STATIC_PATHS = [
-    'pictures',
-    'extra/robots.txt',
-    ]
+    "pictures",
+    "extra/robots.txt",
+]
 
 # custom page generated with a jinja2 template
-TEMPLATE_PAGES = {'pages/jinja2_template.html': 'jinja2_template.html'}
+TEMPLATE_PAGES = {"pages/jinja2_template.html": "jinja2_template.html"}
 
 # code blocks with line numbers
-PYGMENTS_RST_OPTIONS = {'linenos': 'table'}
+PYGMENTS_RST_OPTIONS = {"linenos": "table"}
 
 # foobar will not be used, because it's not in caps. All configuration keys
 # have to be in caps

From 271f4dd68f58313f20c2b3cf40ddc6256b5b6d69 Mon Sep 17 00:00:00 2001
From: Chris Rose <offline@offby1.net>
Date: Sun, 29 Oct 2023 09:57:37 -0700
Subject: [PATCH 2635/2864] Strip trailing whitespace

---
 .coveragerc                                            |  1 -
 docs/_static/pelican-logo.svg                          |  2 +-
 docs/_static/theme_overrides.css                       |  1 -
 pelican/tests/TestPages/draft_page_markdown.md         |  2 +-
 .../content/2012-11-30_md_w_filename_meta#foo-bar.md   |  1 -
 .../content/article_with_markdown_markup_extensions.md |  1 -
 .../tests/content/article_with_uppercase_metadata.rst  |  1 -
 pelican/tests/content/article_without_category.rst     |  1 -
 pelican/tests/content/bloggerexport.xml                |  2 +-
 pelican/tests/content/empty_with_bom.md                |  2 +-
 pelican/tests/content/wordpress_content_encoded        |  1 -
 pelican/tests/content/wordpressexport.xml              |  2 +-
 pelican/themes/notmyidea/static/css/reset.css          |  2 +-
 pelican/themes/simple/templates/author.html            |  1 -
 pelican/themes/simple/templates/category.html          |  1 -
 samples/content/pages/hidden_page.rst                  |  1 -
 samples/content/unbelievable.rst                       | 10 +++++-----
 17 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 2cb24879..fdd2cad6 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,3 +1,2 @@
 [report]
 omit = pelican/tests/*
-
diff --git a/docs/_static/pelican-logo.svg b/docs/_static/pelican-logo.svg
index 95b947bf..f36b42fa 100644
--- a/docs/_static/pelican-logo.svg
+++ b/docs/_static/pelican-logo.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="svg33" width="64" height="64" style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.4142" version="1.1" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g id="g864" transform="matrix(.10228 0 0 .10228 2.441 6.0098e-5)"><g id="g4" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path2" d="m210.35 607.22c-.34-2.106-.842-4.303-1.491-6.591-1.537-5.441-4.918-10.074-9.506-13.854-1.205-1.001-2.503-1.946-3.88-2.823-5.293-3.381-11.692-5.851-18.522-7.32-4.588-.99-9.367-1.525-14.139-1.593-34.662-.774-56.234.387-90.373-.911.012.023.012.046.022.068 1.56 1.264 3.154 2.471 4.782 3.643 3.573 2.584 7.297 4.952 11.155 7.127 7.184 4.04 14.845 7.342 22.859 9.801.956.295 1.912.58 2.87.842 5.6.603 10.631 1.206 14.648 3.074 1.015.455 1.959 1.001 2.835 1.639 2.87 2.106 6.057 6.124 8.152 8.936 4.497 5.999 3.551 10.928 8.88 13.887.557.308 1.182.604 1.889.866 1.696.638 4.119 1.491 5.225-.91.16-.342.283-.764.387-1.264-.446-1.434-1.981-2.675-2.905-3.29-1.638-1.07-2.287-1.719-3.47-2.937-2.186-2.243-2.333-6.056-3.871-8.708 1.935-.82 12.146-2.186 14.287-1.89 4.576.204 8.185.557 10.939 3.392 1.08.854 1.672 1.594 2.652 2.334.069.057.125.114.194.159 4.338 3.153 8.343 4.28 11.894 5.362.936.284 1.822.558 2.69.876 1.332.478 2.582 1.048 3.754 1.81 1.39.922 3.748 3.336 3.849 5.419-3.496-1.116-1.185.296-6.342-.102-2.515-.285-5.087-.456-7.671-.638-4.018-.284-8.038-.581-11.805-1.297-.627-.115-1.254-.251-1.867-.399-.479-.102-.946-.227-1.401-.353-.011.193-.021.376-.021.546-.104 3.939 2.674 5.908-3.678 13.399-.057.08-.137.159-.205.25-1.686 1.97-10.449 5.715-13.182 6.432-11.634 2.334-20.502-5.237-34.515-1.423-4.929 1.833-8.549 9.824-10.815 15.8-3.016 7.936-5.406 17.576-8.139 27.06 5.329-.797 10.53-1.936 15.585-3.427 11.167-3.279 21.651-8.185 31.168-14.445.911-1.231 1.912-2.29 2.994-3.108.284-.217.58-.422.877-.603.215-.137.956-.286 2.127-.502 10.861-1.924 58.5-8.377 61.597-42.962.319-3.494.172-7.285-.513-11.372zm-106.94 18.59c-6.375-1.924-8.003-2.243-12.055-5.385.067.33.17.695.307 1.081 10.779 6.068 22.608 10.462 35.141 12.842-3.893-9.051-8.502-7.445-23.393-8.538zm29.518-4.099c-2.779-6.738-10.313-10.575-16.813-12.464-8.721-3.12-15.061-.125-33.458-8.811.147.239.284.467.432.694 3.575 2.584 7.297 4.963 11.157 7.126 7.184 4.041 14.844 7.343 22.857 9.802 4.167.489 8.175 1.184 11.863 2.96 1.639.773 3.21 1.764 4.702 3.039-.183-.82-.434-1.605-.74-2.346z" style="fill-rule:nonzero;fill:url(#_Linear1)"/></g><g id="g8" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path6" d="m114.13 595.61c-.958-.262-1.914-.547-2.87-.842-8.014-2.459-15.675-5.761-22.859-9.801-3.858-2.175-7.582-4.543-11.155-7.127-1.628-1.172-3.222-2.379-4.782-3.643 2.14 6.603 11.634 13.57 18.078 16.313 8.218 3.495 16.381 4.303 23.588 5.1z" style="fill:#90d4d1"/></g><g id="g12" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path10" d="m94.253 608.25c-3.86-2.163-7.582-4.542-11.157-7.126 10.006 15.823 22.575 15.584 34.014 16.928-8.013-2.459-15.673-5.761-22.857-9.802z" style="fill:#90d4d1"/></g><g id="g16" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path14" d="m126.81 634.34c-12.533-2.38-24.362-6.774-35.141-12.842 1.376 3.973 6.351 10.257 12.943 11.658 2.858 1.024 2.094.762 6.967.614 7.137-.364 10.552-.592 15.608 1.469-.126-.308-.251-.604-.377-.899z" style="fill:#90d4d1"/></g><g id="g20" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path18" d="m143.27 665.76c-.081.101-.159.204-.239.318-13.844 14.093-31.179 24.69-50.59 30.393 1.492-4.132 2.824-8.468 4.076-12.839 5.329-.797 10.53-1.936 15.585-3.427 11.167-3.279 21.651-8.185 31.168-14.445z" style="fill:#90d4d1"/></g><g id="g24" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path22" d="m143.03 666.08c-6.046 8.287-9.118 24.122-12.659 33.274-5.144 13.342-12.294 22.95-27.958 24.317-3.928.351-27.582 1.24-30.11-.035.159-1.344 4.098-2.961 5.123-3.747 6.852-4.847 11.416-13.5 15.014-23.416 19.411-5.703 36.746-16.3 50.59-30.393z" style="fill:#14a0c4"/></g></g><defs id="defs31"><linearGradient id="_Linear1" x2="1" gradientTransform="matrix(138.58 0 0 138.58 72.442 628.88)" gradientUnits="userSpaceOnUse"><stop id="stop26" style="stop-color:rgb(84,196,198)" offset="0"/><stop id="stop28" style="stop-color:rgb(18,186,213)" offset="1"/></linearGradient></defs></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="svg33" width="64" height="64" style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.4142" version="1.1" viewBox="0 0 64 64" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g id="g864" transform="matrix(.10228 0 0 .10228 2.441 6.0098e-5)"><g id="g4" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path2" d="m210.35 607.22c-.34-2.106-.842-4.303-1.491-6.591-1.537-5.441-4.918-10.074-9.506-13.854-1.205-1.001-2.503-1.946-3.88-2.823-5.293-3.381-11.692-5.851-18.522-7.32-4.588-.99-9.367-1.525-14.139-1.593-34.662-.774-56.234.387-90.373-.911.012.023.012.046.022.068 1.56 1.264 3.154 2.471 4.782 3.643 3.573 2.584 7.297 4.952 11.155 7.127 7.184 4.04 14.845 7.342 22.859 9.801.956.295 1.912.58 2.87.842 5.6.603 10.631 1.206 14.648 3.074 1.015.455 1.959 1.001 2.835 1.639 2.87 2.106 6.057 6.124 8.152 8.936 4.497 5.999 3.551 10.928 8.88 13.887.557.308 1.182.604 1.889.866 1.696.638 4.119 1.491 5.225-.91.16-.342.283-.764.387-1.264-.446-1.434-1.981-2.675-2.905-3.29-1.638-1.07-2.287-1.719-3.47-2.937-2.186-2.243-2.333-6.056-3.871-8.708 1.935-.82 12.146-2.186 14.287-1.89 4.576.204 8.185.557 10.939 3.392 1.08.854 1.672 1.594 2.652 2.334.069.057.125.114.194.159 4.338 3.153 8.343 4.28 11.894 5.362.936.284 1.822.558 2.69.876 1.332.478 2.582 1.048 3.754 1.81 1.39.922 3.748 3.336 3.849 5.419-3.496-1.116-1.185.296-6.342-.102-2.515-.285-5.087-.456-7.671-.638-4.018-.284-8.038-.581-11.805-1.297-.627-.115-1.254-.251-1.867-.399-.479-.102-.946-.227-1.401-.353-.011.193-.021.376-.021.546-.104 3.939 2.674 5.908-3.678 13.399-.057.08-.137.159-.205.25-1.686 1.97-10.449 5.715-13.182 6.432-11.634 2.334-20.502-5.237-34.515-1.423-4.929 1.833-8.549 9.824-10.815 15.8-3.016 7.936-5.406 17.576-8.139 27.06 5.329-.797 10.53-1.936 15.585-3.427 11.167-3.279 21.651-8.185 31.168-14.445.911-1.231 1.912-2.29 2.994-3.108.284-.217.58-.422.877-.603.215-.137.956-.286 2.127-.502 10.861-1.924 58.5-8.377 61.597-42.962.319-3.494.172-7.285-.513-11.372zm-106.94 18.59c-6.375-1.924-8.003-2.243-12.055-5.385.067.33.17.695.307 1.081 10.779 6.068 22.608 10.462 35.141 12.842-3.893-9.051-8.502-7.445-23.393-8.538zm29.518-4.099c-2.779-6.738-10.313-10.575-16.813-12.464-8.721-3.12-15.061-.125-33.458-8.811.147.239.284.467.432.694 3.575 2.584 7.297 4.963 11.157 7.126 7.184 4.041 14.844 7.343 22.857 9.802 4.167.489 8.175 1.184 11.863 2.96 1.639.773 3.21 1.764 4.702 3.039-.183-.82-.434-1.605-.74-2.346z" style="fill-rule:nonzero;fill:url(#_Linear1)"/></g><g id="g8" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path6" d="m114.13 595.61c-.958-.262-1.914-.547-2.87-.842-8.014-2.459-15.675-5.761-22.859-9.801-3.858-2.175-7.582-4.543-11.155-7.127-1.628-1.172-3.222-2.379-4.782-3.643 2.14 6.603 11.634 13.57 18.078 16.313 8.218 3.495 16.381 4.303 23.588 5.1z" style="fill:#90d4d1"/></g><g id="g12" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path10" d="m94.253 608.25c-3.86-2.163-7.582-4.542-11.157-7.126 10.006 15.823 22.575 15.584 34.014 16.928-8.013-2.459-15.673-5.761-22.857-9.802z" style="fill:#90d4d1"/></g><g id="g16" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path14" d="m126.81 634.34c-12.533-2.38-24.362-6.774-35.141-12.842 1.376 3.973 6.351 10.257 12.943 11.658 2.858 1.024 2.094.762 6.967.614 7.137-.364 10.552-.592 15.608 1.469-.126-.308-.251-.604-.377-.899z" style="fill:#90d4d1"/></g><g id="g20" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path18" d="m143.27 665.76c-.081.101-.159.204-.239.318-13.844 14.093-31.179 24.69-50.59 30.393 1.492-4.132 2.824-8.468 4.076-12.839 5.329-.797 10.53-1.936 15.585-3.427 11.167-3.279 21.651-8.185 31.168-14.445z" style="fill:#90d4d1"/></g><g id="g24" transform="matrix(4.1667 0 0 4.1667 -301.27 -2392.2)"><path id="path22" d="m143.03 666.08c-6.046 8.287-9.118 24.122-12.659 33.274-5.144 13.342-12.294 22.95-27.958 24.317-3.928.351-27.582 1.24-30.11-.035.159-1.344 4.098-2.961 5.123-3.747 6.852-4.847 11.416-13.5 15.014-23.416 19.411-5.703 36.746-16.3 50.59-30.393z" style="fill:#14a0c4"/></g></g><defs id="defs31"><linearGradient id="_Linear1" x2="1" gradientTransform="matrix(138.58 0 0 138.58 72.442 628.88)" gradientUnits="userSpaceOnUse"><stop id="stop26" style="stop-color:rgb(84,196,198)" offset="0"/><stop id="stop28" style="stop-color:rgb(18,186,213)" offset="1"/></linearGradient></defs></svg>
diff --git a/docs/_static/theme_overrides.css b/docs/_static/theme_overrides.css
index 83afc78e..e840ab6b 100644
--- a/docs/_static/theme_overrides.css
+++ b/docs/_static/theme_overrides.css
@@ -9,4 +9,3 @@
 .wy-table-responsive {
     overflow: visible !important;
 }
-        
diff --git a/pelican/tests/TestPages/draft_page_markdown.md b/pelican/tests/TestPages/draft_page_markdown.md
index fda71868..0f378a55 100644
--- a/pelican/tests/TestPages/draft_page_markdown.md
+++ b/pelican/tests/TestPages/draft_page_markdown.md
@@ -9,4 +9,4 @@ Used for pelican test
 
 The quick brown fox .
 
-This page is a draft
\ No newline at end of file
+This page is a draft
diff --git a/pelican/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md b/pelican/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md
index cdccfc8a..8b3c0bcf 100644
--- a/pelican/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md
+++ b/pelican/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md
@@ -3,4 +3,3 @@ author: Alexis Métaireau
 
 Markdown with filename metadata
 ===============================
-
diff --git a/pelican/tests/content/article_with_markdown_markup_extensions.md b/pelican/tests/content/article_with_markdown_markup_extensions.md
index 6cf56403..7eff4dcb 100644
--- a/pelican/tests/content/article_with_markdown_markup_extensions.md
+++ b/pelican/tests/content/article_with_markdown_markup_extensions.md
@@ -5,4 +5,3 @@ Title: Test Markdown extensions
 ## Level1
 
 ### Level2
-
diff --git a/pelican/tests/content/article_with_uppercase_metadata.rst b/pelican/tests/content/article_with_uppercase_metadata.rst
index e26cdd13..ee79f55a 100644
--- a/pelican/tests/content/article_with_uppercase_metadata.rst
+++ b/pelican/tests/content/article_with_uppercase_metadata.rst
@@ -3,4 +3,3 @@ This is a super article !
 #########################
 
 :Category: Yeah
-
diff --git a/pelican/tests/content/article_without_category.rst b/pelican/tests/content/article_without_category.rst
index ff47f6ef..1cfcba71 100644
--- a/pelican/tests/content/article_without_category.rst
+++ b/pelican/tests/content/article_without_category.rst
@@ -3,4 +3,3 @@ This is an article without category !
 #####################################
 
 This article should be in the DEFAULT_CATEGORY.
-
diff --git a/pelican/tests/content/bloggerexport.xml b/pelican/tests/content/bloggerexport.xml
index 4bc0985a..a3b9cdf2 100644
--- a/pelican/tests/content/bloggerexport.xml
+++ b/pelican/tests/content/bloggerexport.xml
@@ -1064,4 +1064,4 @@
   <gd:extendedProperty name="blogger.itemClass" value="pid-944253050"/>
   <gd:extendedProperty name="blogger.displayTime" value="29 november 2010 om 12:35"/>
  </entry>
-</feed>
\ No newline at end of file
+</feed>
diff --git a/pelican/tests/content/empty_with_bom.md b/pelican/tests/content/empty_with_bom.md
index 5f282702..e02abfc9 100644
--- a/pelican/tests/content/empty_with_bom.md
+++ b/pelican/tests/content/empty_with_bom.md
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/pelican/tests/content/wordpress_content_encoded b/pelican/tests/content/wordpress_content_encoded
index da35de3b..eefff1e9 100644
--- a/pelican/tests/content/wordpress_content_encoded
+++ b/pelican/tests/content/wordpress_content_encoded
@@ -52,4 +52,3 @@ quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
 consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
 cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
 proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
diff --git a/pelican/tests/content/wordpressexport.xml b/pelican/tests/content/wordpressexport.xml
index 4f5b3651..81ed7ea3 100644
--- a/pelican/tests/content/wordpressexport.xml
+++ b/pelican/tests/content/wordpressexport.xml
@@ -838,7 +838,7 @@ proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]></con
             <wp:meta_key>_edit_last</wp:meta_key>
             <wp:meta_value><![CDATA[3]]></wp:meta_value>
         </wp:postmeta>
-        </item>   
+        </item>
         <item>
         <title>A 2nd custom post type also in category 5</title>
         <link>http://thisisa.test/?p=177</link>
diff --git a/pelican/themes/notmyidea/static/css/reset.css b/pelican/themes/notmyidea/static/css/reset.css
index c88e6196..f5123cf6 100644
--- a/pelican/themes/notmyidea/static/css/reset.css
+++ b/pelican/themes/notmyidea/static/css/reset.css
@@ -49,4 +49,4 @@ del {text-decoration: line-through;}
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
-}
\ No newline at end of file
+}
diff --git a/pelican/themes/simple/templates/author.html b/pelican/themes/simple/templates/author.html
index 64aadffb..c054f8ab 100644
--- a/pelican/themes/simple/templates/author.html
+++ b/pelican/themes/simple/templates/author.html
@@ -5,4 +5,3 @@
 {% block content_title %}
 <h1>Articles by {{ author }}</h1>
 {% endblock %}
-
diff --git a/pelican/themes/simple/templates/category.html b/pelican/themes/simple/templates/category.html
index f7889d00..da1a8b52 100644
--- a/pelican/themes/simple/templates/category.html
+++ b/pelican/themes/simple/templates/category.html
@@ -5,4 +5,3 @@
 {% block content_title %}
 <h1>Articles in the {{ category }} category</h1>
 {% endblock %}
-
diff --git a/samples/content/pages/hidden_page.rst b/samples/content/pages/hidden_page.rst
index ab8704ed..b1f52d95 100644
--- a/samples/content/pages/hidden_page.rst
+++ b/samples/content/pages/hidden_page.rst
@@ -6,4 +6,3 @@ This is a test hidden page
 
 This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!
-
diff --git a/samples/content/unbelievable.rst b/samples/content/unbelievable.rst
index 209e3557..afa502cf 100644
--- a/samples/content/unbelievable.rst
+++ b/samples/content/unbelievable.rst
@@ -45,7 +45,7 @@ Testing more sourcecode directives
     :lineseparator: <br>
     :linespans: foo
     :nobackground:
-  
+
     def run(self):
         self.assert_has_content()
         try:
@@ -76,8 +76,8 @@ Testing even more sourcecode directives
 .. sourcecode:: python
     :linenos: table
     :nowrap:
-    
-  
+
+
     formatter = self.options and VARIANTS[self.options.keys()[0]]
 
 
@@ -90,8 +90,8 @@ Even if the default is line numbers, we can override it here
 
 .. sourcecode:: python
     :linenos: none
-    
-  
+
+
     formatter = self.options and VARIANTS[self.options.keys()[0]]
 
 

From 805ca9b4a9af8975f4c2f411e162033bf0a1a500 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Sun, 29 Oct 2023 22:21:04 +0100
Subject: [PATCH 2636/2864] Run pre-commit on all files during CI test job

---
 .github/workflows/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 59a22862..b1b7c809 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -63,6 +63,8 @@ jobs:
           pdm install --no-default --dev
       - name: Run linters
         run: pdm lint --diff
+      - name: Run pre-commit checks on all files
+        uses: pre-commit/action@v3.0.0
 
   docs:
     name: Build docs

From f0aab11a2da8329aab1cb523365adf1441865b49 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Mon, 30 Oct 2023 00:53:15 +0300
Subject: [PATCH 2637/2864] Force git subprocess in tests to use utf-8

---
 pelican/tests/support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 3e4da785..a395eeaf 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -232,7 +232,7 @@ def diff_subproc(first, second):
          '-w', first, second],
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
-        text=True,
+        encoding="utf-8",
     )
 
 

From 4e438ffe6073c4d67ae8074d02f9604ec6a1041f Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Mon, 30 Oct 2023 16:04:44 +0100
Subject: [PATCH 2638/2864] Enable tests to validate dist build contents
 (#3229)

---
 .github/workflows/main.yml                   | 19 +++++-
 pelican/tests/build_test/conftest.py         |  2 +-
 pelican/tests/build_test/test_build_files.py | 66 ++++++++++++++++++++
 pelican/tests/build_test/test_wheel.py       | 28 ---------
 4 files changed, 85 insertions(+), 30 deletions(-)
 create mode 100644 pelican/tests/build_test/test_build_files.py
 delete mode 100644 pelican/tests/build_test/test_wheel.py

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0127982e..85ee5ccb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -64,6 +64,23 @@ jobs:
       - name: Run linters
         run: pdm lint --diff
 
+  build:
+    name: Test build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: pdm-project/setup-pdm@v3
+        with:
+          python-version: 3.9
+          cache: true
+          cache-dependency-path: ./pyproject.toml
+      - name: Install dependencies
+        run: pdm install --dev
+      - name: Build package
+        run: pdm build
+      - name: Test build
+        run: pdm run pytest --check-build=dist  pelican/tests/build_test
+
   docs:
     name: Build docs
     runs-on: ubuntu-latest
@@ -84,7 +101,7 @@ jobs:
   deploy:
     name: Deploy
     environment: Deployment
-    needs: [test, lint, docs]
+    needs: [test, lint, docs, build]
     runs-on: ubuntu-latest
     if: github.ref=='refs/heads/master' && github.event_name!='pull_request' && github.repository == 'getpelican/pelican'
 
diff --git a/pelican/tests/build_test/conftest.py b/pelican/tests/build_test/conftest.py
index 548f7970..b1d1a54b 100644
--- a/pelican/tests/build_test/conftest.py
+++ b/pelican/tests/build_test/conftest.py
@@ -1,6 +1,6 @@
 def pytest_addoption(parser):
     parser.addoption(
-        "--check-wheel",
+        "--check-build",
         action="store",
         default=False,
         help="Check wheel contents.",
diff --git a/pelican/tests/build_test/test_build_files.py b/pelican/tests/build_test/test_build_files.py
new file mode 100644
index 00000000..2b51d362
--- /dev/null
+++ b/pelican/tests/build_test/test_build_files.py
@@ -0,0 +1,66 @@
+from re import match
+import tarfile
+from pathlib import Path
+from zipfile import ZipFile
+
+import pytest
+
+
+@pytest.mark.skipif(
+    "not config.getoption('--check-build')",
+    reason="Only run when --check-build is given",
+)
+def test_wheel_contents(pytestconfig):
+    """
+    This test should test the contents of the wheel to make sure
+    that everything that is needed is included in the final build
+    """
+    dist_folder = pytestconfig.getoption("--check-build")
+    wheels = Path(dist_folder).rglob("*.whl")
+    for wheel_file in wheels:
+        files_list = ZipFile(wheel_file).namelist()
+        # Check if theme files are copied to wheel
+        simple_theme = Path("./pelican/themes/simple/templates")
+        for x in simple_theme.iterdir():
+            assert str(x) in files_list
+
+        # Check if tool templates are copied to wheel
+        tools = Path("./pelican/tools/templates")
+        for x in tools.iterdir():
+            assert str(x) in files_list
+
+        assert "pelican/tools/templates/tasks.py.jinja2" in files_list
+
+
+@pytest.mark.skipif(
+    "not config.getoption('--check-build')",
+    reason="Only run when --check-build is given",
+)
+@pytest.mark.parametrize(
+    "expected_file",
+    [
+        ("THANKS"),
+        ("README.rst"),
+        ("CONTRIBUTING.rst"),
+        ("docs/changelog.rst"),
+        ("samples/"),
+    ],
+)
+def test_sdist_contents(pytestconfig, expected_file):
+    """
+    This test should test the contents of the source distribution to make sure
+    that everything that is needed is included in the final build.
+    """
+    dist_folder = pytestconfig.getoption("--check-build")
+    sdist_files = Path(dist_folder).rglob("*.tar.gz")
+    for dist in sdist_files:
+        files_list = tarfile.open(dist, "r:gz").getnames()
+        dir_matcher = ""
+        if expected_file.endswith("/"):
+            dir_matcher = ".*"
+        filtered_values = [
+            path
+            for path in files_list
+            if match(f"^pelican-\d\.\d\.\d/{expected_file}{dir_matcher}$", path)
+        ]
+        assert len(filtered_values) > 0
diff --git a/pelican/tests/build_test/test_wheel.py b/pelican/tests/build_test/test_wheel.py
deleted file mode 100644
index 8e643981..00000000
--- a/pelican/tests/build_test/test_wheel.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from pathlib import Path
-import pytest
-from zipfile import ZipFile
-
-
-@pytest.mark.skipif(
-    "not config.getoption('--check-wheel')",
-    reason="Only run when --check-wheel is given",
-)
-def test_wheel_contents(pytestconfig):
-    """
-    This test, should test the contents of the wheel to make sure,
-    that everything that is needed is included in the final build
-    """
-    wheel_file = pytestconfig.getoption("--check-wheel")
-    assert wheel_file.endswith(".whl")
-    files_list = ZipFile(wheel_file).namelist()
-    # Check if theme files are copied to wheel
-    simple_theme = Path("./pelican/themes/simple/templates")
-    for x in simple_theme.iterdir():
-        assert str(x) in files_list
-
-    # Check if tool templates are copied to wheel
-    tools = Path("./pelican/tools/templates")
-    for x in tools.iterdir():
-        assert str(x) in files_list
-
-    assert "pelican/tools/templates/tasks.py.jinja2" in files_list

From 08785f714ffdc10560072f2379cb123c6984254e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 30 Oct 2023 19:35:59 +0100
Subject: [PATCH 2639/2864] Remove obsolete linters: Flake8, Black, isort

---
 pyproject.toml         | 4 ----
 requirements/style.pip | 2 --
 tox.ini                | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 requirements/style.pip

diff --git a/pyproject.toml b/pyproject.toml
index 4e3e712a..a16bb7f8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -91,11 +91,7 @@ dev = [
     "pytest-sugar>=0.9.7",
     "pytest-xdist>=3.3.1",
     "tox>=4.11.3",
-    "flake8>=6.1.0",
-    "flake8-import-order>=0.18.2",
     "invoke>=2.2.0",
-    "isort>=5.12.0",
-    "black>=23.10.1",
     "ruff>=0.1.3",
     "tomli>=2.0.1; python_version < \"3.11\"",
 ]
diff --git a/requirements/style.pip b/requirements/style.pip
deleted file mode 100644
index f1c82ed0..00000000
--- a/requirements/style.pip
+++ /dev/null
@@ -1,2 +0,0 @@
-flake8==3.9.2
-flake8-import-order
diff --git a/tox.ini b/tox.ini
index 361c52dd..f6f45af1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.8,3.9,3.10,3.11.3.12},docs,flake8
+envlist = py{3.8,3.9,3.10,3.11.3.12},docs
 
 [testenv]
 basepython =

From 3c5799694530d5e038c71b03007eb684e3c280f5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 30 Oct 2023 19:45:42 +0100
Subject: [PATCH 2640/2864] Ignore Ruff format commit in the blame view

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .git-blame-ignore-revs

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 00000000..7b822fd3
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,3 @@
+# .git-blame-ignore-revs
+# Apply code style to project via: ruff format .
+cabdb26cee66e1173cf16cb31d3fe5f9fa4392e7

From abae21494dcd69ab8a2b11f8b9e01774dc4f52b1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 31 Oct 2023 16:50:48 +0100
Subject: [PATCH 2641/2864] Adjust line length to 88 in EditorConfig

---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index edb13c8a..a9c06c97 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,7 +9,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.py]
-max_line_length = 79
+max_line_length = 88
 
 [*.{yml,yaml}]
 indent_size = 2

From e6a5e2a66520a51f25336201ec876633c267769d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 1 Nov 2023 09:07:48 +0100
Subject: [PATCH 2642/2864] Update pre-commit hook versions

---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f68521e5..5a73aebc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for info on hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -14,7 +14,7 @@ repos:
       - id: forbid-new-submodules
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.0
+    rev: v0.1.3
     hooks:
       - id: ruff
       - id: ruff-format

From 76650898a648b4ba8d2e34e2d67abbbeafc0776e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 1 Nov 2023 09:43:21 +0100
Subject: [PATCH 2643/2864] Update to Markdown 3.5.1 in test requirements

---
 requirements/test.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/test.pip b/requirements/test.pip
index 2cf1ea1f..87869e67 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -6,7 +6,7 @@ pytest-xdist[psutil]
 tzdata
 
 # Optional Packages
-Markdown==3.4.3
+Markdown==3.5.1
 BeautifulSoup4
 lxml
 typogrify

From feae8ef41c995cb0d327033aa0d261cfd4eb85df Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 1 Nov 2023 22:49:15 +0300
Subject: [PATCH 2644/2864] Provide a plugin_enabled Jinja test for themes

---
 docs/themes.rst                  | 17 +++++++
 pelican/generators.py            |  4 ++
 pelican/plugins/_utils.py        | 16 +++++++
 pelican/tests/test_generators.py | 25 ++++++++++
 pelican/tests/test_plugins.py    | 82 +++++++++++++++++++++++++++++++-
 5 files changed, 143 insertions(+), 1 deletion(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 51b5b0d5..2df717e4 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -140,6 +140,23 @@ your date according to the locale given in your settings::
 .. _datetime: https://docs.python.org/3/library/datetime.html#datetime-objects
 .. _strftime: https://docs.python.org/3/library/datetime.html#strftime-strptime-behavior
 
+Checking Loaded Plugins
+-----------------------
+
+Pelican provides a ``plugin_enabled`` Jinja test for checking if a certain plugin
+is enabled. This test accepts a plugin name as a string and will return a boolean.
+Namespace Plugins can be specified with their full name (``pelican.plugins.plugin_name``)
+or their short name (``plugin_name``). The following example uses ``webassets`` plugin
+to minify CSS if it is enabled and falls back to regular CSS otherwise::
+
+    {% if "webassets" is plugin_enabled %}
+        {% assets filters="cssmin", output="css/style.min.css", "css/style.scss" %}
+            <link rel="stylesheet" href="{{SITEURL}}/{{ASSET_URL}}">
+        {% endassets %}
+    {% else %}
+        <link rel="stylesheet" href="{{SITEURL}}/css/style.css}">
+    {% endif %}
+
 
 index.html
 ----------
diff --git a/pelican/generators.py b/pelican/generators.py
index 0bbb7268..3b5ca9e4 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -20,6 +20,7 @@ from jinja2 import (
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Article, Page, Static
 from pelican.plugins import signals
+from pelican.plugins._utils import plugin_enabled
 from pelican.readers import Readers
 from pelican.utils import (
     DateFormatter,
@@ -102,6 +103,9 @@ class Generator:
 
         # get custom Jinja tests from user settings
         custom_tests = self.settings["JINJA_TESTS"]
+        self.env.tests["plugin_enabled"] = partial(
+            plugin_enabled, plugin_list=self.settings["PLUGINS"]
+        )
         self.env.tests.update(custom_tests)
 
         signals.generator_init.send(self)
diff --git a/pelican/plugins/_utils.py b/pelican/plugins/_utils.py
index f0c18f5c..c25f8114 100644
--- a/pelican/plugins/_utils.py
+++ b/pelican/plugins/_utils.py
@@ -40,6 +40,22 @@ def list_plugins(ns_pkg=None):
         logger.info("No plugins are installed")
 
 
+def plugin_enabled(name, plugin_list=None):
+    if plugin_list is None or not plugin_list:
+        # no plugins are loaded
+        return False
+
+    if name in plugin_list:
+        # search name as is
+        return True
+
+    if "pelican.plugins.{}".format(name) in plugin_list:
+        # check if short name is a namespace plugin
+        return True
+
+    return False
+
+
 def load_legacy_plugin(plugin, plugin_paths):
     if "." in plugin:
         # it is in a package, try to resolve package first
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 52adb2c9..af6f5b1a 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1581,6 +1581,31 @@ class TestJinja2Environment(TestCaseWithCLocale):
 
         self._test_jinja2_helper(settings, content, expected)
 
+    def test_jinja2_filter_plugin_enabled(self):
+        """JINJA_FILTERS adds custom filters to Jinja2 environment"""
+        settings = {"PLUGINS": ["legacy_plugin", "pelican.plugins.ns_plugin"]}
+        jinja_template = (
+            "{plugin}: "
+            "{{% if '{plugin}' is plugin_enabled %}}yes"
+            "{{% else %}}no{{% endif %}}"
+        )
+        content = " / ".join(
+            (
+                jinja_template.format(plugin="ns_plugin"),
+                jinja_template.format(plugin="pelican.plugins.ns_plugin"),
+                jinja_template.format(plugin="legacy_plugin"),
+                jinja_template.format(plugin="unknown"),
+            )
+        )
+        expected = (
+            "ns_plugin: yes / "
+            "pelican.plugins.ns_plugin: yes / "
+            "legacy_plugin: yes / "
+            "unknown: no"
+        )
+
+        self._test_jinja2_helper(settings, content, expected)
+
     def test_jinja2_test(self):
         """JINJA_TESTS adds custom tests to Jinja2 environment"""
         content = "foo {{ foo is custom_test }}, bar {{ bar is custom_test }}"
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
index 4f02022c..ccce684e 100644
--- a/pelican/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -2,7 +2,12 @@ import os
 from contextlib import contextmanager
 
 import pelican.tests.dummy_plugins.normal_plugin.normal_plugin as normal_plugin
-from pelican.plugins._utils import get_namespace_plugins, get_plugin_name, load_plugins
+from pelican.plugins._utils import (
+    get_namespace_plugins,
+    get_plugin_name,
+    load_plugins,
+    plugin_enabled,
+)
 from pelican.tests.support import unittest
 
 
@@ -183,3 +188,78 @@ class PluginTest(unittest.TestCase):
             get_plugin_name(NoopPlugin()),
             "PluginTest.test_get_plugin_name.<locals>.NoopPlugin",
         )
+
+    def test_plugin_enabled(self):
+        def get_plugin_names(plugins):
+            return [get_plugin_name(p) for p in plugins]
+
+        with tmp_namespace_path(self._NS_PLUGIN_FOLDER):
+            # with no `PLUGINS` setting, load namespace plugins
+            SETTINGS = {}
+            plugins = get_plugin_names(load_plugins(SETTINGS))
+            self.assertTrue(plugin_enabled("ns_plugin", plugins))
+            self.assertTrue(plugin_enabled("pelican.plugins.ns_plugin", plugins))
+            self.assertFalse(plugin_enabled("normal_plugin", plugins))
+            self.assertFalse(plugin_enabled("unknown", plugins))
+
+            # disable namespace plugins with `PLUGINS = []`
+            SETTINGS = {"PLUGINS": []}
+            plugins = get_plugin_names(load_plugins(SETTINGS))
+            self.assertFalse(plugin_enabled("ns_plugin", plugins))
+            self.assertFalse(plugin_enabled("pelican.plugins.ns_plugin", plugins))
+            self.assertFalse(plugin_enabled("normal_plugin", plugins))
+            self.assertFalse(plugin_enabled("unknown", plugins))
+
+            # with `PLUGINS`, load only specified plugins
+
+            # normal plugin
+            SETTINGS = {
+                "PLUGINS": ["normal_plugin"],
+                "PLUGIN_PATHS": [self._NORMAL_PLUGIN_FOLDER],
+            }
+            plugins = get_plugin_names(load_plugins(SETTINGS))
+            self.assertFalse(plugin_enabled("ns_plugin", plugins))
+            self.assertFalse(plugin_enabled("pelican.plugins.ns_plugin", plugins))
+            self.assertTrue(plugin_enabled("normal_plugin", plugins))
+            self.assertFalse(plugin_enabled("unknown", plugins))
+
+            # normal submodule/subpackage plugins
+            SETTINGS = {
+                "PLUGINS": [
+                    "normal_submodule_plugin.subplugin",
+                    "normal_submodule_plugin.subpackage.subpackage",
+                ],
+                "PLUGIN_PATHS": [self._NORMAL_PLUGIN_FOLDER],
+            }
+            plugins = get_plugin_names(load_plugins(SETTINGS))
+            self.assertFalse(plugin_enabled("ns_plugin", plugins))
+            self.assertFalse(plugin_enabled("pelican.plugins.ns_plugin", plugins))
+            self.assertFalse(plugin_enabled("normal_plugin", plugins))
+            self.assertFalse(plugin_enabled("unknown", plugins))
+
+            # namespace plugin short
+            SETTINGS = {"PLUGINS": ["ns_plugin"]}
+            plugins = get_plugin_names(load_plugins(SETTINGS))
+            self.assertTrue(plugin_enabled("ns_plugin", plugins))
+            self.assertTrue(plugin_enabled("pelican.plugins.ns_plugin", plugins))
+            self.assertFalse(plugin_enabled("normal_plugin", plugins))
+            self.assertFalse(plugin_enabled("unknown", plugins))
+
+            # namespace plugin long
+            SETTINGS = {"PLUGINS": ["pelican.plugins.ns_plugin"]}
+            plugins = get_plugin_names(load_plugins(SETTINGS))
+            self.assertTrue(plugin_enabled("ns_plugin", plugins))
+            self.assertTrue(plugin_enabled("pelican.plugins.ns_plugin", plugins))
+            self.assertFalse(plugin_enabled("normal_plugin", plugins))
+            self.assertFalse(plugin_enabled("unknown", plugins))
+
+            # normal and namespace plugin
+            SETTINGS = {
+                "PLUGINS": ["normal_plugin", "ns_plugin"],
+                "PLUGIN_PATHS": [self._NORMAL_PLUGIN_FOLDER],
+            }
+            plugins = get_plugin_names(load_plugins(SETTINGS))
+            self.assertTrue(plugin_enabled("ns_plugin", plugins))
+            self.assertTrue(plugin_enabled("pelican.plugins.ns_plugin", plugins))
+            self.assertTrue(plugin_enabled("normal_plugin", plugins))
+            self.assertFalse(plugin_enabled("unknown", plugins))

From 49aef30dab372a041acf097207033666bdd48a3e Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Wed, 1 Nov 2023 23:19:26 +0300
Subject: [PATCH 2645/2864] add sphinxext-opengraph to pyproject dev
 requirements

---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index a16bb7f8..d9fe1a33 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -82,6 +82,7 @@ dev = [
     "markdown>=3.5",
     "typogrify>=2.0.7",
     "sphinx>=7.1.2",
+    "sphinxext-opengraph>=0.9.0",
     "furo>=2023.9.10",
     "livereload>=2.6.3",
     "psutil>=5.9.6",

From 32b72123f051dd23bf481eed26ab947f66a22663 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 2 Nov 2023 14:09:51 +0100
Subject: [PATCH 2646/2864] Modify wording slightly

---
 docs/themes.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/themes.rst b/docs/themes.rst
index 2df717e4..2e01ec8e 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -144,10 +144,10 @@ Checking Loaded Plugins
 -----------------------
 
 Pelican provides a ``plugin_enabled`` Jinja test for checking if a certain plugin
-is enabled. This test accepts a plugin name as a string and will return a boolean.
-Namespace Plugins can be specified with their full name (``pelican.plugins.plugin_name``)
-or their short name (``plugin_name``). The following example uses ``webassets`` plugin
-to minify CSS if it is enabled and falls back to regular CSS otherwise::
+is enabled. This test accepts a plugin name as a string and will return a Boolean.
+Namespace plugins can be specified by full name (``pelican.plugins.plugin_name``)
+or short name (``plugin_name``). The following example uses the ``webassets`` plugin
+to minify CSS if the plugin is enabled and otherwise falls back to regular CSS::
 
     {% if "webassets" is plugin_enabled %}
         {% assets filters="cssmin", output="css/style.min.css", "css/style.scss" %}

From 8a8b952ecb83c7b7e2cd8d331a8dff23d319f1ac Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 3 Nov 2023 01:05:12 +0300
Subject: [PATCH 2647/2864] preserve connection order in blinker

---
 docs/plugins.rst              | 10 ++++++----
 pelican/plugins/signals.py    |  6 +++++-
 pelican/tests/test_plugins.py | 21 +++++++++++++++++++++
 pyproject.toml                |  3 ++-
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index db7e00b4..22e1bcc6 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -94,9 +94,12 @@ which you map the signals to your plugin logic. Let's take a simple example::
     your ``register`` callable or they will be garbage-collected before the
     signal is emitted.
 
-If multiple plugins connect to the same signal, there is no way to guarantee or
-control in which order the plugins will be executed. This is a limitation
-inherited from Blinker_, the dependency Pelican uses to implement signals.
+If multiple plugins connect to the same signal, plugins will be executed in the
+order they are connected. With ``PLUGINS`` setting, order will be as defined in
+the setting. If you rely on auto-discovered namespace plugins, no ``PLUGINS``
+setting, they will be connected in the same order they are discovered (same
+order as ``pelican-plugins`` output). If you want to specify the order
+explicitly, disable auto-discovery by defining ``PLUGINS`` in the desired order.
 
 Namespace plugin structure
 --------------------------
@@ -341,4 +344,3 @@ custom article, using the ``article_generator_pretaxonomy`` signal::
 
 .. _Pip: https://pip.pypa.io/
 .. _pelican-plugins bug #314: https://github.com/getpelican/pelican-plugins/issues/314
-.. _Blinker: https://pythonhosted.org/blinker/
diff --git a/pelican/plugins/signals.py b/pelican/plugins/signals.py
index ff129cb4..27177367 100644
--- a/pelican/plugins/signals.py
+++ b/pelican/plugins/signals.py
@@ -1,4 +1,8 @@
-from blinker import signal
+from blinker import signal, Signal
+from ordered_set import OrderedSet
+
+# Signals will call functions in the order of connection, i.e. plugin order
+Signal.set_class = OrderedSet
 
 # Run-level signals:
 
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
index ccce684e..55fa8a6a 100644
--- a/pelican/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -8,6 +8,7 @@ from pelican.plugins._utils import (
     load_plugins,
     plugin_enabled,
 )
+from pelican.plugins.signals import signal
 from pelican.tests.support import unittest
 
 
@@ -263,3 +264,23 @@ class PluginTest(unittest.TestCase):
             self.assertTrue(plugin_enabled("pelican.plugins.ns_plugin", plugins))
             self.assertTrue(plugin_enabled("normal_plugin", plugins))
             self.assertFalse(plugin_enabled("unknown", plugins))
+
+    def test_blinker_is_ordered(self):
+        """ensure that call order is connetion order"""
+        dummy_signal = signal("dummpy_signal")
+
+        functions = []
+        expected = []
+        for i in range(50):
+            # function appends value of i to a list
+            def func(input, i=i):
+                input.append(i)
+
+            functions.append(func)
+            # we expect functions to be run in the connection order
+            dummy_signal.connect(func)
+            expected.append(i)
+
+        input = []
+        dummy_signal.send(input)
+        self.assertEqual(input, expected)
diff --git a/pyproject.toml b/pyproject.toml
index d9fe1a33..816a25f3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,10 +29,11 @@ classifiers = [
 ]
 requires-python = ">=3.8.1,<4.0"
 dependencies = [
-    "blinker>=1.6.3",
+    "blinker>=1.7.0",
     "docutils>=0.20.1",
     "feedgenerator>=2.1.0",
     "jinja2>=3.1.2",
+    "ordered-set>=4.1.0",
     "pygments>=2.16.1",
     "python-dateutil>=2.8.2",
     "rich>=13.6.0",

From 451b094a940ab28060784a1030b84bd39a2a523d Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 4 Nov 2023 00:54:21 +0300
Subject: [PATCH 2648/2864] remove social icons from notmyidea theme

redistribution of these icons may not be compatible with AGPL
---
 pelican/tests/output/basic/theme/css/main.css |  33 ------------------
 .../basic/theme/images/icons/aboutme.png      | Bin 411 -> 0 bytes
 .../basic/theme/images/icons/bitbucket.png    | Bin 3178 -> 0 bytes
 .../basic/theme/images/icons/delicious.png    | Bin 827 -> 0 bytes
 .../basic/theme/images/icons/facebook.png     | Bin 150 -> 0 bytes
 .../basic/theme/images/icons/github.png       | Bin 606 -> 0 bytes
 .../basic/theme/images/icons/gitorious.png    | Bin 223 -> 0 bytes
 .../basic/theme/images/icons/gittip.png       | Bin 402 -> 0 bytes
 .../theme/images/icons/google-groups.png      | Bin 420 -> 0 bytes
 .../basic/theme/images/icons/google-plus.png  | Bin 511 -> 0 bytes
 .../basic/theme/images/icons/hackernews.png   | Bin 2771 -> 0 bytes
 .../basic/theme/images/icons/lastfm.png       | Bin 840 -> 0 bytes
 .../basic/theme/images/icons/linkedin.png     | Bin 625 -> 0 bytes
 .../basic/theme/images/icons/reddit.png       | Bin 458 -> 0 bytes
 .../output/basic/theme/images/icons/rss.png   | Bin 751 -> 0 bytes
 .../basic/theme/images/icons/slideshare.png   | Bin 435 -> 0 bytes
 .../basic/theme/images/icons/speakerdeck.png  | Bin 580 -> 0 bytes
 .../theme/images/icons/stackoverflow.png      | Bin 414 -> 0 bytes
 .../basic/theme/images/icons/twitter.png      | Bin 416 -> 0 bytes
 .../output/basic/theme/images/icons/vimeo.png | Bin 349 -> 0 bytes
 .../basic/theme/images/icons/youtube.png      | Bin 316 -> 0 bytes
 .../tests/output/custom/theme/css/main.css    |  33 ------------------
 .../custom/theme/images/icons/aboutme.png     | Bin 411 -> 0 bytes
 .../custom/theme/images/icons/bitbucket.png   | Bin 3178 -> 0 bytes
 .../custom/theme/images/icons/delicious.png   | Bin 827 -> 0 bytes
 .../custom/theme/images/icons/facebook.png    | Bin 150 -> 0 bytes
 .../custom/theme/images/icons/github.png      | Bin 606 -> 0 bytes
 .../custom/theme/images/icons/gitorious.png   | Bin 223 -> 0 bytes
 .../custom/theme/images/icons/gittip.png      | Bin 402 -> 0 bytes
 .../theme/images/icons/google-groups.png      | Bin 420 -> 0 bytes
 .../custom/theme/images/icons/google-plus.png | Bin 511 -> 0 bytes
 .../custom/theme/images/icons/hackernews.png  | Bin 2771 -> 0 bytes
 .../custom/theme/images/icons/lastfm.png      | Bin 840 -> 0 bytes
 .../custom/theme/images/icons/linkedin.png    | Bin 625 -> 0 bytes
 .../custom/theme/images/icons/reddit.png      | Bin 458 -> 0 bytes
 .../output/custom/theme/images/icons/rss.png  | Bin 751 -> 0 bytes
 .../custom/theme/images/icons/slideshare.png  | Bin 435 -> 0 bytes
 .../custom/theme/images/icons/speakerdeck.png | Bin 580 -> 0 bytes
 .../theme/images/icons/stackoverflow.png      | Bin 414 -> 0 bytes
 .../custom/theme/images/icons/twitter.png     | Bin 416 -> 0 bytes
 .../custom/theme/images/icons/vimeo.png       | Bin 349 -> 0 bytes
 .../custom/theme/images/icons/youtube.png     | Bin 316 -> 0 bytes
 .../output/custom_locale/theme/css/main.css   |  33 ------------------
 .../theme/images/icons/aboutme.png            | Bin 411 -> 0 bytes
 .../theme/images/icons/bitbucket.png          | Bin 3178 -> 0 bytes
 .../theme/images/icons/delicious.png          | Bin 827 -> 0 bytes
 .../theme/images/icons/facebook.png           | Bin 150 -> 0 bytes
 .../theme/images/icons/github.png             | Bin 606 -> 0 bytes
 .../theme/images/icons/gitorious.png          | Bin 223 -> 0 bytes
 .../theme/images/icons/gittip.png             | Bin 402 -> 0 bytes
 .../theme/images/icons/google-groups.png      | Bin 420 -> 0 bytes
 .../theme/images/icons/google-plus.png        | Bin 511 -> 0 bytes
 .../theme/images/icons/hackernews.png         | Bin 2771 -> 0 bytes
 .../theme/images/icons/lastfm.png             | Bin 840 -> 0 bytes
 .../theme/images/icons/linkedin.png           | Bin 625 -> 0 bytes
 .../theme/images/icons/reddit.png             | Bin 458 -> 0 bytes
 .../custom_locale/theme/images/icons/rss.png  | Bin 751 -> 0 bytes
 .../theme/images/icons/slideshare.png         | Bin 435 -> 0 bytes
 .../theme/images/icons/speakerdeck.png        | Bin 580 -> 0 bytes
 .../theme/images/icons/stackoverflow.png      | Bin 414 -> 0 bytes
 .../theme/images/icons/twitter.png            | Bin 416 -> 0 bytes
 .../theme/images/icons/vimeo.png              | Bin 349 -> 0 bytes
 .../theme/images/icons/youtube.png            | Bin 316 -> 0 bytes
 pelican/themes/notmyidea/static/css/main.css  |  33 ------------------
 .../notmyidea/static/images/icons/aboutme.png | Bin 411 -> 0 bytes
 .../static/images/icons/bitbucket.png         | Bin 3178 -> 0 bytes
 .../static/images/icons/delicious.png         | Bin 827 -> 0 bytes
 .../static/images/icons/facebook.png          | Bin 150 -> 0 bytes
 .../notmyidea/static/images/icons/github.png  | Bin 606 -> 0 bytes
 .../static/images/icons/gitorious.png         | Bin 223 -> 0 bytes
 .../notmyidea/static/images/icons/gittip.png  | Bin 402 -> 0 bytes
 .../static/images/icons/google-groups.png     | Bin 420 -> 0 bytes
 .../static/images/icons/google-plus.png       | Bin 511 -> 0 bytes
 .../static/images/icons/hackernews.png        | Bin 2771 -> 0 bytes
 .../notmyidea/static/images/icons/lastfm.png  | Bin 840 -> 0 bytes
 .../static/images/icons/linkedin.png          | Bin 625 -> 0 bytes
 .../notmyidea/static/images/icons/reddit.png  | Bin 458 -> 0 bytes
 .../notmyidea/static/images/icons/rss.png     | Bin 751 -> 0 bytes
 .../static/images/icons/slideshare.png        | Bin 435 -> 0 bytes
 .../static/images/icons/speakerdeck.png       | Bin 580 -> 0 bytes
 .../static/images/icons/stackoverflow.png     | Bin 414 -> 0 bytes
 .../notmyidea/static/images/icons/twitter.png | Bin 416 -> 0 bytes
 .../notmyidea/static/images/icons/vimeo.png   | Bin 349 -> 0 bytes
 .../notmyidea/static/images/icons/youtube.png | Bin 316 -> 0 bytes
 84 files changed, 132 deletions(-)
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/aboutme.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/bitbucket.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/delicious.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/facebook.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/github.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/gitorious.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/gittip.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/google-groups.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/google-plus.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/hackernews.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/lastfm.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/linkedin.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/reddit.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/rss.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/slideshare.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/speakerdeck.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/stackoverflow.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/twitter.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/vimeo.png
 delete mode 100644 pelican/tests/output/basic/theme/images/icons/youtube.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/aboutme.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/bitbucket.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/delicious.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/facebook.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/github.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/gitorious.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/gittip.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/google-groups.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/google-plus.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/hackernews.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/lastfm.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/linkedin.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/reddit.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/rss.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/slideshare.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/speakerdeck.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/stackoverflow.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/twitter.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/vimeo.png
 delete mode 100644 pelican/tests/output/custom/theme/images/icons/youtube.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/aboutme.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/bitbucket.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/delicious.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/facebook.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/github.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/gitorious.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/gittip.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/google-groups.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/google-plus.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/hackernews.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/lastfm.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/linkedin.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/reddit.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/rss.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/slideshare.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/speakerdeck.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/stackoverflow.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/twitter.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/vimeo.png
 delete mode 100644 pelican/tests/output/custom_locale/theme/images/icons/youtube.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/aboutme.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/bitbucket.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/delicious.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/facebook.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/github.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/gitorious.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/gittip.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/google-groups.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/google-plus.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/hackernews.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/lastfm.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/linkedin.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/reddit.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/rss.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/slideshare.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/speakerdeck.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/stackoverflow.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/twitter.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/vimeo.png
 delete mode 100644 pelican/themes/notmyidea/static/images/icons/youtube.png

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index a4aa51a1..49de03d9 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -322,39 +322,6 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 		max-width: 175px;
 	}
 
-	#extras div[class='social'] a {
-		background-repeat: no-repeat;
-		background-position: 3px 6px;
-		padding-left: 25px;
-	}
-
-		/* Icons */
-		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
-		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
-		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
-		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
-		.social a[href*='github.com'],
-		.social a[href*='git.io'] {
-			background-image: url('../images/icons/github.png');
-			background-size: 16px 16px;
-		}
-		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
-		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
-		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
-		.social a[href*='news.ycombinator.com'],
-		.social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
-		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
-		.social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
-		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
-		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
-		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
-		.social a[href*='stackoverflow.com'] {background-image: url('../images/icons/stackoverflow.png');}
-		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
-		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
-		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
-
 /*
 	About
 *****************/
diff --git a/pelican/tests/output/basic/theme/images/icons/aboutme.png b/pelican/tests/output/basic/theme/images/icons/aboutme.png
deleted file mode 100644
index 600110f2f63811ebea40af1b943fded0275b6a39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 411
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0Z>UqK~#7FjgmEk6+sXNzkTlh65QS0-8I48iI50)i1C<TLIf!u65`Ie
z&U9bT%(-r@RZzX|0Z1-827lDPcos@7IuIQ_7Y^=pU^c=6fi$$Dx(bOyOqx{_9Hwx4
z10X3eDO1;1abvB-GN7or(M1rLOv)w&YiKQjNt+u0h|2&`L$%a4B`0oxNy`j3H-Qu^
z65A{2rkY#NVM$$ET66EENb=%**t@NJ@Bu*L+$47eL}qMBY&g%aXQwxuORYaE5?^&X
zwfeM3Z1F*}U${59c)t^gL-sVy094g)j;0{g{!@{J69Dy3KSD581)`3(r2l>K$|J3O
zMSiddRs94I-RZ%BpPVQlG-*wE)^@pKur#bMkyS)ii4hvVB0PPwtX?$Lk2sgu3yxdr
zMHBD`H`aw%Ysl&kiS1h=1)tbo!~Ye`fCpjdO!(yU+ZHs&^bQiZ<l_JU002ovPDHLk
FV1n*$sGR@+

diff --git a/pelican/tests/output/basic/theme/images/icons/bitbucket.png b/pelican/tests/output/basic/theme/images/icons/bitbucket.png
deleted file mode 100644
index 277a7dfb931349c3fc0d905c8225f7d08677025d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3178
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
QSO5S307*qoM6N<$g2TiqjQ{`u

diff --git a/pelican/tests/output/basic/theme/images/icons/delicious.png b/pelican/tests/output/basic/theme/images/icons/delicious.png
deleted file mode 100644
index 34868c5c69979ebabe19d9808e1d20298c196f19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 827
zcmV-B1H}A^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00095Nkl<ZcmZ9E
z1FR)i0EWLgbMCykbA9(&>)pJqZACTW#!hM@D5IKDqq;%eMz!tbv+awqP8IHt=!XVS
zsZ`n>$2lgOwFdh8dv^BsZ><jO?rgQ?6?v<8&iuym=Ei)j$E*iAt2@8G+HYpo%Ugc?
z1M&LD+NGCX^~Sz^1K0F#?X!+K<`@cjlh)QP?AWoJ?+?K9FF|`1HaB5vPVvV94R6@v
z*b_Fn>()0em94EiuYK~#M+HZNki~hy!n`DO0RgV7kx83G-6kVzbw2peZ^$T0XF+WR
zfC!}kbTrMykUD-`pyq(>!2GmFl&qi|8BD#Yimm6&NW;(o1*9a20zlURQu0~F;$lpk
zC^lANi08=`Jt9})*0WlBM`^dLR$E*Uq-h9fXc|BQRMFBY=8w1tql8shMigC06q$^`
z3o;x$Brcc5Vx|EggvrrZTv~ueFR9S5n?9&@2ra;ZlJa{y#y*#;tE-3i@BjIXTFqx<
zWQM^b2eIvt(ZSC+IB^l#ZO?Jct~%A$Zme8|ylK!@D6=^GmdF`z&B`yo_%8qUJKqup
zI`#T8-~s^<(cM|*r>_LNwibZ|C;<x4dFJT@#w)K*RAj!;b#kiO@%%-S#79s85*l`s
zV@@diGfn^<h=354f+lp9mL>c5580x>Z^zql9MEVifl5$XO00aq!?ra*2Oy6Bcd7s&
z4E&Wd&NypYm|1Hm3>yT#OOnPY6%hC_U@<y8#LDs{0H6TSga8x@YCr${)rQ!*wKo?8
z9#Tq_O8z?l9jLHYi?Evx08*MrX&^KM(5TmH)$6an!IIO{lVPDyA_&(p1bE&GN#X#@
z5Sw^`0>Jle48x$&@MzjDei*iPb+`A(ty}jT{_VFp0@p^D9%vpdEdoQ&A~UVr|G*1s
z*N$#`bZl0nsoeDaV0>!ow??I6E<OD4z4Owttg#c08+i88OD;%%{^`TtmR5#V&p7>}
zTD@V0|CC##a5uK^=-$j1%KE$Sep%nY|D6y3VDFw|_#0Q*b=;R(Ji7n@002ovPDHLk
FV1ku*k$3<A

diff --git a/pelican/tests/output/basic/theme/images/icons/facebook.png b/pelican/tests/output/basic/theme/images/icons/facebook.png
deleted file mode 100644
index 1d8a4327d59337d8e0ea3c8e3760479a9c7a4952..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`v7RoDAr*|tKmPx>ca`voa6f0k
zeB{69k@N|?Km7UBZZ))YUHu=w|Mw?(E)O$?WixY_FPL7s$Pm-8fstds@^ATL%bUet
y<Tqqr+Vg*>ZgfGChJzsUtA%$MR;8+S88GxaEa+z7`Ew3v5re0zpUXO@geCxdur~kz

diff --git a/pelican/tests/output/basic/theme/images/icons/github.png b/pelican/tests/output/basic/theme/images/icons/github.png
deleted file mode 100644
index 5d9109deab2b3669c845845515f4d53ab5d6daa6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006dNkl<Zcmd7U
z1MJmN6u|NKvTZjuXIrzCttneG@|bJLZVF?@lx^GQ>3g@6&i?1|w)NXSf84|8m&o+0
zUbR{k48>ZU#v6!wqi1V1r%EE$MYAT@gfEZ`ebJgG`3x?P75EOx(Rb}pK9^g49TLfP
zG|6;$SG<Bm_6l9o4R020xW7a*Z+J!AFa_taEytx^Y3+G)eghQ?T3|KA=%=yb7>bAH
zWw$>tFUyCTTU=}VL5$UQcykD>ruLPAMktgpS2)vHd2`;>>D~O#r0q^piwN%{Eu7xl
ze<swxS0`y;garmdES*^+B#d+t?x0eH1uEgTGh<{(*yIF<M0`6R;>_3-g6EyPr+mZ(
z$~zD9`4D^$F>WOyU!f<&c%QI`>dHS@;3~xO7I+<f0eV6#H-KsphgWlNC_hd*!2uB$
z7~sq}8G@^v;3*V|FuaKN5(}$BLT`v;QG^8+K^(n9LRq|nIJTfh4uflItvKGH?9b#S
z5H%N_Z~&q{V>5=MISM;>bsLPrcC8T?Gyg2EhYt{Z#{?9|afq=U$pRKgVkaa6A5hOW
zm~E0;qoMsELHiVUdq+qHW_!=pLlCuB&nsXkrlThcr&yqB2Ez}bh}WQodCMG=<rA+0
z#G}1yq-#<iS0L&jCSee!qC}1hTtWS8zC`SH8db<)f!$euxzT6!Fg(s<fhQP_WIpd?
sWiSDk@f5|~Tw<DY852<^@xNa`0K$+*Vd5uE0ssI207*qoM6N<$f>62#-T(jq

diff --git a/pelican/tests/output/basic/theme/images/icons/gitorious.png b/pelican/tests/output/basic/theme/images/icons/gitorious.png
deleted file mode 100644
index a6705d0f462b505be4d9a5a372743d206c141a11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`D?^o)dRwqYcev@q#DMvQ
z*(*AHH`kW0om8=NO8&uVRmbKn*uQ@5(H+Zf?%R0x*ww37FTJ_{>eZ{eAD{pK|9`68
zWgnn9ah@)YAr*|ZCyp{U2QWBn{C>Cgf8^^ph2sKmrZ@0Db>47eliif`GZN3kOR|4E
zp1HSr>(=i-J2K=SnYPGB*}QnjI%8UJ(Sx8<XA63}SyslraSzj~KRTIl$xj8xPp<PA
X`P?|)s^vF;9M0hB>gTe~DWM4fr0!yB

diff --git a/pelican/tests/output/basic/theme/images/icons/gittip.png b/pelican/tests/output/basic/theme/images/icons/gittip.png
deleted file mode 100644
index b9f67aaa32a0acd166d7271b3dbf9113717d3f00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfoB*E?S0J6}W0T-*4J5$~5D8`b
z*u=V<M>-n;Wh0%9W86%yoICmD^QXBJ+TuMeduj_mynB29_Kl1X*A2_&{r~^}-@kve
zdYW2FGLG%r8Ru!aX~lxyzki)LushDvqC7Rcx2`zG-R$h~L;wH%fBfKXl#6k)zx}VD
zKk}k|sxxDHYKs!Qtrkt~nbKapYTmR2Z<_=!t4|TTzXRRJSrX(I%%C#k)~^Ns|6P3T
zwz~@CcuyC{kP61s^QK8h9R!*aGdC-5mQ6dy==6QR=MEp?G>PQz`~2?eFFMS(r+K1g
zp!&qb32C!ZG_9s->U*tRla<=$@$cY?|5H+adAMETx@7!MusHjBPl?KXziQ+6?1D=V
ze?2)-gt;N$>Wd8<>nsYyl^Lt{Fxgl%o_?@o{T-$+24C7lzi+*sf1s9QvY5Z$XS=Iy
lUyMDUTPOc|vvcNeU4iM^B0ctPia>WVc)I$ztaD0e0syFMv7G<_

diff --git a/pelican/tests/output/basic/theme/images/icons/google-groups.png b/pelican/tests/output/basic/theme/images/icons/google-groups.png
deleted file mode 100644
index bbd0a0fd41295e94081103efe82742a5c6411765..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<Zcmajb
zGr%ZhAHdP`nPJOQTgI5J`7YVEw)R>wr?kW++e@xB+qT~SFYEF=HvR&ieDr#i-_xj}
zRHo4+e;!+Noelr;cc?77Y;{c*CNr6Zes7m1^J^+M9sV--D^!{k1_1#;6aW?Y?FKU>
z$wUFckfr-O)R-Be!K8BMN$?ljo<0akOpD)OEKI~9+x!b$boZC|3lK-`{C{xHEuU!d
zCn!ydf)v}GF)B$#1SpIDL5ep&8ms<i+;i$*@D~7=J@lOqzWA#qSn>%oIbw(Zf<>Eu
zV{!X$x!~%@{^9sNR&mx%AN_fQnat#ZJ3j~K-$A9Q{GPt1rQRSFm;ow5sT2?@^QR4r
zg$anDgeCx$iqb6h2iG6)ockYoL<MGs2$l1m-AhHOOk)WzKKEExUU5lR{E#fkMyI^r
zh9|$*1}D9nrFre;r@Q~Y8?zi6ocPX{>!0v;mgd!$p2~_@_rOO_1Na`l%Wwj6hQdz(
O0000<MNUMnLSTZ~)5C56

diff --git a/pelican/tests/output/basic/theme/images/icons/google-plus.png b/pelican/tests/output/basic/theme/images/icons/google-plus.png
deleted file mode 100644
index f8553d45ef3c858672ca169868aadbaf3c14b8df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0005TNkl<Zcmb8r
z1Ct{`6ae7<AF+)|#ZJz)eOJ7~*|u%lw#~I|+h*^JvF`e+>oJ)blrcs(C@6ijHhGjL
zrFRi_0z}#gh+z_?jx?ulJ6ZEDq_MICdrx(I>4q_hBh(<wDu+V2jes~|xEhtlmN&gz
zojg(*H)&GA=UnKu{@j%`Tp8yPVwFKL)Fy*Cc9;@j9F;R(5j#{714hoPEP-xa*=pT?
zi_{BB-WV3Xrwx-w+TBv`W<k5*=B&_BI^5HNh5X!w(lCoO)a($s`=jG8E=>7t5P3nx
z6N?e<z>UwA{x^#MIz^w4#;vg#Q`{-|sTaZm+z|gUicmu%q_q_{S4K=37O~-YZFy$l
zCeshS!0W4y4-;Rs{O>veK>w%APq})#_~VzlN~kv#Z!>>U^FI6esN%Y~QuIs1d#~iY
zS5C<<$DO!3cexVMKA`VP&KrXDnvg`iD8?-qH)mw8u{$e0Ls5Ir<bL~J_~LH%<GXnw
z*_{|pRms6=uVsuEfu1{W)bQo-&*8kM652Bd;m<>Fnpzz@8B4^@ijQjs{a4Z+iYWeG
zt$5N5AMVx+R~iI;l~A9E$d3ce%4xvm2W_r2NEe$slb&w_>f!(Z002ovPDHLkV1lnz
B@09=m

diff --git a/pelican/tests/output/basic/theme/images/icons/hackernews.png b/pelican/tests/output/basic/theme/images/icons/hackernews.png
deleted file mode 100644
index 8e05e3ee207e114a96f3811f46f68d17d52fe80b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2771
zcmV;^3M}=BP)<h;3K|Lk000e1NJLTq000mG000mK0{{R3?cL&1000U>X+uL$Nkc;*
zP;zf(X>4Tx07wm;mUmQB*%pV-y*Itk5+Wca^cs2zAksTX6$DX<Nq|rShJ+?|L<L3^
z5h+$=RKNj8hazJ|6bplbV%G`s5KzX!QA9=M-HdAq@2xfS-kSZ#S>M^`x7XQc?|s+0
z08spb1j2M!0f022SQPH-!CVp(%f$Br7!UytSOLJ{W@ZFO_(THK{JlMynW#v{v-a*T
zfMmPdEWc1DbJqWVks>!kBnAKqMb$PuekK>?0+ds;#ThdH1j_W4DKdsJG8Ul;qO2n0
z#IJ1jr{*iW$(WZW<e?f_&KbNko{YOt-kK%hql^ThT$m-`XQO-vWxZ5MngHeZDAUvU
zoJ;^P6q#Sl=O&?Si84hL8SaVl0ssh<#5ufj4vYCYXr2Igrf1}e1c^yvrV-beY31n1
zX8Q57Q~6>sE0n`c;fQ!l&-AnmjxZO1uWyz`0VP>&nP`#itsL#`S=Q!g`M=rU9)45(
zJ;-|dRq-b5&z?byo>|{)?5r=n76A4nTALlSzLiw~v~31J<>9PP?;rs31pu_(obw)r
zY+jPY;tVGXi|p)da{-@gE-UCa`=5eu%D;v=_nFJ?`&K)q7e9d`Nfk3?MdhZarb|T3
z%nS~f&t(1g5dY)AIcd$w!z`Siz!&j_=v7hZlnI21XuE|xfmo0(WD10T)!}~_HYW!e
zew}L+XmwuzeT6wtxJd`dZ#@7*BLgIEKY9Xv>st^p3dp{^Xswa2bB{85{^$B13tWnB
z;Y>jyQ|9&zk7RNsqAVGs--K+z0uqo1bf5|}fi5rtEMN^BfHQCd-XH*kfJhJnmIE$G
z0%<@5vOzxB0181d*a3EfYH$G5fqKvcPJ%XY23!PJzzuK<41h;K3WmW;Fah3yX$XSw
z5EY_9s*o0>51B&N5F1(uc|$=^I1~fLLy3?Ol0f;;Ca4%HgQ}rJP(Ab`bQ-z{U4#0d
z2hboi2K@njgb|nm(_szR0JebHusa+GN5aeCM0gdP2N%HG;Yzp`J`T6S7vUT504#-H
z!jlL<$Or?`Mpy_N@kBz9SR?@vA#0H$qyni$nvf2p8@Y{0k#Xb$28W?xm>3qu8RLgp
zjNxKdVb)?wFx8l2m{v>|<~C*!GlBVnrDD~wrdTJeKXwT=5u1%I#8zOBU|X=4u>;s)
z>^mF|$G{ol9B_WP7+f-LHLe7=57&&lfa}8z;U@8Tyei%l?}87(bMRt(A-)QK9Dg3)
zj~~XrCy)tR1Z#p1A(kK{Y$Q|=8VKhI{e%(1G*N-5Pjn)N5P8I0VkxnX*g?EW941ba
z6iJ387g8iCnY4jaNopcpCOsy-A(P2EWJhusSwLP-t|XrzUnLKcKTwn?CKOLf97RIe
zPB}`sKzTrUL#0v;sBY9)s+hW+T2H-1eM)^VN0T#`^Oxhvt&^*fYnAJldnHel*Ozyf
zUoM{~Um<@={-*r60#U(0!Bc^wuvVc);k3d%g-J!4qLpHZVwz%!VuRu}#Ze`^l7W)9
z5>Kf>>9Eozr6C$Z)1`URxU@~QI@)F0FdauXr2Es8>BaOP=)Lp_WhG@><tXJG<r?L)
z%2EcxFktvIQW>R;lZ?BJkMlI<xzFRz+cvLhUjMu)mH8@eDtwh9m1dOzm5-`SRd3Z4
z)t#zss!!A~Y9?x7YT0W0)h?@z&!^9Kp3j|MH2>uMhw8ApiF&yDYW2hFJ?fJhni{?u
z85&g@mo&yT8JcdI$(rSw=QPK(Xj%)k1X|@<=e1rim6`6$RAwc!i#egKuI;BS(LSWz
zt39n_sIypSqfWEV6J3%nTQ@<sT(?tqLQhLCSTA3%QSYHXQJ<}!q`ybMTYt*H&>-4i
zi$R;gsG*9XzhRzXqv2yCs*$VFDx+GXJH|L;wsDH_KI2;^u!)^Xl1YupO;gy^-c(?^
z&$Q1BYvyPsG^;hc$D**@Sy`+`)}T4VJji^bd7Jqw3q6Zii=7tT7GEswEK@D(EFW1Z
zSp`^awCb?>!`j4}Yh7b~$A)U-W3$et-R8BesV(1jzwLcHnq9En7Q0Tn&-M=XBKs!$
zF$X<|c!#|X_t<oHD7%Dx)e-CH;keH6jN=C<dnd8eNvGePS<WfW4bGzr3>WYh)GZit
z(Q)Cp9CDE^WG;+fcyOWARoj*0TI>4EP1lX*cEoMO-Pk?Z{kZ!p4@(b`M~lalr<3Oz
z&kJ6Nm#<fmSFg8{_hRpA@25UGK8Ze!J`=unzN>vN_+kA5{dW4@^Vjg_`q%qU1ULk&
z3Fr!>1V#i_2R;ij2@(Z$1jE4r!MlPVFVbHmT+|i<Li|H^g**v03|$raa~LixG^{4<
zdAL=0et35TEn-DPL&UpCkI2%<M~jUXOBQ!V$w$RS)kjT5dqtN;OP5$IS+nFuj9QE!
zracxP8x?ybc5<or(%nmk<Lu%J<L)jqT$Z!!+H$q!smsr<kYB-BaVj1gA06Ki|A`aA
zspU+r^k2Dm<pkH0yNCOd=f*4NjqzRhW&Du@mxQu}(L|TTU5R5!u1OV1;{s1XwcvHK
zU-E(Esg#hEqbW0~(W%X8gtYjy(?TU-im)qPGd(B0FT*sWFhjb^Y1Qsk6QV%TkxVFa
zS!TPKj{Z#bNQ@+#C4*TDvud*5XGdk9%2CV_=Je#6<ZjCy$@9tkel=z_cXemJcK(L^
z!8Pt{4y}dOu3X!>PIq0wy5aS{>yK?9ZAjVh%SOwMWgFjair&;wpi!{CU}&@N=Eg#~
zLQ&zpEzVmGY{hI9Z0+4<v#n~|mm*%#^<vB7isDZt+>-0xS$$Xe-OToc?Y*V;rTcf_
zb_jRe-RZjXSeas3UfIyD;9afd%<`i0x4T#DzE)vdabOQ=k7SRuGN`h>O0Q~1)u-yD
z>VX=Mn&!Rgd$;YK+Q-}1zu#?t(*cbG#Ronf6db&N$oEidtwC+YVcg-Y!_VuY>bk#Y
ze_ww@?MU&F&qswvrN_dLb=5o6*Egs)ls3YRlE$&)amR1{;Ppd$6RYV^Go!iq1UMl%
z@#4q$AMc(FJlT1QeX8jv{h#)>&{~RGq1N2iiMFIRX?sk2-|2wUogK~{EkB$8eDsX=
znVPf8XG_nK&J~=SIiGia@<PUi@r#KUhdNhuKDxBz(w(lbuHMUmm#<#&xpJx7z5D!C
zm#b&4IbAz_oqfIShW(A!9=o2FU+jKq>9y}|z3FhX{g&gcj=lwb=lWgyFW&aLedUh-
zof`v-2Kw$UzI*>(+&$@i-u=-BsSjR1%z8NeX#HdC<Dw@DPb!|OKdt@M_}6Bsz4Yv$
z*I>`Hh-Z(6xI-`hmHDqv!v)W&&nrf>M(RhcN6(D;jNN*%^u_SYjF;2ng}*8Ow)d6M
ztDk;%`@Lsk$;9w$(d(H%O5UixIr`T2ZRcd@<kNR)@201U-mAVp_JRGO`(yOSk?HJD
z_)nFejX!sM3H<VSCT(Ws-}i*``!YINegFUf5>QN3Mg3?1|NsB>i~#tuXaD5J_o76e
z$B4WD001vZL_t(|0b{@m1Qi$r!3;wKW??Xc(Sbz(%wQEZ41g$d6oINX6oxVw1@JNO
Z0sz-j0)=#JDs2D&002ovPDHLkV1kM1SuX$p

diff --git a/pelican/tests/output/basic/theme/images/icons/lastfm.png b/pelican/tests/output/basic/theme/images/icons/lastfm.png
deleted file mode 100644
index 2eedd2daa1429ba026c0b3c81f200c7df55d199a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 840
zcmV-O1GoH%P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009INkl<ZcmX|+
zL!cx_7=XX3uJO$3DYk9fb}q5)9CO}VY&)k|m$hx1&u{#C-gHlORc$YS8)E3^KTb{*
zD^Dle+pd;{TwW^A3QsLn5p6`#iFjfNK@sOdj46@unxvEEI5$8_{h^Y@>KCJu$;;6i
zN)?b2a3_#VfTsWs$6EHV5TGNlK%}w4u2N|o9mJtskW6u)FfMY|?6HLq0N~tSmCYiQ
z2itn^l^G`qTae2D0xESFZh|%tXmDcRU;!-yQXzzdgu?j^sE-_`#F)I#a0AjAIORAv
z?nua{5j_L2Xf^mv7?p>M&VsISuyh@C_u_&8Tdjpsq*G;#gR3rt3(wqpYJX|(pqnm-
zVi_(t9gaQ}dWUeQ9S7b0nAMvJMjCC()%*h2T()P6`Q<<4KoQZ3;E)b@<W4y52#8}G
z+(9&P7L7@B<BwD5_-b89N*Q26jy{ZN`8xEBg@}a0RLexa{f}L=0(Z?tG(P+RyR{qj
z!h@tAzKgJXkf6Vab%e4we_6``^6-Oktq?tX33}xg{Dtdjyz?U>mqq9E^qzbJ^&kHt
zb@z3sXYQl9ZY#2oD@eP!I~#uc8*<!e68GQ4@T3J)<}4>V^AwupI;L7D|Jvi|(8qu0
z2LL$zBz)6?fx+w8bl#l{x;rm&{_hjrZqU60&R?<CMX}xY(3`IR{#W+IZN=ZCO%S>r
z_q^a%r%rJ@Z+x)Fd-;e{U-Iff*T}z9(5p5g3wcDXPJR3rG$+nsWZfoYCWAb*gT_Bo
z7<z3y{^DiG_BOJ|9=1uWKlk>fg}|L9J&75r5f0ZeI>gIn5MAw<$RbKrq)K4wK5le|
zR(k=@SlVyBWV*`avXNJ<A=^gb4oQ-X#v-gm5M#>2NP$f#q_(8G+6X;MtJy>;4`+;2
znIjMBZmisPo~Hw3I)yO?atTx+i^wMNq>KkRoaf=R#1u=&Mhm*)MMoa?yQ=3?Z|U=o
zU9OHh!itfmFwG$0g0M5@al}`~v399M8f%oORSV+K_KnG|j?V;kMf)2sF5LyF&y{nJ
Sd8X6=0000<MNUMnLSTYCl#(O>

diff --git a/pelican/tests/output/basic/theme/images/icons/linkedin.png b/pelican/tests/output/basic/theme/images/icons/linkedin.png
deleted file mode 100644
index 06a88016f191d1f7596e5d159eb9e3ef276b6ad4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0wzgBK~#7FO^-8xbw?D(e`jXidN;PMDz@#UZ=y1``Zjjj*tWT`?PP7f
zy?5@Mf1G^Bh5;8m`fWfi8Gso87>NJD$VFG5yq%r(;8z<Bbhfh>R}7Ydty&~ue@oPv
z!go{cG`vvH)n(hYdJfur_4kM7-}`N$BLW71f|-O65QELNn>4;$_2zi#L7VQdUf*VG
zc0B*xR8@Sfo>nmHN}+MDnqn5J#;f9g$TZW=OS!!C<4lU-jh|=cs;0XYW~;nhJEE0r
zdMWpJ#bDNMT&}cGH>t7P-yM4W=h<K9Rw{QI0n_cKw-wju?TEpCnQa%Dp=6epYZp3o
z*NqO?a`nMq=5Bpw=#2d~-DRWx4~G^{+-V(Pex=;^>FCXaLv`alDWtkCwY0;!z58#z
z#&T71?c1;2yXPjW|3Lt-K|fa>vgM24P7nS%my|*-?u{?k1z4y`Q@qLr7+I)}xOVW2
zJ3sxy0Crrjx2{T+o3K*EU*7;Otu&GVZhd>`xi2Rl`h0wRu?9M0pr|e$T%t()-9X(G
zM?fxx1SUy<yKr|DkdWj62;7kX1B3|!KoTyw2PBjFIwLU99fQ%`N<eQ%#66gGrU-PW
zfGdTV5KXXWzn;uRul+bv6+QXo#Po80`=>c#Xy<a@M<Y9|)Azy9yc@xSan4gjQc-dh
zBgfEkMJESJFrcG&5IIt0JzXsWIOj>CAwXc5_{TIPFaU$>TzBm6pmt%Vs1;7F00000
LNkvXXu0mjfHfAMI

diff --git a/pelican/tests/output/basic/theme/images/icons/reddit.png b/pelican/tests/output/basic/theme/images/icons/reddit.png
deleted file mode 100644
index d826d3e746a18b712db7a68746c0c523af802fe0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002|P)t-s*6{zu
z-S)`f`oGrhQd?zZaeauGqhe}vWMyZ3ikXa^u3u_(t-;A(Y<gf_Tl)9(N={SB;rq|%
z{%LiBrn$~=e27+BUXGuzvB=+zp|p95n<+0gcZZmouf@XJ^U34>rn|{qWNU7Dgl~R~
zWNK}Sjg6(Fp|rEIpPrq2fPh<JW^8bF-rU+gJUWSohV%CH{{H@Vdw_9pZ?3Mc{-&h<
z5D)&t!H}c4M@L8gvatR#F#gWWZg6tl`2JH|WzWpXsHv*b($eto@ZI<Rti#tvN>0AJ
zxy#GTfq{X3etxmY-Bn&^YHMt-t*g_~&)L`2qqxp^h?r+{fMacVpMN&`0001qNkl<Z
zcmZw8HChBg5QgFJZ+%E`iI5mSz;FOAJaZCaEJZ?`+O2haTgzCcIS9>WKP}*}Is^$|
zQ}1hfWmjT2av-PYqbE!!n)oua2c5|Qn7a$5l#p|w<m`X?*B?1&{QQ*yG}lv&2sdE^
zHn+C7Hen-x&+Stk`#vFbD`&350(5N}YCBfw0eY(=c;GCP9RL6T07*qoM6N<$f|F|G
A)Bpeg

diff --git a/pelican/tests/output/basic/theme/images/icons/rss.png b/pelican/tests/output/basic/theme/images/icons/rss.png
deleted file mode 100644
index 12448f53417b4974fa041655a5fa82dee20c73d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 751
zcmV<L0ucR)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008ENkl<ZcmWN~
z1CZ@j0LJm(ImxQFZQHhO+qOov$8T77RNJ;~x6jsI=H4WyJO20&0O{2e*R#;@enu8v
zSYz5U`lG9f^{QgNh`4A^uQ5^Zx{ys(=Yy8q{Ee{X4HE;T4==hy{l#^L7b6VOE2;Zb
zJ!B|o{YQH`*)Z)EiL}8j`)Bpn_ih`)mk(Qb4bqZ~PNO$Udm7EjwEm_u5jk-Y`UPr=
zBvh^C@(||iBMvctl*TWN{zi!kgMo#Xr9#o5oR2^pV6dV;eYIR`(vC*|WYG;-_Z*5g
z&G8g77&|ljcLs*3D`JKKK(J`8HGMH-Wy@c~8mCEs04m-&oL^sL$pKOTAR_hZXu*|d
zT4)vN=i8(=cjKeerI}w!NHX?#fwlKyexHDl2uWQ~)(cOI$-qC_lc{<vxslNLRCsn9
z>6z7}`F{d?z0T5WQglfOLER+{E<Zl%%$TE?D=fAlTa07>--Hu?5@wDUpV?F@=Mkg+
zN{1=uqDlzrnkbYp)J3q!I?Vn|_~<C<uZN@sH{`S#%2r4C{8G?g_5ekNtde?3v!K(Q
zwR}v2OSklzgp7V$`07I8@uh^JrS*2WMfKyOlnn#R@2XyOQQDQVom3^=D&~=_Vg7hV
zmXUUUh2z@#F=xhy%2iI*YN7eNY%m-1m)4$3s*@}uPyJp_oTNsog}SMT3+Z%oi+y>M
zVqi53FA<CZH0R8bTC=4{5QK^ph8v;!;n7v%FXxP}+g+hrQa5Endxqg|REJtzZE@Ay
zuJ-JXp@j#9Jku>JQ^xo7*4+R80OflZT^0WscTaBuO7ca6A_aA-H9M3Y@{DSLGBL)|
zTym{{me}!*Z3962jmy>w<<#@)IsY9R%I3sYbB>~@mM@C5Ks~s4nX-}TW8S>D*g7F!
hew!yYJnD{z;D0NLV2ni3qF(?2002ovPDHLkV1k{La&G_t

diff --git a/pelican/tests/output/basic/theme/images/icons/slideshare.png b/pelican/tests/output/basic/theme/images/icons/slideshare.png
deleted file mode 100644
index 9cbe8588e24976076e5fc3898fa97856122f6fa2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004cNkl<Zcmbu8
z1B@g=7=<V1*^15x&$eUZY}>YNn`_&)?H$|J+jM18jcAeNE5840mI#38{rmUny@9DE
z#Xg@8y@9DE0*}W7yWQR+m>Mc@yWPA^!~YvlZXQ7Ti(&Z??RignZicC$0;ki-+teNz
zN*Qw@h$6fTDiChi(;mQdV>IdC=QLyP(`3?fGmSD0E706p2ko0(Fn89&YPG`Qa4@$>
zdhWPhszyk06L$T`#EcuEoIB7dp?k0q>OF&bXs#{9!Ot=1fBXlJ={G`9+@@d!27`fI
z*^>PO`g==w@1W}FBwRnS8UK$h$DgmS5K-O+o6QEJ(Z~waYBd=2dOa)_3-qUlQ$o(J
zM$*}Z*m~g-OePa_IvoOeR-jNQz{PlZ6lKDV2#PRA1rmt_T+Fw|P-fhVCCq=C0AY>_
z#9}czIyxxk)H|>~8V7Uy1sn}2#;nIlxE)_f_XF?+t*xyTxm-@(N8ncJn41xc#e6|8
dAc8(0=Pod^EtOP(ARYh!002ovPDHLkV1k4J!&(3U

diff --git a/pelican/tests/output/basic/theme/images/icons/speakerdeck.png b/pelican/tests/output/basic/theme/images/icons/speakerdeck.png
deleted file mode 100644
index 7281ec48b41095180a83d71eaf0b00c85116965b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006DNkl<ZcmZ{i
zwSpx@6o$XkUE_+oyF-GzTTH~f2>K92#E{?_PJ+8Tth@W(+a>28uk~_0`h`<(yY|`h
z@3?AaV0?I7E@5C8LL5^B7?_#m1O5GLKL6{LaQ3ZN%$$19RhM^ilM4(QGb91Pk}#td
z%#5L?Rn9&W7zkqrdeL$z%L))wjb<QGH@5U5g<zWd8)C|&Sn%Rd{|O|hdaLQx4V6rc
znUG>8cZK2wtEL}mE*O&6H3%~&#zdHx68i}xJQZ+34dIdgm^E12V4($L!Sax!Q)0op
z%%0y@llS*=IU_?ugf;+>a;DdHv`xcYwwSu^B5bgwWG8rba<?cT?m5VS!=2aN#8dY_
z%C~?1h9Pdb_C{X+<UPLr{TKSX50ZM3h9OFFf{G~7@%diF*x)D+-FOR6-gY<tuU`ui
zkKb}9dv@;PpOq`wuy5DGM>UIq4<$P}6+C9-V(ZSGy!i4<yz}t~WCXxxUwzHbEB>XI
zBkkxgITji#coxBn7F<w)fzwZ+jfnz$w`Vhkff+(HXG}8)G(&^98y*WK6@r#xAPJkE
zB$!p2Dp(SSBc78(7IG2fB6qpImV}uBAW^w60JEh#E#74jSPWu)$ntDf_o_fq6*P@u
z7=bSDZyjaFj)YJZ>*@>CvnH5Im-dI=x{a@nz|+mZz(oB8CqTLuD=F=p|2qrpWMi5G
S=mtXo0000<MNUMnLSTY<zXzBA

diff --git a/pelican/tests/output/basic/theme/images/icons/stackoverflow.png b/pelican/tests/output/basic/theme/images/icons/stackoverflow.png
deleted file mode 100644
index 3c6862e902ef0624a812aa212ea0c075aa123284..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004HNkl<ZcmZR;
z2cD$pF+EAsnGD4Lf%pIrvonwio+N_}Sqn8}AxMlIL-?Ph>YRoeQcY09>#1xxKwS5F
z8mlP6JGx3wQgxp~4T-?1`Rz0oPN3$iK>QzwU%sBkR`YrWi#XVjbZs+WxcmSb0KzU<
z4R|<_pXuFnCY5*7ncLn>WBm*@=rz!g=9fLZ0#9?*eV!!i{{b4*NYE=UCUZ&x4QhHf
zjrr}HsjUBBPiJ}aY9eRTvkF<imqiLp7#h}B*mJI_a4KF^<`M|R+MBDbIY8n!dn9;(
zh84Y^&in}Iy8oYMGDu^!aYKcz*4hfk|1i9|-098AGS>sE%bi<+hJ_q$)(X1QD;kN@
z$%`wz`8QVB1Z}9WYXRb&Kzt8~{{vn2e{DI?z%r-*E6ZK%Ff``o<opL=Y=+LR2oYIO
z;cv5~!YgG}h0DZ66+V&}>Jb76HYP@>p``(Y0Zs!*!BjN>0I%aN<?n}IvH$=807*qo
IM6N<$g80C<v;Y7A

diff --git a/pelican/tests/output/basic/theme/images/icons/twitter.png b/pelican/tests/output/basic/theme/images/icons/twitter.png
deleted file mode 100644
index cef1cef96bb2e0c957b77b79ee30894f798ce8f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004JNkl<Zcmb_a
zGlQ5x6x`UhZL^B)D*hR1W83!Gwr$(CZN1w$emobm8mt~8qG4fV0@y>VnQ8)X9Pc^Y
zIsS936mToi>>TyPE<z~;YaQIr7-E{~#Qr4EsAo<UU4h{<-nw03E57@lWjfi!g&7DF
z28?}Xe+wKlDeHw{5g~AlZg$nw&jI@El6lPb4njYl*h^Ou9&^#Z$amnBu)(g>kcc+2
z`5!z^ZFZ_O#v*`YvS&^RN+0_pGFvTxh}Lp2wqGagAdVyz;6#9udAenJvhWwC3QjN}
ztg*<~69%xm!G(wSxK?V6H7%<iNC5PrfJ?^V3nu)GjKvH0XI^DrVNXO8rIk3AWAAyN
z>K70|sCIX&%<6rLrHmSw|10dx_<xBxYG#kZhNIX_7y#n~j`EHg_!c31dAtkWN68GJ
zS?O2ObmnGY%^e6A+f;bt8W>{@95hn1(i_a}5^hC>VT?7YQHpjC*P~ez&J%_J0000<
KMNUMnLSTY<*|#qM

diff --git a/pelican/tests/output/basic/theme/images/icons/vimeo.png b/pelican/tests/output/basic/theme/images/icons/vimeo.png
deleted file mode 100644
index 4b9d72127c574237090a2f5f2f7eb7be94a2b62e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcmV-j0iyniP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0TM|>K~#7FV*mo~S^J1YP}SCZ?(wd@Mi2p&f%E_|kV7PbYe1Nxz5O<v
z3uL!ldsTk%h0La#STsz%{r3O={~vz-f#~r%^x!`XEV=g<MFY@)B@aHprOQt}0LpE;
z`||yluMm-gw;!Wu@Z5X5dHb;ocOOBdC!e?uG=e>|y=nOth{(bt=TS6pPua;?J=e5)
zBGkM)Pk5GtRBXBib(QPnRVW%@oC6PDyoRVi_QQr_=YS?+52c0sPeBv`1LxxFPe2CH
z8{$R%ID<81>CXSCz@?@iUpz?mZ$MU^)He_47<?Llex0~}7sMq%)m-hXamF+pag<JV
vF7FbJE=H)v)PSZ3=nSA$SXBcN$;lf4{SCr3%yBq=00000NkvXXu0mjfiDs1-

diff --git a/pelican/tests/output/basic/theme/images/icons/youtube.png b/pelican/tests/output/basic/theme/images/icons/youtube.png
deleted file mode 100644
index e334e68eed877dbd5109acea1858a533a3174b2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0MP)^
z0MVzc>^%Sg0P#sgK~#7Fl~6T81W^oq2cX(5aX1R@6<62}xdAmT6>b%79aG~T97?pp
zUBiU8?wcQZ@ytL(4yKyhs<TwJ)HgA_c&>>_L_h@KZq&4<BG4R8Hv`~!r=tRZuYHw+
zsG}QRuEqcyfB(K3upr%x8~R$kY>RGqy&kuUuOC&N_n)+)st0x|+@BHFkRd@&PPEwb
z&tB6>xX7cYComKsCfH0jmXR=>tbysq2Gd0WOmZB{y88Z3Wj9^}w-Gbm)y>{S4W9T7
zfp3d!a2x}~TiXWa<}BOO6S3ho2QJ^`nhs+IjSU!vHHb*~-y}#B5s^RLsrl%w&%5IQ
O0000<MNUMnLSTX{BZHCv

diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index a4aa51a1..49de03d9 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -322,39 +322,6 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 		max-width: 175px;
 	}
 
-	#extras div[class='social'] a {
-		background-repeat: no-repeat;
-		background-position: 3px 6px;
-		padding-left: 25px;
-	}
-
-		/* Icons */
-		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
-		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
-		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
-		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
-		.social a[href*='github.com'],
-		.social a[href*='git.io'] {
-			background-image: url('../images/icons/github.png');
-			background-size: 16px 16px;
-		}
-		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
-		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
-		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
-		.social a[href*='news.ycombinator.com'],
-		.social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
-		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
-		.social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
-		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
-		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
-		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
-		.social a[href*='stackoverflow.com'] {background-image: url('../images/icons/stackoverflow.png');}
-		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
-		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
-		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
-
 /*
 	About
 *****************/
diff --git a/pelican/tests/output/custom/theme/images/icons/aboutme.png b/pelican/tests/output/custom/theme/images/icons/aboutme.png
deleted file mode 100644
index 600110f2f63811ebea40af1b943fded0275b6a39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 411
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0Z>UqK~#7FjgmEk6+sXNzkTlh65QS0-8I48iI50)i1C<TLIf!u65`Ie
z&U9bT%(-r@RZzX|0Z1-827lDPcos@7IuIQ_7Y^=pU^c=6fi$$Dx(bOyOqx{_9Hwx4
z10X3eDO1;1abvB-GN7or(M1rLOv)w&YiKQjNt+u0h|2&`L$%a4B`0oxNy`j3H-Qu^
z65A{2rkY#NVM$$ET66EENb=%**t@NJ@Bu*L+$47eL}qMBY&g%aXQwxuORYaE5?^&X
zwfeM3Z1F*}U${59c)t^gL-sVy094g)j;0{g{!@{J69Dy3KSD581)`3(r2l>K$|J3O
zMSiddRs94I-RZ%BpPVQlG-*wE)^@pKur#bMkyS)ii4hvVB0PPwtX?$Lk2sgu3yxdr
zMHBD`H`aw%Ysl&kiS1h=1)tbo!~Ye`fCpjdO!(yU+ZHs&^bQiZ<l_JU002ovPDHLk
FV1n*$sGR@+

diff --git a/pelican/tests/output/custom/theme/images/icons/bitbucket.png b/pelican/tests/output/custom/theme/images/icons/bitbucket.png
deleted file mode 100644
index 277a7dfb931349c3fc0d905c8225f7d08677025d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3178
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
QSO5S307*qoM6N<$g2TiqjQ{`u

diff --git a/pelican/tests/output/custom/theme/images/icons/delicious.png b/pelican/tests/output/custom/theme/images/icons/delicious.png
deleted file mode 100644
index 34868c5c69979ebabe19d9808e1d20298c196f19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 827
zcmV-B1H}A^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00095Nkl<ZcmZ9E
z1FR)i0EWLgbMCykbA9(&>)pJqZACTW#!hM@D5IKDqq;%eMz!tbv+awqP8IHt=!XVS
zsZ`n>$2lgOwFdh8dv^BsZ><jO?rgQ?6?v<8&iuym=Ei)j$E*iAt2@8G+HYpo%Ugc?
z1M&LD+NGCX^~Sz^1K0F#?X!+K<`@cjlh)QP?AWoJ?+?K9FF|`1HaB5vPVvV94R6@v
z*b_Fn>()0em94EiuYK~#M+HZNki~hy!n`DO0RgV7kx83G-6kVzbw2peZ^$T0XF+WR
zfC!}kbTrMykUD-`pyq(>!2GmFl&qi|8BD#Yimm6&NW;(o1*9a20zlURQu0~F;$lpk
zC^lANi08=`Jt9})*0WlBM`^dLR$E*Uq-h9fXc|BQRMFBY=8w1tql8shMigC06q$^`
z3o;x$Brcc5Vx|EggvrrZTv~ueFR9S5n?9&@2ra;ZlJa{y#y*#;tE-3i@BjIXTFqx<
zWQM^b2eIvt(ZSC+IB^l#ZO?Jct~%A$Zme8|ylK!@D6=^GmdF`z&B`yo_%8qUJKqup
zI`#T8-~s^<(cM|*r>_LNwibZ|C;<x4dFJT@#w)K*RAj!;b#kiO@%%-S#79s85*l`s
zV@@diGfn^<h=354f+lp9mL>c5580x>Z^zql9MEVifl5$XO00aq!?ra*2Oy6Bcd7s&
z4E&Wd&NypYm|1Hm3>yT#OOnPY6%hC_U@<y8#LDs{0H6TSga8x@YCr${)rQ!*wKo?8
z9#Tq_O8z?l9jLHYi?Evx08*MrX&^KM(5TmH)$6an!IIO{lVPDyA_&(p1bE&GN#X#@
z5Sw^`0>Jle48x$&@MzjDei*iPb+`A(ty}jT{_VFp0@p^D9%vpdEdoQ&A~UVr|G*1s
z*N$#`bZl0nsoeDaV0>!ow??I6E<OD4z4Owttg#c08+i88OD;%%{^`TtmR5#V&p7>}
zTD@V0|CC##a5uK^=-$j1%KE$Sep%nY|D6y3VDFw|_#0Q*b=;R(Ji7n@002ovPDHLk
FV1ku*k$3<A

diff --git a/pelican/tests/output/custom/theme/images/icons/facebook.png b/pelican/tests/output/custom/theme/images/icons/facebook.png
deleted file mode 100644
index 1d8a4327d59337d8e0ea3c8e3760479a9c7a4952..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`v7RoDAr*|tKmPx>ca`voa6f0k
zeB{69k@N|?Km7UBZZ))YUHu=w|Mw?(E)O$?WixY_FPL7s$Pm-8fstds@^ATL%bUet
y<Tqqr+Vg*>ZgfGChJzsUtA%$MR;8+S88GxaEa+z7`Ew3v5re0zpUXO@geCxdur~kz

diff --git a/pelican/tests/output/custom/theme/images/icons/github.png b/pelican/tests/output/custom/theme/images/icons/github.png
deleted file mode 100644
index 5d9109deab2b3669c845845515f4d53ab5d6daa6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006dNkl<Zcmd7U
z1MJmN6u|NKvTZjuXIrzCttneG@|bJLZVF?@lx^GQ>3g@6&i?1|w)NXSf84|8m&o+0
zUbR{k48>ZU#v6!wqi1V1r%EE$MYAT@gfEZ`ebJgG`3x?P75EOx(Rb}pK9^g49TLfP
zG|6;$SG<Bm_6l9o4R020xW7a*Z+J!AFa_taEytx^Y3+G)eghQ?T3|KA=%=yb7>bAH
zWw$>tFUyCTTU=}VL5$UQcykD>ruLPAMktgpS2)vHd2`;>>D~O#r0q^piwN%{Eu7xl
ze<swxS0`y;garmdES*^+B#d+t?x0eH1uEgTGh<{(*yIF<M0`6R;>_3-g6EyPr+mZ(
z$~zD9`4D^$F>WOyU!f<&c%QI`>dHS@;3~xO7I+<f0eV6#H-KsphgWlNC_hd*!2uB$
z7~sq}8G@^v;3*V|FuaKN5(}$BLT`v;QG^8+K^(n9LRq|nIJTfh4uflItvKGH?9b#S
z5H%N_Z~&q{V>5=MISM;>bsLPrcC8T?Gyg2EhYt{Z#{?9|afq=U$pRKgVkaa6A5hOW
zm~E0;qoMsELHiVUdq+qHW_!=pLlCuB&nsXkrlThcr&yqB2Ez}bh}WQodCMG=<rA+0
z#G}1yq-#<iS0L&jCSee!qC}1hTtWS8zC`SH8db<)f!$euxzT6!Fg(s<fhQP_WIpd?
sWiSDk@f5|~Tw<DY852<^@xNa`0K$+*Vd5uE0ssI207*qoM6N<$f>62#-T(jq

diff --git a/pelican/tests/output/custom/theme/images/icons/gitorious.png b/pelican/tests/output/custom/theme/images/icons/gitorious.png
deleted file mode 100644
index a6705d0f462b505be4d9a5a372743d206c141a11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`D?^o)dRwqYcev@q#DMvQ
z*(*AHH`kW0om8=NO8&uVRmbKn*uQ@5(H+Zf?%R0x*ww37FTJ_{>eZ{eAD{pK|9`68
zWgnn9ah@)YAr*|ZCyp{U2QWBn{C>Cgf8^^ph2sKmrZ@0Db>47eliif`GZN3kOR|4E
zp1HSr>(=i-J2K=SnYPGB*}QnjI%8UJ(Sx8<XA63}SyslraSzj~KRTIl$xj8xPp<PA
X`P?|)s^vF;9M0hB>gTe~DWM4fr0!yB

diff --git a/pelican/tests/output/custom/theme/images/icons/gittip.png b/pelican/tests/output/custom/theme/images/icons/gittip.png
deleted file mode 100644
index b9f67aaa32a0acd166d7271b3dbf9113717d3f00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfoB*E?S0J6}W0T-*4J5$~5D8`b
z*u=V<M>-n;Wh0%9W86%yoICmD^QXBJ+TuMeduj_mynB29_Kl1X*A2_&{r~^}-@kve
zdYW2FGLG%r8Ru!aX~lxyzki)LushDvqC7Rcx2`zG-R$h~L;wH%fBfKXl#6k)zx}VD
zKk}k|sxxDHYKs!Qtrkt~nbKapYTmR2Z<_=!t4|TTzXRRJSrX(I%%C#k)~^Ns|6P3T
zwz~@CcuyC{kP61s^QK8h9R!*aGdC-5mQ6dy==6QR=MEp?G>PQz`~2?eFFMS(r+K1g
zp!&qb32C!ZG_9s->U*tRla<=$@$cY?|5H+adAMETx@7!MusHjBPl?KXziQ+6?1D=V
ze?2)-gt;N$>Wd8<>nsYyl^Lt{Fxgl%o_?@o{T-$+24C7lzi+*sf1s9QvY5Z$XS=Iy
lUyMDUTPOc|vvcNeU4iM^B0ctPia>WVc)I$ztaD0e0syFMv7G<_

diff --git a/pelican/tests/output/custom/theme/images/icons/google-groups.png b/pelican/tests/output/custom/theme/images/icons/google-groups.png
deleted file mode 100644
index bbd0a0fd41295e94081103efe82742a5c6411765..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<Zcmajb
zGr%ZhAHdP`nPJOQTgI5J`7YVEw)R>wr?kW++e@xB+qT~SFYEF=HvR&ieDr#i-_xj}
zRHo4+e;!+Noelr;cc?77Y;{c*CNr6Zes7m1^J^+M9sV--D^!{k1_1#;6aW?Y?FKU>
z$wUFckfr-O)R-Be!K8BMN$?ljo<0akOpD)OEKI~9+x!b$boZC|3lK-`{C{xHEuU!d
zCn!ydf)v}GF)B$#1SpIDL5ep&8ms<i+;i$*@D~7=J@lOqzWA#qSn>%oIbw(Zf<>Eu
zV{!X$x!~%@{^9sNR&mx%AN_fQnat#ZJ3j~K-$A9Q{GPt1rQRSFm;ow5sT2?@^QR4r
zg$anDgeCx$iqb6h2iG6)ockYoL<MGs2$l1m-AhHOOk)WzKKEExUU5lR{E#fkMyI^r
zh9|$*1}D9nrFre;r@Q~Y8?zi6ocPX{>!0v;mgd!$p2~_@_rOO_1Na`l%Wwj6hQdz(
O0000<MNUMnLSTZ~)5C56

diff --git a/pelican/tests/output/custom/theme/images/icons/google-plus.png b/pelican/tests/output/custom/theme/images/icons/google-plus.png
deleted file mode 100644
index f8553d45ef3c858672ca169868aadbaf3c14b8df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0005TNkl<Zcmb8r
z1Ct{`6ae7<AF+)|#ZJz)eOJ7~*|u%lw#~I|+h*^JvF`e+>oJ)blrcs(C@6ijHhGjL
zrFRi_0z}#gh+z_?jx?ulJ6ZEDq_MICdrx(I>4q_hBh(<wDu+V2jes~|xEhtlmN&gz
zojg(*H)&GA=UnKu{@j%`Tp8yPVwFKL)Fy*Cc9;@j9F;R(5j#{714hoPEP-xa*=pT?
zi_{BB-WV3Xrwx-w+TBv`W<k5*=B&_BI^5HNh5X!w(lCoO)a($s`=jG8E=>7t5P3nx
z6N?e<z>UwA{x^#MIz^w4#;vg#Q`{-|sTaZm+z|gUicmu%q_q_{S4K=37O~-YZFy$l
zCeshS!0W4y4-;Rs{O>veK>w%APq})#_~VzlN~kv#Z!>>U^FI6esN%Y~QuIs1d#~iY
zS5C<<$DO!3cexVMKA`VP&KrXDnvg`iD8?-qH)mw8u{$e0Ls5Ir<bL~J_~LH%<GXnw
z*_{|pRms6=uVsuEfu1{W)bQo-&*8kM652Bd;m<>Fnpzz@8B4^@ijQjs{a4Z+iYWeG
zt$5N5AMVx+R~iI;l~A9E$d3ce%4xvm2W_r2NEe$slb&w_>f!(Z002ovPDHLkV1lnz
B@09=m

diff --git a/pelican/tests/output/custom/theme/images/icons/hackernews.png b/pelican/tests/output/custom/theme/images/icons/hackernews.png
deleted file mode 100644
index 8e05e3ee207e114a96f3811f46f68d17d52fe80b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2771
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
Z0sz-j0)=#JDs2D&002ovPDHLkV1kM1SuX$p

diff --git a/pelican/tests/output/custom/theme/images/icons/lastfm.png b/pelican/tests/output/custom/theme/images/icons/lastfm.png
deleted file mode 100644
index 2eedd2daa1429ba026c0b3c81f200c7df55d199a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 840
zcmV-O1GoH%P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009INkl<ZcmX|+
zL!cx_7=XX3uJO$3DYk9fb}q5)9CO}VY&)k|m$hx1&u{#C-gHlORc$YS8)E3^KTb{*
zD^Dle+pd;{TwW^A3QsLn5p6`#iFjfNK@sOdj46@unxvEEI5$8_{h^Y@>KCJu$;;6i
zN)?b2a3_#VfTsWs$6EHV5TGNlK%}w4u2N|o9mJtskW6u)FfMY|?6HLq0N~tSmCYiQ
z2itn^l^G`qTae2D0xESFZh|%tXmDcRU;!-yQXzzdgu?j^sE-_`#F)I#a0AjAIORAv
z?nua{5j_L2Xf^mv7?p>M&VsISuyh@C_u_&8Tdjpsq*G;#gR3rt3(wqpYJX|(pqnm-
zVi_(t9gaQ}dWUeQ9S7b0nAMvJMjCC()%*h2T()P6`Q<<4KoQZ3;E)b@<W4y52#8}G
z+(9&P7L7@B<BwD5_-b89N*Q26jy{ZN`8xEBg@}a0RLexa{f}L=0(Z?tG(P+RyR{qj
z!h@tAzKgJXkf6Vab%e4we_6``^6-Oktq?tX33}xg{Dtdjyz?U>mqq9E^qzbJ^&kHt
zb@z3sXYQl9ZY#2oD@eP!I~#uc8*<!e68GQ4@T3J)<}4>V^AwupI;L7D|Jvi|(8qu0
z2LL$zBz)6?fx+w8bl#l{x;rm&{_hjrZqU60&R?<CMX}xY(3`IR{#W+IZN=ZCO%S>r
z_q^a%r%rJ@Z+x)Fd-;e{U-Iff*T}z9(5p5g3wcDXPJR3rG$+nsWZfoYCWAb*gT_Bo
z7<z3y{^DiG_BOJ|9=1uWKlk>fg}|L9J&75r5f0ZeI>gIn5MAw<$RbKrq)K4wK5le|
zR(k=@SlVyBWV*`avXNJ<A=^gb4oQ-X#v-gm5M#>2NP$f#q_(8G+6X;MtJy>;4`+;2
znIjMBZmisPo~Hw3I)yO?atTx+i^wMNq>KkRoaf=R#1u=&Mhm*)MMoa?yQ=3?Z|U=o
zU9OHh!itfmFwG$0g0M5@al}`~v399M8f%oORSV+K_KnG|j?V;kMf)2sF5LyF&y{nJ
Sd8X6=0000<MNUMnLSTYCl#(O>

diff --git a/pelican/tests/output/custom/theme/images/icons/linkedin.png b/pelican/tests/output/custom/theme/images/icons/linkedin.png
deleted file mode 100644
index 06a88016f191d1f7596e5d159eb9e3ef276b6ad4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0wzgBK~#7FO^-8xbw?D(e`jXidN;PMDz@#UZ=y1``Zjjj*tWT`?PP7f
zy?5@Mf1G^Bh5;8m`fWfi8Gso87>NJD$VFG5yq%r(;8z<Bbhfh>R}7Ydty&~ue@oPv
z!go{cG`vvH)n(hYdJfur_4kM7-}`N$BLW71f|-O65QELNn>4;$_2zi#L7VQdUf*VG
zc0B*xR8@Sfo>nmHN}+MDnqn5J#;f9g$TZW=OS!!C<4lU-jh|=cs;0XYW~;nhJEE0r
zdMWpJ#bDNMT&}cGH>t7P-yM4W=h<K9Rw{QI0n_cKw-wju?TEpCnQa%Dp=6epYZp3o
z*NqO?a`nMq=5Bpw=#2d~-DRWx4~G^{+-V(Pex=;^>FCXaLv`alDWtkCwY0;!z58#z
z#&T71?c1;2yXPjW|3Lt-K|fa>vgM24P7nS%my|*-?u{?k1z4y`Q@qLr7+I)}xOVW2
zJ3sxy0Crrjx2{T+o3K*EU*7;Otu&GVZhd>`xi2Rl`h0wRu?9M0pr|e$T%t()-9X(G
zM?fxx1SUy<yKr|DkdWj62;7kX1B3|!KoTyw2PBjFIwLU99fQ%`N<eQ%#66gGrU-PW
zfGdTV5KXXWzn;uRul+bv6+QXo#Po80`=>c#Xy<a@M<Y9|)Azy9yc@xSan4gjQc-dh
zBgfEkMJESJFrcG&5IIt0JzXsWIOj>CAwXc5_{TIPFaU$>TzBm6pmt%Vs1;7F00000
LNkvXXu0mjfHfAMI

diff --git a/pelican/tests/output/custom/theme/images/icons/reddit.png b/pelican/tests/output/custom/theme/images/icons/reddit.png
deleted file mode 100644
index d826d3e746a18b712db7a68746c0c523af802fe0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002|P)t-s*6{zu
z-S)`f`oGrhQd?zZaeauGqhe}vWMyZ3ikXa^u3u_(t-;A(Y<gf_Tl)9(N={SB;rq|%
z{%LiBrn$~=e27+BUXGuzvB=+zp|p95n<+0gcZZmouf@XJ^U34>rn|{qWNU7Dgl~R~
zWNK}Sjg6(Fp|rEIpPrq2fPh<JW^8bF-rU+gJUWSohV%CH{{H@Vdw_9pZ?3Mc{-&h<
z5D)&t!H}c4M@L8gvatR#F#gWWZg6tl`2JH|WzWpXsHv*b($eto@ZI<Rti#tvN>0AJ
zxy#GTfq{X3etxmY-Bn&^YHMt-t*g_~&)L`2qqxp^h?r+{fMacVpMN&`0001qNkl<Z
zcmZw8HChBg5QgFJZ+%E`iI5mSz;FOAJaZCaEJZ?`+O2haTgzCcIS9>WKP}*}Is^$|
zQ}1hfWmjT2av-PYqbE!!n)oua2c5|Qn7a$5l#p|w<m`X?*B?1&{QQ*yG}lv&2sdE^
zHn+C7Hen-x&+Stk`#vFbD`&350(5N}YCBfw0eY(=c;GCP9RL6T07*qoM6N<$f|F|G
A)Bpeg

diff --git a/pelican/tests/output/custom/theme/images/icons/rss.png b/pelican/tests/output/custom/theme/images/icons/rss.png
deleted file mode 100644
index 12448f53417b4974fa041655a5fa82dee20c73d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 751
zcmV<L0ucR)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008ENkl<ZcmWN~
z1CZ@j0LJm(ImxQFZQHhO+qOov$8T77RNJ;~x6jsI=H4WyJO20&0O{2e*R#;@enu8v
zSYz5U`lG9f^{QgNh`4A^uQ5^Zx{ys(=Yy8q{Ee{X4HE;T4==hy{l#^L7b6VOE2;Zb
zJ!B|o{YQH`*)Z)EiL}8j`)Bpn_ih`)mk(Qb4bqZ~PNO$Udm7EjwEm_u5jk-Y`UPr=
zBvh^C@(||iBMvctl*TWN{zi!kgMo#Xr9#o5oR2^pV6dV;eYIR`(vC*|WYG;-_Z*5g
z&G8g77&|ljcLs*3D`JKKK(J`8HGMH-Wy@c~8mCEs04m-&oL^sL$pKOTAR_hZXu*|d
zT4)vN=i8(=cjKeerI}w!NHX?#fwlKyexHDl2uWQ~)(cOI$-qC_lc{<vxslNLRCsn9
z>6z7}`F{d?z0T5WQglfOLER+{E<Zl%%$TE?D=fAlTa07>--Hu?5@wDUpV?F@=Mkg+
zN{1=uqDlzrnkbYp)J3q!I?Vn|_~<C<uZN@sH{`S#%2r4C{8G?g_5ekNtde?3v!K(Q
zwR}v2OSklzgp7V$`07I8@uh^JrS*2WMfKyOlnn#R@2XyOQQDQVom3^=D&~=_Vg7hV
zmXUUUh2z@#F=xhy%2iI*YN7eNY%m-1m)4$3s*@}uPyJp_oTNsog}SMT3+Z%oi+y>M
zVqi53FA<CZH0R8bTC=4{5QK^ph8v;!;n7v%FXxP}+g+hrQa5Endxqg|REJtzZE@Ay
zuJ-JXp@j#9Jku>JQ^xo7*4+R80OflZT^0WscTaBuO7ca6A_aA-H9M3Y@{DSLGBL)|
zTym{{me}!*Z3962jmy>w<<#@)IsY9R%I3sYbB>~@mM@C5Ks~s4nX-}TW8S>D*g7F!
hew!yYJnD{z;D0NLV2ni3qF(?2002ovPDHLkV1k{La&G_t

diff --git a/pelican/tests/output/custom/theme/images/icons/slideshare.png b/pelican/tests/output/custom/theme/images/icons/slideshare.png
deleted file mode 100644
index 9cbe8588e24976076e5fc3898fa97856122f6fa2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004cNkl<Zcmbu8
z1B@g=7=<V1*^15x&$eUZY}>YNn`_&)?H$|J+jM18jcAeNE5840mI#38{rmUny@9DE
z#Xg@8y@9DE0*}W7yWQR+m>Mc@yWPA^!~YvlZXQ7Ti(&Z??RignZicC$0;ki-+teNz
zN*Qw@h$6fTDiChi(;mQdV>IdC=QLyP(`3?fGmSD0E706p2ko0(Fn89&YPG`Qa4@$>
zdhWPhszyk06L$T`#EcuEoIB7dp?k0q>OF&bXs#{9!Ot=1fBXlJ={G`9+@@d!27`fI
z*^>PO`g==w@1W}FBwRnS8UK$h$DgmS5K-O+o6QEJ(Z~waYBd=2dOa)_3-qUlQ$o(J
zM$*}Z*m~g-OePa_IvoOeR-jNQz{PlZ6lKDV2#PRA1rmt_T+Fw|P-fhVCCq=C0AY>_
z#9}czIyxxk)H|>~8V7Uy1sn}2#;nIlxE)_f_XF?+t*xyTxm-@(N8ncJn41xc#e6|8
dAc8(0=Pod^EtOP(ARYh!002ovPDHLkV1k4J!&(3U

diff --git a/pelican/tests/output/custom/theme/images/icons/speakerdeck.png b/pelican/tests/output/custom/theme/images/icons/speakerdeck.png
deleted file mode 100644
index 7281ec48b41095180a83d71eaf0b00c85116965b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006DNkl<ZcmZ{i
zwSpx@6o$XkUE_+oyF-GzTTH~f2>K92#E{?_PJ+8Tth@W(+a>28uk~_0`h`<(yY|`h
z@3?AaV0?I7E@5C8LL5^B7?_#m1O5GLKL6{LaQ3ZN%$$19RhM^ilM4(QGb91Pk}#td
z%#5L?Rn9&W7zkqrdeL$z%L))wjb<QGH@5U5g<zWd8)C|&Sn%Rd{|O|hdaLQx4V6rc
znUG>8cZK2wtEL}mE*O&6H3%~&#zdHx68i}xJQZ+34dIdgm^E12V4($L!Sax!Q)0op
z%%0y@llS*=IU_?ugf;+>a;DdHv`xcYwwSu^B5bgwWG8rba<?cT?m5VS!=2aN#8dY_
z%C~?1h9Pdb_C{X+<UPLr{TKSX50ZM3h9OFFf{G~7@%diF*x)D+-FOR6-gY<tuU`ui
zkKb}9dv@;PpOq`wuy5DGM>UIq4<$P}6+C9-V(ZSGy!i4<yz}t~WCXxxUwzHbEB>XI
zBkkxgITji#coxBn7F<w)fzwZ+jfnz$w`Vhkff+(HXG}8)G(&^98y*WK6@r#xAPJkE
zB$!p2Dp(SSBc78(7IG2fB6qpImV}uBAW^w60JEh#E#74jSPWu)$ntDf_o_fq6*P@u
z7=bSDZyjaFj)YJZ>*@>CvnH5Im-dI=x{a@nz|+mZz(oB8CqTLuD=F=p|2qrpWMi5G
S=mtXo0000<MNUMnLSTY<zXzBA

diff --git a/pelican/tests/output/custom/theme/images/icons/stackoverflow.png b/pelican/tests/output/custom/theme/images/icons/stackoverflow.png
deleted file mode 100644
index 3c6862e902ef0624a812aa212ea0c075aa123284..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004HNkl<ZcmZR;
z2cD$pF+EAsnGD4Lf%pIrvonwio+N_}Sqn8}AxMlIL-?Ph>YRoeQcY09>#1xxKwS5F
z8mlP6JGx3wQgxp~4T-?1`Rz0oPN3$iK>QzwU%sBkR`YrWi#XVjbZs+WxcmSb0KzU<
z4R|<_pXuFnCY5*7ncLn>WBm*@=rz!g=9fLZ0#9?*eV!!i{{b4*NYE=UCUZ&x4QhHf
zjrr}HsjUBBPiJ}aY9eRTvkF<imqiLp7#h}B*mJI_a4KF^<`M|R+MBDbIY8n!dn9;(
zh84Y^&in}Iy8oYMGDu^!aYKcz*4hfk|1i9|-098AGS>sE%bi<+hJ_q$)(X1QD;kN@
z$%`wz`8QVB1Z}9WYXRb&Kzt8~{{vn2e{DI?z%r-*E6ZK%Ff``o<opL=Y=+LR2oYIO
z;cv5~!YgG}h0DZ66+V&}>Jb76HYP@>p``(Y0Zs!*!BjN>0I%aN<?n}IvH$=807*qo
IM6N<$g80C<v;Y7A

diff --git a/pelican/tests/output/custom/theme/images/icons/twitter.png b/pelican/tests/output/custom/theme/images/icons/twitter.png
deleted file mode 100644
index cef1cef96bb2e0c957b77b79ee30894f798ce8f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004JNkl<Zcmb_a
zGlQ5x6x`UhZL^B)D*hR1W83!Gwr$(CZN1w$emobm8mt~8qG4fV0@y>VnQ8)X9Pc^Y
zIsS936mToi>>TyPE<z~;YaQIr7-E{~#Qr4EsAo<UU4h{<-nw03E57@lWjfi!g&7DF
z28?}Xe+wKlDeHw{5g~AlZg$nw&jI@El6lPb4njYl*h^Ou9&^#Z$amnBu)(g>kcc+2
z`5!z^ZFZ_O#v*`YvS&^RN+0_pGFvTxh}Lp2wqGagAdVyz;6#9udAenJvhWwC3QjN}
ztg*<~69%xm!G(wSxK?V6H7%<iNC5PrfJ?^V3nu)GjKvH0XI^DrVNXO8rIk3AWAAyN
z>K70|sCIX&%<6rLrHmSw|10dx_<xBxYG#kZhNIX_7y#n~j`EHg_!c31dAtkWN68GJ
zS?O2ObmnGY%^e6A+f;bt8W>{@95hn1(i_a}5^hC>VT?7YQHpjC*P~ez&J%_J0000<
KMNUMnLSTY<*|#qM

diff --git a/pelican/tests/output/custom/theme/images/icons/vimeo.png b/pelican/tests/output/custom/theme/images/icons/vimeo.png
deleted file mode 100644
index 4b9d72127c574237090a2f5f2f7eb7be94a2b62e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcmV-j0iyniP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0TM|>K~#7FV*mo~S^J1YP}SCZ?(wd@Mi2p&f%E_|kV7PbYe1Nxz5O<v
z3uL!ldsTk%h0La#STsz%{r3O={~vz-f#~r%^x!`XEV=g<MFY@)B@aHprOQt}0LpE;
z`||yluMm-gw;!Wu@Z5X5dHb;ocOOBdC!e?uG=e>|y=nOth{(bt=TS6pPua;?J=e5)
zBGkM)Pk5GtRBXBib(QPnRVW%@oC6PDyoRVi_QQr_=YS?+52c0sPeBv`1LxxFPe2CH
z8{$R%ID<81>CXSCz@?@iUpz?mZ$MU^)He_47<?Llex0~}7sMq%)m-hXamF+pag<JV
vF7FbJE=H)v)PSZ3=nSA$SXBcN$;lf4{SCr3%yBq=00000NkvXXu0mjfiDs1-

diff --git a/pelican/tests/output/custom/theme/images/icons/youtube.png b/pelican/tests/output/custom/theme/images/icons/youtube.png
deleted file mode 100644
index e334e68eed877dbd5109acea1858a533a3174b2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0MP)^
z0MVzc>^%Sg0P#sgK~#7Fl~6T81W^oq2cX(5aX1R@6<62}xdAmT6>b%79aG~T97?pp
zUBiU8?wcQZ@ytL(4yKyhs<TwJ)HgA_c&>>_L_h@KZq&4<BG4R8Hv`~!r=tRZuYHw+
zsG}QRuEqcyfB(K3upr%x8~R$kY>RGqy&kuUuOC&N_n)+)st0x|+@BHFkRd@&PPEwb
z&tB6>xX7cYComKsCfH0jmXR=>tbysq2Gd0WOmZB{y88Z3Wj9^}w-Gbm)y>{S4W9T7
zfp3d!a2x}~TiXWa<}BOO6S3ho2QJ^`nhs+IjSU!vHHb*~-y}#B5s^RLsrl%w&%5IQ
O0000<MNUMnLSTX{BZHCv

diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
index a4aa51a1..49de03d9 100644
--- a/pelican/tests/output/custom_locale/theme/css/main.css
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -322,39 +322,6 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 		max-width: 175px;
 	}
 
-	#extras div[class='social'] a {
-		background-repeat: no-repeat;
-		background-position: 3px 6px;
-		padding-left: 25px;
-	}
-
-		/* Icons */
-		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
-		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
-		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
-		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
-		.social a[href*='github.com'],
-		.social a[href*='git.io'] {
-			background-image: url('../images/icons/github.png');
-			background-size: 16px 16px;
-		}
-		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
-		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
-		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
-		.social a[href*='news.ycombinator.com'],
-		.social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
-		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
-		.social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
-		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
-		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
-		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
-		.social a[href*='stackoverflow.com'] {background-image: url('../images/icons/stackoverflow.png');}
-		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
-		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
-		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
-
 /*
 	About
 *****************/
diff --git a/pelican/tests/output/custom_locale/theme/images/icons/aboutme.png b/pelican/tests/output/custom_locale/theme/images/icons/aboutme.png
deleted file mode 100644
index 600110f2f63811ebea40af1b943fded0275b6a39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 411
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0Z>UqK~#7FjgmEk6+sXNzkTlh65QS0-8I48iI50)i1C<TLIf!u65`Ie
z&U9bT%(-r@RZzX|0Z1-827lDPcos@7IuIQ_7Y^=pU^c=6fi$$Dx(bOyOqx{_9Hwx4
z10X3eDO1;1abvB-GN7or(M1rLOv)w&YiKQjNt+u0h|2&`L$%a4B`0oxNy`j3H-Qu^
z65A{2rkY#NVM$$ET66EENb=%**t@NJ@Bu*L+$47eL}qMBY&g%aXQwxuORYaE5?^&X
zwfeM3Z1F*}U${59c)t^gL-sVy094g)j;0{g{!@{J69Dy3KSD581)`3(r2l>K$|J3O
zMSiddRs94I-RZ%BpPVQlG-*wE)^@pKur#bMkyS)ii4hvVB0PPwtX?$Lk2sgu3yxdr
zMHBD`H`aw%Ysl&kiS1h=1)tbo!~Ye`fCpjdO!(yU+ZHs&^bQiZ<l_JU002ovPDHLk
FV1n*$sGR@+

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/bitbucket.png b/pelican/tests/output/custom_locale/theme/images/icons/bitbucket.png
deleted file mode 100644
index 277a7dfb931349c3fc0d905c8225f7d08677025d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3178
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
QSO5S307*qoM6N<$g2TiqjQ{`u

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/delicious.png b/pelican/tests/output/custom_locale/theme/images/icons/delicious.png
deleted file mode 100644
index 34868c5c69979ebabe19d9808e1d20298c196f19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 827
zcmV-B1H}A^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00095Nkl<ZcmZ9E
z1FR)i0EWLgbMCykbA9(&>)pJqZACTW#!hM@D5IKDqq;%eMz!tbv+awqP8IHt=!XVS
zsZ`n>$2lgOwFdh8dv^BsZ><jO?rgQ?6?v<8&iuym=Ei)j$E*iAt2@8G+HYpo%Ugc?
z1M&LD+NGCX^~Sz^1K0F#?X!+K<`@cjlh)QP?AWoJ?+?K9FF|`1HaB5vPVvV94R6@v
z*b_Fn>()0em94EiuYK~#M+HZNki~hy!n`DO0RgV7kx83G-6kVzbw2peZ^$T0XF+WR
zfC!}kbTrMykUD-`pyq(>!2GmFl&qi|8BD#Yimm6&NW;(o1*9a20zlURQu0~F;$lpk
zC^lANi08=`Jt9})*0WlBM`^dLR$E*Uq-h9fXc|BQRMFBY=8w1tql8shMigC06q$^`
z3o;x$Brcc5Vx|EggvrrZTv~ueFR9S5n?9&@2ra;ZlJa{y#y*#;tE-3i@BjIXTFqx<
zWQM^b2eIvt(ZSC+IB^l#ZO?Jct~%A$Zme8|ylK!@D6=^GmdF`z&B`yo_%8qUJKqup
zI`#T8-~s^<(cM|*r>_LNwibZ|C;<x4dFJT@#w)K*RAj!;b#kiO@%%-S#79s85*l`s
zV@@diGfn^<h=354f+lp9mL>c5580x>Z^zql9MEVifl5$XO00aq!?ra*2Oy6Bcd7s&
z4E&Wd&NypYm|1Hm3>yT#OOnPY6%hC_U@<y8#LDs{0H6TSga8x@YCr${)rQ!*wKo?8
z9#Tq_O8z?l9jLHYi?Evx08*MrX&^KM(5TmH)$6an!IIO{lVPDyA_&(p1bE&GN#X#@
z5Sw^`0>Jle48x$&@MzjDei*iPb+`A(ty}jT{_VFp0@p^D9%vpdEdoQ&A~UVr|G*1s
z*N$#`bZl0nsoeDaV0>!ow??I6E<OD4z4Owttg#c08+i88OD;%%{^`TtmR5#V&p7>}
zTD@V0|CC##a5uK^=-$j1%KE$Sep%nY|D6y3VDFw|_#0Q*b=;R(Ji7n@002ovPDHLk
FV1ku*k$3<A

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/facebook.png b/pelican/tests/output/custom_locale/theme/images/icons/facebook.png
deleted file mode 100644
index 1d8a4327d59337d8e0ea3c8e3760479a9c7a4952..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`v7RoDAr*|tKmPx>ca`voa6f0k
zeB{69k@N|?Km7UBZZ))YUHu=w|Mw?(E)O$?WixY_FPL7s$Pm-8fstds@^ATL%bUet
y<Tqqr+Vg*>ZgfGChJzsUtA%$MR;8+S88GxaEa+z7`Ew3v5re0zpUXO@geCxdur~kz

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/github.png b/pelican/tests/output/custom_locale/theme/images/icons/github.png
deleted file mode 100644
index 5d9109deab2b3669c845845515f4d53ab5d6daa6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006dNkl<Zcmd7U
z1MJmN6u|NKvTZjuXIrzCttneG@|bJLZVF?@lx^GQ>3g@6&i?1|w)NXSf84|8m&o+0
zUbR{k48>ZU#v6!wqi1V1r%EE$MYAT@gfEZ`ebJgG`3x?P75EOx(Rb}pK9^g49TLfP
zG|6;$SG<Bm_6l9o4R020xW7a*Z+J!AFa_taEytx^Y3+G)eghQ?T3|KA=%=yb7>bAH
zWw$>tFUyCTTU=}VL5$UQcykD>ruLPAMktgpS2)vHd2`;>>D~O#r0q^piwN%{Eu7xl
ze<swxS0`y;garmdES*^+B#d+t?x0eH1uEgTGh<{(*yIF<M0`6R;>_3-g6EyPr+mZ(
z$~zD9`4D^$F>WOyU!f<&c%QI`>dHS@;3~xO7I+<f0eV6#H-KsphgWlNC_hd*!2uB$
z7~sq}8G@^v;3*V|FuaKN5(}$BLT`v;QG^8+K^(n9LRq|nIJTfh4uflItvKGH?9b#S
z5H%N_Z~&q{V>5=MISM;>bsLPrcC8T?Gyg2EhYt{Z#{?9|afq=U$pRKgVkaa6A5hOW
zm~E0;qoMsELHiVUdq+qHW_!=pLlCuB&nsXkrlThcr&yqB2Ez}bh}WQodCMG=<rA+0
z#G}1yq-#<iS0L&jCSee!qC}1hTtWS8zC`SH8db<)f!$euxzT6!Fg(s<fhQP_WIpd?
sWiSDk@f5|~Tw<DY852<^@xNa`0K$+*Vd5uE0ssI207*qoM6N<$f>62#-T(jq

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/gitorious.png b/pelican/tests/output/custom_locale/theme/images/icons/gitorious.png
deleted file mode 100644
index a6705d0f462b505be4d9a5a372743d206c141a11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`D?^o)dRwqYcev@q#DMvQ
z*(*AHH`kW0om8=NO8&uVRmbKn*uQ@5(H+Zf?%R0x*ww37FTJ_{>eZ{eAD{pK|9`68
zWgnn9ah@)YAr*|ZCyp{U2QWBn{C>Cgf8^^ph2sKmrZ@0Db>47eliif`GZN3kOR|4E
zp1HSr>(=i-J2K=SnYPGB*}QnjI%8UJ(Sx8<XA63}SyslraSzj~KRTIl$xj8xPp<PA
X`P?|)s^vF;9M0hB>gTe~DWM4fr0!yB

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/gittip.png b/pelican/tests/output/custom_locale/theme/images/icons/gittip.png
deleted file mode 100644
index b9f67aaa32a0acd166d7271b3dbf9113717d3f00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfoB*E?S0J6}W0T-*4J5$~5D8`b
z*u=V<M>-n;Wh0%9W86%yoICmD^QXBJ+TuMeduj_mynB29_Kl1X*A2_&{r~^}-@kve
zdYW2FGLG%r8Ru!aX~lxyzki)LushDvqC7Rcx2`zG-R$h~L;wH%fBfKXl#6k)zx}VD
zKk}k|sxxDHYKs!Qtrkt~nbKapYTmR2Z<_=!t4|TTzXRRJSrX(I%%C#k)~^Ns|6P3T
zwz~@CcuyC{kP61s^QK8h9R!*aGdC-5mQ6dy==6QR=MEp?G>PQz`~2?eFFMS(r+K1g
zp!&qb32C!ZG_9s->U*tRla<=$@$cY?|5H+adAMETx@7!MusHjBPl?KXziQ+6?1D=V
ze?2)-gt;N$>Wd8<>nsYyl^Lt{Fxgl%o_?@o{T-$+24C7lzi+*sf1s9QvY5Z$XS=Iy
lUyMDUTPOc|vvcNeU4iM^B0ctPia>WVc)I$ztaD0e0syFMv7G<_

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/google-groups.png b/pelican/tests/output/custom_locale/theme/images/icons/google-groups.png
deleted file mode 100644
index bbd0a0fd41295e94081103efe82742a5c6411765..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<Zcmajb
zGr%ZhAHdP`nPJOQTgI5J`7YVEw)R>wr?kW++e@xB+qT~SFYEF=HvR&ieDr#i-_xj}
zRHo4+e;!+Noelr;cc?77Y;{c*CNr6Zes7m1^J^+M9sV--D^!{k1_1#;6aW?Y?FKU>
z$wUFckfr-O)R-Be!K8BMN$?ljo<0akOpD)OEKI~9+x!b$boZC|3lK-`{C{xHEuU!d
zCn!ydf)v}GF)B$#1SpIDL5ep&8ms<i+;i$*@D~7=J@lOqzWA#qSn>%oIbw(Zf<>Eu
zV{!X$x!~%@{^9sNR&mx%AN_fQnat#ZJ3j~K-$A9Q{GPt1rQRSFm;ow5sT2?@^QR4r
zg$anDgeCx$iqb6h2iG6)ockYoL<MGs2$l1m-AhHOOk)WzKKEExUU5lR{E#fkMyI^r
zh9|$*1}D9nrFre;r@Q~Y8?zi6ocPX{>!0v;mgd!$p2~_@_rOO_1Na`l%Wwj6hQdz(
O0000<MNUMnLSTZ~)5C56

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/google-plus.png b/pelican/tests/output/custom_locale/theme/images/icons/google-plus.png
deleted file mode 100644
index f8553d45ef3c858672ca169868aadbaf3c14b8df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0005TNkl<Zcmb8r
z1Ct{`6ae7<AF+)|#ZJz)eOJ7~*|u%lw#~I|+h*^JvF`e+>oJ)blrcs(C@6ijHhGjL
zrFRi_0z}#gh+z_?jx?ulJ6ZEDq_MICdrx(I>4q_hBh(<wDu+V2jes~|xEhtlmN&gz
zojg(*H)&GA=UnKu{@j%`Tp8yPVwFKL)Fy*Cc9;@j9F;R(5j#{714hoPEP-xa*=pT?
zi_{BB-WV3Xrwx-w+TBv`W<k5*=B&_BI^5HNh5X!w(lCoO)a($s`=jG8E=>7t5P3nx
z6N?e<z>UwA{x^#MIz^w4#;vg#Q`{-|sTaZm+z|gUicmu%q_q_{S4K=37O~-YZFy$l
zCeshS!0W4y4-;Rs{O>veK>w%APq})#_~VzlN~kv#Z!>>U^FI6esN%Y~QuIs1d#~iY
zS5C<<$DO!3cexVMKA`VP&KrXDnvg`iD8?-qH)mw8u{$e0Ls5Ir<bL~J_~LH%<GXnw
z*_{|pRms6=uVsuEfu1{W)bQo-&*8kM652Bd;m<>Fnpzz@8B4^@ijQjs{a4Z+iYWeG
zt$5N5AMVx+R~iI;l~A9E$d3ce%4xvm2W_r2NEe$slb&w_>f!(Z002ovPDHLkV1lnz
B@09=m

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/hackernews.png b/pelican/tests/output/custom_locale/theme/images/icons/hackernews.png
deleted file mode 100644
index 8e05e3ee207e114a96f3811f46f68d17d52fe80b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2771
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
Z0sz-j0)=#JDs2D&002ovPDHLkV1kM1SuX$p

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/lastfm.png b/pelican/tests/output/custom_locale/theme/images/icons/lastfm.png
deleted file mode 100644
index 2eedd2daa1429ba026c0b3c81f200c7df55d199a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 840
zcmV-O1GoH%P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009INkl<ZcmX|+
zL!cx_7=XX3uJO$3DYk9fb}q5)9CO}VY&)k|m$hx1&u{#C-gHlORc$YS8)E3^KTb{*
zD^Dle+pd;{TwW^A3QsLn5p6`#iFjfNK@sOdj46@unxvEEI5$8_{h^Y@>KCJu$;;6i
zN)?b2a3_#VfTsWs$6EHV5TGNlK%}w4u2N|o9mJtskW6u)FfMY|?6HLq0N~tSmCYiQ
z2itn^l^G`qTae2D0xESFZh|%tXmDcRU;!-yQXzzdgu?j^sE-_`#F)I#a0AjAIORAv
z?nua{5j_L2Xf^mv7?p>M&VsISuyh@C_u_&8Tdjpsq*G;#gR3rt3(wqpYJX|(pqnm-
zVi_(t9gaQ}dWUeQ9S7b0nAMvJMjCC()%*h2T()P6`Q<<4KoQZ3;E)b@<W4y52#8}G
z+(9&P7L7@B<BwD5_-b89N*Q26jy{ZN`8xEBg@}a0RLexa{f}L=0(Z?tG(P+RyR{qj
z!h@tAzKgJXkf6Vab%e4we_6``^6-Oktq?tX33}xg{Dtdjyz?U>mqq9E^qzbJ^&kHt
zb@z3sXYQl9ZY#2oD@eP!I~#uc8*<!e68GQ4@T3J)<}4>V^AwupI;L7D|Jvi|(8qu0
z2LL$zBz)6?fx+w8bl#l{x;rm&{_hjrZqU60&R?<CMX}xY(3`IR{#W+IZN=ZCO%S>r
z_q^a%r%rJ@Z+x)Fd-;e{U-Iff*T}z9(5p5g3wcDXPJR3rG$+nsWZfoYCWAb*gT_Bo
z7<z3y{^DiG_BOJ|9=1uWKlk>fg}|L9J&75r5f0ZeI>gIn5MAw<$RbKrq)K4wK5le|
zR(k=@SlVyBWV*`avXNJ<A=^gb4oQ-X#v-gm5M#>2NP$f#q_(8G+6X;MtJy>;4`+;2
znIjMBZmisPo~Hw3I)yO?atTx+i^wMNq>KkRoaf=R#1u=&Mhm*)MMoa?yQ=3?Z|U=o
zU9OHh!itfmFwG$0g0M5@al}`~v399M8f%oORSV+K_KnG|j?V;kMf)2sF5LyF&y{nJ
Sd8X6=0000<MNUMnLSTYCl#(O>

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/linkedin.png b/pelican/tests/output/custom_locale/theme/images/icons/linkedin.png
deleted file mode 100644
index 06a88016f191d1f7596e5d159eb9e3ef276b6ad4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0wzgBK~#7FO^-8xbw?D(e`jXidN;PMDz@#UZ=y1``Zjjj*tWT`?PP7f
zy?5@Mf1G^Bh5;8m`fWfi8Gso87>NJD$VFG5yq%r(;8z<Bbhfh>R}7Ydty&~ue@oPv
z!go{cG`vvH)n(hYdJfur_4kM7-}`N$BLW71f|-O65QELNn>4;$_2zi#L7VQdUf*VG
zc0B*xR8@Sfo>nmHN}+MDnqn5J#;f9g$TZW=OS!!C<4lU-jh|=cs;0XYW~;nhJEE0r
zdMWpJ#bDNMT&}cGH>t7P-yM4W=h<K9Rw{QI0n_cKw-wju?TEpCnQa%Dp=6epYZp3o
z*NqO?a`nMq=5Bpw=#2d~-DRWx4~G^{+-V(Pex=;^>FCXaLv`alDWtkCwY0;!z58#z
z#&T71?c1;2yXPjW|3Lt-K|fa>vgM24P7nS%my|*-?u{?k1z4y`Q@qLr7+I)}xOVW2
zJ3sxy0Crrjx2{T+o3K*EU*7;Otu&GVZhd>`xi2Rl`h0wRu?9M0pr|e$T%t()-9X(G
zM?fxx1SUy<yKr|DkdWj62;7kX1B3|!KoTyw2PBjFIwLU99fQ%`N<eQ%#66gGrU-PW
zfGdTV5KXXWzn;uRul+bv6+QXo#Po80`=>c#Xy<a@M<Y9|)Azy9yc@xSan4gjQc-dh
zBgfEkMJESJFrcG&5IIt0JzXsWIOj>CAwXc5_{TIPFaU$>TzBm6pmt%Vs1;7F00000
LNkvXXu0mjfHfAMI

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/reddit.png b/pelican/tests/output/custom_locale/theme/images/icons/reddit.png
deleted file mode 100644
index d826d3e746a18b712db7a68746c0c523af802fe0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002|P)t-s*6{zu
z-S)`f`oGrhQd?zZaeauGqhe}vWMyZ3ikXa^u3u_(t-;A(Y<gf_Tl)9(N={SB;rq|%
z{%LiBrn$~=e27+BUXGuzvB=+zp|p95n<+0gcZZmouf@XJ^U34>rn|{qWNU7Dgl~R~
zWNK}Sjg6(Fp|rEIpPrq2fPh<JW^8bF-rU+gJUWSohV%CH{{H@Vdw_9pZ?3Mc{-&h<
z5D)&t!H}c4M@L8gvatR#F#gWWZg6tl`2JH|WzWpXsHv*b($eto@ZI<Rti#tvN>0AJ
zxy#GTfq{X3etxmY-Bn&^YHMt-t*g_~&)L`2qqxp^h?r+{fMacVpMN&`0001qNkl<Z
zcmZw8HChBg5QgFJZ+%E`iI5mSz;FOAJaZCaEJZ?`+O2haTgzCcIS9>WKP}*}Is^$|
zQ}1hfWmjT2av-PYqbE!!n)oua2c5|Qn7a$5l#p|w<m`X?*B?1&{QQ*yG}lv&2sdE^
zHn+C7Hen-x&+Stk`#vFbD`&350(5N}YCBfw0eY(=c;GCP9RL6T07*qoM6N<$f|F|G
A)Bpeg

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/rss.png b/pelican/tests/output/custom_locale/theme/images/icons/rss.png
deleted file mode 100644
index 12448f53417b4974fa041655a5fa82dee20c73d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 751
zcmV<L0ucR)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008ENkl<ZcmWN~
z1CZ@j0LJm(ImxQFZQHhO+qOov$8T77RNJ;~x6jsI=H4WyJO20&0O{2e*R#;@enu8v
zSYz5U`lG9f^{QgNh`4A^uQ5^Zx{ys(=Yy8q{Ee{X4HE;T4==hy{l#^L7b6VOE2;Zb
zJ!B|o{YQH`*)Z)EiL}8j`)Bpn_ih`)mk(Qb4bqZ~PNO$Udm7EjwEm_u5jk-Y`UPr=
zBvh^C@(||iBMvctl*TWN{zi!kgMo#Xr9#o5oR2^pV6dV;eYIR`(vC*|WYG;-_Z*5g
z&G8g77&|ljcLs*3D`JKKK(J`8HGMH-Wy@c~8mCEs04m-&oL^sL$pKOTAR_hZXu*|d
zT4)vN=i8(=cjKeerI}w!NHX?#fwlKyexHDl2uWQ~)(cOI$-qC_lc{<vxslNLRCsn9
z>6z7}`F{d?z0T5WQglfOLER+{E<Zl%%$TE?D=fAlTa07>--Hu?5@wDUpV?F@=Mkg+
zN{1=uqDlzrnkbYp)J3q!I?Vn|_~<C<uZN@sH{`S#%2r4C{8G?g_5ekNtde?3v!K(Q
zwR}v2OSklzgp7V$`07I8@uh^JrS*2WMfKyOlnn#R@2XyOQQDQVom3^=D&~=_Vg7hV
zmXUUUh2z@#F=xhy%2iI*YN7eNY%m-1m)4$3s*@}uPyJp_oTNsog}SMT3+Z%oi+y>M
zVqi53FA<CZH0R8bTC=4{5QK^ph8v;!;n7v%FXxP}+g+hrQa5Endxqg|REJtzZE@Ay
zuJ-JXp@j#9Jku>JQ^xo7*4+R80OflZT^0WscTaBuO7ca6A_aA-H9M3Y@{DSLGBL)|
zTym{{me}!*Z3962jmy>w<<#@)IsY9R%I3sYbB>~@mM@C5Ks~s4nX-}TW8S>D*g7F!
hew!yYJnD{z;D0NLV2ni3qF(?2002ovPDHLkV1k{La&G_t

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/slideshare.png b/pelican/tests/output/custom_locale/theme/images/icons/slideshare.png
deleted file mode 100644
index 9cbe8588e24976076e5fc3898fa97856122f6fa2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004cNkl<Zcmbu8
z1B@g=7=<V1*^15x&$eUZY}>YNn`_&)?H$|J+jM18jcAeNE5840mI#38{rmUny@9DE
z#Xg@8y@9DE0*}W7yWQR+m>Mc@yWPA^!~YvlZXQ7Ti(&Z??RignZicC$0;ki-+teNz
zN*Qw@h$6fTDiChi(;mQdV>IdC=QLyP(`3?fGmSD0E706p2ko0(Fn89&YPG`Qa4@$>
zdhWPhszyk06L$T`#EcuEoIB7dp?k0q>OF&bXs#{9!Ot=1fBXlJ={G`9+@@d!27`fI
z*^>PO`g==w@1W}FBwRnS8UK$h$DgmS5K-O+o6QEJ(Z~waYBd=2dOa)_3-qUlQ$o(J
zM$*}Z*m~g-OePa_IvoOeR-jNQz{PlZ6lKDV2#PRA1rmt_T+Fw|P-fhVCCq=C0AY>_
z#9}czIyxxk)H|>~8V7Uy1sn}2#;nIlxE)_f_XF?+t*xyTxm-@(N8ncJn41xc#e6|8
dAc8(0=Pod^EtOP(ARYh!002ovPDHLkV1k4J!&(3U

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/speakerdeck.png b/pelican/tests/output/custom_locale/theme/images/icons/speakerdeck.png
deleted file mode 100644
index 7281ec48b41095180a83d71eaf0b00c85116965b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006DNkl<ZcmZ{i
zwSpx@6o$XkUE_+oyF-GzTTH~f2>K92#E{?_PJ+8Tth@W(+a>28uk~_0`h`<(yY|`h
z@3?AaV0?I7E@5C8LL5^B7?_#m1O5GLKL6{LaQ3ZN%$$19RhM^ilM4(QGb91Pk}#td
z%#5L?Rn9&W7zkqrdeL$z%L))wjb<QGH@5U5g<zWd8)C|&Sn%Rd{|O|hdaLQx4V6rc
znUG>8cZK2wtEL}mE*O&6H3%~&#zdHx68i}xJQZ+34dIdgm^E12V4($L!Sax!Q)0op
z%%0y@llS*=IU_?ugf;+>a;DdHv`xcYwwSu^B5bgwWG8rba<?cT?m5VS!=2aN#8dY_
z%C~?1h9Pdb_C{X+<UPLr{TKSX50ZM3h9OFFf{G~7@%diF*x)D+-FOR6-gY<tuU`ui
zkKb}9dv@;PpOq`wuy5DGM>UIq4<$P}6+C9-V(ZSGy!i4<yz}t~WCXxxUwzHbEB>XI
zBkkxgITji#coxBn7F<w)fzwZ+jfnz$w`Vhkff+(HXG}8)G(&^98y*WK6@r#xAPJkE
zB$!p2Dp(SSBc78(7IG2fB6qpImV}uBAW^w60JEh#E#74jSPWu)$ntDf_o_fq6*P@u
z7=bSDZyjaFj)YJZ>*@>CvnH5Im-dI=x{a@nz|+mZz(oB8CqTLuD=F=p|2qrpWMi5G
S=mtXo0000<MNUMnLSTY<zXzBA

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/stackoverflow.png b/pelican/tests/output/custom_locale/theme/images/icons/stackoverflow.png
deleted file mode 100644
index 3c6862e902ef0624a812aa212ea0c075aa123284..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004HNkl<ZcmZR;
z2cD$pF+EAsnGD4Lf%pIrvonwio+N_}Sqn8}AxMlIL-?Ph>YRoeQcY09>#1xxKwS5F
z8mlP6JGx3wQgxp~4T-?1`Rz0oPN3$iK>QzwU%sBkR`YrWi#XVjbZs+WxcmSb0KzU<
z4R|<_pXuFnCY5*7ncLn>WBm*@=rz!g=9fLZ0#9?*eV!!i{{b4*NYE=UCUZ&x4QhHf
zjrr}HsjUBBPiJ}aY9eRTvkF<imqiLp7#h}B*mJI_a4KF^<`M|R+MBDbIY8n!dn9;(
zh84Y^&in}Iy8oYMGDu^!aYKcz*4hfk|1i9|-098AGS>sE%bi<+hJ_q$)(X1QD;kN@
z$%`wz`8QVB1Z}9WYXRb&Kzt8~{{vn2e{DI?z%r-*E6ZK%Ff``o<opL=Y=+LR2oYIO
z;cv5~!YgG}h0DZ66+V&}>Jb76HYP@>p``(Y0Zs!*!BjN>0I%aN<?n}IvH$=807*qo
IM6N<$g80C<v;Y7A

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/twitter.png b/pelican/tests/output/custom_locale/theme/images/icons/twitter.png
deleted file mode 100644
index cef1cef96bb2e0c957b77b79ee30894f798ce8f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004JNkl<Zcmb_a
zGlQ5x6x`UhZL^B)D*hR1W83!Gwr$(CZN1w$emobm8mt~8qG4fV0@y>VnQ8)X9Pc^Y
zIsS936mToi>>TyPE<z~;YaQIr7-E{~#Qr4EsAo<UU4h{<-nw03E57@lWjfi!g&7DF
z28?}Xe+wKlDeHw{5g~AlZg$nw&jI@El6lPb4njYl*h^Ou9&^#Z$amnBu)(g>kcc+2
z`5!z^ZFZ_O#v*`YvS&^RN+0_pGFvTxh}Lp2wqGagAdVyz;6#9udAenJvhWwC3QjN}
ztg*<~69%xm!G(wSxK?V6H7%<iNC5PrfJ?^V3nu)GjKvH0XI^DrVNXO8rIk3AWAAyN
z>K70|sCIX&%<6rLrHmSw|10dx_<xBxYG#kZhNIX_7y#n~j`EHg_!c31dAtkWN68GJ
zS?O2ObmnGY%^e6A+f;bt8W>{@95hn1(i_a}5^hC>VT?7YQHpjC*P~ez&J%_J0000<
KMNUMnLSTY<*|#qM

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/vimeo.png b/pelican/tests/output/custom_locale/theme/images/icons/vimeo.png
deleted file mode 100644
index 4b9d72127c574237090a2f5f2f7eb7be94a2b62e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcmV-j0iyniP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0TM|>K~#7FV*mo~S^J1YP}SCZ?(wd@Mi2p&f%E_|kV7PbYe1Nxz5O<v
z3uL!ldsTk%h0La#STsz%{r3O={~vz-f#~r%^x!`XEV=g<MFY@)B@aHprOQt}0LpE;
z`||yluMm-gw;!Wu@Z5X5dHb;ocOOBdC!e?uG=e>|y=nOth{(bt=TS6pPua;?J=e5)
zBGkM)Pk5GtRBXBib(QPnRVW%@oC6PDyoRVi_QQr_=YS?+52c0sPeBv`1LxxFPe2CH
z8{$R%ID<81>CXSCz@?@iUpz?mZ$MU^)He_47<?Llex0~}7sMq%)m-hXamF+pag<JV
vF7FbJE=H)v)PSZ3=nSA$SXBcN$;lf4{SCr3%yBq=00000NkvXXu0mjfiDs1-

diff --git a/pelican/tests/output/custom_locale/theme/images/icons/youtube.png b/pelican/tests/output/custom_locale/theme/images/icons/youtube.png
deleted file mode 100644
index e334e68eed877dbd5109acea1858a533a3174b2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0MP)^
z0MVzc>^%Sg0P#sgK~#7Fl~6T81W^oq2cX(5aX1R@6<62}xdAmT6>b%79aG~T97?pp
zUBiU8?wcQZ@ytL(4yKyhs<TwJ)HgA_c&>>_L_h@KZq&4<BG4R8Hv`~!r=tRZuYHw+
zsG}QRuEqcyfB(K3upr%x8~R$kY>RGqy&kuUuOC&N_n)+)st0x|+@BHFkRd@&PPEwb
z&tB6>xX7cYComKsCfH0jmXR=>tbysq2Gd0WOmZB{y88Z3Wj9^}w-Gbm)y>{S4W9T7
zfp3d!a2x}~TiXWa<}BOO6S3ho2QJ^`nhs+IjSU!vHHb*~-y}#B5s^RLsrl%w&%5IQ
O0000<MNUMnLSTX{BZHCv

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index a4aa51a1..49de03d9 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -322,39 +322,6 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 		max-width: 175px;
 	}
 
-	#extras div[class='social'] a {
-		background-repeat: no-repeat;
-		background-position: 3px 6px;
-		padding-left: 25px;
-	}
-
-		/* Icons */
-		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
-		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
-		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
-		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
-		.social a[href*='github.com'],
-		.social a[href*='git.io'] {
-			background-image: url('../images/icons/github.png');
-			background-size: 16px 16px;
-		}
-		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
-		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
-		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
-		.social a[href*='news.ycombinator.com'],
-		.social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
-		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
-		.social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
-		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
-		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
-		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
-		.social a[href*='stackoverflow.com'] {background-image: url('../images/icons/stackoverflow.png');}
-		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
-		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
-		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
-
 /*
 	About
 *****************/
diff --git a/pelican/themes/notmyidea/static/images/icons/aboutme.png b/pelican/themes/notmyidea/static/images/icons/aboutme.png
deleted file mode 100644
index 600110f2f63811ebea40af1b943fded0275b6a39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 411
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0Z>UqK~#7FjgmEk6+sXNzkTlh65QS0-8I48iI50)i1C<TLIf!u65`Ie
z&U9bT%(-r@RZzX|0Z1-827lDPcos@7IuIQ_7Y^=pU^c=6fi$$Dx(bOyOqx{_9Hwx4
z10X3eDO1;1abvB-GN7or(M1rLOv)w&YiKQjNt+u0h|2&`L$%a4B`0oxNy`j3H-Qu^
z65A{2rkY#NVM$$ET66EENb=%**t@NJ@Bu*L+$47eL}qMBY&g%aXQwxuORYaE5?^&X
zwfeM3Z1F*}U${59c)t^gL-sVy094g)j;0{g{!@{J69Dy3KSD581)`3(r2l>K$|J3O
zMSiddRs94I-RZ%BpPVQlG-*wE)^@pKur#bMkyS)ii4hvVB0PPwtX?$Lk2sgu3yxdr
zMHBD`H`aw%Ysl&kiS1h=1)tbo!~Ye`fCpjdO!(yU+ZHs&^bQiZ<l_JU002ovPDHLk
FV1n*$sGR@+

diff --git a/pelican/themes/notmyidea/static/images/icons/bitbucket.png b/pelican/themes/notmyidea/static/images/icons/bitbucket.png
deleted file mode 100644
index 277a7dfb931349c3fc0d905c8225f7d08677025d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3178
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
QSO5S307*qoM6N<$g2TiqjQ{`u

diff --git a/pelican/themes/notmyidea/static/images/icons/delicious.png b/pelican/themes/notmyidea/static/images/icons/delicious.png
deleted file mode 100644
index 34868c5c69979ebabe19d9808e1d20298c196f19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 827
zcmV-B1H}A^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00095Nkl<ZcmZ9E
z1FR)i0EWLgbMCykbA9(&>)pJqZACTW#!hM@D5IKDqq;%eMz!tbv+awqP8IHt=!XVS
zsZ`n>$2lgOwFdh8dv^BsZ><jO?rgQ?6?v<8&iuym=Ei)j$E*iAt2@8G+HYpo%Ugc?
z1M&LD+NGCX^~Sz^1K0F#?X!+K<`@cjlh)QP?AWoJ?+?K9FF|`1HaB5vPVvV94R6@v
z*b_Fn>()0em94EiuYK~#M+HZNki~hy!n`DO0RgV7kx83G-6kVzbw2peZ^$T0XF+WR
zfC!}kbTrMykUD-`pyq(>!2GmFl&qi|8BD#Yimm6&NW;(o1*9a20zlURQu0~F;$lpk
zC^lANi08=`Jt9})*0WlBM`^dLR$E*Uq-h9fXc|BQRMFBY=8w1tql8shMigC06q$^`
z3o;x$Brcc5Vx|EggvrrZTv~ueFR9S5n?9&@2ra;ZlJa{y#y*#;tE-3i@BjIXTFqx<
zWQM^b2eIvt(ZSC+IB^l#ZO?Jct~%A$Zme8|ylK!@D6=^GmdF`z&B`yo_%8qUJKqup
zI`#T8-~s^<(cM|*r>_LNwibZ|C;<x4dFJT@#w)K*RAj!;b#kiO@%%-S#79s85*l`s
zV@@diGfn^<h=354f+lp9mL>c5580x>Z^zql9MEVifl5$XO00aq!?ra*2Oy6Bcd7s&
z4E&Wd&NypYm|1Hm3>yT#OOnPY6%hC_U@<y8#LDs{0H6TSga8x@YCr${)rQ!*wKo?8
z9#Tq_O8z?l9jLHYi?Evx08*MrX&^KM(5TmH)$6an!IIO{lVPDyA_&(p1bE&GN#X#@
z5Sw^`0>Jle48x$&@MzjDei*iPb+`A(ty}jT{_VFp0@p^D9%vpdEdoQ&A~UVr|G*1s
z*N$#`bZl0nsoeDaV0>!ow??I6E<OD4z4Owttg#c08+i88OD;%%{^`TtmR5#V&p7>}
zTD@V0|CC##a5uK^=-$j1%KE$Sep%nY|D6y3VDFw|_#0Q*b=;R(Ji7n@002ovPDHLk
FV1ku*k$3<A

diff --git a/pelican/themes/notmyidea/static/images/icons/facebook.png b/pelican/themes/notmyidea/static/images/icons/facebook.png
deleted file mode 100644
index 1d8a4327d59337d8e0ea3c8e3760479a9c7a4952..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`v7RoDAr*|tKmPx>ca`voa6f0k
zeB{69k@N|?Km7UBZZ))YUHu=w|Mw?(E)O$?WixY_FPL7s$Pm-8fstds@^ATL%bUet
y<Tqqr+Vg*>ZgfGChJzsUtA%$MR;8+S88GxaEa+z7`Ew3v5re0zpUXO@geCxdur~kz

diff --git a/pelican/themes/notmyidea/static/images/icons/github.png b/pelican/themes/notmyidea/static/images/icons/github.png
deleted file mode 100644
index 5d9109deab2b3669c845845515f4d53ab5d6daa6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006dNkl<Zcmd7U
z1MJmN6u|NKvTZjuXIrzCttneG@|bJLZVF?@lx^GQ>3g@6&i?1|w)NXSf84|8m&o+0
zUbR{k48>ZU#v6!wqi1V1r%EE$MYAT@gfEZ`ebJgG`3x?P75EOx(Rb}pK9^g49TLfP
zG|6;$SG<Bm_6l9o4R020xW7a*Z+J!AFa_taEytx^Y3+G)eghQ?T3|KA=%=yb7>bAH
zWw$>tFUyCTTU=}VL5$UQcykD>ruLPAMktgpS2)vHd2`;>>D~O#r0q^piwN%{Eu7xl
ze<swxS0`y;garmdES*^+B#d+t?x0eH1uEgTGh<{(*yIF<M0`6R;>_3-g6EyPr+mZ(
z$~zD9`4D^$F>WOyU!f<&c%QI`>dHS@;3~xO7I+<f0eV6#H-KsphgWlNC_hd*!2uB$
z7~sq}8G@^v;3*V|FuaKN5(}$BLT`v;QG^8+K^(n9LRq|nIJTfh4uflItvKGH?9b#S
z5H%N_Z~&q{V>5=MISM;>bsLPrcC8T?Gyg2EhYt{Z#{?9|afq=U$pRKgVkaa6A5hOW
zm~E0;qoMsELHiVUdq+qHW_!=pLlCuB&nsXkrlThcr&yqB2Ez}bh}WQodCMG=<rA+0
z#G}1yq-#<iS0L&jCSee!qC}1hTtWS8zC`SH8db<)f!$euxzT6!Fg(s<fhQP_WIpd?
sWiSDk@f5|~Tw<DY852<^@xNa`0K$+*Vd5uE0ssI207*qoM6N<$f>62#-T(jq

diff --git a/pelican/themes/notmyidea/static/images/icons/gitorious.png b/pelican/themes/notmyidea/static/images/icons/gitorious.png
deleted file mode 100644
index a6705d0f462b505be4d9a5a372743d206c141a11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`D?^o)dRwqYcev@q#DMvQ
z*(*AHH`kW0om8=NO8&uVRmbKn*uQ@5(H+Zf?%R0x*ww37FTJ_{>eZ{eAD{pK|9`68
zWgnn9ah@)YAr*|ZCyp{U2QWBn{C>Cgf8^^ph2sKmrZ@0Db>47eliif`GZN3kOR|4E
zp1HSr>(=i-J2K=SnYPGB*}QnjI%8UJ(Sx8<XA63}SyslraSzj~KRTIl$xj8xPp<PA
X`P?|)s^vF;9M0hB>gTe~DWM4fr0!yB

diff --git a/pelican/themes/notmyidea/static/images/icons/gittip.png b/pelican/themes/notmyidea/static/images/icons/gittip.png
deleted file mode 100644
index b9f67aaa32a0acd166d7271b3dbf9113717d3f00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfoB*E?S0J6}W0T-*4J5$~5D8`b
z*u=V<M>-n;Wh0%9W86%yoICmD^QXBJ+TuMeduj_mynB29_Kl1X*A2_&{r~^}-@kve
zdYW2FGLG%r8Ru!aX~lxyzki)LushDvqC7Rcx2`zG-R$h~L;wH%fBfKXl#6k)zx}VD
zKk}k|sxxDHYKs!Qtrkt~nbKapYTmR2Z<_=!t4|TTzXRRJSrX(I%%C#k)~^Ns|6P3T
zwz~@CcuyC{kP61s^QK8h9R!*aGdC-5mQ6dy==6QR=MEp?G>PQz`~2?eFFMS(r+K1g
zp!&qb32C!ZG_9s->U*tRla<=$@$cY?|5H+adAMETx@7!MusHjBPl?KXziQ+6?1D=V
ze?2)-gt;N$>Wd8<>nsYyl^Lt{Fxgl%o_?@o{T-$+24C7lzi+*sf1s9QvY5Z$XS=Iy
lUyMDUTPOc|vvcNeU4iM^B0ctPia>WVc)I$ztaD0e0syFMv7G<_

diff --git a/pelican/themes/notmyidea/static/images/icons/google-groups.png b/pelican/themes/notmyidea/static/images/icons/google-groups.png
deleted file mode 100644
index bbd0a0fd41295e94081103efe82742a5c6411765..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<Zcmajb
zGr%ZhAHdP`nPJOQTgI5J`7YVEw)R>wr?kW++e@xB+qT~SFYEF=HvR&ieDr#i-_xj}
zRHo4+e;!+Noelr;cc?77Y;{c*CNr6Zes7m1^J^+M9sV--D^!{k1_1#;6aW?Y?FKU>
z$wUFckfr-O)R-Be!K8BMN$?ljo<0akOpD)OEKI~9+x!b$boZC|3lK-`{C{xHEuU!d
zCn!ydf)v}GF)B$#1SpIDL5ep&8ms<i+;i$*@D~7=J@lOqzWA#qSn>%oIbw(Zf<>Eu
zV{!X$x!~%@{^9sNR&mx%AN_fQnat#ZJ3j~K-$A9Q{GPt1rQRSFm;ow5sT2?@^QR4r
zg$anDgeCx$iqb6h2iG6)ockYoL<MGs2$l1m-AhHOOk)WzKKEExUU5lR{E#fkMyI^r
zh9|$*1}D9nrFre;r@Q~Y8?zi6ocPX{>!0v;mgd!$p2~_@_rOO_1Na`l%Wwj6hQdz(
O0000<MNUMnLSTZ~)5C56

diff --git a/pelican/themes/notmyidea/static/images/icons/google-plus.png b/pelican/themes/notmyidea/static/images/icons/google-plus.png
deleted file mode 100644
index f8553d45ef3c858672ca169868aadbaf3c14b8df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0005TNkl<Zcmb8r
z1Ct{`6ae7<AF+)|#ZJz)eOJ7~*|u%lw#~I|+h*^JvF`e+>oJ)blrcs(C@6ijHhGjL
zrFRi_0z}#gh+z_?jx?ulJ6ZEDq_MICdrx(I>4q_hBh(<wDu+V2jes~|xEhtlmN&gz
zojg(*H)&GA=UnKu{@j%`Tp8yPVwFKL)Fy*Cc9;@j9F;R(5j#{714hoPEP-xa*=pT?
zi_{BB-WV3Xrwx-w+TBv`W<k5*=B&_BI^5HNh5X!w(lCoO)a($s`=jG8E=>7t5P3nx
z6N?e<z>UwA{x^#MIz^w4#;vg#Q`{-|sTaZm+z|gUicmu%q_q_{S4K=37O~-YZFy$l
zCeshS!0W4y4-;Rs{O>veK>w%APq})#_~VzlN~kv#Z!>>U^FI6esN%Y~QuIs1d#~iY
zS5C<<$DO!3cexVMKA`VP&KrXDnvg`iD8?-qH)mw8u{$e0Ls5Ir<bL~J_~LH%<GXnw
z*_{|pRms6=uVsuEfu1{W)bQo-&*8kM652Bd;m<>Fnpzz@8B4^@ijQjs{a4Z+iYWeG
zt$5N5AMVx+R~iI;l~A9E$d3ce%4xvm2W_r2NEe$slb&w_>f!(Z002ovPDHLkV1lnz
B@09=m

diff --git a/pelican/themes/notmyidea/static/images/icons/hackernews.png b/pelican/themes/notmyidea/static/images/icons/hackernews.png
deleted file mode 100644
index 8e05e3ee207e114a96f3811f46f68d17d52fe80b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2771
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
Z0sz-j0)=#JDs2D&002ovPDHLkV1kM1SuX$p

diff --git a/pelican/themes/notmyidea/static/images/icons/lastfm.png b/pelican/themes/notmyidea/static/images/icons/lastfm.png
deleted file mode 100644
index 2eedd2daa1429ba026c0b3c81f200c7df55d199a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 840
zcmV-O1GoH%P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009INkl<ZcmX|+
zL!cx_7=XX3uJO$3DYk9fb}q5)9CO}VY&)k|m$hx1&u{#C-gHlORc$YS8)E3^KTb{*
zD^Dle+pd;{TwW^A3QsLn5p6`#iFjfNK@sOdj46@unxvEEI5$8_{h^Y@>KCJu$;;6i
zN)?b2a3_#VfTsWs$6EHV5TGNlK%}w4u2N|o9mJtskW6u)FfMY|?6HLq0N~tSmCYiQ
z2itn^l^G`qTae2D0xESFZh|%tXmDcRU;!-yQXzzdgu?j^sE-_`#F)I#a0AjAIORAv
z?nua{5j_L2Xf^mv7?p>M&VsISuyh@C_u_&8Tdjpsq*G;#gR3rt3(wqpYJX|(pqnm-
zVi_(t9gaQ}dWUeQ9S7b0nAMvJMjCC()%*h2T()P6`Q<<4KoQZ3;E)b@<W4y52#8}G
z+(9&P7L7@B<BwD5_-b89N*Q26jy{ZN`8xEBg@}a0RLexa{f}L=0(Z?tG(P+RyR{qj
z!h@tAzKgJXkf6Vab%e4we_6``^6-Oktq?tX33}xg{Dtdjyz?U>mqq9E^qzbJ^&kHt
zb@z3sXYQl9ZY#2oD@eP!I~#uc8*<!e68GQ4@T3J)<}4>V^AwupI;L7D|Jvi|(8qu0
z2LL$zBz)6?fx+w8bl#l{x;rm&{_hjrZqU60&R?<CMX}xY(3`IR{#W+IZN=ZCO%S>r
z_q^a%r%rJ@Z+x)Fd-;e{U-Iff*T}z9(5p5g3wcDXPJR3rG$+nsWZfoYCWAb*gT_Bo
z7<z3y{^DiG_BOJ|9=1uWKlk>fg}|L9J&75r5f0ZeI>gIn5MAw<$RbKrq)K4wK5le|
zR(k=@SlVyBWV*`avXNJ<A=^gb4oQ-X#v-gm5M#>2NP$f#q_(8G+6X;MtJy>;4`+;2
znIjMBZmisPo~Hw3I)yO?atTx+i^wMNq>KkRoaf=R#1u=&Mhm*)MMoa?yQ=3?Z|U=o
zU9OHh!itfmFwG$0g0M5@al}`~v399M8f%oORSV+K_KnG|j?V;kMf)2sF5LyF&y{nJ
Sd8X6=0000<MNUMnLSTYCl#(O>

diff --git a/pelican/themes/notmyidea/static/images/icons/linkedin.png b/pelican/themes/notmyidea/static/images/icons/linkedin.png
deleted file mode 100644
index 06a88016f191d1f7596e5d159eb9e3ef276b6ad4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0wzgBK~#7FO^-8xbw?D(e`jXidN;PMDz@#UZ=y1``Zjjj*tWT`?PP7f
zy?5@Mf1G^Bh5;8m`fWfi8Gso87>NJD$VFG5yq%r(;8z<Bbhfh>R}7Ydty&~ue@oPv
z!go{cG`vvH)n(hYdJfur_4kM7-}`N$BLW71f|-O65QELNn>4;$_2zi#L7VQdUf*VG
zc0B*xR8@Sfo>nmHN}+MDnqn5J#;f9g$TZW=OS!!C<4lU-jh|=cs;0XYW~;nhJEE0r
zdMWpJ#bDNMT&}cGH>t7P-yM4W=h<K9Rw{QI0n_cKw-wju?TEpCnQa%Dp=6epYZp3o
z*NqO?a`nMq=5Bpw=#2d~-DRWx4~G^{+-V(Pex=;^>FCXaLv`alDWtkCwY0;!z58#z
z#&T71?c1;2yXPjW|3Lt-K|fa>vgM24P7nS%my|*-?u{?k1z4y`Q@qLr7+I)}xOVW2
zJ3sxy0Crrjx2{T+o3K*EU*7;Otu&GVZhd>`xi2Rl`h0wRu?9M0pr|e$T%t()-9X(G
zM?fxx1SUy<yKr|DkdWj62;7kX1B3|!KoTyw2PBjFIwLU99fQ%`N<eQ%#66gGrU-PW
zfGdTV5KXXWzn;uRul+bv6+QXo#Po80`=>c#Xy<a@M<Y9|)Azy9yc@xSan4gjQc-dh
zBgfEkMJESJFrcG&5IIt0JzXsWIOj>CAwXc5_{TIPFaU$>TzBm6pmt%Vs1;7F00000
LNkvXXu0mjfHfAMI

diff --git a/pelican/themes/notmyidea/static/images/icons/reddit.png b/pelican/themes/notmyidea/static/images/icons/reddit.png
deleted file mode 100644
index d826d3e746a18b712db7a68746c0c523af802fe0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002|P)t-s*6{zu
z-S)`f`oGrhQd?zZaeauGqhe}vWMyZ3ikXa^u3u_(t-;A(Y<gf_Tl)9(N={SB;rq|%
z{%LiBrn$~=e27+BUXGuzvB=+zp|p95n<+0gcZZmouf@XJ^U34>rn|{qWNU7Dgl~R~
zWNK}Sjg6(Fp|rEIpPrq2fPh<JW^8bF-rU+gJUWSohV%CH{{H@Vdw_9pZ?3Mc{-&h<
z5D)&t!H}c4M@L8gvatR#F#gWWZg6tl`2JH|WzWpXsHv*b($eto@ZI<Rti#tvN>0AJ
zxy#GTfq{X3etxmY-Bn&^YHMt-t*g_~&)L`2qqxp^h?r+{fMacVpMN&`0001qNkl<Z
zcmZw8HChBg5QgFJZ+%E`iI5mSz;FOAJaZCaEJZ?`+O2haTgzCcIS9>WKP}*}Is^$|
zQ}1hfWmjT2av-PYqbE!!n)oua2c5|Qn7a$5l#p|w<m`X?*B?1&{QQ*yG}lv&2sdE^
zHn+C7Hen-x&+Stk`#vFbD`&350(5N}YCBfw0eY(=c;GCP9RL6T07*qoM6N<$f|F|G
A)Bpeg

diff --git a/pelican/themes/notmyidea/static/images/icons/rss.png b/pelican/themes/notmyidea/static/images/icons/rss.png
deleted file mode 100644
index 12448f53417b4974fa041655a5fa82dee20c73d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 751
zcmV<L0ucR)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008ENkl<ZcmWN~
z1CZ@j0LJm(ImxQFZQHhO+qOov$8T77RNJ;~x6jsI=H4WyJO20&0O{2e*R#;@enu8v
zSYz5U`lG9f^{QgNh`4A^uQ5^Zx{ys(=Yy8q{Ee{X4HE;T4==hy{l#^L7b6VOE2;Zb
zJ!B|o{YQH`*)Z)EiL}8j`)Bpn_ih`)mk(Qb4bqZ~PNO$Udm7EjwEm_u5jk-Y`UPr=
zBvh^C@(||iBMvctl*TWN{zi!kgMo#Xr9#o5oR2^pV6dV;eYIR`(vC*|WYG;-_Z*5g
z&G8g77&|ljcLs*3D`JKKK(J`8HGMH-Wy@c~8mCEs04m-&oL^sL$pKOTAR_hZXu*|d
zT4)vN=i8(=cjKeerI}w!NHX?#fwlKyexHDl2uWQ~)(cOI$-qC_lc{<vxslNLRCsn9
z>6z7}`F{d?z0T5WQglfOLER+{E<Zl%%$TE?D=fAlTa07>--Hu?5@wDUpV?F@=Mkg+
zN{1=uqDlzrnkbYp)J3q!I?Vn|_~<C<uZN@sH{`S#%2r4C{8G?g_5ekNtde?3v!K(Q
zwR}v2OSklzgp7V$`07I8@uh^JrS*2WMfKyOlnn#R@2XyOQQDQVom3^=D&~=_Vg7hV
zmXUUUh2z@#F=xhy%2iI*YN7eNY%m-1m)4$3s*@}uPyJp_oTNsog}SMT3+Z%oi+y>M
zVqi53FA<CZH0R8bTC=4{5QK^ph8v;!;n7v%FXxP}+g+hrQa5Endxqg|REJtzZE@Ay
zuJ-JXp@j#9Jku>JQ^xo7*4+R80OflZT^0WscTaBuO7ca6A_aA-H9M3Y@{DSLGBL)|
zTym{{me}!*Z3962jmy>w<<#@)IsY9R%I3sYbB>~@mM@C5Ks~s4nX-}TW8S>D*g7F!
hew!yYJnD{z;D0NLV2ni3qF(?2002ovPDHLkV1k{La&G_t

diff --git a/pelican/themes/notmyidea/static/images/icons/slideshare.png b/pelican/themes/notmyidea/static/images/icons/slideshare.png
deleted file mode 100644
index 9cbe8588e24976076e5fc3898fa97856122f6fa2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004cNkl<Zcmbu8
z1B@g=7=<V1*^15x&$eUZY}>YNn`_&)?H$|J+jM18jcAeNE5840mI#38{rmUny@9DE
z#Xg@8y@9DE0*}W7yWQR+m>Mc@yWPA^!~YvlZXQ7Ti(&Z??RignZicC$0;ki-+teNz
zN*Qw@h$6fTDiChi(;mQdV>IdC=QLyP(`3?fGmSD0E706p2ko0(Fn89&YPG`Qa4@$>
zdhWPhszyk06L$T`#EcuEoIB7dp?k0q>OF&bXs#{9!Ot=1fBXlJ={G`9+@@d!27`fI
z*^>PO`g==w@1W}FBwRnS8UK$h$DgmS5K-O+o6QEJ(Z~waYBd=2dOa)_3-qUlQ$o(J
zM$*}Z*m~g-OePa_IvoOeR-jNQz{PlZ6lKDV2#PRA1rmt_T+Fw|P-fhVCCq=C0AY>_
z#9}czIyxxk)H|>~8V7Uy1sn}2#;nIlxE)_f_XF?+t*xyTxm-@(N8ncJn41xc#e6|8
dAc8(0=Pod^EtOP(ARYh!002ovPDHLkV1k4J!&(3U

diff --git a/pelican/themes/notmyidea/static/images/icons/speakerdeck.png b/pelican/themes/notmyidea/static/images/icons/speakerdeck.png
deleted file mode 100644
index 7281ec48b41095180a83d71eaf0b00c85116965b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006DNkl<ZcmZ{i
zwSpx@6o$XkUE_+oyF-GzTTH~f2>K92#E{?_PJ+8Tth@W(+a>28uk~_0`h`<(yY|`h
z@3?AaV0?I7E@5C8LL5^B7?_#m1O5GLKL6{LaQ3ZN%$$19RhM^ilM4(QGb91Pk}#td
z%#5L?Rn9&W7zkqrdeL$z%L))wjb<QGH@5U5g<zWd8)C|&Sn%Rd{|O|hdaLQx4V6rc
znUG>8cZK2wtEL}mE*O&6H3%~&#zdHx68i}xJQZ+34dIdgm^E12V4($L!Sax!Q)0op
z%%0y@llS*=IU_?ugf;+>a;DdHv`xcYwwSu^B5bgwWG8rba<?cT?m5VS!=2aN#8dY_
z%C~?1h9Pdb_C{X+<UPLr{TKSX50ZM3h9OFFf{G~7@%diF*x)D+-FOR6-gY<tuU`ui
zkKb}9dv@;PpOq`wuy5DGM>UIq4<$P}6+C9-V(ZSGy!i4<yz}t~WCXxxUwzHbEB>XI
zBkkxgITji#coxBn7F<w)fzwZ+jfnz$w`Vhkff+(HXG}8)G(&^98y*WK6@r#xAPJkE
zB$!p2Dp(SSBc78(7IG2fB6qpImV}uBAW^w60JEh#E#74jSPWu)$ntDf_o_fq6*P@u
z7=bSDZyjaFj)YJZ>*@>CvnH5Im-dI=x{a@nz|+mZz(oB8CqTLuD=F=p|2qrpWMi5G
S=mtXo0000<MNUMnLSTY<zXzBA

diff --git a/pelican/themes/notmyidea/static/images/icons/stackoverflow.png b/pelican/themes/notmyidea/static/images/icons/stackoverflow.png
deleted file mode 100644
index 3c6862e902ef0624a812aa212ea0c075aa123284..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004HNkl<ZcmZR;
z2cD$pF+EAsnGD4Lf%pIrvonwio+N_}Sqn8}AxMlIL-?Ph>YRoeQcY09>#1xxKwS5F
z8mlP6JGx3wQgxp~4T-?1`Rz0oPN3$iK>QzwU%sBkR`YrWi#XVjbZs+WxcmSb0KzU<
z4R|<_pXuFnCY5*7ncLn>WBm*@=rz!g=9fLZ0#9?*eV!!i{{b4*NYE=UCUZ&x4QhHf
zjrr}HsjUBBPiJ}aY9eRTvkF<imqiLp7#h}B*mJI_a4KF^<`M|R+MBDbIY8n!dn9;(
zh84Y^&in}Iy8oYMGDu^!aYKcz*4hfk|1i9|-098AGS>sE%bi<+hJ_q$)(X1QD;kN@
z$%`wz`8QVB1Z}9WYXRb&Kzt8~{{vn2e{DI?z%r-*E6ZK%Ff``o<opL=Y=+LR2oYIO
z;cv5~!YgG}h0DZ66+V&}>Jb76HYP@>p``(Y0Zs!*!BjN>0I%aN<?n}IvH$=807*qo
IM6N<$g80C<v;Y7A

diff --git a/pelican/themes/notmyidea/static/images/icons/twitter.png b/pelican/themes/notmyidea/static/images/icons/twitter.png
deleted file mode 100644
index cef1cef96bb2e0c957b77b79ee30894f798ce8f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004JNkl<Zcmb_a
zGlQ5x6x`UhZL^B)D*hR1W83!Gwr$(CZN1w$emobm8mt~8qG4fV0@y>VnQ8)X9Pc^Y
zIsS936mToi>>TyPE<z~;YaQIr7-E{~#Qr4EsAo<UU4h{<-nw03E57@lWjfi!g&7DF
z28?}Xe+wKlDeHw{5g~AlZg$nw&jI@El6lPb4njYl*h^Ou9&^#Z$amnBu)(g>kcc+2
z`5!z^ZFZ_O#v*`YvS&^RN+0_pGFvTxh}Lp2wqGagAdVyz;6#9udAenJvhWwC3QjN}
ztg*<~69%xm!G(wSxK?V6H7%<iNC5PrfJ?^V3nu)GjKvH0XI^DrVNXO8rIk3AWAAyN
z>K70|sCIX&%<6rLrHmSw|10dx_<xBxYG#kZhNIX_7y#n~j`EHg_!c31dAtkWN68GJ
zS?O2ObmnGY%^e6A+f;bt8W>{@95hn1(i_a}5^hC>VT?7YQHpjC*P~ez&J%_J0000<
KMNUMnLSTY<*|#qM

diff --git a/pelican/themes/notmyidea/static/images/icons/vimeo.png b/pelican/themes/notmyidea/static/images/icons/vimeo.png
deleted file mode 100644
index 4b9d72127c574237090a2f5f2f7eb7be94a2b62e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcmV-j0iyniP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J00000
z003^L2ax~(0TM|>K~#7FV*mo~S^J1YP}SCZ?(wd@Mi2p&f%E_|kV7PbYe1Nxz5O<v
z3uL!ldsTk%h0La#STsz%{r3O={~vz-f#~r%^x!`XEV=g<MFY@)B@aHprOQt}0LpE;
z`||yluMm-gw;!Wu@Z5X5dHb;ocOOBdC!e?uG=e>|y=nOth{(bt=TS6pPua;?J=e5)
zBGkM)Pk5GtRBXBib(QPnRVW%@oC6PDyoRVi_QQr_=YS?+52c0sPeBv`1LxxFPe2CH
z8{$R%ID<81>CXSCz@?@iUpz?mZ$MU^)He_47<?Llex0~}7sMq%)m-hXamF+pag<JV
vF7FbJE=H)v)PSZ3=nSA$SXBcN$;lf4{SCr3%yBq=00000NkvXXu0mjfiDs1-

diff --git a/pelican/themes/notmyidea/static/images/icons/youtube.png b/pelican/themes/notmyidea/static/images/icons/youtube.png
deleted file mode 100644
index e334e68eed877dbd5109acea1858a533a3174b2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0MP)^
z0MVzc>^%Sg0P#sgK~#7Fl~6T81W^oq2cX(5aX1R@6<62}xdAmT6>b%79aG~T97?pp
zUBiU8?wcQZ@ytL(4yKyhs<TwJ)HgA_c&>>_L_h@KZq&4<BG4R8Hv`~!r=tRZuYHw+
zsG}QRuEqcyfB(K3upr%x8~R$kY>RGqy&kuUuOC&N_n)+)st0x|+@BHFkRd@&PPEwb
z&tB6>xX7cYComKsCfH0jmXR=>tbysq2Gd0WOmZB{y88Z3Wj9^}w-Gbm)y>{S4W9T7
zfp3d!a2x}~TiXWa<}BOO6S3ho2QJ^`nhs+IjSU!vHHb*~-y}#B5s^RLsrl%w&%5IQ
O0000<MNUMnLSTX{BZHCv


From e014e5b55bb5dbdf38691be06e220c5ffe4ee067 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sat, 4 Nov 2023 01:00:51 +0300
Subject: [PATCH 2649/2864] add notmyidea font license

---
 .../theme/fonts/Yanone_Kaffeesatz_LICENSE.txt | 93 +++++++++++++++++++
 .../theme/fonts/Yanone_Kaffeesatz_LICENSE.txt | 93 +++++++++++++++++++
 .../theme/fonts/Yanone_Kaffeesatz_LICENSE.txt | 93 +++++++++++++++++++
 .../fonts/Yanone_Kaffeesatz_LICENSE.txt       | 93 +++++++++++++++++++
 4 files changed, 372 insertions(+)
 create mode 100644 pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
 create mode 100644 pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
 create mode 100644 pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
 create mode 100644 pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_LICENSE.txt

diff --git a/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
new file mode 100644
index 00000000..309fd710
--- /dev/null
+++ b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2010 The Yanone Kaffeesatz Project Authors (https://github.com/alexeiva/yanone-kaffeesatz)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
new file mode 100644
index 00000000..309fd710
--- /dev/null
+++ b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2010 The Yanone Kaffeesatz Project Authors (https://github.com/alexeiva/yanone-kaffeesatz)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
new file mode 100644
index 00000000..309fd710
--- /dev/null
+++ b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2010 The Yanone Kaffeesatz Project Authors (https://github.com/alexeiva/yanone-kaffeesatz)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_LICENSE.txt b/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_LICENSE.txt
new file mode 100644
index 00000000..c70bcad3
--- /dev/null
+++ b/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2010 The Yanone Kaffeesatz Project Authors (https://github.com/alexeiva/yanone-kaffeesatz)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

From 6059675d55d0abbb2bcba73f365d88473fb8029f Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Sat, 11 Nov 2023 14:10:08 +0100
Subject: [PATCH 2650/2864] Fix #3233 -- Simple theme classless semantic HTML

---
 .gitignore                                    |  1 +
 docs/settings.rst                             |  6 ++++
 .../custom/author/alexis-metaireau.html       | 12 ++++---
 .../custom/author/alexis-metaireau2.html      | 16 ++++++----
 .../custom/author/alexis-metaireau3.html      | 12 ++++---
 pelican/tests/output/custom/index.html        | 12 ++++---
 pelican/tests/output/custom/index2.html       | 16 ++++++----
 pelican/tests/output/custom/index3.html       | 12 ++++---
 .../author/alexis-metaireau.html              | 12 ++++---
 .../author/alexis-metaireau2.html             | 16 ++++++----
 .../author/alexis-metaireau3.html             | 12 ++++---
 pelican/tests/output/custom_locale/index.html | 12 ++++---
 .../tests/output/custom_locale/index2.html    | 16 ++++++----
 .../tests/output/custom_locale/index3.html    | 12 ++++---
 pelican/themes/simple/templates/archives.html |  2 +-
 pelican/themes/simple/templates/article.html  | 32 +++++++++----------
 pelican/themes/simple/templates/author.html   |  2 +-
 pelican/themes/simple/templates/authors.html  |  2 +-
 pelican/themes/simple/templates/base.html     | 18 +++++++----
 .../themes/simple/templates/categories.html   |  2 +-
 pelican/themes/simple/templates/category.html |  2 +-
 pelican/themes/simple/templates/index.html    | 25 +++++++--------
 pelican/themes/simple/templates/page.html     |  8 ++++-
 .../themes/simple/templates/pagination.html   | 16 ++++++----
 .../simple/templates/period_archives.html     |  2 +-
 pelican/themes/simple/templates/tag.html      |  2 +-
 pelican/themes/simple/templates/tags.html     |  2 +-
 27 files changed, 163 insertions(+), 119 deletions(-)

diff --git a/.gitignore b/.gitignore
index b27f3eb9..473efea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ samples/output
 *.pem
 *.lock
 .pdm-python
+.venv
diff --git a/docs/settings.rst b/docs/settings.rst
index a7768514..88a32d23 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1231,6 +1231,12 @@ Following are example ways to specify your preferred theme::
     # Specify a customized theme, via absolute path
     THEME = "/home/myuser/projects/mysite/themes/mycustomtheme"
 
+The built-in ``simple`` theme can be customized using the following settings.
+
+.. data:: STYLESHEET_URL
+
+   The URL of the stylesheet to use.
+
 The built-in ``notmyidea`` theme can make good use of the following settings.
 Feel free to use them in your themes as well.
 
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index a9c73e6b..aef8c6e6 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -120,11 +120,13 @@
 <p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 3
-        <a href="../author/alexis-metaireau2.html">&raquo;</a>
-        <a href="../author/alexis-metaireau3.html">&#8649;</a>
-</p>
+<nav>
+  <ul>
+    <li>Page 1 / 3</li>
+        <li><a href="../author/alexis-metaireau2.html">&rang;</a></li>
+        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 41f00605..8d17eed5 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -133,13 +133,15 @@ YEAH !</p>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-        <a href="../author/alexis-metaireau.html">&#8647;</a>
-        <a href="../author/alexis-metaireau.html">&laquo;</a>
-    Page 2 / 3
-        <a href="../author/alexis-metaireau3.html">&raquo;</a>
-        <a href="../author/alexis-metaireau3.html">&#8649;</a>
-</p>
+<nav>
+  <ul>
+        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
+        <li><a href="../author/alexis-metaireau.html">&lang;</a></li>
+    <li>Page 2 / 3</li>
+        <li><a href="../author/alexis-metaireau3.html">&rang;</a></li>
+        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 45a5f0d1..48fe75ba 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -85,11 +85,13 @@ pelican.conf, it will …</p></div>
 <p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-        <a href="../author/alexis-metaireau.html">&#8647;</a>
-        <a href="../author/alexis-metaireau2.html">&laquo;</a>
-    Page 3 / 3
-</p>
+<nav>
+  <ul>
+        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
+        <li><a href="../author/alexis-metaireau2.html">&lang;</a></li>
+    <li>Page 3 / 3</li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index ceb6e4f5..6c4d7a94 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -120,11 +120,13 @@
 <p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 3
-        <a href="./index2.html">&raquo;</a>
-        <a href="./index3.html">&#8649;</a>
-</p>
+<nav>
+  <ul>
+    <li>Page 1 / 3</li>
+        <li><a href="./index2.html">&rang;</a></li>
+        <li><a href="./index3.html">&Rang;</a></li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index ddd4e96e..043f8c33 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -133,13 +133,15 @@ YEAH !</p>
 <p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-        <a href="./index.html">&#8647;</a>
-        <a href="./index.html">&laquo;</a>
-    Page 2 / 3
-        <a href="./index3.html">&raquo;</a>
-        <a href="./index3.html">&#8649;</a>
-</p>
+<nav>
+  <ul>
+        <li><a href="./index.html">&Lang;</a></li>
+        <li><a href="./index.html">&lang;</a></li>
+    <li>Page 2 / 3</li>
+        <li><a href="./index3.html">&rang;</a></li>
+        <li><a href="./index3.html">&Rang;</a></li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 698139a0..f8ebaac0 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -85,11 +85,13 @@ pelican.conf, it will …</p></div>
 <p>There are <a href="./tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-        <a href="./index.html">&#8647;</a>
-        <a href="./index2.html">&laquo;</a>
-    Page 3 / 3
-</p>
+<nav>
+  <ul>
+        <li><a href="./index.html">&Lang;</a></li>
+        <li><a href="./index2.html">&lang;</a></li>
+    <li>Page 3 / 3</li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 41a21a98..df76ccf6 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -120,11 +120,13 @@
 <p>There are <a href="../posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 3
-        <a href="../author/alexis-metaireau2.html">&raquo;</a>
-        <a href="../author/alexis-metaireau3.html">&#8649;</a>
-</p>
+<nav>
+  <ul>
+    <li>Page 1 / 3</li>
+        <li><a href="../author/alexis-metaireau2.html">&rang;</a></li>
+        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 6412784f..42a929d0 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -133,13 +133,15 @@ YEAH !</p>
 <p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-        <a href="../author/alexis-metaireau.html">&#8647;</a>
-        <a href="../author/alexis-metaireau.html">&laquo;</a>
-    Page 2 / 3
-        <a href="../author/alexis-metaireau3.html">&raquo;</a>
-        <a href="../author/alexis-metaireau3.html">&#8649;</a>
-</p>
+<nav>
+  <ul>
+        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
+        <li><a href="../author/alexis-metaireau.html">&lang;</a></li>
+    <li>Page 2 / 3</li>
+        <li><a href="../author/alexis-metaireau3.html">&rang;</a></li>
+        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 2679b0a6..941cdc46 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -85,11 +85,13 @@ pelican.conf, it will …</p></div>
 <p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-        <a href="../author/alexis-metaireau.html">&#8647;</a>
-        <a href="../author/alexis-metaireau2.html">&laquo;</a>
-    Page 3 / 3
-</p>
+<nav>
+  <ul>
+        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
+        <li><a href="../author/alexis-metaireau2.html">&lang;</a></li>
+    <li>Page 3 / 3</li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 4a661093..054011cc 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -120,11 +120,13 @@
 <p>There are <a href="./posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-    Page 1 / 3
-        <a href="./index2.html">&raquo;</a>
-        <a href="./index3.html">&#8649;</a>
-</p>
+<nav>
+  <ul>
+    <li>Page 1 / 3</li>
+        <li><a href="./index2.html">&rang;</a></li>
+        <li><a href="./index3.html">&Rang;</a></li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 60fee085..fa2c4d2d 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -133,13 +133,15 @@ YEAH !</p>
 <p>There are <a href="./posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-        <a href="./index.html">&#8647;</a>
-        <a href="./index.html">&laquo;</a>
-    Page 2 / 3
-        <a href="./index3.html">&raquo;</a>
-        <a href="./index3.html">&#8649;</a>
-</p>
+<nav>
+  <ul>
+        <li><a href="./index.html">&Lang;</a></li>
+        <li><a href="./index.html">&lang;</a></li>
+    <li>Page 2 / 3</li>
+        <li><a href="./index3.html">&rang;</a></li>
+        <li><a href="./index3.html">&Rang;</a></li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 76597e82..71ccb4b1 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -85,11 +85,13 @@ pelican.conf, it will …</p></div>
 <p>There are <a href="./tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
                 </ol><!-- /#posts-list -->
-<p class="paginator">
-        <a href="./index.html">&#8647;</a>
-        <a href="./index2.html">&laquo;</a>
-    Page 3 / 3
-</p>
+<nav>
+  <ul>
+        <li><a href="./index.html">&Lang;</a></li>
+        <li><a href="./index2.html">&lang;</a></li>
+    <li>Page 3 / 3</li>
+  </ul>
+</nav>
                 </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
diff --git a/pelican/themes/simple/templates/archives.html b/pelican/themes/simple/templates/archives.html
index b7754c45..c7fb2127 100644
--- a/pelican/themes/simple/templates/archives.html
+++ b/pelican/themes/simple/templates/archives.html
@@ -3,7 +3,7 @@
 {% block title %}{{ SITENAME|striptags }} - Archives{% endblock %}
 
 {% block content %}
-<h1>Archives for {{ SITENAME }}</h1>
+<h2>Archives for {{ SITENAME }}</h2>
 
 <dl>
 {% for article in dates %}
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index a17f2759..07e5534d 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -22,44 +22,44 @@
 {% endblock %}
 
 {% block content %}
+<article>
   <header>
-    <h1 class="entry-title">
+    <h2>
       <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-         title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
+         title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
  {% import 'translations.html' as translations with context %}
  {{ translations.translations_for(article) }}
   </header>
-  <footer class="post-info">
-    <time class="published" datetime="{{ article.date.isoformat() }}">
+  {{ article.content }}
+  <footer>
+    <p>Published: <time datetime="{{ article.date.isoformat() }}">
       {{ article.locale_date }}
-    </time>
+    </time></p>
     {% if article.modified %}
-    <time class="modified" datetime="{{ article.modified.isoformat() }}">
+    <p>Last updated: <time datetime="{{ article.modified.isoformat() }}">
       {{ article.locale_modified }}
-    </time>
+    </time></p>
     {% endif %}
     {% if article.authors %}
-    <address class="vcard author">
+    <address>
       By {% for author in article.authors %}
-          <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
+          <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
         {% endfor %}
     </address>
     {% endif %}
     {% if article.category %}
-    <div class="category">
+    <p>
         Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
-    </div>
+    </p>
     {% endif %}
     {% if article.tags %}
-    <div class="tags">
+    <p>
         Tags:
         {% for tag in article.tags %}
             <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>
         {% endfor %}
-    </div>
+    </p>
     {% endif %}
-  </footer><!-- /.post-info -->
-  <article>
-    {{ article.content }}
+  </footer>
   </article>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/author.html b/pelican/themes/simple/templates/author.html
index c054f8ab..9b30dfe2 100644
--- a/pelican/themes/simple/templates/author.html
+++ b/pelican/themes/simple/templates/author.html
@@ -3,5 +3,5 @@
 {% block title %}{{ SITENAME|striptags }} - Articles by {{ author }}{% endblock %}
 
 {% block content_title %}
-<h1>Articles by {{ author }}</h1>
+<h2>Articles by {{ author }}</h2>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/authors.html b/pelican/themes/simple/templates/authors.html
index 9b80b499..01b4f6f1 100644
--- a/pelican/themes/simple/templates/authors.html
+++ b/pelican/themes/simple/templates/authors.html
@@ -3,7 +3,7 @@
 {% block title %}{{ SITENAME|striptags }} - Authors{% endblock %}
 
 {% block content %}
-    <h1>Authors on {{ SITENAME }}</h1>
+    <h2>Authors on {{ SITENAME }}</h2>
     <ul>
     {% for author, articles in authors|sort %}
         <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 94a16930..e006cba1 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -6,6 +6,12 @@
         <meta charset="utf-8" />
         <meta name="generator" content="Pelican" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        {% if SITESUBTITLE %}
+        <meta name="description" content="{{ SITESUBTITLE }}" />
+        {% endif %}
+        {% if STYLESHEET_URL %}
+        <link rel="stylesheet" type="text/css" href="{{ STYLESHEET_URL }}" />
+        {% endif %}
         {% if FEED_ALL_ATOM %}
         <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Full Atom Feed" />
         {% endif %}
@@ -35,32 +41,32 @@
 
 <body>
         <header>
-                <h1><a href="{{ SITEURL }}/">{{ SITENAME }}{% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
-        </header>
+              <hgroup><h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>{% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}</hgroup>
         <nav><ul>
         {% for title, link in MENUITEMS %}
             <li><a href="{{ link }}">{{ title }}</a></li>
         {% endfor %}
         {% if DISPLAY_PAGES_ON_MENU %}
           {% for p in pages %}
-            <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
+            <li><a href="{{ SITEURL }}/{{ p.url }}" {% if p==page %} aria-current="page" {% endif %}>{{ p.title }}</a></li>
           {% endfor %}
         {% endif %}
         {% if DISPLAY_CATEGORIES_ON_MENU %}
           {% for cat, null in categories %}
-            <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
+            <li><a href="{{ SITEURL }}/{{ cat.url }}" {% if cat==category %} aria-current="page" {% endif %}>{{ cat}}</a></li>
           {% endfor %}
         {% endif %}
         </ul></nav>
+        </header>
         <main>
         {% block content %}
         {% endblock %}
         </main>
         <footer>
-                <address id="about" class="vcard body">
+                <address>
                 Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>,
                 which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                </address>
         </footer>
 </body>
 </html>
diff --git a/pelican/themes/simple/templates/categories.html b/pelican/themes/simple/templates/categories.html
index f099e88f..7da19fb4 100644
--- a/pelican/themes/simple/templates/categories.html
+++ b/pelican/themes/simple/templates/categories.html
@@ -3,7 +3,7 @@
 {% block title %}{{ SITENAME|striptags }} - Categories{% endblock %}
 
 {% block content %}
-    <h1>Categories on {{ SITENAME }}</h1>
+    <h2>Categories on {{ SITENAME }}</h2>
     <ul>
     {% for category, articles in categories|sort %}
         <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
diff --git a/pelican/themes/simple/templates/category.html b/pelican/themes/simple/templates/category.html
index da1a8b52..16525fb2 100644
--- a/pelican/themes/simple/templates/category.html
+++ b/pelican/themes/simple/templates/category.html
@@ -3,5 +3,5 @@
 {% block title %}{{ SITENAME|striptags }} - {{ category }} category{% endblock %}
 
 {% block content_title %}
-<h1>Articles in the {{ category }} category</h1>
+<h2>Articles in the {{ category }} category</h2>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index ab4bc345..c9837b54 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -1,28 +1,27 @@
 {% extends "base.html" %}
 {% block content %}
-<section id="content">
 {% block content_title %}
 <h2>All articles</h2>
 {% endblock %}
 
-<ol id="post-list">
+
 {% for article in articles_page.object_list %}
-        <li><article class="hentry">
-                <header> <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2> </header>
-                <footer class="post-info">
-                    <time class="published" datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }} </time>
-                    <address class="vcard author">By
+        <article>
+                <header> <h2><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2> </header>
+                <section>{{ article.summary }}</section>
+                <footer>
+                    <p>Published: <time datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }} </time></p>
+                    <address>By
                     {% for author in article.authors %}
-                        <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
+                        <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
                     {% endfor %}
                     </address>
-                </footer><!-- /.post-info -->
-                <div class="entry-content"> {{ article.summary }} </div><!-- /.entry-content -->
-        </article></li>
+                </footer>
+        </article>
 {% endfor %}
-</ol><!-- /#posts-list -->
+
 {% if articles_page.has_other_pages() %}
     {% include 'pagination.html' %}
 {% endif %}
-</section><!-- /#content -->
+
 {% endblock content %}
diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
index eea816a9..38452d1d 100644
--- a/pelican/themes/simple/templates/page.html
+++ b/pelican/themes/simple/templates/page.html
@@ -13,15 +13,21 @@
 {% endblock %}
 
 {% block content %}
-    <h1>{{ page.title }}</h1>
+<article>
+  <header>
+    <h2>{{ page.title }}</h2>
+  </header>
     {% import 'translations.html' as translations with context %}
     {{ translations.translations_for(page) }}
 
     {{ page.content }}
 
     {% if page.modified %}
+      <footer>
         <p>
         Last updated: {{ page.locale_modified }}
         </p>
+      </footer>
     {% endif %}
+</article>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/pagination.html b/pelican/themes/simple/templates/pagination.html
index 588f130c..45e7f167 100644
--- a/pelican/themes/simple/templates/pagination.html
+++ b/pelican/themes/simple/templates/pagination.html
@@ -1,15 +1,17 @@
 {% if DEFAULT_PAGINATION %}
 {% set first_page = articles_paginator.page(1) %}
 {% set last_page = articles_paginator.page(articles_paginator.num_pages) %}
-<p class="paginator">
+<nav>
+  <ul>
     {% if articles_page.has_previous() %}
-        <a href="{{ SITEURL }}/{{ first_page.url }}">&#8647;</a>
-        <a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&laquo;</a>
+        <li><a href="{{ SITEURL }}/{{ first_page.url }}">&Lang;</a></li>
+        <li><a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&lang;</a></li>
     {% endif %}
-    Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}
+    <li>Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}</li>
     {% if articles_page.has_next() %}
-        <a href="{{ SITEURL }}/{{ articles_next_page.url }}">&raquo;</a>
-        <a href="{{ SITEURL }}/{{ last_page.url }}">&#8649;</a>
+        <li><a href="{{ SITEURL }}/{{ articles_next_page.url }}">&rang;</a></li>
+        <li><a href="{{ SITEURL }}/{{ last_page.url }}">&Rang;</a></li>
     {% endif %}
-</p>
+  </ul>
+</nav>
 {% endif %}
diff --git a/pelican/themes/simple/templates/period_archives.html b/pelican/themes/simple/templates/period_archives.html
index 9cdc354d..595def50 100644
--- a/pelican/themes/simple/templates/period_archives.html
+++ b/pelican/themes/simple/templates/period_archives.html
@@ -3,7 +3,7 @@
 {% block title %}{{ SITENAME|striptags }} - {{ period | reverse | join(' ') }} archives{% endblock %}
 
 {% block content %}
-<h1>Archives for {{ period | reverse | join(' ') }}</h1>
+<h2>Archives for {{ period | reverse | join(' ') }}</h2>
 
 <dl>
 {% for article in dates %}
diff --git a/pelican/themes/simple/templates/tag.html b/pelican/themes/simple/templates/tag.html
index 59725a05..f9b71f48 100644
--- a/pelican/themes/simple/templates/tag.html
+++ b/pelican/themes/simple/templates/tag.html
@@ -3,5 +3,5 @@
 {% block title %}{{ SITENAME|striptags }} - {{ tag }} tag{% endblock %}
 
 {% block content_title %}
-<h1>Articles tagged with {{ tag }}</h1>
+<h2>Articles tagged with {{ tag }}</h2>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/tags.html b/pelican/themes/simple/templates/tags.html
index 92c142d2..6b5c6b1c 100644
--- a/pelican/themes/simple/templates/tags.html
+++ b/pelican/themes/simple/templates/tags.html
@@ -3,7 +3,7 @@
 {% block title %}{{ SITENAME|striptags }} - Tags{% endblock %}
 
 {% block content %}
-    <h1>Tags for {{ SITENAME }}</h1>
+    <h2>Tags for {{ SITENAME }}</h2>
     <ul>
     {% for tag, articles in tags|sort %}
         <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>

From 39ff56a08260f057538cbb2e39e147bffacdf357 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Nov 2023 13:38:30 +0100
Subject: [PATCH 2651/2864] Update development dependencies

---
 .pre-commit-config.yaml | 2 +-
 pyproject.toml          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5a73aebc..333bc3c0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
       - id: forbid-new-submodules
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.3
+    rev: v0.1.5
     hooks:
       - id: ruff
       - id: ruff-format
diff --git a/pyproject.toml b/pyproject.toml
index 816a25f3..03ba81b4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -80,7 +80,7 @@ dev = [
     "BeautifulSoup4>=4.12.2",
     "jinja2>=3.1.2",
     "lxml>=4.9.3",
-    "markdown>=3.5",
+    "markdown>=3.5.1",
     "typogrify>=2.0.7",
     "sphinx>=7.1.2",
     "sphinxext-opengraph>=0.9.0",
@@ -91,10 +91,10 @@ dev = [
     "pytest>=7.4.3",
     "pytest-cov>=4.1.0",
     "pytest-sugar>=0.9.7",
-    "pytest-xdist>=3.3.1",
+    "pytest-xdist>=3.4.0",
     "tox>=4.11.3",
     "invoke>=2.2.0",
-    "ruff>=0.1.3",
+    "ruff>=0.1.5",
     "tomli>=2.0.1; python_version < \"3.11\"",
 ]
 

From 903ce3ce33d614dfaa39a55db96b7ec44fc7df43 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Nov 2023 13:41:38 +0100
Subject: [PATCH 2652/2864] Pin Furo doc theme version

We override its page.html template with our own, so it is better to
manually and explicity upgrade rather than have a future version
of the Furo theme potentially break the documentation build.
---
 pyproject.toml        | 2 +-
 requirements/docs.pip | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 03ba81b4..d40e6bce 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -84,7 +84,7 @@ dev = [
     "typogrify>=2.0.7",
     "sphinx>=7.1.2",
     "sphinxext-opengraph>=0.9.0",
-    "furo>=2023.9.10",
+    "furo==2023.9.10",
     "livereload>=2.6.3",
     "psutil>=5.9.6",
     "pygments>=2.16.1",
diff --git a/requirements/docs.pip b/requirements/docs.pip
index 961a6473..7b0f37cc 100644
--- a/requirements/docs.pip
+++ b/requirements/docs.pip
@@ -1,5 +1,5 @@
-sphinx<6.0
+sphinx
 sphinxext-opengraph
-furo
+furo==2023.9.10
 livereload
 tomli;python_version<"3.11"

From ecd598f293161a52564aa6e8dfdcc8284dc93970 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Nov 2023 13:53:02 +0100
Subject: [PATCH 2653/2864] Update code base for Python 3.8 and above

Result of: pipx run pyupgrade --py38-plus pelican/**/*.py
---
 pelican/__init__.py                          |  6 ++----
 pelican/contents.py                          |  2 +-
 pelican/paginator.py                         |  2 +-
 pelican/plugins/_utils.py                    |  8 +++----
 pelican/readers.py                           | 16 +++++++-------
 pelican/settings.py                          |  6 +++---
 pelican/tests/build_test/test_build_files.py |  2 +-
 pelican/tests/support.py                     |  2 +-
 pelican/tests/test_readers.py                |  4 +---
 pelican/tests/test_settings.py               |  2 +-
 pelican/tools/pelican_import.py              |  8 +++----
 pelican/tools/pelican_quickstart.py          | 22 ++++++++++----------
 pelican/tools/pelican_themes.py              | 12 +++++------
 pelican/urlwrappers.py                       |  8 +++----
 pelican/utils.py                             | 22 +++++++++-----------
 15 files changed, 58 insertions(+), 64 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index a0ff4989..25c493b9 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -273,7 +273,7 @@ class PrintSettings(argparse.Action):
                         )
                     )
                 else:
-                    console.print("\n{} is not a recognized setting.".format(setting))
+                    console.print(f"\n{setting} is not a recognized setting.")
                     break
         else:
             # No argument was given to --print-settings, so print all settings
@@ -611,9 +611,7 @@ def listen(server, port, output, excqueue=None):
         return
 
     try:
-        console.print(
-            "Serving site at: http://{}:{} - Tap CTRL-C to stop".format(server, port)
-        )
+        console.print(f"Serving site at: http://{server}:{port} - Tap CTRL-C to stop")
         httpd.serve_forever()
     except Exception as e:
         if excqueue is not None:
diff --git a/pelican/contents.py b/pelican/contents.py
index f99e6426..474e5bbf 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -235,7 +235,7 @@ class Content:
     def _expand_settings(self, key, klass=None):
         if not klass:
             klass = self.__class__.__name__
-        fq_key = ("{}_{}".format(klass, key)).upper()
+        fq_key = (f"{klass}_{key}").upper()
         return str(self.settings[fq_key]).format(**self.url_format)
 
     def get_url_setting(self, key):
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 930c915b..e1d50881 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -81,7 +81,7 @@ class Page:
         self.settings = settings
 
     def __repr__(self):
-        return "<Page {} of {}>".format(self.number, self.paginator.num_pages)
+        return f"<Page {self.number} of {self.paginator.num_pages}>"
 
     def has_next(self):
         return self.number < self.paginator.num_pages
diff --git a/pelican/plugins/_utils.py b/pelican/plugins/_utils.py
index c25f8114..805ed049 100644
--- a/pelican/plugins/_utils.py
+++ b/pelican/plugins/_utils.py
@@ -49,7 +49,7 @@ def plugin_enabled(name, plugin_list=None):
         # search name as is
         return True
 
-    if "pelican.plugins.{}".format(name) in plugin_list:
+    if f"pelican.plugins.{name}" in plugin_list:
         # check if short name is a namespace plugin
         return True
 
@@ -68,7 +68,7 @@ def load_legacy_plugin(plugin, plugin_paths):
         # If failed, try to find it in normal importable locations
         spec = importlib.util.find_spec(plugin)
     if spec is None:
-        raise ImportError("Cannot import plugin `{}`".format(plugin))
+        raise ImportError(f"Cannot import plugin `{plugin}`")
     else:
         # Avoid loading the same plugin twice
         if spec.name in sys.modules:
@@ -106,8 +106,8 @@ def load_plugins(settings):
                 # try to find in namespace plugins
                 if plugin in namespace_plugins:
                     plugin = namespace_plugins[plugin]
-                elif "pelican.plugins.{}".format(plugin) in namespace_plugins:
-                    plugin = namespace_plugins["pelican.plugins.{}".format(plugin)]
+                elif f"pelican.plugins.{plugin}" in namespace_plugins:
+                    plugin = namespace_plugins[f"pelican.plugins.{plugin}"]
                 # try to import it
                 else:
                     try:
diff --git a/pelican/readers.py b/pelican/readers.py
index 5033c0bd..60b9765a 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -401,7 +401,7 @@ class HTMLReader(BaseReader):
                 self._in_body = False
                 self._in_top_level = True
             elif self._in_body:
-                self._data_buffer += "</{}>".format(escape(tag))
+                self._data_buffer += f"</{escape(tag)}>"
 
         def handle_startendtag(self, tag, attrs):
             if tag == "meta" and self._in_head:
@@ -410,28 +410,28 @@ class HTMLReader(BaseReader):
                 self._data_buffer += self.build_tag(tag, attrs, True)
 
         def handle_comment(self, data):
-            self._data_buffer += "<!--{}-->".format(data)
+            self._data_buffer += f"<!--{data}-->"
 
         def handle_data(self, data):
             self._data_buffer += data
 
         def handle_entityref(self, data):
-            self._data_buffer += "&{};".format(data)
+            self._data_buffer += f"&{data};"
 
         def handle_charref(self, data):
-            self._data_buffer += "&#{};".format(data)
+            self._data_buffer += f"&#{data};"
 
         def build_tag(self, tag, attrs, close_tag):
-            result = "<{}".format(escape(tag))
+            result = f"<{escape(tag)}"
             for k, v in attrs:
                 result += " " + escape(k)
                 if v is not None:
                     # If the attribute value contains a double quote, surround
                     # with single quotes, otherwise use double quotes.
                     if '"' in v:
-                        result += "='{}'".format(escape(v, quote=False))
+                        result += f"='{escape(v, quote=False)}'"
                     else:
-                        result += '="{}"'.format(escape(v, quote=False))
+                        result += f'="{escape(v, quote=False)}"'
             if close_tag:
                 return result + " />"
             return result + ">"
@@ -439,7 +439,7 @@ class HTMLReader(BaseReader):
         def _handle_meta_tag(self, attrs):
             name = self._attr_value(attrs, "name")
             if name is None:
-                attr_list = ['{}="{}"'.format(k, v) for k, v in attrs]
+                attr_list = [f'{k}="{v}"' for k, v in attrs]
                 attr_serialized = ", ".join(attr_list)
                 logger.warning(
                     "Meta tag in file %s does not have a 'name' "
diff --git a/pelican/settings.py b/pelican/settings.py
index 2c84b6f0..4a4f2901 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -265,7 +265,7 @@ def _printf_s_to_format_field(printf_string, format_field):
         format_field
     )
     if result.format(**{format_field: TEST_STRING}) != expected:
-        raise ValueError("Failed to safely replace %s with {{{}}}".format(format_field))
+        raise ValueError(f"Failed to safely replace %s with {{{format_field}}}")
 
     return result
 
@@ -350,9 +350,9 @@ def handle_deprecated_settings(settings):
         ),
     ]:
         if old in settings:
-            message = "The {} setting has been removed in favor of {}".format(old, new)
+            message = f"The {old} setting has been removed in favor of {new}"
             if doc:
-                message += ", see {} for details".format(doc)
+                message += f", see {doc} for details"
             logger.warning(message)
 
     # PAGINATED_DIRECT_TEMPLATES -> PAGINATED_TEMPLATES
diff --git a/pelican/tests/build_test/test_build_files.py b/pelican/tests/build_test/test_build_files.py
index 2b51d362..9aad990d 100644
--- a/pelican/tests/build_test/test_build_files.py
+++ b/pelican/tests/build_test/test_build_files.py
@@ -61,6 +61,6 @@ def test_sdist_contents(pytestconfig, expected_file):
         filtered_values = [
             path
             for path in files_list
-            if match(f"^pelican-\d\.\d\.\d/{expected_file}{dir_matcher}$", path)
+            if match(rf"^pelican-\d\.\d\.\d/{expected_file}{dir_matcher}$", path)
         ]
         assert len(filtered_values) > 0
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index e3813849..16060441 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -133,7 +133,7 @@ def skipIfNoExecutable(executable):
             res = None
 
     if res is None:
-        return unittest.skip("{} executable not found".format(executable))
+        return unittest.skip(f"{executable} executable not found")
 
     return lambda func: func
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index cf0f39f1..04049894 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -32,9 +32,7 @@ class ReaderTest(unittest.TestCase):
                     % (key, value, real_value),
                 )
             else:
-                self.fail(
-                    "Expected %s to have value %s, but was not in Dict" % (key, value)
-                )
+                self.fail(f"Expected {key} to have value {value}, but was not in Dict")
 
 
 class TestAssertDictHasSubset(ReaderTest):
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 0e77674d..f370f7eb 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -170,7 +170,7 @@ class TestSettingsConfiguration(unittest.TestCase):
 
     def test__printf_s_to_format_field(self):
         for s in ("%s", "{%s}", "{%s"):
-            option = "foo/{}/bar.baz".format(s)
+            option = f"foo/{s}/bar.baz"
             result = _printf_s_to_format_field(option, "slug")
             expected = option % "qux"
             found = result.format(slug="qux")
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 27102f38..681a5c45 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -41,7 +41,7 @@ def decode_wp_content(content, br=True):
             if start == -1:
                 content = content + pre_part
                 continue
-            name = "<pre wp-pre-tag-{}></pre>".format(pre_index)
+            name = f"<pre wp-pre-tag-{pre_index}></pre>"
             pre_tags[name] = pre_part[start:] + "</pre>"
             content = content + pre_part[0:start] + name
             pre_index += 1
@@ -765,7 +765,7 @@ def download_attachments(output_path, urls):
 
         if not os.path.exists(full_path):
             os.makedirs(full_path)
-        print("downloading {}".format(filename))
+        print(f"downloading {filename}")
         try:
             urlretrieve(url, os.path.join(full_path, filename))
             locations[url] = os.path.join(localpath, filename)
@@ -782,7 +782,7 @@ def is_pandoc_needed(in_markup):
 def get_pandoc_version():
     cmd = ["pandoc", "--version"]
     try:
-        output = subprocess.check_output(cmd, universal_newlines=True)
+        output = subprocess.check_output(cmd, text=True)
     except (subprocess.CalledProcessError, OSError) as e:
         logger.warning("Pandoc version unknown: %s", e)
         return ()
@@ -898,7 +898,7 @@ def fields2pelican(
                     new_content = decode_wp_content(content)
                 else:
                     paragraphs = content.splitlines()
-                    paragraphs = ["<p>{}</p>".format(p) for p in paragraphs]
+                    paragraphs = [f"<p>{p}</p>" for p in paragraphs]
                     new_content = "".join(paragraphs)
                 with open(html_filename, "w", encoding="utf-8") as fp:
                     fp.write(new_content)
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index fba0c9c3..db00ce70 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -90,9 +90,9 @@ def ask(question, answer=str, default=None, length=None):
         r = ""
         while True:
             if default:
-                r = input("> {} [{}] ".format(question, default))
+                r = input(f"> {question} [{default}] ")
             else:
-                r = input("> {} ".format(question))
+                r = input(f"> {question} ")
 
             r = r.strip()
 
@@ -104,7 +104,7 @@ def ask(question, answer=str, default=None, length=None):
                     print("You must enter something")
             else:
                 if length and len(r) != length:
-                    print("Entry must be {} characters long".format(length))
+                    print(f"Entry must be {length} characters long")
                 else:
                     break
 
@@ -114,11 +114,11 @@ def ask(question, answer=str, default=None, length=None):
         r = None
         while True:
             if default is True:
-                r = input("> {} (Y/n) ".format(question))
+                r = input(f"> {question} (Y/n) ")
             elif default is False:
-                r = input("> {} (y/N) ".format(question))
+                r = input(f"> {question} (y/N) ")
             else:
-                r = input("> {} (y/n) ".format(question))
+                r = input(f"> {question} (y/n) ")
 
             r = r.strip().lower()
 
@@ -138,9 +138,9 @@ def ask(question, answer=str, default=None, length=None):
         r = None
         while True:
             if default:
-                r = input("> {} [{}] ".format(question, default))
+                r = input(f"> {question} [{default}] ")
             else:
-                r = input("> {} ".format(question))
+                r = input(f"> {question} ")
 
             r = r.strip()
 
@@ -180,7 +180,7 @@ def render_jinja_template(tmpl_name: str, tmpl_vars: Mapping, target_path: str):
             _template = _jinja_env.get_template(tmpl_name)
             fd.write(_template.render(**tmpl_vars))
     except OSError as e:
-        print("Error: {}".format(e))
+        print(f"Error: {e}")
 
 
 def main():
@@ -376,12 +376,12 @@ needed by Pelican.
     try:
         os.makedirs(os.path.join(CONF["basedir"], "content"))
     except OSError as e:
-        print("Error: {}".format(e))
+        print(f"Error: {e}")
 
     try:
         os.makedirs(os.path.join(CONF["basedir"], "output"))
     except OSError as e:
-        print("Error: {}".format(e))
+        print(f"Error: {e}")
 
     conf_python = dict()
     for key, value in CONF.items():
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 4069f99b..c5b49b9f 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -58,7 +58,7 @@ def main():
         "-V",
         "--version",
         action="version",
-        version="pelican-themes v{}".format(__version__),
+        version=f"pelican-themes v{__version__}",
         help="Print the version of this script",
     )
 
@@ -224,7 +224,7 @@ def install(path, v=False, u=False):
             install(path, v)
         else:
             if v:
-                print("Copying '{p}' to '{t}' ...".format(p=path, t=theme_path))
+                print(f"Copying '{path}' to '{theme_path}' ...")
             try:
                 shutil.copytree(path, theme_path)
 
@@ -264,7 +264,7 @@ def symlink(path, v=False):
             err(path + " : already exists")
         else:
             if v:
-                print("Linking `{p}' to `{t}' ...".format(p=path, t=theme_path))
+                print(f"Linking `{path}' to `{theme_path}' ...")
             try:
                 os.symlink(path, theme_path)
             except Exception as e:
@@ -288,12 +288,12 @@ def clean(v=False):
         path = os.path.join(_THEMES_PATH, path)
         if os.path.islink(path) and is_broken_link(path):
             if v:
-                print("Removing {}".format(path))
+                print(f"Removing {path}")
             try:
                 os.remove(path)
             except OSError:
-                print("Error: cannot remove {}".format(path))
+                print(f"Error: cannot remove {path}")
             else:
                 c += 1
 
-    print("\nRemoved {} broken links".format(c))
+    print(f"\nRemoved {c} broken links")
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 2e8cc953..6d705d4c 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -31,7 +31,7 @@ class URLWrapper:
     @property
     def slug(self):
         if self._slug is None:
-            class_key = "{}_REGEX_SUBSTITUTIONS".format(self.__class__.__name__.upper())
+            class_key = f"{self.__class__.__name__.upper()}_REGEX_SUBSTITUTIONS"
             regex_subs = self.settings.get(
                 class_key, self.settings.get("SLUG_REGEX_SUBSTITUTIONS", [])
             )
@@ -60,7 +60,7 @@ class URLWrapper:
         return hash(self.slug)
 
     def _normalize_key(self, key):
-        class_key = "{}_REGEX_SUBSTITUTIONS".format(self.__class__.__name__.upper())
+        class_key = f"{self.__class__.__name__.upper()}_REGEX_SUBSTITUTIONS"
         regex_subs = self.settings.get(
             class_key, self.settings.get("SLUG_REGEX_SUBSTITUTIONS", [])
         )
@@ -98,7 +98,7 @@ class URLWrapper:
         return self.name
 
     def __repr__(self):
-        return "<{} {}>".format(type(self).__name__, repr(self._name))
+        return f"<{type(self).__name__} {repr(self._name)}>"
 
     def _from_settings(self, key, get_page_name=False):
         """Returns URL information as defined in settings.
@@ -108,7 +108,7 @@ class URLWrapper:
         "cat/{slug}" Useful for pagination.
 
         """
-        setting = "{}_{}".format(self.__class__.__name__.upper(), key)
+        setting = f"{self.__class__.__name__.upper()}_{key}"
         value = self.settings[setting]
         if isinstance(value, pathlib.Path):
             value = str(value)
diff --git a/pelican/utils.py b/pelican/utils.py
index 08a08f7e..02ffb9d1 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -35,9 +35,7 @@ def sanitised_join(base_directory, *parts):
     joined = posixize_path(os.path.abspath(os.path.join(base_directory, *parts)))
     base = posixize_path(os.path.abspath(base_directory))
     if not joined.startswith(base):
-        raise RuntimeError(
-            "Attempted to break out of output directory to {}".format(joined)
-        )
+        raise RuntimeError(f"Attempted to break out of output directory to {joined}")
 
     return joined
 
@@ -71,7 +69,7 @@ def strftime(date, date_format):
             # check for '-' prefix
             if len(candidate) == 3:
                 # '-' prefix
-                candidate = "%{}".format(candidate[-1])
+                candidate = f"%{candidate[-1]}"
                 conversion = strip_zeros
             else:
                 conversion = None
@@ -178,11 +176,11 @@ def deprecated_attribute(old, new, since=None, remove=None, doc=None):
 
     def _warn():
         version = ".".join(str(x) for x in since)
-        message = ["{} has been deprecated since {}".format(old, version)]
+        message = [f"{old} has been deprecated since {version}"]
         if remove:
             version = ".".join(str(x) for x in remove)
-            message.append(" and will be removed by version {}".format(version))
-        message.append(".  Use {} instead.".format(new))
+            message.append(f" and will be removed by version {version}")
+        message.append(f".  Use {new} instead.")
         logger.warning("".join(message))
         logger.debug("".join(str(x) for x in traceback.format_stack()))
 
@@ -210,7 +208,7 @@ def get_date(string):
     try:
         return dateutil.parser.parse(string, default=default)
     except (TypeError, ValueError):
-        raise ValueError("{!r} is not a valid date".format(string))
+        raise ValueError(f"{string!r} is not a valid date")
 
 
 @contextmanager
@@ -763,9 +761,9 @@ def order_content(content_list, order_by="slug"):
 def wait_for_changes(settings_file, reader_class, settings):
     content_path = settings.get("PATH", "")
     theme_path = settings.get("THEME", "")
-    ignore_files = set(
+    ignore_files = {
         fnmatch.translate(pattern) for pattern in settings.get("IGNORE_FILES", [])
-    )
+    }
 
     candidate_paths = [
         settings_file,
@@ -838,7 +836,7 @@ def split_all(path):
         return None
     else:
         raise TypeError(
-            '"path" was {}, must be string, None, or pathlib.Path'.format(type(path))
+            f'"path" was {type(path)}, must be string, None, or pathlib.Path'
         )
 
 
@@ -873,7 +871,7 @@ def maybe_pluralize(count, singular, plural):
     selection = plural
     if count == 1:
         selection = singular
-    return "{} {}".format(count, selection)
+    return f"{count} {selection}"
 
 
 @contextmanager

From db241feaa445375dc05e189e69287000ffe5fa8e Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Sun, 12 Nov 2023 15:06:02 +0100
Subject: [PATCH 2654/2864] Fix #2888 -- Apply ruff and pyupgrade to templates

---
 pelican/tools/templates/pelicanconf.py.jinja2 |  22 ++--
 pelican/tools/templates/publishconf.py.jinja2 |  11 +-
 pelican/tools/templates/tasks.py.jinja2       | 113 ++++++++++--------
 3 files changed, 82 insertions(+), 64 deletions(-)

diff --git a/pelican/tools/templates/pelicanconf.py.jinja2 b/pelican/tools/templates/pelicanconf.py.jinja2
index 1112ac88..d2e92d4b 100644
--- a/pelican/tools/templates/pelicanconf.py.jinja2
+++ b/pelican/tools/templates/pelicanconf.py.jinja2
@@ -1,8 +1,8 @@
 AUTHOR = {{author}}
 SITENAME = {{sitename}}
-SITEURL = ''
+SITEURL = ""
 
-PATH = 'content'
+PATH = "content"
 
 TIMEZONE = {{timezone}}
 
@@ -16,16 +16,20 @@ AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None
 
 # Blogroll
-LINKS = (('Pelican', 'https://getpelican.com/'),
-         ('Python.org', 'https://www.python.org/'),
-         ('Jinja2', 'https://palletsprojects.com/p/jinja/'),
-         ('You can modify those links in your config file', '#'),)
+LINKS = (
+    ("Pelican", "https://getpelican.com/"),
+    ("Python.org", "https://www.python.org/"),
+    ("Jinja2", "https://palletsprojects.com/p/jinja/"),
+    ("You can modify those links in your config file", "#"),
+)
 
 # Social widget
-SOCIAL = (('You can add links in your config file', '#'),
-          ('Another social link', '#'),)
+SOCIAL = (
+    ("You can add links in your config file", "#"),
+    ("Another social link", "#"),
+)
 
 DEFAULT_PAGINATION = {{default_pagination}}
 
 # Uncomment following line if you want document-relative URLs when developing
-#RELATIVE_URLS = True
+# RELATIVE_URLS = True
diff --git a/pelican/tools/templates/publishconf.py.jinja2 b/pelican/tools/templates/publishconf.py.jinja2
index e119222c..301e4dfa 100755
--- a/pelican/tools/templates/publishconf.py.jinja2
+++ b/pelican/tools/templates/publishconf.py.jinja2
@@ -3,19 +3,20 @@
 
 import os
 import sys
+
 sys.path.append(os.curdir)
 from pelicanconf import *
 
 # If your site is available via HTTPS, make sure SITEURL begins with https://
-SITEURL = '{{siteurl}}'
+SITEURL = "{{siteurl}}"
 RELATIVE_URLS = False
 
-FEED_ALL_ATOM = 'feeds/all.atom.xml'
-CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml'
+FEED_ALL_ATOM = "feeds/all.atom.xml"
+CATEGORY_FEED_ATOM = "feeds/{slug}.atom.xml"
 
 DELETE_OUTPUT_DIRECTORY = True
 
 # Following items are often useful when publishing
 
-#DISQUS_SITENAME = ""
-#GOOGLE_ANALYTICS = ""
+# DISQUS_SITENAME = ""
+# GOOGLE_ANALYTICS = ""
diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index f3caed56..1a0f02d1 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 import shlex
 import shutil
@@ -14,61 +12,66 @@ from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import DEFAULT_CONFIG, get_settings_from_file
 
 OPEN_BROWSER_ON_SERVE = True
-SETTINGS_FILE_BASE = 'pelicanconf.py'
+SETTINGS_FILE_BASE = "pelicanconf.py"
 SETTINGS = {}
 SETTINGS.update(DEFAULT_CONFIG)
 LOCAL_SETTINGS = get_settings_from_file(SETTINGS_FILE_BASE)
 SETTINGS.update(LOCAL_SETTINGS)
 
 CONFIG = {
-    'settings_base': SETTINGS_FILE_BASE,
-    'settings_publish': 'publishconf.py',
+    "settings_base": SETTINGS_FILE_BASE,
+    "settings_publish": "publishconf.py",
     # Output path. Can be absolute or relative to tasks.py. Default: 'output'
-    'deploy_path': SETTINGS['OUTPUT_PATH'],
+    "deploy_path": SETTINGS["OUTPUT_PATH"],
 {% if ssh %}
     # Remote server configuration
-    'ssh_user': '{{ssh_user}}',
-    'ssh_host': '{{ssh_host}}',
-    'ssh_port': '{{ssh_port}}',
-    'ssh_path': '{{ssh_target_dir}}',
+    "ssh_user": "{{ssh_user}}",
+    "ssh_host": "{{ssh_host}}",
+    "ssh_port": "{{ssh_port}}",
+    "ssh_path": "{{ssh_target_dir}}",
 {% endif %}
 {% if cloudfiles %}
     # Rackspace Cloud Files configuration settings
-    'cloudfiles_username': '{{cloudfiles_username}}',
-    'cloudfiles_api_key': '{{cloudfiles_api_key}}',
-    'cloudfiles_container': '{{cloudfiles_container}}',
+    "cloudfiles_username": "{{cloudfiles_username}}",
+    "cloudfiles_api_key": "{{cloudfiles_api_key}}",
+    "cloudfiles_container": "{{cloudfiles_container}}",
 {% endif %}
 {% if github %}
     # Github Pages configuration
-    'github_pages_branch': '{{github_pages_branch}}',
-    'commit_message': "'Publish site on {}'".format(datetime.date.today().isoformat()),
+    "github_pages_branch": "{{github_pages_branch}}",
+    "commit_message": f"'Publish site on {datetime.date.today().isoformat()}'",
 {% endif %}
     # Host and port for `serve`
-    'host': 'localhost',
-    'port': 8000,
+    "host": "localhost",
+    "port": 8000,
 }
 
+
 @task
 def clean(c):
     """Remove generated files"""
-    if os.path.isdir(CONFIG['deploy_path']):
-        shutil.rmtree(CONFIG['deploy_path'])
-        os.makedirs(CONFIG['deploy_path'])
+    if os.path.isdir(CONFIG["deploy_path"]):
+        shutil.rmtree(CONFIG["deploy_path"])
+        os.makedirs(CONFIG["deploy_path"])
+
 
 @task
 def build(c):
     """Build local version of site"""
-    pelican_run('-s {settings_base}'.format(**CONFIG))
+    pelican_run("-s {settings_base}".format(**CONFIG))
+
 
 @task
 def rebuild(c):
     """`build` with the delete switch"""
-    pelican_run('-d -s {settings_base}'.format(**CONFIG))
+    pelican_run("-d -s {settings_base}".format(**CONFIG))
+
 
 @task
 def regenerate(c):
     """Automatically regenerate site upon file modification"""
-    pelican_run('-r -s {settings_base}'.format(**CONFIG))
+    pelican_run("-r -s {settings_base}".format(**CONFIG))
+
 
 @task
 def serve(c):
@@ -78,28 +81,32 @@ def serve(c):
         allow_reuse_address = True
 
     server = AddressReuseTCPServer(
-        CONFIG['deploy_path'],
-        (CONFIG['host'], CONFIG['port']),
-        ComplexHTTPRequestHandler)
+        CONFIG["deploy_path"],
+        (CONFIG["host"], CONFIG["port"]),
+        ComplexHTTPRequestHandler,
+    )
 
     if OPEN_BROWSER_ON_SERVE:
         # Open site in default browser
         import webbrowser
+
         webbrowser.open("http://{host}:{port}".format(**CONFIG))
 
-    sys.stderr.write('Serving at {host}:{port} ...\n'.format(**CONFIG))
+    sys.stderr.write("Serving at {host}:{port} ...\n".format(**CONFIG))
     server.serve_forever()
 
+
 @task
 def reserve(c):
     """`build`, then `serve`"""
     build(c)
     serve(c)
 
+
 @task
 def preview(c):
     """Build production version of site"""
-    pelican_run('-s {settings_publish}'.format(**CONFIG))
+    pelican_run("-s {settings_publish}".format(**CONFIG))
 
 @task
 def livereload(c):
@@ -107,25 +114,25 @@ def livereload(c):
     from livereload import Server
 
     def cached_build():
-        cmd = '-s {settings_base} -e CACHE_CONTENT=true LOAD_CONTENT_CACHE=true'
+        cmd = "-s {settings_base} -e CACHE_CONTENT=true LOAD_CONTENT_CACHE=true"
         pelican_run(cmd.format(**CONFIG))
 
     cached_build()
     server = Server()
-    theme_path = SETTINGS['THEME']
+    theme_path = SETTINGS["THEME"]
     watched_globs = [
-        CONFIG['settings_base'],
-        '{}/templates/**/*.html'.format(theme_path),
+        CONFIG["settings_base"],
+        f"{theme_path}/templates/**/*.html",
     ]
 
-    content_file_extensions = ['.md', '.rst']
+    content_file_extensions = [".md", ".rst"]
     for extension in content_file_extensions:
-        content_glob = '{0}/**/*{1}'.format(SETTINGS['PATH'], extension)
+        content_glob = "{}/**/*{}".format(SETTINGS["PATH"], extension)
         watched_globs.append(content_glob)
 
-    static_file_extensions = ['.css', '.js']
+    static_file_extensions = [".css", ".js"]
     for extension in static_file_extensions:
-        static_file_glob = '{0}/static/**/*{1}'.format(theme_path, extension)
+        static_file_glob = f"{theme_path}/static/**/*{extension}"
         watched_globs.append(static_file_glob)
 
     for glob in watched_globs:
@@ -134,43 +141,49 @@ def livereload(c):
     if OPEN_BROWSER_ON_SERVE:
         # Open site in default browser
         import webbrowser
+
         webbrowser.open("http://{host}:{port}".format(**CONFIG))
 
-    server.serve(host=CONFIG['host'], port=CONFIG['port'], root=CONFIG['deploy_path'])
+    server.serve(host=CONFIG["host"], port=CONFIG["port"], root=CONFIG["deploy_path"])
 
 {% if cloudfiles %}
 @task
 def cf_upload(c):
     """Publish to Rackspace Cloud Files"""
     rebuild(c)
-    with cd(CONFIG['deploy_path']):
-        c.run('swift -v -A https://auth.api.rackspacecloud.com/v1.0 '
-              '-U {cloudfiles_username} '
-              '-K {cloudfiles_api_key} '
-              'upload -c {cloudfiles_container} .'.format(**CONFIG))
+    with cd(CONFIG["deploy_path"]):
+        c.run(
+            "swift -v -A https://auth.api.rackspacecloud.com/v1.0 "
+            "-U {cloudfiles_username} "
+            "-K {cloudfiles_api_key} "
+            "upload -c {cloudfiles_container} .".format(**CONFIG)
+        )
 {% endif %}
 
 @task
 def publish(c):
     """Publish to production via rsync"""
-    pelican_run('-s {settings_publish}'.format(**CONFIG))
+    pelican_run("-s {settings_publish}".format(**CONFIG))
     c.run(
         'rsync --delete --exclude ".DS_Store" -pthrvz -c '
         '-e "ssh -p {ssh_port}" '
-        '{} {ssh_user}@{ssh_host}:{ssh_path}'.format(
-            CONFIG['deploy_path'].rstrip('/') + '/',
-            **CONFIG))
+        "{} {ssh_user}@{ssh_host}:{ssh_path}".format(
+            CONFIG["deploy_path"].rstrip("/") + "/", **CONFIG
+        )
+    )
 
 {% if github %}
 @task
 def gh_pages(c):
     """Publish to GitHub Pages"""
     preview(c)
-    c.run('ghp-import -b {github_pages_branch} '
-          '-m {commit_message} '
-          '{deploy_path} -p'.format(**CONFIG))
+    c.run(
+        "ghp-import -b {github_pages_branch} "
+        "-m {commit_message} "
+        "{deploy_path} -p".format(**CONFIG)
+    )
 {% endif %}
 
 def pelican_run(cmd):
-    cmd += ' ' + program.core.remainder  # allows to pass-through args to pelican
+    cmd += " " + program.core.remainder  # allows to pass-through args to pelican
     pelican_main(shlex.split(cmd))

From 2238dcab077eac83fb6855b2ab4914cb05882ca3 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Nov 2023 15:53:13 +0100
Subject: [PATCH 2655/2864] Ignore code format commits from `git blame`

---
 .git-blame-ignore-revs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 7b822fd3..0d92c9d9 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,7 @@
 # .git-blame-ignore-revs
 # Apply code style to project via: ruff format .
 cabdb26cee66e1173cf16cb31d3fe5f9fa4392e7
+# Upgrade code base for Python 3.8 and above
+ecd598f293161a52564aa6e8dfdcc8284dc93970
+# Apply Ruff and pyupgrade to Jinja templates
+db241feaa445375dc05e189e69287000ffe5fa8e

From 0c5d63c69ee53d1891644a6b97e96b36e5d8721e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Nov 2023 17:11:23 +0100
Subject: [PATCH 2656/2864] Update documentation related to contributing

---
 CONTRIBUTING.rst    | 28 ++++++++++------------------
 docs/contribute.rst |  4 +---
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index c1175aa4..4faace91 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -79,6 +79,10 @@ don't spend a lot of time working on something that would be rejected for a
 known reason. Consider also whether your new feature might be better suited as
 a ':pelican-doc:`plugins` — you can `ask for help`_  to make that determination.
 
+Also, if you intend to submit a pull request to address something for which there
+is no existing issue, there is no need to create a new issue and then immediately
+submit a pull request that closes it. You can submit the pull request by itself.
+
 Using Git and GitHub
 --------------------
 
@@ -87,7 +91,8 @@ Using Git and GitHub
 * **Don't put multiple unrelated fixes/features in the same branch / pull request.**
   For example, if you're working on a new feature and find a bugfix that
   doesn't *require* your new feature, **make a new distinct branch and pull
-  request** for the bugfix.
+  request** for the bugfix. Similarly, any proposed changes to code style
+  formatting should be in a completely separate pull request.
 * Add a ``RELEASE.md`` file in the root of the project that contains the
   release type (major, minor, patch) and a summary of the changes that will be
   used as the release changelog entry. For example::
@@ -106,15 +111,8 @@ Using Git and GitHub
   detailed explanation (when relevant).
 * `Squash your commits`_ to eliminate merge commits and ensure a clean and
   readable commit history.
-* If you have previously filed a GitHub issue and want to contribute code that
-  addresses that issue, **please use** ``hub pull-request`` instead of using
-  GitHub's web UI to submit the pull request. This isn't an absolute
-  requirement, but makes the maintainers' lives much easier! Specifically:
-  `install hub <https://github.com/github/hub/#installation>`_ and then run
-  `hub pull-request -i [ISSUE] <https://hub.github.com/hub-pull-request.1.html>`_
-  to turn your GitHub issue into a pull request containing your code.
 * After you have issued a pull request, the continuous integration (CI) system
-  will run the test suite for all supported Python versions and check for PEP8
+  will run the test suite on all supported Python versions and check for code style
   compliance. If any of these checks fail, you should fix them. (If tests fail
   on the CI system but seem to pass locally, ensure that local test runs aren't
   skipping any tests.)
@@ -122,13 +120,7 @@ Using Git and GitHub
 Contribution quality standards
 ------------------------------
 
-* Adhere to `PEP8 coding standards`_. This can be eased via the `pycodestyle
-  <https://pypi.org/project/pycodestyle>`_ or `flake8
-  <https://pypi.org/project/flake8/>`_ tools, the latter of which in
-  particular will give you some useful hints about ways in which the
-  code/formatting can be improved. We try to keep line length within the
-  79-character maximum specified by PEP8. Because that can sometimes compromise
-  readability, the hard/enforced maximum is 88 characters.
+* Adhere to the project's code style standards. See: `Development Environment`_
 * Ensure your code is compatible with the `officially-supported Python releases`_.
 * Add docs and tests for your changes. Undocumented and untested features will
   not be accepted.
@@ -142,6 +134,6 @@ need assistance or have any questions about these guidelines.
 .. _`Create a new branch`: https://github.com/getpelican/pelican/wiki/Git-Tips#making-your-changes
 .. _`Squash your commits`: https://github.com/getpelican/pelican/wiki/Git-Tips#squashing-commits
 .. _`Git Tips`: https://github.com/getpelican/pelican/wiki/Git-Tips
-.. _`PEP8 coding standards`: https://www.python.org/dev/peps/pep-0008/
 .. _`ask for help`: `How to get help`_
-.. _`officially-supported Python releases`: https://devguide.python.org/#status-of-python-branches
+.. _`Development Environment`: https://docs.getpelican.com/en/latest/contribute.html#setting-up-the-development-environment
+.. _`officially-supported Python releases`: https://devguide.python.org/versions/#versions
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 33a62064..6a5a417e 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -46,7 +46,6 @@ Install the needed dependencies and set up the project::
 
     python -m pip install invoke
     invoke setup
-    python -m pip install -e ~/projects/pelican
 
 Your local environment should now be ready to go!
 
@@ -159,8 +158,7 @@ check for code style compliance via::
 
 If style violations are found, many of them can be addressed automatically via::
 
-    invoke black
-    invoke isort
+    invoke format
 
 If style violations are found even after running the above auto-formatters,
 you will need to make additional manual changes until ``invoke lint`` no longer

From 86d689851793e61b0cee1fe0bf72c8ebc991b6c1 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 12 Nov 2023 19:43:26 +0300
Subject: [PATCH 2657/2864] remove WRITE_SELECTED

Implementation is buggy and unreliable. Therefore, it is better to
remove the functionality until a robust implementation is added.
---
 docs/faq.rst                  |  4 ----
 docs/publish.rst              | 12 ------------
 docs/settings.rst             | 22 ----------------------
 pelican/__init__.py           | 11 -----------
 pelican/settings.py           | 14 +++++++-------
 pelican/tests/test_pelican.py | 23 -----------------------
 pelican/utils.py              | 13 -------------
 pelican/writers.py            | 12 +-----------
 8 files changed, 8 insertions(+), 103 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index c065b4ed..cecc1157 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -217,10 +217,6 @@ changed. A simple solution is to make ``rsync`` use the ``--checksum`` option,
 which will make it compare the file checksums in a much faster way than Pelican
 would.
 
-When only several specific output files are of interest (e.g. when working on
-some specific page or the theme templates), the ``WRITE_SELECTED`` option may
-help, see :ref:`writing_only_selected_content`.
-
 How to process only a subset of all articles?
 =============================================
 
diff --git a/docs/publish.rst b/docs/publish.rst
index f5ebfff5..e687b65a 100644
--- a/docs/publish.rst
+++ b/docs/publish.rst
@@ -18,18 +18,6 @@ folder, using the default theme to produce a simple site. The default theme
 consists of very simple HTML without styling and is provided so folks may use
 it as a basis for creating their own themes.
 
-When working on a single article or page, it is possible to generate only the
-file that corresponds to that content. To do this, use the ``--write-selected``
-argument, like so::
-
-    pelican --write-selected output/posts/my-post-title.html
-
-Note that you must specify the path to the generated *output* file — not the
-source content. To determine the output file name and location, use the
-``--debug`` flag. If desired, ``--write-selected`` can take a comma-separated
-list of paths or can be configured as a setting. (See:
-:ref:`writing_only_selected_content`)
-
 You can also tell Pelican to watch for your modifications, instead of manually
 re-running it every time you want to see your changes. To enable this, run the
 ``pelican`` command with the ``-r`` or ``--autoreload`` option. On non-Windows
diff --git a/docs/settings.rst b/docs/settings.rst
index 88a32d23..e9edffde 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -362,13 +362,6 @@ Basic settings
 
    If ``True``, load unmodified content from caches.
 
-.. data:: WRITE_SELECTED = []
-
-   If this list is not empty, **only** output files with their paths in this
-   list are written. Paths should be either absolute or relative to the current
-   Pelican working directory. For possible use cases see
-   :ref:`writing_only_selected_content`.
-
 .. data:: FORMATTED_FIELDS = ['summary']
 
    A list of metadata fields containing reST/Markdown content to be parsed and
@@ -1400,21 +1393,6 @@ modification times of the generated ``*.html`` files will always change.
 Therefore, ``rsync``-based uploading may benefit from the ``--checksum``
 option.
 
-.. _writing_only_selected_content:
-
-
-Writing only selected content
-=============================
-
-When only working on a single article or page, or making tweaks to your theme,
-it is often desirable to generate and review your work as quickly as possible.
-In such cases, generating and writing the entire site output is often
-unnecessary. By specifying only the desired files as output paths in the
-``WRITE_SELECTED`` list, **only** those files will be written. This list can be
-also specified on the command line using the ``--write-selected`` option, which
-accepts a comma-separated list of output file paths. By default this list is
-empty, so all output is written. See :ref:`site_generation` for more details.
-
 
 Example settings
 ================
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 25c493b9..a25f5624 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -434,15 +434,6 @@ def parse_arguments(argv=None):
         help="Ignore content cache " "from previous runs by not loading cache files.",
     )
 
-    parser.add_argument(
-        "-w",
-        "--write-selected",
-        type=str,
-        dest="selected_paths",
-        default=None,
-        help="Comma separated list of selected paths to write",
-    )
-
     parser.add_argument(
         "--fatal",
         metavar="errors|warnings",
@@ -527,8 +518,6 @@ def get_config(args):
         config["LOAD_CONTENT_CACHE"] = False
     if args.cache_path:
         config["CACHE_PATH"] = args.cache_path
-    if args.selected_paths:
-        config["WRITE_SELECTED"] = args.selected_paths.split(",")
     if args.relative_paths:
         config["RELATIVE_URLS"] = args.relative_paths
     if args.port is not None:
diff --git a/pelican/settings.py b/pelican/settings.py
index 4a4f2901..33ec210a 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -169,7 +169,6 @@ DEFAULT_CONFIG = {
     "GZIP_CACHE": True,
     "CHECK_MODIFIED_METHOD": "mtime",
     "LOAD_CONTENT_CACHE": False,
-    "WRITE_SELECTED": [],
     "FORMATTED_FIELDS": ["summary"],
     "PORT": 8000,
     "BIND": "127.0.0.1",
@@ -557,6 +556,13 @@ def handle_deprecated_settings(settings):
             )
             settings[old] = settings[new]
 
+    # Warn if removed WRITE_SELECTED is present
+    if "WRITE_SELECTED" in settings:
+        logger.warning(
+            "WRITE_SELECTED is present in settings but this functionality was removed. "
+            "It will have no effect."
+        )
+
     return settings
 
 
@@ -585,12 +591,6 @@ def configure_settings(settings):
         else:
             raise Exception("Could not find the theme %s" % settings["THEME"])
 
-    # make paths selected for writing absolute if necessary
-    settings["WRITE_SELECTED"] = [
-        os.path.abspath(path)
-        for path in settings.get("WRITE_SELECTED", DEFAULT_CONFIG["WRITE_SELECTED"])
-    ]
-
     # standardize strings to lowercase strings
     for key in ["DEFAULT_LANG"]:
         if key in settings:
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 3c0c0572..075f55eb 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -202,29 +202,6 @@ class TestPelican(LoggedTestCase):
         for file in ["a_stylesheet", "a_template"]:
             self.assertTrue(os.path.exists(os.path.join(theme_output, file)))
 
-    def test_write_only_selected(self):
-        """Test that only the selected files are written"""
-        settings = read_settings(
-            path=None,
-            override={
-                "PATH": INPUT_PATH,
-                "OUTPUT_PATH": self.temp_path,
-                "CACHE_PATH": self.temp_cache,
-                "WRITE_SELECTED": [
-                    os.path.join(self.temp_path, "oh-yeah.html"),
-                    os.path.join(self.temp_path, "categories.html"),
-                ],
-                "LOCALE": locale.normalize("en_US"),
-            },
-        )
-        pelican = Pelican(settings=settings)
-        logger = logging.getLogger()
-        orig_level = logger.getEffectiveLevel()
-        logger.setLevel(logging.INFO)
-        mute(True)(pelican.run)()
-        logger.setLevel(orig_level)
-        self.assertLogCountEqual(count=2, msg="Writing .*", level=logging.INFO)
-
     def test_cyclic_intersite_links_no_warnings(self):
         settings = read_settings(
             path=None,
diff --git a/pelican/utils.py b/pelican/utils.py
index 02ffb9d1..eda53d3f 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -840,19 +840,6 @@ def split_all(path):
         )
 
 
-def is_selected_for_writing(settings, path):
-    """Check whether path is selected for writing
-    according to the WRITE_SELECTED list
-
-    If WRITE_SELECTED is an empty list (default),
-    any path is selected for writing.
-    """
-    if settings["WRITE_SELECTED"]:
-        return path in settings["WRITE_SELECTED"]
-    else:
-        return True
-
-
 def path_to_file_url(path):
     """Convert file-system path to file:// URL"""
     return urllib.parse.urljoin("file://", urllib.request.pathname2url(path))
diff --git a/pelican/writers.py b/pelican/writers.py
index ec12d125..d405fc88 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -11,7 +11,6 @@ from pelican.paginator import Paginator
 from pelican.plugins import signals
 from pelican.utils import (
     get_relative_path,
-    is_selected_for_writing,
     path_to_url,
     sanitised_join,
     set_date_tzinfo,
@@ -145,9 +144,6 @@ class Writer:
             name should be skipped to keep that one)
         :param feed_title: the title of the feed.o
         """
-        if not is_selected_for_writing(self.settings, path):
-            return
-
         self.site_url = context.get("SITEURL", path_to_url(get_relative_path(path)))
 
         self.feed_domain = context.get("FEED_DOMAIN")
@@ -203,13 +199,7 @@ class Writer:
         :param **kwargs: additional variables to pass to the templates
         """
 
-        if (
-            name is False
-            or name == ""
-            or not is_selected_for_writing(
-                self.settings, os.path.join(self.output_path, name)
-            )
-        ):
+        if name is False or name == "":
             return
         elif not name:
             # other stuff, just return for now

From 7ca66ee9d0ac672e88c845d347457be7ad4def41 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 12 Nov 2023 18:03:36 +0100
Subject: [PATCH 2658/2864] Prepare release

---
 RELEASE.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..33991cb6
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,21 @@
+Release type: minor
+
+* Upgrade code to new minimum supported Python version: 3.8
+* Settings support for ``pathlib.Path`` `(#2758) <https://github.com/getpelican/pelican/pull/2758>`_
+* Various improvements to Simple theme (`#2976 <https://github.com/getpelican/pelican/pull/2976>`_ & `#3234 <https://github.com/getpelican/pelican/pull/3234>`_)
+* Use Furo as Sphinx documentation theme `(#3023) <https://github.com/getpelican/pelican/pull/3023>`_
+* Default to 100 articles maximum in feeds `(#3127) <https://github.com/getpelican/pelican/pull/3127>`_
+* Add ``period_archives common context`` variable `(#3148) <https://github.com/getpelican/pelican/pull/3148>`_
+* Use ``watchfiles`` as the file-watching backend `(#3151) <https://github.com/getpelican/pelican/pull/3151>`_
+* Add GitHub Actions workflow for GitHub Pages `(#3189) <https://github.com/getpelican/pelican/pull/3189>`_
+* Allow dataclasses in settings `(#3204) <https://github.com/getpelican/pelican/pull/3204>`_
+* Switch build tool to PDM instead of Setuptools/Poetry `(#3220) <https://github.com/getpelican/pelican/pull/3220>`_
+* Provide a ``plugin_enabled`` Jinja test for themes `(#3235) <https://github.com/getpelican/pelican/pull/3235>`_
+* Preserve connection order in Blinker `(#3238) <https://github.com/getpelican/pelican/pull/3238>`_
+* Remove social icons from default ``notmyidea`` theme `(#3240) <https://github.com/getpelican/pelican/pull/3240>`_
+* Remove unreliable ``WRITE_SELECTED`` feature `(#3243) <https://github.com/getpelican/pelican/pull/3243>`_
+* Importer: Report broken embedded video links when importing from Tumblr `(#3177) <https://github.com/getpelican/pelican/issues/3177>`_
+* Importer: Remove newline addition when iterating Photo post types `(#3178) <https://github.com/getpelican/pelican/issues/3178>`_
+* Importer: Force timestamp conversion in Tumblr importer to be UTC with offset `(#3221) <https://github.com/getpelican/pelican/pull/3221>`_
+* Importer: Use tempfile for intermediate HTML file for Pandoc `(#3221) <https://github.com/getpelican/pelican/pull/3221>`_
+* Switch linters to Ruff `(#3223) <https://github.com/getpelican/pelican/pull/3223>`_

From 6cd707a66893a7ed509d982639cd4e7a2bc8cf9c Mon Sep 17 00:00:00 2001
From: botpub <52496925+botpub@users.noreply.github.com>
Date: Sun, 12 Nov 2023 17:44:45 +0000
Subject: [PATCH 2659/2864] Release Pelican 4.9.0

---
 RELEASE.md         | 21 ---------------------
 docs/changelog.rst | 23 +++++++++++++++++++++++
 pyproject.toml     |  2 +-
 3 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 33991cb6..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Release type: minor
-
-* Upgrade code to new minimum supported Python version: 3.8
-* Settings support for ``pathlib.Path`` `(#2758) <https://github.com/getpelican/pelican/pull/2758>`_
-* Various improvements to Simple theme (`#2976 <https://github.com/getpelican/pelican/pull/2976>`_ & `#3234 <https://github.com/getpelican/pelican/pull/3234>`_)
-* Use Furo as Sphinx documentation theme `(#3023) <https://github.com/getpelican/pelican/pull/3023>`_
-* Default to 100 articles maximum in feeds `(#3127) <https://github.com/getpelican/pelican/pull/3127>`_
-* Add ``period_archives common context`` variable `(#3148) <https://github.com/getpelican/pelican/pull/3148>`_
-* Use ``watchfiles`` as the file-watching backend `(#3151) <https://github.com/getpelican/pelican/pull/3151>`_
-* Add GitHub Actions workflow for GitHub Pages `(#3189) <https://github.com/getpelican/pelican/pull/3189>`_
-* Allow dataclasses in settings `(#3204) <https://github.com/getpelican/pelican/pull/3204>`_
-* Switch build tool to PDM instead of Setuptools/Poetry `(#3220) <https://github.com/getpelican/pelican/pull/3220>`_
-* Provide a ``plugin_enabled`` Jinja test for themes `(#3235) <https://github.com/getpelican/pelican/pull/3235>`_
-* Preserve connection order in Blinker `(#3238) <https://github.com/getpelican/pelican/pull/3238>`_
-* Remove social icons from default ``notmyidea`` theme `(#3240) <https://github.com/getpelican/pelican/pull/3240>`_
-* Remove unreliable ``WRITE_SELECTED`` feature `(#3243) <https://github.com/getpelican/pelican/pull/3243>`_
-* Importer: Report broken embedded video links when importing from Tumblr `(#3177) <https://github.com/getpelican/pelican/issues/3177>`_
-* Importer: Remove newline addition when iterating Photo post types `(#3178) <https://github.com/getpelican/pelican/issues/3178>`_
-* Importer: Force timestamp conversion in Tumblr importer to be UTC with offset `(#3221) <https://github.com/getpelican/pelican/pull/3221>`_
-* Importer: Use tempfile for intermediate HTML file for Pandoc `(#3221) <https://github.com/getpelican/pelican/pull/3221>`_
-* Switch linters to Ruff `(#3223) <https://github.com/getpelican/pelican/pull/3223>`_
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 88353ed4..98da5b20 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,29 @@
 Release history
 ###############
 
+4.9.0 - 2023-11-12
+==================
+
+* Upgrade code to new minimum supported Python version: 3.8
+* Settings support for ``pathlib.Path`` `(#2758) <https://github.com/getpelican/pelican/pull/2758>`_
+* Various improvements to Simple theme (`#2976 <https://github.com/getpelican/pelican/pull/2976>`_ & `#3234 <https://github.com/getpelican/pelican/pull/3234>`_)
+* Use Furo as Sphinx documentation theme `(#3023) <https://github.com/getpelican/pelican/pull/3023>`_
+* Default to 100 articles maximum in feeds `(#3127) <https://github.com/getpelican/pelican/pull/3127>`_
+* Add ``period_archives common context`` variable `(#3148) <https://github.com/getpelican/pelican/pull/3148>`_
+* Use ``watchfiles`` as the file-watching backend `(#3151) <https://github.com/getpelican/pelican/pull/3151>`_
+* Add GitHub Actions workflow for GitHub Pages `(#3189) <https://github.com/getpelican/pelican/pull/3189>`_
+* Allow dataclasses in settings `(#3204) <https://github.com/getpelican/pelican/pull/3204>`_
+* Switch build tool to PDM instead of Setuptools/Poetry `(#3220) <https://github.com/getpelican/pelican/pull/3220>`_
+* Provide a ``plugin_enabled`` Jinja test for themes `(#3235) <https://github.com/getpelican/pelican/pull/3235>`_
+* Preserve connection order in Blinker `(#3238) <https://github.com/getpelican/pelican/pull/3238>`_
+* Remove social icons from default ``notmyidea`` theme `(#3240) <https://github.com/getpelican/pelican/pull/3240>`_
+* Remove unreliable ``WRITE_SELECTED`` feature `(#3243) <https://github.com/getpelican/pelican/pull/3243>`_
+* Importer: Report broken embedded video links when importing from Tumblr `(#3177) <https://github.com/getpelican/pelican/issues/3177>`_
+* Importer: Remove newline addition when iterating Photo post types `(#3178) <https://github.com/getpelican/pelican/issues/3178>`_
+* Importer: Force timestamp conversion in Tumblr importer to be UTC with offset `(#3221) <https://github.com/getpelican/pelican/pull/3221>`_
+* Importer: Use tempfile for intermediate HTML file for Pandoc `(#3221) <https://github.com/getpelican/pelican/pull/3221>`_
+* Switch linters to Ruff `(#3223) <https://github.com/getpelican/pelican/pull/3223>`_
+
 4.8.0 - 2022-07-11
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index d40e6bce..e0e118f5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 name = "pelican"
 authors = [{ name = "Justin Mayer", email = "authors@getpelican.com" }]
 description = "Static site generator supporting Markdown and reStructuredText"
-version = "4.8.0"
+version = "4.9.0"
 license = { text = "AGPLv3" }
 readme = "README.rst"
 keywords = ["static site generator", "static sites", "ssg"]

From 1d0fd456e875d743516b56458ab9767511f3e5d3 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Mon, 13 Nov 2023 12:18:41 -0700
Subject: [PATCH 2660/2864] Add `tzdata` requirement on Windows

---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index e0e118f5..cf3c23c0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,6 +40,7 @@ dependencies = [
     "unidecode>=1.3.7",
     "backports-zoneinfo>=0.2.1; python_version < \"3.9\"",
     "watchfiles>=0.21.0",
+    "tzdata; sys_platform == 'win32'",
 ]
 
 [project.optional-dependencies]

From a2525f7db442e99c4210c07aed9e4a04afb494be Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Mon, 13 Nov 2023 14:42:29 -0700
Subject: [PATCH 2661/2864] Remove `tzdata` from testing requirements. Should
 be installed by pelican directly, if needed, based on OS.

---
 requirements/test.pip | 1 -
 1 file changed, 1 deletion(-)

diff --git a/requirements/test.pip b/requirements/test.pip
index 87869e67..8eb1029f 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -3,7 +3,6 @@ Pygments==2.14.0
 pytest
 pytest-cov
 pytest-xdist[psutil]
-tzdata
 
 # Optional Packages
 Markdown==3.5.1

From f510b4b21f8c7d707eb42d6261d910e327b71bc0 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 15 Nov 2023 17:52:41 +0100
Subject: [PATCH 2662/2864] Remove reference to non-existent requirements file

---
 requirements/developer.pip | 1 -
 1 file changed, 1 deletion(-)

diff --git a/requirements/developer.pip b/requirements/developer.pip
index 5c2f5a69..58b2a1dc 100644
--- a/requirements/developer.pip
+++ b/requirements/developer.pip
@@ -1,3 +1,2 @@
 -r test.pip
 -r docs.pip
--r style.pip

From 76f7343b6149e300dc014fd9128f6f4214099b91 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 15 Nov 2023 18:08:10 +0100
Subject: [PATCH 2663/2864] Prepare release

---
 RELEASE.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..b61180cb
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,3 @@
+Release type: patch
+
+* Ensure ``tzdata`` dependency is installed on Windows

From 7194cf579571dbbca85faad5bace71627c56152d Mon Sep 17 00:00:00 2001
From: botpub <52496925+botpub@users.noreply.github.com>
Date: Wed, 15 Nov 2023 17:16:23 +0000
Subject: [PATCH 2664/2864] Release Pelican 4.9.1

---
 RELEASE.md         | 3 ---
 docs/changelog.rst | 5 +++++
 pyproject.toml     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index b61180cb..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Release type: patch
-
-* Ensure ``tzdata`` dependency is installed on Windows
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 98da5b20..5ef19b17 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ###############
 
+4.9.1 - 2023-11-15
+==================
+
+* Ensure ``tzdata`` dependency is installed on Windows
+
 4.9.0 - 2023-11-12
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index cf3c23c0..c8bbe985 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 name = "pelican"
 authors = [{ name = "Justin Mayer", email = "authors@getpelican.com" }]
 description = "Static site generator supporting Markdown and reStructuredText"
-version = "4.9.0"
+version = "4.9.1"
 license = { text = "AGPLv3" }
 readme = "README.rst"
 keywords = ["static site generator", "static sites", "ssg"]

From d9b2bc3a4ea9f11aea58180aaaea69cc95db1f8c Mon Sep 17 00:00:00 2001
From: Vivek Bharadwaj <67718556+vbharadwaj-bk@users.noreply.github.com>
Date: Sun, 19 Nov 2023 01:48:13 -0800
Subject: [PATCH 2665/2864] Add GH pages action to fix file permissions (#3248)

---
 .github/workflows/github_pages.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index ccf172b4..7eae170a 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -44,6 +44,11 @@ jobs:
             --settings "${{ inputs.settings }}" \
             --extra-settings SITEURL='"${{ steps.pages.outputs.base_url }}"' \
             --output "${{ inputs.output-path }}"
+      - name: Fix permissions
+        run: |
+          chmod -c -R +rX "${{ inputs.output-path }}" | while read line; do
+            echo "::warning title=Invalid file permissions automatically fixed::$line"
+          done
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v2
         with:

From 7466b13e0a6c2f0a19ee7b8640adfbd8a7a8ec9e Mon Sep 17 00:00:00 2001
From: Salar Nosrati-Ershad <s3r@tutamail.com>
Date: Wed, 22 Nov 2023 22:54:30 +0330
Subject: [PATCH 2666/2864] fix: keep newline at the end of the file in tools
 As referenced in Jinja documentation about whitespace control:
 <https://jinja.palletsprojects.com/en/3.1.x/templates/#whitespace-control> > 
 To keep single trailing newlines, configure Jinja to > 
 `keep_trailing_newline` I added this to our Jinja environment to keep EOL new
 line in tools scripts

---
 RELEASE.md                          | 3 +++
 pelican/tools/pelican_quickstart.py | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..7881aeac
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,3 @@
+Release type: patch
+
+Keep the newline at the end of the file in generating tools scripts
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index db00ce70..a4dc98e1 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -44,6 +44,7 @@ _TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templ
 _jinja_env = Environment(
     loader=FileSystemLoader(_TEMPLATES_DIR),
     trim_blocks=True,
+    keep_trailing_newline=True,
 )
 
 

From 4ed5c0d5b87e7711e779be6a26c4a1d9ad21aeaa Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Sat, 25 Nov 2023 20:57:40 -0700
Subject: [PATCH 2667/2864] Log the original calling location, rather than the
 wrapper function

---
 pelican/log.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index 0d2b6a3f..befecbf1 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -85,13 +85,15 @@ class FatalLogger(LimitLogger):
     warnings_fatal = False
     errors_fatal = False
 
+    # adding `stacklevel=2` means that the displayed filename and line number
+    # will match the "original" calling location, rather than the wrapper here
     def warning(self, *args, **kwargs):
-        super().warning(*args, **kwargs)
+        super().warning(*args, stacklevel=2, **kwargs)
         if FatalLogger.warnings_fatal:
             raise RuntimeError("Warning encountered")
 
     def error(self, *args, **kwargs):
-        super().error(*args, **kwargs)
+        super().error(*args, stacklevel=2, **kwargs)
         if FatalLogger.errors_fatal:
             raise RuntimeError("Error encountered")
 

From 61eacffa90760c1323aaac15dc6829412e08d2a8 Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre <paolo@melchiorre.org>
Date: Tue, 28 Nov 2023 21:38:26 +0100
Subject: [PATCH 2668/2864] Update tox and GitHub pipeline

---
 .github/workflows/github_pages.yml |  2 +-
 .github/workflows/main.yml         | 18 +++++++++---------
 tox.ini                            |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index 7eae170a..eb9e955f 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c29a08c2..cd646522 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
             python: "3.9"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v4
         with:
@@ -52,10 +52,10 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: pdm-project/setup-pdm@v3
         with:
-          python-version: 3.9
+          python-version: "3.11"
           cache: true
           cache-dependency-path: ./pyproject.toml
       - name: Install dependencies
@@ -70,10 +70,10 @@ jobs:
     name: Test build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: pdm-project/setup-pdm@v3
         with:
-          python-version: 3.9
+          python-version: "3.11"
           cache: true
           cache-dependency-path: ./pyproject.toml
       - name: Install dependencies
@@ -88,11 +88,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
           cache: "pip"
           cache-dependency-path: "**/requirements/*"
       - name: Install tox
@@ -117,14 +117,14 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_TOKEN }}
 
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
 
       - name: Check release
         id: check_release
diff --git a/tox.ini b/tox.ini
index f6f45af1..61e8908a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.8,3.9,3.10,3.11.3.12},docs
+envlist = py{3.8,3.9,3.10,3.11,3.12},docs
 
 [testenv]
 basepython =
@@ -18,7 +18,7 @@ commands =
     pytest -s --cov=pelican pelican
 
 [testenv:docs]
-basepython = python3.9
+basepython = python3.11
 deps =
     -rrequirements/docs.pip
 changedir = docs

From 8626d5bd85da049e7ca7828a785d08e02b736aa1 Mon Sep 17 00:00:00 2001
From: Raphael Das Gupta <github.com@raphael.dasgupta.ch>
Date: Fri, 22 Dec 2023 15:56:57 +0100
Subject: [PATCH 2669/2864] docs: update URL to AsciiDoc website

https://www.methods.co.nz/asciidoc/
gives a SSL certificate warning
and a 404 (page not found) error.
https://asciidoc.org is the new official website
for the AsciiDoc file format.
(It's also what https://en.wikipedia.org/wiki/AsciiDoc links to.)
---
 docs/content.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/content.rst b/docs/content.rst
index cacacea9..8a5d9b32 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -631,7 +631,7 @@ are not included by default in tag, category, and author indexes, nor in the
 main article feed. This has the effect of creating an "unlisted" post.
 
 .. _W3C ISO 8601: https://www.w3.org/TR/NOTE-datetime
-.. _AsciiDoc: https://www.methods.co.nz/asciidoc/
+.. _AsciiDoc: https://asciidoc.org
 .. _Pelican Plugins: https://github.com/pelican-plugins
 .. _pelican-plugins: https://github.com/getpelican/pelican-plugins
 .. _Python-Markdown: https://github.com/Python-Markdown/markdown

From f0beb81a973f44ed1c8704984bc325b5f4df095c Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Sun, 14 Jan 2024 13:45:51 -0700
Subject: [PATCH 2670/2864] Better error logging if a plugin refuses to load

---
 pelican/__init__.py | 3 ++-
 pelican/log.py      | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index a25f5624..40251887 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -80,7 +80,8 @@ class Pelican:
                 plugin.register()
                 self.plugins.append(plugin)
             except Exception as e:
-                logger.error("Cannot register plugin `%s`\n%s", name, e)
+                logger.error("Cannot register plugin `%s`\n%s", name, e, stacklevel=3)
+                print(e.stacktrace)
 
         self.settings["PLUGINS"] = [get_plugin_name(p) for p in self.plugins]
 
diff --git a/pelican/log.py b/pelican/log.py
index befecbf1..6a8fcdf1 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -88,12 +88,16 @@ class FatalLogger(LimitLogger):
     # adding `stacklevel=2` means that the displayed filename and line number
     # will match the "original" calling location, rather than the wrapper here
     def warning(self, *args, **kwargs):
-        super().warning(*args, stacklevel=2, **kwargs)
+        if "stacklevel" not in kwargs.keys():
+            kwargs["stacklevel"] = 2
+        super().warning(*args, **kwargs)
         if FatalLogger.warnings_fatal:
             raise RuntimeError("Warning encountered")
 
     def error(self, *args, **kwargs):
-        super().error(*args, stacklevel=2, **kwargs)
+        if "stacklevel" not in kwargs.keys():
+            kwargs["stacklevel"] = 2
+        super().error(*args, **kwargs)
         if FatalLogger.errors_fatal:
             raise RuntimeError("Error encountered")
 

From f69e2cca6b5d26c8a6b2f3f4444a2c3de2e2d202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ricks@greenbone.net>
Date: Sun, 17 Dec 2023 13:56:33 +0100
Subject: [PATCH 2671/2864] Add type hints for settings module

Types make it easier to understand the code and improve autocompletion
in IDEs.
---
 pelican/settings.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 33ec210a..29051ddb 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -8,11 +8,13 @@ import re
 import sys
 from os.path import isabs
 from pathlib import Path
+from types import ModuleType
+from typing import Any, Dict, Optional
 
 from pelican.log import LimitFilter
 
 
-def load_source(name, path):
+def load_source(name: str, path: str) -> ModuleType:
     spec = importlib.util.spec_from_file_location(name, path)
     mod = importlib.util.module_from_spec(spec)
     sys.modules[name] = mod
@@ -22,6 +24,8 @@ def load_source(name, path):
 
 logger = logging.getLogger(__name__)
 
+Settings = Dict[str, Any]
+
 DEFAULT_THEME = os.path.join(
     os.path.dirname(os.path.abspath(__file__)), "themes", "notmyidea"
 )
@@ -177,7 +181,9 @@ DEFAULT_CONFIG = {
 PYGMENTS_RST_OPTIONS = None
 
 
-def read_settings(path=None, override=None):
+def read_settings(
+    path: Optional[str] = None, override: Optional[Settings] = None
+) -> Settings:
     settings = override or {}
 
     if path:
@@ -221,7 +227,7 @@ def read_settings(path=None, override=None):
     return settings
 
 
-def get_settings_from_module(module=None):
+def get_settings_from_module(module: Optional[ModuleType] = None) -> Settings:
     """Loads settings from a module, returns a dictionary."""
 
     context = {}
@@ -230,7 +236,7 @@ def get_settings_from_module(module=None):
     return context
 
 
-def get_settings_from_file(path):
+def get_settings_from_file(path: str) -> Settings:
     """Loads settings from a file path, returning a dict."""
 
     name, ext = os.path.splitext(os.path.basename(path))
@@ -238,7 +244,7 @@ def get_settings_from_file(path):
     return get_settings_from_module(module)
 
 
-def get_jinja_environment(settings):
+def get_jinja_environment(settings: Settings) -> Settings:
     """Sets the environment for Jinja"""
 
     jinja_env = settings.setdefault(
@@ -253,7 +259,7 @@ def get_jinja_environment(settings):
     return settings
 
 
-def _printf_s_to_format_field(printf_string, format_field):
+def _printf_s_to_format_field(printf_string: str, format_field: str) -> str:
     """Tries to replace %s with {format_field} in the provided printf_string.
     Raises ValueError in case of failure.
     """
@@ -269,7 +275,7 @@ def _printf_s_to_format_field(printf_string, format_field):
     return result
 
 
-def handle_deprecated_settings(settings):
+def handle_deprecated_settings(settings: Settings) -> Settings:
     """Converts deprecated settings and issues warnings. Issues an exception
     if both old and new setting is specified.
     """
@@ -566,7 +572,7 @@ def handle_deprecated_settings(settings):
     return settings
 
 
-def configure_settings(settings):
+def configure_settings(settings: Settings) -> Settings:
     """Provide optimizations, error checking, and warnings for the given
     settings.
     Also, specify the log messages to be ignored.

From bf4fd679a5322433cc4313a80cac49d4ed6c348f Mon Sep 17 00:00:00 2001
From: boxydog <93335439+boxydog@users.noreply.github.com>
Date: Mon, 15 Jan 2024 03:43:19 -0600
Subject: [PATCH 2672/2864] Document how to import posts from Medium (#3262)

---
 docs/importer.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/importer.rst b/docs/importer.rst
index 997a4632..08092984 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -26,6 +26,12 @@ not be converted (as Pelican also supports Markdown).
    manually, or use a plugin such as `More Categories`_ that enables multiple
    categories per article.
 
+.. note::
+
+   Imported pages may contain links to images that still point to the original site.
+   So you might want to download those images into your local content and manually
+   re-link them from the relevant pages of your site.
+
 Dependencies
 ============
 
@@ -121,6 +127,15 @@ For WordPress::
 
     $ pelican-import --wpfile -o ~/output ~/posts.xml
 
+For Medium (an example of using an RSS feed):
+
+    $ python -m pip install feedparser
+    $ pelican-import --feed https://medium.com/feed/@username
+
+.. note::
+
+   The RSS feed may only return the most recent posts — not all of them.
+
 Tests
 =====
 

From 5e6dba73acfd6a85560d82870d1cda9d184c3cb5 Mon Sep 17 00:00:00 2001
From: Salar Nosrati-Ershad <s3r@tutamail.com>
Date: Mon, 15 Jan 2024 13:33:54 +0330
Subject: [PATCH 2673/2864] Add Github Pages commit message variable (#3250)

---
 pelican/tools/templates/Makefile.jinja2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 93ab1aa7..1e9dbff5 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -37,6 +37,7 @@ DROPBOX_DIR={{dropbox_dir}}
 {% endif %}
 {% if github %}
 GITHUB_PAGES_BRANCH={{github_pages_branch}}
+GITHUB_PAGES_COMMIT_MESSAGE=Generate Pelican site
 
 {% endif %}
 
@@ -161,7 +162,7 @@ cf_upload: publish
 {% if github %}
 {% set upload = upload + ["github"] %}
 github: publish
-	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) "$(OUTPUTDIR)"
+	ghp-import -m "$(GITHUB_PAGES_COMMIT_MESSAGE)" -b $(GITHUB_PAGES_BRANCH) "$(OUTPUTDIR)"
 	git push origin $(GITHUB_PAGES_BRANCH)
 
 {% endif %}

From b1cb6c7326e32afba373113b86d823d46f94a812 Mon Sep 17 00:00:00 2001
From: Salar Nosrati-Ershad <s3r@tutamail.com>
Date: Mon, 15 Jan 2024 13:40:12 +0330
Subject: [PATCH 2674/2864] Use `--no-jekyll` flag when invoking `ghp-import`
 (#3259)

---
 pelican/tools/templates/Makefile.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 1e9dbff5..67571b47 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -162,7 +162,7 @@ cf_upload: publish
 {% if github %}
 {% set upload = upload + ["github"] %}
 github: publish
-	ghp-import -m "$(GITHUB_PAGES_COMMIT_MESSAGE)" -b $(GITHUB_PAGES_BRANCH) "$(OUTPUTDIR)"
+	ghp-import -m "$(GITHUB_PAGES_COMMIT_MESSAGE)" -b $(GITHUB_PAGES_BRANCH) "$(OUTPUTDIR)" --no-jekyll
 	git push origin $(GITHUB_PAGES_BRANCH)
 
 {% endif %}

From d6a33f1d21a8cbb34b584895554147ad97e97a72 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Fri, 1 Dec 2023 11:27:16 -0600
Subject: [PATCH 2675/2864] Medium post importer (from medium export)

---
 docs/content.rst                              |   4 +-
 docs/importer.rst                             |  13 +-
 pelican/tests/content/medium_post_content.txt |   4 +
 ...2017-04-21_-medium-post--d1bf01d62ba3.html |  72 ++++++++
 pelican/tests/test_generators.py              |  37 +++-
 pelican/tests/test_importer.py                |  83 +++++++++
 pelican/tools/pelican_import.py               | 165 +++++++++++++++++-
 7 files changed, 357 insertions(+), 21 deletions(-)
 create mode 100644 pelican/tests/content/medium_post_content.txt
 create mode 100644 pelican/tests/content/medium_posts/2017-04-21_-medium-post--d1bf01d62ba3.html

diff --git a/docs/content.rst b/docs/content.rst
index cacacea9..46db1140 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -439,8 +439,8 @@ For **Markdown**, one must rely on an extension. For example, using the `mdx_inc
 Importing an existing site
 ==========================
 
-It is possible to import your site from WordPress, Tumblr, Dotclear, and RSS
-feeds using a simple script. See :ref:`import`.
+It is possible to import your site from several other blogging sites
+(like WordPress, Tumblr, ..) using a simple script. See :ref:`import`.
 
 Translations
 ============
diff --git a/docs/importer.rst b/docs/importer.rst
index 997a4632..093ef465 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -11,6 +11,7 @@ software to reStructuredText or Markdown. The supported import formats are:
 
 - Blogger XML export
 - Dotclear export
+- Medium export
 - Tumblr API
 - WordPress XML export
 - RSS/Atom feed
@@ -65,6 +66,7 @@ Optional arguments
   -h, --help            Show this help message and exit
   --blogger             Blogger XML export (default: False)
   --dotclear            Dotclear export (default: False)
+  --medium              Medium export (default: False)
   --tumblr              Tumblr API (default: False)
   --wpfile              WordPress XML export (default: False)
   --feed                Feed to parse (default: False)
@@ -80,8 +82,7 @@ Optional arguments
                           (default: False)
   --filter-author       Import only post from the specified author
   --strip-raw           Strip raw HTML code that can't be converted to markup
-                        such as flash embeds or iframes (wordpress import
-                        only) (default: False)
+                        such as flash embeds or iframes (default: False)
   --wp-custpost         Put wordpress custom post types in directories. If
                         used with --dir-cat option directories will be created
                         as "/post_type/category/" (wordpress import only)
@@ -113,6 +114,14 @@ For Dotclear::
 
     $ pelican-import --dotclear -o ~/output ~/backup.txt
 
+For Medium::
+
+    $ pelican-import --medium -o ~/output ~/medium-export/posts/
+
+The Medium export is a zip file.  Unzip it, and point this tool to the
+"posts" subdirectory.  For more information on how to export, see
+https://help.medium.com/hc/en-us/articles/115004745787-Export-your-account-data.
+
 For Tumblr::
 
     $ pelican-import --tumblr -o ~/output --blogname=<blogname> <api_key>
diff --git a/pelican/tests/content/medium_post_content.txt b/pelican/tests/content/medium_post_content.txt
new file mode 100644
index 00000000..5e21881c
--- /dev/null
+++ b/pelican/tests/content/medium_post_content.txt
@@ -0,0 +1,4 @@
+
+<hr/><h3>Title header</h3><p>A paragraph of content.</p><p>Paragraph number two.</p><p>A list:</p><ol><li>One.</li><li>Two.</li><li>Three.</li></ol><p>A link: <a data-href="https://example.com/example" href="https://example.com/example" target="_blank">link text</a>.</p><h3>Header 2</h3><p>A block quote:</p><blockquote>quote words <strong>strong words</strong></blockquote><p>after blockquote</p><figure><img data-height="282" data-image-id="image1.png" data-width="739" src="https://cdn-images-1.medium.com/max/800/image1.png"/><figcaption>A figure caption.</figcaption></figure><p>A final note: <a data-href="http://stats.stackexchange.com/" href="http://stats.stackexchange.com/" rel="noopener" target="_blank">Cross-Validated</a> has sometimes been helpful.</p><hr/><p><em>Next: </em><a data-href="https://medium.com/@username/post-url" href="https://medium.com/@username/post-url" target="_blank"><em>Next post</em>
+</a></p>
+<p>By <a href="https://medium.com/@username">User Name</a> on <a href="https://medium.com/p/medium-short-url"><time datetime="2017-04-21T17:11:55.799Z">April 21, 2017</time></a>.</p><p><a href="https://medium.com/@username/this-post-url">Canonical link</a></p><p>Exported from <a href="https://medium.com">Medium</a> on December 1, 2023.</p>
diff --git a/pelican/tests/content/medium_posts/2017-04-21_-medium-post--d1bf01d62ba3.html b/pelican/tests/content/medium_posts/2017-04-21_-medium-post--d1bf01d62ba3.html
new file mode 100644
index 00000000..02d272dc
--- /dev/null
+++ b/pelican/tests/content/medium_posts/2017-04-21_-medium-post--d1bf01d62ba3.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><title>A title</title><style>
+      * {
+        font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+      }
+      html, body {
+        margin: 0;
+        padding: 0;
+      }
+      h1 {
+        font-size: 50px;
+        margin-bottom: 17px;
+        color: #333;
+      }
+      h2 {
+        font-size: 24px;
+        line-height: 1.6;
+        margin: 30px 0 0 0;
+        margin-bottom: 18px;
+        margin-top: 33px;
+        color: #333;
+      }
+      h3 {
+        font-size: 30px;
+        margin: 10px 0 20px 0;
+        color: #333;
+      }
+      header {
+        width: 640px;
+        margin: auto;
+      }
+      section {
+        width: 640px;
+        margin: auto;
+      }
+      section p {
+        margin-bottom: 27px;
+        font-size: 20px;
+        line-height: 1.6;
+        color: #333;
+      }
+      section img {
+        max-width: 640px;
+      }
+      footer {
+        padding: 0 20px;
+        margin: 50px 0;
+        text-align: center;
+        font-size: 12px;
+      }
+      .aspectRatioPlaceholder {
+        max-width: auto !important;
+        max-height: auto !important;
+      }
+      .aspectRatioPlaceholder-fill {
+        padding-bottom: 0 !important;
+      }
+      header,
+      section[data-field=subtitle],
+      section[data-field=description] {
+        display: none;
+      }
+      </style></head><body><article class="h-entry">
+<header>
+<h1 class="p-name">A name (like title)</h1>
+</header>
+<section data-field="subtitle" class="p-summary">
+    Summary (first several words of content)
+</section>
+<section data-field="body" class="e-content">
+<section name="ad15" class="section section--body section--first"><div class="section-divider"><hr class="section-divider"></div><div class="section-content"><div class="section-inner sectionLayout--insetColumn"><h3 name="20a3" id="20a3" class="graf graf--h3 graf--leading graf--title">Title header</h3><p name="e3d6" id="e3d6" class="graf graf--p graf-after--h3">A paragraph of content.</p><p name="c7a8" id="c7a8" class="graf graf--p graf-after--p">Paragraph number two.</p><p name="42aa" id="42aa" class="graf graf--p graf-after--p">A list:</p><ol class="postList"><li name="d65f" id="d65f" class="graf graf--li graf-after--p">One.</li><li name="232b" id="232b" class="graf graf--li graf-after--li">Two.</li><li name="ef87" id="ef87" class="graf graf--li graf-after--li">Three.</li></ol><p name="e743" id="e743" class="graf graf--p graf-after--p">A link: <a href="https://example.com/example" data-href="https://example.com/example" class="markup--anchor markup--p-anchor" target="_blank">link text</a>.</p><h3 name="4cfd" id="4cfd" class="graf graf--h3 graf-after--p">Header 2</h3><p name="433c" id="433c" class="graf graf--p graf-after--p">A block quote:</p><blockquote name="3537" id="3537" class="graf graf--blockquote graf-after--p">quote words <strong class="markup--strong markup--blockquote-strong">strong words</strong></blockquote><p name="00cc" id="00cc" class="graf graf--p graf-after--blockquote">after blockquote</p><figure name="edb0" id="edb0" class="graf graf--figure graf-after--p"><img class="graf-image" data-image-id="image1.png" data-width="739" data-height="282" src="https://cdn-images-1.medium.com/max/800/image1.png"><figcaption class="imageCaption">A figure caption.</figcaption></figure><p name="f401" id="f401" class="graf graf--p graf-after--p graf--trailing">A final note: <a href="http://stats.stackexchange.com/" data-href="http://stats.stackexchange.com/" class="markup--anchor markup--p-anchor" rel="noopener" target="_blank">Cross-Validated</a> has sometimes been helpful.</p></div></div></section><section name="09a3" class="section section--body section--last"><div class="section-divider"><hr class="section-divider"></div><div class="section-content"><div class="section-inner sectionLayout--insetColumn"><p name="81e8" id="81e8" class="graf graf--p graf--leading"><em class="markup--em markup--p-em">Next: </em><a href="https://medium.com/@username/post-url" data-href="https://medium.com/@username/post-url" class="markup--anchor markup--p-anchor" target="_blank"><em class="markup--em markup--p-em">Next post</em>
+</section>
+<footer><p>By <a href="https://medium.com/@username" class="p-author h-card">User Name</a> on <a href="https://medium.com/p/medium-short-url"><time class="dt-published" datetime="2017-04-21T17:11:55.799Z">April 21, 2017</time></a>.</p><p><a href="https://medium.com/@username/this-post-url" class="p-canonical">Canonical link</a></p><p>Exported from <a href="https://medium.com">Medium</a> on December 1, 2023.</p></footer></article></body></html>
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index af6f5b1a..8c257b55 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -264,6 +264,7 @@ class TestArticlesGenerator(unittest.TestCase):
 
     def test_generate_context(self):
         articles_expected = [
+            ["A title", "published", "medium_posts", "article"],
             ["Article title", "published", "Default", "article"],
             [
                 "Article with markdown and summary metadata multi",
@@ -391,13 +392,24 @@ class TestArticlesGenerator(unittest.TestCase):
         # terms of process order will define the name for that category
         categories = [cat.name for cat, _ in self.generator.categories]
         categories_alternatives = (
-            sorted(["Default", "TestCategory", "Yeah", "test", "指導書"]),
-            sorted(["Default", "TestCategory", "yeah", "test", "指導書"]),
+            sorted(
+                ["Default", "TestCategory", "medium_posts", "Yeah", "test", "指導書"]
+            ),
+            sorted(
+                ["Default", "TestCategory", "medium_posts", "yeah", "test", "指導書"]
+            ),
         )
         self.assertIn(sorted(categories), categories_alternatives)
         # test for slug
         categories = [cat.slug for cat, _ in self.generator.categories]
-        categories_expected = ["default", "testcategory", "yeah", "test", "zhi-dao-shu"]
+        categories_expected = [
+            "default",
+            "testcategory",
+            "medium_posts",
+            "yeah",
+            "test",
+            "zhi-dao-shu",
+        ]
         self.assertEqual(sorted(categories), sorted(categories_expected))
 
     def test_do_not_use_folder_as_category(self):
@@ -549,7 +561,8 @@ class TestArticlesGenerator(unittest.TestCase):
             granularity: {period["period"] for period in periods}
             for granularity, periods in period_archives.items()
         }
-        expected = {"year": {(1970,), (2010,), (2012,), (2014,)}}
+        self.maxDiff = None
+        expected = {"year": {(1970,), (2010,), (2012,), (2014,), (2017,)}}
         self.assertEqual(expected, abbreviated_archives)
 
         # Month archives enabled:
@@ -570,7 +583,7 @@ class TestArticlesGenerator(unittest.TestCase):
             for granularity, periods in period_archives.items()
         }
         expected = {
-            "year": {(1970,), (2010,), (2012,), (2014,)},
+            "year": {(1970,), (2010,), (2012,), (2014,), (2017,)},
             "month": {
                 (1970, "January"),
                 (2010, "December"),
@@ -578,6 +591,7 @@ class TestArticlesGenerator(unittest.TestCase):
                 (2012, "November"),
                 (2012, "October"),
                 (2014, "February"),
+                (2017, "April"),
             },
         }
         self.assertEqual(expected, abbreviated_archives)
@@ -602,7 +616,7 @@ class TestArticlesGenerator(unittest.TestCase):
             for granularity, periods in period_archives.items()
         }
         expected = {
-            "year": {(1970,), (2010,), (2012,), (2014,)},
+            "year": {(1970,), (2010,), (2012,), (2014,), (2017,)},
             "month": {
                 (1970, "January"),
                 (2010, "December"),
@@ -610,6 +624,7 @@ class TestArticlesGenerator(unittest.TestCase):
                 (2012, "November"),
                 (2012, "October"),
                 (2014, "February"),
+                (2017, "April"),
             },
             "day": {
                 (1970, "January", 1),
@@ -619,6 +634,7 @@ class TestArticlesGenerator(unittest.TestCase):
                 (2012, "October", 30),
                 (2012, "October", 31),
                 (2014, "February", 9),
+                (2017, "April", 21),
             },
         }
         self.assertEqual(expected, abbreviated_archives)
@@ -836,8 +852,12 @@ class TestArticlesGenerator(unittest.TestCase):
 
         categories = sorted([category.name for category, _ in generator.categories])
         categories_expected = [
-            sorted(["Default", "TestCategory", "yeah", "test", "指導書"]),
-            sorted(["Default", "TestCategory", "Yeah", "test", "指導書"]),
+            sorted(
+                ["Default", "TestCategory", "medium_posts", "yeah", "test", "指導書"]
+            ),
+            sorted(
+                ["Default", "TestCategory", "medium_posts", "Yeah", "test", "指導書"]
+            ),
         ]
         self.assertIn(categories, categories_expected)
 
@@ -864,6 +884,7 @@ class TestArticlesGenerator(unittest.TestCase):
         generator.generate_context()
 
         expected = [
+            "A title",
             "An Article With Code Block To Test Typogrify Ignore",
             "Article title",
             "Article with Nonconformant HTML meta tags",
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 05ef5bbd..916c1183 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -21,6 +21,10 @@ from pelican.tools.pelican_import import (
     get_attachments,
     tumblr2fields,
     wp2fields,
+    mediumpost2fields,
+    mediumposts2fields,
+    strip_medium_post_content,
+    medium_slug,
 )
 from pelican.utils import path_to_file_url, slugify
 
@@ -708,3 +712,82 @@ class TestTumblrImporter(TestCaseWithCLocale):
             posts,
             posts,
         )
+
+
+class TestMediumImporter(TestCaseWithCLocale):
+    def setUp(self):
+        super().setUp()
+        self.test_content_root = "pelican/tests/content"
+        # The content coming out of parsing is similar, but not the same.
+        # Beautiful soup rearranges the order of attributes, for example.
+        # So, we keep a copy of the content for the test.
+        content_filename = f"{self.test_content_root}/medium_post_content.txt"
+        with open(content_filename, encoding="utf-8") as the_content_file:
+            # Many editors and scripts add a final newline, so live with that
+            # in our test
+            the_content = the_content_file.read()
+            assert the_content[-1] == "\n"
+            the_content = the_content[:-1]
+        self.post_tuple = (
+            "A title",
+            the_content,
+            # slug:
+            "2017-04-21-medium-post",
+            "2017-04-21 17:11",
+            "User Name",
+            None,
+            (),
+            "published",
+            "article",
+            "html",
+        )
+
+    def test_mediumpost2field(self):
+        """Parse one post"""
+        post_filename = f"{self.test_content_root}/medium_posts/2017-04-21_-medium-post--d1bf01d62ba3.html"
+        val = mediumpost2fields(post_filename)
+        self.assertEqual(self.post_tuple, val, val)
+
+    def test_mediumposts2field(self):
+        """Parse all posts in an export directory"""
+        posts = [
+            fields
+            for fields in mediumposts2fields(f"{self.test_content_root}/medium_posts")
+        ]
+        self.assertEqual(1, len(posts))
+        self.assertEqual(self.post_tuple, posts[0])
+
+    def test_strip_content(self):
+        """Strip out unhelpful tags"""
+        html_doc = (
+            "<section>This keeps <i>lots</i> of <b>tags</b>, but not "
+            "the <section>section</section> tags</section>"
+        )
+        soup = BeautifulSoup(html_doc, "html.parser")
+        self.assertEqual(
+            "This keeps <i>lots</i> of <b>tags</b>, but not the section tags",
+            strip_medium_post_content(soup),
+        )
+
+    def test_medium_slug(self):
+        # Remove hex stuff at the end
+        self.assertEqual(
+            "2017-04-27_A-long-title",
+            medium_slug(
+                "medium-export/posts/2017-04-27_A-long-title--2971442227dd.html"
+            ),
+        )
+        # Remove "--DRAFT" at the end
+        self.assertEqual(
+            "2017-04-27_A-long-title",
+            medium_slug("medium-export/posts/2017-04-27_A-long-title--DRAFT.html"),
+        )
+        # Remove both (which happens)
+        self.assertEqual(
+            "draft_How-to-do", medium_slug("draft_How-to-do--DRAFT--87225c81dddd.html")
+        )
+        # If no hex stuff, leave it alone
+        self.assertEqual(
+            "2017-04-27_A-long-title",
+            medium_slug("medium-export/posts/2017-04-27_A-long-title.html"),
+        )
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 681a5c45..eb343860 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -15,6 +15,8 @@ from urllib.error import URLError
 from urllib.parse import quote, urlparse, urlsplit, urlunsplit
 from urllib.request import urlretrieve
 
+import dateutil.parser
+
 # because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import init
 from pelican.settings import DEFAULT_CONFIG
@@ -114,19 +116,25 @@ def decode_wp_content(content, br=True):
     return content
 
 
-def xml_to_soup(xml):
-    """Opens an xml file"""
+def _import_bs4():
+    """Import and return bs4, otherwise sys.exit."""
     try:
-        from bs4 import BeautifulSoup
+        import bs4
     except ImportError:
         error = (
             'Missing dependency "BeautifulSoup4" and "lxml" required to '
             "import XML files."
         )
         sys.exit(error)
+    return bs4
+
+
+def file_to_soup(xml, features="xml"):
+    """Reads a file, returns soup."""
+    bs4 = _import_bs4()
     with open(xml, encoding="utf-8") as infile:
         xmlfile = infile.read()
-    soup = BeautifulSoup(xmlfile, "xml")
+    soup = bs4.BeautifulSoup(xmlfile, features)
     return soup
 
 
@@ -140,7 +148,7 @@ def get_filename(post_name, post_id):
 def wp2fields(xml, wp_custpost=False):
     """Opens a wordpress XML file, and yield Pelican fields"""
 
-    soup = xml_to_soup(xml)
+    soup = file_to_soup(xml)
     items = soup.rss.channel.findAll("item")
     for item in items:
         if item.find("status").string in ["publish", "draft"]:
@@ -210,7 +218,7 @@ def wp2fields(xml, wp_custpost=False):
 def blogger2fields(xml):
     """Opens a blogger XML file, and yield Pelican fields"""
 
-    soup = xml_to_soup(xml)
+    soup = file_to_soup(xml)
     entries = soup.feed.findAll("entry")
     for entry in entries:
         raw_kind = entry.find(
@@ -536,6 +544,133 @@ def tumblr2fields(api_key, blogname):
         posts = _get_tumblr_posts(api_key, blogname, offset)
 
 
+def strip_medium_post_content(soup) -> str:
+    """Strip some tags and attributes from medium post content.
+
+    For example, the 'section' and 'div' tags cause trouble while rendering.
+
+    The problem with these tags is you can get a section divider (--------------)
+    that is not between two pieces of content.  For example:
+
+      Some text.
+
+      .. container:: section-divider
+
+         --------------
+
+      .. container:: section-content
+
+      More content.
+
+    In this case, pandoc complains: "Unexpected section title or transition."
+
+    Also, the "id" and "name" attributes in tags cause similar problems.  They show
+    up in .rst as extra junk that separates transitions.
+    """
+    # Remove tags
+    # section and div cause problems
+    # footer also can cause problems, and has nothing we want to keep
+    # See https://stackoverflow.com/a/8439761
+    invalid_tags = ["section", "div", "footer"]
+    for tag in invalid_tags:
+        for match in soup.findAll(tag):
+            match.replaceWithChildren()
+
+    # Remove attributes
+    # See https://stackoverflow.com/a/9045719
+    invalid_attributes = ["name", "id", "class"]
+    bs4 = _import_bs4()
+    for tag in soup.descendants:
+        if isinstance(tag, bs4.element.Tag):
+            tag.attrs = {
+                key: value
+                for key, value in tag.attrs.items()
+                if key not in invalid_attributes
+            }
+
+    # Get the string of all content, keeping other tags
+    all_content = "".join(str(element) for element in soup.contents)
+    return all_content
+
+
+def mediumpost2fields(filepath: str) -> tuple:
+    """Take an HTML post from a medium export, return Pelican fields."""
+
+    soup = file_to_soup(filepath, "html.parser")
+    if not soup:
+        raise ValueError(f"{filepath} could not be parsed by beautifulsoup")
+    kind = "article"
+
+    content = soup.find("section", class_="e-content")
+    if not content:
+        raise ValueError(f"{filepath}: Post has no content")
+
+    title = soup.find("title").string or ""
+
+    raw_date = soup.find("time", class_="dt-published")
+    date = None
+    if raw_date:
+        # This datetime can include timezone, e.g., "2017-04-21T17:11:55.799Z"
+        # python before 3.11 can't parse the timezone using datetime.fromisoformat
+        # See also https://docs.python.org/3.10/library/datetime.html#datetime.datetime.fromisoformat
+        # "This does not support parsing arbitrary ISO 8601 strings"
+        # So, we use dateutil.parser, which can handle it.
+        date_object = dateutil.parser.parse(raw_date.attrs["datetime"])
+        date = date_object.strftime("%Y-%m-%d %H:%M")
+        status = "published"
+    else:
+        status = "draft"
+    author = soup.find("a", class_="p-author h-card")
+    if author:
+        author = author.string
+
+    # Now that we're done with classes, we can strip the content
+    content = strip_medium_post_content(content)
+
+    # medium HTML export doesn't have tag or category
+    # RSS feed has tags, but it doesn't have all the posts.
+    tags = ()
+
+    slug = medium_slug(filepath)
+
+    # TODO: make the fields a python dataclass
+    return (
+        title,
+        content,
+        slug,
+        date,
+        author,
+        None,
+        tags,
+        status,
+        kind,
+        "html",
+    )
+
+
+def medium_slug(filepath: str) -> str:
+    """Make the filepath of a medium exported file into a slug."""
+    # slug: filename without extension
+    slug = os.path.basename(filepath)
+    slug = os.path.splitext(slug)[0]
+    # A medium export filename looks like date_-title-...html
+    # But, RST doesn't like "_-" (see https://github.com/sphinx-doc/sphinx/issues/4350)
+    # so get rid of it
+    slug = slug.replace("_-", "-")
+    # drop the hex string medium puts on the end of the filename, why keep it.
+    # e.g., "-a8a8a8a8" or "---a9a9a9a9"
+    # also: drafts don't need "--DRAFT"
+    slug = re.sub(r"((-)+([0-9a-f]+|DRAFT))+$", "", slug)
+    return slug
+
+
+def mediumposts2fields(medium_export_dir: str):
+    """Take HTML posts in a medium export directory, and yield Pelican fields."""
+    for file in os.listdir(medium_export_dir):
+        filename = os.fsdecode(file)
+        yield mediumpost2fields(os.path.join(medium_export_dir, filename))
+
+
 def feed2fields(file):
     """Read a feed and yield pelican fields"""
     import feedparser
@@ -711,7 +846,7 @@ def get_attachments(xml):
     """returns a dictionary of posts that have attachments with a list
     of the attachment_urls
     """
-    soup = xml_to_soup(xml)
+    soup = file_to_soup(xml)
     items = soup.rss.channel.findAll("item")
     names = {}
     attachments = []
@@ -837,6 +972,9 @@ def fields2pelican(
             posts_require_pandoc.append(filename)
 
         slug = not disable_slugs and filename or None
+        assert slug is None or filename == os.path.basename(
+            filename
+        ), f"filename is not a basename: {filename}"
 
         if wp_attach and attachments:
             try:
@@ -984,6 +1122,9 @@ def main():
     parser.add_argument(
         "--dotclear", action="store_true", dest="dotclear", help="Dotclear export"
     )
+    parser.add_argument(
+        "--medium", action="store_true", dest="medium", help="Medium export"
+    )
     parser.add_argument(
         "--tumblr", action="store_true", dest="tumblr", help="Tumblr export"
     )
@@ -1069,6 +1210,8 @@ def main():
         input_type = "blogger"
     elif args.dotclear:
         input_type = "dotclear"
+    elif args.medium:
+        input_type = "medium"
     elif args.tumblr:
         input_type = "tumblr"
     elif args.wpfile:
@@ -1077,8 +1220,8 @@ def main():
         input_type = "feed"
     else:
         error = (
-            "You must provide either --blogger, --dotclear, "
-            "--tumblr, --wpfile or --feed options"
+            "You must provide one of --blogger, --dotclear, "
+            "--medium, --tumblr, --wpfile or --feed options"
         )
         exit(error)
 
@@ -1097,12 +1240,16 @@ def main():
         fields = blogger2fields(args.input)
     elif input_type == "dotclear":
         fields = dc2fields(args.input)
+    elif input_type == "medium":
+        fields = mediumposts2fields(args.input)
     elif input_type == "tumblr":
         fields = tumblr2fields(args.input, args.blogname)
     elif input_type == "wordpress":
         fields = wp2fields(args.input, args.wp_custpost or False)
     elif input_type == "feed":
         fields = feed2fields(args.input)
+    else:
+        raise ValueError(f"Unhandled input_type {input_type}")
 
     if args.wp_attach:
         attachments = get_attachments(args.input)

From fbe81a971a8f96eae6a13aee4471468f31cbf194 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 17 Jan 2024 09:48:05 +0100
Subject: [PATCH 2676/2864] Delete RELEASE.md

---
 RELEASE.md | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 7881aeac..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Release type: patch
-
-Keep the newline at the end of the file in generating tools scripts

From d39dd9b85f0309e4101e74a270fd2ce97f051a84 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Sun, 21 Jan 2024 22:52:56 -0700
Subject: [PATCH 2677/2864] Resolve inter-site links in summaries.

c.f. https://github.com/getpelican/pelican/issues/3265
c.f. https://github.com/MinchinWeb/minchin.pelican.plugins.summary/issues/5
---
 pelican/__init__.py |  7 +++++--
 pelican/contents.py | 17 +++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index a25f5624..1a3090f8 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -120,12 +120,15 @@ class Pelican:
             if hasattr(p, "generate_context"):
                 p.generate_context()
 
+        # for plugins that create/edit the summary
+        logger.debug("Signal all_generators_finalized.send(<generators>)")
+        signals.all_generators_finalized.send(generators)
+
+        # update links in the summary, etc
         for p in generators:
             if hasattr(p, "refresh_metadata_intersite_links"):
                 p.refresh_metadata_intersite_links()
 
-        signals.all_generators_finalized.send(generators)
-
         writer = self._get_writer()
 
         for p in generators:
diff --git a/pelican/contents.py b/pelican/contents.py
index 474e5bbf..27b8bbc3 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -520,12 +520,17 @@ class Content:
 
         # _summary is an internal variable that some plugins may be writing to,
         # so ensure changes to it are picked up
-        if (
-            "summary" in self.settings["FORMATTED_FIELDS"]
-            and "summary" in self.metadata
-        ):
-            self._summary = self._update_content(self._summary, self.get_siteurl())
-            self.metadata["summary"] = self._summary
+        if "summary" in self.settings["FORMATTED_FIELDS"]:
+            if hasattr(self, "_summary"):
+                self.metadata["summary"] = self._summary
+
+            if "summary" in self.metadata:
+                self.metadata["summary"] = self._update_content(
+                    self.metadata["summary"], self.get_siteurl()
+                )
+
+            if hasattr(self, "_summary") and "summary" in self.metadata:
+                self._summary = self.metadata["summary"]
 
 
 class Page(Content):

From 2fa5c515b0232ce212a3d83827de88b01deaa598 Mon Sep 17 00:00:00 2001
From: namori <157323136+nam-ori@users.noreply.github.com>
Date: Tue, 23 Jan 2024 09:43:07 +0100
Subject: [PATCH 2678/2864] Feeds - Update generators.py to fix a bug with
 slugs (#3279)

---
 pelican/generators.py | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 3b5ca9e4..076c8d38 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -384,8 +384,8 @@ class ArticlesGenerator(CachingGenerator):
                     str(self.settings["CATEGORY_FEED_ATOM"]).format(slug=cat.slug),
                     self.settings.get(
                         "CATEGORY_FEED_ATOM_URL",
-                        str(self.settings["CATEGORY_FEED_ATOM"]).format(slug=cat.slug),
-                    ),
+                        str(self.settings["CATEGORY_FEED_ATOM"]),
+                    ).format(slug=cat.slug),
                     feed_title=cat.name,
                 )
 
@@ -396,8 +396,8 @@ class ArticlesGenerator(CachingGenerator):
                     str(self.settings["CATEGORY_FEED_RSS"]).format(slug=cat.slug),
                     self.settings.get(
                         "CATEGORY_FEED_RSS_URL",
-                        str(self.settings["CATEGORY_FEED_RSS"]).format(slug=cat.slug),
-                    ),
+                        str(self.settings["CATEGORY_FEED_RSS"]),
+                    ).format(slug=cat.slug),
                     feed_title=cat.name,
                     feed_type="rss",
                 )
@@ -410,8 +410,8 @@ class ArticlesGenerator(CachingGenerator):
                     str(self.settings["AUTHOR_FEED_ATOM"]).format(slug=auth.slug),
                     self.settings.get(
                         "AUTHOR_FEED_ATOM_URL",
-                        str(self.settings["AUTHOR_FEED_ATOM"]).format(slug=auth.slug),
-                    ),
+                        str(self.settings["AUTHOR_FEED_ATOM"]),
+                    ).format(slug=auth.slug),
                     feed_title=auth.name,
                 )
 
@@ -422,8 +422,8 @@ class ArticlesGenerator(CachingGenerator):
                     str(self.settings["AUTHOR_FEED_RSS"]).format(slug=auth.slug),
                     self.settings.get(
                         "AUTHOR_FEED_RSS_URL",
-                        str(self.settings["AUTHOR_FEED_RSS"]).format(slug=auth.slug),
-                    ),
+                        str(self.settings["AUTHOR_FEED_RSS"]),
+                    ).format(slug=auth.slug),
                     feed_title=auth.name,
                     feed_type="rss",
                 )
@@ -437,8 +437,8 @@ class ArticlesGenerator(CachingGenerator):
                         str(self.settings["TAG_FEED_ATOM"]).format(slug=tag.slug),
                         self.settings.get(
                             "TAG_FEED_ATOM_URL",
-                            str(self.settings["TAG_FEED_ATOM"]).format(slug=tag.slug),
-                        ),
+                            str(self.settings["TAG_FEED_ATOM"]),
+                        ).format(slug=tag.slug),
                         feed_title=tag.name,
                     )
 
@@ -449,8 +449,8 @@ class ArticlesGenerator(CachingGenerator):
                         str(self.settings["TAG_FEED_RSS"]).format(slug=tag.slug),
                         self.settings.get(
                             "TAG_FEED_RSS_URL",
-                            str(self.settings["TAG_FEED_RSS"]).format(slug=tag.slug),
-                        ),
+                            str(self.settings["TAG_FEED_RSS"]),
+                        ).format(slug=tag.slug),
                         feed_title=tag.name,
                         feed_type="rss",
                     )
@@ -471,10 +471,8 @@ class ArticlesGenerator(CachingGenerator):
                         str(self.settings["TRANSLATION_FEED_ATOM"]).format(lang=lang),
                         self.settings.get(
                             "TRANSLATION_FEED_ATOM_URL",
-                            str(self.settings["TRANSLATION_FEED_ATOM"]).format(
-                                lang=lang
-                            ),
-                        ),
+                            str(self.settings["TRANSLATION_FEED_ATOM"]),
+                        ).format(lang=lang),
                     )
                 if self.settings.get("TRANSLATION_FEED_RSS"):
                     writer.write_feed(

From 3a662ace031a20d15f4933c028b3fffd1b588430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ricks@greenbone.net>
Date: Thu, 18 Jan 2024 17:17:29 +0100
Subject: [PATCH 2679/2864] Add type hints for contents module

Types make it easier to understand the code and improve autocompletion
in IDEs.
---
 pelican/contents.py | 95 +++++++++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 42 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 474e5bbf..82be8f73 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -6,7 +6,8 @@ import os
 import re
 from datetime import timezone
 from html import unescape
-from urllib.parse import unquote, urljoin, urlparse, urlunparse
+from typing import Any, Dict, Optional, Set, Tuple
+from urllib.parse import ParseResult, unquote, urljoin, urlparse, urlunparse
 
 try:
     from zoneinfo import ZoneInfo
@@ -15,7 +16,7 @@ except ModuleNotFoundError:
 
 
 from pelican.plugins import signals
-from pelican.settings import DEFAULT_CONFIG
+from pelican.settings import DEFAULT_CONFIG, Settings
 from pelican.utils import (
     deprecated_attribute,
     memoized,
@@ -44,12 +45,20 @@ class Content:
 
     """
 
+    default_template: Optional[str] = None
+    mandatory_properties: Tuple[str, ...] = ()
+
     @deprecated_attribute(old="filename", new="source_path", since=(3, 2, 0))
     def filename():
         return None
 
     def __init__(
-        self, content, metadata=None, settings=None, source_path=None, context=None
+        self,
+        content: str,
+        metadata: Optional[Dict[str, Any]] = None,
+        settings: Optional[Settings] = None,
+        source_path: Optional[str] = None,
+        context: Optional[Dict[Any, Any]] = None,
     ):
         if metadata is None:
             metadata = {}
@@ -156,10 +165,10 @@ class Content:
 
         signals.content_object_init.send(self)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.source_path or repr(self)
 
-    def _has_valid_mandatory_properties(self):
+    def _has_valid_mandatory_properties(self) -> bool:
         """Test mandatory properties are set."""
         for prop in self.mandatory_properties:
             if not hasattr(self, prop):
@@ -169,7 +178,7 @@ class Content:
                 return False
         return True
 
-    def _has_valid_save_as(self):
+    def _has_valid_save_as(self) -> bool:
         """Return true if save_as doesn't write outside output path, false
         otherwise."""
         try:
@@ -190,7 +199,7 @@ class Content:
 
         return True
 
-    def _has_valid_status(self):
+    def _has_valid_status(self) -> bool:
         if hasattr(self, "allowed_statuses"):
             if self.status not in self.allowed_statuses:
                 logger.error(
@@ -204,7 +213,7 @@ class Content:
         # if undefined we allow all
         return True
 
-    def is_valid(self):
+    def is_valid(self) -> bool:
         """Validate Content"""
         # Use all() to not short circuit and get results of all validations
         return all(
@@ -216,7 +225,7 @@ class Content:
         )
 
     @property
-    def url_format(self):
+    def url_format(self) -> Dict[str, Any]:
         """Returns the URL, formatted with the proper values"""
         metadata = copy.copy(self.metadata)
         path = self.metadata.get("path", self.get_relative_source_path())
@@ -232,19 +241,19 @@ class Content:
         )
         return metadata
 
-    def _expand_settings(self, key, klass=None):
+    def _expand_settings(self, key: str, klass: Optional[str] = None) -> str:
         if not klass:
             klass = self.__class__.__name__
         fq_key = (f"{klass}_{key}").upper()
         return str(self.settings[fq_key]).format(**self.url_format)
 
-    def get_url_setting(self, key):
+    def get_url_setting(self, key: str) -> str:
         if hasattr(self, "override_" + key):
             return getattr(self, "override_" + key)
         key = key if self.in_default_lang else "lang_%s" % key
         return self._expand_settings(key)
 
-    def _link_replacer(self, siteurl, m):
+    def _link_replacer(self, siteurl: str, m: re.Match) -> str:
         what = m.group("what")
         value = urlparse(m.group("value"))
         path = value.path
@@ -272,15 +281,15 @@ class Content:
         # XXX Put this in a different location.
         if what in {"filename", "static", "attach"}:
 
-            def _get_linked_content(key, url):
+            def _get_linked_content(key: str, url: ParseResult) -> Optional[Content]:
                 nonlocal value
 
-                def _find_path(path):
+                def _find_path(path: str) -> Optional[Content]:
                     if path.startswith("/"):
                         path = path[1:]
                     else:
                         # relative to the source path of this content
-                        path = self.get_relative_source_path(
+                        path = self.get_relative_source_path(  # type: ignore
                             os.path.join(self.relative_dir, path)
                         )
                     return self._context[key].get(path, None)
@@ -324,7 +333,7 @@ class Content:
             linked_content = _get_linked_content(key, value)
             if linked_content:
                 if what == "attach":
-                    linked_content.attach_to(self)
+                    linked_content.attach_to(self)  # type: ignore
                 origin = joiner(siteurl, linked_content.url)
                 origin = origin.replace("\\", "/")  # for Windows paths.
             else:
@@ -359,7 +368,7 @@ class Content:
 
         return "".join((m.group("markup"), m.group("quote"), origin, m.group("quote")))
 
-    def _get_intrasite_link_regex(self):
+    def _get_intrasite_link_regex(self) -> re.Pattern:
         intrasite_link_regex = self.settings["INTRASITE_LINK_REGEX"]
         regex = r"""
             (?P<markup><[^\>]+  # match tag with all url-value attributes
@@ -370,7 +379,7 @@ class Content:
             (?P=quote)""".format(intrasite_link_regex)
         return re.compile(regex, re.X)
 
-    def _update_content(self, content, siteurl):
+    def _update_content(self, content: str, siteurl: str) -> str:
         """Update the content attribute.
 
         Change all the relative paths of the content to relative paths
@@ -386,7 +395,7 @@ class Content:
         hrefs = self._get_intrasite_link_regex()
         return hrefs.sub(lambda m: self._link_replacer(siteurl, m), content)
 
-    def get_static_links(self):
+    def get_static_links(self) -> Set[str]:
         static_links = set()
         hrefs = self._get_intrasite_link_regex()
         for m in hrefs.finditer(self._content):
@@ -402,15 +411,15 @@ class Content:
                 path = self.get_relative_source_path(
                     os.path.join(self.relative_dir, path)
                 )
-            path = path.replace("%20", " ")
+            path = path.replace("%20", " ")  # type: ignore
             static_links.add(path)
         return static_links
 
-    def get_siteurl(self):
+    def get_siteurl(self) -> str:
         return self._context.get("localsiteurl", "")
 
     @memoized
-    def get_content(self, siteurl):
+    def get_content(self, siteurl: str) -> str:
         if hasattr(self, "_get_content"):
             content = self._get_content()
         else:
@@ -418,11 +427,11 @@ class Content:
         return self._update_content(content, siteurl)
 
     @property
-    def content(self):
+    def content(self) -> str:
         return self.get_content(self.get_siteurl())
 
     @memoized
-    def get_summary(self, siteurl):
+    def get_summary(self, siteurl: str) -> str:
         """Returns the summary of an article.
 
         This is based on the summary metadata if set, otherwise truncate the
@@ -441,10 +450,10 @@ class Content:
         )
 
     @property
-    def summary(self):
+    def summary(self) -> str:
         return self.get_summary(self.get_siteurl())
 
-    def _get_summary(self):
+    def _get_summary(self) -> str:
         """deprecated function to access summary"""
 
         logger.warning(
@@ -454,34 +463,36 @@ class Content:
         return self.summary
 
     @summary.setter
-    def summary(self, value):
+    def summary(self, value: str):
         """Dummy function"""
         pass
 
     @property
-    def status(self):
+    def status(self) -> str:
         return self._status
 
     @status.setter
-    def status(self, value):
+    def status(self, value: str) -> None:
         # TODO maybe typecheck
         self._status = value.lower()
 
     @property
-    def url(self):
+    def url(self) -> str:
         return self.get_url_setting("url")
 
     @property
-    def save_as(self):
+    def save_as(self) -> str:
         return self.get_url_setting("save_as")
 
-    def _get_template(self):
+    def _get_template(self) -> str:
         if hasattr(self, "template") and self.template is not None:
             return self.template
         else:
             return self.default_template
 
-    def get_relative_source_path(self, source_path=None):
+    def get_relative_source_path(
+        self, source_path: Optional[str] = None
+    ) -> Optional[str]:
         """Return the relative path (from the content path) to the given
         source_path.
 
@@ -501,7 +512,7 @@ class Content:
         )
 
     @property
-    def relative_dir(self):
+    def relative_dir(self) -> str:
         return posixize_path(
             os.path.dirname(
                 os.path.relpath(
@@ -511,7 +522,7 @@ class Content:
             )
         )
 
-    def refresh_metadata_intersite_links(self):
+    def refresh_metadata_intersite_links(self) -> None:
         for key in self.settings["FORMATTED_FIELDS"]:
             if key in self.metadata and key != "summary":
                 value = self._update_content(self.metadata[key], self.get_siteurl())
@@ -534,7 +545,7 @@ class Page(Content):
     default_status = "published"
     default_template = "page"
 
-    def _expand_settings(self, key):
+    def _expand_settings(self, key: str) -> str:
         klass = "draft_page" if self.status == "draft" else None
         return super()._expand_settings(key, klass)
 
@@ -561,7 +572,7 @@ class Article(Content):
         if not hasattr(self, "date") and self.status == "draft":
             self.date = datetime.datetime.max.replace(tzinfo=self.timezone)
 
-    def _expand_settings(self, key):
+    def _expand_settings(self, key: str) -> str:
         klass = "draft" if self.status == "draft" else "article"
         return super()._expand_settings(key, klass)
 
@@ -571,7 +582,7 @@ class Static(Content):
     default_status = "published"
     default_template = None
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self._output_location_referenced = False
 
@@ -588,18 +599,18 @@ class Static(Content):
         return None
 
     @property
-    def url(self):
+    def url(self) -> str:
         # Note when url has been referenced, so we can avoid overriding it.
         self._output_location_referenced = True
         return super().url
 
     @property
-    def save_as(self):
+    def save_as(self) -> str:
         # Note when save_as has been referenced, so we can avoid overriding it.
         self._output_location_referenced = True
         return super().save_as
 
-    def attach_to(self, content):
+    def attach_to(self, content: Content) -> None:
         """Override our output directory with that of the given content object."""
 
         # Determine our file's new output path relative to the linking
@@ -624,7 +635,7 @@ class Static(Content):
 
         new_url = path_to_url(new_save_as)
 
-        def _log_reason(reason):
+        def _log_reason(reason: str) -> None:
             logger.warning(
                 "The {attach} link in %s cannot relocate "
                 "%s because %s. Falling back to "

From e4807316ae9338f05701a70d216687a94fb796d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= <bjoern.ricks@greenbone.net>
Date: Thu, 18 Jan 2024 09:18:00 +0100
Subject: [PATCH 2680/2864] Add type hints for utils module

Types make it easier to understand the code and improve autocompletion
in IDEs.
---
 pelican/utils.py | 143 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 97 insertions(+), 46 deletions(-)

diff --git a/pelican/utils.py b/pelican/utils.py
index eda53d3f..5f161667 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 import fnmatch
 import locale
@@ -16,6 +18,21 @@ from html import entities
 from html.parser import HTMLParser
 from itertools import groupby
 from operator import attrgetter
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Collection,
+    Dict,
+    Generator,
+    Iterable,
+    List,
+    Optional,
+    Sequence,
+    Tuple,
+    Type,
+    Union,
+)
 
 import dateutil.parser
 
@@ -27,11 +44,15 @@ from markupsafe import Markup
 
 import watchfiles
 
+if TYPE_CHECKING:
+    from pelican.contents import Content
+    from pelican.readers import Readers
+    from pelican.settings import Settings
 
 logger = logging.getLogger(__name__)
 
 
-def sanitised_join(base_directory, *parts):
+def sanitised_join(base_directory: str, *parts: str) -> str:
     joined = posixize_path(os.path.abspath(os.path.join(base_directory, *parts)))
     base = posixize_path(os.path.abspath(base_directory))
     if not joined.startswith(base):
@@ -40,7 +61,7 @@ def sanitised_join(base_directory, *parts):
     return joined
 
 
-def strftime(date, date_format):
+def strftime(date: datetime.datetime, date_format: str) -> str:
     """
     Enhanced replacement for built-in strftime with zero stripping
 
@@ -109,10 +130,10 @@ class DateFormatter:
     defined in LOCALE setting
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         self.locale = locale.setlocale(locale.LC_TIME)
 
-    def __call__(self, date, date_format):
+    def __call__(self, date: datetime.datetime, date_format: str) -> str:
         # on OSX, encoding from LC_CTYPE determines the unicode output in PY3
         # make sure it's same as LC_TIME
         with temporary_locale(self.locale, locale.LC_TIME), temporary_locale(
@@ -131,11 +152,11 @@ class memoized:
 
     """
 
-    def __init__(self, func):
+    def __init__(self, func: Callable) -> None:
         self.func = func
-        self.cache = {}
+        self.cache: Dict[Any, Any] = {}
 
-    def __call__(self, *args):
+    def __call__(self, *args) -> Any:
         if not isinstance(args, Hashable):
             # uncacheable. a list, for instance.
             # better to not cache than blow up.
@@ -147,17 +168,23 @@ class memoized:
             self.cache[args] = value
             return value
 
-    def __repr__(self):
+    def __repr__(self) -> Optional[str]:
         return self.func.__doc__
 
-    def __get__(self, obj, objtype):
+    def __get__(self, obj: Any, objtype):
         """Support instance methods."""
         fn = partial(self.__call__, obj)
         fn.cache = self.cache
         return fn
 
 
-def deprecated_attribute(old, new, since=None, remove=None, doc=None):
+def deprecated_attribute(
+    old: str,
+    new: str,
+    since: Tuple[int, ...],
+    remove: Optional[Tuple[int, ...]] = None,
+    doc: Optional[str] = None,
+):
     """Attribute deprecation decorator for gentle upgrades
 
     For example:
@@ -198,7 +225,7 @@ def deprecated_attribute(old, new, since=None, remove=None, doc=None):
     return decorator
 
 
-def get_date(string):
+def get_date(string: str) -> datetime.datetime:
     """Return a datetime object from a string.
 
     If no format matches the given date, raise a ValueError.
@@ -212,7 +239,9 @@ def get_date(string):
 
 
 @contextmanager
-def pelican_open(filename, mode="r", strip_crs=(sys.platform == "win32")):
+def pelican_open(
+    filename: str, mode: str = "r", strip_crs: bool = (sys.platform == "win32")
+) -> Generator[str, None, None]:
     """Open a file and return its content"""
 
     # utf-8-sig will clear any BOM if present
@@ -221,7 +250,12 @@ def pelican_open(filename, mode="r", strip_crs=(sys.platform == "win32")):
     yield content
 
 
-def slugify(value, regex_subs=(), preserve_case=False, use_unicode=False):
+def slugify(
+    value: str,
+    regex_subs: Iterable[Tuple[str, str]] = (),
+    preserve_case: bool = False,
+    use_unicode: bool = False,
+) -> str:
     """
     Normalizes string, converts to lowercase, removes non-alpha characters,
     and converts spaces to hyphens.
@@ -233,9 +267,10 @@ def slugify(value, regex_subs=(), preserve_case=False, use_unicode=False):
     """
 
     import unicodedata
+
     import unidecode
 
-    def normalize_unicode(text):
+    def normalize_unicode(text: str) -> str:
         # normalize text by compatibility composition
         # see: https://en.wikipedia.org/wiki/Unicode_equivalence
         return unicodedata.normalize("NFKC", text)
@@ -262,7 +297,9 @@ def slugify(value, regex_subs=(), preserve_case=False, use_unicode=False):
     return value.strip()
 
 
-def copy(source, destination, ignores=None):
+def copy(
+    source: str, destination: str, ignores: Optional[Iterable[str]] = None
+) -> None:
     """Recursively copy source into destination.
 
     If source is a file, destination has to be a file as well.
@@ -334,7 +371,7 @@ def copy(source, destination, ignores=None):
                     )
 
 
-def copy_file(source, destination):
+def copy_file(source: str, destination: str) -> None:
     """Copy a file"""
     try:
         shutil.copyfile(source, destination)
@@ -344,7 +381,7 @@ def copy_file(source, destination):
         )
 
 
-def clean_output_dir(path, retention):
+def clean_output_dir(path: str, retention: Iterable[str]) -> None:
     """Remove all files from output directory except those in retention list"""
 
     if not os.path.exists(path):
@@ -381,24 +418,24 @@ def clean_output_dir(path, retention):
             logger.error("Unable to delete %s, file type unknown", file)
 
 
-def get_relative_path(path):
+def get_relative_path(path: str) -> str:
     """Return the relative path from the given path to the root path."""
     components = split_all(path)
-    if len(components) <= 1:
+    if components is None or len(components) <= 1:
         return os.curdir
     else:
         parents = [os.pardir] * (len(components) - 1)
         return os.path.join(*parents)
 
 
-def path_to_url(path):
+def path_to_url(path: str) -> str:
     """Return the URL corresponding to a given path."""
     if path is not None:
         path = posixize_path(path)
     return path
 
 
-def posixize_path(rel_path):
+def posixize_path(rel_path: str) -> str:
     """Use '/' as path separator, so that source references,
     like '{static}/foo/bar.jpg' or 'extras/favicon.ico',
     will work on Windows as well as on Mac and Linux."""
@@ -427,20 +464,20 @@ class _HTMLWordTruncator(HTMLParser):
     _singlets = ("br", "col", "link", "base", "img", "param", "area", "hr", "input")
 
     class TruncationCompleted(Exception):
-        def __init__(self, truncate_at):
+        def __init__(self, truncate_at: int) -> None:
             super().__init__(truncate_at)
             self.truncate_at = truncate_at
 
-    def __init__(self, max_words):
+    def __init__(self, max_words: int) -> None:
         super().__init__(convert_charrefs=False)
 
         self.max_words = max_words
         self.words_found = 0
         self.open_tags = []
         self.last_word_end = None
-        self.truncate_at = None
+        self.truncate_at: Optional[int] = None
 
-    def feed(self, *args, **kwargs):
+    def feed(self, *args, **kwargs) -> None:
         try:
             super().feed(*args, **kwargs)
         except self.TruncationCompleted as exc:
@@ -448,29 +485,29 @@ class _HTMLWordTruncator(HTMLParser):
         else:
             self.truncate_at = None
 
-    def getoffset(self):
+    def getoffset(self) -> int:
         line_start = 0
         lineno, line_offset = self.getpos()
         for i in range(lineno - 1):
             line_start = self.rawdata.index("\n", line_start) + 1
         return line_start + line_offset
 
-    def add_word(self, word_end):
+    def add_word(self, word_end: int) -> None:
         self.words_found += 1
         self.last_word_end = None
         if self.words_found == self.max_words:
             raise self.TruncationCompleted(word_end)
 
-    def add_last_word(self):
+    def add_last_word(self) -> None:
         if self.last_word_end is not None:
             self.add_word(self.last_word_end)
 
-    def handle_starttag(self, tag, attrs):
+    def handle_starttag(self, tag: str, attrs: Any) -> None:
         self.add_last_word()
         if tag not in self._singlets:
             self.open_tags.insert(0, tag)
 
-    def handle_endtag(self, tag):
+    def handle_endtag(self, tag: str) -> None:
         self.add_last_word()
         try:
             i = self.open_tags.index(tag)
@@ -481,7 +518,7 @@ class _HTMLWordTruncator(HTMLParser):
             # all unclosed intervening start tags with omitted end tags
             del self.open_tags[: i + 1]
 
-    def handle_data(self, data):
+    def handle_data(self, data: str) -> None:
         word_end = 0
         offset = self.getoffset()
 
@@ -499,7 +536,7 @@ class _HTMLWordTruncator(HTMLParser):
         if word_end < len(data):
             self.add_last_word()
 
-    def _handle_ref(self, name, char):
+    def _handle_ref(self, name: str, char: str) -> None:
         """
         Called by handle_entityref() or handle_charref() when a ref like
         `&mdash;`, `&#8212;`, or `&#x2014` is found.
@@ -543,7 +580,7 @@ class _HTMLWordTruncator(HTMLParser):
             else:
                 self.add_last_word()
 
-    def handle_entityref(self, name):
+    def handle_entityref(self, name: str) -> None:
         """
         Called when an entity ref like '&mdash;' is found
 
@@ -556,7 +593,7 @@ class _HTMLWordTruncator(HTMLParser):
             char = ""
         self._handle_ref(name, char)
 
-    def handle_charref(self, name):
+    def handle_charref(self, name: str) -> None:
         """
         Called when a char ref like '&#8212;' or '&#x2014' is found
 
@@ -574,7 +611,7 @@ class _HTMLWordTruncator(HTMLParser):
         self._handle_ref("#" + name, char)
 
 
-def truncate_html_words(s, num, end_text="…"):
+def truncate_html_words(s: str, num: int, end_text: str = "…") -> str:
     """Truncates HTML to a certain number of words.
 
     (not counting tags and comments). Closes opened tags if they were correctly
@@ -600,7 +637,10 @@ def truncate_html_words(s, num, end_text="…"):
     return out
 
 
-def process_translations(content_list, translation_id=None):
+def process_translations(
+    content_list: List[Content],
+    translation_id: Optional[Union[str, Collection[str]]] = None,
+) -> Tuple[List[Content], List[Content]]:
     """Finds translations and returns them.
 
     For each content_list item, populates the 'translations' attribute, and
@@ -658,7 +698,7 @@ def process_translations(content_list, translation_id=None):
     return index, translations
 
 
-def get_original_items(items, with_str):
+def get_original_items(items: List[Content], with_str: str) -> List[Content]:
     def _warn_source_paths(msg, items, *extra):
         args = [len(items)]
         args.extend(extra)
@@ -698,7 +738,10 @@ def get_original_items(items, with_str):
     return original_items
 
 
-def order_content(content_list, order_by="slug"):
+def order_content(
+    content_list: List[Content],
+    order_by: Union[str, Callable[[Content], Any], None] = "slug",
+) -> List[Content]:
     """Sorts content.
 
     order_by can be a string of an attribute or sorting function. If order_by
@@ -758,7 +801,11 @@ def order_content(content_list, order_by="slug"):
     return content_list
 
 
-def wait_for_changes(settings_file, reader_class, settings):
+def wait_for_changes(
+    settings_file: str,
+    reader_class: Type["Readers"],
+    settings: "Settings",
+):
     content_path = settings.get("PATH", "")
     theme_path = settings.get("THEME", "")
     ignore_files = {
@@ -788,13 +835,15 @@ def wait_for_changes(settings_file, reader_class, settings):
     return next(
         watchfiles.watch(
             *watching_paths,
-            watch_filter=watchfiles.DefaultFilter(ignore_entity_patterns=ignore_files),
+            watch_filter=watchfiles.DefaultFilter(ignore_entity_patterns=ignore_files),  # type: ignore
             rust_timeout=0,
         )
     )
 
 
-def set_date_tzinfo(d, tz_name=None):
+def set_date_tzinfo(
+    d: datetime.datetime, tz_name: Optional[str] = None
+) -> datetime.datetime:
     """Set the timezone for dates that don't have tzinfo"""
     if tz_name and not d.tzinfo:
         timezone = ZoneInfo(tz_name)
@@ -805,11 +854,11 @@ def set_date_tzinfo(d, tz_name=None):
     return d
 
 
-def mkdir_p(path):
+def mkdir_p(path: str) -> None:
     os.makedirs(path, exist_ok=True)
 
 
-def split_all(path):
+def split_all(path: Union[str, pathlib.Path, None]) -> Optional[Sequence[str]]:
     """Split a path into a list of components
 
     While os.path.split() splits a single component off the back of
@@ -840,12 +889,12 @@ def split_all(path):
         )
 
 
-def path_to_file_url(path):
+def path_to_file_url(path: str) -> str:
     """Convert file-system path to file:// URL"""
     return urllib.parse.urljoin("file://", urllib.request.pathname2url(path))
 
 
-def maybe_pluralize(count, singular, plural):
+def maybe_pluralize(count: int, singular: str, plural: str) -> str:
     """
     Returns a formatted string containing count and plural if count is not 1
     Returns count and singular if count is 1
@@ -862,7 +911,9 @@ def maybe_pluralize(count, singular, plural):
 
 
 @contextmanager
-def temporary_locale(temp_locale=None, lc_category=locale.LC_ALL):
+def temporary_locale(
+    temp_locale: Optional[str] = None, lc_category: int = locale.LC_ALL
+) -> Generator[None, None, None]:
     """
     Enable code to run in a context with a temporary locale
     Resets the locale back when exiting context.

From c36ab075269771834b5e05e4d1586d050743d457 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Fri, 26 Jan 2024 16:31:22 -0700
Subject: [PATCH 2681/2864] write back to `._summary`

---
 pelican/contents.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 27b8bbc3..e0629e2a 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -519,7 +519,7 @@ class Content:
                 setattr(self, key.lower(), value)
 
         # _summary is an internal variable that some plugins may be writing to,
-        # so ensure changes to it are picked up
+        # so ensure changes to it are picked up, and write summary back to it
         if "summary" in self.settings["FORMATTED_FIELDS"]:
             if hasattr(self, "_summary"):
                 self.metadata["summary"] = self._summary
@@ -528,8 +528,6 @@ class Content:
                 self.metadata["summary"] = self._update_content(
                     self.metadata["summary"], self.get_siteurl()
                 )
-
-            if hasattr(self, "_summary") and "summary" in self.metadata:
                 self._summary = self.metadata["summary"]
 
 

From f1f2ceccc757d9743dde39f626eccf05e3e9a5b0 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Sat, 27 Jan 2024 10:47:54 -0700
Subject: [PATCH 2682/2864] Warning/error logging: be explicit in how the
 `stacklevel` variable is handled

---
 pelican/log.py | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index 6a8fcdf1..ef49d280 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -85,19 +85,39 @@ class FatalLogger(LimitLogger):
     warnings_fatal = False
     errors_fatal = False
 
-    # adding `stacklevel=2` means that the displayed filename and line number
-    # will match the "original" calling location, rather than the wrapper here
-    def warning(self, *args, **kwargs):
-        if "stacklevel" not in kwargs.keys():
-            kwargs["stacklevel"] = 2
-        super().warning(*args, **kwargs)
+    def warning(self, *args, stacklevel=1, **kwargs):
+        """
+        Displays a logging warning.
+
+        Wrapping it here allows Pelican to filter warnings, and conditionally
+        make warnings fatal.
+
+        Args:
+            stacklevel (int): the stacklevel that would be used to display the
+            calling location, except for this function. Adjusting the
+            stacklevel allows you to see the "true" calling location of the
+            warning, rather than this wrapper location.
+        """
+        stacklevel += 1
+        super().warning(*args, stacklevel=stacklevel, **kwargs)
         if FatalLogger.warnings_fatal:
             raise RuntimeError("Warning encountered")
 
-    def error(self, *args, **kwargs):
-        if "stacklevel" not in kwargs.keys():
-            kwargs["stacklevel"] = 2
-        super().error(*args, **kwargs)
+    def error(self, *args, stacklevel=1, **kwargs):
+        """
+        Displays a logging error.
+
+        Wrapping it here allows Pelican to filter errors, and conditionally
+        make errors non-fatal.
+
+        Args:
+            stacklevel (int): the stacklevel that would be used to display the
+            calling location, except for this function. Adjusting the
+            stacklevel allows you to see the "true" calling location of the
+            error, rather than this wrapper location.
+        """
+        stacklevel += 1
+        super().error(*args, stacklevel=stacklevel, **kwargs)
         if FatalLogger.errors_fatal:
             raise RuntimeError("Error encountered")
 

From 1f14606f8339385c5176ba05adca4664a3ad8868 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Sat, 27 Jan 2024 10:51:35 -0700
Subject: [PATCH 2683/2864] On failing to load a plugin, show the stacktrace is
 pelican is run in debug mode

---
 pelican/__init__.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 40251887..68f3e553 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -80,8 +80,14 @@ class Pelican:
                 plugin.register()
                 self.plugins.append(plugin)
             except Exception as e:
-                logger.error("Cannot register plugin `%s`\n%s", name, e, stacklevel=3)
-                print(e.stacktrace)
+                logger.error(
+                    "Cannot register plugin `%s`\n%s",
+                    name,
+                    e,
+                    stacklevel=2,
+                )
+                if self.settings.get("DEBUG", False):
+                    console.print_exception()
 
         self.settings["PLUGINS"] = [get_plugin_name(p) for p in self.plugins]
 

From 7c7c9355b6c27122dbff6446cd366017f81eb0f2 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 12 Mar 2024 11:57:46 +0100
Subject: [PATCH 2684/2864] Pin Ruff to major semantic version 0.1.x

Upgrading to 0.3.0+ requires code style changes to the code base.
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index c8bbe985..eb1884a9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -95,7 +95,7 @@ dev = [
     "pytest-xdist>=3.4.0",
     "tox>=4.11.3",
     "invoke>=2.2.0",
-    "ruff>=0.1.5",
+    "ruff>=0.1.5,<0.2.0",
     "tomli>=2.0.1; python_version < \"3.11\"",
 ]
 

From 74541381848f1d65ec64463469b5980ba0646617 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 12 Mar 2024 12:05:09 +0100
Subject: [PATCH 2685/2864] Update `setup-python` & `setup-pdm` GitHub Actions

---
 .github/workflows/main.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cd646522..8cd63cc7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           cache: "pip"
@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pdm-project/setup-pdm@v3
+      - uses: pdm-project/setup-pdm@v4
         with:
           python-version: "3.11"
           cache: true
@@ -71,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pdm-project/setup-pdm@v3
+      - uses: pdm-project/setup-pdm@v4
         with:
           python-version: "3.11"
           cache: true
@@ -90,7 +90,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           cache: "pip"
@@ -122,7 +122,7 @@ jobs:
           token: ${{ secrets.GH_TOKEN }}
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 

From fabc40927750f52f11f27695e89ff76c0863a79f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 12 Mar 2024 12:18:11 +0100
Subject: [PATCH 2686/2864] Update more GitHub Actions to resolve warnings

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8cd63cc7..4c0127df 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Run linters
         run: pdm lint --diff
       - name: Run pre-commit checks on all files
-        uses: pre-commit/action@v3.0.0
+        uses: pre-commit/action@v3.0.1
 
   build:
     name: Test build
@@ -100,7 +100,7 @@ jobs:
       - name: Check
         run: tox -e docs
       - name: cache the docs for inspection
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docs
           path: docs/_build/html/

From b87308cfaaa269c44784cda69855ecaf298f9f5e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 27 Mar 2024 08:25:48 +0100
Subject: [PATCH 2687/2864] Update Ruff dependency version

---
 .pre-commit-config.yaml | 2 +-
 pyproject.toml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 333bc3c0..d6cfac07 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
       - id: forbid-new-submodules
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.5
+    rev: v0.1.15
     hooks:
       - id: ruff
       - id: ruff-format
diff --git a/pyproject.toml b/pyproject.toml
index eb1884a9..2f7d677c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -95,7 +95,7 @@ dev = [
     "pytest-xdist>=3.4.0",
     "tox>=4.11.3",
     "invoke>=2.2.0",
-    "ruff>=0.1.5,<0.2.0",
+    "ruff>=0.1.15,<0.2.0",
     "tomli>=2.0.1; python_version < \"3.11\"",
 ]
 

From 94bcd41f27d7f38a9dbd0847c6166e91a66d2090 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 27 Mar 2024 08:26:55 +0100
Subject: [PATCH 2688/2864] Ignore Sphinx 7.2.x package install warnings

Sphinx 7.2+ requires Python 3.9+, which results in annoying warnings
since we still support Python 3.8.x.
---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index 2f7d677c..3ca06df4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -69,6 +69,7 @@ changelog-header = "###############"
 version-header = "="
 
 [tool.pdm]
+ignore_package_warnings = ["sphinx"]
 
 [tool.pdm.scripts]
 docbuild = "invoke docbuild"

From 666b962eb67369a2de45362b08c74524b5d49c57 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Fri, 19 Apr 2024 08:51:07 -0700
Subject: [PATCH 2689/2864] workaround Turkish locale issue

---
 pelican/utils.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pelican/utils.py b/pelican/utils.py
index 5f161667..86698aee 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -132,6 +132,10 @@ class DateFormatter:
 
     def __init__(self) -> None:
         self.locale = locale.setlocale(locale.LC_TIME)
+        # python has issue with Turkish_Türkiye.1254 locale, replace it to
+        # something accepted: Turkish
+        if self.locale == "Turkish_Türkiye.1254":
+            self.locale = "Turkish"
 
     def __call__(self, date: datetime.datetime, date_format: str) -> str:
         # on OSX, encoding from LC_CTYPE determines the unicode output in PY3
@@ -922,6 +926,10 @@ def temporary_locale(
     class to use the C locale.
     """
     orig_locale = locale.setlocale(lc_category)
+    # python has issue with Turkish_Türkiye.1254 locale, replace it to
+    # something accepted: Turkish
+    if orig_locale == "Turkish_Türkiye.1254":
+        orig_locale = "Turkish"
     if temp_locale:
         locale.setlocale(lc_category, temp_locale)
     yield

From 0b5934a1fa56bb7ca9b0b0011e35f9043afc6ce9 Mon Sep 17 00:00:00 2001
From: GiovanH <GiovanH@users.noreply.github.com>
Date: Fri, 19 Apr 2024 13:54:27 -0500
Subject: [PATCH 2690/2864] Feature: Add setting to append `ref` parameter to
 links in feeds (#3249)

---
 docs/settings.rst   | 5 +++++
 pelican/settings.py | 1 +
 pelican/writers.py  | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index e9edffde..4ae608c6 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1008,6 +1008,11 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
    to ``False``, the full content will be included instead. This setting
    doesn't affect Atom feeds, only RSS ones.
 
+.. data:: FEED_APPEND_REF = False
+
+   If set to ``True``, ``?ref=feed`` will be appended to links in generated
+   feeds for the purpose of referrer tracking.
+
 If you don't want to generate some or any of these feeds, set the above
 variables to ``None``.
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 29051ddb..47457ec1 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -52,6 +52,7 @@ DEFAULT_CONFIG = {
     "TRANSLATION_FEED_ATOM": "feeds/all-{lang}.atom.xml",
     "FEED_MAX_ITEMS": 100,
     "RSS_FEED_SUMMARY_ONLY": True,
+    "FEED_APPEND_REF": False,
     "SITEURL": "",
     "SITENAME": "A Pelican Blog",
     "DISPLAY_PAGES_ON_MENU": True,
diff --git a/pelican/writers.py b/pelican/writers.py
index d405fc88..1c41b4ee 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -53,6 +53,9 @@ class Writer:
         title = Markup(item.title).striptags()
         link = self.urljoiner(self.site_url, item.url)
 
+        if self.settings["FEED_APPEND_REF"]:
+            link = link + "?ref=feed"
+
         if isinstance(feed, Rss201rev2Feed):
             # RSS feeds use a single tag called 'description' for both the full
             # content and the summary

From e4d7f0a9d95cf2816e4c0b2b59849f49766e05dc Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 29 May 2024 07:28:22 +0200
Subject: [PATCH 2691/2864] Docs: GitHub Pages workflow not officially
 supported

---
 .github/workflows/github_pages.yml | 1 +
 docs/tips.rst                      | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index eb9e955f..f4a01b92 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -1,3 +1,4 @@
+# Workflow for publishing to GitHub Pages. **NO OFFICIAL SUPPORT PROVIDED.**
 name: Deploy to GitHub Pages
 on:
   workflow_call:
diff --git a/docs/tips.rst b/docs/tips.rst
index 904e5ee7..3344900d 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -126,8 +126,9 @@ branch of your GitHub repository::
 Publishing to GitHub Pages Using a Custom GitHub Actions Workflow
 -----------------------------------------------------------------
 
-Pelican comes with a `custom workflow <https://github.com/getpelican/pelican/blob/master/.github/workflows/github_pages.yml>`_
-for publishing a Pelican site. To use it:
+Pelican-powered sites can be published to GitHub Pages via a `custom workflow
+<https://github.com/getpelican/pelican/blob/master/.github/workflows/github_pages.yml>`_.
+**No official support is provided** for this community-submitted workflow. To use it:
 
 1. Enable GitHub Pages in your repo: go to **Settings → Pages** and choose
    **GitHub Actions** for the **Source** setting.

From 1001dcb6096d315bc460571c5f43ea88a33e1e18 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Wed, 29 May 2024 16:36:20 -0500
Subject: [PATCH 2692/2864] Fix test_deprecated_attribute failures in github
 tests

---
 pelican/tests/test_utils.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 22dd8e38..bd3f0d00 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -23,9 +23,17 @@ from pelican.tests.support import (
 from pelican.writers import Writer
 
 
-class TestUtils(LoggedTestCase):
+class ClassDeprAttr:
     _new_attribute = "new_value"
 
+    @utils.deprecated_attribute(
+        old="_old_attribute", new="_new_attribute", since=(3, 1, 0), remove=(4, 1, 3)
+    )
+    def _old_attribute():
+        return None
+
+
+class TestUtils(LoggedTestCase):
     def setUp(self):
         super().setUp()
         self.temp_output = mkdtemp(prefix="pelicantests.")
@@ -34,15 +42,10 @@ class TestUtils(LoggedTestCase):
         super().tearDown()
         shutil.rmtree(self.temp_output)
 
-    @utils.deprecated_attribute(
-        old="_old_attribute", new="_new_attribute", since=(3, 1, 0), remove=(4, 1, 3)
-    )
-    def _old_attribute():
-        return None
-
     def test_deprecated_attribute(self):
-        value = self._old_attribute
-        self.assertEqual(value, self._new_attribute)
+        test_class = ClassDeprAttr()
+        value = test_class._old_attribute
+        self.assertEqual(value, test_class._new_attribute)
         self.assertLogCountEqual(
             count=1,
             msg=(

From 4f46fedd731664547fc2b5e61f1d8d2c157d2dd3 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Thu, 30 May 2024 09:02:23 -0500
Subject: [PATCH 2693/2864] More Ruff checks, and make it fix

---
 .pre-commit-config.yaml |  2 +-
 pyproject.toml          | 99 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d6cfac07..0e65a965 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
     rev: v0.1.15
     hooks:
       - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
-        args: ["--check"]
 
 exclude: ^pelican/tests/output/
diff --git a/pyproject.toml b/pyproject.toml
index 3ca06df4..39694ffc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -111,3 +111,102 @@ source-includes = [
 [build-system]
 requires = ["pdm-backend"]
 build-backend = "pdm.backend"
+
+
+[tool.ruff.lint]
+# see https://docs.astral.sh/ruff/configuration/#using-pyprojecttoml
+# "F" contains autoflake, see https://github.com/astral-sh/ruff/issues/1647
+# add more rules
+select = [
+    # default Ruff checkers as of ruff 0.1.3: E4, E7, E9, F
+    "E4",
+    "E7",
+    "E9",
+    "F",  # pyflakes
+
+    # the rest in alphabetical order:
+    # TODO: "A",   # flake8-builtins
+    # TODO: "ARG", # flake8-unused-arguments
+    "B",   # flake8-bugbear
+    # TODO: "BLE", # flake8-blind-except
+    # TODO: Do I want "COM", # flake8-commas
+    "C4",  # flake8-comprehensions
+    # TODO: "DJ",  # flake8-django
+    # TODO: "DTZ", # flake8-datetimez
+    # TODO: "EM",  # flake8-errmsg
+    "EXE", # flake8-executable
+    # TODO: "FURB", # refurb
+    # TODO: "FBT", # flake8-boolean-trap
+    # TODO: "G",   # flake8-logging-format
+    "I",   # isort
+    "ICN", # flake8-import-conventions
+    "INP", # flake8-no-pep420
+    # TODO: "INT", # flake8-gettext
+    "ISC", # flake8-implicit-str-concat
+    # TODO: "LOG", # flake8-logging
+    "PERF", # perflint
+    "PIE", # flake8-pie
+    "PL",  # pylint
+    "PYI", # flake8-pyi
+    # TODO: "RET", # flake8-return
+    "RSE", # flake8-raise
+    "RUF",
+    # TODO: "SIM", # flake8-simplify
+    "SLF", # flake8-self
+    "SLOT", # flake8-slots
+    "TID", # flake8-tidy-imports
+    "UP",  # pyupgrade
+    "Q",   # flake8-quotes
+    "TCH", # flake8-type-checking
+    "T10", # flake8-debugger
+    "T20", # flake8-print
+    # TODO: "S",   # flake8-bandit
+    "YTT", # flake8-2020
+    # TODO: add more flake8 rules
+  ]
+
+ignore = [
+    # suppression in order of # of violations in Dec 2023:
+    "B007",  # unused-loop-control-variable
+    "T201",  # print
+    "PLW2901",  # redefined-loop-name
+    "SLF001",  # private-member-access
+    "RUF001",  # ambiguous-unicode-character-string
+    "PLR2004",  # magic-value-comparison
+    "PLR0912",  # too-many-branches
+    "PLR0913",  # too-many-arguments
+    "RUF005",  # collection-literal-concatenation
+    "RUF012",  # mutable-class-default
+    "PLR0915",  # too-many-statements
+    "INP001",  # implicit-namespace-package
+    "RUF015",  # unnecessary-iterable-allocation-for-first-element
+    "PLR1722",  # sys-exit-alias
+    "ISC001",  # single-line-implicit-string-concatenation
+    "C408",  # unnecessary-collection-call
+    "B904",  # raise-without-from-inside-except
+    "UP007",  # use `|` operator for union type annotations (PEP 604)
+    "UP031",  # printf-string-formatting
+    "PLR5501",  # collapsible-else-if
+    "PERF203",  # try-except-in-loop
+    "B006",  # mutable-argument-default
+    "PLR1714",  # repeated-equality-comparison
+    "PERF401",  # manual-list-comprehension
+    # TODO: these only have one violation each in Dec 2023:
+    "SLOT000",  # no-slots-in-str-subclass
+    "PYI024",  # collections-named-tuple
+    "PLW0603",  # global-statement
+    "PIE800",  # unnecessary-spread
+    "ISC003",  # explicit-string-concatenation
+    "EXE002",  # shebang-missing-executable-file
+    "C401",  # unnecessary-generator-set
+    "C416",  # unnecessary `list` comprehension
+    "B028",  # no-explicit-stacklevel
+    "B008",  # function-call-in-default-argument
+]
+
+[tool.ruff.lint.extend-per-file-ignores]
+
+"pelican/__init__.py" = [
+    # allow imports after a call to a function, see the file
+    "E402"
+]

From 6d8597addb17d5fa3027ead91427939e8e4e89ec Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Thu, 30 May 2024 09:05:36 -0500
Subject: [PATCH 2694/2864] The ruff and ruff-format fixes

---
 pelican/__init__.py                          |  8 ++---
 pelican/__main__.py                          |  1 -
 pelican/contents.py                          | 13 ++++---
 pelican/plugins/_utils.py                    |  1 -
 pelican/plugins/signals.py                   |  2 +-
 pelican/readers.py                           |  4 +--
 pelican/rstdirectives.py                     |  1 -
 pelican/settings.py                          |  6 ++--
 pelican/tests/build_test/test_build_files.py |  2 +-
 pelican/tests/support.py                     |  4 +--
 pelican/tests/test_cache.py                  |  1 -
 pelican/tests/test_contents.py               |  2 --
 pelican/tests/test_generators.py             |  2 +-
 pelican/tests/test_importer.py               | 14 ++++----
 pelican/tests/test_paginator.py              |  1 -
 pelican/tests/test_plugins.py                |  2 +-
 pelican/tests/test_readers.py                |  1 -
 pelican/tests/test_settings.py               |  1 -
 pelican/tools/pelican_import.py              |  1 -
 pelican/tools/pelican_quickstart.py          |  6 ++--
 pelican/tools/pelican_themes.py              | 14 ++------
 pelican/urlwrappers.py                       |  2 +-
 pelican/utils.py                             | 37 +++++++++-----------
 pelican/writers.py                           |  1 -
 24 files changed, 48 insertions(+), 79 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 2fd69f1b..aef4b124 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -19,10 +19,10 @@ __path__ = extend_path(__path__, __name__)
 
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
-from pelican.log import console
+from pelican.log import console  # noqa: I001
 from pelican.log import init as init_logging
 from pelican.generators import (
-    ArticlesGenerator,  # noqa: I100
+    ArticlesGenerator,
     PagesGenerator,
     SourceFileGenerator,
     StaticGenerator,
@@ -354,8 +354,8 @@ def parse_arguments(argv=None):
         "--settings",
         dest="settings",
         help="The settings of the application, this is "
-        "automatically set to {} if a file exists with this "
-        "name.".format(DEFAULT_CONFIG_NAME),
+        f"automatically set to {DEFAULT_CONFIG_NAME} if a file exists with this "
+        "name.",
     )
 
     parser.add_argument(
diff --git a/pelican/__main__.py b/pelican/__main__.py
index 17aead3b..41a1f712 100644
--- a/pelican/__main__.py
+++ b/pelican/__main__.py
@@ -4,6 +4,5 @@ python -m pelican module entry point to run via python -m
 
 from . import main
 
-
 if __name__ == "__main__":
     main()
diff --git a/pelican/contents.py b/pelican/contents.py
index c640df69..9532c523 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -17,6 +17,9 @@ except ModuleNotFoundError:
 
 from pelican.plugins import signals
 from pelican.settings import DEFAULT_CONFIG, Settings
+
+# Import these so that they're available when you import from pelican.contents.
+from pelican.urlwrappers import Author, Category, Tag, URLWrapper  # NOQA
 from pelican.utils import (
     deprecated_attribute,
     memoized,
@@ -28,9 +31,6 @@ from pelican.utils import (
     truncate_html_words,
 )
 
-# Import these so that they're available when you import from pelican.contents.
-from pelican.urlwrappers import Author, Category, Tag, URLWrapper  # NOQA
-
 logger = logging.getLogger(__name__)
 
 
@@ -370,13 +370,13 @@ class Content:
 
     def _get_intrasite_link_regex(self) -> re.Pattern:
         intrasite_link_regex = self.settings["INTRASITE_LINK_REGEX"]
-        regex = r"""
+        regex = rf"""
             (?P<markup><[^\>]+  # match tag with all url-value attributes
                 (?:href|src|poster|data|cite|formaction|action|content)\s*=\s*)
 
             (?P<quote>["\'])      # require value to be quoted
-            (?P<path>{}(?P<value>.*?))  # the url value
-            (?P=quote)""".format(intrasite_link_regex)
+            (?P<path>{intrasite_link_regex}(?P<value>.*?))  # the url value
+            (?P=quote)"""
         return re.compile(regex, re.X)
 
     def _update_content(self, content: str, siteurl: str) -> str:
@@ -465,7 +465,6 @@ class Content:
     @summary.setter
     def summary(self, value: str):
         """Dummy function"""
-        pass
 
     @property
     def status(self) -> str:
diff --git a/pelican/plugins/_utils.py b/pelican/plugins/_utils.py
index 805ed049..9dfc8f81 100644
--- a/pelican/plugins/_utils.py
+++ b/pelican/plugins/_utils.py
@@ -6,7 +6,6 @@ import logging
 import pkgutil
 import sys
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/pelican/plugins/signals.py b/pelican/plugins/signals.py
index 27177367..c36f595d 100644
--- a/pelican/plugins/signals.py
+++ b/pelican/plugins/signals.py
@@ -1,4 +1,4 @@
-from blinker import signal, Signal
+from blinker import Signal, signal
 from ordered_set import OrderedSet
 
 # Signals will call functions in the order of connection, i.e. plugin order
diff --git a/pelican/readers.py b/pelican/readers.py
index 60b9765a..e9b07582 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -22,7 +22,7 @@ from pelican.utils import get_date, pelican_open, posixize_path
 try:
     from markdown import Markdown
 except ImportError:
-    Markdown = False  # NOQA
+    Markdown = False
 
 # Metadata processors have no way to discard an unwanted value, so we have
 # them return this value instead to signal that it should be discarded later.
@@ -607,8 +607,8 @@ class Readers(FileStampDataCacher):
 
         # eventually filter the content with typogrify if asked so
         if self.settings["TYPOGRIFY"]:
-            from typogrify.filters import typogrify
             import smartypants
+            from typogrify.filters import typogrify
 
             typogrify_dashes = self.settings["TYPOGRIFY_DASHES"]
             if typogrify_dashes == "oldschool":
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index 0a549424..41bfc3d2 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -2,7 +2,6 @@ import re
 
 from docutils import nodes, utils
 from docutils.parsers.rst import Directive, directives, roles
-
 from pygments import highlight
 from pygments.formatters import HtmlFormatter
 from pygments.lexers import TextLexer, get_lexer_by_name
diff --git a/pelican/settings.py b/pelican/settings.py
index 47457ec1..2cd6fb00 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -267,9 +267,7 @@ def _printf_s_to_format_field(printf_string: str, format_field: str) -> str:
     TEST_STRING = "PELICAN_PRINTF_S_DEPRECATION"
     expected = printf_string % TEST_STRING
 
-    result = printf_string.replace("{", "{{").replace("}", "}}") % "{{{}}}".format(
-        format_field
-    )
+    result = printf_string.replace("{", "{{").replace("}", "}}") % f"{{{format_field}}}"
     if result.format(**{format_field: TEST_STRING}) != expected:
         raise ValueError(f"Failed to safely replace %s with {{{format_field}}}")
 
@@ -412,7 +410,7 @@ def handle_deprecated_settings(settings: Settings) -> Settings:
         )
         logger.warning(message)
         if old_values.get("SLUG"):
-            for f in {"CATEGORY", "TAG"}:
+            for f in ("CATEGORY", "TAG"):
                 if old_values.get(f):
                     old_values[f] = old_values["SLUG"] + old_values[f]
             old_values["AUTHOR"] = old_values.get("AUTHOR", [])
diff --git a/pelican/tests/build_test/test_build_files.py b/pelican/tests/build_test/test_build_files.py
index 9aad990d..c80253db 100644
--- a/pelican/tests/build_test/test_build_files.py
+++ b/pelican/tests/build_test/test_build_files.py
@@ -1,6 +1,6 @@
-from re import match
 import tarfile
 from pathlib import Path
+from re import match
 from zipfile import ZipFile
 
 import pytest
diff --git a/pelican/tests/support.py b/pelican/tests/support.py
index 16060441..f43468b2 100644
--- a/pelican/tests/support.py
+++ b/pelican/tests/support.py
@@ -261,9 +261,7 @@ class LoggedTestCase(unittest.TestCase):
         self.assertEqual(
             actual,
             count,
-            msg="expected {} occurrences of {!r}, but found {}".format(
-                count, msg, actual
-            ),
+            msg=f"expected {count} occurrences of {msg!r}, but found {actual}",
         )
 
 
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index 6dc91b2c..a1bbc559 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -6,7 +6,6 @@ from unittest.mock import MagicMock
 from pelican.generators import ArticlesGenerator, PagesGenerator
 from pelican.tests.support import get_context, get_settings, unittest
 
-
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_DIR = os.path.join(CUR_DIR, "content")
 
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 9dc7b70d..89219029 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -13,7 +13,6 @@ from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import LoggedTestCase, get_context, get_settings, unittest
 from pelican.utils import path_to_url, posixize_path, truncate_html_words
 
-
 # generate one paragraph, enclosed with <p>
 TEST_CONTENT = str(generate_lorem_ipsum(n=1))
 TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
@@ -297,7 +296,6 @@ class TestPage(TestBase):
     def test_signal(self):
         def receiver_test_function(sender):
             receiver_test_function.has_been_called = True
-            pass
 
         receiver_test_function.has_been_called = False
 
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 8c257b55..920d9061 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -13,11 +13,11 @@ from pelican.generators import (
     TemplatePagesGenerator,
 )
 from pelican.tests.support import (
+    TestCaseWithCLocale,
     can_symlink,
     get_context,
     get_settings,
     unittest,
-    TestCaseWithCLocale,
 )
 from pelican.writers import Writer
 
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 916c1183..469184cd 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -5,11 +5,11 @@ from unittest.mock import patch
 
 from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import (
+    TestCaseWithCLocale,
     mute,
     skipIfNoExecutable,
     temporary_folder,
     unittest,
-    TestCaseWithCLocale,
 )
 from pelican.tools.pelican_import import (
     blogger2fields,
@@ -19,12 +19,12 @@ from pelican.tools.pelican_import import (
     download_attachments,
     fields2pelican,
     get_attachments,
-    tumblr2fields,
-    wp2fields,
+    medium_slug,
     mediumpost2fields,
     mediumposts2fields,
     strip_medium_post_content,
-    medium_slug,
+    tumblr2fields,
+    wp2fields,
 )
 from pelican.utils import path_to_file_url, slugify
 
@@ -41,7 +41,7 @@ WORDPRESS_DECODED_CONTENT_SAMPLE = os.path.join(
 try:
     from bs4 import BeautifulSoup
 except ImportError:
-    BeautifulSoup = False  # NOQA
+    BeautifulSoup = False
 
 try:
     import bs4.builder._lxml as LXML
@@ -532,9 +532,7 @@ class TestWordpressXMLAttachements(TestCaseWithCLocale):
                 self.assertEqual(self.attachments[post], {expected_invalid})
             else:
                 self.fail(
-                    "all attachments should match to a " "filename or None, {}".format(
-                        post
-                    )
+                    "all attachments should match to a " f"filename or None, {post}"
                 )
 
     def test_download_attachments(self):
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 2160421f..6a7dbe02 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -7,7 +7,6 @@ from pelican.paginator import Paginator
 from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import get_settings, unittest
 
-
 # generate one paragraph, enclosed with <p>
 TEST_CONTENT = str(generate_lorem_ipsum(n=1))
 TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
index 55fa8a6a..69a0384c 100644
--- a/pelican/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -1,7 +1,6 @@
 import os
 from contextlib import contextmanager
 
-import pelican.tests.dummy_plugins.normal_plugin.normal_plugin as normal_plugin
 from pelican.plugins._utils import (
     get_namespace_plugins,
     get_plugin_name,
@@ -9,6 +8,7 @@ from pelican.plugins._utils import (
     plugin_enabled,
 )
 from pelican.plugins.signals import signal
+from pelican.tests.dummy_plugins.normal_plugin import normal_plugin
 from pelican.tests.support import unittest
 
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 04049894..e49c8b74 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -5,7 +5,6 @@ from pelican import readers
 from pelican.tests.support import get_settings, unittest
 from pelican.utils import SafeDatetime
 
-
 CUR_DIR = os.path.dirname(__file__)
 CONTENT_PATH = os.path.join(CUR_DIR, "content")
 
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index f370f7eb..84f7a5c9 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -3,7 +3,6 @@ import locale
 import os
 from os.path import abspath, dirname, join
 
-
 from pelican.settings import (
     DEFAULT_CONFIG,
     DEFAULT_THEME,
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index eb343860..3e1f31db 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -22,7 +22,6 @@ from pelican.log import init
 from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import SafeDatetime, slugify
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index a4dc98e1..c00a252c 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -169,7 +169,7 @@ def ask_timezone(question, default, tzurl):
             r = tz_dict[r]
             break
         else:
-            print("Please enter a valid time zone:\n" " (check [{}])".format(tzurl))
+            print("Please enter a valid time zone:\n" f" (check [{tzurl}])")
     return r
 
 
@@ -205,14 +205,14 @@ def main():
     args = parser.parse_args()
 
     print(
-        """Welcome to pelican-quickstart v{v}.
+        f"""Welcome to pelican-quickstart v{__version__}.
 
 This script will help you create a new Pelican-based website.
 
 Please answer the following questions so this script can generate the files
 needed by Pelican.
 
-    """.format(v=__version__)
+    """
     )
 
     project = os.path.join(os.environ.get("VIRTUAL_ENV", os.curdir), ".project")
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index c5b49b9f..fa59b8fd 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -240,15 +240,11 @@ def install(path, v=False, u=False):
                 except OSError as e:
                     err(
                         "Cannot change permissions of files "
-                        "or directory in `{r}':\n{e}".format(r=theme_path, e=str(e)),
+                        f"or directory in `{theme_path}':\n{e!s}",
                         die=False,
                     )
             except Exception as e:
-                err(
-                    "Cannot copy `{p}' to `{t}':\n{e}".format(
-                        p=path, t=theme_path, e=str(e)
-                    )
-                )
+                err(f"Cannot copy `{path}' to `{theme_path}':\n{e!s}")
 
 
 def symlink(path, v=False):
@@ -268,11 +264,7 @@ def symlink(path, v=False):
             try:
                 os.symlink(path, theme_path)
             except Exception as e:
-                err(
-                    "Cannot link `{p}' to `{t}':\n{e}".format(
-                        p=path, t=theme_path, e=str(e)
-                    )
-                )
+                err(f"Cannot link `{path}' to `{theme_path}':\n{e!s}")
 
 
 def is_broken_link(path):
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 6d705d4c..4ed385f9 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -98,7 +98,7 @@ class URLWrapper:
         return self.name
 
     def __repr__(self):
-        return f"<{type(self).__name__} {repr(self._name)}>"
+        return f"<{type(self).__name__} {self._name!r}>"
 
     def _from_settings(self, key, get_page_name=False):
         """Returns URL information as defined in settings.
diff --git a/pelican/utils.py b/pelican/utils.py
index 86698aee..7017c458 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -23,14 +23,10 @@ from typing import (
     Any,
     Callable,
     Collection,
-    Dict,
     Generator,
     Iterable,
-    List,
     Optional,
     Sequence,
-    Tuple,
-    Type,
     Union,
 )
 
@@ -40,9 +36,8 @@ try:
     from zoneinfo import ZoneInfo
 except ModuleNotFoundError:
     from backports.zoneinfo import ZoneInfo
-from markupsafe import Markup
-
 import watchfiles
+from markupsafe import Markup
 
 if TYPE_CHECKING:
     from pelican.contents import Content
@@ -158,7 +153,7 @@ class memoized:
 
     def __init__(self, func: Callable) -> None:
         self.func = func
-        self.cache: Dict[Any, Any] = {}
+        self.cache: dict[Any, Any] = {}
 
     def __call__(self, *args) -> Any:
         if not isinstance(args, Hashable):
@@ -185,8 +180,8 @@ class memoized:
 def deprecated_attribute(
     old: str,
     new: str,
-    since: Tuple[int, ...],
-    remove: Optional[Tuple[int, ...]] = None,
+    since: tuple[int, ...],
+    remove: Optional[tuple[int, ...]] = None,
     doc: Optional[str] = None,
 ):
     """Attribute deprecation decorator for gentle upgrades
@@ -256,7 +251,7 @@ def pelican_open(
 
 def slugify(
     value: str,
-    regex_subs: Iterable[Tuple[str, str]] = (),
+    regex_subs: Iterable[tuple[str, str]] = (),
     preserve_case: bool = False,
     use_unicode: bool = False,
 ) -> str:
@@ -642,9 +637,9 @@ def truncate_html_words(s: str, num: int, end_text: str = "…") -> str:
 
 
 def process_translations(
-    content_list: List[Content],
+    content_list: list[Content],
     translation_id: Optional[Union[str, Collection[str]]] = None,
-) -> Tuple[List[Content], List[Content]]:
+) -> tuple[list[Content], list[Content]]:
     """Finds translations and returns them.
 
     For each content_list item, populates the 'translations' attribute, and
@@ -674,14 +669,14 @@ def process_translations(
         content_list.sort(key=attrgetter(*translation_id))
     except TypeError:
         raise TypeError(
-            "Cannot unpack {}, 'translation_id' must be falsy, a"
-            " string or a collection of strings".format(translation_id)
+            f"Cannot unpack {translation_id}, 'translation_id' must be falsy, a"
+            " string or a collection of strings"
         )
     except AttributeError:
         raise AttributeError(
-            "Cannot use {} as 'translation_id', there "
+            f"Cannot use {translation_id} as 'translation_id', there "
             "appear to be items without these metadata "
-            "attributes".format(translation_id)
+            "attributes"
         )
 
     for id_vals, items in groupby(content_list, attrgetter(*translation_id)):
@@ -702,7 +697,7 @@ def process_translations(
     return index, translations
 
 
-def get_original_items(items: List[Content], with_str: str) -> List[Content]:
+def get_original_items(items: list[Content], with_str: str) -> list[Content]:
     def _warn_source_paths(msg, items, *extra):
         args = [len(items)]
         args.extend(extra)
@@ -743,9 +738,9 @@ def get_original_items(items: List[Content], with_str: str) -> List[Content]:
 
 
 def order_content(
-    content_list: List[Content],
+    content_list: list[Content],
     order_by: Union[str, Callable[[Content], Any], None] = "slug",
-) -> List[Content]:
+) -> list[Content]:
     """Sorts content.
 
     order_by can be a string of an attribute or sorting function. If order_by
@@ -807,8 +802,8 @@ def order_content(
 
 def wait_for_changes(
     settings_file: str,
-    reader_class: Type["Readers"],
-    settings: "Settings",
+    reader_class: type[Readers],
+    settings: Settings,
 ):
     content_path = settings.get("PATH", "")
     theme_path = settings.get("THEME", "")
diff --git a/pelican/writers.py b/pelican/writers.py
index 1c41b4ee..746811e1 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -4,7 +4,6 @@ from posixpath import join as posix_join
 from urllib.parse import urljoin
 
 from feedgenerator import Atom1Feed, Rss201rev2Feed, get_tag_uri
-
 from markupsafe import Markup
 
 from pelican.paginator import Paginator

From c46063cfc39dcde030f30ffaaf8896899805c5c8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 30 May 2024 16:42:09 +0200
Subject: [PATCH 2695/2864] Ignore latest Ruff fixes in `git blame`

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 0d92c9d9..bccdab76 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -5,3 +5,5 @@ cabdb26cee66e1173cf16cb31d3fe5f9fa4392e7
 ecd598f293161a52564aa6e8dfdcc8284dc93970
 # Apply Ruff and pyupgrade to Jinja templates
 db241feaa445375dc05e189e69287000ffe5fa8e
+# Change pre-commit to run ruff and ruff-format with fixes
+6d8597addb17d5fa3027ead91427939e8e4e89ec

From 39c964450ce5e1dd2987561f475374790f02c6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Pit-Claudel?=
 <cpitclaudel@users.noreply.github.com>
Date: Thu, 30 May 2024 17:13:27 +0200
Subject: [PATCH 2696/2864] Choose logging handler via `--log-handler` CLI
 option (#3293)

---
 pelican/__init__.py | 16 +++++++++++++++-
 pelican/log.py      |  9 +++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index aef4b124..8a880584 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -19,7 +19,7 @@ __path__ = extend_path(__path__, __name__)
 
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
-from pelican.log import console  # noqa: I001
+from pelican.log import console, DEFAULT_LOG_HANDLER  # noqa: I001
 from pelican.log import init as init_logging
 from pelican.generators import (
     ArticlesGenerator,
@@ -455,6 +455,17 @@ def parse_arguments(argv=None):
         ),
     )
 
+    LOG_HANDLERS = {"plain": None, "rich": DEFAULT_LOG_HANDLER}
+    parser.add_argument(
+        "--log-handler",
+        default="rich",
+        choices=LOG_HANDLERS,
+        help=(
+            "Which handler to use to format log messages. "
+            "The `rich` handler prints output in columns."
+        ),
+    )
+
     parser.add_argument(
         "--logs-dedup-min-level",
         default="WARNING",
@@ -509,6 +520,8 @@ def parse_arguments(argv=None):
     if args.bind is not None and not args.listen:
         logger.warning("--bind without --listen has no effect")
 
+    args.log_handler = LOG_HANDLERS[args.log_handler]
+
     return args
 
 
@@ -631,6 +644,7 @@ def main(argv=None):
         level=args.verbosity,
         fatal=args.fatal,
         name=__name__,
+        handler=args.log_handler,
         logs_dedup_min_level=logs_dedup_min_level,
     )
 
diff --git a/pelican/log.py b/pelican/log.py
index ef49d280..edf2f182 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -126,11 +126,13 @@ logging.setLoggerClass(FatalLogger)
 # force root logger to be of our preferred class
 logging.getLogger().__class__ = FatalLogger
 
+DEFAULT_LOG_HANDLER = RichHandler(console=console)
+
 
 def init(
     level=None,
     fatal="",
-    handler=RichHandler(console=console),
+    handler=DEFAULT_LOG_HANDLER,
     name=None,
     logs_dedup_min_level=None,
 ):
@@ -139,7 +141,10 @@ def init(
 
     LOG_FORMAT = "%(message)s"
     logging.basicConfig(
-        level=level, format=LOG_FORMAT, datefmt="[%H:%M:%S]", handlers=[handler]
+        level=level,
+        format=LOG_FORMAT,
+        datefmt="[%H:%M:%S]",
+        handlers=[handler] if handler else [],
     )
 
     logger = logging.getLogger(name)

From 800f22b3ba2139c267d44c45b681461294262b7d Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Thu, 30 May 2024 10:49:57 -0500
Subject: [PATCH 2697/2864] Upgrade ruff to v0.4.6, pre-commit-hooks to v4.6.0

---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0e65a965..626ea299 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for info on hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -14,7 +14,7 @@ repos:
       - id: forbid-new-submodules
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.15
+    rev: v0.4.6
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

From 0bd02c00c078fe041b65fbf4eab13601bb42676d Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Thu, 30 May 2024 10:53:38 -0500
Subject: [PATCH 2698/2864] Ruff v0.4.6 auto-fixes

---
 pelican/__init__.py              | 10 +---------
 pelican/settings.py              |  5 +----
 pelican/tests/test_generators.py | 12 ++++++------
 pelican/utils.py                 | 18 +++++++++---------
 pelican/writers.py               |  2 +-
 5 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 8a880584..d63f88c3 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -193,15 +193,7 @@ class Pelican:
         )
 
         console.print(
-            "Done: Processed {}, {}, {}, {}, {} and {} in {:.2f} seconds.".format(
-                pluralized_articles,
-                pluralized_drafts,
-                pluralized_hidden_articles,
-                pluralized_pages,
-                pluralized_hidden_pages,
-                pluralized_draft_pages,
-                time.time() - start_time,
-            )
+            f"Done: Processed {pluralized_articles}, {pluralized_drafts}, {pluralized_hidden_articles}, {pluralized_pages}, {pluralized_hidden_pages} and {pluralized_draft_pages} in {time.time() - start_time:.2f} seconds."
         )
 
     def _get_generator_classes(self):
diff --git a/pelican/settings.py b/pelican/settings.py
index 2cd6fb00..0585b3be 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -322,10 +322,7 @@ def handle_deprecated_settings(settings: Settings) -> Settings:
             "EXTRA_TEMPLATES_PATHS is deprecated use "
             "THEME_TEMPLATES_OVERRIDES instead."
         )
-        if (
-            "THEME_TEMPLATES_OVERRIDES" in settings
-            and settings["THEME_TEMPLATES_OVERRIDES"]
-        ):
+        if settings.get("THEME_TEMPLATES_OVERRIDES"):
             raise Exception(
                 "Setting both EXTRA_TEMPLATES_PATHS and "
                 "THEME_TEMPLATES_OVERRIDES is not permitted. Please move to "
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 920d9061..e739e180 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -597,9 +597,9 @@ class TestArticlesGenerator(unittest.TestCase):
         self.assertEqual(expected, abbreviated_archives)
 
         # Day archives enabled:
-        settings[
-            "DAY_ARCHIVE_SAVE_AS"
-        ] = "posts/{date:%Y}/{date:%b}/{date:%d}/index.html"
+        settings["DAY_ARCHIVE_SAVE_AS"] = (
+            "posts/{date:%Y}/{date:%b}/{date:%d}/index.html"
+        )
         settings["DAY_ARCHIVE_URL"] = "posts/{date:%Y}/{date:%b}/{date:%d}/"
         context = get_context(settings)
         generator = ArticlesGenerator(
@@ -737,9 +737,9 @@ class TestArticlesGenerator(unittest.TestCase):
             all_articles=generator.articles,
         )
 
-        settings[
-            "DAY_ARCHIVE_SAVE_AS"
-        ] = "posts/{date:%Y}/{date:%b}/{date:%d}/index.html"
+        settings["DAY_ARCHIVE_SAVE_AS"] = (
+            "posts/{date:%Y}/{date:%b}/{date:%d}/index.html"
+        )
         settings["DAY_ARCHIVE_URL"] = "posts/{date:%Y}/{date:%b}/{date:%d}/"
         context = get_context(settings)
         generator = ArticlesGenerator(
diff --git a/pelican/utils.py b/pelican/utils.py
index 7017c458..78e3e807 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -446,15 +446,15 @@ class _HTMLWordTruncator(HTMLParser):
         r"{DBC}|(\w[\w'-]*)".format(
             # DBC means CJK-like characters. An character can stand for a word.
             DBC=(
-                "([\u4E00-\u9FFF])|"  # CJK Unified Ideographs
-                "([\u3400-\u4DBF])|"  # CJK Unified Ideographs Extension A
-                "([\uF900-\uFAFF])|"  # CJK Compatibility Ideographs
-                "([\U00020000-\U0002A6DF])|"  # CJK Unified Ideographs Extension B
-                "([\U0002F800-\U0002FA1F])|"  # CJK Compatibility Ideographs Supplement
-                "([\u3040-\u30FF])|"  # Hiragana and Katakana
-                "([\u1100-\u11FF])|"  # Hangul Jamo
-                "([\uAC00-\uD7FF])|"  # Hangul Compatibility Jamo
-                "([\u3130-\u318F])"  # Hangul Syllables
+                "([\u4e00-\u9fff])|"  # CJK Unified Ideographs
+                "([\u3400-\u4dbf])|"  # CJK Unified Ideographs Extension A
+                "([\uf900-\ufaff])|"  # CJK Compatibility Ideographs
+                "([\U00020000-\U0002a6df])|"  # CJK Unified Ideographs Extension B
+                "([\U0002f800-\U0002fa1f])|"  # CJK Compatibility Ideographs Supplement
+                "([\u3040-\u30ff])|"  # Hiragana and Katakana
+                "([\u1100-\u11ff])|"  # Hangul Jamo
+                "([\uac00-\ud7ff])|"  # Hangul Compatibility Jamo
+                "([\u3130-\u318f])"  # Hangul Syllables
             )
         ),
         re.UNICODE,
diff --git a/pelican/writers.py b/pelican/writers.py
index 746811e1..cce01b58 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -27,7 +27,7 @@ class Writer:
         self._overridden_files = set()
 
         # See Content._link_replacer for details
-        if "RELATIVE_URLS" in self.settings and self.settings["RELATIVE_URLS"]:
+        if self.settings.get("RELATIVE_URLS"):
             self.urljoiner = posix_join
         else:
             self.urljoiner = lambda base, url: urljoin(

From 54ac03fca6f1d999f61d2f4119dafe156e1a24d8 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Thu, 30 May 2024 10:56:06 -0500
Subject: [PATCH 2699/2864] change ruff version in pyproject.toml

---
 .pre-commit-config.yaml | 1 +
 pyproject.toml          | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 626ea299..a3e7ab17 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,6 +14,7 @@ repos:
       - id: forbid-new-submodules
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
+    # ruff version should match the one in pyproject.toml
     rev: v0.4.6
     hooks:
       - id: ruff
diff --git a/pyproject.toml b/pyproject.toml
index 39694ffc..c84c35b0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,8 @@ dev = [
     "pytest-xdist>=3.4.0",
     "tox>=4.11.3",
     "invoke>=2.2.0",
-    "ruff>=0.1.15,<0.2.0",
+    # ruff version should match the one in .pre-commit-config.yaml
+    "ruff==0.4.6",
     "tomli>=2.0.1; python_version < \"3.11\"",
 ]
 

From 9d46a94d6d1643258af6246706c0e82c86deb1b1 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 30 May 2024 19:15:56 +0200
Subject: [PATCH 2700/2864] Ignore Ruff 0.4.x fixes in `git blame`

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index bccdab76..2809b658 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -7,3 +7,5 @@ ecd598f293161a52564aa6e8dfdcc8284dc93970
 db241feaa445375dc05e189e69287000ffe5fa8e
 # Change pre-commit to run ruff and ruff-format with fixes
 6d8597addb17d5fa3027ead91427939e8e4e89ec
+# Upgrade Ruff from 0.1.x to 0.4.x
+0bd02c00c078fe041b65fbf4eab13601bb42676d

From b6d3b6589935f8e2ea6d01e2ff6f8ee3a308af8c Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Thu, 30 May 2024 10:33:40 -0500
Subject: [PATCH 2701/2864] More ruff checks

---
 pyproject.toml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index c84c35b0..5546d1cf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -190,19 +190,10 @@ ignore = [
     "PLR5501",  # collapsible-else-if
     "PERF203",  # try-except-in-loop
     "B006",  # mutable-argument-default
-    "PLR1714",  # repeated-equality-comparison
-    "PERF401",  # manual-list-comprehension
     # TODO: these only have one violation each in Dec 2023:
     "SLOT000",  # no-slots-in-str-subclass
     "PYI024",  # collections-named-tuple
-    "PLW0603",  # global-statement
     "PIE800",  # unnecessary-spread
-    "ISC003",  # explicit-string-concatenation
-    "EXE002",  # shebang-missing-executable-file
-    "C401",  # unnecessary-generator-set
-    "C416",  # unnecessary `list` comprehension
-    "B028",  # no-explicit-stacklevel
-    "B008",  # function-call-in-default-argument
 ]
 
 [tool.ruff.lint.extend-per-file-ignores]

From 9d30c5608a58d202b1c02d55651e6ac746bfb173 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Thu, 30 May 2024 10:33:50 -0500
Subject: [PATCH 2702/2864] Code changes for more ruff checks

---
 pelican/server.py               |  7 +++----
 pelican/settings.py             |  2 +-
 pelican/tests/test_importer.py  | 29 ++++++++++++++---------------
 pelican/tests/test_testsuite.py |  2 +-
 samples/pelican.conf.py         |  0
 5 files changed, 19 insertions(+), 21 deletions(-)
 mode change 100755 => 100644 samples/pelican.conf.py

diff --git a/pelican/server.py b/pelican/server.py
index 61729bf1..71cd2d81 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -32,19 +32,18 @@ def parse_arguments():
         "--cert",
         default="./cert.pem",
         nargs="?",
-        help="Path to certificate file. " + "Relative to current directory",
+        help="Path to certificate file. Relative to current directory",
     )
     parser.add_argument(
         "--key",
         default="./key.pem",
         nargs="?",
-        help="Path to certificate key file. " + "Relative to current directory",
+        help="Path to certificate key file. Relative to current directory",
     )
     parser.add_argument(
         "--path",
         default=".",
-        help="Path to pelican source directory to serve. "
-        + "Relative to current directory",
+        help="Path to pelican source directory to serve. Relative to current directory",
     )
     return parser.parse_args()
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 0585b3be..ea6fae77 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -223,7 +223,7 @@ def read_settings(
     # parameters to docutils directive handlers, so we have to have a
     # variable here that we'll import from within Pygments.run (see
     # rstdirectives.py) to see what the user defaults were.
-    global PYGMENTS_RST_OPTIONS
+    global PYGMENTS_RST_OPTIONS  # noqa: PLW0603
     PYGMENTS_RST_OPTIONS = settings.get("PYGMENTS_RST_OPTIONS", None)
     return settings
 
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 469184cd..e69e321f 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -152,11 +152,12 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
 
     def test_dircat(self):
         silent_f2p = mute(True)(fields2pelican)
-        test_posts = []
-        for post in self.posts:
-            # check post kind
-            if len(post[5]) > 0:  # Has a category
-                test_posts.append(post)
+        test_posts = [
+            post
+            for post in self.posts
+            # check post has a category
+            if len(post[5]) > 0
+        ]
         with temporary_folder() as temp:
             fnames = list(silent_f2p(test_posts, "markdown", temp, dircat=True))
         subs = DEFAULT_CONFIG["SLUG_REGEX_SUBSTITUTIONS"]
@@ -185,7 +186,7 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
             kind,
             format,
         ) in self.posts:
-            if kind == "page" or kind == "article":
+            if kind in {"page", "article"}:
                 pass
             else:
                 pages_data.append((title, fname))
@@ -206,7 +207,7 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
             kind,
             format,
         ) in self.custposts:
-            if kind == "article" or kind == "page":
+            if kind in {"page", "article"}:
                 pass
             else:
                 cust_data.append((title, kind))
@@ -266,11 +267,12 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
     def test_wp_custpost_true_dirpage_false(self):
         # pages should only be put in their own directory when dirpage = True
         silent_f2p = mute(True)(fields2pelican)
-        test_posts = []
-        for post in self.custposts:
+        test_posts = [
+            post
+            for post in self.custposts
             # check post kind
-            if post[8] == "page":
-                test_posts.append(post)
+            if post[8] == "page"
+        ]
         with temporary_folder() as temp:
             fnames = list(
                 silent_f2p(
@@ -748,10 +750,7 @@ class TestMediumImporter(TestCaseWithCLocale):
 
     def test_mediumposts2field(self):
         """Parse all posts in an export directory"""
-        posts = [
-            fields
-            for fields in mediumposts2fields(f"{self.test_content_root}/medium_posts")
-        ]
+        posts = list(mediumposts2fields(f"{self.test_content_root}/medium_posts"))
         self.assertEqual(1, len(posts))
         self.assertEqual(self.post_tuple, posts[0])
 
diff --git a/pelican/tests/test_testsuite.py b/pelican/tests/test_testsuite.py
index a9a0c200..938d2bdf 100644
--- a/pelican/tests/test_testsuite.py
+++ b/pelican/tests/test_testsuite.py
@@ -6,4 +6,4 @@ from pelican.tests.support import unittest
 class TestSuiteTest(unittest.TestCase):
     def test_error_on_warning(self):
         with self.assertRaises(UserWarning):
-            warnings.warn("test warning")
+            warnings.warn("test warning")  # noqa: B028
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
old mode 100755
new mode 100644

From 144b2edf88026a764b1978f4cb0f27e150d1334e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 30 May 2024 19:40:45 +0200
Subject: [PATCH 2703/2864] Ignore more Ruff fixes in `git blame`

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 2809b658..fddd0764 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -9,3 +9,5 @@ db241feaa445375dc05e189e69287000ffe5fa8e
 6d8597addb17d5fa3027ead91427939e8e4e89ec
 # Upgrade Ruff from 0.1.x to 0.4.x
 0bd02c00c078fe041b65fbf4eab13601bb42676d
+# Apply more Ruff checks to code
+9d30c5608a58d202b1c02d55651e6ac746bfb173

From 3624bcdbf41f570471d24d59dc7ccb24f536e3fe Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Thu, 30 May 2024 13:18:03 -0500
Subject: [PATCH 2704/2864] More ruff fixes: stop ignoring C408, UP007,
 PLR5501, B006

---
 pyproject.toml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 5546d1cf..b7e39a4a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -182,14 +182,17 @@ ignore = [
     "INP001",  # implicit-namespace-package
     "RUF015",  # unnecessary-iterable-allocation-for-first-element
     "PLR1722",  # sys-exit-alias
+    # ruff-format wants us to ignore ISC001.  I don't love that, but okay.
+    # "warning: The following rules may cause conflicts when used with the formatter:
+    #  `ISC001`. To avoid unexpected behavior, we recommend disabling these rules,
+    #  either by removing them from the `select` or `extend-select` configuration,
+    #  or adding them to the `ignore` configuration."
     "ISC001",  # single-line-implicit-string-concatenation
-    "C408",  # unnecessary-collection-call
     "B904",  # raise-without-from-inside-except
-    "UP007",  # use `|` operator for union type annotations (PEP 604)
     "UP031",  # printf-string-formatting
-    "PLR5501",  # collapsible-else-if
+    # PERF203 has minimal performance impact, and you have to catch the exception
+    # inside the loop if you want to ignore it, so let's ignore PERF203.
     "PERF203",  # try-except-in-loop
-    "B006",  # mutable-argument-default
     # TODO: these only have one violation each in Dec 2023:
     "SLOT000",  # no-slots-in-str-subclass
     "PYI024",  # collections-named-tuple

From 7577dd7603f7cb3a09922d1edb65b6eafb6e2ac7 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Thu, 30 May 2024 13:21:12 -0500
Subject: [PATCH 2705/2864] More ruff fixes in files: stop ignoring C408,
 UP007, PLR5501, B006

---
 pelican/__init__.py                 |  6 +++---
 pelican/contents.py                 |  4 ++--
 pelican/generators.py               |  6 ++++--
 pelican/paginator.py                |  5 ++---
 pelican/readers.py                  |  4 ++--
 pelican/rstdirectives.py            |  2 +-
 pelican/settings.py                 |  8 +++----
 pelican/tests/test_contents.py      | 28 ++++++++++++------------
 pelican/tests/test_importer.py      | 12 +++++------
 pelican/tests/test_readers.py       |  2 +-
 pelican/tests/test_utils.py         |  4 ++--
 pelican/tools/pelican_import.py     |  4 ++--
 pelican/tools/pelican_quickstart.py | 27 ++++++++++++-----------
 pelican/urlwrappers.py              |  7 +++---
 pelican/utils.py                    | 33 ++++++++++++-----------------
 pelican/writers.py                  |  2 +-
 16 files changed, 72 insertions(+), 82 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index d63f88c3..ab6b0225 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -417,7 +417,7 @@ def parse_arguments(argv=None):
         "--relative-urls",
         dest="relative_paths",
         action="store_true",
-        help="Use relative urls in output, " "useful for site development",
+        help="Use relative urls in output, useful for site development",
     )
 
     parser.add_argument(
@@ -433,7 +433,7 @@ def parse_arguments(argv=None):
         "--ignore-cache",
         action="store_true",
         dest="ignore_cache",
-        help="Ignore content cache " "from previous runs by not loading cache files.",
+        help="Ignore content cache from previous runs by not loading cache files.",
     )
 
     parser.add_argument(
@@ -488,7 +488,7 @@ def parse_arguments(argv=None):
         "-b",
         "--bind",
         dest="bind",
-        help="IP to bind to when serving files via HTTP " "(default: 127.0.0.1)",
+        help="IP to bind to when serving files via HTTP (default: 127.0.0.1)",
     )
 
     parser.add_argument(
diff --git a/pelican/contents.py b/pelican/contents.py
index 9532c523..21c66296 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -72,7 +72,7 @@ class Content:
         self._context = context
         self.translations = []
 
-        local_metadata = dict()
+        local_metadata = {}
         local_metadata.update(metadata)
 
         # set metadata as attributes
@@ -357,7 +357,7 @@ class Content:
             origin = joiner(siteurl, Author(path, self.settings).url)
         else:
             logger.warning(
-                "Replacement Indicator '%s' not recognized, " "skipping replacement",
+                "Replacement Indicator '%s' not recognized, skipping replacement",
                 what,
             )
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 076c8d38..fdcc62ce 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -156,7 +156,7 @@ class Generator:
 
         return False
 
-    def get_files(self, paths, exclude=[], extensions=None):
+    def get_files(self, paths, exclude=None, extensions=None):
         """Return a list of files to use, based on rules
 
         :param paths: the list pf paths to search (relative to self.path)
@@ -164,6 +164,8 @@ class Generator:
         :param extensions: the list of allowed extensions (if False, all
             extensions are allowed)
         """
+        if exclude is None:
+            exclude = []
         # backward compatibility for older generators
         if isinstance(paths, str):
             paths = [paths]
@@ -1068,7 +1070,7 @@ class StaticGenerator(Generator):
         except OSError as err:
             if err.errno == errno.EXDEV:  # 18: Invalid cross-device link
                 logger.debug(
-                    "Cross-device links not valid. " "Creating symbolic links instead."
+                    "Cross-device links not valid. Creating symbolic links instead."
                 )
                 self.fallback_to_symlinks = True
                 self._link_staticfile(sc)
diff --git a/pelican/paginator.py b/pelican/paginator.py
index e1d50881..92cb26b1 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -131,9 +131,8 @@ class Page:
                 if not self.has_next():
                     rule = p
                     break
-            else:
-                if p.min_page <= self.number:
-                    rule = p
+            elif p.min_page <= self.number:
+                rule = p
 
         if not rule:
             return ""
diff --git a/pelican/readers.py b/pelican/readers.py
index e9b07582..422f39fc 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -199,7 +199,7 @@ class RstReader(BaseReader):
             self._language_code = lang_code
         else:
             logger.warning(
-                "Docutils has no localization for '%s'." " Using 'en' instead.",
+                "Docutils has no localization for '%s'. Using 'en' instead.",
                 lang_code,
             )
             self._language_code = "en"
@@ -320,7 +320,7 @@ class MarkdownReader(BaseReader):
             elif not DUPLICATES_DEFINITIONS_ALLOWED.get(name, True):
                 if len(value) > 1:
                     logger.warning(
-                        "Duplicate definition of `%s` " "for %s. Using first one.",
+                        "Duplicate definition of `%s` for %s. Using first one.",
                         name,
                         self._source_path,
                     )
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index 41bfc3d2..9022ac83 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -78,7 +78,7 @@ class abbreviation(nodes.Inline, nodes.TextElement):
     pass
 
 
-def abbr_role(typ, rawtext, text, lineno, inliner, options={}, content=[]):
+def abbr_role(typ, rawtext, text, lineno, inliner, options=None, content=None):
     text = utils.unescape(text)
     m = _abbr_re.search(text)
     if m is None:
diff --git a/pelican/settings.py b/pelican/settings.py
index ea6fae77..214d88a3 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -447,7 +447,7 @@ def handle_deprecated_settings(settings: Settings) -> Settings:
             and not isinstance(settings[key], Path)
             and "%s" in settings[key]
         ):
-            logger.warning("%%s usage in %s is deprecated, use {lang} " "instead.", key)
+            logger.warning("%%s usage in %s is deprecated, use {lang} instead.", key)
             try:
                 settings[key] = _printf_s_to_format_field(settings[key], "lang")
             except ValueError:
@@ -470,7 +470,7 @@ def handle_deprecated_settings(settings: Settings) -> Settings:
             and not isinstance(settings[key], Path)
             and "%s" in settings[key]
         ):
-            logger.warning("%%s usage in %s is deprecated, use {slug} " "instead.", key)
+            logger.warning("%%s usage in %s is deprecated, use {slug} instead.", key)
             try:
                 settings[key] = _printf_s_to_format_field(settings[key], "slug")
             except ValueError:
@@ -614,7 +614,7 @@ def configure_settings(settings: Settings) -> Settings:
         if key in settings and not isinstance(settings[key], types):
             value = settings.pop(key)
             logger.warn(
-                "Detected misconfigured %s (%s), " "falling back to the default (%s)",
+                "Detected misconfigured %s (%s), falling back to the default (%s)",
                 key,
                 value,
                 DEFAULT_CONFIG[key],
@@ -676,7 +676,7 @@ def configure_settings(settings: Settings) -> Settings:
     if any(settings.get(k) for k in feed_keys):
         if not settings.get("SITEURL"):
             logger.warning(
-                "Feeds generated without SITEURL set properly may" " not be valid"
+                "Feeds generated without SITEURL set properly may not be valid"
             )
 
     if "TIMEZONE" not in settings:
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 89219029..d248c3bb 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -314,7 +314,7 @@ class TestPage(TestBase):
         args["settings"] = settings
 
         # Tag
-        args["content"] = "A simple test, with a " '<a href="|tag|tagname">link</a>'
+        args["content"] = 'A simple test, with a <a href="|tag|tagname">link</a>'
         page = Page(**args)
         content = page.get_content("http://notmyidea.org")
         self.assertEqual(
@@ -326,9 +326,7 @@ class TestPage(TestBase):
         )
 
         # Category
-        args["content"] = (
-            "A simple test, with a " '<a href="|category|category">link</a>'
-        )
+        args["content"] = 'A simple test, with a <a href="|category|category">link</a>'
         page = Page(**args)
         content = page.get_content("http://notmyidea.org")
         self.assertEqual(
@@ -350,7 +348,7 @@ class TestPage(TestBase):
 
         # Classic intrasite link via filename
         args["content"] = (
-            "A simple test, with a " '<a href="|filename|article.rst">link</a>'
+            'A simple test, with a <a href="|filename|article.rst">link</a>'
         )
         content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
@@ -401,7 +399,7 @@ class TestPage(TestBase):
 
         # also test for summary in metadata
         parsed = (
-            "A simple summary test, with a " '<a href="|filename|article.rst">link</a>'
+            'A simple summary test, with a <a href="|filename|article.rst">link</a>'
         )
         linked = (
             "A simple summary test, with a "
@@ -594,7 +592,7 @@ class TestPage(TestBase):
 
         # An intrasite link via filename with %20 as a space
         args["content"] = (
-            "A simple test, with a " '<a href="|filename|article%20spaces.rst">link</a>'
+            'A simple test, with a <a href="|filename|article%20spaces.rst">link</a>'
         )
         content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
@@ -834,10 +832,10 @@ class TestStatic(LoggedTestCase):
 
         otherdir_settings = self.settings.copy()
         otherdir_settings.update(
-            dict(
-                PAGE_SAVE_AS=os.path.join("otherpages", "{slug}.html"),
-                PAGE_URL="otherpages/{slug}.html",
-            )
+            {
+                "PAGE_SAVE_AS": os.path.join("otherpages", "{slug}.html"),
+                "PAGE_URL": "otherpages/{slug}.html",
+            }
         )
         otherdir_page = Page(
             content="other page",
@@ -892,7 +890,7 @@ class TestStatic(LoggedTestCase):
         """
         customstatic = Static(
             content=None,
-            metadata=dict(save_as="customfoo.jpg", url="customfoo.jpg"),
+            metadata={"save_as": "customfoo.jpg", "url": "customfoo.jpg"},
             settings=self.settings,
             source_path=os.path.join("dir", "foo.jpg"),
             context=self.settings.copy(),
@@ -1066,9 +1064,9 @@ class TestStatic(LoggedTestCase):
 
         static = Static(
             content=None,
-            metadata=dict(
-                status="draft",
-            ),
+            metadata={
+                "status": "draft",
+            },
             settings=self.settings,
             source_path=os.path.join("dir", "foo.jpg"),
             context=self.settings.copy(),
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index e69e321f..46d83432 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -71,7 +71,7 @@ class TestBloggerXmlImporter(TestCaseWithCLocale):
         )
         comment_titles = {x[0] for x in test_posts if x[8] == "comment"}
         self.assertEqual(
-            {"Mishka, always a pleasure to read your " "adventures!..."}, comment_titles
+            {"Mishka, always a pleasure to read your adventures!..."}, comment_titles
         )
 
     def test_recognise_status_with_correct_filename(self):
@@ -478,7 +478,7 @@ class TestBuildHeader(unittest.TestCase):
             attachments=["output/test1", "output/test2"],
         )
         self.assertEqual(
-            header, ("test\n####\n" ":attachments: output/test1, " "output/test2\n\n")
+            header, ("test\n####\n:attachments: output/test1, output/test2\n\n")
         )
 
     def test_galleries_added_to_markdown_header(self):
@@ -521,10 +521,10 @@ class TestWordpressXMLAttachements(TestCaseWithCLocale):
                 self.assertEqual(self.attachments[post], expected)
             elif post == "with-excerpt":
                 expected_invalid = (
-                    "http://thisurlisinvalid.notarealdomain/" "not_an_image.jpg"
+                    "http://thisurlisinvalid.notarealdomain/not_an_image.jpg"
                 )
                 expected_pelikan = (
-                    "http://en.wikipedia.org/wiki/" "File:Pelikan_Walvis_Bay.jpg"
+                    "http://en.wikipedia.org/wiki/File:Pelikan_Walvis_Bay.jpg"
                 )
                 self.assertEqual(
                     self.attachments[post], {expected_invalid, expected_pelikan}
@@ -533,9 +533,7 @@ class TestWordpressXMLAttachements(TestCaseWithCLocale):
                 expected_invalid = "http://thisurlisinvalid.notarealdomain"
                 self.assertEqual(self.attachments[post], {expected_invalid})
             else:
-                self.fail(
-                    "all attachments should match to a " f"filename or None, {post}"
-                )
+                self.fail(f"all attachments should match to a filename or None, {post}")
 
     def test_download_attachments(self):
         real_file = os.path.join(CUR_DIR, "content/article.rst")
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index e49c8b74..928eb263 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -591,7 +591,7 @@ class MdReaderTest(ReaderTest):
             "modified": SafeDatetime(2012, 11, 1),
             "multiline": [
                 "Line Metadata should be handle properly.",
-                "See syntax of Meta-Data extension of " "Python Markdown package:",
+                "See syntax of Meta-Data extension of Python Markdown package:",
                 "If a line is indented by 4 or more spaces,",
                 "that line is assumed to be an additional line of the value",
                 "for the previous keyword.",
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index bd3f0d00..6c25cf45 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -922,14 +922,14 @@ class TestSanitisedJoin(unittest.TestCase):
     def test_detect_parent_breakout(self):
         with self.assertRaisesRegex(
             RuntimeError,
-            "Attempted to break out of output directory to " "(.*?:)?/foo/test",
+            "Attempted to break out of output directory to (.*?:)?/foo/test",
         ):  # (.*?:)? accounts for Windows root
             utils.sanitised_join("/foo/bar", "../test")
 
     def test_detect_root_breakout(self):
         with self.assertRaisesRegex(
             RuntimeError,
-            "Attempted to break out of output directory to " "(.*?:)?/test",
+            "Attempted to break out of output directory to (.*?:)?/test",
         ):  # (.*?:)? accounts for Windows root
             utils.sanitised_join("/foo/bar", "/test")
 
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 3e1f31db..c9742d54 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -1095,7 +1095,7 @@ def fields2pelican(
 
     if posts_require_pandoc:
         logger.error(
-            "Pandoc must be installed to import the following posts:" "\n  {}".format(
+            "Pandoc must be installed to import the following posts:\n  {}".format(
                 "\n  ".join(posts_require_pandoc)
             )
         )
@@ -1232,7 +1232,7 @@ def main():
             exit(error)
 
     if args.wp_attach and input_type != "wordpress":
-        error = "You must be importing a wordpress xml " "to use the --wp-attach option"
+        error = "You must be importing a wordpress xml to use the --wp-attach option"
         exit(error)
 
     if input_type == "blogger":
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index c00a252c..2f62e4bc 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -103,11 +103,10 @@ def ask(question, answer=str, default=None, length=None):
                     break
                 else:
                     print("You must enter something")
+            elif length and len(r) != length:
+                print(f"Entry must be {length} characters long")
             else:
-                if length and len(r) != length:
-                    print(f"Entry must be {length} characters long")
-                else:
-                    break
+                break
 
         return r
 
@@ -169,7 +168,7 @@ def ask_timezone(question, default, tzurl):
             r = tz_dict[r]
             break
         else:
-            print("Please enter a valid time zone:\n" f" (check [{tzurl}])")
+            print(f"Please enter a valid time zone:\n (check [{tzurl}])")
     return r
 
 
@@ -253,7 +252,7 @@ needed by Pelican.
         default=True,
     ):
         CONF["siteurl"] = ask(
-            "What is your URL prefix? (see " "above example; no trailing slash)",
+            "What is your URL prefix? (see above example; no trailing slash)",
             str,
             CONF["siteurl"],
         )
@@ -266,7 +265,7 @@ needed by Pelican.
 
     if CONF["with_pagination"]:
         CONF["default_pagination"] = ask(
-            "How many articles per page " "do you want?",
+            "How many articles per page do you want?",
             int,
             CONF["default_pagination"],
         )
@@ -296,7 +295,7 @@ needed by Pelican.
                 "What is your username on that server?", str, CONF["ftp_user"]
             )
             CONF["ftp_target_dir"] = ask(
-                "Where do you want to put your " "web site on that server?",
+                "Where do you want to put your web site on that server?",
                 str,
                 CONF["ftp_target_dir"],
             )
@@ -314,7 +313,7 @@ needed by Pelican.
                 "What is your username on that server?", str, CONF["ssh_user"]
             )
             CONF["ssh_target_dir"] = ask(
-                "Where do you want to put your " "web site on that server?",
+                "Where do you want to put your web site on that server?",
                 str,
                 CONF["ssh_target_dir"],
             )
@@ -338,23 +337,23 @@ needed by Pelican.
             )
 
         if ask(
-            "Do you want to upload your website using " "Rackspace Cloud Files?",
+            "Do you want to upload your website using Rackspace Cloud Files?",
             answer=bool,
             default=False,
         ):
             CONF["cloudfiles"] = (True,)
             CONF["cloudfiles_username"] = ask(
-                "What is your Rackspace " "Cloud username?",
+                "What is your Rackspace Cloud username?",
                 str,
                 CONF["cloudfiles_username"],
             )
             CONF["cloudfiles_api_key"] = ask(
-                "What is your Rackspace " "Cloud API key?",
+                "What is your Rackspace Cloud API key?",
                 str,
                 CONF["cloudfiles_api_key"],
             )
             CONF["cloudfiles_container"] = ask(
-                "What is the name of your " "Cloud Files container?",
+                "What is the name of your Cloud Files container?",
                 str,
                 CONF["cloudfiles_container"],
             )
@@ -384,7 +383,7 @@ needed by Pelican.
     except OSError as e:
         print(f"Error: {e}")
 
-    conf_python = dict()
+    conf_python = {}
     for key, value in CONF.items():
         conf_python[key] = repr(value)
     render_jinja_template("pelicanconf.py.jinja2", conf_python, "pelicanconf.py")
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 4ed385f9..8023613c 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -115,11 +115,10 @@ class URLWrapper:
         if not isinstance(value, str):
             logger.warning("%s is set to %s", setting, value)
             return value
+        elif get_page_name:
+            return os.path.splitext(value)[0].format(**self.as_dict())
         else:
-            if get_page_name:
-                return os.path.splitext(value)[0].format(**self.as_dict())
-            else:
-                return value.format(**self.as_dict())
+            return value.format(**self.as_dict())
 
     page_name = property(
         functools.partial(_from_settings, key="URL", get_page_name=True)
diff --git a/pelican/utils.py b/pelican/utils.py
index 78e3e807..b33eaa22 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -25,9 +25,7 @@ from typing import (
     Collection,
     Generator,
     Iterable,
-    Optional,
     Sequence,
-    Union,
 )
 
 import dateutil.parser
@@ -167,7 +165,7 @@ class memoized:
             self.cache[args] = value
             return value
 
-    def __repr__(self) -> Optional[str]:
+    def __repr__(self) -> str | None:
         return self.func.__doc__
 
     def __get__(self, obj: Any, objtype):
@@ -181,8 +179,8 @@ def deprecated_attribute(
     old: str,
     new: str,
     since: tuple[int, ...],
-    remove: Optional[tuple[int, ...]] = None,
-    doc: Optional[str] = None,
+    remove: tuple[int, ...] | None = None,
+    doc: str | None = None,
 ):
     """Attribute deprecation decorator for gentle upgrades
 
@@ -296,9 +294,7 @@ def slugify(
     return value.strip()
 
 
-def copy(
-    source: str, destination: str, ignores: Optional[Iterable[str]] = None
-) -> None:
+def copy(source: str, destination: str, ignores: Iterable[str] | None = None) -> None:
     """Recursively copy source into destination.
 
     If source is a file, destination has to be a file as well.
@@ -364,7 +360,7 @@ def copy(
                     copy_file(src_path, dst_path)
                 else:
                     logger.warning(
-                        "Skipped copy %s (not a file or " "directory) to %s",
+                        "Skipped copy %s (not a file or directory) to %s",
                         src_path,
                         dst_path,
                     )
@@ -474,7 +470,7 @@ class _HTMLWordTruncator(HTMLParser):
         self.words_found = 0
         self.open_tags = []
         self.last_word_end = None
-        self.truncate_at: Optional[int] = None
+        self.truncate_at: int | None = None
 
     def feed(self, *args, **kwargs) -> None:
         try:
@@ -573,11 +569,10 @@ class _HTMLWordTruncator(HTMLParser):
         if self.last_word_end is None:
             if self._word_prefix_regex.match(char):
                 self.last_word_end = ref_end
+        elif self._word_regex.match(char):
+            self.last_word_end = ref_end
         else:
-            if self._word_regex.match(char):
-                self.last_word_end = ref_end
-            else:
-                self.add_last_word()
+            self.add_last_word()
 
     def handle_entityref(self, name: str) -> None:
         """
@@ -638,7 +633,7 @@ def truncate_html_words(s: str, num: int, end_text: str = "…") -> str:
 
 def process_translations(
     content_list: list[Content],
-    translation_id: Optional[Union[str, Collection[str]]] = None,
+    translation_id: str | Collection[str] | None = None,
 ) -> tuple[list[Content], list[Content]]:
     """Finds translations and returns them.
 
@@ -739,7 +734,7 @@ def get_original_items(items: list[Content], with_str: str) -> list[Content]:
 
 def order_content(
     content_list: list[Content],
-    order_by: Union[str, Callable[[Content], Any], None] = "slug",
+    order_by: str | Callable[[Content], Any] | None = "slug",
 ) -> list[Content]:
     """Sorts content.
 
@@ -841,7 +836,7 @@ def wait_for_changes(
 
 
 def set_date_tzinfo(
-    d: datetime.datetime, tz_name: Optional[str] = None
+    d: datetime.datetime, tz_name: str | None = None
 ) -> datetime.datetime:
     """Set the timezone for dates that don't have tzinfo"""
     if tz_name and not d.tzinfo:
@@ -857,7 +852,7 @@ def mkdir_p(path: str) -> None:
     os.makedirs(path, exist_ok=True)
 
 
-def split_all(path: Union[str, pathlib.Path, None]) -> Optional[Sequence[str]]:
+def split_all(path: str | pathlib.Path | None) -> Sequence[str] | None:
     """Split a path into a list of components
 
     While os.path.split() splits a single component off the back of
@@ -911,7 +906,7 @@ def maybe_pluralize(count: int, singular: str, plural: str) -> str:
 
 @contextmanager
 def temporary_locale(
-    temp_locale: Optional[str] = None, lc_category: int = locale.LC_ALL
+    temp_locale: str | None = None, lc_category: int = locale.LC_ALL
 ) -> Generator[None, None, None]:
     """
     Enable code to run in a context with a temporary locale
diff --git a/pelican/writers.py b/pelican/writers.py
index cce01b58..683ae30b 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -21,7 +21,7 @@ logger = logging.getLogger(__name__)
 class Writer:
     def __init__(self, output_path, settings=None):
         self.output_path = output_path
-        self.reminder = dict()
+        self.reminder = {}
         self.settings = settings or {}
         self._written_files = set()
         self._overridden_files = set()

From 3569dede01cb3e7fe0b8813ebb9a8581d7895a93 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 30 May 2024 21:40:27 +0200
Subject: [PATCH 2706/2864] Ignore more Ruff fixes in `git blame`

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index fddd0764..2d787f0b 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -11,3 +11,5 @@ db241feaa445375dc05e189e69287000ffe5fa8e
 0bd02c00c078fe041b65fbf4eab13601bb42676d
 # Apply more Ruff checks to code
 9d30c5608a58d202b1c02d55651e6ac746bfb173
+# Apply yet more Ruff checks to code
+7577dd7603f7cb3a09922d1edb65b6eafb6e2ac7

From 308af1912e02d1d6f2cb0a8c765fe58431f95f00 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Fri, 31 May 2024 07:21:13 -0500
Subject: [PATCH 2707/2864] Apply pre-commit filters to pelican/tests/output

---
 .pre-commit-config.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a3e7ab17..a6179814 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,5 +20,3 @@ repos:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
-
-exclude: ^pelican/tests/output/

From 98bdd87dae1974f786971452a3edec51b630db4e Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Fri, 31 May 2024 07:21:40 -0500
Subject: [PATCH 2708/2864] Apply pre-commit filters to the files in
 pelican/tests/output

---
 pelican/tests/output/basic/a-markdown-powered-article.html    | 2 +-
 pelican/tests/output/basic/archives.html                      | 2 +-
 pelican/tests/output/basic/article-1.html                     | 2 +-
 pelican/tests/output/basic/article-2.html                     | 2 +-
 pelican/tests/output/basic/article-3.html                     | 2 +-
 pelican/tests/output/basic/author/alexis-metaireau.html       | 2 +-
 pelican/tests/output/basic/authors.html                       | 2 +-
 pelican/tests/output/basic/categories.html                    | 2 +-
 pelican/tests/output/basic/category/bar.html                  | 2 +-
 pelican/tests/output/basic/category/cat1.html                 | 2 +-
 pelican/tests/output/basic/category/misc.html                 | 2 +-
 pelican/tests/output/basic/category/yeah.html                 | 2 +-
 .../output/basic/drafts/a-draft-article-without-date.html     | 4 ++--
 pelican/tests/output/basic/drafts/a-draft-article.html        | 2 +-
 pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml    | 2 +-
 pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml     | 2 +-
 pelican/tests/output/basic/feeds/all-en.atom.xml              | 2 +-
 pelican/tests/output/basic/feeds/all-fr.atom.xml              | 2 +-
 pelican/tests/output/basic/feeds/all.atom.xml                 | 2 +-
 pelican/tests/output/basic/feeds/bar.atom.xml                 | 2 +-
 pelican/tests/output/basic/feeds/cat1.atom.xml                | 2 +-
 pelican/tests/output/basic/feeds/misc.atom.xml                | 2 +-
 pelican/tests/output/basic/feeds/yeah.atom.xml                | 2 +-
 pelican/tests/output/basic/filename_metadata-example.html     | 2 +-
 pelican/tests/output/basic/index.html                         | 2 +-
 pelican/tests/output/basic/oh-yeah-fr.html                    | 2 +-
 pelican/tests/output/basic/oh-yeah.html                       | 2 +-
 pelican/tests/output/basic/override/index.html                | 4 ++--
 .../tests/output/basic/pages/this-is-a-test-hidden-page.html  | 4 ++--
 pelican/tests/output/basic/pages/this-is-a-test-page.html     | 4 ++--
 pelican/tests/output/basic/second-article-fr.html             | 2 +-
 pelican/tests/output/basic/second-article.html                | 2 +-
 pelican/tests/output/basic/tag/bar.html                       | 2 +-
 pelican/tests/output/basic/tag/baz.html                       | 2 +-
 pelican/tests/output/basic/tag/foo.html                       | 2 +-
 pelican/tests/output/basic/tag/foobar.html                    | 2 +-
 pelican/tests/output/basic/tag/oh.html                        | 4 ++--
 pelican/tests/output/basic/tag/yeah.html                      | 2 +-
 pelican/tests/output/basic/tags.html                          | 2 +-
 pelican/tests/output/basic/theme/css/reset.css                | 2 +-
 .../output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt    | 2 +-
 pelican/tests/output/basic/this-is-a-super-article.html       | 2 +-
 pelican/tests/output/basic/unbelievable.html                  | 2 +-
 pelican/tests/output/custom/a-markdown-powered-article.html   | 2 +-
 pelican/tests/output/custom/archives.html                     | 2 +-
 pelican/tests/output/custom/article-1.html                    | 2 +-
 pelican/tests/output/custom/article-2.html                    | 2 +-
 pelican/tests/output/custom/article-3.html                    | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau.html      | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau2.html     | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau3.html     | 2 +-
 pelican/tests/output/custom/authors.html                      | 2 +-
 pelican/tests/output/custom/categories.html                   | 2 +-
 pelican/tests/output/custom/category/bar.html                 | 2 +-
 pelican/tests/output/custom/category/cat1.html                | 2 +-
 pelican/tests/output/custom/category/misc.html                | 2 +-
 pelican/tests/output/custom/category/yeah.html                | 2 +-
 .../output/custom/drafts/a-draft-article-without-date.html    | 2 +-
 pelican/tests/output/custom/drafts/a-draft-article.html       | 2 +-
 pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml   | 2 +-
 pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml    | 2 +-
 pelican/tests/output/custom/feeds/all-en.atom.xml             | 2 +-
 pelican/tests/output/custom/feeds/all-fr.atom.xml             | 2 +-
 pelican/tests/output/custom/feeds/all.atom.xml                | 2 +-
 pelican/tests/output/custom/feeds/all.rss.xml                 | 2 +-
 pelican/tests/output/custom/feeds/bar.atom.xml                | 2 +-
 pelican/tests/output/custom/feeds/bar.rss.xml                 | 2 +-
 pelican/tests/output/custom/feeds/cat1.atom.xml               | 2 +-
 pelican/tests/output/custom/feeds/cat1.rss.xml                | 2 +-
 pelican/tests/output/custom/feeds/misc.atom.xml               | 2 +-
 pelican/tests/output/custom/feeds/misc.rss.xml                | 2 +-
 pelican/tests/output/custom/feeds/yeah.atom.xml               | 2 +-
 pelican/tests/output/custom/feeds/yeah.rss.xml                | 2 +-
 pelican/tests/output/custom/filename_metadata-example.html    | 2 +-
 pelican/tests/output/custom/index.html                        | 2 +-
 pelican/tests/output/custom/index2.html                       | 2 +-
 pelican/tests/output/custom/index3.html                       | 2 +-
 pelican/tests/output/custom/jinja2_template.html              | 2 +-
 pelican/tests/output/custom/oh-yeah-fr.html                   | 2 +-
 pelican/tests/output/custom/oh-yeah.html                      | 2 +-
 pelican/tests/output/custom/override/index.html               | 4 ++--
 .../tests/output/custom/pages/this-is-a-test-hidden-page.html | 4 ++--
 pelican/tests/output/custom/pages/this-is-a-test-page.html    | 4 ++--
 pelican/tests/output/custom/second-article-fr.html            | 2 +-
 pelican/tests/output/custom/second-article.html               | 2 +-
 pelican/tests/output/custom/tag/bar.html                      | 2 +-
 pelican/tests/output/custom/tag/baz.html                      | 2 +-
 pelican/tests/output/custom/tag/foo.html                      | 2 +-
 pelican/tests/output/custom/tag/foobar.html                   | 2 +-
 pelican/tests/output/custom/tag/oh.html                       | 4 ++--
 pelican/tests/output/custom/tag/yeah.html                     | 2 +-
 pelican/tests/output/custom/tags.html                         | 2 +-
 pelican/tests/output/custom/theme/css/reset.css               | 2 +-
 .../output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt   | 2 +-
 pelican/tests/output/custom/this-is-a-super-article.html      | 2 +-
 pelican/tests/output/custom/unbelievable.html                 | 2 +-
 pelican/tests/output/custom_locale/archives.html              | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau.html   | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau2.html  | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau3.html  | 2 +-
 pelican/tests/output/custom_locale/authors.html               | 2 +-
 pelican/tests/output/custom_locale/categories.html            | 2 +-
 pelican/tests/output/custom_locale/category/bar.html          | 2 +-
 pelican/tests/output/custom_locale/category/cat1.html         | 2 +-
 pelican/tests/output/custom_locale/category/misc.html         | 2 +-
 pelican/tests/output/custom_locale/category/yeah.html         | 2 +-
 .../custom_locale/drafts/a-draft-article-without-date.html    | 2 +-
 .../tests/output/custom_locale/drafts/a-draft-article.html    | 2 +-
 .../output/custom_locale/feeds/alexis-metaireau.atom.xml      | 2 +-
 .../tests/output/custom_locale/feeds/alexis-metaireau.rss.xml | 2 +-
 pelican/tests/output/custom_locale/feeds/all-en.atom.xml      | 2 +-
 pelican/tests/output/custom_locale/feeds/all-fr.atom.xml      | 2 +-
 pelican/tests/output/custom_locale/feeds/all.atom.xml         | 2 +-
 pelican/tests/output/custom_locale/feeds/all.rss.xml          | 2 +-
 pelican/tests/output/custom_locale/feeds/bar.atom.xml         | 2 +-
 pelican/tests/output/custom_locale/feeds/bar.rss.xml          | 2 +-
 pelican/tests/output/custom_locale/feeds/cat1.atom.xml        | 2 +-
 pelican/tests/output/custom_locale/feeds/cat1.rss.xml         | 2 +-
 pelican/tests/output/custom_locale/feeds/misc.atom.xml        | 2 +-
 pelican/tests/output/custom_locale/feeds/misc.rss.xml         | 2 +-
 pelican/tests/output/custom_locale/feeds/yeah.atom.xml        | 2 +-
 pelican/tests/output/custom_locale/feeds/yeah.rss.xml         | 2 +-
 pelican/tests/output/custom_locale/index.html                 | 2 +-
 pelican/tests/output/custom_locale/index2.html                | 2 +-
 pelican/tests/output/custom_locale/index3.html                | 2 +-
 pelican/tests/output/custom_locale/jinja2_template.html       | 2 +-
 pelican/tests/output/custom_locale/oh-yeah-fr.html            | 2 +-
 pelican/tests/output/custom_locale/override/index.html        | 4 ++--
 .../custom_locale/pages/this-is-a-test-hidden-page.html       | 4 ++--
 .../tests/output/custom_locale/pages/this-is-a-test-page.html | 4 ++--
 .../posts/2010/décembre/02/this-is-a-super-article/index.html | 2 +-
 .../posts/2010/octobre/15/unbelievable/index.html             | 2 +-
 .../custom_locale/posts/2010/octobre/20/oh-yeah/index.html    | 2 +-
 .../posts/2011/avril/20/a-markdown-powered-article/index.html | 2 +-
 .../custom_locale/posts/2011/février/17/article-1/index.html  | 2 +-
 .../custom_locale/posts/2011/février/17/article-2/index.html  | 2 +-
 .../custom_locale/posts/2011/février/17/article-3/index.html  | 2 +-
 .../posts/2012/février/29/second-article/index.html           | 2 +-
 .../2012/novembre/30/filename_metadata-example/index.html     | 2 +-
 pelican/tests/output/custom_locale/second-article-fr.html     | 2 +-
 pelican/tests/output/custom_locale/tag/bar.html               | 2 +-
 pelican/tests/output/custom_locale/tag/baz.html               | 2 +-
 pelican/tests/output/custom_locale/tag/foo.html               | 2 +-
 pelican/tests/output/custom_locale/tag/foobar.html            | 2 +-
 pelican/tests/output/custom_locale/tag/oh.html                | 4 ++--
 pelican/tests/output/custom_locale/tag/yeah.html              | 2 +-
 pelican/tests/output/custom_locale/tags.html                  | 2 +-
 pelican/tests/output/custom_locale/theme/css/reset.css        | 2 +-
 .../custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt   | 2 +-
 149 files changed, 162 insertions(+), 162 deletions(-)

diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 0098ccac..3c2821f1 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -65,4 +65,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index e3a6c7df..3218fe1d 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -67,4 +67,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 961ad390..91dcff19 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -64,4 +64,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index e5389d35..e3ad5724 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -64,4 +64,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index d23e5da2..2ec3f1e7 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -64,4 +64,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 12e05ec8..d682ab29 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -109,4 +109,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index cff1360b..86d2249a 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -49,4 +49,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index cc54f4a3..86606fbe 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -52,4 +52,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 1f9c0d8d..c4f57bdd 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -65,4 +65,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index ca47821b..a291aae4 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -122,4 +122,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 58490001..fa786910 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -133,4 +133,4 @@ pelican.conf, it will …</p></div>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 815d42e4..caade72e 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -73,4 +73,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
index 5a2d367b..45bc00ec 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
@@ -34,7 +34,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="9999-12-31T23:59:59.999999+00:00">
-                Published: 
+                Published:
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>.</p>
@@ -65,4 +65,4 @@ listed anywhere else.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index a0bed241..9349064c 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -65,4 +65,4 @@ listed anywhere else.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index 8f9a85fa..a0306a0b 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -19,4 +19,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index 1af41d47..d4989286 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -7,4 +7,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 9c44c860..49c76c62 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -71,4 +71,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index 4ecf7534..bca3d2cb 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index e9dceb69..b2399afe 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -73,4 +73,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index edd1170a..93fff29c 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index 8516b95c..2f054a1c 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -4,4 +4,4 @@
 &lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry></feed>
\ No newline at end of file
+</content><category term="cat1"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index a307ac4e..9127b2a5 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -46,4 +46,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 6f871915..6411bf6d 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index f3ae9cea..30da64fd 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -64,4 +64,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index fd334d38..db95e29b 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -272,4 +272,4 @@ pelican.conf, it will …</p></div>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/oh-yeah-fr.html b/pelican/tests/output/basic/oh-yeah-fr.html
index 3fdfeae9..388cc283 100644
--- a/pelican/tests/output/basic/oh-yeah-fr.html
+++ b/pelican/tests/output/basic/oh-yeah-fr.html
@@ -68,4 +68,4 @@ Translations:
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index f8d3d227..186a3c84 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -76,4 +76,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index a74d802f..1b7c404b 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -24,7 +24,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Override url/save_as</h1>
-    
+
     <p>Test page which overrides save_as and url so that this page will be generated
 at a custom location.</p>
 
@@ -48,4 +48,4 @@ at a custom location.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 1c836201..fda32c01 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -24,7 +24,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test hidden page</h1>
-    
+
     <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
@@ -48,4 +48,4 @@ Anyone can see this page but it's not linked to anywhere!</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index 372eff76..b79f424d 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -24,7 +24,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test page</h1>
-    
+
     <p>Just an image.</p>
 <img alt="alternate text" src="/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 <img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
@@ -49,4 +49,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 514c5585..e70f16e5 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -68,4 +68,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 365f99cd..4c833a49 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -68,4 +68,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 047d772a..d2824c2e 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -121,4 +121,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 51518620..01cb257e 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -64,4 +64,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 0214cf26..bdabf131 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -91,4 +91,4 @@ as well as <strong>inline markup</strong>.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index ab07e87f..00b72790 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -73,4 +73,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index f3af2a2f..c675834b 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -24,7 +24,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Oh Oh Oh</h1>
-    
+
     <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
 </section>
@@ -47,4 +47,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index f04affa8..99806970 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -65,4 +65,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index db5d6634..4d82ca7b 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -54,4 +54,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/theme/css/reset.css b/pelican/tests/output/basic/theme/css/reset.css
index c88e6196..f5123cf6 100644
--- a/pelican/tests/output/basic/theme/css/reset.css
+++ b/pelican/tests/output/basic/theme/css/reset.css
@@ -49,4 +49,4 @@ del {text-decoration: line-through;}
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
-}
\ No newline at end of file
+}
diff --git a/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
index 309fd710..c70bcad3 100644
--- a/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
+++ b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
@@ -18,7 +18,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
+fonts, including any derivative works, can be bundled, embedded,
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 6ac68664..52e0bf65 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -82,4 +82,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index d87c31ea..710c8ff7 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -96,4 +96,4 @@ pelican.conf, it will have nothing in default.</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 422421d8..3cf1deb7 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -111,4 +111,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 34c3f4cd..6cf7b82d 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -95,4 +95,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 226489ea..e28fb39b 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -110,4 +110,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 1a835849..8c33fe86 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -110,4 +110,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index c3076e98..15862270 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -110,4 +110,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index aef8c6e6..22a23340 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -171,4 +171,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 8d17eed5..e5f7e953 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -186,4 +186,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 48fe75ba..c5162737 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -136,4 +136,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index de18662e..06919fb7 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -77,4 +77,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index b558d389..34236cdb 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -80,4 +80,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 6f3e9f5b..ad1ef940 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -93,4 +93,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index d9b1e41f..79428cd7 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -162,4 +162,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 7cc5bf9b..16c31252 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -173,4 +173,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 957c76ae..e919ddd5 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -101,4 +101,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
index 94d2c8e9..81137fc7 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
@@ -96,4 +96,4 @@ listed anywhere else.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index c926c14f..260ccaf1 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -96,4 +96,4 @@ listed anywhere else.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index f6cde37e..5bfb73d0 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -71,4 +71,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index c13a742b..b5654682 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -26,4 +26,4 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 703f56f0..1aac415a 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -71,4 +71,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index 39565ca6..68ebd738 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index de5e733d..dbe37a32 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -73,4 +73,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index a8d984fa..45a8dc58 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -28,4 +28,4 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index 002de037..d79aad2d 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index 53035e71..c993753a 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index e8ed355b..c44ac595 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -4,4 +4,4 @@
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry></feed>
\ No newline at end of file
+</content><category term="cat1"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index 9951b293..a6ca0b53 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -4,4 +4,4 @@
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index a260f67d..117c2bc2 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -46,4 +46,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 828eae62..03b3b2fe 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -13,4 +13,4 @@
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index 127ab590..0e5e8858 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index 98b820ec..be592f11 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 70d41179..8bc1babb 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -110,4 +110,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 6c4d7a94..d97eb4c4 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -171,4 +171,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 043f8c33..11943a88 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -186,4 +186,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index f8ebaac0..72ac69c6 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -136,4 +136,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 27a6df8e..71a9e63a 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -72,4 +72,4 @@ Some text
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index f30c9b63..555af6c0 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -114,4 +114,4 @@ Translations:
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 20b90351..661d0153 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -119,4 +119,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 9d1c4f46..09493938 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -28,7 +28,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Override url/save_as</h1>
-    
+
     <p>Test page which overrides save_as and url so that this page will be generated
 at a custom location.</p>
 
@@ -76,4 +76,4 @@ at a custom location.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index bd0d03ed..6eb578c9 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -28,7 +28,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test hidden page</h1>
-    
+
     <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
@@ -76,4 +76,4 @@ Anyone can see this page but it's not linked to anywhere!</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 16d17c3b..db977694 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -28,7 +28,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test page</h1>
-    
+
     <p>Just an image.</p>
 <img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 <img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
@@ -77,4 +77,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index ff7af42d..27638737 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -114,4 +114,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index a71df8cf..2ed7c822 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -114,4 +114,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 719ea12a..bc949e11 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -152,4 +152,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 048dc5ce..bb61b787 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -110,4 +110,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 637bce0b..4edfe432 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -122,4 +122,4 @@ as well as <strong>inline markup</strong>.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 296ee098..cebd52f4 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -101,4 +101,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 4a7ce439..4723075f 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -28,7 +28,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Oh Oh Oh</h1>
-    
+
     <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
 </section>
@@ -75,4 +75,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 78618480..c3e3bb4a 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -93,4 +93,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 1a8ef572..17feabf9 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -82,4 +82,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/theme/css/reset.css b/pelican/tests/output/custom/theme/css/reset.css
index c88e6196..f5123cf6 100644
--- a/pelican/tests/output/custom/theme/css/reset.css
+++ b/pelican/tests/output/custom/theme/css/reset.css
@@ -49,4 +49,4 @@ del {text-decoration: line-through;}
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
-}
\ No newline at end of file
+}
diff --git a/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
index 309fd710..c70bcad3 100644
--- a/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
+++ b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
@@ -18,7 +18,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
+fonts, including any derivative works, can be bundled, embedded,
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index ab9dc16f..565d9f3f 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -125,4 +125,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index a7ad0efa..6153392e 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -142,4 +142,4 @@ pelican.conf, it will have nothing in default.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index 25ef1c6c..8b07609d 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -95,4 +95,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index df76ccf6..86ee7416 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -171,4 +171,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 42a929d0..cf332f97 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -186,4 +186,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 941cdc46..dff225d2 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -136,4 +136,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index 0907ff7c..7cac21cc 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -77,4 +77,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 01dc680a..3b102a03 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -80,4 +80,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index d3dc29de..644a611c 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -93,4 +93,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 5278242c..0fe47339 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -162,4 +162,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 82a77efb..b300e98f 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -173,4 +173,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index f0dff1b6..afa3c4dd 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -101,4 +101,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
index 788f01a3..114aac6c 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
@@ -96,4 +96,4 @@ listed anywhere else.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index bd54bc56..406fbe36 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -96,4 +96,4 @@ listed anywhere else.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index d52de6f9..85b63173 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -71,4 +71,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index 4d9f5165..f383a84d 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -26,4 +26,4 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 974c63b3..974b4279 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -71,4 +71,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
index cfd6eeb2..f44b17f2 100644
--- a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index e1063591..c2a5ef38 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -73,4 +73,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index 442fc1ab..9642bef9 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -28,4 +28,4 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index d4467ea7..f3d8cc1e 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
index d17d7703..71130b31 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index 87a822e5..9a72b398 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -4,4 +4,4 @@
 &lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry></feed>
\ No newline at end of file
+</content><category term="cat1"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
index 6b328fda..c16b8092 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -4,4 +4,4 @@
 &lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index 2e46b473..4898ab84 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -46,4 +46,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index 01c24157..d1493ae8 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -13,4 +13,4 @@
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index 6f2e5f82..f316ada5 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index b7fb81f8..a0d0ba28 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 054011cc..37bfa0ac 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -171,4 +171,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index fa2c4d2d..871fd594 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -186,4 +186,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 71ccb4b1..e3bbdffd 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -136,4 +136,4 @@ pelican.conf, it will …</p></div>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index 01957524..c4bcf019 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -72,4 +72,4 @@ Some text
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 01c7800f..02d30117 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -114,4 +114,4 @@ Translations:
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index a5fcbe04..e1212e43 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -28,7 +28,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Override url/save_as</h1>
-    
+
     <p>Test page which overrides save_as and url so that this page will be generated
 at a custom location.</p>
 
@@ -76,4 +76,4 @@ at a custom location.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index 3e33e3fc..5ba42b3f 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -28,7 +28,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test hidden page</h1>
-    
+
     <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
@@ -76,4 +76,4 @@ Anyone can see this page but it's not linked to anywhere!</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index e4f1d60b..83aaddb0 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -28,7 +28,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test page</h1>
-    
+
     <p>Just an image.</p>
 <img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 <img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
@@ -77,4 +77,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index 4b522248..33866221 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -125,4 +125,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index f27464f8..ef9994c6 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -142,4 +142,4 @@ pelican.conf, it will have nothing in default.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index b47732b7..07332310 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -119,4 +119,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 80e57bc3..5410e9d1 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -111,4 +111,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index c427e2c7..d4afa8b2 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -110,4 +110,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index 88c7adf2..2d849548 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -110,4 +110,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index 257fb6dd..c6b03cc2 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -110,4 +110,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 3b3bd10a..a5a12bc9 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -114,4 +114,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 2618f705..848a0431 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -110,4 +110,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 7edf7710..51ee3977 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -114,4 +114,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index e0e0487f..a4bda96f 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -152,4 +152,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 7fe3b54c..a27bc92e 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -110,4 +110,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index a31e348b..736fa5b8 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -122,4 +122,4 @@ as well as <strong>inline markup</strong>.</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index a33f3362..93757930 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -101,4 +101,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index 5d021c7c..1e583e7e 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -28,7 +28,7 @@
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Oh Oh Oh</h1>
-    
+
     <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
 </section>
@@ -75,4 +75,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 72b905f5..219ab7e7 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -93,4 +93,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index 88b02724..3e59c960 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -82,4 +82,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/theme/css/reset.css b/pelican/tests/output/custom_locale/theme/css/reset.css
index c88e6196..f5123cf6 100644
--- a/pelican/tests/output/custom_locale/theme/css/reset.css
+++ b/pelican/tests/output/custom_locale/theme/css/reset.css
@@ -49,4 +49,4 @@ del {text-decoration: line-through;}
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
-}
\ No newline at end of file
+}
diff --git a/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
index 309fd710..c70bcad3 100644
--- a/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
+++ b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
@@ -18,7 +18,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
+fonts, including any derivative works, can be bundled, embedded,
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The

From 7f07c220deaa6a9e62aaab783651a3591330b524 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Thu, 30 May 2024 15:45:59 -0500
Subject: [PATCH 2709/2864] Add pre-commit djhtml, djcss, djjs to indent
 templates

---
 .pre-commit-config.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a6179814..bfdd6149 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,6 +13,7 @@ repos:
       - id: end-of-file-fixer
       - id: forbid-new-submodules
       - id: trailing-whitespace
+
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # ruff version should match the one in pyproject.toml
     rev: v0.4.6
@@ -20,3 +21,10 @@ repos:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
+
+  - repo: https://github.com/rtts/djhtml
+    rev: '3.0.6'
+    hooks:
+      - id: djhtml
+      - id: djcss
+      - id: djjs

From 4af40e80772a58eac8969360e5caeb99e3e26e78 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Fri, 31 May 2024 07:34:01 -0500
Subject: [PATCH 2710/2864] pre-commit filter auto-indents templates, css, js

---
 docs/_templates/page.html                     | 372 +++++++--------
 .../content/article_with_inline_svg.html      |  14 +-
 ...2017-04-21_-medium-post--d1bf01d62ba3.html | 140 +++---
 .../basic/a-markdown-powered-article.html     | 112 ++---
 pelican/tests/output/basic/archives.html      | 122 ++---
 pelican/tests/output/basic/article-1.html     | 108 ++---
 pelican/tests/output/basic/article-2.html     | 108 ++---
 pelican/tests/output/basic/article-3.html     | 108 ++---
 .../output/basic/author/alexis-metaireau.html | 182 ++++----
 pelican/tests/output/basic/authors.html       |  84 ++--
 pelican/tests/output/basic/categories.html    |  90 ++--
 pelican/tests/output/basic/category/bar.html  | 114 ++---
 pelican/tests/output/basic/category/cat1.html | 194 ++++----
 pelican/tests/output/basic/category/misc.html | 216 ++++-----
 pelican/tests/output/basic/category/yeah.html | 124 ++---
 .../drafts/a-draft-article-without-date.html  | 110 ++---
 .../output/basic/drafts/a-draft-article.html  | 110 ++---
 .../basic/filename_metadata-example.html      | 108 ++---
 pelican/tests/output/basic/index.html         | 438 +++++++++---------
 pelican/tests/output/basic/oh-yeah-fr.html    | 114 ++---
 pelican/tests/output/basic/oh-yeah.html       | 130 +++---
 .../tests/output/basic/override/index.html    |  82 ++--
 .../pages/this-is-a-test-hidden-page.html     |  82 ++--
 .../basic/pages/this-is-a-test-page.html      |  84 ++--
 .../tests/output/basic/second-article-fr.html | 114 ++---
 .../tests/output/basic/second-article.html    | 114 ++---
 pelican/tests/output/basic/tag/bar.html       | 204 ++++----
 pelican/tests/output/basic/tag/baz.html       | 108 ++---
 pelican/tests/output/basic/tag/foo.html       | 154 +++---
 pelican/tests/output/basic/tag/foobar.html    | 124 ++---
 pelican/tests/output/basic/tag/oh.html        |  80 ++--
 pelican/tests/output/basic/tag/yeah.html      | 114 ++---
 pelican/tests/output/basic/tags.html          |  94 ++--
 .../tests/output/basic/theme/css/fonts.css    |  16 +-
 pelican/tests/output/basic/theme/css/main.css | 372 +++++++--------
 .../tests/output/basic/theme/css/pygment.css  | 166 +++----
 .../tests/output/basic/theme/css/reset.css    |  24 +-
 .../tests/output/basic/theme/fonts/font.css   |  16 +-
 .../output/basic/this-is-a-super-article.html | 138 +++---
 pelican/tests/output/basic/unbelievable.html  | 166 +++----
 .../custom/a-markdown-powered-article.html    | 204 ++++----
 pelican/tests/output/custom/archives.html     | 178 +++----
 pelican/tests/output/custom/article-1.html    | 200 ++++----
 pelican/tests/output/custom/article-2.html    | 200 ++++----
 pelican/tests/output/custom/article-3.html    | 200 ++++----
 .../custom/author/alexis-metaireau.html       | 294 ++++++------
 .../custom/author/alexis-metaireau2.html      | 320 ++++++-------
 .../custom/author/alexis-metaireau3.html      | 238 +++++-----
 pelican/tests/output/custom/authors.html      | 138 +++---
 pelican/tests/output/custom/categories.html   | 144 +++---
 pelican/tests/output/custom/category/bar.html | 170 +++----
 .../tests/output/custom/category/cat1.html    | 274 +++++------
 .../tests/output/custom/category/misc.html    | 296 ++++++------
 .../tests/output/custom/category/yeah.html    | 180 +++----
 .../drafts/a-draft-article-without-date.html  | 172 +++----
 .../output/custom/drafts/a-draft-article.html | 172 +++----
 .../custom/filename_metadata-example.html     | 200 ++++----
 pelican/tests/output/custom/index.html        | 294 ++++++------
 pelican/tests/output/custom/index2.html       | 320 ++++++-------
 pelican/tests/output/custom/index3.html       | 238 +++++-----
 .../tests/output/custom/jinja2_template.html  | 130 +++---
 pelican/tests/output/custom/oh-yeah-fr.html   | 206 ++++----
 pelican/tests/output/custom/oh-yeah.html      | 216 ++++-----
 .../tests/output/custom/override/index.html   | 138 +++---
 .../pages/this-is-a-test-hidden-page.html     | 138 +++---
 .../custom/pages/this-is-a-test-page.html     | 140 +++---
 .../output/custom/second-article-fr.html      | 206 ++++----
 .../tests/output/custom/second-article.html   | 206 ++++----
 pelican/tests/output/custom/tag/bar.html      | 266 +++++------
 pelican/tests/output/custom/tag/baz.html      | 200 ++++----
 pelican/tests/output/custom/tag/foo.html      | 216 ++++-----
 pelican/tests/output/custom/tag/foobar.html   | 180 +++----
 pelican/tests/output/custom/tag/oh.html       | 136 +++---
 pelican/tests/output/custom/tag/yeah.html     | 170 +++----
 pelican/tests/output/custom/tags.html         | 148 +++---
 .../tests/output/custom/theme/css/fonts.css   |  16 +-
 .../tests/output/custom/theme/css/main.css    | 372 +++++++--------
 .../tests/output/custom/theme/css/pygment.css | 166 +++----
 .../tests/output/custom/theme/css/reset.css   |  24 +-
 .../tests/output/custom/theme/fonts/font.css  |  16 +-
 .../custom/this-is-a-super-article.html       | 224 ++++-----
 pelican/tests/output/custom/unbelievable.html | 258 +++++------
 .../tests/output/custom_locale/archives.html  | 178 +++----
 .../author/alexis-metaireau.html              | 294 ++++++------
 .../author/alexis-metaireau2.html             | 320 ++++++-------
 .../author/alexis-metaireau3.html             | 238 +++++-----
 .../tests/output/custom_locale/authors.html   | 138 +++---
 .../output/custom_locale/categories.html      | 144 +++---
 .../output/custom_locale/category/bar.html    | 170 +++----
 .../output/custom_locale/category/cat1.html   | 274 +++++------
 .../output/custom_locale/category/misc.html   | 296 ++++++------
 .../output/custom_locale/category/yeah.html   | 180 +++----
 .../drafts/a-draft-article-without-date.html  | 172 +++----
 .../custom_locale/drafts/a-draft-article.html | 172 +++----
 pelican/tests/output/custom_locale/index.html | 294 ++++++------
 .../tests/output/custom_locale/index2.html    | 320 ++++++-------
 .../tests/output/custom_locale/index3.html    | 238 +++++-----
 .../output/custom_locale/jinja2_template.html | 130 +++---
 .../output/custom_locale/oh-yeah-fr.html      | 206 ++++----
 .../output/custom_locale/override/index.html  | 138 +++---
 .../pages/this-is-a-test-hidden-page.html     | 138 +++---
 .../pages/this-is-a-test-page.html            | 140 +++---
 .../02/this-is-a-super-article/index.html     | 224 ++++-----
 .../2010/octobre/15/unbelievable/index.html   | 258 +++++------
 .../posts/2010/octobre/20/oh-yeah/index.html  | 216 ++++-----
 .../20/a-markdown-powered-article/index.html  | 204 ++++----
 .../2011/février/17/article-1/index.html      | 200 ++++----
 .../2011/février/17/article-2/index.html      | 200 ++++----
 .../2011/février/17/article-3/index.html      | 200 ++++----
 .../2012/février/29/second-article/index.html | 206 ++++----
 .../30/filename_metadata-example/index.html   | 200 ++++----
 .../custom_locale/second-article-fr.html      | 206 ++++----
 .../tests/output/custom_locale/tag/bar.html   | 266 +++++------
 .../tests/output/custom_locale/tag/baz.html   | 200 ++++----
 .../tests/output/custom_locale/tag/foo.html   | 216 ++++-----
 .../output/custom_locale/tag/foobar.html      | 180 +++----
 .../tests/output/custom_locale/tag/oh.html    | 136 +++---
 .../tests/output/custom_locale/tag/yeah.html  | 170 +++----
 pelican/tests/output/custom_locale/tags.html  | 148 +++---
 .../output/custom_locale/theme/css/fonts.css  |  16 +-
 .../output/custom_locale/theme/css/main.css   | 372 +++++++--------
 .../custom_locale/theme/css/pygment.css       | 166 +++----
 .../output/custom_locale/theme/css/reset.css  |  24 +-
 .../output/custom_locale/theme/fonts/font.css |  16 +-
 pelican/themes/notmyidea/static/css/fonts.css |  16 +-
 pelican/themes/notmyidea/static/css/main.css  | 372 +++++++--------
 .../themes/notmyidea/static/css/pygment.css   | 166 +++----
 pelican/themes/notmyidea/static/css/reset.css |  24 +-
 .../themes/notmyidea/static/fonts/font.css    |  16 +-
 .../themes/notmyidea/templates/analytics.html |   2 +-
 .../themes/notmyidea/templates/archives.html  |  18 +-
 .../themes/notmyidea/templates/article.html   |  72 +--
 .../notmyidea/templates/article_infos.html    |  26 +-
 .../themes/notmyidea/templates/authors.html   |  16 +-
 pelican/themes/notmyidea/templates/base.html  | 150 +++---
 .../notmyidea/templates/categories.html       |  16 +-
 .../notmyidea/templates/disqus_script.html    |  18 +-
 .../themes/notmyidea/templates/github.html    |  14 +-
 pelican/themes/notmyidea/templates/index.html | 110 ++---
 pelican/themes/notmyidea/templates/page.html  |  12 +-
 .../notmyidea/templates/period_archives.html  |  18 +-
 pelican/themes/notmyidea/templates/tags.html  |  16 +-
 .../notmyidea/templates/translations.html     |  18 +-
 .../themes/notmyidea/templates/twitter.html   |   2 +-
 pelican/themes/simple/templates/archives.html |  14 +-
 pelican/themes/simple/templates/article.html  |  76 +--
 pelican/themes/simple/templates/author.html   |   2 +-
 pelican/themes/simple/templates/authors.html  |   6 +-
 pelican/themes/simple/templates/base.html     |  92 ++--
 .../themes/simple/templates/categories.html   |   6 +-
 pelican/themes/simple/templates/category.html |   2 +-
 pelican/themes/simple/templates/index.html    |  30 +-
 pelican/themes/simple/templates/page.html     |  12 +-
 .../themes/simple/templates/pagination.html   |  22 +-
 .../simple/templates/period_archives.html     |  14 +-
 pelican/themes/simple/templates/tag.html      |   2 +-
 pelican/themes/simple/templates/tags.html     |   6 +-
 .../themes/simple/templates/translations.html |  22 +-
 samples/content/pages/jinja2_template.html    |   2 +-
 159 files changed, 11584 insertions(+), 11584 deletions(-)

diff --git a/docs/_templates/page.html b/docs/_templates/page.html
index 233f43ad..0fbfdf7d 100644
--- a/docs/_templates/page.html
+++ b/docs/_templates/page.html
@@ -1,201 +1,201 @@
 {% extends "base.html" %}
 
 {% block body -%}
-{{ super() }}
-{% include "partials/icons.html" %}
+  {{ super() }}
+  {% include "partials/icons.html" %}
 
-<input type="checkbox" class="sidebar-toggle" name="__navigation" id="__navigation">
-<input type="checkbox" class="sidebar-toggle" name="__toc" id="__toc">
-<label class="overlay sidebar-overlay" for="__navigation">
-  <div class="visually-hidden">Hide navigation sidebar</div>
-</label>
-<label class="overlay toc-overlay" for="__toc">
-  <div class="visually-hidden">Hide table of contents sidebar</div>
-</label>
+  <input type="checkbox" class="sidebar-toggle" name="__navigation" id="__navigation">
+  <input type="checkbox" class="sidebar-toggle" name="__toc" id="__toc">
+  <label class="overlay sidebar-overlay" for="__navigation">
+    <div class="visually-hidden">Hide navigation sidebar</div>
+  </label>
+  <label class="overlay toc-overlay" for="__toc">
+    <div class="visually-hidden">Hide table of contents sidebar</div>
+  </label>
 
-{% if theme_announcement -%}
-<div class="announcement">
-  <aside class="announcement-content">
-    {% block announcement %} {{ theme_announcement }} {% endblock announcement %}
-  </aside>
-</div>
-{%- endif %}
+  {% if theme_announcement -%}
+    <div class="announcement">
+      <aside class="announcement-content">
+        {% block announcement %} {{ theme_announcement }} {% endblock announcement %}
+      </aside>
+    </div>
+  {%- endif %}
 
-<div class="page">
-  <header class="mobile-header">
-    <div class="header-left">
-      <label class="nav-overlay-icon" for="__navigation">
-        <div class="visually-hidden">Toggle site navigation sidebar</div>
-        <i class="icon"><svg><use href="#svg-menu"></use></svg></i>
-      </label>
-    </div>
-    <div class="header-center">
-      <a href="{{ pathto(master_doc) }}"><div class="brand">{{ docstitle if docstitle else project }}</div></a>
-    </div>
-    <div class="header-right">
-      <div class="theme-toggle-container theme-toggle-header">
-        <button class="theme-toggle">
-          <div class="visually-hidden">Toggle Light / Dark / Auto color theme</div>
-          <svg class="theme-icon-when-auto"><use href="#svg-sun-half"></use></svg>
-          <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
-          <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
-        </button>
+  <div class="page">
+    <header class="mobile-header">
+      <div class="header-left">
+        <label class="nav-overlay-icon" for="__navigation">
+          <div class="visually-hidden">Toggle site navigation sidebar</div>
+          <i class="icon"><svg><use href="#svg-menu"></use></svg></i>
+        </label>
       </div>
-      <label class="toc-overlay-icon toc-header-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
-        <div class="visually-hidden">Toggle table of contents sidebar</div>
-        <i class="icon"><svg><use href="#svg-toc"></use></svg></i>
-      </label>
-    </div>
-  </header>
-  <aside class="sidebar-drawer">
-    <div class="sidebar-container">
-      {% block left_sidebar %}
-      <div class="sidebar-sticky">
-        {%- for sidebar_section in sidebars %}
-          {%- include sidebar_section %}
-        {%- endfor %}
+      <div class="header-center">
+        <a href="{{ pathto(master_doc) }}"><div class="brand">{{ docstitle if docstitle else project }}</div></a>
       </div>
-      {% endblock left_sidebar %}
-    </div>
-  </aside>
-  <div class="main">
-    <div class="content">
-      <div class="article-container">
-        <a href="#" class="back-to-top muted-link">
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-            <path d="M13 20h-2V8l-5.5 5.5-1.42-1.42L12 4.16l7.92 7.92-1.42 1.42L13 8v12z"></path>
-          </svg>
-          <span>{% trans %}Back to top{% endtrans %}</span>
-        </a>
-        <div class="content-icon-container">
-          {% if theme_top_of_page_button == "edit" -%}
-          {%- include "components/edit-this-page.html" with context -%}
-          {%- elif theme_top_of_page_button != None -%}
-          {{ warning("Got an unsupported value for 'top_of_page_button'") }}
-          {%- endif -%}
-          {#- Theme toggle -#}
-          <div class="theme-toggle-container theme-toggle-content">
-            <button class="theme-toggle">
-              <div class="visually-hidden">Toggle Light / Dark / Auto color theme</div>
-              <svg class="theme-icon-when-auto"><use href="#svg-sun-half"></use></svg>
-              <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
-              <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
-            </button>
-          </div>
-          <label class="toc-overlay-icon toc-content-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
-            <div class="visually-hidden">Toggle table of contents sidebar</div>
-            <i class="icon"><svg><use href="#svg-toc"></use></svg></i>
-          </label>
+      <div class="header-right">
+        <div class="theme-toggle-container theme-toggle-header">
+          <button class="theme-toggle">
+            <div class="visually-hidden">Toggle Light / Dark / Auto color theme</div>
+            <svg class="theme-icon-when-auto"><use href="#svg-sun-half"></use></svg>
+            <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
+            <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
+          </button>
         </div>
-        <article role="main">
-          {% block content %}{{ body }}{% endblock %}
-        </article>
+        <label class="toc-overlay-icon toc-header-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
+          <div class="visually-hidden">Toggle table of contents sidebar</div>
+          <i class="icon"><svg><use href="#svg-toc"></use></svg></i>
+        </label>
       </div>
-      <footer>
-        {% block footer %}
-        <div class="related-pages">
-          {% if next -%}
-            <a class="next-page" href="{{ next.link }}">
-              <div class="page-info">
-                <div class="context">
-                  <span>{{ _("Next") }}</span>
-                </div>
-                <div class="title">{{ next.title }}</div>
-              </div>
-              <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
-            </a>
-          {%- endif %}
-          {% if prev -%}
-            <a class="prev-page" href="{{ prev.link }}">
-              <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
-              <div class="page-info">
-                <div class="context">
-                  <span>{{ _("Previous") }}</span>
-                </div>
-                {% if prev.link == pathto(master_doc) %}
-                <div class="title">{{ _("Home") }}</div>
-                {% else %}
-                <div class="title">{{ prev.title }}</div>
-                {% endif %}
-              </div>
-            </a>
-          {%- endif %}
-        </div>
-        <div class="bottom-of-page">
-          <div class="left-details">
-            {%- if show_copyright %}
-            <div class="copyright">
-              {%- if hasdoc('copyright') %}
-                {% trans path=pathto('copyright'), copyright=copyright|e -%}
-                  <a href="{{ path }}">Copyright</a> &#169; {{ copyright }}
-                {%- endtrans %}
-              {%- else %}
-                {% trans copyright=copyright|e -%}
-                  Copyright &#169; {{ copyright }}, <a href="https://justinmayer.com">Justin Mayer</a>, Alexis Metaireau, and contributors
-                {%- endtrans %}
-              {%- endif %}
-            </div>
-            {%- endif %}
-            {%- if last_updated -%}
-            <div class="last-updated">
-              {% trans last_updated=last_updated|e -%}
-                Last updated on {{ last_updated }}
-              {%- endtrans -%}
-            </div>
-            {%- endif %}
+    </header>
+    <aside class="sidebar-drawer">
+      <div class="sidebar-container">
+        {% block left_sidebar %}
+          <div class="sidebar-sticky">
+            {%- for sidebar_section in sidebars %}
+              {%- include sidebar_section %}
+            {%- endfor %}
           </div>
-          <div class="right-details">
-            {% if theme_footer_icons or READTHEDOCS -%}
-            <div class="icons">
-              {% if theme_footer_icons -%}
-              {% for icon_dict in theme_footer_icons -%}
-              <a class="muted-link {{ icon_dict.class }}" href="{{ icon_dict.url }}" aria-label="{{ icon_dict.name }}">
-                {{- icon_dict.html -}}
-              </a>
-              {% endfor %}
-              {%- else -%}
-              {#- Show Read the Docs project -#}
-              {%- if READTHEDOCS and slug -%}
-              <a class="muted-link" href="https://readthedocs.org/projects/{{ slug }}" aria-label="On Read the Docs">
-                <svg x="0px" y="0px" viewBox="-125 217 360 360" xml:space="preserve">
-                  <path fill="currentColor" d="M39.2,391.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3 c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2 c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,391.3,40.4,391.1,39.2,391.3z M39.2,353.6c-4.2,0.6-7.1,4.4-6.5,8.5 c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4 c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,353.6,40.4,353.4,39.2,353.6z M39.2,315.9 c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8 c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9 C41.7,315.9,40.4,315.8,39.2,315.9z M39.2,278.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7 c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6 c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,278.2,40.4,278.1,39.2,278.3z M-13.6,238.5c-39.6,0.3-54.3,12.5-54.3,12.5v295.7 c0,0,14.4-12.4,60.8-10.5s55.9,18.2,112.9,19.3s71.3-8.8,71.3-8.8l0.8-301.4c0,0-25.6,7.3-75.6,7.7c-49.9,0.4-61.9-12.7-107.7-14.2 C-8.2,238.6-10.9,238.5-13.6,238.5z M19.5,257.8c0,0,24,7.9,68.3,10.1c37.5,1.9,75-3.7,75-3.7v267.9c0,0-19,10-66.5,6.6 C59.5,536.1,19,522.1,19,522.1L19.5,257.8z M-3.6,264.8c4.2,0,7.7,3.4,7.7,7.7c0,4.2-3.4,7.7-7.7,7.7c0,0-12.4,0.1-20,0.8 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,0,0,0,0c0,0,11.3-6,27-7.5 C-16,264.9-3.6,264.8-3.6,264.8z M-11,302.6c4.2-0.1,7.4,0,7.4,0c4.2,0.5,7.2,4.3,6.7,8.5c-0.4,3.5-3.2,6.3-6.7,6.7 c0,0-12.4,0.1-20,0.8c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5 C-20.5,302.9-15.2,302.7-11,302.6z M-3.6,340.2c4.2,0,7.7,3.4,7.7,7.7s-3.4,7.7-7.7,7.7c0,0-12.4-0.1-20,0.7 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5C-16,340.1-3.6,340.2-3.6,340.2z" />
-                </svg>
-              </a>
-              {%- endif -%}
-              {#- Show GitHub repository home -#}
-              {%- if READTHEDOCS and display_github and github_user != "None" and github_repo != "None" -%}
-              <a class="muted-link" href="https://github.com/{{ github_user }}/{{ github_repo }}" aria-label="On GitHub">
-                <svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 16 16">
-                  <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path>
-                </svg>
-              </a>
-              {%- endif -%}
-              {%- endif %}
-            </div>
-            {%- endif %}
-          </div>
-        </div>
-        {% endblock footer %}
-      </footer>
-    </div>
-    <aside class="toc-drawer{% if furo_hide_toc %} no-toc{% endif %}">
-      {% block right_sidebar %}
-      {% if not furo_hide_toc %}
-      <div class="toc-sticky toc-scroll">
-        <div class="toc-title-container">
-          <span class="toc-title">
-            {{ _("On this page") }}
-          </span>
-        </div>
-        <div class="toc-tree-container">
-          <div class="toc-tree">
-            {{ toc }}
-          </div>
-        </div>
+        {% endblock left_sidebar %}
       </div>
-      {% endif %}
-      {% endblock right_sidebar %}
     </aside>
+    <div class="main">
+      <div class="content">
+        <div class="article-container">
+          <a href="#" class="back-to-top muted-link">
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+              <path d="M13 20h-2V8l-5.5 5.5-1.42-1.42L12 4.16l7.92 7.92-1.42 1.42L13 8v12z"></path>
+            </svg>
+            <span>{% trans %}Back to top{% endtrans %}</span>
+          </a>
+          <div class="content-icon-container">
+            {% if theme_top_of_page_button == "edit" -%}
+              {%- include "components/edit-this-page.html" with context -%}
+            {%- elif theme_top_of_page_button != None -%}
+              {{ warning("Got an unsupported value for 'top_of_page_button'") }}
+            {%- endif -%}
+          {#- Theme toggle -#}
+            <div class="theme-toggle-container theme-toggle-content">
+              <button class="theme-toggle">
+                <div class="visually-hidden">Toggle Light / Dark / Auto color theme</div>
+                <svg class="theme-icon-when-auto"><use href="#svg-sun-half"></use></svg>
+                <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
+                <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
+              </button>
+            </div>
+            <label class="toc-overlay-icon toc-content-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
+              <div class="visually-hidden">Toggle table of contents sidebar</div>
+              <i class="icon"><svg><use href="#svg-toc"></use></svg></i>
+            </label>
+          </div>
+          <article role="main">
+            {% block content %}{{ body }}{% endblock %}
+          </article>
+        </div>
+        <footer>
+          {% block footer %}
+            <div class="related-pages">
+              {% if next -%}
+                <a class="next-page" href="{{ next.link }}">
+                  <div class="page-info">
+                    <div class="context">
+                      <span>{{ _("Next") }}</span>
+                    </div>
+                    <div class="title">{{ next.title }}</div>
+                  </div>
+                  <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
+                </a>
+              {%- endif %}
+              {% if prev -%}
+                <a class="prev-page" href="{{ prev.link }}">
+                  <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
+                  <div class="page-info">
+                    <div class="context">
+                      <span>{{ _("Previous") }}</span>
+                    </div>
+                    {% if prev.link == pathto(master_doc) %}
+                      <div class="title">{{ _("Home") }}</div>
+                    {% else %}
+                      <div class="title">{{ prev.title }}</div>
+                    {% endif %}
+                  </div>
+                </a>
+              {%- endif %}
+            </div>
+            <div class="bottom-of-page">
+              <div class="left-details">
+                {%- if show_copyright %}
+                  <div class="copyright">
+                    {%- if hasdoc('copyright') %}
+                      {% trans path=pathto('copyright'), copyright=copyright|e -%}
+                        <a href="{{ path }}">Copyright</a> &#169; {{ copyright }}
+                      {%- endtrans %}
+                    {%- else %}
+                      {% trans copyright=copyright|e -%}
+                        Copyright &#169; {{ copyright }}, <a href="https://justinmayer.com">Justin Mayer</a>, Alexis Metaireau, and contributors
+                      {%- endtrans %}
+                    {%- endif %}
+                  </div>
+                {%- endif %}
+                {%- if last_updated -%}
+                  <div class="last-updated">
+                    {% trans last_updated=last_updated|e -%}
+                      Last updated on {{ last_updated }}
+                    {%- endtrans -%}
+                  </div>
+                {%- endif %}
+              </div>
+              <div class="right-details">
+                {% if theme_footer_icons or READTHEDOCS -%}
+                  <div class="icons">
+                    {% if theme_footer_icons -%}
+                      {% for icon_dict in theme_footer_icons -%}
+                        <a class="muted-link {{ icon_dict.class }}" href="{{ icon_dict.url }}" aria-label="{{ icon_dict.name }}">
+                          {{- icon_dict.html -}}
+                        </a>
+                      {% endfor %}
+                    {%- else -%}
+              {#- Show Read the Docs project -#}
+                      {%- if READTHEDOCS and slug -%}
+                        <a class="muted-link" href="https://readthedocs.org/projects/{{ slug }}" aria-label="On Read the Docs">
+                          <svg x="0px" y="0px" viewBox="-125 217 360 360" xml:space="preserve">
+                            <path fill="currentColor" d="M39.2,391.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3 c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2 c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,391.3,40.4,391.1,39.2,391.3z M39.2,353.6c-4.2,0.6-7.1,4.4-6.5,8.5 c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4 c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,353.6,40.4,353.4,39.2,353.6z M39.2,315.9 c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8 c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9 C41.7,315.9,40.4,315.8,39.2,315.9z M39.2,278.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7 c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6 c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,278.2,40.4,278.1,39.2,278.3z M-13.6,238.5c-39.6,0.3-54.3,12.5-54.3,12.5v295.7 c0,0,14.4-12.4,60.8-10.5s55.9,18.2,112.9,19.3s71.3-8.8,71.3-8.8l0.8-301.4c0,0-25.6,7.3-75.6,7.7c-49.9,0.4-61.9-12.7-107.7-14.2 C-8.2,238.6-10.9,238.5-13.6,238.5z M19.5,257.8c0,0,24,7.9,68.3,10.1c37.5,1.9,75-3.7,75-3.7v267.9c0,0-19,10-66.5,6.6 C59.5,536.1,19,522.1,19,522.1L19.5,257.8z M-3.6,264.8c4.2,0,7.7,3.4,7.7,7.7c0,4.2-3.4,7.7-7.7,7.7c0,0-12.4,0.1-20,0.8 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,0,0,0,0c0,0,11.3-6,27-7.5 C-16,264.9-3.6,264.8-3.6,264.8z M-11,302.6c4.2-0.1,7.4,0,7.4,0c4.2,0.5,7.2,4.3,6.7,8.5c-0.4,3.5-3.2,6.3-6.7,6.7 c0,0-12.4,0.1-20,0.8c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5 C-20.5,302.9-15.2,302.7-11,302.6z M-3.6,340.2c4.2,0,7.7,3.4,7.7,7.7s-3.4,7.7-7.7,7.7c0,0-12.4-0.1-20,0.7 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5C-16,340.1-3.6,340.2-3.6,340.2z" />
+                          </svg>
+                        </a>
+                      {%- endif -%}
+              {#- Show GitHub repository home -#}
+                      {%- if READTHEDOCS and display_github and github_user != "None" and github_repo != "None" -%}
+                        <a class="muted-link" href="https://github.com/{{ github_user }}/{{ github_repo }}" aria-label="On GitHub">
+                          <svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 16 16">
+                            <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path>
+                          </svg>
+                        </a>
+                      {%- endif -%}
+                    {%- endif %}
+                  </div>
+                {%- endif %}
+              </div>
+            </div>
+          {% endblock footer %}
+        </footer>
+      </div>
+      <aside class="toc-drawer{% if furo_hide_toc %} no-toc{% endif %}">
+        {% block right_sidebar %}
+          {% if not furo_hide_toc %}
+            <div class="toc-sticky toc-scroll">
+              <div class="toc-title-container">
+                <span class="toc-title">
+                  {{ _("On this page") }}
+                </span>
+              </div>
+              <div class="toc-tree-container">
+                <div class="toc-tree">
+                  {{ toc }}
+                </div>
+              </div>
+            </div>
+          {% endif %}
+        {% endblock right_sidebar %}
+      </aside>
+    </div>
   </div>
-</div>
 {%- endblock %}
diff --git a/pelican/tests/content/article_with_inline_svg.html b/pelican/tests/content/article_with_inline_svg.html
index 07f97a8a..06725704 100644
--- a/pelican/tests/content/article_with_inline_svg.html
+++ b/pelican/tests/content/article_with_inline_svg.html
@@ -5,13 +5,13 @@
     <body>
         Ensure that the title attribute in an inline svg is not handled as an HTML title.
         <svg xmlns="http://www.w3.org/2000/svg" width="210mm" height="297mm" viewBox="0 0 210 297">
-           <path fill="#b2b2ff" stroke="#000" stroke-width="2.646" d="M88.698 89.869l-8.899 15.63a38.894 38.894 0 00-16.474 31.722 38.894 38.894 0 0038.894 38.894 38.894 38.894 0 0038.894-38.894 38.894 38.894 0 00-9-24.83l-2.38-16.886-14.828 4.994a38.894 38.894 0 00-12.13-2.144z">
-              <title>A different title inside the inline SVG</title>
-           </path>
-           <ellipse cx="100.806" cy="125.285" rx="3.704" ry="10.583"/>
-           <ellipse cx="82.021" cy="125.285" rx="3.704" ry="10.583"/>
-           <ellipse cx="-111.432" cy="146.563" rx="3.704" ry="10.583" transform="rotate(-64.822)"/>
-           <ellipse cx="-118.245" cy="91.308" rx="6.18" ry="8.62" transform="matrix(.063 -.99801 .96163 .27436 0 0)"/>
+            <path fill="#b2b2ff" stroke="#000" stroke-width="2.646" d="M88.698 89.869l-8.899 15.63a38.894 38.894 0 00-16.474 31.722 38.894 38.894 0 0038.894 38.894 38.894 38.894 0 0038.894-38.894 38.894 38.894 0 00-9-24.83l-2.38-16.886-14.828 4.994a38.894 38.894 0 00-12.13-2.144z">
+                <title>A different title inside the inline SVG</title>
+            </path>
+            <ellipse cx="100.806" cy="125.285" rx="3.704" ry="10.583"/>
+            <ellipse cx="82.021" cy="125.285" rx="3.704" ry="10.583"/>
+            <ellipse cx="-111.432" cy="146.563" rx="3.704" ry="10.583" transform="rotate(-64.822)"/>
+            <ellipse cx="-118.245" cy="91.308" rx="6.18" ry="8.62" transform="matrix(.063 -.99801 .96163 .27436 0 0)"/>
         </svg>
     </body>
 </html>
diff --git a/pelican/tests/content/medium_posts/2017-04-21_-medium-post--d1bf01d62ba3.html b/pelican/tests/content/medium_posts/2017-04-21_-medium-post--d1bf01d62ba3.html
index 02d272dc..6d28f1a2 100644
--- a/pelican/tests/content/medium_posts/2017-04-21_-medium-post--d1bf01d62ba3.html
+++ b/pelican/tests/content/medium_posts/2017-04-21_-medium-post--d1bf01d62ba3.html
@@ -1,72 +1,72 @@
 <!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><title>A title</title><style>
-      * {
-        font-family: Georgia, Cambria, "Times New Roman", Times, serif;
-      }
-      html, body {
-        margin: 0;
-        padding: 0;
-      }
-      h1 {
-        font-size: 50px;
-        margin-bottom: 17px;
-        color: #333;
-      }
-      h2 {
-        font-size: 24px;
-        line-height: 1.6;
-        margin: 30px 0 0 0;
-        margin-bottom: 18px;
-        margin-top: 33px;
-        color: #333;
-      }
-      h3 {
-        font-size: 30px;
-        margin: 10px 0 20px 0;
-        color: #333;
-      }
-      header {
-        width: 640px;
-        margin: auto;
-      }
-      section {
-        width: 640px;
-        margin: auto;
-      }
-      section p {
-        margin-bottom: 27px;
-        font-size: 20px;
-        line-height: 1.6;
-        color: #333;
-      }
-      section img {
-        max-width: 640px;
-      }
-      footer {
-        padding: 0 20px;
-        margin: 50px 0;
-        text-align: center;
-        font-size: 12px;
-      }
-      .aspectRatioPlaceholder {
-        max-width: auto !important;
-        max-height: auto !important;
-      }
-      .aspectRatioPlaceholder-fill {
-        padding-bottom: 0 !important;
-      }
-      header,
-      section[data-field=subtitle],
-      section[data-field=description] {
-        display: none;
-      }
-      </style></head><body><article class="h-entry">
-<header>
-<h1 class="p-name">A name (like title)</h1>
-</header>
-<section data-field="subtitle" class="p-summary">
+  * {
+    font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+  }
+  html, body {
+    margin: 0;
+    padding: 0;
+  }
+  h1 {
+    font-size: 50px;
+    margin-bottom: 17px;
+    color: #333;
+  }
+  h2 {
+    font-size: 24px;
+    line-height: 1.6;
+    margin: 30px 0 0 0;
+    margin-bottom: 18px;
+    margin-top: 33px;
+    color: #333;
+  }
+  h3 {
+    font-size: 30px;
+    margin: 10px 0 20px 0;
+    color: #333;
+  }
+  header {
+    width: 640px;
+    margin: auto;
+  }
+  section {
+    width: 640px;
+    margin: auto;
+  }
+  section p {
+    margin-bottom: 27px;
+    font-size: 20px;
+    line-height: 1.6;
+    color: #333;
+  }
+  section img {
+    max-width: 640px;
+  }
+  footer {
+    padding: 0 20px;
+    margin: 50px 0;
+    text-align: center;
+    font-size: 12px;
+  }
+  .aspectRatioPlaceholder {
+    max-width: auto !important;
+    max-height: auto !important;
+  }
+  .aspectRatioPlaceholder-fill {
+    padding-bottom: 0 !important;
+  }
+  header,
+  section[data-field=subtitle],
+  section[data-field=description] {
+    display: none;
+  }
+</style></head><body><article class="h-entry">
+  <header>
+    <h1 class="p-name">A name (like title)</h1>
+  </header>
+  <section data-field="subtitle" class="p-summary">
     Summary (first several words of content)
-</section>
-<section data-field="body" class="e-content">
-<section name="ad15" class="section section--body section--first"><div class="section-divider"><hr class="section-divider"></div><div class="section-content"><div class="section-inner sectionLayout--insetColumn"><h3 name="20a3" id="20a3" class="graf graf--h3 graf--leading graf--title">Title header</h3><p name="e3d6" id="e3d6" class="graf graf--p graf-after--h3">A paragraph of content.</p><p name="c7a8" id="c7a8" class="graf graf--p graf-after--p">Paragraph number two.</p><p name="42aa" id="42aa" class="graf graf--p graf-after--p">A list:</p><ol class="postList"><li name="d65f" id="d65f" class="graf graf--li graf-after--p">One.</li><li name="232b" id="232b" class="graf graf--li graf-after--li">Two.</li><li name="ef87" id="ef87" class="graf graf--li graf-after--li">Three.</li></ol><p name="e743" id="e743" class="graf graf--p graf-after--p">A link: <a href="https://example.com/example" data-href="https://example.com/example" class="markup--anchor markup--p-anchor" target="_blank">link text</a>.</p><h3 name="4cfd" id="4cfd" class="graf graf--h3 graf-after--p">Header 2</h3><p name="433c" id="433c" class="graf graf--p graf-after--p">A block quote:</p><blockquote name="3537" id="3537" class="graf graf--blockquote graf-after--p">quote words <strong class="markup--strong markup--blockquote-strong">strong words</strong></blockquote><p name="00cc" id="00cc" class="graf graf--p graf-after--blockquote">after blockquote</p><figure name="edb0" id="edb0" class="graf graf--figure graf-after--p"><img class="graf-image" data-image-id="image1.png" data-width="739" data-height="282" src="https://cdn-images-1.medium.com/max/800/image1.png"><figcaption class="imageCaption">A figure caption.</figcaption></figure><p name="f401" id="f401" class="graf graf--p graf-after--p graf--trailing">A final note: <a href="http://stats.stackexchange.com/" data-href="http://stats.stackexchange.com/" class="markup--anchor markup--p-anchor" rel="noopener" target="_blank">Cross-Validated</a> has sometimes been helpful.</p></div></div></section><section name="09a3" class="section section--body section--last"><div class="section-divider"><hr class="section-divider"></div><div class="section-content"><div class="section-inner sectionLayout--insetColumn"><p name="81e8" id="81e8" class="graf graf--p graf--leading"><em class="markup--em markup--p-em">Next: </em><a href="https://medium.com/@username/post-url" data-href="https://medium.com/@username/post-url" class="markup--anchor markup--p-anchor" target="_blank"><em class="markup--em markup--p-em">Next post</em>
-</section>
-<footer><p>By <a href="https://medium.com/@username" class="p-author h-card">User Name</a> on <a href="https://medium.com/p/medium-short-url"><time class="dt-published" datetime="2017-04-21T17:11:55.799Z">April 21, 2017</time></a>.</p><p><a href="https://medium.com/@username/this-post-url" class="p-canonical">Canonical link</a></p><p>Exported from <a href="https://medium.com">Medium</a> on December 1, 2023.</p></footer></article></body></html>
+  </section>
+  <section data-field="body" class="e-content">
+    <section name="ad15" class="section section--body section--first"><div class="section-divider"><hr class="section-divider"></div><div class="section-content"><div class="section-inner sectionLayout--insetColumn"><h3 name="20a3" id="20a3" class="graf graf--h3 graf--leading graf--title">Title header</h3><p name="e3d6" id="e3d6" class="graf graf--p graf-after--h3">A paragraph of content.</p><p name="c7a8" id="c7a8" class="graf graf--p graf-after--p">Paragraph number two.</p><p name="42aa" id="42aa" class="graf graf--p graf-after--p">A list:</p><ol class="postList"><li name="d65f" id="d65f" class="graf graf--li graf-after--p">One.</li><li name="232b" id="232b" class="graf graf--li graf-after--li">Two.</li><li name="ef87" id="ef87" class="graf graf--li graf-after--li">Three.</li></ol><p name="e743" id="e743" class="graf graf--p graf-after--p">A link: <a href="https://example.com/example" data-href="https://example.com/example" class="markup--anchor markup--p-anchor" target="_blank">link text</a>.</p><h3 name="4cfd" id="4cfd" class="graf graf--h3 graf-after--p">Header 2</h3><p name="433c" id="433c" class="graf graf--p graf-after--p">A block quote:</p><blockquote name="3537" id="3537" class="graf graf--blockquote graf-after--p">quote words <strong class="markup--strong markup--blockquote-strong">strong words</strong></blockquote><p name="00cc" id="00cc" class="graf graf--p graf-after--blockquote">after blockquote</p><figure name="edb0" id="edb0" class="graf graf--figure graf-after--p"><img class="graf-image" data-image-id="image1.png" data-width="739" data-height="282" src="https://cdn-images-1.medium.com/max/800/image1.png"><figcaption class="imageCaption">A figure caption.</figcaption></figure><p name="f401" id="f401" class="graf graf--p graf-after--p graf--trailing">A final note: <a href="http://stats.stackexchange.com/" data-href="http://stats.stackexchange.com/" class="markup--anchor markup--p-anchor" rel="noopener" target="_blank">Cross-Validated</a> has sometimes been helpful.</p></div></div></section><section name="09a3" class="section section--body section--last"><div class="section-divider"><hr class="section-divider"></div><div class="section-content"><div class="section-inner sectionLayout--insetColumn"><p name="81e8" id="81e8" class="graf graf--p graf--leading"><em class="markup--em markup--p-em">Next: </em><a href="https://medium.com/@username/post-url" data-href="https://medium.com/@username/post-url" class="markup--anchor markup--p-anchor" target="_blank"><em class="markup--em markup--p-em">Next post</em>
+    </section>
+      <footer><p>By <a href="https://medium.com/@username" class="p-author h-card">User Name</a> on <a href="https://medium.com/p/medium-short-url"><time class="dt-published" datetime="2017-04-21T17:11:55.799Z">April 21, 2017</time></a>.</p><p><a href="https://medium.com/@username/this-post-url" class="p-canonical">Canonical link</a></p><p>Exported from <a href="https://medium.com">Medium</a> on December 1, 2023.</p></footer></article></body></html>
diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 3c2821f1..66136d87 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -1,68 +1,68 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A markdown powered article</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A markdown powered article</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/a-markdown-powered-article.html" rel="bookmark"
-           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/a-markdown-powered-article.html" rel="bookmark"
+                                                   title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00+00:00">
-                Published: Wed 20 April 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-04-20T00:00:00+00:00">
+                                                        Published: Wed 20 April 2011
+                                                </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                                <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
-<p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
-<a href="/unbelievable.html">a file-relative link to unbelievable</a></p>
-    </div><!-- /.entry-content -->
+                                        </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
+                                        <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
+                                                <a href="/unbelievable.html">a file-relative link to unbelievable</a></p>
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 3218fe1d..7aa6b263 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -1,70 +1,70 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-<h1>Archives for A Pelican Blog</h1>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1>Archives for A Pelican Blog</h1>
 
-<dl>
-    <dt>Fri 30 November 2012</dt>
-    <dd><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></dd>
-    <dt>Wed 29 February 2012</dt>
-    <dd><a href="/second-article.html">Second article</a></dd>
-    <dt>Wed 20 April 2011</dt>
-    <dd><a href="/a-markdown-powered-article.html">A markdown powered article</a></dd>
-    <dt>Thu 17 February 2011</dt>
-    <dd><a href="/article-1.html">Article 1</a></dd>
-    <dt>Thu 17 February 2011</dt>
-    <dd><a href="/article-2.html">Article 2</a></dd>
-    <dt>Thu 17 February 2011</dt>
-    <dd><a href="/article-3.html">Article 3</a></dd>
-    <dt>Thu 02 December 2010</dt>
-    <dd><a href="/this-is-a-super-article.html">This is a super article !</a></dd>
-    <dt>Wed 20 October 2010</dt>
-    <dd><a href="/oh-yeah.html">Oh yeah !</a></dd>
-    <dt>Fri 15 October 2010</dt>
-    <dd><a href="/unbelievable.html">Unbelievable !</a></dd>
-    <dt>Sun 14 March 2010</dt>
-    <dd><a href="/tag/baz.html">The baz tag</a></dd>
-</dl>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        <dl>
+                                <dt>Fri 30 November 2012</dt>
+                                <dd><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></dd>
+                                <dt>Wed 29 February 2012</dt>
+                                <dd><a href="/second-article.html">Second article</a></dd>
+                                <dt>Wed 20 April 2011</dt>
+                                <dd><a href="/a-markdown-powered-article.html">A markdown powered article</a></dd>
+                                <dt>Thu 17 February 2011</dt>
+                                <dd><a href="/article-1.html">Article 1</a></dd>
+                                <dt>Thu 17 February 2011</dt>
+                                <dd><a href="/article-2.html">Article 2</a></dd>
+                                <dt>Thu 17 February 2011</dt>
+                                <dd><a href="/article-3.html">Article 3</a></dd>
+                                <dt>Thu 02 December 2010</dt>
+                                <dd><a href="/this-is-a-super-article.html">This is a super article !</a></dd>
+                                <dt>Wed 20 October 2010</dt>
+                                <dd><a href="/oh-yeah.html">Oh yeah !</a></dd>
+                                <dt>Fri 15 October 2010</dt>
+                                <dd><a href="/unbelievable.html">Unbelievable !</a></dd>
+                                <dt>Sun 14 March 2010</dt>
+                                <dd><a href="/tag/baz.html">The baz tag</a></dd>
+                        </dl>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 91dcff19..4ec2a0e1 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -1,67 +1,67 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Article 1</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        <meta name="description" content="Article 1" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Article 1</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <meta name="description" content="Article 1" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/article-1.html" rel="bookmark"
-           title="Permalink to Article 1">Article 1</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/article-1.html" rel="bookmark"
+                                                   title="Permalink to Article 1">Article 1</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+00:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-02-17T00:00:00+00:00">
+                                                        Published: Thu 17 February 2011
+                                                </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                                <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Article 1</p>
+                                        </footer><!-- /.post-info -->      <p>Article 1</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index e3ad5724..99819902 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -1,67 +1,67 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Article 2</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        <meta name="description" content="Article 2" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Article 2</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <meta name="description" content="Article 2" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/article-2.html" rel="bookmark"
-           title="Permalink to Article 2">Article 2</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/article-2.html" rel="bookmark"
+                                                   title="Permalink to Article 2">Article 2</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+00:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-02-17T00:00:00+00:00">
+                                                        Published: Thu 17 February 2011
+                                                </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                                <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Article 2</p>
+                                        </footer><!-- /.post-info -->      <p>Article 2</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 2ec3f1e7..596db91f 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -1,67 +1,67 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Article 3</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        <meta name="description" content="Article 3" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Article 3</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <meta name="description" content="Article 3" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/article-3.html" rel="bookmark"
-           title="Permalink to Article 3">Article 3</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/article-3.html" rel="bookmark"
+                                                   title="Permalink to Article 3">Article 3</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+00:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-02-17T00:00:00+00:00">
+                                                        Published: Thu 17 February 2011
+                                                </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                                <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Article 3</p>
+                                        </footer><!-- /.post-info -->      <p>Article 3</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index d682ab29..e4bde41d 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -1,112 +1,112 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - Alexis Métaireau</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - Alexis Métaireau</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+00:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-12-02T10:14:00+00:00">
+                                                Published: Thu 02 December 2010
+                                        </abbr>
+                                        <br />
+                                        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
+                                                Updated: Sun 17 November 2013
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info --><p>Some content here !</p>
-<div class="section" id="this-is-a-simple-title">
-<h2>This is a simple title</h2>
-<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="/category/yeah.html">yeah</a>.</p>
+                                        <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
+                                </footer><!-- /.post-info --><p>Some content here !</p>
+                                <div class="section" id="this-is-a-simple-title">
+                                        <h2>This is a simple title</h2>
+                                        <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+                                        <img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                        <img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
 </pre>
-<p>→ And now try with some utf8 hell: ééé</p>
-</div>
-                </article>
-            </aside><!-- /#featured -->
+                                        <p>→ And now try with some utf8 hell: ééé</p>
+                                </div>
+                        </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/oh-yeah.html" rel="bookmark"
-                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/oh-yeah.html" rel="bookmark"
+                                                       title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+00:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-20T10:14:00+00:00">
+                                                                Published: Wed 20 October 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
-        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="/category/bar.html">bar</a>.</p>
+                                                        <p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+                                                        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                                </footer><!-- /.post-info -->                <div class="section" id="why-not">
+                                                        <h2>Why not ?</h2>
+                                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                                YEAH !</p>
+                                                        <img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                </div>
 
-                <a class="readmore" href="/oh-yeah.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="/oh-yeah.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index 86d2249a..27d10c2f 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -1,52 +1,52 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - Authors</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - Authors</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-<section id="content" class="body">
-    <h1>Authors on A Pelican Blog</h1>
-    <ul>
-        <li><a href="/author/alexis-metaireau.html">Alexis Métaireau</a> (2)</li>
-    </ul>
-</section>
-
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
+                <section id="content" class="body">
+                        <h1>Authors on A Pelican Blog</h1>
                         <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-
+                                <li><a href="/author/alexis-metaireau.html">Alexis Métaireau</a> (2)</li>
                         </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                </section>
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-</body>
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
+
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
+
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index 86606fbe..5c85b20e 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -1,55 +1,55 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - Categories</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - Categories</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-<section id="content" class="body">
-    <h1>Categories for A Pelican Blog</h1>
-    <ul>
-        <li><a href="/category/bar.html">bar</a> (1)</li>
-        <li><a href="/category/cat1.html">cat1</a> (4)</li>
-        <li><a href="/category/misc.html">misc</a> (4)</li>
-        <li><a href="/category/yeah.html">yeah</a> (1)</li>
-    </ul>
-</section>
-
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
+                <section id="content" class="body">
+                        <h1>Categories for A Pelican Blog</h1>
                         <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-
+                                <li><a href="/category/bar.html">bar</a> (1)</li>
+                                <li><a href="/category/cat1.html">cat1</a> (4)</li>
+                                <li><a href="/category/misc.html">misc</a> (4)</li>
+                                <li><a href="/category/yeah.html">yeah</a> (1)</li>
                         </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                </section>
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-</body>
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
+
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
+
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index c4f57bdd..e89375bf 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -1,68 +1,68 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - bar</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - bar</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li class="active"><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li class="active"><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+00:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-10-20T10:14:00+00:00">
+                                                Published: Wed 20 October 2010
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
-        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="/category/bar.html">bar</a>.</p>
+                                        <p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+                                        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
-                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                </footer><!-- /.post-info --><div class="section" id="why-not">
+                                        <h2>Why not ?</h2>
+                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                YEAH !</p>
+                                        <img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                </div>
+                        </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index a291aae4..6c0cd64c 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -1,125 +1,125 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - cat1</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - cat1</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00+00:00">
-                Published: Wed 20 April 2011
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2011-04-20T00:00:00+00:00">
+                                                Published: Wed 20 April 2011
+                                        </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                        <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
-<a href="/unbelievable.html">a file-relative link to unbelievable</a></p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
+                                <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
+                                        <a href="/unbelievable.html">a file-relative link to unbelievable</a></p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/article-1.html" rel="bookmark"
-                           title="Permalink to Article 1">Article 1</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/article-1.html" rel="bookmark"
+                                                       title="Permalink to Article 1">Article 1</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+00:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+00:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                                        <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 1</p>
+                                                </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="/article-1.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="/article-1.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/article-2.html" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/article-2.html" rel="bookmark"
+                                                       title="Permalink to Article 2">Article 2</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+00:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+00:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                                        <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 2</p>
+                                                </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="/article-2.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="/article-2.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/article-3.html" rel="bookmark"
-                           title="Permalink to Article 3">Article 3</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/article-3.html" rel="bookmark"
+                                                       title="Permalink to Article 3">Article 3</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+00:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+00:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                                        <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 3</p>
+                                                </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="/article-3.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="/article-3.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index fa786910..fa9eb563 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -1,136 +1,136 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - misc</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - misc</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00+00:00">
-                Published: Fri 30 November 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-11-30T00:00:00+00:00">
+                                                Published: Fri 30 November 2012
+                                        </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
+                                        <p>In <a href="/category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info --><p>Some cool stuff!</p>
-                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>Some cool stuff!</p>
+                        </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/second-article.html" rel="bookmark"
+                                                       title="Permalink to Second article">Second article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+00:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2012-02-29T00:00:00+00:00">
+                                                                Published: Wed 29 February 2012
+                                                        </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article-fr.html" hreflang="fr">fr</a>
+                                                        <p>In <a href="/category/misc.html">misc</a>.</p>
+                                                        <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
+                                                        <a href="/second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+                                                </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="/second-article.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="/second-article.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/unbelievable.html" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/unbelievable.html" rel="bookmark"
+                                                       title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00+00:00">
-                Published: Fri 15 October 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-15T20:30:00+00:00">
+                                                                Published: Fri 15 October 2010
+                                                        </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
+                                                        <p>In <a href="/category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
-<div class="section" id="testing-sourcecode-directive">
-<h2>Testing sourcecode directive</h2>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+                                                <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+                                                        <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+                                                <div class="section" id="testing-sourcecode-directive">
+                                                        <h2>Testing sourcecode directive</h2>
+                                                        <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-</div>
-<div class="section" id="testing-another-case">
-<h2>Testing another case</h2>
-<p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …</p></div>
-                <a class="readmore" href="/unbelievable.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                </div>
+                                                <div class="section" id="testing-another-case">
+                                                        <h2>Testing another case</h2>
+                                                        <p>This will now have a line number in 'custom' since it's the default in
+                                                                pelican.conf, it will …</p></div>
+                                                <a class="readmore" href="/unbelievable.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/tag/baz.html" rel="bookmark"
-                           title="Permalink to The baz tag">The baz tag</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/tag/baz.html" rel="bookmark"
+                                                       title="Permalink to The baz tag">The baz tag</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00+00:00">
-                Published: Sun 14 March 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-03-14T00:00:00+00:00">
+                                                                Published: Sun 14 March 2010
+                                                        </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
+                                                        <p>In <a href="/category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+                                                </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
-                <a class="readmore" href="/tag/baz.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="/tag/baz.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index caade72e..ab08cc58 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -1,76 +1,76 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - yeah</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - yeah</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li class="active"><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+00:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-12-02T10:14:00+00:00">
+                                                Published: Thu 02 December 2010
+                                        </abbr>
+                                        <br />
+                                        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
+                                                Updated: Sun 17 November 2013
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info --><p>Some content here !</p>
-<div class="section" id="this-is-a-simple-title">
-<h2>This is a simple title</h2>
-<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="/category/yeah.html">yeah</a>.</p>
+                                        <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
+                                </footer><!-- /.post-info --><p>Some content here !</p>
+                                <div class="section" id="this-is-a-simple-title">
+                                        <h2>This is a simple title</h2>
+                                        <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+                                        <img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                        <img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
 </pre>
-<p>→ And now try with some utf8 hell: ééé</p>
-</div>
-                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <p>→ And now try with some utf8 hell: ééé</p>
+                                </div>
+                        </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
index 45bc00ec..50b72e72 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
@@ -1,68 +1,68 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A draft article without date</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A draft article without date</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/drafts/a-draft-article-without-date.html" rel="bookmark"
-           title="Permalink to A draft article without date">A draft article without date</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/drafts/a-draft-article-without-date.html" rel="bookmark"
+                                                   title="Permalink to A draft article without date">A draft article without date</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="9999-12-31T23:59:59.999999+00:00">
-                Published:
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="9999-12-31T23:59:59.999999+00:00">
+                                                        Published:
+                                                </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
+                                                <p>In <a href="/category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
-listed anywhere else.</p>
+                                        </footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
+                                                listed anywhere else.</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index 9349064c..b9125549 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -1,68 +1,68 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A draft article</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A draft article</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/drafts/a-draft-article.html" rel="bookmark"
-           title="Permalink to A draft article">A draft article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/drafts/a-draft-article.html" rel="bookmark"
+                                                   title="Permalink to A draft article">A draft article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-05-08T15:58:00+00:00">
-                Published: Sun 08 May 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-05-08T15:58:00+00:00">
+                                                        Published: Sun 08 May 2011
+                                                </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
+                                                <p>In <a href="/category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
-listed anywhere else.</p>
+                                        </footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
+                                                listed anywhere else.</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 30da64fd..d66c30fc 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -1,67 +1,67 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>FILENAME_METADATA example</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        <meta name="description" content="Some cool stuff!" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>FILENAME_METADATA example</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <meta name="description" content="Some cool stuff!" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/filename_metadata-example.html" rel="bookmark"
-           title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/filename_metadata-example.html" rel="bookmark"
+                                                   title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00+00:00">
-                Published: Fri 30 November 2012
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2012-11-30T00:00:00+00:00">
+                                                        Published: Fri 30 November 2012
+                                                </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
+                                                <p>In <a href="/category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Some cool stuff!</p>
+                                        </footer><!-- /.post-info -->      <p>Some cool stuff!</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index db95e29b..0436d17b 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -1,275 +1,275 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00+00:00">
-                Published: Fri 30 November 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-11-30T00:00:00+00:00">
+                                                Published: Fri 30 November 2012
+                                        </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
+                                        <p>In <a href="/category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info --><p>Some cool stuff!</p>
-                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>Some cool stuff!</p>
+                        </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/second-article.html" rel="bookmark"
+                                                       title="Permalink to Second article">Second article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+00:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2012-02-29T00:00:00+00:00">
+                                                                Published: Wed 29 February 2012
+                                                        </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article-fr.html" hreflang="fr">fr</a>
+                                                        <p>In <a href="/category/misc.html">misc</a>.</p>
+                                                        <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
+                                                        <a href="/second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+                                                </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="/second-article.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="/second-article.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/a-markdown-powered-article.html" rel="bookmark"
-                           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/a-markdown-powered-article.html" rel="bookmark"
+                                                       title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00+00:00">
-                Published: Wed 20 April 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-04-20T00:00:00+00:00">
+                                                                Published: Wed 20 April 2011
+                                                        </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                                        <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
-<a href="/unbelievable.html">a file-relative link to unbelievable</a></p>
-                <a class="readmore" href="/a-markdown-powered-article.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
+                                                <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
+                                                        <a href="/unbelievable.html">a file-relative link to unbelievable</a></p>
+                                                <a class="readmore" href="/a-markdown-powered-article.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/article-1.html" rel="bookmark"
-                           title="Permalink to Article 1">Article 1</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/article-1.html" rel="bookmark"
+                                                       title="Permalink to Article 1">Article 1</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+00:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+00:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                                        <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 1</p>
+                                                </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="/article-1.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="/article-1.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/article-2.html" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/article-2.html" rel="bookmark"
+                                                       title="Permalink to Article 2">Article 2</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+00:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+00:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                                        <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 2</p>
+                                                </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="/article-2.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="/article-2.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/article-3.html" rel="bookmark"
-                           title="Permalink to Article 3">Article 3</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/article-3.html" rel="bookmark"
+                                                       title="Permalink to Article 3">Article 3</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+00:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+00:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-<p>In <a href="/category/cat1.html">cat1</a>.</p>
+                                                        <p>In <a href="/category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 3</p>
+                                                </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="/article-3.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="/article-3.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/this-is-a-super-article.html" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/this-is-a-super-article.html" rel="bookmark"
+                                                       title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+00:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-12-02T10:14:00+00:00">
+                                                                Published: Thu 02 December 2010
+                                                        </abbr>
+                                                        <br />
+                                                        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
+                                                                Updated: Sun 17 November 2013
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="/category/yeah.html">yeah</a>.</p>
+                                                        <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
+                                                </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+                                                        as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="/this-is-a-super-article.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="/this-is-a-super-article.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/oh-yeah.html" rel="bookmark"
-                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/oh-yeah.html" rel="bookmark"
+                                                       title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+00:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-20T10:14:00+00:00">
+                                                                Published: Wed 20 October 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
-        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="/category/bar.html">bar</a>.</p>
+                                                        <p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+                                                        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                                </footer><!-- /.post-info -->                <div class="section" id="why-not">
+                                                        <h2>Why not ?</h2>
+                                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                                YEAH !</p>
+                                                        <img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                </div>
 
-                <a class="readmore" href="/oh-yeah.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="/oh-yeah.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/unbelievable.html" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/unbelievable.html" rel="bookmark"
+                                                       title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00+00:00">
-                Published: Fri 15 October 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-15T20:30:00+00:00">
+                                                                Published: Fri 15 October 2010
+                                                        </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
+                                                        <p>In <a href="/category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
-<div class="section" id="testing-sourcecode-directive">
-<h2>Testing sourcecode directive</h2>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+                                                <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+                                                        <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+                                                <div class="section" id="testing-sourcecode-directive">
+                                                        <h2>Testing sourcecode directive</h2>
+                                                        <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-</div>
-<div class="section" id="testing-another-case">
-<h2>Testing another case</h2>
-<p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …</p></div>
-                <a class="readmore" href="/unbelievable.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                </div>
+                                                <div class="section" id="testing-another-case">
+                                                        <h2>Testing another case</h2>
+                                                        <p>This will now have a line number in 'custom' since it's the default in
+                                                                pelican.conf, it will …</p></div>
+                                                <a class="readmore" href="/unbelievable.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/tag/baz.html" rel="bookmark"
-                           title="Permalink to The baz tag">The baz tag</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/tag/baz.html" rel="bookmark"
+                                                       title="Permalink to The baz tag">The baz tag</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00+00:00">
-                Published: Sun 14 March 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-03-14T00:00:00+00:00">
+                                                                Published: Sun 14 March 2010
+                                                        </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
+                                                        <p>In <a href="/category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+                                                </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
-                <a class="readmore" href="/tag/baz.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="/tag/baz.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/oh-yeah-fr.html b/pelican/tests/output/basic/oh-yeah-fr.html
index 388cc283..1fbf47c5 100644
--- a/pelican/tests/output/basic/oh-yeah-fr.html
+++ b/pelican/tests/output/basic/oh-yeah-fr.html
@@ -1,71 +1,71 @@
 <!DOCTYPE html>
 <html lang="fr">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Trop bien !</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-      <link rel="alternate" hreflang="en" href="/oh-yeah.html">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Trop bien !</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <link rel="alternate" hreflang="en" href="/oh-yeah.html">
 
-        <meta name="description" content="Et voila du contenu en français" />
-</head>
+                <meta name="description" content="Et voila du contenu en français" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/oh-yeah-fr.html" rel="bookmark"
-           title="Permalink to Trop bien !">Trop bien !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/oh-yeah-fr.html" rel="bookmark"
+                                                   title="Permalink to Trop bien !">Trop bien !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+00:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-10-20T10:14:00+00:00">
+                                                        Published: Wed 20 October 2010
+                                                </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
-Translations:
-        <a href="/oh-yeah.html" hreflang="en">en</a>
+                                                <p>In <a href="/category/misc.html">misc</a>.</p>
+                                                Translations:
+                                                <a href="/oh-yeah.html" hreflang="en">en</a>
 
-</footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
+                                        </footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 186a3c84..bcea5a93 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -1,79 +1,79 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Oh yeah !</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-      <link rel="alternate" hreflang="fr" href="/oh-yeah-fr.html">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Oh yeah !</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <link rel="alternate" hreflang="fr" href="/oh-yeah-fr.html">
 
-        <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" />
-</head>
+                <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li class="active"><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/oh-yeah.html" rel="bookmark"
-           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li class="active"><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/oh-yeah.html" rel="bookmark"
+                                                   title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+00:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-10-20T10:14:00+00:00">
+                                                        Published: Wed 20 October 2010
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
-        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="/category/bar.html">bar</a>.</p>
+                                                <p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+                                                <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->      <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                        </footer><!-- /.post-info -->      <div class="section" id="why-not">
+                                                <h2>Why not ?</h2>
+                                                <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                        YEAH !</p>
+                                                <img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                        </div>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index 1b7c404b..68e97792 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -1,51 +1,51 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Override url/save_as</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Override url/save_as</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li class="active"><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">Override url/save_as</h1>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li class="active"><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">Override url/save_as</h1>
 
-    <p>Test page which overrides save_as and url so that this page will be generated
-at a custom location.</p>
+                        <p>Test page which overrides save_as and url so that this page will be generated
+                                at a custom location.</p>
 
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index fda32c01..b96b722c 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -1,51 +1,51 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>This is a test hidden page</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>This is a test hidden page</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">This is a test hidden page</h1>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">This is a test hidden page</h1>
 
-    <p>This is great for things like error(404) pages
-Anyone can see this page but it's not linked to anywhere!</p>
+                        <p>This is great for things like error(404) pages
+                                Anyone can see this page but it's not linked to anywhere!</p>
 
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index b79f424d..e6e7ead4 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -1,52 +1,52 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>This is a test page</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>This is a test page</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li class="active"><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">This is a test page</h1>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li class="active"><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">This is a test page</h1>
 
-    <p>Just an image.</p>
-<img alt="alternate text" src="/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
-<img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+                        <p>Just an image.</p>
+                        <img alt="alternate text" src="/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+                        <img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index e70f16e5..f0711c64 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -1,71 +1,71 @@
 <!DOCTYPE html>
 <html lang="fr">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Deuxième article</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-      <link rel="alternate" hreflang="en" href="/second-article.html">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Deuxième article</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <link rel="alternate" hreflang="en" href="/second-article.html">
 
-        <meta name="description" content="Ceci est un article, en français." />
-</head>
+                <meta name="description" content="Ceci est un article, en français." />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/second-article-fr.html" rel="bookmark"
-           title="Permalink to Deuxième article">Deuxième article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/second-article-fr.html" rel="bookmark"
+                                                   title="Permalink to Deuxième article">Deuxième article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+00:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2012-02-29T00:00:00+00:00">
+                                                        Published: Wed 29 February 2012
+                                                </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article.html" hreflang="en">en</a>
+                                                <p>In <a href="/category/misc.html">misc</a>.</p>
+                                                <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
+                                                <a href="/second-article.html" hreflang="en">en</a>
 
-</footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
+                                        </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 4c833a49..da4699a5 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -1,71 +1,71 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Second article</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-      <link rel="alternate" hreflang="fr" href="/second-article-fr.html">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Second article</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <link rel="alternate" hreflang="fr" href="/second-article-fr.html">
 
-        <meta name="description" content="This is some article, in english" />
-</head>
+                <meta name="description" content="This is some article, in english" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/second-article.html" rel="bookmark"
-           title="Permalink to Second article">Second article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/second-article.html" rel="bookmark"
+                                                   title="Permalink to Second article">Second article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+00:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2012-02-29T00:00:00+00:00">
+                                                        Published: Wed 29 February 2012
+                                                </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article-fr.html" hreflang="fr">fr</a>
+                                                <p>In <a href="/category/misc.html">misc</a>.</p>
+                                                <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
+                                                <a href="/second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->      <p>This is some article, in english</p>
+                                        </footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index d2824c2e..0a1c7575 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -1,124 +1,124 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - bar</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - bar</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+00:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-02-29T00:00:00+00:00">
+                                                Published: Wed 29 February 2012
+                                        </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article-fr.html" hreflang="fr">fr</a>
+                                        <p>In <a href="/category/misc.html">misc</a>.</p>
+                                        <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
+                                        <a href="/second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>This is some article, in english</p>
+                        </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/this-is-a-super-article.html" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/this-is-a-super-article.html" rel="bookmark"
+                                                       title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+00:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-12-02T10:14:00+00:00">
+                                                                Published: Thu 02 December 2010
+                                                        </abbr>
+                                                        <br />
+                                                        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
+                                                                Updated: Sun 17 November 2013
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="/category/yeah.html">yeah</a>.</p>
+                                                        <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
+                                                </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+                                                        as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="/this-is-a-super-article.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="/this-is-a-super-article.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/oh-yeah.html" rel="bookmark"
-                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/oh-yeah.html" rel="bookmark"
+                                                       title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+00:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-20T10:14:00+00:00">
+                                                                Published: Wed 20 October 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
-        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="/category/bar.html">bar</a>.</p>
+                                                        <p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+                                                        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                                </footer><!-- /.post-info -->                <div class="section" id="why-not">
+                                                        <h2>Why not ?</h2>
+                                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                                YEAH !</p>
+                                                        <img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                </div>
 
-                <a class="readmore" href="/oh-yeah.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="/oh-yeah.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 01cb257e..c4b68a5e 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -1,67 +1,67 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>The baz tag</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        <meta name="description" content="This article overrides the listening of the articles under the baz tag." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>The baz tag</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <meta name="description" content="This article overrides the listening of the articles under the baz tag." />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/tag/baz.html" rel="bookmark"
-           title="Permalink to The baz tag">The baz tag</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/tag/baz.html" rel="bookmark"
+                                                   title="Permalink to The baz tag">The baz tag</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00+00:00">
-                Published: Sun 14 March 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-03-14T00:00:00+00:00">
+                                                        Published: Sun 14 March 2010
+                                                </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
+                                                <p>In <a href="/category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+                                        </footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index bdabf131..f310efee 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -1,94 +1,94 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - foo</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - foo</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+00:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-02-29T00:00:00+00:00">
+                                                Published: Wed 29 February 2012
+                                        </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
-        <a href="/second-article-fr.html" hreflang="fr">fr</a>
+                                        <p>In <a href="/category/misc.html">misc</a>.</p>
+                                        <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/baz.html">baz</a> </p>Translations:
+                                        <a href="/second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>This is some article, in english</p>
+                        </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="/this-is-a-super-article.html" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="/this-is-a-super-article.html" rel="bookmark"
+                                                       title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+00:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-12-02T10:14:00+00:00">
+                                                                Published: Thu 02 December 2010
+                                                        </abbr>
+                                                        <br />
+                                                        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
+                                                                Updated: Sun 17 November 2013
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="/category/yeah.html">yeah</a>.</p>
+                                                        <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
+                                                </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+                                                        as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="/this-is-a-super-article.html">read more</a>
-                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="/this-is-a-super-article.html">read more</a>
+                                        </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 00b72790..edc1ed9a 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -1,76 +1,76 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - foobar</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - foobar</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+00:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-12-02T10:14:00+00:00">
+                                                Published: Thu 02 December 2010
+                                        </abbr>
+                                        <br />
+                                        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
+                                                Updated: Sun 17 November 2013
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info --><p>Some content here !</p>
-<div class="section" id="this-is-a-simple-title">
-<h2>This is a simple title</h2>
-<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="/category/yeah.html">yeah</a>.</p>
+                                        <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
+                                </footer><!-- /.post-info --><p>Some content here !</p>
+                                <div class="section" id="this-is-a-simple-title">
+                                        <h2>This is a simple title</h2>
+                                        <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+                                        <img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                        <img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
 </pre>
-<p>→ And now try with some utf8 hell: ééé</p>
-</div>
-                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <p>→ And now try with some utf8 hell: ééé</p>
+                                </div>
+                        </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index c675834b..26dde5e6 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -1,50 +1,50 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Oh Oh Oh</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Oh Oh Oh</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li class="active"><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">Oh Oh Oh</h1>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li class="active"><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">Oh Oh Oh</h1>
 
-    <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
+                        <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 99806970..2e1c4188 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -1,68 +1,68 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - yeah</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - yeah</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+00:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-10-20T10:14:00+00:00">
+                                                Published: Wed 20 October 2010
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/bar.html">bar</a>.</p>
-<p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
-        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="/category/bar.html">bar</a>.</p>
+                                        <p>tags: <a href="/tag/oh.html">oh</a> <a href="/tag/bar.html">bar</a> <a href="/tag/yeah.html">yeah</a> </p>Translations:
+                                        <a href="/oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
-                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                </footer><!-- /.post-info --><div class="section" id="why-not">
+                                        <h2>Why not ?</h2>
+                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                YEAH !</p>
+                                        <img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                </div>
+                        </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index 4d82ca7b..2bf06525 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -1,57 +1,57 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A Pelican Blog - Tags</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A Pelican Blog - Tags</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-<section id="content" class="body">
-    <h1>Tags for A Pelican Blog</h1>
-    <ul>
-        <li><a href="/tag/bar.html">bar</a> (3)</li>
-        <li><a href="/tag/baz.html">baz</a> (1)</li>
-        <li><a href="/tag/foo.html">foo</a> (2)</li>
-        <li><a href="/tag/foobar.html">foobar</a> (1)</li>
-        <li><a href="/tag/oh.html">oh</a> (1)</li>
-        <li><a href="/tag/yeah.html">yeah</a> (1)</li>
-    </ul>
-</section>
-
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
+                <section id="content" class="body">
+                        <h1>Tags for A Pelican Blog</h1>
                         <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-
+                                <li><a href="/tag/bar.html">bar</a> (3)</li>
+                                <li><a href="/tag/baz.html">baz</a> (1)</li>
+                                <li><a href="/tag/foo.html">foo</a> (2)</li>
+                                <li><a href="/tag/foobar.html">foobar</a> (1)</li>
+                                <li><a href="/tag/oh.html">oh</a> (1)</li>
+                                <li><a href="/tag/yeah.html">yeah</a> (1)</li>
                         </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                </section>
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-</body>
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
+
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
+
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/theme/css/fonts.css b/pelican/tests/output/basic/theme/css/fonts.css
index 56015076..7c69215e 100644
--- a/pelican/tests/output/basic/theme/css/fonts.css
+++ b/pelican/tests/output/basic/theme/css/fonts.css
@@ -1,12 +1,12 @@
 @font-face {
-	font-family: 'Yanone Kaffeesatz';
-	font-style: normal;
-	font-weight: 400;
-	src:
-		local('Yanone Kaffeesatz Regular'),
-		local('YanoneKaffeesatz-Regular'),
+    font-family: 'Yanone Kaffeesatz';
+    font-style: normal;
+    font-weight: 400;
+    src:
+    local('Yanone Kaffeesatz Regular'),
+    local('YanoneKaffeesatz-Regular'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
-		url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
+    url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
-		url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
+    url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
 }
diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 49de03d9..c1d86950 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -36,9 +36,9 @@ h5 {font-size: 1.143em}	/* 16px */
 h6 {font-size: 1em}		/* 14px */
 
 h1, h2, h3, h4, h5, h6 {
-	font-weight: 400;
-	line-height: 1.1;
-	margin-bottom: .8em;
+    font-weight: 400;
+    line-height: 1.1;
+    margin-bottom: .8em;
     font-family: 'Yanone Kaffeesatz', arial, serif;
 }
 
@@ -50,15 +50,15 @@ hr { border: 2px solid #EEEEEE; }
 a {outline: 0;}
 a img {border: 0px; text-decoration: none;}
 a:link, a:visited {
-	color: #C74350;
-	padding: 0 1px;
-	text-decoration: underline;
+    color: #C74350;
+    padding: 0 1px;
+    text-decoration: underline;
 }
 a:hover, a:active {
-	background-color: #C74350;
-	color: #fff;
-	text-decoration: none;
-	text-shadow: 1px 1px 1px #333;
+    background-color: #C74350;
+    color: #fff;
+    text-decoration: none;
+    text-shadow: 1px 1px 1px #333;
 }
 
 h1 a:hover {
@@ -75,17 +75,17 @@ em, i {font-style: italic;}
 
 /* Lists */
 ul {
-	list-style: outside disc;
-	margin: 0em 0 0 1.5em;
+    list-style: outside disc;
+    margin: 0em 0 0 1.5em;
 }
 
 ol {
-	list-style: outside decimal;
-	margin: 0em 0 0 1.5em;
+    list-style: outside decimal;
+    margin: 0em 0 0 1.5em;
 }
 
 li { margin-top: 0.5em;
-     margin-bottom: 1em; }
+    margin-bottom: 1em; }
 
 .post-info {
     float:right;
@@ -116,34 +116,34 @@ cite {}
 q {}
 
 div.note {
-   float: right;
-   margin: 5px;
-   font-size: 85%;
-   max-width: 300px;
+    float: right;
+    margin: 5px;
+    font-size: 85%;
+    max-width: 300px;
 }
 
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
 
 	/* Thead */
-	thead th {padding: .5em .4em; text-align: left;}
-	thead td {}
+thead th {padding: .5em .4em; text-align: left;}
+thead td {}
 
 	/* Tbody */
-	tbody td {padding: .5em .4em;}
-	tbody th {}
+tbody td {padding: .5em .4em;}
+tbody th {}
 
-	tbody .alt td {}
-	tbody .alt th {}
+tbody .alt td {}
+tbody .alt th {}
 
 	/* Tfoot */
-	tfoot th {}
-	tfoot td {}
+tfoot th {}
+tfoot td {}
 
 /* HTML5 tags */
 header, section, footer,
 aside, nav, article, figure {
-	display: block;
+    display: block;
 }
 
 /***** Layout *****/
@@ -171,95 +171,95 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	Header
 *****************/
 #banner {
-	margin: 0 auto;
-	padding: 0.8em 0 0 0;
+    margin: 0 auto;
+    padding: 0.8em 0 0 0;
 }
 
 	/* Banner */
-	#banner h1 {
-		font-size: 3.571em;
-		line-height: 1.0;
-		margin-bottom: .3em;
-	}
+#banner h1 {
+    font-size: 3.571em;
+    line-height: 1.0;
+    margin-bottom: .3em;
+}
 
-	#banner h1 a:link, #banner h1 a:visited {
-		color: #000305;
-		display: block;
-		font-weight: bold;
-		margin: 0 0 0 .2em;
-		text-decoration: none;
-	}
-	#banner h1 a:hover, #banner h1 a:active {
-		background: none;
-		color: #C74350;
-		text-shadow: none;
-	}
+#banner h1 a:link, #banner h1 a:visited {
+    color: #000305;
+    display: block;
+    font-weight: bold;
+    margin: 0 0 0 .2em;
+    text-decoration: none;
+}
+#banner h1 a:hover, #banner h1 a:active {
+    background: none;
+    color: #C74350;
+    text-shadow: none;
+}
 
-	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
+#banner h1 strong {font-size: 0.36em; font-weight: normal;}
 
 	/* Main Nav */
-	#banner nav {
-		background: #000305;
-		font-size: 1.143em;
-		overflow: auto;
-		line-height: 30px;
-		margin: 0 auto 2em auto;
-		padding: 0;
-		text-align: center;
-		max-width: 800px;
+#banner nav {
+    background: #000305;
+    font-size: 1.143em;
+    overflow: auto;
+    line-height: 30px;
+    margin: 0 auto 2em auto;
+    padding: 0;
+    text-align: center;
+    max-width: 800px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
 
-	#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
-	#banner nav li {float: left; display: inline; margin: 0;}
+#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
+#banner nav li {float: left; display: inline; margin: 0;}
 
-	#banner nav a:link, #banner nav a:visited {
-		color: #fff;
-		display: inline-block;
-		height: 30px;
-		padding: 5px 1.5em;
-		text-decoration: none;
-	}
-	#banner nav a:hover, #banner nav a:active,
-	#banner nav .active a:link, #banner nav .active a:visited {
-		background: #C74451;
-		color: #fff;
-		text-shadow: none !important;
-	}
+#banner nav a:link, #banner nav a:visited {
+    color: #fff;
+    display: inline-block;
+    height: 30px;
+    padding: 5px 1.5em;
+    text-decoration: none;
+}
+#banner nav a:hover, #banner nav a:active,
+#banner nav .active a:link, #banner nav .active a:visited {
+    background: #C74451;
+    color: #fff;
+    text-shadow: none !important;
+}
 
-	#banner nav li:first-child a {
-		border-top-left-radius: 5px;
-		-moz-border-radius-topleft: 5px;
-		-webkit-border-top-left-radius: 5px;
+#banner nav li:first-child a {
+    border-top-left-radius: 5px;
+    -moz-border-radius-topleft: 5px;
+    -webkit-border-top-left-radius: 5px;
 
-		border-bottom-left-radius: 5px;
-		-moz-border-radius-bottomleft: 5px;
-		-webkit-border-bottom-left-radius: 5px;
-	}
+    border-bottom-left-radius: 5px;
+    -moz-border-radius-bottomleft: 5px;
+    -webkit-border-bottom-left-radius: 5px;
+}
 
 /*
 	Featured
 *****************/
 #featured {
-	background: #fff;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px;
-	max-width: 760px;
+    background: #fff;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 #featured figure {
-	border: 2px solid #eee;
-	float: right;
-	margin: 0.786em 2em 0 5em;
-	max-width: 248px;
+    border: 2px solid #eee;
+    float: right;
+    margin: 0.786em 2em 0 5em;
+    max-width: 248px;
 }
 #featured figure img {display: block; float: right;}
 
@@ -273,15 +273,15 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	Body
 *****************/
 #content {
-	background: #fff;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px 20px;
-	max-width: 760px;
+    background: #fff;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px 20px;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 /*
@@ -292,51 +292,51 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 #extras ul {list-style: none; margin: 0;}
 #extras li {border-bottom: 1px solid #fff;}
 #extras h2 {
-	color: #C74350;
-	font-size: 1.429em;
-	margin-bottom: .25em;
-	padding: 0 3px;
+    color: #C74350;
+    font-size: 1.429em;
+    margin-bottom: .25em;
+    padding: 0 3px;
 }
 
 #extras a:link, #extras a:visited {
-	color: #444;
-	display: block;
-	border-bottom: 1px solid #F4E3E3;
-	text-decoration: none;
-	padding: .3em .25em;
+    color: #444;
+    display: block;
+    border-bottom: 1px solid #F4E3E3;
+    text-decoration: none;
+    padding: .3em .25em;
 }
 
 #extras a:hover, #extras a:active {color: #fff;}
 
 	/* Blogroll */
-	#extras .blogroll {
-		float: left;
-		max-width: 615px;
-	}
+#extras .blogroll {
+    float: left;
+    max-width: 615px;
+}
 
-	#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
+#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
 
 	/* Social */
-	#extras .social {
-		float: right;
-		max-width: 175px;
-	}
+#extras .social {
+    float: right;
+    max-width: 175px;
+}
 
 /*
 	About
 *****************/
 #about {
-	background: #fff;
-	font-style: normal;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px;
-	text-align: left;
-	max-width: 760px;
+    background: #fff;
+    font-style: normal;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px;
+    text-align: left;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 #about .primary {float: left; max-width: 165px;}
@@ -355,10 +355,10 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 /***** Sections *****/
 /* Blog */
 .hentry {
-	display: block;
-	clear: both;
-	border-top: 1px solid #eee;
-	padding: 1.5em 0;
+    display: block;
+    clear: both;
+    border-top: 1px solid #eee;
+    padding: 1.5em 0;
 }
 li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 #content > .hentry {padding: 1em 0;}
@@ -370,70 +370,70 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 .hentry .post-info * {font-style: normal;}
 
 	/* Content */
-	.hentry footer {margin-bottom: 2em;}
-	.hentry footer address {display: inline;}
-	#posts-list footer address {display: block;}
+.hentry footer {margin-bottom: 2em;}
+.hentry footer address {display: inline;}
+#posts-list footer address {display: block;}
 
 	/* Blog Index */
-	#posts-list {list-style: none; margin: 0;}
-	#posts-list .hentry {padding-left: 10px; position: relative;}
+#posts-list {list-style: none; margin: 0;}
+#posts-list .hentry {padding-left: 10px; position: relative;}
 
-	#posts-list footer {
-		left: 10px;
-		position: relative;
-        float: left;
-		top: 0.5em;
-		max-width: 190px;
-	}
+#posts-list footer {
+    left: 10px;
+    position: relative;
+    float: left;
+    top: 0.5em;
+    max-width: 190px;
+}
 
 	/* About the Author */
-	#about-author {
-		background: #f9f9f9;
-		clear: both;
-		font-style: normal;
-		margin: 2em 0;
-		padding: 10px 20px 15px 20px;
+#about-author {
+    background: #f9f9f9;
+    clear: both;
+    font-style: normal;
+    margin: 2em 0;
+    padding: 10px 20px 15px 20px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
 
-	#about-author strong {
-		color: #C64350;
-		clear: both;
-		display: block;
-		font-size: 1.429em;
-	}
+#about-author strong {
+    color: #C64350;
+    clear: both;
+    display: block;
+    font-size: 1.429em;
+}
 
-	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
+#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
 
 	/* Comments */
-	#comments-list {list-style: none; margin: 0 1em;}
-	#comments-list blockquote {
-		background: #f8f8f8;
-		clear: both;
-		font-style: normal;
-		margin: 0;
-		padding: 15px 20px;
+#comments-list {list-style: none; margin: 0 1em;}
+#comments-list blockquote {
+    background: #f8f8f8;
+    clear: both;
+    font-style: normal;
+    margin: 0;
+    padding: 15px 20px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
-	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
 
-	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
+#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
 
 	/* Add a Comment */
-	#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
-	#add-comment input[type='text'],
-	#add-comment input[type='email'],
-	#add-comment input[type='url'] {float: left; max-width: 200px;}
+#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
+#add-comment input[type='text'],
+#add-comment input[type='email'],
+#add-comment input[type='url'] {float: left; max-width: 200px;}
 
-	#add-comment textarea {float: left; height: 150px; max-width: 495px;}
+#add-comment textarea {float: left; height: 150px; max-width: 495px;}
 
-	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
+#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
 
-	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
-	#add-comment * {margin-bottom: .5em;}
+#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
+#add-comment * {margin-bottom: .5em;}
diff --git a/pelican/tests/output/basic/theme/css/pygment.css b/pelican/tests/output/basic/theme/css/pygment.css
index fdd056f6..a3877a83 100644
--- a/pelican/tests/output/basic/theme/css/pygment.css
+++ b/pelican/tests/output/basic/theme/css/pygment.css
@@ -1,205 +1,205 @@
 .hll {
-background-color:#eee;
+    background-color:#eee;
 }
 .c {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .err {
-border:1px solid #FF0000;
+    border:1px solid #FF0000;
 }
 .k {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .o {
-color:#666666;
+    color:#666666;
 }
 .cm {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .cp {
-color:#007020;
+    color:#007020;
 }
 .c1 {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .cs {
-background-color:#FFF0F0;
-color:#408090;
+    background-color:#FFF0F0;
+    color:#408090;
 }
 .gd {
-color:#A00000;
+    color:#A00000;
 }
 .ge {
-font-style:italic;
+    font-style:italic;
 }
 .gr {
-color:#FF0000;
+    color:#FF0000;
 }
 .gh {
-color:#000080;
-font-weight:bold;
+    color:#000080;
+    font-weight:bold;
 }
 .gi {
-color:#00A000;
+    color:#00A000;
 }
 .go {
-color:#303030;
+    color:#303030;
 }
 .gp {
-color:#C65D09;
-font-weight:bold;
+    color:#C65D09;
+    font-weight:bold;
 }
 .gs {
-font-weight:bold;
+    font-weight:bold;
 }
 .gu {
-color:#800080;
-font-weight:bold;
+    color:#800080;
+    font-weight:bold;
 }
 .gt {
-color:#0040D0;
+    color:#0040D0;
 }
 .kc {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kd {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kn {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kp {
-color:#007020;
+    color:#007020;
 }
 .kr {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kt {
-color:#902000;
+    color:#902000;
 }
 .m {
-color:#208050;
+    color:#208050;
 }
 .s {
-color:#4070A0;
+    color:#4070A0;
 }
 .na {
-color:#4070A0;
+    color:#4070A0;
 }
 .nb {
-color:#007020;
+    color:#007020;
 }
 .nc {
-color:#0E84B5;
-font-weight:bold;
+    color:#0E84B5;
+    font-weight:bold;
 }
 .no {
-color:#60ADD5;
+    color:#60ADD5;
 }
 .nd {
-color:#555555;
-font-weight:bold;
+    color:#555555;
+    font-weight:bold;
 }
 .ni {
-color:#D55537;
-font-weight:bold;
+    color:#D55537;
+    font-weight:bold;
 }
 .ne {
-color:#007020;
+    color:#007020;
 }
 .nf {
-color:#06287E;
+    color:#06287E;
 }
 .nl {
-color:#002070;
-font-weight:bold;
+    color:#002070;
+    font-weight:bold;
 }
 .nn {
-color:#0E84B5;
-font-weight:bold;
+    color:#0E84B5;
+    font-weight:bold;
 }
 .nt {
-color:#062873;
-font-weight:bold;
+    color:#062873;
+    font-weight:bold;
 }
 .nv {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .ow {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .w {
-color:#BBBBBB;
+    color:#BBBBBB;
 }
 .mf {
-color:#208050;
+    color:#208050;
 }
 .mh {
-color:#208050;
+    color:#208050;
 }
 .mi {
-color:#208050;
+    color:#208050;
 }
 .mo {
-color:#208050;
+    color:#208050;
 }
 .sb {
-color:#4070A0;
+    color:#4070A0;
 }
 .sc {
-color:#4070A0;
+    color:#4070A0;
 }
 .sd {
-color:#4070A0;
-font-style:italic;
+    color:#4070A0;
+    font-style:italic;
 }
 .s2 {
-color:#4070A0;
+    color:#4070A0;
 }
 .se {
-color:#4070A0;
-font-weight:bold;
+    color:#4070A0;
+    font-weight:bold;
 }
 .sh {
-color:#4070A0;
+    color:#4070A0;
 }
 .si {
-color:#70A0D0;
-font-style:italic;
+    color:#70A0D0;
+    font-style:italic;
 }
 .sx {
-color:#C65D09;
+    color:#C65D09;
 }
 .sr {
-color:#235388;
+    color:#235388;
 }
 .s1 {
-color:#4070A0;
+    color:#4070A0;
 }
 .ss {
-color:#517918;
+    color:#517918;
 }
 .bp {
-color:#007020;
+    color:#007020;
 }
 .vc {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .vg {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .vi {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .il {
-color:#208050;
+    color:#208050;
 }
diff --git a/pelican/tests/output/basic/theme/css/reset.css b/pelican/tests/output/basic/theme/css/reset.css
index f5123cf6..10b3fde2 100644
--- a/pelican/tests/output/basic/theme/css/reset.css
+++ b/pelican/tests/output/basic/theme/css/reset.css
@@ -15,13 +15,13 @@ b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td {
-	background: transparent;
-	border: 0;
-	font-size: 100%;
-	margin: 0;
-	outline: 0;
-	padding: 0;
-	vertical-align: baseline;
+    background: transparent;
+    border: 0;
+    font-size: 100%;
+    margin: 0;
+    outline: 0;
+    padding: 0;
+    vertical-align: baseline;
 }
 
 body {line-height: 1;}
@@ -32,13 +32,13 @@ blockquote, q {quotes: none;}
 
 blockquote:before, blockquote:after,
 q:before, q:after {
-	content: '';
-	content: none;
+    content: '';
+    content: none;
 }
 
 /* remember to define focus styles! */
 :focus {
-	outline: 0;
+    outline: 0;
 }
 
 /* remember to highlight inserts somehow! */
@@ -47,6 +47,6 @@ del {text-decoration: line-through;}
 
 /* tables still need 'cellspacing="0"' in the markup */
 table {
-	border-collapse: collapse;
-	border-spacing: 0;
+    border-collapse: collapse;
+    border-spacing: 0;
 }
diff --git a/pelican/tests/output/basic/theme/fonts/font.css b/pelican/tests/output/basic/theme/fonts/font.css
index a9eb87e6..cf623603 100644
--- a/pelican/tests/output/basic/theme/fonts/font.css
+++ b/pelican/tests/output/basic/theme/fonts/font.css
@@ -1,12 +1,12 @@
 @font-face {
-	font-family: 'Yanone Kaffeesatz';
-	font-style: normal;
-	font-weight: 400;
-	src:
-		local('Yanone Kaffeesatz Regular'),
-		local('YanoneKaffeesatz-Regular'),
+    font-family: 'Yanone Kaffeesatz';
+    font-style: normal;
+    font-weight: 400;
+    src:
+    local('Yanone Kaffeesatz Regular'),
+    local('YanoneKaffeesatz-Regular'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
-		url('Yanone_Kaffeesatz_400.woff') format('woff'),
+    url('Yanone_Kaffeesatz_400.woff') format('woff'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
-		url('Yanone_Kaffeesatz_400.woff2') format('woff2');
+    url('Yanone_Kaffeesatz_400.woff2') format('woff2');
 }
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 52e0bf65..ee5ae26b 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -1,85 +1,85 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>This is a super article !</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        <meta name="description" content="Multi-line metadata should be supported as well as inline markup." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>This is a super article !</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <meta name="description" content="Multi-line metadata should be supported as well as inline markup." />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li><a href="/category/misc.html">misc</a></li>
-                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/this-is-a-super-article.html" rel="bookmark"
-           title="Permalink to This is a super article !">This is a super article !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li><a href="/category/misc.html">misc</a></li>
+                                <li class="active"><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/this-is-a-super-article.html" rel="bookmark"
+                                                   title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+00:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+00:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-12-02T10:14:00+00:00">
+                                                        Published: Thu 02 December 2010
+                                                </abbr>
+                                                <br />
+                                                <abbr class="modified" title="2013-11-17T23:29:00+00:00">
+                                                        Updated: Sun 17 November 2013
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="/category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->      <p>Some content here !</p>
-<div class="section" id="this-is-a-simple-title">
-<h2>This is a simple title</h2>
-<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="/category/yeah.html">yeah</a>.</p>
+                                                <p>tags: <a href="/tag/foo.html">foo</a> <a href="/tag/bar.html">bar</a> <a href="/tag/foobar.html">foobar</a> </p>
+                                        </footer><!-- /.post-info -->      <p>Some content here !</p>
+                                        <div class="section" id="this-is-a-simple-title">
+                                                <h2>This is a simple title</h2>
+                                                <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+                                                <img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                <img alt="alternate text" src="/pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
 </pre>
-<p>→ And now try with some utf8 hell: ééé</p>
-</div>
+                                                <p>→ And now try with some utf8 hell: ééé</p>
+                                        </div>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 710c8ff7..2cd85dcb 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -1,99 +1,99 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Unbelievable !</title>
-        <link rel="stylesheet" href="/theme/css/main.css" />
-        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-        <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Unbelievable !</title>
+                <link rel="stylesheet" href="/theme/css/main.css" />
+                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+                <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." />
+        </head>
 
-<body id="index" class="home">
-        <header id="banner" class="body">
-                <h1><a href="/">A Pelican Blog</a></h1>
-                <nav><ul>
-                    <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="/override/">Override url/save_as</a></li>
-                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="/category/bar.html">bar</a></li>
-                    <li><a href="/category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                    <li><a href="/category/yeah.html">yeah</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="/unbelievable.html" rel="bookmark"
-           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <header id="banner" class="body">
+                        <h1><a href="/">A Pelican Blog</a></h1>
+                        <nav><ul>
+                                <li><a href="/tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="/override/">Override url/save_as</a></li>
+                                <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="/category/bar.html">bar</a></li>
+                                <li><a href="/category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="/category/misc.html">misc</a></li>
+                                <li><a href="/category/yeah.html">yeah</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="/unbelievable.html" rel="bookmark"
+                                                   title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00+00:00">
-                Published: Fri 15 October 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-10-15T20:30:00+00:00">
+                                                        Published: Fri 15 October 2010
+                                                </abbr>
 
-<p>In <a href="/category/misc.html">misc</a>.</p>
+                                                <p>In <a href="/category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
-<div class="section" id="testing-sourcecode-directive">
-<h2>Testing sourcecode directive</h2>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                        </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
+                                        <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+                                                <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+                                        <div class="section" id="testing-sourcecode-directive">
+                                                <h2>Testing sourcecode directive</h2>
+                                                <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-</div>
-<div class="section" id="testing-another-case">
-<h2>Testing another case</h2>
-<p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will have nothing in default.</p>
-<div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                        </div>
+                                        <div class="section" id="testing-another-case">
+                                                <h2>Testing another case</h2>
+                                                <p>This will now have a line number in 'custom' since it's the default in
+                                                        pelican.conf, it will have nothing in default.</p>
+                                                <div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
-<p>Lovely.</p>
-</div>
-<div class="section" id="testing-more-sourcecode-directives">
-<h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
-<p>Lovely.</p>
-</div>
-<div class="section" id="testing-even-more-sourcecode-directives">
-<h2>Testing even more sourcecode directives</h2>
-<span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-<p>Lovely.</p>
-</div>
-<div class="section" id="testing-overriding-config-defaults">
-<h2>Testing overriding config defaults</h2>
-<p>Even if the default is line numbers, we can override it here</p>
-<div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                <p>Lovely.</p>
+                                        </div>
+                                        <div class="section" id="testing-more-sourcecode-directives">
+                                                <h2>Testing more sourcecode directives</h2>
+                                                <div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+                                                <p>Lovely.</p>
+                                        </div>
+                                        <div class="section" id="testing-even-more-sourcecode-directives">
+                                                <h2>Testing even more sourcecode directives</h2>
+                                                <span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                <p>Lovely.</p>
+                                        </div>
+                                        <div class="section" id="testing-overriding-config-defaults">
+                                                <h2>Testing overriding config defaults</h2>
+                                                <p>Even if the default is line numbers, we can override it here</p>
+                                                <div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
-<p>Lovely.</p>
-</div>
+                                                <p>Lovely.</p>
+                                        </div>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
 
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-</body>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 3cf1deb7..1cee58f6 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -1,114 +1,114 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A markdown powered article</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A markdown powered article</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./a-markdown-powered-article.html" rel="bookmark"
-           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./a-markdown-powered-article.html" rel="bookmark"
+                                                   title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: Wed 20 April 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-04-20T00:00:00+02:00">
+                                                        Published: Wed 20 April 2011
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
-<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
-<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'a-markdown-powered-article.html';
-        var disqus_url = './a-markdown-powered-article.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                        </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
+                                        <p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
+                                                <a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'a-markdown-powered-article.html';
+                                                var disqus_url = './a-markdown-powered-article.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 6cf7b82d..5ca032d3 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -1,98 +1,98 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-<h1>Archives for Alexis' log</h1>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1>Archives for Alexis' log</h1>
 
-<dl>
-    <dt>Fri 30 November 2012</dt>
-    <dd><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></dd>
-    <dt>Wed 29 February 2012</dt>
-    <dd><a href="./second-article.html">Second article</a></dd>
-    <dt>Wed 20 April 2011</dt>
-    <dd><a href="./a-markdown-powered-article.html">A markdown powered article</a></dd>
-    <dt>Thu 17 February 2011</dt>
-    <dd><a href="./article-1.html">Article 1</a></dd>
-    <dt>Thu 17 February 2011</dt>
-    <dd><a href="./article-2.html">Article 2</a></dd>
-    <dt>Thu 17 February 2011</dt>
-    <dd><a href="./article-3.html">Article 3</a></dd>
-    <dt>Thu 02 December 2010</dt>
-    <dd><a href="./this-is-a-super-article.html">This is a super article !</a></dd>
-    <dt>Wed 20 October 2010</dt>
-    <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
-    <dt>Fri 15 October 2010</dt>
-    <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
-    <dt>Sun 14 March 2010</dt>
-    <dd><a href="./tag/baz.html">The baz tag</a></dd>
-</dl>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        <dl>
+                                <dt>Fri 30 November 2012</dt>
+                                <dd><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></dd>
+                                <dt>Wed 29 February 2012</dt>
+                                <dd><a href="./second-article.html">Second article</a></dd>
+                                <dt>Wed 20 April 2011</dt>
+                                <dd><a href="./a-markdown-powered-article.html">A markdown powered article</a></dd>
+                                <dt>Thu 17 February 2011</dt>
+                                <dd><a href="./article-1.html">Article 1</a></dd>
+                                <dt>Thu 17 February 2011</dt>
+                                <dd><a href="./article-2.html">Article 2</a></dd>
+                                <dt>Thu 17 February 2011</dt>
+                                <dd><a href="./article-3.html">Article 3</a></dd>
+                                <dt>Thu 02 December 2010</dt>
+                                <dd><a href="./this-is-a-super-article.html">This is a super article !</a></dd>
+                                <dt>Wed 20 October 2010</dt>
+                                <dd><a href="./oh-yeah.html">Oh yeah !</a></dd>
+                                <dt>Fri 15 October 2010</dt>
+                                <dd><a href="./unbelievable.html">Unbelievable !</a></dd>
+                                <dt>Sun 14 March 2010</dt>
+                                <dd><a href="./tag/baz.html">The baz tag</a></dd>
+                        </dl>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index e28fb39b..b8bc8e1d 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -1,113 +1,113 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Article 1</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Article 1" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Article 1</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Article 1" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./article-1.html" rel="bookmark"
-           title="Permalink to Article 1">Article 1</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./article-1.html" rel="bookmark"
+                                                   title="Permalink to Article 1">Article 1</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                        Published: Thu 17 February 2011
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Article 1</p>
+                                        </footer><!-- /.post-info -->      <p>Article 1</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'article-1.html';
-        var disqus_url = './article-1.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'article-1.html';
+                                                var disqus_url = './article-1.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 8c33fe86..93403466 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -1,113 +1,113 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Article 2</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Article 2" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Article 2</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Article 2" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./article-2.html" rel="bookmark"
-           title="Permalink to Article 2">Article 2</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./article-2.html" rel="bookmark"
+                                                   title="Permalink to Article 2">Article 2</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                        Published: Thu 17 February 2011
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Article 2</p>
+                                        </footer><!-- /.post-info -->      <p>Article 2</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'article-2.html';
-        var disqus_url = './article-2.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'article-2.html';
+                                                var disqus_url = './article-2.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 15862270..cdf52bd7 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -1,113 +1,113 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Article 3</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Article 3" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Article 3</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Article 3" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./article-3.html" rel="bookmark"
-           title="Permalink to Article 3">Article 3</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./article-3.html" rel="bookmark"
+                                                   title="Permalink to Article 3">Article 3</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                        Published: Thu 17 February 2011
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Article 3</p>
+                                        </footer><!-- /.post-info -->      <p>Article 3</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'article-3.html';
-        var disqus_url = './article-3.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'article-3.html';
+                                                var disqus_url = './article-3.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index 22a23340..75bcb182 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -1,174 +1,174 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Alexis Métaireau</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Alexis Métaireau</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: Fri 30 November 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-11-30T00:00:00+01:00">
+                                                Published: Fri 30 November 2012
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>Some cool stuff!</p>
+                                <p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../second-article.html" rel="bookmark"
+                                                       title="Permalink to Second article">Second article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                                Published: Wed 29 February 2012
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+                                                        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+                                                </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="../second-article.html">read more</a>
-<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../second-article.html">read more</a>
+                                                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../a-markdown-powered-article.html" rel="bookmark"
-                           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../a-markdown-powered-article.html" rel="bookmark"
+                                                       title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: Wed 20 April 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-04-20T00:00:00+02:00">
+                                                                Published: Wed 20 April 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
-<a href="../unbelievable.html">a file-relative link to unbelievable</a></p>
-                <a class="readmore" href="../a-markdown-powered-article.html">read more</a>
-<p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
+                                                <p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
+                                                        <a href="../unbelievable.html">a file-relative link to unbelievable</a></p>
+                                                <a class="readmore" href="../a-markdown-powered-article.html">read more</a>
+                                                <p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../article-1.html" rel="bookmark"
-                           title="Permalink to Article 1">Article 1</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../article-1.html" rel="bookmark"
+                                                       title="Permalink to Article 1">Article 1</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 1</p>
+                                                </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="../article-1.html">read more</a>
-<p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-    <li>Page 1 / 3</li>
-        <li><a href="../author/alexis-metaireau2.html">&rang;</a></li>
-        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="../article-1.html">read more</a>
+                                                <p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li>Page 1 / 3</li>
+                                        <li><a href="../author/alexis-metaireau2.html">&rang;</a></li>
+                                        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index e5f7e953..1bf6f7c9 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -1,189 +1,189 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Alexis Métaireau</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Alexis Métaireau</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
                 <section id="content" class="body">
-                    <ol id="posts-list" class="hfeed" start="3">
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../article-2.html" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
+                        <ol id="posts-list" class="hfeed" start="3">
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../article-2.html" rel="bookmark"
+                                                       title="Permalink to Article 2">Article 2</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 2</p>
+                                                </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="../article-2.html">read more</a>
-<p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../article-2.html">read more</a>
+                                                <p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../article-3.html" rel="bookmark"
-                           title="Permalink to Article 3">Article 3</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../article-3.html" rel="bookmark"
+                                                       title="Permalink to Article 3">Article 3</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 3</p>
+                                                </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="../article-3.html">read more</a>
-<p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../article-3.html">read more</a>
+                                                <p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../this-is-a-super-article.html" rel="bookmark"
+                                                       title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                                Published: Thu 02 December 2010
+                                                        </abbr>
+                                                        <br />
+                                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                                Updated: Sun 17 November 2013
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/yeah.html">yeah</a>.</p>
+                                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+                                                </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+                                                        as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
-<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
+                                                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../oh-yeah.html" rel="bookmark"
-                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../oh-yeah.html" rel="bookmark"
+                                                       title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                                Published: Wed 20 October 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/bar.html">bar</a>.</p>
-<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/bar.html">bar</a>.</p>
+                                                        <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+                                                        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                                </footer><!-- /.post-info -->                <div class="section" id="why-not">
+                                                        <h2>Why not ?</h2>
+                                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                                YEAH !</p>
+                                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                </div>
 
-                <a class="readmore" href="../oh-yeah.html">read more</a>
-<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
-        <li><a href="../author/alexis-metaireau.html">&lang;</a></li>
-    <li>Page 2 / 3</li>
-        <li><a href="../author/alexis-metaireau3.html">&rang;</a></li>
-        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="../oh-yeah.html">read more</a>
+                                                <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
+                                        <li><a href="../author/alexis-metaireau.html">&lang;</a></li>
+                                        <li>Page 2 / 3</li>
+                                        <li><a href="../author/alexis-metaireau3.html">&rang;</a></li>
+                                        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index c5162737..082c3bc7 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -1,139 +1,139 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Alexis Métaireau</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Alexis Métaireau</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
                 <section id="content" class="body">
-                    <ol id="posts-list" class="hfeed" start="3">
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../unbelievable.html" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
+                        <ol id="posts-list" class="hfeed" start="3">
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../unbelievable.html" rel="bookmark"
+                                                       title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: Fri 15 October 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-15T20:30:00+02:00">
+                                                                Published: Fri 15 October 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
-<div class="section" id="testing-sourcecode-directive">
-<h2>Testing sourcecode directive</h2>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+                                                <p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+                                                        <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+                                                <div class="section" id="testing-sourcecode-directive">
+                                                        <h2>Testing sourcecode directive</h2>
+                                                        <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-</div>
-<div class="section" id="testing-another-case">
-<h2>Testing another case</h2>
-<p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …</p></div>
-                <a class="readmore" href="../unbelievable.html">read more</a>
-<p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                </div>
+                                                <div class="section" id="testing-another-case">
+                                                        <h2>Testing another case</h2>
+                                                        <p>This will now have a line number in 'custom' since it's the default in
+                                                                pelican.conf, it will …</p></div>
+                                                <a class="readmore" href="../unbelievable.html">read more</a>
+                                                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../tag/baz.html" rel="bookmark"
-                           title="Permalink to The baz tag">The baz tag</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../tag/baz.html" rel="bookmark"
+                                                       title="Permalink to The baz tag">The baz tag</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: Sun 14 March 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-03-14T00:00:00+01:00">
+                                                                Published: Sun 14 March 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+                                                </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
-                <a class="readmore" href="../tag/baz.html">read more</a>
-<p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
-        <li><a href="../author/alexis-metaireau2.html">&lang;</a></li>
-    <li>Page 3 / 3</li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="../tag/baz.html">read more</a>
+                                                <p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
+                                        <li><a href="../author/alexis-metaireau2.html">&lang;</a></li>
+                                        <li>Page 3 / 3</li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index 06919fb7..9b3b76cf 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -1,80 +1,80 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Authors</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Authors</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-<section id="content" class="body">
-    <h1>Authors on Alexis' log</h1>
-    <ul>
-        <li><a href="./author/alexis-metaireau.html">Alexis Métaireau</a> (10)</li>
-    </ul>
-</section>
-
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
+                <section id="content" class="body">
+                        <h1>Authors on Alexis' log</h1>
                         <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                <li><a href="./author/alexis-metaireau.html">Alexis Métaireau</a> (10)</li>
                         </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
+
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 34236cdb..eab567e0 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -1,83 +1,83 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Categories</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Categories</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-<section id="content" class="body">
-    <h1>Categories for Alexis' log</h1>
-    <ul>
-        <li><a href="./category/bar.html">bar</a> (1)</li>
-        <li><a href="./category/cat1.html">cat1</a> (4)</li>
-        <li><a href="./category/misc.html">misc</a> (4)</li>
-        <li><a href="./category/yeah.html">yeah</a> (1)</li>
-    </ul>
-</section>
-
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
+                <section id="content" class="body">
+                        <h1>Categories for Alexis' log</h1>
                         <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                <li><a href="./category/bar.html">bar</a> (1)</li>
+                                <li><a href="./category/cat1.html">cat1</a> (4)</li>
+                                <li><a href="./category/misc.html">misc</a> (4)</li>
+                                <li><a href="./category/yeah.html">yeah</a> (1)</li>
                         </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
+
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index ad1ef940..02a4602f 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -1,96 +1,96 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - bar</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - bar</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                Published: Wed 20 October 2010
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/bar.html">bar</a>.</p>
-<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/bar.html">bar</a>.</p>
+                                        <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+                                        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
-<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                                </footer><!-- /.post-info --><div class="section" id="why-not">
+                                        <h2>Why not ?</h2>
+                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                YEAH !</p>
+                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                </div>
+                                <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 79428cd7..c7abc1a9 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -1,165 +1,165 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - cat1</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - cat1</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li class="active"><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li class="active"><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: Wed 20 April 2011
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2011-04-20T00:00:00+02:00">
+                                                Published: Wed 20 April 2011
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
-<a href="../unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
+                                <p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
+                                        <a href="../unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../article-1.html" rel="bookmark"
-                           title="Permalink to Article 1">Article 1</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../article-1.html" rel="bookmark"
+                                                       title="Permalink to Article 1">Article 1</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 1</p>
+                                                </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="../article-1.html">read more</a>
-<p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../article-1.html">read more</a>
+                                                <p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../article-2.html" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../article-2.html" rel="bookmark"
+                                                       title="Permalink to Article 2">Article 2</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 2</p>
+                                                </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="../article-2.html">read more</a>
-<p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../article-2.html">read more</a>
+                                                <p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../article-3.html" rel="bookmark"
-                           title="Permalink to Article 3">Article 3</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../article-3.html" rel="bookmark"
+                                                       title="Permalink to Article 3">Article 3</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 3</p>
+                                                </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="../article-3.html">read more</a>
-<p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="../article-3.html">read more</a>
+                                                <p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 16c31252..303e35ad 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -1,176 +1,176 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - misc</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - misc</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: Fri 30 November 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-11-30T00:00:00+01:00">
+                                                Published: Fri 30 November 2012
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>Some cool stuff!</p>
+                                <p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../second-article.html" rel="bookmark"
+                                                       title="Permalink to Second article">Second article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                                Published: Wed 29 February 2012
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+                                                        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+                                                </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="../second-article.html">read more</a>
-<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../second-article.html">read more</a>
+                                                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../unbelievable.html" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../unbelievable.html" rel="bookmark"
+                                                       title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: Fri 15 October 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-15T20:30:00+02:00">
+                                                                Published: Fri 15 October 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
-<div class="section" id="testing-sourcecode-directive">
-<h2>Testing sourcecode directive</h2>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+                                                <p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+                                                        <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+                                                <div class="section" id="testing-sourcecode-directive">
+                                                        <h2>Testing sourcecode directive</h2>
+                                                        <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-</div>
-<div class="section" id="testing-another-case">
-<h2>Testing another case</h2>
-<p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …</p></div>
-                <a class="readmore" href="../unbelievable.html">read more</a>
-<p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                </div>
+                                                <div class="section" id="testing-another-case">
+                                                        <h2>Testing another case</h2>
+                                                        <p>This will now have a line number in 'custom' since it's the default in
+                                                                pelican.conf, it will …</p></div>
+                                                <a class="readmore" href="../unbelievable.html">read more</a>
+                                                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../tag/baz.html" rel="bookmark"
-                           title="Permalink to The baz tag">The baz tag</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../tag/baz.html" rel="bookmark"
+                                                       title="Permalink to The baz tag">The baz tag</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: Sun 14 March 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-03-14T00:00:00+01:00">
+                                                                Published: Sun 14 March 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+                                                </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
-                <a class="readmore" href="../tag/baz.html">read more</a>
-<p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="../tag/baz.html">read more</a>
+                                                <p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index e919ddd5..f69b5705 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -1,104 +1,104 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - yeah</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - yeah</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li class="active"><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li class="active"><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                Published: Thu 02 December 2010
+                                        </abbr>
+                                        <br />
+                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                Updated: Sun 17 November 2013
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info --><p>Some content here !</p>
-<div class="section" id="this-is-a-simple-title">
-<h2>This is a simple title</h2>
-<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/yeah.html">yeah</a>.</p>
+                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+                                </footer><!-- /.post-info --><p>Some content here !</p>
+                                <div class="section" id="this-is-a-simple-title">
+                                        <h2>This is a simple title</h2>
+                                        <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                        <img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
 </pre>
-<p>→ And now try with some utf8 hell: ééé</p>
-</div>
-<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                                        <p>→ And now try with some utf8 hell: ééé</p>
+                                </div>
+                                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
index 81137fc7..786e0ae6 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
@@ -1,99 +1,99 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A draft article without date</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A draft article without date</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../drafts/a-draft-article-without-date.html" rel="bookmark"
-           title="Permalink to A draft article without date">A draft article without date</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../drafts/a-draft-article-without-date.html" rel="bookmark"
+                                                   title="Permalink to A draft article without date">A draft article without date</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01+01:00">
-                Published: Fri 02 March 2012
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2012-03-02T14:01:01+01:00">
+                                                        Published: Fri 02 March 2012
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
-listed anywhere else.</p>
+                                        </footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
+                                                listed anywhere else.</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 260ccaf1..508e2d43 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -1,99 +1,99 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A draft article</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A draft article</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../drafts/a-draft-article.html" rel="bookmark"
-           title="Permalink to A draft article">A draft article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../drafts/a-draft-article.html" rel="bookmark"
+                                                   title="Permalink to A draft article">A draft article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-05-08T15:58:00+02:00">
-                Published: Sun 08 May 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-05-08T15:58:00+02:00">
+                                                        Published: Sun 08 May 2011
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
-listed anywhere else.</p>
+                                        </footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
+                                                listed anywhere else.</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 8bc1babb..9eff8f14 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -1,113 +1,113 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>FILENAME_METADATA example</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Some cool stuff!" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>FILENAME_METADATA example</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Some cool stuff!" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./filename_metadata-example.html" rel="bookmark"
-           title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./filename_metadata-example.html" rel="bookmark"
+                                                   title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: Fri 30 November 2012
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2012-11-30T00:00:00+01:00">
+                                                        Published: Fri 30 November 2012
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Some cool stuff!</p>
+                                        </footer><!-- /.post-info -->      <p>Some cool stuff!</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'filename_metadata-example.html';
-        var disqus_url = './filename_metadata-example.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'filename_metadata-example.html';
+                                                var disqus_url = './filename_metadata-example.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index d97eb4c4..b5cf7189 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -1,174 +1,174 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: Fri 30 November 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-11-30T00:00:00+01:00">
+                                                Published: Fri 30 November 2012
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="./category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="./filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>Some cool stuff!</p>
+                                <p>There are <a href="./filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./second-article.html" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./second-article.html" rel="bookmark"
+                                                       title="Permalink to Second article">Second article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                                Published: Wed 29 February 2012
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
-<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./second-article-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/misc.html">misc</a>.</p>
+                                                        <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
+                                                        <a href="./second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+                                                </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="./second-article.html">read more</a>
-<p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="./second-article.html">read more</a>
+                                                <p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./a-markdown-powered-article.html" rel="bookmark"
-                           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./a-markdown-powered-article.html" rel="bookmark"
+                                                       title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: Wed 20 April 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-04-20T00:00:00+02:00">
+                                                                Published: Wed 20 April 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
-<a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
-                <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
-<p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
+                                                <p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
+                                                        <a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
+                                                <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
+                                                <p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./article-1.html" rel="bookmark"
-                           title="Permalink to Article 1">Article 1</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./article-1.html" rel="bookmark"
+                                                       title="Permalink to Article 1">Article 1</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 1</p>
+                                                </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="./article-1.html">read more</a>
-<p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-    <li>Page 1 / 3</li>
-        <li><a href="./index2.html">&rang;</a></li>
-        <li><a href="./index3.html">&Rang;</a></li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="./article-1.html">read more</a>
+                                                <p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li>Page 1 / 3</li>
+                                        <li><a href="./index2.html">&rang;</a></li>
+                                        <li><a href="./index3.html">&Rang;</a></li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 11943a88..3964bcb9 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -1,189 +1,189 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
                 <section id="content" class="body">
-                    <ol id="posts-list" class="hfeed" start="3">
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./article-2.html" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
+                        <ol id="posts-list" class="hfeed" start="3">
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./article-2.html" rel="bookmark"
+                                                       title="Permalink to Article 2">Article 2</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 2</p>
+                                                </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="./article-2.html">read more</a>
-<p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="./article-2.html">read more</a>
+                                                <p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./article-3.html" rel="bookmark"
-                           title="Permalink to Article 3">Article 3</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./article-3.html" rel="bookmark"
+                                                       title="Permalink to Article 3">Article 3</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: Thu 17 February 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: Thu 17 February 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 3</p>
+                                                </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="./article-3.html">read more</a>
-<p>There are <a href="./article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="./article-3.html">read more</a>
+                                                <p>There are <a href="./article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./this-is-a-super-article.html" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./this-is-a-super-article.html" rel="bookmark"
+                                                       title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                                Published: Thu 02 December 2010
+                                                        </abbr>
+                                                        <br />
+                                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                                Updated: Sun 17 November 2013
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/yeah.html">yeah</a>.</p>
+                                                        <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/foobar.html">foobar</a> </p>
+                                                </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+                                                        as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="./this-is-a-super-article.html">read more</a>
-<p>There are <a href="./this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="./this-is-a-super-article.html">read more</a>
+                                                <p>There are <a href="./this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./oh-yeah.html" rel="bookmark"
-                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./oh-yeah.html" rel="bookmark"
+                                                       title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                                Published: Wed 20 October 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/bar.html">bar</a>.</p>
-<p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
-        <a href="./oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/bar.html">bar</a>.</p>
+                                                        <p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
+                                                        <a href="./oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                                </footer><!-- /.post-info -->                <div class="section" id="why-not">
+                                                        <h2>Why not ?</h2>
+                                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                                YEAH !</p>
+                                                        <img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                </div>
 
-                <a class="readmore" href="./oh-yeah.html">read more</a>
-<p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-        <li><a href="./index.html">&Lang;</a></li>
-        <li><a href="./index.html">&lang;</a></li>
-    <li>Page 2 / 3</li>
-        <li><a href="./index3.html">&rang;</a></li>
-        <li><a href="./index3.html">&Rang;</a></li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="./oh-yeah.html">read more</a>
+                                                <p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li><a href="./index.html">&Lang;</a></li>
+                                        <li><a href="./index.html">&lang;</a></li>
+                                        <li>Page 2 / 3</li>
+                                        <li><a href="./index3.html">&rang;</a></li>
+                                        <li><a href="./index3.html">&Rang;</a></li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 72ac69c6..4abea6bb 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -1,139 +1,139 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
                 <section id="content" class="body">
-                    <ol id="posts-list" class="hfeed" start="3">
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./unbelievable.html" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
+                        <ol id="posts-list" class="hfeed" start="3">
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./unbelievable.html" rel="bookmark"
+                                                       title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: Fri 15 October 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-15T20:30:00+02:00">
+                                                                Published: Fri 15 October 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
-<div class="section" id="testing-sourcecode-directive">
-<h2>Testing sourcecode directive</h2>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+                                                <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+                                                        <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+                                                <div class="section" id="testing-sourcecode-directive">
+                                                        <h2>Testing sourcecode directive</h2>
+                                                        <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-</div>
-<div class="section" id="testing-another-case">
-<h2>Testing another case</h2>
-<p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …</p></div>
-                <a class="readmore" href="./unbelievable.html">read more</a>
-<p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                </div>
+                                                <div class="section" id="testing-another-case">
+                                                        <h2>Testing another case</h2>
+                                                        <p>This will now have a line number in 'custom' since it's the default in
+                                                                pelican.conf, it will …</p></div>
+                                                <a class="readmore" href="./unbelievable.html">read more</a>
+                                                <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./tag/baz.html" rel="bookmark"
-                           title="Permalink to The baz tag">The baz tag</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./tag/baz.html" rel="bookmark"
+                                                       title="Permalink to The baz tag">The baz tag</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: Sun 14 March 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-03-14T00:00:00+01:00">
+                                                                Published: Sun 14 March 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+                                                </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
-                <a class="readmore" href="./tag/baz.html">read more</a>
-<p>There are <a href="./tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-        <li><a href="./index.html">&Lang;</a></li>
-        <li><a href="./index2.html">&lang;</a></li>
-    <li>Page 3 / 3</li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="./tag/baz.html">read more</a>
+                                                <p>There are <a href="./tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li><a href="./index.html">&Lang;</a></li>
+                                        <li><a href="./index2.html">&lang;</a></li>
+                                        <li>Page 3 / 3</li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 71a9e63a..91506822 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -1,75 +1,75 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-Some text
+                Some text
 
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 555af6c0..caf2fdc8 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -1,117 +1,117 @@
 <!DOCTYPE html>
 <html lang="fr">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Trop bien !</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-      <link rel="alternate" hreflang="en" href="./oh-yeah.html">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Trop bien !</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <link rel="alternate" hreflang="en" href="./oh-yeah.html">
 
-        <meta name="description" content="Et voila du contenu en français" />
-</head>
+                <meta name="description" content="Et voila du contenu en français" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./oh-yeah-fr.html" rel="bookmark"
-           title="Permalink to Trop bien !">Trop bien !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./oh-yeah-fr.html" rel="bookmark"
+                                                   title="Permalink to Trop bien !">Trop bien !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                        Published: Wed 20 October 2010
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
-Translations:
-        <a href="./oh-yeah.html" hreflang="en">en</a>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/misc.html">misc</a>.</p>
+                                                Translations:
+                                                <a href="./oh-yeah.html" hreflang="en">en</a>
 
-</footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
+                                        </footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'oh-yeah-fr.html';
-        var disqus_url = './oh-yeah-fr.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'oh-yeah-fr.html';
+                                                var disqus_url = './oh-yeah-fr.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 661d0153..9e15a338 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -1,122 +1,122 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Oh yeah !</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-      <link rel="alternate" hreflang="fr" href="./oh-yeah-fr.html">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Oh yeah !</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <link rel="alternate" hreflang="fr" href="./oh-yeah-fr.html">
 
-        <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" />
-</head>
+                <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./oh-yeah.html" rel="bookmark"
-           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./oh-yeah.html" rel="bookmark"
+                                                   title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                        Published: Wed 20 October 2010
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/bar.html">bar</a>.</p>
-<p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
-        <a href="./oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/bar.html">bar</a>.</p>
+                                                <p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
+                                                <a href="./oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->      <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                        </footer><!-- /.post-info -->      <div class="section" id="why-not">
+                                                <h2>Why not ?</h2>
+                                                <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                        YEAH !</p>
+                                                <img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                        </div>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'oh-yeah.html';
-        var disqus_url = './oh-yeah.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'oh-yeah.html';
+                                                var disqus_url = './oh-yeah.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 09493938..b7a58516 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -1,79 +1,79 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Override url/save_as</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Override url/save_as</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li class="active"><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">Override url/save_as</h1>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li class="active"><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">Override url/save_as</h1>
 
-    <p>Test page which overrides save_as and url so that this page will be generated
-at a custom location.</p>
+                        <p>Test page which overrides save_as and url so that this page will be generated
+                                at a custom location.</p>
 
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index 6eb578c9..cd127354 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -1,79 +1,79 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>This is a test hidden page</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>This is a test hidden page</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">This is a test hidden page</h1>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">This is a test hidden page</h1>
 
-    <p>This is great for things like error(404) pages
-Anyone can see this page but it's not linked to anywhere!</p>
+                        <p>This is great for things like error(404) pages
+                                Anyone can see this page but it's not linked to anywhere!</p>
 
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index db977694..67666441 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -1,80 +1,80 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>This is a test page</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>This is a test page</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li class="active"><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">This is a test page</h1>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li class="active"><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">This is a test page</h1>
 
-    <p>Just an image.</p>
-<img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
-<img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+                        <p>Just an image.</p>
+                        <img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+                        <img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 27638737..9a2ce96c 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -1,117 +1,117 @@
 <!DOCTYPE html>
 <html lang="fr">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Deuxième article</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-      <link rel="alternate" hreflang="en" href="./second-article.html">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Deuxième article</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <link rel="alternate" hreflang="en" href="./second-article.html">
 
-        <meta name="description" content="Ceci est un article, en français." />
-</head>
+                <meta name="description" content="Ceci est un article, en français." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./second-article-fr.html" rel="bookmark"
-           title="Permalink to Deuxième article">Deuxième article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./second-article-fr.html" rel="bookmark"
+                                                   title="Permalink to Deuxième article">Deuxième article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                        Published: Wed 29 February 2012
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
-<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./second-article.html" hreflang="en">en</a>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/misc.html">misc</a>.</p>
+                                                <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
+                                                <a href="./second-article.html" hreflang="en">en</a>
 
-</footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
+                                        </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'second-article-fr.html';
-        var disqus_url = './second-article-fr.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'second-article-fr.html';
+                                                var disqus_url = './second-article-fr.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 2ed7c822..4ddfe299 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -1,117 +1,117 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Second article</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-      <link rel="alternate" hreflang="fr" href="./second-article-fr.html">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Second article</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <link rel="alternate" hreflang="fr" href="./second-article-fr.html">
 
-        <meta name="description" content="This is some article, in english" />
-</head>
+                <meta name="description" content="This is some article, in english" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./second-article.html" rel="bookmark"
-           title="Permalink to Second article">Second article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./second-article.html" rel="bookmark"
+                                                   title="Permalink to Second article">Second article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                        Published: Wed 29 February 2012
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
-<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./second-article-fr.html" hreflang="fr">fr</a>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/misc.html">misc</a>.</p>
+                                                <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
+                                                <a href="./second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->      <p>This is some article, in english</p>
+                                        </footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'second-article.html';
-        var disqus_url = './second-article.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'second-article.html';
+                                                var disqus_url = './second-article.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index bc949e11..8c56761d 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -1,155 +1,155 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - bar</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - bar</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                Published: Wed 29 February 2012
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html" hreflang="fr">fr</a>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/misc.html">misc</a>.</p>
+                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+                                        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>This is some article, in english</p>
+                                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../this-is-a-super-article.html" rel="bookmark"
+                                                       title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                                Published: Thu 02 December 2010
+                                                        </abbr>
+                                                        <br />
+                                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                                Updated: Sun 17 November 2013
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/yeah.html">yeah</a>.</p>
+                                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+                                                </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+                                                        as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
-<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
+                                                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../oh-yeah.html" rel="bookmark"
-                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../oh-yeah.html" rel="bookmark"
+                                                       title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                                Published: Wed 20 October 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/bar.html">bar</a>.</p>
-<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/bar.html">bar</a>.</p>
+                                                        <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+                                                        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                                </footer><!-- /.post-info -->                <div class="section" id="why-not">
+                                                        <h2>Why not ?</h2>
+                                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                                YEAH !</p>
+                                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                </div>
 
-                <a class="readmore" href="../oh-yeah.html">read more</a>
-<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="../oh-yeah.html">read more</a>
+                                                <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index bb61b787..4c7dbf4f 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -1,113 +1,113 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>The baz tag</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="This article overrides the listening of the articles under the baz tag." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>The baz tag</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="This article overrides the listening of the articles under the baz tag." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../tag/baz.html" rel="bookmark"
-           title="Permalink to The baz tag">The baz tag</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../tag/baz.html" rel="bookmark"
+                                                   title="Permalink to The baz tag">The baz tag</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: Sun 14 March 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-03-14T00:00:00+01:00">
+                                                        Published: Sun 14 March 2010
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+                                        </footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'tag/baz.html';
-        var disqus_url = '../tag/baz.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'tag/baz.html';
+                                                var disqus_url = '../tag/baz.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 4edfe432..8fbf6d4d 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -1,125 +1,125 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - foo</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - foo</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: Wed 29 February 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                Published: Wed 29 February 2012
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html" hreflang="fr">fr</a>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/misc.html">misc</a>.</p>
+                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+                                        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>This is some article, in english</p>
+                                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../this-is-a-super-article.html" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../this-is-a-super-article.html" rel="bookmark"
+                                                       title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                                Published: Thu 02 December 2010
+                                                        </abbr>
+                                                        <br />
+                                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                                Updated: Sun 17 November 2013
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/yeah.html">yeah</a>.</p>
+                                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+                                                </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+                                                        as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
-<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="../this-is-a-super-article.html">read more</a>
+                                                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index cebd52f4..be73227f 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -1,104 +1,104 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - foobar</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - foobar</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                Published: Thu 02 December 2010
+                                        </abbr>
+                                        <br />
+                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                Updated: Sun 17 November 2013
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info --><p>Some content here !</p>
-<div class="section" id="this-is-a-simple-title">
-<h2>This is a simple title</h2>
-<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/yeah.html">yeah</a>.</p>
+                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+                                </footer><!-- /.post-info --><p>Some content here !</p>
+                                <div class="section" id="this-is-a-simple-title">
+                                        <h2>This is a simple title</h2>
+                                        <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                        <img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
 </pre>
-<p>→ And now try with some utf8 hell: ééé</p>
-</div>
-<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                                        <p>→ And now try with some utf8 hell: ééé</p>
+                                </div>
+                                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 4723075f..d9fbdb20 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -1,78 +1,78 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Oh Oh Oh</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Oh Oh Oh</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li class="active"><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">Oh Oh Oh</h1>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li class="active"><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">Oh Oh Oh</h1>
 
-    <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
+                        <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index c3e3bb4a..5dfa0d67 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -1,96 +1,96 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - yeah</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - yeah</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: Wed 20 October 2010
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                Published: Wed 20 October 2010
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/bar.html">bar</a>.</p>
-<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/bar.html">bar</a>.</p>
+                                        <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+                                        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
-<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                                </footer><!-- /.post-info --><div class="section" id="why-not">
+                                        <h2>Why not ?</h2>
+                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                YEAH !</p>
+                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                </div>
+                                <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 17feabf9..231901b8 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -1,85 +1,85 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Tags</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Tags</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-<section id="content" class="body">
-    <h1>Tags for Alexis' log</h1>
-    <ul>
-        <li><a href="./tag/bar.html">bar</a> (3)</li>
-        <li><a href="./tag/baz.html">baz</a> (1)</li>
-        <li><a href="./tag/foo.html">foo</a> (2)</li>
-        <li><a href="./tag/foobar.html">foobar</a> (1)</li>
-        <li><a href="./tag/oh.html">oh</a> (1)</li>
-        <li><a href="./tag/yeah.html">yeah</a> (1)</li>
-    </ul>
-</section>
-
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
+                <section id="content" class="body">
+                        <h1>Tags for Alexis' log</h1>
                         <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                <li><a href="./tag/bar.html">bar</a> (3)</li>
+                                <li><a href="./tag/baz.html">baz</a> (1)</li>
+                                <li><a href="./tag/foo.html">foo</a> (2)</li>
+                                <li><a href="./tag/foobar.html">foobar</a> (1)</li>
+                                <li><a href="./tag/oh.html">oh</a> (1)</li>
+                                <li><a href="./tag/yeah.html">yeah</a> (1)</li>
                         </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
+
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/theme/css/fonts.css b/pelican/tests/output/custom/theme/css/fonts.css
index 56015076..7c69215e 100644
--- a/pelican/tests/output/custom/theme/css/fonts.css
+++ b/pelican/tests/output/custom/theme/css/fonts.css
@@ -1,12 +1,12 @@
 @font-face {
-	font-family: 'Yanone Kaffeesatz';
-	font-style: normal;
-	font-weight: 400;
-	src:
-		local('Yanone Kaffeesatz Regular'),
-		local('YanoneKaffeesatz-Regular'),
+    font-family: 'Yanone Kaffeesatz';
+    font-style: normal;
+    font-weight: 400;
+    src:
+    local('Yanone Kaffeesatz Regular'),
+    local('YanoneKaffeesatz-Regular'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
-		url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
+    url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
-		url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
+    url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
 }
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 49de03d9..c1d86950 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -36,9 +36,9 @@ h5 {font-size: 1.143em}	/* 16px */
 h6 {font-size: 1em}		/* 14px */
 
 h1, h2, h3, h4, h5, h6 {
-	font-weight: 400;
-	line-height: 1.1;
-	margin-bottom: .8em;
+    font-weight: 400;
+    line-height: 1.1;
+    margin-bottom: .8em;
     font-family: 'Yanone Kaffeesatz', arial, serif;
 }
 
@@ -50,15 +50,15 @@ hr { border: 2px solid #EEEEEE; }
 a {outline: 0;}
 a img {border: 0px; text-decoration: none;}
 a:link, a:visited {
-	color: #C74350;
-	padding: 0 1px;
-	text-decoration: underline;
+    color: #C74350;
+    padding: 0 1px;
+    text-decoration: underline;
 }
 a:hover, a:active {
-	background-color: #C74350;
-	color: #fff;
-	text-decoration: none;
-	text-shadow: 1px 1px 1px #333;
+    background-color: #C74350;
+    color: #fff;
+    text-decoration: none;
+    text-shadow: 1px 1px 1px #333;
 }
 
 h1 a:hover {
@@ -75,17 +75,17 @@ em, i {font-style: italic;}
 
 /* Lists */
 ul {
-	list-style: outside disc;
-	margin: 0em 0 0 1.5em;
+    list-style: outside disc;
+    margin: 0em 0 0 1.5em;
 }
 
 ol {
-	list-style: outside decimal;
-	margin: 0em 0 0 1.5em;
+    list-style: outside decimal;
+    margin: 0em 0 0 1.5em;
 }
 
 li { margin-top: 0.5em;
-     margin-bottom: 1em; }
+    margin-bottom: 1em; }
 
 .post-info {
     float:right;
@@ -116,34 +116,34 @@ cite {}
 q {}
 
 div.note {
-   float: right;
-   margin: 5px;
-   font-size: 85%;
-   max-width: 300px;
+    float: right;
+    margin: 5px;
+    font-size: 85%;
+    max-width: 300px;
 }
 
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
 
 	/* Thead */
-	thead th {padding: .5em .4em; text-align: left;}
-	thead td {}
+thead th {padding: .5em .4em; text-align: left;}
+thead td {}
 
 	/* Tbody */
-	tbody td {padding: .5em .4em;}
-	tbody th {}
+tbody td {padding: .5em .4em;}
+tbody th {}
 
-	tbody .alt td {}
-	tbody .alt th {}
+tbody .alt td {}
+tbody .alt th {}
 
 	/* Tfoot */
-	tfoot th {}
-	tfoot td {}
+tfoot th {}
+tfoot td {}
 
 /* HTML5 tags */
 header, section, footer,
 aside, nav, article, figure {
-	display: block;
+    display: block;
 }
 
 /***** Layout *****/
@@ -171,95 +171,95 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	Header
 *****************/
 #banner {
-	margin: 0 auto;
-	padding: 0.8em 0 0 0;
+    margin: 0 auto;
+    padding: 0.8em 0 0 0;
 }
 
 	/* Banner */
-	#banner h1 {
-		font-size: 3.571em;
-		line-height: 1.0;
-		margin-bottom: .3em;
-	}
+#banner h1 {
+    font-size: 3.571em;
+    line-height: 1.0;
+    margin-bottom: .3em;
+}
 
-	#banner h1 a:link, #banner h1 a:visited {
-		color: #000305;
-		display: block;
-		font-weight: bold;
-		margin: 0 0 0 .2em;
-		text-decoration: none;
-	}
-	#banner h1 a:hover, #banner h1 a:active {
-		background: none;
-		color: #C74350;
-		text-shadow: none;
-	}
+#banner h1 a:link, #banner h1 a:visited {
+    color: #000305;
+    display: block;
+    font-weight: bold;
+    margin: 0 0 0 .2em;
+    text-decoration: none;
+}
+#banner h1 a:hover, #banner h1 a:active {
+    background: none;
+    color: #C74350;
+    text-shadow: none;
+}
 
-	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
+#banner h1 strong {font-size: 0.36em; font-weight: normal;}
 
 	/* Main Nav */
-	#banner nav {
-		background: #000305;
-		font-size: 1.143em;
-		overflow: auto;
-		line-height: 30px;
-		margin: 0 auto 2em auto;
-		padding: 0;
-		text-align: center;
-		max-width: 800px;
+#banner nav {
+    background: #000305;
+    font-size: 1.143em;
+    overflow: auto;
+    line-height: 30px;
+    margin: 0 auto 2em auto;
+    padding: 0;
+    text-align: center;
+    max-width: 800px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
 
-	#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
-	#banner nav li {float: left; display: inline; margin: 0;}
+#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
+#banner nav li {float: left; display: inline; margin: 0;}
 
-	#banner nav a:link, #banner nav a:visited {
-		color: #fff;
-		display: inline-block;
-		height: 30px;
-		padding: 5px 1.5em;
-		text-decoration: none;
-	}
-	#banner nav a:hover, #banner nav a:active,
-	#banner nav .active a:link, #banner nav .active a:visited {
-		background: #C74451;
-		color: #fff;
-		text-shadow: none !important;
-	}
+#banner nav a:link, #banner nav a:visited {
+    color: #fff;
+    display: inline-block;
+    height: 30px;
+    padding: 5px 1.5em;
+    text-decoration: none;
+}
+#banner nav a:hover, #banner nav a:active,
+#banner nav .active a:link, #banner nav .active a:visited {
+    background: #C74451;
+    color: #fff;
+    text-shadow: none !important;
+}
 
-	#banner nav li:first-child a {
-		border-top-left-radius: 5px;
-		-moz-border-radius-topleft: 5px;
-		-webkit-border-top-left-radius: 5px;
+#banner nav li:first-child a {
+    border-top-left-radius: 5px;
+    -moz-border-radius-topleft: 5px;
+    -webkit-border-top-left-radius: 5px;
 
-		border-bottom-left-radius: 5px;
-		-moz-border-radius-bottomleft: 5px;
-		-webkit-border-bottom-left-radius: 5px;
-	}
+    border-bottom-left-radius: 5px;
+    -moz-border-radius-bottomleft: 5px;
+    -webkit-border-bottom-left-radius: 5px;
+}
 
 /*
 	Featured
 *****************/
 #featured {
-	background: #fff;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px;
-	max-width: 760px;
+    background: #fff;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 #featured figure {
-	border: 2px solid #eee;
-	float: right;
-	margin: 0.786em 2em 0 5em;
-	max-width: 248px;
+    border: 2px solid #eee;
+    float: right;
+    margin: 0.786em 2em 0 5em;
+    max-width: 248px;
 }
 #featured figure img {display: block; float: right;}
 
@@ -273,15 +273,15 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	Body
 *****************/
 #content {
-	background: #fff;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px 20px;
-	max-width: 760px;
+    background: #fff;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px 20px;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 /*
@@ -292,51 +292,51 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 #extras ul {list-style: none; margin: 0;}
 #extras li {border-bottom: 1px solid #fff;}
 #extras h2 {
-	color: #C74350;
-	font-size: 1.429em;
-	margin-bottom: .25em;
-	padding: 0 3px;
+    color: #C74350;
+    font-size: 1.429em;
+    margin-bottom: .25em;
+    padding: 0 3px;
 }
 
 #extras a:link, #extras a:visited {
-	color: #444;
-	display: block;
-	border-bottom: 1px solid #F4E3E3;
-	text-decoration: none;
-	padding: .3em .25em;
+    color: #444;
+    display: block;
+    border-bottom: 1px solid #F4E3E3;
+    text-decoration: none;
+    padding: .3em .25em;
 }
 
 #extras a:hover, #extras a:active {color: #fff;}
 
 	/* Blogroll */
-	#extras .blogroll {
-		float: left;
-		max-width: 615px;
-	}
+#extras .blogroll {
+    float: left;
+    max-width: 615px;
+}
 
-	#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
+#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
 
 	/* Social */
-	#extras .social {
-		float: right;
-		max-width: 175px;
-	}
+#extras .social {
+    float: right;
+    max-width: 175px;
+}
 
 /*
 	About
 *****************/
 #about {
-	background: #fff;
-	font-style: normal;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px;
-	text-align: left;
-	max-width: 760px;
+    background: #fff;
+    font-style: normal;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px;
+    text-align: left;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 #about .primary {float: left; max-width: 165px;}
@@ -355,10 +355,10 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 /***** Sections *****/
 /* Blog */
 .hentry {
-	display: block;
-	clear: both;
-	border-top: 1px solid #eee;
-	padding: 1.5em 0;
+    display: block;
+    clear: both;
+    border-top: 1px solid #eee;
+    padding: 1.5em 0;
 }
 li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 #content > .hentry {padding: 1em 0;}
@@ -370,70 +370,70 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 .hentry .post-info * {font-style: normal;}
 
 	/* Content */
-	.hentry footer {margin-bottom: 2em;}
-	.hentry footer address {display: inline;}
-	#posts-list footer address {display: block;}
+.hentry footer {margin-bottom: 2em;}
+.hentry footer address {display: inline;}
+#posts-list footer address {display: block;}
 
 	/* Blog Index */
-	#posts-list {list-style: none; margin: 0;}
-	#posts-list .hentry {padding-left: 10px; position: relative;}
+#posts-list {list-style: none; margin: 0;}
+#posts-list .hentry {padding-left: 10px; position: relative;}
 
-	#posts-list footer {
-		left: 10px;
-		position: relative;
-        float: left;
-		top: 0.5em;
-		max-width: 190px;
-	}
+#posts-list footer {
+    left: 10px;
+    position: relative;
+    float: left;
+    top: 0.5em;
+    max-width: 190px;
+}
 
 	/* About the Author */
-	#about-author {
-		background: #f9f9f9;
-		clear: both;
-		font-style: normal;
-		margin: 2em 0;
-		padding: 10px 20px 15px 20px;
+#about-author {
+    background: #f9f9f9;
+    clear: both;
+    font-style: normal;
+    margin: 2em 0;
+    padding: 10px 20px 15px 20px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
 
-	#about-author strong {
-		color: #C64350;
-		clear: both;
-		display: block;
-		font-size: 1.429em;
-	}
+#about-author strong {
+    color: #C64350;
+    clear: both;
+    display: block;
+    font-size: 1.429em;
+}
 
-	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
+#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
 
 	/* Comments */
-	#comments-list {list-style: none; margin: 0 1em;}
-	#comments-list blockquote {
-		background: #f8f8f8;
-		clear: both;
-		font-style: normal;
-		margin: 0;
-		padding: 15px 20px;
+#comments-list {list-style: none; margin: 0 1em;}
+#comments-list blockquote {
+    background: #f8f8f8;
+    clear: both;
+    font-style: normal;
+    margin: 0;
+    padding: 15px 20px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
-	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
 
-	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
+#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
 
 	/* Add a Comment */
-	#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
-	#add-comment input[type='text'],
-	#add-comment input[type='email'],
-	#add-comment input[type='url'] {float: left; max-width: 200px;}
+#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
+#add-comment input[type='text'],
+#add-comment input[type='email'],
+#add-comment input[type='url'] {float: left; max-width: 200px;}
 
-	#add-comment textarea {float: left; height: 150px; max-width: 495px;}
+#add-comment textarea {float: left; height: 150px; max-width: 495px;}
 
-	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
+#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
 
-	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
-	#add-comment * {margin-bottom: .5em;}
+#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
+#add-comment * {margin-bottom: .5em;}
diff --git a/pelican/tests/output/custom/theme/css/pygment.css b/pelican/tests/output/custom/theme/css/pygment.css
index fdd056f6..a3877a83 100644
--- a/pelican/tests/output/custom/theme/css/pygment.css
+++ b/pelican/tests/output/custom/theme/css/pygment.css
@@ -1,205 +1,205 @@
 .hll {
-background-color:#eee;
+    background-color:#eee;
 }
 .c {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .err {
-border:1px solid #FF0000;
+    border:1px solid #FF0000;
 }
 .k {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .o {
-color:#666666;
+    color:#666666;
 }
 .cm {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .cp {
-color:#007020;
+    color:#007020;
 }
 .c1 {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .cs {
-background-color:#FFF0F0;
-color:#408090;
+    background-color:#FFF0F0;
+    color:#408090;
 }
 .gd {
-color:#A00000;
+    color:#A00000;
 }
 .ge {
-font-style:italic;
+    font-style:italic;
 }
 .gr {
-color:#FF0000;
+    color:#FF0000;
 }
 .gh {
-color:#000080;
-font-weight:bold;
+    color:#000080;
+    font-weight:bold;
 }
 .gi {
-color:#00A000;
+    color:#00A000;
 }
 .go {
-color:#303030;
+    color:#303030;
 }
 .gp {
-color:#C65D09;
-font-weight:bold;
+    color:#C65D09;
+    font-weight:bold;
 }
 .gs {
-font-weight:bold;
+    font-weight:bold;
 }
 .gu {
-color:#800080;
-font-weight:bold;
+    color:#800080;
+    font-weight:bold;
 }
 .gt {
-color:#0040D0;
+    color:#0040D0;
 }
 .kc {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kd {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kn {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kp {
-color:#007020;
+    color:#007020;
 }
 .kr {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kt {
-color:#902000;
+    color:#902000;
 }
 .m {
-color:#208050;
+    color:#208050;
 }
 .s {
-color:#4070A0;
+    color:#4070A0;
 }
 .na {
-color:#4070A0;
+    color:#4070A0;
 }
 .nb {
-color:#007020;
+    color:#007020;
 }
 .nc {
-color:#0E84B5;
-font-weight:bold;
+    color:#0E84B5;
+    font-weight:bold;
 }
 .no {
-color:#60ADD5;
+    color:#60ADD5;
 }
 .nd {
-color:#555555;
-font-weight:bold;
+    color:#555555;
+    font-weight:bold;
 }
 .ni {
-color:#D55537;
-font-weight:bold;
+    color:#D55537;
+    font-weight:bold;
 }
 .ne {
-color:#007020;
+    color:#007020;
 }
 .nf {
-color:#06287E;
+    color:#06287E;
 }
 .nl {
-color:#002070;
-font-weight:bold;
+    color:#002070;
+    font-weight:bold;
 }
 .nn {
-color:#0E84B5;
-font-weight:bold;
+    color:#0E84B5;
+    font-weight:bold;
 }
 .nt {
-color:#062873;
-font-weight:bold;
+    color:#062873;
+    font-weight:bold;
 }
 .nv {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .ow {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .w {
-color:#BBBBBB;
+    color:#BBBBBB;
 }
 .mf {
-color:#208050;
+    color:#208050;
 }
 .mh {
-color:#208050;
+    color:#208050;
 }
 .mi {
-color:#208050;
+    color:#208050;
 }
 .mo {
-color:#208050;
+    color:#208050;
 }
 .sb {
-color:#4070A0;
+    color:#4070A0;
 }
 .sc {
-color:#4070A0;
+    color:#4070A0;
 }
 .sd {
-color:#4070A0;
-font-style:italic;
+    color:#4070A0;
+    font-style:italic;
 }
 .s2 {
-color:#4070A0;
+    color:#4070A0;
 }
 .se {
-color:#4070A0;
-font-weight:bold;
+    color:#4070A0;
+    font-weight:bold;
 }
 .sh {
-color:#4070A0;
+    color:#4070A0;
 }
 .si {
-color:#70A0D0;
-font-style:italic;
+    color:#70A0D0;
+    font-style:italic;
 }
 .sx {
-color:#C65D09;
+    color:#C65D09;
 }
 .sr {
-color:#235388;
+    color:#235388;
 }
 .s1 {
-color:#4070A0;
+    color:#4070A0;
 }
 .ss {
-color:#517918;
+    color:#517918;
 }
 .bp {
-color:#007020;
+    color:#007020;
 }
 .vc {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .vg {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .vi {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .il {
-color:#208050;
+    color:#208050;
 }
diff --git a/pelican/tests/output/custom/theme/css/reset.css b/pelican/tests/output/custom/theme/css/reset.css
index f5123cf6..10b3fde2 100644
--- a/pelican/tests/output/custom/theme/css/reset.css
+++ b/pelican/tests/output/custom/theme/css/reset.css
@@ -15,13 +15,13 @@ b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td {
-	background: transparent;
-	border: 0;
-	font-size: 100%;
-	margin: 0;
-	outline: 0;
-	padding: 0;
-	vertical-align: baseline;
+    background: transparent;
+    border: 0;
+    font-size: 100%;
+    margin: 0;
+    outline: 0;
+    padding: 0;
+    vertical-align: baseline;
 }
 
 body {line-height: 1;}
@@ -32,13 +32,13 @@ blockquote, q {quotes: none;}
 
 blockquote:before, blockquote:after,
 q:before, q:after {
-	content: '';
-	content: none;
+    content: '';
+    content: none;
 }
 
 /* remember to define focus styles! */
 :focus {
-	outline: 0;
+    outline: 0;
 }
 
 /* remember to highlight inserts somehow! */
@@ -47,6 +47,6 @@ del {text-decoration: line-through;}
 
 /* tables still need 'cellspacing="0"' in the markup */
 table {
-	border-collapse: collapse;
-	border-spacing: 0;
+    border-collapse: collapse;
+    border-spacing: 0;
 }
diff --git a/pelican/tests/output/custom/theme/fonts/font.css b/pelican/tests/output/custom/theme/fonts/font.css
index a9eb87e6..cf623603 100644
--- a/pelican/tests/output/custom/theme/fonts/font.css
+++ b/pelican/tests/output/custom/theme/fonts/font.css
@@ -1,12 +1,12 @@
 @font-face {
-	font-family: 'Yanone Kaffeesatz';
-	font-style: normal;
-	font-weight: 400;
-	src:
-		local('Yanone Kaffeesatz Regular'),
-		local('YanoneKaffeesatz-Regular'),
+    font-family: 'Yanone Kaffeesatz';
+    font-style: normal;
+    font-weight: 400;
+    src:
+    local('Yanone Kaffeesatz Regular'),
+    local('YanoneKaffeesatz-Regular'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
-		url('Yanone_Kaffeesatz_400.woff') format('woff'),
+    url('Yanone_Kaffeesatz_400.woff') format('woff'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
-		url('Yanone_Kaffeesatz_400.woff2') format('woff2');
+    url('Yanone_Kaffeesatz_400.woff2') format('woff2');
 }
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 565d9f3f..2dac8f11 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -1,128 +1,128 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>This is a super article !</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Multi-line metadata should be supported as well as inline markup." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>This is a super article !</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Multi-line metadata should be supported as well as inline markup." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./this-is-a-super-article.html" rel="bookmark"
-           title="Permalink to This is a super article !">This is a super article !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li class="active"><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./this-is-a-super-article.html" rel="bookmark"
+                                                   title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: Thu 02 December 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: Sun 17 November 2013
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                        Published: Thu 02 December 2010
+                                                </abbr>
+                                                <br />
+                                                <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                        Updated: Sun 17 November 2013
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->      <p>Some content here !</p>
-<div class="section" id="this-is-a-simple-title">
-<h2>This is a simple title</h2>
-<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="./pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/yeah.html">yeah</a>.</p>
+                                                <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/foobar.html">foobar</a> </p>
+                                        </footer><!-- /.post-info -->      <p>Some content here !</p>
+                                        <div class="section" id="this-is-a-simple-title">
+                                                <h2>This is a simple title</h2>
+                                                <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+                                                <img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                <img alt="alternate text" src="./pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
 </pre>
-<p>→ And now try with some utf8 hell: ééé</p>
-</div>
+                                                <p>→ And now try with some utf8 hell: ééé</p>
+                                        </div>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'this-is-a-super-article.html';
-        var disqus_url = './this-is-a-super-article.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'this-is-a-super-article.html';
+                                                var disqus_url = './this-is-a-super-article.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 6153392e..d777df9e 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -1,145 +1,145 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Unbelievable !</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Unbelievable !</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./unbelievable.html" rel="bookmark"
-           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./unbelievable.html" rel="bookmark"
+                                                   title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: Fri 15 October 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-10-15T20:30:00+02:00">
+                                                        Published: Fri 15 October 2010
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
-<a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
-<div class="section" id="testing-sourcecode-directive">
-<h2>Testing sourcecode directive</h2>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                        </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
+                                        <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+                                                <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
+                                        <div class="section" id="testing-sourcecode-directive">
+                                                <h2>Testing sourcecode directive</h2>
+                                                <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-</div>
-<div class="section" id="testing-another-case">
-<h2>Testing another case</h2>
-<p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will have nothing in default.</p>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                        </div>
+                                        <div class="section" id="testing-another-case">
+                                                <h2>Testing another case</h2>
+                                                <p>This will now have a line number in 'custom' since it's the default in
+                                                        pelican.conf, it will have nothing in default.</p>
+                                                <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-<p>Lovely.</p>
-</div>
-<div class="section" id="testing-more-sourcecode-directives">
-<h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
-<p>Lovely.</p>
-</div>
-<div class="section" id="testing-even-more-sourcecode-directives">
-<h2>Testing even more sourcecode directives</h2>
-<span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-<p>Lovely.</p>
-</div>
-<div class="section" id="testing-overriding-config-defaults">
-<h2>Testing overriding config defaults</h2>
-<p>Even if the default is line numbers, we can override it here</p>
-<div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                <p>Lovely.</p>
+                                        </div>
+                                        <div class="section" id="testing-more-sourcecode-directives">
+                                                <h2>Testing more sourcecode directives</h2>
+                                                <div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+                                                <p>Lovely.</p>
+                                        </div>
+                                        <div class="section" id="testing-even-more-sourcecode-directives">
+                                                <h2>Testing even more sourcecode directives</h2>
+                                                <span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                <p>Lovely.</p>
+                                        </div>
+                                        <div class="section" id="testing-overriding-config-defaults">
+                                                <h2>Testing overriding config defaults</h2>
+                                                <p>Even if the default is line numbers, we can override it here</p>
+                                                <div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
-<p>Lovely.</p>
-</div>
+                                                <p>Lovely.</p>
+                                        </div>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'unbelievable.html';
-        var disqus_url = './unbelievable.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'unbelievable.html';
+                                                var disqus_url = './unbelievable.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index 8b07609d..c3f25eb7 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -1,98 +1,98 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-<h1>Archives for Alexis' log</h1>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1>Archives for Alexis' log</h1>
 
-<dl>
-    <dt>30 novembre 2012</dt>
-    <dd><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></dd>
-    <dt>29 février 2012</dt>
-    <dd><a href="./posts/2012/février/29/second-article/">Second article</a></dd>
-    <dt>20 avril 2011</dt>
-    <dd><a href="./posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></dd>
-    <dt>17 février 2011</dt>
-    <dd><a href="./posts/2011/février/17/article-1/">Article 1</a></dd>
-    <dt>17 février 2011</dt>
-    <dd><a href="./posts/2011/février/17/article-2/">Article 2</a></dd>
-    <dt>17 février 2011</dt>
-    <dd><a href="./posts/2011/février/17/article-3/">Article 3</a></dd>
-    <dt>02 décembre 2010</dt>
-    <dd><a href="./posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></dd>
-    <dt>20 octobre 2010</dt>
-    <dd><a href="./posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></dd>
-    <dt>15 octobre 2010</dt>
-    <dd><a href="./posts/2010/octobre/15/unbelievable/">Unbelievable !</a></dd>
-    <dt>14 mars 2010</dt>
-    <dd><a href="./tag/baz.html">The baz tag</a></dd>
-</dl>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        <dl>
+                                <dt>30 novembre 2012</dt>
+                                <dd><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></dd>
+                                <dt>29 février 2012</dt>
+                                <dd><a href="./posts/2012/février/29/second-article/">Second article</a></dd>
+                                <dt>20 avril 2011</dt>
+                                <dd><a href="./posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></dd>
+                                <dt>17 février 2011</dt>
+                                <dd><a href="./posts/2011/février/17/article-1/">Article 1</a></dd>
+                                <dt>17 février 2011</dt>
+                                <dd><a href="./posts/2011/février/17/article-2/">Article 2</a></dd>
+                                <dt>17 février 2011</dt>
+                                <dd><a href="./posts/2011/février/17/article-3/">Article 3</a></dd>
+                                <dt>02 décembre 2010</dt>
+                                <dd><a href="./posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></dd>
+                                <dt>20 octobre 2010</dt>
+                                <dd><a href="./posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></dd>
+                                <dt>15 octobre 2010</dt>
+                                <dd><a href="./posts/2010/octobre/15/unbelievable/">Unbelievable !</a></dd>
+                                <dt>14 mars 2010</dt>
+                                <dd><a href="./tag/baz.html">The baz tag</a></dd>
+                        </dl>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 86ee7416..db0a7b2f 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -1,174 +1,174 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Alexis Métaireau</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Alexis Métaireau</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: 30 novembre 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-11-30T00:00:00+01:00">
+                                                Published: 30 novembre 2012
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="../posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>Some cool stuff!</p>
+                                <p>There are <a href="../posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2012/février/29/second-article/" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2012/février/29/second-article/" rel="bookmark"
+                                                       title="Permalink to Second article">Second article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                                Published: 29 février 2012
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+                                                        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+                                                </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="../posts/2012/février/29/second-article/">read more</a>
-<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../posts/2012/février/29/second-article/">read more</a>
+                                                <p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
-                           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
+                                                       title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: 20 avril 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-04-20T00:00:00+02:00">
+                                                                Published: 20 avril 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
-<a href="../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
-                <a class="readmore" href="../posts/2011/avril/20/a-markdown-powered-article/">read more</a>
-<p>There are <a href="../posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
+                                                <p><a href="../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
+                                                        <a href="../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
+                                                <a class="readmore" href="../posts/2011/avril/20/a-markdown-powered-article/">read more</a>
+                                                <p>There are <a href="../posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2011/février/17/article-1/" rel="bookmark"
-                           title="Permalink to Article 1">Article 1</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2011/février/17/article-1/" rel="bookmark"
+                                                       title="Permalink to Article 1">Article 1</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: 17 février 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 1</p>
+                                                </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-1/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-    <li>Page 1 / 3</li>
-        <li><a href="../author/alexis-metaireau2.html">&rang;</a></li>
-        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="../posts/2011/février/17/article-1/">read more</a>
+                                                <p>There are <a href="../posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li>Page 1 / 3</li>
+                                        <li><a href="../author/alexis-metaireau2.html">&rang;</a></li>
+                                        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index cf332f97..0f1908c4 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -1,189 +1,189 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Alexis Métaireau</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Alexis Métaireau</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
                 <section id="content" class="body">
-                    <ol id="posts-list" class="hfeed" start="3">
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2011/février/17/article-2/" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
+                        <ol id="posts-list" class="hfeed" start="3">
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2011/février/17/article-2/" rel="bookmark"
+                                                       title="Permalink to Article 2">Article 2</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: 17 février 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 2</p>
+                                                </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-2/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../posts/2011/février/17/article-2/">read more</a>
+                                                <p>There are <a href="../posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2011/février/17/article-3/" rel="bookmark"
-                           title="Permalink to Article 3">Article 3</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2011/février/17/article-3/" rel="bookmark"
+                                                       title="Permalink to Article 3">Article 3</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: 17 février 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 3</p>
+                                                </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-3/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../posts/2011/février/17/article-3/">read more</a>
+                                                <p>There are <a href="../posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                                                       title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                                Published: 02 décembre 2010
+                                                        </abbr>
+                                                        <br />
+                                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                                Updated: 17 novembre 2013
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/yeah.html">yeah</a>.</p>
+                                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+                                                </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+                                                        as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+                                                <p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
-                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
+                                                       title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                                Published: 20 octobre 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/bar.html">bar</a>.</p>
-<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/bar.html">bar</a>.</p>
+                                                        <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+                                                        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                                </footer><!-- /.post-info -->                <div class="section" id="why-not">
+                                                        <h2>Why not ?</h2>
+                                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                                YEAH !</p>
+                                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                </div>
 
-                <a class="readmore" href="../posts/2010/octobre/20/oh-yeah/">read more</a>
-<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
-        <li><a href="../author/alexis-metaireau.html">&lang;</a></li>
-    <li>Page 2 / 3</li>
-        <li><a href="../author/alexis-metaireau3.html">&rang;</a></li>
-        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="../posts/2010/octobre/20/oh-yeah/">read more</a>
+                                                <p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
+                                        <li><a href="../author/alexis-metaireau.html">&lang;</a></li>
+                                        <li>Page 2 / 3</li>
+                                        <li><a href="../author/alexis-metaireau3.html">&rang;</a></li>
+                                        <li><a href="../author/alexis-metaireau3.html">&Rang;</a></li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index dff225d2..a5942573 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -1,139 +1,139 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Alexis Métaireau</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Alexis Métaireau</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
                 <section id="content" class="body">
-                    <ol id="posts-list" class="hfeed" start="3">
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2010/octobre/15/unbelievable/" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
+                        <ol id="posts-list" class="hfeed" start="3">
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2010/octobre/15/unbelievable/" rel="bookmark"
+                                                       title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: 15 octobre 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-15T20:30:00+02:00">
+                                                                Published: 15 octobre 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
-<a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
-<div class="section" id="testing-sourcecode-directive">
-<h2>Testing sourcecode directive</h2>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+                                                <p><a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+                                                        <a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+                                                <div class="section" id="testing-sourcecode-directive">
+                                                        <h2>Testing sourcecode directive</h2>
+                                                        <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-</div>
-<div class="section" id="testing-another-case">
-<h2>Testing another case</h2>
-<p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …</p></div>
-                <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
-<p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                </div>
+                                                <div class="section" id="testing-another-case">
+                                                        <h2>Testing another case</h2>
+                                                        <p>This will now have a line number in 'custom' since it's the default in
+                                                                pelican.conf, it will …</p></div>
+                                                <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
+                                                <p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../tag/baz.html" rel="bookmark"
-                           title="Permalink to The baz tag">The baz tag</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../tag/baz.html" rel="bookmark"
+                                                       title="Permalink to The baz tag">The baz tag</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 mars 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-03-14T00:00:00+01:00">
+                                                                Published: 14 mars 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+                                                </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
-                <a class="readmore" href="../tag/baz.html">read more</a>
-<p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
-        <li><a href="../author/alexis-metaireau2.html">&lang;</a></li>
-    <li>Page 3 / 3</li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="../tag/baz.html">read more</a>
+                                                <p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li><a href="../author/alexis-metaireau.html">&Lang;</a></li>
+                                        <li><a href="../author/alexis-metaireau2.html">&lang;</a></li>
+                                        <li>Page 3 / 3</li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index 7cac21cc..14a3e1ca 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -1,80 +1,80 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Authors</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Authors</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-<section id="content" class="body">
-    <h1>Authors on Alexis' log</h1>
-    <ul>
-        <li><a href="./author/alexis-metaireau.html">Alexis Métaireau</a> (10)</li>
-    </ul>
-</section>
-
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
+                <section id="content" class="body">
+                        <h1>Authors on Alexis' log</h1>
                         <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                <li><a href="./author/alexis-metaireau.html">Alexis Métaireau</a> (10)</li>
                         </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
+
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 3b102a03..8fb45c4e 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -1,83 +1,83 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Categories</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Categories</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-<section id="content" class="body">
-    <h1>Categories for Alexis' log</h1>
-    <ul>
-        <li><a href="./category/bar.html">bar</a> (1)</li>
-        <li><a href="./category/cat1.html">cat1</a> (4)</li>
-        <li><a href="./category/misc.html">misc</a> (4)</li>
-        <li><a href="./category/yeah.html">yeah</a> (1)</li>
-    </ul>
-</section>
-
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
+                <section id="content" class="body">
+                        <h1>Categories for Alexis' log</h1>
                         <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                <li><a href="./category/bar.html">bar</a> (1)</li>
+                                <li><a href="./category/cat1.html">cat1</a> (4)</li>
+                                <li><a href="./category/misc.html">misc</a> (4)</li>
+                                <li><a href="./category/yeah.html">yeah</a> (1)</li>
                         </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
+
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index 644a611c..6915f22e 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -1,96 +1,96 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - bar</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - bar</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                Published: 20 octobre 2010
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/bar.html">bar</a>.</p>
-<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/bar.html">bar</a>.</p>
+                                        <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+                                        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
-<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                                </footer><!-- /.post-info --><div class="section" id="why-not">
+                                        <h2>Why not ?</h2>
+                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                YEAH !</p>
+                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                </div>
+                                <p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 0fe47339..5cf93f15 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -1,165 +1,165 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - cat1</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - cat1</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li class="active"><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li class="active"><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: 20 avril 2011
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2011-04-20T00:00:00+02:00">
+                                                Published: 20 avril 2011
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info --><p>You're mutually oblivious.</p>
-<p><a href="../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
-<a href="../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p><p>There are <a href="../posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
+                                <p><a href="../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
+                                        <a href="../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p><p>There are <a href="../posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2011/février/17/article-1/" rel="bookmark"
-                           title="Permalink to Article 1">Article 1</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2011/février/17/article-1/" rel="bookmark"
+                                                       title="Permalink to Article 1">Article 1</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: 17 février 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 1</p>
+                                                </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-1/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../posts/2011/février/17/article-1/">read more</a>
+                                                <p>There are <a href="../posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2011/février/17/article-2/" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2011/février/17/article-2/" rel="bookmark"
+                                                       title="Permalink to Article 2">Article 2</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: 17 février 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 2</p>
+                                                </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-2/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../posts/2011/février/17/article-2/">read more</a>
+                                                <p>There are <a href="../posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2011/février/17/article-3/" rel="bookmark"
-                           title="Permalink to Article 3">Article 3</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2011/février/17/article-3/" rel="bookmark"
+                                                       title="Permalink to Article 3">Article 3</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: 17 février 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 3</p>
+                                                </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="../posts/2011/février/17/article-3/">read more</a>
-<p>There are <a href="../posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="../posts/2011/février/17/article-3/">read more</a>
+                                                <p>There are <a href="../posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index b300e98f..2d2fbfc2 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -1,176 +1,176 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - misc</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - misc</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: 30 novembre 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-11-30T00:00:00+01:00">
+                                                Published: 30 novembre 2012
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="../posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>Some cool stuff!</p>
+                                <p>There are <a href="../posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2012/février/29/second-article/" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2012/février/29/second-article/" rel="bookmark"
+                                                       title="Permalink to Second article">Second article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                                Published: 29 février 2012
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+                                                        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+                                                </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="../posts/2012/février/29/second-article/">read more</a>
-<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../posts/2012/février/29/second-article/">read more</a>
+                                                <p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2010/octobre/15/unbelievable/" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2010/octobre/15/unbelievable/" rel="bookmark"
+                                                       title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: 15 octobre 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-15T20:30:00+02:00">
+                                                                Published: 15 octobre 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
-<a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
-<div class="section" id="testing-sourcecode-directive">
-<h2>Testing sourcecode directive</h2>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+                                                <p><a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+                                                        <a class="reference external" href="../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+                                                <div class="section" id="testing-sourcecode-directive">
+                                                        <h2>Testing sourcecode directive</h2>
+                                                        <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-</div>
-<div class="section" id="testing-another-case">
-<h2>Testing another case</h2>
-<p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …</p></div>
-                <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
-<p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                </div>
+                                                <div class="section" id="testing-another-case">
+                                                        <h2>Testing another case</h2>
+                                                        <p>This will now have a line number in 'custom' since it's the default in
+                                                                pelican.conf, it will …</p></div>
+                                                <a class="readmore" href="../posts/2010/octobre/15/unbelievable/">read more</a>
+                                                <p>There are <a href="../posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../tag/baz.html" rel="bookmark"
-                           title="Permalink to The baz tag">The baz tag</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../tag/baz.html" rel="bookmark"
+                                                       title="Permalink to The baz tag">The baz tag</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 mars 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-03-14T00:00:00+01:00">
+                                                                Published: 14 mars 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+                                                </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
-                <a class="readmore" href="../tag/baz.html">read more</a>
-<p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="../tag/baz.html">read more</a>
+                                                <p>There are <a href="../tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index afa3c4dd..bab572c4 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -1,104 +1,104 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - yeah</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - yeah</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li class="active"><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li class="active"><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                Published: 02 décembre 2010
+                                        </abbr>
+                                        <br />
+                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                Updated: 17 novembre 2013
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info --><p>Some content here !</p>
-<div class="section" id="this-is-a-simple-title">
-<h2>This is a simple title</h2>
-<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/yeah.html">yeah</a>.</p>
+                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+                                </footer><!-- /.post-info --><p>Some content here !</p>
+                                <div class="section" id="this-is-a-simple-title">
+                                        <h2>This is a simple title</h2>
+                                        <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                        <img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
 </pre>
-<p>→ And now try with some utf8 hell: ééé</p>
-</div>
-<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                                        <p>→ And now try with some utf8 hell: ééé</p>
+                                </div>
+                                <p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
index 114aac6c..dae74c58 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
@@ -1,99 +1,99 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A draft article without date</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A draft article without date</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../drafts/a-draft-article-without-date.html" rel="bookmark"
-           title="Permalink to A draft article without date">A draft article without date</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../drafts/a-draft-article-without-date.html" rel="bookmark"
+                                                   title="Permalink to A draft article without date">A draft article without date</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-03-02T14:01:01+01:00">
-                Published: 02 mars 2012
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2012-03-02T14:01:01+01:00">
+                                                        Published: 02 mars 2012
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
-listed anywhere else.</p>
+                                        </footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
+                                                listed anywhere else.</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 406fbe36..ad8688d4 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -1,99 +1,99 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A draft article</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A draft article</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="This is a draft article, it should live under the /drafts/ folder and not be listed anywhere else." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../drafts/a-draft-article.html" rel="bookmark"
-           title="Permalink to A draft article">A draft article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../drafts/a-draft-article.html" rel="bookmark"
+                                                   title="Permalink to A draft article">A draft article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-05-08T15:58:00+02:00">
-                Published: 08 mai 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-05-08T15:58:00+02:00">
+                                                        Published: 08 mai 2011
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
-listed anywhere else.</p>
+                                        </footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
+                                                listed anywhere else.</p>
 
-    </div><!-- /.entry-content -->
+                                </div><!-- /.entry-content -->
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 37bfa0ac..0499f5d5 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -1,174 +1,174 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: 30 novembre 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-11-30T00:00:00+01:00">
+                                                Published: 30 novembre 2012
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="./category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info --><p>Some cool stuff!</p>
-<p>There are <a href="./posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>Some cool stuff!</p>
+                                <p>There are <a href="./posts/2012/novembre/30/filename_metadata-example/#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./posts/2012/février/29/second-article/" rel="bookmark"
-                           title="Permalink to Second article">Second article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./posts/2012/février/29/second-article/" rel="bookmark"
+                                                       title="Permalink to Second article">Second article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                                Published: 29 février 2012
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
-<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./second-article-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/misc.html">misc</a>.</p>
+                                                        <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
+                                                        <a href="./second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <p>This is some article, in english</p>
+                                                </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
-                <a class="readmore" href="./posts/2012/février/29/second-article/">read more</a>
-<p>There are <a href="./posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="./posts/2012/février/29/second-article/">read more</a>
+                                                <p>There are <a href="./posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
-                           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
+                                                       title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: 20 avril 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-04-20T00:00:00+02:00">
+                                                                Published: 20 avril 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
-<p><a href="./posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
-<a href="./posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
-                <a class="readmore" href="./posts/2011/avril/20/a-markdown-powered-article/">read more</a>
-<p>There are <a href="./posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
+                                                <p><a href="./posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
+                                                        <a href="./posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
+                                                <a class="readmore" href="./posts/2011/avril/20/a-markdown-powered-article/">read more</a>
+                                                <p>There are <a href="./posts/2011/avril/20/a-markdown-powered-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./posts/2011/février/17/article-1/" rel="bookmark"
-                           title="Permalink to Article 1">Article 1</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./posts/2011/février/17/article-1/" rel="bookmark"
+                                                       title="Permalink to Article 1">Article 1</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: 17 février 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 1</p>
+                                                </footer><!-- /.post-info -->                <p>Article 1</p>
 
-                <a class="readmore" href="./posts/2011/février/17/article-1/">read more</a>
-<p>There are <a href="./posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-    <li>Page 1 / 3</li>
-        <li><a href="./index2.html">&rang;</a></li>
-        <li><a href="./index3.html">&Rang;</a></li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="./posts/2011/février/17/article-1/">read more</a>
+                                                <p>There are <a href="./posts/2011/février/17/article-1/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li>Page 1 / 3</li>
+                                        <li><a href="./index2.html">&rang;</a></li>
+                                        <li><a href="./index3.html">&Rang;</a></li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 871fd594..35e1aca6 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -1,189 +1,189 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
                 <section id="content" class="body">
-                    <ol id="posts-list" class="hfeed" start="3">
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./posts/2011/février/17/article-2/" rel="bookmark"
-                           title="Permalink to Article 2">Article 2</a></h1>
-                </header>
+                        <ol id="posts-list" class="hfeed" start="3">
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./posts/2011/février/17/article-2/" rel="bookmark"
+                                                       title="Permalink to Article 2">Article 2</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: 17 février 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 2</p>
+                                                </footer><!-- /.post-info -->                <p>Article 2</p>
 
-                <a class="readmore" href="./posts/2011/février/17/article-2/">read more</a>
-<p>There are <a href="./posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="./posts/2011/février/17/article-2/">read more</a>
+                                                <p>There are <a href="./posts/2011/février/17/article-2/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./posts/2011/février/17/article-3/" rel="bookmark"
-                           title="Permalink to Article 3">Article 3</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./posts/2011/février/17/article-3/" rel="bookmark"
+                                                       title="Permalink to Article 3">Article 3</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                                Published: 17 février 2011
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/cat1.html">cat1</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Article 3</p>
+                                                </footer><!-- /.post-info -->                <p>Article 3</p>
 
-                <a class="readmore" href="./posts/2011/février/17/article-3/">read more</a>
-<p>There are <a href="./posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="./posts/2011/février/17/article-3/">read more</a>
+                                                <p>There are <a href="./posts/2011/février/17/article-3/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                                                       title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                                Published: 02 décembre 2010
+                                                        </abbr>
+                                                        <br />
+                                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                                Updated: 17 novembre 2013
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/yeah.html">yeah</a>.</p>
+                                                        <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/foobar.html">foobar</a> </p>
+                                                </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+                                                        as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="./posts/2010/décembre/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="./posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="./posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+                                                <p>There are <a href="./posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./posts/2010/octobre/20/oh-yeah/" rel="bookmark"
-                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./posts/2010/octobre/20/oh-yeah/" rel="bookmark"
+                                                       title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                                Published: 20 octobre 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/bar.html">bar</a>.</p>
-<p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
-        <a href="./oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/bar.html">bar</a>.</p>
+                                                        <p>tags: <a href="./tag/oh.html">oh</a> <a href="./tag/bar.html">bar</a> <a href="./tag/yeah.html">yeah</a> </p>Translations:
+                                                        <a href="./oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                                </footer><!-- /.post-info -->                <div class="section" id="why-not">
+                                                        <h2>Why not ?</h2>
+                                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                                YEAH !</p>
+                                                        <img alt="alternate text" src="./pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                </div>
 
-                <a class="readmore" href="./posts/2010/octobre/20/oh-yeah/">read more</a>
-<p>There are <a href="./posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-        <li><a href="./index.html">&Lang;</a></li>
-        <li><a href="./index.html">&lang;</a></li>
-    <li>Page 2 / 3</li>
-        <li><a href="./index3.html">&rang;</a></li>
-        <li><a href="./index3.html">&Rang;</a></li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="./posts/2010/octobre/20/oh-yeah/">read more</a>
+                                                <p>There are <a href="./posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li><a href="./index.html">&Lang;</a></li>
+                                        <li><a href="./index.html">&lang;</a></li>
+                                        <li>Page 2 / 3</li>
+                                        <li><a href="./index3.html">&rang;</a></li>
+                                        <li><a href="./index3.html">&Rang;</a></li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index e3bbdffd..5b5c3a67 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -1,139 +1,139 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
                 <section id="content" class="body">
-                    <ol id="posts-list" class="hfeed" start="3">
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./posts/2010/octobre/15/unbelievable/" rel="bookmark"
-                           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-                </header>
+                        <ol id="posts-list" class="hfeed" start="3">
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./posts/2010/octobre/15/unbelievable/" rel="bookmark"
+                                                       title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: 15 octobre 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-15T20:30:00+02:00">
+                                                                Published: 15 octobre 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
-<a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
-<div class="section" id="testing-sourcecode-directive">
-<h2>Testing sourcecode directive</h2>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
+                                                <p><a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+                                                        <a class="reference external" href="./posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+                                                <div class="section" id="testing-sourcecode-directive">
+                                                        <h2>Testing sourcecode directive</h2>
+                                                        <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-</div>
-<div class="section" id="testing-another-case">
-<h2>Testing another case</h2>
-<p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …</p></div>
-                <a class="readmore" href="./posts/2010/octobre/15/unbelievable/">read more</a>
-<p>There are <a href="./posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                </div>
+                                                <div class="section" id="testing-another-case">
+                                                        <h2>Testing another case</h2>
+                                                        <p>This will now have a line number in 'custom' since it's the default in
+                                                                pelican.conf, it will …</p></div>
+                                                <a class="readmore" href="./posts/2010/octobre/15/unbelievable/">read more</a>
+                                                <p>There are <a href="./posts/2010/octobre/15/unbelievable/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="./tag/baz.html" rel="bookmark"
-                           title="Permalink to The baz tag">The baz tag</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="./tag/baz.html" rel="bookmark"
+                                                       title="Permalink to The baz tag">The baz tag</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 mars 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-03-14T00:00:00+01:00">
+                                                                Published: 14 mars 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="./category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+                                                </footer><!-- /.post-info -->                <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
-                <a class="readmore" href="./tag/baz.html">read more</a>
-<p>There are <a href="./tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
-<nav>
-  <ul>
-        <li><a href="./index.html">&Lang;</a></li>
-        <li><a href="./index2.html">&lang;</a></li>
-    <li>Page 3 / 3</li>
-  </ul>
-</nav>
+                                                <a class="readmore" href="./tag/baz.html">read more</a>
+                                                <p>There are <a href="./tag/baz.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
+                        <nav>
+                                <ul>
+                                        <li><a href="./index.html">&Lang;</a></li>
+                                        <li><a href="./index2.html">&lang;</a></li>
+                                        <li>Page 3 / 3</li>
+                                </ul>
+                        </nav>
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index c4bcf019..75602f5e 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -1,75 +1,75 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-Some text
+                Some text
 
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 02d30117..baec35fa 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -1,117 +1,117 @@
 <!DOCTYPE html>
 <html lang="fr">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Trop bien !</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-      <link rel="alternate" hreflang="en" href="./posts/2010/octobre/20/oh-yeah/">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Trop bien !</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <link rel="alternate" hreflang="en" href="./posts/2010/octobre/20/oh-yeah/">
 
-        <meta name="description" content="Et voila du contenu en français" />
-</head>
+                <meta name="description" content="Et voila du contenu en français" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./oh-yeah-fr.html" rel="bookmark"
-           title="Permalink to Trop bien !">Trop bien !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./oh-yeah-fr.html" rel="bookmark"
+                                                   title="Permalink to Trop bien !">Trop bien !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                        Published: 20 octobre 2010
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
-Translations:
-        <a href="./posts/2010/octobre/20/oh-yeah/" hreflang="en">en</a>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/misc.html">misc</a>.</p>
+                                                Translations:
+                                                <a href="./posts/2010/octobre/20/oh-yeah/" hreflang="en">en</a>
 
-</footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
+                                        </footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'oh-yeah-fr.html';
-        var disqus_url = './oh-yeah-fr.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'oh-yeah-fr.html';
+                                                var disqus_url = './oh-yeah-fr.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index e1212e43..285e553b 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -1,79 +1,79 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Override url/save_as</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Override url/save_as</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li class="active"><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">Override url/save_as</h1>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li class="active"><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">Override url/save_as</h1>
 
-    <p>Test page which overrides save_as and url so that this page will be generated
-at a custom location.</p>
+                        <p>Test page which overrides save_as and url so that this page will be generated
+                                at a custom location.</p>
 
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index 5ba42b3f..431d6849 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -1,79 +1,79 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>This is a test hidden page</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>This is a test hidden page</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">This is a test hidden page</h1>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">This is a test hidden page</h1>
 
-    <p>This is great for things like error(404) pages
-Anyone can see this page but it's not linked to anywhere!</p>
+                        <p>This is great for things like error(404) pages
+                                Anyone can see this page but it's not linked to anywhere!</p>
 
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index 83aaddb0..62af11b3 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -1,80 +1,80 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>This is a test page</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>This is a test page</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li class="active"><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">This is a test page</h1>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li class="active"><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">This is a test page</h1>
 
-    <p>Just an image.</p>
-<img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
-<img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+                        <p>Just an image.</p>
+                        <img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
+                        <img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index 33866221..1585c0db 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -1,128 +1,128 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>This is a super article !</title>
-        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Multi-line metadata should be supported as well as inline markup." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>This is a super article !</title>
+                <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Multi-line metadata should be supported as well as inline markup." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../../../../../override/">Override url/save_as</a></li>
-                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li class="active"><a href="../../../../../category/yeah.html">yeah</a></li>
-                    <li><a href="../../../../../category/misc.html">misc</a></li>
-                    <li><a href="../../../../../category/cat1.html">cat1</a></li>
-                    <li><a href="../../../../../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../../../../../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
-           title="Permalink to This is a super article !">This is a super article !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../../../../../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../../../../../override/">Override url/save_as</a></li>
+                                <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li class="active"><a href="../../../../../category/yeah.html">yeah</a></li>
+                                <li><a href="../../../../../category/misc.html">misc</a></li>
+                                <li><a href="../../../../../category/cat1.html">cat1</a></li>
+                                <li><a href="../../../../../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../../../../../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                                                   title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                        Published: 02 décembre 2010
+                                                </abbr>
+                                                <br />
+                                                <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                        Updated: 17 novembre 2013
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../../../../../category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="../../../../../tag/foo.html">foo</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->      <p>Some content here !</p>
-<div class="section" id="this-is-a-simple-title">
-<h2>This is a simple title</h2>
-<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="../../../../../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="../../../../../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../../../../../category/yeah.html">yeah</a>.</p>
+                                                <p>tags: <a href="../../../../../tag/foo.html">foo</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/foobar.html">foobar</a> </p>
+                                        </footer><!-- /.post-info -->      <p>Some content here !</p>
+                                        <div class="section" id="this-is-a-simple-title">
+                                                <h2>This is a simple title</h2>
+                                                <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+                                                <img alt="alternate text" src="../../../../../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                <img alt="alternate text" src="../../../../../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
 </pre>
-<p>→ And now try with some utf8 hell: ééé</p>
-</div>
+                                                <p>→ And now try with some utf8 hell: ééé</p>
+                                        </div>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'posts/2010/décembre/02/this-is-a-super-article/';
-        var disqus_url = '../../../../../posts/2010/décembre/02/this-is-a-super-article/';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'posts/2010/décembre/02/this-is-a-super-article/';
+                                                var disqus_url = '../../../../../posts/2010/décembre/02/this-is-a-super-article/';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index ef9994c6..3a9a3f5e 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -1,145 +1,145 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Unbelievable !</title>
-        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Unbelievable !</title>
+                <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Or completely awesome. Depends the needs. a root-relative link to markdown-article a file-relative link to markdown-article Testing sourcecode..." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../../../../../override/">Override url/save_as</a></li>
-                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="../../../../../category/misc.html">misc</a></li>
-                    <li><a href="../../../../../category/cat1.html">cat1</a></li>
-                    <li><a href="../../../../../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../../../../../posts/2010/octobre/15/unbelievable/" rel="bookmark"
-           title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../../../../../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../../../../../override/">Override url/save_as</a></li>
+                                <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="../../../../../category/misc.html">misc</a></li>
+                                <li><a href="../../../../../category/cat1.html">cat1</a></li>
+                                <li><a href="../../../../../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../../../../../posts/2010/octobre/15/unbelievable/" rel="bookmark"
+                                                   title="Permalink to Unbelievable !">Unbelievable !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-15T20:30:00+02:00">
-                Published: 15 octobre 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-10-15T20:30:00+02:00">
+                                                        Published: 15 octobre 2010
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../../../../../category/misc.html">misc</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../../../../../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
-<p><a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
-<a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
-<div class="section" id="testing-sourcecode-directive">
-<h2>Testing sourcecode directive</h2>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                        </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
+                                        <p><a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+                                                <a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a file-relative link to markdown-article</a></p>
+                                        <div class="section" id="testing-sourcecode-directive">
+                                                <h2>Testing sourcecode directive</h2>
+                                                <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-</div>
-<div class="section" id="testing-another-case">
-<h2>Testing another case</h2>
-<p>This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will have nothing in default.</p>
-<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                        </div>
+                                        <div class="section" id="testing-another-case">
+                                                <h2>Testing another case</h2>
+                                                <p>This will now have a line number in 'custom' since it's the default in
+                                                        pelican.conf, it will have nothing in default.</p>
+                                                <div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span></pre></div></td><td class="code"><div><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div></td></tr></table></div>
-<p>Lovely.</p>
-</div>
-<div class="section" id="testing-more-sourcecode-directives">
-<h2>Testing more sourcecode directives</h2>
-<div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
-<p>Lovely.</p>
-</div>
-<div class="section" id="testing-even-more-sourcecode-directives">
-<h2>Testing even more sourcecode directives</h2>
-<span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
-<p>Lovely.</p>
-</div>
-<div class="section" id="testing-overriding-config-defaults">
-<h2>Testing overriding config defaults</h2>
-<p>Even if the default is line numbers, we can override it here</p>
-<div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                <p>Lovely.</p>
+                                        </div>
+                                        <div class="section" id="testing-more-sourcecode-directives">
+                                                <h2>Testing more sourcecode directives</h2>
+                                                <div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+                                                <p>Lovely.</p>
+                                        </div>
+                                        <div class="section" id="testing-even-more-sourcecode-directives">
+                                                <h2>Testing even more sourcecode directives</h2>
+                                                <span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
+                                                <p>Lovely.</p>
+                                        </div>
+                                        <div class="section" id="testing-overriding-config-defaults">
+                                                <h2>Testing overriding config defaults</h2>
+                                                <p>Even if the default is line numbers, we can override it here</p>
+                                                <div class="highlight"><pre><span></span><span class="n">formatter</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">options</span> <span class="ow">and</span> <span class="n">VARIANTS</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">options</span><span class="o">.</span><span class="n">keys</span><span class="p">()[</span><span class="mi">0</span><span class="p">]]</span>
 </pre></div>
-<p>Lovely.</p>
-</div>
+                                                <p>Lovely.</p>
+                                        </div>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'posts/2010/octobre/15/unbelievable/';
-        var disqus_url = '../../../../../posts/2010/octobre/15/unbelievable/';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'posts/2010/octobre/15/unbelievable/';
+                                                var disqus_url = '../../../../../posts/2010/octobre/15/unbelievable/';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index 07332310..e39b8b68 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -1,122 +1,122 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Oh yeah !</title>
-        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-      <link rel="alternate" hreflang="fr" href="../../../../../oh-yeah-fr.html">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Oh yeah !</title>
+                <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <link rel="alternate" hreflang="fr" href="../../../../../oh-yeah-fr.html">
 
-        <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" />
-</head>
+                <meta name="description" content="Why not ? After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../../../../../override/">Override url/save_as</a></li>
-                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
-                    <li><a href="../../../../../category/misc.html">misc</a></li>
-                    <li><a href="../../../../../category/cat1.html">cat1</a></li>
-                    <li class="active"><a href="../../../../../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../../../../../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
-           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../../../../../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../../../../../override/">Override url/save_as</a></li>
+                                <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                                <li><a href="../../../../../category/misc.html">misc</a></li>
+                                <li><a href="../../../../../category/cat1.html">cat1</a></li>
+                                <li class="active"><a href="../../../../../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../../../../../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
+                                                   title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                        Published: 20 octobre 2010
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../../../../../category/bar.html">bar</a>.</p>
-<p>tags: <a href="../../../../../tag/oh.html">oh</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../../../../../oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../../../../../category/bar.html">bar</a>.</p>
+                                                <p>tags: <a href="../../../../../tag/oh.html">oh</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/yeah.html">yeah</a> </p>Translations:
+                                                <a href="../../../../../oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->      <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="../../../../../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                        </footer><!-- /.post-info -->      <div class="section" id="why-not">
+                                                <h2>Why not ?</h2>
+                                                <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                        YEAH !</p>
+                                                <img alt="alternate text" src="../../../../../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                        </div>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'posts/2010/octobre/20/oh-yeah/';
-        var disqus_url = '../../../../../posts/2010/octobre/20/oh-yeah/';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'posts/2010/octobre/20/oh-yeah/';
+                                                var disqus_url = '../../../../../posts/2010/octobre/20/oh-yeah/';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 5410e9d1..5f675a3d 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -1,114 +1,114 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>A markdown powered article</title>
-        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>A markdown powered article</title>
+                <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="You're mutually oblivious. a root-relative link to unbelievable a file-relative link to unbelievable" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../../../../../override/">Override url/save_as</a></li>
-                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
-                    <li><a href="../../../../../category/misc.html">misc</a></li>
-                    <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
-                    <li><a href="../../../../../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../../../../../posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
-           title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../../../../../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../../../../../override/">Override url/save_as</a></li>
+                                <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                                <li><a href="../../../../../category/misc.html">misc</a></li>
+                                <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
+                                <li><a href="../../../../../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../../../../../posts/2011/avril/20/a-markdown-powered-article/" rel="bookmark"
+                                                   title="Permalink to A markdown powered article">A markdown powered article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-04-20T00:00:00+02:00">
-                Published: 20 avril 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-04-20T00:00:00+02:00">
+                                                        Published: 20 avril 2011
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
-<p><a href="../../../../../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
-<a href="../../../../../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'posts/2011/avril/20/a-markdown-powered-article/';
-        var disqus_url = '../../../../../posts/2011/avril/20/a-markdown-powered-article/';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                        </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
+                                        <p><a href="../../../../../posts/2010/octobre/15/unbelievable/">a root-relative link to unbelievable</a>
+                                                <a href="../../../../../posts/2010/octobre/15/unbelievable/">a file-relative link to unbelievable</a></p>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'posts/2011/avril/20/a-markdown-powered-article/';
+                                                var disqus_url = '../../../../../posts/2011/avril/20/a-markdown-powered-article/';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index d4afa8b2..05dc2de6 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -1,113 +1,113 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Article 1</title>
-        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Article 1" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Article 1</title>
+                <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Article 1" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../../../../../override/">Override url/save_as</a></li>
-                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
-                    <li><a href="../../../../../category/misc.html">misc</a></li>
-                    <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
-                    <li><a href="../../../../../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../../../../../posts/2011/février/17/article-1/" rel="bookmark"
-           title="Permalink to Article 1">Article 1</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../../../../../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../../../../../override/">Override url/save_as</a></li>
+                                <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                                <li><a href="../../../../../category/misc.html">misc</a></li>
+                                <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
+                                <li><a href="../../../../../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../../../../../posts/2011/février/17/article-1/" rel="bookmark"
+                                                   title="Permalink to Article 1">Article 1</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                        Published: 17 février 2011
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Article 1</p>
+                                        </footer><!-- /.post-info -->      <p>Article 1</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'posts/2011/février/17/article-1/';
-        var disqus_url = '../../../../../posts/2011/février/17/article-1/';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'posts/2011/février/17/article-1/';
+                                                var disqus_url = '../../../../../posts/2011/février/17/article-1/';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index 2d849548..40d59bb2 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -1,113 +1,113 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Article 2</title>
-        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Article 2" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Article 2</title>
+                <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Article 2" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../../../../../override/">Override url/save_as</a></li>
-                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
-                    <li><a href="../../../../../category/misc.html">misc</a></li>
-                    <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
-                    <li><a href="../../../../../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../../../../../posts/2011/février/17/article-2/" rel="bookmark"
-           title="Permalink to Article 2">Article 2</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../../../../../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../../../../../override/">Override url/save_as</a></li>
+                                <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                                <li><a href="../../../../../category/misc.html">misc</a></li>
+                                <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
+                                <li><a href="../../../../../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../../../../../posts/2011/février/17/article-2/" rel="bookmark"
+                                                   title="Permalink to Article 2">Article 2</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                        Published: 17 février 2011
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Article 2</p>
+                                        </footer><!-- /.post-info -->      <p>Article 2</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'posts/2011/février/17/article-2/';
-        var disqus_url = '../../../../../posts/2011/février/17/article-2/';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'posts/2011/février/17/article-2/';
+                                                var disqus_url = '../../../../../posts/2011/février/17/article-2/';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index c6b03cc2..bec205f8 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -1,113 +1,113 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Article 3</title>
-        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Article 3" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Article 3</title>
+                <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Article 3" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../../../../../override/">Override url/save_as</a></li>
-                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
-                    <li><a href="../../../../../category/misc.html">misc</a></li>
-                    <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
-                    <li><a href="../../../../../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../../../../../posts/2011/février/17/article-3/" rel="bookmark"
-           title="Permalink to Article 3">Article 3</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../../../../../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../../../../../override/">Override url/save_as</a></li>
+                                <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                                <li><a href="../../../../../category/misc.html">misc</a></li>
+                                <li class="active"><a href="../../../../../category/cat1.html">cat1</a></li>
+                                <li><a href="../../../../../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../../../../../posts/2011/février/17/article-3/" rel="bookmark"
+                                                   title="Permalink to Article 3">Article 3</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2011-02-17T00:00:00+01:00">
-                Published: 17 février 2011
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2011-02-17T00:00:00+01:00">
+                                                        Published: 17 février 2011
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../../../../../category/cat1.html">cat1</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Article 3</p>
+                                        </footer><!-- /.post-info -->      <p>Article 3</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'posts/2011/février/17/article-3/';
-        var disqus_url = '../../../../../posts/2011/février/17/article-3/';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'posts/2011/février/17/article-3/';
+                                                var disqus_url = '../../../../../posts/2011/février/17/article-3/';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index a5a12bc9..0f1a40c2 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -1,117 +1,117 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Second article</title>
-        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-      <link rel="alternate" hreflang="fr" href="../../../../../second-article-fr.html">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Second article</title>
+                <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <link rel="alternate" hreflang="fr" href="../../../../../second-article-fr.html">
 
-        <meta name="description" content="This is some article, in english" />
-</head>
+                <meta name="description" content="This is some article, in english" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../../../../../override/">Override url/save_as</a></li>
-                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="../../../../../category/misc.html">misc</a></li>
-                    <li><a href="../../../../../category/cat1.html">cat1</a></li>
-                    <li><a href="../../../../../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../../../../../posts/2012/février/29/second-article/" rel="bookmark"
-           title="Permalink to Second article">Second article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../../../../../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../../../../../override/">Override url/save_as</a></li>
+                                <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="../../../../../category/misc.html">misc</a></li>
+                                <li><a href="../../../../../category/cat1.html">cat1</a></li>
+                                <li><a href="../../../../../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../../../../../posts/2012/février/29/second-article/" rel="bookmark"
+                                                   title="Permalink to Second article">Second article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                        Published: 29 février 2012
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../../../../../category/misc.html">misc</a>.</p>
-<p>tags: <a href="../../../../../tag/foo.html">foo</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/baz.html">baz</a> </p>Translations:
-        <a href="../../../../../second-article-fr.html" hreflang="fr">fr</a>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../../../../../category/misc.html">misc</a>.</p>
+                                                <p>tags: <a href="../../../../../tag/foo.html">foo</a> <a href="../../../../../tag/bar.html">bar</a> <a href="../../../../../tag/baz.html">baz</a> </p>Translations:
+                                                <a href="../../../../../second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->      <p>This is some article, in english</p>
+                                        </footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'posts/2012/février/29/second-article/';
-        var disqus_url = '../../../../../posts/2012/février/29/second-article/';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'posts/2012/février/29/second-article/';
+                                                var disqus_url = '../../../../../posts/2012/février/29/second-article/';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 848a0431..6f200a7b 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -1,113 +1,113 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>FILENAME_METADATA example</title>
-        <link rel="stylesheet" href="../../../../../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="Some cool stuff!" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>FILENAME_METADATA example</title>
+                <link rel="stylesheet" href="../../../../../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="Some cool stuff!" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../../../../../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../../../../../override/">Override url/save_as</a></li>
-                    <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../../../../../category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="../../../../../category/misc.html">misc</a></li>
-                    <li><a href="../../../../../category/cat1.html">cat1</a></li>
-                    <li><a href="../../../../../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../../../../../posts/2012/novembre/30/filename_metadata-example/" rel="bookmark"
-           title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../../../../../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../../../../../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../../../../../override/">Override url/save_as</a></li>
+                                <li><a href="../../../../../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../../../../../category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="../../../../../category/misc.html">misc</a></li>
+                                <li><a href="../../../../../category/cat1.html">cat1</a></li>
+                                <li><a href="../../../../../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../../../../../posts/2012/novembre/30/filename_metadata-example/" rel="bookmark"
+                                                   title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-11-30T00:00:00+01:00">
-                Published: 30 novembre 2012
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2012-11-30T00:00:00+01:00">
+                                                        Published: 30 novembre 2012
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../../../../../category/misc.html">misc</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../../../../../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>Some cool stuff!</p>
+                                        </footer><!-- /.post-info -->      <p>Some cool stuff!</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'posts/2012/novembre/30/filename_metadata-example/';
-        var disqus_url = '../../../../../posts/2012/novembre/30/filename_metadata-example/';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'posts/2012/novembre/30/filename_metadata-example/';
+                                                var disqus_url = '../../../../../posts/2012/novembre/30/filename_metadata-example/';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 51ee3977..704b5d52 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -1,117 +1,117 @@
 <!DOCTYPE html>
 <html lang="fr">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Deuxième article</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-      <link rel="alternate" hreflang="en" href="./posts/2012/février/29/second-article/">
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Deuxième article</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <link rel="alternate" hreflang="en" href="./posts/2012/février/29/second-article/">
 
-        <meta name="description" content="Ceci est un article, en français." />
-</head>
+                <meta name="description" content="Ceci est un article, en français." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="./second-article-fr.html" rel="bookmark"
-           title="Permalink to Deuxième article">Deuxième article</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="./second-article-fr.html" rel="bookmark"
+                                                   title="Permalink to Deuxième article">Deuxième article</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                        Published: 29 février 2012
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="./category/misc.html">misc</a>.</p>
-<p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
-        <a href="./posts/2012/février/29/second-article/" hreflang="en">en</a>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="./category/misc.html">misc</a>.</p>
+                                                <p>tags: <a href="./tag/foo.html">foo</a> <a href="./tag/bar.html">bar</a> <a href="./tag/baz.html">baz</a> </p>Translations:
+                                                <a href="./posts/2012/février/29/second-article/" hreflang="en">en</a>
 
-</footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
+                                        </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'second-article-fr.html';
-        var disqus_url = './second-article-fr.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'second-article-fr.html';
+                                                var disqus_url = './second-article-fr.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index a4bda96f..96142e9c 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -1,155 +1,155 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - bar</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - bar</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                Published: 29 février 2012
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html" hreflang="fr">fr</a>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/misc.html">misc</a>.</p>
+                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+                                        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>This is some article, in english</p>
+                                <p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                                                       title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                                Published: 02 décembre 2010
+                                                        </abbr>
+                                                        <br />
+                                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                                Updated: 17 novembre 2013
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/yeah.html">yeah</a>.</p>
+                                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+                                                </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+                                                        as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
+                                                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+                                                <p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
-                           title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2010/octobre/20/oh-yeah/" rel="bookmark"
+                                                       title="Permalink to Oh yeah !">Oh yeah !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                                Published: 20 octobre 2010
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/bar.html">bar</a>.</p>
-<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/bar.html">bar</a>.</p>
+                                                        <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+                                                        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info -->                <div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
+                                                </footer><!-- /.post-info -->                <div class="section" id="why-not">
+                                                        <h2>Why not ?</h2>
+                                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                                YEAH !</p>
+                                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                                </div>
 
-                <a class="readmore" href="../posts/2010/octobre/20/oh-yeah/">read more</a>
-<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="../posts/2010/octobre/20/oh-yeah/">read more</a>
+                                                <p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index a27bc92e..e43246e3 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -1,113 +1,113 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>The baz tag</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        <meta name="description" content="This article overrides the listening of the articles under the baz tag." />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>The baz tag</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+                <meta name="description" content="This article overrides the listening of the articles under the baz tag." />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="../tag/baz.html" rel="bookmark"
-           title="Permalink to The baz tag">The baz tag</a></h1>
-    </header>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li class="active"><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <article>
+                                <header>
+                                        <h1 class="entry-title">
+                                                <a href="../tag/baz.html" rel="bookmark"
+                                                   title="Permalink to The baz tag">The baz tag</a></h1>
+                                </header>
 
-    <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-03-14T00:00:00+01:00">
-                Published: 14 mars 2010
-        </abbr>
+                                <div class="entry-content">
+                                        <footer class="post-info">
+                                                <abbr class="published" title="2010-03-14T00:00:00+01:00">
+                                                        Published: 14 mars 2010
+                                                </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
+                                                <address class="vcard author">
+                                                        By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                </address>
+                                                <p>In <a href="../category/misc.html">misc</a>.</p>
 
-</footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
+                                        </footer><!-- /.post-info -->      <p>This article overrides the listening of the articles under the <em>baz</em> tag.</p>
 
-    </div><!-- /.entry-content -->
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = 'blog-notmyidea';
-        var disqus_identifier = 'tag/baz.html';
-        var disqus_url = '../tag/baz.html';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
+                                </div><!-- /.entry-content -->
+                                <div class="comments">
+                                        <h2>Comments !</h2>
+                                        <div id="disqus_thread"></div>
+                                        <script type="text/javascript">
+                                                var disqus_shortname = 'blog-notmyidea';
+                                                var disqus_identifier = 'tag/baz.html';
+                                                var disqus_url = '../tag/baz.html';
+                                                (function() {
+                                                        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                                                        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
+                                                        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                                                })();
+                                        </script>
+                                        <noscript>Please enable JavaScript to view the comments.</noscript>
+                                </div>
 
-  </article>
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                        </article>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 736fa5b8..e80d2340 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -1,125 +1,125 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - foo</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - foo</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2012-02-29T00:00:00+01:00">
-                Published: 29 février 2012
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2012-02-29T00:00:00+01:00">
+                                                Published: 29 février 2012
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/misc.html">misc</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
-        <a href="../second-article-fr.html" hreflang="fr">fr</a>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/misc.html">misc</a>.</p>
+                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/baz.html">baz</a> </p>Translations:
+                                        <a href="../second-article-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><p>This is some article, in english</p>
-<p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
+                                </footer><!-- /.post-info --><p>This is some article, in english</p>
+                                <p>There are <a href="../posts/2012/février/29/second-article/#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
                 <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
 
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
-                           title="Permalink to This is a super article !">This is a super article !</a></h1>
-                </header>
+                                <li><article class="hentry">
+                                        <header>
+                                                <h1><a href="../posts/2010/décembre/02/this-is-a-super-article/" rel="bookmark"
+                                                       title="Permalink to This is a super article !">This is a super article !</a></h1>
+                                        </header>
 
-                <div class="entry-content">
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
-        </abbr>
+                                        <div class="entry-content">
+                                                <footer class="post-info">
+                                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                                Published: 02 décembre 2010
+                                                        </abbr>
+                                                        <br />
+                                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                                Updated: 17 novembre 2013
+                                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
-as well as <strong>inline markup</strong>.</p>
+                                                        <address class="vcard author">
+                                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                                        </address>
+                                                        <p>In <a href="../category/yeah.html">yeah</a>.</p>
+                                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+                                                </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
+                                                        as well as <strong>inline markup</strong>.</p>
 
-                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
-<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
-            </article></li>
-                </ol><!-- /#posts-list -->
+                                                <a class="readmore" href="../posts/2010/décembre/02/this-is-a-super-article/">read more</a>
+                                                <p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+                                </article></li>
+                        </ol><!-- /#posts-list -->
                 </section><!-- /#content -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 93757930..a1169a88 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -1,104 +1,104 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - foobar</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - foobar</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-12-02T10:14:00+01:00">
-                Published: 02 décembre 2010
-        </abbr>
-		<br />
-        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
-                Updated: 17 novembre 2013
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-12-02T10:14:00+01:00">
+                                                Published: 02 décembre 2010
+                                        </abbr>
+                                        <br />
+                                        <abbr class="modified" title="2013-11-17T23:29:00+01:00">
+                                                Updated: 17 novembre 2013
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/yeah.html">yeah</a>.</p>
-<p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
-</footer><!-- /.post-info --><p>Some content here !</p>
-<div class="section" id="this-is-a-simple-title">
-<h2>This is a simple title</h2>
-<p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-<img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/yeah.html">yeah</a>.</p>
+                                        <p>tags: <a href="../tag/foo.html">foo</a> <a href="../tag/bar.html">bar</a> <a href="../tag/foobar.html">foobar</a> </p>
+                                </footer><!-- /.post-info --><p>Some content here !</p>
+                                <div class="section" id="this-is-a-simple-title">
+                                        <h2>This is a simple title</h2>
+                                        <p>And here comes the cool <a class="reference external" href="http://books.couchdb.org/relax/design-documents/views">stuff</a>.</p>
+                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                        <img alt="alternate text" src="../pictures/Sushi_Macro.jpg" style="width: 600px; height: 450px;" />
 <pre class="literal-block">
 &gt;&gt;&gt; from ipdb import set_trace
 &gt;&gt;&gt; set_trace()
 </pre>
-<p>→ And now try with some utf8 hell: ééé</p>
-</div>
-<p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                                        <p>→ And now try with some utf8 hell: ééé</p>
+                                </div>
+                                <p>There are <a href="../posts/2010/décembre/02/this-is-a-super-article/#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index 1e583e7e..07c2542f 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -1,78 +1,78 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Oh Oh Oh</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Oh Oh Oh</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li class="active"><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
-<section id="content" class="body">
-    <h1 class="entry-title">Oh Oh Oh</h1>
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li class="active"><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
+                <section id="content" class="body">
+                        <h1 class="entry-title">Oh Oh Oh</h1>
 
-    <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
+                        <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
-</section>
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 219ab7e7..dabcaf7d 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -1,96 +1,96 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - yeah</title>
-        <link rel="stylesheet" href="../theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - yeah</title>
+                <link rel="stylesheet" href="../theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="../">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="../override/">Override url/save_as</a></li>
-                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="../category/yeah.html">yeah</a></li>
-                    <li><a href="../category/misc.html">misc</a></li>
-                    <li><a href="../category/cat1.html">cat1</a></li>
-                    <li><a href="../category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="../">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="../tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="../override/">Override url/save_as</a></li>
+                                <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="../category/yeah.html">yeah</a></li>
+                                <li><a href="../category/misc.html">misc</a></li>
+                                <li><a href="../category/cat1.html">cat1</a></li>
+                                <li><a href="../category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
-<footer class="post-info">
-        <abbr class="published" title="2010-10-20T10:14:00+02:00">
-                Published: 20 octobre 2010
-        </abbr>
+                <aside id="featured" class="body">
+                        <article>
+                                <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
+                                <footer class="post-info">
+                                        <abbr class="published" title="2010-10-20T10:14:00+02:00">
+                                                Published: 20 octobre 2010
+                                        </abbr>
 
-        <address class="vcard author">
-                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
-        </address>
-<p>In <a href="../category/bar.html">bar</a>.</p>
-<p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
-        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
+                                        <address class="vcard author">
+                                                By                         <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
+                                        </address>
+                                        <p>In <a href="../category/bar.html">bar</a>.</p>
+                                        <p>tags: <a href="../tag/oh.html">oh</a> <a href="../tag/bar.html">bar</a> <a href="../tag/yeah.html">yeah</a> </p>Translations:
+                                        <a href="../oh-yeah-fr.html" hreflang="fr">fr</a>
 
-</footer><!-- /.post-info --><div class="section" id="why-not">
-<h2>Why not ?</h2>
-<p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
-YEAH !</p>
-<img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
-</div>
-<p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
-            </aside><!-- /#featured -->
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
-                        <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                        </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                                </footer><!-- /.post-info --><div class="section" id="why-not">
+                                        <h2>Why not ?</h2>
+                                        <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
+                                                YEAH !</p>
+                                        <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
+                                </div>
+                                <p>There are <a href="../posts/2010/octobre/20/oh-yeah/#disqus_thread">comments</a>.</p>                </article>
+                </aside><!-- /#featured -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index 3e59c960..2ac682b4 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -1,85 +1,85 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>Alexis' log - Tags</title>
-        <link rel="stylesheet" href="./theme/css/main.css" />
-        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-</head>
+        <head>
+                <meta charset="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                <meta name="generator" content="Pelican" />
+                <title>Alexis' log - Tags</title>
+                <link rel="stylesheet" href="./theme/css/main.css" />
+                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+                <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+        </head>
 
-<body id="index" class="home">
-<a href="http://github.com/ametaireau/">
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-</a>
-        <header id="banner" class="body">
-                <h1><a href="./">Alexis' log</a></h1>
-                <nav><ul>
-                    <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
-                    <li><a href="./override/">Override url/save_as</a></li>
-                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                    <li><a href="./category/yeah.html">yeah</a></li>
-                    <li><a href="./category/misc.html">misc</a></li>
-                    <li><a href="./category/cat1.html">cat1</a></li>
-                    <li><a href="./category/bar.html">bar</a></li>
-                </ul></nav>
-        </header><!-- /#banner -->
+        <body id="index" class="home">
+                <a href="http://github.com/ametaireau/">
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                </a>
+                <header id="banner" class="body">
+                        <h1><a href="./">Alexis' log</a></h1>
+                        <nav><ul>
+                                <li><a href="./tag/oh.html">Oh Oh Oh</a></li>
+                                <li><a href="./override/">Override url/save_as</a></li>
+                                <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                                <li><a href="./category/yeah.html">yeah</a></li>
+                                <li><a href="./category/misc.html">misc</a></li>
+                                <li><a href="./category/cat1.html">cat1</a></li>
+                                <li><a href="./category/bar.html">bar</a></li>
+                        </ul></nav>
+                </header><!-- /#banner -->
 
-<section id="content" class="body">
-    <h1>Tags for Alexis' log</h1>
-    <ul>
-        <li><a href="./tag/bar.html">bar</a> (3)</li>
-        <li><a href="./tag/baz.html">baz</a> (1)</li>
-        <li><a href="./tag/foo.html">foo</a> (2)</li>
-        <li><a href="./tag/foobar.html">foobar</a> (1)</li>
-        <li><a href="./tag/oh.html">oh</a> (1)</li>
-        <li><a href="./tag/yeah.html">yeah</a> (1)</li>
-    </ul>
-</section>
-
-        <section id="extras" class="body">
-                <div class="blogroll">
-                        <h2>links</h2>
+                <section id="content" class="body">
+                        <h1>Tags for Alexis' log</h1>
                         <ul>
-                            <li><a href="http://biologeek.org">Biologeek</a></li>
-                            <li><a href="http://filyb.info/">Filyb</a></li>
-                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                <li><a href="./tag/bar.html">bar</a> (3)</li>
+                                <li><a href="./tag/baz.html">baz</a> (1)</li>
+                                <li><a href="./tag/foo.html">foo</a> (2)</li>
+                                <li><a href="./tag/foobar.html">foobar</a> (1)</li>
+                                <li><a href="./tag/oh.html">oh</a> (1)</li>
+                                <li><a href="./tag/yeah.html">yeah</a> (1)</li>
                         </ul>
-                </div><!-- /.blogroll -->
-                <div class="social">
-                        <h2>social</h2>
-                        <ul>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                </section>
 
-                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                            <li><a href="http://github.com/ametaireau">github</a></li>
-                        </ul>
-                </div><!-- /.social -->
-        </section><!-- /#extras -->
+                <section id="extras" class="body">
+                        <div class="blogroll">
+                                <h2>links</h2>
+                                <ul>
+                                        <li><a href="http://biologeek.org">Biologeek</a></li>
+                                        <li><a href="http://filyb.info/">Filyb</a></li>
+                                        <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                                        <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                                        <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                                        <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                                </ul>
+                        </div><!-- /.blogroll -->
+                        <div class="social">
+                                <h2>social</h2>
+                                <ul>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                                        <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                                        <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                                        <li><a href="http://github.com/ametaireau">github</a></li>
+                                </ul>
+                        </div><!-- /.social -->
+                </section><!-- /#extras -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-<script type="text/javascript">
-    var disqus_shortname = 'blog-notmyidea';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
-</body>
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
+
+                <script type="text/javascript">
+                        var disqus_shortname = 'blog-notmyidea';
+                        (function () {
+                                var s = document.createElement('script'); s.async = true;
+                                s.type = 'text/javascript';
+                                s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+                                (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+                        }());
+                </script>
+        </body>
 </html>
diff --git a/pelican/tests/output/custom_locale/theme/css/fonts.css b/pelican/tests/output/custom_locale/theme/css/fonts.css
index 56015076..7c69215e 100644
--- a/pelican/tests/output/custom_locale/theme/css/fonts.css
+++ b/pelican/tests/output/custom_locale/theme/css/fonts.css
@@ -1,12 +1,12 @@
 @font-face {
-	font-family: 'Yanone Kaffeesatz';
-	font-style: normal;
-	font-weight: 400;
-	src:
-		local('Yanone Kaffeesatz Regular'),
-		local('YanoneKaffeesatz-Regular'),
+    font-family: 'Yanone Kaffeesatz';
+    font-style: normal;
+    font-weight: 400;
+    src:
+    local('Yanone Kaffeesatz Regular'),
+    local('YanoneKaffeesatz-Regular'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
-		url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
+    url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
-		url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
+    url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
 }
diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
index 49de03d9..c1d86950 100644
--- a/pelican/tests/output/custom_locale/theme/css/main.css
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -36,9 +36,9 @@ h5 {font-size: 1.143em}	/* 16px */
 h6 {font-size: 1em}		/* 14px */
 
 h1, h2, h3, h4, h5, h6 {
-	font-weight: 400;
-	line-height: 1.1;
-	margin-bottom: .8em;
+    font-weight: 400;
+    line-height: 1.1;
+    margin-bottom: .8em;
     font-family: 'Yanone Kaffeesatz', arial, serif;
 }
 
@@ -50,15 +50,15 @@ hr { border: 2px solid #EEEEEE; }
 a {outline: 0;}
 a img {border: 0px; text-decoration: none;}
 a:link, a:visited {
-	color: #C74350;
-	padding: 0 1px;
-	text-decoration: underline;
+    color: #C74350;
+    padding: 0 1px;
+    text-decoration: underline;
 }
 a:hover, a:active {
-	background-color: #C74350;
-	color: #fff;
-	text-decoration: none;
-	text-shadow: 1px 1px 1px #333;
+    background-color: #C74350;
+    color: #fff;
+    text-decoration: none;
+    text-shadow: 1px 1px 1px #333;
 }
 
 h1 a:hover {
@@ -75,17 +75,17 @@ em, i {font-style: italic;}
 
 /* Lists */
 ul {
-	list-style: outside disc;
-	margin: 0em 0 0 1.5em;
+    list-style: outside disc;
+    margin: 0em 0 0 1.5em;
 }
 
 ol {
-	list-style: outside decimal;
-	margin: 0em 0 0 1.5em;
+    list-style: outside decimal;
+    margin: 0em 0 0 1.5em;
 }
 
 li { margin-top: 0.5em;
-     margin-bottom: 1em; }
+    margin-bottom: 1em; }
 
 .post-info {
     float:right;
@@ -116,34 +116,34 @@ cite {}
 q {}
 
 div.note {
-   float: right;
-   margin: 5px;
-   font-size: 85%;
-   max-width: 300px;
+    float: right;
+    margin: 5px;
+    font-size: 85%;
+    max-width: 300px;
 }
 
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
 
 	/* Thead */
-	thead th {padding: .5em .4em; text-align: left;}
-	thead td {}
+thead th {padding: .5em .4em; text-align: left;}
+thead td {}
 
 	/* Tbody */
-	tbody td {padding: .5em .4em;}
-	tbody th {}
+tbody td {padding: .5em .4em;}
+tbody th {}
 
-	tbody .alt td {}
-	tbody .alt th {}
+tbody .alt td {}
+tbody .alt th {}
 
 	/* Tfoot */
-	tfoot th {}
-	tfoot td {}
+tfoot th {}
+tfoot td {}
 
 /* HTML5 tags */
 header, section, footer,
 aside, nav, article, figure {
-	display: block;
+    display: block;
 }
 
 /***** Layout *****/
@@ -171,95 +171,95 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	Header
 *****************/
 #banner {
-	margin: 0 auto;
-	padding: 0.8em 0 0 0;
+    margin: 0 auto;
+    padding: 0.8em 0 0 0;
 }
 
 	/* Banner */
-	#banner h1 {
-		font-size: 3.571em;
-		line-height: 1.0;
-		margin-bottom: .3em;
-	}
+#banner h1 {
+    font-size: 3.571em;
+    line-height: 1.0;
+    margin-bottom: .3em;
+}
 
-	#banner h1 a:link, #banner h1 a:visited {
-		color: #000305;
-		display: block;
-		font-weight: bold;
-		margin: 0 0 0 .2em;
-		text-decoration: none;
-	}
-	#banner h1 a:hover, #banner h1 a:active {
-		background: none;
-		color: #C74350;
-		text-shadow: none;
-	}
+#banner h1 a:link, #banner h1 a:visited {
+    color: #000305;
+    display: block;
+    font-weight: bold;
+    margin: 0 0 0 .2em;
+    text-decoration: none;
+}
+#banner h1 a:hover, #banner h1 a:active {
+    background: none;
+    color: #C74350;
+    text-shadow: none;
+}
 
-	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
+#banner h1 strong {font-size: 0.36em; font-weight: normal;}
 
 	/* Main Nav */
-	#banner nav {
-		background: #000305;
-		font-size: 1.143em;
-		overflow: auto;
-		line-height: 30px;
-		margin: 0 auto 2em auto;
-		padding: 0;
-		text-align: center;
-		max-width: 800px;
+#banner nav {
+    background: #000305;
+    font-size: 1.143em;
+    overflow: auto;
+    line-height: 30px;
+    margin: 0 auto 2em auto;
+    padding: 0;
+    text-align: center;
+    max-width: 800px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
 
-	#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
-	#banner nav li {float: left; display: inline; margin: 0;}
+#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
+#banner nav li {float: left; display: inline; margin: 0;}
 
-	#banner nav a:link, #banner nav a:visited {
-		color: #fff;
-		display: inline-block;
-		height: 30px;
-		padding: 5px 1.5em;
-		text-decoration: none;
-	}
-	#banner nav a:hover, #banner nav a:active,
-	#banner nav .active a:link, #banner nav .active a:visited {
-		background: #C74451;
-		color: #fff;
-		text-shadow: none !important;
-	}
+#banner nav a:link, #banner nav a:visited {
+    color: #fff;
+    display: inline-block;
+    height: 30px;
+    padding: 5px 1.5em;
+    text-decoration: none;
+}
+#banner nav a:hover, #banner nav a:active,
+#banner nav .active a:link, #banner nav .active a:visited {
+    background: #C74451;
+    color: #fff;
+    text-shadow: none !important;
+}
 
-	#banner nav li:first-child a {
-		border-top-left-radius: 5px;
-		-moz-border-radius-topleft: 5px;
-		-webkit-border-top-left-radius: 5px;
+#banner nav li:first-child a {
+    border-top-left-radius: 5px;
+    -moz-border-radius-topleft: 5px;
+    -webkit-border-top-left-radius: 5px;
 
-		border-bottom-left-radius: 5px;
-		-moz-border-radius-bottomleft: 5px;
-		-webkit-border-bottom-left-radius: 5px;
-	}
+    border-bottom-left-radius: 5px;
+    -moz-border-radius-bottomleft: 5px;
+    -webkit-border-bottom-left-radius: 5px;
+}
 
 /*
 	Featured
 *****************/
 #featured {
-	background: #fff;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px;
-	max-width: 760px;
+    background: #fff;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 #featured figure {
-	border: 2px solid #eee;
-	float: right;
-	margin: 0.786em 2em 0 5em;
-	max-width: 248px;
+    border: 2px solid #eee;
+    float: right;
+    margin: 0.786em 2em 0 5em;
+    max-width: 248px;
 }
 #featured figure img {display: block; float: right;}
 
@@ -273,15 +273,15 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	Body
 *****************/
 #content {
-	background: #fff;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px 20px;
-	max-width: 760px;
+    background: #fff;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px 20px;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 /*
@@ -292,51 +292,51 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 #extras ul {list-style: none; margin: 0;}
 #extras li {border-bottom: 1px solid #fff;}
 #extras h2 {
-	color: #C74350;
-	font-size: 1.429em;
-	margin-bottom: .25em;
-	padding: 0 3px;
+    color: #C74350;
+    font-size: 1.429em;
+    margin-bottom: .25em;
+    padding: 0 3px;
 }
 
 #extras a:link, #extras a:visited {
-	color: #444;
-	display: block;
-	border-bottom: 1px solid #F4E3E3;
-	text-decoration: none;
-	padding: .3em .25em;
+    color: #444;
+    display: block;
+    border-bottom: 1px solid #F4E3E3;
+    text-decoration: none;
+    padding: .3em .25em;
 }
 
 #extras a:hover, #extras a:active {color: #fff;}
 
 	/* Blogroll */
-	#extras .blogroll {
-		float: left;
-		max-width: 615px;
-	}
+#extras .blogroll {
+    float: left;
+    max-width: 615px;
+}
 
-	#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
+#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
 
 	/* Social */
-	#extras .social {
-		float: right;
-		max-width: 175px;
-	}
+#extras .social {
+    float: right;
+    max-width: 175px;
+}
 
 /*
 	About
 *****************/
 #about {
-	background: #fff;
-	font-style: normal;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px;
-	text-align: left;
-	max-width: 760px;
+    background: #fff;
+    font-style: normal;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px;
+    text-align: left;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 #about .primary {float: left; max-width: 165px;}
@@ -355,10 +355,10 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 /***** Sections *****/
 /* Blog */
 .hentry {
-	display: block;
-	clear: both;
-	border-top: 1px solid #eee;
-	padding: 1.5em 0;
+    display: block;
+    clear: both;
+    border-top: 1px solid #eee;
+    padding: 1.5em 0;
 }
 li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 #content > .hentry {padding: 1em 0;}
@@ -370,70 +370,70 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 .hentry .post-info * {font-style: normal;}
 
 	/* Content */
-	.hentry footer {margin-bottom: 2em;}
-	.hentry footer address {display: inline;}
-	#posts-list footer address {display: block;}
+.hentry footer {margin-bottom: 2em;}
+.hentry footer address {display: inline;}
+#posts-list footer address {display: block;}
 
 	/* Blog Index */
-	#posts-list {list-style: none; margin: 0;}
-	#posts-list .hentry {padding-left: 10px; position: relative;}
+#posts-list {list-style: none; margin: 0;}
+#posts-list .hentry {padding-left: 10px; position: relative;}
 
-	#posts-list footer {
-		left: 10px;
-		position: relative;
-        float: left;
-		top: 0.5em;
-		max-width: 190px;
-	}
+#posts-list footer {
+    left: 10px;
+    position: relative;
+    float: left;
+    top: 0.5em;
+    max-width: 190px;
+}
 
 	/* About the Author */
-	#about-author {
-		background: #f9f9f9;
-		clear: both;
-		font-style: normal;
-		margin: 2em 0;
-		padding: 10px 20px 15px 20px;
+#about-author {
+    background: #f9f9f9;
+    clear: both;
+    font-style: normal;
+    margin: 2em 0;
+    padding: 10px 20px 15px 20px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
 
-	#about-author strong {
-		color: #C64350;
-		clear: both;
-		display: block;
-		font-size: 1.429em;
-	}
+#about-author strong {
+    color: #C64350;
+    clear: both;
+    display: block;
+    font-size: 1.429em;
+}
 
-	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
+#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
 
 	/* Comments */
-	#comments-list {list-style: none; margin: 0 1em;}
-	#comments-list blockquote {
-		background: #f8f8f8;
-		clear: both;
-		font-style: normal;
-		margin: 0;
-		padding: 15px 20px;
+#comments-list {list-style: none; margin: 0 1em;}
+#comments-list blockquote {
+    background: #f8f8f8;
+    clear: both;
+    font-style: normal;
+    margin: 0;
+    padding: 15px 20px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
-	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
 
-	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
+#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
 
 	/* Add a Comment */
-	#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
-	#add-comment input[type='text'],
-	#add-comment input[type='email'],
-	#add-comment input[type='url'] {float: left; max-width: 200px;}
+#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
+#add-comment input[type='text'],
+#add-comment input[type='email'],
+#add-comment input[type='url'] {float: left; max-width: 200px;}
 
-	#add-comment textarea {float: left; height: 150px; max-width: 495px;}
+#add-comment textarea {float: left; height: 150px; max-width: 495px;}
 
-	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
+#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
 
-	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
-	#add-comment * {margin-bottom: .5em;}
+#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
+#add-comment * {margin-bottom: .5em;}
diff --git a/pelican/tests/output/custom_locale/theme/css/pygment.css b/pelican/tests/output/custom_locale/theme/css/pygment.css
index fdd056f6..a3877a83 100644
--- a/pelican/tests/output/custom_locale/theme/css/pygment.css
+++ b/pelican/tests/output/custom_locale/theme/css/pygment.css
@@ -1,205 +1,205 @@
 .hll {
-background-color:#eee;
+    background-color:#eee;
 }
 .c {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .err {
-border:1px solid #FF0000;
+    border:1px solid #FF0000;
 }
 .k {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .o {
-color:#666666;
+    color:#666666;
 }
 .cm {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .cp {
-color:#007020;
+    color:#007020;
 }
 .c1 {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .cs {
-background-color:#FFF0F0;
-color:#408090;
+    background-color:#FFF0F0;
+    color:#408090;
 }
 .gd {
-color:#A00000;
+    color:#A00000;
 }
 .ge {
-font-style:italic;
+    font-style:italic;
 }
 .gr {
-color:#FF0000;
+    color:#FF0000;
 }
 .gh {
-color:#000080;
-font-weight:bold;
+    color:#000080;
+    font-weight:bold;
 }
 .gi {
-color:#00A000;
+    color:#00A000;
 }
 .go {
-color:#303030;
+    color:#303030;
 }
 .gp {
-color:#C65D09;
-font-weight:bold;
+    color:#C65D09;
+    font-weight:bold;
 }
 .gs {
-font-weight:bold;
+    font-weight:bold;
 }
 .gu {
-color:#800080;
-font-weight:bold;
+    color:#800080;
+    font-weight:bold;
 }
 .gt {
-color:#0040D0;
+    color:#0040D0;
 }
 .kc {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kd {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kn {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kp {
-color:#007020;
+    color:#007020;
 }
 .kr {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kt {
-color:#902000;
+    color:#902000;
 }
 .m {
-color:#208050;
+    color:#208050;
 }
 .s {
-color:#4070A0;
+    color:#4070A0;
 }
 .na {
-color:#4070A0;
+    color:#4070A0;
 }
 .nb {
-color:#007020;
+    color:#007020;
 }
 .nc {
-color:#0E84B5;
-font-weight:bold;
+    color:#0E84B5;
+    font-weight:bold;
 }
 .no {
-color:#60ADD5;
+    color:#60ADD5;
 }
 .nd {
-color:#555555;
-font-weight:bold;
+    color:#555555;
+    font-weight:bold;
 }
 .ni {
-color:#D55537;
-font-weight:bold;
+    color:#D55537;
+    font-weight:bold;
 }
 .ne {
-color:#007020;
+    color:#007020;
 }
 .nf {
-color:#06287E;
+    color:#06287E;
 }
 .nl {
-color:#002070;
-font-weight:bold;
+    color:#002070;
+    font-weight:bold;
 }
 .nn {
-color:#0E84B5;
-font-weight:bold;
+    color:#0E84B5;
+    font-weight:bold;
 }
 .nt {
-color:#062873;
-font-weight:bold;
+    color:#062873;
+    font-weight:bold;
 }
 .nv {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .ow {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .w {
-color:#BBBBBB;
+    color:#BBBBBB;
 }
 .mf {
-color:#208050;
+    color:#208050;
 }
 .mh {
-color:#208050;
+    color:#208050;
 }
 .mi {
-color:#208050;
+    color:#208050;
 }
 .mo {
-color:#208050;
+    color:#208050;
 }
 .sb {
-color:#4070A0;
+    color:#4070A0;
 }
 .sc {
-color:#4070A0;
+    color:#4070A0;
 }
 .sd {
-color:#4070A0;
-font-style:italic;
+    color:#4070A0;
+    font-style:italic;
 }
 .s2 {
-color:#4070A0;
+    color:#4070A0;
 }
 .se {
-color:#4070A0;
-font-weight:bold;
+    color:#4070A0;
+    font-weight:bold;
 }
 .sh {
-color:#4070A0;
+    color:#4070A0;
 }
 .si {
-color:#70A0D0;
-font-style:italic;
+    color:#70A0D0;
+    font-style:italic;
 }
 .sx {
-color:#C65D09;
+    color:#C65D09;
 }
 .sr {
-color:#235388;
+    color:#235388;
 }
 .s1 {
-color:#4070A0;
+    color:#4070A0;
 }
 .ss {
-color:#517918;
+    color:#517918;
 }
 .bp {
-color:#007020;
+    color:#007020;
 }
 .vc {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .vg {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .vi {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .il {
-color:#208050;
+    color:#208050;
 }
diff --git a/pelican/tests/output/custom_locale/theme/css/reset.css b/pelican/tests/output/custom_locale/theme/css/reset.css
index f5123cf6..10b3fde2 100644
--- a/pelican/tests/output/custom_locale/theme/css/reset.css
+++ b/pelican/tests/output/custom_locale/theme/css/reset.css
@@ -15,13 +15,13 @@ b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td {
-	background: transparent;
-	border: 0;
-	font-size: 100%;
-	margin: 0;
-	outline: 0;
-	padding: 0;
-	vertical-align: baseline;
+    background: transparent;
+    border: 0;
+    font-size: 100%;
+    margin: 0;
+    outline: 0;
+    padding: 0;
+    vertical-align: baseline;
 }
 
 body {line-height: 1;}
@@ -32,13 +32,13 @@ blockquote, q {quotes: none;}
 
 blockquote:before, blockquote:after,
 q:before, q:after {
-	content: '';
-	content: none;
+    content: '';
+    content: none;
 }
 
 /* remember to define focus styles! */
 :focus {
-	outline: 0;
+    outline: 0;
 }
 
 /* remember to highlight inserts somehow! */
@@ -47,6 +47,6 @@ del {text-decoration: line-through;}
 
 /* tables still need 'cellspacing="0"' in the markup */
 table {
-	border-collapse: collapse;
-	border-spacing: 0;
+    border-collapse: collapse;
+    border-spacing: 0;
 }
diff --git a/pelican/tests/output/custom_locale/theme/fonts/font.css b/pelican/tests/output/custom_locale/theme/fonts/font.css
index a9eb87e6..cf623603 100644
--- a/pelican/tests/output/custom_locale/theme/fonts/font.css
+++ b/pelican/tests/output/custom_locale/theme/fonts/font.css
@@ -1,12 +1,12 @@
 @font-face {
-	font-family: 'Yanone Kaffeesatz';
-	font-style: normal;
-	font-weight: 400;
-	src:
-		local('Yanone Kaffeesatz Regular'),
-		local('YanoneKaffeesatz-Regular'),
+    font-family: 'Yanone Kaffeesatz';
+    font-style: normal;
+    font-weight: 400;
+    src:
+    local('Yanone Kaffeesatz Regular'),
+    local('YanoneKaffeesatz-Regular'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
-		url('Yanone_Kaffeesatz_400.woff') format('woff'),
+    url('Yanone_Kaffeesatz_400.woff') format('woff'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
-		url('Yanone_Kaffeesatz_400.woff2') format('woff2');
+    url('Yanone_Kaffeesatz_400.woff2') format('woff2');
 }
diff --git a/pelican/themes/notmyidea/static/css/fonts.css b/pelican/themes/notmyidea/static/css/fonts.css
index 56015076..7c69215e 100644
--- a/pelican/themes/notmyidea/static/css/fonts.css
+++ b/pelican/themes/notmyidea/static/css/fonts.css
@@ -1,12 +1,12 @@
 @font-face {
-	font-family: 'Yanone Kaffeesatz';
-	font-style: normal;
-	font-weight: 400;
-	src:
-		local('Yanone Kaffeesatz Regular'),
-		local('YanoneKaffeesatz-Regular'),
+    font-family: 'Yanone Kaffeesatz';
+    font-style: normal;
+    font-weight: 400;
+    src:
+    local('Yanone Kaffeesatz Regular'),
+    local('YanoneKaffeesatz-Regular'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
-		url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
+    url('../fonts/Yanone_Kaffeesatz_400.woff') format('woff'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
-		url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
+    url('../fonts/Yanone_Kaffeesatz_400.woff2') format('woff2');
 }
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 49de03d9..c1d86950 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -36,9 +36,9 @@ h5 {font-size: 1.143em}	/* 16px */
 h6 {font-size: 1em}		/* 14px */
 
 h1, h2, h3, h4, h5, h6 {
-	font-weight: 400;
-	line-height: 1.1;
-	margin-bottom: .8em;
+    font-weight: 400;
+    line-height: 1.1;
+    margin-bottom: .8em;
     font-family: 'Yanone Kaffeesatz', arial, serif;
 }
 
@@ -50,15 +50,15 @@ hr { border: 2px solid #EEEEEE; }
 a {outline: 0;}
 a img {border: 0px; text-decoration: none;}
 a:link, a:visited {
-	color: #C74350;
-	padding: 0 1px;
-	text-decoration: underline;
+    color: #C74350;
+    padding: 0 1px;
+    text-decoration: underline;
 }
 a:hover, a:active {
-	background-color: #C74350;
-	color: #fff;
-	text-decoration: none;
-	text-shadow: 1px 1px 1px #333;
+    background-color: #C74350;
+    color: #fff;
+    text-decoration: none;
+    text-shadow: 1px 1px 1px #333;
 }
 
 h1 a:hover {
@@ -75,17 +75,17 @@ em, i {font-style: italic;}
 
 /* Lists */
 ul {
-	list-style: outside disc;
-	margin: 0em 0 0 1.5em;
+    list-style: outside disc;
+    margin: 0em 0 0 1.5em;
 }
 
 ol {
-	list-style: outside decimal;
-	margin: 0em 0 0 1.5em;
+    list-style: outside decimal;
+    margin: 0em 0 0 1.5em;
 }
 
 li { margin-top: 0.5em;
-     margin-bottom: 1em; }
+    margin-bottom: 1em; }
 
 .post-info {
     float:right;
@@ -116,34 +116,34 @@ cite {}
 q {}
 
 div.note {
-   float: right;
-   margin: 5px;
-   font-size: 85%;
-   max-width: 300px;
+    float: right;
+    margin: 5px;
+    font-size: 85%;
+    max-width: 300px;
 }
 
 /* Tables */
 table {margin: .5em auto 1.5em auto; width: 98%;}
 
 	/* Thead */
-	thead th {padding: .5em .4em; text-align: left;}
-	thead td {}
+thead th {padding: .5em .4em; text-align: left;}
+thead td {}
 
 	/* Tbody */
-	tbody td {padding: .5em .4em;}
-	tbody th {}
+tbody td {padding: .5em .4em;}
+tbody th {}
 
-	tbody .alt td {}
-	tbody .alt th {}
+tbody .alt td {}
+tbody .alt th {}
 
 	/* Tfoot */
-	tfoot th {}
-	tfoot td {}
+tfoot th {}
+tfoot td {}
 
 /* HTML5 tags */
 header, section, footer,
 aside, nav, article, figure {
-	display: block;
+    display: block;
 }
 
 /***** Layout *****/
@@ -171,95 +171,95 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	Header
 *****************/
 #banner {
-	margin: 0 auto;
-	padding: 0.8em 0 0 0;
+    margin: 0 auto;
+    padding: 0.8em 0 0 0;
 }
 
 	/* Banner */
-	#banner h1 {
-		font-size: 3.571em;
-		line-height: 1.0;
-		margin-bottom: .3em;
-	}
+#banner h1 {
+    font-size: 3.571em;
+    line-height: 1.0;
+    margin-bottom: .3em;
+}
 
-	#banner h1 a:link, #banner h1 a:visited {
-		color: #000305;
-		display: block;
-		font-weight: bold;
-		margin: 0 0 0 .2em;
-		text-decoration: none;
-	}
-	#banner h1 a:hover, #banner h1 a:active {
-		background: none;
-		color: #C74350;
-		text-shadow: none;
-	}
+#banner h1 a:link, #banner h1 a:visited {
+    color: #000305;
+    display: block;
+    font-weight: bold;
+    margin: 0 0 0 .2em;
+    text-decoration: none;
+}
+#banner h1 a:hover, #banner h1 a:active {
+    background: none;
+    color: #C74350;
+    text-shadow: none;
+}
 
-	#banner h1 strong {font-size: 0.36em; font-weight: normal;}
+#banner h1 strong {font-size: 0.36em; font-weight: normal;}
 
 	/* Main Nav */
-	#banner nav {
-		background: #000305;
-		font-size: 1.143em;
-		overflow: auto;
-		line-height: 30px;
-		margin: 0 auto 2em auto;
-		padding: 0;
-		text-align: center;
-		max-width: 800px;
+#banner nav {
+    background: #000305;
+    font-size: 1.143em;
+    overflow: auto;
+    line-height: 30px;
+    margin: 0 auto 2em auto;
+    padding: 0;
+    text-align: center;
+    max-width: 800px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
 
-	#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
-	#banner nav li {float: left; display: inline; margin: 0;}
+#banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
+#banner nav li {float: left; display: inline; margin: 0;}
 
-	#banner nav a:link, #banner nav a:visited {
-		color: #fff;
-		display: inline-block;
-		height: 30px;
-		padding: 5px 1.5em;
-		text-decoration: none;
-	}
-	#banner nav a:hover, #banner nav a:active,
-	#banner nav .active a:link, #banner nav .active a:visited {
-		background: #C74451;
-		color: #fff;
-		text-shadow: none !important;
-	}
+#banner nav a:link, #banner nav a:visited {
+    color: #fff;
+    display: inline-block;
+    height: 30px;
+    padding: 5px 1.5em;
+    text-decoration: none;
+}
+#banner nav a:hover, #banner nav a:active,
+#banner nav .active a:link, #banner nav .active a:visited {
+    background: #C74451;
+    color: #fff;
+    text-shadow: none !important;
+}
 
-	#banner nav li:first-child a {
-		border-top-left-radius: 5px;
-		-moz-border-radius-topleft: 5px;
-		-webkit-border-top-left-radius: 5px;
+#banner nav li:first-child a {
+    border-top-left-radius: 5px;
+    -moz-border-radius-topleft: 5px;
+    -webkit-border-top-left-radius: 5px;
 
-		border-bottom-left-radius: 5px;
-		-moz-border-radius-bottomleft: 5px;
-		-webkit-border-bottom-left-radius: 5px;
-	}
+    border-bottom-left-radius: 5px;
+    -moz-border-radius-bottomleft: 5px;
+    -webkit-border-bottom-left-radius: 5px;
+}
 
 /*
 	Featured
 *****************/
 #featured {
-	background: #fff;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px;
-	max-width: 760px;
+    background: #fff;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 #featured figure {
-	border: 2px solid #eee;
-	float: right;
-	margin: 0.786em 2em 0 5em;
-	max-width: 248px;
+    border: 2px solid #eee;
+    float: right;
+    margin: 0.786em 2em 0 5em;
+    max-width: 248px;
 }
 #featured figure img {display: block; float: right;}
 
@@ -273,15 +273,15 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 	Body
 *****************/
 #content {
-	background: #fff;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px 20px;
-	max-width: 760px;
+    background: #fff;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px 20px;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 /*
@@ -292,51 +292,51 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 #extras ul {list-style: none; margin: 0;}
 #extras li {border-bottom: 1px solid #fff;}
 #extras h2 {
-	color: #C74350;
-	font-size: 1.429em;
-	margin-bottom: .25em;
-	padding: 0 3px;
+    color: #C74350;
+    font-size: 1.429em;
+    margin-bottom: .25em;
+    padding: 0 3px;
 }
 
 #extras a:link, #extras a:visited {
-	color: #444;
-	display: block;
-	border-bottom: 1px solid #F4E3E3;
-	text-decoration: none;
-	padding: .3em .25em;
+    color: #444;
+    display: block;
+    border-bottom: 1px solid #F4E3E3;
+    text-decoration: none;
+    padding: .3em .25em;
 }
 
 #extras a:hover, #extras a:active {color: #fff;}
 
 	/* Blogroll */
-	#extras .blogroll {
-		float: left;
-		max-width: 615px;
-	}
+#extras .blogroll {
+    float: left;
+    max-width: 615px;
+}
 
-	#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
+#extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;}
 
 	/* Social */
-	#extras .social {
-		float: right;
-		max-width: 175px;
-	}
+#extras .social {
+    float: right;
+    max-width: 175px;
+}
 
 /*
 	About
 *****************/
 #about {
-	background: #fff;
-	font-style: normal;
-	margin-bottom: 2em;
-	overflow: hidden;
-	padding: 20px;
-	text-align: left;
-	max-width: 760px;
+    background: #fff;
+    font-style: normal;
+    margin-bottom: 2em;
+    overflow: hidden;
+    padding: 20px;
+    text-align: left;
+    max-width: 760px;
 
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
 #about .primary {float: left; max-width: 165px;}
@@ -355,10 +355,10 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 /***** Sections *****/
 /* Blog */
 .hentry {
-	display: block;
-	clear: both;
-	border-top: 1px solid #eee;
-	padding: 1.5em 0;
+    display: block;
+    clear: both;
+    border-top: 1px solid #eee;
+    padding: 1.5em 0;
 }
 li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 #content > .hentry {padding: 1em 0;}
@@ -370,70 +370,70 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 .hentry .post-info * {font-style: normal;}
 
 	/* Content */
-	.hentry footer {margin-bottom: 2em;}
-	.hentry footer address {display: inline;}
-	#posts-list footer address {display: block;}
+.hentry footer {margin-bottom: 2em;}
+.hentry footer address {display: inline;}
+#posts-list footer address {display: block;}
 
 	/* Blog Index */
-	#posts-list {list-style: none; margin: 0;}
-	#posts-list .hentry {padding-left: 10px; position: relative;}
+#posts-list {list-style: none; margin: 0;}
+#posts-list .hentry {padding-left: 10px; position: relative;}
 
-	#posts-list footer {
-		left: 10px;
-		position: relative;
-        float: left;
-		top: 0.5em;
-		max-width: 190px;
-	}
+#posts-list footer {
+    left: 10px;
+    position: relative;
+    float: left;
+    top: 0.5em;
+    max-width: 190px;
+}
 
 	/* About the Author */
-	#about-author {
-		background: #f9f9f9;
-		clear: both;
-		font-style: normal;
-		margin: 2em 0;
-		padding: 10px 20px 15px 20px;
+#about-author {
+    background: #f9f9f9;
+    clear: both;
+    font-style: normal;
+    margin: 2em 0;
+    padding: 10px 20px 15px 20px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
 
-	#about-author strong {
-		color: #C64350;
-		clear: both;
-		display: block;
-		font-size: 1.429em;
-	}
+#about-author strong {
+    color: #C64350;
+    clear: both;
+    display: block;
+    font-size: 1.429em;
+}
 
-	#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
+#about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
 
 	/* Comments */
-	#comments-list {list-style: none; margin: 0 1em;}
-	#comments-list blockquote {
-		background: #f8f8f8;
-		clear: both;
-		font-style: normal;
-		margin: 0;
-		padding: 15px 20px;
+#comments-list {list-style: none; margin: 0 1em;}
+#comments-list blockquote {
+    background: #f8f8f8;
+    clear: both;
+    font-style: normal;
+    margin: 0;
+    padding: 15px 20px;
 
-		border-radius: 5px;
-		-moz-border-radius: 5px;
-		-webkit-border-radius: 5px;
-	}
-	#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+#comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
 
-	#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
+#comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
 
 	/* Add a Comment */
-	#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
-	#add-comment input[type='text'],
-	#add-comment input[type='email'],
-	#add-comment input[type='url'] {float: left; max-width: 200px;}
+#add-comment label {clear: left; float: left; text-align: left; max-width: 150px;}
+#add-comment input[type='text'],
+#add-comment input[type='email'],
+#add-comment input[type='url'] {float: left; max-width: 200px;}
 
-	#add-comment textarea {float: left; height: 150px; max-width: 495px;}
+#add-comment textarea {float: left; height: 150px; max-width: 495px;}
 
-	#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
+#add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
 
-	#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
-	#add-comment * {margin-bottom: .5em;}
+#add-comment input[type='submit'] {float: right; margin: 0 .5em;}
+#add-comment * {margin-bottom: .5em;}
diff --git a/pelican/themes/notmyidea/static/css/pygment.css b/pelican/themes/notmyidea/static/css/pygment.css
index fdd056f6..a3877a83 100644
--- a/pelican/themes/notmyidea/static/css/pygment.css
+++ b/pelican/themes/notmyidea/static/css/pygment.css
@@ -1,205 +1,205 @@
 .hll {
-background-color:#eee;
+    background-color:#eee;
 }
 .c {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .err {
-border:1px solid #FF0000;
+    border:1px solid #FF0000;
 }
 .k {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .o {
-color:#666666;
+    color:#666666;
 }
 .cm {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .cp {
-color:#007020;
+    color:#007020;
 }
 .c1 {
-color:#408090;
-font-style:italic;
+    color:#408090;
+    font-style:italic;
 }
 .cs {
-background-color:#FFF0F0;
-color:#408090;
+    background-color:#FFF0F0;
+    color:#408090;
 }
 .gd {
-color:#A00000;
+    color:#A00000;
 }
 .ge {
-font-style:italic;
+    font-style:italic;
 }
 .gr {
-color:#FF0000;
+    color:#FF0000;
 }
 .gh {
-color:#000080;
-font-weight:bold;
+    color:#000080;
+    font-weight:bold;
 }
 .gi {
-color:#00A000;
+    color:#00A000;
 }
 .go {
-color:#303030;
+    color:#303030;
 }
 .gp {
-color:#C65D09;
-font-weight:bold;
+    color:#C65D09;
+    font-weight:bold;
 }
 .gs {
-font-weight:bold;
+    font-weight:bold;
 }
 .gu {
-color:#800080;
-font-weight:bold;
+    color:#800080;
+    font-weight:bold;
 }
 .gt {
-color:#0040D0;
+    color:#0040D0;
 }
 .kc {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kd {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kn {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kp {
-color:#007020;
+    color:#007020;
 }
 .kr {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .kt {
-color:#902000;
+    color:#902000;
 }
 .m {
-color:#208050;
+    color:#208050;
 }
 .s {
-color:#4070A0;
+    color:#4070A0;
 }
 .na {
-color:#4070A0;
+    color:#4070A0;
 }
 .nb {
-color:#007020;
+    color:#007020;
 }
 .nc {
-color:#0E84B5;
-font-weight:bold;
+    color:#0E84B5;
+    font-weight:bold;
 }
 .no {
-color:#60ADD5;
+    color:#60ADD5;
 }
 .nd {
-color:#555555;
-font-weight:bold;
+    color:#555555;
+    font-weight:bold;
 }
 .ni {
-color:#D55537;
-font-weight:bold;
+    color:#D55537;
+    font-weight:bold;
 }
 .ne {
-color:#007020;
+    color:#007020;
 }
 .nf {
-color:#06287E;
+    color:#06287E;
 }
 .nl {
-color:#002070;
-font-weight:bold;
+    color:#002070;
+    font-weight:bold;
 }
 .nn {
-color:#0E84B5;
-font-weight:bold;
+    color:#0E84B5;
+    font-weight:bold;
 }
 .nt {
-color:#062873;
-font-weight:bold;
+    color:#062873;
+    font-weight:bold;
 }
 .nv {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .ow {
-color:#007020;
-font-weight:bold;
+    color:#007020;
+    font-weight:bold;
 }
 .w {
-color:#BBBBBB;
+    color:#BBBBBB;
 }
 .mf {
-color:#208050;
+    color:#208050;
 }
 .mh {
-color:#208050;
+    color:#208050;
 }
 .mi {
-color:#208050;
+    color:#208050;
 }
 .mo {
-color:#208050;
+    color:#208050;
 }
 .sb {
-color:#4070A0;
+    color:#4070A0;
 }
 .sc {
-color:#4070A0;
+    color:#4070A0;
 }
 .sd {
-color:#4070A0;
-font-style:italic;
+    color:#4070A0;
+    font-style:italic;
 }
 .s2 {
-color:#4070A0;
+    color:#4070A0;
 }
 .se {
-color:#4070A0;
-font-weight:bold;
+    color:#4070A0;
+    font-weight:bold;
 }
 .sh {
-color:#4070A0;
+    color:#4070A0;
 }
 .si {
-color:#70A0D0;
-font-style:italic;
+    color:#70A0D0;
+    font-style:italic;
 }
 .sx {
-color:#C65D09;
+    color:#C65D09;
 }
 .sr {
-color:#235388;
+    color:#235388;
 }
 .s1 {
-color:#4070A0;
+    color:#4070A0;
 }
 .ss {
-color:#517918;
+    color:#517918;
 }
 .bp {
-color:#007020;
+    color:#007020;
 }
 .vc {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .vg {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .vi {
-color:#BB60D5;
+    color:#BB60D5;
 }
 .il {
-color:#208050;
+    color:#208050;
 }
diff --git a/pelican/themes/notmyidea/static/css/reset.css b/pelican/themes/notmyidea/static/css/reset.css
index f5123cf6..10b3fde2 100644
--- a/pelican/themes/notmyidea/static/css/reset.css
+++ b/pelican/themes/notmyidea/static/css/reset.css
@@ -15,13 +15,13 @@ b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td {
-	background: transparent;
-	border: 0;
-	font-size: 100%;
-	margin: 0;
-	outline: 0;
-	padding: 0;
-	vertical-align: baseline;
+    background: transparent;
+    border: 0;
+    font-size: 100%;
+    margin: 0;
+    outline: 0;
+    padding: 0;
+    vertical-align: baseline;
 }
 
 body {line-height: 1;}
@@ -32,13 +32,13 @@ blockquote, q {quotes: none;}
 
 blockquote:before, blockquote:after,
 q:before, q:after {
-	content: '';
-	content: none;
+    content: '';
+    content: none;
 }
 
 /* remember to define focus styles! */
 :focus {
-	outline: 0;
+    outline: 0;
 }
 
 /* remember to highlight inserts somehow! */
@@ -47,6 +47,6 @@ del {text-decoration: line-through;}
 
 /* tables still need 'cellspacing="0"' in the markup */
 table {
-	border-collapse: collapse;
-	border-spacing: 0;
+    border-collapse: collapse;
+    border-spacing: 0;
 }
diff --git a/pelican/themes/notmyidea/static/fonts/font.css b/pelican/themes/notmyidea/static/fonts/font.css
index a9eb87e6..cf623603 100644
--- a/pelican/themes/notmyidea/static/fonts/font.css
+++ b/pelican/themes/notmyidea/static/fonts/font.css
@@ -1,12 +1,12 @@
 @font-face {
-	font-family: 'Yanone Kaffeesatz';
-	font-style: normal;
-	font-weight: 400;
-	src:
-		local('Yanone Kaffeesatz Regular'),
-		local('YanoneKaffeesatz-Regular'),
+    font-family: 'Yanone Kaffeesatz';
+    font-style: normal;
+    font-weight: 400;
+    src:
+    local('Yanone Kaffeesatz Regular'),
+    local('YanoneKaffeesatz-Regular'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLRTHiN2BPBirwIkMLKUspj4.woff */
-		url('Yanone_Kaffeesatz_400.woff') format('woff'),
+    url('Yanone_Kaffeesatz_400.woff') format('woff'),
 		/* from https://fonts.gstatic.com/s/yanonekaffeesatz/v8/YDAoLskQQ5MOAgvHUQCcLfGwxTS8d1Q9KiDNCMKLFUM.woff2 */
-		url('Yanone_Kaffeesatz_400.woff2') format('woff2');
+    url('Yanone_Kaffeesatz_400.woff2') format('woff2');
 }
diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
index 22642579..d247e3ed 100644
--- a/pelican/themes/notmyidea/templates/analytics.html
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -1,3 +1,3 @@
 {% if ANALYTICS %}
-{{ ANALYTICS }}
+    {{ ANALYTICS }}
 {% endif %}
diff --git a/pelican/themes/notmyidea/templates/archives.html b/pelican/themes/notmyidea/templates/archives.html
index f6784942..ffc3627f 100644
--- a/pelican/themes/notmyidea/templates/archives.html
+++ b/pelican/themes/notmyidea/templates/archives.html
@@ -1,13 +1,13 @@
 {% extends "base.html" %}
 {% block content %}
-<section id="content" class="body">
-<h1>Archives for {{ SITENAME }}</h1>
+    <section id="content" class="body">
+        <h1>Archives for {{ SITENAME }}</h1>
 
-<dl>
-{% for article in dates %}
-    <dt>{{ article.locale_date }}</dt>
-    <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
-{% endfor %}
-</dl>
-</section>
+        <dl>
+            {% for article in dates %}
+                <dt>{{ article.locale_date }}</dt>
+                <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+            {% endfor %}
+        </dl>
+    </section>
 {% endblock %}
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 6abcb09d..c0c1ebc3 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -3,51 +3,51 @@
 {% block head -%}
   {{ super() -}}
   {% if article.summary %}
-        <meta name="description" content="{{ article.summary | striptags | safe | truncate(150) }}" />
+    <meta name="description" content="{{ article.summary | striptags | safe | truncate(150) }}" />
   {% endif %}
 {% endblock %}
 
 {% block title %}{{ article.title|striptags }}{% endblock %}
 
 {% block extra_head %}
-{% import 'translations.html' as translations with context %}
-{% if translations.entry_hreflang(article) %}
-  {{ translations.entry_hreflang(article) }}
-{% endif %}
+  {% import 'translations.html' as translations with context %}
+  {% if translations.entry_hreflang(article) %}
+    {{ translations.entry_hreflang(article) }}
+  {% endif %}
 {% endblock %}
 
 {% block content %}
-<section id="content" class="body">
-  <article>
-    <header>
-      <h1 class="entry-title">
-        <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-           title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
-      {% include 'twitter.html' %}
-    </header>
+  <section id="content" class="body">
+    <article>
+      <header>
+        <h1 class="entry-title">
+          <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
+             title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
+        {% include 'twitter.html' %}
+      </header>
 
-    <div class="entry-content">
-      {% include 'article_infos.html' %}
-      {{ article.content }}
-    </div><!-- /.entry-content -->
-    {% if DISQUS_SITENAME and SITEURL and article.status != "draft" %}
-    <div class="comments">
-      <h2>Comments !</h2>
-      <div id="disqus_thread"></div>
-      <script type="text/javascript">
-        var disqus_shortname = '{{ DISQUS_SITENAME }}';
-        var disqus_identifier = '{{ article.url }}';
-        var disqus_url = '{{ SITEURL }}/{{ article.url }}';
-        (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-      </script>
-      <noscript>Please enable JavaScript to view the comments.</noscript>
-    </div>
-    {% endif %}
+      <div class="entry-content">
+        {% include 'article_infos.html' %}
+        {{ article.content }}
+      </div><!-- /.entry-content -->
+      {% if DISQUS_SITENAME and SITEURL and article.status != "draft" %}
+        <div class="comments">
+          <h2>Comments !</h2>
+          <div id="disqus_thread"></div>
+          <script type="text/javascript">
+            var disqus_shortname = '{{ DISQUS_SITENAME }}';
+            var disqus_identifier = '{{ article.url }}';
+            var disqus_url = '{{ SITEURL }}/{{ article.url }}';
+            (function() {
+              var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+              dsq.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+              (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+            })();
+          </script>
+          <noscript>Please enable JavaScript to view the comments.</noscript>
+        </div>
+      {% endif %}
 
-  </article>
-</section>
+    </article>
+  </section>
 {% endblock %}
diff --git a/pelican/themes/notmyidea/templates/article_infos.html b/pelican/themes/notmyidea/templates/article_infos.html
index 172ad85d..335dcbb1 100644
--- a/pelican/themes/notmyidea/templates/article_infos.html
+++ b/pelican/themes/notmyidea/templates/article_infos.html
@@ -3,21 +3,21 @@
                 Published: {{ article.locale_date }}
         </abbr>
         {% if article.modified %}
-		<br />
-        <abbr class="modified" title="{{ article.modified.isoformat() }}">
-                Updated: {{ article.locale_modified }}
-        </abbr>
+                <br />
+                <abbr class="modified" title="{{ article.modified.isoformat() }}">
+                        Updated: {{ article.locale_modified }}
+                </abbr>
         {% endif %}
 
         {% if article.authors %}
-        <address class="vcard author">
-                By {% for author in article.authors %}
-                        <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
-                {% endfor %}
-        </address>
+                <address class="vcard author">
+                        By {% for author in article.authors %}
+                                <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
+                        {% endfor %}
+                </address>
         {% endif %}
-<p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>.</p>
-{% include 'taglist.html' %}
-{% import 'translations.html' as translations with context %}
-{{ translations.translations_for(article) }}
+        <p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>.</p>
+        {% include 'taglist.html' %}
+        {% import 'translations.html' as translations with context %}
+        {{ translations.translations_for(article) }}
 </footer><!-- /.post-info -->
diff --git a/pelican/themes/notmyidea/templates/authors.html b/pelican/themes/notmyidea/templates/authors.html
index b9f87e22..e7c1e3e4 100644
--- a/pelican/themes/notmyidea/templates/authors.html
+++ b/pelican/themes/notmyidea/templates/authors.html
@@ -4,13 +4,13 @@
 
 {% block content %}
 
-<section id="content" class="body">
-    <h1>Authors on {{ SITENAME }}</h1>
-    <ul>
-    {% for author, articles in authors|sort %}
-        <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
-    {% endfor %}
-    </ul>
-</section>
+    <section id="content" class="body">
+        <h1>Authors on {{ SITENAME }}</h1>
+        <ul>
+            {% for author, articles in authors|sort %}
+                <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
+            {% endfor %}
+        </ul>
+    </section>
 
 {% endblock %}
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index 6c8c20a7..e5fabb09 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -1,83 +1,83 @@
 <!DOCTYPE html>
 <html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock html_lang %}">
-<head>
-        {% block head %}
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="generator" content="Pelican" />
-        <title>{% block title %}{{ SITENAME|striptags }}{%endblock%}</title>
-        <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" />
-        {% if FEED_ALL_ATOM %}
-        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Atom Feed" />
-        {% endif %}
-        {% if FEED_ALL_RSS %}
-        <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} RSS Feed" />
-        {% endif %}
-        {% block extra_head %}{% endblock extra_head %}
-        {% endblock head %}
-</head>
+        <head>
+                {% block head %}
+                        <meta charset="utf-8" />
+                        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+                        <meta name="generator" content="Pelican" />
+                        <title>{% block title %}{{ SITENAME|striptags }}{%endblock%}</title>
+                        <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" />
+                        {% if FEED_ALL_ATOM %}
+                                <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Atom Feed" />
+                        {% endif %}
+                        {% if FEED_ALL_RSS %}
+                                <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} RSS Feed" />
+                        {% endif %}
+                        {% block extra_head %}{% endblock extra_head %}
+                {% endblock head %}
+        </head>
 
-<body id="index" class="home">
-{% include 'github.html' %}
-        <header id="banner" class="body">
-                <h1><a href="{{ SITEURL }}/">{{ SITENAME }}{% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
-                <nav><ul>
-                {% for title, link in MENUITEMS %}
-                    <li><a href="{{ link }}">{{ title }}</a></li>
-                {% endfor %}
-                {% if DISPLAY_PAGES_ON_MENU -%}
-                {% for pg in pages %}
-                    <li{% if pg == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ pg.url }}">{{ pg.title }}</a></li>
-                {% endfor %}
-                {% endif %}
-                {% if DISPLAY_CATEGORIES_ON_MENU -%}
-                {% for cat, null in categories %}
-                    <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
-                {% endfor %}
-                {% endif %}
-                </ul></nav>
-        </header><!-- /#banner -->
-        {% block content %}
-        {% endblock %}
-        <section id="extras" class="body">
-        {% if LINKS %}
-                <div class="blogroll">
-                        <h2>{{ LINKS_WIDGET_NAME | default('links') }}</h2>
-                        <ul>
-                        {% for name, link in LINKS %}
-                            <li><a href="{{ link }}">{{ name }}</a></li>
-                        {% endfor %}
-                        </ul>
-                </div><!-- /.blogroll -->
-        {% endif %}
-        {% if SOCIAL or FEED_ALL_ATOM or FEED_ALL_RSS %}
-                <div class="social">
-                        <h2>{{ SOCIAL_WIDGET_NAME | default('social') }}</h2>
-                        <ul>
-                            {% if FEED_ALL_ATOM %}
-                            <li><a href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            {% endif %}
-                            {% if FEED_ALL_RSS %}
-                            <li><a href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            {% endif %}
+        <body id="index" class="home">
+                {% include 'github.html' %}
+                <header id="banner" class="body">
+                        <h1><a href="{{ SITEURL }}/">{{ SITENAME }}{% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
+                        <nav><ul>
+                                {% for title, link in MENUITEMS %}
+                                        <li><a href="{{ link }}">{{ title }}</a></li>
+                                {% endfor %}
+                                {% if DISPLAY_PAGES_ON_MENU -%}
+                                        {% for pg in pages %}
+                                                <li{% if pg == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ pg.url }}">{{ pg.title }}</a></li>
+                                        {% endfor %}
+                                {% endif %}
+                                {% if DISPLAY_CATEGORIES_ON_MENU -%}
+                                        {% for cat, null in categories %}
+                                                <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
+                                        {% endfor %}
+                                {% endif %}
+                        </ul></nav>
+                </header><!-- /#banner -->
+                {% block content %}
+                {% endblock %}
+                <section id="extras" class="body">
+                        {% if LINKS %}
+                                <div class="blogroll">
+                                        <h2>{{ LINKS_WIDGET_NAME | default('links') }}</h2>
+                                        <ul>
+                                                {% for name, link in LINKS %}
+                                                        <li><a href="{{ link }}">{{ name }}</a></li>
+                                                {% endfor %}
+                                        </ul>
+                                </div><!-- /.blogroll -->
+                        {% endif %}
+                        {% if SOCIAL or FEED_ALL_ATOM or FEED_ALL_RSS %}
+                                <div class="social">
+                                        <h2>{{ SOCIAL_WIDGET_NAME | default('social') }}</h2>
+                                        <ul>
+                                                {% if FEED_ALL_ATOM %}
+                                                        <li><a href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate">atom feed</a></li>
+                                                {% endif %}
+                                                {% if FEED_ALL_RSS %}
+                                                        <li><a href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate">rss feed</a></li>
+                                                {% endif %}
 
-                        {% for name, link in SOCIAL %}
-                            <li><a href="{{ link }}">{{ name }}</a></li>
-                        {% endfor %}
-                        </ul>
-                </div><!-- /.social -->
-        {% endif %}
-        </section><!-- /#extras -->
+                                                {% for name, link in SOCIAL %}
+                                                        <li><a href="{{ link }}">{{ name }}</a></li>
+                                                {% endfor %}
+                                        </ul>
+                                </div><!-- /.social -->
+                        {% endif %}
+                </section><!-- /#extras -->
 
-        <footer id="contentinfo" class="body">
-                <address id="about" class="vcard body">
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address><!-- /#about -->
+                <footer id="contentinfo" class="body">
+                        <address id="about" class="vcard body">
+                                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>, which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+                        </address><!-- /#about -->
 
-                <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
-        </footer><!-- /#contentinfo -->
+                        <p>The theme is by <a rel="nofollow" href="https://www.smashingmagazine.com/2009/08/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+                </footer><!-- /#contentinfo -->
 
-{% include 'analytics.html' %}
-{% include 'disqus_script.html' %}
-</body>
+                {% include 'analytics.html' %}
+                {% include 'disqus_script.html' %}
+        </body>
 </html>
diff --git a/pelican/themes/notmyidea/templates/categories.html b/pelican/themes/notmyidea/templates/categories.html
index 7c5951c7..033f892a 100644
--- a/pelican/themes/notmyidea/templates/categories.html
+++ b/pelican/themes/notmyidea/templates/categories.html
@@ -4,13 +4,13 @@
 
 {% block content %}
 
-<section id="content" class="body">
-    <h1>Categories for {{ SITENAME }}</h1>
-    <ul>
-    {% for category, articles in categories|sort %}
-        <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
-    {% endfor %}
-    </ul>
-</section>
+    <section id="content" class="body">
+        <h1>Categories for {{ SITENAME }}</h1>
+        <ul>
+            {% for category, articles in categories|sort %}
+                <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
+            {% endfor %}
+        </ul>
+    </section>
 
 {% endblock %}
diff --git a/pelican/themes/notmyidea/templates/disqus_script.html b/pelican/themes/notmyidea/templates/disqus_script.html
index 23ec532a..ef8823c1 100644
--- a/pelican/themes/notmyidea/templates/disqus_script.html
+++ b/pelican/themes/notmyidea/templates/disqus_script.html
@@ -1,11 +1,11 @@
 {% if DISQUS_SITENAME %}
-<script type="text/javascript">
-    var disqus_shortname = '{{ DISQUS_SITENAME }}';
-    (function () {
-        var s = document.createElement('script'); s.async = true;
-        s.type = 'text/javascript';
-        s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
-        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-    }());
-</script>
+    <script type="text/javascript">
+        var disqus_shortname = '{{ DISQUS_SITENAME }}';
+        (function () {
+            var s = document.createElement('script'); s.async = true;
+            s.type = 'text/javascript';
+            s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+            (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+        }());
+    </script>
 {% endif %}
diff --git a/pelican/themes/notmyidea/templates/github.html b/pelican/themes/notmyidea/templates/github.html
index ccc401fe..75876edd 100644
--- a/pelican/themes/notmyidea/templates/github.html
+++ b/pelican/themes/notmyidea/templates/github.html
@@ -1,9 +1,9 @@
 {% if GITHUB_URL %}
-<a href="{{ GITHUB_URL }}">
-{% if GITHUB_POSITION != "left" %}
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
-{% else %}
-<img style="position: absolute; top: 0; left: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_left_white_ffffff.png" alt="Fork me on GitHub" />
-{% endif %}
-</a>
+    <a href="{{ GITHUB_URL }}">
+        {% if GITHUB_POSITION != "left" %}
+            <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+        {% else %}
+            <img style="position: absolute; top: 0; left: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_left_white_ffffff.png" alt="Fork me on GitHub" />
+        {% endif %}
+    </a>
 {% endif %}
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 14e9c14d..7a5c24ba 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -1,65 +1,65 @@
 {% extends "base.html" %}
 {% block content_title %}{% endblock %}
 {% block content %}
-{% if articles %}
-    {% for article in articles_page.object_list %}
+    {% if articles %}
+        {% for article in articles_page.object_list %}
 
         {# First item #}
-        {% if loop.first and not articles_page.has_previous() %}
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
-                    {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
-                </article>
-            </aside><!-- /#featured -->
-            {% if loop.length > 1 %}
-                <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-            {% endif %}
-        {# other items #}
-        {% else %}
-            {% if loop.first %}
-                <section id="content" class="body">
-                    <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
-            {% endif %}
-            <li><article class="hentry">
-                <header>
-                    <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-                           title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
-                </header>
-
-                <div class="entry-content">
-                {% include 'article_infos.html' %}
-                {{ article.summary }}
-                <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
-                {% include 'comments.html' %}
-                </div><!-- /.entry-content -->
-            </article></li>
-        {% endif %}
-        {% if loop.last %}
-            {% if loop.length > 1 or articles_page.has_other_pages() %}
-                </ol><!-- /#posts-list -->
-                {% if articles_page.has_other_pages() %}
-                    {% include 'pagination.html' %}
+            {% if loop.first and not articles_page.has_previous() %}
+                <aside id="featured" class="body">
+                    <article>
+                        <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
+                        {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
+                    </article>
+                </aside><!-- /#featured -->
+                {% if loop.length > 1 %}
+                    <section id="content" class="body">
+                        <h1>Other articles</h1>
+                        <hr />
+                        <ol id="posts-list" class="hfeed">
                 {% endif %}
-                </section><!-- /#content -->
+        {# other items #}
+            {% else %}
+                {% if loop.first %}
+                    <section id="content" class="body">
+                        <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
+                {% endif %}
+                <li><article class="hentry">
+                    <header>
+                        <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
+                               title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
+                    </header>
+
+                    <div class="entry-content">
+                        {% include 'article_infos.html' %}
+                        {{ article.summary }}
+                        <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
+                        {% include 'comments.html' %}
+                    </div><!-- /.entry-content -->
+                </article></li>
             {% endif %}
-        {% endif %}
-    {% endfor %}
-{% else %}
-<section id="content" class="body">
-    {% if pages %}
-    <h2>Pages</h2>
-    <ul>
-    {% for page in pages %}
-        <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
-    {% endfor %}
-    </ul>
+            {% if loop.last %}
+                {% if loop.length > 1 or articles_page.has_other_pages() %}
+                    </ol><!-- /#posts-list -->
+                    {% if articles_page.has_other_pages() %}
+                        {% include 'pagination.html' %}
+                    {% endif %}
+                    </section><!-- /#content -->
+                {% endif %}
+            {% endif %}
+        {% endfor %}
     {% else %}
-    <p>This site currently has no content.</p>
+        <section id="content" class="body">
+            {% if pages %}
+                <h2>Pages</h2>
+                <ul>
+                    {% for page in pages %}
+                        <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
+                    {% endfor %}
+                </ul>
+            {% else %}
+                <p>This site currently has no content.</p>
+            {% endif %}
+        </section>
     {% endif %}
-</section>
-{% endif %}
 {% endblock content %}
diff --git a/pelican/themes/notmyidea/templates/page.html b/pelican/themes/notmyidea/templates/page.html
index 428c47f1..af3004e7 100644
--- a/pelican/themes/notmyidea/templates/page.html
+++ b/pelican/themes/notmyidea/templates/page.html
@@ -3,17 +3,17 @@
 {% block title %}{{ page.title|striptags }}{% endblock %}
 
 {% block extra_head %}
-{% import 'translations.html' as translations with context %}
-{% if translations.entry_hreflang(page) %}
-  {{ translations.entry_hreflang(page) }}
-{% endif %}
+  {% import 'translations.html' as translations with context %}
+  {% if translations.entry_hreflang(page) %}
+    {{ translations.entry_hreflang(page) }}
+  {% endif %}
 {% endblock %}
 
 {% block content %}
-<section id="content" class="body">
+  <section id="content" class="body">
     <h1 class="entry-title">{{ page.title }}</h1>
     {% import 'translations.html' as translations with context %}
     {{ translations.translations_for(page) }}
     {{ page.content }}
-</section>
+  </section>
 {% endblock %}
diff --git a/pelican/themes/notmyidea/templates/period_archives.html b/pelican/themes/notmyidea/templates/period_archives.html
index 252e002f..6db49ed0 100644
--- a/pelican/themes/notmyidea/templates/period_archives.html
+++ b/pelican/themes/notmyidea/templates/period_archives.html
@@ -1,13 +1,13 @@
 {% extends "base.html" %}
 {% block content %}
-<section id="content" class="body">
-<h1>Archives for {{ period | reverse | join(' ') }}</h1>
+    <section id="content" class="body">
+        <h1>Archives for {{ period | reverse | join(' ') }}</h1>
 
-<dl>
-{% for article in dates %}
-    <dt>{{ article.locale_date }}</dt>
-    <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
-{% endfor %}
-</dl>
-</section>
+        <dl>
+            {% for article in dates %}
+                <dt>{{ article.locale_date }}</dt>
+                <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+            {% endfor %}
+        </dl>
+    </section>
 {% endblock %}
diff --git a/pelican/themes/notmyidea/templates/tags.html b/pelican/themes/notmyidea/templates/tags.html
index a1729321..a9cce026 100644
--- a/pelican/themes/notmyidea/templates/tags.html
+++ b/pelican/themes/notmyidea/templates/tags.html
@@ -4,13 +4,13 @@
 
 {% block content %}
 
-<section id="content" class="body">
-    <h1>Tags for {{ SITENAME }}</h1>
-    <ul>
-    {% for tag, articles in tags|sort %}
-        <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
-    {% endfor %}
-    </ul>
-</section>
+    <section id="content" class="body">
+        <h1>Tags for {{ SITENAME }}</h1>
+        <ul>
+            {% for tag, articles in tags|sort %}
+                <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
+            {% endfor %}
+        </ul>
+    </section>
 
 {% endblock %}
diff --git a/pelican/themes/notmyidea/templates/translations.html b/pelican/themes/notmyidea/templates/translations.html
index 1eec7c43..eed0703d 100644
--- a/pelican/themes/notmyidea/templates/translations.html
+++ b/pelican/themes/notmyidea/templates/translations.html
@@ -1,16 +1,16 @@
 {% macro translations_for(article) %}
-{% if article.translations %}
-Translations:
+  {% if article.translations %}
+    Translations:
     {% for translation in article.translations %}
-        <a href="{{ SITEURL }}/{{ translation.url }}" hreflang="{{ translation.lang }}">{{ translation.lang }}</a>
+      <a href="{{ SITEURL }}/{{ translation.url }}" hreflang="{{ translation.lang }}">{{ translation.lang }}</a>
     {% endfor %}
-{% endif %}
+  {% endif %}
 {% endmacro %}
 
 {% macro entry_hreflang(entry) %}
-{% if entry.translations %}
-  {% for translation in entry.translations %}
-    <link rel="alternate" hreflang="{{ translation.lang }}" href="{{ SITEURL }}/{{ translation.url }}">
-  {% endfor %}
-{% endif %}
+  {% if entry.translations %}
+    {% for translation in entry.translations %}
+      <link rel="alternate" hreflang="{{ translation.lang }}" href="{{ SITEURL }}/{{ translation.url }}">
+    {% endfor %}
+  {% endif %}
 {% endmacro %}
diff --git a/pelican/themes/notmyidea/templates/twitter.html b/pelican/themes/notmyidea/templates/twitter.html
index 48184ebe..da1dddd9 100644
--- a/pelican/themes/notmyidea/templates/twitter.html
+++ b/pelican/themes/notmyidea/templates/twitter.html
@@ -1,3 +1,3 @@
 {% if TWITTER_USERNAME %}
-<a rel="nofollow" href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="https://platform.twitter.com/widgets.js"></script>
+    <a rel="nofollow" href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="https://platform.twitter.com/widgets.js"></script>
 {% endif %}
diff --git a/pelican/themes/simple/templates/archives.html b/pelican/themes/simple/templates/archives.html
index c7fb2127..a61bf3c6 100644
--- a/pelican/themes/simple/templates/archives.html
+++ b/pelican/themes/simple/templates/archives.html
@@ -3,12 +3,12 @@
 {% block title %}{{ SITENAME|striptags }} - Archives{% endblock %}
 
 {% block content %}
-<h2>Archives for {{ SITENAME }}</h2>
+    <h2>Archives for {{ SITENAME }}</h2>
 
-<dl>
-{% for article in dates %}
-    <dt>{{ article.locale_date }}</dt>
-    <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
-{% endfor %}
-</dl>
+    <dl>
+        {% for article in dates %}
+            <dt>{{ article.locale_date }}</dt>
+            <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+        {% endfor %}
+    </dl>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index 07e5534d..a01de100 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -22,44 +22,44 @@
 {% endblock %}
 
 {% block content %}
-<article>
-  <header>
-    <h2>
-      <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-         title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
- {% import 'translations.html' as translations with context %}
- {{ translations.translations_for(article) }}
-  </header>
-  {{ article.content }}
-  <footer>
-    <p>Published: <time datetime="{{ article.date.isoformat() }}">
-      {{ article.locale_date }}
-    </time></p>
-    {% if article.modified %}
-    <p>Last updated: <time datetime="{{ article.modified.isoformat() }}">
-      {{ article.locale_modified }}
-    </time></p>
-    {% endif %}
-    {% if article.authors %}
-    <address>
-      By {% for author in article.authors %}
-          <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
-        {% endfor %}
-    </address>
-    {% endif %}
-    {% if article.category %}
-    <p>
-        Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
-    </p>
-    {% endif %}
-    {% if article.tags %}
-    <p>
-        Tags:
-        {% for tag in article.tags %}
+  <article>
+    <header>
+      <h2>
+        <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
+           title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
+      {% import 'translations.html' as translations with context %}
+      {{ translations.translations_for(article) }}
+    </header>
+    {{ article.content }}
+    <footer>
+      <p>Published: <time datetime="{{ article.date.isoformat() }}">
+        {{ article.locale_date }}
+      </time></p>
+      {% if article.modified %}
+        <p>Last updated: <time datetime="{{ article.modified.isoformat() }}">
+          {{ article.locale_modified }}
+        </time></p>
+      {% endif %}
+      {% if article.authors %}
+        <address>
+          By {% for author in article.authors %}
+            <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
+          {% endfor %}
+        </address>
+      {% endif %}
+      {% if article.category %}
+        <p>
+          Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
+        </p>
+      {% endif %}
+      {% if article.tags %}
+        <p>
+          Tags:
+          {% for tag in article.tags %}
             <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>
-        {% endfor %}
-    </p>
-    {% endif %}
-  </footer>
+          {% endfor %}
+        </p>
+      {% endif %}
+    </footer>
   </article>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/author.html b/pelican/themes/simple/templates/author.html
index 9b30dfe2..06f871dc 100644
--- a/pelican/themes/simple/templates/author.html
+++ b/pelican/themes/simple/templates/author.html
@@ -3,5 +3,5 @@
 {% block title %}{{ SITENAME|striptags }} - Articles by {{ author }}{% endblock %}
 
 {% block content_title %}
-<h2>Articles by {{ author }}</h2>
+    <h2>Articles by {{ author }}</h2>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/authors.html b/pelican/themes/simple/templates/authors.html
index 01b4f6f1..97a74572 100644
--- a/pelican/themes/simple/templates/authors.html
+++ b/pelican/themes/simple/templates/authors.html
@@ -5,8 +5,8 @@
 {% block content %}
     <h2>Authors on {{ SITENAME }}</h2>
     <ul>
-    {% for author, articles in authors|sort %}
-        <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
-    {% endfor %}
+        {% for author, articles in authors|sort %}
+            <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
+        {% endfor %}
     </ul>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index e006cba1..e9461fd5 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -1,50 +1,50 @@
 <!DOCTYPE html>
 <html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock html_lang %}">
-<head>
-        {% block head %}
-        <title>{% block title %}{{ SITENAME|striptags }}{% endblock title %}</title>
-        <meta charset="utf-8" />
-        <meta name="generator" content="Pelican" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        {% if SITESUBTITLE %}
+  <head>
+    {% block head %}
+      <title>{% block title %}{{ SITENAME|striptags }}{% endblock title %}</title>
+      <meta charset="utf-8" />
+      <meta name="generator" content="Pelican" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      {% if SITESUBTITLE %}
         <meta name="description" content="{{ SITESUBTITLE }}" />
-        {% endif %}
-        {% if STYLESHEET_URL %}
+      {% endif %}
+      {% if STYLESHEET_URL %}
         <link rel="stylesheet" type="text/css" href="{{ STYLESHEET_URL }}" />
-        {% endif %}
-        {% if FEED_ALL_ATOM %}
+      {% endif %}
+      {% if FEED_ALL_ATOM %}
         <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Full Atom Feed" />
-        {% endif %}
-        {% if FEED_ALL_RSS %}
+      {% endif %}
+      {% if FEED_ALL_RSS %}
         <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} Full RSS Feed" />
-        {% endif %}
-        {% if FEED_ATOM %}
+      {% endif %}
+      {% if FEED_ATOM %}
         <link href="{{ FEED_DOMAIN }}/{%if FEED_ATOM_URL %}{{ FEED_ATOM_URL }}{% else %}{{ FEED_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Atom Feed" />
-        {% endif %}
-        {% if FEED_RSS %}
+      {% endif %}
+      {% if FEED_RSS %}
         <link href="{{ FEED_DOMAIN }}/{% if FEED_RSS_URL %}{{ FEED_RSS_URL }}{% else %}{{ FEED_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} RSS Feed" />
-        {% endif %}
-        {% if CATEGORY_FEED_ATOM and category %}
+      {% endif %}
+      {% if CATEGORY_FEED_ATOM and category %}
         <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_ATOM.format(slug=category.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Categories Atom Feed" />
-        {% endif %}
-        {% if CATEGORY_FEED_RSS and category %}
+      {% endif %}
+      {% if CATEGORY_FEED_RSS and category %}
         <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_RSS_URL %}{{ CATEGORY_FEED_RSS_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_RSS.format(slug=category.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} Categories RSS Feed" />
-        {% endif %}
-        {% if TAG_FEED_ATOM and tag %}
+      {% endif %}
+      {% if TAG_FEED_ATOM and tag %}
         <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_ATOM.format(slug=tag.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Tags Atom Feed" />
-        {% endif %}
-        {% if TAG_FEED_RSS and tag %}
+      {% endif %}
+      {% if TAG_FEED_RSS and tag %}
         <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_RSS.format(slug=tag.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} Tags RSS Feed" />
-        {% endif %}
-        {% endblock head %}
-</head>
+      {% endif %}
+    {% endblock head %}
+  </head>
 
-<body>
-        <header>
-              <hgroup><h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>{% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}</hgroup>
-        <nav><ul>
+  <body>
+    <header>
+      <hgroup><h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>{% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}</hgroup>
+      <nav><ul>
         {% for title, link in MENUITEMS %}
-            <li><a href="{{ link }}">{{ title }}</a></li>
+          <li><a href="{{ link }}">{{ title }}</a></li>
         {% endfor %}
         {% if DISPLAY_PAGES_ON_MENU %}
           {% for p in pages %}
@@ -56,17 +56,17 @@
             <li><a href="{{ SITEURL }}/{{ cat.url }}" {% if cat==category %} aria-current="page" {% endif %}>{{ cat}}</a></li>
           {% endfor %}
         {% endif %}
-        </ul></nav>
-        </header>
-        <main>
-        {% block content %}
-        {% endblock %}
-        </main>
-        <footer>
-                <address>
-                Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-                </address>
-        </footer>
-</body>
+      </ul></nav>
+    </header>
+    <main>
+      {% block content %}
+      {% endblock %}
+    </main>
+    <footer>
+      <address>
+        Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>,
+        which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+      </address>
+    </footer>
+  </body>
 </html>
diff --git a/pelican/themes/simple/templates/categories.html b/pelican/themes/simple/templates/categories.html
index 7da19fb4..c723f8a0 100644
--- a/pelican/themes/simple/templates/categories.html
+++ b/pelican/themes/simple/templates/categories.html
@@ -5,8 +5,8 @@
 {% block content %}
     <h2>Categories on {{ SITENAME }}</h2>
     <ul>
-    {% for category, articles in categories|sort %}
-        <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
-    {% endfor %}
+        {% for category, articles in categories|sort %}
+            <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
+        {% endfor %}
     </ul>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/category.html b/pelican/themes/simple/templates/category.html
index 16525fb2..bfad3918 100644
--- a/pelican/themes/simple/templates/category.html
+++ b/pelican/themes/simple/templates/category.html
@@ -3,5 +3,5 @@
 {% block title %}{{ SITENAME|striptags }} - {{ category }} category{% endblock %}
 
 {% block content_title %}
-<h2>Articles in the {{ category }} category</h2>
+    <h2>Articles in the {{ category }} category</h2>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index c9837b54..97caac6a 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -1,27 +1,27 @@
 {% extends "base.html" %}
 {% block content %}
-{% block content_title %}
-<h2>All articles</h2>
-{% endblock %}
+    {% block content_title %}
+        <h2>All articles</h2>
+    {% endblock %}
 
 
-{% for article in articles_page.object_list %}
+    {% for article in articles_page.object_list %}
         <article>
-                <header> <h2><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2> </header>
-                <section>{{ article.summary }}</section>
-                <footer>
-                    <p>Published: <time datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }} </time></p>
-                    <address>By
+            <header> <h2><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2> </header>
+            <section>{{ article.summary }}</section>
+            <footer>
+                <p>Published: <time datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }} </time></p>
+                <address>By
                     {% for author in article.authors %}
                         <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
                     {% endfor %}
-                    </address>
-                </footer>
+                </address>
+            </footer>
         </article>
-{% endfor %}
+    {% endfor %}
 
-{% if articles_page.has_other_pages() %}
-    {% include 'pagination.html' %}
-{% endif %}
+    {% if articles_page.has_other_pages() %}
+        {% include 'pagination.html' %}
+    {% endif %}
 
 {% endblock content %}
diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
index 38452d1d..0eefc7e3 100644
--- a/pelican/themes/simple/templates/page.html
+++ b/pelican/themes/simple/templates/page.html
@@ -13,10 +13,10 @@
 {% endblock %}
 
 {% block content %}
-<article>
-  <header>
-    <h2>{{ page.title }}</h2>
-  </header>
+  <article>
+    <header>
+      <h2>{{ page.title }}</h2>
+    </header>
     {% import 'translations.html' as translations with context %}
     {{ translations.translations_for(page) }}
 
@@ -25,9 +25,9 @@
     {% if page.modified %}
       <footer>
         <p>
-        Last updated: {{ page.locale_modified }}
+          Last updated: {{ page.locale_modified }}
         </p>
       </footer>
     {% endif %}
-</article>
+  </article>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/pagination.html b/pelican/themes/simple/templates/pagination.html
index 45e7f167..9511fdba 100644
--- a/pelican/themes/simple/templates/pagination.html
+++ b/pelican/themes/simple/templates/pagination.html
@@ -1,17 +1,17 @@
 {% if DEFAULT_PAGINATION %}
-{% set first_page = articles_paginator.page(1) %}
-{% set last_page = articles_paginator.page(articles_paginator.num_pages) %}
-<nav>
-  <ul>
-    {% if articles_page.has_previous() %}
+  {% set first_page = articles_paginator.page(1) %}
+  {% set last_page = articles_paginator.page(articles_paginator.num_pages) %}
+  <nav>
+    <ul>
+      {% if articles_page.has_previous() %}
         <li><a href="{{ SITEURL }}/{{ first_page.url }}">&Lang;</a></li>
         <li><a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&lang;</a></li>
-    {% endif %}
-    <li>Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}</li>
-    {% if articles_page.has_next() %}
+      {% endif %}
+      <li>Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}</li>
+      {% if articles_page.has_next() %}
         <li><a href="{{ SITEURL }}/{{ articles_next_page.url }}">&rang;</a></li>
         <li><a href="{{ SITEURL }}/{{ last_page.url }}">&Rang;</a></li>
-    {% endif %}
-  </ul>
-</nav>
+      {% endif %}
+    </ul>
+  </nav>
 {% endif %}
diff --git a/pelican/themes/simple/templates/period_archives.html b/pelican/themes/simple/templates/period_archives.html
index 595def50..181f4937 100644
--- a/pelican/themes/simple/templates/period_archives.html
+++ b/pelican/themes/simple/templates/period_archives.html
@@ -3,12 +3,12 @@
 {% block title %}{{ SITENAME|striptags }} - {{ period | reverse | join(' ') }} archives{% endblock %}
 
 {% block content %}
-<h2>Archives for {{ period | reverse | join(' ') }}</h2>
+    <h2>Archives for {{ period | reverse | join(' ') }}</h2>
 
-<dl>
-{% for article in dates %}
-    <dt>{{ article.locale_date }}</dt>
-    <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
-{% endfor %}
-</dl>
+    <dl>
+        {% for article in dates %}
+            <dt>{{ article.locale_date }}</dt>
+            <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+        {% endfor %}
+    </dl>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/tag.html b/pelican/themes/simple/templates/tag.html
index f9b71f48..be217783 100644
--- a/pelican/themes/simple/templates/tag.html
+++ b/pelican/themes/simple/templates/tag.html
@@ -3,5 +3,5 @@
 {% block title %}{{ SITENAME|striptags }} - {{ tag }} tag{% endblock %}
 
 {% block content_title %}
-<h2>Articles tagged with {{ tag }}</h2>
+    <h2>Articles tagged with {{ tag }}</h2>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/tags.html b/pelican/themes/simple/templates/tags.html
index 6b5c6b1c..b21e5b52 100644
--- a/pelican/themes/simple/templates/tags.html
+++ b/pelican/themes/simple/templates/tags.html
@@ -5,8 +5,8 @@
 {% block content %}
     <h2>Tags for {{ SITENAME }}</h2>
     <ul>
-    {% for tag, articles in tags|sort %}
-        <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
-    {% endfor %}
+        {% for tag, articles in tags|sort %}
+            <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
+        {% endfor %}
     </ul>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/translations.html b/pelican/themes/simple/templates/translations.html
index f0e2478d..eed0703d 100644
--- a/pelican/themes/simple/templates/translations.html
+++ b/pelican/themes/simple/templates/translations.html
@@ -1,16 +1,16 @@
 {% macro translations_for(article) %}
-{% if article.translations %}
-Translations:
-{% for translation in article.translations %}
-<a href="{{ SITEURL }}/{{ translation.url }}" hreflang="{{ translation.lang }}">{{ translation.lang }}</a>
-{% endfor %}
-{% endif %}
+  {% if article.translations %}
+    Translations:
+    {% for translation in article.translations %}
+      <a href="{{ SITEURL }}/{{ translation.url }}" hreflang="{{ translation.lang }}">{{ translation.lang }}</a>
+    {% endfor %}
+  {% endif %}
 {% endmacro %}
 
 {% macro entry_hreflang(entry) %}
-{% if entry.translations %}
-  {% for translation in entry.translations %}
-    <link rel="alternate" hreflang="{{ translation.lang }}" href="{{ SITEURL }}/{{ translation.url }}">
-  {% endfor %}
-{% endif %}
+  {% if entry.translations %}
+    {% for translation in entry.translations %}
+      <link rel="alternate" hreflang="{{ translation.lang }}" href="{{ SITEURL }}/{{ translation.url }}">
+    {% endfor %}
+  {% endif %}
 {% endmacro %}
diff --git a/samples/content/pages/jinja2_template.html b/samples/content/pages/jinja2_template.html
index 1b0dc4e4..32ca857e 100644
--- a/samples/content/pages/jinja2_template.html
+++ b/samples/content/pages/jinja2_template.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
 
-Some text
+    Some text
 
 {% endblock %}

From 37ba4fc21a341c0f81b60d87158fd03eb73bae5b Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 31 May 2024 14:46:06 +0200
Subject: [PATCH 2711/2864] Ignore DjHTML indentation changes in `git blame`

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 2d787f0b..f98a3dca 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -13,3 +13,5 @@ db241feaa445375dc05e189e69287000ffe5fa8e
 9d30c5608a58d202b1c02d55651e6ac746bfb173
 # Apply yet more Ruff checks to code
 7577dd7603f7cb3a09922d1edb65b6eafb6e2ac7
+# Indent Jinja templates, HTML, CSS, and JS via DjHTML
+4af40e80772a58eac8969360e5caeb99e3e26e78

From cbe6c08f444cb583c835830903c4adea57a6d20d Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Fri, 31 May 2024 08:48:32 -0500
Subject: [PATCH 2712/2864] Don't ignore ruff B007, RUF015, PLR1722

---
 pyproject.toml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index b7e39a4a..606a05ba 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -168,7 +168,6 @@ select = [
 
 ignore = [
     # suppression in order of # of violations in Dec 2023:
-    "B007",  # unused-loop-control-variable
     "T201",  # print
     "PLW2901",  # redefined-loop-name
     "SLF001",  # private-member-access
@@ -176,12 +175,18 @@ ignore = [
     "PLR2004",  # magic-value-comparison
     "PLR0912",  # too-many-branches
     "PLR0913",  # too-many-arguments
+    # RUF005: this is a different style of concatenating literals.  It perhaps performs
+    # a bit better, but doesn't seem any more readable to me.  So, ignore it.
     "RUF005",  # collection-literal-concatenation
+    # TODO: several classes have class variables.  If that is correct, we should
+    #   annotate them with ClassVar.
+    # See https://docs.astral.sh/ruff/rules/mutable-class-default/
     "RUF012",  # mutable-class-default
     "PLR0915",  # too-many-statements
+    # Note: we have a couple of "namespace packages" (i.e. missing __init__.py)
+    # Not sure if we should add __init__.py to them, or they really need to be
+    # namespace packages.
     "INP001",  # implicit-namespace-package
-    "RUF015",  # unnecessary-iterable-allocation-for-first-element
-    "PLR1722",  # sys-exit-alias
     # ruff-format wants us to ignore ISC001.  I don't love that, but okay.
     # "warning: The following rules may cause conflicts when used with the formatter:
     #  `ISC001`. To avoid unexpected behavior, we recommend disabling these rules,

From 9b77a9027bea3596c9ced8ba4890c2928e978ce1 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Fri, 31 May 2024 08:48:44 -0500
Subject: [PATCH 2713/2864] File fixes for ruff B007, RUF015, PLR1722

---
 pelican/tests/test_importer.py  | 72 ++++++++++++++++-----------------
 pelican/tests/test_utils.py     | 11 ++---
 pelican/tools/pelican_import.py | 12 +++---
 pelican/utils.py                |  2 +-
 pelican/writers.py              |  2 +-
 5 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 46d83432..b00970f4 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -108,15 +108,15 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         self.assertTrue(self.posts)
         for (
             title,
-            content,
-            fname,
-            date,
-            author,
-            categ,
-            tags,
-            status,
-            kind,
-            format,
+            _content,
+            _fname,
+            _date,
+            _author,
+            _categ,
+            _tags,
+            _status,
+            _kind,
+            _format,
         ) in self.posts:
             self.assertTrue(title.strip())
 
@@ -127,15 +127,15 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         pages_data = []
         for (
             title,
-            content,
+            _content,
             fname,
-            date,
-            author,
-            categ,
-            tags,
-            status,
+            _date,
+            _author,
+            _categ,
+            _tags,
+            _status,
             kind,
-            format,
+            _format,
         ) in self.posts:
             if kind == "page":
                 pages_data.append((title, fname))
@@ -147,7 +147,7 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         silent_f2p = mute(True)(fields2pelican)
         test_post = filter(lambda p: p[0].startswith("Empty Page"), self.posts)
         with temporary_folder() as temp:
-            fname = list(silent_f2p(test_post, "markdown", temp, dirpage=True))[0]
+            fname = next(iter(silent_f2p(test_post, "markdown", temp, dirpage=True)))
             self.assertTrue(fname.endswith("pages%sempty.md" % os.path.sep))
 
     def test_dircat(self):
@@ -176,15 +176,15 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         pages_data = []
         for (
             title,
-            content,
+            _content,
             fname,
-            date,
-            author,
-            categ,
-            tags,
-            status,
+            _date,
+            _author,
+            _categ,
+            _tags,
+            _status,
             kind,
-            format,
+            _format,
         ) in self.posts:
             if kind in {"page", "article"}:
                 pass
@@ -197,15 +197,15 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         cust_data = []
         for (
             title,
-            content,
-            fname,
-            date,
-            author,
-            categ,
-            tags,
-            status,
+            _content,
+            _fname,
+            _date,
+            _author,
+            _categ,
+            _tags,
+            _status,
             kind,
-            format,
+            _format,
         ) in self.custposts:
             if kind in {"page", "article"}:
                 pass
@@ -346,7 +346,7 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         silent_f2p = mute(True)(fields2pelican)
         test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)
         with temporary_folder() as temp:
-            md = [r(f) for f in silent_f2p(test_post, "markdown", temp)][0]
+            md = next(r(f) for f in silent_f2p(test_post, "markdown", temp))
             self.assertTrue(re.search(r"\s+a = \[1, 2, 3\]", md))
             self.assertTrue(re.search(r"\s+b = \[4, 5, 6\]", md))
 
@@ -362,7 +362,7 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         silent_f2p = mute(True)(fields2pelican)
         test_post = filter(lambda p: p[0].startswith("Code in List"), self.posts)
         with temporary_folder() as temp:
-            md = [r(f) for f in silent_f2p(test_post, "markdown", temp)][0]
+            md = next(r(f) for f in silent_f2p(test_post, "markdown", temp))
             sample_line = re.search(r"- This is a code sample", md).group(0)
             code_line = re.search(r"\s+a = \[1, 2, 3\]", md).group(0)
             self.assertTrue(sample_line.rindex("This") < code_line.rindex("a"))
@@ -375,7 +375,7 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         silent_f2p = mute(True)(fields2pelican)
         test_post = filter(lambda p: p[0].startswith("Post with raw data"), self.posts)
         with temporary_folder() as temp:
-            md = [r(f) for f in silent_f2p(test_post, "markdown", temp)][0]
+            md = next(r(f) for f in silent_f2p(test_post, "markdown", temp))
             escaped_quotes = re.search(r'\\[\'"“”‘’]', md)
             self.assertFalse(escaped_quotes)
 
@@ -387,7 +387,7 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         silent_f2p = mute(True)(fields2pelican)
         test_post = filter(lambda p: p[0].startswith("Caption on image"), self.posts)
         with temporary_folder() as temp:
-            md = [r(f) for f in silent_f2p(test_post, "markdown", temp)][0]
+            md = next(r(f) for f in silent_f2p(test_post, "markdown", temp))
 
         caption = re.search(r"\[caption", md)
         self.assertFalse(caption)
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 6c25cf45..beda7140 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -210,13 +210,10 @@ class TestUtils(LoggedTestCase):
             )
 
         # check with preserve case
-        for value, expected in samples:
-            self.assertEqual(
-                utils.slugify(
-                    "Çığ", regex_subs=subs, preserve_case=True, use_unicode=True
-                ),
-                "Çığ",
-            )
+        self.assertEqual(
+            utils.slugify("Çığ", regex_subs=subs, preserve_case=True, use_unicode=True),
+            "Çığ",
+        )
 
         # check normalization
         samples = (
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index c9742d54..39504edb 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -1070,14 +1070,14 @@ def fields2pelican(
                     rc = subprocess.call(cmd, shell=True)
                     if rc < 0:
                         error = "Child was terminated by signal %d" % -rc
-                        exit(error)
+                        sys.exit(error)
 
                     elif rc > 0:
                         error = "Please, check your Pandoc installation."
-                        exit(error)
+                        sys.exit(error)
                 except OSError as e:
                     error = "Pandoc execution failed: %s" % e
-                    exit(error)
+                    sys.exit(error)
 
             with open(out_filename, encoding="utf-8") as fs:
                 content = fs.read()
@@ -1222,18 +1222,18 @@ def main():
             "You must provide one of --blogger, --dotclear, "
             "--medium, --tumblr, --wpfile or --feed options"
         )
-        exit(error)
+        sys.exit(error)
 
     if not os.path.exists(args.output):
         try:
             os.mkdir(args.output)
         except OSError:
             error = "Unable to create the output folder: " + args.output
-            exit(error)
+            sys.exit(error)
 
     if args.wp_attach and input_type != "wordpress":
         error = "You must be importing a wordpress xml to use the --wp-attach option"
-        exit(error)
+        sys.exit(error)
 
     if input_type == "blogger":
         fields = blogger2fields(args.input)
diff --git a/pelican/utils.py b/pelican/utils.py
index b33eaa22..43acdd7f 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -483,7 +483,7 @@ class _HTMLWordTruncator(HTMLParser):
     def getoffset(self) -> int:
         line_start = 0
         lineno, line_offset = self.getpos()
-        for i in range(lineno - 1):
+        for _ in range(lineno - 1):
             line_start = self.rawdata.index("\n", line_start) + 1
         return line_start + line_offset
 
diff --git a/pelican/writers.py b/pelican/writers.py
index 683ae30b..91b1caeb 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -259,7 +259,7 @@ class Writer:
             }
 
             # generated pages, and write
-            for page_num in range(list(paginators.values())[0].num_pages):
+            for page_num in range(next(iter(paginators.values())).num_pages):
                 paginated_kwargs = kwargs.copy()
                 for key in paginators.keys():
                     paginator = paginators[key]

From fc45791da48d363900a202388ffed68d6d705ded Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Fri, 31 May 2024 10:41:09 -0500
Subject: [PATCH 2714/2864] Fix or ignore ruff T201, RUF001, PLR2004, B904,
 SLOT000, PYI024, PIE800

---
 pyproject.toml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 606a05ba..ccd75f9f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -168,11 +168,8 @@ select = [
 
 ignore = [
     # suppression in order of # of violations in Dec 2023:
-    "T201",  # print
     "PLW2901",  # redefined-loop-name
     "SLF001",  # private-member-access
-    "RUF001",  # ambiguous-unicode-character-string
-    "PLR2004",  # magic-value-comparison
     "PLR0912",  # too-many-branches
     "PLR0913",  # too-many-arguments
     # RUF005: this is a different style of concatenating literals.  It perhaps performs
@@ -193,15 +190,10 @@ ignore = [
     #  either by removing them from the `select` or `extend-select` configuration,
     #  or adding them to the `ignore` configuration."
     "ISC001",  # single-line-implicit-string-concatenation
-    "B904",  # raise-without-from-inside-except
     "UP031",  # printf-string-formatting
     # PERF203 has minimal performance impact, and you have to catch the exception
     # inside the loop if you want to ignore it, so let's ignore PERF203.
     "PERF203",  # try-except-in-loop
-    # TODO: these only have one violation each in Dec 2023:
-    "SLOT000",  # no-slots-in-str-subclass
-    "PYI024",  # collections-named-tuple
-    "PIE800",  # unnecessary-spread
 ]
 
 [tool.ruff.lint.extend-per-file-ignores]
@@ -210,3 +202,16 @@ ignore = [
     # allow imports after a call to a function, see the file
     "E402"
 ]
+"pelican/tests/test_utils.py" = [
+    # the tests have a bunch of unicode characters
+    "RUF001"
+]
+"pelican/tests/test_generators.py" = [
+    # the tests have a bunch of constants, why not
+    "PLR2004"
+]
+
+"pelican/tools/*.py}" = [
+    # this is a command-line utility, prints are fine
+    "T201"
+]

From 82b48fcfa12a0fc02c82172f47440870de10ead2 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Fri, 31 May 2024 10:41:24 -0500
Subject: [PATCH 2715/2864] Fixes in files for ruff T201, RUF001, PLR2004,
 B904, SLOT000, PYI024, PIE800

---
 docs/conf.py                        |  2 +-
 pelican/__init__.py                 |  4 ++--
 pelican/generators.py               |  2 +-
 pelican/paginator.py                |  2 +-
 pelican/server.py                   | 14 ++++++--------
 pelican/tests/test_importer.py      |  4 ++--
 pelican/tools/pelican_quickstart.py |  2 +-
 pelican/utils.py                    |  8 ++++----
 8 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 8d8078a2..8f14a018 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@ source_suffix = ".rst"
 master_doc = "index"
 project = project_data.get("name").upper()
 year = datetime.datetime.now().date().year
-copyright = f"2010–{year}"
+copyright = f"2010–{year}"  # noqa: RUF001
 exclude_patterns = ["_build"]
 release = project_data.get("version")
 version = ".".join(release.split(".")[:1])
diff --git a/pelican/__init__.py b/pelican/__init__.py
index ab6b0225..20d17706 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -294,7 +294,7 @@ class ParseOverrides(argparse.Action):
                 raise ValueError(
                     "Extra settings must be specified as KEY=VALUE pairs "
                     f"but you specified {item}"
-                )
+                ) from None
             try:
                 overrides[k] = json.loads(v)
             except json.decoder.JSONDecodeError:
@@ -305,7 +305,7 @@ class ParseOverrides(argparse.Action):
                     "Use -e KEY='\"string\"' to specify a string value; "
                     "-e KEY=null to specify None; "
                     "-e KEY=false (or true) to specify False (or True)."
-                )
+                ) from None
         setattr(namespace, self.dest, overrides)
 
 
diff --git a/pelican/generators.py b/pelican/generators.py
index fdcc62ce..a2bf2f44 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -1040,7 +1040,7 @@ class StaticGenerator(Generator):
         save_as = os.path.join(self.output_path, staticfile.save_as)
         s_mtime = os.path.getmtime(source_path)
         d_mtime = os.path.getmtime(save_as)
-        return s_mtime - d_mtime > 0.000001
+        return s_mtime - d_mtime > 0.000001  # noqa: PLR2004
 
     def _link_or_copy_staticfile(self, sc):
         if self.settings["STATIC_CREATE_LINKS"]:
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 92cb26b1..4a7c1aa2 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -5,7 +5,7 @@ from collections import namedtuple
 from math import ceil
 
 logger = logging.getLogger(__name__)
-PaginationRule = namedtuple(
+PaginationRule = namedtuple(  # noqa: PYI024
     "PaginationRule",
     "min_page URL SAVE_AS",
 )
diff --git a/pelican/server.py b/pelican/server.py
index 71cd2d81..ebf13677 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -53,14 +53,12 @@ class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
 
     extensions_map = {
         **server.SimpleHTTPRequestHandler.extensions_map,
-        **{
-            # web fonts
-            ".oft": "font/oft",
-            ".sfnt": "font/sfnt",
-            ".ttf": "font/ttf",
-            ".woff": "font/woff",
-            ".woff2": "font/woff2",
-        },
+        # web fonts
+        ".oft": "font/oft",
+        ".sfnt": "font/sfnt",
+        ".ttf": "font/ttf",
+        ".woff": "font/woff",
+        ".woff2": "font/woff2",
     }
 
     def translate_path(self, path):
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index b00970f4..0349a175 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -376,7 +376,7 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         test_post = filter(lambda p: p[0].startswith("Post with raw data"), self.posts)
         with temporary_folder() as temp:
             md = next(r(f) for f in silent_f2p(test_post, "markdown", temp))
-            escaped_quotes = re.search(r'\\[\'"“”‘’]', md)
+            escaped_quotes = re.search(r'\\[\'"“”‘’]', md)  # noqa: RUF001
             self.assertFalse(escaped_quotes)
 
     def test_convert_caption_to_figure(self):
@@ -505,7 +505,7 @@ class TestWordpressXMLAttachements(TestCaseWithCLocale):
 
     def test_recognise_attachments(self):
         self.assertTrue(self.attachments)
-        self.assertTrue(len(self.attachments.keys()) == 3)
+        self.assertEqual(3, len(self.attachments.keys()))
 
     def test_attachments_associated_with_correct_post(self):
         self.assertTrue(self.attachments)
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 2f62e4bc..9be107d0 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -79,7 +79,7 @@ _TZ_URL = "https://en.wikipedia.org/wiki/List_of_tz_database_time_zones"
 
 # Create a 'marked' default path, to determine if someone has supplied
 # a path on the command-line.
-class _DEFAULT_PATH_TYPE(str):
+class _DEFAULT_PATH_TYPE(str):  # noqa: SLOT000
     is_default_path = True
 
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 43acdd7f..6dc4825e 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -81,7 +81,7 @@ def strftime(date: datetime.datetime, date_format: str) -> str:
         # test for valid C89 directives only
         if candidate[-1] in c89_directives:
             # check for '-' prefix
-            if len(candidate) == 3:
+            if len(candidate) == 3:  # noqa: PLR2004
                 # '-' prefix
                 candidate = f"%{candidate[-1]}"
                 conversion = strip_zeros
@@ -232,7 +232,7 @@ def get_date(string: str) -> datetime.datetime:
     try:
         return dateutil.parser.parse(string, default=default)
     except (TypeError, ValueError):
-        raise ValueError(f"{string!r} is not a valid date")
+        raise ValueError(f"{string!r} is not a valid date") from None
 
 
 @contextmanager
@@ -666,13 +666,13 @@ def process_translations(
         raise TypeError(
             f"Cannot unpack {translation_id}, 'translation_id' must be falsy, a"
             " string or a collection of strings"
-        )
+        ) from None
     except AttributeError:
         raise AttributeError(
             f"Cannot use {translation_id} as 'translation_id', there "
             "appear to be items without these metadata "
             "attributes"
-        )
+        ) from None
 
     for id_vals, items in groupby(content_list, attrgetter(*translation_id)):
         # prepare warning string

From 3e81af966a88ca68135aedbe51ccf93b0e59f2eb Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Sat, 1 Jun 2024 16:00:07 -0500
Subject: [PATCH 2716/2864] ruff UP031: use format specifiers instead of
 percent format

---
 pyproject.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index ccd75f9f..dd256a44 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -190,7 +190,6 @@ ignore = [
     #  either by removing them from the `select` or `extend-select` configuration,
     #  or adding them to the `ignore` configuration."
     "ISC001",  # single-line-implicit-string-concatenation
-    "UP031",  # printf-string-formatting
     # PERF203 has minimal performance impact, and you have to catch the exception
     # inside the loop if you want to ignore it, so let's ignore PERF203.
     "PERF203",  # try-except-in-loop

From 30bde3823f50b9ba8ac5996c1c46bb72031aa6b8 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Sat, 1 Jun 2024 16:00:17 -0500
Subject: [PATCH 2717/2864] ruff UP031 in files: use format specifiers instead
 of percent format

---
 pelican/contents.py                 |  2 +-
 pelican/generators.py               |  4 +-
 pelican/settings.py                 |  2 +-
 pelican/tests/test_contents.py      |  2 +-
 pelican/tests/test_importer.py      |  2 +-
 pelican/tests/test_pelican.py       |  3 +-
 pelican/tests/test_readers.py       |  3 +-
 pelican/tests/test_utils.py         |  4 +-
 pelican/tools/pelican_import.py     | 57 ++++++++++++++---------------
 pelican/tools/pelican_quickstart.py |  4 +-
 pelican/utils.py                    |  2 +-
 pelican/writers.py                  | 12 +++---
 12 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 21c66296..cf13dabc 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -250,7 +250,7 @@ class Content:
     def get_url_setting(self, key: str) -> str:
         if hasattr(self, "override_" + key):
             return getattr(self, "override_" + key)
-        key = key if self.in_default_lang else "lang_%s" % key
+        key = key if self.in_default_lang else f"lang_{key}"
         return self._expand_settings(key)
 
     def _link_replacer(self, siteurl: str, m: re.Match) -> str:
diff --git a/pelican/generators.py b/pelican/generators.py
index a2bf2f44..73b51713 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -537,9 +537,9 @@ class ArticlesGenerator(CachingGenerator):
         """Generate direct templates pages"""
         for template in self.settings["DIRECT_TEMPLATES"]:
             save_as = self.settings.get(
-                "%s_SAVE_AS" % template.upper(), "%s.html" % template
+                f"{template.upper()}_SAVE_AS", f"{template}.html"
             )
-            url = self.settings.get("%s_URL" % template.upper(), "%s.html" % template)
+            url = self.settings.get(f"{template.upper()}_URL", f"{template}.html")
             if not save_as:
                 continue
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 214d88a3..46b761a5 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -591,7 +591,7 @@ def configure_settings(settings: Settings) -> Settings:
         if os.path.exists(theme_path):
             settings["THEME"] = theme_path
         else:
-            raise Exception("Could not find the theme %s" % settings["THEME"])
+            raise Exception("Could not find the theme {}".format(settings["THEME"]))
 
     # standardize strings to lowercase strings
     for key in ["DEFAULT_LANG"]:
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index d248c3bb..81f8907c 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -282,7 +282,7 @@ class TestPage(TestBase):
             #
             # Until we find some other method to test this functionality, we
             # will simply skip this test.
-            unittest.skip("There is no locale %s in this system." % locale)
+            unittest.skip(f"There is no locale {locale} in this system.")
 
     def test_template(self):
         # Pages default to page, metadata overwrites
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 0349a175..10b0f7f6 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -148,7 +148,7 @@ class TestWordpressXmlImporter(TestCaseWithCLocale):
         test_post = filter(lambda p: p[0].startswith("Empty Page"), self.posts)
         with temporary_folder() as temp:
             fname = next(iter(silent_f2p(test_post, "markdown", temp, dirpage=True)))
-            self.assertTrue(fname.endswith("pages%sempty.md" % os.path.sep))
+            self.assertTrue(fname.endswith(f"pages{os.path.sep}empty.md"))
 
     def test_dircat(self):
         silent_f2p = mute(True)(fields2pelican)
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 075f55eb..ba03b529 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -71,8 +71,7 @@ class TestPelican(LoggedTestCase):
         if proc.returncode != 0:
             msg = self._formatMessage(
                 msg,
-                "%s and %s differ:\nstdout:\n%s\nstderr\n%s"
-                % (left_path, right_path, out, err),
+                f"{left_path} and {right_path} differ:\nstdout:\n{out}\nstderr\n{err}",
             )
             raise self.failureException(msg)
 
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 928eb263..ec366fa8 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -27,8 +27,7 @@ class ReaderTest(unittest.TestCase):
                 self.assertEqual(
                     value,
                     real_value,
-                    "Expected %s to have value %s, but was %s"
-                    % (key, value, real_value),
+                    f"Expected {key} to have value {value}, but was {real_value}",
                 )
             else:
                 self.fail(f"Expected {key} to have value {value}, but was not in Dict")
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index beda7140..f7f11ffb 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -721,11 +721,11 @@ class TestCopy(unittest.TestCase):
 
     def _exist_file(self, *path):
         path = os.path.join(self.root_dir, *path)
-        self.assertTrue(os.path.isfile(path), "File does not exist: %s" % path)
+        self.assertTrue(os.path.isfile(path), f"File does not exist: {path}")
 
     def _exist_dir(self, *path):
         path = os.path.join(self.root_dir, *path)
-        self.assertTrue(os.path.exists(path), "Directory does not exist: %s" % path)
+        self.assertTrue(os.path.exists(path), f"Directory does not exist: {path}")
 
     def test_copy_file_same_path(self):
         self._create_file("a.txt")
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 39504edb..65517f42 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -155,7 +155,7 @@ def wp2fields(xml, wp_custpost=False):
                 # Use HTMLParser due to issues with BeautifulSoup 3
                 title = unescape(item.title.contents[0])
             except IndexError:
-                title = "No title [%s]" % item.find("post_name").string
+                title = "No title [{}]".format(item.find("post_name").string)
                 logger.warning('Post "%s" is lacking a proper title', title)
 
             post_name = item.find("post_name").string
@@ -510,11 +510,10 @@ def tumblr2fields(api_key, blogname):
                 title = post.get("question")
                 content = (
                     "<p>"
-                    '<a href="%s" rel="external nofollow">%s</a>'
-                    ": %s"
+                    '<a href="{}" rel="external nofollow">{}</a>'
+                    ": {}"
                     "</p>\n"
-                    " %s"
-                    % (
+                    " {}".format(
                         post.get("asking_name"),
                         post.get("asking_url"),
                         post.get("question"),
@@ -710,19 +709,19 @@ def build_header(
 
     header = "{}\n{}\n".format(title, "#" * column_width(title))
     if date:
-        header += ":date: %s\n" % date
+        header += f":date: {date}\n"
     if author:
-        header += ":author: %s\n" % author
+        header += f":author: {author}\n"
     if categories:
-        header += ":category: %s\n" % ", ".join(categories)
+        header += ":category: {}\n".format(", ".join(categories))
     if tags:
-        header += ":tags: %s\n" % ", ".join(tags)
+        header += ":tags: {}\n".format(", ".join(tags))
     if slug:
-        header += ":slug: %s\n" % slug
+        header += f":slug: {slug}\n"
     if status:
-        header += ":status: %s\n" % status
+        header += f":status: {status}\n"
     if attachments:
-        header += ":attachments: %s\n" % ", ".join(attachments)
+        header += ":attachments: {}\n".format(", ".join(attachments))
     header += "\n"
     return header
 
@@ -732,21 +731,21 @@ def build_asciidoc_header(
 ):
     """Build a header from a list of fields"""
 
-    header = "= %s\n" % title
+    header = f"= {title}\n"
     if author:
-        header += "%s\n" % author
+        header += f"{author}\n"
         if date:
-            header += "%s\n" % date
+            header += f"{date}\n"
     if categories:
-        header += ":category: %s\n" % ", ".join(categories)
+        header += ":category: {}\n".format(", ".join(categories))
     if tags:
-        header += ":tags: %s\n" % ", ".join(tags)
+        header += ":tags: {}\n".format(", ".join(tags))
     if slug:
-        header += ":slug: %s\n" % slug
+        header += f":slug: {slug}\n"
     if status:
-        header += ":status: %s\n" % status
+        header += f":status: {status}\n"
     if attachments:
-        header += ":attachments: %s\n" % ", ".join(attachments)
+        header += ":attachments: {}\n".format(", ".join(attachments))
     header += "\n"
     return header
 
@@ -755,21 +754,21 @@ def build_markdown_header(
     title, date, author, categories, tags, slug, status=None, attachments=None
 ):
     """Build a header from a list of fields"""
-    header = "Title: %s\n" % title
+    header = f"Title: {title}\n"
     if date:
-        header += "Date: %s\n" % date
+        header += f"Date: {date}\n"
     if author:
-        header += "Author: %s\n" % author
+        header += f"Author: {author}\n"
     if categories:
-        header += "Category: %s\n" % ", ".join(categories)
+        header += "Category: {}\n".format(", ".join(categories))
     if tags:
-        header += "Tags: %s\n" % ", ".join(tags)
+        header += "Tags: {}\n".format(", ".join(tags))
     if slug:
-        header += "Slug: %s\n" % slug
+        header += f"Slug: {slug}\n"
     if status:
-        header += "Status: %s\n" % status
+        header += f"Status: {status}\n"
     if attachments:
-        header += "Attachments: %s\n" % ", ".join(attachments)
+        header += "Attachments: {}\n".format(", ".join(attachments))
     header += "\n"
     return header
 
@@ -1076,7 +1075,7 @@ def fields2pelican(
                         error = "Please, check your Pandoc installation."
                         sys.exit(error)
                 except OSError as e:
-                    error = "Pandoc execution failed: %s" % e
+                    error = f"Pandoc execution failed: {e}"
                     sys.exit(error)
 
             with open(out_filename, encoding="utf-8") as fs:
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 9be107d0..e278e3bc 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -220,7 +220,7 @@ needed by Pelican.
         CONF["basedir"] = open(project).read().rstrip("\n")
         print(
             "Using project associated with current virtual environment. "
-            "Will save to:\n%s\n" % CONF["basedir"]
+            "Will save to:\n{}\n".format(CONF["basedir"])
         )
     else:
         CONF["basedir"] = os.path.abspath(
@@ -394,7 +394,7 @@ needed by Pelican.
         render_jinja_template("tasks.py.jinja2", CONF, "tasks.py")
         render_jinja_template("Makefile.jinja2", CONF, "Makefile")
 
-    print("Done. Your new project is available at %s" % CONF["basedir"])
+    print("Done. Your new project is available at {}".format(CONF["basedir"]))
 
 
 if __name__ == "__main__":
diff --git a/pelican/utils.py b/pelican/utils.py
index 6dc4825e..a29fdf81 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -626,7 +626,7 @@ def truncate_html_words(s: str, num: int, end_text: str = "…") -> str:
         out += " " + end_text
     # Close any tags still open
     for tag in truncator.open_tags:
-        out += "</%s>" % tag
+        out += f"</{tag}>"
     # Return string
     return out
 
diff --git a/pelican/writers.py b/pelican/writers.py
index 91b1caeb..1a2cf7b0 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -107,14 +107,14 @@ class Writer:
         """
         if filename in self._overridden_files:
             if override:
-                raise RuntimeError("File %s is set to be overridden twice" % filename)
+                raise RuntimeError(f"File {filename} is set to be overridden twice")
             logger.info("Skipping %s", filename)
             filename = os.devnull
         elif filename in self._written_files:
             if override:
                 logger.info("Overwriting %s", filename)
             else:
-                raise RuntimeError("File %s is to be overwritten" % filename)
+                raise RuntimeError(f"File {filename} is to be overwritten")
         if override:
             self._overridden_files.add(filename)
         self._written_files.add(filename)
@@ -272,10 +272,10 @@ class Writer:
                     )
                     paginated_kwargs.update(
                         {
-                            "%s_paginator" % key: paginator,
-                            "%s_page" % key: page,
-                            "%s_previous_page" % key: previous_page,
-                            "%s_next_page" % key: next_page,
+                            f"{key}_paginator": paginator,
+                            f"{key}_page": page,
+                            f"{key}_previous_page": previous_page,
+                            f"{key}_next_page": next_page,
                         }
                     )
 

From b77bb690e260a84879b7980c58d858244f556d31 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Sat, 1 Jun 2024 18:13:05 -0500
Subject: [PATCH 2718/2864] Improve test coverage, docs, and .gitignore

---
 .coveragerc                                   |  4 +-
 .gitignore                                    |  6 +++
 docs/contribute.rst                           | 28 ++++++++++++++
 .../article_with_md_extension.md              |  1 +
 pelican/tests/test_pelican.py                 | 37 ++++++++++++++++++-
 5 files changed, 73 insertions(+), 3 deletions(-)
 create mode 120000 pelican/tests/simple_content/article_with_md_extension.md

diff --git a/.coveragerc b/.coveragerc
index fdd2cad6..6347d80b 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,2 +1,4 @@
 [report]
-omit = pelican/tests/*
+omit =
+       pelican/tests/*
+       pelican/signals.py
diff --git a/.gitignore b/.gitignore
index 473efea2..65e4d759 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,9 @@ samples/output
 *.lock
 .pdm-python
 .venv
+
+# direnv
+.envrc
+
+# pycharm
+.idea
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 6a5a417e..419ba80f 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -64,6 +64,20 @@ your bug fix or feature::
 Now you can make changes to Pelican, its documentation, and/or other aspects of
 the project.
 
+Setting up git blame
+--------------------
+
+``git blame`` annotates lines from a file with information about the pull request
+that last modified it.  Sweeping shallow changes (like formatting) can make that
+information less useful, so we keep a list of such changes to be ignored.  To set
+that up in your repository::
+
+    git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+For more information, see here_.
+
+.. _here: https://www.michaelheap.com/git-ignore-rev/
+
 Running the test suite
 ----------------------
 
@@ -108,6 +122,20 @@ environments.
 
 .. _Tox: https://tox.readthedocs.io/en/latest/
 
+Running a code coverage report
+------------------------------
+
+The code is more likely to stay robust if it is tested.
+coverage_ is a library that measures how much of the code is tested.
+To run it::
+
+    invoke coverage
+    open htmlcov/index.html
+
+The HTML will show overall coverage, coverage per file, and even line-by-line coverage.
+
+.. _coverage: https://github.com/nedbat/coveragepy
+
 Building the docs
 -----------------
 
diff --git a/pelican/tests/simple_content/article_with_md_extension.md b/pelican/tests/simple_content/article_with_md_extension.md
new file mode 120000
index 00000000..00a11ad3
--- /dev/null
+++ b/pelican/tests/simple_content/article_with_md_extension.md
@@ -0,0 +1 @@
+../content/article_with_md_extension.md
\ No newline at end of file
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index 075f55eb..2bea1e4e 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -1,3 +1,5 @@
+import contextlib
+import io
 import locale
 import logging
 import os
@@ -6,9 +8,12 @@ import sys
 import unittest
 from collections.abc import Sequence
 from shutil import rmtree
-from tempfile import mkdtemp
+from tempfile import TemporaryDirectory, mkdtemp
+from unittest.mock import patch
 
-from pelican import Pelican
+from rich.console import Console
+
+from pelican import Pelican, __version__, main
 from pelican.generators import StaticGenerator
 from pelican.settings import read_settings
 from pelican.tests.support import (
@@ -271,3 +276,31 @@ class TestPelican(LoggedTestCase):
             [sys.executable, "-m", "pelican", "--help"]
         ).decode("ascii", "replace")
         assert "usage:" in output
+
+    def test_main_version(self):
+        """Run main --version."""
+        out = io.StringIO()
+        with contextlib.redirect_stdout(out):
+            with self.assertRaises(SystemExit):
+                main(["--version"])
+            self.assertEqual(f"{__version__}\n", out.getvalue())
+
+    def test_main_help(self):
+        """Run main --help."""
+        out = io.StringIO()
+        with contextlib.redirect_stdout(out):
+            with self.assertRaises(SystemExit):
+                main(["--help"])
+            self.assertIn("A tool to generate a static blog", out.getvalue())
+
+    def test_main_on_content(self):
+        """Invoke main on simple_content directory."""
+        out, err = io.StringIO(), io.StringIO()
+        with contextlib.redirect_stdout(out), contextlib.redirect_stderr(err):
+            with TemporaryDirectory() as temp_dir:
+                # Don't highlight anything.
+                # See https://rich.readthedocs.io/en/stable/highlighting.html
+                with patch("pelican.console", new=Console(highlight=False)):
+                    main(["-o", temp_dir, "pelican/tests/simple_content"])
+            self.assertIn("Processed 1 article", out.getvalue())
+            self.assertEqual("", err.getvalue())

From af9865d31751c2bbe783cfc1e23fafed5e216129 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 2 Jun 2024 09:01:21 +0200
Subject: [PATCH 2719/2864] Ignore Ruff UP031 fixes in `git blame`

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index f98a3dca..ac9f882e 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -15,3 +15,5 @@ db241feaa445375dc05e189e69287000ffe5fa8e
 7577dd7603f7cb3a09922d1edb65b6eafb6e2ac7
 # Indent Jinja templates, HTML, CSS, and JS via DjHTML
 4af40e80772a58eac8969360e5caeb99e3e26e78
+# Ruff UP031: Use F-string format specifiers instead of percent format
+30bde3823f50b9ba8ac5996c1c46bb72031aa6b8

From 8c7c29e4f2a35124f2bfe7905fd0a5a334f7e056 Mon Sep 17 00:00:00 2001
From: boxydog <93335439+boxydog@users.noreply.github.com>
Date: Sun, 2 Jun 2024 14:03:56 -0500
Subject: [PATCH 2720/2864] Add dependabot checking (#5)

---
 .github/dependabot.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..5968b41d
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+# See https://docs.github.com/en/free-pro-team@latest/
+#  github/administering-a-repository/enabling-and-disabling-version-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10

From fd955ba05497c8add703fdb9d0e9788fc1aa90bf Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Jun 2024 19:16:58 +0200
Subject: [PATCH 2721/2864] Show missing line numbers via `invoke coverage`

Also includes a change that causes this command to return a failing
status when coverage drops below its current value of 74.8%.
---
 tasks.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tasks.py b/tasks.py
index 64409e20..9a7564b2 100644
--- a/tasks.py
+++ b/tasks.py
@@ -47,7 +47,11 @@ def tests(c):
 @task
 def coverage(c):
     """Generate code coverage of running the test suite."""
-    c.run(f"{VENV_BIN}/pytest --cov=pelican", pty=PTY)
+    c.run(
+        f"{VENV_BIN}/pytest --cov=pelican --cov-report term-missing "
+        "--cov-fail-under 74.8",
+        pty=PTY,
+    )
     c.run(f"{VENV_BIN}/coverage html", pty=PTY)
 
 

From e262990c689c6895a4724a7fd2c42412a8dca6a6 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Jun 2024 19:23:46 +0200
Subject: [PATCH 2722/2864] Tweak docs about test coverage and `git blame`

---
 docs/contribute.rst | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 419ba80f..07cf998a 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -64,19 +64,26 @@ your bug fix or feature::
 Now you can make changes to Pelican, its documentation, and/or other aspects of
 the project.
 
-Setting up git blame
---------------------
+Setting up ``git blame`` (optional)
+-----------------------------------
 
-``git blame`` annotates lines from a file with information about the pull request
-that last modified it.  Sweeping shallow changes (like formatting) can make that
-information less useful, so we keep a list of such changes to be ignored.  To set
-that up in your repository::
+``git blame`` annotates lines in a file with information about the pull request
+that last modified it. Sweeping shallow changes (like formatting) can make that
+information less useful, so we keep a list of such changes to be ignored. Run the
+following command to set this up in your repository, adding ``--global`` if you
+want this setting to apply to all repositories::
 
     git config blame.ignoreRevsFile .git-blame-ignore-revs
 
-For more information, see here_.
+As noted in a `useful article`_ about ``git blame``, there are other related
+settings you may find to be beneficial::
 
-.. _here: https://www.michaelheap.com/git-ignore-rev/
+    # Add `?` to any lines that have had a commit skipped using --ignore-rev
+    git config --global blame.markIgnoredLines true
+    # Add `*` to any lines that were added in a skipped commit and can not be attributed
+    git config --global blame.markUnblamableLines true
+
+.. _useful article: https://www.michaelheap.com/git-ignore-rev/
 
 Running the test suite
 ----------------------
@@ -125,16 +132,17 @@ environments.
 Running a code coverage report
 ------------------------------
 
-The code is more likely to stay robust if it is tested.
-coverage_ is a library that measures how much of the code is tested.
-To run it::
+Code is more likely to stay robust if it is tested. Coverage_ is a library that
+measures how much of the code is tested. To run it::
 
     invoke coverage
+
+This will show overall coverage, coverage per file, and even line-by-line coverage.
+There is also an HTML report available::
+
     open htmlcov/index.html
 
-The HTML will show overall coverage, coverage per file, and even line-by-line coverage.
-
-.. _coverage: https://github.com/nedbat/coveragepy
+.. _Coverage: https://github.com/nedbat/coveragepy
 
 Building the docs
 -----------------

From b80a592d305834b08735b4aa10c050b4e77f15da Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 16 Jun 2024 19:37:23 +0200
Subject: [PATCH 2723/2864] Lower minimum coverage required in `invoke
 coverage`

---
 tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks.py b/tasks.py
index 9a7564b2..3a1722eb 100644
--- a/tasks.py
+++ b/tasks.py
@@ -49,7 +49,7 @@ def coverage(c):
     """Generate code coverage of running the test suite."""
     c.run(
         f"{VENV_BIN}/pytest --cov=pelican --cov-report term-missing "
-        "--cov-fail-under 74.8",
+        "--cov-fail-under 74",
         pty=PTY,
     )
     c.run(f"{VENV_BIN}/coverage html", pty=PTY)

From dc40474e29f5bd3c32a354377ea666908016db41 Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanh@users.noreply.github.com>
Date: Tue, 11 Jun 2024 19:38:08 +0100
Subject: [PATCH 2724/2864] Use Dependabot to keep GitHub Actions up to date

Configure Dependabot to send automated PRs to update the version numbers
in `.github/workflows/*.yml` when new versions of actions are released.

See:

https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
---
 .github/dependabot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5968b41d..a0a90b94 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,3 +8,7 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

From e46595cdacc57d8a76e8945c7aab5e28686b7f9d Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanh@users.noreply.github.com>
Date: Tue, 11 Jun 2024 20:03:12 +0100
Subject: [PATCH 2725/2864] Add theme, Python version, siteurl and feed_domain
 to GitHub Pages deployment workflow

Add theme, Python version, siteurl and feed_domain support to the
reusable GitHub Actions workflow for deploying a Pelican site to GitHub
Pages:

1. Add a new `theme` option to the workflow that callers can use to
   specify an external theme to be checked out and used

2. Add a new `python` option to the workflow that callers can use to
   specify the Python version, in case they need to build their site
   with a particular version of Python

3. Pass `--extra-settings FEED_DOMAIN='"${{ steps.pages.outputs.base_url }}"'`
   to the `pelican` command to set the value of Pelican's `FEED_DOMAIN`
   setting for feed URLs.

4. Add a `feed_domain` input to the workflow so that users can override
   the feed domain if they need to.

5. Add a `siteurl` input to the workflow so that users can override the
   site URL if they need to.

6. Add a note to the docs about GitHub Pages generating http:// URLs for
   https:// sites, and how to fix it

7. Some light editing of the docs for the workflow
---
 .github/workflows/github_pages.yml | 43 +++++++++++++--
 docs/tips.rst                      | 88 +++++++++++++++++++++---------
 2 files changed, 100 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index f4a01b92..efe6959c 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -17,6 +17,26 @@ on:
         default: "output/"
         description: "Where to output the generated files (`pelican`'s `--output` option)"
         type: string
+      theme:
+        required: false
+        default: ""
+        description: "The GitHub repo URL of a custom theme to use, for example: 'https://github.com/seanh/sidecar.git'"
+        type: string
+      python:
+        required: false
+        default: "3.12"
+        description: "The version of Python to use, for example: '3.12' (to use the most recent version of Python 3.12, this is faster) or '3.12.1' (to use an exact version, slower)"
+        type: string
+      siteurl:
+        required: false
+        default: ""
+        description: "The base URL of your web site (Pelican's SITEURL setting). If not passed this will default to the URL of your GitHub Pages site, which is correct in most cases."
+        type: string
+      feed_domain:
+        required: false
+        default: ""
+        description: "The domain to be prepended to feed URLs (Pelican's FEED_DOMAIN setting). If not passed this will default to the URL of your GitHub Pages site, which is correct in most cases."
+        type: string
 permissions:
   contents: read
   pages: write
@@ -33,18 +53,31 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: ${{ inputs.python }}
+      - name: Checkout theme
+        if: ${{ inputs.theme }}
+        run: git clone '${{ inputs.theme }}' .theme
       - name: Configure GitHub Pages
         id: pages
         uses: actions/configure-pages@v3
       - name: Install requirements
         run: pip install ${{ inputs.requirements }}
       - name: Build Pelican site
+        shell: python
         run: |
-          pelican \
-            --settings "${{ inputs.settings }}" \
-            --extra-settings SITEURL='"${{ steps.pages.outputs.base_url }}"' \
-            --output "${{ inputs.output-path }}"
+          import subprocess
+
+          cmd = "pelican"
+          cmd += " --settings ${{ inputs.settings }}"
+          cmd += " --extra-settings"
+          cmd += """ SITEURL='"${{ inputs.siteurl || steps.pages.outputs.base_url }}"'"""
+          cmd += """ FEED_DOMAIN='"${{ inputs.feed_domain || steps.pages.outputs.base_url }}"'"""
+          cmd += " --output ${{ inputs.output-path }}"
+
+          if "${{ inputs.theme }}":
+              cmd += " --theme-path .theme"
+
+          subprocess.run(cmd, shell=True, check=True)
       - name: Fix permissions
         run: |
           chmod -c -R +rX "${{ inputs.output-path }}" | while read line; do
diff --git a/docs/tips.rst b/docs/tips.rst
index 3344900d..5d75e4fb 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -163,8 +163,8 @@ Pelican-powered sites can be published to GitHub Pages via a `custom workflow
 
 Notes:
 
-* You don't need to set ``SITEURL`` in your Pelican settings: the workflow will
-  set it for you
+* You don't need to set ``SITEURL`` or ``FEED_DOMAIN`` in your Pelican
+  settings: the workflow will set them correctly for you
 
 * You don't need to commit your ``--output`` / ``OUTPUT_PATH`` directory
   (``output/``) to git: the workflow will run ``pelican`` to build the output
@@ -174,36 +174,72 @@ See `GitHub's docs about reusable workflows <https://docs.github.com/en/actions/
 for more information.
 
 A number of optional inputs can be added to the ``with:`` block when calling
-the workflow:
-
-+--------------+----------+-----------------------------------+--------+---------------+
-| Name         | Required | Description                       | Type   | Default       |
-+==============+==========+===================================+========+===============+
-| settings     | Yes      | The path to your Pelican settings | string |               |
-|              |          | file (``pelican``'s               |        |               |
-|              |          | ``--settings`` option),           |        |               |
-|              |          | for example: ``"publishconf.py"`` |        |               |
-+--------------+----------+-----------------------------------+--------+---------------+
-| requirements | No       | The Python requirements to        | string | ``"pelican"`` |
-|              |          | install, for example to enable    |        |               |
-|              |          | markdown and typogrify use:       |        |               |
-|              |          | ``"pelican[markdown] typogrify"`` |        |               |
-|              |          | or if you have a requirements     |        |               |
-|              |          | file: ``"-r requirements.txt"``   |        |               |
-+--------------+----------+-----------------------------------+--------+---------------+
-| output-path  | No       | Where to output the generated     | string | ``"output/"`` |
-|              |          | files (``pelican``'s ``--output`` |        |               |
-|              |          | option)                           |        |               |
-+--------------+----------+-----------------------------------+--------+---------------+
-
-For example:
+the workflow, for example:
 
 .. code-block:: yaml
 
     with:
       settings: "publishconf.py"
       requirements: "pelican[markdown] typogrify"
-      output-path: "__output__/"
+      theme: "https://github.com/seanh/sidecar.git"
+      python: "3.12"
+
+Here's the complete list of workflow inputs:
+
++------------------+----------+--------------------------------------------+--------+---------------+
+| Name             | Required | Description                                | Type   | Default       |
++==================+==========+============================================+========+===============+
+| ``settings``     | Yes      | The path to your Pelican settings          | string |               |
+|                  |          | file (``pelican``'s                        |        |               |
+|                  |          | ``--settings`` option),                    |        |               |
+|                  |          | for example: ``"publishconf.py"``          |        |               |
++------------------+----------+--------------------------------------------+--------+---------------+
+| ``requirements`` | No       | The Python requirements to                 | string | ``"pelican"`` |
+|                  |          | install, for example to enable             |        |               |
+|                  |          | markdown and typogrify use:                |        |               |
+|                  |          | ``"pelican[markdown] typogrify"``          |        |               |
+|                  |          | or if you have a requirements              |        |               |
+|                  |          | file: ``"-r requirements.txt"``            |        |               |
++------------------+----------+--------------------------------------------+--------+---------------+
+| ``output-path``  | No       | Where to output the generated              | string | ``"output/"`` |
+|                  |          | files (``pelican``'s ``--output``          |        |               |
+|                  |          | option)                                    |        |               |
++------------------+----------+--------------------------------------------+--------+---------------+
+| ``theme``        | No       | The GitHub repo URL of a custom            | string | ``""``        |
+|                  |          | theme to use, for example:                 |        |               |
+|                  |          | ``"https://github.com/seanh/sidecar.git"`` |        |               |
++------------------+----------+--------------------------------------------+--------+---------------+
+| ``python``       | No       | The version of Python to use to build the  | string | ``"3.12"``    |
+|                  |          | site, for example: ``"3.12"`` (to use the  |        |               |
+|                  |          | most recent version of Python 3.12, this   |        |               |
+|                  |          | is faster) or ``"3.12.1"`` (to use an      |        |               |
+|                  |          | exact version, slower)                     |        |               |
++------------------+----------+--------------------------------------------+--------+---------------+
+| ``siteurl``      | No       | The base URL of your web site (Pelican's   | string | The URL of    |
+|                  |          | ``SITEURL`` setting). If not passed this   |        | your GitHub   |
+|                  |          | will default to the URL of your GitHub     |        | Pages site.   |
+|                  |          | Pages site, which is correct in most       |        |               |
+|                  |          | cases.                                     |        |               |
++------------------+----------+--------------------------------------------+--------+---------------+
+| ``feed_domain``  |          | The domain to be prepended to feed URLs    | string | The URL of    |
+|                  |          | (Pelican's ``FEED_DOMAIN`` setting). If    |        | your GitHub   |
+|                  |          | not passed this will default to the URL of |        | Pages site.   |
+|                  |          | your GitHub Pages site, which is correct   |        |               |
+|                  |          | in most cases.                             |        |               |
++------------------+----------+--------------------------------------------+--------+---------------+
+
+
+"Insecure content" warnings from browsers
+"""""""""""""""""""""""""""""""""""""""""
+
+If your site uses ``https://`` and is broken because the browser is blocking
+network requests (for example for CSS files) due to "insecure content" this
+may be because GitHub Pages is generating ``http://`` URLs for your site.
+
+To fix this go into your site repo's settings and enable the **Enforce HTTPS** setting:
+go to **Settings → Pages** and check **Enforce HTTPS**.
+Then re-run the workflow to re-deploy your site.
+Alternatively, you can use the workflow's ``siteurl`` and ``feed_domain`` settings.
 
 Custom 404 Pages
 ----------------

From f19de98b9e6495bf42154ef6dd763b6b8c486fde Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Mon, 17 Jun 2024 08:11:21 -0500
Subject: [PATCH 2726/2864] Log warnings about files that would have been
 processed by disabled readers

---
 pelican/__init__.py           |  5 +++--
 pelican/generators.py         | 27 +++++++++++++++++++++++-
 pelican/readers.py            | 39 ++++++++++++++++++++++++++++++-----
 pelican/tests/test_pelican.py | 24 ++++++++++++++++++++-
 pelican/tests/test_readers.py | 15 +++++++++++++-
 pelican/tests/test_utils.py   |  7 +++++++
 pelican/utils.py              | 15 +++++++++++---
 7 files changed, 119 insertions(+), 13 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 20d17706..96849bae 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -30,7 +30,6 @@ from pelican.generators import (
 )
 from pelican.plugins import signals
 from pelican.plugins._utils import get_plugin_name, load_plugins
-from pelican.readers import Readers
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import read_settings
 from pelican.utils import clean_output_dir, maybe_pluralize, wait_for_changes
@@ -126,6 +125,8 @@ class Pelican:
         for p in generators:
             if hasattr(p, "generate_context"):
                 p.generate_context()
+            if hasattr(p, "check_disabled_readers"):
+                p.check_disabled_readers()
 
         # for plugins that create/edit the summary
         logger.debug("Signal all_generators_finalized.send(<generators>)")
@@ -573,7 +574,7 @@ def autoreload(args, excqueue=None):
         try:
             pelican.run()
 
-            changed_files = wait_for_changes(args.settings, Readers, settings)
+            changed_files = wait_for_changes(args.settings, settings)
             changed_files = {c[1] for c in changed_files}
 
             if settings_file in changed_files:
diff --git a/pelican/generators.py b/pelican/generators.py
index 73b51713..548c494f 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -7,6 +7,7 @@ from collections import defaultdict
 from functools import partial
 from itertools import chain, groupby
 from operator import attrgetter
+from typing import List, Optional, Set
 
 from jinja2 import (
     BaseLoader,
@@ -156,7 +157,9 @@ class Generator:
 
         return False
 
-    def get_files(self, paths, exclude=None, extensions=None):
+    def get_files(
+        self, paths, exclude: Optional[List[str]] = None, extensions=None
+    ) -> Set[str]:
         """Return a list of files to use, based on rules
 
         :param paths: the list pf paths to search (relative to self.path)
@@ -250,6 +253,13 @@ class Generator:
         # return the name of the class for logging purposes
         return self.__class__.__name__
 
+    def _check_disabled_readers(self, paths, exclude: Optional[List[str]]) -> None:
+        """Log warnings for files that would have been processed by disabled readers."""
+        for fil in self.get_files(
+            paths, exclude=exclude, extensions=self.readers.disabled_extensions
+        ):
+            self.readers.check_file(fil)
+
 
 class CachingGenerator(Generator, FileStampDataCacher):
     """Subclass of Generator and FileStampDataCacher classes
@@ -643,6 +653,11 @@ class ArticlesGenerator(CachingGenerator):
         self.generate_authors(write)
         self.generate_drafts(write)
 
+    def check_disabled_readers(self) -> None:
+        self._check_disabled_readers(
+            self.settings["ARTICLE_PATHS"], exclude=self.settings["ARTICLE_EXCLUDES"]
+        )
+
     def generate_context(self):
         """Add the articles into the shared context"""
 
@@ -849,6 +864,11 @@ class PagesGenerator(CachingGenerator):
         super().__init__(*args, **kwargs)
         signals.page_generator_init.send(self)
 
+    def check_disabled_readers(self) -> None:
+        self._check_disabled_readers(
+            self.settings["PAGE_PATHS"], exclude=self.settings["PAGE_EXCLUDES"]
+        )
+
     def generate_context(self):
         all_pages = []
         hidden_pages = []
@@ -953,6 +973,11 @@ class StaticGenerator(Generator):
         self.fallback_to_symlinks = False
         signals.static_generator_init.send(self)
 
+    def check_disabled_readers(self) -> None:
+        self._check_disabled_readers(
+            self.settings["STATIC_PATHS"], exclude=self.settings["STATIC_EXCLUDES"]
+        )
+
     def generate_context(self):
         self.staticfiles = []
         linked_files = set(self.context["static_links"])
diff --git a/pelican/readers.py b/pelican/readers.py
index 422f39fc..ee7e3466 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -17,7 +17,7 @@ from pelican import rstdirectives  # NOQA
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Author, Category, Page, Tag
 from pelican.plugins import signals
-from pelican.utils import get_date, pelican_open, posixize_path
+from pelican.utils import file_suffix, get_date, pelican_open, posixize_path
 
 try:
     from markdown import Markdown
@@ -125,6 +125,10 @@ class BaseReader:
         metadata = {}
         return content, metadata
 
+    def disabled_message(self) -> str:
+        """Message about why this plugin was disabled."""
+        return ""
+
 
 class _FieldBodyTranslator(HTMLTranslator):
     def __init__(self, document):
@@ -347,6 +351,12 @@ class MarkdownReader(BaseReader):
             metadata = {}
         return content, metadata
 
+    def disabled_message(self) -> str:
+        return (
+            "Could not import markdown.Markdown.  "
+            "Have you installed the markdown package?"
+        )
+
 
 class HTMLReader(BaseReader):
     """Parses HTML files as input, looking for meta, title, and body tags"""
@@ -508,17 +518,23 @@ class Readers(FileStampDataCacher):
     def __init__(self, settings=None, cache_name=""):
         self.settings = settings or {}
         self.readers = {}
+        self.disabled_readers = {}
+        # extension => reader for readers that are enabled
         self.reader_classes = {}
+        # extension => reader for readers that are not enabled
+        disabled_reader_classes = {}
 
         for cls in [BaseReader] + BaseReader.__subclasses__():
             if not cls.enabled:
                 logger.debug(
                     "Missing dependencies for %s", ", ".join(cls.file_extensions)
                 )
-                continue
 
             for ext in cls.file_extensions:
-                self.reader_classes[ext] = cls
+                if cls.enabled:
+                    self.reader_classes[ext] = cls
+                else:
+                    disabled_reader_classes[ext] = cls
 
         if self.settings["READERS"]:
             self.reader_classes.update(self.settings["READERS"])
@@ -531,6 +547,9 @@ class Readers(FileStampDataCacher):
 
             self.readers[fmt] = reader_class(self.settings)
 
+        for fmt, reader_class in disabled_reader_classes.items():
+            self.disabled_readers[fmt] = reader_class(self.settings)
+
         # set up caching
         cache_this_level = (
             cache_name != "" and self.settings["CONTENT_CACHING_LAYER"] == "reader"
@@ -541,8 +560,13 @@ class Readers(FileStampDataCacher):
 
     @property
     def extensions(self):
+        """File extensions that will be processed by a reader."""
         return self.readers.keys()
 
+    @property
+    def disabled_extensions(self):
+        return self.disabled_readers.keys()
+
     def read_file(
         self,
         base_path,
@@ -562,8 +586,7 @@ class Readers(FileStampDataCacher):
         logger.debug("Read file %s -> %s", source_path, content_class.__name__)
 
         if not fmt:
-            _, ext = os.path.splitext(os.path.basename(path))
-            fmt = ext[1:]
+            fmt = file_suffix(path)
 
         if fmt not in self.readers:
             raise TypeError("Pelican does not know how to parse %s", path)
@@ -654,6 +677,12 @@ class Readers(FileStampDataCacher):
             context=context,
         )
 
+    def check_file(self, source_path: str) -> None:
+        """Log a warning if a file is processed by a disabled reader."""
+        reader = self.disabled_readers.get(file_suffix(source_path), None)
+        if reader:
+            logger.warning(f"{source_path}: {reader.disabled_message()}")
+
 
 def find_empty_alt(content, path):
     """Find images with empty alt
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index add5f576..e243be61 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -9,10 +9,11 @@ import unittest
 from collections.abc import Sequence
 from shutil import rmtree
 from tempfile import TemporaryDirectory, mkdtemp
-from unittest.mock import patch
+from unittest.mock import PropertyMock, patch
 
 from rich.console import Console
 
+import pelican.readers
 from pelican import Pelican, __version__, main
 from pelican.generators import StaticGenerator
 from pelican.settings import read_settings
@@ -303,3 +304,24 @@ class TestPelican(LoggedTestCase):
                     main(["-o", temp_dir, "pelican/tests/simple_content"])
             self.assertIn("Processed 1 article", out.getvalue())
             self.assertEqual("", err.getvalue())
+
+    def test_main_on_content_markdown_disabled(self):
+        """Invoke main on simple_content directory."""
+        with patch.object(
+            pelican.readers.MarkdownReader, "enabled", new_callable=PropertyMock
+        ) as attr_mock:
+            attr_mock.return_value = False
+            out, err = io.StringIO(), io.StringIO()
+            with contextlib.redirect_stdout(out), contextlib.redirect_stderr(err):
+                with TemporaryDirectory() as temp_dir:
+                    # Don't highlight anything.
+                    # See https://rich.readthedocs.io/en/stable/highlighting.html
+                    with patch("pelican.console", new=Console(highlight=False)):
+                        main(["-o", temp_dir, "pelican/tests/simple_content"])
+                self.assertIn("Processed 0 articles", out.getvalue())
+                self.assertLogCountEqual(
+                    1,
+                    ".*article_with_md_extension.md: "
+                    "Could not import markdown.Markdown.  "
+                    "Have you installed the markdown package?",
+                )
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index ec366fa8..68938a83 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -1,5 +1,5 @@
 import os
-from unittest.mock import patch
+from unittest.mock import PropertyMock, patch
 
 from pelican import readers
 from pelican.tests.support import get_settings, unittest
@@ -32,6 +32,19 @@ class ReaderTest(unittest.TestCase):
             else:
                 self.fail(f"Expected {key} to have value {value}, but was not in Dict")
 
+    def test_markdown_disabled(self):
+        with patch.object(
+            readers.MarkdownReader, "enabled", new_callable=PropertyMock
+        ) as attr_mock:
+            attr_mock.return_value = False
+            readrs = readers.Readers(settings=get_settings())
+            self.assertEqual(
+                set(readers.MarkdownReader.file_extensions),
+                readrs.disabled_readers.keys(),
+            )
+            for val in readrs.disabled_readers.values():
+                self.assertEqual(readers.MarkdownReader, val.__class__)
+
 
 class TestAssertDictHasSubset(ReaderTest):
     def setUp(self):
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index f7f11ffb..0da59dd4 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -966,3 +966,10 @@ class TestMemoized(unittest.TestCase):
             container.get.cache.clear()
             self.assertEqual("bar", container.get("bar"))
             get_mock.assert_called_once_with("bar")
+
+
+class TestStringUtils(unittest.TestCase):
+    def test_file_suffix(self):
+        self.assertEqual("", utils.file_suffix(""))
+        self.assertEqual("", utils.file_suffix("foo"))
+        self.assertEqual("md", utils.file_suffix("foo.md"))
diff --git a/pelican/utils.py b/pelican/utils.py
index a29fdf81..b780ab97 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -29,6 +29,7 @@ from typing import (
 )
 
 import dateutil.parser
+from watchfiles import Change
 
 try:
     from zoneinfo import ZoneInfo
@@ -39,7 +40,6 @@ from markupsafe import Markup
 
 if TYPE_CHECKING:
     from pelican.contents import Content
-    from pelican.readers import Readers
     from pelican.settings import Settings
 
 logger = logging.getLogger(__name__)
@@ -797,9 +797,8 @@ def order_content(
 
 def wait_for_changes(
     settings_file: str,
-    reader_class: type[Readers],
     settings: Settings,
-):
+) -> set[tuple[Change, str]]:
     content_path = settings.get("PATH", "")
     theme_path = settings.get("THEME", "")
     ignore_files = {
@@ -924,3 +923,13 @@ def temporary_locale(
         locale.setlocale(lc_category, temp_locale)
     yield
     locale.setlocale(lc_category, orig_locale)
+
+
+def file_suffix(path: str) -> str:
+    """Return the suffix of a filename in a path."""
+    _, ext = os.path.splitext(os.path.basename(path))
+    ret = ""
+    if len(ext) > 1:
+        # drop the ".", e.g., "exe", not ".exe"
+        ret = ext[1:]
+    return ret

From 135c61f769b963efeb5cc61f9d4332fd887a0b30 Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanh@users.noreply.github.com>
Date: Mon, 17 Jun 2024 16:38:10 +0100
Subject: [PATCH 2727/2864] Add Dependabot to GitHub Actions workflow docs

---
 docs/tips.rst | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/tips.rst b/docs/tips.rst
index 5d75e4fb..338dbe1f 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -152,6 +152,25 @@ Pelican-powered sites can be published to GitHub Pages via a `custom workflow
            with:
              settings: "publishconf.py"
 
+   You may want to replace the ``@master`` with the ID of a specific commit in
+   this repo in order to pin the version of the reusable workflow that you're using:
+   ``uses: getpelican/pelican/.github/workflows/github_pages.yml@<COMMIT_ID>``.
+   If you do this you might want to get Dependabot to send you automated pull
+   requests to update that commit ID whenever new versions of this workflow are
+   published, like so:
+
+   .. code-block:: yaml
+
+       # .github/dependabot.yml
+       version: 2
+       updates:
+         - package-ecosystem: "github-actions"
+           directory: "/"
+           schedule:
+             interval: "monthly"
+
+   See `GitHub's docs about using Dependabot to keep your actions up to date <https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot>`_.
+
 3. Go to the **Actions** tab in your repo
    (``https://github.com/<username>/<repository>/actions``) and you should see a
    **Deploy to GitHub Pages** action running.

From 50f77b42b2acfffbb3451aa15374726a96c1c8eb Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 17 Jun 2024 20:36:18 +0200
Subject: [PATCH 2728/2864] Add CODEOWNERS file to project

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..0fbd850c
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+.github/workflows/github_pages.yml @seanh

From d03ae2a41fc813f8b8ee0d8df46d8b9e18bb0d20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 11:44:06 +0000
Subject: [PATCH 2729/2864] Bump actions/upload-pages-artifact from 2 to 3

Bumps [actions/upload-pages-artifact](https://github.com/actions/upload-pages-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-pages-artifact/releases)
- [Commits](https://github.com/actions/upload-pages-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-pages-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/github_pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index efe6959c..d8a18de3 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -84,7 +84,7 @@ jobs:
             echo "::warning title=Invalid file permissions automatically fixed::$line"
           done
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         with:
           path: ${{ inputs.output-path }}
   deploy:

From 750a1f8bfaf4d14aafd398976c55ecab332e3001 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 18:44:01 +0000
Subject: [PATCH 2730/2864] Bump actions/configure-pages from 3 to 5

Bumps [actions/configure-pages](https://github.com/actions/configure-pages) from 3 to 5.
- [Release notes](https://github.com/actions/configure-pages/releases)
- [Commits](https://github.com/actions/configure-pages/compare/v3...v5)

---
updated-dependencies:
- dependency-name: actions/configure-pages
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/github_pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index d8a18de3..0e9eab77 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -59,7 +59,7 @@ jobs:
         run: git clone '${{ inputs.theme }}' .theme
       - name: Configure GitHub Pages
         id: pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
       - name: Install requirements
         run: pip install ${{ inputs.requirements }}
       - name: Build Pelican site

From 487877f206ff124278fc53be22eb00bafc3708f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 11:44:10 +0000
Subject: [PATCH 2731/2864] Bump actions/deploy-pages from 2 to 4

Bumps [actions/deploy-pages](https://github.com/actions/deploy-pages) from 2 to 4.
- [Release notes](https://github.com/actions/deploy-pages/releases)
- [Commits](https://github.com/actions/deploy-pages/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/deploy-pages
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/github_pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index 0e9eab77..427ad96d 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -96,4 +96,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

From 617aba077f1692925dc07abaf61999e624ac922a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 18:44:11 +0000
Subject: [PATCH 2732/2864] Bump actions/setup-python from 4 to 5

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/github_pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index 427ad96d..e7f7b59a 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ inputs.python }}
       - name: Checkout theme

From 853e9e6b8a479b99217ca0f9928012eca90a7ecd Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanh@users.noreply.github.com>
Date: Mon, 17 Jun 2024 20:46:28 +0100
Subject: [PATCH 2733/2864] Document that feed_domain is not required

---
 docs/tips.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tips.rst b/docs/tips.rst
index 338dbe1f..c86a12f4 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -240,7 +240,7 @@ Here's the complete list of workflow inputs:
 |                  |          | Pages site, which is correct in most       |        |               |
 |                  |          | cases.                                     |        |               |
 +------------------+----------+--------------------------------------------+--------+---------------+
-| ``feed_domain``  |          | The domain to be prepended to feed URLs    | string | The URL of    |
+| ``feed_domain``  | No       | The domain to be prepended to feed URLs    | string | The URL of    |
 |                  |          | (Pelican's ``FEED_DOMAIN`` setting). If    |        | your GitHub   |
 |                  |          | not passed this will default to the URL of |        | Pages site.   |
 |                  |          | your GitHub Pages site, which is correct   |        |               |

From 05535c7d6c274dc6e3560b70e98f73bc6d01e052 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 17 Jun 2024 22:19:21 +0200
Subject: [PATCH 2734/2864] Docs: GitHub Pages workflow is now supported

---
 .github/workflows/github_pages.yml | 2 +-
 docs/tips.rst                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index e7f7b59a..48ebb2d0 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -1,4 +1,4 @@
-# Workflow for publishing to GitHub Pages. **NO OFFICIAL SUPPORT PROVIDED.**
+# Workflow for publishing to GitHub Pages.
 name: Deploy to GitHub Pages
 on:
   workflow_call:
diff --git a/docs/tips.rst b/docs/tips.rst
index 338dbe1f..746b5e43 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -128,7 +128,7 @@ Publishing to GitHub Pages Using a Custom GitHub Actions Workflow
 
 Pelican-powered sites can be published to GitHub Pages via a `custom workflow
 <https://github.com/getpelican/pelican/blob/master/.github/workflows/github_pages.yml>`_.
-**No official support is provided** for this community-submitted workflow. To use it:
+To use it:
 
 1. Enable GitHub Pages in your repo: go to **Settings → Pages** and choose
    **GitHub Actions** for the **Source** setting.

From 993c75103b7fccebb33dc0a148a4b9be42373d54 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 18 Jun 2024 09:04:59 +0200
Subject: [PATCH 2735/2864] Generate social cards in Sphinx documentation

Without `matplotlib` installed, Sphinx output says that social cards
cannot be generated.
---
 requirements/docs.pip | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements/docs.pip b/requirements/docs.pip
index 7b0f37cc..4c16c84a 100644
--- a/requirements/docs.pip
+++ b/requirements/docs.pip
@@ -2,4 +2,5 @@ sphinx
 sphinxext-opengraph
 furo==2023.9.10
 livereload
+matplotlib
 tomli;python_version<"3.11"

From 49723e6daf8caf6c46ab6cb58715dfe6b7e4a40d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 18 Jun 2024 09:08:45 +0200
Subject: [PATCH 2736/2864] Docs: Remove `ifconfig` Sphinx extension

Originally added in #815, something about this seems to be causing an
obscure ReadTheDocs build error.
---
 docs/conf.py   | 1 -
 docs/index.rst | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 8f14a018..b812ee4c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,6 @@ with open("../pyproject.toml", "rb") as f:
 templates_path = ["_templates"]
 extensions = [
     "sphinx.ext.autodoc",
-    "sphinx.ext.ifconfig",
     "sphinx.ext.extlinks",
     "sphinxext.opengraph",
 ]
diff --git a/docs/index.rst b/docs/index.rst
index 60591482..159ea3be 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,15 +1,6 @@
 Pelican |release|
 =================
 
-
-.. ifconfig:: release.endswith('.dev')
-
-    .. warning::
-
-        This documentation is for the version of Pelican currently under
-        development. Were you looking for version |last_stable| documentation?
-
-
 Pelican is a static site generator, written in Python_. Highlights include:
 
 * Write your content directly with your editor of choice in reStructuredText_

From 5171631dec562f8033388b52f0690aa0381bf170 Mon Sep 17 00:00:00 2001
From: Tomasz Wojdat <tpwojdat@gmail.com>
Date: Wed, 19 Jun 2024 00:11:28 +0200
Subject: [PATCH 2737/2864] chore: update URLs of GitHub Ribbons

Old URLs are no longer active. New ones were taken from GitHub blog:
https://github.blog/2008-12-19-github-ribbons/

Also update output in functional tests.
---
 pelican/tests/output/custom/a-markdown-powered-article.html   | 2 +-
 pelican/tests/output/custom/archives.html                     | 2 +-
 pelican/tests/output/custom/article-1.html                    | 2 +-
 pelican/tests/output/custom/article-2.html                    | 2 +-
 pelican/tests/output/custom/article-3.html                    | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau.html      | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau2.html     | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau3.html     | 2 +-
 pelican/tests/output/custom/authors.html                      | 2 +-
 pelican/tests/output/custom/categories.html                   | 2 +-
 pelican/tests/output/custom/category/bar.html                 | 2 +-
 pelican/tests/output/custom/category/cat1.html                | 2 +-
 pelican/tests/output/custom/category/misc.html                | 2 +-
 pelican/tests/output/custom/category/yeah.html                | 2 +-
 .../output/custom/drafts/a-draft-article-without-date.html    | 2 +-
 pelican/tests/output/custom/drafts/a-draft-article.html       | 2 +-
 pelican/tests/output/custom/filename_metadata-example.html    | 2 +-
 pelican/tests/output/custom/index.html                        | 2 +-
 pelican/tests/output/custom/index2.html                       | 2 +-
 pelican/tests/output/custom/index3.html                       | 2 +-
 pelican/tests/output/custom/jinja2_template.html              | 2 +-
 pelican/tests/output/custom/oh-yeah-fr.html                   | 2 +-
 pelican/tests/output/custom/oh-yeah.html                      | 2 +-
 pelican/tests/output/custom/override/index.html               | 2 +-
 .../tests/output/custom/pages/this-is-a-test-hidden-page.html | 2 +-
 pelican/tests/output/custom/pages/this-is-a-test-page.html    | 2 +-
 pelican/tests/output/custom/second-article-fr.html            | 2 +-
 pelican/tests/output/custom/second-article.html               | 2 +-
 pelican/tests/output/custom/tag/bar.html                      | 2 +-
 pelican/tests/output/custom/tag/baz.html                      | 2 +-
 pelican/tests/output/custom/tag/foo.html                      | 2 +-
 pelican/tests/output/custom/tag/foobar.html                   | 2 +-
 pelican/tests/output/custom/tag/oh.html                       | 2 +-
 pelican/tests/output/custom/tag/yeah.html                     | 2 +-
 pelican/tests/output/custom/tags.html                         | 2 +-
 pelican/tests/output/custom/this-is-a-super-article.html      | 2 +-
 pelican/tests/output/custom/unbelievable.html                 | 2 +-
 pelican/tests/output/custom_locale/archives.html              | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau.html   | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau2.html  | 2 +-
 .../tests/output/custom_locale/author/alexis-metaireau3.html  | 2 +-
 pelican/tests/output/custom_locale/authors.html               | 2 +-
 pelican/tests/output/custom_locale/categories.html            | 2 +-
 pelican/tests/output/custom_locale/category/bar.html          | 2 +-
 pelican/tests/output/custom_locale/category/cat1.html         | 2 +-
 pelican/tests/output/custom_locale/category/misc.html         | 2 +-
 pelican/tests/output/custom_locale/category/yeah.html         | 2 +-
 .../custom_locale/drafts/a-draft-article-without-date.html    | 2 +-
 .../tests/output/custom_locale/drafts/a-draft-article.html    | 2 +-
 pelican/tests/output/custom_locale/index.html                 | 2 +-
 pelican/tests/output/custom_locale/index2.html                | 2 +-
 pelican/tests/output/custom_locale/index3.html                | 2 +-
 pelican/tests/output/custom_locale/jinja2_template.html       | 2 +-
 pelican/tests/output/custom_locale/oh-yeah-fr.html            | 2 +-
 pelican/tests/output/custom_locale/override/index.html        | 2 +-
 .../custom_locale/pages/this-is-a-test-hidden-page.html       | 2 +-
 .../tests/output/custom_locale/pages/this-is-a-test-page.html | 2 +-
 .../posts/2010/décembre/02/this-is-a-super-article/index.html | 2 +-
 .../posts/2010/octobre/15/unbelievable/index.html             | 2 +-
 .../custom_locale/posts/2010/octobre/20/oh-yeah/index.html    | 2 +-
 .../posts/2011/avril/20/a-markdown-powered-article/index.html | 2 +-
 .../custom_locale/posts/2011/février/17/article-1/index.html  | 2 +-
 .../custom_locale/posts/2011/février/17/article-2/index.html  | 2 +-
 .../custom_locale/posts/2011/février/17/article-3/index.html  | 2 +-
 .../posts/2012/février/29/second-article/index.html           | 2 +-
 .../2012/novembre/30/filename_metadata-example/index.html     | 2 +-
 pelican/tests/output/custom_locale/second-article-fr.html     | 2 +-
 pelican/tests/output/custom_locale/tag/bar.html               | 2 +-
 pelican/tests/output/custom_locale/tag/baz.html               | 2 +-
 pelican/tests/output/custom_locale/tag/foo.html               | 2 +-
 pelican/tests/output/custom_locale/tag/foobar.html            | 2 +-
 pelican/tests/output/custom_locale/tag/oh.html                | 2 +-
 pelican/tests/output/custom_locale/tag/yeah.html              | 2 +-
 pelican/tests/output/custom_locale/tags.html                  | 2 +-
 pelican/themes/notmyidea/templates/github.html                | 4 ++--
 75 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 1cee58f6..b8359a6d 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 5ca032d3..234fa63a 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index b8bc8e1d..4b670b16 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 93403466..ad1e20fb 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index cdf52bd7..7157c014 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index 75bcb182..b4230aad 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 1bf6f7c9..43823162 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 082c3bc7..cf7a6031 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index 9b3b76cf..5ba9af8c 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index eab567e0..2c055fac 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 02a4602f..7415f9f4 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index c7abc1a9..f72f8bc8 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 303e35ad..895f253e 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index f69b5705..a6d76ac2 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
index 786e0ae6..70879483 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 508e2d43..8e56ba96 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 9eff8f14..00b1f158 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index b5cf7189..b29d8d86 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 3964bcb9..a1c3f5b5 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 4abea6bb..93e0d029 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 91506822..e745d4cf 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index caf2fdc8..8659bd0e 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -15,7 +15,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 9e15a338..0825e211 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -15,7 +15,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index b7a58516..8a5df3b4 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index cd127354..df4e9090 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index 67666441..f9d959a5 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 9a2ce96c..c53cc23e 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -15,7 +15,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 4ddfe299..f42dd642 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -15,7 +15,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 8c56761d..3abbc833 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 4c7dbf4f..e2dfada4 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 8fbf6d4d..c03bca5c 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index be73227f..d3609714 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index d9fbdb20..5530d037 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 5dfa0d67..d0457390 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 231901b8..e5b3b08f 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 2dac8f11..222fcbab 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index d777df9e..0d88db61 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index c3f25eb7..3e85bc13 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index db0a7b2f..7582d623 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 0f1908c4..0ba022b7 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index a5942573..5033e7f2 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index 14a3e1ca..1d1bb320 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 8fb45c4e..9a684dd2 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index 6915f22e..c061c8d8 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 5cf93f15..a1b9156b 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 2d2fbfc2..8df30965 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index bab572c4..9e22f4f3 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
index dae74c58..cf8c8760 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index ad8688d4..56f9e0b4 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 0499f5d5..5c5c3c27 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 35e1aca6..68d4f195 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 5b5c3a67..030ea072 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index 75602f5e..3d2ac0e1 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index baec35fa..a3203152 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -15,7 +15,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index 285e553b..f457679f 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index 431d6849..12cab620 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index 62af11b3..e945a3ed 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index 1585c0db..336a13cf 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 3a9a3f5e..a5788171 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index e39b8b68..23c57785 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -15,7 +15,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 5f675a3d..c2e1cc57 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index 05dc2de6..0742bc52 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index 40d59bb2..a5201ffb 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index bec205f8..fe175d6f 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 0f1a40c2..d2d3cfe1 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -15,7 +15,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 6f200a7b..a596dbed 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 704b5d52..e631a575 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -15,7 +15,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index 96142e9c..f8edf2f2 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index e43246e3..ad8fefa9 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -13,7 +13,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index e80d2340..688666f8 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index a1169a88..6abc2d24 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index 07c2542f..72cde941 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index dabcaf7d..b0a1a5ac 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index 2ac682b4..40daf2ef 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -12,7 +12,7 @@
 
         <body id="index" class="home">
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/themes/notmyidea/templates/github.html b/pelican/themes/notmyidea/templates/github.html
index 75876edd..8e256af7 100644
--- a/pelican/themes/notmyidea/templates/github.html
+++ b/pelican/themes/notmyidea/templates/github.html
@@ -1,9 +1,9 @@
 {% if GITHUB_URL %}
     <a href="{{ GITHUB_URL }}">
         {% if GITHUB_POSITION != "left" %}
-            <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+            <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
         {% else %}
-            <img style="position: absolute; top: 0; left: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_left_white_ffffff.png" alt="Fork me on GitHub" />
+            <img style="position: absolute; top: 0; left: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_left_white_ffffff.png" alt="Fork me on GitHub" />
         {% endif %}
     </a>
 {% endif %}

From 6a501917283c664c3724b1b8b46a96d4f1874d30 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 25 Jun 2024 10:49:07 +0200
Subject: [PATCH 2738/2864] Tweak Markdown-not-installed console warnings

Adding single-quotation marks should cause 'markdown' to be highlighted
in green, presumably via Rich.
---
 pelican/readers.py            | 4 ++--
 pelican/tests/test_pelican.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index ee7e3466..3d0e8d58 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -353,8 +353,8 @@ class MarkdownReader(BaseReader):
 
     def disabled_message(self) -> str:
         return (
-            "Could not import markdown.Markdown.  "
-            "Have you installed the markdown package?"
+            "Could not import 'markdown.Markdown'. "
+            "Have you installed the 'markdown' package?"
         )
 
 
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index e243be61..a43afa3e 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -322,6 +322,6 @@ class TestPelican(LoggedTestCase):
                 self.assertLogCountEqual(
                     1,
                     ".*article_with_md_extension.md: "
-                    "Could not import markdown.Markdown.  "
-                    "Have you installed the markdown package?",
+                    "Could not import 'markdown.Markdown'. "
+                    "Have you installed the 'markdown' package?",
                 )

From bdd4e45628c901cad3c95f281c28d52a2bb676b4 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 25 Jun 2024 10:54:24 +0200
Subject: [PATCH 2739/2864] Enforce 75% code coverage in CI via Tox

---
 tasks.py | 2 +-
 tox.ini  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks.py b/tasks.py
index 3a1722eb..cf9851ed 100644
--- a/tasks.py
+++ b/tasks.py
@@ -49,7 +49,7 @@ def coverage(c):
     """Generate code coverage of running the test suite."""
     c.run(
         f"{VENV_BIN}/pytest --cov=pelican --cov-report term-missing "
-        "--cov-fail-under 74",
+        "--cov-fail-under 75",
         pty=PTY,
     )
     c.run(f"{VENV_BIN}/coverage html", pty=PTY)
diff --git a/tox.ini b/tox.ini
index 61e8908a..7b8598ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ deps =
 
 commands =
     {envpython} --version
-    pytest -s --cov=pelican pelican
+    pytest -s --cov=pelican --cov-fail-under 75 pelican
 
 [testenv:docs]
 basepython = python3.11

From 28e54106f2fc3f6c837cef62f2498fd75ae7e91e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 25 Jun 2024 11:00:41 +0200
Subject: [PATCH 2740/2864] Update Ruff linter

---
 .pre-commit-config.yaml | 2 +-
 pyproject.toml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bfdd6149..9ae674ab 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # ruff version should match the one in pyproject.toml
-    rev: v0.4.6
+    rev: v0.4.10
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
diff --git a/pyproject.toml b/pyproject.toml
index dd256a44..1a2e1474 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ dev = [
     "tox>=4.11.3",
     "invoke>=2.2.0",
     # ruff version should match the one in .pre-commit-config.yaml
-    "ruff==0.4.6",
+    "ruff==0.4.10",
     "tomli>=2.0.1; python_version < \"3.11\"",
 ]
 

From 36ebe91af78823860e4dc6c790f3f28507457016 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 25 Jun 2024 11:33:28 +0200
Subject: [PATCH 2741/2864] Rename default branch to `main`

---
 .github/workflows/main.yml |  2 +-
 CONTRIBUTING.rst           |  4 ++--
 README.rst                 |  4 ++--
 docs/settings.rst          |  2 +-
 docs/themes.rst            |  4 ++--
 docs/tips.rst              | 16 ++++++++--------
 pelican/settings.py        |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4c0127df..e07caa72 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -110,7 +110,7 @@ jobs:
     environment: Deployment
     needs: [test, lint, docs, build]
     runs-on: ubuntu-latest
-    if: github.ref=='refs/heads/master' && github.event_name!='pull_request' && github.repository == 'getpelican/pelican'
+    if: github.ref=='refs/heads/main' && github.event_name!='pull_request' && github.repository == 'getpelican/pelican'
 
     permissions:
       contents: write
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 4faace91..5ac5f0ad 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -24,7 +24,7 @@ Before you ask for help, please make sure you do the following:
 
 3. Try reproducing the issue in a clean environment, ensuring you are using:
 
-* latest Pelican release (or an up-to-date Git clone of Pelican master)
+* latest Pelican release (or an up-to-date Git clone of Pelican ``main`` branch)
 * latest releases of libraries used by Pelican
 * no plugins or only those related to the issue
 
@@ -87,7 +87,7 @@ Using Git and GitHub
 --------------------
 
 * `Create a new branch`_ specific to your change (as opposed to making
-  your commits in the master branch).
+  your commits in the ``main`` branch).
 * **Don't put multiple unrelated fixes/features in the same branch / pull request.**
   For example, if you're working on a new feature and find a bugfix that
   doesn't *require* your new feature, **make a new distinct branch and pull
diff --git a/README.rst b/README.rst
index 3f708242..0e3577ec 100644
--- a/README.rst
+++ b/README.rst
@@ -64,8 +64,8 @@ Why the name “Pelican”?
 .. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html
 .. _`hosted on GitHub`: https://github.com/getpelican/pelican
 
-.. |build-status| image:: https://img.shields.io/github/actions/workflow/status/getpelican/pelican/main.yml?branch=master
-   :target: https://github.com/getpelican/pelican/actions/workflows/main.yml?query=branch%3Amaster
+.. |build-status| image:: https://img.shields.io/github/actions/workflow/status/getpelican/pelican/main.yml?branch=main
+   :target: https://github.com/getpelican/pelican/actions/workflows/main.yml?query=branch%3Amain
    :alt: GitHub Actions CI: continuous integration status
 .. |pypi-version| image:: https://img.shields.io/pypi/v/pelican.svg
    :target: https://pypi.org/project/pelican/
diff --git a/docs/settings.rst b/docs/settings.rst
index 4ae608c6..7269c0bd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -28,7 +28,7 @@ Environment variables can also be used here but must be escaped appropriately::
 
 Settings are configured in the form of a Python module (a file). There is an
 `example settings file
-<https://github.com/getpelican/pelican/raw/master/samples/pelican.conf.py>`_
+<https://github.com/getpelican/pelican/raw/main/samples/pelican.conf.py>`_
 available for reference.
 
 To see a list of current settings in your environment, including both default
diff --git a/docs/themes.rst b/docs/themes.rst
index 2e01ec8e..ace5dcb9 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -17,7 +17,7 @@ To generate its HTML output, Pelican uses the `Jinja
 <https://palletsprojects.com/p/jinja/>`_ templating engine due to its flexibility and
 straightforward syntax. If you want to create your own theme, feel free to take
 inspiration from the `"simple" theme
-<https://github.com/getpelican/pelican/tree/master/pelican/themes/simple/templates>`_.
+<https://github.com/getpelican/pelican/tree/main/pelican/themes/simple/templates>`_.
 
 To generate your site using a theme you have created (or downloaded manually
 and then modified), you can specify that theme via the ``-t`` flag::
@@ -368,7 +368,7 @@ period_num              A tuple of the form (``year``, ``month``, ``day``),
 
 You can see an example of how to use `period` in the `"simple" theme
 period_archives.html template
-<https://github.com/getpelican/pelican/blob/master/pelican/themes/simple/templates/period_archives.html>`_.
+<https://github.com/getpelican/pelican/blob/main/pelican/themes/simple/templates/period_archives.html>`_.
 
 
 .. _period_archives_variable:
diff --git a/docs/tips.rst b/docs/tips.rst
index 1398ccd9..e5574c7c 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -89,18 +89,18 @@ Publishing a User Site to GitHub Pages from a Branch
 ----------------------------------------------------
 
 To publish a Pelican site in the form of User Pages, you need to *push* the
-content of the ``output`` dir generated by Pelican to the ``master`` branch of
+content of the ``output`` dir generated by Pelican to the ``main`` branch of
 your ``<username>.github.io`` repository on GitHub.
 
 Again, you can take advantage of ``ghp-import``::
 
     $ pelican content -o output -s pelicanconf.py
     $ ghp-import output -b gh-pages
-    $ git push git@github.com:elemoine/elemoine.github.io.git gh-pages:master
+    $ git push git@github.com:elemoine/elemoine.github.io.git gh-pages:main
 
 The ``git push`` command pushes the local ``gh-pages`` branch (freshly updated
 by the ``ghp-import`` command) to the ``elemoine.github.io`` repository's
-``master`` branch on GitHub.
+``main`` branch on GitHub.
 
 .. note::
 
@@ -116,10 +116,10 @@ inside the ``Pelican`` folder you can run::
 
     $ pelican content -o .. -s pelicanconf.py
 
-Now you can push the whole project ``<username>.github.io`` to the master
+Now you can push the whole project ``<username>.github.io`` to the main
 branch of your GitHub repository::
 
-    $ git push origin master
+    $ git push origin main
 
 (assuming origin is set to your remote repository).
 
@@ -127,7 +127,7 @@ Publishing to GitHub Pages Using a Custom GitHub Actions Workflow
 -----------------------------------------------------------------
 
 Pelican-powered sites can be published to GitHub Pages via a `custom workflow
-<https://github.com/getpelican/pelican/blob/master/.github/workflows/github_pages.yml>`_.
+<https://github.com/getpelican/pelican/blob/main/.github/workflows/github_pages.yml>`_.
 To use it:
 
 1. Enable GitHub Pages in your repo: go to **Settings → Pages** and choose
@@ -144,7 +144,7 @@ To use it:
          workflow_dispatch:
        jobs:
          deploy:
-           uses: "getpelican/pelican/.github/workflows/github_pages.yml@master"
+           uses: "getpelican/pelican/.github/workflows/github_pages.yml@main"
            permissions:
              contents: "read"
              pages: "write"
@@ -152,7 +152,7 @@ To use it:
            with:
              settings: "publishconf.py"
 
-   You may want to replace the ``@master`` with the ID of a specific commit in
+   You may want to replace the ``@main`` with the ID of a specific commit in
    this repo in order to pin the version of the reusable workflow that you're using:
    ``uses: getpelican/pelican/.github/workflows/github_pages.yml@<COMMIT_ID>``.
    If you do this you might want to get Dependabot to send you automated pull
diff --git a/pelican/settings.py b/pelican/settings.py
index 46b761a5..66d6beeb 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -347,7 +347,7 @@ def handle_deprecated_settings(settings: Settings) -> Settings:
             "FILES_TO_COPY",
             "STATIC_PATHS and EXTRA_PATH_METADATA",
             "https://github.com/getpelican/pelican/"
-            "blob/master/docs/settings.rst#path-metadata",
+            "blob/main/docs/settings.rst#path-metadata",
         ),
     ]:
         if old in settings:

From 513abbfdc668946590194c637dbe90ec228aaf6f Mon Sep 17 00:00:00 2001
From: Agathe <microjoe@microjoe.org>
Date: Tue, 25 Jun 2024 15:07:41 +0200
Subject: [PATCH 2742/2864] Introduce paragraph count summary (#2761)

Co-authored-by: Justin Mayer <entroP@gmail.com>
---
 docs/content.rst               |  5 ++++-
 docs/settings.rst              |  8 ++++++++
 pelican/contents.py            |  8 +++++++-
 pelican/tests/test_contents.py | 25 +++++++++++++++++++++++++
 pelican/tests/test_utils.py    | 17 +++++++++++++++++
 pelican/utils.py               | 19 +++++++++++++++++++
 6 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/docs/content.rst b/docs/content.rst
index 4277b838..7d7e2cfa 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -162,7 +162,10 @@ author you can use ``author`` field.
 
 If you do not explicitly specify summary metadata for a given post, the
 ``SUMMARY_MAX_LENGTH`` setting can be used to specify how many words from the
-beginning of an article are used as the summary.
+beginning of an article are used as the summary. You can also use an article's
+first N paragraphs as its summary using the ``SUMMARY_MAX_PARAGRAPHS`` setting.
+If both settings are in use, the specified number of paragraphs will
+be used but may be truncated to respect the specified maximum length.
 
 You can also extract any metadata from the filename through a regular
 expression to be set in the ``FILENAME_METADATA`` setting. All named groups
diff --git a/docs/settings.rst b/docs/settings.rst
index 7269c0bd..93c632d2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -308,6 +308,14 @@ Basic settings
    does not otherwise specify a summary. Setting to ``None`` will cause the
    summary to be a copy of the original content.
 
+.. data:: SUMMARY_MAX_PARAGRAPHS = None
+
+   When creating a short summary of an article, this will be the number of
+   paragraphs to use as the summary. This only applies if your content
+   does not otherwise specify a summary. Setting to ``None`` will cause the
+   summary to use the whole text (up to ``SUMMARY_MAX_LENGTH``) instead of just
+   the first N paragraphs.
+
 .. data:: SUMMARY_END_SUFFIX = '…'
 
    When creating a short summary of an article and the result was truncated to
diff --git a/pelican/contents.py b/pelican/contents.py
index cf13dabc..5a403261 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -28,6 +28,7 @@ from pelican.utils import (
     sanitised_join,
     set_date_tzinfo,
     slugify,
+    truncate_html_paragraphs,
     truncate_html_words,
 )
 
@@ -440,8 +441,13 @@ class Content:
         if "summary" in self.metadata:
             return self.metadata["summary"]
 
+        content = self.content
+        max_paragraphs = self.settings.get("SUMMARY_MAX_PARAGRAPHS")
+        if max_paragraphs is not None:
+            content = truncate_html_paragraphs(self.content, max_paragraphs)
+
         if self.settings["SUMMARY_MAX_LENGTH"] is None:
-            return self.content
+            return content
 
         return truncate_html_words(
             self.content,
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 81f8907c..06d1a690 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -116,6 +116,31 @@ class TestPage(TestBase):
         page = Page(**page_kwargs)
         self.assertEqual(page.summary, "")
 
+    def test_summary_paragraph(self):
+        # If SUMMARY_MAX_PARAGRAPHS is set, the generated summary should
+        # not exceed the given paragraph count.
+        page_kwargs = self._copy_page_kwargs()
+        settings = get_settings()
+        page_kwargs["settings"] = settings
+        del page_kwargs["metadata"]["summary"]
+        settings["SUMMARY_MAX_PARAGRAPHS"] = 1
+        settings["SUMMARY_MAX_LENGTH"] = None
+        page = Page(**page_kwargs)
+        self.assertEqual(page.summary, TEST_CONTENT)
+
+    def test_summary_paragraph_max_length(self):
+        # If both SUMMARY_MAX_PARAGRAPHS and SUMMARY_MAX_LENGTH are set,
+        # the generated summary should not exceed the given paragraph count and
+        # not exceed the given length.
+        page_kwargs = self._copy_page_kwargs()
+        settings = get_settings()
+        page_kwargs["settings"] = settings
+        del page_kwargs["metadata"]["summary"]
+        settings["SUMMARY_MAX_PARAGRAPHS"] = 1
+        settings["SUMMARY_MAX_LENGTH"] = 10
+        page = Page(**page_kwargs)
+        self.assertEqual(page.summary, truncate_html_words(TEST_CONTENT, 10))
+
     def test_summary_end_suffix(self):
         # If a :SUMMARY_END_SUFFIX: is set, and there is no other summary,
         # generated summary should contain the specified marker at the end.
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 0da59dd4..c35b756c 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -401,6 +401,23 @@ class TestUtils(LoggedTestCase):
         self.assertEqual(utils.truncate_html_words("&#1234 text", 20), "&#1234 text")
         self.assertEqual(utils.truncate_html_words("&#xabc text", 20), "&#xabc text")
 
+    def test_truncate_html_paragraphs(self):
+        one = "<p>one</p>"
+
+        self.assertEqual(utils.truncate_html_paragraphs(one, 0), "")
+        self.assertEqual(utils.truncate_html_paragraphs(one, 1), one)
+        self.assertEqual(utils.truncate_html_paragraphs(one, 2), one)
+
+        two = one + "<p>two</p>"
+        self.assertEqual(utils.truncate_html_paragraphs(two, 1), one)
+        self.assertEqual(utils.truncate_html_paragraphs(two, 2), two)
+
+        three = two + "<p>three</p>"
+        self.assertEqual(utils.truncate_html_paragraphs(three, 1), one)
+        self.assertEqual(utils.truncate_html_paragraphs(three, 2), two)
+        self.assertEqual(utils.truncate_html_paragraphs(three, 3), three)
+        self.assertEqual(utils.truncate_html_paragraphs(three, 4), three)
+
     def test_process_translations(self):
         fr_articles = []
         en_articles = []
diff --git a/pelican/utils.py b/pelican/utils.py
index b780ab97..69d9dde5 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -631,6 +631,25 @@ def truncate_html_words(s: str, num: int, end_text: str = "…") -> str:
     return out
 
 
+def truncate_html_paragraphs(s, count):
+    """Truncate HTML to a certain number of paragraphs.
+
+    :param count: number of paragraphs to keep
+
+    Newlines in the HTML are preserved.
+    """
+    paragraphs = []
+    tag_stop = 0
+    substr = s[:]
+    for _ in range(count):
+        substr = substr[tag_stop:]
+        tag_start = substr.find("<p>")
+        tag_stop = substr.find("</p>") + len("</p>")
+        paragraphs.append(substr[tag_start:tag_stop])
+
+    return "".join(paragraphs)
+
+
 def process_translations(
     content_list: list[Content],
     translation_id: str | Collection[str] | None = None,

From d85f493ee377ae2040bbcd45ce752d9c53e598a9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 30 Jul 2024 09:56:27 +0200
Subject: [PATCH 2743/2864] Add initial configuration for Vale prose linter

Vale: <https://github.com/errata-ai/vale>
---
 .gitignore |  1 +
 .vale.ini  | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 .vale.ini

diff --git a/.gitignore b/.gitignore
index 65e4d759..a3d27ca8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ samples/output
 *.pem
 *.lock
 .pdm-python
+.vale
 .venv
 
 # direnv
diff --git a/.vale.ini b/.vale.ini
new file mode 100644
index 00000000..aad18229
--- /dev/null
+++ b/.vale.ini
@@ -0,0 +1,10 @@
+StylesPath = .vale/styles
+
+Vocab = Pelican
+
+MinAlertLevel = suggestion
+
+Packages = proselint, alex
+
+[*]
+BasedOnStyles = Vale, proselint, alex

From bb0ed26fdd3c1bbfbca6f384a01a304fab954a00 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 30 Jul 2024 10:00:36 +0200
Subject: [PATCH 2744/2864] Document how to have same source & output hierarchy

---
 docs/faq.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index cecc1157..bbf058cd 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -99,6 +99,15 @@ If you want to include metadata in templates outside the article context (e.g.,
 
     {% if article and article.modified %}
 
+How do I make my output folder structure identical to my content hierarchy?
+===========================================================================
+
+Try these settings::
+
+    USE_FOLDER_AS_CATEGORY = False
+    PATH_METADATA = "(?P<path_no_ext>.*)\..*"
+    ARTICLE_URL = ARTICLE_SAVE_AS = PAGE_URL = PAGE_SAVE_AS = "{path_no_ext}.html"
+
 How do I assign custom templates on a per-page basis?
 =====================================================
 

From 2d375bc135f15403137a6322568a2e572aff3831 Mon Sep 17 00:00:00 2001
From: Agathe Porte <989521+gagath@users.noreply.github.com>
Date: Sun, 4 Aug 2024 22:39:50 +0900
Subject: [PATCH 2745/2864] tasks.py.jinja2: optimize imports

When opening the generated tasks.py file with a Python linter enabled,
some imports will be marked as unecessary depending on the options
passed to pelican-quickstart.

Add if statements around the optional imports so they are used
only when necessary.
---
 pelican/tools/templates/tasks.py.jinja2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pelican/tools/templates/tasks.py.jinja2 b/pelican/tools/templates/tasks.py.jinja2
index 1a0f02d1..26af6f0d 100644
--- a/pelican/tools/templates/tasks.py.jinja2
+++ b/pelican/tools/templates/tasks.py.jinja2
@@ -2,11 +2,15 @@ import os
 import shlex
 import shutil
 import sys
+{% if github %}
 import datetime
+{% endif %}
 
 from invoke import task
 from invoke.main import program
+{% if cloudfiles %}
 from invoke.util import cd
+{% endif %}
 from pelican import main as pelican_main
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
 from pelican.settings import DEFAULT_CONFIG, get_settings_from_file

From 4201256a5bb154db647dcc9871c9a774ea797e71 Mon Sep 17 00:00:00 2001
From: GiovanH <GiovanH@users.noreply.github.com>
Date: Thu, 12 Sep 2024 06:28:51 -0500
Subject: [PATCH 2746/2864] Add disabled status for #3304 (#3305)

---
 docs/content.rst                      |  9 ++++++++-
 pelican/contents.py                   | 24 ++++++++++++++++++++++--
 pelican/generators.py                 | 15 ++++++++++++++-
 pelican/readers.py                    |  5 ++++-
 pelican/tests/content/article_skip.md |  5 +++++
 pelican/tests/test_cache.py           |  5 +++--
 6 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 pelican/tests/content/article_skip.md

diff --git a/docs/content.rst b/docs/content.rst
index 7d7e2cfa..6c58aa11 100644
--- a/docs/content.rst
+++ b/docs/content.rst
@@ -89,7 +89,7 @@ contains a list of reserved metadata keywords:
 ``summary``     Brief description of content for index pages
 ``lang``        Content language ID (``en``, ``fr``, etc.)
 ``translation`` If content is a translation of another (``true`` or ``false``)
-``status``      Content status: ``draft``, ``hidden``, or ``published``
+``status``      Content status: ``draft``, ``hidden``, ``skip``, or ``published``
 ``template``    Name of template to use to generate content (without extension)
 ``save_as``     Save content to this relative file path
 ``url``         URL to use for this article/page
@@ -633,6 +633,13 @@ attribute. Hidden posts will be output to ``ARTICLE_SAVE_AS`` as expected, but
 are not included by default in tag, category, and author indexes, nor in the
 main article feed. This has the effect of creating an "unlisted" post.
 
+Skip Posts
+==========
+
+Posts marked with ``skip`` status are ignored entirely. They are not processed
+nor output to the ``ARTICLE_SAVE_AS`` path. Such posts will similarly not be
+included in indexes or feeds.
+
 .. _W3C ISO 8601: https://www.w3.org/TR/NOTE-datetime
 .. _AsciiDoc: https://asciidoc.org
 .. _Pelican Plugins: https://github.com/pelican-plugins
diff --git a/pelican/contents.py b/pelican/contents.py
index 5a403261..0769f875 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -547,9 +547,29 @@ class Content:
                 self._summary = self.metadata["summary"]
 
 
+class SkipStub(Content):
+    """Stub class representing content that should not be processed in any way."""
+
+    def __init__(
+        self, content, metadata=None, settings=None, source_path=None, context=None
+    ):
+        self.source_path = source_path
+
+    def is_valid(self):
+        return False
+
+    @property
+    def content(self):
+        raise NotImplementedError("Stub content should not be read")
+
+    @property
+    def save_as(self):
+        raise NotImplementedError("Stub content cannot be saved")
+
+
 class Page(Content):
     mandatory_properties = ("title",)
-    allowed_statuses = ("published", "hidden", "draft")
+    allowed_statuses = ("published", "hidden", "draft", "skip")
     default_status = "published"
     default_template = "page"
 
@@ -560,7 +580,7 @@ class Page(Content):
 
 class Article(Content):
     mandatory_properties = ("title", "date", "category")
-    allowed_statuses = ("published", "hidden", "draft")
+    allowed_statuses = ("published", "hidden", "draft", "skip")
     default_status = "published"
     default_template = "article"
 
diff --git a/pelican/generators.py b/pelican/generators.py
index 548c494f..6b44d79e 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -19,7 +19,7 @@ from jinja2 import (
 )
 
 from pelican.cache import FileStampDataCacher
-from pelican.contents import Article, Page, Static
+from pelican.contents import Article, Page, SkipStub, Static
 from pelican.plugins import signals
 from pelican.plugins._utils import plugin_enabled
 from pelican.readers import Readers
@@ -690,6 +690,10 @@ class ArticlesGenerator(CachingGenerator):
                     self._add_failed_source_path(f)
                     continue
 
+                if isinstance(article, SkipStub):
+                    logger.debug("Safely skipping %s", f)
+                    continue
+
                 if not article.is_valid():
                     self._add_failed_source_path(f)
                     continue
@@ -702,6 +706,8 @@ class ArticlesGenerator(CachingGenerator):
                 all_drafts.append(article)
             elif article.status == "hidden":
                 hidden_articles.append(article)
+            elif article.status == "skip":
+                raise AssertionError("Documents with 'skip' status should be skipped")
 
             self.add_source_path(article)
             self.add_static_links(article)
@@ -899,6 +905,10 @@ class PagesGenerator(CachingGenerator):
                     self._add_failed_source_path(f)
                     continue
 
+                if isinstance(page, SkipStub):
+                    logger.debug("Safely skipping %s", f)
+                    continue
+
                 if not page.is_valid():
                     self._add_failed_source_path(f)
                     continue
@@ -911,6 +921,9 @@ class PagesGenerator(CachingGenerator):
                 hidden_pages.append(page)
             elif page.status == "draft":
                 draft_pages.append(page)
+            elif page.status == "skip":
+                raise AssertionError("Documents with 'skip' status should be skipped")
+
             self.add_source_path(page)
             self.add_static_links(page)
 
diff --git a/pelican/readers.py b/pelican/readers.py
index 3d0e8d58..59aa7ca3 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -15,7 +15,7 @@ from docutils.writers.html4css1 import HTMLTranslator, Writer
 
 from pelican import rstdirectives  # NOQA
 from pelican.cache import FileStampDataCacher
-from pelican.contents import Author, Category, Page, Tag
+from pelican.contents import Author, Category, Page, SkipStub, Tag
 from pelican.plugins import signals
 from pelican.utils import file_suffix, get_date, pelican_open, posixize_path
 
@@ -669,6 +669,9 @@ class Readers(FileStampDataCacher):
             )
             context_signal.send(context_sender, metadata=metadata)
 
+        if metadata.get("status") == "skip":
+            content_class = SkipStub
+
         return content_class(
             content=content,
             metadata=metadata,
diff --git a/pelican/tests/content/article_skip.md b/pelican/tests/content/article_skip.md
new file mode 100644
index 00000000..02cd5a52
--- /dev/null
+++ b/pelican/tests/content/article_skip.md
@@ -0,0 +1,5 @@
+Title: Skipped article
+Date: 2024-06-30
+Status: skip
+
+This content will not be rendered.
diff --git a/pelican/tests/test_cache.py b/pelican/tests/test_cache.py
index a1bbc559..8876a8a5 100644
--- a/pelican/tests/test_cache.py
+++ b/pelican/tests/test_cache.py
@@ -183,15 +183,16 @@ class TestCache(unittest.TestCase):
         generator.readers.read_file = MagicMock()
         generator.generate_context()
         """
-        6 files don't get cached because they were not valid
+        7 files don't get cached because they were not valid
         - article_with_attributes_containing_double_quotes.html
         - article_with_comments.html
         - article_with_null_attributes.html
         - 2012-11-30_md_w_filename_meta#foo-bar.md
         - empty.md
         - empty_with_bom.md
+        - article_skip.md
         """
-        self.assertEqual(generator.readers.read_file.call_count, 6)
+        self.assertEqual(generator.readers.read_file.call_count, 7)
 
     def test_article_reader_content_caching(self):
         """Test raw article content caching at the reader level"""

From 5687883d4b813c2bb95baa1a9c8d2c7cecfa4160 Mon Sep 17 00:00:00 2001
From: Egbert <10352354+egberts@users.noreply.github.com>
Date: Thu, 12 Sep 2024 07:21:12 -0500
Subject: [PATCH 2747/2864] Bump Pygments to 2.16.1 in test requirements; fixes
 #3385 (#3386)

---
 requirements/test.pip | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/test.pip b/requirements/test.pip
index 8eb1029f..a2c35d57 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,11 +1,11 @@
 # Tests
-Pygments==2.14.0
+Pygments>=2.16.1
 pytest
 pytest-cov
 pytest-xdist[psutil]
 
 # Optional Packages
-Markdown==3.5.1
+Markdown>=3.5.1
 BeautifulSoup4
 lxml
 typogrify

From e609b4d78a4ada21bacff7a5977cfcac68e5cab3 Mon Sep 17 00:00:00 2001
From: GeorgeHu <43069137+GeorgeHu6@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:29:01 +0800
Subject: [PATCH 2748/2864] Translate documentation into Simplified Chinese
 (#3346)

---
 docs/conf.py                                  |    3 +
 docs/locale/zh_CN/LC_MESSAGES/changelog.po    | 1669 +++++++++++++++
 docs/locale/zh_CN/LC_MESSAGES/content.po      | 1074 ++++++++++
 docs/locale/zh_CN/LC_MESSAGES/contribute.po   |  731 +++++++
 docs/locale/zh_CN/LC_MESSAGES/faq.po          |  457 +++++
 docs/locale/zh_CN/LC_MESSAGES/importer.po     |  321 +++
 docs/locale/zh_CN/LC_MESSAGES/index.po        |  134 ++
 docs/locale/zh_CN/LC_MESSAGES/install.po      |  244 +++
 docs/locale/zh_CN/LC_MESSAGES/internals.po    |  172 ++
 .../zh_CN/LC_MESSAGES/pelican-themes.po       |  206 ++
 docs/locale/zh_CN/LC_MESSAGES/plugins.po      |  711 +++++++
 docs/locale/zh_CN/LC_MESSAGES/publish.po      |  329 +++
 docs/locale/zh_CN/LC_MESSAGES/quickstart.po   |  151 ++
 docs/locale/zh_CN/LC_MESSAGES/report.po       |  249 +++
 docs/locale/zh_CN/LC_MESSAGES/settings.po     | 1815 +++++++++++++++++
 docs/locale/zh_CN/LC_MESSAGES/sphinx.po       |   60 +
 docs/locale/zh_CN/LC_MESSAGES/themes.po       | 1269 ++++++++++++
 docs/locale/zh_CN/LC_MESSAGES/tips.po         |  679 ++++++
 18 files changed, 10274 insertions(+)
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/changelog.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/content.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/contribute.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/faq.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/importer.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/index.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/install.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/internals.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/pelican-themes.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/plugins.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/publish.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/quickstart.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/report.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/settings.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/sphinx.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/themes.po
 create mode 100644 docs/locale/zh_CN/LC_MESSAGES/tips.po

diff --git a/docs/conf.py b/docs/conf.py
index b812ee4c..2cac97e3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,6 +19,9 @@ with open("../pyproject.toml", "rb") as f:
 
 # -- General configuration ----------------------------------------------------
 templates_path = ["_templates"]
+locale_dirs = ["locale/"]
+gettext_compact = False
+gettext_uuid = True
 extensions = [
     "sphinx.ext.autodoc",
     "sphinx.ext.extlinks",
diff --git a/docs/locale/zh_CN/LC_MESSAGES/changelog.po b/docs/locale/zh_CN/LC_MESSAGES/changelog.po
new file mode 100644
index 00000000..18fec089
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/changelog.po
@@ -0,0 +1,1669 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../changelog.rst:2 4aeac72dd31d4f34ae17a35dc3dfb6bb
+msgid "Release history"
+msgstr "更新日志"
+
+#: ../../changelog.rst:5 1e1473d7633a41f6bf9b31bdd8b7fe79
+msgid "4.9.1 - 2023-11-15"
+msgstr ""
+
+#: ../../changelog.rst:7 b8408b62a2644333a6f79c46ed50ae40
+msgid "Ensure ``tzdata`` dependency is installed on Windows"
+msgstr ""
+
+#: ../../changelog.rst:10 fd27b54d8bc441ffaad0eed5342e3fb0
+msgid "4.9.0 - 2023-11-12"
+msgstr ""
+
+#: ../../changelog.rst:12 d2a96d9c7641406db9b5bbbf1e1591f1
+msgid "Upgrade code to new minimum supported Python version: 3.8"
+msgstr ""
+
+#: ../../changelog.rst:13 eecb4e70e6d64882a298a68a906aa7e7
+msgid ""
+"Settings support for ``pathlib.Path`` `(#2758) "
+"<https://github.com/getpelican/pelican/pull/2758>`_"
+msgstr ""
+
+#: ../../changelog.rst:14 73d4ff7624894557974d1e14072e995e
+msgid ""
+"Various improvements to Simple theme (`#2976 "
+"<https://github.com/getpelican/pelican/pull/2976>`_ & `#3234 "
+"<https://github.com/getpelican/pelican/pull/3234>`_)"
+msgstr ""
+
+#: ../../changelog.rst:15 242c2330a6264406a9444beb84da5682
+msgid ""
+"Use Furo as Sphinx documentation theme `(#3023) "
+"<https://github.com/getpelican/pelican/pull/3023>`_"
+msgstr ""
+
+#: ../../changelog.rst:16 dabb5eb48294457aba25a322ab1d0197
+msgid ""
+"Default to 100 articles maximum in feeds `(#3127) "
+"<https://github.com/getpelican/pelican/pull/3127>`_"
+msgstr ""
+
+#: ../../changelog.rst:17 86ddf69ef3e74a5e9633b231762624d3
+msgid ""
+"Add ``period_archives common context`` variable `(#3148) "
+"<https://github.com/getpelican/pelican/pull/3148>`_"
+msgstr ""
+
+#: ../../changelog.rst:18 2e0c631a1cf04880b862de6b807eff48
+msgid ""
+"Use ``watchfiles`` as the file-watching backend `(#3151) "
+"<https://github.com/getpelican/pelican/pull/3151>`_"
+msgstr ""
+
+#: ../../changelog.rst:19 59ca5ac64d244f93abcda99d3544de2a
+msgid ""
+"Add GitHub Actions workflow for GitHub Pages `(#3189) "
+"<https://github.com/getpelican/pelican/pull/3189>`_"
+msgstr ""
+
+#: ../../changelog.rst:20 88ed863544e64ea5a09301d25cd80d3e
+msgid ""
+"Allow dataclasses in settings `(#3204) "
+"<https://github.com/getpelican/pelican/pull/3204>`_"
+msgstr ""
+
+#: ../../changelog.rst:21 b101d1a2f7c04acfa220a77ccf85dc35
+msgid ""
+"Switch build tool to PDM instead of Setuptools/Poetry `(#3220) "
+"<https://github.com/getpelican/pelican/pull/3220>`_"
+msgstr ""
+
+#: ../../changelog.rst:22 422f54c14c4144b986362c831b56cb86
+msgid ""
+"Provide a ``plugin_enabled`` Jinja test for themes `(#3235) "
+"<https://github.com/getpelican/pelican/pull/3235>`_"
+msgstr ""
+
+#: ../../changelog.rst:23 1a85c8e28699430cb4ee54e6b1cda9ba
+msgid ""
+"Preserve connection order in Blinker `(#3238) "
+"<https://github.com/getpelican/pelican/pull/3238>`_"
+msgstr ""
+
+#: ../../changelog.rst:24 f605f3f56552418d80225548b3bea74c
+msgid ""
+"Remove social icons from default ``notmyidea`` theme `(#3240) "
+"<https://github.com/getpelican/pelican/pull/3240>`_"
+msgstr ""
+
+#: ../../changelog.rst:25 de509b7854fe41f986b7ea8c86034ded
+msgid ""
+"Remove unreliable ``WRITE_SELECTED`` feature `(#3243) "
+"<https://github.com/getpelican/pelican/pull/3243>`_"
+msgstr ""
+
+#: ../../changelog.rst:26 1206eb9fb5c344c0ae2fa5ae405bb29e
+msgid ""
+"Importer: Report broken embedded video links when importing from Tumblr "
+"`(#3177) <https://github.com/getpelican/pelican/issues/3177>`_"
+msgstr ""
+
+#: ../../changelog.rst:27 eeefe71248724cd8928500b64c1d24f0
+msgid ""
+"Importer: Remove newline addition when iterating Photo post types "
+"`(#3178) <https://github.com/getpelican/pelican/issues/3178>`_"
+msgstr ""
+
+#: ../../changelog.rst:28 d9bbceb0175b42b9be8b19b89546c7fd
+msgid ""
+"Importer: Force timestamp conversion in Tumblr importer to be UTC with "
+"offset `(#3221) <https://github.com/getpelican/pelican/pull/3221>`_"
+msgstr ""
+
+#: ../../changelog.rst:29 fcb7a001e25345bda01cc0d7fbdcc0c1
+msgid ""
+"Importer: Use tempfile for intermediate HTML file for Pandoc `(#3221) "
+"<https://github.com/getpelican/pelican/pull/3221>`_"
+msgstr ""
+
+#: ../../changelog.rst:30 c7a0a3a319754ada970b27f9913833bd
+msgid ""
+"Switch linters to Ruff `(#3223) "
+"<https://github.com/getpelican/pelican/pull/3223>`_"
+msgstr ""
+
+#: ../../changelog.rst:33 b80948b635ca4ba3bdaf0efedf9e8230
+msgid "4.8.0 - 2022-07-11"
+msgstr ""
+
+#: ../../changelog.rst:35 c95dd083acb34ccea579bed98c19d95b
+msgid ""
+"Use JSON values for extra settings in Invoke tasks template `(#2994) "
+"<https://github.com/getpelican/pelican/pull/2994>`_"
+msgstr ""
+
+#: ../../changelog.rst:36 54acbf33444345efa17b6006650cfff2
+msgid ""
+"Add content tag for links, which can help with things like Twitter social"
+" cards `(#3001) <https://github.com/getpelican/pelican/pull/3001>`_"
+msgstr ""
+
+#: ../../changelog.rst:37 28a4102c014741ac987ba8be6ff00565
+msgid ""
+"Improve word count behavior when generating summary `(#3002) "
+"<https://github.com/getpelican/pelican/pull/3002>`_"
+msgstr ""
+
+#: ../../changelog.rst:40 00956e307c3647078780260ec470f0c4
+msgid "4.7.2 - 2022-02-09"
+msgstr ""
+
+#: ../../changelog.rst:42 9782bf3d611b4168b76fe33602f13d26
+msgid ""
+"Fix incorrect parsing of parameters specified via `-e` / `--extra-"
+"settings` option flags `(#2938) "
+"<https://github.com/getpelican/pelican/pull/2938>`_"
+msgstr ""
+
+#: ../../changelog.rst:43 b3ce4b03bd92409ea6aea120cd2d3a4f
+msgid ""
+"Add ``categories.html`` template to default theme `(#2973) "
+"<https://github.com/getpelican/pelican/pull/2973>`_"
+msgstr ""
+
+#: ../../changelog.rst:44 bdcd1255d2534a5c992a53c2c9640299
+msgid ""
+"Document how to use plugins to inject content `(#2922) "
+"<https://github.com/getpelican/pelican/pull/2922>`_"
+msgstr ""
+
+#: ../../changelog.rst:47 9052d76f02fc4509998872f8c650696d
+msgid "4.7.1 - 2021-10-12"
+msgstr ""
+
+#: ../../changelog.rst:49 1ddc283dca434367a9eebebb4dc19c55
+msgid ""
+"Extend rich logging to server component `(#2927) "
+"<https://github.com/getpelican/pelican/pull/2927>`_"
+msgstr ""
+
+#: ../../changelog.rst:50 2ebe1d316cc541eba3ef3d20512c97f0
+msgid ""
+"Fix an issue where metadata flagged to be discarded was being cached "
+"`(#2926) <https://github.com/getpelican/pelican/pull/2926>`_"
+msgstr ""
+
+#: ../../changelog.rst:51 7561e4a903db49bba3c7cb5d22ea25be
+msgid ""
+"Adjust suffix in server to allow redirection when needed `(#2931) "
+"<https://github.com/getpelican/pelican/pull/2931>`_"
+msgstr ""
+
+#: ../../changelog.rst:52 369516860be2437b9099796b0b3c7847
+msgid ""
+"Add MIME types for web fonts `(#2929) "
+"<https://github.com/getpelican/pelican/pull/2929>`_"
+msgstr ""
+
+#: ../../changelog.rst:53 2a4dd51d3c2d46c1a0a774274436fc74
+msgid ""
+"Distribute sample data used to run tests `(#2935) "
+"<https://github.com/getpelican/pelican/pull/2935>`_"
+msgstr ""
+
+#: ../../changelog.rst:54 63a08ba90a054e369d1be50c491f094b
+msgid "Add Python 3.10 to test matrix"
+msgstr ""
+
+#: ../../changelog.rst:57 f07f93ca41894e2ea7de889e68dddd63
+msgid "4.7.0 - 2021-10-01"
+msgstr ""
+
+#: ../../changelog.rst:59 1e0f42b1b76e4eb4a356612459563660
+msgid ""
+"Improve default theme rendering on mobile and other small screen devices "
+"`(#2914) <https://github.com/getpelican/pelican/pull/2914>`_"
+msgstr ""
+
+#: ../../changelog.rst:60 2ae6e8430fd4421994f330f095111d0e
+msgid ""
+"Add support for hidden articles `(#2866) "
+"<https://github.com/getpelican/pelican/pull/2866>`_"
+msgstr ""
+
+#: ../../changelog.rst:61 eabcc4a0ac764f3991805d2f746cd415
+msgid ""
+"Improve word count behavior when generating summary CJK & other locales "
+"`(#2864) <https://github.com/getpelican/pelican/pull/2864>`_"
+msgstr ""
+
+#: ../../changelog.rst:62 9a1b80fe805a4c35960c6cba82d813b2
+msgid ""
+"Add progress spinner during generation `(#2869) "
+"<https://github.com/getpelican/pelican/pull/2869>`_ and richer logging "
+"`(#2897) <https://github.com/getpelican/pelican/pull/2897>`_, both via "
+"`Rich <https://github.com/willmcgugan/rich>`_"
+msgstr ""
+
+#: ../../changelog.rst:64 5ea56ecd1a0740a1bc75e6f60515dfa8
+msgid ""
+"Invoke tasks ``serve`` and ``livereload`` now auto-open a web browser "
+"pointing to the locally-served web site `(#2764) "
+"<https://github.com/getpelican/pelican/pull/2764>`_"
+msgstr ""
+
+#: ../../changelog.rst:65 60ed0fd02107499ead142c41c827f71a
+msgid ""
+"Support some date format codes used by ISO dates `(#2902) "
+"<https://github.com/getpelican/pelican/pull/2902>`_"
+msgstr ""
+
+#: ../../changelog.rst:66 fbf7c4ded7af44a6813c0b26432d6905
+msgid ""
+"Document how to add a new writer `(#2901) "
+"<https://github.com/getpelican/pelican/pull/2901>`_"
+msgstr ""
+
+#: ../../changelog.rst:69 fbada9e3ad0845b4a72f9688cf251a6a
+msgid "4.6.0 - 2021-03-23"
+msgstr ""
+
+#: ../../changelog.rst:71 fb814688de1a4df58087cb466d7fa24f
+msgid ""
+"Add new URL pattern to ``PAGINATION_PATTERNS`` for the last page in the "
+"list `(#1401) <https://github.com/getpelican/pelican/issues/1401>`_"
+msgstr ""
+
+#: ../../changelog.rst:72 9c5ae9de4b3f4ee7bb54ba0f5fe9194b
+msgid ""
+"Speed up ``livereload`` Invoke task via caching `(#2847) "
+"<https://github.com/getpelican/pelican/pull/2847>`_"
+msgstr ""
+
+#: ../../changelog.rst:73 ccfa403160e6435990a51f311c059f65
+msgid ""
+"Ignore ``None`` return value from ``get_generators`` signal `(#2850) "
+"<https://github.com/getpelican/pelican/pull/2850>`_"
+msgstr ""
+
+#: ../../changelog.rst:74 e00f58f952cf473390d2d3a0bff95f26
+msgid "Relax dependency minimum versions and remove upper bounds"
+msgstr ""
+
+#: ../../changelog.rst:77 7d2fd1353eda4e5cb27a27dae71fda0c
+msgid "4.5.4 - 2021-01-04"
+msgstr ""
+
+#: ../../changelog.rst:79 d40e6e0035144705b52124f970bc3ea3
+msgid ""
+"Replace plugin definitions in settings with string representations after "
+"registering, so they can be cached correctly `(#2828) "
+"<https://github.com/getpelican/pelican/issues/2828>`_."
+msgstr ""
+
+#: ../../changelog.rst:82 13f1634fef1f4a65a64ad54159de14fe
+msgid "4.5.3 - 2020-12-01"
+msgstr ""
+
+#: ../../changelog.rst:84 19753217e0b04230998d9f5c9730a423
+msgid "Fix a mistake made in PR #2821"
+msgstr ""
+
+#: ../../changelog.rst:87 1c8a0889b5de47178fab5b9d5d085c55
+msgid "4.5.2 - 2020-11-22"
+msgstr ""
+
+#: ../../changelog.rst:89 8c30ac8608f54fd48f29f1e48f640ccd
+msgid "Improve logging of generators and writer loaders"
+msgstr ""
+
+#: ../../changelog.rst:92 2673cef2ee1c42bdad7f7a80c77002c6
+msgid "4.5.1 - 2020-11-02"
+msgstr ""
+
+#: ../../changelog.rst:94 50a7b8039d1d45b4bf85550da4c40318
+msgid ""
+"Refactor intra-site link discovery in order to match more permissively "
+"`(#2646) <https://github.com/getpelican/pelican/issues/2646>`_"
+msgstr ""
+
+#: ../../changelog.rst:95 009addb3893a4c9b98af8eba13e57e11
+msgid ""
+"Fix plugins running twice in auto-reload mode `(#2817) "
+"<https://github.com/getpelican/pelican/issues/2817>`_"
+msgstr ""
+
+#: ../../changelog.rst:96 43f7f7e70f3948cdaaa3fb6b7a6ab45d
+msgid ""
+"Add notice to use ``from pelican import signals`` instead of ``import "
+"pelican.signals`` `(#2805) "
+"<https://github.com/getpelican/pelican/issues/2805>`_"
+msgstr ""
+
+#: ../../changelog.rst:99 ef2a1b597d854881bf89d6240fe59ee0
+msgid "4.5.0 - 2020-08-20"
+msgstr ""
+
+#: ../../changelog.rst:101 d6f141fa55fc43cfa36eac89d4ec4a67
+msgid "Add namespace plugin support; list plugins via ``pelican-plugins`` command"
+msgstr ""
+
+#: ../../changelog.rst:102 83d9116dd10b404fb3d978977a91f03a
+msgid "Override settings via ``-e`` / ``--extra-settings`` CLI option flags"
+msgstr ""
+
+#: ../../changelog.rst:103 772c3e4941e64bc9a5a41ee644e980b3
+msgid "Add settings for custom Jinja globals and tests"
+msgstr ""
+
+#: ../../changelog.rst:104 cf2bd72795894ce796ae65a26307fa9e
+msgid "Customize article summary ellipsis via ``SUMMARY_END_SUFFIX`` setting"
+msgstr ""
+
+#: ../../changelog.rst:105 3494ccef87de4029a51d34e9f6ebac8c
+msgid "Customize Typogrify dash handling via new ``TYPOGRIFY_DASHES`` setting"
+msgstr ""
+
+#: ../../changelog.rst:106 441907e7fc27419cad1f678c3d81fcdd
+msgid "Support Unicode when generating slugs"
+msgstr ""
+
+#: ../../changelog.rst:107 0466696922dd4904a9a061c79d9e5d01
+msgid "Support Asciidoc ``.adoc`` file generation in Pelican importer"
+msgstr ""
+
+#: ../../changelog.rst:108 0711923af6544d84a09b027877cd7318
+msgid "Improve user experience when ``pelican --listen`` web server is quit"
+msgstr ""
+
+#: ../../changelog.rst:109 1736b73cd9354c5fb276263a0158f1d0
+msgid "Improve Invoke tasks template"
+msgstr ""
+
+#: ../../changelog.rst:110 a243c2afd72349ebb46076aef63a62af
+msgid "Include tests in source distributions"
+msgstr ""
+
+#: ../../changelog.rst:111 d3659b2430704e179785f6edeea9d975
+msgid "Switch CI from Travis to GitHub Actions"
+msgstr ""
+
+#: ../../changelog.rst:112 a9ee05a0579d4153935499a3f3bdcc47
+msgid "Remove support for Python 2.7"
+msgstr ""
+
+#: ../../changelog.rst:115 eb3830c633c14e63995b8fbcf8e3d29b
+msgid "4.2.0 - 2019-10-17"
+msgstr ""
+
+#: ../../changelog.rst:117 5af9b29432a94955813a11932e9e38c8
+msgid "Support inline SVGs; don't treat titles in SVGs as HTML titles"
+msgstr ""
+
+#: ../../changelog.rst:118 d776137d56d04320a1a70ced25696379
+msgid "Add category to feeds (in addition to tags)"
+msgstr ""
+
+#: ../../changelog.rst:119 ab3c5b4616544a3d89492ff849de5932
+msgid "Improve content metadata field docs"
+msgstr ""
+
+#: ../../changelog.rst:120 aa20a63221484e90954aaac555dba376
+msgid "Add docs for including other Markdown/reST files in content"
+msgstr ""
+
+#: ../../changelog.rst:123 f40de58367e94d50af3e6e700523edc7
+msgid "4.1.3 - 2019-10-09"
+msgstr ""
+
+#: ../../changelog.rst:125 910c8615c3224456a42555389c268e4c
+msgid "Fix quick-start docs regarding ``pelican --listen``"
+msgstr ""
+
+#: ../../changelog.rst:126 1c9961cd18bd4d17ae1f9ff0f3f45990
+msgid "Set default listen address to 127.0.0.1"
+msgstr ""
+
+#: ../../changelog.rst:127 7108f2b9c2d8444b8fa1ca32a26e36cc
+msgid "Add extra/optional Markdown dependency to setup.py"
+msgstr ""
+
+#: ../../changelog.rst:128 7d9eed3579384908b8ab564a4c358df8
+msgid "Use correct SSH port syntax for rsync in tasks.py"
+msgstr ""
+
+#: ../../changelog.rst:129 3b55feb812b14a1198b04659aa01ecf0
+msgid "Place all deprecated settings handling together"
+msgstr ""
+
+#: ../../changelog.rst:130 dc17ca3853c04536a3ade24a93d079ac
+msgid "Add related project URLs for display on PyPI"
+msgstr ""
+
+#: ../../changelog.rst:131 c513a9e1fed74fe3ae3c23ffe2f804d9
+msgid "Skip some tests on Windows that can't pass due to filesystem differences"
+msgstr ""
+
+#: ../../changelog.rst:134 ced29508dce44f0eb42c45aedc672fa6
+msgid "4.1.2 - 2019-09-23"
+msgstr ""
+
+#: ../../changelog.rst:136 c448cf2e59da43248819ddb51f9f9738
+msgid "Fix pelican.settings.load_source to avoid caching issues - PR #2621"
+msgstr ""
+
+#: ../../changelog.rst:139 98b3a78914f14383858960c37872cec0
+msgid "4.1.1 - 2019-08-23"
+msgstr ""
+
+#: ../../changelog.rst:141 7569ab6dfb9f4f59a4d9414a9ec307ac
+msgid "Add AutoPub to auto-publish releases on PR merge"
+msgstr ""
+
+#: ../../changelog.rst:142 29b086166a89485e9151534a891c8794
+msgid "Add CSS classes for reStructuredText figures"
+msgstr ""
+
+#: ../../changelog.rst:143 3d90d9a7e7f244aeb5ef4bc09624c9d8
+msgid "Pass ``argv`` to Pelican ``main`` entrypoint"
+msgstr ""
+
+#: ../../changelog.rst:144 33de38d2ec8641ca865cebb06167ec58
+msgid "Set default content status to a blank string rather than ``None``"
+msgstr ""
+
+#: ../../changelog.rst:147 9ba143abfcdf4a9a86f7866b897c9831
+msgid "4.1.0 - 2019-07-14"
+msgstr ""
+
+#: ../../changelog.rst:149 cc59d3e8f5f64f5a9ec02b56956e4d53
+msgid "Live browser reload upon changed files (provided via Invoke task)"
+msgstr ""
+
+#: ../../changelog.rst:150 1013f5e7df5448b5a808743127ed0740
+msgid "Add ``pyproject.toml``, managed by Poetry"
+msgstr ""
+
+#: ../../changelog.rst:151 9548fcd5133743259a8e586f69e6453e
+msgid "Support for invoking ``python -m pelican``"
+msgstr ""
+
+#: ../../changelog.rst:152 c1ca4a3bfa27477ebcfd9ac5757cd20b
+msgid "Add relative source path attribute to content"
+msgstr ""
+
+#: ../../changelog.rst:153 14c8367983884cd5913ef4aeaaae2ebe
+msgid "Allow directories in ``EXTRA_PATH_METADATA``"
+msgstr ""
+
+#: ../../changelog.rst:154 493069ecda9345cdab15204358d49856
+msgid ""
+"Add ``all_articles`` variable to period pages (for recent posts "
+"functionality)"
+msgstr ""
+
+#: ../../changelog.rst:155 57597a2f853047128a7f19d871a767cd
+msgid "Improve debug mode output"
+msgstr ""
+
+#: ../../changelog.rst:156 c1e2985b649844aface3795c16f24799
+msgid "Remove blank or duplicate summaries from Atom feed"
+msgstr ""
+
+#: ../../changelog.rst:157 be874126bdaa46ab868e9d5d572973ba
+msgid ""
+"Fix bugs in pagination, pelican-import, pelican-quickstart, and feed "
+"importer"
+msgstr ""
+
+#: ../../changelog.rst:160 3220150f83f64d869d28b2f8abdfae29
+msgid "4.0.1 (2018-11-30)"
+msgstr ""
+
+#: ../../changelog.rst:162 55ef92708e464069b85c860f407c44ee
+msgid "Refactor ``pelican.server`` logging"
+msgstr ""
+
+#: ../../changelog.rst:163 bbe751997c7541f78979d7885be777ad
+msgid "Fix bug in which all static files were processed as \"draft\""
+msgstr ""
+
+#: ../../changelog.rst:164 e85f8cfa33124937bff767d633c505e6
+msgid "Bug fixes for Invoke/Makefile automation, Importer, and other miscellanea"
+msgstr ""
+
+#: ../../changelog.rst:166 aee9e749eaa6417c9d7617678fbd5017
+#, python-format
+msgid ""
+"If upgrading from 3.7.x or earlier, please note that slug-related "
+"settings in 4.0+ use ``{slug}`` and/or ``{lang}`` rather than ``%s``. If "
+"``%s``-style settings are encountered, Pelican will emit a warning and "
+"fall back to the default setting. Some user-submitted themes might try to"
+" format setting values but fail upon site build with a ``TypeError``. In "
+"such cases, the theme needs to be updated. For example, instead of "
+"``TAG_FEED_ATOM|format(tag.slug)``, use "
+"``TAG_FEED_ATOM.format(slug=tag.slug)``"
+msgstr ""
+
+#: ../../changelog.rst:175 1c9f10c7ca554583840076dd4198471b
+msgid "4.0.0 (2018-11-13)"
+msgstr ""
+
+#: ../../changelog.rst:177 2e48c6a93f014447a24f76ec22c56634
+msgid "Replace ``develop_server.sh`` script with ``pelican --listen``"
+msgstr ""
+
+#: ../../changelog.rst:178 e9913592f867453ca8eb027547556190
+msgid "Improved copy/link behavior for large static files (e.g., videos)"
+msgstr ""
+
+#: ../../changelog.rst:179 7b739431500a4e508b4eddee2944998c
+msgid ""
+"New ``{static}`` syntax to link to static content; content linked to by "
+"``{static}`` and ``{attach}`` is automatically copied over even if not in"
+" ``STATIC_PATHS``"
+msgstr ""
+
+#: ../../changelog.rst:182 7d5ec1addb4a49b6825a365c1b28e6b7
+msgid "Pages can now have ``draft`` status"
+msgstr ""
+
+#: ../../changelog.rst:183 567c77a6a7c24d999b974ce0ed8ea7f9
+msgid "Show current settings via new ``--print-settings`` flag"
+msgstr ""
+
+#: ../../changelog.rst:184 f8206229f89f474990ad86f3670eb6c6
+#, python-format
+msgid ""
+"All settings for slugs now use ``{slug}`` and/or ``{lang}`` rather than "
+"``%s``. If ``%s``-style settings are encountered, Pelican will emit a "
+"warning and fallback to the default setting."
+msgstr ""
+
+#: ../../changelog.rst:187 55c29729d5ae42f6931b0af7ea314bcb
+msgid "New signals: ``feed_generated`` and ``page_generated_write_page``"
+msgstr ""
+
+#: ../../changelog.rst:188 fdd81adbccd2499988dda1b8faef1ab3
+msgid "Replace Fabric with Invoke and ``fabfile.py`` template with ``tasks.py``"
+msgstr ""
+
+#: ../../changelog.rst:189 85659c414dad4293b8a0d6ad9350c4d9
+msgid ""
+"Replace ``PAGINATED_DIRECT_TEMPLATES`` by ``PAGINATED_TEMPLATES``, "
+"extending control over pagination to all templates and making page size "
+"variable"
+msgstr ""
+
+#: ../../changelog.rst:191 2e76745f8fea417fb90052f755372212
+msgid ""
+"Replace ``SLUG_SUBSTITUTIONS`` (and friends) by "
+"``SLUG_REGEX_SUBSTITUTIONS`` for more finegrained control"
+msgstr ""
+
+#: ../../changelog.rst:193 c477dc73b63646c2bf339afff54a2e5f
+msgid ""
+"``'{base_name}'`` value in ``PAGINATION_PATTERNS`` setting no longer "
+"strips ``'bar'`` from ``'foo/bar.html'`` (unless ``'bar' == 'index'``)."
+msgstr ""
+
+#: ../../changelog.rst:195 0c9192b9f8c64af491d33f9358694940
+msgid ""
+"``ARTICLE_ORDER_BY`` and ``PAGE_ORDER_BY`` now also affect 1) category, "
+"tag and author pages 2) feeds 3) draft and hidden articles and pages"
+msgstr ""
+
+#: ../../changelog.rst:197 6e339043faff4d4a9a718a7571bf9698
+msgid ""
+"New ``ARTICLE_TRANSLATION_ID`` and ``PAGE_TRANSLATION_ID`` settings to "
+"specify metadata attributes used to identify/disable translations"
+msgstr ""
+
+#: ../../changelog.rst:199 84e3cebb5adf4c45bda8f132772f2bdd
+msgid "Make the HTML reader parse multiple occurrences of metadata tags as a list"
+msgstr ""
+
+#: ../../changelog.rst:200 790b535916b4402e8f3e568a96d208cc
+msgid "New Blogger XML backup importer"
+msgstr ""
+
+#: ../../changelog.rst:201 84ba1adba13c4c66a843be015263cc5f
+msgid ""
+"Wordpress importer now updates file links to point to local copies if the"
+" files were downloaded with ``--wp-attach``."
+msgstr ""
+
+#: ../../changelog.rst:203 e40ac2db0d404e3d8b51e350256eb49b
+msgid ""
+"Importer no longer inserts extra newlines, to prevent breaking of HTML "
+"attributes."
+msgstr ""
+
+#: ../../changelog.rst:205 a026ba70157640f9afdbbfd1c52635ed
+msgid ""
+"Pelican server now prioritises ``foo.html`` and ``foo/index.html`` over "
+"``foo/`` when resolving ``foo``."
+msgstr ""
+
+#: ../../changelog.rst:209 7bd3c3fdc45a4e848499d05fd1a2149a
+msgid "3.7.1 (2017-01-10)"
+msgstr ""
+
+#: ../../changelog.rst:211 a2224771f8184ef2ae2ae19e69ffff95
+msgid "Fix locale issues in Quickstart script"
+msgstr ""
+
+#: ../../changelog.rst:212 4bc8c9d8dbf24260a84512695081a437
+msgid "Specify encoding for README and CHANGELOG in setup.py"
+msgstr ""
+
+#: ../../changelog.rst:215 cdc85601d26440c08ba36b90b241218a
+msgid "3.7.0 (2016-12-12)"
+msgstr ""
+
+#: ../../changelog.rst:217 88cad459481748c385a4d15e5041255c
+msgid "Atom feeds output ``<content>`` in addition to ``<summary>``"
+msgstr ""
+
+#: ../../changelog.rst:218 e8f51cd31ea94d1cb0fff327607a5106
+msgid ""
+"Atom feeds use ``<published>`` for the original publication date and "
+"``<updated>`` for modifications"
+msgstr ""
+
+#: ../../changelog.rst:220 56be71bb20124ccbb10bf502c2158ebd
+msgid "Simplify Atom feed ID generation and support URL fragments"
+msgstr ""
+
+#: ../../changelog.rst:221 1ece62b3d5424ec4abd099d5b2bf20e0
+msgid "Produce category feeds with category-specific titles"
+msgstr ""
+
+#: ../../changelog.rst:222 106c730749474695b90ef8e5ddd31a7e
+msgid ""
+"RSS feeds now default to summary instead of full content; set "
+"``RSS_FEED_SUMMARY_ONLY = False`` to revert to previous behavior"
+msgstr ""
+
+#: ../../changelog.rst:224 14f1280956dc466a97042a5a313f9511
+msgid "Replace ``MD_EXTENSIONS`` with ``MARKDOWN`` setting"
+msgstr ""
+
+#: ../../changelog.rst:225 57cec9a1574f40f691b026cd680b681e
+msgid ""
+"Replace ``JINJA_EXTENSIONS`` with more-robust ``JINJA_ENVIRONMENT`` "
+"setting"
+msgstr ""
+
+#: ../../changelog.rst:226 9a398118c3d34bb996dc9af2d9c9503a
+msgid ""
+"Improve summary truncation logic to handle special characters and tags "
+"that span multiple lines, using HTML parser instead of regular "
+"expressions"
+msgstr ""
+
+#: ../../changelog.rst:228 75ef90817db34f7ea869a68fcc3fb469
+msgid "Include summary when looking for intra-site link substitutions"
+msgstr ""
+
+#: ../../changelog.rst:229 264f880b25284b01b7135c2a2b9e8dc1
+msgid "Link to authors and index via ``{author}name`` and ``{index}`` syntax"
+msgstr ""
+
+#: ../../changelog.rst:230 4c7abfddef0b454882888ba479aea6b7
+msgid "Override widget names via ``LINKS_WIDGET_NAME`` and ``SOCIAL_WIDGET_NAME``"
+msgstr ""
+
+#: ../../changelog.rst:231 2c5e79d0ad6141c9b6a19ee3e65d091e
+msgid "Add ``INDEX_SAVE_AS`` option to override default ``index.html`` value"
+msgstr ""
+
+#: ../../changelog.rst:232 6f89cd4a39ec445297f7dbb93e662e45
+msgid "Remove ``PAGES`` context variable for themes in favor of ``pages``"
+msgstr ""
+
+#: ../../changelog.rst:233 5b5ca0f599de4532964b3abe99a8c0d7
+msgid ""
+"``SLUG_SUBSTITUTIONS`` now accepts 3-tuple elements, allowing URL slugs "
+"to contain non-alphanumeric characters"
+msgstr ""
+
+#: ../../changelog.rst:235 159f3122fe94405489ccc20fe78f53b5
+msgid ""
+"Tag and category slugs can be controlled with greater precision using the"
+" ``TAG_SUBSTITUTIONS`` and ``CATEGORY_SUBSTITUTIONS`` settings"
+msgstr ""
+
+#: ../../changelog.rst:237 e163a8d8d61a4997b4259fcad5005d9c
+msgid ""
+"Author slugs can be controlled with greater precision using the "
+"``AUTHOR_SUBSTITUTIONS`` setting"
+msgstr ""
+
+#: ../../changelog.rst:239 f81c1120fcd44bfc9dd76acfb090ca9c
+msgid "``DEFAULT_DATE`` can be defined as a string"
+msgstr ""
+
+#: ../../changelog.rst:240 d79a66c8b8b44b3a93ec70011feae3e4
+msgid "Use ``mtime`` instead of ``ctime`` when ``DEFAULT_DATE = 'fs'``"
+msgstr ""
+
+#: ../../changelog.rst:241 ec0aa5c74458441c9ba450673f5fd2ef
+msgid "Add ``--fatal=errors|warnings`` option for use with continuous integration"
+msgstr ""
+
+#: ../../changelog.rst:242 13b4ab828a2941dfa8f1418685bb81a0
+msgid ""
+"When using generator-level caching, ensure previously-cached files are "
+"processed instead of just new files."
+msgstr ""
+
+#: ../../changelog.rst:244 d89e5097e9984f3daf4db6e9b929ada0
+msgid "Add Python and Pelican version information to debug output"
+msgstr ""
+
+#: ../../changelog.rst:245 4716f79323444484a70f7fe8c2650e1f
+msgid "Improve compatibility with Python 3.5"
+msgstr ""
+
+#: ../../changelog.rst:246 0f44c8d133b84c41a41d850300da1578
+msgid "Comply with and enforce PEP8 guidelines"
+msgstr ""
+
+#: ../../changelog.rst:247 c334d1c279204190893641f5ac313e36
+msgid "Replace tables in settings documentation with ``data::`` directives"
+msgstr ""
+
+#: ../../changelog.rst:250 461f1d0f43544a69be1139a9f19fe25a
+msgid "3.6.3 (2015-08-14)"
+msgstr ""
+
+#: ../../changelog.rst:252 7cff2bfca67f43bcb81338e645c16d6a
+msgid "Fix permissions issue in release tarball"
+msgstr ""
+
+#: ../../changelog.rst:255 73ecf430824c4621a9feba3aeb0f0435
+msgid "3.6.2 (2015-08-01)"
+msgstr ""
+
+#: ../../changelog.rst:257 304aa2b89bdb4d6a9765f92c169eeab7
+msgid "Fix installation errors related to Unicode in tests"
+msgstr ""
+
+#: ../../changelog.rst:258 8b544b800b20492db937b02285e42065
+msgid "Don't show pagination in ``notmyidea`` theme if there's only one page"
+msgstr ""
+
+#: ../../changelog.rst:259 f4aa88761161465faaf260a5b8fd25a9
+msgid "Make hidden pages available in context"
+msgstr ""
+
+#: ../../changelog.rst:260 13a3a8e59edc4125afa6dee4ed568e9d
+msgid "Improve URLWrapper comparison"
+msgstr ""
+
+#: ../../changelog.rst:263 fa56610009e8407a89af312d093f2aff
+msgid "3.6.0 (2015-06-15)"
+msgstr ""
+
+#: ../../changelog.rst:265 c4f546492e6447edb4d87c9317bdfb3f
+msgid "Disable caching by default in order to prevent potential confusion"
+msgstr ""
+
+#: ../../changelog.rst:266 b874f6f5b4734a5c80587442728a7544
+msgid "Improve caching behavior, replacing ``pickle`` with ``cpickle``"
+msgstr ""
+
+#: ../../changelog.rst:267 1f5690a0d5b6437e99c0ea9104de979b
+msgid "Allow Markdown or reST content in metadata fields other than ``summary``"
+msgstr ""
+
+#: ../../changelog.rst:268 a1f397d14aca4c879211d95a5ca892db
+msgid "Support semicolon-separated author/tag lists"
+msgstr ""
+
+#: ../../changelog.rst:269 9926a6f073cc4fa9813df12d652898be
+msgid "Improve flexibility of article sorting"
+msgstr ""
+
+#: ../../changelog.rst:270 e832f800cde5424bb332cc49f30f3f0a
+msgid "Add ``--relative-urls`` argument"
+msgstr ""
+
+#: ../../changelog.rst:271 3d1c82c08deb4a778f807be5b779d381
+msgid "Support devserver listening on addresses other than localhost"
+msgstr ""
+
+#: ../../changelog.rst:272 b6ee74584c064fac80c6f0e37d4f1d68
+msgid "Unify HTTP server handlers to ``pelican.server`` throughout"
+msgstr ""
+
+#: ../../changelog.rst:273 7e5010e2d8b74a03b694e8fa433fdf98
+msgid "Handle intra-site links to draft posts"
+msgstr ""
+
+#: ../../changelog.rst:274 a9afa1c067be459886fd7998d52f59d3
+msgid "Move ``tag_cloud`` from core to plugin"
+msgstr ""
+
+#: ../../changelog.rst:275 432317300d7a4b2f82199c0f275716e4
+msgid "Load default theme's external resources via HTTPS"
+msgstr ""
+
+#: ../../changelog.rst:276 56de44e81ae14997afb15c15e59f36ce
+msgid "Import drafts from WordPress XML"
+msgstr ""
+
+#: ../../changelog.rst:277 f1ef4f1c13434d6b9614ebe9ebddfce6
+msgid "Improve support for Windows users"
+msgstr ""
+
+#: ../../changelog.rst:278 0fef1b4c413d491a98aba0c84e082594
+msgid "Enhance logging and test suite"
+msgstr ""
+
+#: ../../changelog.rst:279 432c66ec8584401797ea817ec661c45b
+msgid "Clean up and refactor codebase"
+msgstr ""
+
+#: ../../changelog.rst:280 e22e5fb2b5264d1ca6eb78c067c76a32
+msgid "New signals: ``all_generators_finalized`` and ``page_writer_finalized``"
+msgstr ""
+
+#: ../../changelog.rst:283 b4d02cf4a5b642dcbb0237738d79bfcb
+msgid "3.5.0 (2014-11-04)"
+msgstr ""
+
+#: ../../changelog.rst:285 e9efd7356dc9488aa6f4f20ba995683a
+msgid ""
+"Introduce ``ARTICLE_ORDER_BY`` and ``PAGE_ORDER_BY`` settings to control "
+"the order of articles and pages."
+msgstr ""
+
+#: ../../changelog.rst:287 7cba6f51788f47f391c2eb2c35bff315
+msgid "Include time zone information in dates rendered in templates."
+msgstr ""
+
+#: ../../changelog.rst:288 8288271ca2e74d6da347bdce53a3cf59
+msgid "Expose the reader name in the metadata for articles and pages."
+msgstr ""
+
+#: ../../changelog.rst:289 0c44eda91d9c4722b8ae87ed75416fd1
+msgid ""
+"Add the ability to store static files along with content in the same "
+"directory as articles and pages using ``{attach}`` in the path."
+msgstr ""
+
+#: ../../changelog.rst:291 d96ca5c3ced44a7db8997feda6d5c36d
+msgid ""
+"Prevent Pelican from raising an exception when there are duplicate pieces"
+" of metadata in a Markdown file."
+msgstr ""
+
+#: ../../changelog.rst:293 59a2c665716a4d51bdec967e877f86a1
+msgid ""
+"Introduce the ``TYPOGRIFY_IGNORE_TAGS`` setting to add HTML tags to be "
+"ignored by Typogrify."
+msgstr ""
+
+#: ../../changelog.rst:295 fa33c1b08c7b4286b25b56b4ea285c5a
+#, python-format
+msgid ""
+"Add the ability to use ``-`` in date formats to strip leading zeros. For "
+"example, ``%-d/%-m/%y`` will now result in the date ``9/8/12``."
+msgstr ""
+
+#: ../../changelog.rst:297 64d61ee9d8ae4414b9b84a8051cd5522
+msgid ""
+"Ensure feed generation is correctly disabled during quickstart "
+"configuration."
+msgstr ""
+
+#: ../../changelog.rst:298 85d7dfece0244142a1e486fbae2beb01
+msgid ""
+"Fix ``PAGE_EXCLUDES`` and ``ARTICLE_EXCLUDES`` from incorrectly matching "
+"sub-directories."
+msgstr ""
+
+#: ../../changelog.rst:300 3acc9c23e76e4b289d9de3705c416913
+msgid "Introduce ``STATIC_EXCLUDE`` setting to add static file excludes."
+msgstr ""
+
+#: ../../changelog.rst:301 10dd085e254948f986aa41f9bd5ba73b
+msgid ""
+"Fix an issue when using ``PAGINATION_PATTERNS`` while ``RELATIVE_URLS`` "
+"is enabled."
+msgstr ""
+
+#: ../../changelog.rst:303 f7b355566396425cbd08985d5771e6d4
+msgid ""
+"Fix feed generation causing links to use the wrong language for month "
+"names when using other locales."
+msgstr ""
+
+#: ../../changelog.rst:305 28f48794554048308015e2fb52cc4c5b
+msgid ""
+"Fix an issue where the authors list in the simple template wasn't "
+"correctly formatted."
+msgstr ""
+
+#: ../../changelog.rst:307 5509ab0c156845d1a7f1a59306ccfe6c
+msgid "Fix an issue when parsing non-string URLs from settings."
+msgstr ""
+
+#: ../../changelog.rst:308 4da2cbc439db416daeb4442a29645664
+msgid "Improve consistency of debug and warning messages."
+msgstr ""
+
+#: ../../changelog.rst:311 2e98c390cf6b4b4b93ddcce23014dbe9
+msgid "3.4.0 (2014-07-01)"
+msgstr ""
+
+#: ../../changelog.rst:313 b3f12ddd82d74409b734a8bd10458173
+msgid "Speed up content generation via new caching mechanism"
+msgstr ""
+
+#: ../../changelog.rst:314 c1772deca0344f74aad300e77e2641b2
+msgid "Add selective post generation (instead of always building entire site)"
+msgstr ""
+
+#: ../../changelog.rst:315 7db419405a1740ef917e19f05015228a
+msgid "Many documentation improvements, including switching to prettier RtD theme"
+msgstr ""
+
+#: ../../changelog.rst:316 a045ce18d5724b888849a2036fdf626d
+msgid "Add support for multiple content and plugin paths"
+msgstr ""
+
+#: ../../changelog.rst:317 75ddeed2af5e4a56a83e6b4026807ebf
+msgid ""
+"Add ``:modified:`` metadata field to complement ``:date:``. Used to "
+"specify the last date and time an article was updated independently from "
+"the date and time it was published."
+msgstr ""
+
+#: ../../changelog.rst:320 0049c916daed45a6bcd389ad0c120732
+msgid "Add support for multiple authors via new ``:authors:`` metadata field"
+msgstr ""
+
+#: ../../changelog.rst:321 bd572ae6cd4c4783b751a35f4f001ed6
+msgid "Watch for changes in static directories when in auto-regeneration mode"
+msgstr ""
+
+#: ../../changelog.rst:322 b48f6001e36e428491aa05fa2d419cd1
+msgid "Add filters to limit log output when desired"
+msgstr ""
+
+#: ../../changelog.rst:323 5d67072828f04eb1a2b8d37aca1706e4
+msgid "Add language support to drafts"
+msgstr ""
+
+#: ../../changelog.rst:324 5f6eef6c622a468ab0750bc4fbafffcd
+msgid "Add ``SLUGIFY_SOURCE`` setting to control how post slugs are generated"
+msgstr ""
+
+#: ../../changelog.rst:325 f77675fb2cb94589b821eaf0116d5b33
+msgid "Fix many issues relating to locale and encoding"
+msgstr ""
+
+#: ../../changelog.rst:326 b90206854315449696be45e4d459e5b4
+msgid "Apply Typogrify filter to post summary"
+msgstr ""
+
+#: ../../changelog.rst:327 86383b9bc16e4b4a9ec3d15e7b727ca1
+msgid ""
+"Preserve file metadata (e.g. time stamps) when copying static files to "
+"output"
+msgstr ""
+
+#: ../../changelog.rst:328 f844db2703af4069830a3fbcbd3841bd
+msgid "Move AsciiDoc support from Pelican core into separate plugin"
+msgstr ""
+
+#: ../../changelog.rst:329 1c30d68d58dc42d9b33c2662f1258bcd
+msgid ""
+"Produce inline links instead of reference-style links when importing "
+"content"
+msgstr ""
+
+#: ../../changelog.rst:330 fa8944dc8e284fe4bf78ad3a0676af3f
+msgid "Improve handling of ``IGNORE_FILES`` setting behavior"
+msgstr ""
+
+#: ../../changelog.rst:331 f4c5805f6879483f9aa25e247f49016e
+msgid "Properly escape symbol characters in tag names (e.g., ``C++``)"
+msgstr ""
+
+#: ../../changelog.rst:332 d4c27bbafbd0427e821e301a503eec07
+msgid "Minor tweaks for Python 3.4 compatibility"
+msgstr ""
+
+#: ../../changelog.rst:333 743111e35a0c4303985dcce214e3e29f
+msgid "Add several new signals"
+msgstr ""
+
+#: ../../changelog.rst:336 46ee1a42a2ac4f688e20db25231a97cc
+msgid "3.3.0 (2013-09-24)"
+msgstr ""
+
+#: ../../changelog.rst:338 d38c96a268fb4928b7884c32f04ea781
+msgid "Drop Python 3.2 support in favor of Python 3.3"
+msgstr ""
+
+#: ../../changelog.rst:339 e4b1b4170e3a4daf85bb3e0b4a33d84c
+msgid ""
+"Add ``Fabfile`` so Fabric can be used for workflow automation instead of "
+"Make"
+msgstr ""
+
+#: ../../changelog.rst:340 8f898752127545598c060470ba4ea5a6
+msgid ""
+"``OUTPUT_RETENTION`` setting can be used to preserve metadata (e.g., VCS "
+"data such as ``.hg`` and ``.git``) from being removed from output "
+"directory"
+msgstr ""
+
+#: ../../changelog.rst:342 3cef6e0824db42ef8eb2a6db21e018c4
+msgid "Tumblr import"
+msgstr ""
+
+#: ../../changelog.rst:343 9b35ec96add44773857342682a38fbe9
+msgid "Improve logic and consistency when cleaning output folder"
+msgstr ""
+
+#: ../../changelog.rst:344 0e3383e3461a44b590b00a88c8543859
+msgid "Improve documentation versioning and release automation"
+msgstr ""
+
+#: ../../changelog.rst:345 ab9935d7e2c84ccb852185870f8d1cc9
+msgid "Improve pagination flexibility"
+msgstr ""
+
+#: ../../changelog.rst:346 92bd1ab368544083ac4e64f5d424c151
+msgid ""
+"Rename signals for better consistency (some plugins may need to be "
+"updated)"
+msgstr ""
+
+#: ../../changelog.rst:347 740eae7ce680434c981b4064809072a3
+msgid ""
+"Move metadata extraction from generators to readers; metadata extraction "
+"no longer article-specific"
+msgstr ""
+
+#: ../../changelog.rst:349 d1ae5b5bc77f4bcaa40d5bd86cdc0fcc
+msgid ""
+"Deprecate ``FILES_TO_COPY`` in favor of ``STATIC_PATHS`` and "
+"``EXTRA_PATH_METADATA``"
+msgstr ""
+
+#: ../../changelog.rst:351 806154386d4c45d9b625087bbd8706bd
+msgid "Summaries in Markdown posts no longer include footnotes"
+msgstr ""
+
+#: ../../changelog.rst:352 1e20db19c60442a4ae4c517d5edaac8c
+msgid ""
+"Remove unnecessary whitespace in output via ``lstrip_blocks`` Jinja "
+"parameter"
+msgstr ""
+
+#: ../../changelog.rst:353 72b17016676643d4863b6da2dc5dd585
+msgid "Move PDF generation from core to plugin"
+msgstr ""
+
+#: ../../changelog.rst:354 c8e9e2beddd242038b0655913de16745
+msgid "Replace ``MARKUP`` setting with ``READERS``"
+msgstr ""
+
+#: ../../changelog.rst:355 39124ff576a145e194694060c394ebea
+msgid "Add warning if img tag is missing ``alt`` attribute"
+msgstr ""
+
+#: ../../changelog.rst:356 039cc780731643f882a0dd52bd7486d9
+msgid "Add support for ``{}`` in relative links syntax, besides ``||``"
+msgstr ""
+
+#: ../../changelog.rst:357 9289f5f1c5f04c5894cb8e7e02f9f5c8
+msgid "Add support for ``{tag}`` and ``{category}`` relative links"
+msgstr ""
+
+#: ../../changelog.rst:358 a214dc13448b479bb7af0a16825457aa
+msgid "Add a ``content_written`` signal"
+msgstr ""
+
+#: ../../changelog.rst:361 5249278a96bc437fa297368c8f672404
+msgid "3.2.1 and 3.2.2"
+msgstr ""
+
+#: ../../changelog.rst:363 3f9b98d264e048949c389dbe3e260652
+msgid "Facilitate inclusion in FreeBSD Ports Collection"
+msgstr ""
+
+#: ../../changelog.rst:366 124cc3f3f8924e918bd0789422649535
+msgid "3.2 (2013-04-24)"
+msgstr ""
+
+#: ../../changelog.rst:368 fa25abf620e84a568df67473d9b3e20f
+msgid "Support for Python 3!"
+msgstr ""
+
+#: ../../changelog.rst:369 b1702663f9ff41e387aa055aa8a80985
+msgid ""
+"Override page save-to location from meta-data (enables using a static "
+"page as the site's home page, for example)"
+msgstr ""
+
+#: ../../changelog.rst:371 3d9f1c80f4c74f0fb655aaff98846e2e
+msgid "Time period archives (per-year, per-month, and per-day archives of posts)"
+msgstr ""
+
+#: ../../changelog.rst:372 ee27abd30d204213967d190e45bc3cce
+msgid "Posterous blog import"
+msgstr ""
+
+#: ../../changelog.rst:373 2614d3717c644bd4b567eb2bbcec9c5b
+msgid "Improve WordPress blog import"
+msgstr ""
+
+#: ../../changelog.rst:374 8e10fa12d60b4473858214e618f934f3
+msgid "Migrate plugins to separate repository"
+msgstr ""
+
+#: ../../changelog.rst:375 a4ff557f266149e992884d5bc180f6fd
+msgid "Improve HTML parser"
+msgstr ""
+
+#: ../../changelog.rst:376 e9a87539173943dcb76ffff618a205cc
+msgid ""
+"Provide ability to show or hide categories from menu using "
+"``DISPLAY_CATEGORIES_ON_MENU`` option"
+msgstr ""
+
+#: ../../changelog.rst:378 721df0da641444c1a41fe72e38bafa20
+msgid "Auto-regeneration can be told to ignore files via ``IGNORE_FILES`` setting"
+msgstr ""
+
+#: ../../changelog.rst:379 2f925e2291c54bc0b6da964d7f17079f
+msgid "Improve post-generation feedback to user"
+msgstr ""
+
+#: ../../changelog.rst:380 bc36457afeaa449583693dcef652e072
+msgid ""
+"For multilingual posts, use meta-data to designate which is the original "
+"and which is the translation"
+msgstr ""
+
+#: ../../changelog.rst:382 8abbe86f8e4a4786886f887bad894983
+msgid "Add ``.mdown`` to list of supported Markdown file extensions"
+msgstr ""
+
+#: ../../changelog.rst:383 84e1d9cee66c4ee3ba779eb697169d35
+msgid "Document-relative URL generation (``RELATIVE_URLS``) is now off by default"
+msgstr ""
+
+#: ../../changelog.rst:386 461aa8ba882c4543980540c6686a69ff
+msgid "3.1 (2012-12-04)"
+msgstr ""
+
+#: ../../changelog.rst:388 ea4445533819403b8a54af8f62d30dab
+msgid ""
+"Importer now stores slugs within files by default. This can be disabled "
+"with the ``--disable-slugs`` option."
+msgstr ""
+
+#: ../../changelog.rst:390 a00bcb155126439ab341cff0f37ecc5a
+msgid "Improve handling of links to intra-site resources"
+msgstr ""
+
+#: ../../changelog.rst:391 5d47bb0eac84452b829ea7a5a7447bdd
+msgid ""
+"Ensure WordPress import adds paragraphs for all types of line endings in "
+"post content"
+msgstr ""
+
+#: ../../changelog.rst:393 6d41430cf1ae4bbe95c7206bed9fe17c
+msgid "Decode HTML entities within WordPress post titles on import"
+msgstr ""
+
+#: ../../changelog.rst:394 17121b597e6148768c531523a9b6f955
+msgid "Improve appearance of LinkedIn icon in default theme"
+msgstr ""
+
+#: ../../changelog.rst:395 cfc8bfbe89c44ce9a30e230f255d79dd
+msgid "Add GitHub and Google+ social icons support in default theme"
+msgstr ""
+
+#: ../../changelog.rst:396 5bd746b4bcc64c7382d492f61d50193c
+msgid "Optimize social icons"
+msgstr ""
+
+#: ../../changelog.rst:397 bdb1513252d54c1f89e9efc11516b368
+msgid ""
+"Add ``FEED_ALL_ATOM`` and ``FEED_ALL_RSS`` to generate feeds containing "
+"all posts regardless of their language"
+msgstr ""
+
+#: ../../changelog.rst:399 6d52c5f3e6e64dcc8b11fb5f80d6df46
+msgid ""
+"Split ``TRANSLATION_FEED`` into ``TRANSLATION_FEED_ATOM`` and "
+"``TRANSLATION_FEED_RSS``"
+msgstr ""
+
+#: ../../changelog.rst:401 12c0a402411f47a4a71f64d7f19efd01
+msgid "Different feeds can now be enabled/disabled individually"
+msgstr ""
+
+#: ../../changelog.rst:402 f7ddae2570b34df1b598fa35239449ad
+msgid ""
+"Allow for blank author: if ``AUTHOR`` setting is not set, author won't "
+"default to ``${USER}`` anymore, and a post won't contain any author "
+"information if the post author is empty"
+msgstr ""
+
+#: ../../changelog.rst:405 e12a883add8d41f1b330e51ace547b06
+msgid "Move LESS and Webassets support from Pelican core to plugin"
+msgstr ""
+
+#: ../../changelog.rst:406 d2e26f930edf4d68801b4e005ab7cdca
+msgid ""
+"The ``DEFAULT_DATE`` setting now defaults to ``None``, which means that "
+"articles won't be generated unless date metadata is specified"
+msgstr ""
+
+#: ../../changelog.rst:408 c198ce6b37c94d98b358cf8aae3fa1c0
+msgid ""
+"Add ``FILENAME_METADATA`` setting to support metadata extraction from "
+"filename"
+msgstr ""
+
+#: ../../changelog.rst:410 c3a2e1677eab4de3a12963b8c13e4875
+msgid ""
+"Add ``gzip_cache`` plugin to compress common text files into a ``.gz`` "
+"file within the same directory as the original file, preventing the "
+"server (e.g. Nginx) from having to compress files during an HTTP call"
+msgstr ""
+
+#: ../../changelog.rst:413 666bac4d13ba42d5b61833beb0950beb
+msgid "Add support for AsciiDoc-formatted content"
+msgstr ""
+
+#: ../../changelog.rst:414 aaf5c771064c4c46975523a15609e6c9
+msgid ""
+"Add ``USE_FOLDER_AS_CATEGORY`` setting so that feature can be toggled "
+"on/off"
+msgstr ""
+
+#: ../../changelog.rst:415 71233f0cf0844770a9374a375bce2ed6
+msgid "Support arbitrary Jinja template files"
+msgstr ""
+
+#: ../../changelog.rst:416 fa2c3365a6c049bdb69a3215fd4010f7
+msgid "Restore basic functional tests"
+msgstr ""
+
+#: ../../changelog.rst:417 925cdeb6a5344275a69e3d93ecc88eea
+msgid ""
+"New signals: ``generator_init``, ``get_generators``, and "
+"``article_generate_preread``"
+msgstr ""
+
+#: ../../changelog.rst:421 a534e61fa0374d0cb03ec9d83b5fe387
+msgid "3.0 (2012-08-08)"
+msgstr ""
+
+#: ../../changelog.rst:423 7ec504fa35f84ec1b47a86fb9ef3b685
+msgid "Refactored the way URLs are handled"
+msgstr ""
+
+#: ../../changelog.rst:424 a268577292d945649ad12e1430ed9eaf
+msgid "Improved the English documentation"
+msgstr ""
+
+#: ../../changelog.rst:425 c694abe18818459d83a25f01c6257d9b
+msgid "Fixed packaging using ``setuptools`` entrypoints"
+msgstr ""
+
+#: ../../changelog.rst:426 81b5a9a2740340e6ad48d2baceef5ebd
+msgid "Added ``typogrify`` support"
+msgstr ""
+
+#: ../../changelog.rst:427 39d0f35b4ee343259ec7375597a718ec
+msgid "Added a way to disable feed generation"
+msgstr ""
+
+#: ../../changelog.rst:428 8eb4aa1d17ff406aaf5be093c4310966
+msgid "Added support for ``DIRECT_TEMPLATES``"
+msgstr ""
+
+#: ../../changelog.rst:429 0b43a8fa70db455696e298f4c11ac0c3
+msgid "Allow multiple extensions for content files"
+msgstr ""
+
+#: ../../changelog.rst:430 89b94d339a3f46f882451d1dfac8df08
+msgid "Added LESS support"
+msgstr ""
+
+#: ../../changelog.rst:431 bb9a3c00bb23405698d39c49b812ec07
+msgid "Improved the import script"
+msgstr ""
+
+#: ../../changelog.rst:432 d4b7b6302e4b48b6990484066099dec1
+msgid "Added functional tests"
+msgstr ""
+
+#: ../../changelog.rst:433 cc8d47d8e96d47c1965b6b721ad32de5
+msgid "Rsync support in the generated Makefile"
+msgstr ""
+
+#: ../../changelog.rst:434 10cb71db95504caf9c45928191f650b0
+msgid "Improved feed support (easily pluggable with Feedburner for instance)"
+msgstr ""
+
+#: ../../changelog.rst:435 61c7cb5819f94c89bd6dc3773375048f
+msgid "Added support for ``abbr`` in reST"
+msgstr ""
+
+#: ../../changelog.rst:436 f65624c8dd3f4047be4adc66a8a9d1f4
+msgid "Fixed a bunch of bugs :-)"
+msgstr ""
+
+#: ../../changelog.rst:439 d87300bfd91e495286e96a06c76fea5a
+msgid "2.8 (2012-02-28)"
+msgstr ""
+
+#: ../../changelog.rst:441 a96f4e4b17034044a7fad630eba6f6c3
+msgid "Dotclear importer"
+msgstr ""
+
+#: ../../changelog.rst:442 769b7e899fe44b2299b3bc021b23724d
+msgid "Allow the usage of Markdown extensions"
+msgstr ""
+
+#: ../../changelog.rst:443 c11b737547f44ee4b9f206d78fd69034
+msgid "Themes are now easily extensible"
+msgstr ""
+
+#: ../../changelog.rst:444 22b0eea97e5c4d5ea4615961685ddfda
+msgid "Don't output pagination information if there is only one page"
+msgstr ""
+
+#: ../../changelog.rst:445 739a53e452714197918fdb7c730685c2
+msgid "Add a page per author, with all their articles"
+msgstr ""
+
+#: ../../changelog.rst:446 6b9d84b09f954dba8e2ad225e26ad68a
+msgid "Improved the test suite"
+msgstr ""
+
+#: ../../changelog.rst:447 6099f1c52f7c48adad09f9b84f50f181
+msgid "Made the themes easier to extend"
+msgstr ""
+
+#: ../../changelog.rst:448 e4090cb5f1634fe0b30e498e8f1c0eca
+msgid "Removed Skribit support"
+msgstr ""
+
+#: ../../changelog.rst:449 04ff51eeefd24306804c5a2daa98d59e
+msgid "Added a ``pelican-quickstart`` script"
+msgstr ""
+
+#: ../../changelog.rst:450 550158557c904ad8abe330a0b86e6755
+msgid "Fixed timezone-related issues"
+msgstr ""
+
+#: ../../changelog.rst:451 f41a6fafa9d548adbae1dfc7276a7f3a
+msgid "Added some scripts for Windows support"
+msgstr ""
+
+#: ../../changelog.rst:452 e8b30590d7c64808b604f03d4bf25ffc
+msgid "Date can be specified in seconds"
+msgstr ""
+
+#: ../../changelog.rst:453 bbdf1c456cc3417e876855d8b792753c
+msgid "Never fail when generating posts (skip and continue)"
+msgstr ""
+
+#: ../../changelog.rst:454 33545506148f48c7a1f42d12535604ad
+msgid "Allow the use of future dates"
+msgstr ""
+
+#: ../../changelog.rst:455 1d56de44e22c432eb61fbd23fe27ae88
+msgid "Support having different timezones per language"
+msgstr ""
+
+#: ../../changelog.rst:456 0002c845a16a4d5bb19eeca4dedb0ce9
+msgid "Enhanced the documentation"
+msgstr ""
+
+#: ../../changelog.rst:459 2dd8c562cd44466cbbc868023bc8eef6
+msgid "2.7 (2011-06-11)"
+msgstr ""
+
+#: ../../changelog.rst:461 6383d280fbbf47e99be6cbceaaa30245
+msgid "Use ``logging`` rather than echoing to stdout"
+msgstr ""
+
+#: ../../changelog.rst:462 80e585445f284f95be38a221068c817d
+msgid "Support custom Jinja filters"
+msgstr ""
+
+#: ../../changelog.rst:463 a2431e6f9cd041d7ae9a81ee9ea1f1d3
+msgid "Compatibility with Python 2.5"
+msgstr ""
+
+#: ../../changelog.rst:464 8cdec91cfae54eef979319ffcd7b2b4b
+msgid "Added a theme manager"
+msgstr ""
+
+#: ../../changelog.rst:465 53823ba8924f4092a13f30d612b6d147
+msgid "Packaged for Debian"
+msgstr ""
+
+#: ../../changelog.rst:466 dcf480ab75f849e78f2e15e0de4880c9
+msgid "Added draft support"
+msgstr ""
+
+#: ../../changelog.rst:469 9e46e5ecc5aa48ed9c973f181250bb2d
+msgid "2.6 (2011-03-08)"
+msgstr ""
+
+#: ../../changelog.rst:471 3b00b44b0dc74320bcc30ac3c3b8d43f
+msgid "Changes in the output directory structure"
+msgstr ""
+
+#: ../../changelog.rst:472 7edd59c2885748b18242900bc717e6f2
+msgid "Makes templates easier to work with / create"
+msgstr ""
+
+#: ../../changelog.rst:473 80ecbc256d074c0ab966b3f8f90b2fa7
+msgid "Added RSS support (was Atom-only)"
+msgstr ""
+
+#: ../../changelog.rst:474 6bcd42cb56ae4e52b1fd66833cad6bd3
+msgid "Added tag support for the feeds"
+msgstr ""
+
+#: ../../changelog.rst:475 e8875e8c6317488eb0fa76f5d444763f
+msgid "Enhance the documentation"
+msgstr ""
+
+#: ../../changelog.rst:476 feb91b6347cb467ba693cb55a2cd8a00
+msgid "Added another theme (brownstone)"
+msgstr ""
+
+#: ../../changelog.rst:477 3e8cd0da99fe408bb66b8db1caaa336b
+msgid "Added translations"
+msgstr ""
+
+#: ../../changelog.rst:478 888218f74f754c209363573264452100
+msgid "Added a way to use cleaner URLs with a rewrite url module (or equivalent)"
+msgstr ""
+
+#: ../../changelog.rst:479 5006a51a923042dcabda9843b155d177
+msgid "Added a tag cloud"
+msgstr ""
+
+#: ../../changelog.rst:480 a329ec582419436392aea3556205352c
+msgid ""
+"Added an autoreloading feature: the blog is automatically regenerated "
+"each time a modification is detected"
+msgstr ""
+
+#: ../../changelog.rst:482 8b136937ff5c42b6a9d4ca2c09f49399
+msgid "Translate the documentation into French"
+msgstr ""
+
+#: ../../changelog.rst:483 00b39926200d4f1389445e6f7a25ea34
+msgid "Import a blog from an RSS feed"
+msgstr ""
+
+#: ../../changelog.rst:484 92dd7ebe963e4c3da3dd0b138d8c0cd7
+msgid "Pagination support"
+msgstr ""
+
+#: ../../changelog.rst:485 45dc61ad8c664e1e84511003c2431e7f
+msgid "Added Skribit support"
+msgstr ""
+
+#: ../../changelog.rst:488 17729e7145b04f21b6adef1c94284e4b
+msgid "2.5 (2010-11-20)"
+msgstr ""
+
+#: ../../changelog.rst:490 44ae6d5ba68944cea82d7b3598be287e
+msgid "Import from WordPress"
+msgstr ""
+
+#: ../../changelog.rst:491 a0af2d8823354b8fa048b456f9d0df25
+msgid "Added some new themes (martyalchin / wide-notmyidea)"
+msgstr ""
+
+#: ../../changelog.rst:492 ec519864fa79463b8eea11f06934cbc5
+msgid "First bug report!"
+msgstr ""
+
+#: ../../changelog.rst:493 7d38312ffc1f4589ad54b2d019cad3ea
+msgid "Linkedin support"
+msgstr ""
+
+#: ../../changelog.rst:494 99a73194501a4469acac9ffdd791502f
+msgid "Added a FAQ"
+msgstr ""
+
+#: ../../changelog.rst:495 49dc1d7af56c43a8b21e3d0e0bf141ad
+msgid "Google Analytics support"
+msgstr ""
+
+#: ../../changelog.rst:496 59edf76455f2489993739d027964bb63
+msgid "Twitter support"
+msgstr ""
+
+#: ../../changelog.rst:497 9c2d230b25e24b179049dc9e0332401c
+msgid "Use relative URLs, not static ones"
+msgstr ""
+
+#: ../../changelog.rst:500 fc4e0772192648cd89baed818dbeb908
+msgid "2.4 (2010-11-06)"
+msgstr ""
+
+#: ../../changelog.rst:502 d01de90563a94bafae690740613aa682
+msgid "Minor themes changes"
+msgstr ""
+
+#: ../../changelog.rst:503 38a95f8b00684dc3ab279840640a01d8
+msgid "Add Disqus support (so we have comments)"
+msgstr ""
+
+#: ../../changelog.rst:504 13dca871c120491a90240c43c7d0f4c7
+msgid "Another code refactoring"
+msgstr ""
+
+#: ../../changelog.rst:505 87ec5e2d8b80482aac6e0a82f31c0d12
+msgid "Added config settings about pages"
+msgstr ""
+
+#: ../../changelog.rst:506 30c338ee5d85462588119841675c73f4
+msgid "Blog entries can also be generated in PDF"
+msgstr ""
+
+#: ../../changelog.rst:509 6d1ebe0620ff46939743b2fe2e9f1683
+msgid "2.3 (2010-10-31)"
+msgstr ""
+
+#: ../../changelog.rst:511 3df14b83afaa446ca893c157189e33fb
+msgid "Markdown support"
+msgstr ""
+
+#: ../../changelog.rst:514 91b45ea2e78047ccbbd97c7059930864
+msgid "2.2 (2010-10-30)"
+msgstr ""
+
+#: ../../changelog.rst:516 4b96d6c2c47d463ebb66d1eaeb1f004e
+msgid "Prettify output"
+msgstr ""
+
+#: ../../changelog.rst:517 cd805a3c55c84ddd89080a4912d91633
+msgid "Manages static pages as well"
+msgstr ""
+
+#: ../../changelog.rst:520 bc8859b0bf4043e09aed54af4b3c6ba7
+msgid "2.1 (2010-10-30)"
+msgstr ""
+
+#: ../../changelog.rst:522 3146db5382224eddad41228f6f539e4c
+msgid "Make notmyidea the default theme"
+msgstr ""
+
+#: ../../changelog.rst:525 f1bff0048805473d90461c68f8c82f07
+msgid "2.0 (2010-10-30)"
+msgstr ""
+
+#: ../../changelog.rst:527 9c0181b93ed34eaa87a8e323a773a4c9
+msgid "Refactoring to be more extensible"
+msgstr ""
+
+#: ../../changelog.rst:528 878c1cc7b2bb4adbb1684439b029cd14
+msgid "Change into the setting variables"
+msgstr ""
+
+#: ../../changelog.rst:531 ca506f63c6474fa4ba68a7b57a840e81
+msgid "1.2 (2010-09-28)"
+msgstr ""
+
+#: ../../changelog.rst:533 eef62c1f5bff457eba9733aba004b18d
+msgid "Added a debug option"
+msgstr ""
+
+#: ../../changelog.rst:534 5c800901f23b4dceac320db21cb1e3db
+msgid "Added per-category feeds"
+msgstr ""
+
+#: ../../changelog.rst:535 d51b96b46a2b4dc09088ad32fbc61bbb
+msgid "Use filesystem to get dates if no metadata is provided"
+msgstr ""
+
+#: ../../changelog.rst:536 9b6420ecf5fb459d885d70db9190ad3b
+msgid "Add Pygments support"
+msgstr ""
+
+#: ../../changelog.rst:539 5ccc5d9fa9424ec8896c57c3d62e1b6e
+msgid "1.1 (2010-08-19)"
+msgstr ""
+
+#: ../../changelog.rst:541 a992372f04e345b5b37b6e20891b9b60
+msgid "First working version"
+msgstr ""
diff --git a/docs/locale/zh_CN/LC_MESSAGES/content.po b/docs/locale/zh_CN/LC_MESSAGES/content.po
new file mode 100644
index 00000000..e180a866
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/content.po
@@ -0,0 +1,1074 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-09-15 09:23+0800\n"
+"PO-Revision-Date: 2024-06-25 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../content.rst:2 0e0d4e5751154cd4a5002b3f93cce14a
+msgid "Writing content"
+msgstr "创作内容"
+
+#: ../../content.rst:5 4316c31e97f740239cb3daaa533c0b64
+msgid "Articles and pages"
+msgstr "文章和页面"
+
+#: ../../content.rst:7 66e59f17488f4914a6d5c4538214dd91
+msgid ""
+"Pelican considers \"articles\" to be chronological content, such as posts"
+" on a blog, and thus associated with a date."
+msgstr "Pelican将“文章”（article）视为有时间顺序的内容，例如博客上的博文就是文章。"
+
+#: ../../content.rst:10 ed244e3e671f450daf0617a80274878b
+msgid ""
+"The idea behind \"pages\" is that they are usually not temporal in nature"
+" and are used for content that does not change very often (e.g., "
+"\"About\" or \"Contact\" pages)."
+msgstr "“页面”（page）指的是不经常改变的内容，例如“关于”“联系我们”这样的。"
+
+#: ../../content.rst:14 f30d12684e0043438418655ba9f5cf25
+msgid "You can find sample content in the repository at ``samples/content/``."
+msgstr ""
+"在代码仓库的 ``samples/content/`` "
+"文件夹下有一些内容示例供您查看。（译者注：原文档中还有post与content的说法，一般既指代文章又指代页面，后文统一将其翻译为推文）"
+
+#: ../../content.rst:19 370562db18eb42f19935009d087595b4
+msgid "File metadata"
+msgstr "文件元数据"
+
+#: ../../content.rst:21 e9e758d40aeb42a78a5e25ddbca35a3b
+msgid ""
+"Pelican tries to be smart enough to get the information it needs from the"
+" file system (for instance, about the category of your articles), but "
+"some information you need to provide in the form of metadata inside your "
+"files."
+msgstr "Pelican可以从文件系统中自动地获取一些信息（例如文章的分类），但是有些信息需要您以元数据的形式在文件中提供。"
+
+#: ../../content.rst:25 276a3d27de8c41a784b3c4fa6b0b9f1b
+msgid ""
+"If you are writing your content in reStructuredText format, you can "
+"provide this metadata in text files via the following syntax (give your "
+"file the ``.rst`` extension)::"
+msgstr "如果您用reStructuredText的格式进行内容创作，您可以按照下面的语法在文本文件中提供元数据（请给文本文件加上 ``.rst`` 后缀）："
+
+#: ../../content.rst:40 b5d99eedf95a4b6bbf760eccb4add31b
+msgid ""
+"Author and tag lists may be semicolon-separated instead, which allows you"
+" to write authors and tags containing commas::"
+msgstr "如果有多个作者或多个文章标签，需要将他们以分号分隔，这样就可以在作者或标签中使用逗号了："
+
+#: ../../content.rst:46 18ae0e8b1cae406381a546bf2462c1e6
+msgid ""
+"Pelican implements an extension to reStructuredText to enable support for"
+" the ``abbr`` HTML tag. To use it, write something like this in your "
+"post::"
+msgstr "Pelican在reStructuredText上实现了 ``abbr`` HTML标签的使用支持。在正文部分按照下面的形式书写即可。"
+
+#: ../../content.rst:51 62c068f033f0498d888dd72f23f9d231
+msgid ""
+"You can also use Markdown syntax (with a file ending in ``.md``, "
+"``.markdown``, ``.mkd``, or ``.mdown``). Markdown generation requires "
+"that you first explicitly install the Python-Markdown_ package, which can"
+" be done via ``pip install Markdown``."
+msgstr ""
+"Pelican同时也支持Markdown语法（文件的扩展名需要为 ``.md`` 、 ``.markdown``、 ``.mkd`` 或 "
+"``.mdown`` ）要让Pelican进行Markdown的生成，需要先通过 ``pip install Markdown`` 安装 "
+"Python-Markdown_ 。"
+
+#: ../../content.rst:56 f39e1de0f9ea4533942c5bf0bff7866f
+msgid ""
+"Pelican also supports `Markdown Extensions`_, which might have to be "
+"installed separately if they are not included in the default ``Markdown``"
+" package and can be configured and loaded via the ``MARKDOWN`` setting."
+msgstr ""
+"Pelican同样支持 `Markdown扩展`_ ，可以是 ``Markdown`` 包自带的扩展，也可以是另外安装的，可以通过 "
+"``MARKDOWN`` 配置项管理这些扩展。"
+
+#: ../../content.rst:60 c9f3ab98c3d54b53bf647ba9202b5386
+msgid "Metadata syntax for Markdown posts should follow this pattern::"
+msgstr "Markdown中的元数据语法需要按照下面的格式书写："
+
+#: ../../content.rst:73 ba840c208e4b4198ac0a2bd672a94f36
+msgid ""
+"You can also have your own metadata keys (so long as they don't conflict "
+"with reserved metadata keywords) for use in your templates. The following"
+" table contains a list of reserved metadata keywords:"
+msgstr "您也可以定义自己的元数据类型（只要和保留的元数据关键字不冲突），这些自定义的元数据关键字可以用在自定义的模板中。下面的列出了所有保留的元数据关键字。"
+
+#: ../../content.rst:78 a9537c5593d9458d9193dacc82c27f2f
+msgid "Metadata"
+msgstr "元数据类型"
+
+#: ../../content.rst:78 ../../content.rst:548 827ac866a3914692ac5fc9eaa1921aac
+#: a55315aa4aee4e30a7768bc54d7063da
+msgid "Description"
+msgstr "描述"
+
+#: ../../content.rst:80 d5e5b3902b9f46e3a827c551e26d84bd
+msgid "``title``"
+msgstr "``title``"
+
+#: ../../content.rst:80 07eb7d1b1a5f458084564729052749e7
+msgid "Title of the article or page"
+msgstr "文章或页面的标题"
+
+#: ../../content.rst:81 37abd449ffca4436a505f0dc35343cea
+msgid "``date``"
+msgstr "``date``"
+
+#: ../../content.rst:81 a13a424e96f643068af63b0d0d2dbb27
+msgid "Publication date (e.g., ``YYYY-MM-DD HH:SS``)"
+msgstr "发布日期（需要以 ``YYYY-MM-DD HH:SS`` 的格式）"
+
+#: ../../content.rst:82 7534c5908891457797988ef7a67b17db
+msgid "``modified``"
+msgstr "``modified``"
+
+#: ../../content.rst:82 6cc7d4c20ee44e31bb54173b24aa9afe
+msgid "Modification date (e.g., ``YYYY-MM-DD HH:SS``)"
+msgstr "最后修改日期（需要以 ``YYYY-MM-DD HH:SS`` 的格式）"
+
+#: ../../content.rst:83 0f7d30bb91bf46f7a0e2dd5ab186955d
+msgid "``tags``"
+msgstr "``tags``"
+
+#: ../../content.rst:83 e07fee37f1de414f82b38e7ff5e9051b
+msgid "Content tags, separated by commas"
+msgstr "推文标签，以逗号分隔"
+
+#: ../../content.rst:84 cc730907be1c4bb6a4d1f4e551f1bb13
+msgid "``keywords``"
+msgstr "``keywords``"
+
+#: ../../content.rst:84 b4185fda72084329b551f26b6eff5bd5
+msgid "Content keywords, separated by commas (HTML content only)"
+msgstr "推文关键字，以逗号分隔（只能在HTML内容中使用）"
+
+#: ../../content.rst:85 98438d6e0fbf4783a580516079fa5f3b
+msgid "``category``"
+msgstr "``category``"
+
+#: ../../content.rst:85 48e04733764e4962bfe4d16828b34d79
+msgid "Content category (one only — not multiple)"
+msgstr "推文分类（只能归属到一个分类中，不支持多个）"
+
+#: ../../content.rst:86 275265cdeaaf4515b8f84dd79d29e181
+msgid "``slug``"
+msgstr "``slug``"
+
+#: ../../content.rst:86 d910b7a82ea540179d561f639e531b9d
+msgid "Identifier used in URLs and translations"
+msgstr "URL和翻译的唯一标识符"
+
+#: ../../content.rst:87 ac2a927028d647a0b4f5edb14e5b1851
+msgid "``author``"
+msgstr "``author``"
+
+#: ../../content.rst:87 bd27267c861f470db23499a67a631854
+msgid "Content author, when there is only one"
+msgstr "当只有一个作者时可以使用这个元数据"
+
+#: ../../content.rst:88 9616ecb488914e4eaa192ecb4e437ba0
+msgid "``authors``"
+msgstr "``authors``"
+
+#: ../../content.rst:88 762660408c274f5690dba81dcc88c662
+msgid "Content authors, when there are multiple"
+msgstr "当有多个作者时需要使用这个元数据"
+
+#: ../../content.rst:89 40d65df77e0f4e75a26615d60775a382
+msgid "``summary``"
+msgstr "``summary``"
+
+#: ../../content.rst:89 f072a97cf1c54b7fbd383f205732f1c2
+msgid "Brief description of content for index pages"
+msgstr "简短的推文概要，会显示在首页上"
+
+#: ../../content.rst:90 69018dfa7f9b4e74b518fc1940af8908
+msgid "``lang``"
+msgstr "``lang``"
+
+#: ../../content.rst:90 f139c5b2a2774ee3bb83d4bd3b523a93
+msgid "Content language ID (``en``, ``fr``, etc.)"
+msgstr "推文所用语言的ID（例如 ``en`` 、 ``fr`` 、 ``zh-cn`` 等）"
+
+#: ../../content.rst:91 13757ce4c6a84096b4d131232eaeb8b4
+msgid "``translation``"
+msgstr "``translation``"
+
+#: ../../content.rst:91 9b3f475397bc4d60a1eb911f6763285f
+msgid "If content is a translation of another (``true`` or ``false``)"
+msgstr "手动指定当前内容是否是某个翻译版本（该元数据的值只能是 ``true`` 或 ``false``）"
+
+#: ../../content.rst:92 3f294461641949eead16c79e7bffdb22
+msgid "``status``"
+msgstr "``status``"
+
+#: ../../content.rst:92 f6ab65a6adf64379a14fb89d300d9eaa
+msgid "Content status: ``draft``, ``hidden``, ``skip``, or ``published``"
+msgstr "推文的状态： ``draft``、 ``hidden`` 、 ``skip`` 或 ``published`` "
+
+#: ../../content.rst:93 d9aefdcc77aa462d9934eb49f2b39095
+msgid "``template``"
+msgstr "``template``"
+
+#: ../../content.rst:93 41ecae4039714f31b0220f0d0f45a0c7
+msgid "Name of template to use to generate content (without extension)"
+msgstr "用于指定要使用的生成模板，只需要写模板的名字，不需要模板文件的后缀名"
+
+#: ../../content.rst:94 892e239c7a9145beb61b2f583284f448
+msgid "``save_as``"
+msgstr "``save_as``"
+
+#: ../../content.rst:94 3bc3792a6a5c4e79bcf8f77fc48f313b
+msgid "Save content to this relative file path"
+msgstr "将内容保存到指定的相对文件路径"
+
+#: ../../content.rst:95 8c3ed87a54734ca1bba051448d8169f9
+msgid "``url``"
+msgstr "``url``"
+
+#: ../../content.rst:95 2b55b515c7ce40e48eae20fbc67107bb
+msgid "URL to use for this article/page"
+msgstr "指定本篇文章或页面要使用的URL"
+
+#: ../../content.rst:98 81c7cc35f7b74566b7dd9083c2fc17f1
+msgid ""
+"Readers for additional formats (such as AsciiDoc_) are available via "
+"plugins, which you can find via the `Pelican Plugins`_ collection as well"
+" as the legacy `pelican-plugins`_ repository."
+msgstr ""
+"对其他格式的支持（例如 AsciiDoc_ ）可以通过插件实现，在 `Pelican插件`_ 集中可以查看所有插件。当然，在老的 "
+"`pelican-plugins`_ 仓库中也可以查看。"
+
+#: ../../content.rst:102 b808c2914ee14c1380fe53e5e1f378f7
+msgid ""
+"Pelican can also process HTML files ending in ``.html`` and ``.htm``. "
+"Pelican interprets the HTML in a very straightforward manner, reading "
+"metadata from ``meta`` tags, the title from the ``title`` tag, and the "
+"body out from the ``body`` tag::"
+msgstr ""
+"Pelican还能处理后缀名为 ``.html`` 和 ``.htm`` "
+"的HTML文件Pelican在解释转换HTML文件时用的方法非常直接，会从 ``meta`` HTML标签中获取元数据信息，从 ``title``"
+" HTML标签中获取标题，从 ``body`` 标签中获取文章的正文内容："
+
+#: ../../content.rst:122 289c3761b4b94691bee5ef07e8ab25ff
+msgid ""
+"With HTML, there is one simple exception to the standard metadata: tags "
+"can be specified either via the ``tags`` metadata, as is standard in "
+"Pelican, or via the ``keywords`` metadata, as is standard in HTML. The "
+"two can be used interchangeably."
+msgstr ""
+"当使用HTML文件时，上述的众多元数据中有一个比较特殊的存在——tags。这个元数据在HTML文档中有两种方式可以指定，一种是Pelican中定义的"
+" ``tags`` （上面的例子中用的就是这种）；另一种是使用HTML中定义的 ``keywords`` "
+"（即将name属性的“tags”换成“keywords”）。"
+
+#: ../../content.rst:127 9af1403c5c624860bd73aba6f6ad642f
+msgid ""
+"Note that, aside from the title, none of this content metadata is "
+"mandatory: if the date is not specified and ``DEFAULT_DATE`` is set to "
+"``'fs'``, Pelican will rely on the file's \"mtime\" timestamp, and the "
+"category can be determined by the directory in which the file resides. "
+"For example, a file located at ``python/foobar/myfoobar.rst`` will have a"
+" category of ``foobar``. If you would like to organize your files in "
+"other ways where the name of the subfolder would not be a good category "
+"name, you can set the setting ``USE_FOLDER_AS_CATEGORY`` to ``False``.  "
+"When parsing dates given in the page metadata, Pelican supports the W3C's"
+" `suggested subset ISO 8601`__."
+msgstr ""
+"需要注意的是，除了title外，其他所有元数据都是可以缺省的。若未指定日期元数据并且将 ``DEFAULT_DATE`` 设为了 "
+"``'fs'``，Pelican就会从文件的 “mtime” 时间戳中获取日期信息；文件所在目录的名称会被作为category。例如 "
+"``python/foobar/myfoobar.rst`` 的category元数据值就会被设为 ``foobar`` "
+"。如果您不希望子目录的名称成为category的值，则需要在设置中将 ``USE_FOLDER_AS_CATEGORY`` 设为 "
+"``False`` 。进行日期元数据的解析时，Pelican支持W3C的 `suggested subset ISO 8601`__ 标准。"
+
+#: ../../content.rst:137 0f142fac1e9e41eeb0cf4cc70a42f72b
+msgid ""
+"So the title is the only required metadata. If that bothers you, worry "
+"not. Instead of manually specifying a title in your metadata each time, "
+"you can use the source content file name as the title. For example, a "
+"Markdown source file named ``Publishing via Pelican.md`` would "
+"automatically be assigned a title of *Publishing via Pelican*. If you "
+"would prefer this behavior, add the following line to your settings "
+"file::"
+msgstr ""
+"总而言之，标题是唯一必须指定的元数据。如果您甚至懒得写标题，也不用担心，Pelican会自动将文件名作为内容的标题。例如，Markdown源文件 "
+"``Publishing via Pelican.md`` 的标题会自动设为 *Publishing via "
+"Pelican*。如果您希望启用这个特性，请在设置文件中添加下面这么一行："
+
+#: ../../content.rst:148 481919b7e3974c8293d420886105941f
+msgid ""
+"When experimenting with different settings (especially the metadata ones)"
+" caching may interfere and the changes may not be visible. In such cases "
+"disable caching with ``LOAD_CONTENT_CACHE = False`` or use the "
+"``--ignore-cache`` command-line switch."
+msgstr ""
+"在您尝试不同的设置时（特别是在设置元数据时），缓存可能会对您造成干扰，导致设置更改不起作用。若您遇到了这种问题，可以在配置文件中加上 "
+"``LOAD_CONTENT_CACHE = False`` ，或是在使用命令行生成站点时加上 ``--ignore-cache`` 参数。"
+
+#: ../../content.rst:155 466fa8d713b343d1a8ae8266c3031479
+msgid ""
+"``modified`` should be last time you updated the article, and defaults to"
+" ``date`` if not specified. Besides you can show ``modified`` in the "
+"templates, feed entries in feed readers will be updated automatically "
+"when you set ``modified`` to the current date after you modified your "
+"article."
+msgstr ""
+"``modified`` 元数据中应该为文章最后一次的修改时间，若没有指定，会自动与 ``date`` 保持一致。在您修改文章并将 "
+"``modified`` 设为当前日期后，除了在模板中显示 ``modified`` 之外，feed阅读器中的feed条目也会自动更新。"
+
+#: ../../content.rst:160 e7c9358cd2a74e64863af04736d10775
+msgid ""
+"``authors`` is a comma-separated list of article authors. If there's only"
+" one author you can use ``author`` field."
+msgstr "``authors`` 元数据中是文章作者的列表，各个作者之间用逗号分隔。若只有一个作者，可以使用 ``author`` 。"
+
+#: ../../content.rst:163 15bdeea8538244948ca509ee57ef8f63
+msgid ""
+"If you do not explicitly specify summary metadata for a given post, the "
+"``SUMMARY_MAX_LENGTH`` setting can be used to specify how many words from"
+" the beginning of an article are used as the summary. You can also use an"
+" article's first N paragraphs as its summary using the "
+"``SUMMARY_MAX_PARAGRAPHS`` setting. If both settings are in use, the "
+"specified number of paragraphs will be used but may be truncated to "
+"respect the specified maximum length."
+msgstr ""
+"若您没有显式地指定summary元数据，Pelican会自动从推文开头截取 ``SUMMARY_MAX_LENGTH`` "
+"指定长度的内容作为summary。另外，您也可以使用配置项 ``SUMMARY_MAX_PARAGRAPHS`` "
+"指定推文开头前N段内容作为summary。若同时指定了这两个配置项，首先会考虑 ``SUMMARY_MAX_PARAGRAPHS`` "
+"，若前N段的总长度超过 ``SUMMARY_MAX_LENGTH`` ，还是会按照 ``SUMMARY_MAX_LENGTH`` 进行截断。"
+
+#: ../../content.rst:170 64a7dcd4911447338ac1871083242a83
+msgid ""
+"You can also extract any metadata from the filename through a regular "
+"expression to be set in the ``FILENAME_METADATA`` setting. All named "
+"groups that are matched will be set in the metadata object. The default "
+"value for the ``FILENAME_METADATA`` setting will only extract the date "
+"from the filename. For example, if you would like to extract both the "
+"date and the slug, you could set something like: "
+"``'(?P<date>\\d{4}-\\d{2}-\\d{2})_(?P<slug>.*)'``"
+msgstr ""
+"您可以通过 ``FILENAME_METADATA`` "
+"设置来使用正则表达式从文件名中提取元数据。正则匹配到的每个命名分组都被看成一个元数据。预设的 ``FILENAME_METADATA`` "
+"只会从文件名中提取date和slug。例如，可以使用 "
+"``'(?P<date>\\d{4}-\\d{2}-\\d{2})_(?P<slug>.*)'`` 提取date和slug。"
+
+#: ../../content.rst:177 0b6aaca5fc60494fafd2bdf345f25ab3
+msgid ""
+"Please note that the metadata available inside your files takes "
+"precedence over the metadata extracted from the filename."
+msgstr "请注意，您在推文中直接指定的元数据的优先级是大于从文件名中提取的。"
+
+#: ../../content.rst:181 463df99e715d44c09a48770ddda1e139
+msgid "Pages"
+msgstr "页面"
+
+#: ../../content.rst:183 d2dd51b7abe14dc4921adcf50b8218fb
+msgid ""
+"If you create a folder named ``pages`` inside the content folder, all the"
+" files in it will be used to generate static pages, such as **About** or "
+"**Contact** pages. (See example filesystem layout below.)"
+msgstr ""
+"如果您在content文件夹下创建了一个 ``pages`` 文件夹，那么Pelican会为其中的每个文件生成一个例如 **关于** "
+"、**联系我们** 这样的静态页面。（具体可以看下面项目文件组织的例子）"
+
+#: ../../content.rst:187 3ac83019ba9c44e781a7b67c837c99d6
+msgid ""
+"You can use the ``DISPLAY_PAGES_ON_MENU`` setting to control whether all "
+"those pages are displayed in the primary navigation menu. (Default is "
+"``True``.)"
+msgstr "您可以通过 ``DISPLAY_PAGES_ON_MENU`` 设置来决定页面是否被列在主导航菜单中（默认值为 ``True`` ）。"
+
+#: ../../content.rst:190 56486e599f334e0fbc976bcf2d22bd5e
+msgid ""
+"If you want to exclude any pages from being linked to or listed in the "
+"menu, then add a ``status: hidden`` attribute to its metadata. This is "
+"useful for things like making error pages that fit the generated theme of"
+" your site."
+msgstr ""
+"如果您希望让某些页面不会被链接并且也不列在任何菜单中，可以为它加上元数据属性 ``status: hidden`` "
+"。这在将错误页面适配到所用主题时很有用。"
+
+#: ../../content.rst:195 0205a4cab1a040a4aef74a3c375855a4
+msgid "Static content"
+msgstr "静态内容"
+
+#: ../../content.rst:197 2a86301465bd4f41944964cb0edf1572
+msgid ""
+"Static files are files other than articles and pages that are copied to "
+"the output folder as-is, without processing. You can control which static"
+" files are copied over with the ``STATIC_PATHS`` setting of the project's"
+" ``pelicanconf.py`` file. Pelican's default configuration includes the "
+"``images`` directory for this, but others must be added manually. In "
+"addition, static files that are explicitly linked to are included (see "
+"below)."
+msgstr ""
+"静态文件与文章、页面不同，会原模原样地复制到输出文件夹中。当然，您也通过设置 ``STATIC_PATHS`` "
+"更改复制时的目标文件夹。Pelican的默认配置中只包含了 ``images`` "
+"一个文件夹，其他的需要手动添加。另外静态文件也包含那些被显式链接的（详见后文）。"
+
+#: ../../content.rst:206 3b74472b747e4cd494aae142ec4deecc
+msgid ""
+"In the default configuration, all files with a valid content file suffix "
+"(``.html``, ``.rst``, ``.md``, ...) get processed by the article and page"
+" generators *before* the static generator. This is avoided by altering "
+"the ``*_EXCLUDE`` settings appropriately."
+msgstr ""
+"在默认配置下，所有后缀名有效的文件（ ``.html`` 、 ``.rst`` 、 ``.md`` , "
+"...）都会由文章/页面生成器处理，这是在静态文件处理之前完成的。若这些文件中的某一些是静态文件，可以合理使用 ``*_EXCLUDE`` "
+"配置项将他们排除（例如 ``ARTICLE_EXCLUDES`` 、 ``PAGE_EXCLUDES``）。"
+
+#: ../../content.rst:212 ab263a1d5b5a4fb0a705257701b8b6c3
+msgid "Mixed content in the same directory"
+msgstr "在同一个目录下存放不同类型的内容"
+
+#: ../../content.rst:214 dfec139d8f98465ea117dcd02f3e7870
+msgid ""
+"Starting with Pelican 3.5, static files can safely share a source "
+"directory with page source files, without exposing the page sources in "
+"the generated site. Any such directory must be added to both "
+"``STATIC_PATHS`` and ``PAGE_PATHS`` (or ``STATIC_PATHS`` and "
+"``ARTICLE_PATHS``). Pelican will identify and process the page source "
+"files normally, and copy the remaining files as if they lived in a "
+"separate directory reserved for static files."
+msgstr ""
+"从Pelican 3.5开始，静态文件就可以和页面源文件安全地放在同一目录下了。这些包含了不同类型内容文件的目录需要添加到 "
+"``STATIC_PATHS`` 和 ``PAGE_PATHS`` 中（或者 ``STATIC_PATHS`` 和 "
+"``ARTICLE_PATHS`` "
+"中）。Pelican会正常地识别和处理文章和页面源文件，然后再把静态文件复制，和处理处于单独一个文件夹的静态文件行为一致。"
+
+#: ../../content.rst:221 de484f74c05a48e4ac84631e56309bf6
+msgid ""
+"Note: Placing static and content source files together in the same source"
+" directory does not guarantee that they will end up in the same place in "
+"the generated site. The easiest way to do this is by using the "
+"``{attach}`` link syntax (described below). Alternatively, the "
+"``STATIC_SAVE_AS``, ``PAGE_SAVE_AS``, and ``ARTICLE_SAVE_AS`` settings "
+"(and the corresponding ``*_URL`` settings) can be configured to place "
+"files of different types together, just as they could in earlier versions"
+" of Pelican."
+msgstr ""
+"请注意：Pelican不保证放在同一个源目录下的静态文件和内容文件在站点生成完后最终出现在同一个地方。要让他们出现在一个地方，可以使用 "
+"``{attach}`` 链接语法（下面会提到）。此外，还可以通过设置 ``STATIC_SAVE_AS`` 、 ``PAGE_SAVE_AS``"
+" 和 ``ARTICLE_SAVE_AS`` (还有相应的 ``*_URL`` 设置)让不同类型的文件最终放在一起。"
+
+#: ../../content.rst:232 6733f6cc9bbb4ee0995d7f818c24b850
+msgid "Linking to internal content"
+msgstr "内部链接"
+
+#: ../../content.rst:234 e0f9e61fef924c82aa7950ad20c0b686
+msgid ""
+"From Pelican 3.1 onwards, it is now possible to specify intra-site links "
+"to files in the *source content* hierarchy instead of files in the "
+"*generated* hierarchy. This makes it easier to link from the current post"
+" to other content that may be sitting alongside that post (instead of "
+"having to determine where the other content will be placed after site "
+"generation)."
+msgstr ""
+"从Pelican 3.1开始，站内链接可以在 *源文件* 层次下指定，而不是只能在 *生成后的站点* "
+"层次下指定。当需要在当前推文链接到邻近位置的内容时，可以直接从源内容文件的位置开始链接（而不需要考虑在站点生成后文件会被放在哪儿）。"
+
+#: ../../content.rst:240 8de8953b665841818066d12cec9631d4
+msgid ""
+"To link to internal content (files in the ``content`` directory), use the"
+" following syntax for the link target: ``{filename}path/to/file``. Note: "
+"forward slashes, ``/``, are the required path separator in the "
+"``{filename}`` directive on all operating systems, including Windows."
+msgstr ""
+"要链接到站内（即在 ``content`` 目录下的文件），使用下述的目标链接语法： ``{filename}path/to/file`` "
+"。注意，在所有操作系统（当然也包括Windows）上，路径的分隔符都要使用正斜杠 ``/`` 。"
+
+#: ../../content.rst:246 dbd1404fa9fe47b7ba2594d1cc5d84f5
+msgid "For example, a Pelican project might be structured like this::"
+msgstr "例如，某Pelican项目的文件结构组织如下："
+
+#: ../../content.rst:257 04b1728643124b6e903acb6c32d6c970
+msgid "In this example, ``article1.rst`` could look like this::"
+msgstr "在这个例子中， ``article1.rst`` 的内容如下："
+
+#: ../../content.rst:269 9197b32aca1c4af6ac2f2b56e7498206
+msgid "and ``article2.md``::"
+msgstr "``article2.md`` 的内容如下："
+
+#: ../../content.rst:280 baccc8dc58cd482cb42bd44d78d16d42
+msgid "Linking to static files"
+msgstr "链接到静态文件"
+
+#: ../../content.rst:282 33067c5bbb554baea7306b0c2f0b5356
+msgid ""
+"You can link to static content using ``{static}path/to/file``. Files "
+"linked to with this syntax will automatically be copied to the output "
+"directory, even if the source directories containing them are not "
+"included in the ``STATIC_PATHS`` setting of the project's "
+"``pelicanconf.py`` file."
+msgstr ""
+"您可以通过 ``{static}path/to/file`` 链接到静态内容。使用这个指令链接的文件都会被自动复制到输出目录中，即使它没有包含在 "
+"``STATIC_PATHS`` 中。"
+
+#: ../../content.rst:287 ../../content.rst:322 533a9aee68e5452db609cc5e1e569381
+#: 7c9993b8f8c44863975e5db9d5ce1cb8
+msgid "For example, a project's content directory might be structured like this::"
+msgstr "例如，某Pelican项目的文件结构组织如下："
+
+#: ../../content.rst:297 7c70d916da684551b499f25fd9567e11
+msgid "``test.md`` would include::"
+msgstr "``test.md`` 的文件内容如下："
+
+#: ../../content.rst:302 8921fb6dfbba4e6ea4c0220650617dc6
+msgid ""
+"Site generation would then copy ``han.jpg`` to ``output/images/han.jpg``,"
+" ``menu.pdf`` to ``output/pdfs/menu.pdf``, and write the appropriate "
+"links in ``test.md``."
+msgstr ""
+"站点生成时会将 ``han.jpg`` 拷贝到 ``output/images/han.jpg`` 、将 ``menu.pdf`` 拷贝到 "
+"``output/pdfs/menu.pdf`` ，同时也会自动把 ``test.md`` 中的相关链接都替换为正确的。"
+
+#: ../../content.rst:306 244c1bb923ec4b7ab33c039f2deefe94
+msgid ""
+"If you use ``{static}`` to link to an article or a page, this will be "
+"turned into a link to its source code."
+msgstr "如果您使用 ``{static}`` 链接到文章或页面，会链接到他们的源文件而不是渲染后的文章或页面。"
+
+#: ../../content.rst:310 50d69d50e26d4b48b4b1fb2643efa0e6
+msgid "Attaching static files"
+msgstr "将静态文件作为附件"
+
+#: ../../content.rst:312 f28e37fba55b49a99f03bbafc669ef87
+msgid ""
+"Starting with Pelican 3.5, static files can be \"attached\" to a page or "
+"article using this syntax for the link target: ``{attach}path/to/file``. "
+"This works like the ``{static}`` syntax, but also relocates the static "
+"file into the linking document's output directory. If the static file "
+"originates from a subdirectory beneath the linking document's source, "
+"that relationship will be preserved on output. Otherwise, it will become "
+"a sibling of the linking document."
+msgstr ""
+"从Pelican 3.5开始，静态文件可以使用下述语法 “附” 在页面或文章上： ``{attach}path/to/file`` 。这和 "
+"``{static}`` "
+"语法很像，也会将静态文件重定位到文章或页面的对应输出目录中。当推文所链接的静态文件处于其源文件所在位置的子目录下时，这种父子关系在输出目录中会得以保留。否则，默认情况下，静态文件会和对应的文档输出到同一目录层级下。"
+
+#: ../../content.rst:320 dba2dfdd8ef14b41b37f9db53ebb9704
+msgid "This only works for linking to static files."
+msgstr "这只在链接到静态文件时起作用。"
+
+#: ../../content.rst:333 a523bb1926b54025908733f0aca757c5
+msgid "``pelicanconf.py`` would include::"
+msgstr "例如对于某设置文件 ``pelicanconf.py`` "
+
+#: ../../content.rst:340 d12e170143234a51862ac73d04acb16b
+msgid "``testpost.md`` would include::"
+msgstr "``testpost.md`` 的内容如下："
+
+#: ../../content.rst:350 8628f5e27e51444fad84dc68aa8a74bb
+msgid ""
+"Site generation would then produce an output directory structured like "
+"this::"
+msgstr "对应生成输出的站点目录结构如下："
+
+#: ../../content.rst:360 8f74e3a043b84a088708bc046118b327
+msgid ""
+"Notice that all the files linked using ``{attach}`` ended up in or "
+"beneath the article's output directory."
+msgstr "可以注意到，使用 ``{attach}`` 链接的文件要么和文章输出处于同级目录，要么就是在文章所在位置的子目录下。"
+
+#: ../../content.rst:363 cdaf8ffc246645da8614e76072a6704d
+msgid ""
+"If a static file is linked multiple times, the relocating feature of "
+"``{attach}`` will only work in the first of those links to be processed. "
+"After the first link, Pelican will treat ``{attach}`` like ``{static}``. "
+"This avoids breaking the already-processed links."
+msgstr ""
+"若一个静态文件被多次链接， ``{attach}`` 只会在该静态文件第一次被链接时进行重定位处理（即按照上面的规则复制到对应目录）。之后使用 "
+"``{attach}`` 进行的链接的效果就和 ``{static}`` 一模一样了。这样子就可以避免破坏已经生成好的链接。"
+
+#: ../../content.rst:368 0783ef45de914a48af081fbf5978ae93
+msgid ""
+"**Be careful when linking to a file from multiple documents:** Since the "
+"first link to a file finalizes its location and Pelican does not define "
+"the order in which documents are processed, using ``{attach}`` on a file "
+"linked by multiple documents can cause its location to change from one "
+"site build to the next. (Whether this happens in practice will depend on "
+"the operating system, file system, version of Pelican, and documents "
+"being added, modified, or removed from the project.) Any external sites "
+"linking to the file's old location might then find their links broken. "
+"**It is therefore advisable to use {attach} only if you use it in all "
+"links to a file, and only if the linking documents share a single "
+"directory.** Under these conditions, the file's output location will not "
+"change in future builds. In cases where these precautions are not "
+"possible, consider using ``{static}`` links instead of ``{attach}``, and "
+"letting the file's location be determined by the project's "
+"``STATIC_SAVE_AS`` and ``STATIC_URL`` settings. (Per-file ``save_as`` and"
+" ``url`` overrides can still be set in ``EXTRA_PATH_METADATA``.)"
+msgstr ""
+"**当同一文件被多个推文链接时需要尤其小心：** "
+"第一次链接到文件时，Pelican就会确定其最终位置，而Pelican处理推文的顺序是不能确定的，因此多个推文使用 ``{attach}`` "
+"链接到同一文件时，每一次站点生成后该文件的最终位置是无法确定的（这种情况发生与否取决于操作系统、文件系统、Pelican的版本、推文从项目中的添加修改移除）。当这种情况发生时，其他站点到本站点文件旧位置的链接就会损坏。**因此，只有当静态文件只被一篇推文链接，或链接到某静态文件的推文都在同一目录下时才使用"
+" {attach}**。在这种情况下，该文件的输出位置在站点构建中不会变化。如果无法保证上述条件来预防链接损坏，可以考虑使用 "
+"``{static}`` 来替换 ``{attach}`` 。如此，文件的最终位置就由 ``STATIC_SAVE_AS`` 和 "
+"``STATIC_URL`` 来决定。（每个文件的 ``save_as`` 和 ``url`` 仍然可以通过更改 "
+"``EXTRA_PATH_METADATA`` 设置来覆盖）"
+
+#: ../../content.rst:385 85347094a7f741ac96f2489969660181
+msgid ""
+"When using ``{attach}``, any parent directory in ``*_URL`` / "
+"``*_SAVE_AS`` settings should match each other. See also: :ref:`url-"
+"settings`"
+msgstr ""
+"当使用{attach}时， ``*_URL`` / ``*_SAVE_AS`` 设置中的所有父目录都应该互相对应。具体请参见 "
+":ref:`URL配置<url-settings>` 。"
+
+#: ../../content.rst:389 eaefe7d009be4a5797cabee8bf1230a4
+msgid "Linking to authors, categories, index and tags"
+msgstr "链接到作者、分类、索引、标签"
+
+#: ../../content.rst:391 2c5b13a80a6b49acadeed0ff3d71236f
+msgid ""
+"You can link to authors, categories, index and tags using the "
+"``{author}name``, ``{category}foobar``, ``{index}`` and ``{tag}tagname`` "
+"syntax."
+msgstr ""
+"您可以通过 ``{author}name`` 、 ``{category}foobar`` 、 ``{index}`` 和 "
+"``{tag}tagname`` 这样的语法链接到作者、分类、索引和标签。"
+
+#: ../../content.rst:395 ec56f8d188bf4e41a961f00535b16dfb
+msgid "Deprecated internal link syntax"
+msgstr "已弃用的内部链接语法"
+
+#: ../../content.rst:397 01e39bc18c964baaaf43779b37fbaa01
+msgid ""
+"To remain compatible with earlier versions, Pelican still supports "
+"vertical bars (``||``) in addition to curly braces (``{}``) for internal "
+"links. For example: ``|filename|an_article.rst``, ``|tag|tagname``, "
+"``|category|foobar``. The syntax was changed from ``||`` to ``{}`` to "
+"avoid collision with Markdown extensions or reST directives. Similarly, "
+"Pelican also still supports linking to static content with "
+"``{filename}``. The syntax was changed to ``{static}`` to allow linking "
+"to both generated articles and pages and their static sources."
+msgstr ""
+"为了保持和早期版本的兼容，在内部链接中除了使用花括号（ ``{}`` ）外，还支持在内部链接中使用竖线（ ``||`` ）。例如， "
+"``|filename|an_article.rst`` 、  ``|tag|tagname`` 、 ``|category|foobar`` "
+"。将语法中的 ``||`` 改到 ``{}`` 是为了避免和Markdown或reST的语法和指令相冲突。类似地， ``{filename}`` "
+"虽然仍能使用，但是其语法已经改为了 ``{static}`` 。 ``{static}`` 既可以链接到文章或页面，也可以链接到静态资源。"
+
+#: ../../content.rst:405 375eca8f0c324943a3d5ba60f46e8aa7
+msgid "Support for the old syntax may eventually be removed."
+msgstr "对旧语法地支持最终会被移除。"
+
+#: ../../content.rst:408 d1e5719616d5454a810ed1562d0610fa
+msgid "Including other files"
+msgstr "引入其他文件"
+
+#: ../../content.rst:409 b429cad5b7904db5b16053bd9dbc7bb6
+msgid "Both Markdown and reStructuredText syntaxes provide mechanisms for this."
+msgstr "Markdown和reStructuredText的语法中都提供了这种机制"
+
+#: ../../content.rst:411 fa6e783b42c84147a18f2a23136a8212
+msgid ""
+"Following below are some examples for **reStructuredText** using `the "
+"include directive`_:"
+msgstr "下面是 **reStructuredText** 使用 `include指令`_ 的一些例子："
+
+#: ../../content.rst:417 ecbaa72c1df64857b2e720ab7055e258
+msgid ""
+"Include a fragment of a file delimited by two identifiers, highlighted as"
+" C++ (slicing based on line numbers is also possible):"
+msgstr "下面的例子，引入了一段用一对标识符分隔的文件片段，并指定以C++语法进行高亮显示。（同样支持通过行号指定片段）"
+
+#: ../../content.rst:426 04bf027b52124b669b3b56ea50ac240d
+msgid ""
+"Include a raw HTML file (or an inline SVG) and put it directly into the "
+"output without any processing:"
+msgstr "将一HTML文件（或者一个行内SVG）直接引入，并且不进行任何处理直接将其作为输出："
+
+#: ../../content.rst:433 612365f02c5a471295f2f3601f0d95e9
+msgid ""
+"For **Markdown**, one must rely on an extension. For example, using the "
+"`mdx_include plugin`_:"
+msgstr "对于 **Markdown** ，若要进行文件引入，就必须使用扩展插件。例如可以使用 `mdx_include plugin`_ ："
+
+#: ../../content.rst:443 30c87f2b5e594c24ac8ab719614c71fd
+msgid "Importing an existing site"
+msgstr "导入已有站点"
+
+#: ../../content.rst:445 f0f0ccd87dcc4afebe9b7d954481eeb2
+msgid ""
+"It is possible to import your site from several other blogging sites "
+"(like WordPress, Tumblr, ..) using a simple script. See :ref:`import`."
+msgstr "您可以使用一个简单的脚本导入已有的站点（例如WordPress、Tumblr）。详见 :ref:`导入已有站点<import>` 。"
+
+#: ../../content.rst:449 48de7111f6ec49ec8637c06e7d774f26
+msgid "Translations"
+msgstr "翻译"
+
+#: ../../content.rst:451 0d1f7e6d14b746e2bb40f200c23f89a5
+msgid ""
+"It is possible to translate articles. To do so, you need to add a "
+"``lang`` meta attribute to your articles/pages and set a ``DEFAULT_LANG``"
+" setting (which is English [en] by default). With those settings in "
+"place, only articles with the default language will be listed, and each "
+"article will be accompanied by a list of available translations for that "
+"article."
+msgstr ""
+"一篇文章可以有多个翻译版本。对于这类文章，您需要加上元数据属性 ``lang`` ，并且配置 ``DEFAULT_LANG`` "
+"（默认为[en]）。完成上述配置后，文章列表中列出的是默认语言版本的文章，文章内容页中会列出所有可用的翻译版本供读者选择。"
+
+#: ../../content.rst:459 61df3a34ac194a2eb037c1b4e868265c
+msgid ""
+"This core Pelican functionality does not create sub-sites (e.g. "
+"``example.com/de``) with translated templates for each language. For such"
+" advanced functionality the `i18n_subsites plugin`_ can be used."
+msgstr ""
+"Pelican的这个核心功能并不会给同一文章的不同语言版本创建子站点（例如 ``example.com/de`` "
+"）。但是如果需要创建子站点的话，可以使用扩展插件 `i18n_subsites plugin`_ 。"
+
+#: ../../content.rst:464 c05ed4b06cec45248f976be0580b257c
+msgid ""
+"By default, Pelican uses the article's URL \"slug\" to determine if two "
+"or more articles are translations of one another. (This can be changed "
+"with the ``ARTICLE_TRANSLATION_ID`` setting.) The slug can be set "
+"manually in the file's metadata; if not set explicitly, Pelican will "
+"auto-generate the slug from the title of the article."
+msgstr ""
+"默认情况下，Pelican会使用文章的URL “slug” 来判断当前文档是否是同一篇文章的不同翻译版本。（这一点可以通过配置 "
+"``ARTICLE_TRANSLATION_ID`` "
+"来改变）slug可以通过元数据手动指定，若没有，Pelican会根据文章的标题（title）来自动生成slug。"
+
+#: ../../content.rst:470 e448fdfd15c046fb8c641fcead12b26d
+msgid ""
+"Here is an example of two articles, one in English and the other in "
+"French."
+msgstr "以下的例子是一篇文章有英语和法语两个翻译版本的情况。"
+
+#: ../../content.rst:472 62a186c5d6194a37b884343a858f2200
+msgid "The English article::"
+msgstr "英语文章如下："
+
+#: ../../content.rst:482 b32c5433696e4a09adb804cef323b3f1
+msgid "And the French version::"
+msgstr "法语版本为："
+
+#: ../../content.rst:492 b4d1d69ebe22462d985ebe2cfc8cd1e8
+msgid ""
+"Post content quality notwithstanding, you can see that only item in "
+"common between the two articles is the slug, which is functioning here as"
+" an identifier. If you'd rather not explicitly define the slug this way, "
+"you must then instead ensure that the translated article titles are "
+"identical, since the slug will be auto-generated from the article title."
+msgstr "值得注意的是，以上两篇文章的slug是相同的，即slug作为唯一标识符存在。若您没有手动指定slug，那么请保证同一篇文章的不同翻译版本的标题是相同的。如此，由于slug会根据文章标题自动生成，它们隐含的slug会是相同的。"
+
+#: ../../content.rst:498 2e50d70746634009a070dc41068fbc89
+msgid ""
+"If you do not want the original version of one specific article to be "
+"detected by the ``DEFAULT_LANG`` setting, use the ``translation`` "
+"metadata to specify which posts are translations::"
+msgstr ""
+"如果您不希望某篇文章的原始版本以 ``DEFAULT_LANG`` 翻译版本出现，可以使用 ``translation`` "
+"元数据来指出本推文是一个非默认语言的翻译版本。（译者注：例如，设置的默认语言为zh_CN，如果某篇推文的原始版本是英文而不是中文，那么对于中文翻译版本的就可以指定其translations元数据为true，即对于该推文来说，中文版本是翻译后的版本）"
+
+#: ../../content.rst:515 01ecf34fd1e440ea908fd181001b38b6
+msgid "Syntax highlighting"
+msgstr "语法高亮"
+
+#: ../../content.rst:517 4d7eebd1886347b383ea3b1c517b821d
+msgid ""
+"Pelican can provide colorized syntax highlighting for your code blocks. "
+"To do so, you must use the following conventions inside your content "
+"files."
+msgstr "您可以按照下面的约定在文件内容中添加代码块，Pelican可以完成五彩缤纷的语法高亮。"
+
+#: ../../content.rst:520 5896f772fcd04f309e2188040f0bea60
+msgid ""
+"For reStructuredText, use the ``code-block`` directive to specify the "
+"type of code to be highlighted (in these examples, we'll use "
+"``python``)::"
+msgstr "对于reStructuredText，使用 ``code-block`` 指令指定代码所使用的语言（此处以``python``为例）："
+
+#: ../../content.rst:527 ec6ec4c325c6406ba3b00437116b84b8
+msgid ""
+"For Markdown, which utilizes the `CodeHilite extension`_ to provide "
+"syntax highlighting, include the language identifier just above the code "
+"block, indenting both the identifier and the code::"
+msgstr "Markdown则使用 `CodeHilite extension`_ 扩展插件来完成语法高亮。在代码上方标记所用语言，同时将其与代码都进行缩进："
+
+#: ../../content.rst:541 58220db84e4d4ab7950dad7ad36ea1b5
+msgid ""
+"The specified identifier (e.g. ``python``, ``ruby``) should be one that "
+"appears on the `list of available lexers "
+"<https://pygments.org/docs/lexers/>`_."
+msgstr ""
+"指定语言的标识符（例如 ``python``、``ruby``）必须是在 `可用列表 "
+"<https://pygments.org/docs/lexers/>`_ 中列出的。"
+
+#: ../../content.rst:544 cb10d4bc6f4c44008ce8324df993c2ed
+msgid ""
+"When using reStructuredText the following options are available in the "
+"`code-block` directive:"
+msgstr "对于reStructuredText，下面列出的选项可以在 `code-block` 命令中使用："
+
+#: ../../content.rst:548 3598816f6ab54705aa545de3eb95a22c
+msgid "Option"
+msgstr "选项"
+
+#: ../../content.rst:548 2861fb4a308a443c971110b5757e9d13
+msgid "Valid values"
+msgstr "有效值"
+
+#: ../../content.rst:550 638a4299a7d346659254d7aa6e2485e7
+msgid "anchorlinenos"
+msgstr "anchorlinenos"
+
+#: ../../content.rst:550 ../../content.rst:574 ../../content.rst:576
+#: 0e32384143484934af18e224e414a45b 217edf5016f74e23a906623d077191ff
+#: c6b0e9c5aa4340329b2fe203222055df
+msgid "N/A"
+msgstr "N/A"
+
+#: ../../content.rst:550 e219ff4135fb45e8b27fdd71a874ffee
+msgid "If present, wrap line numbers in ``<a>`` tags."
+msgstr "指定行号是否显示在 <a> 标签中"
+
+#: ../../content.rst:551 8e95919e90e14208a8150c2c52cb20b9
+msgid "classprefix"
+msgstr "classprefix"
+
+#: ../../content.rst:551 ../../content.rst:559 ../../content.rst:561
+#: ../../content.rst:570 ../../content.rst:572 ../../content.rst:577
+#: ../../content.rst:578 96789c1cd92545b1a9153e9be1c5726d
+#: 9e591c65044b4ca4aa876e0dd5ba94bc a1920b40389d4b25a66cb0e755389960
+#: bee284b2086a40a4aa28bc87c916d9df cb11442c371b48349bba579e7dfce72b
+#: e330b50a8cea43a5b55771f04fc4e688 f28e8d5bd9544ccbbcb99037c02f08cf
+msgid "string"
+msgstr "string"
+
+#: ../../content.rst:551 f6d85a8a8ec74c46a313bcfb72f5283a
+msgid "String to prepend to token class names"
+msgstr "要添加到用于语法高亮的css类名前面的字符串"
+
+#: ../../content.rst:552 4fd6cd04ea444c389c6f77030eb0a123
+msgid "hl_lines"
+msgstr "hl_lines"
+
+#: ../../content.rst:552 aa5112c2c73e40d9940b5a21eaa1d650
+msgid "numbers"
+msgstr "numbers"
+
+#: ../../content.rst:552 1b03b3add35c44eeaef4d3c31dd51fb4
+msgid ""
+"List of lines to be highlighted, where line numbers to highlight are "
+"separated by a space. This is similar to ``emphasize-lines`` in Sphinx, "
+"but it does not support a range of line numbers separated by a hyphen, or"
+" comma-separated line numbers."
+msgstr "需要高亮的行号列表，行号之间以空格隔开。这与Sphinx中的 ``emphasize-lines`` 类似，但是不支持使用连字符和逗号指定行号范围。"
+
+#: ../../content.rst:559 abe7266edc704a0b857856e92fd2022b
+msgid "lineanchors"
+msgstr "lineanchors"
+
+#: ../../content.rst:559 baa7634eb7e646e39698c24bc3ee82af
+msgid "Wrap each line in an anchor using this string and -linenumber."
+msgstr "用此处指定的字符串和 “-行号”给每一行都加上锚点。"
+
+#: ../../content.rst:561 21ccf81937cf4fe38f556f2852524269
+msgid "linenos"
+msgstr "linenos"
+
+#: ../../content.rst:561 2b1b4a9f23e448d4baaf5d36b896a5ba
+msgid ""
+"If present or set to \"table\", output line numbers in a table; if set to"
+" \"inline\", output them inline. \"none\" means do not output the line "
+"numbers for this table."
+msgstr "开启此选项或将此选项设为“table”时，输出表格时会带上行号；如果设为“inline”，则内联输出行号；如果设为“none”，则不输出行号。"
+
+#: ../../content.rst:566 d9813ccee6d24eae8c539fd9cc0ddd54
+msgid "linenospecial"
+msgstr "linenospecial"
+
+#: ../../content.rst:566 ../../content.rst:568 ../../content.rst:569
+#: 1eeb1f08e07e4f95a03cbeca48b422a6 bac61cf96bc3466985c9f4d5b934055b
+#: eadc4e3c92094e589c3b931d20cd97ab
+msgid "number"
+msgstr "number"
+
+#: ../../content.rst:566 ff3b3aa5e45e4a3a837400e8333f7c5a
+msgid "If set, every nth line will be given the 'special' CSS class."
+msgstr "是否每隔几行就设置一行特殊的css样式类。"
+
+#: ../../content.rst:568 e32730e901bb460e975410fe26a9432f
+msgid "linenostart"
+msgstr "linenostart"
+
+#: ../../content.rst:568 48d2621a74174b82a71d52a921e2f60f
+msgid "Line number for the first line."
+msgstr "起始行的行号。"
+
+#: ../../content.rst:569 fcb4c1088bb04cd9ba6e4273e3013369
+msgid "linenostep"
+msgstr "linenostep"
+
+#: ../../content.rst:569 1ce5e05481f84c7f84964bb1d2e3e9ae
+msgid "Print every nth line number."
+msgstr "每隔几行输出一次"
+
+#: ../../content.rst:570 110dc8da76774b3ca517ad93c53fbd3f
+msgid "lineseparator"
+msgstr "lineseparator"
+
+#: ../../content.rst:570 b9ba8609393c4ec8b964481ae2c66614
+msgid "String to print between lines of code, '\\n' by default."
+msgstr "每行输出代码之间的输出字符串，默认为 '\\n'。"
+
+#: ../../content.rst:572 8b336c4c8e65427ebb1a89e94232199a
+msgid "linespans"
+msgstr "linespans"
+
+#: ../../content.rst:572 07c2d6ca97084859b47b09237633a4ab
+msgid "Wrap each line in a span using this and -linenumber."
+msgstr "使用指定的字符串和“-行号”将每一行包装在一个span中。"
+
+#: ../../content.rst:574 bd0c5e4ba73d458aa14fce20c1347910
+msgid "nobackground"
+msgstr "nobackground"
+
+#: ../../content.rst:574 07672d498e2f4b6e8d4da4b5382a34f0
+msgid "If set, do not output background color for the wrapping element"
+msgstr "若设置，则不为元素输出背景颜色"
+
+#: ../../content.rst:576 a054798a57814cfd9b363d7048dd9e1e
+msgid "nowrap"
+msgstr "nowrap"
+
+#: ../../content.rst:576 de085518cf324de4b6d917c616e2b7dd
+msgid "If set, do not wrap the tokens at all."
+msgstr "若设置，则不对token进行换行处理。"
+
+#: ../../content.rst:577 5989452c45bd4cc187e1cd1cfb88b440
+msgid "tagsfile"
+msgstr "tagsfile"
+
+#: ../../content.rst:577 74b9388dcbe048ff824108bafc0bf72b
+msgid "ctags file to use for name definitions."
+msgstr "用于命名定义的ctags文件"
+
+#: ../../content.rst:578 0b355baf272c4e87a18b1594b311258f
+msgid "tagurlformat"
+msgstr "tagurlformat"
+
+#: ../../content.rst:578 dde5f2fd922b4b45b5eca083527dd93a
+msgid "format for the ctag links."
+msgstr "用于ctag链接的格式"
+
+#: ../../content.rst:581 e034ff3a3ee44ef185f8c3aed60fc692
+msgid ""
+"Note that, depending on the version, your Pygments module might not have "
+"all of these options available. Refer to the *HtmlFormatter* section of "
+"the `Pygments documentation <https://pygments.org/docs/formatters/>`_ for"
+" more details on each of the options."
+msgstr ""
+"请注意，由于版本的不同，Pygments模块可能不完全支持上述选项。请参考 `Pygments文档 "
+"<https://pygments.org/docs/formatters/>`_ 中 *HtmlFormatter* "
+"一节获取每个选项的详细信息。"
+
+#: ../../content.rst:586 e7df88ffb2d4475ca19259b222d1ab3e
+msgid ""
+"For example, the following code block enables line numbers, starting at "
+"153, and prefixes the Pygments CSS classes with *pgcss* to make the names"
+" more unique and avoid possible CSS conflicts::"
+msgstr ""
+"举个例子，下面的代码块开启了行号显示，从153行开始输出，并且指定Pygments的CSS类以 *pgcss* "
+"为前缀，使得类名更为独特并避免可能的CSS冲突："
+
+#: ../../content.rst:597 fc9b8b1fa7364ce1a274281a8e2e7237
+msgid ""
+"It is also possible to specify the ``PYGMENTS_RST_OPTIONS`` variable in "
+"your Pelican settings file to include options that will be automatically "
+"applied to every code block."
+msgstr ""
+"您也可以在Pelican的配置文件中指定 ``PYGMENTS_RST_OPTIONS`` "
+"，如此就可以让Pelican自动在每个代码块上使用指定的选项。"
+
+#: ../../content.rst:601 b51dfbadd3bc42a483611d7013a87241
+msgid ""
+"For example, if you want to have line numbers displayed for every code "
+"block and a CSS prefix, you would set this variable to::"
+msgstr ""
+"举个例子，若您希望每个代码块都显示行号，并且在CSS类名前都加上前缀pgcss，就可以像这样设置 ``PYGMENTS_RST_OPTIONS``"
+" ："
+
+#: ../../content.rst:606 82a9f33cc7c9493e8d8772f6c6fb63da
+msgid ""
+"If specified, settings for individual code blocks will override the "
+"defaults in your settings file."
+msgstr ""
+"若指定了 ``PYGMENTS_RST_OPTIONS`` ，同时也为代码块单独指定了一些选项，单独指定的会将 "
+"``PYGMENTS_RST_OPTIONS`` 覆盖。"
+
+#: ../../content.rst:610 d2baf0b12ba148f0af9ccab86542e35f
+msgid "Publishing drafts"
+msgstr "发布草稿"
+
+#: ../../content.rst:612 2ba53426b76742e6980e6700c94d3d96
+msgid ""
+"If you want to publish an article or a page as a draft (for friends to "
+"review before publishing, for example), you can add a ``Status: draft`` "
+"attribute to its metadata. That article will then be output to the "
+"``drafts`` folder and not listed on the index page nor on any category or"
+" tag page."
+msgstr ""
+"如果您想要以草稿的形式发布文章或页面（例如在正式发布前给朋友预览），可以添加元数据属性 ``Status: draft`` 。如此，文章就会输出到"
+" ``drafts`` 文件夹中，并且不会被列在首页、分类或是标签页面中。"
+
+#: ../../content.rst:617 e3a756e1580d48378a16946caeb79c8a
+msgid ""
+"If your articles should be automatically published as a draft (to not "
+"accidentally publish an article before it is finished), include the "
+"status in the ``DEFAULT_METADATA``::"
+msgstr ""
+"若您希望文章默认以草稿形式发布（可以防止在完成文章前不小心将其正式发布），可以将此status属性加在 ``DEFAULT_METADATA`` "
+"中："
+
+#: ../../content.rst:625 c4b74b80b8714eb2a69d81f42f6e3e27
+msgid ""
+"To publish a post when the default status is ``draft``, update the post's"
+" metadata to include ``Status: published``."
+msgstr "要发布当前处于 ``draft`` 状态的推文，更新推文的元数据，使其中包括 ``Status: published``。"
+
+#: ../../content.rst:629 f8baadb48b12467aaa1025f018ab6621
+msgid "Hidden Posts"
+msgstr "隐藏推文"
+
+#: ../../content.rst:631 eb5efca86b2d4432a49703306334591a
+msgid ""
+"Like pages, posts can also be marked as ``hidden`` with the ``Status: "
+"hidden`` attribute. Hidden posts will be output to ``ARTICLE_SAVE_AS`` as"
+" expected, but are not included by default in tag, category, and author "
+"indexes, nor in the main article feed. This has the effect of creating an"
+" \"unlisted\" post."
+msgstr ""
+"和页面一样，推文也能通过 ``Status: hidden`` 标记为隐藏状态。隐藏的推文会输出到 ``ARTICLE_SAVE_AS`` "
+"指定的目录中，这些推文“不会被列出”，即不会在标签、分类、作者主页、feed中出现。"
+
+#: ../../content.rst:637 2d67772b24bb40748d56dc3938195ce6
+msgid "Skip Posts"
+msgstr "忽略推文"
+
+#: ../../content.rst:639 0c97c429a7a74ba4830851491829d63e
+msgid ""
+"Posts marked with ``skip`` status are ignored entirely. They are not "
+"processed nor output to the ``ARTICLE_SAVE_AS`` path. Such posts will "
+"similarly not be included in indexes or feeds."
+msgstr ""
+"状态设为了 ``skip`` 的推文将会被完全忽略。也就是说，他们不会被处理，也不会输出到 ``ARTICLE_SAVE_AS`` "
+"指定的目录中。同样，被忽略的推文不会出现在索引或者订阅源中。"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/contribute.po b/docs/locale/zh_CN/LC_MESSAGES/contribute.po
new file mode 100644
index 00000000..3149fff3
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/contribute.po
@@ -0,0 +1,731 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-25 20:36+0800\n"
+"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../contribute.rst:2 e8f9694c47aa44e7944dae800ee528f3
+msgid "Contributing and feedback guidelines"
+msgstr "项目贡献与意见反馈"
+
+#: ../../contribute.rst:4 784f37182e78474b960306a5a794ae16
+msgid ""
+"There are many ways to contribute to Pelican. You can improve the "
+"documentation, add missing features, and fix bugs (or just report them). "
+"You can also help out by reviewing and commenting on `existing issues "
+"<https://github.com/getpelican/pelican/issues>`_."
+msgstr ""
+"有很多渠道可以参与到贡献项目中来，例如帮助改进文档、添加缺失的特性、修复与报告bug。"
+"可以从查看 `已有 issues <https://github.com/getpelican/pelican/issues>`_ 开始。"
+
+#: ../../contribute.rst:9 e17c3ff0fa71469cbe22cb4ad2640ad8
+msgid ""
+"Don't hesitate to fork Pelican and submit an issue or pull request on "
+"GitHub. When doing so, please consider the following guidelines."
+msgstr ""
+"随时随地都可以fork Pelican或是在GitHub上提交issue或PR。"
+
+#: ../../../CONTRIBUTING.rst:2 f8bc69070fab4dd7be34e1cc6a42cc02
+msgid "Filing issues"
+msgstr "提出issue"
+
+#: ../../../CONTRIBUTING.rst:4 fe98a059b9c24fcc92358f2c4505174d
+msgid "Before you submit a new issue, try `asking for help`_ first."
+msgstr "在你提交一个新的issue之前，可以先尝试 `请求他人帮助`_ 。"
+
+#: ../../../CONTRIBUTING.rst:5 e9fff7c354614ae28db994c0fcc121c0
+msgid ""
+"If determined to create a new issue, first search `Pelican Discussions`_ "
+"and `existing issues`_ (open and closed) to see if your question has "
+"already been answered previously."
+msgstr ""
+"当你决定要提出新的issue时，先在 `Pelican的讨论版`_ 和 `已有issues`_ 中搜索一下，"
+"（开放关闭的issue都搜一下），来看看你的问题是不是有人之前已经提出过。"
+
+#: ../../../CONTRIBUTING.rst:14 84cb74beed564f31810674cacf5c1f97
+msgid "How to get help"
+msgstr "如何获取帮助"
+
+#: ../../../CONTRIBUTING.rst:16 0557a84947c14606be4fd0565247d85d
+msgid "Before you ask for help, please make sure you do the following:"
+msgstr "在寻求帮助之前，请先尝试如下步骤："
+
+#: ../../../CONTRIBUTING.rst:18 6d59a3356e734dd196ec8a0739556b4c
+msgid ""
+"Read the documentation_ thoroughly. If in a hurry, at least use the "
+"search field that is provided at top-left on the documentation_ pages. "
+"Make sure you read the docs for the Pelican version you are using."
+msgstr ""
+"完整阅读 documentation_ 。如果你很急，至少先在 documentation_ 左上角的搜索栏"
+"中尝试搜索。确保你阅读的文档和使用的Pelican版本相匹配。"
+
+#: ../../../CONTRIBUTING.rst:21 4b33299936404cf98a66b672fad0e38f
+msgid ""
+"Use a search engine (e.g., DuckDuckGo, Google) to search for a solution "
+"to your problem. Someone may have already found a solution, perhaps in "
+"the form of a ':pelican-doc:`plugins` or a specific combination of "
+"settings."
+msgstr ""
+"使用搜索引擎（例如 DuckDuckGo、Google）搜索遇到问题的解决方案。互联网上可能"
+"已经有人遇到过相同的问题，解决方法可能包括使用某些 :pelican-doc:`plugins` 或配置"
+"一系列的设置选项。"
+
+#: ../../../CONTRIBUTING.rst:25 b48195d9ef674566b89aabc38139c301
+msgid "Try reproducing the issue in a clean environment, ensuring you are using:"
+msgstr "尝试在一个尽可能简单的环境中重现问题，并确保以下几点："
+
+#: ../../../CONTRIBUTING.rst:27 685d2888d2c94ea9a752ec433f8b9f1f
+msgid ""
+"latest Pelican release (or an up-to-date Git clone of Pelican ``main`` "
+"branch)"
+msgstr "使用最新版本的Pelican（或是用Git克隆Pelican的main分支）"
+
+#: ../../../CONTRIBUTING.rst:28 910a372d95d8448492eafc66eccd1ccf
+msgid "latest releases of libraries used by Pelican"
+msgstr "将Pelican使用的库升级到最新版本"
+
+#: ../../../CONTRIBUTING.rst:29 c44f4dc6b05d4be29eccc889f042702c
+msgid "no plugins or only those related to the issue"
+msgstr "此环境中没有使用插件或是只使用和问题相关的插件"
+
+#: ../../../CONTRIBUTING.rst:31 3abdf6131cf4412a8205b634a6651b01
+msgid ""
+"**NOTE:** The most common sources of problems are anomalies in (1) "
+"themes, (2) plugins, (3) settings files, and (4) ``make``/``invoke`` "
+"automation wrappers. If you can't reproduce your problem when using the "
+"following steps to generate your site, then the problem is almost "
+"certainly with one of the above-listed elements (and not Pelican "
+"itself)::"
+msgstr ""
+"**注意：** 最常见的问题基本上都产生于主题、插件、设置文件和自动化工具 "
+"``make``/``invoke`` 中。如果按照下述步骤生成站点后无法复现之前的问题，那么"
+"几乎可以肯定问题出在这四个地方，而不在Pelican本身："
+
+#: ../../../CONTRIBUTING.rst:41 f2331ea165ac4a3c8e70bf98c995f0e8
+msgid ""
+"If you can generate your site without problems using the steps above, "
+"then your problem is unlikely to be caused by Pelican itself, and "
+"therefore please consider reaching out to the maintainers of the "
+"plugins/theme you are using instead of raising the topic with the Pelican"
+" core community."
+msgstr ""
+"如果按照上述步骤能够正常生成站点，那么你的问题不太可能是由Pelican本身导致的，"
+"请考虑联系对应插件/主题的维护者，而不是在Pelican内核的社区中提出问题。"
+
+#: ../../../CONTRIBUTING.rst:46 d83b0036d4894f3ebc73e657a203d11a
+msgid ""
+"If despite the above efforts you still cannot resolve your problem, be "
+"sure to include in your inquiry the following information, preferably in "
+"the form of links to content uploaded to a `paste service`_, GitHub "
+"repository, or other publicly-accessible location:"
+msgstr ""
+"经过上面这些努力，若您仍无法解决问题，确保你的提问中包括如下信息，可以以 "
+"`paste service`_ 链接、GitHub仓库，或者其他可公开获取的形式提供："
+
+#: ../../../CONTRIBUTING.rst:51 4281f931e9064336b267bd67a35134e9
+msgid ""
+"Describe what version of Pelican you are running (output of ``pelican "
+"--version`` or the HEAD commit hash if you cloned the repo) and how "
+"exactly you installed it (the full command you used, e.g. ``python -m pip"
+" install pelican``)."
+msgstr ""
+"描述正在运行的Pelican版本信息（可以通过 ``pelican --version`` 命令得到，如果"
+"clone的源仓库则可以查看HEAD commit的哈希值），以及你是如何安装Pelican的"
+"（要包括使用到的命令，例如 ``python -m pip install pelican``）"
+
+#: ../../../CONTRIBUTING.rst:54 b1303c98bca840efb895aceb16789eb9
+msgid ""
+"If you are looking for a way to get some end result, prepare a detailed "
+"description of what the end result should look like (preferably in the "
+"form of an image or a mock-up page) and explain in detail what you have "
+"done so far to achieve it."
+msgstr ""
+"如果你希望产生某种特定的最终结果，请详细描述此最终结果是什么样的（最好以图片或者"
+"伪页面的形式），，并且细致讲述你做了哪些尝试。"
+
+#: ../../../CONTRIBUTING.rst:58 8fe972c4685140d5bd1c37f4635f6f09
+msgid ""
+"If you are trying to solve some issue, prepare a detailed description of "
+"how to reproduce the problem. If the issue cannot be easily reproduced, "
+"it cannot be debugged by developers or volunteers. Describe only the "
+"**minimum steps** necessary to reproduce it (no extra plugins, etc.)."
+msgstr ""
+"如果你在尝试解决某些问题，请详细描述如何复现此问题。如果问题很难被复现，其他开发者和志愿者就很难进行调试。"
+"尽量只写出复现该问题的 **最少步骤** （无额外插件）。"
+
+#: ../../../CONTRIBUTING.rst:62 1f3874f308e64281b910dc716180ebcf
+msgid ""
+"Upload your settings file or any other custom code that would enable "
+"people to reproduce the problem or to see what you have already tried to "
+"achieve the desired end result."
+msgstr ""
+"上传你的配置文件以及所有自定义过的代码，这可以使得大家能够重现问题或者看到你已经"
+"做出的尝试。"
+
+#: ../../../CONTRIBUTING.rst:65 1fdc6c63f1b141c7a35233607ec0d922
+msgid ""
+"Upload detailed and **complete** output logs and backtraces (remember to "
+"add the ``--debug`` flag: ``pelican --debug content [...]``)"
+msgstr ""
+"上传详细 **完整** 的输出日志以及backtraces信息（记得在执行pelican命令时加上 "
+"``--debug`` 标记： ``pelican --debug content [...]`` ）"
+
+#: ../../../CONTRIBUTING.rst:71 8741dba5da1a4990ae9c30531d05dc19
+msgid ""
+"Once the above preparation is ready, you can post your query as a new "
+"thread in `Pelican Discussions`_. Remember to include all the information"
+" you prepared."
+msgstr ""
+"一旦做好了上述准备，就可以在 `Pelican Discussions`_ 中发起你的问题了。记得在请求"
+"中附上收集好的信息。"
+
+#: ../../../CONTRIBUTING.rst:75 b34a3031f5d1427e92a9d1969d7b5274
+msgid "Contributing code"
+msgstr "贡献代码"
+
+#: ../../../CONTRIBUTING.rst:77 e29672c736554ebbbd6efd441af19df7
+msgid ""
+"Before you submit a contribution, please ask whether it is desired so "
+"that you don't spend a lot of time working on something that would be "
+"rejected for a known reason. Consider also whether your new feature might"
+" be better suited as a ':pelican-doc:`plugins` — you can `ask for help`_"
+"  to make that determination."
+msgstr ""
+"在提交代码修改前，请先询问是否需要此修改，以免你做的工作因为已知原因而被拒绝。"
+"想想要添加的新特性是否更适合以 :pelican-doc:`插件` 形式完成。可以通过 "
+"`如何获取帮助`_ 来帮助你作出决定。"
+
+#: ../../../CONTRIBUTING.rst:82 e263c09fb6e5471eb0c2c3e97994322d
+msgid ""
+"Also, if you intend to submit a pull request to address something for "
+"which there is no existing issue, there is no need to create a new issue "
+"and then immediately submit a pull request that closes it. You can submit"
+" the pull request by itself."
+msgstr ""
+"另外，如果你的PR是为了解决一个目前没有在issue中出现过的问题，那么就没有必要先创建"
+"一个新的issue，而是可以直接提起PR。"
+
+#: ../../../CONTRIBUTING.rst:87 9b08ef3e5fe4474e9306e4bfe9662fff
+msgid "Using Git and GitHub"
+msgstr "使用Git与GitHub"
+
+#: ../../../CONTRIBUTING.rst:89 7ad95f82b7d04c0ca97bb958d2425e27
+msgid ""
+"`Create a new branch`_ specific to your change (as opposed to making your"
+" commits in the ``main`` branch)."
+msgstr ""
+"`创建一个新的分支`_ 来标记你做的修改（而不是直接在主分支中提交）。"
+
+#: ../../../CONTRIBUTING.rst:91 8a31c5d7ae4045cdbf2aa67e79be3f9c
+msgid ""
+"**Don't put multiple unrelated fixes/features in the same branch / pull "
+"request.** For example, if you're working on a new feature and find a "
+"bugfix that doesn't *require* your new feature, **make a new distinct "
+"branch and pull request** for the bugfix. Similarly, any proposed changes"
+" to code style formatting should be in a completely separate pull "
+"request."
+msgstr ""
+"**不要把多个无关联的修复/特性修改放在同一个分支/拉去请求中。** 如果当你在做新特性的时候"
+"发现了一个bug可以修复，但修复这个bug *不需要用到* 这个新特性， **那么请另外创建"
+"一个分支并拉取请求。** 类似的，任何对代码风格的格式化都应该在单独的请求中拉取。"
+
+#: ../../../CONTRIBUTING.rst:96 ef2e10f7ec5e4fbbb0f977dd09b7be49
+msgid ""
+"Add a ``RELEASE.md`` file in the root of the project that contains the "
+"release type (major, minor, patch) and a summary of the changes that will"
+" be used as the release changelog entry. For example::"
+msgstr ""
+"在项目根目录下添加 ``RELEASE.md`` 文件，在其中包含release的类型（主要、次要、补丁），"
+"以及对项目改变的概述，这些内容会作为该release发布日志的一部分。下面是一个例子："
+
+#: ../../../CONTRIBUTING.rst:104 24a4d63624f44f63a0ce809901455c02
+msgid ""
+"Check for unnecessary whitespace via ``git diff --check`` before "
+"committing."
+msgstr ""
+"在提交前使用 ``git diff --check`` 来检查是否有无意义的空白字符。"
+
+#: ../../../CONTRIBUTING.rst:105 11c5b82604fe4638bf9ee6e9ef0a401b
+msgid ""
+"First line of your commit message should start with present-tense verb, "
+"be 50 characters or less, and include the relevant issue number(s) if "
+"applicable. *Example:* ``Ensure proper PLUGIN_PATH behavior. Refs #428.``"
+" If the commit *completely fixes* an existing bug report, please use "
+"``Fixes #585`` or ``Fix #585`` syntax (so the relevant issue is "
+"automatically closed upon PR merge)."
+msgstr ""
+"commit信息的第一行应该以现在时动词开头，并且第一行尽量保持在50字以下，并且包含相关联"
+"issue的编号（如果有的话）。 例如： ``Ensure proper PLUGIN_PATH behavior. "
+"Refs #428.`` 如果此项提交 *完全修复* 了某项已报告的bug，请使用例如 ``Fixes #585`` "
+"或 ``Fix #585`` 的语法（这样的话相关的issue会在PR合并后自动关闭）。"
+
+#: ../../../CONTRIBUTING.rst:110 0c1ff9d0738440e1bce853fc830278af
+msgid ""
+"After the first line of the commit message, add a blank line and then a "
+"more detailed explanation (when relevant)."
+msgstr ""
+"在第一行commit信息后添加一行空白行，再进行更多相关的细节描述。"
+
+#: ../../../CONTRIBUTING.rst:112 d817ad5d9e35488eb45d88828ee9f053
+msgid ""
+"`Squash your commits`_ to eliminate merge commits and ensure a clean and "
+"readable commit history."
+msgstr ""
+"`压缩commit`_ 来消除合并commits，确保你的commit历史记录是干净可读的。"
+
+#: ../../../CONTRIBUTING.rst:114 b7064f44923a499da3c3ce078470e269
+msgid ""
+"After you have issued a pull request, the continuous integration (CI) "
+"system will run the test suite on all supported Python versions and check"
+" for code style compliance. If any of these checks fail, you should fix "
+"them. (If tests fail on the CI system but seem to pass locally, ensure "
+"that local test runs aren't skipping any tests.)"
+msgstr ""
+"在你发出PR后，持续集成（CI）系统会在所有支持的Python版本上运行测试套件，并且"
+"检查代码风格的合规性。如果出现了错误，你应该将其修复。（如果没有通过CI系统上的"
+"测试但是本地测试通过了，请再检查一下，确保在本地进行了所有CI系统中的检查）"
+
+#: ../../../CONTRIBUTING.rst:121 342f2e6c14b9441caaf3f9b6d2eb764b
+msgid "Contribution quality standards"
+msgstr "贡献的质量标准"
+
+#: ../../../CONTRIBUTING.rst:123 842514f115634a5d821d48490d4aed7b
+msgid ""
+"Adhere to the project's code style standards. See: `Development "
+"Environment`_"
+msgstr ""
+"遵循项目的代码风格标准。详见 `开发环境`_"
+
+#: ../../../CONTRIBUTING.rst:124 4719590d89be4a5e94817902cc424be5
+msgid ""
+"Ensure your code is compatible with the `officially-supported Python "
+"releases`_."
+msgstr ""
+"确保你的代码可以兼容 `python的官方发布版本`_"
+
+#: ../../../CONTRIBUTING.rst:125 fa0ad5dd93e149fa8a12dd339bef9056
+msgid ""
+"Add docs and tests for your changes. Undocumented and untested features "
+"will not be accepted."
+msgstr ""
+"请为你修改的内容添加文档与测试。未注有文档或没有对应测试的特性会被拒绝。"
+
+#: ../../../CONTRIBUTING.rst:127 dc4db53c2ce34e5490a0c57ea800a4da
+msgid ""
+":pelican-doc:`Run all the tests <contribute>` **on all versions of Python"
+" supported by Pelican** to ensure nothing was accidentally broken."
+msgstr ""
+"**在Pelican支持的所有Python版本上** :pelican-doc:`执行所有测试 <contribute>` ，"
+"以确保没有意料之外的问题。"
+
+#: ../../../CONTRIBUTING.rst:130 3a88c2e8326a4acd896d0ac75d4c9ccb
+msgid ""
+"Check out our `Git Tips`_ page or `ask for help`_ if you need assistance "
+"or have any questions about these guidelines."
+msgstr ""
+"若需要帮助或对以上指南有任何疑惑，还可以查看我们的 `Git提示`_ 页面和 `请求帮助`_ 部分。"
+
+#: ../../contribute.rst:15 daead9e8fb804eb6acd152b85d837182
+msgid "Setting up the development environment"
+msgstr "配置开发环境"
+
+#: ../../contribute.rst:17 1ab6df98bcb141f49e278d153cc96e22
+msgid ""
+"While there are many ways to set up one's development environment, the "
+"following instructions will utilize Pip_ and PDM_. These tools facilitate"
+" managing virtual environments for separate Python projects that are "
+"isolated from one another, so you can use different packages (and package"
+" versions) for each."
+msgstr ""
+"在配置开发环境时往往有很多种方式，但下面的指南会使用 Pip_ 和 PDM_ 完成配置。这两个工具"
+"都可以用于管理虚拟环境，使得不同的Python项目相互隔离，这样就可以很方便的在不同的项目中"
+"使用不同的库（以及不同的库版本）。"
+
+#: ../../contribute.rst:22 6a9c8f6ddb1d495f8a9bd1b8a131cabd
+msgid "Please note that Python |min_python| is required for Pelican development."
+msgstr "请注意，要进行Pelican的开发，至少需要Python |min_python|"
+
+#: ../../contribute.rst:24 3d994e2a522141d7ada0a8fe13eb4c64
+msgid ""
+"*(Optional)* If you prefer to `install PDM "
+"<https://pdm.fming.dev/latest/#installation>`_ once for use with multiple"
+" projects, you can install it via::"
+msgstr ""
+"*（可选）* 若您想要 `安装PDM <https://pdm.fming.dev/latest/#installation>`_ ，"
+"可以使用下面这条命令："
+
+#: ../../contribute.rst:29 dbaa532c292048cb87926dd8b6e3141a
+msgid ""
+"Point your web browser to the `Pelican repository`_ and tap the **Fork** "
+"button at top-right. Then clone the source for your fork and add the "
+"upstream project as a Git remote::"
+msgstr ""
+"在Web浏览器中进入 `Pelican的代码仓库`_ ，点击右上角的 **Fork** 按钮。然后克隆"
+"你自己的这份fork，最后添加项目的原仓库为远程仓库upstream："
+
+#: ../../contribute.rst:38 adbe5d876f114645a3e1b489b2a34bd9
+msgid ""
+"While PDM can dynamically create and manage virtual environments, we're "
+"going to manually create and activate a virtual environment::"
+msgstr ""
+"通过下面的命令可以手动创建并激活一个虚拟环境："
+
+#: ../../contribute.rst:45 ../../contribute.rst:181
+#: 6ede38ac05174bc19df4198e735342e0 f6d42cdd70384eaebbe115aefd0d01ec
+msgid "Install the needed dependencies and set up the project::"
+msgstr "安装必需的依赖并配置项目："
+
+#: ../../contribute.rst:50 d863bf4dc76e4b18b933f2635a6a3af3
+msgid "Your local environment should now be ready to go!"
+msgstr "现在，你的本地开发环境就配置完成了！"
+
+#: ../../contribute.rst:57 dc19edf71c914f48a953b379efa076c0
+msgid "Development"
+msgstr "开发"
+
+#: ../../contribute.rst:59 6082eb5afbf14f86a031ed4f53d2943c
+msgid ""
+"Once Pelican has been set up for local development, create a topic branch"
+" for your bug fix or feature::"
+msgstr ""
+"在配置好Pelican的本地开发环境后，请先为你的bug修复或特性增加创建一个分支："
+
+#: ../../contribute.rst:64 1cafbaea6ec04597b62e871c0f0793b2
+msgid ""
+"Now you can make changes to Pelican, its documentation, and/or other "
+"aspects of the project."
+msgstr ""
+"在切换到新建的分支后，就可以开始对Pelican的文档或其他内容做更改了。"
+
+#: ../../contribute.rst:68 e0f5da1e216f499d86427e21c23557d4
+msgid "Setting up ``git blame`` (optional)"
+msgstr "配置 ``git blame`` （可选）"
+
+#: ../../contribute.rst:70 2906e116c2dc4a2c8db78fa64820af56
+msgid ""
+"``git blame`` annotates lines in a file with information about the pull "
+"request that last modified it. Sweeping shallow changes (like formatting)"
+" can make that information less useful, so we keep a list of such changes"
+" to be ignored. Run the following command to set this up in your "
+"repository, adding ``--global`` if you want this setting to apply to all "
+"repositories::"
+msgstr ""
+"``git blame`` 会在文件中的行上标注有关最后一次修改该行的PR信息。对浅层变化（如格式化）"
+"进行批量更改可能会使这些信息变得不那么有用，因此我们维护一个包含此类更改的列表，"
+"以便忽略它们。运行以下命令在您的存储库中设置此配置，如果希望此设置适用于所有存储库，"
+"请添加 ``--global`` ："
+
+#: ../../contribute.rst:78 36f257406a294713835841cf549e0f67
+msgid ""
+"As noted in a `useful article`_ about ``git blame``, there are other "
+"related settings you may find to be beneficial::"
+msgstr ""
+"就像在 `这篇文章`_ 中提到的，还可以进行一些可能有用的额外设置："
+
+#: ../../contribute.rst:89 37a3a813eeb84f408546bf6a83fdafd6
+msgid "Running the test suite"
+msgstr "运行测试套件"
+
+#: ../../contribute.rst:91 44276ab045104e5c9ab3d2425172d7ac
+msgid ""
+"Each time you make changes to Pelican, there are two things to do "
+"regarding tests: check that the existing tests pass, and add tests for "
+"any new features or bug fixes. The tests are located in "
+"``pelican/tests``, and you can run them via::"
+msgstr ""
+"每次对Pelican做出修改后，在测试方面需要做两个工作：检查是否能通过已有的测试、"
+"为新增特性或bug修复创建测试。请将自动化测试文件放在 ``pelican/tests`` 中，"
+"接着执行以下命令："
+
+#: ../../contribute.rst:98 9557eb87ac4945ccbaf8775aa7768f6e
+msgid ""
+"(For more on Invoke, see ``invoke -l`` to list tasks, or "
+"https://pyinvoke.org for documentation.)"
+msgstr ""
+"（执行 ``invoke -l`` 会列出可以调用的测试任务，关于此的更多文档请参阅 "
+"https://pyinvoke.org ）"
+
+#: ../../contribute.rst:101 d1cebbdf4fcf4be5b918613c5050d638
+msgid ""
+"In addition to running the test suite, it is important to also ensure "
+"that any lines you changed conform to code style guidelines. You can "
+"check that via::"
+msgstr ""
+"除了运行测试套件外，还要确保修改了的部分遵循代码风格指南。可以通过下面的命令"
+"检查代码风格："
+
+#: ../../contribute.rst:106 7a0b9ebf408f472aa786f6c3ac639240
+msgid ""
+"If code style violations are found in lines you changed, correct those "
+"lines and re-run the above lint command until they have all been fixed. "
+"You do not need to address style violations, if any, for code lines you "
+"did not touch."
+msgstr ""
+"如果在修改过的代码中有地方违反了代码风格规范，请纠正并再次运行上述命令，直到全部纠正。"
+"但是若是发现违反代码风格的地方并不是你修改的，请忽略之，不要进行纠正。"
+
+#: ../../contribute.rst:110 74ec20f2daf74ad18cc083ad48b89dfe
+msgid ""
+"After making your changes and running the tests, you may see a test "
+"failure mentioning that \"some generated files differ from the expected "
+"functional tests output.\" If you have made changes that affect the HTML "
+"output generated by Pelican, and the changes to that output are expected "
+"and deemed correct given the nature of your changes, then you should "
+"update the output used by the functional tests. To do so, **make sure you"
+" have both** ``en_EN.utf8`` **and** ``fr_FR.utf8`` **locales installed**,"
+" and then run the following command::"
+msgstr ""
+"在修改完代码，运行测试的过程中，你可能会看到测试失败中有提到“some generated files "
+"differ from the expected functional tests output” 。这可能是由于你对代码的修改"
+"影响到了Pelican的HTML输出，若输出的结果确实是你想要的，请更新功能测试所用的输出用例。"
+"请确保你安装了 ``en_EN.utf8`` 和 ``fr_FR.utf8`` ，然后执行下述命令："
+
+#: ../../contribute.rst:120 4299259dadd748238f9465eefb84727c
+msgid ""
+"You may also find that some tests are skipped because some dependency "
+"(e.g., Pandoc) is not installed. This does not automatically mean that "
+"these tests have passed; you should at least verify that any skipped "
+"tests are not affected by your changes."
+msgstr ""
+"你还可能会发现有一些测试由于缺少依赖（例如 Pandoc）而被跳过。这并不意味着通过"
+"了这些测试，请至少确保对代码的修改不会影响到这些被跳过的测试。"
+
+#: ../../contribute.rst:125 a8835ccddf624fc1994c618ded8cc5ba
+msgid ""
+"You should run the test suite under each of the supported versions of "
+"Python. This is best done by creating a separate Python environment for "
+"each version. Tox_ is a useful tool to automate running tests inside "
+"``virtualenv`` environments."
+msgstr ""
+"你应该在Pelican支持的所有Python版本下运行测试套件。一般会通过为每一个Python版本"
+"创建一个虚拟环境来实现这一点。Tox_ 是一个用于在 ``virtualenv`` 环境中自动运行"
+"测试的工具。"
+
+#: ../../contribute.rst:133 b8b8c16b0d0743b98de5d759f79d07ba
+msgid "Running a code coverage report"
+msgstr "运行代码测试覆盖报告"
+
+#: ../../contribute.rst:135 674a92a42d924931801c9f9c02463cd5
+msgid ""
+"Code is more likely to stay robust if it is tested. Coverage_ is a "
+"library that measures how much of the code is tested. To run it::"
+msgstr ""
+"经过测试的代码往往具有更好的健壮性。 Coverage_ 是一个用于衡量代码测试覆盖率的库"
+"执行下面的命令以调取之："
+
+#: ../../contribute.rst:140 ecb5e7f9e83c4243ba04b58764e573b6
+msgid ""
+"This will show overall coverage, coverage per file, and even line-by-line"
+" coverage. There is also an HTML report available::"
+msgstr ""
+"该命令会展示总体覆盖率以及在每个文件上的覆盖率，甚至还会展示每一行的覆盖情况。"
+"同样也会有一份HTML格式的报告供您查看："
+
+#: ../../contribute.rst:148 bad31d4cb0b644ac8ecb7885b22072a7
+msgid "Building the docs"
+msgstr "构建文档"
+
+#: ../../contribute.rst:150 47e1f1caa594462d9b3b4403645abf3b
+msgid ""
+"If you make changes to the documentation, you should build and inspect "
+"your changes before committing them::"
+msgstr ""
+"若你对文档进行过修改，请在commit前完成构建和检查："
+
+#: ../../contribute.rst:155 a4961ae22c2c4de9bbc8bb98d3a3ec81
+msgid ""
+"Open http://localhost:8000 in your browser to review the documentation. "
+"While the above task is running, any changes you make and save to the "
+"documentation should automatically appear in the browser, as it live-"
+"reloads when it detects changes to the documentation source files."
+msgstr ""
+"执行上述命令后，请在Web浏览器中打开 http://localhost:8000 来查看文档。"
+"在上述命令执行时，对文档做的任何修改应该会自动反映在浏览器中。"
+
+#: ../../contribute.rst:161 7740ec477ad747ebaa2dde2b2aef45d5
+msgid "Plugin development"
+msgstr "插件开发"
+
+#: ../../contribute.rst:163 9505da5fcac24d718f59c797061d2b0f
+msgid ""
+"To create a *new* Pelican plugin, please refer to the `plugin template`_ "
+"repository for detailed instructions."
+msgstr ""
+"要创建一个 *新的* Pelican插件，请参阅 `插件模板`_ 仓库以获得更为详细的指导。"
+
+#: ../../contribute.rst:166 5fdae4611a6949b9a4c3bc82c52d3bc6
+msgid ""
+"If you want to contribute to an *existing* Pelican plugin, follow the "
+"steps above to set up Pelican for local development, and then create a "
+"directory to store cloned plugin repositories::"
+msgstr ""
+"若你想在 *已有* Pelican插件中做贡献，请先按前文所述步骤配置Pelican的本地开发环境，"
+"然后创建一个文件夹来存放克隆下来的插件仓库："
+
+#: ../../contribute.rst:172 0f50b12aaf3b4049999130a92fa6b670
+msgid ""
+"Assuming you wanted to contribute to the Simple Footnotes plugin, you "
+"would first browse to the `Simple Footnotes`_ repository on GitHub and "
+"tap the **Fork** button at top-right. Then clone the source for your fork"
+" and add the upstream project as a Git remote::"
+msgstr ""
+"假设想要为Simple Footnotes插件做贡献，你应该先查看并fork `Simple Footnotes`_ "
+"的Github仓库，然后克隆你自己fork的那一份，再添加原仓库作为Git远程仓库upstream："
+
+#: ../../contribute.rst:185 2efe992372f149c3b63ca22016f8501b
+msgid "Create a topic branch for your plugin bug fix or feature::"
+msgstr "同样地，为你想要进行的bug修复或特性添加创建一个分支："
+
+#: ../../contribute.rst:189 40f3c07d12cc4630bc75355c3449196d
+msgid ""
+"After writing new tests for your plugin changes, run the plugin test "
+"suite and check for code style compliance via::"
+msgstr ""
+"完成修改并添加测试后，运行测试套件，并检查代码风格："
+
+#: ../../contribute.rst:195 ba97ce962daa437cbcf2d09897394aed
+msgid ""
+"If style violations are found, many of them can be addressed "
+"automatically via::"
+msgstr ""
+"若存在不合规范风格的代码，大多数情况下可以通过下述命令自动纠正："
+
+#: ../../contribute.rst:199 a0ee1e11aaea4f5c8ba4c4704678bbaf
+msgid ""
+"If style violations are found even after running the above auto-"
+"formatters, you will need to make additional manual changes until "
+"``invoke lint`` no longer reports any code style violations."
+msgstr ""
+"如果在自动格式化后仍存在代码风格上的问题，请手动修正这些问题，直到执行 "
+"``invoke lint`` 时不再报告问题。"
+
+#: ../../contribute.rst:207 e9d1e344bb0d4b2fb9d08c2d71d9a342
+msgid "Submitting your changes"
+msgstr "提交更改"
+
+#: ../../contribute.rst:209 716c9f94166d42299d9ee58eed4f9b53
+msgid ""
+"Assuming linting validation and tests pass, add a ``RELEASE.md`` file in "
+"the root of the project that contains the release type (major, minor, "
+"patch) and a summary of the changes that will be used as the release "
+"changelog entry. For example::"
+msgstr ""
+"通过了风格检查和所有测试后，请在项目的根目录下添加一个 ``RELEASE.md`` 文件，"
+"其中应包含发布的类型（major、minor、patch）以及代码变更的摘要，这份摘要会被用作"
+"更新日志的条目。下面是一个例子："
+
+#: ../../contribute.rst:218 656309283e5642b99981c84da9b04c86
+msgid "Commit your changes and push your topic branch::"
+msgstr "commit你的更改，并push对应分支："
+
+#: ../../contribute.rst:224 16617b687db94783b5488884e4c9be1b
+msgid ""
+"Finally, browse to your repository fork on GitHub and submit a pull "
+"request."
+msgstr ""
+"最后，前往Github，从你fork的仓库向原仓库提出PR。"
+
+#: ../../contribute.rst:228 629ae326bd4e4718a8865d3925c02c3e
+msgid "Logging tips"
+msgstr "日志技巧"
+
+#: ../../contribute.rst:230 486bb6ae6c484431923a96b7a7aff0c5
+msgid "Try to use logging with appropriate levels."
+msgstr "请仔细斟酌合适的日志等级。"
+
+#: ../../contribute.rst:232 fbe2aed8f0f5412081461fce5d36e51e
+msgid "For logging messages that are not repeated, use the usual Python way::"
+msgstr "对于不重复的日志消息，使用一般的方式即可："
+
+#: ../../contribute.rst:241 bab220240a0744f5b1170783098b5eac
+#, python-format
+msgid ""
+"Do not format log messages yourself. Use ``%s`` formatting in messages "
+"and pass arguments to logger. This is important, because the Pelican "
+"logger will preprocess some arguments, such as exceptions."
+msgstr ""
+"请不要自己格式化日志消息，而是使用在日志消息中使用 ``%s`` 并向logger传入参数。请务必"
+"遵循这一规则，因为Pelican的logger会自动预处理一些特殊的参数，例如exception。"
+
+#: ../../contribute.rst:246 a760419565b8440ebc8b4dc8898520db
+msgid "Limiting extraneous log messages"
+msgstr "限制低关联日志消息"
+
+#: ../../contribute.rst:248 dcf900d9f7d0424fabff4a9c5a7e5dc8
+msgid ""
+"If the log message can occur several times, you may want to limit the log"
+" to prevent flooding. In order to do that, use the ``extra`` keyword "
+"argument for the logging message in the following format::"
+msgstr ""
+"如果同一日志消息会重复多次，你会希望限制这些多余的内容。使用 ``extra`` "
+"命名参数来实现这一点："
+
+#: ../../contribute.rst:255 1ca7d769fc9348f8a5f9eef7b614522b
+msgid ""
+"Optionally, you can also set ``'limit_args'`` as a tuple of arguments in "
+"``extra`` dict if your generic message needs formatting."
+msgstr ""
+"可选的，如果通用日志消息需要格式化，可以添加 ``'limit_args'`` 参数并将其对应值"
+"设为一个元组。"
+
+#: ../../contribute.rst:258 85328a267c464f9aaacb1b0ef289d624
+msgid ""
+"Limit is set to ``5``, i.e, first four logs with the same ``'limit_msg'``"
+" are outputted normally but the fifth one will be logged using "
+"``'limit_msg'`` (and ``'limit_args'`` if present). After the fifth, "
+"corresponding log messages will be ignored."
+msgstr ""
+"限制数默认设为了 ``5`` ，即前四个有相同 ``'limit_msg'`` 参数的日志消息会正常输出，"
+"但第五条这样的日志消息会呈现为 ``'limit_msg'`` 参数值本身（ ``'limit_args'`` 同理）。"
+"第六条及之后的日志消息会被直接忽略。"
+
+#: ../../contribute.rst:263 7a51dbb9559d4a579654b2ab0938d09b
+msgid ""
+"For example, if you want to log missing resources, use the following "
+"code::"
+msgstr ""
+"例如，如果你想要用日志记录资源缺失的信息，可以使用下面的代码："
+
+#: ../../contribute.rst:271 8db05f7332f3475b940fb79d24e74ce7
+msgid "The log messages will be displayed as follows::"
+msgstr "最终的日志消息看起来会像这样："
+
+#: ../../contribute.rst:281 93d618c58e6e4688bebb999ddf591eaa
+msgid "Outputting traceback in the logs"
+msgstr "在日志中输出traceback信息"
+
+#: ../../contribute.rst:283 3d56bb4bc804499a8d3c8f14dc614916
+msgid ""
+"If you're logging inside an ``except`` block, you may want to provide the"
+" traceback information as well. You can do that by setting ``exc_info`` "
+"keyword argument to ``True`` during logging. However, doing so by default"
+" can be undesired because tracebacks are long and can be confusing to "
+"regular users. Try to limit them to ``--debug`` mode like the following::"
+msgstr ""
+"当在 ``except`` 块中进行日志记录时，你可能会希望同时输出traceback信息。可以"
+"简单地将 ``exc_info`` 参数设为 ``True`` 来实现这一功能。但是通过此方法输出的"
+"traceback信息会非常长，不便于理解。可以像下述代码一样将这些信息限制在 "
+"``--debug`` 模式中："
+
+#~ msgid "latest Pelican release (or an up-to-date Git clone of Pelican master)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "`Create a new branch`_ specific to "
+#~ "your change (as opposed to making "
+#~ "your commits in the master branch)."
+#~ msgstr ""
diff --git a/docs/locale/zh_CN/LC_MESSAGES/faq.po b/docs/locale/zh_CN/LC_MESSAGES/faq.po
new file mode 100644
index 00000000..81712a82
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/faq.po
@@ -0,0 +1,457 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-07-31 22:54+0800\n"
+"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../faq.rst:2 87acb7c16d974b4eb060949b8ce40914
+msgid "Frequently Asked Questions (FAQ)"
+msgstr "常见问题解答"
+
+#: ../../faq.rst:4 76aee892f7f14d0590db2d76c7cc0123
+msgid "Here are some frequently asked questions about Pelican."
+msgstr "以下是一些Pelican的常见问题解答。"
+
+#: ../../faq.rst:7 c98549fdd5814984bfa3a6eaf4631d37
+msgid "What's the best way to communicate a problem, question, or suggestion?"
+msgstr "交流问题、疑问或提建议的最佳方式是什么？"
+
+#: ../../faq.rst:9 dbecb306adeb482ba3b9bd68483bc372
+msgid "Please read our :doc:`feedback guidelines <contribute>`."
+msgstr "请参阅文档 :doc:`项目贡献与意见反馈 <contribute>` 。"
+
+#: ../../faq.rst:12 8fe91d51140946f1b2cb131d786c1814
+msgid "How can I help?"
+msgstr "我可以帮上什么忙？"
+
+#: ../../faq.rst:14 d8477da414c446b3936e73931eb4f63a
+msgid ""
+"There are several ways to help out. First, you can communicate any "
+"Pelican suggestions or problems you might have via `Pelican Discussions "
+"<https://github.com/getpelican/pelican/discussions>`_. Please first check"
+" the existing list of discussions and issues (both open and closed) in "
+"order to avoid submitting topics that have already been covered before."
+msgstr ""
+"有好多种方法可以提供帮助。首先，可以在 `Pelican讨论板块 "
+"<https://github.com/getpelican/pelican/discussions>`_ "
+"中提出任何关于Pelican的建议或是问题。在提问或建议之前，请先查看已关闭或开放的issues中是否已有相关内容，以避免内容上的重复。"
+
+#: ../../faq.rst:20 95a29a97e08a452f89aa4eaad191b698
+msgid ""
+"If you want to contribute, please fork `the Git repository "
+"<https://github.com/getpelican/pelican/>`_, create a new feature branch, "
+"make your changes, and issue a pull request. Someone will review your "
+"changes as soon as possible. Please refer to the :doc:`How to Contribute "
+"<contribute>` section for more details."
+msgstr ""
+"如果你想要对项目进行贡献，请fork `Git仓库 <https://github.com/getpelican/pelican/>`_ "
+"，创建一个新的功能分支，并在其中进行修改，在修改完成后提出一个PR。项目组会尽快审核你的PR。关于此的更多内容，请参见 "
+":doc:`项目贡献与意见反馈 <contribute>` 一节。"
+
+#: ../../faq.rst:26 bf7a6828eec74dc588c18e185bdd7090
+msgid ""
+"You can also contribute by creating themes and improving the "
+"documentation."
+msgstr "你可以发起的贡献当然也包括创建主题和改进文档。"
+
+#: ../../faq.rst:29 2ce846241ce744fd81981a376d3f5fe2
+msgid "Is the Pelican settings file mandatory?"
+msgstr "Pelican配置文件是必要的吗？"
+
+#: ../../faq.rst:31 527720062339422095e2c95755af5584
+msgid ""
+"Configuration files are optional and are just an easy way to configure "
+"Pelican. For basic operations, it's possible to specify options while "
+"invoking Pelican via the command line. See ``pelican --help`` for more "
+"information."
+msgstr ""
+"配置文件是可选的，其本质是使您可以更方便地配置Pelican。对于一些基本的配置操作，完全可以在命令行中指定，调用 ``pelican "
+"--help`` 可以查看pelican命令的更多信息。"
+
+#: ../../faq.rst:36 d0ca19a2e40c4ecaa9ecba6cc677f142
+msgid "Changes to the settings file take no effect"
+msgstr "修改后的配置文件没有生效"
+
+#: ../../faq.rst:38 5b741cbb28854893818826c593f8e323
+msgid ""
+"When experimenting with different settings (especially the metadata ones)"
+" caching may interfere and the changes may not be visible. In such cases,"
+" ensure that caching is disabled via ``LOAD_CONTENT_CACHE = False`` or "
+"use the ``--ignore-cache`` command-line switch."
+msgstr ""
+"在尝试不同的配置时（尤其是尝试不同元数据时），缓存很可能会产生干扰，使得修改不可见。此时，确保配置了 ``LOAD_CONTENT_CACHE ="
+" False`` 或在命令行中加上 ``--ignore-cache`` 以禁用缓存。"
+
+#: ../../faq.rst:44 439f2221927b42f7a4c219ab1a76f849
+msgid "I'm creating my own theme. How do I use Pygments for syntax highlighting?"
+msgstr "在自己创建主题时，如何使用Pygments来调整语法高亮？"
+
+#: ../../faq.rst:46 3475c1550e584c84a118ac061461f9f6
+msgid ""
+"Pygments adds some classes to the generated content. These classes are "
+"used by themes to style code syntax highlighting via CSS. Specifically, "
+"you can customize the appearance of your syntax highlighting via the "
+"``.highlight pre`` class in your theme's CSS file. To see how various "
+"styles can be used to render Django code, for example, use the style "
+"selector drop-down at top-right on the `Pygments project demo site "
+"<https://pygments.org/demo/>`_."
+msgstr ""
+"Pygments会为生成的内容添加一些CSS类。这些类会为主题所用，主题会通过CSS来为代码添加语法高亮。具体来说，你可以通过主题CSS文件中的 "
+"``.highlight pre`` 类来自定义语法高亮的外观。在 `Pygments 项目的demo网站 "
+"<https://pygments.org/demo/>`_ 上可以预览能够渲染的代码类型。"
+
+#: ../../faq.rst:53 ecffb1f9501f46c88f799b79fc0ba343
+msgid ""
+"You can use the following example commands to generate a starting CSS "
+"file from a Pygments built-in style (in this case, \"monokai\") and then "
+"copy the generated CSS file to your new theme::"
+msgstr "你可以使用下面的命令来让Pygments使用内置风格（此处为“monokai”）生成一个初始CSS文件，然后将此文件拷贝到新主题中："
+
+#: ../../faq.rst:60 8fc71763c5c243339c9e737cc55b99da
+msgid "Don't forget to import your ``pygment.css`` file from your main CSS file."
+msgstr "不要忘了在你的CSS主文件中引入  ``pygment.css`` 文件。"
+
+#: ../../faq.rst:63 ad118f1f46db423fab19f570cd789798
+msgid "How do I create my own theme?"
+msgstr "如何创建我自己的主题？"
+
+#: ../../faq.rst:65 1674585960e742cbade644b63d3bb32a
+msgid "Please refer to :ref:`theming-pelican`."
+msgstr "请参阅 :ref:`theming-pelican` 。"
+
+#: ../../faq.rst:68 b06c6a8df1634d20b988515af6536e2c
+msgid "I want to use Markdown, but I got an error."
+msgstr "我想要使用Markdown，但是出错了。"
+
+#: ../../faq.rst:70 c0a89314dbdf4368b2e32d781c0ae95b
+msgid ""
+"If you try to generate Markdown content without first installing the "
+"Markdown library, you may see a message that says ``No valid files found "
+"in content``. Markdown is not a hard dependency for Pelican, so if you "
+"have content in Markdown format, you will need to explicitly install the "
+"Markdown library. You can do so by typing the following command, "
+"prepending ``sudo`` if permissions require it::"
+msgstr ""
+"如果没有事先安装Markdown库，在生成Markdown内容时会看到一条提示 ``No valid files found in "
+"content`` "
+"。虽然Markdown并不是必需依赖，但如果你写的内容中含有Markdown格式，就需要安装Markdown库了。输入下面的命令以安装Markdown库，如果需要权限，请在前面添加"
+" ``sudo`` ："
+
+#: ../../faq.rst:80 a4c93b71eb914652b3f05357067f87b3
+msgid "Can I use arbitrary metadata in my templates?"
+msgstr "在模板中可以使用任意元数据吗？"
+
+#: ../../faq.rst:82 6ac1579e5d8842f5bf97b87745848c6a
+msgid ""
+"Yes. For example, to include a modified date in a Markdown post, one "
+"could include the following at the top of the article::"
+msgstr "当然可以。例如，可以在Markdown帖子中包含一个“修改日期”，加在文章开头即可："
+
+#: ../../faq.rst:87 d1ad8fa8e07c4500ab754962064749a8
+msgid ""
+"For reStructuredText, this metadata should of course be prefixed with a "
+"colon::"
+msgstr "对于reStructuredText，此元数据也应当以冒号为前缀："
+
+#: ../../faq.rst:91 e3c9814b5b3849a7957f964565038e45
+msgid ""
+"This metadata can then be accessed in templates such as ``article.html`` "
+"via::"
+msgstr "此元数据可以在模板中获取到，例如在 ``article.html`` 中，可以像这样获取："
+
+#: ../../faq.rst:97 11d953b5718c4baeb7f7fbbb9538c763
+msgid ""
+"If you want to include metadata in templates outside the article context "
+"(e.g., ``base.html``), the ``if`` statement should instead be::"
+msgstr "如果您想在其他模板（例如 ``base.html`` ）中获取此元数据，则 ``if`` 语句应改为："
+
+#: ../../faq.rst:103 99ca0aeea6d14c159cf1f1b8d9cf016d
+msgid ""
+"How do I make my output folder structure identical to my content "
+"hierarchy?"
+msgstr "如何使得输出目录的结构和content目录的结构保持一致？"
+
+#: ../../faq.rst:105 e97223e6c7c94c08a1d42f783fd67f7e
+msgid "Try these settings::"
+msgstr "可以尝试如下配置："
+
+#: ../../faq.rst:112 d35f11a227ba421596458ea8f26ecde0
+msgid "How do I assign custom templates on a per-page basis?"
+msgstr "如何为某个页面指定某个模板？"
+
+#: ../../faq.rst:114 287bac0946dc47feab068bdb76d0bc2e
+msgid ""
+"It's as simple as adding an extra line of metadata to any page or article"
+" that you want to have its own template. For example, this is how it "
+"would be handled for content in reST format::"
+msgstr "这非常简单，在任何页面或者文章中，都可以通过多添加一行元数据来指定特定模板。例如，在reST中，使用："
+
+#: ../../faq.rst:120 b845784299bf47629e616505000724c1
+msgid "For content in Markdown format::"
+msgstr "对于Markdown，则使用："
+
+#: ../../faq.rst:124 fa734dbb540e4cda8a5be5fb1b2da124
+msgid ""
+"Then just make sure your theme contains the relevant template file (e.g. "
+"``template_name.html``)."
+msgstr "确保对应的模板文件在主题中存在即可（例如 ``template_name.html`` ）。"
+
+#: ../../faq.rst:128 bdee9be4397f4839855295ee1a0fdd12
+msgid "How can I override the generated URL of a specific page or article?"
+msgstr "如何重写某一个页面或文章生成的URL？"
+
+#: ../../faq.rst:130 ed91b5bdcbe24473a6fed738784311b8
+msgid ""
+"Include ``url`` and ``save_as`` metadata in any pages or articles that "
+"you want to override the generated URL. Here is an example page in reST "
+"format::"
+msgstr "在任意页面或文章中都可以添加 ``url`` 和 ``save_as`` 元数据，这样就可以重写URL了。下面以reST格式为例："
+
+#: ../../faq.rst:139 5aa733d8d3bd4d86920e7e142715b1f4
+msgid ""
+"With this metadata, the page will be written to "
+"``override/url/index.html`` and Pelican will use the URL "
+"``override/url/`` to link to this page."
+msgstr ""
+"有了这样的元数据，此页面会保存为 ``override/url/index.html`` ，Pelican会将 ``override/url/``"
+" 作为链接到此页面的URL。"
+
+#: ../../faq.rst:143 04d9890aa34d4c1e86bc7a49cd64938a
+msgid "How can I use a static page as my home page?"
+msgstr "如何使用一个静态页面作为主页？"
+
+#: ../../faq.rst:145 d3e8a4e2d453446f9037fa46e6775080
+msgid ""
+"The override feature mentioned above can be used to specify a static page"
+" as your home page. The following Markdown example could be stored in "
+"``content/pages/home.md``::"
+msgstr "上一个问题中提到的特性可以用于实现此需求。下面例子中的Markdown文件保存为 ``content/pages/home.md`` ："
+
+#: ../../faq.rst:155 739da75e7ce946af99c9f577e8a284ff
+msgid ""
+"If the original blog index is still wanted, it can then be saved in a "
+"different location by setting ``INDEX_SAVE_AS = 'blog_index.html'`` for "
+"the ``'index'`` direct template."
+msgstr ""
+"如果仍需要原来的博客主页（即 ``'index'`` 直接模板），可以通过设置 ``INDEX_SAVE_AS = "
+"'blog_index.html'`` 将其存储在其他位置。"
+
+#: ../../faq.rst:160 5224f09821d24e4a8db6870da1266a20
+msgid "What if I want to disable feed generation?"
+msgstr "可以禁用订阅源生成吗？"
+
+#: ../../faq.rst:162 8f014ffab3c44b0ebf2b0d9872bfbfa7
+msgid ""
+"To disable feed generation, all feed settings should be set to ``None``. "
+"All but three feed settings already default to ``None``, so if you want "
+"to disable all feed generation, you only need to specify the following "
+"settings::"
+msgstr ""
+"要禁用订阅源，所有订阅源相关的配置都应被设为 ``None`` 。其中有三项设置默认为 ``None`` "
+"，因此如果要彻底不生成订阅源，你只需要指定下面这些设置："
+
+#: ../../faq.rst:172 9ab29ccca83c4ecfabcb3ad4dd17c751
+msgid ""
+"The word ``None`` should not be surrounded by quotes. Please note that "
+"``None`` and ``''`` are not the same thing."
+msgstr "``None`` 两侧不需要加引号。请注意 ``None`` 和 ``''`` 不是同一个东西。"
+
+#: ../../faq.rst:176 fd8cbe4962d145ccadfd480419dbea9e
+msgid ""
+"I'm getting a warning about feeds generated without SITEURL being set "
+"properly"
+msgstr "Pelican警告说由于SITEURL设置不正确，无法正常生成订阅源"
+
+#: ../../faq.rst:178 e3135e5903ec422f8d7895866ca6f365
+msgid ""
+"`RSS and Atom feeds require all URL links to be absolute "
+"<https://validator.w3.org/feed/docs/rss2.html#comments>`_. In order to "
+"properly generate links in Pelican you will need to set ``SITEURL`` to "
+"the full path of your site."
+msgstr ""
+"`RSS和Atom订阅源要求所有URL都要链接到绝对地址 "
+"<https://validator.w3.org/feed/docs/rss2.html#comments>`_ "
+"。为了使得Pelican能正确生成链接，你需要将站点的 ``SITEURL`` 设置为完整路径。"
+
+#: ../../faq.rst:183 4f2cd929dda7464cbd577d1249969920
+msgid ""
+"Feeds are still generated when this warning is displayed, but links "
+"within may be malformed and thus the feed may not validate."
+msgstr "虽然Pelican提出了警告，但是仍会生成订阅源，但其中的链接可能是无效的，这会导致订阅源不可用。"
+
+#: ../../faq.rst:187 a9f3465fda8c4a0d9395b2d6d9d5478f
+msgid "Can I force Atom feeds to show only summaries instead of article content?"
+msgstr "可以让Atom订阅源只显示摘要，不显示文章内容吗？"
+
+#: ../../faq.rst:189 baf140533501453aa8caeddfc276d8fb
+msgid ""
+"Instead of having to open a separate browser window to read articles, the"
+" overwhelming majority of folks who use feed readers prefer to read "
+"content within the feed reader itself. Mainly for that reason, Pelican "
+"does not support restricting Atom feeds to only contain summaries. Unlike"
+" Atom feeds, the RSS feed specification does not include a separate "
+"``content`` field, so by default Pelican publishes RSS feeds that only "
+"contain summaries (but can optionally be set to instead publish full "
+"content RSS feeds). So the default feed generation behavior provides "
+"users with a choice: subscribe to Atom feeds for full content or to RSS "
+"feeds for just the summaries."
+msgstr ""
+"绝大多数使用订阅源阅读器的人都更喜欢直接在阅读器中阅读文章内容，而不是另外再打开窗口来阅读。因此，Pelican不支持使Atom只包含摘要。但是由于RSS不包含单独的"
+" ``content`` "
+"字段，因此Pelican在发布RSS时默认只包含摘要（当然也可以设置为包含文章内容）。Pelican在订阅源生成上的如此行为就可以让用户自行选择订阅类型：包含了完整内容的Atom或是只包含摘要的RSS。"
+
+#: ../../faq.rst:200 850ac093f2764547a7df74d5d055cbd4
+msgid "Is Pelican only suitable for blogs?"
+msgstr "Pelican只适合用于博客吗？"
+
+#: ../../faq.rst:202 1fb5d92096b242d09da5e0e490b34685
+msgid ""
+"No. Pelican can be easily configured to create and maintain any type of "
+"static site. This may require a little customization of your theme and "
+"Pelican configuration. For example, if you are building a launch site for"
+" your product and do not need tags on your site, you could remove the "
+"relevant HTML code from your theme. You can also disable generation of "
+"tag-related pages via::"
+msgstr "不是的。Pelican可以方便地用于创建维护任何静态站点，为此你需要对主题和配置做一些定制。例如，如果要为你的产品构建一个宣传网站，即不需要使用标签特性，从主题中移除与标签相关的HTML代码即可。另外，还可以通过下面的设置来禁用标签相关页面的生成："
+
+#: ../../faq.rst:212 5452959b3b694cbc89bb8e91bfbef840
+msgid ""
+"Why does Pelican always write all HTML files even with content caching "
+"enabled?"
+msgstr "启用内容缓存后，为什么Pelican仍会每次都写入所有HTML文件？"
+
+#: ../../faq.rst:214 b27b4b7256f749f1bc5970b95fa742ab
+msgid ""
+"In order to reliably determine whether the HTML output is different "
+"before writing it, a large part of the generation environment including "
+"the template contexts, imported plugins, etc. would have to be saved and "
+"compared, at least in the form of a hash (which would require special "
+"handling of unhashable types), because of all the possible combinations "
+"of plugins, pagination, etc. which may change in many different ways. "
+"This would require a lot more processing time and memory and storage "
+"space. Simply writing the files each time is a lot faster and a lot more "
+"reliable."
+msgstr "为了确定HTML输出确实和之前的不同，模板上下文、插件等很多生成环境都需要保存并比较某种哈希值（对于不可哈希的内容类型还需要进行一些额外处理）。另外，由于插件、分页等内容的存在，输出的HTML很可能会与之前不同。因此，考虑到处理时间和存储空间，每次都重新写入全部HTML会更快更可靠。"
+
+#: ../../faq.rst:223 dcb5b1cf0e1b413bb7c04f6deb4ad5d7
+msgid ""
+"However, this means that the modification time of the files changes every"
+" time, so a ``rsync`` based upload will transfer them even if their "
+"content hasn't changed. A simple solution is to make ``rsync`` use the "
+"``--checksum`` option, which will make it compare the file checksums in a"
+" much faster way than Pelican would."
+msgstr ""
+"然而，这样的机制会使得在每次生成站点后，文件的修改时间都会变化，因此基于 ``rsync`` "
+"上传时会把没有变化的内容也进行上传。一个简便的解决方法就是给 ``rsync`` 加上 ``--checksum`` "
+"选项，这会比Pelican在生成时进行校验更快。"
+
+#: ../../faq.rst:230 628a1180f3fd4c0b8301b33e0728d2c2
+msgid "How to process only a subset of all articles?"
+msgstr "如何只处理一部分文章？"
+
+#: ../../faq.rst:232 c2bfe768775342bb8386255ea1bbbe4e
+msgid ""
+"It is often useful to process only e.g. 10 articles for debugging "
+"purposes. This can be achieved by explicitly specifying only the "
+"filenames of those articles in ``ARTICLE_PATHS``. A list of such "
+"filenames could be found using a command similar to ``cd content; find "
+"-name '*.md' | head -n 10``."
+msgstr ""
+"简便起见，在调试时可能只需要处理几篇文章。可以直接在配置项 ``ARTICLE_PATHS`` 中添加需要处理文章的文件名。可以通过像 ``cd "
+"content; find -name '*.md' | head -n 10`` 这样的命令获取文章文件名的列表。"
+
+#: ../../faq.rst:238 72d30cb7a6e348c483cba0c6b6de8d3a
+msgid "My tag cloud is missing/broken since I upgraded Pelican"
+msgstr "在升级Pelican后，标签云消失或不可用了"
+
+#: ../../faq.rst:240 7d07dcddab5d42d1aab6a8dbd27ce36c
+msgid ""
+"In an ongoing effort to streamline Pelican, tag cloud generation has been"
+" moved out of Pelican core and into a separate `plugin "
+"<https://github.com/pelican-plugins/tag-cloud>`_. See the :ref:`plugins` "
+"documentation for further information about the Pelican plugin system."
+msgstr ""
+"我们一直致力于精简Pelican，标签云生成的功能已经从Pelican核心中移除，转而放到了一个单独的 `tag-cloud插件 "
+"<https://github.com/pelican-plugins/tag-cloud>`_ 中。查看 :ref:`plugins` "
+"文档获取更多关于Pelican插件系统的信息。"
+
+#: ../../faq.rst:246 51c727bc21f946b8915f958312369e0f
+msgid "Since I upgraded Pelican my pages are no longer rendered"
+msgstr "升级Pelican后，一些页面没有被渲染"
+
+#: ../../faq.rst:248 4a0d962bc2d844cbab3d0b3e7f6f7bba
+msgid ""
+"Pages were available to themes as lowercase ``pages`` and uppercase "
+"``PAGES``. To bring this inline with the :ref:`templates-variables` "
+"section, ``PAGES`` has been removed. This is quickly resolved by updating"
+" your theme to iterate over ``pages`` instead of ``PAGES``. Just "
+"replace::"
+msgstr ""
+"在以前的版本中，主题通过小写的 ``pages`` 和大写的 ``PAGES`` 都能获取到页面。为了使之与 :ref:`templates-"
+"variables` 一节中的内容保持一致，大写的 ``PAGES`` 被删除了。只要将主题中的 ``PAGES`` 替换为 ``pages`` "
+"，问题即可解决。例如将原先的："
+
+#: ../../faq.rst:255 6167ad6b52db43d384247747db1884ca
+msgid "with something like::"
+msgstr "替换为："
+
+#: ../../faq.rst:260 a7a04eb9e8e549fa8a2a72db3f35b532
+msgid "How can I stop Pelican from trying to parse my static files as content?"
+msgstr "如何避免让Pelican将我的静态文件解析为内容文件？（译者注：例如要将一个HTML文件作为静态文件）？"
+
+#: ../../faq.rst:262 6baaf265738d4acaa26f7829c64a0ac5
+msgid ""
+"Pelican's article and page generators run before it's static generator. "
+"That means if you use a setup similar to the default configuration, where"
+" a static source directory is defined inside a ``*_PATHS`` setting, all "
+"files that have a valid content file ending (``.html``, ``.rst``, "
+"``.md``, ...) will be treated as articles or pages before they get "
+"treated as static files."
+msgstr ""
+"Pelican的文章与页面生成器会先于静态文件生成器运行。这意味着若使用默认配置，即静态资源文件夹定义在某个 ``*_PATHS`` "
+"配置项中，所有以有效内容文件后缀结尾的文件（ ``.html`` 、 ``.rst`` 、 ``.md`` "
+"等）都会被视为文章或者页面，而不是静态文件。"
+
+#: ../../faq.rst:268 e4591dd94ddd4199900b9a451d12929e
+msgid ""
+"To circumvent this issue either use the appropriate ``*_EXCLUDES`` "
+"setting or disable the offending reader via ``READERS`` if you don't need"
+" it."
+msgstr ""
+"为了避免这个问题，使用合适的 ``*_EXCLUDES`` 配置，在必要时还可以通过 ``READERS`` "
+"配置项来直接禁用产生问题的reader。"
+
+#: ../../faq.rst:272 ca927fe2be10411ab365bcc3e4fa4dbd
+msgid "Why is [arbitrary Markdown syntax] not supported?"
+msgstr "为什么不是所有的Markdown语法都支持？"
+
+#: ../../faq.rst:274 5c9cc929a6bf4f1db9d4eed5f37fc0af
+msgid ""
+"Pelican does not directly handle Markdown processing and instead "
+"delegates that task to the Python-Markdown_ project, the core of which "
+"purposefully follows the original Markdown syntax rules and not the "
+"myriad Markdown \"flavors\" that have subsequently propagated. That said,"
+" Python-Markdown_ is quite modular, and the syntax you are looking for "
+"may be provided by one of the many available `Markdown Extensions`_. "
+"Alternatively, some folks have created Pelican plugins that support "
+"Markdown variants, so that may be your best choice if there is a "
+"particular variant you want to use when writing your content."
+msgstr ""
+"Pelican并不直接对Markdown进行处理，而是将此任务交给 Python-Markdown_ "
+"项目，此项目的核心有意只遵循原始的Markdown语法规则，而不服从之后传播开的大量Markdown风格。另外， Python-Markdown_"
+" 是相当模块化的，你想要使用的语法可能已经有现成的 `Markdown扩展`_ "
+"进行了实现。或者，也有人创建了支持Markdown变体的Pelican插件，如果你想要用某种Markdown变体，可以在这些地方寻找支持。"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/importer.po b/docs/locale/zh_CN/LC_MESSAGES/importer.po
new file mode 100644
index 00000000..9e015c1a
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/importer.po
@@ -0,0 +1,321 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../importer.rst:4 2e58a5582f664ba0af49aac4480bc799
+msgid "Importing an existing site"
+msgstr "导入已有站点"
+
+#: ../../importer.rst:7 5182de0b717543c7a4813491755b720a
+msgid "Description"
+msgstr "简介"
+
+#: ../../importer.rst:9 29a8bae0ba78486894ed4c286cd2f3b4
+msgid ""
+"``pelican-import`` is a command-line tool for converting articles from "
+"other software to reStructuredText or Markdown. The supported import "
+"formats are:"
+msgstr ""
+"命令行工具 ``pelican-import`` 用于将其他软件生成的文章转换成reStructuredText"
+"或Markdown格式。支持导入下面这些格式："
+
+#: ../../importer.rst:12 c670f6055ad24d818132d74951c9928c
+msgid "Blogger XML export"
+msgstr "Blogger XML export"
+
+#: ../../importer.rst:13 d31ddaa8c7d54a268b379f706164de39
+msgid "Dotclear export"
+msgstr "Dotclear export"
+
+#: ../../importer.rst:14 5102eb70c58240b2ad4d508a196b176e
+msgid "Medium export"
+msgstr "Medium export"
+
+#: ../../importer.rst:15 2cfcdf575387417bae3a9938aa55b0e6
+msgid "Tumblr API"
+msgstr "Tumblr API"
+
+#: ../../importer.rst:16 42233d68a4bc46339b284681bdbdd19c
+msgid "WordPress XML export"
+msgstr "WordPress XML export"
+
+#: ../../importer.rst:17 0170dad08a80435b99a39ccaf887c5bb
+msgid "RSS/Atom feed"
+msgstr "RSS/Atom feed"
+
+#: ../../importer.rst:19 077a8220f4a84dd297ec5aa7cff15a24
+msgid ""
+"The conversion from HTML to reStructuredText or Markdown relies on "
+"`Pandoc`_. For Dotclear, if the source posts are written with Markdown "
+"syntax, they will not be converted (as Pelican also supports Markdown)."
+msgstr ""
+"从HTML转换到reStructuredText或Markdown是依赖 `Pandoc`_ "
+"完成的。对于Dotclear，若原帖子是由Markdown语法写的，则无需转换"
+"（因为Pelican本就支持Markdown）。"
+
+#: ../../importer.rst:25 e9b94b6029204b82b009d3ef23c19814
+msgid ""
+"Unlike Pelican, Wordpress supports multiple categories per article. These"
+" are imported as a comma-separated string. You have to resolve these "
+"manually, or use a plugin such as `More Categories`_ that enables "
+"multiple categories per article."
+msgstr ""
+"和Pelican不同，在Wordpress中可以将一篇文章同时放在多个分类中。在导入时，各个分类"
+"会以逗号分隔，你必须自己手动进行处理。或者也可以使用例如 `More Categories`_ "
+"这样的插件，使得文章可以同时存在于多个分类中。"
+
+#: ../../importer.rst:32 f7add19b68754b6e8a617a1d50dee759
+msgid ""
+"Imported pages may contain links to images that still point to the "
+"original site. So you might want to download those images into your local"
+" content and manually re-link them from the relevant pages of your site."
+msgstr ""
+"要导入的内容中可能会包含指向原站点的图片链接，你可能希望将他们全部下载下来，然后再"
+"重新手动调整这些链接。"
+
+#: ../../importer.rst:37 22cc1a514c4f42efbcf9afc3d987c42e
+msgid "Dependencies"
+msgstr "依赖"
+
+#: ../../importer.rst:39 6139199770a24fc7af7ca7e556d18d5f
+msgid ""
+"``pelican-import`` has some dependencies not required by the rest of "
+"Pelican:"
+msgstr ""
+"``pelican-import`` 需要用到一些其他依赖，这些依赖只会被 ``pelican-import`` 用到："
+
+#: ../../importer.rst:41 0e8eb04bb07f4752880b873e73e7f7e5
+msgid ""
+"*BeautifulSoup4* and *lxml*, for WordPress and Dotclear import. Can be "
+"installed like any other Python package (``pip install BeautifulSoup4 "
+"lxml``)."
+msgstr ""
+"为了能够导入WordPress和Dotclear的内容，需要 *BeautifulSoup4* 与 *lxml* 。"
+"安装方法与其他Python包相同（ ``pip install BeautifulSoup4 lxml`` ）"
+
+#: ../../importer.rst:44 7d31c1ad4ecb4014a3ef240436b9b3e1
+msgid "*Feedparser*, for feed import (``pip install feedparser``)."
+msgstr "为了能够导入订阅源，需要 *Feedparser* （ ``pip install feedparser`` ）"
+
+#: ../../importer.rst:45 db7a18b1a4534a17956c9d030dddff56
+msgid ""
+"*Pandoc*, see the `Pandoc site`_ for installation instructions on your "
+"operating system."
+msgstr ""
+"还需要 *Pandoc* ，参照 `Pandoc官方网站`_ 进行安装。"
+
+#: ../../importer.rst:53 9952881aed104ef0ac82af5339e6b149
+msgid "Usage"
+msgstr "用法"
+
+#: ../../importer.rst:63 83dbe43e4d2e4d8eaf3e37724ac119e3
+msgid "Positional arguments"
+msgstr "位置参数"
+
+#: ../../importer.rst:65 4a12692744024752be75d82ed74d369d
+msgid "``input``"
+msgstr "``input``"
+
+#: ../../importer.rst:65 52f62f22221f4c3d964df5aced3d2a2b
+msgid "The input file to read"
+msgstr "需要读取的输入文件"
+
+#: ../../importer.rst:66 acc46432d5c14ea8a5e27e6ec2b84d18
+msgid "``api_key``"
+msgstr "``api_key``"
+
+#: ../../importer.rst:66 29dd358bf2fe49d8a218c56ca376f6a6
+msgid ""
+"(Tumblr only) api_key can be obtained from "
+"https://www.tumblr.com/oauth/apps"
+msgstr ""
+"（只会在Tumblr中用到）从 https://www.tumblr.com/oauth/apps 中获取到的api_key"
+
+#: ../../importer.rst:70 a81b90d51a9f4c28adc09038715cf5c2
+msgid "Optional arguments"
+msgstr "可选参数"
+
+#: ../../importer.rst:72 d4d5211b75aa4103b06ad7685368af06
+msgid "Show this help message and exit"
+msgstr "显示此帮助信息并退出 ``pelican-import`` "
+
+#: ../../importer.rst:73 a7bae87fe16644f4b5da7d32fdc05f95
+msgid "Blogger XML export (default: False)"
+msgstr "输入是否为Blogger XML格式（默认：False）"
+
+#: ../../importer.rst:74 e8c133125ed04120bcc3737fa2a0ba60
+msgid "Dotclear export (default: False)"
+msgstr "输入是否为Dotclear格式（默认：False）"
+
+#: ../../importer.rst:75 caffd159f92a4f36aadedec398823ac3
+msgid "Medium export (default: False)"
+msgstr "输入是否为Medium格式（默认：False）"
+
+#: ../../importer.rst:76 f1bcaccf8e2f43f6894f2f0540c9d7ba
+msgid "Tumblr API (default: False)"
+msgstr "输入是否为Tumblr API格式（默认：False）"
+
+#: ../../importer.rst:77 6131f8fa00294515a028f4bb1a3a3053
+msgid "WordPress XML export (default: False)"
+msgstr "输入是否为WordPress XML格式（默认：False）"
+
+#: ../../importer.rst:78 dad00ee0aebb4550acae995ecdbb622f
+msgid "Feed to parse (default: False)"
+msgstr "输入是否为订阅源格式（默认：False）"
+
+#: ../../importer.rst:80 0ca3cbbc57c64b5b88444ccde94f94ce
+msgid "Output path (default: content)"
+msgstr "输出路径（默认：content）"
+
+#: ../../importer.rst:82 baa2762a4ee745028e29865720ca299d
+msgid ""
+"Output markup format: ``rst``, ``markdown``, or ``asciidoc`` (default: "
+"``rst``)"
+msgstr ""
+"输出格式，可选值为： ``rst`` 、 ``markdown`` 、 ``asciidoc`` （默认： ``rst`` ）"
+
+#: ../../importer.rst:84 53232a317a58422d8f070c245d3b7409
+msgid "Put files in directories with categories name (default: False)"
+msgstr "是否要将输出文件按分类名放到各文件夹中（默认：False）"
+
+#: ../../importer.rst:86 f72e1895d9fc4facb90ddffb53b31a0a
+msgid ""
+"Put files recognised as pages in \"pages/\" sub- directory (blogger and "
+"wordpress import only) (default: False)"
+msgstr ""
+"将识别为页面的文件放入“pages/” 子文件夹中（仅在blogger和wordpress中有用）（默认：False）"
+
+#: ../../importer.rst:89 3f9315af4f1e4ced8ece96fca71cb1e7
+msgid "Import only post from the specified author"
+msgstr "仅导入某个作者的帖子"
+
+#: ../../importer.rst:90 0b34125f0bb744b089fe77b86b3e50f7
+msgid ""
+"Strip raw HTML code that can't be converted to markup such as flash "
+"embeds or iframes (default: False)"
+msgstr ""
+"删除无法转换的HTML代码，例如嵌入的flash或iframe（默认：False）"
+
+#: ../../importer.rst:92 f899a119b708450bbd38913f813255c2
+msgid ""
+"Put wordpress custom post types in directories. If used with --dir-cat "
+"option directories will be created as \"/post_type/category/\" (wordpress"
+" import only)"
+msgstr ""
+"将wordpress中的自定义类型博文放到对应文件夹中。如果同时还使用了 --dir-cat 选项，"
+"输出转换后文件时会创建诸如“/post_type/category/” 的文件夹（只在wordpress中有效）"
+
+#: ../../importer.rst:95 627c041fab81460eafd4f5fe361bcd1a
+msgid ""
+"Download files uploaded to wordpress as attachments. Files will be added "
+"to posts as a list in the post header and links to the files within the "
+"post will be updated. All files will be downloaded, even if they aren't "
+"associated with a post. Files will be downloaded with their original path"
+" inside the output directory, e.g. \"output/wp-"
+"uploads/date/postname/file.jpg\". (wordpress import only) (requires an "
+"internet connection)"
+msgstr ""
+"下载作为附件上传到WordPress的文件。文件会以列表形式添加到帖子的开头，并且到这些"
+"文件的链接都会进行更新。另外，即使某些文件没有在任何帖子中用到，也同样会被下载。"
+"文件会被下载到输出文件夹下，并保持原始路径，例如"
+"“output/wp-uploads/date/postname/file.jpg” 。（仅在wordpress中有效，"
+"且需要互联网连接）"
+
+#: ../../importer.rst:104 11162d8c497b4108a38c2a60af4a4215
+msgid ""
+"Disable storing slugs from imported posts within output. With this "
+"disabled, your Pelican URLs may not be consistent with your original "
+"posts. (default: False)"
+msgstr ""
+"不保存导入推文的slug，会导致Pelican的URL和原推文不一致。（默认：False）"
+
+#: ../../importer.rst:109 f4f4b6e918d3498e927b59c5d0bae05a
+msgid "Blog name used in Tumblr API"
+msgstr "Tumblr API中使用的博客名"
+
+#: ../../importer.rst:113 16e0f9bd1c6e4b338673f1800e6a4995
+msgid "Examples"
+msgstr "例子"
+
+#: ../../importer.rst:115 0cf17b9fd72940c391a1bb8bf7de534b
+msgid "For Blogger::"
+msgstr "导入Blogger："
+
+#: ../../importer.rst:119 3fc79daf9e9e4f5ba1a121faaabd0c9e
+msgid "For Dotclear::"
+msgstr "导入Dotclear："
+
+#: ../../importer.rst:123 328ff8145b464fa2ab59505a8bc3236a
+msgid "For Medium::"
+msgstr "导入Medium："
+
+#: ../../importer.rst:127 8ca5f721833142249b6d798efcb77458
+msgid ""
+"The Medium export is a zip file.  Unzip it, and point this tool to the "
+"\"posts\" subdirectory.  For more information on how to export, see "
+"https://help.medium.com/hc/en-us/articles/115004745787-Export-your-"
+"account-data."
+msgstr ""
+"Medium中导出的是一个zip文件。请先解压之，然后再将其中的“posts”子目录传给此工具。 "
+"https://help.medium.com/hc/en-us/articles/115004745787-Export-your-account-data "
+"中有更详细的导出指导。"
+
+#: ../../importer.rst:131 516a83a4d8cf4570a9a6fff416e5cf5a
+msgid "For Tumblr::"
+msgstr "导入Tumblr："
+
+#: ../../importer.rst:135 8fcab620c0d44bb29a120d8d781f4daa
+msgid "For WordPress::"
+msgstr "导入WordPress："
+
+#: ../../importer.rst:139 a929213eb21f4118b9adbb6199bd78ea
+msgid "For Medium (an example of using an RSS feed):"
+msgstr "导入Medium（例子中使用了RSS订阅源）："
+
+#: ../../importer.rst:141 5e23c5d167ef4db1994f4323ac3d120e
+msgid ""
+"$ python -m pip install feedparser $ pelican-import --feed "
+"https://medium.com/feed/@username"
+msgstr ""
+"$ python -m pip install feedparser $ pelican-import --feed "
+"https://medium.com/feed/@username"
+
+#: ../../importer.rst:146 b44dfe0f807049899c0560c6bf62c386
+msgid "The RSS feed may only return the most recent posts — not all of them."
+msgstr "RSS订阅源可能只会返回最新的帖子，而不是所有帖子。"
+
+#: ../../importer.rst:149 575426ff787d4647b3aa2469b8b52412
+msgid "Tests"
+msgstr "测试"
+
+#: ../../importer.rst:151 036d2119412b41f3a3cb69cec74ecc81
+msgid "To test the module, one can use sample files:"
+msgstr "可以使用下面的文件作为样例进行测试："
+
+#: ../../importer.rst:153 482b30f9aab54717bb14218ae5fa8ea6
+msgid ""
+"for WordPress: https://www.wpbeginner.com/wp-themes/how-to-add-dummy-"
+"content-for-theme-development-in-wordpress/"
+msgstr ""
+"WordPress： https://www.wpbeginner.com/wp-themes/how-to-add-dummy-content-"
+"for-theme-development-in-wordpress/"
+
+#: ../../importer.rst:154 6cb1bd10d37e4993aabece8aaed20171
+msgid "for Dotclear: http://media.dotaddict.org/tda/downloads/lorem-backup.txt"
+msgstr "Dotclear： http://media.dotaddict.org/tda/downloads/lorem-backup.txt"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/index.po b/docs/locale/zh_CN/LC_MESSAGES/index.po
new file mode 100644
index 00000000..47773c0b
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/index.po
@@ -0,0 +1,134 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../index.rst:2 160b5c32c524404ba295da4e89124739
+msgid "Pelican |release|"
+msgstr "Pelican |release|"
+
+#: ../../index.rst:4 19170a80b4274f71b77062c7a6b90726
+msgid ""
+"Pelican is a static site generator, written in Python_. Highlights "
+"include:"
+msgstr ""
+"Pelican是一个用 Python_ 写的静态站点生成器，它有诸多亮点："
+
+#: ../../index.rst:6 6ab42a346f2c46d789cd46655195f2d3
+msgid ""
+"Write your content directly with your editor of choice in "
+"reStructuredText_ or Markdown_ formats"
+msgstr ""
+"你可以直接在自己的编辑器中用 reStructuredText_ 或 Markdown_ 完成内容创作"
+
+#: ../../index.rst:8 dbd17888530e43ce8bdfc1594947032c
+msgid "Includes a simple CLI tool to (re)generate your site"
+msgstr "自带了一个简单的命令行工具，你可以用它来生成你的站点"
+
+#: ../../index.rst:9 2bbe72bda8db457a88f3d3a94d16cc0c
+msgid "Easy to interface with distributed version control systems and web hooks"
+msgstr "易于与分布式版本控制系统和webhook交互"
+
+#: ../../index.rst:10 24af69b083024f2a9c4f162d54fa57c6
+msgid "Completely static output is easy to host anywhere"
+msgstr "生成的站点是完全静态的，可以在任何主机上轻松地部署"
+
+#: ../../index.rst:12 1e2090f3f19d49a19a6c50524e4cd0b7
+msgid "Ready to get started? Check out the :doc:`Quickstart<quickstart>` guide."
+msgstr "准备好开始体验了吗？请查看 :doc:`快速入门<quickstart>` 指南。"
+
+#: ../../index.rst:15 481a352565e84c848e018de507fbe9af
+msgid "Features"
+msgstr "特性"
+
+#: ../../index.rst:17 6c7b5d9b43ca42f1b1df139e7f884d26
+msgid "Pelican’s feature highlights include:"
+msgstr "Pelican在特性上也有很多亮点："
+
+#: ../../index.rst:19 464e5e8ea8324fab9c5496b317a6db97
+msgid ""
+"Articles (e.g., blog posts) and pages (e.g., \"About\", \"Projects\", "
+"\"Contact\")"
+msgstr ""
+"可以生成文章（例如博客推文）和页面（例如“关于”、“联系我们”、“项目”）"
+
+#: ../../index.rst:20 c7cc4fe6ea8145feb0ace7d0965e2634
+msgid "Integration with external services"
+msgstr "可以和外部服务集成"
+
+#: ../../index.rst:21 ceb2c8a629024157946eba53638d7eb1
+msgid "Site themes (created using Jinja2_ templates)"
+msgstr "可以使用主题（主题使用 Jinja2_ 模板引擎创建）"
+
+#: ../../index.rst:22 51c3defcba6c4d31a77c3aade6826f1a
+msgid "Publication of articles in multiple languages"
+msgstr "可以为同一篇文章发布多种语言版本"
+
+#: ../../index.rst:23 6f7cbfae94c54318a904e9725ce73677
+msgid "Generation of Atom and RSS feeds"
+msgstr "可以生成Atom和Rss订阅源"
+
+#: ../../index.rst:24 3d667d2ed98a489788f6c38a4e4a6752
+msgid "Code syntax highlighting"
+msgstr "可以渲染代码高亮"
+
+#: ../../index.rst:25 bf1a1f91b821464182471a3760a59d4f
+msgid "Import existing content from WordPress, Dotclear, or RSS feeds"
+msgstr "可以从WordPress、Dotclear或Rss订阅源导入已有的内容"
+
+#: ../../index.rst:26 bd82641c549645cb8b4cd3187800397c
+msgid "Fast rebuild times thanks to content caching and selective output writing"
+msgstr "得益于内容缓存和选择性生成设计，可以快速重新生成站点"
+
+#: ../../index.rst:27 8dec47d1ab13410c9b99db0709c860a3
+msgid "Extensible via a rich plugin ecosystem: `Pelican Plugins`_"
+msgstr "可扩展性强，有丰富的插件生态： `Pelican Plugins`_"
+
+#: ../../index.rst:30 c7e090d7d2e04ff1ac1844e56209d75b
+msgid "Why the name \"Pelican\"?"
+msgstr "为什么叫做“Pelican”？"
+
+#: ../../index.rst:32 8c31222af5e24ba69acb5dd07a5b5d56
+msgid ""
+"\"Pelican\" is an anagram for *calepin*, which means \"notebook\" in "
+"French. ;)"
+msgstr ""
+"“Pelican”是法语词笔记本 *calepin* 读音的回文。;)"
+
+#: ../../index.rst:35 188f72b2bb644f978180eba22009ebc6
+msgid "Source code"
+msgstr "源码"
+
+#: ../../index.rst:37 2c8804f173fb4aa8973fb4d2413c263b
+msgid "You can access the source code at: https://github.com/getpelican/pelican"
+msgstr "在这里可以获取Pelican的源码： https://github.com/getpelican/pelican"
+
+#: ../../index.rst:40 06ab21b7cde94cee92193199ddc69775
+msgid "How to get help, contribute, or provide feedback"
+msgstr "如何获取帮助、贡献内容或是提供反馈"
+
+#: ../../index.rst:42 7fdcc2bcaac04317a6f4114f1d9c327f
+msgid ""
+"See our :doc:`feedback and contribution submission guidelines "
+"<contribute>`."
+msgstr ""
+"请查看文档 :doc:`反馈意见和贡献的提交指南 <contribute>`。"
+
+#: ../../index.rst:45 3d15499d76e1489d8e8782c65f73bb29
+msgid "Documentation"
+msgstr "文档"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/install.po b/docs/locale/zh_CN/LC_MESSAGES/install.po
new file mode 100644
index 00000000..4bc2c10f
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/install.po
@@ -0,0 +1,244 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"PO-Revision-Date: 2024-06-25 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../install.rst:2 32d9c99d9171418c89daafbe7260daa9
+msgid "Installing Pelican"
+msgstr "安装Pelican"
+
+#: ../../install.rst:4 73ec02b650044be6bb17951f4a915075
+msgid ""
+"Pelican currently runs best on |min_python|; earlier versions of Python "
+"are not supported."
+msgstr ""
+"Pelican需要 |min_python| 以上版本的Python，不支持更低版本。"
+
+#: ../../install.rst:6 9134a5a1bd9a4f54a36a3da163d859d8
+msgid ""
+"You can install Pelican via several different methods. The simplest is "
+"via Pip_::"
+msgstr ""
+"有多种方法可以安装Pelican，最简单的就是通过 Pip_："
+
+#: ../../install.rst:10 22d5948b07d14a13bc45aa14ef11e856
+msgid "Or, if you plan on using Markdown::"
+msgstr "如果您需要使用Markdown，请使用下面的命令安装："
+
+#: ../../install.rst:14 b910f7faa2c84e5eb62fbd0fae2544d3
+msgid ""
+"(Keep in mind that some operating systems will require you to prefix the "
+"above command with ``sudo`` in order to install Pelican system-wide.)"
+msgstr ""
+"（在某些操作系统中，需要在命令前加 ``sudo`` 才能在整个系统上安装Pelican）"
+
+#: ../../install.rst:17 afb018b5d42e433e8107ca38dfcb545f
+msgid ""
+"While the above is the simplest method, the recommended approach is to "
+"create a virtual environment for Pelican via virtualenv_ before "
+"installing Pelican. Assuming you have virtualenv_ installed, you can then"
+" open a new terminal session and create a new virtual environment for "
+"Pelican::"
+msgstr ""
+"尽管上面是最简单的安装方法，但我们推荐使用虚拟环境 virtualenv_ 完成"
+"Pelican的安装。当您安装好 virtualenv_ 后，打开一个新的命令行并"
+"为Pelican创建一个虚拟环境："
+
+#: ../../install.rst:26 7d981233f13e42b6b07fbd5fa58f69fc
+msgid ""
+"Once the virtual environment has been created and activated, Pelican can "
+"be installed via ``python -m pip install pelican`` as noted above. "
+"Alternatively, if you have the project source, you can install Pelican "
+"using the distutils method::"
+msgstr ""
+"当创建并激活虚拟环境后，使用之前提到过的命令 ``python -m pip install pelican`` "
+"就可以安装Pelican了。或者，如果您想要从源码安装，可以使用distutils方式："
+
+#: ../../install.rst:33 c8109ae3e44541e18e713e39690009ae
+msgid ""
+"If you have Git installed and prefer to install the latest bleeding-edge "
+"version of Pelican rather than a stable release, use the following "
+"command::"
+msgstr ""
+"如果安装过Git，并且您希望安装Pelican的最最新版本（而不是稳定版），"
+"请使用下面的命令："
+
+#: ../../install.rst:38 2ba389e93d084dea8b702336479a0470
+msgid ""
+"Once Pelican is installed, you can run ``pelican --help`` to see basic "
+"usage options. For more detail, refer to the :doc:`Publish<publish>` "
+"section."
+msgstr ""
+"当您安装好Pelican，可以执行 ``pelican --help`` 命令来查看一些基本用法。"
+"在 :doc:`发布站点<publish>` 章节中可以了解更多信息。"
+
+#: ../../install.rst:42 d1850a31cca24c5281cc7c9fd748b56b
+msgid "Optional packages"
+msgstr "可选包"
+
+#: ../../install.rst:44 8428281e15354c71a5aec92e9e0041b9
+msgid ""
+"If you plan on using `Markdown <https://pypi.org/project/Markdown/>`_ as "
+"a markup format, you can install Pelican with Markdown support::"
+msgstr ""
+"如您希望使用 `Markdown <https://pypi.org/project/Markdown/>`_ "
+"来写作，执行下面的命令来安装Markdown支持："
+
+#: ../../install.rst:49 6dcdacecb0874afd8c88cbf814c522ba
+msgid ""
+"Typographical enhancements can be enabled in your settings file, but "
+"first the requisite `Typogrify <https://pypi.org/project/typogrify/>`_ "
+"library must be installed::"
+msgstr ""
+"Pelican还支持排版增强，若您需要使用，请先安装 `Typogrify "
+"<https://pypi.org/project/typogrify/>`_ 库，稍后您可以在设置文件中启用它。"
+
+#: ../../install.rst:56 d3ff6383ae9745bc9bfed85654086311
+msgid "Dependencies"
+msgstr "依赖"
+
+#: ../../install.rst:58 2dc22a3fa6c242bdb5b61005e1910d79
+msgid ""
+"When Pelican is installed, the following dependent Python packages should"
+" be automatically installed without any action on your part:"
+msgstr ""
+"当Pelican安装完成后，下面的所有Python依赖应该都会自动安装，"
+"无需另外做任何操作："
+
+#: ../../install.rst:61 4c7a644a29b540869d69acd10e032039
+msgid ""
+"`feedgenerator <https://pypi.org/project/feedgenerator/>`_, to generate "
+"the Atom feeds"
+msgstr ""
+"`feedgenerator <https://pypi.org/project/feedgenerator/>`_，"
+"用于生成Atom feeds"
+
+#: ../../install.rst:63 365c8fb0938e4d9fbf78d110b05cb99f
+msgid "`jinja2 <https://pypi.org/project/Jinja2/>`_, for templating support"
+msgstr "`jinja2 <https://pypi.org/project/Jinja2/>`_，用于模板系统"
+
+#: ../../install.rst:64 5db63207e60c4997924c3baf8aec8524
+msgid "`pygments <https://pypi.org/project/Pygments/>`_, for syntax highlighting"
+msgstr "`pygments <https://pypi.org/project/Pygments/>`_，用于语法高亮"
+
+#: ../../install.rst:65 72bfb5fc2b514031a42952502746c100
+msgid ""
+"`docutils <https://pypi.org/project/docutils/>`_, for supporting "
+"reStructuredText as an input format"
+msgstr ""
+"`docutils <https://pypi.org/project/docutils/>`_，"
+"用于reStructuredText格式"
+
+#: ../../install.rst:67 d00ac0c26d884a2d9d7f02fa89491892
+msgid ""
+"`blinker <https://pypi.org/project/blinker/>`_, an object-to-object and "
+"broadcast signaling system"
+msgstr ""
+"`blinker <https://pypi.org/project/blinker/>`_，"
+"对象-对象的信号广播系统"
+
+#: ../../install.rst:69 0d317b007acf49fc879203fa8ffb4048
+msgid ""
+"`unidecode <https://pypi.org/project/Unidecode/>`_, for ASCII "
+"transliterations of Unicode text utilities"
+msgstr ""
+"`unidecode <https://pypi.org/project/Unidecode/>`_，"
+"用于将Unicode文本转为ASCII字符的音译"
+
+#: ../../install.rst:72 ded0aae575854f149bcf2ea9efa4ba21
+msgid ""
+"`MarkupSafe <https://pypi.org/project/MarkupSafe/>`_, for a markup-safe "
+"string implementation"
+msgstr ""
+"`MarkupSafe <https://pypi.org/project/MarkupSafe/>`_，"
+"用于转义字符的安全处理"
+
+#: ../../install.rst:74 eae7d8f6f84040339ccfef98e20502d8
+msgid ""
+"`python-dateutil <https://pypi.org/project/python-dateutil/>`_, to read "
+"the date metadata"
+msgstr ""
+"`python-dateutil <https://pypi.org/project/python-dateutil/>`_，"
+"用于读取日期相关的元数据"
+
+#: ../../install.rst:78 cd33ec4583574c5bb879f08813b9932c
+msgid "Upgrading"
+msgstr "更新升级"
+
+#: ../../install.rst:80 1513dd1e43564cb29da0a14988e0791d
+msgid ""
+"If you installed a stable Pelican release via Pip_ and wish to upgrade to"
+" the latest stable release, you can do so by adding ``--upgrade``::"
+msgstr ""
+"若是通过 Pip_ 安装了稳定版本的Pelican，可以通过在安装命令中"
+"添加 ``--upgrade`` 来升级到最新版："
+
+#: ../../install.rst:85 fae6900b3acc41d4b7bb34c192fe4c08
+msgid ""
+"If you installed Pelican via distutils or the bleeding-edge method, "
+"simply perform the same step to install the most recent version."
+msgstr ""
+"若是通过distutils安装或是通过Git安装了测试版的Pelican"
+"重新进行一遍和安装时同样的步骤即可。"
+
+#: ../../install.rst:89 89392d36f81f4c7eb75e9a74d1795faa
+msgid "Kickstart your site"
+msgstr "启动网站"
+
+#: ../../install.rst:91 a8517a0fbbb1420297df214f50d8792d
+msgid ""
+"Once Pelican has been installed, you can create a skeleton project via "
+"the ``pelican-quickstart`` command, which begins by asking some questions"
+" about your site::"
+msgstr ""
+"Pelican安装完成后，通过 ``pelican-quickstart`` 命令创建项目的整体框架，"
+"在运行这个命令时，您需要输入一些与站点相关的信息："
+
+#: ../../install.rst:97 50231ba4b02d4e868995bdacbd02b27d
+msgid ""
+"If run inside an activated virtual environment, ``pelican-quickstart`` "
+"will look for an associated project path inside "
+"``$VIRTUAL_ENV/.project``. If that file exists and contains a valid "
+"directory path, the new Pelican project will be saved at that location. "
+"Otherwise, the default is the current working directory. To set the new "
+"project path on initial invocation, use: ``pelican-quickstart --path "
+"/your/desired/directory``"
+msgstr ""
+"如果是在虚拟环境中执行 ``pelican-quickstart`` ，系统会自动在 "
+"``$VIRTUAL_ENV/.project`` 目录中查找这个命令。若这个这个命令存在"
+"并且路径是正确的，一个新的Pelican项目就会在目标位置创建。否则，"
+"会默认在当前的工作目录下创建这个项目。若要在初始化时指定项目路径，请使用 "
+"``pelican-quickstart --path /your/desired/directory``。"
+
+#: ../../install.rst:104 ea893addf15c47f182384509b1a3a2f7
+msgid ""
+"Once you finish answering all the questions, your project will consist of"
+" the following hierarchy (except for *pages* — shown in parentheses below"
+" — which you can optionally add yourself if you plan to create non-"
+"chronological content)::"
+msgstr ""
+"当您回答完所有问题后，项目就会成功创建。项目中会包含下述的一些层级结构"
+"（除了用括号括起来的 *pages*）。如果有一些内容不需要按时间排序，"
+"您可以将它们放在（pages）所在的位置："
+
+#: ../../install.rst:118 7d13a0cc5ebd44159fddc8de68993fc7
+msgid ""
+"The next step is to begin to adding content to the *content* folder that "
+"has been created for you."
+msgstr ""
+"接下来就可以开始往 *content* 目录中添加自己创作的内容了。"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/internals.po b/docs/locale/zh_CN/LC_MESSAGES/internals.po
new file mode 100644
index 00000000..5fea5c46
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/internals.po
@@ -0,0 +1,172 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../internals.rst:2 5d90a7c7f9dd42b5ba1fdfc05c5e9c3c
+msgid "Pelican internals"
+msgstr "Pelican内部机制"
+
+#: ../../internals.rst:4 fa53597118244e8585b3b0a9fb4336c0
+msgid ""
+"This section describe how Pelican works internally. As you'll see, it's "
+"quite simple, but a bit of documentation doesn't hurt.  :)"
+msgstr ""
+"这一节描述了Pelican的内部运行机制。你会发现，Pelican的内部其实并不复杂。 :)"
+
+#: ../../internals.rst:7 c9a34db098f34796b80ee62896702be2
+msgid ""
+"You can also find in the :doc:`report` section an excerpt of a report the"
+" original author wrote with some software design information."
+msgstr "你可以在 :doc:`report` 一节中找到原作者用软件设计相关内容报告的节选。"
+
+#: ../../internals.rst:13 ac2af84842574bef9a791b416e21834e
+msgid "Overall structure"
+msgstr "总体结构"
+
+#: ../../internals.rst:15 fb7aea45b8f74c9c877bf2640d47aaac
+msgid ""
+"What Pelican does is take a list of files and process them into some sort"
+" of output. Usually, the input files are reStructuredText and Markdown "
+"files, and the output is a blog, but both input and output can be "
+"anything you want."
+msgstr ""
+"Pelican做的事情其实很简单：获取一个文件列表，并将它们处理为某种输出。通常，输入文件是"
+"reStructuredText和Markdown文件，输出是一个博客，但事实上输入和输出都可以是你想要的"
+"任何内容。"
+
+#: ../../internals.rst:19 599649d1e9da4355ab02b50ea4fbdb19
+msgid "The logic is separated into different classes and concepts:"
+msgstr "系统的整体逻辑可以分为几个不同的类和概念："
+
+#: ../../internals.rst:21 8ec0821a726e4ade8046921cc09b3ea3
+msgid ""
+"**Writers** are responsible for writing files: .html files, RSS feeds, "
+"and so on. Since those operations are commonly used, the object is "
+"created once and then passed to the generators."
+msgstr ""
+"**Writers** 负责完成 html、RSS订阅源等等内容的文件写入。因为这些操作都是比较常用的，"
+"这个类只会被创建一次，然后再传给Generators。"
+
+#: ../../internals.rst:25 63c9a61869884147a8752e9be188e0e9
+msgid ""
+"**Readers** are used to read from various formats (HTML, Markdown and "
+"reStructuredText for now, but the system is extensible). Given a file, "
+"they return metadata (author, tags, category, etc.) and content (HTML-"
+"formatted)."
+msgstr ""
+"**Readers** 用于读取不同格式的文件（目前支持HTML、Markdown、reStructuredText，"
+"但可以继续扩展）。向**Readers**输入一个文件，它会返回文档的元数据（作者、标签、"
+"分类等等）与HTML格式的文档正文内容。"
+
+#: ../../internals.rst:29 d9bc146ae213415b804cd93ebf43e340
+msgid ""
+"**Generators** generate the different outputs. For instance, Pelican "
+"comes with ``ArticlesGenerator`` and ``PageGenerator``. Given a "
+"configuration, they can do whatever they want. Most of the time, it's "
+"generating files from inputs."
+msgstr ""
+"**Generators** 用以生成不同的输出，Pelican自带了 ``ArticlesGenerator`` 和 "
+"``PageGenerator`` 。给定一套配置信息， **Generators** 可以做几乎任何事。"
+"但大多数情况下，它的工作就是从输入生成文件。"
+
+#: ../../internals.rst:34 49ef39e8677a4529a3ee226faae1526b
+msgid ""
+"Pelican also uses templates, so it's easy to write your own theme. The "
+"syntax is `Jinja2 <https://palletsprojects.com/p/jinja/>`_ and is very "
+"easy to learn, so don't hesitate to jump in and build your own theme."
+msgstr ""
+"Pelican使用了模板引擎，因此可以较为简单地编写自定义主题。模板语法使用的是易于学习的 "
+"`Jinja2 <https://palletsprojects.com/p/jinja/>`_ ，因此快去构建你自己的主题吧。"
+
+#: ../../internals.rst:39 1aef766f93d549afa332fad4278c4063
+msgid "How to implement a new reader?"
+msgstr "如何实现一个新的reader？"
+
+#: ../../internals.rst:41 abbbfc19ccea4e3ea3716179981e3c1d
+msgid ""
+"Is there an awesome markup language you want to add to Pelican? Well, the"
+" only thing you have to do is to create a class with a ``read`` method "
+"that returns HTML content and some metadata."
+msgstr ""
+"若是希望为Pelican添加一个标记语言，只需要创建一个类，实现 ``read`` 方法，并在其中"
+"返回元数据和以HTML表示的正文内容。"
+
+#: ../../internals.rst:45 1e9fc1bcc9444db4b751f1c621280a32
+msgid "Take a look at the Markdown reader::"
+msgstr "可以看一看Markdown的reader："
+
+#: ../../internals.rst:71 cbc4f49384964be3a0a68b1083100839
+msgid "Simple, isn't it?"
+msgstr "是不是很简单呢？"
+
+#: ../../internals.rst:73 02643c7e485d49e39344570ba5639a60
+msgid ""
+"If your new reader requires additional Python dependencies, then you "
+"should wrap their ``import`` statements in a ``try...except`` block.  "
+"Then inside the reader's class, set the ``enabled`` class attribute to "
+"mark import success or failure. This makes it possible for users to "
+"continue using their favourite markup method without needing to install "
+"modules for formats they don't use."
+msgstr ""
+"如果新创建的reader需要额外的Python依赖，应该把 ``import`` 放在 ``try...except`` "
+"块中。在reader类中，设置类属性 ``enabled`` 来标记import是否成功。这使得用户能"
+"继续使用他们喜欢的标记语言而无需安装用不到的模块。"
+
+#: ../../internals.rst:80 02deeeac368b4dbc8c7b1025275d5bd5
+msgid "How to implement a new generator?"
+msgstr "如何实现一个新的generator？"
+
+#: ../../internals.rst:82 f7e5c28efbdb40c0bac7b985e8264310
+msgid ""
+"Generators have two important methods. You're not forced to create both; "
+"only the existing ones will be called."
+msgstr ""
+"generator有两个重要方法。不一定两个都要创建，若只创建了一个，就会自动调用存在的方法。"
+
+#: ../../internals.rst:85 01f2801461e043e7882167907e337d2c
+msgid ""
+"``generate_context``, that is called first, for all the generators. Do "
+"whatever you have to do, and update the global context if needed. This "
+"context is shared between all generators, and will be passed to the "
+"templates. For instance, the ``PageGenerator`` ``generate_context`` "
+"method finds all the pages, transforms them into objects, and populates "
+"the context with them. Be careful *not* to output anything using this "
+"context at this stage, as it is likely to change by the effect of other "
+"generators."
+msgstr ""
+"``generate_context`` 会优先被调用，其中可以完成任何你想要做的事，如果需要的话，还要"
+"更新全局上下文。全局上下文会在所有generator间共享，并在之后传给模板。例如 "
+"``PageGenerator`` 的 ``generate_context`` 方法会找寻所有页面，并将他们转换为对象，"
+"再将上下文传入其中。注意，请 *不要* 在此阶段使用该上下文输出任何内容，因为其他"
+"generator还会继续影响上下文。"
+
+#: ../../internals.rst:93 3241d04af8944c48bf162963a774000c
+msgid ""
+"``generate_output`` is then called. And guess what is it made for? Oh, "
+"generating the output.  :) It's here that you may want to look at the "
+"context and call the methods of the ``writer`` object that is passed as "
+"the first argument of this function. In the ``PageGenerator`` example, "
+"this method will look at all the pages recorded in the global context and"
+" output a file on the disk (using the writer method ``write_file``) for "
+"each page encountered."
+msgstr ""
+"``generate_output`` 会在 ``generate_context`` 之后被调用，用于生成要输出的内容。"
+"此时就需要使用上下文并调用 ``writer`` 对象的方法，此 ``writer`` 就是传入 "
+"``generate_output`` 方法的第一个参数。``PageGenerator`` 的 ``generate_output`` "
+"方法中，会使用writer的 ``write_file`` 方法为全局上下文中的每一个页面输出一个文件。"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/pelican-themes.po b/docs/locale/zh_CN/LC_MESSAGES/pelican-themes.po
new file mode 100644
index 00000000..bceef808
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/pelican-themes.po
@@ -0,0 +1,206 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../pelican-themes.rst:2 1fce54d5389b41f4a588e9b23b646aee
+msgid "pelican-themes"
+msgstr "pelican-themes"
+
+#: ../../pelican-themes.rst:7 6158b329ed7b469286405115e2ed7fa0
+msgid "Description"
+msgstr "简介"
+
+#: ../../pelican-themes.rst:9 3df74d6d079945f7a4e0062ed5ea3eed
+msgid ""
+"``pelican-themes`` is a command line tool for managing themes for "
+"Pelican. See :ref:`settings/themes` for settings related to themes."
+msgstr ""
+"``pelican-themes`` 是一个命令行工具，用于管理Pelican主题。有关主题的配置，"
+"请参考 :ref:`设置章节中的主题 <settings/themes>` 。"
+
+#: ../../pelican-themes.rst:14 03eb76faf4544c8dbf478752096c7d7c
+msgid "Usage"
+msgstr "用法"
+
+#: ../../pelican-themes.rst:16 d5dcdc6c26094f5695061f9c53633589
+msgid "pelican-themes [-h] [-l] [-i theme path [theme path ...]]"
+msgstr "pelican-themes [-h] [-l] [-i theme path [theme path ...]]"
+
+#: ../../pelican-themes.rst:17 99b7a21ca612425da217b72b8c0c9b64
+msgid "[-r theme name [theme name ...]]"
+msgstr "[-r theme name [theme name ...]]"
+
+#: ../../pelican-themes.rst:18 1f64db909173426dabee822aea3b269b
+msgid "[-s theme path [theme path ...]] [-v] [--version]"
+msgstr "[-s theme path [theme path ...]] [-v] [--version]"
+
+#: ../../pelican-themes.rst:21 63ef4d44a1db4176b4c3866671a93603
+msgid "Optional arguments:"
+msgstr "可选参数："
+
+#: ../../pelican-themes.rst:24 348360945a0943ffa8122aad16bf0ec1
+msgid "Show the help and exit"
+msgstr "显示帮助信息并退出"
+
+#: ../../pelican-themes.rst:26 aaec8d28264b45b7aac617b7140b5b13
+msgid "Show the themes already installed"
+msgstr "显示已安装的主题"
+
+#: ../../pelican-themes.rst:28 c8d44b6ac6754f4e8e10a39848f042d0
+msgid "One or more themes to install"
+msgstr "安装一个或多个主题"
+
+#: ../../pelican-themes.rst:30 18077fbf428e476aa218464fb0f18d8d
+msgid "One or more themes to remove"
+msgstr "移除一个或多个主题"
+
+#: ../../pelican-themes.rst:32 e328d59886be45a6ae9530a0f2bea3ca
+msgid ""
+"Same as ``--install``, but create a symbolic link instead of copying the "
+"theme. Useful for theme development"
+msgstr ""
+"和 ``--install`` 相同，区别在于此选项仅会创建一个符号链接到给定的目录，"
+"而不会将主题完整拷贝。一般用于主题的开发"
+
+#: ../../pelican-themes.rst:35 481c7a32a5e6400d83c9e2e56e6b94a4
+msgid "Verbose output"
+msgstr "开启详细输出"
+
+#: ../../pelican-themes.rst:37 d7889dd20ac643ecad73e464ec4cfa55
+msgid "Print the version of this script"
+msgstr "显示此工具的版本信息"
+
+#: ../../pelican-themes.rst:42 5c3d3aabd5304e8f9a6f0593824f1da6
+msgid "Examples"
+msgstr "例子"
+
+#: ../../pelican-themes.rst:46 4d6ff63aae06482dbf22f41d4111b001
+msgid "Listing the installed themes"
+msgstr "列出已安装主题"
+
+#: ../../pelican-themes.rst:48 91a9e942ea36479999586426afead753
+msgid ""
+"With ``pelican-themes``, you can see the available themes by using the "
+"``-l`` or ``--list`` option:"
+msgstr ""
+"在 ``pelican-themes`` 中使用 ``-l`` 或 ``--list`` 选项，查看可用主题："
+
+#: ../../pelican-themes.rst:62 7a2f7dc98fcc45cabc4639576d503c28
+msgid ""
+"In this example, we can see there are three themes available: "
+"``notmyidea``, ``simple``, and ``two-column``."
+msgstr ""
+"在上面的例子中，可以看到有三个主题可供使用： ``notmyidea`` 、 "
+"``simple`` 、和 ``two-column`` 。"
+
+#: ../../pelican-themes.rst:65 8c03dfa908114d92b8a9aeb6673555ce
+msgid ""
+"``two-column`` is followed by an ``@`` because this theme is not copied "
+"to the Pelican theme path, but is instead just linked to it (see "
+"`Creating symbolic links`_ for details about creating symbolic links)."
+msgstr ""
+"主题 ``two-column`` 后有一个 ``@`` ，这是因为该主题没有被拷贝到Pelican的主题"
+"路径下，而只是为其创建了一个符号链接 （详见 `创建符号链接`_ ）。"
+
+#: ../../pelican-themes.rst:69 bc91e8c3ff4a44dd9234d0ab186d8515
+msgid ""
+"Note that you can combine the ``--list`` option with the ``-v`` or "
+"``--verbose`` option to get more verbose output, like this:"
+msgstr ""
+"当然，你可以将 ``--list`` 选项和 ``-v`` 或 ``--verbose`` 结合起来，从而"
+"得到更详细的输出："
+
+#: ../../pelican-themes.rst:81 0b407ed71e6a4b428f5a582b58a47f3c
+msgid "Installing themes"
+msgstr "安装主题"
+
+#: ../../pelican-themes.rst:83 e95f78a5c3b844b9a6fd2924f455748f
+msgid ""
+"You can install one or more themes using the ``-i`` or ``--install`` "
+"option. This option takes as argument the path(s) of the theme(s) you "
+"want to install, and can be combined with the ``--verbose`` option:"
+msgstr ""
+"使用 ``-i`` 或 ``--install`` 选项可以安装一个或多个主题。此选项将一个"
+"或多个到达主题的路径作为参数，同样可以结合 ``--verbose`` 选项："
+
+#: ../../pelican-themes.rst:103 5b20e90396564e08860b2b3a569e7166
+msgid "Removing themes"
+msgstr "移除主题"
+
+#: ../../pelican-themes.rst:105 2415bf89e3804c9dbdc34814b0132b8c
+msgid ""
+"The ``pelican-themes`` command can also remove themes from the Pelican "
+"themes path. The ``-r`` or ``--remove`` option takes as argument the "
+"name(s) of the theme(s) you want to remove, and can be combined with the "
+"``--verbose`` option."
+msgstr ""
+"``pelican-themes`` 命令同样可用于移除Pelican主题文件夹下的主题。 ``-r`` 或 "
+"``--remove`` 选项以一个或多个主题的名称为参数，同样也可以结合 ``--verbose`` "
+"选项使用。"
+
+#: ../../pelican-themes.rst:122 9ea5149543a648049444220a4041da69
+msgid "Creating symbolic links"
+msgstr "创建符号链接"
+
+#: ../../pelican-themes.rst:124 17cdf3146683485ea72db5fbd9c1f60a
+msgid ""
+"``pelican-themes`` can also install themes by creating symbolic links "
+"instead of copying entire themes into the Pelican themes path."
+msgstr ""
+"``pelican-themes`` 也可以通过创建符号链接来安装主题，如此便无需完整拷贝主题。"
+
+#: ../../pelican-themes.rst:127 1d2c60b41c374936a9986a852d50e898
+msgid ""
+"To symbolically link a theme, you can use the ``-s`` or ``--symlink``, "
+"which works exactly as the ``--install`` option:"
+msgstr ""
+"使用 ``-s`` 或 ``--symlink`` 选项来为主题创建符号链接，用法和 ``--install`` 选项相同："
+
+#: ../../pelican-themes.rst:134 66707a8607f549199dca6f93586d2d87
+msgid ""
+"In this example, the ``two-column`` theme is now symbolically linked to "
+"the Pelican themes path, so we can use it, but we can also modify it "
+"without having to reinstall it after each modification."
+msgstr ""
+"在上面的例子中， ``two-column`` 主题就已经在Pelican主题目录下创建了符号链接，"
+"也可以正常使用。如此，当我们修改主题后就无需重新进行安装。"
+
+#: ../../pelican-themes.rst:138 93ec27a473b04bca9d2930a7cb6b609c
+msgid "This is useful for theme development:"
+msgstr "这对主题的开发是很有用的："
+
+#: ../../pelican-themes.rst:155 66d808308aa64fc9afcef8bdf03bca8b
+msgid "Doing several things at once"
+msgstr "同时执行多个操作"
+
+#: ../../pelican-themes.rst:157 ace10a2c2f4d4adab9ade60631e82c38
+msgid ""
+"The ``--install``, ``--remove`` and ``--symlink`` options are not "
+"mutually exclusive, so you can combine them in the same command line to "
+"do more than one operation at time, like this:"
+msgstr ""
+"``--install`` 、 ``--remove`` 和 ``--symlink`` 可以同时使用，不会冲突，"
+"因此可以在同一行命令中同时做多个操作："
+
+#: ../../pelican-themes.rst:169 e7adbac04b6a40fd986c02e834cc1756
+msgid ""
+"In this example, the theme ``notmyidea-cms`` is replaced by the theme "
+"``notmyidea-cms-fr``"
+msgstr ""
+"在上面的例子中，用 ``notmyidea-cms-fr`` 替换了 ``notmyidea-cms`` 主题。"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/plugins.po b/docs/locale/zh_CN/LC_MESSAGES/plugins.po
new file mode 100644
index 00000000..7b62744d
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/plugins.po
@@ -0,0 +1,711 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"PO-Revision-Date: 2024-06-26 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../plugins.rst:4 b1b40bca7d3748008eefe26806d5d5ef
+msgid "Plugins"
+msgstr "插件"
+
+#: ../../plugins.rst:6 42ca486828e4442a9d74216d0d8bb37d
+msgid ""
+"Beginning with version 3.0, Pelican supports plugins. Plugins are a way "
+"to add features to Pelican without having to directly modify the Pelican "
+"core."
+msgstr ""
+"Pelican从3.0版本开始支持插件。通过插件，不必直接修改Pelican的核心代码就可以给"
+"Pelican添加新功能。"
+
+#: ../../plugins.rst:10 6bb8ab4cb7eb44ddb1ed4734f47f6781
+msgid "How to use plugins"
+msgstr "如何使用插件"
+
+#: ../../plugins.rst:12 822e0bd7ce2f4433a7c39b3accde01a1
+msgid ""
+"Starting with version 4.5, Pelican moved to a new plugin structure "
+"utilizing namespace packages that can be easily installed via Pip_. "
+"Plugins supporting this structure will install under the namespace "
+"package ``pelican.plugins`` and can be automatically discovered by "
+"Pelican. To see a list of Pip-installed namespace plugins that are active"
+" in your environment, run::"
+msgstr ""
+"Pelican从4.5版本开始使用了一种全新的插件结构，利用了命名空间包，"
+"并且可以轻松地通过 Pip_ 进行安装。支持此结构地插件都会被安装在命名空间包 "
+"``pelican.plugins`` 下，因此Pelican可以自动发现他们。下面的命令可以用于"
+"查看环境中用Pip安装的所有插件："
+
+#: ../../plugins.rst:20 2b59c5d107dc4b118dc76116910e9495
+msgid ""
+"If you leave the ``PLUGINS`` setting as default (``None``), Pelican will "
+"automatically discover namespace plugins and register them. If, on the "
+"other hand, you specify a ``PLUGINS`` setting as a list of plugins, this "
+"auto-discovery will be disabled. At that point, only the plugins you "
+"specify will be registered, and you must explicitly list any namespace "
+"plugins as well."
+msgstr ""
+"若将 ``PLUGINS`` 配置项设为默认的 ``None`` ，Pelican会自动发现命名空间中的"
+"插件并且将他们全部加载；若你在 ``PLUGINS`` 设置项中指定了一系列的插件，"
+"Pelican就不会去自动发现插件，也就是说，你需要显式地指定所有要使用的插件。"
+
+#: ../../plugins.rst:26 52d1968196294569a478931f7022e686
+msgid ""
+"If you are using the ``PLUGINS`` setting, you can specify plugins in two "
+"ways. The first method specifies plugins as a list of strings. Namespace "
+"plugins can be specified either by their full names "
+"(``pelican.plugins.myplugin``) or by their short names (``myplugin``)::"
+msgstr ""
+"在配置 ``PLUGINS`` 时，有两种方式。一是用字符串列表指定插件的名称，可以是包含"
+"命名空间的完整名称（例如 ``pelican.plugins.myplugin`` ），也可以是简短名称"
+"（ ``myplugin``）："
+
+#: ../../plugins.rst:35 b2c75e52e66e4000968e744ffa4b89a9
+msgid ""
+"Alternatively, you can import them in your settings file and pass the "
+"modules::"
+msgstr ""
+"二是在设置文件中先import进来，再将import进的模块放在 ``PLUGINS`` 设置项中："
+
+#: ../../plugins.rst:43 88af9139373f4cd89fa5b958196c9448
+msgid ""
+"When experimenting with different plugins (especially the ones that deal "
+"with metadata and content) caching may interfere and the changes may not "
+"be visible. In such cases disable caching with ``LOAD_CONTENT_CACHE = "
+"False`` or use the ``--ignore-cache`` command-line switch."
+msgstr ""
+"在尝试不同的插件时（尤其是那些处理元数据和内容的插件），缓存可能会相互干扰，"
+"一些更改不会生效。发生这种情况时，就需要通过设置 ``LOAD_CONTENT_CACHE = False`` "
+"或使用 ``--ignore-cache`` 命令行选项禁用缓存。"
+
+#: ../../plugins.rst:48 d0e3cd59052c4a7d995fb5e1e15d9799
+msgid ""
+"If your plugins are not in an importable path, you can specify a list of "
+"paths via the ``PLUGIN_PATHS`` setting. As shown in the following "
+"example, paths in the ``PLUGIN_PATHS`` list can be absolute or relative "
+"to the settings file::"
+msgstr ""
+"如果插件处于无法直接进行import的路径，可以在 ``PLUGIN_PATHS`` 配置项中指定这些路径。"
+"如下例所示， ``PLUGIN_PATHS`` 中的路径可以是绝对的，也可以是相对于设置文件的："
+
+#: ../../plugins.rst:56 4c3de952a8514e5caea402392b911f0b
+msgid "Where to find plugins"
+msgstr "在哪儿下载插件"
+
+#: ../../plugins.rst:57 16173c9dceb0409f89964412dd7e71e9
+msgid ""
+"Namespace plugins can be found in the `pelican-plugins organization`_ as "
+"individual repositories. Legacy plugins are located in the `pelican-"
+"plugins repository`_ and will be gradually phased out in favor of the "
+"namespace versions."
+msgstr ""
+"新的命名空间插件可以在GitHub的 `pelican-plugins 组织`_ 中找到，每个插件都是"
+"一个独立的仓库。而老的插件则可以在GitHub的 `pelican-plugins 仓库`_ 中找到。"
+"这些老的插件会逐步淘汰并转移到新的命名空间版本。"
+
+#: ../../plugins.rst:65 a30a9862112b47128f6e7b28c6836f27
+msgid ""
+"Please note that while we do our best to review and maintain these "
+"plugins, they are submitted by the Pelican community and thus may have "
+"varying levels of support and interoperability."
+msgstr ""
+"请注意，尽管我们尽全力审查和维护这些插件，但这些插件是Pelican社区提交的，"
+"因此支持性和互操作性程度各不相同。"
+
+#: ../../plugins.rst:70 f4e140c61c0f45ed8ac53dca3b05b1f1
+msgid "How to create plugins"
+msgstr "如何创建插件"
+
+#: ../../plugins.rst:72 43013c6cf4f34ca09205e8dab0b9fa6d
+msgid ""
+"Plugins are based on the concept of signals. Pelican sends signals, and "
+"plugins subscribe to those signals. The list of available signals is "
+"documented in a subsequent section."
+msgstr ""
+"插件是基于信号这一概念的。Pelican会发送信号，插件则订阅这些信号。可用的信号"
+"在下一节会贴出来。"
+
+#: ../../plugins.rst:76 5377a966ab114a29acb61f79eadc632b
+msgid ""
+"The only rule to follow for plugins is to define a ``register`` callable,"
+" in which you map the signals to your plugin logic. Let's take a simple "
+"example::"
+msgstr ""
+"对于插件来说，唯一需要遵循的规则就是一定要定义一个可调用的 ``register`` ，"
+"在 ``register`` 中需要将信号映射到插件逻辑上。下面是一个简单的例子："
+
+#: ../../plugins.rst:93 2217318326524c62804ec94e55a4ca20
+msgid ""
+"Signal receivers are weakly-referenced and thus must not be defined "
+"within your ``register`` callable or they will be garbage-collected "
+"before the signal is emitted."
+msgstr ""
+"信号接收器在Pelican中是弱引用的，因此不能将它定义在可调用的 ``register`` 中，"
+"否则接收器在信号发送之前就会被回收。"
+
+#: ../../plugins.rst:97 6731cc78478a46c5a0cb51a8cd477318
+msgid ""
+"If multiple plugins connect to the same signal, plugins will be executed "
+"in the order they are connected. With ``PLUGINS`` setting, order will be "
+"as defined in the setting. If you rely on auto-discovered namespace "
+"plugins, no ``PLUGINS`` setting, they will be connected in the same order"
+" they are discovered (same order as ``pelican-plugins`` output). If you "
+"want to specify the order explicitly, disable auto-discovery by defining "
+"``PLUGINS`` in the desired order."
+msgstr ""
+"如果多个插件关联到同一个信号，插件将按照它们关联的前后顺序执行。但若设置了 "
+"``PLUGINS`` 配置项会以此配置项中的顺序为准。如果您使用了无需PLUGINS设置的新版"
+"命名空间插件，它们将按照被探测到的顺序进行连接（与 pelican-plugins 输出的顺序相同）。"
+
+#: ../../plugins.rst:105 6dad534cc0014b78a3638a91cc4a1120
+msgid "Namespace plugin structure"
+msgstr "命名空间插件的结构"
+
+#: ../../plugins.rst:107 aa6f290c3f4d42558b684d0e3487af95
+msgid ""
+"Namespace plugins must adhere to a certain structure in order to function"
+" properly. They need to be installable (i.e. contain ``setup.py`` or "
+"equivalent) and have a folder structure as follows::"
+msgstr ""
+"命名空间插件必须遵循特定的结构才能正常工作。这些插件需要是可安装的"
+"（即包含 ``setup.py`` 或其他等效文件），并且遵循下述文件夹结构："
+
+#: ../../plugins.rst:120 b8d73cfdb5f042cca1705f97d693263d
+msgid ""
+"It is crucial that ``pelican`` or ``pelican/plugins`` folder **not** "
+"contain an ``__init__.py`` file. In fact, it is best to have those "
+"folders empty besides the listed folders in the above structure and keep "
+"your plugin related files contained solely in the "
+"``pelican/plugins/myplugin`` folder to avoid any issues."
+msgstr ""
+"非常关键的一点就是， ``pelican`` 和 ``pelican/plugins`` 文件夹下都 **不能** 包含 "
+"``__init__.py`` 文件。事实上，这两个文件夹下最好是只有上面列出的文件夹，"
+"并且保证与插件相关的文件都仅包含在 ``pelican/plugins/myplugin`` 文件夹中，"
+"以避免奇奇怪怪的问题。"
+
+#: ../../plugins.rst:126 c3f08ae8c0d7415098157bbd1c99ce08
+msgid ""
+"To easily set up the proper structure, a `cookiecutter template for "
+"plugins`_ is provided. Refer to that project's README for instructions on"
+" how to use it."
+msgstr ""
+"为了让大家更容易就能建立正确的结构，我们为插件提供了一个 `cookiecutter模板`_ ，"
+"使用方法参考此项目README文件中的指示即可。"
+
+#: ../../plugins.rst:132 c2321eec3dc84224918172c5040a259f
+msgid "List of signals"
+msgstr "信号列表"
+
+#: ../../plugins.rst:134 78c4cfefae7e412f8f6287da2e3c8d34
+msgid "Here is the list of currently implemented signals:"
+msgstr "下面是目前已经实现了的信号："
+
+#: ../../plugins.rst:137 7a3c3b8b0f114d54b497ab77b09dc558
+msgid "Signal"
+msgstr "信号"
+
+#: ../../plugins.rst:137 781b5c11f87f43b9ba4b3e75bee696d0
+msgid "Arguments"
+msgstr "参数"
+
+#: ../../plugins.rst:137 df7d14950fed44f4a4b93908aed36060
+msgid "Description"
+msgstr "描述"
+
+#: ../../plugins.rst:139 598901e7cb5b49ac9acb5f148bf7c0e7
+msgid "initialized"
+msgstr "initialized"
+
+#: ../../plugins.rst:139 ../../plugins.rst:140 ../../plugins.rst:158
+#: ../../plugins.rst:161 4cedbf9ee7fb4c7abe20e15e4ee1c7fb
+#: 704ff7e1ddfc4eb3bd7798d25df1e668 bc98001ef73d419b8f811bbb3d3a571a
+#: c9104ccaf84c48d98fafca001ec187e2
+msgid "pelican object"
+msgstr "pelican object"
+
+#: ../../plugins.rst:140 6f1a09178e2c44c9bda76ed0c0025bef
+msgid "finalized"
+msgstr "finalized"
+
+#: ../../plugins.rst:140 175a1d1ab8374325812a00cfd581e54e
+msgid ""
+"invoked after all the generators are executed and just before pelican "
+"exits useful for custom post processing actions, such as: - minifying "
+"js/css assets. - notify/ping search engines with an updated sitemap."
+msgstr ""
+"所有generator执行完成后调用，即pelican退出之前。这对于自定义后处理操作是"
+"非常有用的，例如可以简化js/css资源、向搜索引擎告知更新后的sitemap。"
+
+#: ../../plugins.rst:144 8d390b6db281423d92a4d7bd4921b4b4
+msgid "generator_init"
+msgstr "generator_init"
+
+#: ../../plugins.rst:144 fef4d6e70a4c4365be408a5f1579135c
+msgid "generator"
+msgstr "generator"
+
+#: ../../plugins.rst:144 dbe5ff1590dc4df38cb8fd234708c7bd
+msgid "invoked in the Generator.__init__"
+msgstr "在Generator.__init__中调用"
+
+#: ../../plugins.rst:145 0324812d14d9452fbf28c286c2a10834
+msgid "all_generators_finalized"
+msgstr "all_generators_finalized"
+
+#: ../../plugins.rst:145 f6170ebf34b247868d149f0efca462b3
+msgid "generators"
+msgstr "generators"
+
+#: ../../plugins.rst:145 d67dff93c28146498074abbf3aeb5103
+msgid "invoked after all the generators are executed and before writing output"
+msgstr "在所有generator执行完后，写入输出内容前调用，"
+
+#: ../../plugins.rst:146 0e9feed7804b4bbdb23711f9d6ad4f40
+msgid "readers_init"
+msgstr "readers_init"
+
+#: ../../plugins.rst:146 f0de00423c104ecd8e60fb3450b534b4
+msgid "readers"
+msgstr "readers"
+
+#: ../../plugins.rst:146 b554b35806e34e51bc5ab974fb517541
+msgid "invoked in the Readers.__init__"
+msgstr "在Readers.__init__中调用"
+
+#: ../../plugins.rst:147 ../../plugins.rst:201 003cdeb23b67433e8cf70c600a42e8e4
+#: 7f4a2f6665064a16bcd1b7ea347f5b49
+msgid "article_generator_context"
+msgstr "article_generator_context"
+
+#: ../../plugins.rst:147 8997b3fd1a8d4efb86245916e50c31b9
+msgid "article_generator, metadata"
+msgstr "article_generator, metadata"
+
+#: ../../plugins.rst:148 ../../plugins.rst:203 4496df152e48410995ae35f73e3ce0e9
+#: f46672e3f919441ba2486f9641752913
+msgid "article_generator_preread"
+msgstr "article_generator_preread"
+
+#: ../../plugins.rst:148 ../../plugins.rst:150 ../../plugins.rst:151
+#: ../../plugins.rst:154 3408ba823f14463196f2296480e25c7d
+#: 43b073d3f3ad4a2ba3d0c18447cb7cf6 c776a7323f0a41babb44daf3abfd6b85
+#: f47ca0a3f9654ed4b7653fd946b2d9b6
+msgid "article_generator"
+msgstr "article_generator"
+
+#: ../../plugins.rst:148 94e2a57c5b074d068f051d5de850060c
+msgid ""
+"invoked before a article is read in ArticlesGenerator.generate_context; "
+"use if code needs to do something before every article is parsed"
+msgstr ""
+"在ArticlesGenerator.generate_context读取文章之前调用；若代码需要在解析每篇文章前"
+"执行某些操作，就可以使用此信号。"
+
+#: ../../plugins.rst:150 c58f32123f234e6cafa42aa4ede5bf73
+msgid "article_generator_init"
+msgstr "article_generator_init"
+
+#: ../../plugins.rst:150 10d3585dc8f94d978643a9c2dc9219a9
+msgid "invoked in the ArticlesGenerator.__init__"
+msgstr "在ArticlesGenerator.__init__中调用"
+
+#: ../../plugins.rst:151 93ec423e266b4ba9b941a5826e290fec
+msgid "article_generator_pretaxonomy"
+msgstr "article_generator_pretaxonomy"
+
+#: ../../plugins.rst:151 27290d55819e4bfabe1624059956258f
+msgid ""
+"invoked before categories and tags lists are created useful when e.g. "
+"modifying the list of articles to be generated so that removed articles "
+"are not leaked in categories or tags"
+msgstr ""
+"在创建类别和标签列表之前调用。例如，当需要变更要生成的文章列表时可以使用，"
+"如此可以避免一些已移除文章在分类或标签列表中泄露。"
+
+#: ../../plugins.rst:154 ../../plugins.rst:202 12c99acda2ac45debe4fc574a246fc63
+#: f3bfb220e59d473bb27601c16f5a1625
+msgid "article_generator_finalized"
+msgstr "article_generator_finalized"
+
+#: ../../plugins.rst:154 4cb8ed5b4701426b8e1707c6c6b0d48f
+msgid "invoked at the end of ArticlesGenerator.generate_context"
+msgstr "在ArticlesGenerator.generate_context的最后调用"
+
+#: ../../plugins.rst:155 c19a632018d44ad2b72d5cf6b7cc9c14
+msgid "article_generator_write_article"
+msgstr "article_generator_write_article"
+
+#: ../../plugins.rst:155 9da20e77d40b45e292ae994fb0fbe97c
+msgid "article_generator, content"
+msgstr "article_generator, content"
+
+#: ../../plugins.rst:155 a2d5bc3f72b64e47bcaccff3bf27dec2
+msgid "invoked before writing each article, the article is passed as content"
+msgstr "在写入每篇文章前调用，文章以内容的形式作为参数传入。"
+
+#: ../../plugins.rst:156 0db965f5b99f49e48fc1db531c139f13
+msgid "article_writer_finalized"
+msgstr "article_writer_finalized"
+
+#: ../../plugins.rst:156 c6af98478be14eb283bb95e7b6a3118c
+msgid "article_generator, writer"
+msgstr "article_generator, writer"
+
+#: ../../plugins.rst:156 c48e1152864c4249886f3c7ed4ece85b
+msgid ""
+"invoked after all articles and related pages have been written, but "
+"before the article generator is closed."
+msgstr ""
+"在所有文章及相关联页面写入完成后，在文章generator关闭前调用。"
+
+#: ../../plugins.rst:158 f6af27fc844d43779d581cb4383b97ed
+msgid "get_generators"
+msgstr "get_generators"
+
+#: ../../plugins.rst:158 b41e27f19c47478a8ece4f43a685f6be
+msgid ""
+"invoked in Pelican.get_generator_classes, can return a Generator, or "
+"several generators in a tuple or in a list."
+msgstr ""
+"在Pelican.get_generator_classes中调用，可以返回一个Generator，也可以以一个"
+"元组或列表的形式返回多个generator。"
+
+#: ../../plugins.rst:161 f23075094c4f46958de609a44850eb6d
+msgid "get_writer"
+msgstr "get_writer"
+
+#: ../../plugins.rst:161 365671a73e17434f90973ee8e632fa32
+msgid "invoked in Pelican.get_writer, can return a custom Writer."
+msgstr "在Pelican.get_writer前调用，可以返回一个自定义Writer。"
+
+#: ../../plugins.rst:163 ../../plugins.rst:204 299eef53e530489a9e7366042919059f
+#: 917cc78965d84285bc832cecf181ce55
+msgid "page_generator_context"
+msgstr "page_generator_context"
+
+#: ../../plugins.rst:163 26f64e1dbe854ca287aa0f59b269477c
+msgid "page_generator, metadata"
+msgstr "page_generator, metadata"
+
+#: ../../plugins.rst:164 ../../plugins.rst:205 c2ec4e60dda142569cdcfe5a311b21a5
+#: fcd417f63054406ea7869a2a945dc819
+msgid "page_generator_preread"
+msgstr "page_generator_preread"
+
+#: ../../plugins.rst:164 ../../plugins.rst:166 ../../plugins.rst:167
+#: 89c2d7a279604926a290c2665fe8082a 98ab9a5bc2804442a217233f4ab8a003
+#: fca779509f1742e99e3d10a6602561c9
+msgid "page_generator"
+msgstr "page_generator"
+
+#: ../../plugins.rst:164 295fe11e61ba4f80a145ce06a1ffc777
+msgid ""
+"invoked before a page is read in PageGenerator.generate_context; use if "
+"code needs to do something before every page is parsed."
+msgstr ""
+"在PageGenerator.generate_context读取页面前调用，若代码需要在解析每个页面前"
+"执行某些操作，就可以使用此信号。"
+
+#: ../../plugins.rst:166 ../../plugins.rst:207 4f2b1db9b6054af2b0fd0545082bcafd
+#: db8ee3e356d84758b427d9f29d034000
+msgid "page_generator_init"
+msgstr "page_generator_init"
+
+#: ../../plugins.rst:166 1d4e2e940e0f4dd5a151519aea710454
+msgid "invoked in the PagesGenerator.__init__"
+msgstr "在PagesGenerator.__init__中调用"
+
+#: ../../plugins.rst:167 ../../plugins.rst:206 319e921c48474a43bbdac4bf43a688f2
+#: 5e9b33a48c51417fb5211824b0ad008d
+msgid "page_generator_finalized"
+msgstr "page_generator_finalized"
+
+#: ../../plugins.rst:167 019fa3fddf2e4725b978326f221c80bd
+msgid "invoked at the end of PagesGenerator.generate_context"
+msgstr "在PagesGenerator.generate_context的最后调用"
+
+#: ../../plugins.rst:168 0f77c3c609594768a0aaed6529260b97
+msgid "page_generator_write_page"
+msgstr "page_generator_write_page"
+
+#: ../../plugins.rst:168 0ca5fb200a254cff8529cb5d95e8e26e
+msgid "page_generator, content"
+msgstr "page_generator, content"
+
+#: ../../plugins.rst:168 164d45dac5ab4df8abd898c1466e186d
+msgid "invoked before writing each page, the page is passed as content"
+msgstr "在写入每个页面前调用，页面以内容形式作为参数传入"
+
+#: ../../plugins.rst:169 4780473ba6ae47998f891232f122b34a
+msgid "page_writer_finalized"
+msgstr "page_writer_finalized"
+
+#: ../../plugins.rst:169 6c516a5ae777406ca9ed7bf27b7124c7
+msgid "page_generator, writer"
+msgstr "page_generator, writer"
+
+#: ../../plugins.rst:169 e8978d0fb878427cbf686608c593aa67
+msgid ""
+"invoked after all pages have been written, but before the page generator "
+"is closed."
+msgstr "调用于所有页面写入完成后，在页面generator关闭前。"
+
+#: ../../plugins.rst:171 ../../plugins.rst:208 47bf9969c38b4fef9e15e9d7ea67630e
+#: d9a3d5d939d4499b9320ea15dbd3f26e
+msgid "static_generator_context"
+msgstr "static_generator_context"
+
+#: ../../plugins.rst:171 47064012c4e447f5a1f087a7af420f8f
+msgid "static_generator, metadata"
+msgstr "static_generator, metadata"
+
+#: ../../plugins.rst:172 ../../plugins.rst:209 7050e1889934465a8837ba65fa249118
+#: f45c31c591fd450badd89a7f87c6f991
+msgid "static_generator_preread"
+msgstr "static_generator_preread"
+
+#: ../../plugins.rst:172 ../../plugins.rst:175 ../../plugins.rst:176
+#: 1e99fc14855a4a2e8d1f4758e12792d9 45cdf5c2a8d049889b4315d1ea78f462
+#: b7ae37b94f2f44feb24ac32b0cdfa447
+msgid "static_generator"
+msgstr "static_generator"
+
+#: ../../plugins.rst:172 431017db31bf439f8d3fb5e16b020376
+msgid ""
+"invoked before a static file is read in StaticGenerator.generate_context;"
+" use if code needs to do something before every static file is added to "
+"the staticfiles list."
+msgstr ""
+"在StaticGenerator.generate_context读取静态文件前调用，若代码需要在每个静态文件"
+"加入静态文件列表前进行一些修改，就可以使用此信号。"
+
+#: ../../plugins.rst:175 2a380c26f2984e659ec36248a543a4c3
+msgid "static_generator_init"
+msgstr "static_generator_init"
+
+#: ../../plugins.rst:175 832447303775460c83743d831aa58290
+msgid "invoked in the StaticGenerator.__init__"
+msgstr "在StaticGenerator.__init__中调用"
+
+#: ../../plugins.rst:176 b01307445d54485a9036fb0f9619ff78
+msgid "static_generator_finalized"
+msgstr "static_generator_finalized"
+
+#: ../../plugins.rst:176 2f7e7e25668b44fc824bb39270c3de96
+msgid "invoked at the end of StaticGenerator.generate_context"
+msgstr "在StaticGenerator.generate_context的最后调用"
+
+#: ../../plugins.rst:177 2a34785767ee416dbe41a6aa1f7e4ab1
+msgid "content_object_init"
+msgstr "content_object_init"
+
+#: ../../plugins.rst:177 c41d8a8653a94d648b573b5c13db3954
+msgid "content_object"
+msgstr "content_object"
+
+#: ../../plugins.rst:177 379b6d76d2f14d05bf1502d2c55b125f
+msgid "invoked at the end of Content.__init__"
+msgstr "在Content.__init__的最后调用"
+
+#: ../../plugins.rst:178 10761aa6a1d54ee0a28e562bdacffebf
+msgid "content_written"
+msgstr "content_written"
+
+#: ../../plugins.rst:178 001ad90e09ab4b21a702b2ed9771a156
+msgid "path, context"
+msgstr "path, context"
+
+#: ../../plugins.rst:178 69b05b02e1564fe4b48dbd2926fdaec3
+msgid "invoked each time a content file is written."
+msgstr "每一次内容文件写入后调用。"
+
+#: ../../plugins.rst:179 30938518f54f46028c8fd03808471be7
+msgid "feed_generated"
+msgstr "feed_generated"
+
+#: ../../plugins.rst:179 e29bf37e7114454099baa21955b7fce0
+msgid "context, feed"
+msgstr "context, feed"
+
+#: ../../plugins.rst:179 366ba164593242309dab922c36667dc3
+msgid ""
+"invoked each time a feed gets generated. Can be used to modify a feed "
+"object before it gets written."
+msgstr "每个feed生成前调用。可以用于在feed写入前修改之。"
+
+#: ../../plugins.rst:181 0b6d7fc85d374b9c82c60d4a0df69fcd
+msgid "feed_written"
+msgstr "feed_written"
+
+#: ../../plugins.rst:181 d3fdc3a669e9418b9f6e738c549fa151
+msgid "path, context, feed"
+msgstr "path, context, feed"
+
+#: ../../plugins.rst:181 3da952e464034f8c8491caa94f0aec2d
+msgid "invoked each time a feed file is written."
+msgstr "每一个feed文件写入后调用。"
+
+#: ../../plugins.rst:186 24bf768827184a8a9c2ad9d23d3549e4
+msgid ""
+"Avoid ``content_object_init`` signal if you intend to read ``summary`` or"
+" ``content`` properties of the content object. That combination can "
+"result in unresolved links when :ref:`ref-linking-to-internal-content` "
+"(see `pelican-plugins bug #314`_). Use ``_summary`` and ``_content`` "
+"properties instead, or, alternatively, run your plugin at a later stage "
+"(e.g. ``all_generators_finalized``)."
+msgstr ""
+"请避免使用 ``content_object_init`` 信号读取content对象的 ``summary`` 或 "
+"``content`` 属性，这可能导致在 :ref:`ref-linking-to-internal-content` 时无法"
+"解析链接（请参阅 `pelican-plugins bug #314`_ ）。请改用 ``_summary`` 和 "
+"``_content`` 属性，或者就在后续阶段再运行插件（例如 ``all_generators_finalized`` 时）。"
+
+#: ../../plugins.rst:195 9222300d10c74a9eb27fc229488e63a4
+msgid ""
+"After Pelican 3.2, signal names were standardized.  Older plugins may "
+"need to be updated to use the new names:"
+msgstr ""
+"Pelican3.2之后，信号名都进行了标准化，较老的插件可能需要进行更新："
+
+#: ../../plugins.rst:199 2ba779a696064672965e17c70f70d927
+msgid "Old name"
+msgstr "旧名称"
+
+#: ../../plugins.rst:199 d21e933be9064983aa2cfaeca4f00cb9
+msgid "New name"
+msgstr "新名称"
+
+#: ../../plugins.rst:201 805ac7c62fc94113a3481890793f5417
+msgid "article_generate_context"
+msgstr "article_generate_context"
+
+#: ../../plugins.rst:202 d6f1a03ae49349b091045c8079b80d44
+msgid "article_generate_finalized"
+msgstr "article_generate_finalized"
+
+#: ../../plugins.rst:203 c967c8322a744c2c970beb6b98b90743
+msgid "article_generate_preread"
+msgstr "article_generate_preread"
+
+#: ../../plugins.rst:204 71adeb83fba74317ad0fac5784612a3d
+msgid "pages_generate_context"
+msgstr "pages_generate_context"
+
+#: ../../plugins.rst:205 d2297a5ec351411e8a66a74d8168caa0
+msgid "pages_generate_preread"
+msgstr "pages_generate_preread"
+
+#: ../../plugins.rst:206 fb572935b7f445d298ff2c9c89c59c4e
+msgid "pages_generator_finalized"
+msgstr "pages_generator_finalized"
+
+#: ../../plugins.rst:207 0bb615d8a6f643a3a1a9abac2ec4f712
+msgid "pages_generator_init"
+msgstr "pages_generator_init"
+
+#: ../../plugins.rst:208 beddb5f81a62458b87c0703355a7b5a4
+msgid "static_generate_context"
+msgstr "static_generate_context"
+
+#: ../../plugins.rst:209 8fe8895dcb464e11bb01657e975f1352
+msgid "static_generate_preread"
+msgstr "static_generate_preread"
+
+#: ../../plugins.rst:213 44b14caddfd245c18cacd755fd0023e9
+msgid "Recipes"
+msgstr "具体使用方法举例"
+
+#: ../../plugins.rst:215 c24473f41cc84d028c99fa56af636037
+msgid ""
+"We eventually realised some of the recipes to create plugins would be "
+"best shared in the documentation somewhere, so here they are!"
+msgstr ""
+"下面分享了一些创建插件的具体方法，请享用！"
+
+#: ../../plugins.rst:219 96de26e8150e4339b3461d2dcc478cf3
+msgid "How to create a new reader"
+msgstr "如何创建一个新的reader"
+
+#: ../../plugins.rst:221 3f26c1183b814401b333bbd8528675d9
+msgid ""
+"One thing you might want is to add support for your very own input "
+"format. While it might make sense to add this feature in Pelican core, we"
+" wisely chose to avoid this situation and instead have the different "
+"readers defined via plugins."
+msgstr ""
+"你可能需要添加对输入文件格式的特殊支持。这似乎可以作为Pelican核心的一个功能，"
+"但我们选择避免将此功能放在核心中，而是通过插件实现不同的reader。"
+
+#: ../../plugins.rst:226 8167dcbaa6864da3b2262a2a99e08a15
+msgid ""
+"The rationale behind this choice is mainly that plugins are really easy "
+"to write and don't slow down Pelican itself when they're not active."
+msgstr ""
+"做出这个决定主要是因为实现这样的格式支持插件非常容易，而且这样在不需要此功能时"
+"也不会影响Pelican自身的速度。"
+
+#: ../../plugins.rst:229 26c8185062964b52921860cfa2ce508c
+msgid "No more talking — here is an example::"
+msgstr "多说无益，下面是一个具体例子："
+
+#: ../../plugins.rst:265 ea51efb1925f45e79c87d6e5488cbbcd
+msgid "Adding a new generator"
+msgstr "添加新的generator"
+
+#: ../../plugins.rst:267 9e04f17a5fa1488d82d3629edf8cdf3f
+msgid ""
+"Adding a new generator is also really easy. You might want to have a look"
+" at :doc:`internals` for more information on how to create your own "
+"generator."
+msgstr ""
+"添加一个generator也非常简单，你可能会想要看一看 :doc:`internals` ，其中有关于"
+"如何创建generator的内容。"
+
+#: ../../plugins.rst:281 f4c92958e88a41a7a0deee697b48fc58
+msgid "Adding a new writer"
+msgstr "添加新的writer"
+
+#: ../../plugins.rst:283 188bf0e8a68446458ae525c67cfe098c
+msgid ""
+"Adding a writer will allow you to output additional file formats to disk,"
+" or change how the existing formats are written to disk. Note that only "
+"one writer will be active at a time, so be sure to either subclass the "
+"built-in Writer, or completely re-implement it."
+msgstr ""
+"添加writer可以让你将其他文件格式输出到磁盘，或者可以改变现有格式写入磁盘的方式。"
+"请注意，一次只能启用一个writer，因此请确保继承了内置的Writer，并且完全重新实现之。"
+
+#: ../../plugins.rst:288 edb5d1fa15bc48859c2912ba7c344286
+msgid "Here is a basic example of how to set up your own writer::"
+msgstr "下面是启用你的自定义writer的一个基本例子："
+
+#: ../../plugins.rst:308 0df8f3318357472cbd72e17e1b5085b2
+msgid "Using Plugins to Inject Content"
+msgstr "使用插件添加内容"
+
+#: ../../plugins.rst:310 d0161dbe86c44111a6295259ec8cab54
+msgid ""
+"You can programmatically inject articles or pages using plugins. This can"
+" be useful if you plan to fetch articles from an API, for example."
+msgstr ""
+"可以通过插件以可编程的方式添加文章或页面。如果你打算从某些API获取文章，这就会很有用。"
+
+#: ../../plugins.rst:313 5d5c41dbeb7243d4b497752771bc7858
+msgid ""
+"Following is a simple example of how one can build a plugin that injects "
+"a custom article, using the ``article_generator_pretaxonomy`` signal::"
+msgstr ""
+"下面是一个简单的示例，说明了如何使用 ``article_generator_pretaxonomy`` "
+"信号构建一个添加自定义文章的插件："
diff --git a/docs/locale/zh_CN/LC_MESSAGES/publish.po b/docs/locale/zh_CN/LC_MESSAGES/publish.po
new file mode 100644
index 00000000..afb626f6
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/publish.po
@@ -0,0 +1,329 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"PO-Revision-Date: 2024-06-25 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../publish.rst:2 65617cfb871b492589d55186b708a1ce
+msgid "Publish your site"
+msgstr "发布站点"
+
+#: ../../publish.rst:7 dc4c9b1c1afd477d906b892dc592bdcd
+msgid "Site generation"
+msgstr "站点生成"
+
+#: ../../publish.rst:9 610c37360e2b49ec8ea630ddc224d2b7
+msgid ""
+"Once Pelican is installed and you have some content (e.g., in Markdown or"
+" reST format), you can convert your content into HTML via the ``pelican``"
+" command, specifying the path to your content and (optionally) the path "
+"to your :doc:`settings<settings>` file::"
+msgstr ""
+"您应该已经安装好Pelican并且已经创作了一些内容了吧（以Markdown或是reST格式），"
+"现在就可以将这些内容通过 ``pelican`` 命令转换为HTML了，在转换时需要指定"
+"创作内容存放的路径；如果有需要， :doc:`配置<settings>` 文件的路径也可单独指定："
+
+#: ../../publish.rst:16 6f353c84f5204d2b84c49d1557010b19
+msgid ""
+"The above command will generate your site and save it in the ``output/`` "
+"folder, using the default theme to produce a simple site. The default "
+"theme consists of very simple HTML without styling and is provided so "
+"folks may use it as a basis for creating their own themes."
+msgstr ""
+"上面的指令会在 ``output/`` 目录下生成站点，使用的是默认的主题。默认主题只使用"
+"一些简单的HTML并且不包含样式，大家往往以这个简单主题为基础来创作自己的主题。"
+
+#: ../../publish.rst:21 bb5064d57ed144e6b85d7d3d0938f91c
+msgid ""
+"You can also tell Pelican to watch for your modifications, instead of "
+"manually re-running it every time you want to see your changes. To enable"
+" this, run the ``pelican`` command with the ``-r`` or ``--autoreload`` "
+"option. On non-Windows environments, this option can also be combined "
+"with the ``-l`` or ``--listen`` option to simultaneously both auto-"
+"regenerate *and* serve the output at http://localhost:8000::"
+msgstr ""
+"你也可以让Pelican来监听对源内容文件的修改，而不是在每次修改内容后重新手动执行命令"
+"来生成站点。在执行 ``pelican`` 命令时，加上 ``-r`` 或者 ``--autoreload`` 选项"
+"就可以做到这一点。在非Windows环境下，这个选项还可以和 ``-l`` 或 ``--listen`` "
+"搭配使用，这样就可以在自动重生成站点的基础上，同时提供在 http://localhost:8000 "
+"上的访问："
+
+#: ../../publish.rst:30 40089a6762204e27bd16afaa038a8277
+msgid ""
+"Pelican has other command-line switches available. Have a look at the "
+"help to see all the options you can use::"
+msgstr ""
+"Pelican还有一些其他的命令行选项。可以在帮助中看到所有可用选项："
+
+#: ../../publish.rst:36 4484bb6f6e2b4bd49027c98be4fa2cd8
+msgid "Viewing the generated files"
+msgstr "浏览生成的文件"
+
+#: ../../publish.rst:38 4dc83b844c964bcab17af21fabd5e6b2
+msgid ""
+"The files generated by Pelican are static files, so you don't actually "
+"need anything special to view them. You can use your browser to open the "
+"generated HTML files directly::"
+msgstr ""
+"Pelican生成的文件都是静态的，也就是说不需要使用什么特殊的手段就可以浏览。"
+"您可以直接使用浏览器打开生成的HTML文件："
+
+#: ../../publish.rst:44 c5774634f7da4f64bb7c7d0adbcdb65b
+msgid ""
+"Because the above method may have trouble locating your CSS and other "
+"linked assets, running Pelican's simple built-in web server will often "
+"provide a more reliable previewing experience::"
+msgstr ""
+"事实上，上面所说的直接打开的方式可能会使CSS或其他链接上出现问题，"
+"可以运行Pelican自带的简易web服务器，如此便可以获得可靠的预览体验："
+
+#: ../../publish.rst:50 b2eab6914b854b40bd769433fbad21b7
+msgid ""
+"Once the web server has been started, you can preview your site at: "
+"http://localhost:8000/"
+msgstr ""
+"当web服务器启动后，可以访问 http://localhost:8000/ 来预览您的站点。"
+
+#: ../../publish.rst:54 3b7344cad46a4dfaa01c067dd1f4009b
+msgid "Deployment"
+msgstr "部署"
+
+#: ../../publish.rst:56 de2815c211b84291a985a1d808ffbfe7
+msgid ""
+"After you have generated your site, previewed it in your local "
+"development environment, and are ready to deploy it to production, you "
+"might first re-generate your site with any production-specific settings "
+"(e.g., analytics, feeds, etc.) that you may have defined::"
+msgstr ""
+"当您生成好站点后，可以在本地先进行预览，确认无误后，在部署前可能还需使用"
+"生产环境特定的配置文件重新生成站点："
+
+#: ../../publish.rst:63 56e568114b72443ebcf1f741f07504dc
+msgid ""
+"To base your publish configuration on top of your ``pelicanconf.py``, you"
+" can import your ``pelicanconf`` settings by including the following line"
+" in your ``publishconf.py``::"
+msgstr ""
+"您可以基于 ``pelicanconf.py`` 进行设置文件的配置， 在 ``publishconf.py`` "
+"中import ``pelicanconf`` 就可实现（译者注：配置文件其实本质上就是一些"
+"Python变量，因此import后就可以全部引入）："
+
+#: ../../publish.rst:69 b9e1243ed9ba409890d86ef8ff85499d
+msgid ""
+"If you have generated a ``publishconf.py`` using ``pelican-quickstart``, "
+"this line is included by default."
+msgstr ""
+"如果 ``publishconf.py`` 是通过 ``pelican-quickstart`` 生成的，上面这行默认就有。"
+
+#: ../../publish.rst:72 39671d42b0bb4c828fc51c63c351402c
+msgid ""
+"The steps for deploying your site will depend on where it will be hosted."
+" If you have SSH access to a server running Nginx or Apache, you might "
+"use the ``rsync`` tool to transmit your site files::"
+msgstr ""
+"部署站点的方法步骤取决于网站托管的位置。对于使用SSH访问的运行着Nginx或"
+"Apache的服务器，您可能需要使用 ``rsync`` 工具来传输站点文件："
+
+#: ../../publish.rst:78 523ed256e0164a968d8580310e4a9304
+msgid ""
+"There are many other deployment options, some of which can be configured "
+"when first setting up your site via the ``pelican-quickstart`` command. "
+"See the :doc:`Tips<tips>` page for detail on publishing via GitHub Pages."
+msgstr ""
+"还有很多其他的部署方式供您选择，有一些在第一次通过 ``pelican-quickstart`` "
+"命令建立站点时就已经配置。在 :doc:`小技巧<tips>` 中可以查看如何通过"
+"Github Pages部署站点。"
+
+#: ../../publish.rst:83 c44ecc79922d419b8627706a6694dd8c
+msgid "Automation"
+msgstr "自动化"
+
+#: ../../publish.rst:85 b892dcba14a84306aa6b39295b5f81e3
+msgid ""
+"While the ``pelican`` command is the canonical way to generate your site,"
+" automation tools can be used to streamline the generation and "
+"publication flow. One of the questions asked during the ``pelican-"
+"quickstart`` process pertains to whether you want to automate site "
+"generation and publication. If you answered \"yes\" to that question, a "
+"``tasks.py`` and ``Makefile`` will be generated in the root of your "
+"project. These files, pre-populated with certain information gleaned from"
+" other answers provided during the ``pelican-quickstart`` process, are "
+"meant as a starting point and should be customized to fit your particular"
+" needs and usage patterns. If you find one or both of these automation "
+"tools to be of limited utility, these files can be deleted at any time "
+"and will not affect usage of the canonical ``pelican`` command."
+msgstr ""
+"``pelican`` 命令是生成站点的标准方法，但同时也有自动化工具可以用来简化生成与"
+"发布流程。在 ``pelican-quickstart`` 的过程中，其中一个问题就是是否启用自动站点"
+"生成与发布。若您选择了 “yes”，在项目的根目录中就会生成 ``tasks.py`` "
+"和 ``Makefile`` 。这些文件中预填充了一些从 ``pelican-quickstart`` 过程中"
+"收集的信息，您应该从这个生成好的文件出发，再根据实际需要进一步修改。"
+"另外，如果您认为这些自动化脚本文件没什么用，完全可以将他们删除，这不会对标准命令 "
+"``pelican`` 产生任何影响。"
+
+#: ../../publish.rst:98 4c49ca3a24e3462a984dda738875ed4e
+msgid ""
+"Following are automation tools that \"wrap\" the ``pelican`` command and "
+"can simplify the process of generating, previewing, and uploading your "
+"site."
+msgstr ""
+"下面是一些自动化工具，其中包装了 ``pelican`` 命令，可以用于简化生成、预览和"
+"上传站点的过程。"
+
+#: ../../publish.rst:102 103fb7405038442aae62b62ea0fcdbe5
+msgid "Invoke"
+msgstr "Invoke"
+
+#: ../../publish.rst:104 d3e46bf8da96489e923f6497e8932538
+msgid ""
+"The advantage of Invoke_ is that it is written in Python and thus can be "
+"used in a wide range of environments. The downside is that it must be "
+"installed separately. Use the following command to install Invoke, "
+"prefixing with ``sudo`` if your environment requires it::"
+msgstr ""
+"Invoke_ 工具使用Python作为编程语言，并且能够用在很多不同的环境中。它需要使用"
+"下面的命令单独安装，在某些操作系统中可能需要在前面加上 ``sudo`` ："
+
+#: ../../publish.rst:111 786359d08e8f45598df7b1c45e32ca0a
+msgid ""
+"Take a moment to open the ``tasks.py`` file that was generated in your "
+"project root. You will see a number of commands, any one of which can be "
+"renamed, removed, and/or customized to your liking. Using the out-of-the-"
+"box configuration, you can generate your site via::"
+msgstr ""
+"可以打开 ``tasks.py`` 文件看看其中的代码，可以尝试更改和删除其中的命令，"
+"也可以按照您的喜好自行进行其他修改。生成好的文件是开箱即用的，您可以通过"
+"下面的命令生成站点："
+
+#: ../../publish.rst:118 ../../publish.rst:166 04c6045b58c24bc1a1fd594cdcf4ef5c
+#: 1e9cf29276ec4446b1b0f4a55a1ef4b8
+msgid ""
+"If you'd prefer to have Pelican automatically regenerate your site every "
+"time a change is detected (which is handy when testing locally), use the "
+"following command instead::"
+msgstr ""
+"若您希望Pelican在检测到变化时自动重新生成站点（在本地测试的时候很实用），"
+"可以使用下面的命令："
+
+#: ../../publish.rst:124 ../../publish.rst:172 fabe0ce08eca4c5ebd9ca65898dab138
+#: ff42351e29b944a59e8df22b1cbb20f5
+msgid ""
+"To serve the generated site so it can be previewed in your browser at "
+"http://localhost:8000/::"
+msgstr ""
+"下面的命令则可以让您在生成后通过浏览器访问 http://localhost:8000/ 来预览站点"
+
+#: ../../publish.rst:129 e1b12a6c64b246f89aea105b8d7febbc
+msgid ""
+"To serve the generated site with automatic browser reloading every time a"
+" change is detected, first ``python -m pip install livereload``, then use"
+" the following command::"
+msgstr ""
+"在每次检测到修改重生成站点后，可以让浏览器自动进行重载。先运行 "
+"``python -m pip install livereload`` 安装，再运行下面的这条命令就可以实现："
+
+#: ../../publish.rst:135 bf0d6c7770fe4a399b81b9ebdd48fa4e
+msgid ""
+"If during the ``pelican-quickstart`` process you answered \"yes\" when "
+"asked whether you want to upload your site via SSH, you can use the "
+"following command to publish your site via rsync over SSH::"
+msgstr ""
+"如果在 ``pelican-quickstart`` 过程中，对是否要通过SSH上传站点问题回答了“yes”，"
+"您就可以使用下面的命令借助rsync在SSH上发布站点："
+
+#: ../../publish.rst:141 9bea9f82ce164ee5ba07349a4c4d58ea
+msgid ""
+"These are just a few of the commands available by default, so feel free "
+"to explore ``tasks.py`` and see what other commands are available. More "
+"importantly, don't hesitate to customize ``tasks.py`` to suit your "
+"specific needs and preferences."
+msgstr ""
+"默认就可以使用的命令远不止这些，在 ``tasks.py`` 中可以找到更多可用的命令。"
+"更重要的是，当您有特定需求和偏好时，直接修改 ``tasks.py`` 即可。"
+
+#: ../../publish.rst:147 06a6e7232c6243d79ab9f43ddc28590d
+msgid "Make"
+msgstr "Make"
+
+#: ../../publish.rst:149 a2a5b589cf804fcd83ee2d0fbf98c12d
+msgid ""
+"A ``Makefile`` is also automatically created for you when you say \"yes\""
+" to the relevant question during the ``pelican-quickstart`` process. The "
+"advantage of this method is that the ``make`` command is built into most "
+"POSIX systems and thus doesn't require installing anything else in order "
+"to use it. The downside is that non-POSIX systems (e.g., Windows) do not "
+"include ``make``, and installing it on those systems can be a non-trivial"
+" task."
+msgstr ""
+"``Makefile`` 也是自动生成的。在大多数POSIX系统中都内置了 ``make`` 命令，"
+"无需安装即可使用。但在非POSIX系统（例如Windows）中并没有 ``make`` ，在这些"
+"系统中安装 ``make`` 则往往比较麻烦。"
+
+#: ../../publish.rst:156 68c38c3eb34e4e6ca9cd4a2d3646d5cb
+msgid ""
+"If you want to use ``make`` to generate your site using the settings in "
+"``pelicanconf.py``, run::"
+msgstr ""
+"使用 ``make`` 命令是以 ``pelicanconf.py`` 作为配置文件来生成站点的："
+
+#: ../../publish.rst:161 133e6e1ebf92412a85eedbe56e0b91af
+msgid ""
+"To generate the site for production, using the settings in "
+"``publishconf.py``, run::"
+msgstr ""
+"使用 ``publishconf.py`` 作为配置文件来为生产环境生成站点："
+
+#: ../../publish.rst:177 f4e250949c2145ceb03b65c875767abc
+msgid ""
+"Normally you would need to run ``make regenerate`` and ``make serve`` in "
+"two separate terminal sessions, but you can run both at once via::"
+msgstr ""
+"一般来说， ``make regenerate`` 和 ``make serve`` 需要在分别在单独的终端会话中"
+"运行，下面的命令相当于同时运行上述两个命令："
+
+#: ../../publish.rst:182 1f83bbcf60134eef959370bb5ca402d9
+msgid ""
+"The above command will simultaneously run Pelican in regeneration mode as"
+" well as serve the output at http://localhost:8000."
+msgstr ""
+"上面的命令会让Pelican在重生成模式下持续运行，同样地，您可以通过 "
+"http://localhost:8000 访问生成的站点。"
+
+#: ../../publish.rst:185 9274a68b1e3b4639bf638a044eda613d
+msgid ""
+"When you're ready to publish your site, you can upload it via the "
+"method(s) you chose during the ``pelican-quickstart`` questionnaire. For "
+"this example, we'll use rsync over ssh::"
+msgstr ""
+"当准备好发布站点时，可以使用在 ``pelican-quickstart`` 过程中选择的方法进行上传。"
+"下面的例子使用rsync在ssh上完成这一工作："
+
+#: ../../publish.rst:191 9d7e7927c183491f981aacebe14e5bf1
+msgid "That's it! Your site should now be live."
+msgstr "OK！您的站点现在已经可以访问了。"
+
+#: ../../publish.rst:193 8f570acd5f494f5b9645fdbca6db6fbb
+msgid ""
+"(The default ``Makefile`` and ``devserver.sh`` scripts use the ``python``"
+" and ``pelican`` executables to complete its tasks. If you want to use "
+"different executables, such as ``python3``, you can set the ``PY`` and "
+"``PELICAN`` environment variables, respectively, to override the default "
+"executable names.)"
+msgstr ""
+"（默认的 ``Makefile`` 和 ``devserver.sh`` 脚本执行 ``python`` 和 ``pelican`` "
+"来完成任务。若您希望使用其他的可执行文件，例如 ``python3`` ，设置环境变量 ``PY`` "
+"和 ``PELICAN`` 来覆盖默认的可执行文件名）"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/quickstart.po b/docs/locale/zh_CN/LC_MESSAGES/quickstart.po
new file mode 100644
index 00000000..42ad4387
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/quickstart.po
@@ -0,0 +1,151 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"PO-Revision-Date: 2024-06-25 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../quickstart.rst:2 e5f32d61440744aab3f878488ef9e1e3
+msgid "Quickstart"
+msgstr "快速开始"
+
+#: ../../quickstart.rst:4 d3762ec7c3934f85b25b04cf4024a90c
+msgid ""
+"Reading through all the documentation is highly recommended, but for the "
+"truly impatient, following are some quick steps to get started."
+msgstr ""
+"强烈建议将所有文档完整地看一遍，但如果您目前没空，下面的步骤可以帮助您快速开始"
+"使用Pelican。"
+
+#: ../../quickstart.rst:8 c5982d5ecf7c445590254370b84995be
+msgid "Installation"
+msgstr "安装"
+
+#: ../../quickstart.rst:10 fda7d08c05f14e2fa0c07a4a1d216db5
+msgid ""
+"Install Pelican (and optionally Markdown if you intend to use it) on "
+"Python |min_python| by running the following command in your preferred "
+"terminal, prefixing with ``sudo`` if permissions warrant::"
+msgstr ""
+"在命令行中执行下面的命令以安装Pelican（如果您需要Markdown支持的话，也可以同时安装之）。"
+"Pelican需要使用 |min_python| 以上版本的Python。在必要情况下，请在命令前加上 ``sudo`` 。"
+
+#: ../../quickstart.rst:17 9db650d9dc9d4ac48df4dd9fc0a246ac
+msgid "Create a project"
+msgstr "创建项目"
+
+#: ../../quickstart.rst:19 2e9a72a878754604abdb27d9ec37937e
+msgid ""
+"First, choose a name for your project, create an appropriately-named "
+"directory for your site, and switch to that directory::"
+msgstr ""
+"首先，给您的项目想个名字，并以合适的名字创建一个文件夹来存放您的站点。"
+"接着，进入这个新创建的文件夹："
+
+#: ../../quickstart.rst:25 da759420dd8440b485936a5a054f142a
+msgid ""
+"Create a skeleton project via the ``pelican-quickstart`` command, which "
+"begins by asking some questions about your site::"
+msgstr ""
+"通过 ``pelican-quickstart`` 命令创建一个项目的框架，执行这个命令后，"
+"您需要输入一些站点相关的信息："
+
+#: ../../quickstart.rst:30 eb2d702c9f5a4981a93f805e98674cfe
+msgid ""
+"For questions that have default values denoted in brackets, feel free to "
+"use the Return key to accept those default values [#tzlocal_fn]_. When "
+"asked for your URL prefix, enter your domain name as indicated (e.g., "
+"``https://example.com``)."
+msgstr ""
+"对于那些在括号中写了默认值的问题，完全可以直接回车以使用预设值 [#tzlocal_fn]_。"
+"在输入站点URL的前缀（prefix）时，请根据提示的格式输入站点的域名（例如 "
+"``https://example.com``）。"
+
+#: ../../quickstart.rst:36 66d29d63cce0488a8ec9e43ce97035f9
+msgid "Create an article"
+msgstr "创作文章"
+
+#: ../../quickstart.rst:38 03af35552ef84e4491b46d8bf8c0f51e
+msgid ""
+"You cannot run Pelican until you have created some content. Use your "
+"preferred text editor to create your first article with the following "
+"content::"
+msgstr ""
+"您可以使用喜欢的文本编辑器来创建第一篇文章。下面是一个样例，可以将它作为您的第一篇文章："
+
+#: ../../quickstart.rst:47 165d46a3f9da4f949375c70115fdeb3b
+msgid ""
+"Given that this example article is in Markdown format, save it as "
+"``~/projects/yoursite/content/keyboard-review.md``."
+msgstr ""
+"上面这篇文章是以Markdown的格式完成的，一定要将其保存在站点目录的content文件夹下，例如 "
+"``~/projects/yoursite/content/keyboard-review.md``。"
+
+#: ../../quickstart.rst:51 5cc306848439434f81708eddee812f0e
+msgid "Generate your site"
+msgstr "生成站点"
+
+#: ../../quickstart.rst:53 03037d0c3b0b4a64b957f8284f008c9d
+msgid ""
+"From your project root directory, run the ``pelican`` command to generate"
+" your site::"
+msgstr ""
+"在项目的根目录下，直接运行命令 ``pelican`` 就可以生成您自己的站点了："
+
+#: ../../quickstart.rst:57 abadae17b6f94e36b8603bad69f6e24f
+msgid ""
+"Your site has now been generated inside the ``output/`` directory. (You "
+"may see a warning related to feeds, but that is normal when developing "
+"locally and can be ignored for now.)"
+msgstr ""
+"站点会生成在 ``output/`` 目录下。（此时可能会显示和feeds有关的警告，这和当前的"
+"本地开发环境有关，目前可以忽略之）"
+
+#: ../../quickstart.rst:62 7cf36e609f544f02a0c800f8412cf79c
+msgid "Preview your site"
+msgstr "预览站点"
+
+#: ../../quickstart.rst:64 1a64015c5cc9401bac0a6ac953164fb3
+msgid ""
+"Open a new terminal session, navigate to your project root directory, and"
+" run the following command to launch Pelican's web server::"
+msgstr ""
+"打开一个新的命令行，进入刚才项目的根目录，执行下面的命令以运行一个Pelican web服务器："
+
+#: ../../quickstart.rst:69 eb286b4785304d22a46e90884d26de07
+msgid "Preview your site by navigating to http://localhost:8000/ in your browser."
+msgstr "打开浏览器，进入 http://localhost:8000/ 就可以看到刚刚生成的站点了。"
+
+#: ../../quickstart.rst:71 1dc30b5cb267402c9da251303ff59dbf
+msgid ""
+"Continue reading the other documentation sections for more detail, and "
+"check out the Pelican wiki's Tutorials_ page for links to community-"
+"published tutorials."
+msgstr ""
+"请继续阅读文档中的其他部分来了解Pelican的更多用法，也可以前往Pelican的"
+"wiki 教程_ 页面获取社区发布的教程。"
+
+#: ../../quickstart.rst:78 6c135ea1cbb44400b446c0f9074e0fc5
+msgid "Footnotes"
+msgstr "脚注"
+
+#: ../../quickstart.rst:80 911df4217fd94e6184502153ed0e53dc
+msgid ""
+"You can help localize default fields by installing the optional `tzlocal "
+"<https://pypi.org/project/tzlocal/>`_ module."
+msgstr ""
+"您可以安装可选模块 `tzlocal <https://pypi.org/project/tzlocal/>`_ 来"
+"本地化默认字段。"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/report.po b/docs/locale/zh_CN/LC_MESSAGES/report.po
new file mode 100644
index 00000000..6cbab7f7
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/report.po
@@ -0,0 +1,249 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../report.rst:2 bc25575efa494c7b9455e02eb5c514ab
+msgid "Some history about Pelican"
+msgstr "Pelican的一些历史"
+
+#: ../../report.rst:6 959bbe068d2e4fd19e48be22706070d2
+msgid ""
+"This page comes from a report the original author (Alexis Métaireau) "
+"wrote right after writing Pelican, in December 2010. The information may "
+"not be up-to-date."
+msgstr ""
+"此页面来自原作者 Alexis Métaireau 在2010年12月完成Pelican后作的一篇报告，因此"
+"其中涉及的具体内容可能和最新的Pelican有些出入。"
+
+#: ../../report.rst:10 598beb4776eb4a7bb1c928979752b1f1
+msgid ""
+"Pelican is a simple static blog generator. It parses markup files "
+"(Markdown or reStructuredText for now) and generates an HTML folder with "
+"all the files in it. I've chosen to use Python to implement Pelican "
+"because it seemed to be simple and to fit to my needs. I did not wanted "
+"to define a class for each thing, but still wanted to keep my things "
+"loosely coupled. It turns out that it was exactly what I wanted. From "
+"time to time, thanks to the feedback of some users, it took me a very few"
+" time to provide fixes on it. So far, I've re-factored the Pelican code "
+"by two times; each time took less than 30 minutes."
+msgstr ""
+"Pelican是一个简单的静态博客生成器。它解析标记文件（目前主要是Markdown和"
+"reStructuredText），并生成一个文件夹，其中包含了对应于标记文件的HTML。由于Python"
+"很简单并且符合需求，我选择使用Python来实现Pelican。我不想为每个东西定义一个类，"
+"但同时又想要各部件之间低耦合。事实证明，这正是我想要的。在发展过程中，多亏了用户"
+"给的反馈，我花了些时间修复了一些问题。到目前为止，我已经将Pelican的代码重构了两次，"
+"每次重构都不会超过30分钟。"
+
+#: ../../report.rst:21 1709ab99c3144cb692afd1d1bc388921
+msgid "Use case"
+msgstr "使用场景"
+
+#: ../../report.rst:23 119f315a8e6c409d98783a636ac2147c
+msgid ""
+"I was previously using WordPress, a solution you can host on a web server"
+" to manage your blog. Most of the time, I prefer using markup languages "
+"such as Markdown or reStructuredText to type my articles. To do so, I use"
+" vim. I think it is important to let the people choose the tool they want"
+" to write the articles. In my opinion, a blog manager should just allow "
+"you to take any kind of input and transform it to a weblog. That's what "
+"Pelican does. You can write your articles using the tool you want, and "
+"the markup language you want, and then generate a static HTML weblog."
+msgstr ""
+"我之前使用的是WordPress，你可以将它部署在Web服务器上来管理博客。大多数时候，"
+"我更喜欢使用Markdown或reStructuredText等标记语言来撰写文章。为此，我一般用vim"
+"来写这些文章。我认为让大家自行选择用于写文章的工具是很重要的。在我看来，博客管理器"
+"应该能够接受任何类型的输入并将其转换为博客站。Pelican就采取这一思想。您可以选择自己"
+"喜欢的工具以及标记语言来撰写文章，然后生成静态的HTML博客站。"
+
+#: ../../report.rst:34 1a087a07690c4c35873a7f4ce18ba52b
+msgid ""
+"To be flexible enough, Pelican has template support, so you can easily "
+"write your own themes if you want to."
+msgstr ""
+"为了足够的灵活性，Pelican中支持使用模板，这样你就可以编写自己的主题了。"
+
+#: ../../report.rst:38 fca5a0962a0d4c27aa163f2aec94b1cf
+msgid "Design process"
+msgstr "设计过程"
+
+#: ../../report.rst:40 073dd0b024fa4701acc0078b84c45648
+msgid ""
+"Pelican came from a need I have. I started by creating a single file "
+"application, and I have make it grow to support what it does by now. To "
+"start, I wrote a piece of documentation about what I wanted to do. Then, "
+"I created the content I wanted to parse (the reStructuredText files) and "
+"started experimenting with the code. Pelican was 200 lines long and "
+"contained almost ten functions and one class when it was first usable."
+msgstr ""
+"Pelican来源于我的需求。从单文件应用程序出发，不断成长为现在功能丰富的应用。首先，我"
+"写了一份需求文档；然后创建了我想要解析的内容（reStructuredText文件），并开始"
+"实验性的编写代码。Pelican的第一个能够使用的版本包含了200行代码、10个函数以及1个类。"
+
+#: ../../report.rst:47 f407fc9ad9434f1082014eeca8c4cc89
+msgid ""
+"I have been facing different problems all over the time and wanted to add"
+" features to Pelican while using it. The first change I have done was to "
+"add the support of a settings file. It is possible to pass the options to"
+" the command line, but can be tedious if there is a lot of them. In the "
+"same way, I have added the support of different things over time: Atom "
+"feeds, multiple themes, multiple markup support, etc. At some point, it "
+"appears that the \"only one file\" mantra was not good enough for "
+"Pelican, so I decided to rework a bit all that, and split this in "
+"multiple different files."
+msgstr ""
+"我不断遇到各种问题，在使用过程中还想要往Pelican中添加功能。在对代码的第一次修改中，"
+"添加了对配置文件的支持。虽然可以在命令行中往里传入选项，但当配置项多起来后，就会变得"
+"异常冗长。同样地，Pelican支持了越来越多的功能：Atom订阅源、多主体支持、多标记语言"
+"支持等等。在某一时刻，单文件应用已经不适合Pelican了，因此我决定多做些工作，将应用分离"
+"到多个文件中。"
+
+#: ../../report.rst:56 57b3d1ba492646e28e20396b78df8ea0
+msgid "I’ve separated the logic in different classes and concepts:"
+msgstr "我将系统整体逻辑分为如下几个类和概念："
+
+#: ../../report.rst:58 2d4090dba6674569a7e1088919185aa5
+msgid ""
+"*writers* are responsible of all the writing process of the files. They "
+"are responsible of writing .html files, RSS feeds and so on. Since those "
+"operations are commonly used, the object is created once, and then passed"
+" to the generators."
+msgstr ""
+"**Writers** 负责文件的写入工作，即负责完成 html、RSS订阅源等文件的写入。因为这些"
+"操作都是比较常用的，这个类只会被创建一次，然后再传给Generators。"
+
+#: ../../report.rst:63 a4cff6dceb8f430791edaeb3b2280924
+msgid ""
+"*readers* are used to read from various formats (Markdown and "
+"reStructuredText for now, but the system is extensible). Given a file, "
+"they return metadata (author, tags, category, etc) and content (HTML "
+"formatted)."
+msgstr ""
+"**Readers** 用于读取不同格式的文件（目前支持Markdown、reStructuredText，"
+"但可以继续扩展）。向 **Readers** 输入一个文件，它会返回文档的元数据（作者、标签、"
+"分类等等）与HTML格式的文档正文内容。"
+
+#: ../../report.rst:67 6ed9719c06c2477ea05ea30e4806ad14
+msgid ""
+"*generators* generate the different outputs. For instance, Pelican comes "
+"with an ArticlesGenerator and PagesGenerator, into others. Given a "
+"configuration, they can do whatever you want them to do. Most of the time"
+" it's generating files from inputs (user inputs and files)."
+msgstr ""
+"**Generators** 用以生成不同的输出，Pelican自带了 ``ArticlesGenerator`` 和 "
+"``PageGenerator`` 。给定一套配置信息， **Generators** 可以做几乎任何事。"
+"但大多数情况下，它的工作就是从输入生成文件。"
+
+#: ../../report.rst:72 cb5129c105b04d788a908f580a83e7e1
+msgid ""
+"I also deal with contents objects. They can be ``Articles``, ``Pages``, "
+"``Quotes``, or whatever you want. They are defined in the ``contents.py``"
+" module and represent some content to be used by the program."
+msgstr ""
+"同样，还要处理正文对象。正文对象可以是 ``Articles`` 、 ``Pages`` 、 ``Quotes`` "
+"或者其他你想要的类型。这些对象在 ``contents.py`` 模块中完成定义，同时代表了应用中"
+"使用到的内容。"
+
+#: ../../report.rst:77 4123da2b628448359aa9ed20b2ca87d2
+msgid "In more detail"
+msgstr "更细节的内容"
+
+#: ../../report.rst:79 8482492940524edf8244fc220553cd3c
+msgid "Here is an overview of the classes involved in Pelican."
+msgstr "以下是Pelican中涉及的类的概述。"
+
+#: ../../report.rst:83 a8a39a1ccc154604b8bb000dff44982d
+msgid ""
+"The interface does not really exist, and I have added it only to clarify "
+"the whole picture. I do use duck typing and not interfaces."
+msgstr ""
+"上图中的接口事实上并不存在，我是为了整张图的完整性才加上去的。在实际实现中，使用了"
+"鸭子类型而不是接口。"
+
+#: ../../report.rst:86 889dfae0dc4242f0b21ce831c7172001
+msgid "Internally, the following process is followed:"
+msgstr "应用内部按以下流程进行处理："
+
+#: ../../report.rst:88 fc5cbf8ca65c456c90c56c00cf5ab93f
+msgid ""
+"First of all, the command line is parsed, and some content from the user "
+"is used to initialize the different generator objects."
+msgstr ""
+"首先，解析命令行，并根据用户给入的一些内容来初始化不同的generator对象。"
+
+#: ../../report.rst:91 5d0c1dc643364248820fad76c204f663
+msgid ""
+"A ``context`` is created. It contains the settings from the command line "
+"and a settings file if provided."
+msgstr ""
+"创建一个 ``context`` ，其中包含了来自命令行和文件的配置信息。"
+
+#: ../../report.rst:93 36725875f2c14e0bb8fc60b16afa1367
+msgid ""
+"The ``generate_context`` method of each generator is called, updating the"
+" context."
+msgstr ""
+"调用各generator对象的 ``generate_context`` 方法来更新 ``context`` 。"
+
+#: ../../report.rst:95 d50a4b2e38884eb38f1b66fdf7fb1eda
+msgid ""
+"The writer is created and given to the ``generate_output`` method of each"
+" generator."
+msgstr ""
+"创建 **Writers** 并将其给入generator的 ``generate_output`` 方法。"
+
+#: ../../report.rst:98 da8d9096940044f2849112fb5efcb4cb
+msgid ""
+"I make two calls because it is important that when the output is "
+"generated by the generators, the context will not change. In other words,"
+" the first method ``generate_context`` should modify the context, whereas"
+" the second ``generate_output`` method should not."
+msgstr ""
+"由于当generator生成输出时并不会改变上下文，我进行了两次调用。换句话说，第一个方法 "
+"``generate_context`` 会修改上下文，而第二个方法 ``generate_output`` 不会。"
+
+#: ../../report.rst:103 a6350edba931463fb92ae51dd9bc253a
+msgid ""
+"Then, it is up to the generators to do what the want, in the "
+"``generate_context`` and ``generate_content`` method. Taking the "
+"``ArticlesGenerator`` class will help to understand some others concepts."
+" Here is what happens when calling the ``generate_context`` method:"
+msgstr ""
+"然后，事情就取决于各generator在 ``generate_context`` 和 ``generate_content`` "
+"中做的操作了。拿 ``ArticlesGenerator`` 举例可以帮助理解其他的一些概念。下面是调用 "
+"``generate_context`` 方法后会发生的事情："
+
+#: ../../report.rst:108 4b99ddf2cf344d0b8fbd080c15adfb64
+msgid ""
+"Read the folder “path”, looking for restructured text files, load each of"
+" them, and construct a content object (``Article``) with it. To do so, "
+"use ``Reader`` objects."
+msgstr ""
+"读取文件夹路径，查找并加载每个restructured文件，并为每个文件构建一个正文内容对象（ "
+"``Article`` ）。此工作是由 ``Reader`` 对象完成的。"
+
+#: ../../report.rst:111 176a7a5896904f2e9929623ef652660b
+msgid "Update the ``context`` with all those articles."
+msgstr "根据所有的文章更新 ``context`` 。"
+
+#: ../../report.rst:113 bb88942c85004c4c9e0b55a72076b18f
+msgid ""
+"Then, the ``generate_content`` method uses the ``context`` and the "
+"``writer`` to generate the wanted output."
+msgstr ""
+"然后， ``generate_content`` 方法使用 ``context`` 和 ``writer`` 来生成想要的输出。"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/settings.po b/docs/locale/zh_CN/LC_MESSAGES/settings.po
new file mode 100644
index 00000000..36c7209e
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/settings.po
@@ -0,0 +1,1815 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-27 16:18+0800\n"
+"PO-Revision-Date: 2024-06-26 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../settings.rst:2 53029e75034c46d4b54eae3cd205fe2e
+msgid "Settings"
+msgstr "设置"
+
+#: ../../settings.rst:4 dd0b07017437474b99116d1c1927af95
+msgid ""
+"Pelican is configurable thanks to a settings file you can pass to the "
+"command line::"
+msgstr "可以通过命令行给Pelican传入配置文件："
+
+#: ../../settings.rst:9 df860abc6301440b89366f2898aabd6f
+msgid ""
+"If you used the ``pelican-quickstart`` command, your primary settings "
+"file will be named ``pelicanconf.py`` by default."
+msgstr "如果使用的是 ``pelican-quickstart`` 命令，默认的主配置文件时 ``pelicanconf.py`` 。"
+
+#: ../../settings.rst:12 a7b47b4379934afcb2bfd9f5425c4a6c
+msgid ""
+"You can also specify settings via ``-e`` / ``--extra-settings`` option "
+"flags. It will override default settings as well as any defined within "
+"the setting file. Note that values must follow JSON notation::"
+msgstr ""
+"通过 ``-e`` / ``--extra-settings`` "
+"选项，可以直接指定一些配置来覆盖配置文件中的设置。需要注意的是，选项值必须时JSON格式的："
+
+#: ../../settings.rst:18 16437361edd74b8fb84dcde3da35baa3
+msgid ""
+"Environment variables can also be used here but must be escaped "
+"appropriately::"
+msgstr "可以在命令中使用环境变量，但是需要正确地进行转义："
+
+#: ../../settings.rst:24 71a1194ecd1b4a519877818ad172a44f
+msgid ""
+"When experimenting with different settings (especially the metadata ones)"
+" caching may interfere and the changes may not be visible. In such cases "
+"disable caching with ``LOAD_CONTENT_CACHE = False`` or use the "
+"``--ignore-cache`` command-line switch."
+msgstr ""
+"在尝试不同的设置（特别是尝试元数据）时，受缓存的干扰，对设置的更改可能不会生效。在这种情况下，指定 ``LOAD_CONTENT_CACHE = "
+"False`` 设置或 ``--ignore-cache`` 命令行选项即可。"
+
+#: ../../settings.rst:29 3362ac7659744fab9649c7d4edec7456
+msgid ""
+"Settings are configured in the form of a Python module (a file). There is"
+" an `example settings file "
+"<https://github.com/getpelican/pelican/raw/main/samples/pelican.conf.py>`_"
+" available for reference."
+msgstr ""
+"设置以Python模块（一个文件）的形式。 `示例配置文件 "
+"<https://github.com/getpelican/pelican/raw/main/samples/pelican.conf.py>`_"
+" 可供您参考。"
+
+#: ../../settings.rst:34 fd01256fff0d40319c6bd55c3e3d1f8d
+msgid ""
+"To see a list of current settings in your environment, including both "
+"default and any customized values, run the following command (append one "
+"or more specific setting names as arguments to see values for those "
+"settings only)::"
+msgstr "要查看当前环境下的配置，同时查看默认的或是自定义的配置值，执行下面的命令（在后面以参数的形式添加一个或多个指定的配置名称，可以单独查看指定的配置项）:"
+
+#: ../../settings.rst:40 fd4f9ceda04c4b119adf0e6e3226842d
+msgid ""
+"All the setting identifiers must be set in all-caps, otherwise they will "
+"not be processed. Setting values that are numbers (5, 20, etc.), booleans"
+" (True, False, None, etc.), dictionaries, or tuples should *not* be "
+"enclosed in quotation marks. All other values (i.e., strings) *must* be "
+"enclosed in quotation marks."
+msgstr ""
+"所有设置的键（设置中的变量名）都必须是大写的，否则会被无视。配置值可能是数值（5、20等）、布尔值（True、False、None等）、字典或者元组。这些值应该以Python值的形式存在，"
+" *不* 需要用引号引起来。除此之外的其他配置值（例如字符串） *必须* 用引号引起来。"
+
+#: ../../settings.rst:46 aece462c39674aa68651567ca58ac940
+msgid ""
+"Unless otherwise specified, settings that refer to paths can be either "
+"absolute or relative to the configuration file. The settings you define "
+"in the configuration file will be passed to the templates, which allows "
+"you to use your settings to add site-wide content."
+msgstr "除非另有指定，设置中指定的路径可以是绝对路径，也可以是相对于配置文件的相对路径。设置中配置的东西会传递到网站模板中，这使得可以在配置文件中添加在整个站点中都能使用的内容。"
+
+#: ../../settings.rst:51 b3de78704bd34981bce53c625e7181ce
+msgid "Here is a list of settings for Pelican:"
+msgstr "下面是Pelican设置项的列表："
+
+#: ../../settings.rst:55 4a3728c3d465496b903ad3bafef32da9
+msgid "Basic settings"
+msgstr "基础设置"
+
+#: ../../settings.rst:59 74ac50f3d3d847148d37db0c2f4dcb1a
+msgid ""
+"When you don't specify a category in your post metadata, set this setting"
+" to ``True``, and organize your articles in subfolders, the subfolder "
+"will become the category of your post. If set to ``False``, "
+"``DEFAULT_CATEGORY`` will be used as a fallback."
+msgstr ""
+"当您没有在推文中指定元数据categroy时，若本项设置设为了 ``True`` "
+"，并且文章也是通过子文件夹进行分类管理的，那么这些子文件夹的名称就会作为发布内容的分类。若本项设为了 ``False`` ，会使用配置项 "
+"``DEFAULT_CATEGORY`` 作为默认分类。"
+
+#: ../../settings.rst:66 6fd89e4093cf42f7b7a15d12b806ae39
+msgid "The default category to fall back on."
+msgstr "默认的分类"
+
+#: ../../settings.rst:70 dce02cdf67434cc385bf4c1a0ab92931
+msgid ""
+"Whether to display pages on the menu of the template. Templates may or "
+"may not honor this setting."
+msgstr "指定是否将“页面”显示在模板的菜单中。模板可能不会遵循此项。"
+
+#: ../../settings.rst:75 830ab9b9933b488193d4b8afd85e6a31
+msgid ""
+"Whether to display categories on the menu of the template. Templates may "
+"or not honor this setting."
+msgstr "指定是否将“分类”显示在模板的菜单中。模板可能不会遵循此项。"
+
+#: ../../settings.rst:80 01ef16e7f3d7423b96ee3b57b0173ebc
+msgid ""
+"Extra configuration settings for the docutils publisher (applicable only "
+"to reStructuredText). See `Docutils Configuration`_ settings for more "
+"details."
+msgstr "docutils的额外配置项（只针对reStructuredText有效）。在 `Docutils 配置`_ 设置中查看更多信息。"
+
+#: ../../settings.rst:85 f7a9532b08ac43b4a61bd175ec91d66b
+msgid ""
+"Delete the output directory, and **all** of its contents, before "
+"generating new files. This can be useful in preventing older, unnecessary"
+" files from persisting in your output. However, **this is a destructive "
+"setting and should be handled with extreme care.**"
+msgstr ""
+"在生成新文件前删除输出目录和其中 **所有** 的内容。这可以避免一些老的无用的文件一直存在于输出目录中。但是， "
+"**此项配置是具有破坏性的，请谨慎使用** 。"
+
+#: ../../settings.rst:92 ff8c5e50c9ac40bb85e8384fcad6617e
+msgid ""
+"A list of filenames that should be retained and not deleted from the "
+"output directory. One use case would be the preservation of version "
+"control data."
+msgstr "一个文件名的列表，包含了应该保留，不从输出目录中删除的文件。可以用于版本控制数据的保留。"
+
+#: ../../settings.rst:95 ../../settings.rst:110 ../../settings.rst:136
+#: 7ee367e15d2549a5889dee6f67f9d5bf 8befd4f04dcf4f638e6a50972cf62f0e
+#: c5a4d3b37cd94412a6f37c8ad0dae8e1
+msgid "Example::"
+msgstr "例子："
+
+#: ../../settings.rst:101 b188b54ab9bf46898663261c6b0bdbf9
+msgid ""
+"A dictionary of custom Jinja2 environment variables you want to use. This"
+" also includes a list of extensions you may want to include. See `Jinja "
+"Environment documentation`_."
+msgstr "一个字典，用于您想要用的自定义的Jinja2环境变量。这其中也包含了要使用的扩展列表。详见 `Jinja环境文档`_ "
+
+#: ../../settings.rst:107 57cdaaf600bf4c2aa461094e99584b54
+msgid ""
+"A dictionary of custom Jinja2 filters you want to use.  The dictionary "
+"should map the filtername to the filter function."
+msgstr "一个字典，存放自定义的Jinja2过滤器。此字典中应该是过滤器名称到过滤器函数的映射。"
+
+#: ../../settings.rst:118 31c28dcad1a2433784678692606c7407
+msgid "See: `Jinja custom filters documentation`_."
+msgstr "详见： `Jinja自定义过滤器文档`_ 。"
+
+#: ../../settings.rst:122 33098b212ebb4c769d9a7e8e35e22f71
+msgid ""
+"A dictionary of custom objects to map into the Jinja2 global environment "
+"namespace. The dictionary should map the global name to the global "
+"variable/function. See: `Jinja global namespace documentation`_."
+msgstr ""
+"一个字典，可以将自定义对象映射到Jinja2的全局环境命名空间中。字典中应该是全局名称到全局变量/函数的映射。详见： "
+"`Jinja全局命名空间文档`_ 。"
+
+#: ../../settings.rst:128 9d07d4c867f644dbad534da8c17805eb
+msgid ""
+"A dictionary of custom Jinja2 tests you want to use. The dictionary "
+"should map test names to test functions. See: `Jinja custom tests "
+"documentation`_."
+msgstr "一个字典，自定义了要使用的Jinja测试。字典中应该是测试名到测试函数的映射。详见： `Jinja自定义测试文档`_ 。"
+
+#: ../../settings.rst:133 68fca89155b84571bf16ccc9e2d4d2f2
+msgid ""
+"A list of tuples containing the logging level (up to ``warning``) and the"
+" message to be ignored."
+msgstr "一个以元组为元素的列表，元组中包含日志等级（最高到 ``warning``）和要忽略的消息。"
+
+#: ../../settings.rst:142 2052888dbd6c4eb58148d383c23e6670
+msgid ""
+"A dictionary of file extensions / Reader classes for Pelican to process "
+"or ignore."
+msgstr "一个字典，记录了文件扩展名到Reader类的映射。可以据此让Pelican按照指定规则处理或忽略某些文件。"
+
+#: ../../settings.rst:145 5f70a62f7360438eb733791964a66c80
+msgid "For example, to avoid processing .html files, set::"
+msgstr "例如，下面的配置可以让Pelican忽略 .html的文件不处理："
+
+#: ../../settings.rst:149 2d665ed99679489fb6a06fbd30754d6b
+msgid "To add a custom reader for the ``foo`` extension, set::"
+msgstr "为扩展名为 ``foo`` 的文件添加自定义的reader："
+
+#: ../../settings.rst:155 726d7ea5aa2540139b82d68adf424a99
+msgid ""
+"A list of glob patterns.  Files and directories matching any of these "
+"patterns will be ignored by the processor. For example, the default "
+"``['.#*']`` will ignore emacs lock files, and ``['__pycache__']`` would "
+"ignore Python 3's bytecode caches."
+msgstr ""
+"通配符模式的列表。任何匹配上的文件和目录都会被忽略。例如，默认的 ``['.#*']`` 可以忽略emacs的锁定文件，  "
+"``['__pycache__']`` 则可以忽略Python3的字节码缓存文件。"
+
+#: ../../settings.rst:162 39fdbf56f4314015b8c61c7473b7046f
+msgid ""
+"Extra configuration settings for the Markdown processor. Refer to the "
+"Python Markdown documentation's `Options section <https://python-"
+"markdown.github.io/reference/#markdown>`_ for a complete list of "
+"supported options. The ``extensions`` option will be automatically "
+"computed from the ``extension_configs`` option."
+msgstr ""
+"对Markdown处理器的额外配置。可以参考Python Markdown文档的 `选项章节 <https://python-"
+"markdown.github.io/reference/#markdown>`_ ，查看可用选项的完整列表。其中的 "
+"``extensions_configs`` 选项会用于自动计算 ``extensions`` 选项。"
+
+#: ../../settings.rst:168 bcabc42f8a1143f28d39d928a84e5c80
+msgid "Defaults to::"
+msgstr "默认值为："
+
+#: ../../settings.rst:180 dfb5d9dcf9034218a44c38fa5d94b6e4
+msgid ""
+"The dictionary defined in your settings file will replace this default "
+"one."
+msgstr "配置文件中的字典会覆盖默认设置。"
+
+#: ../../settings.rst:185 57124bf26ff24273a9fda76782a551e0
+msgid ""
+"Where to output the generated files. This should correspond to your web "
+"server's virtual host root directory."
+msgstr "输出生成文件的位置。此项配置应该和web服务器虚拟主机的根目录有关。"
+
+#: ../../settings.rst:190 61cce052ae5549f98e48a9da9548b1d4
+msgid ""
+"Path to content directory to be processed by Pelican. If undefined, and "
+"content path is not specified via an argument to the ``pelican`` command,"
+" Pelican will use the current working directory."
+msgstr "待Pelican处理的文件目录的路径。如果没有定义，也没有在 ``pelican`` 命令中通过参数指定，Pelican会默认使用当前工作目录。"
+
+#: ../../settings.rst:196 770d207912f24f7b989208ef921d761c
+msgid ""
+"A list of directories and files to look at for pages, relative to "
+"``PATH``."
+msgstr "此列表中的目录和文件会被视为页面，路径是相对于 ``PATH`` 的。"
+
+#: ../../settings.rst:200 6c39a2bdec444b59b7564f15c161483e
+msgid ""
+"A list of directories to exclude when looking for pages in addition to "
+"``ARTICLE_PATHS``."
+msgstr "除了 ``ARTICLE_PATHS`` 中的文件不会被视为页面外，此选项中也可指定不被视为页面的文件目录。"
+
+#: ../../settings.rst:205 ec472b45d27448538a216960335cede9
+msgid ""
+"A list of directories and files to look at for articles, relative to "
+"``PATH``."
+msgstr "此列表中的目录和文件会被视为文章，路径是相对于 ``PATH`` 的。"
+
+#: ../../settings.rst:210 7d45d3e60d0c4c0e8c75fafc6ee0bf1a
+msgid ""
+"A list of directories to exclude when looking for articles in addition to"
+" ``PAGE_PATHS``."
+msgstr "除了 ``PAGE_PATHS`` 中的文件不会被视为文章外，此选项中也可指定不被视为文章的文件目录。"
+
+#: ../../settings.rst:215 4b3fb145ed814ff49262ce0ad20f711a
+msgid ""
+"Set to True if you want to copy the articles and pages in their original "
+"format (e.g. Markdown or reStructuredText) to the specified "
+"``OUTPUT_PATH``."
+msgstr ""
+"如果你想要将文章和页面以源格式（例如Markdown或reStructuredText）复制一份到 ``OUTPUT_PATH`` "
+"目录中，就将此项设为True。"
+
+#: ../../settings.rst:220 4da18483b371405facd124c3e345594c
+msgid ""
+"Controls the extension that will be used by the SourcesGenerator.  "
+"Defaults to ``.text``. If not a valid string the default value will be "
+"used."
+msgstr "控制会被SourcesGenerator使用的扩展名。默认为 ``.text`` 。如果设置的值是无效的，会使用默认值。"
+
+#: ../../settings.rst:225 86076613fd6d438ab908d53be5422f06
+msgid "The list of plugins to load. See :ref:`plugins`."
+msgstr "要加载的插件列表。详见 :ref:`插件<plugins>` 。"
+
+#: ../../settings.rst:229 208cbbef07c742a3906f604c97a4d332
+msgid "A list of directories where to look for plugins. See :ref:`plugins`."
+msgstr "查找插件的目录列表。详见 :ref:`插件<plugins>` 。"
+
+#: ../../settings.rst:233 265efbdef95744759fea79fd41a4003f
+msgid "Your site name"
+msgstr "站点名称"
+
+#: ../../settings.rst:237 d57d6f99c06b4776b31acc033c97f67b
+msgid ""
+"Base URL of your web site. Not defined by default, so it is best to "
+"specify your SITEURL; if you do not, feeds will not be generated with "
+"properly-formed URLs. If your site is available via HTTPS, this setting "
+"should begin with ``https://`` — otherwise use ``http://``. Then append "
+"your domain, with no trailing slash at the end. Example: ``SITEURL = "
+"'https://example.com'``"
+msgstr ""
+"网站的基URL。此选项没有默认值，因此最好是指定一下SITEURL；如果不指定，feeds就无法正确生成URL。如果站点使用了HTTPS，那么此项设定最好以"
+" ``https://`` 开头；否则使用 ``http://`` 即可。在协议后面接着就是域名，不要以斜杠结尾。一个例子： ``SITEURL "
+"= 'https://example.com'`` "
+
+#: ../../settings.rst:246 d4dd07a95a904806812b20ff3ec3049b
+msgid ""
+"A list of directories (relative to ``PATH``) in which to look for static "
+"files. Such files will be copied to the output directory without "
+"modification. Articles, pages, and other content source files will "
+"normally be skipped, so it is safe for a directory to appear both here "
+"and in ``PAGE_PATHS`` or ``ARTICLE_PATHS``.  Pelican's default settings "
+"include the \"images\" directory here."
+msgstr ""
+"用于查找静态文件的目录列表。静态文件会原封不动地拷贝到输出目录中。文章、页面以及其他的内容源文件都会被跳过，因此一个目录可以安全地同时出现在此选项以及"
+" ``PAGE_PATHS`` 或 ``ARTICLE_PATHS`` 中。Pelican默认会将 \"images\" 目录包含在此选项中。"
+
+#: ../../settings.rst:255 fc85f34c9d9640f48e0c739cc2787847
+msgid "A list of directories to exclude when looking for static files."
+msgstr "此选项列表中的目录都会在搜索静态文件时排除在外。"
+
+#: ../../settings.rst:259 ff6eb957bf36419d8a6a376d3232c117
+msgid ""
+"If set to False, content source files will not be skipped when copying "
+"files found in ``STATIC_PATHS``. This setting is for backward "
+"compatibility with Pelican releases before version 3.5.  It has no effect"
+" unless ``STATIC_PATHS`` contains a directory that is also in "
+"``ARTICLE_PATHS`` or ``PAGE_PATHS``. If you are trying to publish your "
+"site's source files, consider using the ``OUTPUT_SOURCES`` setting "
+"instead."
+msgstr ""
+"如果此选项设为False， ``STATIC_PATHS`` "
+"中的内容源文件将不会被忽略，也会像静态文件一样被原封不动地拷贝。此项设置是为了给3.5版本前的Pelican进行向后兼容的。若某个目录同时出现在了"
+" ``STATIC_PATHS`` 和 ``ARTICLE_PATHS`` 中，或 ``STATIC_PATHS`` 和 "
+"``PAGE_PATHS`` 中时才会生效。如果你是想将站点的源文件发布出去的话，请考虑使用 ``OUTPUT_SOURCES`` 设置。"
+
+#: ../../settings.rst:268 bf1a395929034faca5de2bf94514f5e3
+msgid ""
+"Create links instead of copying files. If the content and output "
+"directories are on the same device, then create hard links.  Falls back "
+"to symbolic links if the output directory is on a different filesystem. "
+"If symlinks are created, don't forget to add the ``-L`` or ``--copy-"
+"links`` option to rsync when uploading your site."
+msgstr ""
+"为静态文件创建链接而不是复制文件本身。如果内容和输出目录位于同一设备上，则创建硬链接；如果输出目录位于不同的文件系统上，则回退至符号链接。若创建了符号链接，使用rsync上传网站时需要添加-L或"
+"--copy-links选项。"
+
+#: ../../settings.rst:276 c1931f5e9644460bb528a831fdd41a59
+msgid ""
+"If set to ``True``, and ``STATIC_CREATE_LINKS`` is ``False``, compare "
+"mtimes of content and output files, and only copy content files that are "
+"newer than existing output files."
+msgstr ""
+"当此项设为 ``True`` 且 ``STATIC_CREATE_LINKS`` 设为 ``False`` "
+"时才会生效，此时会比较mtime，只有在当前文件更新时才会执行拷贝。"
+
+#: ../../settings.rst:282 60d680a3b3f44bd6b4461c92057e4471
+msgid ""
+"If set to True, several typographical improvements will be incorporated "
+"into the generated HTML via the `Typogrify "
+"<https://pypi.org/project/typogrify/>`_ library, which can be installed "
+"via: ``python -m pip install typogrify``"
+msgstr ""
+"若此项设置为True，一些显示上的改进将通过 `Typogrify <https://pypi.org/project/typogrify/>`_"
+" 库合并到生成的HTML中。可以通过 ``python -m pip install typogrify`` 进行安装。"
+
+#: ../../settings.rst:289 db77faf7956845d1a2d4ff9150138017
+msgid ""
+"A list of tags for Typogrify to ignore. By default Typogrify will ignore "
+"``pre`` and ``code`` tags. This requires that Typogrify version 2.0.4 or "
+"later is installed"
+msgstr ""
+"指定Typogrify要忽略的标签列表。默认情况下，Typogrify将忽略 ``pre`` 和 ``code`` "
+"标签此项特性需要安装高于2.0.4版本的Typogrify。"
+
+#: ../../settings.rst:295 8fddf3800e844a189677f113252bee04
+msgid ""
+"This setting controls how Typogrify sets up the Smartypants filter to "
+"interpret multiple dash/hyphen/minus characters. A single ASCII dash "
+"character (``-``) is always rendered as a hyphen. The ``default`` setting"
+" does not handle en-dashes and converts double-hyphens into em-dashes. "
+"The ``oldschool`` setting renders both en-dashes and em-dashes when it "
+"sees two (``--``) and three (``---``) hyphen characters, respectively. "
+"The ``oldschool_inverted`` setting turns two hyphens into an em-dash and "
+"three hyphens into an en-dash."
+msgstr ""
+"此设置用于设置Typogrify的Smartypants过滤器，控制过滤器如何解析多个破折号/连字符/减号。单个ASCII破折号字符 "
+"(``-``) 始终被视为连字符。设为 ``default`` 时不处理短破折号，并会将双连字符转换为长破折号；设为 ``oldschool`` "
+"时会将两个 ( ``--`` ) 和三个 ( ``--`` ) 连字符分别呈现为短破折号和长破折号；设为 "
+"``oldschool_inverted`` 时则会将两个连字符转换为长破折号，而将三个连字符转换为短破折号。"
+
+#: ../../settings.rst:306 c110b209965c448c8e3ca4109edfa0d6
+msgid ""
+"When creating a short summary of an article, this will be the default "
+"length (measured in words) of the text created.  This only applies if "
+"your content does not otherwise specify a summary. Setting to ``None`` "
+"will cause the summary to be a copy of the original content."
+msgstr ""
+"当未给文章或页面书写摘要时，会自动创建摘要，此设置指定了默认创建摘要的长度"
+"（以字/词为单位）。若将此项设为 ``None`` ，摘要会和原始内容一模一样。"
+
+#: ../../settings.rst:313 9d446d0be4d248e1b5ef7f5df1977310
+msgid ""
+"When creating a short summary of an article, this will be the number of "
+"paragraphs to use as the summary. This only applies if your content does "
+"not otherwise specify a summary. Setting to ``None`` will cause the "
+"summary to use the whole text (up to ``SUMMARY_MAX_LENGTH``) instead of "
+"just the first N paragraphs."
+msgstr ""
+"当未给文章或页面书写摘要时，会自动创建摘要。此设置指定了默认创建摘要的段落数，"
+"即将正文的前N段视为摘要。若将此项设为 ``None`` ，摘要会和原始内容一模一样，"
+"但具体还会遵循 ``SUMMARY_MAX_LENGTH`` 。"
+
+#: ../../settings.rst:321 6a04572678864a959a48dc83f4e78465
+msgid ""
+"When creating a short summary of an article and the result was truncated "
+"to match the required word length, this will be used as the truncation "
+"suffix."
+msgstr "在创建摘要时，若内容因长度被截断，此项设置值将用作截断的结尾。"
+
+#: ../../settings.rst:326 df2e4e17f0de4d5b97f282fb9a73c57d
+msgid ""
+"If disabled, content with dates in the future will get a default status "
+"of ``draft``. See :ref:`reading_only_modified_content` for caveats."
+msgstr ""
+"若此项设为False，带了未来日期的文章或页面的状态都会设为 ``draft`` 。相关注意事项详见 "
+":ref:`reading_only_modified_content` 。"
+
+#: ../../settings.rst:331 32787a794f534c759cdff64b48f3d4f0
+msgid ""
+"Regular expression that is used to parse internal links. Default syntax "
+"when linking to internal files, tags, etc., is to enclose the identifier,"
+" say ``filename``, in ``{}`` or ``||``. Identifier between ``{`` and "
+"``}`` goes into the ``what`` capturing group.  For details see :ref:`ref-"
+"linking-to-internal-content`."
+msgstr ""
+"用于解析内部链接的正则表达式。链接到内部文件、标签等时的默认语法是将标识符（例如 ``filename`` ）括在 ``{}`` 或 ``||``"
+" 中。 ``{`` 和 ``}`` 之间的则进入 ``what`` 捕获组。更多详情请参见 :ref:`ref-linking-to-"
+"internal-content` 。"
+
+#: ../../settings.rst:339 58a95b3645534c8fa0d30d0e237f3d42
+msgid ""
+"A list of default Pygments settings for your reStructuredText code "
+"blocks. See :ref:`internal_pygments_options` for a list of supported "
+"options."
+msgstr ""
+"reStructuredText代码块的默认Pygments设置列表。有关受支持选项的列表，请参阅 "
+":ref:`internal_pygments_options` 。"
+
+#: ../../settings.rst:344 8086dcfa7a7c41dca8ad4c3bfca3f627
+msgid ""
+"If ``True``, saves content in caches.  See "
+":ref:`reading_only_modified_content` for details about caching."
+msgstr "若设为 ``True`` ，会将内容保存在缓存中。有关缓存请参阅 :ref:`reading_only_modified_content` 。"
+
+#: ../../settings.rst:349 2ed178f518144b649b73718f9238b54b
+msgid ""
+"If set to ``'reader'``, save only the raw content and metadata returned "
+"by readers. If set to ``'generator'``, save processed content objects."
+msgstr "若设为 ``reader`` ，则只保存reader返回的原始内容和元数据。若设为 ``generator`` ，则保存处理过的内容对象。"
+
+#: ../../settings.rst:354 202ee8f7b97949909b28648926f42215
+msgid "Directory in which to store cache files."
+msgstr "指定存储缓存文件的目录。"
+
+#: ../../settings.rst:358 c4c1793569284f8aa087727d2cac0e4f
+msgid "If ``True``, use gzip to (de)compress the cache files."
+msgstr "若设为 ``True`` ，则使用gzip对缓存文件进行解压缩。"
+
+#: ../../settings.rst:362 3d8bcb7fb9fc4e0883de376634b5f443
+msgid "Controls how files are checked for modifications."
+msgstr "调整判定文件是否修改的方式"
+
+#: ../../settings.rst:364 ../../settings.rst:1364
+#: ded4e8033f904545a9ed73fe4b5f5912
+msgid "If set to ``'mtime'``, the modification time of the file is checked."
+msgstr "若设为 ``mtime`` ，则检查文件的修改时间。"
+
+#: ../../settings.rst:366 ../../settings.rst:1366
+#: 4e96ee3515e540ba828b8a80328ff700
+msgid ""
+"If set to a name of a function provided by the ``hashlib`` module, e.g. "
+"``'md5'``, the file hash is checked."
+msgstr "若设为 ``hashlib`` 库中提供的方法名，例如 ``md5`` ，则会检查文件的哈希值。"
+
+#: ../../settings.rst:371 2a66a13f76854ae794911f0c4d3fcffd
+msgid "If ``True``, load unmodified content from caches."
+msgstr "若设为 ``True`` ，则会从缓存中加载未修改的内容。"
+
+#: ../../settings.rst:375 eea621ea4a5344069cd4c2cf40b3a953
+msgid ""
+"A list of metadata fields containing reST/Markdown content to be parsed "
+"and translated to HTML."
+msgstr "元数据的列表，此列表中的元数据会被解析为HTML。"
+
+#: ../../settings.rst:380 8760f989d6ab474d987830631e1eca56
+msgid ""
+"The TCP port to serve content from the output folder via HTTP when "
+"pelican is run with --listen"
+msgstr "使用--listen运行pelican时，会在此选项指定的TCP端口上以HTTP提供内容。"
+
+#: ../../settings.rst:385 ea445f6d17204bd8b7f73803aa27a4a8
+msgid "The IP to which to bind the HTTP server."
+msgstr "需要和HTTP服务器绑定的IP地址。"
+
+#: ../../settings.rst:390 3b524d176da047c091f2769c156f3484
+msgid "URL settings"
+msgstr "URL设置"
+
+#: ../../settings.rst:392 fc094e521c5646b18a62975847740ce7
+msgid ""
+"The first thing to understand is that there are currently two supported "
+"methods for URL formation: *relative* and *absolute*. Relative URLs are "
+"useful when testing locally, and absolute URLs are reliable and most "
+"useful when publishing. One method of supporting both is to have one "
+"Pelican configuration file for local development and another for "
+"publishing. To see an example of this type of setup, use the ``pelican-"
+"quickstart`` script as described in the :doc:`Installation <install>` "
+"section, which will produce two separate configuration files for local "
+"development and publishing, respectively."
+msgstr ""
+"首先要知道的是，URL格式有两种形式： *相对URL* 、 *绝对URL* "
+"。相对URL在本地测试时往往比较有用，而绝对URL在发布时往往是比较有效可靠的。要同时支持两种URL形式，可以在本地开发和发布环境中使用两份不同的配置文件。执行脚本"
+" ``pelican-quickstart`` 时，就会为本地开发和发布环境分别生成一份配置文件，此脚本在 :doc:`安装Pelican "
+"<install>` 一节中有详细描述。"
+
+#: ../../settings.rst:401 9749e4b4a85f45b28fa7a71d05b9bf9c
+msgid ""
+"You can customize the URLs and locations where files will be saved. The "
+"``*_URL`` and ``*_SAVE_AS`` variables use Python's format strings. These "
+"variables allow you to place your articles in a location such as "
+"``{slug}/index.html`` and link to them as ``{slug}`` for clean URLs (see "
+"example below). These settings give you the flexibility to place your "
+"articles and pages anywhere you want."
+msgstr ""
+"URL和文件存储位置都是可以自定义的， ``*_URL`` 和 ``*_SAVE_AS`` "
+"变量使用Python风格的格式化字符串。你可以利用一些变量将文章放在诸如 ``{slug}/index.html`` 的位置，并且可以以 "
+"``{slug}`` 的形式进行链接，如此可以让URL更加简洁（详见下面的例子）。这些设置可以让你灵活地将文章和页面放在任何你想要的地方。"
+
+#: ../../settings.rst:409 9e5d3f0ff133412b8d47de5fc9489e5f
+msgid ""
+"If a ``*_SAVE_AS`` setting contains a parent directory that doesn't match"
+" the parent directory inside the corresponding ``*_URL`` setting, this "
+"may cause Pelican to generate unexpected URLs in a few cases, such as "
+"when using the ``{attach}`` syntax."
+msgstr ""
+"如果 ``*_SAVE_AS`` 中包含了不在 ``*_URL`` 中的父目录，会导致Pelican在少数情况下（例如使用 "
+"``{attach}`` 语法时）产生不确定的URL。"
+
+#: ../../settings.rst:414 b2429a00d07341099c3f34b7134f3732
+msgid ""
+"If you don't want that flexibility and instead prefer that your generated"
+" output paths mirror your source content's filesystem path hierarchy, try"
+" the following settings::"
+msgstr "若不希望有这种灵活性，而是希望生成的输出路径保留源内容路径的层次结构，可以尝试以下设置："
+
+#: ../../settings.rst:421 d89d44671c504501a54d3baca12e9017
+msgid ""
+"Otherwise, you can use a variety of file metadata attributes within URL-"
+"related settings:"
+msgstr "否则，可以在URL相关设置中可以使用下面的这些元数据属性："
+
+#: ../../settings.rst:424 c97e4acb5b1d4ffda3028b9fdf8b7ed7
+msgid "slug"
+msgstr "slug"
+
+#: ../../settings.rst:425 a5257ea8cb0b430db73f09b337db7a74
+msgid "date"
+msgstr "date"
+
+#: ../../settings.rst:426 d6aa5650f1f34a0ba162f2fd2bf33182
+msgid "lang"
+msgstr "lang"
+
+#: ../../settings.rst:427 1fa0d7e3527b46e298468ad129188ca2
+msgid "author"
+msgstr "author"
+
+#: ../../settings.rst:428 e68b3eeb56304803b7dd56c5c919382d
+msgid "category"
+msgstr "category"
+
+#: ../../settings.rst:430 ../../settings.rst:565
+#: 663b3feef9aa44208752d6bbe79dbfba
+msgid "Example usage::"
+msgstr "例如："
+
+#: ../../settings.rst:437 9cdacb3495c84888b48bb6092b7d0111
+msgid ""
+"This would save your articles into something like ``/posts/2011/Aug/07"
+"/sample-post/index.html``, save your pages into "
+"``/pages/about/index.html``, and render them available at URLs of "
+"``/posts/2011/Aug/07/sample-post/`` and ``/pages/about/``, respectively."
+msgstr ""
+"上面的设置会将你的文章以类似于 ``/posts/2011/Aug/07/sample-post/index.html`` 的形式存储，页面则以 "
+"``/pages/about/index.html`` 的形式存储，对应的URL分别为 ``/posts/2011/Aug/07/sample-"
+"post/`` 与 ``/pages/about/`` 。"
+
+#: ../../settings.rst:443 f7d6af3d02834a689522f5b479aa1d8b
+msgid ""
+"If you specify a ``datetime`` directive, it will be substituted using the"
+" input files' date metadata attribute. If the date is not specified for a"
+" particular file, Pelican will rely on the file's ``mtime`` timestamp. "
+"Check the `Python datetime documentation`_ for more information."
+msgstr ""
+"如果指定了 ``datetime`` 指令，会使用输入文件的日期元数据进行替换。若没有指定日期，Pelican会根据文件的 ``mtime`` "
+"时间戳替换之。更多信息可以参考 `Python datetime文档`_ 。"
+
+#: ../../settings.rst:453 6165ea3291b444c29b329cb7c1d12efa
+msgid ""
+"Defines whether Pelican should use document-relative URLs or not. Only "
+"set this to ``True`` when developing/testing and only if you fully "
+"understand the effect it can have on links/feeds."
+msgstr ""
+"定义Pelican是否使用文档间的相对URL。请只在开发或测试时将此项设为 ``True`` "
+"，并且确保你已经明白此项设置对链接与feed的影响。（译者注：当此项为True时，网页之间的链接会使用相对路径表达，例如 ``../my-"
+"article.html`` ）"
+
+#: ../../settings.rst:459 ef74181aff694f228072bb8fc114a49c
+msgid "The URL to refer to an article."
+msgstr "文章的URL格式。"
+
+#: ../../settings.rst:463 28debd5a396746ddaa4c5552034c6f5e
+msgid "The place where we will save an article."
+msgstr "文章的存储位置。"
+
+#: ../../settings.rst:467 a6a8e9c42b1144c0bbe071a0948a7c41
+msgid "The URL to refer to an article which doesn't use the default language."
+msgstr "非默认语言文章的URL格式。"
+
+#: ../../settings.rst:471 885589960b054edbac6b5b5ceabf70ba
+msgid ""
+"The place where we will save an article which doesn't use the default "
+"language."
+msgstr "非默认语言文章的存储位置。"
+
+#: ../../settings.rst:476 ed30016072a84eab9108c94ef05d72ac
+msgid "The URL to refer to an article draft."
+msgstr "draft状态文章的URL格式。"
+
+#: ../../settings.rst:480 f1827c2a350e41fb8a29b32ce4f0ce38
+msgid "The place where we will save an article draft."
+msgstr "draft状态文章的存储位置。"
+
+#: ../../settings.rst:484 a73fe74a021e4e1ca7b9d514b05dc709
+msgid ""
+"The URL to refer to an article draft which doesn't use the default "
+"language."
+msgstr "draft状态非默认语言文章的URL格式。"
+
+#: ../../settings.rst:488 9eaa92ef96bc49d3b7a751b88e7d1775
+msgid ""
+"The place where we will save an article draft which doesn't use the "
+"default language."
+msgstr "draft状态非默认语言文章的存储位置。"
+
+#: ../../settings.rst:493 303454f9d4524fc680dd2092dcb56cb9
+msgid "The URL we will use to link to a page."
+msgstr "页面的URL格式。"
+
+#: ../../settings.rst:497 afd8b970b616418d84b9e3fd4ab52cb4
+msgid ""
+"The location we will save the page. This value has to be the same as "
+"PAGE_URL or you need to use a rewrite in your server config."
+msgstr "页面的保存位置。除非在服务器上设置了重写规则，否则此项设置必须和PAGE_URL一致。"
+
+#: ../../settings.rst:502 311b0f44a40c450da8d5049aef066bed
+msgid ""
+"The URL we will use to link to a page which doesn't use the default "
+"language."
+msgstr "非默认语言页面的URL格式。"
+
+#: ../../settings.rst:507 a6829be9309144cebd8135f7e20f8670
+msgid "The location we will save the page which doesn't use the default language."
+msgstr "非默认语言页面的存储位置。"
+
+#: ../../settings.rst:511 95a46aad8dd046d096ad55df0777d67b
+msgid "The URL used to link to a page draft."
+msgstr "draft状态页面的URL。"
+
+#: ../../settings.rst:515 0036d550e0cc47058e209dcd9cf313b5
+msgid "The actual location a page draft is saved at."
+msgstr "draft状态页面的实际存储位置。"
+
+#: ../../settings.rst:519 6f382f91d09b4301b68a38d94312ef21
+msgid ""
+"The URL used to link to a page draft which doesn't use the default "
+"language."
+msgstr "draft状态非默认语言页面的URL格式。"
+
+#: ../../settings.rst:524 5ef1118bbfa844c5be60d015a8294deb
+msgid ""
+"The actual location a page draft which doesn't use the default language "
+"is saved at."
+msgstr "draft状态非默认语言页面的实际存储位置。"
+
+#: ../../settings.rst:529 4c23c58e9b0341c7a632114822383784
+msgid "The URL to use for an author."
+msgstr "某一个作者的URL格式。"
+
+#: ../../settings.rst:533 26e5bbec4ccf442eb1f2ed5850b10aab
+msgid "The location to save an author."
+msgstr "某一个作者的存储位置。"
+
+#: ../../settings.rst:537 1a63d575005147a6a1f506499aea31da
+msgid "The URL to use for a category."
+msgstr "某一个分类的URL格式。"
+
+#: ../../settings.rst:541 aae69f204db3414eb520a6cf2d7b9ee0
+msgid "The location to save a category."
+msgstr "某一个分类的存储位置。"
+
+#: ../../settings.rst:545 c248088861924e30beb1d223ec197ff5
+msgid "The URL to use for a tag."
+msgstr "某一个标签的URL格式。"
+
+#: ../../settings.rst:549 c6f5770301c44f3abb9c105276cb9bd3
+msgid "The location to save the tag page."
+msgstr "某一个标签的存储位置"
+
+#: ../../settings.rst:553 9fc1cb3d807d407bbff78d4d3203f8c0
+msgid ""
+"If you do not want one or more of the default pages to be created (e.g., "
+"you are the only author on your site and thus do not need an Authors "
+"page), set the corresponding ``*_SAVE_AS`` setting to ``''`` to prevent "
+"the relevant page from being generated."
+msgstr "如果您不希望创建默认页面（例如你是网站上的唯一作者，因此不需要作者页面），请将相应的 ``*_SAVE_AS`` 设置设置为 ``''`` 。"
+
+#: ../../settings.rst:558 2a4afa6f1db840c69e80199d928c3e9a
+msgid ""
+"Pelican can optionally create per-year, per-month, and per-day archives "
+"of your posts. These secondary archives are disabled by default but are "
+"automatically enabled if you supply format strings for their respective "
+"``_SAVE_AS`` settings. Period archives fit intuitively with the "
+"hierarchical model of web URLs and can make it easier for readers to "
+"navigate through the posts you've written over time."
+msgstr ""
+"可选的，Pelican可以为帖子创建每年、每月或是每日的归档。除非你为各自的 ``*_SAVE_AS`` "
+"设置了格式化字符串，否则这些归档在默认情况下是关闭的。按时间进行归档更直观地符合web URL的层次模型，也可以让读者更容易按时间顺序浏览帖子。"
+
+#: ../../settings.rst:572 973812c7673a481686350dfca8378df8
+msgid ""
+"With these settings, Pelican will create an archive of all your posts for"
+" the year at (for instance) ``posts/2011/index.html`` and an archive of "
+"all your posts for the month at ``posts/2011/Aug/index.html``. These can "
+"be accessed through the URLs ``posts/2011/`` and ``posts/2011/Aug/``, "
+"respectively."
+msgstr ""
+"例如若使用了上面的设置，Pelican会创建按年的归档（例如 ``posts/2011/index.html`` ），以及按月的归档（例如 "
+"``posts/2011/Aug/index.html`` ）。这两个页面分别通过 ``posts/2011/`` 和 "
+"``posts/2011/Aug/`` 进行访问。"
+
+#: ../../settings.rst:578 e1e1bb5cc26a40a9a62f88ddd10c072a
+msgid ""
+"Period archives work best when the final path segment is ``index.html``. "
+"This way a reader can remove a portion of your URL and automatically "
+"arrive at an appropriate archive of posts, without having to specify a "
+"page name."
+msgstr ""
+"当路径设置为以 ``index.html`` "
+"结尾时，归档的体验会非常好。读者可以删除URL中的一部分以到达合适时间段的归档，而不需要指定某一个页面的名称。"
+
+#: ../../settings.rst:584 4899822fdcf94a7e8edb0478260181a5
+msgid "The location to save per-year archives of your posts."
+msgstr "年归档的存储位置。"
+
+#: ../../settings.rst:588 eaac63d4c2aa4a0dbfe548b61008edfe
+msgid ""
+"The URL to use for per-year archives of your posts. You should set this "
+"if you enable per-year archives."
+msgstr "年归档的URL格式，若想要启用年归档，请配置此项。"
+
+#: ../../settings.rst:593 376c3ee871c847d7b1072ed0e29c482a
+msgid "The location to save per-month archives of your posts."
+msgstr "月归档的存储位置。"
+
+#: ../../settings.rst:597 4788e190048c48c181a8aa4b60b86535
+msgid ""
+"The URL to use for per-month archives of your posts. You should set this "
+"if you enable per-month archives."
+msgstr "月归档的URL格式，若想要启用月归档，请配置此项。"
+
+#: ../../settings.rst:602 9e0023d2bb9c43d3bc7bad9bf4b5429c
+msgid "The location to save per-day archives of your posts."
+msgstr "日归档的存储位置。"
+
+#: ../../settings.rst:606 3055e7f7b4af4e87aca8cb560dd0313c
+msgid ""
+"The URL to use for per-day archives of your posts. You should set this if"
+" you enable per-day archives."
+msgstr "日归档的URL格式，若想要启用日归档，请配置此项。"
+
+#: ../../settings.rst:609 67fdf1f1cf1a497b8c5847fb10d907e1
+msgid ""
+"``DIRECT_TEMPLATES`` work a bit differently than noted above. Only the "
+"``_SAVE_AS`` settings are available, but it is available for any direct "
+"template."
+msgstr ""
+"``DIRECT_TEMPLATES`` 的工作方式与上面提到的有点不同，在其中可以使用一些特别的直接模板，并且仅在 ``*_SAVE_AS`` "
+"设置中可用。"
+
+#: ../../settings.rst:615 ee557971709e4c8e84085295064a205e
+msgid "The location to save the article archives page."
+msgstr "文章归档页面的存储位置。"
+
+#: ../../settings.rst:619 5229274ff3514aa2b3ab5338b22cdea6
+msgid "The location to save the author list."
+msgstr "作者列表的存储位置。"
+
+#: ../../settings.rst:623 560b6eaf36ef4975a5f7503698473e2b
+msgid "The location to save the category list."
+msgstr "分类列表的存储位置。"
+
+#: ../../settings.rst:627 048f18adc37f4693925f05373a426f26
+msgid "The location to save the tag list."
+msgstr "标签列表的存储位置。"
+
+#: ../../settings.rst:631 ac31a8a0b68d47ed9ec65dc9b8eae2a6
+msgid "The location to save the list of all articles."
+msgstr "所有文章列表的存储位置。"
+
+#: ../../settings.rst:633 ceb51d0a532447099bc681ba9cce5b1d
+msgid ""
+"URLs for direct template pages are theme-dependent. Some themes use "
+"corresponding ``*_URL`` setting as string, while others hard-code them: "
+"``'archives.html'``, ``'authors.html'``, ``'categories.html'``, "
+"``'tags.html'``."
+msgstr ""
+"事实上，直接模板页面的URL是和使用的主题相关的。有些主题会使用 ``*_URL`` 作为变量字符串，而有些则是直接对这些直接模板页面进行硬编码："
+" ``'archives.html'`` 、 ``'authors.html'`` 、 ``'categories.html'`` 。"
+
+#: ../../settings.rst:640 d600dab1b91c4662833d0c5c298938b4
+msgid ""
+"Specifies from where you want the slug to be automatically generated. Can"
+" be set to ``title`` to use the \"Title:\" metadata tag or ``basename`` "
+"to use the article's file name when creating the slug."
+msgstr "自动生成slug所依赖的内容。可以指定为元数据标签 ``title`` ，也可以使用文章源文件的文件名 ``basename`` 。"
+
+#: ../../settings.rst:646 d274502af37648e289fd588834b0019d
+msgid ""
+"Allow Unicode characters in slugs. Set ``True`` to keep Unicode "
+"characters in auto-generated slugs. Otherwise, Unicode characters will be"
+" replaced with ASCII equivalents."
+msgstr ""
+"指定是否允许在slug中使用Unicode字符。若设为 ``True`` "
+"，自动生成的slug中会保留Unicode字符；否则Unicode字符会使用含义相同的ASCII替换。"
+
+#: ../../settings.rst:652 37cddacc30bc430b9ea1bad479e90f3d
+msgid ""
+"Preserve uppercase characters in slugs. Set ``True`` to keep uppercase "
+"characters from ``SLUGIFY_SOURCE`` as-is."
+msgstr "指定是否保留slug中的大写字母。若设为 ``True`` ，则会原样保留 ``SLUGIFY_SOURCE`` 中的大写字母。"
+
+#: ../../settings.rst:662 785ff8b6508b4e6e980ae6638e7346f9
+msgid ""
+"Regex substitutions to make when generating slugs of articles and pages. "
+"Specified as a list of pairs of ``(from, to)`` which are applied in "
+"order, ignoring case. The default substitutions have the effect of "
+"removing non-alphanumeric characters and converting internal whitespace "
+"to dashes. Apart from these substitutions, slugs are always converted to "
+"lowercase ascii characters and leading and trailing whitespace is "
+"stripped. Useful for backward compatibility with existing URLs."
+msgstr ""
+"指定生成文章和页面slug时要进行的正则表达式替换。指定的是一对对 ``(from, to)`` "
+"（from为要替换的内容，to为替换进去的内容），列表中的各对替换规则是按序执行且忽略大小写的。默认的替换会删除非字母非数字的字符并将内部空格替换为连字符。除此之外，slug会将所有字符转换为小写ASCII字符，并删除所有前导和末尾空格。这有利于现有URL的向后兼容。"
+
+#: ../../settings.rst:672 f2ddbe0d79124ce2b0b9390f9c1492e9
+msgid ""
+"Regex substitutions for author slugs. Defaults to "
+"``SLUG_REGEX_SUBSTITUTIONS``."
+msgstr "针对作者slug的正则替换。默认等于 ``SLUG_REGEX_SUBSTITUTIONS`` 。"
+
+#: ../../settings.rst:677 68c5594a14544fe9bed90cdfb41f25c4
+msgid ""
+"Regex substitutions for category slugs. Defaults to "
+"``SLUG_REGEX_SUBSTITUTIONS``."
+msgstr "针对分类slug的正则替换。默认等于 ``SLUG_REGEX_SUBSTITUTIONS`` 。"
+
+#: ../../settings.rst:682 3dd263d38e47445c88d34a790e919053
+msgid ""
+"Regex substitutions for tag slugs. Defaults to "
+"``SLUG_REGEX_SUBSTITUTIONS``."
+msgstr "针对标签slug的正则替换。默认等于 ``SLUG_REGEX_SUBSTITUTIONS`` 。"
+
+#: ../../settings.rst:685 21a264926d3b46edb2af35f936d0985a
+msgid "Time and Date"
+msgstr "日期与时间"
+
+#: ../../settings.rst:689 ef50be008f104aa6bcbf2df6a81921e8
+msgid "The timezone used in the date information, to generate Atom and RSS feeds."
+msgstr "日期信息中使用的时区，会用于生成Atom和RSS feeds。（无默认值，必须手动设置指定）"
+
+#: ../../settings.rst:691 9ec4050abc58489db63deda401d80b7d
+msgid ""
+"If no timezone is defined, UTC is assumed. This means that the generated "
+"Atom and RSS feeds will contain incorrect date information if your locale"
+" is not UTC."
+msgstr "若没有定义时区，会直接使用UTC时区。这意味着当你的时区不等于UTC时，生成的Atom和RSS feeds中会包含错误的日期信息。"
+
+#: ../../settings.rst:695 8797378878dc47e99388e1d0421da263
+msgid ""
+"Pelican issues a warning in case this setting is not defined, as it was "
+"not mandatory in previous versions."
+msgstr "在之前的版本中，这一项设置并不是强制的，因此Pelican会在未设置时区时提出警告。"
+
+#: ../../settings.rst:698 18326d528d0045c88c8e31d0f9bb26f9
+msgid ""
+"Have a look at `the wikipedia page`_ to get a list of valid timezone "
+"values."
+msgstr "有效的时区设置值可以在 `维基百科页`_ 中查看。"
+
+#: ../../settings.rst:704 3af0a717e34c4926a40fc6cd58518df2
+msgid ""
+"The default date you want to use.  If ``'fs'``, Pelican will use the file"
+" system timestamp information (mtime) if it can't get date information "
+"from the metadata.  If given any other string, it will be parsed by the "
+"same method as article metadata.  If set to a tuple object, the default "
+"datetime object will instead be generated by passing the tuple to the "
+"``datetime.datetime`` constructor."
+msgstr ""
+"要使用的默认日期。若设为 ``'fs'`` "
+"，Pelican在无法从元数据中获取日期时，会以系统时间戳信息（mtime）为准；若设为其他字符串，Pelican将用与解析文章元数据相同的方法进行解析；若设为元组，则会将该元组传递给"
+" ``datetime.datetime`` 的构造函数来生成日期。"
+
+#: ../../settings.rst:713 e8358468fd034f24a7984b20909ada30
+msgid "The default date format you want to use."
+msgstr "指定要使用的默认日期格式。"
+
+#: ../../settings.rst:717 e7f8237ab45945d78484e8fef0005bdc
+msgid "If you manage multiple languages, you can set the date formatting here."
+msgstr "若需要管理多种语言，可以在这里针对不同语言设置不同的日期格式。"
+
+#: ../../settings.rst:719 eab2352e48174cb085b7bd23115ad15b
+msgid ""
+"If no ``DATE_FORMATS`` are set, Pelican will fall back to "
+"``DEFAULT_DATE_FORMAT``. If you need to maintain multiple languages with "
+"different date formats, you can set the ``DATE_FORMATS`` dictionary using"
+" the language name (``lang`` metadata in your post content) as the key."
+msgstr ""
+"如果 ``DATE_FORMATS`` 没有设置过，Pelican会使用 ``DEFAULT_DATE_FORMAT`` "
+"。如果要为不同语言设置不同如期格式，可以在此设置项字典中指定，键为语言名称（对应于帖子内容元数据中的 ``lang`` ），值为日期格式字符串。"
+
+#: ../../settings.rst:724 2f8d1e03399549bf84a05e25d718ec80
+#, python-format
+msgid ""
+"In addition to the standard C89 strftime format codes that are listed in "
+"`Python datetime documentation`_, you can use the ``-`` character between"
+" ``%`` and the format character to remove any leading zeros. For example,"
+" ``%d/%m/%Y`` will output ``01/01/2014`` whereas ``%-d/%-m/%Y`` will "
+"result in ``1/1/2014``."
+msgstr ""
+"除了 `Python datetime文档`_ 中列出的标准C89 strftime格式代码之外，可以通过在 ``%`` 和格式字符之间添加 "
+"``-`` 来删除日期中的前导零。例如  ``%d/%m/%Y`` 对应输出 ``01/01/2014`` ，而 ``%-d/%-m/%Y`` "
+"对应输出 ``1/1/2014`` 。"
+
+#: ../../settings.rst:737 28f1a04cc72943b8bbb45b0f05039e6b
+msgid ""
+"It is also possible to set different locale settings for each language by"
+" using a ``(locale, format)`` tuple as a dictionary value which will "
+"override the ``LOCALE`` setting:"
+msgstr "你还能够通过将元组 ``(locale, format)`` 作为值，来为每种语言指定地区，此处设置的地区会覆盖 ``LOCALE`` 设置："
+
+#: ../../settings.rst:757 0edf14c3edcf41aba562d74822a9f1f5
+msgid ""
+"Change the locale [#]_. A list of locales can be provided here or a "
+"single string representing one locale.  When providing a list, all the "
+"locales will be tried until one works."
+msgstr "设置地区 [#]_ 。可以同时指定多个地区，也可以使用字符串指定单个地区。当设置了多个地区时，会一个个尝试直到某一个可以使用。"
+
+#: ../../settings.rst:761 26b26ebd973b40fd973a9252fe24173c
+msgid "You can set locale to further control date format:"
+msgstr "通过设置地区进一步控制日期格式："
+
+#: ../../settings.rst:769 e0056e0a853f4891b87e3b2f66af9ab9
+msgid ""
+"For a list of available locales refer to `locales on Windows`_  or on "
+"Unix/Linux, use the ``locale -a`` command; see manpage `locale(1)`_ for "
+"more information."
+msgstr ""
+"要查看可用的地区列表，可以参看 `Windows上的地区`_ ；若使用的时Unix/Linux系统， 使用 ``locale -a`` "
+"命令即可，有关该命令的更多信息可以参阅手册 `locale(1)`_ 。"
+
+#: ../../settings.rst:774 ac7d9e8b711e438e9a80a31274d1fa11
+msgid "Default is the system locale."
+msgstr "默认值与系统的地区设置保持一致。"
+
+#: ../../settings.rst:788 39a1ce7f77994c1ca37792f44b4297ee
+msgid "Template pages"
+msgstr "模板页面"
+
+#: ../../settings.rst:792 fb2c9cf72b3946828619ecb6051abd0b
+msgid ""
+"A mapping containing template pages that will be rendered with the blog "
+"entries."
+msgstr "一些映射关系，指出了会和博客一起渲染的模板页面。"
+
+#: ../../settings.rst:795 f8163db87b30489fa6067f58d395cee1
+msgid ""
+"If you want to generate custom pages besides your blog entries, you can "
+"point any Jinja2 template file with a path pointing to the file and the "
+"destination path for the generated file."
+msgstr "如果你想要生成除了博客之外的自定义页面，你可以指出任何Jinja2的模板文件，需要同时指出源文件路径和生成文件的路径。"
+
+#: ../../settings.rst:799 ef26f9eaad274b969a0ae1183e7ac0c8
+msgid ""
+"For instance, if you have a blog with three static pages — a list of "
+"books, your resume, and a contact page — you could have::"
+msgstr "例如，如果你的博客有三个静态页面——书籍列表、你的简历、以及一个联系我们页面，你可这么配置："
+
+#: ../../settings.rst:808 2c8a293e4d77423db215de89aa20ca5c
+msgid "The extensions to use when looking up template files from template names."
+msgstr "指定要查找并视为模板文件的文件扩展名。"
+
+#: ../../settings.rst:812 101a0198fc6249b3adea735ff522b9b1
+msgid ""
+"List of templates that are used directly to render content. Typically "
+"direct templates are used to generate index pages for collections of "
+"content (e.g., category and tag index pages). If the author, category and"
+" tag collections are not needed, set ``DIRECT_TEMPLATES = ['index', "
+"'archives']``"
+msgstr ""
+"指定用于直接渲染内容的模板列表。一般来说直接模板会用于生成内容集合的主页（例如分类和标签的主页）。如果不需要作者、分类或者标签集合，可以设置 "
+"``DIRECT_TEMPLATES = ['index', archives']`` 。"
+
+#: ../../settings.rst:817 c5952388671a4fab8095d4a9b596905f
+msgid ""
+"``DIRECT_TEMPLATES`` are searched for over paths maintained in "
+"``THEME_TEMPLATES_OVERRIDES``."
+msgstr "``DIRECT_TEMPLATES`` 会在 ``THEME_TEMPLATES_OVERRIDES`` 的路径中搜索。"
+
+#: ../../settings.rst:822 8c4e0bfebc60422cbcb852f17e53fbeb
+msgid "Metadata"
+msgstr "元数据"
+
+#: ../../settings.rst:826 5d3ac5fa0fe94d0faf3603d032152259
+msgid "Default author (usually your name)."
+msgstr "默认作者（通常是你自己的名字）。"
+
+#: ../../settings.rst:830 bd855c810143419b97250e11fe9db428
+msgid "The default metadata you want to use for all articles and pages."
+msgstr "应用于所有文章和页面的默认元数据。"
+
+#: ../../settings.rst:834 b9b192605075405ba1b89c817db323e5
+msgid ""
+"The regexp that will be used to extract any metadata from the filename. "
+"All named groups that are matched will be set in the metadata object.  "
+"The default value will only extract the date from the filename."
+msgstr "指定用于从文件名中提取元数据的正则表达式。所有匹配上的命名匹配组都会用于设置元数据。默认值会从文件名中提取日期。"
+
+#: ../../settings.rst:838 f5730036a8ad4bdbbc7250201e97d4b3
+msgid "For example, to extract both the date and the slug::"
+msgstr "例如，可以同时提取日期和slug："
+
+#: ../../settings.rst:842 bfcc4210a493460a954dfb5d96f57462
+msgid "See also ``SLUGIFY_SOURCE``."
+msgstr "另请参看 ``SLUGIFY_SOURCE`` 。"
+
+#: ../../settings.rst:846 1bc373d7947b4c9181fd54d01409eb06
+msgid ""
+"Like ``FILENAME_METADATA``, but parsed from a page's full path relative "
+"to the content source directory."
+msgstr "和 ``FILENAME_METADATA`` 类似，但提取解析的对象是相对于内容源文件目录的路径。"
+
+#: ../../settings.rst:851 b02a8c4b99204d92b9d6625f79c27c89
+msgid ""
+"Extra metadata dictionaries keyed by relative path. Relative paths "
+"require correct OS-specific directory separators (i.e. / in UNIX and \\\\"
+" in Windows) unlike some other Pelican file settings. Paths to a "
+"directory apply to all files under it. The most-specific path wins "
+"conflicts."
+msgstr "指定要从相对路径提取的额外元数据字典。与Pelican的其他设置文件不同，此项设置需要正确使用和操作系统对应的目录分隔符（Unix中使用/，Windows中使用\\\\）。若对一个目录设置了规则，该规则会作用于该目录下所有文件。当有多个路径相互冲突时，Pelican会选用更为具体的路径。"
+
+#: ../../settings.rst:856 d8ceeec6c7e14be3a79c73db2472a7cb
+msgid ""
+"Not all metadata needs to be :ref:`embedded in source file itself "
+"<internal_metadata>`. For example, blog posts are often named following a"
+" ``YYYY-MM-DD-SLUG.rst`` pattern, or nested into ``YYYY/MM/DD-SLUG`` "
+"directories. To extract metadata from the filename or path, set "
+"``FILENAME_METADATA`` or ``PATH_METADATA`` to regular expressions that "
+"use Python's `group name notation`_ ``(?P<name>…)``. If you want to "
+"attach additional metadata but don't want to encode it in the path, you "
+"can set ``EXTRA_PATH_METADATA``:"
+msgstr ""
+"不是所有元数据都需要直接 :ref:`放在推文源文件中 <internal_metadata>` 。例如，博文可能是以 ``YYYY-MM-DD-"
+"SLUG.rst`` 的形式命名的，或者是直接放在 ``YYYY/MM/DD-SLUG`` 文件夹中。要从文件名或路径中提取元数据，设置 "
+"``FILENAME_METADATA`` 或 ``PATH_METADATA`` 即可，需使用Python风格的 `命名组表示法`_ "
+"``(?P<name>…)`` 。当你需要为帖子附加一些额外的元数据，但不想将其编码在文件路径中时，就可以在 "
+"``EXTRA_PATH_METADATA`` 中设置："
+
+#: ../../settings.rst:877 3c7085d581f74cba8b5b7be5451d0dd0
+msgid ""
+"This can be a convenient way to shift the installed location of a "
+"particular file:"
+msgstr "通过这个设置项，很方便就可以转移特定文件的位置："
+
+#: ../../settings.rst:897 62d0261aa15a42a486691e7d615f58c7
+msgid "Feed settings"
+msgstr "订阅源设置"
+
+#: ../../settings.rst:899 e06e3b6cd4e34d9990e28f533c70916b
+msgid ""
+"By default, Pelican uses Atom feeds. However, it is also possible to use "
+"RSS feeds if you prefer."
+msgstr "默认情况下，Pelican会使用Atom订阅源。但如果你愿意的话，也可以使用RSS。"
+
+#: ../../settings.rst:902 8a0de4febfd34d9eb1cdcc74d4c02198
+msgid ""
+"Pelican generates category feeds as well as feeds for all your articles. "
+"It does not generate feeds for tags by default, but it is possible to do "
+"so using the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:"
+msgstr ""
+"Pelican会生成分类的feed，也会为所有文章生成，但默认并不会为标签生成feed，要生成标签feed，可以使用  "
+"``TAG_FEED_ATOM`` 和 ``TAG_FEED_RSS`` 设置："
+
+#: ../../settings.rst:908 e1d650d03db342a09b22e34ff11b9365
+msgid ""
+"The domain prepended to feed URLs. Since feed URLs should always be "
+"absolute, it is highly recommended to define this (e.g., "
+"\"https://feeds.example.com\"). If you have already explicitly defined "
+"SITEURL (see above) and want to use the same domain for your feeds, you "
+"can just set:  ``FEED_DOMAIN = SITEURL``."
+msgstr ""
+"指定要附加到订阅源URL前面的域名。因为订阅源URL最好是绝对的，所以强烈推荐定义此设置项（例如 "
+"https://feeds.example.com ）。若SITEURL已经显式地定义了，并且希望使用相同地URL，就可以直接设置 "
+"``FEED_DOMAIN = SITEURL`` 。"
+
+#: ../../settings.rst:916 f3bc5a60dab54c2ab52f99f81b743102
+msgid "The location to save the Atom feed."
+msgstr "指定保存Atom订阅源的位置。"
+
+#: ../../settings.rst:920 4145c00c2347484fa37f4387283e0fb6
+msgid ""
+"Relative URL of the Atom feed. If not set, ``FEED_ATOM`` is used both for"
+" save location and URL."
+msgstr "Atom订阅源的相对URL。如果未设置此项，会将 ``FEED_ATOM`` 同时用于存储位置和URL。"
+
+#: ../../settings.rst:925 579cd1112ba44be7b82c77050af3a256
+msgid "The location to save the RSS feed."
+msgstr "指定保存RSS订阅源的位置。"
+
+#: ../../settings.rst:929 5fdb4ce14c0a454381db194885b088f2
+msgid ""
+"Relative URL of the RSS feed. If not set, ``FEED_RSS`` is used both for "
+"save location and URL."
+msgstr "RSS订阅源的相对URL。如果未设置此项，会将 ``FEED_RSS`` 同时用于存储位置和URL。"
+
+#: ../../settings.rst:934 91bd81a74c234968a27e4b61924273f5
+msgid ""
+"The location to save the all-posts Atom feed: this feed will contain all "
+"posts regardless of their language."
+msgstr "存储all-posts Atom订阅源的文件位置：其中会包含所有语言的帖子。"
+
+#: ../../settings.rst:939 62aceff0073b48eeb8929f102bfad7e4
+msgid ""
+"Relative URL of the all-posts Atom feed. If not set, ``FEED_ALL_ATOM`` is"
+" used both for save location and URL."
+msgstr "all-posts Atom订阅源的相对URL。如果未设置此项，会将 ``FEED_ALL_ATOM`` 同时用于存储位置和URL。"
+
+#: ../../settings.rst:944 3b9f640128e84a4a96e696a830e3a8cd
+msgid ""
+"The location to save the the all-posts RSS feed: this feed will contain "
+"all posts regardless of their language."
+msgstr "存储all-posts RSS订阅源的文件位置：其中会包含所有语言的帖子。"
+
+#: ../../settings.rst:949 2b80018af24945ac949377bb01f4d699
+msgid ""
+"Relative URL of the all-posts RSS feed. If not set, ``FEED_ALL_RSS`` is "
+"used both for save location and URL."
+msgstr "all-posts RSS订阅源的相对URL。如果未设置此项，会将 ``FEED_ALL_RSS`` 同时用于存储位置和URL。"
+
+#: ../../settings.rst:954 c00dc056edc64aafb33bafad947364db
+msgid "The location to save the category Atom feeds. [2]_"
+msgstr "category Atom订阅源的存储位置。 [2]_"
+
+#: ../../settings.rst:958 fb8c09a3eb844121b05c5a067d616a42
+msgid ""
+"Relative URL of the category Atom feeds, including the ``{slug}`` "
+"placeholder. [2]_ If not set, ``CATEGORY_FEED_ATOM`` is used both for "
+"save location and URL."
+msgstr ""
+"category Atom订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 "
+"``CATEGORY_FEED_ATOM`` 同时用于存储位置和URL。"
+
+#: ../../settings.rst:964 bd0dba597ed44c0ab95df015d13fb42f
+msgid ""
+"The location to save the category RSS feeds, including the ``{slug}`` "
+"placeholder. [2]_"
+msgstr "category RSS订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_"
+
+#: ../../settings.rst:969 5e06453a1300407188c78eceadcabef1
+msgid ""
+"Relative URL of the category RSS feeds, including the ``{slug}`` "
+"placeholder. [2]_ If not set, ``CATEGORY_FEED_RSS`` is used both for save"
+" location and URL."
+msgstr ""
+"category RSS订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 "
+"``CATEGORY_FEED_RSS`` 同时用于存储位置和URL。"
+
+#: ../../settings.rst:975 1ad2208106b5492cbc0bb0fc6b6d2eef
+msgid "The location to save the author Atom feeds. [2]_"
+msgstr "category Atom订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_"
+
+#: ../../settings.rst:979 069eb238b2d6458eac8fc200c12aa6fd
+msgid ""
+"Relative URL of the author Atom feeds, including the ``{slug}`` "
+"placeholder. [2]_ If not set, ``AUTHOR_FEED_ATOM`` is used both for save "
+"location and URL."
+msgstr ""
+"author Atom订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 "
+"``AUTHOR_FEED_ATOM`` 同时用于存储位置和URL。"
+
+#: ../../settings.rst:985 0b5a562410eb47c5a47a31a852973974
+msgid "The location to save the author RSS feeds. [2]_"
+msgstr "author RSS订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_"
+
+#: ../../settings.rst:989 c1964676a205466fb2a835e99bc00885
+msgid ""
+"Relative URL of the author RSS feeds, including the ``{slug}`` "
+"placeholder. [2]_ If not set, ``AUTHOR_FEED_RSS`` is used both for save "
+"location and URL."
+msgstr ""
+"author RSS订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 ``AUTHOR_FEED_RSS`` "
+"同时用于存储位置和URL。"
+
+#: ../../settings.rst:994 2242bd16e270495eba740e72964d840d
+msgid ""
+"The location to save the tag Atom feed, including the ``{slug}`` "
+"placeholder. [2]_"
+msgstr "tag Atom订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_"
+
+#: ../../settings.rst:999 2f69bb73cef343b48f09ead8fd268d26
+msgid ""
+"Relative URL of the tag Atom feed, including the ``{slug}`` placeholder. "
+"[2]_"
+msgstr "tag Atom订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_"
+
+#: ../../settings.rst:1004 059a551f316c4d7e99b43a4d6e999c43
+msgid ""
+"Relative URL to output the tag RSS feed, including the ``{slug}`` "
+"placeholder. If not set, ``TAG_FEED_RSS`` is used both for save location "
+"and URL."
+msgstr "tag RSS订阅源的相对URL，其中包含 ``{slug}`` 。如果未设置，会将 ``TAG_FEED_RSS`` 同时用于存储位置和URL。"
+
+#: ../../settings.rst:1010 ba1909bb43f7468ab36384a33e9f0d35
+msgid ""
+"Maximum number of items allowed in a feed. Setting to ``None`` will cause"
+" the feed to contains every article. 100 if not specified."
+msgstr "单个订阅源中允许包含的最多元素数量。若设为 ``None`` 表示不做上限；若不指定，默认上限为100。"
+
+#: ../../settings.rst:1015 ee56a7f7761e4badb24ddd0771b9bcaa
+msgid ""
+"Only include item summaries in the ``description`` tag of RSS feeds. If "
+"set to ``False``, the full content will be included instead. This setting"
+" doesn't affect Atom feeds, only RSS ones."
+msgstr ""
+"仅在RSS订阅源的 ``description`` 标签中包含项目摘要。若设为 ``False`` ，则将包含完整内容。此项设置不会影响Atom "
+"feed，只针对RSS feed。"
+
+#: ../../settings.rst:1021 d34b3c9cf9c643559e8f1bd58b4d4d9e
+msgid ""
+"If set to ``True``, ``?ref=feed`` will be appended to links in generated "
+"feeds for the purpose of referrer tracking."
+msgstr "若设为 ``True`` ，会将 ``?ref=feed`` 附到生成的链接中，以便追踪引用。"
+
+#: ../../settings.rst:1024 67aa494bb5c846eeac10b91d633fbeb1
+msgid ""
+"If you don't want to generate some or any of these feeds, set the above "
+"variables to ``None``."
+msgstr "若你不想要生成某些订阅源，将对应变量设为 ``None`` 即可。"
+
+#: ../../settings.rst:1027 e281a7a6d60d4362a56364ea4e7c2ed4
+msgid "``{slug}`` is replaced by name of the category / author / tag."
+msgstr "``{slug}`` 会分别用分类名/作者名/标签名来替换。"
+
+#: ../../settings.rst:1031 f1101bee785f48fb8745c1cbed7ccb5c
+msgid "Pagination"
+msgstr "分页"
+
+#: ../../settings.rst:1033 9d8deaf84be143aa919bae8458e256a5
+msgid ""
+"The default behaviour of Pelican is to list all the article titles along "
+"with a short description on the index page. While this works well for "
+"small-to-medium sites, sites with a large quantity of articles will "
+"probably benefit from paginating this list."
+msgstr "默认情况下，Pelican会把所有文章以简短描述的形式展示在首页上。虽然这对中小型网站效果不错，但对于拥有大量文章的网站来说可能需要将此列表进行分页。"
+
+#: ../../settings.rst:1038 8315da9ec0d64ffb881d0dfa6f25590e
+msgid "You can use the following settings to configure the pagination."
+msgstr "你可以使用下面的设置来配置分页。"
+
+#: ../../settings.rst:1042 9a56cc2f10634c34980a6868c4988e43
+msgid ""
+"The minimum number of articles allowed on the last page. Use this when "
+"you don't want the last page to only contain a handful of articles."
+msgstr "最后一页允许的最小文章数。当不希望最后一页仅包含少数文章时，请使用此选项。（译者注：当最后一页达不到此最小文章数时，会被合并到前一页）"
+
+#: ../../settings.rst:1047 f3d093d68890442abfda1dea23eb25ed
+msgid ""
+"The maximum number of articles to include on a page, not including "
+"orphans. False to disable pagination."
+msgstr "一个页面上包含的最大文章数，不包括孤立文章（译者注：当发生上一条设置选项中提到的合并时，最后一页显然会超过此最大文章数）。设为False会禁用分页。"
+
+#: ../../settings.rst:1052 df3fe4f1806f4a16b2a9fdd11cc50aa2
+msgid ""
+"The templates to use pagination with, and the number of articles to "
+"include on a page. If this value is ``None``, it defaults to "
+"``DEFAULT_PAGINATION``."
+msgstr "指定哪些模板需要启用分页，以及对应的单页面文章数量。若设为 ``None`` ，则默认值为 ``DEFAULT_PAGINATION`` 。"
+
+#: ../../settings.rst:1060 0ee1f92f0be740c3afb7b793327495df
+msgid "A set of patterns that are used to determine advanced pagination output."
+msgstr "一组模式，用于高级分页输出。"
+
+#: ../../settings.rst:1064 1a3aef30d05c45b5b4dd54ab7c4c043c
+msgid "Using Pagination Patterns"
+msgstr "使用分页模式"
+
+#: ../../settings.rst:1066 9bbd095189634b8f8a43cf4f196ec8d5
+msgid ""
+"By default, pages subsequent to ``.../foo.html`` are created as "
+"``.../foo2.html``, etc. The ``PAGINATION_PATTERNS`` setting can be used "
+"to change this. It takes a sequence of triples, where each triple "
+"consists of::"
+msgstr ""
+"默认情况下，连续页面的URL会如此编码：第一页为 ``.../foo.html`` ，后一页为 ``.../foo2.html`` "
+"。``PAGINATION_PATTERNS`` 就是用于修改这个编页规则的，其中是一些三元组："
+
+#: ../../settings.rst:1072 9303664b0829486097906d555b50c30d
+msgid ""
+"For ``page_url`` and ``page_save_as``, you may use a number of variables."
+" ``{url}`` and ``{save_as}`` correspond respectively to the ``*_URL`` and"
+" ``*_SAVE_AS`` values of the corresponding page type (e.g. "
+"``ARTICLE_SAVE_AS``). If ``{save_as} == foo/bar.html``, then ``{name} == "
+"foo/bar`` and ``{extension} == .html``. ``{base_name}`` equals ``{name}``"
+" except that it strips trailing ``/index`` if present. ``{number}`` "
+"equals the page number."
+msgstr ""
+"在  ``page_url`` 和 ``page_save_as`` 中，你可以使用很多变量。对于不同的页面类型， ``{url}`` 和 "
+"``{save_as}`` 对应于其 ``*_URL`` 和 ``*_SAVE_AS`` 配置项的计算值（例如 "
+"``ARTICLE_SAVE_AS`` ）。假设 ``{save_as} == foo/bar.html`` ，那么此时 ``{name} == "
+"foo/bar`` 、``{extension} == .html`` 。另外， ``{base_name}`` 和 ``{name}`` "
+"相同，只不过会截去末尾的 ``/index`` （如果有的话）。 ``{number}`` 则等于页码。（译者注： "
+"``minimum_page`` 意味到达该页面数后开始使用此条规则）"
+
+#: ../../settings.rst:1079 b3b8c76240bd4097b2ccd51e129fd949
+msgid ""
+"For example, if you want to leave the first page unchanged, but place "
+"subsequent pages at ``.../page/2/`` etc, you could set "
+"``PAGINATION_PATTERNS`` as follows::"
+msgstr ""
+"举个例子，如果你想要保持第一面保持不变，但后续页面都以 ``.../page/2/`` 的形式出现，你可以如此设置 "
+"``PAGINATION_PATTERNS`` ："
+
+#: ../../settings.rst:1089 d229ff3fdd86402c9c511d154856da26
+msgid ""
+"If you want a pattern to apply to the last page in the list, use ``-1`` "
+"as the ``minimum_page`` value::"
+msgstr "如果你想指定最后一面制定规则，将 ``minimum_page`` 的值设为 ``-1`` 即可："
+
+#: ../../settings.rst:1095 8a2f277505ea4ec1bf03baf8e8558fe0
+msgid "Translations"
+msgstr "翻译"
+
+#: ../../settings.rst:1097 fd82b5daff4b4c019f3af94589fdf236
+msgid ""
+"Pelican offers a way to translate articles. See the :doc:`Content "
+"<content>` section for more information."
+msgstr "Pelican为文章翻译提供了展示方法。详见 :doc:`创作内容 <content>` 。"
+
+#: ../../settings.rst:1102 0ed0fba765d44cb29c7a4561f1a7da11
+msgid "The default language to use."
+msgstr "指定默认语言。"
+
+#: ../../settings.rst:1106 b142b956828d4fa6bf5a6f41154a0bc8
+msgid ""
+"The metadata attribute(s) used to identify which articles are "
+"translations of one another. May be a string or a collection of strings. "
+"Set to ``None`` or ``False`` to disable the identification of "
+"translations."
+msgstr "指定用于标识不同翻译是同一篇文章的元数据。可以是一个或多个字符串。要禁用对文章翻译的识别，将此项设为 ``None`` 或 ``False`` 。"
+
+#: ../../settings.rst:1112 b7a889c0eda0476cb8926803274db471
+msgid ""
+"The metadata attribute(s) used to identify which pages are translations "
+"of one another. May be a string or a collection of strings. Set to "
+"``None`` or ``False`` to disable the identification of translations."
+msgstr "指定用于标识不同翻译是同一个页面的元数据。可以是一个或多个字符串。要禁用对页面翻译的识别，将此项设为 ``None`` 或 ``False`` 。"
+
+#: ../../settings.rst:1118 761a948ad532489ab91be66f6ff4afc3
+msgid "The location to save the Atom feed for translations. [3]_"
+msgstr "指定各翻译Atom订阅源的存储位置。 [3]_"
+
+#: ../../settings.rst:1122 3c51071a92a446179fa38606692a56d6
+msgid ""
+"Relative URL of the Atom feed for translations, including the ``{lang}`` "
+"placeholder. [3]_ If not set, ``TRANSLATION_FEED_ATOM`` is used both for "
+"save location and URL."
+msgstr ""
+"指定各翻译Atom feed的含有 ``{lang}`` 的相对URL。 [3]_ "
+"若未设置此项，``TRANSLATION_FEED_ATOM`` 会同时用于存储位置和URL。"
+
+#: ../../settings.rst:1128 12ef75b1e91b49a2884fc8508893a066
+msgid "Where to put the RSS feed for translations."
+msgstr "指定各翻译RSS订阅源的存储位置。"
+
+#: ../../settings.rst:1132 6b6d0ca12bbb4f26a2f91dea3ca2c6c7
+msgid ""
+"Relative URL of the RSS feed for translations, including the ``{lang}`` "
+"placeholder. [3]_ If not set, ``TRANSLATION_FEED_RSS`` is used both for "
+"save location and URL."
+msgstr ""
+"文章或页面不同翻译在RSS订阅源中的相对路径，其中含有 ``{lang}``。 [3]_ "
+"若未设置此项，``TRANSLATION_FEED_RSS`` 会同时用于存储位置和URL。"
+
+#: ../../settings.rst:1136 a653ebc90d404e1d88f473baa6d34bfa
+msgid "{lang} is the language code"
+msgstr "{lang} 为语言代码"
+
+#: ../../settings.rst:1140 417bf3d48cbb489daf8fab166ee7bda3
+msgid "Ordering content"
+msgstr "内容的排列顺序"
+
+#: ../../settings.rst:1144 0cf90a8d6a3f48879e6f835e7944ccf2
+msgid ""
+"Order archives by newest first by date. (False: orders by date with older"
+" articles first.)"
+msgstr "若设为True，日期较新的会排在前面；若设为False，则日期较旧的会排在前面。"
+
+#: ../../settings.rst:1149 69921fd37f9947948c4951ea539be84a
+msgid ""
+"Reverse the category order. (True: lists by reverse alphabetical order; "
+"default lists alphabetically.)"
+msgstr "若设为True，分类会按字典序逆序排列；若设为False，则按字典序顺序排列。"
+
+#: ../../settings.rst:1154 858fdbaaccf94d1392cf6c102da139a9
+msgid ""
+"Defines how the articles (``articles_page.object_list`` in the template) "
+"are sorted. Valid options are: metadata as a string (use ``reversed-`` "
+"prefix to reverse the sort order), special option ``'basename'`` which "
+"will use the basename of the file (without path), or a custom function to"
+" extract the sorting key from articles. Using a value of ``'date'`` will "
+"sort articles in chronological order, while the default value, "
+"``'reversed-date'``, will sort articles by date in reverse order (i.e., "
+"newest article comes first)."
+msgstr ""
+"定义文章（模板中的 ``articles_page.object_list`` "
+"）的排序方式。有效选项包括：字符串形式的元数据（使用前缀reverse-来指定逆序）、特殊选项 ``'basename'`` "
+"（不带路径的文件名）、或是一个可以从文章中提取排序键的自定义函数。例如，将选项值设为 ``'date'`` ，文章就会以时间顺序排列文章。默认值为"
+" ``'reversed-date'`` ，即以日期逆序排列，即新文章在前、旧文章在后。"
+
+#: ../../settings.rst:1164 302ab57b0ae2473ebefff23151f4675f
+msgid ""
+"Defines how the pages (``pages`` variable in the template) are sorted. "
+"Options are same as ``ARTICLE_ORDER_BY``.  The default value, "
+"``'basename'`` will sort pages by their basename."
+msgstr ""
+"定义页面（模板中的 ``pages`` 变量）的排序顺序。有效选项和 ``ARTICLE_ORDER_BY`` 中的相同。默认值为 "
+"``basename``。"
+
+#: ../../settings.rst:1172 8503a9717f4c4d37a15b95fe4881528f
+msgid "Themes"
+msgstr "主题"
+
+#: ../../settings.rst:1174 ee7c320a20664fd294235130ca68827e
+msgid ""
+"Creating Pelican themes is addressed in a dedicated section (see :ref"
+":`theming-pelican`). However, here are the settings that are related to "
+"themes."
+msgstr "创建Pelican主题在单独的一节中讲解（参见 :ref:`theming-pelican` ）。此处讲解和主题有关的配置项。"
+
+#: ../../settings.rst:1180 a7abb7abd4fd4914a9b2de4e18f2166a
+msgid ""
+"Theme to use to produce the output. Can be a relative or absolute path to"
+" a theme folder, or the name of a default theme or a theme installed via "
+":doc:`pelican-themes` (see below)."
+msgstr ""
+"用于产生输出的主题。可以是到达要使用主题的文件夹的相对或绝对路径，或是主题的名称（默认主题或通过 :doc:`pelican-themes` "
+"安装的主题）。"
+
+#: ../../settings.rst:1186 c80860199b464fe9be8c59b8162cd446
+msgid ""
+"Destination directory in the output path where Pelican will place the "
+"files collected from `THEME_STATIC_PATHS`. Default is `theme`."
+msgstr ""
+"Pelican从 `THEME_STATIC_PATHS` 中发现主题要使用的静态文件，此设置项指定这些静态文件在输出路径中的目录。默认值为 "
+"`theme` 。"
+
+#: ../../settings.rst:1191 7dbeb5f932f345c9b7c3546b7cfb788f
+msgid ""
+"Static theme paths you want to copy. Default value is `static`, but if "
+"your theme has other static paths, you can put them here. If files or "
+"directories with the same names are included in the paths defined in this"
+" settings, they will be progressively overwritten."
+msgstr ""
+"要复制的静态主题路径。默认值为 `static` "
+"，但如果你的主题有其他静态路径，也可以将其放在此处。此项设置中若包含了相同名称的文件或目录，前面的会被后面的覆盖。"
+
+#: ../../settings.rst:1198 fe7833a44b7547a889fb97b77b219186
+msgid ""
+"A list of paths you want Jinja2 to search for templates before searching "
+"the theme's ``templates/`` directory.  Allows for overriding individual "
+"theme template files without having to fork an existing theme.  Jinja2 "
+"searches in the following order: files in ``THEME_TEMPLATES_OVERRIDES`` "
+"first, then the theme's ``templates/``."
+msgstr ""
+"在搜索主题的 ``templates/`` "
+"目录前，Jinja2会先搜索此设置项中的路径。可以使用此设置项覆盖主题中的某些模板文件，以尽量避免修改现有主题。"
+
+#: ../../settings.rst:1204 fb8d33e45bd7411eb4c709bc8735725f
+#, python-format
+msgid ""
+"You can also extend templates from the theme using the ``{% extends %}`` "
+"directive utilizing the ``!theme`` prefix as shown in the following "
+"example:"
+msgstr "利用 ``{% extends %}`` 指令中的 ``!theme`` 前缀也可以用于从主题扩展模板，如下例所示："
+
+#: ../../settings.rst:1213 bad5f78cf14f48cfa4e3031fc66e945a
+msgid "Specify the CSS file you want to load."
+msgstr "指定需要加载的CSS文件。"
+
+#: ../../settings.rst:1215 744422adebf048efb9576eb3d6f01b4f
+msgid ""
+"By default, two themes are available. You can specify them using the "
+"``THEME`` setting or by passing the ``-t`` option to the ``pelican`` "
+"command:"
+msgstr "默认情况下，有两个主题可供选择。可以使用 ``THEME`` 选项指定，或是在 ``pelican`` 命令中使用 ``-t`` 选项的参数传入。"
+
+#: ../../settings.rst:1218 bad7ba14225c4a47922ce9440f0bfb11
+msgid "notmyidea"
+msgstr "notmyidea（默认值）"
+
+#: ../../settings.rst:1219 16954ec8b6224cd7902c5af01586f5cb
+msgid "simple (a synonym for \"plain text\" :)"
+msgstr "simple（即“plain text”）"
+
+#: ../../settings.rst:1221 7d839f8fe8ea454abb64906c4cf38932
+msgid ""
+"There are a number of other themes available at "
+"https://github.com/getpelican/pelican-themes. Pelican comes with :doc"
+":`pelican-themes`, a small script for managing themes."
+msgstr ""
+"还有很多主题可以在 https://github.com/getpelican/pelican-themes 上下载。Pelican使用一个称为 "
+":doc:`pelican-themes` 的小脚本来管理主题。"
+
+#: ../../settings.rst:1225 d512f8161e89412693a9acb00948e348
+msgid ""
+"You can define your own theme, either by starting from scratch or by "
+"duplicating and modifying a pre-existing theme. Here is :doc:`a guide on "
+"how to create your theme <themes>`."
+msgstr "你还可以创建自己的主题，可以从头开始，也可以在已有主题的基础上修改。请参看 :doc:`主题 <themes>` 文档。"
+
+#: ../../settings.rst:1229 696c62600fb4479bbbbc6a010024d2aa
+msgid "Following are example ways to specify your preferred theme::"
+msgstr "下面是几个指定某个主题的例子："
+
+#: ../../settings.rst:1240 e70559ce885e4db0aa17a71a9a2ed757
+msgid ""
+"The built-in ``simple`` theme can be customized using the following "
+"settings."
+msgstr "内置的 ``simple`` 主题可以使用以下设置项进行自定义。"
+
+#: ../../settings.rst:1244 67a316d5c57045448387c17445e71a53
+msgid "The URL of the stylesheet to use."
+msgstr "要使用的样式表的URL。"
+
+#: ../../settings.rst:1246 61fc5d9b1f0c4b6586fd458660e384ff
+msgid ""
+"The built-in ``notmyidea`` theme can make good use of the following "
+"settings. Feel free to use them in your themes as well."
+msgstr "下面的一下选项可以很好地作用于内置的 ``notmyidea`` 主题。当然在其他主题中你也可以尽情尝试这些选项。"
+
+#: ../../settings.rst:1251 fdd6425dea494c098212b971ed30bb71
+msgid "A subtitle to appear in the header."
+msgstr "页面顶部要显示的副标题。"
+
+#: ../../settings.rst:1255 706528c7601a4352a40399b6a7b8b8dd
+msgid ""
+"Pelican can handle Disqus comments. Specify the Disqus sitename "
+"identifier here."
+msgstr "可以在Pelican中使用Disqus的评论系统，此设置项用于设置Disqus的站点标识符。"
+
+#: ../../settings.rst:1260 c0ff07ee87814a60b798b0b22b562af0
+msgid ""
+"Your GitHub URL (if you have one). It will then use this information to "
+"create a GitHub ribbon."
+msgstr "指定你的GitHub URL（如果有的话），此信息将被用于创建GitHub功能区。"
+
+#: ../../settings.rst:1265 751716f49245400b99fdbb95052f8cb4
+msgid ""
+"Put any desired analytics scripts in this setting in ``publishconf.py``. "
+"Example:"
+msgstr "在 ``publishconf.py`` 中设置此项，用于指定想要使用的统计分析脚本。如下例："
+
+#: ../../settings.rst:1279 e65031f7629d4b06b837b05b80b68141
+msgid ""
+"A list of tuples (Title, URL) for additional menu items to appear at the "
+"beginning of the main menu."
+msgstr "元组 (标题, URL) 的列表，用于指定额外的菜单项，会添加在菜单栏的开头。"
+
+#: ../../settings.rst:1284 13839251877b49bb9962c0bc7b75f951
+msgid "A list of tuples (Title, URL) for links to appear on the header."
+msgstr "元组 (标题, URL) 的列表，用于指定要展示在网页开头的链接。"
+
+#: ../../settings.rst:1288 3a22924a9cb242029138754da6257800
+msgid "A list of tuples (Title, URL) to appear in the \"social\" section."
+msgstr "元组 (标题, URL) 的列表，用于指定要展示在“social”部分的内容。"
+
+#: ../../settings.rst:1292 4e64ba4558af483ea5234a40b6a7f667
+msgid ""
+"Allows for adding a button to articles to encourage others to tweet about"
+" them. Add your Twitter username if you want this button to appear."
+msgstr "允许在文章中添加按钮，以鼓励其他人发布有关它们的推文。如果希望显示此按钮，在此项中设置你的Twitter用户名。"
+
+#: ../../settings.rst:1297 1948a7f1556942869467e12269a83c97
+msgid ""
+"Allows override of the name of the links widget.  If not specified, "
+"defaults to \"links\"."
+msgstr "指定用于覆盖“links”部分的名称。默认值为“links”。"
+
+#: ../../settings.rst:1302 4fcc458a089d46ec80586edae17cd901
+msgid ""
+"Allows override of the name of the \"social\" widget.  If not specified, "
+"defaults to \"social\"."
+msgstr "指定用于覆盖“social”部分的名称。默认值为“social”。"
+
+#: ../../settings.rst:1305 481872501e9f4df687b70830929f429f
+msgid ""
+"In addition, you can use the \"wide\" version of the ``notmyidea`` theme "
+"by adding the following to your configuration::"
+msgstr "另外，你可以使用 ``notmyidea`` 主题的“宽屏”版本，在配置文件中添加下面这行配置即可："
+
+#: ../../settings.rst:1312 add39f626ea24dd6885a117bdbef1c2b
+msgid "Logging"
+msgstr "日志"
+
+#: ../../settings.rst:1314 16c2fccd07c44079989173c2b101439f
+msgid ""
+"Sometimes, a long list of warnings may appear during site generation. "
+"Finding the **meaningful** error message in the middle of tons of "
+"annoying log output can be quite tricky. In order to filter out redundant"
+" log messages, Pelican comes with the ``LOG_FILTER`` setting."
+msgstr ""
+"在站点生成过程中有时可能会出现一堆警告信息。在这一大堆日志输出中寻找 **有意义** "
+"的错误消息是非常棘手的。为了过滤掉多余的日志消息，可以在Pelican中指定 ``LOG_FILTER`` 设置。"
+
+#: ../../settings.rst:1319 0a8d1eb4cad64db1bdccc37e40c0d5b9
+msgid ""
+"``LOG_FILTER`` should be a list of tuples ``(level, msg)``, each of them "
+"being composed of the logging level (up to ``warning``) and the message "
+"to be ignored. Simply populate the list with the log messages you want to"
+" hide, and they will be filtered out."
+msgstr ""
+"``LOG_FILTER`` 是元组 ``(level, msg)`` ，level指定日志记录等级（最高为 ``warning`` "
+"），msg指定要忽略的消息。将想要隐藏的日志消息添加到此列表中就可以将他们过滤掉。"
+
+#: ../../settings.rst:1324 ../../settings.rst:1332
+#: a060e3f3d20b4f5ca0891c81e1e6bf44
+msgid "For example::"
+msgstr "例如："
+
+#: ../../settings.rst:1329 66bf87b59c0547d6992c494296f54cba
+msgid ""
+"It is possible to filter out messages by a template. Check out source "
+"code to obtain a template."
+msgstr "用模板字符串指定要过滤的消息也是可以的。具体的消息种类请查看源码。"
+
+#: ../../settings.rst:1339 77c817d503564c58b81e694cd2f2c357
+msgid ""
+"Silencing messages by templates is a dangerous feature. It is possible to"
+" unintentionally filter out multiple message types with the same template"
+" (including messages from future Pelican versions). Proceed with caution."
+msgstr "通过模板过滤忽略消息是一个危险的功能。 使用同一模板可能会无意中过滤掉多种消息类型（包括来自新版本Pelican的消息），请谨慎行事。"
+
+#: ../../settings.rst:1345 2ca9fb8cc8854442b52381580df2423e
+msgid "This option does nothing if ``--debug`` is passed."
+msgstr "当使用了 ``--debug`` 参数，此项设置就不会起作用。"
+
+#: ../../settings.rst:1351 a915c4d447a44d9d8f1df8aeb978a590
+msgid "Reading only modified content"
+msgstr "只读取修改过的内容"
+
+#: ../../settings.rst:1353 7c899d3702eb4c9389b29caa1dd199bf
+msgid ""
+"To speed up the build process, Pelican can optionally read only articles "
+"and pages with modified content."
+msgstr "为了加速网站构建过程，Pelican能够只读取修改过内容的文章和页面。"
+
+#: ../../settings.rst:1356 22170a8c737540d6b2826de10d97f57e
+msgid "When Pelican is about to read some content source file:"
+msgstr "当Pelican准备读取内容源文件时，会执行下面的规则："
+
+#: ../../settings.rst:1358 c746f9e5624441c4a53d81f9049910d8
+msgid ""
+"The hash or modification time information for the file from a previous "
+"build are loaded from a cache file if ``LOAD_CONTENT_CACHE`` is ``True``."
+" These files are stored in the ``CACHE_PATH`` directory.  If the file has"
+" no record in the cache file, it is read as usual."
+msgstr ""
+"若 ``LOAD_CONTENT_CACHE`` 为 ``True`` "
+"，则从缓存文件中加载上一次构建时文件的哈希值或修改时间。这些缓存的文件存储在 ``CACHE_PATH`` "
+"所指定的目录中。若文件是新的，在缓存文件中没有记录，则照常读取。"
+
+#: ../../settings.rst:1362 20764c61c87044a6a7cfaca089dbe088
+msgid "The file is checked according to ``CHECK_MODIFIED_METHOD``:"
+msgstr "文件会以 ``CHECK_MODIFIED_METHOD`` 设置的方式检查："
+
+#: ../../settings.rst:1368 f31c72607b3c4c6e99d97c7db70ffdd6
+msgid ""
+"If set to anything else or the necessary information about the file "
+"cannot be found in the cache file, the content is read as usual."
+msgstr "如果设置为其他任何值或在缓存文件中无法找到有关该文件的必要信息，则将照常读取内容。"
+
+#: ../../settings.rst:1371 32c11190a05847fc94ef489e2cd75ebc
+msgid ""
+"If the file is considered unchanged, the content data saved in a previous"
+" build corresponding to the file is loaded from the cache, and the file "
+"is not read."
+msgstr "如果Pelican认为文件没有更改过，会直接从上一次构建的对应文件中加载内容，源文件就不会被读取。"
+
+#: ../../settings.rst:1374 8a6a10580d4646c08562a415ab80b032
+msgid ""
+"If the file is considered changed, the file is read and the new "
+"modification information and the content data are saved to the cache if "
+"``CACHE_CONTENT`` is ``True``."
+msgstr ""
+"若Pelican认为文件更改过了，则会读取源文件；若 ``CACHE_CONTENT`` 设为了 ``True`` "
+"，Pelican还会将修改后的信息以及内容数据存入缓存。"
+
+#: ../../settings.rst:1378 4d2198d1f1a04c0ab92bd5a2bfe2f3bd
+msgid ""
+"If ``CONTENT_CACHING_LAYER`` is set to ``'reader'`` (the default), the "
+"raw content and metadata returned by a reader are cached. If this setting"
+" is instead set to ``'generator'``, the processed content object is "
+"cached. Caching the processed content object may conflict with plugins "
+"(as some reading related signals may be skipped) and the "
+"``WITH_FUTURE_DATES`` functionality (as the ``draft`` status of the "
+"cached content objects would not change automatically over time)."
+msgstr ""
+"若 ``CONTENT_CACHING_LAYER`` 设为了 ``'reader'`` （默认值），则缓存reader返回的原始内容和元数据；若"
+" ``CONTENT_CACHING_LAYER`` 设为了 ``'generator'`` "
+"，则缓存处理过后的内容对象。缓存已处理的内容对象可能会和插件（因为可能会跳过一些与读取相关的信号）与 ``WITH_FUTURE_DATES`` "
+"的功能（因为已处理内容对象的 ``draft`` 状态不会改变）冲突。"
+
+#: ../../settings.rst:1386 75139bf4fb6f40649b4691f4158d1eee
+msgid ""
+"Checking modification times is faster than comparing file hashes, but it "
+"is not as reliable because ``mtime`` information can be lost, e.g., when "
+"copying content source files using the ``cp`` or ``rsync`` commands "
+"without the ``mtime`` preservation mode (which for ``rsync`` can be "
+"invoked by passing the ``--archive`` flag)."
+msgstr ""
+"检查文件修改时间比计算文件哈希更快，但事实上却不太可靠，因为 ``mtime`` 信息有丢失的可能。例如，使用 ``cp`` 或 "
+"``rsync`` 命令时没有开启 ``mtime`` 保留模式。（rsync可以通过指定 ``--archive`` 标志启用 "
+"``mtime`` 保留模式）"
+
+#: ../../settings.rst:1392 f556d8c0bd75495ca85a41e310637101
+msgid ""
+"The cache files are Python pickles, so they may not be readable by "
+"different versions of Python as the pickle format often changes. If such "
+"an error is encountered, it is caught and the cache file is rebuilt "
+"automatically in the new format. The cache files will also be rebuilt "
+"after the ``GZIP_CACHE`` setting has been changed."
+msgstr ""
+"缓存文件使用的是Python "
+"pickles，因此不同版本的Python由于pickle文件格式变化可能无法读取缓存。如果遇到此类错误，会自动以新格式重新构建缓存。另外，当 "
+"``GZIP_CACHE`` 设置发生变化后，缓存也会自动重建。"
+
+#: ../../settings.rst:1398 2b6a584c560d467ba34a744bb37c0006
+msgid ""
+"The ``--ignore-cache`` command-line option is useful when the whole cache"
+" needs to be regenerated, such as when making modifications to the "
+"settings file that will affect the cached content, or just for debugging "
+"purposes. When Pelican runs in autoreload mode, modification of the "
+"settings file will make it ignore the cache automatically if "
+"``AUTORELOAD_IGNORE_CACHE`` is ``True``."
+msgstr ""
+"当需要重新生成整个缓存时，可以使用 ``--ignore-cache`` "
+"命令行选项，例如当需要修改会影响缓存内容的设置项时，或是调试时，都可以使用 ``--ignore-cache`` 。若 "
+"``AUTORELOAD_IGNORE_CACHE`` 设为了 ``True`` ，修改设置文件时会自动忽略缓存。"
+
+#: ../../settings.rst:1404 a38225b961234c2e96f6d0f2545ed455
+msgid ""
+"Note that even when using cached content, all output is always written, "
+"so the modification times of the generated ``*.html`` files will always "
+"change. Therefore, ``rsync``-based uploading may benefit from the "
+"``--checksum`` option."
+msgstr ""
+"需要注意的是，即使使用了缓存的内容，最终的输出文件也始终会进行重新写入，因此生成的 ``*.html`` 文件的修改时间始终会变化。所以，基于 "
+"``rsync`` 进行上传时，可以考虑使用 ``--checksum`` 选项。"
+
+#: ../../settings.rst:1411 2aa4b6fbbab24465ab36a606cecf299c
+msgid "Example settings"
+msgstr "配置示例"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/sphinx.po b/docs/locale/zh_CN/LC_MESSAGES/sphinx.po
new file mode 100644
index 00000000..860cbcb2
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/sphinx.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../_templates/page.html:68 697aead398874e06aa15cfd74d134745
+msgid "Back to top"
+msgstr "返回顶部"
+
+#: ../../_templates/page.html:101 f91a64e54aae49c2bd09a944ea693193
+msgid "Next"
+msgstr "下一节"
+
+#: ../../_templates/page.html:113 6c3ad069077b4e2cb6e1f77cc2962881
+msgid "Previous"
+msgstr "前一节"
+
+#: ../../_templates/page.html:116 e83e03d0b50c4065a9f87db25a23b3ee
+msgid "Home"
+msgstr "首页"
+
+#: ../../_templates/page.html:129 1d0fdb4c0b4e420283101ba5c21ac985
+#, python-format
+msgid "<a href=\"%(path)s\">Copyright</a> &#169; %(copyright)s"
+msgstr "<a href=\"%(path)s\">Copyright</a> &#169; %(copyright)s"
+
+#: ../../_templates/page.html:133 0a35c662e6574da48f7ac5c6b2c82874
+#, python-format
+msgid ""
+"Copyright &#169; %(copyright)s, <a "
+"href=\"https://justinmayer.com\">Justin Mayer</a>, Alexis Metaireau, and "
+"contributors"
+msgstr ""
+"Copyright &#169; %(copyright)s, <a "
+"href=\"https://justinmayer.com\">Justin Mayer</a>, Alexis Metaireau, and "
+"contributors"
+
+#: ../../_templates/page.html:141 07b89372db484251bfcd3b54e0845bf0
+#, python-format
+msgid "Last updated on %(last_updated)s"
+msgstr "最后更新于 %(last_updated)s"
+
+#: ../../_templates/page.html:187 2eb9f1b479a7405290a91d8e1962f265
+msgid "On this page"
+msgstr "本页目录"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/themes.po b/docs/locale/zh_CN/LC_MESSAGES/themes.po
new file mode 100644
index 00000000..5f626265
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/themes.po
@@ -0,0 +1,1269 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-25 20:36+0800\n"
+"PO-Revision-Date: 2024-06-26 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../themes.rst:4 89902fe106274689a45bfad9447f4485
+msgid "Themes"
+msgstr "主题"
+
+#: ../../themes.rst:6 877321a191544e6db8b1fe257b7bfc82
+msgid ""
+"There is a community-managed repository of `Pelican Themes`_ for people "
+"to share and use."
+msgstr ""
+"有一个由社区管理的主题仓库 `Pelican Themes`_ 供大家使用。"
+
+#: ../../themes.rst:9 6f0fdcf7ea28413482621e993a00aba2
+msgid ""
+"Please note that while we do our best to review and merge theme "
+"contributions, they are submitted by the Pelican community and thus may "
+"have varying levels of support and interoperability."
+msgstr ""
+"请注意，虽然我们已经尽全力审查与合并主题，但是由于他们是由社区提交的，因此"
+"支持性和互操作性各有不同。"
+
+#: ../../themes.rst:14 f4083056816746ad8779108e8605f782
+msgid "Creating Themes"
+msgstr "创建主题"
+
+#: ../../themes.rst:16 11544ff05900447c9d89b7e4b762b456
+msgid ""
+"To generate its HTML output, Pelican uses the `Jinja "
+"<https://palletsprojects.com/p/jinja/>`_ templating engine due to its "
+"flexibility and straightforward syntax. If you want to create your own "
+"theme, feel free to take inspiration from the `\"simple\" theme "
+"<https://github.com/getpelican/pelican/tree/main/pelican/themes/simple/templates>`_."
+msgstr ""
+"Pelican使用 `Jinja <https://palletsprojects.com/p/jinja/>`_ 来生成HTML。"
+"如果你想要创建你自己的主题，请从 `\"simple\" 主题 "
+"<https://github.com/getpelican/pelican/tree/master/pelican/themes/simple/templates>`_ "
+"中找寻灵感。"
+
+#: ../../themes.rst:22 646df766f1a64f6e89ba22466a9a57ee
+msgid ""
+"To generate your site using a theme you have created (or downloaded "
+"manually and then modified), you can specify that theme via the ``-t`` "
+"flag::"
+msgstr ""
+"要使用你自己创建的主题生成站点，你可以通过命令行中的 ``-t`` 参数指定主题："
+
+#: ../../themes.rst:27 f3b0f229f56444d0b09f27dcc5076398
+msgid ""
+"If you'd rather not specify the theme on every invocation, you can define"
+" ``THEME`` in your settings to point to the location of your preferred "
+"theme."
+msgstr ""
+"如果你不希望每次都通过命令行手动指定主题，你可以在配置文件中定义 ``THEME`` "
+"来指定你希望使用的主题的位置。"
+
+#: ../../themes.rst:32 b8028cb48f844e16b49bd30e6f7c7ec5
+msgid "Structure"
+msgstr "结构"
+
+#: ../../themes.rst:34 a3fcbbe24e4c4448b09db74e7140dd52
+msgid "To make your own theme, you must follow the following structure::"
+msgstr "你需要遵循下面的结构来制作你自己的主题："
+
+#: ../../themes.rst:52 153830a0dc1c47358f1fd67c11174676
+msgid ""
+"`static` contains all the static assets, which will be copied to the "
+"output `theme` folder. The above filesystem layout includes CSS and image"
+" folders, but those are just examples. Put what you need here."
+msgstr ""
+"`static` 文件夹包含了所有静态资源，会被复制输出到 `theme` 文件夹中。上面的文件夹"
+"布局结构包括了CSS和image文件夹，但是这只是举个例子。你可以根据需求安排文件。"
+
+#: ../../themes.rst:56 e923579cd7b74cdc94f43d4da4e47b2e
+msgid ""
+"`templates` contains all the templates that will be used to generate the "
+"content. The template files listed above are mandatory; you can add your "
+"own templates if it helps you keep things organized while creating your "
+"theme."
+msgstr ""
+"`templates` 文件夹包含了需要用到的所有模板文件，这些模板文件会用于生成网站内容。"
+"上面列出的模板文件都是必须有的。当然，你可以添加一些其他的模板来帮助组织主题文件。"
+
+#: ../../themes.rst:64 354197c97b424a53b682d31d2432bbd7
+msgid "Templates and Variables"
+msgstr "模板和变量"
+
+#: ../../themes.rst:66 263ff11382b1433082f35b605ed76f4b
+msgid ""
+"The idea is to use a simple syntax that you can embed into your HTML "
+"pages. This document describes which templates should exist in a theme, "
+"and which variables will be passed to each template at generation time."
+msgstr ""
+"你可以将一些简单的语法嵌入到HTML文件中。以下文档描述了哪些模板需要存在于主题中，"
+"以及有哪些变量可以在模板中使用。"
+
+#: ../../themes.rst:70 b511ed5df3fc4f75a8e9ca6e874b6cf7
+msgid ""
+"All templates will receive the variables defined in your settings file, "
+"as long as they are in all-caps. You can access them directly."
+msgstr ""
+"所有模板都能接收到配置文件中定义的变量，变量名都是全大写的，可以直接使用。"
+
+#: ../../themes.rst:77 903d9890350a4b08a3c5e11bdc202d10
+msgid "Common Variables"
+msgstr "通用变量"
+
+#: ../../themes.rst:79 fa18fc2c334d4b51ae7545d24a8b5df5
+msgid "All of these settings will be available to all templates."
+msgstr "下列变量在所有模板中均可使用。"
+
+#: ../../themes.rst:82 ../../themes.rst:170 ../../themes.rst:199
+#: ../../themes.rst:233 ../../themes.rst:266 ../../themes.rst:306
+#: ../../themes.rst:322 ../../themes.rst:355 1a4a93014c47420d8957a7f2209d6525
+#: 2d1889e9a23a4cb298d38366289f381d 63553de1af084662a41fded0a700913d
+#: 87ec83ae24564eaf831ada4f4aab01a3 8907d23ec9f94b5b83a9bdd717fc95bd
+#: 951f8b457243424da836ecf85c5db0e1 a3866a27423c4782a6d47b28d41e1144
+#: eee781bef37d4e94a9796ff50dd63447
+msgid "Variable"
+msgstr "变量名"
+
+#: ../../themes.rst:82 ../../themes.rst:170 ../../themes.rst:199
+#: ../../themes.rst:233 ../../themes.rst:266 ../../themes.rst:306
+#: ../../themes.rst:322 ../../themes.rst:355 ../../themes.rst:446
+#: ../../themes.rst:490 ../../themes.rst:509 17384d55be144a6ab765864d5833f96f
+#: 2e69f59326a04747b7655b61a713bcf5 46ecfcac4e0b48879a665f5ded2abc4c
+#: 4b4d47cfd511455db6eb2793e60907b6 6b9bab6f2603419da0032456f90e326a
+#: 9cadd069ae2b471eaaeeac1281b7f88d af7a426781734d61a2f1c95aff008adc
+#: c1274b2e4b5442d7b9774ffacdd22c1a f53c09af9fd642f7a26552ada70160d8
+#: f9ffc9bb411340199e68bb28e1c38e97 ff0cc823d5f44c71be4d9dfb09198ae5
+msgid "Description"
+msgstr "描述"
+
+#: ../../themes.rst:84 92684afe53b74e5eacca15acf5567c1c
+msgid "output_file"
+msgstr "output_file"
+
+#: ../../themes.rst:84 9534d42aed3a4f5bbcefb8f9aebefc9e
+msgid ""
+"The name of the file currently being generated. For instance, when "
+"Pelican is rendering the home page, output_file will be \"index.html\"."
+msgstr ""
+"当前正在生成的文件名。例如在Pelican渲染主页时，此变量的值就是“index.html”。"
+
+#: ../../themes.rst:87 ../../themes.rst:202 ../../themes.rst:236
+#: ../../themes.rst:325 ../../themes.rst:406 5e810b19b7934988905a23189aa25584
+#: 7ce75b9ff72a41368aa4d85147b3ee01 b304eca8c6ab4a97b9f9816e48e785a3
+#: b4b801b67a5f4a038664df8273752437 f6d5de62ec124133abd3e71d052076c9
+msgid "articles"
+msgstr "articles"
+
+#: ../../themes.rst:87 a37338288479498dabc0d35a3499ae2a
+msgid ""
+"The list of articles, ordered descending by date. All the elements are "
+"`Article` objects, so you can access their attributes (e.g. title, "
+"summary, author etc.). Sometimes this is shadowed (for instance, in the "
+"tags page). You will then find info about it in the `all_articles` "
+"variable."
+msgstr ""
+"文章列表，以日期降序排列。所有元素都是 `Article` 对象，因此你可以访问 `Article` "
+"对象的属性（例如title、summary、author等）。有时候此变量是隐藏的（例如在标签页面中）。"
+"但仍可以在 `all_articles` 变量中找到相关信息。"
+
+#: ../../themes.rst:93 ../../themes.rst:203 ../../themes.rst:237
+#: ../../themes.rst:326 ../../themes.rst:408 100c5d8c8602411da08bfcde279249f2
+#: 24ff711ecb9e4308b52d404b822244f3 389e8343632d48048b4ced0128d20011
+#: 3d9a59ea4c7a428998e0bb4df84c6576 b0fe593f0e774b7a9b33ff8e44c8284a
+msgid "dates"
+msgstr "dates"
+
+#: ../../themes.rst:93 957d856345744280bb8cde05d15b934c
+msgid "The same list of articles, but ordered by date, ascending."
+msgstr "和articles相同的文章列表，但是以日期升序排列"
+
+#: ../../themes.rst:95 850f75175d0f44c9987b95b244e0e085
+msgid "hidden_articles"
+msgstr "hidden_articles"
+
+#: ../../themes.rst:95 2853b0eb27e241c78c5ad83d8d502905
+msgid "The list of hidden articles"
+msgstr "处于隐藏状态的文章的列表"
+
+#: ../../themes.rst:96 68baf2e00aeb4fbbb9b18c562f5215de
+msgid "drafts"
+msgstr "drafts"
+
+#: ../../themes.rst:96 3eefce5813424f4b8a5edb283ec34699
+msgid "The list of draft articles"
+msgstr "处于草稿状态的文章的列表"
+
+#: ../../themes.rst:97 2bde499d530048a8ba3e5fb72a4a1840
+msgid "period_archives"
+msgstr "period_archives"
+
+#: ../../themes.rst:97 afad8caed5294d4bae4922b2674806ff
+msgid ""
+"A dictionary containing elements related to time-period archives (if "
+"enabled). See the section :ref:`Listing and Linking to Period Archives "
+"<period_archives_variable>` for details."
+msgstr ""
+"一个字典，包含与时间段存档相关的元素（若启用了时间段存档）。详见 "
+":ref:`时间段存档的列表和链接 <period_archives_variable>`"
+
+#: ../../themes.rst:101 ../../themes.rst:450 0b796b141cc24e34b57bc554273720c1
+#: d5bf3dd243d04c55ace1738de4d5b81b
+msgid "authors"
+msgstr "authors"
+
+#: ../../themes.rst:101 10010e1b527e4eedb7477d52bbf0ed94
+msgid ""
+"A list of (author, articles) tuples, containing all the authors and "
+"corresponding articles (values)"
+msgstr ""
+"元组(author, articles)的列表，包含所有作者及对应文章。"
+
+#: ../../themes.rst:103 7bb90c8b99344911b68de2dc8ba1a9d7
+msgid "categories"
+msgstr "categories"
+
+#: ../../themes.rst:103 becaee92fa434a47bb2ffa4ba6d3d863
+msgid ""
+"A list of (category, articles) tuples, containing all the categories and "
+"corresponding articles (values)"
+msgstr ""
+"元组(category, articles)的列表，包含所有分类及对应文章"
+
+#: ../../themes.rst:105 ../../themes.rst:470 ../../themes.rst:529
+#: 9d21fa3040b14b91a47dff071caae024 b8597a5c585e43a0bb544bfe8cf9bd26
+#: d692f555b4ea461ca4d8c0c65a67f21a
+msgid "tags"
+msgstr "tags"
+
+#: ../../themes.rst:105 0c0424ec68a74f578e271d0b1fe44b28
+msgid ""
+"A list of (tag, articles) tuples, containing all the tags and "
+"corresponding articles (values)"
+msgstr ""
+"元组(tag, articles)的列表，包含所有标签及对应文章"
+
+#: ../../themes.rst:107 196d2ef3131b4ab2b7e90a43d8c17dcd
+msgid "pages"
+msgstr "pages"
+
+#: ../../themes.rst:107 abb2b6303bb44b3e9335fcc9bfa2a704
+msgid "The list of pages"
+msgstr "页面的列表"
+
+#: ../../themes.rst:108 14a71679646448d59f6ccc2c63c2cc8b
+msgid "hidden_pages"
+msgstr "hidden_pages"
+
+#: ../../themes.rst:108 dfc32fdbe91240a78c15ff048e2f58ce
+msgid "The list of hidden pages"
+msgstr "处于隐藏状态的页面的列表"
+
+#: ../../themes.rst:109 78a644f88301408e977449a4fc0ffe12
+msgid "draft_pages"
+msgstr "draft_pages"
+
+#: ../../themes.rst:109 7418727938f343da8cb0071239f67d71
+msgid "The list of draft pages"
+msgstr "处于草稿状态的页面的列表"
+
+#: ../../themes.rst:114 04e0bd5e7d504ff8975c8492ce8c250a
+msgid "Sorting"
+msgstr "排序"
+
+#: ../../themes.rst:116 edae254af6974908bbeb7125dca0c708
+msgid ""
+"URL wrappers (currently categories, tags, and authors), have comparison "
+"methods that allow them to be easily sorted by name::"
+msgstr ""
+"URL包装器（分类、标签、作者），都拥有比较方法，使其易于按名称排序："
+
+#: ../../themes.rst:121 878bb8a3a3064552b7608444cb419856
+msgid ""
+"If you want to sort based on different criteria, `Jinja's sort command`__"
+" has a number of options."
+msgstr ""
+"如果你想要以不同条件进行排序，可以使用 `Jinja的排序命令`__ ，其中有丰富的选项。"
+
+#: ../../themes.rst:128 3f3c857d79ed447f9dd3f5ce91082747
+msgid "Date Formatting"
+msgstr "日期格式"
+
+#: ../../themes.rst:130 37d3f94188aa435297071a869bfdca96
+msgid ""
+"Pelican formats the date according to your settings and locale "
+"(``DATE_FORMATS``/``DEFAULT_DATE_FORMAT``) and provides a ``locale_date``"
+" attribute. On the other hand, the ``date`` attribute will be a "
+"`datetime`_ object. If you need custom formatting for a date different "
+"than your settings, use the Jinja filter ``strftime`` that comes with "
+"Pelican. Usage is same as Python `strftime`_ format, but the filter will "
+"do the right thing and format your date according to the locale given in "
+"your settings::"
+msgstr ""
+"Pelican会根据设置和地区（ ``DATE_FORMATS``/``DEFAULT_DATE_FORMAT`` ）对日期"
+"进行格式化，同时还会提供一个 ``locale_date`` 属性。 ``date`` 属性以 `datetime`_ "
+"类表示。如果你需要使用与设置中不同的自定义日期格式，使用Jinja中的 ``strftime`` "
+"过滤器即可。用法Python中的 `strftime`_ 相同，但是过滤器会根据设置中给出的地区对"
+"日期进行格式化："
+
+#: ../../themes.rst:144 cc5bc390c54b4c4f96641b2d8efe2169
+msgid "Checking Loaded Plugins"
+msgstr "检测已加载的插件"
+
+#: ../../themes.rst:146 2805eea94378479eafe1f9e214875f44
+msgid ""
+"Pelican provides a ``plugin_enabled`` Jinja test for checking if a "
+"certain plugin is enabled. This test accepts a plugin name as a string "
+"and will return a Boolean. Namespace plugins can be specified by full "
+"name (``pelican.plugins.plugin_name``) or short name (``plugin_name``). "
+"The following example uses the ``webassets`` plugin to minify CSS if the "
+"plugin is enabled and otherwise falls back to regular CSS::"
+msgstr ""
+"Pelican 提供了一个名为 ``plugin_enabled`` 的Jinja test，可用于检测某个插件是否启用。"
+"此test以字符串形式接受一个插件名称，并且返回一个布尔值。命名空间插件可以通过全名"
+"（ ``pelican.plugins.plugin_name`` ）或者短名称（ ``plugin_name`` ）指定。"
+"下面的例子中通过 ``webassets`` 插件来减小CSS的体积，但若此插件未启用，则回滚回普通的CSS："
+
+#: ../../themes.rst:162 f31869529aef47a28224e3da3bc0c702
+msgid "index.html"
+msgstr "index.html"
+
+#: ../../themes.rst:164 d412aecaa8e34b2ca56032be8711b258
+msgid "This is the home page or index of your blog, generated at ``index.html``."
+msgstr "站点的主页，可以理解为推文的索引页，生成为 ``index.html`` 。"
+
+#: ../../themes.rst:166 396a268629374d1aaef9857ccff9ee53
+msgid ""
+"If pagination is active, subsequent pages will reside in "
+"``index{number}.html``."
+msgstr ""
+"如果开启了分页功能，后续的页面会以 ``index{number}.html`` 的形式生成。"
+
+#: ../../themes.rst:172 ../../themes.rst:205 ../../themes.rst:239
+#: ../../themes.rst:328 08f6e73beb544181b9b2627ad68dbbfe
+#: 244d220cd8684bb68489bf61227f87b5 34b8185111f54d8fbffa9ac5a87302a8
+#: d7bcb30486284e9dac239a40d4b9f229
+msgid "articles_paginator"
+msgstr "articles_paginator"
+
+#: ../../themes.rst:172 ../../themes.rst:205 ../../themes.rst:239
+#: ../../themes.rst:328 3fa810e9ae1d4dc1839754210e5d2570
+#: 9554b801f6df475caedff0345c5dfb93 bbc15c5dfe934bcd9e5f258f2008af11
+#: e5952c856b7d4670a93a99863ef94c49
+msgid "A paginator object for the list of articles"
+msgstr "一个分页器对象，其中存放着文章列表"
+
+#: ../../themes.rst:173 ../../themes.rst:206 ../../themes.rst:240
+#: ../../themes.rst:329 2362ac4e51264ba8b1a38272414c026c
+#: 755bbbd447fe420eb124c1dcbfecd767 7eaa5ec86823488fa38009e3a5bf1756
+#: 82eef974e6c2428eb29528b9a6cae6d3
+msgid "articles_page"
+msgstr "articles_page"
+
+#: ../../themes.rst:173 ../../themes.rst:206 ../../themes.rst:240
+#: ../../themes.rst:329 283875f54861414396ce8695d3002f7d
+#: b7400c136a8340df9eaa5e5f29b81766 ba00d04cfe6c4040bf704c17be73470f
+#: cdb81b11ea1a44d2890915c496eada40
+msgid "The current page of articles"
+msgstr "当前分页包含的文章的列表"
+
+#: ../../themes.rst:174 ../../themes.rst:207 ../../themes.rst:241
+#: ../../themes.rst:330 4fd0b5d101a74f23b8fb32e95b35af7f
+#: 6d6631ebf17e436ebd910cb778fa47e6 8869fe25c487475ea64c0ab80ee8c48b
+#: efd8e4bfc9234996870b90026c00f695
+msgid "articles_previous_page"
+msgstr "articles_previous_page"
+
+#: ../../themes.rst:174 ../../themes.rst:207 ../../themes.rst:241
+#: ../../themes.rst:330 228a67aba662491bb3e8b8f53d936921
+#: 4e0499da01e146d78c4c50ab293ceaec a9c5b7f1fb854f359f596f2de65510e9
+#: eaeb09fc611545ec87fbdbe32b7da599
+msgid "The previous page of articles (``None`` if page does not exist)"
+msgstr "前一分页包含的文章的列表（若没有前一页，此变量值为 ``None`` ）"
+
+#: ../../themes.rst:176 ../../themes.rst:209 ../../themes.rst:243
+#: ../../themes.rst:332 44e81860c57c4136953fec9d390a1896
+#: 92e4766edf0d4f1a94801521a3ccc8c6 c7f7e0e63a5e4b3f838df1082628f71f
+#: eb4130c14eef4dc59383097aa4bfd9cc
+msgid "articles_next_page"
+msgstr "articles_next_page"
+
+#: ../../themes.rst:176 ../../themes.rst:209 ../../themes.rst:243
+#: ../../themes.rst:332 0aaccba1bbd843f3a13da1b8b206cb47
+#: 87d1cad4927745329bf74840147f3cae 9df65206ff0040caae56f0d2185e63d4
+#: a38e11e768ec40acafdc943d00fd1c39
+msgid "The next page of articles (``None`` if page does not exist)"
+msgstr "后一分页包含的文章的列表（若没有后一页，此变量值为 ``None`` ）"
+
+#: ../../themes.rst:178 ../../themes.rst:211 ../../themes.rst:245
+#: ../../themes.rst:334 06c22ce247524bc59649f37ac570360d
+#: 3f913f031d1544049d4204b5c786e8eb 80e9ef1975ac43cb87b1cb1e2292a15d
+#: 9d50cd6bc33542ff9ec268664242cdac
+msgid "dates_paginator"
+msgstr "dates_paginator"
+
+#: ../../themes.rst:178 ../../themes.rst:211 470234ce4ff84c1282773c5e074a0984
+#: 66b61e29b0d94312be1924ffbf6a76f0
+msgid "A paginator object for the article list, ordered by date, ascending."
+msgstr "分页器对象，存放着以日期正序排列的文章列表。"
+
+#: ../../themes.rst:180 ../../themes.rst:213 ../../themes.rst:247
+#: ../../themes.rst:336 06688dad88b84be0a1b8a77904d3e36c
+#: 4c3336d0cc6146c0854e1a3b0a01226a c22fbf78288d40c2a7f53a0e05827bc9
+#: cbead4319b8449948907728edd1563e5
+msgid "dates_page"
+msgstr "dates_page"
+
+#: ../../themes.rst:180 ../../themes.rst:213 332ab164d0d14965a064f41289fd8b5a
+#: 9c0313b487514c1a8ea9ed741a022a98
+msgid "The current page of articles, ordered by date, ascending."
+msgstr "以日期正序（从旧到新）排列时，当前分页包含的文章的列表。"
+
+#: ../../themes.rst:182 ../../themes.rst:215 ../../themes.rst:249
+#: ../../themes.rst:338 225a16b1ca764c1297a6126e82294ea5
+#: 25b7b90357db4d999771a5dbb3ee46f0 f42233112a7940cfa0e448f72c254385
+#: fd276760afc04d66a3abb295db0c491b
+msgid "dates_previous_page"
+msgstr "dates_previous_page"
+
+#: ../../themes.rst:182 ../../themes.rst:215 ../../themes.rst:249
+#: ../../themes.rst:338 058e893b353046ffbdee082ea0ddcde2
+#: 0b15ab2a1e6e4d58a6648a72a2207ae5 13dc7929b6e9453bac9c30a9abf9a5f6
+#: 62de8d49e771412a89266c2d8731bd49
+msgid ""
+"The previous page of articles, ordered by date, ascending (``None`` if "
+"page does not exist)"
+msgstr ""
+"以日期正序（从旧到新）排列时，前一分页包含的文章的列表。"
+"（若没有前一页，此变量值为 ``None`` ）"
+
+#: ../../themes.rst:184 ../../themes.rst:217 ../../themes.rst:251
+#: ../../themes.rst:340 156f78d11b96475a9d52085860a1e6c5
+#: 33b0c94c117c41ee955df750c1fd728c 5763fdf2c1cd43fc96013756029661d6
+#: add31a94f5dc490684aac08b7bcad8e5
+msgid "dates_next_page"
+msgstr "dates_next_page"
+
+#: ../../themes.rst:184 ../../themes.rst:217 ../../themes.rst:251
+#: ../../themes.rst:340 a61d56f03b5946899f9e951eba65df08
+#: ac60da91c10449cc8d519beb0b2f1102 cdfa2284c2c54da3a366d1deaefab551
+#: dc9ea16f9bb44d1d8d1032397aac1a8e
+msgid ""
+"The next page of articles, ordered by date, ascending (``None`` if page "
+"does not exist)"
+msgstr ""
+"以日期正序（从旧到新）排列时，后一分页包含的文章的列表。"
+"（若没有后一页，此变量值为 ``None`` ）"
+
+#: ../../themes.rst:186 ../../themes.rst:219 ../../themes.rst:253
+#: ../../themes.rst:342 ../../themes.rst:493 501f30d99fc441f3b5070f8703c7e324
+#: 6a4735af4aa84d56bf745244c29f7e0c 8c9158f1b7f04d5ea07058d816be2e70
+#: cf1d564d80d34860a32fcddbac41375c e8c83819bbc0448799bae5ea19538100
+msgid "page_name"
+msgstr "page_name"
+
+#: ../../themes.rst:186 99f67be157844a6e85f1ebe6d40c9182
+msgid "'index' -- useful for pagination links"
+msgstr "值为 'index' ——在分页链接中很实用"
+
+#: ../../themes.rst:191 01c6da9f6c7b431d971fa0ec426f948f
+msgid "author.html"
+msgstr "author.html"
+
+#: ../../themes.rst:193 feee792cfdbf49b3a289762c8e0e0edb
+msgid ""
+"This template will be processed for each of the existing authors, with "
+"output generated according to the ``AUTHOR_SAVE_AS`` setting (`Default:` "
+"``author/{slug}.html``). If pagination is active, subsequent pages will "
+"by default reside at ``author/{slug}{number}.html``."
+msgstr ""
+"此模板会应用于每个已存在的作者上，并根据配置项 ``AUTHOR_SAVE_AS`` 确定输出路径"
+"（ `默认值为：` ``author/{slug}.html`` ）。如果启用了分页，后续页面会保存为 "
+"``author/{slug}{number}.html`` 。"
+
+#: ../../themes.rst:201 ../../themes.rst:448 ../../themes.rst:511
+#: 1f0784e3f85140afab2178a061897017 af9d9be813ae4f43be00ff6770a75fe5
+#: f9ea3f154b7f4268ab412ea2e6bf6c87
+msgid "author"
+msgstr "author"
+
+#: ../../themes.rst:201 01d284aaf9534cc5852557cc4063b6dc
+msgid "The name of the author being processed"
+msgstr "当前正在处理的作者名"
+
+#: ../../themes.rst:202 9a53c5cec5fb4fdd8df98bab9cfc77fa
+msgid "Articles by this author"
+msgstr "当前作者的文章"
+
+#: ../../themes.rst:203 4d5fc91dac964d63a9ac28ff07f44b97
+msgid "Articles by this author, but ordered by date, ascending"
+msgstr "当前作者的文章，以日期正序排列"
+
+#: ../../themes.rst:219 2f5aca7ff98c4de4bfdd82d6e57803e1
+msgid ""
+"AUTHOR_URL where everything after `{slug}` is removed -- useful for "
+"pagination links"
+msgstr ""
+"变量值与AUTHOR_URL一致，所有在 `{slug}` 之后的字符都会被删除——这对分页链接很有用"
+
+#: ../../themes.rst:225 a603e6fd07f7404ca86716249a4347ef
+msgid "category.html"
+msgstr "category.html"
+
+#: ../../themes.rst:227 10beee5e95394fd2ac3ab29e76cc06fc
+msgid ""
+"This template will be processed for each of the existing categories, with"
+" output generated according to the ``CATEGORY_SAVE_AS`` setting "
+"(`Default:` ``category/{slug}.html``). If pagination is active, "
+"subsequent pages will by default reside at "
+"``category/{slug}{number}.html``."
+msgstr ""
+"此模板会应用于每个已存在的分类上，根据设置项 ``CATEGORY_SAVE_AS`` 确定输出路径"
+"（`默认值为：` ``category/{slug}.html`` ）。如果启用了分页，后续页面会保存为 "
+"``category/{slug}{number}.html`` 。"
+
+#: ../../themes.rst:235 ../../themes.rst:269 ../../themes.rst:452
+#: 04b6f1c1d1f04e0e806f898dda0df53e a8a2719723a44a04b0cc7516a9b8e811
+#: fc79984925564ea5b5dece084dbd3f15
+msgid "category"
+msgstr "category"
+
+#: ../../themes.rst:235 feb49105f74f4e93b8f7f3471327cc4b
+msgid "The name of the category being processed"
+msgstr "正在处理的分类名称"
+
+#: ../../themes.rst:236 fa6d2909a42446edbce322e4bdd74ca9
+msgid "Articles for this category"
+msgstr "此分类下的文章"
+
+#: ../../themes.rst:237 c89759eb3241470fb8f098ccb022f286
+msgid "Articles for this category, but ordered by date, ascending"
+msgstr "此分类下的文章，以日期正序排列"
+
+#: ../../themes.rst:245 ../../themes.rst:334 03985448999c44859adcb45b7a9da87c
+#: b5506c9105b843de92190998f7d07245
+msgid "A paginator object for the list of articles, ordered by date, ascending"
+msgstr "分页器对象，存放着以日期正序排列的文章列表"
+
+#: ../../themes.rst:247 ../../themes.rst:336 926e4184e9fc4288be3701737c8ea3cc
+#: 929ee1e0a49d4a7fa52343db55e6201b
+msgid "The current page of articles, ordered by date, ascending"
+msgstr "当前页面中的文章，以日期正序排列"
+
+#: ../../themes.rst:253 6b396d9ad87e4156a694c9e31663d935
+msgid ""
+"CATEGORY_URL where everything after `{slug}` is removed -- useful for "
+"pagination links"
+msgstr ""
+"变量值与CATEGORY_URL一致，所有在 `{slug}` 之后的字符都会被删除——这对分页链接很有用"
+
+#: ../../themes.rst:259 0c7b031962f14ca78b9cd72aa2de5b03
+msgid "article.html"
+msgstr "article.html"
+
+#: ../../themes.rst:261 1132a54c80564ac0a2706b026b263af7
+msgid ""
+"This template will be processed for each article, with output generated "
+"according to the ``ARTICLE_SAVE_AS`` setting (`Default:` "
+"``{slug}.html``). The following variables are available when rendering."
+msgstr ""
+"此模板会应用于文章上，根据设置项 ``ARTICLE_SAVE_AS`` 确定输出路径（`默认值为：` "
+"``{slug}.html`` ）。在渲染文章过程中可以使用下列变量。"
+
+#: ../../themes.rst:268 6cc80575f5ac41e9bca4ce466d593f1d
+msgid "article"
+msgstr "article"
+
+#: ../../themes.rst:268 bbad6618dfa346c396dfa8cf02cb7ee7
+msgid "The article object to be displayed"
+msgstr "准备显示的文章对象"
+
+#: ../../themes.rst:269 4a9bcc18543a4d9eb533092d25bd59a2
+msgid "The name of the category for the current article"
+msgstr "当前文章所属分类的名称"
+
+#: ../../themes.rst:272 fdbbcc85d2aa406493ae4f0b4511e1a8
+msgid ""
+"Any metadata that you put in the header of the article source file will "
+"be available as fields on the ``article`` object. The field name will be "
+"the same as the name of the metadata field, except in all-lowercase "
+"characters."
+msgstr ""
+"文章源文件开头部分的元数据都会作为 ``article`` 对象的属性存在，属性名和元数据中"
+"指定的相同（但是是全小写的）。"
+
+#: ../../themes.rst:276 1c7d9a6b460849daacae3a205b6a59a6
+msgid ""
+"For example, you could add a field called `FacebookImage` to your article"
+" metadata, as shown below:"
+msgstr ""
+"例如，一篇文章源文件中添加了一个额外的元数据 `FacebookImage` ："
+
+#: ../../themes.rst:289 b934e5fbde064a7eb6d09405abc0ba1d
+msgid ""
+"This new metadata will be made available as `article.facebookimage` in "
+"your `article.html` template. This would allow you, for example, to "
+"specify an image for the Facebook open graph tags that will change for "
+"each article:"
+msgstr ""
+"此元数据在 `article.html` 模板中可以通过 `article.facebookimage` 获取。"
+"通过这种方式，就可以实现例如Facebook的动态打开标签："
+
+#: ../../themes.rst:299 dacf9a5dc4de4a5398baf9632399be4b
+msgid "page.html"
+msgstr "page.html"
+
+#: ../../themes.rst:301 a65649dffe0e4e1fb26e38565a89fbf2
+msgid ""
+"This template will be processed for each page, with output generated "
+"according to the ``PAGE_SAVE_AS`` setting (`Default:` "
+"``pages/{slug}.html``). The following variables are available when "
+"rendering."
+msgstr ""
+"此模板会应用于页面上，根据设置项 ``PAGE_SAVE_AS`` 确定输出路径（`默认值为：` "
+"``pages/{slug}.html`` ）。在渲染过程中可以使用下列变量。"
+
+#: ../../themes.rst:308 fb581643c0c04d6b89c3aa62bcdb5225
+msgid "page"
+msgstr "page"
+
+#: ../../themes.rst:308 02c821223e5448d7999f67d499844684
+msgid ""
+"The page object to be displayed. You can access its title, slug, and "
+"content."
+msgstr ""
+"准备显示的页面对象，可以从中获取标题、slug和具体内容。"
+
+#: ../../themes.rst:314 4f312193d3914a58be2a8e54e2fb61d8
+msgid "tag.html"
+msgstr "tag.html"
+
+#: ../../themes.rst:316 e96e2b0601e340878872dfcf5159575e
+msgid ""
+"This template will be processed for each tag, with output generated "
+"according to the ``TAG_SAVE_AS`` setting (`Default:` "
+"``tag/{slug}.html``). If pagination is active, subsequent pages will by "
+"default reside at ``tag/{slug}{number}.html``."
+msgstr ""
+"此模板会应用于标签页上，根据设置项 ``TAG_SAVE_AS`` 确定输出路径（`默认值为：` "
+"``tag/{slug}.html`` ）。若启用了分页，后续页面默认存储为。``tag/{slug}{number}.html`` 。"
+
+#: ../../themes.rst:324 2c8332f2cdc144828b75e23937d3ef8e
+msgid "tag"
+msgstr "tag"
+
+#: ../../themes.rst:324 413cc4b9730a40d3aaee657a7d261daa
+msgid "The name of the tag being processed"
+msgstr "当前正在处理标签的名称"
+
+#: ../../themes.rst:325 726e68a5b71c4ba182afd29b36394c82
+msgid "Articles related to this tag"
+msgstr "和此标签关联的文章"
+
+#: ../../themes.rst:326 780cb9b0de1e4bc1842b8a1bc1ad9202
+msgid "Articles related to this tag, but ordered by date, ascending"
+msgstr "和此标签关联的文章，以日期正序排列"
+
+#: ../../themes.rst:342 c6fb1ba5f18b454ead7abdee5cded85b
+msgid ""
+"TAG_URL where everything after `{slug}` is removed -- useful for "
+"pagination links"
+msgstr ""
+"变量值与TAG_URL一致，所有在 `{slug}` 之后的字符都会被删除——这对分页链接很有用"
+
+#: ../../themes.rst:348 8786a045b390459fad281b06b7edae8c
+msgid "period_archives.html"
+msgstr "period_archives.html"
+
+#: ../../themes.rst:350 c2fad0f517ec40eb8309beca3794ca8b
+msgid ""
+"This template will be processed for each year of your posts if a path for"
+" ``YEAR_ARCHIVE_SAVE_AS`` is defined, each month if "
+"``MONTH_ARCHIVE_SAVE_AS`` is defined, and each day if "
+"``DAY_ARCHIVE_SAVE_AS`` is defined."
+msgstr ""
+"此模板用于生成归档页面， ``YEAR_ARCHIVE_SAVE_AS`` 、 ``MONTH_ARCHIVE_SAVE_AS`` "
+"与 ``DAY_ARCHIVE_SAVE_AS`` 分别对应着年、月、日的归档，只有指定了对应的路径才会生成"
+"归档页面。"
+
+#: ../../themes.rst:357 ../../themes.rst:394 ef52bf257ddc4687801b9438efa2660a
+#: f6eb6f96a622406cbf6d60a5c57276c7
+msgid "period"
+msgstr "period"
+
+#: ../../themes.rst:357 2d01d1314880482791134dbae86647d8
+msgid ""
+"A tuple of the form (`year`, `month`, `day`) that indicates the current "
+"time period. `year` and `day` are numbers while `month` is a string. This"
+" tuple only contains `year` if the time period is a given year. It "
+"contains both `year` and `month` if the time period is over years and "
+"months and so on."
+msgstr ""
+"一个元组，格式为 (`year`, `month`, `day`) ，指明了当前的时间段。 `year` 和 `day` "
+"为数字， `month` 则为字符串。当时间段以年给定时，此元组只会有 `year` ；当时间段以年"
+"和月给定时此元组中则只会包含 `year` 和 `month` ；以此类推。"
+
+#: ../../themes.rst:364 ../../themes.rst:397 2164d658ab7342839ea592c7f534c332
+#: ff99b9574a444dec9014c06b0c9b908e
+msgid "period_num"
+msgstr "period_num"
+
+#: ../../themes.rst:364 c4864711405b4f9fa565ac3bcc3a8803
+msgid ""
+"A tuple of the form (``year``, ``month``, ``day``), as in ``period``, "
+"except all values are numbers."
+msgstr ""
+"一个元组，格式为 (``year``, ``month``, ``day``) ，与 ``period`` 含义相同，"
+"只不过年月日都是以数字给出的。"
+
+#: ../../themes.rst:369 27affb54796f4855826eaf3506ed4ed5
+msgid ""
+"You can see an example of how to use `period` in the `\"simple\" theme "
+"period_archives.html template "
+"<https://github.com/getpelican/pelican/blob/main/pelican/themes/simple/templates/period_archives.html>`_."
+msgstr ""
+"有关 `period` 的使用可以参考 `\"simple\" 主题中的period_archives.html模板 "
+"<https://github.com/getpelican/pelican/blob/main/pelican/themes/simple/templates/period_archives.html>`_ ."
+
+#: ../../themes.rst:377 f556c7dd5ca5454888d19edf992c8dfa
+msgid "Listing and Linking to Period Archives"
+msgstr "列出归档与链接到归档"
+
+#: ../../themes.rst:379 d76f0d91885c42edb2652303f4a60cb6
+msgid ""
+"The ``period_archives`` variable can be used to generate a list of links "
+"to the set of period archives that Pelican generates. As a :ref:`common "
+"variable <common_variables>`, it is available for use in any template, so"
+" you can implement such an index in a custom direct template, or in a "
+"sidebar visible across different site pages."
+msgstr ""
+"对于Pelican给出的归档时间段， ``period_archives`` 可用于生成对应的链接列表。"
+"此变量作为 :ref:`通用变量 <common_variables>` ，可在所有模板中使用。因此可以借此"
+"在自定义直接模板中或是侧边栏中实现链接索引。"
+
+#: ../../themes.rst:385 bf76ed577485401d8c5e180a2ea6b7fe
+msgid ""
+"``period_archives`` is a dict that may contain ``year``, ``month``, "
+"and/or ``day`` keys, depending on which ``*_ARCHIVE_SAVE_AS`` settings "
+"are enabled. The corresponding value is a list of dicts, where each dict "
+"in turn represents a time period (ordered according to the "
+"``NEWEST_FIRST_ARCHIVES`` setting) with the following keys and values:"
+msgstr ""
+"``period_archives`` 是一个字典，根据 ``*_ARCHIVE_SAVE_AS`` 设置的启用情况，"
+"其键对应为 ``year`` 、 ``month`` 与 ``day`` ，其值是包含字典的列表，每个字典依次"
+"表示一个时间段（顺序由 ``NEWEST_FIRST_ARCHIVES`` 设置决定），并包含以下键值对："
+
+#: ../../themes.rst:392 d4b7e16101e24e13ac49a201f2e9b288
+msgid "Key"
+msgstr "键"
+
+#: ../../themes.rst:392 cda01b45b25c4b76bf38849c6b5368d0
+msgid "Value"
+msgstr "值"
+
+#: ../../themes.rst:394 ac2a1a43510a417fb10561cff9a5189e
+msgid ""
+"The same tuple as described in ``period_archives.html``, e.g. ``(2023, "
+"'June', 18)``."
+msgstr ""
+"一个元组，内容和 ``period_archives.html`` 中一样，例如 ``(2023, 'June', 18)`` 。"
+
+#: ../../themes.rst:397 fdae5356b80444dc84294a4e54b7a69e
+msgid ""
+"The same tuple as described in ``period_archives.html``, e.g. ``(2023, 6,"
+" 18)``."
+msgstr ""
+"一个元组，内容和 ``period_archives.html`` 中一样，例如 ``(2023, 6, 18)`` 。"
+
+#: ../../themes.rst:399 ../../themes.rst:476 ../../themes.rst:496
+#: ../../themes.rst:535 08cccff8dd0048a39054424ae58bfe24
+#: 3fe5b8e9d83a4cd28bfc96c745406432 c2d9d11c36e94278a94b3404e8335524
+#: c9ee356463204591986c9c17f8dfc8b4
+msgid "url"
+msgstr "url"
+
+#: ../../themes.rst:399 0c826cc879af4c8fa1fb4fceb92bb362
+msgid ""
+"The URL to the period archive page, e.g. ``posts/2023/06/18/``. This is "
+"controlled by the corresponding ``*_ARCHIVE_URL`` setting."
+msgstr ""
+"当前时间段归档页面的URL，例如 ``posts/2023/06/18/`` 。具体值由对应的设置项 "
+"``*_ARCHIVE_URL`` 决定。"
+
+#: ../../themes.rst:402 ../../themes.rst:463 ../../themes.rst:494
+#: ../../themes.rst:522 155a764c3763409c9bdf881881da49e4
+#: 8da502261f724333814ae130f068a454 d3eaeebea8a54785a4778eac9d436479
+#: ec45a7fbd4db443ab75b13b0fb2876e7
+msgid "save_as"
+msgstr "save_as"
+
+#: ../../themes.rst:402 29cd2e19b0f24fa8ac20e184aea547c5
+msgid ""
+"The path to the save location of the period archive page file, e.g. "
+"``posts/2023/06/18/index.html``. This is used internally by Pelican and "
+"is usually not relevant to themes."
+msgstr ""
+"当前时间段归档页面的存储路径，例如 ``posts/2023/06/18/index.html`` 。此路径用于"
+"Pelican内部处理，往往与主题无关。"
+
+#: ../../themes.rst:406 4bd641dcf26c4f61bf8d3c8667552501
+msgid ""
+"A list of :ref:`Article <object-article>` objects that fall under the "
+"time period."
+msgstr ""
+"一个列表，其中为当前时间段内所有文章的 :ref:`Article <object-article>` 对象。"
+
+#: ../../themes.rst:408 c59db635e66a4ed68b2648b6cd8691a4
+msgid ""
+"Same list as ``articles``, but ordered according to the "
+"``NEWEST_FIRST_ARCHIVES`` setting."
+msgstr ""
+"和 ``articles`` 相同的列表，但按照 ``NEWEST_FIRST_ARCHIVES`` 设置项进行排列。"
+
+#: ../../themes.rst:412 f096e1915d684d6b9bd0a1e5e034e5f0
+msgid "Here is an example of how ``period_archives`` can be used in a template:"
+msgstr "下面的例子展示了如何在模板中使用 ``period_archives`` ："
+
+#: ../../themes.rst:426 3f6144d2a3914984bc376ed6f33af53b
+msgid ""
+"You can change ``period_archives.month`` in the ``for`` statement to "
+"``period_archives.year`` or ``period_archives.day`` as appropriate, "
+"depending on the time period granularity desired."
+msgstr ""
+"你可以根据需要的时间粒度将 ``for`` 语句中的 ``period_archives.month`` 改为 "
+"``period_archives.year`` 或 ``period_archives.day`` 。"
+
+#: ../../themes.rst:432 ce9158ea38b54c5faeee718a7644ca5f
+msgid "Objects"
+msgstr "对象"
+
+#: ../../themes.rst:434 dd0725152df94c8f9e2d94439ccfa3a1
+msgid ""
+"Detail objects attributes that are available and useful in templates. Not"
+" all attributes are listed here, this is a selection of attributes "
+"considered useful in a template."
+msgstr ""
+"下面是对在模板中可用对象的属性的详细说明。以下仅列出了较常用的一些，并不是全部。"
+
+#: ../../themes.rst:441 af8644dff51348af8e52938bb8d6a0c8
+msgid "Article"
+msgstr "Article"
+
+#: ../../themes.rst:443 cc283674732243e5883a99b6a32166af
+msgid "The string representation of an Article is the `source_path` attribute."
+msgstr "Article对象的字符串表示即为 `source_path` 属性。"
+
+#: ../../themes.rst:446 ../../themes.rst:490 ../../themes.rst:509
+#: 3f2a9f3ea4c34e4ba7b83b17897f4b59 529f2387d2044534a0e3059defb2be46
+#: 97104fabe548459e9142574e4194afdb
+msgid "Attribute"
+msgstr "属性"
+
+#: ../../themes.rst:448 16d19143b7964b99953026728e8a5d4a
+msgid "The :ref:`Author <object-author_cat_tag>` of this article."
+msgstr "当前文章的 :ref:`Author <object-author_cat_tag>`"
+
+#: ../../themes.rst:450 5a7ae4c0e9164288bd46cbf698ae01f8
+msgid "A list of :ref:`Authors <object-author_cat_tag>` of this article."
+msgstr "当前文章的多个 :ref:`Authors <object-author_cat_tag>`"
+
+#: ../../themes.rst:452 982b4fe7fa4a41a5b3aed3a82168b462
+msgid "The :ref:`Category <object-author_cat_tag>` of this article."
+msgstr "当前文章的 :ref:`Category <object-author_cat_tag>`"
+
+#: ../../themes.rst:454 ../../themes.rst:513 10ea5d1008fa4e7e9f11680013530b13
+#: 3bca890724c2487885fbfb34803f0a8b
+msgid "content"
+msgstr "content"
+
+#: ../../themes.rst:454 14973ea2fac140dbac7ed05f09f3b27d
+msgid "The rendered content of the article."
+msgstr "当前文章渲染完成的内容"
+
+#: ../../themes.rst:455 ../../themes.rst:514 1733ed5bfe0d421d96f074c2ea46c163
+#: b577071078d5413ba0199a4b5a64a926
+msgid "date"
+msgstr "date"
+
+#: ../../themes.rst:455 c99033f75c6c4aabb03c1ed24e530551
+msgid "Datetime object representing the article date."
+msgstr "当前文章的Datetime对象"
+
+#: ../../themes.rst:456 ../../themes.rst:515 9f8a6847d9f24162980e8bac2cc6e159
+#: c01cd89b410d45258311d8d62a0b3b24
+msgid "date_format"
+msgstr "date_format"
+
+#: ../../themes.rst:456 ../../themes.rst:515 14a1bee230d243da83e1a8f8e4817838
+#: 35bed86384a74210a5c5be86feb1ca83
+msgid "Either default date format or locale date format."
+msgstr "默认日期格式或是特定地区的日期格式"
+
+#: ../../themes.rst:457 ../../themes.rst:516 7c05e281dd0f4b7885653f977ce73b96
+#: 942fcdc259554437b58035fd53b3f430
+msgid "default_template"
+msgstr "default_template"
+
+#: ../../themes.rst:457 ../../themes.rst:516 754d4caf3da64863818cae661450c76b
+#: 7fc12db08b5641f388113c447d272970
+msgid "Default template name."
+msgstr "默认的模板名称"
+
+#: ../../themes.rst:458 ../../themes.rst:517 6434f76e9f2c425ab2e0f4e1df0d5eff
+#: 7a42be4c30d74d93b9778768d88f0d61
+msgid "in_default_lang"
+msgstr "in_default_lang"
+
+#: ../../themes.rst:458 ../../themes.rst:517 573f32f9ea2942b2849cb62bc4ad5b0d
+#: d9bbddf5ba92486faca7219d41907449
+msgid "Boolean representing if the article is written in the default language."
+msgstr "布尔值，用于表示当前文章是不是以默认语言写的。"
+
+#: ../../themes.rst:460 ../../themes.rst:519 c06096412cd6477f9a9505202b65a66b
+#: cf2ee07db2b544fb8bb5867fd47b4766
+msgid "lang"
+msgstr "lang"
+
+#: ../../themes.rst:460 ../../themes.rst:519 5feb94756b424a1f970b45ad224ab4df
+#: bb4db90299324791bcc00c9687d458e8
+msgid "Language of the article."
+msgstr "当前文章使用的语言。"
+
+#: ../../themes.rst:461 ../../themes.rst:520 3ddd8549af7f4c54bb4d1176ab4991fe
+#: f599ee9e24d24679ae8efe1b92bfabd2
+msgid "locale_date"
+msgstr "locale_date"
+
+#: ../../themes.rst:461 ../../themes.rst:520 492201eaff5d43bcb2a27d38dd414ea5
+#: bd9e52a8bfc24c89982c21a7ec33546b
+msgid "Date formatted by the `date_format`."
+msgstr "以 `date_format` 格式化后的日期。"
+
+#: ../../themes.rst:462 ../../themes.rst:521 298a8c49a9c54aa08e92063a205b4270
+#: 91a12b6902f140a285bd808fe527e942
+msgid "metadata"
+msgstr "metadata"
+
+#: ../../themes.rst:462 a6266566a3764288a3439022e3a374b5
+msgid "Article header metadata `dict`."
+msgstr "文章元数据的字典。"
+
+#: ../../themes.rst:463 8c8bb35d3d0a4fd4a8cbbe66da13e9f6
+msgid "Location to save the article page."
+msgstr "本篇文章生成保存的位置。"
+
+#: ../../themes.rst:464 ../../themes.rst:495 ../../themes.rst:523
+#: 02324ac5ed2f418d8aeabad7ef196271 265ffa91569c417faf9edfad84909010
+#: eb3abbd690c540dc8c8f96c457a949f1
+msgid "slug"
+msgstr "slug"
+
+#: ../../themes.rst:464 ../../themes.rst:495 ../../themes.rst:523
+#: 6ceb857897804044822f46787b8b2e24 6f893196b6f94121aa829816652d9b8d
+#: d07f43f0b91e4e0492db289b425a66ca
+msgid "Page slug."
+msgstr "推文的slug"
+
+#: ../../themes.rst:465 ../../themes.rst:524 2a6c951175234a94ad49fe66b5e0ac67
+#: 8cc7b9782316464ab8f4d93f44364487
+msgid "source_path"
+msgstr "source_path"
+
+#: ../../themes.rst:465 e56b161d0ff444db81b9ef5438205492
+msgid "Full system path of the article source file."
+msgstr "文章源文件的完整系统路径。"
+
+#: ../../themes.rst:466 ../../themes.rst:525 3288505bb4c94604a880a6e41e854174
+#: c6d1c1970adc4b7d851fc9a62579e2c6
+msgid "relative_source_path"
+msgstr "relative_source_path"
+
+#: ../../themes.rst:466 efa94005826e46b1a7ace439cfea8ecd
+msgid "Relative path from PATH_ to the article source file."
+msgstr "从 PATH_ 到当前文章源文件的相对路径。"
+
+#: ../../themes.rst:467 ../../themes.rst:526 0f57131e78b043bd974e545651a9eac6
+#: 4f11a741e9684957bc2ac83e1aa850ca
+msgid "status"
+msgstr "status"
+
+#: ../../themes.rst:467 ff6df46c090044a9afd9bafe55483999
+msgid "The article status, can be any of 'published' or 'draft'."
+msgstr "当前文章的状态，可能值为'published'或'draft'。"
+
+#: ../../themes.rst:469 ../../themes.rst:528 042ac3c1853845f99752c484e341dbde
+#: 59ec1f34a47b41959621ae638ee75bf6
+msgid "summary"
+msgstr "summary"
+
+#: ../../themes.rst:469 ../../themes.rst:528 f13f50f1e1024ce2bb1a3cd2d6bd0f45
+#: fe9173ab1a3b42a39d1ae3f24b2e13b6
+msgid "Rendered summary content."
+msgstr "渲染后的摘要内容。"
+
+#: ../../themes.rst:470 ../../themes.rst:529 455d848accf04082b6d0efe5c0451a8c
+#: 5acb76f85cdd47f0933b5c411f645ccd
+msgid "List of :ref:`Tag <object-author_cat_tag>` objects."
+msgstr ":ref:`Tag <object-author_cat_tag>` 对象的列表。"
+
+#: ../../themes.rst:472 ../../themes.rst:531 346843df50f64fcb8738d9a33a5991c0
+#: 5b43ff1b52e049a080dcfcf7c8532e55
+msgid "template"
+msgstr "template"
+
+#: ../../themes.rst:472 ../../themes.rst:531 1c98b0c5f84b438d9fbcdc7e564b532a
+#: 75b07b60fd0540ac998a7a5f8c755abb
+msgid "Template name to use for rendering."
+msgstr "用于渲染的模板名称"
+
+#: ../../themes.rst:473 ../../themes.rst:532 3da31ca0f3a74f1b807028b268704562
+#: 939c8b4e82c34cdc9e11fff8728e925a
+msgid "title"
+msgstr "title"
+
+#: ../../themes.rst:473 4f435f74edea49abba15e465cd65bc9b
+msgid "Title of the article."
+msgstr "当前文章的标题。"
+
+#: ../../themes.rst:474 ../../themes.rst:533 4c7c144119804fcc9b3aff5ba1cc1d60
+#: 60cfb30189bc4622b9f0f10d57e8cebb
+msgid "translations"
+msgstr "translations"
+
+#: ../../themes.rst:474 ../../themes.rst:533 5086f31401d243e5ba1e7d3a4dbc75ea
+#: 6c9e4cba9d80461787be1e245ea0e77c
+msgid "List of translations :ref:`Article <object-article>` objects."
+msgstr "当前文章所有翻译版本的 :ref:`Article <object-article>` 对象。"
+
+#: ../../themes.rst:476 0bbe38a721924758b16f7ed92bd47060
+msgid "URL to the article page."
+msgstr "文章页面的URL。"
+
+#: ../../themes.rst:485 6a1b829fd11b4a5aaa913e8ab5d8cb9a
+msgid "Author / Category / Tag"
+msgstr "Author / Category / Tag"
+
+#: ../../themes.rst:487 e74be0b0e7d7477791a14dc892a01970
+msgid "The string representation of those objects is the `name` attribute."
+msgstr "这些对象的字符串表示与 `name` 属性一致。"
+
+#: ../../themes.rst:492 95f673648cd347589e30bac268c62402
+msgid "name"
+msgstr "name"
+
+#: ../../themes.rst:492 c85c4552f17e47ce8e75aa83968488b7
+msgid "Name of this object [1]_."
+msgstr "当前对象的名称 [1]_ 。"
+
+#: ../../themes.rst:493 9ab58cf8d1c14233b5fab67bcff1ed07
+msgid "Author page name."
+msgstr "作者页面的名称。"
+
+#: ../../themes.rst:494 8924be38e76744c18a232657e3e53541
+msgid "Location to save the author page."
+msgstr "保存当前作者页面的路径。"
+
+#: ../../themes.rst:496 d836061f54274605b775c9a303e73355
+msgid "URL to the author page."
+msgstr "作者页面的URL。"
+
+#: ../../themes.rst:499 8a004fbcd1134a6aa51ecc83ead04eb3
+msgid "for Author object, coming from `:authors:` or `AUTHOR`."
+msgstr "对于Author对象，此属性值由 `:authors:` 或 `AUTHOR` 得来。"
+
+#: ../../themes.rst:504 015a5ef21bc1482baa94fe2ecc389be9
+msgid "Page"
+msgstr "Page"
+
+#: ../../themes.rst:506 e509492329b543b094117d9b207d40c1
+msgid "The string representation of a Page is the `source_path` attribute."
+msgstr "Page对象的字符串表示与 `source_path` 属性一致。"
+
+#: ../../themes.rst:511 acbd8346326242e3a6124d349d90c83f
+msgid "The :ref:`Author <object-author_cat_tag>` of this page."
+msgstr "当前页面的 :ref:`Author <object-author_cat_tag>` 。"
+
+#: ../../themes.rst:513 17df00ade1b84d89b90e0cf8949014c5
+msgid "The rendered content of the page."
+msgstr "当前页面渲染后的内容。"
+
+#: ../../themes.rst:514 50ec2f44596c4f849458456113b6688d
+msgid "Datetime object representing the page date."
+msgstr "当前页面日期对应的Datetime对象。"
+
+#: ../../themes.rst:521 29fd9eb25f1643bc844a9480618ddee3
+msgid "Page header metadata `dict`."
+msgstr "页面元数据的 `字典` 。"
+
+#: ../../themes.rst:522 caeac875f56345dfb4b871dd5cc47ff6
+msgid "Location to save the page."
+msgstr "保存页面的位置。"
+
+#: ../../themes.rst:524 ee2e9caa90d24f7f8106e82449194c5b
+msgid "Full system path of the page source file."
+msgstr "页面源文件的完整系统路径。"
+
+#: ../../themes.rst:525 4ac1a61bb61b491ab05058392e561819
+msgid "Relative path from PATH_ to the page source file."
+msgstr "页面源文件相对于 PATH_ 的相对路径。"
+
+#: ../../themes.rst:526 1e21d2a5056e4f56b1fb9aeb9b56240a
+msgid "The page status, can be any of 'published', 'hidden' or 'draft'."
+msgstr "页面的状态，可能值有'published'、'hidden'或者'draft'。"
+
+#: ../../themes.rst:532 0afb2b618cdd49d5b6f4c37dfa84c847
+msgid "Title of the page."
+msgstr "页面的标题。"
+
+#: ../../themes.rst:535 e4f719f69ae3495280e4953b0e948e02
+msgid "URL to the page."
+msgstr "页面的URL"
+
+#: ../../themes.rst:542 dbc8f1369a294996ac59e07d955880b6
+msgid "Feeds"
+msgstr "订阅源"
+
+#: ../../themes.rst:544 dbfa3023cab6407cb324cffe523c8533
+msgid ""
+"The feed variables changed in 3.0. Each variable now explicitly lists "
+"ATOM or RSS in the name. ATOM is still the default. Old themes will need "
+"to be updated. Here is a complete list of the feed variables::"
+msgstr ""
+"订阅源相关变量在3.0版本发生过变化。各变量现在都在名称中显示地表达了属于ATOM还是RSS。"
+"默认使用ATOM。旧的主题需要进行更新。下面是订阅源相关变量的完整列表："
+
+#: ../../themes.rst:563 ee43d4b51dda44288f9786eefb8bf62c
+msgid "Inheritance"
+msgstr "继承"
+
+#: ../../themes.rst:565 a921f3b3e050422db6694600b6ae3379
+msgid ""
+"Since version 3.0, Pelican supports inheritance from the ``simple`` "
+"theme, so you can re-use the ``simple`` theme templates in your own "
+"themes."
+msgstr ""
+"从3.0版本开始，Pelican支持从 ``simple`` 主题继承，因此可以在你自己的主题中"
+"重用 ``simple`` 主题。"
+
+#: ../../themes.rst:568 36142bb5338a43a5bf0d9e53b52c0c05
+msgid ""
+"If one of the mandatory files in the ``templates/`` directory of your "
+"theme is missing, it will be replaced by the matching template from the "
+"``simple`` theme. So if the HTML structure of a template in the "
+"``simple`` theme is right for you, you don't have to write a new template"
+" from scratch."
+msgstr ""
+"如果 ``templates/`` 目录中缺失了的某些必须要有的文件，会自动使用 ``simple`` "
+"主题中的对应模板。因此如果 ``simple`` 主题中的一些模板正合你意，就没必要重新"
+"写个新的了。"
+
+#: ../../themes.rst:573 d4c77f03fe8049ed82ea0870e4384991
+#, python-format
+msgid ""
+"You can also extend templates from the ``simple`` theme in your own "
+"themes by using the ``{% extends %}`` directive as in the following "
+"example:"
+msgstr ""
+"你也可以使用 ``{% extends %}`` 指令在你自己的主题中扩展 ``simple`` 主题："
+
+#: ../../themes.rst:584 6c8634ea148d48e68124f8b240de47c3
+msgid "Example"
+msgstr "例子"
+
+#: ../../themes.rst:586 c5845f57a75642a5a2a0c9018fd1dac0
+msgid "With this system, it is possible to create a theme with just two files."
+msgstr "利用这种自动继承的规则，只用两个文件就可以创建一个主题。"
+
+#: ../../themes.rst:589 c7ea4273a1ca4050968a1308a5a47c51
+msgid "base.html"
+msgstr "base.html"
+
+#: ../../themes.rst:591 4fa7a95ff17c4421bd39c45a9cd42f8f
+msgid "The first file is the ``templates/base.html`` template:"
+msgstr "第一个文件是 ``templates/base.html`` 模板："
+
+#: ../../themes.rst:602 87484a8d548449b4b58d6773201ddf67
+msgid ""
+"On the first line, we extend the ``base.html`` template from the "
+"``simple`` theme, so we don't have to rewrite the entire file."
+msgstr ""
+"第一行中，从 ``simple`` 主题中扩展了 ``base.html`` 模板，因此无需重写整个文件。"
+
+#: ../../themes.rst:604 20209f5462c24d3b9918f14db3dc9f0c
+msgid ""
+"On the third line, we open the ``head`` block which has already been "
+"defined in the ``simple`` theme."
+msgstr ""
+"第三行，我们开始声明 ``head`` 块，这个块已在 ``simple`` 中进行了定义。"
+
+#: ../../themes.rst:606 9d6577b07bdd4eab814a188effd796c7
+msgid ""
+"On the fourth line, the function ``super()`` keeps the content previously"
+" inserted in the ``head`` block."
+msgstr ""
+"第四行中， ``super()`` 函数使得已添加到 ``head`` 块中的前序内容得以保留。"
+
+#: ../../themes.rst:608 157f34425e4d4b119c97bc7a9cb513ff
+msgid "On the fifth line, we append a stylesheet to the page."
+msgstr "第五行为页面添加了一个样式表。"
+
+#: ../../themes.rst:609 bf52b4834d67475194b43b35c2a9dfde
+msgid "On the last line, we close the ``head`` block."
+msgstr "最后一行结束对 ``head`` 块的声明。"
+
+#: ../../themes.rst:611 968532a3244e436fba5b6df5c996888d
+msgid ""
+"This file will be extended by all the other templates, so the stylesheet "
+"will be linked from all pages."
+msgstr ""
+"其他所有模板都会在此文件基础上进行扩展，因此样式表会被所有页面引用。"
+
+#: ../../themes.rst:615 62629bf8d5ea4271a598b95ebede4757
+msgid "style.css"
+msgstr "style.css"
+
+#: ../../themes.rst:617 e8e0ee6348e84ff590fe5afebe39ec63
+msgid "The second file is the ``static/css/style.css`` CSS stylesheet:"
+msgstr "第二个文件是CSS样式表 ``static/css/style.css`` ："
+
+#: ../../themes.rst:661 80ec5c70bd9b49e7b22718cc18e46b84
+msgid "Download"
+msgstr "下载"
+
+#: ../../themes.rst:663 acf9dfc296794b3c928572374b39926e
+msgid ""
+"You can download this example theme :download:`here <_static/theme-"
+"basic.zip>`."
+msgstr ""
+"可以在 :download:`这里 <_static/theme-basic.zip>` 下载此例。"
+
+#~ msgid ""
+#~ "To generate its HTML output, Pelican "
+#~ "uses the `Jinja "
+#~ "<https://palletsprojects.com/p/jinja/>`_ templating engine"
+#~ " due to its flexibility and "
+#~ "straightforward syntax. If you want to"
+#~ " create your own theme, feel free "
+#~ "to take inspiration from the `\"simple\""
+#~ " theme "
+#~ "<https://github.com/getpelican/pelican/tree/master/pelican/themes/simple/templates>`_."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can see an example of how "
+#~ "to use `period` in the `\"simple\" "
+#~ "theme period_archives.html template "
+#~ "<https://github.com/getpelican/pelican/blob/master/pelican/themes/simple/templates/period_archives.html>`_."
+#~ msgstr ""
diff --git a/docs/locale/zh_CN/LC_MESSAGES/tips.po b/docs/locale/zh_CN/LC_MESSAGES/tips.po
new file mode 100644
index 00000000..4ecdcb1b
--- /dev/null
+++ b/docs/locale/zh_CN/LC_MESSAGES/tips.po
@@ -0,0 +1,679 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2010–2024
+# This file is distributed under the same license as the PELICAN package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PELICAN 4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-25 20:36+0800\n"
+"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
+"Language: zh_CN\n"
+"Language-Team: zh_CN <LL@li.org>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.15.0\n"
+
+#: ../../tips.rst:2 415f61a654104cf4826423e3aa1d3807
+msgid "Tips"
+msgstr "小技巧"
+
+#: ../../tips.rst:4 1bc50144d85845f3a7f21f9ef87bba44
+msgid "Here are some tips about Pelican that you might find useful."
+msgstr "以下是一些实用的小技巧。"
+
+#: ../../tips.rst:7 ../../tips.rst:264 d9115f4b162d46e6aa89d56309c1ec41
+#: e693dc009e5c466d99655b705223f300
+msgid "Custom 404 Pages"
+msgstr "自定义404页面"
+
+#: ../../tips.rst:9 5c7cd70793f44d3c9fcf63779755d62b
+msgid ""
+"When a browser requests a resource that the web server cannot find, the "
+"web server usually displays a generic \"File not found\" (404) error page"
+" that can be stark and unsightly. One way to provide an error page that "
+"matches the theme of your site is to create a custom 404 page (*not* an "
+"article), such as this Markdown-formatted example stored in "
+"``content/pages/404.md``::"
+msgstr ""
+"当浏览器请求的资源无法在服务器中找到时，web服务器常常会显示一个通用的“File not "
+"found 404”的错误页面，这可能会不太美观。为了能使用一个与站点主题相匹配的404页面"
+"（注意是页面而 **不是** 文章），例如下面这个Markdown格式的例子，将此文件存为了 "
+"``content/pages/404.md`` ："
+
+#: ../../tips.rst:22 cab28bb6b2a548a09f8cc6e4778f1a78
+msgid ""
+"The next step is to configure your web server to display this custom page"
+" instead of its default 404 page. For Nginx, add the following to your "
+"configuration file's ``location`` block::"
+msgstr ""
+"接下来就是要配置web服务器，使其显示此自定义页面而不是默认的404页面。例如对于Nginx，"
+"在配置文件的 ``location`` 块中添加下面的命令："
+
+#: ../../tips.rst:28 f8acbc4d00de4cfb8dfd9358a8168c14
+msgid "For Apache::"
+msgstr "对于Apache："
+
+#: ../../tips.rst:32 3701d02f6dba4936a86a9fbb226261e8
+msgid ""
+"For Amazon S3, first navigate to the ``Static Site Hosting`` menu in the "
+"bucket settings on your AWS console. From there::"
+msgstr ""
+"对于Amazon S3实例，先在控制台的设置中找到  ``Static Site Hosting`` ，并添加："
+
+#: ../../tips.rst:38 4d111f7cca2e49828e343ff889847358
+msgid "Publishing to GitHub Pages"
+msgstr "发布到GitHub Pages"
+
+#: ../../tips.rst:40 f7fa83b00f6d4dd58d6f119725474538
+msgid ""
+"If you use `GitHub <https://github.com/>`_ for your Pelican site you can "
+"publish your site to `GitHub Pages <https://pages.github.com/>`_ for "
+"free. Your site will be published to ``https://<username>.github.io`` if "
+"it's a user or organization site or to "
+"``https://<username>.github.io/<repository>`` if it's a project site. "
+"It's also possible to `use a custom domain with GitHub Pages "
+"<https://docs.github.com/en/pages/configuring-a-custom-domain-for-your-"
+"github-pages-site>`_."
+msgstr ""
+"如果将Pelican站点放在了 `GitHub <https://github.com/>`_ 上，那么你就可以将站点"
+"免费发布在 `GitHub Pages <https://pages.github.com/>`_ 上。如果是用户或组织的"
+"站点，发布的地址为 ``https://<username>.github.io`` ；如果是某个项目的站点，"
+"发布的地址则为 ``https://<username>.github.io/<repository>`` 。当然也可以 "
+"`在GitHub Pages上使用自定义域名 <https://docs.github.com/en/pages/configuring-a-custom-"
+"domain-for-your-github-pages-site>`_ 。"
+
+#: ../../tips.rst:46 a3167f2a605d44288b83d66f052e8cdd
+msgid ""
+"There are `two ways to publish a site to GitHub Pages "
+"<https://docs.github.com/en/pages/getting-started-with-github-"
+"pages/configuring-a-publishing-source-for-your-github-pages-site>`_:"
+msgstr ""
+"总的来说，有 `两种将站点发布到GitHub Pages的方法 <https://docs.github.com/en/pages"
+"/getting-started-with-github-pages/configuring-a-publishing-source-for-"
+"your-github-pages-site>`_ ："
+
+#: ../../tips.rst:48 b2f270c5a15d4e3e92331c3c37db25dd
+msgid ""
+"**Publishing from a branch:** run ``pelican`` locally and push the output"
+" directory to a special branch of your GitHub repo. GitHub will then "
+"publish the contents of this branch to your GitHub Pages site."
+msgstr ""
+"**从某一分支发布：** 在本地运行 ``pelican`` 后将输出文件夹push到GitHub仓库的"
+"某一分支。GitHub就会将该分支的内容发布到GitHub Pages上。"
+
+#: ../../tips.rst:51 4ffdb550d8bf468dbfe4d32dfcda21cd
+msgid ""
+"**Publishing with a custom GitHub Actions workflow:** just push the "
+"source files of your Pelican site to your GitHub repo's default branch "
+"and have a custom GitHub Actions workflow run ``pelican`` for you to "
+"generate the output directory and publish it to your GitHub Pages site.  "
+"This way you don't need to run ``pelican`` locally. You can even edit "
+"your site's source files using GitHub's web interface and any changes "
+"that you commit will be published."
+msgstr ""
+"**从自定义GitHub Actions工作流发布：** 将内容源文件推送到GitHub仓库的默认分支，"
+"然后在GitHub Actions工作流中执行 ``pelican`` 以生成输出文件夹，最后将其发布到你"
+"的GitHub Pages站点。此种方法下就无需在本地执行 ``pelican`` 命令了。甚至可以直接"
+"在GitHub的网页中在线修改站点内容源文件。"
+
+#: ../../tips.rst:60 0e9c34ce1a5948098a5d0812eb8ac1b4
+msgid "Publishing a Project Site to GitHub Pages from a Branch"
+msgstr "从某一分支发布项目站点到GitHub Pages"
+
+#: ../../tips.rst:62 5190ebea8d8b4542ac9ecb98c297594e
+msgid ""
+"To publish a Pelican site as a Project Page you need to *push* the "
+"content of the ``output`` dir generated by Pelican to a repository's "
+"``gh-pages`` branch on GitHub."
+msgstr ""
+"要将Pelican站点发布为项目页面，你需要将Pelican生成的 ``output`` 目录 "
+"**push** 到GitHub仓库的 ``gh-pages`` 分支。"
+
+#: ../../tips.rst:66 e12298010e9745b59d60d31ae909fd4c
+msgid ""
+"The excellent `ghp-import <https://github.com/davisp/ghp-import>`_, which"
+" can be installed with ``pip``, makes this process really easy."
+msgstr ""
+"可通过 ``pip`` 安装的 `ghp-import <https://github.com/davisp/ghp-import>`_ "
+"使这一步变得非常简单。"
+
+#: ../../tips.rst:69 cd5a5847355846dd81a0ad37858358f2
+msgid ""
+"For example, if the source of your Pelican site is contained in a GitHub "
+"repository, and if you want to publish that Pelican site in the form of "
+"Project Pages to this repository, you can then use the following::"
+msgstr ""
+"例如，当Pelican站点的源文件已经包含在GitHub仓库中时，可以将其作为此仓库的项目页面："
+
+#: ../../tips.rst:77 18d3e7316a5a48acb337c3c67e94084c
+msgid ""
+"The ``ghp-import output`` command updates the local ``gh-pages`` branch "
+"with the content of the ``output`` directory (creating the branch if it "
+"doesn't already exist). The ``git push origin gh-pages`` command updates "
+"the remote ``gh-pages`` branch, effectively publishing the Pelican site."
+msgstr ""
+"``ghp-import output`` 命令会用 ``output`` 目录下的内容更新本地的 ``gh-pages`` "
+"分支（如果此分支不存在则会先创建）。接着再用  ``git push origin gh-pages`` "
+"命令更新远程分支 ``gh-pages`` ，如此就能够发布Pelican站点了。"
+
+#: ../../tips.rst:84 cc8b9d96da674850b39373728000f722
+msgid ""
+"The ``github`` target of the Makefile (and the ``gh_pages`` task of "
+"``tasks.py``) created by the ``pelican-quickstart`` command publishes the"
+" Pelican site as Project Pages, as described above."
+msgstr ""
+"``pelican-quickstart`` 在Makefile文件中所生成的 ``github`` 目标（以及为 "
+"``gh_pages`` 任务生成的 ``tasks.py`` ）使得Pelican站点能像上面描述的那样被发布"
+"为项目页面。"
+
+#: ../../tips.rst:89 41c7b129fd334796848c4d75404dbe81
+msgid "Publishing a User Site to GitHub Pages from a Branch"
+msgstr "从某一分支发布用户站点到GitHub Pages"
+
+#: ../../tips.rst:91 b379f950927d484ba91fbe649a248cfe
+msgid ""
+"To publish a Pelican site in the form of User Pages, you need to *push* "
+"the content of the ``output`` dir generated by Pelican to the ``main`` "
+"branch of your ``<username>.github.io`` repository on GitHub."
+msgstr ""
+"要以用户页面形式发布Pelican站点，你需要将Pelican生成的 ``output`` 目录内容 "
+"**push** 到 ``<username>.github.io`` 仓库的 ``master`` 分支上。"
+
+#: ../../tips.rst:95 6d1bd6c0ff25494e997c4efbdcd1d861
+msgid "Again, you can take advantage of ``ghp-import``::"
+msgstr "同样的，此处也可以使用 ``ghp-import`` ："
+
+#: ../../tips.rst:101 45fb7ba534af4f7d828e1630e591c02a
+msgid ""
+"The ``git push`` command pushes the local ``gh-pages`` branch (freshly "
+"updated by the ``ghp-import`` command) to the ``elemoine.github.io`` "
+"repository's ``main`` branch on GitHub."
+msgstr ""
+"``git push`` 命令将本地的 ``gh-pages`` 分支（此分支在刚刚通过 ``ghp-import`` "
+"命令进行了更新）push到了GitHub仓库 ``elemoine.github.io`` 的 ``master`` 分支。"
+
+#: ../../tips.rst:107 b105e7dd1aef441896c0f59166808113
+msgid ""
+"To publish your Pelican site as User Pages, feel free to adjust the "
+"``github`` target of the Makefile."
+msgstr ""
+"要将Pelican站点发布为用户页面，可以根据需要修改Makefile中的 ``github`` 目标。"
+
+#: ../../tips.rst:110 87a89a932eec40e8bfdd5c756f4d54fc
+msgid ""
+"Another option for publishing to User Pages is to generate the output "
+"files in the root directory of the project."
+msgstr ""
+"发布用户页面的另一种方法就是将输出文件生成在项目的根目录下。"
+
+#: ../../tips.rst:113 dab76a45349c432cb4b763484661ec2c
+msgid ""
+"For example, your main project folder is ``<username>.github.io`` and you"
+" can create the Pelican project in a subdirectory called ``Pelican``. "
+"Then from inside the ``Pelican`` folder you can run::"
+msgstr ""
+"例如，项目的主文件夹是 ``<username>.github.io`` ，你可以在子目录 ``Pelican`` "
+"中创建一个Pelican项目。然后你可以在这个 ``Pelican`` 文件夹中执行下面的命令："
+
+#: ../../tips.rst:119 7f13464c92f14cc18f8c00f7dae78f93
+msgid ""
+"Now you can push the whole project ``<username>.github.io`` to the main "
+"branch of your GitHub repository::"
+msgstr ""
+"接着可以将整个项目 ``<username>.github.io`` push到GitHub仓库的master分支中："
+
+#: ../../tips.rst:124 e82ff566e32b4696863aa04216aaf355
+msgid "(assuming origin is set to your remote repository)."
+msgstr "（此处假设远程仓库命名为origin）。"
+
+#: ../../tips.rst:127 1958522ba7c34537855505f1e64c7b43
+msgid "Publishing to GitHub Pages Using a Custom GitHub Actions Workflow"
+msgstr "使用自定义GitHub Actions工作流将站点发布GitHub Pages中"
+
+#: ../../tips.rst:129 19c47b80d248451facd8407bd960b527
+msgid ""
+"Pelican-powered sites can be published to GitHub Pages via a `custom "
+"workflow "
+"<https://github.com/getpelican/pelican/blob/main/.github/workflows/github_pages.yml>`_."
+" To use it:"
+msgstr ""
+"Pelican已经给你准备了一份 `自定义工作流 "
+"<https://github.com/getpelican/pelican/blob/main/.github/workflows/github_pages.yml>`_"
+" ，你可以直接使用此工作流发布站点："
+
+#: ../../tips.rst:133 bdc132ef5b974d1eae684d8118e4d914
+msgid ""
+"Enable GitHub Pages in your repo: go to **Settings → Pages** and choose "
+"**GitHub Actions** for the **Source** setting."
+msgstr ""
+"首先为仓库开启GitHub Pages： **Settings → Pages** 中有个 **Source** 设置项，"
+"将其选择为 **GitHub Actions** 。"
+
+#: ../../tips.rst:136 d7d197c176bd4127a75cfaf9dd29212b
+msgid ""
+"Commit a ``.github/workflows/pelican.yml`` file to your repo with these "
+"contents:"
+msgstr ""
+"往你的仓库中commit一个 ``.github/workflows/pelican.yml`` 文件，文件内容如下："
+
+#: ../../tips.rst:155 656a2b783b6043f2ac26b1e7b342732e
+msgid ""
+"You may want to replace the ``@main`` with the ID of a specific commit in"
+" this repo in order to pin the version of the reusable workflow that "
+"you're using: ``uses: "
+"getpelican/pelican/.github/workflows/github_pages.yml@<COMMIT_ID>``. If "
+"you do this you might want to get Dependabot to send you automated pull "
+"requests to update that commit ID whenever new versions of this workflow "
+"are published, like so:"
+msgstr "你可能想要将 ``@main`` 替换为这个仓库中某个特定commit的ID，以便将你使用的"
+"可重用工作流的版本固定下来，此时，可以使用 ``uses: getpelican/pelican/.github/workflows/"
+"github_pages.yml@<COMMIT_ID>`` 。在这种情况下，你可能想让Dependabot自动向你发送"
+"PR，以便在发布新版本的工作流时更新commit ID，如下所示:"
+
+#: ../../tips.rst:172 0e2e10f42d6142e1b2f9d2251879ffad
+msgid ""
+"See `GitHub's docs about using Dependabot to keep your actions up to date"
+" <https://docs.github.com/en/code-security/dependabot/working-with-"
+"dependabot/keeping-your-actions-up-to-date-with-dependabot>`_."
+msgstr "请参阅 `GitHub文档 <https://docs.github.com/en/code-security/"
+"dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-"
+"dependabot>`_ ，了解如何使用Dependabot使您的action保持最新。"
+
+#: ../../tips.rst:174 2475397adfbb48af9a1d16fc0a24d9b9
+msgid ""
+"Go to the **Actions** tab in your repo "
+"(``https://github.com/<username>/<repository>/actions``) and you should "
+"see a **Deploy to GitHub Pages** action running."
+msgstr ""
+"选中仓库的 **Actions** 标签栏（ ``https://github.com/<username>/<repository>"
+"/actions`` ），此时你应该会看到已经有一个名为 **Deploy to GitHub Pages** 的"
+"action正在运行。"
+
+#: ../../tips.rst:178 df30a15c460b442796f7f2007c283f32
+msgid ""
+"Once the action completes you should see your Pelican site deployed at "
+"your repo's GitHub Pages URL: ``https://<username>.github.io`` for a user"
+" or organization site or ``https://<username>.github.io/<repository>>`` "
+"for a project site."
+msgstr ""
+"当此action执行完成，就能够通过仓库的GitHub Pages地址 ``https://<username>."
+"github.io`` 看到部署好了的用户或组织站点了，对于项目站点，可通过 ``https://"
+"<username>.github.io/<repository>`` 访问。"
+
+#: ../../tips.rst:183 f79963fcfd204f2780ff536516e6d407
+msgid "Notes:"
+msgstr "注意事项："
+
+#: ../../tips.rst:185 3a2dc6a36d38454e85265ef35c5e8010
+msgid ""
+"You don't need to set ``SITEURL`` or ``FEED_DOMAIN`` in your Pelican "
+"settings: the workflow will set them correctly for you"
+msgstr ""
+"无需在Pelican配置文件中设置 ``SITEURL`` ，工作流会帮你进行设置。"
+
+#: ../../tips.rst:188 ea406746a7db49dfa10de025a3be4a31
+msgid ""
+"You don't need to commit your ``--output`` / ``OUTPUT_PATH`` directory "
+"(``output/``) to git: the workflow will run ``pelican`` to build the "
+"output directory for you on GitHub Actions"
+msgstr ""
+"无需commit ``--output`` 或 ``OUTPUT_PATH`` 所指定的目录（ ``output/`` ）："
+"工作流会自己执行 ``pelican`` 命令来构建输出目录。"
+
+#: ../../tips.rst:192 a92a4068ac294a22ac80b1db68090634
+msgid ""
+"See `GitHub's docs about reusable workflows "
+"<https://docs.github.com/en/actions/using-workflows/reusing-workflows>`_ "
+"for more information."
+msgstr ""
+"更多信息请参阅 `GitHub可重用工作流文档 <https://docs.github.com/en/actions/using-"
+"workflows/reusing-workflows>`_ 。"
+
+#: ../../tips.rst:195 1264d8a048aa4bd7878845ba2dac0d0d
+msgid ""
+"A number of optional inputs can be added to the ``with:`` block when "
+"calling the workflow, for example:"
+msgstr ""
+"有一些可选输入可以添加到工作流的 ``with:`` 块中："
+
+#: ../../tips.rst:206 3faf65d7567244e3bc65a15dc84cf247
+msgid "Here's the complete list of workflow inputs:"
+msgstr "下面是工作流可用输入参数的完整列表："
+
+#: ../../tips.rst:209 37919ce86ddb4546bd191440ba1c5b9a
+msgid "Name"
+msgstr "名称"
+
+#: ../../tips.rst:209 645ae6a27c7b40ecbc795dbd698b0649
+msgid "Required"
+msgstr "是否必需"
+
+#: ../../tips.rst:209 18917f8f278440e38882a4f1ca62fc8f
+msgid "Description"
+msgstr "描述"
+
+#: ../../tips.rst:209 99be24eafb6d43578e6eabba25f568fe
+msgid "Type"
+msgstr "值的类型"
+
+#: ../../tips.rst:209 24860d0693b84e6c9297f8733b338824
+msgid "Default"
+msgstr "默认值"
+
+#: ../../tips.rst:211 7e9bb7ea151c4e8c99116dd4decbe3c1
+msgid "``settings``"
+msgstr "``settings``"
+
+#: ../../tips.rst:211 647c4173846f4057920030c8f774d5ea
+msgid "Yes"
+msgstr "是"
+
+#: ../../tips.rst:211 05c57822d0a249de9718a9a3c56e9e56
+msgid ""
+"The path to your Pelican settings file (``pelican``'s ``--settings`` "
+"option), for example: ``\"publishconf.py\"``"
+msgstr ""
+"Pelican配置文件的路径（会被用于 ``pelican`` 命令的 ``--settings`` 选项），例如 "
+"``\"publishconf.py\"`` 。"
+
+#: ../../tips.rst:211 ../../tips.rst:216 ../../tips.rst:223 ../../tips.rst:227
+#: ../../tips.rst:231 ../../tips.rst:237 ../../tips.rst:243
+#: 4e21f78e86f049048a800ddd5c51e230 618fd4eb66ff45b29c98df87b145613c
+#: 93083ab6eb974293820f40d16349c100 9684f50652484820b924109f31418cd7
+#: 9df48660f1a84fe1af952256c7b58aec cef3fc9239d941969fda711c74994d8c
+#: d09fff93593844cfbb0b270b4cd74193
+msgid "string"
+msgstr "string"
+
+#: ../../tips.rst:216 f867df810054493f9d6be16271822ddb
+msgid "``requirements``"
+msgstr "``requirements``"
+
+#: ../../tips.rst:216 ../../tips.rst:223 ../../tips.rst:227 ../../tips.rst:231
+#: ../../tips.rst:237 ../../tips.rst:243 019e197dd56b44229549da7a2421ce37
+#: 636f76c7f1ca4c61bcea4bbe39a4eb1f 671a0ff87e294e7ab0ac8cdf70fdfe1d
+#: 848f43cf99c447a595f4760e2cf25f2b b425d772694640d0a7bae06c236fa1a2
+#: d145c924e4f348f5ad24b51286ce61e6
+msgid "No"
+msgstr "否"
+
+#: ../../tips.rst:216 0d5ee9c193994b2cac7757e881f01a42
+msgid ""
+"The Python requirements to install, for example to enable markdown and "
+"typogrify use: ``\"pelican[markdown] typogrify\"`` or if you have a "
+"requirements file: ``\"-r requirements.txt\"``"
+msgstr ""
+"需要安装的Python模块，例如要开启markdown和typogrify，可指定 ``\"pelican[markdown] "
+"typogrify\"`` ，或者可以指定一个requirements文件： ``\"-r requirements.txt\"`` "
+
+#: ../../tips.rst:216 67298d60de17486dbc1b6841f2c433b9
+msgid "``\"pelican\"``"
+msgstr "``\"pelican\"``"
+
+#: ../../tips.rst:223 219a8d185ac440329e8aa7306e55e708
+msgid "``output-path``"
+msgstr "``output-path``"
+
+#: ../../tips.rst:223 21a3530e340349afa64d7eb69b393c98
+msgid "Where to output the generated files (``pelican``'s ``--output`` option)"
+msgstr "生成文件的输出位置（会被用于 ``pelican`` 命令的 ``--output`` 选项）"
+
+#: ../../tips.rst:223 dea97da0dfc24941b8850d1d26ea3cd3
+msgid "``\"output/\"``"
+msgstr "``\"output/\"``"
+
+#: ../../tips.rst:227 688ac4687d7841629137bf97ce97deee
+msgid "``theme``"
+msgstr "``theme``"
+
+#: ../../tips.rst:227 2c2e6b6d8a6044c0ba64d00ea1b12d40
+msgid ""
+"The GitHub repo URL of a custom theme to use, for example: "
+"``\"https://github.com/seanh/sidecar.git\"``"
+msgstr ""
+"要使用的自定义主题的GitHub仓库URL，例如： ``\"https://github.com/seanh/"
+"sidecar.git\"``"
+
+#: ../../tips.rst:227 bd63884f7e60412d9a6cccc5da9c47ac
+msgid "``\"\"``"
+msgstr "``\"\"``"
+
+#: ../../tips.rst:231 9527d9e89d704210baff0bb6e3e23b20
+msgid "``python``"
+msgstr "``python``"
+
+#: ../../tips.rst:231 1aa44193e62647c0ba275507ea84b42c
+msgid ""
+"The version of Python to use to build the site, for example: ``\"3.12\"``"
+" (to use the most recent version of Python 3.12, this is faster) or "
+"``\"3.12.1\"`` (to use an exact version, slower)"
+msgstr ""
+"构建站点时使用的Python版本，例如： ``\"3.12\"`` 或 ``\"3.12.1\"``"
+
+#: ../../tips.rst:231 d182ae2dd44c482fb3f2373a7d97087c
+msgid "``\"3.12\"``"
+msgstr "``\"3.12\"``"
+
+#: ../../tips.rst:237 dc65b4e578e24d179c38066871c2c572
+msgid "``siteurl``"
+msgstr "``siteurl``"
+
+#: ../../tips.rst:237 5909de5d60224c7b875753f88fd13296
+msgid ""
+"The base URL of your web site (Pelican's ``SITEURL`` setting). If not "
+"passed this will default to the URL of your GitHub Pages site, which is "
+"correct in most cases."
+msgstr ""
+"站点的基URL，会用于配置项 ``SITEURL`` 。若未指定，默认值为GitHub Pages站点"
+"的URL，这适用于大部分情况。"
+
+#: ../../tips.rst:237 ../../tips.rst:243 0c0b86aa4b984615afb3564b76e379ff
+#: c7ddd6347a7f4467b31aaa8f4d4a2309
+msgid "The URL of your GitHub Pages site."
+msgstr "GitHub Pages站点的URL"
+
+#: ../../tips.rst:243 af7d2b52c5504ac2b69490a18d14f80f
+msgid "``feed_domain``"
+msgstr "``feed_domain``"
+
+#: ../../tips.rst:243 2cc126862a8047c286381aa258aad013
+msgid ""
+"The domain to be prepended to feed URLs (Pelican's ``FEED_DOMAIN`` "
+"setting). If not passed this will default to the URL of your GitHub Pages"
+" site, which is correct in most cases."
+msgstr ""
+"订阅源URL前要附加的域名，会用于配置项 ``FEED_DOMAIN`` 。若未指定，默认值为"
+"GitHub Pages站点的URL，这适用于大部分情况。"
+
+#: ../../tips.rst:252 b86ab8a1fa24447d99becc592411010e
+msgid "\"Insecure content\" warnings from browsers"
+msgstr "浏览器报“不安全的内容（Insecure content）”警告"
+
+#: ../../tips.rst:254 c81d5f8889c14a069e55fe7472a238f2
+msgid ""
+"If your site uses ``https://`` and is broken because the browser is "
+"blocking network requests (for example for CSS files) due to \"insecure "
+"content\" this may be because GitHub Pages is generating ``http://`` URLs"
+" for your site."
+msgstr ""
+"当站点使用 ``https://`` 时，可能会损坏，无法正常显示，这是由于浏览器阻拦了一些"
+"对“不安全内容”的网络请求。可能的原因之一是GitHub Pages给你的站点生成了 ``http://`` "
+"URL。"
+
+#: ../../tips.rst:258 2a53f882b7e645149d18ce81757b9758
+msgid ""
+"To fix this go into your site repo's settings and enable the **Enforce "
+"HTTPS** setting: go to **Settings → Pages** and check **Enforce HTTPS**. "
+"Then re-run the workflow to re-deploy your site. Alternatively, you can "
+"use the workflow's ``siteurl`` and ``feed_domain`` settings."
+msgstr ""
+"要想解决这一问题，需要为站点所在仓库开启 **强制使用HTTPS** ：点击 **Settings → Pages** "
+"并在其中勾选 **Enforce HTTPS** ，接着再重新执行工作流以重新部署站点。也可以尝试"
+"通过配置 ``siteurl`` 与 ``feed_domain`` 解决问题。"
+
+#: ../../tips.rst:266 483cbd21e61841d983e2ecc8bc3006bc
+msgid ""
+"GitHub Pages will display the custom 404 page described above, as noted "
+"in the relevant `GitHub docs "
+"<https://help.github.com/articles/custom-404-pages/>`_."
+msgstr ""
+"如果按前述进行配置，GitHub Pages是能够正确显示自定义的404页面的，相关内容在 "
+"`GitHub的文档中 <https://help.github.com/articles/custom-404-pages/>`_ 也有提到。"
+
+#: ../../tips.rst:270 6b54e9c354f34e1f9a5a3f50d96b98c3
+msgid "Update your site on each commit"
+msgstr "在每次commit后都更新站点"
+
+#: ../../tips.rst:272 2e83c0c761c94f35ae3056634d8f1552
+msgid ""
+"To automatically update your Pelican site on each commit, you can create "
+"a post-commit hook. For example, you can add the following to "
+"``.git/hooks/post-commit``::"
+msgstr ""
+"要想在每次commit后自动更新Pelican站点，你可以创建一个post-commit钩子。例如，"
+"可以将下面的内容保存为 ``.git/hooks/post-commit`` ："
+
+#: ../../tips.rst:279 528589366e634f15bb0a702969715286
+msgid "Copy static files to the root of your site"
+msgstr "将静态文件拷贝到站点根目录"
+
+#: ../../tips.rst:281 dc4267653ef04722a0583915c05b6c88
+msgid ""
+"To use a `custom domain <https://help.github.com/articles/setting-up-a"
+"-custom-domain-with-pages>`_ with GitHub Pages, you need to put the "
+"domain of your site (e.g., ``blog.example.com``) inside a ``CNAME`` file "
+"at the root of your site. To do this, create the ``content/extra/`` "
+"directory and add a ``CNAME`` file to it. Then use the ``STATIC_PATHS`` "
+"setting to tell Pelican to copy this file to your output directory. For "
+"example::"
+msgstr ""
+"要将 `自定义域名 <https://help.github.com/articles/setting-up-a-custom-domain-"
+"with-pages>`_ 与GitHub Pages一起使用，需要将站点的域名（例如 ``blog.example.com`` "
+"）添加到站点根目录的 ``CNAME`` 文件中。为此，请创建 ``content/extra/`` 目录，并在里面添加一个 ``CNAME`` "
+"文件。然后使用Pelican的 ``STATIC_PATHS`` 来告诉Pelican将此文件复制到输出目录："
+
+#: ../../tips.rst:292 5fcdc283f55f4d8ca121cb6438c67a36
+msgid "Note: use forward slashes, ``/``, even on Windows."
+msgstr "请注意：务必使用正斜杠 ``/`` ，在Windows上也是。"
+
+#: ../../tips.rst:294 326a40a1536c462ea4974ce4b560f54c
+msgid ""
+"You can also use the ``EXTRA_PATH_METADATA`` mechanism to place a "
+"``favicon.ico`` or ``robots.txt`` at the root of any site."
+msgstr ""
+"利用 ``EXTRA_PATH_METADATA`` 机制，你可以将 ``favicon.ico`` 或 ``robots.txt`` "
+"也拷贝到站点的根目录下。"
+
+#: ../../tips.rst:298 4e589caa6f17438aae1d1a12819c6ef2
+msgid "How to add YouTube or Vimeo Videos"
+msgstr "如何添加YouTube或Vimeo视频"
+
+#: ../../tips.rst:300 5f60f033a7084739af5ef0dce5b91197
+msgid ""
+"The easiest way is to paste the embed code of the video from these sites "
+"directly into your source content."
+msgstr ""
+"最简单的方法是将这些网站的视频嵌入代码直接粘贴到您的源内容文件中。"
+
+#: ../../tips.rst:303 5446d02bebc241e88cc30b484799696c
+msgid ""
+"Alternatively, you can also use Pelican plugins like ``liquid_tags``, "
+"``pelican_youtube``, or ``pelican_vimeo`` to embed videos in your "
+"content."
+msgstr ""
+"或者，您还可以使用例如 ``liquid_tags`` 、``pelican_youtube`` 或 ``pelican_vimeo`` "
+"等Pelican插件将视频嵌入。"
+
+#: ../../tips.rst:306 c871fab4a3424b0dba84c1af24f6405f
+msgid ""
+"Moreover, markup languages like reST and Markdown have plugins that let "
+"you embed videos in the markup. You can use `reST video directive "
+"<https://gist.github.com/dbrgn/2922648>`_ for reST or `mdx_video plugin "
+"<https://github.com/italomaia/mdx-video>`_ for Markdown."
+msgstr ""
+"此外，像reST和 Markdown这样的标记语言都有对应插件可以让你在其中嵌入视频。"
+"可以使用 `reST的视频指令 <https://gist.github.com/dbrgn/2922648>`_ 或者 "
+"`Markdown的mdx_video插件 <https://github.com/italomaia/mdx-video>`_ 。"
+
+#: ../../tips.rst:313 569b7609cb9d412e942001da7c4a704c
+msgid "Develop Locally Using SSL"
+msgstr "在本地使用SSL进行开发"
+
+#: ../../tips.rst:315 e66f6f1cacc4466682461d251aedb929
+msgid "Here's how you can set up your local pelican server to support SSL."
+msgstr "以下描述了如何在本地Pelican服务器上配置SSL。"
+
+#: ../../tips.rst:317 138c34c1b6804246b79fda266a1fd937
+msgid ""
+"First, create a self-signed certificate and key using ``openssl`` (this "
+"creates ``cert.pem`` and ``key.pem``)::"
+msgstr ""
+"首先，通过 ``openssl`` 创建自签名的证书和密钥，这会生成 ``cert.pem`` 和 "
+"``key.pem`` 文件："
+
+#: ../../tips.rst:321 ac189182bc694bcaa94cd935311f4492
+msgid ""
+"And use this command to launch the server (the server starts within your "
+"``output`` directory)::"
+msgstr ""
+"接着使用下面的命令来开启服务器（此服务器会在 ``output`` 目录下开启）："
+
+#: ../../tips.rst:325 88a33744d69f4f5bbc4a43024c43d3a0
+msgid "If you are using ``develop-server.sh``,  add this to the top::"
+msgstr "如果你使用的是 ``develop-server.sh`` 脚本，在脚本的开头添加："
+
+#: ../../tips.rst:330 9a783977fe814657b8590185af281b1e
+msgid "and modify the ``pelican.server`` line as follows::"
+msgstr "然后修改按照下述修改 ``pelican.server`` 一行："
+
+#~ msgid ""
+#~ "To publish a Pelican site in the"
+#~ " form of User Pages, you need "
+#~ "to *push* the content of the "
+#~ "``output`` dir generated by Pelican to"
+#~ " the ``master`` branch of your "
+#~ "``<username>.github.io`` repository on GitHub."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The ``git push`` command pushes the "
+#~ "local ``gh-pages`` branch (freshly "
+#~ "updated by the ``ghp-import`` command)"
+#~ " to the ``elemoine.github.io`` repository's "
+#~ "``master`` branch on GitHub."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Now you can push the whole project"
+#~ " ``<username>.github.io`` to the master "
+#~ "branch of your GitHub repository::"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Pelican-powered sites can be published"
+#~ " to GitHub Pages via a `custom "
+#~ "workflow "
+#~ "<https://github.com/getpelican/pelican/blob/master/.github/workflows/github_pages.yml>`_."
+#~ " To use it:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You may want to replace the "
+#~ "``@master`` with the ID of a "
+#~ "specific commit in this repo in "
+#~ "order to pin the version of the"
+#~ " reusable workflow that you're using: "
+#~ "``uses: "
+#~ "getpelican/pelican/.github/workflows/github_pages.yml@<COMMIT_ID>``."
+#~ " If you do this you might want"
+#~ " to get Dependabot to send you "
+#~ "automated pull requests to update that"
+#~ " commit ID whenever new versions of"
+#~ " this workflow are published, like "
+#~ "so:"
+#~ msgstr ""

From 44db258f59d1029210cd4d9113aad9feea29218d Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 16 Sep 2024 15:11:14 +0200
Subject: [PATCH 2749/2864] Adjust list of Git-ignored files

---
 .gitignore | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a3d27ca8..6ea22c9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 *.pyc
 .DS_Store
 docs/_build
-docs/fr/_build
+docs/*/_build
 build
 dist
 tags
@@ -19,9 +19,11 @@ samples/output
 .pdm-python
 .vale
 .venv
+**/LC_MESSAGES/*.mo
 
 # direnv
 .envrc
 
-# pycharm
+# IDE cruft
 .idea
+.vscode

From 9e8af627b528e04d84335df731872b108ad18c82 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 16 Sep 2024 15:16:43 +0200
Subject: [PATCH 2750/2864] Prepare release

---
 RELEASE.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..9f31782f
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,12 @@
+Release type: minor
+
+- Add setting to specify summary via paragraph count
+- Add new status to skip generation of a post
+- Add setting to append ``ref`` parameter to links in feeds
+- Configure logging handler via ``--log-handler`` CLI option
+- Resolve intra-site links in summaries
+- Warn when files are not processed due to disabled readers
+- Add Medium post importer
+- Improve GitHub Pages workflow
+- Improve code test coverage
+- Translate documentation into Simplified Chinese

From a5db130e1d3a76a27cd8387ffb47a5e24821eea5 Mon Sep 17 00:00:00 2001
From: botpub <52496925+botpub@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:23:38 +0000
Subject: [PATCH 2751/2864] Release Pelican 4.10.0

---
 RELEASE.md         | 12 ------------
 docs/changelog.rst | 14 ++++++++++++++
 pyproject.toml     |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 9f31782f..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Release type: minor
-
-- Add setting to specify summary via paragraph count
-- Add new status to skip generation of a post
-- Add setting to append ``ref`` parameter to links in feeds
-- Configure logging handler via ``--log-handler`` CLI option
-- Resolve intra-site links in summaries
-- Warn when files are not processed due to disabled readers
-- Add Medium post importer
-- Improve GitHub Pages workflow
-- Improve code test coverage
-- Translate documentation into Simplified Chinese
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5ef19b17..61674564 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,20 @@
 Release history
 ###############
 
+4.10.0 - 2024-09-16
+===================
+
+- Add setting to specify summary via paragraph count
+- Add new status to skip generation of a post
+- Add setting to append ``ref`` parameter to links in feeds
+- Configure logging handler via ``--log-handler`` CLI option
+- Resolve intra-site links in summaries
+- Warn when files are not processed due to disabled readers
+- Add Medium post importer
+- Improve GitHub Pages workflow
+- Improve code test coverage
+- Translate documentation into Simplified Chinese
+
 4.9.1 - 2023-11-15
 ==================
 
diff --git a/pyproject.toml b/pyproject.toml
index 1a2e1474..2233ab62 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 name = "pelican"
 authors = [{ name = "Justin Mayer", email = "authors@getpelican.com" }]
 description = "Static site generator supporting Markdown and reStructuredText"
-version = "4.9.1"
+version = "4.10.0"
 license = { text = "AGPLv3" }
 readme = "README.rst"
 keywords = ["static site generator", "static sites", "ssg"]

From 86bf9230b40c47f45aa30141ceca46286b5f0480 Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Thu, 19 Sep 2024 14:25:01 +0200
Subject: [PATCH 2752/2864] test: fix build test

the regex, searching for the builded files was not stable to changes for two digit versions.

fixes: Build test failures in GitHub CI workflow #3393
---
 pelican/tests/build_test/test_build_files.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tests/build_test/test_build_files.py b/pelican/tests/build_test/test_build_files.py
index c80253db..8e295f32 100644
--- a/pelican/tests/build_test/test_build_files.py
+++ b/pelican/tests/build_test/test_build_files.py
@@ -61,6 +61,6 @@ def test_sdist_contents(pytestconfig, expected_file):
         filtered_values = [
             path
             for path in files_list
-            if match(rf"^pelican-\d\.\d\.\d/{expected_file}{dir_matcher}$", path)
+            if match(rf"^pelican-\d+\.\d+\.\d+/{expected_file}{dir_matcher}$", path)
         ]
         assert len(filtered_values) > 0

From 84db21c724143e21673e266d98857c4235d1499a Mon Sep 17 00:00:00 2001
From: Lioman <dev@lioman.de>
Date: Fri, 20 Sep 2024 14:46:29 +0200
Subject: [PATCH 2753/2864] Match actual version instead of regex in `build` CI
 job (#3396)

---
 pelican/tests/build_test/test_build_files.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pelican/tests/build_test/test_build_files.py b/pelican/tests/build_test/test_build_files.py
index 8e295f32..c59d9235 100644
--- a/pelican/tests/build_test/test_build_files.py
+++ b/pelican/tests/build_test/test_build_files.py
@@ -1,3 +1,4 @@
+import importlib.metadata
 import tarfile
 from pathlib import Path
 from re import match
@@ -5,6 +6,8 @@ from zipfile import ZipFile
 
 import pytest
 
+version = importlib.metadata.version("pelican")
+
 
 @pytest.mark.skipif(
     "not config.getoption('--check-build')",
@@ -16,7 +19,7 @@ def test_wheel_contents(pytestconfig):
     that everything that is needed is included in the final build
     """
     dist_folder = pytestconfig.getoption("--check-build")
-    wheels = Path(dist_folder).rglob("*.whl")
+    wheels = Path(dist_folder).rglob(f"pelican-{version}-py3-none-any.whl")
     for wheel_file in wheels:
         files_list = ZipFile(wheel_file).namelist()
         # Check if theme files are copied to wheel
@@ -52,7 +55,7 @@ def test_sdist_contents(pytestconfig, expected_file):
     that everything that is needed is included in the final build.
     """
     dist_folder = pytestconfig.getoption("--check-build")
-    sdist_files = Path(dist_folder).rglob("*.tar.gz")
+    sdist_files = Path(dist_folder).rglob(f"pelican-{version}.tar.gz")
     for dist in sdist_files:
         files_list = tarfile.open(dist, "r:gz").getnames()
         dir_matcher = ""
@@ -61,6 +64,6 @@ def test_sdist_contents(pytestconfig, expected_file):
         filtered_values = [
             path
             for path in files_list
-            if match(rf"^pelican-\d+\.\d+\.\d+/{expected_file}{dir_matcher}$", path)
+            if match(rf"^pelican-{version}/{expected_file}{dir_matcher}$", path)
         ]
         assert len(filtered_values) > 0

From 6c6b940ffc80120e0334166ad03061eaf406aae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Pit-Claudel?= <clement.pitclaudel@live.com>
Date: Fri, 20 Sep 2024 18:49:23 +0200
Subject: [PATCH 2754/2864] Don't store a RichHandler object in the argparse
 namespace (#3394)

---
 pelican/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 96849bae..89a63e84 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -310,6 +310,9 @@ class ParseOverrides(argparse.Action):
         setattr(namespace, self.dest, overrides)
 
 
+LOG_HANDLERS = {"plain": None, "rich": DEFAULT_LOG_HANDLER}
+
+
 def parse_arguments(argv=None):
     parser = argparse.ArgumentParser(
         description="A tool to generate a static blog, "
@@ -448,7 +451,6 @@ def parse_arguments(argv=None):
         ),
     )
 
-    LOG_HANDLERS = {"plain": None, "rich": DEFAULT_LOG_HANDLER}
     parser.add_argument(
         "--log-handler",
         default="rich",
@@ -513,8 +515,6 @@ def parse_arguments(argv=None):
     if args.bind is not None and not args.listen:
         logger.warning("--bind without --listen has no effect")
 
-    args.log_handler = LOG_HANDLERS[args.log_handler]
-
     return args
 
 
@@ -637,7 +637,7 @@ def main(argv=None):
         level=args.verbosity,
         fatal=args.fatal,
         name=__name__,
-        handler=args.log_handler,
+        handler=LOG_HANDLERS[args.log_handler],
         logs_dedup_min_level=logs_dedup_min_level,
     )
 

From 08283b491537550043dcc869ee1d5b13d89d26af Mon Sep 17 00:00:00 2001
From: Frederik Elwert <frederik.elwert@web.de>
Date: Sat, 28 Sep 2024 18:55:22 +0200
Subject: [PATCH 2755/2864] Fix symbolic link handling in `pelican-themes
 -s/-c` (#3392)

---
 pelican/tools/pelican_themes.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index fa59b8fd..4d8cee2d 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -249,6 +249,7 @@ def install(path, v=False, u=False):
 
 def symlink(path, v=False):
     """Symbolically link a theme"""
+    path = os.path.realpath(path)
     if not os.path.exists(path):
         err(path + " : no such file or directory")
     elif not os.path.isdir(path):
@@ -269,7 +270,7 @@ def symlink(path, v=False):
 
 def is_broken_link(path):
     """Returns True if the path given as is a broken symlink"""
-    path = os.readlink(path)
+    path = os.path.realpath(path)
     return not os.path.exists(path)
 
 

From fe45094545c98f6777e684ebe3134ccea2df01fb Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 28 Sep 2024 18:59:03 +0200
Subject: [PATCH 2756/2864] Prepare release

---
 RELEASE.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..94a83dd7
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,4 @@
+Release type: patch
+
+- Fix error when running ``pelican -r -l``
+- Fix symlink handling in ``pelican-themes``

From b86383fb28a160eeaf3e13cbf99469a0ed4cfcb2 Mon Sep 17 00:00:00 2001
From: botpub <52496925+botpub@users.noreply.github.com>
Date: Sat, 28 Sep 2024 17:02:04 +0000
Subject: [PATCH 2757/2864] Release Pelican 4.10.1

---
 RELEASE.md         | 4 ----
 docs/changelog.rst | 6 ++++++
 pyproject.toml     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 94a83dd7..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Release type: patch
-
-- Fix error when running ``pelican -r -l``
-- Fix symlink handling in ``pelican-themes``
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 61674564..cfc290df 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,12 @@
 Release history
 ###############
 
+4.10.1 - 2024-09-28
+===================
+
+- Fix error when running ``pelican -r -l``
+- Fix symlink handling in ``pelican-themes``
+
 4.10.0 - 2024-09-16
 ===================
 
diff --git a/pyproject.toml b/pyproject.toml
index 2233ab62..0fce25ca 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 name = "pelican"
 authors = [{ name = "Justin Mayer", email = "authors@getpelican.com" }]
 description = "Static site generator supporting Markdown and reStructuredText"
-version = "4.10.0"
+version = "4.10.1"
 license = { text = "AGPLv3" }
 readme = "README.rst"
 keywords = ["static site generator", "static sites", "ssg"]

From 478012e0d0bd8431d90ccac2802210778a638cd9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 2 Oct 2024 19:08:26 +0200
Subject: [PATCH 2758/2864] Clarify `_include_path()` parameter docstring

---
 pelican/generators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 6b44d79e..207c9296 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -138,7 +138,7 @@ class Generator:
     def _include_path(self, path, extensions=None):
         """Inclusion logic for .get_files(), returns True/False
 
-        :param path: the path which might be including
+        :param path: potential path to include (relative to content root)
         :param extensions: the list of allowed extensions, or False if all
             extensions are allowed
         """

From f5dc4d4b96c0b21079dc4f60e97b241f211885bf Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 4 Oct 2024 15:04:13 +0200
Subject: [PATCH 2759/2864] Disable blank GitHub issues

Existing issue template categories should cover most any case.
---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 9e240bd9..a07de4ab 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,6 @@
 ---
 # Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
 - name: '💬 Pelican IRC Channel'
   url: https://web.libera.chat/?#pelican

From b02abf022009eb2ca31977b2908c42b5144f9743 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 4 Oct 2024 15:06:11 +0200
Subject: [PATCH 2760/2864] Improve GitHub issue templates

---
 .github/ISSUE_TEMPLATE/---bug-report.md      | 8 ++++++--
 .github/ISSUE_TEMPLATE/---everything-else.md | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
index c0f9dec6..6825b61c 100644
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -17,11 +17,15 @@ assignees: ''
 
 <!-- Checked checkbox should look like this: [x] -->
 - [ ] I have read the [Filing Issues](https://docs.getpelican.com/en/latest/contribute.html#filing-issues) and subsequent “How to Get Help” sections of the documentation.
+- [ ] I can reproduce this problem with stock/default settings file, theme, and sample content (as described in above “How to Get Help” sections of the documentation).
 - [ ] I have searched the [issues](https://github.com/getpelican/pelican/issues?q=is%3Aissue) (including closed ones) and believe that this is not a duplicate.
 
 <!--
-  Once the above boxes are checked, if you are able to fill in the following list
-  with your information, it would be very helpful for maintainers.
+  If you cannot reproduce the problem with stock/default settings file, theme, and sample content,
+  please close this tab and ask your question in the Discussions area instead:
+  <https://github.com/getpelican/pelican/discussions>
+  Otherwise, once the above boxes are checked, please fill out the following list
+  of information, which would be very helpful for maintainers.
 -->
 
 - **OS version and name**: <!-- Replace with version + name -->
diff --git a/.github/ISSUE_TEMPLATE/---everything-else.md b/.github/ISSUE_TEMPLATE/---everything-else.md
index fd2a58ae..23a3f7bd 100644
--- a/.github/ISSUE_TEMPLATE/---everything-else.md
+++ b/.github/ISSUE_TEMPLATE/---everything-else.md
@@ -8,7 +8,11 @@ assignees: ''
 ---
 
 <!--
-  Describe your question/issue here. This space is meant to be used for general questions
+  Instead of a new issue, please consider submitting your question to:
+  <https://github.com/getpelican/pelican/discussions>
+  If for some reason you believe that your question warrants a new issue
+  instead of a discussion thread, describe your question/issue here.
+  This space is meant to be used for general questions
   that are not bugs, feature requests, or documentation issues.
   Before you submit this, let’s make sure of a few things.
   Please make sure the following boxes are ticked if they are correct.
@@ -18,6 +22,7 @@ assignees: ''
 <!-- Checked checkbox should look like this: [x] -->
 - [ ] I have searched the [issues](https://github.com/getpelican/pelican/issues?q=is%3Aissue) (including closed ones) and believe that this is not a duplicate.
 - [ ] I have searched the [documentation](https://docs.getpelican.com/) and believe that my question is not covered.
+- [ ] I have carefully read the [How to Get Help](https://docs.getpelican.com/en/latest/contribute.html#how-to-get-help) section of the documentation.
 
 ## Issue
 <!-- Now feel free to write your issue, but please be descriptive! Thanks again 🙌 ❤️ -->

From 92050d90bc99f65dfdcd2297d8223228a0d08367 Mon Sep 17 00:00:00 2001
From: Frederik Elwert <frederik.elwert@rub.de>
Date: Thu, 10 Oct 2024 14:35:07 +0200
Subject: [PATCH 2761/2864] Add FAQ regarding theme overrides

Currently, the documentation refers to creating new themes a lot.
It is much less apparent how one can customize an existing theme by
overriding individual templates or adding new ones. This commit adds
an FAQ for this, and also mentions the mechanism in the FAQ on custom
templates.
---
 docs/faq.rst | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index bbf058cd..8ae3af29 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -64,6 +64,19 @@ How do I create my own theme?
 
 Please refer to :ref:`theming-pelican`.
 
+Can I override individual templates without forking the whole theme?
+====================================================================
+
+Yes, you can override existing templates of the theme that you are using, or
+add new templates, via the ``THEME_TEMPLATES_OVERRIDES`` variable. For example,
+to override the page template, you can define the location for your templates
+like this::
+
+    THEME_TEMPLATES_OVERRIDES = ["templates"]
+
+You can then define a custom template in ``templates/page.html``.
+See :ref:`settings/themes` for details.
+
 I want to use Markdown, but I got an error.
 ===========================================
 
@@ -122,7 +135,8 @@ For content in Markdown format::
     Template: template_name
 
 Then just make sure your theme contains the relevant template file (e.g.
-``template_name.html``).
+``template_name.html``). If you just want to add a new custom template to an
+existing theme, you can also provide it in a directory specified by ``THEME_TEMPLATES_OVERRIDES`` (see :ref:`settings/themes`).
 
 How can I override the generated URL of a specific page or article?
 ===================================================================

From 0da2530d9b0de8c8a3c9757f8e9d6d520d837fc2 Mon Sep 17 00:00:00 2001
From: Noel Miller <4983138+noelmiller@users.noreply.github.com>
Date: Tue, 22 Oct 2024 11:59:19 -0500
Subject: [PATCH 2762/2864] De-couple build workflow from GitHub Pages
 publication (#3404)

---
 .github/workflows/github_pages.yml | 14 +++++++---
 docs/tips.rst                      | 45 ++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index 48ebb2d0..9c279ab1 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -1,4 +1,4 @@
-# Workflow for publishing to GitHub Pages.
+# Workflow for building the site and (optionally) publishing it to GitHub Pages.
 name: Deploy to GitHub Pages
 on:
   workflow_call:
@@ -37,13 +37,15 @@ on:
         default: ""
         description: "The domain to be prepended to feed URLs (Pelican's FEED_DOMAIN setting). If not passed this will default to the URL of your GitHub Pages site, which is correct in most cases."
         type: string
+      deploy:
+        required: false
+        default: true
+        description: "Whether to deploy the site. If true then build the site and deploy it. If false then just test that the site builds successfully but don't deploy anything."
+        type: boolean
 permissions:
   contents: read
   pages: write
   id-token: write
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -88,6 +90,10 @@ jobs:
         with:
           path: ${{ inputs.output-path }}
   deploy:
+    concurrency:
+      group: "pages"
+      cancel-in-progress: false
+    if: ${{ inputs.deploy }}
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
diff --git a/docs/tips.rst b/docs/tips.rst
index e5574c7c..4df20ae3 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -246,7 +246,52 @@ Here's the complete list of workflow inputs:
 |                  |          | your GitHub Pages site, which is correct   |        |               |
 |                  |          | in most cases.                             |        |               |
 +------------------+----------+--------------------------------------------+--------+---------------+
+| ``deploy``       | No       | This is used to determine whether you will | bool   | ``true``      |
+|                  |          | deploy the site or not to GitHub Pages.    |        |               |
+|                  |          | This is most useful if you want to test a  |        |               |
+|                  |          | change to your website in a pull request   |        |               |
+|                  |          | before deploying those change.             |        |               |
++------------------+----------+--------------------------------------------+--------+---------------+
 
+Testing Your Build in a GitHub Pull Request
+"""""""""""""""""""""""""""""""""""""""""""
+
+If you want to test your build in a pull request before deploying to GitHub, your workflow might look something like this:
+
+.. code-block:: yaml
+
+    name: Build and Deploy Site
+    on:
+      push:
+        branches: ["main"]
+      pull_request:
+        branches: ["main"]
+      workflow_dispatch:
+        inputs:
+          deploy:
+            required: false
+            default: true
+            description: "Whether to deploy the site. If checked, then build the site and deploy it. If not checked, then just test that the site builds successfully but don't deploy anything."
+            type: boolean
+    jobs:
+      deploy:
+        uses: "getpelican/pelican/.github/workflows/github_pages.yml@main"
+        permissions:
+          id-token: write
+          contents: read
+          pages: write
+        with:
+          settings: "publishconf.py"
+          requirements: "-r requirements.txt"
+          deploy: ${{ (github.event_name == 'workflow_dispatch' && inputs.deploy == true) || (github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch) }}
+
+The ``on`` section of the workflow defines the events that will trigger the workflow. In this example, the workflow will run on pushes to the main branch, pull requests to the main branch, and manual runs of the workflow.
+
+``workflow_dispatch`` defines the deploy boolean to be true by default. This means that if you run the workflow manually, it will deploy the site.
+
+The ``deploy`` input for the job is using a set of standard GitHub workflow variables to control when ``deploy`` will either be true or false (you can customize this to your needs).
+
+In this example, the ``deploy`` will be true if the event is a push to the main branch (or merging into main from a PR) or a manual run of the workflow. If the event is a pull request, the ``deploy`` will be false and it will only build an artifact for the site.
 
 "Insecure content" warnings from browsers
 """""""""""""""""""""""""""""""""""""""""

From 075542721cf3ab893526ddda3355821d0ac3cac3 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Sun, 3 Nov 2024 13:28:44 -0600
Subject: [PATCH 2763/2864] pre-commit autoupdate and fix new issues pointed
 out by ruff

---
 .pre-commit-config.yaml             | 6 +++---
 pelican/tools/pelican_quickstart.py | 6 +++---
 pelican/tools/pelican_themes.py     | 1 -
 pyproject.toml                      | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9ae674ab..716ddd89 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for info on hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -16,14 +16,14 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # ruff version should match the one in pyproject.toml
-    rev: v0.4.10
+    rev: v0.7.2
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
 
   - repo: https://github.com/rtts/djhtml
-    rev: '3.0.6'
+    rev: '3.0.7'
     hooks:
       - id: djhtml
       - id: djcss
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index e278e3bc..77131a52 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -87,7 +87,7 @@ _DEFAULT_PATH = _DEFAULT_PATH_TYPE(os.curdir)
 
 
 def ask(question, answer=str, default=None, length=None):
-    if answer == str:
+    if answer is str:
         r = ""
         while True:
             if default:
@@ -110,7 +110,7 @@ def ask(question, answer=str, default=None, length=None):
 
         return r
 
-    elif answer == bool:
+    elif answer is bool:
         r = None
         while True:
             if default is True:
@@ -134,7 +134,7 @@ def ask(question, answer=str, default=None, length=None):
             else:
                 print("You must answer 'yes' or 'no'")
         return r
-    elif answer == int:
+    elif answer is int:
         r = None
         while True:
             if default:
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 4d8cee2d..adf86dc0 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -23,7 +23,6 @@ except ImportError:
     )
 
 
-global _THEMES_PATH
 _THEMES_PATH = os.path.join(
     os.path.dirname(os.path.abspath(pelican.__file__)), "themes"
 )
diff --git a/pyproject.toml b/pyproject.toml
index 0fce25ca..f3629015 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ dev = [
     "tox>=4.11.3",
     "invoke>=2.2.0",
     # ruff version should match the one in .pre-commit-config.yaml
-    "ruff==0.4.10",
+    "ruff==0.7.2",
     "tomli>=2.0.1; python_version < \"3.11\"",
 ]
 

From 60261b8c99d57a70ee5ce4d3c576a8a2c0417dfe Mon Sep 17 00:00:00 2001
From: GeorgeHu6 <dhxxhch@163.com>
Date: Thu, 7 Nov 2024 16:31:32 +0800
Subject: [PATCH 2764/2864] Doc: update Chinese translation

---
 docs/locale/zh_CN/LC_MESSAGES/changelog.po | 776 +++++++++++----------
 docs/locale/zh_CN/LC_MESSAGES/faq.po       | 159 +++--
 docs/locale/zh_CN/LC_MESSAGES/tips.po      | 416 ++++++-----
 3 files changed, 739 insertions(+), 612 deletions(-)

diff --git a/docs/locale/zh_CN/LC_MESSAGES/changelog.po b/docs/locale/zh_CN/LC_MESSAGES/changelog.po
index 18fec089..fa2ad406 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/changelog.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/changelog.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"POT-Creation-Date: 2024-11-07 16:25+0800\n"
 "PO-Revision-Date: 2024-06-27 19:00+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
@@ -16,243 +16,299 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.15.0\n"
+"Generated-By: Babel 2.16.0\n"
 
-#: ../../changelog.rst:2 4aeac72dd31d4f34ae17a35dc3dfb6bb
+#: ../../changelog.rst:2 0742e96cabd04fc99355bbfa66fcb719
 msgid "Release history"
 msgstr "更新日志"
 
-#: ../../changelog.rst:5 1e1473d7633a41f6bf9b31bdd8b7fe79
+#: ../../changelog.rst:5 47b916504e6c4a33a499718574212ed2
+msgid "4.10.1 - 2024-09-28"
+msgstr ""
+
+#: ../../changelog.rst:7 33731d204a8f42d6972a5b41035bf6fa
+msgid "Fix error when running ``pelican -r -l``"
+msgstr ""
+
+#: ../../changelog.rst:8 0c82e22bd70f497880747a23445a279e
+msgid "Fix symlink handling in ``pelican-themes``"
+msgstr ""
+
+#: ../../changelog.rst:11 2a6b4d6833884393bf6eb0f664f07027
+msgid "4.10.0 - 2024-09-16"
+msgstr ""
+
+#: ../../changelog.rst:13 c5b7388ced0246df9383968b896cee1d
+msgid "Add setting to specify summary via paragraph count"
+msgstr ""
+
+#: ../../changelog.rst:14 55bef71482124d7ba15dcc13def666b4
+msgid "Add new status to skip generation of a post"
+msgstr ""
+
+#: ../../changelog.rst:15 74aa099718c64ec3864fb4b54e8c7e7b
+msgid "Add setting to append ``ref`` parameter to links in feeds"
+msgstr ""
+
+#: ../../changelog.rst:16 be0d21b2ffd648f9aad935e95fa2e9b2
+msgid "Configure logging handler via ``--log-handler`` CLI option"
+msgstr ""
+
+#: ../../changelog.rst:17 f582b79f9b19462988607337626e92e8
+msgid "Resolve intra-site links in summaries"
+msgstr ""
+
+#: ../../changelog.rst:18 00e8752d88364591a1e7844b3605963c
+msgid "Warn when files are not processed due to disabled readers"
+msgstr ""
+
+#: ../../changelog.rst:19 0de52c3ba40b44f0816cc8dabf7913ab
+msgid "Add Medium post importer"
+msgstr ""
+
+#: ../../changelog.rst:20 051bf922a7304dd798e894ddcfb64635
+msgid "Improve GitHub Pages workflow"
+msgstr ""
+
+#: ../../changelog.rst:21 7db880406e9540de9b2d5b023cc10147
+msgid "Improve code test coverage"
+msgstr ""
+
+#: ../../changelog.rst:22 c4327d2df9e34af384a4b0c96031e7e1
+msgid "Translate documentation into Simplified Chinese"
+msgstr ""
+
+#: ../../changelog.rst:25 75bd952da32744868b68714fa89d62ec
 msgid "4.9.1 - 2023-11-15"
 msgstr ""
 
-#: ../../changelog.rst:7 b8408b62a2644333a6f79c46ed50ae40
+#: ../../changelog.rst:27 f896a982ada348e3bf763a9cf620d432
 msgid "Ensure ``tzdata`` dependency is installed on Windows"
 msgstr ""
 
-#: ../../changelog.rst:10 fd27b54d8bc441ffaad0eed5342e3fb0
+#: ../../changelog.rst:30 f7893a294e2c4c44bd82d68283421096
 msgid "4.9.0 - 2023-11-12"
 msgstr ""
 
-#: ../../changelog.rst:12 d2a96d9c7641406db9b5bbbf1e1591f1
+#: ../../changelog.rst:32 3fc89471c16044349176c6bf58daef61
 msgid "Upgrade code to new minimum supported Python version: 3.8"
 msgstr ""
 
-#: ../../changelog.rst:13 eecb4e70e6d64882a298a68a906aa7e7
+#: ../../changelog.rst:33 361eb8523ae54e6c965c4957d5af9a0b
 msgid ""
 "Settings support for ``pathlib.Path`` `(#2758) "
 "<https://github.com/getpelican/pelican/pull/2758>`_"
 msgstr ""
 
-#: ../../changelog.rst:14 73d4ff7624894557974d1e14072e995e
+#: ../../changelog.rst:34 7ea2147f8b6c4bc1af0e926b897fbbc7
 msgid ""
 "Various improvements to Simple theme (`#2976 "
 "<https://github.com/getpelican/pelican/pull/2976>`_ & `#3234 "
 "<https://github.com/getpelican/pelican/pull/3234>`_)"
 msgstr ""
 
-#: ../../changelog.rst:15 242c2330a6264406a9444beb84da5682
+#: ../../changelog.rst:35 fc0e0bb6fd8a49bca130f352208d4e65
 msgid ""
 "Use Furo as Sphinx documentation theme `(#3023) "
 "<https://github.com/getpelican/pelican/pull/3023>`_"
 msgstr ""
 
-#: ../../changelog.rst:16 dabb5eb48294457aba25a322ab1d0197
+#: ../../changelog.rst:36 1767e84116304b62bff9c66576c8b530
 msgid ""
 "Default to 100 articles maximum in feeds `(#3127) "
 "<https://github.com/getpelican/pelican/pull/3127>`_"
 msgstr ""
 
-#: ../../changelog.rst:17 86ddf69ef3e74a5e9633b231762624d3
+#: ../../changelog.rst:37 1f42290cb97f4c22b71b49bfd4e1d763
 msgid ""
 "Add ``period_archives common context`` variable `(#3148) "
 "<https://github.com/getpelican/pelican/pull/3148>`_"
 msgstr ""
 
-#: ../../changelog.rst:18 2e0c631a1cf04880b862de6b807eff48
+#: ../../changelog.rst:38 8e70999f32d743d8be9d7a09a7b8440e
 msgid ""
 "Use ``watchfiles`` as the file-watching backend `(#3151) "
 "<https://github.com/getpelican/pelican/pull/3151>`_"
 msgstr ""
 
-#: ../../changelog.rst:19 59ca5ac64d244f93abcda99d3544de2a
+#: ../../changelog.rst:39 eb554022ed4445b4886e5fb7b1ffda48
 msgid ""
 "Add GitHub Actions workflow for GitHub Pages `(#3189) "
 "<https://github.com/getpelican/pelican/pull/3189>`_"
 msgstr ""
 
-#: ../../changelog.rst:20 88ed863544e64ea5a09301d25cd80d3e
+#: ../../changelog.rst:40 aee78c33fc074a5aa2a3e7b6b074a2d1
 msgid ""
 "Allow dataclasses in settings `(#3204) "
 "<https://github.com/getpelican/pelican/pull/3204>`_"
 msgstr ""
 
-#: ../../changelog.rst:21 b101d1a2f7c04acfa220a77ccf85dc35
+#: ../../changelog.rst:41 b302dcfa9ab347c7a4190e35a2fec468
 msgid ""
 "Switch build tool to PDM instead of Setuptools/Poetry `(#3220) "
 "<https://github.com/getpelican/pelican/pull/3220>`_"
 msgstr ""
 
-#: ../../changelog.rst:22 422f54c14c4144b986362c831b56cb86
+#: ../../changelog.rst:42 39c35ce577d6418ebe1bdb8bd83855da
 msgid ""
 "Provide a ``plugin_enabled`` Jinja test for themes `(#3235) "
 "<https://github.com/getpelican/pelican/pull/3235>`_"
 msgstr ""
 
-#: ../../changelog.rst:23 1a85c8e28699430cb4ee54e6b1cda9ba
+#: ../../changelog.rst:43 10520c5ebec34d02996410cc1d611162
 msgid ""
 "Preserve connection order in Blinker `(#3238) "
 "<https://github.com/getpelican/pelican/pull/3238>`_"
 msgstr ""
 
-#: ../../changelog.rst:24 f605f3f56552418d80225548b3bea74c
+#: ../../changelog.rst:44 e3e01fbe72ff48578ee636044d930861
 msgid ""
 "Remove social icons from default ``notmyidea`` theme `(#3240) "
 "<https://github.com/getpelican/pelican/pull/3240>`_"
 msgstr ""
 
-#: ../../changelog.rst:25 de509b7854fe41f986b7ea8c86034ded
+#: ../../changelog.rst:45 0e0d4fc6f77947a79bc3864dbcfd3025
 msgid ""
 "Remove unreliable ``WRITE_SELECTED`` feature `(#3243) "
 "<https://github.com/getpelican/pelican/pull/3243>`_"
 msgstr ""
 
-#: ../../changelog.rst:26 1206eb9fb5c344c0ae2fa5ae405bb29e
+#: ../../changelog.rst:46 3945b50f56c849e8b756418a049e8bd5
 msgid ""
 "Importer: Report broken embedded video links when importing from Tumblr "
 "`(#3177) <https://github.com/getpelican/pelican/issues/3177>`_"
 msgstr ""
 
-#: ../../changelog.rst:27 eeefe71248724cd8928500b64c1d24f0
+#: ../../changelog.rst:47 91a65ac386d64de293807b14a1ee66c1
 msgid ""
 "Importer: Remove newline addition when iterating Photo post types "
 "`(#3178) <https://github.com/getpelican/pelican/issues/3178>`_"
 msgstr ""
 
-#: ../../changelog.rst:28 d9bbceb0175b42b9be8b19b89546c7fd
+#: ../../changelog.rst:48 5965fc057a0a4c94a2507956a2227789
 msgid ""
 "Importer: Force timestamp conversion in Tumblr importer to be UTC with "
 "offset `(#3221) <https://github.com/getpelican/pelican/pull/3221>`_"
 msgstr ""
 
-#: ../../changelog.rst:29 fcb7a001e25345bda01cc0d7fbdcc0c1
+#: ../../changelog.rst:49 f4a79028bfa946debc9a6924670e5456
 msgid ""
 "Importer: Use tempfile for intermediate HTML file for Pandoc `(#3221) "
 "<https://github.com/getpelican/pelican/pull/3221>`_"
 msgstr ""
 
-#: ../../changelog.rst:30 c7a0a3a319754ada970b27f9913833bd
+#: ../../changelog.rst:50 ac3ff1ef109f49898c54eb75bb9d4bf3
 msgid ""
 "Switch linters to Ruff `(#3223) "
 "<https://github.com/getpelican/pelican/pull/3223>`_"
 msgstr ""
 
-#: ../../changelog.rst:33 b80948b635ca4ba3bdaf0efedf9e8230
+#: ../../changelog.rst:53 87b5ee37dea84dce9c75361f533e8057
 msgid "4.8.0 - 2022-07-11"
 msgstr ""
 
-#: ../../changelog.rst:35 c95dd083acb34ccea579bed98c19d95b
+#: ../../changelog.rst:55 858d9945de86466eb1507d7859efc304
 msgid ""
 "Use JSON values for extra settings in Invoke tasks template `(#2994) "
 "<https://github.com/getpelican/pelican/pull/2994>`_"
 msgstr ""
 
-#: ../../changelog.rst:36 54acbf33444345efa17b6006650cfff2
+#: ../../changelog.rst:56 ad022a2dbbe74c28ab78757f64791daa
 msgid ""
 "Add content tag for links, which can help with things like Twitter social"
 " cards `(#3001) <https://github.com/getpelican/pelican/pull/3001>`_"
 msgstr ""
 
-#: ../../changelog.rst:37 28a4102c014741ac987ba8be6ff00565
+#: ../../changelog.rst:57 889f590d0fda46dbb6a14336644f265e
 msgid ""
 "Improve word count behavior when generating summary `(#3002) "
 "<https://github.com/getpelican/pelican/pull/3002>`_"
 msgstr ""
 
-#: ../../changelog.rst:40 00956e307c3647078780260ec470f0c4
+#: ../../changelog.rst:60 c6c9bfd44396439c8e3a04b083dfc9b3
 msgid "4.7.2 - 2022-02-09"
 msgstr ""
 
-#: ../../changelog.rst:42 9782bf3d611b4168b76fe33602f13d26
+#: ../../changelog.rst:62 21432dcec96e438c8f21de585540e9b9
 msgid ""
 "Fix incorrect parsing of parameters specified via `-e` / `--extra-"
 "settings` option flags `(#2938) "
 "<https://github.com/getpelican/pelican/pull/2938>`_"
 msgstr ""
 
-#: ../../changelog.rst:43 b3ce4b03bd92409ea6aea120cd2d3a4f
+#: ../../changelog.rst:63 250cb0b205ea4bc091bcbfa18a688398
 msgid ""
 "Add ``categories.html`` template to default theme `(#2973) "
 "<https://github.com/getpelican/pelican/pull/2973>`_"
 msgstr ""
 
-#: ../../changelog.rst:44 bdcd1255d2534a5c992a53c2c9640299
+#: ../../changelog.rst:64 f404aaef8abe40d89a8394f71043767b
 msgid ""
 "Document how to use plugins to inject content `(#2922) "
 "<https://github.com/getpelican/pelican/pull/2922>`_"
 msgstr ""
 
-#: ../../changelog.rst:47 9052d76f02fc4509998872f8c650696d
+#: ../../changelog.rst:67 ea47463991054e678639e2d5afee8733
 msgid "4.7.1 - 2021-10-12"
 msgstr ""
 
-#: ../../changelog.rst:49 1ddc283dca434367a9eebebb4dc19c55
+#: ../../changelog.rst:69 52f38102dca542dcaa5e901ba9cff484
 msgid ""
 "Extend rich logging to server component `(#2927) "
 "<https://github.com/getpelican/pelican/pull/2927>`_"
 msgstr ""
 
-#: ../../changelog.rst:50 2ebe1d316cc541eba3ef3d20512c97f0
+#: ../../changelog.rst:70 e2f47cedaac946b6b3877063c1531849
 msgid ""
 "Fix an issue where metadata flagged to be discarded was being cached "
 "`(#2926) <https://github.com/getpelican/pelican/pull/2926>`_"
 msgstr ""
 
-#: ../../changelog.rst:51 7561e4a903db49bba3c7cb5d22ea25be
+#: ../../changelog.rst:71 c7270f10045541f992ea76f9b8f938bc
 msgid ""
 "Adjust suffix in server to allow redirection when needed `(#2931) "
 "<https://github.com/getpelican/pelican/pull/2931>`_"
 msgstr ""
 
-#: ../../changelog.rst:52 369516860be2437b9099796b0b3c7847
+#: ../../changelog.rst:72 25eecc81230442e8be149c26afebcba8
 msgid ""
 "Add MIME types for web fonts `(#2929) "
 "<https://github.com/getpelican/pelican/pull/2929>`_"
 msgstr ""
 
-#: ../../changelog.rst:53 2a4dd51d3c2d46c1a0a774274436fc74
+#: ../../changelog.rst:73 28bdcfa53bcf4bf5908acd39b88b1264
 msgid ""
 "Distribute sample data used to run tests `(#2935) "
 "<https://github.com/getpelican/pelican/pull/2935>`_"
 msgstr ""
 
-#: ../../changelog.rst:54 63a08ba90a054e369d1be50c491f094b
+#: ../../changelog.rst:74 90855b72a6744760a57195ca0566401c
 msgid "Add Python 3.10 to test matrix"
 msgstr ""
 
-#: ../../changelog.rst:57 f07f93ca41894e2ea7de889e68dddd63
+#: ../../changelog.rst:77 a5d1ee359c9a472bac01a3c953358994
 msgid "4.7.0 - 2021-10-01"
 msgstr ""
 
-#: ../../changelog.rst:59 1e0f42b1b76e4eb4a356612459563660
+#: ../../changelog.rst:79 1b28838f5000456aa396f8768c307102
 msgid ""
 "Improve default theme rendering on mobile and other small screen devices "
 "`(#2914) <https://github.com/getpelican/pelican/pull/2914>`_"
 msgstr ""
 
-#: ../../changelog.rst:60 2ae6e8430fd4421994f330f095111d0e
+#: ../../changelog.rst:80 e080e2f741464f92b7d988da7e3dba5d
 msgid ""
 "Add support for hidden articles `(#2866) "
 "<https://github.com/getpelican/pelican/pull/2866>`_"
 msgstr ""
 
-#: ../../changelog.rst:61 eabcc4a0ac764f3991805d2f746cd415
+#: ../../changelog.rst:81 71036c834cc4480ba38566d039d9b50a
 msgid ""
 "Improve word count behavior when generating summary CJK & other locales "
 "`(#2864) <https://github.com/getpelican/pelican/pull/2864>`_"
 msgstr ""
 
-#: ../../changelog.rst:62 9a1b80fe805a4c35960c6cba82d813b2
+#: ../../changelog.rst:82 dad2c8c0f0d84a4db5b0139e8dc4bec8
 msgid ""
 "Add progress spinner during generation `(#2869) "
 "<https://github.com/getpelican/pelican/pull/2869>`_ and richer logging "
@@ -260,294 +316,294 @@ msgid ""
 "`Rich <https://github.com/willmcgugan/rich>`_"
 msgstr ""
 
-#: ../../changelog.rst:64 5ea56ecd1a0740a1bc75e6f60515dfa8
+#: ../../changelog.rst:84 ad420f41f0fb44809f0f88d2638ed6b9
 msgid ""
 "Invoke tasks ``serve`` and ``livereload`` now auto-open a web browser "
 "pointing to the locally-served web site `(#2764) "
 "<https://github.com/getpelican/pelican/pull/2764>`_"
 msgstr ""
 
-#: ../../changelog.rst:65 60ed0fd02107499ead142c41c827f71a
+#: ../../changelog.rst:85 34794ceaec054ec4b47706297e65a498
 msgid ""
 "Support some date format codes used by ISO dates `(#2902) "
 "<https://github.com/getpelican/pelican/pull/2902>`_"
 msgstr ""
 
-#: ../../changelog.rst:66 fbf7c4ded7af44a6813c0b26432d6905
+#: ../../changelog.rst:86 cd9520f44e004be6a7d7fb27032d37a6
 msgid ""
 "Document how to add a new writer `(#2901) "
 "<https://github.com/getpelican/pelican/pull/2901>`_"
 msgstr ""
 
-#: ../../changelog.rst:69 fbada9e3ad0845b4a72f9688cf251a6a
+#: ../../changelog.rst:89 278990583126431793bd184ef69e4315
 msgid "4.6.0 - 2021-03-23"
 msgstr ""
 
-#: ../../changelog.rst:71 fb814688de1a4df58087cb466d7fa24f
+#: ../../changelog.rst:91 a7a02445adbd4dd58d066f6f8fa5810b
 msgid ""
 "Add new URL pattern to ``PAGINATION_PATTERNS`` for the last page in the "
 "list `(#1401) <https://github.com/getpelican/pelican/issues/1401>`_"
 msgstr ""
 
-#: ../../changelog.rst:72 9c5ae9de4b3f4ee7bb54ba0f5fe9194b
+#: ../../changelog.rst:92 e5e2fd04bc8a40edb8a0d1c088a95708
 msgid ""
 "Speed up ``livereload`` Invoke task via caching `(#2847) "
 "<https://github.com/getpelican/pelican/pull/2847>`_"
 msgstr ""
 
-#: ../../changelog.rst:73 ccfa403160e6435990a51f311c059f65
+#: ../../changelog.rst:93 e37a383072324f98a8f5698edab71384
 msgid ""
 "Ignore ``None`` return value from ``get_generators`` signal `(#2850) "
 "<https://github.com/getpelican/pelican/pull/2850>`_"
 msgstr ""
 
-#: ../../changelog.rst:74 e00f58f952cf473390d2d3a0bff95f26
+#: ../../changelog.rst:94 ea446fad671d4e1e8b3220a35ffe170b
 msgid "Relax dependency minimum versions and remove upper bounds"
 msgstr ""
 
-#: ../../changelog.rst:77 7d2fd1353eda4e5cb27a27dae71fda0c
+#: ../../changelog.rst:97 3e38341f147e414ba7b10c339d28a0d4
 msgid "4.5.4 - 2021-01-04"
 msgstr ""
 
-#: ../../changelog.rst:79 d40e6e0035144705b52124f970bc3ea3
+#: ../../changelog.rst:99 b4296b7abe7a411faedd991310af951f
 msgid ""
 "Replace plugin definitions in settings with string representations after "
 "registering, so they can be cached correctly `(#2828) "
 "<https://github.com/getpelican/pelican/issues/2828>`_."
 msgstr ""
 
-#: ../../changelog.rst:82 13f1634fef1f4a65a64ad54159de14fe
+#: ../../changelog.rst:102 7fc32eaefef846d28cd834cabfa8dee9
 msgid "4.5.3 - 2020-12-01"
 msgstr ""
 
-#: ../../changelog.rst:84 19753217e0b04230998d9f5c9730a423
+#: ../../changelog.rst:104 5e0db3263ddd42bca058026426cf06e6
 msgid "Fix a mistake made in PR #2821"
 msgstr ""
 
-#: ../../changelog.rst:87 1c8a0889b5de47178fab5b9d5d085c55
+#: ../../changelog.rst:107 1ef29d1cc4de42d1aa3c0c163df3514a
 msgid "4.5.2 - 2020-11-22"
 msgstr ""
 
-#: ../../changelog.rst:89 8c30ac8608f54fd48f29f1e48f640ccd
+#: ../../changelog.rst:109 c7c77959e6d04be4a6a6c7ace8d64c0d
 msgid "Improve logging of generators and writer loaders"
 msgstr ""
 
-#: ../../changelog.rst:92 2673cef2ee1c42bdad7f7a80c77002c6
+#: ../../changelog.rst:112 00572ddf9ed24457aedc3f744b684404
 msgid "4.5.1 - 2020-11-02"
 msgstr ""
 
-#: ../../changelog.rst:94 50a7b8039d1d45b4bf85550da4c40318
+#: ../../changelog.rst:114 85d67c71b8664cf3900c982deba934b5
 msgid ""
 "Refactor intra-site link discovery in order to match more permissively "
 "`(#2646) <https://github.com/getpelican/pelican/issues/2646>`_"
 msgstr ""
 
-#: ../../changelog.rst:95 009addb3893a4c9b98af8eba13e57e11
+#: ../../changelog.rst:115 0ae962176dac4745a0929eac1cb0a671
 msgid ""
 "Fix plugins running twice in auto-reload mode `(#2817) "
 "<https://github.com/getpelican/pelican/issues/2817>`_"
 msgstr ""
 
-#: ../../changelog.rst:96 43f7f7e70f3948cdaaa3fb6b7a6ab45d
+#: ../../changelog.rst:116 6c9d2b7c8f5c40d9830f38cc39807326
 msgid ""
 "Add notice to use ``from pelican import signals`` instead of ``import "
 "pelican.signals`` `(#2805) "
 "<https://github.com/getpelican/pelican/issues/2805>`_"
 msgstr ""
 
-#: ../../changelog.rst:99 ef2a1b597d854881bf89d6240fe59ee0
+#: ../../changelog.rst:119 cc543240f72d4e15bafa37e8cbe86c54
 msgid "4.5.0 - 2020-08-20"
 msgstr ""
 
-#: ../../changelog.rst:101 d6f141fa55fc43cfa36eac89d4ec4a67
+#: ../../changelog.rst:121 3b3db764e63f49c0b00d2b1cc71755f2
 msgid "Add namespace plugin support; list plugins via ``pelican-plugins`` command"
 msgstr ""
 
-#: ../../changelog.rst:102 83d9116dd10b404fb3d978977a91f03a
+#: ../../changelog.rst:122 ad62f8bcd989447e97326c5845ec146b
 msgid "Override settings via ``-e`` / ``--extra-settings`` CLI option flags"
 msgstr ""
 
-#: ../../changelog.rst:103 772c3e4941e64bc9a5a41ee644e980b3
+#: ../../changelog.rst:123 f12bccb1dc904d0bbffb0d9e5291ad3d
 msgid "Add settings for custom Jinja globals and tests"
 msgstr ""
 
-#: ../../changelog.rst:104 cf2bd72795894ce796ae65a26307fa9e
+#: ../../changelog.rst:124 c569ff52ef904228971c38b1a958847f
 msgid "Customize article summary ellipsis via ``SUMMARY_END_SUFFIX`` setting"
 msgstr ""
 
-#: ../../changelog.rst:105 3494ccef87de4029a51d34e9f6ebac8c
+#: ../../changelog.rst:125 733087bf4e14447095fb364a1d5b606f
 msgid "Customize Typogrify dash handling via new ``TYPOGRIFY_DASHES`` setting"
 msgstr ""
 
-#: ../../changelog.rst:106 441907e7fc27419cad1f678c3d81fcdd
+#: ../../changelog.rst:126 9e0de47310964a99bf1ec0a87f810036
 msgid "Support Unicode when generating slugs"
 msgstr ""
 
-#: ../../changelog.rst:107 0466696922dd4904a9a061c79d9e5d01
+#: ../../changelog.rst:127 c496a287d95b47759425578bc29d4cf3
 msgid "Support Asciidoc ``.adoc`` file generation in Pelican importer"
 msgstr ""
 
-#: ../../changelog.rst:108 0711923af6544d84a09b027877cd7318
+#: ../../changelog.rst:128 1f8597af3f9946129cfb150e9728c25c
 msgid "Improve user experience when ``pelican --listen`` web server is quit"
 msgstr ""
 
-#: ../../changelog.rst:109 1736b73cd9354c5fb276263a0158f1d0
+#: ../../changelog.rst:129 418a06eb1d9d4332945b5b1729734579
 msgid "Improve Invoke tasks template"
 msgstr ""
 
-#: ../../changelog.rst:110 a243c2afd72349ebb46076aef63a62af
+#: ../../changelog.rst:130 8b63e2e5d29a4cde830ea8c1df058ab1
 msgid "Include tests in source distributions"
 msgstr ""
 
-#: ../../changelog.rst:111 d3659b2430704e179785f6edeea9d975
+#: ../../changelog.rst:131 68105e5e919a43518ac6af8b88957e44
 msgid "Switch CI from Travis to GitHub Actions"
 msgstr ""
 
-#: ../../changelog.rst:112 a9ee05a0579d4153935499a3f3bdcc47
+#: ../../changelog.rst:132 053f40c3741c4d54bc840f2ad32f34eb
 msgid "Remove support for Python 2.7"
 msgstr ""
 
-#: ../../changelog.rst:115 eb3830c633c14e63995b8fbcf8e3d29b
+#: ../../changelog.rst:135 6190d59940dd4c57a603140e0813f9b5
 msgid "4.2.0 - 2019-10-17"
 msgstr ""
 
-#: ../../changelog.rst:117 5af9b29432a94955813a11932e9e38c8
+#: ../../changelog.rst:137 5f11442743c841ff91d46b643698dfa9
 msgid "Support inline SVGs; don't treat titles in SVGs as HTML titles"
 msgstr ""
 
-#: ../../changelog.rst:118 d776137d56d04320a1a70ced25696379
+#: ../../changelog.rst:138 a68bbd4f2a024c7a84c259aee8fcb621
 msgid "Add category to feeds (in addition to tags)"
 msgstr ""
 
-#: ../../changelog.rst:119 ab3c5b4616544a3d89492ff849de5932
+#: ../../changelog.rst:139 dd3937b7cb38480a84e6a5daed48e113
 msgid "Improve content metadata field docs"
 msgstr ""
 
-#: ../../changelog.rst:120 aa20a63221484e90954aaac555dba376
+#: ../../changelog.rst:140 87030fc248dc46e5902d3e7681702351
 msgid "Add docs for including other Markdown/reST files in content"
 msgstr ""
 
-#: ../../changelog.rst:123 f40de58367e94d50af3e6e700523edc7
+#: ../../changelog.rst:143 85163f7808a64f7cac3dd54f98c2a2fd
 msgid "4.1.3 - 2019-10-09"
 msgstr ""
 
-#: ../../changelog.rst:125 910c8615c3224456a42555389c268e4c
+#: ../../changelog.rst:145 486947a4cc584437aff9364d721eeb41
 msgid "Fix quick-start docs regarding ``pelican --listen``"
 msgstr ""
 
-#: ../../changelog.rst:126 1c9961cd18bd4d17ae1f9ff0f3f45990
+#: ../../changelog.rst:146 cf68238f21bd40b081eb670527e5ad88
 msgid "Set default listen address to 127.0.0.1"
 msgstr ""
 
-#: ../../changelog.rst:127 7108f2b9c2d8444b8fa1ca32a26e36cc
+#: ../../changelog.rst:147 21aed223e69549038ee7b840fe0e45a5
 msgid "Add extra/optional Markdown dependency to setup.py"
 msgstr ""
 
-#: ../../changelog.rst:128 7d9eed3579384908b8ab564a4c358df8
+#: ../../changelog.rst:148 5c5c50a24bf945babe1fea501be5b672
 msgid "Use correct SSH port syntax for rsync in tasks.py"
 msgstr ""
 
-#: ../../changelog.rst:129 3b55feb812b14a1198b04659aa01ecf0
+#: ../../changelog.rst:149 cafa64aa81c94212a964ece5f6d00ea6
 msgid "Place all deprecated settings handling together"
 msgstr ""
 
-#: ../../changelog.rst:130 dc17ca3853c04536a3ade24a93d079ac
+#: ../../changelog.rst:150 92ad7248e4d848f5b9955653a132ba1d
 msgid "Add related project URLs for display on PyPI"
 msgstr ""
 
-#: ../../changelog.rst:131 c513a9e1fed74fe3ae3c23ffe2f804d9
+#: ../../changelog.rst:151 f97dcb0a8c6f41ca8e6a249f975688ab
 msgid "Skip some tests on Windows that can't pass due to filesystem differences"
 msgstr ""
 
-#: ../../changelog.rst:134 ced29508dce44f0eb42c45aedc672fa6
+#: ../../changelog.rst:154 cb1b18c4628a48f3a7b59e4447057291
 msgid "4.1.2 - 2019-09-23"
 msgstr ""
 
-#: ../../changelog.rst:136 c448cf2e59da43248819ddb51f9f9738
+#: ../../changelog.rst:156 1cc7ba6aab5a43e9a3fbb04a8cf4c954
 msgid "Fix pelican.settings.load_source to avoid caching issues - PR #2621"
 msgstr ""
 
-#: ../../changelog.rst:139 98b3a78914f14383858960c37872cec0
+#: ../../changelog.rst:159 808b70fac79147a7a30cb263bfc091d5
 msgid "4.1.1 - 2019-08-23"
 msgstr ""
 
-#: ../../changelog.rst:141 7569ab6dfb9f4f59a4d9414a9ec307ac
+#: ../../changelog.rst:161 3515525c09794e3eb685696916e9b4a8
 msgid "Add AutoPub to auto-publish releases on PR merge"
 msgstr ""
 
-#: ../../changelog.rst:142 29b086166a89485e9151534a891c8794
+#: ../../changelog.rst:162 e3958153de2543ab8af7b27e424a5199
 msgid "Add CSS classes for reStructuredText figures"
 msgstr ""
 
-#: ../../changelog.rst:143 3d90d9a7e7f244aeb5ef4bc09624c9d8
+#: ../../changelog.rst:163 469aba039b0e4bb5b08bd7bc9fd455f9
 msgid "Pass ``argv`` to Pelican ``main`` entrypoint"
 msgstr ""
 
-#: ../../changelog.rst:144 33de38d2ec8641ca865cebb06167ec58
+#: ../../changelog.rst:164 08494f27a31149a8a4e662d7160d334a
 msgid "Set default content status to a blank string rather than ``None``"
 msgstr ""
 
-#: ../../changelog.rst:147 9ba143abfcdf4a9a86f7866b897c9831
+#: ../../changelog.rst:167 4e7e6da9e1a94e5886de5c7bb90da964
 msgid "4.1.0 - 2019-07-14"
 msgstr ""
 
-#: ../../changelog.rst:149 cc59d3e8f5f64f5a9ec02b56956e4d53
+#: ../../changelog.rst:169 de8697dee456433f8fd5592c79dc1235
 msgid "Live browser reload upon changed files (provided via Invoke task)"
 msgstr ""
 
-#: ../../changelog.rst:150 1013f5e7df5448b5a808743127ed0740
+#: ../../changelog.rst:170 67db4943813d410386e77969e6aea98f
 msgid "Add ``pyproject.toml``, managed by Poetry"
 msgstr ""
 
-#: ../../changelog.rst:151 9548fcd5133743259a8e586f69e6453e
+#: ../../changelog.rst:171 a6388203f3c44a31b2458bd0961c9e91
 msgid "Support for invoking ``python -m pelican``"
 msgstr ""
 
-#: ../../changelog.rst:152 c1ca4a3bfa27477ebcfd9ac5757cd20b
+#: ../../changelog.rst:172 b526c18ddea74343b14a62d3933c31db
 msgid "Add relative source path attribute to content"
 msgstr ""
 
-#: ../../changelog.rst:153 14c8367983884cd5913ef4aeaaae2ebe
+#: ../../changelog.rst:173 98e5827380d24bb2b640c709ee1fa5bf
 msgid "Allow directories in ``EXTRA_PATH_METADATA``"
 msgstr ""
 
-#: ../../changelog.rst:154 493069ecda9345cdab15204358d49856
+#: ../../changelog.rst:174 7372879d036e4c19967f008fed50bcfb
 msgid ""
 "Add ``all_articles`` variable to period pages (for recent posts "
 "functionality)"
 msgstr ""
 
-#: ../../changelog.rst:155 57597a2f853047128a7f19d871a767cd
+#: ../../changelog.rst:175 8b41c0640e9a4c4ca9458eea777c6c72
 msgid "Improve debug mode output"
 msgstr ""
 
-#: ../../changelog.rst:156 c1e2985b649844aface3795c16f24799
+#: ../../changelog.rst:176 00af35668b044b6da9e934104b73eac9
 msgid "Remove blank or duplicate summaries from Atom feed"
 msgstr ""
 
-#: ../../changelog.rst:157 be874126bdaa46ab868e9d5d572973ba
+#: ../../changelog.rst:177 97c5594b58d94c45ada8a9efdb2216c8
 msgid ""
 "Fix bugs in pagination, pelican-import, pelican-quickstart, and feed "
 "importer"
 msgstr ""
 
-#: ../../changelog.rst:160 3220150f83f64d869d28b2f8abdfae29
+#: ../../changelog.rst:180 496531289a9c446c97d5e1842e5761f9
 msgid "4.0.1 (2018-11-30)"
 msgstr ""
 
-#: ../../changelog.rst:162 55ef92708e464069b85c860f407c44ee
+#: ../../changelog.rst:182 48f43697fb824914a518283bab0ab39d
 msgid "Refactor ``pelican.server`` logging"
 msgstr ""
 
-#: ../../changelog.rst:163 bbe751997c7541f78979d7885be777ad
+#: ../../changelog.rst:183 7f431162613848738f2267518e0f435e
 msgid "Fix bug in which all static files were processed as \"draft\""
 msgstr ""
 
-#: ../../changelog.rst:164 e85f8cfa33124937bff767d633c505e6
+#: ../../changelog.rst:184 7c9866081cc0478aab4bcbb65f241b2b
 msgid "Bug fixes for Invoke/Makefile automation, Importer, and other miscellanea"
 msgstr ""
 
-#: ../../changelog.rst:166 aee9e749eaa6417c9d7617678fbd5017
+#: ../../changelog.rst:186 b4f0a6a574f54e8baec02108e3cdf121
 #, python-format
 msgid ""
 "If upgrading from 3.7.x or earlier, please note that slug-related "
@@ -560,34 +616,34 @@ msgid ""
 "``TAG_FEED_ATOM.format(slug=tag.slug)``"
 msgstr ""
 
-#: ../../changelog.rst:175 1c9f10c7ca554583840076dd4198471b
+#: ../../changelog.rst:195 963535bf97cb4048b11dd47fa7fe5cb1
 msgid "4.0.0 (2018-11-13)"
 msgstr ""
 
-#: ../../changelog.rst:177 2e48c6a93f014447a24f76ec22c56634
+#: ../../changelog.rst:197 be207dbf17cc4c38ab4c8617ece18d43
 msgid "Replace ``develop_server.sh`` script with ``pelican --listen``"
 msgstr ""
 
-#: ../../changelog.rst:178 e9913592f867453ca8eb027547556190
+#: ../../changelog.rst:198 bfeb93e653cc44b4a6e65c1b5978e0d2
 msgid "Improved copy/link behavior for large static files (e.g., videos)"
 msgstr ""
 
-#: ../../changelog.rst:179 7b739431500a4e508b4eddee2944998c
+#: ../../changelog.rst:199 0f6be38dbd8942c8a8692c377624a26a
 msgid ""
 "New ``{static}`` syntax to link to static content; content linked to by "
 "``{static}`` and ``{attach}`` is automatically copied over even if not in"
 " ``STATIC_PATHS``"
 msgstr ""
 
-#: ../../changelog.rst:182 7d5ec1addb4a49b6825a365c1b28e6b7
+#: ../../changelog.rst:202 6d42f604ef724c72b0d691d52cced384
 msgid "Pages can now have ``draft`` status"
 msgstr ""
 
-#: ../../changelog.rst:183 567c77a6a7c24d999b974ce0ed8ea7f9
+#: ../../changelog.rst:203 c6513f293ae04b9fb1cee4ef355de4bd
 msgid "Show current settings via new ``--print-settings`` flag"
 msgstr ""
 
-#: ../../changelog.rst:184 f8206229f89f474990ad86f3670eb6c6
+#: ../../changelog.rst:204 63636f2fc7184030bc83647b4f81d63a
 #, python-format
 msgid ""
 "All settings for slugs now use ``{slug}`` and/or ``{lang}`` rather than "
@@ -595,1075 +651,1075 @@ msgid ""
 "warning and fallback to the default setting."
 msgstr ""
 
-#: ../../changelog.rst:187 55c29729d5ae42f6931b0af7ea314bcb
+#: ../../changelog.rst:207 594a958f9f9c495c86c4eb15ee1d353e
 msgid "New signals: ``feed_generated`` and ``page_generated_write_page``"
 msgstr ""
 
-#: ../../changelog.rst:188 fdd81adbccd2499988dda1b8faef1ab3
+#: ../../changelog.rst:208 4c1a13c890d04aea9bdb43ba3a85f98e
 msgid "Replace Fabric with Invoke and ``fabfile.py`` template with ``tasks.py``"
 msgstr ""
 
-#: ../../changelog.rst:189 85659c414dad4293b8a0d6ad9350c4d9
+#: ../../changelog.rst:209 05c5bacea3de4d159dc464bb80d3b70d
 msgid ""
 "Replace ``PAGINATED_DIRECT_TEMPLATES`` by ``PAGINATED_TEMPLATES``, "
 "extending control over pagination to all templates and making page size "
 "variable"
 msgstr ""
 
-#: ../../changelog.rst:191 2e76745f8fea417fb90052f755372212
+#: ../../changelog.rst:211 d4c57ccd147b409bafd324580546ce89
 msgid ""
 "Replace ``SLUG_SUBSTITUTIONS`` (and friends) by "
 "``SLUG_REGEX_SUBSTITUTIONS`` for more finegrained control"
 msgstr ""
 
-#: ../../changelog.rst:193 c477dc73b63646c2bf339afff54a2e5f
+#: ../../changelog.rst:213 5fcdd3851c4348ffb6f9f30e21d01cca
 msgid ""
 "``'{base_name}'`` value in ``PAGINATION_PATTERNS`` setting no longer "
 "strips ``'bar'`` from ``'foo/bar.html'`` (unless ``'bar' == 'index'``)."
 msgstr ""
 
-#: ../../changelog.rst:195 0c9192b9f8c64af491d33f9358694940
+#: ../../changelog.rst:215 f21a405be2434ee78cac35d1f653b6ba
 msgid ""
 "``ARTICLE_ORDER_BY`` and ``PAGE_ORDER_BY`` now also affect 1) category, "
 "tag and author pages 2) feeds 3) draft and hidden articles and pages"
 msgstr ""
 
-#: ../../changelog.rst:197 6e339043faff4d4a9a718a7571bf9698
+#: ../../changelog.rst:217 781dd286cb154c46a9e2036e697bcf7f
 msgid ""
 "New ``ARTICLE_TRANSLATION_ID`` and ``PAGE_TRANSLATION_ID`` settings to "
 "specify metadata attributes used to identify/disable translations"
 msgstr ""
 
-#: ../../changelog.rst:199 84e3cebb5adf4c45bda8f132772f2bdd
+#: ../../changelog.rst:219 ae7fd53c1d6047eb8027016c4a00bd65
 msgid "Make the HTML reader parse multiple occurrences of metadata tags as a list"
 msgstr ""
 
-#: ../../changelog.rst:200 790b535916b4402e8f3e568a96d208cc
+#: ../../changelog.rst:220 dca4b981c67c42a080e5724d65ddf825
 msgid "New Blogger XML backup importer"
 msgstr ""
 
-#: ../../changelog.rst:201 84ba1adba13c4c66a843be015263cc5f
+#: ../../changelog.rst:221 f92482bf76ec447186de98f4a471dd55
 msgid ""
 "Wordpress importer now updates file links to point to local copies if the"
 " files were downloaded with ``--wp-attach``."
 msgstr ""
 
-#: ../../changelog.rst:203 e40ac2db0d404e3d8b51e350256eb49b
+#: ../../changelog.rst:223 0778a52f39704e629fed5df26deeaeb6
 msgid ""
 "Importer no longer inserts extra newlines, to prevent breaking of HTML "
 "attributes."
 msgstr ""
 
-#: ../../changelog.rst:205 a026ba70157640f9afdbbfd1c52635ed
+#: ../../changelog.rst:225 6b21bcb847014ebcb4e658aaf54fd591
 msgid ""
 "Pelican server now prioritises ``foo.html`` and ``foo/index.html`` over "
 "``foo/`` when resolving ``foo``."
 msgstr ""
 
-#: ../../changelog.rst:209 7bd3c3fdc45a4e848499d05fd1a2149a
+#: ../../changelog.rst:229 d9c7906de4814a988e96a0f836121773
 msgid "3.7.1 (2017-01-10)"
 msgstr ""
 
-#: ../../changelog.rst:211 a2224771f8184ef2ae2ae19e69ffff95
+#: ../../changelog.rst:231 dee875ace0cf4cf4a84e968613c64f1e
 msgid "Fix locale issues in Quickstart script"
 msgstr ""
 
-#: ../../changelog.rst:212 4bc8c9d8dbf24260a84512695081a437
+#: ../../changelog.rst:232 0735e4ab311648fba920ba433eb5c81b
 msgid "Specify encoding for README and CHANGELOG in setup.py"
 msgstr ""
 
-#: ../../changelog.rst:215 cdc85601d26440c08ba36b90b241218a
+#: ../../changelog.rst:235 713d99ebaa1f446a857751b754b63677
 msgid "3.7.0 (2016-12-12)"
 msgstr ""
 
-#: ../../changelog.rst:217 88cad459481748c385a4d15e5041255c
+#: ../../changelog.rst:237 0330d842ba514f58965a9b625db18791
 msgid "Atom feeds output ``<content>`` in addition to ``<summary>``"
 msgstr ""
 
-#: ../../changelog.rst:218 e8f51cd31ea94d1cb0fff327607a5106
+#: ../../changelog.rst:238 7e5d0a914d214dbfb969b4e270f148c5
 msgid ""
 "Atom feeds use ``<published>`` for the original publication date and "
 "``<updated>`` for modifications"
 msgstr ""
 
-#: ../../changelog.rst:220 56be71bb20124ccbb10bf502c2158ebd
+#: ../../changelog.rst:240 4f0ed4869e00418b8b16a7e692516126
 msgid "Simplify Atom feed ID generation and support URL fragments"
 msgstr ""
 
-#: ../../changelog.rst:221 1ece62b3d5424ec4abd099d5b2bf20e0
+#: ../../changelog.rst:241 cdc742c1ed2c44a1b76a5cf7374c1374
 msgid "Produce category feeds with category-specific titles"
 msgstr ""
 
-#: ../../changelog.rst:222 106c730749474695b90ef8e5ddd31a7e
+#: ../../changelog.rst:242 6a89fde3d1084e0d91e8b89b293a851c
 msgid ""
 "RSS feeds now default to summary instead of full content; set "
 "``RSS_FEED_SUMMARY_ONLY = False`` to revert to previous behavior"
 msgstr ""
 
-#: ../../changelog.rst:224 14f1280956dc466a97042a5a313f9511
+#: ../../changelog.rst:244 dbe1f00b9a114bf6a5e7728eb15cbfd2
 msgid "Replace ``MD_EXTENSIONS`` with ``MARKDOWN`` setting"
 msgstr ""
 
-#: ../../changelog.rst:225 57cec9a1574f40f691b026cd680b681e
+#: ../../changelog.rst:245 e8d183ddfb3a4b2bbb4ccc523ff1ce4d
 msgid ""
 "Replace ``JINJA_EXTENSIONS`` with more-robust ``JINJA_ENVIRONMENT`` "
 "setting"
 msgstr ""
 
-#: ../../changelog.rst:226 9a398118c3d34bb996dc9af2d9c9503a
+#: ../../changelog.rst:246 c4044fb542ce4772bc469c06f3606f88
 msgid ""
 "Improve summary truncation logic to handle special characters and tags "
 "that span multiple lines, using HTML parser instead of regular "
 "expressions"
 msgstr ""
 
-#: ../../changelog.rst:228 75ef90817db34f7ea869a68fcc3fb469
+#: ../../changelog.rst:248 6f6a8c2b60324ad6b00feb9f492c4d45
 msgid "Include summary when looking for intra-site link substitutions"
 msgstr ""
 
-#: ../../changelog.rst:229 264f880b25284b01b7135c2a2b9e8dc1
+#: ../../changelog.rst:249 e121d156b37b4f59a8846b700e1769ea
 msgid "Link to authors and index via ``{author}name`` and ``{index}`` syntax"
 msgstr ""
 
-#: ../../changelog.rst:230 4c7abfddef0b454882888ba479aea6b7
+#: ../../changelog.rst:250 1d210456ced542c1babb622b06b2c4f4
 msgid "Override widget names via ``LINKS_WIDGET_NAME`` and ``SOCIAL_WIDGET_NAME``"
 msgstr ""
 
-#: ../../changelog.rst:231 2c5e79d0ad6141c9b6a19ee3e65d091e
+#: ../../changelog.rst:251 6104e9c05e844436b12e538008947f47
 msgid "Add ``INDEX_SAVE_AS`` option to override default ``index.html`` value"
 msgstr ""
 
-#: ../../changelog.rst:232 6f89cd4a39ec445297f7dbb93e662e45
+#: ../../changelog.rst:252 0f875978cade45889a49f818c6664093
 msgid "Remove ``PAGES`` context variable for themes in favor of ``pages``"
 msgstr ""
 
-#: ../../changelog.rst:233 5b5ca0f599de4532964b3abe99a8c0d7
+#: ../../changelog.rst:253 bd6d148038524dbd8889ef4479115f15
 msgid ""
 "``SLUG_SUBSTITUTIONS`` now accepts 3-tuple elements, allowing URL slugs "
 "to contain non-alphanumeric characters"
 msgstr ""
 
-#: ../../changelog.rst:235 159f3122fe94405489ccc20fe78f53b5
+#: ../../changelog.rst:255 84e180ffd01640e39c8a02616d665f92
 msgid ""
 "Tag and category slugs can be controlled with greater precision using the"
 " ``TAG_SUBSTITUTIONS`` and ``CATEGORY_SUBSTITUTIONS`` settings"
 msgstr ""
 
-#: ../../changelog.rst:237 e163a8d8d61a4997b4259fcad5005d9c
+#: ../../changelog.rst:257 c42874e842584772a9c6abda4cf1d2b2
 msgid ""
 "Author slugs can be controlled with greater precision using the "
 "``AUTHOR_SUBSTITUTIONS`` setting"
 msgstr ""
 
-#: ../../changelog.rst:239 f81c1120fcd44bfc9dd76acfb090ca9c
+#: ../../changelog.rst:259 c3ad7f1d581d4a848a0d80425732faaa
 msgid "``DEFAULT_DATE`` can be defined as a string"
 msgstr ""
 
-#: ../../changelog.rst:240 d79a66c8b8b44b3a93ec70011feae3e4
+#: ../../changelog.rst:260 28824188813542f08ef3546d48faeb4d
 msgid "Use ``mtime`` instead of ``ctime`` when ``DEFAULT_DATE = 'fs'``"
 msgstr ""
 
-#: ../../changelog.rst:241 ec0aa5c74458441c9ba450673f5fd2ef
+#: ../../changelog.rst:261 4cbfd98d99134eaba723b0a98dd38fdd
 msgid "Add ``--fatal=errors|warnings`` option for use with continuous integration"
 msgstr ""
 
-#: ../../changelog.rst:242 13b4ab828a2941dfa8f1418685bb81a0
+#: ../../changelog.rst:262 e0346ee13c104f26a360952f415db7ca
 msgid ""
 "When using generator-level caching, ensure previously-cached files are "
 "processed instead of just new files."
 msgstr ""
 
-#: ../../changelog.rst:244 d89e5097e9984f3daf4db6e9b929ada0
+#: ../../changelog.rst:264 3faa472e3d4440dfacb1e40b20cdbb36
 msgid "Add Python and Pelican version information to debug output"
 msgstr ""
 
-#: ../../changelog.rst:245 4716f79323444484a70f7fe8c2650e1f
+#: ../../changelog.rst:265 7ca51c4375d641d18777b07bedb86f2c
 msgid "Improve compatibility with Python 3.5"
 msgstr ""
 
-#: ../../changelog.rst:246 0f44c8d133b84c41a41d850300da1578
+#: ../../changelog.rst:266 cf9b150420fa47369ff0c95e8edc002b
 msgid "Comply with and enforce PEP8 guidelines"
 msgstr ""
 
-#: ../../changelog.rst:247 c334d1c279204190893641f5ac313e36
+#: ../../changelog.rst:267 889cf4339a4b4d8daf520a7fb9985d8b
 msgid "Replace tables in settings documentation with ``data::`` directives"
 msgstr ""
 
-#: ../../changelog.rst:250 461f1d0f43544a69be1139a9f19fe25a
+#: ../../changelog.rst:270 586aeb301e8941fcb2171458f12ad198
 msgid "3.6.3 (2015-08-14)"
 msgstr ""
 
-#: ../../changelog.rst:252 7cff2bfca67f43bcb81338e645c16d6a
+#: ../../changelog.rst:272 5499ed424969406c924c504f6f62f63e
 msgid "Fix permissions issue in release tarball"
 msgstr ""
 
-#: ../../changelog.rst:255 73ecf430824c4621a9feba3aeb0f0435
+#: ../../changelog.rst:275 da9c552726b940a3b07c45b4233657ce
 msgid "3.6.2 (2015-08-01)"
 msgstr ""
 
-#: ../../changelog.rst:257 304aa2b89bdb4d6a9765f92c169eeab7
+#: ../../changelog.rst:277 d29fcc033a634d8aac8f656c5eb9674f
 msgid "Fix installation errors related to Unicode in tests"
 msgstr ""
 
-#: ../../changelog.rst:258 8b544b800b20492db937b02285e42065
+#: ../../changelog.rst:278 1276e0c3d1a9447d84e25c3ad9e7abe7
 msgid "Don't show pagination in ``notmyidea`` theme if there's only one page"
 msgstr ""
 
-#: ../../changelog.rst:259 f4aa88761161465faaf260a5b8fd25a9
+#: ../../changelog.rst:279 c12da2ed75d64539af457cd49216fd7b
 msgid "Make hidden pages available in context"
 msgstr ""
 
-#: ../../changelog.rst:260 13a3a8e59edc4125afa6dee4ed568e9d
+#: ../../changelog.rst:280 22195be7d66d49b5a2536d4125dbb247
 msgid "Improve URLWrapper comparison"
 msgstr ""
 
-#: ../../changelog.rst:263 fa56610009e8407a89af312d093f2aff
+#: ../../changelog.rst:283 3fa9c04278aa4a6daaaacf03bcbc86c4
 msgid "3.6.0 (2015-06-15)"
 msgstr ""
 
-#: ../../changelog.rst:265 c4f546492e6447edb4d87c9317bdfb3f
+#: ../../changelog.rst:285 743e2686d8584c64bba2ff52de34b282
 msgid "Disable caching by default in order to prevent potential confusion"
 msgstr ""
 
-#: ../../changelog.rst:266 b874f6f5b4734a5c80587442728a7544
+#: ../../changelog.rst:286 5b7083ceed2642178328e7faf6c2e3d7
 msgid "Improve caching behavior, replacing ``pickle`` with ``cpickle``"
 msgstr ""
 
-#: ../../changelog.rst:267 1f5690a0d5b6437e99c0ea9104de979b
+#: ../../changelog.rst:287 de23594147fd4549af0d010d938b04b1
 msgid "Allow Markdown or reST content in metadata fields other than ``summary``"
 msgstr ""
 
-#: ../../changelog.rst:268 a1f397d14aca4c879211d95a5ca892db
+#: ../../changelog.rst:288 7d11607580c449709f22c3a7f1dd8cf1
 msgid "Support semicolon-separated author/tag lists"
 msgstr ""
 
-#: ../../changelog.rst:269 9926a6f073cc4fa9813df12d652898be
+#: ../../changelog.rst:289 1b78213ac5644a09b8d58bac7c132b30
 msgid "Improve flexibility of article sorting"
 msgstr ""
 
-#: ../../changelog.rst:270 e832f800cde5424bb332cc49f30f3f0a
+#: ../../changelog.rst:290 24fc473a1dcc409fbceb231cc61bf0db
 msgid "Add ``--relative-urls`` argument"
 msgstr ""
 
-#: ../../changelog.rst:271 3d1c82c08deb4a778f807be5b779d381
+#: ../../changelog.rst:291 a56f975051ca406b8ba80ed2b688316e
 msgid "Support devserver listening on addresses other than localhost"
 msgstr ""
 
-#: ../../changelog.rst:272 b6ee74584c064fac80c6f0e37d4f1d68
+#: ../../changelog.rst:292 e1c6f89208aa43768200ae0b5cb667e4
 msgid "Unify HTTP server handlers to ``pelican.server`` throughout"
 msgstr ""
 
-#: ../../changelog.rst:273 7e5010e2d8b74a03b694e8fa433fdf98
+#: ../../changelog.rst:293 c2543badc27243f1aadd684351852866
 msgid "Handle intra-site links to draft posts"
 msgstr ""
 
-#: ../../changelog.rst:274 a9afa1c067be459886fd7998d52f59d3
+#: ../../changelog.rst:294 3c111a7e2c7b43c683c7bef6a78058a7
 msgid "Move ``tag_cloud`` from core to plugin"
 msgstr ""
 
-#: ../../changelog.rst:275 432317300d7a4b2f82199c0f275716e4
+#: ../../changelog.rst:295 5e8d38af8ae647ba80edfb065967c18a
 msgid "Load default theme's external resources via HTTPS"
 msgstr ""
 
-#: ../../changelog.rst:276 56de44e81ae14997afb15c15e59f36ce
+#: ../../changelog.rst:296 8577b7a1315f4c0caa8a68379c7b9da6
 msgid "Import drafts from WordPress XML"
 msgstr ""
 
-#: ../../changelog.rst:277 f1ef4f1c13434d6b9614ebe9ebddfce6
+#: ../../changelog.rst:297 e2debaa9a5224d09af847e937c1446a6
 msgid "Improve support for Windows users"
 msgstr ""
 
-#: ../../changelog.rst:278 0fef1b4c413d491a98aba0c84e082594
+#: ../../changelog.rst:298 b2042bbb92e74fe5ae51df03addf61da
 msgid "Enhance logging and test suite"
 msgstr ""
 
-#: ../../changelog.rst:279 432c66ec8584401797ea817ec661c45b
+#: ../../changelog.rst:299 373b2ce42e7b4b10b4302660f177b137
 msgid "Clean up and refactor codebase"
 msgstr ""
 
-#: ../../changelog.rst:280 e22e5fb2b5264d1ca6eb78c067c76a32
+#: ../../changelog.rst:300 ad174f831fc7487c9efec8f1b1ebc937
 msgid "New signals: ``all_generators_finalized`` and ``page_writer_finalized``"
 msgstr ""
 
-#: ../../changelog.rst:283 b4d02cf4a5b642dcbb0237738d79bfcb
+#: ../../changelog.rst:303 a0e616e94c144183bb7cd8f0d0f9f253
 msgid "3.5.0 (2014-11-04)"
 msgstr ""
 
-#: ../../changelog.rst:285 e9efd7356dc9488aa6f4f20ba995683a
+#: ../../changelog.rst:305 d4c1d004789b4cfa9187a2994e2f3613
 msgid ""
 "Introduce ``ARTICLE_ORDER_BY`` and ``PAGE_ORDER_BY`` settings to control "
 "the order of articles and pages."
 msgstr ""
 
-#: ../../changelog.rst:287 7cba6f51788f47f391c2eb2c35bff315
+#: ../../changelog.rst:307 8532ec7e6c884d6d886c75690a860810
 msgid "Include time zone information in dates rendered in templates."
 msgstr ""
 
-#: ../../changelog.rst:288 8288271ca2e74d6da347bdce53a3cf59
+#: ../../changelog.rst:308 399b4302a06c4d71853eb69309edaec9
 msgid "Expose the reader name in the metadata for articles and pages."
 msgstr ""
 
-#: ../../changelog.rst:289 0c44eda91d9c4722b8ae87ed75416fd1
+#: ../../changelog.rst:309 03f44d912342475d981539bfc28e893b
 msgid ""
 "Add the ability to store static files along with content in the same "
 "directory as articles and pages using ``{attach}`` in the path."
 msgstr ""
 
-#: ../../changelog.rst:291 d96ca5c3ced44a7db8997feda6d5c36d
+#: ../../changelog.rst:311 aad755538ae5458bb0266537ce3a3488
 msgid ""
 "Prevent Pelican from raising an exception when there are duplicate pieces"
 " of metadata in a Markdown file."
 msgstr ""
 
-#: ../../changelog.rst:293 59a2c665716a4d51bdec967e877f86a1
+#: ../../changelog.rst:313 6ccca5efc34c43fc9e6549ce27d07b1a
 msgid ""
 "Introduce the ``TYPOGRIFY_IGNORE_TAGS`` setting to add HTML tags to be "
 "ignored by Typogrify."
 msgstr ""
 
-#: ../../changelog.rst:295 fa33c1b08c7b4286b25b56b4ea285c5a
+#: ../../changelog.rst:315 3a07ce5e47fb446f935a8aef182feda9
 #, python-format
 msgid ""
 "Add the ability to use ``-`` in date formats to strip leading zeros. For "
 "example, ``%-d/%-m/%y`` will now result in the date ``9/8/12``."
 msgstr ""
 
-#: ../../changelog.rst:297 64d61ee9d8ae4414b9b84a8051cd5522
+#: ../../changelog.rst:317 2b9865f51d2c431cad79bb1ad85dcf13
 msgid ""
 "Ensure feed generation is correctly disabled during quickstart "
 "configuration."
 msgstr ""
 
-#: ../../changelog.rst:298 85d7dfece0244142a1e486fbae2beb01
+#: ../../changelog.rst:318 900fd70063554c06b56e0c13084c5e56
 msgid ""
 "Fix ``PAGE_EXCLUDES`` and ``ARTICLE_EXCLUDES`` from incorrectly matching "
 "sub-directories."
 msgstr ""
 
-#: ../../changelog.rst:300 3acc9c23e76e4b289d9de3705c416913
+#: ../../changelog.rst:320 bef97ccdcc354bf68f7a738fefee44d0
 msgid "Introduce ``STATIC_EXCLUDE`` setting to add static file excludes."
 msgstr ""
 
-#: ../../changelog.rst:301 10dd085e254948f986aa41f9bd5ba73b
+#: ../../changelog.rst:321 96218c06cbc84b9884f17d4b3c2782d4
 msgid ""
 "Fix an issue when using ``PAGINATION_PATTERNS`` while ``RELATIVE_URLS`` "
 "is enabled."
 msgstr ""
 
-#: ../../changelog.rst:303 f7b355566396425cbd08985d5771e6d4
+#: ../../changelog.rst:323 0c2ccbc6e9e74f69912fecf3a9812535
 msgid ""
 "Fix feed generation causing links to use the wrong language for month "
 "names when using other locales."
 msgstr ""
 
-#: ../../changelog.rst:305 28f48794554048308015e2fb52cc4c5b
+#: ../../changelog.rst:325 ddc6d5315bfa4dd1888de8ff606e1efe
 msgid ""
 "Fix an issue where the authors list in the simple template wasn't "
 "correctly formatted."
 msgstr ""
 
-#: ../../changelog.rst:307 5509ab0c156845d1a7f1a59306ccfe6c
+#: ../../changelog.rst:327 28013aa7b4734809bd162e47c5bded8f
 msgid "Fix an issue when parsing non-string URLs from settings."
 msgstr ""
 
-#: ../../changelog.rst:308 4da2cbc439db416daeb4442a29645664
+#: ../../changelog.rst:328 4fe13830f2ed4449820e4a126e29db74
 msgid "Improve consistency of debug and warning messages."
 msgstr ""
 
-#: ../../changelog.rst:311 2e98c390cf6b4b4b93ddcce23014dbe9
+#: ../../changelog.rst:331 e412e8ca8ce94736a1bd9b64260a17c7
 msgid "3.4.0 (2014-07-01)"
 msgstr ""
 
-#: ../../changelog.rst:313 b3f12ddd82d74409b734a8bd10458173
+#: ../../changelog.rst:333 1153f4eed1394ce3a12d65af79337222
 msgid "Speed up content generation via new caching mechanism"
 msgstr ""
 
-#: ../../changelog.rst:314 c1772deca0344f74aad300e77e2641b2
+#: ../../changelog.rst:334 78911d6e2e8f43ce879ae634815c16a4
 msgid "Add selective post generation (instead of always building entire site)"
 msgstr ""
 
-#: ../../changelog.rst:315 7db419405a1740ef917e19f05015228a
+#: ../../changelog.rst:335 4fe3d9df73aa40f986e1a6f7602c3b09
 msgid "Many documentation improvements, including switching to prettier RtD theme"
 msgstr ""
 
-#: ../../changelog.rst:316 a045ce18d5724b888849a2036fdf626d
+#: ../../changelog.rst:336 517fbe1c874c48c2ab429e1ea5633fe3
 msgid "Add support for multiple content and plugin paths"
 msgstr ""
 
-#: ../../changelog.rst:317 75ddeed2af5e4a56a83e6b4026807ebf
+#: ../../changelog.rst:337 ebcfb3cf3a3a4841a4e144fa186ab023
 msgid ""
 "Add ``:modified:`` metadata field to complement ``:date:``. Used to "
 "specify the last date and time an article was updated independently from "
 "the date and time it was published."
 msgstr ""
 
-#: ../../changelog.rst:320 0049c916daed45a6bcd389ad0c120732
+#: ../../changelog.rst:340 350a9e23a1e24e8d927ea35835b92ca0
 msgid "Add support for multiple authors via new ``:authors:`` metadata field"
 msgstr ""
 
-#: ../../changelog.rst:321 bd572ae6cd4c4783b751a35f4f001ed6
+#: ../../changelog.rst:341 0b0f1d5303444f29990c75b5e071be14
 msgid "Watch for changes in static directories when in auto-regeneration mode"
 msgstr ""
 
-#: ../../changelog.rst:322 b48f6001e36e428491aa05fa2d419cd1
+#: ../../changelog.rst:342 29aafd6e485d45188d102fdb72feaafe
 msgid "Add filters to limit log output when desired"
 msgstr ""
 
-#: ../../changelog.rst:323 5d67072828f04eb1a2b8d37aca1706e4
+#: ../../changelog.rst:343 a77cea47df51490595f9ee1b8e05fdd1
 msgid "Add language support to drafts"
 msgstr ""
 
-#: ../../changelog.rst:324 5f6eef6c622a468ab0750bc4fbafffcd
+#: ../../changelog.rst:344 4bd686906beb45ddab847c0cdac33be8
 msgid "Add ``SLUGIFY_SOURCE`` setting to control how post slugs are generated"
 msgstr ""
 
-#: ../../changelog.rst:325 f77675fb2cb94589b821eaf0116d5b33
+#: ../../changelog.rst:345 6ce9976300e64d7dadb2048080424994
 msgid "Fix many issues relating to locale and encoding"
 msgstr ""
 
-#: ../../changelog.rst:326 b90206854315449696be45e4d459e5b4
+#: ../../changelog.rst:346 da577863fe4844d9b74218625a26f6ad
 msgid "Apply Typogrify filter to post summary"
 msgstr ""
 
-#: ../../changelog.rst:327 86383b9bc16e4b4a9ec3d15e7b727ca1
+#: ../../changelog.rst:347 faa72319441d4e8698e29c1bf829189f
 msgid ""
 "Preserve file metadata (e.g. time stamps) when copying static files to "
 "output"
 msgstr ""
 
-#: ../../changelog.rst:328 f844db2703af4069830a3fbcbd3841bd
+#: ../../changelog.rst:348 d2b92229d5494bea903ad60e6a5c8335
 msgid "Move AsciiDoc support from Pelican core into separate plugin"
 msgstr ""
 
-#: ../../changelog.rst:329 1c30d68d58dc42d9b33c2662f1258bcd
+#: ../../changelog.rst:349 61a9b4aa9cb44033b2f4229d2b167c64
 msgid ""
 "Produce inline links instead of reference-style links when importing "
 "content"
 msgstr ""
 
-#: ../../changelog.rst:330 fa8944dc8e284fe4bf78ad3a0676af3f
+#: ../../changelog.rst:350 d94f8c5cce634cc8ba784a3b59fb4819
 msgid "Improve handling of ``IGNORE_FILES`` setting behavior"
 msgstr ""
 
-#: ../../changelog.rst:331 f4c5805f6879483f9aa25e247f49016e
+#: ../../changelog.rst:351 e3d657b677384a4588da385c9b21080a
 msgid "Properly escape symbol characters in tag names (e.g., ``C++``)"
 msgstr ""
 
-#: ../../changelog.rst:332 d4c27bbafbd0427e821e301a503eec07
+#: ../../changelog.rst:352 d519c9f50e564647987ec969d7ec0ccf
 msgid "Minor tweaks for Python 3.4 compatibility"
 msgstr ""
 
-#: ../../changelog.rst:333 743111e35a0c4303985dcce214e3e29f
+#: ../../changelog.rst:353 5ce6f5c727f447c9a432d1fd363e2c29
 msgid "Add several new signals"
 msgstr ""
 
-#: ../../changelog.rst:336 46ee1a42a2ac4f688e20db25231a97cc
+#: ../../changelog.rst:356 dae29c0187c44c27972be55b01c69ef8
 msgid "3.3.0 (2013-09-24)"
 msgstr ""
 
-#: ../../changelog.rst:338 d38c96a268fb4928b7884c32f04ea781
+#: ../../changelog.rst:358 17fad8c0afd94ba5a3b660e70b74a282
 msgid "Drop Python 3.2 support in favor of Python 3.3"
 msgstr ""
 
-#: ../../changelog.rst:339 e4b1b4170e3a4daf85bb3e0b4a33d84c
+#: ../../changelog.rst:359 ad9c00a4712845a9a13423e6b9b02a92
 msgid ""
 "Add ``Fabfile`` so Fabric can be used for workflow automation instead of "
 "Make"
 msgstr ""
 
-#: ../../changelog.rst:340 8f898752127545598c060470ba4ea5a6
+#: ../../changelog.rst:360 cd23162f223245a685ff1a9881b8b195
 msgid ""
 "``OUTPUT_RETENTION`` setting can be used to preserve metadata (e.g., VCS "
 "data such as ``.hg`` and ``.git``) from being removed from output "
 "directory"
 msgstr ""
 
-#: ../../changelog.rst:342 3cef6e0824db42ef8eb2a6db21e018c4
+#: ../../changelog.rst:362 2d4af689970445558506be64942cda4d
 msgid "Tumblr import"
 msgstr ""
 
-#: ../../changelog.rst:343 9b35ec96add44773857342682a38fbe9
+#: ../../changelog.rst:363 94cb151962db4a4186070048cf9a52d1
 msgid "Improve logic and consistency when cleaning output folder"
 msgstr ""
 
-#: ../../changelog.rst:344 0e3383e3461a44b590b00a88c8543859
+#: ../../changelog.rst:364 4f24e4305c8f49baba762604f81a009b
 msgid "Improve documentation versioning and release automation"
 msgstr ""
 
-#: ../../changelog.rst:345 ab9935d7e2c84ccb852185870f8d1cc9
+#: ../../changelog.rst:365 fd8868d0c4ee4ec5b998c117e60fe784
 msgid "Improve pagination flexibility"
 msgstr ""
 
-#: ../../changelog.rst:346 92bd1ab368544083ac4e64f5d424c151
+#: ../../changelog.rst:366 eb2be9edbc6e470f952a97cac0a8c012
 msgid ""
 "Rename signals for better consistency (some plugins may need to be "
 "updated)"
 msgstr ""
 
-#: ../../changelog.rst:347 740eae7ce680434c981b4064809072a3
+#: ../../changelog.rst:367 89f9707a3d1e443389b024a5bc34f87e
 msgid ""
 "Move metadata extraction from generators to readers; metadata extraction "
 "no longer article-specific"
 msgstr ""
 
-#: ../../changelog.rst:349 d1ae5b5bc77f4bcaa40d5bd86cdc0fcc
+#: ../../changelog.rst:369 41bb6f6c43cd493ab89c900de7aa6628
 msgid ""
 "Deprecate ``FILES_TO_COPY`` in favor of ``STATIC_PATHS`` and "
 "``EXTRA_PATH_METADATA``"
 msgstr ""
 
-#: ../../changelog.rst:351 806154386d4c45d9b625087bbd8706bd
+#: ../../changelog.rst:371 86a7dff5bc8645c3be130a8ae4add149
 msgid "Summaries in Markdown posts no longer include footnotes"
 msgstr ""
 
-#: ../../changelog.rst:352 1e20db19c60442a4ae4c517d5edaac8c
+#: ../../changelog.rst:372 009790743d7f42ba8278f18c392db041
 msgid ""
 "Remove unnecessary whitespace in output via ``lstrip_blocks`` Jinja "
 "parameter"
 msgstr ""
 
-#: ../../changelog.rst:353 72b17016676643d4863b6da2dc5dd585
+#: ../../changelog.rst:373 38b06c9a766c4c93b6d8e2869a5b3711
 msgid "Move PDF generation from core to plugin"
 msgstr ""
 
-#: ../../changelog.rst:354 c8e9e2beddd242038b0655913de16745
+#: ../../changelog.rst:374 bb68b5bb0de84b9abfcd65987be9c368
 msgid "Replace ``MARKUP`` setting with ``READERS``"
 msgstr ""
 
-#: ../../changelog.rst:355 39124ff576a145e194694060c394ebea
+#: ../../changelog.rst:375 4a0c9f70f0f24261a597ce1b155e0800
 msgid "Add warning if img tag is missing ``alt`` attribute"
 msgstr ""
 
-#: ../../changelog.rst:356 039cc780731643f882a0dd52bd7486d9
+#: ../../changelog.rst:376 dcabdeff1f5e4ee69292730bb31c9131
 msgid "Add support for ``{}`` in relative links syntax, besides ``||``"
 msgstr ""
 
-#: ../../changelog.rst:357 9289f5f1c5f04c5894cb8e7e02f9f5c8
+#: ../../changelog.rst:377 9fde536f5fca40e6a620b5f07049a0c3
 msgid "Add support for ``{tag}`` and ``{category}`` relative links"
 msgstr ""
 
-#: ../../changelog.rst:358 a214dc13448b479bb7af0a16825457aa
+#: ../../changelog.rst:378 b241cd3f2847484bb7a56631c58d5ba4
 msgid "Add a ``content_written`` signal"
 msgstr ""
 
-#: ../../changelog.rst:361 5249278a96bc437fa297368c8f672404
+#: ../../changelog.rst:381 b6077687c2a64ddeafa187b1448c048f
 msgid "3.2.1 and 3.2.2"
 msgstr ""
 
-#: ../../changelog.rst:363 3f9b98d264e048949c389dbe3e260652
+#: ../../changelog.rst:383 bf6c37fc7c2e47f0aee3ee9cb0cb5306
 msgid "Facilitate inclusion in FreeBSD Ports Collection"
 msgstr ""
 
-#: ../../changelog.rst:366 124cc3f3f8924e918bd0789422649535
+#: ../../changelog.rst:386 3e800dbf3fe24766b77a043bc8da3c09
 msgid "3.2 (2013-04-24)"
 msgstr ""
 
-#: ../../changelog.rst:368 fa25abf620e84a568df67473d9b3e20f
+#: ../../changelog.rst:388 17cb561f2e184679831d2e3ac7eda3de
 msgid "Support for Python 3!"
 msgstr ""
 
-#: ../../changelog.rst:369 b1702663f9ff41e387aa055aa8a80985
+#: ../../changelog.rst:389 faee303362bb40ad952cc4581036f070
 msgid ""
 "Override page save-to location from meta-data (enables using a static "
 "page as the site's home page, for example)"
 msgstr ""
 
-#: ../../changelog.rst:371 3d9f1c80f4c74f0fb655aaff98846e2e
+#: ../../changelog.rst:391 3fc6523eaace489494b61380def294d1
 msgid "Time period archives (per-year, per-month, and per-day archives of posts)"
 msgstr ""
 
-#: ../../changelog.rst:372 ee27abd30d204213967d190e45bc3cce
+#: ../../changelog.rst:392 3eafb73945bf414cbcb903a9695ff8de
 msgid "Posterous blog import"
 msgstr ""
 
-#: ../../changelog.rst:373 2614d3717c644bd4b567eb2bbcec9c5b
+#: ../../changelog.rst:393 cc3982d7a21146319745d929a38b43d9
 msgid "Improve WordPress blog import"
 msgstr ""
 
-#: ../../changelog.rst:374 8e10fa12d60b4473858214e618f934f3
+#: ../../changelog.rst:394 165fdfe5bfe1415c8b6cd56af637f3d4
 msgid "Migrate plugins to separate repository"
 msgstr ""
 
-#: ../../changelog.rst:375 a4ff557f266149e992884d5bc180f6fd
+#: ../../changelog.rst:395 2f62212ada534de6ade55404aae98383
 msgid "Improve HTML parser"
 msgstr ""
 
-#: ../../changelog.rst:376 e9a87539173943dcb76ffff618a205cc
+#: ../../changelog.rst:396 66b0bf3a2b4a47c78a5a936c80c0e4fb
 msgid ""
 "Provide ability to show or hide categories from menu using "
 "``DISPLAY_CATEGORIES_ON_MENU`` option"
 msgstr ""
 
-#: ../../changelog.rst:378 721df0da641444c1a41fe72e38bafa20
+#: ../../changelog.rst:398 d316333413c3459f803d9ec694450dab
 msgid "Auto-regeneration can be told to ignore files via ``IGNORE_FILES`` setting"
 msgstr ""
 
-#: ../../changelog.rst:379 2f925e2291c54bc0b6da964d7f17079f
+#: ../../changelog.rst:399 7a199ee7396d485aaa55496b32e8a5c0
 msgid "Improve post-generation feedback to user"
 msgstr ""
 
-#: ../../changelog.rst:380 bc36457afeaa449583693dcef652e072
+#: ../../changelog.rst:400 6deb9ccecfab4fcba7157680ce6a35b9
 msgid ""
 "For multilingual posts, use meta-data to designate which is the original "
 "and which is the translation"
 msgstr ""
 
-#: ../../changelog.rst:382 8abbe86f8e4a4786886f887bad894983
+#: ../../changelog.rst:402 be2051f4c2304904b3264bd61da6bb3b
 msgid "Add ``.mdown`` to list of supported Markdown file extensions"
 msgstr ""
 
-#: ../../changelog.rst:383 84e1d9cee66c4ee3ba779eb697169d35
+#: ../../changelog.rst:403 be4c498c73604b7289bd908490b820fe
 msgid "Document-relative URL generation (``RELATIVE_URLS``) is now off by default"
 msgstr ""
 
-#: ../../changelog.rst:386 461aa8ba882c4543980540c6686a69ff
+#: ../../changelog.rst:406 26c902ee59b54f5199b53dbd841981ce
 msgid "3.1 (2012-12-04)"
 msgstr ""
 
-#: ../../changelog.rst:388 ea4445533819403b8a54af8f62d30dab
+#: ../../changelog.rst:408 1dce4c50db964039b0d0b4a27e19ce96
 msgid ""
 "Importer now stores slugs within files by default. This can be disabled "
 "with the ``--disable-slugs`` option."
 msgstr ""
 
-#: ../../changelog.rst:390 a00bcb155126439ab341cff0f37ecc5a
+#: ../../changelog.rst:410 247f3c4937844361a98a9bbc557774cb
 msgid "Improve handling of links to intra-site resources"
 msgstr ""
 
-#: ../../changelog.rst:391 5d47bb0eac84452b829ea7a5a7447bdd
+#: ../../changelog.rst:411 baf6646be1424810853be748d7a15129
 msgid ""
 "Ensure WordPress import adds paragraphs for all types of line endings in "
 "post content"
 msgstr ""
 
-#: ../../changelog.rst:393 6d41430cf1ae4bbe95c7206bed9fe17c
+#: ../../changelog.rst:413 4cefab609bb64186a2f597cedad65b61
 msgid "Decode HTML entities within WordPress post titles on import"
 msgstr ""
 
-#: ../../changelog.rst:394 17121b597e6148768c531523a9b6f955
+#: ../../changelog.rst:414 8b1e222311f749a5b50858f0dc34466d
 msgid "Improve appearance of LinkedIn icon in default theme"
 msgstr ""
 
-#: ../../changelog.rst:395 cfc8bfbe89c44ce9a30e230f255d79dd
+#: ../../changelog.rst:415 bd4f42ac16a040d6b0e5cb1e9f5d5977
 msgid "Add GitHub and Google+ social icons support in default theme"
 msgstr ""
 
-#: ../../changelog.rst:396 5bd746b4bcc64c7382d492f61d50193c
+#: ../../changelog.rst:416 d65513f7ff4d4294a5a4b755f6aa65c4
 msgid "Optimize social icons"
 msgstr ""
 
-#: ../../changelog.rst:397 bdb1513252d54c1f89e9efc11516b368
+#: ../../changelog.rst:417 9c930d0296f9464490df06094597739f
 msgid ""
 "Add ``FEED_ALL_ATOM`` and ``FEED_ALL_RSS`` to generate feeds containing "
 "all posts regardless of their language"
 msgstr ""
 
-#: ../../changelog.rst:399 6d52c5f3e6e64dcc8b11fb5f80d6df46
+#: ../../changelog.rst:419 c3c18b3ea6ce4a24abb55abd44b7164f
 msgid ""
 "Split ``TRANSLATION_FEED`` into ``TRANSLATION_FEED_ATOM`` and "
 "``TRANSLATION_FEED_RSS``"
 msgstr ""
 
-#: ../../changelog.rst:401 12c0a402411f47a4a71f64d7f19efd01
+#: ../../changelog.rst:421 9994413cfc6347fd8b9879e117b2b889
 msgid "Different feeds can now be enabled/disabled individually"
 msgstr ""
 
-#: ../../changelog.rst:402 f7ddae2570b34df1b598fa35239449ad
+#: ../../changelog.rst:422 ca5c45416f784c87bed555ace354af21
 msgid ""
 "Allow for blank author: if ``AUTHOR`` setting is not set, author won't "
 "default to ``${USER}`` anymore, and a post won't contain any author "
 "information if the post author is empty"
 msgstr ""
 
-#: ../../changelog.rst:405 e12a883add8d41f1b330e51ace547b06
+#: ../../changelog.rst:425 5270ac00aa8f4f2d98f2a3a57a6bf03c
 msgid "Move LESS and Webassets support from Pelican core to plugin"
 msgstr ""
 
-#: ../../changelog.rst:406 d2e26f930edf4d68801b4e005ab7cdca
+#: ../../changelog.rst:426 a8e64d393d0a4e3195dbdc1215302f9c
 msgid ""
 "The ``DEFAULT_DATE`` setting now defaults to ``None``, which means that "
 "articles won't be generated unless date metadata is specified"
 msgstr ""
 
-#: ../../changelog.rst:408 c198ce6b37c94d98b358cf8aae3fa1c0
+#: ../../changelog.rst:428 e9d682bcd1de45f3a1a98ae17193aced
 msgid ""
 "Add ``FILENAME_METADATA`` setting to support metadata extraction from "
 "filename"
 msgstr ""
 
-#: ../../changelog.rst:410 c3a2e1677eab4de3a12963b8c13e4875
+#: ../../changelog.rst:430 fe3a4d2bc15d4b4fba48fc8af3569336
 msgid ""
 "Add ``gzip_cache`` plugin to compress common text files into a ``.gz`` "
 "file within the same directory as the original file, preventing the "
 "server (e.g. Nginx) from having to compress files during an HTTP call"
 msgstr ""
 
-#: ../../changelog.rst:413 666bac4d13ba42d5b61833beb0950beb
+#: ../../changelog.rst:433 c44353005d5d4e1293cc9a1878517726
 msgid "Add support for AsciiDoc-formatted content"
 msgstr ""
 
-#: ../../changelog.rst:414 aaf5c771064c4c46975523a15609e6c9
+#: ../../changelog.rst:434 dcdc1aff409544f1b60d7c22a7a41b6b
 msgid ""
 "Add ``USE_FOLDER_AS_CATEGORY`` setting so that feature can be toggled "
 "on/off"
 msgstr ""
 
-#: ../../changelog.rst:415 71233f0cf0844770a9374a375bce2ed6
+#: ../../changelog.rst:435 f6675e347a114c75a3952ef5ef5f1e29
 msgid "Support arbitrary Jinja template files"
 msgstr ""
 
-#: ../../changelog.rst:416 fa2c3365a6c049bdb69a3215fd4010f7
+#: ../../changelog.rst:436 87ba44c075b144ee8c4734e4f6f4e4c9
 msgid "Restore basic functional tests"
 msgstr ""
 
-#: ../../changelog.rst:417 925cdeb6a5344275a69e3d93ecc88eea
+#: ../../changelog.rst:437 0354818a87df49e59ac35a7d738c8e83
 msgid ""
 "New signals: ``generator_init``, ``get_generators``, and "
 "``article_generate_preread``"
 msgstr ""
 
-#: ../../changelog.rst:421 a534e61fa0374d0cb03ec9d83b5fe387
+#: ../../changelog.rst:441 1256b71b526e43dbb94823c0604f0bc6
 msgid "3.0 (2012-08-08)"
 msgstr ""
 
-#: ../../changelog.rst:423 7ec504fa35f84ec1b47a86fb9ef3b685
+#: ../../changelog.rst:443 e79ee10015eb41fea71877bff6453a0b
 msgid "Refactored the way URLs are handled"
 msgstr ""
 
-#: ../../changelog.rst:424 a268577292d945649ad12e1430ed9eaf
+#: ../../changelog.rst:444 f41008aff59344b0a964a38304c8f27d
 msgid "Improved the English documentation"
 msgstr ""
 
-#: ../../changelog.rst:425 c694abe18818459d83a25f01c6257d9b
+#: ../../changelog.rst:445 9cfcf344ed0d41c0aa20d2e4178de487
 msgid "Fixed packaging using ``setuptools`` entrypoints"
 msgstr ""
 
-#: ../../changelog.rst:426 81b5a9a2740340e6ad48d2baceef5ebd
+#: ../../changelog.rst:446 75d4a7f700424bb69bd8fbba899fe5f2
 msgid "Added ``typogrify`` support"
 msgstr ""
 
-#: ../../changelog.rst:427 39d0f35b4ee343259ec7375597a718ec
+#: ../../changelog.rst:447 e9e8e0933822437381e4a099118d17a8
 msgid "Added a way to disable feed generation"
 msgstr ""
 
-#: ../../changelog.rst:428 8eb4aa1d17ff406aaf5be093c4310966
+#: ../../changelog.rst:448 c9746121791347a18725b210eb69fca6
 msgid "Added support for ``DIRECT_TEMPLATES``"
 msgstr ""
 
-#: ../../changelog.rst:429 0b43a8fa70db455696e298f4c11ac0c3
+#: ../../changelog.rst:449 84b68057366c4c1eb56502f64a42bb73
 msgid "Allow multiple extensions for content files"
 msgstr ""
 
-#: ../../changelog.rst:430 89b94d339a3f46f882451d1dfac8df08
+#: ../../changelog.rst:450 36450fadc3a1446898365333ebd9a369
 msgid "Added LESS support"
 msgstr ""
 
-#: ../../changelog.rst:431 bb9a3c00bb23405698d39c49b812ec07
+#: ../../changelog.rst:451 1e1d7cc4e8b647c1b9c5be55374c43f0
 msgid "Improved the import script"
 msgstr ""
 
-#: ../../changelog.rst:432 d4b7b6302e4b48b6990484066099dec1
+#: ../../changelog.rst:452 bbb3522bded542c9af30ade57961b005
 msgid "Added functional tests"
 msgstr ""
 
-#: ../../changelog.rst:433 cc8d47d8e96d47c1965b6b721ad32de5
+#: ../../changelog.rst:453 06d82b81708d4234911c4552adb21aa3
 msgid "Rsync support in the generated Makefile"
 msgstr ""
 
-#: ../../changelog.rst:434 10cb71db95504caf9c45928191f650b0
+#: ../../changelog.rst:454 9e0ef37470e4457d91f43b9a7ceb77aa
 msgid "Improved feed support (easily pluggable with Feedburner for instance)"
 msgstr ""
 
-#: ../../changelog.rst:435 61c7cb5819f94c89bd6dc3773375048f
+#: ../../changelog.rst:455 5a84812ef2d440b5953327383ac064ed
 msgid "Added support for ``abbr`` in reST"
 msgstr ""
 
-#: ../../changelog.rst:436 f65624c8dd3f4047be4adc66a8a9d1f4
+#: ../../changelog.rst:456 3e899ccc01a94cca8886244190cf5944
 msgid "Fixed a bunch of bugs :-)"
 msgstr ""
 
-#: ../../changelog.rst:439 d87300bfd91e495286e96a06c76fea5a
+#: ../../changelog.rst:459 73ed385ee1c143dcb9d1f5a2aa21a101
 msgid "2.8 (2012-02-28)"
 msgstr ""
 
-#: ../../changelog.rst:441 a96f4e4b17034044a7fad630eba6f6c3
+#: ../../changelog.rst:461 e037cd34f3af4d2c826ccc7a949f2df8
 msgid "Dotclear importer"
 msgstr ""
 
-#: ../../changelog.rst:442 769b7e899fe44b2299b3bc021b23724d
+#: ../../changelog.rst:462 994601f5041a465086869af70ae072dc
 msgid "Allow the usage of Markdown extensions"
 msgstr ""
 
-#: ../../changelog.rst:443 c11b737547f44ee4b9f206d78fd69034
+#: ../../changelog.rst:463 0830c593481e4e5ea1526f4d1a8848fa
 msgid "Themes are now easily extensible"
 msgstr ""
 
-#: ../../changelog.rst:444 22b0eea97e5c4d5ea4615961685ddfda
+#: ../../changelog.rst:464 3ff0b224c93e442684a1b686d8666ced
 msgid "Don't output pagination information if there is only one page"
 msgstr ""
 
-#: ../../changelog.rst:445 739a53e452714197918fdb7c730685c2
+#: ../../changelog.rst:465 ec4ec66862df420caf61a32c472f972b
 msgid "Add a page per author, with all their articles"
 msgstr ""
 
-#: ../../changelog.rst:446 6b9d84b09f954dba8e2ad225e26ad68a
+#: ../../changelog.rst:466 864df61f6eef43e4980bf957b14ac26e
 msgid "Improved the test suite"
 msgstr ""
 
-#: ../../changelog.rst:447 6099f1c52f7c48adad09f9b84f50f181
+#: ../../changelog.rst:467 285e4cb5a43241558e3d2bf1876c0ee5
 msgid "Made the themes easier to extend"
 msgstr ""
 
-#: ../../changelog.rst:448 e4090cb5f1634fe0b30e498e8f1c0eca
+#: ../../changelog.rst:468 7597e818692d42039cffc1fb67513c52
 msgid "Removed Skribit support"
 msgstr ""
 
-#: ../../changelog.rst:449 04ff51eeefd24306804c5a2daa98d59e
+#: ../../changelog.rst:469 867bceffc3cf431a919f92d33691870a
 msgid "Added a ``pelican-quickstart`` script"
 msgstr ""
 
-#: ../../changelog.rst:450 550158557c904ad8abe330a0b86e6755
+#: ../../changelog.rst:470 bdbf4396e57242af8f2be7c4c20ea455
 msgid "Fixed timezone-related issues"
 msgstr ""
 
-#: ../../changelog.rst:451 f41a6fafa9d548adbae1dfc7276a7f3a
+#: ../../changelog.rst:471 2a8752a2c1d14916aa78eaf4878db4f9
 msgid "Added some scripts for Windows support"
 msgstr ""
 
-#: ../../changelog.rst:452 e8b30590d7c64808b604f03d4bf25ffc
+#: ../../changelog.rst:472 67d470d30d8d41d38022c6a7024f3c62
 msgid "Date can be specified in seconds"
 msgstr ""
 
-#: ../../changelog.rst:453 bbdf1c456cc3417e876855d8b792753c
+#: ../../changelog.rst:473 fcdf6b71286b4951ac69786e590c7649
 msgid "Never fail when generating posts (skip and continue)"
 msgstr ""
 
-#: ../../changelog.rst:454 33545506148f48c7a1f42d12535604ad
+#: ../../changelog.rst:474 9cba8ad7120b4ea0bdd385d5facb119f
 msgid "Allow the use of future dates"
 msgstr ""
 
-#: ../../changelog.rst:455 1d56de44e22c432eb61fbd23fe27ae88
+#: ../../changelog.rst:475 4ded329080034fac931b6be8f801ce2d
 msgid "Support having different timezones per language"
 msgstr ""
 
-#: ../../changelog.rst:456 0002c845a16a4d5bb19eeca4dedb0ce9
+#: ../../changelog.rst:476 5a5f49be18c449fba6a8aeaa2b36b14e
 msgid "Enhanced the documentation"
 msgstr ""
 
-#: ../../changelog.rst:459 2dd8c562cd44466cbbc868023bc8eef6
+#: ../../changelog.rst:479 d49c481caef348f59c74d194bcca6579
 msgid "2.7 (2011-06-11)"
 msgstr ""
 
-#: ../../changelog.rst:461 6383d280fbbf47e99be6cbceaaa30245
+#: ../../changelog.rst:481 7d8c241cc73642d8a5214b44dcfe30ca
 msgid "Use ``logging`` rather than echoing to stdout"
 msgstr ""
 
-#: ../../changelog.rst:462 80e585445f284f95be38a221068c817d
+#: ../../changelog.rst:482 670a6095a13c4970aac3016915813b9c
 msgid "Support custom Jinja filters"
 msgstr ""
 
-#: ../../changelog.rst:463 a2431e6f9cd041d7ae9a81ee9ea1f1d3
+#: ../../changelog.rst:483 be2c4c82052b4cb48e02ca0dca49eeb6
 msgid "Compatibility with Python 2.5"
 msgstr ""
 
-#: ../../changelog.rst:464 8cdec91cfae54eef979319ffcd7b2b4b
+#: ../../changelog.rst:484 773398476e4d45df89d7d958d2e496e6
 msgid "Added a theme manager"
 msgstr ""
 
-#: ../../changelog.rst:465 53823ba8924f4092a13f30d612b6d147
+#: ../../changelog.rst:485 963c80928b8e4d92a9c549a4daa58cb9
 msgid "Packaged for Debian"
 msgstr ""
 
-#: ../../changelog.rst:466 dcf480ab75f849e78f2e15e0de4880c9
+#: ../../changelog.rst:486 c37c96fad3ad438395e73f2b2fdd5678
 msgid "Added draft support"
 msgstr ""
 
-#: ../../changelog.rst:469 9e46e5ecc5aa48ed9c973f181250bb2d
+#: ../../changelog.rst:489 7c215208f8a34f53ae0d22361f9305af
 msgid "2.6 (2011-03-08)"
 msgstr ""
 
-#: ../../changelog.rst:471 3b00b44b0dc74320bcc30ac3c3b8d43f
+#: ../../changelog.rst:491 deeb4eb9a00547bea54a8f4486cea948
 msgid "Changes in the output directory structure"
 msgstr ""
 
-#: ../../changelog.rst:472 7edd59c2885748b18242900bc717e6f2
+#: ../../changelog.rst:492 5719cd5592b442549b860851c95ace8a
 msgid "Makes templates easier to work with / create"
 msgstr ""
 
-#: ../../changelog.rst:473 80ecbc256d074c0ab966b3f8f90b2fa7
+#: ../../changelog.rst:493 a14ed59f0b7d43b7b64033cbda6fa1b3
 msgid "Added RSS support (was Atom-only)"
 msgstr ""
 
-#: ../../changelog.rst:474 6bcd42cb56ae4e52b1fd66833cad6bd3
+#: ../../changelog.rst:494 2b78e48ee5c04ee88a19e82dd5736b08
 msgid "Added tag support for the feeds"
 msgstr ""
 
-#: ../../changelog.rst:475 e8875e8c6317488eb0fa76f5d444763f
+#: ../../changelog.rst:495 129c8684dfe34773943a63f7294422dc
 msgid "Enhance the documentation"
 msgstr ""
 
-#: ../../changelog.rst:476 feb91b6347cb467ba693cb55a2cd8a00
+#: ../../changelog.rst:496 865503839227447ca15dae5cccbbd7f8
 msgid "Added another theme (brownstone)"
 msgstr ""
 
-#: ../../changelog.rst:477 3e8cd0da99fe408bb66b8db1caaa336b
+#: ../../changelog.rst:497 ecbde1d7724c445283ca769b43684207
 msgid "Added translations"
 msgstr ""
 
-#: ../../changelog.rst:478 888218f74f754c209363573264452100
+#: ../../changelog.rst:498 6877cc6c1e92490fab2840698dadba59
 msgid "Added a way to use cleaner URLs with a rewrite url module (or equivalent)"
 msgstr ""
 
-#: ../../changelog.rst:479 5006a51a923042dcabda9843b155d177
+#: ../../changelog.rst:499 4b937b4f363b4bfd86d3447d61ac79e0
 msgid "Added a tag cloud"
 msgstr ""
 
-#: ../../changelog.rst:480 a329ec582419436392aea3556205352c
+#: ../../changelog.rst:500 61ebc53121c34b96bb6edf9bd95b385e
 msgid ""
 "Added an autoreloading feature: the blog is automatically regenerated "
 "each time a modification is detected"
 msgstr ""
 
-#: ../../changelog.rst:482 8b136937ff5c42b6a9d4ca2c09f49399
+#: ../../changelog.rst:502 79b3ebc425c64a60a5e9914da9e43752
 msgid "Translate the documentation into French"
 msgstr ""
 
-#: ../../changelog.rst:483 00b39926200d4f1389445e6f7a25ea34
+#: ../../changelog.rst:503 a1446ce9b3e147ac9926754b1db32746
 msgid "Import a blog from an RSS feed"
 msgstr ""
 
-#: ../../changelog.rst:484 92dd7ebe963e4c3da3dd0b138d8c0cd7
+#: ../../changelog.rst:504 0d427fc4738a447fbdae05b78559171e
 msgid "Pagination support"
 msgstr ""
 
-#: ../../changelog.rst:485 45dc61ad8c664e1e84511003c2431e7f
+#: ../../changelog.rst:505 d70488ef9cea45db8389a99209fe9d9a
 msgid "Added Skribit support"
 msgstr ""
 
-#: ../../changelog.rst:488 17729e7145b04f21b6adef1c94284e4b
+#: ../../changelog.rst:508 ee9730d28c0a4e378618499401e1e399
 msgid "2.5 (2010-11-20)"
 msgstr ""
 
-#: ../../changelog.rst:490 44ae6d5ba68944cea82d7b3598be287e
+#: ../../changelog.rst:510 41764632aa2a46a9864a41bfa73b3d58
 msgid "Import from WordPress"
 msgstr ""
 
-#: ../../changelog.rst:491 a0af2d8823354b8fa048b456f9d0df25
+#: ../../changelog.rst:511 b3ee93bdd46e4699adea39b8e99ba3c4
 msgid "Added some new themes (martyalchin / wide-notmyidea)"
 msgstr ""
 
-#: ../../changelog.rst:492 ec519864fa79463b8eea11f06934cbc5
+#: ../../changelog.rst:512 1a023f24ad50438c947a0c980213819a
 msgid "First bug report!"
 msgstr ""
 
-#: ../../changelog.rst:493 7d38312ffc1f4589ad54b2d019cad3ea
+#: ../../changelog.rst:513 573a4f64b2d2486f80416c4f98e5a3e4
 msgid "Linkedin support"
 msgstr ""
 
-#: ../../changelog.rst:494 99a73194501a4469acac9ffdd791502f
+#: ../../changelog.rst:514 c3c6ab49cad54f60a2f167abc9888764
 msgid "Added a FAQ"
 msgstr ""
 
-#: ../../changelog.rst:495 49dc1d7af56c43a8b21e3d0e0bf141ad
+#: ../../changelog.rst:515 7cf0a7d9c46545dd81397ed03bcd542e
 msgid "Google Analytics support"
 msgstr ""
 
-#: ../../changelog.rst:496 59edf76455f2489993739d027964bb63
+#: ../../changelog.rst:516 de467a7c0a654db0a31ec42908c83b39
 msgid "Twitter support"
 msgstr ""
 
-#: ../../changelog.rst:497 9c2d230b25e24b179049dc9e0332401c
+#: ../../changelog.rst:517 455af156688d454f8dea6b8dcca0cb48
 msgid "Use relative URLs, not static ones"
 msgstr ""
 
-#: ../../changelog.rst:500 fc4e0772192648cd89baed818dbeb908
+#: ../../changelog.rst:520 12dceabc363e493599eb83725eb0d891
 msgid "2.4 (2010-11-06)"
 msgstr ""
 
-#: ../../changelog.rst:502 d01de90563a94bafae690740613aa682
+#: ../../changelog.rst:522 0d24870c616a4d02a6e23758a1022a0c
 msgid "Minor themes changes"
 msgstr ""
 
-#: ../../changelog.rst:503 38a95f8b00684dc3ab279840640a01d8
+#: ../../changelog.rst:523 4d8d6c48d9824e258c6789afe95ffb4e
 msgid "Add Disqus support (so we have comments)"
 msgstr ""
 
-#: ../../changelog.rst:504 13dca871c120491a90240c43c7d0f4c7
+#: ../../changelog.rst:524 74cd4df65f8b41a1967033aedead1c87
 msgid "Another code refactoring"
 msgstr ""
 
-#: ../../changelog.rst:505 87ec5e2d8b80482aac6e0a82f31c0d12
+#: ../../changelog.rst:525 a44c01fa1c1242ab86a6ab32851e0284
 msgid "Added config settings about pages"
 msgstr ""
 
-#: ../../changelog.rst:506 30c338ee5d85462588119841675c73f4
+#: ../../changelog.rst:526 c4519c5267eb4606b7f5de643028429e
 msgid "Blog entries can also be generated in PDF"
 msgstr ""
 
-#: ../../changelog.rst:509 6d1ebe0620ff46939743b2fe2e9f1683
+#: ../../changelog.rst:529 7164d3eacbd946c8a317dc16929ba48d
 msgid "2.3 (2010-10-31)"
 msgstr ""
 
-#: ../../changelog.rst:511 3df14b83afaa446ca893c157189e33fb
+#: ../../changelog.rst:531 ca062e8a7c1a43f2a678bbfe22484d6a
 msgid "Markdown support"
 msgstr ""
 
-#: ../../changelog.rst:514 91b45ea2e78047ccbbd97c7059930864
+#: ../../changelog.rst:534 fc9a53b1a9034f809688d3c4114b412c
 msgid "2.2 (2010-10-30)"
 msgstr ""
 
-#: ../../changelog.rst:516 4b96d6c2c47d463ebb66d1eaeb1f004e
+#: ../../changelog.rst:536 121f2a61adc043a79c029fb4acc3ea0d
 msgid "Prettify output"
 msgstr ""
 
-#: ../../changelog.rst:517 cd805a3c55c84ddd89080a4912d91633
+#: ../../changelog.rst:537 f6a56a02617e458089148229dd92bd08
 msgid "Manages static pages as well"
 msgstr ""
 
-#: ../../changelog.rst:520 bc8859b0bf4043e09aed54af4b3c6ba7
+#: ../../changelog.rst:540 c4d2a7150f2a46f7a87e1d810777b5be
 msgid "2.1 (2010-10-30)"
 msgstr ""
 
-#: ../../changelog.rst:522 3146db5382224eddad41228f6f539e4c
+#: ../../changelog.rst:542 739f08f2d6a746199390e3809f4a27f1
 msgid "Make notmyidea the default theme"
 msgstr ""
 
-#: ../../changelog.rst:525 f1bff0048805473d90461c68f8c82f07
+#: ../../changelog.rst:545 2596c0b20ea947a5845cd92f3190f32e
 msgid "2.0 (2010-10-30)"
 msgstr ""
 
-#: ../../changelog.rst:527 9c0181b93ed34eaa87a8e323a773a4c9
+#: ../../changelog.rst:547 a023ea05a0864c2085b91526bfa23554
 msgid "Refactoring to be more extensible"
 msgstr ""
 
-#: ../../changelog.rst:528 878c1cc7b2bb4adbb1684439b029cd14
+#: ../../changelog.rst:548 a411e0742c7a4751b1b5d8f7848cbf2b
 msgid "Change into the setting variables"
 msgstr ""
 
-#: ../../changelog.rst:531 ca506f63c6474fa4ba68a7b57a840e81
+#: ../../changelog.rst:551 d8933a28653242fc942087162ac6a4c9
 msgid "1.2 (2010-09-28)"
 msgstr ""
 
-#: ../../changelog.rst:533 eef62c1f5bff457eba9733aba004b18d
+#: ../../changelog.rst:553 66415309e0d64d06a490ecaef4efb36d
 msgid "Added a debug option"
 msgstr ""
 
-#: ../../changelog.rst:534 5c800901f23b4dceac320db21cb1e3db
+#: ../../changelog.rst:554 ceaef7c8b0fe4df79600738d71b8d094
 msgid "Added per-category feeds"
 msgstr ""
 
-#: ../../changelog.rst:535 d51b96b46a2b4dc09088ad32fbc61bbb
+#: ../../changelog.rst:555 6bac9fd70e104b28bfd06a936d71e32a
 msgid "Use filesystem to get dates if no metadata is provided"
 msgstr ""
 
-#: ../../changelog.rst:536 9b6420ecf5fb459d885d70db9190ad3b
+#: ../../changelog.rst:556 1f663ceee61b4c0595834cc72a9e3e7d
 msgid "Add Pygments support"
 msgstr ""
 
-#: ../../changelog.rst:539 5ccc5d9fa9424ec8896c57c3d62e1b6e
+#: ../../changelog.rst:559 1df408a7787943e68de9384710331200
 msgid "1.1 (2010-08-19)"
 msgstr ""
 
-#: ../../changelog.rst:541 a992372f04e345b5b37b6e20891b9b60
+#: ../../changelog.rst:561 7e611ea96d6c4b4db5751229abbfec38
 msgid "First working version"
 msgstr ""
diff --git a/docs/locale/zh_CN/LC_MESSAGES/faq.po b/docs/locale/zh_CN/LC_MESSAGES/faq.po
index 81712a82..f63513ea 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/faq.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/faq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-31 22:54+0800\n"
+"POT-Creation-Date: 2024-11-07 16:25+0800\n"
 "PO-Revision-Date: 2024-06-27 19:00+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
@@ -16,29 +16,29 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.15.0\n"
+"Generated-By: Babel 2.16.0\n"
 
-#: ../../faq.rst:2 87acb7c16d974b4eb060949b8ce40914
+#: ../../faq.rst:2 84467b3ab4b8411589855b3130e14406
 msgid "Frequently Asked Questions (FAQ)"
 msgstr "常见问题解答"
 
-#: ../../faq.rst:4 76aee892f7f14d0590db2d76c7cc0123
+#: ../../faq.rst:4 54c28b1640fd4939b5f196fa377292eb
 msgid "Here are some frequently asked questions about Pelican."
 msgstr "以下是一些Pelican的常见问题解答。"
 
-#: ../../faq.rst:7 c98549fdd5814984bfa3a6eaf4631d37
+#: ../../faq.rst:7 a95f8f3dcb6741949ba9d4761199dd0a
 msgid "What's the best way to communicate a problem, question, or suggestion?"
 msgstr "交流问题、疑问或提建议的最佳方式是什么？"
 
-#: ../../faq.rst:9 dbecb306adeb482ba3b9bd68483bc372
+#: ../../faq.rst:9 d93f8424407d42b2b3ce37b39baecd8a
 msgid "Please read our :doc:`feedback guidelines <contribute>`."
 msgstr "请参阅文档 :doc:`项目贡献与意见反馈 <contribute>` 。"
 
-#: ../../faq.rst:12 8fe91d51140946f1b2cb131d786c1814
+#: ../../faq.rst:12 9fea72b4670c4fe6a3d67e1ddb158f47
 msgid "How can I help?"
 msgstr "我可以帮上什么忙？"
 
-#: ../../faq.rst:14 d8477da414c446b3936e73931eb4f63a
+#: ../../faq.rst:14 3f4b88cf5b814e678a552c821ae4b450
 msgid ""
 "There are several ways to help out. First, you can communicate any "
 "Pelican suggestions or problems you might have via `Pelican Discussions "
@@ -50,7 +50,7 @@ msgstr ""
 "<https://github.com/getpelican/pelican/discussions>`_ "
 "中提出任何关于Pelican的建议或是问题。在提问或建议之前，请先查看已关闭或开放的issues中是否已有相关内容，以避免内容上的重复。"
 
-#: ../../faq.rst:20 95a29a97e08a452f89aa4eaad191b698
+#: ../../faq.rst:20 ca9e66682caf43a481ca91ecace43ed0
 msgid ""
 "If you want to contribute, please fork `the Git repository "
 "<https://github.com/getpelican/pelican/>`_, create a new feature branch, "
@@ -62,17 +62,17 @@ msgstr ""
 "，创建一个新的功能分支，并在其中进行修改，在修改完成后提出一个PR。项目组会尽快审核你的PR。关于此的更多内容，请参见 "
 ":doc:`项目贡献与意见反馈 <contribute>` 一节。"
 
-#: ../../faq.rst:26 bf7a6828eec74dc588c18e185bdd7090
+#: ../../faq.rst:26 f05e9b722b084a439cd6d99b3155910d
 msgid ""
 "You can also contribute by creating themes and improving the "
 "documentation."
 msgstr "你可以发起的贡献当然也包括创建主题和改进文档。"
 
-#: ../../faq.rst:29 2ce846241ce744fd81981a376d3f5fe2
+#: ../../faq.rst:29 d40c58aeafe54bdaa389c3c05a0fd721
 msgid "Is the Pelican settings file mandatory?"
 msgstr "Pelican配置文件是必要的吗？"
 
-#: ../../faq.rst:31 527720062339422095e2c95755af5584
+#: ../../faq.rst:31 96ef0c57471d4a669bd7f2a7f493c23b
 msgid ""
 "Configuration files are optional and are just an easy way to configure "
 "Pelican. For basic operations, it's possible to specify options while "
@@ -82,11 +82,11 @@ msgstr ""
 "配置文件是可选的，其本质是使您可以更方便地配置Pelican。对于一些基本的配置操作，完全可以在命令行中指定，调用 ``pelican "
 "--help`` 可以查看pelican命令的更多信息。"
 
-#: ../../faq.rst:36 d0ca19a2e40c4ecaa9ecba6cc677f142
+#: ../../faq.rst:36 e3752aec18514ce292ee4ebd0d95db37
 msgid "Changes to the settings file take no effect"
 msgstr "修改后的配置文件没有生效"
 
-#: ../../faq.rst:38 5b741cbb28854893818826c593f8e323
+#: ../../faq.rst:38 3f5c632fd20446cf8dd70a5eb88dbbcf
 msgid ""
 "When experimenting with different settings (especially the metadata ones)"
 " caching may interfere and the changes may not be visible. In such cases,"
@@ -96,11 +96,11 @@ msgstr ""
 "在尝试不同的配置时（尤其是尝试不同元数据时），缓存很可能会产生干扰，使得修改不可见。此时，确保配置了 ``LOAD_CONTENT_CACHE ="
 " False`` 或在命令行中加上 ``--ignore-cache`` 以禁用缓存。"
 
-#: ../../faq.rst:44 439f2221927b42f7a4c219ab1a76f849
+#: ../../faq.rst:44 067892211d0d4f4bae85d65a0132eb1d
 msgid "I'm creating my own theme. How do I use Pygments for syntax highlighting?"
 msgstr "在自己创建主题时，如何使用Pygments来调整语法高亮？"
 
-#: ../../faq.rst:46 3475c1550e584c84a118ac061461f9f6
+#: ../../faq.rst:46 b1e6ed1bea2e4b3cb3798131f30a828c
 msgid ""
 "Pygments adds some classes to the generated content. These classes are "
 "used by themes to style code syntax highlighting via CSS. Specifically, "
@@ -114,30 +114,49 @@ msgstr ""
 "``.highlight pre`` 类来自定义语法高亮的外观。在 `Pygments 项目的demo网站 "
 "<https://pygments.org/demo/>`_ 上可以预览能够渲染的代码类型。"
 
-#: ../../faq.rst:53 ecffb1f9501f46c88f799b79fc0ba343
+#: ../../faq.rst:53 5dccc8ae367545b08bdce61e008e0a20
 msgid ""
 "You can use the following example commands to generate a starting CSS "
 "file from a Pygments built-in style (in this case, \"monokai\") and then "
 "copy the generated CSS file to your new theme::"
 msgstr "你可以使用下面的命令来让Pygments使用内置风格（此处为“monokai”）生成一个初始CSS文件，然后将此文件拷贝到新主题中："
 
-#: ../../faq.rst:60 8fc71763c5c243339c9e737cc55b99da
+#: ../../faq.rst:60 027edae1ebdf4d52b59171a26915c1ac
 msgid "Don't forget to import your ``pygment.css`` file from your main CSS file."
 msgstr "不要忘了在你的CSS主文件中引入  ``pygment.css`` 文件。"
 
-#: ../../faq.rst:63 ad118f1f46db423fab19f570cd789798
+#: ../../faq.rst:63 164af3be4dce45879963c5d3ee0cd264
 msgid "How do I create my own theme?"
 msgstr "如何创建我自己的主题？"
 
-#: ../../faq.rst:65 1674585960e742cbade644b63d3bb32a
+#: ../../faq.rst:65 7b1db6528b0a4735894868a229a5969d
 msgid "Please refer to :ref:`theming-pelican`."
 msgstr "请参阅 :ref:`theming-pelican` 。"
 
-#: ../../faq.rst:68 b06c6a8df1634d20b988515af6536e2c
+#: ../../faq.rst:68 b8e21f837e0744c49cfe8f0cb3a1d5ee
+msgid "Can I override individual templates without forking the whole theme?"
+msgstr "我只需要覆盖主题中单独的几个模板文件，可不可以不fork整个主题？"
+
+#: ../../faq.rst:70 70fd7b5c55c246a6a25b20304bfdb616
+msgid ""
+"Yes, you can override existing templates of the theme that you are using,"
+" or add new templates, via the ``THEME_TEMPLATES_OVERRIDES`` variable. "
+"For example, to override the page template, you can define the location "
+"for your templates like this::"
+msgstr "当然可以，覆盖部分模板文件或是添加一些模板文件都是可以的，使用 ``THEME_TEMPLATES_OVERRIDES`` 变量即可。"
+"例如，若需要覆盖page的模板，可以向这样定义你自己的模板文件位置："
+
+#: ../../faq.rst:77 a96870f0cad74996bec2469ea0c2e9e1
+msgid ""
+"You can then define a custom template in ``templates/page.html``. See "
+":ref:`settings/themes` for details."
+msgstr "自定义的模板可以为 ``templates/page.html`` 。详情请参看 :ref:`settings/themes` 。"
+
+#: ../../faq.rst:81 b832cd952cf44a0097f383825f0f295f
 msgid "I want to use Markdown, but I got an error."
 msgstr "我想要使用Markdown，但是出错了。"
 
-#: ../../faq.rst:70 c0a89314dbdf4368b2e32d781c0ae95b
+#: ../../faq.rst:83 32d9dbde7029412d852ab8e710112573
 msgid ""
 "If you try to generate Markdown content without first installing the "
 "Markdown library, you may see a message that says ``No valid files found "
@@ -151,77 +170,79 @@ msgstr ""
 "。虽然Markdown并不是必需依赖，但如果你写的内容中含有Markdown格式，就需要安装Markdown库了。输入下面的命令以安装Markdown库，如果需要权限，请在前面添加"
 " ``sudo`` ："
 
-#: ../../faq.rst:80 a4c93b71eb914652b3f05357067f87b3
+#: ../../faq.rst:93 46728a367ffe47d9afeb7608e9c0db5f
 msgid "Can I use arbitrary metadata in my templates?"
 msgstr "在模板中可以使用任意元数据吗？"
 
-#: ../../faq.rst:82 6ac1579e5d8842f5bf97b87745848c6a
+#: ../../faq.rst:95 9b7fbafc6d29429a88a079bfb74e3af5
 msgid ""
 "Yes. For example, to include a modified date in a Markdown post, one "
 "could include the following at the top of the article::"
 msgstr "当然可以。例如，可以在Markdown帖子中包含一个“修改日期”，加在文章开头即可："
 
-#: ../../faq.rst:87 d1ad8fa8e07c4500ab754962064749a8
+#: ../../faq.rst:100 ce62442a4c9d4347bd6ae8a59476fcee
 msgid ""
 "For reStructuredText, this metadata should of course be prefixed with a "
 "colon::"
 msgstr "对于reStructuredText，此元数据也应当以冒号为前缀："
 
-#: ../../faq.rst:91 e3c9814b5b3849a7957f964565038e45
+#: ../../faq.rst:104 bf869a6da43e448a9cc512843aa4a183
 msgid ""
 "This metadata can then be accessed in templates such as ``article.html`` "
 "via::"
 msgstr "此元数据可以在模板中获取到，例如在 ``article.html`` 中，可以像这样获取："
 
-#: ../../faq.rst:97 11d953b5718c4baeb7f7fbbb9538c763
+#: ../../faq.rst:110 b9c9a648b30942b996b124af9fd5a84c
 msgid ""
 "If you want to include metadata in templates outside the article context "
 "(e.g., ``base.html``), the ``if`` statement should instead be::"
 msgstr "如果您想在其他模板（例如 ``base.html`` ）中获取此元数据，则 ``if`` 语句应改为："
 
-#: ../../faq.rst:103 99ca0aeea6d14c159cf1f1b8d9cf016d
+#: ../../faq.rst:116 b78a678a165d40f4823fac2b19bcafc1
 msgid ""
 "How do I make my output folder structure identical to my content "
 "hierarchy?"
 msgstr "如何使得输出目录的结构和content目录的结构保持一致？"
 
-#: ../../faq.rst:105 e97223e6c7c94c08a1d42f783fd67f7e
+#: ../../faq.rst:118 851d1019c070482991667cc024063d29
 msgid "Try these settings::"
 msgstr "可以尝试如下配置："
 
-#: ../../faq.rst:112 d35f11a227ba421596458ea8f26ecde0
+#: ../../faq.rst:125 5195876e3f364a838d72b16c568263bc
 msgid "How do I assign custom templates on a per-page basis?"
 msgstr "如何为某个页面指定某个模板？"
 
-#: ../../faq.rst:114 287bac0946dc47feab068bdb76d0bc2e
+#: ../../faq.rst:127 2ddd3cf1fbf048b1819bcfc9b3691a12
 msgid ""
 "It's as simple as adding an extra line of metadata to any page or article"
 " that you want to have its own template. For example, this is how it "
 "would be handled for content in reST format::"
 msgstr "这非常简单，在任何页面或者文章中，都可以通过多添加一行元数据来指定特定模板。例如，在reST中，使用："
 
-#: ../../faq.rst:120 b845784299bf47629e616505000724c1
+#: ../../faq.rst:133 6f5eb40b4a5e4f83ab9d1cb48fefad57
 msgid "For content in Markdown format::"
 msgstr "对于Markdown，则使用："
 
-#: ../../faq.rst:124 fa734dbb540e4cda8a5be5fb1b2da124
+#: ../../faq.rst:137 2e28d1bf074c437eb5017bf6f345bf71
 msgid ""
 "Then just make sure your theme contains the relevant template file (e.g. "
-"``template_name.html``)."
-msgstr "确保对应的模板文件在主题中存在即可（例如 ``template_name.html`` ）。"
+"``template_name.html``). If you just want to add a new custom template to"
+" an existing theme, you can also provide it in a directory specified by "
+"``THEME_TEMPLATES_OVERRIDES`` (see :ref:`settings/themes`)."
+msgstr ""
 
-#: ../../faq.rst:128 bdee9be4397f4839855295ee1a0fdd12
+#: ../../faq.rst:142 675e77f99f3c42bb8715c84a97c7a064
 msgid "How can I override the generated URL of a specific page or article?"
 msgstr "如何重写某一个页面或文章生成的URL？"
 
-#: ../../faq.rst:130 ed91b5bdcbe24473a6fed738784311b8
+#: ../../faq.rst:144 7e518b99b29d4787addc732d57e94ed1
 msgid ""
 "Include ``url`` and ``save_as`` metadata in any pages or articles that "
 "you want to override the generated URL. Here is an example page in reST "
 "format::"
 msgstr "在任意页面或文章中都可以添加 ``url`` 和 ``save_as`` 元数据，这样就可以重写URL了。下面以reST格式为例："
 
-#: ../../faq.rst:139 5aa733d8d3bd4d86920e7e142715b1f4
+#: ../../faq.rst:153 903306ecaed3483591b4ed2dcba3d183
 msgid ""
 "With this metadata, the page will be written to "
 "``override/url/index.html`` and Pelican will use the URL "
@@ -230,18 +251,18 @@ msgstr ""
 "有了这样的元数据，此页面会保存为 ``override/url/index.html`` ，Pelican会将 ``override/url/``"
 " 作为链接到此页面的URL。"
 
-#: ../../faq.rst:143 04d9890aa34d4c1e86bc7a49cd64938a
+#: ../../faq.rst:157 d80d84fcb6844e25a8452e29c4113181
 msgid "How can I use a static page as my home page?"
 msgstr "如何使用一个静态页面作为主页？"
 
-#: ../../faq.rst:145 d3e8a4e2d453446f9037fa46e6775080
+#: ../../faq.rst:159 e17a2e2dd9014109888bab9286ee607c
 msgid ""
 "The override feature mentioned above can be used to specify a static page"
 " as your home page. The following Markdown example could be stored in "
 "``content/pages/home.md``::"
 msgstr "上一个问题中提到的特性可以用于实现此需求。下面例子中的Markdown文件保存为 ``content/pages/home.md`` ："
 
-#: ../../faq.rst:155 739da75e7ce946af99c9f577e8a284ff
+#: ../../faq.rst:169 b99ba0ca8656416cbdc38f3fa263b7eb
 msgid ""
 "If the original blog index is still wanted, it can then be saved in a "
 "different location by setting ``INDEX_SAVE_AS = 'blog_index.html'`` for "
@@ -250,11 +271,11 @@ msgstr ""
 "如果仍需要原来的博客主页（即 ``'index'`` 直接模板），可以通过设置 ``INDEX_SAVE_AS = "
 "'blog_index.html'`` 将其存储在其他位置。"
 
-#: ../../faq.rst:160 5224f09821d24e4a8db6870da1266a20
+#: ../../faq.rst:174 fca4725a57dd451fb3b0fb9df78f69b5
 msgid "What if I want to disable feed generation?"
 msgstr "可以禁用订阅源生成吗？"
 
-#: ../../faq.rst:162 8f014ffab3c44b0ebf2b0d9872bfbfa7
+#: ../../faq.rst:176 e9c08140e2ed44f189a7a156db027a3e
 msgid ""
 "To disable feed generation, all feed settings should be set to ``None``. "
 "All but three feed settings already default to ``None``, so if you want "
@@ -264,19 +285,19 @@ msgstr ""
 "要禁用订阅源，所有订阅源相关的配置都应被设为 ``None`` 。其中有三项设置默认为 ``None`` "
 "，因此如果要彻底不生成订阅源，你只需要指定下面这些设置："
 
-#: ../../faq.rst:172 9ab29ccca83c4ecfabcb3ad4dd17c751
+#: ../../faq.rst:186 7820a481af4c4f44a40fb3ae80768a1d
 msgid ""
 "The word ``None`` should not be surrounded by quotes. Please note that "
 "``None`` and ``''`` are not the same thing."
 msgstr "``None`` 两侧不需要加引号。请注意 ``None`` 和 ``''`` 不是同一个东西。"
 
-#: ../../faq.rst:176 fd8cbe4962d145ccadfd480419dbea9e
+#: ../../faq.rst:190 4fa2ffbf1c274ec396a0d756762c260d
 msgid ""
 "I'm getting a warning about feeds generated without SITEURL being set "
 "properly"
 msgstr "Pelican警告说由于SITEURL设置不正确，无法正常生成订阅源"
 
-#: ../../faq.rst:178 e3135e5903ec422f8d7895866ca6f365
+#: ../../faq.rst:192 8d52f14f6b03476897dfb15c188a961a
 msgid ""
 "`RSS and Atom feeds require all URL links to be absolute "
 "<https://validator.w3.org/feed/docs/rss2.html#comments>`_. In order to "
@@ -287,17 +308,17 @@ msgstr ""
 "<https://validator.w3.org/feed/docs/rss2.html#comments>`_ "
 "。为了使得Pelican能正确生成链接，你需要将站点的 ``SITEURL`` 设置为完整路径。"
 
-#: ../../faq.rst:183 4f2cd929dda7464cbd577d1249969920
+#: ../../faq.rst:197 1412ceb735d44a30b58db3241248e7ec
 msgid ""
 "Feeds are still generated when this warning is displayed, but links "
 "within may be malformed and thus the feed may not validate."
 msgstr "虽然Pelican提出了警告，但是仍会生成订阅源，但其中的链接可能是无效的，这会导致订阅源不可用。"
 
-#: ../../faq.rst:187 a9f3465fda8c4a0d9395b2d6d9d5478f
+#: ../../faq.rst:201 20cadccc527e4ebda08eac9ed34f5055
 msgid "Can I force Atom feeds to show only summaries instead of article content?"
 msgstr "可以让Atom订阅源只显示摘要，不显示文章内容吗？"
 
-#: ../../faq.rst:189 baf140533501453aa8caeddfc276d8fb
+#: ../../faq.rst:203 9c45ba2ec5c6402e86e89661b943d1ad
 msgid ""
 "Instead of having to open a separate browser window to read articles, the"
 " overwhelming majority of folks who use feed readers prefer to read "
@@ -314,11 +335,11 @@ msgstr ""
 " ``content`` "
 "字段，因此Pelican在发布RSS时默认只包含摘要（当然也可以设置为包含文章内容）。Pelican在订阅源生成上的如此行为就可以让用户自行选择订阅类型：包含了完整内容的Atom或是只包含摘要的RSS。"
 
-#: ../../faq.rst:200 850ac093f2764547a7df74d5d055cbd4
+#: ../../faq.rst:214 bf0d4ca837f74d9ab6618db6306c6a70
 msgid "Is Pelican only suitable for blogs?"
 msgstr "Pelican只适合用于博客吗？"
 
-#: ../../faq.rst:202 1fb5d92096b242d09da5e0e490b34685
+#: ../../faq.rst:216 49697f375cfc49b08f5d0c2297d15028
 msgid ""
 "No. Pelican can be easily configured to create and maintain any type of "
 "static site. This may require a little customization of your theme and "
@@ -328,13 +349,13 @@ msgid ""
 "tag-related pages via::"
 msgstr "不是的。Pelican可以方便地用于创建维护任何静态站点，为此你需要对主题和配置做一些定制。例如，如果要为你的产品构建一个宣传网站，即不需要使用标签特性，从主题中移除与标签相关的HTML代码即可。另外，还可以通过下面的设置来禁用标签相关页面的生成："
 
-#: ../../faq.rst:212 5452959b3b694cbc89bb8e91bfbef840
+#: ../../faq.rst:226 0a59dd7209554237912579b362d07788
 msgid ""
 "Why does Pelican always write all HTML files even with content caching "
 "enabled?"
 msgstr "启用内容缓存后，为什么Pelican仍会每次都写入所有HTML文件？"
 
-#: ../../faq.rst:214 b27b4b7256f749f1bc5970b95fa742ab
+#: ../../faq.rst:228 6291b82d02fc4450a79d1200b5d04f62
 msgid ""
 "In order to reliably determine whether the HTML output is different "
 "before writing it, a large part of the generation environment including "
@@ -347,7 +368,7 @@ msgid ""
 "reliable."
 msgstr "为了确定HTML输出确实和之前的不同，模板上下文、插件等很多生成环境都需要保存并比较某种哈希值（对于不可哈希的内容类型还需要进行一些额外处理）。另外，由于插件、分页等内容的存在，输出的HTML很可能会与之前不同。因此，考虑到处理时间和存储空间，每次都重新写入全部HTML会更快更可靠。"
 
-#: ../../faq.rst:223 dcb5b1cf0e1b413bb7c04f6deb4ad5d7
+#: ../../faq.rst:237 5cc5e1361f914c92b0670030f0c83f5d
 msgid ""
 "However, this means that the modification time of the files changes every"
 " time, so a ``rsync`` based upload will transfer them even if their "
@@ -359,11 +380,11 @@ msgstr ""
 "上传时会把没有变化的内容也进行上传。一个简便的解决方法就是给 ``rsync`` 加上 ``--checksum`` "
 "选项，这会比Pelican在生成时进行校验更快。"
 
-#: ../../faq.rst:230 628a1180f3fd4c0b8301b33e0728d2c2
+#: ../../faq.rst:244 b24c40be89b94f3b980cbbda38d46115
 msgid "How to process only a subset of all articles?"
 msgstr "如何只处理一部分文章？"
 
-#: ../../faq.rst:232 c2bfe768775342bb8386255ea1bbbe4e
+#: ../../faq.rst:246 fa34a90481f44ace83ee16401543ce09
 msgid ""
 "It is often useful to process only e.g. 10 articles for debugging "
 "purposes. This can be achieved by explicitly specifying only the "
@@ -374,11 +395,11 @@ msgstr ""
 "简便起见，在调试时可能只需要处理几篇文章。可以直接在配置项 ``ARTICLE_PATHS`` 中添加需要处理文章的文件名。可以通过像 ``cd "
 "content; find -name '*.md' | head -n 10`` 这样的命令获取文章文件名的列表。"
 
-#: ../../faq.rst:238 72d30cb7a6e348c483cba0c6b6de8d3a
+#: ../../faq.rst:252 0fa566e3aa084cb9b04e0cee32684222
 msgid "My tag cloud is missing/broken since I upgraded Pelican"
 msgstr "在升级Pelican后，标签云消失或不可用了"
 
-#: ../../faq.rst:240 7d07dcddab5d42d1aab6a8dbd27ce36c
+#: ../../faq.rst:254 0bd1304a12c24f048b227c68391b148c
 msgid ""
 "In an ongoing effort to streamline Pelican, tag cloud generation has been"
 " moved out of Pelican core and into a separate `plugin "
@@ -389,11 +410,11 @@ msgstr ""
 "<https://github.com/pelican-plugins/tag-cloud>`_ 中。查看 :ref:`plugins` "
 "文档获取更多关于Pelican插件系统的信息。"
 
-#: ../../faq.rst:246 51c727bc21f946b8915f958312369e0f
+#: ../../faq.rst:260 1833dfba94c74f4bb9e9f0a112ed3e0f
 msgid "Since I upgraded Pelican my pages are no longer rendered"
 msgstr "升级Pelican后，一些页面没有被渲染"
 
-#: ../../faq.rst:248 4a0d962bc2d844cbab3d0b3e7f6f7bba
+#: ../../faq.rst:262 576e5c2338ba4c43a51bb562301ad0c2
 msgid ""
 "Pages were available to themes as lowercase ``pages`` and uppercase "
 "``PAGES``. To bring this inline with the :ref:`templates-variables` "
@@ -405,15 +426,15 @@ msgstr ""
 "variables` 一节中的内容保持一致，大写的 ``PAGES`` 被删除了。只要将主题中的 ``PAGES`` 替换为 ``pages`` "
 "，问题即可解决。例如将原先的："
 
-#: ../../faq.rst:255 6167ad6b52db43d384247747db1884ca
+#: ../../faq.rst:269 355512b9f6b34ece9b6baed128b2ca4d
 msgid "with something like::"
 msgstr "替换为："
 
-#: ../../faq.rst:260 a7a04eb9e8e549fa8a2a72db3f35b532
+#: ../../faq.rst:274 99ef769943fe41c4a37ca951e905b2ba
 msgid "How can I stop Pelican from trying to parse my static files as content?"
 msgstr "如何避免让Pelican将我的静态文件解析为内容文件？（译者注：例如要将一个HTML文件作为静态文件）？"
 
-#: ../../faq.rst:262 6baaf265738d4acaa26f7829c64a0ac5
+#: ../../faq.rst:276 4efb20c5b82d41afb07151599fa189dd
 msgid ""
 "Pelican's article and page generators run before it's static generator. "
 "That means if you use a setup similar to the default configuration, where"
@@ -426,7 +447,7 @@ msgstr ""
 "配置项中，所有以有效内容文件后缀结尾的文件（ ``.html`` 、 ``.rst`` 、 ``.md`` "
 "等）都会被视为文章或者页面，而不是静态文件。"
 
-#: ../../faq.rst:268 e4591dd94ddd4199900b9a451d12929e
+#: ../../faq.rst:282 d959eb6a67fe440caa70105e1692bf93
 msgid ""
 "To circumvent this issue either use the appropriate ``*_EXCLUDES`` "
 "setting or disable the offending reader via ``READERS`` if you don't need"
@@ -435,11 +456,11 @@ msgstr ""
 "为了避免这个问题，使用合适的 ``*_EXCLUDES`` 配置，在必要时还可以通过 ``READERS`` "
 "配置项来直接禁用产生问题的reader。"
 
-#: ../../faq.rst:272 ca927fe2be10411ab365bcc3e4fa4dbd
+#: ../../faq.rst:286 5e64dc4b6fad4e7ea07278f5a2529e89
 msgid "Why is [arbitrary Markdown syntax] not supported?"
 msgstr "为什么不是所有的Markdown语法都支持？"
 
-#: ../../faq.rst:274 5c9cc929a6bf4f1db9d4eed5f37fc0af
+#: ../../faq.rst:288 6872a70ec1434c41a78d465271761c69
 msgid ""
 "Pelican does not directly handle Markdown processing and instead "
 "delegates that task to the Python-Markdown_ project, the core of which "
@@ -455,3 +476,9 @@ msgstr ""
 "项目，此项目的核心有意只遵循原始的Markdown语法规则，而不服从之后传播开的大量Markdown风格。另外， Python-Markdown_"
 " 是相当模块化的，你想要使用的语法可能已经有现成的 `Markdown扩展`_ "
 "进行了实现。或者，也有人创建了支持Markdown变体的Pelican插件，如果你想要用某种Markdown变体，可以在这些地方寻找支持。"
+
+#~ msgid ""
+#~ "Then just make sure your theme "
+#~ "contains the relevant template file "
+#~ "(e.g. ``template_name.html``)."
+#~ msgstr "确保对应的模板文件在主题中存在即可（例如 ``template_name.html`` ）。"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/tips.po b/docs/locale/zh_CN/LC_MESSAGES/tips.po
index 4ecdcb1b..a65edf13 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/tips.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/tips.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-25 20:36+0800\n"
+"POT-Creation-Date: 2024-11-07 16:25+0800\n"
 "PO-Revision-Date: 2024-06-27 19:00+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
@@ -16,22 +16,22 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.15.0\n"
+"Generated-By: Babel 2.16.0\n"
 
-#: ../../tips.rst:2 415f61a654104cf4826423e3aa1d3807
+#: ../../tips.rst:2 9c4618aaecd44b0d93537cb760e227fa
 msgid "Tips"
 msgstr "小技巧"
 
-#: ../../tips.rst:4 1bc50144d85845f3a7f21f9ef87bba44
+#: ../../tips.rst:4 f49ab5e1ef034ca29140bac3832e8e1c
 msgid "Here are some tips about Pelican that you might find useful."
 msgstr "以下是一些实用的小技巧。"
 
-#: ../../tips.rst:7 ../../tips.rst:264 d9115f4b162d46e6aa89d56309c1ec41
-#: e693dc009e5c466d99655b705223f300
+#: ../../tips.rst:7 ../../tips.rst:309 95bea35d0347495bb551fe9486bcd29d
+#: b64b7ed713b64f588ea7488c6d0b0441
 msgid "Custom 404 Pages"
 msgstr "自定义404页面"
 
-#: ../../tips.rst:9 5c7cd70793f44d3c9fcf63779755d62b
+#: ../../tips.rst:9 d59dc30de5954aa1abc7c46fbac596c6
 msgid ""
 "When a browser requests a resource that the web server cannot find, the "
 "web server usually displays a generic \"File not found\" (404) error page"
@@ -40,36 +40,34 @@ msgid ""
 "article), such as this Markdown-formatted example stored in "
 "``content/pages/404.md``::"
 msgstr ""
-"当浏览器请求的资源无法在服务器中找到时，web服务器常常会显示一个通用的“File not "
-"found 404”的错误页面，这可能会不太美观。为了能使用一个与站点主题相匹配的404页面"
-"（注意是页面而 **不是** 文章），例如下面这个Markdown格式的例子，将此文件存为了 "
-"``content/pages/404.md`` ："
+"当浏览器请求的资源无法在服务器中找到时，web服务器常常会显示一个通用的“File not found "
+"404”的错误页面，这可能会不太美观。为了能使用一个与站点主题相匹配的404页面（注意是页面而 **不是** "
+"文章），例如下面这个Markdown格式的例子，将此文件存为了 ``content/pages/404.md`` ："
 
-#: ../../tips.rst:22 cab28bb6b2a548a09f8cc6e4778f1a78
+#: ../../tips.rst:22 416f9b3eeaac4af8bdc9f32b7cdcba39
 msgid ""
 "The next step is to configure your web server to display this custom page"
 " instead of its default 404 page. For Nginx, add the following to your "
 "configuration file's ``location`` block::"
 msgstr ""
-"接下来就是要配置web服务器，使其显示此自定义页面而不是默认的404页面。例如对于Nginx，"
-"在配置文件的 ``location`` 块中添加下面的命令："
+"接下来就是要配置web服务器，使其显示此自定义页面而不是默认的404页面。例如对于Nginx，在配置文件的 ``location`` "
+"块中添加下面的命令："
 
-#: ../../tips.rst:28 f8acbc4d00de4cfb8dfd9358a8168c14
+#: ../../tips.rst:28 5d52fbcc9d9d4603b3f9d97360face10
 msgid "For Apache::"
 msgstr "对于Apache："
 
-#: ../../tips.rst:32 3701d02f6dba4936a86a9fbb226261e8
+#: ../../tips.rst:32 5413c6bcff6a41688ffcede94b9955e4
 msgid ""
 "For Amazon S3, first navigate to the ``Static Site Hosting`` menu in the "
 "bucket settings on your AWS console. From there::"
-msgstr ""
-"对于Amazon S3实例，先在控制台的设置中找到  ``Static Site Hosting`` ，并添加："
+msgstr "对于Amazon S3实例，先在控制台的设置中找到  ``Static Site Hosting`` ，并添加："
 
-#: ../../tips.rst:38 4d111f7cca2e49828e343ff889847358
+#: ../../tips.rst:38 9b02aa39367a4c33918bddef02d1788d
 msgid "Publishing to GitHub Pages"
 msgstr "发布到GitHub Pages"
 
-#: ../../tips.rst:40 f7fa83b00f6d4dd58d6f119725474538
+#: ../../tips.rst:40 ca3f1deb69a04d40a89576f580d63781
 msgid ""
 "If you use `GitHub <https://github.com/>`_ for your Pelican site you can "
 "publish your site to `GitHub Pages <https://pages.github.com/>`_ for "
@@ -80,14 +78,14 @@ msgid ""
 "<https://docs.github.com/en/pages/configuring-a-custom-domain-for-your-"
 "github-pages-site>`_."
 msgstr ""
-"如果将Pelican站点放在了 `GitHub <https://github.com/>`_ 上，那么你就可以将站点"
-"免费发布在 `GitHub Pages <https://pages.github.com/>`_ 上。如果是用户或组织的"
-"站点，发布的地址为 ``https://<username>.github.io`` ；如果是某个项目的站点，"
-"发布的地址则为 ``https://<username>.github.io/<repository>`` 。当然也可以 "
-"`在GitHub Pages上使用自定义域名 <https://docs.github.com/en/pages/configuring-a-custom-"
+"如果将Pelican站点放在了 `GitHub <https://github.com/>`_ 上，那么你就可以将站点免费发布在 `GitHub "
+"Pages <https://pages.github.com/>`_ 上。如果是用户或组织的站点，发布的地址为 "
+"``https://<username>.github.io`` ；如果是某个项目的站点，发布的地址则为 "
+"``https://<username>.github.io/<repository>`` 。当然也可以 `在GitHub "
+"Pages上使用自定义域名 <https://docs.github.com/en/pages/configuring-a-custom-"
 "domain-for-your-github-pages-site>`_ 。"
 
-#: ../../tips.rst:46 a3167f2a605d44288b83d66f052e8cdd
+#: ../../tips.rst:46 5962c3cb4a0b41289d6b08b9edd2fdee
 msgid ""
 "There are `two ways to publish a site to GitHub Pages "
 "<https://docs.github.com/en/pages/getting-started-with-github-"
@@ -97,16 +95,16 @@ msgstr ""
 "/getting-started-with-github-pages/configuring-a-publishing-source-for-"
 "your-github-pages-site>`_ ："
 
-#: ../../tips.rst:48 b2f270c5a15d4e3e92331c3c37db25dd
+#: ../../tips.rst:48 ad6f071b3cdc4529a41776f799347da0
 msgid ""
 "**Publishing from a branch:** run ``pelican`` locally and push the output"
 " directory to a special branch of your GitHub repo. GitHub will then "
 "publish the contents of this branch to your GitHub Pages site."
 msgstr ""
-"**从某一分支发布：** 在本地运行 ``pelican`` 后将输出文件夹push到GitHub仓库的"
-"某一分支。GitHub就会将该分支的内容发布到GitHub Pages上。"
+"**从某一分支发布：** 在本地运行 ``pelican`` "
+"后将输出文件夹push到GitHub仓库的某一分支。GitHub就会将该分支的内容发布到GitHub Pages上。"
 
-#: ../../tips.rst:51 4ffdb550d8bf468dbfe4d32dfcda21cd
+#: ../../tips.rst:51 6237e147cf4142d9b172588964ec00d2
 msgid ""
 "**Publishing with a custom GitHub Actions workflow:** just push the "
 "source files of your Pelican site to your GitHub repo's default branch "
@@ -116,25 +114,24 @@ msgid ""
 "your site's source files using GitHub's web interface and any changes "
 "that you commit will be published."
 msgstr ""
-"**从自定义GitHub Actions工作流发布：** 将内容源文件推送到GitHub仓库的默认分支，"
-"然后在GitHub Actions工作流中执行 ``pelican`` 以生成输出文件夹，最后将其发布到你"
-"的GitHub Pages站点。此种方法下就无需在本地执行 ``pelican`` 命令了。甚至可以直接"
-"在GitHub的网页中在线修改站点内容源文件。"
+"**从自定义GitHub Actions工作流发布：** 将内容源文件推送到GitHub仓库的默认分支，然后在GitHub "
+"Actions工作流中执行 ``pelican`` 以生成输出文件夹，最后将其发布到你的GitHub Pages站点。此种方法下就无需在本地执行 "
+"``pelican`` 命令了。甚至可以直接在GitHub的网页中在线修改站点内容源文件。"
 
-#: ../../tips.rst:60 0e9c34ce1a5948098a5d0812eb8ac1b4
+#: ../../tips.rst:60 f2655b8ab23147e58fd68e2385a7624a
 msgid "Publishing a Project Site to GitHub Pages from a Branch"
 msgstr "从某一分支发布项目站点到GitHub Pages"
 
-#: ../../tips.rst:62 5190ebea8d8b4542ac9ecb98c297594e
+#: ../../tips.rst:62 1a156c5a8019400d86a33ce306b521ac
 msgid ""
 "To publish a Pelican site as a Project Page you need to *push* the "
 "content of the ``output`` dir generated by Pelican to a repository's "
 "``gh-pages`` branch on GitHub."
 msgstr ""
-"要将Pelican站点发布为项目页面，你需要将Pelican生成的 ``output`` 目录 "
-"**push** 到GitHub仓库的 ``gh-pages`` 分支。"
+"要将Pelican站点发布为项目页面，你需要将Pelican生成的 ``output`` 目录 **push** 到GitHub仓库的 ``gh-"
+"pages`` 分支。"
 
-#: ../../tips.rst:66 e12298010e9745b59d60d31ae909fd4c
+#: ../../tips.rst:66 22caeeba90b24dbe9f0305370de074fc
 msgid ""
 "The excellent `ghp-import <https://github.com/davisp/ghp-import>`_, which"
 " can be installed with ``pip``, makes this process really easy."
@@ -142,15 +139,14 @@ msgstr ""
 "可通过 ``pip`` 安装的 `ghp-import <https://github.com/davisp/ghp-import>`_ "
 "使这一步变得非常简单。"
 
-#: ../../tips.rst:69 cd5a5847355846dd81a0ad37858358f2
+#: ../../tips.rst:69 6ea08af050644b58ae5255dafb4f4d8b
 msgid ""
 "For example, if the source of your Pelican site is contained in a GitHub "
 "repository, and if you want to publish that Pelican site in the form of "
 "Project Pages to this repository, you can then use the following::"
-msgstr ""
-"例如，当Pelican站点的源文件已经包含在GitHub仓库中时，可以将其作为此仓库的项目页面："
+msgstr "例如，当Pelican站点的源文件已经包含在GitHub仓库中时，可以将其作为此仓库的项目页面："
 
-#: ../../tips.rst:77 18d3e7316a5a48acb337c3c67e94084c
+#: ../../tips.rst:77 355b81e8a2194cf9b91bee0f4ee6dca9
 msgid ""
 "The ``ghp-import output`` command updates the local ``gh-pages`` branch "
 "with the content of the ``output`` directory (creating the branch if it "
@@ -158,37 +154,36 @@ msgid ""
 "the remote ``gh-pages`` branch, effectively publishing the Pelican site."
 msgstr ""
 "``ghp-import output`` 命令会用 ``output`` 目录下的内容更新本地的 ``gh-pages`` "
-"分支（如果此分支不存在则会先创建）。接着再用  ``git push origin gh-pages`` "
-"命令更新远程分支 ``gh-pages`` ，如此就能够发布Pelican站点了。"
+"分支（如果此分支不存在则会先创建）。接着再用  ``git push origin gh-pages`` 命令更新远程分支 ``gh-"
+"pages`` ，如此就能够发布Pelican站点了。"
 
-#: ../../tips.rst:84 cc8b9d96da674850b39373728000f722
+#: ../../tips.rst:84 8a3fd725eba44fa99541376722601cce
 msgid ""
 "The ``github`` target of the Makefile (and the ``gh_pages`` task of "
 "``tasks.py``) created by the ``pelican-quickstart`` command publishes the"
 " Pelican site as Project Pages, as described above."
 msgstr ""
-"``pelican-quickstart`` 在Makefile文件中所生成的 ``github`` 目标（以及为 "
-"``gh_pages`` 任务生成的 ``tasks.py`` ）使得Pelican站点能像上面描述的那样被发布"
-"为项目页面。"
+"``pelican-quickstart`` 在Makefile文件中所生成的 ``github`` 目标（以及为 ``gh_pages`` "
+"任务生成的 ``tasks.py`` ）使得Pelican站点能像上面描述的那样被发布为项目页面。"
 
-#: ../../tips.rst:89 41c7b129fd334796848c4d75404dbe81
+#: ../../tips.rst:89 e8ebf23099ed45e7a65d23b9a7e4ccbd
 msgid "Publishing a User Site to GitHub Pages from a Branch"
 msgstr "从某一分支发布用户站点到GitHub Pages"
 
-#: ../../tips.rst:91 b379f950927d484ba91fbe649a248cfe
+#: ../../tips.rst:91 7dc8ae1992b7411d9d6db7cc4a0127cb
 msgid ""
 "To publish a Pelican site in the form of User Pages, you need to *push* "
 "the content of the ``output`` dir generated by Pelican to the ``main`` "
 "branch of your ``<username>.github.io`` repository on GitHub."
 msgstr ""
-"要以用户页面形式发布Pelican站点，你需要将Pelican生成的 ``output`` 目录内容 "
-"**push** 到 ``<username>.github.io`` 仓库的 ``master`` 分支上。"
+"要以用户页面形式发布Pelican站点，你需要将Pelican生成的 ``output`` 目录内容 **push** 到 "
+"``<username>.github.io`` 仓库的 ``master`` 分支上。"
 
-#: ../../tips.rst:95 6d1bd6c0ff25494e997c4efbdcd1d861
+#: ../../tips.rst:95 da706340ef5f4d18bfb183596a4196c9
 msgid "Again, you can take advantage of ``ghp-import``::"
 msgstr "同样的，此处也可以使用 ``ghp-import`` ："
 
-#: ../../tips.rst:101 45fb7ba534af4f7d828e1630e591c02a
+#: ../../tips.rst:101 61aa6f0d9fdf407682d3f781ae5475c6
 msgid ""
 "The ``git push`` command pushes the local ``gh-pages`` branch (freshly "
 "updated by the ``ghp-import`` command) to the ``elemoine.github.io`` "
@@ -197,21 +192,19 @@ msgstr ""
 "``git push`` 命令将本地的 ``gh-pages`` 分支（此分支在刚刚通过 ``ghp-import`` "
 "命令进行了更新）push到了GitHub仓库 ``elemoine.github.io`` 的 ``master`` 分支。"
 
-#: ../../tips.rst:107 b105e7dd1aef441896c0f59166808113
+#: ../../tips.rst:107 f74afbf668a1472d901fe0a16472ab98
 msgid ""
 "To publish your Pelican site as User Pages, feel free to adjust the "
 "``github`` target of the Makefile."
-msgstr ""
-"要将Pelican站点发布为用户页面，可以根据需要修改Makefile中的 ``github`` 目标。"
+msgstr "要将Pelican站点发布为用户页面，可以根据需要修改Makefile中的 ``github`` 目标。"
 
-#: ../../tips.rst:110 87a89a932eec40e8bfdd5c756f4d54fc
+#: ../../tips.rst:110 d69dcdb58a4b4b38aa8b8bf8e4fd733a
 msgid ""
 "Another option for publishing to User Pages is to generate the output "
 "files in the root directory of the project."
-msgstr ""
-"发布用户页面的另一种方法就是将输出文件生成在项目的根目录下。"
+msgstr "发布用户页面的另一种方法就是将输出文件生成在项目的根目录下。"
 
-#: ../../tips.rst:113 dab76a45349c432cb4b763484661ec2c
+#: ../../tips.rst:113 4991892f24df40b982faf01ddb292175
 msgid ""
 "For example, your main project folder is ``<username>.github.io`` and you"
 " can create the Pelican project in a subdirectory called ``Pelican``. "
@@ -220,22 +213,21 @@ msgstr ""
 "例如，项目的主文件夹是 ``<username>.github.io`` ，你可以在子目录 ``Pelican`` "
 "中创建一个Pelican项目。然后你可以在这个 ``Pelican`` 文件夹中执行下面的命令："
 
-#: ../../tips.rst:119 7f13464c92f14cc18f8c00f7dae78f93
+#: ../../tips.rst:119 ca5939f8c58b44b69ebfb2f953a4a73b
 msgid ""
 "Now you can push the whole project ``<username>.github.io`` to the main "
 "branch of your GitHub repository::"
-msgstr ""
-"接着可以将整个项目 ``<username>.github.io`` push到GitHub仓库的master分支中："
+msgstr "接着可以将整个项目 ``<username>.github.io`` push到GitHub仓库的master分支中："
 
-#: ../../tips.rst:124 e82ff566e32b4696863aa04216aaf355
+#: ../../tips.rst:124 54962439805d47abb121ca9454e7a4cc
 msgid "(assuming origin is set to your remote repository)."
 msgstr "（此处假设远程仓库命名为origin）。"
 
-#: ../../tips.rst:127 1958522ba7c34537855505f1e64c7b43
+#: ../../tips.rst:127 b3fe320a90904fbda8c7ed8c7bddbd6e
 msgid "Publishing to GitHub Pages Using a Custom GitHub Actions Workflow"
 msgstr "使用自定义GitHub Actions工作流将站点发布GitHub Pages中"
 
-#: ../../tips.rst:129 19c47b80d248451facd8407bd960b527
+#: ../../tips.rst:129 3b368bc0a307473dae560671fd9527be
 msgid ""
 "Pelican-powered sites can be published to GitHub Pages via a `custom "
 "workflow "
@@ -246,22 +238,21 @@ msgstr ""
 "<https://github.com/getpelican/pelican/blob/main/.github/workflows/github_pages.yml>`_"
 " ，你可以直接使用此工作流发布站点："
 
-#: ../../tips.rst:133 bdc132ef5b974d1eae684d8118e4d914
+#: ../../tips.rst:133 a7b1be522b694d9a8beb186b4603a7aa
 msgid ""
 "Enable GitHub Pages in your repo: go to **Settings → Pages** and choose "
 "**GitHub Actions** for the **Source** setting."
 msgstr ""
-"首先为仓库开启GitHub Pages： **Settings → Pages** 中有个 **Source** 设置项，"
-"将其选择为 **GitHub Actions** 。"
+"首先为仓库开启GitHub Pages： **Settings → Pages** 中有个 **Source** 设置项，将其选择为 "
+"**GitHub Actions** 。"
 
-#: ../../tips.rst:136 d7d197c176bd4127a75cfaf9dd29212b
+#: ../../tips.rst:136 9cc114d8a6b44ff49fa7fecbdbcd012f
 msgid ""
 "Commit a ``.github/workflows/pelican.yml`` file to your repo with these "
 "contents:"
-msgstr ""
-"往你的仓库中commit一个 ``.github/workflows/pelican.yml`` 文件，文件内容如下："
+msgstr "往你的仓库中commit一个 ``.github/workflows/pelican.yml`` 文件，文件内容如下："
 
-#: ../../tips.rst:155 656a2b783b6043f2ac26b1e7b342732e
+#: ../../tips.rst:155 f7d029425d7047deae43e9506c7f4779
 msgid ""
 "You may want to replace the ``@main`` with the ID of a specific commit in"
 " this repo in order to pin the version of the reusable workflow that "
@@ -270,62 +261,63 @@ msgid ""
 "you do this you might want to get Dependabot to send you automated pull "
 "requests to update that commit ID whenever new versions of this workflow "
 "are published, like so:"
-msgstr "你可能想要将 ``@main`` 替换为这个仓库中某个特定commit的ID，以便将你使用的"
-"可重用工作流的版本固定下来，此时，可以使用 ``uses: getpelican/pelican/.github/workflows/"
-"github_pages.yml@<COMMIT_ID>`` 。在这种情况下，你可能想让Dependabot自动向你发送"
-"PR，以便在发布新版本的工作流时更新commit ID，如下所示:"
+msgstr ""
+"你可能想要将 ``@main`` 替换为这个仓库中某个特定commit的ID，以便将你使用的可重用工作流的版本固定下来，此时，可以使用 "
+"``uses: "
+"getpelican/pelican/.github/workflows/github_pages.yml@<COMMIT_ID>`` "
+"。在这种情况下，你可能想让Dependabot自动向你发送PR，以便在发布新版本的工作流时更新commit ID，如下所示:"
 
-#: ../../tips.rst:172 0e2e10f42d6142e1b2f9d2251879ffad
+#: ../../tips.rst:172 fd060b5d5d824ab8825b384d37872894
 msgid ""
 "See `GitHub's docs about using Dependabot to keep your actions up to date"
 " <https://docs.github.com/en/code-security/dependabot/working-with-"
 "dependabot/keeping-your-actions-up-to-date-with-dependabot>`_."
-msgstr "请参阅 `GitHub文档 <https://docs.github.com/en/code-security/"
-"dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-"
+msgstr ""
+"请参阅 `GitHub文档 <https://docs.github.com/en/code-security/dependabot"
+"/working-with-dependabot/keeping-your-actions-up-to-date-with-"
 "dependabot>`_ ，了解如何使用Dependabot使您的action保持最新。"
 
-#: ../../tips.rst:174 2475397adfbb48af9a1d16fc0a24d9b9
+#: ../../tips.rst:174 1b862876e15c4fcd898c4d9b3ba616c5
 msgid ""
 "Go to the **Actions** tab in your repo "
 "(``https://github.com/<username>/<repository>/actions``) and you should "
 "see a **Deploy to GitHub Pages** action running."
 msgstr ""
-"选中仓库的 **Actions** 标签栏（ ``https://github.com/<username>/<repository>"
-"/actions`` ），此时你应该会看到已经有一个名为 **Deploy to GitHub Pages** 的"
-"action正在运行。"
+"选中仓库的 **Actions** 标签栏（ "
+"``https://github.com/<username>/<repository>/actions`` ），此时你应该会看到已经有一个名为 "
+"**Deploy to GitHub Pages** 的action正在运行。"
 
-#: ../../tips.rst:178 df30a15c460b442796f7f2007c283f32
+#: ../../tips.rst:178 f8413793636140f9b017abad379b3429
 msgid ""
 "Once the action completes you should see your Pelican site deployed at "
 "your repo's GitHub Pages URL: ``https://<username>.github.io`` for a user"
 " or organization site or ``https://<username>.github.io/<repository>>`` "
 "for a project site."
 msgstr ""
-"当此action执行完成，就能够通过仓库的GitHub Pages地址 ``https://<username>."
-"github.io`` 看到部署好了的用户或组织站点了，对于项目站点，可通过 ``https://"
-"<username>.github.io/<repository>`` 访问。"
+"当此action执行完成，就能够通过仓库的GitHub Pages地址 ``https://<username>.github.io`` "
+"看到部署好了的用户或组织站点了，对于项目站点，可通过 ``https://<username>.github.io/<repository>`` "
+"访问。"
 
-#: ../../tips.rst:183 f79963fcfd204f2780ff536516e6d407
+#: ../../tips.rst:183 d792bb046c474f70aa98b2c16a5b1254
 msgid "Notes:"
 msgstr "注意事项："
 
-#: ../../tips.rst:185 3a2dc6a36d38454e85265ef35c5e8010
+#: ../../tips.rst:185 89472d2b7231439faf9e51eda07d8323
 msgid ""
 "You don't need to set ``SITEURL`` or ``FEED_DOMAIN`` in your Pelican "
 "settings: the workflow will set them correctly for you"
-msgstr ""
-"无需在Pelican配置文件中设置 ``SITEURL`` ，工作流会帮你进行设置。"
+msgstr "无需在Pelican配置文件中设置 ``SITEURL`` ，工作流会帮你进行设置。"
 
-#: ../../tips.rst:188 ea406746a7db49dfa10de025a3be4a31
+#: ../../tips.rst:188 ea2b632160804a6e9bf1b4cecb7de716
 msgid ""
 "You don't need to commit your ``--output`` / ``OUTPUT_PATH`` directory "
 "(``output/``) to git: the workflow will run ``pelican`` to build the "
 "output directory for you on GitHub Actions"
 msgstr ""
-"无需commit ``--output`` 或 ``OUTPUT_PATH`` 所指定的目录（ ``output/`` ）："
-"工作流会自己执行 ``pelican`` 命令来构建输出目录。"
+"无需commit ``--output`` 或 ``OUTPUT_PATH`` 所指定的目录（ ``output/`` ）：工作流会自己执行 "
+"``pelican`` 命令来构建输出目录。"
 
-#: ../../tips.rst:192 a92a4068ac294a22ac80b1db68090634
+#: ../../tips.rst:192 fd9fb772fba844f099cac781f2b0642f
 msgid ""
 "See `GitHub's docs about reusable workflows "
 "<https://docs.github.com/en/actions/using-workflows/reusing-workflows>`_ "
@@ -334,46 +326,45 @@ msgstr ""
 "更多信息请参阅 `GitHub可重用工作流文档 <https://docs.github.com/en/actions/using-"
 "workflows/reusing-workflows>`_ 。"
 
-#: ../../tips.rst:195 1264d8a048aa4bd7878845ba2dac0d0d
+#: ../../tips.rst:195 f9c527704af24f6da0b4229b7882a25b
 msgid ""
 "A number of optional inputs can be added to the ``with:`` block when "
 "calling the workflow, for example:"
-msgstr ""
-"有一些可选输入可以添加到工作流的 ``with:`` 块中："
+msgstr "有一些可选输入可以添加到工作流的 ``with:`` 块中："
 
-#: ../../tips.rst:206 3faf65d7567244e3bc65a15dc84cf247
+#: ../../tips.rst:206 956f5bae1fc64096acd2a2540a29004c
 msgid "Here's the complete list of workflow inputs:"
 msgstr "下面是工作流可用输入参数的完整列表："
 
-#: ../../tips.rst:209 37919ce86ddb4546bd191440ba1c5b9a
+#: ../../tips.rst:209 eb37c894d7bc4278ab1a92e3b82c5603
 msgid "Name"
 msgstr "名称"
 
-#: ../../tips.rst:209 645ae6a27c7b40ecbc795dbd698b0649
+#: ../../tips.rst:209 446faf9e7d544e6aa47d4a1eca506c01
 msgid "Required"
 msgstr "是否必需"
 
-#: ../../tips.rst:209 18917f8f278440e38882a4f1ca62fc8f
+#: ../../tips.rst:209 de96e4f5cd09488296f97f569fe1fb90
 msgid "Description"
 msgstr "描述"
 
-#: ../../tips.rst:209 99be24eafb6d43578e6eabba25f568fe
+#: ../../tips.rst:209 181bbfff09144f5b9c241b2fc79c989d
 msgid "Type"
 msgstr "值的类型"
 
-#: ../../tips.rst:209 24860d0693b84e6c9297f8733b338824
+#: ../../tips.rst:209 c3d44d1e7be6421a83bae2f5dc6e578f
 msgid "Default"
 msgstr "默认值"
 
-#: ../../tips.rst:211 7e9bb7ea151c4e8c99116dd4decbe3c1
+#: ../../tips.rst:211 305d9d73681b4c6c80161cc906d60bbd
 msgid "``settings``"
 msgstr "``settings``"
 
-#: ../../tips.rst:211 647c4173846f4057920030c8f774d5ea
+#: ../../tips.rst:211 dbe6210f19914ae3b11e4caec7a945f0
 msgid "Yes"
 msgstr "是"
 
-#: ../../tips.rst:211 05c57822d0a249de9718a9a3c56e9e56
+#: ../../tips.rst:211 bbd2306b324d4b5eae513cb7a7683286
 msgid ""
 "The path to your Pelican settings file (``pelican``'s ``--settings`` "
 "option), for example: ``\"publishconf.py\"``"
@@ -383,26 +374,27 @@ msgstr ""
 
 #: ../../tips.rst:211 ../../tips.rst:216 ../../tips.rst:223 ../../tips.rst:227
 #: ../../tips.rst:231 ../../tips.rst:237 ../../tips.rst:243
-#: 4e21f78e86f049048a800ddd5c51e230 618fd4eb66ff45b29c98df87b145613c
-#: 93083ab6eb974293820f40d16349c100 9684f50652484820b924109f31418cd7
-#: 9df48660f1a84fe1af952256c7b58aec cef3fc9239d941969fda711c74994d8c
-#: d09fff93593844cfbb0b270b4cd74193
+#: 073e18d8ae29406eb05040d4e3a9ae60 7d43e6cfb091410ebec7464da05b61b4
+#: 8837cc8935f148fb80f05cc5d3d53629 b2da1f7640f948039230cd835c49accd
+#: bfe3d052cdc443bb81fed82e77acf3c1 c93816e00a254ef69c69f05833e8762b
+#: ee35302c7e034070af1d234ab919c32a
 msgid "string"
 msgstr "string"
 
-#: ../../tips.rst:216 f867df810054493f9d6be16271822ddb
+#: ../../tips.rst:216 4eab6faa96244f13a09754112a783f2f
 msgid "``requirements``"
 msgstr "``requirements``"
 
 #: ../../tips.rst:216 ../../tips.rst:223 ../../tips.rst:227 ../../tips.rst:231
-#: ../../tips.rst:237 ../../tips.rst:243 019e197dd56b44229549da7a2421ce37
-#: 636f76c7f1ca4c61bcea4bbe39a4eb1f 671a0ff87e294e7ab0ac8cdf70fdfe1d
-#: 848f43cf99c447a595f4760e2cf25f2b b425d772694640d0a7bae06c236fa1a2
-#: d145c924e4f348f5ad24b51286ce61e6
+#: ../../tips.rst:237 ../../tips.rst:243 ../../tips.rst:249
+#: 197d6ee11fce4a50996a0c458cfdbdad 2086d667b9b1475cb0f002924cdfde12
+#: 25e940621f5b48c9af487d898d7f93cf 5664232c9fdd46c7b8278b8ecef8e3b1
+#: 6693126a0da74c61b67e14ca8e535ec3 7f8a93a2048140748fa73537bfae2a54
+#: 85fd40a29f31490bb23b20f05e574aaa
 msgid "No"
 msgstr "否"
 
-#: ../../tips.rst:216 0d5ee9c193994b2cac7757e881f01a42
+#: ../../tips.rst:216 9d5bdd70e7da4794805180cc758ebe37
 msgid ""
 "The Python requirements to install, for example to enable markdown and "
 "typogrify use: ``\"pelican[markdown] typogrify\"`` or if you have a "
@@ -411,138 +403,194 @@ msgstr ""
 "需要安装的Python模块，例如要开启markdown和typogrify，可指定 ``\"pelican[markdown] "
 "typogrify\"`` ，或者可以指定一个requirements文件： ``\"-r requirements.txt\"`` "
 
-#: ../../tips.rst:216 67298d60de17486dbc1b6841f2c433b9
+#: ../../tips.rst:216 03ad0b322a714032bcce9f56ce66318d
 msgid "``\"pelican\"``"
 msgstr "``\"pelican\"``"
 
-#: ../../tips.rst:223 219a8d185ac440329e8aa7306e55e708
+#: ../../tips.rst:223 e568553782b443dbacecaa7ded4c391c
 msgid "``output-path``"
 msgstr "``output-path``"
 
-#: ../../tips.rst:223 21a3530e340349afa64d7eb69b393c98
+#: ../../tips.rst:223 2920ae9de5a64ae1ad82bd2287fa7c1e
 msgid "Where to output the generated files (``pelican``'s ``--output`` option)"
 msgstr "生成文件的输出位置（会被用于 ``pelican`` 命令的 ``--output`` 选项）"
 
-#: ../../tips.rst:223 dea97da0dfc24941b8850d1d26ea3cd3
+#: ../../tips.rst:223 41b90747f0954a5799c8baf4a59d99fd
 msgid "``\"output/\"``"
 msgstr "``\"output/\"``"
 
-#: ../../tips.rst:227 688ac4687d7841629137bf97ce97deee
+#: ../../tips.rst:227 e2cc62185182463abc5140244a808e6d
 msgid "``theme``"
 msgstr "``theme``"
 
-#: ../../tips.rst:227 2c2e6b6d8a6044c0ba64d00ea1b12d40
+#: ../../tips.rst:227 cd3b78d03dcd4554a8ce10a873f5ff9f
 msgid ""
 "The GitHub repo URL of a custom theme to use, for example: "
 "``\"https://github.com/seanh/sidecar.git\"``"
-msgstr ""
-"要使用的自定义主题的GitHub仓库URL，例如： ``\"https://github.com/seanh/"
-"sidecar.git\"``"
+msgstr "要使用的自定义主题的GitHub仓库URL，例如： ``\"https://github.com/seanh/sidecar.git\"``"
 
-#: ../../tips.rst:227 bd63884f7e60412d9a6cccc5da9c47ac
+#: ../../tips.rst:227 d94f331173334fb2a84b1caadffb72df
 msgid "``\"\"``"
 msgstr "``\"\"``"
 
-#: ../../tips.rst:231 9527d9e89d704210baff0bb6e3e23b20
+#: ../../tips.rst:231 44ceb2743481486b95c1c739d543f15d
 msgid "``python``"
 msgstr "``python``"
 
-#: ../../tips.rst:231 1aa44193e62647c0ba275507ea84b42c
+#: ../../tips.rst:231 4b5cddab44d24c7c8560e16991b784c7
 msgid ""
 "The version of Python to use to build the site, for example: ``\"3.12\"``"
 " (to use the most recent version of Python 3.12, this is faster) or "
 "``\"3.12.1\"`` (to use an exact version, slower)"
-msgstr ""
-"构建站点时使用的Python版本，例如： ``\"3.12\"`` 或 ``\"3.12.1\"``"
+msgstr "构建站点时使用的Python版本，例如： ``\"3.12\"`` 或 ``\"3.12.1\"``"
 
-#: ../../tips.rst:231 d182ae2dd44c482fb3f2373a7d97087c
+#: ../../tips.rst:231 919c0e36e8ff40bcbcc4480081b49ce5
 msgid "``\"3.12\"``"
 msgstr "``\"3.12\"``"
 
-#: ../../tips.rst:237 dc65b4e578e24d179c38066871c2c572
+#: ../../tips.rst:237 842af56c539f4a74a97c7a5b1525eb35
 msgid "``siteurl``"
 msgstr "``siteurl``"
 
-#: ../../tips.rst:237 5909de5d60224c7b875753f88fd13296
+#: ../../tips.rst:237 7fc0777d6e174d6f8d757926a61aa3c8
 msgid ""
 "The base URL of your web site (Pelican's ``SITEURL`` setting). If not "
 "passed this will default to the URL of your GitHub Pages site, which is "
 "correct in most cases."
-msgstr ""
-"站点的基URL，会用于配置项 ``SITEURL`` 。若未指定，默认值为GitHub Pages站点"
-"的URL，这适用于大部分情况。"
+msgstr "站点的基URL，会用于配置项 ``SITEURL`` 。若未指定，默认值为GitHub Pages站点的URL，这适用于大部分情况。"
 
-#: ../../tips.rst:237 ../../tips.rst:243 0c0b86aa4b984615afb3564b76e379ff
-#: c7ddd6347a7f4467b31aaa8f4d4a2309
+#: ../../tips.rst:237 ../../tips.rst:243 082f65333e224d71817b82b1e4f515c4
+#: 3d786e828a4745db849bdb8f47738db8
 msgid "The URL of your GitHub Pages site."
 msgstr "GitHub Pages站点的URL"
 
-#: ../../tips.rst:243 af7d2b52c5504ac2b69490a18d14f80f
+#: ../../tips.rst:243 e5adb69f985547b7b3cc2bd3f31d4cc3
 msgid "``feed_domain``"
 msgstr "``feed_domain``"
 
-#: ../../tips.rst:243 2cc126862a8047c286381aa258aad013
+#: ../../tips.rst:243 c88f037c9f1f4148bef6347228257f7d
 msgid ""
 "The domain to be prepended to feed URLs (Pelican's ``FEED_DOMAIN`` "
 "setting). If not passed this will default to the URL of your GitHub Pages"
 " site, which is correct in most cases."
 msgstr ""
-"订阅源URL前要附加的域名，会用于配置项 ``FEED_DOMAIN`` 。若未指定，默认值为"
-"GitHub Pages站点的URL，这适用于大部分情况。"
+"订阅源URL前要附加的域名，会用于配置项 ``FEED_DOMAIN`` 。若未指定，默认值为GitHub "
+"Pages站点的URL，这适用于大部分情况。"
 
-#: ../../tips.rst:252 b86ab8a1fa24447d99becc592411010e
+#: ../../tips.rst:249 358c5aa434cd4ad09beab02df88413d5
+msgid "``deploy``"
+msgstr "``deploy``"
+
+#: ../../tips.rst:249 b8748aeace5a448d9382e225be98f90c
+msgid ""
+"This is used to determine whether you will deploy the site or not to "
+"GitHub Pages. This is most useful if you want to test a change to your "
+"website in a pull request before deploying those change."
+msgstr "此项配置用于表示是否要将站点部署至GitHub Pages。当对站点做了更改，并且在正式部署前进行测试，就可以用到此项。"
+
+#: ../../tips.rst:249 034006b9b71b4cb486f230b8aad873ce
+msgid "bool"
+msgstr "bool"
+
+#: ../../tips.rst:249 078ac613a8b74703af98c75bb5a007c1
+msgid "``true``"
+msgstr "``true``"
+
+#: ../../tips.rst:257 e63cf881e3204be8b52ee5d8635ba4cf
+msgid "Testing Your Build in a GitHub Pull Request"
+msgstr "在Github拉取请求时进行测试"
+
+#: ../../tips.rst:259 a2f6bd3420eb46a08f54efda35a6eaf4
+msgid ""
+"If you want to test your build in a pull request before deploying to "
+"GitHub, your workflow might look something like this:"
+msgstr "如果想在正式部署到 GitHub 前在PR中进行测试，下面是一个可用的 workflow 示例"
+
+#: ../../tips.rst:288 84393693279741efa82c5ee6b27cbd28
+msgid ""
+"The ``on`` section of the workflow defines the events that will trigger "
+"the workflow. In this example, the workflow will run on pushes to the "
+"main branch, pull requests to the main branch, and manual runs of the "
+"workflow."
+msgstr "工作流的 ``on`` 部分定义了工作流的触发器。在此示例中，工作流将在main分支收到push、有PR提起到主分支以及"
+"手动运行工作流时执行。"
+
+#: ../../tips.rst:290 cd3c13b2af974a32aa4291d07fc11e9c
+msgid ""
+"``workflow_dispatch`` defines the deploy boolean to be true by default. "
+"This means that if you run the workflow manually, it will deploy the "
+"site."
+msgstr "``workflow_dispatch`` 将 deploy 的默认值设为 true。也就是说当手动运行工作流时，更改的内容就会正式部署。"
+
+#: ../../tips.rst:292 5402cd211d5b4aa8a244c916bb381a5b
+msgid ""
+"The ``deploy`` input for the job is using a set of standard GitHub "
+"workflow variables to control when ``deploy`` will either be true or "
+"false (you can customize this to your needs)."
+msgstr "job中的 ``deploy`` 使用了一些 GitHub workflow 变量来计算 ``deploy`` 值为 true 还是 false（您可以根据需要自定义）。"
+
+#: ../../tips.rst:294 d084908e3a0749f0b802b43626cfe2c4
+msgid ""
+"In this example, the ``deploy`` will be true if the event is a push to "
+"the main branch (or merging into main from a PR) or a manual run of the "
+"workflow. If the event is a pull request, the ``deploy`` will be false "
+"and it will only build an artifact for the site."
+msgstr "在此示例中，如果触发事件是推送到主分支（或从 PR 合并到主分支）或手动运行工作流，则 deploy 将为 true；"
+"如果触发事件只是Pull Request，则 ``deploy`` 将为 false，并且此时只会为站点构建一个artifact。"
+
+#: ../../tips.rst:297 85e70fc3faa04208979f7bbe92b025ef
 msgid "\"Insecure content\" warnings from browsers"
 msgstr "浏览器报“不安全的内容（Insecure content）”警告"
 
-#: ../../tips.rst:254 c81d5f8889c14a069e55fe7472a238f2
+#: ../../tips.rst:299 34f7075cf31f416da2aeb529c616d97d
 msgid ""
 "If your site uses ``https://`` and is broken because the browser is "
 "blocking network requests (for example for CSS files) due to \"insecure "
 "content\" this may be because GitHub Pages is generating ``http://`` URLs"
 " for your site."
 msgstr ""
-"当站点使用 ``https://`` 时，可能会损坏，无法正常显示，这是由于浏览器阻拦了一些"
-"对“不安全内容”的网络请求。可能的原因之一是GitHub Pages给你的站点生成了 ``http://`` "
-"URL。"
+"当站点使用 ``https://`` "
+"时，可能会损坏，无法正常显示，这是由于浏览器阻拦了一些对“不安全内容”的网络请求。可能的原因之一是GitHub Pages给你的站点生成了 "
+"``http://`` URL。"
 
-#: ../../tips.rst:258 2a53f882b7e645149d18ce81757b9758
+#: ../../tips.rst:303 47271df82577424c8e2c31a9e76a553a
 msgid ""
 "To fix this go into your site repo's settings and enable the **Enforce "
 "HTTPS** setting: go to **Settings → Pages** and check **Enforce HTTPS**. "
 "Then re-run the workflow to re-deploy your site. Alternatively, you can "
 "use the workflow's ``siteurl`` and ``feed_domain`` settings."
 msgstr ""
-"要想解决这一问题，需要为站点所在仓库开启 **强制使用HTTPS** ：点击 **Settings → Pages** "
-"并在其中勾选 **Enforce HTTPS** ，接着再重新执行工作流以重新部署站点。也可以尝试"
-"通过配置 ``siteurl`` 与 ``feed_domain`` 解决问题。"
+"要想解决这一问题，需要为站点所在仓库开启 **强制使用HTTPS** ：点击 **Settings → Pages** 并在其中勾选 "
+"**Enforce HTTPS** ，接着再重新执行工作流以重新部署站点。也可以尝试通过配置 ``siteurl`` 与 "
+"``feed_domain`` 解决问题。"
 
-#: ../../tips.rst:266 483cbd21e61841d983e2ecc8bc3006bc
+#: ../../tips.rst:311 e69189ef4a8440fb8940d8012b4f19d6
 msgid ""
 "GitHub Pages will display the custom 404 page described above, as noted "
 "in the relevant `GitHub docs "
 "<https://help.github.com/articles/custom-404-pages/>`_."
 msgstr ""
-"如果按前述进行配置，GitHub Pages是能够正确显示自定义的404页面的，相关内容在 "
-"`GitHub的文档中 <https://help.github.com/articles/custom-404-pages/>`_ 也有提到。"
+"如果按前述进行配置，GitHub Pages是能够正确显示自定义的404页面的，相关内容在 `GitHub的文档中 "
+"<https://help.github.com/articles/custom-404-pages/>`_ 也有提到。"
 
-#: ../../tips.rst:270 6b54e9c354f34e1f9a5a3f50d96b98c3
+#: ../../tips.rst:315 1b8c2457f44a4d61a033363830b8bd90
 msgid "Update your site on each commit"
 msgstr "在每次commit后都更新站点"
 
-#: ../../tips.rst:272 2e83c0c761c94f35ae3056634d8f1552
+#: ../../tips.rst:317 476dbdb670924c02a962e78d6a7854c1
 msgid ""
 "To automatically update your Pelican site on each commit, you can create "
 "a post-commit hook. For example, you can add the following to "
 "``.git/hooks/post-commit``::"
 msgstr ""
-"要想在每次commit后自动更新Pelican站点，你可以创建一个post-commit钩子。例如，"
-"可以将下面的内容保存为 ``.git/hooks/post-commit`` ："
+"要想在每次commit后自动更新Pelican站点，你可以创建一个post-commit钩子。例如，可以将下面的内容保存为 "
+"``.git/hooks/post-commit`` ："
 
-#: ../../tips.rst:279 528589366e634f15bb0a702969715286
+#: ../../tips.rst:324 36dc5f05eaf84573acada36c59d8d2fc
 msgid "Copy static files to the root of your site"
 msgstr "将静态文件拷贝到站点根目录"
 
-#: ../../tips.rst:281 dc4267653ef04722a0583915c05b6c88
+#: ../../tips.rst:326 4a0722ad68e944ee80e6378259cc1dd6
 msgid ""
 "To use a `custom domain <https://help.github.com/articles/setting-up-a"
 "-custom-domain-with-pages>`_ with GitHub Pages, you need to put the "
@@ -557,11 +605,11 @@ msgstr ""
 "）添加到站点根目录的 ``CNAME`` 文件中。为此，请创建 ``content/extra/`` 目录，并在里面添加一个 ``CNAME`` "
 "文件。然后使用Pelican的 ``STATIC_PATHS`` 来告诉Pelican将此文件复制到输出目录："
 
-#: ../../tips.rst:292 5fcdc283f55f4d8ca121cb6438c67a36
+#: ../../tips.rst:337 8ad906848762400d9e2462034d151a16
 msgid "Note: use forward slashes, ``/``, even on Windows."
 msgstr "请注意：务必使用正斜杠 ``/`` ，在Windows上也是。"
 
-#: ../../tips.rst:294 326a40a1536c462ea4974ce4b560f54c
+#: ../../tips.rst:339 7b109f4944064382babc9158567c8e82
 msgid ""
 "You can also use the ``EXTRA_PATH_METADATA`` mechanism to place a "
 "``favicon.ico`` or ``robots.txt`` at the root of any site."
@@ -569,18 +617,17 @@ msgstr ""
 "利用 ``EXTRA_PATH_METADATA`` 机制，你可以将 ``favicon.ico`` 或 ``robots.txt`` "
 "也拷贝到站点的根目录下。"
 
-#: ../../tips.rst:298 4e589caa6f17438aae1d1a12819c6ef2
+#: ../../tips.rst:343 678eea0644b5400496ad9173d05368d5
 msgid "How to add YouTube or Vimeo Videos"
 msgstr "如何添加YouTube或Vimeo视频"
 
-#: ../../tips.rst:300 5f60f033a7084739af5ef0dce5b91197
+#: ../../tips.rst:345 ca57b327dd6b432d82cdc91193bde6bb
 msgid ""
 "The easiest way is to paste the embed code of the video from these sites "
 "directly into your source content."
-msgstr ""
-"最简单的方法是将这些网站的视频嵌入代码直接粘贴到您的源内容文件中。"
+msgstr "最简单的方法是将这些网站的视频嵌入代码直接粘贴到您的源内容文件中。"
 
-#: ../../tips.rst:303 5446d02bebc241e88cc30b484799696c
+#: ../../tips.rst:348 0a4f27e2edbe494ab52f73595646986e
 msgid ""
 "Alternatively, you can also use Pelican plugins like ``liquid_tags``, "
 "``pelican_youtube``, or ``pelican_vimeo`` to embed videos in your "
@@ -589,45 +636,42 @@ msgstr ""
 "或者，您还可以使用例如 ``liquid_tags`` 、``pelican_youtube`` 或 ``pelican_vimeo`` "
 "等Pelican插件将视频嵌入。"
 
-#: ../../tips.rst:306 c871fab4a3424b0dba84c1af24f6405f
+#: ../../tips.rst:351 e73517b72da347738421784b776b1f1c
 msgid ""
 "Moreover, markup languages like reST and Markdown have plugins that let "
 "you embed videos in the markup. You can use `reST video directive "
 "<https://gist.github.com/dbrgn/2922648>`_ for reST or `mdx_video plugin "
 "<https://github.com/italomaia/mdx-video>`_ for Markdown."
 msgstr ""
-"此外，像reST和 Markdown这样的标记语言都有对应插件可以让你在其中嵌入视频。"
-"可以使用 `reST的视频指令 <https://gist.github.com/dbrgn/2922648>`_ 或者 "
-"`Markdown的mdx_video插件 <https://github.com/italomaia/mdx-video>`_ 。"
+"此外，像reST和 Markdown这样的标记语言都有对应插件可以让你在其中嵌入视频。可以使用 `reST的视频指令 "
+"<https://gist.github.com/dbrgn/2922648>`_ 或者 `Markdown的mdx_video插件 "
+"<https://github.com/italomaia/mdx-video>`_ 。"
 
-#: ../../tips.rst:313 569b7609cb9d412e942001da7c4a704c
+#: ../../tips.rst:358 b9d27cda716048b2ab7c13646d7faf09
 msgid "Develop Locally Using SSL"
 msgstr "在本地使用SSL进行开发"
 
-#: ../../tips.rst:315 e66f6f1cacc4466682461d251aedb929
+#: ../../tips.rst:360 50df9ec072aa47eabbae132fd8f5cb68
 msgid "Here's how you can set up your local pelican server to support SSL."
 msgstr "以下描述了如何在本地Pelican服务器上配置SSL。"
 
-#: ../../tips.rst:317 138c34c1b6804246b79fda266a1fd937
+#: ../../tips.rst:362 9b5045375a874c4d9c29f7109f05c539
 msgid ""
 "First, create a self-signed certificate and key using ``openssl`` (this "
 "creates ``cert.pem`` and ``key.pem``)::"
-msgstr ""
-"首先，通过 ``openssl`` 创建自签名的证书和密钥，这会生成 ``cert.pem`` 和 "
-"``key.pem`` 文件："
+msgstr "首先，通过 ``openssl`` 创建自签名的证书和密钥，这会生成 ``cert.pem`` 和 ``key.pem`` 文件："
 
-#: ../../tips.rst:321 ac189182bc694bcaa94cd935311f4492
+#: ../../tips.rst:366 2f1cfa536fc540f69d671f8a118769d7
 msgid ""
 "And use this command to launch the server (the server starts within your "
 "``output`` directory)::"
-msgstr ""
-"接着使用下面的命令来开启服务器（此服务器会在 ``output`` 目录下开启）："
+msgstr "接着使用下面的命令来开启服务器（此服务器会在 ``output`` 目录下开启）："
 
-#: ../../tips.rst:325 88a33744d69f4f5bbc4a43024c43d3a0
+#: ../../tips.rst:370 029ea2b0e4fe4b0f814158ae33e3a8ff
 msgid "If you are using ``develop-server.sh``,  add this to the top::"
 msgstr "如果你使用的是 ``develop-server.sh`` 脚本，在脚本的开头添加："
 
-#: ../../tips.rst:330 9a783977fe814657b8590185af281b1e
+#: ../../tips.rst:375 c2784fdd9fdb433799d57f903d0e49d8
 msgid "and modify the ``pelican.server`` line as follows::"
 msgstr "然后修改按照下述修改 ``pelican.server`` 一行："
 

From 1edca552532ae3f3dc72ee4a2bd8109d2b293fdc Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Sun, 10 Nov 2024 12:05:02 +1100
Subject: [PATCH 2765/2864] settings: Change the default IGNORE_FILES to all
 "hidden" files.

This is to avoid subtle behaviour that contributed to root cause of
https://github.com/pelican-plugins/sitemap/issues/36

Specifically: if installing Pelican into a local virtualenv with the pdm or uv
default name ".venv", then subdirectories of .venv will contain all of the test
.rst and .md files.

If you then run Pelican in that same root directory using the default PATH
value (".") then it will add those content files to the site.
---
 docs/settings.rst   | 10 +++++-----
 pelican/settings.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 93c632d2..b442451a 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -150,12 +150,12 @@ Basic settings
 
       READERS = {'foo': FooReader}
 
-.. data:: IGNORE_FILES = ['.#*']
+.. data:: IGNORE_FILES = ['.*']
 
-   A list of glob patterns.  Files and directories matching any of these
-   patterns will be ignored by the processor. For example, the default
-   ``['.#*']`` will ignore emacs lock files, and ``['__pycache__']`` would
-   ignore Python 3's bytecode caches.
+   A list of glob patterns. Files and directories matching any of these patterns
+   will be ignored by the processor. For example, the default ``['.*']`` will
+   ignore "hidden" files and directories, and ``['__pycache__']`` would ignore
+   Python 3's bytecode caches.
 
 .. data:: MARKDOWN = {...}
 
diff --git a/pelican/settings.py b/pelican/settings.py
index 66d6beeb..1c6b5c76 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -157,7 +157,7 @@ DEFAULT_CONFIG = {
     "PYGMENTS_RST_OPTIONS": {},
     "TEMPLATE_PAGES": {},
     "TEMPLATE_EXTENSIONS": [".html"],
-    "IGNORE_FILES": [".#*"],
+    "IGNORE_FILES": [".*"],
     "SLUG_REGEX_SUBSTITUTIONS": [
         (r"[^\w\s-]", ""),  # remove non-alphabetical/whitespace/'-' chars
         (r"(?u)\A\s*", ""),  # strip leading whitespace

From 31538d157880a4a22e9a8f2027dd5c21604f0a50 Mon Sep 17 00:00:00 2001
From: Martin <me@mart-e.be>
Date: Mon, 11 Nov 2024 14:43:09 +0100
Subject: [PATCH 2766/2864] [IMP] add information in error message

Not always clear what was the issue with only the keyword
---
 pelican/contents.py            | 3 ++-
 pelican/tests/test_contents.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 0769f875..bf7b3c3f 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -358,8 +358,9 @@ class Content:
             origin = joiner(siteurl, Author(path, self.settings).url)
         else:
             logger.warning(
-                "Replacement Indicator '%s' not recognized, skipping replacement",
+                "Replacement Indicator %r not recognized in %r, skipping replacement",
                 what,
+                origin,
             )
 
         # keep all other parts, such as query, fragment, etc.
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 06d1a690..4defafa4 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -1036,7 +1036,7 @@ class TestStatic(LoggedTestCase):
         self.assertEqual(content, html)
         self.assertLogCountEqual(
             count=1,
-            msg="Replacement Indicator 'unknown' not recognized, "
+            msg="Replacement Indicator 'unknown' not recognized in '{unknown}foo', "
             "skipping replacement",
             level=logging.WARNING,
         )

From d9652ef109d900cba2bbba8d701b9f4343c81065 Mon Sep 17 00:00:00 2001
From: Scott Colby <scolby33@users.noreply.github.com>
Date: Wed, 27 Nov 2024 14:51:03 -0500
Subject: [PATCH 2767/2864] fix: `SUMMARY_MAX_PARAGRAPHS` not respected in some
 combinations with `SUMMARY_MAX_LENGTH` (#3427)

---
 RELEASE.md                     |  4 ++++
 pelican/contents.py            |  2 +-
 pelican/tests/test_contents.py | 30 ++++++++++++++++++++++++++----
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..61dcffa2
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,4 @@
+Release type: patch
+
+- Change ``IGNORE_FILES`` setting default to ignore all hidden files
+- Fix ``SUMMARY_MAX_PARAGRAPHS`` not being respected in some combinations with ``SUMMARY_MAX_LENGTH``
diff --git a/pelican/contents.py b/pelican/contents.py
index bf7b3c3f..2abdf492 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -451,7 +451,7 @@ class Content:
             return content
 
         return truncate_html_words(
-            self.content,
+            content,
             self.settings["SUMMARY_MAX_LENGTH"],
             self.settings["SUMMARY_END_SUFFIX"],
         )
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 4defafa4..97653e33 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -13,8 +13,12 @@ from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import LoggedTestCase, get_context, get_settings, unittest
 from pelican.utils import path_to_url, posixize_path, truncate_html_words
 
-# generate one paragraph, enclosed with <p>
-TEST_CONTENT = str(generate_lorem_ipsum(n=1))
+# generate 3 test paragraphs, each enclosed with <p>
+# save the first paragraph separately for testing the summary generation algorithm
+# NOTE: these values are nondeterministic between test runs
+TEST_CONTENT_FIRST_PARAGRAPH = str(generate_lorem_ipsum(n=1))
+TEST_CONTENT_REMAINING_PARAGRAPHS = str(generate_lorem_ipsum(n=2))
+TEST_CONTENT = TEST_CONTENT_FIRST_PARAGRAPH + TEST_CONTENT_REMAINING_PARAGRAPHS
 TEST_SUMMARY = generate_lorem_ipsum(n=1, html=False)
 
 
@@ -126,7 +130,7 @@ class TestPage(TestBase):
         settings["SUMMARY_MAX_PARAGRAPHS"] = 1
         settings["SUMMARY_MAX_LENGTH"] = None
         page = Page(**page_kwargs)
-        self.assertEqual(page.summary, TEST_CONTENT)
+        self.assertEqual(page.summary, TEST_CONTENT_FIRST_PARAGRAPH)
 
     def test_summary_paragraph_max_length(self):
         # If both SUMMARY_MAX_PARAGRAPHS and SUMMARY_MAX_LENGTH are set,
@@ -139,7 +143,25 @@ class TestPage(TestBase):
         settings["SUMMARY_MAX_PARAGRAPHS"] = 1
         settings["SUMMARY_MAX_LENGTH"] = 10
         page = Page(**page_kwargs)
-        self.assertEqual(page.summary, truncate_html_words(TEST_CONTENT, 10))
+        self.assertEqual(
+            page.summary, truncate_html_words(TEST_CONTENT_FIRST_PARAGRAPH, 10)
+        )
+
+    def test_summary_paragraph_long_max_length(self):
+        # If both SUMMARY_MAX_PARAGRAPHS and SUMMARY_MAX_LENGTH are set,
+        # and the first SUMMARY_MAX_PARAGRAPHS paragraphs have fewer words
+        # than SUMMARY_MAX_LENGTH, the generated summary should still only
+        # contain the given number of paragraphs.
+        page_kwargs = self._copy_page_kwargs()
+        settings = get_settings()
+        page_kwargs["settings"] = settings
+        del page_kwargs["metadata"]["summary"]
+        settings["SUMMARY_MAX_PARAGRAPHS"] = 1
+        settings["SUMMARY_MAX_LENGTH"] = 50
+        page = Page(**page_kwargs)
+        self.assertEqual(
+            page.summary, truncate_html_words(TEST_CONTENT_FIRST_PARAGRAPH, 50)
+        )
 
     def test_summary_end_suffix(self):
         # If a :SUMMARY_END_SUFFIX: is set, and there is no other summary,

From 07c7eacab914985942ea776f6606fd5f8a8f9e93 Mon Sep 17 00:00:00 2001
From: botpub <52496925+botpub@users.noreply.github.com>
Date: Wed, 27 Nov 2024 19:53:23 +0000
Subject: [PATCH 2768/2864] Release Pelican 4.10.2

---
 RELEASE.md         | 4 ----
 docs/changelog.rst | 6 ++++++
 pyproject.toml     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 61dcffa2..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Release type: patch
-
-- Change ``IGNORE_FILES`` setting default to ignore all hidden files
-- Fix ``SUMMARY_MAX_PARAGRAPHS`` not being respected in some combinations with ``SUMMARY_MAX_LENGTH``
diff --git a/docs/changelog.rst b/docs/changelog.rst
index cfc290df..03dfc81b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,12 @@
 Release history
 ###############
 
+4.10.2 - 2024-11-27
+===================
+
+- Change ``IGNORE_FILES`` setting default to ignore all hidden files
+- Fix ``SUMMARY_MAX_PARAGRAPHS`` not being respected in some combinations with ``SUMMARY_MAX_LENGTH``
+
 4.10.1 - 2024-09-28
 ===================
 
diff --git a/pyproject.toml b/pyproject.toml
index f3629015..bd6b22b4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 name = "pelican"
 authors = [{ name = "Justin Mayer", email = "authors@getpelican.com" }]
 description = "Static site generator supporting Markdown and reStructuredText"
-version = "4.10.1"
+version = "4.10.2"
 license = { text = "AGPLv3" }
 readme = "README.rst"
 keywords = ["static site generator", "static sites", "ssg"]

From 7d4adfce3f4fff69be4f6e72edc2f3659971110a Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Sat, 21 Dec 2024 15:45:35 +0200
Subject: [PATCH 2769/2864] Add support for Python 3.13

---
 .github/workflows/main.yml | 2 +-
 pyproject.toml             | 1 +
 tox.ini                    | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e07caa72..319c8fab 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu, macos, windows]
-        python: ["3.10", "3.11", "3.12"]
+        python: ["3.10", "3.11", "3.12", "3.13"]
         include:
           - os: ubuntu
             python: "3.8"
diff --git a/pyproject.toml b/pyproject.toml
index bd6b22b4..9359fa9f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,6 +19,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Content Management System",
     "Topic :: Internet :: WWW/HTTP :: Site Management",
diff --git a/tox.ini b/tox.ini
index 7b8598ac..def8cf4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.8,3.9,3.10,3.11,3.12},docs
+envlist = py{3.8,3.9,3.10,3.11,3.12,3.13},docs
 
 [testenv]
 basepython =
@@ -8,6 +8,7 @@ basepython =
     py3.10: python3.10
     py3.11: python3.11
     py3.12: python3.12
+    py3.13: python3.13
 passenv = *
 usedevelop=True
 deps =

From 714a3d53a16d7be5c5622a98dce75ddbc1ce6a27 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Sat, 21 Dec 2024 15:53:13 +0200
Subject: [PATCH 2770/2864] Drop support for EOL Python 3.8

---
 .github/workflows/main.yml          |  2 --
 pelican/contents.py                 | 12 ++++++------
 pelican/generators.py               |  8 ++++----
 pelican/settings.py                 |  4 ++--
 pelican/tests/test_generators.py    | 16 +++-------------
 pelican/tools/pelican_quickstart.py |  2 +-
 pelican/utils.py                    | 11 ++++-------
 pyproject.toml                      |  4 +---
 tox.ini                             |  3 +--
 9 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 319c8fab..9e5a877b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,8 +17,6 @@ jobs:
         os: [ubuntu, macos, windows]
         python: ["3.10", "3.11", "3.12", "3.13"]
         include:
-          - os: ubuntu
-            python: "3.8"
           - os: ubuntu
             python: "3.9"
 
diff --git a/pelican/contents.py b/pelican/contents.py
index 2abdf492..c48715dc 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -6,7 +6,7 @@ import os
 import re
 from datetime import timezone
 from html import unescape
-from typing import Any, Dict, Optional, Set, Tuple
+from typing import Any, Optional
 from urllib.parse import ParseResult, unquote, urljoin, urlparse, urlunparse
 
 try:
@@ -47,7 +47,7 @@ class Content:
     """
 
     default_template: Optional[str] = None
-    mandatory_properties: Tuple[str, ...] = ()
+    mandatory_properties: tuple[str, ...] = ()
 
     @deprecated_attribute(old="filename", new="source_path", since=(3, 2, 0))
     def filename():
@@ -56,10 +56,10 @@ class Content:
     def __init__(
         self,
         content: str,
-        metadata: Optional[Dict[str, Any]] = None,
+        metadata: Optional[dict[str, Any]] = None,
         settings: Optional[Settings] = None,
         source_path: Optional[str] = None,
-        context: Optional[Dict[Any, Any]] = None,
+        context: Optional[dict[Any, Any]] = None,
     ):
         if metadata is None:
             metadata = {}
@@ -226,7 +226,7 @@ class Content:
         )
 
     @property
-    def url_format(self) -> Dict[str, Any]:
+    def url_format(self) -> dict[str, Any]:
         """Returns the URL, formatted with the proper values"""
         metadata = copy.copy(self.metadata)
         path = self.metadata.get("path", self.get_relative_source_path())
@@ -397,7 +397,7 @@ class Content:
         hrefs = self._get_intrasite_link_regex()
         return hrefs.sub(lambda m: self._link_replacer(siteurl, m), content)
 
-    def get_static_links(self) -> Set[str]:
+    def get_static_links(self) -> set[str]:
         static_links = set()
         hrefs = self._get_intrasite_link_regex()
         for m in hrefs.finditer(self._content):
diff --git a/pelican/generators.py b/pelican/generators.py
index 207c9296..0e6b08ea 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -7,7 +7,7 @@ from collections import defaultdict
 from functools import partial
 from itertools import chain, groupby
 from operator import attrgetter
-from typing import List, Optional, Set
+from typing import Optional
 
 from jinja2 import (
     BaseLoader,
@@ -158,8 +158,8 @@ class Generator:
         return False
 
     def get_files(
-        self, paths, exclude: Optional[List[str]] = None, extensions=None
-    ) -> Set[str]:
+        self, paths, exclude: Optional[list[str]] = None, extensions=None
+    ) -> set[str]:
         """Return a list of files to use, based on rules
 
         :param paths: the list pf paths to search (relative to self.path)
@@ -253,7 +253,7 @@ class Generator:
         # return the name of the class for logging purposes
         return self.__class__.__name__
 
-    def _check_disabled_readers(self, paths, exclude: Optional[List[str]]) -> None:
+    def _check_disabled_readers(self, paths, exclude: Optional[list[str]]) -> None:
         """Log warnings for files that would have been processed by disabled readers."""
         for fil in self.get_files(
             paths, exclude=exclude, extensions=self.readers.disabled_extensions
diff --git a/pelican/settings.py b/pelican/settings.py
index 1c6b5c76..84b7bf71 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -9,7 +9,7 @@ import sys
 from os.path import isabs
 from pathlib import Path
 from types import ModuleType
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from pelican.log import LimitFilter
 
@@ -24,7 +24,7 @@ def load_source(name: str, path: str) -> ModuleType:
 
 logger = logging.getLogger(__name__)
 
-Settings = Dict[str, Any]
+Settings = dict[str, Any]
 
 DEFAULT_THEME = os.path.join(
     os.path.dirname(os.path.abspath(__file__)), "themes", "notmyidea"
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index e739e180..01add63c 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -1,5 +1,4 @@
 import os
-import sys
 from shutil import copy, rmtree
 from tempfile import mkdtemp
 from unittest.mock import MagicMock
@@ -1528,18 +1527,9 @@ class TestStaticGenerator(unittest.TestCase):
         self.generator.generate_context()
         self.generator.generate_output(None)
         self.assertTrue(os.path.islink(self.endfile))
-
-        # os.path.realpath is broken on Windows before python3.8 for symlinks.
-        # This is a (ugly) workaround.
-        # see: https://bugs.python.org/issue9949
-        if os.name == "nt" and sys.version_info < (3, 8):
-
-            def get_real_path(path):
-                return os.readlink(path) if os.path.islink(path) else path
-        else:
-            get_real_path = os.path.realpath
-
-        self.assertEqual(get_real_path(self.endfile), get_real_path(self.startfile))
+        self.assertEqual(
+            os.path.realpath(self.endfile), os.path.realpath(self.startfile)
+        )
 
     def test_delete_existing_file_before_mkdir(self):
         with open(self.startfile, "w") as f:
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index 77131a52..77657162 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -3,7 +3,7 @@
 import argparse
 import locale
 import os
-from typing import Mapping
+from collections.abc import Mapping
 
 from jinja2 import Environment, FileSystemLoader
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 69d9dde5..21dbe804 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -11,7 +11,7 @@ import shutil
 import sys
 import traceback
 import urllib
-from collections.abc import Hashable
+from collections.abc import Collection, Generator, Hashable, Iterable, Sequence
 from contextlib import contextmanager
 from functools import partial
 from html import entities
@@ -22,10 +22,6 @@ from typing import (
     TYPE_CHECKING,
     Any,
     Callable,
-    Collection,
-    Generator,
-    Iterable,
-    Sequence,
 )
 
 import dateutil.parser
@@ -133,8 +129,9 @@ class DateFormatter:
     def __call__(self, date: datetime.datetime, date_format: str) -> str:
         # on OSX, encoding from LC_CTYPE determines the unicode output in PY3
         # make sure it's same as LC_TIME
-        with temporary_locale(self.locale, locale.LC_TIME), temporary_locale(
-            self.locale, locale.LC_CTYPE
+        with (
+            temporary_locale(self.locale, locale.LC_TIME),
+            temporary_locale(self.locale, locale.LC_CTYPE),
         ):
             formatted = strftime(date, date_format)
 
diff --git a/pyproject.toml b/pyproject.toml
index 9359fa9f..813b098c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,6 @@ classifiers = [
     "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -28,7 +27,7 @@ classifiers = [
     "Topic :: Text Processing :: Markup :: HTML",
     "Topic :: Text Processing :: Markup :: reStructuredText",
 ]
-requires-python = ">=3.8.1,<4.0"
+requires-python = ">=3.9,<4.0"
 dependencies = [
     "blinker>=1.7.0",
     "docutils>=0.20.1",
@@ -39,7 +38,6 @@ dependencies = [
     "python-dateutil>=2.8.2",
     "rich>=13.6.0",
     "unidecode>=1.3.7",
-    "backports-zoneinfo>=0.2.1; python_version < \"3.9\"",
     "watchfiles>=0.21.0",
     "tzdata; sys_platform == 'win32'",
 ]
diff --git a/tox.ini b/tox.ini
index def8cf4d..106e4580 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py{3.8,3.9,3.10,3.11,3.12,3.13},docs
+envlist = py{3.9,3.10,3.11,3.12,3.13},docs
 
 [testenv]
 basepython =
-    py3.8: python3.8
     py3.9: python3.9
     py3.10: python3.10
     py3.11: python3.11

From 5bb39c4f6fe378d60746cff59a020133e60a0433 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Sat, 21 Dec 2024 15:53:56 +0200
Subject: [PATCH 2771/2864] Replace deprecated logger.warn with logger.warning

---
 pelican/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 84b7bf71..69120058 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -613,7 +613,7 @@ def configure_settings(settings: Settings) -> Settings:
     ]:
         if key in settings and not isinstance(settings[key], types):
             value = settings.pop(key)
-            logger.warn(
+            logger.warning(
                 "Detected misconfigured %s (%s), falling back to the default (%s)",
                 key,
                 value,

From 74d76ca0dac6af53226c85028e7454b7635a4ffb Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 14 Jan 2025 11:39:17 +0100
Subject: [PATCH 2772/2864] Pin Pygments due to indentation changes in 2.19

---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 813b098c..f4ce80cd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -34,7 +34,7 @@ dependencies = [
     "feedgenerator>=2.1.0",
     "jinja2>=3.1.2",
     "ordered-set>=4.1.0",
-    "pygments>=2.16.1",
+    "pygments>=2.16.1,<2.19.0",
     "python-dateutil>=2.8.2",
     "rich>=13.6.0",
     "unidecode>=1.3.7",
@@ -88,7 +88,7 @@ dev = [
     "furo==2023.9.10",
     "livereload>=2.6.3",
     "psutil>=5.9.6",
-    "pygments>=2.16.1",
+    "pygments>=2.16.1,<2.19.0",
     "pytest>=7.4.3",
     "pytest-cov>=4.1.0",
     "pytest-sugar>=0.9.7",

From 7a4c89f64af9940cc9d07d979e7c23877c1677b3 Mon Sep 17 00:00:00 2001
From: David Lesieur <david@davidlesieur.com>
Date: Thu, 26 Dec 2024 19:05:16 -0500
Subject: [PATCH 2773/2864] Adjust test following changes in Typogrify.

Typogrify's 'widont' filter used to ignore the list of 'ignore_tags', but this got fixed in Typogrify.
---
 pelican/tests/test_readers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 68938a83..e13cbb11 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -417,7 +417,7 @@ class RstReaderTest(ReaderTest):
                 path="article.rst", TYPOGRIFY=True, TYPOGRIFY_IGNORE_TAGS=["p"]
             )
             expected = (
-                "<p>THIS is some content. With some stuff to&nbsp;"
+                "<p>THIS is some content. With some stuff to "
                 "&quot;typogrify&quot;...</p>\n<p>Now with added "
                 'support for <abbr title="three letter acronym">'
                 "TLA</abbr>.</p>\n"

From b4fcb7f4e34c415dce457a91426c5966bb8ffd84 Mon Sep 17 00:00:00 2001
From: David Lesieur <david@davidlesieur.com>
Date: Fri, 27 Dec 2024 16:42:15 -0500
Subject: [PATCH 2774/2864] Remove obsolete comment regarding widont.

---
 pelican/tests/test_readers.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index e13cbb11..4372fea1 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -411,8 +411,7 @@ class RstReaderTest(ReaderTest):
 
     def test_typogrify_ignore_tags(self):
         try:
-            # typogrify should be able to ignore user specified tags,
-            # but tries to be clever with widont extension
+            # typogrify should be able to ignore user specified tags.
             page = self.read_file(
                 path="article.rst", TYPOGRIFY=True, TYPOGRIFY_IGNORE_TAGS=["p"]
             )

From b3ef32bcf143479283e853b5b7561a2c840cfe66 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 14 Jan 2025 12:35:17 +0100
Subject: [PATCH 2775/2864] test: Require Typogrify 2.1+ to pass updated test

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f4ce80cd..02a1d56a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -82,7 +82,7 @@ dev = [
     "jinja2>=3.1.2",
     "lxml>=4.9.3",
     "markdown>=3.5.1",
-    "typogrify>=2.0.7",
+    "typogrify>=2.1.0",
     "sphinx>=7.1.2",
     "sphinxext-opengraph>=0.9.0",
     "furo==2023.9.10",

From 9207e1ff62e109badb2f94fde1326ad0b2a1927a Mon Sep 17 00:00:00 2001
From: David Lesieur <david@davidlesieur.com>
Date: Tue, 14 Jan 2025 06:48:39 -0500
Subject: [PATCH 2776/2864] feat: Add setting to omit selected Typogrify
 filters. Fixes #3436 (#3439)

---
 docs/settings.rst             |  9 +++-
 pelican/readers.py            | 17 +++++--
 pelican/settings.py           |  1 +
 pelican/tests/test_readers.py | 84 +++++++++++++++++++++++++++++++++++
 4 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index b442451a..72c72fb1 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -288,7 +288,14 @@ Basic settings
 
    A list of tags for Typogrify to ignore. By default Typogrify will ignore
    ``pre`` and ``code`` tags. This requires that Typogrify version 2.0.4 or
-   later is installed
+   later is installed.
+
+.. data:: TYPOGRIFY_OMIT_FILTERS = []
+
+   A list of Typogrify filters to skip. Allowed values are: ``'amp'``,
+   ``'smartypants'``, ``'caps'``, ``'initial_quotes'``, ``'widont'``. By
+   default, no filter is omitted (in other words, all filters get applied). This
+   setting requires that Typogrify version 2.1.0 or later is installed.
 
 .. data:: TYPOGRIFY_DASHES = 'default'
 
diff --git a/pelican/readers.py b/pelican/readers.py
index 59aa7ca3..182194fe 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -648,11 +648,22 @@ class Readers(FileStampDataCacher):
             smartypants.Attr.default |= smartypants.Attr.w
 
             def typogrify_wrapper(text):
-                """Ensures ignore_tags feature is backward compatible"""
+                """Ensure compatibility with older versions of Typogrify.
+
+                The 'TYPOGRIFY_IGNORE_TAGS' and/or 'TYPOGRIFY_OMIT_FILTERS'
+                settings will be ignored if the installed version of Typogrify
+                doesn't have the corresponding features."""
                 try:
-                    return typogrify(text, self.settings["TYPOGRIFY_IGNORE_TAGS"])
+                    return typogrify(
+                        text,
+                        self.settings["TYPOGRIFY_IGNORE_TAGS"],
+                        **{f: False for f in self.settings["TYPOGRIFY_OMIT_FILTERS"]},
+                    )
                 except TypeError:
-                    return typogrify(text)
+                    try:
+                        typogrify(text, self.settings["TYPOGRIFY_IGNORE_TAGS"])
+                    except TypeError:
+                        return typogrify(text)
 
             if content:
                 content = typogrify_wrapper(content)
diff --git a/pelican/settings.py b/pelican/settings.py
index 69120058..1fb0b211 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -149,6 +149,7 @@ DEFAULT_CONFIG = {
     "ARTICLE_PERMALINK_STRUCTURE": "",
     "TYPOGRIFY": False,
     "TYPOGRIFY_IGNORE_TAGS": [],
+    "TYPOGRIFY_OMIT_FILTERS": [],
     "TYPOGRIFY_DASHES": "default",
     "SUMMARY_END_SUFFIX": "…",
     "SUMMARY_MAX_LENGTH": 50,
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 4372fea1..751088f7 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -409,6 +409,90 @@ class RstReaderTest(ReaderTest):
         except ImportError:
             return unittest.skip("need the typogrify distribution")
 
+    def test_typogrify_ignore_filters(self):
+        try:
+            # typogrify should be able to ignore user specified filters.
+            page = self.read_file(
+                path="article_with_code_block.rst",
+                TYPOGRIFY=True,
+                TYPOGRIFY_OMIT_FILTERS=["amp"],
+            )
+            expected = (
+                "<p>An article with some&nbsp;code</p>\n"
+                '<div class="highlight"><pre><span></span>'
+                '<span class="n">x</span>'
+                ' <span class="o">&amp;</span>'
+                ' <span class="n">y</span>\n</pre></div>\n'
+                "<p>A block&nbsp;quote:</p>\n<blockquote>\nx "
+                "&amp; y</blockquote>\n"
+                "<p>Normal:\nx &amp;&nbsp;y</p>\n"
+            )
+            self.assertEqual(page.content, expected)
+
+            page = self.read_file(
+                path="article.rst",
+                TYPOGRIFY=True,
+                TYPOGRIFY_OMIT_FILTERS=["smartypants"],
+            )
+            expected = (
+                '<p><span class="caps">THIS</span> is some content. '
+                "With some stuff to&nbsp;&quot;typogrify&quot;...</p>\n"
+                '<p>Now with added support for <abbr title="three letter '
+                'acronym"><span class="caps">TLA</span></abbr>.</p>\n'
+            )
+            self.assertEqual(page.content, expected)
+
+            page = self.read_file(
+                path="article.rst",
+                TYPOGRIFY=True,
+                TYPOGRIFY_OMIT_FILTERS=["caps"],
+            )
+            expected = (
+                "<p>THIS is some content. "
+                "With some stuff to&nbsp;&#8220;typogrify&#8221;&#8230;</p>\n"
+                '<p>Now with added support for <abbr title="three letter '
+                'acronym">TLA</abbr>.</p>\n'
+            )
+            self.assertEqual(page.content, expected)
+
+            page = self.read_file(
+                path="article.rst",
+                TYPOGRIFY=True,
+                TYPOGRIFY_OMIT_FILTERS=["initial_quotes"],
+            )
+            expected = (
+                '<p><span class="caps">THIS</span> is some content. '
+                "With some stuff to&nbsp;&#8220;typogrify&#8221;&#8230;</p>\n"
+                '<p>Now with added support for <abbr title="three letter '
+                'acronym"><span class="caps">TLA</span></abbr>.</p>\n'
+            )
+            self.assertEqual(page.content, expected)
+
+            page = self.read_file(
+                path="article.rst",
+                TYPOGRIFY=True,
+                TYPOGRIFY_OMIT_FILTERS=["widont"],
+            )
+            expected = (
+                '<p><span class="caps">THIS</span> is some content. '
+                "With some stuff to "
+                "&#8220;typogrify&#8221;&#8230;</p>\n<p>Now with added "
+                'support for <abbr title="three letter acronym">'
+                '<span class="caps">TLA</span></abbr>.</p>\n'
+            )
+            self.assertEqual(page.content, expected)
+
+            page = self.read_file(
+                path="article.rst",
+                TYPOGRIFY=True,
+                TYPOGRIFY_OMIT_FILTERS=["this-filter-does-not-exists"],
+            )
+            self.assertRaises(TypeError)
+        except ImportError:
+            return unittest.skip("need the typogrify distribution")
+        except TypeError:
+            return unittest.skip("need typogrify version 2.1.0 or later")
+
     def test_typogrify_ignore_tags(self):
         try:
             # typogrify should be able to ignore user specified tags.

From 8a1c55ed07f9d749e7f45c1711f63fb93a51daa7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 14 Jan 2025 12:49:34 +0100
Subject: [PATCH 2777/2864] docs: Clarify namespace plugin loading order

---
 docs/plugins.rst | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 22e1bcc6..58eee16b 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -94,12 +94,14 @@ which you map the signals to your plugin logic. Let's take a simple example::
     your ``register`` callable or they will be garbage-collected before the
     signal is emitted.
 
-If multiple plugins connect to the same signal, plugins will be executed in the
-order they are connected. With ``PLUGINS`` setting, order will be as defined in
-the setting. If you rely on auto-discovered namespace plugins, no ``PLUGINS``
-setting, they will be connected in the same order they are discovered (same
-order as ``pelican-plugins`` output). If you want to specify the order
-explicitly, disable auto-discovery by defining ``PLUGINS`` in the desired order.
+If multiple plugins connect to the same signal, plugins will be invoked in the
+order they are registered. When the ``PLUGINS`` setting is defined, plugin
+invocation order will be the order in which the plugins are listed in the
+``PLUGINS`` setting. If you rely on auto-discovered namespace plugins and have
+no ``PLUGINS`` setting defined, plugins will be invoked in the same order that
+they are discovered (the same order as listed in the output of the
+``pelican-plugins`` command). If you want to specify the order explicitly,
+disable auto-discovery by defining ``PLUGINS`` in the desired order.
 
 Namespace plugin structure
 --------------------------

From 4878fc82a709cabb0778a6807b6a9eeb6f430c01 Mon Sep 17 00:00:00 2001
From: Alvin Mites <alvin@technowizardry.it>
Date: Wed, 15 Jan 2025 03:43:52 -0700
Subject: [PATCH 2778/2864] chore: Update link to re-directed example settings
 file (#3445)

---
 docs/locale/zh_CN/LC_MESSAGES/settings.po | 4 ++--
 docs/settings.rst                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/locale/zh_CN/LC_MESSAGES/settings.po b/docs/locale/zh_CN/LC_MESSAGES/settings.po
index 36c7209e..9738cd7b 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/settings.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/settings.po
@@ -63,11 +63,11 @@ msgstr ""
 msgid ""
 "Settings are configured in the form of a Python module (a file). There is"
 " an `example settings file "
-"<https://github.com/getpelican/pelican/raw/main/samples/pelican.conf.py>`_"
+"<https://raw.githubusercontent.com/getpelican/pelican/main/samples/pelican.conf.py>`_"
 " available for reference."
 msgstr ""
 "设置以Python模块（一个文件）的形式。 `示例配置文件 "
-"<https://github.com/getpelican/pelican/raw/main/samples/pelican.conf.py>`_"
+"<https://raw.githubusercontent.com/getpelican/pelican/main/samples/pelican.conf.py>`_"
 " 可供您参考。"
 
 #: ../../settings.rst:34 fd01256fff0d40319c6bd55c3e3d1f8d
diff --git a/docs/settings.rst b/docs/settings.rst
index 72c72fb1..d2740e6e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -28,7 +28,7 @@ Environment variables can also be used here but must be escaped appropriately::
 
 Settings are configured in the form of a Python module (a file). There is an
 `example settings file
-<https://github.com/getpelican/pelican/raw/main/samples/pelican.conf.py>`_
+<https://raw.githubusercontent.com/getpelican/pelican/main/samples/pelican.conf.py>`_
 available for reference.
 
 To see a list of current settings in your environment, including both default

From d813c5148edab58c1052644dab42fc17fabee8f1 Mon Sep 17 00:00:00 2001
From: Frederik Elwert <frederik.elwert@rub.de>
Date: Thu, 10 Oct 2024 14:10:12 +0200
Subject: [PATCH 2779/2864] Add more blocks to simple base template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change makes it easier to create new themes by inheriting from the
simple theme. It allows customization of the whole body (while still
making use of the theme’s head), or individual parts of the body like
header, menu, or footer.
---
 pelican/themes/simple/templates/base.html | 64 +++++++++++++----------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index e9461fd5..7afbc3c2 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -40,33 +40,41 @@
   </head>
 
   <body>
-    <header>
-      <hgroup><h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>{% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}</hgroup>
-      <nav><ul>
-        {% for title, link in MENUITEMS %}
-          <li><a href="{{ link }}">{{ title }}</a></li>
-        {% endfor %}
-        {% if DISPLAY_PAGES_ON_MENU %}
-          {% for p in pages %}
-            <li><a href="{{ SITEURL }}/{{ p.url }}" {% if p==page %} aria-current="page" {% endif %}>{{ p.title }}</a></li>
-          {% endfor %}
-        {% endif %}
-        {% if DISPLAY_CATEGORIES_ON_MENU %}
-          {% for cat, null in categories %}
-            <li><a href="{{ SITEURL }}/{{ cat.url }}" {% if cat==category %} aria-current="page" {% endif %}>{{ cat}}</a></li>
-          {% endfor %}
-        {% endif %}
-      </ul></nav>
-    </header>
-    <main>
-      {% block content %}
-      {% endblock %}
-    </main>
-    <footer>
-      <address>
-        Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>,
-        which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
-      </address>
-    </footer>
+    {% block body %}
+      <header>
+        {% block header %}
+          <hgroup><h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>{% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}</hgroup>
+        {% endblock %}
+        {% block nav %}
+          <nav><ul>
+            {% for title, link in MENUITEMS %}
+              <li><a href="{{ link }}">{{ title }}</a></li>
+            {% endfor %}
+            {% if DISPLAY_PAGES_ON_MENU %}
+              {% for p in pages %}
+                <li><a href="{{ SITEURL }}/{{ p.url }}" {% if p==page %} aria-current="page" {% endif %}>{{ p.title }}</a></li>
+              {% endfor %}
+            {% endif %}
+            {% if DISPLAY_CATEGORIES_ON_MENU %}
+              {% for cat, null in categories %}
+                <li><a href="{{ SITEURL }}/{{ cat.url }}" {% if cat==category %} aria-current="page" {% endif %}>{{ cat}}</a></li>
+              {% endfor %}
+            {% endif %}
+          </ul></nav>
+        {% endblock %}
+      </header>
+      <main>
+        {% block content %}
+        {% endblock %}
+      </main>
+      <footer>
+        {% block footer %}
+          <address>
+            Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>,
+            which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
+          </address>
+        {% endblock %}
+      </footer>
+    {% endblock %}
   </body>
 </html>

From af3c2ed0cf83523d7e1d80744e93909aa99a53ce Mon Sep 17 00:00:00 2001
From: Frederik Elwert <frederik.elwert@rub.de>
Date: Wed, 15 Jan 2025 11:37:44 +0100
Subject: [PATCH 2780/2864] Add block name in endblock

---
 pelican/themes/simple/templates/base.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 7afbc3c2..491a5903 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -44,7 +44,7 @@
       <header>
         {% block header %}
           <hgroup><h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>{% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}</hgroup>
-        {% endblock %}
+        {% endblock header %}
         {% block nav %}
           <nav><ul>
             {% for title, link in MENUITEMS %}
@@ -61,11 +61,11 @@
               {% endfor %}
             {% endif %}
           </ul></nav>
-        {% endblock %}
+        {% endblock nav %}
       </header>
       <main>
         {% block content %}
-        {% endblock %}
+        {% endblock content %}
       </main>
       <footer>
         {% block footer %}
@@ -73,8 +73,8 @@
             Proudly powered by <a rel="nofollow" href="https://getpelican.com/">Pelican</a>,
             which takes great advantage of <a rel="nofollow" href="https://www.python.org/">Python</a>.
           </address>
-        {% endblock %}
+        {% endblock footer %}
       </footer>
-    {% endblock %}
+    {% endblock body %}
   </body>
 </html>

From 4fcc24ddfe33ae67df58721214dd3ec6050cd523 Mon Sep 17 00:00:00 2001
From: Frederik Elwert <frederik.elwert@rub.de>
Date: Wed, 15 Jan 2025 11:38:00 +0100
Subject: [PATCH 2781/2864] Add test for simple theme and inheritance

---
 pelican/tests/test_theme.py | 138 ++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 pelican/tests/test_theme.py

diff --git a/pelican/tests/test_theme.py b/pelican/tests/test_theme.py
new file mode 100644
index 00000000..0070078a
--- /dev/null
+++ b/pelican/tests/test_theme.py
@@ -0,0 +1,138 @@
+import os
+import unittest
+from shutil import rmtree
+from tempfile import mkdtemp
+
+from pelican import Pelican
+from pelican.settings import read_settings
+from pelican.tests.support import LoggedTestCase, mute
+
+CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
+CONTENT_DIR = os.path.join(CURRENT_DIR, "simple_content")
+
+
+class TestTemplateInheritance(LoggedTestCase):
+    def setUp(self):
+        super().setUp()
+        self.temp_output = mkdtemp(prefix="pelican_test_output.")
+        self.temp_theme = mkdtemp(prefix="pelican_test_theme.")
+        self.temp_cache = mkdtemp(prefix="pelican_test_cache.")
+
+        # Create test theme directory structure
+        os.makedirs(os.path.join(self.temp_theme, "templates"), exist_ok=True)
+
+        # Create base.html template that inherits from simple theme
+        template_content = """{% extends "!simple/base.html" %}
+
+{% block head %}
+{{ super() }}
+    <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/style.css" />
+{% endblock %}
+
+{% block footer %}
+    <p>New footer</p>
+{% endblock %}
+"""
+
+        with open(os.path.join(self.temp_theme, "templates", "base.html"), "w") as f:
+            f.write(template_content)
+
+    def tearDown(self):
+        """Clean up temporary directories and files"""
+        for path in [self.temp_output, self.temp_theme, self.temp_cache]:
+            if os.path.exists(path):
+                rmtree(path)
+
+        super().tearDown()
+
+    def test_simple_theme(self):
+        """Test that when a template is missing from our theme, Pelican falls back
+        to using the template from the simple theme."""
+
+        settings = read_settings(
+            path=None,
+            override={
+                "THEME": "simple",
+                "PATH": CONTENT_DIR,
+                "OUTPUT_PATH": self.temp_output,
+                "CACHE_PATH": self.temp_cache,
+                "SITEURL": "http://example.com",
+                # Disable unnecessary output that might cause failures
+                "ARCHIVES_SAVE_AS": "",
+                "CATEGORIES_SAVE_AS": "",
+                "TAGS_SAVE_AS": "",
+                "AUTHOR_SAVE_AS": "",
+                "AUTHORS_SAVE_AS": "",
+            },
+        )
+
+        pelican = Pelican(settings=settings)
+        mute(True)(pelican.run)()
+
+        output_file = os.path.join(self.temp_output, "test-md-file.html")
+        self.assertTrue(os.path.exists(output_file))
+
+        with open(output_file) as f:
+            content = f.read()
+
+        # Verify file content is present
+        self.assertIn("Test md File", content)
+
+        # Verify simple theme content is present
+        self.assertIn('<html lang="en">', content)
+        self.assertIn("Proudly powered by", content)
+
+        # Verify our custom theme additions are NOT present
+        # (since we should be using the simple theme's template directly)
+        self.assertNotIn(
+            '<link rel="stylesheet" type="text/css" href="http://example.com/theme/css/style.css"',
+            content,
+        )
+
+    def test_theme_inheritance(self):
+        """Test that theme inheritance works correctly"""
+        settings = read_settings(
+            path=None,
+            override={
+                "THEME": self.temp_theme,
+                "PATH": CONTENT_DIR,
+                "OUTPUT_PATH": self.temp_output,
+                "CACHE_PATH": self.temp_cache,
+                "SITEURL": "http://example.com",
+                # Disable unnecessary output that might cause failures
+                "ARCHIVES_SAVE_AS": "",
+                "CATEGORIES_SAVE_AS": "",
+                "TAGS_SAVE_AS": "",
+                "AUTHOR_SAVE_AS": "",
+                "AUTHORS_SAVE_AS": "",
+            },
+        )
+
+        pelican = Pelican(settings=settings)
+        # Generate the site with muted output
+        mute(True)(pelican.run)()
+
+        # Check the output file
+        output_file = os.path.join(self.temp_output, "test-md-file.html")
+        self.assertTrue(os.path.exists(output_file))
+
+        with open(output_file) as f:
+            content = f.read()
+
+        # Verify inheritance worked
+        self.assertIn('<html lang="en">', content)  # From simple theme
+
+        # Verify super() maintained original head content
+        self.assertIn('<meta charset="utf-8"', content)
+
+        # Verify our changes were included
+        self.assertIn(
+            '<link rel="stylesheet" type="text/css" href="http://example.com/theme/css/style.css"',
+            content,
+        )
+        self.assertNotIn("Proudly powered by", content)
+        self.assertIn("New footer", content)
+
+
+if __name__ == "__main__":
+    unittest.main()

From 5be013d9d28fdfe7ff0e110d560907db97e32ce9 Mon Sep 17 00:00:00 2001
From: Vincent Cheng <vcheng@debian.org>
Date: Wed, 15 Jan 2025 08:36:52 -0800
Subject: [PATCH 2782/2864] Make build reproducible by reading envvar
 `SOURCE_DATE_EPOCH` if set (#3430)

Co-authored-by: Justin Mayer <entroP@gmail.com>
---
 docs/conf.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 2cac97e3..283562b9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,7 @@
 import datetime
 import os
 import sys
+import time
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -30,7 +31,9 @@ extensions = [
 source_suffix = ".rst"
 master_doc = "index"
 project = project_data.get("name").upper()
-year = datetime.datetime.now().date().year
+year = datetime.datetime.fromtimestamp(
+    int(os.environ.get("SOURCE_DATE_EPOCH", time.time())), datetime.timezone.utc
+).year
 copyright = f"2010–{year}"  # noqa: RUF001
 exclude_patterns = ["_build"]
 release = project_data.get("version")

From 543424aa4112f4c8b277b00a9675d90c488732a1 Mon Sep 17 00:00:00 2001
From: Yashas Lokesh <yashas.lokesh@gmail.com>
Date: Wed, 15 Jan 2025 11:40:27 -0500
Subject: [PATCH 2783/2864] fix: Fix auto-reload with globs in `IGNORE_FILES`
 (#3441)

The default `IGNORE_FILES` value of `'.*'` was being compiled to a regular expression and then passed into `watchfiles.DefaultFilter` to filter out files when auto-reload is enabled.

This commit compares the patterns from `IGNORE_FILES` directly with the filename to match the usage of `fnmatch` elsewhere in the codebase. The new filtering class will continue working as expected for custom `IGNORE_FILES` settings.
---
 docs/settings.rst           | 11 ++++--
 pelican/settings.py         |  2 +-
 pelican/tests/test_utils.py | 69 ++++++++++++++++++++++++++++++++++++-
 pelican/utils.py            | 23 ++++++++++---
 4 files changed, 96 insertions(+), 9 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index d2740e6e..876c4fb6 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -150,13 +150,17 @@ Basic settings
 
       READERS = {'foo': FooReader}
 
-.. data:: IGNORE_FILES = ['.*']
+.. data:: IGNORE_FILES = ['**/.*']
 
-   A list of glob patterns. Files and directories matching any of these patterns
-   will be ignored by the processor. For example, the default ``['.*']`` will
+   A list of Unix glob patterns. Files and directories matching any of these patterns
+   or any of the commonly hidden files and directories set by ``watchfiles.DefaultFilter``
+   will be ignored by the processor. For example, the default ``['**/.*']`` will
    ignore "hidden" files and directories, and ``['__pycache__']`` would ignore
    Python 3's bytecode caches.
 
+   For a full list of the commonly hidden files set by ``watchfiles.DefaultFilter``,
+   please refer to the `watchfiles documentation`_.
+
 .. data:: MARKDOWN = {...}
 
    Extra configuration settings for the Markdown processor. Refer to the Python
@@ -1423,3 +1427,4 @@ Example settings
 
 .. _Jinja Environment documentation: https://jinja.palletsprojects.com/en/latest/api/#jinja2.Environment
 .. _Docutils Configuration: http://docutils.sourceforge.net/docs/user/config.html
+.. _`watchfiles documentation`: https://watchfiles.helpmanual.io/api/filters/#watchfiles.DefaultFilter.ignore_dirs
diff --git a/pelican/settings.py b/pelican/settings.py
index 1fb0b211..3abe11bb 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -158,7 +158,7 @@ DEFAULT_CONFIG = {
     "PYGMENTS_RST_OPTIONS": {},
     "TEMPLATE_PAGES": {},
     "TEMPLATE_EXTENSIONS": [".html"],
-    "IGNORE_FILES": [".*"],
+    "IGNORE_FILES": ["**/.*"],
     "SLUG_REGEX_SUBSTITUTIONS": [
         (r"[^\w\s-]", ""),  # remove non-alphabetical/whitespace/'-' chars
         (r"(?u)\A\s*", ""),  # strip leading whitespace
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index c35b756c..01ad1c58 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -6,6 +6,8 @@ from datetime import timezone
 from sys import platform
 from tempfile import mkdtemp
 
+import watchfiles
+
 try:
     from zoneinfo import ZoneInfo
 except ModuleNotFoundError:
@@ -13,7 +15,7 @@ except ModuleNotFoundError:
 
 from pelican import utils
 from pelican.generators import TemplatePagesGenerator
-from pelican.settings import read_settings
+from pelican.settings import DEFAULT_CONFIG, read_settings
 from pelican.tests.support import (
     LoggedTestCase,
     get_article,
@@ -990,3 +992,68 @@ class TestStringUtils(unittest.TestCase):
         self.assertEqual("", utils.file_suffix(""))
         self.assertEqual("", utils.file_suffix("foo"))
         self.assertEqual("md", utils.file_suffix("foo.md"))
+
+
+class TestFileChangeFilter(unittest.TestCase):
+    ignore_file_patterns = DEFAULT_CONFIG["IGNORE_FILES"]
+
+    def test_regular_files_not_filtered(self):
+        filter = utils.FileChangeFilter(ignore_file_patterns=self.ignore_file_patterns)
+        basename = "article.rst"
+        full_path = os.path.join(os.path.dirname(__file__), "content", basename)
+
+        for change in watchfiles.Change:
+            self.assertTrue(filter(change=change, path=basename))
+            self.assertTrue(filter(change=change, path=full_path))
+
+    def test_dotfiles_filtered(self):
+        filter = utils.FileChangeFilter(ignore_file_patterns=self.ignore_file_patterns)
+        basename = ".config"
+        full_path = os.path.join(os.path.dirname(__file__), "content", basename)
+
+        # Testing with just the hidden file name and the full file path to the hidden file
+        for change in watchfiles.Change:
+            self.assertFalse(filter(change=change, path=basename))
+            self.assertFalse(filter(change=change, path=full_path))
+
+    def test_default_filters(self):
+        # Testing a subset of the default filters
+        # For reference: https://watchfiles.helpmanual.io/api/filters/#watchfiles.DefaultFilter.ignore_dirs
+        filter = utils.FileChangeFilter(ignore_file_patterns=[])
+        test_basenames = [
+            "__pycache__",
+            ".git",
+            ".hg",
+            ".svn",
+            ".tox",
+            ".venv",
+            ".idea",
+            "node_modules",
+            ".mypy_cache",
+            ".pytest_cache",
+            ".hypothesis",
+            ".DS_Store",
+            "flycheck_file",
+            "test_file~",
+        ]
+
+        for basename in test_basenames:
+            full_path = os.path.join(os.path.dirname(__file__), basename)
+            for change in watchfiles.Change:
+                self.assertFalse(filter(change=change, path=basename))
+                self.assertFalse(filter(change=change, path=full_path))
+
+    def test_custom_ignore_pattern(self):
+        filter = utils.FileChangeFilter(ignore_file_patterns=["*.rst"])
+        basename = "article.rst"
+        full_path = os.path.join(os.path.dirname(__file__), basename)
+        for change in watchfiles.Change:
+            self.assertFalse(filter(change=change, path=basename))
+            self.assertFalse(filter(change=change, path=full_path))
+
+        # If the user changes `IGNORE_FILES` to only contain ['*.rst'], then dotfiles would not be filtered anymore
+        basename = ".config"
+        full_path = os.path.join(os.path.dirname(__file__), basename)
+        for change in watchfiles.Change:
+            self.assertTrue(filter(change=change, path=basename))
+            self.assertTrue(filter(change=change, path=full_path))
diff --git a/pelican/utils.py b/pelican/utils.py
index 21dbe804..75889a7b 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -811,15 +811,30 @@ def order_content(
     return content_list
 
 
+class FileChangeFilter(watchfiles.DefaultFilter):
+    def __init__(self, ignore_file_patterns: Sequence[str], *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.ignore_file_patterns = ignore_file_patterns
+
+    def __call__(self, change: watchfiles.Change, path: str) -> bool:
+        """Returns `True` if a file should be watched for changes. The `IGNORE_FILES`
+        setting is a list of Unix glob patterns. This call will filter out files and
+        directories specified by `IGNORE_FILES` Pelican setting and by the default
+        filters of `watchfiles.DefaultFilter`, seen here:
+        https://watchfiles.helpmanual.io/api/filters/#watchfiles.DefaultFilter.ignore_dirs
+        """
+        return super().__call__(change, path) and not any(
+            fnmatch.fnmatch(os.path.abspath(path), p) for p in self.ignore_file_patterns
+        )
+
+
 def wait_for_changes(
     settings_file: str,
     settings: Settings,
 ) -> set[tuple[Change, str]]:
     content_path = settings.get("PATH", "")
     theme_path = settings.get("THEME", "")
-    ignore_files = {
-        fnmatch.translate(pattern) for pattern in settings.get("IGNORE_FILES", [])
-    }
+    ignore_file_patterns = set(settings.get("IGNORE_FILES", []))
 
     candidate_paths = [
         settings_file,
@@ -844,7 +859,7 @@ def wait_for_changes(
     return next(
         watchfiles.watch(
             *watching_paths,
-            watch_filter=watchfiles.DefaultFilter(ignore_entity_patterns=ignore_files),  # type: ignore
+            watch_filter=FileChangeFilter(ignore_file_patterns=ignore_file_patterns),
             rust_timeout=0,
         )
     )

From ec95a2c85554b52798ba9d670d18919fdfc62584 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 15 Jan 2025 17:53:09 +0100
Subject: [PATCH 2784/2864] Prepare release

---
 RELEASE.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..9fb13e49
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,8 @@
+Release type: minor
+
+- Add setting to selectively omit Typogrify filters `(#3439) <https://github.com/getpelican/pelican/pull/3439>`_
+- Add more blocks to the Simple theme’s base template, making it easier to create new themes by inheriting from the Simple theme `(#3405) <https://github.com/getpelican/pelican/pull/3405>`_
+- Fix auto-reload behavior upon changes to the theme, content or settings. Make default ``IGNORE_FILES`` recursively ignore all hidden files as well as the `default filters <https://watchfiles.helpmanual.io/api/filters/#watchfiles.DefaultFilter.ignore_dirs>`_ from ``watchfiles.DefaultFilter``. `(#3441) <https://github.com/getpelican/pelican/pull/3441>`_
+- Get current year from the ``SOURCE_DATE_EPOCH`` environment variable, if available `(#3430) <https://github.com/getpelican/pelican/pull/3430>`_
+- Add Python 3.13 to test matrix and remove Python 3.8 `(#3435) <https://github.com/getpelican/pelican/pull/3435>`_
+- Require Typogrify 2.1+ and Pygments <2.19

From 69e24fa82f0b6103930d85de5eeb8234414e6a11 Mon Sep 17 00:00:00 2001
From: botpub <52496925+botpub@users.noreply.github.com>
Date: Wed, 15 Jan 2025 17:01:09 +0000
Subject: [PATCH 2785/2864] Release Pelican 4.11.0

---
 RELEASE.md         |  8 --------
 docs/changelog.rst | 10 ++++++++++
 pyproject.toml     |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 9fb13e49..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Release type: minor
-
-- Add setting to selectively omit Typogrify filters `(#3439) <https://github.com/getpelican/pelican/pull/3439>`_
-- Add more blocks to the Simple theme’s base template, making it easier to create new themes by inheriting from the Simple theme `(#3405) <https://github.com/getpelican/pelican/pull/3405>`_
-- Fix auto-reload behavior upon changes to the theme, content or settings. Make default ``IGNORE_FILES`` recursively ignore all hidden files as well as the `default filters <https://watchfiles.helpmanual.io/api/filters/#watchfiles.DefaultFilter.ignore_dirs>`_ from ``watchfiles.DefaultFilter``. `(#3441) <https://github.com/getpelican/pelican/pull/3441>`_
-- Get current year from the ``SOURCE_DATE_EPOCH`` environment variable, if available `(#3430) <https://github.com/getpelican/pelican/pull/3430>`_
-- Add Python 3.13 to test matrix and remove Python 3.8 `(#3435) <https://github.com/getpelican/pelican/pull/3435>`_
-- Require Typogrify 2.1+ and Pygments <2.19
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 03dfc81b..b82faaa3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,16 @@
 Release history
 ###############
 
+4.11.0 - 2025-01-15
+===================
+
+- Add setting to selectively omit Typogrify filters `(#3439) <https://github.com/getpelican/pelican/pull/3439>`_
+- Add more blocks to the Simple theme’s base template, making it easier to create new themes by inheriting from the Simple theme `(#3405) <https://github.com/getpelican/pelican/pull/3405>`_
+- Fix auto-reload behavior upon changes to the theme, content or settings. Make default ``IGNORE_FILES`` recursively ignore all hidden files as well as the `default filters <https://watchfiles.helpmanual.io/api/filters/#watchfiles.DefaultFilter.ignore_dirs>`_ from ``watchfiles.DefaultFilter``. `(#3441) <https://github.com/getpelican/pelican/pull/3441>`_
+- Get current year from the ``SOURCE_DATE_EPOCH`` environment variable, if available `(#3430) <https://github.com/getpelican/pelican/pull/3430>`_
+- Add Python 3.13 to test matrix and remove Python 3.8 `(#3435) <https://github.com/getpelican/pelican/pull/3435>`_
+- Require Typogrify 2.1+ and Pygments <2.19
+
 4.10.2 - 2024-11-27
 ===================
 
diff --git a/pyproject.toml b/pyproject.toml
index 02a1d56a..014ebfc8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 name = "pelican"
 authors = [{ name = "Justin Mayer", email = "authors@getpelican.com" }]
 description = "Static site generator supporting Markdown and reStructuredText"
-version = "4.10.2"
+version = "4.11.0"
 license = { text = "AGPLv3" }
 readme = "README.rst"
 keywords = ["static site generator", "static sites", "ssg"]

From b71159a11e82fe5b0286fc81538920e69adb16e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Mon, 27 Jan 2025 06:18:55 +0100
Subject: [PATCH 2786/2864] docs: Update install from sources using setuptools

---
 docs/install.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/install.rst b/docs/install.rst
index aa3c92d0..502148ed 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -25,10 +25,10 @@ session and create a new virtual environment for Pelican::
 
 Once the virtual environment has been created and activated, Pelican can be
 installed via ``python -m pip install pelican`` as noted above. Alternatively, if you
-have the project source, you can install Pelican using the distutils method::
+have the project source, you can install Pelican using the setuptools method::
 
     cd path-to-Pelican-source
-    python setup.py install
+    python -m pip install .
 
 If you have Git installed and prefer to install the latest bleeding-edge
 version of Pelican rather than a stable release, use the following command::

From 88a6f57940f89e141ff66550f59708fc62bde71c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 11 Apr 2025 18:33:27 +0200
Subject: [PATCH 2787/2864] Upgrade Beautiful Soup & adjust tests to conform

---
 pelican/tools/pelican_import.py | 18 +++++++++---------
 pyproject.toml                  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 65517f42..7270488e 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -27,7 +27,7 @@ logger = logging.getLogger(__name__)
 
 def decode_wp_content(content, br=True):
     pre_tags = {}
-    if content.strip() == "":
+    if content is None or content.strip() == "":
         return ""
 
     content += "\n"
@@ -148,7 +148,7 @@ def wp2fields(xml, wp_custpost=False):
     """Opens a wordpress XML file, and yield Pelican fields"""
 
     soup = file_to_soup(xml)
-    items = soup.rss.channel.findAll("item")
+    items = soup.rss.channel.find_all("item")
     for item in items:
         if item.find("status").string in ["publish", "draft"]:
             try:
@@ -172,11 +172,11 @@ def wp2fields(xml, wp_custpost=False):
             author = item.find("creator").string
 
             categories = [
-                cat.string for cat in item.findAll("category", {"domain": "category"})
+                cat.string for cat in item.find_all("category", {"domain": "category"})
             ]
 
             tags = [
-                tag.string for tag in item.findAll("category", {"domain": "post_tag"})
+                tag.string for tag in item.find_all("category", {"domain": "post_tag"})
             ]
             # To publish a post the status should be 'published'
             status = (
@@ -218,7 +218,7 @@ def blogger2fields(xml):
     """Opens a blogger XML file, and yield Pelican fields"""
 
     soup = file_to_soup(xml)
-    entries = soup.feed.findAll("entry")
+    entries = soup.feed.find_all("entry")
     for entry in entries:
         raw_kind = entry.find(
             "category", {"scheme": "http://schemas.google.com/g/2005#kind"}
@@ -253,7 +253,7 @@ def blogger2fields(xml):
         # blogger posts only have tags, no category
         tags = [
             tag.get("term")
-            for tag in entry.findAll(
+            for tag in entry.find_all(
                 "category", {"scheme": "http://www.blogger.com/atom/ns#"}
             )
         ]
@@ -571,8 +571,8 @@ def strip_medium_post_content(soup) -> str:
     # See https://stackoverflow.com/a/8439761
     invalid_tags = ["section", "div", "footer"]
     for tag in invalid_tags:
-        for match in soup.findAll(tag):
-            match.replaceWithChildren()
+        for match in soup.find_all(tag):
+            match.unwrap()
 
     # Remove attributes
     # See https://stackoverflow.com/a/9045719
@@ -845,7 +845,7 @@ def get_attachments(xml):
     of the attachment_urls
     """
     soup = file_to_soup(xml)
-    items = soup.rss.channel.findAll("item")
+    items = soup.rss.channel.find_all("item")
     names = {}
     attachments = []
 
diff --git a/pyproject.toml b/pyproject.toml
index 014ebfc8..9684d6df 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -78,7 +78,7 @@ test = "invoke tests"
 
 [tool.pdm.dev-dependencies]
 dev = [
-    "BeautifulSoup4>=4.12.2",
+    "BeautifulSoup4>=4.13.3",
     "jinja2>=3.1.2",
     "lxml>=4.9.3",
     "markdown>=3.5.1",

From 9c7749a29887754d0ada49338503f0545870f8d2 Mon Sep 17 00:00:00 2001
From: Al Sweigart <asweigart@gmail.com>
Date: Sat, 12 Apr 2025 05:38:30 -0500
Subject: [PATCH 2788/2864] docs: Move default values to fix settings anchor
 links (#3458)

* Fix anchor links for settings by moving default value text down.
* Fix typos in default values.

---------

Co-authored-by: Justin Mayer <entroP@gmail.com>
---
 docs/settings.rst | 653 ++++++++++++++++++++++++++--------------------
 1 file changed, 363 insertions(+), 290 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 876c4fb6..89333f47 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -54,40 +54,41 @@ Here is a list of settings for Pelican:
 Basic settings
 ==============
 
-.. data:: USE_FOLDER_AS_CATEGORY = True
+.. data:: USE_FOLDER_AS_CATEGORY
 
    When you don't specify a category in your post metadata, set this setting to
    ``True``, and organize your articles in subfolders, the subfolder will
    become the category of your post. If set to ``False``, ``DEFAULT_CATEGORY``
-   will be used as a fallback.
+   will be used as a fallback. The default is ``True``.
 
-.. data:: DEFAULT_CATEGORY = 'misc'
+.. data:: DEFAULT_CATEGORY
 
-   The default category to fall back on.
+   The default category to fall back on. The default is ``'misc'``.
 
-.. data:: DISPLAY_PAGES_ON_MENU = True
+.. data:: DISPLAY_PAGES_ON_MENU
 
    Whether to display pages on the menu of the template. Templates may or may
-   not honor this setting.
+   not honor this setting. The default is ``True``.
 
-.. data:: DISPLAY_CATEGORIES_ON_MENU = True
+.. data:: DISPLAY_CATEGORIES_ON_MENU
 
    Whether to display categories on the menu of the template. Templates may or
-   not honor this setting.
+   not honor this setting. The default is ``True``.
 
-.. data:: DOCUTILS_SETTINGS = {}
+.. data:: DOCUTILS_SETTINGS
 
    Extra configuration settings for the docutils publisher (applicable only to
    reStructuredText). See `Docutils Configuration`_ settings for more details.
+   The default is ``{}`` with no extra configuration settings.
 
-.. data:: DELETE_OUTPUT_DIRECTORY = False
+.. data:: DELETE_OUTPUT_DIRECTORY
 
    Delete the output directory, and **all** of its contents, before generating
    new files. This can be useful in preventing older, unnecessary files from
    persisting in your output. However, **this is a destructive setting and
-   should be handled with extreme care.**
+   should be handled with extreme care.** The default is ``False``.
 
-.. data:: OUTPUT_RETENTION = []
+.. data:: OUTPUT_RETENTION
 
    A list of filenames that should be retained and not deleted from the output
    directory. One use case would be the preservation of version control data.
@@ -96,13 +97,16 @@ Basic settings
 
       OUTPUT_RETENTION = [".hg", ".git", ".bzr"]
 
-.. data:: JINJA_ENVIRONMENT = {'trim_blocks': True, 'lstrip_blocks': True}
+   The default is ``[]``.
+
+.. data:: JINJA_ENVIRONMENT
 
    A dictionary of custom Jinja2 environment variables you want to use. This
    also includes a list of extensions you may want to include. See `Jinja
-   Environment documentation`_.
+   Environment documentation`_. The default is
+   ``{'extensions': [], 'trim_blocks': True, 'lstrip_blocks': True}``.
 
-.. data:: JINJA_FILTERS = {}
+.. data:: JINJA_FILTERS
 
    A dictionary of custom Jinja2 filters you want to use.  The dictionary
    should map the filtername to the filter function.
@@ -115,20 +119,22 @@ Basic settings
     from custom_filter import urlencode_filter
     JINJA_FILTERS = {'urlencode': urlencode_filter}
 
-   See: `Jinja custom filters documentation`_.
+   See: `Jinja custom filters documentation`_. The default is ``{}``.
 
-.. data:: JINJA_GLOBALS = {}
+.. data:: JINJA_GLOBALS
 
    A dictionary of custom objects to map into the Jinja2 global environment
    namespace. The dictionary should map the global name to the global
-   variable/function. See: `Jinja global namespace documentation`_.
+   variable/function. See: `Jinja global namespace documentation`_. The
+   default is ``{}``.
 
-.. data:: JINJA_TESTS = {}
+.. data:: JINJA_TESTS
 
    A dictionary of custom Jinja2 tests you want to use. The dictionary should
    map test names to test functions. See: `Jinja custom tests documentation`_.
+   The default is ``{}``.
 
-.. data:: LOG_FILTER = []
+.. data:: LOG_FILTER
 
    A list of tuples containing the logging level (up to ``warning``) and the
    message to be ignored.
@@ -137,7 +143,9 @@ Basic settings
 
       LOG_FILTER = [(logging.WARN, 'TAG_SAVE_AS is set to False')]
 
-.. data:: READERS = {}
+   The default is ``[]``.
+
+.. data:: READERS
 
    A dictionary of file extensions / Reader classes for Pelican to process or
    ignore.
@@ -150,7 +158,9 @@ Basic settings
 
       READERS = {'foo': FooReader}
 
-.. data:: IGNORE_FILES = ['**/.*']
+   The default is ``{}``.
+
+.. data:: IGNORE_FILES
 
    A list of Unix glob patterns. Files and directories matching any of these patterns
    or any of the commonly hidden files and directories set by ``watchfiles.DefaultFilter``
@@ -161,7 +171,9 @@ Basic settings
    For a full list of the commonly hidden files set by ``watchfiles.DefaultFilter``,
    please refer to the `watchfiles documentation`_.
 
-.. data:: MARKDOWN = {...}
+   The default is ``['**/.*']``.
+
+.. data:: MARKDOWN
 
    Extra configuration settings for the Markdown processor. Refer to the Python
    Markdown documentation's `Options section
@@ -169,7 +181,7 @@ Basic settings
    list of supported options. The ``extensions`` option will be automatically
    computed from the ``extension_configs`` option.
 
-   Defaults to::
+   The default is::
 
         MARKDOWN = {
             'extension_configs': {
@@ -184,57 +196,63 @@ Basic settings
       The dictionary defined in your settings file will replace this default
       one.
 
-.. data:: OUTPUT_PATH = 'output/'
+.. data:: OUTPUT_PATH
 
    Where to output the generated files. This should correspond to your web
    server's virtual host root directory.
 
+   The default is ``'output'``.
+
 .. data:: PATH
 
    Path to content directory to be processed by Pelican. If undefined, and
    content path is not specified via an argument to the ``pelican`` command,
-   Pelican will use the current working directory.
+   Pelican will default to ``'.'``, the current working directory.
 
-.. data:: PAGE_PATHS = ['pages']
+.. data:: PAGE_PATHS
 
    A list of directories and files to look at for pages, relative to ``PATH``.
+   The default is ``['pages']``.
 
-.. data:: PAGE_EXCLUDES = []
+.. data:: PAGE_EXCLUDES
 
    A list of directories to exclude when looking for pages in addition to
-   ``ARTICLE_PATHS``.
+   ``ARTICLE_PATHS``. The default is ``[]``.
 
-.. data:: ARTICLE_PATHS = ['']
+.. data:: ARTICLE_PATHS
 
    A list of directories and files to look at for articles, relative to
-   ``PATH``.
+   ``PATH``. The default is ``['']``.
 
-.. data:: ARTICLE_EXCLUDES = []
+.. data:: ARTICLE_EXCLUDES
 
    A list of directories to exclude when looking for articles in addition to
-   ``PAGE_PATHS``.
+   ``PAGE_PATHS``. The default is ``[]``.
 
-.. data:: OUTPUT_SOURCES = False
+.. data:: OUTPUT_SOURCES
 
    Set to True if you want to copy the articles and pages in their original
    format (e.g. Markdown or reStructuredText) to the specified ``OUTPUT_PATH``.
+   The default is ``False``.
 
-.. data:: OUTPUT_SOURCES_EXTENSION = '.text'
+.. data:: OUTPUT_SOURCES_EXTENSION
 
    Controls the extension that will be used by the SourcesGenerator.  Defaults
-   to ``.text``. If not a valid string the default value will be used.
+   to ``.text``. If not a valid string the default value will be used. The
+   default is ``'.text'``.
 
-.. data:: PLUGINS = None
+.. data:: PLUGINS
 
-   The list of plugins to load. See :ref:`plugins`.
+   The list of plugins to load. See :ref:`plugins`. The default is ``None``.
 
-.. data:: PLUGIN_PATHS = []
+.. data:: PLUGIN_PATHS
 
-   A list of directories where to look for plugins. See :ref:`plugins`.
+   A list of directories where to look for plugins. See :ref:`plugins`. The
+   default is ``[]``.
 
-.. data:: SITENAME = 'A Pelican Blog'
+.. data:: SITENAME
 
-   Your site name
+   Your site's name. The default is ``'A Pelican Blog'``.
 
 .. data:: SITEURL
 
@@ -245,63 +263,68 @@ Basic settings
    domain, with no trailing slash at the end. Example: ``SITEURL =
    'https://example.com'``
 
-.. data:: STATIC_PATHS = ['images']
+   The default is ``''``, the blank string.
+
+.. data:: STATIC_PATHS
 
    A list of directories (relative to ``PATH``) in which to look for static
    files. Such files will be copied to the output directory without
    modification. Articles, pages, and other content source files will normally
    be skipped, so it is safe for a directory to appear both here and in
    ``PAGE_PATHS`` or ``ARTICLE_PATHS``.  Pelican's default settings include the
-   "images" directory here.
+   "images" directory here. The default is ``['images']``.
 
-.. data:: STATIC_EXCLUDES = []
+.. data:: STATIC_EXCLUDES
 
-   A list of directories to exclude when looking for static files.
+   A list of directories to exclude when looking for static files. The default
+   is ``[]``.
 
-.. data:: STATIC_EXCLUDE_SOURCES = True
+.. data:: STATIC_EXCLUDE_SOURCES
 
    If set to False, content source files will not be skipped when copying files
    found in ``STATIC_PATHS``. This setting is for backward compatibility with
    Pelican releases before version 3.5.  It has no effect unless
    ``STATIC_PATHS`` contains a directory that is also in ``ARTICLE_PATHS`` or
    ``PAGE_PATHS``. If you are trying to publish your site's source files,
-   consider using the ``OUTPUT_SOURCES`` setting instead.
+   consider using the ``OUTPUT_SOURCES`` setting instead. The default is
+   ``True``.
 
-.. data:: STATIC_CREATE_LINKS = False
+.. data:: STATIC_CREATE_LINKS
 
    Create links instead of copying files. If the content and output directories
    are on the same device, then create hard links.  Falls back to symbolic
    links if the output directory is on a different filesystem. If symlinks are
    created, don't forget to add the ``-L`` or ``--copy-links`` option to rsync
-   when uploading your site.
+   when uploading your site. The default is ``False``.
 
-.. data:: STATIC_CHECK_IF_MODIFIED = False
+.. data:: STATIC_CHECK_IF_MODIFIED
 
    If set to ``True``, and ``STATIC_CREATE_LINKS`` is ``False``, compare mtimes
    of content and output files, and only copy content files that are newer than
-   existing output files.
+   existing output files. The default is ``False``.
 
-.. data:: TYPOGRIFY = False
+.. data:: TYPOGRIFY
 
-   If set to True, several typographical improvements will be incorporated into
+   If set to ``True``, several typographical improvements will be incorporated into
    the generated HTML via the `Typogrify
    <https://pypi.org/project/typogrify/>`_ library, which can be installed
-   via: ``python -m pip install typogrify``
+   via: ``python -m pip install typogrify``. The default is ``False``.
 
-.. data:: TYPOGRIFY_IGNORE_TAGS = []
+.. data:: TYPOGRIFY_IGNORE_TAGS
 
    A list of tags for Typogrify to ignore. By default Typogrify will ignore
    ``pre`` and ``code`` tags. This requires that Typogrify version 2.0.4 or
-   later is installed.
+   later is installed. The default is ``[]``.
 
-.. data:: TYPOGRIFY_OMIT_FILTERS = []
+.. data:: TYPOGRIFY_OMIT_FILTERS
 
    A list of Typogrify filters to skip. Allowed values are: ``'amp'``,
    ``'smartypants'``, ``'caps'``, ``'initial_quotes'``, ``'widont'``. By
    default, no filter is omitted (in other words, all filters get applied). This
-   setting requires that Typogrify version 2.1.0 or later is installed.
+   setting requires that Typogrify version 2.1.0 or later is installed. The
+   default is ``[]``.
 
-.. data:: TYPOGRIFY_DASHES = 'default'
+.. data:: TYPOGRIFY_DASHES
 
    This setting controls how Typogrify sets up the Smartypants filter to
    interpret multiple dash/hyphen/minus characters. A single ASCII dash
@@ -310,65 +333,72 @@ Basic settings
    ``oldschool`` setting renders both en-dashes and em-dashes when it sees two
    (``--``) and three (``---``) hyphen characters, respectively. The
    ``oldschool_inverted`` setting turns two hyphens into an em-dash and three
-   hyphens into an en-dash.
+   hyphens into an en-dash. The default is ``'default'``.
 
-.. data:: SUMMARY_MAX_LENGTH = 50
+.. data:: SUMMARY_MAX_LENGTH
 
    When creating a short summary of an article, this will be the default length
    (measured in words) of the text created.  This only applies if your content
    does not otherwise specify a summary. Setting to ``None`` will cause the
-   summary to be a copy of the original content.
+   summary to be a copy of the original content. The default is ``50``.
 
-.. data:: SUMMARY_MAX_PARAGRAPHS = None
+.. data:: SUMMARY_MAX_PARAGRAPHS
 
    When creating a short summary of an article, this will be the number of
    paragraphs to use as the summary. This only applies if your content
    does not otherwise specify a summary. Setting to ``None`` will cause the
    summary to use the whole text (up to ``SUMMARY_MAX_LENGTH``) instead of just
-   the first N paragraphs.
+   the first N paragraphs. The default is ``None``.
 
-.. data:: SUMMARY_END_SUFFIX = '…'
+.. data:: SUMMARY_END_SUFFIX
 
    When creating a short summary of an article and the result was truncated to
    match the required word length, this will be used as the truncation suffix.
+   The default is ``'…'``.
 
-.. data:: WITH_FUTURE_DATES = True
+.. data:: WITH_FUTURE_DATES
 
    If disabled, content with dates in the future will get a default status of
-   ``draft``. See :ref:`reading_only_modified_content` for caveats.
+   ``draft``. See :ref:`reading_only_modified_content` for caveats. The default
+   is ``True``.
 
-.. data:: INTRASITE_LINK_REGEX = '[{|](?P<what>.*?)[|}]'
+.. data:: INTRASITE_LINK_REGEX
 
    Regular expression that is used to parse internal links. Default syntax when
    linking to internal files, tags, etc., is to enclose the identifier, say
    ``filename``, in ``{}`` or ``||``. Identifier between ``{`` and ``}`` goes
    into the ``what`` capturing group.  For details see
-   :ref:`ref-linking-to-internal-content`.
+   :ref:`ref-linking-to-internal-content`. The default is
+   ``'[{|](?P<what>.*?)[|}]'``.
 
-.. data:: PYGMENTS_RST_OPTIONS = []
+.. data:: PYGMENTS_RST_OPTIONS
 
    A list of default Pygments settings for your reStructuredText code blocks.
-   See :ref:`internal_pygments_options` for a list of supported options.
+   See :ref:`internal_pygments_options` for a list of supported options. The
+   default is ``{}``.
 
-.. data:: CACHE_CONTENT = False
+.. data:: CACHE_CONTENT
 
    If ``True``, saves content in caches.  See
-   :ref:`reading_only_modified_content` for details about caching.
+   :ref:`reading_only_modified_content` for details about caching. The default
+   is ``False``.
 
-.. data:: CONTENT_CACHING_LAYER = 'reader'
+.. data:: CONTENT_CACHING_LAYER
 
    If set to ``'reader'``, save only the raw content and metadata returned by
-   readers. If set to ``'generator'``, save processed content objects.
+   readers. If set to ``'generator'``, save processed content objects. The
+   default is ``'reader'``.
 
-.. data:: CACHE_PATH = 'cache'
+.. data:: CACHE_PATH
 
-   Directory in which to store cache files.
+   Directory in which to store cache files. The default is ``'cache'``.
 
-.. data:: GZIP_CACHE = True
+.. data:: GZIP_CACHE
 
-   If ``True``, use gzip to (de)compress the cache files.
+   If ``True``, use gzip to (de)compress the cache files. The default is
+   ``True``.
 
-.. data:: CHECK_MODIFIED_METHOD = 'mtime'
+.. data:: CHECK_MODIFIED_METHOD
 
    Controls how files are checked for modifications.
 
@@ -377,23 +407,25 @@ Basic settings
    - If set to a name of a function provided by the ``hashlib``
      module, e.g. ``'md5'``, the file hash is checked.
 
-.. data:: LOAD_CONTENT_CACHE = False
+   The default is ``'mtime'``.
 
-   If ``True``, load unmodified content from caches.
+.. data:: LOAD_CONTENT_CACHE
 
-.. data:: FORMATTED_FIELDS = ['summary']
+   If ``True``, load unmodified content from caches. The default is ``False``.
+
+.. data:: FORMATTED_FIELDS
 
    A list of metadata fields containing reST/Markdown content to be parsed and
-   translated to HTML.
+   translated to HTML. The default is ``['summary']``.
 
-.. data:: PORT = 8000
+.. data:: PORT
 
    The TCP port to serve content from the output folder via HTTP when pelican
-   is run with --listen
+   is run with ``--listen``. The default is ``8000``.
 
-.. data:: BIND = ''
+.. data:: BIND
 
-   The IP to which to bind the HTTP server.
+   The IP to which to bind the HTTP server. The default is ``'127.0.0.1'``.
 
 .. _url-settings:
 
@@ -459,105 +491,113 @@ This would save your articles into something like
 .. _Python datetime documentation:
     https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior
 
-.. data:: RELATIVE_URLS = False
+.. data:: RELATIVE_URLS
 
    Defines whether Pelican should use document-relative URLs or not. Only set
    this to ``True`` when developing/testing and only if you fully understand
-   the effect it can have on links/feeds.
+   the effect it can have on links/feeds. The default is ``False``.
 
-.. data:: ARTICLE_URL = '{slug}.html'
+.. data:: ARTICLE_URL
 
-   The URL to refer to an article.
+   The URL to refer to an article. The default is ``'{slug}.html'``.
 
-.. data:: ARTICLE_SAVE_AS = '{slug}.html'
+.. data:: ARTICLE_SAVE_AS
 
-   The place where we will save an article.
+   The place where we will save an article. The default is ``'{slug.html}'``.
 
-.. data:: ARTICLE_LANG_URL = '{slug}-{lang}.html'
+.. data:: ARTICLE_LANG_URL
 
    The URL to refer to an article which doesn't use the default language.
+   The default is ``'{slug}-{lang}.html``.
 
-.. data:: ARTICLE_LANG_SAVE_AS = '{slug}-{lang}.html'
+.. data:: ARTICLE_LANG_SAVE_AS
 
    The place where we will save an article which doesn't use the default
-   language.
+   language. The default is ``'{slug}-{lang}.html'``.
 
-.. data:: DRAFT_URL = 'drafts/{slug}.html'
+.. data:: DRAFT_URL
 
-   The URL to refer to an article draft.
+   The URL to refer to an article draft. The default is
+   ``'drafts/{slug}.html'``.
 
-.. data:: DRAFT_SAVE_AS = 'drafts/{slug}.html'
+.. data:: DRAFT_SAVE_AS
 
-   The place where we will save an article draft.
+   The place where we will save an article draft. The default is ``'drafts/{slug}.html'``.
 
-.. data:: DRAFT_LANG_URL = 'drafts/{slug}-{lang}.html'
+.. data:: DRAFT_LANG_URL
 
    The URL to refer to an article draft which doesn't use the default language.
+   The default is ``'drafts/{slug}-{lang}.html'``.
 
-.. data:: DRAFT_LANG_SAVE_AS = 'drafts/{slug}-{lang}.html'
+.. data:: DRAFT_LANG_SAVE_AS
 
    The place where we will save an article draft which doesn't use the default
-   language.
+   language. The default is ``'drafts/{slug}-{lang}.html'``.
 
-.. data:: PAGE_URL = 'pages/{slug}.html'
+.. data:: PAGE_URL
 
-   The URL we will use to link to a page.
+   The URL we will use to link to a page. The default is
+   ``'pages/{slug}.html'``.
 
-.. data:: PAGE_SAVE_AS = 'pages/{slug}.html'
+.. data:: PAGE_SAVE_AS
 
    The location we will save the page. This value has to be the same as
-   PAGE_URL or you need to use a rewrite in your server config.
+   PAGE_URL or you need to use a rewrite in your server config. The default
+   is ``'pages/{slug}.html'``.
 
-.. data:: PAGE_LANG_URL = 'pages/{slug}-{lang}.html'
+.. data:: PAGE_LANG_URL
 
    The URL we will use to link to a page which doesn't use the default
-   language.
+   language. The default is ``'pages/{slug}-{lang}.html'``.
 
-.. data:: PAGE_LANG_SAVE_AS = 'pages/{slug}-{lang}.html'
+.. data:: PAGE_LANG_SAVE_AS
 
    The location we will save the page which doesn't use the default language.
+   The default is ``'pages/{slug}-{lang}.html'``.
 
-.. data:: DRAFT_PAGE_URL = 'drafts/pages/{slug}.html'
+.. data:: DRAFT_PAGE_URL
 
-   The URL used to link to a page draft.
+   The URL used to link to a page draft. The default is
+   ``'drafts/pages/{slug}.html'``.
 
-.. data:: DRAFT_PAGE_SAVE_AS = 'drafts/pages/{slug}.html'
+.. data:: DRAFT_PAGE_SAVE_AS
 
-   The actual location a page draft is saved at.
+   The actual location a page draft is saved at. The default is
+   ``'drafts/pages/{slug}.html'``.
 
-.. data:: DRAFT_PAGE_LANG_URL = 'drafts/pages/{slug}-{lang}.html'
+.. data:: DRAFT_PAGE_LANG_URL
 
    The URL used to link to a page draft which doesn't use the default
-   language.
+   language. The default is ``'drafts/pages/{slug}-{lang}.html'``.
 
-.. data:: DRAFT_PAGE_LANG_SAVE_AS = 'drafts/pages/{slug}-{lang}.html'
+.. data:: DRAFT_PAGE_LANG_SAVE_AS
 
    The actual location a page draft which doesn't use the default language is
-   saved at.
+   saved at. The default is ``'drafts/pages/{slug}-{lang}.html'``.
 
-.. data:: AUTHOR_URL = 'author/{slug}.html'
+.. data:: AUTHOR_URL
 
-   The URL to use for an author.
+   The URL to use for an author. The default is ``'author/{slug}.html'``.
 
-.. data:: AUTHOR_SAVE_AS = 'author/{slug}.html'
+.. data:: AUTHOR_SAVE_AS
 
-   The location to save an author.
+   The location to save an author. The default is ``'author/{slug}.html'``.
 
-.. data:: CATEGORY_URL = 'category/{slug}.html'
+.. data:: CATEGORY_URL
 
-   The URL to use for a category.
+   The URL to use for a category. The default is ``'category/{slug}.html'``.
 
-.. data:: CATEGORY_SAVE_AS = 'category/{slug}.html'
+.. data:: CATEGORY_SAVE_AS
 
-   The location to save a category.
+   The location to save a category. The default is ``'category/{slug}.html'``.
 
-.. data:: TAG_URL = 'tag/{slug}.html'
+.. data:: TAG_URL
 
-   The URL to use for a tag.
+   The URL to use for a tag. The default is ``'tag/{slug}.html'``.
 
-.. data:: TAG_SAVE_AS = 'tag/{slug}.html'
+.. data:: TAG_SAVE_AS
 
-   The location to save the tag page.
+   The location to save the tag page. The default is ``'tag/{slug}.html'``.
 
 .. note::
 
@@ -590,85 +630,81 @@ through the URLs ``posts/2011/`` and ``posts/2011/Aug/``, respectively.
     This way a reader can remove a portion of your URL and automatically arrive
     at an appropriate archive of posts, without having to specify a page name.
 
-.. data:: YEAR_ARCHIVE_SAVE_AS = ''
+.. data:: YEAR_ARCHIVE_SAVE_AS
 
-   The location to save per-year archives of your posts.
+   The location to save per-year archives of your posts. The default is ``''``.
 
-.. data:: YEAR_ARCHIVE_URL = ''
+.. data:: YEAR_ARCHIVE_URL
 
    The URL to use for per-year archives of your posts. You should set this if
-   you enable per-year archives.
+   you enable per-year archives. The default is ``''``.
 
-.. data:: MONTH_ARCHIVE_SAVE_AS = ''
+.. data:: MONTH_ARCHIVE_SAVE_AS
 
-   The location to save per-month archives of your posts.
+   The location to save per-month archives of your posts. The default is
+   ``''``.
 
-.. data:: MONTH_ARCHIVE_URL = ''
+.. data:: MONTH_ARCHIVE_URL
 
    The URL to use for per-month archives of your posts. You should set this if
-   you enable per-month archives.
+   you enable per-month archives. The default is ``''``.
 
-.. data:: DAY_ARCHIVE_SAVE_AS = ''
+.. data:: DAY_ARCHIVE_SAVE_AS
 
-   The location to save per-day archives of your posts.
+   The location to save per-day archives of your posts. The default is ``''``.
 
-.. data:: DAY_ARCHIVE_URL = ''
+.. data:: DAY_ARCHIVE_URL
 
    The URL to use for per-day archives of your posts. You should set this if
-   you enable per-day archives.
+   you enable per-day archives. The default is ``''``.
 
 ``DIRECT_TEMPLATES`` work a bit differently than noted above. Only the
 ``_SAVE_AS`` settings are available, but it is available for any direct
 template.
 
-.. data:: ARCHIVES_SAVE_AS = 'archives.html'
+.. data:: ARCHIVES_SAVE_AS
 
-   The location to save the article archives page.
+   The location to save the article archives page. The default is ``'archives.html'``.
 
-.. data:: AUTHORS_SAVE_AS = 'authors.html'
+.. data:: AUTHORS_SAVE_AS
 
-   The location to save the author list.
+   The location to save the author list. The default is ``'authors.html'``.
 
-.. data:: CATEGORIES_SAVE_AS = 'categories.html'
+.. data:: CATEGORIES_SAVE_AS
 
-   The location to save the category list.
+   The location to save the category list. The default is ``'categories.html'``.
 
-.. data:: TAGS_SAVE_AS = 'tags.html'
+.. data:: TAGS_SAVE_AS
 
-   The location to save the tag list.
+   The location to save the tag list. The default is ``'tags.html'``.
 
-.. data:: INDEX_SAVE_AS = 'index.html'
+.. data:: INDEX_SAVE_AS
 
-   The location to save the list of all articles.
+   The location to save the list of all articles. The default is ``'index.html'``.
 
 URLs for direct template pages are theme-dependent. Some themes use
 corresponding ``*_URL`` setting as string, while others hard-code them:
 ``'archives.html'``, ``'authors.html'``, ``'categories.html'``,
 ``'tags.html'``.
 
-.. data:: SLUGIFY_SOURCE = 'title'
+.. data:: SLUGIFY_SOURCE
 
    Specifies from where you want the slug to be automatically generated. Can be
    set to ``title`` to use the "Title:" metadata tag or ``basename`` to use the
-   article's file name when creating the slug.
+   article's file name when creating the slug. The default is ``'title'``.
 
-.. data:: SLUGIFY_USE_UNICODE = False
+.. data:: SLUGIFY_USE_UNICODE
 
    Allow Unicode characters in slugs. Set ``True`` to keep Unicode characters
    in auto-generated slugs. Otherwise, Unicode characters will be replaced
-   with ASCII equivalents.
+   with ASCII equivalents. The default is ``False``.
 
-.. data:: SLUGIFY_PRESERVE_CASE = False
+.. data:: SLUGIFY_PRESERVE_CASE
 
    Preserve uppercase characters in slugs. Set ``True`` to keep uppercase
-   characters from ``SLUGIFY_SOURCE`` as-is.
+   characters from ``SLUGIFY_SOURCE`` as-is. The default is ``False``.
 
-.. data:: SLUG_REGEX_SUBSTITUTIONS = [
-        (r'[^\\w\\s-]', ''),  # remove non-alphabetical/whitespace/'-' chars
-        (r'(?u)\\A\\s*', ''),  # strip leading whitespace
-        (r'(?u)\\s*\\Z', ''),  # strip trailing whitespace
-        (r'[-\\s]+', '-'),  # reduce multiple whitespace or '-' to single '-'
-    ]
+.. data:: SLUG_REGEX_SUBSTITUTIONS
 
    Regex substitutions to make when generating slugs of articles and pages.
    Specified as a list of pairs of ``(from, to)`` which are applied in order,
@@ -676,21 +712,29 @@ corresponding ``*_URL`` setting as string, while others hard-code them:
    non-alphanumeric characters and converting internal whitespace to dashes.
    Apart from these substitutions, slugs are always converted to lowercase
    ascii characters and leading and trailing whitespace is stripped. Useful for
-   backward compatibility with existing URLs.
+   backward compatibility with existing URLs. The default is::
 
-.. data:: AUTHOR_REGEX_SUBSTITUTIONS = SLUG_REGEX_SUBSTITUTIONS
+       [
+           (r'[^\\w\\s-]', ''),   # remove non-alphabetical/whitespace/'-' chars
+           (r'(?u)\\A\\s*', ''),  # strip leading whitespace
+           (r'(?u)\\s*\\Z', ''),  # strip trailing whitespace
+           (r'[-\\s]+', '-'),     # reduce multiple whitespace or '-' to single '-'
+       ]
 
-   Regex substitutions for author slugs. Defaults to
+.. data:: AUTHOR_REGEX_SUBSTITUTIONS
+
+   Regex substitutions for author slugs. The default is
    ``SLUG_REGEX_SUBSTITUTIONS``.
 
-.. data:: CATEGORY_REGEX_SUBSTITUTIONS = SLUG_REGEX_SUBSTITUTIONS
+.. data:: CATEGORY_REGEX_SUBSTITUTIONS
 
-   Regex substitutions for category slugs. Defaults to
+   Regex substitutions for category slugs. The default is
    ``SLUG_REGEX_SUBSTITUTIONS``.
 
-.. data:: TAG_REGEX_SUBSTITUTIONS = SLUG_REGEX_SUBSTITUTIONS
+.. data:: TAG_REGEX_SUBSTITUTIONS
 
-   Regex substitutions for tag slugs. Defaults to ``SLUG_REGEX_SUBSTITUTIONS``.
+   Regex substitutions for tag slugs. The default is
+   ``SLUG_REGEX_SUBSTITUTIONS``.
 
 Time and Date
 =============
@@ -710,20 +754,20 @@ Time and Date
 
 .. _the wikipedia page: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
-.. data:: DEFAULT_DATE = None
+.. data:: DEFAULT_DATE
 
    The default date you want to use.  If ``'fs'``, Pelican will use the file
    system timestamp information (mtime) if it can't get date information from
    the metadata.  If given any other string, it will be parsed by the same
    method as article metadata.  If set to a tuple object, the default datetime
    object will instead be generated by passing the tuple to the
-   ``datetime.datetime`` constructor.
+   ``datetime.datetime`` constructor. The default is ``None``.
 
-.. data:: DEFAULT_DATE_FORMAT = '%a %d %B %Y'
+.. data:: DEFAULT_DATE_FORMAT
 
-   The default date format you want to use.
+   The default date format you want to use. The default is ``'%a %d %B %Y'``.
 
-.. data:: DATE_FORMATS = {}
+.. data:: DATE_FORMATS
 
    If you manage multiple languages, you can set the date formatting here.
 
@@ -763,9 +807,11 @@ Time and Date
           'jp': ('jpn','%Y-%m-%d(%a)'),
       }
 
+   The default is ``{}``.
+
 .. data:: LOCALE
 
-   Change the locale [#]_. A list of locales can be provided here or a single
+   Change the locale. A list of locales can be provided here or a single
    string representing one locale.  When providing a list, all the locales will
    be tried until one works.
 
@@ -779,11 +825,9 @@ Time and Date
 
    For a list of available locales refer to `locales on Windows`_  or on
    Unix/Linux, use the ``locale -a`` command; see manpage
-   `locale(1)`_ for more information.
+   `locale(1)`_ for more information. The default is the system locale.
 
 
-.. [#] Default is the system locale.
-
 .. _Jinja custom filters documentation: https://jinja.palletsprojects.com/en/latest/api/#custom-filters
 .. _Jinja global namespace documentation: https://jinja.palletsprojects.com/en/latest/api/#the-global-namespace
 .. _Jinja custom tests documentation: https://jinja.palletsprojects.com/en/latest/api/#custom-tests
@@ -798,7 +842,7 @@ Time and Date
 Template pages
 ==============
 
-.. data:: TEMPLATE_PAGES = None
+.. data:: TEMPLATE_PAGES
 
    A mapping containing template pages that will be rendered with the blog
    entries.
@@ -814,11 +858,14 @@ Template pages
                          'src/resume.html': 'dest/resume.html',
                          'src/contact.html': 'dest/contact.html'}
 
-.. data:: TEMPLATE_EXTENSIONS = ['.html']
+   The default is ``{}``.
+
+.. data:: TEMPLATE_EXTENSIONS
 
    The extensions to use when looking up template files from template names.
+   The default is ``['.html']``.
 
-.. data:: DIRECT_TEMPLATES = ['index', 'authors', 'categories', 'tags', 'archives']
+.. data:: DIRECT_TEMPLATES
 
    List of templates that are used directly to render content. Typically direct
    templates are used to generate index pages for collections of content (e.g.,
@@ -828,19 +875,21 @@ Template pages
    ``DIRECT_TEMPLATES`` are searched for over paths maintained in
    ``THEME_TEMPLATES_OVERRIDES``.
 
+   The default is ``['index', 'tags', 'categories', 'authors', 'archives']``.
 
 Metadata
 ========
 
 .. data:: AUTHOR
 
-   Default author (usually your name).
+   Default author (usually your name). The default is ``None``, which removes the byline.
 
-.. data:: DEFAULT_METADATA = {}
+.. data:: DEFAULT_METADATA
 
-   The default metadata you want to use for all articles and pages.
+   The default metadata you want to use for all articles and pages. The default
+   is ``{}``.
 
-.. data:: FILENAME_METADATA = r'(?P<date>\\d{4}-\\d{2}-\\d{2}).*'
+.. data:: FILENAME_METADATA
 
    The regexp that will be used to extract any metadata from the filename. All
    named groups that are matched will be set in the metadata object.  The
@@ -850,14 +899,14 @@ Metadata
 
       FILENAME_METADATA = r'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'
 
-   See also ``SLUGIFY_SOURCE``.
+   See also ``SLUGIFY_SOURCE``. The default is ``r'(?P<date>\d{4}-\d{2}-\d{2}).*'``.
 
-.. data:: PATH_METADATA = ''
+.. data:: PATH_METADATA
 
    Like ``FILENAME_METADATA``, but parsed from a page's full path relative to
-   the content source directory.
+   the content source directory. The default is ``''``.
 
-.. data:: EXTRA_PATH_METADATA = {}
+.. data:: EXTRA_PATH_METADATA
 
    Extra metadata dictionaries keyed by relative path. Relative paths require
    correct OS-specific directory separators (i.e. / in UNIX and \\ in Windows)
@@ -903,6 +952,8 @@ file:
 .. _group name notation:
    https://docs.python.org/3/library/re.html#regular-expression-syntax
 
+   The default is ``{}``.
+
 
 Feed settings
 =============
@@ -914,123 +965,130 @@ Pelican generates category feeds as well as feeds for all your articles. It
 does not generate feeds for tags by default, but it is possible to do so using
 the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 
-.. data:: FEED_DOMAIN = None, i.e. base URL is "/"
+.. data:: FEED_DOMAIN
 
    The domain prepended to feed URLs. Since feed URLs should always be
    absolute, it is highly recommended to define this (e.g.,
    "https://feeds.example.com"). If you have already explicitly defined SITEURL
    (see above) and want to use the same domain for your feeds, you can just
-   set:  ``FEED_DOMAIN = SITEURL``.
+   set:  ``FEED_DOMAIN = SITEURL``. The default is ``None``, which uses the
+   base URL "/".
 
-.. data:: FEED_ATOM = None, i.e. no Atom feed
+.. data:: FEED_ATOM
 
-   The location to save the Atom feed.
+   The location to save the Atom feed. The default is ``None``, for no Atom
+   feed.
 
-.. data:: FEED_ATOM_URL = None
+.. data:: FEED_ATOM_URL
 
    Relative URL of the Atom feed. If not set, ``FEED_ATOM`` is used both for
-   save location and URL.
+   save location and URL. The default is ``None``.
 
-.. data:: FEED_RSS = None, i.e. no RSS
+.. data:: FEED_RSS
 
-   The location to save the RSS feed.
+   The location to save the RSS feed. The default is ``None``, for no RSS feed.
 
-.. data:: FEED_RSS_URL = None
+.. data:: FEED_RSS_URL
 
    Relative URL of the RSS feed. If not set, ``FEED_RSS`` is used both for save
-   location and URL.
+   location and URL. The default is ``None``.
 
-.. data:: FEED_ALL_ATOM = 'feeds/all.atom.xml'
+.. data:: FEED_ALL_ATOM
 
    The location to save the all-posts Atom feed: this feed will contain all
-   posts regardless of their language.
+   posts regardless of their language. The default is ``'feeds/all.atom.xml'``.
 
-.. data:: FEED_ALL_ATOM_URL = None
+.. data:: FEED_ALL_ATOM_URL
 
    Relative URL of the all-posts Atom feed. If not set, ``FEED_ALL_ATOM`` is
-   used both for save location and URL.
+   used both for save location and URL. The default is ``None``.
 
-.. data:: FEED_ALL_RSS = None, i.e. no all-posts RSS
+.. data:: FEED_ALL_RSS
 
    The location to save the the all-posts RSS feed: this feed will contain all
-   posts regardless of their language.
+   posts regardless of their language. The default is ``None``, for no
+   all-posts RSS feed.
 
-.. data:: FEED_ALL_RSS_URL = None
+.. data:: FEED_ALL_RSS_URL
 
    Relative URL of the all-posts RSS feed. If not set, ``FEED_ALL_RSS`` is used
-   both for save location and URL.
+   both for save location and URL. The default is ``None``.
 
-.. data:: CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml'
+.. data:: CATEGORY_FEED_ATOM
 
-   The location to save the category Atom feeds. [2]_
+   The location to save the category Atom feeds. [2]_ The default is
+   ``'feeds/{slug}.atom.xml'``.
 
-.. data:: CATEGORY_FEED_ATOM_URL = None
+.. data:: CATEGORY_FEED_ATOM_URL
 
    Relative URL of the category Atom feeds, including the ``{slug}``
    placeholder. [2]_ If not set, ``CATEGORY_FEED_ATOM`` is used both for save
-   location and URL.
+   location and URL. The default is ``None``.
 
-.. data:: CATEGORY_FEED_RSS = None, i.e. no RSS
+.. data:: CATEGORY_FEED_RSS
 
    The location to save the category RSS feeds, including the ``{slug}``
-   placeholder. [2]_
+   placeholder. [2]_ The default is ``None``, for no RSS feed.
 
-.. data:: CATEGORY_FEED_RSS_URL = None
+.. data:: CATEGORY_FEED_RSS_URL
 
    Relative URL of the category RSS feeds, including the ``{slug}``
    placeholder. [2]_ If not set, ``CATEGORY_FEED_RSS`` is used both for save
-   location and URL.
+   location and URL. The default is ``None``.
 
-.. data:: AUTHOR_FEED_ATOM = 'feeds/{slug}.atom.xml'
+.. data:: AUTHOR_FEED_ATOM
 
-   The location to save the author Atom feeds. [2]_
+   The location to save the author Atom feeds. [2]_ The default is
+   ``'feeds/{slug}.atom.xml'``.
 
-.. data:: AUTHOR_FEED_ATOM_URL = None
+.. data:: AUTHOR_FEED_ATOM_URL
 
    Relative URL of the author Atom feeds, including the ``{slug}`` placeholder.
    [2]_ If not set, ``AUTHOR_FEED_ATOM`` is used both for save location and
-   URL.
+   URL. The default is ``None`` (not set).
 
-.. data:: AUTHOR_FEED_RSS = 'feeds/{slug}.rss.xml'
+.. data:: AUTHOR_FEED_RSS
 
-   The location to save the author RSS feeds. [2]_
+   The location to save the author RSS feeds. [2]_ The default is
+   ``'feeds/{slug}.rss.xml'``.
 
-.. data:: AUTHOR_FEED_RSS_URL = None
+.. data:: AUTHOR_FEED_RSS_URL
 
    Relative URL of the author RSS feeds, including the ``{slug}`` placeholder.
    [2]_ If not set, ``AUTHOR_FEED_RSS`` is used both for save location and URL.
+   The default is ``None``.
 
-.. data:: TAG_FEED_ATOM = None, i.e. no tag feed
+.. data:: TAG_FEED_ATOM
 
    The location to save the tag Atom feed, including the ``{slug}``
-   placeholder. [2]_
+   placeholder. [2]_ The default is ``None``, for no tag feed.
 
-.. data:: TAG_FEED_ATOM_URL = None
+.. data:: TAG_FEED_ATOM_URL
 
    Relative URL of the tag Atom feed, including the ``{slug}`` placeholder.
-   [2]_
+   [2]_ The default is ``None``.
 
-.. data:: TAG_FEED_RSS = None, i.e. no RSS tag feed
+.. data:: TAG_FEED_RSS
 
    Relative URL to output the tag RSS feed, including the ``{slug}``
    placeholder. If not set, ``TAG_FEED_RSS`` is used both for save location and
-   URL.
+   URL. The default is ``None``, for no tag feed.
 
-.. data:: FEED_MAX_ITEMS = 100
+.. data:: FEED_MAX_ITEMS
 
    Maximum number of items allowed in a feed. Setting to ``None`` will cause the
-   feed to contains every article. 100 if not specified.
+   feed to contains every article. 100 if not specified. The default is ``100``.
 
-.. data:: RSS_FEED_SUMMARY_ONLY = True
+.. data:: RSS_FEED_SUMMARY_ONLY
 
    Only include item summaries in the ``description`` tag of RSS feeds. If set
    to ``False``, the full content will be included instead. This setting
-   doesn't affect Atom feeds, only RSS ones.
+   doesn't affect Atom feeds, only RSS ones. The default is ``True``.
 
-.. data:: FEED_APPEND_REF = False
+.. data:: FEED_APPEND_REF
 
    If set to ``True``, ``?ref=feed`` will be appended to links in generated
-   feeds for the purpose of referrer tracking.
+   feeds for the purpose of referrer tracking. The default is ``False``.
 
 If you don't want to generate some or any of these feeds, set the above
 variables to ``None``.
@@ -1048,27 +1106,32 @@ paginating this list.
 
 You can use the following settings to configure the pagination.
 
-.. data:: DEFAULT_ORPHANS = 0
+.. data:: DEFAULT_ORPHANS
 
    The minimum number of articles allowed on the last page. Use this when you
-   don't want the last page to only contain a handful of articles.
+   don't want the last page to only contain a handful of articles. The default
+   is ``0``.
 
-.. data:: DEFAULT_PAGINATION = False
+.. data:: DEFAULT_PAGINATION
 
    The maximum number of articles to include on a page, not including orphans.
-   False to disable pagination.
+   False to disable pagination. The default is ``False``.
 
-.. data:: PAGINATED_TEMPLATES = {'index': None, 'tag': None, 'category': None, 'author': None}
+.. data:: PAGINATED_TEMPLATES
 
    The templates to use pagination with, and the number of articles to include
    on a page. If this value is ``None``, it defaults to ``DEFAULT_PAGINATION``.
+   The default is ``{'index': None, 'tag': None, 'category': None, 'author': None}``.
 
-.. data:: PAGINATION_PATTERNS = (
-      (1, '{name}{extension}', '{name}{extension}'),
-      (2, '{name}{number}{extension}', '{name}{number}{extension}'),
-  )
+.. data:: PAGINATION_PATTERNS
 
-   A set of patterns that are used to determine advanced pagination output.
+   A set of patterns that are used to determine advanced pagination output. The
+   default is::
+
+       (
+           (1, '{name}{extension}', '{name}{extension}'),
+           (2, '{name}{number}{extension}', '{name}{number}{extension}'),
+       )
 
 
 Using Pagination Patterns
@@ -1108,59 +1171,62 @@ Translations
 Pelican offers a way to translate articles. See the :doc:`Content <content>`
 section for more information.
 
-.. data:: DEFAULT_LANG = 'en'
+.. data:: DEFAULT_LANG
 
-   The default language to use.
+   The default language to use. The default is ``'en'``.
 
-.. data:: ARTICLE_TRANSLATION_ID = 'slug'
+.. data:: ARTICLE_TRANSLATION_ID
 
    The metadata attribute(s) used to identify which articles are translations
    of one another. May be a string or a collection of strings. Set to ``None``
-   or ``False`` to disable the identification of translations.
+   or ``False`` to disable the identification of translations. The default is
+   ``'slug'``.
 
-.. data:: PAGE_TRANSLATION_ID = 'slug'
+.. data:: PAGE_TRANSLATION_ID
 
    The metadata attribute(s) used to identify which pages are translations of
    one another. May be a string or a collection of strings. Set to ``None`` or
-   ``False`` to disable the identification of translations.
+   ``False`` to disable the identification of translations. The default is
+   ``'slug'``.
 
-.. data:: TRANSLATION_FEED_ATOM = 'feeds/all-{lang}.atom.xml'
+.. data:: TRANSLATION_FEED_ATOM
 
-   The location to save the Atom feed for translations. [3]_
+   The location to save the Atom feed for translations. [3]_ The default is
+   ``'feeds/all-{lang}.atom.xml'``.
 
-.. data:: TRANSLATION_FEED_ATOM_URL = None
+.. data:: TRANSLATION_FEED_ATOM_URL
 
    Relative URL of the Atom feed for translations, including the ``{lang}``
    placeholder. [3]_ If not set, ``TRANSLATION_FEED_ATOM`` is used both for
-   save location and URL.
+   save location and URL. The default is ``None``.
 
-.. data:: TRANSLATION_FEED_RSS = None, i.e. no RSS
+.. data:: TRANSLATION_FEED_RSS
 
-   Where to put the RSS feed for translations.
+   Where to put the RSS feed for translations. The default is ``None``,
+   meaning no RSS feed.
 
-.. data:: TRANSLATION_FEED_RSS_URL = None
+.. data:: TRANSLATION_FEED_RSS_URL
 
    Relative URL of the RSS feed for translations, including the ``{lang}``
    placeholder. [3]_ If not set, ``TRANSLATION_FEED_RSS`` is used both for save
-   location and URL.
+   location and URL. The default is ``None``.
 
 .. [3] {lang} is the language code
 
-
 Ordering content
 ================
 
-.. data:: NEWEST_FIRST_ARCHIVES = True
+.. data:: NEWEST_FIRST_ARCHIVES
 
    Order archives by newest first by date. (False: orders by date with older
-   articles first.)
+   articles first.) The default is ``True``.
 
-.. data:: REVERSE_CATEGORY_ORDER = False
+.. data:: REVERSE_CATEGORY_ORDER
 
    Reverse the category order. (True: lists by reverse alphabetical order;
-   default lists alphabetically.)
+   default lists alphabetically.) The default is ``False``.
 
-.. data:: ARTICLE_ORDER_BY = 'reversed-date'
+.. data:: ARTICLE_ORDER_BY
 
    Defines how the articles (``articles_page.object_list`` in the template) are
    sorted. Valid options are: metadata as a string (use ``reversed-`` prefix
@@ -1168,13 +1234,14 @@ Ordering content
    the basename of the file (without path), or a custom function to extract the
    sorting key from articles. Using a value of ``'date'`` will sort articles in
    chronological order, while the default value, ``'reversed-date'``, will sort
-   articles by date in reverse order (i.e., newest article comes first).
+   articles by date in reverse order (i.e., newest article comes first). The
+   default is ``'reversed-date'``.
 
-.. data:: PAGE_ORDER_BY = 'basename'
+.. data:: PAGE_ORDER_BY
 
    Defines how the pages (``pages`` variable in the template) are sorted.
    Options are same as ``ARTICLE_ORDER_BY``.  The default value, ``'basename'``
-   will sort pages by their basename.
+   will sort pages by their basename. The default is ``'basename'``.
 
 
 .. _settings/themes:
@@ -1190,27 +1257,28 @@ themes.
 
    Theme to use to produce the output. Can be a relative or absolute path to a
    theme folder, or the name of a default theme or a theme installed via
-   :doc:`pelican-themes` (see below).
+   :doc:`pelican-themes` (see below). The default theme is "notmyidea".
 
-.. data:: THEME_STATIC_DIR = 'theme'
+.. data:: THEME_STATIC_DIR
 
    Destination directory in the output path where Pelican will place the files
-   collected from `THEME_STATIC_PATHS`. Default is `theme`.
+   collected from `THEME_STATIC_PATHS`. Default is `theme`. The default is
+   ``'theme'``.
 
-.. data:: THEME_STATIC_PATHS = ['static']
+.. data:: THEME_STATIC_PATHS
 
    Static theme paths you want to copy. Default value is `static`, but if your
    theme has other static paths, you can put them here. If files or directories
    with the same names are included in the paths defined in this settings, they
-   will be progressively overwritten.
+   will be progressively overwritten. The default is ``['static']``.
 
-.. data:: THEME_TEMPLATES_OVERRIDES = []
+.. data:: THEME_TEMPLATES_OVERRIDES
 
    A list of paths you want Jinja2 to search for templates before searching the
    theme's ``templates/`` directory.  Allows for overriding individual theme
    template files without having to fork an existing theme.  Jinja2 searches in
    the following order: files in ``THEME_TEMPLATES_OVERRIDES`` first, then the
-   theme's ``templates/``.
+   theme's ``templates/``. The default is ``[]``.
 
    You can also extend templates from the theme using the ``{% extends %}``
    directive utilizing the ``!theme`` prefix as shown in the following example:
@@ -1219,9 +1287,9 @@ themes.
 
       {% extends '!theme/article.html' %}
 
-.. data:: CSS_FILE = 'main.css'
+.. data:: CSS_FILE
 
-   Specify the CSS file you want to load.
+   Specify the CSS file you want to load. The default is ``'main.css'``.
 
 By default, two themes are available. You can specify them using the ``THEME``
 setting or by passing the ``-t`` option to the ``pelican`` command:
@@ -1252,24 +1320,24 @@ The built-in ``simple`` theme can be customized using the following settings.
 
 .. data:: STYLESHEET_URL
 
-   The URL of the stylesheet to use.
+   The URL of the stylesheet to use. The default is ``None``.
 
 The built-in ``notmyidea`` theme can make good use of the following settings.
 Feel free to use them in your themes as well.
 
 .. data:: SITESUBTITLE
 
-   A subtitle to appear in the header.
+   A subtitle to appear in the header. The default is ``None``.
 
 .. data:: DISQUS_SITENAME
 
    Pelican can handle Disqus comments. Specify the Disqus sitename identifier
-   here.
+   here. The default is ``None``.
 
 .. data:: GITHUB_URL
 
    Your GitHub URL (if you have one). It will then use this information to
-   create a GitHub ribbon.
+   create a GitHub ribbon. The default is ``None``.
 
 .. data:: ANALYTICS
 
@@ -1285,33 +1353,38 @@ Feel free to use them in your themes as well.
           </script>
       """
 
+   The default is ``None``.
+
 .. data:: MENUITEMS
 
    A list of tuples (Title, URL) for additional menu items to appear at the
-   beginning of the main menu.
+   beginning of the main menu. The default is ``None``.
 
 .. data:: LINKS
 
-   A list of tuples (Title, URL) for links to appear on the header.
+   A list of tuples (Title, URL) for links to appear on the header. The
+   default is ``None``.
 
 .. data:: SOCIAL
 
-   A list of tuples (Title, URL) to appear in the "social" section.
+   A list of tuples (Title, URL) to appear in the "social" section. The
+   default is ``None``.
 
 .. data:: TWITTER_USERNAME
 
    Allows for adding a button to articles to encourage others to tweet about
-   them. Add your Twitter username if you want this button to appear.
+   them. Add your Twitter username if you want this button to appear. The
+   default is ``None``.
 
 .. data:: LINKS_WIDGET_NAME
 
    Allows override of the name of the links widget.  If not specified, defaults
-   to "links".
+   to "links". The default is ``None``.
 
 .. data:: SOCIAL_WIDGET_NAME
 
    Allows override of the name of the "social" widget.  If not specified,
-   defaults to "social".
+   defaults to "social". The default is ``None``.
 
 In addition, you can use the "wide" version of the ``notmyidea`` theme by
 adding the following to your configuration::

From 7fd66d8a95337251b7ee2626e3565d17dfe79450 Mon Sep 17 00:00:00 2001
From: Kristinita <Kristinita@users.noreply.github.com>
Date: Tue, 15 Apr 2025 11:14:33 +0300
Subject: [PATCH 2789/2864] docs: Use raw string for the `PATH_METADATA`
 setting

---
 docs/faq.rst        | 2 +-
 docs/settings.rst   | 2 +-
 pelican/settings.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 8ae3af29..dc6097c8 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -118,7 +118,7 @@ How do I make my output folder structure identical to my content hierarchy?
 Try these settings::
 
     USE_FOLDER_AS_CATEGORY = False
-    PATH_METADATA = "(?P<path_no_ext>.*)\..*"
+    PATH_METADATA = r"(?P<path_no_ext>.*)\..*"
     ARTICLE_URL = ARTICLE_SAVE_AS = PAGE_URL = PAGE_SAVE_AS = "{path_no_ext}.html"
 
 How do I assign custom templates on a per-page basis?
diff --git a/docs/settings.rst b/docs/settings.rst
index 89333f47..775bd528 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -458,7 +458,7 @@ If you don't want that flexibility and instead prefer that your generated
 output paths mirror your source content's filesystem path hierarchy, try the
 following settings::
 
-    PATH_METADATA = '(?P<path_no_ext>.*)\..*'
+    PATH_METADATA = r'(?P<path_no_ext>.*)\..*'
     ARTICLE_URL = ARTICLE_SAVE_AS = PAGE_URL = PAGE_SAVE_AS = '{path_no_ext}.html'
 
 Otherwise, you can use a variety of file metadata attributes within URL-related
diff --git a/pelican/settings.py b/pelican/settings.py
index 3abe11bb..2932627e 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -144,7 +144,7 @@ DEFAULT_CONFIG = {
     "DEFAULT_ORPHANS": 0,
     "DEFAULT_METADATA": {},
     "FILENAME_METADATA": r"(?P<date>\d{4}-\d{2}-\d{2}).*",
-    "PATH_METADATA": "",
+    "PATH_METADATA": r"",
     "EXTRA_PATH_METADATA": {},
     "ARTICLE_PERMALINK_STRUCTURE": "",
     "TYPOGRIFY": False,

From ca32b1b77cd009038f482f309688d44291c6f7da Mon Sep 17 00:00:00 2001
From: n <>
Date: Sat, 10 May 2025 12:41:57 +0200
Subject: [PATCH 2790/2864] bump pygments version to <2.20.0

---
 pelican/tests/output/basic/feeds/all-en.atom.xml              | 2 +-
 pelican/tests/output/basic/feeds/all.atom.xml                 | 2 +-
 pelican/tests/output/basic/feeds/misc.atom.xml                | 2 +-
 pelican/tests/output/basic/unbelievable.html                  | 2 +-
 pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml   | 2 +-
 pelican/tests/output/custom/feeds/all-en.atom.xml             | 2 +-
 pelican/tests/output/custom/feeds/all.atom.xml                | 2 +-
 pelican/tests/output/custom/feeds/misc.atom.xml               | 2 +-
 pelican/tests/output/custom/unbelievable.html                 | 2 +-
 .../output/custom_locale/feeds/alexis-metaireau.atom.xml      | 2 +-
 pelican/tests/output/custom_locale/feeds/all-en.atom.xml      | 2 +-
 pelican/tests/output/custom_locale/feeds/all.atom.xml         | 2 +-
 pelican/tests/output/custom_locale/feeds/misc.atom.xml        | 2 +-
 .../posts/2010/octobre/15/unbelievable/index.html             | 2 +-
 pyproject.toml                                                | 4 ++--
 requirements/test.pip                                         | 2 +-
 16 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 49c76c62..73261f1d 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt;&lt;span class="testingw"&gt; &lt;/span&gt;&lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index b2399afe..41dd9cbf 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -57,7 +57,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt;&lt;span class="testingw"&gt; &lt;/span&gt;&lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index 9127b2a5..94730137 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt;&lt;span class="testingw"&gt; &lt;/span&gt;&lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 2cd85dcb..37a40736 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -57,7 +57,7 @@
                                         </div>
                                         <div class="section" id="testing-more-sourcecode-directives">
                                                 <h2>Testing more sourcecode directives</h2>
-                                                <div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+                                                <div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span><span class="testingw"> </span><span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
                                                 <p>Lovely.</p>
                                         </div>
                                         <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index 5bfb73d0..affc9e2f 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt;&lt;span class="testingw"&gt; &lt;/span&gt;&lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 1aac415a..d20fabb8 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt;&lt;span class="testingw"&gt; &lt;/span&gt;&lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index dbe37a32..15d98711 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -57,7 +57,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt;&lt;span class="testingw"&gt; &lt;/span&gt;&lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 117c2bc2..9365d612 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt;&lt;span class="testingw"&gt; &lt;/span&gt;&lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 0d88db61..ae3a235f 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -64,7 +64,7 @@
                                         </div>
                                         <div class="section" id="testing-more-sourcecode-directives">
                                                 <h2>Testing more sourcecode directives</h2>
-                                                <div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+                                                <div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span><span class="testingw"> </span><span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
                                                 <p>Lovely.</p>
                                         </div>
                                         <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 85b63173..3e25af4a 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt;&lt;span class="testingw"&gt; &lt;/span&gt;&lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 974b4279..b88949b4 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -55,7 +55,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt;&lt;span class="testingw"&gt; &lt;/span&gt;&lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index c2a5ef38..acb0ca23 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -57,7 +57,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt;&lt;span class="testingw"&gt; &lt;/span&gt;&lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index 4898ab84..2484c569 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -30,7 +30,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
 &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span&gt;&lt;/span&gt;&lt;span id="foo-8"&gt;&lt;a id="foo-8" name="foo-8"&gt;&lt;/a&gt;&lt;a href="#foo-8"&gt;&lt;span class="linenos special"&gt; 8&lt;/span&gt;&lt;/a&gt;&lt;span class="testingk"&gt;def&lt;/span&gt;&lt;span class="testingw"&gt; &lt;/span&gt;&lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a id="foo-9" name="foo-9"&gt;&lt;/a&gt;&lt;a href="#foo-9"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a id="foo-10" name="foo-10"&gt;&lt;/a&gt;&lt;a href="#foo-10"&gt;&lt;span class="linenos special"&gt;10&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a id="foo-11" name="foo-11"&gt;&lt;/a&gt;&lt;a href="#foo-11"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a id="foo-12" name="foo-12"&gt;&lt;/a&gt;&lt;a href="#foo-12"&gt;&lt;span class="linenos special"&gt;12&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a id="foo-13" name="foo-13"&gt;&lt;/a&gt;&lt;a href="#foo-13"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a id="foo-14" name="foo-14"&gt;&lt;/a&gt;&lt;a href="#foo-14"&gt;&lt;span class="linenos special"&gt;14&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a id="foo-15" name="foo-15"&gt;&lt;/a&gt;&lt;a href="#foo-15"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a id="foo-16" name="foo-16"&gt;&lt;/a&gt;&lt;a href="#foo-16"&gt;&lt;span class="linenos special"&gt;16&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a id="foo-17" name="foo-17"&gt;&lt;/a&gt;&lt;a href="#foo-17"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a id="foo-18" name="foo-18"&gt;&lt;/a&gt;&lt;a href="#foo-18"&gt;&lt;span class="linenos special"&gt;18&lt;/span&gt;&lt;/a&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a id="foo-19" name="foo-19"&gt;&lt;/a&gt;&lt;a href="#foo-19"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a id="foo-20" name="foo-20"&gt;&lt;/a&gt;&lt;a href="#foo-20"&gt;&lt;span class="linenos special"&gt;20&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a id="foo-21" name="foo-21"&gt;&lt;/a&gt;&lt;a href="#foo-21"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a id="foo-22" name="foo-22"&gt;&lt;/a&gt;&lt;a href="#foo-22"&gt;&lt;span class="linenos special"&gt;22&lt;/span&gt;&lt;/a&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingkc"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a id="foo-23" name="foo-23"&gt;&lt;/a&gt;&lt;a href="#foo-23"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a id="foo-24" name="foo-24"&gt;&lt;/a&gt;&lt;a href="#foo-24"&gt;&lt;span class="linenos special"&gt;24&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a id="foo-25" name="foo-25"&gt;&lt;/a&gt;&lt;a href="#foo-25"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingkc"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a id="foo-26" name="foo-26"&gt;&lt;/a&gt;&lt;a href="#foo-26"&gt;&lt;span class="linenos special"&gt;26&lt;/span&gt;&lt;/a&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a id="foo-27" name="foo-27"&gt;&lt;/a&gt;&lt;a href="#foo-27"&gt;&lt;span class="linenos"&gt;  &lt;/span&gt;&lt;/a&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingnb"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index a5788171..35da4c63 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -64,7 +64,7 @@
                                         </div>
                                         <div class="section" id="testing-more-sourcecode-directives">
                                                 <h2>Testing more sourcecode directives</h2>
-                                                <div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+                                                <div class="highlight"><pre><span></span><span id="foo-8"><a id="foo-8" name="foo-8"></a><a href="#foo-8"><span class="linenos special"> 8</span></a><span class="testingk">def</span><span class="testingw"> </span><span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a id="foo-9" name="foo-9"></a><a href="#foo-9"><span class="linenos">  </span></a>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a id="foo-10" name="foo-10"></a><a href="#foo-10"><span class="linenos special">10</span></a>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a id="foo-11" name="foo-11"></a><a href="#foo-11"><span class="linenos">  </span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a id="foo-12" name="foo-12"></a><a href="#foo-12"><span class="linenos special">12</span></a>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a id="foo-13" name="foo-13"></a><a href="#foo-13"><span class="linenos">  </span></a>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a id="foo-14" name="foo-14"></a><a href="#foo-14"><span class="linenos special">14</span></a>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a id="foo-15" name="foo-15"></a><a href="#foo-15"><span class="linenos">  </span></a><br></span><span id="foo-16"><a id="foo-16" name="foo-16"></a><a href="#foo-16"><span class="linenos special">16</span></a>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a id="foo-17" name="foo-17"></a><a href="#foo-17"><span class="linenos">  </span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a id="foo-18" name="foo-18"></a><a href="#foo-18"><span class="linenos special">18</span></a>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a id="foo-19" name="foo-19"></a><a href="#foo-19"><span class="linenos">  </span></a><br></span><span id="foo-20"><a id="foo-20" name="foo-20"></a><a href="#foo-20"><span class="linenos special">20</span></a>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a id="foo-21" name="foo-21"></a><a href="#foo-21"><span class="linenos">  </span></a>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a id="foo-22" name="foo-22"></a><a href="#foo-22"><span class="linenos special">22</span></a>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingkc">True</span><br></span><span id="foo-23"><a id="foo-23" name="foo-23"></a><a href="#foo-23"><span class="linenos">  </span></a><br></span><span id="foo-24"><a id="foo-24" name="foo-24"></a><a href="#foo-24"><span class="linenos special">24</span></a>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a id="foo-25" name="foo-25"></a><a href="#foo-25"><span class="linenos">  </span></a>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingkc">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a id="foo-26" name="foo-26"></a><a href="#foo-26"><span class="linenos special">26</span></a>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a id="foo-27" name="foo-27"></a><a href="#foo-27"><span class="linenos">  </span></a>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingnb">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
                                                 <p>Lovely.</p>
                                         </div>
                                         <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pyproject.toml b/pyproject.toml
index 9684d6df..16c3e460 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -34,7 +34,7 @@ dependencies = [
     "feedgenerator>=2.1.0",
     "jinja2>=3.1.2",
     "ordered-set>=4.1.0",
-    "pygments>=2.16.1,<2.19.0",
+    "pygments>=2.16.1,<2.20.0",
     "python-dateutil>=2.8.2",
     "rich>=13.6.0",
     "unidecode>=1.3.7",
@@ -88,7 +88,7 @@ dev = [
     "furo==2023.9.10",
     "livereload>=2.6.3",
     "psutil>=5.9.6",
-    "pygments>=2.16.1,<2.19.0",
+    "pygments>=2.16.1,<2.20.0",
     "pytest>=7.4.3",
     "pytest-cov>=4.1.0",
     "pytest-sugar>=0.9.7",
diff --git a/requirements/test.pip b/requirements/test.pip
index a2c35d57..8d8cd5e1 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,5 +1,5 @@
 # Tests
-Pygments>=2.16.1
+Pygments>=2.19.0
 pytest
 pytest-cov
 pytest-xdist[psutil]

From 07f32c1a0945852385457c6b64b8689882b6a9c6 Mon Sep 17 00:00:00 2001
From: Emmanuel Ferdman <emmanuelferdman@gmail.com>
Date: Tue, 13 May 2025 06:40:14 -0700
Subject: [PATCH 2791/2864] fix: resolve datetime warnings

Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com>
---
 pelican/contents.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index c48715dc..1ce61b43 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -4,7 +4,6 @@ import locale
 import logging
 import os
 import re
-from datetime import timezone
 from html import unescape
 from typing import Any, Optional
 from urllib.parse import ParseResult, unquote, urljoin, urlparse, urlunparse
@@ -593,7 +592,7 @@ class Article(Content):
             if self.date.tzinfo is None:
                 now = datetime.datetime.now()
             else:
-                now = datetime.datetime.utcnow().replace(tzinfo=timezone.utc)
+                now = datetime.datetime.now(datetime.timezone.utc)
             if self.date > now:
                 self.status = "draft"
 

From ffe22e3c59b012f05d44479b3979941877640596 Mon Sep 17 00:00:00 2001
From: Ilya Simpson <elliot@p-s.co.nz>
Date: Thu, 29 May 2025 22:29:33 +1200
Subject: [PATCH 2792/2864] Fixing documented default for `ARTICLE_SAVE_AS`.

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 775bd528..c7e514b1 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -503,7 +503,7 @@ This would save your articles into something like
 
 .. data:: ARTICLE_SAVE_AS
 
-   The place where we will save an article. The default is ``'{slug.html}'``.
+   The place where we will save an article. The default is ``'{slug}.html'``.
 
 .. data:: ARTICLE_LANG_URL
 

From f44ec524278bb0fd53ef11b6ef0d83ab70109de3 Mon Sep 17 00:00:00 2001
From: Ilya Simpson <elliot@p-s.co.nz>
Date: Sun, 1 Jun 2025 19:04:45 +1200
Subject: [PATCH 2793/2864] Enable `flake8-builtins` Ruff rule.

---
 docs/conf.py                    |  2 +-
 pelican/server.py               |  4 ++--
 pelican/tests/test_plugins.py   | 10 ++++-----
 pelican/tests/test_utils.py     | 32 +++++++++++++++------------
 pelican/tools/pelican_import.py | 38 +++++++++++++++++----------------
 pyproject.toml                  |  2 +-
 tasks.py                        |  4 ++--
 7 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 283562b9..4c15bc62 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -34,7 +34,7 @@ project = project_data.get("name").upper()
 year = datetime.datetime.fromtimestamp(
     int(os.environ.get("SOURCE_DATE_EPOCH", time.time())), datetime.timezone.utc
 ).year
-copyright = f"2010–{year}"  # noqa: RUF001
+project_copyright = f"2010–{year}"  # noqa: RUF001
 exclude_patterns = ["_build"]
 release = project_data.get("version")
 version = ".".join(release.split(".")[:1])
diff --git a/pelican/server.py b/pelican/server.py
index ebf13677..c4607e21 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -122,8 +122,8 @@ class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
 
         return mimetype
 
-    def log_message(self, format, *args):
-        logger.info(format, *args)
+    def log_message(self, msg_format, *args):
+        logger.info(msg_format, *args)
 
 
 class RootedHTTPServer(server.HTTPServer):
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
index 69a0384c..42bb2ca6 100644
--- a/pelican/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -273,14 +273,14 @@ class PluginTest(unittest.TestCase):
         expected = []
         for i in range(50):
             # function appends value of i to a list
-            def func(input, i=i):
-                input.append(i)
+            def func(dummy_input, i=i):
+                dummy_input.append(i)
 
             functions.append(func)
             # we expect functions to be run in the connection order
             dummy_signal.connect(func)
             expected.append(i)
 
-        input = []
-        dummy_signal.send(input)
-        self.assertEqual(input, expected)
+        dummy_input = []
+        dummy_signal.send(dummy_input)
+        self.assertEqual(dummy_input, expected)
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 01ad1c58..95bf197a 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -998,28 +998,32 @@ class TestFileChangeFilter(unittest.TestCase):
     ignore_file_patterns = DEFAULT_CONFIG["IGNORE_FILES"]
 
     def test_regular_files_not_filtered(self):
-        filter = utils.FileChangeFilter(ignore_file_patterns=self.ignore_file_patterns)
+        file_change_filter = utils.FileChangeFilter(
+            ignore_file_patterns=self.ignore_file_patterns
+        )
         basename = "article.rst"
         full_path = os.path.join(os.path.dirname(__file__), "content", basename)
 
         for change in watchfiles.Change:
-            self.assertTrue(filter(change=change, path=basename))
-            self.assertTrue(filter(change=change, path=full_path))
+            self.assertTrue(file_change_filter(change=change, path=basename))
+            self.assertTrue(file_change_filter(change=change, path=full_path))
 
     def test_dotfiles_filtered(self):
-        filter = utils.FileChangeFilter(ignore_file_patterns=self.ignore_file_patterns)
+        file_change_filter = utils.FileChangeFilter(
+            ignore_file_patterns=self.ignore_file_patterns
+        )
         basename = ".config"
         full_path = os.path.join(os.path.dirname(__file__), "content", basename)
 
         # Testing with just the hidden file name and the full file path to the hidden file
         for change in watchfiles.Change:
-            self.assertFalse(filter(change=change, path=basename))
-            self.assertFalse(filter(change=change, path=full_path))
+            self.assertFalse(file_change_filter(change=change, path=basename))
+            self.assertFalse(file_change_filter(change=change, path=full_path))
 
     def test_default_filters(self):
         # Testing a subset of the default filters
         # For reference: https://watchfiles.helpmanual.io/api/filters/#watchfiles.DefaultFilter.ignore_dirs
-        filter = utils.FileChangeFilter(ignore_file_patterns=[])
+        file_change_filter = utils.FileChangeFilter(ignore_file_patterns=[])
         test_basenames = [
             "__pycache__",
             ".git",
@@ -1040,20 +1044,20 @@ class TestFileChangeFilter(unittest.TestCase):
         for basename in test_basenames:
             full_path = os.path.join(os.path.dirname(__file__), basename)
             for change in watchfiles.Change:
-                self.assertFalse(filter(change=change, path=basename))
-                self.assertFalse(filter(change=change, path=full_path))
+                self.assertFalse(file_change_filter(change=change, path=basename))
+                self.assertFalse(file_change_filter(change=change, path=full_path))
 
     def test_custom_ignore_pattern(self):
-        filter = utils.FileChangeFilter(ignore_file_patterns=["*.rst"])
+        file_change_filter = utils.FileChangeFilter(ignore_file_patterns=["*.rst"])
         basename = "article.rst"
         full_path = os.path.join(os.path.dirname(__file__), basename)
         for change in watchfiles.Change:
-            self.assertFalse(filter(change=change, path=basename))
-            self.assertFalse(filter(change=change, path=full_path))
+            self.assertFalse(file_change_filter(change=change, path=basename))
+            self.assertFalse(file_change_filter(change=change, path=full_path))
 
         # If the user changes `IGNORE_FILES` to only contain ['*.rst'], then dotfiles would not be filtered anymore
         basename = ".config"
         full_path = os.path.join(os.path.dirname(__file__), basename)
         for change in watchfiles.Change:
-            self.assertTrue(filter(change=change, path=basename))
-            self.assertTrue(filter(change=change, path=full_path))
+            self.assertTrue(file_change_filter(change=change, path=basename))
+            self.assertTrue(file_change_filter(change=change, path=full_path))
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 7270488e..8bcae51f 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -320,7 +320,7 @@ def dc2fields(file):
         # post_id = fields[0][1:]
         # blog_id = fields[1]
         # user_id = fields[2]
-        cat_id = fields[3]
+        cat_ids = fields[3]
         # post_dt = fields[4]
         # post_tz = fields[5]
         post_creadt = fields[6]
@@ -354,8 +354,10 @@ def dc2fields(file):
         categories = []
         tags = []
 
-        if cat_id:
-            categories = [category_list[id].strip() for id in cat_id.split(",")]
+        if cat_ids:
+            categories = [
+                category_list[cat_id].strip() for cat_id in cat_ids.split(",")
+            ]
 
         # Get tags related to a post
         tag = (
@@ -453,11 +455,11 @@ def tumblr2fields(api_key, blogname):
                 ).strftime("%Y-%m-%d-")
                 + slug
             )
-            format = post.get("format")
+            post_format = post.get("format")
             content = post.get("body")
-            type = post.get("type")
-            if type == "photo":
-                if format == "markdown":
+            post_type = post.get("type")
+            if post_type == "photo":
+                if post_format == "markdown":
                     fmtstr = "![%s](%s)"
                 else:
                     fmtstr = '<img alt="%s" src="%s" />'
@@ -466,20 +468,20 @@ def tumblr2fields(api_key, blogname):
                     % (photo.get("caption"), photo.get("original_size").get("url"))
                     for photo in post.get("photos")
                 )
-            elif type == "quote":
-                if format == "markdown":
+            elif post_type == "quote":
+                if post_format == "markdown":
                     fmtstr = "\n\n&mdash; %s"
                 else:
                     fmtstr = "<p>&mdash; %s</p>"
                 content = post.get("text") + fmtstr % post.get("source")
-            elif type == "link":
-                if format == "markdown":
+            elif post_type == "link":
+                if post_format == "markdown":
                     fmtstr = "[via](%s)\n\n"
                 else:
                     fmtstr = '<p><a href="%s">via</a></p>\n'
                 content = fmtstr % post.get("url") + post.get("description")
-            elif type == "audio":
-                if format == "markdown":
+            elif post_type == "audio":
+                if post_format == "markdown":
                     fmtstr = "[via](%s)\n\n"
                 else:
                     fmtstr = '<p><a href="%s">via</a></p>\n'
@@ -488,8 +490,8 @@ def tumblr2fields(api_key, blogname):
                     + post.get("caption")
                     + post.get("player")
                 )
-            elif type == "video":
-                if format == "markdown":
+            elif post_type == "video":
+                if post_format == "markdown":
                     fmtstr = "[via](%s)\n\n"
                 else:
                     fmtstr = '<p><a href="%s">via</a></p>\n'
@@ -506,7 +508,7 @@ def tumblr2fields(api_key, blogname):
                 else:
                     players = "\n".join(players)
                 content = source + caption + players
-            elif type == "answer":
+            elif post_type == "answer":
                 title = post.get("question")
                 content = (
                     "<p>"
@@ -531,11 +533,11 @@ def tumblr2fields(api_key, blogname):
                 slug,
                 date,
                 post.get("blog_name"),
-                [type],
+                [post_type],
                 tags,
                 status,
                 kind,
-                format,
+                post_format,
             )
 
         offset += len(posts)
diff --git a/pyproject.toml b/pyproject.toml
index 9684d6df..7af9366c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -125,7 +125,7 @@ select = [
     "F",  # pyflakes
 
     # the rest in alphabetical order:
-    # TODO: "A",   # flake8-builtins
+    "A",   # flake8-builtins
     # TODO: "ARG", # flake8-unused-arguments
     "B",   # flake8-bugbear
     # TODO: "BLE", # flake8-blind-except
diff --git a/tasks.py b/tasks.py
index cf9851ed..f5a02a35 100644
--- a/tasks.py
+++ b/tasks.py
@@ -56,7 +56,7 @@ def coverage(c):
 
 
 @task
-def format(c, check=False, diff=False):
+def formatcode(c, check=False, diff=False):
     """Run Ruff's auto-formatter, optionally with --check or --diff"""
     check_flag, diff_flag = "", ""
     if check:
@@ -83,7 +83,7 @@ def ruff(c, fix=False, diff=False):
 def lint(c, fix=False, diff=False):
     """Check code style via linting tools."""
     ruff(c, fix=fix, diff=diff)
-    format(c, check=not fix, diff=diff)
+    formatcode(c, check=not fix, diff=diff)
 
 
 @task

From b2ac0e93aa09ae6db14a24586cf479c5a679b3ff Mon Sep 17 00:00:00 2001
From: Ilya Simpson <elliot@p-s.co.nz>
Date: Sat, 7 Jun 2025 22:12:46 +1200
Subject: [PATCH 2794/2864] Fixing default `SLUG_REGEX_SUBSTITUTIONS` in docs.

Backslashes should not have been doubled, given the defaults are raw
strings.
---
 docs/settings.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c7e514b1..19c7782c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -715,10 +715,10 @@ corresponding ``*_URL`` setting as string, while others hard-code them:
    backward compatibility with existing URLs. The default is::
 
        [
-           (r'[^\\w\\s-]', ''),   # remove non-alphabetical/whitespace/'-' chars
-           (r'(?u)\\A\\s*', ''),  # strip leading whitespace
-           (r'(?u)\\s*\\Z', ''),  # strip trailing whitespace
-           (r'[-\\s]+', '-'),     # reduce multiple whitespace or '-' to single '-'
+           (r'[^\w\s-]', ''),   # remove non-alphabetical/whitespace/'-' chars
+           (r'(?u)\A\s*', ''),  # strip leading whitespace
+           (r'(?u)\s*\Z', ''),  # strip trailing whitespace
+           (r'[-\s]+', '-'),     # reduce multiple whitespace or '-' to single '-'
        ]
 
 .. data:: AUTHOR_REGEX_SUBSTITUTIONS

From ff4460c3d736167fb47370933fb98b5f68b80e95 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 1 Jul 2025 09:31:01 +0200
Subject: [PATCH 2795/2864] Limit Dependabot scope to GitHub Actions only

Sometimes we intentionally pin specific package versions -- such as for
Pygments, Jinja2, and Markdown -- and thus automated Dependabot PRs for
those packages are spurious and unwanted.
---
 .github/dependabot.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a0a90b94..4fed5330 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,13 +1,8 @@
 # See https://docs.github.com/en/free-pro-team@latest/
 #  github/administering-a-repository/enabling-and-disabling-version-updates
-
+---
 version: 2
 updates:
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 10
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

From fca2fde2ed651a5d503a8ae06cad0f9f27f86f6a Mon Sep 17 00:00:00 2001
From: Ilya Simpson <elliot@p-s.co.nz>
Date: Sat, 31 May 2025 12:20:09 +1200
Subject: [PATCH 2796/2864] Change lists, not tuples, in config settings

In the documentation, both `SOCIAL` and `LINKS` are described as a list
of tuples, but all examples show them as tuples of tuples. It makes the
most sense for them to be lists, so the examples should match the docs
going forward.

Similarly, `LOCALE` is described as a list, but the examples show it as
a tuple. Likewise, the examples should be lists, in line with the
description.
---
 docs/settings.rst                             | 4 ++--
 pelican/tests/default_conf.py                 | 8 ++++----
 pelican/tools/templates/pelicanconf.py.jinja2 | 8 ++++----
 samples/pelican.conf.py                       | 8 ++++----
 samples/pelican.conf_FR.py                    | 8 ++++----
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c7e514b1..0ecb8fc1 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -819,9 +819,9 @@ Time and Date
 
    .. parsed-literal::
 
-      LOCALE = ('usa', 'jpn',      # On Windows
+      LOCALE = ['usa', 'jpn',      # On Windows
                 'en_US', 'ja_JP'   # On Unix/Linux
-      )
+      ]
 
    For a list of available locales refer to `locales on Windows`_  or on
    Unix/Linux, use the ``locale -a`` command; see manpage
diff --git a/pelican/tests/default_conf.py b/pelican/tests/default_conf.py
index 583c3253..c675d9ab 100644
--- a/pelican/tests/default_conf.py
+++ b/pelican/tests/default_conf.py
@@ -12,20 +12,20 @@ DEFAULT_PAGINATION = 2
 FEED_RSS = "feeds/all.rss.xml"
 CATEGORY_FEED_RSS = "feeds/{slug}.rss.xml"
 
-LINKS = (
+LINKS = [
     ("Biologeek", "http://biologeek.org"),
     ("Filyb", "http://filyb.info/"),
     ("Libert-fr", "http://www.libert-fr.com"),
     ("N1k0", "http://prendreuncafe.com/blog/"),
     ("Tarek Ziadé", "http://ziade.org/blog"),
     ("Zubin Mithra", "http://zubin71.wordpress.com/"),
-)
+]
 
-SOCIAL = (
+SOCIAL = [
     ("twitter", "http://twitter.com/ametaireau"),
     ("lastfm", "http://lastfm.com/user/akounet"),
     ("github", "http://github.com/ametaireau"),
-)
+]
 
 # global metadata to all the contents
 DEFAULT_METADATA = {"yeah": "it is"}
diff --git a/pelican/tools/templates/pelicanconf.py.jinja2 b/pelican/tools/templates/pelicanconf.py.jinja2
index d2e92d4b..b2d41c78 100644
--- a/pelican/tools/templates/pelicanconf.py.jinja2
+++ b/pelican/tools/templates/pelicanconf.py.jinja2
@@ -16,18 +16,18 @@ AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None
 
 # Blogroll
-LINKS = (
+LINKS = [
     ("Pelican", "https://getpelican.com/"),
     ("Python.org", "https://www.python.org/"),
     ("Jinja2", "https://palletsprojects.com/p/jinja/"),
     ("You can modify those links in your config file", "#"),
-)
+]
 
 # Social widget
-SOCIAL = (
+SOCIAL = [
     ("You can add links in your config file", "#"),
     ("Another social link", "#"),
-)
+]
 
 DEFAULT_PAGINATION = {{default_pagination}}
 
diff --git a/samples/pelican.conf.py b/samples/pelican.conf.py
index d10254e8..233a2061 100644
--- a/samples/pelican.conf.py
+++ b/samples/pelican.conf.py
@@ -17,20 +17,20 @@ DEFAULT_DATE = (2012, 3, 2, 14, 1, 1)
 FEED_ALL_RSS = "feeds/all.rss.xml"
 CATEGORY_FEED_RSS = "feeds/{slug}.rss.xml"
 
-LINKS = (
+LINKS = [
     ("Biologeek", "http://biologeek.org"),
     ("Filyb", "http://filyb.info/"),
     ("Libert-fr", "http://www.libert-fr.com"),
     ("N1k0", "http://prendreuncafe.com/blog/"),
     ("Tarek Ziadé", "http://ziade.org/blog"),
     ("Zubin Mithra", "http://zubin71.wordpress.com/"),
-)
+]
 
-SOCIAL = (
+SOCIAL = [
     ("twitter", "http://twitter.com/ametaireau"),
     ("lastfm", "http://lastfm.com/user/akounet"),
     ("github", "http://github.com/ametaireau"),
-)
+]
 
 # global metadata to all the contents
 DEFAULT_METADATA = {"yeah": "it is"}
diff --git a/samples/pelican.conf_FR.py b/samples/pelican.conf_FR.py
index cbca06df..f0872839 100644
--- a/samples/pelican.conf_FR.py
+++ b/samples/pelican.conf_FR.py
@@ -21,20 +21,20 @@ ARTICLE_SAVE_AS = ARTICLE_URL + "index.html"
 FEED_ALL_RSS = "feeds/all.rss.xml"
 CATEGORY_FEED_RSS = "feeds/{slug}.rss.xml"
 
-LINKS = (
+LINKS = [
     ("Biologeek", "http://biologeek.org"),
     ("Filyb", "http://filyb.info/"),
     ("Libert-fr", "http://www.libert-fr.com"),
     ("N1k0", "http://prendreuncafe.com/blog/"),
     ("Tarek Ziadé", "http://ziade.org/blog"),
     ("Zubin Mithra", "http://zubin71.wordpress.com/"),
-)
+]
 
-SOCIAL = (
+SOCIAL = [
     ("twitter", "http://twitter.com/ametaireau"),
     ("lastfm", "http://lastfm.com/user/akounet"),
     ("github", "http://github.com/ametaireau"),
-)
+]
 
 # global metadata to all the contents
 DEFAULT_METADATA = {"yeah": "it is"}

From 4dedf1795831db99d18941c707923ba48cc28ce7 Mon Sep 17 00:00:00 2001
From: boxydog <boxydog@users.noreply.github.com>
Date: Fri, 4 Jul 2025 14:44:04 -0500
Subject: [PATCH 2797/2864] Move ruff to 0.12.2 and fix new complaints

---
 .pre-commit-config.yaml             |  6 ++---
 docs/conf.py                        |  2 +-
 pelican/__init__.py                 |  6 ++---
 pelican/cache.py                    |  3 +--
 pelican/contents.py                 |  3 +--
 pelican/log.py                      |  3 +--
 pelican/paginator.py                |  2 +-
 pelican/plugins/_utils.py           |  4 ++--
 pelican/readers.py                  |  7 +++---
 pelican/settings.py                 | 12 ++++------
 pelican/tests/test_contents.py      | 36 ++++++++++------------------
 pelican/tests/test_generators.py    |  5 +---
 pelican/tests/test_paginator.py     |  8 +------
 pelican/tests/test_plugins.py       |  6 ++---
 pelican/tests/test_rstdirectives.py |  3 +--
 pelican/tools/pelican_import.py     | 37 +++++++++++++----------------
 pelican/tools/pelican_themes.py     |  3 +--
 pelican/utils.py                    |  9 +++----
 pelican/writers.py                  |  3 +--
 pyproject.toml                      |  3 +--
 tasks.py                            |  5 ++--
 21 files changed, 64 insertions(+), 102 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 716ddd89..38287df9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,14 +16,14 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # ruff version should match the one in pyproject.toml
-    rev: v0.7.2
+    rev: v0.12.2
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
 
   - repo: https://github.com/rtts/djhtml
-    rev: '3.0.7'
+    rev: '3.0.8'
     hooks:
       - id: djhtml
       - id: djcss
diff --git a/docs/conf.py b/docs/conf.py
index 4c15bc62..e335e73c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,7 +41,7 @@ version = ".".join(release.split(".")[:1])
 last_stable = project_data.get("version")
 rst_prolog = f"""
 .. |last_stable| replace:: :pelican-doc:`{last_stable}`
-.. |min_python| replace:: {project_data.get('requires-python').split(",")[0]}
+.. |min_python| replace:: {project_data.get("requires-python").split(",")[0]}
 """
 
 extlinks = {"pelican-doc": ("https://docs.getpelican.com/en/latest/%s.html", "%s")}
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 89a63e84..0e92def9 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -402,8 +402,7 @@ def parse_arguments(argv=None):
         "--autoreload",
         dest="autoreload",
         action="store_true",
-        help="Relaunch pelican each time a modification occurs"
-        " on the content files.",
+        help="Relaunch pelican each time a modification occurs on the content files.",
     )
 
     parser.add_argument(
@@ -446,8 +445,7 @@ def parse_arguments(argv=None):
         choices=("errors", "warnings"),
         default="",
         help=(
-            "Exit the program with non-zero status if any "
-            "errors/warnings encountered."
+            "Exit the program with non-zero status if any errors/warnings encountered."
         ),
     )
 
diff --git a/pelican/cache.py b/pelican/cache.py
index d1f8550e..8bd34268 100644
--- a/pelican/cache.py
+++ b/pelican/cache.py
@@ -1,3 +1,4 @@
+import gzip
 import hashlib
 import logging
 import os
@@ -22,8 +23,6 @@ class FileDataCacher:
         self._cache_path = os.path.join(self.settings["CACHE_PATH"], cache_name)
         self._cache_data_policy = caching_policy
         if self.settings["GZIP_CACHE"]:
-            import gzip
-
             self._cache_open = gzip.open
         else:
             self._cache_open = open
diff --git a/pelican/contents.py b/pelican/contents.py
index 1ce61b43..daf72ce6 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -342,8 +342,7 @@ class Content:
                     value.geturl(),
                     extra={
                         "limit_msg": (
-                            "Other resources were not found "
-                            "and their urls not replaced"
+                            "Other resources were not found and their urls not replaced"
                         )
                     },
                 )
diff --git a/pelican/log.py b/pelican/log.py
index edf2f182..27478d14 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,4 +1,5 @@
 import logging
+import warnings
 from collections import defaultdict
 
 from rich.console import Console
@@ -156,8 +157,6 @@ def init(
 
 
 def log_warnings():
-    import warnings
-
     logging.captureWarnings(True)
     warnings.simplefilter("default", DeprecationWarning)
     init(logging.DEBUG, name="py.warnings")
diff --git a/pelican/paginator.py b/pelican/paginator.py
index 4a7c1aa2..9dcbb9d7 100644
--- a/pelican/paginator.py
+++ b/pelican/paginator.py
@@ -53,7 +53,7 @@ class Paginator:
         "Returns the total number of pages."
         if self._num_pages is None:
             hits = max(1, self.count - self.orphans)
-            self._num_pages = int(ceil(hits / (float(self.per_page) or 1)))
+            self._num_pages = ceil(hits / (float(self.per_page) or 1))
         return self._num_pages
 
     num_pages = property(_get_num_pages)
diff --git a/pelican/plugins/_utils.py b/pelican/plugins/_utils.py
index 9dfc8f81..e21201a7 100644
--- a/pelican/plugins/_utils.py
+++ b/pelican/plugins/_utils.py
@@ -19,7 +19,7 @@ def iter_namespace(ns_pkg):
 
 def get_namespace_plugins(ns_pkg=None):
     if ns_pkg is None:
-        import pelican.plugins as ns_pkg
+        import pelican.plugins as ns_pkg  # noqa: PLC0415
 
     return {
         name: importlib.import_module(name)
@@ -29,7 +29,7 @@ def get_namespace_plugins(ns_pkg=None):
 
 
 def list_plugins(ns_pkg=None):
-    from pelican.log import init as init_logging
+    from pelican.log import init as init_logging  # noqa: PLC0415
 
     init_logging(logging.INFO)
     ns_plugins = get_namespace_plugins(ns_pkg)
diff --git a/pelican/readers.py b/pelican/readers.py
index 182194fe..fc0a4f40 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -630,8 +630,9 @@ class Readers(FileStampDataCacher):
 
         # eventually filter the content with typogrify if asked so
         if self.settings["TYPOGRIFY"]:
-            import smartypants
-            from typogrify.filters import typogrify
+            # typogrify is an optional feature, user may not have it installed
+            import smartypants  # noqa: PLC0415
+            from typogrify.filters import typogrify  # noqa: PLC0415
 
             typogrify_dashes = self.settings["TYPOGRIFY_DASHES"]
             if typogrify_dashes == "oldschool":
@@ -657,7 +658,7 @@ class Readers(FileStampDataCacher):
                     return typogrify(
                         text,
                         self.settings["TYPOGRIFY_IGNORE_TAGS"],
-                        **{f: False for f in self.settings["TYPOGRIFY_OMIT_FILTERS"]},
+                        **dict.fromkeys(self.settings["TYPOGRIFY_OMIT_FILTERS"], False),
                     )
                 except TypeError:
                     try:
diff --git a/pelican/settings.py b/pelican/settings.py
index 2932627e..2f3f8fa1 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -12,6 +12,7 @@ from types import ModuleType
 from typing import Any, Optional
 
 from pelican.log import LimitFilter
+from pelican.paginator import PaginationRule
 
 
 def load_source(name: str, path: str) -> ModuleType:
@@ -320,8 +321,7 @@ def handle_deprecated_settings(settings: Settings) -> Settings:
     # EXTRA_TEMPLATES_PATHS -> THEME_TEMPLATES_OVERRIDES
     if "EXTRA_TEMPLATES_PATHS" in settings:
         logger.warning(
-            "EXTRA_TEMPLATES_PATHS is deprecated use "
-            "THEME_TEMPLATES_OVERRIDES instead."
+            "EXTRA_TEMPLATES_PATHS is deprecated use THEME_TEMPLATES_OVERRIDES instead."
         )
         if settings.get("THEME_TEMPLATES_OVERRIDES"):
             raise Exception(
@@ -453,8 +453,7 @@ def handle_deprecated_settings(settings: Settings) -> Settings:
                 settings[key] = _printf_s_to_format_field(settings[key], "lang")
             except ValueError:
                 logger.warning(
-                    "Failed to convert %%s to {lang} for %s. "
-                    "Falling back to default.",
+                    "Failed to convert %%s to {lang} for %s. Falling back to default.",
                     key,
                 )
                 settings[key] = DEFAULT_CONFIG[key]
@@ -476,8 +475,7 @@ def handle_deprecated_settings(settings: Settings) -> Settings:
                 settings[key] = _printf_s_to_format_field(settings[key], "slug")
             except ValueError:
                 logger.warning(
-                    "Failed to convert %%s to {slug} for %s. "
-                    "Falling back to default.",
+                    "Failed to convert %%s to {slug} for %s. Falling back to default.",
                     key,
                 )
                 settings[key] = DEFAULT_CONFIG[key]
@@ -689,8 +687,6 @@ def configure_settings(settings: Settings) -> Settings:
         )
 
     # fix up pagination rules
-    from pelican.paginator import PaginationRule
-
     pagination_rules = [
         PaginationRule(*r)
         for r in settings.get(
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 97653e33..3c3aae81 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -7,7 +7,7 @@ from sys import platform
 
 from jinja2.utils import generate_lorem_ipsum
 
-from pelican.contents import Article, Author, Category, Page, Static
+from pelican.contents import Article, Author, Category, Page, Static, logger
 from pelican.plugins.signals import content_object_init
 from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import LoggedTestCase, get_context, get_settings, unittest
@@ -49,24 +49,18 @@ class TestBase(LoggedTestCase):
         self._enable_limit_filter()
 
     def _disable_limit_filter(self):
-        from pelican.contents import logger
-
         logger.disable_filter()
 
     def _enable_limit_filter(self):
-        from pelican.contents import logger
-
         logger.enable_filter()
 
     def _copy_page_kwargs(self):
-        # make a deep copy of page_kwargs
-        page_kwargs = {key: self.page_kwargs[key] for key in self.page_kwargs}
-        for key in page_kwargs:
-            if not isinstance(page_kwargs[key], dict):
+        # copy page_kwargs
+        page_kwargs = dict(self.page_kwargs)
+        for key, val in page_kwargs.items():
+            if not isinstance(val, dict):
                 break
-            page_kwargs[key] = {
-                subkey: page_kwargs[key][subkey] for subkey in page_kwargs[key]
-            }
+            page_kwargs[key] = {subkey: val[subkey] for subkey in val}
 
         return page_kwargs
 
@@ -310,18 +304,16 @@ class TestPage(TestBase):
 
         # I doubt this can work on all platforms ...
         if platform == "win32":
-            locale = "jpn"
+            the_locale = "jpn"
         else:
-            locale = "ja_JP.utf8"
-        page_kwargs["settings"]["DATE_FORMATS"] = {"jp": (locale, "%Y-%m-%d(%a)")}
+            the_locale = "ja_JP.utf8"
+        page_kwargs["settings"]["DATE_FORMATS"] = {"jp": (the_locale, "%Y-%m-%d(%a)")}
         page_kwargs["metadata"]["lang"] = "jp"
 
-        import locale as locale_module
-
         try:
             page = Page(**page_kwargs)
             self.assertEqual(page.locale_date, "2015-09-13(\u65e5)")
-        except locale_module.Error:
+        except locale.Error:
             # The constructor of ``Page`` will try to set the locale to
             # ``ja_JP.utf8``. But this attempt will failed when there is no
             # such locale in the system. You can see which locales there are
@@ -329,7 +321,7 @@ class TestPage(TestBase):
             #
             # Until we find some other method to test this functionality, we
             # will simply skip this test.
-            unittest.skip(f"There is no locale {locale} in this system.")
+            unittest.skip(f"There is no locale {the_locale} in this system.")
 
     def test_template(self):
         # Pages default to page, metadata overwrites
@@ -406,8 +398,7 @@ class TestPage(TestBase):
 
         # fragment
         args["content"] = (
-            "A simple test, with a "
-            '<a href="|filename|article.rst#section-2">link</a>'
+            'A simple test, with a <a href="|filename|article.rst#section-2">link</a>'
         )
         content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
@@ -687,8 +678,7 @@ class TestPage(TestBase):
         }
 
         args["content"] = (
-            "A simple test, with a link to a"
-            '<a href="{filename}poster.jpg">poster</a>'
+            'A simple test, with a link to a<a href="{filename}poster.jpg">poster</a>'
         )
         content = Page(**args).get_content("http://notmyidea.org")
         self.assertEqual(
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 01add63c..6e9f2be8 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -916,10 +916,7 @@ class TestArticlesGenerator(unittest.TestCase):
             "This is a super article !",
             "This is a super article !",
             "This is an article with category !",
-            (
-                "This is an article with multiple authors in lastname, "
-                "firstname format!"
-            ),
+            ("This is an article with multiple authors in lastname, firstname format!"),
             "This is an article with multiple authors in list format!",
             "This is an article with multiple authors!",
             "This is an article with multiple authors!",
diff --git a/pelican/tests/test_paginator.py b/pelican/tests/test_paginator.py
index 6a7dbe02..2f98231d 100644
--- a/pelican/tests/test_paginator.py
+++ b/pelican/tests/test_paginator.py
@@ -3,7 +3,7 @@ import locale
 from jinja2.utils import generate_lorem_ipsum
 
 from pelican.contents import Article, Author
-from pelican.paginator import Paginator
+from pelican.paginator import PaginationRule, Paginator
 from pelican.settings import DEFAULT_CONFIG
 from pelican.tests.support import get_settings, unittest
 
@@ -35,8 +35,6 @@ class TestPage(unittest.TestCase):
     def test_save_as_preservation(self):
         settings = get_settings()
         # fix up pagination rules
-        from pelican.paginator import PaginationRule
-
         pagination_rules = [
             PaginationRule(*r)
             for r in settings.get(
@@ -56,8 +54,6 @@ class TestPage(unittest.TestCase):
         self.assertEqual(page.save_as, "foobar.foo")
 
     def test_custom_pagination_pattern(self):
-        from pelican.paginator import PaginationRule
-
         settings = get_settings()
         settings["PAGINATION_PATTERNS"] = [
             PaginationRule(*r)
@@ -81,8 +77,6 @@ class TestPage(unittest.TestCase):
         self.assertEqual(page2.url, "//blog.my.site/2/")
 
     def test_custom_pagination_pattern_last_page(self):
-        from pelican.paginator import PaginationRule
-
         settings = get_settings()
         settings["PAGINATION_PATTERNS"] = [
             PaginationRule(*r)
diff --git a/pelican/tests/test_plugins.py b/pelican/tests/test_plugins.py
index 42bb2ca6..f67c5fe4 100644
--- a/pelican/tests/test_plugins.py
+++ b/pelican/tests/test_plugins.py
@@ -23,7 +23,7 @@ def tmp_namespace_path(path):
     """
     # This avoids calls to internal `pelican.plugins.__path__._recalculate()`
     # as it should not be necessary
-    import pelican
+    import pelican  # noqa: PLC0415
 
     old_path = pelican.__path__[:]
     try:
@@ -41,8 +41,8 @@ class PluginTest(unittest.TestCase):
     _NORMAL_PLUGIN_FOLDER = os.path.join(_PLUGIN_FOLDER, "normal_plugin")
 
     def test_namespace_path_modification(self):
-        import pelican
-        import pelican.plugins
+        import pelican  # noqa: PLC0415
+        import pelican.plugins  # noqa: PLC0415
 
         old_path = pelican.__path__[:]
 
diff --git a/pelican/tests/test_rstdirectives.py b/pelican/tests/test_rstdirectives.py
index 46ed6f49..dfe55961 100644
--- a/pelican/tests/test_rstdirectives.py
+++ b/pelican/tests/test_rstdirectives.py
@@ -1,12 +1,11 @@
 from unittest.mock import Mock
 
+from pelican.rstdirectives import abbr_role
 from pelican.tests.support import unittest
 
 
 class Test_abbr_role(unittest.TestCase):
     def call_it(self, text):
-        from pelican.rstdirectives import abbr_role
-
         rawtext = text
         lineno = 42
         inliner = Mock(name="inliner")
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 8bcae51f..d0f2b3c2 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -2,6 +2,7 @@
 
 import argparse
 import datetime
+import json
 import logging
 import os
 import re
@@ -9,6 +10,7 @@ import subprocess
 import sys
 import tempfile
 import time
+import urllib.request as urllib_request
 from collections import defaultdict
 from html import unescape
 from urllib.error import URLError
@@ -16,6 +18,7 @@ from urllib.parse import quote, urlparse, urlsplit, urlunsplit
 from urllib.request import urlretrieve
 
 import dateutil.parser
+from docutils.utils import column_width
 
 # because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import init
@@ -118,7 +121,7 @@ def decode_wp_content(content, br=True):
 def _import_bs4():
     """Import and return bs4, otherwise sys.exit."""
     try:
-        import bs4
+        import bs4  # noqa: PLC0415
     except ImportError:
         error = (
             'Missing dependency "BeautifulSoup4" and "lxml" required to '
@@ -272,7 +275,7 @@ def blogger2fields(xml):
 def dc2fields(file):
     """Opens a Dotclear export file, and yield pelican fields"""
     try:
-        from bs4 import BeautifulSoup
+        from bs4 import BeautifulSoup  # noqa: PLC0415
     except ImportError:
         error = (
             "Missing dependency "
@@ -311,7 +314,7 @@ def dc2fields(file):
                 else:
                     posts.append(line)
 
-    print("%i posts read." % len(posts))
+    print(f"{len(posts)} posts read.")
 
     subs = DEFAULT_CONFIG["SLUG_REGEX_SUBSTITUTIONS"]
     for post in posts:
@@ -367,7 +370,7 @@ def dc2fields(file):
             .replace("a:0:", "")
         )
         if len(tag) > 1:
-            if int(len(tag[:1])) == 1:
+            if len(tag[:1]) == 1:
                 newtag = tag.split('"')[1]
                 tags.append(
                     BeautifulSoup(newtag, "xml")
@@ -418,13 +421,10 @@ def dc2fields(file):
 
 
 def _get_tumblr_posts(api_key, blogname, offset=0):
-    import json
-    import urllib.request as urllib_request
-
     url = (
-        "https://api.tumblr.com/v2/blog/%s.tumblr.com/"
-        "posts?api_key=%s&offset=%d&filter=raw"
-    ) % (blogname, api_key, offset)
+        f"https://api.tumblr.com/v2/blog/{blogname}.tumblr.com/"
+        f"posts?api_key={api_key}&offset={offset}&filter=raw"
+    )
     request = urllib_request.Request(url)
     handle = urllib_request.urlopen(request)
     posts = json.loads(handle.read().decode("utf-8"))
@@ -673,7 +673,7 @@ def mediumposts2fields(medium_export_dir: str):
 
 def feed2fields(file):
     """Read a feed and yield pelican fields"""
-    import feedparser
+    import feedparser  # noqa: PLC0415
 
     d = feedparser.parse(file)
     subs = DEFAULT_CONFIG["SLUG_REGEX_SUBSTITUTIONS"]
@@ -707,8 +707,6 @@ def build_header(
 ):
     """Build a header from a list of fields"""
 
-    from docutils.utils import column_width
-
     header = "{}\n{}\n".format(title, "#" * column_width(title))
     if date:
         header += f":date: {date}\n"
@@ -971,10 +969,10 @@ def fields2pelican(
         if is_pandoc_needed(in_markup) and not pandoc_version:
             posts_require_pandoc.append(filename)
 
-        slug = not disable_slugs and filename or None
-        assert slug is None or filename == os.path.basename(
-            filename
-        ), f"filename is not a basename: {filename}"
+        slug = (not disable_slugs and filename) or None
+        assert slug is None or filename == os.path.basename(filename), (
+            f"filename is not a basename: {filename}"
+        )
 
         if wp_attach and attachments:
             try:
@@ -1047,8 +1045,7 @@ def fields2pelican(
                         "--wrap=none" if pandoc_version >= (1, 16) else "--no-wrap"
                     )
                     cmd = (
-                        "pandoc --normalize {0} --from=html"
-                        ' --to={1} {2} -o "{3}" "{4}"'
+                        'pandoc --normalize {0} --from=html --to={1} {2} -o "{3}" "{4}"'
                     )
                     cmd = cmd.format(
                         parse_raw,
@@ -1070,7 +1067,7 @@ def fields2pelican(
                 try:
                     rc = subprocess.call(cmd, shell=True)
                     if rc < 0:
-                        error = "Child was terminated by signal %d" % -rc
+                        error = f"Child was terminated by signal {-rc}"
                         sys.exit(error)
 
                     elif rc > 0:
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index adf86dc0..1ae707e3 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -17,8 +17,7 @@ try:
     import pelican
 except ImportError:
     err(
-        "Cannot import pelican.\nYou must "
-        "install Pelican in order to run this script.",
+        "Cannot import pelican.\nYou must install Pelican in order to run this script.",
         -1,
     )
 
diff --git a/pelican/utils.py b/pelican/utils.py
index 75889a7b..5531d2fb 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -10,6 +10,7 @@ import re
 import shutil
 import sys
 import traceback
+import unicodedata
 import urllib
 from collections.abc import Collection, Generator, Hashable, Iterable, Sequence
 from contextlib import contextmanager
@@ -25,6 +26,7 @@ from typing import (
 )
 
 import dateutil.parser
+import unidecode
 from watchfiles import Change
 
 try:
@@ -260,10 +262,6 @@ def slugify(
     look into pelican.settings.DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS'].
     """
 
-    import unicodedata
-
-    import unidecode
-
     def normalize_unicode(text: str) -> str:
         # normalize text by compatibility composition
         # see: https://en.wikipedia.org/wiki/Unicode_equivalence
@@ -796,8 +794,7 @@ def order_content(
                                 content.get_relative_source_path(),
                                 extra={
                                     "limit_msg": (
-                                        "More files are missing "
-                                        "the needed attribute."
+                                        "More files are missing the needed attribute."
                                     )
                                 },
                             )
diff --git a/pelican/writers.py b/pelican/writers.py
index 1a2cf7b0..1a99532a 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -261,8 +261,7 @@ class Writer:
             # generated pages, and write
             for page_num in range(next(iter(paginators.values())).num_pages):
                 paginated_kwargs = kwargs.copy()
-                for key in paginators.keys():
-                    paginator = paginators[key]
+                for key, paginator in paginators.items():
                     previous_page = paginator.page(page_num) if page_num > 0 else None
                     page = paginator.page(page_num + 1)
                     next_page = (
diff --git a/pyproject.toml b/pyproject.toml
index 7af9366c..e12a48eb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,7 @@ dev = [
     "tox>=4.11.3",
     "invoke>=2.2.0",
     # ruff version should match the one in .pre-commit-config.yaml
-    "ruff==0.7.2",
+    "ruff==0.12.2",
     "tomli>=2.0.1; python_version < \"3.11\"",
 ]
 
@@ -112,7 +112,6 @@ source-includes = [
 requires = ["pdm-backend"]
 build-backend = "pdm.backend"
 
-
 [tool.ruff.lint]
 # see https://docs.astral.sh/ruff/configuration/#using-pyprojecttoml
 # "F" contains autoflake, see https://github.com/astral-sh/ruff/issues/1647
diff --git a/tasks.py b/tasks.py
index f5a02a35..a879d2bd 100644
--- a/tasks.py
+++ b/tasks.py
@@ -3,10 +3,11 @@ from pathlib import Path
 from shutil import which
 
 from invoke import task
+from livereload import Server
 
 PKG_NAME = "pelican"
 PKG_PATH = Path(PKG_NAME)
-DOCS_PORT = os.environ.get("DOCS_PORT", 8000)
+DOCS_PORT = int(os.environ.get("DOCS_PORT", "8000"))
 BIN_DIR = "bin" if os.name != "nt" else "Scripts"
 PTY = os.name != "nt"
 ACTIVE_VENV = os.environ.get("VIRTUAL_ENV", None)
@@ -29,8 +30,6 @@ def docbuild(c):
 @task(docbuild)
 def docserve(c):
     """Serve docs at http://localhost:$DOCS_PORT/ (default port is 8000)"""
-    from livereload import Server
-
     server = Server()
     server.watch("docs/conf.py", lambda: docbuild(c))
     server.watch("CONTRIBUTING.rst", lambda: docbuild(c))

From 3efb0817e30c9a822d1f9ffa65a54f3908a85c19 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 8 Jul 2025 08:13:44 +0200
Subject: [PATCH 2798/2864] Ignore Ruff 0.12 rule compliance in `git blame`

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index ac9f882e..df6e6f61 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -17,3 +17,5 @@ db241feaa445375dc05e189e69287000ffe5fa8e
 4af40e80772a58eac8969360e5caeb99e3e26e78
 # Ruff UP031: Use F-string format specifiers instead of percent format
 30bde3823f50b9ba8ac5996c1c46bb72031aa6b8
+# Upgrade Ruff to 0.12.x & comply with new rules
+4dedf1795831db99d18941c707923ba48cc28ce7

From 95965459f27b7bebba1ab45d76e5bc41ef053134 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 9 Jul 2025 09:15:40 +0200
Subject: [PATCH 2799/2864] docs: Fix linter errors with `invoke lint --fix`

---
 docs/contribute.rst | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 07cf998a..37b90e92 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -103,9 +103,14 @@ lines you changed conform to code style guidelines. You can check that via::
 
     invoke lint
 
+If style violations are found, many of them can be addressed automatically via::
+
+    invoke lint --fix
+    invoke format
+
 If code style violations are found in lines you changed, correct those lines
-and re-run the above lint command until they have all been fixed. You do not
-need to address style violations, if any, for code lines you did not touch.
+and re-run the ``invoke lint`` command until they have all been fixed. You do
+not need to address style violations, if any, for code lines you did not touch.
 
 After making your changes and running the tests, you may see a test failure
 mentioning that "some generated files differ from the expected functional tests
@@ -194,6 +199,7 @@ check for code style compliance via::
 
 If style violations are found, many of them can be addressed automatically via::
 
+    invoke lint --fix
     invoke format
 
 If style violations are found even after running the above auto-formatters,

From f92b2a27ab926f08ccc66f764095f537fe95a42c Mon Sep 17 00:00:00 2001
From: GeorgeHu6 <dhxxhch@163.com>
Date: Sun, 13 Jul 2025 16:40:13 +0800
Subject: [PATCH 2800/2864] Doc: update Chinese translation

---
 docs/locale/zh_CN/LC_MESSAGES/changelog.po  |  814 ++++++-----
 docs/locale/zh_CN/LC_MESSAGES/contribute.po |  456 +++---
 docs/locale/zh_CN/LC_MESSAGES/install.po    |  146 +-
 docs/locale/zh_CN/LC_MESSAGES/plugins.po    |  440 +++---
 docs/locale/zh_CN/LC_MESSAGES/settings.po   | 1393 +++++++++++--------
 5 files changed, 1720 insertions(+), 1529 deletions(-)

diff --git a/docs/locale/zh_CN/LC_MESSAGES/changelog.po b/docs/locale/zh_CN/LC_MESSAGES/changelog.po
index fa2ad406..94392a8d 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/changelog.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/changelog.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-07 16:25+0800\n"
+"POT-Creation-Date: 2025-07-13 11:46+0800\n"
 "PO-Revision-Date: 2024-06-27 19:00+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
@@ -16,299 +16,356 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.16.0\n"
+"Generated-By: Babel 2.17.0\n"
 
 #: ../../changelog.rst:2 0742e96cabd04fc99355bbfa66fcb719
 msgid "Release history"
 msgstr "更新日志"
 
-#: ../../changelog.rst:5 47b916504e6c4a33a499718574212ed2
+#: ../../changelog.rst:5 2a6b4d6833884393bf6eb0f664f07027
+msgid "4.11.0 - 2025-01-15"
+msgstr ""
+
+#: ../../changelog.rst:7 eb554022ed4445b4886e5fb7b1ffda48
+msgid ""
+"Add setting to selectively omit Typogrify filters `(#3439) "
+"<https://github.com/getpelican/pelican/pull/3439>`_"
+msgstr ""
+
+#: ../../changelog.rst:8 b4296b7abe7a411faedd991310af951f
+msgid ""
+"Add more blocks to the Simple theme’s base template, making it easier to "
+"create new themes by inheriting from the Simple theme `(#3405) "
+"<https://github.com/getpelican/pelican/pull/3405>`_"
+msgstr ""
+
+#: ../../changelog.rst:9 da7911e453434d5fa2a24bb9bad85d5f
+msgid ""
+"Fix auto-reload behavior upon changes to the theme, content or settings. "
+"Make default ``IGNORE_FILES`` recursively ignore all hidden files as well"
+" as the `default filters "
+"<https://watchfiles.helpmanual.io/api/filters/#watchfiles.DefaultFilter.ignore_dirs>`_"
+" from ``watchfiles.DefaultFilter``. `(#3441) "
+"<https://github.com/getpelican/pelican/pull/3441>`_"
+msgstr ""
+
+#: ../../changelog.rst:10 ad022a2dbbe74c28ab78757f64791daa
+msgid ""
+"Get current year from the ``SOURCE_DATE_EPOCH`` environment variable, if "
+"available `(#3430) <https://github.com/getpelican/pelican/pull/3430>`_"
+msgstr ""
+
+#: ../../changelog.rst:11 c7270f10045541f992ea76f9b8f938bc
+msgid ""
+"Add Python 3.13 to test matrix and remove Python 3.8 `(#3435) "
+"<https://github.com/getpelican/pelican/pull/3435>`_"
+msgstr ""
+
+#: ../../changelog.rst:12 c913ff7038e2445e831be08ce7a2d95f
+msgid "Require Typogrify 2.1+ and Pygments <2.19"
+msgstr ""
+
+#: ../../changelog.rst:15 47b916504e6c4a33a499718574212ed2
+msgid "4.10.2 - 2024-11-27"
+msgstr ""
+
+#: ../../changelog.rst:17 6ccca5efc34c43fc9e6549ce27d07b1a
+msgid "Change ``IGNORE_FILES`` setting default to ignore all hidden files"
+msgstr ""
+
+#: ../../changelog.rst:18 b541de728f0d4480bf6a3cb93a331134
+msgid ""
+"Fix ``SUMMARY_MAX_PARAGRAPHS`` not being respected in some combinations "
+"with ``SUMMARY_MAX_LENGTH``"
+msgstr ""
+
+#: ../../changelog.rst:21 47b916504e6c4a33a499718574212ed2
 msgid "4.10.1 - 2024-09-28"
 msgstr ""
 
-#: ../../changelog.rst:7 33731d204a8f42d6972a5b41035bf6fa
+#: ../../changelog.rst:23 33731d204a8f42d6972a5b41035bf6fa
 msgid "Fix error when running ``pelican -r -l``"
 msgstr ""
 
-#: ../../changelog.rst:8 0c82e22bd70f497880747a23445a279e
+#: ../../changelog.rst:24 0c82e22bd70f497880747a23445a279e
 msgid "Fix symlink handling in ``pelican-themes``"
 msgstr ""
 
-#: ../../changelog.rst:11 2a6b4d6833884393bf6eb0f664f07027
+#: ../../changelog.rst:27 2a6b4d6833884393bf6eb0f664f07027
 msgid "4.10.0 - 2024-09-16"
 msgstr ""
 
-#: ../../changelog.rst:13 c5b7388ced0246df9383968b896cee1d
+#: ../../changelog.rst:29 c5b7388ced0246df9383968b896cee1d
 msgid "Add setting to specify summary via paragraph count"
 msgstr ""
 
-#: ../../changelog.rst:14 55bef71482124d7ba15dcc13def666b4
+#: ../../changelog.rst:30 55bef71482124d7ba15dcc13def666b4
 msgid "Add new status to skip generation of a post"
 msgstr ""
 
-#: ../../changelog.rst:15 74aa099718c64ec3864fb4b54e8c7e7b
+#: ../../changelog.rst:31 74aa099718c64ec3864fb4b54e8c7e7b
 msgid "Add setting to append ``ref`` parameter to links in feeds"
 msgstr ""
 
-#: ../../changelog.rst:16 be0d21b2ffd648f9aad935e95fa2e9b2
+#: ../../changelog.rst:32 be0d21b2ffd648f9aad935e95fa2e9b2
 msgid "Configure logging handler via ``--log-handler`` CLI option"
 msgstr ""
 
-#: ../../changelog.rst:17 f582b79f9b19462988607337626e92e8
+#: ../../changelog.rst:33 f582b79f9b19462988607337626e92e8
 msgid "Resolve intra-site links in summaries"
 msgstr ""
 
-#: ../../changelog.rst:18 00e8752d88364591a1e7844b3605963c
+#: ../../changelog.rst:34 00e8752d88364591a1e7844b3605963c
 msgid "Warn when files are not processed due to disabled readers"
 msgstr ""
 
-#: ../../changelog.rst:19 0de52c3ba40b44f0816cc8dabf7913ab
+#: ../../changelog.rst:35 0de52c3ba40b44f0816cc8dabf7913ab
 msgid "Add Medium post importer"
 msgstr ""
 
-#: ../../changelog.rst:20 051bf922a7304dd798e894ddcfb64635
+#: ../../changelog.rst:36 051bf922a7304dd798e894ddcfb64635
 msgid "Improve GitHub Pages workflow"
 msgstr ""
 
-#: ../../changelog.rst:21 7db880406e9540de9b2d5b023cc10147
+#: ../../changelog.rst:37 7db880406e9540de9b2d5b023cc10147
 msgid "Improve code test coverage"
 msgstr ""
 
-#: ../../changelog.rst:22 c4327d2df9e34af384a4b0c96031e7e1
+#: ../../changelog.rst:38 c4327d2df9e34af384a4b0c96031e7e1
 msgid "Translate documentation into Simplified Chinese"
 msgstr ""
 
-#: ../../changelog.rst:25 75bd952da32744868b68714fa89d62ec
+#: ../../changelog.rst:41 75bd952da32744868b68714fa89d62ec
 msgid "4.9.1 - 2023-11-15"
 msgstr ""
 
-#: ../../changelog.rst:27 f896a982ada348e3bf763a9cf620d432
+#: ../../changelog.rst:43 f896a982ada348e3bf763a9cf620d432
 msgid "Ensure ``tzdata`` dependency is installed on Windows"
 msgstr ""
 
-#: ../../changelog.rst:30 f7893a294e2c4c44bd82d68283421096
+#: ../../changelog.rst:46 f7893a294e2c4c44bd82d68283421096
 msgid "4.9.0 - 2023-11-12"
 msgstr ""
 
-#: ../../changelog.rst:32 3fc89471c16044349176c6bf58daef61
+#: ../../changelog.rst:48 3fc89471c16044349176c6bf58daef61
 msgid "Upgrade code to new minimum supported Python version: 3.8"
 msgstr ""
 
-#: ../../changelog.rst:33 361eb8523ae54e6c965c4957d5af9a0b
+#: ../../changelog.rst:49 361eb8523ae54e6c965c4957d5af9a0b
 msgid ""
 "Settings support for ``pathlib.Path`` `(#2758) "
 "<https://github.com/getpelican/pelican/pull/2758>`_"
 msgstr ""
 
-#: ../../changelog.rst:34 7ea2147f8b6c4bc1af0e926b897fbbc7
+#: ../../changelog.rst:50 7ea2147f8b6c4bc1af0e926b897fbbc7
 msgid ""
 "Various improvements to Simple theme (`#2976 "
 "<https://github.com/getpelican/pelican/pull/2976>`_ & `#3234 "
 "<https://github.com/getpelican/pelican/pull/3234>`_)"
 msgstr ""
 
-#: ../../changelog.rst:35 fc0e0bb6fd8a49bca130f352208d4e65
+#: ../../changelog.rst:51 fc0e0bb6fd8a49bca130f352208d4e65
 msgid ""
 "Use Furo as Sphinx documentation theme `(#3023) "
 "<https://github.com/getpelican/pelican/pull/3023>`_"
 msgstr ""
 
-#: ../../changelog.rst:36 1767e84116304b62bff9c66576c8b530
+#: ../../changelog.rst:52 1767e84116304b62bff9c66576c8b530
 msgid ""
 "Default to 100 articles maximum in feeds `(#3127) "
 "<https://github.com/getpelican/pelican/pull/3127>`_"
 msgstr ""
 
-#: ../../changelog.rst:37 1f42290cb97f4c22b71b49bfd4e1d763
+#: ../../changelog.rst:53 1f42290cb97f4c22b71b49bfd4e1d763
 msgid ""
 "Add ``period_archives common context`` variable `(#3148) "
 "<https://github.com/getpelican/pelican/pull/3148>`_"
 msgstr ""
 
-#: ../../changelog.rst:38 8e70999f32d743d8be9d7a09a7b8440e
+#: ../../changelog.rst:54 8e70999f32d743d8be9d7a09a7b8440e
 msgid ""
 "Use ``watchfiles`` as the file-watching backend `(#3151) "
 "<https://github.com/getpelican/pelican/pull/3151>`_"
 msgstr ""
 
-#: ../../changelog.rst:39 eb554022ed4445b4886e5fb7b1ffda48
+#: ../../changelog.rst:55 eb554022ed4445b4886e5fb7b1ffda48
 msgid ""
 "Add GitHub Actions workflow for GitHub Pages `(#3189) "
 "<https://github.com/getpelican/pelican/pull/3189>`_"
 msgstr ""
 
-#: ../../changelog.rst:40 aee78c33fc074a5aa2a3e7b6b074a2d1
+#: ../../changelog.rst:56 aee78c33fc074a5aa2a3e7b6b074a2d1
 msgid ""
 "Allow dataclasses in settings `(#3204) "
 "<https://github.com/getpelican/pelican/pull/3204>`_"
 msgstr ""
 
-#: ../../changelog.rst:41 b302dcfa9ab347c7a4190e35a2fec468
+#: ../../changelog.rst:57 b302dcfa9ab347c7a4190e35a2fec468
 msgid ""
 "Switch build tool to PDM instead of Setuptools/Poetry `(#3220) "
 "<https://github.com/getpelican/pelican/pull/3220>`_"
 msgstr ""
 
-#: ../../changelog.rst:42 39c35ce577d6418ebe1bdb8bd83855da
+#: ../../changelog.rst:58 39c35ce577d6418ebe1bdb8bd83855da
 msgid ""
 "Provide a ``plugin_enabled`` Jinja test for themes `(#3235) "
 "<https://github.com/getpelican/pelican/pull/3235>`_"
 msgstr ""
 
-#: ../../changelog.rst:43 10520c5ebec34d02996410cc1d611162
+#: ../../changelog.rst:59 10520c5ebec34d02996410cc1d611162
 msgid ""
 "Preserve connection order in Blinker `(#3238) "
 "<https://github.com/getpelican/pelican/pull/3238>`_"
 msgstr ""
 
-#: ../../changelog.rst:44 e3e01fbe72ff48578ee636044d930861
+#: ../../changelog.rst:60 e3e01fbe72ff48578ee636044d930861
 msgid ""
 "Remove social icons from default ``notmyidea`` theme `(#3240) "
 "<https://github.com/getpelican/pelican/pull/3240>`_"
 msgstr ""
 
-#: ../../changelog.rst:45 0e0d4fc6f77947a79bc3864dbcfd3025
+#: ../../changelog.rst:61 0e0d4fc6f77947a79bc3864dbcfd3025
 msgid ""
 "Remove unreliable ``WRITE_SELECTED`` feature `(#3243) "
 "<https://github.com/getpelican/pelican/pull/3243>`_"
 msgstr ""
 
-#: ../../changelog.rst:46 3945b50f56c849e8b756418a049e8bd5
+#: ../../changelog.rst:62 3945b50f56c849e8b756418a049e8bd5
 msgid ""
 "Importer: Report broken embedded video links when importing from Tumblr "
 "`(#3177) <https://github.com/getpelican/pelican/issues/3177>`_"
 msgstr ""
 
-#: ../../changelog.rst:47 91a65ac386d64de293807b14a1ee66c1
+#: ../../changelog.rst:63 91a65ac386d64de293807b14a1ee66c1
 msgid ""
 "Importer: Remove newline addition when iterating Photo post types "
 "`(#3178) <https://github.com/getpelican/pelican/issues/3178>`_"
 msgstr ""
 
-#: ../../changelog.rst:48 5965fc057a0a4c94a2507956a2227789
+#: ../../changelog.rst:64 5965fc057a0a4c94a2507956a2227789
 msgid ""
 "Importer: Force timestamp conversion in Tumblr importer to be UTC with "
 "offset `(#3221) <https://github.com/getpelican/pelican/pull/3221>`_"
 msgstr ""
 
-#: ../../changelog.rst:49 f4a79028bfa946debc9a6924670e5456
+#: ../../changelog.rst:65 f4a79028bfa946debc9a6924670e5456
 msgid ""
 "Importer: Use tempfile for intermediate HTML file for Pandoc `(#3221) "
 "<https://github.com/getpelican/pelican/pull/3221>`_"
 msgstr ""
 
-#: ../../changelog.rst:50 ac3ff1ef109f49898c54eb75bb9d4bf3
+#: ../../changelog.rst:66 ac3ff1ef109f49898c54eb75bb9d4bf3
 msgid ""
 "Switch linters to Ruff `(#3223) "
 "<https://github.com/getpelican/pelican/pull/3223>`_"
 msgstr ""
 
-#: ../../changelog.rst:53 87b5ee37dea84dce9c75361f533e8057
+#: ../../changelog.rst:69 87b5ee37dea84dce9c75361f533e8057
 msgid "4.8.0 - 2022-07-11"
 msgstr ""
 
-#: ../../changelog.rst:55 858d9945de86466eb1507d7859efc304
+#: ../../changelog.rst:71 858d9945de86466eb1507d7859efc304
 msgid ""
 "Use JSON values for extra settings in Invoke tasks template `(#2994) "
 "<https://github.com/getpelican/pelican/pull/2994>`_"
 msgstr ""
 
-#: ../../changelog.rst:56 ad022a2dbbe74c28ab78757f64791daa
+#: ../../changelog.rst:72 ad022a2dbbe74c28ab78757f64791daa
 msgid ""
 "Add content tag for links, which can help with things like Twitter social"
 " cards `(#3001) <https://github.com/getpelican/pelican/pull/3001>`_"
 msgstr ""
 
-#: ../../changelog.rst:57 889f590d0fda46dbb6a14336644f265e
+#: ../../changelog.rst:73 889f590d0fda46dbb6a14336644f265e
 msgid ""
 "Improve word count behavior when generating summary `(#3002) "
 "<https://github.com/getpelican/pelican/pull/3002>`_"
 msgstr ""
 
-#: ../../changelog.rst:60 c6c9bfd44396439c8e3a04b083dfc9b3
+#: ../../changelog.rst:76 c6c9bfd44396439c8e3a04b083dfc9b3
 msgid "4.7.2 - 2022-02-09"
 msgstr ""
 
-#: ../../changelog.rst:62 21432dcec96e438c8f21de585540e9b9
+#: ../../changelog.rst:78 21432dcec96e438c8f21de585540e9b9
 msgid ""
 "Fix incorrect parsing of parameters specified via `-e` / `--extra-"
 "settings` option flags `(#2938) "
 "<https://github.com/getpelican/pelican/pull/2938>`_"
 msgstr ""
 
-#: ../../changelog.rst:63 250cb0b205ea4bc091bcbfa18a688398
+#: ../../changelog.rst:79 250cb0b205ea4bc091bcbfa18a688398
 msgid ""
 "Add ``categories.html`` template to default theme `(#2973) "
 "<https://github.com/getpelican/pelican/pull/2973>`_"
 msgstr ""
 
-#: ../../changelog.rst:64 f404aaef8abe40d89a8394f71043767b
+#: ../../changelog.rst:80 f404aaef8abe40d89a8394f71043767b
 msgid ""
 "Document how to use plugins to inject content `(#2922) "
 "<https://github.com/getpelican/pelican/pull/2922>`_"
 msgstr ""
 
-#: ../../changelog.rst:67 ea47463991054e678639e2d5afee8733
+#: ../../changelog.rst:83 ea47463991054e678639e2d5afee8733
 msgid "4.7.1 - 2021-10-12"
 msgstr ""
 
-#: ../../changelog.rst:69 52f38102dca542dcaa5e901ba9cff484
+#: ../../changelog.rst:85 52f38102dca542dcaa5e901ba9cff484
 msgid ""
 "Extend rich logging to server component `(#2927) "
 "<https://github.com/getpelican/pelican/pull/2927>`_"
 msgstr ""
 
-#: ../../changelog.rst:70 e2f47cedaac946b6b3877063c1531849
+#: ../../changelog.rst:86 e2f47cedaac946b6b3877063c1531849
 msgid ""
 "Fix an issue where metadata flagged to be discarded was being cached "
 "`(#2926) <https://github.com/getpelican/pelican/pull/2926>`_"
 msgstr ""
 
-#: ../../changelog.rst:71 c7270f10045541f992ea76f9b8f938bc
+#: ../../changelog.rst:87 c7270f10045541f992ea76f9b8f938bc
 msgid ""
 "Adjust suffix in server to allow redirection when needed `(#2931) "
 "<https://github.com/getpelican/pelican/pull/2931>`_"
 msgstr ""
 
-#: ../../changelog.rst:72 25eecc81230442e8be149c26afebcba8
+#: ../../changelog.rst:88 25eecc81230442e8be149c26afebcba8
 msgid ""
 "Add MIME types for web fonts `(#2929) "
 "<https://github.com/getpelican/pelican/pull/2929>`_"
 msgstr ""
 
-#: ../../changelog.rst:73 28bdcfa53bcf4bf5908acd39b88b1264
+#: ../../changelog.rst:89 28bdcfa53bcf4bf5908acd39b88b1264
 msgid ""
 "Distribute sample data used to run tests `(#2935) "
 "<https://github.com/getpelican/pelican/pull/2935>`_"
 msgstr ""
 
-#: ../../changelog.rst:74 90855b72a6744760a57195ca0566401c
+#: ../../changelog.rst:90 90855b72a6744760a57195ca0566401c
 msgid "Add Python 3.10 to test matrix"
 msgstr ""
 
-#: ../../changelog.rst:77 a5d1ee359c9a472bac01a3c953358994
+#: ../../changelog.rst:93 a5d1ee359c9a472bac01a3c953358994
 msgid "4.7.0 - 2021-10-01"
 msgstr ""
 
-#: ../../changelog.rst:79 1b28838f5000456aa396f8768c307102
+#: ../../changelog.rst:95 1b28838f5000456aa396f8768c307102
 msgid ""
 "Improve default theme rendering on mobile and other small screen devices "
 "`(#2914) <https://github.com/getpelican/pelican/pull/2914>`_"
 msgstr ""
 
-#: ../../changelog.rst:80 e080e2f741464f92b7d988da7e3dba5d
+#: ../../changelog.rst:96 e080e2f741464f92b7d988da7e3dba5d
 msgid ""
 "Add support for hidden articles `(#2866) "
 "<https://github.com/getpelican/pelican/pull/2866>`_"
 msgstr ""
 
-#: ../../changelog.rst:81 71036c834cc4480ba38566d039d9b50a
+#: ../../changelog.rst:97 71036c834cc4480ba38566d039d9b50a
 msgid ""
 "Improve word count behavior when generating summary CJK & other locales "
 "`(#2864) <https://github.com/getpelican/pelican/pull/2864>`_"
 msgstr ""
 
-#: ../../changelog.rst:82 dad2c8c0f0d84a4db5b0139e8dc4bec8
+#: ../../changelog.rst:98 dad2c8c0f0d84a4db5b0139e8dc4bec8
 msgid ""
 "Add progress spinner during generation `(#2869) "
 "<https://github.com/getpelican/pelican/pull/2869>`_ and richer logging "
@@ -316,295 +373,295 @@ msgid ""
 "`Rich <https://github.com/willmcgugan/rich>`_"
 msgstr ""
 
-#: ../../changelog.rst:84 ad420f41f0fb44809f0f88d2638ed6b9
+#: ../../changelog.rst:100 ad420f41f0fb44809f0f88d2638ed6b9
 msgid ""
 "Invoke tasks ``serve`` and ``livereload`` now auto-open a web browser "
 "pointing to the locally-served web site `(#2764) "
 "<https://github.com/getpelican/pelican/pull/2764>`_"
 msgstr ""
 
-#: ../../changelog.rst:85 34794ceaec054ec4b47706297e65a498
+#: ../../changelog.rst:101 34794ceaec054ec4b47706297e65a498
 msgid ""
 "Support some date format codes used by ISO dates `(#2902) "
 "<https://github.com/getpelican/pelican/pull/2902>`_"
 msgstr ""
 
-#: ../../changelog.rst:86 cd9520f44e004be6a7d7fb27032d37a6
+#: ../../changelog.rst:102 cd9520f44e004be6a7d7fb27032d37a6
 msgid ""
 "Document how to add a new writer `(#2901) "
 "<https://github.com/getpelican/pelican/pull/2901>`_"
 msgstr ""
 
-#: ../../changelog.rst:89 278990583126431793bd184ef69e4315
+#: ../../changelog.rst:105 278990583126431793bd184ef69e4315
 msgid "4.6.0 - 2021-03-23"
 msgstr ""
 
-#: ../../changelog.rst:91 a7a02445adbd4dd58d066f6f8fa5810b
+#: ../../changelog.rst:107 a7a02445adbd4dd58d066f6f8fa5810b
 msgid ""
 "Add new URL pattern to ``PAGINATION_PATTERNS`` for the last page in the "
 "list `(#1401) <https://github.com/getpelican/pelican/issues/1401>`_"
 msgstr ""
 
-#: ../../changelog.rst:92 e5e2fd04bc8a40edb8a0d1c088a95708
+#: ../../changelog.rst:108 e5e2fd04bc8a40edb8a0d1c088a95708
 msgid ""
 "Speed up ``livereload`` Invoke task via caching `(#2847) "
 "<https://github.com/getpelican/pelican/pull/2847>`_"
 msgstr ""
 
-#: ../../changelog.rst:93 e37a383072324f98a8f5698edab71384
+#: ../../changelog.rst:109 e37a383072324f98a8f5698edab71384
 msgid ""
 "Ignore ``None`` return value from ``get_generators`` signal `(#2850) "
 "<https://github.com/getpelican/pelican/pull/2850>`_"
 msgstr ""
 
-#: ../../changelog.rst:94 ea446fad671d4e1e8b3220a35ffe170b
+#: ../../changelog.rst:110 ea446fad671d4e1e8b3220a35ffe170b
 msgid "Relax dependency minimum versions and remove upper bounds"
 msgstr ""
 
-#: ../../changelog.rst:97 3e38341f147e414ba7b10c339d28a0d4
+#: ../../changelog.rst:113 3e38341f147e414ba7b10c339d28a0d4
 msgid "4.5.4 - 2021-01-04"
 msgstr ""
 
-#: ../../changelog.rst:99 b4296b7abe7a411faedd991310af951f
+#: ../../changelog.rst:115 b4296b7abe7a411faedd991310af951f
 msgid ""
 "Replace plugin definitions in settings with string representations after "
 "registering, so they can be cached correctly `(#2828) "
 "<https://github.com/getpelican/pelican/issues/2828>`_."
 msgstr ""
 
-#: ../../changelog.rst:102 7fc32eaefef846d28cd834cabfa8dee9
+#: ../../changelog.rst:118 7fc32eaefef846d28cd834cabfa8dee9
 msgid "4.5.3 - 2020-12-01"
 msgstr ""
 
-#: ../../changelog.rst:104 5e0db3263ddd42bca058026426cf06e6
+#: ../../changelog.rst:120 5e0db3263ddd42bca058026426cf06e6
 msgid "Fix a mistake made in PR #2821"
 msgstr ""
 
-#: ../../changelog.rst:107 1ef29d1cc4de42d1aa3c0c163df3514a
+#: ../../changelog.rst:123 1ef29d1cc4de42d1aa3c0c163df3514a
 msgid "4.5.2 - 2020-11-22"
 msgstr ""
 
-#: ../../changelog.rst:109 c7c77959e6d04be4a6a6c7ace8d64c0d
+#: ../../changelog.rst:125 c7c77959e6d04be4a6a6c7ace8d64c0d
 msgid "Improve logging of generators and writer loaders"
 msgstr ""
 
-#: ../../changelog.rst:112 00572ddf9ed24457aedc3f744b684404
+#: ../../changelog.rst:128 00572ddf9ed24457aedc3f744b684404
 msgid "4.5.1 - 2020-11-02"
 msgstr ""
 
-#: ../../changelog.rst:114 85d67c71b8664cf3900c982deba934b5
+#: ../../changelog.rst:130 85d67c71b8664cf3900c982deba934b5
 msgid ""
 "Refactor intra-site link discovery in order to match more permissively "
 "`(#2646) <https://github.com/getpelican/pelican/issues/2646>`_"
 msgstr ""
 
-#: ../../changelog.rst:115 0ae962176dac4745a0929eac1cb0a671
+#: ../../changelog.rst:131 0ae962176dac4745a0929eac1cb0a671
 msgid ""
 "Fix plugins running twice in auto-reload mode `(#2817) "
 "<https://github.com/getpelican/pelican/issues/2817>`_"
 msgstr ""
 
-#: ../../changelog.rst:116 6c9d2b7c8f5c40d9830f38cc39807326
+#: ../../changelog.rst:132 6c9d2b7c8f5c40d9830f38cc39807326
 msgid ""
 "Add notice to use ``from pelican import signals`` instead of ``import "
 "pelican.signals`` `(#2805) "
 "<https://github.com/getpelican/pelican/issues/2805>`_"
 msgstr ""
 
-#: ../../changelog.rst:119 cc543240f72d4e15bafa37e8cbe86c54
+#: ../../changelog.rst:135 cc543240f72d4e15bafa37e8cbe86c54
 msgid "4.5.0 - 2020-08-20"
 msgstr ""
 
-#: ../../changelog.rst:121 3b3db764e63f49c0b00d2b1cc71755f2
+#: ../../changelog.rst:137 3b3db764e63f49c0b00d2b1cc71755f2
 msgid "Add namespace plugin support; list plugins via ``pelican-plugins`` command"
 msgstr ""
 
-#: ../../changelog.rst:122 ad62f8bcd989447e97326c5845ec146b
+#: ../../changelog.rst:138 ad62f8bcd989447e97326c5845ec146b
 msgid "Override settings via ``-e`` / ``--extra-settings`` CLI option flags"
 msgstr ""
 
-#: ../../changelog.rst:123 f12bccb1dc904d0bbffb0d9e5291ad3d
+#: ../../changelog.rst:139 f12bccb1dc904d0bbffb0d9e5291ad3d
 msgid "Add settings for custom Jinja globals and tests"
 msgstr ""
 
-#: ../../changelog.rst:124 c569ff52ef904228971c38b1a958847f
+#: ../../changelog.rst:140 c569ff52ef904228971c38b1a958847f
 msgid "Customize article summary ellipsis via ``SUMMARY_END_SUFFIX`` setting"
 msgstr ""
 
-#: ../../changelog.rst:125 733087bf4e14447095fb364a1d5b606f
+#: ../../changelog.rst:141 733087bf4e14447095fb364a1d5b606f
 msgid "Customize Typogrify dash handling via new ``TYPOGRIFY_DASHES`` setting"
 msgstr ""
 
-#: ../../changelog.rst:126 9e0de47310964a99bf1ec0a87f810036
+#: ../../changelog.rst:142 9e0de47310964a99bf1ec0a87f810036
 msgid "Support Unicode when generating slugs"
 msgstr ""
 
-#: ../../changelog.rst:127 c496a287d95b47759425578bc29d4cf3
+#: ../../changelog.rst:143 c496a287d95b47759425578bc29d4cf3
 msgid "Support Asciidoc ``.adoc`` file generation in Pelican importer"
 msgstr ""
 
-#: ../../changelog.rst:128 1f8597af3f9946129cfb150e9728c25c
+#: ../../changelog.rst:144 1f8597af3f9946129cfb150e9728c25c
 msgid "Improve user experience when ``pelican --listen`` web server is quit"
 msgstr ""
 
-#: ../../changelog.rst:129 418a06eb1d9d4332945b5b1729734579
+#: ../../changelog.rst:145 418a06eb1d9d4332945b5b1729734579
 msgid "Improve Invoke tasks template"
 msgstr ""
 
-#: ../../changelog.rst:130 8b63e2e5d29a4cde830ea8c1df058ab1
+#: ../../changelog.rst:146 8b63e2e5d29a4cde830ea8c1df058ab1
 msgid "Include tests in source distributions"
 msgstr ""
 
-#: ../../changelog.rst:131 68105e5e919a43518ac6af8b88957e44
+#: ../../changelog.rst:147 68105e5e919a43518ac6af8b88957e44
 msgid "Switch CI from Travis to GitHub Actions"
 msgstr ""
 
-#: ../../changelog.rst:132 053f40c3741c4d54bc840f2ad32f34eb
+#: ../../changelog.rst:148 053f40c3741c4d54bc840f2ad32f34eb
 msgid "Remove support for Python 2.7"
 msgstr ""
 
-#: ../../changelog.rst:135 6190d59940dd4c57a603140e0813f9b5
+#: ../../changelog.rst:151 6190d59940dd4c57a603140e0813f9b5
 msgid "4.2.0 - 2019-10-17"
 msgstr ""
 
-#: ../../changelog.rst:137 5f11442743c841ff91d46b643698dfa9
+#: ../../changelog.rst:153 5f11442743c841ff91d46b643698dfa9
 msgid "Support inline SVGs; don't treat titles in SVGs as HTML titles"
 msgstr ""
 
-#: ../../changelog.rst:138 a68bbd4f2a024c7a84c259aee8fcb621
+#: ../../changelog.rst:154 a68bbd4f2a024c7a84c259aee8fcb621
 msgid "Add category to feeds (in addition to tags)"
 msgstr ""
 
-#: ../../changelog.rst:139 dd3937b7cb38480a84e6a5daed48e113
+#: ../../changelog.rst:155 dd3937b7cb38480a84e6a5daed48e113
 msgid "Improve content metadata field docs"
 msgstr ""
 
-#: ../../changelog.rst:140 87030fc248dc46e5902d3e7681702351
+#: ../../changelog.rst:156 87030fc248dc46e5902d3e7681702351
 msgid "Add docs for including other Markdown/reST files in content"
 msgstr ""
 
-#: ../../changelog.rst:143 85163f7808a64f7cac3dd54f98c2a2fd
+#: ../../changelog.rst:159 85163f7808a64f7cac3dd54f98c2a2fd
 msgid "4.1.3 - 2019-10-09"
 msgstr ""
 
-#: ../../changelog.rst:145 486947a4cc584437aff9364d721eeb41
+#: ../../changelog.rst:161 486947a4cc584437aff9364d721eeb41
 msgid "Fix quick-start docs regarding ``pelican --listen``"
 msgstr ""
 
-#: ../../changelog.rst:146 cf68238f21bd40b081eb670527e5ad88
+#: ../../changelog.rst:162 cf68238f21bd40b081eb670527e5ad88
 msgid "Set default listen address to 127.0.0.1"
 msgstr ""
 
-#: ../../changelog.rst:147 21aed223e69549038ee7b840fe0e45a5
+#: ../../changelog.rst:163 21aed223e69549038ee7b840fe0e45a5
 msgid "Add extra/optional Markdown dependency to setup.py"
 msgstr ""
 
-#: ../../changelog.rst:148 5c5c50a24bf945babe1fea501be5b672
+#: ../../changelog.rst:164 5c5c50a24bf945babe1fea501be5b672
 msgid "Use correct SSH port syntax for rsync in tasks.py"
 msgstr ""
 
-#: ../../changelog.rst:149 cafa64aa81c94212a964ece5f6d00ea6
+#: ../../changelog.rst:165 cafa64aa81c94212a964ece5f6d00ea6
 msgid "Place all deprecated settings handling together"
 msgstr ""
 
-#: ../../changelog.rst:150 92ad7248e4d848f5b9955653a132ba1d
+#: ../../changelog.rst:166 92ad7248e4d848f5b9955653a132ba1d
 msgid "Add related project URLs for display on PyPI"
 msgstr ""
 
-#: ../../changelog.rst:151 f97dcb0a8c6f41ca8e6a249f975688ab
+#: ../../changelog.rst:167 f97dcb0a8c6f41ca8e6a249f975688ab
 msgid "Skip some tests on Windows that can't pass due to filesystem differences"
 msgstr ""
 
-#: ../../changelog.rst:154 cb1b18c4628a48f3a7b59e4447057291
+#: ../../changelog.rst:170 cb1b18c4628a48f3a7b59e4447057291
 msgid "4.1.2 - 2019-09-23"
 msgstr ""
 
-#: ../../changelog.rst:156 1cc7ba6aab5a43e9a3fbb04a8cf4c954
+#: ../../changelog.rst:172 1cc7ba6aab5a43e9a3fbb04a8cf4c954
 msgid "Fix pelican.settings.load_source to avoid caching issues - PR #2621"
 msgstr ""
 
-#: ../../changelog.rst:159 808b70fac79147a7a30cb263bfc091d5
+#: ../../changelog.rst:175 808b70fac79147a7a30cb263bfc091d5
 msgid "4.1.1 - 2019-08-23"
 msgstr ""
 
-#: ../../changelog.rst:161 3515525c09794e3eb685696916e9b4a8
+#: ../../changelog.rst:177 3515525c09794e3eb685696916e9b4a8
 msgid "Add AutoPub to auto-publish releases on PR merge"
 msgstr ""
 
-#: ../../changelog.rst:162 e3958153de2543ab8af7b27e424a5199
+#: ../../changelog.rst:178 e3958153de2543ab8af7b27e424a5199
 msgid "Add CSS classes for reStructuredText figures"
 msgstr ""
 
-#: ../../changelog.rst:163 469aba039b0e4bb5b08bd7bc9fd455f9
+#: ../../changelog.rst:179 469aba039b0e4bb5b08bd7bc9fd455f9
 msgid "Pass ``argv`` to Pelican ``main`` entrypoint"
 msgstr ""
 
-#: ../../changelog.rst:164 08494f27a31149a8a4e662d7160d334a
+#: ../../changelog.rst:180 08494f27a31149a8a4e662d7160d334a
 msgid "Set default content status to a blank string rather than ``None``"
 msgstr ""
 
-#: ../../changelog.rst:167 4e7e6da9e1a94e5886de5c7bb90da964
+#: ../../changelog.rst:183 4e7e6da9e1a94e5886de5c7bb90da964
 msgid "4.1.0 - 2019-07-14"
 msgstr ""
 
-#: ../../changelog.rst:169 de8697dee456433f8fd5592c79dc1235
+#: ../../changelog.rst:185 de8697dee456433f8fd5592c79dc1235
 msgid "Live browser reload upon changed files (provided via Invoke task)"
 msgstr ""
 
-#: ../../changelog.rst:170 67db4943813d410386e77969e6aea98f
+#: ../../changelog.rst:186 67db4943813d410386e77969e6aea98f
 msgid "Add ``pyproject.toml``, managed by Poetry"
 msgstr ""
 
-#: ../../changelog.rst:171 a6388203f3c44a31b2458bd0961c9e91
+#: ../../changelog.rst:187 a6388203f3c44a31b2458bd0961c9e91
 msgid "Support for invoking ``python -m pelican``"
 msgstr ""
 
-#: ../../changelog.rst:172 b526c18ddea74343b14a62d3933c31db
+#: ../../changelog.rst:188 b526c18ddea74343b14a62d3933c31db
 msgid "Add relative source path attribute to content"
 msgstr ""
 
-#: ../../changelog.rst:173 98e5827380d24bb2b640c709ee1fa5bf
+#: ../../changelog.rst:189 98e5827380d24bb2b640c709ee1fa5bf
 msgid "Allow directories in ``EXTRA_PATH_METADATA``"
 msgstr ""
 
-#: ../../changelog.rst:174 7372879d036e4c19967f008fed50bcfb
+#: ../../changelog.rst:190 7372879d036e4c19967f008fed50bcfb
 msgid ""
 "Add ``all_articles`` variable to period pages (for recent posts "
 "functionality)"
 msgstr ""
 
-#: ../../changelog.rst:175 8b41c0640e9a4c4ca9458eea777c6c72
+#: ../../changelog.rst:191 8b41c0640e9a4c4ca9458eea777c6c72
 msgid "Improve debug mode output"
 msgstr ""
 
-#: ../../changelog.rst:176 00af35668b044b6da9e934104b73eac9
+#: ../../changelog.rst:192 00af35668b044b6da9e934104b73eac9
 msgid "Remove blank or duplicate summaries from Atom feed"
 msgstr ""
 
-#: ../../changelog.rst:177 97c5594b58d94c45ada8a9efdb2216c8
+#: ../../changelog.rst:193 97c5594b58d94c45ada8a9efdb2216c8
 msgid ""
 "Fix bugs in pagination, pelican-import, pelican-quickstart, and feed "
 "importer"
 msgstr ""
 
-#: ../../changelog.rst:180 496531289a9c446c97d5e1842e5761f9
+#: ../../changelog.rst:196 496531289a9c446c97d5e1842e5761f9
 msgid "4.0.1 (2018-11-30)"
 msgstr ""
 
-#: ../../changelog.rst:182 48f43697fb824914a518283bab0ab39d
+#: ../../changelog.rst:198 48f43697fb824914a518283bab0ab39d
 msgid "Refactor ``pelican.server`` logging"
 msgstr ""
 
-#: ../../changelog.rst:183 7f431162613848738f2267518e0f435e
+#: ../../changelog.rst:199 7f431162613848738f2267518e0f435e
 msgid "Fix bug in which all static files were processed as \"draft\""
 msgstr ""
 
-#: ../../changelog.rst:184 7c9866081cc0478aab4bcbb65f241b2b
+#: ../../changelog.rst:200 7c9866081cc0478aab4bcbb65f241b2b
 msgid "Bug fixes for Invoke/Makefile automation, Importer, and other miscellanea"
 msgstr ""
 
-#: ../../changelog.rst:186 b4f0a6a574f54e8baec02108e3cdf121
-#, python-format
+#: ../../changelog.rst:202 b4f0a6a574f54e8baec02108e3cdf121
+#, python-brace-format, python-format
 msgid ""
 "If upgrading from 3.7.x or earlier, please note that slug-related "
 "settings in 4.0+ use ``{slug}`` and/or ``{lang}`` rather than ``%s``. If "
@@ -616,1110 +673,1117 @@ msgid ""
 "``TAG_FEED_ATOM.format(slug=tag.slug)``"
 msgstr ""
 
-#: ../../changelog.rst:195 963535bf97cb4048b11dd47fa7fe5cb1
+#: ../../changelog.rst:211 963535bf97cb4048b11dd47fa7fe5cb1
 msgid "4.0.0 (2018-11-13)"
 msgstr ""
 
-#: ../../changelog.rst:197 be207dbf17cc4c38ab4c8617ece18d43
+#: ../../changelog.rst:213 be207dbf17cc4c38ab4c8617ece18d43
 msgid "Replace ``develop_server.sh`` script with ``pelican --listen``"
 msgstr ""
 
-#: ../../changelog.rst:198 bfeb93e653cc44b4a6e65c1b5978e0d2
+#: ../../changelog.rst:214 bfeb93e653cc44b4a6e65c1b5978e0d2
 msgid "Improved copy/link behavior for large static files (e.g., videos)"
 msgstr ""
 
-#: ../../changelog.rst:199 0f6be38dbd8942c8a8692c377624a26a
+#: ../../changelog.rst:215 0f6be38dbd8942c8a8692c377624a26a
+#, python-brace-format
 msgid ""
 "New ``{static}`` syntax to link to static content; content linked to by "
 "``{static}`` and ``{attach}`` is automatically copied over even if not in"
 " ``STATIC_PATHS``"
 msgstr ""
 
-#: ../../changelog.rst:202 6d42f604ef724c72b0d691d52cced384
+#: ../../changelog.rst:218 6d42f604ef724c72b0d691d52cced384
 msgid "Pages can now have ``draft`` status"
 msgstr ""
 
-#: ../../changelog.rst:203 c6513f293ae04b9fb1cee4ef355de4bd
+#: ../../changelog.rst:219 c6513f293ae04b9fb1cee4ef355de4bd
 msgid "Show current settings via new ``--print-settings`` flag"
 msgstr ""
 
-#: ../../changelog.rst:204 63636f2fc7184030bc83647b4f81d63a
-#, python-format
+#: ../../changelog.rst:220 63636f2fc7184030bc83647b4f81d63a
+#, python-brace-format, python-format
 msgid ""
 "All settings for slugs now use ``{slug}`` and/or ``{lang}`` rather than "
 "``%s``. If ``%s``-style settings are encountered, Pelican will emit a "
 "warning and fallback to the default setting."
 msgstr ""
 
-#: ../../changelog.rst:207 594a958f9f9c495c86c4eb15ee1d353e
+#: ../../changelog.rst:223 594a958f9f9c495c86c4eb15ee1d353e
 msgid "New signals: ``feed_generated`` and ``page_generated_write_page``"
 msgstr ""
 
-#: ../../changelog.rst:208 4c1a13c890d04aea9bdb43ba3a85f98e
+#: ../../changelog.rst:224 4c1a13c890d04aea9bdb43ba3a85f98e
 msgid "Replace Fabric with Invoke and ``fabfile.py`` template with ``tasks.py``"
 msgstr ""
 
-#: ../../changelog.rst:209 05c5bacea3de4d159dc464bb80d3b70d
+#: ../../changelog.rst:225 05c5bacea3de4d159dc464bb80d3b70d
 msgid ""
 "Replace ``PAGINATED_DIRECT_TEMPLATES`` by ``PAGINATED_TEMPLATES``, "
 "extending control over pagination to all templates and making page size "
 "variable"
 msgstr ""
 
-#: ../../changelog.rst:211 d4c57ccd147b409bafd324580546ce89
+#: ../../changelog.rst:227 d4c57ccd147b409bafd324580546ce89
 msgid ""
 "Replace ``SLUG_SUBSTITUTIONS`` (and friends) by "
 "``SLUG_REGEX_SUBSTITUTIONS`` for more finegrained control"
 msgstr ""
 
-#: ../../changelog.rst:213 5fcdd3851c4348ffb6f9f30e21d01cca
+#: ../../changelog.rst:229 5fcdd3851c4348ffb6f9f30e21d01cca
+#, python-brace-format
 msgid ""
 "``'{base_name}'`` value in ``PAGINATION_PATTERNS`` setting no longer "
 "strips ``'bar'`` from ``'foo/bar.html'`` (unless ``'bar' == 'index'``)."
 msgstr ""
 
-#: ../../changelog.rst:215 f21a405be2434ee78cac35d1f653b6ba
+#: ../../changelog.rst:231 f21a405be2434ee78cac35d1f653b6ba
 msgid ""
 "``ARTICLE_ORDER_BY`` and ``PAGE_ORDER_BY`` now also affect 1) category, "
 "tag and author pages 2) feeds 3) draft and hidden articles and pages"
 msgstr ""
 
-#: ../../changelog.rst:217 781dd286cb154c46a9e2036e697bcf7f
+#: ../../changelog.rst:233 781dd286cb154c46a9e2036e697bcf7f
 msgid ""
 "New ``ARTICLE_TRANSLATION_ID`` and ``PAGE_TRANSLATION_ID`` settings to "
 "specify metadata attributes used to identify/disable translations"
 msgstr ""
 
-#: ../../changelog.rst:219 ae7fd53c1d6047eb8027016c4a00bd65
+#: ../../changelog.rst:235 ae7fd53c1d6047eb8027016c4a00bd65
 msgid "Make the HTML reader parse multiple occurrences of metadata tags as a list"
 msgstr ""
 
-#: ../../changelog.rst:220 dca4b981c67c42a080e5724d65ddf825
+#: ../../changelog.rst:236 dca4b981c67c42a080e5724d65ddf825
 msgid "New Blogger XML backup importer"
 msgstr ""
 
-#: ../../changelog.rst:221 f92482bf76ec447186de98f4a471dd55
+#: ../../changelog.rst:237 f92482bf76ec447186de98f4a471dd55
 msgid ""
 "Wordpress importer now updates file links to point to local copies if the"
 " files were downloaded with ``--wp-attach``."
 msgstr ""
 
-#: ../../changelog.rst:223 0778a52f39704e629fed5df26deeaeb6
+#: ../../changelog.rst:239 0778a52f39704e629fed5df26deeaeb6
 msgid ""
 "Importer no longer inserts extra newlines, to prevent breaking of HTML "
 "attributes."
 msgstr ""
 
-#: ../../changelog.rst:225 6b21bcb847014ebcb4e658aaf54fd591
+#: ../../changelog.rst:241 6b21bcb847014ebcb4e658aaf54fd591
 msgid ""
 "Pelican server now prioritises ``foo.html`` and ``foo/index.html`` over "
 "``foo/`` when resolving ``foo``."
 msgstr ""
 
-#: ../../changelog.rst:229 d9c7906de4814a988e96a0f836121773
+#: ../../changelog.rst:245 d9c7906de4814a988e96a0f836121773
 msgid "3.7.1 (2017-01-10)"
 msgstr ""
 
-#: ../../changelog.rst:231 dee875ace0cf4cf4a84e968613c64f1e
+#: ../../changelog.rst:247 dee875ace0cf4cf4a84e968613c64f1e
 msgid "Fix locale issues in Quickstart script"
 msgstr ""
 
-#: ../../changelog.rst:232 0735e4ab311648fba920ba433eb5c81b
+#: ../../changelog.rst:248 0735e4ab311648fba920ba433eb5c81b
 msgid "Specify encoding for README and CHANGELOG in setup.py"
 msgstr ""
 
-#: ../../changelog.rst:235 713d99ebaa1f446a857751b754b63677
+#: ../../changelog.rst:251 713d99ebaa1f446a857751b754b63677
 msgid "3.7.0 (2016-12-12)"
 msgstr ""
 
-#: ../../changelog.rst:237 0330d842ba514f58965a9b625db18791
+#: ../../changelog.rst:253 0330d842ba514f58965a9b625db18791
 msgid "Atom feeds output ``<content>`` in addition to ``<summary>``"
 msgstr ""
 
-#: ../../changelog.rst:238 7e5d0a914d214dbfb969b4e270f148c5
+#: ../../changelog.rst:254 7e5d0a914d214dbfb969b4e270f148c5
 msgid ""
 "Atom feeds use ``<published>`` for the original publication date and "
 "``<updated>`` for modifications"
 msgstr ""
 
-#: ../../changelog.rst:240 4f0ed4869e00418b8b16a7e692516126
+#: ../../changelog.rst:256 4f0ed4869e00418b8b16a7e692516126
 msgid "Simplify Atom feed ID generation and support URL fragments"
 msgstr ""
 
-#: ../../changelog.rst:241 cdc742c1ed2c44a1b76a5cf7374c1374
+#: ../../changelog.rst:257 cdc742c1ed2c44a1b76a5cf7374c1374
 msgid "Produce category feeds with category-specific titles"
 msgstr ""
 
-#: ../../changelog.rst:242 6a89fde3d1084e0d91e8b89b293a851c
+#: ../../changelog.rst:258 6a89fde3d1084e0d91e8b89b293a851c
 msgid ""
 "RSS feeds now default to summary instead of full content; set "
 "``RSS_FEED_SUMMARY_ONLY = False`` to revert to previous behavior"
 msgstr ""
 
-#: ../../changelog.rst:244 dbe1f00b9a114bf6a5e7728eb15cbfd2
+#: ../../changelog.rst:260 dbe1f00b9a114bf6a5e7728eb15cbfd2
 msgid "Replace ``MD_EXTENSIONS`` with ``MARKDOWN`` setting"
 msgstr ""
 
-#: ../../changelog.rst:245 e8d183ddfb3a4b2bbb4ccc523ff1ce4d
+#: ../../changelog.rst:261 e8d183ddfb3a4b2bbb4ccc523ff1ce4d
 msgid ""
 "Replace ``JINJA_EXTENSIONS`` with more-robust ``JINJA_ENVIRONMENT`` "
 "setting"
 msgstr ""
 
-#: ../../changelog.rst:246 c4044fb542ce4772bc469c06f3606f88
+#: ../../changelog.rst:262 c4044fb542ce4772bc469c06f3606f88
 msgid ""
 "Improve summary truncation logic to handle special characters and tags "
 "that span multiple lines, using HTML parser instead of regular "
 "expressions"
 msgstr ""
 
-#: ../../changelog.rst:248 6f6a8c2b60324ad6b00feb9f492c4d45
+#: ../../changelog.rst:264 6f6a8c2b60324ad6b00feb9f492c4d45
 msgid "Include summary when looking for intra-site link substitutions"
 msgstr ""
 
-#: ../../changelog.rst:249 e121d156b37b4f59a8846b700e1769ea
+#: ../../changelog.rst:265 e121d156b37b4f59a8846b700e1769ea
+#, python-brace-format
 msgid "Link to authors and index via ``{author}name`` and ``{index}`` syntax"
 msgstr ""
 
-#: ../../changelog.rst:250 1d210456ced542c1babb622b06b2c4f4
+#: ../../changelog.rst:266 1d210456ced542c1babb622b06b2c4f4
 msgid "Override widget names via ``LINKS_WIDGET_NAME`` and ``SOCIAL_WIDGET_NAME``"
 msgstr ""
 
-#: ../../changelog.rst:251 6104e9c05e844436b12e538008947f47
+#: ../../changelog.rst:267 6104e9c05e844436b12e538008947f47
 msgid "Add ``INDEX_SAVE_AS`` option to override default ``index.html`` value"
 msgstr ""
 
-#: ../../changelog.rst:252 0f875978cade45889a49f818c6664093
+#: ../../changelog.rst:268 0f875978cade45889a49f818c6664093
 msgid "Remove ``PAGES`` context variable for themes in favor of ``pages``"
 msgstr ""
 
-#: ../../changelog.rst:253 bd6d148038524dbd8889ef4479115f15
+#: ../../changelog.rst:269 bd6d148038524dbd8889ef4479115f15
 msgid ""
 "``SLUG_SUBSTITUTIONS`` now accepts 3-tuple elements, allowing URL slugs "
 "to contain non-alphanumeric characters"
 msgstr ""
 
-#: ../../changelog.rst:255 84e180ffd01640e39c8a02616d665f92
+#: ../../changelog.rst:271 84e180ffd01640e39c8a02616d665f92
 msgid ""
 "Tag and category slugs can be controlled with greater precision using the"
 " ``TAG_SUBSTITUTIONS`` and ``CATEGORY_SUBSTITUTIONS`` settings"
 msgstr ""
 
-#: ../../changelog.rst:257 c42874e842584772a9c6abda4cf1d2b2
+#: ../../changelog.rst:273 c42874e842584772a9c6abda4cf1d2b2
 msgid ""
 "Author slugs can be controlled with greater precision using the "
 "``AUTHOR_SUBSTITUTIONS`` setting"
 msgstr ""
 
-#: ../../changelog.rst:259 c3ad7f1d581d4a848a0d80425732faaa
+#: ../../changelog.rst:275 c3ad7f1d581d4a848a0d80425732faaa
 msgid "``DEFAULT_DATE`` can be defined as a string"
 msgstr ""
 
-#: ../../changelog.rst:260 28824188813542f08ef3546d48faeb4d
+#: ../../changelog.rst:276 28824188813542f08ef3546d48faeb4d
 msgid "Use ``mtime`` instead of ``ctime`` when ``DEFAULT_DATE = 'fs'``"
 msgstr ""
 
-#: ../../changelog.rst:261 4cbfd98d99134eaba723b0a98dd38fdd
+#: ../../changelog.rst:277 4cbfd98d99134eaba723b0a98dd38fdd
 msgid "Add ``--fatal=errors|warnings`` option for use with continuous integration"
 msgstr ""
 
-#: ../../changelog.rst:262 e0346ee13c104f26a360952f415db7ca
+#: ../../changelog.rst:278 e0346ee13c104f26a360952f415db7ca
 msgid ""
 "When using generator-level caching, ensure previously-cached files are "
 "processed instead of just new files."
 msgstr ""
 
-#: ../../changelog.rst:264 3faa472e3d4440dfacb1e40b20cdbb36
+#: ../../changelog.rst:280 3faa472e3d4440dfacb1e40b20cdbb36
 msgid "Add Python and Pelican version information to debug output"
 msgstr ""
 
-#: ../../changelog.rst:265 7ca51c4375d641d18777b07bedb86f2c
+#: ../../changelog.rst:281 7ca51c4375d641d18777b07bedb86f2c
 msgid "Improve compatibility with Python 3.5"
 msgstr ""
 
-#: ../../changelog.rst:266 cf9b150420fa47369ff0c95e8edc002b
+#: ../../changelog.rst:282 cf9b150420fa47369ff0c95e8edc002b
 msgid "Comply with and enforce PEP8 guidelines"
 msgstr ""
 
-#: ../../changelog.rst:267 889cf4339a4b4d8daf520a7fb9985d8b
+#: ../../changelog.rst:283 889cf4339a4b4d8daf520a7fb9985d8b
 msgid "Replace tables in settings documentation with ``data::`` directives"
 msgstr ""
 
-#: ../../changelog.rst:270 586aeb301e8941fcb2171458f12ad198
+#: ../../changelog.rst:286 586aeb301e8941fcb2171458f12ad198
 msgid "3.6.3 (2015-08-14)"
 msgstr ""
 
-#: ../../changelog.rst:272 5499ed424969406c924c504f6f62f63e
+#: ../../changelog.rst:288 5499ed424969406c924c504f6f62f63e
 msgid "Fix permissions issue in release tarball"
 msgstr ""
 
-#: ../../changelog.rst:275 da9c552726b940a3b07c45b4233657ce
+#: ../../changelog.rst:291 da9c552726b940a3b07c45b4233657ce
 msgid "3.6.2 (2015-08-01)"
 msgstr ""
 
-#: ../../changelog.rst:277 d29fcc033a634d8aac8f656c5eb9674f
+#: ../../changelog.rst:293 d29fcc033a634d8aac8f656c5eb9674f
 msgid "Fix installation errors related to Unicode in tests"
 msgstr ""
 
-#: ../../changelog.rst:278 1276e0c3d1a9447d84e25c3ad9e7abe7
+#: ../../changelog.rst:294 1276e0c3d1a9447d84e25c3ad9e7abe7
 msgid "Don't show pagination in ``notmyidea`` theme if there's only one page"
 msgstr ""
 
-#: ../../changelog.rst:279 c12da2ed75d64539af457cd49216fd7b
+#: ../../changelog.rst:295 c12da2ed75d64539af457cd49216fd7b
 msgid "Make hidden pages available in context"
 msgstr ""
 
-#: ../../changelog.rst:280 22195be7d66d49b5a2536d4125dbb247
+#: ../../changelog.rst:296 22195be7d66d49b5a2536d4125dbb247
 msgid "Improve URLWrapper comparison"
 msgstr ""
 
-#: ../../changelog.rst:283 3fa9c04278aa4a6daaaacf03bcbc86c4
+#: ../../changelog.rst:299 3fa9c04278aa4a6daaaacf03bcbc86c4
 msgid "3.6.0 (2015-06-15)"
 msgstr ""
 
-#: ../../changelog.rst:285 743e2686d8584c64bba2ff52de34b282
+#: ../../changelog.rst:301 743e2686d8584c64bba2ff52de34b282
 msgid "Disable caching by default in order to prevent potential confusion"
 msgstr ""
 
-#: ../../changelog.rst:286 5b7083ceed2642178328e7faf6c2e3d7
+#: ../../changelog.rst:302 5b7083ceed2642178328e7faf6c2e3d7
 msgid "Improve caching behavior, replacing ``pickle`` with ``cpickle``"
 msgstr ""
 
-#: ../../changelog.rst:287 de23594147fd4549af0d010d938b04b1
+#: ../../changelog.rst:303 de23594147fd4549af0d010d938b04b1
 msgid "Allow Markdown or reST content in metadata fields other than ``summary``"
 msgstr ""
 
-#: ../../changelog.rst:288 7d11607580c449709f22c3a7f1dd8cf1
+#: ../../changelog.rst:304 7d11607580c449709f22c3a7f1dd8cf1
 msgid "Support semicolon-separated author/tag lists"
 msgstr ""
 
-#: ../../changelog.rst:289 1b78213ac5644a09b8d58bac7c132b30
+#: ../../changelog.rst:305 1b78213ac5644a09b8d58bac7c132b30
 msgid "Improve flexibility of article sorting"
 msgstr ""
 
-#: ../../changelog.rst:290 24fc473a1dcc409fbceb231cc61bf0db
+#: ../../changelog.rst:306 24fc473a1dcc409fbceb231cc61bf0db
 msgid "Add ``--relative-urls`` argument"
 msgstr ""
 
-#: ../../changelog.rst:291 a56f975051ca406b8ba80ed2b688316e
+#: ../../changelog.rst:307 a56f975051ca406b8ba80ed2b688316e
 msgid "Support devserver listening on addresses other than localhost"
 msgstr ""
 
-#: ../../changelog.rst:292 e1c6f89208aa43768200ae0b5cb667e4
+#: ../../changelog.rst:308 e1c6f89208aa43768200ae0b5cb667e4
 msgid "Unify HTTP server handlers to ``pelican.server`` throughout"
 msgstr ""
 
-#: ../../changelog.rst:293 c2543badc27243f1aadd684351852866
+#: ../../changelog.rst:309 c2543badc27243f1aadd684351852866
 msgid "Handle intra-site links to draft posts"
 msgstr ""
 
-#: ../../changelog.rst:294 3c111a7e2c7b43c683c7bef6a78058a7
+#: ../../changelog.rst:310 3c111a7e2c7b43c683c7bef6a78058a7
 msgid "Move ``tag_cloud`` from core to plugin"
 msgstr ""
 
-#: ../../changelog.rst:295 5e8d38af8ae647ba80edfb065967c18a
+#: ../../changelog.rst:311 5e8d38af8ae647ba80edfb065967c18a
 msgid "Load default theme's external resources via HTTPS"
 msgstr ""
 
-#: ../../changelog.rst:296 8577b7a1315f4c0caa8a68379c7b9da6
+#: ../../changelog.rst:312 8577b7a1315f4c0caa8a68379c7b9da6
 msgid "Import drafts from WordPress XML"
 msgstr ""
 
-#: ../../changelog.rst:297 e2debaa9a5224d09af847e937c1446a6
+#: ../../changelog.rst:313 e2debaa9a5224d09af847e937c1446a6
 msgid "Improve support for Windows users"
 msgstr ""
 
-#: ../../changelog.rst:298 b2042bbb92e74fe5ae51df03addf61da
+#: ../../changelog.rst:314 b2042bbb92e74fe5ae51df03addf61da
 msgid "Enhance logging and test suite"
 msgstr ""
 
-#: ../../changelog.rst:299 373b2ce42e7b4b10b4302660f177b137
+#: ../../changelog.rst:315 373b2ce42e7b4b10b4302660f177b137
 msgid "Clean up and refactor codebase"
 msgstr ""
 
-#: ../../changelog.rst:300 ad174f831fc7487c9efec8f1b1ebc937
+#: ../../changelog.rst:316 ad174f831fc7487c9efec8f1b1ebc937
 msgid "New signals: ``all_generators_finalized`` and ``page_writer_finalized``"
 msgstr ""
 
-#: ../../changelog.rst:303 a0e616e94c144183bb7cd8f0d0f9f253
+#: ../../changelog.rst:319 a0e616e94c144183bb7cd8f0d0f9f253
 msgid "3.5.0 (2014-11-04)"
 msgstr ""
 
-#: ../../changelog.rst:305 d4c1d004789b4cfa9187a2994e2f3613
+#: ../../changelog.rst:321 d4c1d004789b4cfa9187a2994e2f3613
 msgid ""
 "Introduce ``ARTICLE_ORDER_BY`` and ``PAGE_ORDER_BY`` settings to control "
 "the order of articles and pages."
 msgstr ""
 
-#: ../../changelog.rst:307 8532ec7e6c884d6d886c75690a860810
+#: ../../changelog.rst:323 8532ec7e6c884d6d886c75690a860810
 msgid "Include time zone information in dates rendered in templates."
 msgstr ""
 
-#: ../../changelog.rst:308 399b4302a06c4d71853eb69309edaec9
+#: ../../changelog.rst:324 399b4302a06c4d71853eb69309edaec9
 msgid "Expose the reader name in the metadata for articles and pages."
 msgstr ""
 
-#: ../../changelog.rst:309 03f44d912342475d981539bfc28e893b
+#: ../../changelog.rst:325 03f44d912342475d981539bfc28e893b
+#, python-brace-format
 msgid ""
 "Add the ability to store static files along with content in the same "
 "directory as articles and pages using ``{attach}`` in the path."
 msgstr ""
 
-#: ../../changelog.rst:311 aad755538ae5458bb0266537ce3a3488
+#: ../../changelog.rst:327 aad755538ae5458bb0266537ce3a3488
 msgid ""
 "Prevent Pelican from raising an exception when there are duplicate pieces"
 " of metadata in a Markdown file."
 msgstr ""
 
-#: ../../changelog.rst:313 6ccca5efc34c43fc9e6549ce27d07b1a
+#: ../../changelog.rst:329 6ccca5efc34c43fc9e6549ce27d07b1a
 msgid ""
 "Introduce the ``TYPOGRIFY_IGNORE_TAGS`` setting to add HTML tags to be "
 "ignored by Typogrify."
 msgstr ""
 
-#: ../../changelog.rst:315 3a07ce5e47fb446f935a8aef182feda9
+#: ../../changelog.rst:331 3a07ce5e47fb446f935a8aef182feda9
 #, python-format
 msgid ""
 "Add the ability to use ``-`` in date formats to strip leading zeros. For "
 "example, ``%-d/%-m/%y`` will now result in the date ``9/8/12``."
 msgstr ""
 
-#: ../../changelog.rst:317 2b9865f51d2c431cad79bb1ad85dcf13
+#: ../../changelog.rst:333 2b9865f51d2c431cad79bb1ad85dcf13
 msgid ""
 "Ensure feed generation is correctly disabled during quickstart "
 "configuration."
 msgstr ""
 
-#: ../../changelog.rst:318 900fd70063554c06b56e0c13084c5e56
+#: ../../changelog.rst:334 900fd70063554c06b56e0c13084c5e56
 msgid ""
 "Fix ``PAGE_EXCLUDES`` and ``ARTICLE_EXCLUDES`` from incorrectly matching "
 "sub-directories."
 msgstr ""
 
-#: ../../changelog.rst:320 bef97ccdcc354bf68f7a738fefee44d0
+#: ../../changelog.rst:336 bef97ccdcc354bf68f7a738fefee44d0
 msgid "Introduce ``STATIC_EXCLUDE`` setting to add static file excludes."
 msgstr ""
 
-#: ../../changelog.rst:321 96218c06cbc84b9884f17d4b3c2782d4
+#: ../../changelog.rst:337 96218c06cbc84b9884f17d4b3c2782d4
 msgid ""
 "Fix an issue when using ``PAGINATION_PATTERNS`` while ``RELATIVE_URLS`` "
 "is enabled."
 msgstr ""
 
-#: ../../changelog.rst:323 0c2ccbc6e9e74f69912fecf3a9812535
+#: ../../changelog.rst:339 0c2ccbc6e9e74f69912fecf3a9812535
 msgid ""
 "Fix feed generation causing links to use the wrong language for month "
 "names when using other locales."
 msgstr ""
 
-#: ../../changelog.rst:325 ddc6d5315bfa4dd1888de8ff606e1efe
+#: ../../changelog.rst:341 ddc6d5315bfa4dd1888de8ff606e1efe
 msgid ""
 "Fix an issue where the authors list in the simple template wasn't "
 "correctly formatted."
 msgstr ""
 
-#: ../../changelog.rst:327 28013aa7b4734809bd162e47c5bded8f
+#: ../../changelog.rst:343 28013aa7b4734809bd162e47c5bded8f
 msgid "Fix an issue when parsing non-string URLs from settings."
 msgstr ""
 
-#: ../../changelog.rst:328 4fe13830f2ed4449820e4a126e29db74
+#: ../../changelog.rst:344 4fe13830f2ed4449820e4a126e29db74
 msgid "Improve consistency of debug and warning messages."
 msgstr ""
 
-#: ../../changelog.rst:331 e412e8ca8ce94736a1bd9b64260a17c7
+#: ../../changelog.rst:347 e412e8ca8ce94736a1bd9b64260a17c7
 msgid "3.4.0 (2014-07-01)"
 msgstr ""
 
-#: ../../changelog.rst:333 1153f4eed1394ce3a12d65af79337222
+#: ../../changelog.rst:349 1153f4eed1394ce3a12d65af79337222
 msgid "Speed up content generation via new caching mechanism"
 msgstr ""
 
-#: ../../changelog.rst:334 78911d6e2e8f43ce879ae634815c16a4
+#: ../../changelog.rst:350 78911d6e2e8f43ce879ae634815c16a4
 msgid "Add selective post generation (instead of always building entire site)"
 msgstr ""
 
-#: ../../changelog.rst:335 4fe3d9df73aa40f986e1a6f7602c3b09
+#: ../../changelog.rst:351 4fe3d9df73aa40f986e1a6f7602c3b09
 msgid "Many documentation improvements, including switching to prettier RtD theme"
 msgstr ""
 
-#: ../../changelog.rst:336 517fbe1c874c48c2ab429e1ea5633fe3
+#: ../../changelog.rst:352 517fbe1c874c48c2ab429e1ea5633fe3
 msgid "Add support for multiple content and plugin paths"
 msgstr ""
 
-#: ../../changelog.rst:337 ebcfb3cf3a3a4841a4e144fa186ab023
+#: ../../changelog.rst:353 ebcfb3cf3a3a4841a4e144fa186ab023
 msgid ""
 "Add ``:modified:`` metadata field to complement ``:date:``. Used to "
 "specify the last date and time an article was updated independently from "
 "the date and time it was published."
 msgstr ""
 
-#: ../../changelog.rst:340 350a9e23a1e24e8d927ea35835b92ca0
+#: ../../changelog.rst:356 350a9e23a1e24e8d927ea35835b92ca0
 msgid "Add support for multiple authors via new ``:authors:`` metadata field"
 msgstr ""
 
-#: ../../changelog.rst:341 0b0f1d5303444f29990c75b5e071be14
+#: ../../changelog.rst:357 0b0f1d5303444f29990c75b5e071be14
 msgid "Watch for changes in static directories when in auto-regeneration mode"
 msgstr ""
 
-#: ../../changelog.rst:342 29aafd6e485d45188d102fdb72feaafe
+#: ../../changelog.rst:358 29aafd6e485d45188d102fdb72feaafe
 msgid "Add filters to limit log output when desired"
 msgstr ""
 
-#: ../../changelog.rst:343 a77cea47df51490595f9ee1b8e05fdd1
+#: ../../changelog.rst:359 a77cea47df51490595f9ee1b8e05fdd1
 msgid "Add language support to drafts"
 msgstr ""
 
-#: ../../changelog.rst:344 4bd686906beb45ddab847c0cdac33be8
+#: ../../changelog.rst:360 4bd686906beb45ddab847c0cdac33be8
 msgid "Add ``SLUGIFY_SOURCE`` setting to control how post slugs are generated"
 msgstr ""
 
-#: ../../changelog.rst:345 6ce9976300e64d7dadb2048080424994
+#: ../../changelog.rst:361 6ce9976300e64d7dadb2048080424994
 msgid "Fix many issues relating to locale and encoding"
 msgstr ""
 
-#: ../../changelog.rst:346 da577863fe4844d9b74218625a26f6ad
+#: ../../changelog.rst:362 da577863fe4844d9b74218625a26f6ad
 msgid "Apply Typogrify filter to post summary"
 msgstr ""
 
-#: ../../changelog.rst:347 faa72319441d4e8698e29c1bf829189f
+#: ../../changelog.rst:363 faa72319441d4e8698e29c1bf829189f
 msgid ""
 "Preserve file metadata (e.g. time stamps) when copying static files to "
 "output"
 msgstr ""
 
-#: ../../changelog.rst:348 d2b92229d5494bea903ad60e6a5c8335
+#: ../../changelog.rst:364 d2b92229d5494bea903ad60e6a5c8335
 msgid "Move AsciiDoc support from Pelican core into separate plugin"
 msgstr ""
 
-#: ../../changelog.rst:349 61a9b4aa9cb44033b2f4229d2b167c64
+#: ../../changelog.rst:365 61a9b4aa9cb44033b2f4229d2b167c64
 msgid ""
 "Produce inline links instead of reference-style links when importing "
 "content"
 msgstr ""
 
-#: ../../changelog.rst:350 d94f8c5cce634cc8ba784a3b59fb4819
+#: ../../changelog.rst:366 d94f8c5cce634cc8ba784a3b59fb4819
 msgid "Improve handling of ``IGNORE_FILES`` setting behavior"
 msgstr ""
 
-#: ../../changelog.rst:351 e3d657b677384a4588da385c9b21080a
+#: ../../changelog.rst:367 e3d657b677384a4588da385c9b21080a
 msgid "Properly escape symbol characters in tag names (e.g., ``C++``)"
 msgstr ""
 
-#: ../../changelog.rst:352 d519c9f50e564647987ec969d7ec0ccf
+#: ../../changelog.rst:368 d519c9f50e564647987ec969d7ec0ccf
 msgid "Minor tweaks for Python 3.4 compatibility"
 msgstr ""
 
-#: ../../changelog.rst:353 5ce6f5c727f447c9a432d1fd363e2c29
+#: ../../changelog.rst:369 5ce6f5c727f447c9a432d1fd363e2c29
 msgid "Add several new signals"
 msgstr ""
 
-#: ../../changelog.rst:356 dae29c0187c44c27972be55b01c69ef8
+#: ../../changelog.rst:372 dae29c0187c44c27972be55b01c69ef8
 msgid "3.3.0 (2013-09-24)"
 msgstr ""
 
-#: ../../changelog.rst:358 17fad8c0afd94ba5a3b660e70b74a282
+#: ../../changelog.rst:374 17fad8c0afd94ba5a3b660e70b74a282
 msgid "Drop Python 3.2 support in favor of Python 3.3"
 msgstr ""
 
-#: ../../changelog.rst:359 ad9c00a4712845a9a13423e6b9b02a92
+#: ../../changelog.rst:375 ad9c00a4712845a9a13423e6b9b02a92
 msgid ""
 "Add ``Fabfile`` so Fabric can be used for workflow automation instead of "
 "Make"
 msgstr ""
 
-#: ../../changelog.rst:360 cd23162f223245a685ff1a9881b8b195
+#: ../../changelog.rst:376 cd23162f223245a685ff1a9881b8b195
 msgid ""
 "``OUTPUT_RETENTION`` setting can be used to preserve metadata (e.g., VCS "
 "data such as ``.hg`` and ``.git``) from being removed from output "
 "directory"
 msgstr ""
 
-#: ../../changelog.rst:362 2d4af689970445558506be64942cda4d
+#: ../../changelog.rst:378 2d4af689970445558506be64942cda4d
 msgid "Tumblr import"
 msgstr ""
 
-#: ../../changelog.rst:363 94cb151962db4a4186070048cf9a52d1
+#: ../../changelog.rst:379 94cb151962db4a4186070048cf9a52d1
 msgid "Improve logic and consistency when cleaning output folder"
 msgstr ""
 
-#: ../../changelog.rst:364 4f24e4305c8f49baba762604f81a009b
+#: ../../changelog.rst:380 4f24e4305c8f49baba762604f81a009b
 msgid "Improve documentation versioning and release automation"
 msgstr ""
 
-#: ../../changelog.rst:365 fd8868d0c4ee4ec5b998c117e60fe784
+#: ../../changelog.rst:381 fd8868d0c4ee4ec5b998c117e60fe784
 msgid "Improve pagination flexibility"
 msgstr ""
 
-#: ../../changelog.rst:366 eb2be9edbc6e470f952a97cac0a8c012
+#: ../../changelog.rst:382 eb2be9edbc6e470f952a97cac0a8c012
 msgid ""
 "Rename signals for better consistency (some plugins may need to be "
 "updated)"
 msgstr ""
 
-#: ../../changelog.rst:367 89f9707a3d1e443389b024a5bc34f87e
+#: ../../changelog.rst:383 89f9707a3d1e443389b024a5bc34f87e
 msgid ""
 "Move metadata extraction from generators to readers; metadata extraction "
 "no longer article-specific"
 msgstr ""
 
-#: ../../changelog.rst:369 41bb6f6c43cd493ab89c900de7aa6628
+#: ../../changelog.rst:385 41bb6f6c43cd493ab89c900de7aa6628
 msgid ""
 "Deprecate ``FILES_TO_COPY`` in favor of ``STATIC_PATHS`` and "
 "``EXTRA_PATH_METADATA``"
 msgstr ""
 
-#: ../../changelog.rst:371 86a7dff5bc8645c3be130a8ae4add149
+#: ../../changelog.rst:387 86a7dff5bc8645c3be130a8ae4add149
 msgid "Summaries in Markdown posts no longer include footnotes"
 msgstr ""
 
-#: ../../changelog.rst:372 009790743d7f42ba8278f18c392db041
+#: ../../changelog.rst:388 009790743d7f42ba8278f18c392db041
 msgid ""
 "Remove unnecessary whitespace in output via ``lstrip_blocks`` Jinja "
 "parameter"
 msgstr ""
 
-#: ../../changelog.rst:373 38b06c9a766c4c93b6d8e2869a5b3711
+#: ../../changelog.rst:389 38b06c9a766c4c93b6d8e2869a5b3711
 msgid "Move PDF generation from core to plugin"
 msgstr ""
 
-#: ../../changelog.rst:374 bb68b5bb0de84b9abfcd65987be9c368
+#: ../../changelog.rst:390 bb68b5bb0de84b9abfcd65987be9c368
 msgid "Replace ``MARKUP`` setting with ``READERS``"
 msgstr ""
 
-#: ../../changelog.rst:375 4a0c9f70f0f24261a597ce1b155e0800
+#: ../../changelog.rst:391 4a0c9f70f0f24261a597ce1b155e0800
 msgid "Add warning if img tag is missing ``alt`` attribute"
 msgstr ""
 
-#: ../../changelog.rst:376 dcabdeff1f5e4ee69292730bb31c9131
+#: ../../changelog.rst:392 dcabdeff1f5e4ee69292730bb31c9131
+#, python-brace-format
 msgid "Add support for ``{}`` in relative links syntax, besides ``||``"
 msgstr ""
 
-#: ../../changelog.rst:377 9fde536f5fca40e6a620b5f07049a0c3
+#: ../../changelog.rst:393 9fde536f5fca40e6a620b5f07049a0c3
+#, python-brace-format
 msgid "Add support for ``{tag}`` and ``{category}`` relative links"
 msgstr ""
 
-#: ../../changelog.rst:378 b241cd3f2847484bb7a56631c58d5ba4
+#: ../../changelog.rst:394 b241cd3f2847484bb7a56631c58d5ba4
 msgid "Add a ``content_written`` signal"
 msgstr ""
 
-#: ../../changelog.rst:381 b6077687c2a64ddeafa187b1448c048f
+#: ../../changelog.rst:397 b6077687c2a64ddeafa187b1448c048f
 msgid "3.2.1 and 3.2.2"
 msgstr ""
 
-#: ../../changelog.rst:383 bf6c37fc7c2e47f0aee3ee9cb0cb5306
+#: ../../changelog.rst:399 bf6c37fc7c2e47f0aee3ee9cb0cb5306
 msgid "Facilitate inclusion in FreeBSD Ports Collection"
 msgstr ""
 
-#: ../../changelog.rst:386 3e800dbf3fe24766b77a043bc8da3c09
+#: ../../changelog.rst:402 3e800dbf3fe24766b77a043bc8da3c09
 msgid "3.2 (2013-04-24)"
 msgstr ""
 
-#: ../../changelog.rst:388 17cb561f2e184679831d2e3ac7eda3de
+#: ../../changelog.rst:404 17cb561f2e184679831d2e3ac7eda3de
 msgid "Support for Python 3!"
 msgstr ""
 
-#: ../../changelog.rst:389 faee303362bb40ad952cc4581036f070
+#: ../../changelog.rst:405 faee303362bb40ad952cc4581036f070
 msgid ""
 "Override page save-to location from meta-data (enables using a static "
 "page as the site's home page, for example)"
 msgstr ""
 
-#: ../../changelog.rst:391 3fc6523eaace489494b61380def294d1
+#: ../../changelog.rst:407 3fc6523eaace489494b61380def294d1
 msgid "Time period archives (per-year, per-month, and per-day archives of posts)"
 msgstr ""
 
-#: ../../changelog.rst:392 3eafb73945bf414cbcb903a9695ff8de
+#: ../../changelog.rst:408 3eafb73945bf414cbcb903a9695ff8de
 msgid "Posterous blog import"
 msgstr ""
 
-#: ../../changelog.rst:393 cc3982d7a21146319745d929a38b43d9
+#: ../../changelog.rst:409 cc3982d7a21146319745d929a38b43d9
 msgid "Improve WordPress blog import"
 msgstr ""
 
-#: ../../changelog.rst:394 165fdfe5bfe1415c8b6cd56af637f3d4
+#: ../../changelog.rst:410 165fdfe5bfe1415c8b6cd56af637f3d4
 msgid "Migrate plugins to separate repository"
 msgstr ""
 
-#: ../../changelog.rst:395 2f62212ada534de6ade55404aae98383
+#: ../../changelog.rst:411 2f62212ada534de6ade55404aae98383
 msgid "Improve HTML parser"
 msgstr ""
 
-#: ../../changelog.rst:396 66b0bf3a2b4a47c78a5a936c80c0e4fb
+#: ../../changelog.rst:412 66b0bf3a2b4a47c78a5a936c80c0e4fb
 msgid ""
 "Provide ability to show or hide categories from menu using "
 "``DISPLAY_CATEGORIES_ON_MENU`` option"
 msgstr ""
 
-#: ../../changelog.rst:398 d316333413c3459f803d9ec694450dab
+#: ../../changelog.rst:414 d316333413c3459f803d9ec694450dab
 msgid "Auto-regeneration can be told to ignore files via ``IGNORE_FILES`` setting"
 msgstr ""
 
-#: ../../changelog.rst:399 7a199ee7396d485aaa55496b32e8a5c0
+#: ../../changelog.rst:415 7a199ee7396d485aaa55496b32e8a5c0
 msgid "Improve post-generation feedback to user"
 msgstr ""
 
-#: ../../changelog.rst:400 6deb9ccecfab4fcba7157680ce6a35b9
+#: ../../changelog.rst:416 6deb9ccecfab4fcba7157680ce6a35b9
 msgid ""
 "For multilingual posts, use meta-data to designate which is the original "
 "and which is the translation"
 msgstr ""
 
-#: ../../changelog.rst:402 be2051f4c2304904b3264bd61da6bb3b
+#: ../../changelog.rst:418 be2051f4c2304904b3264bd61da6bb3b
 msgid "Add ``.mdown`` to list of supported Markdown file extensions"
 msgstr ""
 
-#: ../../changelog.rst:403 be4c498c73604b7289bd908490b820fe
+#: ../../changelog.rst:419 be4c498c73604b7289bd908490b820fe
 msgid "Document-relative URL generation (``RELATIVE_URLS``) is now off by default"
 msgstr ""
 
-#: ../../changelog.rst:406 26c902ee59b54f5199b53dbd841981ce
+#: ../../changelog.rst:422 26c902ee59b54f5199b53dbd841981ce
 msgid "3.1 (2012-12-04)"
 msgstr ""
 
-#: ../../changelog.rst:408 1dce4c50db964039b0d0b4a27e19ce96
+#: ../../changelog.rst:424 1dce4c50db964039b0d0b4a27e19ce96
 msgid ""
 "Importer now stores slugs within files by default. This can be disabled "
 "with the ``--disable-slugs`` option."
 msgstr ""
 
-#: ../../changelog.rst:410 247f3c4937844361a98a9bbc557774cb
+#: ../../changelog.rst:426 247f3c4937844361a98a9bbc557774cb
 msgid "Improve handling of links to intra-site resources"
 msgstr ""
 
-#: ../../changelog.rst:411 baf6646be1424810853be748d7a15129
+#: ../../changelog.rst:427 baf6646be1424810853be748d7a15129
 msgid ""
 "Ensure WordPress import adds paragraphs for all types of line endings in "
 "post content"
 msgstr ""
 
-#: ../../changelog.rst:413 4cefab609bb64186a2f597cedad65b61
+#: ../../changelog.rst:429 4cefab609bb64186a2f597cedad65b61
 msgid "Decode HTML entities within WordPress post titles on import"
 msgstr ""
 
-#: ../../changelog.rst:414 8b1e222311f749a5b50858f0dc34466d
+#: ../../changelog.rst:430 8b1e222311f749a5b50858f0dc34466d
 msgid "Improve appearance of LinkedIn icon in default theme"
 msgstr ""
 
-#: ../../changelog.rst:415 bd4f42ac16a040d6b0e5cb1e9f5d5977
+#: ../../changelog.rst:431 bd4f42ac16a040d6b0e5cb1e9f5d5977
 msgid "Add GitHub and Google+ social icons support in default theme"
 msgstr ""
 
-#: ../../changelog.rst:416 d65513f7ff4d4294a5a4b755f6aa65c4
+#: ../../changelog.rst:432 d65513f7ff4d4294a5a4b755f6aa65c4
 msgid "Optimize social icons"
 msgstr ""
 
-#: ../../changelog.rst:417 9c930d0296f9464490df06094597739f
+#: ../../changelog.rst:433 9c930d0296f9464490df06094597739f
 msgid ""
 "Add ``FEED_ALL_ATOM`` and ``FEED_ALL_RSS`` to generate feeds containing "
 "all posts regardless of their language"
 msgstr ""
 
-#: ../../changelog.rst:419 c3c18b3ea6ce4a24abb55abd44b7164f
+#: ../../changelog.rst:435 c3c18b3ea6ce4a24abb55abd44b7164f
 msgid ""
 "Split ``TRANSLATION_FEED`` into ``TRANSLATION_FEED_ATOM`` and "
 "``TRANSLATION_FEED_RSS``"
 msgstr ""
 
-#: ../../changelog.rst:421 9994413cfc6347fd8b9879e117b2b889
+#: ../../changelog.rst:437 9994413cfc6347fd8b9879e117b2b889
 msgid "Different feeds can now be enabled/disabled individually"
 msgstr ""
 
-#: ../../changelog.rst:422 ca5c45416f784c87bed555ace354af21
+#: ../../changelog.rst:438 ca5c45416f784c87bed555ace354af21
+#, python-brace-format
 msgid ""
 "Allow for blank author: if ``AUTHOR`` setting is not set, author won't "
 "default to ``${USER}`` anymore, and a post won't contain any author "
 "information if the post author is empty"
 msgstr ""
 
-#: ../../changelog.rst:425 5270ac00aa8f4f2d98f2a3a57a6bf03c
+#: ../../changelog.rst:441 5270ac00aa8f4f2d98f2a3a57a6bf03c
 msgid "Move LESS and Webassets support from Pelican core to plugin"
 msgstr ""
 
-#: ../../changelog.rst:426 a8e64d393d0a4e3195dbdc1215302f9c
+#: ../../changelog.rst:442 a8e64d393d0a4e3195dbdc1215302f9c
 msgid ""
 "The ``DEFAULT_DATE`` setting now defaults to ``None``, which means that "
 "articles won't be generated unless date metadata is specified"
 msgstr ""
 
-#: ../../changelog.rst:428 e9d682bcd1de45f3a1a98ae17193aced
+#: ../../changelog.rst:444 e9d682bcd1de45f3a1a98ae17193aced
 msgid ""
 "Add ``FILENAME_METADATA`` setting to support metadata extraction from "
 "filename"
 msgstr ""
 
-#: ../../changelog.rst:430 fe3a4d2bc15d4b4fba48fc8af3569336
+#: ../../changelog.rst:446 fe3a4d2bc15d4b4fba48fc8af3569336
 msgid ""
 "Add ``gzip_cache`` plugin to compress common text files into a ``.gz`` "
 "file within the same directory as the original file, preventing the "
 "server (e.g. Nginx) from having to compress files during an HTTP call"
 msgstr ""
 
-#: ../../changelog.rst:433 c44353005d5d4e1293cc9a1878517726
+#: ../../changelog.rst:449 c44353005d5d4e1293cc9a1878517726
 msgid "Add support for AsciiDoc-formatted content"
 msgstr ""
 
-#: ../../changelog.rst:434 dcdc1aff409544f1b60d7c22a7a41b6b
+#: ../../changelog.rst:450 dcdc1aff409544f1b60d7c22a7a41b6b
 msgid ""
 "Add ``USE_FOLDER_AS_CATEGORY`` setting so that feature can be toggled "
 "on/off"
 msgstr ""
 
-#: ../../changelog.rst:435 f6675e347a114c75a3952ef5ef5f1e29
+#: ../../changelog.rst:451 f6675e347a114c75a3952ef5ef5f1e29
 msgid "Support arbitrary Jinja template files"
 msgstr ""
 
-#: ../../changelog.rst:436 87ba44c075b144ee8c4734e4f6f4e4c9
+#: ../../changelog.rst:452 87ba44c075b144ee8c4734e4f6f4e4c9
 msgid "Restore basic functional tests"
 msgstr ""
 
-#: ../../changelog.rst:437 0354818a87df49e59ac35a7d738c8e83
+#: ../../changelog.rst:453 0354818a87df49e59ac35a7d738c8e83
 msgid ""
 "New signals: ``generator_init``, ``get_generators``, and "
 "``article_generate_preread``"
 msgstr ""
 
-#: ../../changelog.rst:441 1256b71b526e43dbb94823c0604f0bc6
+#: ../../changelog.rst:457 1256b71b526e43dbb94823c0604f0bc6
 msgid "3.0 (2012-08-08)"
 msgstr ""
 
-#: ../../changelog.rst:443 e79ee10015eb41fea71877bff6453a0b
+#: ../../changelog.rst:459 e79ee10015eb41fea71877bff6453a0b
 msgid "Refactored the way URLs are handled"
 msgstr ""
 
-#: ../../changelog.rst:444 f41008aff59344b0a964a38304c8f27d
+#: ../../changelog.rst:460 f41008aff59344b0a964a38304c8f27d
 msgid "Improved the English documentation"
 msgstr ""
 
-#: ../../changelog.rst:445 9cfcf344ed0d41c0aa20d2e4178de487
+#: ../../changelog.rst:461 9cfcf344ed0d41c0aa20d2e4178de487
 msgid "Fixed packaging using ``setuptools`` entrypoints"
 msgstr ""
 
-#: ../../changelog.rst:446 75d4a7f700424bb69bd8fbba899fe5f2
+#: ../../changelog.rst:462 75d4a7f700424bb69bd8fbba899fe5f2
 msgid "Added ``typogrify`` support"
 msgstr ""
 
-#: ../../changelog.rst:447 e9e8e0933822437381e4a099118d17a8
+#: ../../changelog.rst:463 e9e8e0933822437381e4a099118d17a8
 msgid "Added a way to disable feed generation"
 msgstr ""
 
-#: ../../changelog.rst:448 c9746121791347a18725b210eb69fca6
+#: ../../changelog.rst:464 c9746121791347a18725b210eb69fca6
 msgid "Added support for ``DIRECT_TEMPLATES``"
 msgstr ""
 
-#: ../../changelog.rst:449 84b68057366c4c1eb56502f64a42bb73
+#: ../../changelog.rst:465 84b68057366c4c1eb56502f64a42bb73
 msgid "Allow multiple extensions for content files"
 msgstr ""
 
-#: ../../changelog.rst:450 36450fadc3a1446898365333ebd9a369
+#: ../../changelog.rst:466 36450fadc3a1446898365333ebd9a369
 msgid "Added LESS support"
 msgstr ""
 
-#: ../../changelog.rst:451 1e1d7cc4e8b647c1b9c5be55374c43f0
+#: ../../changelog.rst:467 1e1d7cc4e8b647c1b9c5be55374c43f0
 msgid "Improved the import script"
 msgstr ""
 
-#: ../../changelog.rst:452 bbb3522bded542c9af30ade57961b005
+#: ../../changelog.rst:468 bbb3522bded542c9af30ade57961b005
 msgid "Added functional tests"
 msgstr ""
 
-#: ../../changelog.rst:453 06d82b81708d4234911c4552adb21aa3
+#: ../../changelog.rst:469 06d82b81708d4234911c4552adb21aa3
 msgid "Rsync support in the generated Makefile"
 msgstr ""
 
-#: ../../changelog.rst:454 9e0ef37470e4457d91f43b9a7ceb77aa
+#: ../../changelog.rst:470 9e0ef37470e4457d91f43b9a7ceb77aa
 msgid "Improved feed support (easily pluggable with Feedburner for instance)"
 msgstr ""
 
-#: ../../changelog.rst:455 5a84812ef2d440b5953327383ac064ed
+#: ../../changelog.rst:471 5a84812ef2d440b5953327383ac064ed
 msgid "Added support for ``abbr`` in reST"
 msgstr ""
 
-#: ../../changelog.rst:456 3e899ccc01a94cca8886244190cf5944
+#: ../../changelog.rst:472 3e899ccc01a94cca8886244190cf5944
 msgid "Fixed a bunch of bugs :-)"
 msgstr ""
 
-#: ../../changelog.rst:459 73ed385ee1c143dcb9d1f5a2aa21a101
+#: ../../changelog.rst:475 73ed385ee1c143dcb9d1f5a2aa21a101
 msgid "2.8 (2012-02-28)"
 msgstr ""
 
-#: ../../changelog.rst:461 e037cd34f3af4d2c826ccc7a949f2df8
+#: ../../changelog.rst:477 e037cd34f3af4d2c826ccc7a949f2df8
 msgid "Dotclear importer"
 msgstr ""
 
-#: ../../changelog.rst:462 994601f5041a465086869af70ae072dc
+#: ../../changelog.rst:478 994601f5041a465086869af70ae072dc
 msgid "Allow the usage of Markdown extensions"
 msgstr ""
 
-#: ../../changelog.rst:463 0830c593481e4e5ea1526f4d1a8848fa
+#: ../../changelog.rst:479 0830c593481e4e5ea1526f4d1a8848fa
 msgid "Themes are now easily extensible"
 msgstr ""
 
-#: ../../changelog.rst:464 3ff0b224c93e442684a1b686d8666ced
+#: ../../changelog.rst:480 3ff0b224c93e442684a1b686d8666ced
 msgid "Don't output pagination information if there is only one page"
 msgstr ""
 
-#: ../../changelog.rst:465 ec4ec66862df420caf61a32c472f972b
+#: ../../changelog.rst:481 ec4ec66862df420caf61a32c472f972b
 msgid "Add a page per author, with all their articles"
 msgstr ""
 
-#: ../../changelog.rst:466 864df61f6eef43e4980bf957b14ac26e
+#: ../../changelog.rst:482 864df61f6eef43e4980bf957b14ac26e
 msgid "Improved the test suite"
 msgstr ""
 
-#: ../../changelog.rst:467 285e4cb5a43241558e3d2bf1876c0ee5
+#: ../../changelog.rst:483 285e4cb5a43241558e3d2bf1876c0ee5
 msgid "Made the themes easier to extend"
 msgstr ""
 
-#: ../../changelog.rst:468 7597e818692d42039cffc1fb67513c52
+#: ../../changelog.rst:484 7597e818692d42039cffc1fb67513c52
 msgid "Removed Skribit support"
 msgstr ""
 
-#: ../../changelog.rst:469 867bceffc3cf431a919f92d33691870a
+#: ../../changelog.rst:485 867bceffc3cf431a919f92d33691870a
 msgid "Added a ``pelican-quickstart`` script"
 msgstr ""
 
-#: ../../changelog.rst:470 bdbf4396e57242af8f2be7c4c20ea455
+#: ../../changelog.rst:486 bdbf4396e57242af8f2be7c4c20ea455
 msgid "Fixed timezone-related issues"
 msgstr ""
 
-#: ../../changelog.rst:471 2a8752a2c1d14916aa78eaf4878db4f9
+#: ../../changelog.rst:487 2a8752a2c1d14916aa78eaf4878db4f9
 msgid "Added some scripts for Windows support"
 msgstr ""
 
-#: ../../changelog.rst:472 67d470d30d8d41d38022c6a7024f3c62
+#: ../../changelog.rst:488 67d470d30d8d41d38022c6a7024f3c62
 msgid "Date can be specified in seconds"
 msgstr ""
 
-#: ../../changelog.rst:473 fcdf6b71286b4951ac69786e590c7649
+#: ../../changelog.rst:489 fcdf6b71286b4951ac69786e590c7649
 msgid "Never fail when generating posts (skip and continue)"
 msgstr ""
 
-#: ../../changelog.rst:474 9cba8ad7120b4ea0bdd385d5facb119f
+#: ../../changelog.rst:490 9cba8ad7120b4ea0bdd385d5facb119f
 msgid "Allow the use of future dates"
 msgstr ""
 
-#: ../../changelog.rst:475 4ded329080034fac931b6be8f801ce2d
+#: ../../changelog.rst:491 4ded329080034fac931b6be8f801ce2d
 msgid "Support having different timezones per language"
 msgstr ""
 
-#: ../../changelog.rst:476 5a5f49be18c449fba6a8aeaa2b36b14e
+#: ../../changelog.rst:492 5a5f49be18c449fba6a8aeaa2b36b14e
 msgid "Enhanced the documentation"
 msgstr ""
 
-#: ../../changelog.rst:479 d49c481caef348f59c74d194bcca6579
+#: ../../changelog.rst:495 d49c481caef348f59c74d194bcca6579
 msgid "2.7 (2011-06-11)"
 msgstr ""
 
-#: ../../changelog.rst:481 7d8c241cc73642d8a5214b44dcfe30ca
+#: ../../changelog.rst:497 7d8c241cc73642d8a5214b44dcfe30ca
 msgid "Use ``logging`` rather than echoing to stdout"
 msgstr ""
 
-#: ../../changelog.rst:482 670a6095a13c4970aac3016915813b9c
+#: ../../changelog.rst:498 670a6095a13c4970aac3016915813b9c
 msgid "Support custom Jinja filters"
 msgstr ""
 
-#: ../../changelog.rst:483 be2c4c82052b4cb48e02ca0dca49eeb6
+#: ../../changelog.rst:499 be2c4c82052b4cb48e02ca0dca49eeb6
 msgid "Compatibility with Python 2.5"
 msgstr ""
 
-#: ../../changelog.rst:484 773398476e4d45df89d7d958d2e496e6
+#: ../../changelog.rst:500 773398476e4d45df89d7d958d2e496e6
 msgid "Added a theme manager"
 msgstr ""
 
-#: ../../changelog.rst:485 963c80928b8e4d92a9c549a4daa58cb9
+#: ../../changelog.rst:501 963c80928b8e4d92a9c549a4daa58cb9
 msgid "Packaged for Debian"
 msgstr ""
 
-#: ../../changelog.rst:486 c37c96fad3ad438395e73f2b2fdd5678
+#: ../../changelog.rst:502 c37c96fad3ad438395e73f2b2fdd5678
 msgid "Added draft support"
 msgstr ""
 
-#: ../../changelog.rst:489 7c215208f8a34f53ae0d22361f9305af
+#: ../../changelog.rst:505 7c215208f8a34f53ae0d22361f9305af
 msgid "2.6 (2011-03-08)"
 msgstr ""
 
-#: ../../changelog.rst:491 deeb4eb9a00547bea54a8f4486cea948
+#: ../../changelog.rst:507 deeb4eb9a00547bea54a8f4486cea948
 msgid "Changes in the output directory structure"
 msgstr ""
 
-#: ../../changelog.rst:492 5719cd5592b442549b860851c95ace8a
+#: ../../changelog.rst:508 5719cd5592b442549b860851c95ace8a
 msgid "Makes templates easier to work with / create"
 msgstr ""
 
-#: ../../changelog.rst:493 a14ed59f0b7d43b7b64033cbda6fa1b3
+#: ../../changelog.rst:509 a14ed59f0b7d43b7b64033cbda6fa1b3
 msgid "Added RSS support (was Atom-only)"
 msgstr ""
 
-#: ../../changelog.rst:494 2b78e48ee5c04ee88a19e82dd5736b08
+#: ../../changelog.rst:510 2b78e48ee5c04ee88a19e82dd5736b08
 msgid "Added tag support for the feeds"
 msgstr ""
 
-#: ../../changelog.rst:495 129c8684dfe34773943a63f7294422dc
+#: ../../changelog.rst:511 129c8684dfe34773943a63f7294422dc
 msgid "Enhance the documentation"
 msgstr ""
 
-#: ../../changelog.rst:496 865503839227447ca15dae5cccbbd7f8
+#: ../../changelog.rst:512 865503839227447ca15dae5cccbbd7f8
 msgid "Added another theme (brownstone)"
 msgstr ""
 
-#: ../../changelog.rst:497 ecbde1d7724c445283ca769b43684207
+#: ../../changelog.rst:513 ecbde1d7724c445283ca769b43684207
 msgid "Added translations"
 msgstr ""
 
-#: ../../changelog.rst:498 6877cc6c1e92490fab2840698dadba59
+#: ../../changelog.rst:514 6877cc6c1e92490fab2840698dadba59
 msgid "Added a way to use cleaner URLs with a rewrite url module (or equivalent)"
 msgstr ""
 
-#: ../../changelog.rst:499 4b937b4f363b4bfd86d3447d61ac79e0
+#: ../../changelog.rst:515 4b937b4f363b4bfd86d3447d61ac79e0
 msgid "Added a tag cloud"
 msgstr ""
 
-#: ../../changelog.rst:500 61ebc53121c34b96bb6edf9bd95b385e
+#: ../../changelog.rst:516 61ebc53121c34b96bb6edf9bd95b385e
 msgid ""
 "Added an autoreloading feature: the blog is automatically regenerated "
 "each time a modification is detected"
 msgstr ""
 
-#: ../../changelog.rst:502 79b3ebc425c64a60a5e9914da9e43752
+#: ../../changelog.rst:518 79b3ebc425c64a60a5e9914da9e43752
 msgid "Translate the documentation into French"
 msgstr ""
 
-#: ../../changelog.rst:503 a1446ce9b3e147ac9926754b1db32746
+#: ../../changelog.rst:519 a1446ce9b3e147ac9926754b1db32746
 msgid "Import a blog from an RSS feed"
 msgstr ""
 
-#: ../../changelog.rst:504 0d427fc4738a447fbdae05b78559171e
+#: ../../changelog.rst:520 0d427fc4738a447fbdae05b78559171e
 msgid "Pagination support"
 msgstr ""
 
-#: ../../changelog.rst:505 d70488ef9cea45db8389a99209fe9d9a
+#: ../../changelog.rst:521 d70488ef9cea45db8389a99209fe9d9a
 msgid "Added Skribit support"
 msgstr ""
 
-#: ../../changelog.rst:508 ee9730d28c0a4e378618499401e1e399
+#: ../../changelog.rst:524 ee9730d28c0a4e378618499401e1e399
 msgid "2.5 (2010-11-20)"
 msgstr ""
 
-#: ../../changelog.rst:510 41764632aa2a46a9864a41bfa73b3d58
+#: ../../changelog.rst:526 41764632aa2a46a9864a41bfa73b3d58
 msgid "Import from WordPress"
 msgstr ""
 
-#: ../../changelog.rst:511 b3ee93bdd46e4699adea39b8e99ba3c4
+#: ../../changelog.rst:527 b3ee93bdd46e4699adea39b8e99ba3c4
 msgid "Added some new themes (martyalchin / wide-notmyidea)"
 msgstr ""
 
-#: ../../changelog.rst:512 1a023f24ad50438c947a0c980213819a
+#: ../../changelog.rst:528 1a023f24ad50438c947a0c980213819a
 msgid "First bug report!"
 msgstr ""
 
-#: ../../changelog.rst:513 573a4f64b2d2486f80416c4f98e5a3e4
+#: ../../changelog.rst:529 573a4f64b2d2486f80416c4f98e5a3e4
 msgid "Linkedin support"
 msgstr ""
 
-#: ../../changelog.rst:514 c3c6ab49cad54f60a2f167abc9888764
+#: ../../changelog.rst:530 c3c6ab49cad54f60a2f167abc9888764
 msgid "Added a FAQ"
 msgstr ""
 
-#: ../../changelog.rst:515 7cf0a7d9c46545dd81397ed03bcd542e
+#: ../../changelog.rst:531 7cf0a7d9c46545dd81397ed03bcd542e
 msgid "Google Analytics support"
 msgstr ""
 
-#: ../../changelog.rst:516 de467a7c0a654db0a31ec42908c83b39
+#: ../../changelog.rst:532 de467a7c0a654db0a31ec42908c83b39
 msgid "Twitter support"
 msgstr ""
 
-#: ../../changelog.rst:517 455af156688d454f8dea6b8dcca0cb48
+#: ../../changelog.rst:533 455af156688d454f8dea6b8dcca0cb48
 msgid "Use relative URLs, not static ones"
 msgstr ""
 
-#: ../../changelog.rst:520 12dceabc363e493599eb83725eb0d891
+#: ../../changelog.rst:536 12dceabc363e493599eb83725eb0d891
 msgid "2.4 (2010-11-06)"
 msgstr ""
 
-#: ../../changelog.rst:522 0d24870c616a4d02a6e23758a1022a0c
+#: ../../changelog.rst:538 0d24870c616a4d02a6e23758a1022a0c
 msgid "Minor themes changes"
 msgstr ""
 
-#: ../../changelog.rst:523 4d8d6c48d9824e258c6789afe95ffb4e
+#: ../../changelog.rst:539 4d8d6c48d9824e258c6789afe95ffb4e
 msgid "Add Disqus support (so we have comments)"
 msgstr ""
 
-#: ../../changelog.rst:524 74cd4df65f8b41a1967033aedead1c87
+#: ../../changelog.rst:540 74cd4df65f8b41a1967033aedead1c87
 msgid "Another code refactoring"
 msgstr ""
 
-#: ../../changelog.rst:525 a44c01fa1c1242ab86a6ab32851e0284
+#: ../../changelog.rst:541 a44c01fa1c1242ab86a6ab32851e0284
 msgid "Added config settings about pages"
 msgstr ""
 
-#: ../../changelog.rst:526 c4519c5267eb4606b7f5de643028429e
+#: ../../changelog.rst:542 c4519c5267eb4606b7f5de643028429e
 msgid "Blog entries can also be generated in PDF"
 msgstr ""
 
-#: ../../changelog.rst:529 7164d3eacbd946c8a317dc16929ba48d
+#: ../../changelog.rst:545 7164d3eacbd946c8a317dc16929ba48d
 msgid "2.3 (2010-10-31)"
 msgstr ""
 
-#: ../../changelog.rst:531 ca062e8a7c1a43f2a678bbfe22484d6a
+#: ../../changelog.rst:547 ca062e8a7c1a43f2a678bbfe22484d6a
 msgid "Markdown support"
 msgstr ""
 
-#: ../../changelog.rst:534 fc9a53b1a9034f809688d3c4114b412c
+#: ../../changelog.rst:550 fc9a53b1a9034f809688d3c4114b412c
 msgid "2.2 (2010-10-30)"
 msgstr ""
 
-#: ../../changelog.rst:536 121f2a61adc043a79c029fb4acc3ea0d
+#: ../../changelog.rst:552 121f2a61adc043a79c029fb4acc3ea0d
 msgid "Prettify output"
 msgstr ""
 
-#: ../../changelog.rst:537 f6a56a02617e458089148229dd92bd08
+#: ../../changelog.rst:553 f6a56a02617e458089148229dd92bd08
 msgid "Manages static pages as well"
 msgstr ""
 
-#: ../../changelog.rst:540 c4d2a7150f2a46f7a87e1d810777b5be
+#: ../../changelog.rst:556 c4d2a7150f2a46f7a87e1d810777b5be
 msgid "2.1 (2010-10-30)"
 msgstr ""
 
-#: ../../changelog.rst:542 739f08f2d6a746199390e3809f4a27f1
+#: ../../changelog.rst:558 739f08f2d6a746199390e3809f4a27f1
 msgid "Make notmyidea the default theme"
 msgstr ""
 
-#: ../../changelog.rst:545 2596c0b20ea947a5845cd92f3190f32e
+#: ../../changelog.rst:561 2596c0b20ea947a5845cd92f3190f32e
 msgid "2.0 (2010-10-30)"
 msgstr ""
 
-#: ../../changelog.rst:547 a023ea05a0864c2085b91526bfa23554
+#: ../../changelog.rst:563 a023ea05a0864c2085b91526bfa23554
 msgid "Refactoring to be more extensible"
 msgstr ""
 
-#: ../../changelog.rst:548 a411e0742c7a4751b1b5d8f7848cbf2b
+#: ../../changelog.rst:564 a411e0742c7a4751b1b5d8f7848cbf2b
 msgid "Change into the setting variables"
 msgstr ""
 
-#: ../../changelog.rst:551 d8933a28653242fc942087162ac6a4c9
+#: ../../changelog.rst:567 d8933a28653242fc942087162ac6a4c9
 msgid "1.2 (2010-09-28)"
 msgstr ""
 
-#: ../../changelog.rst:553 66415309e0d64d06a490ecaef4efb36d
+#: ../../changelog.rst:569 66415309e0d64d06a490ecaef4efb36d
 msgid "Added a debug option"
 msgstr ""
 
-#: ../../changelog.rst:554 ceaef7c8b0fe4df79600738d71b8d094
+#: ../../changelog.rst:570 ceaef7c8b0fe4df79600738d71b8d094
 msgid "Added per-category feeds"
 msgstr ""
 
-#: ../../changelog.rst:555 6bac9fd70e104b28bfd06a936d71e32a
+#: ../../changelog.rst:571 6bac9fd70e104b28bfd06a936d71e32a
 msgid "Use filesystem to get dates if no metadata is provided"
 msgstr ""
 
-#: ../../changelog.rst:556 1f663ceee61b4c0595834cc72a9e3e7d
+#: ../../changelog.rst:572 1f663ceee61b4c0595834cc72a9e3e7d
 msgid "Add Pygments support"
 msgstr ""
 
-#: ../../changelog.rst:559 1df408a7787943e68de9384710331200
+#: ../../changelog.rst:575 1df408a7787943e68de9384710331200
 msgid "1.1 (2010-08-19)"
 msgstr ""
 
-#: ../../changelog.rst:561 7e611ea96d6c4b4db5751229abbfec38
+#: ../../changelog.rst:577 7e611ea96d6c4b4db5751229abbfec38
 msgid "First working version"
 msgstr ""
diff --git a/docs/locale/zh_CN/LC_MESSAGES/contribute.po b/docs/locale/zh_CN/LC_MESSAGES/contribute.po
index 3149fff3..5199f51a 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/contribute.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/contribute.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-25 20:36+0800\n"
+"POT-Creation-Date: 2025-07-13 11:46+0800\n"
 "PO-Revision-Date: 2024-06-27 19:00+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
@@ -16,93 +16,91 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.15.0\n"
+"Generated-By: Babel 2.17.0\n"
 
-#: ../../contribute.rst:2 e8f9694c47aa44e7944dae800ee528f3
+#: ../../contribute.rst:2 848b6c0ec944440791d56b25e314a8ab
 msgid "Contributing and feedback guidelines"
 msgstr "项目贡献与意见反馈"
 
-#: ../../contribute.rst:4 784f37182e78474b960306a5a794ae16
+#: ../../contribute.rst:4 e8b8762778fd461db0934f07e4fc1fc5
 msgid ""
 "There are many ways to contribute to Pelican. You can improve the "
 "documentation, add missing features, and fix bugs (or just report them). "
 "You can also help out by reviewing and commenting on `existing issues "
 "<https://github.com/getpelican/pelican/issues>`_."
 msgstr ""
-"有很多渠道可以参与到贡献项目中来，例如帮助改进文档、添加缺失的特性、修复与报告bug。"
-"可以从查看 `已有 issues <https://github.com/getpelican/pelican/issues>`_ 开始。"
+"有很多渠道可以参与到贡献项目中来，例如帮助改进文档、添加缺失的特性、修复与报告bug。可以从查看 `已有 issues "
+"<https://github.com/getpelican/pelican/issues>`_ 开始。"
 
-#: ../../contribute.rst:9 e17c3ff0fa71469cbe22cb4ad2640ad8
+#: ../../contribute.rst:9 103b2f2862c4469695e4c6aff2321a8d
 msgid ""
 "Don't hesitate to fork Pelican and submit an issue or pull request on "
 "GitHub. When doing so, please consider the following guidelines."
-msgstr ""
-"随时随地都可以fork Pelican或是在GitHub上提交issue或PR。"
+msgstr "随时随地都可以fork Pelican或是在GitHub上提交issue或PR。"
 
-#: ../../../CONTRIBUTING.rst:2 f8bc69070fab4dd7be34e1cc6a42cc02
+#: ../../../CONTRIBUTING.rst:2 5ad44a6fdf0b45eaaa800023139694f8
 msgid "Filing issues"
 msgstr "提出issue"
 
-#: ../../../CONTRIBUTING.rst:4 fe98a059b9c24fcc92358f2c4505174d
+#: ../../../CONTRIBUTING.rst:4 c7e2bb966f49419aba7ed7027a977043
 msgid "Before you submit a new issue, try `asking for help`_ first."
 msgstr "在你提交一个新的issue之前，可以先尝试 `请求他人帮助`_ 。"
 
-#: ../../../CONTRIBUTING.rst:5 e9fff7c354614ae28db994c0fcc121c0
+#: ../../../CONTRIBUTING.rst:5 a287bb06699b4db79d6dd7491bbe031b
 msgid ""
 "If determined to create a new issue, first search `Pelican Discussions`_ "
 "and `existing issues`_ (open and closed) to see if your question has "
 "already been answered previously."
 msgstr ""
-"当你决定要提出新的issue时，先在 `Pelican的讨论版`_ 和 `已有issues`_ 中搜索一下，"
-"（开放关闭的issue都搜一下），来看看你的问题是不是有人之前已经提出过。"
+"当你决定要提出新的issue时，先在 `Pelican的讨论版`_ 和 `已有issues`_ "
+"中搜索一下，（开放关闭的issue都搜一下），来看看你的问题是不是有人之前已经提出过。"
 
-#: ../../../CONTRIBUTING.rst:14 84cb74beed564f31810674cacf5c1f97
+#: ../../../CONTRIBUTING.rst:14 d4a600f2338b458e822aba90e54d4cfd
 msgid "How to get help"
 msgstr "如何获取帮助"
 
-#: ../../../CONTRIBUTING.rst:16 0557a84947c14606be4fd0565247d85d
+#: ../../../CONTRIBUTING.rst:16 db3264afde384c2891d9be7205578556
 msgid "Before you ask for help, please make sure you do the following:"
 msgstr "在寻求帮助之前，请先尝试如下步骤："
 
-#: ../../../CONTRIBUTING.rst:18 6d59a3356e734dd196ec8a0739556b4c
+#: ../../../CONTRIBUTING.rst:18 3581147764244a548cd2898faaa7799a
 msgid ""
 "Read the documentation_ thoroughly. If in a hurry, at least use the "
 "search field that is provided at top-left on the documentation_ pages. "
 "Make sure you read the docs for the Pelican version you are using."
 msgstr ""
-"完整阅读 documentation_ 。如果你很急，至少先在 documentation_ 左上角的搜索栏"
-"中尝试搜索。确保你阅读的文档和使用的Pelican版本相匹配。"
+"完整阅读 documentation_ 。如果你很急，至少先在 documentation_ "
+"左上角的搜索栏中尝试搜索。确保你阅读的文档和使用的Pelican版本相匹配。"
 
-#: ../../../CONTRIBUTING.rst:21 4b33299936404cf98a66b672fad0e38f
+#: ../../../CONTRIBUTING.rst:21 d8e467909ec64ba7900da93b3765bfa6
 msgid ""
 "Use a search engine (e.g., DuckDuckGo, Google) to search for a solution "
 "to your problem. Someone may have already found a solution, perhaps in "
 "the form of a ':pelican-doc:`plugins` or a specific combination of "
 "settings."
 msgstr ""
-"使用搜索引擎（例如 DuckDuckGo、Google）搜索遇到问题的解决方案。互联网上可能"
-"已经有人遇到过相同的问题，解决方法可能包括使用某些 :pelican-doc:`plugins` 或配置"
-"一系列的设置选项。"
+"使用搜索引擎（例如 DuckDuckGo、Google）搜索遇到问题的解决方案。互联网上可能已经有人遇到过相同的问题，解决方法可能包括使用某些 "
+":pelican-doc:`plugins` 或配置一系列的设置选项。"
 
-#: ../../../CONTRIBUTING.rst:25 b48195d9ef674566b89aabc38139c301
+#: ../../../CONTRIBUTING.rst:25 2011839b36504c41b307cc9f817c4a46
 msgid "Try reproducing the issue in a clean environment, ensuring you are using:"
 msgstr "尝试在一个尽可能简单的环境中重现问题，并确保以下几点："
 
-#: ../../../CONTRIBUTING.rst:27 685d2888d2c94ea9a752ec433f8b9f1f
+#: ../../../CONTRIBUTING.rst:27 2d64217ea3e54dc58a371fc11a6ece8e
 msgid ""
 "latest Pelican release (or an up-to-date Git clone of Pelican ``main`` "
 "branch)"
 msgstr "使用最新版本的Pelican（或是用Git克隆Pelican的main分支）"
 
-#: ../../../CONTRIBUTING.rst:28 910a372d95d8448492eafc66eccd1ccf
+#: ../../../CONTRIBUTING.rst:28 721ca09c5a9a495b9fbb6aa86df8be28
 msgid "latest releases of libraries used by Pelican"
 msgstr "将Pelican使用的库升级到最新版本"
 
-#: ../../../CONTRIBUTING.rst:29 c44f4dc6b05d4be29eccc889f042702c
+#: ../../../CONTRIBUTING.rst:29 bbe722bd2be748219d38c134f29569dd
 msgid "no plugins or only those related to the issue"
 msgstr "此环境中没有使用插件或是只使用和问题相关的插件"
 
-#: ../../../CONTRIBUTING.rst:31 3abdf6131cf4412a8205b634a6651b01
+#: ../../../CONTRIBUTING.rst:31 e9f337f01ca546be93bd1d18884a1685
 msgid ""
 "**NOTE:** The most common sources of problems are anomalies in (1) "
 "themes, (2) plugins, (3) settings files, and (4) ``make``/``invoke`` "
@@ -111,93 +109,84 @@ msgid ""
 "certainly with one of the above-listed elements (and not Pelican "
 "itself)::"
 msgstr ""
-"**注意：** 最常见的问题基本上都产生于主题、插件、设置文件和自动化工具 "
-"``make``/``invoke`` 中。如果按照下述步骤生成站点后无法复现之前的问题，那么"
-"几乎可以肯定问题出在这四个地方，而不在Pelican本身："
+"**注意：** 最常见的问题基本上都产生于主题、插件、设置文件和自动化工具 ``make``/``invoke`` "
+"中。如果按照下述步骤生成站点后无法复现之前的问题，那么几乎可以肯定问题出在这四个地方，而不在Pelican本身："
 
-#: ../../../CONTRIBUTING.rst:41 f2331ea165ac4a3c8e70bf98c995f0e8
+#: ../../../CONTRIBUTING.rst:41 1420bb3dd096480289b3da1534d7bf64
 msgid ""
 "If you can generate your site without problems using the steps above, "
 "then your problem is unlikely to be caused by Pelican itself, and "
 "therefore please consider reaching out to the maintainers of the "
 "plugins/theme you are using instead of raising the topic with the Pelican"
 " core community."
-msgstr ""
-"如果按照上述步骤能够正常生成站点，那么你的问题不太可能是由Pelican本身导致的，"
-"请考虑联系对应插件/主题的维护者，而不是在Pelican内核的社区中提出问题。"
+msgstr "如果按照上述步骤能够正常生成站点，那么你的问题不太可能是由Pelican本身导致的，请考虑联系对应插件/主题的维护者，而不是在Pelican内核的社区中提出问题。"
 
-#: ../../../CONTRIBUTING.rst:46 d83b0036d4894f3ebc73e657a203d11a
+#: ../../../CONTRIBUTING.rst:46 bdb7575fa4c74c0891fd686794cc84fd
 msgid ""
 "If despite the above efforts you still cannot resolve your problem, be "
 "sure to include in your inquiry the following information, preferably in "
 "the form of links to content uploaded to a `paste service`_, GitHub "
 "repository, or other publicly-accessible location:"
 msgstr ""
-"经过上面这些努力，若您仍无法解决问题，确保你的提问中包括如下信息，可以以 "
-"`paste service`_ 链接、GitHub仓库，或者其他可公开获取的形式提供："
+"经过上面这些努力，若您仍无法解决问题，确保你的提问中包括如下信息，可以以 `paste service`_ "
+"链接、GitHub仓库，或者其他可公开获取的形式提供："
 
-#: ../../../CONTRIBUTING.rst:51 4281f931e9064336b267bd67a35134e9
+#: ../../../CONTRIBUTING.rst:51 b559dc6ca72649baa754cb14d1ac77ca
 msgid ""
 "Describe what version of Pelican you are running (output of ``pelican "
 "--version`` or the HEAD commit hash if you cloned the repo) and how "
 "exactly you installed it (the full command you used, e.g. ``python -m pip"
 " install pelican``)."
 msgstr ""
-"描述正在运行的Pelican版本信息（可以通过 ``pelican --version`` 命令得到，如果"
-"clone的源仓库则可以查看HEAD commit的哈希值），以及你是如何安装Pelican的"
-"（要包括使用到的命令，例如 ``python -m pip install pelican``）"
+"描述正在运行的Pelican版本信息（可以通过 ``pelican --version`` 命令得到，如果clone的源仓库则可以查看HEAD "
+"commit的哈希值），以及你是如何安装Pelican的（要包括使用到的命令，例如 ``python -m pip install "
+"pelican``）"
 
-#: ../../../CONTRIBUTING.rst:54 b1303c98bca840efb895aceb16789eb9
+#: ../../../CONTRIBUTING.rst:54 d09a0393a4c1462b878c1adf31a7537d
 msgid ""
 "If you are looking for a way to get some end result, prepare a detailed "
 "description of what the end result should look like (preferably in the "
 "form of an image or a mock-up page) and explain in detail what you have "
 "done so far to achieve it."
-msgstr ""
-"如果你希望产生某种特定的最终结果，请详细描述此最终结果是什么样的（最好以图片或者"
-"伪页面的形式），，并且细致讲述你做了哪些尝试。"
+msgstr "如果你希望产生某种特定的最终结果，请详细描述此最终结果是什么样的（最好以图片或者伪页面的形式），，并且细致讲述你做了哪些尝试。"
 
-#: ../../../CONTRIBUTING.rst:58 8fe972c4685140d5bd1c37f4635f6f09
+#: ../../../CONTRIBUTING.rst:58 720ee9dbccc74dccbabb994a2d36638d
 msgid ""
 "If you are trying to solve some issue, prepare a detailed description of "
 "how to reproduce the problem. If the issue cannot be easily reproduced, "
 "it cannot be debugged by developers or volunteers. Describe only the "
 "**minimum steps** necessary to reproduce it (no extra plugins, etc.)."
 msgstr ""
-"如果你在尝试解决某些问题，请详细描述如何复现此问题。如果问题很难被复现，其他开发者和志愿者就很难进行调试。"
-"尽量只写出复现该问题的 **最少步骤** （无额外插件）。"
+"如果你在尝试解决某些问题，请详细描述如何复现此问题。如果问题很难被复现，其他开发者和志愿者就很难进行调试。尽量只写出复现该问题的 **最少步骤**"
+" （无额外插件）。"
 
-#: ../../../CONTRIBUTING.rst:62 1f3874f308e64281b910dc716180ebcf
+#: ../../../CONTRIBUTING.rst:62 34bdc49c617643d8ae7adb6a433a88fe
 msgid ""
 "Upload your settings file or any other custom code that would enable "
 "people to reproduce the problem or to see what you have already tried to "
 "achieve the desired end result."
-msgstr ""
-"上传你的配置文件以及所有自定义过的代码，这可以使得大家能够重现问题或者看到你已经"
-"做出的尝试。"
+msgstr "上传你的配置文件以及所有自定义过的代码，这可以使得大家能够重现问题或者看到你已经做出的尝试。"
 
-#: ../../../CONTRIBUTING.rst:65 1fdc6c63f1b141c7a35233607ec0d922
+#: ../../../CONTRIBUTING.rst:65 03c88e23c7b54117aa69e003c8bbef6e
 msgid ""
 "Upload detailed and **complete** output logs and backtraces (remember to "
 "add the ``--debug`` flag: ``pelican --debug content [...]``)"
 msgstr ""
-"上传详细 **完整** 的输出日志以及backtraces信息（记得在执行pelican命令时加上 "
-"``--debug`` 标记： ``pelican --debug content [...]`` ）"
+"上传详细 **完整** 的输出日志以及backtraces信息（记得在执行pelican命令时加上 ``--debug`` 标记： "
+"``pelican --debug content [...]`` ）"
 
-#: ../../../CONTRIBUTING.rst:71 8741dba5da1a4990ae9c30531d05dc19
+#: ../../../CONTRIBUTING.rst:71 953240a12cd64be7b9375a4571193314
 msgid ""
 "Once the above preparation is ready, you can post your query as a new "
 "thread in `Pelican Discussions`_. Remember to include all the information"
 " you prepared."
-msgstr ""
-"一旦做好了上述准备，就可以在 `Pelican Discussions`_ 中发起你的问题了。记得在请求"
-"中附上收集好的信息。"
+msgstr "一旦做好了上述准备，就可以在 `Pelican Discussions`_ 中发起你的问题了。记得在请求中附上收集好的信息。"
 
-#: ../../../CONTRIBUTING.rst:75 b34a3031f5d1427e92a9d1969d7b5274
+#: ../../../CONTRIBUTING.rst:75 e9f48bdfc6c744f282c70da3ac581052
 msgid "Contributing code"
 msgstr "贡献代码"
 
-#: ../../../CONTRIBUTING.rst:77 e29672c736554ebbbd6efd441af19df7
+#: ../../../CONTRIBUTING.rst:77 888be6bde2de42a49705f29443a519c1
 msgid ""
 "Before you submit a contribution, please ask whether it is desired so "
 "that you don't spend a lot of time working on something that would be "
@@ -205,32 +194,28 @@ msgid ""
 " be better suited as a ':pelican-doc:`plugins` — you can `ask for help`_"
 "  to make that determination."
 msgstr ""
-"在提交代码修改前，请先询问是否需要此修改，以免你做的工作因为已知原因而被拒绝。"
-"想想要添加的新特性是否更适合以 :pelican-doc:`插件` 形式完成。可以通过 "
-"`如何获取帮助`_ 来帮助你作出决定。"
+"在提交代码修改前，请先询问是否需要此修改，以免你做的工作因为已知原因而被拒绝。想想要添加的新特性是否更适合以 :pelican-doc:`插件` "
+"形式完成。可以通过 `如何获取帮助`_ 来帮助你作出决定。"
 
-#: ../../../CONTRIBUTING.rst:82 e263c09fb6e5471eb0c2c3e97994322d
+#: ../../../CONTRIBUTING.rst:82 6e1329bbd8354c30b8ffa07f18894d3f
 msgid ""
 "Also, if you intend to submit a pull request to address something for "
 "which there is no existing issue, there is no need to create a new issue "
 "and then immediately submit a pull request that closes it. You can submit"
 " the pull request by itself."
-msgstr ""
-"另外，如果你的PR是为了解决一个目前没有在issue中出现过的问题，那么就没有必要先创建"
-"一个新的issue，而是可以直接提起PR。"
+msgstr "另外，如果你的PR是为了解决一个目前没有在issue中出现过的问题，那么就没有必要先创建一个新的issue，而是可以直接提起PR。"
 
-#: ../../../CONTRIBUTING.rst:87 9b08ef3e5fe4474e9306e4bfe9662fff
+#: ../../../CONTRIBUTING.rst:87 bca476812a33487c98d6aa840820671b
 msgid "Using Git and GitHub"
 msgstr "使用Git与GitHub"
 
-#: ../../../CONTRIBUTING.rst:89 7ad95f82b7d04c0ca97bb958d2425e27
+#: ../../../CONTRIBUTING.rst:89 51f8df6063a544baabf35ef3bae28e83
 msgid ""
 "`Create a new branch`_ specific to your change (as opposed to making your"
 " commits in the ``main`` branch)."
-msgstr ""
-"`创建一个新的分支`_ 来标记你做的修改（而不是直接在主分支中提交）。"
+msgstr "`创建一个新的分支`_ 来标记你做的修改（而不是直接在主分支中提交）。"
 
-#: ../../../CONTRIBUTING.rst:91 8a31c5d7ae4045cdbf2aa67e79be3f9c
+#: ../../../CONTRIBUTING.rst:91 6c419972402444d5976574902311e2d7
 msgid ""
 "**Don't put multiple unrelated fixes/features in the same branch / pull "
 "request.** For example, if you're working on a new feature and find a "
@@ -239,27 +224,25 @@ msgid ""
 " to code style formatting should be in a completely separate pull "
 "request."
 msgstr ""
-"**不要把多个无关联的修复/特性修改放在同一个分支/拉去请求中。** 如果当你在做新特性的时候"
-"发现了一个bug可以修复，但修复这个bug *不需要用到* 这个新特性， **那么请另外创建"
-"一个分支并拉取请求。** 类似的，任何对代码风格的格式化都应该在单独的请求中拉取。"
+"**不要把多个无关联的修复/特性修改放在同一个分支/拉去请求中。** 如果当你在做新特性的时候发现了一个bug可以修复，但修复这个bug "
+"*不需要用到* 这个新特性， **那么请另外创建一个分支并拉取请求。** 类似的，任何对代码风格的格式化都应该在单独的请求中拉取。"
 
-#: ../../../CONTRIBUTING.rst:96 ef2e10f7ec5e4fbbb0f977dd09b7be49
+#: ../../../CONTRIBUTING.rst:96 ced35621749d426a8e39fdeb9b0f7c90
 msgid ""
 "Add a ``RELEASE.md`` file in the root of the project that contains the "
 "release type (major, minor, patch) and a summary of the changes that will"
 " be used as the release changelog entry. For example::"
 msgstr ""
-"在项目根目录下添加 ``RELEASE.md`` 文件，在其中包含release的类型（主要、次要、补丁），"
-"以及对项目改变的概述，这些内容会作为该release发布日志的一部分。下面是一个例子："
+"在项目根目录下添加 ``RELEASE.md`` "
+"文件，在其中包含release的类型（主要、次要、补丁），以及对项目改变的概述，这些内容会作为该release发布日志的一部分。下面是一个例子："
 
-#: ../../../CONTRIBUTING.rst:104 24a4d63624f44f63a0ce809901455c02
+#: ../../../CONTRIBUTING.rst:104 ca6b2bf54f5248cbb7d90edb678478fc
 msgid ""
 "Check for unnecessary whitespace via ``git diff --check`` before "
 "committing."
-msgstr ""
-"在提交前使用 ``git diff --check`` 来检查是否有无意义的空白字符。"
+msgstr "在提交前使用 ``git diff --check`` 来检查是否有无意义的空白字符。"
 
-#: ../../../CONTRIBUTING.rst:105 11c5b82604fe4638bf9ee6e9ef0a401b
+#: ../../../CONTRIBUTING.rst:105 48776b48e4924398b7632b8f05141e78
 msgid ""
 "First line of your commit message should start with present-tense verb, "
 "be 50 characters or less, and include the relevant issue number(s) if "
@@ -268,82 +251,73 @@ msgid ""
 "``Fixes #585`` or ``Fix #585`` syntax (so the relevant issue is "
 "automatically closed upon PR merge)."
 msgstr ""
-"commit信息的第一行应该以现在时动词开头，并且第一行尽量保持在50字以下，并且包含相关联"
-"issue的编号（如果有的话）。 例如： ``Ensure proper PLUGIN_PATH behavior. "
-"Refs #428.`` 如果此项提交 *完全修复* 了某项已报告的bug，请使用例如 ``Fixes #585`` "
-"或 ``Fix #585`` 的语法（这样的话相关的issue会在PR合并后自动关闭）。"
+"commit信息的第一行应该以现在时动词开头，并且第一行尽量保持在50字以下，并且包含相关联issue的编号（如果有的话）。 例如： "
+"``Ensure proper PLUGIN_PATH behavior. Refs #428.`` 如果此项提交 *完全修复* "
+"了某项已报告的bug，请使用例如 ``Fixes #585`` 或 ``Fix #585`` "
+"的语法（这样的话相关的issue会在PR合并后自动关闭）。"
 
-#: ../../../CONTRIBUTING.rst:110 0c1ff9d0738440e1bce853fc830278af
+#: ../../../CONTRIBUTING.rst:110 75acb68d9eaa4230ae230f016bf77b6c
 msgid ""
 "After the first line of the commit message, add a blank line and then a "
 "more detailed explanation (when relevant)."
-msgstr ""
-"在第一行commit信息后添加一行空白行，再进行更多相关的细节描述。"
+msgstr "在第一行commit信息后添加一行空白行，再进行更多相关的细节描述。"
 
-#: ../../../CONTRIBUTING.rst:112 d817ad5d9e35488eb45d88828ee9f053
+#: ../../../CONTRIBUTING.rst:112 51e3a16f76364d91a9abf219c731ff80
 msgid ""
 "`Squash your commits`_ to eliminate merge commits and ensure a clean and "
 "readable commit history."
-msgstr ""
-"`压缩commit`_ 来消除合并commits，确保你的commit历史记录是干净可读的。"
+msgstr "`压缩commit`_ 来消除合并commits，确保你的commit历史记录是干净可读的。"
 
-#: ../../../CONTRIBUTING.rst:114 b7064f44923a499da3c3ce078470e269
+#: ../../../CONTRIBUTING.rst:114 01ddd9df01024d38a8de79122a91cc07
 msgid ""
 "After you have issued a pull request, the continuous integration (CI) "
 "system will run the test suite on all supported Python versions and check"
 " for code style compliance. If any of these checks fail, you should fix "
 "them. (If tests fail on the CI system but seem to pass locally, ensure "
 "that local test runs aren't skipping any tests.)"
-msgstr ""
-"在你发出PR后，持续集成（CI）系统会在所有支持的Python版本上运行测试套件，并且"
-"检查代码风格的合规性。如果出现了错误，你应该将其修复。（如果没有通过CI系统上的"
-"测试但是本地测试通过了，请再检查一下，确保在本地进行了所有CI系统中的检查）"
+msgstr "在你发出PR后，持续集成（CI）系统会在所有支持的Python版本上运行测试套件，并且检查代码风格的合规性。如果出现了错误，你应该将其修复。（如果没有通过CI系统上的测试但是本地测试通过了，请再检查一下，确保在本地进行了所有CI系统中的检查）"
 
-#: ../../../CONTRIBUTING.rst:121 342f2e6c14b9441caaf3f9b6d2eb764b
+#: ../../../CONTRIBUTING.rst:121 bc27587df397410a9bb272f0851756a3
 msgid "Contribution quality standards"
 msgstr "贡献的质量标准"
 
-#: ../../../CONTRIBUTING.rst:123 842514f115634a5d821d48490d4aed7b
+#: ../../../CONTRIBUTING.rst:123 2cf100b3e98b43e5b841493887a1d8be
 msgid ""
 "Adhere to the project's code style standards. See: `Development "
 "Environment`_"
-msgstr ""
-"遵循项目的代码风格标准。详见 `开发环境`_"
+msgstr "遵循项目的代码风格标准。详见 `开发环境`_"
 
-#: ../../../CONTRIBUTING.rst:124 4719590d89be4a5e94817902cc424be5
+#: ../../../CONTRIBUTING.rst:124 fffad000d6ca490291bd09cb18fcc75a
 msgid ""
 "Ensure your code is compatible with the `officially-supported Python "
 "releases`_."
-msgstr ""
-"确保你的代码可以兼容 `python的官方发布版本`_"
+msgstr "确保你的代码可以兼容 `python的官方发布版本`_"
 
-#: ../../../CONTRIBUTING.rst:125 fa0ad5dd93e149fa8a12dd339bef9056
+#: ../../../CONTRIBUTING.rst:125 907e4426cbc643fb9075e32be169ba42
 msgid ""
 "Add docs and tests for your changes. Undocumented and untested features "
 "will not be accepted."
-msgstr ""
-"请为你修改的内容添加文档与测试。未注有文档或没有对应测试的特性会被拒绝。"
+msgstr "请为你修改的内容添加文档与测试。未注有文档或没有对应测试的特性会被拒绝。"
 
-#: ../../../CONTRIBUTING.rst:127 dc4db53c2ce34e5490a0c57ea800a4da
+#: ../../../CONTRIBUTING.rst:127 d2bcbeeb9c0541c2a5ac5ec589a16ca4
 msgid ""
 ":pelican-doc:`Run all the tests <contribute>` **on all versions of Python"
 " supported by Pelican** to ensure nothing was accidentally broken."
 msgstr ""
-"**在Pelican支持的所有Python版本上** :pelican-doc:`执行所有测试 <contribute>` ，"
-"以确保没有意料之外的问题。"
+"**在Pelican支持的所有Python版本上** :pelican-doc:`执行所有测试 <contribute>` "
+"，以确保没有意料之外的问题。"
 
-#: ../../../CONTRIBUTING.rst:130 3a88c2e8326a4acd896d0ac75d4c9ccb
+#: ../../../CONTRIBUTING.rst:130 26daa76aea674039be278882a95422f5
 msgid ""
 "Check out our `Git Tips`_ page or `ask for help`_ if you need assistance "
 "or have any questions about these guidelines."
-msgstr ""
-"若需要帮助或对以上指南有任何疑惑，还可以查看我们的 `Git提示`_ 页面和 `请求帮助`_ 部分。"
+msgstr "若需要帮助或对以上指南有任何疑惑，还可以查看我们的 `Git提示`_ 页面和 `请求帮助`_ 部分。"
 
-#: ../../contribute.rst:15 daead9e8fb804eb6acd152b85d837182
+#: ../../contribute.rst:15 b4a94275e9c14d8795fa54473ee2f05b
 msgid "Setting up the development environment"
 msgstr "配置开发环境"
 
-#: ../../contribute.rst:17 1ab6df98bcb141f49e278d153cc96e22
+#: ../../contribute.rst:17 a0eb6948883742d2a00665a576ef6aba
 msgid ""
 "While there are many ways to set up one's development environment, the "
 "following instructions will utilize Pip_ and PDM_. These tools facilitate"
@@ -351,71 +325,67 @@ msgid ""
 "isolated from one another, so you can use different packages (and package"
 " versions) for each."
 msgstr ""
-"在配置开发环境时往往有很多种方式，但下面的指南会使用 Pip_ 和 PDM_ 完成配置。这两个工具"
-"都可以用于管理虚拟环境，使得不同的Python项目相互隔离，这样就可以很方便的在不同的项目中"
-"使用不同的库（以及不同的库版本）。"
+"在配置开发环境时往往有很多种方式，但下面的指南会使用 Pip_ 和 PDM_ "
+"完成配置。这两个工具都可以用于管理虚拟环境，使得不同的Python项目相互隔离，这样就可以很方便的在不同的项目中使用不同的库（以及不同的库版本）。"
 
-#: ../../contribute.rst:22 6a9c8f6ddb1d495f8a9bd1b8a131cabd
+#: ../../contribute.rst:22 4c5c4d91e6964d709d01102e32310642
 msgid "Please note that Python |min_python| is required for Pelican development."
 msgstr "请注意，要进行Pelican的开发，至少需要Python |min_python|"
 
-#: ../../contribute.rst:24 3d994e2a522141d7ada0a8fe13eb4c64
+#: ../../contribute.rst:24 5419157e28984a618fc1f0df81deb620
 msgid ""
 "*(Optional)* If you prefer to `install PDM "
 "<https://pdm.fming.dev/latest/#installation>`_ once for use with multiple"
 " projects, you can install it via::"
 msgstr ""
-"*（可选）* 若您想要 `安装PDM <https://pdm.fming.dev/latest/#installation>`_ ，"
-"可以使用下面这条命令："
+"*（可选）* 若您想要 `安装PDM <https://pdm.fming.dev/latest/#installation>`_ "
+"，可以使用下面这条命令："
 
-#: ../../contribute.rst:29 dbaa532c292048cb87926dd8b6e3141a
+#: ../../contribute.rst:29 a9d08dc294cb4857a58d2c63eae98a15
 msgid ""
 "Point your web browser to the `Pelican repository`_ and tap the **Fork** "
 "button at top-right. Then clone the source for your fork and add the "
 "upstream project as a Git remote::"
 msgstr ""
-"在Web浏览器中进入 `Pelican的代码仓库`_ ，点击右上角的 **Fork** 按钮。然后克隆"
-"你自己的这份fork，最后添加项目的原仓库为远程仓库upstream："
+"在Web浏览器中进入 `Pelican的代码仓库`_ ，点击右上角的 **Fork** "
+"按钮。然后克隆你自己的这份fork，最后添加项目的原仓库为远程仓库upstream："
 
-#: ../../contribute.rst:38 adbe5d876f114645a3e1b489b2a34bd9
+#: ../../contribute.rst:38 4c8ebbf9839441ca9364eeb1d25b180f
 msgid ""
 "While PDM can dynamically create and manage virtual environments, we're "
 "going to manually create and activate a virtual environment::"
-msgstr ""
-"通过下面的命令可以手动创建并激活一个虚拟环境："
+msgstr "通过下面的命令可以手动创建并激活一个虚拟环境："
 
-#: ../../contribute.rst:45 ../../contribute.rst:181
-#: 6ede38ac05174bc19df4198e735342e0 f6d42cdd70384eaebbe115aefd0d01ec
+#: ../../contribute.rst:45 ../../contribute.rst:186
+#: 2afe046c20814fe5b3de9a65606505f1 6ec60e6a37b642edb68af7ed1bc82c0b
 msgid "Install the needed dependencies and set up the project::"
 msgstr "安装必需的依赖并配置项目："
 
-#: ../../contribute.rst:50 d863bf4dc76e4b18b933f2635a6a3af3
+#: ../../contribute.rst:50 59d5dabaab1d409c8873187e5664fe67
 msgid "Your local environment should now be ready to go!"
 msgstr "现在，你的本地开发环境就配置完成了！"
 
-#: ../../contribute.rst:57 dc19edf71c914f48a953b379efa076c0
+#: ../../contribute.rst:57 6fdce76f8ec64275b24366ff03cc6340
 msgid "Development"
 msgstr "开发"
 
-#: ../../contribute.rst:59 6082eb5afbf14f86a031ed4f53d2943c
+#: ../../contribute.rst:59 1d1a814a5dba40bcb84ce824d6312805
 msgid ""
 "Once Pelican has been set up for local development, create a topic branch"
 " for your bug fix or feature::"
-msgstr ""
-"在配置好Pelican的本地开发环境后，请先为你的bug修复或特性增加创建一个分支："
+msgstr "在配置好Pelican的本地开发环境后，请先为你的bug修复或特性增加创建一个分支："
 
-#: ../../contribute.rst:64 1cafbaea6ec04597b62e871c0f0793b2
+#: ../../contribute.rst:64 773cdd3a48894e11a62cb24b25ef4829
 msgid ""
 "Now you can make changes to Pelican, its documentation, and/or other "
 "aspects of the project."
-msgstr ""
-"在切换到新建的分支后，就可以开始对Pelican的文档或其他内容做更改了。"
+msgstr "在切换到新建的分支后，就可以开始对Pelican的文档或其他内容做更改了。"
 
-#: ../../contribute.rst:68 e0f5da1e216f499d86427e21c23557d4
+#: ../../contribute.rst:68 bb120553218b4d0699998fbaf00d32c0
 msgid "Setting up ``git blame`` (optional)"
 msgstr "配置 ``git blame`` （可选）"
 
-#: ../../contribute.rst:70 2906e116c2dc4a2c8db78fa64820af56
+#: ../../contribute.rst:70 644fae63e5ea4e66a24e35a7ada3524c
 msgid ""
 "``git blame`` annotates lines in a file with information about the pull "
 "request that last modified it. Sweeping shallow changes (like formatting)"
@@ -424,61 +394,59 @@ msgid ""
 "repository, adding ``--global`` if you want this setting to apply to all "
 "repositories::"
 msgstr ""
-"``git blame`` 会在文件中的行上标注有关最后一次修改该行的PR信息。对浅层变化（如格式化）"
-"进行批量更改可能会使这些信息变得不那么有用，因此我们维护一个包含此类更改的列表，"
-"以便忽略它们。运行以下命令在您的存储库中设置此配置，如果希望此设置适用于所有存储库，"
-"请添加 ``--global`` ："
+"``git blame`` "
+"会在文件中的行上标注有关最后一次修改该行的PR信息。对浅层变化（如格式化）进行批量更改可能会使这些信息变得不那么有用，因此我们维护一个包含此类更改的列表，以便忽略它们。运行以下命令在您的存储库中设置此配置，如果希望此设置适用于所有存储库，请添加"
+" ``--global`` ："
 
-#: ../../contribute.rst:78 36f257406a294713835841cf549e0f67
+#: ../../contribute.rst:78 68b7031047e94e03b0e1b0ea39d0355e
 msgid ""
 "As noted in a `useful article`_ about ``git blame``, there are other "
 "related settings you may find to be beneficial::"
-msgstr ""
-"就像在 `这篇文章`_ 中提到的，还可以进行一些可能有用的额外设置："
+msgstr "就像在 `这篇文章`_ 中提到的，还可以进行一些可能有用的额外设置："
 
-#: ../../contribute.rst:89 37a3a813eeb84f408546bf6a83fdafd6
+#: ../../contribute.rst:89 c33fd6178fb044dda7073f1fc2cce979
 msgid "Running the test suite"
 msgstr "运行测试套件"
 
-#: ../../contribute.rst:91 44276ab045104e5c9ab3d2425172d7ac
+#: ../../contribute.rst:91 5b51e49bc1ca42c6916c4dceed476057
 msgid ""
 "Each time you make changes to Pelican, there are two things to do "
 "regarding tests: check that the existing tests pass, and add tests for "
 "any new features or bug fixes. The tests are located in "
 "``pelican/tests``, and you can run them via::"
 msgstr ""
-"每次对Pelican做出修改后，在测试方面需要做两个工作：检查是否能通过已有的测试、"
-"为新增特性或bug修复创建测试。请将自动化测试文件放在 ``pelican/tests`` 中，"
-"接着执行以下命令："
+"每次对Pelican做出修改后，在测试方面需要做两个工作：检查是否能通过已有的测试、为新增特性或bug修复创建测试。请将自动化测试文件放在 "
+"``pelican/tests`` 中，接着执行以下命令："
 
-#: ../../contribute.rst:98 9557eb87ac4945ccbaf8775aa7768f6e
+#: ../../contribute.rst:98 0e03b29d89cc408e9374cb51f7147611
 msgid ""
 "(For more on Invoke, see ``invoke -l`` to list tasks, or "
 "https://pyinvoke.org for documentation.)"
-msgstr ""
-"（执行 ``invoke -l`` 会列出可以调用的测试任务，关于此的更多文档请参阅 "
-"https://pyinvoke.org ）"
+msgstr "（执行 ``invoke -l`` 会列出可以调用的测试任务，关于此的更多文档请参阅 https://pyinvoke.org ）"
 
-#: ../../contribute.rst:101 d1cebbdf4fcf4be5b918613c5050d638
+#: ../../contribute.rst:101 70aad8c721c64d2b8d32488dd9da851e
 msgid ""
 "In addition to running the test suite, it is important to also ensure "
 "that any lines you changed conform to code style guidelines. You can "
 "check that via::"
-msgstr ""
-"除了运行测试套件外，还要确保修改了的部分遵循代码风格指南。可以通过下面的命令"
-"检查代码风格："
+msgstr "除了运行测试套件外，还要确保修改了的部分遵循代码风格指南。可以通过下面的命令检查代码风格："
 
-#: ../../contribute.rst:106 7a0b9ebf408f472aa786f6c3ac639240
+#: ../../contribute.rst:106 ../../contribute.rst:200
+#: b0ff008dde5e4e0b892e0fc2fa959b6a
+msgid ""
+"If style violations are found, many of them can be addressed "
+"automatically via::"
+msgstr "若存在不合规范风格的代码，大多数情况下可以通过下述命令自动纠正："
+
+#: ../../contribute.rst:111 ebad1e2cb63a45d999d2d3e510711972
 msgid ""
 "If code style violations are found in lines you changed, correct those "
-"lines and re-run the above lint command until they have all been fixed. "
-"You do not need to address style violations, if any, for code lines you "
-"did not touch."
-msgstr ""
-"如果在修改过的代码中有地方违反了代码风格规范，请纠正并再次运行上述命令，直到全部纠正。"
-"但是若是发现违反代码风格的地方并不是你修改的，请忽略之，不要进行纠正。"
+"lines and re-run the ``invoke lint`` command until they have all been "
+"fixed. You do not need to address style violations, if any, for code "
+"lines you did not touch."
+msgstr "如果在修改过的代码中有地方违反了代码风格规范，请纠正并再次运行上述命令，直到全部纠正。但是若是发现违反代码风格的地方并不是你修改的，请忽略之，不要进行纠正。"
 
-#: ../../contribute.rst:110 74ec20f2daf74ad18cc083ad48b89dfe
+#: ../../contribute.rst:115 e208ada16ab8425e9fbbcd5f135f6574
 msgid ""
 "After making your changes and running the tests, you may see a test "
 "failure mentioning that \"some generated files differ from the expected "
@@ -489,94 +457,83 @@ msgid ""
 " have both** ``en_EN.utf8`` **and** ``fr_FR.utf8`` **locales installed**,"
 " and then run the following command::"
 msgstr ""
-"在修改完代码，运行测试的过程中，你可能会看到测试失败中有提到“some generated files "
-"differ from the expected functional tests output” 。这可能是由于你对代码的修改"
-"影响到了Pelican的HTML输出，若输出的结果确实是你想要的，请更新功能测试所用的输出用例。"
-"请确保你安装了 ``en_EN.utf8`` 和 ``fr_FR.utf8`` ，然后执行下述命令："
+"在修改完代码，运行测试的过程中，你可能会看到测试失败中有提到“some generated files differ from the "
+"expected functional tests output” "
+"。这可能是由于你对代码的修改影响到了Pelican的HTML输出，若输出的结果确实是你想要的，请更新功能测试所用的输出用例。请确保你安装了 "
+"``en_EN.utf8`` 和 ``fr_FR.utf8`` ，然后执行下述命令："
 
-#: ../../contribute.rst:120 4299259dadd748238f9465eefb84727c
+#: ../../contribute.rst:125 a4a3e16c3e0345c99cb2d8b674627afa
 msgid ""
 "You may also find that some tests are skipped because some dependency "
 "(e.g., Pandoc) is not installed. This does not automatically mean that "
 "these tests have passed; you should at least verify that any skipped "
 "tests are not affected by your changes."
-msgstr ""
-"你还可能会发现有一些测试由于缺少依赖（例如 Pandoc）而被跳过。这并不意味着通过"
-"了这些测试，请至少确保对代码的修改不会影响到这些被跳过的测试。"
+msgstr "你还可能会发现有一些测试由于缺少依赖（例如 Pandoc）而被跳过。这并不意味着通过了这些测试，请至少确保对代码的修改不会影响到这些被跳过的测试。"
 
-#: ../../contribute.rst:125 a8835ccddf624fc1994c618ded8cc5ba
+#: ../../contribute.rst:130 dd6db784c2534b0ea0842cb736dca7c3
 msgid ""
 "You should run the test suite under each of the supported versions of "
 "Python. This is best done by creating a separate Python environment for "
 "each version. Tox_ is a useful tool to automate running tests inside "
 "``virtualenv`` environments."
 msgstr ""
-"你应该在Pelican支持的所有Python版本下运行测试套件。一般会通过为每一个Python版本"
-"创建一个虚拟环境来实现这一点。Tox_ 是一个用于在 ``virtualenv`` 环境中自动运行"
-"测试的工具。"
+"你应该在Pelican支持的所有Python版本下运行测试套件。一般会通过为每一个Python版本创建一个虚拟环境来实现这一点。Tox_ "
+"是一个用于在 ``virtualenv`` 环境中自动运行测试的工具。"
 
-#: ../../contribute.rst:133 b8b8c16b0d0743b98de5d759f79d07ba
+#: ../../contribute.rst:138 58fd644b4b7248ebb9c8ff899a2f90b1
 msgid "Running a code coverage report"
 msgstr "运行代码测试覆盖报告"
 
-#: ../../contribute.rst:135 674a92a42d924931801c9f9c02463cd5
+#: ../../contribute.rst:140 abe50ab68fef48dea42aa269743fc172
 msgid ""
 "Code is more likely to stay robust if it is tested. Coverage_ is a "
 "library that measures how much of the code is tested. To run it::"
-msgstr ""
-"经过测试的代码往往具有更好的健壮性。 Coverage_ 是一个用于衡量代码测试覆盖率的库"
-"执行下面的命令以调取之："
+msgstr "经过测试的代码往往具有更好的健壮性。 Coverage_ 是一个用于衡量代码测试覆盖率的库执行下面的命令以调取之："
 
-#: ../../contribute.rst:140 ecb5e7f9e83c4243ba04b58764e573b6
+#: ../../contribute.rst:145 9d5ba28c240f464c92db9869c01e3917
 msgid ""
 "This will show overall coverage, coverage per file, and even line-by-line"
 " coverage. There is also an HTML report available::"
-msgstr ""
-"该命令会展示总体覆盖率以及在每个文件上的覆盖率，甚至还会展示每一行的覆盖情况。"
-"同样也会有一份HTML格式的报告供您查看："
+msgstr "该命令会展示总体覆盖率以及在每个文件上的覆盖率，甚至还会展示每一行的覆盖情况。同样也会有一份HTML格式的报告供您查看："
 
-#: ../../contribute.rst:148 bad31d4cb0b644ac8ecb7885b22072a7
+#: ../../contribute.rst:153 45e095f0c0fd4a5b9f75027d12dd891f
 msgid "Building the docs"
 msgstr "构建文档"
 
-#: ../../contribute.rst:150 47e1f1caa594462d9b3b4403645abf3b
+#: ../../contribute.rst:155 e1e8bb56a9c8449a8da8e10fcf45da2a
 msgid ""
 "If you make changes to the documentation, you should build and inspect "
 "your changes before committing them::"
-msgstr ""
-"若你对文档进行过修改，请在commit前完成构建和检查："
+msgstr "若你对文档进行过修改，请在commit前完成构建和检查："
 
-#: ../../contribute.rst:155 a4961ae22c2c4de9bbc8bb98d3a3ec81
+#: ../../contribute.rst:160 9482dc5bee484f0c9f05af197b49ed70
 msgid ""
 "Open http://localhost:8000 in your browser to review the documentation. "
 "While the above task is running, any changes you make and save to the "
 "documentation should automatically appear in the browser, as it live-"
 "reloads when it detects changes to the documentation source files."
 msgstr ""
-"执行上述命令后，请在Web浏览器中打开 http://localhost:8000 来查看文档。"
-"在上述命令执行时，对文档做的任何修改应该会自动反映在浏览器中。"
+"执行上述命令后，请在Web浏览器中打开 http://localhost:8000 "
+"来查看文档。在上述命令执行时，对文档做的任何修改应该会自动反映在浏览器中。"
 
-#: ../../contribute.rst:161 7740ec477ad747ebaa2dde2b2aef45d5
+#: ../../contribute.rst:166 82343c9684bb440eb260110d98bb0e59
 msgid "Plugin development"
 msgstr "插件开发"
 
-#: ../../contribute.rst:163 9505da5fcac24d718f59c797061d2b0f
+#: ../../contribute.rst:168 8697f547344e4973ad34f9c619ddf22e
 msgid ""
 "To create a *new* Pelican plugin, please refer to the `plugin template`_ "
 "repository for detailed instructions."
-msgstr ""
-"要创建一个 *新的* Pelican插件，请参阅 `插件模板`_ 仓库以获得更为详细的指导。"
+msgstr "要创建一个 *新的* Pelican插件，请参阅 `插件模板`_ 仓库以获得更为详细的指导。"
 
-#: ../../contribute.rst:166 5fdae4611a6949b9a4c3bc82c52d3bc6
+#: ../../contribute.rst:171 3c505e3035c143c89efd3e648fe00e8e
 msgid ""
 "If you want to contribute to an *existing* Pelican plugin, follow the "
 "steps above to set up Pelican for local development, and then create a "
 "directory to store cloned plugin repositories::"
-msgstr ""
-"若你想在 *已有* Pelican插件中做贡献，请先按前文所述步骤配置Pelican的本地开发环境，"
-"然后创建一个文件夹来存放克隆下来的插件仓库："
+msgstr "若你想在 *已有* Pelican插件中做贡献，请先按前文所述步骤配置Pelican的本地开发环境，然后创建一个文件夹来存放克隆下来的插件仓库："
 
-#: ../../contribute.rst:172 0f50b12aaf3b4049999130a92fa6b670
+#: ../../contribute.rst:177 5523421ea2664b1ab0859216a1c8a463
 msgid ""
 "Assuming you wanted to contribute to the Simple Footnotes plugin, you "
 "would first browse to the `Simple Footnotes`_ repository on GitHub and "
@@ -586,129 +543,111 @@ msgstr ""
 "假设想要为Simple Footnotes插件做贡献，你应该先查看并fork `Simple Footnotes`_ "
 "的Github仓库，然后克隆你自己fork的那一份，再添加原仓库作为Git远程仓库upstream："
 
-#: ../../contribute.rst:185 2efe992372f149c3b63ca22016f8501b
+#: ../../contribute.rst:190 e5178eb4654a44919c743d37f00ff4c3
 msgid "Create a topic branch for your plugin bug fix or feature::"
 msgstr "同样地，为你想要进行的bug修复或特性添加创建一个分支："
 
-#: ../../contribute.rst:189 40f3c07d12cc4630bc75355c3449196d
+#: ../../contribute.rst:194 af04dad9f528473caa4c4c0f4c33042a
 msgid ""
 "After writing new tests for your plugin changes, run the plugin test "
 "suite and check for code style compliance via::"
-msgstr ""
-"完成修改并添加测试后，运行测试套件，并检查代码风格："
+msgstr "完成修改并添加测试后，运行测试套件，并检查代码风格："
 
-#: ../../contribute.rst:195 ba97ce962daa437cbcf2d09897394aed
-msgid ""
-"If style violations are found, many of them can be addressed "
-"automatically via::"
-msgstr ""
-"若存在不合规范风格的代码，大多数情况下可以通过下述命令自动纠正："
-
-#: ../../contribute.rst:199 a0ee1e11aaea4f5c8ba4c4704678bbaf
+#: ../../contribute.rst:205 06d00f61d5c344d587baa85116b3c1e0
 msgid ""
 "If style violations are found even after running the above auto-"
 "formatters, you will need to make additional manual changes until "
 "``invoke lint`` no longer reports any code style violations."
-msgstr ""
-"如果在自动格式化后仍存在代码风格上的问题，请手动修正这些问题，直到执行 "
-"``invoke lint`` 时不再报告问题。"
+msgstr "如果在自动格式化后仍存在代码风格上的问题，请手动修正这些问题，直到执行 ``invoke lint`` 时不再报告问题。"
 
-#: ../../contribute.rst:207 e9d1e344bb0d4b2fb9d08c2d71d9a342
+#: ../../contribute.rst:213 9a0831b06abd494fad469b7df71c489f
 msgid "Submitting your changes"
 msgstr "提交更改"
 
-#: ../../contribute.rst:209 716c9f94166d42299d9ee58eed4f9b53
+#: ../../contribute.rst:215 23b5d147059b4cea99a213f50d63097a
 msgid ""
 "Assuming linting validation and tests pass, add a ``RELEASE.md`` file in "
 "the root of the project that contains the release type (major, minor, "
 "patch) and a summary of the changes that will be used as the release "
 "changelog entry. For example::"
 msgstr ""
-"通过了风格检查和所有测试后，请在项目的根目录下添加一个 ``RELEASE.md`` 文件，"
-"其中应包含发布的类型（major、minor、patch）以及代码变更的摘要，这份摘要会被用作"
-"更新日志的条目。下面是一个例子："
+"通过了风格检查和所有测试后，请在项目的根目录下添加一个 ``RELEASE.md`` "
+"文件，其中应包含发布的类型（major、minor、patch）以及代码变更的摘要，这份摘要会被用作更新日志的条目。下面是一个例子："
 
-#: ../../contribute.rst:218 656309283e5642b99981c84da9b04c86
+#: ../../contribute.rst:224 6794c41ebe2c4937ba4f3f8e16e7a9d9
 msgid "Commit your changes and push your topic branch::"
 msgstr "commit你的更改，并push对应分支："
 
-#: ../../contribute.rst:224 16617b687db94783b5488884e4c9be1b
+#: ../../contribute.rst:230 daa69b097fc14739be924714f8070cf6
 msgid ""
 "Finally, browse to your repository fork on GitHub and submit a pull "
 "request."
-msgstr ""
-"最后，前往Github，从你fork的仓库向原仓库提出PR。"
+msgstr "最后，前往Github，从你fork的仓库向原仓库提出PR。"
 
-#: ../../contribute.rst:228 629ae326bd4e4718a8865d3925c02c3e
+#: ../../contribute.rst:234 b71524be74c84517a12fcdecb51bc55e
 msgid "Logging tips"
 msgstr "日志技巧"
 
-#: ../../contribute.rst:230 486bb6ae6c484431923a96b7a7aff0c5
+#: ../../contribute.rst:236 a0b70f864ce144eabe0f89d78844c395
 msgid "Try to use logging with appropriate levels."
 msgstr "请仔细斟酌合适的日志等级。"
 
-#: ../../contribute.rst:232 fbe2aed8f0f5412081461fce5d36e51e
+#: ../../contribute.rst:238 3b44fa3ec9b3493e97c310207e5dce91
 msgid "For logging messages that are not repeated, use the usual Python way::"
 msgstr "对于不重复的日志消息，使用一般的方式即可："
 
-#: ../../contribute.rst:241 bab220240a0744f5b1170783098b5eac
+#: ../../contribute.rst:247 49d4e407310348838660e8c74c6e3fb6
 #, python-format
 msgid ""
 "Do not format log messages yourself. Use ``%s`` formatting in messages "
 "and pass arguments to logger. This is important, because the Pelican "
 "logger will preprocess some arguments, such as exceptions."
 msgstr ""
-"请不要自己格式化日志消息，而是使用在日志消息中使用 ``%s`` 并向logger传入参数。请务必"
-"遵循这一规则，因为Pelican的logger会自动预处理一些特殊的参数，例如exception。"
+"请不要自己格式化日志消息，而是使用在日志消息中使用 ``%s`` "
+"并向logger传入参数。请务必遵循这一规则，因为Pelican的logger会自动预处理一些特殊的参数，例如exception。"
 
-#: ../../contribute.rst:246 a760419565b8440ebc8b4dc8898520db
+#: ../../contribute.rst:252 4ac501dff8bc4554998d3f03486cce0e
 msgid "Limiting extraneous log messages"
 msgstr "限制低关联日志消息"
 
-#: ../../contribute.rst:248 dcf900d9f7d0424fabff4a9c5a7e5dc8
+#: ../../contribute.rst:254 c4dfb487945341cda6c0858954a2ed40
 msgid ""
 "If the log message can occur several times, you may want to limit the log"
 " to prevent flooding. In order to do that, use the ``extra`` keyword "
 "argument for the logging message in the following format::"
-msgstr ""
-"如果同一日志消息会重复多次，你会希望限制这些多余的内容。使用 ``extra`` "
-"命名参数来实现这一点："
+msgstr "如果同一日志消息会重复多次，你会希望限制这些多余的内容。使用 ``extra`` 命名参数来实现这一点："
 
-#: ../../contribute.rst:255 1ca7d769fc9348f8a5f9eef7b614522b
+#: ../../contribute.rst:261 4090a3bc71e3441e8a7efd639d36ec1e
 msgid ""
 "Optionally, you can also set ``'limit_args'`` as a tuple of arguments in "
 "``extra`` dict if your generic message needs formatting."
-msgstr ""
-"可选的，如果通用日志消息需要格式化，可以添加 ``'limit_args'`` 参数并将其对应值"
-"设为一个元组。"
+msgstr "可选的，如果通用日志消息需要格式化，可以添加 ``'limit_args'`` 参数并将其对应值设为一个元组。"
 
-#: ../../contribute.rst:258 85328a267c464f9aaacb1b0ef289d624
+#: ../../contribute.rst:264 dd6530ceb29d4a91902046a3d4e63af6
 msgid ""
 "Limit is set to ``5``, i.e, first four logs with the same ``'limit_msg'``"
 " are outputted normally but the fifth one will be logged using "
 "``'limit_msg'`` (and ``'limit_args'`` if present). After the fifth, "
 "corresponding log messages will be ignored."
 msgstr ""
-"限制数默认设为了 ``5`` ，即前四个有相同 ``'limit_msg'`` 参数的日志消息会正常输出，"
-"但第五条这样的日志消息会呈现为 ``'limit_msg'`` 参数值本身（ ``'limit_args'`` 同理）。"
-"第六条及之后的日志消息会被直接忽略。"
+"限制数默认设为了 ``5`` ，即前四个有相同 ``'limit_msg'`` 参数的日志消息会正常输出，但第五条这样的日志消息会呈现为 "
+"``'limit_msg'`` 参数值本身（ ``'limit_args'`` 同理）。第六条及之后的日志消息会被直接忽略。"
 
-#: ../../contribute.rst:263 7a51dbb9559d4a579654b2ab0938d09b
+#: ../../contribute.rst:269 50bdb3405a964740aeb91a7d559ba9b5
 msgid ""
 "For example, if you want to log missing resources, use the following "
 "code::"
-msgstr ""
-"例如，如果你想要用日志记录资源缺失的信息，可以使用下面的代码："
+msgstr "例如，如果你想要用日志记录资源缺失的信息，可以使用下面的代码："
 
-#: ../../contribute.rst:271 8db05f7332f3475b940fb79d24e74ce7
+#: ../../contribute.rst:277 0303387eccd842f9aa57eb3192252dba
 msgid "The log messages will be displayed as follows::"
 msgstr "最终的日志消息看起来会像这样："
 
-#: ../../contribute.rst:281 93d618c58e6e4688bebb999ddf591eaa
+#: ../../contribute.rst:287 281637c4520d4755993e8bfa46b0326b
 msgid "Outputting traceback in the logs"
 msgstr "在日志中输出traceback信息"
 
-#: ../../contribute.rst:283 3d56bb4bc804499a8d3c8f14dc614916
+#: ../../contribute.rst:289 8bd9319a7a6c4f77bd651057d1cc7c75
 msgid ""
 "If you're logging inside an ``except`` block, you may want to provide the"
 " traceback information as well. You can do that by setting ``exc_info`` "
@@ -716,9 +655,8 @@ msgid ""
 " can be undesired because tracebacks are long and can be confusing to "
 "regular users. Try to limit them to ``--debug`` mode like the following::"
 msgstr ""
-"当在 ``except`` 块中进行日志记录时，你可能会希望同时输出traceback信息。可以"
-"简单地将 ``exc_info`` 参数设为 ``True`` 来实现这一功能。但是通过此方法输出的"
-"traceback信息会非常长，不便于理解。可以像下述代码一样将这些信息限制在 "
+"当在 ``except`` 块中进行日志记录时，你可能会希望同时输出traceback信息。可以简单地将 ``exc_info`` 参数设为 "
+"``True`` 来实现这一功能。但是通过此方法输出的traceback信息会非常长，不便于理解。可以像下述代码一样将这些信息限制在 "
 "``--debug`` 模式中："
 
 #~ msgid "latest Pelican release (or an up-to-date Git clone of Pelican master)"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/install.po b/docs/locale/zh_CN/LC_MESSAGES/install.po
index 4bc2c10f..f77ccab5 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/install.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/install.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"POT-Creation-Date: 2025-07-13 11:46+0800\n"
 "PO-Revision-Date: 2024-06-25 19:00+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
@@ -16,38 +16,35 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.15.0\n"
+"Generated-By: Babel 2.17.0\n"
 
-#: ../../install.rst:2 32d9c99d9171418c89daafbe7260daa9
+#: ../../install.rst:2 e735e1393d63466092c9fc0a5ee4117d
 msgid "Installing Pelican"
 msgstr "安装Pelican"
 
-#: ../../install.rst:4 73ec02b650044be6bb17951f4a915075
+#: ../../install.rst:4 e34bdf7c1bbb4c75a47f8bd16e626c67
 msgid ""
 "Pelican currently runs best on |min_python|; earlier versions of Python "
 "are not supported."
-msgstr ""
-"Pelican需要 |min_python| 以上版本的Python，不支持更低版本。"
+msgstr "Pelican需要 |min_python| 以上版本的Python，不支持更低版本。"
 
-#: ../../install.rst:6 9134a5a1bd9a4f54a36a3da163d859d8
+#: ../../install.rst:6 ff98ade47da6403e84dd1b2209896d9c
 msgid ""
 "You can install Pelican via several different methods. The simplest is "
 "via Pip_::"
-msgstr ""
-"有多种方法可以安装Pelican，最简单的就是通过 Pip_："
+msgstr "有多种方法可以安装Pelican，最简单的就是通过 Pip_："
 
-#: ../../install.rst:10 22d5948b07d14a13bc45aa14ef11e856
+#: ../../install.rst:10 ae2fcb82534e4a3f81980f69ed94c9ad
 msgid "Or, if you plan on using Markdown::"
 msgstr "如果您需要使用Markdown，请使用下面的命令安装："
 
-#: ../../install.rst:14 b910f7faa2c84e5eb62fbd0fae2544d3
+#: ../../install.rst:14 ed597b1eb47949efba0f1781ef7bbd1f
 msgid ""
 "(Keep in mind that some operating systems will require you to prefix the "
 "above command with ``sudo`` in order to install Pelican system-wide.)"
-msgstr ""
-"（在某些操作系统中，需要在命令前加 ``sudo`` 才能在整个系统上安装Pelican）"
+msgstr "（在某些操作系统中，需要在命令前加 ``sudo`` 才能在整个系统上安装Pelican）"
 
-#: ../../install.rst:17 afb018b5d42e433e8107ca38dfcb545f
+#: ../../install.rst:17 04d6784f06dd40e7bff76bf6476aaba1
 msgid ""
 "While the above is the simplest method, the recommended approach is to "
 "create a virtual environment for Pelican via virtualenv_ before "
@@ -55,43 +52,40 @@ msgid ""
 " open a new terminal session and create a new virtual environment for "
 "Pelican::"
 msgstr ""
-"尽管上面是最简单的安装方法，但我们推荐使用虚拟环境 virtualenv_ 完成"
-"Pelican的安装。当您安装好 virtualenv_ 后，打开一个新的命令行并"
-"为Pelican创建一个虚拟环境："
+"尽管上面是最简单的安装方法，但我们推荐使用虚拟环境 virtualenv_ 完成Pelican的安装。当您安装好 virtualenv_ "
+"后，打开一个新的命令行并为Pelican创建一个虚拟环境："
 
-#: ../../install.rst:26 7d981233f13e42b6b07fbd5fa58f69fc
+#: ../../install.rst:26 08aae819315e48a194a065a3fc3dddad
 msgid ""
 "Once the virtual environment has been created and activated, Pelican can "
 "be installed via ``python -m pip install pelican`` as noted above. "
 "Alternatively, if you have the project source, you can install Pelican "
-"using the distutils method::"
+"using the setuptools method::"
 msgstr ""
 "当创建并激活虚拟环境后，使用之前提到过的命令 ``python -m pip install pelican`` "
-"就可以安装Pelican了。或者，如果您想要从源码安装，可以使用distutils方式："
+"就可以安装Pelican了。或者，如果您想要从源码安装，可以使用setuptools："
 
-#: ../../install.rst:33 c8109ae3e44541e18e713e39690009ae
+#: ../../install.rst:33 368febf14ca740e19fa470b0f832dea1
 msgid ""
 "If you have Git installed and prefer to install the latest bleeding-edge "
 "version of Pelican rather than a stable release, use the following "
 "command::"
-msgstr ""
-"如果安装过Git，并且您希望安装Pelican的最最新版本（而不是稳定版），"
-"请使用下面的命令："
+msgstr "如果安装过Git，并且您希望安装Pelican的最最新版本（而不是稳定版），请使用下面的命令："
 
-#: ../../install.rst:38 2ba389e93d084dea8b702336479a0470
+#: ../../install.rst:38 2498d09099194317a62e67b907bdd5d3
 msgid ""
 "Once Pelican is installed, you can run ``pelican --help`` to see basic "
 "usage options. For more detail, refer to the :doc:`Publish<publish>` "
 "section."
 msgstr ""
-"当您安装好Pelican，可以执行 ``pelican --help`` 命令来查看一些基本用法。"
-"在 :doc:`发布站点<publish>` 章节中可以了解更多信息。"
+"当您安装好Pelican，可以执行 ``pelican --help`` 命令来查看一些基本用法。在 :doc:`发布站点<publish>` "
+"章节中可以了解更多信息。"
 
-#: ../../install.rst:42 d1850a31cca24c5281cc7c9fd748b56b
+#: ../../install.rst:42 4ef93669753e4bb89252a8c9852e7a71
 msgid "Optional packages"
 msgstr "可选包"
 
-#: ../../install.rst:44 8428281e15354c71a5aec92e9e0041b9
+#: ../../install.rst:44 190eabcd8f3a437cbf895ecee25aff4d
 msgid ""
 "If you plan on using `Markdown <https://pypi.org/project/Markdown/>`_ as "
 "a markup format, you can install Pelican with Markdown support::"
@@ -99,7 +93,7 @@ msgstr ""
 "如您希望使用 `Markdown <https://pypi.org/project/Markdown/>`_ "
 "来写作，执行下面的命令来安装Markdown支持："
 
-#: ../../install.rst:49 6dcdacecb0874afd8c88cbf814c522ba
+#: ../../install.rst:49 fa8fc8ff397a412f839bc2805696aa45
 msgid ""
 "Typographical enhancements can be enabled in your settings file, but "
 "first the requisite `Typogrify <https://pypi.org/project/typogrify/>`_ "
@@ -108,108 +102,94 @@ msgstr ""
 "Pelican还支持排版增强，若您需要使用，请先安装 `Typogrify "
 "<https://pypi.org/project/typogrify/>`_ 库，稍后您可以在设置文件中启用它。"
 
-#: ../../install.rst:56 d3ff6383ae9745bc9bfed85654086311
+#: ../../install.rst:56 74911273a6934154bad4fadbc0d1f28b
 msgid "Dependencies"
 msgstr "依赖"
 
-#: ../../install.rst:58 2dc22a3fa6c242bdb5b61005e1910d79
+#: ../../install.rst:58 77d44b11ae7e4945b119fd473bb53e67
 msgid ""
 "When Pelican is installed, the following dependent Python packages should"
 " be automatically installed without any action on your part:"
-msgstr ""
-"当Pelican安装完成后，下面的所有Python依赖应该都会自动安装，"
-"无需另外做任何操作："
+msgstr "当Pelican安装完成后，下面的所有Python依赖应该都会自动安装，无需另外做任何操作："
 
-#: ../../install.rst:61 4c7a644a29b540869d69acd10e032039
+#: ../../install.rst:61 22bdf13ed0a3482fb66f10486518261c
 msgid ""
 "`feedgenerator <https://pypi.org/project/feedgenerator/>`_, to generate "
 "the Atom feeds"
-msgstr ""
-"`feedgenerator <https://pypi.org/project/feedgenerator/>`_，"
-"用于生成Atom feeds"
+msgstr "`feedgenerator <https://pypi.org/project/feedgenerator/>`_，用于生成Atom feeds"
 
-#: ../../install.rst:63 365c8fb0938e4d9fbf78d110b05cb99f
+#: ../../install.rst:63 21ddc5ce3bed4f9cab2a454e8319a8c4
 msgid "`jinja2 <https://pypi.org/project/Jinja2/>`_, for templating support"
 msgstr "`jinja2 <https://pypi.org/project/Jinja2/>`_，用于模板系统"
 
-#: ../../install.rst:64 5db63207e60c4997924c3baf8aec8524
+#: ../../install.rst:64 9302b2919a4f4de0927060911f69f5ed
 msgid "`pygments <https://pypi.org/project/Pygments/>`_, for syntax highlighting"
 msgstr "`pygments <https://pypi.org/project/Pygments/>`_，用于语法高亮"
 
-#: ../../install.rst:65 72bfb5fc2b514031a42952502746c100
+#: ../../install.rst:65 c6e45ac0f3ea4f91953fb2dfc66d29d9
 msgid ""
 "`docutils <https://pypi.org/project/docutils/>`_, for supporting "
 "reStructuredText as an input format"
-msgstr ""
-"`docutils <https://pypi.org/project/docutils/>`_，"
-"用于reStructuredText格式"
+msgstr "`docutils <https://pypi.org/project/docutils/>`_，用于reStructuredText格式"
 
-#: ../../install.rst:67 d00ac0c26d884a2d9d7f02fa89491892
+#: ../../install.rst:67 aea17a424f3c4e8eab50172b6653fe16
 msgid ""
 "`blinker <https://pypi.org/project/blinker/>`_, an object-to-object and "
 "broadcast signaling system"
-msgstr ""
-"`blinker <https://pypi.org/project/blinker/>`_，"
-"对象-对象的信号广播系统"
+msgstr "`blinker <https://pypi.org/project/blinker/>`_，对象-对象的信号广播系统"
 
-#: ../../install.rst:69 0d317b007acf49fc879203fa8ffb4048
+#: ../../install.rst:69 5da4c8d1fdf349c2afe23ffc9d832816
 msgid ""
 "`unidecode <https://pypi.org/project/Unidecode/>`_, for ASCII "
 "transliterations of Unicode text utilities"
 msgstr ""
-"`unidecode <https://pypi.org/project/Unidecode/>`_，"
-"用于将Unicode文本转为ASCII字符的音译"
+"`unidecode "
+"<https://pypi.org/project/Unidecode/>`_，用于将Unicode文本转为ASCII字符的音译"
 
-#: ../../install.rst:72 ded0aae575854f149bcf2ea9efa4ba21
+#: ../../install.rst:72 ff81051def5544e1b5d66532453aed25
 msgid ""
 "`MarkupSafe <https://pypi.org/project/MarkupSafe/>`_, for a markup-safe "
 "string implementation"
-msgstr ""
-"`MarkupSafe <https://pypi.org/project/MarkupSafe/>`_，"
-"用于转义字符的安全处理"
+msgstr "`MarkupSafe <https://pypi.org/project/MarkupSafe/>`_，用于转义字符的安全处理"
 
-#: ../../install.rst:74 eae7d8f6f84040339ccfef98e20502d8
+#: ../../install.rst:74 0222b4cdfdcb48839f5f6b092071db99
 msgid ""
 "`python-dateutil <https://pypi.org/project/python-dateutil/>`_, to read "
 "the date metadata"
 msgstr ""
-"`python-dateutil <https://pypi.org/project/python-dateutil/>`_，"
-"用于读取日期相关的元数据"
+"`python-dateutil <https://pypi.org/project/python-"
+"dateutil/>`_，用于读取日期相关的元数据"
 
-#: ../../install.rst:78 cd33ec4583574c5bb879f08813b9932c
+#: ../../install.rst:78 49117127302b49b39bd5b86abae18709
 msgid "Upgrading"
 msgstr "更新升级"
 
-#: ../../install.rst:80 1513dd1e43564cb29da0a14988e0791d
+#: ../../install.rst:80 93962c7d303f4c9fa5ad9d43f86ea50a
 msgid ""
 "If you installed a stable Pelican release via Pip_ and wish to upgrade to"
 " the latest stable release, you can do so by adding ``--upgrade``::"
-msgstr ""
-"若是通过 Pip_ 安装了稳定版本的Pelican，可以通过在安装命令中"
-"添加 ``--upgrade`` 来升级到最新版："
+msgstr "若是通过 Pip_ 安装了稳定版本的Pelican，可以通过在安装命令中添加 ``--upgrade`` 来升级到最新版："
 
-#: ../../install.rst:85 fae6900b3acc41d4b7bb34c192fe4c08
+#: ../../install.rst:85 1ac1fa009f9e4245ae7f975bda7d5a22
 msgid ""
 "If you installed Pelican via distutils or the bleeding-edge method, "
 "simply perform the same step to install the most recent version."
-msgstr ""
-"若是通过distutils安装或是通过Git安装了测试版的Pelican"
-"重新进行一遍和安装时同样的步骤即可。"
+msgstr "若是通过distutils安装或是通过Git安装了测试版的Pelican重新进行一遍和安装时同样的步骤即可。"
 
-#: ../../install.rst:89 89392d36f81f4c7eb75e9a74d1795faa
+#: ../../install.rst:89 7845fa285f0b4dcd8e881c9edd61f80c
 msgid "Kickstart your site"
 msgstr "启动网站"
 
-#: ../../install.rst:91 a8517a0fbbb1420297df214f50d8792d
+#: ../../install.rst:91 488ad84175cb45f6a6bb26cec24c1f10
 msgid ""
 "Once Pelican has been installed, you can create a skeleton project via "
 "the ``pelican-quickstart`` command, which begins by asking some questions"
 " about your site::"
 msgstr ""
-"Pelican安装完成后，通过 ``pelican-quickstart`` 命令创建项目的整体框架，"
-"在运行这个命令时，您需要输入一些与站点相关的信息："
+"Pelican安装完成后，通过 ``pelican-quickstart`` "
+"命令创建项目的整体框架，在运行这个命令时，您需要输入一些与站点相关的信息："
 
-#: ../../install.rst:97 50231ba4b02d4e868995bdacbd02b27d
+#: ../../install.rst:97 63a773d35b91455b944206337e527a3a
 msgid ""
 "If run inside an activated virtual environment, ``pelican-quickstart`` "
 "will look for an associated project path inside "
@@ -219,26 +199,22 @@ msgid ""
 "project path on initial invocation, use: ``pelican-quickstart --path "
 "/your/desired/directory``"
 msgstr ""
-"如果是在虚拟环境中执行 ``pelican-quickstart`` ，系统会自动在 "
-"``$VIRTUAL_ENV/.project`` 目录中查找这个命令。若这个这个命令存在"
-"并且路径是正确的，一个新的Pelican项目就会在目标位置创建。否则，"
-"会默认在当前的工作目录下创建这个项目。若要在初始化时指定项目路径，请使用 "
-"``pelican-quickstart --path /your/desired/directory``。"
+"如果是在虚拟环境中执行 ``pelican-quickstart`` ，系统会自动在 ``$VIRTUAL_ENV/.project`` "
+"目录中查找这个命令。若这个这个命令存在并且路径是正确的，一个新的Pelican项目就会在目标位置创建。否则，会默认在当前的工作目录下创建这个项目。若要在初始化时指定项目路径，请使用"
+" ``pelican-quickstart --path /your/desired/directory``。"
 
-#: ../../install.rst:104 ea893addf15c47f182384509b1a3a2f7
+#: ../../install.rst:104 b7cdf15328074880bb4fc69dcb7bd26f
 msgid ""
 "Once you finish answering all the questions, your project will consist of"
 " the following hierarchy (except for *pages* — shown in parentheses below"
 " — which you can optionally add yourself if you plan to create non-"
 "chronological content)::"
 msgstr ""
-"当您回答完所有问题后，项目就会成功创建。项目中会包含下述的一些层级结构"
-"（除了用括号括起来的 *pages*）。如果有一些内容不需要按时间排序，"
-"您可以将它们放在（pages）所在的位置："
+"当您回答完所有问题后，项目就会成功创建。项目中会包含下述的一些层级结构（除了用括号括起来的 "
+"*pages*）。如果有一些内容不需要按时间排序，您可以将它们放在（pages）所在的位置："
 
-#: ../../install.rst:118 7d13a0cc5ebd44159fddc8de68993fc7
+#: ../../install.rst:118 05e4fe3b0d0a4c998fba451692a68725
 msgid ""
 "The next step is to begin to adding content to the *content* folder that "
 "has been created for you."
-msgstr ""
-"接下来就可以开始往 *content* 目录中添加自己创作的内容了。"
+msgstr "接下来就可以开始往 *content* 目录中添加自己创作的内容了。"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/plugins.po b/docs/locale/zh_CN/LC_MESSAGES/plugins.po
index 7b62744d..123117b8 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/plugins.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/plugins.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-24 19:06+0800\n"
+"POT-Creation-Date: 2025-07-13 11:46+0800\n"
 "PO-Revision-Date: 2024-06-26 19:00+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
@@ -16,26 +16,24 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.15.0\n"
+"Generated-By: Babel 2.17.0\n"
 
-#: ../../plugins.rst:4 b1b40bca7d3748008eefe26806d5d5ef
+#: ../../plugins.rst:4 3df58bcad1a64350a8e763d87d7470e3
 msgid "Plugins"
 msgstr "插件"
 
-#: ../../plugins.rst:6 42ca486828e4442a9d74216d0d8bb37d
+#: ../../plugins.rst:6 5e0f2aa517254778a71d1e742b051645
 msgid ""
 "Beginning with version 3.0, Pelican supports plugins. Plugins are a way "
 "to add features to Pelican without having to directly modify the Pelican "
 "core."
-msgstr ""
-"Pelican从3.0版本开始支持插件。通过插件，不必直接修改Pelican的核心代码就可以给"
-"Pelican添加新功能。"
+msgstr "Pelican从3.0版本开始支持插件。通过插件，不必直接修改Pelican的核心代码就可以给Pelican添加新功能。"
 
-#: ../../plugins.rst:10 6bb8ab4cb7eb44ddb1ed4734f47f6781
+#: ../../plugins.rst:10 40ad4aad1dc54b929f6059031edae0d9
 msgid "How to use plugins"
 msgstr "如何使用插件"
 
-#: ../../plugins.rst:12 822e0bd7ce2f4433a7c39b3accde01a1
+#: ../../plugins.rst:12 8fc9f8cba76b4bb9930d80b5b985885a
 msgid ""
 "Starting with version 4.5, Pelican moved to a new plugin structure "
 "utilizing namespace packages that can be easily installed via Pip_. "
@@ -44,12 +42,11 @@ msgid ""
 "Pelican. To see a list of Pip-installed namespace plugins that are active"
 " in your environment, run::"
 msgstr ""
-"Pelican从4.5版本开始使用了一种全新的插件结构，利用了命名空间包，"
-"并且可以轻松地通过 Pip_ 进行安装。支持此结构地插件都会被安装在命名空间包 "
-"``pelican.plugins`` 下，因此Pelican可以自动发现他们。下面的命令可以用于"
-"查看环境中用Pip安装的所有插件："
+"Pelican从4.5版本开始使用了一种全新的插件结构，利用了命名空间包，并且可以轻松地通过 Pip_ "
+"进行安装。支持此结构地插件都会被安装在命名空间包 ``pelican.plugins`` "
+"下，因此Pelican可以自动发现他们。下面的命令可以用于查看环境中用Pip安装的所有插件："
 
-#: ../../plugins.rst:20 2b59c5d107dc4b118dc76116910e9495
+#: ../../plugins.rst:20 de052285e7f645a9ab551433f3c07d46
 msgid ""
 "If you leave the ``PLUGINS`` setting as default (``None``), Pelican will "
 "automatically discover namespace plugins and register them. If, on the "
@@ -58,132 +55,122 @@ msgid ""
 "specify will be registered, and you must explicitly list any namespace "
 "plugins as well."
 msgstr ""
-"若将 ``PLUGINS`` 配置项设为默认的 ``None`` ，Pelican会自动发现命名空间中的"
-"插件并且将他们全部加载；若你在 ``PLUGINS`` 设置项中指定了一系列的插件，"
-"Pelican就不会去自动发现插件，也就是说，你需要显式地指定所有要使用的插件。"
+"若将 ``PLUGINS`` 配置项设为默认的 ``None`` ，Pelican会自动发现命名空间中的插件并且将他们全部加载；若你在 "
+"``PLUGINS`` 设置项中指定了一系列的插件，Pelican就不会去自动发现插件，也就是说，你需要显式地指定所有要使用的插件。"
 
-#: ../../plugins.rst:26 52d1968196294569a478931f7022e686
+#: ../../plugins.rst:26 a9675be841b84df584e67087cd23ab34
 msgid ""
 "If you are using the ``PLUGINS`` setting, you can specify plugins in two "
 "ways. The first method specifies plugins as a list of strings. Namespace "
 "plugins can be specified either by their full names "
 "(``pelican.plugins.myplugin``) or by their short names (``myplugin``)::"
 msgstr ""
-"在配置 ``PLUGINS`` 时，有两种方式。一是用字符串列表指定插件的名称，可以是包含"
-"命名空间的完整名称（例如 ``pelican.plugins.myplugin`` ），也可以是简短名称"
-"（ ``myplugin``）："
+"在配置 ``PLUGINS`` 时，有两种方式。一是用字符串列表指定插件的名称，可以是包含命名空间的完整名称（例如 "
+"``pelican.plugins.myplugin`` ），也可以是简短名称（ ``myplugin``）："
 
-#: ../../plugins.rst:35 b2c75e52e66e4000968e744ffa4b89a9
+#: ../../plugins.rst:35 188bf617180b4a7b9bc09f3fb1c201ae
 msgid ""
 "Alternatively, you can import them in your settings file and pass the "
 "modules::"
-msgstr ""
-"二是在设置文件中先import进来，再将import进的模块放在 ``PLUGINS`` 设置项中："
+msgstr "二是在设置文件中先import进来，再将import进的模块放在 ``PLUGINS`` 设置项中："
 
-#: ../../plugins.rst:43 88af9139373f4cd89fa5b958196c9448
+#: ../../plugins.rst:43 2d5db874810245a98b59ab080a0df1a5
 msgid ""
 "When experimenting with different plugins (especially the ones that deal "
 "with metadata and content) caching may interfere and the changes may not "
 "be visible. In such cases disable caching with ``LOAD_CONTENT_CACHE = "
 "False`` or use the ``--ignore-cache`` command-line switch."
 msgstr ""
-"在尝试不同的插件时（尤其是那些处理元数据和内容的插件），缓存可能会相互干扰，"
-"一些更改不会生效。发生这种情况时，就需要通过设置 ``LOAD_CONTENT_CACHE = False`` "
-"或使用 ``--ignore-cache`` 命令行选项禁用缓存。"
+"在尝试不同的插件时（尤其是那些处理元数据和内容的插件），缓存可能会相互干扰，一些更改不会生效。发生这种情况时，就需要通过设置 "
+"``LOAD_CONTENT_CACHE = False`` 或使用 ``--ignore-cache`` 命令行选项禁用缓存。"
 
-#: ../../plugins.rst:48 d0e3cd59052c4a7d995fb5e1e15d9799
+#: ../../plugins.rst:48 7421f93c1d714c9c853fc9311681515a
 msgid ""
 "If your plugins are not in an importable path, you can specify a list of "
 "paths via the ``PLUGIN_PATHS`` setting. As shown in the following "
 "example, paths in the ``PLUGIN_PATHS`` list can be absolute or relative "
 "to the settings file::"
 msgstr ""
-"如果插件处于无法直接进行import的路径，可以在 ``PLUGIN_PATHS`` 配置项中指定这些路径。"
-"如下例所示， ``PLUGIN_PATHS`` 中的路径可以是绝对的，也可以是相对于设置文件的："
+"如果插件处于无法直接进行import的路径，可以在 ``PLUGIN_PATHS`` 配置项中指定这些路径。如下例所示， "
+"``PLUGIN_PATHS`` 中的路径可以是绝对的，也可以是相对于设置文件的："
 
-#: ../../plugins.rst:56 4c3de952a8514e5caea402392b911f0b
+#: ../../plugins.rst:56 b8406038d0284d3fbef9d3de1fa7fd9f
 msgid "Where to find plugins"
 msgstr "在哪儿下载插件"
 
-#: ../../plugins.rst:57 16173c9dceb0409f89964412dd7e71e9
+#: ../../plugins.rst:57 b07653ce77194a998630a55ae9511de5
 msgid ""
 "Namespace plugins can be found in the `pelican-plugins organization`_ as "
 "individual repositories. Legacy plugins are located in the `pelican-"
 "plugins repository`_ and will be gradually phased out in favor of the "
 "namespace versions."
 msgstr ""
-"新的命名空间插件可以在GitHub的 `pelican-plugins 组织`_ 中找到，每个插件都是"
-"一个独立的仓库。而老的插件则可以在GitHub的 `pelican-plugins 仓库`_ 中找到。"
-"这些老的插件会逐步淘汰并转移到新的命名空间版本。"
+"新的命名空间插件可以在GitHub的 `pelican-plugins 组织`_ "
+"中找到，每个插件都是一个独立的仓库。而老的插件则可以在GitHub的 `pelican-plugins 仓库`_ "
+"中找到。这些老的插件会逐步淘汰并转移到新的命名空间版本。"
 
-#: ../../plugins.rst:65 a30a9862112b47128f6e7b28c6836f27
+#: ../../plugins.rst:65 5c55fa6f3d664be2a49b8256dc2f6a2e
 msgid ""
 "Please note that while we do our best to review and maintain these "
 "plugins, they are submitted by the Pelican community and thus may have "
 "varying levels of support and interoperability."
-msgstr ""
-"请注意，尽管我们尽全力审查和维护这些插件，但这些插件是Pelican社区提交的，"
-"因此支持性和互操作性程度各不相同。"
+msgstr "请注意，尽管我们尽全力审查和维护这些插件，但这些插件是Pelican社区提交的，因此支持性和互操作性程度各不相同。"
 
-#: ../../plugins.rst:70 f4e140c61c0f45ed8ac53dca3b05b1f1
+#: ../../plugins.rst:70 25339a713a97492c88b0e60024ac34b8
 msgid "How to create plugins"
 msgstr "如何创建插件"
 
-#: ../../plugins.rst:72 43013c6cf4f34ca09205e8dab0b9fa6d
+#: ../../plugins.rst:72 62b6b4a1a5f0486e8b3a39d6a7050f0a
 msgid ""
 "Plugins are based on the concept of signals. Pelican sends signals, and "
 "plugins subscribe to those signals. The list of available signals is "
 "documented in a subsequent section."
-msgstr ""
-"插件是基于信号这一概念的。Pelican会发送信号，插件则订阅这些信号。可用的信号"
-"在下一节会贴出来。"
+msgstr "插件是基于信号这一概念的。Pelican会发送信号，插件则订阅这些信号。可用的信号在下一节会贴出来。"
 
-#: ../../plugins.rst:76 5377a966ab114a29acb61f79eadc632b
+#: ../../plugins.rst:76 f8f74b0257be46a1878e72e126166bd0
 msgid ""
 "The only rule to follow for plugins is to define a ``register`` callable,"
 " in which you map the signals to your plugin logic. Let's take a simple "
 "example::"
 msgstr ""
-"对于插件来说，唯一需要遵循的规则就是一定要定义一个可调用的 ``register`` ，"
-"在 ``register`` 中需要将信号映射到插件逻辑上。下面是一个简单的例子："
+"对于插件来说，唯一需要遵循的规则就是一定要定义一个可调用的 ``register`` ，在 ``register`` "
+"中需要将信号映射到插件逻辑上。下面是一个简单的例子："
 
-#: ../../plugins.rst:93 2217318326524c62804ec94e55a4ca20
+#: ../../plugins.rst:93 163eebc74421416da2ad497830c42771
 msgid ""
 "Signal receivers are weakly-referenced and thus must not be defined "
 "within your ``register`` callable or they will be garbage-collected "
 "before the signal is emitted."
-msgstr ""
-"信号接收器在Pelican中是弱引用的，因此不能将它定义在可调用的 ``register`` 中，"
-"否则接收器在信号发送之前就会被回收。"
+msgstr "信号接收器在Pelican中是弱引用的，因此不能将它定义在可调用的 ``register`` 中，否则接收器在信号发送之前就会被回收。"
 
-#: ../../plugins.rst:97 6731cc78478a46c5a0cb51a8cd477318
+#: ../../plugins.rst:97 bb63bd2d24e341a1a4f7dfa118648d9a
 msgid ""
-"If multiple plugins connect to the same signal, plugins will be executed "
-"in the order they are connected. With ``PLUGINS`` setting, order will be "
-"as defined in the setting. If you rely on auto-discovered namespace "
-"plugins, no ``PLUGINS`` setting, they will be connected in the same order"
-" they are discovered (same order as ``pelican-plugins`` output). If you "
-"want to specify the order explicitly, disable auto-discovery by defining "
+"If multiple plugins connect to the same signal, plugins will be invoked "
+"in the order they are registered. When the ``PLUGINS`` setting is "
+"defined, plugin invocation order will be the order in which the plugins "
+"are listed in the ``PLUGINS`` setting. If you rely on auto-discovered "
+"namespace plugins and have no ``PLUGINS`` setting defined, plugins will "
+"be invoked in the same order that they are discovered (the same order as "
+"listed in the output of the ``pelican-plugins`` command). If you want to "
+"specify the order explicitly, disable auto-discovery by defining "
 "``PLUGINS`` in the desired order."
 msgstr ""
-"如果多个插件关联到同一个信号，插件将按照它们关联的前后顺序执行。但若设置了 "
-"``PLUGINS`` 配置项会以此配置项中的顺序为准。如果您使用了无需PLUGINS设置的新版"
-"命名空间插件，它们将按照被探测到的顺序进行连接（与 pelican-plugins 输出的顺序相同）。"
+"对于关联到同一个信号的多个插件，将按照它们注册的前后顺序执行。但若设置了 ``PLUGINS`` "
+"配置项，则会以此配置项中的顺序为准。如果您使用了无需PLUGINS设置的新版命名空间插件，它们将按照被探测到的顺序进行连接（与 pelican-"
+"plugins 输出的顺序相同）。若您此时仍想要显式指定顺序，设置 ``PLUGINS`` 配置项即可。"
 
-#: ../../plugins.rst:105 6dad534cc0014b78a3638a91cc4a1120
+#: ../../plugins.rst:107 062aa3a3402141cfbd376d4fee1b5b34
 msgid "Namespace plugin structure"
 msgstr "命名空间插件的结构"
 
-#: ../../plugins.rst:107 aa6f290c3f4d42558b684d0e3487af95
+#: ../../plugins.rst:109 e6968290620d4de3b71ff62d5abba91f
 msgid ""
 "Namespace plugins must adhere to a certain structure in order to function"
 " properly. They need to be installable (i.e. contain ``setup.py`` or "
 "equivalent) and have a folder structure as follows::"
-msgstr ""
-"命名空间插件必须遵循特定的结构才能正常工作。这些插件需要是可安装的"
-"（即包含 ``setup.py`` 或其他等效文件），并且遵循下述文件夹结构："
+msgstr "命名空间插件必须遵循特定的结构才能正常工作。这些插件需要是可安装的（即包含 ``setup.py`` 或其他等效文件），并且遵循下述文件夹结构："
 
-#: ../../plugins.rst:120 b8d73cfdb5f042cca1705f97d693263d
+#: ../../plugins.rst:122 b9782f71fae14bce9854b8b5056407d8
 msgid ""
 "It is crucial that ``pelican`` or ``pelican/plugins`` folder **not** "
 "contain an ``__init__.py`` file. In fact, it is best to have those "
@@ -192,373 +179,357 @@ msgid ""
 "``pelican/plugins/myplugin`` folder to avoid any issues."
 msgstr ""
 "非常关键的一点就是， ``pelican`` 和 ``pelican/plugins`` 文件夹下都 **不能** 包含 "
-"``__init__.py`` 文件。事实上，这两个文件夹下最好是只有上面列出的文件夹，"
-"并且保证与插件相关的文件都仅包含在 ``pelican/plugins/myplugin`` 文件夹中，"
-"以避免奇奇怪怪的问题。"
+"``__init__.py`` 文件。事实上，这两个文件夹下最好是只有上面列出的文件夹，并且保证与插件相关的文件都仅包含在 "
+"``pelican/plugins/myplugin`` 文件夹中，以避免奇奇怪怪的问题。"
 
-#: ../../plugins.rst:126 c3f08ae8c0d7415098157bbd1c99ce08
+#: ../../plugins.rst:128 8440bc91329c498c90fadab556391a84
 msgid ""
 "To easily set up the proper structure, a `cookiecutter template for "
 "plugins`_ is provided. Refer to that project's README for instructions on"
 " how to use it."
-msgstr ""
-"为了让大家更容易就能建立正确的结构，我们为插件提供了一个 `cookiecutter模板`_ ，"
-"使用方法参考此项目README文件中的指示即可。"
+msgstr "为了让大家更容易就能建立正确的结构，我们为插件提供了一个 `cookiecutter模板`_ ，使用方法参考此项目README文件中的指示即可。"
 
-#: ../../plugins.rst:132 c2321eec3dc84224918172c5040a259f
+#: ../../plugins.rst:134 bb029c6c9ea14a2dac684d516fb9a1eb
 msgid "List of signals"
 msgstr "信号列表"
 
-#: ../../plugins.rst:134 78c4cfefae7e412f8f6287da2e3c8d34
+#: ../../plugins.rst:136 968d92d9b3bb4491ad9c0e4a015e73f9
 msgid "Here is the list of currently implemented signals:"
 msgstr "下面是目前已经实现了的信号："
 
-#: ../../plugins.rst:137 7a3c3b8b0f114d54b497ab77b09dc558
+#: ../../plugins.rst:139 f2db011f146d40bf9f07ec6b09c7c6d0
 msgid "Signal"
 msgstr "信号"
 
-#: ../../plugins.rst:137 781b5c11f87f43b9ba4b3e75bee696d0
+#: ../../plugins.rst:139 32f683cb25c74315ac803c62868bd7b2
 msgid "Arguments"
 msgstr "参数"
 
-#: ../../plugins.rst:137 df7d14950fed44f4a4b93908aed36060
+#: ../../plugins.rst:139 d02ae4c30dec40ae8bd894fda051562d
 msgid "Description"
 msgstr "描述"
 
-#: ../../plugins.rst:139 598901e7cb5b49ac9acb5f148bf7c0e7
+#: ../../plugins.rst:141 d526b9cb6c3c409f9b2d243082dfbdc3
 msgid "initialized"
 msgstr "initialized"
 
-#: ../../plugins.rst:139 ../../plugins.rst:140 ../../plugins.rst:158
-#: ../../plugins.rst:161 4cedbf9ee7fb4c7abe20e15e4ee1c7fb
-#: 704ff7e1ddfc4eb3bd7798d25df1e668 bc98001ef73d419b8f811bbb3d3a571a
-#: c9104ccaf84c48d98fafca001ec187e2
+#: ../../plugins.rst:141 ../../plugins.rst:142 ../../plugins.rst:160
+#: ../../plugins.rst:163 0ab3e30cf009477980c4c619e0a7dc5e
+#: 8cf4a2d70a234250a4d9f63e4e8cb49f a600f769faef42d99333442745c7b498
+#: a69e7ba2df7a47658b2f0e4ade60d455
 msgid "pelican object"
 msgstr "pelican object"
 
-#: ../../plugins.rst:140 6f1a09178e2c44c9bda76ed0c0025bef
+#: ../../plugins.rst:142 3aff44965eec41269a45fd0b84b8b5d7
 msgid "finalized"
 msgstr "finalized"
 
-#: ../../plugins.rst:140 175a1d1ab8374325812a00cfd581e54e
+#: ../../plugins.rst:142 6a3bd6c773b245af9151ff5669ef7f84
 msgid ""
 "invoked after all the generators are executed and just before pelican "
 "exits useful for custom post processing actions, such as: - minifying "
 "js/css assets. - notify/ping search engines with an updated sitemap."
-msgstr ""
-"所有generator执行完成后调用，即pelican退出之前。这对于自定义后处理操作是"
-"非常有用的，例如可以简化js/css资源、向搜索引擎告知更新后的sitemap。"
+msgstr "所有generator执行完成后调用，即pelican退出之前。这对于自定义后处理操作是非常有用的，例如可以简化js/css资源、向搜索引擎告知更新后的sitemap。"
 
-#: ../../plugins.rst:144 8d390b6db281423d92a4d7bd4921b4b4
+#: ../../plugins.rst:146 eecb5a5dc1b84f94a830db617122f365
 msgid "generator_init"
 msgstr "generator_init"
 
-#: ../../plugins.rst:144 fef4d6e70a4c4365be408a5f1579135c
+#: ../../plugins.rst:146 b01311f8da704b55b38e23149c60bc22
 msgid "generator"
 msgstr "generator"
 
-#: ../../plugins.rst:144 dbe5ff1590dc4df38cb8fd234708c7bd
+#: ../../plugins.rst:146 a3c477e7a8d04e94af4ee7a82c873ef2
 msgid "invoked in the Generator.__init__"
 msgstr "在Generator.__init__中调用"
 
-#: ../../plugins.rst:145 0324812d14d9452fbf28c286c2a10834
+#: ../../plugins.rst:147 246a49eb99d34589ac409e5613f27069
 msgid "all_generators_finalized"
 msgstr "all_generators_finalized"
 
-#: ../../plugins.rst:145 f6170ebf34b247868d149f0efca462b3
+#: ../../plugins.rst:147 0dafe1a8f7224b1bbe1af3ebeeac0b31
 msgid "generators"
 msgstr "generators"
 
-#: ../../plugins.rst:145 d67dff93c28146498074abbf3aeb5103
+#: ../../plugins.rst:147 9d5130f91ac748e58d96cfba7711e8f6
 msgid "invoked after all the generators are executed and before writing output"
 msgstr "在所有generator执行完后，写入输出内容前调用，"
 
-#: ../../plugins.rst:146 0e9feed7804b4bbdb23711f9d6ad4f40
+#: ../../plugins.rst:148 3a7f543549164bb684f47daa5b1b9bd1
 msgid "readers_init"
 msgstr "readers_init"
 
-#: ../../plugins.rst:146 f0de00423c104ecd8e60fb3450b534b4
+#: ../../plugins.rst:148 0946829014734c53a0b1e389df853daf
 msgid "readers"
 msgstr "readers"
 
-#: ../../plugins.rst:146 b554b35806e34e51bc5ab974fb517541
+#: ../../plugins.rst:148 380ba486fff24555b3c312bee4645d23
 msgid "invoked in the Readers.__init__"
 msgstr "在Readers.__init__中调用"
 
-#: ../../plugins.rst:147 ../../plugins.rst:201 003cdeb23b67433e8cf70c600a42e8e4
-#: 7f4a2f6665064a16bcd1b7ea347f5b49
+#: ../../plugins.rst:149 ../../plugins.rst:203 04aa2b44a0b84da9b62b952b627a2b5c
+#: e725d629327b48e3a7dffad1d07d81d2
 msgid "article_generator_context"
 msgstr "article_generator_context"
 
-#: ../../plugins.rst:147 8997b3fd1a8d4efb86245916e50c31b9
+#: ../../plugins.rst:149 f0c440ead7fc46e2a90685c3fdffb5d4
 msgid "article_generator, metadata"
 msgstr "article_generator, metadata"
 
-#: ../../plugins.rst:148 ../../plugins.rst:203 4496df152e48410995ae35f73e3ce0e9
-#: f46672e3f919441ba2486f9641752913
+#: ../../plugins.rst:150 ../../plugins.rst:205 2ed41de1aaed481195aeacbc841459be
+#: e9e159b6d49d4cd29ebbe6eb6e0bb3b1
 msgid "article_generator_preread"
 msgstr "article_generator_preread"
 
-#: ../../plugins.rst:148 ../../plugins.rst:150 ../../plugins.rst:151
-#: ../../plugins.rst:154 3408ba823f14463196f2296480e25c7d
-#: 43b073d3f3ad4a2ba3d0c18447cb7cf6 c776a7323f0a41babb44daf3abfd6b85
-#: f47ca0a3f9654ed4b7653fd946b2d9b6
+#: ../../plugins.rst:150 ../../plugins.rst:152 ../../plugins.rst:153
+#: ../../plugins.rst:156 37277bd83e254f47b6df91ba6790f79e
+#: 9d3b745b96114ff7931cbcc372901c3e b89f87d254984ec59e25045227c708bf
+#: d38f0e2931b84b82adcc5aca5a4c2233
 msgid "article_generator"
 msgstr "article_generator"
 
-#: ../../plugins.rst:148 94e2a57c5b074d068f051d5de850060c
+#: ../../plugins.rst:150 7a45243569e84c1e9d5d49b5c1a7b86a
 msgid ""
 "invoked before a article is read in ArticlesGenerator.generate_context; "
 "use if code needs to do something before every article is parsed"
-msgstr ""
-"在ArticlesGenerator.generate_context读取文章之前调用；若代码需要在解析每篇文章前"
-"执行某些操作，就可以使用此信号。"
+msgstr "在ArticlesGenerator.generate_context读取文章之前调用；若代码需要在解析每篇文章前执行某些操作，就可以使用此信号。"
 
-#: ../../plugins.rst:150 c58f32123f234e6cafa42aa4ede5bf73
+#: ../../plugins.rst:152 87c8e4ad4a104cb889172025f1b0229b
 msgid "article_generator_init"
 msgstr "article_generator_init"
 
-#: ../../plugins.rst:150 10d3585dc8f94d978643a9c2dc9219a9
+#: ../../plugins.rst:152 46c1e5fbb90a4668afda3d66e4520689
 msgid "invoked in the ArticlesGenerator.__init__"
 msgstr "在ArticlesGenerator.__init__中调用"
 
-#: ../../plugins.rst:151 93ec423e266b4ba9b941a5826e290fec
+#: ../../plugins.rst:153 de4b631d41e946c485ebb813e3dd6b62
 msgid "article_generator_pretaxonomy"
 msgstr "article_generator_pretaxonomy"
 
-#: ../../plugins.rst:151 27290d55819e4bfabe1624059956258f
+#: ../../plugins.rst:153 697a45a251fe4188b1f32cec631427b9
 msgid ""
 "invoked before categories and tags lists are created useful when e.g. "
 "modifying the list of articles to be generated so that removed articles "
 "are not leaked in categories or tags"
-msgstr ""
-"在创建类别和标签列表之前调用。例如，当需要变更要生成的文章列表时可以使用，"
-"如此可以避免一些已移除文章在分类或标签列表中泄露。"
+msgstr "在创建类别和标签列表之前调用。例如，当需要变更要生成的文章列表时可以使用，如此可以避免一些已移除文章在分类或标签列表中泄露。"
 
-#: ../../plugins.rst:154 ../../plugins.rst:202 12c99acda2ac45debe4fc574a246fc63
-#: f3bfb220e59d473bb27601c16f5a1625
+#: ../../plugins.rst:156 ../../plugins.rst:204 051dcac75cbf4f5ea3a665e6da642324
+#: 2360e283fdd142ab8d65792581522e72
 msgid "article_generator_finalized"
 msgstr "article_generator_finalized"
 
-#: ../../plugins.rst:154 4cb8ed5b4701426b8e1707c6c6b0d48f
+#: ../../plugins.rst:156 0c3c808d5b7044018f8566ccc6dd3010
 msgid "invoked at the end of ArticlesGenerator.generate_context"
 msgstr "在ArticlesGenerator.generate_context的最后调用"
 
-#: ../../plugins.rst:155 c19a632018d44ad2b72d5cf6b7cc9c14
+#: ../../plugins.rst:157 60d78048da4843a7a0307218c078d151
 msgid "article_generator_write_article"
 msgstr "article_generator_write_article"
 
-#: ../../plugins.rst:155 9da20e77d40b45e292ae994fb0fbe97c
+#: ../../plugins.rst:157 2ac0d0e7306a4d5086bb2e8b7b17ffb1
 msgid "article_generator, content"
 msgstr "article_generator, content"
 
-#: ../../plugins.rst:155 a2d5bc3f72b64e47bcaccff3bf27dec2
+#: ../../plugins.rst:157 565551e010964925b10a3b5734913119
 msgid "invoked before writing each article, the article is passed as content"
 msgstr "在写入每篇文章前调用，文章以内容的形式作为参数传入。"
 
-#: ../../plugins.rst:156 0db965f5b99f49e48fc1db531c139f13
+#: ../../plugins.rst:158 fd7918c3200f4714b028c8d0a200df98
 msgid "article_writer_finalized"
 msgstr "article_writer_finalized"
 
-#: ../../plugins.rst:156 c6af98478be14eb283bb95e7b6a3118c
+#: ../../plugins.rst:158 e54633543dbf4e5fb2dd4c1bfc09b1c1
 msgid "article_generator, writer"
 msgstr "article_generator, writer"
 
-#: ../../plugins.rst:156 c48e1152864c4249886f3c7ed4ece85b
+#: ../../plugins.rst:158 965e61a0fd6347faa2d7224a50a98b76
 msgid ""
 "invoked after all articles and related pages have been written, but "
 "before the article generator is closed."
-msgstr ""
-"在所有文章及相关联页面写入完成后，在文章generator关闭前调用。"
+msgstr "在所有文章及相关联页面写入完成后，在文章generator关闭前调用。"
 
-#: ../../plugins.rst:158 f6af27fc844d43779d581cb4383b97ed
+#: ../../plugins.rst:160 30df01c5c11a4ed58b006d78b007c68d
 msgid "get_generators"
 msgstr "get_generators"
 
-#: ../../plugins.rst:158 b41e27f19c47478a8ece4f43a685f6be
+#: ../../plugins.rst:160 758447f5e55a4738a14486b0e962034d
 msgid ""
 "invoked in Pelican.get_generator_classes, can return a Generator, or "
 "several generators in a tuple or in a list."
-msgstr ""
-"在Pelican.get_generator_classes中调用，可以返回一个Generator，也可以以一个"
-"元组或列表的形式返回多个generator。"
+msgstr "在Pelican.get_generator_classes中调用，可以返回一个Generator，也可以以一个元组或列表的形式返回多个generator。"
 
-#: ../../plugins.rst:161 f23075094c4f46958de609a44850eb6d
+#: ../../plugins.rst:163 730e948388a24435be216830e0af5be6
 msgid "get_writer"
 msgstr "get_writer"
 
-#: ../../plugins.rst:161 365671a73e17434f90973ee8e632fa32
+#: ../../plugins.rst:163 df9f9fef24984c4bad07b8834e79352f
 msgid "invoked in Pelican.get_writer, can return a custom Writer."
 msgstr "在Pelican.get_writer前调用，可以返回一个自定义Writer。"
 
-#: ../../plugins.rst:163 ../../plugins.rst:204 299eef53e530489a9e7366042919059f
-#: 917cc78965d84285bc832cecf181ce55
+#: ../../plugins.rst:165 ../../plugins.rst:206 1c172b26e92543d2be488a88cceaf576
+#: 252231854c504621b28243dfba9d88ab
 msgid "page_generator_context"
 msgstr "page_generator_context"
 
-#: ../../plugins.rst:163 26f64e1dbe854ca287aa0f59b269477c
+#: ../../plugins.rst:165 a830e240c6564552ba4952bc657120a9
 msgid "page_generator, metadata"
 msgstr "page_generator, metadata"
 
-#: ../../plugins.rst:164 ../../plugins.rst:205 c2ec4e60dda142569cdcfe5a311b21a5
-#: fcd417f63054406ea7869a2a945dc819
+#: ../../plugins.rst:166 ../../plugins.rst:207 09add2ea39344ad8936296a07cfd8e82
+#: 0fc3cf365d9d418b8225e8f1f5da76d0
 msgid "page_generator_preread"
 msgstr "page_generator_preread"
 
-#: ../../plugins.rst:164 ../../plugins.rst:166 ../../plugins.rst:167
-#: 89c2d7a279604926a290c2665fe8082a 98ab9a5bc2804442a217233f4ab8a003
-#: fca779509f1742e99e3d10a6602561c9
+#: ../../plugins.rst:166 ../../plugins.rst:168 ../../plugins.rst:169
+#: 3c31cfe2f4744cd987f1638a4b82e5de a80ec8c388cb477abbcfc4f558d34df7
+#: d485c4f9c2c443748234827727cc887e
 msgid "page_generator"
 msgstr "page_generator"
 
-#: ../../plugins.rst:164 295fe11e61ba4f80a145ce06a1ffc777
+#: ../../plugins.rst:166 4d8b96aa6ebf47d885cd978c336679ff
 msgid ""
 "invoked before a page is read in PageGenerator.generate_context; use if "
 "code needs to do something before every page is parsed."
-msgstr ""
-"在PageGenerator.generate_context读取页面前调用，若代码需要在解析每个页面前"
-"执行某些操作，就可以使用此信号。"
+msgstr "在PageGenerator.generate_context读取页面前调用，若代码需要在解析每个页面前执行某些操作，就可以使用此信号。"
 
-#: ../../plugins.rst:166 ../../plugins.rst:207 4f2b1db9b6054af2b0fd0545082bcafd
-#: db8ee3e356d84758b427d9f29d034000
+#: ../../plugins.rst:168 ../../plugins.rst:209 06adf06d2b204100b9f80850b84bdff0
+#: c0988434a401410e8cf6b4528e6d2870
 msgid "page_generator_init"
 msgstr "page_generator_init"
 
-#: ../../plugins.rst:166 1d4e2e940e0f4dd5a151519aea710454
+#: ../../plugins.rst:168 d359da10912949fa999dc3ad5215be66
 msgid "invoked in the PagesGenerator.__init__"
 msgstr "在PagesGenerator.__init__中调用"
 
-#: ../../plugins.rst:167 ../../plugins.rst:206 319e921c48474a43bbdac4bf43a688f2
-#: 5e9b33a48c51417fb5211824b0ad008d
+#: ../../plugins.rst:169 ../../plugins.rst:208 0994b38b87704caea04ef0671a7b1c67
+#: a97cf5f236a64959aa09838dbe03dfdc
 msgid "page_generator_finalized"
 msgstr "page_generator_finalized"
 
-#: ../../plugins.rst:167 019fa3fddf2e4725b978326f221c80bd
+#: ../../plugins.rst:169 4cfdfe952daf4e3ea5ea1c8b2cf7a664
 msgid "invoked at the end of PagesGenerator.generate_context"
 msgstr "在PagesGenerator.generate_context的最后调用"
 
-#: ../../plugins.rst:168 0f77c3c609594768a0aaed6529260b97
+#: ../../plugins.rst:170 7e2504584a1b4fa4ae88c5002bcbb26f
 msgid "page_generator_write_page"
 msgstr "page_generator_write_page"
 
-#: ../../plugins.rst:168 0ca5fb200a254cff8529cb5d95e8e26e
+#: ../../plugins.rst:170 ea204a5fe703472ea5afea283135b94d
 msgid "page_generator, content"
 msgstr "page_generator, content"
 
-#: ../../plugins.rst:168 164d45dac5ab4df8abd898c1466e186d
+#: ../../plugins.rst:170 22dd198fe6dc498f944e2c0e2c595c6c
 msgid "invoked before writing each page, the page is passed as content"
 msgstr "在写入每个页面前调用，页面以内容形式作为参数传入"
 
-#: ../../plugins.rst:169 4780473ba6ae47998f891232f122b34a
+#: ../../plugins.rst:171 84d5def2c4fc4a2489d2b4fc1fa445df
 msgid "page_writer_finalized"
 msgstr "page_writer_finalized"
 
-#: ../../plugins.rst:169 6c516a5ae777406ca9ed7bf27b7124c7
+#: ../../plugins.rst:171 c55d65276a4e49c58c34d12cc062c90d
 msgid "page_generator, writer"
 msgstr "page_generator, writer"
 
-#: ../../plugins.rst:169 e8978d0fb878427cbf686608c593aa67
+#: ../../plugins.rst:171 b2a3d1c7c2864a08829833bc16b3223e
 msgid ""
 "invoked after all pages have been written, but before the page generator "
 "is closed."
 msgstr "调用于所有页面写入完成后，在页面generator关闭前。"
 
-#: ../../plugins.rst:171 ../../plugins.rst:208 47bf9969c38b4fef9e15e9d7ea67630e
-#: d9a3d5d939d4499b9320ea15dbd3f26e
+#: ../../plugins.rst:173 ../../plugins.rst:210 097c5b3dc1d34a5eb7c1b4ae67179b3e
+#: a420152f887e4977bdd26a5fa7230915
 msgid "static_generator_context"
 msgstr "static_generator_context"
 
-#: ../../plugins.rst:171 47064012c4e447f5a1f087a7af420f8f
+#: ../../plugins.rst:173 1bbacfe960644e4a902b9c866e3fffce
 msgid "static_generator, metadata"
 msgstr "static_generator, metadata"
 
-#: ../../plugins.rst:172 ../../plugins.rst:209 7050e1889934465a8837ba65fa249118
-#: f45c31c591fd450badd89a7f87c6f991
+#: ../../plugins.rst:174 ../../plugins.rst:211 c1242bcf76fc40568f67a2ce4e70c0bb
+#: f407aa94870645c891bb349edc3ae9a4
 msgid "static_generator_preread"
 msgstr "static_generator_preread"
 
-#: ../../plugins.rst:172 ../../plugins.rst:175 ../../plugins.rst:176
-#: 1e99fc14855a4a2e8d1f4758e12792d9 45cdf5c2a8d049889b4315d1ea78f462
-#: b7ae37b94f2f44feb24ac32b0cdfa447
+#: ../../plugins.rst:174 ../../plugins.rst:177 ../../plugins.rst:178
+#: 36f5be5c982b42d097c0465f542e490f cf0ebefd743246dd9db1b37a8c6a43a8
+#: d5cd54887d904bcca02b0df4f22580e9
 msgid "static_generator"
 msgstr "static_generator"
 
-#: ../../plugins.rst:172 431017db31bf439f8d3fb5e16b020376
+#: ../../plugins.rst:174 1b2fbadf156644429e66ad2e64d26658
 msgid ""
 "invoked before a static file is read in StaticGenerator.generate_context;"
 " use if code needs to do something before every static file is added to "
 "the staticfiles list."
-msgstr ""
-"在StaticGenerator.generate_context读取静态文件前调用，若代码需要在每个静态文件"
-"加入静态文件列表前进行一些修改，就可以使用此信号。"
+msgstr "在StaticGenerator.generate_context读取静态文件前调用，若代码需要在每个静态文件加入静态文件列表前进行一些修改，就可以使用此信号。"
 
-#: ../../plugins.rst:175 2a380c26f2984e659ec36248a543a4c3
+#: ../../plugins.rst:177 654377fe53434f77b3ba294b5689d1d4
 msgid "static_generator_init"
 msgstr "static_generator_init"
 
-#: ../../plugins.rst:175 832447303775460c83743d831aa58290
+#: ../../plugins.rst:177 e9b3cbbde7a6443a81d025d1a4fe6145
 msgid "invoked in the StaticGenerator.__init__"
 msgstr "在StaticGenerator.__init__中调用"
 
-#: ../../plugins.rst:176 b01307445d54485a9036fb0f9619ff78
+#: ../../plugins.rst:178 202be739e43444f48f122d3e5f657a45
 msgid "static_generator_finalized"
 msgstr "static_generator_finalized"
 
-#: ../../plugins.rst:176 2f7e7e25668b44fc824bb39270c3de96
+#: ../../plugins.rst:178 06080672fd614d39a79aa6d3a783087f
 msgid "invoked at the end of StaticGenerator.generate_context"
 msgstr "在StaticGenerator.generate_context的最后调用"
 
-#: ../../plugins.rst:177 2a34785767ee416dbe41a6aa1f7e4ab1
+#: ../../plugins.rst:179 ce174fb4533143518c13b16ab6dbe4c8
 msgid "content_object_init"
 msgstr "content_object_init"
 
-#: ../../plugins.rst:177 c41d8a8653a94d648b573b5c13db3954
+#: ../../plugins.rst:179 5089a38bad1447cab62f350df8e76f31
 msgid "content_object"
 msgstr "content_object"
 
-#: ../../plugins.rst:177 379b6d76d2f14d05bf1502d2c55b125f
+#: ../../plugins.rst:179 d105f652be424f5cad8bfaf7be69ec4b
 msgid "invoked at the end of Content.__init__"
 msgstr "在Content.__init__的最后调用"
 
-#: ../../plugins.rst:178 10761aa6a1d54ee0a28e562bdacffebf
+#: ../../plugins.rst:180 dbda8a11bca744a4ba5fc51d044f1d6e
 msgid "content_written"
 msgstr "content_written"
 
-#: ../../plugins.rst:178 001ad90e09ab4b21a702b2ed9771a156
+#: ../../plugins.rst:180 c8ba95ebcc2e4c79ae79717a730fe504
 msgid "path, context"
 msgstr "path, context"
 
-#: ../../plugins.rst:178 69b05b02e1564fe4b48dbd2926fdaec3
+#: ../../plugins.rst:180 6d9caed8fa24400a86f8ede1c3ecb260
 msgid "invoked each time a content file is written."
 msgstr "每一次内容文件写入后调用。"
 
-#: ../../plugins.rst:179 30938518f54f46028c8fd03808471be7
+#: ../../plugins.rst:181 73a4265b050c4b32be186bb2cec59f30
 msgid "feed_generated"
 msgstr "feed_generated"
 
-#: ../../plugins.rst:179 e29bf37e7114454099baa21955b7fce0
+#: ../../plugins.rst:181 78fa3603986f417286f2e7440f5aff57
 msgid "context, feed"
 msgstr "context, feed"
 
-#: ../../plugins.rst:179 366ba164593242309dab922c36667dc3
+#: ../../plugins.rst:181 13dcd9e5fb2f408db72b87b88877596b
 msgid ""
 "invoked each time a feed gets generated. Can be used to modify a feed "
 "object before it gets written."
 msgstr "每个feed生成前调用。可以用于在feed写入前修改之。"
 
-#: ../../plugins.rst:181 0b6d7fc85d374b9c82c60d4a0df69fcd
+#: ../../plugins.rst:183 3a959768d5704e459940cbfcf8e1459c
 msgid "feed_written"
 msgstr "feed_written"
 
-#: ../../plugins.rst:181 d3fdc3a669e9418b9f6e738c549fa151
+#: ../../plugins.rst:183 86844bee049a445e87db283bdf325338
 msgid "path, context, feed"
 msgstr "path, context, feed"
 
-#: ../../plugins.rst:181 3da952e464034f8c8491caa94f0aec2d
+#: ../../plugins.rst:183 e79185da7cb54bf5aa59a46846222391
 msgid "invoked each time a feed file is written."
 msgstr "每一个feed文件写入后调用。"
 
-#: ../../plugins.rst:186 24bf768827184a8a9c2ad9d23d3549e4
+#: ../../plugins.rst:188 0fe0539bad1c4fcbbebbdaa98d328ee9
 msgid ""
 "Avoid ``content_object_init`` signal if you intend to read ``summary`` or"
 " ``content`` properties of the content object. That combination can "
@@ -567,145 +538,132 @@ msgid ""
 "properties instead, or, alternatively, run your plugin at a later stage "
 "(e.g. ``all_generators_finalized``)."
 msgstr ""
-"请避免使用 ``content_object_init`` 信号读取content对象的 ``summary`` 或 "
-"``content`` 属性，这可能导致在 :ref:`ref-linking-to-internal-content` 时无法"
-"解析链接（请参阅 `pelican-plugins bug #314`_ ）。请改用 ``_summary`` 和 "
-"``_content`` 属性，或者就在后续阶段再运行插件（例如 ``all_generators_finalized`` 时）。"
+"请避免使用 ``content_object_init`` 信号读取content对象的 ``summary`` 或 ``content`` "
+"属性，这可能导致在 :ref:`ref-linking-to-internal-content` 时无法解析链接（请参阅 `pelican-"
+"plugins bug #314`_ ）。请改用 ``_summary`` 和 ``_content`` 属性，或者就在后续阶段再运行插件（例如 "
+"``all_generators_finalized`` 时）。"
 
-#: ../../plugins.rst:195 9222300d10c74a9eb27fc229488e63a4
+#: ../../plugins.rst:197 77ca681d0d7a4a9ea42f7eebf683f024
 msgid ""
 "After Pelican 3.2, signal names were standardized.  Older plugins may "
 "need to be updated to use the new names:"
-msgstr ""
-"Pelican3.2之后，信号名都进行了标准化，较老的插件可能需要进行更新："
+msgstr "Pelican3.2之后，信号名都进行了标准化，较老的插件可能需要进行更新："
 
-#: ../../plugins.rst:199 2ba779a696064672965e17c70f70d927
+#: ../../plugins.rst:201 c83f9215c5964ba49cb5ed849c777495
 msgid "Old name"
 msgstr "旧名称"
 
-#: ../../plugins.rst:199 d21e933be9064983aa2cfaeca4f00cb9
+#: ../../plugins.rst:201 167435de345b443fa51c27b355121e14
 msgid "New name"
 msgstr "新名称"
 
-#: ../../plugins.rst:201 805ac7c62fc94113a3481890793f5417
+#: ../../plugins.rst:203 bcdf136cbb2c4dedbd90f6e56f584c6b
 msgid "article_generate_context"
 msgstr "article_generate_context"
 
-#: ../../plugins.rst:202 d6f1a03ae49349b091045c8079b80d44
+#: ../../plugins.rst:204 60fe5b91f4a54f0997f93d927b0d81c4
 msgid "article_generate_finalized"
 msgstr "article_generate_finalized"
 
-#: ../../plugins.rst:203 c967c8322a744c2c970beb6b98b90743
+#: ../../plugins.rst:205 31252537627f4042b7f7b4e0a4a33aeb
 msgid "article_generate_preread"
 msgstr "article_generate_preread"
 
-#: ../../plugins.rst:204 71adeb83fba74317ad0fac5784612a3d
+#: ../../plugins.rst:206 719da4844a0a4b6fbb2cf2d9b7e51deb
 msgid "pages_generate_context"
 msgstr "pages_generate_context"
 
-#: ../../plugins.rst:205 d2297a5ec351411e8a66a74d8168caa0
+#: ../../plugins.rst:207 f7c865fd6824473aad024fc606235b48
 msgid "pages_generate_preread"
 msgstr "pages_generate_preread"
 
-#: ../../plugins.rst:206 fb572935b7f445d298ff2c9c89c59c4e
+#: ../../plugins.rst:208 74c47460bacf4fd68f2536580efb1480
 msgid "pages_generator_finalized"
 msgstr "pages_generator_finalized"
 
-#: ../../plugins.rst:207 0bb615d8a6f643a3a1a9abac2ec4f712
+#: ../../plugins.rst:209 b403e7f978c24d989d99587579f31d3c
 msgid "pages_generator_init"
 msgstr "pages_generator_init"
 
-#: ../../plugins.rst:208 beddb5f81a62458b87c0703355a7b5a4
+#: ../../plugins.rst:210 94e5184530c94cc48d00fd819fffd649
 msgid "static_generate_context"
 msgstr "static_generate_context"
 
-#: ../../plugins.rst:209 8fe8895dcb464e11bb01657e975f1352
+#: ../../plugins.rst:211 00ca2c730ad840f584d3f9dd30daf0cd
 msgid "static_generate_preread"
 msgstr "static_generate_preread"
 
-#: ../../plugins.rst:213 44b14caddfd245c18cacd755fd0023e9
+#: ../../plugins.rst:215 f8044e028ccd4d64954e24375a739cd2
 msgid "Recipes"
 msgstr "具体使用方法举例"
 
-#: ../../plugins.rst:215 c24473f41cc84d028c99fa56af636037
+#: ../../plugins.rst:217 0c441d12047240199025f2d3ac954167
 msgid ""
 "We eventually realised some of the recipes to create plugins would be "
 "best shared in the documentation somewhere, so here they are!"
-msgstr ""
-"下面分享了一些创建插件的具体方法，请享用！"
+msgstr "下面分享了一些创建插件的具体方法，请享用！"
 
-#: ../../plugins.rst:219 96de26e8150e4339b3461d2dcc478cf3
+#: ../../plugins.rst:221 bb96f2da7b3340cb9ed56ee1ad59796b
 msgid "How to create a new reader"
 msgstr "如何创建一个新的reader"
 
-#: ../../plugins.rst:221 3f26c1183b814401b333bbd8528675d9
+#: ../../plugins.rst:223 49dbbbd2c5ca4798a1b9d67b48630d36
 msgid ""
 "One thing you might want is to add support for your very own input "
 "format. While it might make sense to add this feature in Pelican core, we"
 " wisely chose to avoid this situation and instead have the different "
 "readers defined via plugins."
-msgstr ""
-"你可能需要添加对输入文件格式的特殊支持。这似乎可以作为Pelican核心的一个功能，"
-"但我们选择避免将此功能放在核心中，而是通过插件实现不同的reader。"
+msgstr "你可能需要添加对输入文件格式的特殊支持。这似乎可以作为Pelican核心的一个功能，但我们选择避免将此功能放在核心中，而是通过插件实现不同的reader。"
 
-#: ../../plugins.rst:226 8167dcbaa6864da3b2262a2a99e08a15
+#: ../../plugins.rst:228 af8936c711204a0aa7c85835124065c5
 msgid ""
 "The rationale behind this choice is mainly that plugins are really easy "
 "to write and don't slow down Pelican itself when they're not active."
-msgstr ""
-"做出这个决定主要是因为实现这样的格式支持插件非常容易，而且这样在不需要此功能时"
-"也不会影响Pelican自身的速度。"
+msgstr "做出这个决定主要是因为实现这样的格式支持插件非常容易，而且这样在不需要此功能时也不会影响Pelican自身的速度。"
 
-#: ../../plugins.rst:229 26c8185062964b52921860cfa2ce508c
+#: ../../plugins.rst:231 11dac8bd71994c18a289086ec95a0273
 msgid "No more talking — here is an example::"
 msgstr "多说无益，下面是一个具体例子："
 
-#: ../../plugins.rst:265 ea51efb1925f45e79c87d6e5488cbbcd
+#: ../../plugins.rst:267 f6bf903ae8de4ac183ecea699de568dc
 msgid "Adding a new generator"
 msgstr "添加新的generator"
 
-#: ../../plugins.rst:267 9e04f17a5fa1488d82d3629edf8cdf3f
+#: ../../plugins.rst:269 50d39b45550446a493a6d5d6eb971103
 msgid ""
 "Adding a new generator is also really easy. You might want to have a look"
 " at :doc:`internals` for more information on how to create your own "
 "generator."
-msgstr ""
-"添加一个generator也非常简单，你可能会想要看一看 :doc:`internals` ，其中有关于"
-"如何创建generator的内容。"
+msgstr "添加一个generator也非常简单，你可能会想要看一看 :doc:`internals` ，其中有关于如何创建generator的内容。"
 
-#: ../../plugins.rst:281 f4c92958e88a41a7a0deee697b48fc58
+#: ../../plugins.rst:283 1b4bc8c2b02645dd81b06ffdbd759c36
 msgid "Adding a new writer"
 msgstr "添加新的writer"
 
-#: ../../plugins.rst:283 188bf0e8a68446458ae525c67cfe098c
+#: ../../plugins.rst:285 ac526121b895429d8412605bca594684
 msgid ""
 "Adding a writer will allow you to output additional file formats to disk,"
 " or change how the existing formats are written to disk. Note that only "
 "one writer will be active at a time, so be sure to either subclass the "
 "built-in Writer, or completely re-implement it."
-msgstr ""
-"添加writer可以让你将其他文件格式输出到磁盘，或者可以改变现有格式写入磁盘的方式。"
-"请注意，一次只能启用一个writer，因此请确保继承了内置的Writer，并且完全重新实现之。"
+msgstr "添加writer可以让你将其他文件格式输出到磁盘，或者可以改变现有格式写入磁盘的方式。请注意，一次只能启用一个writer，因此请确保继承了内置的Writer，并且完全重新实现之。"
 
-#: ../../plugins.rst:288 edb5d1fa15bc48859c2912ba7c344286
+#: ../../plugins.rst:290 4335016710cd417ca9b8068cb7a45d51
 msgid "Here is a basic example of how to set up your own writer::"
 msgstr "下面是启用你的自定义writer的一个基本例子："
 
-#: ../../plugins.rst:308 0df8f3318357472cbd72e17e1b5085b2
+#: ../../plugins.rst:310 c65b371d4bf740c49dfe190407c9af69
 msgid "Using Plugins to Inject Content"
 msgstr "使用插件添加内容"
 
-#: ../../plugins.rst:310 d0161dbe86c44111a6295259ec8cab54
+#: ../../plugins.rst:312 9f180f86d09f43d7aff4607bb7deb6f1
 msgid ""
 "You can programmatically inject articles or pages using plugins. This can"
 " be useful if you plan to fetch articles from an API, for example."
-msgstr ""
-"可以通过插件以可编程的方式添加文章或页面。如果你打算从某些API获取文章，这就会很有用。"
+msgstr "可以通过插件以可编程的方式添加文章或页面。如果你打算从某些API获取文章，这就会很有用。"
 
-#: ../../plugins.rst:313 5d5c41dbeb7243d4b497752771bc7858
+#: ../../plugins.rst:315 a65dd6bb4d0e48438dcf6d545bfaa053
 msgid ""
 "Following is a simple example of how one can build a plugin that injects "
 "a custom article, using the ``article_generator_pretaxonomy`` signal::"
-msgstr ""
-"下面是一个简单的示例，说明了如何使用 ``article_generator_pretaxonomy`` "
-"信号构建一个添加自定义文章的插件："
+msgstr "下面是一个简单的示例，说明了如何使用 ``article_generator_pretaxonomy`` 信号构建一个添加自定义文章的插件："
diff --git a/docs/locale/zh_CN/LC_MESSAGES/settings.po b/docs/locale/zh_CN/LC_MESSAGES/settings.po
index 9738cd7b..ef07e611 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/settings.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/settings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-27 16:18+0800\n"
+"POT-Creation-Date: 2025-07-13 11:46+0800\n"
 "PO-Revision-Date: 2024-06-26 19:00+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
@@ -16,25 +16,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.15.0\n"
+"Generated-By: Babel 2.17.0\n"
 
-#: ../../settings.rst:2 53029e75034c46d4b54eae3cd205fe2e
+#: ../../settings.rst:2 33f20b9899bd4f78a4f3eb7d250dfcc9
 msgid "Settings"
 msgstr "设置"
 
-#: ../../settings.rst:4 dd0b07017437474b99116d1c1927af95
+#: ../../settings.rst:4 3c3d83a6b67b42e5bb4e2519e403949d
 msgid ""
 "Pelican is configurable thanks to a settings file you can pass to the "
 "command line::"
 msgstr "可以通过命令行给Pelican传入配置文件："
 
-#: ../../settings.rst:9 df860abc6301440b89366f2898aabd6f
+#: ../../settings.rst:9 4137dd63d4b241cfbf37d291e974734a
 msgid ""
 "If you used the ``pelican-quickstart`` command, your primary settings "
 "file will be named ``pelicanconf.py`` by default."
 msgstr "如果使用的是 ``pelican-quickstart`` 命令，默认的主配置文件时 ``pelicanconf.py`` 。"
 
-#: ../../settings.rst:12 a7b47b4379934afcb2bfd9f5425c4a6c
+#: ../../settings.rst:12 509edfb7c1484707a192b4537faaf3b3
 msgid ""
 "You can also specify settings via ``-e`` / ``--extra-settings`` option "
 "flags. It will override default settings as well as any defined within "
@@ -43,13 +43,13 @@ msgstr ""
 "通过 ``-e`` / ``--extra-settings`` "
 "选项，可以直接指定一些配置来覆盖配置文件中的设置。需要注意的是，选项值必须时JSON格式的："
 
-#: ../../settings.rst:18 16437361edd74b8fb84dcde3da35baa3
+#: ../../settings.rst:18 2b7e043877334b32996b426ea7f8e1f0
 msgid ""
 "Environment variables can also be used here but must be escaped "
 "appropriately::"
 msgstr "可以在命令中使用环境变量，但是需要正确地进行转义："
 
-#: ../../settings.rst:24 71a1194ecd1b4a519877818ad172a44f
+#: ../../settings.rst:24 e9ac322feb4a4dbd9e07b73a1c49af72
 msgid ""
 "When experimenting with different settings (especially the metadata ones)"
 " caching may interfere and the changes may not be visible. In such cases "
@@ -59,7 +59,7 @@ msgstr ""
 "在尝试不同的设置（特别是尝试元数据）时，受缓存的干扰，对设置的更改可能不会生效。在这种情况下，指定 ``LOAD_CONTENT_CACHE = "
 "False`` 设置或 ``--ignore-cache`` 命令行选项即可。"
 
-#: ../../settings.rst:29 3362ac7659744fab9649c7d4edec7456
+#: ../../settings.rst:29 f8b7aff6141b48b3a03f726f769c9603
 msgid ""
 "Settings are configured in the form of a Python module (a file). There is"
 " an `example settings file "
@@ -70,7 +70,7 @@ msgstr ""
 "<https://raw.githubusercontent.com/getpelican/pelican/main/samples/pelican.conf.py>`_"
 " 可供您参考。"
 
-#: ../../settings.rst:34 fd01256fff0d40319c6bd55c3e3d1f8d
+#: ../../settings.rst:34 3ed2687613ef480bb61b8232c47d4af8
 msgid ""
 "To see a list of current settings in your environment, including both "
 "default and any customized values, run the following command (append one "
@@ -78,7 +78,7 @@ msgid ""
 "settings only)::"
 msgstr "要查看当前环境下的配置，同时查看默认的或是自定义的配置值，执行下面的命令（在后面以参数的形式添加一个或多个指定的配置名称，可以单独查看指定的配置项）:"
 
-#: ../../settings.rst:40 fd4f9ceda04c4b119adf0e6e3226842d
+#: ../../settings.rst:40 5d6b03822d2e4f35890b7a651a88987c
 msgid ""
 "All the setting identifiers must be set in all-caps, otherwise they will "
 "not be processed. Setting values that are numbers (5, 20, etc.), booleans"
@@ -89,7 +89,7 @@ msgstr ""
 "所有设置的键（设置中的变量名）都必须是大写的，否则会被无视。配置值可能是数值（5、20等）、布尔值（True、False、None等）、字典或者元组。这些值应该以Python值的形式存在，"
 " *不* 需要用引号引起来。除此之外的其他配置值（例如字符串） *必须* 用引号引起来。"
 
-#: ../../settings.rst:46 aece462c39674aa68651567ca58ac940
+#: ../../settings.rst:46 258fb84ebdee4dfe9373c7b7c2aab94d
 msgid ""
 "Unless otherwise specified, settings that refer to paths can be either "
 "absolute or relative to the configuration file. The settings you define "
@@ -97,135 +97,169 @@ msgid ""
 "you to use your settings to add site-wide content."
 msgstr "除非另有指定，设置中指定的路径可以是绝对路径，也可以是相对于配置文件的相对路径。设置中配置的东西会传递到网站模板中，这使得可以在配置文件中添加在整个站点中都能使用的内容。"
 
-#: ../../settings.rst:51 b3de78704bd34981bce53c625e7181ce
+#: ../../settings.rst:51 938a61723b6b4361b440b165bca533b7
 msgid "Here is a list of settings for Pelican:"
 msgstr "下面是Pelican设置项的列表："
 
-#: ../../settings.rst:55 4a3728c3d465496b903ad3bafef32da9
+#: ../../settings.rst:55 8ea36bbc1f084d1d8e29dc0bd2f8c922
 msgid "Basic settings"
 msgstr "基础设置"
 
-#: ../../settings.rst:59 74ac50f3d3d847148d37db0c2f4dcb1a
+#: ../../settings.rst:59 5de910e868b14ee791a313a2d31c16b2
 msgid ""
 "When you don't specify a category in your post metadata, set this setting"
 " to ``True``, and organize your articles in subfolders, the subfolder "
 "will become the category of your post. If set to ``False``, "
-"``DEFAULT_CATEGORY`` will be used as a fallback."
+"``DEFAULT_CATEGORY`` will be used as a fallback. The default is ``True``."
 msgstr ""
 "当您没有在推文中指定元数据categroy时，若本项设置设为了 ``True`` "
 "，并且文章也是通过子文件夹进行分类管理的，那么这些子文件夹的名称就会作为发布内容的分类。若本项设为了 ``False`` ，会使用配置项 "
-"``DEFAULT_CATEGORY`` 作为默认分类。"
+"``DEFAULT_CATEGORY`` 作为默认分类。本项设置默认为 ``True`` 。"
 
-#: ../../settings.rst:66 6fd89e4093cf42f7b7a15d12b806ae39
-msgid "The default category to fall back on."
-msgstr "默认的分类"
+#: ../../settings.rst:66 3675c7a1107744f0818c0473c4f0643b
+msgid "The default category to fall back on. The default is ``'misc'``."
+msgstr "默认的分类。本项设置默认为 ``'misc'`` 。"
 
-#: ../../settings.rst:70 dce02cdf67434cc385bf4c1a0ab92931
+#: ../../settings.rst:70 f4ee51775b44419586a76dbf79d887e5
 msgid ""
 "Whether to display pages on the menu of the template. Templates may or "
-"may not honor this setting."
-msgstr "指定是否将“页面”显示在模板的菜单中。模板可能不会遵循此项。"
+"may not honor this setting. The default is ``True``."
+msgstr "指定是否将“页面”显示在模板的菜单中。模板可能不会遵循此项。本项设置默认为 ``True`` 。"
 
-#: ../../settings.rst:75 830ab9b9933b488193d4b8afd85e6a31
+#: ../../settings.rst:75 b4f761d35ffb49e9bf520bc1206f7868
 msgid ""
 "Whether to display categories on the menu of the template. Templates may "
-"or not honor this setting."
-msgstr "指定是否将“分类”显示在模板的菜单中。模板可能不会遵循此项。"
+"or not honor this setting. The default is ``True``."
+msgstr "指定是否将“分类”显示在模板的菜单中。模板可能不会遵循此项。本项设置默认为 ``True`` 。"
 
-#: ../../settings.rst:80 01ef16e7f3d7423b96ee3b57b0173ebc
+#: ../../settings.rst:80 f3b1f471909b4af29de908310a75eaf5
+#, python-brace-format
 msgid ""
 "Extra configuration settings for the docutils publisher (applicable only "
 "to reStructuredText). See `Docutils Configuration`_ settings for more "
-"details."
+"details. The default is ``{}`` with no extra configuration settings."
 msgstr "docutils的额外配置项（只针对reStructuredText有效）。在 `Docutils 配置`_ 设置中查看更多信息。"
+"默认为 ``{}`` ，即不做任何额外配置。"
 
-#: ../../settings.rst:85 f7a9532b08ac43b4a61bd175ec91d66b
+#: ../../settings.rst:86 841018ef5c0c410c92bc7780acf25291
 msgid ""
 "Delete the output directory, and **all** of its contents, before "
 "generating new files. This can be useful in preventing older, unnecessary"
 " files from persisting in your output. However, **this is a destructive "
-"setting and should be handled with extreme care.**"
+"setting and should be handled with extreme care.** The default is "
+"``False``."
 msgstr ""
-"在生成新文件前删除输出目录和其中 **所有** 的内容。这可以避免一些老的无用的文件一直存在于输出目录中。但是， "
-"**此项配置是具有破坏性的，请谨慎使用** 。"
+"在生成新文件前删除输出目录及其中的 **所有** 内容。这可以避免一些老的无用的文件一直存在于输出目录中。但是， "
+"**此项配置是具有破坏性的，请谨慎使用** 。本项设置默认为 ``False`` 。"
 
-#: ../../settings.rst:92 ff8c5e50c9ac40bb85e8384fcad6617e
+#: ../../settings.rst:93 b9b726bedf79446e8f1721edee1b2eb8
 msgid ""
 "A list of filenames that should be retained and not deleted from the "
 "output directory. One use case would be the preservation of version "
 "control data."
 msgstr "一个文件名的列表，包含了应该保留，不从输出目录中删除的文件。可以用于版本控制数据的保留。"
 
-#: ../../settings.rst:95 ../../settings.rst:110 ../../settings.rst:136
-#: 7ee367e15d2549a5889dee6f67f9d5bf 8befd4f04dcf4f638e6a50972cf62f0e
-#: c5a4d3b37cd94412a6f37c8ad0dae8e1
+#: ../../settings.rst:96 ../../settings.rst:114 ../../settings.rst:142
+#: 39c5fe892d10473ea765dfd16aa70b29 bcb1712b6ed142d6b8db0d06f30dc902
 msgid "Example::"
 msgstr "例子："
 
-#: ../../settings.rst:101 b188b54ab9bf46898663261c6b0bdbf9
+#: ../../settings.rst:100 ../../settings.rst:146
+#: f0fd9392aa0544248ae3ecfa505cbd50
+msgid "The default is ``[]``."
+msgstr "默认为 ``[]`` 。"
+
+#: ../../settings.rst:104 47a64611cf2f4e6b85543040b8221d3a
+#, python-brace-format
 msgid ""
 "A dictionary of custom Jinja2 environment variables you want to use. This"
 " also includes a list of extensions you may want to include. See `Jinja "
-"Environment documentation`_."
-msgstr "一个字典，用于您想要用的自定义的Jinja2环境变量。这其中也包含了要使用的扩展列表。详见 `Jinja环境文档`_ "
+"Environment documentation`_. The default is ``{'extensions': [], "
+"'trim_blocks': True, 'lstrip_blocks': True}``."
+msgstr "一个字典，用于配置自定义Jinja2环境变量。这其中也包含了要使用的扩展列表。详见 `Jinja环境文档`_ 。"
+"本项设置默认为 ``{'extensions': [], 'trim_blocks': True, 'lstrip_blocks': True}`` 。"
 
-#: ../../settings.rst:107 57cdaaf600bf4c2aa461094e99584b54
+#: ../../settings.rst:111 b0e2be83c4684482a75198372a093d96
 msgid ""
 "A dictionary of custom Jinja2 filters you want to use.  The dictionary "
 "should map the filtername to the filter function."
 msgstr "一个字典，存放自定义的Jinja2过滤器。此字典中应该是过滤器名称到过滤器函数的映射。"
 
-#: ../../settings.rst:118 31c28dcad1a2433784678692606c7407
-msgid "See: `Jinja custom filters documentation`_."
-msgstr "详见： `Jinja自定义过滤器文档`_ 。"
+#: ../../settings.rst:122 7e0e43b081f94e5dbe72072f2dc251e2
+#, python-brace-format
+msgid "See: `Jinja custom filters documentation`_. The default is ``{}``."
+msgstr "详见： `Jinja自定义过滤器文档`_ 。本项设置默认为 ``{}`` 。"
 
-#: ../../settings.rst:122 33098b212ebb4c769d9a7e8e35e22f71
+#: ../../settings.rst:126 b0ec3d780aaf4daf95b134faba512564
+#, python-brace-format
 msgid ""
 "A dictionary of custom objects to map into the Jinja2 global environment "
 "namespace. The dictionary should map the global name to the global "
-"variable/function. See: `Jinja global namespace documentation`_."
+"variable/function. See: `Jinja global namespace documentation`_. The "
+"default is ``{}``."
 msgstr ""
 "一个字典，可以将自定义对象映射到Jinja2的全局环境命名空间中。字典中应该是全局名称到全局变量/函数的映射。详见： "
-"`Jinja全局命名空间文档`_ 。"
+"`Jinja全局命名空间文档`_ 。本项设置默认为 ``{}`` 。"
 
-#: ../../settings.rst:128 9d07d4c867f644dbad534da8c17805eb
+#: ../../settings.rst:133 8ef1787d5b3f4a9fa1111027f183fd4f
+#, python-brace-format
 msgid ""
 "A dictionary of custom Jinja2 tests you want to use. The dictionary "
 "should map test names to test functions. See: `Jinja custom tests "
-"documentation`_."
+"documentation`_. The default is ``{}``."
 msgstr "一个字典，自定义了要使用的Jinja测试。字典中应该是测试名到测试函数的映射。详见： `Jinja自定义测试文档`_ 。"
+"本项设置默认为 ``{}`` 。"
 
-#: ../../settings.rst:133 68fca89155b84571bf16ccc9e2d4d2f2
+#: ../../settings.rst:139 06c6769420a744ea9fc27fc3e930bfcb
 msgid ""
 "A list of tuples containing the logging level (up to ``warning``) and the"
 " message to be ignored."
 msgstr "一个以元组为元素的列表，元组中包含日志等级（最高到 ``warning``）和要忽略的消息。"
 
-#: ../../settings.rst:142 2052888dbd6c4eb58148d383c23e6670
+#: ../../settings.rst:150 4234d5d045444f60a42af4d6a76f2de9
 msgid ""
 "A dictionary of file extensions / Reader classes for Pelican to process "
 "or ignore."
 msgstr "一个字典，记录了文件扩展名到Reader类的映射。可以据此让Pelican按照指定规则处理或忽略某些文件。"
 
-#: ../../settings.rst:145 5f70a62f7360438eb733791964a66c80
+#: ../../settings.rst:153 bda15a1a6e724557ae9ba779a4d941fd
 msgid "For example, to avoid processing .html files, set::"
 msgstr "例如，下面的配置可以让Pelican忽略 .html的文件不处理："
 
-#: ../../settings.rst:149 2d665ed99679489fb6a06fbd30754d6b
+#: ../../settings.rst:157 07c385958bf648868271075a146da55d
 msgid "To add a custom reader for the ``foo`` extension, set::"
 msgstr "为扩展名为 ``foo`` 的文件添加自定义的reader："
 
-#: ../../settings.rst:155 726d7ea5aa2540139b82d68adf424a99
-msgid ""
-"A list of glob patterns.  Files and directories matching any of these "
-"patterns will be ignored by the processor. For example, the default "
-"``['.#*']`` will ignore emacs lock files, and ``['__pycache__']`` would "
-"ignore Python 3's bytecode caches."
-msgstr ""
-"通配符模式的列表。任何匹配上的文件和目录都会被忽略。例如，默认的 ``['.#*']`` 可以忽略emacs的锁定文件，  "
-"``['__pycache__']`` 则可以忽略Python3的字节码缓存文件。"
+#: ../../settings.rst:161 ../../settings.rst:810 ../../settings.rst:861
+#: ../../settings.rst:955 f0fd9392aa0544248ae3ecfa505cbd50
+#, python-brace-format
+msgid "The default is ``{}``."
+msgstr "默认为 ``{}`` 。"
 
-#: ../../settings.rst:162 39fdbf56f4314015b8c61c7473b7046f
+#: ../../settings.rst:165 ebc561b14759445386bb22e0318ae6de
+msgid ""
+"A list of Unix glob patterns. Files and directories matching any of these"
+" patterns or any of the commonly hidden files and directories set by "
+"``watchfiles.DefaultFilter`` will be ignored by the processor. For "
+"example, the default ``['**/.*']`` will ignore \"hidden\" files and "
+"directories, and ``['__pycache__']`` would ignore Python 3's bytecode "
+"caches."
+msgstr ""
+"通配符模式的列表。匹配到其中任一个模式，或是 ``watchfiles.DefaultFilter`` 中设置了隐藏的文件和目录都会被忽略。"
+"例如，默认的 ``['**/.*']`` 可以用于忽略任何隐藏文件与目录， ``['__pycache__']`` 则可以忽略Python3的字节码缓存文件。"
+
+#: ../../settings.rst:171 6d3691b43e9741bd97f11cf56ddd89ff
+msgid ""
+"For a full list of the commonly hidden files set by "
+"``watchfiles.DefaultFilter``, please refer to the `watchfiles "
+"documentation`_."
+msgstr "请参阅 `watchfiles文档`_ 以获取 ``watchfiles.DefaultFilter`` 中设置常见隐藏文件的完整列表"
+
+#: ../../settings.rst:174 f0fd9392aa0544248ae3ecfa505cbd50
+msgid "The default is ``['**/.*']``."
+msgstr "默认为 ``['**/.*']`` 。"
+
+#: ../../settings.rst:178 43597f10c7444144a4bffed8b2a29b41
 msgid ""
 "Extra configuration settings for the Markdown processor. Refer to the "
 "Python Markdown documentation's `Options section <https://python-"
@@ -237,82 +271,88 @@ msgstr ""
 "markdown.github.io/reference/#markdown>`_ ，查看可用选项的完整列表。其中的 "
 "``extensions_configs`` 选项会用于自动计算 ``extensions`` 选项。"
 
-#: ../../settings.rst:168 bcabc42f8a1143f28d39d928a84e5c80
-msgid "Defaults to::"
+#: ../../settings.rst:184 f0fd9392aa0544248ae3ecfa505cbd50
+msgid "The default is::"
 msgstr "默认值为："
 
-#: ../../settings.rst:180 dfb5d9dcf9034218a44c38fa5d94b6e4
+#: ../../settings.rst:196 38d0b586c896439aa13c04c9555d9a4b
 msgid ""
 "The dictionary defined in your settings file will replace this default "
 "one."
 msgstr "配置文件中的字典会覆盖默认设置。"
 
-#: ../../settings.rst:185 57124bf26ff24273a9fda76782a551e0
+#: ../../settings.rst:201 d6295ff5c7a345b2b9eb5f365fc5db8c
 msgid ""
 "Where to output the generated files. This should correspond to your web "
 "server's virtual host root directory."
 msgstr "输出生成文件的位置。此项配置应该和web服务器虚拟主机的根目录有关。"
 
-#: ../../settings.rst:190 61cce052ae5549f98e48a9da9548b1d4
+#: ../../settings.rst:204 f0fd9392aa0544248ae3ecfa505cbd50
+msgid "The default is ``'output'``."
+msgstr "默认为 ``'output'`` 。"
+
+#: ../../settings.rst:208 1da4adc27e65428b8178929389a8ca72
 msgid ""
 "Path to content directory to be processed by Pelican. If undefined, and "
 "content path is not specified via an argument to the ``pelican`` command,"
-" Pelican will use the current working directory."
+" Pelican will default to ``'.'``, the current working directory."
 msgstr "待Pelican处理的文件目录的路径。如果没有定义，也没有在 ``pelican`` 命令中通过参数指定，Pelican会默认使用当前工作目录。"
 
-#: ../../settings.rst:196 770d207912f24f7b989208ef921d761c
+#: ../../settings.rst:214 2b21399d328a41ba9982c23771f4c281
 msgid ""
 "A list of directories and files to look at for pages, relative to "
-"``PATH``."
-msgstr "此列表中的目录和文件会被视为页面，路径是相对于 ``PATH`` 的。"
+"``PATH``. The default is ``['pages']``."
+msgstr "此列表中的目录和文件会被视为页面，路径是相对于 ``PATH`` 的。本项配置默认为 ``['pages']`` 。"
 
-#: ../../settings.rst:200 6c39a2bdec444b59b7564f15c161483e
+#: ../../settings.rst:219 c456260766774bcab50850fa7e4f9cf8
 msgid ""
 "A list of directories to exclude when looking for pages in addition to "
-"``ARTICLE_PATHS``."
-msgstr "除了 ``ARTICLE_PATHS`` 中的文件不会被视为页面外，此选项中也可指定不被视为页面的文件目录。"
+"``ARTICLE_PATHS``. The default is ``[]``."
+msgstr "除了 ``ARTICLE_PATHS`` 中的文件不会被视为页面外，此选项中也可指定不被视为页面的文件目录。本项配置默认为 ``[]`` 。"
 
-#: ../../settings.rst:205 ec472b45d27448538a216960335cede9
+#: ../../settings.rst:224 7d1515dd32ea4eb3bc0b621ef7cd0c2b
 msgid ""
 "A list of directories and files to look at for articles, relative to "
-"``PATH``."
-msgstr "此列表中的目录和文件会被视为文章，路径是相对于 ``PATH`` 的。"
+"``PATH``. The default is ``['']``."
+msgstr "此列表中的目录和文件会被视为文章，路径是相对于 ``PATH`` 的。本项配置默认为 ``['']`` 。"
 
-#: ../../settings.rst:210 7d45d3e60d0c4c0e8c75fafc6ee0bf1a
+#: ../../settings.rst:229 562736e3c91442bbb062e85e63d6f1f9
 msgid ""
 "A list of directories to exclude when looking for articles in addition to"
-" ``PAGE_PATHS``."
-msgstr "除了 ``PAGE_PATHS`` 中的文件不会被视为文章外，此选项中也可指定不被视为文章的文件目录。"
+" ``PAGE_PATHS``. The default is ``[]``."
+msgstr "除了 ``PAGE_PATHS`` 中的文件不会被视为文章外，此选项中也可指定不被视为文章的文件目录。本项配置默认为 ``[]`` 。"
 
-#: ../../settings.rst:215 4b3fb145ed814ff49262ce0ad20f711a
+#: ../../settings.rst:234 ea5874e71eb941a2b37262eb9cb398bf
 msgid ""
 "Set to True if you want to copy the articles and pages in their original "
 "format (e.g. Markdown or reStructuredText) to the specified "
-"``OUTPUT_PATH``."
+"``OUTPUT_PATH``. The default is ``False``."
 msgstr ""
 "如果你想要将文章和页面以源格式（例如Markdown或reStructuredText）复制一份到 ``OUTPUT_PATH`` "
-"目录中，就将此项设为True。"
+"目录中，就将此项设为True。本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:220 4da18483b371405facd124c3e345594c
+#: ../../settings.rst:240 30108efdc87c48368c035774372eb8f1
 msgid ""
 "Controls the extension that will be used by the SourcesGenerator.  "
 "Defaults to ``.text``. If not a valid string the default value will be "
-"used."
-msgstr "控制会被SourcesGenerator使用的扩展名。默认为 ``.text`` 。如果设置的值是无效的，会使用默认值。"
+"used. The default is ``'.text'``."
+msgstr "控制SourcesGenerator使用的扩展名。默认为 ``.text`` 。如果设置的值是无效的，会使用默认值。本项配置默认为 ``'.text'`` 。"
 
-#: ../../settings.rst:225 86076613fd6d438ab908d53be5422f06
-msgid "The list of plugins to load. See :ref:`plugins`."
-msgstr "要加载的插件列表。详见 :ref:`插件<plugins>` 。"
+#: ../../settings.rst:246 5763cdeffac14fb4a4403b534251e8e2
+msgid "The list of plugins to load. See :ref:`plugins`. The default is ``None``."
+msgstr "要加载的插件列表。详见 :ref:`插件<plugins>` 。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:229 208cbbef07c742a3906f604c97a4d332
-msgid "A list of directories where to look for plugins. See :ref:`plugins`."
-msgstr "查找插件的目录列表。详见 :ref:`插件<plugins>` 。"
+#: ../../settings.rst:250 8f081da9abd648a0b029262e50bb5834
+msgid ""
+"A list of directories where to look for plugins. See :ref:`plugins`. The "
+"default is ``[]``."
+msgstr "查找插件的目录列表。详见 :ref:`插件<plugins>` 。本项配置默认为 ``[]`` 。"
 
-#: ../../settings.rst:233 265efbdef95744759fea79fd41a4003f
-msgid "Your site name"
-msgstr "站点名称"
+#: ../../settings.rst:255 4a0df17e21714b569b3beef92153bc9c
+msgid "Your site's name. The default is ``'A Pelican Blog'``."
+msgstr "站点名称。默认为 ``'A Pelican Blog'`` 。"
 
-#: ../../settings.rst:237 d57d6f99c06b4776b31acc033c97f67b
+#: ../../settings.rst:259 a2a835e1c3804bdaa57c834e117f5b2e
 msgid ""
 "Base URL of your web site. Not defined by default, so it is best to "
 "specify your SITEURL; if you do not, feeds will not be generated with "
@@ -325,23 +365,29 @@ msgstr ""
 " ``https://`` 开头；否则使用 ``http://`` 即可。在协议后面接着就是域名，不要以斜杠结尾。一个例子： ``SITEURL "
 "= 'https://example.com'`` "
 
-#: ../../settings.rst:246 d4dd07a95a904806812b20ff3ec3049b
+#: ../../settings.rst:266 72e916aee6f143cd82a15c0c84b2bd73
+msgid "The default is ``''``, the blank string."
+msgstr "默认为 ``''`` ，即空字符串。"
+
+#: ../../settings.rst:270 af6a95fa0a79465287831e83c66b6eb0
 msgid ""
 "A list of directories (relative to ``PATH``) in which to look for static "
 "files. Such files will be copied to the output directory without "
 "modification. Articles, pages, and other content source files will "
 "normally be skipped, so it is safe for a directory to appear both here "
 "and in ``PAGE_PATHS`` or ``ARTICLE_PATHS``.  Pelican's default settings "
-"include the \"images\" directory here."
+"include the \"images\" directory here. The default is ``['images']``."
 msgstr ""
-"用于查找静态文件的目录列表。静态文件会原封不动地拷贝到输出目录中。文章、页面以及其他的内容源文件都会被跳过，因此一个目录可以安全地同时出现在此选项以及"
-" ``PAGE_PATHS`` 或 ``ARTICLE_PATHS`` 中。Pelican默认会将 \"images\" 目录包含在此选项中。"
+"用于查找静态文件的目录列表（相对于 ``PATH`` 目录）。静态文件会原封不动地拷贝到输出目录中。文章、页面以及其他的内容源文件都会被跳过，因此一个目录可以安全地同时出现在此选项以及"
+" ``PAGE_PATHS`` 或 ``ARTICLE_PATHS`` 中。Pelican默认会将 \"images\" 目录包含在此选项中。本项配置默认为 ``['images']`` 。"
 
-#: ../../settings.rst:255 fc85f34c9d9640f48e0c739cc2787847
-msgid "A list of directories to exclude when looking for static files."
-msgstr "此选项列表中的目录都会在搜索静态文件时排除在外。"
+#: ../../settings.rst:279 562736e3c91442bbb062e85e63d6f1f9
+msgid ""
+"A list of directories to exclude when looking for static files. The "
+"default is ``[]``."
+msgstr "此选项列表中的目录都会在搜索静态文件时排除在外。本项配置默认为 ``[]`` 。"
 
-#: ../../settings.rst:259 ff6eb957bf36419d8a6a376d3232c117
+#: ../../settings.rst:284 92849777e12b448898dba49e9799484b
 msgid ""
 "If set to False, content source files will not be skipped when copying "
 "files found in ``STATIC_PATHS``. This setting is for backward "
@@ -349,53 +395,65 @@ msgid ""
 " unless ``STATIC_PATHS`` contains a directory that is also in "
 "``ARTICLE_PATHS`` or ``PAGE_PATHS``. If you are trying to publish your "
 "site's source files, consider using the ``OUTPUT_SOURCES`` setting "
-"instead."
+"instead. The default is ``True``."
 msgstr ""
 "如果此选项设为False， ``STATIC_PATHS`` "
 "中的内容源文件将不会被忽略，也会像静态文件一样被原封不动地拷贝。此项设置是为了给3.5版本前的Pelican进行向后兼容的。若某个目录同时出现在了"
 " ``STATIC_PATHS`` 和 ``ARTICLE_PATHS`` 中，或 ``STATIC_PATHS`` 和 "
-"``PAGE_PATHS`` 中时才会生效。如果你是想将站点的源文件发布出去的话，请考虑使用 ``OUTPUT_SOURCES`` 设置。"
+"``PAGE_PATHS`` 中时才会生效。如果你是想将站点的源文件发布出去的话，请考虑使用 ``OUTPUT_SOURCES`` 。本项配置默认为 ``True`` 。"
 
-#: ../../settings.rst:268 bf1a395929034faca5de2bf94514f5e3
+#: ../../settings.rst:294 a4a2ef0dfd6442fb889bf9bfe33688
 msgid ""
 "Create links instead of copying files. If the content and output "
 "directories are on the same device, then create hard links.  Falls back "
 "to symbolic links if the output directory is on a different filesystem. "
 "If symlinks are created, don't forget to add the ``-L`` or ``--copy-"
-"links`` option to rsync when uploading your site."
+"links`` option to rsync when uploading your site. The default is "
+"``False``."
 msgstr ""
 "为静态文件创建链接而不是复制文件本身。如果内容和输出目录位于同一设备上，则创建硬链接；如果输出目录位于不同的文件系统上，则回退至符号链接。若创建了符号链接，使用rsync上传网站时需要添加-L或"
-"--copy-links选项。"
+"--copy-links选项。本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:276 c1931f5e9644460bb528a831fdd41a59
+#: ../../settings.rst:302 8c6ff3cd170444dc9e9411e43bbcffdd
 msgid ""
 "If set to ``True``, and ``STATIC_CREATE_LINKS`` is ``False``, compare "
 "mtimes of content and output files, and only copy content files that are "
-"newer than existing output files."
+"newer than existing output files. The default is ``False``."
 msgstr ""
 "当此项设为 ``True`` 且 ``STATIC_CREATE_LINKS`` 设为 ``False`` "
-"时才会生效，此时会比较mtime，只有在当前文件更新时才会执行拷贝。"
+"时才会生效，此时会比较mtime，只有在当前文件更新时才会执行拷贝。本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:282 60d680a3b3f44bd6b4461c92057e4471
+#: ../../settings.rst:308 b26c548f490f45f9bbe95ee6b12fd306
 msgid ""
-"If set to True, several typographical improvements will be incorporated "
-"into the generated HTML via the `Typogrify "
+"If set to ``True``, several typographical improvements will be "
+"incorporated into the generated HTML via the `Typogrify "
 "<https://pypi.org/project/typogrify/>`_ library, which can be installed "
-"via: ``python -m pip install typogrify``"
+"via: ``python -m pip install typogrify``. The default is ``False``."
 msgstr ""
 "若此项设置为True，一些显示上的改进将通过 `Typogrify <https://pypi.org/project/typogrify/>`_"
-" 库合并到生成的HTML中。可以通过 ``python -m pip install typogrify`` 进行安装。"
+" 库合并到生成的HTML中。可以通过 ``python -m pip install typogrify`` 进行安装。本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:289 db77faf7956845d1a2d4ff9150138017
+#: ../../settings.rst:315 f4a976dc583346eebd71cedbbd43839c
 msgid ""
 "A list of tags for Typogrify to ignore. By default Typogrify will ignore "
 "``pre`` and ``code`` tags. This requires that Typogrify version 2.0.4 or "
-"later is installed"
+"later is installed. The default is ``[]``."
 msgstr ""
 "指定Typogrify要忽略的标签列表。默认情况下，Typogrify将忽略 ``pre`` 和 ``code`` "
-"标签此项特性需要安装高于2.0.4版本的Typogrify。"
+"标签此项特性需要安装高于2.0.4版本的Typogrify。。本项配置默认为 ``[]`` 。"
 
-#: ../../settings.rst:295 8fddf3800e844a189677f113252bee04
+#: ../../settings.rst:321 b40b1e64ddc344bfa9451e3e51e397df
+msgid ""
+"A list of Typogrify filters to skip. Allowed values are: ``'amp'``, "
+"``'smartypants'``, ``'caps'``, ``'initial_quotes'``, ``'widont'``. By "
+"default, no filter is omitted (in other words, all filters get applied). "
+"This setting requires that Typogrify version 2.1.0 or later is installed."
+" The default is ``[]``."
+msgstr "要忽略的Typogrify过滤器列表。可用值包括： ``'amp'`` 、 ``'smartypants'`` 、 ``'caps'`` 、 "
+"``'initial_quotes'`` 、 ``'widont'`` 。默认不忽略任何过滤器。本项配置需要2.1.0或以上版本的Typogrify。"
+"本项配置默认为 ``[]`` 。"
+
+#: ../../settings.rst:329 8b9d3479e18c407090a4aac6a1dcafdf
 msgid ""
 "This setting controls how Typogrify sets up the Smartypants filter to "
 "interpret multiple dash/hyphen/minus characters. A single ASCII dash "
@@ -404,132 +462,147 @@ msgid ""
 "The ``oldschool`` setting renders both en-dashes and em-dashes when it "
 "sees two (``--``) and three (``---``) hyphen characters, respectively. "
 "The ``oldschool_inverted`` setting turns two hyphens into an em-dash and "
-"three hyphens into an en-dash."
+"three hyphens into an en-dash. The default is ``'default'``."
 msgstr ""
 "此设置用于设置Typogrify的Smartypants过滤器，控制过滤器如何解析多个破折号/连字符/减号。单个ASCII破折号字符 "
 "(``-``) 始终被视为连字符。设为 ``default`` 时不处理短破折号，并会将双连字符转换为长破折号；设为 ``oldschool`` "
 "时会将两个 ( ``--`` ) 和三个 ( ``--`` ) 连字符分别呈现为短破折号和长破折号；设为 "
-"``oldschool_inverted`` 时则会将两个连字符转换为长破折号，而将三个连字符转换为短破折号。"
+"``oldschool_inverted`` 时则会将两个连字符转换为长破折号，而将三个连字符转换为短破折号。本项配置默认为 ``'default'`` "
 
-#: ../../settings.rst:306 c110b209965c448c8e3ca4109edfa0d6
+#: ../../settings.rst:340 44489695c0bb4c75ba04e6d23b17a6b7
 msgid ""
 "When creating a short summary of an article, this will be the default "
 "length (measured in words) of the text created.  This only applies if "
 "your content does not otherwise specify a summary. Setting to ``None`` "
-"will cause the summary to be a copy of the original content."
+"will cause the summary to be a copy of the original content. The default "
+"is ``50``."
 msgstr ""
-"当未给文章或页面书写摘要时，会自动创建摘要，此设置指定了默认创建摘要的长度"
-"（以字/词为单位）。若将此项设为 ``None`` ，摘要会和原始内容一模一样。"
+"当未给文章或页面书写摘要时，会自动创建摘要，此设置指定了默认创建摘要的长度（以字/词为单位）。若将此项设为 ``None`` "
+"，摘要会和原始内容一模一样。本项配置默认为 ``50`` 。"
 
-#: ../../settings.rst:313 9d446d0be4d248e1b5ef7f5df1977310
+#: ../../settings.rst:347 aad4656b1b5441f588931776445fb4cf
 msgid ""
 "When creating a short summary of an article, this will be the number of "
 "paragraphs to use as the summary. This only applies if your content does "
 "not otherwise specify a summary. Setting to ``None`` will cause the "
 "summary to use the whole text (up to ``SUMMARY_MAX_LENGTH``) instead of "
-"just the first N paragraphs."
+"just the first N paragraphs. The default is ``None``."
 msgstr ""
-"当未给文章或页面书写摘要时，会自动创建摘要。此设置指定了默认创建摘要的段落数，"
-"即将正文的前N段视为摘要。若将此项设为 ``None`` ，摘要会和原始内容一模一样，"
-"但具体还会遵循 ``SUMMARY_MAX_LENGTH`` 。"
+"当未给文章或页面书写摘要时，会自动创建摘要。此设置指定了默认创建摘要的段落数，即将正文的前N段视为摘要。若将此项设为 ``None`` "
+"，摘要会和原始内容一模一样，但具体还会遵循 ``SUMMARY_MAX_LENGTH`` 。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:321 6a04572678864a959a48dc83f4e78465
+#: ../../settings.rst:355 469780be0d8144f0bfe4fc7c475e11cb
 msgid ""
 "When creating a short summary of an article and the result was truncated "
 "to match the required word length, this will be used as the truncation "
-"suffix."
-msgstr "在创建摘要时，若内容因长度被截断，此项设置值将用作截断的结尾。"
+"suffix. The default is ``'…'``."
+msgstr "在创建摘要时，若内容因长度被截断，此项设置值将用作截断的结尾。本项配置默认为 ``'…'`` 。"
 
-#: ../../settings.rst:326 df2e4e17f0de4d5b97f282fb9a73c57d
+#: ../../settings.rst:361 11e86cf295024b67a50156da38d62043
 msgid ""
 "If disabled, content with dates in the future will get a default status "
-"of ``draft``. See :ref:`reading_only_modified_content` for caveats."
+"of ``draft``. See :ref:`reading_only_modified_content` for caveats. The "
+"default is ``True``."
 msgstr ""
 "若此项设为False，带了未来日期的文章或页面的状态都会设为 ``draft`` 。相关注意事项详见 "
-":ref:`reading_only_modified_content` 。"
+":ref:`reading_only_modified_content` 。本项配置默认为 ``True`` 。"
 
-#: ../../settings.rst:331 32787a794f534c759cdff64b48f3d4f0
+#: ../../settings.rst:367 c29c4ca7127741d49a164b7dff038232
+#, python-brace-format
 msgid ""
 "Regular expression that is used to parse internal links. Default syntax "
 "when linking to internal files, tags, etc., is to enclose the identifier,"
 " say ``filename``, in ``{}`` or ``||``. Identifier between ``{`` and "
 "``}`` goes into the ``what`` capturing group.  For details see :ref:`ref-"
-"linking-to-internal-content`."
+"linking-to-internal-content`. The default is ``'[{|](?P<what>.*?)[|}]'``."
 msgstr ""
 "用于解析内部链接的正则表达式。链接到内部文件、标签等时的默认语法是将标识符（例如 ``filename`` ）括在 ``{}`` 或 ``||``"
 " 中。 ``{`` 和 ``}`` 之间的则进入 ``what`` 捕获组。更多详情请参见 :ref:`ref-linking-to-"
-"internal-content` 。"
+"internal-content` 。本项配置默认为 ``'[{|](?P<what>.*?)[|}]'`` 。"
 
-#: ../../settings.rst:339 58a95b3645534c8fa0d30d0e237f3d42
+#: ../../settings.rst:376 a74ea9d0899541e78d3a997b8f481ad6
+#, python-brace-format
 msgid ""
 "A list of default Pygments settings for your reStructuredText code "
 "blocks. See :ref:`internal_pygments_options` for a list of supported "
-"options."
+"options. The default is ``{}``."
 msgstr ""
-"reStructuredText代码块的默认Pygments设置列表。有关受支持选项的列表，请参阅 "
-":ref:`internal_pygments_options` 。"
+"reStructuredText代码块的默认Pygments设置列表。请参阅 "
+":ref:`internal_pygments_options` 查看支持选项列表。本项配置默认为 ``{}`` 。"
 
-#: ../../settings.rst:344 8086dcfa7a7c41dca8ad4c3bfca3f627
+#: ../../settings.rst:382 aa2425b88dea4351bf184f127a5965de
 msgid ""
 "If ``True``, saves content in caches.  See "
-":ref:`reading_only_modified_content` for details about caching."
+":ref:`reading_only_modified_content` for details about caching. The "
+"default is ``False``."
 msgstr "若设为 ``True`` ，会将内容保存在缓存中。有关缓存请参阅 :ref:`reading_only_modified_content` 。"
+"本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:349 2ed178f518144b649b73718f9238b54b
+#: ../../settings.rst:388 fe1ca91d569e4c2584b0dd3907761f40
 msgid ""
 "If set to ``'reader'``, save only the raw content and metadata returned "
-"by readers. If set to ``'generator'``, save processed content objects."
+"by readers. If set to ``'generator'``, save processed content objects. "
+"The default is ``'reader'``."
 msgstr "若设为 ``reader`` ，则只保存reader返回的原始内容和元数据。若设为 ``generator`` ，则保存处理过的内容对象。"
+"本项配置默认为 ``'reader'`` 。"
 
-#: ../../settings.rst:354 202ee8f7b97949909b28648926f42215
-msgid "Directory in which to store cache files."
-msgstr "指定存储缓存文件的目录。"
+#: ../../settings.rst:394 9fc3e0a091d0493cb1172bb1c3bde79d
+msgid "Directory in which to store cache files. The default is ``'cache'``."
+msgstr "指定存储缓存文件的目录。本项配置默认为 ``'cache'`` 。"
 
-#: ../../settings.rst:358 c4c1793569284f8aa087727d2cac0e4f
-msgid "If ``True``, use gzip to (de)compress the cache files."
-msgstr "若设为 ``True`` ，则使用gzip对缓存文件进行解压缩。"
+#: ../../settings.rst:398 e37599cff5684bcc92d1102ccb78ba03
+msgid ""
+"If ``True``, use gzip to (de)compress the cache files. The default is "
+"``True``."
+msgstr "若设为 ``True`` ，则使用gzip对缓存文件进行解压缩。本项配置默认为 ``True`` 。"
 
-#: ../../settings.rst:362 3d8bcb7fb9fc4e0883de376634b5f443
+#: ../../settings.rst:403 c6735c207785406f93dbd6c85c1e7331
 msgid "Controls how files are checked for modifications."
 msgstr "调整判定文件是否修改的方式"
 
-#: ../../settings.rst:364 ../../settings.rst:1364
-#: ded4e8033f904545a9ed73fe4b5f5912
+#: ../../settings.rst:405 ../../settings.rst:1448
+#: 18648953d9c040c8bd0b98d212509bbf
 msgid "If set to ``'mtime'``, the modification time of the file is checked."
 msgstr "若设为 ``mtime`` ，则检查文件的修改时间。"
 
-#: ../../settings.rst:366 ../../settings.rst:1366
-#: 4e96ee3515e540ba828b8a80328ff700
+#: ../../settings.rst:407 ../../settings.rst:1450
+#: e5596360b86d44ef81b01bb259b4b189
 msgid ""
 "If set to a name of a function provided by the ``hashlib`` module, e.g. "
 "``'md5'``, the file hash is checked."
 msgstr "若设为 ``hashlib`` 库中提供的方法名，例如 ``md5`` ，则会检查文件的哈希值。"
 
-#: ../../settings.rst:371 2a66a13f76854ae794911f0c4d3fcffd
-msgid "If ``True``, load unmodified content from caches."
-msgstr "若设为 ``True`` ，则会从缓存中加载未修改的内容。"
+#: ../../settings.rst:410 f0fd9392aa0544248ae3ecfa505cbd50
+msgid "The default is ``'mtime'``."
+msgstr "默认为 ``'mtime'`` 。"
 
-#: ../../settings.rst:375 eea621ea4a5344069cd4c2cf40b3a953
+#: ../../settings.rst:414 f9de4ce8f2534da6b6318522dd749cef
+msgid ""
+"If ``True``, load unmodified content from caches. The default is "
+"``False``."
+msgstr "若设为 ``True`` ，则会从缓存中加载未修改的内容。本项配置默认为 ``False`` 。"
+
+#: ../../settings.rst:418 48308a306f9c41f0b95ce62120a4c64b
 msgid ""
 "A list of metadata fields containing reST/Markdown content to be parsed "
-"and translated to HTML."
-msgstr "元数据的列表，此列表中的元数据会被解析为HTML。"
+"and translated to HTML. The default is ``['summary']``."
+msgstr "元数据的列表，此列表中的元数据会被解析为HTML。本项配置默认为 ``['summary']`` 。"
 
-#: ../../settings.rst:380 8760f989d6ab474d987830631e1eca56
+#: ../../settings.rst:423 43cbc9a1d76d4d698f9c0e4013ec47d8
 msgid ""
 "The TCP port to serve content from the output folder via HTTP when "
-"pelican is run with --listen"
-msgstr "使用--listen运行pelican时，会在此选项指定的TCP端口上以HTTP提供内容。"
+"pelican is run with ``--listen``. The default is ``8000``."
+msgstr "使用--listen运行pelican时，会在此选项指定的TCP端口上以HTTP提供内容。本项配置默认为 ``8000`` 。"
 
-#: ../../settings.rst:385 ea445f6d17204bd8b7f73803aa27a4a8
-msgid "The IP to which to bind the HTTP server."
-msgstr "需要和HTTP服务器绑定的IP地址。"
+#: ../../settings.rst:428 ad5bd958c68f45f8b031fe61c19baa46
+msgid "The IP to which to bind the HTTP server. The default is ``'127.0.0.1'``."
+msgstr "需要和HTTP服务器绑定的IP地址。本项配置默认为 ``'127.0.0.1'`` 。"
 
-#: ../../settings.rst:390 3b524d176da047c091f2769c156f3484
+#: ../../settings.rst:433 bb37f2124e17422e8d92159261df8891
 msgid "URL settings"
 msgstr "URL设置"
 
-#: ../../settings.rst:392 fc094e521c5646b18a62975847740ce7
+#: ../../settings.rst:435 b8f09390ffb0493c87f475f214133b2d
 msgid ""
 "The first thing to understand is that there are currently two supported "
 "methods for URL formation: *relative* and *absolute*. Relative URLs are "
@@ -546,7 +619,8 @@ msgstr ""
 " ``pelican-quickstart`` 时，就会为本地开发和发布环境分别生成一份配置文件，此脚本在 :doc:`安装Pelican "
 "<install>` 一节中有详细描述。"
 
-#: ../../settings.rst:401 9749e4b4a85f45b28fa7a71d05b9bf9c
+#: ../../settings.rst:444 5c90d0e477da4e37a4b3ae46684e3cb1
+#, python-brace-format
 msgid ""
 "You can customize the URLs and locations where files will be saved. The "
 "``*_URL`` and ``*_SAVE_AS`` variables use Python's format strings. These "
@@ -559,7 +633,8 @@ msgstr ""
 "变量使用Python风格的格式化字符串。你可以利用一些变量将文章放在诸如 ``{slug}/index.html`` 的位置，并且可以以 "
 "``{slug}`` 的形式进行链接，如此可以让URL更加简洁（详见下面的例子）。这些设置可以让你灵活地将文章和页面放在任何你想要的地方。"
 
-#: ../../settings.rst:409 9e5d3f0ff133412b8d47de5fc9489e5f
+#: ../../settings.rst:452 0ca45357c5b74c758e00faefa8f4c0e8
+#, python-brace-format
 msgid ""
 "If a ``*_SAVE_AS`` setting contains a parent directory that doesn't match"
 " the parent directory inside the corresponding ``*_URL`` setting, this "
@@ -569,45 +644,45 @@ msgstr ""
 "如果 ``*_SAVE_AS`` 中包含了不在 ``*_URL`` 中的父目录，会导致Pelican在少数情况下（例如使用 "
 "``{attach}`` 语法时）产生不确定的URL。"
 
-#: ../../settings.rst:414 b2429a00d07341099c3f34b7134f3732
+#: ../../settings.rst:457 b04cc2a7f85f4ba692a703555df3a194
 msgid ""
 "If you don't want that flexibility and instead prefer that your generated"
 " output paths mirror your source content's filesystem path hierarchy, try"
 " the following settings::"
 msgstr "若不希望有这种灵活性，而是希望生成的输出路径保留源内容路径的层次结构，可以尝试以下设置："
 
-#: ../../settings.rst:421 d89d44671c504501a54d3baca12e9017
+#: ../../settings.rst:464 ad7d1e214f2a4d85ae7b1d28e3a164cb
 msgid ""
 "Otherwise, you can use a variety of file metadata attributes within URL-"
 "related settings:"
 msgstr "否则，可以在URL相关设置中可以使用下面的这些元数据属性："
 
-#: ../../settings.rst:424 c97e4acb5b1d4ffda3028b9fdf8b7ed7
+#: ../../settings.rst:467 c4b17402ea72433f9df15ac8b3a1ceb9
 msgid "slug"
 msgstr "slug"
 
-#: ../../settings.rst:425 a5257ea8cb0b430db73f09b337db7a74
+#: ../../settings.rst:468 fad16eab57e94f5f8f69ec1d19752a95
 msgid "date"
 msgstr "date"
 
-#: ../../settings.rst:426 d6aa5650f1f34a0ba162f2fd2bf33182
+#: ../../settings.rst:469 031db5162fbe4ff2a63a482a1574ef3d
 msgid "lang"
 msgstr "lang"
 
-#: ../../settings.rst:427 1fa0d7e3527b46e298468ad129188ca2
+#: ../../settings.rst:470 a4da9aeb8acc4e6eaee3809b7b55cca8
 msgid "author"
 msgstr "author"
 
-#: ../../settings.rst:428 e68b3eeb56304803b7dd56c5c919382d
+#: ../../settings.rst:471 2eb8d928fd324ae2baa8d68c224d8804
 msgid "category"
 msgstr "category"
 
-#: ../../settings.rst:430 ../../settings.rst:565
-#: 663b3feef9aa44208752d6bbe79dbfba
+#: ../../settings.rst:473 ../../settings.rst:616
+#: 9e1b640b50424480b171962702ffdc5f
 msgid "Example usage::"
 msgstr "例如："
 
-#: ../../settings.rst:437 9cdacb3495c84888b48bb6092b7d0111
+#: ../../settings.rst:480 d6a8ebf0d638473eac3819a10923303d
 msgid ""
 "This would save your articles into something like ``/posts/2011/Aug/07"
 "/sample-post/index.html``, save your pages into "
@@ -618,7 +693,7 @@ msgstr ""
 "``/pages/about/index.html`` 的形式存储，对应的URL分别为 ``/posts/2011/Aug/07/sample-"
 "post/`` 与 ``/pages/about/`` 。"
 
-#: ../../settings.rst:443 f7d6af3d02834a689522f5b479aa1d8b
+#: ../../settings.rst:486 5f57f3feaa7f4e778a1d916ff18c1d63
 msgid ""
 "If you specify a ``datetime`` directive, it will be substituted using the"
 " input files' date metadata attribute. If the date is not specified for a"
@@ -628,119 +703,160 @@ msgstr ""
 "如果指定了 ``datetime`` 指令，会使用输入文件的日期元数据进行替换。若没有指定日期，Pelican会根据文件的 ``mtime`` "
 "时间戳替换之。更多信息可以参考 `Python datetime文档`_ 。"
 
-#: ../../settings.rst:453 6165ea3291b444c29b329cb7c1d12efa
+#: ../../settings.rst:496 a82644d4452643c1912f03ab291d6f4b
 msgid ""
 "Defines whether Pelican should use document-relative URLs or not. Only "
 "set this to ``True`` when developing/testing and only if you fully "
-"understand the effect it can have on links/feeds."
+"understand the effect it can have on links/feeds. The default is "
+"``False``."
 msgstr ""
 "定义Pelican是否使用文档间的相对URL。请只在开发或测试时将此项设为 ``True`` "
 "，并且确保你已经明白此项设置对链接与feed的影响。（译者注：当此项为True时，网页之间的链接会使用相对路径表达，例如 ``../my-"
-"article.html`` ）"
+"article.html`` ）。本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:459 ef74181aff694f228072bb8fc114a49c
-msgid "The URL to refer to an article."
-msgstr "文章的URL格式。"
+#: ../../settings.rst:502 08d86196410f482e803c69d85078652a
+#, python-brace-format
+msgid "The URL to refer to an article. The default is ``'{slug}.html'``."
+msgstr "draft状态文章的URL格式。本项配置默认为 ``'{slug}.html'`` 。"
 
-#: ../../settings.rst:463 28debd5a396746ddaa4c5552034c6f5e
-msgid "The place where we will save an article."
-msgstr "文章的存储位置。"
+#: ../../settings.rst:506 13b5dcc285d849999acd612a07d00105
+#, python-brace-format
+msgid "The place where we will save an article. The default is ``'{slug}.html'``."
+msgstr "draft状态文章的存储位置。本项配置默认为 ``'{slug}.html'`` 。"
 
-#: ../../settings.rst:467 a6a8e9c42b1144c0bbe071a0948a7c41
-msgid "The URL to refer to an article which doesn't use the default language."
-msgstr "非默认语言文章的URL格式。"
+#: ../../settings.rst:510 08d86196410f482e803c69d85078652a
+#, python-brace-format
+msgid ""
+"The URL to refer to an article which doesn't use the default language. "
+"The default is ``'{slug}-{lang}.html``."
+msgstr "非默认语言文章的URL格式。本项配置默认为 ``'{slug}-{lang}.html`` 。"
 
-#: ../../settings.rst:471 885589960b054edbac6b5b5ceabf70ba
+#: ../../settings.rst:515 13b5dcc285d849999acd612a07d00105
+#, python-brace-format
 msgid ""
 "The place where we will save an article which doesn't use the default "
-"language."
-msgstr "非默认语言文章的存储位置。"
+"language. The default is ``'{slug}-{lang}.html'``."
+msgstr "非默认语言文章的存储位置。本项配置默认为 ``'{slug}-{lang}.html'`` 。"
 
-#: ../../settings.rst:476 ed30016072a84eab9108c94ef05d72ac
-msgid "The URL to refer to an article draft."
-msgstr "draft状态文章的URL格式。"
+#: ../../settings.rst:520 eb807715a5ce47398b0a9545f2d21c3f
+#, python-brace-format
+msgid ""
+"The URL to refer to an article draft. The default is "
+"``'drafts/{slug}.html'``."
+msgstr "draft状态非默认语言文章的URL格式。本项配置默认为 ``'drafts/{slug}.html'`` 。"
 
-#: ../../settings.rst:480 f1827c2a350e41fb8a29b32ce4f0ce38
-msgid "The place where we will save an article draft."
-msgstr "draft状态文章的存储位置。"
+#: ../../settings.rst:525 b3e2acb8ad31482cacda5244df2b36e1
+#, python-brace-format
+msgid ""
+"The place where we will save an article draft. The default is "
+"``'drafts/{slug}.html'``."
+msgstr "draft状态非默认语言文章的存储位置。本项配置默认为 ``'drafts/{slug}.html'`` 。"
 
-#: ../../settings.rst:484 a73fe74a021e4e1ca7b9d514b05dc709
+#: ../../settings.rst:529 eb807715a5ce47398b0a9545f2d21c3f
+#, python-brace-format
 msgid ""
 "The URL to refer to an article draft which doesn't use the default "
-"language."
-msgstr "draft状态非默认语言文章的URL格式。"
+"language. The default is ``'drafts/{slug}-{lang}.html'``."
+msgstr "draft状态非默认语言文章的URL格式。本项配置默认为 ``'drafts/{slug}-{lang}.html'`` 。"
 
-#: ../../settings.rst:488 9eaa92ef96bc49d3b7a751b88e7d1775
+#: ../../settings.rst:534 b3e2acb8ad31482cacda5244df2b36e1
+#, python-brace-format
 msgid ""
 "The place where we will save an article draft which doesn't use the "
-"default language."
-msgstr "draft状态非默认语言文章的存储位置。"
+"default language. The default is ``'drafts/{slug}-{lang}.html'``."
+msgstr "draft状态非默认语言文章的存储位置。本项配置默认为 ``'drafts/{slug}-{lang}.html'`` 。"
 
-#: ../../settings.rst:493 303454f9d4524fc680dd2092dcb56cb9
-msgid "The URL we will use to link to a page."
-msgstr "页面的URL格式。"
+#: ../../settings.rst:539 6596ed1c997349bf94a503bdaa8b9e68
+#, python-brace-format
+msgid ""
+"The URL we will use to link to a page. The default is "
+"``'pages/{slug}.html'``."
+msgstr "非默认语言页面的URL格式。本项配置默认为 ``'pages/{slug}.html'`` 。"
 
-#: ../../settings.rst:497 afd8b970b616418d84b9e3fd4ab52cb4
+#: ../../settings.rst:544 e837fdc936e54e6a80398382c305606b
+#, python-brace-format
 msgid ""
 "The location we will save the page. This value has to be the same as "
-"PAGE_URL or you need to use a rewrite in your server config."
+"PAGE_URL or you need to use a rewrite in your server config. The default "
+"is ``'pages/{slug}.html'``."
 msgstr "页面的保存位置。除非在服务器上设置了重写规则，否则此项设置必须和PAGE_URL一致。"
+"本项配置默认为 ``'pages/{slug}.html'`` 。"
 
-#: ../../settings.rst:502 311b0f44a40c450da8d5049aef066bed
+#: ../../settings.rst:550 6596ed1c997349bf94a503bdaa8b9e68
+#, python-brace-format
 msgid ""
 "The URL we will use to link to a page which doesn't use the default "
-"language."
-msgstr "非默认语言页面的URL格式。"
+"language. The default is ``'pages/{slug}-{lang}.html'``."
+msgstr "非默认语言页面的URL格式。本项配置默认为 ``'pages/{slug}-{lang}.html'`` 。"
 
-#: ../../settings.rst:507 a6829be9309144cebd8135f7e20f8670
-msgid "The location we will save the page which doesn't use the default language."
-msgstr "非默认语言页面的存储位置。"
+#: ../../settings.rst:555 e837fdc936e54e6a80398382c305606b
+#, python-brace-format
+msgid ""
+"The location we will save the page which doesn't use the default "
+"language. The default is ``'pages/{slug}-{lang}.html'``."
+msgstr "非默认语言页面的存储位置。本项配置默认为 ``'pages/{slug}-{lang}.html'`` 。"
 
-#: ../../settings.rst:511 95a46aad8dd046d096ad55df0777d67b
-msgid "The URL used to link to a page draft."
-msgstr "draft状态页面的URL。"
+#: ../../settings.rst:560 f50ffd4223fe4f1ab65496ddd66531f7
+#, python-brace-format
+msgid ""
+"The URL used to link to a page draft. The default is "
+"``'drafts/pages/{slug}.html'``."
+msgstr "draft状态非默认语言页面的URL格式。本项配置默认为 ``'drafts/pages/{slug}.html'`` 。"
 
-#: ../../settings.rst:515 0036d550e0cc47058e209dcd9cf313b5
-msgid "The actual location a page draft is saved at."
-msgstr "draft状态页面的实际存储位置。"
+#: ../../settings.rst:565 3675c7a1107744f0818c0473c4f0643b
+#, python-brace-format
+msgid ""
+"The actual location a page draft is saved at. The default is "
+"``'drafts/pages/{slug}.html'``."
+msgstr "draft状态非默认语言页面的实际存储位置。本项配置默认为 ``'drafts/pages/{slug}.html'`` 。"
 
-#: ../../settings.rst:519 6f382f91d09b4301b68a38d94312ef21
+#: ../../settings.rst:570 ee417f88ca17494cb0c3c7ec38ba9588
+#, python-brace-format
 msgid ""
 "The URL used to link to a page draft which doesn't use the default "
-"language."
-msgstr "draft状态非默认语言页面的URL格式。"
+"language. The default is ``'drafts/pages/{slug}-{lang}.html'``."
+msgstr "draft状态非默认语言页面的URL格式。本项配置默认为 ``'drafts/pages/{slug}-{lang}.html'`` 。"
 
-#: ../../settings.rst:524 5ef1118bbfa844c5be60d015a8294deb
+#: ../../settings.rst:575 3675c7a1107744f0818c0473c4f0643b
+#, python-brace-format
 msgid ""
 "The actual location a page draft which doesn't use the default language "
-"is saved at."
-msgstr "draft状态非默认语言页面的实际存储位置。"
+"is saved at. The default is ``'drafts/pages/{slug}-{lang}.html'``."
+msgstr "draft状态非默认语言页面的实际存储位置。本项配置默认为 ``'drafts/pages/{slug}-{lang}.html'`` 。"
 
-#: ../../settings.rst:529 4c23c58e9b0341c7a632114822383784
-msgid "The URL to use for an author."
-msgstr "某一个作者的URL格式。"
+#: ../../settings.rst:580 08d86196410f482e803c69d85078652a
+#, python-brace-format
+msgid "The URL to use for an author. The default is ``'author/{slug}.html'``."
+msgstr "此URL用于作者页。本项配置默认为 ``'author/{slug}.html'`` 。"
 
-#: ../../settings.rst:533 26e5bbec4ccf442eb1f2ed5850b10aab
-msgid "The location to save an author."
-msgstr "某一个作者的存储位置。"
+#: ../../settings.rst:584 c4758a4ce8f94850ba4567250259741d
+#, python-brace-format
+msgid "The location to save an author. The default is ``'author/{slug}.html'``."
+msgstr "作者列表的存储位置。本项配置默认为 ``'author/{slug}.html'`` 。"
 
-#: ../../settings.rst:537 1a63d575005147a6a1f506499aea31da
-msgid "The URL to use for a category."
-msgstr "某一个分类的URL格式。"
+#: ../../settings.rst:588 531f7328d8114d868ae245686dd1b85c
+#, python-brace-format
+msgid "The URL to use for a category. The default is ``'category/{slug}.html'``."
+msgstr "此URL用于分类页。本项配置默认为 ``'category/{slug}.html'`` 。"
 
-#: ../../settings.rst:541 aae69f204db3414eb520a6cf2d7b9ee0
-msgid "The location to save a category."
-msgstr "某一个分类的存储位置。"
+#: ../../settings.rst:592 c4758a4ce8f94850ba4567250259741d
+#, python-brace-format
+msgid ""
+"The location to save a category. The default is "
+"``'category/{slug}.html'``."
+msgstr "分类列表的存储位置。本项配置默认为 ``'category/{slug}.html'`` 。"
 
-#: ../../settings.rst:545 c248088861924e30beb1d223ec197ff5
-msgid "The URL to use for a tag."
-msgstr "某一个标签的URL格式。"
+#: ../../settings.rst:596 08d86196410f482e803c69d85078652a
+#, python-brace-format
+msgid "The URL to use for a tag. The default is ``'tag/{slug}.html'``."
+msgstr "此URL用于标签页。本项配置默认为 ``'tag/{slug}.html'`` 。"
 
-#: ../../settings.rst:549 c6f5770301c44f3abb9c105276cb9bd3
-msgid "The location to save the tag page."
-msgstr "某一个标签的存储位置"
+#: ../../settings.rst:600 7a7143a49149452d999c2084cc0266e6
+#, python-brace-format
+msgid "The location to save the tag page. The default is ``'tag/{slug}.html'``."
+msgstr "某一个标签页的存储位置。本项配置默认为 ``'tag/{slug}.html'``"
 
-#: ../../settings.rst:553 9fc1cb3d807d407bbff78d4d3203f8c0
+#: ../../settings.rst:604 a62168ceb2d2448fbcdac62882e42d11
 msgid ""
 "If you do not want one or more of the default pages to be created (e.g., "
 "you are the only author on your site and thus do not need an Authors "
@@ -748,7 +864,7 @@ msgid ""
 "the relevant page from being generated."
 msgstr "如果您不希望创建默认页面（例如你是网站上的唯一作者，因此不需要作者页面），请将相应的 ``*_SAVE_AS`` 设置设置为 ``''`` 。"
 
-#: ../../settings.rst:558 2a4afa6f1db840c69e80199d928c3e9a
+#: ../../settings.rst:609 2478a8d793294eb29adacef7766119bc
 msgid ""
 "Pelican can optionally create per-year, per-month, and per-day archives "
 "of your posts. These secondary archives are disabled by default but are "
@@ -760,7 +876,7 @@ msgstr ""
 "可选的，Pelican可以为帖子创建每年、每月或是每日的归档。除非你为各自的 ``*_SAVE_AS`` "
 "设置了格式化字符串，否则这些归档在默认情况下是关闭的。按时间进行归档更直观地符合web URL的层次模型，也可以让读者更容易按时间顺序浏览帖子。"
 
-#: ../../settings.rst:572 973812c7673a481686350dfca8378df8
+#: ../../settings.rst:623 31eb7d472c40499eaf3bb2680388fead
 msgid ""
 "With these settings, Pelican will create an archive of all your posts for"
 " the year at (for instance) ``posts/2011/index.html`` and an archive of "
@@ -772,7 +888,7 @@ msgstr ""
 "``posts/2011/Aug/index.html`` ）。这两个页面分别通过 ``posts/2011/`` 和 "
 "``posts/2011/Aug/`` 进行访问。"
 
-#: ../../settings.rst:578 e1e1bb5cc26a40a9a62f88ddd10c072a
+#: ../../settings.rst:629 192f00bf9b4d435788b81599c48e0f66
 msgid ""
 "Period archives work best when the final path segment is ``index.html``. "
 "This way a reader can remove a portion of your URL and automatically "
@@ -782,37 +898,43 @@ msgstr ""
 "当路径设置为以 ``index.html`` "
 "结尾时，归档的体验会非常好。读者可以删除URL中的一部分以到达合适时间段的归档，而不需要指定某一个页面的名称。"
 
-#: ../../settings.rst:584 4899822fdcf94a7e8edb0478260181a5
-msgid "The location to save per-year archives of your posts."
-msgstr "年归档的存储位置。"
+#: ../../settings.rst:635 e49118aa81654f33bb3e83703e730ab0
+msgid ""
+"The location to save per-year archives of your posts. The default is "
+"``''``."
+msgstr "年归档的存储位置。本项配置默认为 ``''`` 。"
 
-#: ../../settings.rst:588 eaac63d4c2aa4a0dbfe548b61008edfe
+#: ../../settings.rst:639 531f7328d8114d868ae245686dd1b85c
 msgid ""
 "The URL to use for per-year archives of your posts. You should set this "
-"if you enable per-year archives."
-msgstr "年归档的URL格式，若想要启用年归档，请配置此项。"
+"if you enable per-year archives. The default is ``''``."
+msgstr "年归档的URL格式，若想要启用年归档，请配置此项。本项配置默认为 ``''`` 。"
 
-#: ../../settings.rst:593 376c3ee871c847d7b1072ed0e29c482a
-msgid "The location to save per-month archives of your posts."
-msgstr "月归档的存储位置。"
+#: ../../settings.rst:644 d0c7703c21d9400aa5d6ac77b56fe19e
+msgid ""
+"The location to save per-month archives of your posts. The default is "
+"``''``."
+msgstr "月归档的存储位置。本项配置默认为 ``''`` 。"
 
-#: ../../settings.rst:597 4788e190048c48c181a8aa4b60b86535
+#: ../../settings.rst:649 b078d36e2bba494ca1c87f5902b2bd15
 msgid ""
 "The URL to use for per-month archives of your posts. You should set this "
-"if you enable per-month archives."
-msgstr "月归档的URL格式，若想要启用月归档，请配置此项。"
+"if you enable per-month archives. The default is ``''``."
+msgstr "月归档的URL格式，若想要启用月归档，请配置此项。本项配置默认为 ``''`` 。"
 
-#: ../../settings.rst:602 9e0023d2bb9c43d3bc7bad9bf4b5429c
-msgid "The location to save per-day archives of your posts."
-msgstr "日归档的存储位置。"
+#: ../../settings.rst:654 f75ca583dd6249acad90cdd2417bc047
+msgid ""
+"The location to save per-day archives of your posts. The default is "
+"``''``."
+msgstr "日归档的存储位置。本项配置默认为 ``''`` 。"
 
-#: ../../settings.rst:606 3055e7f7b4af4e87aca8cb560dd0313c
+#: ../../settings.rst:658 d4b75f03113f4e72872002cf10c3ae79
 msgid ""
 "The URL to use for per-day archives of your posts. You should set this if"
-" you enable per-day archives."
-msgstr "日归档的URL格式，若想要启用日归档，请配置此项。"
+" you enable per-day archives. The default is ``''``."
+msgstr "日归档的URL格式，若想要启用日归档，请配置此项。本项配置默认为 ``''`` 。"
 
-#: ../../settings.rst:609 67fdf1f1cf1a497b8c5847fb10d907e1
+#: ../../settings.rst:661 e73bb60a4c2c47ccba854a07265812dc
 msgid ""
 "``DIRECT_TEMPLATES`` work a bit differently than noted above. Only the "
 "``_SAVE_AS`` settings are available, but it is available for any direct "
@@ -821,27 +943,33 @@ msgstr ""
 "``DIRECT_TEMPLATES`` 的工作方式与上面提到的有点不同，在其中可以使用一些特别的直接模板，并且仅在 ``*_SAVE_AS`` "
 "设置中可用。"
 
-#: ../../settings.rst:615 ee557971709e4c8e84085295064a205e
-msgid "The location to save the article archives page."
-msgstr "文章归档页面的存储位置。"
+#: ../../settings.rst:667 c4758a4ce8f94850ba4567250259741d
+msgid ""
+"The location to save the article archives page. The default is "
+"``'archives.html'``."
+msgstr "文章归档页面的存储位置。本项配置默认为 ``'archives.html'`` 。"
 
-#: ../../settings.rst:619 5229274ff3514aa2b3ab5338b22cdea6
-msgid "The location to save the author list."
-msgstr "作者列表的存储位置。"
+#: ../../settings.rst:671 7a7143a49149452d999c2084cc0266e6
+msgid "The location to save the author list. The default is ``'authors.html'``."
+msgstr "作者列表的存储位置。本项配置默认为 ``'authors.html'`` 。"
 
-#: ../../settings.rst:623 560b6eaf36ef4975a5f7503698473e2b
-msgid "The location to save the category list."
-msgstr "分类列表的存储位置。"
+#: ../../settings.rst:675 c4758a4ce8f94850ba4567250259741d
+msgid ""
+"The location to save the category list. The default is "
+"``'categories.html'``."
+msgstr "分类列表的存储位置。本项配置默认为 ``'categories.html'`` 。"
 
-#: ../../settings.rst:627 048f18adc37f4693925f05373a426f26
-msgid "The location to save the tag list."
-msgstr "标签列表的存储位置。"
+#: ../../settings.rst:679 7a7143a49149452d999c2084cc0266e6
+msgid "The location to save the tag list. The default is ``'tags.html'``."
+msgstr "标签列表的存储位置。本项配置默认为 `'tags.html'`` 。"
 
-#: ../../settings.rst:631 ac31a8a0b68d47ed9ec65dc9b8eae2a6
-msgid "The location to save the list of all articles."
-msgstr "所有文章列表的存储位置。"
+#: ../../settings.rst:683 28942938054b490c8dd5ca8367d87ea9
+msgid ""
+"The location to save the list of all articles. The default is "
+"``'index.html'``."
+msgstr "所有文章列表的存储位置。本项配置默认为 ``'index.html'`` 。"
 
-#: ../../settings.rst:633 ceb51d0a532447099bc681ba9cce5b1d
+#: ../../settings.rst:685 556bfbe4d2ab4b51815544a7ed6fa0aa
 msgid ""
 "URLs for direct template pages are theme-dependent. Some themes use "
 "corresponding ``*_URL`` setting as string, while others hard-code them: "
@@ -851,29 +979,32 @@ msgstr ""
 "事实上，直接模板页面的URL是和使用的主题相关的。有些主题会使用 ``*_URL`` 作为变量字符串，而有些则是直接对这些直接模板页面进行硬编码："
 " ``'archives.html'`` 、 ``'authors.html'`` 、 ``'categories.html'`` 。"
 
-#: ../../settings.rst:640 d600dab1b91c4662833d0c5c298938b4
+#: ../../settings.rst:692 4f67c4073e084cfdbf5f58188cce97d8
 msgid ""
 "Specifies from where you want the slug to be automatically generated. Can"
 " be set to ``title`` to use the \"Title:\" metadata tag or ``basename`` "
-"to use the article's file name when creating the slug."
+"to use the article's file name when creating the slug. The default is "
+"``'title'``."
 msgstr "自动生成slug所依赖的内容。可以指定为元数据标签 ``title`` ，也可以使用文章源文件的文件名 ``basename`` 。"
+"本项配置默认为 ``'title'`` 。"
 
-#: ../../settings.rst:646 d274502af37648e289fd588834b0019d
+#: ../../settings.rst:698 161c36590f2b40a3a4d9dab57848fba7
 msgid ""
 "Allow Unicode characters in slugs. Set ``True`` to keep Unicode "
 "characters in auto-generated slugs. Otherwise, Unicode characters will be"
-" replaced with ASCII equivalents."
+" replaced with ASCII equivalents. The default is ``False``."
 msgstr ""
 "指定是否允许在slug中使用Unicode字符。若设为 ``True`` "
-"，自动生成的slug中会保留Unicode字符；否则Unicode字符会使用含义相同的ASCII替换。"
+"，自动生成的slug中会保留Unicode字符；否则Unicode字符会使用含义相同的ASCII替换。本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:652 37cddacc30bc430b9ea1bad479e90f3d
+#: ../../settings.rst:704 771258d986ef4e46b80e1ee043e3a377
 msgid ""
 "Preserve uppercase characters in slugs. Set ``True`` to keep uppercase "
-"characters from ``SLUGIFY_SOURCE`` as-is."
+"characters from ``SLUGIFY_SOURCE`` as-is. The default is ``False``."
 msgstr "指定是否保留slug中的大写字母。若设为 ``True`` ，则会原样保留 ``SLUGIFY_SOURCE`` 中的大写字母。"
+"本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:662 785ff8b6508b4e6e980ae6638e7346f9
+#: ../../settings.rst:709 ea3e23a38ffe465e8fef398b69940b87
 msgid ""
 "Regex substitutions to make when generating slugs of articles and pages. "
 "Specified as a list of pairs of ``(from, to)`` which are applied in "
@@ -881,78 +1012,81 @@ msgid ""
 "removing non-alphanumeric characters and converting internal whitespace "
 "to dashes. Apart from these substitutions, slugs are always converted to "
 "lowercase ascii characters and leading and trailing whitespace is "
-"stripped. Useful for backward compatibility with existing URLs."
+"stripped. Useful for backward compatibility with existing URLs. The "
+"default is::"
 msgstr ""
 "指定生成文章和页面slug时要进行的正则表达式替换。指定的是一对对 ``(from, to)`` "
 "（from为要替换的内容，to为替换进去的内容），列表中的各对替换规则是按序执行且忽略大小写的。默认的替换会删除非字母非数字的字符并将内部空格替换为连字符。除此之外，slug会将所有字符转换为小写ASCII字符，并删除所有前导和末尾空格。这有利于现有URL的向后兼容。"
+"本项配置默认如下："
 
-#: ../../settings.rst:672 f2ddbe0d79124ce2b0b9390f9c1492e9
+#: ../../settings.rst:726 4ed665fd61124d7199e5d3a336a6490e
 msgid ""
-"Regex substitutions for author slugs. Defaults to "
+"Regex substitutions for author slugs. The default is "
 "``SLUG_REGEX_SUBSTITUTIONS``."
 msgstr "针对作者slug的正则替换。默认等于 ``SLUG_REGEX_SUBSTITUTIONS`` 。"
 
-#: ../../settings.rst:677 68c5594a14544fe9bed90cdfb41f25c4
+#: ../../settings.rst:731 9ec67c2063eb4bc5a47a0cbcd68f4e7d
 msgid ""
-"Regex substitutions for category slugs. Defaults to "
+"Regex substitutions for category slugs. The default is "
 "``SLUG_REGEX_SUBSTITUTIONS``."
 msgstr "针对分类slug的正则替换。默认等于 ``SLUG_REGEX_SUBSTITUTIONS`` 。"
 
-#: ../../settings.rst:682 3dd263d38e47445c88d34a790e919053
+#: ../../settings.rst:736 04708135895649fd8e9fabc003c0219f
 msgid ""
-"Regex substitutions for tag slugs. Defaults to "
+"Regex substitutions for tag slugs. The default is "
 "``SLUG_REGEX_SUBSTITUTIONS``."
 msgstr "针对标签slug的正则替换。默认等于 ``SLUG_REGEX_SUBSTITUTIONS`` 。"
 
-#: ../../settings.rst:685 21a264926d3b46edb2af35f936d0985a
+#: ../../settings.rst:740 e38808bbec234497a9349626bf5b3e96
 msgid "Time and Date"
 msgstr "日期与时间"
 
-#: ../../settings.rst:689 ef50be008f104aa6bcbf2df6a81921e8
+#: ../../settings.rst:744 26e96055ea16439caae61e79c2f1a7b6
 msgid "The timezone used in the date information, to generate Atom and RSS feeds."
 msgstr "日期信息中使用的时区，会用于生成Atom和RSS feeds。（无默认值，必须手动设置指定）"
 
-#: ../../settings.rst:691 9ec4050abc58489db63deda401d80b7d
+#: ../../settings.rst:746 0d1bac8219e34ecea81f4733a13ee33a
 msgid ""
 "If no timezone is defined, UTC is assumed. This means that the generated "
 "Atom and RSS feeds will contain incorrect date information if your locale"
 " is not UTC."
 msgstr "若没有定义时区，会直接使用UTC时区。这意味着当你的时区不等于UTC时，生成的Atom和RSS feeds中会包含错误的日期信息。"
 
-#: ../../settings.rst:695 8797378878dc47e99388e1d0421da263
+#: ../../settings.rst:750 e2439055d3b7422fab3a3ba41d07ce62
 msgid ""
 "Pelican issues a warning in case this setting is not defined, as it was "
 "not mandatory in previous versions."
 msgstr "在之前的版本中，这一项设置并不是强制的，因此Pelican会在未设置时区时提出警告。"
 
-#: ../../settings.rst:698 18326d528d0045c88c8e31d0f9bb26f9
+#: ../../settings.rst:753 6cf83583c26d42108c10f9f23a512db3
 msgid ""
 "Have a look at `the wikipedia page`_ to get a list of valid timezone "
 "values."
 msgstr "有效的时区设置值可以在 `维基百科页`_ 中查看。"
 
-#: ../../settings.rst:704 3af0a717e34c4926a40fc6cd58518df2
+#: ../../settings.rst:759 5e31086101004bde84dc96efa1967666
 msgid ""
 "The default date you want to use.  If ``'fs'``, Pelican will use the file"
 " system timestamp information (mtime) if it can't get date information "
 "from the metadata.  If given any other string, it will be parsed by the "
 "same method as article metadata.  If set to a tuple object, the default "
 "datetime object will instead be generated by passing the tuple to the "
-"``datetime.datetime`` constructor."
+"``datetime.datetime`` constructor. The default is ``None``."
 msgstr ""
 "要使用的默认日期。若设为 ``'fs'`` "
 "，Pelican在无法从元数据中获取日期时，会以系统时间戳信息（mtime）为准；若设为其他字符串，Pelican将用与解析文章元数据相同的方法进行解析；若设为元组，则会将该元组传递给"
-" ``datetime.datetime`` 的构造函数来生成日期。"
+" ``datetime.datetime`` 的构造函数来生成日期。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:713 e8358468fd034f24a7984b20909ada30
-msgid "The default date format you want to use."
-msgstr "指定要使用的默认日期格式。"
+#: ../../settings.rst:768 27cab75cf2344a8c8d1573700e1f35ca
+#, python-format
+msgid "The default date format you want to use. The default is ``'%a %d %B %Y'``."
+msgstr "指定要使用的默认日期格式。本项配置默认为 ``'%a %d %B %Y'`` 。"
 
-#: ../../settings.rst:717 e7f8237ab45945d78484e8fef0005bdc
+#: ../../settings.rst:772 fcf723cc20f544e6a43339335ba86558
 msgid "If you manage multiple languages, you can set the date formatting here."
 msgstr "若需要管理多种语言，可以在这里针对不同语言设置不同的日期格式。"
 
-#: ../../settings.rst:719 eab2352e48174cb085b7bd23115ad15b
+#: ../../settings.rst:774 d11fdb2b3aaa47b7993a38e4d5603e12
 msgid ""
 "If no ``DATE_FORMATS`` are set, Pelican will fall back to "
 "``DEFAULT_DATE_FORMAT``. If you need to maintain multiple languages with "
@@ -962,7 +1096,7 @@ msgstr ""
 "如果 ``DATE_FORMATS`` 没有设置过，Pelican会使用 ``DEFAULT_DATE_FORMAT`` "
 "。如果要为不同语言设置不同如期格式，可以在此设置项字典中指定，键为语言名称（对应于帖子内容元数据中的 ``lang`` ），值为日期格式字符串。"
 
-#: ../../settings.rst:724 2f8d1e03399549bf84a05e25d718ec80
+#: ../../settings.rst:779 c63c2ef9276b496bac1067b956c93819
 #, python-format
 msgid ""
 "In addition to the standard C89 strftime format codes that are listed in "
@@ -975,65 +1109,63 @@ msgstr ""
 "``-`` 来删除日期中的前导零。例如  ``%d/%m/%Y`` 对应输出 ``01/01/2014`` ，而 ``%-d/%-m/%Y`` "
 "对应输出 ``1/1/2014`` 。"
 
-#: ../../settings.rst:737 28f1a04cc72943b8bbb45b0f05039e6b
+#: ../../settings.rst:792 f1cb8ed02da747fdb9556138744cb6b4
 msgid ""
 "It is also possible to set different locale settings for each language by"
 " using a ``(locale, format)`` tuple as a dictionary value which will "
 "override the ``LOCALE`` setting:"
 msgstr "你还能够通过将元组 ``(locale, format)`` 作为值，来为每种语言指定地区，此处设置的地区会覆盖 ``LOCALE`` 设置："
 
-#: ../../settings.rst:757 0edf14c3edcf41aba562d74822a9f1f5
+#: ../../settings.rst:814 81db232f575b4d4194222e5afb0d141a
 msgid ""
-"Change the locale [#]_. A list of locales can be provided here or a "
-"single string representing one locale.  When providing a list, all the "
-"locales will be tried until one works."
-msgstr "设置地区 [#]_ 。可以同时指定多个地区，也可以使用字符串指定单个地区。当设置了多个地区时，会一个个尝试直到某一个可以使用。"
+"Change the locale. A list of locales can be provided here or a single "
+"string representing one locale.  When providing a list, all the locales "
+"will be tried until one works."
+msgstr "设置地区。可以同时指定多个地区，也可以使用字符串指定单个地区。当设置了多个地区时，会一个个尝试直到某一个可以使用。"
 
-#: ../../settings.rst:761 26b26ebd973b40fd973a9252fe24173c
+#: ../../settings.rst:818 d3630c9f75e145a98dd5746f4ca54ae4
 msgid "You can set locale to further control date format:"
 msgstr "通过设置地区进一步控制日期格式："
 
-#: ../../settings.rst:769 e0056e0a853f4891b87e3b2f66af9ab9
+#: ../../settings.rst:826 feb0efa8a8a648648634ef896509879b
 msgid ""
 "For a list of available locales refer to `locales on Windows`_  or on "
 "Unix/Linux, use the ``locale -a`` command; see manpage `locale(1)`_ for "
-"more information."
+"more information. The default is the system locale."
 msgstr ""
 "要查看可用的地区列表，可以参看 `Windows上的地区`_ ；若使用的时Unix/Linux系统， 使用 ``locale -a`` "
-"命令即可，有关该命令的更多信息可以参阅手册 `locale(1)`_ 。"
+"命令即可，有关该命令的更多信息可以参阅手册 `locale(1)`_ 。本项配置默认与系统locale保持一致。"
 
-#: ../../settings.rst:774 ac7d9e8b711e438e9a80a31274d1fa11
-msgid "Default is the system locale."
-msgstr "默认值与系统的地区设置保持一致。"
-
-#: ../../settings.rst:788 39a1ce7f77994c1ca37792f44b4297ee
+#: ../../settings.rst:843 15067988a9f64c23ac30113f261c932f
 msgid "Template pages"
 msgstr "模板页面"
 
-#: ../../settings.rst:792 fb2c9cf72b3946828619ecb6051abd0b
+#: ../../settings.rst:847 1e8e76f577b44f389d546bebe897b0a4
 msgid ""
 "A mapping containing template pages that will be rendered with the blog "
 "entries."
 msgstr "一些映射关系，指出了会和博客一起渲染的模板页面。"
 
-#: ../../settings.rst:795 f8163db87b30489fa6067f58d395cee1
+#: ../../settings.rst:850 97158dd7cf984420b72d4fe184f613f3
 msgid ""
 "If you want to generate custom pages besides your blog entries, you can "
 "point any Jinja2 template file with a path pointing to the file and the "
 "destination path for the generated file."
 msgstr "如果你想要生成除了博客之外的自定义页面，你可以指出任何Jinja2的模板文件，需要同时指出源文件路径和生成文件的路径。"
 
-#: ../../settings.rst:799 ef26f9eaad274b969a0ae1183e7ac0c8
+#: ../../settings.rst:854 3bab3b6570c044c3a507687ebd136988
 msgid ""
 "For instance, if you have a blog with three static pages — a list of "
 "books, your resume, and a contact page — you could have::"
 msgstr "例如，如果你的博客有三个静态页面——书籍列表、你的简历、以及一个联系我们页面，你可这么配置："
 
-#: ../../settings.rst:808 2c8a293e4d77423db215de89aa20ca5c
-msgid "The extensions to use when looking up template files from template names."
-msgstr "指定要查找并视为模板文件的文件扩展名。"
+#: ../../settings.rst:865 c1a40d40e5b34bc49b138e87baf1dd09
+msgid ""
+"The extensions to use when looking up template files from template names."
+" The default is ``['.html']``."
+msgstr "指定要查找并视为模板文件的文件扩展名。本项配置默认为 ``['.html']`` 。"
 
-#: ../../settings.rst:812 101a0198fc6249b3adea735ff522b9b1
+#: ../../settings.rst:870 ad976b56f784425380d5ca5095c83bad
 msgid ""
 "List of templates that are used directly to render content. Typically "
 "direct templates are used to generate index pages for collections of "
@@ -1044,46 +1176,58 @@ msgstr ""
 "指定用于直接渲染内容的模板列表。一般来说直接模板会用于生成内容集合的主页（例如分类和标签的主页）。如果不需要作者、分类或者标签集合，可以设置 "
 "``DIRECT_TEMPLATES = ['index', archives']`` 。"
 
-#: ../../settings.rst:817 c5952388671a4fab8095d4a9b596905f
+#: ../../settings.rst:875 f545160f96c34ac9b9218b8cb88c2bab
 msgid ""
 "``DIRECT_TEMPLATES`` are searched for over paths maintained in "
 "``THEME_TEMPLATES_OVERRIDES``."
 msgstr "``DIRECT_TEMPLATES`` 会在 ``THEME_TEMPLATES_OVERRIDES`` 的路径中搜索。"
 
-#: ../../settings.rst:822 8c4e0bfebc60422cbcb852f17e53fbeb
+#: ../../settings.rst:878 57441857f4a146568ebfdb358c6647e5
+msgid "The default is ``['index', 'tags', 'categories', 'authors', 'archives']``."
+msgstr "默认为 ``['index', 'tags', 'categories', 'authors', 'archives']`` 。"
+
+#: ../../settings.rst:881 e5b9ac921eba40d7961d58d716d285ff
 msgid "Metadata"
 msgstr "元数据"
 
-#: ../../settings.rst:826 5d3ac5fa0fe94d0faf3603d032152259
-msgid "Default author (usually your name)."
-msgstr "默认作者（通常是你自己的名字）。"
+#: ../../settings.rst:885 983b827b2d9e4162ac78b6659e73f99f
+msgid ""
+"Default author (usually your name). The default is ``None``, which "
+"removes the byline."
+msgstr "默认作者（通常是你自己）。本项配置默认为 ``None`` ，此时会删除作者名一行。"
 
-#: ../../settings.rst:830 bd855c810143419b97250e11fe9db428
-msgid "The default metadata you want to use for all articles and pages."
-msgstr "应用于所有文章和页面的默认元数据。"
+#: ../../settings.rst:889 27cab75cf2344a8c8d1573700e1f35ca
+#, python-brace-format
+msgid ""
+"The default metadata you want to use for all articles and pages. The "
+"default is ``{}``."
+msgstr "应用于所有文章和页面的默认元数据。本项配置默认为 ``{}`` 。"
 
-#: ../../settings.rst:834 b9b192605075405ba1b89c817db323e5
+#: ../../settings.rst:894 f322adf782eb45b6b261a51befce0b7b
 msgid ""
 "The regexp that will be used to extract any metadata from the filename. "
 "All named groups that are matched will be set in the metadata object.  "
 "The default value will only extract the date from the filename."
 msgstr "指定用于从文件名中提取元数据的正则表达式。所有匹配上的命名匹配组都会用于设置元数据。默认值会从文件名中提取日期。"
 
-#: ../../settings.rst:838 f5730036a8ad4bdbbc7250201e97d4b3
+#: ../../settings.rst:898 b14cef00e4d74cf1aafa83f8adc7ff22
 msgid "For example, to extract both the date and the slug::"
 msgstr "例如，可以同时提取日期和slug："
 
-#: ../../settings.rst:842 bfcc4210a493460a954dfb5d96f57462
-msgid "See also ``SLUGIFY_SOURCE``."
-msgstr "另请参看 ``SLUGIFY_SOURCE`` 。"
+#: ../../settings.rst:902 6f0fe6e9f1634fa281d42a4db9c7df83
+#, python-brace-format
+msgid ""
+"See also ``SLUGIFY_SOURCE``. The default is "
+"``r'(?P<date>\\d{4}-\\d{2}-\\d{2}).*'``."
+msgstr "参考 ``SLUGIFY_SOURCE`` 。本项配置默认为 ``r'(?P<date>\\d{4}-\\d{2}-\\d{2}).*'`` 。"
 
-#: ../../settings.rst:846 1bc373d7947b4c9181fd54d01409eb06
+#: ../../settings.rst:906 6868648226c841849965cfc4a8f8a0fb
 msgid ""
 "Like ``FILENAME_METADATA``, but parsed from a page's full path relative "
-"to the content source directory."
-msgstr "和 ``FILENAME_METADATA`` 类似，但提取解析的对象是相对于内容源文件目录的路径。"
+"to the content source directory. The default is ``''``."
+msgstr "和 ``FILENAME_METADATA`` 类似，但解析时的路径是相对于内容源文件所在目录的。本项配置默认为 ``''`` 。"
 
-#: ../../settings.rst:851 b02a8c4b99204d92b9d6625f79c27c89
+#: ../../settings.rst:911 52089bec13c64713a256032ed4f894ef
 msgid ""
 "Extra metadata dictionaries keyed by relative path. Relative paths "
 "require correct OS-specific directory separators (i.e. / in UNIX and \\\\"
@@ -1092,7 +1236,7 @@ msgid ""
 "conflicts."
 msgstr "指定要从相对路径提取的额外元数据字典。与Pelican的其他设置文件不同，此项设置需要正确使用和操作系统对应的目录分隔符（Unix中使用/，Windows中使用\\\\）。若对一个目录设置了规则，该规则会作用于该目录下所有文件。当有多个路径相互冲突时，Pelican会选用更为具体的路径。"
 
-#: ../../settings.rst:856 d8ceeec6c7e14be3a79c73db2472a7cb
+#: ../../settings.rst:916 375cc26258cd4030a2e1743220b331db
 msgid ""
 "Not all metadata needs to be :ref:`embedded in source file itself "
 "<internal_metadata>`. For example, blog posts are often named following a"
@@ -1109,23 +1253,23 @@ msgstr ""
 "``(?P<name>…)`` 。当你需要为帖子附加一些额外的元数据，但不想将其编码在文件路径中时，就可以在 "
 "``EXTRA_PATH_METADATA`` 中设置："
 
-#: ../../settings.rst:877 3c7085d581f74cba8b5b7be5451d0dd0
+#: ../../settings.rst:937 43d9707ff47e488dba64d7d1d23cbc4a
 msgid ""
 "This can be a convenient way to shift the installed location of a "
 "particular file:"
 msgstr "通过这个设置项，很方便就可以转移特定文件的位置："
 
-#: ../../settings.rst:897 62d0261aa15a42a486691e7d615f58c7
+#: ../../settings.rst:959 ef39cc18199a44b895748dfe9c46a07c
 msgid "Feed settings"
 msgstr "订阅源设置"
 
-#: ../../settings.rst:899 e06e3b6cd4e34d9990e28f533c70916b
+#: ../../settings.rst:961 8c7bb16134c24af5b49a9e63b6ff36f8
 msgid ""
 "By default, Pelican uses Atom feeds. However, it is also possible to use "
 "RSS feeds if you prefer."
 msgstr "默认情况下，Pelican会使用Atom订阅源。但如果你愿意的话，也可以使用RSS。"
 
-#: ../../settings.rst:902 8a0de4febfd34d9eb1cdcc74d4c02198
+#: ../../settings.rst:964 a20b5eb7bea54cde84cfde3380cc9c86
 msgid ""
 "Pelican generates category feeds as well as feeds for all your articles. "
 "It does not generate feeds for tags by default, but it is possible to do "
@@ -1134,171 +1278,200 @@ msgstr ""
 "Pelican会生成分类的feed，也会为所有文章生成，但默认并不会为标签生成feed，要生成标签feed，可以使用  "
 "``TAG_FEED_ATOM`` 和 ``TAG_FEED_RSS`` 设置："
 
-#: ../../settings.rst:908 e1d650d03db342a09b22e34ff11b9365
+#: ../../settings.rst:970 1ffaa4be4dae4481b80eff1b8191f366
 msgid ""
 "The domain prepended to feed URLs. Since feed URLs should always be "
 "absolute, it is highly recommended to define this (e.g., "
 "\"https://feeds.example.com\"). If you have already explicitly defined "
 "SITEURL (see above) and want to use the same domain for your feeds, you "
-"can just set:  ``FEED_DOMAIN = SITEURL``."
+"can just set:  ``FEED_DOMAIN = SITEURL``. The default is ``None``, which "
+"uses the base URL \"/\"."
 msgstr ""
-"指定要附加到订阅源URL前面的域名。因为订阅源URL最好是绝对的，所以强烈推荐定义此设置项（例如 "
+"指定要附加到订阅源URL前面的域名。因为订阅源URL应该是绝对的，所以强烈推荐定义此设置项（例如 "
 "https://feeds.example.com ）。若SITEURL已经显式地定义了，并且希望使用相同地URL，就可以直接设置 "
-"``FEED_DOMAIN = SITEURL`` 。"
+"``FEED_DOMAIN = SITEURL`` 。本项配置默认为 ``None`` ，即使用基础URL \"/\" 。"
 
-#: ../../settings.rst:916 f3bc5a60dab54c2ab52f99f81b743102
-msgid "The location to save the Atom feed."
-msgstr "指定保存Atom订阅源的位置。"
+#: ../../settings.rst:979 7a7143a49149452d999c2084cc0266e6
+msgid ""
+"The location to save the Atom feed. The default is ``None``, for no Atom "
+"feed."
+msgstr "指定Atom订阅源的存储位置。本项配置默认为 ``None`` ，即不使用Atom订阅源。"
 
-#: ../../settings.rst:920 4145c00c2347484fa37f4387283e0fb6
+#: ../../settings.rst:984 2fd2426a582247f8a375940ecbd0f96a
 msgid ""
 "Relative URL of the Atom feed. If not set, ``FEED_ATOM`` is used both for"
-" save location and URL."
+" save location and URL. The default is ``None``."
 msgstr "Atom订阅源的相对URL。如果未设置此项，会将 ``FEED_ATOM`` 同时用于存储位置和URL。"
+"本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:925 579cd1112ba44be7b82c77050af3a256
-msgid "The location to save the RSS feed."
-msgstr "指定保存RSS订阅源的位置。"
+#: ../../settings.rst:989 c4758a4ce8f94850ba4567250259741d
+msgid ""
+"The location to save the RSS feed. The default is ``None``, for no RSS "
+"feed."
+msgstr "RSS订阅源的存储位置。本项配置默认为 ``None`` ，即不使用RSS订阅源。"
 
-#: ../../settings.rst:929 5fdb4ce14c0a454381db194885b088f2
+#: ../../settings.rst:993 737caf1d58854aa3b86820243fc80403
 msgid ""
 "Relative URL of the RSS feed. If not set, ``FEED_RSS`` is used both for "
-"save location and URL."
-msgstr "RSS订阅源的相对URL。如果未设置此项，会将 ``FEED_RSS`` 同时用于存储位置和URL。"
+"save location and URL. The default is ``None``."
+msgstr "RSS订阅源的相对URL。如果未设置此项，会将 ``FEED_RSS`` 同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:934 91bd81a74c234968a27e4b61924273f5
+#: ../../settings.rst:998 28942938054b490c8dd5ca8367d87ea9
 msgid ""
 "The location to save the all-posts Atom feed: this feed will contain all "
-"posts regardless of their language."
-msgstr "存储all-posts Atom订阅源的文件位置：其中会包含所有语言的帖子。"
+"posts regardless of their language. The default is "
+"``'feeds/all.atom.xml'``."
+msgstr "存储all-posts Atom订阅源的文件位置：其中会包含所有语言的帖子。本项配置默认为 ``'feeds/all.atom.xml'`` 。"
 
-#: ../../settings.rst:939 62aceff0073b48eeb8929f102bfad7e4
+#: ../../settings.rst:1003 f4e7fbd9297743ccaadafa11c7cfb1e1
 msgid ""
 "Relative URL of the all-posts Atom feed. If not set, ``FEED_ALL_ATOM`` is"
-" used both for save location and URL."
+" used both for save location and URL. The default is ``None``."
 msgstr "all-posts Atom订阅源的相对URL。如果未设置此项，会将 ``FEED_ALL_ATOM`` 同时用于存储位置和URL。"
+"本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:944 3b9f640128e84a4a96e696a830e3a8cd
+#: ../../settings.rst:1008 eaacfd07bdb94dd2a9c6792a1f036807
 msgid ""
 "The location to save the the all-posts RSS feed: this feed will contain "
-"all posts regardless of their language."
-msgstr "存储all-posts RSS订阅源的文件位置：其中会包含所有语言的帖子。"
+"all posts regardless of their language. The default is ``None``, for no "
+"all-posts RSS feed."
+msgstr "存储all-posts RSS订阅源的文件位置：其中会包含所有语言的帖子。本项配置默认为 ``None`` ，即不使用all-posts RSS订阅源。"
 
-#: ../../settings.rst:949 2b80018af24945ac949377bb01f4d699
+#: ../../settings.rst:1014 fe17f05439064eea8fb3dad8255cd467
 msgid ""
 "Relative URL of the all-posts RSS feed. If not set, ``FEED_ALL_RSS`` is "
-"used both for save location and URL."
-msgstr "all-posts RSS订阅源的相对URL。如果未设置此项，会将 ``FEED_ALL_RSS`` 同时用于存储位置和URL。"
+"used both for save location and URL. The default is ``None``."
+msgstr "all-posts RSS订阅源的相对URL。如果未设置此项，会将 ``FEED_ALL_RSS`` 同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:954 c00dc056edc64aafb33bafad947364db
-msgid "The location to save the category Atom feeds. [2]_"
-msgstr "category Atom订阅源的存储位置。 [2]_"
+#: ../../settings.rst:1019 c4758a4ce8f94850ba4567250259741d
+#, python-brace-format
+msgid ""
+"The location to save the category Atom feeds. [2]_ The default is "
+"``'feeds/{slug}.atom.xml'``."
+msgstr "category Atom订阅源的存储位置。 [2]_ 本项配置默认为 ``'feeds/{slug}.atom.xml'`` 。"
 
-#: ../../settings.rst:958 fb8c09a3eb844121b05c5a067d616a42
+#: ../../settings.rst:1024 d31bcd45f3ee47e4a316ac3f765c527d
+#, python-brace-format
 msgid ""
 "Relative URL of the category Atom feeds, including the ``{slug}`` "
 "placeholder. [2]_ If not set, ``CATEGORY_FEED_ATOM`` is used both for "
-"save location and URL."
+"save location and URL. The default is ``None``."
 msgstr ""
 "category Atom订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 "
-"``CATEGORY_FEED_ATOM`` 同时用于存储位置和URL。"
+"``CATEGORY_FEED_ATOM`` 同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:964 bd0dba597ed44c0ab95df015d13fb42f
+#: ../../settings.rst:1030 fabfac75a52f48029a8147f62289c252
+#, python-brace-format
 msgid ""
 "The location to save the category RSS feeds, including the ``{slug}`` "
-"placeholder. [2]_"
-msgstr "category RSS订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_"
+"placeholder. [2]_ The default is ``None``, for no RSS feed."
+msgstr "category RSS订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_ 本项配置默认为 ``None`` ，即不使用RSS订阅源。"
 
-#: ../../settings.rst:969 5e06453a1300407188c78eceadcabef1
+#: ../../settings.rst:1035 fabfac75a52f48029a8147f62289c252
+#, python-brace-format
 msgid ""
 "Relative URL of the category RSS feeds, including the ``{slug}`` "
 "placeholder. [2]_ If not set, ``CATEGORY_FEED_RSS`` is used both for save"
-" location and URL."
+" location and URL. The default is ``None``."
 msgstr ""
 "category RSS订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 "
-"``CATEGORY_FEED_RSS`` 同时用于存储位置和URL。"
+"``CATEGORY_FEED_RSS`` 同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:975 1ad2208106b5492cbc0bb0fc6b6d2eef
-msgid "The location to save the author Atom feeds. [2]_"
-msgstr "category Atom订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_"
+#: ../../settings.rst:1041 28942938054b490c8dd5ca8367d87ea9
+#, python-brace-format
+msgid ""
+"The location to save the author Atom feeds. [2]_ The default is "
+"``'feeds/{slug}.atom.xml'``."
+msgstr "author Atom订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_ 本项配置默认为 ``'feeds/{slug}.atom.xml'`` 。"
 
-#: ../../settings.rst:979 069eb238b2d6458eac8fc200c12aa6fd
+#: ../../settings.rst:1046 fde52f62d95a4bad85a5a1b49eed6170
+#, python-brace-format
 msgid ""
 "Relative URL of the author Atom feeds, including the ``{slug}`` "
 "placeholder. [2]_ If not set, ``AUTHOR_FEED_ATOM`` is used both for save "
-"location and URL."
+"location and URL. The default is ``None`` (not set)."
 msgstr ""
 "author Atom订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 "
-"``AUTHOR_FEED_ATOM`` 同时用于存储位置和URL。"
+"``AUTHOR_FEED_ATOM`` 同时用于存储位置和URL。本项配置默认为 ``None`` ，即不使用。"
 
-#: ../../settings.rst:985 0b5a562410eb47c5a47a31a852973974
-msgid "The location to save the author RSS feeds. [2]_"
-msgstr "author RSS订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_"
+#: ../../settings.rst:1052 c4758a4ce8f94850ba4567250259741d
+#, python-brace-format
+msgid ""
+"The location to save the author RSS feeds. [2]_ The default is "
+"``'feeds/{slug}.rss.xml'``."
+msgstr "author RSS订阅源的存储位置。 [2]_ 本项配置默认为 ``'feeds/{slug}.rss.xml'`` 。"
 
-#: ../../settings.rst:989 c1964676a205466fb2a835e99bc00885
+#: ../../settings.rst:1057 367ef87d541c45ffaf65e8d8b1469f1a
+#, python-brace-format
 msgid ""
 "Relative URL of the author RSS feeds, including the ``{slug}`` "
 "placeholder. [2]_ If not set, ``AUTHOR_FEED_RSS`` is used both for save "
-"location and URL."
+"location and URL. The default is ``None``."
 msgstr ""
 "author RSS订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 ``AUTHOR_FEED_RSS`` "
-"同时用于存储位置和URL。"
+"同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:994 2242bd16e270495eba740e72964d840d
+#: ../../settings.rst:1063 b1159e07c8184831b6dcfd308cd23439
+#, python-brace-format
 msgid ""
 "The location to save the tag Atom feed, including the ``{slug}`` "
-"placeholder. [2]_"
-msgstr "tag Atom订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_"
+"placeholder. [2]_ The default is ``None``, for no tag feed."
+msgstr "tag Atom订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_ 本项配置默认为 ``None`` ，即不使用tag feed。"
 
-#: ../../settings.rst:999 2f69bb73cef343b48f09ead8fd268d26
+#: ../../settings.rst:1068 d744ca82b48d4e9298f2ca19252aedec
+#, python-brace-format
 msgid ""
 "Relative URL of the tag Atom feed, including the ``{slug}`` placeholder. "
-"[2]_"
-msgstr "tag Atom订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_"
+"[2]_ The default is ``None``."
+msgstr "tag Atom订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1004 059a551f316c4d7e99b43a4d6e999c43
+#: ../../settings.rst:1073 b1159e07c8184831b6dcfd308cd23439
+#, python-brace-format
 msgid ""
 "Relative URL to output the tag RSS feed, including the ``{slug}`` "
 "placeholder. If not set, ``TAG_FEED_RSS`` is used both for save location "
-"and URL."
+"and URL. The default is ``None``, for no tag feed."
 msgstr "tag RSS订阅源的相对URL，其中包含 ``{slug}`` 。如果未设置，会将 ``TAG_FEED_RSS`` 同时用于存储位置和URL。"
+"本项配置默认为 ``None`` ，即不使用tag feed。"
 
-#: ../../settings.rst:1010 ba1909bb43f7468ab36384a33e9f0d35
+#: ../../settings.rst:1079 c8f29653c4f3423b8dec9905fa1de6f2
 msgid ""
 "Maximum number of items allowed in a feed. Setting to ``None`` will cause"
-" the feed to contains every article. 100 if not specified."
+" the feed to contains every article. 100 if not specified. The default is"
+" ``100``."
 msgstr "单个订阅源中允许包含的最多元素数量。若设为 ``None`` 表示不做上限；若不指定，默认上限为100。"
 
-#: ../../settings.rst:1015 ee56a7f7761e4badb24ddd0771b9bcaa
+#: ../../settings.rst:1084 27393055cbb846bba21699d9a59502c2
 msgid ""
 "Only include item summaries in the ``description`` tag of RSS feeds. If "
 "set to ``False``, the full content will be included instead. This setting"
-" doesn't affect Atom feeds, only RSS ones."
+" doesn't affect Atom feeds, only RSS ones. The default is ``True``."
 msgstr ""
 "仅在RSS订阅源的 ``description`` 标签中包含项目摘要。若设为 ``False`` ，则将包含完整内容。此项设置不会影响Atom "
-"feed，只针对RSS feed。"
+"feed，只针对RSS feed。本项配置默认为 ``True`` 。"
 
-#: ../../settings.rst:1021 d34b3c9cf9c643559e8f1bd58b4d4d9e
+#: ../../settings.rst:1090 2c53416e07e34cc9998718fc5e82cc12
 msgid ""
 "If set to ``True``, ``?ref=feed`` will be appended to links in generated "
-"feeds for the purpose of referrer tracking."
-msgstr "若设为 ``True`` ，会将 ``?ref=feed`` 附到生成的链接中，以便追踪引用。"
+"feeds for the purpose of referrer tracking. The default is ``False``."
+msgstr "若设为 ``True`` ，会将 ``?ref=feed`` 附到生成的链接中，以便追踪引用。本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:1024 67aa494bb5c846eeac10b91d633fbeb1
+#: ../../settings.rst:1093 7f647c4c65494b93bb6d1c3ef4b39af6
 msgid ""
 "If you don't want to generate some or any of these feeds, set the above "
 "variables to ``None``."
 msgstr "若你不想要生成某些订阅源，将对应变量设为 ``None`` 即可。"
 
-#: ../../settings.rst:1027 e281a7a6d60d4362a56364ea4e7c2ed4
+#: ../../settings.rst:1096 372a88d4b1044ba491c1547e90014c73
+#, python-brace-format
 msgid "``{slug}`` is replaced by name of the category / author / tag."
 msgstr "``{slug}`` 会分别用分类名/作者名/标签名来替换。"
 
-#: ../../settings.rst:1031 f1101bee785f48fb8745c1cbed7ccb5c
+#: ../../settings.rst:1100 9913cc3370754eda888a2594a73ce4da
 msgid "Pagination"
 msgstr "分页"
 
-#: ../../settings.rst:1033 9d8deaf84be143aa919bae8458e256a5
+#: ../../settings.rst:1102 caf94bfd47344208a34f6b10225646a1
 msgid ""
 "The default behaviour of Pelican is to list all the article titles along "
 "with a short description on the index page. While this works well for "
@@ -1306,38 +1479,46 @@ msgid ""
 "probably benefit from paginating this list."
 msgstr "默认情况下，Pelican会把所有文章以简短描述的形式展示在首页上。虽然这对中小型网站效果不错，但对于拥有大量文章的网站来说可能需要将此列表进行分页。"
 
-#: ../../settings.rst:1038 8315da9ec0d64ffb881d0dfa6f25590e
+#: ../../settings.rst:1107 2667020362fe4d23a84b1d25b24863c3
 msgid "You can use the following settings to configure the pagination."
 msgstr "你可以使用下面的设置来配置分页。"
 
-#: ../../settings.rst:1042 9a56cc2f10634c34980a6868c4988e43
+#: ../../settings.rst:1111 656911c7bc2145b0bd1ff10d5373d7dc
 msgid ""
 "The minimum number of articles allowed on the last page. Use this when "
-"you don't want the last page to only contain a handful of articles."
+"you don't want the last page to only contain a handful of articles. The "
+"default is ``0``."
 msgstr "最后一页允许的最小文章数。当不希望最后一页仅包含少数文章时，请使用此选项。（译者注：当最后一页达不到此最小文章数时，会被合并到前一页）"
+"本项配置默认为 ``0`` 。"
 
-#: ../../settings.rst:1047 f3d093d68890442abfda1dea23eb25ed
+#: ../../settings.rst:1117 030af02515a84a13925108ab06457c0b
 msgid ""
 "The maximum number of articles to include on a page, not including "
-"orphans. False to disable pagination."
+"orphans. False to disable pagination. The default is ``False``."
 msgstr "一个页面上包含的最大文章数，不包括孤立文章（译者注：当发生上一条设置选项中提到的合并时，最后一页显然会超过此最大文章数）。设为False会禁用分页。"
+"本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:1052 df3fe4f1806f4a16b2a9fdd11cc50aa2
+#: ../../settings.rst:1122 478c5db91b16485b81ea4523ae70b6f1
+#, python-brace-format
 msgid ""
 "The templates to use pagination with, and the number of articles to "
 "include on a page. If this value is ``None``, it defaults to "
-"``DEFAULT_PAGINATION``."
+"``DEFAULT_PAGINATION``. The default is ``{'index': None, 'tag': None, "
+"'category': None, 'author': None}``."
 msgstr "指定哪些模板需要启用分页，以及对应的单页面文章数量。若设为 ``None`` ，则默认值为 ``DEFAULT_PAGINATION`` 。"
+"本项配置默认为 ``{'index': None, 'tag': None, 'category': None, 'author': None}`` 。"
 
-#: ../../settings.rst:1060 0ee1f92f0be740c3afb7b793327495df
-msgid "A set of patterns that are used to determine advanced pagination output."
-msgstr "一组模式，用于高级分页输出。"
+#: ../../settings.rst:1128 631c92f55fca4dd4acff9348397bdead
+msgid ""
+"A set of patterns that are used to determine advanced pagination output. "
+"The default is::"
+msgstr "一组匹配模式，用于高级分页输出。本项配置默认如下："
 
-#: ../../settings.rst:1064 1a3aef30d05c45b5b4dd54ab7c4c043c
+#: ../../settings.rst:1138 319e228179c2404dace7b1374e30a558
 msgid "Using Pagination Patterns"
 msgstr "使用分页模式"
 
-#: ../../settings.rst:1066 9bbd095189634b8f8a43cf4f196ec8d5
+#: ../../settings.rst:1140 7c7876166cba4db0bc8ca7c6ceb1f828
 msgid ""
 "By default, pages subsequent to ``.../foo.html`` are created as "
 "``.../foo2.html``, etc. The ``PAGINATION_PATTERNS`` setting can be used "
@@ -1347,7 +1528,8 @@ msgstr ""
 "默认情况下，连续页面的URL会如此编码：第一页为 ``.../foo.html`` ，后一页为 ``.../foo2.html`` "
 "。``PAGINATION_PATTERNS`` 就是用于修改这个编页规则的，其中是一些三元组："
 
-#: ../../settings.rst:1072 9303664b0829486097906d555b50c30d
+#: ../../settings.rst:1146 b96115cbd30a454e98427c2f568c9d9f
+#, python-brace-format
 msgid ""
 "For ``page_url`` and ``page_save_as``, you may use a number of variables."
 " ``{url}`` and ``{save_as}`` correspond respectively to the ``*_URL`` and"
@@ -1364,7 +1546,7 @@ msgstr ""
 "相同，只不过会截去末尾的 ``/index`` （如果有的话）。 ``{number}`` 则等于页码。（译者注： "
 "``minimum_page`` 意味到达该页面数后开始使用此条规则）"
 
-#: ../../settings.rst:1079 b3b8c76240bd4097b2ccd51e129fd949
+#: ../../settings.rst:1153 0513d4b59b6443a592d6c47abf6ffd13
 msgid ""
 "For example, if you want to leave the first page unchanged, but place "
 "subsequent pages at ``.../page/2/`` etc, you could set "
@@ -1373,88 +1555,99 @@ msgstr ""
 "举个例子，如果你想要保持第一面保持不变，但后续页面都以 ``.../page/2/`` 的形式出现，你可以如此设置 "
 "``PAGINATION_PATTERNS`` ："
 
-#: ../../settings.rst:1089 d229ff3fdd86402c9c511d154856da26
+#: ../../settings.rst:1163 a7e53284e5344eb5bab04206293349e4
 msgid ""
 "If you want a pattern to apply to the last page in the list, use ``-1`` "
 "as the ``minimum_page`` value::"
 msgstr "如果你想指定最后一面制定规则，将 ``minimum_page`` 的值设为 ``-1`` 即可："
 
-#: ../../settings.rst:1095 8a2f277505ea4ec1bf03baf8e8558fe0
+#: ../../settings.rst:1169 ee7ce86e8f1749e686233ec4a999dcc9
 msgid "Translations"
 msgstr "翻译"
 
-#: ../../settings.rst:1097 fd82b5daff4b4c019f3af94589fdf236
+#: ../../settings.rst:1171 66ba1c80957b4e84a265bbf1cfac36e5
 msgid ""
 "Pelican offers a way to translate articles. See the :doc:`Content "
 "<content>` section for more information."
 msgstr "Pelican为文章翻译提供了展示方法。详见 :doc:`创作内容 <content>` 。"
 
-#: ../../settings.rst:1102 0ed0fba765d44cb29c7a4561f1a7da11
-msgid "The default language to use."
-msgstr "指定默认语言。"
+#: ../../settings.rst:1176 27cab75cf2344a8c8d1573700e1f35ca
+msgid "The default language to use. The default is ``'en'``."
+msgstr "指定默认语言。本项配置默认为 ``'en'`` 。"
 
-#: ../../settings.rst:1106 b142b956828d4fa6bf5a6f41154a0bc8
+#: ../../settings.rst:1180 2db269f9350e48098e8e06643b77a107
 msgid ""
 "The metadata attribute(s) used to identify which articles are "
 "translations of one another. May be a string or a collection of strings. "
 "Set to ``None`` or ``False`` to disable the identification of "
-"translations."
+"translations. The default is ``'slug'``."
 msgstr "指定用于标识不同翻译是同一篇文章的元数据。可以是一个或多个字符串。要禁用对文章翻译的识别，将此项设为 ``None`` 或 ``False`` 。"
+"本项配置默认为 ``'slug'`` 。"
 
-#: ../../settings.rst:1112 b7a889c0eda0476cb8926803274db471
+#: ../../settings.rst:1187 bfa4d3e17c6f42ac9ddeb79fd2131943
 msgid ""
 "The metadata attribute(s) used to identify which pages are translations "
 "of one another. May be a string or a collection of strings. Set to "
-"``None`` or ``False`` to disable the identification of translations."
+"``None`` or ``False`` to disable the identification of translations. The "
+"default is ``'slug'``."
 msgstr "指定用于标识不同翻译是同一个页面的元数据。可以是一个或多个字符串。要禁用对页面翻译的识别，将此项设为 ``None`` 或 ``False`` 。"
+"本项配置默认为 ``'slug'`` 。"
 
-#: ../../settings.rst:1118 761a948ad532489ab91be66f6ff4afc3
-msgid "The location to save the Atom feed for translations. [3]_"
-msgstr "指定各翻译Atom订阅源的存储位置。 [3]_"
+#: ../../settings.rst:1194 2ae8d30c65cb460194294c5a5de14f02
+#, python-brace-format
+msgid ""
+"The location to save the Atom feed for translations. [3]_ The default is "
+"``'feeds/all-{lang}.atom.xml'``."
+msgstr "指定各翻译Atom订阅源的存储位置。 [3]_ 本项配置默认为 ``'feeds/all-{lang}.atom.xml'`` 。"
 
-#: ../../settings.rst:1122 3c51071a92a446179fa38606692a56d6
+#: ../../settings.rst:1199 bc09f3717a8a497680abc66b70745d0f
+#, python-brace-format
 msgid ""
 "Relative URL of the Atom feed for translations, including the ``{lang}`` "
 "placeholder. [3]_ If not set, ``TRANSLATION_FEED_ATOM`` is used both for "
-"save location and URL."
+"save location and URL. The default is ``None``."
 msgstr ""
 "指定各翻译Atom feed的含有 ``{lang}`` 的相对URL。 [3]_ "
-"若未设置此项，``TRANSLATION_FEED_ATOM`` 会同时用于存储位置和URL。"
+"若未设置此项，``TRANSLATION_FEED_ATOM`` 会同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1128 12ef75b1e91b49a2884fc8508893a066
-msgid "Where to put the RSS feed for translations."
-msgstr "指定各翻译RSS订阅源的存储位置。"
+#: ../../settings.rst:1205 1049b8c5e754466684e120afb2f7d281
+msgid ""
+"Where to put the RSS feed for translations. The default is ``None``, "
+"meaning no RSS feed."
+msgstr "指定各翻译RSS订阅源的存储位置。本项配置默认为 ``None`` ，即无RSS feed。"
 
-#: ../../settings.rst:1132 6b6d0ca12bbb4f26a2f91dea3ca2c6c7
+#: ../../settings.rst:1210 625b105c73764fce865b2504e811e055
+#, python-brace-format
 msgid ""
 "Relative URL of the RSS feed for translations, including the ``{lang}`` "
 "placeholder. [3]_ If not set, ``TRANSLATION_FEED_RSS`` is used both for "
-"save location and URL."
+"save location and URL. The default is ``None``."
 msgstr ""
 "文章或页面不同翻译在RSS订阅源中的相对路径，其中含有 ``{lang}``。 [3]_ "
-"若未设置此项，``TRANSLATION_FEED_RSS`` 会同时用于存储位置和URL。"
+"若未设置此项，``TRANSLATION_FEED_RSS`` 会同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1136 a653ebc90d404e1d88f473baa6d34bfa
+#: ../../settings.rst:1214 088e79d226f0487fafc14494179cabcf
+#, python-brace-format
 msgid "{lang} is the language code"
 msgstr "{lang} 为语言代码"
 
-#: ../../settings.rst:1140 417bf3d48cbb489daf8fab166ee7bda3
+#: ../../settings.rst:1217 4376232e5a294aca906df56af2f49303
 msgid "Ordering content"
 msgstr "内容的排列顺序"
 
-#: ../../settings.rst:1144 0cf90a8d6a3f48879e6f835e7944ccf2
+#: ../../settings.rst:1221 41cf2c63929d4eeeae7bfdee85e8d084
 msgid ""
 "Order archives by newest first by date. (False: orders by date with older"
-" articles first.)"
-msgstr "若设为True，日期较新的会排在前面；若设为False，则日期较旧的会排在前面。"
+" articles first.) The default is ``True``."
+msgstr "若设为True，日期较新的会排在前面；若设为False，则日期较旧的会排在前面。本项配置默认为 ``True`` 。"
 
-#: ../../settings.rst:1149 69921fd37f9947948c4951ea539be84a
+#: ../../settings.rst:1226 3f3709e077b3416f8c3640dfc4432e38
 msgid ""
 "Reverse the category order. (True: lists by reverse alphabetical order; "
-"default lists alphabetically.)"
-msgstr "若设为True，分类会按字典序逆序排列；若设为False，则按字典序顺序排列。"
+"default lists alphabetically.) The default is ``False``."
+msgstr "若设为True，分类会按字典序逆序排列；若设为False，则按字典序顺序排列。本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:1154 858fdbaaccf94d1392cf6c102da139a9
+#: ../../settings.rst:1231 ff8d745b1884450185d26b1f7d645a5f
 msgid ""
 "Defines how the articles (``articles_page.object_list`` in the template) "
 "are sorted. Valid options are: metadata as a string (use ``reversed-`` "
@@ -1463,99 +1656,104 @@ msgid ""
 " extract the sorting key from articles. Using a value of ``'date'`` will "
 "sort articles in chronological order, while the default value, "
 "``'reversed-date'``, will sort articles by date in reverse order (i.e., "
-"newest article comes first)."
+"newest article comes first). The default is ``'reversed-date'``."
 msgstr ""
 "定义文章（模板中的 ``articles_page.object_list`` "
-"）的排序方式。有效选项包括：字符串形式的元数据（使用前缀reverse-来指定逆序）、特殊选项 ``'basename'`` "
+"）的排序方式。有效选项包括：字符串形式的元数据（使用前缀 ``reversed-`` 来指定逆序）、特殊选项 ``'basename'`` "
 "（不带路径的文件名）、或是一个可以从文章中提取排序键的自定义函数。例如，将选项值设为 ``'date'`` ，文章就会以时间顺序排列文章。默认值为"
-" ``'reversed-date'`` ，即以日期逆序排列，即新文章在前、旧文章在后。"
+" ``'reversed-date'`` ，即以日期逆序排列，即新文章在前、旧文章在后。本项配置默认为 ``'reversed-date'`` 。"
 
-#: ../../settings.rst:1164 302ab57b0ae2473ebefff23151f4675f
+#: ../../settings.rst:1242 c2de8ca998954143a3a21d52f57a4e17
 msgid ""
 "Defines how the pages (``pages`` variable in the template) are sorted. "
 "Options are same as ``ARTICLE_ORDER_BY``.  The default value, "
-"``'basename'`` will sort pages by their basename."
+"``'basename'`` will sort pages by their basename. The default is "
+"``'basename'``."
 msgstr ""
-"定义页面（模板中的 ``pages`` 变量）的排序顺序。有效选项和 ``ARTICLE_ORDER_BY`` 中的相同。默认值为 "
-"``basename``。"
+"定义页面（模板中的 ``pages`` 变量）的排序顺序。有效选项和 ``ARTICLE_ORDER_BY`` 中的相同。本项配置默认为 ``'basename'`` 。"
 
-#: ../../settings.rst:1172 8503a9717f4c4d37a15b95fe4881528f
+#: ../../settings.rst:1250 6a345fb283734251b7acad72b7c4cf51
 msgid "Themes"
 msgstr "主题"
 
-#: ../../settings.rst:1174 ee7c320a20664fd294235130ca68827e
+#: ../../settings.rst:1252 6498842c51bb40548a640a7d419909bf
 msgid ""
 "Creating Pelican themes is addressed in a dedicated section (see :ref"
 ":`theming-pelican`). However, here are the settings that are related to "
 "themes."
 msgstr "创建Pelican主题在单独的一节中讲解（参见 :ref:`theming-pelican` ）。此处讲解和主题有关的配置项。"
 
-#: ../../settings.rst:1180 a7abb7abd4fd4914a9b2de4e18f2166a
+#: ../../settings.rst:1258 bb35f8335e4142f5b69a61115ab790e5
 msgid ""
 "Theme to use to produce the output. Can be a relative or absolute path to"
 " a theme folder, or the name of a default theme or a theme installed via "
-":doc:`pelican-themes` (see below)."
+":doc:`pelican-themes` (see below). The default theme is \"notmyidea\"."
 msgstr ""
 "用于产生输出的主题。可以是到达要使用主题的文件夹的相对或绝对路径，或是主题的名称（默认主题或通过 :doc:`pelican-themes` "
-"安装的主题）。"
+"安装的主题）。默认主题为 \"notmyidea\" 。"
 
-#: ../../settings.rst:1186 c80860199b464fe9be8c59b8162cd446
+#: ../../settings.rst:1264 3d47fbf73e7a4188a877619ef4cbed77
 msgid ""
 "Destination directory in the output path where Pelican will place the "
-"files collected from `THEME_STATIC_PATHS`. Default is `theme`."
+"files collected from `THEME_STATIC_PATHS`. Default is `theme`. The "
+"default is ``'theme'``."
 msgstr ""
-"Pelican从 `THEME_STATIC_PATHS` 中发现主题要使用的静态文件，此设置项指定这些静态文件在输出路径中的目录。默认值为 "
-"`theme` 。"
+"Pelican从 `THEME_STATIC_PATHS` 中发现主题要使用的静态文件，此设置项指定这些静态文件在输出路径中的目录。"
+"本项配置默认为 ``'theme'`` 。"
 
-#: ../../settings.rst:1191 7dbeb5f932f345c9b7c3546b7cfb788f
+#: ../../settings.rst:1270 c0b9021df19241fab6b6f90983248f9c
 msgid ""
 "Static theme paths you want to copy. Default value is `static`, but if "
 "your theme has other static paths, you can put them here. If files or "
 "directories with the same names are included in the paths defined in this"
-" settings, they will be progressively overwritten."
+" settings, they will be progressively overwritten. The default is "
+"``['static']``."
 msgstr ""
 "要复制的静态主题路径。默认值为 `static` "
 "，但如果你的主题有其他静态路径，也可以将其放在此处。此项设置中若包含了相同名称的文件或目录，前面的会被后面的覆盖。"
+"本项配置默认为 ``['static']`` 。"
 
-#: ../../settings.rst:1198 fe7833a44b7547a889fb97b77b219186
+#: ../../settings.rst:1277 117f2d4711394bf39c50303d6b24c06b
 msgid ""
 "A list of paths you want Jinja2 to search for templates before searching "
 "the theme's ``templates/`` directory.  Allows for overriding individual "
 "theme template files without having to fork an existing theme.  Jinja2 "
 "searches in the following order: files in ``THEME_TEMPLATES_OVERRIDES`` "
-"first, then the theme's ``templates/``."
+"first, then the theme's ``templates/``. The default is ``[]``."
 msgstr ""
 "在搜索主题的 ``templates/`` "
 "目录前，Jinja2会先搜索此设置项中的路径。可以使用此设置项覆盖主题中的某些模板文件，以尽量避免修改现有主题。"
+"Jinja2会先搜索 ``THEME_TEMPLATES_OVERRIDES`` 配置的文件，再搜索主题中的 ``templates/`` 目录。"
+"本项配置默认为 ``[]`` 。"
 
-#: ../../settings.rst:1204 fb8d33e45bd7411eb4c709bc8735725f
-#, python-format
+#: ../../settings.rst:1283 3f686a923ffa4a468df172f04146e388
+#, python-brace-format, python-format
 msgid ""
 "You can also extend templates from the theme using the ``{% extends %}`` "
 "directive utilizing the ``!theme`` prefix as shown in the following "
 "example:"
 msgstr "利用 ``{% extends %}`` 指令中的 ``!theme`` 前缀也可以用于从主题扩展模板，如下例所示："
 
-#: ../../settings.rst:1213 bad5f78cf14f48cfa4e3031fc66e945a
-msgid "Specify the CSS file you want to load."
-msgstr "指定需要加载的CSS文件。"
+#: ../../settings.rst:1292 35121540d2254f698cbf9538d00cf5bd
+msgid "Specify the CSS file you want to load. The default is ``'main.css'``."
+msgstr "指定需要加载的CSS文件。本项配置默认为 ``'main.css'`` 。"
 
-#: ../../settings.rst:1215 744422adebf048efb9576eb3d6f01b4f
+#: ../../settings.rst:1294 533f2b3f18864e7ca68bfcb5d6961fe1
 msgid ""
 "By default, two themes are available. You can specify them using the "
 "``THEME`` setting or by passing the ``-t`` option to the ``pelican`` "
 "command:"
 msgstr "默认情况下，有两个主题可供选择。可以使用 ``THEME`` 选项指定，或是在 ``pelican`` 命令中使用 ``-t`` 选项的参数传入。"
 
-#: ../../settings.rst:1218 bad7ba14225c4a47922ce9440f0bfb11
+#: ../../settings.rst:1297 f1ea5d4700ca4f1091d6ee798596cff7
 msgid "notmyidea"
 msgstr "notmyidea（默认值）"
 
-#: ../../settings.rst:1219 16954ec8b6224cd7902c5af01586f5cb
+#: ../../settings.rst:1298 9b7be83a91ab4de7bd6d7a30dbcef939
 msgid "simple (a synonym for \"plain text\" :)"
 msgstr "simple（即“plain text”）"
 
-#: ../../settings.rst:1221 7d839f8fe8ea454abb64906c4cf38932
+#: ../../settings.rst:1300 3ac1546ab1144586825809c12f4abc78
 msgid ""
 "There are a number of other themes available at "
 "https://github.com/getpelican/pelican-themes. Pelican comes with :doc"
@@ -1564,98 +1762,107 @@ msgstr ""
 "还有很多主题可以在 https://github.com/getpelican/pelican-themes 上下载。Pelican使用一个称为 "
 ":doc:`pelican-themes` 的小脚本来管理主题。"
 
-#: ../../settings.rst:1225 d512f8161e89412693a9acb00948e348
+#: ../../settings.rst:1304 f1b29806557540ddaefe6bc035a48459
 msgid ""
 "You can define your own theme, either by starting from scratch or by "
 "duplicating and modifying a pre-existing theme. Here is :doc:`a guide on "
 "how to create your theme <themes>`."
 msgstr "你还可以创建自己的主题，可以从头开始，也可以在已有主题的基础上修改。请参看 :doc:`主题 <themes>` 文档。"
 
-#: ../../settings.rst:1229 696c62600fb4479bbbbc6a010024d2aa
+#: ../../settings.rst:1308 47a8dd97888b440aabbea22aee72630a
 msgid "Following are example ways to specify your preferred theme::"
 msgstr "下面是几个指定某个主题的例子："
 
-#: ../../settings.rst:1240 e70559ce885e4db0aa17a71a9a2ed757
+#: ../../settings.rst:1319 3f51b49bed124af39ae67bf60c8384f8
 msgid ""
 "The built-in ``simple`` theme can be customized using the following "
 "settings."
 msgstr "内置的 ``simple`` 主题可以使用以下设置项进行自定义。"
 
-#: ../../settings.rst:1244 67a316d5c57045448387c17445e71a53
-msgid "The URL of the stylesheet to use."
-msgstr "要使用的样式表的URL。"
+#: ../../settings.rst:1323 08d86196410f482e803c69d85078652a
+msgid "The URL of the stylesheet to use. The default is ``None``."
+msgstr "要使用的样式表的URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1246 61fc5d9b1f0c4b6586fd458660e384ff
+#: ../../settings.rst:1325 369beaeb61fd4e4f843d8174b666c0a7
 msgid ""
 "The built-in ``notmyidea`` theme can make good use of the following "
 "settings. Feel free to use them in your themes as well."
 msgstr "下面的一下选项可以很好地作用于内置的 ``notmyidea`` 主题。当然在其他主题中你也可以尽情尝试这些选项。"
 
-#: ../../settings.rst:1251 fdd6425dea494c098212b971ed30bb71
-msgid "A subtitle to appear in the header."
-msgstr "页面顶部要显示的副标题。"
+#: ../../settings.rst:1330 7f647c4c65494b93bb6d1c3ef4b39af6
+msgid "A subtitle to appear in the header. The default is ``None``."
+msgstr "页面顶部要显示的副标题。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1255 706528c7601a4352a40399b6a7b8b8dd
+#: ../../settings.rst:1334 49eda3f428d7490bb78e081bbc941e64
 msgid ""
 "Pelican can handle Disqus comments. Specify the Disqus sitename "
-"identifier here."
-msgstr "可以在Pelican中使用Disqus的评论系统，此设置项用于设置Disqus的站点标识符。"
+"identifier here. The default is ``None``."
+msgstr "可以在Pelican中使用Disqus的评论系统，此设置项用于设置Disqus的站点标识符。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1260 c0ff07ee87814a60b798b0b22b562af0
+#: ../../settings.rst:1339 a52590c6150e459495608626cf47cbc8
 msgid ""
 "Your GitHub URL (if you have one). It will then use this information to "
-"create a GitHub ribbon."
-msgstr "指定你的GitHub URL（如果有的话），此信息将被用于创建GitHub功能区。"
+"create a GitHub ribbon. The default is ``None``."
+msgstr "指定你的GitHub URL（如果有的话），此信息将被用于创建GitHub标记。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1265 751716f49245400b99fdbb95052f8cb4
+#: ../../settings.rst:1344 7a1fab7bd7d248aca77d6cebb71415fb
 msgid ""
 "Put any desired analytics scripts in this setting in ``publishconf.py``. "
 "Example:"
 msgstr "在 ``publishconf.py`` 中设置此项，用于指定想要使用的统计分析脚本。如下例："
 
-#: ../../settings.rst:1279 e65031f7629d4b06b837b05b80b68141
+#: ../../settings.rst:1356 f0fd9392aa0544248ae3ecfa505cbd50
+msgid "The default is ``None``."
+msgstr "默认为 ``None``"
+
+#: ../../settings.rst:1360 5f3cf76b56694fa88318f38e06dfb9d9
 msgid ""
 "A list of tuples (Title, URL) for additional menu items to appear at the "
-"beginning of the main menu."
-msgstr "元组 (标题, URL) 的列表，用于指定额外的菜单项，会添加在菜单栏的开头。"
+"beginning of the main menu. The default is ``None``."
+msgstr "指定 (标题, URL) 元组的列表，用于指定额外的菜单项，会添加在菜单栏的开头。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1284 13839251877b49bb9962c0bc7b75f951
-msgid "A list of tuples (Title, URL) for links to appear on the header."
-msgstr "元组 (标题, URL) 的列表，用于指定要展示在网页开头的链接。"
+#: ../../settings.rst:1365 23402de55a8d4b9a99f81aa3cbfd334f
+msgid ""
+"A list of tuples (Title, URL) for links to appear on the header. The "
+"default is ``None``."
+msgstr "指定 (标题, URL) 元组的列表，用于指定要展示在顶部的链接。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1288 3a22924a9cb242029138754da6257800
-msgid "A list of tuples (Title, URL) to appear in the \"social\" section."
-msgstr "元组 (标题, URL) 的列表，用于指定要展示在“social”部分的内容。"
+#: ../../settings.rst:1370 55e5a965cc1f45eea43a064d8c93c758
+msgid ""
+"A list of tuples (Title, URL) to appear in the \"social\" section. The "
+"default is ``None``."
+msgstr "指定 (标题, URL) 元组的列表，用于指定要展示在“social”部分的内容。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1292 4e64ba4558af483ea5234a40b6a7f667
+#: ../../settings.rst:1375 2b60264917b1429b9252029724038ed9
 msgid ""
 "Allows for adding a button to articles to encourage others to tweet about"
-" them. Add your Twitter username if you want this button to appear."
-msgstr "允许在文章中添加按钮，以鼓励其他人发布有关它们的推文。如果希望显示此按钮，在此项中设置你的Twitter用户名。"
+" them. Add your Twitter username if you want this button to appear. The "
+"default is ``None``."
+msgstr "允许在文章中添加按钮，以便其他人在tweet上引用。如果希望显示此按钮，在此项中设置你的Twitter用户名。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1297 1948a7f1556942869467e12269a83c97
+#: ../../settings.rst:1381 f625d19e9cfc481f90ba05c050829ef3
 msgid ""
 "Allows override of the name of the links widget.  If not specified, "
-"defaults to \"links\"."
-msgstr "指定用于覆盖“links”部分的名称。默认值为“links”。"
+"defaults to \"links\". The default is ``None``."
+msgstr "指定用于覆盖“links”部分的名称，若不指定，默认设为 “links”。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1302 4fcc458a089d46ec80586edae17cd901
+#: ../../settings.rst:1386 54cd361f2d6c44ec8b8838f2364f9c7f
 msgid ""
 "Allows override of the name of the \"social\" widget.  If not specified, "
-"defaults to \"social\"."
-msgstr "指定用于覆盖“social”部分的名称。默认值为“social”。"
+"defaults to \"social\". The default is ``None``."
+msgstr "指定用于覆盖“social”部分的名称。若不指定，默认设为 “social”。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1305 481872501e9f4df687b70830929f429f
+#: ../../settings.rst:1389 16874b8a80b149578efba9c45a78a9c7
 msgid ""
 "In addition, you can use the \"wide\" version of the ``notmyidea`` theme "
 "by adding the following to your configuration::"
 msgstr "另外，你可以使用 ``notmyidea`` 主题的“宽屏”版本，在配置文件中添加下面这行配置即可："
 
-#: ../../settings.rst:1312 add39f626ea24dd6885a117bdbef1c2b
+#: ../../settings.rst:1396 9d24e75fc67d4b98a06bbe832f7cd947
 msgid "Logging"
 msgstr "日志"
 
-#: ../../settings.rst:1314 16c2fccd07c44079989173c2b101439f
+#: ../../settings.rst:1398 9ddaf0c25b314e609b7de6873b2cfbcf
 msgid ""
 "Sometimes, a long list of warnings may appear during site generation. "
 "Finding the **meaningful** error message in the middle of tons of "
@@ -1665,7 +1872,7 @@ msgstr ""
 "在站点生成过程中有时可能会出现一堆警告信息。在这一大堆日志输出中寻找 **有意义** "
 "的错误消息是非常棘手的。为了过滤掉多余的日志消息，可以在Pelican中指定 ``LOG_FILTER`` 设置。"
 
-#: ../../settings.rst:1319 0a8d1eb4cad64db1bdccc37e40c0d5b9
+#: ../../settings.rst:1403 4c3ea89d86e846f3b38f146060f19c53
 msgid ""
 "``LOG_FILTER`` should be a list of tuples ``(level, msg)``, each of them "
 "being composed of the logging level (up to ``warning``) and the message "
@@ -1675,43 +1882,43 @@ msgstr ""
 "``LOG_FILTER`` 是元组 ``(level, msg)`` ，level指定日志记录等级（最高为 ``warning`` "
 "），msg指定要忽略的消息。将想要隐藏的日志消息添加到此列表中就可以将他们过滤掉。"
 
-#: ../../settings.rst:1324 ../../settings.rst:1332
-#: a060e3f3d20b4f5ca0891c81e1e6bf44
+#: ../../settings.rst:1408 ../../settings.rst:1416
+#: b62320cd110548f08cdc2b9ff52953d5
 msgid "For example::"
 msgstr "例如："
 
-#: ../../settings.rst:1329 66bf87b59c0547d6992c494296f54cba
+#: ../../settings.rst:1413 8a81ee82a14e4571852d1b955568028a
 msgid ""
 "It is possible to filter out messages by a template. Check out source "
 "code to obtain a template."
 msgstr "用模板字符串指定要过滤的消息也是可以的。具体的消息种类请查看源码。"
 
-#: ../../settings.rst:1339 77c817d503564c58b81e694cd2f2c357
+#: ../../settings.rst:1423 880baed291ff4f63836986b7c9082825
 msgid ""
 "Silencing messages by templates is a dangerous feature. It is possible to"
 " unintentionally filter out multiple message types with the same template"
 " (including messages from future Pelican versions). Proceed with caution."
 msgstr "通过模板过滤忽略消息是一个危险的功能。 使用同一模板可能会无意中过滤掉多种消息类型（包括来自新版本Pelican的消息），请谨慎行事。"
 
-#: ../../settings.rst:1345 2ca9fb8cc8854442b52381580df2423e
+#: ../../settings.rst:1429 988048d34b0340beb22f11922ce0959a
 msgid "This option does nothing if ``--debug`` is passed."
 msgstr "当使用了 ``--debug`` 参数，此项设置就不会起作用。"
 
-#: ../../settings.rst:1351 a915c4d447a44d9d8f1df8aeb978a590
+#: ../../settings.rst:1435 e1b3e06d5d29428ba28f2842124a7dcc
 msgid "Reading only modified content"
 msgstr "只读取修改过的内容"
 
-#: ../../settings.rst:1353 7c899d3702eb4c9389b29caa1dd199bf
+#: ../../settings.rst:1437 ff9209b75d1645c8b5af8941525fead0
 msgid ""
 "To speed up the build process, Pelican can optionally read only articles "
 "and pages with modified content."
 msgstr "为了加速网站构建过程，Pelican能够只读取修改过内容的文章和页面。"
 
-#: ../../settings.rst:1356 22170a8c737540d6b2826de10d97f57e
+#: ../../settings.rst:1440 5aee5c450b2047bea84e436894c179ef
 msgid "When Pelican is about to read some content source file:"
 msgstr "当Pelican准备读取内容源文件时，会执行下面的规则："
 
-#: ../../settings.rst:1358 c746f9e5624441c4a53d81f9049910d8
+#: ../../settings.rst:1442 0aca4765447b49308b5a52b22a74d16a
 msgid ""
 "The hash or modification time information for the file from a previous "
 "build are loaded from a cache file if ``LOAD_CONTENT_CACHE`` is ``True``."
@@ -1722,24 +1929,24 @@ msgstr ""
 "，则从缓存文件中加载上一次构建时文件的哈希值或修改时间。这些缓存的文件存储在 ``CACHE_PATH`` "
 "所指定的目录中。若文件是新的，在缓存文件中没有记录，则照常读取。"
 
-#: ../../settings.rst:1362 20764c61c87044a6a7cfaca089dbe088
+#: ../../settings.rst:1446 b8bb9d616a2d41b484ec5440fa09e57a
 msgid "The file is checked according to ``CHECK_MODIFIED_METHOD``:"
 msgstr "文件会以 ``CHECK_MODIFIED_METHOD`` 设置的方式检查："
 
-#: ../../settings.rst:1368 f31c72607b3c4c6e99d97c7db70ffdd6
+#: ../../settings.rst:1452 fb6105f54c80491c80f99b8b447c5a4b
 msgid ""
 "If set to anything else or the necessary information about the file "
 "cannot be found in the cache file, the content is read as usual."
 msgstr "如果设置为其他任何值或在缓存文件中无法找到有关该文件的必要信息，则将照常读取内容。"
 
-#: ../../settings.rst:1371 32c11190a05847fc94ef489e2cd75ebc
+#: ../../settings.rst:1455 c46fe5fc65a44157b02b9e26befcefc6
 msgid ""
 "If the file is considered unchanged, the content data saved in a previous"
 " build corresponding to the file is loaded from the cache, and the file "
 "is not read."
 msgstr "如果Pelican认为文件没有更改过，会直接从上一次构建的对应文件中加载内容，源文件就不会被读取。"
 
-#: ../../settings.rst:1374 8a6a10580d4646c08562a415ab80b032
+#: ../../settings.rst:1458 0d597148978d4d228fc55b546d77ba97
 msgid ""
 "If the file is considered changed, the file is read and the new "
 "modification information and the content data are saved to the cache if "
@@ -1748,7 +1955,7 @@ msgstr ""
 "若Pelican认为文件更改过了，则会读取源文件；若 ``CACHE_CONTENT`` 设为了 ``True`` "
 "，Pelican还会将修改后的信息以及内容数据存入缓存。"
 
-#: ../../settings.rst:1378 4d2198d1f1a04c0ab92bd5a2bfe2f3bd
+#: ../../settings.rst:1462 e1c91fa9ecf84419a4e34e3fa0951b56
 msgid ""
 "If ``CONTENT_CACHING_LAYER`` is set to ``'reader'`` (the default), the "
 "raw content and metadata returned by a reader are cached. If this setting"
@@ -1763,7 +1970,7 @@ msgstr ""
 "，则缓存处理过后的内容对象。缓存已处理的内容对象可能会和插件（因为可能会跳过一些与读取相关的信号）与 ``WITH_FUTURE_DATES`` "
 "的功能（因为已处理内容对象的 ``draft`` 状态不会改变）冲突。"
 
-#: ../../settings.rst:1386 75139bf4fb6f40649b4691f4158d1eee
+#: ../../settings.rst:1470 d46b39637a86497eb38667c8ecf9bf66
 msgid ""
 "Checking modification times is faster than comparing file hashes, but it "
 "is not as reliable because ``mtime`` information can be lost, e.g., when "
@@ -1775,7 +1982,7 @@ msgstr ""
 "``rsync`` 命令时没有开启 ``mtime`` 保留模式。（rsync可以通过指定 ``--archive`` 标志启用 "
 "``mtime`` 保留模式）"
 
-#: ../../settings.rst:1392 f556d8c0bd75495ca85a41e310637101
+#: ../../settings.rst:1476 3ef54978b60c4fcb9f2b0dc625797b74
 msgid ""
 "The cache files are Python pickles, so they may not be readable by "
 "different versions of Python as the pickle format often changes. If such "
@@ -1787,7 +1994,7 @@ msgstr ""
 "pickles，因此不同版本的Python由于pickle文件格式变化可能无法读取缓存。如果遇到此类错误，会自动以新格式重新构建缓存。另外，当 "
 "``GZIP_CACHE`` 设置发生变化后，缓存也会自动重建。"
 
-#: ../../settings.rst:1398 2b6a584c560d467ba34a744bb37c0006
+#: ../../settings.rst:1482 40fb13c9fe444d109c9014ce4f294f92
 msgid ""
 "The ``--ignore-cache`` command-line option is useful when the whole cache"
 " needs to be regenerated, such as when making modifications to the "
@@ -1800,7 +2007,7 @@ msgstr ""
 "命令行选项，例如当需要修改会影响缓存内容的设置项时，或是调试时，都可以使用 ``--ignore-cache`` 。若 "
 "``AUTORELOAD_IGNORE_CACHE`` 设为了 ``True`` ，修改设置文件时会自动忽略缓存。"
 
-#: ../../settings.rst:1404 a38225b961234c2e96f6d0f2545ed455
+#: ../../settings.rst:1488 05ea098bd1b34660878cc598cf9c639c
 msgid ""
 "Note that even when using cached content, all output is always written, "
 "so the modification times of the generated ``*.html`` files will always "
@@ -1810,6 +2017,54 @@ msgstr ""
 "需要注意的是，即使使用了缓存的内容，最终的输出文件也始终会进行重新写入，因此生成的 ``*.html`` 文件的修改时间始终会变化。所以，基于 "
 "``rsync`` 进行上传时，可以考虑使用 ``--checksum`` 选项。"
 
-#: ../../settings.rst:1411 2aa4b6fbbab24465ab36a606cecf299c
+#: ../../settings.rst:1495 358bf9edd2594e2fa3db87aae3703994
 msgid "Example settings"
 msgstr "配置示例"
+
+#~ msgid "Your site name"
+#~ msgstr "站点名称"
+
+#~ msgid "The URL to refer to an article."
+#~ msgstr "文章的URL格式。"
+
+#~ msgid "The place where we will save an article."
+#~ msgstr "文章的存储位置。"
+
+#~ msgid "The URL we will use to link to a page."
+#~ msgstr "页面的URL格式。"
+
+#~ msgid "The URL used to link to a page draft."
+#~ msgstr "draft状态页面的URL。"
+
+#~ msgid "The actual location a page draft is saved at."
+#~ msgstr "draft状态页面的实际存储位置。"
+
+#~ msgid "The URL to use for an author."
+#~ msgstr "某一个作者的URL格式。"
+
+#~ msgid "The location to save an author."
+#~ msgstr "某一个作者的存储位置。"
+
+#~ msgid "The URL to use for a category."
+#~ msgstr "某一个分类的URL格式。"
+
+#~ msgid "The location to save a category."
+#~ msgstr "某一个分类的存储位置。"
+
+#~ msgid "The URL to use for a tag."
+#~ msgstr "某一个标签的URL格式。"
+
+#~ msgid "Default is the system locale."
+#~ msgstr "默认值与系统的地区设置保持一致。"
+
+#~ msgid "Default author (usually your name)."
+#~ msgstr "默认作者（通常是你自己的名字）。"
+
+#~ msgid "See also ``SLUGIFY_SOURCE``."
+#~ msgstr "另请参看 ``SLUGIFY_SOURCE`` 。"
+
+#~ msgid "The location to save the Atom feed."
+#~ msgstr "指定保存Atom订阅源的位置。"
+
+#~ msgid "The location to save the RSS feed."
+#~ msgstr "指定保存RSS订阅源的位置。"

From 7ef5eae6399641b59987bbb408733fc9f6fe3207 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 21 Jul 2025 20:14:15 +0200
Subject: [PATCH 2801/2864] Update feed functional tests for FeedGenerator 2.2

---
 .../basic/feeds/alexis-metaireau.atom.xml     |  6 ++---
 .../basic/feeds/alexis-metaireau.rss.xml      |  6 ++---
 .../tests/output/basic/feeds/all-en.atom.xml  | 22 ++++++++--------
 .../tests/output/basic/feeds/all-fr.atom.xml  |  6 ++---
 pelican/tests/output/basic/feeds/all.atom.xml | 26 +++++++++----------
 pelican/tests/output/basic/feeds/bar.atom.xml |  4 +--
 .../tests/output/basic/feeds/cat1.atom.xml    | 10 +++----
 .../tests/output/basic/feeds/misc.atom.xml    | 10 +++----
 .../tests/output/basic/feeds/yeah.atom.xml    |  4 +--
 .../custom/feeds/alexis-metaireau.atom.xml    | 22 ++++++++--------
 .../custom/feeds/alexis-metaireau.rss.xml     | 22 ++++++++--------
 .../tests/output/custom/feeds/all-en.atom.xml | 22 ++++++++--------
 .../tests/output/custom/feeds/all-fr.atom.xml |  6 ++---
 .../tests/output/custom/feeds/all.atom.xml    | 26 +++++++++----------
 pelican/tests/output/custom/feeds/all.rss.xml | 26 +++++++++----------
 .../tests/output/custom/feeds/bar.atom.xml    |  4 +--
 pelican/tests/output/custom/feeds/bar.rss.xml |  4 +--
 .../tests/output/custom/feeds/cat1.atom.xml   | 10 +++----
 .../tests/output/custom/feeds/cat1.rss.xml    | 10 +++----
 .../tests/output/custom/feeds/misc.atom.xml   | 10 +++----
 .../tests/output/custom/feeds/misc.rss.xml    | 10 +++----
 .../tests/output/custom/feeds/yeah.atom.xml   |  4 +--
 .../tests/output/custom/feeds/yeah.rss.xml    |  4 +--
 .../feeds/alexis-metaireau.atom.xml           | 22 ++++++++--------
 .../feeds/alexis-metaireau.rss.xml            | 22 ++++++++--------
 .../custom_locale/feeds/all-en.atom.xml       | 22 ++++++++--------
 .../custom_locale/feeds/all-fr.atom.xml       |  6 ++---
 .../output/custom_locale/feeds/all.atom.xml   | 26 +++++++++----------
 .../output/custom_locale/feeds/all.rss.xml    | 26 +++++++++----------
 .../output/custom_locale/feeds/bar.atom.xml   |  4 +--
 .../output/custom_locale/feeds/bar.rss.xml    |  4 +--
 .../output/custom_locale/feeds/cat1.atom.xml  | 10 +++----
 .../output/custom_locale/feeds/cat1.rss.xml   | 10 +++----
 .../output/custom_locale/feeds/misc.atom.xml  | 10 +++----
 .../output/custom_locale/feeds/misc.rss.xml   | 10 +++----
 .../output/custom_locale/feeds/yeah.atom.xml  |  4 +--
 .../output/custom_locale/feeds/yeah.rss.xml   |  4 +--
 37 files changed, 227 insertions(+), 227 deletions(-)

diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index a0306a0b..94d038c8 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - Alexis Métaireau</title><link href="/" rel="alternate"></link><link href="/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - Alexis Métaireau</title><link href="/" rel="alternate"/><link href="/feeds/alexis-metaireau.atom.xml" rel="self"/><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"/><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -13,10 +13,10 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"/><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index d4989286..876648a8 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>A Pelican Blog - Alexis Métaireau</title><link>/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>A Pelican Blog - Alexis Métaireau</title><link>/</link><description/><atom:link href="/feeds/alexis-metaireau.rss.xml" rel="self"/><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0000</lastBuildDate><item><title>This is a super article !</title><link>/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0000</pubDate><guid>tag:None,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid>tag:None,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 73261f1d..f420f5d3 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-en.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"/><link href="/feeds/all-en.atom.xml" rel="self"/><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"/><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name/></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"/><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name/></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"/><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"/></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"/><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"/><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"/><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"/><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -20,13 +20,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"/><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"/><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name/></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -70,5 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+</content><category term="misc"/></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"/><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name/></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index bca3d2cb..a1249178 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"/><link href="/feeds/all-fr.atom.xml" rel="self"/><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"/><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name/></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"/><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name/></author><id>tag:None,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index 41dd9cbf..2fb89a47 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"/><link href="/feeds/all.atom.xml" rel="self"/><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"/><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name/></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"/><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name/></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"/><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name/></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"/><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"/></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"/><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"/><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"/><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"/><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -21,14 +21,14 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"/><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"/><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name/></author><id>tag:None,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"/><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name/></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -72,5 +72,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+</content><category term="misc"/></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"/><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name/></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index 93fff29c..1b2065d8 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - bar</title><link href="/" rel="alternate"></link><link href="/feeds/bar.atom.xml" rel="self"></link><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - bar</title><link href="/" rel="alternate"/><link href="/feeds/bar.atom.xml" rel="self"/><id>/</id><updated>2010-10-20T10:14:00+00:00</updated><entry><title>Oh yeah !</title><link href="/oh-yeah.html" rel="alternate"/><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index 2f054a1c..90e58bfb 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - cat1</title><link href="/" rel="alternate"></link><link href="/feeds/cat1.atom.xml" rel="self"></link><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - cat1</title><link href="/" rel="alternate"/><link href="/feeds/cat1.atom.xml" rel="self"/><id>/</id><updated>2011-04-20T00:00:00+00:00</updated><entry><title>A markdown powered article</title><link href="/a-markdown-powered-article.html" rel="alternate"/><published>2011-04-20T00:00:00+00:00</published><updated>2011-04-20T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry></feed>
+&lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"/></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"/><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"/><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"/><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name/></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"/></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index 94730137..f6ebe315 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - misc</title><link href="/" rel="alternate"></link><link href="/feeds/misc.atom.xml" rel="self"></link><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - misc</title><link href="/" rel="alternate"/><link href="/feeds/misc.atom.xml" rel="self"/><id>/</id><updated>2012-11-30T00:00:00+00:00</updated><entry><title>FILENAME_METADATA example</title><link href="/filename_metadata-example.html" rel="alternate"/><published>2012-11-30T00:00:00+00:00</published><updated>2012-11-30T00:00:00+00:00</updated><author><name/></author><id>tag:None,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Second article</title><link href="/second-article.html" rel="alternate"/><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name/></author><id>tag:None,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>Unbelievable !</title><link href="/unbelievable.html" rel="alternate"/><published>2010-10-15T20:30:00+00:00</published><updated>2010-10-15T20:30:00+00:00</updated><author><name/></author><id>tag:None,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -45,5 +45,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+</content><category term="misc"/></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"/><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name/></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 6411bf6d..0193a00e 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - yeah</title><link href="/" rel="alternate"></link><link href="/feeds/yeah.atom.xml" rel="self"></link><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+<feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog - yeah</title><link href="/" rel="alternate"/><link href="/feeds/yeah.atom.xml" rel="self"/><id>/</id><updated>2013-11-17T23:29:00+00:00</updated><entry><title>This is a super article !</title><link href="/this-is-a-super-article.html" rel="alternate"/><published>2010-12-02T10:14:00+00:00</published><updated>2013-11-17T23:29:00+00:00</updated><author><name>Alexis Métaireau</name></author><id>tag:None,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index affc9e2f..33a908fc 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"/><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"/><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"/></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"/><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -20,13 +20,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"/><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -70,5 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+</content><category term="misc"/></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"/><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index b5654682..ac26f9d9 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"/><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -25,5 +25,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index d20fabb8..09475566 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"/><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"/><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"/></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"/><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -20,13 +20,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"/><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -70,5 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+</content><category term="misc"/></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"/><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index 68ebd738..934e857d 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index 15d98711..b3b6d682 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"/><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"/><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"/></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"/><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -21,14 +21,14 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"/><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -72,5 +72,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+</content><category term="misc"/></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"/><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index 45a8dc58..0fc1932d 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"/><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</guid><category>misc</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</guid><category>misc</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -27,5 +27,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index d79aad2d..6e16e339 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><subtitle>A personal blog.</subtitle><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><subtitle>A personal blog.</subtitle><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/oh-yeah.html" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index c993753a..aec898f5 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - bar</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log - bar</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"/><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/oh-yeah.html</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index c44ac595..50605d9c 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><subtitle>A personal blog.</subtitle><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><subtitle>A personal blog.</subtitle><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/a-markdown-powered-article.html" rel="alternate"/><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry></feed>
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"/></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"/></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index a6ca0b53..18f41401 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"/><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/a-markdown-powered-article.html</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item></channel></rss>
+&lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index 9365d612..f79beb87 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/filename_metadata-example.html" rel="alternate"/><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/second-article.html" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article.html</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/unbelievable.html" rel="alternate"/><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -45,5 +45,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+</content><category term="misc"/></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"/><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 03b3b2fe..c309dbea 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"/><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/filename_metadata-example.html</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:/filename_metadata-example.html</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/second-article.html</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:/second-article.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/unbelievable.html</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/a-markdown-powered-article.html"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -12,5 +12,5 @@
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index 0e5e8858..d7013e66 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/this-is-a-super-article.html" rel="alternate"/><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index be592f11..fd82614c 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"/><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index 3e25af4a..ed48b839 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - Alexis Métaireau</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/alexis-metaireau.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"/><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"/><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"/></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"/><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -20,13 +20,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"/><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -70,5 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+</content><category term="misc"/></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"/><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index f383a84d..d014d9b0 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log - Alexis Métaireau</title><link>http://blog.notmyidea.org/</link><description/><atom:link href="http://blog.notmyidea.org/feeds/alexis-metaireau.rss.xml" rel="self"/><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -25,5 +25,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index b88949b4..f96c7dce 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/all-en.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"/><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"/><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"/></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"/><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -20,13 +20,13 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"/><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -70,5 +70,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+</content><category term="misc"/></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"/><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
index f44b17f2..4b491f62 100644
--- a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index acb0ca23..774e5bfc 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/all.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"/><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"/><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"/></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"/><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -21,14 +21,14 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"/><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -72,5 +72,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+</content><category term="misc"/></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"/><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index 9642bef9..588e4ea9 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log</title><link>http://blog.notmyidea.org/</link><description/><atom:link href="http://blog.notmyidea.org/feeds/all.rss.xml" rel="self"/><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Deuxième article</title><link>http://blog.notmyidea.org/second-article-fr.html</link><description>&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</guid><category>misc</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item><item><title>Trop bien !</title><link>http://blog.notmyidea.org/oh-yeah-fr.html</link><description>&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</guid><category>misc</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -27,5 +27,5 @@ YEAH !&lt;/p&gt;
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index f3d8cc1e..2bef0511 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - bar</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/bar.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2010-10-20T10:14:00+02:00</updated><entry><title>Oh yeah !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/" rel="alternate"/><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</id><content type="html">&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
+</content><category term="bar"/><category term="oh"/><category term="bar"/><category term="yeah"/></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
index 71130b31..4e922bb3 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - bar</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log - bar</title><link>http://blog.notmyidea.org/</link><description/><atom:link href="http://blog.notmyidea.org/feeds/bar.rss.xml" rel="self"/><lastBuildDate>Wed, 20 Oct 2010 10:14:00 +0200</lastBuildDate><item><title>Oh yeah !</title><link>http://blog.notmyidea.org/posts/2010/octobre/20/oh-yeah/</link><description>&lt;div class="section" id="why-not"&gt;
 &lt;h2&gt;Why not ?&lt;/h2&gt;
 &lt;p&gt;After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index 9a72b398..c1d134f0 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"></link><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - cat1</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/cat1.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2011-04-20T00:00:00+02:00</updated><entry><title>A markdown powered article</title><link href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/" rel="alternate"/><published>2011-04-20T00:00:00+02:00</published><updated>2011-04-20T00:00:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</id><content type="html">&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
-</content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry></feed>
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"/></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
+</content><category term="cat1"/></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"/><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
+</content><category term="cat1"/></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
index c16b8092..1c797a86 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log - cat1</title><link>http://blog.notmyidea.org/</link><description/><atom:link href="http://blog.notmyidea.org/feeds/cat1.rss.xml" rel="self"/><lastBuildDate>Wed, 20 Apr 2011 00:00:00 +0200</lastBuildDate><item><title>A markdown powered article</title><link>http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/</link><description>&lt;p&gt;You're mutually oblivious.&lt;/p&gt;
 &lt;p&gt;&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a root-relative link to unbelievable&lt;/a&gt;
-&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item></channel></rss>
+&lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index 2484c569..4b5e5e87 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"></link><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</content><category term="misc"></category></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
-</content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"></link><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - misc</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/misc.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2012-11-30T00:00:00+01:00</updated><entry><title>FILENAME_METADATA example</title><link href="http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/" rel="alternate"/><published>2012-11-30T00:00:00+01:00</published><updated>2012-11-30T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</id><content type="html">&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</content><category term="misc"/></entry><entry><title>Second article</title><link href="http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/" rel="alternate"/><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</id><content type="html">&lt;p&gt;This is some article, in english&lt;/p&gt;
+</content><category term="misc"/><category term="foo"/><category term="bar"/><category term="baz"/></entry><entry><title>Unbelievable !</title><link href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/" rel="alternate"/><published>2010-10-15T20:30:00+02:00</published><updated>2010-10-15T20:30:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</id><summary type="html">&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -45,5 +45,5 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;/pre&gt;&lt;/div&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
+</content><category term="misc"/></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"/><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</content><category term="misc"/></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index d1493ae8..fe4f0674 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log - misc</title><link>http://blog.notmyidea.org/</link><description/><atom:link href="http://blog.notmyidea.org/feeds/misc.rss.xml" rel="self"/><lastBuildDate>Fri, 30 Nov 2012 00:00:00 +0100</lastBuildDate><item><title>FILENAME_METADATA example</title><link>http://blog.notmyidea.org/posts/2012/novembre/30/filename_metadata-example/</link><description>&lt;p&gt;Some cool stuff!&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 30 Nov 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-11-30:/posts/2012/novembre/30/filename_metadata-example/</guid><category>misc</category></item><item><title>Second article</title><link>http://blog.notmyidea.org/posts/2012/f%C3%A9vrier/29/second-article/</link><description>&lt;p&gt;This is some article, in english&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 29 Feb 2012 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2012-02-29:/posts/2012/février/29/second-article/</guid><category>misc</category><category>foo</category><category>bar</category><category>baz</category></item><item><title>Unbelievable !</title><link>http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/</link><description>&lt;p&gt;Or completely awesome. Depends the needs.&lt;/p&gt;
 &lt;p&gt;&lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a root-relative link to markdown-article&lt;/a&gt;
 &lt;a class="reference external" href="http://blog.notmyidea.org/posts/2011/avril/20/a-markdown-powered-article/"&gt;a file-relative link to markdown-article&lt;/a&gt;&lt;/p&gt;
 &lt;div class="section" id="testing-sourcecode-directive"&gt;
@@ -12,5 +12,5 @@
 &lt;div class="section" id="testing-another-case"&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
-pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
+pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid>tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index f316ada5..cdfd203a 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"></link><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log - yeah</title><link href="http://blog.notmyidea.org/" rel="alternate"/><link href="http://blog.notmyidea.org/feeds/yeah.atom.xml" rel="self"/><id>http://blog.notmyidea.org/</id><updated>2013-11-17T23:29:00+01:00</updated><entry><title>This is a super article !</title><link href="http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/" rel="alternate"/><published>2010-12-02T10:14:00+01:00</published><updated>2013-11-17T23:29:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</id><summary type="html">&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 </summary><content type="html">&lt;p&gt;Some content here !&lt;/p&gt;
 &lt;div class="section" id="this-is-a-simple-title"&gt;
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
+</content><category term="yeah"/><category term="foo"/><category term="bar"/><category term="foobar"/></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index a0d0ba28..a0e11fe8 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description/><atom:link href="http://blog.notmyidea.org/feeds/yeah.rss.xml" rel="self"/><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid>tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>

From 595713b91a2dba6e4f1f289c1d1f6c7f04afe729 Mon Sep 17 00:00:00 2001
From: Ilya Simpson <elliot@p-s.co.nz>
Date: Mon, 2 Jun 2025 17:29:44 +1200
Subject: [PATCH 2802/2864] Fix default `FEED_DOMAIN`: `None` -> `SITEURL`.

This is similar to how `AUTHOR_REGEX_SUBSTITUTIONS` is described, for
instance.
---
 docs/settings.rst | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 2fac8853..67d1080f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -969,10 +969,7 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 
    The domain prepended to feed URLs. Since feed URLs should always be
    absolute, it is highly recommended to define this (e.g.,
-   "https://feeds.example.com"). If you have already explicitly defined SITEURL
-   (see above) and want to use the same domain for your feeds, you can just
-   set:  ``FEED_DOMAIN = SITEURL``. The default is ``None``, which uses the
-   base URL "/".
+   "https://feeds.example.com"). The default is ``SITEURL``.
 
 .. data:: FEED_ATOM
 

From 6df3cfc6e330d4ec4176694f9ccd8c3c027d8532 Mon Sep 17 00:00:00 2001
From: Ilya Simpson <elliot@p-s.co.nz>
Date: Tue, 22 Jul 2025 15:17:46 +1200
Subject: [PATCH 2803/2864] Enable `flake8-unused-arguments` Ruff rule.

---
 pelican/__init__.py             |  2 ++
 pelican/contents.py             |  3 ++-
 pelican/generators.py           |  3 +++
 pelican/readers.py              | 10 ++++++----
 pelican/rstdirectives.py        |  1 +
 pelican/tests/test_contents.py  |  2 +-
 pelican/tests/test_importer.py  |  6 +++---
 pelican/tests/test_server.py    |  2 +-
 pelican/tools/pelican_import.py |  1 -
 pelican/utils.py                |  8 +++-----
 pyproject.toml                  |  2 +-
 11 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 0e92def9..8d916fc7 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -252,6 +252,7 @@ class Pelican:
 
 class PrintSettings(argparse.Action):
     def __call__(self, parser, namespace, values, option_string):
+        del option_string  # Unused argument
         init_logging(name=__name__)
 
         try:
@@ -287,6 +288,7 @@ class PrintSettings(argparse.Action):
 
 class ParseOverrides(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
+        del parser, option_string  # Unused arguments
         overrides = {}
         for item in values:
             try:
diff --git a/pelican/contents.py b/pelican/contents.py
index daf72ce6..a06a1a6a 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -431,7 +431,7 @@ class Content:
         return self.get_content(self.get_siteurl())
 
     @memoized
-    def get_summary(self, siteurl: str) -> str:
+    def get_summary(self, _siteurl: str) -> str:
         """Returns the summary of an article.
 
         This is based on the summary metadata if set, otherwise truncate the
@@ -552,6 +552,7 @@ class SkipStub(Content):
     def __init__(
         self, content, metadata=None, settings=None, source_path=None, context=None
     ):
+        del content, metadata, settings, context  # Unused arguments
         self.source_path = source_path
 
     def is_valid(self):
diff --git a/pelican/generators.py b/pelican/generators.py
index 0e6b08ea..e04d1733 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -296,6 +296,7 @@ class _FileLoader(BaseLoader):
         self.fullpath = os.path.join(basedir, path)
 
     def get_source(self, environment, template):
+        del environment  # Unused argument
         if template != self.path or not os.path.exists(self.fullpath):
             raise TemplateNotFound(template)
         mtime = os.path.getmtime(self.fullpath)
@@ -1022,6 +1023,7 @@ class StaticGenerator(Generator):
         signals.static_generator_finalized.send(self)
 
     def generate_output(self, writer):
+        del writer  # Unused argument
         self._copy_paths(
             self.settings["THEME_STATIC_PATHS"],
             self.theme,
@@ -1131,6 +1133,7 @@ class SourceFileGenerator(Generator):
         copy(obj.source_path, dest)
 
     def generate_output(self, writer=None):
+        del writer  # Unused argument
         logger.info("Generating source files...")
         for obj in chain(self.context["articles"], self.context["pages"]):
             self._create_source(obj)
diff --git a/pelican/readers.py b/pelican/readers.py
index fc0a4f40..ca1b2393 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -45,15 +45,15 @@ DUPLICATES_DEFINITIONS_ALLOWED = {
 
 METADATA_PROCESSORS = {
     "tags": lambda x, y: ([Tag(tag, y) for tag in ensure_metadata_list(x)] or _DISCARD),
-    "date": lambda x, y: get_date(x.replace("_", " ")),
-    "modified": lambda x, y: get_date(x),
-    "status": lambda x, y: x.strip() or _DISCARD,
+    "date": lambda x, _y: get_date(x.replace("_", " ")),
+    "modified": lambda x, _y: get_date(x),
+    "status": lambda x, _y: x.strip() or _DISCARD,
     "category": lambda x, y: _process_if_nonempty(Category, x, y),
     "author": lambda x, y: _process_if_nonempty(Author, x, y),
     "authors": lambda x, y: (
         [Author(author, y) for author in ensure_metadata_list(x)] or _DISCARD
     ),
-    "slug": lambda x, y: x.strip() or _DISCARD,
+    "slug": lambda x, _y: x.strip() or _DISCARD,
 }
 
 logger = logging.getLogger(__name__)
@@ -121,6 +121,7 @@ class BaseReader:
 
     def read(self, source_path):
         "No-op parser"
+        del source_path  # Unused argument
         content = None
         metadata = {}
         return content, metadata
@@ -165,6 +166,7 @@ class PelicanHTMLTranslator(HTMLTranslator):
         self.body.append(self.starttag(node, "abbr", "", **attrs))
 
     def depart_abbreviation(self, node):
+        del node  # Unused argument
         self.body.append("</abbr>")
 
     def visit_image(self, node):
diff --git a/pelican/rstdirectives.py b/pelican/rstdirectives.py
index 9022ac83..e45a0582 100644
--- a/pelican/rstdirectives.py
+++ b/pelican/rstdirectives.py
@@ -79,6 +79,7 @@ class abbreviation(nodes.Inline, nodes.TextElement):
 
 
 def abbr_role(typ, rawtext, text, lineno, inliner, options=None, content=None):
+    del typ, rawtext, lineno, inliner, options, content  # Unused arguments
     text = utils.unescape(text)
     m = _abbr_re.search(text)
     if m is None:
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 3c3aae81..4b1effa2 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -333,7 +333,7 @@ class TestPage(TestBase):
         self.assertEqual("custom", custom_page.template)
 
     def test_signal(self):
-        def receiver_test_function(sender):
+        def receiver_test_function(_sender):
             receiver_test_function.has_been_called = True
 
         receiver_test_function.has_been_called = False
diff --git a/pelican/tests/test_importer.py b/pelican/tests/test_importer.py
index 10b0f7f6..2df56e0d 100644
--- a/pelican/tests/test_importer.py
+++ b/pelican/tests/test_importer.py
@@ -552,7 +552,7 @@ class TestWordpressXMLAttachements(TestCaseWithCLocale):
 class TestTumblrImporter(TestCaseWithCLocale):
     @patch("pelican.tools.pelican_import._get_tumblr_posts")
     def test_posts(self, get):
-        def get_posts(api_key, blogname, offset=0):
+        def get_posts(_api_key, _blogname, offset=0):
             if offset > 0:
                 return []
 
@@ -603,7 +603,7 @@ class TestTumblrImporter(TestCaseWithCLocale):
 
     @patch("pelican.tools.pelican_import._get_tumblr_posts")
     def test_video_embed(self, get):
-        def get_posts(api_key, blogname, offset=0):
+        def get_posts(_api_key, _blogname, offset=0):
             if offset > 0:
                 return []
 
@@ -657,7 +657,7 @@ class TestTumblrImporter(TestCaseWithCLocale):
 
     @patch("pelican.tools.pelican_import._get_tumblr_posts")
     def test_broken_video_embed(self, get):
-        def get_posts(api_key, blogname, offset=0):
+        def get_posts(_api_key, _blogname, offset=0):
             if offset > 0:
                 return []
 
diff --git a/pelican/tests/test_server.py b/pelican/tests/test_server.py
index fd616ef7..43cd070d 100644
--- a/pelican/tests/test_server.py
+++ b/pelican/tests/test_server.py
@@ -8,7 +8,7 @@ from pelican.tests.support import unittest
 
 
 class MockRequest:
-    def makefile(self, *args, **kwargs):
+    def makefile(self, *_args, **_kwargs):
         return BytesIO(b"")
 
 
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index d0f2b3c2..bd349ac9 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -941,7 +941,6 @@ def fields2pelican(
     strip_raw=False,
     disable_slugs=False,
     dirpage=False,
-    filename_template=None,
     filter_author=None,
     wp_custpost=False,
     wp_attach=False,
diff --git a/pelican/utils.py b/pelican/utils.py
index 5531d2fb..eb281ce9 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -8,7 +8,6 @@ import os
 import pathlib
 import re
 import shutil
-import sys
 import traceback
 import unicodedata
 import urllib
@@ -215,7 +214,7 @@ def deprecated_attribute(
         _warn()
         setattr(self, new, value)
 
-    def decorator(dummy):
+    def decorator(_dummy):
         return property(fget=fget, fset=fset, doc=doc)
 
     return decorator
@@ -235,9 +234,7 @@ def get_date(string: str) -> datetime.datetime:
 
 
 @contextmanager
-def pelican_open(
-    filename: str, mode: str = "r", strip_crs: bool = (sys.platform == "win32")
-) -> Generator[str, None, None]:
+def pelican_open(filename: str, mode: str = "r") -> Generator[str, None, None]:
     """Open a file and return its content"""
 
     # utf-8-sig will clear any BOM if present
@@ -493,6 +490,7 @@ class _HTMLWordTruncator(HTMLParser):
             self.add_word(self.last_word_end)
 
     def handle_starttag(self, tag: str, attrs: Any) -> None:
+        del attrs  # Unused argument
         self.add_last_word()
         if tag not in self._singlets:
             self.open_tags.insert(0, tag)
diff --git a/pyproject.toml b/pyproject.toml
index f92509f8..8d0fd9b9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -125,7 +125,7 @@ select = [
 
     # the rest in alphabetical order:
     "A",   # flake8-builtins
-    # TODO: "ARG", # flake8-unused-arguments
+    "ARG", # flake8-unused-arguments
     "B",   # flake8-bugbear
     # TODO: "BLE", # flake8-blind-except
     # TODO: Do I want "COM", # flake8-commas

From 4cac1ab5f1bd97e815693b0c9aeaebb42b716bd4 Mon Sep 17 00:00:00 2001
From: Jacki <jacki@thejackimonster.de>
Date: Tue, 8 Apr 2025 15:55:03 +0200
Subject: [PATCH 2804/2864] Drop loading external image from Github

Signed-off-by: Jacki <jacki@thejackimonster.de>
---
 pelican/themes/notmyidea/templates/github.html | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pelican/themes/notmyidea/templates/github.html b/pelican/themes/notmyidea/templates/github.html
index 8e256af7..bd79d621 100644
--- a/pelican/themes/notmyidea/templates/github.html
+++ b/pelican/themes/notmyidea/templates/github.html
@@ -1,9 +1,18 @@
 {% if GITHUB_URL %}
+    <style type="text/css">
+        div.github_url {
+            position: absolute;
+            border: 0;
+            background: black;
+            padding: 2px 8px;
+            width: 120px;
+        }
+    </style>
     <a href="{{ GITHUB_URL }}">
         {% if GITHUB_POSITION != "left" %}
-            <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+            <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
         {% else %}
-            <img style="position: absolute; top: 0; left: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_left_white_ffffff.png" alt="Fork me on GitHub" />
+            <div class="github_url" style="top: 0; left: 0; border-radius: 0 0 8px 0;">Fork me on GitHub</div>
         {% endif %}
     </a>
 {% endif %}

From f95466c8fec8014a1e5770f79919fed6959a7905 Mon Sep 17 00:00:00 2001
From: Jacki <jacki@thejackimonster.de>
Date: Tue, 8 Apr 2025 16:32:42 +0200
Subject: [PATCH 2805/2864] Implement dark mode for template

Signed-off-by: Jacki <jacki@thejackimonster.de>
---
 pelican/themes/notmyidea/static/css/main.css | 55 ++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index c1d86950..2e2aee48 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -27,6 +27,13 @@ body {
     text-align: left;
 }
 
+@media (prefers-color-scheme: dark) {
+    body {
+        background: #070808;
+        color: #FFFEFE;
+    }
+}
+
 /* Headings */
 h1 {font-size: 2em }
 h2 {font-size: 1.571em}	/* 22px */
@@ -106,6 +113,12 @@ dd {margin-left: 1.5em;}
 
 pre{background-color:  rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
 
+@media (prefers-color-scheme: dark) {
+    pre {
+        background: rgb(38, 38, 38);
+    }
+}
+
 /* Quotes */
 blockquote {
     margin: 20px;
@@ -197,6 +210,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 
 #banner h1 strong {font-size: 0.36em; font-weight: normal;}
 
+@media (prefers-color-scheme: dark) {
+    #banner h1 a:link, #banner h1 a:visited {
+        color: #FFFAF8;
+    }
+}
+
 	/* Main Nav */
 #banner nav {
     background: #000305;
@@ -213,6 +232,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 5px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #banner nav {
+        background: #121518;
+    }
+}
+
 #banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
 #banner nav li {float: left; display: inline; margin: 0;}
 
@@ -255,6 +280,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #featured {
+        background: #151617;
+    }
+}
+
 #featured figure {
     border: 2px solid #eee;
     float: right;
@@ -284,6 +315,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #content {
+        background: #111;
+    }
+}
+
 /*
 	Extras
 *****************/
@@ -306,6 +343,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     padding: .3em .25em;
 }
 
+@media (prefers-color-scheme: dark) {
+    #extras a:link, #extras a:visited {
+        color: #888;
+    }
+}
+
 #extras a:hover, #extras a:active {color: #fff;}
 
 	/* Blogroll */
@@ -339,6 +382,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #about {
+        background: #222;
+    }
+}
+
 #about .primary {float: left; max-width: 165px;}
 #about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
 #about .photo {float: left; margin: 5px 20px;}
@@ -367,6 +416,12 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 .entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
 .entry-title a:visited {background-color: #fff;}
 
+@media (prefers-color-scheme: dark) {
+    .entry-title a:link, .entry-title a:visited {
+        color: #C74350;
+    }
+}
+
 .hentry .post-info * {font-style: normal;}
 
 	/* Content */

From 87e3b60da73d5089e43fa85f703233553a8b7ca4 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 22 Jul 2025 17:16:03 +0200
Subject: [PATCH 2806/2864] Update tests for dark mode & GitHub link changes

---
 pelican/tests/output/basic/theme/css/main.css | 55 +++++++++++++++++++
 .../custom/a-markdown-powered-article.html    | 11 +++-
 pelican/tests/output/custom/archives.html     | 11 +++-
 pelican/tests/output/custom/article-1.html    | 11 +++-
 pelican/tests/output/custom/article-2.html    | 11 +++-
 pelican/tests/output/custom/article-3.html    | 11 +++-
 .../custom/author/alexis-metaireau.html       | 11 +++-
 .../custom/author/alexis-metaireau2.html      | 11 +++-
 .../custom/author/alexis-metaireau3.html      | 11 +++-
 pelican/tests/output/custom/authors.html      | 11 +++-
 pelican/tests/output/custom/categories.html   | 11 +++-
 pelican/tests/output/custom/category/bar.html | 11 +++-
 .../tests/output/custom/category/cat1.html    | 11 +++-
 .../tests/output/custom/category/misc.html    | 11 +++-
 .../tests/output/custom/category/yeah.html    | 11 +++-
 .../drafts/a-draft-article-without-date.html  | 11 +++-
 .../output/custom/drafts/a-draft-article.html | 11 +++-
 .../custom/filename_metadata-example.html     | 11 +++-
 pelican/tests/output/custom/index.html        | 11 +++-
 pelican/tests/output/custom/index2.html       | 11 +++-
 pelican/tests/output/custom/index3.html       | 11 +++-
 .../tests/output/custom/jinja2_template.html  | 11 +++-
 pelican/tests/output/custom/oh-yeah-fr.html   | 11 +++-
 pelican/tests/output/custom/oh-yeah.html      | 11 +++-
 .../tests/output/custom/override/index.html   | 11 +++-
 .../pages/this-is-a-test-hidden-page.html     | 11 +++-
 .../custom/pages/this-is-a-test-page.html     | 11 +++-
 .../output/custom/second-article-fr.html      | 11 +++-
 .../tests/output/custom/second-article.html   | 11 +++-
 pelican/tests/output/custom/tag/bar.html      | 11 +++-
 pelican/tests/output/custom/tag/baz.html      | 11 +++-
 pelican/tests/output/custom/tag/foo.html      | 11 +++-
 pelican/tests/output/custom/tag/foobar.html   | 11 +++-
 pelican/tests/output/custom/tag/oh.html       | 11 +++-
 pelican/tests/output/custom/tag/yeah.html     | 11 +++-
 pelican/tests/output/custom/tags.html         | 11 +++-
 .../tests/output/custom/theme/css/main.css    | 55 +++++++++++++++++++
 .../custom/this-is-a-super-article.html       | 11 +++-
 pelican/tests/output/custom/unbelievable.html | 11 +++-
 .../tests/output/custom_locale/archives.html  | 11 +++-
 .../author/alexis-metaireau.html              | 11 +++-
 .../author/alexis-metaireau2.html             | 11 +++-
 .../author/alexis-metaireau3.html             | 11 +++-
 .../tests/output/custom_locale/authors.html   | 11 +++-
 .../output/custom_locale/categories.html      | 11 +++-
 .../output/custom_locale/category/bar.html    | 11 +++-
 .../output/custom_locale/category/cat1.html   | 11 +++-
 .../output/custom_locale/category/misc.html   | 11 +++-
 .../output/custom_locale/category/yeah.html   | 11 +++-
 .../drafts/a-draft-article-without-date.html  | 11 +++-
 .../custom_locale/drafts/a-draft-article.html | 11 +++-
 pelican/tests/output/custom_locale/index.html | 11 +++-
 .../tests/output/custom_locale/index2.html    | 11 +++-
 .../tests/output/custom_locale/index3.html    | 11 +++-
 .../output/custom_locale/jinja2_template.html | 11 +++-
 .../output/custom_locale/oh-yeah-fr.html      | 11 +++-
 .../output/custom_locale/override/index.html  | 11 +++-
 .../pages/this-is-a-test-hidden-page.html     | 11 +++-
 .../pages/this-is-a-test-page.html            | 11 +++-
 .../02/this-is-a-super-article/index.html     | 11 +++-
 .../2010/octobre/15/unbelievable/index.html   | 11 +++-
 .../posts/2010/octobre/20/oh-yeah/index.html  | 11 +++-
 .../20/a-markdown-powered-article/index.html  | 11 +++-
 .../2011/février/17/article-1/index.html      | 11 +++-
 .../2011/février/17/article-2/index.html      | 11 +++-
 .../2011/février/17/article-3/index.html      | 11 +++-
 .../2012/février/29/second-article/index.html | 11 +++-
 .../30/filename_metadata-example/index.html   | 11 +++-
 .../custom_locale/second-article-fr.html      | 11 +++-
 .../tests/output/custom_locale/tag/bar.html   | 11 +++-
 .../tests/output/custom_locale/tag/baz.html   | 11 +++-
 .../tests/output/custom_locale/tag/foo.html   | 11 +++-
 .../output/custom_locale/tag/foobar.html      | 11 +++-
 .../tests/output/custom_locale/tag/oh.html    | 11 +++-
 .../tests/output/custom_locale/tag/yeah.html  | 11 +++-
 pelican/tests/output/custom_locale/tags.html  | 11 +++-
 .../output/custom_locale/theme/css/main.css   | 55 +++++++++++++++++++
 77 files changed, 905 insertions(+), 74 deletions(-)

diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index c1d86950..2e2aee48 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -27,6 +27,13 @@ body {
     text-align: left;
 }
 
+@media (prefers-color-scheme: dark) {
+    body {
+        background: #070808;
+        color: #FFFEFE;
+    }
+}
+
 /* Headings */
 h1 {font-size: 2em }
 h2 {font-size: 1.571em}	/* 22px */
@@ -106,6 +113,12 @@ dd {margin-left: 1.5em;}
 
 pre{background-color:  rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
 
+@media (prefers-color-scheme: dark) {
+    pre {
+        background: rgb(38, 38, 38);
+    }
+}
+
 /* Quotes */
 blockquote {
     margin: 20px;
@@ -197,6 +210,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 
 #banner h1 strong {font-size: 0.36em; font-weight: normal;}
 
+@media (prefers-color-scheme: dark) {
+    #banner h1 a:link, #banner h1 a:visited {
+        color: #FFFAF8;
+    }
+}
+
 	/* Main Nav */
 #banner nav {
     background: #000305;
@@ -213,6 +232,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 5px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #banner nav {
+        background: #121518;
+    }
+}
+
 #banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
 #banner nav li {float: left; display: inline; margin: 0;}
 
@@ -255,6 +280,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #featured {
+        background: #151617;
+    }
+}
+
 #featured figure {
     border: 2px solid #eee;
     float: right;
@@ -284,6 +315,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #content {
+        background: #111;
+    }
+}
+
 /*
 	Extras
 *****************/
@@ -306,6 +343,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     padding: .3em .25em;
 }
 
+@media (prefers-color-scheme: dark) {
+    #extras a:link, #extras a:visited {
+        color: #888;
+    }
+}
+
 #extras a:hover, #extras a:active {color: #fff;}
 
 	/* Blogroll */
@@ -339,6 +382,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #about {
+        background: #222;
+    }
+}
+
 #about .primary {float: left; max-width: 165px;}
 #about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
 #about .photo {float: left; margin: 5px 20px;}
@@ -367,6 +416,12 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 .entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
 .entry-title a:visited {background-color: #fff;}
 
+@media (prefers-color-scheme: dark) {
+    .entry-title a:link, .entry-title a:visited {
+        color: #C74350;
+    }
+}
+
 .hentry .post-info * {font-style: normal;}
 
 	/* Content */
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index b8359a6d..687c1153 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 234fa63a..bfd80dfe 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 4b670b16..e7f389c8 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index ad1e20fb..3c9b6aa1 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 7157c014..a2647149 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index b4230aad..b2f5cc32 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 43823162..2178d0a7 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index cf7a6031..ab95c63e 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index 5ba9af8c..01fd740e 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 2c055fac..7e863fb2 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 7415f9f4..8496df9c 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index f72f8bc8..a4059604 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 895f253e..269ade75 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index a6d76ac2..07d4e8a0 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
index 70879483..eb4a435b 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 8e56ba96..4b61e5f3 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 00b1f158..d0e97d1b 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index b29d8d86..8d801127 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index a1c3f5b5..0dec6bee 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index 93e0d029..25bafa25 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index e745d4cf..6fd241e3 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 8659bd0e..95cf0f01 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -14,8 +14,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 0825e211..080d8469 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -14,8 +14,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 8a5df3b4..6c2b1f08 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index df4e9090..e3f2349a 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index f9d959a5..cdd776c5 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index c53cc23e..67ebbf22 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -14,8 +14,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index f42dd642..9122e56a 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -14,8 +14,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 3abbc833..a8f3bbeb 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index e2dfada4..4ba10792 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index c03bca5c..0e3661f6 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index d3609714..62147ee8 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 5530d037..5e28c19d 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index d0457390..d1c8ec88 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index e5b3b08f..1efd9c29 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index c1d86950..2e2aee48 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -27,6 +27,13 @@ body {
     text-align: left;
 }
 
+@media (prefers-color-scheme: dark) {
+    body {
+        background: #070808;
+        color: #FFFEFE;
+    }
+}
+
 /* Headings */
 h1 {font-size: 2em }
 h2 {font-size: 1.571em}	/* 22px */
@@ -106,6 +113,12 @@ dd {margin-left: 1.5em;}
 
 pre{background-color:  rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
 
+@media (prefers-color-scheme: dark) {
+    pre {
+        background: rgb(38, 38, 38);
+    }
+}
+
 /* Quotes */
 blockquote {
     margin: 20px;
@@ -197,6 +210,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 
 #banner h1 strong {font-size: 0.36em; font-weight: normal;}
 
+@media (prefers-color-scheme: dark) {
+    #banner h1 a:link, #banner h1 a:visited {
+        color: #FFFAF8;
+    }
+}
+
 	/* Main Nav */
 #banner nav {
     background: #000305;
@@ -213,6 +232,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 5px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #banner nav {
+        background: #121518;
+    }
+}
+
 #banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
 #banner nav li {float: left; display: inline; margin: 0;}
 
@@ -255,6 +280,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #featured {
+        background: #151617;
+    }
+}
+
 #featured figure {
     border: 2px solid #eee;
     float: right;
@@ -284,6 +315,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #content {
+        background: #111;
+    }
+}
+
 /*
 	Extras
 *****************/
@@ -306,6 +343,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     padding: .3em .25em;
 }
 
+@media (prefers-color-scheme: dark) {
+    #extras a:link, #extras a:visited {
+        color: #888;
+    }
+}
+
 #extras a:hover, #extras a:active {color: #fff;}
 
 	/* Blogroll */
@@ -339,6 +382,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #about {
+        background: #222;
+    }
+}
+
 #about .primary {float: left; max-width: 165px;}
 #about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
 #about .photo {float: left; margin: 5px 20px;}
@@ -367,6 +416,12 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 .entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
 .entry-title a:visited {background-color: #fff;}
 
+@media (prefers-color-scheme: dark) {
+    .entry-title a:link, .entry-title a:visited {
+        color: #C74350;
+    }
+}
+
 .hentry .post-info * {font-style: normal;}
 
 	/* Content */
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 222fcbab..57f80f30 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index ae3a235f..373810c8 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log <strong>A personal blog.</strong></a></h1>
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index 3e85bc13..206f107a 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index 7582d623..be2cfdc2 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 0ba022b7..8092536a 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 5033e7f2..2a429904 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index 1d1bb320..8eeb4f3c 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 9a684dd2..e417235b 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index c061c8d8..d57b6710 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index a1b9156b..30be6893 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 8df30965..810902ed 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 9e22f4f3..6b3793a3 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
index cf8c8760..addedd2f 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 56f9e0b4..45393805 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 5c5c3c27..a2f09b0a 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index 68d4f195..05c7b300 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 030ea072..1b8f86ba 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index 3d2ac0e1..379fd570 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index a3203152..2c5947ab 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -14,8 +14,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index f457679f..a8ec2de4 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index 12cab620..f3ac78f8 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index e945a3ed..b18a0bad 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index 336a13cf..bf2cbca2 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index 35da4c63..d08da362 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index 23c57785..3e6c0dc9 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -14,8 +14,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index c2e1cc57..7d080202 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index 0742bc52..da2c39d0 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index a5201ffb..462b4817 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index fe175d6f..cc4cd574 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index d2d3cfe1..be1b0d90 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -14,8 +14,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index a596dbed..2304f27c 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../../../../../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index e631a575..ad3d369d 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -14,8 +14,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index f8edf2f2..ab9ccadf 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index ad8fefa9..8376ee30 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -12,8 +12,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 688666f8..defa8304 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 6abc2d24..73e5c280 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index 72cde941..dec01b53 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index b0a1a5ac..5938bfba 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="../">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index 40daf2ef..b2f9682e 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -11,8 +11,17 @@
         </head>
 
         <body id="index" class="home">
+                <style type="text/css">
+                        div.github_url {
+                                position: absolute;
+                                border: 0;
+                                background: black;
+                                padding: 2px 8px;
+                                width: 120px;
+                        }
+                </style>
                 <a href="http://github.com/ametaireau/">
-                        <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+                        <div class="github_url" style="top: 0; right: 0; border-radius: 0 0 0 8px;">Fork me on GitHub</div>
                 </a>
                 <header id="banner" class="body">
                         <h1><a href="./">Alexis' log</a></h1>
diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css
index c1d86950..2e2aee48 100644
--- a/pelican/tests/output/custom_locale/theme/css/main.css
+++ b/pelican/tests/output/custom_locale/theme/css/main.css
@@ -27,6 +27,13 @@ body {
     text-align: left;
 }
 
+@media (prefers-color-scheme: dark) {
+    body {
+        background: #070808;
+        color: #FFFEFE;
+    }
+}
+
 /* Headings */
 h1 {font-size: 2em }
 h2 {font-size: 1.571em}	/* 22px */
@@ -106,6 +113,12 @@ dd {margin-left: 1.5em;}
 
 pre{background-color:  rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
 
+@media (prefers-color-scheme: dark) {
+    pre {
+        background: rgb(38, 38, 38);
+    }
+}
+
 /* Quotes */
 blockquote {
     margin: 20px;
@@ -197,6 +210,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
 
 #banner h1 strong {font-size: 0.36em; font-weight: normal;}
 
+@media (prefers-color-scheme: dark) {
+    #banner h1 a:link, #banner h1 a:visited {
+        color: #FFFAF8;
+    }
+}
+
 	/* Main Nav */
 #banner nav {
     background: #000305;
@@ -213,6 +232,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 5px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #banner nav {
+        background: #121518;
+    }
+}
+
 #banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;}
 #banner nav li {float: left; display: inline; margin: 0;}
 
@@ -255,6 +280,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #featured {
+        background: #151617;
+    }
+}
+
 #featured figure {
     border: 2px solid #eee;
     float: right;
@@ -284,6 +315,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #content {
+        background: #111;
+    }
+}
+
 /*
 	Extras
 *****************/
@@ -306,6 +343,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     padding: .3em .25em;
 }
 
+@media (prefers-color-scheme: dark) {
+    #extras a:link, #extras a:visited {
+        color: #888;
+    }
+}
+
 #extras a:hover, #extras a:active {color: #fff;}
 
 	/* Blogroll */
@@ -339,6 +382,12 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     -webkit-border-radius: 10px;
 }
 
+@media (prefers-color-scheme: dark) {
+    #about {
+        background: #222;
+    }
+}
+
 #about .primary {float: left; max-width: 165px;}
 #about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
 #about .photo {float: left; margin: 5px 20px;}
@@ -367,6 +416,12 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;}
 .entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
 .entry-title a:visited {background-color: #fff;}
 
+@media (prefers-color-scheme: dark) {
+    .entry-title a:link, .entry-title a:visited {
+        color: #C74350;
+    }
+}
+
 .hentry .post-info * {font-style: normal;}
 
 	/* Content */

From 5acf155c328eb10df10507c28a880e47a939de8e Mon Sep 17 00:00:00 2001
From: nkr <42086312+nkr0@users.noreply.github.com>
Date: Thu, 9 Oct 2025 23:47:46 +0200
Subject: [PATCH 2807/2864] Fix docutils PendingDeprecationWarning

---
 pelican/readers.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pelican/readers.py b/pelican/readers.py
index ca1b2393..dfa76638 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -268,9 +268,11 @@ class RstReader(BaseReader):
             extra_params.update(user_params)
 
         pub = docutils.core.Publisher(
-            writer=self.writer_class(), destination_class=docutils.io.StringOutput
+            reader="standalone",
+            parser="restructuredtext",
+            writer=self.writer_class(),
+            destination_class=docutils.io.StringOutput,
         )
-        pub.set_components("standalone", "restructuredtext", "html")
         pub.process_programmatic_settings(None, extra_params, None)
         pub.set_source(source_path=source_path)
         pub.publish()

From 69cbd8d7920ef6103cbc348a9ee00cb8a6690cae Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 16 Oct 2025 08:01:15 +0200
Subject: [PATCH 2808/2864] Require Docutils 0.22 for compatibility with #3510

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8d0fd9b9..2763908a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,7 @@ classifiers = [
 requires-python = ">=3.9,<4.0"
 dependencies = [
     "blinker>=1.7.0",
-    "docutils>=0.20.1",
+    "docutils>=0.22.2",
     "feedgenerator>=2.1.0",
     "jinja2>=3.1.2",
     "ordered-set>=4.1.0",

From 35f7b0dd6bd376004dcd1632ac22eb37a5d4b648 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 16 Oct 2025 08:38:09 +0200
Subject: [PATCH 2809/2864] Revert Docutils version change

This caused a gnarly dependency resolution problem that could not be
easly rectified. Perhaps a future Sphinx release will fix this.
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2763908a..8d0fd9b9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,7 @@ classifiers = [
 requires-python = ">=3.9,<4.0"
 dependencies = [
     "blinker>=1.7.0",
-    "docutils>=0.22.2",
+    "docutils>=0.20.1",
     "feedgenerator>=2.1.0",
     "jinja2>=3.1.2",
     "ordered-set>=4.1.0",

From c16417fe99b18af1da9a4a2dfc5ca056e09797ea Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 16 Oct 2025 08:49:34 +0200
Subject: [PATCH 2810/2864] Update Furo doc theme to version 2025.9.25

---
 docs/_templates/page.html | 386 ++++++++++++++++++++------------------
 pyproject.toml            |   2 +-
 2 files changed, 204 insertions(+), 184 deletions(-)

diff --git a/docs/_templates/page.html b/docs/_templates/page.html
index 0fbfdf7d..2cfb02b5 100644
--- a/docs/_templates/page.html
+++ b/docs/_templates/page.html
@@ -1,201 +1,221 @@
 {% extends "base.html" %}
 
 {% block body -%}
-  {{ super() }}
-  {% include "partials/icons.html" %}
+{{ super() }}
+{% include "partials/icons.html" %}
 
-  <input type="checkbox" class="sidebar-toggle" name="__navigation" id="__navigation">
-  <input type="checkbox" class="sidebar-toggle" name="__toc" id="__toc">
-  <label class="overlay sidebar-overlay" for="__navigation">
-    <div class="visually-hidden">Hide navigation sidebar</div>
-  </label>
-  <label class="overlay toc-overlay" for="__toc">
-    <div class="visually-hidden">Hide table of contents sidebar</div>
-  </label>
+<input type="checkbox" class="sidebar-toggle" name="__navigation" id="__navigation" aria-label="Toggle site navigation sidebar">
+<input type="checkbox" class="sidebar-toggle" name="__toc" id="__toc" aria-label="Toggle table of contents sidebar">
+<label class="overlay sidebar-overlay" for="__navigation"></label>
+<label class="overlay toc-overlay" for="__toc"></label>
 
-  {% if theme_announcement -%}
-    <div class="announcement">
-      <aside class="announcement-content">
-        {% block announcement %} {{ theme_announcement }} {% endblock announcement %}
-      </aside>
+<a class="skip-to-content muted-link" href="#furo-main-content">
+  {%- trans -%}
+  Skip to content
+  {%- endtrans -%}
+</a>
+
+{% if theme_announcement -%}
+<div class="announcement">
+  <aside class="announcement-content">
+    {% block announcement %} {{ theme_announcement }} {% endblock announcement %}
+  </aside>
+</div>
+{%- endif %}
+
+<div class="page">
+  <header class="mobile-header">
+    <div class="header-left">
+      <label class="nav-overlay-icon" for="__navigation">
+        <span class="icon"><svg><use href="#svg-menu"></use></svg></span>
+      </label>
     </div>
-  {%- endif %}
+    <div class="header-center">
+      <a href="{{ pathto(master_doc) }}"><div class="brand">{{ docstitle if docstitle else project }}</div></a>
+    </div>
+    <div class="header-right">
+      <div class="theme-toggle-container theme-toggle-header">
+        <button class="theme-toggle" aria-label="Toggle Light / Dark / Auto color theme">
+          <svg class="theme-icon-when-auto-light"><use href="#svg-sun-with-moon"></use></svg>
+          <svg class="theme-icon-when-auto-dark"><use href="#svg-moon-with-sun"></use></svg>
+          <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
+          <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
+        </button>
+      </div>
+      <label class="toc-overlay-icon toc-header-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
+        <span class="icon"><svg><use href="#svg-toc"></use></svg></span>
+      </label>
+    </div>
+  </header>
+  <aside class="sidebar-drawer">
+    <div class="sidebar-container">
+      {% block left_sidebar %}
+      <div class="sidebar-sticky">
+        {%- for sidebar_section in sidebars %}
+          {%- include sidebar_section %}
+        {%- endfor %}
+      </div>
+      {% endblock left_sidebar %}
+    </div>
+  </aside>
+  <div class="main">
+    <div class="content">
+      <div class="article-container">
+        <a href="#" class="back-to-top muted-link">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+            <path d="M13 20h-2V8l-5.5 5.5-1.42-1.42L12 4.16l7.92 7.92-1.42 1.42L13 8v12z"></path>
+          </svg>
+          <span>{% trans %}Back to top{% endtrans %}</span>
+        </a>
+        <div class="content-icon-container">
+          {% if theme_top_of_page_button != "edit" -%}
+            {{ warning("Got configuration for 'top_of_page_button': this is deprecated.") }}
+          {%- endif -%}
 
-  <div class="page">
-    <header class="mobile-header">
-      <div class="header-left">
-        <label class="nav-overlay-icon" for="__navigation">
-          <div class="visually-hidden">Toggle site navigation sidebar</div>
-          <i class="icon"><svg><use href="#svg-menu"></use></svg></i>
-        </label>
-      </div>
-      <div class="header-center">
-        <a href="{{ pathto(master_doc) }}"><div class="brand">{{ docstitle if docstitle else project }}</div></a>
-      </div>
-      <div class="header-right">
-        <div class="theme-toggle-container theme-toggle-header">
-          <button class="theme-toggle">
-            <div class="visually-hidden">Toggle Light / Dark / Auto color theme</div>
-            <svg class="theme-icon-when-auto"><use href="#svg-sun-half"></use></svg>
-            <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
-            <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
-          </button>
-        </div>
-        <label class="toc-overlay-icon toc-header-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
-          <div class="visually-hidden">Toggle table of contents sidebar</div>
-          <i class="icon"><svg><use href="#svg-toc"></use></svg></i>
-        </label>
-      </div>
-    </header>
-    <aside class="sidebar-drawer">
-      <div class="sidebar-container">
-        {% block left_sidebar %}
-          <div class="sidebar-sticky">
-            {%- for sidebar_section in sidebars %}
-              {%- include sidebar_section %}
-            {%- endfor %}
-          </div>
-        {% endblock left_sidebar %}
-      </div>
-    </aside>
-    <div class="main">
-      <div class="content">
-        <div class="article-container">
-          <a href="#" class="back-to-top muted-link">
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-              <path d="M13 20h-2V8l-5.5 5.5-1.42-1.42L12 4.16l7.92 7.92-1.42 1.42L13 8v12z"></path>
-            </svg>
-            <span>{% trans %}Back to top{% endtrans %}</span>
-          </a>
-          <div class="content-icon-container">
-            {% if theme_top_of_page_button == "edit" -%}
-              {%- include "components/edit-this-page.html" with context -%}
-            {%- elif theme_top_of_page_button != None -%}
-              {{ warning("Got an unsupported value for 'top_of_page_button'") }}
+          {%- if theme_top_of_page_buttons == "" -%}
+            {% if theme_top_of_page_button == None -%}
+              {#- We respect the old configuration of disabling all the buttons -#}
+              {%- set theme_top_of_page_buttons = [] -%}
+            {% else %}
+              {%- set theme_top_of_page_buttons = ["view", "edit"] -%}
             {%- endif -%}
+          {% else -%}
+            {% if theme_top_of_page_button != "edit" -%}
+              {%- set theme_top_of_page_buttons = [] -%}
+              {{ warning("Got configuration for both 'top_of_page_button' and 'top_of_page_buttons', ignoring both and removing all top of page buttons.") }}
+            {%- endif -%}
+          {%- endif -%}
+          {% for button in theme_top_of_page_buttons -%}
+            {% if button == "view" %}
+            {%- include "components/view-this-page.html" with context -%}
+            {% elif button == "edit" %}
+            {%- include "components/edit-this-page.html" with context -%}
+            {% else %}
+            {{ warning("Got an unsupported value in 'top_of_page_buttons' for theme configuration") }}
+            {% endif %}
+          {%- endfor -%}
           {#- Theme toggle -#}
-            <div class="theme-toggle-container theme-toggle-content">
-              <button class="theme-toggle">
-                <div class="visually-hidden">Toggle Light / Dark / Auto color theme</div>
-                <svg class="theme-icon-when-auto"><use href="#svg-sun-half"></use></svg>
-                <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
-                <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
-              </button>
-            </div>
-            <label class="toc-overlay-icon toc-content-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
-              <div class="visually-hidden">Toggle table of contents sidebar</div>
-              <i class="icon"><svg><use href="#svg-toc"></use></svg></i>
-            </label>
+          <div class="theme-toggle-container theme-toggle-content">
+            <button class="theme-toggle" aria-label="Toggle Light / Dark / Auto color theme">
+              <svg class="theme-icon-when-auto-light"><use href="#svg-sun-with-moon"></use></svg>
+              <svg class="theme-icon-when-auto-dark"><use href="#svg-moon-with-sun"></use></svg>
+              <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
+              <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
+            </button>
           </div>
-          <article role="main">
-            {% block content %}{{ body }}{% endblock %}
-          </article>
+          <label class="toc-overlay-icon toc-content-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
+            <span class="icon"><svg><use href="#svg-toc"></use></svg></span>
+          </label>
         </div>
-        <footer>
-          {% block footer %}
-            <div class="related-pages">
-              {% if next -%}
-                <a class="next-page" href="{{ next.link }}">
-                  <div class="page-info">
-                    <div class="context">
-                      <span>{{ _("Next") }}</span>
-                    </div>
-                    <div class="title">{{ next.title }}</div>
-                  </div>
-                  <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
-                </a>
-              {%- endif %}
-              {% if prev -%}
-                <a class="prev-page" href="{{ prev.link }}">
-                  <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
-                  <div class="page-info">
-                    <div class="context">
-                      <span>{{ _("Previous") }}</span>
-                    </div>
-                    {% if prev.link == pathto(master_doc) %}
-                      <div class="title">{{ _("Home") }}</div>
-                    {% else %}
-                      <div class="title">{{ prev.title }}</div>
-                    {% endif %}
-                  </div>
-                </a>
-              {%- endif %}
-            </div>
-            <div class="bottom-of-page">
-              <div class="left-details">
-                {%- if show_copyright %}
-                  <div class="copyright">
-                    {%- if hasdoc('copyright') %}
-                      {% trans path=pathto('copyright'), copyright=copyright|e -%}
-                        <a href="{{ path }}">Copyright</a> &#169; {{ copyright }}
-                      {%- endtrans %}
-                    {%- else %}
-                      {% trans copyright=copyright|e -%}
-                        Copyright &#169; {{ copyright }}, <a href="https://justinmayer.com">Justin Mayer</a>, Alexis Metaireau, and contributors
-                      {%- endtrans %}
-                    {%- endif %}
-                  </div>
-                {%- endif %}
-                {%- if last_updated -%}
-                  <div class="last-updated">
-                    {% trans last_updated=last_updated|e -%}
-                      Last updated on {{ last_updated }}
-                    {%- endtrans -%}
-                  </div>
-                {%- endif %}
-              </div>
-              <div class="right-details">
-                {% if theme_footer_icons or READTHEDOCS -%}
-                  <div class="icons">
-                    {% if theme_footer_icons -%}
-                      {% for icon_dict in theme_footer_icons -%}
-                        <a class="muted-link {{ icon_dict.class }}" href="{{ icon_dict.url }}" aria-label="{{ icon_dict.name }}">
-                          {{- icon_dict.html -}}
-                        </a>
-                      {% endfor %}
-                    {%- else -%}
-              {#- Show Read the Docs project -#}
-                      {%- if READTHEDOCS and slug -%}
-                        <a class="muted-link" href="https://readthedocs.org/projects/{{ slug }}" aria-label="On Read the Docs">
-                          <svg x="0px" y="0px" viewBox="-125 217 360 360" xml:space="preserve">
-                            <path fill="currentColor" d="M39.2,391.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3 c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2 c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,391.3,40.4,391.1,39.2,391.3z M39.2,353.6c-4.2,0.6-7.1,4.4-6.5,8.5 c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4 c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,353.6,40.4,353.4,39.2,353.6z M39.2,315.9 c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8 c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9 C41.7,315.9,40.4,315.8,39.2,315.9z M39.2,278.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7 c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6 c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,278.2,40.4,278.1,39.2,278.3z M-13.6,238.5c-39.6,0.3-54.3,12.5-54.3,12.5v295.7 c0,0,14.4-12.4,60.8-10.5s55.9,18.2,112.9,19.3s71.3-8.8,71.3-8.8l0.8-301.4c0,0-25.6,7.3-75.6,7.7c-49.9,0.4-61.9-12.7-107.7-14.2 C-8.2,238.6-10.9,238.5-13.6,238.5z M19.5,257.8c0,0,24,7.9,68.3,10.1c37.5,1.9,75-3.7,75-3.7v267.9c0,0-19,10-66.5,6.6 C59.5,536.1,19,522.1,19,522.1L19.5,257.8z M-3.6,264.8c4.2,0,7.7,3.4,7.7,7.7c0,4.2-3.4,7.7-7.7,7.7c0,0-12.4,0.1-20,0.8 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,0,0,0,0c0,0,11.3-6,27-7.5 C-16,264.9-3.6,264.8-3.6,264.8z M-11,302.6c4.2-0.1,7.4,0,7.4,0c4.2,0.5,7.2,4.3,6.7,8.5c-0.4,3.5-3.2,6.3-6.7,6.7 c0,0-12.4,0.1-20,0.8c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5 C-20.5,302.9-15.2,302.7-11,302.6z M-3.6,340.2c4.2,0,7.7,3.4,7.7,7.7s-3.4,7.7-7.7,7.7c0,0-12.4-0.1-20,0.7 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5C-16,340.1-3.6,340.2-3.6,340.2z" />
-                          </svg>
-                        </a>
-                      {%- endif -%}
-              {#- Show GitHub repository home -#}
-                      {%- if READTHEDOCS and display_github and github_user != "None" and github_repo != "None" -%}
-                        <a class="muted-link" href="https://github.com/{{ github_user }}/{{ github_repo }}" aria-label="On GitHub">
-                          <svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 16 16">
-                            <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path>
-                          </svg>
-                        </a>
-                      {%- endif -%}
-                    {%- endif %}
-                  </div>
-                {%- endif %}
-              </div>
-            </div>
-          {% endblock footer %}
-        </footer>
+        <article role="main" id="furo-main-content">
+          {% block content %}{{ body }}{% endblock %}
+        </article>
       </div>
-      <aside class="toc-drawer{% if furo_hide_toc %} no-toc{% endif %}">
-        {% block right_sidebar %}
-          {% if not furo_hide_toc %}
-            <div class="toc-sticky toc-scroll">
-              <div class="toc-title-container">
-                <span class="toc-title">
-                  {{ _("On this page") }}
-                </span>
-              </div>
-              <div class="toc-tree-container">
-                <div class="toc-tree">
-                  {{ toc }}
+      <footer>
+        {% block footer %}
+        <div class="related-pages">
+          {% if next -%}
+            <a class="next-page" href="{{ next.link }}">
+              <div class="page-info">
+                <div class="context">
+                  <span>{{ _("Next") }}</span>
                 </div>
+                <div class="title">{{ next.title }}</div>
               </div>
+              <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
+            </a>
+          {%- endif %}
+          {% if prev -%}
+            <a class="prev-page" href="{{ prev.link }}">
+              <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
+              <div class="page-info">
+                <div class="context">
+                  <span>{{ _("Previous") }}</span>
+                </div>
+                {% if prev.link == pathto(master_doc) %}
+                <div class="title">{{ _("Home") }}</div>
+                {% else %}
+                <div class="title">{{ prev.title }}</div>
+                {% endif %}
+              </div>
+            </a>
+          {%- endif %}
+        </div>
+        <div class="bottom-of-page">
+          <div class="left-details">
+            {%- if show_copyright %}
+            <div class="copyright">
+              {%- if hasdoc('copyright') %}
+                {% trans path=pathto('copyright'), copyright=copyright|e -%}
+                  <a href="{{ path }}">Copyright</a> &#169; {{ copyright }}
+                {%- endtrans %}
+              {%- else %}
+                {% trans copyright=copyright|e -%}
+                  Copyright &#169; {{ copyright }}, <a href="https://justinmayer.com">Justin Mayer</a>, Alexis Metaireau, and contributors
+                {%- endtrans %}
+              {%- endif %}
             </div>
-          {% endif %}
-        {% endblock right_sidebar %}
-      </aside>
+            {%- endif %}
+            {%- if last_updated -%}
+            <div class="last-updated">
+              {% trans last_updated=last_updated|e -%}
+                Last updated on {{ last_updated }}
+              {%- endtrans -%}
+            </div>
+            {%- endif %}
+          </div>
+          <div class="right-details">
+            {% if theme_footer_icons or READTHEDOCS -%}
+            <div class="icons">
+              {% if theme_footer_icons -%}
+              {% for icon_dict in theme_footer_icons -%}
+              <a class="muted-link {{ icon_dict.class }}" href="{{ icon_dict.url }}" aria-label="{{ icon_dict.name }}">
+                {{- icon_dict.html -}}
+              </a>
+              {% endfor %}
+              {%- else -%}
+              {#- Show Read the Docs project -#}
+              {%- if READTHEDOCS and slug -%}
+              <a class="muted-link" href="https://readthedocs.org/projects/{{ slug }}" aria-label="On Read the Docs">
+                <svg x="0px" y="0px" viewBox="-125 217 360 360" xml:space="preserve">
+                  <path fill="currentColor" d="M39.2,391.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3 c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2 c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,391.3,40.4,391.1,39.2,391.3z M39.2,353.6c-4.2,0.6-7.1,4.4-6.5,8.5 c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4 c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,353.6,40.4,353.4,39.2,353.6z M39.2,315.9 c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8 c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9 C41.7,315.9,40.4,315.8,39.2,315.9z M39.2,278.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7 c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6 c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,278.2,40.4,278.1,39.2,278.3z M-13.6,238.5c-39.6,0.3-54.3,12.5-54.3,12.5v295.7 c0,0,14.4-12.4,60.8-10.5s55.9,18.2,112.9,19.3s71.3-8.8,71.3-8.8l0.8-301.4c0,0-25.6,7.3-75.6,7.7c-49.9,0.4-61.9-12.7-107.7-14.2 C-8.2,238.6-10.9,238.5-13.6,238.5z M19.5,257.8c0,0,24,7.9,68.3,10.1c37.5,1.9,75-3.7,75-3.7v267.9c0,0-19,10-66.5,6.6 C59.5,536.1,19,522.1,19,522.1L19.5,257.8z M-3.6,264.8c4.2,0,7.7,3.4,7.7,7.7c0,4.2-3.4,7.7-7.7,7.7c0,0-12.4,0.1-20,0.8 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,0,0,0,0c0,0,11.3-6,27-7.5 C-16,264.9-3.6,264.8-3.6,264.8z M-11,302.6c4.2-0.1,7.4,0,7.4,0c4.2,0.5,7.2,4.3,6.7,8.5c-0.4,3.5-3.2,6.3-6.7,6.7 c0,0-12.4,0.1-20,0.8c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5 C-20.5,302.9-15.2,302.7-11,302.6z M-3.6,340.2c4.2,0,7.7,3.4,7.7,7.7s-3.4,7.7-7.7,7.7c0,0-12.4-0.1-20,0.7 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5C-16,340.1-3.6,340.2-3.6,340.2z" />
+                </svg>
+              </a>
+              {%- endif -%}
+              {#- Show GitHub repository home -#}
+              {%- if READTHEDOCS and display_github and github_user != "None" and github_repo != "None" -%}
+              <a class="muted-link" href="https://github.com/{{ github_user }}/{{ github_repo }}" aria-label="On GitHub">
+                <svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 16 16">
+                  <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path>
+                </svg>
+              </a>
+              {%- endif -%}
+              {%- endif %}
+            </div>
+            {%- endif %}
+          </div>
+        </div>
+        {% endblock footer %}
+      </footer>
     </div>
+    <aside class="toc-drawer{% if furo_hide_toc %} no-toc{% endif %}">
+      {% block right_sidebar %}
+      {% if not furo_hide_toc %}
+      <div class="toc-sticky toc-scroll">
+        <div class="toc-title-container">
+          <span class="toc-title">
+            {{ _("On this page") }}
+          </span>
+        </div>
+        <div class="toc-tree-container">
+          <div class="toc-tree">
+            {{ toc }}
+          </div>
+        </div>
+      </div>
+      {% endif %}
+      {% endblock right_sidebar %}
+    </aside>
   </div>
+</div>
 {%- endblock %}
diff --git a/pyproject.toml b/pyproject.toml
index 8d0fd9b9..ce5cd894 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -85,7 +85,7 @@ dev = [
     "typogrify>=2.1.0",
     "sphinx>=7.1.2",
     "sphinxext-opengraph>=0.9.0",
-    "furo==2023.9.10",
+    "furo==2025.9.25",
     "livereload>=2.6.3",
     "psutil>=5.9.6",
     "pygments>=2.16.1,<2.20.0",

From 1b17a65ebb99b6f36947d86f30d87a569e45fd3f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 16 Oct 2025 08:56:35 +0200
Subject: [PATCH 2811/2864] Update `checkout` & `setup-python` GitHub Actions

---
 .github/workflows/main.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9e5a877b..68e1fd30 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,9 +21,9 @@ jobs:
             python: "3.9"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
           cache: "pip"
@@ -50,7 +50,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: pdm-project/setup-pdm@v4
         with:
           python-version: "3.11"
@@ -68,7 +68,7 @@ jobs:
     name: Test build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: pdm-project/setup-pdm@v4
         with:
           python-version: "3.11"
@@ -86,9 +86,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
           cache: "pip"
@@ -115,12 +115,12 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           token: ${{ secrets.GH_TOKEN }}
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 

From b1b06d73a016ed78012b671c23500f11f4880e32 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 16 Oct 2025 09:02:37 +0200
Subject: [PATCH 2812/2864] Indent custom Furo template to mollify djLint

---
 docs/_templates/page.html | 410 +++++++++++++++++++-------------------
 1 file changed, 205 insertions(+), 205 deletions(-)

diff --git a/docs/_templates/page.html b/docs/_templates/page.html
index 2cfb02b5..c0c31744 100644
--- a/docs/_templates/page.html
+++ b/docs/_templates/page.html
@@ -1,221 +1,221 @@
 {% extends "base.html" %}
 
 {% block body -%}
-{{ super() }}
-{% include "partials/icons.html" %}
+  {{ super() }}
+  {% include "partials/icons.html" %}
 
-<input type="checkbox" class="sidebar-toggle" name="__navigation" id="__navigation" aria-label="Toggle site navigation sidebar">
-<input type="checkbox" class="sidebar-toggle" name="__toc" id="__toc" aria-label="Toggle table of contents sidebar">
-<label class="overlay sidebar-overlay" for="__navigation"></label>
-<label class="overlay toc-overlay" for="__toc"></label>
+  <input type="checkbox" class="sidebar-toggle" name="__navigation" id="__navigation" aria-label="Toggle site navigation sidebar">
+  <input type="checkbox" class="sidebar-toggle" name="__toc" id="__toc" aria-label="Toggle table of contents sidebar">
+  <label class="overlay sidebar-overlay" for="__navigation"></label>
+  <label class="overlay toc-overlay" for="__toc"></label>
 
-<a class="skip-to-content muted-link" href="#furo-main-content">
-  {%- trans -%}
-  Skip to content
-  {%- endtrans -%}
-</a>
+  <a class="skip-to-content muted-link" href="#furo-main-content">
+    {%- trans -%}
+      Skip to content
+    {%- endtrans -%}
+  </a>
 
-{% if theme_announcement -%}
-<div class="announcement">
-  <aside class="announcement-content">
-    {% block announcement %} {{ theme_announcement }} {% endblock announcement %}
-  </aside>
-</div>
-{%- endif %}
-
-<div class="page">
-  <header class="mobile-header">
-    <div class="header-left">
-      <label class="nav-overlay-icon" for="__navigation">
-        <span class="icon"><svg><use href="#svg-menu"></use></svg></span>
-      </label>
+  {% if theme_announcement -%}
+    <div class="announcement">
+      <aside class="announcement-content">
+        {% block announcement %} {{ theme_announcement }} {% endblock announcement %}
+      </aside>
     </div>
-    <div class="header-center">
-      <a href="{{ pathto(master_doc) }}"><div class="brand">{{ docstitle if docstitle else project }}</div></a>
-    </div>
-    <div class="header-right">
-      <div class="theme-toggle-container theme-toggle-header">
-        <button class="theme-toggle" aria-label="Toggle Light / Dark / Auto color theme">
-          <svg class="theme-icon-when-auto-light"><use href="#svg-sun-with-moon"></use></svg>
-          <svg class="theme-icon-when-auto-dark"><use href="#svg-moon-with-sun"></use></svg>
-          <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
-          <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
-        </button>
+  {%- endif %}
+
+  <div class="page">
+    <header class="mobile-header">
+      <div class="header-left">
+        <label class="nav-overlay-icon" for="__navigation">
+          <span class="icon"><svg><use href="#svg-menu"></use></svg></span>
+        </label>
       </div>
-      <label class="toc-overlay-icon toc-header-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
-        <span class="icon"><svg><use href="#svg-toc"></use></svg></span>
-      </label>
-    </div>
-  </header>
-  <aside class="sidebar-drawer">
-    <div class="sidebar-container">
-      {% block left_sidebar %}
-      <div class="sidebar-sticky">
-        {%- for sidebar_section in sidebars %}
-          {%- include sidebar_section %}
-        {%- endfor %}
+      <div class="header-center">
+        <a href="{{ pathto(master_doc) }}"><div class="brand">{{ docstitle if docstitle else project }}</div></a>
       </div>
-      {% endblock left_sidebar %}
-    </div>
-  </aside>
-  <div class="main">
-    <div class="content">
-      <div class="article-container">
-        <a href="#" class="back-to-top muted-link">
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-            <path d="M13 20h-2V8l-5.5 5.5-1.42-1.42L12 4.16l7.92 7.92-1.42 1.42L13 8v12z"></path>
-          </svg>
-          <span>{% trans %}Back to top{% endtrans %}</span>
-        </a>
-        <div class="content-icon-container">
-          {% if theme_top_of_page_button != "edit" -%}
-            {{ warning("Got configuration for 'top_of_page_button': this is deprecated.") }}
-          {%- endif -%}
-
-          {%- if theme_top_of_page_buttons == "" -%}
-            {% if theme_top_of_page_button == None -%}
-              {#- We respect the old configuration of disabling all the buttons -#}
-              {%- set theme_top_of_page_buttons = [] -%}
-            {% else %}
-              {%- set theme_top_of_page_buttons = ["view", "edit"] -%}
-            {%- endif -%}
-          {% else -%}
-            {% if theme_top_of_page_button != "edit" -%}
-              {%- set theme_top_of_page_buttons = [] -%}
-              {{ warning("Got configuration for both 'top_of_page_button' and 'top_of_page_buttons', ignoring both and removing all top of page buttons.") }}
-            {%- endif -%}
-          {%- endif -%}
-          {% for button in theme_top_of_page_buttons -%}
-            {% if button == "view" %}
-            {%- include "components/view-this-page.html" with context -%}
-            {% elif button == "edit" %}
-            {%- include "components/edit-this-page.html" with context -%}
-            {% else %}
-            {{ warning("Got an unsupported value in 'top_of_page_buttons' for theme configuration") }}
-            {% endif %}
-          {%- endfor -%}
-          {#- Theme toggle -#}
-          <div class="theme-toggle-container theme-toggle-content">
-            <button class="theme-toggle" aria-label="Toggle Light / Dark / Auto color theme">
-              <svg class="theme-icon-when-auto-light"><use href="#svg-sun-with-moon"></use></svg>
-              <svg class="theme-icon-when-auto-dark"><use href="#svg-moon-with-sun"></use></svg>
-              <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
-              <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
-            </button>
-          </div>
-          <label class="toc-overlay-icon toc-content-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
-            <span class="icon"><svg><use href="#svg-toc"></use></svg></span>
-          </label>
+      <div class="header-right">
+        <div class="theme-toggle-container theme-toggle-header">
+          <button class="theme-toggle" aria-label="Toggle Light / Dark / Auto color theme">
+            <svg class="theme-icon-when-auto-light"><use href="#svg-sun-with-moon"></use></svg>
+            <svg class="theme-icon-when-auto-dark"><use href="#svg-moon-with-sun"></use></svg>
+            <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
+            <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
+          </button>
         </div>
-        <article role="main" id="furo-main-content">
-          {% block content %}{{ body }}{% endblock %}
-        </article>
+        <label class="toc-overlay-icon toc-header-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
+          <span class="icon"><svg><use href="#svg-toc"></use></svg></span>
+        </label>
       </div>
-      <footer>
-        {% block footer %}
-        <div class="related-pages">
-          {% if next -%}
-            <a class="next-page" href="{{ next.link }}">
-              <div class="page-info">
-                <div class="context">
-                  <span>{{ _("Next") }}</span>
-                </div>
-                <div class="title">{{ next.title }}</div>
-              </div>
-              <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
-            </a>
-          {%- endif %}
-          {% if prev -%}
-            <a class="prev-page" href="{{ prev.link }}">
-              <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
-              <div class="page-info">
-                <div class="context">
-                  <span>{{ _("Previous") }}</span>
-                </div>
-                {% if prev.link == pathto(master_doc) %}
-                <div class="title">{{ _("Home") }}</div>
-                {% else %}
-                <div class="title">{{ prev.title }}</div>
-                {% endif %}
-              </div>
-            </a>
-          {%- endif %}
-        </div>
-        <div class="bottom-of-page">
-          <div class="left-details">
-            {%- if show_copyright %}
-            <div class="copyright">
-              {%- if hasdoc('copyright') %}
-                {% trans path=pathto('copyright'), copyright=copyright|e -%}
-                  <a href="{{ path }}">Copyright</a> &#169; {{ copyright }}
-                {%- endtrans %}
-              {%- else %}
-                {% trans copyright=copyright|e -%}
-                  Copyright &#169; {{ copyright }}, <a href="https://justinmayer.com">Justin Mayer</a>, Alexis Metaireau, and contributors
-                {%- endtrans %}
-              {%- endif %}
-            </div>
-            {%- endif %}
-            {%- if last_updated -%}
-            <div class="last-updated">
-              {% trans last_updated=last_updated|e -%}
-                Last updated on {{ last_updated }}
-              {%- endtrans -%}
-            </div>
-            {%- endif %}
+    </header>
+    <aside class="sidebar-drawer">
+      <div class="sidebar-container">
+        {% block left_sidebar %}
+          <div class="sidebar-sticky">
+            {%- for sidebar_section in sidebars %}
+              {%- include sidebar_section %}
+            {%- endfor %}
           </div>
-          <div class="right-details">
-            {% if theme_footer_icons or READTHEDOCS -%}
-            <div class="icons">
-              {% if theme_footer_icons -%}
-              {% for icon_dict in theme_footer_icons -%}
-              <a class="muted-link {{ icon_dict.class }}" href="{{ icon_dict.url }}" aria-label="{{ icon_dict.name }}">
-                {{- icon_dict.html -}}
-              </a>
-              {% endfor %}
-              {%- else -%}
-              {#- Show Read the Docs project -#}
-              {%- if READTHEDOCS and slug -%}
-              <a class="muted-link" href="https://readthedocs.org/projects/{{ slug }}" aria-label="On Read the Docs">
-                <svg x="0px" y="0px" viewBox="-125 217 360 360" xml:space="preserve">
-                  <path fill="currentColor" d="M39.2,391.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3 c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2 c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,391.3,40.4,391.1,39.2,391.3z M39.2,353.6c-4.2,0.6-7.1,4.4-6.5,8.5 c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4 c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,353.6,40.4,353.4,39.2,353.6z M39.2,315.9 c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8 c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9 C41.7,315.9,40.4,315.8,39.2,315.9z M39.2,278.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7 c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6 c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,278.2,40.4,278.1,39.2,278.3z M-13.6,238.5c-39.6,0.3-54.3,12.5-54.3,12.5v295.7 c0,0,14.4-12.4,60.8-10.5s55.9,18.2,112.9,19.3s71.3-8.8,71.3-8.8l0.8-301.4c0,0-25.6,7.3-75.6,7.7c-49.9,0.4-61.9-12.7-107.7-14.2 C-8.2,238.6-10.9,238.5-13.6,238.5z M19.5,257.8c0,0,24,7.9,68.3,10.1c37.5,1.9,75-3.7,75-3.7v267.9c0,0-19,10-66.5,6.6 C59.5,536.1,19,522.1,19,522.1L19.5,257.8z M-3.6,264.8c4.2,0,7.7,3.4,7.7,7.7c0,4.2-3.4,7.7-7.7,7.7c0,0-12.4,0.1-20,0.8 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,0,0,0,0c0,0,11.3-6,27-7.5 C-16,264.9-3.6,264.8-3.6,264.8z M-11,302.6c4.2-0.1,7.4,0,7.4,0c4.2,0.5,7.2,4.3,6.7,8.5c-0.4,3.5-3.2,6.3-6.7,6.7 c0,0-12.4,0.1-20,0.8c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5 C-20.5,302.9-15.2,302.7-11,302.6z M-3.6,340.2c4.2,0,7.7,3.4,7.7,7.7s-3.4,7.7-7.7,7.7c0,0-12.4-0.1-20,0.7 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5C-16,340.1-3.6,340.2-3.6,340.2z" />
-                </svg>
-              </a>
-              {%- endif -%}
-              {#- Show GitHub repository home -#}
-              {%- if READTHEDOCS and display_github and github_user != "None" and github_repo != "None" -%}
-              <a class="muted-link" href="https://github.com/{{ github_user }}/{{ github_repo }}" aria-label="On GitHub">
-                <svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 16 16">
-                  <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path>
-                </svg>
-              </a>
-              {%- endif -%}
-              {%- endif %}
-            </div>
-            {%- endif %}
-          </div>
-        </div>
-        {% endblock footer %}
-      </footer>
-    </div>
-    <aside class="toc-drawer{% if furo_hide_toc %} no-toc{% endif %}">
-      {% block right_sidebar %}
-      {% if not furo_hide_toc %}
-      <div class="toc-sticky toc-scroll">
-        <div class="toc-title-container">
-          <span class="toc-title">
-            {{ _("On this page") }}
-          </span>
-        </div>
-        <div class="toc-tree-container">
-          <div class="toc-tree">
-            {{ toc }}
-          </div>
-        </div>
+        {% endblock left_sidebar %}
       </div>
-      {% endif %}
-      {% endblock right_sidebar %}
     </aside>
+    <div class="main">
+      <div class="content">
+        <div class="article-container">
+          <a href="#" class="back-to-top muted-link">
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+              <path d="M13 20h-2V8l-5.5 5.5-1.42-1.42L12 4.16l7.92 7.92-1.42 1.42L13 8v12z"></path>
+            </svg>
+            <span>{% trans %}Back to top{% endtrans %}</span>
+          </a>
+          <div class="content-icon-container">
+            {% if theme_top_of_page_button != "edit" -%}
+              {{ warning("Got configuration for 'top_of_page_button': this is deprecated.") }}
+            {%- endif -%}
+
+            {%- if theme_top_of_page_buttons == "" -%}
+              {% if theme_top_of_page_button == None -%}
+              {#- We respect the old configuration of disabling all the buttons -#}
+                {%- set theme_top_of_page_buttons = [] -%}
+              {% else %}
+                {%- set theme_top_of_page_buttons = ["view", "edit"] -%}
+              {%- endif -%}
+            {% else -%}
+              {% if theme_top_of_page_button != "edit" -%}
+                {%- set theme_top_of_page_buttons = [] -%}
+                {{ warning("Got configuration for both 'top_of_page_button' and 'top_of_page_buttons', ignoring both and removing all top of page buttons.") }}
+              {%- endif -%}
+            {%- endif -%}
+            {% for button in theme_top_of_page_buttons -%}
+              {% if button == "view" %}
+                {%- include "components/view-this-page.html" with context -%}
+              {% elif button == "edit" %}
+                {%- include "components/edit-this-page.html" with context -%}
+              {% else %}
+                {{ warning("Got an unsupported value in 'top_of_page_buttons' for theme configuration") }}
+              {% endif %}
+            {%- endfor -%}
+          {#- Theme toggle -#}
+            <div class="theme-toggle-container theme-toggle-content">
+              <button class="theme-toggle" aria-label="Toggle Light / Dark / Auto color theme">
+                <svg class="theme-icon-when-auto-light"><use href="#svg-sun-with-moon"></use></svg>
+                <svg class="theme-icon-when-auto-dark"><use href="#svg-moon-with-sun"></use></svg>
+                <svg class="theme-icon-when-dark"><use href="#svg-moon"></use></svg>
+                <svg class="theme-icon-when-light"><use href="#svg-sun"></use></svg>
+              </button>
+            </div>
+            <label class="toc-overlay-icon toc-content-icon{% if furo_hide_toc %} no-toc{% endif %}" for="__toc">
+              <span class="icon"><svg><use href="#svg-toc"></use></svg></span>
+            </label>
+          </div>
+          <article role="main" id="furo-main-content">
+            {% block content %}{{ body }}{% endblock %}
+          </article>
+        </div>
+        <footer>
+          {% block footer %}
+            <div class="related-pages">
+              {% if next -%}
+                <a class="next-page" href="{{ next.link }}">
+                  <div class="page-info">
+                    <div class="context">
+                      <span>{{ _("Next") }}</span>
+                    </div>
+                    <div class="title">{{ next.title }}</div>
+                  </div>
+                  <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
+                </a>
+              {%- endif %}
+              {% if prev -%}
+                <a class="prev-page" href="{{ prev.link }}">
+                  <svg class="furo-related-icon"><use href="#svg-arrow-right"></use></svg>
+                  <div class="page-info">
+                    <div class="context">
+                      <span>{{ _("Previous") }}</span>
+                    </div>
+                    {% if prev.link == pathto(master_doc) %}
+                      <div class="title">{{ _("Home") }}</div>
+                    {% else %}
+                      <div class="title">{{ prev.title }}</div>
+                    {% endif %}
+                  </div>
+                </a>
+              {%- endif %}
+            </div>
+            <div class="bottom-of-page">
+              <div class="left-details">
+                {%- if show_copyright %}
+                  <div class="copyright">
+                    {%- if hasdoc('copyright') %}
+                      {% trans path=pathto('copyright'), copyright=copyright|e -%}
+                        <a href="{{ path }}">Copyright</a> &#169; {{ copyright }}
+                      {%- endtrans %}
+                    {%- else %}
+                      {% trans copyright=copyright|e -%}
+                        Copyright &#169; {{ copyright }}, <a href="https://justinmayer.com">Justin Mayer</a>, Alexis Metaireau, and contributors
+                      {%- endtrans %}
+                    {%- endif %}
+                  </div>
+                {%- endif %}
+                {%- if last_updated -%}
+                  <div class="last-updated">
+                    {% trans last_updated=last_updated|e -%}
+                      Last updated on {{ last_updated }}
+                    {%- endtrans -%}
+                  </div>
+                {%- endif %}
+              </div>
+              <div class="right-details">
+                {% if theme_footer_icons or READTHEDOCS -%}
+                  <div class="icons">
+                    {% if theme_footer_icons -%}
+                      {% for icon_dict in theme_footer_icons -%}
+                        <a class="muted-link {{ icon_dict.class }}" href="{{ icon_dict.url }}" aria-label="{{ icon_dict.name }}">
+                          {{- icon_dict.html -}}
+                        </a>
+                      {% endfor %}
+                    {%- else -%}
+              {#- Show Read the Docs project -#}
+                      {%- if READTHEDOCS and slug -%}
+                        <a class="muted-link" href="https://readthedocs.org/projects/{{ slug }}" aria-label="On Read the Docs">
+                          <svg x="0px" y="0px" viewBox="-125 217 360 360" xml:space="preserve">
+                            <path fill="currentColor" d="M39.2,391.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3 c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2 c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,391.3,40.4,391.1,39.2,391.3z M39.2,353.6c-4.2,0.6-7.1,4.4-6.5,8.5 c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4 c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,353.6,40.4,353.4,39.2,353.6z M39.2,315.9 c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8 c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6c-30.1-2.4-46.5-7.9-46.5-7.9 C41.7,315.9,40.4,315.8,39.2,315.9z M39.2,278.3c-4.2,0.6-7.1,4.4-6.5,8.5c0.4,3,2.6,5.5,5.5,6.3c0,0,18.5,6.1,50,8.7 c25.3,2.1,54-1.8,54-1.8c4.2-0.1,7.5-3.6,7.4-7.8c-0.1-4.2-3.6-7.5-7.8-7.4c-0.5,0-1,0.1-1.5,0.2c0,0-28.1,3.5-50.9,1.6 c-30.1-2.4-46.5-7.9-46.5-7.9C41.7,278.2,40.4,278.1,39.2,278.3z M-13.6,238.5c-39.6,0.3-54.3,12.5-54.3,12.5v295.7 c0,0,14.4-12.4,60.8-10.5s55.9,18.2,112.9,19.3s71.3-8.8,71.3-8.8l0.8-301.4c0,0-25.6,7.3-75.6,7.7c-49.9,0.4-61.9-12.7-107.7-14.2 C-8.2,238.6-10.9,238.5-13.6,238.5z M19.5,257.8c0,0,24,7.9,68.3,10.1c37.5,1.9,75-3.7,75-3.7v267.9c0,0-19,10-66.5,6.6 C59.5,536.1,19,522.1,19,522.1L19.5,257.8z M-3.6,264.8c4.2,0,7.7,3.4,7.7,7.7c0,4.2-3.4,7.7-7.7,7.7c0,0-12.4,0.1-20,0.8 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,0,0,0,0c0,0,11.3-6,27-7.5 C-16,264.9-3.6,264.8-3.6,264.8z M-11,302.6c4.2-0.1,7.4,0,7.4,0c4.2,0.5,7.2,4.3,6.7,8.5c-0.4,3.5-3.2,6.3-6.7,6.7 c0,0-12.4,0.1-20,0.8c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5 C-20.5,302.9-15.2,302.7-11,302.6z M-3.6,340.2c4.2,0,7.7,3.4,7.7,7.7s-3.4,7.7-7.7,7.7c0,0-12.4-0.1-20,0.7 c-12.7,1.3-21.4,5.9-21.4,5.9c-3.7,2-8.4,0.5-10.3-3.2c-2-3.7-0.5-8.4,3.2-10.3c0,0,11.3-6,27-7.5C-16,340.1-3.6,340.2-3.6,340.2z" />
+                          </svg>
+                        </a>
+                      {%- endif -%}
+              {#- Show GitHub repository home -#}
+                      {%- if READTHEDOCS and display_github and github_user != "None" and github_repo != "None" -%}
+                        <a class="muted-link" href="https://github.com/{{ github_user }}/{{ github_repo }}" aria-label="On GitHub">
+                          <svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 16 16">
+                            <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path>
+                          </svg>
+                        </a>
+                      {%- endif -%}
+                    {%- endif %}
+                  </div>
+                {%- endif %}
+              </div>
+            </div>
+          {% endblock footer %}
+        </footer>
+      </div>
+      <aside class="toc-drawer{% if furo_hide_toc %} no-toc{% endif %}">
+        {% block right_sidebar %}
+          {% if not furo_hide_toc %}
+            <div class="toc-sticky toc-scroll">
+              <div class="toc-title-container">
+                <span class="toc-title">
+                  {{ _("On this page") }}
+                </span>
+              </div>
+              <div class="toc-tree-container">
+                <div class="toc-tree">
+                  {{ toc }}
+                </div>
+              </div>
+            </div>
+          {% endif %}
+        {% endblock right_sidebar %}
+      </aside>
+    </div>
   </div>
-</div>
 {%- endblock %}

From b989441a6144eaec17e290912d8f02547bb60947 Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanh@users.noreply.github.com>
Date: Thu, 16 Oct 2025 08:15:34 +0100
Subject: [PATCH 2813/2864] Don't use upload-pages-artifact (#3502)

---
 .github/workflows/github_pages.yml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index 9c279ab1..86c23fa3 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -85,10 +85,28 @@ jobs:
           chmod -c -R +rX "${{ inputs.output-path }}" | while read line; do
             echo "::warning title=Invalid file permissions automatically fixed::$line"
           done
+      - name: Archive artifact
+        shell: sh
+        run: |
+          echo "::group::Archive artifact"
+          tar \
+            --dereference \
+            --hard-dereference \
+            --directory "$OUTPUT_PATH" \
+            -cvf "$RUNNER_TEMP/artifact.tar" \
+            --exclude=.git \
+            --exclude=.github \
+            .
+          echo "::endgroup::"
+        env:
+          OUTPUT_PATH: ${{ inputs.output-path }}
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          path: ${{ inputs.output-path }}
+          name: github-pages
+          path: ${{ runner.temp }}/artifact.tar
+          retention-days: 1
+          if-no-files-found: error
   deploy:
     concurrency:
       group: "pages"

From af8e861d39a7dda6d0417609c8f0f03f5a7da92d Mon Sep 17 00:00:00 2001
From: joelsvensson <joel__svensson@hotmail.com>
Date: Thu, 16 Oct 2025 09:17:39 +0200
Subject: [PATCH 2814/2864] ci: Add Stork install option to GitHub Pages
 workflow (#3452)

---
 .github/workflows/github_pages.yml | 10 +++++++++-
 docs/tips.rst                      |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index 86c23fa3..004524c4 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -42,6 +42,11 @@ on:
         default: true
         description: "Whether to deploy the site. If true then build the site and deploy it. If false then just test that the site builds successfully but don't deploy anything."
         type: boolean
+      stork:
+        required: false
+        default: false
+        description: "Whether to add Stork search tool. If true, it will be installed on runner."
+        type: boolean
 permissions:
   contents: read
   pages: write
@@ -62,6 +67,9 @@ jobs:
       - name: Configure GitHub Pages
         id: pages
         uses: actions/configure-pages@v5
+      - name: Install Stork
+        if: ${{ inputs.stork }}
+        run: cargo install stork-search --locked
       - name: Install requirements
         run: pip install ${{ inputs.requirements }}
       - name: Build Pelican site
@@ -82,7 +90,7 @@ jobs:
           subprocess.run(cmd, shell=True, check=True)
       - name: Fix permissions
         run: |
-          chmod -c -R +rX "${{ inputs.output-path }}" | while read line; do
+          chmod -c -R +rX "${{ inputs.output-path }}" | while read -r line; do
             echo "::warning title=Invalid file permissions automatically fixed::$line"
           done
       - name: Archive artifact
diff --git a/docs/tips.rst b/docs/tips.rst
index 4df20ae3..3d228522 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -252,6 +252,10 @@ Here's the complete list of workflow inputs:
 |                  |          | change to your website in a pull request   |        |               |
 |                  |          | before deploying those change.             |        |               |
 +------------------+----------+--------------------------------------------+--------+---------------+
+| ``stork``        | No       | This is used to determine whether Stork    | bool   | ``false``     |
+|                  |          | will be installed on the runner to be able |        |               |
+|                  |          | to build a site with Stork search enabled  |        |               |
++------------------+----------+--------------------------------------------+--------+---------------+
 
 Testing Your Build in a GitHub Pull Request
 """""""""""""""""""""""""""""""""""""""""""

From 91d55a4c8eff9a1bfa2b6b478ce68b029f397962 Mon Sep 17 00:00:00 2001
From: Elliot Simpson <elliot@p-s.co.nz>
Date: Fri, 17 Oct 2025 20:05:08 +1300
Subject: [PATCH 2815/2864] Enable Ruff rule `blind-except` (#3493)

---
 .pre-commit-config.yaml         |  2 +-
 pelican/__init__.py             | 16 ++++++++--------
 pelican/generators.py           | 14 ++++++--------
 pelican/tools/pelican_themes.py |  4 ++--
 pelican/utils.py                | 14 +++++++-------
 pelican/writers.py              | 10 ++--------
 pyproject.toml                  |  4 ++--
 7 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 38287df9..b5291afb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # ruff version should match the one in pyproject.toml
-    rev: v0.12.2
+    rev: v0.12.7
     hooks:
       - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 8d916fc7..ead3fa7a 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -37,7 +37,7 @@ from pelican.writers import Writer
 
 try:
     __version__ = importlib.metadata.version("pelican")
-except Exception:
+except importlib.metadata.PackageNotFoundError:
     __version__ = "unknown"
 
 DEFAULT_CONFIG_NAME = "pelicanconf.py"
@@ -78,11 +78,10 @@ class Pelican:
             try:
                 plugin.register()
                 self.plugins.append(plugin)
-            except Exception as e:
-                logger.error(
-                    "Cannot register plugin `%s`\n%s",
+            except Exception:
+                logger.exception(
+                    "Cannot register plugin `%s`",
                     name,
-                    e,
                     stacklevel=2,
                 )
                 if self.settings.get("DEBUG", False):
@@ -258,7 +257,7 @@ class PrintSettings(argparse.Action):
         try:
             instance, settings = get_instance(namespace)
         except Exception as e:
-            logger.critical("%s: %s", e.__class__.__name__, e)
+            logger.critical("%s", e.__class__.__name__, exc_info=True)
             console.print_exception()
             sys.exit(getattr(e, "exitcode", 1))
 
@@ -621,7 +620,8 @@ def listen(server, port, output, excqueue=None):
     except Exception as e:
         if excqueue is not None:
             excqueue.put(traceback.format_exception_only(type(e), e)[-1])
-        return
+        else:
+            logging.exception("Listening aborted unexpectedly.")
 
     except KeyboardInterrupt:
         httpd.socket.close()
@@ -680,7 +680,7 @@ def main(argv=None):
     except KeyboardInterrupt:
         logger.warning("Keyboard interrupt received. Exiting.")
     except Exception as e:
-        logger.critical("%s: %s", e.__class__.__name__, e)
+        logger.critical("%s: %s", e.__class__.__name__, e, exc_info=True)
 
         if args.verbosity == logging.DEBUG:
             console.print_exception()
diff --git a/pelican/generators.py b/pelican/generators.py
index e04d1733..bf1d1cb8 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -681,11 +681,10 @@ class ArticlesGenerator(CachingGenerator):
                         context_signal=signals.article_generator_context,
                         context_sender=self,
                     )
-                except Exception as e:
-                    logger.error(
-                        "Could not process %s\n%s",
+                except Exception:
+                    logger.exception(
+                        "Could not process %s",
                         f,
-                        e,
                         exc_info=self.settings.get("DEBUG", False),
                     )
                     self._add_failed_source_path(f)
@@ -896,11 +895,10 @@ class PagesGenerator(CachingGenerator):
                         context_signal=signals.page_generator_context,
                         context_sender=self,
                     )
-                except Exception as e:
-                    logger.error(
-                        "Could not process %s\n%s",
+                except Exception:
+                    logger.exception(
+                        "Could not process %s",
                         f,
-                        e,
                         exc_info=self.settings.get("DEBUG", False),
                     )
                     self._add_failed_source_path(f)
diff --git a/pelican/tools/pelican_themes.py b/pelican/tools/pelican_themes.py
index 1ae707e3..29fd7a30 100755
--- a/pelican/tools/pelican_themes.py
+++ b/pelican/tools/pelican_themes.py
@@ -241,7 +241,7 @@ def install(path, v=False, u=False):
                         f"or directory in `{theme_path}':\n{e!s}",
                         die=False,
                     )
-            except Exception as e:
+            except OSError as e:
                 err(f"Cannot copy `{path}' to `{theme_path}':\n{e!s}")
 
 
@@ -262,7 +262,7 @@ def symlink(path, v=False):
                 print(f"Linking `{path}' to `{theme_path}' ...")
             try:
                 os.symlink(path, theme_path)
-            except Exception as e:
+            except OSError as e:
                 err(f"Cannot link `{path}' to `{theme_path}':\n{e!s}")
 
 
diff --git a/pelican/utils.py b/pelican/utils.py
index eb281ce9..0dd36a1f 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -378,8 +378,8 @@ def clean_output_dir(path: str, retention: Iterable[str]) -> None:
     if not os.path.isdir(path):
         try:
             os.remove(path)
-        except Exception as e:
-            logger.error("Unable to delete file %s; %s", path, e)
+        except Exception:
+            logger.exception("Unable to delete file %s", path)
         return
 
     # remove existing content from output folder unless in retention list
@@ -393,14 +393,14 @@ def clean_output_dir(path: str, retention: Iterable[str]) -> None:
             try:
                 shutil.rmtree(file)
                 logger.debug("Deleted directory %s", file)
-            except Exception as e:
-                logger.error("Unable to delete directory %s; %s", file, e)
+            except Exception:
+                logger.exception("Unable to delete directory %s", file)
         elif os.path.isfile(file) or os.path.islink(file):
             try:
                 os.remove(file)
                 logger.debug("Deleted file/link %s", file)
-            except Exception as e:
-                logger.error("Unable to delete file %s; %s", file, e)
+            except Exception:
+                logger.exception("Unable to delete file %s", file)
         else:
             logger.error("Unable to delete %s, file type unknown", file)
 
@@ -764,7 +764,7 @@ def order_content(
             try:
                 content_list.sort(key=order_by)
             except Exception:
-                logger.error("Error sorting with function %s", order_by)
+                logger.exception("Error sorting with function %s", order_by)
         elif isinstance(order_by, str):
             if order_by.startswith("reversed-"):
                 order_reversed = True
diff --git a/pelican/writers.py b/pelican/writers.py
index 1a99532a..009d761a 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -161,10 +161,7 @@ class Writer:
         if path:
             complete_path = sanitised_join(self.output_path, path)
 
-            try:
-                os.makedirs(os.path.dirname(complete_path))
-            except Exception:
-                pass
+            os.makedirs(os.path.dirname(complete_path), exist_ok=True)
 
             with self._open_w(complete_path, "utf-8", override_output) as fp:
                 feed.write(fp, "utf-8")
@@ -215,10 +212,7 @@ class Writer:
             output = template.render(localcontext)
             path = sanitised_join(output_path, name)
 
-            try:
-                os.makedirs(os.path.dirname(path))
-            except Exception:
-                pass
+            os.makedirs(os.path.dirname(path), exist_ok=True)
 
             with self._open_w(path, "utf-8", override=override) as f:
                 f.write(output)
diff --git a/pyproject.toml b/pyproject.toml
index ce5cd894..efa19e24 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,7 @@ dev = [
     "tox>=4.11.3",
     "invoke>=2.2.0",
     # ruff version should match the one in .pre-commit-config.yaml
-    "ruff==0.12.2",
+    "ruff==0.12.7",
     "tomli>=2.0.1; python_version < \"3.11\"",
 ]
 
@@ -127,7 +127,7 @@ select = [
     "A",   # flake8-builtins
     "ARG", # flake8-unused-arguments
     "B",   # flake8-bugbear
-    # TODO: "BLE", # flake8-blind-except
+    "BLE", # flake8-blind-except
     # TODO: Do I want "COM", # flake8-commas
     "C4",  # flake8-comprehensions
     # TODO: "DJ",  # flake8-django

From 24e0894840c6b40fe915534db19cf2b4395461f5 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 17 Oct 2025 09:36:12 +0200
Subject: [PATCH 2816/2864] docs: Avoid using colons in metadata field names

Fix #3486
---
 docs/faq.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index dc6097c8..3c2ac972 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -112,6 +112,11 @@ If you want to include metadata in templates outside the article context (e.g.,
 
     {% if article and article.modified %}
 
+.. note::
+
+    Because the colon symbol (``:``) is used as a separator, be aware that
+    metadata field names *containing* a colon will probably not work.
+
 How do I make my output folder structure identical to my content hierarchy?
 ===========================================================================
 

From 2548bae70dfe752720129d6aa9057df267b02d17 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 16 Oct 2025 09:26:59 +0200
Subject: [PATCH 2817/2864] Drop Python 3.9 support

---
 .github/workflows/main.yml | 3 ---
 pyproject.toml             | 3 +--
 tox.ini                    | 3 +--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 68e1fd30..bf18fbed 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,9 +16,6 @@ jobs:
       matrix:
         os: [ubuntu, macos, windows]
         python: ["3.10", "3.11", "3.12", "3.13"]
-        include:
-          - os: ubuntu
-            python: "3.9"
 
     steps:
       - uses: actions/checkout@v5
diff --git a/pyproject.toml b/pyproject.toml
index efa19e24..b7866962 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,6 @@ classifiers = [
     "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -27,7 +26,7 @@ classifiers = [
     "Topic :: Text Processing :: Markup :: HTML",
     "Topic :: Text Processing :: Markup :: reStructuredText",
 ]
-requires-python = ">=3.9,<4.0"
+requires-python = ">=3.10,<4.0"
 dependencies = [
     "blinker>=1.7.0",
     "docutils>=0.20.1",
diff --git a/tox.ini b/tox.ini
index 106e4580..4ab0921c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py{3.9,3.10,3.11,3.12,3.13},docs
+envlist = py{3.10,3.11,3.12,3.13},docs
 
 [testenv]
 basepython =
-    py3.9: python3.9
     py3.10: python3.10
     py3.11: python3.11
     py3.12: python3.12

From 8d61c0bdf725c986eadb5856708a39fcd3ba137c Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Thu, 16 Oct 2025 09:39:58 +0200
Subject: [PATCH 2818/2864] Update code for Python 3.10+

---
 pelican/__init__.py   |  2 +-
 pelican/contents.py   | 22 ++++++++++------------
 pelican/generators.py |  5 ++---
 pelican/settings.py   |  6 +++---
 pelican/utils.py      | 14 ++++++++++----
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/pelican/__init__.py b/pelican/__init__.py
index ead3fa7a..a69e574b 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -266,7 +266,7 @@ class PrintSettings(argparse.Action):
             for setting in values:
                 if setting in settings:
                     # Only add newline between setting name and value if dict
-                    if isinstance(settings[setting], (dict, tuple, list)):
+                    if isinstance(settings[setting], dict | tuple | list):
                         setting_format = "\n{}:\n{}"
                     else:
                         setting_format = "\n{}: {}"
diff --git a/pelican/contents.py b/pelican/contents.py
index a06a1a6a..8494145a 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -5,7 +5,7 @@ import logging
 import os
 import re
 from html import unescape
-from typing import Any, Optional
+from typing import Any
 from urllib.parse import ParseResult, unquote, urljoin, urlparse, urlunparse
 
 try:
@@ -45,7 +45,7 @@ class Content:
 
     """
 
-    default_template: Optional[str] = None
+    default_template: str | None = None
     mandatory_properties: tuple[str, ...] = ()
 
     @deprecated_attribute(old="filename", new="source_path", since=(3, 2, 0))
@@ -55,10 +55,10 @@ class Content:
     def __init__(
         self,
         content: str,
-        metadata: Optional[dict[str, Any]] = None,
-        settings: Optional[Settings] = None,
-        source_path: Optional[str] = None,
-        context: Optional[dict[Any, Any]] = None,
+        metadata: dict[str, Any] | None = None,
+        settings: Settings | None = None,
+        source_path: str | None = None,
+        context: dict[Any, Any] | None = None,
     ):
         if metadata is None:
             metadata = {}
@@ -241,7 +241,7 @@ class Content:
         )
         return metadata
 
-    def _expand_settings(self, key: str, klass: Optional[str] = None) -> str:
+    def _expand_settings(self, key: str, klass: str | None = None) -> str:
         if not klass:
             klass = self.__class__.__name__
         fq_key = (f"{klass}_{key}").upper()
@@ -281,10 +281,10 @@ class Content:
         # XXX Put this in a different location.
         if what in {"filename", "static", "attach"}:
 
-            def _get_linked_content(key: str, url: ParseResult) -> Optional[Content]:
+            def _get_linked_content(key: str, url: ParseResult) -> Content | None:
                 nonlocal value
 
-                def _find_path(path: str) -> Optional[Content]:
+                def _find_path(path: str) -> Content | None:
                     if path.startswith("/"):
                         path = path[1:]
                     else:
@@ -494,9 +494,7 @@ class Content:
         else:
             return self.default_template
 
-    def get_relative_source_path(
-        self, source_path: Optional[str] = None
-    ) -> Optional[str]:
+    def get_relative_source_path(self, source_path: str | None = None) -> str | None:
         """Return the relative path (from the content path) to the given
         source_path.
 
diff --git a/pelican/generators.py b/pelican/generators.py
index bf1d1cb8..3b867dfb 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -7,7 +7,6 @@ from collections import defaultdict
 from functools import partial
 from itertools import chain, groupby
 from operator import attrgetter
-from typing import Optional
 
 from jinja2 import (
     BaseLoader,
@@ -158,7 +157,7 @@ class Generator:
         return False
 
     def get_files(
-        self, paths, exclude: Optional[list[str]] = None, extensions=None
+        self, paths, exclude: list[str] | None = None, extensions=None
     ) -> set[str]:
         """Return a list of files to use, based on rules
 
@@ -253,7 +252,7 @@ class Generator:
         # return the name of the class for logging purposes
         return self.__class__.__name__
 
-    def _check_disabled_readers(self, paths, exclude: Optional[list[str]]) -> None:
+    def _check_disabled_readers(self, paths, exclude: list[str] | None) -> None:
         """Log warnings for files that would have been processed by disabled readers."""
         for fil in self.get_files(
             paths, exclude=exclude, extensions=self.readers.disabled_extensions
diff --git a/pelican/settings.py b/pelican/settings.py
index 2f3f8fa1..98b1357e 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -9,7 +9,7 @@ import sys
 from os.path import isabs
 from pathlib import Path
 from types import ModuleType
-from typing import Any, Optional
+from typing import Any
 
 from pelican.log import LimitFilter
 from pelican.paginator import PaginationRule
@@ -185,7 +185,7 @@ PYGMENTS_RST_OPTIONS = None
 
 
 def read_settings(
-    path: Optional[str] = None, override: Optional[Settings] = None
+    path: str | None = None, override: Settings | None = None
 ) -> Settings:
     settings = override or {}
 
@@ -230,7 +230,7 @@ def read_settings(
     return settings
 
 
-def get_settings_from_module(module: Optional[ModuleType] = None) -> Settings:
+def get_settings_from_module(module: ModuleType | None = None) -> Settings:
     """Loads settings from a module, returns a dictionary."""
 
     context = {}
diff --git a/pelican/utils.py b/pelican/utils.py
index 0dd36a1f..a5e08538 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -11,7 +11,14 @@ import shutil
 import traceback
 import unicodedata
 import urllib
-from collections.abc import Collection, Generator, Hashable, Iterable, Sequence
+from collections.abc import (
+    Callable,
+    Collection,
+    Generator,
+    Hashable,
+    Iterable,
+    Sequence,
+)
 from contextlib import contextmanager
 from functools import partial
 from html import entities
@@ -21,7 +28,6 @@ from operator import attrgetter
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
 )
 
 import dateutil.parser
@@ -234,7 +240,7 @@ def get_date(string: str) -> datetime.datetime:
 
 
 @contextmanager
-def pelican_open(filename: str, mode: str = "r") -> Generator[str, None, None]:
+def pelican_open(filename: str, mode: str = "r") -> Generator[str]:
     """Open a file and return its content"""
 
     # utf-8-sig will clear any BOM if present
@@ -932,7 +938,7 @@ def maybe_pluralize(count: int, singular: str, plural: str) -> str:
 @contextmanager
 def temporary_locale(
     temp_locale: str | None = None, lc_category: int = locale.LC_ALL
-) -> Generator[None, None, None]:
+) -> Generator[None]:
     """
     Enable code to run in a context with a temporary locale
     Resets the locale back when exiting context.

From 41f7436669d7aa7aadca09bc0bab504cde4cfab6 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 17 Oct 2025 08:48:41 +0200
Subject: [PATCH 2819/2864] Remove upper bound on Requires-Python

Rationale: https://discuss.python.org/t/requires-python-upper-limits/12663
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index b7866962..fb0212a7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,7 +26,7 @@ classifiers = [
     "Topic :: Text Processing :: Markup :: HTML",
     "Topic :: Text Processing :: Markup :: reStructuredText",
 ]
-requires-python = ">=3.10,<4.0"
+requires-python = ">=3.10"
 dependencies = [
     "blinker>=1.7.0",
     "docutils>=0.20.1",

From 098ec5b0afeafdcfa259a6fc2ccae797a10f7d5f Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Fri, 17 Oct 2025 09:53:59 +0200
Subject: [PATCH 2820/2864] Add support for Python 3.14

---
 .github/workflows/main.yml | 2 +-
 pyproject.toml             | 1 +
 tox.ini                    | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bf18fbed..c99e6ae5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu, macos, windows]
-        python: ["3.10", "3.11", "3.12", "3.13"]
+        python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - uses: actions/checkout@v5
diff --git a/pyproject.toml b/pyproject.toml
index fb0212a7..66e4a77f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,6 +18,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Content Management System",
     "Topic :: Internet :: WWW/HTTP :: Site Management",
diff --git a/tox.ini b/tox.ini
index 4ab0921c..2b91bff4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.10,3.11,3.12,3.13},docs
+envlist = py{3.10,3.11,3.12,3.13,3.14},docs
 
 [testenv]
 basepython =
@@ -7,6 +7,7 @@ basepython =
     py3.11: python3.11
     py3.12: python3.12
     py3.13: python3.13
+    py3.14: python3.14
 passenv = *
 usedevelop=True
 deps =

From 2e9a6647a5c1f007c946b740c4b902d49cfb82a6 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 30 Oct 2025 04:47:33 -0600
Subject: [PATCH 2821/2864] Exclude Apple debugging artifacts from package
 builds (#3518)

Co-authored-by: Justin Mayer <entroP@gmail.com>
---
 pyproject.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 66e4a77f..09fcbdb6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -107,6 +107,9 @@ source-includes = [
     "docs/changelog.rst",
     "samples/",
 ]
+excludes = [
+    "pelican/build/"
+]
 
 [build-system]
 requires = ["pdm-backend"]

From 86f1f7225d99dd269dbd6d58ed0aae45867045c7 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 1 Nov 2025 10:37:20 +0100
Subject: [PATCH 2822/2864] Upgrade `upload-artifact` GitHub Action to v5

---
 .github/workflows/github_pages.yml | 2 +-
 .github/workflows/main.yml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index 004524c4..4aaf922d 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -109,7 +109,7 @@ jobs:
         env:
           OUTPUT_PATH: ${{ inputs.output-path }}
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: github-pages
           path: ${{ runner.temp }}/artifact.tar
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c99e6ae5..0f59e862 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -95,7 +95,7 @@ jobs:
       - name: Check
         run: tox -e docs
       - name: cache the docs for inspection
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: docs
           path: docs/_build/html/

From 06da37fd0a1ab1b18b88f5ecbb1b889d21d6a820 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 19 Nov 2025 09:02:23 +0100
Subject: [PATCH 2823/2864] Encourage discussions instead of new issues

Folks tend to ignore the comments in issue templates and create new
issues, even when the issue template comments make it clear that we
would prefer that folks create discussions for topics outside of bug
reports, documentation issues, and feature requests.
---
 .github/ISSUE_TEMPLATE/config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a07de4ab..356d6322 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,6 +2,10 @@
 # Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
 blank_issues_enabled: false
 contact_links:
+- name: '🗃️ Everything Else'
+  url: https://github.com/getpelican/pelican/discussions
+  about: |
+    Do you have a question/issue that does not fall into any of the other categories?
 - name: '💬 Pelican IRC Channel'
   url: https://web.libera.chat/?#pelican
   about: |

From 1f00e226104a4d9824fadf7f815a8f54435f583e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Wed, 19 Nov 2025 09:07:11 +0100
Subject: [PATCH 2824/2864] Remove "Everything Else" issue template

We now direct folks directly to discussions instead.
---
 .github/ISSUE_TEMPLATE/---everything-else.md | 28 --------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/---everything-else.md

diff --git a/.github/ISSUE_TEMPLATE/---everything-else.md b/.github/ISSUE_TEMPLATE/---everything-else.md
deleted file mode 100644
index 23a3f7bd..00000000
--- a/.github/ISSUE_TEMPLATE/---everything-else.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: "\U0001F5C3 Everything Else"
-about: Do you have a question/issue that does not fall into any of the other categories?
-title: ''
-labels: question
-assignees: ''
-
----
-
-<!--
-  Instead of a new issue, please consider submitting your question to:
-  <https://github.com/getpelican/pelican/discussions>
-  If for some reason you believe that your question warrants a new issue
-  instead of a discussion thread, describe your question/issue here.
-  This space is meant to be used for general questions
-  that are not bugs, feature requests, or documentation issues.
-  Before you submit this, let’s make sure of a few things.
-  Please make sure the following boxes are ticked if they are correct.
-  If not, please try and fulfill them first.
--->
-
-<!-- Checked checkbox should look like this: [x] -->
-- [ ] I have searched the [issues](https://github.com/getpelican/pelican/issues?q=is%3Aissue) (including closed ones) and believe that this is not a duplicate.
-- [ ] I have searched the [documentation](https://docs.getpelican.com/) and believe that my question is not covered.
-- [ ] I have carefully read the [How to Get Help](https://docs.getpelican.com/en/latest/contribute.html#how-to-get-help) section of the documentation.
-
-## Issue
-<!-- Now feel free to write your issue, but please be descriptive! Thanks again 🙌 ❤️ -->

From 782962d3ad6e1724441006d97790d99a789997eb Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 1 Dec 2025 09:09:51 +0100
Subject: [PATCH 2825/2864] Tell Dependabot to stop creating pull requests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Perhaps the "right" way to do this is to delete the dependabot.yml file entirely ¯\_(ツ)_/¯
---
 .github/dependabot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4fed5330..02edf983 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,3 +7,4 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+    open-pull-requests-limit: 0

From 945fd6d3b6ecef58be922807e6cbabc8d300eb11 Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanh@users.noreply.github.com>
Date: Tue, 25 Nov 2025 18:30:12 +0000
Subject: [PATCH 2826/2864] Update GitHub Pages workflow's Python version

Update the default Python version used by the GitHub Pages workflow
to 3.14.
---
 .github/workflows/github_pages.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index 4aaf922d..a94a6355 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -24,8 +24,8 @@ on:
         type: string
       python:
         required: false
-        default: "3.12"
-        description: "The version of Python to use, for example: '3.12' (to use the most recent version of Python 3.12, this is faster) or '3.12.1' (to use an exact version, slower)"
+        default: "3.14"
+        description: "The version of Python to use, for example: '3.14' (to use the most recent version of Python 3.14, this is faster) or '3.14.0' (to use an exact version, slower)"
         type: string
       siteurl:
         required: false

From 993d21401f3a4e2524b8fff5a86b23f193a15914 Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanh@users.noreply.github.com>
Date: Tue, 25 Nov 2025 18:29:15 +0000
Subject: [PATCH 2827/2864] Add `theme-checkout` option to GitHub Pages
 workflow

---
 .github/workflows/github_pages.yml |  10 ++-
 docs/tips.rst                      | 108 +++++++++++++++--------------
 2 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index a94a6355..59edb733 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -22,6 +22,11 @@ on:
         default: ""
         description: "The GitHub repo URL of a custom theme to use, for example: 'https://github.com/seanh/sidecar.git'"
         type: string
+      theme-checkout:
+        required: false
+        default: ""
+        description: "Git ref (branch, tag or commit) of the theme repo to checkout. This can be used to pin the version of your theme. If not specified defaults to the theme repo's default branch."
+        type: string
       python:
         required: false
         default: "3.14"
@@ -61,9 +66,12 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ inputs.python }}
-      - name: Checkout theme
+      - name: Clone theme
         if: ${{ inputs.theme }}
         run: git clone '${{ inputs.theme }}' .theme
+      - name: Checkout theme ref
+        if: ${{ inputs.theme && inputs.theme-checkout }}
+        run: git -C .theme checkout '${{ inputs.theme-checkout }}'
       - name: Configure GitHub Pages
         id: pages
         uses: actions/configure-pages@v5
diff --git a/docs/tips.rst b/docs/tips.rst
index 3d228522..83d09a5e 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -205,57 +205,63 @@ the workflow, for example:
 
 Here's the complete list of workflow inputs:
 
-+------------------+----------+--------------------------------------------+--------+---------------+
-| Name             | Required | Description                                | Type   | Default       |
-+==================+==========+============================================+========+===============+
-| ``settings``     | Yes      | The path to your Pelican settings          | string |               |
-|                  |          | file (``pelican``'s                        |        |               |
-|                  |          | ``--settings`` option),                    |        |               |
-|                  |          | for example: ``"publishconf.py"``          |        |               |
-+------------------+----------+--------------------------------------------+--------+---------------+
-| ``requirements`` | No       | The Python requirements to                 | string | ``"pelican"`` |
-|                  |          | install, for example to enable             |        |               |
-|                  |          | markdown and typogrify use:                |        |               |
-|                  |          | ``"pelican[markdown] typogrify"``          |        |               |
-|                  |          | or if you have a requirements              |        |               |
-|                  |          | file: ``"-r requirements.txt"``            |        |               |
-+------------------+----------+--------------------------------------------+--------+---------------+
-| ``output-path``  | No       | Where to output the generated              | string | ``"output/"`` |
-|                  |          | files (``pelican``'s ``--output``          |        |               |
-|                  |          | option)                                    |        |               |
-+------------------+----------+--------------------------------------------+--------+---------------+
-| ``theme``        | No       | The GitHub repo URL of a custom            | string | ``""``        |
-|                  |          | theme to use, for example:                 |        |               |
-|                  |          | ``"https://github.com/seanh/sidecar.git"`` |        |               |
-+------------------+----------+--------------------------------------------+--------+---------------+
-| ``python``       | No       | The version of Python to use to build the  | string | ``"3.12"``    |
-|                  |          | site, for example: ``"3.12"`` (to use the  |        |               |
-|                  |          | most recent version of Python 3.12, this   |        |               |
-|                  |          | is faster) or ``"3.12.1"`` (to use an      |        |               |
-|                  |          | exact version, slower)                     |        |               |
-+------------------+----------+--------------------------------------------+--------+---------------+
-| ``siteurl``      | No       | The base URL of your web site (Pelican's   | string | The URL of    |
-|                  |          | ``SITEURL`` setting). If not passed this   |        | your GitHub   |
-|                  |          | will default to the URL of your GitHub     |        | Pages site.   |
-|                  |          | Pages site, which is correct in most       |        |               |
-|                  |          | cases.                                     |        |               |
-+------------------+----------+--------------------------------------------+--------+---------------+
-| ``feed_domain``  | No       | The domain to be prepended to feed URLs    | string | The URL of    |
-|                  |          | (Pelican's ``FEED_DOMAIN`` setting). If    |        | your GitHub   |
-|                  |          | not passed this will default to the URL of |        | Pages site.   |
-|                  |          | your GitHub Pages site, which is correct   |        |               |
-|                  |          | in most cases.                             |        |               |
-+------------------+----------+--------------------------------------------+--------+---------------+
-| ``deploy``       | No       | This is used to determine whether you will | bool   | ``true``      |
-|                  |          | deploy the site or not to GitHub Pages.    |        |               |
-|                  |          | This is most useful if you want to test a  |        |               |
-|                  |          | change to your website in a pull request   |        |               |
-|                  |          | before deploying those change.             |        |               |
-+------------------+----------+--------------------------------------------+--------+---------------+
-| ``stork``        | No       | This is used to determine whether Stork    | bool   | ``false``     |
-|                  |          | will be installed on the runner to be able |        |               |
-|                  |          | to build a site with Stork search enabled  |        |               |
-+------------------+----------+--------------------------------------------+--------+---------------+
++--------------------+----------+--------------------------------------------+--------+---------------+
+| Name               | Required | Description                                | Type   | Default       |
++====================+==========+============================================+========+===============+
+| ``settings``       | Yes      | The path to your Pelican settings          | string |               |
+|                    |          | file (``pelican``'s                        |        |               |
+|                    |          | ``--settings`` option),                    |        |               |
+|                    |          | for example: ``"publishconf.py"``          |        |               |
++--------------------+----------+--------------------------------------------+--------+---------------+
+| ``requirements``   | No       | The Python requirements to                 | string | ``"pelican"`` |
+|                    |          | install, for example to enable             |        |               |
+|                    |          | markdown and typogrify use:                |        |               |
+|                    |          | ``"pelican[markdown] typogrify"``          |        |               |
+|                    |          | or if you have a requirements              |        |               |
+|                    |          | file: ``"-r requirements.txt"``            |        |               |
++--------------------+----------+--------------------------------------------+--------+---------------+
+| ``output-path``    | No       | Where to output the generated              | string | ``"output/"`` |
+|                    |          | files (``pelican``'s ``--output``          |        |               |
+|                    |          | option)                                    |        |               |
++--------------------+----------+--------------------------------------------+--------+---------------+
+| ``theme``          | No       | The GitHub repo URL of a custom            | string | ``""``        |
+|                    |          | theme to use, for example:                 |        |               |
+|                    |          | ``"https://github.com/seanh/sidecar.git"`` |        |               |
++--------------------+----------+--------------------------------------------+--------+---------------+
+| ``theme-checkout`` | No       | Git ref (branch, tag or commit) of the     | string | ``""``        |
+|                    |          | theme repo to checkout. This can be used   |        |               |
+|                    |          | to pin the version of your theme. If not   |        |               |
+|                    |          | specified defaults to the theme repo's     |        |               |
+|                    |          | default branch.                            |        |               |
++--------------------+----------+--------------------------------------------+--------+---------------+
+| ``python``         | No       | The version of Python to use to build the  | string | ``"3.12"``    |
+|                    |          | site, for example: ``"3.12"`` (to use the  |        |               |
+|                    |          | most recent version of Python 3.12, this   |        |               |
+|                    |          | is faster) or ``"3.12.1"`` (to use an      |        |               |
+|                    |          | exact version, slower)                     |        |               |
++--------------------+----------+--------------------------------------------+--------+---------------+
+| ``siteurl``        | No       | The base URL of your web site (Pelican's   | string | The URL of    |
+|                    |          | ``SITEURL`` setting). If not passed this   |        | your GitHub   |
+|                    |          | will default to the URL of your GitHub     |        | Pages site.   |
+|                    |          | Pages site, which is correct in most       |        |               |
+|                    |          | cases.                                     |        |               |
++--------------------+----------+--------------------------------------------+--------+---------------+
+| ``feed_domain``    | No       | The domain to be prepended to feed URLs    | string | The URL of    |
+|                    |          | (Pelican's ``FEED_DOMAIN`` setting). If    |        | your GitHub   |
+|                    |          | not passed this will default to the URL of |        | Pages site.   |
+|                    |          | your GitHub Pages site, which is correct   |        |               |
+|                    |          | in most cases.                             |        |               |
++--------------------+----------+--------------------------------------------+--------+---------------+
+| ``deploy``         | No       | This is used to determine whether you will | bool   | ``true``      |
+|                    |          | deploy the site or not to GitHub Pages.    |        |               |
+|                    |          | This is most useful if you want to test a  |        |               |
+|                    |          | change to your website in a pull request   |        |               |
+|                    |          | before deploying those change.             |        |               |
++--------------------+----------+--------------------------------------------+--------+---------------+
+| ``stork``          | No       | This is used to determine whether Stork    | bool   | ``false``     |
+|                    |          | will be installed on the runner to be able |        |               |
+|                    |          | to build a site with Stork search enabled  |        |               |
++--------------------+----------+--------------------------------------------+--------+---------------+
 
 Testing Your Build in a GitHub Pull Request
 """""""""""""""""""""""""""""""""""""""""""

From 3d3265b74c54338b8e9371c51eba4e8ef8b629c9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 1 Dec 2025 09:27:33 +0100
Subject: [PATCH 2828/2864] ci: Increment `checkout` GitHub action to v6

---
 .github/workflows/github_pages.yml |  2 +-
 .github/workflows/main.yml         | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
index 59edb733..c17919e9 100644
--- a/.github/workflows/github_pages.yml
+++ b/.github/workflows/github_pages.yml
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0f59e862..14b8ee90 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
         python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v6
         with:
@@ -47,7 +47,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: pdm-project/setup-pdm@v4
         with:
           python-version: "3.11"
@@ -65,7 +65,7 @@ jobs:
     name: Test build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: pdm-project/setup-pdm@v4
         with:
           python-version: "3.11"
@@ -83,7 +83,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -112,7 +112,7 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           token: ${{ secrets.GH_TOKEN }}
 

From 302f20a628b50e2d9cbc391ae7447c73d648c707 Mon Sep 17 00:00:00 2001
From: Chad Smith <chad@grassfedcode.com>
Date: Sat, 20 Apr 2019 09:34:27 -0700
Subject: [PATCH 2829/2864] add pipx installation instructions and prefer venv

---
 docs/install.rst | 61 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 15 deletions(-)

diff --git a/docs/install.rst b/docs/install.rst
index 502148ed..e10d136e 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -3,25 +3,48 @@ Installing Pelican
 
 Pelican currently runs best on |min_python|; earlier versions of Python are not supported.
 
-You can install Pelican via several different methods. The simplest is via Pip_::
+Once Pelican is installed, you can run ``pelican --help`` to see basic usage
+options. For more detail, refer to the :doc:`Publish<publish>` section.
+
+You can install Pelican via several different methods. The simplest is via
+`pip <http://www.pip-installer.org/>`_::
 
     python -m pip install pelican
 
-Or, if you plan on using Markdown::
+Keep in mind that operating systems will often require you to prefix the above
+command with ``sudo`` in order to install Pelican system-wide. **You should
+not do this** as it may break your operating system. In this case you
+can add the ``--user`` flag or try one of the recommended methods below.
 
-    python -m pip install "pelican[markdown]"
+**Recommended method 1:** `pipx <https://github.com/pipxproject/pipx/>`_
 
-(Keep in mind that some operating systems will require you to prefix the above
-command with ``sudo`` in order to install Pelican system-wide.)
+pipx lets you execute binaries from Python packages in isolated environments.
+You can install pipx according to instructions on its  
+`homepage <https://github.com/pipxproject/pipx/>`_. After pipx is installed,
+you can install pelican::
 
-While the above is the simplest method, the recommended approach is to create a
-virtual environment for Pelican via virtualenv_ before installing Pelican.
-Assuming you have virtualenv_ installed, you can then open a new terminal
-session and create a new virtual environment for Pelican::
+    $ pipx install pelican
+    installed package pelican 4.0.1, Python 3.6.7
+    These binaries are now globally available
+     - pelican
+     - pelican-import
+     - pelican-quickstart
+     - pelican-themes
+    done! ✨ 🌟 ✨
 
-    virtualenv ~/virtualenvs/pelican
-    cd ~/virtualenvs/pelican
-    source bin/activate
+To upgrade or uninstall::
+
+    pipx upgrade pelican
+    pipx uninstall pelican
+
+**Recommended method 2:** Virtual Environment
+
+If you prefer to manually manage a Virtual Environment, you can create 
+a virtual environment for Pelican via venv_ (or virtualenv_ if you are 
+using Python2) before installing Pelican.::
+
+    python -m venv ~/virtualenvs/pelican
+    . ~/virtualenvs/pelican/bin/activate
 
 Once the virtual environment has been created and activated, Pelican can be
 installed via ``python -m pip install pelican`` as noted above. Alternatively, if you
@@ -35,8 +58,7 @@ version of Pelican rather than a stable release, use the following command::
 
     python -m pip install -e "git+https://github.com/getpelican/pelican.git#egg=pelican"
 
-Once Pelican is installed, you can run ``pelican --help`` to see basic usage
-options. For more detail, refer to the :doc:`Publish<publish>` section.
+To exit the virtual environment, type ``deactivate``.
 
 Optional packages
 -----------------
@@ -52,6 +74,11 @@ installed::
 
     python -m pip install typogrify
 
+If you are using pipx, you can inject packages into the pipx-managed virtual
+environment::
+
+    pipx inject pelican Markdown
+
 Dependencies
 ------------
 
@@ -85,6 +112,10 @@ the latest stable release, you can do so by adding ``--upgrade``::
 If you installed Pelican via distutils or the bleeding-edge method, simply
 perform the same step to install the most recent version.
 
+If you installed with pipx::
+
+    pipx upgrade pelican
+
 Kickstart your site
 -------------------
 
@@ -118,5 +149,5 @@ content)::
 The next step is to begin to adding content to the *content* folder that has
 been created for you.
 
-.. _Pip: https://pip.pypa.io/
 .. _virtualenv: https://virtualenv.pypa.io/en/latest/
+.. _venv: https://docs.python.org/3/library/venv.html

From b5e20d7f6d8520bb277c7c261eed8c33a53ae4de Mon Sep 17 00:00:00 2001
From: GeorgeHu <43069137+GeorgeHu6@users.noreply.github.com>
Date: Tue, 3 Feb 2026 19:11:45 +0800
Subject: [PATCH 2830/2864] docs: Update Chinese translation (#3559)

---
 docs/locale/zh_CN/LC_MESSAGES/faq.po      |  95 +++---
 docs/locale/zh_CN/LC_MESSAGES/settings.po | 371 ++++++++++++----------
 docs/locale/zh_CN/LC_MESSAGES/sphinx.po   |  26 +-
 docs/locale/zh_CN/LC_MESSAGES/tips.po     | 146 +++++----
 4 files changed, 354 insertions(+), 284 deletions(-)

diff --git a/docs/locale/zh_CN/LC_MESSAGES/faq.po b/docs/locale/zh_CN/LC_MESSAGES/faq.po
index f63513ea..f0738365 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/faq.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/faq.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-07 16:25+0800\n"
-"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"POT-Creation-Date: 2026-02-02 10:32+0800\n"
+"PO-Revision-Date: 2026-02-02 10:32+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
 "Language-Team: \n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.16.0\n"
+"Generated-By: Babel 2.17.0\n"
 
 #: ../../faq.rst:2 84467b3ab4b8411589855b3130e14406
 msgid "Frequently Asked Questions (FAQ)"
@@ -143,8 +143,9 @@ msgid ""
 " or add new templates, via the ``THEME_TEMPLATES_OVERRIDES`` variable. "
 "For example, to override the page template, you can define the location "
 "for your templates like this::"
-msgstr "当然可以，覆盖部分模板文件或是添加一些模板文件都是可以的，使用 ``THEME_TEMPLATES_OVERRIDES`` 变量即可。"
-"例如，若需要覆盖page的模板，可以向这样定义你自己的模板文件位置："
+msgstr ""
+"当然可以，覆盖部分模板文件或是添加一些模板文件都是可以的，使用 ``THEME_TEMPLATES_OVERRIDES`` "
+"变量即可。例如，若需要覆盖page的模板，可以向这样定义你自己的模板文件位置："
 
 #: ../../faq.rst:77 a96870f0cad74996bec2469ea0c2e9e1
 msgid ""
@@ -198,51 +199,59 @@ msgid ""
 "(e.g., ``base.html``), the ``if`` statement should instead be::"
 msgstr "如果您想在其他模板（例如 ``base.html`` ）中获取此元数据，则 ``if`` 语句应改为："
 
-#: ../../faq.rst:116 b78a678a165d40f4823fac2b19bcafc1
+#: ../../faq.rst:117 22fb499d05e041c4bea55515c5428685
+msgid ""
+"Because the colon symbol (``:``) is used as a separator, be aware that "
+"metadata field names *containing* a colon will probably not work."
+msgstr "因为冒号 (``:``) 已经用作分隔符，字段名称包含冒号的元数据可能不会起作用。"
+
+#: ../../faq.rst:121 b78a678a165d40f4823fac2b19bcafc1
 msgid ""
 "How do I make my output folder structure identical to my content "
 "hierarchy?"
 msgstr "如何使得输出目录的结构和content目录的结构保持一致？"
 
-#: ../../faq.rst:118 851d1019c070482991667cc024063d29
+#: ../../faq.rst:123 851d1019c070482991667cc024063d29
 msgid "Try these settings::"
 msgstr "可以尝试如下配置："
 
-#: ../../faq.rst:125 5195876e3f364a838d72b16c568263bc
+#: ../../faq.rst:130 5195876e3f364a838d72b16c568263bc
 msgid "How do I assign custom templates on a per-page basis?"
 msgstr "如何为某个页面指定某个模板？"
 
-#: ../../faq.rst:127 2ddd3cf1fbf048b1819bcfc9b3691a12
+#: ../../faq.rst:132 2ddd3cf1fbf048b1819bcfc9b3691a12
 msgid ""
 "It's as simple as adding an extra line of metadata to any page or article"
 " that you want to have its own template. For example, this is how it "
 "would be handled for content in reST format::"
 msgstr "这非常简单，在任何页面或者文章中，都可以通过多添加一行元数据来指定特定模板。例如，在reST中，使用："
 
-#: ../../faq.rst:133 6f5eb40b4a5e4f83ab9d1cb48fefad57
+#: ../../faq.rst:138 6f5eb40b4a5e4f83ab9d1cb48fefad57
 msgid "For content in Markdown format::"
 msgstr "对于Markdown，则使用："
 
-#: ../../faq.rst:137 2e28d1bf074c437eb5017bf6f345bf71
+#: ../../faq.rst:142 2e28d1bf074c437eb5017bf6f345bf71
 msgid ""
 "Then just make sure your theme contains the relevant template file (e.g. "
 "``template_name.html``). If you just want to add a new custom template to"
 " an existing theme, you can also provide it in a directory specified by "
 "``THEME_TEMPLATES_OVERRIDES`` (see :ref:`settings/themes`)."
 msgstr ""
+"接着只要确保主题中有相对应的模板文件 (e.g. ``template_name.html``)。如果只是需要把一个自定义"
+"模板加到已有主题中，可以将其放在 ``THEME_TEMPLATES_OVERRIDES`` 指定的目录中 （详见 :ref:`settings/themes`）。"
 
-#: ../../faq.rst:142 675e77f99f3c42bb8715c84a97c7a064
+#: ../../faq.rst:147 675e77f99f3c42bb8715c84a97c7a064
 msgid "How can I override the generated URL of a specific page or article?"
 msgstr "如何重写某一个页面或文章生成的URL？"
 
-#: ../../faq.rst:144 7e518b99b29d4787addc732d57e94ed1
+#: ../../faq.rst:149 7e518b99b29d4787addc732d57e94ed1
 msgid ""
 "Include ``url`` and ``save_as`` metadata in any pages or articles that "
 "you want to override the generated URL. Here is an example page in reST "
 "format::"
 msgstr "在任意页面或文章中都可以添加 ``url`` 和 ``save_as`` 元数据，这样就可以重写URL了。下面以reST格式为例："
 
-#: ../../faq.rst:153 903306ecaed3483591b4ed2dcba3d183
+#: ../../faq.rst:158 903306ecaed3483591b4ed2dcba3d183
 msgid ""
 "With this metadata, the page will be written to "
 "``override/url/index.html`` and Pelican will use the URL "
@@ -251,18 +260,18 @@ msgstr ""
 "有了这样的元数据，此页面会保存为 ``override/url/index.html`` ，Pelican会将 ``override/url/``"
 " 作为链接到此页面的URL。"
 
-#: ../../faq.rst:157 d80d84fcb6844e25a8452e29c4113181
+#: ../../faq.rst:162 d80d84fcb6844e25a8452e29c4113181
 msgid "How can I use a static page as my home page?"
 msgstr "如何使用一个静态页面作为主页？"
 
-#: ../../faq.rst:159 e17a2e2dd9014109888bab9286ee607c
+#: ../../faq.rst:164 e17a2e2dd9014109888bab9286ee607c
 msgid ""
 "The override feature mentioned above can be used to specify a static page"
 " as your home page. The following Markdown example could be stored in "
 "``content/pages/home.md``::"
 msgstr "上一个问题中提到的特性可以用于实现此需求。下面例子中的Markdown文件保存为 ``content/pages/home.md`` ："
 
-#: ../../faq.rst:169 b99ba0ca8656416cbdc38f3fa263b7eb
+#: ../../faq.rst:174 b99ba0ca8656416cbdc38f3fa263b7eb
 msgid ""
 "If the original blog index is still wanted, it can then be saved in a "
 "different location by setting ``INDEX_SAVE_AS = 'blog_index.html'`` for "
@@ -271,11 +280,11 @@ msgstr ""
 "如果仍需要原来的博客主页（即 ``'index'`` 直接模板），可以通过设置 ``INDEX_SAVE_AS = "
 "'blog_index.html'`` 将其存储在其他位置。"
 
-#: ../../faq.rst:174 fca4725a57dd451fb3b0fb9df78f69b5
+#: ../../faq.rst:179 fca4725a57dd451fb3b0fb9df78f69b5
 msgid "What if I want to disable feed generation?"
 msgstr "可以禁用订阅源生成吗？"
 
-#: ../../faq.rst:176 e9c08140e2ed44f189a7a156db027a3e
+#: ../../faq.rst:181 e9c08140e2ed44f189a7a156db027a3e
 msgid ""
 "To disable feed generation, all feed settings should be set to ``None``. "
 "All but three feed settings already default to ``None``, so if you want "
@@ -285,19 +294,19 @@ msgstr ""
 "要禁用订阅源，所有订阅源相关的配置都应被设为 ``None`` 。其中有三项设置默认为 ``None`` "
 "，因此如果要彻底不生成订阅源，你只需要指定下面这些设置："
 
-#: ../../faq.rst:186 7820a481af4c4f44a40fb3ae80768a1d
+#: ../../faq.rst:191 7820a481af4c4f44a40fb3ae80768a1d
 msgid ""
 "The word ``None`` should not be surrounded by quotes. Please note that "
 "``None`` and ``''`` are not the same thing."
 msgstr "``None`` 两侧不需要加引号。请注意 ``None`` 和 ``''`` 不是同一个东西。"
 
-#: ../../faq.rst:190 4fa2ffbf1c274ec396a0d756762c260d
+#: ../../faq.rst:195 4fa2ffbf1c274ec396a0d756762c260d
 msgid ""
 "I'm getting a warning about feeds generated without SITEURL being set "
 "properly"
 msgstr "Pelican警告说由于SITEURL设置不正确，无法正常生成订阅源"
 
-#: ../../faq.rst:192 8d52f14f6b03476897dfb15c188a961a
+#: ../../faq.rst:197 8d52f14f6b03476897dfb15c188a961a
 msgid ""
 "`RSS and Atom feeds require all URL links to be absolute "
 "<https://validator.w3.org/feed/docs/rss2.html#comments>`_. In order to "
@@ -308,17 +317,17 @@ msgstr ""
 "<https://validator.w3.org/feed/docs/rss2.html#comments>`_ "
 "。为了使得Pelican能正确生成链接，你需要将站点的 ``SITEURL`` 设置为完整路径。"
 
-#: ../../faq.rst:197 1412ceb735d44a30b58db3241248e7ec
+#: ../../faq.rst:202 1412ceb735d44a30b58db3241248e7ec
 msgid ""
 "Feeds are still generated when this warning is displayed, but links "
 "within may be malformed and thus the feed may not validate."
 msgstr "虽然Pelican提出了警告，但是仍会生成订阅源，但其中的链接可能是无效的，这会导致订阅源不可用。"
 
-#: ../../faq.rst:201 20cadccc527e4ebda08eac9ed34f5055
+#: ../../faq.rst:206 20cadccc527e4ebda08eac9ed34f5055
 msgid "Can I force Atom feeds to show only summaries instead of article content?"
 msgstr "可以让Atom订阅源只显示摘要，不显示文章内容吗？"
 
-#: ../../faq.rst:203 9c45ba2ec5c6402e86e89661b943d1ad
+#: ../../faq.rst:208 9c45ba2ec5c6402e86e89661b943d1ad
 msgid ""
 "Instead of having to open a separate browser window to read articles, the"
 " overwhelming majority of folks who use feed readers prefer to read "
@@ -335,11 +344,11 @@ msgstr ""
 " ``content`` "
 "字段，因此Pelican在发布RSS时默认只包含摘要（当然也可以设置为包含文章内容）。Pelican在订阅源生成上的如此行为就可以让用户自行选择订阅类型：包含了完整内容的Atom或是只包含摘要的RSS。"
 
-#: ../../faq.rst:214 bf0d4ca837f74d9ab6618db6306c6a70
+#: ../../faq.rst:219 bf0d4ca837f74d9ab6618db6306c6a70
 msgid "Is Pelican only suitable for blogs?"
 msgstr "Pelican只适合用于博客吗？"
 
-#: ../../faq.rst:216 49697f375cfc49b08f5d0c2297d15028
+#: ../../faq.rst:221 49697f375cfc49b08f5d0c2297d15028
 msgid ""
 "No. Pelican can be easily configured to create and maintain any type of "
 "static site. This may require a little customization of your theme and "
@@ -349,13 +358,13 @@ msgid ""
 "tag-related pages via::"
 msgstr "不是的。Pelican可以方便地用于创建维护任何静态站点，为此你需要对主题和配置做一些定制。例如，如果要为你的产品构建一个宣传网站，即不需要使用标签特性，从主题中移除与标签相关的HTML代码即可。另外，还可以通过下面的设置来禁用标签相关页面的生成："
 
-#: ../../faq.rst:226 0a59dd7209554237912579b362d07788
+#: ../../faq.rst:231 0a59dd7209554237912579b362d07788
 msgid ""
 "Why does Pelican always write all HTML files even with content caching "
 "enabled?"
 msgstr "启用内容缓存后，为什么Pelican仍会每次都写入所有HTML文件？"
 
-#: ../../faq.rst:228 6291b82d02fc4450a79d1200b5d04f62
+#: ../../faq.rst:233 6291b82d02fc4450a79d1200b5d04f62
 msgid ""
 "In order to reliably determine whether the HTML output is different "
 "before writing it, a large part of the generation environment including "
@@ -368,7 +377,7 @@ msgid ""
 "reliable."
 msgstr "为了确定HTML输出确实和之前的不同，模板上下文、插件等很多生成环境都需要保存并比较某种哈希值（对于不可哈希的内容类型还需要进行一些额外处理）。另外，由于插件、分页等内容的存在，输出的HTML很可能会与之前不同。因此，考虑到处理时间和存储空间，每次都重新写入全部HTML会更快更可靠。"
 
-#: ../../faq.rst:237 5cc5e1361f914c92b0670030f0c83f5d
+#: ../../faq.rst:242 5cc5e1361f914c92b0670030f0c83f5d
 msgid ""
 "However, this means that the modification time of the files changes every"
 " time, so a ``rsync`` based upload will transfer them even if their "
@@ -380,11 +389,11 @@ msgstr ""
 "上传时会把没有变化的内容也进行上传。一个简便的解决方法就是给 ``rsync`` 加上 ``--checksum`` "
 "选项，这会比Pelican在生成时进行校验更快。"
 
-#: ../../faq.rst:244 b24c40be89b94f3b980cbbda38d46115
+#: ../../faq.rst:249 b24c40be89b94f3b980cbbda38d46115
 msgid "How to process only a subset of all articles?"
 msgstr "如何只处理一部分文章？"
 
-#: ../../faq.rst:246 fa34a90481f44ace83ee16401543ce09
+#: ../../faq.rst:251 fa34a90481f44ace83ee16401543ce09
 msgid ""
 "It is often useful to process only e.g. 10 articles for debugging "
 "purposes. This can be achieved by explicitly specifying only the "
@@ -395,11 +404,11 @@ msgstr ""
 "简便起见，在调试时可能只需要处理几篇文章。可以直接在配置项 ``ARTICLE_PATHS`` 中添加需要处理文章的文件名。可以通过像 ``cd "
 "content; find -name '*.md' | head -n 10`` 这样的命令获取文章文件名的列表。"
 
-#: ../../faq.rst:252 0fa566e3aa084cb9b04e0cee32684222
+#: ../../faq.rst:257 0fa566e3aa084cb9b04e0cee32684222
 msgid "My tag cloud is missing/broken since I upgraded Pelican"
 msgstr "在升级Pelican后，标签云消失或不可用了"
 
-#: ../../faq.rst:254 0bd1304a12c24f048b227c68391b148c
+#: ../../faq.rst:259 0bd1304a12c24f048b227c68391b148c
 msgid ""
 "In an ongoing effort to streamline Pelican, tag cloud generation has been"
 " moved out of Pelican core and into a separate `plugin "
@@ -410,11 +419,11 @@ msgstr ""
 "<https://github.com/pelican-plugins/tag-cloud>`_ 中。查看 :ref:`plugins` "
 "文档获取更多关于Pelican插件系统的信息。"
 
-#: ../../faq.rst:260 1833dfba94c74f4bb9e9f0a112ed3e0f
+#: ../../faq.rst:265 1833dfba94c74f4bb9e9f0a112ed3e0f
 msgid "Since I upgraded Pelican my pages are no longer rendered"
 msgstr "升级Pelican后，一些页面没有被渲染"
 
-#: ../../faq.rst:262 576e5c2338ba4c43a51bb562301ad0c2
+#: ../../faq.rst:267 576e5c2338ba4c43a51bb562301ad0c2
 msgid ""
 "Pages were available to themes as lowercase ``pages`` and uppercase "
 "``PAGES``. To bring this inline with the :ref:`templates-variables` "
@@ -426,15 +435,15 @@ msgstr ""
 "variables` 一节中的内容保持一致，大写的 ``PAGES`` 被删除了。只要将主题中的 ``PAGES`` 替换为 ``pages`` "
 "，问题即可解决。例如将原先的："
 
-#: ../../faq.rst:269 355512b9f6b34ece9b6baed128b2ca4d
+#: ../../faq.rst:274 355512b9f6b34ece9b6baed128b2ca4d
 msgid "with something like::"
 msgstr "替换为："
 
-#: ../../faq.rst:274 99ef769943fe41c4a37ca951e905b2ba
+#: ../../faq.rst:279 99ef769943fe41c4a37ca951e905b2ba
 msgid "How can I stop Pelican from trying to parse my static files as content?"
-msgstr "如何避免让Pelican将我的静态文件解析为内容文件？（译者注：例如要将一个HTML文件作为静态文件）？"
+msgstr "如何避免让Pelican将我的静态文件解析为内容文件？（译者注：例如要将一个HTML文件作为静态文件）"
 
-#: ../../faq.rst:276 4efb20c5b82d41afb07151599fa189dd
+#: ../../faq.rst:281 4efb20c5b82d41afb07151599fa189dd
 msgid ""
 "Pelican's article and page generators run before it's static generator. "
 "That means if you use a setup similar to the default configuration, where"
@@ -447,7 +456,7 @@ msgstr ""
 "配置项中，所有以有效内容文件后缀结尾的文件（ ``.html`` 、 ``.rst`` 、 ``.md`` "
 "等）都会被视为文章或者页面，而不是静态文件。"
 
-#: ../../faq.rst:282 d959eb6a67fe440caa70105e1692bf93
+#: ../../faq.rst:287 d959eb6a67fe440caa70105e1692bf93
 msgid ""
 "To circumvent this issue either use the appropriate ``*_EXCLUDES`` "
 "setting or disable the offending reader via ``READERS`` if you don't need"
@@ -456,11 +465,11 @@ msgstr ""
 "为了避免这个问题，使用合适的 ``*_EXCLUDES`` 配置，在必要时还可以通过 ``READERS`` "
 "配置项来直接禁用产生问题的reader。"
 
-#: ../../faq.rst:286 5e64dc4b6fad4e7ea07278f5a2529e89
+#: ../../faq.rst:291 5e64dc4b6fad4e7ea07278f5a2529e89
 msgid "Why is [arbitrary Markdown syntax] not supported?"
 msgstr "为什么不是所有的Markdown语法都支持？"
 
-#: ../../faq.rst:288 6872a70ec1434c41a78d465271761c69
+#: ../../faq.rst:293 6872a70ec1434c41a78d465271761c69
 msgid ""
 "Pelican does not directly handle Markdown processing and instead "
 "delegates that task to the Python-Markdown_ project, the core of which "
diff --git a/docs/locale/zh_CN/LC_MESSAGES/settings.po b/docs/locale/zh_CN/LC_MESSAGES/settings.po
index ef07e611..ef52fc73 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/settings.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-07-13 11:46+0800\n"
-"PO-Revision-Date: 2024-06-26 19:00+0800\n"
+"POT-Creation-Date: 2026-02-02 10:32+0800\n"
+"PO-Revision-Date: 2026-02-02 10:32+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
 "Language-Team: \n"
@@ -138,8 +138,9 @@ msgid ""
 "Extra configuration settings for the docutils publisher (applicable only "
 "to reStructuredText). See `Docutils Configuration`_ settings for more "
 "details. The default is ``{}`` with no extra configuration settings."
-msgstr "docutils的额外配置项（只针对reStructuredText有效）。在 `Docutils 配置`_ 设置中查看更多信息。"
-"默认为 ``{}`` ，即不做任何额外配置。"
+msgstr ""
+"docutils的额外配置项（只针对reStructuredText有效）。在 `Docutils 配置`_ 设置中查看更多信息。默认为 "
+"``{}`` ，即不做任何额外配置。"
 
 #: ../../settings.rst:86 841018ef5c0c410c92bc7780acf25291
 msgid ""
@@ -176,8 +177,9 @@ msgid ""
 " also includes a list of extensions you may want to include. See `Jinja "
 "Environment documentation`_. The default is ``{'extensions': [], "
 "'trim_blocks': True, 'lstrip_blocks': True}``."
-msgstr "一个字典，用于配置自定义Jinja2环境变量。这其中也包含了要使用的扩展列表。详见 `Jinja环境文档`_ 。"
-"本项设置默认为 ``{'extensions': [], 'trim_blocks': True, 'lstrip_blocks': True}`` 。"
+msgstr ""
+"一个字典，用于配置自定义Jinja2环境变量。这其中也包含了要使用的扩展列表。详见 `Jinja环境文档`_ 。本项设置默认为 "
+"``{'extensions': [], 'trim_blocks': True, 'lstrip_blocks': True}`` 。"
 
 #: ../../settings.rst:111 b0e2be83c4684482a75198372a093d96
 msgid ""
@@ -207,8 +209,9 @@ msgid ""
 "A dictionary of custom Jinja2 tests you want to use. The dictionary "
 "should map test names to test functions. See: `Jinja custom tests "
 "documentation`_. The default is ``{}``."
-msgstr "一个字典，自定义了要使用的Jinja测试。字典中应该是测试名到测试函数的映射。详见： `Jinja自定义测试文档`_ 。"
-"本项设置默认为 ``{}`` 。"
+msgstr ""
+"一个字典，自定义了要使用的Jinja测试。字典中应该是测试名到测试函数的映射。详见： `Jinja自定义测试文档`_ 。本项设置默认为 "
+"``{}`` 。"
 
 #: ../../settings.rst:139 06c6769420a744ea9fc27fc3e930bfcb
 msgid ""
@@ -245,8 +248,9 @@ msgid ""
 "directories, and ``['__pycache__']`` would ignore Python 3's bytecode "
 "caches."
 msgstr ""
-"通配符模式的列表。匹配到其中任一个模式，或是 ``watchfiles.DefaultFilter`` 中设置了隐藏的文件和目录都会被忽略。"
-"例如，默认的 ``['**/.*']`` 可以用于忽略任何隐藏文件与目录， ``['__pycache__']`` 则可以忽略Python3的字节码缓存文件。"
+"通配符模式的列表。匹配到其中任一个模式，或是 ``watchfiles.DefaultFilter`` "
+"中设置了隐藏的文件和目录都会被忽略。例如，默认的 ``['**/.*']`` 可以用于忽略任何隐藏文件与目录， "
+"``['__pycache__']`` 则可以忽略Python3的字节码缓存文件。"
 
 #: ../../settings.rst:171 6d3691b43e9741bd97f11cf56ddd89ff
 msgid ""
@@ -336,7 +340,9 @@ msgid ""
 "Controls the extension that will be used by the SourcesGenerator.  "
 "Defaults to ``.text``. If not a valid string the default value will be "
 "used. The default is ``'.text'``."
-msgstr "控制SourcesGenerator使用的扩展名。默认为 ``.text`` 。如果设置的值是无效的，会使用默认值。本项配置默认为 ``'.text'`` 。"
+msgstr ""
+"控制SourcesGenerator使用的扩展名。默认为 ``.text`` 。如果设置的值是无效的，会使用默认值。本项配置默认为 "
+"``'.text'`` 。"
 
 #: ../../settings.rst:246 5763cdeffac14fb4a4403b534251e8e2
 msgid "The list of plugins to load. See :ref:`plugins`. The default is ``None``."
@@ -378,8 +384,10 @@ msgid ""
 "and in ``PAGE_PATHS`` or ``ARTICLE_PATHS``.  Pelican's default settings "
 "include the \"images\" directory here. The default is ``['images']``."
 msgstr ""
-"用于查找静态文件的目录列表（相对于 ``PATH`` 目录）。静态文件会原封不动地拷贝到输出目录中。文章、页面以及其他的内容源文件都会被跳过，因此一个目录可以安全地同时出现在此选项以及"
-" ``PAGE_PATHS`` 或 ``ARTICLE_PATHS`` 中。Pelican默认会将 \"images\" 目录包含在此选项中。本项配置默认为 ``['images']`` 。"
+"用于查找静态文件的目录列表（相对于 ``PATH`` "
+"目录）。静态文件会原封不动地拷贝到输出目录中。文章、页面以及其他的内容源文件都会被跳过，因此一个目录可以安全地同时出现在此选项以及 "
+"``PAGE_PATHS`` 或 ``ARTICLE_PATHS`` 中。Pelican默认会将 \"images\" "
+"目录包含在此选项中。本项配置默认为 ``['images']`` 。"
 
 #: ../../settings.rst:279 562736e3c91442bbb062e85e63d6f1f9
 msgid ""
@@ -400,9 +408,10 @@ msgstr ""
 "如果此选项设为False， ``STATIC_PATHS`` "
 "中的内容源文件将不会被忽略，也会像静态文件一样被原封不动地拷贝。此项设置是为了给3.5版本前的Pelican进行向后兼容的。若某个目录同时出现在了"
 " ``STATIC_PATHS`` 和 ``ARTICLE_PATHS`` 中，或 ``STATIC_PATHS`` 和 "
-"``PAGE_PATHS`` 中时才会生效。如果你是想将站点的源文件发布出去的话，请考虑使用 ``OUTPUT_SOURCES`` 。本项配置默认为 ``True`` 。"
+"``PAGE_PATHS`` 中时才会生效。如果你是想将站点的源文件发布出去的话，请考虑使用 ``OUTPUT_SOURCES`` "
+"。本项配置默认为 ``True`` 。"
 
-#: ../../settings.rst:294 a4a2ef0dfd6442fb889bf9bfe33688
+#: ../../settings.rst:294 a4a2ef0dfd6442fb889bf9bfe33688ee
 msgid ""
 "Create links instead of copying files. If the content and output "
 "directories are on the same device, then create hard links.  Falls back "
@@ -431,7 +440,8 @@ msgid ""
 "via: ``python -m pip install typogrify``. The default is ``False``."
 msgstr ""
 "若此项设置为True，一些显示上的改进将通过 `Typogrify <https://pypi.org/project/typogrify/>`_"
-" 库合并到生成的HTML中。可以通过 ``python -m pip install typogrify`` 进行安装。本项配置默认为 ``False`` 。"
+" 库合并到生成的HTML中。可以通过 ``python -m pip install typogrify`` 进行安装。本项配置默认为 "
+"``False`` 。"
 
 #: ../../settings.rst:315 f4a976dc583346eebd71cedbbd43839c
 msgid ""
@@ -449,9 +459,10 @@ msgid ""
 "default, no filter is omitted (in other words, all filters get applied). "
 "This setting requires that Typogrify version 2.1.0 or later is installed."
 " The default is ``[]``."
-msgstr "要忽略的Typogrify过滤器列表。可用值包括： ``'amp'`` 、 ``'smartypants'`` 、 ``'caps'`` 、 "
-"``'initial_quotes'`` 、 ``'widont'`` 。默认不忽略任何过滤器。本项配置需要2.1.0或以上版本的Typogrify。"
-"本项配置默认为 ``[]`` 。"
+msgstr ""
+"要忽略的Typogrify过滤器列表。可用值包括： ``'amp'`` 、 ``'smartypants'`` 、 ``'caps'`` 、 "
+"``'initial_quotes'`` 、 ``'widont'`` "
+"。默认不忽略任何过滤器。本项配置需要2.1.0或以上版本的Typogrify。本项配置默认为 ``[]`` 。"
 
 #: ../../settings.rst:329 8b9d3479e18c407090a4aac6a1dcafdf
 msgid ""
@@ -467,7 +478,8 @@ msgstr ""
 "此设置用于设置Typogrify的Smartypants过滤器，控制过滤器如何解析多个破折号/连字符/减号。单个ASCII破折号字符 "
 "(``-``) 始终被视为连字符。设为 ``default`` 时不处理短破折号，并会将双连字符转换为长破折号；设为 ``oldschool`` "
 "时会将两个 ( ``--`` ) 和三个 ( ``--`` ) 连字符分别呈现为短破折号和长破折号；设为 "
-"``oldschool_inverted`` 时则会将两个连字符转换为长破折号，而将三个连字符转换为短破折号。本项配置默认为 ``'default'`` "
+"``oldschool_inverted`` 时则会将两个连字符转换为长破折号，而将三个连字符转换为短破折号。本项配置默认为 "
+"``'default'`` "
 
 #: ../../settings.rst:340 44489695c0bb4c75ba04e6d23b17a6b7
 msgid ""
@@ -508,7 +520,6 @@ msgstr ""
 ":ref:`reading_only_modified_content` 。本项配置默认为 ``True`` 。"
 
 #: ../../settings.rst:367 c29c4ca7127741d49a164b7dff038232
-#, python-brace-format
 msgid ""
 "Regular expression that is used to parse internal links. Default syntax "
 "when linking to internal files, tags, etc., is to enclose the identifier,"
@@ -527,24 +538,26 @@ msgid ""
 "blocks. See :ref:`internal_pygments_options` for a list of supported "
 "options. The default is ``{}``."
 msgstr ""
-"reStructuredText代码块的默认Pygments设置列表。请参阅 "
-":ref:`internal_pygments_options` 查看支持选项列表。本项配置默认为 ``{}`` 。"
+"reStructuredText代码块的默认Pygments设置列表。请参阅 :ref:`internal_pygments_options` "
+"查看支持选项列表。本项配置默认为 ``{}`` 。"
 
 #: ../../settings.rst:382 aa2425b88dea4351bf184f127a5965de
 msgid ""
 "If ``True``, saves content in caches.  See "
 ":ref:`reading_only_modified_content` for details about caching. The "
 "default is ``False``."
-msgstr "若设为 ``True`` ，会将内容保存在缓存中。有关缓存请参阅 :ref:`reading_only_modified_content` 。"
-"本项配置默认为 ``False`` 。"
+msgstr ""
+"若设为 ``True`` ，会将内容保存在缓存中。有关缓存请参阅 :ref:`reading_only_modified_content` "
+"。本项配置默认为 ``False`` 。"
 
 #: ../../settings.rst:388 fe1ca91d569e4c2584b0dd3907761f40
 msgid ""
 "If set to ``'reader'``, save only the raw content and metadata returned "
 "by readers. If set to ``'generator'``, save processed content objects. "
 "The default is ``'reader'``."
-msgstr "若设为 ``reader`` ，则只保存reader返回的原始内容和元数据。若设为 ``generator`` ，则保存处理过的内容对象。"
-"本项配置默认为 ``'reader'`` 。"
+msgstr ""
+"若设为 ``reader`` ，则只保存reader返回的原始内容和元数据。若设为 ``generator`` "
+"，则保存处理过的内容对象。本项配置默认为 ``'reader'`` 。"
 
 #: ../../settings.rst:394 9fc3e0a091d0493cb1172bb1c3bde79d
 msgid "Directory in which to store cache files. The default is ``'cache'``."
@@ -560,12 +573,12 @@ msgstr "若设为 ``True`` ，则使用gzip对缓存文件进行解压缩。本
 msgid "Controls how files are checked for modifications."
 msgstr "调整判定文件是否修改的方式"
 
-#: ../../settings.rst:405 ../../settings.rst:1448
+#: ../../settings.rst:405 ../../settings.rst:1445
 #: 18648953d9c040c8bd0b98d212509bbf
 msgid "If set to ``'mtime'``, the modification time of the file is checked."
 msgstr "若设为 ``mtime`` ，则检查文件的修改时间。"
 
-#: ../../settings.rst:407 ../../settings.rst:1450
+#: ../../settings.rst:407 ../../settings.rst:1447
 #: e5596360b86d44ef81b01bb259b4b189
 msgid ""
 "If set to a name of a function provided by the ``hashlib`` module, e.g. "
@@ -779,8 +792,9 @@ msgid ""
 "The location we will save the page. This value has to be the same as "
 "PAGE_URL or you need to use a rewrite in your server config. The default "
 "is ``'pages/{slug}.html'``."
-msgstr "页面的保存位置。除非在服务器上设置了重写规则，否则此项设置必须和PAGE_URL一致。"
-"本项配置默认为 ``'pages/{slug}.html'`` 。"
+msgstr ""
+"页面的保存位置。除非在服务器上设置了重写规则，否则此项设置必须和PAGE_URL一致。本项配置默认为 "
+"``'pages/{slug}.html'`` 。"
 
 #: ../../settings.rst:550 6596ed1c997349bf94a503bdaa8b9e68
 #, python-brace-format
@@ -985,8 +999,9 @@ msgid ""
 " be set to ``title`` to use the \"Title:\" metadata tag or ``basename`` "
 "to use the article's file name when creating the slug. The default is "
 "``'title'``."
-msgstr "自动生成slug所依赖的内容。可以指定为元数据标签 ``title`` ，也可以使用文章源文件的文件名 ``basename`` 。"
-"本项配置默认为 ``'title'`` 。"
+msgstr ""
+"自动生成slug所依赖的内容。可以指定为元数据标签 ``title`` ，也可以使用文章源文件的文件名 ``basename`` 。本项配置默认为"
+" ``'title'`` 。"
 
 #: ../../settings.rst:698 161c36590f2b40a3a4d9dab57848fba7
 msgid ""
@@ -1001,8 +1016,9 @@ msgstr ""
 msgid ""
 "Preserve uppercase characters in slugs. Set ``True`` to keep uppercase "
 "characters from ``SLUGIFY_SOURCE`` as-is. The default is ``False``."
-msgstr "指定是否保留slug中的大写字母。若设为 ``True`` ，则会原样保留 ``SLUGIFY_SOURCE`` 中的大写字母。"
-"本项配置默认为 ``False`` 。"
+msgstr ""
+"指定是否保留slug中的大写字母。若设为 ``True`` ，则会原样保留 ``SLUGIFY_SOURCE`` 中的大写字母。本项配置默认为 "
+"``False`` 。"
 
 #: ../../settings.rst:709 ea3e23a38ffe465e8fef398b69940b87
 msgid ""
@@ -1016,8 +1032,7 @@ msgid ""
 "default is::"
 msgstr ""
 "指定生成文章和页面slug时要进行的正则表达式替换。指定的是一对对 ``(from, to)`` "
-"（from为要替换的内容，to为替换进去的内容），列表中的各对替换规则是按序执行且忽略大小写的。默认的替换会删除非字母非数字的字符并将内部空格替换为连字符。除此之外，slug会将所有字符转换为小写ASCII字符，并删除所有前导和末尾空格。这有利于现有URL的向后兼容。"
-"本项配置默认如下："
+"（from为要替换的内容，to为替换进去的内容），列表中的各对替换规则是按序执行且忽略大小写的。默认的替换会删除非字母非数字的字符并将内部空格替换为连字符。除此之外，slug会将所有字符转换为小写ASCII字符，并删除所有前导和末尾空格。这有利于现有URL的向后兼容。本项配置默认如下："
 
 #: ../../settings.rst:726 4ed665fd61124d7199e5d3a336a6490e
 msgid ""
@@ -1282,75 +1297,75 @@ msgstr ""
 msgid ""
 "The domain prepended to feed URLs. Since feed URLs should always be "
 "absolute, it is highly recommended to define this (e.g., "
-"\"https://feeds.example.com\"). If you have already explicitly defined "
-"SITEURL (see above) and want to use the same domain for your feeds, you "
-"can just set:  ``FEED_DOMAIN = SITEURL``. The default is ``None``, which "
-"uses the base URL \"/\"."
+"\"https://feeds.example.com\"). The default is ``SITEURL``."
 msgstr ""
 "指定要附加到订阅源URL前面的域名。因为订阅源URL应该是绝对的，所以强烈推荐定义此设置项（例如 "
-"https://feeds.example.com ）。若SITEURL已经显式地定义了，并且希望使用相同地URL，就可以直接设置 "
-"``FEED_DOMAIN = SITEURL`` 。本项配置默认为 ``None`` ，即使用基础URL \"/\" 。"
+"https://feeds.example.com ）。本项配置默认为 ``SITEURL`` 。"
 
-#: ../../settings.rst:979 7a7143a49149452d999c2084cc0266e6
+#: ../../settings.rst:976 7a7143a49149452d999c2084cc0266e6
 msgid ""
 "The location to save the Atom feed. The default is ``None``, for no Atom "
 "feed."
 msgstr "指定Atom订阅源的存储位置。本项配置默认为 ``None`` ，即不使用Atom订阅源。"
 
-#: ../../settings.rst:984 2fd2426a582247f8a375940ecbd0f96a
+#: ../../settings.rst:981 2fd2426a582247f8a375940ecbd0f96a
 msgid ""
 "Relative URL of the Atom feed. If not set, ``FEED_ATOM`` is used both for"
 " save location and URL. The default is ``None``."
-msgstr "Atom订阅源的相对URL。如果未设置此项，会将 ``FEED_ATOM`` 同时用于存储位置和URL。"
-"本项配置默认为 ``None`` 。"
+msgstr "Atom订阅源的相对URL。如果未设置此项，会将 ``FEED_ATOM`` 同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:989 c4758a4ce8f94850ba4567250259741d
+#: ../../settings.rst:986 c4758a4ce8f94850ba4567250259741d
 msgid ""
 "The location to save the RSS feed. The default is ``None``, for no RSS "
 "feed."
 msgstr "RSS订阅源的存储位置。本项配置默认为 ``None`` ，即不使用RSS订阅源。"
 
-#: ../../settings.rst:993 737caf1d58854aa3b86820243fc80403
+#: ../../settings.rst:990 737caf1d58854aa3b86820243fc80403
 msgid ""
 "Relative URL of the RSS feed. If not set, ``FEED_RSS`` is used both for "
 "save location and URL. The default is ``None``."
 msgstr "RSS订阅源的相对URL。如果未设置此项，会将 ``FEED_RSS`` 同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:998 28942938054b490c8dd5ca8367d87ea9
+#: ../../settings.rst:995 28942938054b490c8dd5ca8367d87ea9
 msgid ""
 "The location to save the all-posts Atom feed: this feed will contain all "
 "posts regardless of their language. The default is "
 "``'feeds/all.atom.xml'``."
 msgstr "存储all-posts Atom订阅源的文件位置：其中会包含所有语言的帖子。本项配置默认为 ``'feeds/all.atom.xml'`` 。"
 
-#: ../../settings.rst:1003 f4e7fbd9297743ccaadafa11c7cfb1e1
+#: ../../settings.rst:1000 f4e7fbd9297743ccaadafa11c7cfb1e1
 msgid ""
 "Relative URL of the all-posts Atom feed. If not set, ``FEED_ALL_ATOM`` is"
 " used both for save location and URL. The default is ``None``."
-msgstr "all-posts Atom订阅源的相对URL。如果未设置此项，会将 ``FEED_ALL_ATOM`` 同时用于存储位置和URL。"
-"本项配置默认为 ``None`` 。"
+msgstr ""
+"all-posts Atom订阅源的相对URL。如果未设置此项，会将 ``FEED_ALL_ATOM`` 同时用于存储位置和URL。本项配置默认为"
+" ``None`` 。"
 
-#: ../../settings.rst:1008 eaacfd07bdb94dd2a9c6792a1f036807
+#: ../../settings.rst:1005 eaacfd07bdb94dd2a9c6792a1f036807
 msgid ""
 "The location to save the the all-posts RSS feed: this feed will contain "
 "all posts regardless of their language. The default is ``None``, for no "
 "all-posts RSS feed."
-msgstr "存储all-posts RSS订阅源的文件位置：其中会包含所有语言的帖子。本项配置默认为 ``None`` ，即不使用all-posts RSS订阅源。"
+msgstr ""
+"存储all-posts RSS订阅源的文件位置：其中会包含所有语言的帖子。本项配置默认为 ``None`` ，即不使用all-posts "
+"RSS订阅源。"
 
-#: ../../settings.rst:1014 fe17f05439064eea8fb3dad8255cd467
+#: ../../settings.rst:1011 fe17f05439064eea8fb3dad8255cd467
 msgid ""
 "Relative URL of the all-posts RSS feed. If not set, ``FEED_ALL_RSS`` is "
 "used both for save location and URL. The default is ``None``."
-msgstr "all-posts RSS订阅源的相对URL。如果未设置此项，会将 ``FEED_ALL_RSS`` 同时用于存储位置和URL。本项配置默认为 ``None`` 。"
+msgstr ""
+"all-posts RSS订阅源的相对URL。如果未设置此项，会将 ``FEED_ALL_RSS`` 同时用于存储位置和URL。本项配置默认为 "
+"``None`` 。"
 
-#: ../../settings.rst:1019 c4758a4ce8f94850ba4567250259741d
+#: ../../settings.rst:1016 c4758a4ce8f94850ba4567250259741d
 #, python-brace-format
 msgid ""
 "The location to save the category Atom feeds. [2]_ The default is "
 "``'feeds/{slug}.atom.xml'``."
 msgstr "category Atom订阅源的存储位置。 [2]_ 本项配置默认为 ``'feeds/{slug}.atom.xml'`` 。"
 
-#: ../../settings.rst:1024 d31bcd45f3ee47e4a316ac3f765c527d
+#: ../../settings.rst:1021 d31bcd45f3ee47e4a316ac3f765c527d
 #, python-brace-format
 msgid ""
 "Relative URL of the category Atom feeds, including the ``{slug}`` "
@@ -1360,14 +1375,14 @@ msgstr ""
 "category Atom订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 "
 "``CATEGORY_FEED_ATOM`` 同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1030 fabfac75a52f48029a8147f62289c252
+#: ../../settings.rst:1027 fabfac75a52f48029a8147f62289c252
 #, python-brace-format
 msgid ""
 "The location to save the category RSS feeds, including the ``{slug}`` "
 "placeholder. [2]_ The default is ``None``, for no RSS feed."
 msgstr "category RSS订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_ 本项配置默认为 ``None`` ，即不使用RSS订阅源。"
 
-#: ../../settings.rst:1035 fabfac75a52f48029a8147f62289c252
+#: ../../settings.rst:1032 fabfac75a52f48029a8147f62289c252
 #, python-brace-format
 msgid ""
 "Relative URL of the category RSS feeds, including the ``{slug}`` "
@@ -1377,14 +1392,16 @@ msgstr ""
 "category RSS订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 "
 "``CATEGORY_FEED_RSS`` 同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1041 28942938054b490c8dd5ca8367d87ea9
+#: ../../settings.rst:1038 28942938054b490c8dd5ca8367d87ea9
 #, python-brace-format
 msgid ""
 "The location to save the author Atom feeds. [2]_ The default is "
 "``'feeds/{slug}.atom.xml'``."
-msgstr "author Atom订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_ 本项配置默认为 ``'feeds/{slug}.atom.xml'`` 。"
+msgstr ""
+"author Atom订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_ 本项配置默认为 "
+"``'feeds/{slug}.atom.xml'`` 。"
 
-#: ../../settings.rst:1046 fde52f62d95a4bad85a5a1b49eed6170
+#: ../../settings.rst:1043 fde52f62d95a4bad85a5a1b49eed6170
 #, python-brace-format
 msgid ""
 "Relative URL of the author Atom feeds, including the ``{slug}`` "
@@ -1394,14 +1411,14 @@ msgstr ""
 "author Atom订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 "
 "``AUTHOR_FEED_ATOM`` 同时用于存储位置和URL。本项配置默认为 ``None`` ，即不使用。"
 
-#: ../../settings.rst:1052 c4758a4ce8f94850ba4567250259741d
+#: ../../settings.rst:1049 c4758a4ce8f94850ba4567250259741d
 #, python-brace-format
 msgid ""
 "The location to save the author RSS feeds. [2]_ The default is "
 "``'feeds/{slug}.rss.xml'``."
 msgstr "author RSS订阅源的存储位置。 [2]_ 本项配置默认为 ``'feeds/{slug}.rss.xml'`` 。"
 
-#: ../../settings.rst:1057 367ef87d541c45ffaf65e8d8b1469f1a
+#: ../../settings.rst:1054 367ef87d541c45ffaf65e8d8b1469f1a
 #, python-brace-format
 msgid ""
 "Relative URL of the author RSS feeds, including the ``{slug}`` "
@@ -1411,37 +1428,38 @@ msgstr ""
 "author RSS订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 如果未设置， 会将 ``AUTHOR_FEED_RSS`` "
 "同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1063 b1159e07c8184831b6dcfd308cd23439
+#: ../../settings.rst:1060 b1159e07c8184831b6dcfd308cd23439
 #, python-brace-format
 msgid ""
 "The location to save the tag Atom feed, including the ``{slug}`` "
 "placeholder. [2]_ The default is ``None``, for no tag feed."
 msgstr "tag Atom订阅源的存储位置，其中包含 ``{slug}`` 。 [2]_ 本项配置默认为 ``None`` ，即不使用tag feed。"
 
-#: ../../settings.rst:1068 d744ca82b48d4e9298f2ca19252aedec
+#: ../../settings.rst:1065 d744ca82b48d4e9298f2ca19252aedec
 #, python-brace-format
 msgid ""
 "Relative URL of the tag Atom feed, including the ``{slug}`` placeholder. "
 "[2]_ The default is ``None``."
 msgstr "tag Atom订阅源的相对URL，其中包含 ``{slug}`` 。 [2]_ 本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1073 b1159e07c8184831b6dcfd308cd23439
+#: ../../settings.rst:1070 b1159e07c8184831b6dcfd308cd23439
 #, python-brace-format
 msgid ""
 "Relative URL to output the tag RSS feed, including the ``{slug}`` "
 "placeholder. If not set, ``TAG_FEED_RSS`` is used both for save location "
 "and URL. The default is ``None``, for no tag feed."
-msgstr "tag RSS订阅源的相对URL，其中包含 ``{slug}`` 。如果未设置，会将 ``TAG_FEED_RSS`` 同时用于存储位置和URL。"
-"本项配置默认为 ``None`` ，即不使用tag feed。"
+msgstr ""
+"tag RSS订阅源的相对URL，其中包含 ``{slug}`` 。如果未设置，会将 ``TAG_FEED_RSS`` "
+"同时用于存储位置和URL。本项配置默认为 ``None`` ，即不使用tag feed。"
 
-#: ../../settings.rst:1079 c8f29653c4f3423b8dec9905fa1de6f2
+#: ../../settings.rst:1076 c8f29653c4f3423b8dec9905fa1de6f2
 msgid ""
 "Maximum number of items allowed in a feed. Setting to ``None`` will cause"
 " the feed to contains every article. 100 if not specified. The default is"
 " ``100``."
 msgstr "单个订阅源中允许包含的最多元素数量。若设为 ``None`` 表示不做上限；若不指定，默认上限为100。"
 
-#: ../../settings.rst:1084 27393055cbb846bba21699d9a59502c2
+#: ../../settings.rst:1081 27393055cbb846bba21699d9a59502c2
 msgid ""
 "Only include item summaries in the ``description`` tag of RSS feeds. If "
 "set to ``False``, the full content will be included instead. This setting"
@@ -1450,28 +1468,28 @@ msgstr ""
 "仅在RSS订阅源的 ``description`` 标签中包含项目摘要。若设为 ``False`` ，则将包含完整内容。此项设置不会影响Atom "
 "feed，只针对RSS feed。本项配置默认为 ``True`` 。"
 
-#: ../../settings.rst:1090 2c53416e07e34cc9998718fc5e82cc12
+#: ../../settings.rst:1087 2c53416e07e34cc9998718fc5e82cc12
 msgid ""
 "If set to ``True``, ``?ref=feed`` will be appended to links in generated "
 "feeds for the purpose of referrer tracking. The default is ``False``."
 msgstr "若设为 ``True`` ，会将 ``?ref=feed`` 附到生成的链接中，以便追踪引用。本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:1093 7f647c4c65494b93bb6d1c3ef4b39af6
+#: ../../settings.rst:1090 7f647c4c65494b93bb6d1c3ef4b39af6
 msgid ""
 "If you don't want to generate some or any of these feeds, set the above "
 "variables to ``None``."
 msgstr "若你不想要生成某些订阅源，将对应变量设为 ``None`` 即可。"
 
-#: ../../settings.rst:1096 372a88d4b1044ba491c1547e90014c73
+#: ../../settings.rst:1093 372a88d4b1044ba491c1547e90014c73
 #, python-brace-format
 msgid "``{slug}`` is replaced by name of the category / author / tag."
 msgstr "``{slug}`` 会分别用分类名/作者名/标签名来替换。"
 
-#: ../../settings.rst:1100 9913cc3370754eda888a2594a73ce4da
+#: ../../settings.rst:1097 9913cc3370754eda888a2594a73ce4da
 msgid "Pagination"
 msgstr "分页"
 
-#: ../../settings.rst:1102 caf94bfd47344208a34f6b10225646a1
+#: ../../settings.rst:1099 caf94bfd47344208a34f6b10225646a1
 msgid ""
 "The default behaviour of Pelican is to list all the article titles along "
 "with a short description on the index page. While this works well for "
@@ -1479,46 +1497,50 @@ msgid ""
 "probably benefit from paginating this list."
 msgstr "默认情况下，Pelican会把所有文章以简短描述的形式展示在首页上。虽然这对中小型网站效果不错，但对于拥有大量文章的网站来说可能需要将此列表进行分页。"
 
-#: ../../settings.rst:1107 2667020362fe4d23a84b1d25b24863c3
+#: ../../settings.rst:1104 2667020362fe4d23a84b1d25b24863c3
 msgid "You can use the following settings to configure the pagination."
 msgstr "你可以使用下面的设置来配置分页。"
 
-#: ../../settings.rst:1111 656911c7bc2145b0bd1ff10d5373d7dc
+#: ../../settings.rst:1108 656911c7bc2145b0bd1ff10d5373d7dc
 msgid ""
 "The minimum number of articles allowed on the last page. Use this when "
 "you don't want the last page to only contain a handful of articles. The "
 "default is ``0``."
-msgstr "最后一页允许的最小文章数。当不希望最后一页仅包含少数文章时，请使用此选项。（译者注：当最后一页达不到此最小文章数时，会被合并到前一页）"
-"本项配置默认为 ``0`` 。"
+msgstr ""
+"最后一页允许的最小文章数。当不希望最后一页仅包含少数文章时，请使用此选项。（译者注：当最后一页达不到此最小文章数时，会被合并到前一页）本项配置默认为"
+" ``0`` 。"
 
-#: ../../settings.rst:1117 030af02515a84a13925108ab06457c0b
+#: ../../settings.rst:1114 030af02515a84a13925108ab06457c0b
 msgid ""
 "The maximum number of articles to include on a page, not including "
 "orphans. False to disable pagination. The default is ``False``."
-msgstr "一个页面上包含的最大文章数，不包括孤立文章（译者注：当发生上一条设置选项中提到的合并时，最后一页显然会超过此最大文章数）。设为False会禁用分页。"
-"本项配置默认为 ``False`` 。"
+msgstr ""
+"一个页面上包含的最大文章数，不包括孤立文章（译者注：当发生上一条设置选项中提到的合并时，最后一页显然会超过此最大文章数）。设为False会禁用分页。本项配置默认为"
+" ``False`` 。"
 
-#: ../../settings.rst:1122 478c5db91b16485b81ea4523ae70b6f1
+#: ../../settings.rst:1119 478c5db91b16485b81ea4523ae70b6f1
 #, python-brace-format
 msgid ""
 "The templates to use pagination with, and the number of articles to "
 "include on a page. If this value is ``None``, it defaults to "
 "``DEFAULT_PAGINATION``. The default is ``{'index': None, 'tag': None, "
 "'category': None, 'author': None}``."
-msgstr "指定哪些模板需要启用分页，以及对应的单页面文章数量。若设为 ``None`` ，则默认值为 ``DEFAULT_PAGINATION`` 。"
-"本项配置默认为 ``{'index': None, 'tag': None, 'category': None, 'author': None}`` 。"
+msgstr ""
+"指定哪些模板需要启用分页，以及对应的单页面文章数量。若设为 ``None`` ，则默认值为 ``DEFAULT_PAGINATION`` "
+"。本项配置默认为 ``{'index': None, 'tag': None, 'category': None, 'author': "
+"None}`` 。"
 
-#: ../../settings.rst:1128 631c92f55fca4dd4acff9348397bdead
+#: ../../settings.rst:1125 631c92f55fca4dd4acff9348397bdead
 msgid ""
 "A set of patterns that are used to determine advanced pagination output. "
 "The default is::"
 msgstr "一组匹配模式，用于高级分页输出。本项配置默认如下："
 
-#: ../../settings.rst:1138 319e228179c2404dace7b1374e30a558
+#: ../../settings.rst:1135 319e228179c2404dace7b1374e30a558
 msgid "Using Pagination Patterns"
 msgstr "使用分页模式"
 
-#: ../../settings.rst:1140 7c7876166cba4db0bc8ca7c6ceb1f828
+#: ../../settings.rst:1137 7c7876166cba4db0bc8ca7c6ceb1f828
 msgid ""
 "By default, pages subsequent to ``.../foo.html`` are created as "
 "``.../foo2.html``, etc. The ``PAGINATION_PATTERNS`` setting can be used "
@@ -1528,7 +1550,7 @@ msgstr ""
 "默认情况下，连续页面的URL会如此编码：第一页为 ``.../foo.html`` ，后一页为 ``.../foo2.html`` "
 "。``PAGINATION_PATTERNS`` 就是用于修改这个编页规则的，其中是一些三元组："
 
-#: ../../settings.rst:1146 b96115cbd30a454e98427c2f568c9d9f
+#: ../../settings.rst:1143 b96115cbd30a454e98427c2f568c9d9f
 #, python-brace-format
 msgid ""
 "For ``page_url`` and ``page_save_as``, you may use a number of variables."
@@ -1546,7 +1568,7 @@ msgstr ""
 "相同，只不过会截去末尾的 ``/index`` （如果有的话）。 ``{number}`` 则等于页码。（译者注： "
 "``minimum_page`` 意味到达该页面数后开始使用此条规则）"
 
-#: ../../settings.rst:1153 0513d4b59b6443a592d6c47abf6ffd13
+#: ../../settings.rst:1150 0513d4b59b6443a592d6c47abf6ffd13
 msgid ""
 "For example, if you want to leave the first page unchanged, but place "
 "subsequent pages at ``.../page/2/`` etc, you could set "
@@ -1555,52 +1577,54 @@ msgstr ""
 "举个例子，如果你想要保持第一面保持不变，但后续页面都以 ``.../page/2/`` 的形式出现，你可以如此设置 "
 "``PAGINATION_PATTERNS`` ："
 
-#: ../../settings.rst:1163 a7e53284e5344eb5bab04206293349e4
+#: ../../settings.rst:1160 a7e53284e5344eb5bab04206293349e4
 msgid ""
 "If you want a pattern to apply to the last page in the list, use ``-1`` "
 "as the ``minimum_page`` value::"
 msgstr "如果你想指定最后一面制定规则，将 ``minimum_page`` 的值设为 ``-1`` 即可："
 
-#: ../../settings.rst:1169 ee7ce86e8f1749e686233ec4a999dcc9
+#: ../../settings.rst:1166 ee7ce86e8f1749e686233ec4a999dcc9
 msgid "Translations"
 msgstr "翻译"
 
-#: ../../settings.rst:1171 66ba1c80957b4e84a265bbf1cfac36e5
+#: ../../settings.rst:1168 66ba1c80957b4e84a265bbf1cfac36e5
 msgid ""
 "Pelican offers a way to translate articles. See the :doc:`Content "
 "<content>` section for more information."
 msgstr "Pelican为文章翻译提供了展示方法。详见 :doc:`创作内容 <content>` 。"
 
-#: ../../settings.rst:1176 27cab75cf2344a8c8d1573700e1f35ca
+#: ../../settings.rst:1173 27cab75cf2344a8c8d1573700e1f35ca
 msgid "The default language to use. The default is ``'en'``."
 msgstr "指定默认语言。本项配置默认为 ``'en'`` 。"
 
-#: ../../settings.rst:1180 2db269f9350e48098e8e06643b77a107
+#: ../../settings.rst:1177 2db269f9350e48098e8e06643b77a107
 msgid ""
 "The metadata attribute(s) used to identify which articles are "
 "translations of one another. May be a string or a collection of strings. "
 "Set to ``None`` or ``False`` to disable the identification of "
 "translations. The default is ``'slug'``."
-msgstr "指定用于标识不同翻译是同一篇文章的元数据。可以是一个或多个字符串。要禁用对文章翻译的识别，将此项设为 ``None`` 或 ``False`` 。"
-"本项配置默认为 ``'slug'`` 。"
+msgstr ""
+"指定用于标识不同翻译是同一篇文章的元数据。可以是一个或多个字符串。要禁用对文章翻译的识别，将此项设为 ``None`` 或 ``False`` "
+"。本项配置默认为 ``'slug'`` 。"
 
-#: ../../settings.rst:1187 bfa4d3e17c6f42ac9ddeb79fd2131943
+#: ../../settings.rst:1184 bfa4d3e17c6f42ac9ddeb79fd2131943
 msgid ""
 "The metadata attribute(s) used to identify which pages are translations "
 "of one another. May be a string or a collection of strings. Set to "
 "``None`` or ``False`` to disable the identification of translations. The "
 "default is ``'slug'``."
-msgstr "指定用于标识不同翻译是同一个页面的元数据。可以是一个或多个字符串。要禁用对页面翻译的识别，将此项设为 ``None`` 或 ``False`` 。"
-"本项配置默认为 ``'slug'`` 。"
+msgstr ""
+"指定用于标识不同翻译是同一个页面的元数据。可以是一个或多个字符串。要禁用对页面翻译的识别，将此项设为 ``None`` 或 ``False`` "
+"。本项配置默认为 ``'slug'`` 。"
 
-#: ../../settings.rst:1194 2ae8d30c65cb460194294c5a5de14f02
+#: ../../settings.rst:1191 2ae8d30c65cb460194294c5a5de14f02
 #, python-brace-format
 msgid ""
 "The location to save the Atom feed for translations. [3]_ The default is "
 "``'feeds/all-{lang}.atom.xml'``."
 msgstr "指定各翻译Atom订阅源的存储位置。 [3]_ 本项配置默认为 ``'feeds/all-{lang}.atom.xml'`` 。"
 
-#: ../../settings.rst:1199 bc09f3717a8a497680abc66b70745d0f
+#: ../../settings.rst:1196 bc09f3717a8a497680abc66b70745d0f
 #, python-brace-format
 msgid ""
 "Relative URL of the Atom feed for translations, including the ``{lang}`` "
@@ -1610,13 +1634,13 @@ msgstr ""
 "指定各翻译Atom feed的含有 ``{lang}`` 的相对URL。 [3]_ "
 "若未设置此项，``TRANSLATION_FEED_ATOM`` 会同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1205 1049b8c5e754466684e120afb2f7d281
+#: ../../settings.rst:1202 1049b8c5e754466684e120afb2f7d281
 msgid ""
 "Where to put the RSS feed for translations. The default is ``None``, "
 "meaning no RSS feed."
 msgstr "指定各翻译RSS订阅源的存储位置。本项配置默认为 ``None`` ，即无RSS feed。"
 
-#: ../../settings.rst:1210 625b105c73764fce865b2504e811e055
+#: ../../settings.rst:1207 625b105c73764fce865b2504e811e055
 #, python-brace-format
 msgid ""
 "Relative URL of the RSS feed for translations, including the ``{lang}`` "
@@ -1626,28 +1650,28 @@ msgstr ""
 "文章或页面不同翻译在RSS订阅源中的相对路径，其中含有 ``{lang}``。 [3]_ "
 "若未设置此项，``TRANSLATION_FEED_RSS`` 会同时用于存储位置和URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1214 088e79d226f0487fafc14494179cabcf
+#: ../../settings.rst:1211 088e79d226f0487fafc14494179cabcf
 #, python-brace-format
 msgid "{lang} is the language code"
 msgstr "{lang} 为语言代码"
 
-#: ../../settings.rst:1217 4376232e5a294aca906df56af2f49303
+#: ../../settings.rst:1214 4376232e5a294aca906df56af2f49303
 msgid "Ordering content"
 msgstr "内容的排列顺序"
 
-#: ../../settings.rst:1221 41cf2c63929d4eeeae7bfdee85e8d084
+#: ../../settings.rst:1218 41cf2c63929d4eeeae7bfdee85e8d084
 msgid ""
 "Order archives by newest first by date. (False: orders by date with older"
 " articles first.) The default is ``True``."
 msgstr "若设为True，日期较新的会排在前面；若设为False，则日期较旧的会排在前面。本项配置默认为 ``True`` 。"
 
-#: ../../settings.rst:1226 3f3709e077b3416f8c3640dfc4432e38
+#: ../../settings.rst:1223 3f3709e077b3416f8c3640dfc4432e38
 msgid ""
 "Reverse the category order. (True: lists by reverse alphabetical order; "
 "default lists alphabetically.) The default is ``False``."
 msgstr "若设为True，分类会按字典序逆序排列；若设为False，则按字典序顺序排列。本项配置默认为 ``False`` 。"
 
-#: ../../settings.rst:1231 ff8d745b1884450185d26b1f7d645a5f
+#: ../../settings.rst:1228 ff8d745b1884450185d26b1f7d645a5f
 msgid ""
 "Defines how the articles (``articles_page.object_list`` in the template) "
 "are sorted. Valid options are: metadata as a string (use ``reversed-`` "
@@ -1658,32 +1682,33 @@ msgid ""
 "``'reversed-date'``, will sort articles by date in reverse order (i.e., "
 "newest article comes first). The default is ``'reversed-date'``."
 msgstr ""
-"定义文章（模板中的 ``articles_page.object_list`` "
-"）的排序方式。有效选项包括：字符串形式的元数据（使用前缀 ``reversed-`` 来指定逆序）、特殊选项 ``'basename'`` "
+"定义文章（模板中的 ``articles_page.object_list`` ）的排序方式。有效选项包括：字符串形式的元数据（使用前缀 "
+"``reversed-`` 来指定逆序）、特殊选项 ``'basename'`` "
 "（不带路径的文件名）、或是一个可以从文章中提取排序键的自定义函数。例如，将选项值设为 ``'date'`` ，文章就会以时间顺序排列文章。默认值为"
 " ``'reversed-date'`` ，即以日期逆序排列，即新文章在前、旧文章在后。本项配置默认为 ``'reversed-date'`` 。"
 
-#: ../../settings.rst:1242 c2de8ca998954143a3a21d52f57a4e17
+#: ../../settings.rst:1239 c2de8ca998954143a3a21d52f57a4e17
 msgid ""
 "Defines how the pages (``pages`` variable in the template) are sorted. "
 "Options are same as ``ARTICLE_ORDER_BY``.  The default value, "
 "``'basename'`` will sort pages by their basename. The default is "
 "``'basename'``."
 msgstr ""
-"定义页面（模板中的 ``pages`` 变量）的排序顺序。有效选项和 ``ARTICLE_ORDER_BY`` 中的相同。本项配置默认为 ``'basename'`` 。"
+"定义页面（模板中的 ``pages`` 变量）的排序顺序。有效选项和 ``ARTICLE_ORDER_BY`` 中的相同。本项配置默认为 "
+"``'basename'`` 。"
 
-#: ../../settings.rst:1250 6a345fb283734251b7acad72b7c4cf51
+#: ../../settings.rst:1247 6a345fb283734251b7acad72b7c4cf51
 msgid "Themes"
 msgstr "主题"
 
-#: ../../settings.rst:1252 6498842c51bb40548a640a7d419909bf
+#: ../../settings.rst:1249 6498842c51bb40548a640a7d419909bf
 msgid ""
 "Creating Pelican themes is addressed in a dedicated section (see :ref"
 ":`theming-pelican`). However, here are the settings that are related to "
 "themes."
 msgstr "创建Pelican主题在单独的一节中讲解（参见 :ref:`theming-pelican` ）。此处讲解和主题有关的配置项。"
 
-#: ../../settings.rst:1258 bb35f8335e4142f5b69a61115ab790e5
+#: ../../settings.rst:1255 bb35f8335e4142f5b69a61115ab790e5
 msgid ""
 "Theme to use to produce the output. Can be a relative or absolute path to"
 " a theme folder, or the name of a default theme or a theme installed via "
@@ -1692,16 +1717,16 @@ msgstr ""
 "用于产生输出的主题。可以是到达要使用主题的文件夹的相对或绝对路径，或是主题的名称（默认主题或通过 :doc:`pelican-themes` "
 "安装的主题）。默认主题为 \"notmyidea\" 。"
 
-#: ../../settings.rst:1264 3d47fbf73e7a4188a877619ef4cbed77
+#: ../../settings.rst:1261 3d47fbf73e7a4188a877619ef4cbed77
 msgid ""
 "Destination directory in the output path where Pelican will place the "
 "files collected from `THEME_STATIC_PATHS`. Default is `theme`. The "
 "default is ``'theme'``."
 msgstr ""
-"Pelican从 `THEME_STATIC_PATHS` 中发现主题要使用的静态文件，此设置项指定这些静态文件在输出路径中的目录。"
-"本项配置默认为 ``'theme'`` 。"
+"Pelican从 `THEME_STATIC_PATHS` 中发现主题要使用的静态文件，此设置项指定这些静态文件在输出路径中的目录。本项配置默认为"
+" ``'theme'`` 。"
 
-#: ../../settings.rst:1270 c0b9021df19241fab6b6f90983248f9c
+#: ../../settings.rst:1267 c0b9021df19241fab6b6f90983248f9c
 msgid ""
 "Static theme paths you want to copy. Default value is `static`, but if "
 "your theme has other static paths, you can put them here. If files or "
@@ -1710,10 +1735,10 @@ msgid ""
 "``['static']``."
 msgstr ""
 "要复制的静态主题路径。默认值为 `static` "
-"，但如果你的主题有其他静态路径，也可以将其放在此处。此项设置中若包含了相同名称的文件或目录，前面的会被后面的覆盖。"
-"本项配置默认为 ``['static']`` 。"
+"，但如果你的主题有其他静态路径，也可以将其放在此处。此项设置中若包含了相同名称的文件或目录，前面的会被后面的覆盖。本项配置默认为 "
+"``['static']`` 。"
 
-#: ../../settings.rst:1277 117f2d4711394bf39c50303d6b24c06b
+#: ../../settings.rst:1274 117f2d4711394bf39c50303d6b24c06b
 msgid ""
 "A list of paths you want Jinja2 to search for templates before searching "
 "the theme's ``templates/`` directory.  Allows for overriding individual "
@@ -1722,11 +1747,11 @@ msgid ""
 "first, then the theme's ``templates/``. The default is ``[]``."
 msgstr ""
 "在搜索主题的 ``templates/`` "
-"目录前，Jinja2会先搜索此设置项中的路径。可以使用此设置项覆盖主题中的某些模板文件，以尽量避免修改现有主题。"
-"Jinja2会先搜索 ``THEME_TEMPLATES_OVERRIDES`` 配置的文件，再搜索主题中的 ``templates/`` 目录。"
-"本项配置默认为 ``[]`` 。"
+"目录前，Jinja2会先搜索此设置项中的路径。可以使用此设置项覆盖主题中的某些模板文件，以尽量避免修改现有主题。Jinja2会先搜索 "
+"``THEME_TEMPLATES_OVERRIDES`` 配置的文件，再搜索主题中的 ``templates/`` 目录。本项配置默认为 "
+"``[]`` 。"
 
-#: ../../settings.rst:1283 3f686a923ffa4a468df172f04146e388
+#: ../../settings.rst:1280 3f686a923ffa4a468df172f04146e388
 #, python-brace-format, python-format
 msgid ""
 "You can also extend templates from the theme using the ``{% extends %}`` "
@@ -1734,26 +1759,26 @@ msgid ""
 "example:"
 msgstr "利用 ``{% extends %}`` 指令中的 ``!theme`` 前缀也可以用于从主题扩展模板，如下例所示："
 
-#: ../../settings.rst:1292 35121540d2254f698cbf9538d00cf5bd
+#: ../../settings.rst:1289 35121540d2254f698cbf9538d00cf5bd
 msgid "Specify the CSS file you want to load. The default is ``'main.css'``."
 msgstr "指定需要加载的CSS文件。本项配置默认为 ``'main.css'`` 。"
 
-#: ../../settings.rst:1294 533f2b3f18864e7ca68bfcb5d6961fe1
+#: ../../settings.rst:1291 533f2b3f18864e7ca68bfcb5d6961fe1
 msgid ""
 "By default, two themes are available. You can specify them using the "
 "``THEME`` setting or by passing the ``-t`` option to the ``pelican`` "
 "command:"
 msgstr "默认情况下，有两个主题可供选择。可以使用 ``THEME`` 选项指定，或是在 ``pelican`` 命令中使用 ``-t`` 选项的参数传入。"
 
-#: ../../settings.rst:1297 f1ea5d4700ca4f1091d6ee798596cff7
+#: ../../settings.rst:1294 f1ea5d4700ca4f1091d6ee798596cff7
 msgid "notmyidea"
 msgstr "notmyidea（默认值）"
 
-#: ../../settings.rst:1298 9b7be83a91ab4de7bd6d7a30dbcef939
+#: ../../settings.rst:1295 9b7be83a91ab4de7bd6d7a30dbcef939
 msgid "simple (a synonym for \"plain text\" :)"
 msgstr "simple（即“plain text”）"
 
-#: ../../settings.rst:1300 3ac1546ab1144586825809c12f4abc78
+#: ../../settings.rst:1297 3ac1546ab1144586825809c12f4abc78
 msgid ""
 "There are a number of other themes available at "
 "https://github.com/getpelican/pelican-themes. Pelican comes with :doc"
@@ -1762,107 +1787,107 @@ msgstr ""
 "还有很多主题可以在 https://github.com/getpelican/pelican-themes 上下载。Pelican使用一个称为 "
 ":doc:`pelican-themes` 的小脚本来管理主题。"
 
-#: ../../settings.rst:1304 f1b29806557540ddaefe6bc035a48459
+#: ../../settings.rst:1301 f1b29806557540ddaefe6bc035a48459
 msgid ""
 "You can define your own theme, either by starting from scratch or by "
 "duplicating and modifying a pre-existing theme. Here is :doc:`a guide on "
 "how to create your theme <themes>`."
 msgstr "你还可以创建自己的主题，可以从头开始，也可以在已有主题的基础上修改。请参看 :doc:`主题 <themes>` 文档。"
 
-#: ../../settings.rst:1308 47a8dd97888b440aabbea22aee72630a
+#: ../../settings.rst:1305 47a8dd97888b440aabbea22aee72630a
 msgid "Following are example ways to specify your preferred theme::"
 msgstr "下面是几个指定某个主题的例子："
 
-#: ../../settings.rst:1319 3f51b49bed124af39ae67bf60c8384f8
+#: ../../settings.rst:1316 3f51b49bed124af39ae67bf60c8384f8
 msgid ""
 "The built-in ``simple`` theme can be customized using the following "
 "settings."
 msgstr "内置的 ``simple`` 主题可以使用以下设置项进行自定义。"
 
-#: ../../settings.rst:1323 08d86196410f482e803c69d85078652a
+#: ../../settings.rst:1320 08d86196410f482e803c69d85078652a
 msgid "The URL of the stylesheet to use. The default is ``None``."
 msgstr "要使用的样式表的URL。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1325 369beaeb61fd4e4f843d8174b666c0a7
+#: ../../settings.rst:1322 369beaeb61fd4e4f843d8174b666c0a7
 msgid ""
 "The built-in ``notmyidea`` theme can make good use of the following "
 "settings. Feel free to use them in your themes as well."
 msgstr "下面的一下选项可以很好地作用于内置的 ``notmyidea`` 主题。当然在其他主题中你也可以尽情尝试这些选项。"
 
-#: ../../settings.rst:1330 7f647c4c65494b93bb6d1c3ef4b39af6
+#: ../../settings.rst:1327 7f647c4c65494b93bb6d1c3ef4b39af6
 msgid "A subtitle to appear in the header. The default is ``None``."
 msgstr "页面顶部要显示的副标题。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1334 49eda3f428d7490bb78e081bbc941e64
+#: ../../settings.rst:1331 49eda3f428d7490bb78e081bbc941e64
 msgid ""
 "Pelican can handle Disqus comments. Specify the Disqus sitename "
 "identifier here. The default is ``None``."
 msgstr "可以在Pelican中使用Disqus的评论系统，此设置项用于设置Disqus的站点标识符。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1339 a52590c6150e459495608626cf47cbc8
+#: ../../settings.rst:1336 a52590c6150e459495608626cf47cbc8
 msgid ""
 "Your GitHub URL (if you have one). It will then use this information to "
 "create a GitHub ribbon. The default is ``None``."
 msgstr "指定你的GitHub URL（如果有的话），此信息将被用于创建GitHub标记。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1344 7a1fab7bd7d248aca77d6cebb71415fb
+#: ../../settings.rst:1341 7a1fab7bd7d248aca77d6cebb71415fb
 msgid ""
 "Put any desired analytics scripts in this setting in ``publishconf.py``. "
 "Example:"
 msgstr "在 ``publishconf.py`` 中设置此项，用于指定想要使用的统计分析脚本。如下例："
 
-#: ../../settings.rst:1356 f0fd9392aa0544248ae3ecfa505cbd50
+#: ../../settings.rst:1353 f0fd9392aa0544248ae3ecfa505cbd50
 msgid "The default is ``None``."
 msgstr "默认为 ``None``"
 
-#: ../../settings.rst:1360 5f3cf76b56694fa88318f38e06dfb9d9
+#: ../../settings.rst:1357 5f3cf76b56694fa88318f38e06dfb9d9
 msgid ""
 "A list of tuples (Title, URL) for additional menu items to appear at the "
 "beginning of the main menu. The default is ``None``."
 msgstr "指定 (标题, URL) 元组的列表，用于指定额外的菜单项，会添加在菜单栏的开头。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1365 23402de55a8d4b9a99f81aa3cbfd334f
+#: ../../settings.rst:1362 23402de55a8d4b9a99f81aa3cbfd334f
 msgid ""
 "A list of tuples (Title, URL) for links to appear on the header. The "
 "default is ``None``."
 msgstr "指定 (标题, URL) 元组的列表，用于指定要展示在顶部的链接。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1370 55e5a965cc1f45eea43a064d8c93c758
+#: ../../settings.rst:1367 55e5a965cc1f45eea43a064d8c93c758
 msgid ""
 "A list of tuples (Title, URL) to appear in the \"social\" section. The "
 "default is ``None``."
 msgstr "指定 (标题, URL) 元组的列表，用于指定要展示在“social”部分的内容。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1375 2b60264917b1429b9252029724038ed9
+#: ../../settings.rst:1372 2b60264917b1429b9252029724038ed9
 msgid ""
 "Allows for adding a button to articles to encourage others to tweet about"
 " them. Add your Twitter username if you want this button to appear. The "
 "default is ``None``."
 msgstr "允许在文章中添加按钮，以便其他人在tweet上引用。如果希望显示此按钮，在此项中设置你的Twitter用户名。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1381 f625d19e9cfc481f90ba05c050829ef3
+#: ../../settings.rst:1378 f625d19e9cfc481f90ba05c050829ef3
 msgid ""
 "Allows override of the name of the links widget.  If not specified, "
 "defaults to \"links\". The default is ``None``."
 msgstr "指定用于覆盖“links”部分的名称，若不指定，默认设为 “links”。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1386 54cd361f2d6c44ec8b8838f2364f9c7f
+#: ../../settings.rst:1383 54cd361f2d6c44ec8b8838f2364f9c7f
 msgid ""
 "Allows override of the name of the \"social\" widget.  If not specified, "
 "defaults to \"social\". The default is ``None``."
 msgstr "指定用于覆盖“social”部分的名称。若不指定，默认设为 “social”。本项配置默认为 ``None`` 。"
 
-#: ../../settings.rst:1389 16874b8a80b149578efba9c45a78a9c7
+#: ../../settings.rst:1386 16874b8a80b149578efba9c45a78a9c7
 msgid ""
 "In addition, you can use the \"wide\" version of the ``notmyidea`` theme "
 "by adding the following to your configuration::"
 msgstr "另外，你可以使用 ``notmyidea`` 主题的“宽屏”版本，在配置文件中添加下面这行配置即可："
 
-#: ../../settings.rst:1396 9d24e75fc67d4b98a06bbe832f7cd947
+#: ../../settings.rst:1393 9d24e75fc67d4b98a06bbe832f7cd947
 msgid "Logging"
 msgstr "日志"
 
-#: ../../settings.rst:1398 9ddaf0c25b314e609b7de6873b2cfbcf
+#: ../../settings.rst:1395 9ddaf0c25b314e609b7de6873b2cfbcf
 msgid ""
 "Sometimes, a long list of warnings may appear during site generation. "
 "Finding the **meaningful** error message in the middle of tons of "
@@ -1872,7 +1897,7 @@ msgstr ""
 "在站点生成过程中有时可能会出现一堆警告信息。在这一大堆日志输出中寻找 **有意义** "
 "的错误消息是非常棘手的。为了过滤掉多余的日志消息，可以在Pelican中指定 ``LOG_FILTER`` 设置。"
 
-#: ../../settings.rst:1403 4c3ea89d86e846f3b38f146060f19c53
+#: ../../settings.rst:1400 4c3ea89d86e846f3b38f146060f19c53
 msgid ""
 "``LOG_FILTER`` should be a list of tuples ``(level, msg)``, each of them "
 "being composed of the logging level (up to ``warning``) and the message "
@@ -1882,43 +1907,43 @@ msgstr ""
 "``LOG_FILTER`` 是元组 ``(level, msg)`` ，level指定日志记录等级（最高为 ``warning`` "
 "），msg指定要忽略的消息。将想要隐藏的日志消息添加到此列表中就可以将他们过滤掉。"
 
-#: ../../settings.rst:1408 ../../settings.rst:1416
+#: ../../settings.rst:1405 ../../settings.rst:1413
 #: b62320cd110548f08cdc2b9ff52953d5
 msgid "For example::"
 msgstr "例如："
 
-#: ../../settings.rst:1413 8a81ee82a14e4571852d1b955568028a
+#: ../../settings.rst:1410 8a81ee82a14e4571852d1b955568028a
 msgid ""
 "It is possible to filter out messages by a template. Check out source "
 "code to obtain a template."
 msgstr "用模板字符串指定要过滤的消息也是可以的。具体的消息种类请查看源码。"
 
-#: ../../settings.rst:1423 880baed291ff4f63836986b7c9082825
+#: ../../settings.rst:1420 880baed291ff4f63836986b7c9082825
 msgid ""
 "Silencing messages by templates is a dangerous feature. It is possible to"
 " unintentionally filter out multiple message types with the same template"
 " (including messages from future Pelican versions). Proceed with caution."
 msgstr "通过模板过滤忽略消息是一个危险的功能。 使用同一模板可能会无意中过滤掉多种消息类型（包括来自新版本Pelican的消息），请谨慎行事。"
 
-#: ../../settings.rst:1429 988048d34b0340beb22f11922ce0959a
+#: ../../settings.rst:1426 988048d34b0340beb22f11922ce0959a
 msgid "This option does nothing if ``--debug`` is passed."
 msgstr "当使用了 ``--debug`` 参数，此项设置就不会起作用。"
 
-#: ../../settings.rst:1435 e1b3e06d5d29428ba28f2842124a7dcc
+#: ../../settings.rst:1432 e1b3e06d5d29428ba28f2842124a7dcc
 msgid "Reading only modified content"
 msgstr "只读取修改过的内容"
 
-#: ../../settings.rst:1437 ff9209b75d1645c8b5af8941525fead0
+#: ../../settings.rst:1434 ff9209b75d1645c8b5af8941525fead0
 msgid ""
 "To speed up the build process, Pelican can optionally read only articles "
 "and pages with modified content."
 msgstr "为了加速网站构建过程，Pelican能够只读取修改过内容的文章和页面。"
 
-#: ../../settings.rst:1440 5aee5c450b2047bea84e436894c179ef
+#: ../../settings.rst:1437 5aee5c450b2047bea84e436894c179ef
 msgid "When Pelican is about to read some content source file:"
 msgstr "当Pelican准备读取内容源文件时，会执行下面的规则："
 
-#: ../../settings.rst:1442 0aca4765447b49308b5a52b22a74d16a
+#: ../../settings.rst:1439 0aca4765447b49308b5a52b22a74d16a
 msgid ""
 "The hash or modification time information for the file from a previous "
 "build are loaded from a cache file if ``LOAD_CONTENT_CACHE`` is ``True``."
@@ -1929,24 +1954,24 @@ msgstr ""
 "，则从缓存文件中加载上一次构建时文件的哈希值或修改时间。这些缓存的文件存储在 ``CACHE_PATH`` "
 "所指定的目录中。若文件是新的，在缓存文件中没有记录，则照常读取。"
 
-#: ../../settings.rst:1446 b8bb9d616a2d41b484ec5440fa09e57a
+#: ../../settings.rst:1443 b8bb9d616a2d41b484ec5440fa09e57a
 msgid "The file is checked according to ``CHECK_MODIFIED_METHOD``:"
 msgstr "文件会以 ``CHECK_MODIFIED_METHOD`` 设置的方式检查："
 
-#: ../../settings.rst:1452 fb6105f54c80491c80f99b8b447c5a4b
+#: ../../settings.rst:1449 fb6105f54c80491c80f99b8b447c5a4b
 msgid ""
 "If set to anything else or the necessary information about the file "
 "cannot be found in the cache file, the content is read as usual."
 msgstr "如果设置为其他任何值或在缓存文件中无法找到有关该文件的必要信息，则将照常读取内容。"
 
-#: ../../settings.rst:1455 c46fe5fc65a44157b02b9e26befcefc6
+#: ../../settings.rst:1452 c46fe5fc65a44157b02b9e26befcefc6
 msgid ""
 "If the file is considered unchanged, the content data saved in a previous"
 " build corresponding to the file is loaded from the cache, and the file "
 "is not read."
 msgstr "如果Pelican认为文件没有更改过，会直接从上一次构建的对应文件中加载内容，源文件就不会被读取。"
 
-#: ../../settings.rst:1458 0d597148978d4d228fc55b546d77ba97
+#: ../../settings.rst:1455 0d597148978d4d228fc55b546d77ba97
 msgid ""
 "If the file is considered changed, the file is read and the new "
 "modification information and the content data are saved to the cache if "
@@ -1955,7 +1980,7 @@ msgstr ""
 "若Pelican认为文件更改过了，则会读取源文件；若 ``CACHE_CONTENT`` 设为了 ``True`` "
 "，Pelican还会将修改后的信息以及内容数据存入缓存。"
 
-#: ../../settings.rst:1462 e1c91fa9ecf84419a4e34e3fa0951b56
+#: ../../settings.rst:1459 e1c91fa9ecf84419a4e34e3fa0951b56
 msgid ""
 "If ``CONTENT_CACHING_LAYER`` is set to ``'reader'`` (the default), the "
 "raw content and metadata returned by a reader are cached. If this setting"
@@ -1970,7 +1995,7 @@ msgstr ""
 "，则缓存处理过后的内容对象。缓存已处理的内容对象可能会和插件（因为可能会跳过一些与读取相关的信号）与 ``WITH_FUTURE_DATES`` "
 "的功能（因为已处理内容对象的 ``draft`` 状态不会改变）冲突。"
 
-#: ../../settings.rst:1470 d46b39637a86497eb38667c8ecf9bf66
+#: ../../settings.rst:1467 d46b39637a86497eb38667c8ecf9bf66
 msgid ""
 "Checking modification times is faster than comparing file hashes, but it "
 "is not as reliable because ``mtime`` information can be lost, e.g., when "
@@ -1982,7 +2007,7 @@ msgstr ""
 "``rsync`` 命令时没有开启 ``mtime`` 保留模式。（rsync可以通过指定 ``--archive`` 标志启用 "
 "``mtime`` 保留模式）"
 
-#: ../../settings.rst:1476 3ef54978b60c4fcb9f2b0dc625797b74
+#: ../../settings.rst:1473 3ef54978b60c4fcb9f2b0dc625797b74
 msgid ""
 "The cache files are Python pickles, so they may not be readable by "
 "different versions of Python as the pickle format often changes. If such "
@@ -1994,7 +2019,7 @@ msgstr ""
 "pickles，因此不同版本的Python由于pickle文件格式变化可能无法读取缓存。如果遇到此类错误，会自动以新格式重新构建缓存。另外，当 "
 "``GZIP_CACHE`` 设置发生变化后，缓存也会自动重建。"
 
-#: ../../settings.rst:1482 40fb13c9fe444d109c9014ce4f294f92
+#: ../../settings.rst:1479 40fb13c9fe444d109c9014ce4f294f92
 msgid ""
 "The ``--ignore-cache`` command-line option is useful when the whole cache"
 " needs to be regenerated, such as when making modifications to the "
@@ -2007,7 +2032,7 @@ msgstr ""
 "命令行选项，例如当需要修改会影响缓存内容的设置项时，或是调试时，都可以使用 ``--ignore-cache`` 。若 "
 "``AUTORELOAD_IGNORE_CACHE`` 设为了 ``True`` ，修改设置文件时会自动忽略缓存。"
 
-#: ../../settings.rst:1488 05ea098bd1b34660878cc598cf9c639c
+#: ../../settings.rst:1485 05ea098bd1b34660878cc598cf9c639c
 msgid ""
 "Note that even when using cached content, all output is always written, "
 "so the modification times of the generated ``*.html`` files will always "
@@ -2017,7 +2042,7 @@ msgstr ""
 "需要注意的是，即使使用了缓存的内容，最终的输出文件也始终会进行重新写入，因此生成的 ``*.html`` 文件的修改时间始终会变化。所以，基于 "
 "``rsync`` 进行上传时，可以考虑使用 ``--checksum`` 选项。"
 
-#: ../../settings.rst:1495 358bf9edd2594e2fa3db87aae3703994
+#: ../../settings.rst:1492 358bf9edd2594e2fa3db87aae3703994
 msgid "Example settings"
 msgstr "配置示例"
 
diff --git a/docs/locale/zh_CN/LC_MESSAGES/sphinx.po b/docs/locale/zh_CN/LC_MESSAGES/sphinx.po
index 860cbcb2..320d41f2 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/sphinx.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/sphinx.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-24 19:06+0800\n"
-"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"POT-Creation-Date: 2026-02-02 10:32+0800\n"
+"PO-Revision-Date: 2026-02-02 10:32+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
 "Language-Team: \n"
@@ -16,30 +16,34 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.15.0\n"
+"Generated-By: Babel 2.17.0\n"
 
-#: ../../_templates/page.html:68 697aead398874e06aa15cfd74d134745
+#: ../../_templates/page.html:13 d28434a1f790406f866556f17fe43bea
+msgid "Skip to content"
+msgstr ""
+
+#: ../../_templates/page.html:68 11a1e7e70c0542dcb853ce6d667b4b13
 msgid "Back to top"
 msgstr "返回顶部"
 
-#: ../../_templates/page.html:101 f91a64e54aae49c2bd09a944ea693193
+#: ../../_templates/page.html:121 b65dfb48967147f688c1d2166a0d3e60
 msgid "Next"
 msgstr "下一节"
 
-#: ../../_templates/page.html:113 6c3ad069077b4e2cb6e1f77cc2962881
+#: ../../_templates/page.html:133 44ccbbca34f24a5fb1083bcda42d2399
 msgid "Previous"
 msgstr "前一节"
 
-#: ../../_templates/page.html:116 e83e03d0b50c4065a9f87db25a23b3ee
+#: ../../_templates/page.html:136 fd17897083a54a929cff164a233bd4d7
 msgid "Home"
 msgstr "首页"
 
-#: ../../_templates/page.html:129 1d0fdb4c0b4e420283101ba5c21ac985
+#: ../../_templates/page.html:149 17589e72a0364f6b8532d40aea593ad7
 #, python-format
 msgid "<a href=\"%(path)s\">Copyright</a> &#169; %(copyright)s"
 msgstr "<a href=\"%(path)s\">Copyright</a> &#169; %(copyright)s"
 
-#: ../../_templates/page.html:133 0a35c662e6574da48f7ac5c6b2c82874
+#: ../../_templates/page.html:153 6603e5fc982d4b8b8ba3145dcf098be9
 #, python-format
 msgid ""
 "Copyright &#169; %(copyright)s, <a "
@@ -50,11 +54,11 @@ msgstr ""
 "href=\"https://justinmayer.com\">Justin Mayer</a>, Alexis Metaireau, and "
 "contributors"
 
-#: ../../_templates/page.html:141 07b89372db484251bfcd3b54e0845bf0
+#: ../../_templates/page.html:161 757352d714c74c48ad540604822a210e
 #, python-format
 msgid "Last updated on %(last_updated)s"
 msgstr "最后更新于 %(last_updated)s"
 
-#: ../../_templates/page.html:187 2eb9f1b479a7405290a91d8e1962f265
+#: ../../_templates/page.html:207 6b07f3b7330d47a3976e765b14da9ad1
 msgid "On this page"
 msgstr "本页目录"
diff --git a/docs/locale/zh_CN/LC_MESSAGES/tips.po b/docs/locale/zh_CN/LC_MESSAGES/tips.po
index a65edf13..2b59a8bd 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/tips.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/tips.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PELICAN 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-07 16:25+0800\n"
-"PO-Revision-Date: 2024-06-27 19:00+0800\n"
+"POT-Creation-Date: 2026-02-02 10:32+0800\n"
+"PO-Revision-Date: 2026-02-02 10:32+0800\n"
 "Last-Translator: GeorgeHu <dhxxhch@163.com>\n"
 "Language: zh_CN\n"
 "Language-Team: zh_CN <LL@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.16.0\n"
+"Generated-By: Babel 2.17.0\n"
 
 #: ../../tips.rst:2 9c4618aaecd44b0d93537cb760e227fa
 msgid "Tips"
@@ -26,7 +26,7 @@ msgstr "小技巧"
 msgid "Here are some tips about Pelican that you might find useful."
 msgstr "以下是一些实用的小技巧。"
 
-#: ../../tips.rst:7 ../../tips.rst:309 95bea35d0347495bb551fe9486bcd29d
+#: ../../tips.rst:7 ../../tips.rst:319 95bea35d0347495bb551fe9486bcd29d
 #: b64b7ed713b64f588ea7488c6d0b0441
 msgid "Custom 404 Pages"
 msgstr "自定义404页面"
@@ -373,11 +373,11 @@ msgstr ""
 "``\"publishconf.py\"`` 。"
 
 #: ../../tips.rst:211 ../../tips.rst:216 ../../tips.rst:223 ../../tips.rst:227
-#: ../../tips.rst:231 ../../tips.rst:237 ../../tips.rst:243
-#: 073e18d8ae29406eb05040d4e3a9ae60 7d43e6cfb091410ebec7464da05b61b4
-#: 8837cc8935f148fb80f05cc5d3d53629 b2da1f7640f948039230cd835c49accd
-#: bfe3d052cdc443bb81fed82e77acf3c1 c93816e00a254ef69c69f05833e8762b
-#: ee35302c7e034070af1d234ab919c32a
+#: ../../tips.rst:231 ../../tips.rst:237 ../../tips.rst:243 ../../tips.rst:249
+#: 073e18d8ae29406eb05040d4e3a9ae60 6932c9139d4f4da7a34601a9d78ee622
+#: 7d43e6cfb091410ebec7464da05b61b4 8837cc8935f148fb80f05cc5d3d53629
+#: b2da1f7640f948039230cd835c49accd bfe3d052cdc443bb81fed82e77acf3c1
+#: c93816e00a254ef69c69f05833e8762b ee35302c7e034070af1d234ab919c32a
 msgid "string"
 msgstr "string"
 
@@ -386,11 +386,12 @@ msgid "``requirements``"
 msgstr "``requirements``"
 
 #: ../../tips.rst:216 ../../tips.rst:223 ../../tips.rst:227 ../../tips.rst:231
-#: ../../tips.rst:237 ../../tips.rst:243 ../../tips.rst:249
-#: 197d6ee11fce4a50996a0c458cfdbdad 2086d667b9b1475cb0f002924cdfde12
-#: 25e940621f5b48c9af487d898d7f93cf 5664232c9fdd46c7b8278b8ecef8e3b1
+#: ../../tips.rst:237 ../../tips.rst:243 ../../tips.rst:249 ../../tips.rst:255
+#: ../../tips.rst:261 197d6ee11fce4a50996a0c458cfdbdad
+#: 2086d667b9b1475cb0f002924cdfde12 25e940621f5b48c9af487d898d7f93cf
+#: 3052432fbf5d420d8f6adbadb908e6f0 5664232c9fdd46c7b8278b8ecef8e3b1
 #: 6693126a0da74c61b67e14ca8e535ec3 7f8a93a2048140748fa73537bfae2a54
-#: 85fd40a29f31490bb23b20f05e574aaa
+#: 85fd40a29f31490bb23b20f05e574aaa 9d02d6e4689b4b55bdf832e18b0ed4bb
 msgid "No"
 msgstr "否"
 
@@ -429,46 +430,60 @@ msgid ""
 "``\"https://github.com/seanh/sidecar.git\"``"
 msgstr "要使用的自定义主题的GitHub仓库URL，例如： ``\"https://github.com/seanh/sidecar.git\"``"
 
-#: ../../tips.rst:227 d94f331173334fb2a84b1caadffb72df
+#: ../../tips.rst:227 ../../tips.rst:231 919c0e36e8ff40bcbcc4480081b49ce5
+#: d94f331173334fb2a84b1caadffb72df
 msgid "``\"\"``"
 msgstr "``\"\"``"
 
-#: ../../tips.rst:231 44ceb2743481486b95c1c739d543f15d
+#: ../../tips.rst:231 921a2ae610a84349a5654e204ba6b034
+msgid "``theme-checkout``"
+msgstr "``theme-checkout``"
+
+#: ../../tips.rst:231 7815b328b5f94ca496107881f5bb8aab
+msgid ""
+"Git ref (branch, tag or commit) of the theme repo to checkout. This can "
+"be used to pin the version of your theme. If not specified defaults to "
+"the theme repo's default branch."
+msgstr ""
+"主题仓库要checkout的Git引用 (branch, tag 或 commit)。这可以用于固定主题的版本。若未指定，"
+"使用仓库的默认branch。"
+
+#: ../../tips.rst:237 44ceb2743481486b95c1c739d543f15d
 msgid "``python``"
 msgstr "``python``"
 
-#: ../../tips.rst:231 4b5cddab44d24c7c8560e16991b784c7
+#: ../../tips.rst:237 4b5cddab44d24c7c8560e16991b784c7
 msgid ""
 "The version of Python to use to build the site, for example: ``\"3.12\"``"
 " (to use the most recent version of Python 3.12, this is faster) or "
 "``\"3.12.1\"`` (to use an exact version, slower)"
 msgstr "构建站点时使用的Python版本，例如： ``\"3.12\"`` 或 ``\"3.12.1\"``"
 
-#: ../../tips.rst:231 919c0e36e8ff40bcbcc4480081b49ce5
+#: ../../tips.rst:237 919c0e36e8ff40bcbcc4480081b49ce5
 msgid "``\"3.12\"``"
 msgstr "``\"3.12\"``"
 
-#: ../../tips.rst:237 842af56c539f4a74a97c7a5b1525eb35
+#: ../../tips.rst:243 842af56c539f4a74a97c7a5b1525eb35
 msgid "``siteurl``"
 msgstr "``siteurl``"
 
-#: ../../tips.rst:237 7fc0777d6e174d6f8d757926a61aa3c8
+#: ../../tips.rst:243 7fc0777d6e174d6f8d757926a61aa3c8
 msgid ""
 "The base URL of your web site (Pelican's ``SITEURL`` setting). If not "
 "passed this will default to the URL of your GitHub Pages site, which is "
 "correct in most cases."
 msgstr "站点的基URL，会用于配置项 ``SITEURL`` 。若未指定，默认值为GitHub Pages站点的URL，这适用于大部分情况。"
 
-#: ../../tips.rst:237 ../../tips.rst:243 082f65333e224d71817b82b1e4f515c4
+#: ../../tips.rst:243 ../../tips.rst:249 082f65333e224d71817b82b1e4f515c4
 #: 3d786e828a4745db849bdb8f47738db8
 msgid "The URL of your GitHub Pages site."
 msgstr "GitHub Pages站点的URL"
 
-#: ../../tips.rst:243 e5adb69f985547b7b3cc2bd3f31d4cc3
+#: ../../tips.rst:249 e5adb69f985547b7b3cc2bd3f31d4cc3
 msgid "``feed_domain``"
 msgstr "``feed_domain``"
 
-#: ../../tips.rst:243 c88f037c9f1f4148bef6347228257f7d
+#: ../../tips.rst:249 c88f037c9f1f4148bef6347228257f7d
 msgid ""
 "The domain to be prepended to feed URLs (Pelican's ``FEED_DOMAIN`` "
 "setting). If not passed this will default to the URL of your GitHub Pages"
@@ -477,72 +492,89 @@ msgstr ""
 "订阅源URL前要附加的域名，会用于配置项 ``FEED_DOMAIN`` 。若未指定，默认值为GitHub "
 "Pages站点的URL，这适用于大部分情况。"
 
-#: ../../tips.rst:249 358c5aa434cd4ad09beab02df88413d5
+#: ../../tips.rst:255 358c5aa434cd4ad09beab02df88413d5
 msgid "``deploy``"
 msgstr "``deploy``"
 
-#: ../../tips.rst:249 b8748aeace5a448d9382e225be98f90c
+#: ../../tips.rst:255 b8748aeace5a448d9382e225be98f90c
 msgid ""
 "This is used to determine whether you will deploy the site or not to "
 "GitHub Pages. This is most useful if you want to test a change to your "
 "website in a pull request before deploying those change."
 msgstr "此项配置用于表示是否要将站点部署至GitHub Pages。当对站点做了更改，并且在正式部署前进行测试，就可以用到此项。"
 
-#: ../../tips.rst:249 034006b9b71b4cb486f230b8aad873ce
+#: ../../tips.rst:255 ../../tips.rst:261 034006b9b71b4cb486f230b8aad873ce
 msgid "bool"
 msgstr "bool"
 
-#: ../../tips.rst:249 078ac613a8b74703af98c75bb5a007c1
+#: ../../tips.rst:255 078ac613a8b74703af98c75bb5a007c1
 msgid "``true``"
 msgstr "``true``"
 
-#: ../../tips.rst:257 e63cf881e3204be8b52ee5d8635ba4cf
+#: ../../tips.rst:261 842af56c539f4a74a97c7a5b1525eb35
+msgid "``stork``"
+msgstr "``stork``"
+
+#: ../../tips.rst:261 b8748aeace5a448d9382e225be98f90c
+msgid ""
+"This is used to determine whether Stork will be installed on the runner "
+"to be able to build a site with Stork search enabled"
+msgstr ""
+"此配置项用于指定是否要在runner中安装Stork搜索。"
+
+#: ../../tips.rst:261 358c5aa434cd4ad09beab02df88413d5
+msgid "``false``"
+msgstr "``false``"
+
+#: ../../tips.rst:267 e63cf881e3204be8b52ee5d8635ba4cf
 msgid "Testing Your Build in a GitHub Pull Request"
 msgstr "在Github拉取请求时进行测试"
 
-#: ../../tips.rst:259 a2f6bd3420eb46a08f54efda35a6eaf4
+#: ../../tips.rst:269 a2f6bd3420eb46a08f54efda35a6eaf4
 msgid ""
 "If you want to test your build in a pull request before deploying to "
 "GitHub, your workflow might look something like this:"
 msgstr "如果想在正式部署到 GitHub 前在PR中进行测试，下面是一个可用的 workflow 示例"
 
-#: ../../tips.rst:288 84393693279741efa82c5ee6b27cbd28
+#: ../../tips.rst:298 84393693279741efa82c5ee6b27cbd28
 msgid ""
 "The ``on`` section of the workflow defines the events that will trigger "
 "the workflow. In this example, the workflow will run on pushes to the "
 "main branch, pull requests to the main branch, and manual runs of the "
 "workflow."
-msgstr "工作流的 ``on`` 部分定义了工作流的触发器。在此示例中，工作流将在main分支收到push、有PR提起到主分支以及"
-"手动运行工作流时执行。"
+msgstr "工作流的 ``on`` 部分定义了工作流的触发器。在此示例中，工作流将在main分支收到push、有PR提起到主分支以及手动运行工作流时执行。"
 
-#: ../../tips.rst:290 cd3c13b2af974a32aa4291d07fc11e9c
+#: ../../tips.rst:300 cd3c13b2af974a32aa4291d07fc11e9c
 msgid ""
 "``workflow_dispatch`` defines the deploy boolean to be true by default. "
 "This means that if you run the workflow manually, it will deploy the "
 "site."
 msgstr "``workflow_dispatch`` 将 deploy 的默认值设为 true。也就是说当手动运行工作流时，更改的内容就会正式部署。"
 
-#: ../../tips.rst:292 5402cd211d5b4aa8a244c916bb381a5b
+#: ../../tips.rst:302 5402cd211d5b4aa8a244c916bb381a5b
 msgid ""
 "The ``deploy`` input for the job is using a set of standard GitHub "
 "workflow variables to control when ``deploy`` will either be true or "
 "false (you can customize this to your needs)."
-msgstr "job中的 ``deploy`` 使用了一些 GitHub workflow 变量来计算 ``deploy`` 值为 true 还是 false（您可以根据需要自定义）。"
+msgstr ""
+"job中的 ``deploy`` 使用了一些 GitHub workflow 变量来计算 ``deploy`` 值为 true 还是 "
+"false（您可以根据需要自定义）。"
 
-#: ../../tips.rst:294 d084908e3a0749f0b802b43626cfe2c4
+#: ../../tips.rst:304 d084908e3a0749f0b802b43626cfe2c4
 msgid ""
 "In this example, the ``deploy`` will be true if the event is a push to "
 "the main branch (or merging into main from a PR) or a manual run of the "
 "workflow. If the event is a pull request, the ``deploy`` will be false "
 "and it will only build an artifact for the site."
-msgstr "在此示例中，如果触发事件是推送到主分支（或从 PR 合并到主分支）或手动运行工作流，则 deploy 将为 true；"
-"如果触发事件只是Pull Request，则 ``deploy`` 将为 false，并且此时只会为站点构建一个artifact。"
+msgstr ""
+"在此示例中，如果触发事件是推送到主分支（或从 PR 合并到主分支）或手动运行工作流，则 deploy 将为 true；如果触发事件只是Pull "
+"Request，则 ``deploy`` 将为 false，并且此时只会为站点构建一个artifact。"
 
-#: ../../tips.rst:297 85e70fc3faa04208979f7bbe92b025ef
+#: ../../tips.rst:307 85e70fc3faa04208979f7bbe92b025ef
 msgid "\"Insecure content\" warnings from browsers"
 msgstr "浏览器报“不安全的内容（Insecure content）”警告"
 
-#: ../../tips.rst:299 34f7075cf31f416da2aeb529c616d97d
+#: ../../tips.rst:309 34f7075cf31f416da2aeb529c616d97d
 msgid ""
 "If your site uses ``https://`` and is broken because the browser is "
 "blocking network requests (for example for CSS files) due to \"insecure "
@@ -553,7 +585,7 @@ msgstr ""
 "时，可能会损坏，无法正常显示，这是由于浏览器阻拦了一些对“不安全内容”的网络请求。可能的原因之一是GitHub Pages给你的站点生成了 "
 "``http://`` URL。"
 
-#: ../../tips.rst:303 47271df82577424c8e2c31a9e76a553a
+#: ../../tips.rst:313 47271df82577424c8e2c31a9e76a553a
 msgid ""
 "To fix this go into your site repo's settings and enable the **Enforce "
 "HTTPS** setting: go to **Settings → Pages** and check **Enforce HTTPS**. "
@@ -564,7 +596,7 @@ msgstr ""
 "**Enforce HTTPS** ，接着再重新执行工作流以重新部署站点。也可以尝试通过配置 ``siteurl`` 与 "
 "``feed_domain`` 解决问题。"
 
-#: ../../tips.rst:311 e69189ef4a8440fb8940d8012b4f19d6
+#: ../../tips.rst:321 e69189ef4a8440fb8940d8012b4f19d6
 msgid ""
 "GitHub Pages will display the custom 404 page described above, as noted "
 "in the relevant `GitHub docs "
@@ -573,11 +605,11 @@ msgstr ""
 "如果按前述进行配置，GitHub Pages是能够正确显示自定义的404页面的，相关内容在 `GitHub的文档中 "
 "<https://help.github.com/articles/custom-404-pages/>`_ 也有提到。"
 
-#: ../../tips.rst:315 1b8c2457f44a4d61a033363830b8bd90
+#: ../../tips.rst:325 1b8c2457f44a4d61a033363830b8bd90
 msgid "Update your site on each commit"
 msgstr "在每次commit后都更新站点"
 
-#: ../../tips.rst:317 476dbdb670924c02a962e78d6a7854c1
+#: ../../tips.rst:327 476dbdb670924c02a962e78d6a7854c1
 msgid ""
 "To automatically update your Pelican site on each commit, you can create "
 "a post-commit hook. For example, you can add the following to "
@@ -586,11 +618,11 @@ msgstr ""
 "要想在每次commit后自动更新Pelican站点，你可以创建一个post-commit钩子。例如，可以将下面的内容保存为 "
 "``.git/hooks/post-commit`` ："
 
-#: ../../tips.rst:324 36dc5f05eaf84573acada36c59d8d2fc
+#: ../../tips.rst:334 36dc5f05eaf84573acada36c59d8d2fc
 msgid "Copy static files to the root of your site"
 msgstr "将静态文件拷贝到站点根目录"
 
-#: ../../tips.rst:326 4a0722ad68e944ee80e6378259cc1dd6
+#: ../../tips.rst:336 4a0722ad68e944ee80e6378259cc1dd6
 msgid ""
 "To use a `custom domain <https://help.github.com/articles/setting-up-a"
 "-custom-domain-with-pages>`_ with GitHub Pages, you need to put the "
@@ -605,11 +637,11 @@ msgstr ""
 "）添加到站点根目录的 ``CNAME`` 文件中。为此，请创建 ``content/extra/`` 目录，并在里面添加一个 ``CNAME`` "
 "文件。然后使用Pelican的 ``STATIC_PATHS`` 来告诉Pelican将此文件复制到输出目录："
 
-#: ../../tips.rst:337 8ad906848762400d9e2462034d151a16
+#: ../../tips.rst:347 8ad906848762400d9e2462034d151a16
 msgid "Note: use forward slashes, ``/``, even on Windows."
 msgstr "请注意：务必使用正斜杠 ``/`` ，在Windows上也是。"
 
-#: ../../tips.rst:339 7b109f4944064382babc9158567c8e82
+#: ../../tips.rst:349 7b109f4944064382babc9158567c8e82
 msgid ""
 "You can also use the ``EXTRA_PATH_METADATA`` mechanism to place a "
 "``favicon.ico`` or ``robots.txt`` at the root of any site."
@@ -617,17 +649,17 @@ msgstr ""
 "利用 ``EXTRA_PATH_METADATA`` 机制，你可以将 ``favicon.ico`` 或 ``robots.txt`` "
 "也拷贝到站点的根目录下。"
 
-#: ../../tips.rst:343 678eea0644b5400496ad9173d05368d5
+#: ../../tips.rst:353 678eea0644b5400496ad9173d05368d5
 msgid "How to add YouTube or Vimeo Videos"
 msgstr "如何添加YouTube或Vimeo视频"
 
-#: ../../tips.rst:345 ca57b327dd6b432d82cdc91193bde6bb
+#: ../../tips.rst:355 ca57b327dd6b432d82cdc91193bde6bb
 msgid ""
 "The easiest way is to paste the embed code of the video from these sites "
 "directly into your source content."
 msgstr "最简单的方法是将这些网站的视频嵌入代码直接粘贴到您的源内容文件中。"
 
-#: ../../tips.rst:348 0a4f27e2edbe494ab52f73595646986e
+#: ../../tips.rst:358 0a4f27e2edbe494ab52f73595646986e
 msgid ""
 "Alternatively, you can also use Pelican plugins like ``liquid_tags``, "
 "``pelican_youtube``, or ``pelican_vimeo`` to embed videos in your "
@@ -636,7 +668,7 @@ msgstr ""
 "或者，您还可以使用例如 ``liquid_tags`` 、``pelican_youtube`` 或 ``pelican_vimeo`` "
 "等Pelican插件将视频嵌入。"
 
-#: ../../tips.rst:351 e73517b72da347738421784b776b1f1c
+#: ../../tips.rst:361 e73517b72da347738421784b776b1f1c
 msgid ""
 "Moreover, markup languages like reST and Markdown have plugins that let "
 "you embed videos in the markup. You can use `reST video directive "
@@ -647,31 +679,31 @@ msgstr ""
 "<https://gist.github.com/dbrgn/2922648>`_ 或者 `Markdown的mdx_video插件 "
 "<https://github.com/italomaia/mdx-video>`_ 。"
 
-#: ../../tips.rst:358 b9d27cda716048b2ab7c13646d7faf09
+#: ../../tips.rst:368 b9d27cda716048b2ab7c13646d7faf09
 msgid "Develop Locally Using SSL"
 msgstr "在本地使用SSL进行开发"
 
-#: ../../tips.rst:360 50df9ec072aa47eabbae132fd8f5cb68
+#: ../../tips.rst:370 50df9ec072aa47eabbae132fd8f5cb68
 msgid "Here's how you can set up your local pelican server to support SSL."
 msgstr "以下描述了如何在本地Pelican服务器上配置SSL。"
 
-#: ../../tips.rst:362 9b5045375a874c4d9c29f7109f05c539
+#: ../../tips.rst:372 9b5045375a874c4d9c29f7109f05c539
 msgid ""
 "First, create a self-signed certificate and key using ``openssl`` (this "
 "creates ``cert.pem`` and ``key.pem``)::"
 msgstr "首先，通过 ``openssl`` 创建自签名的证书和密钥，这会生成 ``cert.pem`` 和 ``key.pem`` 文件："
 
-#: ../../tips.rst:366 2f1cfa536fc540f69d671f8a118769d7
+#: ../../tips.rst:376 2f1cfa536fc540f69d671f8a118769d7
 msgid ""
 "And use this command to launch the server (the server starts within your "
 "``output`` directory)::"
 msgstr "接着使用下面的命令来开启服务器（此服务器会在 ``output`` 目录下开启）："
 
-#: ../../tips.rst:370 029ea2b0e4fe4b0f814158ae33e3a8ff
+#: ../../tips.rst:380 029ea2b0e4fe4b0f814158ae33e3a8ff
 msgid "If you are using ``develop-server.sh``,  add this to the top::"
 msgstr "如果你使用的是 ``develop-server.sh`` 脚本，在脚本的开头添加："
 
-#: ../../tips.rst:375 c2784fdd9fdb433799d57f903d0e49d8
+#: ../../tips.rst:385 c2784fdd9fdb433799d57f903d0e49d8
 msgid "and modify the ``pelican.server`` line as follows::"
 msgstr "然后修改按照下述修改 ``pelican.server`` 一行："
 

From 8b4d7475ea9ee7f998f482ce6fc1f5267e12a73d Mon Sep 17 00:00:00 2001
From: Chris Rose <offline@offby1.net>
Date: Wed, 31 Dec 2025 08:45:17 -0800
Subject: [PATCH 2831/2864] dev: Switch from PDM to standard dev-dependencies

PDM supports this specification (per https://pdm-project.org/latest/usage/dependency/#add-development-only-dependencies) and this lets other frontends (uv, baby!) make use of the same dependencies.
---
 pyproject.toml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 09fcbdb6..f6cb125b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -59,24 +59,7 @@ pelican-plugins = "pelican.plugins._utils:list_plugins"
 pelican-quickstart = "pelican.tools.pelican_quickstart:main"
 pelican-themes = "pelican.tools.pelican_themes:main"
 
-[tool.autopub]
-project-name = "Pelican"
-git-username = "botpub"
-git-email = "52496925+botpub@users.noreply.github.com"
-changelog-file = "docs/changelog.rst"
-changelog-header = "###############"
-version-header = "="
-
-[tool.pdm]
-ignore_package_warnings = ["sphinx"]
-
-[tool.pdm.scripts]
-docbuild = "invoke docbuild"
-docserve = "invoke docserve"
-lint = "invoke lint"
-test = "invoke tests"
-
-[tool.pdm.dev-dependencies]
+[dependency-groups]
 dev = [
     "BeautifulSoup4>=4.13.3",
     "jinja2>=3.1.2",
@@ -100,6 +83,23 @@ dev = [
     "tomli>=2.0.1; python_version < \"3.11\"",
 ]
 
+[tool.autopub]
+project-name = "Pelican"
+git-username = "botpub"
+git-email = "52496925+botpub@users.noreply.github.com"
+changelog-file = "docs/changelog.rst"
+changelog-header = "###############"
+version-header = "="
+
+[tool.pdm]
+ignore_package_warnings = ["sphinx"]
+
+[tool.pdm.scripts]
+docbuild = "invoke docbuild"
+docserve = "invoke docserve"
+lint = "invoke lint"
+test = "invoke tests"
+
 [tool.pdm.build]
 source-includes = [
     "CONTRIBUTING.rst",

From 4444f99c179e44984eef905617e9cfd34b639df0 Mon Sep 17 00:00:00 2001
From: Sam Bull <git@sambull.org>
Date: Thu, 19 Feb 2026 22:58:11 +0000
Subject: [PATCH 2832/2864] Don't render 'By' if no authors

---
 pelican/themes/simple/templates/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index 97caac6a..5eabc244 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -11,11 +11,13 @@
             <section>{{ article.summary }}</section>
             <footer>
                 <p>Published: <time datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }} </time></p>
+                {%- if article.authors %}
                 <address>By
                     {% for author in article.authors %}
                         <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
                     {% endfor %}
                 </address>
+                {%- endif %}
             </footer>
         </article>
     {% endfor %}

From d9b76ac0e7c348c198d0a1ff00ab467624f812c0 Mon Sep 17 00:00:00 2001
From: nkr <42086312+nkr0@users.noreply.github.com>
Date: Tue, 7 Oct 2025 03:06:13 +0200
Subject: [PATCH 2833/2864] Use a city closer to the equator and that does not
 use daylight savings in tests

---
 pelican/tests/test_utils.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 95bf197a..2d370c64 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -64,8 +64,13 @@ class TestUtils(LoggedTestCase):
         date_hour_z = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11, tzinfo=timezone.utc
         )
-        date_hour_est = utils.SafeDatetime(
-            year=2012, month=11, day=22, hour=22, minute=11, tzinfo=ZoneInfo("EST")
+        date_hour_wib = utils.SafeDatetime(
+            year=2012,
+            month=11,
+            day=22,
+            hour=22,
+            minute=11,
+            tzinfo=ZoneInfo("Asia/Jakarta"),
         )
         date_hour_sec = utils.SafeDatetime(
             year=2012, month=11, day=22, hour=22, minute=11, second=10
@@ -79,14 +84,14 @@ class TestUtils(LoggedTestCase):
             second=10,
             tzinfo=timezone.utc,
         )
-        date_hour_sec_est = utils.SafeDatetime(
+        date_hour_sec_wib = utils.SafeDatetime(
             year=2012,
             month=11,
             day=22,
             hour=22,
             minute=11,
             second=10,
-            tzinfo=ZoneInfo("EST"),
+            tzinfo=ZoneInfo("Asia/Jakarta"),
         )
         date_hour_sec_frac_z = utils.SafeDatetime(
             year=2012,
@@ -108,10 +113,10 @@ class TestUtils(LoggedTestCase):
             "22.11.2012": date,
             "22.11.2012 22:11": date_hour,
             "2012-11-22T22:11Z": date_hour_z,
-            "2012-11-22T22:11-0500": date_hour_est,
+            "2012-11-22T22:11+0700": date_hour_wib,
             "2012-11-22 22:11:10": date_hour_sec,
             "2012-11-22T22:11:10Z": date_hour_sec_z,
-            "2012-11-22T22:11:10-0500": date_hour_sec_est,
+            "2012-11-22T22:11:10+0700": date_hour_sec_wib,
             "2012-11-22T22:11:10.123Z": date_hour_sec_frac_z,
         }
 

From e78a555fff7e3474a759fdcf40df6debc1788f62 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 30 Mar 2026 10:59:20 +0200
Subject: [PATCH 2834/2864] fix: Appease linter

---
 pelican/themes/simple/templates/index.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index 5eabc244..100a7200 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -12,11 +12,11 @@
             <footer>
                 <p>Published: <time datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }} </time></p>
                 {%- if article.authors %}
-                <address>By
-                    {% for author in article.authors %}
-                        <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
-                    {% endfor %}
-                </address>
+                    <address>By
+                        {% for author in article.authors %}
+                            <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
+                        {% endfor %}
+                    </address>
                 {%- endif %}
             </footer>
         </article>

From c495634138bba98d0e64cfcea0ad7b60ec74dbfe Mon Sep 17 00:00:00 2001
From: Jan <jan@demter.de>
Date: Mon, 30 Mar 2026 11:03:31 +0200
Subject: [PATCH 2835/2864] Add `SSH_PORT` to `sftp_upload` in Makefile
 template

---
 pelican/tools/templates/Makefile.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/tools/templates/Makefile.jinja2 b/pelican/tools/templates/Makefile.jinja2
index 67571b47..467b1976 100644
--- a/pelican/tools/templates/Makefile.jinja2
+++ b/pelican/tools/templates/Makefile.jinja2
@@ -128,7 +128,7 @@ ssh_upload: publish
 
 {% set upload = upload + ["sftp_upload"] %}
 sftp_upload: publish
-	printf 'put -r $(OUTPUTDIR)/*' | sftp $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+	printf 'put -r $(OUTPUTDIR)/*' | sftp -P $(SSH_PORT) $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
 {% set upload = upload + ["rsync_upload"] %}
 rsync_upload: publish

From 862ac78310d45532f582ee76c2210d26e734e194 Mon Sep 17 00:00:00 2001
From: Sam Bull <git@sambull.org>
Date: Mon, 30 Mar 2026 12:04:55 +0100
Subject: [PATCH 2836/2864] Add `page_content` block for better template
 inheritance

---
 pelican/themes/simple/templates/page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/themes/simple/templates/page.html b/pelican/themes/simple/templates/page.html
index 0eefc7e3..4096e7a4 100644
--- a/pelican/themes/simple/templates/page.html
+++ b/pelican/themes/simple/templates/page.html
@@ -20,7 +20,7 @@
     {% import 'translations.html' as translations with context %}
     {{ translations.translations_for(page) }}
 
-    {{ page.content }}
+    {% block page_content %}{{ page.content }}{% endblock page_content %}
 
     {% if page.modified %}
       <footer>

From 68c341bd105ae9329fbae30ebd37be7751bc848e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 31 Mar 2026 08:48:50 +0200
Subject: [PATCH 2837/2864] refactor: Require Python 3.11 and above

---
 .github/workflows/main.yml | 2 +-
 .readthedocs.yaml          | 2 +-
 pyproject.toml             | 3 +--
 tox.ini                    | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 14b8ee90..06d90677 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu, macos, windows]
-        python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        python: ["3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - uses: actions/checkout@v6
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index b18ff005..cd5f2060 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -9,7 +9,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.10"
+    python: "3.11"
 
 # Build HTML & PDF formats
 formats:
diff --git a/pyproject.toml b/pyproject.toml
index f6cb125b..8ea92e34 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,6 @@ classifiers = [
     "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -27,7 +26,7 @@ classifiers = [
     "Topic :: Text Processing :: Markup :: HTML",
     "Topic :: Text Processing :: Markup :: reStructuredText",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
     "blinker>=1.7.0",
     "docutils>=0.20.1",
diff --git a/tox.ini b/tox.ini
index 2b91bff4..fee8f38d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py{3.10,3.11,3.12,3.13,3.14},docs
+envlist = py{3.11,3.12,3.13,3.14},docs
 
 [testenv]
 basepython =
-    py3.10: python3.10
     py3.11: python3.11
     py3.12: python3.12
     py3.13: python3.13

From 74feb7c48b53372c4eb3a027609b3b2b19697fa4 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 31 Mar 2026 08:56:27 +0200
Subject: [PATCH 2838/2864] refactor: Upgrade code for Python 3.11 and above

---
 docs/conf.py                    |  9 ++-------
 pelican/contents.py             |  2 +-
 pelican/tests/test_utils.py     |  8 ++++----
 pelican/tools/pelican_import.py | 12 ++++++------
 requirements/docs.pip           |  1 -
 5 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index e335e73c..77c49bcb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -2,12 +2,7 @@ import datetime
 import os
 import sys
 import time
-
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    import tomli as tomllib
-
+import tomllib
 
 sys.path.append(os.path.abspath(os.pardir))
 
@@ -32,7 +27,7 @@ source_suffix = ".rst"
 master_doc = "index"
 project = project_data.get("name").upper()
 year = datetime.datetime.fromtimestamp(
-    int(os.environ.get("SOURCE_DATE_EPOCH", time.time())), datetime.timezone.utc
+    int(os.environ.get("SOURCE_DATE_EPOCH", time.time())), datetime.UTC
 ).year
 project_copyright = f"2010–{year}"  # noqa: RUF001
 exclude_patterns = ["_build"]
diff --git a/pelican/contents.py b/pelican/contents.py
index 8494145a..3d9e086c 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -590,7 +590,7 @@ class Article(Content):
             if self.date.tzinfo is None:
                 now = datetime.datetime.now()
             else:
-                now = datetime.datetime.now(datetime.timezone.utc)
+                now = datetime.datetime.now(datetime.UTC)
             if self.date > now:
                 self.status = "draft"
 
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 2d370c64..b5a53eac 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -2,7 +2,7 @@ import locale
 import logging
 import os
 import shutil
-from datetime import timezone
+from datetime import UTC
 from sys import platform
 from tempfile import mkdtemp
 
@@ -62,7 +62,7 @@ class TestUtils(LoggedTestCase):
         date = utils.SafeDatetime(year=2012, month=11, day=22)
         date_hour = utils.SafeDatetime(year=2012, month=11, day=22, hour=22, minute=11)
         date_hour_z = utils.SafeDatetime(
-            year=2012, month=11, day=22, hour=22, minute=11, tzinfo=timezone.utc
+            year=2012, month=11, day=22, hour=22, minute=11, tzinfo=UTC
         )
         date_hour_wib = utils.SafeDatetime(
             year=2012,
@@ -82,7 +82,7 @@ class TestUtils(LoggedTestCase):
             hour=22,
             minute=11,
             second=10,
-            tzinfo=timezone.utc,
+            tzinfo=UTC,
         )
         date_hour_sec_wib = utils.SafeDatetime(
             year=2012,
@@ -101,7 +101,7 @@ class TestUtils(LoggedTestCase):
             minute=11,
             second=10,
             microsecond=123000,
-            tzinfo=timezone.utc,
+            tzinfo=UTC,
         )
         dates = {
             "2012-11-22": date,
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index bd349ac9..1c03f9c9 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -446,13 +446,13 @@ def tumblr2fields(api_key, blogname):
             slug = post.get("slug") or slugify(title, regex_subs=subs)
             tags = post.get("tags")
             timestamp = post.get("timestamp")
-            date = SafeDatetime.fromtimestamp(
-                int(timestamp), tz=datetime.timezone.utc
-            ).strftime("%Y-%m-%d %H:%M:%S%z")
+            date = SafeDatetime.fromtimestamp(int(timestamp), tz=datetime.UTC).strftime(
+                "%Y-%m-%d %H:%M:%S%z"
+            )
             slug = (
-                SafeDatetime.fromtimestamp(
-                    int(timestamp), tz=datetime.timezone.utc
-                ).strftime("%Y-%m-%d-")
+                SafeDatetime.fromtimestamp(int(timestamp), tz=datetime.UTC).strftime(
+                    "%Y-%m-%d-"
+                )
                 + slug
             )
             post_format = post.get("format")
diff --git a/requirements/docs.pip b/requirements/docs.pip
index 4c16c84a..4684ff8e 100644
--- a/requirements/docs.pip
+++ b/requirements/docs.pip
@@ -3,4 +3,3 @@ sphinxext-opengraph
 furo==2023.9.10
 livereload
 matplotlib
-tomli;python_version<"3.11"

From d50abb7319efdd6143de768ba8b3cdba2ce1784e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 31 Mar 2026 08:59:28 +0200
Subject: [PATCH 2839/2864] chore: Require docutils 0.22 and above

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8ea92e34..cbd16ef8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,7 +29,7 @@ classifiers = [
 requires-python = ">=3.11"
 dependencies = [
     "blinker>=1.7.0",
-    "docutils>=0.20.1",
+    "docutils>=0.22.0",
     "feedgenerator>=2.1.0",
     "jinja2>=3.1.2",
     "ordered-set>=4.1.0",

From de6df5ef7a781237d248d8fdecfe62d67ac578cf Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Tue, 31 Mar 2026 09:05:37 +0200
Subject: [PATCH 2840/2864] chore: Require Sphinx 9.0 and above

---
 pyproject.toml        | 4 ++--
 requirements/docs.pip | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index cbd16ef8..236a47fb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -65,9 +65,9 @@ dev = [
     "lxml>=4.9.3",
     "markdown>=3.5.1",
     "typogrify>=2.1.0",
-    "sphinx>=7.1.2",
+    "sphinx>=9.0.0",
     "sphinxext-opengraph>=0.9.0",
-    "furo==2025.9.25",
+    "furo==2025.12.19",
     "livereload>=2.6.3",
     "psutil>=5.9.6",
     "pygments>=2.16.1,<2.20.0",
diff --git a/requirements/docs.pip b/requirements/docs.pip
index 4684ff8e..2f895ae4 100644
--- a/requirements/docs.pip
+++ b/requirements/docs.pip
@@ -1,5 +1,5 @@
 sphinx
 sphinxext-opengraph
-furo==2023.9.10
+furo==2025.12.19
 livereload
 matplotlib

From 77e88ae3f25f3c6eab3e45b5dc05b6fdaefdae77 Mon Sep 17 00:00:00 2001
From: Yash Srivastava <yashaqua@gmail.com>
Date: Sun, 5 Apr 2026 23:51:51 +0530
Subject: [PATCH 2841/2864] fix: Move `livereload` import inside `docserve()`
 task

This fixes `invoke setup` failing in fresh virtual environments.
The top-level import of `livereload` caused tasks.py to fail before any
task could execute, since `livereload` is a development dependency only
installed by PDM as part of the setup task.
---
 tasks.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tasks.py b/tasks.py
index a879d2bd..a1e0ac78 100644
--- a/tasks.py
+++ b/tasks.py
@@ -3,7 +3,6 @@ from pathlib import Path
 from shutil import which
 
 from invoke import task
-from livereload import Server
 
 PKG_NAME = "pelican"
 PKG_PATH = Path(PKG_NAME)
@@ -30,6 +29,8 @@ def docbuild(c):
 @task(docbuild)
 def docserve(c):
     """Serve docs at http://localhost:$DOCS_PORT/ (default port is 8000)"""
+    from livereload import Server  # noqa: PLC0415
+
     server = Server()
     server.watch("docs/conf.py", lambda: docbuild(c))
     server.watch("CONTRIBUTING.rst", lambda: docbuild(c))

From 70767ca8bae9df1519fec6fae0ba7890eb3c0cd5 Mon Sep 17 00:00:00 2001
From: Sam Bull <git@sambull.org>
Date: Mon, 13 Apr 2026 10:11:12 +0100
Subject: [PATCH 2842/2864] fix: Don't log feed warning if `FEED_DOMAIN` is set

---
 pelican/settings.py            |  5 +++--
 pelican/tests/test_settings.py | 37 +++++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 98b1357e..dbe903f1 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -673,9 +673,10 @@ def configure_settings(settings: Settings) -> Settings:
     ]
 
     if any(settings.get(k) for k in feed_keys):
-        if not settings.get("SITEURL"):
+        if not (settings.get("SITEURL") or settings.get("FEED_DOMAIN")):
             logger.warning(
-                "Feeds generated without SITEURL set properly may not be valid"
+                "Feeds generated without SITEURL or FEED_DOMAIN set properly"
+                " may not be valid"
             )
 
     if "TIMEZONE" not in settings:
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 84f7a5c9..59eebd53 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -1,8 +1,10 @@
 import copy
 import locale
+import logging
 import os
 from os.path import abspath, dirname, join
 
+from pelican import log
 from pelican.settings import (
     DEFAULT_CONFIG,
     DEFAULT_THEME,
@@ -11,7 +13,7 @@ from pelican.settings import (
     handle_deprecated_settings,
     read_settings,
 )
-from pelican.tests.support import unittest
+from pelican.tests.support import LogCountHandler, unittest
 
 
 class TestSettingsConfiguration(unittest.TestCase):
@@ -108,6 +110,39 @@ class TestSettingsConfiguration(unittest.TestCase):
         configure_settings(settings)
         self.assertEqual(settings["FEED_DOMAIN"], "http://feeds.example.com")
 
+    def _feeds_warning_settings(self, **overrides):
+        base = {
+            "LOCALE": "",
+            "PATH": os.curdir,
+            "THEME": DEFAULT_THEME,
+            "FEED_RSS": "feeds/all.rss.xml",
+        }
+        base.update(overrides)
+        handler = LogCountHandler()
+        logger = logging.getLogger()
+        logger.addHandler(handler)
+        saved = log.LimitFilter._raised_messages.copy()
+        log.LimitFilter._raised_messages = set()
+        try:
+            configure_settings(base)
+            return handler.count_logs(
+                "Feeds generated without SITEURL", logging.WARNING
+            )
+        finally:
+            log.LimitFilter._raised_messages = saved
+            logger.removeHandler(handler)
+
+    def test_feeds_warning_with_siteurl(self):
+        self.assertEqual(self._feeds_warning_settings(SITEURL="http://example.com"), 0)
+
+    def test_feeds_warning_with_feed_domain(self):
+        self.assertEqual(
+            self._feeds_warning_settings(FEED_DOMAIN="http://feeds.example.com"), 0
+        )
+
+    def test_feeds_warning_without_siteurl_or_feed_domain(self):
+        self.assertEqual(self._feeds_warning_settings(), 1)
+
     def test_theme_settings_exceptions(self):
         settings = self.settings
 

From ca460ee75374544680e120dfb302de92eac2ac6a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 13 Apr 2026 17:33:58 +0200
Subject: [PATCH 2843/2864] Ensure `URLWrapper.__str__()` returns a string

This could otherwise cause an error if a setting, such as `AUTHOR`, was
set to `None`.
---
 pelican/urlwrappers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 8023613c..6edfbe2e 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -95,7 +95,7 @@ class URLWrapper:
         return False
 
     def __str__(self):
-        return self.name
+        return self.name or ""
 
     def __repr__(self):
         return f"<{type(self).__name__} {self._name!r}>"

From a2570498ba5b49b2221131f6ff701f9d94933475 Mon Sep 17 00:00:00 2001
From: Sam Bull <git@sambull.org>
Date: Mon, 13 Apr 2026 16:59:46 +0100
Subject: [PATCH 2844/2864] Use slug in category/tag feed title

---
 pelican/tests/test_theme.py               | 30 +++++++++++++++++++++++
 pelican/themes/simple/templates/base.html |  8 +++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/pelican/tests/test_theme.py b/pelican/tests/test_theme.py
index 0070078a..25d23b97 100644
--- a/pelican/tests/test_theme.py
+++ b/pelican/tests/test_theme.py
@@ -133,6 +133,36 @@ class TestTemplateInheritance(LoggedTestCase):
         self.assertNotIn("Proudly powered by", content)
         self.assertIn("New footer", content)
 
+    def test_category_and_tag_feed_titles_use_slug(self):
+        """Feed link titles on category/tag pages should have unique titles."""
+
+        settings = read_settings(
+            path=None,
+            override={
+                "THEME": "simple",
+                "PATH": CONTENT_DIR,
+                "OUTPUT_PATH": self.temp_output,
+                "CACHE_PATH": self.temp_cache,
+                "SITEURL": "http://example.com",
+                "SITENAME": "My Site",
+                "CATEGORY_FEED_ATOM": "feeds/{slug}.atom.xml",
+                "TAG_FEED_ATOM": "feeds/tag-{slug}.atom.xml",
+            },
+        )
+
+        pelican = Pelican(settings=settings)
+        mute(True)(pelican.run)()
+
+        cat_file = os.path.join(self.temp_output, "category", "test.html")
+        with open(cat_file) as f:
+            cat_content = f.read()
+        self.assertIn('title="Test Category Atom Feed"', cat_content)
+
+        tag_file = os.path.join(self.temp_output, "tag", "foo.html")
+        with open(tag_file) as f:
+            tag_content = f.read()
+        self.assertIn('title="Foo Tag Atom Feed"', tag_content)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 491a5903..57d2bafd 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -25,16 +25,16 @@
         <link href="{{ FEED_DOMAIN }}/{% if FEED_RSS_URL %}{{ FEED_RSS_URL }}{% else %}{{ FEED_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} RSS Feed" />
       {% endif %}
       {% if CATEGORY_FEED_ATOM and category %}
-        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_ATOM.format(slug=category.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Categories Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_ATOM.format(slug=category.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ category.slug.title() }} Category Atom Feed" />
       {% endif %}
       {% if CATEGORY_FEED_RSS and category %}
-        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_RSS_URL %}{{ CATEGORY_FEED_RSS_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_RSS.format(slug=category.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} Categories RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_RSS_URL %}{{ CATEGORY_FEED_RSS_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_RSS.format(slug=category.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ category.slug.title() }} Category RSS Feed" />
       {% endif %}
       {% if TAG_FEED_ATOM and tag %}
-        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_ATOM.format(slug=tag.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} Tags Atom Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_ATOM.format(slug=tag.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ tag.slug.title() }} Tag Atom Feed" />
       {% endif %}
       {% if TAG_FEED_RSS and tag %}
-        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_RSS.format(slug=tag.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} Tags RSS Feed" />
+        <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_RSS.format(slug=tag.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ tag.slug.title() }} Tag RSS Feed" />
       {% endif %}
     {% endblock head %}
   </head>

From 9f62408cdc7d580148db36eecd1bb65f9891a434 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Mon, 11 Dec 2023 22:00:35 -0700
Subject: [PATCH 2845/2864] If it fails to write a tag/catetory/author page,
 tell us which one we failed on

---
 pelican/generators.py | 90 ++++++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 39 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 3b867dfb..d17120f3 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -570,57 +570,69 @@ class ArticlesGenerator(CachingGenerator):
         tag_template = self.get_template("tag")
         for tag, articles in self.tags.items():
             dates = [article for article in self.dates if article in articles]
-            write(
-                tag.save_as,
-                tag_template,
-                self.context,
-                tag=tag,
-                url=tag.url,
-                articles=articles,
-                dates=dates,
-                template_name="tag",
-                blog=True,
-                page_name=tag.page_name,
-                all_articles=self.articles,
-            )
+            try:
+                write(
+                    tag.save_as,
+                    tag_template,
+                    self.context,
+                    tag=tag,
+                    url=tag.url,
+                    articles=articles,
+                    dates=dates,
+                    template_name="tag",
+                    blog=True,
+                    page_name=tag.page_name,
+                    all_articles=self.articles,
+                )
+            except RuntimeError as e:
+                logger.error('Trying to write Tag page for "%s".' % (tag))
+                raise e
 
     def generate_categories(self, write):
         """Generate category pages."""
         category_template = self.get_template("category")
         for cat, articles in self.categories:
             dates = [article for article in self.dates if article in articles]
-            write(
-                cat.save_as,
-                category_template,
-                self.context,
-                url=cat.url,
-                category=cat,
-                articles=articles,
-                dates=dates,
-                template_name="category",
-                blog=True,
-                page_name=cat.page_name,
-                all_articles=self.articles,
-            )
+            try:
+                write(
+                    cat.save_as,
+                    category_template,
+                    self.context,
+                    url=cat.url,
+                    category=cat,
+                    articles=articles,
+                    dates=dates,
+                    template_name="category",
+                    blog=True,
+                    page_name=cat.page_name,
+                    all_articles=self.articles,
+                )
+            except RuntimeError as e:
+                logger.error('Trying to write Category page for "%s".' % (cat))
+                raise e
 
     def generate_authors(self, write):
         """Generate Author pages."""
         author_template = self.get_template("author")
         for aut, articles in self.authors:
             dates = [article for article in self.dates if article in articles]
-            write(
-                aut.save_as,
-                author_template,
-                self.context,
-                url=aut.url,
-                author=aut,
-                articles=articles,
-                dates=dates,
-                template_name="author",
-                blog=True,
-                page_name=aut.page_name,
-                all_articles=self.articles,
-            )
+            try:
+                write(
+                    aut.save_as,
+                    author_template,
+                    self.context,
+                    url=aut.url,
+                    author=aut,
+                    articles=articles,
+                    dates=dates,
+                    template_name="author",
+                    blog=True,
+                    page_name=aut.page_name,
+                    all_articles=self.articles,
+                )
+            except RuntimeError as e:
+                logger.error('Trying to write Author page for "%s".' % (aut))
+                raise e
 
     def generate_drafts(self, write):
         """Generate drafts pages."""

From b4e2d6cc1f198172d793c674e9075c127e5e91a9 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Tue, 12 Dec 2023 20:02:27 -0700
Subject: [PATCH 2846/2864] Better error message on bad slug

---
 pelican/generators.py | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index d17120f3..08a20095 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -584,9 +584,16 @@ class ArticlesGenerator(CachingGenerator):
                     page_name=tag.page_name,
                     all_articles=self.articles,
                 )
-            except RuntimeError as e:
-                logger.error('Trying to write Tag page for "%s".' % (tag))
-                raise e
+            except RuntimeError:
+                if not tag.slug:
+                    logger.warning(
+                        'Tag "%s" has an invalid slug; skipping writing tag page...',
+                        tag,
+                    )
+                    continue
+                else:
+                    logger.error('Failed to write Tag page for "%s".', tag)
+                    raise
 
     def generate_categories(self, write):
         """Generate category pages."""
@@ -607,9 +614,16 @@ class ArticlesGenerator(CachingGenerator):
                     page_name=cat.page_name,
                     all_articles=self.articles,
                 )
-            except RuntimeError as e:
-                logger.error('Trying to write Category page for "%s".' % (cat))
-                raise e
+            except RuntimeError:
+                if not cat.slug:
+                    logger.warning(
+                        'Category "%s" has an invalid slug; skipping writing category page...',
+                        cat,
+                    )
+                    continue
+                else:
+                    logger.error('Failed to write Category page for "%s".', cat)
+                    raise
 
     def generate_authors(self, write):
         """Generate Author pages."""
@@ -630,9 +644,16 @@ class ArticlesGenerator(CachingGenerator):
                     page_name=aut.page_name,
                     all_articles=self.articles,
                 )
-            except RuntimeError as e:
-                logger.error('Trying to write Author page for "%s".' % (aut))
-                raise e
+            except RuntimeError:
+                if not aut.slug:
+                    logger.warning(
+                        'Author "%s" has an invalid slug; skipping writing author page...',
+                        aut,
+                    )
+                    continue
+                else:
+                    logger.error('Failed to write Author page for "%s".', aut)
+                    raise
 
     def generate_drafts(self, write):
         """Generate drafts pages."""

From b70e61098440ccb675e2200dce9ae1fd738adbb3 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Wed, 27 Dec 2023 15:39:51 -0700
Subject: [PATCH 2847/2864] Log warnings on creating (tag) slugs directly

---
 pelican/generators.py  | 9 ++++++---
 pelican/urlwrappers.py | 9 ++++++++-
 pelican/utils.py       | 2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 08a20095..65fcb9c3 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -586,9 +586,10 @@ class ArticlesGenerator(CachingGenerator):
                 )
             except RuntimeError:
                 if not tag.slug:
-                    logger.warning(
+                    logger.info(
                         'Tag "%s" has an invalid slug; skipping writing tag page...',
                         tag,
+                        extra={"limit_msg": "Further tags with invalid slugs."},
                     )
                     continue
                 else:
@@ -616,9 +617,10 @@ class ArticlesGenerator(CachingGenerator):
                 )
             except RuntimeError:
                 if not cat.slug:
-                    logger.warning(
+                    logger.info(
                         'Category "%s" has an invalid slug; skipping writing category page...',
                         cat,
+                        extra={"limit_msg": "Further categories with invalid slugs."},
                     )
                     continue
                 else:
@@ -646,9 +648,10 @@ class ArticlesGenerator(CachingGenerator):
                 )
             except RuntimeError:
                 if not aut.slug:
-                    logger.warning(
+                    logger.info(
                         'Author "%s" has an invalid slug; skipping writing author page...',
                         aut,
+                        extra={"limit_msg": "Further authors with invalid slugs."},
                     )
                     continue
                 else:
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 6edfbe2e..6eb952db 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -42,11 +42,18 @@ class URLWrapper:
                 preserve_case=preserve_case,
                 use_unicode=self.settings.get("SLUGIFY_USE_UNICODE", False),
             )
+            if not self._slug:
+                logger.warning(
+                    'Unable to generate valid slug for %s "%s".',
+                    self.__class__.__name__,
+                    self.name,
+                    extra={"limit_msg": "Other invalid slugs."},
+                )
         return self._slug
 
     @slug.setter
     def slug(self, slug):
-        # if slug is expliticly set, changing name won't alter slug
+        # if slug is explicitly set, changing name won't alter slug
         self._slug_from_name = False
         self._slug = slug
 
diff --git a/pelican/utils.py b/pelican/utils.py
index a5e08538..c17422aa 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -259,7 +259,7 @@ def slugify(
     Normalizes string, converts to lowercase, removes non-alpha characters,
     and converts spaces to hyphens.
 
-    Took from Django sources.
+    Taken from Django sources.
 
     For a set of sensible default regex substitutions to pass to regex_subs
     look into pelican.settings.DEFAULT_CONFIG['SLUG_REGEX_SUBSTITUTIONS'].

From 6e3c51fd21a7c6a2e040341dd48413a03c84f90f Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Tue, 31 Mar 2026 19:24:32 -0600
Subject: [PATCH 2848/2864] Use custom exception for (failing to) overwrite
 files

---
 pelican/generators.py |  7 ++++---
 pelican/writers.py    | 10 ++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 65fcb9c3..b7eef104 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -30,6 +30,7 @@ from pelican.utils import (
     posixize_path,
     process_translations,
 )
+from pelican.writers import FileOverwriteFailedError
 
 logger = logging.getLogger(__name__)
 
@@ -584,7 +585,7 @@ class ArticlesGenerator(CachingGenerator):
                     page_name=tag.page_name,
                     all_articles=self.articles,
                 )
-            except RuntimeError:
+            except FileOverwriteFailedError:
                 if not tag.slug:
                     logger.info(
                         'Tag "%s" has an invalid slug; skipping writing tag page...',
@@ -615,7 +616,7 @@ class ArticlesGenerator(CachingGenerator):
                     page_name=cat.page_name,
                     all_articles=self.articles,
                 )
-            except RuntimeError:
+            except FileOverwriteFailedError:
                 if not cat.slug:
                     logger.info(
                         'Category "%s" has an invalid slug; skipping writing category page...',
@@ -646,7 +647,7 @@ class ArticlesGenerator(CachingGenerator):
                     page_name=aut.page_name,
                     all_articles=self.articles,
                 )
-            except RuntimeError:
+            except FileOverwriteFailedError:
                 if not aut.slug:
                     logger.info(
                         'Author "%s" has an invalid slug; skipping writing author page...',
diff --git a/pelican/writers.py b/pelican/writers.py
index 009d761a..07aa6d42 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -18,6 +18,10 @@ from pelican.utils import (
 logger = logging.getLogger(__name__)
 
 
+class FileOverwriteFailedError(RuntimeError):
+    """Failed to overwrite an existing file."""
+
+
 class Writer:
     def __init__(self, output_path, settings=None):
         self.output_path = output_path
@@ -107,14 +111,16 @@ class Writer:
         """
         if filename in self._overridden_files:
             if override:
-                raise RuntimeError(f"File {filename} is set to be overridden twice")
+                raise FileOverwriteFailedError(
+                    f"File {filename} is set to be overridden twice"
+                )
             logger.info("Skipping %s", filename)
             filename = os.devnull
         elif filename in self._written_files:
             if override:
                 logger.info("Overwriting %s", filename)
             else:
-                raise RuntimeError(f"File {filename} is to be overwritten")
+                raise FileOverwriteFailedError(f"File {filename} is to be overwritten")
         if override:
             self._overridden_files.add(filename)
         self._written_files.add(filename)

From 871aa779d0980902d1ff06e3a51a0676c708b91f Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Sat, 4 Apr 2026 09:58:26 -0600
Subject: [PATCH 2849/2864] Better error messages with trying to (and failing)
 to overwrite files

---
 pelican/writers.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index 07aa6d42..67d52ecd 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -112,15 +112,19 @@ class Writer:
         if filename in self._overridden_files:
             if override:
                 raise FileOverwriteFailedError(
-                    f"File {filename} is set to be overridden twice"
+                    f'Failed to overwrite "{filename}" a second time '
+                    "(was previously overwritten)"
                 )
-            logger.info("Skipping %s", filename)
+            logger.info('Skipping "%s", not overwriting', filename)
             filename = os.devnull
         elif filename in self._written_files:
             if override:
-                logger.info("Overwriting %s", filename)
+                logger.info('Overwriting "%s"', filename)
             else:
-                raise FileOverwriteFailedError(f"File {filename} is to be overwritten")
+                raise FileOverwriteFailedError(
+                    f'Failed to overwrite "{filename}" as Pelican has already '
+                    "written to it previously (set `override=True` if intended)"
+                )
         if override:
             self._overridden_files.add(filename)
         self._written_files.add(filename)
@@ -171,7 +175,7 @@ class Writer:
 
             with self._open_w(complete_path, "utf-8", override_output) as fp:
                 feed.write(fp, "utf-8")
-                logger.info("Writing %s", complete_path)
+                logger.info('Writing "%s"', complete_path)
 
             signals.feed_written.send(complete_path, context=context, feed=feed)
         return feed
@@ -222,7 +226,7 @@ class Writer:
 
             with self._open_w(path, "utf-8", override=override) as f:
                 f.write(output)
-            logger.info("Writing %s", path)
+            logger.info('Writing "%s"', path)
 
             # Send a signal to say we're writing a file with some specific
             # local context.

From 24350502c77b95d4bdf5d2e29d055027930c5752 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Mon, 6 Apr 2026 15:13:07 -0600
Subject: [PATCH 2850/2864] Docs: note that plugins and themes can be found on
 PyPI

---
 docs/plugins.rst | 5 +++++
 docs/themes.rst  | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 58eee16b..b9c7b4f9 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -66,6 +66,11 @@ Please note that while we do our best to review and maintain these plugins,
 they are submitted by the Pelican community and thus may have varying levels of
 support and interoperability.
 
+Community plugins can also be found on PyPI tagged with "`Framework ::
+Pelican :: Plugins`_".
+
+.. _Framework :: Pelican :: Plugins: https://pypi.org/search/?q=&o=-created&c=Framework+%3A%3A+Pelican+%3A%3A+Plugins
+
 How to create plugins
 =====================
 
diff --git a/docs/themes.rst b/docs/themes.rst
index ace5dcb9..fa4c9d37 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -10,6 +10,12 @@ Please note that while we do our best to review and merge theme contributions,
 they are submitted by the Pelican community and thus may have varying levels of
 support and interoperability.
 
+Community themes can also be found on PyPI tagged with "`Framework ::
+Pelican :: Themes`_".
+
+.. _Framework :: Pelican :: Themes: https://pypi.org/search/?q=&o=-created&c=Framework+%3A%3A+Pelican+%3A%3A+Themes
+
+
 Creating Themes
 ~~~~~~~~~~~~~~~
 

From ebfbc344dfa0285ceff91744559dd5904286761f Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Mon, 6 Apr 2026 15:13:57 -0600
Subject: [PATCH 2851/2864] Docs/Plugins: document another signal

---
 docs/plugins.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index b9c7b4f9..df4f55a3 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -151,7 +151,9 @@ finalized                           pelican object                 invoked after
 generator_init                      generator                      invoked in the Generator.__init__
 all_generators_finalized            generators                     invoked after all the generators are executed and before writing output
 readers_init                        readers                        invoked in the Readers.__init__
-article_generator_context           article_generator, metadata
+article_generator_context           article_generator, metadata    invoked after the content and metadata for the article has been generated;
+                                                                   use if you need to adjust the article metadata before it gets used by
+                                                                   Pelican.
 article_generator_preread           article_generator              invoked before a article is read in ArticlesGenerator.generate_context;
                                                                    use if code needs to do something before every article is parsed
 article_generator_init              article_generator              invoked in the ArticlesGenerator.__init__

From d15460c06061a1033f6b4904bdeebb49d1a0da0f Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Mon, 6 Apr 2026 15:16:36 -0600
Subject: [PATCH 2852/2864] Docs/Settings: more notes on how to extract
 metadata from filenames

---
 docs/settings.rst | 134 ++++++++++++++++++++++++++++------------------
 1 file changed, 82 insertions(+), 52 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 67d1080f..6bdc439e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -632,31 +632,36 @@ through the URLs ``posts/2011/`` and ``posts/2011/Aug/``, respectively.
 
 .. data:: YEAR_ARCHIVE_SAVE_AS
 
-   The location to save per-year archives of your posts. The default is ``''``.
+   The location to save per-year archives of your posts. The default is ``""``,
+   i.e. this is disabled by default.
 
 .. data:: YEAR_ARCHIVE_URL
 
    The URL to use for per-year archives of your posts. You should set this if
-   you enable per-year archives. The default is ``''``.
+   you enable per-year archives. The default is ``""``, i.e. this is disabled
+   by default.
 
 .. data:: MONTH_ARCHIVE_SAVE_AS
 
    The location to save per-month archives of your posts. The default is
-   ``''``.
+   ``""``, i.e. this is disabled by default.
 
 .. data:: MONTH_ARCHIVE_URL
 
    The URL to use for per-month archives of your posts. You should set this if
-   you enable per-month archives. The default is ``''``.
+   you enable per-month archives. The default is ``""``, i.e. this is disabled
+   by default.
 
 .. data:: DAY_ARCHIVE_SAVE_AS
 
-   The location to save per-day archives of your posts. The default is ``''``.
+   The location to save per-day archives of your posts. The default is ``""``,
+   i.e. this is disabled by default.
 
 .. data:: DAY_ARCHIVE_URL
 
    The URL to use for per-day archives of your posts. You should set this if
-   you enable per-day archives. The default is ``''``.
+   you enable per-day archives. The default is ``""``, i.e. this is disabled by
+   default.
 
 ``DIRECT_TEMPLATES`` work a bit differently than noted above. Only the
 ``_SAVE_AS`` settings are available, but it is available for any direct
@@ -893,18 +898,37 @@ Metadata
 
    The regexp that will be used to extract any metadata from the filename. All
    named groups that are matched will be set in the metadata object.  The
-   default value will only extract the date from the filename.
+   default value is ``r"(?P<date>\d{4}-\d{2}-\d{2}).*"`` and will only extract
+   the date from the filename.
 
-   For example, to extract both the date and the slug::
+   For example, if your source file were titled ``2026-04-30_blog-article.md``,
+   you could extract both the date and the slug::
 
-      FILENAME_METADATA = r'(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)'
+      FILENAME_METADATA = r"(?P<date>\d{4}-\d{2}-\d{2})_(?P<slug>.*)"
 
-   See also ``SLUGIFY_SOURCE``. The default is ``r'(?P<date>\d{4}-\d{2}-\d{2}).*'``.
+   giving you a date of *April 30, 2026* and a slug of *blog-article*.
+
+   See also ``SLUGIFY_SOURCE``. The default is
+   ``r"(?P<date>\d{4}-\d{2}-\d{2}).*"``, i.e. it assumed your filenames start
+   with an ISO-style date, e.g. ``2026-04-30``.
+
+   See also, ``FILENAME_METADATA``.
 
 .. data:: PATH_METADATA
 
    Like ``FILENAME_METADATA``, but parsed from a page's full path relative to
-   the content source directory. The default is ``''``.
+   the content source directory, include the source filename. The default
+   value is ``""``.
+
+   For example, if your source files were stored in folders by year and then my
+   month, with the filename being the day of the month, (e.g.
+   ``2026/04/30.rst``) you could extract that with::
+
+      PATH_METADATA = r"(?P<date>\d{4}/\d{2}/\d{2}).*"
+
+   (The above works on Windows as well.)
+
+   See also ``FILENAME_METADATA``.
 
 .. data:: EXTRA_PATH_METADATA
 
@@ -913,44 +937,44 @@ Metadata
    unlike some other Pelican file settings. Paths to a directory apply to all
    files under it. The most-specific path wins conflicts.
 
-Not all metadata needs to be :ref:`embedded in source file itself
-<internal_metadata>`. For example, blog posts are often named following a
-``YYYY-MM-DD-SLUG.rst`` pattern, or nested into ``YYYY/MM/DD-SLUG``
-directories. To extract metadata from the filename or path, set
-``FILENAME_METADATA`` or ``PATH_METADATA`` to regular expressions that use
-Python's `group name notation`_ ``(?P<name>…)``. If you want to attach
-additional metadata but don't want to encode it in the path, you can set
-``EXTRA_PATH_METADATA``:
+   Not all metadata needs to be :ref:`embedded in source file itself
+   <internal_metadata>`. For example, blog posts are often named following a
+   ``YYYY-MM-DD-SLUG.rst`` pattern, or nested into ``YYYY/MM/DD-SLUG``
+   directories. To extract metadata from the filename or path, set
+   ``FILENAME_METADATA`` or ``PATH_METADATA`` to regular expressions that use
+   Python's `group name notation`_ ``(?P<name>…)``. If you want to attach
+   additional metadata but don't want to encode it in the path, you can set
+   ``EXTRA_PATH_METADATA``:
 
-.. parsed-literal::
+   .. parsed-literal::
 
-    EXTRA_PATH_METADATA = {
-        'relative/path/to/file-1': {
-            'key-1a': 'value-1a',
-            'key-1b': 'value-1b',
-            },
-        'relative/path/to/file-2': {
-            'key-2': 'value-2',
-            },
-        }
+       EXTRA_PATH_METADATA = {
+           "relative/path/to/file-1": {
+               "key-1a": "value-1a",
+               "key-1b": "value-1b",
+           },
+           "relative/path/to/file-2": {
+               "key-2": "value-2",
+           },
+       }
 
-This can be a convenient way to shift the installed location of a particular
-file:
+   This can be a convenient way to shift the output location of a particular
+   file:
 
-.. parsed-literal::
+   .. parsed-literal::
 
-    # Take advantage of the following defaults
-    # STATIC_SAVE_AS = '{path}'
-    # STATIC_URL = '{path}'
-    STATIC_PATHS = [
-        'static/robots.txt',
-        ]
-    EXTRA_PATH_METADATA = {
-        'static/robots.txt': {'path': 'robots.txt'},
-        }
+       # Take advantage of the following defaults:
+       # STATIC_SAVE_AS = "{path}"
+       # STATIC_URL = "{path}"
+       STATIC_PATHS = [
+           "static/robots.txt",
+       ]
+       EXTRA_PATH_METADATA = {
+           "static/robots.txt": {"path": "robots.txt"},
+       }
 
-.. _group name notation:
-   https://docs.python.org/3/library/re.html#regular-expression-syntax
+   .. _group name notation:
+      https://docs.python.org/3/library/re.html#regular-expression-syntax
 
    The default is ``{}``.
 
@@ -1074,7 +1098,7 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 .. data:: FEED_MAX_ITEMS
 
    Maximum number of items allowed in a feed. Setting to ``None`` will cause the
-   feed to contains every article. 100 if not specified. The default is ``100``.
+   feed to contains every article. The default is ``100``.
 
 .. data:: RSS_FEED_SUMMARY_ONLY
 
@@ -1313,7 +1337,10 @@ Following are example ways to specify your preferred theme::
     # Specify a customized theme, via absolute path
     THEME = "/home/myuser/projects/mysite/themes/mycustomtheme"
 
-The built-in ``simple`` theme can be customized using the following settings.
+Simple Theme
+------------
+
+The built-in ``simple`` theme can be customized using the following settings:
 
 .. data:: STYLESHEET_URL
 
@@ -1383,6 +1410,9 @@ Feel free to use them in your themes as well.
    Allows override of the name of the "social" widget.  If not specified,
    defaults to "social". The default is ``None``.
 
+Notmyidea Theme
+---------------
+
 In addition, you can use the "wide" version of the ``notmyidea`` theme by
 adding the following to your configuration::
 
@@ -1428,7 +1458,7 @@ For example::
 .. _reading_only_modified_content:
 
 
-Reading only modified content
+Reading Only Modified Content
 =============================
 
 To speed up the build process, Pelican can optionally read only articles and
@@ -1442,12 +1472,12 @@ When Pelican is about to read some content source file:
    file has no record in the cache file, it is read as usual.
 2. The file is checked according to ``CHECK_MODIFIED_METHOD``:
 
-    - If set to ``'mtime'``, the modification time of the file is
-      checked.
-    - If set to a name of a function provided by the ``hashlib``
-      module, e.g. ``'md5'``, the file hash is checked.
-    - If set to anything else or the necessary information about the
-      file cannot be found in the cache file, the content is read as usual.
+   - If set to ``"mtime"``, the modification time of the file is
+     checked.
+   - If set to a name of a function provided by the ``hashlib``
+     module, e.g. ``"md5"``, the file hash is checked.
+   - If set to anything else or the necessary information about the
+     file cannot be found in the cache file, the content is read as usual.
 
 3. If the file is considered unchanged, the content data saved in a
    previous build corresponding to the file is loaded from the cache, and the

From 763bf5224ca596abdd6356008745b479dd5cbd90 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Mon, 6 Apr 2026 15:17:16 -0600
Subject: [PATCH 2853/2864] Docs/Settings: update code formatting

to bring it more inline with current black/ruff formatting, particularly in the use of double (over single) quotes
---
 docs/plugins.rst  |   8 +-
 docs/settings.rst | 256 +++++++++++++++++++++++-----------------------
 2 files changed, 134 insertions(+), 130 deletions(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index df4f55a3..3da0c078 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -117,10 +117,10 @@ and have a folder structure as follows::
 
     myplugin
     ├── pelican
-    │   └── plugins
-    │       └── myplugin
-    │           ├── __init__.py
-    │           └── ...
+    │   └── plugins
+    │       └── myplugin
+    │           ├── __init__.py
+    │           └── ...
     ├── ...
     └── setup.py
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 6bdc439e..3fac5f18 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -63,7 +63,7 @@ Basic settings
 
 .. data:: DEFAULT_CATEGORY
 
-   The default category to fall back on. The default is ``'misc'``.
+   The default category to fall back on. The default is ``"misc"``.
 
 .. data:: DISPLAY_PAGES_ON_MENU
 
@@ -104,7 +104,7 @@ Basic settings
    A dictionary of custom Jinja2 environment variables you want to use. This
    also includes a list of extensions you may want to include. See `Jinja
    Environment documentation`_. The default is
-   ``{'extensions': [], 'trim_blocks': True, 'lstrip_blocks': True}``.
+   ``{"extensions": [], "trim_blocks": True, "lstrip_blocks": True}``.
 
 .. data:: JINJA_FILTERS
 
@@ -114,10 +114,10 @@ Basic settings
    Example::
 
     import sys
-    sys.path.append('to/your/path')
+    sys.path.append("to/your/path")
 
     from custom_filter import urlencode_filter
-    JINJA_FILTERS = {'urlencode': urlencode_filter}
+    JINJA_FILTERS = {"urlencode": urlencode_filter}
 
    See: `Jinja custom filters documentation`_. The default is ``{}``.
 
@@ -141,7 +141,7 @@ Basic settings
 
    Example::
 
-      LOG_FILTER = [(logging.WARN, 'TAG_SAVE_AS is set to False')]
+      LOG_FILTER = [(logging.WARN, "TAG_SAVE_AS is set to False")]
 
    The default is ``[]``.
 
@@ -152,11 +152,11 @@ Basic settings
 
    For example, to avoid processing .html files, set::
 
-      READERS = {'html': None}
+      READERS = {"html": None}
 
    To add a custom reader for the ``foo`` extension, set::
 
-      READERS = {'foo': FooReader}
+      READERS = {"foo": FooReader}
 
    The default is ``{}``.
 
@@ -164,14 +164,14 @@ Basic settings
 
    A list of Unix glob patterns. Files and directories matching any of these patterns
    or any of the commonly hidden files and directories set by ``watchfiles.DefaultFilter``
-   will be ignored by the processor. For example, the default ``['**/.*']`` will
-   ignore "hidden" files and directories, and ``['__pycache__']`` would ignore
+   will be ignored by the processor. For example, the default ``["**/.*"]`` will
+   ignore "hidden" files and directories, and ``["__pycache__"]`` would ignore
    Python 3's bytecode caches.
 
    For a full list of the commonly hidden files set by ``watchfiles.DefaultFilter``,
    please refer to the `watchfiles documentation`_.
 
-   The default is ``['**/.*']``.
+   The default is ``["**/.*"]``.
 
 .. data:: MARKDOWN
 
@@ -184,12 +184,12 @@ Basic settings
    The default is::
 
         MARKDOWN = {
-            'extension_configs': {
-                'markdown.extensions.codehilite': {'css_class': 'highlight'},
-                'markdown.extensions.extra': {},
-                'markdown.extensions.meta': {},
+            "extension_configs": {
+                "markdown.extensions.codehilite": {"css_class": "highlight"},
+                "markdown.extensions.extra": {},
+                "markdown.extensions.meta": {},
             },
-            'output_format': 'html5',
+            "output_format": "html5",
         }
 
    .. Note::
@@ -201,18 +201,18 @@ Basic settings
    Where to output the generated files. This should correspond to your web
    server's virtual host root directory.
 
-   The default is ``'output'``.
+   The default is ``"output"``.
 
 .. data:: PATH
 
    Path to content directory to be processed by Pelican. If undefined, and
    content path is not specified via an argument to the ``pelican`` command,
-   Pelican will default to ``'.'``, the current working directory.
+   Pelican will default to ``"."``, the current working directory.
 
 .. data:: PAGE_PATHS
 
    A list of directories and files to look at for pages, relative to ``PATH``.
-   The default is ``['pages']``.
+   The default is ``["pages"]``.
 
 .. data:: PAGE_EXCLUDES
 
@@ -222,7 +222,7 @@ Basic settings
 .. data:: ARTICLE_PATHS
 
    A list of directories and files to look at for articles, relative to
-   ``PATH``. The default is ``['']``.
+   ``PATH``. The default is ``[""]``.
 
 .. data:: ARTICLE_EXCLUDES
 
@@ -239,7 +239,7 @@ Basic settings
 
    Controls the extension that will be used by the SourcesGenerator.  Defaults
    to ``.text``. If not a valid string the default value will be used. The
-   default is ``'.text'``.
+   default is ``".text"``.
 
 .. data:: PLUGINS
 
@@ -252,7 +252,7 @@ Basic settings
 
 .. data:: SITENAME
 
-   Your site's name. The default is ``'A Pelican Blog'``.
+   Your site's name. The default is ``"A Pelican Blog"``.
 
 .. data:: SITEURL
 
@@ -261,9 +261,9 @@ Basic settings
    properly-formed URLs. If your site is available via HTTPS, this setting
    should begin with ``https://`` — otherwise use ``http://``. Then append your
    domain, with no trailing slash at the end. Example: ``SITEURL =
-   'https://example.com'``
+   "https://example.com"``
 
-   The default is ``''``, the blank string.
+   The default is ``""``, the blank string.
 
 .. data:: STATIC_PATHS
 
@@ -272,7 +272,7 @@ Basic settings
    modification. Articles, pages, and other content source files will normally
    be skipped, so it is safe for a directory to appear both here and in
    ``PAGE_PATHS`` or ``ARTICLE_PATHS``.  Pelican's default settings include the
-   "images" directory here. The default is ``['images']``.
+   "images" directory here. The default is ``["images"]``.
 
 .. data:: STATIC_EXCLUDES
 
@@ -318,8 +318,8 @@ Basic settings
 
 .. data:: TYPOGRIFY_OMIT_FILTERS
 
-   A list of Typogrify filters to skip. Allowed values are: ``'amp'``,
-   ``'smartypants'``, ``'caps'``, ``'initial_quotes'``, ``'widont'``. By
+   A list of Typogrify filters to skip. Allowed values are: ``"amp"``,
+   ``"smartypants"``, ``"caps"``, ``"initial_quotes"``, ``"widont"``. By
    default, no filter is omitted (in other words, all filters get applied). This
    setting requires that Typogrify version 2.1.0 or later is installed. The
    default is ``[]``.
@@ -333,7 +333,7 @@ Basic settings
    ``oldschool`` setting renders both en-dashes and em-dashes when it sees two
    (``--``) and three (``---``) hyphen characters, respectively. The
    ``oldschool_inverted`` setting turns two hyphens into an em-dash and three
-   hyphens into an en-dash. The default is ``'default'``.
+   hyphens into an en-dash. The default is ``"default"``.
 
 .. data:: SUMMARY_MAX_LENGTH
 
@@ -354,7 +354,7 @@ Basic settings
 
    When creating a short summary of an article and the result was truncated to
    match the required word length, this will be used as the truncation suffix.
-   The default is ``'…'``.
+   The default is ``"…"``.
 
 .. data:: WITH_FUTURE_DATES
 
@@ -369,7 +369,7 @@ Basic settings
    ``filename``, in ``{}`` or ``||``. Identifier between ``{`` and ``}`` goes
    into the ``what`` capturing group.  For details see
    :ref:`ref-linking-to-internal-content`. The default is
-   ``'[{|](?P<what>.*?)[|}]'``.
+   ``"[{|](?P<what>.*?)[|}]"``.
 
 .. data:: PYGMENTS_RST_OPTIONS
 
@@ -385,13 +385,13 @@ Basic settings
 
 .. data:: CONTENT_CACHING_LAYER
 
-   If set to ``'reader'``, save only the raw content and metadata returned by
-   readers. If set to ``'generator'``, save processed content objects. The
-   default is ``'reader'``.
+   If set to ``"reader"``, save only the raw content and metadata returned by
+   readers. If set to ``"generator"``, save processed content objects. The
+   default is ``"reader"``.
 
 .. data:: CACHE_PATH
 
-   Directory in which to store cache files. The default is ``'cache'``.
+   Directory in which to store cache files. The default is ``"cache"``.
 
 .. data:: GZIP_CACHE
 
@@ -402,12 +402,12 @@ Basic settings
 
    Controls how files are checked for modifications.
 
-   - If set to ``'mtime'``, the modification time of the file is
+   - If set to ``"mtime"``, the modification time of the file is
      checked.
    - If set to a name of a function provided by the ``hashlib``
-     module, e.g. ``'md5'``, the file hash is checked.
+     module, e.g. ``"md5"``, the file hash is checked.
 
-   The default is ``'mtime'``.
+   The default is ``"mtime"``.
 
 .. data:: LOAD_CONTENT_CACHE
 
@@ -416,7 +416,7 @@ Basic settings
 .. data:: FORMATTED_FIELDS
 
    A list of metadata fields containing reST/Markdown content to be parsed and
-   translated to HTML. The default is ``['summary']``.
+   translated to HTML. The default is ``["summary"]``.
 
 .. data:: PORT
 
@@ -425,7 +425,7 @@ Basic settings
 
 .. data:: BIND
 
-   The IP to which to bind the HTTP server. The default is ``'127.0.0.1'``.
+   The IP to which to bind the HTTP server. The default is ``"127.0.0.1"``.
 
 .. _url-settings:
 
@@ -458,8 +458,8 @@ If you don't want that flexibility and instead prefer that your generated
 output paths mirror your source content's filesystem path hierarchy, try the
 following settings::
 
-    PATH_METADATA = r'(?P<path_no_ext>.*)\..*'
-    ARTICLE_URL = ARTICLE_SAVE_AS = PAGE_URL = PAGE_SAVE_AS = '{path_no_ext}.html'
+    PATH_METADATA = r"(?P<path_no_ext>.*)\..*"
+    ARTICLE_URL = ARTICLE_SAVE_AS = PAGE_URL = PAGE_SAVE_AS = "{path_no_ext}.html"
 
 Otherwise, you can use a variety of file metadata attributes within URL-related
 settings:
@@ -472,10 +472,10 @@ settings:
 
 Example usage::
 
-   ARTICLE_URL = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/'
-   ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html'
-   PAGE_URL = 'pages/{slug}/'
-   PAGE_SAVE_AS = 'pages/{slug}/index.html'
+   ARTICLE_URL = "posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/"
+   ARTICLE_SAVE_AS = "posts/{date:%Y}/{date:%b}/{date:%d}/{slug}/index.html"
+   PAGE_URL = "pages/{slug}/"
+   PAGE_SAVE_AS = "pages/{slug}/index.html"
 
 This would save your articles into something like
 ``/posts/2011/Aug/07/sample-post/index.html``, save your pages into
@@ -499,111 +499,111 @@ This would save your articles into something like
 
 .. data:: ARTICLE_URL
 
-   The URL to refer to an article. The default is ``'{slug}.html'``.
+   The URL to refer to an article. The default is ``"{slug}.html"``.
 
 .. data:: ARTICLE_SAVE_AS
 
-   The place where we will save an article. The default is ``'{slug}.html'``.
+   The place where we will save an article. The default is ``"{slug}.html"``.
 
 .. data:: ARTICLE_LANG_URL
 
    The URL to refer to an article which doesn't use the default language.
-   The default is ``'{slug}-{lang}.html``.
+   The default is ``"{slug}-{lang}.html"``.
 
 .. data:: ARTICLE_LANG_SAVE_AS
 
    The place where we will save an article which doesn't use the default
-   language. The default is ``'{slug}-{lang}.html'``.
+   language. The default is ``"{slug}-{lang}.html"``.
 
 .. data:: DRAFT_URL
 
    The URL to refer to an article draft. The default is
-   ``'drafts/{slug}.html'``.
+   ``"drafts/{slug}.html"``.
 
 .. data:: DRAFT_SAVE_AS
 
-   The place where we will save an article draft. The default is ``'drafts/{slug}.html'``.
+   The place where we will save an article draft. The default is ``"drafts/{slug}.html"``.
 
 .. data:: DRAFT_LANG_URL
 
    The URL to refer to an article draft which doesn't use the default language.
-   The default is ``'drafts/{slug}-{lang}.html'``.
+   The default is ``"drafts/{slug}-{lang}.html"``.
 
 .. data:: DRAFT_LANG_SAVE_AS
 
    The place where we will save an article draft which doesn't use the default
-   language. The default is ``'drafts/{slug}-{lang}.html'``.
+   language. The default is ``"drafts/{slug}-{lang}.html"``.
 
 .. data:: PAGE_URL
 
    The URL we will use to link to a page. The default is
-   ``'pages/{slug}.html'``.
+   ``"pages/{slug}.html"``.
 
 .. data:: PAGE_SAVE_AS
 
    The location we will save the page. This value has to be the same as
    PAGE_URL or you need to use a rewrite in your server config. The default
-   is ``'pages/{slug}.html'``.
+   is ``"pages/{slug}.html"``.
 
 .. data:: PAGE_LANG_URL
 
    The URL we will use to link to a page which doesn't use the default
-   language. The default is ``'pages/{slug}-{lang}.html'``.
+   language. The default is ``"pages/{slug}-{lang}.html"``.
 
 .. data:: PAGE_LANG_SAVE_AS
 
    The location we will save the page which doesn't use the default language.
-   The default is ``'pages/{slug}-{lang}.html'``.
+   The default is ``"pages/{slug}-{lang}.html"``.
 
 .. data:: DRAFT_PAGE_URL
 
    The URL used to link to a page draft. The default is
-   ``'drafts/pages/{slug}.html'``.
+   ``"drafts/pages/{slug}.html"``.
 
 .. data:: DRAFT_PAGE_SAVE_AS
 
    The actual location a page draft is saved at. The default is
-   ``'drafts/pages/{slug}.html'``.
+   ``"drafts/pages/{slug}.html"``.
 
 .. data:: DRAFT_PAGE_LANG_URL
 
    The URL used to link to a page draft which doesn't use the default
-   language. The default is ``'drafts/pages/{slug}-{lang}.html'``.
+   language. The default is ``"drafts/pages/{slug}-{lang}.html"``.
 
 .. data:: DRAFT_PAGE_LANG_SAVE_AS
 
    The actual location a page draft which doesn't use the default language is
-   saved at. The default is ``'drafts/pages/{slug}-{lang}.html'``.
+   saved at. The default is ``"drafts/pages/{slug}-{lang}.html"``.
 
 .. data:: AUTHOR_URL
 
-   The URL to use for an author. The default is ``'author/{slug}.html'``.
+   The URL to use for an author. The default is ``"author/{slug}.html"``.
 
 .. data:: AUTHOR_SAVE_AS
 
-   The location to save an author. The default is ``'author/{slug}.html'``.
+   The location to save an author. The default is ``"author/{slug}.html"``.
 
 .. data:: CATEGORY_URL
 
-   The URL to use for a category. The default is ``'category/{slug}.html'``.
+   The URL to use for a category. The default is ``"category/{slug}.html"``.
 
 .. data:: CATEGORY_SAVE_AS
 
-   The location to save a category. The default is ``'category/{slug}.html'``.
+   The location to save a category. The default is ``"category/{slug}.html"``.
 
 .. data:: TAG_URL
 
-   The URL to use for a tag. The default is ``'tag/{slug}.html'``.
+   The URL to use for a tag. The default is ``"tag/{slug}.html"``.
 
 .. data:: TAG_SAVE_AS
 
-   The location to save the tag page. The default is ``'tag/{slug}.html'``.
+   The location to save the tag page. The default is ``"tag/{slug}.html"``.
 
 .. note::
 
     If you do not want one or more of the default pages to be created (e.g.,
     you are the only author on your site and thus do not need an Authors page),
-    set the corresponding ``*_SAVE_AS`` setting to ``''`` to prevent the
+    set the corresponding ``*_SAVE_AS`` setting to ``""`` to prevent the
     relevant page from being generated.
 
 Pelican can optionally create per-year, per-month, and per-day archives of your
@@ -615,10 +615,10 @@ written over time.
 
 Example usage::
 
-   YEAR_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/index.html'
-   YEAR_ARCHIVE_URL = 'posts/{date:%Y}/'
-   MONTH_ARCHIVE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/index.html'
-   MONTH_ARCHIVE_URL = 'posts/{date:%Y}/{date:%b}/'
+   YEAR_ARCHIVE_SAVE_AS = "posts/{date:%Y}/index.html"
+   YEAR_ARCHIVE_URL = "posts/{date:%Y}/"
+   MONTH_ARCHIVE_SAVE_AS = "posts/{date:%Y}/{date:%b}/index.html"
+   MONTH_ARCHIVE_URL = "posts/{date:%Y}/{date:%b}/"
 
 With these settings, Pelican will create an archive of all your posts for the
 year at (for instance) ``posts/2011/index.html`` and an archive of all your
@@ -669,34 +669,34 @@ template.
 
 .. data:: ARCHIVES_SAVE_AS
 
-   The location to save the article archives page. The default is ``'archives.html'``.
+   The location to save the article archives page. The default is ``"archives.html"``.
 
 .. data:: AUTHORS_SAVE_AS
 
-   The location to save the author list. The default is ``'authors.html'``.
+   The location to save the author list. The default is ``"authors.html"``.
 
 .. data:: CATEGORIES_SAVE_AS
 
-   The location to save the category list. The default is ``'categories.html'``.
+   The location to save the category list. The default is ``"categories.html"``.
 
 .. data:: TAGS_SAVE_AS
 
-   The location to save the tag list. The default is ``'tags.html'``.
+   The location to save the tag list. The default is ``"tags.html"``.
 
 .. data:: INDEX_SAVE_AS
 
-   The location to save the list of all articles. The default is ``'index.html'``.
+   The location to save the list of all articles. The default is ``"index.html"``.
 
 URLs for direct template pages are theme-dependent. Some themes use
 corresponding ``*_URL`` setting as string, while others hard-code them:
-``'archives.html'``, ``'authors.html'``, ``'categories.html'``,
-``'tags.html'``.
+``"archives.html"``, ``"authors.html"``, ``"categories.html"``,
+``"tags.html"``.
 
 .. data:: SLUGIFY_SOURCE
 
    Specifies from where you want the slug to be automatically generated. Can be
    set to ``title`` to use the "Title:" metadata tag or ``basename`` to use the
-   article's file name when creating the slug. The default is ``'title'``.
+   article's file name when creating the slug. The default is ``"title"``.
 
 .. data:: SLUGIFY_USE_UNICODE
 
@@ -720,10 +720,10 @@ corresponding ``*_URL`` setting as string, while others hard-code them:
    backward compatibility with existing URLs. The default is::
 
        [
-           (r'[^\w\s-]', ''),   # remove non-alphabetical/whitespace/'-' chars
-           (r'(?u)\A\s*', ''),  # strip leading whitespace
-           (r'(?u)\s*\Z', ''),  # strip trailing whitespace
-           (r'[-\s]+', '-'),     # reduce multiple whitespace or '-' to single '-'
+           (r"[^\w\s-]", ""),   # remove non-alphabetical/whitespace/"-" chars
+           (r"(?u)\A\s*", ""),  # strip leading whitespace
+           (r"(?u)\s*\Z", ""),  # strip trailing whitespace
+           (r"[-\s]+", "-"),    # reduce multiple whitespace or "-" to single "-"
        ]
 
 .. data:: AUTHOR_REGEX_SUBSTITUTIONS
@@ -761,7 +761,7 @@ Time and Date
 
 .. data:: DEFAULT_DATE
 
-   The default date you want to use.  If ``'fs'``, Pelican will use the file
+   The default date you want to use.  If ``"fs"``, Pelican will use the file
    system timestamp information (mtime) if it can't get date information from
    the metadata.  If given any other string, it will be parsed by the same
    method as article metadata.  If set to a tuple object, the default datetime
@@ -770,7 +770,8 @@ Time and Date
 
 .. data:: DEFAULT_DATE_FORMAT
 
-   The default date format you want to use. The default is ``'%a %d %B %Y'``.
+   The default date format you want to use. The default is ``"%a %d %B %Y"``,
+   e.g. "Mon 06 April 2026".
 
 .. data:: DATE_FORMATS
 
@@ -790,8 +791,8 @@ Time and Date
    .. parsed-literal::
 
        DATE_FORMATS = {
-           'en': '%a, %d %b %Y',
-           'jp': '%Y-%m-%d(%a)',
+           "en": "%a, %d %b %Y",
+           "jp": "%Y-%m-%d(%a)",
        }
 
    It is also possible to set different locale settings for each language by
@@ -802,14 +803,14 @@ Time and Date
 
       # On Unix/Linux
       DATE_FORMATS = {
-          'en': ('en_US','%a, %d %b %Y'),
-          'jp': ('ja_JP','%Y-%m-%d(%a)'),
+          "en": ("en_US", "%a, %d %b %Y"),
+          "jp": ("ja_JP", "%Y-%m-%d(%a)"),
       }
 
       # On Windows
       DATE_FORMATS = {
-          'en': ('usa','%a, %d %b %Y'),
-          'jp': ('jpn','%Y-%m-%d(%a)'),
+          "en": ("usa", "%a, %d %b %Y"),
+          "jp": ("jpn", "%Y-%m-%d(%a)"),
       }
 
    The default is ``{}``.
@@ -824,8 +825,9 @@ Time and Date
 
    .. parsed-literal::
 
-      LOCALE = ['usa', 'jpn',      # On Windows
-                'en_US', 'ja_JP'   # On Unix/Linux
+      LOCALE = [
+          "usa", "jpn",      # On Windows
+          "en_US", "ja_JP"   # On Unix/Linux
       ]
 
    For a list of available locales refer to `locales on Windows`_  or on
@@ -859,28 +861,30 @@ Template pages
    For instance, if you have a blog with three static pages — a list of books,
    your resume, and a contact page — you could have::
 
-       TEMPLATE_PAGES = {'src/books.html': 'dest/books.html',
-                         'src/resume.html': 'dest/resume.html',
-                         'src/contact.html': 'dest/contact.html'}
+       TEMPLATE_PAGES = {
+           "src/books.html": "dest/books.html",
+           "src/resume.html": "dest/resume.html",
+           "src/contact.html": "dest/contact.html",
+       }
 
    The default is ``{}``.
 
 .. data:: TEMPLATE_EXTENSIONS
 
    The extensions to use when looking up template files from template names.
-   The default is ``['.html']``.
+   The default is ``[".html"]``.
 
 .. data:: DIRECT_TEMPLATES
 
    List of templates that are used directly to render content. Typically direct
    templates are used to generate index pages for collections of content (e.g.,
    category and tag index pages). If the author, category and tag collections are not
-   needed, set ``DIRECT_TEMPLATES = ['index', 'archives']``
+   needed, set ``DIRECT_TEMPLATES = ["index", "archives"]``
 
    ``DIRECT_TEMPLATES`` are searched for over paths maintained in
    ``THEME_TEMPLATES_OVERRIDES``.
 
-   The default is ``['index', 'tags', 'categories', 'authors', 'archives']``.
+   The default is ``["index", "tags", "categories", "authors", "archives"]``.
 
 Metadata
 ========
@@ -1017,7 +1021,7 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 .. data:: FEED_ALL_ATOM
 
    The location to save the all-posts Atom feed: this feed will contain all
-   posts regardless of their language. The default is ``'feeds/all.atom.xml'``.
+   posts regardless of their language. The default is ``"feeds/all.atom.xml"``.
 
 .. data:: FEED_ALL_ATOM_URL
 
@@ -1038,7 +1042,7 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 .. data:: CATEGORY_FEED_ATOM
 
    The location to save the category Atom feeds. [2]_ The default is
-   ``'feeds/{slug}.atom.xml'``.
+   ``"feeds/{slug}.atom.xml"``.
 
 .. data:: CATEGORY_FEED_ATOM_URL
 
@@ -1060,7 +1064,7 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 .. data:: AUTHOR_FEED_ATOM
 
    The location to save the author Atom feeds. [2]_ The default is
-   ``'feeds/{slug}.atom.xml'``.
+   ``"feeds/{slug}.atom.xml"``.
 
 .. data:: AUTHOR_FEED_ATOM_URL
 
@@ -1071,7 +1075,7 @@ the ``TAG_FEED_ATOM`` and ``TAG_FEED_RSS`` settings:
 .. data:: AUTHOR_FEED_RSS
 
    The location to save the author RSS feeds. [2]_ The default is
-   ``'feeds/{slug}.rss.xml'``.
+   ``"feeds/{slug}.rss.xml"``.
 
 .. data:: AUTHOR_FEED_RSS_URL
 
@@ -1142,7 +1146,7 @@ You can use the following settings to configure the pagination.
 
    The templates to use pagination with, and the number of articles to include
    on a page. If this value is ``None``, it defaults to ``DEFAULT_PAGINATION``.
-   The default is ``{'index': None, 'tag': None, 'category': None, 'author': None}``.
+   The default is ``{"index": None, "tag": None, "category": None, "author": None}``.
 
 .. data:: PAGINATION_PATTERNS
 
@@ -1150,8 +1154,8 @@ You can use the following settings to configure the pagination.
    default is::
 
        (
-           (1, '{name}{extension}', '{name}{extension}'),
-           (2, '{name}{number}{extension}', '{name}{number}{extension}'),
+           (1, "{name}{extension}", "{name}{extension}"),
+           (2, "{name}{number}{extension}", "{name}{number}{extension}""),
        )
 
 
@@ -1176,15 +1180,15 @@ subsequent pages at ``.../page/2/`` etc, you could set ``PAGINATION_PATTERNS``
 as follows::
 
   PAGINATION_PATTERNS = (
-      (1, '{url}', '{save_as}'),
-      (2, '{base_name}/page/{number}/', '{base_name}/page/{number}/index.html'),
+      (1, "{url}", "{save_as}"),
+      (2, "{base_name}/page/{number}/", "{base_name}/page/{number}/index.html"),
   )
 
 
 If you want a pattern to apply to the last page in the list, use ``-1``
 as the ``minimum_page`` value::
 
-    (-1, '{base_name}/last/', '{base_name}/last/index.html'),
+    (-1, "{base_name}/last/", "{base_name}/last/index.html"),
 
 Translations
 ============
@@ -1194,26 +1198,26 @@ section for more information.
 
 .. data:: DEFAULT_LANG
 
-   The default language to use. The default is ``'en'``.
+   The default language to use. The default is ``"en"``.
 
 .. data:: ARTICLE_TRANSLATION_ID
 
    The metadata attribute(s) used to identify which articles are translations
    of one another. May be a string or a collection of strings. Set to ``None``
    or ``False`` to disable the identification of translations. The default is
-   ``'slug'``.
+   ``"slug"``.
 
 .. data:: PAGE_TRANSLATION_ID
 
    The metadata attribute(s) used to identify which pages are translations of
    one another. May be a string or a collection of strings. Set to ``None`` or
    ``False`` to disable the identification of translations. The default is
-   ``'slug'``.
+   ``"slug"``.
 
 .. data:: TRANSLATION_FEED_ATOM
 
    The location to save the Atom feed for translations. [3]_ The default is
-   ``'feeds/all-{lang}.atom.xml'``.
+   ``"feeds/all-{lang}.atom.xml"``.
 
 .. data:: TRANSLATION_FEED_ATOM_URL
 
@@ -1251,18 +1255,18 @@ Ordering content
 
    Defines how the articles (``articles_page.object_list`` in the template) are
    sorted. Valid options are: metadata as a string (use ``reversed-`` prefix
-   to reverse the sort order), special option ``'basename'`` which will use
+   to reverse the sort order), special option ``"basename"`` which will use
    the basename of the file (without path), or a custom function to extract the
-   sorting key from articles. Using a value of ``'date'`` will sort articles in
-   chronological order, while the default value, ``'reversed-date'``, will sort
+   sorting key from articles. Using a value of ``"date"`` will sort articles in
+   chronological order, while the default value, ``"reversed-date"``, will sort
    articles by date in reverse order (i.e., newest article comes first). The
-   default is ``'reversed-date'``.
+   default is ``"reversed-date"``.
 
 .. data:: PAGE_ORDER_BY
 
    Defines how the pages (``pages`` variable in the template) are sorted.
-   Options are same as ``ARTICLE_ORDER_BY``.  The default value, ``'basename'``
-   will sort pages by their basename. The default is ``'basename'``.
+   Options are same as ``ARTICLE_ORDER_BY``.  The default value, ``"basename"``
+   will sort pages by their basename. The default is ``"basename"``.
 
 
 .. _settings/themes:
@@ -1284,14 +1288,14 @@ themes.
 
    Destination directory in the output path where Pelican will place the files
    collected from `THEME_STATIC_PATHS`. Default is `theme`. The default is
-   ``'theme'``.
+   ``"theme"``.
 
 .. data:: THEME_STATIC_PATHS
 
    Static theme paths you want to copy. Default value is `static`, but if your
    theme has other static paths, you can put them here. If files or directories
    with the same names are included in the paths defined in this settings, they
-   will be progressively overwritten. The default is ``['static']``.
+   will be progressively overwritten. The default is ``["static"]``.
 
 .. data:: THEME_TEMPLATES_OVERRIDES
 
@@ -1310,7 +1314,7 @@ themes.
 
 .. data:: CSS_FILE
 
-   Specify the CSS file you want to load. The default is ``'main.css'``.
+   Specify the CSS file you want to load. The default is ``"main.css"``.
 
 By default, two themes are available. You can specify them using the ``THEME``
 setting or by passing the ``-t`` option to the ``pelican`` command:
@@ -1435,7 +1439,7 @@ they will be filtered out.
 For example::
 
    import logging
-   LOG_FILTER = [(logging.WARN, 'TAG_SAVE_AS is set to False')]
+   LOG_FILTER = [(logging.WARN, "TAG_SAVE_AS is set to False")]
 
 It is possible to filter out messages by a template. Check out source code to
 obtain a template.
@@ -1443,7 +1447,7 @@ obtain a template.
 For example::
 
    import logging
-   LOG_FILTER = [(logging.WARN, 'Empty alt attribute for image %s in %s')]
+   LOG_FILTER = [(logging.WARN, "Empty alt attribute for image %s in %s")]
 
 .. Warning::
 
@@ -1486,9 +1490,9 @@ When Pelican is about to read some content source file:
    modification information and the content data are saved to the cache if
    ``CACHE_CONTENT`` is ``True``.
 
-If ``CONTENT_CACHING_LAYER`` is set to ``'reader'`` (the default), the raw
+If ``CONTENT_CACHING_LAYER`` is set to ``"reader"`` (the default), the raw
 content and metadata returned by a reader are cached. If this setting is
-instead set to ``'generator'``, the processed content object is cached. Caching
+instead set to ``"generator"``, the processed content object is cached. Caching
 the processed content object may conflict with plugins (as some reading related
 signals may be skipped) and the ``WITH_FUTURE_DATES`` functionality (as the
 ``draft`` status of the cached content objects would not change automatically

From d6461130cc9e2f0b85fe8a0cf7a5904f0ca32545 Mon Sep 17 00:00:00 2001
From: Russell <russell.ballestrini@gmail.com>
Date: Mon, 13 Apr 2026 14:01:25 -0400
Subject: [PATCH 2854/2864] Strip TOC elements from article summaries

* Strip TOC elements from article summaries

Automatically remove table of contents divs and toc-backref anchor links
from article summaries when displayed outside full article context
(e.g., on homepage, in RSS feeds).

ReStructuredText automatically generates anchor links in section headings
when a table of contents directive is present. These anchors work perfectly
on full article pages, but become broken links when article summaries appear
on homepage or in feeds - the anchor targets don't exist in that context.

This change adds a strip_toc_elements_from_html() function in pelican/utils.py
that uses regex to remove:
- TOC div blocks (<div class="contents">...</div>) containing broken navigation
- toc-backref anchor links from headings while preserving heading text

Both removals are necessary since TOC anchor targets don't exist in summary context.

The function is called automatically in Content.get_summary() so all
summaries are cleaned without requiring configuration or template changes.

Includes comprehensive unit tests covering various TOC formats, edge cases,
and case-insensitive matching.

---------

Co-authored-by: Justin Mayer <entroP@gmail.com>
---
 pelican/contents.py            | 19 ++++++++----
 pelican/tests/test_contents.py | 22 ++++++++++++++
 pelican/tests/test_utils.py    | 54 ++++++++++++++++++++++++++++++++++
 pelican/utils.py               | 31 +++++++++++++++++++
 4 files changed, 120 insertions(+), 6 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 3d9e086c..c0a3e775 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -27,6 +27,7 @@ from pelican.utils import (
     sanitised_join,
     set_date_tzinfo,
     slugify,
+    strip_toc_elements_from_html,
     truncate_html_paragraphs,
     truncate_html_words,
 )
@@ -446,13 +447,19 @@ class Content:
             content = truncate_html_paragraphs(self.content, max_paragraphs)
 
         if self.settings["SUMMARY_MAX_LENGTH"] is None:
-            return content
+            summary = content
+        else:
+            summary = truncate_html_words(
+                content,
+                self.settings["SUMMARY_MAX_LENGTH"],
+                self.settings["SUMMARY_END_SUFFIX"],
+            )
 
-        return truncate_html_words(
-            content,
-            self.settings["SUMMARY_MAX_LENGTH"],
-            self.settings["SUMMARY_END_SUFFIX"],
-        )
+        # Strip TOC elements that would contain broken links in summary context
+        # TOC anchors only work in full article view, not in summaries/excerpts
+        summary = strip_toc_elements_from_html(summary)
+
+        return summary
 
     @property
     def summary(self) -> str:
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 4b1effa2..4e48e594 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -172,6 +172,28 @@ class TestPage(TestBase):
         )
         self.assertIn("test_marker", page.summary)
 
+    def test_summary_strips_toc_elements(self):
+        """Auto-generated summary should strip TOC divs and toc-backref anchors."""
+        page_kwargs = self._copy_page_kwargs()
+        settings = get_settings()
+        page_kwargs["settings"] = settings
+        del page_kwargs["metadata"]["summary"]
+        toc_content = (
+            '<div class="contents topic" id="toc">'
+            "<p>Table of contents</p>"
+            '<ul><li><a href="#s1">Section</a></li></ul>'
+            "</div>"
+            '<h2><a class="toc-backref" href="#id1">My Section</a></h2>'
+            "<p>First paragraph of real content.</p>"
+        )
+        page_kwargs["content"] = toc_content
+        settings["SUMMARY_MAX_LENGTH"] = None
+        page = Page(**page_kwargs)
+        self.assertNotIn('<div class="contents', page.summary)
+        self.assertNotIn("toc-backref", page.summary)
+        self.assertIn("<h2>My Section</h2>", page.summary)
+        self.assertIn("<p>First paragraph of real content.</p>", page.summary)
+
     def test_summary_get_summary_warning(self):
         """calling ._get_summary() should issue a warning"""
         page_kwargs = self._copy_page_kwargs()
diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index b5a53eac..aad07555 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -425,6 +425,60 @@ class TestUtils(LoggedTestCase):
         self.assertEqual(utils.truncate_html_paragraphs(three, 3), three)
         self.assertEqual(utils.truncate_html_paragraphs(three, 4), three)
 
+    def test_strip_toc_elements_from_html(self):
+        # Test removing TOC div with various class names
+        html_with_toc = (
+            '<div class="contents topic" id="table-of-contents">'
+            '<p class="topic-title">Table of Contents</p>'
+            '<ul><li><a href="#section1">Section 1</a></li></ul>'
+            "</div>"
+            "<p>Some content here</p>"
+        )
+        result = utils.strip_toc_elements_from_html(html_with_toc)
+        self.assertNotIn('<div class="contents', result)
+        self.assertIn("<p>Some content here</p>", result)
+
+        # Test removing toc-backref anchors while preserving heading text
+        html_with_backref = (
+            '<h2><a class="toc-backref" href="#id1">Section Heading</a></h2>'
+            "<p>Some content</p>"
+        )
+        result = utils.strip_toc_elements_from_html(html_with_backref)
+        self.assertNotIn("toc-backref", result)
+        self.assertNotIn("<a class=", result)
+        self.assertIn("Section Heading", result)
+        self.assertIn("<h2>Section Heading</h2>", result)
+
+        # Test combined - remove both TOC div and backrefs
+        html_combined = (
+            '<div class="contents">'
+            "<p>TOC here</p>"
+            "</div>"
+            '<h2><a class="toc-backref" href="#id1">the design</a></h2>'
+            "<p>Article content</p>"
+            '<h2><a class="toc-backref" href="#id2">key features</a></h2>'
+            "<p>More content</p>"
+        )
+        result = utils.strip_toc_elements_from_html(html_combined)
+        self.assertNotIn('<div class="contents', result)
+        self.assertNotIn("toc-backref", result)
+        self.assertIn("the design", result)
+        self.assertIn("key features", result)
+        self.assertIn("<p>Article content</p>", result)
+
+        # Test empty input
+        self.assertEqual(utils.strip_toc_elements_from_html(""), "")
+
+        # Test HTML without TOC elements (should be unchanged)
+        plain_html = "<p>Just some plain content</p>"
+        self.assertEqual(utils.strip_toc_elements_from_html(plain_html), plain_html)
+
+        # Test case-insensitive matching
+        html_mixed_case = '<div CLASS="CONTENTS"><p>TOC</p></div><p>Content</p>'
+        result = utils.strip_toc_elements_from_html(html_mixed_case)
+        self.assertNotIn("CONTENTS", result)
+        self.assertIn("<p>Content</p>", result)
+
     def test_process_translations(self):
         fr_articles = []
         en_articles = []
diff --git a/pelican/utils.py b/pelican/utils.py
index c17422aa..ee14a031 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -649,6 +649,37 @@ def truncate_html_paragraphs(s, count):
     return "".join(paragraphs)
 
 
+def strip_toc_elements_from_html(html: str) -> str:
+    """Strip table of contents elements from HTML summaries.
+
+    Removes TOC divs (with broken navigation links) and toc-backref anchor
+    links from headings. Both are necessary since TOC anchor targets don't
+    exist when summaries are displayed outside full article context
+    (e.g., homepage, RSS feeds).
+
+    :param html: HTML content to process
+    :return: Cleaned HTML with TOC elements removed
+    """
+    # Remove the entire <div class="contents"> ... </div> block
+    html = re.sub(
+        r'<div\s+class="contents[^"]*"[^>]*>.*?</div>',
+        "",
+        html,
+        flags=re.DOTALL | re.IGNORECASE,
+    )
+
+    # Remove anchor links from headings (e.g., <a class="toc-backref" href="#id1">text</a>)
+    # These links point to anchors that don't exist in summary context
+    html = re.sub(
+        r'<a[^>]*class="[^"]*toc-backref[^"]*"[^>]*>(.*?)</a>',
+        r"\1",
+        html,
+        flags=re.DOTALL | re.IGNORECASE,
+    )
+
+    return html
+
+
 def process_translations(
     content_list: list[Content],
     translation_id: str | Collection[str] | None = None,

From 751dff90f42c9feeda7aa7f4db20693602d82f10 Mon Sep 17 00:00:00 2001
From: Sam Bull <git@sambull.org>
Date: Tue, 14 Apr 2026 11:02:25 +0100
Subject: [PATCH 2855/2864] Fix disabled category output

---
 pelican/contents.py         |  2 +-
 pelican/generators.py       |  5 +++--
 pelican/readers.py          |  4 ++--
 pelican/tests/test_theme.py | 38 +++++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index c0a3e775..11459f77 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -584,7 +584,7 @@ class Page(Content):
 
 
 class Article(Content):
-    mandatory_properties = ("title", "date", "category")
+    mandatory_properties = ("title", "date")
     allowed_statuses = ("published", "hidden", "draft", "skip")
     default_status = "published"
     default_template = "article"
diff --git a/pelican/generators.py b/pelican/generators.py
index b7eef104..515257c4 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -513,7 +513,7 @@ class ArticlesGenerator(CachingGenerator):
                 self.get_template(article.template),
                 self.context,
                 article=article,
-                category=article.category,
+                category=getattr(article, "category", None),
                 override_output=hasattr(article, "override_save_as"),
                 url=article.url,
                 blog=True,
@@ -764,7 +764,8 @@ class ArticlesGenerator(CachingGenerator):
         for article in self.articles:
             # only main articles are listed in categories and tags
             # not translations or hidden articles
-            self.categories[article.category].append(article)
+            if hasattr(article, "category"):
+                self.categories[article.category].append(article)
             if hasattr(article, "tags"):
                 for tag in article.tags:
                     self.tags[tag].append(article)
diff --git a/pelican/readers.py b/pelican/readers.py
index dfa76638..508d655f 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -746,7 +746,7 @@ def default_metadata(settings=None, process=None):
             if process:
                 value = process(name, value)
             metadata[name] = value
-        if "DEFAULT_CATEGORY" in settings:
+        if "DEFAULT_CATEGORY" in settings and settings.get("CATEGORY_SAVE_AS"):
             value = settings["DEFAULT_CATEGORY"]
             if process:
                 value = process("category", value)
@@ -811,7 +811,7 @@ def parse_path_metadata(source_path, settings=None, process=None):
         checks = []
         for key, data in [("FILENAME_METADATA", base), ("PATH_METADATA", source_path)]:
             checks.append((settings.get(key, None), data))
-        if settings.get("USE_FOLDER_AS_CATEGORY", None):
+        if settings.get("USE_FOLDER_AS_CATEGORY") and settings.get("CATEGORY_SAVE_AS"):
             checks.append(("(?P<category>.*)", subdir))
         for regexp, data in checks:
             if regexp and data:
diff --git a/pelican/tests/test_theme.py b/pelican/tests/test_theme.py
index 25d23b97..aa996081 100644
--- a/pelican/tests/test_theme.py
+++ b/pelican/tests/test_theme.py
@@ -133,6 +133,44 @@ class TestTemplateInheritance(LoggedTestCase):
         self.assertNotIn("Proudly powered by", content)
         self.assertIn("New footer", content)
 
+    def test_disabled_categories_no_links(self):
+        """When CATEGORY_SAVE_AS is empty, articles without an explicit
+        category should not get a default category or show category links."""
+
+        # Create an article without a Category metadata line
+        content_dir = mkdtemp(prefix="pelican_test_content.")
+        with open(os.path.join(content_dir, "no_category.md"), "w") as f:
+            f.write(
+                "Title: No Category Article\n"
+                "Date: 2024-01-01\n\n"
+                "Article without a category.\n"
+            )
+
+        try:
+            settings = read_settings(
+                path=None,
+                override={
+                    "THEME": "simple",
+                    "PATH": content_dir,
+                    "OUTPUT_PATH": self.temp_output,
+                    "CACHE_PATH": self.temp_cache,
+                    "SITEURL": "http://example.com",
+                    "CATEGORY_SAVE_AS": None,
+                    "CATEGORY_URL": None,
+                    "CATEGORIES_SAVE_AS": None,
+                },
+            )
+
+            pelican = Pelican(settings=settings)
+            mute(True)(pelican.run)()
+
+            with open(os.path.join(self.temp_output, "no-category-article.html")) as f:
+                content = f.read()
+
+            self.assertNotIn("Category:", content)
+        finally:
+            rmtree(content_dir)
+
     def test_category_and_tag_feed_titles_use_slug(self):
         """Feed link titles on category/tag pages should have unique titles."""
 

From 691995c14202586e812b4b4e1d282a45db3add35 Mon Sep 17 00:00:00 2001
From: Sam Bull <git@sambull.org>
Date: Tue, 14 Apr 2026 11:05:32 +0100
Subject: [PATCH 2856/2864] Support `CSS_FILE` in Simple theme

---
 docs/_static/theme-basic.zip              | Bin 1449 -> 0 bytes
 docs/themes.rst                           |  62 +++++++--------
 pelican/settings.py                       |  11 +++
 pelican/tests/test_theme.py               |  91 ++++++++++++++++++++++
 pelican/themes/simple/templates/base.html |   3 +
 5 files changed, 134 insertions(+), 33 deletions(-)
 delete mode 100644 docs/_static/theme-basic.zip

diff --git a/docs/_static/theme-basic.zip b/docs/_static/theme-basic.zip
deleted file mode 100644
index d1e4754a44fcedc4c1c16f34b3782c225d13da3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1449
zcmWIWW@h1H0D<tdZ+2h?lwf0!VMt0W&P>)14dG;9W((8w<J_d>S6ac%z{v7~nSlXJ
z1i<xsrK9Q>fa@<w%`M1DEJ-bfm~<vw(~k?gNg_bIIT!?hCUqx;t?LHzRs*pl7L$N3
zOV!IL$;|;fE&;ods(s#k%?3O!-z{6SIal7Dz&+*Nt`%28?b#m~hYD~iyzz1sEYD}q
ze>?NLjPW7=i{?%>6U=(#wrR2My!>G1rlT`v1U_xwrQE(L(%f)Tjl0irVcqV9wdeM|
zwVw5WTWqfF5yn$XK6f;kTIT2;dZJdt<=683ZE3CjyUv8GiV3#2*Urp$td2bTa^u~(
zTj~+vbUhI@oOt2BD=tYafd%(8UroP>%kc!aUgmd{=n_OXCb<|I-Y-^b`Ayx2)hI}K
zFHQY!m-4{A#)^@F;SUo7gA_KSic2bUQuTm_f&<)inU<do5Tm7r-buIf4jJ&Yz5gvT
zPhk2~jpWNA^VD*kk|!PseN-gz=<f4*3Ac}0-4FTs_wUBnJCtf$quB};9Qf&2S#n*-
zhSh8Bs<U<HRQ{N#ip)N{Yr0mb{A`cd3zfcoNu253HWw~ehKjh>+bm9tK6L!WXNgaq
zH*?M2re0ff@K_P&?Z}*|*CeD?X8d7Tc_TsNVXm%ik8Z#fH?ECG89HUMG8XN!3$6^2
z+O0D0qgU_BQm?voMIrLvZ`z&?d1)Zy_{i*g?9Ov<8qc;C=Vo<vO<a<<K;e@>`Nl}A
znLqev^PF&5skrlA*&&tSOZ#){TT3#z1N^z!vXzYXEXdc~#HG`7S5JBU=@WU9mC<hZ
z#3$xF^?h;R;fBil^Vkj>tofH4rmK2RR&CybLe@`RGfvuzJzi+Mb+X1Yvsv<bH+3HW
ze)Hk3?-lU?Z$>6LW?VT@0-7fU7~VR9n6P}w3dxsfv4CtAX0Ajw%K>f{avlYm3d*Bc
zO~sW%A*KQo5W|wjE-a=Z<yWBbp!|x}ct`+XW)WmZX8>)11OPn40F4A?7(7N|W*1~5
z*P|N=$vi+~L74}uvAD7hazOmTW-L-h0-6uXNEqg`vH?Sofei?`f!VPGSk^Ky00373
BtK<Lx

diff --git a/docs/themes.rst b/docs/themes.rst
index fa4c9d37..c17d0fbd 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -589,38 +589,12 @@ using the ``{% extends %}`` directive as in the following example:
 Example
 -------
 
-With this system, it is possible to create a theme with just two files.
+With this system, it is possible to create a theme with just one file.
 
-base.html
-"""""""""
+main.css
+""""""""
 
-The first file is the ``templates/base.html`` template:
-
-.. code-block:: html+jinja
-
-    {% extends "!simple/base.html" %}
-
-    {% block head %}
-    {{ super() }}
-       <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/style.css" />
-    {% endblock %}
-
-1. On the first line, we extend the ``base.html`` template from the ``simple``
-   theme, so we don't have to rewrite the entire file.
-2. On the third line, we open the ``head`` block which has already been defined
-   in the ``simple`` theme.
-3. On the fourth line, the function ``super()`` keeps the content previously
-   inserted in the ``head`` block.
-4. On the fifth line, we append a stylesheet to the page.
-5. On the last line, we close the ``head`` block.
-
-This file will be extended by all the other templates, so the stylesheet will
-be linked from all pages.
-
-style.css
-"""""""""
-
-The second file is the ``static/css/style.css`` CSS stylesheet:
+The file is ``static/css/main.css`` (the default ``CSS_FILE``):
 
 .. code-block:: css
 
@@ -663,10 +637,32 @@ The second file is the ``static/css/style.css`` CSS stylesheet:
         margin-top : 1em ;
     }
 
-Download
-""""""""
+Custom templates
+""""""""""""""""
 
-You can download this example theme :download:`here <_static/theme-basic.zip>`.
+If you want to customise the templates as well, you can extend them. For
+example, to add a custom footer, create a ``templates/base.html``:
+
+.. code-block:: html+jinja
+
+    {% extends "!simple/base.html" %}
+
+    {% block footer %}
+        <p>Custom footer</p>
+    {{ super() }}
+    {% endblock %}
+
+1. On the first line, we extend the ``base.html`` template from the ``simple``
+   theme, so we don't have to rewrite the entire file.
+2. On the third line, we open the ``footer`` block which has already been
+   defined in the ``simple`` theme.
+3. On the fourth line, we insert the extra footer content.
+4. On the fifth line, the function ``super()`` keeps the content previously
+   inserted in the ``head`` block.
+5. On the last line, we close the ``footer`` block.
+
+This file will be extended by all the other templates, so the custom footer
+will appear on all pages.
 
 
 .. Links
diff --git a/pelican/settings.py b/pelican/settings.py
index dbe903f1..29761f70 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -592,6 +592,17 @@ def configure_settings(settings: Settings) -> Settings:
         else:
             raise Exception("Could not find the theme {}".format(settings["THEME"]))
 
+    # Clear CSS_FILE if the file doesn't exist in the theme
+    css_file = settings.get("CSS_FILE")
+    if css_file:
+        theme = settings["THEME"]
+        static_paths = settings.get("THEME_STATIC_PATHS", ["static"])
+        if not any(
+            os.path.isfile(os.path.join(theme, sp, "css", css_file))
+            for sp in static_paths
+        ):
+            settings["CSS_FILE"] = ""
+
     # standardize strings to lowercase strings
     for key in ["DEFAULT_LANG"]:
         if key in settings:
diff --git a/pelican/tests/test_theme.py b/pelican/tests/test_theme.py
index aa996081..c4bd6f14 100644
--- a/pelican/tests/test_theme.py
+++ b/pelican/tests/test_theme.py
@@ -201,6 +201,97 @@ class TestTemplateInheritance(LoggedTestCase):
             tag_content = f.read()
         self.assertIn('title="Foo Tag Atom Feed"', tag_content)
 
+    def test_simple_theme_no_css_link(self):
+        """The simple theme has no static/css/ directory, so the CSS_FILE
+        link should not be rendered."""
+
+        settings = read_settings(
+            path=None,
+            override={
+                "THEME": "simple",
+                "PATH": CONTENT_DIR,
+                "OUTPUT_PATH": self.temp_output,
+                "CACHE_PATH": self.temp_cache,
+                "SITEURL": "http://example.com",
+            },
+        )
+
+        pelican = Pelican(settings=settings)
+        mute(True)(pelican.run)()
+
+        with open(os.path.join(self.temp_output, "test-md-file.html")) as f:
+            content = f.read()
+
+        self.assertNotIn("/theme/css/main.css", content)
+
+    def test_child_theme_with_css_file(self):
+        """A child theme that provides static/css/main.css should have the
+        CSS_FILE link rendered."""
+
+        # Add a CSS file to the child theme
+        css_dir = os.path.join(self.temp_theme, "static", "css")
+        os.makedirs(css_dir)
+        with open(os.path.join(css_dir, "main.css"), "w") as f:
+            f.write("body { margin: 0; }")
+
+        settings = read_settings(
+            path=None,
+            override={
+                "THEME": self.temp_theme,
+                "PATH": CONTENT_DIR,
+                "OUTPUT_PATH": self.temp_output,
+                "CACHE_PATH": self.temp_cache,
+                "SITEURL": "http://example.com",
+            },
+        )
+
+        pelican = Pelican(settings=settings)
+        mute(True)(pelican.run)()
+
+        with open(os.path.join(self.temp_output, "test-md-file.html")) as f:
+            content = f.read()
+
+        self.assertIn(
+            'href="http://example.com/theme/css/main.css"',
+            content,
+        )
+
+    def test_css_only_theme(self):
+        """A theme with only a static/css/main.css file (no templates)
+        should work by falling back to the simple theme's templates."""
+
+        css_only_theme = mkdtemp(prefix="pelican_test_css_only_theme.")
+        css_dir = os.path.join(css_only_theme, "static", "css")
+        os.makedirs(css_dir)
+        with open(os.path.join(css_dir, "main.css"), "w") as f:
+            f.write("body { margin: 0; }")
+
+        try:
+            settings = read_settings(
+                path=None,
+                override={
+                    "THEME": css_only_theme,
+                    "PATH": CONTENT_DIR,
+                    "OUTPUT_PATH": self.temp_output,
+                    "CACHE_PATH": self.temp_cache,
+                    "SITEURL": "http://example.com",
+                },
+            )
+
+            pelican = Pelican(settings=settings)
+            mute(True)(pelican.run)()
+
+            with open(os.path.join(self.temp_output, "test-md-file.html")) as f:
+                content = f.read()
+
+            self.assertIn(
+                'href="http://example.com/theme/css/main.css"',
+                content,
+            )
+            self.assertIn("Proudly powered by", content)
+        finally:
+            rmtree(css_only_theme)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index 57d2bafd..d86e38f8 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -9,6 +9,9 @@
       {% if SITESUBTITLE %}
         <meta name="description" content="{{ SITESUBTITLE }}" />
       {% endif %}
+      {% if CSS_FILE %}
+        <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" />
+      {% endif %}
       {% if STYLESHEET_URL %}
         <link rel="stylesheet" type="text/css" href="{{ STYLESHEET_URL }}" />
       {% endif %}

From f941cb0885d57208fd4441170d313721ad8e569c Mon Sep 17 00:00:00 2001
From: Sam Bull <git@sambull.org>
Date: Wed, 15 Apr 2026 07:14:52 +0100
Subject: [PATCH 2857/2864] Fix raising exceptions on filtered logs

---
 pelican/log.py            | 71 +++++++++++++++++++--------------------
 pelican/tests/test_log.py | 42 +++++++++++++++++++++++
 2 files changed, 76 insertions(+), 37 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index 27478d14..7d39d0fa 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -10,6 +10,10 @@ __all__ = ["init"]
 console = Console()
 
 
+class FilteredMessage(Exception):
+    """An exception to signal whether a message was filtered or not."""
+
+
 class LimitFilter(logging.Filter):
     """
     Remove duplicates records, and limit the number of records in the same
@@ -83,44 +87,35 @@ class LimitLogger(logging.Logger):
 
 
 class FatalLogger(LimitLogger):
-    warnings_fatal = False
-    errors_fatal = False
+    fatal_lvl = logging.CRITICAL + 1  # i.e. No levels by default
 
-    def warning(self, *args, stacklevel=1, **kwargs):
-        """
-        Displays a logging warning.
+    def filter(self, record):
+        """A hack to let _log() know whether a message was logged or not."""
+        result = super().filter(record)
+        if not result:
+            raise FilteredMessage
+        return result
 
-        Wrapping it here allows Pelican to filter warnings, and conditionally
-        make warnings fatal.
+    def _log(
+        self,
+        level,
+        msg,
+        args,
+        exc_info=None,
+        extra=None,
+        stack_info=False,
+        stacklevel=1,
+    ):
+        try:
+            super()._log(level, msg, args, exc_info, extra, stack_info, stacklevel + 1)
+        except FilteredMessage:
+            # Avoid raising RuntimeError below if no log was emitted.
+            return
 
-        Args:
-            stacklevel (int): the stacklevel that would be used to display the
-            calling location, except for this function. Adjusting the
-            stacklevel allows you to see the "true" calling location of the
-            warning, rather than this wrapper location.
-        """
-        stacklevel += 1
-        super().warning(*args, stacklevel=stacklevel, **kwargs)
-        if FatalLogger.warnings_fatal:
-            raise RuntimeError("Warning encountered")
-
-    def error(self, *args, stacklevel=1, **kwargs):
-        """
-        Displays a logging error.
-
-        Wrapping it here allows Pelican to filter errors, and conditionally
-        make errors non-fatal.
-
-        Args:
-            stacklevel (int): the stacklevel that would be used to display the
-            calling location, except for this function. Adjusting the
-            stacklevel allows you to see the "true" calling location of the
-            error, rather than this wrapper location.
-        """
-        stacklevel += 1
-        super().error(*args, stacklevel=stacklevel, **kwargs)
-        if FatalLogger.errors_fatal:
-            raise RuntimeError("Error encountered")
+        # __init__.py:main() catches this exception then does its own critical log.
+        # We need to avoid throwing the exception a second time here.
+        if level >= FatalLogger.fatal_lvl and level != logging.CRITICAL:
+            raise RuntimeError("Warning or error encountered")
 
 
 logging.setLoggerClass(FatalLogger)
@@ -137,8 +132,10 @@ def init(
     name=None,
     logs_dedup_min_level=None,
 ):
-    FatalLogger.warnings_fatal = fatal.startswith("warning")
-    FatalLogger.errors_fatal = bool(fatal)
+    if fatal:
+        FatalLogger.fatal_lvl = (
+            logging.WARNING if fatal.startswith("warning") else logging.ERROR
+        )
 
     LOG_FORMAT = "%(message)s"
     logging.basicConfig(
diff --git a/pelican/tests/test_log.py b/pelican/tests/test_log.py
index 8791fc7c..a7e1316b 100644
--- a/pelican/tests/test_log.py
+++ b/pelican/tests/test_log.py
@@ -73,3 +73,45 @@ class TestLog(unittest.TestCase):
             self.assertEqual(
                 self.handler.count_logs("Another log \\d", logging.WARNING), 0
             )
+
+    def test_filtered_warning_no_raise_with_fatal_warnings(self):
+        log.FatalLogger.fatal_lvl = logging.WARNING
+        try:
+            log.LimitFilter._ignore.add((logging.WARNING, "Filtered %s"))
+            # Should not raise because the message is filtered out.
+            self.logger.warning("Filtered %s", "msg")
+        finally:
+            log.FatalLogger.fatal_lvl = logging.CRITICAL + 1
+
+    def test_unfiltered_warning_raises_with_fatal_warnings(self):
+        log.FatalLogger.fatal_lvl = logging.WARNING
+        try:
+            with self.assertRaises(RuntimeError):
+                self.logger.warning("Unfiltered warning")
+        finally:
+            log.FatalLogger.fatal_lvl = logging.CRITICAL + 1
+
+    def test_filtered_error_no_raise_with_fatal_errors(self):
+        log.FatalLogger.fatal_lvl = logging.ERROR
+        try:
+            log.LimitFilter._ignore.add((logging.WARNING, "Filtered error %s"))
+            # Errors go through LimitFilter (levelno > WARNING returns True),
+            # but we can test with a duplicate message which gets filtered.
+            self.logger.warning("Some warning")
+            self._reset_limit_filter()
+            # Use _ignore to filter an error-level record by lowering dedup level.
+            log.LimitFilter.LOGS_DEDUP_MIN_LEVEL = logging.ERROR
+            log.LimitFilter._ignore.add((logging.ERROR, "Filtered error %s"))
+            self.logger.error("Filtered error %s", "msg")
+        finally:
+            log.FatalLogger.fatal_lvl = logging.CRITICAL + 1
+            log.LimitFilter.LOGS_DEDUP_MIN_LEVEL = logging.WARNING
+
+    def test_critical_never_raises(self):
+        log.FatalLogger.fatal_lvl = logging.WARNING
+        try:
+            # CRITICAL should not raise even though it's above fatal_lvl,
+            # because main() catches RuntimeError and logs its own critical.
+            self.logger.critical("Critical message")
+        finally:
+            log.FatalLogger.fatal_lvl = logging.CRITICAL + 1

From 8ad4e90170f1801c63e89ffe1d16d63304165da9 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 29 Dec 2025 11:50:02 +0100
Subject: [PATCH 2858/2864] docs: Overhaul installation instructions; add `uv`

---
 docs/install.rst | 94 +++++++++++++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 44 deletions(-)

diff --git a/docs/install.rst b/docs/install.rst
index e10d136e..c85e401f 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -1,62 +1,59 @@
 Installing Pelican
 ##################
 
-Pelican currently runs best on |min_python|; earlier versions of Python are not supported.
+Pelican currently runs best on Python |min_python|; earlier versions of Python are not supported.
 
 Once Pelican is installed, you can run ``pelican --help`` to see basic usage
 options. For more detail, refer to the :doc:`Publish<publish>` section.
 
-You can install Pelican via several different methods. The simplest is via
-`pip <http://www.pip-installer.org/>`_::
+You can install Pelican via several different methods.
 
-    python -m pip install pelican
+**Recommended method:** `Pip <https://pip.pypa.io/>`_ User Install
 
-Keep in mind that operating systems will often require you to prefix the above
-command with ``sudo`` in order to install Pelican system-wide. **You should
-not do this** as it may break your operating system. In this case you
-can add the ``--user`` flag or try one of the recommended methods below.
+To install Pelican via Pip::
 
-**Recommended method 1:** `pipx <https://github.com/pipxproject/pipx/>`_
+    python3 -m pip install --user "pelican[markdown]"
 
-pipx lets you execute binaries from Python packages in isolated environments.
-You can install pipx according to instructions on its  
-`homepage <https://github.com/pipxproject/pipx/>`_. After pipx is installed,
-you can install pelican::
+Or, if you do not plan to use `Markdown <https://pypi.org/project/Markdown/>`_,
+you can omit the ``[markdown]`` suffix::
 
-    $ pipx install pelican
-    installed package pelican 4.0.1, Python 3.6.7
-    These binaries are now globally available
-     - pelican
-     - pelican-import
-     - pelican-quickstart
-     - pelican-themes
-    done! ✨ 🌟 ✨
+    python3 -m pip install --user pelican
 
-To upgrade or uninstall::
+**Alternate method 1:** `Pipx <https://github.com/pypa/pipx>`_
 
-    pipx upgrade pelican
-    pipx uninstall pelican
+Pipx lets you execute binaries from Python packages in isolated environments.
+You can install Pipx by following its
+`documentation <https://pipx.pypa.io>`_. After Pipx is installed,
+you can install Pelican via::
 
-**Recommended method 2:** Virtual Environment
+    pipx install "pelican[markdown]"
 
-If you prefer to manually manage a Virtual Environment, you can create 
-a virtual environment for Pelican via venv_ (or virtualenv_ if you are 
-using Python2) before installing Pelican.::
+**Alternate method 2:** `uv <https://docs.astral.sh/uv/>`_
 
-    python -m venv ~/virtualenvs/pelican
-    . ~/virtualenvs/pelican/bin/activate
+Like Pipx, ``uv`` allows you to install tools in isolated environments.
+If you have ``uv`` installed, you can install Pelican via::
 
-Once the virtual environment has been created and activated, Pelican can be
-installed via ``python -m pip install pelican`` as noted above. Alternatively, if you
-have the project source, you can install Pelican using the setuptools method::
+    uv tool install "pelican[markdown]"
+
+**Alternate method 3:** Virtual Environment
+
+If you prefer to manually manage a virtual environment, you can create
+a virtual environment for Pelican via venv_ before installing Pelican::
+
+    python3 -m venv ~/virtualenvs/pelican
+    source ~/virtualenvs/pelican/bin/activate
+    python3 -m pip install "pelican[markdown]"
+
+Alternatively, if you have the project source, you can replace the last command
+with the following to install Pelican using the ``setuptools`` method::
 
     cd path-to-Pelican-source
-    python -m pip install .
+    python3 -m pip install .
 
 If you have Git installed and prefer to install the latest bleeding-edge
 version of Pelican rather than a stable release, use the following command::
 
-    python -m pip install -e "git+https://github.com/getpelican/pelican.git#egg=pelican"
+    python3 -m pip install -e "git+https://github.com/getpelican/pelican.git#egg=pelican"
 
 To exit the virtual environment, type ``deactivate``.
 
@@ -66,18 +63,23 @@ Optional packages
 If you plan on using `Markdown <https://pypi.org/project/Markdown/>`_ as a
 markup format, you can install Pelican with Markdown support::
 
-    python -m pip install "pelican[markdown]"
+    python3 -m pip install --user "pelican[markdown]"
 
 Typographical enhancements can be enabled in your settings file, but first the
-requisite `Typogrify <https://pypi.org/project/typogrify/>`_ library must be
+requisite `Typogrify <https://github.com/justinmayer/typogrify>`_ library must be
 installed::
 
-    python -m pip install typogrify
+    python3 -m pip install --user typogrify
 
-If you are using pipx, you can inject packages into the pipx-managed virtual
-environment::
+If you are using Pipx, you can inject packages into the Pipx-managed virtual
+environment. For example, to add Typogrify::
 
-    pipx inject pelican Markdown
+    pipx inject pelican typogrify
+
+To use ``uv`` to install Pelican with additional extra packages, use the
+following example command, which like above will also install Typogrify::
+
+    uv tool install --with typogrify "pelican[markdown]"
 
 Dependencies
 ------------
@@ -107,15 +109,19 @@ Upgrading
 If you installed a stable Pelican release via Pip_ and wish to upgrade to
 the latest stable release, you can do so by adding ``--upgrade``::
 
-    python -m pip install --upgrade pelican
+    python3 -m pip install --upgrade pelican
 
-If you installed Pelican via distutils or the bleeding-edge method, simply
+If you installed Pelican via ``setuptools`` or the bleeding-edge method,
 perform the same step to install the most recent version.
 
-If you installed with pipx::
+If you installed with Pipx, upgrade via::
 
     pipx upgrade pelican
 
+If you installed with ``uv``, upgrade via::
+
+    uv tool upgrade pelican
+
 Kickstart your site
 -------------------
 

From 85946e54b8091caf7545acfe9394506434155568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
Date: Sat, 18 Apr 2026 01:03:28 +0200
Subject: [PATCH 2859/2864] fix: typo in pyproject.toml

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 236a47fb..a5b5bde5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -210,7 +210,7 @@ ignore = [
     "PLR2004"
 ]
 
-"pelican/tools/*.py}" = [
+"pelican/tools/*.py" = [
     # this is a command-line utility, prints are fine
     "T201"
 ]

From c2149063585de9984cb1c1a9b9034061a431080b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
Date: Sat, 18 Apr 2026 01:12:26 +0200
Subject: [PATCH 2860/2864] Use more specific exceptions instead of just
 Exception.

---
 pelican/settings.py              |  8 ++++----
 pelican/tests/test_generators.py |  4 +++-
 pelican/tests/test_settings.py   | 12 ++++++------
 pelican/utils.py                 |  6 +++---
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pelican/settings.py b/pelican/settings.py
index 29761f70..45957fd0 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -324,7 +324,7 @@ def handle_deprecated_settings(settings: Settings) -> Settings:
             "EXTRA_TEMPLATES_PATHS is deprecated use THEME_TEMPLATES_OVERRIDES instead."
         )
         if settings.get("THEME_TEMPLATES_OVERRIDES"):
-            raise Exception(
+            raise ValueError(
                 "Setting both EXTRA_TEMPLATES_PATHS and "
                 "THEME_TEMPLATES_OVERRIDES is not permitted. Please move to "
                 "only setting THEME_TEMPLATES_OVERRIDES."
@@ -392,7 +392,7 @@ def handle_deprecated_settings(settings: Settings) -> Settings:
         if f + "_REGEX_SUBSTITUTIONS" in settings
     }
     if old_values and new_values:
-        raise Exception(
+        raise ValueError(
             "Setting both {new_key} and {old_key} (or variants thereof) is "
             "not permitted. Please move to only setting {new_key}.".format(
                 old_key="SLUG_SUBSTITUTIONS", new_key="SLUG_REGEX_SUBSTITUTIONS"
@@ -573,7 +573,7 @@ def configure_settings(settings: Settings) -> Settings:
     Also, specify the log messages to be ignored.
     """
     if "PATH" not in settings or not os.path.isdir(settings["PATH"]):
-        raise Exception(
+        raise ValueError(
             "You need to specify a path containing the content"
             " (see pelican --help for more information)"
         )
@@ -590,7 +590,7 @@ def configure_settings(settings: Settings) -> Settings:
         if os.path.exists(theme_path):
             settings["THEME"] = theme_path
         else:
-            raise Exception("Could not find the theme {}".format(settings["THEME"]))
+            raise ValueError("Could not find the theme {}".format(settings["THEME"]))
 
     # Clear CSS_FILE if the file doesn't exist in the theme
     css_file = settings.get("CSS_FILE")
diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index 6e9f2be8..f566bc9c 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -788,7 +788,9 @@ class TestArticlesGenerator(unittest.TestCase):
             theme=settings["THEME"],
             output_path=None,
         )
-        self.assertRaises(Exception, generator.get_template, "not_a_template")
+        self.assertRaises(
+            PelicanTemplateNotFound, generator.get_template, "not_a_template"
+        )
 
     def test_generate_authors(self):
         """Check authors generation."""
diff --git a/pelican/tests/test_settings.py b/pelican/tests/test_settings.py
index 59eebd53..54167e63 100644
--- a/pelican/tests/test_settings.py
+++ b/pelican/tests/test_settings.py
@@ -153,7 +153,7 @@ class TestSettingsConfiguration(unittest.TestCase):
 
         # Check that non-existent theme raises exception
         settings["THEME"] = "foo"
-        self.assertRaises(Exception, configure_settings, settings)
+        self.assertRaises(ValueError, configure_settings, settings)
 
     def test_deprecated_dir_setting(self):
         settings = self.settings
@@ -190,17 +190,17 @@ class TestSettingsConfiguration(unittest.TestCase):
         # test that 'PATH' is set
         settings = {}
 
-        self.assertRaises(Exception, configure_settings, settings)
+        self.assertRaises(ValueError, configure_settings, settings)
 
         # Test that 'PATH' is valid
         settings["PATH"] = ""
-        self.assertRaises(Exception, configure_settings, settings)
+        self.assertRaises(ValueError, configure_settings, settings)
 
         # Test nonexistent THEME
         settings["PATH"] = os.curdir
         settings["THEME"] = "foo"
 
-        self.assertRaises(Exception, configure_settings, settings)
+        self.assertRaises(ValueError, configure_settings, settings)
 
     def test__printf_s_to_format_field(self):
         for s in ("%s", "{%s}", "{%s"):
@@ -253,14 +253,14 @@ class TestSettingsConfiguration(unittest.TestCase):
         settings["EXTRA_TEMPLATES_PATHS"] = ["/ha"]
         settings["THEME_TEMPLATES_OVERRIDES"] = ["/foo/bar"]
 
-        self.assertRaises(Exception, handle_deprecated_settings, settings)
+        self.assertRaises(ValueError, handle_deprecated_settings, settings)
 
     def test_slug_and_slug_regex_substitutions_exception(self):
         settings = {}
         settings["SLUG_REGEX_SUBSTITUTIONS"] = [("C++", "cpp")]
         settings["TAG_SUBSTITUTIONS"] = [("C#", "csharp")]
 
-        self.assertRaises(Exception, handle_deprecated_settings, settings)
+        self.assertRaises(ValueError, handle_deprecated_settings, settings)
 
     def test_deprecated_slug_substitutions(self):
         default_slug_regex_subs = self.settings["SLUG_REGEX_SUBSTITUTIONS"]
diff --git a/pelican/utils.py b/pelican/utils.py
index ee14a031..90d1a3fd 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -384,7 +384,7 @@ def clean_output_dir(path: str, retention: Iterable[str]) -> None:
     if not os.path.isdir(path):
         try:
             os.remove(path)
-        except Exception:
+        except OSError:
             logger.exception("Unable to delete file %s", path)
         return
 
@@ -399,13 +399,13 @@ def clean_output_dir(path: str, retention: Iterable[str]) -> None:
             try:
                 shutil.rmtree(file)
                 logger.debug("Deleted directory %s", file)
-            except Exception:
+            except OSError:
                 logger.exception("Unable to delete directory %s", file)
         elif os.path.isfile(file) or os.path.islink(file):
             try:
                 os.remove(file)
                 logger.debug("Deleted file/link %s", file)
-            except Exception:
+            except OSError:
                 logger.exception("Unable to delete file %s", file)
         else:
             logger.error("Unable to delete %s, file type unknown", file)

From 3e401f648cf1eb9c470156dbcc8effebc634a59e Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 19 Apr 2026 10:12:17 +0200
Subject: [PATCH 2861/2864] test: Ensure MIME type for JS is JavaScript

---
 pelican/tests/test_server.py | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pelican/tests/test_server.py b/pelican/tests/test_server.py
index 43cd070d..e9660a6a 100644
--- a/pelican/tests/test_server.py
+++ b/pelican/tests/test_server.py
@@ -22,17 +22,16 @@ class TestServer(unittest.TestCase):
         self.temp_output = mkdtemp(prefix="pelicantests.")
         self.old_cwd = os.getcwd()
         os.chdir(self.temp_output)
+        self.handler = ComplexHTTPRequestHandler(
+            MockRequest(), ("0.0.0.0", 8888), self.server
+        )
+        self.handler.base_path = self.temp_output
 
     def tearDown(self):
         os.chdir(self.old_cwd)
         rmtree(self.temp_output)
 
     def test_get_path_that_exists(self):
-        handler = ComplexHTTPRequestHandler(
-            MockRequest(), ("0.0.0.0", 8888), self.server
-        )
-        handler.base_path = self.temp_output
-
         open(os.path.join(self.temp_output, "foo.html"), "a").close()
         os.mkdir(os.path.join(self.temp_output, "foo"))
         open(os.path.join(self.temp_output, "foo", "index.html"), "a").close()
@@ -44,17 +43,29 @@ class TestServer(unittest.TestCase):
 
         for suffix in ["", "/"]:
             # foo.html has precedence over foo/index.html
-            path = handler.get_path_that_exists("foo" + suffix)
+            path = self.handler.get_path_that_exists("foo" + suffix)
             self.assertEqual(path, "foo.html")
 
             # folder with index.html should return folder/index.html
-            path = handler.get_path_that_exists("bar" + suffix)
+            path = self.handler.get_path_that_exists("bar" + suffix)
             self.assertEqual(path, "bar/index.html")
 
             # folder without index.html should return same as input
-            path = handler.get_path_that_exists("baz" + suffix)
+            path = self.handler.get_path_that_exists("baz" + suffix)
             self.assertEqual(path, "baz" + suffix)
 
             # not existing path should return None
-            path = handler.get_path_that_exists("quux" + suffix)
+            path = self.handler.get_path_that_exists("quux" + suffix)
             self.assertIsNone(path)
+
+    def test_guess_type_method_returns_javascript_for_js_files(self):
+        js_file = os.path.join(self.temp_output, "script.js")
+        with open(js_file, "w") as f:
+            f.write("console.log('hello');")
+
+        mimetype = self.handler.guess_type(js_file)
+        self.assertIn(
+            mimetype,
+            ("text/javascript", "application/javascript"),
+            f"Expected .js MIME type to be 'text/javascript' or 'application/javascript', got '{mimetype}'",
+        )

From 5672362f41a6e61c0bde6b93c3afa13ccf30fa88 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 19 Apr 2026 10:28:52 +0200
Subject: [PATCH 2862/2864] fix: Override server JS MIME type if `text/plain`

On systems such as Windows, JavaScript files can be incorrectly assigned
the "text/plain" MIME type in Python's mimetypes module. This overrides
this behavior when it occurs.
---
 pelican/server.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pelican/server.py b/pelican/server.py
index c4607e21..92b6ad76 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -120,6 +120,11 @@ class ComplexHTTPRequestHandler(server.SimpleHTTPRequestHandler):
         if mimetype == "application/octet-stream" and magic_from_file:
             mimetype = magic_from_file(path, mime=True)
 
+        # On some systems, JavaScript files are incorrectly assigned the "text/plain"
+        # MIME type in Python's mimetypes module. Override this behavior when it occurs.
+        if posixpath.splitext(path)[1] == ".js" and mimetype == "text/plain":
+            mimetype = "text/javascript"
+
         return mimetype
 
     def log_message(self, msg_format, *args):

From f7fe7865c569aebe9172b48651b9e069d0e529e8 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Mon, 20 Apr 2026 17:26:41 +0200
Subject: [PATCH 2863/2864] Prepare release

---
 RELEASE.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 00000000..45ab07f9
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,18 @@
+Release type: minor
+
+- Add dark mode to ``notmyidea`` template `(#3490) <https://github.com/getpelican/pelican/pull/3490>`_
+- Support ``CSS_FILE`` setting in Simple theme `(#3555) <https://github.com/getpelican/pelican/pull/3555>`_
+- Improve Simple theme template inheritance `(#3570) <https://github.com/getpelican/pelican/pull/3570>`_
+- Strip table-of-contents elements from article summaries `(#3512) <https://github.com/getpelican/pelican/pull/3512>`_
+- Use slug in category/tag feed titles `(#3569) <https://github.com/getpelican/pelican/pull/3569>`_
+- Fix raising exceptions on filtered logs `(#3547) <https://github.com/getpelican/pelican/pull/3547>`_
+- Fix disabled category output `(#3589) <https://github.com/getpelican/pelican/pull/3589>`_
+- Fix default ``FEED_DOMAIN`` to fall back to ``SITEURL`` `(#3477) <https://github.com/getpelican/pelican/pull/3477>`_
+- Don't log feed warning if ``FEED_DOMAIN`` is set `(#3544) <https://github.com/getpelican/pelican/pull/3544>`_
+- Fix ``livereload`` import in ``docserve()`` task `(#3583) <https://github.com/getpelican/pelican/pull/3583>`_
+- Fix JavaScript MIME detection on Windows `(#3594) <https://github.com/getpelican/pelican/pull/3594>`_
+- Fix linking to individual settings in docs `(#3458) <https://github.com/getpelican/pelican/pull/3458>`_
+- Overhaul installation instructions; add ``pipx`` and ``uv`` `(#3549) <https://github.com/getpelican/pelican/pull/3549>`_
+- Enhance GitHub Pages workflow `(#3452) <https://github.com/getpelican/pelican/pull/3452>`_ & `(#3529) <https://github.com/getpelican/pelican/pull/3529>`_
+- Require Docutils 0.22+ and Sphinx 9.0+ `(#3579) <https://github.com/getpelican/pelican/pull/3579>`_
+- Require Python 3.11 and above; add Python 3.14 to test matrix `(#3514) <https://github.com/getpelican/pelican/pull/3514>`_

From 3c69dc68d25a761911697467c765a16e68915c74 Mon Sep 17 00:00:00 2001
From: botpub <52496925+botpub@users.noreply.github.com>
Date: Mon, 20 Apr 2026 15:29:45 +0000
Subject: [PATCH 2864/2864] Release Pelican 4.12.0

---
 RELEASE.md         | 18 ------------------
 docs/changelog.rst | 20 ++++++++++++++++++++
 pyproject.toml     |  2 +-
 3 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 45ab07f9..00000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Release type: minor
-
-- Add dark mode to ``notmyidea`` template `(#3490) <https://github.com/getpelican/pelican/pull/3490>`_
-- Support ``CSS_FILE`` setting in Simple theme `(#3555) <https://github.com/getpelican/pelican/pull/3555>`_
-- Improve Simple theme template inheritance `(#3570) <https://github.com/getpelican/pelican/pull/3570>`_
-- Strip table-of-contents elements from article summaries `(#3512) <https://github.com/getpelican/pelican/pull/3512>`_
-- Use slug in category/tag feed titles `(#3569) <https://github.com/getpelican/pelican/pull/3569>`_
-- Fix raising exceptions on filtered logs `(#3547) <https://github.com/getpelican/pelican/pull/3547>`_
-- Fix disabled category output `(#3589) <https://github.com/getpelican/pelican/pull/3589>`_
-- Fix default ``FEED_DOMAIN`` to fall back to ``SITEURL`` `(#3477) <https://github.com/getpelican/pelican/pull/3477>`_
-- Don't log feed warning if ``FEED_DOMAIN`` is set `(#3544) <https://github.com/getpelican/pelican/pull/3544>`_
-- Fix ``livereload`` import in ``docserve()`` task `(#3583) <https://github.com/getpelican/pelican/pull/3583>`_
-- Fix JavaScript MIME detection on Windows `(#3594) <https://github.com/getpelican/pelican/pull/3594>`_
-- Fix linking to individual settings in docs `(#3458) <https://github.com/getpelican/pelican/pull/3458>`_
-- Overhaul installation instructions; add ``pipx`` and ``uv`` `(#3549) <https://github.com/getpelican/pelican/pull/3549>`_
-- Enhance GitHub Pages workflow `(#3452) <https://github.com/getpelican/pelican/pull/3452>`_ & `(#3529) <https://github.com/getpelican/pelican/pull/3529>`_
-- Require Docutils 0.22+ and Sphinx 9.0+ `(#3579) <https://github.com/getpelican/pelican/pull/3579>`_
-- Require Python 3.11 and above; add Python 3.14 to test matrix `(#3514) <https://github.com/getpelican/pelican/pull/3514>`_
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b82faaa3..71cb851d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,26 @@
 Release history
 ###############
 
+4.12.0 - 2026-04-20
+===================
+
+- Add dark mode to ``notmyidea`` template `(#3490) <https://github.com/getpelican/pelican/pull/3490>`_
+- Support ``CSS_FILE`` setting in Simple theme `(#3555) <https://github.com/getpelican/pelican/pull/3555>`_
+- Improve Simple theme template inheritance `(#3570) <https://github.com/getpelican/pelican/pull/3570>`_
+- Strip table-of-contents elements from article summaries `(#3512) <https://github.com/getpelican/pelican/pull/3512>`_
+- Use slug in category/tag feed titles `(#3569) <https://github.com/getpelican/pelican/pull/3569>`_
+- Fix raising exceptions on filtered logs `(#3547) <https://github.com/getpelican/pelican/pull/3547>`_
+- Fix disabled category output `(#3589) <https://github.com/getpelican/pelican/pull/3589>`_
+- Fix default ``FEED_DOMAIN`` to fall back to ``SITEURL`` `(#3477) <https://github.com/getpelican/pelican/pull/3477>`_
+- Don't log feed warning if ``FEED_DOMAIN`` is set `(#3544) <https://github.com/getpelican/pelican/pull/3544>`_
+- Fix ``livereload`` import in ``docserve()`` task `(#3583) <https://github.com/getpelican/pelican/pull/3583>`_
+- Fix JavaScript MIME detection on Windows `(#3594) <https://github.com/getpelican/pelican/pull/3594>`_
+- Fix linking to individual settings in docs `(#3458) <https://github.com/getpelican/pelican/pull/3458>`_
+- Overhaul installation instructions; add ``pipx`` and ``uv`` `(#3549) <https://github.com/getpelican/pelican/pull/3549>`_
+- Enhance GitHub Pages workflow `(#3452) <https://github.com/getpelican/pelican/pull/3452>`_ & `(#3529) <https://github.com/getpelican/pelican/pull/3529>`_
+- Require Docutils 0.22+ and Sphinx 9.0+ `(#3579) <https://github.com/getpelican/pelican/pull/3579>`_
+- Require Python 3.11 and above; add Python 3.14 to test matrix `(#3514) <https://github.com/getpelican/pelican/pull/3514>`_
+
 4.11.0 - 2025-01-15
 ===================
 
diff --git a/pyproject.toml b/pyproject.toml
index a5b5bde5..3e914e84 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 name = "pelican"
 authors = [{ name = "Justin Mayer", email = "authors@getpelican.com" }]
 description = "Static site generator supporting Markdown and reStructuredText"
-version = "4.11.0"
+version = "4.12.0"
 license = { text = "AGPLv3" }
 readme = "README.rst"
 keywords = ["static site generator", "static sites", "ssg"]